From f561120295d392678a19d5a8a578da272a082bc0 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 7 Jan 2023 23:40:02 +0100
Subject: [PATCH 0001/2296] Remove info labels, since they are no longer
 present in this component in thew new design

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 356 ++++++++++++++++++
 1 file changed, 356 insertions(+)
 create mode 100644 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
new file mode 100644
index 0000000000..4d1a2133fd
--- /dev/null
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -0,0 +1,356 @@
+// 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.Threading;
+using osuTK;
+using osuTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Select
+{
+    public partial class BeatmapInfoWedgeV2 : VisibilityContainer
+    {
+        public const float BORDER_THICKNESS = 2.5f;
+        private const float shear_width = 36.75f;
+
+        private const float transition_duration = 250;
+
+        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGE_HEIGHT, 0);
+
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
+        protected Container DisplayedContent { get; private set; }
+
+        protected WedgeInfoText Info { get; private set; }
+
+        public BeatmapInfoWedgeV2()
+        {
+            Shear = wedged_container_shear;
+            Masking = true;
+            BorderColour = new Color4(221, 255, 255, 255);
+            BorderThickness = BORDER_THICKNESS;
+            Alpha = 0;
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = new Color4(130, 204, 255, 150),
+                Radius = 20,
+                Roundness = 15,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            ruleset.BindValueChanged(_ => updateDisplay());
+        }
+
+        private const double animation_duration = 800;
+
+        protected override void PopIn()
+        {
+            this.MoveToX(0, animation_duration, Easing.OutQuint);
+            this.RotateTo(0, animation_duration, Easing.OutQuint);
+            this.FadeIn(transition_duration);
+        }
+
+        protected override void PopOut()
+        {
+            this.MoveToX(-100, animation_duration, Easing.In);
+            this.RotateTo(10, animation_duration, Easing.In);
+            this.FadeOut(transition_duration * 2, Easing.In);
+        }
+
+        private WorkingBeatmap beatmap;
+
+        public WorkingBeatmap Beatmap
+        {
+            get => beatmap;
+            set
+            {
+                if (beatmap == value) return;
+
+                beatmap = value;
+
+                updateDisplay();
+            }
+        }
+
+        public override bool IsPresent => base.IsPresent || DisplayedContent == null; // Visibility is updated in the LoadComponentAsync callback
+
+        private Container loadingInfo;
+
+        private void updateDisplay()
+        {
+            Scheduler.AddOnce(perform);
+
+            void perform()
+            {
+                void removeOldInfo()
+                {
+                    State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
+
+                    DisplayedContent?.FadeOut(transition_duration);
+                    DisplayedContent?.Expire();
+                    DisplayedContent = null;
+                }
+
+                if (beatmap == null)
+                {
+                    removeOldInfo();
+                    return;
+                }
+
+                LoadComponentAsync(loadingInfo = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Shear = -Shear,
+                    Depth = DisplayedContent?.Depth + 1 ?? 0,
+                    Children = new Drawable[]
+                    {
+                        new BeatmapInfoWedgeBackground(beatmap),
+                        Info = new WedgeInfoText(beatmap),
+                    }
+                }, loaded =>
+                {
+                    // ensure we are the most recent loaded wedge.
+                    if (loaded != loadingInfo) return;
+
+                    removeOldInfo();
+                    Add(DisplayedContent = loaded);
+                });
+            }
+        }
+
+        public partial class WedgeInfoText : Container
+        {
+            public OsuSpriteText VersionLabel { get; private set; }
+            public OsuSpriteText TitleLabel { get; private set; }
+            public OsuSpriteText ArtistLabel { get; private set; }
+            public FillFlowContainer MapperContainer { get; private set; }
+
+            private Container difficultyColourBar;
+            private StarRatingDisplay starRatingDisplay;
+
+            private ILocalisedBindableString titleBinding;
+            private ILocalisedBindableString artistBinding;
+
+            private readonly WorkingBeatmap working;
+
+            [Resolved]
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+
+            [Resolved]
+            private BeatmapDifficultyCache difficultyCache { get; set; }
+
+            [Resolved]
+            private OsuColour colours { get; set; }
+
+            private ModSettingChangeTracker settingChangeTracker;
+
+            public WedgeInfoText(WorkingBeatmap working)
+            {
+                this.working = working;
+            }
+
+            private CancellationTokenSource cancellationSource;
+            private IBindable<StarDifficulty?> starDifficulty;
+
+            [BackgroundDependencyLoader]
+            private void load(LocalisationManager localisation)
+            {
+                var beatmapInfo = working.BeatmapInfo;
+                var metadata = beatmapInfo.Metadata;
+
+                RelativeSizeAxes = Axes.Both;
+
+                titleBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
+                artistBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
+
+                const float top_height = 0.7f;
+
+                Children = new Drawable[]
+                {
+                    difficultyColourBar = new Container
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 20f,
+                        Children = new[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Width = top_height,
+                            },
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RelativePositionAxes = Axes.Both,
+                                Alpha = 0.5f,
+                                X = top_height,
+                                Width = 1 - top_height,
+                            }
+                        }
+                    },
+                    new FillFlowContainer
+                    {
+                        Name = "Topleft-aligned metadata",
+                        Anchor = Anchor.TopLeft,
+                        Origin = Anchor.TopLeft,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding { Top = 10, Left = 25, Right = shear_width * 2.5f },
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Children = new Drawable[]
+                        {
+                            VersionLabel = new OsuSpriteText
+                            {
+                                Text = beatmapInfo.DifficultyName,
+                                Font = OsuFont.GetFont(size: 24, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                                Truncate = true,
+                            },
+                        }
+                    },
+                    new FillFlowContainer
+                    {
+                        Name = "Topright-aligned metadata",
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
+                        AutoSizeAxes = Axes.Both,
+                        Shear = wedged_container_shear,
+                        Spacing = new Vector2(0f, 5f),
+                        Children = new Drawable[]
+                        {
+                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                Alpha = 0f,
+                            },
+                            new BeatmapSetOnlineStatusPill
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                TextSize = 11,
+                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
+                                Status = beatmapInfo.Status,
+                                Alpha = string.IsNullOrEmpty(beatmapInfo.DifficultyName) ? 0 : 1
+                            }
+                        }
+                    },
+                    new FillFlowContainer
+                    {
+                        Name = "Centre-aligned metadata",
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.TopLeft,
+                        Y = -7,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding { Left = 25, Right = shear_width },
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Children = new Drawable[]
+                        {
+                            TitleLabel = new OsuSpriteText
+                            {
+                                Current = { BindTarget = titleBinding },
+                                Font = OsuFont.GetFont(size: 28, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                                Truncate = true,
+                            },
+                            ArtistLabel = new OsuSpriteText
+                            {
+                                Current = { BindTarget = artistBinding },
+                                Font = OsuFont.GetFont(size: 17, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                                Truncate = true,
+                            },
+                            MapperContainer = new FillFlowContainer
+                            {
+                                Margin = new MarginPadding { Top = 10 },
+                                Direction = FillDirection.Horizontal,
+                                AutoSizeAxes = Axes.Both,
+                                Child = getMapper(metadata),
+                            }
+                        }
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                starRatingDisplay.DisplayedStars.BindValueChanged(s =>
+                {
+                    difficultyColourBar.Colour = colours.ForStarDifficulty(s.NewValue);
+                }, true);
+
+                starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+                starDifficulty.BindValueChanged(s =>
+                {
+                    starRatingDisplay.Current.Value = s.NewValue ?? default;
+
+                    // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
+                    if (!starRatingDisplay.IsPresent)
+                        starRatingDisplay.FinishTransforms(true);
+
+                    starRatingDisplay.FadeIn(transition_duration);
+                });
+
+                mods.BindValueChanged(m =>
+                {
+                    settingChangeTracker?.Dispose();
+
+                    settingChangeTracker = new ModSettingChangeTracker(m.NewValue);
+                }, true);
+            }
+
+            private Drawable getMapper(BeatmapMetadata metadata)
+            {
+                if (string.IsNullOrEmpty(metadata.Author.Username))
+                    return Empty();
+
+                return new LinkFlowContainer(s =>
+                {
+                    s.Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 15);
+                }).With(d =>
+                {
+                    d.AutoSizeAxes = Axes.Both;
+                    d.AddText("mapped by ");
+                    d.AddUserLink(metadata.Author);
+                });
+            }
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                settingChangeTracker?.Dispose();
+                cancellationSource?.Cancel();
+            }
+        }
+    }
+}

From c646f8479b35cc7d66b1075ad5c5ba8ab46434ad Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 7 Jan 2023 23:53:19 +0100
Subject: [PATCH 0002/2296] Move stardifficulty logic to main BeatmapInfoWedge
 class instead of text subclass ( for use by background star rating colour bar
 )

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 4d1a2133fd..104fa8787b 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -37,10 +37,16 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
+        [Resolved]
+        private BeatmapDifficultyCache difficultyCache { get; set; }
+
         protected Container DisplayedContent { get; private set; }
 
         protected WedgeInfoText Info { get; private set; }
 
+        private IBindable<StarDifficulty?> starDifficulty;
+        private CancellationTokenSource cancellationSource;
+
         public BeatmapInfoWedgeV2()
         {
             Shear = wedged_container_shear;
@@ -98,6 +104,19 @@ namespace osu.Game.Screens.Select
 
         private Container loadingInfo;
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            cancellationSource?.Cancel();
+        }
+
         private void updateDisplay()
         {
             Scheduler.AddOnce(perform);
@@ -127,7 +146,7 @@ namespace osu.Game.Screens.Select
                     Children = new Drawable[]
                     {
                         new BeatmapInfoWedgeBackground(beatmap),
-                        Info = new WedgeInfoText(beatmap),
+                        Info = new WedgeInfoText(beatmap, starDifficulty),
                     }
                 }, loaded =>
                 {
@@ -154,26 +173,22 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString artistBinding;
 
             private readonly WorkingBeatmap working;
+            private readonly IBindable<StarDifficulty?> starDifficulty;
 
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
-            [Resolved]
-            private BeatmapDifficultyCache difficultyCache { get; set; }
-
             [Resolved]
             private OsuColour colours { get; set; }
 
             private ModSettingChangeTracker settingChangeTracker;
 
-            public WedgeInfoText(WorkingBeatmap working)
+            public WedgeInfoText(WorkingBeatmap working, IBindable<StarDifficulty?> starDifficulty)
             {
                 this.working = working;
+                this.starDifficulty = starDifficulty;
             }
 
-            private CancellationTokenSource cancellationSource;
-            private IBindable<StarDifficulty?> starDifficulty;
-
             [BackgroundDependencyLoader]
             private void load(LocalisationManager localisation)
             {
@@ -309,7 +324,6 @@ namespace osu.Game.Screens.Select
                     difficultyColourBar.Colour = colours.ForStarDifficulty(s.NewValue);
                 }, true);
 
-                starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
@@ -349,7 +363,6 @@ namespace osu.Game.Screens.Select
             {
                 base.Dispose(isDisposing);
                 settingChangeTracker?.Dispose();
-                cancellationSource?.Cancel();
             }
         }
     }

From 0199c19f74705c2d5c0dd10f3c61c0c8325ef224 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 8 Jan 2023 01:24:47 +0100
Subject: [PATCH 0003/2296] Add a test scene and move colour bar to back and
 adjust positioning of it

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 187 ++++++++++++++++++
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 131 +++---------
 2 files changed, 217 insertions(+), 101 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
new file mode 100644
index 0000000000..98e9d803ca
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -0,0 +1,187 @@
+// 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 JetBrains.Annotations;
+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.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Screens.Select;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    [TestFixture]
+    public partial class TestSceneBeatmapInfoWedgeV2 : OsuTestScene
+    {
+        private RulesetStore rulesets;
+        private TestBeatmapInfoWedgeV2 infoWedge;
+        private readonly List<IBeatmap> beatmaps = new List<IBeatmap>();
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            this.rulesets = rulesets;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Add(infoWedge = new TestBeatmapInfoWedgeV2
+            {
+                Size = new Vector2(0.6f, 120),
+                RelativeSizeAxes = Axes.X,
+                Margin = new MarginPadding { Top = 20 }
+            });
+
+            AddStep("show", () => infoWedge.Show());
+
+            selectBeatmap(Beatmap.Value.Beatmap);
+
+            AddWaitStep("wait for select", 3);
+
+            AddStep("hide", () => { infoWedge.Hide(); });
+
+            AddWaitStep("wait for hide", 3);
+
+            AddStep("show", () => { infoWedge.Show(); });
+
+            AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
+            {
+                foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
+                    hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
+            });
+
+            foreach (var rulesetInfo in rulesets.AvailableRulesets)
+            {
+                var instance = rulesetInfo.CreateInstance();
+                var testBeatmap = createTestBeatmap(rulesetInfo);
+
+                beatmaps.Add(testBeatmap);
+
+                setRuleset(rulesetInfo);
+
+                selectBeatmap(testBeatmap);
+
+                testBeatmapLabels(instance);
+            }
+        }
+
+        private void testBeatmapLabels(Ruleset ruleset)
+        {
+            AddAssert("check title", () => infoWedge.Info.TitleLabel.Current.Value == $"{ruleset.ShortName}Title");
+            AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist");
+        }
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("reset mods", () => SelectedMods.SetDefault());
+        }
+
+        [Test]
+        public void TestTruncation()
+        {
+            selectBeatmap(createLongMetadata());
+        }
+
+        private void setRuleset(RulesetInfo rulesetInfo)
+        {
+            Container containerBefore = null;
+
+            AddStep("set ruleset", () =>
+            {
+                // wedge content is only refreshed if the ruleset changes, so only wait for load in that case.
+                if (!rulesetInfo.Equals(Ruleset.Value))
+                    containerBefore = infoWedge.DisplayedContent;
+
+                Ruleset.Value = rulesetInfo;
+            });
+
+            AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);
+        }
+
+        private void selectBeatmap([CanBeNull] IBeatmap b)
+        {
+            Container containerBefore = null;
+
+            AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
+            {
+                containerBefore = infoWedge.DisplayedContent;
+                infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
+            });
+
+            AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);
+        }
+
+        private IBeatmap createTestBeatmap(RulesetInfo ruleset)
+        {
+            List<HitObject> objects = new List<HitObject>();
+            for (double i = 0; i < 50000; i += 1000)
+                objects.Add(new TestHitObject { StartTime = i });
+
+            return new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Author = { Username = $"{ruleset.ShortName}Author" },
+                        Artist = $"{ruleset.ShortName}Artist",
+                        Source = $"{ruleset.ShortName}Source",
+                        Title = $"{ruleset.ShortName}Title"
+                    },
+                    Ruleset = ruleset,
+                    StarRating = 6,
+                    DifficultyName = $"{ruleset.ShortName}Version",
+                    Difficulty = new BeatmapDifficulty()
+                },
+                HitObjects = objects
+            };
+        }
+
+        private IBeatmap createLongMetadata()
+        {
+            return new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Author = { Username = "WWWWWWWWWWWWWWW" },
+                        Artist = "Verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Artist",
+                        Source = "Verrrrry long Source",
+                        Title = "Verrrrry long Title"
+                    },
+                    DifficultyName = "Verrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Version",
+                    Status = BeatmapOnlineStatus.Graveyard,
+                },
+            };
+        }
+
+        private partial class TestBeatmapInfoWedgeV2 : BeatmapInfoWedgeV2
+        {
+            public new Container DisplayedContent => base.DisplayedContent;
+
+            public new WedgeInfoText Info => base.Info;
+        }
+
+        private class TestHitObject : ConvertHitObject, IHasPosition
+        {
+            public float X => 0;
+            public float Y => 0;
+            public Vector2 Position { get; } = Vector2.Zero;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 104fa8787b..5583ad11f7 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using osuTK;
-using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -16,18 +15,16 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select
 {
+    [Cached]
     public partial class BeatmapInfoWedgeV2 : VisibilityContainer
     {
-        public const float BORDER_THICKNESS = 2.5f;
         private const float shear_width = 36.75f;
 
         private const float transition_duration = 250;
@@ -44,22 +41,25 @@ namespace osu.Game.Screens.Select
 
         protected WedgeInfoText Info { get; private set; }
 
-        private IBindable<StarDifficulty?> starDifficulty;
+        private IBindable<StarDifficulty?> starDifficulty = new Bindable<StarDifficulty?>();
         private CancellationTokenSource cancellationSource;
 
+        private readonly Container difficultyColourBar;
+
         public BeatmapInfoWedgeV2()
         {
+            CornerRadius = 10;
             Shear = wedged_container_shear;
             Masking = true;
-            BorderColour = new Color4(221, 255, 255, 255);
-            BorderThickness = BORDER_THICKNESS;
             Alpha = 0;
-            EdgeEffect = new EdgeEffectParameters
+            Child = difficultyColourBar = new Container
             {
-                Type = EdgeEffectType.Glow,
-                Colour = new Color4(130, 204, 255, 150),
-                Radius = 20,
-                Roundness = 15,
+                Depth = float.MaxValue,
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                RelativeSizeAxes = Axes.Y,
+                Width = 40,
+                Child = new Box { RelativeSizeAxes = Axes.Both }
             };
         }
 
@@ -95,6 +95,7 @@ namespace osu.Game.Screens.Select
                 if (beatmap == value) return;
 
                 beatmap = value;
+                starDifficulty = difficultyCache.GetBindableDifficulty(value.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
 
                 updateDisplay();
             }
@@ -104,12 +105,6 @@ namespace osu.Game.Screens.Select
 
         private Container loadingInfo;
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -140,13 +135,15 @@ namespace osu.Game.Screens.Select
 
                 LoadComponentAsync(loadingInfo = new Container
                 {
+                    Masking = true,
+                    X = -30,
+                    CornerRadius = 10,
                     RelativeSizeAxes = Axes.Both,
-                    Shear = -Shear,
                     Depth = DisplayedContent?.Depth + 1 ?? 0,
                     Children = new Drawable[]
                     {
-                        new BeatmapInfoWedgeBackground(beatmap),
-                        Info = new WedgeInfoText(beatmap, starDifficulty),
+                        new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
+                        Info = new WedgeInfoText(beatmap, starDifficulty) { Shear = -Shear }
                     }
                 }, loaded =>
                 {
@@ -161,12 +158,9 @@ namespace osu.Game.Screens.Select
 
         public partial class WedgeInfoText : Container
         {
-            public OsuSpriteText VersionLabel { get; private set; }
             public OsuSpriteText TitleLabel { get; private set; }
             public OsuSpriteText ArtistLabel { get; private set; }
-            public FillFlowContainer MapperContainer { get; private set; }
 
-            private Container difficultyColourBar;
             private StarRatingDisplay starRatingDisplay;
 
             private ILocalisedBindableString titleBinding;
@@ -178,6 +172,9 @@ namespace osu.Game.Screens.Select
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
+            [Resolved]
+            private BeatmapInfoWedgeV2 wedge { get; set; }
+
             [Resolved]
             private OsuColour colours { get; set; }
 
@@ -200,51 +197,8 @@ namespace osu.Game.Screens.Select
                 titleBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
                 artistBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
 
-                const float top_height = 0.7f;
-
                 Children = new Drawable[]
                 {
-                    difficultyColourBar = new Container
-                    {
-                        RelativeSizeAxes = Axes.Y,
-                        Width = 20f,
-                        Children = new[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Width = top_height,
-                            },
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                RelativePositionAxes = Axes.Both,
-                                Alpha = 0.5f,
-                                X = top_height,
-                                Width = 1 - top_height,
-                            }
-                        }
-                    },
-                    new FillFlowContainer
-                    {
-                        Name = "Topleft-aligned metadata",
-                        Anchor = Anchor.TopLeft,
-                        Origin = Anchor.TopLeft,
-                        Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Top = 10, Left = 25, Right = shear_width * 2.5f },
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Children = new Drawable[]
-                        {
-                            VersionLabel = new OsuSpriteText
-                            {
-                                Text = beatmapInfo.DifficultyName,
-                                Font = OsuFont.GetFont(size: 24, italics: true),
-                                RelativeSizeAxes = Axes.X,
-                                Truncate = true,
-                            },
-                        }
-                    },
                     new FillFlowContainer
                     {
                         Name = "Topright-aligned metadata",
@@ -279,12 +233,10 @@ namespace osu.Game.Screens.Select
                     },
                     new FillFlowContainer
                     {
-                        Name = "Centre-aligned metadata",
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.TopLeft,
-                        Y = -7,
+                        Name = "Top-left aligned metadata",
                         Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Left = 25, Right = shear_width },
+                        Position = new Vector2(50, 12),
+                        Width = .8f,
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
@@ -292,23 +244,17 @@ namespace osu.Game.Screens.Select
                             TitleLabel = new OsuSpriteText
                             {
                                 Current = { BindTarget = titleBinding },
-                                Font = OsuFont.GetFont(size: 28, italics: true),
+                                Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true,
+                                Truncate = true
                             },
                             ArtistLabel = new OsuSpriteText
                             {
                                 Current = { BindTarget = artistBinding },
-                                Font = OsuFont.GetFont(size: 17, italics: true),
+                                //Not sure if this should be semi bold or medium
+                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true,
-                            },
-                            MapperContainer = new FillFlowContainer
-                            {
-                                Margin = new MarginPadding { Top = 10 },
-                                Direction = FillDirection.Horizontal,
-                                AutoSizeAxes = Axes.Both,
-                                Child = getMapper(metadata),
+                                Truncate = true
                             }
                         }
                     }
@@ -321,9 +267,8 @@ namespace osu.Game.Screens.Select
 
                 starRatingDisplay.DisplayedStars.BindValueChanged(s =>
                 {
-                    difficultyColourBar.Colour = colours.ForStarDifficulty(s.NewValue);
+                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                 }, true);
-
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
@@ -343,22 +288,6 @@ namespace osu.Game.Screens.Select
                 }, true);
             }
 
-            private Drawable getMapper(BeatmapMetadata metadata)
-            {
-                if (string.IsNullOrEmpty(metadata.Author.Username))
-                    return Empty();
-
-                return new LinkFlowContainer(s =>
-                {
-                    s.Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 15);
-                }).With(d =>
-                {
-                    d.AutoSizeAxes = Axes.Both;
-                    d.AddText("mapped by ");
-                    d.AddUserLink(metadata.Author);
-                });
-            }
-
             protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);

From 61caabaa8ee4002c7d96859f0937b3fb8b997c82 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 8 Jan 2023 01:47:22 +0100
Subject: [PATCH 0004/2296] Add coloured star counter

---
 .../Graphics/UserInterface/StarCounter.cs     |  6 ++-
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 51 +++++++++++++++----
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index d7d088d798..7adb482188 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -32,6 +32,11 @@ namespace osu.Game.Graphics.UserInterface
 
         private const float star_spacing = 4;
 
+        public virtual FillDirection Direction
+        {
+            set => stars.Direction = value;
+        }
+
         private float current;
 
         /// <summary>
@@ -66,7 +71,6 @@ namespace osu.Game.Graphics.UserInterface
                 stars = new FillFlowContainer<Star>
                 {
                     AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(star_spacing),
                     ChildrenEnumerable = Enumerable.Range(0, StarCount).Select(_ => CreateStar())
                 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 5583ad11f7..07fcb42fff 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -3,7 +3,9 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using osuTK;
 using osu.Framework.Allocation;
@@ -17,6 +19,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 
@@ -25,11 +28,12 @@ namespace osu.Game.Screens.Select
     [Cached]
     public partial class BeatmapInfoWedgeV2 : VisibilityContainer
     {
-        private const float shear_width = 36.75f;
+        private const float shear_width = 21;
+        private const int wedge_height = 120;
 
         private const float transition_duration = 250;
 
-        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGE_HEIGHT, 0);
+        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / wedge_height, 0);
 
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
@@ -45,6 +49,7 @@ namespace osu.Game.Screens.Select
         private CancellationTokenSource cancellationSource;
 
         private readonly Container difficultyColourBar;
+        private readonly StarCounter starCounter;
 
         public BeatmapInfoWedgeV2()
         {
@@ -52,14 +57,27 @@ namespace osu.Game.Screens.Select
             Shear = wedged_container_shear;
             Masking = true;
             Alpha = 0;
-            Child = difficultyColourBar = new Container
+
+            Children = new Drawable[]
             {
-                Depth = float.MaxValue,
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                RelativeSizeAxes = Axes.Y,
-                Width = 40,
-                Child = new Box { RelativeSizeAxes = Axes.Both }
+                difficultyColourBar = new Container
+                {
+                    Depth = float.MaxValue,
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 40,
+                    Child = new Box { RelativeSizeAxes = Axes.Both }
+                },
+                starCounter = new StarCounter
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(0.4f),
+                    Shear = -wedged_container_shear,
+                    X = -15,
+                    Direction = FillDirection.Vertical
+                }
             };
         }
 
@@ -67,6 +85,15 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             ruleset.BindValueChanged(_ => updateDisplay());
+
+            float starAngle = (float)(Math.Atan(shear_width / wedge_height) * (180 / Math.PI));
+
+            //Applying the rotation directly to the StarCounter distorts the stars, hence it is applied to the child container
+            starCounter.Children.First().Rotation = starAngle;
+
+            //Makes sure the stars center themselves properly in the colour bar
+            starCounter.Children.First().Anchor = Anchor.Centre;
+            starCounter.Children.First().Origin = Anchor.Centre;
         }
 
         private const double animation_duration = 800;
@@ -267,8 +294,12 @@ namespace osu.Game.Screens.Select
 
                 starRatingDisplay.DisplayedStars.BindValueChanged(s =>
                 {
-                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
+                    wedge.starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
+                    wedge.starCounter.Current = (float)s.NewValue;
+
+                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue), 750, Easing.OutQuint);
                 }, true);
+
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;

From 1698272eb88b3937228783d3df8d04db993d5da5 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 8 Jan 2023 12:03:02 +0100
Subject: [PATCH 0005/2296] Simplify passing data from BeatmapInfoWedgeV2.cs to
 subclass wedgeinfotext

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 07fcb42fff..1056d9478b 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -60,17 +60,22 @@ namespace osu.Game.Screens.Select
 
             Children = new Drawable[]
             {
+                //These elements can't be grouped with the rest of the content, due to being present either outside or under the backgrounds area
                 difficultyColourBar = new Container
                 {
+                    Colour = Colour4.Transparent,
                     Depth = float.MaxValue,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Y,
+
+                    //By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
                     Width = 40,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
                 starCounter = new StarCounter
                 {
+                    Colour = Colour4.Transparent,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.Centre,
                     Scale = new Vector2(0.4f),
@@ -170,7 +175,7 @@ namespace osu.Game.Screens.Select
                     Children = new Drawable[]
                     {
                         new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
-                        Info = new WedgeInfoText(beatmap, starDifficulty) { Shear = -Shear }
+                        Info = new WedgeInfoText { Shear = -Shear }
                     }
                 }, loaded =>
                 {
@@ -193,9 +198,6 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
 
-            private readonly WorkingBeatmap working;
-            private readonly IBindable<StarDifficulty?> starDifficulty;
-
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
@@ -207,17 +209,11 @@ namespace osu.Game.Screens.Select
 
             private ModSettingChangeTracker settingChangeTracker;
 
-            public WedgeInfoText(WorkingBeatmap working, IBindable<StarDifficulty?> starDifficulty)
-            {
-                this.working = working;
-                this.starDifficulty = starDifficulty;
-            }
-
             [BackgroundDependencyLoader]
             private void load(LocalisationManager localisation)
             {
-                var beatmapInfo = working.BeatmapInfo;
-                var metadata = beatmapInfo.Metadata;
+                var beatmapInfo = wedge.Beatmap.BeatmapInfo;
+                var metadata = wedge.beatmap.Metadata;
 
                 RelativeSizeAxes = Axes.Both;
 
@@ -262,7 +258,7 @@ namespace osu.Game.Screens.Select
                     {
                         Name = "Top-left aligned metadata",
                         Direction = FillDirection.Vertical,
-                        Position = new Vector2(50, 12),
+                        Position = new Vector2(80, 12),
                         Width = .8f,
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
@@ -270,6 +266,7 @@ namespace osu.Game.Screens.Select
                         {
                             TitleLabel = new OsuSpriteText
                             {
+                                Shadow = true,
                                 Current = { BindTarget = titleBinding },
                                 Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
@@ -277,6 +274,7 @@ namespace osu.Game.Screens.Select
                             },
                             ArtistLabel = new OsuSpriteText
                             {
+                                Shadow = true,
                                 Current = { BindTarget = artistBinding },
                                 //Not sure if this should be semi bold or medium
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
@@ -297,10 +295,10 @@ namespace osu.Game.Screens.Select
                     wedge.starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
                     wedge.starCounter.Current = (float)s.NewValue;
 
-                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue), 750, Easing.OutQuint);
+                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                 }, true);
 
-                starDifficulty.BindValueChanged(s =>
+                wedge.starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
 

From 65c30d2c2e0a322d0d75003905fd44b4e5969d32 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 8 Jan 2023 12:56:32 +0100
Subject: [PATCH 0006/2296] Remove nullability disabling

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 62 +++++++++----------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 1056d9478b..da7cfc6613 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.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,17 +34,11 @@ namespace osu.Game.Screens.Select
         private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / wedge_height, 0);
 
         [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
-        [Resolved]
-        private BeatmapDifficultyCache difficultyCache { get; set; }
+        protected Container? DisplayedContent { get; private set; }
 
-        protected Container DisplayedContent { get; private set; }
-
-        protected WedgeInfoText Info { get; private set; }
-
-        private IBindable<StarDifficulty?> starDifficulty = new Bindable<StarDifficulty?>();
-        private CancellationTokenSource cancellationSource;
+        protected WedgeInfoText? Info { get; private set; }
 
         private readonly Container difficultyColourBar;
         private readonly StarCounter starCounter;
@@ -117,9 +109,9 @@ namespace osu.Game.Screens.Select
             this.FadeOut(transition_duration * 2, Easing.In);
         }
 
-        private WorkingBeatmap beatmap;
+        private WorkingBeatmap? beatmap;
 
-        public WorkingBeatmap Beatmap
+        public WorkingBeatmap? Beatmap
         {
             get => beatmap;
             set
@@ -127,7 +119,6 @@ namespace osu.Game.Screens.Select
                 if (beatmap == value) return;
 
                 beatmap = value;
-                starDifficulty = difficultyCache.GetBindableDifficulty(value.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
 
                 updateDisplay();
             }
@@ -135,14 +126,7 @@ namespace osu.Game.Screens.Select
 
         public override bool IsPresent => base.IsPresent || DisplayedContent == null; // Visibility is updated in the LoadComponentAsync callback
 
-        private Container loadingInfo;
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            cancellationSource?.Cancel();
-        }
+        private Container? loadingInfo;
 
         private void updateDisplay()
         {
@@ -190,30 +174,36 @@ namespace osu.Game.Screens.Select
 
         public partial class WedgeInfoText : Container
         {
-            public OsuSpriteText TitleLabel { get; private set; }
-            public OsuSpriteText ArtistLabel { get; private set; }
+            public OsuSpriteText TitleLabel { get; private set; } = null!;
+            public OsuSpriteText ArtistLabel { get; private set; } = null!;
 
-            private StarRatingDisplay starRatingDisplay;
+            private StarRatingDisplay starRatingDisplay = null!;
 
-            private ILocalisedBindableString titleBinding;
-            private ILocalisedBindableString artistBinding;
+            private ILocalisedBindableString titleBinding = null!;
+            private ILocalisedBindableString artistBinding = null!;
 
             [Resolved]
-            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
             [Resolved]
-            private BeatmapInfoWedgeV2 wedge { get; set; }
+            private BeatmapInfoWedgeV2 wedge { get; set; } = null!;
 
             [Resolved]
-            private OsuColour colours { get; set; }
+            private OsuColour colours { get; set; } = null!;
 
-            private ModSettingChangeTracker settingChangeTracker;
+            [Resolved]
+            private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
+
+            private ModSettingChangeTracker? settingChangeTracker;
+
+            private IBindable<StarDifficulty?>? starDifficulty;
+            private CancellationTokenSource? cancellationSource;
 
             [BackgroundDependencyLoader]
             private void load(LocalisationManager localisation)
             {
-                var beatmapInfo = wedge.Beatmap.BeatmapInfo;
-                var metadata = wedge.beatmap.Metadata;
+                var beatmapInfo = wedge.Beatmap!.BeatmapInfo;
+                var metadata = wedge.beatmap!.Metadata;
 
                 RelativeSizeAxes = Axes.Both;
 
@@ -274,6 +264,7 @@ namespace osu.Game.Screens.Select
                             },
                             ArtistLabel = new OsuSpriteText
                             {
+                                //figma design has a diffused shadow, instead of the solid one present here.
                                 Shadow = true,
                                 Current = { BindTarget = artistBinding },
                                 //Not sure if this should be semi bold or medium
@@ -298,7 +289,8 @@ namespace osu.Game.Screens.Select
                     wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                 }, true);
 
-                wedge.starDifficulty.BindValueChanged(s =>
+                starDifficulty = difficultyCache.GetBindableDifficulty(wedge.beatmap!.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+                starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
 
@@ -320,6 +312,8 @@ namespace osu.Game.Screens.Select
             protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);
+
+                cancellationSource?.Cancel();
                 settingChangeTracker?.Dispose();
             }
         }

From 9afdfd7f067c786f236748c84e7028e0c294ff76 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sun, 8 Jan 2023 15:42:42 +0100
Subject: [PATCH 0007/2296] small tweaks, container edge - effect addition..

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index da7cfc6613..ced6931e1f 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
@@ -27,9 +28,9 @@ namespace osu.Game.Screens.Select
     public partial class BeatmapInfoWedgeV2 : VisibilityContainer
     {
         private const float shear_width = 21;
-        private const int wedge_height = 120;
-
+        private const float wedge_height = 120;
         private const float transition_duration = 250;
+        private const float corner_radius = 10;
 
         private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / wedge_height, 0);
 
@@ -45,14 +46,20 @@ namespace osu.Game.Screens.Select
 
         public BeatmapInfoWedgeV2()
         {
-            CornerRadius = 10;
             Shear = wedged_container_shear;
             Masking = true;
-            Alpha = 0;
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Colour = Colour4.Black.Opacity(.25f),
+                Type = EdgeEffectType.Shadow,
+                Radius = corner_radius,
+                Roundness = corner_radius
+            };
+            CornerRadius = corner_radius;
 
             Children = new Drawable[]
             {
-                //These elements can't be grouped with the rest of the content, due to being present either outside or under the backgrounds area
+                // These elements can't be grouped with the rest of the content, due to being present either outside or under the backgrounds area
                 difficultyColourBar = new Container
                 {
                     Colour = Colour4.Transparent,
@@ -61,7 +68,7 @@ namespace osu.Game.Screens.Select
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Y,
 
-                    //By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
+                    // By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
                     Width = 40,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
@@ -70,7 +77,7 @@ namespace osu.Game.Screens.Select
                     Colour = Colour4.Transparent,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.Centre,
-                    Scale = new Vector2(0.4f),
+                    Scale = new Vector2(0.35f),
                     Shear = -wedged_container_shear,
                     X = -15,
                     Direction = FillDirection.Vertical
@@ -85,10 +92,10 @@ namespace osu.Game.Screens.Select
 
             float starAngle = (float)(Math.Atan(shear_width / wedge_height) * (180 / Math.PI));
 
-            //Applying the rotation directly to the StarCounter distorts the stars, hence it is applied to the child container
+            // Applying the rotation directly to the StarCounter distorts the stars, hence it is applied to the child container
             starCounter.Children.First().Rotation = starAngle;
 
-            //Makes sure the stars center themselves properly in the colour bar
+            // Makes sure the stars center themselves properly in the colour bar
             starCounter.Children.First().Anchor = Anchor.Centre;
             starCounter.Children.First().Origin = Anchor.Centre;
         }
@@ -153,13 +160,13 @@ namespace osu.Game.Screens.Select
                 {
                     Masking = true,
                     X = -30,
-                    CornerRadius = 10,
+                    CornerRadius = corner_radius,
                     RelativeSizeAxes = Axes.Both,
                     Depth = DisplayedContent?.Depth + 1 ?? 0,
                     Children = new Drawable[]
                     {
                         new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
-                        Info = new WedgeInfoText { Shear = -Shear }
+                        Info = new WedgeInfoText(beatmap) { Shear = -Shear }
                     }
                 }, loaded =>
                 {
@@ -182,11 +189,10 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding = null!;
             private ILocalisedBindableString artistBinding = null!;
 
-            [Resolved]
-            private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
+            private readonly WorkingBeatmap working;
 
             [Resolved]
-            private BeatmapInfoWedgeV2 wedge { get; set; } = null!;
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
             [Resolved]
             private OsuColour colours { get; set; } = null!;
@@ -194,16 +200,24 @@ namespace osu.Game.Screens.Select
             [Resolved]
             private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
+            [Resolved]
+            private BeatmapInfoWedgeV2 wedge { get; set; } = null!;
+
             private ModSettingChangeTracker? settingChangeTracker;
 
             private IBindable<StarDifficulty?>? starDifficulty;
             private CancellationTokenSource? cancellationSource;
 
+            public WedgeInfoText(WorkingBeatmap working)
+            {
+                this.working = working;
+            }
+
             [BackgroundDependencyLoader]
             private void load(LocalisationManager localisation)
             {
-                var beatmapInfo = wedge.Beatmap!.BeatmapInfo;
-                var metadata = wedge.beatmap!.Metadata;
+                var beatmapInfo = working.BeatmapInfo;
+                var metadata = working.Metadata;
 
                 RelativeSizeAxes = Axes.Both;
 
@@ -249,7 +263,7 @@ namespace osu.Game.Screens.Select
                         Name = "Top-left aligned metadata",
                         Direction = FillDirection.Vertical,
                         Position = new Vector2(80, 12),
-                        Width = .8f,
+                        Width = .7f,
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
@@ -289,7 +303,7 @@ namespace osu.Game.Screens.Select
                     wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                 }, true);
 
-                starDifficulty = difficultyCache.GetBindableDifficulty(wedge.beatmap!.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+                starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;

From 2a82f618ed9a69dd28613dfc8f04189ceecd702f Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 10 Jan 2023 17:34:47 +0100
Subject: [PATCH 0008/2296] Add TODO for text margin const, added pertinent
 comments to known "issues"

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index ced6931e1f..ce07a59a0c 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -32,6 +32,9 @@ namespace osu.Game.Screens.Select
         private const float transition_duration = 250;
         private const float corner_radius = 10;
 
+        /// Todo: move this const out to song select when more new design elements are implemented for the beatmap details area, since it applies to text alignment of various elements
+        private const float text_margin = 62;
+
         private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / wedge_height, 0);
 
         [Resolved]
@@ -159,18 +162,21 @@ namespace osu.Game.Screens.Select
                 LoadComponentAsync(loadingInfo = new Container
                 {
                     Masking = true,
+                    // We offset this by the portion of the colour bar underneath we wish to show
                     X = -30,
                     CornerRadius = corner_radius,
                     RelativeSizeAxes = Axes.Both,
                     Depth = DisplayedContent?.Depth + 1 ?? 0,
                     Children = new Drawable[]
                     {
+                        // TODO: New wedge design uses a coloured horizontal gradient for its background, however this lacks implementation information in the figma draft.
+                        // pending https://www.figma.com/file/DXKwqZhD5yyb1igc3mKo1P?node-id=2980:3361#340801912 being answered.
                         new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
                         Info = new WedgeInfoText(beatmap) { Shear = -Shear }
                     }
                 }, loaded =>
                 {
-                    // ensure we are the most recent loaded wedge.
+                    // Ensure we are the most recent loaded wedge.
                     if (loaded != loadingInfo) return;
 
                     removeOldInfo();
@@ -262,7 +268,7 @@ namespace osu.Game.Screens.Select
                     {
                         Name = "Top-left aligned metadata",
                         Direction = FillDirection.Vertical,
-                        Position = new Vector2(80, 12),
+                        Position = new Vector2(text_margin + shear_width, 12),
                         Width = .7f,
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
@@ -278,10 +284,10 @@ namespace osu.Game.Screens.Select
                             },
                             ArtistLabel = new OsuSpriteText
                             {
-                                //figma design has a diffused shadow, instead of the solid one present here.
+                                // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
                                 Shadow = true,
                                 Current = { BindTarget = artistBinding },
-                                //Not sure if this should be semi bold or medium
+                                // Not sure if this should be semi bold or medium
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
                                 Truncate = true
@@ -297,8 +303,8 @@ namespace osu.Game.Screens.Select
 
                 starRatingDisplay.DisplayedStars.BindValueChanged(s =>
                 {
-                    wedge.starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
                     wedge.starCounter.Current = (float)s.NewValue;
+                    wedge.starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
 
                     wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                 }, true);

From 8bfe24ced0c9163c1e1017b76d1f1669d57a160c Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 10 Jan 2023 17:49:33 +0100
Subject: [PATCH 0009/2296] Remove nullable disable in test.

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 98e9d803ca..193acc8a7b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.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.Collections.Generic;
-using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -24,8 +21,8 @@ namespace osu.Game.Tests.Visual.SongSelect
     [TestFixture]
     public partial class TestSceneBeatmapInfoWedgeV2 : OsuTestScene
     {
-        private RulesetStore rulesets;
-        private TestBeatmapInfoWedgeV2 infoWedge;
+        private RulesetStore rulesets = null!;
+        private TestBeatmapInfoWedgeV2 infoWedge = null!;
         private readonly List<IBeatmap> beatmaps = new List<IBeatmap>();
 
         [BackgroundDependencyLoader]
@@ -80,8 +77,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void testBeatmapLabels(Ruleset ruleset)
         {
-            AddAssert("check title", () => infoWedge.Info.TitleLabel.Current.Value == $"{ruleset.ShortName}Title");
-            AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist");
+            AddAssert("check title", () => infoWedge.Info!.TitleLabel.Current.Value == $"{ruleset.ShortName}Title");
+            AddAssert("check artist", () => infoWedge.Info!.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist");
         }
 
         [SetUpSteps]
@@ -98,7 +95,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void setRuleset(RulesetInfo rulesetInfo)
         {
-            Container containerBefore = null;
+            Container? containerBefore = null;
 
             AddStep("set ruleset", () =>
             {
@@ -112,9 +109,9 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);
         }
 
-        private void selectBeatmap([CanBeNull] IBeatmap b)
+        private void selectBeatmap(IBeatmap? b)
         {
-            Container containerBefore = null;
+            Container? containerBefore = null;
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
@@ -172,9 +169,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private partial class TestBeatmapInfoWedgeV2 : BeatmapInfoWedgeV2
         {
-            public new Container DisplayedContent => base.DisplayedContent;
+            public new Container? DisplayedContent => base.DisplayedContent;
 
-            public new WedgeInfoText Info => base.Info;
+            public new WedgeInfoText? Info => base.Info;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition

From 880428046a17606b200750c6f8bdec254fd7e4e1 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 10 Jan 2023 18:03:28 +0100
Subject: [PATCH 0010/2296] Fix margins on top right aligned elements.

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index ce07a59a0c..1497bed121 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -238,7 +238,7 @@ namespace osu.Game.Screens.Select
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
                         Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
+                        Padding = new MarginPadding { Top = 3, Right = 8 },
                         AutoSizeAxes = Axes.Both,
                         Shear = wedged_container_shear,
                         Spacing = new Vector2(0f, 5f),

From 7510201804aab33e90d805b8a34b9883f9ff390f Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 16 Jan 2023 22:24:21 +0100
Subject: [PATCH 0011/2296] Add back null beatmap test

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 193acc8a7b..a2935fb218 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -2,6 +2,7 @@
 // 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;
@@ -93,6 +94,15 @@ namespace osu.Game.Tests.Visual.SongSelect
             selectBeatmap(createLongMetadata());
         }
 
+        [Test]
+        public void TestNullBeatmap()
+        {
+            selectBeatmap(null);
+            AddAssert("check default title", () => infoWedge.Info!.TitleLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Title);
+            AddAssert("check default artist", () => infoWedge.Info!.ArtistLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Artist);
+            AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Any());
+        }
+
         private void setRuleset(RulesetInfo rulesetInfo)
         {
             Container? containerBefore = null;

From 74b72e4ac0d6c34df51bf8d27c24d4625a9f8039 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 16 Jan 2023 22:46:18 +0100
Subject: [PATCH 0012/2296] Address issues that joehuu brought up

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs  |  2 +-
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs         | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index a2935fb218..4904e2a723 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             Add(infoWedge = new TestBeatmapInfoWedgeV2
             {
-                Size = new Vector2(0.6f, 120),
+                Width = 0.6f,
                 RelativeSizeAxes = Axes.X,
                 Margin = new MarginPadding { Top = 20 }
             });
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 1497bed121..02d640fc0d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Screens.Select
         private const float wedge_height = 120;
         private const float transition_duration = 250;
         private const float corner_radius = 10;
+        private const float colour_bar_width = 30;
 
         /// Todo: move this const out to song select when more new design elements are implemented for the beatmap details area, since it applies to text alignment of various elements
         private const float text_margin = 62;
@@ -49,6 +50,7 @@ namespace osu.Game.Screens.Select
 
         public BeatmapInfoWedgeV2()
         {
+            Height = wedge_height;
             Shear = wedged_container_shear;
             Masking = true;
             EdgeEffect = new EdgeEffectParameters
@@ -72,7 +74,7 @@ namespace osu.Game.Screens.Select
                     RelativeSizeAxes = Axes.Y,
 
                     // By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
-                    Width = 40,
+                    Width = colour_bar_width + corner_radius,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
                 starCounter = new StarCounter
@@ -82,7 +84,7 @@ namespace osu.Game.Screens.Select
                     Origin = Anchor.Centre,
                     Scale = new Vector2(0.35f),
                     Shear = -wedged_container_shear,
-                    X = -15,
+                    X = -colour_bar_width / 2,
                     Direction = FillDirection.Vertical
                 }
             };
@@ -163,7 +165,7 @@ namespace osu.Game.Screens.Select
                 {
                     Masking = true,
                     // We offset this by the portion of the colour bar underneath we wish to show
-                    X = -30,
+                    X = -colour_bar_width,
                     CornerRadius = corner_radius,
                     RelativeSizeAxes = Axes.Both,
                     Depth = DisplayedContent?.Depth + 1 ?? 0,
@@ -268,8 +270,7 @@ namespace osu.Game.Screens.Select
                     {
                         Name = "Top-left aligned metadata",
                         Direction = FillDirection.Vertical,
-                        Position = new Vector2(text_margin + shear_width, 12),
-                        Width = .7f,
+                        Padding = new MarginPadding { Horizontal = text_margin + shear_width, Top = 12 },
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]

From 0ac7cd7409e1c61cc0f8df03c1fa0b780adb43da Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Wed, 18 Jan 2023 13:55:52 +0100
Subject: [PATCH 0013/2296] Expose star difficulty to wedge to allow updating
 starcounter and background colour internally.

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 02d640fc0d..d90c002953 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -24,7 +24,6 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.Select
 {
-    [Cached]
     public partial class BeatmapInfoWedgeV2 : VisibilityContainer
     {
         private const float shear_width = 21;
@@ -41,6 +40,9 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         protected Container? DisplayedContent { get; private set; }
 
         protected WedgeInfoText? Info { get; private set; }
@@ -183,6 +185,14 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     Add(DisplayedContent = loaded);
+
+                    Info.StarRatingDisplay.DisplayedStars.BindValueChanged(s =>
+                    {
+                        starCounter.Current = (float)s.NewValue;
+                        starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
+
+                        difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
+                    }, true);
                 });
             }
         }
@@ -192,7 +202,7 @@ namespace osu.Game.Screens.Select
             public OsuSpriteText TitleLabel { get; private set; } = null!;
             public OsuSpriteText ArtistLabel { get; private set; } = null!;
 
-            private StarRatingDisplay starRatingDisplay = null!;
+            public StarRatingDisplay StarRatingDisplay = null!;
 
             private ILocalisedBindableString titleBinding = null!;
             private ILocalisedBindableString artistBinding = null!;
@@ -202,15 +212,9 @@ namespace osu.Game.Screens.Select
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
-            [Resolved]
-            private OsuColour colours { get; set; } = null!;
-
             [Resolved]
             private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
-            [Resolved]
-            private BeatmapInfoWedgeV2 wedge { get; set; } = null!;
-
             private ModSettingChangeTracker? settingChangeTracker;
 
             private IBindable<StarDifficulty?>? starDifficulty;
@@ -246,7 +250,7 @@ namespace osu.Game.Screens.Select
                         Spacing = new Vector2(0f, 5f),
                         Children = new Drawable[]
                         {
-                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
+                            StarRatingDisplay = new StarRatingDisplay(default, animated: true)
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
@@ -302,24 +306,16 @@ namespace osu.Game.Screens.Select
             {
                 base.LoadComplete();
 
-                starRatingDisplay.DisplayedStars.BindValueChanged(s =>
-                {
-                    wedge.starCounter.Current = (float)s.NewValue;
-                    wedge.starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
-
-                    wedge.difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
-                }, true);
-
                 starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
                 starDifficulty.BindValueChanged(s =>
                 {
-                    starRatingDisplay.Current.Value = s.NewValue ?? default;
+                    StarRatingDisplay.Current.Value = s.NewValue ?? default;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
-                    if (!starRatingDisplay.IsPresent)
-                        starRatingDisplay.FinishTransforms(true);
+                    if (!StarRatingDisplay.IsPresent)
+                        StarRatingDisplay.FinishTransforms(true);
 
-                    starRatingDisplay.FadeIn(transition_duration);
+                    StarRatingDisplay.FadeIn(transition_duration);
                 });
 
                 mods.BindValueChanged(m =>

From 655242371b2858371c82970d9fe316eb7d26cd6d Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 23 Jan 2023 17:00:46 +0100
Subject: [PATCH 0014/2296] Buffer wedge content to avoid opacity issues when
 showing / hiding

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 66 +++++++++++--------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index d90c002953..63e414d6ad 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -49,6 +49,7 @@ namespace osu.Game.Screens.Select
 
         private readonly Container difficultyColourBar;
         private readonly StarCounter starCounter;
+        private readonly BufferedContainer bufferedContent;
 
         public BeatmapInfoWedgeV2()
         {
@@ -64,30 +65,35 @@ namespace osu.Game.Screens.Select
             };
             CornerRadius = corner_radius;
 
-            Children = new Drawable[]
+            // We want to buffer the wedge to avoid weird transparency overlaps between the colour bar and the background.
+            Child = bufferedContent = new BufferedContainer
             {
-                // These elements can't be grouped with the rest of the content, due to being present either outside or under the backgrounds area
-                difficultyColourBar = new Container
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    Colour = Colour4.Transparent,
-                    Depth = float.MaxValue,
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    RelativeSizeAxes = Axes.Y,
+                    // These elements can't be grouped with the rest of the content, due to being present either outside or under the backgrounds area
+                    difficultyColourBar = new Container
+                    {
+                        Colour = Colour4.Transparent,
+                        Depth = float.MaxValue,
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        RelativeSizeAxes = Axes.Y,
 
-                    // By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
-                    Width = colour_bar_width + corner_radius,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }
-                },
-                starCounter = new StarCounter
-                {
-                    Colour = Colour4.Transparent,
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(0.35f),
-                    Shear = -wedged_container_shear,
-                    X = -colour_bar_width / 2,
-                    Direction = FillDirection.Vertical
+                        // By limiting the width we avoid this box showing up as an outline around the drawables that are on top of it.
+                        Width = colour_bar_width + corner_radius,
+                        Child = new Box { RelativeSizeAxes = Axes.Both }
+                    },
+                    starCounter = new StarCounter
+                    {
+                        Colour = Colour4.Transparent,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(0.35f),
+                        Shear = -wedged_container_shear,
+                        X = -colour_bar_width / 2,
+                        Direction = FillDirection.Vertical
+                    }
                 }
             };
         }
@@ -184,9 +190,9 @@ namespace osu.Game.Screens.Select
                     if (loaded != loadingInfo) return;
 
                     removeOldInfo();
-                    Add(DisplayedContent = loaded);
+                    bufferedContent.Add(DisplayedContent = loaded);
 
-                    Info.StarRatingDisplay.DisplayedStars.BindValueChanged(s =>
+                    Info.DisplayedStars.BindValueChanged(s =>
                     {
                         starCounter.Current = (float)s.NewValue;
                         starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
@@ -202,13 +208,15 @@ namespace osu.Game.Screens.Select
             public OsuSpriteText TitleLabel { get; private set; } = null!;
             public OsuSpriteText ArtistLabel { get; private set; } = null!;
 
-            public StarRatingDisplay StarRatingDisplay = null!;
+            private StarRatingDisplay starRatingDisplay = null!;
 
             private ILocalisedBindableString titleBinding = null!;
             private ILocalisedBindableString artistBinding = null!;
 
             private readonly WorkingBeatmap working;
 
+            public IBindable<double> DisplayedStars => starRatingDisplay.DisplayedStars;
+
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
@@ -250,7 +258,7 @@ namespace osu.Game.Screens.Select
                         Spacing = new Vector2(0f, 5f),
                         Children = new Drawable[]
                         {
-                            StarRatingDisplay = new StarRatingDisplay(default, animated: true)
+                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
@@ -309,13 +317,13 @@ namespace osu.Game.Screens.Select
                 starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
                 starDifficulty.BindValueChanged(s =>
                 {
-                    StarRatingDisplay.Current.Value = s.NewValue ?? default;
+                    starRatingDisplay.Current.Value = s.NewValue ?? default;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
-                    if (!StarRatingDisplay.IsPresent)
-                        StarRatingDisplay.FinishTransforms(true);
+                    if (!starRatingDisplay.IsPresent)
+                        starRatingDisplay.FinishTransforms(true);
 
-                    StarRatingDisplay.FadeIn(transition_duration);
+                    starRatingDisplay.FadeIn(transition_duration);
                 });
 
                 mods.BindValueChanged(m =>

From c7d49bdc82c4ab48ab60040cdd0e161a481fdf94 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 30 Jan 2023 13:13:57 +0100
Subject: [PATCH 0015/2296] Update ```BeatmapInfoWedgeV2.cs``` animation to be
 similar to exit transition in ```SongSelect.cs``

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 63e414d6ad..6a1662fd6a 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -113,20 +113,18 @@ namespace osu.Game.Screens.Select
             starCounter.Children.First().Origin = Anchor.Centre;
         }
 
-        private const double animation_duration = 800;
+        private const double animation_duration = 600;
 
         protected override void PopIn()
         {
             this.MoveToX(0, animation_duration, Easing.OutQuint);
-            this.RotateTo(0, animation_duration, Easing.OutQuint);
-            this.FadeIn(transition_duration);
+            this.FadeIn(200, Easing.In);
         }
 
         protected override void PopOut()
         {
-            this.MoveToX(-100, animation_duration, Easing.In);
-            this.RotateTo(10, animation_duration, Easing.In);
-            this.FadeOut(transition_duration * 2, Easing.In);
+            this.MoveToX(-150, animation_duration, Easing.OutQuint);
+            this.FadeOut(200, Easing.OutQuint);
         }
 
         private WorkingBeatmap? beatmap;

From 92690afa5fecd750583924c5917fc3b877b73041 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 30 Jan 2023 16:12:26 +0100
Subject: [PATCH 0016/2296] de-nest ```removeOldInfo()```

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 6a1662fd6a..41fe9d8d50 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -152,15 +152,6 @@ namespace osu.Game.Screens.Select
 
             void perform()
             {
-                void removeOldInfo()
-                {
-                    State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
-
-                    DisplayedContent?.FadeOut(transition_duration);
-                    DisplayedContent?.Expire();
-                    DisplayedContent = null;
-                }
-
                 if (beatmap == null)
                 {
                     removeOldInfo();
@@ -199,6 +190,15 @@ namespace osu.Game.Screens.Select
                     }, true);
                 });
             }
+
+            void removeOldInfo()
+            {
+                State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
+
+                DisplayedContent?.FadeOut(transition_duration);
+                DisplayedContent?.Expire();
+                DisplayedContent = null;
+            }
         }
 
         public partial class WedgeInfoText : Container

From 27c52a45fc079174f29067ae6b7e97529f02cceb Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Mon, 30 Jan 2023 16:13:55 +0100
Subject: [PATCH 0017/2296] Use inline lambda for scheduling

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 41fe9d8d50..0cc60e4bba 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -148,9 +148,7 @@ namespace osu.Game.Screens.Select
 
         private void updateDisplay()
         {
-            Scheduler.AddOnce(perform);
-
-            void perform()
+            Scheduler.AddOnce(() =>
             {
                 if (beatmap == null)
                 {
@@ -189,7 +187,7 @@ namespace osu.Game.Screens.Select
                         difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                     }, true);
                 });
-            }
+            });
 
             void removeOldInfo()
             {

From f8a5ce0cd2df5e5247ed0affe00ec4d6e8ffc1a7 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 2 Feb 2023 22:32:33 +0900
Subject: [PATCH 0018/2296] Use stable sort for catch hyperdash generation

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

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index ab61b14ac4..c51d3d5c70 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -209,7 +209,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 }
             }
 
-            palpableObjects.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
+            palpableObjects = palpableObjects.OrderBy(h => h.StartTime).ToList();
 
             double halfCatcherWidth = Catcher.CalculateCatchWidth(beatmap.Difficulty) / 2;
 

From 491ba13b6f1a9dc15c80474fd60970cb66926c3f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 3 Feb 2023 14:07:21 +0900
Subject: [PATCH 0019/2296] Factor out palpable obejct enumeration logic

---
 .../Beatmaps/CatchBeatmap.cs                  | 21 ++++++++++++++++
 .../Beatmaps/CatchBeatmapProcessor.cs         | 24 ++++---------------
 .../Difficulty/CatchDifficultyCalculator.cs   |  8 +++----
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs
index f009c10a9c..1f05d66b86 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmap.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Catch.Beatmaps
 {
@@ -38,5 +39,25 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 }
             };
         }
+
+        /// <summary>
+        /// Enumerate all <see cref="PalpableCatchHitObject"/>s, sorted by their start times.
+        /// </summary>
+        /// <remarks>
+        /// If multiple objects have the same start time, the ordering is preserved (it is a stable sorting).
+        /// </remarks>
+        public static IEnumerable<PalpableCatchHitObject> GetPalpableObjects(IEnumerable<HitObject> hitObjects)
+        {
+            return hitObjects.SelectMany(selectPalpableObjects).OrderBy(h => h.StartTime);
+
+            IEnumerable<PalpableCatchHitObject> selectPalpableObjects(HitObject h)
+            {
+                if (h is PalpableCatchHitObject palpable)
+                    yield return palpable;
+
+                foreach (var nested in h.NestedHitObjects.OfType<PalpableCatchHitObject>())
+                    yield return nested;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index c51d3d5c70..32134912f1 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
@@ -192,24 +191,9 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
         private static void initialiseHyperDash(IBeatmap beatmap)
         {
-            List<PalpableCatchHitObject> palpableObjects = new List<PalpableCatchHitObject>();
-
-            foreach (var currentObject in beatmap.HitObjects)
-            {
-                if (currentObject is Fruit fruitObject)
-                    palpableObjects.Add(fruitObject);
-
-                if (currentObject is JuiceStream)
-                {
-                    foreach (var juice in currentObject.NestedHitObjects)
-                    {
-                        if (juice is PalpableCatchHitObject palpableObject && !(juice is TinyDroplet))
-                            palpableObjects.Add(palpableObject);
-                    }
-                }
-            }
-
-            palpableObjects = palpableObjects.OrderBy(h => h.StartTime).ToList();
+            var palpableObjects = CatchBeatmap.GetPalpableObjects(beatmap.HitObjects)
+                                              .Where(h => h is Fruit || (h is Droplet && h is not TinyDroplet))
+                                              .ToArray();
 
             double halfCatcherWidth = Catcher.CalculateCatchWidth(beatmap.Difficulty) / 2;
 
@@ -221,7 +205,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             int lastDirection = 0;
             double lastExcess = halfCatcherWidth;
 
-            for (int i = 0; i < palpableObjects.Count - 1; i++)
+            for (int i = 0; i < palpableObjects.Length - 1; i++)
             {
                 var currentObject = palpableObjects[i];
                 var nextObject = palpableObjects[i + 1];
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 42cfde268e..959f4830dd 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Catch.Difficulty.Skills;
 using osu.Game.Rulesets.Catch.Mods;
@@ -54,13 +55,10 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             List<DifficultyHitObject> objects = new List<DifficultyHitObject>();
 
             // In 2B beatmaps, it is possible that a normal Fruit is placed in the middle of a JuiceStream.
-            foreach (var hitObject in beatmap.HitObjects
-                                             .SelectMany(obj => obj is JuiceStream stream ? stream.NestedHitObjects.AsEnumerable() : new[] { obj })
-                                             .Cast<CatchHitObject>()
-                                             .OrderBy(x => x.StartTime))
+            foreach (var hitObject in CatchBeatmap.GetPalpableObjects(beatmap.HitObjects))
             {
                 // We want to only consider fruits that contribute to the combo.
-                if (hitObject is BananaShower || hitObject is TinyDroplet)
+                if (hitObject is Banana || hitObject is TinyDroplet)
                     continue;
 
                 if (lastObject != null)

From 5fc8f1d1bef944c43f1e9b1ac0456ded7015db72 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Fri, 3 Feb 2023 19:52:01 +0100
Subject: [PATCH 0020/2296] Fix ```BeatmapInfoWedgeV2.cs``` starCounter needing
 janky rotation application

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 0cc60e4bba..48a16d5449 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using osuTK;
 using osu.Framework.Allocation;
@@ -84,15 +83,25 @@ namespace osu.Game.Screens.Select
                         Width = colour_bar_width + corner_radius,
                         Child = new Box { RelativeSizeAxes = Axes.Both }
                     },
-                    starCounter = new StarCounter
+                    new Container
                     {
-                        Colour = Colour4.Transparent,
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.Centre,
-                        Scale = new Vector2(0.35f),
+                        // Applying the shear to this container and nesting the starCounter inside avoids
+                        // the deformation that occurs if the shear is applied to the starCounter whilst rotated
                         Shear = -wedged_container_shear,
                         X = -colour_bar_width / 2,
-                        Direction = FillDirection.Vertical
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = colour_bar_width,
+                        Child = starCounter = new StarCounter
+                        {
+                            Rotation = (float)(Math.Atan(shear_width / wedge_height) * (180 / Math.PI)),
+                            Colour = Colour4.Transparent,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Scale = new Vector2(0.35f),
+                            Direction = FillDirection.Vertical
+                        }
                     }
                 }
             };
@@ -102,15 +111,6 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             ruleset.BindValueChanged(_ => updateDisplay());
-
-            float starAngle = (float)(Math.Atan(shear_width / wedge_height) * (180 / Math.PI));
-
-            // Applying the rotation directly to the StarCounter distorts the stars, hence it is applied to the child container
-            starCounter.Children.First().Rotation = starAngle;
-
-            // Makes sure the stars center themselves properly in the colour bar
-            starCounter.Children.First().Anchor = Anchor.Centre;
-            starCounter.Children.First().Origin = Anchor.Centre;
         }
 
         private const double animation_duration = 600;

From de37a0a000bfb99ad0f56eaadbe9929eb93229ab Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Fri, 3 Feb 2023 19:53:04 +0100
Subject: [PATCH 0021/2296] enable pixelSnapping for the
 ```BufferedContainer``` in BeatmapInfoWedgeV2.cs

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 48a16d5449..a18d4086f7 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Select
             CornerRadius = corner_radius;
 
             // We want to buffer the wedge to avoid weird transparency overlaps between the colour bar and the background.
-            Child = bufferedContent = new BufferedContainer
+            Child = bufferedContent = new BufferedContainer(pixelSnapping: true)
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]

From 38cc47d64ec35313d7cb928ae78a018b5641e2d5 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 4 Feb 2023 16:52:30 +0100
Subject: [PATCH 0022/2296] Remove ```IsPresent``` usages

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index a18d4086f7..fda20dde4d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -142,8 +142,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public override bool IsPresent => base.IsPresent || DisplayedContent == null; // Visibility is updated in the LoadComponentAsync callback
-
         private Container? loadingInfo;
 
         private void updateDisplay()
@@ -316,7 +314,7 @@ namespace osu.Game.Screens.Select
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
-                    if (!starRatingDisplay.IsPresent)
+                    if (starRatingDisplay.Alpha > 0)
                         starRatingDisplay.FinishTransforms(true);
 
                     starRatingDisplay.FadeIn(transition_duration);

From cb679ccc2b95858b0ff85e86bffcd6ee6a27d9dd Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 11 Feb 2023 18:00:17 +0100
Subject: [PATCH 0023/2296] Separate wedge visibility test into its own method

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 4904e2a723..f99950dfb0 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
@@ -49,12 +50,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddWaitStep("wait for select", 3);
 
-            AddStep("hide", () => { infoWedge.Hide(); });
-
-            AddWaitStep("wait for hide", 3);
-
-            AddStep("show", () => { infoWedge.Show(); });
-
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
             {
                 foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
@@ -76,6 +71,26 @@ namespace osu.Game.Tests.Visual.SongSelect
             }
         }
 
+        [Test]
+        public void TestWedgeVisibility()
+        {
+            AddStep("Make shadow red for test visibility", () =>
+            {
+                infoWedge.EdgeEffect = new EdgeEffectParameters
+                {
+                    Colour = Colour4.Red,
+                    Type = EdgeEffectType.Shadow,
+                    Radius = 5,
+                };
+            });
+            AddStep("hide", () => { infoWedge.Hide(); });
+            AddWaitStep("wait for hide", 3);
+            AddAssert("check visibility", () => infoWedge.Alpha == 0);
+            AddStep("show", () => { infoWedge.Show(); });
+            AddWaitStep("wait for show", 1);
+            AddAssert("check visibility", () => infoWedge.Alpha > 0);
+        }
+
         private void testBeatmapLabels(Ruleset ruleset)
         {
             AddAssert("check title", () => infoWedge.Info!.TitleLabel.Current.Value == $"{ruleset.ShortName}Title");

From 468419896a5364252afa23263d9e43d26c4b7edf Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 11 Feb 2023 18:08:50 +0100
Subject: [PATCH 0024/2296] Separate ruleset changing tests into their own
 method.

Add small clarification for edge colouring in visibility test
---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index f99950dfb0..ebd8c008b3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -39,22 +39,25 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             Add(infoWedge = new TestBeatmapInfoWedgeV2
             {
+                State = { Value = Visibility.Visible },
                 Width = 0.6f,
                 RelativeSizeAxes = Axes.X,
                 Margin = new MarginPadding { Top = 20 }
             });
 
-            AddStep("show", () => infoWedge.Show());
-
-            selectBeatmap(Beatmap.Value.Beatmap);
-
-            AddWaitStep("wait for select", 3);
-
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
             {
                 foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
                     hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
             });
+        }
+
+        [Test]
+        public void TestRulesetChange()
+        {
+            selectBeatmap(Beatmap.Value.Beatmap);
+
+            AddWaitStep("wait for select", 3);
 
             foreach (var rulesetInfo in rulesets.AvailableRulesets)
             {
@@ -74,6 +77,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestWedgeVisibility()
         {
+            // Mostly just in case someone runs this test before others,
+            // leading to the shadow being very hard to see if it is black
             AddStep("Make shadow red for test visibility", () =>
             {
                 infoWedge.EdgeEffect = new EdgeEffectParameters

From 09cb6ca3a797e516c3097b48883468be0f85f237 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Sat, 11 Feb 2023 18:15:21 +0100
Subject: [PATCH 0025/2296] Clean up formatting and wedge placement in
 testscene a tad,

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index ebd8c008b3..3f3c7441f4 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 State = { Value = Visibility.Visible },
                 Width = 0.6f,
                 RelativeSizeAxes = Axes.X,
-                Margin = new MarginPadding { Top = 20 }
+                Margin = new MarginPadding { Top = 20, Left = -10 }
             });
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             // Mostly just in case someone runs this test before others,
             // leading to the shadow being very hard to see if it is black
-            AddStep("Make shadow red for test visibility", () =>
+            AddStep("make shadow red for test visibility", () =>
             {
                 infoWedge.EdgeEffect = new EdgeEffectParameters
                 {

From 299023fce036d6995ead30d00d1de6364bbcc137 Mon Sep 17 00:00:00 2001
From: mk56-spn <darioheadleysilva@gmail.com>
Date: Tue, 21 Feb 2023 16:07:26 +0100
Subject: [PATCH 0026/2296] Improve visibility of wedge shading in test scene
 and fix an issue with excessive roundness on said shadow.

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 25 ++++++++++++++-----
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs |  9 +++----
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 3f3c7441f4..09b93119cc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
@@ -37,12 +38,25 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             base.LoadComplete();
 
-            Add(infoWedge = new TestBeatmapInfoWedgeV2
+            AddRange(new Drawable[]
             {
-                State = { Value = Visibility.Visible },
-                Width = 0.6f,
-                RelativeSizeAxes = Axes.X,
-                Margin = new MarginPadding { Top = 20, Left = -10 }
+                // This exists only to make the wedge more visible in the test scene
+                new Box
+                {
+                    Y = -20,
+                    Colour = Colour4.Cornsilk.Darken(0.2f),
+                    Height = BeatmapInfoWedgeV2.WEDGE_HEIGHT + 40,
+                    Width = 0.65f,
+                    RelativeSizeAxes = Axes.X,
+                    Margin = new MarginPadding { Top = 20, Left = -10 }
+                },
+                infoWedge = new TestBeatmapInfoWedgeV2
+                {
+                    State = { Value = Visibility.Visible },
+                    Width = 0.6f,
+                    RelativeSizeAxes = Axes.X,
+                    Margin = new MarginPadding { Top = 20, Left = -10 }
+                },
             });
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
@@ -200,7 +214,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         private partial class TestBeatmapInfoWedgeV2 : BeatmapInfoWedgeV2
         {
             public new Container? DisplayedContent => base.DisplayedContent;
-
             public new WedgeInfoText? Info => base.Info;
         }
 
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index fda20dde4d..0a35e68c7e 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -25,8 +25,8 @@ namespace osu.Game.Screens.Select
 {
     public partial class BeatmapInfoWedgeV2 : VisibilityContainer
     {
+        public const float WEDGE_HEIGHT = 120;
         private const float shear_width = 21;
-        private const float wedge_height = 120;
         private const float transition_duration = 250;
         private const float corner_radius = 10;
         private const float colour_bar_width = 30;
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Select
         /// Todo: move this const out to song select when more new design elements are implemented for the beatmap details area, since it applies to text alignment of various elements
         private const float text_margin = 62;
 
-        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / wedge_height, 0);
+        private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / WEDGE_HEIGHT, 0);
 
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Select
 
         public BeatmapInfoWedgeV2()
         {
-            Height = wedge_height;
+            Height = WEDGE_HEIGHT;
             Shear = wedged_container_shear;
             Masking = true;
             EdgeEffect = new EdgeEffectParameters
@@ -60,7 +60,6 @@ namespace osu.Game.Screens.Select
                 Colour = Colour4.Black.Opacity(.25f),
                 Type = EdgeEffectType.Shadow,
                 Radius = corner_radius,
-                Roundness = corner_radius
             };
             CornerRadius = corner_radius;
 
@@ -95,7 +94,7 @@ namespace osu.Game.Screens.Select
                         Width = colour_bar_width,
                         Child = starCounter = new StarCounter
                         {
-                            Rotation = (float)(Math.Atan(shear_width / wedge_height) * (180 / Math.PI)),
+                            Rotation = (float)(Math.Atan(shear_width / WEDGE_HEIGHT) * (180 / Math.PI)),
                             Colour = Colour4.Transparent,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,

From f21238f517fa8e22a694affd4406bf3b858a8bb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Mar 2023 16:51:57 +0900
Subject: [PATCH 0027/2296] Adjust shadow to look better

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 0a35e68c7e..b7b60cffab 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -57,9 +57,9 @@ namespace osu.Game.Screens.Select
             Masking = true;
             EdgeEffect = new EdgeEffectParameters
             {
-                Colour = Colour4.Black.Opacity(.25f),
+                Colour = Colour4.Black.Opacity(0.2f),
                 Type = EdgeEffectType.Shadow,
-                Radius = corner_radius,
+                Radius = 3,
             };
             CornerRadius = corner_radius;
 

From c1743dbe1df7994f425d118c19c44ee8ea8c126c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jun 2023 16:53:29 +0900
Subject: [PATCH 0028/2296] Select all text when popover is initially shown

Depends on https://github.com/ppy/osu-framework/pull/5823.
---
 osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 5a1fbbee1e..62925ff708 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -328,7 +328,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 BeatDivisor.BindValueChanged(_ => updateState(), true);
                 divisorTextBox.OnCommit += (_, _) => setPresets();
 
-                Schedule(() => GetContainingInputManager().ChangeFocus(divisorTextBox));
+                divisorTextBox.SelectAll();
             }
 
             private void setPresets()

From 5d5e6a5ab750f380393a9c6ffd9cd3028e486f1f Mon Sep 17 00:00:00 2001
From: Hydria <liverpol2222@gmail.com>
Date: Mon, 3 Jul 2023 17:45:30 +0100
Subject: [PATCH 0029/2296] Finalised LN Adjustment Values

Spent a couple days discussing this on the pp rework server about values that were the most acceptable, these seemed to be the best from the community standpoint of top players.
Note: This is more to fix issues with the current system, not to be a final solution.
Related Google Sheets Page: https://docs.google.com/spreadsheets/d/1P0AxfdKvMHwWBQder4ZkFGO1fC9eADSGCryA5-UGriU/edit?usp=sharing
---
 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 06c825e37d..0a4fec3a70 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
     {
         private const double individual_decay_base = 0.125;
         private const double overall_decay_base = 0.30;
-        private const double release_threshold = 24;
+        private const double release_threshold = 30;
 
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 1;
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
             // 0.0 +--------+-+---------------> Release Difference / ms
             //         release_threshold
             if (isOverlapping)
-                holdAddition = 1 / (1 + Math.Exp(0.5 * (release_threshold - closestEndTime)));
+                holdAddition = 1 / (1 + Math.Exp(0.27 * (release_threshold - closestEndTime)));
 
             // Decay and increase individualStrains in own column
             individualStrains[column] = applyDecay(individualStrains[column], startTime - startTimes[column], individual_decay_base);

From 3c76cb2fb0cc67763e50770670a0c890c1755cd9 Mon Sep 17 00:00:00 2001
From: Zyf <zyfarok@gmail.com>
Date: Sat, 8 Jul 2023 17:54:23 +0200
Subject: [PATCH 0030/2296] Scoring : Use square-root of combo

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

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 35a7dfe369..0760a89b90 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -293,7 +293,7 @@ namespace osu.Game.Rulesets.Scoring
 
         protected virtual double GetBonusScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type);
 
-        protected virtual double GetComboScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type) * (1 + result.ComboAfterJudgement / 10d);
+        protected virtual double GetComboScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type) * Math.Pow(result.ComboAfterJudgement, 0.5);
 
         protected virtual void ApplyScoreChange(JudgementResult result)
         {

From 175bd3b5782e5858a4445f0de44a412b86788e8d Mon Sep 17 00:00:00 2001
From: Zyf <zyfarok@gmail.com>
Date: Sat, 8 Jul 2023 19:05:56 +0200
Subject: [PATCH 0031/2296] Scoring : Move some of the accuracy weight to
 ComboScore (edited)

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 0760a89b90..ea1140ef71 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -317,8 +317,8 @@ namespace osu.Game.Rulesets.Scoring
 
         protected virtual double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
-            return 700000 * comboProgress +
-                   300000 * Math.Pow(Accuracy.Value, 10) * accuracyProgress +
+            return 700000 * Accuracy.Value * comboProgress +
+                   300000 * Math.Pow(Accuracy.Value, 8) * accuracyProgress +
                    bonusPortion;
         }
 

From ecb633f8fbd616b30fbeae5724f86659034ca2eb Mon Sep 17 00:00:00 2001
From: Zyf <zyfarok@gmail.com>
Date: Sat, 15 Jul 2023 14:55:43 +0200
Subject: [PATCH 0032/2296] Scoring : Remove ComputeTotalScore overide in
 OsuScoreProcessor

---
 osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index f97be0d7ff..dfdf3c58fd 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
@@ -17,12 +17,5 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
         protected override HitEvent CreateHitEvent(JudgementResult result)
             => base.CreateHitEvent(result).With((result as OsuHitCircleJudgementResult)?.CursorPositionAtHit);
-
-        protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
-        {
-            return 700000 * comboProgress
-                   + 300000 * Math.Pow(Accuracy.Value, 10) * accuracyProgress
-                   + bonusPortion;
-        }
     }
 }

From b672b49e02b6d650f9b207ab908edfd3f4886dc3 Mon Sep 17 00:00:00 2001
From: Zyf <zyfarok@gmail.com>
Date: Sat, 15 Jul 2023 23:20:49 +0200
Subject: [PATCH 0033/2296] Scoring : Implement v1 to v3 conversion.

---
 .../Difficulty/OsuLegacyScoreSimulator.cs     | 10 ++-
 .../StandardisedScoreMigrationTools.cs        | 69 +++++++++++++++++--
 .../Difficulty/DifficultyAttributes.cs        | 10 +++
 .../Rulesets/Scoring/ILegacyScoreSimulator.cs | 12 +++-
 4 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 980d86e4ad..78245f903a 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -20,9 +20,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         public int ComboScore { get; private set; }
 
-        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
+        public int LegacyBonusScore { get; private set; }
+
+        public int MaxCombo { get; private set; }
+
+        public double BonusScoreRatio => LegacyBonusScore == 0 ? 0 : (double)modernBonusScore / LegacyBonusScore;
 
-        private int legacyBonusScore;
         private int modernBonusScore;
         private int combo;
 
@@ -77,6 +80,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             foreach (var obj in playableBeatmap.HitObjects)
                 simulateHit(obj);
+            MaxCombo = combo;
         }
 
         private void simulateHit(HitObject hitObject)
@@ -164,7 +168,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             if (isBonus)
             {
-                legacyBonusScore += scoreIncrease;
+                LegacyBonusScore += scoreIncrease;
                 modernBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 60530c31cb..61f0d1f195 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -218,7 +218,9 @@ namespace osu.Game.Database
             {
                 LegacyAccuracyScore = sv1Simulator.AccuracyScore,
                 LegacyComboScore = sv1Simulator.ComboScore,
-                LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio
+                LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio,
+                LegacyBonusScore = sv1Simulator.LegacyBonusScore,
+                LegacyMaxCombo = sv1Simulator.MaxCombo,
             });
         }
 
@@ -240,13 +242,16 @@ namespace osu.Game.Database
             int maximumLegacyAccuracyScore = attributes.LegacyAccuracyScore;
             int maximumLegacyComboScore = attributes.LegacyComboScore;
             double maximumLegacyBonusRatio = attributes.LegacyBonusScoreRatio;
+            int maximumLegacyBonusScore = attributes.LegacyBonusScore;
+            int maximumLegacyCombo = attributes.LegacyMaxCombo;
             double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
 
             // The part of total score that doesn't include bonus.
             int maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
+            int maximumLegacyTotalScore = maximumLegacyBaseScore + maximumLegacyBonusScore;
 
-            // The combo proportion is calculated as a proportion of maximumLegacyBaseScore.
-            double comboProportion = Math.Min(1, (double)score.LegacyTotalScore / maximumLegacyBaseScore);
+            // The combo proportion is calculated as a proportion of maximumLegacyTotalScore.
+            double comboProportion = (double)score.LegacyTotalScore / maximumLegacyTotalScore;
 
             // The bonus proportion makes up the rest of the score that exceeds maximumLegacyBaseScore.
             double bonusProportion = Math.Max(0, ((long)score.LegacyTotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
@@ -254,9 +259,63 @@ namespace osu.Game.Database
             switch (score.Ruleset.OnlineID)
             {
                 case 0:
+                    if(score.MaxCombo == 0 || score.Accuracy == 0)
+                        return (long)Math.Round((
+                            0
+                            + 300000 * Math.Pow(score.Accuracy, 8)
+                            + bonusProportion) * modMultiplier);
+
+                    double v3exp = 0.5; // Scorev3 combo exponent
+
+                    // Assumption :
+                    // - sliders and slider-ticks are uniformly spread arround the beatmap
+                    //      thus we can ignore them without losing much precision (consider a map of hit-circles only !)
+                    // - the Ok/Meh hit results are uniformly spread in the score
+                    //      thus we can simplify and consider each hit result to be score.Accuracy without losing much precision
+                    // What is strippedV1/strippedV3 :
+                    // This is the ComboScore of v1/v3 were we remove all (map-)constant multipliers and accuracy multipliers (including hit results),
+                    // based on the previous assumptions. For Scorev1, this is basically the sum of squared combos (because without sliders: object_count == combo).
+                    double maxStrippedV1 = Math.Pow(maximumLegacyCombo, 2);
+                    double maxStrippedV3 = Math.Pow(maximumLegacyCombo, 1 + v3exp);
+
+                    double strippedV1 = maxStrippedV1 * comboProportion / score.Accuracy;
+
+                    double strippedV1FromMaxCombo = Math.Pow(score.MaxCombo, 2);
+                    double strippedV3FromMaxCombo = Math.Pow(score.MaxCombo, 1 + v3exp);
+
+                    // Compute approximate lower estimate scorev3 for that play
+                    // That is, a play were we made biggest amount of big combos (Repeat MaxCombo + 1 remaining big combo)
+                    // And didn't combo anything in the reminder of the map
+                    double possibleMaxComboRepeat = Math.Floor(strippedV1 / strippedV1FromMaxCombo);
+                    double strippedV1FromMaxComboRepeat = possibleMaxComboRepeat * strippedV1FromMaxCombo;
+                    double remainingStrippedV1 = strippedV1 - strippedV1FromMaxComboRepeat;
+                    double remainingCombo = Math.Sqrt(remainingStrippedV1);
+                    double remainingStrippedV3 = Math.Pow(remainingCombo, 1 + v3exp);
+
+                    double newLowerStrippedV3 = (possibleMaxComboRepeat * strippedV3FromMaxCombo) + remainingStrippedV3;
+
+                    // Compute approximate upper estimate scorev3 for that play
+                    // That is, a play were all combos were equal (except MaxCombo)
+                    remainingStrippedV1 = strippedV1 - strippedV1FromMaxCombo;
+                    double remainingComboObjects = maximumLegacyCombo - score.MaxCombo - score.Statistics[HitResult.Miss];
+                    double remainingAverageCombo = remainingComboObjects > 0 ? remainingStrippedV1 / remainingComboObjects : 0;
+                    remainingStrippedV3 = remainingComboObjects * Math.Pow(remainingAverageCombo, v3exp);
+
+                    double newUpperStrippedV3 = strippedV3FromMaxCombo + remainingStrippedV3;
+
+                    // Approximate by combining lower and upper estimates
+                    // As the lower-estimate is very pessimistic, we use a 30/70 ratio
+                    // And cap it with 1.2 times the middle-point to avoid overstimates
+                    double strippedV3 = Math.Min(
+                        0.3 * newLowerStrippedV3 + 0.7 * newUpperStrippedV3,
+                        1.2 * (newLowerStrippedV3 + newUpperStrippedV3) / 2
+                    );
+
+                    double newComboScoreProportion = (strippedV3 / maxStrippedV3) * score.Accuracy;
+
                     return (long)Math.Round((
-                        700000 * comboProportion
-                        + 300000 * Math.Pow(score.Accuracy, 10)
+                        700000 * newComboScoreProportion * score.Accuracy
+                        + 300000 * Math.Pow(score.Accuracy, 8)
                         + bonusProportion) * modMultiplier);
 
                 case 1:
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index 5a01faa417..69345872c6 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -64,6 +64,16 @@ namespace osu.Game.Rulesets.Difficulty
         /// </summary>
         public double LegacyBonusScoreRatio { get; set; }
 
+        /// <summary>
+        /// The bonus portion of the legacy (ScoreV1) total score.
+        /// </summary>
+        public int LegacyBonusScore { get; set; }
+
+        /// <summary>
+        /// The maximum combo of the legacy (ScoreV1) total score.
+        /// </summary>
+        public int LegacyMaxCombo { get; set; }
+
         /// <summary>
         /// Creates new <see cref="DifficultyAttributes"/>.
         /// </summary>
diff --git a/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs b/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
index 7240f0d73e..68ace15b20 100644
--- a/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
+++ b/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
@@ -23,9 +23,19 @@ namespace osu.Game.Rulesets.Scoring
         int ComboScore { get; }
 
         /// <summary>
-        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
+        /// The bonus portion of the legacy (ScoreV1) total score.
         /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
         /// </summary>
+        int LegacyBonusScore { get; }
+
+        /// <summary>
+        /// The maximum combo of the legacy (ScoreV1) total score.
+        /// </summary>
+        int MaxCombo { get; }
+
+        /// <summary>
+        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
+        /// </summary>
         double BonusScoreRatio { get; }
 
         /// <summary>

From a97915180f37a87ac5716acdb0bfcafffe9e6452 Mon Sep 17 00:00:00 2001
From: Zyf <zyfarok@gmail.com>
Date: Sat, 15 Jul 2023 23:30:59 +0200
Subject: [PATCH 0034/2296] Scoring : Adds fields to Catch/Mania/Taiko
 Simulators too

---
 .../Difficulty/CatchLegacyScoreSimulator.cs            | 10 +++++++---
 .../Difficulty/ManiaLegacyScoreSimulator.cs            |  3 +++
 .../Difficulty/TaikoLegacyScoreSimulator.cs            | 10 +++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index c79fd36d96..284fd23aea 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -20,9 +20,12 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
         public int ComboScore { get; private set; }
 
-        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
+        public int LegacyBonusScore { get; private set; }
+
+        public int MaxCombo { get; private set; }
+
+        public double BonusScoreRatio => LegacyBonusScore == 0 ? 0 : (double)modernBonusScore / LegacyBonusScore;
 
-        private int legacyBonusScore;
         private int modernBonusScore;
         private int combo;
 
@@ -74,6 +77,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             foreach (var obj in playableBeatmap.HitObjects)
                 simulateHit(obj);
+            MaxCombo = combo;
         }
 
         private void simulateHit(HitObject hitObject)
@@ -129,7 +133,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             if (isBonus)
             {
-                legacyBonusScore += scoreIncrease;
+                LegacyBonusScore += scoreIncrease;
                 modernBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
index e544428979..f09c911b98 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty
     {
         public int AccuracyScore => 0;
         public int ComboScore { get; private set; }
+        public int LegacyBonusScore => 0;
+        public int MaxCombo { get; private set; }
         public double BonusScoreRatio => 0;
 
         public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
@@ -23,6 +25,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                                     .Aggregate(1.0, (c, n) => c * n);
 
             ComboScore = (int)(1000000 * multiplier);
+            MaxCombo = playableBeatmap.GetMaxCombo();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index e77327d622..239ec5765c 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -20,9 +20,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         public int ComboScore { get; private set; }
 
-        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
+        public int LegacyBonusScore { get; private set; }
+
+        public int MaxCombo { get; private set; }
+
+        public double BonusScoreRatio => LegacyBonusScore == 0 ? 0 : (double)modernBonusScore / LegacyBonusScore;
 
-        private int legacyBonusScore;
         private int modernBonusScore;
         private int combo;
 
@@ -80,6 +83,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             foreach (var obj in playableBeatmap.HitObjects)
                 simulateHit(obj);
+            MaxCombo = combo;
         }
 
         private void simulateHit(HitObject hitObject)
@@ -189,7 +193,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             if (isBonus)
             {
-                legacyBonusScore += scoreIncrease;
+                LegacyBonusScore += scoreIncrease;
                 modernBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else

From 768d7b5e1c30329280447dc452fde063b6e440b3 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Mon, 17 Jul 2023 23:31:21 -0400
Subject: [PATCH 0035/2296] correct implementation of stable notelock

---
 .../TestSceneHitCircle.cs                     |  2 +-
 .../Objects/Drawables/DrawableHitCircle.cs    |  7 ++-
 .../Objects/Drawables/DrawableOsuHitObject.cs | 10 ++--
 .../Objects/Drawables/DrawableSliderHead.cs   |  3 +-
 osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs |  2 +-
 osu.Game.Rulesets.Osu/UI/ClickAction.cs       | 18 +++++++
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs        |  2 +-
 .../UI/ObjectOrderedHitPolicy.cs              | 53 ++++++++++---------
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  2 +-
 .../UI/StartTimeOrderedHitPolicy.cs           |  8 +--
 osu.Game/Rulesets/UI/HitObjectContainer.cs    |  2 +-
 osu.Game/Rulesets/UI/IHitObjectContainer.cs   |  2 +-
 12 files changed, 72 insertions(+), 39 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/UI/ClickAction.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index 0314afc1ac..c818a361df 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (auto && !userTriggered && timeOffset > hitOffset && CheckHittable?.Invoke(this, Time.Current) != false)
+                if (auto && !userTriggered && timeOffset > hitOffset && CheckHittable?.Invoke(this, Time.Current) == ClickAction.Hit)
                 {
                     // force success
                     ApplyResult(r => r.Type = HitResult.Great);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 3458069dd1..09d818def8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osuTK;
@@ -154,13 +155,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             var result = ResultFor(timeOffset);
+            var clickAction = CheckHittable?.Invoke(this, Time.Current);
 
-            if (result == HitResult.None || CheckHittable?.Invoke(this, Time.Current) == false)
+            if (clickAction == ClickAction.Shake || (result == HitResult.None && clickAction != ClickAction.Ignore))
             {
                 Shake();
                 return;
             }
 
+            if (result == HitResult.None)
+                return;
+
             ApplyResult(r =>
             {
                 var circleResult = (OsuHitCircleJudgementResult)r;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index df0ba344d8..a8ce2118c8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Rulesets.Osu.UI;
 using osuTK;
 using osuTK.Graphics;
 
@@ -30,10 +31,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override float SamplePlaybackPosition => CalculateDrawableRelativePosition(this);
 
         /// <summary>
-        /// Whether this <see cref="DrawableOsuHitObject"/> can be hit, given a time value.
-        /// If non-null, judgements will be ignored (resulting in a shake) whilst the function returns false.
+        /// What action this <see cref="DrawableOsuHitObject"/> should take in response to a
+        /// click at the given time value.
+        /// If non-null, judgements will be ignored for return values of <see cref="ClickAction.Ignore"/>
+        /// and <see cref="ClickAction.Shake"/>, and this hit object will be shaken for return values of
+        /// <see cref="ClickAction.Shake"/>.
         /// </summary>
-        public Func<DrawableHitObject, double, bool> CheckHittable;
+        public Func<DrawableHitObject, double, ClickAction> CheckHittable;
 
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index b8a1efabe0..a4cf69ee31 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -8,6 +8,7 @@ using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -60,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             pathVersion.BindTo(DrawableSlider.PathVersion);
 
-            CheckHittable = (d, t) => DrawableSlider.CheckHittable?.Invoke(d, t) ?? true;
+            CheckHittable = (d, t) => DrawableSlider.CheckHittable?.Invoke(d, t) ?? ClickAction.Hit;
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
index afa54c2dfb..7503c43e0b 100644
--- a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
-        public bool IsHittable(DrawableHitObject hitObject, double time) => true;
+        public ClickAction CheckHittable(DrawableHitObject hitObject, double time) => ClickAction.Hit;
 
         public void HandleHit(DrawableHitObject hitObject)
         {
diff --git a/osu.Game.Rulesets.Osu/UI/ClickAction.cs b/osu.Game.Rulesets.Osu/UI/ClickAction.cs
new file mode 100644
index 0000000000..2b00f5acce
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/ClickAction.cs
@@ -0,0 +1,18 @@
+// 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.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    /// <summary>
+    /// An action that an <see cref="IHitPolicy"/> recommends be taken in response to a click
+    /// on a <see cref="DrawableOsuHitObject"/>.
+    /// </summary>
+    public enum ClickAction
+    {
+        Ignore,
+        Shake,
+        Hit
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
index b509796742..9820b8c188 100644
--- a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.UI
         /// <param name="hitObject">The <see cref="DrawableHitObject"/> to check.</param>
         /// <param name="time">The time to check.</param>
         /// <returns>Whether <paramref name="hitObject"/> can be hit at the given <paramref name="time"/>.</returns>
-        bool IsHittable(DrawableHitObject hitObject, double time);
+        ClickAction CheckHittable(DrawableHitObject hitObject, double time);
 
         /// <summary>
         /// Handles a <see cref="HitObject"/> being hit.
diff --git a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
index 6330208d37..07942954e1 100644
--- a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
@@ -3,8 +3,7 @@
 
 #nullable disable
 
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -22,35 +21,41 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
-        public bool IsHittable(DrawableHitObject hitObject, double time) => enumerateHitObjectsUpTo(hitObject.HitObject.StartTime).All(obj => obj.AllJudged);
-
         public void HandleHit(DrawableHitObject hitObject)
         {
         }
 
-        private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
+        public ClickAction CheckHittable(DrawableHitObject hitObject, double time)
         {
-            foreach (var obj in HitObjectContainer.AliveObjects)
+            int index = HitObjectContainer.AliveObjects.IndexOf(hitObject);
+
+            if (index > 0)
             {
-                if (obj.HitObject.StartTime >= targetTime)
-                    yield break;
-
-                switch (obj)
-                {
-                    case DrawableSpinner:
-                        continue;
-
-                    case DrawableSlider slider:
-                        yield return slider.HeadCircle;
-
-                        break;
-
-                    default:
-                        yield return obj;
-
-                        break;
-                }
+                var previousHitObject = (DrawableOsuHitObject)HitObjectContainer.AliveObjects[index - 1];
+                if (previousHitObject.HitObject.StackHeight > 0 && !previousHitObject.AllJudged)
+                    return ClickAction.Ignore;
             }
+
+            foreach (DrawableHitObject testObject in HitObjectContainer.AliveObjects)
+            {
+                if (testObject.AllJudged)
+                    continue;
+
+                // if we found the object being checked, we can move on to the final timing test.
+                if (testObject == hitObject)
+                    break;
+
+                // for all other objects, we check for validity and block the hit if any are still valid.
+                // 3ms of extra leniency to account for slightly unsnapped objects.
+                if (testObject.HitObject.GetEndTime() + 3 < hitObject.HitObject.StartTime)
+                    return ClickAction.Shake;
+            }
+
+            // stable has `const HitObjectManager.HITTABLE_RANGE = 400;`, which is only used for notelock code.
+            // probably not a coincidence that this is equivalent to lazer's OsuHitWindows.MISS_WINDOW.
+
+            // TODO stable compares to 200 when autopilot is enabled, instead of 400.
+            return Math.Abs(hitObject.HitObject.StartTime - time) < 400 ? ClickAction.Hit : ClickAction.Shake;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index ed02284a4b..15ca0a90de 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override void OnNewDrawableHitObject(DrawableHitObject drawable)
         {
-            ((DrawableOsuHitObject)drawable).CheckHittable = hitPolicy.IsHittable;
+            ((DrawableOsuHitObject)drawable).CheckHittable = hitPolicy.CheckHittable;
 
             Debug.Assert(!drawable.IsLoaded, $"Already loaded {nameof(DrawableHitObject)} is added to {nameof(OsuPlayfield)}");
             drawable.OnLoadComplete += onDrawableHitObjectLoaded;
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index edc3ba0818..f33ca58aef 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
-        public bool IsHittable(DrawableHitObject hitObject, double time)
+        public ClickAction CheckHittable(DrawableHitObject hitObject, double time)
         {
             DrawableHitObject blockingObject = null;
 
@@ -36,13 +36,13 @@ namespace osu.Game.Rulesets.Osu.UI
 
             // If there is no previous hitobject, allow the hit.
             if (blockingObject == null)
-                return true;
+                return ClickAction.Hit;
 
             // A hit is allowed if:
             // 1. The last blocking hitobject has been judged.
             // 2. The current time is after the last hitobject's start time.
             // Hits at exactly the same time as the blocking hitobject are allowed for maps that contain simultaneous hitobjects (e.g. /b/372245).
-            return blockingObject.Judged || time >= blockingObject.HitObject.StartTime;
+            return (blockingObject.Judged || time >= blockingObject.HitObject.StartTime) ? ClickAction.Hit : ClickAction.Shake;
         }
 
         public void HandleHit(DrawableHitObject hitObject)
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
 
-            if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
+            if (CheckHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset) != ClickAction.Hit)
                 throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
 
             // Miss all hitobjects prior to the hit one.
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 099be486b3..454a83bcda 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.UI
     {
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
-        public IEnumerable<DrawableHitObject> AliveObjects => AliveEntries.Select(pair => pair.Drawable).OrderBy(h => h.HitObject.StartTime);
+        public IList<DrawableHitObject> AliveObjects => AliveEntries.Select(pair => pair.Drawable).OrderBy(h => h.HitObject.StartTime).ToList();
 
         /// <summary>
         /// Invoked when a <see cref="DrawableHitObject"/> is judged.
diff --git a/osu.Game/Rulesets/UI/IHitObjectContainer.cs b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
index 6dcb0944be..bb4806206d 100644
--- a/osu.Game/Rulesets/UI/IHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
@@ -19,6 +19,6 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="IHitObjectContainer"/> uses pooled objects, this is equivalent to <see cref="Objects"/>.
         /// </remarks>
-        IEnumerable<DrawableHitObject> AliveObjects { get; }
+        IList<DrawableHitObject> AliveObjects { get; }
     }
 }

From 15af85226ce9c15c6bdb18d1c727cd257683d4e1 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 19 Jul 2023 02:06:29 -0400
Subject: [PATCH 0036/2296] adjust test for correct stable notelock

stable actually allows for hitobjs to be hit in the middle of sliders, as long as it doesn't interfere with the end time of the slider.
---
 .../TestSceneObjectOrderedHitPolicy.cs                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index ee70441688..be2affa50f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -213,10 +213,10 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         /// <summary>
-        /// Tests clicking a future circle after a slider's start time, but hitting all slider ticks.
+        /// Tests clicking a future circle after a slider's start time, but hitting the slider head and all slider ticks.
         /// </summary>
         [Test]
-        public void TestMissSliderHeadAndHitAllSliderTicks()
+        public void TestHitCircleBeforeSliderHead()
         {
             const double time_slider = 1500;
             const double time_circle = 1510;
@@ -248,7 +248,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Time = time_slider + 10, Position = positionSlider, Actions = { OsuAction.RightButton } }
             });
 
-            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Great);
             addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);

From 2c97ac74107c975f8f37e6a840caff06bef08fc8 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 19 Jul 2023 14:28:04 -0400
Subject: [PATCH 0037/2296] convert AliveObjects to list in hit policy instead
 of globally

---
 osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs | 8 +++++---
 osu.Game/Rulesets/UI/HitObjectContainer.cs         | 2 +-
 osu.Game/Rulesets/UI/IHitObjectContainer.cs        | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
index 07942954e1..172e5a39d8 100644
--- a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Linq;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -27,16 +28,17 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public ClickAction CheckHittable(DrawableHitObject hitObject, double time)
         {
-            int index = HitObjectContainer.AliveObjects.IndexOf(hitObject);
+            var aliveObjects = HitObjectContainer.AliveObjects.ToList();
+            int index = aliveObjects.IndexOf(hitObject);
 
             if (index > 0)
             {
-                var previousHitObject = (DrawableOsuHitObject)HitObjectContainer.AliveObjects[index - 1];
+                var previousHitObject = (DrawableOsuHitObject)aliveObjects[index - 1];
                 if (previousHitObject.HitObject.StackHeight > 0 && !previousHitObject.AllJudged)
                     return ClickAction.Ignore;
             }
 
-            foreach (DrawableHitObject testObject in HitObjectContainer.AliveObjects)
+            foreach (DrawableHitObject testObject in aliveObjects)
             {
                 if (testObject.AllJudged)
                     continue;
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 454a83bcda..099be486b3 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.UI
     {
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
-        public IList<DrawableHitObject> AliveObjects => AliveEntries.Select(pair => pair.Drawable).OrderBy(h => h.HitObject.StartTime).ToList();
+        public IEnumerable<DrawableHitObject> AliveObjects => AliveEntries.Select(pair => pair.Drawable).OrderBy(h => h.HitObject.StartTime);
 
         /// <summary>
         /// Invoked when a <see cref="DrawableHitObject"/> is judged.
diff --git a/osu.Game/Rulesets/UI/IHitObjectContainer.cs b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
index bb4806206d..6dcb0944be 100644
--- a/osu.Game/Rulesets/UI/IHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
@@ -19,6 +19,6 @@ namespace osu.Game.Rulesets.UI
         /// <remarks>
         /// If this <see cref="IHitObjectContainer"/> uses pooled objects, this is equivalent to <see cref="Objects"/>.
         /// </remarks>
-        IList<DrawableHitObject> AliveObjects { get; }
+        IEnumerable<DrawableHitObject> AliveObjects { get; }
     }
 }

From 6a8123029854e79f9124ea90f88c41e0245fda16 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Wed, 19 Jul 2023 14:44:28 -0400
Subject: [PATCH 0038/2296] rename ObjectOrderedHitPolicy to LegacyHitPolicy

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs                     | 2 +-
 .../UI/{ObjectOrderedHitPolicy.cs => LegacyHitPolicy.cs}        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Rulesets.Osu/UI/{ObjectOrderedHitPolicy.cs => LegacyHitPolicy.cs} (97%)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 250d97c537..229f80c2bd 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             var osuRuleset = (DrawableOsuRuleset)drawableRuleset;
 
             if (ClassicNoteLock.Value)
-                osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
+                osuRuleset.Playfield.HitPolicy = new LegacyHitPolicy();
 
             usingHiddenFading = drawableRuleset.Mods.OfType<OsuModHidden>().SingleOrDefault()?.OnlyFadeApproachCircles.Value == false;
         }
diff --git a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
similarity index 97%
rename from osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
rename to osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
index 172e5a39d8..c35d4a1b56 100644
--- a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// Hits will be blocked until the previous <see cref="HitObject"/>s have been judged.
     /// </remarks>
     /// </summary>
-    public class ObjectOrderedHitPolicy : IHitPolicy
+    public class LegacyHitPolicy : IHitPolicy
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 

From ef2134a92a32f0607d0f69bc04c8dbfd2a477acd Mon Sep 17 00:00:00 2001
From: Hydria <liverpol2222@gmail.com>
Date: Sat, 22 Jul 2023 10:45:48 +0100
Subject: [PATCH 0039/2296] Fix issue with processing LN orders

Related Issue: https://github.com/ppy/osu/issues/22756

The trigger in question happens when
(1) in a chord: a longer LN, then a shorter LN is processed respectively.
(2) in a chord: a long LN, then a note is processed respectively.

however, given the opposite processing step, it will fail to trigger.

We observe that both situations have the same pattern, however has undeterministic results, which only depends on the order the mapper placed each note.
---
 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 0a4fec3a70..7d8d010da0 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -53,7 +53,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
                 isOverlapping |= Precision.DefinitelyBigger(endTimes[i], startTime, 1) && Precision.DefinitelyBigger(endTime, endTimes[i], 1);
 
                 // We give a slight bonus to everything if something is held meanwhile
-                if (Precision.DefinitelyBigger(endTimes[i], endTime, 1))
+                if (Precision.DefinitelyBigger(endTimes[i], endTime, 1) &&
+                    Precision.DefinitelyBigger(startTime, startTimes[i], 1))
                     holdFactor = 1.25;
 
                 closestEndTime = Math.Min(closestEndTime, Math.Abs(endTime - endTimes[i]));

From 1e19def1538d718421e4d7c6802045011616d21e Mon Sep 17 00:00:00 2001
From: Hydria <liverpol2222@gmail.com>
Date: Sat, 22 Jul 2023 16:44:01 +0100
Subject: [PATCH 0040/2296] 2nd fix to cover all scenarios

---
 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 7d8d010da0..a24fcaad8d 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -50,7 +50,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
             for (int i = 0; i < endTimes.Length; ++i)
             {
                 // The current note is overlapped if a previous note or end is overlapping the current note body
-                isOverlapping |= Precision.DefinitelyBigger(endTimes[i], startTime, 1) && Precision.DefinitelyBigger(endTime, endTimes[i], 1);
+                isOverlapping |= Precision.DefinitelyBigger(endTimes[i], startTime, 1) &&
+                                 Precision.DefinitelyBigger(endTime, endTimes[i], 1) &&
+                                 Precision.DefinitelyBigger(startTime, startTimes[i], 1);
 
                 // We give a slight bonus to everything if something is held meanwhile
                 if (Precision.DefinitelyBigger(endTimes[i], endTime, 1) &&

From 4622255cc7a3d20487fce6378ce4d6dc0f487a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 18:24:15 +0200
Subject: [PATCH 0041/2296] Move out helper methods to static class

---
 .../Edit/OsuSelectionHandler.cs               |  45 ++-----
 .../SkinEditor/SkinSelectionHandler.cs        |   7 +-
 .../Compose/Components/SelectionHandler.cs    |  94 -------------
 osu.Game/Utils/GeometryUtils.cs               | 126 ++++++++++++++++++
 4 files changed, 143 insertions(+), 129 deletions(-)
 create mode 100644 osu.Game/Utils/GeometryUtils.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 2a6d6ce4c3..468d8ae9f5 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Input;
 
@@ -42,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             base.OnSelectionChanged();
 
-            Quad quad = selectedMovableObjects.Length > 0 ? getSurroundingQuad(selectedMovableObjects) : new Quad();
+            Quad quad = selectedMovableObjects.Length > 0 ? GeometryUtils.GetSurroundingQuad(selectedMovableObjects) : new Quad();
 
             SelectionBox.CanRotate = quad.Width > 0 || quad.Height > 0;
             SelectionBox.CanFlipX = SelectionBox.CanScaleX = quad.Width > 0;
@@ -109,13 +110,13 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             var hitObjects = selectedMovableObjects;
 
-            var flipQuad = flipOverOrigin ? new Quad(0, 0, OsuPlayfield.BASE_SIZE.X, OsuPlayfield.BASE_SIZE.Y) : getSurroundingQuad(hitObjects);
+            var flipQuad = flipOverOrigin ? new Quad(0, 0, OsuPlayfield.BASE_SIZE.X, OsuPlayfield.BASE_SIZE.Y) : GeometryUtils.GetSurroundingQuad(hitObjects);
 
             bool didFlip = false;
 
             foreach (var h in hitObjects)
             {
-                var flippedPosition = GetFlippedPosition(direction, flipQuad, h.Position);
+                var flippedPosition = GeometryUtils.GetFlippedPosition(direction, flipQuad, h.Position);
 
                 if (!Precision.AlmostEquals(flippedPosition, h.Position))
                 {
@@ -173,18 +174,18 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             var hitObjects = selectedMovableObjects;
 
-            Quad quad = getSurroundingQuad(hitObjects);
+            Quad quad = GeometryUtils.GetSurroundingQuad(hitObjects);
 
             referenceOrigin ??= quad.Centre;
 
             foreach (var h in hitObjects)
             {
-                h.Position = RotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
+                h.Position = GeometryUtils.RotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
 
                 if (h is IHasPath path)
                 {
                     foreach (PathControlPoint cp in path.Path.ControlPoints)
-                        cp.Position = RotatePointAroundOrigin(cp.Position, Vector2.Zero, delta);
+                        cp.Position = GeometryUtils.RotatePointAroundOrigin(cp.Position, Vector2.Zero, delta);
                 }
             }
 
@@ -196,7 +197,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             referencePathTypes ??= slider.Path.ControlPoints.Select(p => p.Type).ToList();
 
-            Quad sliderQuad = GetSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position));
+            Quad sliderQuad = GeometryUtils.GetSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position));
 
             // Limit minimum distance between control points after scaling to almost 0. Less than 0 causes the slider to flip, exactly 0 causes a crash through division by 0.
             scale = Vector2.ComponentMax(new Vector2(Precision.FLOAT_EPSILON), sliderQuad.Size + scale) - sliderQuad.Size;
@@ -222,7 +223,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             slider.SnapTo(snapProvider);
 
             //if sliderhead or sliderend end up outside playfield, revert scaling.
-            Quad scaledQuad = getSurroundingQuad(new OsuHitObject[] { slider });
+            Quad scaledQuad = GeometryUtils.GetSurroundingQuad(new OsuHitObject[] { slider });
             (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
             if (xInBounds && yInBounds && slider.Path.HasValidLength)
@@ -238,10 +239,10 @@ namespace osu.Game.Rulesets.Osu.Edit
         private void scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
         {
             scale = getClampedScale(hitObjects, reference, scale);
-            Quad selectionQuad = getSurroundingQuad(hitObjects);
+            Quad selectionQuad = GeometryUtils.GetSurroundingQuad(hitObjects);
 
             foreach (var h in hitObjects)
-                h.Position = GetScaledPosition(reference, scale, selectionQuad, h.Position);
+                h.Position = GeometryUtils.GetScaledPosition(reference, scale, selectionQuad, h.Position);
         }
 
         private (bool X, bool Y) isQuadInBounds(Quad quad)
@@ -256,7 +257,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             var hitObjects = selectedMovableObjects;
 
-            Quad quad = getSurroundingQuad(hitObjects);
+            Quad quad = GeometryUtils.GetSurroundingQuad(hitObjects);
 
             Vector2 delta = Vector2.Zero;
 
@@ -286,7 +287,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
             float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
 
-            Quad selectionQuad = getSurroundingQuad(hitObjects);
+            Quad selectionQuad = GeometryUtils.GetSurroundingQuad(hitObjects);
 
             //todo: this is not always correct for selections involving sliders. This approximation assumes each point is scaled independently, but sliderends move with the sliderhead.
             Quad scaledQuad = new Quad(selectionQuad.TopLeft.X + xOffset, selectionQuad.TopLeft.Y + yOffset, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
@@ -311,26 +312,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             return scale;
         }
 
-        /// <summary>
-        /// Returns a gamefield-space quad surrounding the provided hit objects.
-        /// </summary>
-        /// <param name="hitObjects">The hit objects to calculate a quad for.</param>
-        private Quad getSurroundingQuad(OsuHitObject[] hitObjects) =>
-            GetSurroundingQuad(hitObjects.SelectMany(h =>
-            {
-                if (h is IHasPath path)
-                {
-                    return new[]
-                    {
-                        h.Position,
-                        // can't use EndPosition for reverse slider cases.
-                        h.Position + path.Path.PositionAt(1)
-                    };
-                }
-
-                return new[] { h.Position };
-            }));
-
         /// <summary>
         /// All osu! hitobjects which can be moved/rotated/scaled.
         /// </summary>
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index b43f4eeb00..4a1ddd9d69 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Components.Menus;
 using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Skinning;
+using osu.Game.Utils;
 using osuTK;
 
 namespace osu.Game.Overlays.SkinEditor
@@ -40,7 +41,7 @@ namespace osu.Game.Overlays.SkinEditor
                 {
                     var drawableItem = (Drawable)b.Item;
 
-                    var rotatedPosition = RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, selectionQuad.Centre, angle);
+                    var rotatedPosition = GeometryUtils.RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, selectionQuad.Centre, angle);
                     updateDrawablePosition(drawableItem, rotatedPosition);
 
                     drawableItem.Rotation += angle;
@@ -137,7 +138,7 @@ namespace osu.Game.Overlays.SkinEditor
             {
                 var drawableItem = (Drawable)b.Item;
 
-                var flippedPosition = GetFlippedPosition(direction, flipOverOrigin ? drawableItem.Parent.ScreenSpaceDrawQuad : selectionQuad, b.ScreenSpaceSelectionPoint);
+                var flippedPosition = GeometryUtils.GetFlippedPosition(direction, flipOverOrigin ? drawableItem.Parent.ScreenSpaceDrawQuad : selectionQuad, b.ScreenSpaceSelectionPoint);
 
                 updateDrawablePosition(drawableItem, flippedPosition);
 
@@ -275,7 +276,7 @@ namespace osu.Game.Overlays.SkinEditor
         /// </summary>
         /// <returns></returns>
         private Quad getSelectionQuad() =>
-            GetSurroundingQuad(SelectedBlueprints.SelectMany(b => b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+            GeometryUtils.GetSurroundingQuad(SelectedBlueprints.SelectMany(b => b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
 
         private void applyFixedAnchors(Anchor anchor)
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 052cb18a5d..9b44b15fe4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -16,7 +16,6 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Resources.Localisation.Web;
@@ -401,98 +400,5 @@ namespace osu.Game.Screens.Edit.Compose.Components
             => Enumerable.Empty<MenuItem>();
 
         #endregion
-
-        #region Helper Methods
-
-        /// <summary>
-        /// Rotate a point around an arbitrary origin.
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <param name="origin">The centre origin to rotate around.</param>
-        /// <param name="angle">The angle to rotate (in degrees).</param>
-        protected static Vector2 RotatePointAroundOrigin(Vector2 point, Vector2 origin, float angle)
-        {
-            angle = -angle;
-
-            point.X -= origin.X;
-            point.Y -= origin.Y;
-
-            Vector2 ret;
-            ret.X = point.X * MathF.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Sin(MathUtils.DegreesToRadians(angle));
-            ret.Y = point.X * -MathF.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Cos(MathUtils.DegreesToRadians(angle));
-
-            ret.X += origin.X;
-            ret.Y += origin.Y;
-
-            return ret;
-        }
-
-        /// <summary>
-        /// Given a flip direction, a surrounding quad for all selected objects, and a position,
-        /// will return the flipped position in screen space coordinates.
-        /// </summary>
-        protected static Vector2 GetFlippedPosition(Direction direction, Quad quad, Vector2 position)
-        {
-            var centre = quad.Centre;
-
-            switch (direction)
-            {
-                case Direction.Horizontal:
-                    position.X = centre.X - (position.X - centre.X);
-                    break;
-
-                case Direction.Vertical:
-                    position.Y = centre.Y - (position.Y - centre.Y);
-                    break;
-            }
-
-            return position;
-        }
-
-        /// <summary>
-        /// Given a scale vector, a surrounding quad for all selected objects, and a position,
-        /// will return the scaled position in screen space coordinates.
-        /// </summary>
-        protected static Vector2 GetScaledPosition(Anchor reference, Vector2 scale, Quad selectionQuad, Vector2 position)
-        {
-            // adjust the direction of scale depending on which side the user is dragging.
-            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
-            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
-
-            // guard against no-ops and NaN.
-            if (scale.X != 0 && selectionQuad.Width > 0)
-                position.X = selectionQuad.TopLeft.X + xOffset + (position.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
-
-            if (scale.Y != 0 && selectionQuad.Height > 0)
-                position.Y = selectionQuad.TopLeft.Y + yOffset + (position.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
-
-            return position;
-        }
-
-        /// <summary>
-        /// Returns a quad surrounding the provided points.
-        /// </summary>
-        /// <param name="points">The points to calculate a quad for.</param>
-        protected static Quad GetSurroundingQuad(IEnumerable<Vector2> points)
-        {
-            if (!points.Any())
-                return new Quad();
-
-            Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
-            Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
-
-            // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
-            foreach (var p in points)
-            {
-                minPosition = Vector2.ComponentMin(minPosition, p);
-                maxPosition = Vector2.ComponentMax(maxPosition, p);
-            }
-
-            Vector2 size = maxPosition - minPosition;
-
-            return new Quad(minPosition.X, minPosition.Y, size.X, size.Y);
-        }
-
-        #endregion
     }
 }
diff --git a/osu.Game/Utils/GeometryUtils.cs b/osu.Game/Utils/GeometryUtils.cs
new file mode 100644
index 0000000000..725e93d098
--- /dev/null
+++ b/osu.Game/Utils/GeometryUtils.cs
@@ -0,0 +1,126 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+
+namespace osu.Game.Utils
+{
+    public static class GeometryUtils
+    {
+        /// <summary>
+        /// Rotate a point around an arbitrary origin.
+        /// </summary>
+        /// <param name="point">The point.</param>
+        /// <param name="origin">The centre origin to rotate around.</param>
+        /// <param name="angle">The angle to rotate (in degrees).</param>
+        public static Vector2 RotatePointAroundOrigin(Vector2 point, Vector2 origin, float angle)
+        {
+            angle = -angle;
+
+            point.X -= origin.X;
+            point.Y -= origin.Y;
+
+            Vector2 ret;
+            ret.X = point.X * MathF.Cos(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Sin(MathUtils.DegreesToRadians(angle));
+            ret.Y = point.X * -MathF.Sin(MathUtils.DegreesToRadians(angle)) + point.Y * MathF.Cos(MathUtils.DegreesToRadians(angle));
+
+            ret.X += origin.X;
+            ret.Y += origin.Y;
+
+            return ret;
+        }
+
+        /// <summary>
+        /// Given a flip direction, a surrounding quad for all selected objects, and a position,
+        /// will return the flipped position in screen space coordinates.
+        /// </summary>
+        public static Vector2 GetFlippedPosition(Direction direction, Quad quad, Vector2 position)
+        {
+            var centre = quad.Centre;
+
+            switch (direction)
+            {
+                case Direction.Horizontal:
+                    position.X = centre.X - (position.X - centre.X);
+                    break;
+
+                case Direction.Vertical:
+                    position.Y = centre.Y - (position.Y - centre.Y);
+                    break;
+            }
+
+            return position;
+        }
+
+        /// <summary>
+        /// Given a scale vector, a surrounding quad for all selected objects, and a position,
+        /// will return the scaled position in screen space coordinates.
+        /// </summary>
+        public static Vector2 GetScaledPosition(Anchor reference, Vector2 scale, Quad selectionQuad, Vector2 position)
+        {
+            // adjust the direction of scale depending on which side the user is dragging.
+            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
+            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
+
+            // guard against no-ops and NaN.
+            if (scale.X != 0 && selectionQuad.Width > 0)
+                position.X = selectionQuad.TopLeft.X + xOffset + (position.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
+
+            if (scale.Y != 0 && selectionQuad.Height > 0)
+                position.Y = selectionQuad.TopLeft.Y + yOffset + (position.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
+
+            return position;
+        }
+
+        /// <summary>
+        /// Returns a quad surrounding the provided points.
+        /// </summary>
+        /// <param name="points">The points to calculate a quad for.</param>
+        public static Quad GetSurroundingQuad(IEnumerable<Vector2> points)
+        {
+            if (!points.Any())
+                return new Quad();
+
+            Vector2 minPosition = new Vector2(float.MaxValue, float.MaxValue);
+            Vector2 maxPosition = new Vector2(float.MinValue, float.MinValue);
+
+            // Go through all hitobjects to make sure they would remain in the bounds of the editor after movement, before any movement is attempted
+            foreach (var p in points)
+            {
+                minPosition = Vector2.ComponentMin(minPosition, p);
+                maxPosition = Vector2.ComponentMax(maxPosition, p);
+            }
+
+            Vector2 size = maxPosition - minPosition;
+
+            return new Quad(minPosition.X, minPosition.Y, size.X, size.Y);
+        }
+
+        /// <summary>
+        /// Returns a gamefield-space quad surrounding the provided hit objects.
+        /// </summary>
+        /// <param name="hitObjects">The hit objects to calculate a quad for.</param>
+        public static Quad GetSurroundingQuad(IEnumerable<IHasPosition> hitObjects) =>
+            GetSurroundingQuad(hitObjects.SelectMany(h =>
+            {
+                if (h is IHasPath path)
+                {
+                    return new[]
+                    {
+                        h.Position,
+                        // can't use EndPosition for reverse slider cases.
+                        h.Position + path.Path.PositionAt(1)
+                    };
+                }
+
+                return new[] { h.Position };
+            }));
+    }
+}

From ba8ebefb50dca3a31462ecf4b282036ada782991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 18:09:07 +0200
Subject: [PATCH 0042/2296] Add basic structure for new rotation handler

---
 .../Compose/Components/SelectionHandler.cs    |  9 ++++++
 .../Components/SelectionRotationHandler.cs    | 31 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 9b44b15fe4..80df796fd7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -55,6 +55,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved(CanBeNull = true)]
         protected IEditorChangeHandler ChangeHandler { get; private set; }
 
+        protected SelectionRotationHandler RotationHandler { get; private set; }
+
         protected SelectionHandler()
         {
             selectedBlueprints = new List<SelectionBlueprint<T>>();
@@ -66,6 +68,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
+            RotationHandler = CreateRotationHandler();
+
             InternalChild = SelectionBox = CreateSelectionBox();
 
             SelectedItems.CollectionChanged += (_, _) =>
@@ -132,6 +136,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <returns>Whether any items could be rotated.</returns>
         public virtual bool HandleRotation(float angle) => false;
 
+        /// <summary>
+        /// Creates the handler to use for rotation operations.
+        /// </summary>
+        public virtual SelectionRotationHandler CreateRotationHandler() => new SelectionRotationHandler();
+
         /// <summary>
         /// Handles the selected items being scaled.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
new file mode 100644
index 0000000000..595edbb4fc
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
@@ -0,0 +1,31 @@
+// 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 osuTK;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// Base handler for editor rotation operations.
+    /// </summary>
+    public class SelectionRotationHandler
+    {
+        /// <summary>
+        /// Whether the rotation can currently be performed.
+        /// </summary>
+        public Bindable<bool> CanRotate { get; private set; } = new BindableBool();
+
+        public virtual void Begin()
+        {
+        }
+
+        public virtual void Update(float rotation, Vector2 origin)
+        {
+        }
+
+        public virtual void Commit()
+        {
+        }
+    }
+}

From ba904fd77bbb530b505817b32dbb31ac0e5baa1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 19:18:38 +0200
Subject: [PATCH 0043/2296] Migrate osu! rotation handling to
 `SelectionRotationHandler`

---
 .../Edit/OsuSelectionHandler.cs               | 30 +-----
 .../Edit/OsuSelectionRotationHandler.cs       | 98 +++++++++++++++++++
 2 files changed, 101 insertions(+), 27 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 468d8ae9f5..1d46b8ff8a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -28,11 +28,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         [Resolved(CanBeNull = true)]
         private IDistanceSnapProvider? snapProvider { get; set; }
 
-        /// <summary>
-        /// During a transform, the initial origin is stored so it can be used throughout the operation.
-        /// </summary>
-        private Vector2? referenceOrigin;
-
         /// <summary>
         /// During a transform, the initial path types of a single selected slider are stored so they
         /// can be maintained throughout the operation.
@@ -54,7 +49,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected override void OnOperationEnded()
         {
             base.OnOperationEnded();
-            referenceOrigin = null;
             referencePathTypes = null;
         }
 
@@ -170,28 +164,10 @@ namespace osu.Game.Rulesets.Osu.Edit
             if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
         }
 
-        public override bool HandleRotation(float delta)
+        public override SelectionRotationHandler CreateRotationHandler() => new OsuSelectionRotationHandler(ChangeHandler)
         {
-            var hitObjects = selectedMovableObjects;
-
-            Quad quad = GeometryUtils.GetSurroundingQuad(hitObjects);
-
-            referenceOrigin ??= quad.Centre;
-
-            foreach (var h in hitObjects)
-            {
-                h.Position = GeometryUtils.RotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
-
-                if (h is IHasPath path)
-                {
-                    foreach (PathControlPoint cp in path.Path.ControlPoints)
-                        cp.Position = GeometryUtils.RotatePointAroundOrigin(cp.Position, Vector2.Zero, delta);
-                }
-            }
-
-            // this isn't always the case but let's be lenient for now.
-            return true;
-        }
+            SelectedItems = { BindTarget = SelectedItems }
+        };
 
         private void scaleSlider(Slider slider, Vector2 scale)
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
new file mode 100644
index 0000000000..0eb7637786
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
@@ -0,0 +1,98 @@
+// 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.Bindables;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Utils;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public class OsuSelectionRotationHandler : SelectionRotationHandler
+    {
+        private readonly IEditorChangeHandler? changeHandler;
+
+        public BindableList<HitObject> SelectedItems { get; } = new BindableList<HitObject>();
+
+        public OsuSelectionRotationHandler(IEditorChangeHandler? changeHandler)
+        {
+            this.changeHandler = changeHandler;
+
+            SelectedItems.CollectionChanged += (_, __) => updateState();
+        }
+
+        private void updateState()
+        {
+            var quad = GeometryUtils.GetSurroundingQuad(selectedMovableObjects);
+            CanRotate.Value = quad.Width > 0 || quad.Height > 0;
+        }
+
+        private OsuHitObject[]? objectsInRotation;
+
+        private Vector2? defaultOrigin;
+        private Dictionary<OsuHitObject, Vector2>? originalPositions;
+        private Dictionary<IHasPath, Vector2[]>? originalPathControlPointPositions;
+
+        public override void Begin()
+        {
+            if (objectsInRotation != null)
+                throw new InvalidOperationException($"Cannot {nameof(Begin)} a rotate operation while another is in progress!");
+
+            changeHandler?.BeginChange();
+
+            objectsInRotation = selectedMovableObjects.ToArray();
+            defaultOrigin = GeometryUtils.GetSurroundingQuad(objectsInRotation).Centre;
+            originalPositions = objectsInRotation.ToDictionary(obj => obj, obj => obj.Position);
+            originalPathControlPointPositions = objectsInRotation.OfType<IHasPath>().ToDictionary(
+                obj => obj,
+                obj => obj.Path.ControlPoints.Select(point => point.Position).ToArray());
+        }
+
+        public override void Update(float rotation, Vector2? origin = null)
+        {
+            if (objectsInRotation == null)
+                throw new InvalidOperationException($"Cannot {nameof(Update)} a rotate operation without calling {nameof(Begin)} first!");
+
+            Debug.Assert(originalPositions != null && originalPathControlPointPositions != null && defaultOrigin != null);
+
+            Vector2 actualOrigin = origin ?? defaultOrigin.Value;
+
+            foreach (var ho in objectsInRotation)
+            {
+                ho.Position = GeometryUtils.RotatePointAroundOrigin(originalPositions[ho], actualOrigin, rotation);
+
+                if (ho is IHasPath withPath)
+                {
+                    var originalPath = originalPathControlPointPositions[withPath];
+
+                    for (int i = 0; i < withPath.Path.ControlPoints.Count; ++i)
+                        withPath.Path.ControlPoints[i].Position = GeometryUtils.RotatePointAroundOrigin(originalPath[i], Vector2.Zero, rotation);
+                }
+            }
+        }
+
+        public override void Commit()
+        {
+            if (objectsInRotation == null)
+                throw new InvalidOperationException($"Cannot {nameof(Commit)} a rotate operation without calling {nameof(Begin)} first!");
+
+            changeHandler?.EndChange();
+
+            objectsInRotation = null;
+            originalPositions = null;
+            originalPathControlPointPositions = null;
+            defaultOrigin = null;
+        }
+
+        private IEnumerable<OsuHitObject> selectedMovableObjects => SelectedItems.Cast<OsuHitObject>()
+                                                                                 .Where(h => h is not Spinner);
+    }
+}

From f8047d6ab6d96bf9c7b87fcf50b93e2b084da2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 19:48:39 +0200
Subject: [PATCH 0044/2296] Migrate skin element rotation handling to
 `SelectionRotationHandler`

---
 .../SkinEditor/SkinSelectionHandler.cs        | 29 +-----
 .../SkinSelectionRotationHandler.cs           | 94 +++++++++++++++++++
 2 files changed, 98 insertions(+), 25 deletions(-)
 create mode 100644 osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 4a1ddd9d69..bee973bea0 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -26,31 +26,11 @@ namespace osu.Game.Overlays.SkinEditor
         [Resolved]
         private SkinEditor skinEditor { get; set; } = null!;
 
-        public override bool HandleRotation(float angle)
+        public override SelectionRotationHandler CreateRotationHandler() => new SkinSelectionRotationHandler(ChangeHandler)
         {
-            if (SelectedBlueprints.Count == 1)
-            {
-                // for single items, rotate around the origin rather than the selection centre.
-                ((Drawable)SelectedBlueprints.First().Item).Rotation += angle;
-            }
-            else
-            {
-                var selectionQuad = getSelectionQuad();
-
-                foreach (var b in SelectedBlueprints)
-                {
-                    var drawableItem = (Drawable)b.Item;
-
-                    var rotatedPosition = GeometryUtils.RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, selectionQuad.Centre, angle);
-                    updateDrawablePosition(drawableItem, rotatedPosition);
-
-                    drawableItem.Rotation += angle;
-                }
-            }
-
-            // this isn't always the case but let's be lenient for now.
-            return true;
-        }
+            SelectedItems = { BindTarget = SelectedItems },
+            UpdatePosition = updateDrawablePosition
+        };
 
         public override bool HandleScale(Vector2 scale, Anchor anchor)
         {
@@ -172,7 +152,6 @@ namespace osu.Game.Overlays.SkinEditor
         {
             base.OnSelectionChanged();
 
-            SelectionBox.CanRotate = true;
             SelectionBox.CanScaleX = true;
             SelectionBox.CanScaleY = true;
             SelectionBox.CanFlipX = true;
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
new file mode 100644
index 0000000000..e60e2b1e12
--- /dev/null
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
@@ -0,0 +1,94 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Skinning;
+using osu.Game.Utils;
+using osuTK;
+
+namespace osu.Game.Overlays.SkinEditor
+{
+    public class SkinSelectionRotationHandler : SelectionRotationHandler
+    {
+        private readonly IEditorChangeHandler? changeHandler;
+
+        public BindableList<ISerialisableDrawable> SelectedItems { get; } = new BindableList<ISerialisableDrawable>();
+        public Action<Drawable, Vector2> UpdatePosition { get; init; } = null!;
+
+        public SkinSelectionRotationHandler(IEditorChangeHandler? changeHandler)
+        {
+            this.changeHandler = changeHandler;
+
+            SelectedItems.CollectionChanged += (_, __) => updateState();
+        }
+
+        private void updateState()
+        {
+            CanRotate.Value = SelectedItems.Count > 0;
+        }
+
+        private Drawable[]? objectsInRotation;
+
+        private Vector2? defaultOrigin;
+        private Dictionary<Drawable, float>? originalRotations;
+        private Dictionary<Drawable, Vector2>? originalPositions;
+
+        public override void Begin()
+        {
+            if (objectsInRotation != null)
+                throw new InvalidOperationException($"Cannot {nameof(Begin)} a rotate operation while another is in progress!");
+
+            changeHandler?.BeginChange();
+
+            objectsInRotation = SelectedItems.Cast<Drawable>().ToArray();
+            originalRotations = objectsInRotation.ToDictionary(d => d, d => d.Rotation);
+            originalPositions = objectsInRotation.ToDictionary(d => d, d => d.ToScreenSpace(d.OriginPosition));
+            defaultOrigin = GeometryUtils.GetSurroundingQuad(objectsInRotation.SelectMany(d => d.ScreenSpaceDrawQuad.GetVertices().ToArray())).Centre;
+        }
+
+        public override void Update(float rotation, Vector2? origin = null)
+        {
+            if (objectsInRotation == null)
+                throw new InvalidOperationException($"Cannot {nameof(Update)} a rotate operation without calling {nameof(Begin)} first!");
+
+            Debug.Assert(originalRotations != null && originalPositions != null && defaultOrigin != null);
+
+            if (objectsInRotation.Length == 1 && origin == null)
+            {
+                // for single items, rotate around the origin rather than the selection centre by default.
+                objectsInRotation[0].Rotation = originalRotations.Single().Value + rotation;
+                return;
+            }
+
+            var actualOrigin = origin ?? defaultOrigin.Value;
+
+            foreach (var drawableItem in objectsInRotation)
+            {
+                var rotatedPosition = GeometryUtils.RotatePointAroundOrigin(originalPositions[drawableItem], actualOrigin, rotation);
+                UpdatePosition(drawableItem, rotatedPosition);
+
+                drawableItem.Rotation = originalRotations[drawableItem] + rotation;
+            }
+        }
+
+        public override void Commit()
+        {
+            if (objectsInRotation == null)
+                throw new InvalidOperationException($"Cannot {nameof(Commit)} a rotate operation without calling {nameof(Begin)} first!");
+
+            changeHandler?.EndChange();
+
+            objectsInRotation = null;
+            originalPositions = null;
+            originalRotations = null;
+            defaultOrigin = null;
+        }
+    }
+}

From 21df0e2d60824ea1e34cd88f60741484d251d049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 19:57:31 +0200
Subject: [PATCH 0045/2296] Migrate test to `SelectionRotationHandler`

---
 .../Editing/TestSceneComposeSelectBox.cs      | 50 ++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 7a0b3d0c1a..147488812e 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -3,7 +3,9 @@
 
 #nullable disable
 
+using System;
 using System.Linq;
+using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -34,13 +36,12 @@ namespace osu.Game.Tests.Visual.Editing
                     {
                         RelativeSizeAxes = Axes.Both,
 
-                        CanRotate = true,
                         CanScaleX = true,
                         CanScaleY = true,
                         CanFlipX = true,
                         CanFlipY = true,
 
-                        OnRotation = handleRotation,
+                        RotationHandler = new TestSelectionRotationHandler(() => selectionArea),
                         OnScale = handleScale
                     }
                 }
@@ -71,11 +72,48 @@ namespace osu.Game.Tests.Visual.Editing
             return true;
         }
 
-        private bool handleRotation(float angle)
+        private class TestSelectionRotationHandler : SelectionRotationHandler
         {
-            // kinda silly and wrong, but just showing that the drag handles work.
-            selectionArea.Rotation += angle;
-            return true;
+            private readonly Func<Container> getTargetContainer;
+
+            public TestSelectionRotationHandler(Func<Container> getTargetContainer)
+            {
+                this.getTargetContainer = getTargetContainer;
+
+                CanRotate.Value = true;
+            }
+
+            [CanBeNull]
+            private Container targetContainer;
+
+            private float? initialRotation;
+
+            public override void Begin()
+            {
+                if (targetContainer != null)
+                    throw new InvalidOperationException($"Cannot {nameof(Begin)} a rotate operation while another is in progress!");
+
+                targetContainer = getTargetContainer();
+                initialRotation = targetContainer!.Rotation;
+            }
+
+            public override void Update(float rotation, Vector2? origin = null)
+            {
+                if (targetContainer == null)
+                    throw new InvalidOperationException($"Cannot {nameof(Update)} a rotate operation without calling {nameof(Begin)} first!");
+
+                // kinda silly and wrong, but just showing that the drag handles work.
+                targetContainer.Rotation = initialRotation!.Value + rotation;
+            }
+
+            public override void Commit()
+            {
+                if (targetContainer == null)
+                    throw new InvalidOperationException($"Cannot {nameof(Commit)} a rotate operation without calling {nameof(Begin)} first!");
+
+                targetContainer = null;
+                initialRotation = null;
+            }
         }
 
         [Test]

From aec3ca250cc3301415d0ba38bc0058b2a2463205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 20:01:30 +0200
Subject: [PATCH 0046/2296] Migrate `SelectionHandler` to use
 `SelectionRotationHandler`

---
 .../Edit/OsuSelectionHandler.cs               |  1 -
 .../Edit/Compose/Components/SelectionBox.cs   | 41 ++++++++-----------
 .../Components/SelectionBoxRotationHandle.cs  | 20 +++++----
 .../Compose/Components/SelectionHandler.cs    |  2 +-
 .../Components/SelectionRotationHandler.cs    |  9 +++-
 5 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 1d46b8ff8a..1dfbf4179b 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad quad = selectedMovableObjects.Length > 0 ? GeometryUtils.GetSurroundingQuad(selectedMovableObjects) : new Quad();
 
-            SelectionBox.CanRotate = quad.Width > 0 || quad.Height > 0;
             SelectionBox.CanFlipX = SelectionBox.CanScaleX = quad.Width > 0;
             SelectionBox.CanFlipY = SelectionBox.CanScaleY = quad.Height > 0;
             SelectionBox.CanReverse = EditorBeatmap.SelectedHitObjects.Count > 1 || EditorBeatmap.SelectedHitObjects.Any(s => s is Slider);
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 5d9fac739c..53442071b5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -22,7 +23,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private const float button_padding = 5;
 
-        public Func<float, bool>? OnRotation;
+        public SelectionRotationHandler? RotationHandler { get; init; }
         public Func<Vector2, Anchor, bool>? OnScale;
         public Func<Direction, bool, bool>? OnFlip;
         public Func<bool>? OnReverse;
@@ -51,22 +52,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private bool canRotate;
-
-        /// <summary>
-        /// Whether rotation support should be enabled.
-        /// </summary>
-        public bool CanRotate
-        {
-            get => canRotate;
-            set
-            {
-                if (canRotate == value) return;
-
-                canRotate = value;
-                recreate();
-            }
-        }
+        private IBindable<bool> canRotate = new BindableBool();
 
         private bool canScaleX;
 
@@ -161,7 +147,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private OsuColour colours { get; set; } = null!;
 
         [BackgroundDependencyLoader]
-        private void load() => recreate();
+        private void load()
+        {
+            if (RotationHandler != null)
+                canRotate.BindTo(RotationHandler.CanRotate);
+
+            canRotate.BindValueChanged(_ => recreate());
+            recreate();
+        }
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
@@ -174,10 +167,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     return CanReverse && reverseButton?.TriggerClick() == true;
 
                 case Key.Comma:
-                    return CanRotate && rotateCounterClockwiseButton?.TriggerClick() == true;
+                    return canRotate.Value && rotateCounterClockwiseButton?.TriggerClick() == true;
 
                 case Key.Period:
-                    return CanRotate && rotateClockwiseButton?.TriggerClick() == true;
+                    return canRotate.Value && rotateClockwiseButton?.TriggerClick() == true;
             }
 
             return base.OnKeyDown(e);
@@ -254,14 +247,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (CanScaleY) addYScaleComponents();
             if (CanFlipX) addXFlipComponents();
             if (CanFlipY) addYFlipComponents();
-            if (CanRotate) addRotationComponents();
+            if (canRotate.Value) addRotationComponents();
             if (CanReverse) reverseButton = addButton(FontAwesome.Solid.Backward, "Reverse pattern (Ctrl-G)", () => OnReverse?.Invoke());
         }
 
         private void addRotationComponents()
         {
-            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise (Ctrl-<)", () => OnRotation?.Invoke(-90));
-            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise (Ctrl->)", () => OnRotation?.Invoke(90));
+            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise (Ctrl-<)", () => RotationHandler?.Rotate(-90));
+            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise (Ctrl->)", () => RotationHandler?.Rotate(90));
 
             addRotateHandle(Anchor.TopLeft);
             addRotateHandle(Anchor.TopRight);
@@ -331,7 +324,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             var handle = new SelectionBoxRotationHandle
             {
                 Anchor = anchor,
-                HandleRotate = angle => OnRotation?.Invoke(angle)
+                RotationHandler = RotationHandler
             };
 
             handle.OperationStarted += operationStarted;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index c2a3f12efd..4107a09692 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
@@ -21,7 +22,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public partial class SelectionBoxRotationHandle : SelectionBoxDragHandle, IHasTooltip
     {
-        public Action<float> HandleRotate { get; set; }
+        [CanBeNull]
+        public SelectionRotationHandler RotationHandler { get; init; }
 
         public LocalisableString TooltipText { get; private set; }
 
@@ -63,10 +65,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnDragStart(DragStartEvent e)
         {
-            bool handle = base.OnDragStart(e);
-            if (handle)
-                cumulativeRotation.Value = 0;
-            return handle;
+            if (RotationHandler == null) return false;
+
+            RotationHandler.Begin();
+            return true;
         }
 
         protected override void OnDrag(DragEvent e)
@@ -99,7 +101,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            base.OnDragEnd(e);
+            RotationHandler?.Commit();
+            UpdateHoverState();
+
             cumulativeRotation.Value = null;
             rawCumulativeRotation = 0;
             TooltipText = default;
@@ -116,14 +120,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void applyRotation(bool shouldSnap)
         {
-            float oldRotation = cumulativeRotation.Value ?? 0;
-
             float newRotation = shouldSnap ? snap(rawCumulativeRotation, snap_step) : MathF.Round(rawCumulativeRotation);
             newRotation = (newRotation - 180) % 360 + 180;
 
             cumulativeRotation.Value = newRotation;
 
-            HandleRotate?.Invoke(newRotation - oldRotation);
+            RotationHandler?.Update(newRotation);
             TooltipText = shouldSnap ? EditorStrings.RotationSnapped(newRotation) : EditorStrings.RotationUnsnapped(newRotation);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 80df796fd7..31ad8fa3d7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OperationStarted = OnOperationBegan,
                 OperationEnded = OnOperationEnded,
 
-                OnRotation = HandleRotation,
+                RotationHandler = RotationHandler,
                 OnScale = HandleScale,
                 OnFlip = HandleFlip,
                 OnReverse = HandleReverse,
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
index 595edbb4fc..d5dd1d38d4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
@@ -16,11 +16,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public Bindable<bool> CanRotate { get; private set; } = new BindableBool();
 
+        public void Rotate(float rotation, Vector2? origin = null)
+        {
+            Begin();
+            Update(rotation, origin);
+            Commit();
+        }
+
         public virtual void Begin()
         {
         }
 
-        public virtual void Update(float rotation, Vector2 origin)
+        public virtual void Update(float rotation, Vector2? origin = null)
         {
         }
 

From a201152b042e0dfb13a4abaca85def6b5fc23577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jul 2023 20:09:31 +0200
Subject: [PATCH 0047/2296] Add xmldoc to `SelectionRotationHandler`

---
 .../Components/SelectionRotationHandler.cs    | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
index d5dd1d38d4..6524f7fa35 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
@@ -16,6 +16,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public Bindable<bool> CanRotate { get; private set; } = new BindableBool();
 
+        /// <summary>
+        /// Performs a single, instant, atomic rotation operation.
+        /// </summary>
+        /// <remarks>
+        /// This method is intended to be used in atomic contexts (such as when pressing a single button).
+        /// For continuous operations, see the <see cref="Begin"/>-<see cref="Update"/>-<see cref="Commit"/> flow.
+        /// </remarks>
+        /// <param name="rotation">Rotation to apply in degrees.</param>
+        /// <param name="origin">
+        /// The origin point to rotate around.
+        /// If the default <see langword="null"/> value is supplied, a sane implementation-defined default will be used.
+        /// </param>
         public void Rotate(float rotation, Vector2? origin = null)
         {
             Begin();
@@ -23,14 +35,48 @@ namespace osu.Game.Screens.Edit.Compose.Components
             Commit();
         }
 
+        /// <summary>
+        /// Begins a continuous rotation operation.
+        /// </summary>
+        /// <remarks>
+        /// This flow is intended to be used when a rotation operation is made incrementally (such as when dragging a rotation handle or slider).
+        /// For instantaneous, atomic operations, use the convenience <see cref="Rotate"/> method.
+        /// </remarks>
         public virtual void Begin()
         {
         }
 
+        /// <summary>
+        /// Updates a continuous rotation operation.
+        /// Must be preceded by a <see cref="Begin"/> call.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This flow is intended to be used when a rotation operation is made incrementally (such as when dragging a rotation handle or slider).
+        /// As such, the values of <paramref name="rotation"/> and <paramref name="origin"/> supplied should be relative to the state of the objects being rotated
+        /// when <see cref="Begin"/> was called, rather than instantaneous deltas.
+        /// </para>
+        /// <para>
+        /// For instantaneous, atomic operations, use the convenience <see cref="Rotate"/> method.
+        /// </para>
+        /// </remarks>
+        /// <param name="rotation">Rotation to apply in degrees.</param>
+        /// <param name="origin">
+        /// The origin point to rotate around.
+        /// If the default <see langword="null"/> value is supplied, a sane implementation-defined default will be used.
+        /// </param>
         public virtual void Update(float rotation, Vector2? origin = null)
         {
         }
 
+        /// <summary>
+        /// Ends a continuous rotation operation.
+        /// Must be preceded by a <see cref="Begin"/> call.
+        /// </summary>
+        /// <remarks>
+        /// This flow is intended to be used when a rotation operation is made incrementally (such as when dragging a rotation handle or slider).
+        /// For instantaneous, atomic operations, use the convenience <see cref="Rotate"/> method.
+        /// </remarks>
         public virtual void Commit()
         {
         }

From 060ad36d601d613c7f81e06e3e4ca1acca4b1d43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 20:19:03 +0900
Subject: [PATCH 0048/2296] Add test coverage of music control in editor from
 external

---
 .../TestSceneBeatmapEditorNavigation.cs       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 5483be5676..54ee1659e1 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -170,6 +170,39 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("time is correct", () => getEditor().ChildrenOfType<EditorClock>().First().CurrentTime, () => Is.EqualTo(1234));
         }
 
+        [Test]
+        public void TestAttemptGlobalMusicOperationFromEditor()
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("import test beatmap", () => Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely());
+            AddStep("retrieve beatmap", () => beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach());
+
+            AddStep("present beatmap", () => Game.PresentBeatmap(beatmapSet));
+            AddUntilStep("wait for song select",
+                () => Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
+                      && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
+                      && songSelect.IsLoaded);
+
+            AddUntilStep("wait for music playing", () => Game.MusicController.IsPlaying);
+            AddStep("user request stop", () => Game.MusicController.Stop(requestedByUser: true));
+            AddUntilStep("wait for music stopped", () => !Game.MusicController.IsPlaying);
+
+            AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
+            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
+
+            AddUntilStep("music still stopped", () => !Game.MusicController.IsPlaying);
+            AddStep("user request play", () => Game.MusicController.Play(requestedByUser: true));
+            AddUntilStep("music still stopped", () => !Game.MusicController.IsPlaying);
+
+            AddStep("exit to song select", () => Game.PerformFromScreen(_ => { }, typeof(PlaySongSelect).Yield()));
+            AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+
+            AddUntilStep("wait for music playing", () => Game.MusicController.IsPlaying);
+            AddStep("user request stop", () => Game.MusicController.Stop(requestedByUser: true));
+            AddUntilStep("wait for music stopped", () => !Game.MusicController.IsPlaying);
+        }
+
         private EditorBeatmap getEditorBeatmap() => getEditor().ChildrenOfType<EditorBeatmap>().Single();
 
         private Editor getEditor() => (Editor)Game.ScreenStack.CurrentScreen;

From 157b1f301b11ad6887b79edbe31e386d21f2c674 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 19:58:23 +0900
Subject: [PATCH 0049/2296] Rename `AllowTrackAdjustments` to more
 understandable `ApplyModTrackAdjustments`

---
 .../Visual/TestSceneOsuScreenStack.cs         | 26 +++++++++----------
 .../Overlays/FirstRunSetup/ScreenUIScale.cs   |  2 +-
 osu.Game/Overlays/MusicController.cs          | 14 +++++-----
 osu.Game/Screens/Edit/Editor.cs               |  2 +-
 osu.Game/Screens/IOsuScreen.cs                |  2 +-
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  2 +-
 .../Spectate/MultiSpectatorScreen.cs          |  2 +-
 osu.Game/Screens/OsuScreen.cs                 | 14 +++++-----
 osu.Game/Screens/Play/Player.cs               |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  2 +-
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs b/osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs
index 7f01a67903..6b39717354 100644
--- a/osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs
+++ b/osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs
@@ -56,38 +56,38 @@ namespace osu.Game.Tests.Visual
         public void AllowTrackAdjustmentsTest()
         {
             AddStep("push allowing screen", () => stack.Push(loadNewScreen<AllowScreen>()));
-            AddAssert("allows adjustments 1", () => musicController.AllowTrackAdjustments);
+            AddAssert("allows adjustments 1", () => musicController.ApplyModTrackAdjustments);
 
             AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>()));
-            AddAssert("allows adjustments 2", () => musicController.AllowTrackAdjustments);
+            AddAssert("allows adjustments 2", () => musicController.ApplyModTrackAdjustments);
 
             AddStep("push disallowing screen", () => stack.Push(loadNewScreen<DisallowScreen>()));
-            AddAssert("disallows adjustments 3", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 3", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>()));
-            AddAssert("disallows adjustments 4", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 4", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>()));
-            AddAssert("disallows adjustments 5", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 5", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("push allowing screen", () => stack.Push(loadNewScreen<AllowScreen>()));
-            AddAssert("allows adjustments 6", () => musicController.AllowTrackAdjustments);
+            AddAssert("allows adjustments 6", () => musicController.ApplyModTrackAdjustments);
 
             // Now start exiting from screens
             AddStep("exit screen", () => stack.Exit());
-            AddAssert("disallows adjustments 7", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 7", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("exit screen", () => stack.Exit());
-            AddAssert("disallows adjustments 8", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 8", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("exit screen", () => stack.Exit());
-            AddAssert("disallows adjustments 9", () => !musicController.AllowTrackAdjustments);
+            AddAssert("disallows adjustments 9", () => !musicController.ApplyModTrackAdjustments);
 
             AddStep("exit screen", () => stack.Exit());
-            AddAssert("allows adjustments 10", () => musicController.AllowTrackAdjustments);
+            AddAssert("allows adjustments 10", () => musicController.ApplyModTrackAdjustments);
 
             AddStep("exit screen", () => stack.Exit());
-            AddAssert("allows adjustments 11", () => musicController.AllowTrackAdjustments);
+            AddAssert("allows adjustments 11", () => musicController.ApplyModTrackAdjustments);
         }
 
         public partial class TestScreen : ScreenWithBeatmapBackground
@@ -129,12 +129,12 @@ namespace osu.Game.Tests.Visual
 
         private partial class AllowScreen : OsuScreen
         {
-            public override bool? AllowTrackAdjustments => true;
+            public override bool? ApplyModTrackAdjustments => true;
         }
 
         public partial class DisallowScreen : OsuScreen
         {
-            public override bool? AllowTrackAdjustments => false;
+            public override bool? ApplyModTrackAdjustments => false;
         }
 
         private partial class InheritScreen : OsuScreen
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs b/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
index e3cd2ae36c..02f0ad9506 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.FirstRunSetup
         {
             protected override bool ControlGlobalMusic => false;
 
-            public override bool? AllowTrackAdjustments => false;
+            public override bool? ApplyModTrackAdjustments => false;
         }
 
         private partial class UIScaleSlider : RoundedSliderBar<float>
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 0d175a624c..562140f5cb 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -356,20 +356,20 @@ namespace osu.Game.Overlays
                 NextTrack();
         }
 
-        private bool allowTrackAdjustments;
+        private bool applyModTrackAdjustments;
 
         /// <summary>
         /// Whether mod track adjustments are allowed to be applied.
         /// </summary>
-        public bool AllowTrackAdjustments
+        public bool ApplyModTrackAdjustments
         {
-            get => allowTrackAdjustments;
+            get => applyModTrackAdjustments;
             set
             {
-                if (allowTrackAdjustments == value)
+                if (applyModTrackAdjustments == value)
                     return;
 
-                allowTrackAdjustments = value;
+                applyModTrackAdjustments = value;
                 ResetTrackAdjustments();
             }
         }
@@ -377,7 +377,7 @@ namespace osu.Game.Overlays
         private AudioAdjustments modTrackAdjustments;
 
         /// <summary>
-        /// Resets the adjustments currently applied on <see cref="CurrentTrack"/> and applies the mod adjustments if <see cref="AllowTrackAdjustments"/> is <c>true</c>.
+        /// Resets the adjustments currently applied on <see cref="CurrentTrack"/> and applies the mod adjustments if <see cref="ApplyModTrackAdjustments"/> is <c>true</c>.
         /// </summary>
         /// <remarks>
         /// Does not reset any adjustments applied directly to the beatmap track.
@@ -390,7 +390,7 @@ namespace osu.Game.Overlays
             CurrentTrack.RemoveAllAdjustments(AdjustableProperty.Tempo);
             CurrentTrack.RemoveAllAdjustments(AdjustableProperty.Volume);
 
-            if (allowTrackAdjustments)
+            if (applyModTrackAdjustments)
             {
                 CurrentTrack.BindAdjustments(modTrackAdjustments = new AudioAdjustments());
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 17e5eb8ef6..b885eee46f 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Edit
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
-        public override bool? AllowTrackAdjustments => false;
+        public override bool? ApplyModTrackAdjustments => false;
 
         protected override bool PlayExitSound => !ExitConfirmed && !switchingDifficulty;
 
diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index cceede5424..756fbb80a7 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens
         /// Whether mod track adjustments should be applied on entering this screen.
         /// A <see langword="null"/> value means that the parent screen's value of this setting will be used.
         /// </summary>
-        bool? AllowTrackAdjustments { get; }
+        bool? ApplyModTrackAdjustments { get; }
 
         /// <summary>
         /// Invoked when the back button has been pressed to close any overlays before exiting this <see cref="IOsuScreen"/>.
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 75b673cf1b..8d08de4168 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Cached(typeof(IBindable<PlaylistItem>))]
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
-        public override bool? AllowTrackAdjustments => true;
+        public override bool? ApplyModTrackAdjustments => true;
 
         protected override BackgroundScreen CreateBackground() => new RoomBackgroundScreen(Room.Playlist.FirstOrDefault())
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 2d2aa0f1d5..92ce86bef2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
         // We are managing our own adjustments. For now, this happens inside the Player instances themselves.
-        public override bool? AllowTrackAdjustments => false;
+        public override bool? ApplyModTrackAdjustments => false;
 
         /// <summary>
         /// Whether all spectating players have finished loading.
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 9c098794a6..869d14c030 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Screens
         [Resolved]
         private MusicController musicController { get; set; }
 
-        public virtual bool? AllowTrackAdjustments => null;
+        public virtual bool? ApplyModTrackAdjustments => null;
 
         public Bindable<WorkingBeatmap> Beatmap { get; private set; }
 
@@ -95,7 +95,7 @@ namespace osu.Game.Screens
 
         private OsuScreenDependencies screenDependencies;
 
-        private bool? trackAdjustmentStateAtSuspend;
+        private bool? modTrackAdjustmentStateAtSuspend;
 
         internal void CreateLeasedDependencies(IReadOnlyDependencyContainer dependencies) => createDependencies(dependencies);
 
@@ -178,8 +178,8 @@ namespace osu.Game.Screens
 
             // it's feasible to resume to a screen if the target screen never loaded successfully.
             // in such a case there's no need to restore this value.
-            if (trackAdjustmentStateAtSuspend != null)
-                musicController.AllowTrackAdjustments = trackAdjustmentStateAtSuspend.Value;
+            if (modTrackAdjustmentStateAtSuspend != null)
+                musicController.ApplyModTrackAdjustments = modTrackAdjustmentStateAtSuspend.Value;
 
             base.OnResuming(e);
         }
@@ -188,7 +188,7 @@ namespace osu.Game.Screens
         {
             base.OnSuspending(e);
 
-            trackAdjustmentStateAtSuspend = musicController.AllowTrackAdjustments;
+            modTrackAdjustmentStateAtSuspend = musicController.ApplyModTrackAdjustments;
 
             onSuspendingLogo();
         }
@@ -197,8 +197,8 @@ namespace osu.Game.Screens
         {
             applyArrivingDefaults(false);
 
-            if (AllowTrackAdjustments != null)
-                musicController.AllowTrackAdjustments = AllowTrackAdjustments.Value;
+            if (ApplyModTrackAdjustments != null)
+                musicController.ApplyModTrackAdjustments = ApplyModTrackAdjustments.Value;
 
             if (backgroundStack?.Push(ownedBackground = CreateBackground()) != true)
             {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 379c10a4a4..e2e8b71c10 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Play
         protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
 
         // We are managing our own adjustments (see OnEntering/OnExiting).
-        public override bool? AllowTrackAdjustments => false;
+        public override bool? ApplyModTrackAdjustments => false;
 
         private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 47e5325baf..58755878d0 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Select
 
         protected virtual bool ShowFooter => true;
 
-        public override bool? AllowTrackAdjustments => true;
+        public override bool? ApplyModTrackAdjustments => true;
 
         /// <summary>
         /// Can be null if <see cref="ShowFooter"/> is false.

From 6146f30541086bc1d9b2bb85a03194d663c7d1b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 20:00:18 +0900
Subject: [PATCH 0050/2296] Allow screens to change the ability to interact
 with the global track

---
 .../Overlays/Music/MusicKeyBindingHandler.cs  |  8 +-----
 osu.Game/Overlays/MusicController.cs          | 28 +++++++++++++++----
 osu.Game/Overlays/NowPlayingOverlay.cs        | 22 +++++++++------
 osu.Game/Screens/IOsuScreen.cs                |  6 ++++
 osu.Game/Screens/OsuScreen.cs                 | 10 +++++++
 5 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
index b7d265c448..78de76b981 100644
--- a/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
+++ b/osu.Game/Overlays/Music/MusicKeyBindingHandler.cs
@@ -30,20 +30,14 @@ namespace osu.Game.Overlays.Music
         [Resolved]
         private OnScreenDisplay? onScreenDisplay { get; set; }
 
-        [Resolved]
-        private OsuGame game { get; set; } = null!;
-
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
-            if (e.Repeat)
+            if (e.Repeat || !musicController.AllowTrackControl.Value)
                 return false;
 
             switch (e.Action)
             {
                 case GlobalAction.MusicPlay:
-                    if (game.LocalUserPlaying.Value)
-                        return false;
-
                     // use previous state as TogglePause may not update the track's state immediately (state update is run on the audio thread see https://github.com/ppy/osu/issues/9880#issuecomment-674668842)
                     bool wasPlaying = musicController.IsPlaying;
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 562140f5cb..665c61edf0 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -40,6 +40,11 @@ namespace osu.Game.Overlays
         /// </summary>
         public bool UserPauseRequested { get; private set; }
 
+        /// <summary>
+        /// Whether control of the global track should be allowed.
+        /// </summary>
+        public readonly BindableBool AllowTrackControl = new BindableBool(true);
+
         /// <summary>
         /// Fired when the global <see cref="WorkingBeatmap"/> has changed.
         /// Includes direction information for display purposes.
@@ -92,8 +97,10 @@ namespace osu.Game.Overlays
             seekDelegate?.Cancel();
             seekDelegate = Schedule(() =>
             {
-                if (!beatmap.Disabled)
-                    CurrentTrack.Seek(position);
+                if (beatmap.Disabled || !AllowTrackControl.Value)
+                    return;
+
+                CurrentTrack.Seek(position);
             });
         }
 
@@ -107,7 +114,7 @@ namespace osu.Game.Overlays
 
             if (CurrentTrack.IsDummyDevice || beatmap.Value.BeatmapSetInfo.DeletePending)
             {
-                if (beatmap.Disabled)
+                if (beatmap.Disabled || !AllowTrackControl.Value)
                     return;
 
                 Logger.Log($"{nameof(MusicController)} skipping next track to {nameof(EnsurePlayingSomething)}");
@@ -132,6 +139,9 @@ namespace osu.Game.Overlays
         /// <returns>Whether the operation was successful.</returns>
         public bool Play(bool restart = false, bool requestedByUser = false)
         {
+            if (requestedByUser && !AllowTrackControl.Value)
+                return false;
+
             if (requestedByUser)
                 UserPauseRequested = false;
 
@@ -153,6 +163,9 @@ namespace osu.Game.Overlays
         /// </param>
         public void Stop(bool requestedByUser = false)
         {
+            if (requestedByUser && !AllowTrackControl.Value)
+                return;
+
             UserPauseRequested |= requestedByUser;
             if (CurrentTrack.IsRunning)
                 CurrentTrack.StopAsync();
@@ -164,6 +177,9 @@ namespace osu.Game.Overlays
         /// <returns>Whether the operation was successful.</returns>
         public bool TogglePause()
         {
+            if (!AllowTrackControl.Value)
+                return false;
+
             if (CurrentTrack.IsRunning)
                 Stop(true);
             else
@@ -189,7 +205,7 @@ namespace osu.Game.Overlays
         /// <returns>The <see cref="PreviousTrackResult"/> that indicate the decided action.</returns>
         private PreviousTrackResult prev()
         {
-            if (beatmap.Disabled)
+            if (beatmap.Disabled || !AllowTrackControl.Value)
                 return PreviousTrackResult.None;
 
             double currentTrackPosition = CurrentTrack.CurrentTime;
@@ -229,7 +245,7 @@ namespace osu.Game.Overlays
 
         private bool next()
         {
-            if (beatmap.Disabled)
+            if (beatmap.Disabled || !AllowTrackControl.Value)
                 return false;
 
             queuedDirection = TrackChangeDirection.Next;
@@ -352,7 +368,7 @@ namespace osu.Game.Overlays
 
         private void onTrackCompleted()
         {
-            if (!CurrentTrack.Looping && !beatmap.Disabled)
+            if (!CurrentTrack.Looping && !beatmap.Disabled && AllowTrackControl.Value)
                 NextTrack();
         }
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 15eefb2d9f..78539fde7a 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Overlays
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private Bindable<bool> allowTrackControl;
+
         public NowPlayingOverlay()
         {
             Width = 400;
@@ -220,8 +222,10 @@ namespace osu.Game.Overlays
         {
             base.LoadComplete();
 
-            beatmap.BindDisabledChanged(_ => Scheduler.AddOnce(beatmapDisabledChanged));
-            beatmapDisabledChanged();
+            beatmap.BindDisabledChanged(_ => Scheduler.AddOnce(updateEnabledStates));
+
+            allowTrackControl = musicController.AllowTrackControl.GetBoundCopy();
+            allowTrackControl.BindValueChanged(_ => Scheduler.AddOnce(updateEnabledStates), true);
 
             musicController.TrackChanged += trackChanged;
             trackChanged(beatmap.Value);
@@ -334,16 +338,18 @@ namespace osu.Game.Overlays
             };
         }
 
-        private void beatmapDisabledChanged()
+        private void updateEnabledStates()
         {
-            bool disabled = beatmap.Disabled;
+            bool beatmapDisabled = beatmap.Disabled;
+            bool trackControlDisabled = !musicController.AllowTrackControl.Value;
 
-            if (disabled)
+            if (beatmapDisabled || trackControlDisabled)
                 playlist?.Hide();
 
-            prevButton.Enabled.Value = !disabled;
-            nextButton.Enabled.Value = !disabled;
-            playlistButton.Enabled.Value = !disabled;
+            prevButton.Enabled.Value = !beatmapDisabled && !trackControlDisabled;
+            nextButton.Enabled.Value = !beatmapDisabled && !trackControlDisabled;
+            playlistButton.Enabled.Value = !beatmapDisabled && !trackControlDisabled;
+            playButton.Enabled.Value = !trackControlDisabled;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/IOsuScreen.cs b/osu.Game/Screens/IOsuScreen.cs
index 756fbb80a7..5b4e2d75f4 100644
--- a/osu.Game/Screens/IOsuScreen.cs
+++ b/osu.Game/Screens/IOsuScreen.cs
@@ -69,6 +69,12 @@ namespace osu.Game.Screens
         /// </summary>
         bool? ApplyModTrackAdjustments { get; }
 
+        /// <summary>
+        /// Whether control of the global track should be allowed via the music controller / now playing overlay.
+        /// A <see langword="null"/> value means that the parent screen's value of this setting will be used.
+        /// </summary>
+        bool? AllowGlobalTrackControl { get; }
+
         /// <summary>
         /// Invoked when the back button has been pressed to close any overlays before exiting this <see cref="IOsuScreen"/>.
         /// </summary>
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 869d14c030..2dc9d5d49d 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -87,6 +87,8 @@ namespace osu.Game.Screens
 
         public virtual bool? ApplyModTrackAdjustments => null;
 
+        public virtual bool? AllowGlobalTrackControl => null;
+
         public Bindable<WorkingBeatmap> Beatmap { get; private set; }
 
         public Bindable<RulesetInfo> Ruleset { get; private set; }
@@ -95,6 +97,8 @@ namespace osu.Game.Screens
 
         private OsuScreenDependencies screenDependencies;
 
+        private bool? globalMusicControlStateAtSuspend;
+
         private bool? modTrackAdjustmentStateAtSuspend;
 
         internal void CreateLeasedDependencies(IReadOnlyDependencyContainer dependencies) => createDependencies(dependencies);
@@ -180,6 +184,8 @@ namespace osu.Game.Screens
             // in such a case there's no need to restore this value.
             if (modTrackAdjustmentStateAtSuspend != null)
                 musicController.ApplyModTrackAdjustments = modTrackAdjustmentStateAtSuspend.Value;
+            if (globalMusicControlStateAtSuspend != null)
+                musicController.AllowTrackControl.Value = globalMusicControlStateAtSuspend.Value;
 
             base.OnResuming(e);
         }
@@ -189,6 +195,7 @@ namespace osu.Game.Screens
             base.OnSuspending(e);
 
             modTrackAdjustmentStateAtSuspend = musicController.ApplyModTrackAdjustments;
+            globalMusicControlStateAtSuspend = musicController.AllowTrackControl.Value;
 
             onSuspendingLogo();
         }
@@ -200,6 +207,9 @@ namespace osu.Game.Screens
             if (ApplyModTrackAdjustments != null)
                 musicController.ApplyModTrackAdjustments = ApplyModTrackAdjustments.Value;
 
+            if (AllowGlobalTrackControl != null)
+                musicController.AllowTrackControl.Value = AllowGlobalTrackControl.Value;
+
             if (backgroundStack?.Push(ownedBackground = CreateBackground()) != true)
             {
                 // If the constructed instance was not actually pushed to the background stack, we don't want to track it unnecessarily.

From 3485b72eaa3885d337d5b71d9fa7c3a87809270f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Jul 2023 20:00:31 +0900
Subject: [PATCH 0051/2296] Disallow interacting with the global track state in
 `Player` and `Editor`

---
 osu.Game/Screens/Edit/Editor.cs           | 2 ++
 osu.Game/Screens/Play/Player.cs           | 2 ++
 osu.Game/Screens/Ranking/ResultsScreen.cs | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b885eee46f..d11297b3b2 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Screens.Edit
 
         public override bool? ApplyModTrackAdjustments => false;
 
+        public override bool? AllowGlobalTrackControl => false;
+
         protected override bool PlayExitSound => !ExitConfirmed && !switchingDifficulty;
 
         protected bool HasUnsavedChanges
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e2e8b71c10..956c4d4856 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -71,6 +71,8 @@ namespace osu.Game.Screens.Play
         // We are managing our own adjustments (see OnEntering/OnExiting).
         public override bool? ApplyModTrackAdjustments => false;
 
+        public override bool? AllowGlobalTrackControl => false;
+
         private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
 
         private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 96fed3e6ba..43ddcffb62 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Screens.Ranking
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        public override bool? AllowGlobalTrackControl => true;
+
         // Temporary for now to stop dual transitions. Should respect the current toolbar mode, but there's no way to do so currently.
         public override bool HideOverlaysOnEnter => true;
 

From 0bd34a4f13eb79a0dba578f5a17c20e872976a09 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 25 Jul 2023 21:14:21 -0700
Subject: [PATCH 0052/2296] Always show supporter-only playlist durations

---
 osu.Game/Localisation/OnlinePlayStrings.cs    | 19 +++++++
 .../Match/Components/RoomSettingsOverlay.cs   |  5 +-
 .../Playlists/PlaylistsRoomSettingsOverlay.cs | 55 +++++++++++++------
 3 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Localisation/OnlinePlayStrings.cs

diff --git a/osu.Game/Localisation/OnlinePlayStrings.cs b/osu.Game/Localisation/OnlinePlayStrings.cs
new file mode 100644
index 0000000000..e9f17cddc0
--- /dev/null
+++ b/osu.Game/Localisation/OnlinePlayStrings.cs
@@ -0,0 +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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class OnlinePlayStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.OnlinePlay";
+
+        /// <summary>
+        /// "This duration is only available for osu!supporters."
+        /// </summary>
+        public static LocalisableString SupporterOnlyDurationNotice => new TranslatableString(getKey(@"supporter_only_duration_notice"), @"This duration is only available for osu!supporters.");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
index 05232fe0e2..916b799d50 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
         protected partial class Section : Container
         {
-            private readonly Container content;
+            private readonly ReverseChildIDFillFlowContainer<Drawable> content;
 
             protected override Container<Drawable> Content => content;
 
@@ -135,10 +135,11 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
                             Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
                             Text = title.ToUpperInvariant(),
                         },
-                        content = new Container
+                        content = new ReverseChildIDFillFlowContainer<Drawable>
                         {
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
+                            Direction = FillDirection.Vertical
                         },
                     },
                 };
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
index e93f56c2e2..c69ccb7b1c 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
@@ -23,6 +23,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osuTK;
+using osu.Game.Localisation;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
@@ -80,6 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             private IBindable<APIUser> localUser = null!;
 
             private readonly Room room;
+            private OsuSpriteText durationNoticeText = null!;
 
             public MatchSettings(Room room)
             {
@@ -141,14 +143,22 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                         },
                                                         new Section("Duration")
                                                         {
-                                                            Child = new Container
+                                                            Children = new Drawable[]
                                                             {
-                                                                RelativeSizeAxes = Axes.X,
-                                                                Height = 40,
-                                                                Child = DurationField = new DurationDropdown
+                                                                new Container
                                                                 {
-                                                                    RelativeSizeAxes = Axes.X
-                                                                }
+                                                                    RelativeSizeAxes = Axes.X,
+                                                                    Height = 40,
+                                                                    Child = DurationField = new DurationDropdown
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X
+                                                                    },
+                                                                },
+                                                                durationNoticeText = new OsuSpriteText
+                                                                {
+                                                                    Alpha = 0,
+                                                                    Colour = colours.Yellow,
+                                                                },
                                                             }
                                                         },
                                                         new Section("Allowed attempts (across all playlist items)")
@@ -305,6 +315,17 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 MaxAttempts.BindValueChanged(count => MaxAttemptsField.Text = count.NewValue?.ToString(), true);
                 Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true);
 
+                DurationField.Current.BindValueChanged(duration =>
+                {
+                    if (selectedAvailableDuration)
+                        durationNoticeText.Hide();
+                    else
+                    {
+                        durationNoticeText.Show();
+                        durationNoticeText.Text = OnlinePlayStrings.SupporterOnlyDurationNotice;
+                    }
+                });
+
                 localUser = api.LocalUser.GetBoundCopy();
                 localUser.BindValueChanged(populateDurations, true);
 
@@ -314,6 +335,10 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
             private void populateDurations(ValueChangedEvent<APIUser> user)
             {
+                // roughly correct (see https://github.com/Humanizr/Humanizer/blob/18167e56c082449cc4fe805b8429e3127a7b7f93/readme.md?plain=1#L427)
+                // if we want this to be more accurate we might consider sending an actual end time, not a time span. probably not required though.
+                const int days_in_month = 31;
+
                 DurationField.Items = new[]
                 {
                     TimeSpan.FromMinutes(30),
@@ -326,18 +351,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     TimeSpan.FromDays(3),
                     TimeSpan.FromDays(7),
                     TimeSpan.FromDays(14),
+                    TimeSpan.FromDays(days_in_month),
+                    TimeSpan.FromDays(days_in_month * 3),
                 };
-
-                // TODO: show these in the interface at all times.
-                if (user.NewValue.IsSupporter)
-                {
-                    // roughly correct (see https://github.com/Humanizr/Humanizer/blob/18167e56c082449cc4fe805b8429e3127a7b7f93/readme.md?plain=1#L427)
-                    // if we want this to be more accurate we might consider sending an actual end time, not a time span. probably not required though.
-                    const int days_in_month = 31;
-
-                    DurationField.AddDropdownItem(TimeSpan.FromDays(days_in_month));
-                    DurationField.AddDropdownItem(TimeSpan.FromDays(days_in_month * 3));
-                }
             }
 
             protected override void Update()
@@ -352,7 +368,10 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             private void onPlaylistChanged(object? sender, NotifyCollectionChangedEventArgs e) =>
                 playlistLength.Text = $"Length: {Playlist.GetTotalDuration()}";
 
-            private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0;
+            private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0
+                                             && selectedAvailableDuration;
+
+            private bool selectedAvailableDuration => DurationField.Current.Value < TimeSpan.FromDays(31) || localUser.Value.IsSupporter;
 
             private void apply()
             {

From 39c2bb240bbd53c1d241313d6160be000fd9a205 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 14:03:12 +0900
Subject: [PATCH 0053/2296] Apply NRT to `SelectionBoxRotationHandle`.

---
 .../Compose/Components/SelectionBoxRotationHandle.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index 4107a09692..8665ec9b08 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
@@ -16,25 +13,24 @@ using osu.Framework.Localisation;
 using osu.Game.Localisation;
 using osuTK;
 using osuTK.Graphics;
-using Key = osuTK.Input.Key;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     public partial class SelectionBoxRotationHandle : SelectionBoxDragHandle, IHasTooltip
     {
-        [CanBeNull]
-        public SelectionRotationHandler RotationHandler { get; init; }
+        public SelectionRotationHandler? RotationHandler { get; init; }
 
         public LocalisableString TooltipText { get; private set; }
 
-        private SpriteIcon icon;
+        private SpriteIcon icon = null!;
 
         private const float snap_step = 15;
 
         private readonly Bindable<float?> cumulativeRotation = new Bindable<float?>();
 
         [Resolved]
-        private SelectionBox selectionBox { get; set; }
+        private SelectionBox selectionBox { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()

From 7fd6bb9d5f98c6ba74b06f827292a5cab875d322 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 14:04:16 +0900
Subject: [PATCH 0054/2296] Fix a couple of code style issues in `SelectionBox`

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 53442071b5..ed6bbf7668 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private IBindable<bool> canRotate = new BindableBool();
+        private readonly IBindable<bool> canRotate = new BindableBool();
 
         private bool canScaleX;
 
@@ -152,8 +152,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (RotationHandler != null)
                 canRotate.BindTo(RotationHandler.CanRotate);
 
-            canRotate.BindValueChanged(_ => recreate());
-            recreate();
+            canRotate.BindValueChanged(_ => recreate(), true);
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)

From 30e0e00c520d8072eb9cfe8fca2c0e2a14fd06e9 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 25 Jul 2023 22:57:01 -0700
Subject: [PATCH 0055/2296] Rename `selectedAvailableDuration` to
 `hasValidDuration`

---
 .../OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
index c69ccb7b1c..f7bd7fc530 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
@@ -317,7 +317,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
                 DurationField.Current.BindValueChanged(duration =>
                 {
-                    if (selectedAvailableDuration)
+                    if (hasValidDuration)
                         durationNoticeText.Hide();
                     else
                     {
@@ -369,9 +369,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 playlistLength.Text = $"Length: {Playlist.GetTotalDuration()}";
 
             private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0
-                                             && selectedAvailableDuration;
+                                             && hasValidDuration;
 
-            private bool selectedAvailableDuration => DurationField.Current.Value < TimeSpan.FromDays(31) || localUser.Value.IsSupporter;
+            private bool hasValidDuration => DurationField.Current.Value < TimeSpan.FromDays(31) || localUser.Value.IsSupporter;
 
             private void apply()
             {

From c1ba8fe175c9bff9e018f2409fbc3cfa041e4902 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 16:07:45 +0900
Subject: [PATCH 0056/2296] Rename `BackgroundBeatmapProcessor` to
 `BackgroundDataStoreProcessor`

---
 ...orTests.cs => BackgroundDataStoreProcessorTests.cs} |  8 ++++----
 ...mapProcessor.cs => BackgroundDataStoreProcessor.cs} | 10 +++++++---
 osu.Game/OsuGame.cs                                    |  2 +-
 osu.Game/Scoring/ScoreInfo.cs                          |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename osu.Game.Tests/Database/{BackgroundBeatmapProcessorTests.cs => BackgroundDataStoreProcessorTests.cs} (92%)
 rename osu.Game/{BackgroundBeatmapProcessor.cs => BackgroundDataStoreProcessor.cs} (97%)

diff --git a/osu.Game.Tests/Database/BackgroundBeatmapProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
similarity index 92%
rename from osu.Game.Tests/Database/BackgroundBeatmapProcessorTests.cs
rename to osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index c876316be4..15bb0fc09c 100644
--- a/osu.Game.Tests/Database/BackgroundBeatmapProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -15,7 +15,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Database
 {
     [HeadlessTest]
-    public partial class BackgroundBeatmapProcessorTests : OsuTestScene, ILocalUserPlayInfo
+    public partial class BackgroundDataStoreProcessorTests : OsuTestScene, ILocalUserPlayInfo
     {
         public IBindable<bool> IsPlaying => isPlaying;
 
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Database
 
             AddStep("Run background processor", () =>
             {
-                Add(new TestBackgroundBeatmapProcessor());
+                Add(new TestBackgroundDataStoreProcessor());
             });
 
             AddUntilStep("wait for difficulties repopulated", () =>
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Database
 
             AddStep("Run background processor", () =>
             {
-                Add(new TestBackgroundBeatmapProcessor());
+                Add(new TestBackgroundDataStoreProcessor());
             });
 
             AddWaitStep("wait some", 500);
@@ -124,7 +124,7 @@ namespace osu.Game.Tests.Database
             });
         }
 
-        public partial class TestBackgroundBeatmapProcessor : BackgroundBeatmapProcessor
+        public partial class TestBackgroundDataStoreProcessor : BackgroundDataStoreProcessor
         {
             protected override int TimeToSleepDuringGameplay => 10;
         }
diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
similarity index 97%
rename from osu.Game/BackgroundBeatmapProcessor.cs
rename to osu.Game/BackgroundDataStoreProcessor.cs
index b553fee503..c475a07c79 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -24,7 +24,10 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game
 {
-    public partial class BackgroundBeatmapProcessor : Component
+    /// <summary>
+    /// Performs background updating of data stores at startup.
+    /// </summary>
+    public partial class BackgroundDataStoreProcessor : Component
     {
         [Resolved]
         private RulesetStore rulesetStore { get; set; } = null!;
@@ -61,7 +64,8 @@ namespace osu.Game
 
             Task.Factory.StartNew(() =>
             {
-                Logger.Log("Beginning background beatmap processing..");
+                Logger.Log("Beginning background data store processing..");
+
                 checkForOutdatedStarRatings();
                 processBeatmapSetsWithMissingMetrics();
                 processScoresWithMissingStatistics();
@@ -74,7 +78,7 @@ namespace osu.Game
                     return;
                 }
 
-                Logger.Log("Finished background beatmap processing!");
+                Logger.Log("Finished background data store processing!");
             });
         }
 
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1a40bb8e3d..c60bff9e4c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1025,7 +1025,7 @@ namespace osu.Game
 
             loadComponentSingleFile(CreateHighPerformanceSession(), Add);
 
-            loadComponentSingleFile(new BackgroundBeatmapProcessor(), Add);
+            loadComponentSingleFile(new BackgroundDataStoreProcessor(), Add);
 
             Add(difficultyRecommender);
             Add(externalLinkOpener = new ExternalLinkOpener());
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index c6f4433824..a3bbb2c09e 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Scoring
         /// If this does not match <see cref="LegacyScoreEncoder.LATEST_VERSION"/>,
         /// the total score has not yet been updated to reflect the current scoring values.
         ///
-        /// See <see cref="BackgroundBeatmapProcessor"/>'s conversion logic.
+        /// See <see cref="BackgroundDataStoreProcessor"/>'s conversion logic.
         /// </summary>
         /// <remarks>
         /// This may not match the version stored in the replay files.

From 30baac0f3db82d4df246c75bb458113be90c210e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 16:08:02 +0900
Subject: [PATCH 0057/2296] Avoid reprocessing scores which already failed an
 upgrade previously

Closes https://github.com/ppy/osu/issues/24301.
---
 osu.Game/BackgroundDataStoreProcessor.cs | 6 ++++--
 osu.Game/Database/RealmAccess.cs         | 3 ++-
 osu.Game/Scoring/ScoreInfo.cs            | 9 +++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index c475a07c79..ae9e9527de 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -186,7 +186,7 @@ namespace osu.Game
 
             realmAccess.Run(r =>
             {
-                foreach (var score in r.All<ScoreInfo>())
+                foreach (var score in r.All<ScoreInfo>().Where(s => !s.TotalScoreUpgradeFailed))
                 {
                     if (score.BeatmapInfo != null
                         && score.Statistics.Sum(kvp => kvp.Value) > 0
@@ -225,6 +225,7 @@ namespace osu.Game
                 catch (Exception e)
                 {
                     Logger.Log(@$"Failed to populate maximum statistics for {id}: {e}");
+                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.TotalScoreUpgradeFailed = true);
                 }
             }
         }
@@ -234,7 +235,7 @@ namespace osu.Game
             Logger.Log("Querying for scores that need total score conversion...");
 
             HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>()
-                                                                             .Where(s => s.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
+                                                                             .Where(s => !s.TotalScoreUpgradeFailed && s.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
                                                                              .AsEnumerable().Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
@@ -283,6 +284,7 @@ namespace osu.Game
                 catch (Exception e)
                 {
                     Logger.Log($"Failed to convert total score for {id}: {e}");
+                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.TotalScoreUpgradeFailed = true);
                     ++failedCount;
                 }
             }
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index f32b161bb6..04a4b28fa4 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -82,8 +82,9 @@ namespace osu.Game.Database
         /// 30   2023-06-16    Run migration of old lazer scores again. This time with more correct rounding considerations.
         /// 31   2023-06-26    Add Version and LegacyTotalScore to ScoreInfo, set Version to 30000002 and copy TotalScore into LegacyTotalScore for legacy scores.
         /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
+        /// 33   2023-07-26    Add TotalScoreUpgradeFailed flag to ScoreInfo to track upgrade failures.
         /// </summary>
-        private const int schema_version = 32;
+        private const int schema_version = 33;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index a3bbb2c09e..c3a45332e4 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -81,6 +81,15 @@ namespace osu.Game.Scoring
         /// </remarks>
         public long? LegacyTotalScore { get; set; }
 
+        /// <summary>
+        /// If an reprocess of total score failed to update this score to the latest version, this flag will become <c>true</c>.
+        /// Should be used to ensure we don't repeatedly attempt to update the same scores each startup even though we already know they will fail.
+        /// </summary>
+        /// <remarks>
+        /// See https://github.com/ppy/osu/issues/24301 for one example of how this can occur(missing beatmap file on disk).
+        /// </remarks>
+        public bool TotalScoreUpgradeFailed { get; set; }
+
         public int MaxCombo { get; set; }
 
         public double Accuracy { get; set; }

From a2f1ced5a224e6ff1c239c430be62793b3b24fe0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 16:22:21 +0900
Subject: [PATCH 0058/2296] Add test coverage of failed-to-upgrade flag

---
 .../BackgroundDataStoreProcessorTests.cs      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index 15bb0fc09c..d7ec572026 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -8,6 +8,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Tests.Visual;
@@ -124,6 +127,32 @@ namespace osu.Game.Tests.Database
             });
         }
 
+        [Test]
+        public void TestScoreUpgradeFailed()
+        {
+            ScoreInfo scoreInfo = null!;
+
+            AddStep("Add score which requires upgrade (but has no beatmap)", () =>
+            {
+                Realm.Write(r =>
+                {
+                    r.Add(scoreInfo = new ScoreInfo(ruleset: r.All<RulesetInfo>().First(), beatmap: new BeatmapInfo
+                    {
+                        BeatmapSet = new BeatmapSetInfo(),
+                        Ruleset = r.All<RulesetInfo>().First(),
+                    })
+                    {
+                        TotalScoreVersion = 30000002,
+                        IsLegacyScore = true,
+                    });
+                });
+            });
+
+            AddStep("Run background processor", () => Add(new TestBackgroundDataStoreProcessor()));
+
+            AddUntilStep("Score marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed));
+        }
+
         public partial class TestBackgroundDataStoreProcessor : BackgroundDataStoreProcessor
         {
             protected override int TimeToSleepDuringGameplay => 10;

From 235cb2d73fcc64ffb2c85d1dafb2a03486557276 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 16:28:38 +0900
Subject: [PATCH 0059/2296] Add test coverage of upgrade success for good
 measure

---
 .../BackgroundDataStoreProcessorTests.cs      | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index d7ec572026..23b88b7395 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -127,6 +127,30 @@ namespace osu.Game.Tests.Database
             });
         }
 
+        [Test]
+        public void TestScoreUpgradeSuccess()
+        {
+            ScoreInfo scoreInfo = null!;
+
+            AddStep("Add score which requires upgrade (but has no beatmap)", () =>
+            {
+                Realm.Write(r =>
+                {
+                    r.Add(scoreInfo = new ScoreInfo(ruleset: r.All<RulesetInfo>().First(), beatmap: r.All<BeatmapInfo>().First())
+                    {
+                        TotalScoreVersion = 30000002,
+                        LegacyTotalScore = 123456,
+                        IsLegacyScore = true,
+                    });
+                });
+            });
+
+            AddStep("Run background processor", () => Add(new TestBackgroundDataStoreProcessor()));
+
+            AddUntilStep("Score version upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(LegacyScoreEncoder.LATEST_VERSION));
+            AddAssert("Score not marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed), () => Is.False);
+        }
+
         [Test]
         public void TestScoreUpgradeFailed()
         {
@@ -150,7 +174,8 @@ namespace osu.Game.Tests.Database
 
             AddStep("Run background processor", () => Add(new TestBackgroundDataStoreProcessor()));
 
-            AddUntilStep("Score marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed));
+            AddUntilStep("Score marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed), () => Is.True);
+            AddAssert("Score version not upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(30000002));
         }
 
         public partial class TestBackgroundDataStoreProcessor : BackgroundDataStoreProcessor

From 9d87ff2986f3430b4c44b03d895720f5c8b57bd3 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 26 Jul 2023 01:37:55 -0700
Subject: [PATCH 0060/2296] Improve supporter-only duration notice and fix max
 duration of non-supporter

See https://github.com/ppy/osu-web/blob/3c542292569b336c4dff38e2b52a823149ec1a81/.env.example#L230. Might have more duration options in the future.
---
 osu.Game/Localisation/OnlinePlayStrings.cs                    | 4 ++--
 .../OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Localisation/OnlinePlayStrings.cs b/osu.Game/Localisation/OnlinePlayStrings.cs
index e9f17cddc0..1853cb753a 100644
--- a/osu.Game/Localisation/OnlinePlayStrings.cs
+++ b/osu.Game/Localisation/OnlinePlayStrings.cs
@@ -10,9 +10,9 @@ namespace osu.Game.Localisation
         private const string prefix = @"osu.Game.Resources.Localisation.OnlinePlay";
 
         /// <summary>
-        /// "This duration is only available for osu!supporters."
+        /// "Playlist durations longer than 2 weeks require an active osu!supporter tag."
         /// </summary>
-        public static LocalisableString SupporterOnlyDurationNotice => new TranslatableString(getKey(@"supporter_only_duration_notice"), @"This duration is only available for osu!supporters.");
+        public static LocalisableString SupporterOnlyDurationNotice => new TranslatableString(getKey(@"supporter_only_duration_notice"), @"Playlist durations longer than 2 weeks require an active osu!supporter tag.");
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
index f7bd7fc530..84e419d67a 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
@@ -371,7 +371,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0
                                              && hasValidDuration;
 
-            private bool hasValidDuration => DurationField.Current.Value < TimeSpan.FromDays(31) || localUser.Value.IsSupporter;
+            private bool hasValidDuration => DurationField.Current.Value <= TimeSpan.FromDays(14) || localUser.Value.IsSupporter;
 
             private void apply()
             {

From 06fe5583cb9ecd4915aad3835b09ae732dfc1aff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 15:47:57 +0900
Subject: [PATCH 0061/2296] Expose a new SSDQ from playfield for skinnable area
 bounds

---
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs | 17 +++++++++++++++++
 osu.Game/Rulesets/UI/Playfield.cs            | 11 +++++++++++
 2 files changed, 28 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index e3ebadc836..7b00447238 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
@@ -25,6 +26,22 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly List<Stage> stages = new List<Stage>();
 
+        public override Quad SkinnableComponentScreenSpaceDrawQuad
+        {
+            get
+            {
+                if (Stages.Count == 1)
+                    return Stages.First().ScreenSpaceDrawQuad;
+
+                RectangleF area = RectangleF.Empty;
+
+                foreach (var stage in Stages)
+                    area = RectangleF.Union(area, stage.ScreenSpaceDrawQuad.AABBFloat);
+
+                return area;
+            }
+        }
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => stages.Any(s => s.ReceivePositionalInputAt(screenSpacePos));
 
         public ManiaPlayfield(List<StageDefinition> stageDefinitions)
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 3f263aba63..e9c35555c8 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -23,6 +23,7 @@ using osu.Game.Skinning;
 using osuTK;
 using osu.Game.Rulesets.Objects.Pooling;
 using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics.Primitives;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -94,6 +95,16 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         public readonly BindableBool DisplayJudgements = new BindableBool(true);
 
+        /// <summary>
+        /// A screen space draw quad which resembles the edges of the playfield for skinning purposes.
+        /// This will allow users / components to snap objects to the "edge" of the playfield.
+        /// </summary>
+        /// <remarks>
+        /// Rulesets which reduce the visible area further than the full relative playfield space itself
+        /// should retarget this to the ScreenSpaceDrawQuad of the appropriate container.
+        /// </remarks>
+        public virtual Quad SkinnableComponentScreenSpaceDrawQuad => ScreenSpaceDrawQuad;
+
         [Resolved(CanBeNull = true)]
         [CanBeNull]
         protected IReadOnlyList<Mod> Mods { get; private set; }

From 5bd06832d0a4e35bbbd52eea2ffb3970764e6d0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 15:48:40 +0900
Subject: [PATCH 0062/2296] Fix skin component toolbox not working correctly
 for ruleset matching

Until now, the only usage of ruleset layers was where there is both a
ruleset specific and non-ruleset-specific layer present. The matching
code was making assumptions about this.

As I tried to add a new playfield layer which breaks this assumption,
non-ruleset-specifc components were not being displayed in the toolbox.
This turned out to be due to a `target` of `null` being provided due to
the weird `getTarget` matching (that happened to *just* do what we
wanted previously due to the equals implementation, but only because
there was a container without the ruleset present in the available
targets).

I've changed this to be a more appropriate lookup method, where the
target for dependency sourcing is provided separately from the ruleset
filter.
---
 .../Overlays/SkinEditor/SkinComponentToolbox.cs | 17 +++++++++++++----
 osu.Game/Overlays/SkinEditor/SkinEditor.cs      |  4 ++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinComponentToolbox.cs b/osu.Game/Overlays/SkinEditor/SkinComponentToolbox.cs
index 1ce253d67c..a476fc1a6d 100644
--- a/osu.Game/Overlays/SkinEditor/SkinComponentToolbox.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinComponentToolbox.cs
@@ -13,6 +13,7 @@ using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Skinning;
 using osuTK;
@@ -23,14 +24,22 @@ namespace osu.Game.Overlays.SkinEditor
     {
         public Action<Type>? RequestPlacement;
 
-        private readonly SkinComponentsContainer? target;
+        private readonly SkinComponentsContainer target;
+
+        private readonly RulesetInfo? ruleset;
 
         private FillFlowContainer fill = null!;
 
-        public SkinComponentToolbox(SkinComponentsContainer? target = null)
-            : base(target?.Lookup.Ruleset == null ? SkinEditorStrings.Components : LocalisableString.Interpolate($"{SkinEditorStrings.Components} ({target.Lookup.Ruleset.Name})"))
+        /// <summary>
+        /// Create a new component toolbox for the specified taget.
+        /// </summary>
+        /// <param name="target">The target. This is mainly used as a dependency source to find candidate components.</param>
+        /// <param name="ruleset">A ruleset to filter components by. If null, only components which are not ruleset-specific will be included.</param>
+        public SkinComponentToolbox(SkinComponentsContainer target, RulesetInfo? ruleset)
+            : base(ruleset == null ? SkinEditorStrings.Components : LocalisableString.Interpolate($"{SkinEditorStrings.Components} ({ruleset.Name})"))
         {
             this.target = target;
+            this.ruleset = ruleset;
         }
 
         [BackgroundDependencyLoader]
@@ -51,7 +60,7 @@ namespace osu.Game.Overlays.SkinEditor
         {
             fill.Clear();
 
-            var skinnableTypes = SerialisedDrawableInfo.GetAllAvailableDrawables(target?.Lookup.Ruleset);
+            var skinnableTypes = SerialisedDrawableInfo.GetAllAvailableDrawables(ruleset);
             foreach (var type in skinnableTypes)
                 attemptAddComponent(type);
         }
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index 2b23ce290f..67cf0eab18 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -366,14 +366,14 @@ namespace osu.Game.Overlays.SkinEditor
             // If the new target has a ruleset, let's show ruleset-specific items at the top, and the rest below.
             if (target.NewValue.Ruleset != null)
             {
-                componentsSidebar.Add(new SkinComponentToolbox(skinComponentsContainer)
+                componentsSidebar.Add(new SkinComponentToolbox(skinComponentsContainer, target.NewValue.Ruleset)
                 {
                     RequestPlacement = requestPlacement
                 });
             }
 
             // Remove the ruleset from the lookup to get base components.
-            componentsSidebar.Add(new SkinComponentToolbox(getTarget(new SkinComponentsContainerLookup(target.NewValue.Target)))
+            componentsSidebar.Add(new SkinComponentToolbox(skinComponentsContainer, null)
             {
                 RequestPlacement = requestPlacement
             });

From 6cf065f6d1c92ddcdf36efa97fbe4634ee3cd9f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2023 15:48:21 +0900
Subject: [PATCH 0063/2296] Add playfield layer to skin editor

---
 osu.Game/Screens/Play/HUDOverlay.cs                | 14 ++++++++++++--
 osu.Game/Skinning/SkinComponentsContainerLookup.cs |  5 ++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index d11171e3fe..6696332307 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -12,6 +12,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
@@ -103,10 +104,11 @@ namespace osu.Game.Screens.Play
 
         private readonly List<Drawable> hideTargets;
 
+        private readonly Drawable playfieldComponents;
+
         public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods, bool alwaysShowLeaderboard = true)
         {
             Drawable rulesetComponents;
-
             this.drawableRuleset = drawableRuleset;
             this.mods = mods;
 
@@ -123,6 +125,9 @@ namespace osu.Game.Screens.Play
                 rulesetComponents = drawableRuleset != null
                     ? new HUDComponentsContainer(drawableRuleset.Ruleset.RulesetInfo) { AlwaysPresent = true, }
                     : Empty(),
+                playfieldComponents = drawableRuleset != null
+                    ? new SkinComponentsContainer(new SkinComponentsContainerLookup(SkinComponentsContainerLookup.TargetArea.Playfield, drawableRuleset.Ruleset.RulesetInfo)) { AlwaysPresent = true, }
+                    : Empty(),
                 topRightElements = new FillFlowContainer
                 {
                     Anchor = Anchor.TopRight,
@@ -162,7 +167,7 @@ namespace osu.Game.Screens.Play
                 },
             };
 
-            hideTargets = new List<Drawable> { mainComponents, rulesetComponents, topRightElements };
+            hideTargets = new List<Drawable> { mainComponents, rulesetComponents, playfieldComponents, topRightElements };
 
             if (!alwaysShowLeaderboard)
                 hideTargets.Add(LeaderboardFlow);
@@ -230,6 +235,11 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
+            Quad playfieldScreenSpaceDrawQuad = drawableRuleset.Playfield.SkinnableComponentScreenSpaceDrawQuad;
+
+            playfieldComponents.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+            playfieldComponents.Size = ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+
             float? lowestTopScreenSpaceLeft = null;
             float? lowestTopScreenSpaceRight = null;
 
diff --git a/osu.Game/Skinning/SkinComponentsContainerLookup.cs b/osu.Game/Skinning/SkinComponentsContainerLookup.cs
index fbc0ab58ad..34358c3f06 100644
--- a/osu.Game/Skinning/SkinComponentsContainerLookup.cs
+++ b/osu.Game/Skinning/SkinComponentsContainerLookup.cs
@@ -68,7 +68,10 @@ namespace osu.Game.Skinning
             MainHUDComponents,
 
             [Description("Song select")]
-            SongSelect
+            SongSelect,
+
+            [Description("Playfield")]
+            Playfield
         }
     }
 }

From 26c128a09323cb0ee00cdb3c93d0463367b2f451 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Fri, 28 Jul 2023 14:39:30 -0400
Subject: [PATCH 0064/2296] added keybind and localization string

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs       | 6 +++++-
 osu.Game/Localisation/GlobalActionKeyBindingStrings.cs | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 01c454e3f9..3d24afbb16 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -116,9 +116,10 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.F3 }, GlobalAction.DecreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.F4 }, GlobalAction.IncreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.Shift, InputKey.Tab }, GlobalAction.ToggleInGameInterface),
+            new KeyBinding(InputKey.Tab, GlobalAction.ToggleInGameLeaderboard),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.PauseGameplay),
             new KeyBinding(InputKey.Control, GlobalAction.HoldForHUD),
-            new KeyBinding(InputKey.Tab, GlobalAction.ToggleChatFocus),
+            new KeyBinding(InputKey.Enter, GlobalAction.ToggleChatFocus),
             new KeyBinding(InputKey.F1, GlobalAction.SaveReplay),
             new KeyBinding(InputKey.F2, GlobalAction.ExportReplay),
         };
@@ -285,6 +286,9 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameInterface))]
         ToggleInGameInterface,
 
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameLeaderboard))]
+        ToggleInGameLeaderboard,
+
         // Song select keybindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleModSelection))]
         ToggleModSelection,
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index f93d86225c..ceefc27968 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -219,6 +219,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ToggleInGameInterface => new TranslatableString(getKey(@"toggle_in_game_interface"), @"Toggle in-game interface");
 
+        /// <summary>
+        /// "Toggle in-game leaderboard"
+        /// </summary>
+        public static LocalisableString ToggleInGameLeaderboard => new TranslatableString(getKey(@"toggle_in_game_leaderboard"), @"Toggle in-game leaderboard");
+
         /// <summary>
         /// "Toggle mod select"
         /// </summary>

From a4065486c198fd49fd538ba779f7e6cfb08fe79e Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Fri, 28 Jul 2023 14:39:41 -0400
Subject: [PATCH 0065/2296] bound bind during gameplay

---
 osu.Game/Screens/Play/HUDOverlay.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index d11171e3fe..9c001b3db3 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -78,6 +78,7 @@ namespace osu.Game.Screens.Play
         public Bindable<bool> ShowHud { get; } = new BindableBool();
 
         private Bindable<HUDVisibilityMode> configVisibilityMode;
+        private Bindable<bool> configLeaderboardVisibility;
         private Bindable<bool> configSettingsOverlay;
 
         private readonly BindableBool replayLoaded = new BindableBool();
@@ -179,6 +180,7 @@ namespace osu.Game.Screens.Play
             ModDisplay.Current.Value = mods;
 
             configVisibilityMode = config.GetBindable<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode);
+            configLeaderboardVisibility = config.GetBindable<bool>(OsuSetting.GameplayLeaderboard);
             configSettingsOverlay = config.GetBindable<bool>(OsuSetting.ReplaySettingsOverlay);
 
             if (configVisibilityMode.Value == HUDVisibilityMode.Never && !hasShownNotificationOnce)
@@ -381,6 +383,10 @@ namespace osu.Game.Screens.Play
                     }
 
                     return true;
+
+                case GlobalAction.ToggleInGameLeaderboard:
+                    configLeaderboardVisibility.Value = !configLeaderboardVisibility.Value;
+                    return true;
             }
 
             return false;

From aca8310cd1df87a131e1e1dfc7d0bc047101c578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 28 Jul 2023 23:36:57 +0200
Subject: [PATCH 0066/2296] Fix non-compiling test

To be fair, currently the test is a bit pointless (as it has no reason
to be a `SkinnableTestScene`, it gains precisely nothing from it - all
that is shown there is some generic components on song select). But that
is no worse then `master`, so look away for now.
---
 .../Visual/Gameplay/TestSceneSkinEditorComponentsList.cs     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
index 515bc09bbb..b7b2a6c175 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
@@ -8,6 +8,7 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.SkinEditor;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -19,7 +20,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestToggleEditor()
         {
-            AddStep("show available components", () => SetContents(_ => new SkinComponentToolbox
+            var skinComponentsContainer = new SkinComponentsContainer(new SkinComponentsContainerLookup(SkinComponentsContainerLookup.TargetArea.SongSelect));
+
+            AddStep("show available components", () => SetContents(_ => new SkinComponentToolbox(skinComponentsContainer, null)
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,

From 1fd4a6dc96fe5b87ee9c616a2518775a731a765e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Jul 2023 01:07:08 +0200
Subject: [PATCH 0067/2296] Fix tests crashing due to `HUDOverlay` not finding
 `DrawableRuleset` in `Update()`

---
 osu.Game/Screens/Play/HUDOverlay.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 6696332307..536d3ac146 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -70,7 +70,9 @@ namespace osu.Game.Screens.Play
 
         public Bindable<bool> ShowHealthBar = new Bindable<bool>(true);
 
+        [CanBeNull]
         private readonly DrawableRuleset drawableRuleset;
+
         private readonly IReadOnlyList<Mod> mods;
 
         /// <summary>
@@ -106,7 +108,7 @@ namespace osu.Game.Screens.Play
 
         private readonly Drawable playfieldComponents;
 
-        public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods, bool alwaysShowLeaderboard = true)
+        public HUDOverlay([CanBeNull] DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods, bool alwaysShowLeaderboard = true)
         {
             Drawable rulesetComponents;
             this.drawableRuleset = drawableRuleset;
@@ -235,10 +237,13 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            Quad playfieldScreenSpaceDrawQuad = drawableRuleset.Playfield.SkinnableComponentScreenSpaceDrawQuad;
+            if (drawableRuleset != null)
+            {
+                Quad playfieldScreenSpaceDrawQuad = drawableRuleset.Playfield.SkinnableComponentScreenSpaceDrawQuad;
 
-            playfieldComponents.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
-            playfieldComponents.Size = ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+                playfieldComponents.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+                playfieldComponents.Size = ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+            }
 
             float? lowestTopScreenSpaceLeft = null;
             float? lowestTopScreenSpaceRight = null;

From a3301dc7ffb0a6e4958065f8b8210a3b98c1fdc4 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Fri, 28 Jul 2023 23:22:28 -0700
Subject: [PATCH 0068/2296] Fix accuracy break info decimal separator being
 incorrect in certain languages

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

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index 7261155c94..b8696352e8 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Play.Break
 
         private void currentValueChanged(ValueChangedEvent<T> e)
         {
-            string newText = prefix + Format(e.NewValue);
+            LocalisableString newText = LocalisableString.Interpolate($"{prefix}{Format(e.NewValue)}");
 
             if (valueText.Text == newText)
                 return;

From 8a06914438fd3d1d8bdcc462c5fe196891bee2c7 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 25 Jul 2023 20:50:55 +0900
Subject: [PATCH 0069/2296] remove #nullable disable in tournament

---
 .../NonVisual/LadderInfoSerialisationTest.cs  |  5 +-
 .../Screens/TestSceneLadderEditorScreen.cs    |  2 +-
 .../Screens/TestSceneSeedingEditorScreen.cs   |  3 +-
 .../Screens/TestSceneTeamIntroScreen.cs       |  2 +-
 .../Screens/TestSceneTeamWinScreen.cs         |  2 +-
 .../TournamentTestScene.cs                    |  9 +--
 .../Components/DrawableTeamFlag.cs            | 10 ++-
 .../Components/DrawableTeamTitle.cs           |  8 +--
 .../Components/DrawableTournamentTeam.cs      | 11 ++--
 osu.Game.Tournament/Components/SongBar.cs     |  8 +--
 .../Components/TournamentBeatmapPanel.cs      | 18 +++--
 .../Components/TournamentMatchChatDisplay.cs  |  4 +-
 .../Components/TourneyVideo.cs                |  6 +-
 osu.Game.Tournament/IPC/FileBasedIPC.cs       | 65 +++++++++----------
 osu.Game.Tournament/JsonPointConverter.cs     |  9 +--
 osu.Game.Tournament/Models/LadderInfo.cs      |  6 +-
 osu.Game.Tournament/Models/RoundBeatmap.cs    |  1 -
 osu.Game.Tournament/Models/StableInfo.cs      |  6 +-
 osu.Game.Tournament/Models/TournamentMatch.cs | 22 +++----
 osu.Game.Tournament/Models/TournamentTeam.cs  |  9 ++-
 .../Screens/Drawings/Components/Group.cs      |  4 +-
 .../Components/ScrollingTeamContainer.cs      | 27 ++++----
 .../Components/StorageBackedTeamList.cs       |  6 +-
 .../Components/VisualiserContainer.cs         |  4 +-
 .../Screens/Drawings/DrawingsScreen.cs        | 28 ++++----
 .../Screens/Editors/LadderEditorScreen.cs     | 64 ++++++++----------
 .../Gameplay/Components/MatchHeader.cs        |  8 +--
 .../Gameplay/Components/TeamDisplay.cs        |  2 +-
 .../Gameplay/Components/TeamScoreDisplay.cs   | 24 ++++---
 .../Components/TournamentMatchScoreDisplay.cs |  4 +-
 .../Screens/Gameplay/GameplayScreen.cs        | 36 +++++-----
 .../Ladder/Components/DrawableMatchTeam.cs    | 29 ++++-----
 .../Components/DrawableTournamentMatch.cs     | 28 ++++----
 .../Components/DrawableTournamentRound.cs     |  4 +-
 .../Ladder/Components/LadderEditorSettings.cs | 22 +++----
 .../Ladder/Components/SettingsTeamDropdown.cs |  2 +-
 .../Screens/Ladder/LadderScreen.cs            | 12 ++--
 .../Screens/MapPool/MapPoolScreen.cs          | 38 ++++++-----
 .../Screens/Schedule/ScheduleScreen.cs        | 10 ++-
 .../Screens/Setup/ResolutionSelector.cs       |  6 +-
 .../Screens/Setup/SetupScreen.cs              | 22 +++----
 .../Screens/Setup/StablePathSelectScreen.cs   | 12 ++--
 .../Screens/Setup/TournamentSwitcher.cs       | 10 ++-
 .../Screens/Showcase/ShowcaseScreen.cs        |  2 +-
 .../Screens/TeamIntro/SeedingScreen.cs        | 22 +++----
 .../Screens/TeamIntro/TeamIntroScreen.cs      |  6 +-
 .../Screens/TeamWin/TeamWinScreen.cs          | 12 ++--
 .../Screens/TournamentMatchScreen.cs          |  8 +--
 osu.Game.Tournament/TournamentGame.cs         |  8 +--
 osu.Game.Tournament/TournamentGameBase.cs     | 29 +++++----
 osu.Game.Tournament/TournamentSceneManager.cs | 20 +++---
 51 files changed, 333 insertions(+), 382 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs b/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
index 962a6fbd6c..d18651b8bb 100644
--- a/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
@@ -3,6 +3,7 @@
 
 using Newtonsoft.Json;
 using NUnit.Framework;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Tests.NonVisual
@@ -35,8 +36,8 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 PlayersPerTeam = { Value = 4 },
                 Teams =
                 {
-                    match.Team1.Value,
-                    match.Team2.Value,
+                    match.Team1.Value.AsNonNull(),
+                    match.Team2.Value.AsNonNull(),
                 },
                 Rounds =
                 {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
index 29ecdaf873..b9b150d264 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Tournament.Tests.Screens
 
             AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
 
-            AddAssert("assert ladder teams reset", () => Ladder.CurrentMatch.Value.Team1.Value == null && Ladder.CurrentMatch.Value.Team2.Value == null);
+            AddAssert("assert ladder teams reset", () => Ladder.CurrentMatch.Value?.Team1.Value == null && Ladder.CurrentMatch.Value?.Team2.Value == null);
         }
     }
 }
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
index 15d4fb1f3f..a7ef4d7a29 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Editors;
 
@@ -17,7 +18,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             var match = CreateSampleMatch();
 
-            Add(new SeedingEditorScreen(match.Team1.Value, new TeamEditorScreen())
+            Add(new SeedingEditorScreen(match.Team1.Value.AsNonNull(), new TeamEditorScreen())
             {
                 Width = 0.85f // create room for control panel
             });
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
index b76e0d7521..d6941848b7 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tournament.Tests.Screens
             {
                 Team1 = { Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA") },
                 Team2 = { Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN") },
-                Round = { Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals") }
+                Round = { Value = Ladder.Rounds.First(g => g.Name.Value == "Quarterfinals") }
             };
 
             Add(new TeamIntroScreen
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
index 05c21fa0b1..1e3ff72d43 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tournament.Tests.Screens
             {
                 var match = Ladder.CurrentMatch.Value!;
 
-                match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals");
+                match.Round.Value = Ladder.Rounds.First(g => g.Name.Value == "Quarterfinals");
                 match.Completed.Value = true;
             });
 
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 84e5da62f4..0cf1e22211 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -40,10 +41,10 @@ namespace osu.Game.Tournament.Tests
 
             match = CreateSampleMatch();
 
-            Ladder.Rounds.Add(match.Round.Value);
+            Ladder.Rounds.Add(match.Round.Value.AsNonNull());
             Ladder.Matches.Add(match);
-            Ladder.Teams.Add(match.Team1.Value);
-            Ladder.Teams.Add(match.Team2.Value);
+            Ladder.Teams.Add(match.Team1.Value.AsNonNull());
+            Ladder.Teams.Add(match.Team2.Value.AsNonNull());
 
             Ruleset.BindTo(Ladder.Ruleset);
             Dependencies.CacheAs(new StableInfo(storage));
@@ -152,7 +153,7 @@ namespace osu.Game.Tournament.Tests
             },
             Round =
             {
-                Value = new TournamentRound { Name = { Value = "Quarterfinals" } }
+                Value = new TournamentRound { Name = { Value = "Quarterfinals" } },
             }
         };
 
diff --git a/osu.Game.Tournament/Components/DrawableTeamFlag.cs b/osu.Game.Tournament/Components/DrawableTeamFlag.cs
index 317d685ee7..aef854bb8d 100644
--- a/osu.Game.Tournament/Components/DrawableTeamFlag.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamFlag.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -17,14 +15,14 @@ namespace osu.Game.Tournament.Components
 {
     public partial class DrawableTeamFlag : Container
     {
-        private readonly TournamentTeam team;
+        private readonly TournamentTeam? team;
 
         [UsedImplicitly]
-        private Bindable<string> flag;
+        private Bindable<string>? flag;
 
-        private Sprite flagSprite;
+        private Sprite? flagSprite;
 
-        public DrawableTeamFlag(TournamentTeam team)
+        public DrawableTeamFlag(TournamentTeam? team)
         {
             this.team = team;
         }
diff --git a/osu.Game.Tournament/Components/DrawableTeamTitle.cs b/osu.Game.Tournament/Components/DrawableTeamTitle.cs
index 68cc46be19..85b3e5419c 100644
--- a/osu.Game.Tournament/Components/DrawableTeamTitle.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamTitle.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -12,12 +10,12 @@ namespace osu.Game.Tournament.Components
 {
     public partial class DrawableTeamTitle : TournamentSpriteTextWithBackground
     {
-        private readonly TournamentTeam team;
+        private readonly TournamentTeam? team;
 
         [UsedImplicitly]
-        private Bindable<string> acronym;
+        private Bindable<string>? acronym;
 
-        public DrawableTeamTitle(TournamentTeam team)
+        public DrawableTeamTitle(TournamentTeam? team)
         {
             this.team = team;
         }
diff --git a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
index 0036f5f115..9583682e8b 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentTeam.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -14,15 +12,15 @@ namespace osu.Game.Tournament.Components
 {
     public abstract partial class DrawableTournamentTeam : CompositeDrawable
     {
-        public readonly TournamentTeam Team;
+        public readonly TournamentTeam? Team;
 
         protected readonly Container Flag;
         protected readonly TournamentSpriteText AcronymText;
 
         [UsedImplicitly]
-        private Bindable<string> acronym;
+        private Bindable<string>? acronym;
 
-        protected DrawableTournamentTeam(TournamentTeam team)
+        protected DrawableTournamentTeam(TournamentTeam? team)
         {
             Team = team;
 
@@ -36,7 +34,8 @@ namespace osu.Game.Tournament.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (Team == null) return;
+            if (Team == null)
+                return;
 
             (acronym = Team.Acronym.GetBoundCopy()).BindValueChanged(_ => AcronymText.Text = Team?.Acronym.Value?.ToUpperInvariant() ?? string.Empty, true);
         }
diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 4f4a02ccf1..19d63286d8 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -24,12 +22,12 @@ namespace osu.Game.Tournament.Components
 {
     public partial class SongBar : CompositeDrawable
     {
-        private TournamentBeatmap beatmap;
+        private TournamentBeatmap? beatmap;
 
         public const float HEIGHT = 145 / 2f;
 
         [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
         public TournamentBeatmap Beatmap
         {
@@ -55,7 +53,7 @@ namespace osu.Game.Tournament.Components
             }
         }
 
-        private FillFlowContainer flow;
+        private FillFlowContainer flow = null!;
 
         private bool expanded;
 
diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 49478a2174..2d5844d02b 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -22,13 +22,13 @@ namespace osu.Game.Tournament.Components
     {
         public readonly TournamentBeatmap? Beatmap;
 
-        private readonly string mod;
+        private readonly string? mod;
 
         public const float HEIGHT = 50;
 
         private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
 
-        private Box flash = null!;
+        private Box? flash;
 
         public TournamentBeatmapPanel(TournamentBeatmap? beatmap, string mod = "")
         {
@@ -135,25 +135,29 @@ namespace osu.Game.Tournament.Components
                 match.OldValue.PicksBans.CollectionChanged -= picksBansOnCollectionChanged;
             if (match.NewValue != null)
                 match.NewValue.PicksBans.CollectionChanged += picksBansOnCollectionChanged;
-
-            Scheduler.AddOnce(updateState);
+            updateState();
         }
 
         private void picksBansOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-            => Scheduler.AddOnce(updateState);
+            => updateState();
 
         private BeatmapChoice? choice;
 
         private void updateState()
         {
-            var newChoice = currentMatch.Value?.PicksBans.FirstOrDefault(p => p.BeatmapID == Beatmap?.OnlineID);
+            if (currentMatch.Value == null)
+            {
+                return;
+            }
+
+            var newChoice = currentMatch.Value.PicksBans.FirstOrDefault(p => p.BeatmapID == Beatmap?.OnlineID);
 
             bool shouldFlash = newChoice != choice;
 
             if (newChoice != null)
             {
                 if (shouldFlash)
-                    flash.FadeOutFromOne(500).Loop(0, 10);
+                    flash?.FadeOutFromOne(500).Loop(0, 10);
 
                 BorderThickness = 6;
 
diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index e943cb8b8c..0998e606e9 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -92,9 +92,9 @@ namespace osu.Game.Tournament.Components
             {
                 if (info.CurrentMatch.Value is TournamentMatch match)
                 {
-                    if (match.Team1.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
+                    if (match.Team1.Value?.Players.Any(u => u.OnlineID == Message.Sender.OnlineID) == true)
                         UsernameColour = TournamentGame.COLOUR_RED;
-                    else if (match.Team2.Value.Players.Any(u => u.OnlineID == Message.Sender.OnlineID))
+                    else if (match.Team2.Value?.Players.Any(u => u.OnlineID == Message.Sender.OnlineID) == true)
                         UsernameColour = TournamentGame.COLOUR_BLUE;
                 }
             }
diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index b9ce84b735..6e45c7556b 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -19,8 +17,8 @@ namespace osu.Game.Tournament.Components
     {
         private readonly string filename;
         private readonly bool drawFallbackGradient;
-        private Video video;
-        private ManualClock manualClock;
+        private Video? video;
+        private ManualClock? manualClock;
 
         public bool VideoAvailable => video != null;
 
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 7babb3ea5a..333dd0fd73 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -1,12 +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.IO;
 using System.Linq;
-using JetBrains.Annotations;
 using Microsoft.Win32;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
@@ -24,36 +21,35 @@ namespace osu.Game.Tournament.IPC
 {
     public partial class FileBasedIPC : MatchIPCInfo
     {
-        public Storage IPCStorage { get; private set; }
+        public Storage? IPCStorage { get; private set; }
 
         [Resolved]
-        protected IAPIProvider API { get; private set; }
+        protected IAPIProvider API { get; private set; } = null!;
 
         [Resolved]
-        protected IRulesetStore Rulesets { get; private set; }
+        protected IRulesetStore Rulesets { get; private set; } = null!;
 
         [Resolved]
-        private GameHost host { get; set; }
+        private GameHost host { get; set; } = null!;
 
         [Resolved]
-        private LadderInfo ladder { get; set; }
+        private LadderInfo ladder { get; set; } = null!;
 
         [Resolved]
-        private StableInfo stableInfo { get; set; }
+        private StableInfo stableInfo { get; set; } = null!;
 
         private int lastBeatmapId;
-        private ScheduledDelegate scheduled;
-        private GetBeatmapRequest beatmapLookupRequest;
+        private ScheduledDelegate? scheduled;
+        private GetBeatmapRequest? beatmapLookupRequest;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            string stablePath = stableInfo.StablePath ?? findStablePath();
+            string? stablePath = stableInfo.StablePath ?? findStablePath();
             initialiseIPCStorage(stablePath);
         }
 
-        [CanBeNull]
-        private Storage initialiseIPCStorage(string path)
+        private Storage? initialiseIPCStorage(string? path)
         {
             scheduled?.Cancel();
 
@@ -89,9 +85,9 @@ namespace osu.Game.Tournament.IPC
 
                                     lastBeatmapId = beatmapId;
 
-                                    var existing = ladder.CurrentMatch.Value?.Round.Value?.Beatmaps.FirstOrDefault(b => b.ID == beatmapId && b.Beatmap != null);
+                                    var existing = ladder.CurrentMatch.Value?.Round.Value?.Beatmaps.FirstOrDefault(b => b.ID == beatmapId);
 
-                                    if (existing != null)
+                                    if (existing?.Beatmap != null)
                                         Beatmap.Value = existing.Beatmap;
                                     else
                                     {
@@ -114,7 +110,7 @@ namespace osu.Game.Tournament.IPC
                             using (var stream = IPCStorage.GetStream(file_ipc_channel_filename))
                             using (var sr = new StreamReader(stream))
                             {
-                                ChatChannel.Value = sr.ReadLine();
+                                ChatChannel.Value = sr.ReadLine().AsNonNull();
                             }
                         }
                         catch (Exception)
@@ -140,8 +136,8 @@ namespace osu.Game.Tournament.IPC
                             using (var stream = IPCStorage.GetStream(file_ipc_scores_filename))
                             using (var sr = new StreamReader(stream))
                             {
-                                Score1.Value = int.Parse(sr.ReadLine());
-                                Score2.Value = int.Parse(sr.ReadLine());
+                                Score1.Value = int.Parse(sr.ReadLine().AsNonNull());
+                                Score2.Value = int.Parse(sr.ReadLine().AsNonNull());
                             }
                         }
                         catch (Exception)
@@ -164,7 +160,7 @@ namespace osu.Game.Tournament.IPC
         /// </summary>
         /// <param name="path">Path to the IPC directory</param>
         /// <returns>Whether the supplied path was a valid IPC directory.</returns>
-        public bool SetIPCLocation(string path)
+        public bool SetIPCLocation(string? path)
         {
             if (path == null || !ipcFileExistsInDirectory(path))
                 return false;
@@ -184,29 +180,28 @@ namespace osu.Game.Tournament.IPC
         /// <returns>Whether an IPC directory was successfully auto-detected.</returns>
         public bool AutoDetectIPCLocation() => SetIPCLocation(findStablePath());
 
-        private static bool ipcFileExistsInDirectory(string p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
+        private static bool ipcFileExistsInDirectory(string? p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
 
-        [CanBeNull]
-        private string findStablePath()
+        private string? findStablePath()
         {
-            string stableInstallPath = findFromEnvVar() ??
-                                       findFromRegistry() ??
-                                       findFromLocalAppData() ??
-                                       findFromDotFolder();
+            string? stableInstallPath = findFromEnvVar() ??
+                                        findFromRegistry() ??
+                                        findFromLocalAppData() ??
+                                        findFromDotFolder();
 
             Logger.Log($"Stable path for tourney usage: {stableInstallPath}");
             return stableInstallPath;
         }
 
-        private string findFromEnvVar()
+        private string? findFromEnvVar()
         {
             try
             {
                 Logger.Log("Trying to find stable with environment variables");
-                string stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
+                string? stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
 
                 if (ipcFileExistsInDirectory(stableInstallPath))
-                    return stableInstallPath;
+                    return stableInstallPath!;
             }
             catch
             {
@@ -215,7 +210,7 @@ namespace osu.Game.Tournament.IPC
             return null;
         }
 
-        private string findFromLocalAppData()
+        private string? findFromLocalAppData()
         {
             Logger.Log("Trying to find stable in %LOCALAPPDATA%");
             string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
@@ -226,7 +221,7 @@ namespace osu.Game.Tournament.IPC
             return null;
         }
 
-        private string findFromDotFolder()
+        private string? findFromDotFolder()
         {
             Logger.Log("Trying to find stable in dotfolders");
             string stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
@@ -237,16 +232,16 @@ namespace osu.Game.Tournament.IPC
             return null;
         }
 
-        private string findFromRegistry()
+        private string? findFromRegistry()
         {
             Logger.Log("Trying to find stable in registry");
 
             try
             {
-                string stableInstallPath;
+                string? stableInstallPath;
 
 #pragma warning disable CA1416
-                using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                using (RegistryKey? key = Registry.ClassesRoot.OpenSubKey("osu"))
                     stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
 #pragma warning restore CA1416
 
diff --git a/osu.Game.Tournament/JsonPointConverter.cs b/osu.Game.Tournament/JsonPointConverter.cs
index d3b40a3526..a58ec47612 100644
--- a/osu.Game.Tournament/JsonPointConverter.cs
+++ b/osu.Game.Tournament/JsonPointConverter.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.Diagnostics;
 using System.Drawing;
@@ -28,7 +26,7 @@ namespace osu.Game.Tournament
             if (reader.TokenType != JsonToken.StartObject)
             {
                 // if there's no object present then this is using string representation (System.Drawing.Point serializes to "x,y")
-                string str = (string)reader.Value;
+                string? str = (string?)reader.Value;
 
                 Debug.Assert(str != null);
 
@@ -45,9 +43,12 @@ namespace osu.Game.Tournament
 
                 if (reader.TokenType == JsonToken.PropertyName)
                 {
-                    string name = reader.Value?.ToString();
+                    string? name = reader.Value?.ToString();
                     int? val = reader.ReadAsInt32();
 
+                    if (name == null)
+                        continue;
+
                     if (val == null)
                         continue;
 
diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index 229837c94e..219a2a7bfb 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.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 Newtonsoft.Json;
@@ -17,7 +15,7 @@ namespace osu.Game.Tournament.Models
     [Serializable]
     public class LadderInfo
     {
-        public Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+        public Bindable<RulesetInfo?> Ruleset = new Bindable<RulesetInfo?>();
 
         public BindableList<TournamentMatch> Matches = new BindableList<TournamentMatch>();
         public BindableList<TournamentRound> Rounds = new BindableList<TournamentRound>();
@@ -27,7 +25,7 @@ namespace osu.Game.Tournament.Models
         public List<TournamentProgression> Progressions = new List<TournamentProgression>();
 
         [JsonIgnore] // updated manually in TournamentGameBase
-        public Bindable<TournamentMatch> CurrentMatch = new Bindable<TournamentMatch>();
+        public Bindable<TournamentMatch?> CurrentMatch = new Bindable<TournamentMatch?>();
 
         public Bindable<int> ChromaKeyWidth = new BindableInt(1024)
         {
diff --git a/osu.Game.Tournament/Models/RoundBeatmap.cs b/osu.Game.Tournament/Models/RoundBeatmap.cs
index f2ec261246..b03b28b3b8 100644
--- a/osu.Game.Tournament/Models/RoundBeatmap.cs
+++ b/osu.Game.Tournament/Models/RoundBeatmap.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Tournament.Models
     public class RoundBeatmap
     {
         public int ID;
-
         public string Mods = string.Empty;
 
         [JsonProperty("BeatmapInfo")]
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 1ae80d4596..7ee0b4a361 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.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.IO;
 using Newtonsoft.Json;
@@ -20,12 +18,12 @@ namespace osu.Game.Tournament.Models
         /// <summary>
         /// Path to the IPC directory used by the stable (cutting-edge) install.
         /// </summary>
-        public string StablePath { get; set; }
+        public string? StablePath { get; set; }
 
         /// <summary>
         /// Fired whenever stable info is successfully saved to file.
         /// </summary>
-        public event Action OnStableInfoSaved;
+        public event Action? OnStableInfoSaved;
 
         private const string config_path = "stable.json";
 
diff --git a/osu.Game.Tournament/Models/TournamentMatch.cs b/osu.Game.Tournament/Models/TournamentMatch.cs
index 97c2060f2c..0a700eb4d6 100644
--- a/osu.Game.Tournament/Models/TournamentMatch.cs
+++ b/osu.Game.Tournament/Models/TournamentMatch.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.ObjectModel;
@@ -33,16 +31,16 @@ namespace osu.Game.Tournament.Models
         }
 
         [JsonIgnore]
-        public readonly Bindable<TournamentTeam> Team1 = new Bindable<TournamentTeam>();
+        public readonly Bindable<TournamentTeam?> Team1 = new Bindable<TournamentTeam?>();
 
-        public string Team1Acronym;
+        public string? Team1Acronym;
 
         public readonly Bindable<int?> Team1Score = new Bindable<int?>();
 
         [JsonIgnore]
-        public readonly Bindable<TournamentTeam> Team2 = new Bindable<TournamentTeam>();
+        public readonly Bindable<TournamentTeam?> Team2 = new Bindable<TournamentTeam?>();
 
-        public string Team2Acronym;
+        public string? Team2Acronym;
 
         public readonly Bindable<int?> Team2Score = new Bindable<int?>();
 
@@ -53,13 +51,13 @@ namespace osu.Game.Tournament.Models
         public readonly ObservableCollection<BeatmapChoice> PicksBans = new ObservableCollection<BeatmapChoice>();
 
         [JsonIgnore]
-        public readonly Bindable<TournamentRound> Round = new Bindable<TournamentRound>();
+        public readonly Bindable<TournamentRound?> Round = new Bindable<TournamentRound?>();
 
         [JsonIgnore]
-        public readonly Bindable<TournamentMatch> Progression = new Bindable<TournamentMatch>();
+        public readonly Bindable<TournamentMatch?> Progression = new Bindable<TournamentMatch?>();
 
         [JsonIgnore]
-        public readonly Bindable<TournamentMatch> LosersProgression = new Bindable<TournamentMatch>();
+        public readonly Bindable<TournamentMatch?> LosersProgression = new Bindable<TournamentMatch?>();
 
         /// <summary>
         /// Should not be set directly. Use LadderInfo.CurrentMatch.Value = this instead.
@@ -79,7 +77,7 @@ namespace osu.Game.Tournament.Models
             Team2.BindValueChanged(t => Team2Acronym = t.NewValue?.Acronym.Value, true);
         }
 
-        public TournamentMatch(TournamentTeam team1 = null, TournamentTeam team2 = null)
+        public TournamentMatch(TournamentTeam? team1 = null, TournamentTeam? team2 = null)
             : this()
         {
             Team1.Value = team1;
@@ -87,10 +85,10 @@ namespace osu.Game.Tournament.Models
         }
 
         [JsonIgnore]
-        public TournamentTeam Winner => !Completed.Value ? null : Team1Score.Value > Team2Score.Value ? Team1.Value : Team2.Value;
+        public TournamentTeam? Winner => !Completed.Value ? null : Team1Score.Value > Team2Score.Value ? Team1.Value : Team2.Value;
 
         [JsonIgnore]
-        public TournamentTeam Loser => !Completed.Value ? null : Team1Score.Value > Team2Score.Value ? Team2.Value : Team1.Value;
+        public TournamentTeam? Loser => !Completed.Value ? null : Team1Score.Value > Team2Score.Value ? Team2.Value : Team1.Value;
 
         public TeamColour WinnerColour => Winner == Team1.Value ? TeamColour.Red : TeamColour.Blue;
 
diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 1beea517d5..3587aa937e 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.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 System;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 
 namespace osu.Game.Tournament.Models
 {
@@ -39,7 +38,7 @@ namespace osu.Game.Tournament.Models
             {
                 int[] ranks = Players.Select(p => p.Rank)
                                      .Where(i => i.HasValue)
-                                     .Select(i => i.Value)
+                                     .Select(i => i.AsNonNull().Value)
                                      .ToArray();
 
                 if (ranks.Length == 0)
@@ -66,14 +65,14 @@ namespace osu.Game.Tournament.Models
             {
                 // use a sane default flag name based on acronym.
                 if (val.OldValue.StartsWith(FlagName.Value, StringComparison.InvariantCultureIgnoreCase))
-                    FlagName.Value = val.NewValue.Length >= 2 ? val.NewValue?.Substring(0, 2).ToUpperInvariant() : string.Empty;
+                    FlagName.Value = val.NewValue?.Length >= 2 ? val.NewValue.Substring(0, 2).ToUpperInvariant() : string.Empty;
             };
 
             FullName.ValueChanged += val =>
             {
                 // use a sane acronym based on full name.
                 if (val.OldValue.StartsWith(Acronym.Value, StringComparison.InvariantCultureIgnoreCase))
-                    Acronym.Value = val.NewValue.Length >= 3 ? val.NewValue?.Substring(0, 3).ToUpperInvariant() : string.Empty;
+                    Acronym.Value = val.NewValue?.Length >= 3 ? val.NewValue.Substring(0, 3).ToUpperInvariant() : string.Empty;
             };
         }
 
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
index a79e2253a4..9d4474a58c 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
         public bool ContainsTeam(string fullName)
         {
-            return allTeams.Any(t => t.Team.FullName.Value == fullName);
+            return allTeams.Any(t => t.Team?.FullName.Value == fullName);
         }
 
         public bool RemoveTeam(TournamentTeam team)
@@ -112,7 +112,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
         {
             StringBuilder sb = new StringBuilder();
             foreach (GroupTeam gt in allTeams)
-                sb.AppendLine(gt.Team.FullName.Value);
+                sb.AppendLine(gt.Team?.FullName.Value);
             return sb.ToString();
         }
     }
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
index c2b15dd3e9..4a47de8714 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.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 System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -22,8 +21,8 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 {
     public partial class ScrollingTeamContainer : Container
     {
-        public event Action OnScrollStarted;
-        public event Action<TournamentTeam> OnSelected;
+        public event Action? OnScrollStarted;
+        public event Action<TournamentTeam>? OnSelected;
 
         private readonly List<TournamentTeam> availableTeams = new List<TournamentTeam>();
 
@@ -42,7 +41,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
         private double lastTime;
 
-        private ScheduledDelegate delayedStateChangeDelegate;
+        private ScheduledDelegate? delayedStateChangeDelegate;
 
         public ScrollingTeamContainer()
         {
@@ -117,7 +116,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                     if (!Children.Any())
                         break;
 
-                    ScrollingTeam closest = null;
+                    ScrollingTeam? closest = null;
 
                     foreach (var c in Children)
                     {
@@ -139,15 +138,14 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
                     Trace.Assert(closest != null, "closest != null");
 
-                    // ReSharper disable once PossibleNullReferenceException
-                    offset += DrawWidth / 2f - (closest.Position.X + closest.DrawWidth / 2f);
+                    offset += DrawWidth / 2f - (closest.AsNonNull().Position.X + closest.AsNonNull().DrawWidth / 2f);
 
-                    ScrollingTeam st = closest;
+                    ScrollingTeam st = closest.AsNonNull();
 
                     availableTeams.RemoveAll(at => at == st.Team);
 
                     st.Selected = true;
-                    OnSelected?.Invoke(st.Team);
+                    OnSelected?.Invoke(st.Team.AsNonNull());
 
                     delayedStateChangeDelegate = Scheduler.AddDelayed(() => setScrollState(ScrollState.Idle), 10000);
                     break;
@@ -174,7 +172,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
             setScrollState(ScrollState.Idle);
         }
 
-        public void AddTeams(IEnumerable<TournamentTeam> teams)
+        public void AddTeams(IEnumerable<TournamentTeam>? teams)
         {
             if (teams == null)
                 return;
@@ -190,8 +188,11 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
             setScrollState(ScrollState.Idle);
         }
 
-        public void RemoveTeam(TournamentTeam team)
+        public void RemoveTeam(TournamentTeam? team)
         {
+            if (team == null)
+                return;
+
             availableTeams.Remove(team);
 
             foreach (var c in Children)
@@ -311,6 +312,8 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
         public partial class ScrollingTeam : DrawableTournamentTeam
         {
+            public new TournamentTeam Team => base.Team.AsNonNull();
+
             public const float WIDTH = 58;
             public const float HEIGHT = 44;
 
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs b/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
index 74afb42c1a..e13462b9bd 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/StorageBackedTeamList.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;
@@ -39,7 +37,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                     {
                         while (sr.Peek() != -1)
                         {
-                            string line = sr.ReadLine()?.Trim();
+                            string? line = sr.ReadLine()?.Trim();
 
                             if (string.IsNullOrEmpty(line))
                                 continue;
@@ -56,7 +54,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                             teams.Add(new TournamentTeam
                             {
                                 FullName = { Value = split[1], },
-                                Acronym = { Value = split.Length >= 3 ? split[2] : null, },
+                                Acronym = { Value = split.Length >= 3 ? split[2] : string.Empty, },
                                 FlagName = { Value = split[0] }
                             });
                         }
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/VisualiserContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/VisualiserContainer.cs
index 676eec14cd..d5e39e3f44 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/VisualiserContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/VisualiserContainer.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;
@@ -72,7 +70,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
             private float leftPos => -(float)((Time.Current + Offset) / CycleTime) + expiredCount;
 
-            private Texture texture;
+            private Texture texture = null!;
 
             private int expiredCount;
 
diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index 23d0edf26e..b2dd4e8c36 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -1,14 +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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -28,27 +27,27 @@ namespace osu.Game.Tournament.Screens.Drawings
     {
         private const string results_filename = "drawings_results.txt";
 
-        private ScrollingTeamContainer teamsContainer;
-        private GroupContainer groupsContainer;
-        private TournamentSpriteText fullTeamNameText;
+        private ScrollingTeamContainer teamsContainer = null!;
+        private GroupContainer groupsContainer = null!;
+        private TournamentSpriteText fullTeamNameText = null!;
 
         private readonly List<TournamentTeam> allTeams = new List<TournamentTeam>();
 
-        private DrawingsConfigManager drawingsConfig;
+        private DrawingsConfigManager drawingsConfig = null!;
 
-        private Task writeOp;
+        private Task? writeOp;
 
-        private Storage storage;
+        private Storage storage = null!;
 
-        public ITeamList TeamList;
+        public ITeamList? TeamList;
 
         [BackgroundDependencyLoader]
         private void load(Storage storage)
         {
-            RelativeSizeAxes = Axes.Both;
-
             this.storage = storage;
 
+            RelativeSizeAxes = Axes.Both;
+
             TeamList ??= new StorageBackedTeamList(storage);
 
             if (!TeamList.Teams.Any())
@@ -224,7 +223,7 @@ namespace osu.Game.Tournament.Screens.Drawings
             teamsContainer.ClearTeams();
             allTeams.Clear();
 
-            foreach (TournamentTeam t in TeamList.Teams)
+            foreach (TournamentTeam t in TeamList.AsNonNull().Teams)
             {
                 if (groupsContainer.ContainsTeam(t.FullName.Value))
                     continue;
@@ -251,7 +250,7 @@ namespace osu.Game.Tournament.Screens.Drawings
                     using (Stream stream = storage.GetStream(results_filename, FileAccess.Read, FileMode.Open))
                     using (StreamReader sr = new StreamReader(stream))
                     {
-                        string line;
+                        string? line;
 
                         while ((line = sr.ReadLine()?.Trim()) != null)
                         {
@@ -261,8 +260,7 @@ namespace osu.Game.Tournament.Screens.Drawings
                             if (line.ToUpperInvariant().StartsWith("GROUP", StringComparison.Ordinal))
                                 continue;
 
-                            // ReSharper disable once AccessToModifiedClosure
-                            TournamentTeam teamToAdd = allTeams.FirstOrDefault(t => t.FullName.Value == line);
+                            TournamentTeam? teamToAdd = allTeams.FirstOrDefault(t => t.FullName.Value == line);
 
                             if (teamToAdd == null)
                                 continue;
diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index 9411892dc5..a82ac57ee9 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -1,12 +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.Drawing;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -35,13 +32,12 @@ namespace osu.Game.Tournament.Screens.Editors
         [Cached]
         private LadderEditorInfo editorInfo = new LadderEditorInfo();
 
-        private WarningBox rightClickMessage;
+        private WarningBox rightClickMessage = null!;
 
-        private RectangularPositionSnapGrid grid;
+        private RectangularPositionSnapGrid grid = null!;
 
         [Resolved(canBeNull: true)]
-        [CanBeNull]
-        private IDialogOverlay dialogOverlay { get; set; }
+        private IDialogOverlay? dialogOverlay { get; set; }
 
         protected override bool DrawLoserPaths => true;
 
@@ -94,36 +90,28 @@ namespace osu.Game.Tournament.Screens.Editors
             ScrollContent.Add(new JoinVisualiser(MatchesContainer, match, losers, UpdateLayout));
         }
 
-        public MenuItem[] ContextMenuItems
-        {
-            get
+        public MenuItem[] ContextMenuItems =>
+            new MenuItem[]
             {
-                if (editorInfo == null)
-                    return Array.Empty<MenuItem>();
-
-                return new MenuItem[]
+                new OsuMenuItem("Create new match", MenuItemType.Highlighted, () =>
                 {
-                    new OsuMenuItem("Create new match", MenuItemType.Highlighted, () =>
+                    Vector2 pos = MatchesContainer.Count == 0 ? Vector2.Zero : lastMatchesContainerMouseDownPosition;
+
+                    TournamentMatch newMatch = new TournamentMatch { Position = { Value = new Point((int)pos.X, (int)pos.Y) } };
+
+                    LadderInfo.Matches.Add(newMatch);
+
+                    editorInfo.Selected.Value = newMatch;
+                }),
+                new OsuMenuItem("Reset teams", MenuItemType.Destructive, () =>
+                {
+                    dialogOverlay?.Push(new LadderResetTeamsDialog(() =>
                     {
-                        Vector2 pos = MatchesContainer.Count == 0 ? Vector2.Zero : lastMatchesContainerMouseDownPosition;
-
-                        TournamentMatch newMatch = new TournamentMatch { Position = { Value = new Point((int)pos.X, (int)pos.Y) } };
-
-                        LadderInfo.Matches.Add(newMatch);
-
-                        editorInfo.Selected.Value = newMatch;
-                    }),
-                    new OsuMenuItem("Reset teams", MenuItemType.Destructive, () =>
-                    {
-                        dialogOverlay?.Push(new LadderResetTeamsDialog(() =>
-                        {
-                            foreach (var p in MatchesContainer)
-                                p.Match.Reset();
-                        }));
-                    })
-                };
-            }
-        }
+                        foreach (var p in MatchesContainer)
+                            p.Match.Reset();
+                    }));
+                })
+            };
 
         public void Remove(TournamentMatch match)
         {
@@ -135,11 +123,11 @@ namespace osu.Game.Tournament.Screens.Editors
             private readonly Container<DrawableTournamentMatch> matchesContainer;
             public readonly TournamentMatch Source;
             private readonly bool losers;
-            private readonly Action complete;
+            private readonly Action? complete;
 
-            private ProgressionPath path;
+            private ProgressionPath? path;
 
-            public JoinVisualiser(Container<DrawableTournamentMatch> matchesContainer, TournamentMatch source, bool losers, Action complete)
+            public JoinVisualiser(Container<DrawableTournamentMatch> matchesContainer, TournamentMatch source, bool losers, Action? complete)
             {
                 this.matchesContainer = matchesContainer;
                 RelativeSizeAxes = Axes.Both;
@@ -153,7 +141,7 @@ namespace osu.Game.Tournament.Screens.Editors
                     Source.Progression.Value = null;
             }
 
-            private DrawableTournamentMatch findTarget(InputState state)
+            private DrawableTournamentMatch? findTarget(InputState state)
             {
                 return matchesContainer.FirstOrDefault(d => d.ReceivePositionalInputAt(state.Mouse.Position));
             }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index 8f7484980d..69f150c8ac 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -14,9 +12,9 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
     public partial class MatchHeader : Container
     {
-        private TeamScoreDisplay teamDisplay1;
-        private TeamScoreDisplay teamDisplay2;
-        private DrawableTournamentHeaderLogo logo;
+        private TeamScoreDisplay teamDisplay1 = null!;
+        private TeamScoreDisplay teamDisplay2 = null!;
+        private DrawableTournamentHeaderLogo logo = null!;
 
         private bool showScores = true;
 
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index c23327a43f..3fdbbb5973 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             }
         }
 
-        public TeamDisplay(TournamentTeam team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
+        public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
             : base(team)
         {
             AutoSizeAxes = Axes.Both;
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
index 57fe1c7312..c7fcfae602 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -17,16 +15,22 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
     {
         private readonly TeamColour teamColour;
 
-        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-        private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
+        private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
+        private readonly Bindable<TournamentTeam?> currentTeam = new Bindable<TournamentTeam?>();
         private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
 
-        private TeamDisplay teamDisplay;
+        private TeamDisplay? teamDisplay;
 
         public bool ShowScore
         {
-            get => teamDisplay.ShowScore;
-            set => teamDisplay.ShowScore = value;
+            get => teamDisplay?.ShowScore ?? false;
+            set
+            {
+                if (teamDisplay != null)
+                {
+                    teamDisplay.ShowScore = value;
+                }
+            }
         }
 
         public TeamScoreDisplay(TeamColour teamColour)
@@ -48,7 +52,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             updateMatch();
         }
 
-        private void matchChanged(ValueChangedEvent<TournamentMatch> match)
+        private void matchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             currentTeamScore.UnbindBindings();
             currentTeam.UnbindBindings();
@@ -78,7 +82,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             switch (e.Button)
             {
                 case MouseButton.Left:
-                    if (currentTeamScore.Value < currentMatch.Value.PointsToWin)
+                    if (currentTeamScore.Value < currentMatch.Value?.PointsToWin)
                         currentTeamScore.Value++;
                     return true;
 
@@ -91,7 +95,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             return base.OnMouseDown(e);
         }
 
-        private void teamChanged(ValueChangedEvent<TournamentTeam> team)
+        private void teamChanged(ValueChangedEvent<TournamentTeam?> team)
         {
             bool wasShowingScores = teamDisplay?.ShowScore ?? false;
 
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
index 838e5fa071..7ae20acc77 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.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.Allocation;
 using osu.Framework.Bindables;
@@ -146,7 +144,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private partial class MatchScoreCounter : CommaSeparatedScoreCounter
         {
-            private OsuSpriteText displayedSpriteText;
+            private OsuSpriteText displayedSpriteText = null!;
 
             public MatchScoreCounter()
             {
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 4258522cff..79c50e60ba 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -26,16 +24,16 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private readonly BindableBool warmup = new BindableBool();
 
         public readonly Bindable<TourneyState> State = new Bindable<TourneyState>();
-        private OsuButton warmupButton;
-        private MatchIPCInfo ipc;
+        private OsuButton warmupButton = null!;
+        private MatchIPCInfo ipc = null!;
 
         [Resolved(canBeNull: true)]
-        private TournamentSceneManager sceneManager { get; set; }
+        private TournamentSceneManager? sceneManager { get; set; }
 
         [Resolved]
-        private TournamentMatchChatDisplay chat { get; set; }
+        private TournamentMatchChatDisplay chat { get; set; } = null!;
 
-        private Drawable chroma;
+        private Drawable chroma = null!;
 
         [BackgroundDependencyLoader]
         private void load(LadderInfo ladder, MatchIPCInfo ipc)
@@ -142,7 +140,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
             State.BindValueChanged(_ => updateState(), true);
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             base.CurrentMatchChanged(match);
 
@@ -153,29 +151,35 @@ namespace osu.Game.Tournament.Screens.Gameplay
             scheduledScreenChange?.Cancel();
         }
 
-        private ScheduledDelegate scheduledScreenChange;
-        private ScheduledDelegate scheduledContract;
+        private ScheduledDelegate? scheduledScreenChange;
+        private ScheduledDelegate? scheduledContract;
 
-        private TournamentMatchScoreDisplay scoreDisplay;
+        private TournamentMatchScoreDisplay scoreDisplay = null!;
 
         private TourneyState lastState;
-        private MatchHeader header;
+        private MatchHeader header = null!;
 
         private void contract()
         {
+            if (!IsLoaded)
+                return;
+
             scheduledContract?.Cancel();
 
             SongBar.Expanded = false;
             scoreDisplay.FadeOut(100);
-            using (chat?.BeginDelayedSequence(500))
-                chat?.Expand();
+            using (chat.BeginDelayedSequence(500))
+                chat.Expand();
         }
 
         private void expand()
         {
+            if (!IsLoaded)
+                return;
+
             scheduledContract?.Cancel();
 
-            chat?.Contract();
+            chat.Contract();
 
             using (BeginDelayedSequence(300))
             {
@@ -252,7 +256,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private partial class ChromaArea : CompositeDrawable
         {
             [Resolved]
-            private LadderInfo ladder { get; set; }
+            private LadderInfo ladder { get; set; } = null!;
 
             [BackgroundDependencyLoader]
             private void load()
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index 2b66df1a31..a380ad9b49 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.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.Allocation;
 using osu.Framework.Bindables;
@@ -28,20 +26,20 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
     {
         private readonly TournamentMatch match;
         private readonly bool losers;
-        private TournamentSpriteText scoreText;
-        private Box background;
-        private Box backgroundRight;
+        private TournamentSpriteText scoreText = null!;
+        private Box background = null!;
+        private Box backgroundRight = null!;
 
         private readonly Bindable<int?> score = new Bindable<int?>();
         private readonly BindableBool completed = new BindableBool();
 
         private Color4 colourWinner;
 
-        private readonly Func<bool> isWinner;
-        private LadderEditorScreen ladderEditor;
+        private readonly Func<bool>? isWinner;
+        private LadderEditorScreen ladderEditor = null!;
 
         [Resolved(canBeNull: true)]
-        private LadderInfo ladderInfo { get; set; }
+        private LadderInfo? ladderInfo { get; set; }
 
         private void setCurrent()
         {
@@ -56,9 +54,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         }
 
         [Resolved(CanBeNull = true)]
-        private LadderEditorInfo editorInfo { get; set; }
+        private LadderEditorInfo? editorInfo { get; set; }
 
-        public DrawableMatchTeam(TournamentTeam team, TournamentMatch match, bool losers)
+        public DrawableMatchTeam(TournamentTeam? team, TournamentMatch match, bool losers)
             : base(team)
         {
             this.match = match;
@@ -72,14 +70,11 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             AcronymText.Padding = new MarginPadding { Left = 50 };
             AcronymText.Font = OsuFont.Torus.With(size: 22, weight: FontWeight.Bold);
 
-            if (match != null)
-            {
-                isWinner = () => match.Winner == Team;
+            isWinner = () => match.Winner == Team;
 
-                completed.BindTo(match.Completed);
-                if (team != null)
-                    score.BindTo(team == match.Team1.Value ? match.Team1Score : match.Team2Score);
-            }
+            completed.BindTo(match.Completed);
+            if (team != null)
+                score.BindTo(team == match.Team1.Value ? match.Team1Score : match.Team2Score);
         }
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index c394877ae9..7b8f2e373b 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.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.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -27,13 +26,13 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         protected readonly FillFlowContainer<DrawableMatchTeam> Flow;
         private readonly Drawable selectionBox;
         private readonly Drawable currentMatchSelectionBox;
-        private Bindable<TournamentMatch> globalSelection;
+        private Bindable<TournamentMatch>? globalSelection;
 
         [Resolved(CanBeNull = true)]
-        private LadderEditorInfo editorInfo { get; set; }
+        private LadderEditorInfo? editorInfo { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private LadderInfo ladderInfo { get; set; }
+        private LadderInfo? ladderInfo { get; set; }
 
         public DrawableTournamentMatch(TournamentMatch match, bool editor = false)
         {
@@ -129,7 +128,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         /// <summary>
         /// Fired when something changed that requires a ladder redraw.
         /// </summary>
-        public Action Changed;
+        public Action? Changed;
 
         private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
 
@@ -201,20 +200,22 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             }
             else
             {
-                transferProgression(Match.Progression?.Value, Match.Winner);
-                transferProgression(Match.LosersProgression?.Value, Match.Loser);
+                Debug.Assert(Match.Winner != null);
+                transferProgression(Match.Progression.Value, Match.Winner);
+                Debug.Assert(Match.Loser != null);
+                transferProgression(Match.LosersProgression.Value, Match.Loser);
             }
 
             Changed?.Invoke();
         }
 
-        private void transferProgression(TournamentMatch destination, TournamentTeam team)
+        private void transferProgression(TournamentMatch? destination, TournamentTeam team)
         {
             if (destination == null) return;
 
             bool progressionAbove = destination.ID < Match.ID;
 
-            Bindable<TournamentTeam> destinationTeam;
+            Bindable<TournamentTeam?> destinationTeam;
 
             // check for the case where we have already transferred out value
             if (destination.Team1.Value == team)
@@ -268,8 +269,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             {
                 foreach (var conditional in Match.ConditionalMatches)
                 {
-                    bool team1Match = conditional.Acronyms.Contains(Match.Team1Acronym);
-                    bool team2Match = conditional.Acronyms.Contains(Match.Team2Acronym);
+                    bool team1Match = Match.Team1Acronym != null && conditional.Acronyms.Contains(Match.Team1Acronym);
+                    bool team2Match = Match.Team2Acronym != null && conditional.Acronyms.Contains(Match.Team2Acronym);
 
                     if (team1Match && team2Match)
                         Match.Date.Value = conditional.Date.Value;
@@ -344,6 +345,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             Match.Progression.Value = null;
             Match.LosersProgression.Value = null;
 
+            if (ladderInfo == null)
+                return;
+
             ladderInfo.Matches.Remove(Match);
 
             foreach (var m in ladderInfo.Matches)
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
index 4b2a29247b..216e0a5a3e 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.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 JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -52,7 +50,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             name.BindValueChanged(_ => textName.Text = ((losers ? "Losers " : "") + round.Name).ToUpperInvariant(), true);
 
             description = round.Description.GetBoundCopy();
-            description.BindValueChanged(_ => textDescription.Text = round.Description.Value?.ToUpperInvariant(), true);
+            description.BindValueChanged(_ => textDescription.Text = round.Description.Value?.ToUpperInvariant() ?? string.Empty, true);
         }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index 5c9c14cc30..9f0fa19915 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.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.Collections.Specialized;
 using System.Diagnostics;
@@ -23,17 +21,17 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 {
     public partial class LadderEditorSettings : CompositeDrawable
     {
-        private SettingsDropdown<TournamentRound> roundDropdown;
-        private PlayerCheckbox losersCheckbox;
-        private DateTextBox dateTimeBox;
-        private SettingsTeamDropdown team1Dropdown;
-        private SettingsTeamDropdown team2Dropdown;
+        private SettingsDropdown<TournamentRound?> roundDropdown = null!;
+        private PlayerCheckbox losersCheckbox = null!;
+        private DateTextBox dateTimeBox = null!;
+        private SettingsTeamDropdown team1Dropdown = null!;
+        private SettingsTeamDropdown team2Dropdown = null!;
 
         [Resolved]
-        private LadderEditorInfo editorInfo { get; set; }
+        private LadderEditorInfo editorInfo { get; set; } = null!;
 
         [Resolved]
-        private LadderInfo ladderInfo { get; set; }
+        private LadderInfo ladderInfo { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -77,7 +75,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             };
         }
 
-        private void roundDropdownChanged(ValueChangedEvent<TournamentRound> round)
+        private void roundDropdownChanged(ValueChangedEvent<TournamentRound?> round)
         {
             if (editorInfo.Selected.Value?.Date.Value < round.NewValue?.StartDate.Value)
             {
@@ -101,11 +99,11 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         {
         }
 
-        private partial class SettingsRoundDropdown : SettingsDropdown<TournamentRound>
+        private partial class SettingsRoundDropdown : SettingsDropdown<TournamentRound?>
         {
             public SettingsRoundDropdown(BindableList<TournamentRound> rounds)
             {
-                Current = new Bindable<TournamentRound>();
+                Current = new Bindable<TournamentRound?>();
 
                 foreach (var r in rounds.Prepend(new TournamentRound()))
                     add(r);
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
index 00e5353edd..7e35190e2e 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
@@ -12,7 +12,7 @@ using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Ladder.Components
 {
-    public partial class SettingsTeamDropdown : SettingsDropdown<TournamentTeam>
+    public partial class SettingsTeamDropdown : SettingsDropdown<TournamentTeam?>
     {
         public SettingsTeamDropdown(BindableList<TournamentTeam> teams)
         {
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 2d5281b893..4f56a2fcc9 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.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.Specialized;
 using System.Diagnostics;
 using System.Linq;
@@ -22,13 +20,13 @@ namespace osu.Game.Tournament.Screens.Ladder
 {
     public partial class LadderScreen : TournamentScreen
     {
-        protected Container<DrawableTournamentMatch> MatchesContainer;
-        private Container<Path> paths;
-        private Container headings;
+        protected Container<DrawableTournamentMatch> MatchesContainer = null!;
+        private Container<Path> paths = null!;
+        private Container headings = null!;
 
-        protected LadderDragContainer ScrollContent;
+        protected LadderDragContainer ScrollContent = null!;
 
-        protected Container Content;
+        protected Container Content = null!;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index f45da861cb..3091f4293c 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.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.Allocation;
 using osu.Framework.Bindables;
@@ -24,20 +22,20 @@ namespace osu.Game.Tournament.Screens.MapPool
 {
     public partial class MapPoolScreen : TournamentMatchScreen
     {
-        private FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows;
+        private FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows = null!;
 
         [Resolved(canBeNull: true)]
-        private TournamentSceneManager sceneManager { get; set; }
+        private TournamentSceneManager? sceneManager { get; set; }
 
         private TeamColour pickColour;
         private ChoiceType pickType;
 
-        private OsuButton buttonRedBan;
-        private OsuButton buttonBlueBan;
-        private OsuButton buttonRedPick;
-        private OsuButton buttonBluePick;
+        private OsuButton buttonRedBan = null!;
+        private OsuButton buttonBlueBan = null!;
+        private OsuButton buttonRedPick = null!;
+        private OsuButton buttonBluePick = null!;
 
-        private ScheduledDelegate scheduledScreenChange;
+        private ScheduledDelegate? scheduledScreenChange;
 
         [BackgroundDependencyLoader]
         private void load(MatchIPCInfo ipc)
@@ -113,7 +111,7 @@ namespace osu.Game.Tournament.Screens.MapPool
             ipc.Beatmap.BindValueChanged(beatmapChanged);
         }
 
-        private Bindable<bool> splitMapPoolByMods;
+        private Bindable<bool>? splitMapPoolByMods;
 
         protected override void LoadComplete()
         {
@@ -148,6 +146,9 @@ namespace osu.Game.Tournament.Screens.MapPool
 
         private void setNextMode()
         {
+            if (CurrentMatch.Value == null)
+                return;
+
             const TeamColour roll_winner = TeamColour.Red; //todo: draw from match
 
             var nextColour = (CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
@@ -169,11 +170,11 @@ namespace osu.Game.Tournament.Screens.MapPool
                     addForBeatmap(map.Beatmap.OnlineID);
                 else
                 {
-                    var existing = CurrentMatch.Value.PicksBans.FirstOrDefault(p => p.BeatmapID == map.Beatmap?.OnlineID);
+                    var existing = CurrentMatch.Value?.PicksBans.FirstOrDefault(p => p.BeatmapID == map.Beatmap?.OnlineID);
 
                     if (existing != null)
                     {
-                        CurrentMatch.Value.PicksBans.Remove(existing);
+                        CurrentMatch.Value?.PicksBans.Remove(existing);
                         setNextMode();
                     }
                 }
@@ -186,13 +187,13 @@ namespace osu.Game.Tournament.Screens.MapPool
 
         private void reset()
         {
-            CurrentMatch.Value.PicksBans.Clear();
+            CurrentMatch.Value?.PicksBans.Clear();
             setNextMode();
         }
 
         private void addForBeatmap(int beatmapId)
         {
-            if (CurrentMatch.Value == null)
+            if (CurrentMatch.Value?.Round.Value == null)
                 return;
 
             if (CurrentMatch.Value.Round.Value.Beatmaps.All(b => b.Beatmap?.OnlineID != beatmapId))
@@ -228,7 +229,7 @@ namespace osu.Game.Tournament.Screens.MapPool
             base.Hide();
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             base.CurrentMatchChanged(match);
             updateDisplay();
@@ -245,12 +246,15 @@ namespace osu.Game.Tournament.Screens.MapPool
 
             if (CurrentMatch.Value.Round.Value != null)
             {
-                FillFlowContainer<TournamentBeatmapPanel> currentFlow = null;
-                string currentMods = null;
+                FillFlowContainer<TournamentBeatmapPanel>? currentFlow = null;
+                string? currentMods = null;
                 int flowCount = 0;
 
                 foreach (var b in CurrentMatch.Value.Round.Value.Beatmaps)
                 {
+                    if (b.Beatmap == null)
+                        continue;
+
                     if (currentFlow == null || (LadderInfo.SplitMapPoolByMods.Value && currentMods != b.Mods))
                     {
                         mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 9232b4c689..063c231add 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.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 osu.Framework.Allocation;
@@ -21,9 +19,9 @@ namespace osu.Game.Tournament.Screens.Schedule
 {
     public partial class ScheduleScreen : TournamentScreen
     {
-        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-        private Container mainContainer;
-        private LadderInfo ladder;
+        private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
+        private Container mainContainer = null!;
+        private LadderInfo ladder = null!;
 
         [BackgroundDependencyLoader]
         private void load(LadderInfo ladder)
@@ -107,7 +105,7 @@ namespace osu.Game.Tournament.Screens.Schedule
             currentMatch.BindValueChanged(matchChanged, true);
         }
 
-        private void matchChanged(ValueChangedEvent<TournamentMatch> match)
+        private void matchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             var upcoming = ladder.Matches.Where(p => !p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4);
             var conditionals = ladder
diff --git a/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
index e6ab6f143a..c700e3bfdd 100644
--- a/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
+++ b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.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.Graphics;
 using osu.Game.Graphics.UserInterface;
@@ -14,9 +12,9 @@ namespace osu.Game.Tournament.Screens.Setup
         private const int minimum_window_height = 480;
         private const int maximum_window_height = 2160;
 
-        public new Action<int> Action;
+        public new Action<int>? Action;
 
-        private OsuNumberBox numberBox;
+        private OsuNumberBox? numberBox;
 
         protected override Drawable CreateComponent()
         {
diff --git a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
index 5c7bbed69c..1152759c2a 100644
--- a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/SetupScreen.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.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -24,27 +22,27 @@ namespace osu.Game.Tournament.Screens.Setup
 {
     public partial class SetupScreen : TournamentScreen
     {
-        private FillFlowContainer fillFlow;
+        private FillFlowContainer fillFlow = null!;
 
-        private LoginOverlay loginOverlay;
-        private ResolutionSelector resolution;
+        private LoginOverlay? loginOverlay;
+        private ResolutionSelector resolution = null!;
 
         [Resolved]
-        private MatchIPCInfo ipc { get; set; }
+        private MatchIPCInfo ipc { get; set; } = null!;
 
         [Resolved]
-        private StableInfo stableInfo { get; set; }
+        private StableInfo stableInfo { 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(canBeNull: true)]
-        private TournamentSceneManager sceneManager { get; set; }
+        private TournamentSceneManager? sceneManager { get; set; }
 
-        private Bindable<Size> windowSize;
+        private Bindable<Size> windowSize = null!;
 
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig)
@@ -115,7 +113,7 @@ namespace osu.Game.Tournament.Screens.Setup
                     Failing = api.IsLoggedIn != true,
                     Description = "In order to access the API and display metadata, signing in is required."
                 },
-                new LabelledDropdown<RulesetInfo>
+                new LabelledDropdown<RulesetInfo?>
                 {
                     Label = "Ruleset",
                     Description = "Decides what stats are displayed and which ranks are retrieved for players. This requires a restart to reload data for an existing bracket.",
diff --git a/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
index 463b012b77..c3d072b6a0 100644
--- a/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.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.IO;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -24,19 +22,19 @@ namespace osu.Game.Tournament.Screens.Setup
     public partial class StablePathSelectScreen : TournamentScreen
     {
         [Resolved(canBeNull: true)]
-        private TournamentSceneManager sceneManager { get; set; }
+        private TournamentSceneManager? sceneManager { get; set; }
 
         [Resolved]
-        private MatchIPCInfo ipc { get; set; }
+        private MatchIPCInfo ipc { get; set; } = null!;
 
-        private OsuDirectorySelector directorySelector;
-        private DialogOverlay overlay;
+        private OsuDirectorySelector directorySelector = null!;
+        private DialogOverlay? overlay;
 
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuColour colours)
         {
             var initialStorage = (ipc as FileBasedIPC)?.IPCStorage ?? storage;
-            string initialPath = new DirectoryInfo(initialStorage.GetFullPath(string.Empty)).Parent?.FullName;
+            string? initialPath = new DirectoryInfo(initialStorage.GetFullPath(string.Empty)).Parent?.FullName;
 
             AddRangeInternal(new Drawable[]
             {
diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index ae49ccb63b..e55cbc2dbb 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.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.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
@@ -13,12 +11,12 @@ namespace osu.Game.Tournament.Screens.Setup
 {
     internal partial class TournamentSwitcher : ActionableInfo
     {
-        private OsuDropdown<string> dropdown;
-        private OsuButton folderButton;
-        private OsuButton reloadTournamentsButton;
+        private OsuDropdown<string> dropdown = null!;
+        private OsuButton folderButton = null!;
+        private OsuButton reloadTournamentsButton = null!;
 
         [Resolved]
-        private TournamentGameBase game { get; set; }
+        private TournamentGameBase game { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load(TournamentStorage storage)
diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index db4d6198e6..ae2ec0c291 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tournament.Screens.Showcase
             });
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             // showcase screen doesn't care about a match being selected.
             // base call intentionally omitted to not show match warning.
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index b07a0a65dd..120a76c127 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.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.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -22,12 +20,12 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 {
     public partial class SeedingScreen : TournamentMatchScreen
     {
-        private Container mainContainer;
+        private Container mainContainer = null!;
 
-        private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
+        private readonly Bindable<TournamentTeam?> currentTeam = new Bindable<TournamentTeam?>();
 
-        private TourneyButton showFirstTeamButton;
-        private TourneyButton showSecondTeamButton;
+        private TourneyButton showFirstTeamButton = null!;
+        private TourneyButton showSecondTeamButton = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -53,13 +51,13 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                         {
                             RelativeSizeAxes = Axes.X,
                             Text = "Show first team",
-                            Action = () => currentTeam.Value = CurrentMatch.Value.Team1.Value,
+                            Action = () => currentTeam.Value = CurrentMatch.Value?.Team1.Value,
                         },
                         showSecondTeamButton = new TourneyButton
                         {
                             RelativeSizeAxes = Axes.X,
                             Text = "Show second team",
-                            Action = () => currentTeam.Value = CurrentMatch.Value.Team2.Value,
+                            Action = () => currentTeam.Value = CurrentMatch.Value?.Team2.Value,
                         },
                         new SettingsTeamDropdown(LadderInfo.Teams)
                         {
@@ -73,7 +71,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
             currentTeam.BindValueChanged(teamChanged, true);
         }
 
-        private void teamChanged(ValueChangedEvent<TournamentTeam> team) => updateTeamDisplay();
+        private void teamChanged(ValueChangedEvent<TournamentTeam?> team) => updateTeamDisplay();
 
         public override void Show()
         {
@@ -84,7 +82,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
             updateTeamDisplay();
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             base.CurrentMatchChanged(match);
 
@@ -256,7 +254,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 
         private partial class LeftInfo : CompositeDrawable
         {
-            public LeftInfo(TournamentTeam team)
+            public LeftInfo(TournamentTeam? team)
             {
                 FillFlowContainer fill;
 
@@ -315,7 +313,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 
             private partial class TeamDisplay : DrawableTournamentTeam
             {
-                public TeamDisplay(TournamentTeam team)
+                public TeamDisplay(TournamentTeam? team)
                     : base(team)
                 {
                     AutoSizeAxes = Axes.Both;
diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index 950a63808c..2280f21d47 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -15,7 +13,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 {
     public partial class TeamIntroScreen : TournamentMatchScreen
     {
-        private Container mainContainer;
+        private Container mainContainer = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -36,7 +34,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
             };
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             base.CurrentMatchChanged(match);
 
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index 9206de1dc2..af21613541 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -16,12 +14,12 @@ namespace osu.Game.Tournament.Screens.TeamWin
 {
     public partial class TeamWinScreen : TournamentMatchScreen
     {
-        private Container mainContainer;
+        private Container mainContainer = null!;
 
         private readonly Bindable<bool> currentCompleted = new Bindable<bool>();
 
-        private TourneyVideo blueWinVideo;
-        private TourneyVideo redWinVideo;
+        private TourneyVideo blueWinVideo = null!;
+        private TourneyVideo redWinVideo = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -51,7 +49,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
             currentCompleted.BindValueChanged(_ => update());
         }
 
-        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected override void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             base.CurrentMatchChanged(match);
 
@@ -70,7 +68,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
         {
             var match = CurrentMatch.Value;
 
-            if (match.Winner == null)
+            if (match?.Winner == null)
             {
                 mainContainer.Clear();
                 return;
diff --git a/osu.Game.Tournament/Screens/TournamentMatchScreen.cs b/osu.Game.Tournament/Screens/TournamentMatchScreen.cs
index 58444d0c1b..5a9b9d05ed 100644
--- a/osu.Game.Tournament/Screens/TournamentMatchScreen.cs
+++ b/osu.Game.Tournament/Screens/TournamentMatchScreen.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.Game.Tournament.Models;
 
@@ -10,8 +8,8 @@ namespace osu.Game.Tournament.Screens
 {
     public abstract partial class TournamentMatchScreen : TournamentScreen
     {
-        protected readonly Bindable<TournamentMatch> CurrentMatch = new Bindable<TournamentMatch>();
-        private WarningBox noMatchWarning;
+        protected readonly Bindable<TournamentMatch?> CurrentMatch = new Bindable<TournamentMatch?>();
+        private WarningBox? noMatchWarning;
 
         protected override void LoadComplete()
         {
@@ -21,7 +19,7 @@ namespace osu.Game.Tournament.Screens
             CurrentMatch.BindValueChanged(CurrentMatchChanged, true);
         }
 
-        protected virtual void CurrentMatchChanged(ValueChangedEvent<TournamentMatch> match)
+        protected virtual void CurrentMatchChanged(ValueChangedEvent<TournamentMatch?> match)
         {
             if (match.NewValue == null)
             {
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index c79cc9cd57..ba3b17b513 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.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.Drawing;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -35,12 +33,12 @@ namespace osu.Game.Tournament
         public static readonly Color4 ELEMENT_FOREGROUND_COLOUR = Color4Extensions.FromHex("#000");
 
         public static readonly Color4 TEXT_COLOUR = Color4Extensions.FromHex("#fff");
-        private Drawable heightWarning;
+        private Drawable heightWarning = null!;
 
-        private Bindable<WindowMode> windowMode;
+        private Bindable<WindowMode> windowMode = null!;
         private readonly BindableSize windowSize = new BindableSize();
 
-        private LoadingSpinner loadingSpinner;
+        private LoadingSpinner loadingSpinner = null!;
 
         [Cached(typeof(IDialogOverlay))]
         private readonly DialogOverlay dialogOverlay = new DialogOverlay();
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 509c8bb940..ee03b4c35d 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -1,14 +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.
 
-#nullable disable
-
 using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
@@ -31,11 +30,11 @@ namespace osu.Game.Tournament
     public partial class TournamentGameBase : OsuGameBase
     {
         public const string BRACKET_FILENAME = @"bracket.json";
-        private LadderInfo ladder;
-        private TournamentStorage storage;
-        private DependencyContainer dependencies;
-        private FileBasedIPC ipc;
-        private BeatmapLookupCache beatmapCache;
+        private LadderInfo ladder = null!;
+        private TournamentStorage storage = null!;
+        private DependencyContainer dependencies = null!;
+        private FileBasedIPC ipc = null!;
+        private BeatmapLookupCache beatmapCache = null!;
 
         protected Task BracketLoadTask => bracketLoadTaskCompletionSource.Task;
 
@@ -54,7 +53,7 @@ namespace osu.Game.Tournament
             return new ProductionEndpointConfiguration();
         }
 
-        private TournamentSpriteText initialisationText;
+        private TournamentSpriteText initialisationText = null!;
 
         [BackgroundDependencyLoader]
         private void load(Storage baseStorage)
@@ -78,6 +77,8 @@ namespace osu.Game.Tournament
             dependencies.CacheAs(new StableInfo(storage));
 
             beatmapCache = dependencies.Get<BeatmapLookupCache>();
+
+            ladder = new LadderInfo();
         }
 
         protected override void LoadComplete()
@@ -100,11 +101,11 @@ namespace osu.Game.Tournament
                 {
                     using (Stream stream = storage.GetStream(BRACKET_FILENAME, FileAccess.Read, FileMode.Open))
                     using (var sr = new StreamReader(stream))
-                        ladder = JsonConvert.DeserializeObject<LadderInfo>(await sr.ReadToEndAsync().ConfigureAwait(false), new JsonPointConverter());
+                    {
+                        ladder = JsonConvert.DeserializeObject<LadderInfo>(await sr.ReadToEndAsync().ConfigureAwait(false), new JsonPointConverter()) ?? ladder;
+                    }
                 }
 
-                ladder ??= new LadderInfo();
-
                 var resolvedRuleset = ladder.Ruleset.Value != null
                     ? RulesetStore.GetRuleset(ladder.Ruleset.Value.ShortName)
                     : RulesetStore.AvailableRulesets.First();
@@ -283,7 +284,7 @@ namespace osu.Game.Tournament
 
         private void updateLoadProgressMessage(string s) => Schedule(() => initialisationText.Text = s);
 
-        public void PopulatePlayer(TournamentUser user, Action success = null, Action failure = null, bool immediate = false)
+        public void PopulatePlayer(TournamentUser user, Action? success = null, Action? failure = null, bool immediate = false)
         {
             var req = new GetUserRequest(user.OnlineID, ladder.Ruleset.Value);
 
@@ -348,8 +349,8 @@ namespace osu.Game.Tournament
             foreach (var r in ladder.Rounds)
                 r.Matches = ladder.Matches.Where(p => p.Round.Value == r).Select(p => p.ID).ToList();
 
-            ladder.Progressions = ladder.Matches.Where(p => p.Progression.Value != null).Select(p => new TournamentProgression(p.ID, p.Progression.Value.ID)).Concat(
-                                            ladder.Matches.Where(p => p.LosersProgression.Value != null).Select(p => new TournamentProgression(p.ID, p.LosersProgression.Value.ID, true)))
+            ladder.Progressions = ladder.Matches.Where(p => p.Progression.Value != null).Select(p => new TournamentProgression(p.ID, p.Progression.Value.AsNonNull().ID)).Concat(
+                                            ladder.Matches.Where(p => p.LosersProgression.Value != null).Select(p => new TournamentProgression(p.ID, p.LosersProgression.Value.AsNonNull().ID, true)))
                                         .ToList();
 
             return JsonConvert.SerializeObject(ladder,
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 9ac5a9de12..c69b76ae29 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.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 osu.Framework.Allocation;
@@ -35,8 +33,8 @@ namespace osu.Game.Tournament
     [Cached]
     public partial class TournamentSceneManager : CompositeDrawable
     {
-        private Container screens;
-        private TourneyVideo video;
+        private Container screens = null!;
+        private TourneyVideo video = null!;
 
         public const int CONTROL_AREA_WIDTH = 200;
 
@@ -50,8 +48,8 @@ namespace osu.Game.Tournament
         [Cached]
         private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay();
 
-        private Container chatContainer;
-        private FillFlowContainer buttons;
+        private Container chatContainer = null!;
+        private FillFlowContainer buttons = null!;
 
         public TournamentSceneManager()
         {
@@ -166,10 +164,10 @@ namespace osu.Game.Tournament
 
         private float depth;
 
-        private Drawable currentScreen;
-        private ScheduledDelegate scheduledHide;
+        private Drawable? currentScreen;
+        private ScheduledDelegate? scheduledHide;
 
-        private Drawable temporaryScreen;
+        private Drawable? temporaryScreen;
 
         public void SetScreen(Drawable screen)
         {
@@ -284,7 +282,7 @@ namespace osu.Game.Tournament
                                 Y = -2,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Text = shortcutKey.ToString(),
+                                Text = shortcutKey.Value.ToString(),
                             }
                         }
                     });
@@ -304,7 +302,7 @@ namespace osu.Game.Tournament
 
             private bool isSelected;
 
-            public Action<Type> RequestSelection;
+            public Action<Type>? RequestSelection;
 
             public bool IsSelected
             {

From 4c33013674a9f2ddd761d966e1c6e08e88de66a6 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sat, 29 Jul 2023 22:41:26 +0900
Subject: [PATCH 0070/2296] null check in test

---
 .../Screens/TestSceneMapPoolScreen.cs         | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 2c17cd0d52..254d5c6996 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -1,11 +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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
@@ -16,7 +15,7 @@ namespace osu.Game.Tournament.Tests.Screens
 {
     public partial class TestSceneMapPoolScreen : TournamentScreenTestScene
     {
-        private MapPoolScreen screen;
+        private MapPoolScreen screen = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -32,7 +31,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load few maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 8; i++)
                     addBeatmap();
@@ -52,7 +51,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load just enough maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 18; i++)
                     addBeatmap();
@@ -72,7 +71,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 19; i++)
                     addBeatmap();
@@ -92,7 +91,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 11; i++)
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
@@ -118,7 +117,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 12; i++)
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
@@ -138,7 +137,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
+                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
 
                 for (int i = 0; i < 12; i++)
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
@@ -155,7 +154,7 @@ namespace osu.Game.Tournament.Tests.Screens
 
         private void addBeatmap(string mods = "NM")
         {
-            Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Add(new RoundBeatmap
+            Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Add(new RoundBeatmap
             {
                 Beatmap = CreateSampleBeatmap(),
                 Mods = mods

From 033c9091c04377869a13185230fb4e95bf62c665 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 01:39:31 +0900
Subject: [PATCH 0071/2296] use cast instead AsNonNull

---
 osu.Game.Tournament/Models/TournamentTeam.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 3587aa937e..b3b2f213ce 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tournament.Models
             {
                 int[] ranks = Players.Select(p => p.Rank)
                                      .Where(i => i.HasValue)
-                                     .Select(i => i.AsNonNull().Value)
+                                     .Cast<int>()
                                      .ToArray();
 
                 if (ranks.Length == 0)

From 625ed729eed3a76703fe0c1713fa9617baf5e33b Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 01:39:56 +0900
Subject: [PATCH 0072/2296] debug assert `closest != null`

---
 .../Screens/Drawings/Components/ScrollingTeamContainer.cs   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
index 4a47de8714..7f19e8a497 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
@@ -136,11 +136,11 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                             closest = stc;
                     }
 
-                    Trace.Assert(closest != null, "closest != null");
+                    Debug.Assert(closest != null, "closest != null");
 
-                    offset += DrawWidth / 2f - (closest.AsNonNull().Position.X + closest.AsNonNull().DrawWidth / 2f);
+                    offset += DrawWidth / 2f - (closest.Position.X + closest.DrawWidth / 2f);
 
-                    ScrollingTeam st = closest.AsNonNull();
+                    ScrollingTeam st = closest;
 
                     availableTeams.RemoveAll(at => at == st.Team);
 

From cb4adf115cae1dbef79f1b8af64d0d71c768b537 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 01:40:13 +0900
Subject: [PATCH 0073/2296] RemoveTeam shouldn't have nullable arg

---
 .../Screens/Drawings/Components/ScrollingTeamContainer.cs    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
index 7f19e8a497..d4e0f29852 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
@@ -188,11 +188,8 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
             setScrollState(ScrollState.Idle);
         }
 
-        public void RemoveTeam(TournamentTeam? team)
+        public void RemoveTeam(TournamentTeam team)
         {
-            if (team == null)
-                return;
-
             availableTeams.Remove(team);
 
             foreach (var c in Children)

From 9482f7445614907f001aee2097939d25ad6c0b92 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 01:49:57 +0900
Subject: [PATCH 0074/2296] fix nullable for TeamList

---
 osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index b2dd4e8c36..fc59b486fe 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tournament.Screens.Drawings
 
         private Storage storage = null!;
 
-        public ITeamList? TeamList;
+        public ITeamList TeamList = null!;
 
         [BackgroundDependencyLoader]
         private void load(Storage storage)
@@ -48,7 +48,8 @@ namespace osu.Game.Tournament.Screens.Drawings
 
             RelativeSizeAxes = Axes.Both;
 
-            TeamList ??= new StorageBackedTeamList(storage);
+            if (TeamList.IsNull())
+                TeamList = new StorageBackedTeamList(storage);
 
             if (!TeamList.Teams.Any())
             {
@@ -223,7 +224,7 @@ namespace osu.Game.Tournament.Screens.Drawings
             teamsContainer.ClearTeams();
             allTeams.Clear();
 
-            foreach (TournamentTeam t in TeamList.AsNonNull().Teams)
+            foreach (TournamentTeam t in TeamList.Teams)
             {
                 if (groupsContainer.ContainsTeam(t.FullName.Value))
                     continue;

From 88a1cf40052a92f70f8055fd1da33b44d575f022 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 01:57:44 +0900
Subject: [PATCH 0075/2296] remove all `canBeNull` from attribute

---
 osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs     | 2 +-
 osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs        | 2 +-
 .../Screens/Ladder/Components/DrawableMatchTeam.cs            | 4 ++--
 .../Screens/Ladder/Components/DrawableTournamentMatch.cs      | 4 ++--
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs          | 2 +-
 osu.Game.Tournament/Screens/Setup/SetupScreen.cs              | 2 +-
 osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
index a82ac57ee9..4074e681f9 100644
--- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tournament.Screens.Editors
 
         private RectangularPositionSnapGrid grid = null!;
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private IDialogOverlay? dialogOverlay { get; set; }
 
         protected override bool DrawLoserPaths => true;
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 79c50e60ba..20188cc5dc 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private OsuButton warmupButton = null!;
         private MatchIPCInfo ipc = null!;
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private TournamentSceneManager? sceneManager { get; set; }
 
         [Resolved]
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index a380ad9b49..637591c6f6 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         private readonly Func<bool>? isWinner;
         private LadderEditorScreen ladderEditor = null!;
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private LadderInfo? ladderInfo { get; set; }
 
         private void setCurrent()
@@ -53,7 +53,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             ladderInfo.CurrentMatch.Value.Current.Value = true;
         }
 
-        [Resolved(CanBeNull = true)]
+        [Resolved]
         private LadderEditorInfo? editorInfo { get; set; }
 
         public DrawableMatchTeam(TournamentTeam? team, TournamentMatch match, bool losers)
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index 7b8f2e373b..4de47d7c7f 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -28,10 +28,10 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         private readonly Drawable currentMatchSelectionBox;
         private Bindable<TournamentMatch>? globalSelection;
 
-        [Resolved(CanBeNull = true)]
+        [Resolved]
         private LadderEditorInfo? editorInfo { get; set; }
 
-        [Resolved(CanBeNull = true)]
+        [Resolved]
         private LadderInfo? ladderInfo { get; set; }
 
         public DrawableTournamentMatch(TournamentMatch match, bool editor = false)
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 3091f4293c..cfce2694e9 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tournament.Screens.MapPool
     {
         private FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows = null!;
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private TournamentSceneManager? sceneManager { get; set; }
 
         private TeamColour pickColour;
diff --git a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
index 1152759c2a..df1ce69c33 100644
--- a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tournament.Screens.Setup
         [Resolved]
         private RulesetStore rulesets { get; set; } = null!;
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private TournamentSceneManager? sceneManager { get; set; }
 
         private Bindable<Size> windowSize = null!;
diff --git a/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
index c3d072b6a0..74404e06f8 100644
--- a/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tournament.Screens.Setup
 {
     public partial class StablePathSelectScreen : TournamentScreen
     {
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private TournamentSceneManager? sceneManager { get; set; }
 
         [Resolved]

From 65b4ae506ee563b9a2b940c4a72b9c9d34ac5dc2 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Sat, 29 Jul 2023 13:18:47 -0400
Subject: [PATCH 0076/2296] Moved enum to bottom of enumeration table

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 3d24afbb16..79f098f90e 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -286,9 +286,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameInterface))]
         ToggleInGameInterface,
 
-        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameLeaderboard))]
-        ToggleInGameLeaderboard,
-
         // Song select keybindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleModSelection))]
         ToggleModSelection,
@@ -382,5 +379,9 @@ namespace osu.Game.Input.Bindings
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleReplaySettings))]
         ToggleReplaySettings,
+
+        // Editor (cont)
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameLeaderboard))]
+        ToggleInGameLeaderboard,
     }
 }

From 5fa0a21b564890637beda25061c454573317ae9b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 18:14:20 +0900
Subject: [PATCH 0077/2296] Add corner radius around player areas

---
 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index dc4a2df9d8..54f03569de 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
+            CornerRadius = 5;
 
             AudioContainer audioContainer;
             InternalChildren = new Drawable[]

From 1826819663776a737ab77ad2c1265266067cea2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 18:56:29 +0900
Subject: [PATCH 0078/2296] Move `Facade` to nested class

---
 .../Multiplayer/Spectate/PlayerGrid.cs        | 12 ++++++++++
 .../Multiplayer/Spectate/PlayerGrid_Facade.cs | 22 -------------------
 2 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index 771a8c0de4..87072e8d9e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -169,5 +169,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             foreach (var cell in facadeContainer)
                 cell.Size = cellSize;
         }
+
+        /// <summary>
+        /// A facade of the grid which is used as a dummy object to store the required position/size of cells.
+        /// </summary>
+        public partial class Facade : Drawable
+        {
+            public Facade()
+            {
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
deleted file mode 100644
index 934c22c918..0000000000
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
+++ /dev/null
@@ -1,22 +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.Graphics;
-
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
-{
-    public partial class PlayerGrid
-    {
-        /// <summary>
-        /// A facade of the grid which is used as a dummy object to store the required position/size of cells.
-        /// </summary>
-        private partial class Facade : Drawable
-        {
-            public Facade()
-            {
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-            }
-        }
-    }
-}

From 84bc14c1ddc1e878a0245fce39aa1252f2c398cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 18:56:41 +0900
Subject: [PATCH 0079/2296] Improve animation and sizing of maximised screen
 display

---
 .../Multiplayer/Spectate/PlayerGrid.cs        | 42 +++++++++------
 .../Multiplayer/Spectate/PlayerGrid_Cell.cs   | 52 +++++++++----------
 2 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index 87072e8d9e..c88feb12bd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
@@ -15,20 +16,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     /// </summary>
     public partial class PlayerGrid : CompositeDrawable
     {
+        public const float ANIMATION_DELAY = 400;
+
         /// <summary>
         /// A temporary limitation on the number of players, because only layouts up to 16 players are supported for a single screen.
         /// Todo: Can be removed in the future with scrolling support + performance improvements.
         /// </summary>
         public const int MAX_PLAYERS = 16;
 
-        private const float player_spacing = 5;
+        private const float player_spacing = 6;
 
         /// <summary>
         /// The currently-maximised facade.
         /// </summary>
-        public Drawable MaximisedFacade => maximisedFacade;
+        public Facade MaximisedFacade { get; }
 
-        private readonly Facade maximisedFacade;
         private readonly Container paddingContainer;
         private readonly FillFlowContainer<Facade> facadeContainer;
         private readonly Container<Cell> cellContainer;
@@ -48,12 +50,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                             RelativeSizeAxes = Axes.Both,
                             Child = facadeContainer = new FillFlowContainer<Facade>
                             {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Spacing = new Vector2(player_spacing),
                             }
                         },
-                        maximisedFacade = new Facade { RelativeSizeAxes = Axes.Both }
+                        MaximisedFacade = new Facade
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(0.8f),
+                        }
                     }
                 },
                 cellContainer = new Container<Cell> { RelativeSizeAxes = Axes.Both }
@@ -91,26 +99,30 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private void toggleMaximisationState(Cell target)
         {
-            // Iterate through all cells to ensure only one is maximised at any time.
-            foreach (var i in cellContainer.ToList())
-            {
-                if (i == target)
-                    i.IsMaximised = !i.IsMaximised;
-                else
-                    i.IsMaximised = false;
+            bool anyMaximised = target.IsMaximised = !target.IsMaximised;
 
-                if (i.IsMaximised)
+            // Iterate through all cells to ensure only one is maximised at any time.
+            foreach (var cell in cellContainer.ToList())
+            {
+                if (cell != target)
+                    cell.IsMaximised = false;
+
+                if (cell.IsMaximised)
                 {
                     // Transfer cell to the maximised facade.
-                    i.SetFacade(maximisedFacade);
-                    cellContainer.ChangeChildDepth(i, maximisedInstanceDepth -= 0.001f);
+                    cell.SetFacade(MaximisedFacade);
+                    cellContainer.ChangeChildDepth(cell, maximisedInstanceDepth -= 0.001f);
                 }
                 else
                 {
                     // Transfer cell back to its original facade.
-                    i.SetFacade(facadeContainer[i.FacadeIndex]);
+                    cell.SetFacade(facadeContainer[cell.FacadeIndex]);
                 }
+
+                cell.FadeColour(anyMaximised && cell != target ? Color4.Gray : Color4.White, ANIMATION_DELAY, Easing.Out);
             }
+
+            facadeContainer.ScaleTo(anyMaximised ? 0.95f : 1, ANIMATION_DELAY, Easing.OutQuint);
         }
 
         protected override void Update()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index 4a8b8f49e1..d11e79d820 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -8,6 +8,7 @@ using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
@@ -40,7 +41,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             public bool IsMaximised;
 
             private Facade facade;
-            private bool isTracking = true;
+
+            private bool isAnimating;
 
             public Cell(int facadeIndex, Drawable content)
             {
@@ -54,11 +56,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             {
                 base.Update();
 
-                if (isTracking)
-                {
-                    Position = getFinalPosition();
-                    Size = getFinalSize();
-                }
+                var targetPos = getFinalPosition();
+                var targetSize = getFinalSize();
+
+                double duration = isAnimating ? 60 : 0;
+
+                Position = new Vector2(
+                    (float)Interpolation.DampContinuously(Position.X, targetPos.X, duration, Time.Elapsed),
+                    (float)Interpolation.DampContinuously(Position.Y, targetPos.Y, duration, Time.Elapsed)
+                );
+
+                Size = new Vector2(
+                    (float)Interpolation.DampContinuously(Size.X, targetSize.X, duration, Time.Elapsed),
+                    (float)Interpolation.DampContinuously(Size.Y, targetSize.Y, duration, Time.Elapsed)
+                );
+
+                // If we don't track the animating state, the animation will also occur when resizing the window.
+                isAnimating &= !Precision.AlmostEquals(Position, targetPos, 0.01f);
             }
 
             /// <summary>
@@ -66,30 +80,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             /// </summary>
             public void SetFacade([NotNull] Facade newFacade)
             {
-                Facade lastFacade = facade;
                 facade = newFacade;
-
-                if (lastFacade == null || lastFacade == newFacade)
-                    return;
-
-                isTracking = false;
-
-                this.MoveTo(getFinalPosition(), 400, Easing.OutQuint).ResizeTo(getFinalSize(), 400, Easing.OutQuint)
-                    .Then()
-                    .OnComplete(_ =>
-                    {
-                        if (facade == newFacade)
-                            isTracking = true;
-                    });
+                isAnimating = true;
             }
 
-            private Vector2 getFinalPosition()
-            {
-                var topLeft = Parent.ToLocalSpace(facade.ToScreenSpace(Vector2.Zero));
-                return topLeft + facade.DrawSize / 2;
-            }
+            private Vector2 getFinalPosition() =>
+                Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.Centre);
 
-            private Vector2 getFinalSize() => facade.DrawSize;
+            private Vector2 getFinalSize() =>
+                Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.BottomRight)
+                - Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.TopLeft);
 
             protected override bool OnClick(ClickEvent e)
             {

From 38244c081ff942940a95df3b6a74f27bb3c24368 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 19:08:46 +0900
Subject: [PATCH 0080/2296] Further refactorings along with shadow
 implementation

---
 .../Multiplayer/Spectate/PlayerArea.cs        |  2 --
 .../Multiplayer/Spectate/PlayerGrid.cs        | 19 ++++++--------
 .../Multiplayer/Spectate/PlayerGrid_Cell.cs   | 26 +++++++++++++------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 54f03569de..1b03452df7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -67,8 +67,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             SpectatorPlayerClock = clock;
 
             RelativeSizeAxes = Axes.Both;
-            Masking = true;
-            CornerRadius = 5;
 
             AudioContainer audioContainer;
             InternalChildren = new Drawable[]
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index c88feb12bd..c162b87727 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -83,8 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var facade = new Facade();
             facadeContainer.Add(facade);
 
-            var cell = new Cell(index, content) { ToggleMaximisationState = toggleMaximisationState };
-            cell.SetFacade(facade);
+            var cell = new Cell(index, content, facade) { ToggleMaximisationState = toggleMaximisationState };
 
             cellContainer.Add(cell);
         }
@@ -99,30 +98,28 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private void toggleMaximisationState(Cell target)
         {
-            bool anyMaximised = target.IsMaximised = !target.IsMaximised;
+            // in the case the target is the already maximised cell, no cell should be maximised.
+            bool hasMaximised = !target.IsMaximised;
 
             // Iterate through all cells to ensure only one is maximised at any time.
             foreach (var cell in cellContainer.ToList())
             {
-                if (cell != target)
-                    cell.IsMaximised = false;
-
-                if (cell.IsMaximised)
+                if (hasMaximised && cell == target)
                 {
                     // Transfer cell to the maximised facade.
-                    cell.SetFacade(MaximisedFacade);
+                    cell.SetFacade(MaximisedFacade, true);
                     cellContainer.ChangeChildDepth(cell, maximisedInstanceDepth -= 0.001f);
                 }
                 else
                 {
                     // Transfer cell back to its original facade.
-                    cell.SetFacade(facadeContainer[cell.FacadeIndex]);
+                    cell.SetFacade(facadeContainer[cell.FacadeIndex], false);
                 }
 
-                cell.FadeColour(anyMaximised && cell != target ? Color4.Gray : Color4.White, ANIMATION_DELAY, Easing.Out);
+                cell.FadeColour(hasMaximised && cell != target ? Color4.Gray : Color4.White, ANIMATION_DELAY, Easing.OutQuint);
             }
 
-            facadeContainer.ScaleTo(anyMaximised ? 0.95f : 1, ANIMATION_DELAY, Easing.OutQuint);
+            facadeContainer.ScaleTo(hasMaximised ? 0.95f : 1, ANIMATION_DELAY, Easing.OutQuint);
         }
 
         protected override void Update()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index d11e79d820..4e624da17f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.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 JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osuTK;
@@ -33,23 +31,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             /// <summary>
             /// An action that toggles the maximisation state of this cell.
             /// </summary>
-            public Action<Cell> ToggleMaximisationState;
+            public Action<Cell>? ToggleMaximisationState;
 
             /// <summary>
             /// Whether this cell is currently maximised.
             /// </summary>
-            public bool IsMaximised;
+            public bool IsMaximised { get; private set; }
 
             private Facade facade;
 
             private bool isAnimating;
 
-            public Cell(int facadeIndex, Drawable content)
+            public Cell(int facadeIndex, Drawable content, Facade facade)
             {
                 FacadeIndex = facadeIndex;
+                this.facade = facade;
 
                 Origin = Anchor.Centre;
                 InternalChild = Content = content;
+
+                Masking = true;
+                CornerRadius = 5;
             }
 
             protected override void Update()
@@ -78,10 +80,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             /// <summary>
             /// Makes this cell track a new facade.
             /// </summary>
-            public void SetFacade([NotNull] Facade newFacade)
+            public void SetFacade(Facade newFacade, bool isMaximised)
             {
                 facade = newFacade;
+                IsMaximised = isMaximised;
                 isAnimating = true;
+
+                TweenEdgeEffectTo(new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Radius = isMaximised ? 30 : 10,
+                    Colour = Colour4.Black.Opacity(isMaximised ? 0.5f : 0.2f),
+                }, ANIMATION_DELAY, Easing.OutQuint);
             }
 
             private Vector2 getFinalPosition() =>
@@ -93,7 +103,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             protected override bool OnClick(ClickEvent e)
             {
-                ToggleMaximisationState(this);
+                ToggleMaximisationState?.Invoke(this);
                 return true;
             }
         }

From 75625f089e1f8f9957bf6a7fb52bc48f552f38d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jul 2023 19:22:21 +0900
Subject: [PATCH 0081/2296] Hide toolbar when entering multiplayer spectator

---
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 2d2aa0f1d5..58eed7e85c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         // We are managing our own adjustments. For now, this happens inside the Player instances themselves.
         public override bool? AllowTrackAdjustments => false;
 
+        public override bool HideOverlaysOnEnter => true;
+
         /// <summary>
         /// Whether all spectating players have finished loading.
         /// </summary>

From 9d928c0225d3b86257f1cf8cd71a606c46038892 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 29 Jul 2023 10:39:50 -0700
Subject: [PATCH 0082/2296] Apply NRT to `BreakInfoLine`

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index b8696352e8..c6a0ca0ef6 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.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.Allocation;
 using osu.Framework.Bindables;
@@ -71,7 +69,7 @@ namespace osu.Game.Screens.Play.Break
             if (count is Enum countEnum)
                 return countEnum.GetDescription();
 
-            return count.ToString();
+            return count.ToString() ?? string.Empty;
         }
 
         [BackgroundDependencyLoader]

From 740898dffb910d5d6e8306c746e9578b383b47d0 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 29 Jul 2023 10:40:18 -0700
Subject: [PATCH 0083/2296] Remove unnecessary prefix parameter

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index c6a0ca0ef6..cfdf6cc651 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -24,12 +24,8 @@ namespace osu.Game.Screens.Play.Break
         private readonly OsuSpriteText text;
         private readonly OsuSpriteText valueText;
 
-        private readonly string prefix;
-
-        public BreakInfoLine(LocalisableString name, string prefix = @"")
+        public BreakInfoLine(LocalisableString name)
         {
-            this.prefix = prefix;
-
             AutoSizeAxes = Axes.Y;
             Children = new Drawable[]
             {
@@ -45,7 +41,7 @@ namespace osu.Game.Screens.Play.Break
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.CentreLeft,
-                    Text = prefix + @"-",
+                    Text = @"-",
                     Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 17),
                     Margin = new MarginPadding { Left = margin }
                 }
@@ -56,7 +52,7 @@ namespace osu.Game.Screens.Play.Break
 
         private void currentValueChanged(ValueChangedEvent<T> e)
         {
-            LocalisableString newText = LocalisableString.Interpolate($"{prefix}{Format(e.NewValue)}");
+            LocalisableString newText = Format(e.NewValue);
 
             if (valueText.Text == newText)
                 return;
@@ -82,8 +78,8 @@ namespace osu.Game.Screens.Play.Break
 
     public partial class PercentageBreakInfoLine : BreakInfoLine<double>
     {
-        public PercentageBreakInfoLine(LocalisableString name, string prefix = "")
-            : base(name, prefix)
+        public PercentageBreakInfoLine(LocalisableString name)
+            : base(name)
         {
         }
 

From 6ad8339c6674300806378693d79cc9f12285e71a Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:30:11 +0900
Subject: [PATCH 0084/2296] use no null when true

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 333dd0fd73..daf1417f6f 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using Microsoft.Win32;
@@ -180,7 +181,7 @@ namespace osu.Game.Tournament.IPC
         /// <returns>Whether an IPC directory was successfully auto-detected.</returns>
         public bool AutoDetectIPCLocation() => SetIPCLocation(findStablePath());
 
-        private static bool ipcFileExistsInDirectory(string? p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
+        private static bool ipcFileExistsInDirectory([NotNullWhen(true)] string? p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
 
         private string? findStablePath()
         {
@@ -201,7 +202,7 @@ namespace osu.Game.Tournament.IPC
                 string? stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
 
                 if (ipcFileExistsInDirectory(stableInstallPath))
-                    return stableInstallPath!;
+                    return stableInstallPath;
             }
             catch
             {

From a1f0e5978448040c646e0252ffc7fdf4077beb17 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:30:51 +0900
Subject: [PATCH 0085/2296] remove null check for b.Beatmap

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index cfce2694e9..9caa87d75e 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -252,9 +252,6 @@ namespace osu.Game.Tournament.Screens.MapPool
 
                 foreach (var b in CurrentMatch.Value.Round.Value.Beatmaps)
                 {
-                    if (b.Beatmap == null)
-                        continue;
-
                     if (currentFlow == null || (LadderInfo.SplitMapPoolByMods.Value && currentMods != b.Mods))
                     {
                         mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>

From bc2ca11bb0497b81c0a891a34aac645089828e02 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:31:05 +0900
Subject: [PATCH 0086/2296] move to initialiser

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

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index ee03b4c35d..eecd097a97 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament
     public partial class TournamentGameBase : OsuGameBase
     {
         public const string BRACKET_FILENAME = @"bracket.json";
-        private LadderInfo ladder = null!;
+        private LadderInfo ladder = new LadderInfo();
         private TournamentStorage storage = null!;
         private DependencyContainer dependencies = null!;
         private FileBasedIPC ipc = null!;
@@ -77,8 +77,6 @@ namespace osu.Game.Tournament
             dependencies.CacheAs(new StableInfo(storage));
 
             beatmapCache = dependencies.Get<BeatmapLookupCache>();
-
-            ladder = new LadderInfo();
         }
 
         protected override void LoadComplete()

From 059012130924902e36d3e8311d23e4381b7d07eb Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:38:19 +0900
Subject: [PATCH 0087/2296] string mod should not null

Already assigned in the constructor
---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 2d5844d02b..0f916d931d 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tournament.Components
     {
         public readonly TournamentBeatmap? Beatmap;
 
-        private readonly string? mod;
+        private readonly string mod;
 
         public const float HEIGHT = 50;
 

From ba80d1e2d5e766a5791b047fcad736adb4f54340 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:49:13 +0900
Subject: [PATCH 0088/2296] remove nullable for Box

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

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 0f916d931d..ba922c7c7b 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Tournament.Components
 
         private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
 
-        private Box? flash;
+        private Box flash = null!;
 
         public TournamentBeatmapPanel(TournamentBeatmap? beatmap, string mod = "")
         {
@@ -135,11 +135,12 @@ namespace osu.Game.Tournament.Components
                 match.OldValue.PicksBans.CollectionChanged -= picksBansOnCollectionChanged;
             if (match.NewValue != null)
                 match.NewValue.PicksBans.CollectionChanged += picksBansOnCollectionChanged;
-            updateState();
+
+            Scheduler.AddOnce(updateState);
         }
 
         private void picksBansOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-            => updateState();
+            => Scheduler.AddOnce(updateState);
 
         private BeatmapChoice? choice;
 
@@ -157,7 +158,7 @@ namespace osu.Game.Tournament.Components
             if (newChoice != null)
             {
                 if (shouldFlash)
-                    flash?.FadeOutFromOne(500).Loop(0, 10);
+                    flash.FadeOutFromOne(500).Loop(0, 10);
 
                 BorderThickness = 6;
 

From 5d09eca1041e10119738707c608340a3d8ddf861 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:49:30 +0900
Subject: [PATCH 0089/2296] revert test change

---
 osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
index d6941848b7..b76e0d7521 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tournament.Tests.Screens
             {
                 Team1 = { Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA") },
                 Team2 = { Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN") },
-                Round = { Value = Ladder.Rounds.First(g => g.Name.Value == "Quarterfinals") }
+                Round = { Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals") }
             };
 
             Add(new TeamIntroScreen

From 99dd156d5322ab17a542b855796323fadd981e36 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:50:16 +0900
Subject: [PATCH 0090/2296] remove useless using

---
 osu.Game.Tournament/Models/TournamentTeam.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index b3b2f213ce..3cd527aaaa 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -5,7 +5,6 @@ using System;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 
 namespace osu.Game.Tournament.Models
 {

From 404a927caf55f05be24d1eadf0f3bda06227d92e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Sun, 30 Jul 2023 02:56:52 +0900
Subject: [PATCH 0091/2296] fix Possible NullReferenceException in test

---
 .../Components/TestSceneTournamentModDisplay.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
index cea4306ff8..0cb95c2e43 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tournament.Tests.Components
 
         private void success(APIBeatmap beatmap)
         {
-            var ruleset = rulesets.GetRuleset(Ladder.Ruleset.Value.OnlineID);
+            var ruleset = rulesets.GetRuleset(Ladder.Ruleset.Value?.OnlineID ?? -1);
 
             if (ruleset == null)
                 return;

From 6ebfafa9c3b1f24cc89ec72a577e70a799b052d1 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 29 Jul 2023 11:02:04 -0700
Subject: [PATCH 0092/2296] Remove unnecessary text comparison

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index cfdf6cc651..3357963fac 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -47,17 +47,7 @@ namespace osu.Game.Screens.Play.Break
                 }
             };
 
-            Current.ValueChanged += currentValueChanged;
-        }
-
-        private void currentValueChanged(ValueChangedEvent<T> e)
-        {
-            LocalisableString newText = Format(e.NewValue);
-
-            if (valueText.Text == newText)
-                return;
-
-            valueText.Text = newText;
+            Current.ValueChanged += text => valueText.Text = Format(text.NewValue);
         }
 
         protected virtual LocalisableString Format(T count)

From 4ddf05602f1f117f8ab0248c937a2487e76f59a3 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 29 Jul 2023 11:05:15 -0700
Subject: [PATCH 0093/2296] Update `BreakInfoLine` to formatting standards

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs | 34 ++++++++++++--------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index 3357963fac..147650ca07 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -21,21 +21,30 @@ namespace osu.Game.Screens.Play.Break
 
         public Bindable<T> Current = new Bindable<T>();
 
-        private readonly OsuSpriteText text;
-        private readonly OsuSpriteText valueText;
+        private readonly LocalisableString name;
+
+        private OsuSpriteText valueText = null!;
 
         public BreakInfoLine(LocalisableString name)
         {
+            this.name = name;
+
             AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
             Children = new Drawable[]
             {
-                text = new OsuSpriteText
+                new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.CentreRight,
                     Text = name,
                     Font = OsuFont.GetFont(size: 17),
-                    Margin = new MarginPadding { Right = margin }
+                    Margin = new MarginPadding { Right = margin },
+                    Colour = colours.Yellow,
                 },
                 valueText = new OsuSpriteText
                 {
@@ -43,11 +52,17 @@ namespace osu.Game.Screens.Play.Break
                     Origin = Anchor.CentreLeft,
                     Text = @"-",
                     Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 17),
-                    Margin = new MarginPadding { Left = margin }
+                    Margin = new MarginPadding { Left = margin },
+                    Colour = colours.YellowLight,
                 }
             };
+        }
 
-            Current.ValueChanged += text => valueText.Text = Format(text.NewValue);
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(text => valueText.Text = Format(text.NewValue), true);
         }
 
         protected virtual LocalisableString Format(T count)
@@ -57,13 +72,6 @@ namespace osu.Game.Screens.Play.Break
 
             return count.ToString() ?? string.Empty;
         }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            text.Colour = colours.Yellow;
-            valueText.Colour = colours.YellowLight;
-        }
     }
 
     public partial class PercentageBreakInfoLine : BreakInfoLine<double>

From 945d89e955cb350b55b383a5cd5f90dda72ad10c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 13:45:42 +0900
Subject: [PATCH 0094/2296] Move disables to loading screens for better
 coverage of edge cases

---
 osu.Game/Screens/Edit/Editor.cs       | 2 --
 osu.Game/Screens/Edit/EditorLoader.cs | 2 ++
 osu.Game/Screens/Play/Player.cs       | 2 --
 osu.Game/Screens/Play/PlayerLoader.cs | 2 ++
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d11297b3b2..b885eee46f 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -68,8 +68,6 @@ namespace osu.Game.Screens.Edit
 
         public override bool? ApplyModTrackAdjustments => false;
 
-        public override bool? AllowGlobalTrackControl => false;
-
         protected override bool PlayExitSound => !ExitConfirmed && !switchingDifficulty;
 
         protected bool HasUnsavedChanges
diff --git a/osu.Game/Screens/Edit/EditorLoader.cs b/osu.Game/Screens/Edit/EditorLoader.cs
index f665b7c511..8bcfa7b9f0 100644
--- a/osu.Game/Screens/Edit/EditorLoader.cs
+++ b/osu.Game/Screens/Edit/EditorLoader.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Screens.Edit
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        public override bool? AllowGlobalTrackControl => false;
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 956c4d4856..e2e8b71c10 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -71,8 +71,6 @@ namespace osu.Game.Screens.Play
         // We are managing our own adjustments (see OnEntering/OnExiting).
         public override bool? ApplyModTrackAdjustments => false;
 
-        public override bool? AllowGlobalTrackControl => false;
-
         private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
 
         private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 4b15bac0f3..872425e3fd 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -46,6 +46,8 @@ namespace osu.Game.Screens.Play
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        public override bool? AllowGlobalTrackControl => false;
+
         // Here because IsHovered will not update unless we do so.
         public override bool HandlePositionalInput => true;
 

From 713829163689bea7bd053a62d5edcbc30e12097e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 13:52:58 +0900
Subject: [PATCH 0095/2296] Adjust xmldoc to explicitly metnion it only affects
 end user control

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

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 665c61edf0..0986c0513c 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays
         public bool UserPauseRequested { get; private set; }
 
         /// <summary>
-        /// Whether control of the global track should be allowed.
+        /// Whether user control of the global track should be allowed.
         /// </summary>
         public readonly BindableBool AllowTrackControl = new BindableBool(true);
 

From feea412bec6d4d015a2a4fdcc9fd373ddee817ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 14:40:00 +0900
Subject: [PATCH 0096/2296] Add test with only one player

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

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index e09496b6e9..e81dc87d4f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -65,6 +65,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("clear playing users", () => playingUsers.Clear());
         }
 
+        [TestCase(1)]
+        [TestCase(4)]
+        public void TestGeneral(int count)
+        {
+            int[] userIds = getPlayerIds(count);
+
+            start(userIds);
+            loadSpectateScreen();
+
+            sendFrames(userIds, 1000);
+            AddWaitStep("wait a bit", 20);
+        }
+
         [Test]
         public void TestDelayedStart()
         {
@@ -88,18 +101,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("two players added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 2);
         }
 
-        [Test]
-        public void TestGeneral()
-        {
-            int[] userIds = getPlayerIds(4);
-
-            start(userIds);
-            loadSpectateScreen();
-
-            sendFrames(userIds, 1000);
-            AddWaitStep("wait a bit", 20);
-        }
-
         [Test]
         public void TestSpectatorPlayerInteractiveElementsHidden()
         {

From 45ceaba00d83027f679a3130bd0c269ebb24f790 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 14:40:58 +0900
Subject: [PATCH 0097/2296] Disable multiplayer spectator zoom when there's
 only one player's screen visible

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index c162b87727..6e71c010e5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -98,8 +98,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private void toggleMaximisationState(Cell target)
         {
-            // in the case the target is the already maximised cell, no cell should be maximised.
-            bool hasMaximised = !target.IsMaximised;
+            // in the case the target is the already maximised cell (or there is only one cell), no cell should be maximised.
+            bool hasMaximised = !target.IsMaximised && cellContainer.Count > 1;
 
             // Iterate through all cells to ensure only one is maximised at any time.
             foreach (var cell in cellContainer.ToList())

From 4f83c8661a67685f4897e99679d987f416104437 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 16:12:55 +0900
Subject: [PATCH 0098/2296] Remove unnecessary async fetch of beatmap in
 `NowPlayingOverlay`

No idea if this was historically required for some reason, but it's
definitely not required now.
---
 osu.Game/Overlays/NowPlayingOverlay.cs | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 15eefb2d9f..f6fad0ef6c 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using System;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -293,21 +292,10 @@ namespace osu.Game.Overlays
             // avoid using scheduler as our scheduler may not be run for a long time, holding references to beatmaps.
             pendingBeatmapSwitch = delegate
             {
-                // todo: this can likely be replaced with WorkingBeatmap.GetBeatmapAsync()
-                Task.Run(() =>
-                {
-                    if (beatmap?.Beatmap == null) // this is not needed if a placeholder exists
-                    {
-                        title.Text = @"Nothing to play";
-                        artist.Text = @"Nothing to play";
-                    }
-                    else
-                    {
-                        BeatmapMetadata metadata = beatmap.Metadata;
-                        title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
-                        artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
-                    }
-                });
+                BeatmapMetadata metadata = beatmap.Metadata;
+
+                title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
+                artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
 
                 LoadComponentAsync(new Background(beatmap) { Depth = float.MaxValue }, newBackground =>
                 {

From 07d224ecb6bfab5f72bb8f79210a8f43bd9a39e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 16:17:04 +0900
Subject: [PATCH 0099/2296] Apply NRT to `NowPlayingOverlay`

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 39 +++++++++++++-------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index f6fad0ef6c..37cb85983c 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.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 System;
 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.Containers;
 using osu.Framework.Graphics.Effects;
@@ -39,33 +38,33 @@ namespace osu.Game.Overlays
         private const float bottom_black_area_height = 55;
         private const float margin = 10;
 
-        private Drawable background;
-        private ProgressBar progressBar;
+        private Drawable background = null!;
+        private ProgressBar progressBar = null!;
 
-        private IconButton prevButton;
-        private IconButton playButton;
-        private IconButton nextButton;
-        private IconButton playlistButton;
+        private IconButton prevButton = null!;
+        private IconButton playButton = null!;
+        private IconButton nextButton = null!;
+        private IconButton playlistButton = null!;
 
-        private SpriteText title, artist;
+        private SpriteText title = null!, artist = null!;
 
-        private PlaylistOverlay playlist;
+        private PlaylistOverlay? playlist;
 
-        private Container dragContainer;
-        private Container playerContainer;
-        private Container playlistContainer;
+        private Container dragContainer = null!;
+        private Container playerContainer = null!;
+        private Container playlistContainer = null!;
 
         protected override string PopInSampleName => "UI/now-playing-pop-in";
         protected override string PopOutSampleName => "UI/now-playing-pop-out";
 
         [Resolved]
-        private MusicController musicController { get; set; }
+        private MusicController musicController { get; set; } = null!;
 
         [Resolved]
-        private Bindable<WorkingBeatmap> beatmap { get; set; }
+        private Bindable<WorkingBeatmap> beatmap { get; set; } = null!;
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         public NowPlayingOverlay()
         {
@@ -285,7 +284,7 @@ namespace osu.Game.Overlays
             }
         }
 
-        private Action pendingBeatmapSwitch;
+        private Action? pendingBeatmapSwitch;
 
         private void trackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction = TrackChangeDirection.None)
         {
@@ -338,7 +337,7 @@ namespace osu.Game.Overlays
         {
             base.Dispose(isDisposing);
 
-            if (musicController != null)
+            if (musicController.IsNotNull())
                 musicController.TrackChanged -= trackChanged;
         }
 
@@ -371,7 +370,7 @@ namespace osu.Game.Overlays
             private readonly Sprite sprite;
             private readonly WorkingBeatmap beatmap;
 
-            public Background(WorkingBeatmap beatmap = null)
+            public Background(WorkingBeatmap beatmap)
                 : base(cachedFrameBuffer: true)
             {
                 this.beatmap = beatmap;
@@ -401,7 +400,7 @@ namespace osu.Game.Overlays
             [BackgroundDependencyLoader]
             private void load(LargeTextureStore textures)
             {
-                sprite.Texture = beatmap?.GetBackground() ?? textures.Get(@"Backgrounds/bg4");
+                sprite.Texture = beatmap.GetBackground() ?? textures.Get(@"Backgrounds/bg4");
             }
         }
 

From de61b74e910d2342a6eeafac5a804796fe8418aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 16:21:35 +0900
Subject: [PATCH 0100/2296] Add proper cancellation and out-of-order blocking
 logic to `NowPlayingOverlay`'s background carousel

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 37cb85983c..89442e29bc 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -286,8 +287,14 @@ namespace osu.Game.Overlays
 
         private Action? pendingBeatmapSwitch;
 
+        private CancellationTokenSource? backgroundLoadCancellation;
+
+        private WorkingBeatmap? currentBeatmap;
+
         private void trackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction = TrackChangeDirection.None)
         {
+            currentBeatmap = beatmap;
+
             // avoid using scheduler as our scheduler may not be run for a long time, holding references to beatmaps.
             pendingBeatmapSwitch = delegate
             {
@@ -296,8 +303,16 @@ namespace osu.Game.Overlays
                 title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
                 artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
 
+                backgroundLoadCancellation?.Cancel();
+
                 LoadComponentAsync(new Background(beatmap) { Depth = float.MaxValue }, newBackground =>
                 {
+                    if (beatmap != currentBeatmap)
+                    {
+                        newBackground.Dispose();
+                        return;
+                    }
+
                     switch (direction)
                     {
                         case TrackChangeDirection.Next:
@@ -317,7 +332,7 @@ namespace osu.Game.Overlays
                     background = newBackground;
 
                     playerContainer.Add(newBackground);
-                });
+                }, (backgroundLoadCancellation = new CancellationTokenSource()).Token);
             };
         }
 

From 35ec55c1f6df3d9ded611c6cd8afb3f696c101ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 16:41:33 +0900
Subject: [PATCH 0101/2296] Don't queue export replay operations if button is
 disabled

---
 osu.Game/Screens/Ranking/ReplayDownloadButton.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index a5b33e584d..aa734d2077 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -117,11 +117,17 @@ namespace osu.Game.Screens.Ranking
                     return true;
 
                 case GlobalAction.ExportReplay:
-                    State.BindValueChanged(exportWhenReady, true);
-
-                    // start the import via button
-                    if (State.Value != DownloadState.LocallyAvailable)
+                    if (State.Value == DownloadState.LocallyAvailable)
+                    {
+                        State.BindValueChanged(exportWhenReady, true);
+                    }
+                    else
+                    {
+                        // A download needs to be performed before we can export this replay.
                         button.TriggerClick();
+                        if (button.Enabled.Value)
+                            State.BindValueChanged(exportWhenReady, true);
+                    }
 
                     return true;
             }

From 6d5b3617b3cf8af702573d0443c7f0da276834c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 30 Jul 2023 16:41:45 +0900
Subject: [PATCH 0102/2296] Remove pending export operation if active score is
 changed

---
 osu.Game/Screens/Ranking/ReplayDownloadButton.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index aa734d2077..b6166e97f6 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -83,6 +83,10 @@ namespace osu.Game.Screens.Ranking
 
             Score.BindValueChanged(score =>
             {
+                // An export may be pending from the last score.
+                // Reset this to meet user expectations (a new score which has just been switched to shouldn't export)
+                State.ValueChanged -= exportWhenReady;
+
                 downloadTracker?.RemoveAndDisposeImmediately();
 
                 if (score.NewValue != null)

From 1981e49a40723f16476fae208a28c693fca03c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Jul 2023 14:28:16 +0200
Subject: [PATCH 0103/2296] Fix nullability inspection

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

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 4132db42bc..6abde713b6 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Overlays
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
-        private Bindable<bool> allowTrackControl;
+        private Bindable<bool> allowTrackControl = null!;
 
         public NowPlayingOverlay()
         {

From d3435483eba7d8cd2dc113e1deeeb5ce2a13779b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Jul 2023 15:50:10 +0200
Subject: [PATCH 0104/2296] Fix multiplayer match screen being exited from when
 not current

This was supposed to be fixed by #24255, but has popped up as a
regression on Sentry since:

	https://sentry.ppy.sh/organizations/ppy/issues/22749/?project=2&referrer=regression_activity-email

On a fifteen-minute check I cannot figure out how to reproduce, so
rather than spending further brain cycles on this, just apply the same
explicit guard that like fifteen other places do.
---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index f5746ca96c..f13b47c0f5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -265,7 +265,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     dialogOverlay.Push(new ConfirmDialog("Are you sure you want to leave this multiplayer match?", () =>
                     {
                         exitConfirmed = true;
-                        this.Exit();
+                        if (this.IsCurrentScreen())
+                            this.Exit();
                     }));
                 }
 

From 7763f3dd404afa4a1dea1039804e36ca4c469213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Jul 2023 19:05:08 +0200
Subject: [PATCH 0105/2296] Fix osu! logo suddenly disappearing during rapid
 exit

---
 osu.Game/Screens/Menu/MainMenu.cs | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 510c9a5373..22040b4f0b 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Diagnostics;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -202,6 +203,9 @@ namespace osu.Game.Screens.Menu
                 dialogOverlay?.Push(new StorageErrorDialog(osuStorage, osuStorage.Error));
         }
 
+        [CanBeNull]
+        private Drawable proxiedLogo;
+
         protected override void LogoArriving(OsuLogo logo, bool resuming)
         {
             base.LogoArriving(logo, resuming);
@@ -211,7 +215,7 @@ namespace osu.Game.Screens.Menu
             logo.FadeColour(Color4.White, 100, Easing.OutQuint);
             logo.FadeIn(100, Easing.OutQuint);
 
-            logo.ProxyToContainer(logoTarget);
+            proxiedLogo = logo.ProxyToContainer(logoTarget);
 
             if (resuming)
             {
@@ -250,12 +254,27 @@ namespace osu.Game.Screens.Menu
             var seq = logo.FadeOut(300, Easing.InSine)
                           .ScaleTo(0.2f, 300, Easing.InSine);
 
-            logo.ReturnProxy();
+            if (proxiedLogo != null)
+            {
+                logo.ReturnProxy();
+                proxiedLogo = null;
+            }
 
             seq.OnComplete(_ => Buttons.SetOsuLogo(null));
             seq.OnAbort(_ => Buttons.SetOsuLogo(null));
         }
 
+        protected override void LogoExiting(OsuLogo logo)
+        {
+            base.LogoExiting(logo);
+
+            if (proxiedLogo != null)
+            {
+                logo.ReturnProxy();
+                proxiedLogo = null;
+            }
+        }
+
         public override void OnSuspending(ScreenTransitionEvent e)
         {
             base.OnSuspending(e);

From 262f25dce826574cbfd466fbecf52e151dabe642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Jul 2023 19:39:30 +0200
Subject: [PATCH 0106/2296] Make `SelectionRotationHandler` a `Component`

---
 .../Edit/OsuSelectionHandler.cs               |  5 +---
 .../Edit/OsuSelectionRotationHandler.cs       | 23 +++++++++-----
 .../Editing/TestSceneComposeSelectBox.cs      |  2 +-
 .../SkinEditor/SkinSelectionHandler.cs        |  3 +-
 .../SkinSelectionRotationHandler.cs           | 30 ++++++++++++-------
 .../Compose/Components/SelectionHandler.cs    |  8 +++--
 .../Components/SelectionRotationHandler.cs    |  3 +-
 7 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 1dfbf4179b..e81941d254 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -163,10 +163,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
         }
 
-        public override SelectionRotationHandler CreateRotationHandler() => new OsuSelectionRotationHandler(ChangeHandler)
-        {
-            SelectedItems = { BindTarget = SelectedItems }
-        };
+        public override SelectionRotationHandler CreateRotationHandler() => new OsuSelectionRotationHandler();
 
         private void scaleSlider(Slider slider, Vector2 scale)
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
index 0eb7637786..21fb8a67de 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionRotationHandler.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -16,17 +17,25 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class OsuSelectionRotationHandler : SelectionRotationHandler
+    public partial class OsuSelectionRotationHandler : SelectionRotationHandler
     {
-        private readonly IEditorChangeHandler? changeHandler;
+        [Resolved]
+        private IEditorChangeHandler? changeHandler { get; set; }
 
-        public BindableList<HitObject> SelectedItems { get; } = new BindableList<HitObject>();
+        private BindableList<HitObject> selectedItems { get; } = new BindableList<HitObject>();
 
-        public OsuSelectionRotationHandler(IEditorChangeHandler? changeHandler)
+        [BackgroundDependencyLoader]
+        private void load(EditorBeatmap editorBeatmap)
         {
-            this.changeHandler = changeHandler;
+            selectedItems.BindTo(editorBeatmap.SelectedHitObjects);
+        }
 
-            SelectedItems.CollectionChanged += (_, __) => updateState();
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedItems.CollectionChanged += (_, __) => updateState();
+            updateState();
         }
 
         private void updateState()
@@ -92,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             defaultOrigin = null;
         }
 
-        private IEnumerable<OsuHitObject> selectedMovableObjects => SelectedItems.Cast<OsuHitObject>()
+        private IEnumerable<OsuHitObject> selectedMovableObjects => selectedItems.Cast<OsuHitObject>()
                                                                                  .Where(h => h is not Spinner);
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 147488812e..9901118ce8 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Visual.Editing
             return true;
         }
 
-        private class TestSelectionRotationHandler : SelectionRotationHandler
+        private partial class TestSelectionRotationHandler : SelectionRotationHandler
         {
             private readonly Func<Container> getTargetContainer;
 
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index bee973bea0..72216f040e 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -26,9 +26,8 @@ namespace osu.Game.Overlays.SkinEditor
         [Resolved]
         private SkinEditor skinEditor { get; set; } = null!;
 
-        public override SelectionRotationHandler CreateRotationHandler() => new SkinSelectionRotationHandler(ChangeHandler)
+        public override SelectionRotationHandler CreateRotationHandler() => new SkinSelectionRotationHandler
         {
-            SelectedItems = { BindTarget = SelectedItems },
             UpdatePosition = updateDrawablePosition
         };
 
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
index e60e2b1e12..60f69000a2 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionRotationHandler.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit;
@@ -15,23 +16,32 @@ using osuTK;
 
 namespace osu.Game.Overlays.SkinEditor
 {
-    public class SkinSelectionRotationHandler : SelectionRotationHandler
+    public partial class SkinSelectionRotationHandler : SelectionRotationHandler
     {
-        private readonly IEditorChangeHandler? changeHandler;
-
-        public BindableList<ISerialisableDrawable> SelectedItems { get; } = new BindableList<ISerialisableDrawable>();
         public Action<Drawable, Vector2> UpdatePosition { get; init; } = null!;
 
-        public SkinSelectionRotationHandler(IEditorChangeHandler? changeHandler)
-        {
-            this.changeHandler = changeHandler;
+        [Resolved]
+        private IEditorChangeHandler? changeHandler { get; set; }
 
-            SelectedItems.CollectionChanged += (_, __) => updateState();
+        private BindableList<ISerialisableDrawable> selectedItems { get; } = new BindableList<ISerialisableDrawable>();
+
+        [BackgroundDependencyLoader]
+        private void load(SkinEditor skinEditor)
+        {
+            selectedItems.BindTo(skinEditor.SelectedComponents);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedItems.CollectionChanged += (_, __) => updateState();
+            updateState();
         }
 
         private void updateState()
         {
-            CanRotate.Value = SelectedItems.Count > 0;
+            CanRotate.Value = selectedItems.Count > 0;
         }
 
         private Drawable[]? objectsInRotation;
@@ -47,7 +57,7 @@ namespace osu.Game.Overlays.SkinEditor
 
             changeHandler?.BeginChange();
 
-            objectsInRotation = SelectedItems.Cast<Drawable>().ToArray();
+            objectsInRotation = selectedItems.Cast<Drawable>().ToArray();
             originalRotations = objectsInRotation.ToDictionary(d => d, d => d.Rotation);
             originalPositions = objectsInRotation.ToDictionary(d => d, d => d.ToScreenSpace(d.OriginPosition));
             defaultOrigin = GeometryUtils.GetSurroundingQuad(objectsInRotation.SelectMany(d => d.ScreenSpaceDrawQuad.GetVertices().ToArray())).Centre;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 31ad8fa3d7..57f9513cc1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -68,9 +68,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            RotationHandler = CreateRotationHandler();
-
-            InternalChild = SelectionBox = CreateSelectionBox();
+            AddRangeInternal(new Drawable[]
+            {
+                RotationHandler = CreateRotationHandler(),
+                SelectionBox = CreateSelectionBox(),
+            });
 
             SelectedItems.CollectionChanged += (_, _) =>
             {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
index 6524f7fa35..5faa4a108d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionRotationHandler.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components
@@ -9,7 +10,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// Base handler for editor rotation operations.
     /// </summary>
-    public class SelectionRotationHandler
+    public partial class SelectionRotationHandler : Component
     {
         /// <summary>
         /// Whether the rotation can currently be performed.

From ebe5dd2ac97683761d1712b896235c5d53a2611e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 30 Jul 2023 20:21:41 +0200
Subject: [PATCH 0107/2296] Interface with `SelectionRotationHandler` via DI
 rather than explicit passing

---
 .../Visual/Editing/TestSceneComposeSelectBox.cs     | 10 +++++++++-
 .../Screens/Edit/Compose/Components/SelectionBox.cs | 13 +++++++------
 .../Components/SelectionBoxRotationHandle.cs        | 13 +++++++------
 .../Edit/Compose/Components/SelectionHandler.cs     | 10 ++++++++--
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 9901118ce8..80c69aacf6 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -7,6 +7,7 @@ using System;
 using System.Linq;
 using JetBrains.Annotations;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
@@ -22,6 +23,14 @@ namespace osu.Game.Tests.Visual.Editing
         private Container selectionArea;
         private SelectionBox selectionBox;
 
+        [Cached(typeof(SelectionRotationHandler))]
+        private TestSelectionRotationHandler rotationHandler;
+
+        public TestSceneComposeSelectBox()
+        {
+            rotationHandler = new TestSelectionRotationHandler(() => selectionArea);
+        }
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -41,7 +50,6 @@ namespace osu.Game.Tests.Visual.Editing
                         CanFlipX = true,
                         CanFlipY = true,
 
-                        RotationHandler = new TestSelectionRotationHandler(() => selectionArea),
                         OnScale = handleScale
                     }
                 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index ed6bbf7668..876e8ccbe9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -23,7 +23,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private const float button_padding = 5;
 
-        public SelectionRotationHandler? RotationHandler { get; init; }
+        [Resolved]
+        private SelectionRotationHandler? rotationHandler { get; set; }
+
         public Func<Vector2, Anchor, bool>? OnScale;
         public Func<Direction, bool, bool>? OnFlip;
         public Func<bool>? OnReverse;
@@ -149,8 +151,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (RotationHandler != null)
-                canRotate.BindTo(RotationHandler.CanRotate);
+            if (rotationHandler != null)
+                canRotate.BindTo(rotationHandler.CanRotate);
 
             canRotate.BindValueChanged(_ => recreate(), true);
         }
@@ -252,8 +254,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void addRotationComponents()
         {
-            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise (Ctrl-<)", () => RotationHandler?.Rotate(-90));
-            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise (Ctrl->)", () => RotationHandler?.Rotate(90));
+            rotateCounterClockwiseButton = addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise (Ctrl-<)", () => rotationHandler?.Rotate(-90));
+            rotateClockwiseButton = addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise (Ctrl->)", () => rotationHandler?.Rotate(90));
 
             addRotateHandle(Anchor.TopLeft);
             addRotateHandle(Anchor.TopRight);
@@ -323,7 +325,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             var handle = new SelectionBoxRotationHandle
             {
                 Anchor = anchor,
-                RotationHandler = RotationHandler
             };
 
             handle.OperationStarted += operationStarted;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index 8665ec9b08..024749a701 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -19,8 +19,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public partial class SelectionBoxRotationHandle : SelectionBoxDragHandle, IHasTooltip
     {
-        public SelectionRotationHandler? RotationHandler { get; init; }
-
         public LocalisableString TooltipText { get; private set; }
 
         private SpriteIcon icon = null!;
@@ -32,6 +30,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved]
         private SelectionBox selectionBox { get; set; } = null!;
 
+        [Resolved]
+        private SelectionRotationHandler? rotationHandler { get; set; }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -61,9 +62,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnDragStart(DragStartEvent e)
         {
-            if (RotationHandler == null) return false;
+            if (rotationHandler == null) return false;
 
-            RotationHandler.Begin();
+            rotationHandler.Begin();
             return true;
         }
 
@@ -97,7 +98,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            RotationHandler?.Commit();
+            rotationHandler?.Commit();
             UpdateHoverState();
 
             cumulativeRotation.Value = null;
@@ -121,7 +122,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             cumulativeRotation.Value = newRotation;
 
-            RotationHandler?.Update(newRotation);
+            rotationHandler?.Update(newRotation);
             TooltipText = shouldSnap ? EditorStrings.RotationSnapped(newRotation) : EditorStrings.RotationUnsnapped(newRotation);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 57f9513cc1..158b4066bc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -65,12 +65,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
             AlwaysPresent = true;
         }
 
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.CacheAs(RotationHandler = CreateRotationHandler());
+            return dependencies;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
             AddRangeInternal(new Drawable[]
             {
-                RotationHandler = CreateRotationHandler(),
+                RotationHandler,
                 SelectionBox = CreateSelectionBox(),
             });
 
@@ -86,7 +93,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 OperationStarted = OnOperationBegan,
                 OperationEnded = OnOperationEnded,
 
-                RotationHandler = RotationHandler,
                 OnScale = HandleScale,
                 OnFlip = HandleFlip,
                 OnReverse = HandleReverse,

From 72005bef7c037977b084f8c5b8eb60a516610573 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 31 Jul 2023 15:10:58 +0900
Subject: [PATCH 0108/2296] Fix skin editor crashing if the same component is
 provided twice

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

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index 2b23ce290f..8179d58ddf 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -356,7 +356,7 @@ namespace osu.Game.Overlays.SkinEditor
                     {
                         new SettingsDropdown<SkinComponentsContainerLookup?>
                         {
-                            Items = availableTargets.Select(t => t.Lookup),
+                            Items = availableTargets.Select(t => t.Lookup).Distinct(),
                             Current = selectedTarget,
                         }
                     }

From d78cc6085194de5f321f8a22354f7d9ddc73696b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 07:12:40 +0900
Subject: [PATCH 0109/2296] Update framework

---
 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 7f15d9fafd..651e5b1fe6 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.724.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.801.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 909cfa57fb..1ac0f9de73 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="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.724.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.801.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 8b8680d02c..9926d52413 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.724.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.801.0" />
   </ItemGroup>
 </Project>

From 528298bc39a07f7f5f75f5cb3931b0f6a283b3b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 07:17:12 +0900
Subject: [PATCH 0110/2296] Update test in line with framework changes

---
 .../TestSceneUpdateableBeatmapSetCover.cs      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index a1a546d4a7..54532001a9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -99,16 +99,18 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             TestUpdateableOnlineBeatmapSetCover updateableCover = null;
 
-            AddStep("setup cover", () => Child = updateableCover = new TestUpdateableOnlineBeatmapSetCover
+            AddStep("setup cover", () => Child = updateableCover = new TestUpdateableOnlineBeatmapSetCover(400)
             {
                 OnlineInfo = CreateAPIBeatmapSet(),
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
             });
 
-            AddStep("change model", () => updateableCover.OnlineInfo = null);
-            AddWaitStep("wait some", 5);
-            AddAssert("no cover added", () => !updateableCover.ChildrenOfType<DelayedLoadUnloadWrapper>().Any());
+            AddStep("change model to null", () => updateableCover.OnlineInfo = null);
+
+            AddUntilStep("wait for load", () => updateableCover.DelayedLoadFinished);
+
+            AddAssert("no cover added", () => !updateableCover.ChildrenOfType<TestOnlineBeatmapSetCover>().Any());
         }
 
         [Test]
@@ -143,11 +145,19 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             private readonly int loadDelay;
 
+            public bool DelayedLoadFinished;
+
             public TestUpdateableOnlineBeatmapSetCover(int loadDelay = 10000)
             {
                 this.loadDelay = loadDelay;
             }
 
+            protected override void OnLoadFinished()
+            {
+                base.OnLoadFinished();
+                DelayedLoadFinished = true;
+            }
+
             protected override Drawable CreateDrawable(IBeatmapSetOnlineInfo model)
             {
                 if (model == null)

From 2e2b0c4e4109905f46e17f478ab1c0e936abfb23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 00:22:08 +0200
Subject: [PATCH 0111/2296] Move `SliderWithTextBoxInput` to more general
 namespace

---
 .../UserInterfaceV2}/SliderWithTextBoxInput.cs                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename osu.Game/{Screens/Edit/Timing => Graphics/UserInterfaceV2}/SliderWithTextBoxInput.cs (97%)

diff --git a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
similarity index 97%
rename from osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
rename to osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
index 1bf0e5299d..3f4e133d45 100644
--- a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
@@ -8,12 +8,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
-using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays.Settings;
 using osu.Game.Utils;
 using osuTK;
 
-namespace osu.Game.Screens.Edit.Timing
+namespace osu.Game.Graphics.UserInterfaceV2
 {
     public partial class SliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T>
         where T : struct, IEquatable<T>, IComparable<T>, IConvertible

From ca81f233563aca7d39822a6d551fc8824c1d3d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 00:44:05 +0200
Subject: [PATCH 0112/2296] Add test covering non-instantaneous behaviour

---
 .../TestSceneSliderWithTextBoxInput.cs        | 63 +++++++++++++++++++
 .../UserInterfaceV2/SliderWithTextBoxInput.cs |  2 -
 2 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
new file mode 100644
index 0000000000..dc70e2b9cb
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
@@ -0,0 +1,63 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public partial class TestSceneSliderWithTextBoxInput : OsuManualInputManagerTestScene
+    {
+        private SliderWithTextBoxInput<float> sliderWithTextBoxInput = null!;
+
+        private OsuSliderBar<float> slider => sliderWithTextBoxInput.ChildrenOfType<OsuSliderBar<float>>().Single();
+        private Nub nub => sliderWithTextBoxInput.ChildrenOfType<Nub>().Single();
+        private OsuTextBox textBox => sliderWithTextBoxInput.ChildrenOfType<OsuTextBox>().Single();
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create slider", () => Child = sliderWithTextBoxInput = new SliderWithTextBoxInput<float>("Test Slider")
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Width = 0.5f,
+                Current = new BindableFloat
+                {
+                    MinValue = -5,
+                    MaxValue = 5,
+                    Precision = 0.2f
+                }
+            });
+        }
+
+        [Test]
+        public void TestNonInstantaneousMode()
+        {
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("change text", () => textBox.Text = "3");
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.Zero);
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.Zero);
+
+            AddStep("commit text", () => InputManager.Key(Key.Enter));
+            AddAssert("slider moved", () => slider.Current.Value, () => Is.EqualTo(3));
+            AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(3));
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(nub));
+            AddStep("hold left mouse", () => InputManager.PressButton(MouseButton.Left));
+            AddStep("move mouse to minimum", () => InputManager.MoveMouseTo(sliderWithTextBoxInput.ScreenSpaceDrawQuad.BottomLeft));
+            AddAssert("textbox not changed", () => textBox.Current.Value, () => Is.EqualTo("3"));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(3));
+
+            AddStep("release left mouse", () => InputManager.ReleaseButton(MouseButton.Left));
+            AddAssert("textbox changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
+            AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
index 3f4e133d45..38de0ea94a 100644
--- a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
@@ -51,8 +51,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
             textBox.OnCommit += (t, isNew) =>
             {
-                if (!isNew) return;
-
                 try
                 {
                     switch (slider.Current)

From 0b019f1d4526dbad742fb8d36d3d7923b575c091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 00:45:57 +0200
Subject: [PATCH 0113/2296] Add test covering desired instantaneous behaviour

---
 .../TestSceneSliderWithTextBoxInput.cs        | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
index dc70e2b9cb..37f18cd3dd 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
@@ -59,5 +59,28 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("textbox changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
             AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
         }
+
+        [Test]
+        public void TestInstantaneousMode()
+        {
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("change text", () => textBox.Text = "3");
+            AddAssert("slider moved", () => slider.Current.Value, () => Is.EqualTo(3));
+            AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(3));
+
+            AddStep("commit text", () => InputManager.Key(Key.Enter));
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(3));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(3));
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(nub));
+            AddStep("hold left mouse", () => InputManager.PressButton(MouseButton.Left));
+            AddStep("move mouse to minimum", () => InputManager.MoveMouseTo(sliderWithTextBoxInput.ScreenSpaceDrawQuad.BottomLeft));
+            AddAssert("textbox changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
+            AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("release left mouse", () => InputManager.ReleaseButton(MouseButton.Left));
+            AddAssert("textbox not changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+        }
     }
 }

From 4fb0ff8800281dc7c4fd97c99359791e1edd6390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 00:51:29 +0200
Subject: [PATCH 0114/2296] Implement instantaneous `SliderWithTextBoxInput`
 mode

---
 .../TestSceneSliderWithTextBoxInput.cs        |   4 +
 .../UserInterfaceV2/SliderWithTextBoxInput.cs | 128 ++++++++++++------
 2 files changed, 88 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
index 37f18cd3dd..797afccc77 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestNonInstantaneousMode()
         {
+            AddStep("set instantaneous to false", () => sliderWithTextBoxInput.Instantaneous = false);
+
             AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
             AddStep("change text", () => textBox.Text = "3");
             AddAssert("slider not moved", () => slider.Current.Value, () => Is.Zero);
@@ -63,6 +65,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestInstantaneousMode()
         {
+            AddStep("set instantaneous to true", () => sliderWithTextBoxInput.Instantaneous = true);
+
             AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
             AddStep("change text", () => textBox.Text = "3");
             AddAssert("slider moved", () => slider.Current.Value, () => Is.EqualTo(3));
diff --git a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
index 38de0ea94a..fc0e4d2083 100644
--- a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
@@ -17,12 +17,42 @@ namespace osu.Game.Graphics.UserInterfaceV2
     public partial class SliderWithTextBoxInput<T> : CompositeDrawable, IHasCurrentValue<T>
         where T : struct, IEquatable<T>, IComparable<T>, IConvertible
     {
+        /// <summary>
+        /// A custom step value for each key press which actuates a change on this control.
+        /// </summary>
+        public float KeyboardStep
+        {
+            get => slider.KeyboardStep;
+            set => slider.KeyboardStep = value;
+        }
+
+        public Bindable<T> Current
+        {
+            get => slider.Current;
+            set => slider.Current = value;
+        }
+
+        private bool instantaneous;
+
+        /// <summary>
+        /// Whether changes to the slider should instantaneously transfer to the text box (and vice versa).
+        /// If <see langword="false"/>, the transfer will happen on text box commit (explicit, or implicit via focus loss), or on slider drag end.
+        /// </summary>
+        public bool Instantaneous
+        {
+            get => instantaneous;
+            set
+            {
+                instantaneous = value;
+                slider.TransferValueOnCommit = !instantaneous;
+            }
+        }
+
         private readonly SettingsSlider<T> slider;
+        private readonly LabelledTextBox textBox;
 
         public SliderWithTextBoxInput(LocalisableString labelText)
         {
-            LabelledTextBox textBox;
-
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
@@ -49,55 +79,65 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 },
             };
 
-            textBox.OnCommit += (t, isNew) =>
-            {
-                try
-                {
-                    switch (slider.Current)
-                    {
-                        case Bindable<int> bindableInt:
-                            bindableInt.Value = int.Parse(t.Text);
-                            break;
+            textBox.OnCommit += textCommitted;
+            textBox.Current.BindValueChanged(textChanged);
 
-                        case Bindable<double> bindableDouble:
-                            bindableDouble.Value = double.Parse(t.Text);
-                            break;
-
-                        default:
-                            slider.Current.Parse(t.Text);
-                            break;
-                    }
-                }
-                catch
-                {
-                    // TriggerChange below will restore the previous text value on failure.
-                }
-
-                // This is run regardless of parsing success as the parsed number may not actually trigger a change
-                // due to bindable clamping. Even in such a case we want to update the textbox to a sane visual state.
-                Current.TriggerChange();
-            };
-
-            Current.BindValueChanged(_ =>
-            {
-                decimal decimalValue = slider.Current.Value.ToDecimal(NumberFormatInfo.InvariantInfo);
-                textBox.Text = decimalValue.ToString($@"N{FormatUtils.FindPrecision(decimalValue)}");
-            }, true);
+            Current.BindValueChanged(updateTextBoxFromSlider, true);
         }
 
-        /// <summary>
-        /// A custom step value for each key press which actuates a change on this control.
-        /// </summary>
-        public float KeyboardStep
+        private bool updatingFromTextBox;
+
+        private void textChanged(ValueChangedEvent<string> change)
         {
-            get => slider.KeyboardStep;
-            set => slider.KeyboardStep = value;
+            if (!instantaneous) return;
+
+            tryUpdateSliderFromTextBox();
         }
 
-        public Bindable<T> Current
+        private void textCommitted(TextBox t, bool isNew)
         {
-            get => slider.Current;
-            set => slider.Current = value;
+            tryUpdateSliderFromTextBox();
+
+            // If the attempted update above failed, restore text box to match the slider.
+            Current.TriggerChange();
+        }
+
+        private void tryUpdateSliderFromTextBox()
+        {
+            updatingFromTextBox = true;
+
+            try
+            {
+                switch (slider.Current)
+                {
+                    case Bindable<int> bindableInt:
+                        bindableInt.Value = int.Parse(textBox.Current.Value);
+                        break;
+
+                    case Bindable<double> bindableDouble:
+                        bindableDouble.Value = double.Parse(textBox.Current.Value);
+                        break;
+
+                    default:
+                        slider.Current.Parse(textBox.Current.Value);
+                        break;
+                }
+            }
+            catch
+            {
+                // ignore parsing failures.
+                // sane state will eventually be restored by a commit (either explicit, or implicit via focus loss).
+            }
+
+            updatingFromTextBox = false;
+        }
+
+        private void updateTextBoxFromSlider(ValueChangedEvent<T> _)
+        {
+            if (updatingFromTextBox) return;
+
+            decimal decimalValue = slider.Current.Value.ToDecimal(NumberFormatInfo.InvariantInfo);
+            textBox.Text = decimalValue.ToString($@"N{FormatUtils.FindPrecision(decimalValue)}");
         }
     }
 }

From 049215f2dc1cbdd2ae17c10d28a0430b0dd28ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 00:54:40 +0200
Subject: [PATCH 0115/2296] Add test coverage for invalid input scenarios

---
 .../TestSceneSliderWithTextBoxInput.cs        | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
index 797afccc77..d23fcebae3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSliderWithTextBoxInput.cs
@@ -60,6 +60,26 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("release left mouse", () => InputManager.ReleaseButton(MouseButton.Left));
             AddAssert("textbox changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
             AddAssert("current changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("set text to invalid", () => textBox.Text = "garbage");
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("commit text", () => InputManager.Key(Key.Enter));
+            AddAssert("text restored", () => textBox.Text, () => Is.EqualTo("-5"));
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("set text to invalid", () => textBox.Text = "garbage");
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("lose focus", () => InputManager.ChangeFocus(null));
+            AddAssert("text restored", () => textBox.Text, () => Is.EqualTo("-5"));
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
         }
 
         [Test]
@@ -85,6 +105,26 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("release left mouse", () => InputManager.ReleaseButton(MouseButton.Left));
             AddAssert("textbox not changed", () => textBox.Current.Value, () => Is.EqualTo("-5"));
             AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("set text to invalid", () => textBox.Text = "garbage");
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("commit text", () => InputManager.Key(Key.Enter));
+            AddAssert("text restored", () => textBox.Text, () => Is.EqualTo("-5"));
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("focus textbox", () => InputManager.ChangeFocus(textBox));
+            AddStep("set text to invalid", () => textBox.Text = "garbage");
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
+
+            AddStep("lose focus", () => InputManager.ChangeFocus(null));
+            AddAssert("text restored", () => textBox.Text, () => Is.EqualTo("-5"));
+            AddAssert("slider not moved", () => slider.Current.Value, () => Is.EqualTo(-5));
+            AddAssert("current not changed", () => sliderWithTextBoxInput.Current.Value, () => Is.EqualTo(-5));
         }
     }
 }

From ed0c7e888085b798dda471b00a905058ca734e90 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 19:21:46 +0900
Subject: [PATCH 0116/2296] Add failing test coverage showing crash on multiple
 `StartGameplay` invocations

---
 .../Multiplayer/TestSceneMultiSpectatorScreen.cs   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index e81dc87d4f..864c987569 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -78,6 +78,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddWaitStep("wait a bit", 20);
         }
 
+        [Test]
+        public void TestMultipleStartRequests()
+        {
+            int[] userIds = getPlayerIds(2);
+
+            start(userIds);
+            loadSpectateScreen();
+
+            sendFrames(userIds, 1000);
+            AddWaitStep("wait a bit", 20);
+
+            start(userIds);
+        }
+
         [Test]
         public void TestDelayedStart()
         {

From 9fe9ea2c90545e9ce546ffd0cebb9224b20a6cac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 19:18:18 +0900
Subject: [PATCH 0117/2296] Fix potential crash on multiple `StartGameplay`
 calls in multiplayer spectator

---
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 7528ff4064..afc10d0c0a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -214,7 +214,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         protected override void StartGameplay(int userId, SpectatorGameplayState spectatorGameplayState)
-            => instances.Single(i => i.UserId == userId).LoadScore(spectatorGameplayState.Score);
+        {
+            var playerArea = instances.Single(i => i.UserId == userId);
+
+            // The multiplayer spectator flow requires the client to return to a higher level screen
+            // (ie. StartGameplay should only be called once per player).
+            //
+            // Meanwhile, the solo spectator flow supports multiple `StartGameplay` calls.
+            // To ensure we don't crash out in an edge case where this is called more than once in multiplayer,
+            // guard against re-entry for the same player.
+            if (playerArea.Score != null)
+                return;
+
+            playerArea.LoadScore(spectatorGameplayState.Score);
+        }
 
         protected override void QuitGameplay(int userId)
         {

From fe47dc291bff3559ff13473dd384c3afbd73a481 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 19:08:26 +0900
Subject: [PATCH 0118/2296] Fix `onLoadRequested` getting early-exited too
 early in spectator scenarios

In some scenarios, multiplayer spectator would not tick over to the next
beatmap.

Here's an example:

- Room has two items queued
- Local user starts download of both
- First beatmap starts and download is complete
- First beatmap ends (spectating is active)
- Second beatmap starts but download is not complete

In this scenario, the local client will get stuck at the spectator
screen due to the `onLoadRequested`-invoked screen change being early
exited.

It would require manual recovery (clicking back button) to return to a
sane state.
---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index f13b47c0f5..7c12e6eab5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -371,9 +371,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onLoadRequested()
         {
-            if (BeatmapAvailability.Value.State != DownloadState.LocallyAvailable)
-                return;
-
             // In the case of spectating, IMultiplayerClient.LoadRequested can be fired while the game is still spectating a previous session.
             // For now, we want to game to switch to the new game so need to request exiting from the play screen.
             if (!ParentScreen.IsCurrentScreen())
@@ -391,6 +388,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client.LocalUser?.State == MultiplayerUserState.Spectating && (SelectedItem.Value == null || Beatmap.IsDefault))
                 return;
 
+            if (BeatmapAvailability.Value.State != DownloadState.LocallyAvailable)
+                return;
+
             StartPlay();
         }
 

From df504e1fc2f8fcae2e36f5548b80d44acb640a2a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 19:00:01 +0900
Subject: [PATCH 0119/2296] Show extended statistics in multiplayer spectator
 automatically

---
 .../Spectate/MultiSpectatorResultsScreen.cs     |  7 +++++++
 osu.Game/Screens/Ranking/ResultsScreen.cs       | 17 +++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs
index fe3f02466d..2afc187e40 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorResultsScreen.cs
@@ -18,6 +18,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Scheduler.AddDelayed(() => StatisticsPanel.ToggleVisibility(), 1000);
+        }
+
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
         protected override APIRequest FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 43ddcffb62..78815d430f 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -55,7 +55,8 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private StatisticsPanel statisticsPanel;
+        protected StatisticsPanel StatisticsPanel;
+
         private Drawable bottomPanel;
         private Container<ScorePanel> detachedPanelContainer;
 
@@ -98,7 +99,7 @@ namespace osu.Game.Screens.Ranking
                                 RelativeSizeAxes = Axes.Both,
                                 Children = new Drawable[]
                                 {
-                                    statisticsPanel = CreateStatisticsPanel().With(panel =>
+                                    StatisticsPanel = CreateStatisticsPanel().With(panel =>
                                     {
                                         panel.RelativeSizeAxes = Axes.Both;
                                         panel.Score.BindTarget = SelectedScore;
@@ -107,7 +108,7 @@ namespace osu.Game.Screens.Ranking
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         SelectedScore = { BindTarget = SelectedScore },
-                                        PostExpandAction = () => statisticsPanel.ToggleVisibility()
+                                        PostExpandAction = () => StatisticsPanel.ToggleVisibility()
                                     },
                                     detachedPanelContainer = new Container<ScorePanel>
                                     {
@@ -194,7 +195,7 @@ namespace osu.Game.Screens.Ranking
             if (req != null)
                 api.Queue(req);
 
-            statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
+            StatisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
         }
 
         protected override void Update()
@@ -234,7 +235,7 @@ namespace osu.Game.Screens.Ranking
         protected virtual APIRequest FetchNextPage(int direction, Action<IEnumerable<ScoreInfo>> scoresCallback) => null;
 
         /// <summary>
-        /// Creates the <see cref="StatisticsPanel"/> to be used to display extended information about scores.
+        /// Creates the <see cref="Statistics.StatisticsPanel"/> to be used to display extended information about scores.
         /// </summary>
         protected virtual StatisticsPanel CreateStatisticsPanel() => new StatisticsPanel();
 
@@ -272,9 +273,9 @@ namespace osu.Game.Screens.Ranking
 
         public override bool OnBackButton()
         {
-            if (statisticsPanel.State.Value == Visibility.Visible)
+            if (StatisticsPanel.State.Value == Visibility.Visible)
             {
-                statisticsPanel.Hide();
+                StatisticsPanel.Hide();
                 return true;
             }
 
@@ -353,7 +354,7 @@ namespace osu.Game.Screens.Ranking
             switch (e.Action)
             {
                 case GlobalAction.Select:
-                    statisticsPanel.ToggleVisibility();
+                    StatisticsPanel.ToggleVisibility();
                     return true;
             }
 

From 70bd1d3cf484f018442db2f8d86e7edea962b504 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 20:18:21 +0900
Subject: [PATCH 0120/2296] Fix centred player not animating correctly

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index 4e624da17f..ffc2328dc0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 );
 
                 // If we don't track the animating state, the animation will also occur when resizing the window.
-                isAnimating &= !Precision.AlmostEquals(Position, targetPos, 0.01f);
+                isAnimating &= !Precision.AlmostEquals(Size, targetSize, 0.5f);
             }
 
             /// <summary>

From bcfc76b469e25108c341c876ab76fc71419ec1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 17:41:07 +0200
Subject: [PATCH 0121/2296] Add visual-only test coverage for centred player
 case

---
 .../Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index e81dc87d4f..f90385ed9d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -67,6 +67,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         [TestCase(1)]
         [TestCase(4)]
+        [TestCase(9)]
         public void TestGeneral(int count)
         {
             int[] userIds = getPlayerIds(count);

From f7d5ac9f926c9463094512a7b67290b3c4efbe86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 1 Aug 2023 18:09:48 +0200
Subject: [PATCH 0122/2296] Privatise setter

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

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 78815d430f..1d0499c909 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        protected StatisticsPanel StatisticsPanel;
+        protected StatisticsPanel StatisticsPanel { get; private set; }
 
         private Drawable bottomPanel;
         private Container<ScorePanel> detachedPanelContainer;

From 426bc52fd544a7512f27284a28ef6cc50225d286 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Tue, 1 Aug 2023 14:27:37 -0400
Subject: [PATCH 0123/2296] Updated schema_version number and added braces
 around some migration cases to help with re-using variable names

---
 osu.Game/Database/RealmAccess.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index f32b161bb6..c949ccbe43 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -82,8 +82,9 @@ namespace osu.Game.Database
         /// 30   2023-06-16    Run migration of old lazer scores again. This time with more correct rounding considerations.
         /// 31   2023-06-26    Add Version and LegacyTotalScore to ScoreInfo, set Version to 30000002 and copy TotalScore into LegacyTotalScore for legacy scores.
         /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
+        /// 32   2023-08-01    Added a new keybind that toggles the in-game leaderboard on and off
         /// </summary>
-        private const int schema_version = 32;
+        private const int schema_version = 33;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -771,6 +772,7 @@ namespace osu.Game.Database
                     break;
 
                 case 8:
+                {
                     // Ctrl -/+ now adjusts UI scale so let's clear any bindings which overlap these combinations.
                     // New defaults will be populated by the key store afterwards.
                     var keyBindings = migration.NewRealm.All<RealmKeyBinding>();
@@ -784,6 +786,7 @@ namespace osu.Game.Database
                         migration.NewRealm.Remove(decreaseSpeedBinding);
 
                     break;
+                }
 
                 case 9:
                     // Pretty pointless to do this as beatmaps aren't really loaded via realm yet, but oh well.
@@ -838,6 +841,7 @@ namespace osu.Game.Database
                     break;
 
                 case 11:
+                {
                     string keyBindingClassName = getMappedOrOriginalName(typeof(RealmKeyBinding));
 
                     if (!migration.OldRealm.Schema.TryFindObjectSchema(keyBindingClassName, out _))
@@ -864,6 +868,7 @@ namespace osu.Game.Database
                     }
 
                     break;
+                }
 
                 case 14:
                     foreach (var beatmap in migration.NewRealm.All<BeatmapInfo>())
@@ -1012,6 +1017,14 @@ namespace osu.Game.Database
 
                     break;
                 }
+
+                case 33:
+                {
+                    var oldKeyBinds = migration.NewRealm.All<RealmKeyBinding>();
+                    var newKeyBinds = migration.NewRealm.All<RealmKeyBinding>();
+
+                    break;
+                }
             }
 
             Logger.Log($"Migration completed in {stopwatch.ElapsedMilliseconds}ms");

From 5443f89dca0823fac233d54d1dd850b793b4145c Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Tue, 1 Aug 2023 16:58:52 -0400
Subject: [PATCH 0124/2296] Assuming its still set to tab, removes binding for
 toggle chat so itll be set to the new default

---
 osu.Game/Database/RealmAccess.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index c949ccbe43..d751cce834 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -1020,8 +1020,14 @@ namespace osu.Game.Database
 
                 case 33:
                 {
-                    var oldKeyBinds = migration.NewRealm.All<RealmKeyBinding>();
-                    var newKeyBinds = migration.NewRealm.All<RealmKeyBinding>();
+                    // Get all current keybinds, and find the toggle chat bind
+                    // (by default it used to overlap the new toggle leaderboard)
+                    var newKeyBindings = migration.NewRealm.All<RealmKeyBinding>().ToList();
+                    var toggleChatBind = newKeyBindings.FirstOrDefault(bind => bind.ActionInt == (int)GlobalAction.ToggleChatFocus);
+
+                    // If we have a bind for it, and that bind is tab, remove it
+                    if (toggleChatBind != default && toggleChatBind.KeyCombination.Keys.SequenceEqual(new[] { InputKey.Tab }))
+                        migration.NewRealm.Remove(toggleChatBind);
 
                     break;
                 }

From a618ed140e0bd631f3d0aeba8a625b37c991673d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 15:07:06 +0900
Subject: [PATCH 0125/2296] Move `StoryboardReplacesBackground` bindable more
 local to usage

---
 osu.Game/Graphics/Containers/UserDimContainer.cs        | 6 ------
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs | 9 +++++++--
 osu.Game/Screens/Play/Player.cs                         | 2 --
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 6f6292c3b2..4821e6b370 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -28,11 +28,6 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
 
-        /// <summary>
-        /// Whether or not the storyboard loaded should completely hide the background behind it.
-        /// </summary>
-        public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
-
         /// <summary>
         /// Whether player is in break time.
         /// Must be bound to <see cref="BreakTracker.IsBreakTime"/> to allow for dim adjustments in gameplay.
@@ -83,7 +78,6 @@ namespace osu.Game.Graphics.Containers
             LightenDuringBreaks.ValueChanged += _ => UpdateVisuals();
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
             ShowStoryboard.ValueChanged += _ => UpdateVisuals();
-            StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
             IgnoreUserSettings.ValueChanged += _ => UpdateVisuals();
         }
 
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 312fd496a1..8a3755f980 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Screens.Backgrounds
         /// </remarks>
         public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>(true);
 
+        /// <summary>
+        /// Whether or not the storyboard loaded should completely hide the background behind it.
+        /// </summary>
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
         /// <summary>
@@ -60,12 +63,11 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
+            dimmable.StoryboardReplacesBackground.BindTo(StoryboardReplacesBackground);
             dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);
             dimmable.DimWhenUserSettingsIgnored.BindTo(DimWhenUserSettingsIgnored);
-
-            StoryboardReplacesBackground.BindTo(dimmable.StoryboardReplacesBackground);
         }
 
         [BackgroundDependencyLoader]
@@ -144,6 +146,8 @@ namespace osu.Game.Screens.Backgrounds
             /// </remarks>
             public readonly Bindable<float> BlurAmount = new BindableFloat();
 
+            public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
+
             public Background Background
             {
                 get => background;
@@ -187,6 +191,7 @@ namespace osu.Game.Screens.Backgrounds
 
                 userBlurLevel.ValueChanged += _ => UpdateVisuals();
                 BlurAmount.ValueChanged += _ => UpdateVisuals();
+                StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
             }
 
             protected override bool ShowDimContent
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7d67e2657d..5f8e061d89 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1049,8 +1049,6 @@ namespace osu.Game.Screens.Play
 
             DimmableStoryboard.IsBreakTime.BindTo(breakTracker.IsBreakTime);
 
-            DimmableStoryboard.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
-
             storyboardReplacesBackground.Value = Beatmap.Value.Storyboard.ReplacesBackground && Beatmap.Value.Storyboard.HasDrawable;
 
             foreach (var mod in GameplayState.Mods.OfType<IApplicableToPlayer>())

From 0e510088f90e0c177be9f7147be61e39c149c97c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 15:50:15 +0900
Subject: [PATCH 0126/2296] Ensure background of gameplay is black when
 storyboard is overriding background display

---
 .../Background/TestSceneUserDimBackgrounds.cs | 26 +++++++++----------
 .../Graphics/Containers/UserDimContainer.cs   |  7 +++--
 .../Backgrounds/BackgroundScreenBeatmap.cs    | 13 +++++++---
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 5df5337a96..566ccd6bd5 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -125,13 +125,13 @@ namespace osu.Game.Tests.Visual.Background
             createFakeStoryboard();
             AddStep("Enable Storyboard", () =>
             {
-                player.ReplacesBackground.Value = true;
+                player.StoryboardReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
-            AddUntilStep("Background is invisible, storyboard is visible", () => songSelect.IsBackgroundInvisible() && player.IsStoryboardVisible);
+            AddUntilStep("Background is black, storyboard is visible", () => songSelect.IsBackgroundVisible() && songSelect.IsBackgroundBlack() && player.IsStoryboardVisible);
             AddStep("Disable Storyboard", () =>
             {
-                player.ReplacesBackground.Value = false;
+                player.StoryboardReplacesBackground.Value = false;
                 player.StoryboardEnabled.Value = false;
             });
             AddUntilStep("Background is visible, storyboard is invisible", () => songSelect.IsBackgroundVisible() && !player.IsStoryboardVisible);
@@ -173,7 +173,7 @@ namespace osu.Game.Tests.Visual.Background
             createFakeStoryboard();
             AddStep("Enable Storyboard", () =>
             {
-                player.ReplacesBackground.Value = true;
+                player.StoryboardReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
             AddStep("Enable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = false);
@@ -188,7 +188,7 @@ namespace osu.Game.Tests.Visual.Background
         {
             performFullSetup();
             createFakeStoryboard();
-            AddStep("Enable replacing background", () => player.ReplacesBackground.Value = true);
+            AddStep("Enable replacing background", () => player.StoryboardReplacesBackground.Value = true);
 
             AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
             AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible());
@@ -199,11 +199,11 @@ namespace osu.Game.Tests.Visual.Background
                 player.DimmableStoryboard.IgnoreUserSettings.Value = true;
             });
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
-            AddUntilStep("Background is invisible", () => songSelect.IsBackgroundInvisible());
+            AddUntilStep("Background is dimmed", () => songSelect.IsBackgroundVisible() && songSelect.IsBackgroundBlack());
 
-            AddStep("Disable background replacement", () => player.ReplacesBackground.Value = false);
+            AddStep("Disable background replacement", () => player.StoryboardReplacesBackground.Value = false);
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
-            AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible());
+            AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible() && !songSelect.IsBackgroundBlack());
         }
 
         /// <summary>
@@ -257,7 +257,7 @@ namespace osu.Game.Tests.Visual.Background
         private void createFakeStoryboard() => AddStep("Create storyboard", () =>
         {
             player.StoryboardEnabled.Value = false;
-            player.ReplacesBackground.Value = false;
+            player.StoryboardReplacesBackground.Value = false;
             player.DimmableStoryboard.Add(new OsuSpriteText
             {
                 Size = new Vector2(500, 50),
@@ -323,6 +323,8 @@ namespace osu.Game.Tests.Visual.Background
                 config.BindWith(OsuSetting.BlurLevel, BlurLevel);
             }
 
+            public bool IsBackgroundBlack() => background.CurrentColour == OsuColour.Gray(0);
+
             public bool IsBackgroundDimmed() => background.CurrentColour == OsuColour.Gray(1f - background.CurrentDim);
 
             public bool IsBackgroundUndimmed() => background.CurrentColour == Color4.White;
@@ -331,8 +333,6 @@ namespace osu.Game.Tests.Visual.Background
 
             public bool IsUserBlurDisabled() => background.CurrentBlur == new Vector2(0);
 
-            public bool IsBackgroundInvisible() => background.CurrentAlpha == 0;
-
             public bool IsBackgroundVisible() => background.CurrentAlpha == 1;
 
             public bool IsBackgroundBlur() => Precision.AlmostEquals(background.CurrentBlur, new Vector2(BACKGROUND_BLUR), 0.1f);
@@ -367,7 +367,7 @@ namespace osu.Game.Tests.Visual.Background
             {
                 base.OnEntering(e);
 
-                ApplyToBackground(b => ReplacesBackground.BindTo(b.StoryboardReplacesBackground));
+                ApplyToBackground(b => StoryboardReplacesBackground.BindTo(b.StoryboardReplacesBackground));
             }
 
             public new DimmableStoryboard DimmableStoryboard => base.DimmableStoryboard;
@@ -376,7 +376,7 @@ namespace osu.Game.Tests.Visual.Background
             public bool BlockLoad;
 
             public Bindable<bool> StoryboardEnabled;
-            public readonly Bindable<bool> ReplacesBackground = new Bindable<bool>();
+            public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
             public readonly Bindable<bool> IsPaused = new Bindable<bool>();
 
             public LoadBlockingTestPlayer(bool allowPause = true)
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 4821e6b370..625702ef6e 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -24,8 +24,11 @@ namespace osu.Game.Graphics.Containers
         public const double BACKGROUND_FADE_DURATION = 800;
 
         /// <summary>
-        /// Whether or not user-configured settings relating to brightness of elements should be ignored
+        /// Whether or not user-configured settings relating to brightness of elements should be ignored.
         /// </summary>
+        /// <remarks>
+        /// For best or worst, this also bypasses storyboard disable. Not sure this is correct but leaving it as to not break anything.
+        /// </remarks>
         public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
 
         /// <summary>
@@ -52,7 +55,7 @@ namespace osu.Game.Graphics.Containers
 
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 
-        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : DimWhenUserSettingsIgnored.Value, 0);
+        protected virtual float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : DimWhenUserSettingsIgnored.Value, 0);
 
         protected override Container<Drawable> Content => dimContent;
 
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 8a3755f980..1506b884b4 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -194,9 +194,16 @@ namespace osu.Game.Screens.Backgrounds
                 StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
             }
 
-            protected override bool ShowDimContent
-                // The background needs to be hidden in the case of it being replaced by the storyboard
-                => (!ShowStoryboard.Value && !IgnoreUserSettings.Value) || !StoryboardReplacesBackground.Value;
+            protected override float DimLevel
+            {
+                get
+                {
+                    if ((IgnoreUserSettings.Value || ShowStoryboard.Value) && StoryboardReplacesBackground.Value)
+                        return 1;
+
+                    return base.DimLevel;
+                }
+            }
 
             protected override void UpdateVisuals()
             {

From eef63b41dae7bc1d7916236b0bb2f0f6800cca4c Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 15:01:58 +0900
Subject: [PATCH 0127/2296] fetch missing beatmap when import score with
 missing beatmap

---
 .../Online/TestSceneReplayMissingBeatmap.cs   |  96 ++++++++
 osu.Game/OsuGame.cs                           |   2 +
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs |  15 +-
 osu.Game/Scoring/ScoreImporter.cs             |  21 ++
 osu.Game/Scoring/ScoreManager.cs              |   7 +
 .../Import/ReplayMissingBeatmapScreen.cs      | 210 ++++++++++++++++++
 6 files changed, 349 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
 create mode 100644 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
new file mode 100644
index 0000000000..a260cc8593
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.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.
+
+using System.Net;
+using NUnit.Framework;
+using osu.Game.Database;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Screens.Import;
+using osu.Game.Tests.Resources;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public partial class TestSceneReplayMissingBeatmap : OsuGameTestScene
+    {
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+
+        [Test]
+        public void TestSceneMissingBeatmapWithOnlineAvailable()
+        {
+            var beatmap = new APIBeatmap
+            {
+                OnlineBeatmapSetID = 173612
+            };
+
+            var beatmapset = new APIBeatmapSet
+            {
+                OnlineID = 173612,
+            };
+
+            setupBeatmapResponse(beatmap, beatmapset);
+
+            AddStep("import score", () =>
+            {
+                using (var resourceStream = TestResources.OpenResource("Replays/mania-replay.osr"))
+                {
+                    var importTask = new ImportTask(resourceStream, "replay.osr");
+
+                    Game.ScoreManager.Import(new[] { importTask });
+                }
+            });
+
+            AddUntilStep("Replay missing screen show", () => Game.ScreenStack.CurrentScreen.GetType() == typeof(ReplayMissingBeatmapScreen));
+        }
+
+        [Test]
+        public void TestSceneMissingBeatmapWithOnlineUnavailable()
+        {
+            setupFailedResponse();
+
+            AddStep("import score", () =>
+            {
+                using (var resourceStream = TestResources.OpenResource("Replays/mania-replay.osr"))
+                {
+                    var importTask = new ImportTask(resourceStream, "replay.osr");
+
+                    Game.ScoreManager.Import(new[] { importTask });
+                }
+            });
+
+            AddUntilStep("Replay missing screen not show", () => Game.ScreenStack.CurrentScreen.GetType() != typeof(ReplayMissingBeatmapScreen));
+        }
+
+        private void setupBeatmapResponse(APIBeatmap b, APIBeatmapSet s)
+            => AddStep("setup response", () =>
+            {
+                dummyAPI.HandleRequest = request =>
+                {
+                    if (request is GetBeatmapRequest getBeatmapRequest)
+                    {
+                        getBeatmapRequest.TriggerSuccess(b);
+                        return true;
+                    }
+
+                    if (request is GetBeatmapSetRequest getBeatmapSetRequest)
+                    {
+                        getBeatmapSetRequest.TriggerSuccess(s);
+                        return true;
+                    }
+
+                    return false;
+                };
+            });
+
+        private void setupFailedResponse()
+            => AddStep("setup failed response", () =>
+            {
+                dummyAPI.HandleRequest = request =>
+                {
+                    request.TriggerFailure(new WebException());
+                    return true;
+                };
+            });
+    }
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1a40bb8e3d..50b4e4f125 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -854,6 +854,8 @@ namespace osu.Game
 
             MultiplayerClient.PostNotification = n => Notifications.Post(n);
 
+            ScoreManager.Performer = this;
+
             // 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/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 8c00110909..a191220b37 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -7,6 +7,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using JetBrains.Annotations;
 using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
@@ -61,7 +62,7 @@ namespace osu.Game.Scoring.Legacy
                 workingBeatmap = GetBeatmap(beatmapHash);
 
                 if (workingBeatmap is DummyWorkingBeatmap)
-                    throw new BeatmapNotFoundException(beatmapHash);
+                    throw new BeatmapNotFoundException(beatmapHash, stream);
 
                 scoreInfo.User = new APIUser { Username = sr.ReadString() };
 
@@ -349,9 +350,19 @@ namespace osu.Game.Scoring.Legacy
         {
             public string Hash { get; }
 
-            public BeatmapNotFoundException(string hash)
+            [CanBeNull]
+            public MemoryStream ScoreStream { get; }
+
+            public BeatmapNotFoundException(string hash, [CanBeNull] Stream scoreStream)
             {
                 Hash = hash;
+
+                if (scoreStream != null)
+                {
+                    ScoreStream = new MemoryStream();
+                    scoreStream.Position = 0;
+                    scoreStream.CopyTo(ScoreStream);
+                }
             }
         }
     }
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 81b9f57bbc..408c83a5b8 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -9,6 +9,7 @@ using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.IO.Archives;
@@ -19,6 +20,8 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens;
+using osu.Game.Screens.Import;
 using Realms;
 
 namespace osu.Game.Scoring
@@ -27,6 +30,8 @@ namespace osu.Game.Scoring
     {
         public override IEnumerable<string> HandledExtensions => new[] { ".osr" };
 
+        public IPerformFromScreenRunner? Performer { get; set; }
+
         protected override string[] HashableFileTypes => new[] { ".osr" };
 
         private readonly RulesetStore rulesets;
@@ -54,12 +59,28 @@ namespace osu.Game.Scoring
                 }
                 catch (LegacyScoreDecoder.BeatmapNotFoundException e)
                 {
+                    onMissingBeatmap(e);
                     Logger.Log($@"Score '{name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
                     return null;
                 }
             }
         }
 
+        private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e)
+        {
+            var req = new GetBeatmapRequest(new BeatmapInfo
+            {
+                MD5Hash = e.Hash
+            });
+
+            req.Success += res =>
+            {
+                Performer?.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, e.ScoreStream)));
+            };
+
+            api.Queue(req);
+        }
+
         public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);
 
         protected override void Populate(ScoreInfo model, ArchiveReader? archive, Realm realm, CancellationToken cancellationToken = default)
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 31b5bd8365..9331168ab0 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Online.API;
 using osu.Game.Scoring.Legacy;
+using osu.Game.Screens;
 
 namespace osu.Game.Scoring
 {
@@ -30,6 +31,12 @@ namespace osu.Game.Scoring
         private readonly ScoreImporter scoreImporter;
         private readonly LegacyScoreExporter scoreExporter;
 
+        [CanBeNull]
+        public IPerformFromScreenRunner Performer
+        {
+            set => scoreImporter.Performer = value;
+        }
+
         public override bool PauseImports
         {
             get => base.PauseImports;
diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
new file mode 100644
index 0000000000..d7decc0e4e
--- /dev/null
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -0,0 +1,210 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables.Cards;
+using osu.Game.Configuration;
+using osu.Game.Database;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Settings;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
+using osuTK;
+using Realms;
+
+namespace osu.Game.Screens.Import
+{
+    [Cached(typeof(IPreviewTrackOwner))]
+    public partial class ReplayMissingBeatmapScreen : OsuScreen, IPreviewTrackOwner
+    {
+        [Resolved]
+        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        [Resolved]
+        private ScoreManager scoreManager { get; set; } = null!;
+
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
+
+        private IDisposable? realmSubscription;
+
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        [Resolved]
+        private INotificationOverlay? notificationOverlay { get; set; }
+
+        private Container beatmapPanelContainer = null!;
+        private ReplayDownloadButton replayDownloadButton = null!;
+        private SettingsCheckbox automaticDownload = null!;
+
+        private readonly MemoryStream? scoreStream;
+        private readonly APIBeatmap beatmap;
+
+        private APIBeatmapSet? beatmapSetInfo;
+
+        public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream? scoreStream = null)
+        {
+            this.beatmap = beatmap;
+            this.scoreStream = scoreStream;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, OsuConfigManager config)
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    Masking = true,
+                    CornerRadius = 20,
+                    AutoSizeAxes = Axes.Both,
+                    AutoSizeDuration = 500,
+                    AutoSizeEasing = Easing.OutQuint,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colours.Gray5,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new FillFlowContainer
+                        {
+                            Margin = new MarginPadding(20),
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Vertical,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Spacing = new Vector2(15),
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Text = "Beatmap info",
+                                    Font = OsuFont.Default.With(size: 30),
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                },
+                                new FillFlowContainer
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Spacing = new Vector2(15),
+                                    Children = new Drawable[]
+                                    {
+                                        beatmapPanelContainer = new Container
+                                        {
+                                            AutoSizeAxes = Axes.Both,
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.CentreLeft,
+                                        },
+                                    }
+                                },
+                                automaticDownload = new SettingsCheckbox
+                                {
+                                    LabelText = "Automatically download beatmaps",
+                                    Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                },
+                                replayDownloadButton = new ReplayDownloadButton(new ScoreInfo())
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                },
+                            }
+                        }
+                    }
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            var onlineBeatmapRequest = new GetBeatmapSetRequest(beatmap.OnlineBeatmapSetID);
+
+            onlineBeatmapRequest.Success += res =>
+            {
+                beatmapSetInfo = res;
+                beatmapPanelContainer.Child = new BeatmapCardNormal(res, allowExpansion: false);
+                checkForAutomaticDownload(res);
+            };
+
+            api.Queue(onlineBeatmapRequest);
+
+            realmSubscription = realm.RegisterForNotifications(
+                realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
+        }
+
+        private void checkForAutomaticDownload(APIBeatmapSet beatmap)
+        {
+            if (!automaticDownload.Current.Value)
+                return;
+
+            beatmapDownloader.Download(beatmap);
+        }
+
+        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
+        {
+            if (changes?.InsertedIndices == null) return;
+
+            if (beatmapSetInfo == null) return;
+
+            if (scoreStream == null) return;
+
+            if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))
+            {
+                var progressNotification = new ImportProgressNotification();
+                var importTask = new ImportTask(scoreStream, "score.osr");
+
+                scoreManager.Import(progressNotification, new[] { importTask })
+                            .ContinueWith(s =>
+                            {
+                                s.GetResultSafely<IEnumerable<Live<ScoreInfo>>>().FirstOrDefault()?.PerformRead(score =>
+                                {
+                                    Guid scoreid = score.ID;
+                                    Scheduler.Add(() =>
+                                    {
+                                        replayDownloadButton.Score.Value = realm.Realm.Find<ScoreInfo>(scoreid) ?? new ScoreInfo();
+                                    });
+                                });
+                            });
+
+                notificationOverlay?.Post(progressNotification);
+
+                realmSubscription?.Dispose();
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            realmSubscription?.Dispose();
+        }
+    }
+}

From c07a1ec91ec0e087c6c7a437d5d0b684cea1b4e8 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 16:09:37 +0900
Subject: [PATCH 0128/2296] retrun DefaultBeatmap when beatmapset already
 delete pending

reimplement https://github.com/ppy/osu/pull/22741
---
 osu.Game/Beatmaps/WorkingBeatmapCache.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index 78eed626f2..c06f4da4ae 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Beatmaps
 
         public virtual WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo)
         {
-            if (beatmapInfo?.BeatmapSet == null)
+            if (beatmapInfo?.BeatmapSet == null || beatmapInfo.BeatmapSet?.DeletePending == true)
                 return DefaultBeatmap;
 
             lock (workingCache)

From 4c43c9232970c1ac9c4ce2ba4ad4dc54f910e530 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 17:48:24 +0900
Subject: [PATCH 0129/2296] ensure dispose stream

---
 osu.Game/Scoring/ScoreImporter.cs                     | 2 ++
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 408c83a5b8..ea3bd8f5ae 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -78,6 +78,8 @@ namespace osu.Game.Scoring
                 Performer?.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, e.ScoreStream)));
             };
 
+            req.Failure += _ => e.ScoreStream?.Dispose();
+
             api.Queue(req);
         }
 
diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index d7decc0e4e..a6215165fb 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -174,16 +174,17 @@ namespace osu.Game.Screens.Import
 
             if (beatmapSetInfo == null) return;
 
-            if (scoreStream == null) return;
+            if (scoreStream == null || !scoreStream.CanRead) return;
 
             if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))
             {
                 var progressNotification = new ImportProgressNotification();
                 var importTask = new ImportTask(scoreStream, "score.osr");
-
                 scoreManager.Import(progressNotification, new[] { importTask })
                             .ContinueWith(s =>
                             {
+                                scoreStream.Dispose();
+
                                 s.GetResultSafely<IEnumerable<Live<ScoreInfo>>>().FirstOrDefault()?.PerformRead(score =>
                                 {
                                     Guid scoreid = score.ID;
@@ -205,6 +206,7 @@ namespace osu.Game.Screens.Import
             base.Dispose(isDisposing);
 
             realmSubscription?.Dispose();
+            scoreStream?.Dispose();
         }
     }
 }

From 1bdd054bd60a6af5c0816cbbacf6ca629c771b8a Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 18:15:58 +0900
Subject: [PATCH 0130/2296] extract method

---
 .../Import/ReplayMissingBeatmapScreen.cs      | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index a6215165fb..5707721bde 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -64,6 +64,8 @@ namespace osu.Game.Screens.Import
         public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream? scoreStream = null)
         {
             this.beatmap = beatmap;
+            beatmapSetInfo = beatmap.BeatmapSet;
+
             this.scoreStream = scoreStream;
         }
 
@@ -145,21 +147,32 @@ namespace osu.Game.Screens.Import
         {
             base.LoadComplete();
 
-            var onlineBeatmapRequest = new GetBeatmapSetRequest(beatmap.OnlineBeatmapSetID);
-
-            onlineBeatmapRequest.Success += res =>
+            if (beatmapSetInfo == null)
             {
-                beatmapSetInfo = res;
-                beatmapPanelContainer.Child = new BeatmapCardNormal(res, allowExpansion: false);
-                checkForAutomaticDownload(res);
-            };
+                var onlineBeatmapRequest = new GetBeatmapSetRequest(beatmap.OnlineBeatmapSetID);
 
-            api.Queue(onlineBeatmapRequest);
+                onlineBeatmapRequest.Success += res =>
+                {
+                    beatmapSetInfo = res;
+                    updateStatus();
+                };
+                api.Queue(onlineBeatmapRequest);
+            }
 
+            updateStatus();
             realmSubscription = realm.RegisterForNotifications(
                 realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
         }
 
+        private void updateStatus()
+        {
+            if (beatmapSetInfo == null) return;
+
+            beatmapPanelContainer.Clear();
+            beatmapPanelContainer.Child = new BeatmapCardNormal(beatmapSetInfo, allowExpansion: false);
+            checkForAutomaticDownload(beatmapSetInfo);
+        }
+
         private void checkForAutomaticDownload(APIBeatmapSet beatmap)
         {
             if (!automaticDownload.Current.Value)

From 14d87e49c75e423ac34c0e5276f32dda93880bdf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 16:49:58 +0900
Subject: [PATCH 0131/2296] Improve choice of where to start playback of
 multiplayer spectator

---
 .../Spectate/MultiSpectatorScreen.cs          | 32 ++++++++++++++-----
 .../Spectate/SpectatorSyncManager.cs          |  2 +-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index afc10d0c0a..bb1a139cf7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -2,12 +2,13 @@
 // 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.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -198,15 +199,29 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private void performInitialSeek()
         {
-            // Seek the master clock to the gameplay time.
-            // This is chosen as the first available frame in the players' replays, which matches the seek by each individual SpectatorPlayer.
-            double startTime = instances.Where(i => i.Score != null)
-                                        .SelectMany(i => i.Score.AsNonNull().Replay.Frames)
-                                        .Select(f => f.Time)
-                                        .DefaultIfEmpty(0)
-                                        .Min();
+            // We want to start showing gameplay as soon as possible.
+            // Each client may be in a different place in the beatmap, so we need to do our best to find a common
+            // starting point.
+            //
+            // Preferring a lower value ensures that we don't have some clients stuttering to keep up.
+            List<double> minFrameTimes = new List<double>();
+
+            foreach (var instance in instances)
+            {
+                if (instance.Score == null)
+                    continue;
+
+                minFrameTimes.Add(instance.Score.Replay.Frames.Min(f => f.Time));
+            }
+
+            // Remove any outliers (only need to worry about removing those lower than the mean since we will take a Min() after.
+            double mean = minFrameTimes.Average();
+            minFrameTimes.RemoveAll(t => mean - t > 1000);
+
+            double startTime = minFrameTimes.Min();
 
             masterClockContainer.Reset(startTime, true);
+            Logger.Log($"Multiplayer spectator seeking to initial time of {startTime}");
         }
 
         protected override void OnNewPlayingUserState(int userId, SpectatorState spectatorState)
@@ -245,6 +260,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return base.OnBackButton();
 
             // On a manual exit, set the player back to idle unless gameplay has finished.
+            // Of note, this doesn't cover exiting using alt-f4 or menu home option.
             if (multiplayerClient.Room.State != MultiplayerRoomState.Open)
                 multiplayerClient.ChangeState(MultiplayerUserState.Idle);
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs
index 615c0d7c2b..fd61b60fe4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorSyncManager.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
 
             masterState = newState;
-            Logger.Log($"{nameof(SpectatorSyncManager)}'s master clock become {masterState}");
+            Logger.Log($"{nameof(SpectatorSyncManager)}'s master clock became {masterState}");
 
             switch (masterState)
             {

From 75c1d5ad7feaf9fd81d9ddd83e5650961e98a952 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 18:02:11 +0900
Subject: [PATCH 0132/2296] Add lenience to `FramedBeatmapClock` workaround

---
 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 399e2fde7f..9577d1e38b 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
-            if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < decoupledClock.CurrentTime)
+            if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < decoupledClock.CurrentTime - 100)
             {
                 // 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 6637a5e7bc39db1083e73453025ce29b1f69ea7e Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 18:53:27 +0900
Subject: [PATCH 0133/2296] ensure Performer not null

---
 osu.Game/Scoring/ScoreImporter.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index ea3bd8f5ae..db4c0aff89 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -68,6 +68,12 @@ namespace osu.Game.Scoring
 
         private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e)
         {
+            if (Performer == null)
+            {
+                e.ScoreStream?.Dispose();
+                return;
+            }
+
             var req = new GetBeatmapRequest(new BeatmapInfo
             {
                 MD5Hash = e.Hash
@@ -75,7 +81,7 @@ namespace osu.Game.Scoring
 
             req.Success += res =>
             {
-                Performer?.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, e.ScoreStream)));
+                Performer.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, e.ScoreStream)));
             };
 
             req.Failure += _ => e.ScoreStream?.Dispose();

From 87fee001c786b29db34063ef3350e9a9f024d3ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 18:26:36 +0900
Subject: [PATCH 0134/2296] Fix multiplayer spectator potentially taking too
 long to start

When watching from the middle of gameplay, due to a series of failures,
`SpectatorClock` would not get seeked to the current time, causing all
clients to look like they were out of sync.

This is a hotfix for the issue. A better fix will require framework
changes or considerable restructuring.

I'd recommend testing this works in practice and agreeing that while it
is a hack, it's likely not going to cause issues and is something we
want to see fixed sooner rather than later.
---
 .../Multiplayer/Spectate/SpectatorPlayerClock.cs           | 2 ++
 osu.Game/Screens/Play/GameplayClockContainer.cs            | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs
index 45615d4e19..2ce78818a0 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.Logging;
 using osu.Framework.Timing;
 using osu.Game.Screens.Play;
 
@@ -59,6 +60,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         public bool Seek(double position)
         {
+            Logger.Log($"{nameof(SpectatorPlayerClock)} seeked to {position}");
             CurrentTime = position;
             return true;
         }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 22e6884526..226108209a 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -160,6 +160,13 @@ namespace osu.Game.Screens.Play
 
             Seek(StartTime);
 
+            // This is a workaround for the fact that DecoupleableInterpolatingFramedClock doesn't seek the source
+            // if the source is not IsRunning. (see https://github.com/ppy/osu-framework/blob/2102638056dfcf85d21b4d85266d53b5dd018767/osu.Framework/Timing/DecoupleableInterpolatingFramedClock.cs#L209-L210)
+            //
+            // This breaks in multiplayer spectator.
+            // I hope to remove this once we knock some sense into clocks in general.
+            (SourceClock as IAdjustableClock)?.Seek(StartTime);
+
             if (!wasPaused || startClock)
                 Start();
         }

From 0e7e36f114006c02c46b18b5cc79703e68293a4d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Aug 2023 21:53:14 +0900
Subject: [PATCH 0135/2296] don't passing stream by exception

---
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 15 ++-------------
 osu.Game/Scoring/ScoreImporter.cs             | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index a191220b37..8c00110909 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -7,7 +7,6 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using JetBrains.Annotations;
 using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
@@ -62,7 +61,7 @@ namespace osu.Game.Scoring.Legacy
                 workingBeatmap = GetBeatmap(beatmapHash);
 
                 if (workingBeatmap is DummyWorkingBeatmap)
-                    throw new BeatmapNotFoundException(beatmapHash, stream);
+                    throw new BeatmapNotFoundException(beatmapHash);
 
                 scoreInfo.User = new APIUser { Username = sr.ReadString() };
 
@@ -350,19 +349,9 @@ namespace osu.Game.Scoring.Legacy
         {
             public string Hash { get; }
 
-            [CanBeNull]
-            public MemoryStream ScoreStream { get; }
-
-            public BeatmapNotFoundException(string hash, [CanBeNull] Stream scoreStream)
+            public BeatmapNotFoundException(string hash)
             {
                 Hash = hash;
-
-                if (scoreStream != null)
-                {
-                    ScoreStream = new MemoryStream();
-                    scoreStream.Position = 0;
-                    scoreStream.CopyTo(ScoreStream);
-                }
             }
         }
     }
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index db4c0aff89..64394800cd 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using Newtonsoft.Json;
@@ -59,19 +60,24 @@ namespace osu.Game.Scoring
                 }
                 catch (LegacyScoreDecoder.BeatmapNotFoundException e)
                 {
-                    onMissingBeatmap(e);
+                    onMissingBeatmap(e, archive, name);
                     Logger.Log($@"Score '{name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
                     return null;
                 }
             }
         }
 
-        private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e)
+        private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e, ArchiveReader archive, string name)
         {
             if (Performer == null)
-            {
-                e.ScoreStream?.Dispose();
                 return;
+
+            var stream = new MemoryStream();
+
+            // stream will close after exception throw, so fetch the stream again.
+            using (var scoreStream = archive.GetStream(name))
+            {
+                scoreStream.CopyTo(stream);
             }
 
             var req = new GetBeatmapRequest(new BeatmapInfo
@@ -81,10 +87,10 @@ namespace osu.Game.Scoring
 
             req.Success += res =>
             {
-                Performer.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, e.ScoreStream)));
+                Performer.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, stream)));
             };
 
-            req.Failure += _ => e.ScoreStream?.Dispose();
+            req.Failure += _ => stream.Dispose();
 
             api.Queue(req);
         }

From aab462fd95534417aa5b3b65918d021a9907885c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 2 Aug 2023 09:40:22 -0700
Subject: [PATCH 0136/2296] Fix `valueText` being replaced even if current is
 not binding to anything

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs |  7 +------
 osu.Game/Screens/Play/BreakOverlay.cs        | 17 +++++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index 147650ca07..df71767f82 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -56,13 +56,8 @@ namespace osu.Game.Screens.Play.Break
                     Colour = colours.YellowLight,
                 }
             };
-        }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Current.BindValueChanged(text => valueText.Text = Format(text.NewValue), true);
+            Current.BindValueChanged(text => valueText.Text = Format(text.NewValue));
         }
 
         protected virtual LocalisableString Format(T count)
diff --git a/osu.Game/Screens/Play/BreakOverlay.cs b/osu.Game/Screens/Play/BreakOverlay.cs
index 4927800059..3ca82ec00b 100644
--- a/osu.Game/Screens/Play/BreakOverlay.cs
+++ b/osu.Game/Screens/Play/BreakOverlay.cs
@@ -46,13 +46,14 @@ namespace osu.Game.Screens.Play
         private readonly Container remainingTimeBox;
         private readonly RemainingTimeCounter remainingTimeCounter;
         private readonly BreakArrows breakArrows;
+        private readonly ScoreProcessor scoreProcessor;
+        private readonly BreakInfo info;
 
         public BreakOverlay(bool letterboxing, ScoreProcessor scoreProcessor)
         {
+            this.scoreProcessor = scoreProcessor;
             RelativeSizeAxes = Axes.Both;
 
-            BreakInfo info;
-
             Child = fadeContainer = new Container
             {
                 Alpha = 0,
@@ -102,18 +103,18 @@ namespace osu.Game.Screens.Play
                     }
                 }
             };
-
-            if (scoreProcessor != null)
-            {
-                info.AccuracyDisplay.Current.BindTo(scoreProcessor.Accuracy);
-                info.GradeDisplay.Current.BindTo(scoreProcessor.Rank);
-            }
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
             initializeBreaks();
+
+            if (scoreProcessor != null)
+            {
+                info.AccuracyDisplay.Current.BindTo(scoreProcessor.Accuracy);
+                info.GradeDisplay.Current.BindTo(scoreProcessor.Rank);
+            }
         }
 
         private void initializeBreaks()

From f38b21110f0e60a1667f3f2cb7c21fa5936b6122 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Aug 2023 08:57:43 +0900
Subject: [PATCH 0137/2296] Add missing parenthesis to comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index bb1a139cf7..66524f66ae 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -214,7 +214,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 minFrameTimes.Add(instance.Score.Replay.Frames.Min(f => f.Time));
             }
 
-            // Remove any outliers (only need to worry about removing those lower than the mean since we will take a Min() after.
+            // Remove any outliers (only need to worry about removing those lower than the mean since we will take a Min() after).
             double mean = minFrameTimes.Average();
             minFrameTimes.RemoveAll(t => mean - t > 1000);
 

From 71f6e5731d9e7b0990f1a56aa03343466be6d193 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Aug 2023 08:58:19 +0900
Subject: [PATCH 0138/2296] Fix potential null reference if no frames found
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 66524f66ae..c1b1127542 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 if (instance.Score == null)
                     continue;
 
-                minFrameTimes.Add(instance.Score.Replay.Frames.Min(f => f.Time));
+                minFrameTimes.Add(instance.Score.Replay.Frames.MinBy(f => f.Time)?.Time ?? 0);
             }
 
             // Remove any outliers (only need to worry about removing those lower than the mean since we will take a Min() after).

From d39ef48b71bb346932a10f69bdb315782666be15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Aug 2023 09:01:11 +0900
Subject: [PATCH 0139/2296] Return `null` intead of `FileNotFoundException` on
 missing file in `ZipArchiveReader`

---
 osu.Game/IO/Archives/ZipArchiveReader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/IO/Archives/ZipArchiveReader.cs b/osu.Game/IO/Archives/ZipArchiveReader.cs
index 1fca8aa055..5ef03b3641 100644
--- a/osu.Game/IO/Archives/ZipArchiveReader.cs
+++ b/osu.Game/IO/Archives/ZipArchiveReader.cs
@@ -31,7 +31,7 @@ namespace osu.Game.IO.Archives
         {
             ZipArchiveEntry entry = archive.Entries.SingleOrDefault(e => e.Key == name);
             if (entry == null)
-                throw new FileNotFoundException();
+                return null;
 
             var owner = MemoryAllocator.Default.Allocate<byte>((int)entry.Size);
 

From 52b1073d937fbd91112bc5b1dee0f660f8bc09ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 3 Aug 2023 21:08:00 +0200
Subject: [PATCH 0140/2296] Fix playfield skin layer not rotating correctly
 with barrel roll mod

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

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 536d3ac146..43c61588b1 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -242,7 +242,9 @@ namespace osu.Game.Screens.Play
                 Quad playfieldScreenSpaceDrawQuad = drawableRuleset.Playfield.SkinnableComponentScreenSpaceDrawQuad;
 
                 playfieldComponents.Position = ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
-                playfieldComponents.Size = ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft);
+                playfieldComponents.Width = (ToLocalSpace(playfieldScreenSpaceDrawQuad.TopRight) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft)).Length;
+                playfieldComponents.Height = (ToLocalSpace(playfieldScreenSpaceDrawQuad.BottomLeft) - ToLocalSpace(playfieldScreenSpaceDrawQuad.TopLeft)).Length;
+                playfieldComponents.Rotation = drawableRuleset.Playfield.Rotation;
             }
 
             float? lowestTopScreenSpaceLeft = null;

From d179fe3d96919ed33105d0f489c3bbbda23dd721 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 3 Aug 2023 23:09:39 -0700
Subject: [PATCH 0141/2296] Add support for changelog entries with url attached

---
 .../Online/TestSceneChangelogOverlay.cs       |  9 +++++++-
 osu.Game/Overlays/Changelog/ChangelogEntry.cs | 22 +++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 8d61c5df9f..040b903636 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -154,7 +154,14 @@ namespace osu.Game.Tests.Visual.Online
                         Type = ChangelogEntryType.Misc,
                         Category = "Code quality",
                         Title = "Clean up another thing"
-                    }
+                    },
+                    new APIChangelogEntry
+                    {
+                        Type = ChangelogEntryType.Add,
+                        Category = "osu!",
+                        Title = "Add entry with news url",
+                        Url = "https://osu.ppy.sh/home/news/2023-07-27-summer-splash"
+                    },
                 }
             });
 
diff --git a/osu.Game/Overlays/Changelog/ChangelogEntry.cs b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
index 06ec2043f9..9c40440778 100644
--- a/osu.Game/Overlays/Changelog/ChangelogEntry.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 using osuTK.Graphics;
@@ -29,6 +30,9 @@ namespace osu.Game.Overlays.Changelog
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        [Resolved]
+        private ILinkHandler? linkHandler { get; set; }
+
         private FontUsage fontLarge;
         private FontUsage fontMedium;
 
@@ -86,11 +90,21 @@ namespace osu.Game.Overlays.Changelog
                 }
             };
 
-            title.AddText(entry.Title, t =>
+            if (string.IsNullOrEmpty(entry.Url))
             {
-                t.Font = fontLarge;
-                t.Colour = entryColour;
-            });
+                title.AddText(entry.Title, t =>
+                {
+                    t.Font = fontLarge;
+                    t.Colour = entryColour;
+                });
+            }
+            else
+            {
+                title.AddLink(entry.Title, () => linkHandler?.HandleLink(entry.Url), entry.Url, t =>
+                {
+                    t.Font = fontLarge;
+                });
+            }
 
             if (!string.IsNullOrEmpty(entry.Repository) && !string.IsNullOrEmpty(entry.GithubUrl))
                 addRepositoryReference(title, entryColour);

From 79892865288507e43b12c7b376ec8b7bfddb3ed4 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 4 Aug 2023 19:57:25 +0900
Subject: [PATCH 0142/2296] scoreStream never been null

---
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index 5707721bde..6fabbd00c8 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -56,12 +56,12 @@ namespace osu.Game.Screens.Import
         private ReplayDownloadButton replayDownloadButton = null!;
         private SettingsCheckbox automaticDownload = null!;
 
-        private readonly MemoryStream? scoreStream;
+        private readonly MemoryStream scoreStream;
         private readonly APIBeatmap beatmap;
 
         private APIBeatmapSet? beatmapSetInfo;
 
-        public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream? scoreStream = null)
+        public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream scoreStream)
         {
             this.beatmap = beatmap;
             beatmapSetInfo = beatmap.BeatmapSet;
@@ -187,7 +187,7 @@ namespace osu.Game.Screens.Import
 
             if (beatmapSetInfo == null) return;
 
-            if (scoreStream == null || !scoreStream.CanRead) return;
+            if (!scoreStream.CanRead) return;
 
             if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))
             {

From 09047538c70629861a2121af5dbe9db04224886d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Fri, 4 Aug 2023 20:02:22 +0900
Subject: [PATCH 0143/2296] remove all memory stream dispose

---
 osu.Game/Scoring/ScoreImporter.cs                     | 2 --
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 64394800cd..5c354ac3d1 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -90,8 +90,6 @@ namespace osu.Game.Scoring
                 Performer.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, stream)));
             };
 
-            req.Failure += _ => stream.Dispose();
-
             api.Queue(req);
         }
 
diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index 6fabbd00c8..2e0e7a8e3f 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -196,8 +196,6 @@ namespace osu.Game.Screens.Import
                 scoreManager.Import(progressNotification, new[] { importTask })
                             .ContinueWith(s =>
                             {
-                                scoreStream.Dispose();
-
                                 s.GetResultSafely<IEnumerable<Live<ScoreInfo>>>().FirstOrDefault()?.PerformRead(score =>
                                 {
                                     Guid scoreid = score.ID;
@@ -219,7 +217,6 @@ namespace osu.Game.Screens.Import
             base.Dispose(isDisposing);
 
             realmSubscription?.Dispose();
-            scoreStream?.Dispose();
         }
     }
 }

From 49f5d6813ec82dec79ef02e8b380fde4cc7a44d8 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Fri, 4 Aug 2023 22:05:59 -0700
Subject: [PATCH 0144/2296] Block beatmap editor from testing/exiting/exporting
 when saving fails

---
 osu.Game/Screens/Edit/Editor.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b885eee46f..35d8bb4ab7 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -425,7 +425,8 @@ namespace osu.Game.Screens.Edit
             {
                 dialogOverlay.Push(new SaveBeforeGameplayTestDialog(() =>
                 {
-                    Save();
+                    if (!Save()) return;
+
                     pushEditorPlayer();
                 }));
             }
@@ -764,7 +765,7 @@ namespace osu.Game.Screens.Edit
 
         private void confirmExitWithSave()
         {
-            Save();
+            if (!Save()) return;
 
             ExitConfirmed = true;
             this.Exit();
@@ -1021,13 +1022,15 @@ namespace osu.Game.Screens.Edit
 
         private void exportBeatmap()
         {
-            Save();
+            if (!Save()) return;
+
             beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
         }
 
         private void exportLegacyBeatmap()
         {
-            Save();
+            if (!Save()) return;
+
             beatmapManager.ExportLegacy(Beatmap.Value.BeatmapSetInfo);
         }
 

From d91798271d80fe735e2f0c9ff72c6faf30fe0525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 8 Aug 2023 22:06:30 +0200
Subject: [PATCH 0145/2296] Add test case covering exit block

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 .../Editing/TestSceneEditorBeatmapCreation.cs | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 5aa2dd2ebf..37cb43a43a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -18,6 +18,7 @@ using osu.Game.Database;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
@@ -453,6 +454,51 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        [Test]
+        public void TestExitBlockedWhenSavingBeatmapWithSameNamedDifficulties()
+        {
+            Guid setId = Guid.Empty;
+            const string duplicate_difficulty_name = "duplicate";
+
+            AddStep("retrieve set ID", () => setId = EditorBeatmap.BeatmapInfo.BeatmapSet!.ID);
+            AddStep("set difficulty name", () => EditorBeatmap.BeatmapInfo.DifficultyName = duplicate_difficulty_name);
+            AddStep("save beatmap", () => Editor.Save());
+            AddAssert("new beatmap persisted", () =>
+            {
+                var set = beatmapManager.QueryBeatmapSet(s => s.ID == setId);
+                return set != null && set.PerformRead(s => s.Beatmaps.Count == 1 && s.Files.Count == 1);
+            });
+
+            AddStep("create new difficulty", () => Editor.CreateNewDifficulty(new CatchRuleset().RulesetInfo));
+
+            AddUntilStep("wait for created", () =>
+            {
+                string? difficultyName = Editor.ChildrenOfType<EditorBeatmap>().SingleOrDefault()?.BeatmapInfo.DifficultyName;
+                return difficultyName != null && difficultyName != duplicate_difficulty_name;
+            });
+            AddUntilStep("wait for editor load", () => Editor.IsLoaded && DialogOverlay.IsLoaded);
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(new[]
+            {
+                new Fruit
+                {
+                    StartTime = 0
+                },
+                new Fruit
+                {
+                    StartTime = 1000
+                }
+            }));
+
+            AddStep("set difficulty name", () => EditorBeatmap.BeatmapInfo.DifficultyName = duplicate_difficulty_name);
+            AddUntilStep("wait for has unsaved changes", () => Editor.HasUnsavedChanges);
+
+            AddStep("exit", () => Editor.Exit());
+            AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is PromptForSaveDialog);
+            AddStep("attempt to save", () => DialogOverlay.CurrentDialog.PerformOkAction());
+            AddAssert("editor is still current", () => Editor.IsCurrentScreen());
+        }
+
         [Test]
         public void TestCreateNewDifficultyForInconvertibleRuleset()
         {

From c88045dfc7251dde653bd666f3ebf1b7be4fb809 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Aug 2023 18:21:57 +0900
Subject: [PATCH 0146/2296] Fix weird usage of `Cast`

---
 osu.Game.Tournament/Models/TournamentTeam.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 3cd527aaaa..5df8c2a620 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tournament.Models
             {
                 int[] ranks = Players.Select(p => p.Rank)
                                      .Where(i => i.HasValue)
-                                     .Cast<int>()
+                                     .Select(i => i!.Value)
                                      .ToArray();
 
                 if (ranks.Length == 0)

From 5898a9986b2ee8dc12628f7e2ff880a367457d46 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 9 Aug 2023 19:11:36 +0900
Subject: [PATCH 0147/2296] Revert "use no null when true"

This reverts commit 6ad8339c6674300806378693d79cc9f12285e71a.
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index daf1417f6f..333dd0fd73 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using Microsoft.Win32;
@@ -181,7 +180,7 @@ namespace osu.Game.Tournament.IPC
         /// <returns>Whether an IPC directory was successfully auto-detected.</returns>
         public bool AutoDetectIPCLocation() => SetIPCLocation(findStablePath());
 
-        private static bool ipcFileExistsInDirectory([NotNullWhen(true)] string? p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
+        private static bool ipcFileExistsInDirectory(string? p) => p != null && File.Exists(Path.Combine(p, "ipc.txt"));
 
         private string? findStablePath()
         {
@@ -202,7 +201,7 @@ namespace osu.Game.Tournament.IPC
                 string? stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
 
                 if (ipcFileExistsInDirectory(stableInstallPath))
-                    return stableInstallPath;
+                    return stableInstallPath!;
             }
             catch
             {

From 5ad80879b771015b757823b9fd322ebe7b1c87f1 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 9 Aug 2023 19:11:51 +0900
Subject: [PATCH 0148/2296] let MatchIPCInfo .Beatmap be nullable

---
 osu.Game.Tournament/Components/SongBar.cs            | 2 +-
 osu.Game.Tournament/IPC/FileBasedIPC.cs              | 3 ++-
 osu.Game.Tournament/IPC/MatchIPCInfo.cs              | 2 +-
 osu.Game.Tournament/Screens/BeatmapInfoScreen.cs     | 2 +-
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 19d63286d8..fa0cbda16b 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tournament.Components
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
-        public TournamentBeatmap Beatmap
+        public TournamentBeatmap? Beatmap
         {
             set
             {
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 333dd0fd73..bf835122cc 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -87,12 +87,13 @@ namespace osu.Game.Tournament.IPC
 
                                     var existing = ladder.CurrentMatch.Value?.Round.Value?.Beatmaps.FirstOrDefault(b => b.ID == beatmapId);
 
-                                    if (existing?.Beatmap != null)
+                                    if (existing != null)
                                         Beatmap.Value = existing.Beatmap;
                                     else
                                     {
                                         beatmapLookupRequest = new GetBeatmapRequest(new APIBeatmap { OnlineID = beatmapId });
                                         beatmapLookupRequest.Success += b => Beatmap.Value = new TournamentBeatmap(b);
+                                        beatmapLookupRequest.Failure += _ => Beatmap.Value = null;
                                         API.Queue(beatmapLookupRequest);
                                     }
                                 }
diff --git a/osu.Game.Tournament/IPC/MatchIPCInfo.cs b/osu.Game.Tournament/IPC/MatchIPCInfo.cs
index ff557717d5..f57518971f 100644
--- a/osu.Game.Tournament/IPC/MatchIPCInfo.cs
+++ b/osu.Game.Tournament/IPC/MatchIPCInfo.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tournament.IPC
 {
     public partial class MatchIPCInfo : Component
     {
-        public Bindable<TournamentBeatmap> Beatmap { get; } = new Bindable<TournamentBeatmap>();
+        public Bindable<TournamentBeatmap?> Beatmap { get; } = new Bindable<TournamentBeatmap?>();
         public Bindable<LegacyMods> Mods { get; } = new Bindable<LegacyMods>();
         public Bindable<TourneyState> State { get; } = new Bindable<TourneyState>();
         public Bindable<string> ChatChannel { get; } = new Bindable<string>();
diff --git a/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs b/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
index e977012803..32a50d2222 100644
--- a/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
+++ b/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tournament.Screens
             SongBar.Mods = mods.NewValue;
         }
 
-        private void beatmapChanged(ValueChangedEvent<TournamentBeatmap> beatmap)
+        private void beatmapChanged(ValueChangedEvent<TournamentBeatmap?> beatmap)
         {
             SongBar.FadeInFromZero(300, Easing.OutQuint);
             SongBar.Beatmap = beatmap.NewValue;
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 9caa87d75e..07dc2bea54 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -121,13 +121,13 @@ namespace osu.Game.Tournament.Screens.MapPool
             splitMapPoolByMods.BindValueChanged(_ => updateDisplay());
         }
 
-        private void beatmapChanged(ValueChangedEvent<TournamentBeatmap> beatmap)
+        private void beatmapChanged(ValueChangedEvent<TournamentBeatmap?> beatmap)
         {
             if (CurrentMatch.Value == null || CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) < 2)
                 return;
 
             // if bans have already been placed, beatmap changes result in a selection being made autoamtically
-            if (beatmap.NewValue.OnlineID > 0)
+            if (beatmap.NewValue?.OnlineID > 0)
                 addForBeatmap(beatmap.NewValue.OnlineID);
         }
 

From 6549ca530480828076c7bd372cb8fec764189260 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Aug 2023 00:20:37 +0900
Subject: [PATCH 0149/2296] Revert some usages of `AsNonNull()` in tests

We generally prefer `!` when it is unambiguous usage (ie. direct access).
---
 .../NonVisual/LadderInfoSerialisationTest.cs      |  5 ++---
 .../Screens/TestSceneMapPoolScreen.cs             | 15 +++++++--------
 osu.Game.Tournament.Tests/TournamentTestScene.cs  |  7 +++----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs b/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
index d18651b8bb..acb4a87ffc 100644
--- a/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/LadderInfoSerialisationTest.cs
@@ -3,7 +3,6 @@
 
 using Newtonsoft.Json;
 using NUnit.Framework;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Tests.NonVisual
@@ -36,8 +35,8 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 PlayersPerTeam = { Value = 4 },
                 Teams =
                 {
-                    match.Team1.Value.AsNonNull(),
-                    match.Team2.Value.AsNonNull(),
+                    match.Team1.Value!,
+                    match.Team2.Value!,
                 },
                 Rounds =
                 {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 254d5c6996..7b2c1ba336 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
@@ -31,7 +30,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load few maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
                 for (int i = 0; i < 8; i++)
                     addBeatmap();
@@ -51,7 +50,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load just enough maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
                 for (int i = 0; i < 18; i++)
                     addBeatmap();
@@ -71,7 +70,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
                 for (int i = 0; i < 19; i++)
                     addBeatmap();
@@ -91,7 +90,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
                 for (int i = 0; i < 11; i++)
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
@@ -117,7 +116,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
                 for (int i = 0; i < 12; i++)
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
@@ -137,7 +136,7 @@ namespace osu.Game.Tournament.Tests.Screens
         {
             AddStep("load many maps", () =>
             {
-                Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Clear();
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
                 for (int i = 0; i < 12; i++)
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
@@ -154,7 +153,7 @@ namespace osu.Game.Tournament.Tests.Screens
 
         private void addBeatmap(string mods = "NM")
         {
-            Ladder.CurrentMatch.Value.AsNonNull().Round.Value.AsNonNull().Beatmaps.Add(new RoundBeatmap
+            Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Add(new RoundBeatmap
             {
                 Beatmap = CreateSampleBeatmap(),
                 Mods = mods
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 0cf1e22211..f24fc61d85 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -41,10 +40,10 @@ namespace osu.Game.Tournament.Tests
 
             match = CreateSampleMatch();
 
-            Ladder.Rounds.Add(match.Round.Value.AsNonNull());
+            Ladder.Rounds.Add(match.Round.Value!);
             Ladder.Matches.Add(match);
-            Ladder.Teams.Add(match.Team1.Value.AsNonNull());
-            Ladder.Teams.Add(match.Team2.Value.AsNonNull());
+            Ladder.Teams.Add(match.Team1.Value!);
+            Ladder.Teams.Add(match.Team2.Value!);
 
             Ruleset.BindTo(Ladder.Ruleset);
             Dependencies.CacheAs(new StableInfo(storage));

From 4e83245acfc61c0460fc4882935d5b7e64b04e09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 10 Aug 2023 00:24:57 +0900
Subject: [PATCH 0150/2296] Apply nullability to all remaining tests where it
 wasn't applied

---
 .../Components/TestSceneDateTextBox.cs                      | 2 --
 osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs    | 4 +---
 .../Components/TestSceneTournamentModDisplay.cs             | 2 --
 osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs         | 2 --
 osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs      | 6 ++----
 osu.Game.Tournament.Tests/NonVisual/TournamentHostTest.cs   | 4 +---
 .../Screens/TestSceneGameplayScreen.cs                      | 2 --
 .../Screens/TestSceneScheduleScreen.cs                      | 2 --
 8 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs b/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
index f547acd635..c1651b8ce3 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.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.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
index f793c33878..762cfa2519 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.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.Allocation;
 using osu.Framework.Graphics;
@@ -22,7 +20,7 @@ namespace osu.Game.Tournament.Tests.Components
         [Test]
         public void TestSongBar()
         {
-            SongBar songBar = null;
+            SongBar songBar = null!;
 
             AddStep("create bar", () => Child = songBar = new SongBar
             {
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
index 0cb95c2e43..99a448c494 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs b/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
index 256a984a7c..014c96b075 100644
--- a/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.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.IO;
 using System.Threading.Tasks;
diff --git a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
index ca6354cb48..6ee7808099 100644
--- a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.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.IO;
 using System.Linq;
 using NUnit.Framework;
@@ -36,11 +34,11 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 {
                     var osu = LoadTournament(host);
                     TournamentStorage storage = (TournamentStorage)osu.Dependencies.Get<Storage>();
-                    FileBasedIPC ipc = null;
+                    FileBasedIPC? ipc = null;
 
                     WaitForOrAssert(() => (ipc = osu.Dependencies.Get<MatchIPCInfo>() as FileBasedIPC)?.IsLoaded == true, @"ipc could not be populated in a reasonable amount of time");
 
-                    Assert.True(ipc.SetIPCLocation(testStableInstallDirectory));
+                    Assert.True(ipc!.SetIPCLocation(testStableInstallDirectory));
                     Assert.True(storage.AllTournaments.Exists("stable.json"));
                 }
                 finally
diff --git a/osu.Game.Tournament.Tests/NonVisual/TournamentHostTest.cs b/osu.Game.Tournament.Tests/NonVisual/TournamentHostTest.cs
index 8dc0946432..e4a35913cc 100644
--- a/osu.Game.Tournament.Tests/NonVisual/TournamentHostTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/TournamentHostTest.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 System.Threading.Tasks;
@@ -13,7 +11,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
 {
     public abstract class TournamentHostTest
     {
-        public static TournamentGameBase LoadTournament(GameHost host, TournamentGameBase tournament = null)
+        public static TournamentGameBase LoadTournament(GameHost host, TournamentGameBase? tournament = null)
         {
             tournament ??= new TournamentGameBase();
             Task.Factory.StartNew(() => host.Run(tournament), TaskCreationOptions.LongRunning)
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index abf0905647..31583bf8b7 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.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;
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index 5071fbbfe3..f3c3fdec97 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.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 NUnit.Framework;
 using osu.Framework.Allocation;

From 3501b7c22b9820292cc9b28ca0caadef6255c82e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 9 Aug 2023 21:32:46 +0200
Subject: [PATCH 0151/2296] Fix some more nullability inspections

---
 .../Components/TestSceneDateTextBox.cs                      | 2 +-
 .../Components/TestSceneTournamentModDisplay.cs             | 6 +++---
 osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs b/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
index c1651b8ce3..d018a7ed5c 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDateTextBox.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Tournament.Tests.Components
 {
     public partial class TestSceneDateTextBox : OsuManualInputManagerTestScene
     {
-        private DateTextBox textBox;
+        private DateTextBox textBox = null!;
 
         [SetUp]
         public void Setup() => Schedule(() =>
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
index 99a448c494..0b69da78a4 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Tournament.Tests.Components
     public partial class TestSceneTournamentModDisplay : TournamentTestScene
     {
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private IRulesetStore rulesets { get; set; }
+        private IRulesetStore rulesets { get; set; } = null!;
 
-        private FillFlowContainer<TournamentBeatmapPanel> fillFlow;
+        private FillFlowContainer<TournamentBeatmapPanel> fillFlow = null!;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs b/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
index 014c96b075..e8c9f65608 100644
--- a/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/DataLoadTest.cs
@@ -79,11 +79,11 @@ namespace osu.Game.Tournament.Tests.NonVisual
         public partial class TestTournament : TournamentGameBase
         {
             private readonly bool resetRuleset;
-            private readonly Action runOnLoadComplete;
+            private readonly Action? runOnLoadComplete;
 
             public new Task BracketLoadTask => base.BracketLoadTask;
 
-            public TestTournament(bool resetRuleset = false, [InstantHandle] Action runOnLoadComplete = null)
+            public TestTournament(bool resetRuleset = false, [InstantHandle] Action? runOnLoadComplete = null)
             {
                 this.resetRuleset = resetRuleset;
                 this.runOnLoadComplete = runOnLoadComplete;

From 71c42167e7e8fce7e4671f67e672786e5584fe21 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Thu, 10 Aug 2023 10:17:12 -0400
Subject: [PATCH 0152/2296] Updated wording on realm comments

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

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index d751cce834..6eb1e3bf9b 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -1021,11 +1021,11 @@ namespace osu.Game.Database
                 case 33:
                 {
                     // Get all current keybinds, and find the toggle chat bind
-                    // (by default it used to overlap the new toggle leaderboard)
+                    // (by default it would to overlap the new toggle leaderboard)
                     var newKeyBindings = migration.NewRealm.All<RealmKeyBinding>().ToList();
                     var toggleChatBind = newKeyBindings.FirstOrDefault(bind => bind.ActionInt == (int)GlobalAction.ToggleChatFocus);
 
-                    // If we have a bind for it, and that bind is tab, remove it
+                    // If we have a bind for it, and that bind is still tab, remove it
                     if (toggleChatBind != default && toggleChatBind.KeyCombination.Keys.SequenceEqual(new[] { InputKey.Tab }))
                         migration.NewRealm.Remove(toggleChatBind);
 

From 5d6ebb4df9f1fffd6bdadfe454dff9d1249dd589 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Thu, 10 Aug 2023 10:18:15 -0400
Subject: [PATCH 0153/2296] Removed comments organizing
 GlobalActionContainer.cs, since they were incorrectly grouping actions

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 79f098f90e..1090eeb462 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -205,7 +205,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleMute))]
         ToggleMute,
 
-        // In-Game Keybindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.SkipCutscene))]
         SkipCutscene,
 
@@ -233,7 +232,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.QuickExit))]
         QuickExit,
 
-        // Game-wide beatmap music controller keybindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.MusicNext))]
         MusicNext,
 
@@ -261,7 +259,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.PauseGameplay))]
         PauseGameplay,
 
-        // Editor
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorSetupMode))]
         EditorSetupMode,
 
@@ -286,7 +283,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameInterface))]
         ToggleInGameInterface,
 
-        // Song select keybindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleModSelection))]
         ToggleModSelection,
 
@@ -380,7 +376,6 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleReplaySettings))]
         ToggleReplaySettings,
 
-        // Editor (cont)
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameLeaderboard))]
         ToggleInGameLeaderboard,
     }

From 2b738edb93dbc34d1f850db710221656871c3e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 10 Aug 2023 22:55:02 +0200
Subject: [PATCH 0154/2296] Reword / fix comments

---
 osu.Game/Database/RealmAccess.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 6eb1e3bf9b..90e39da201 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Database
         /// 30   2023-06-16    Run migration of old lazer scores again. This time with more correct rounding considerations.
         /// 31   2023-06-26    Add Version and LegacyTotalScore to ScoreInfo, set Version to 30000002 and copy TotalScore into LegacyTotalScore for legacy scores.
         /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
-        /// 32   2023-08-01    Added a new keybind that toggles the in-game leaderboard on and off
+        /// 33   2023-08-01    Reset default chat toggle keybind to avoid conflict with leaderboard toggle keybind.
         /// </summary>
         private const int schema_version = 33;
 
@@ -1020,12 +1020,11 @@ namespace osu.Game.Database
 
                 case 33:
                 {
-                    // Get all current keybinds, and find the toggle chat bind
-                    // (by default it would to overlap the new toggle leaderboard)
+                    // Clear default bindings for the chat focus toggle,
+                    // as they would conflict with the newly-added leaderboard toggle.
                     var newKeyBindings = migration.NewRealm.All<RealmKeyBinding>().ToList();
                     var toggleChatBind = newKeyBindings.FirstOrDefault(bind => bind.ActionInt == (int)GlobalAction.ToggleChatFocus);
 
-                    // If we have a bind for it, and that bind is still tab, remove it
                     if (toggleChatBind != default && toggleChatBind.KeyCombination.Keys.SequenceEqual(new[] { InputKey.Tab }))
                         migration.NewRealm.Remove(toggleChatBind);
 

From 896cbb0ba074474858e222253a34b449a7869bea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Aug 2023 21:34:59 +0900
Subject: [PATCH 0155/2296] Update framework

---
 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 651e5b1fe6..1ac85532b8 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.801.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.811.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1ac0f9de73..dd6f9b3a96 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="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.801.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.811.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 9926d52413..0cf1fe9c28 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.801.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.811.0" />
   </ItemGroup>
 </Project>

From d2f5e696e77072138dc0bafd5e62b3567d165f07 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 11 Aug 2023 22:34:04 +0200
Subject: [PATCH 0156/2296] Fix DrawableHitObject state not synchronizing with
 hitobject edits

---
 .../Objects/Drawables/DrawableHitObject.cs        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index bf649a0a15..f141263e27 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -260,7 +260,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             StartTimeBindable.BindTo(HitObject.StartTimeBindable);
-            StartTimeBindable.BindValueChanged(onStartTimeChanged);
 
             if (HitObject is IHasComboInformation combo)
             {
@@ -311,9 +310,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             samplesBindable.UnbindFrom(HitObject.SamplesBindable);
 
-            // Changes in start time trigger state updates. When a new hitobject is applied, OnApply() automatically performs a state update anyway.
-            StartTimeBindable.ValueChanged -= onStartTimeChanged;
-
             // When a new hitobject is applied, the samples will be cleared before re-populating.
             // In order to stop this needless update, the event is unbound and re-bound as late as possible in Apply().
             samplesBindable.CollectionChanged -= onSamplesChanged;
@@ -333,6 +329,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Entry.NestedEntries.RemoveAll(nestedEntry => nestedEntry is SyntheticHitObjectEntry);
             ClearNestedHitObjects();
 
+            // Changes in state trigger defaults applied trigger state updates.
+            // When a new hitobject is applied, OnApply() automatically performs a state update anyway.
             HitObject.DefaultsApplied -= onDefaultsApplied;
 
             entry.RevertResult -= onRevertResult;
@@ -375,8 +373,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void onSamplesChanged(object sender, NotifyCollectionChangedEventArgs e) => LoadSamples();
 
-        private void onStartTimeChanged(ValueChangedEvent<double> startTime) => updateState(State.Value, true);
-
         private void onNewResult(DrawableHitObject drawableHitObject, JudgementResult result) => OnNewResult?.Invoke(drawableHitObject, result);
 
         private void onRevertResult()
@@ -394,6 +390,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Debug.Assert(Entry != null);
             Apply(Entry);
 
+            // Applied defaults indicate a change in hit object state.
+            if (Result is not null)
+            {
+                Result.TimeOffset = 0;
+                updateState(State.Value, true);
+            }
+
             DefaultsApplied?.Invoke(this);
         }
 

From 5d1ccc2601a739e2d8ed61b8d9b64a0efa580f7f Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 11 Aug 2023 23:39:28 +0200
Subject: [PATCH 0157/2296] Ensure invariant of monotone time

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 30 ++++++++++++++++++-
 osu.Game/Rulesets/UI/Playfield.cs          | 35 ++++++++++++++++++----
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 099be486b3..e919e4d088 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -51,6 +51,11 @@ namespace osu.Game.Rulesets.UI
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> is updated.
+        /// </summary>
+        public event Action<HitObject> HitObjectUpdated;
+
         public HitObjectContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -108,6 +113,7 @@ namespace osu.Game.Rulesets.UI
             drawable.OnNewResult += onNewResult;
 
             bindStartTime(drawable);
+            bindUpdated(drawable);
             AddInternal(drawable);
         }
 
@@ -116,7 +122,7 @@ namespace osu.Game.Rulesets.UI
             drawable.OnNewResult -= onNewResult;
 
             unbindStartTime(drawable);
-
+            unbindUpdated(drawable);
             RemoveInternal(drawable, false);
         }
 
@@ -176,6 +182,27 @@ namespace osu.Game.Rulesets.UI
             startTimeMap.Clear();
         }
 
+        private void bindUpdated(DrawableHitObject hitObject)
+        {
+            hitObject.DefaultsApplied += onDefaultsApplied;
+        }
+
+        private void unbindUpdated(DrawableHitObject hitObject)
+        {
+            hitObject.DefaultsApplied += onDefaultsApplied;
+        }
+
+        private void unbindAllUpdated()
+        {
+            foreach (var h in AliveObjects)
+                unbindUpdated(h);
+        }
+
+        private void onDefaultsApplied(DrawableHitObject obj)
+        {
+            HitObjectUpdated?.Invoke(obj.HitObject);
+        }
+
         protected override int Compare(Drawable x, Drawable y)
         {
             if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
@@ -192,6 +219,7 @@ namespace osu.Game.Rulesets.UI
         {
             base.Dispose(isDisposing);
             unbindAllStartTimes();
+            unbindAllUpdated();
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index e9c35555c8..9a4d082a06 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.UI
 
         private readonly HitObjectEntryManager entryManager = new HitObjectEntryManager();
 
-        private readonly Stack<HitObjectLifetimeEntry> judgedEntries;
+        private readonly LinkedList<HitObjectLifetimeEntry> judgedEntries;
 
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
@@ -125,12 +125,13 @@ namespace osu.Game.Rulesets.UI
                 h.NewResult += onNewResult;
                 h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
                 h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
+                h.HitObjectUpdated += onHitObjectUpdated;
             }));
 
             entryManager.OnEntryAdded += onEntryAdded;
             entryManager.OnEntryRemoved += onEntryRemoved;
 
-            judgedEntries = new Stack<HitObjectLifetimeEntry>();
+            judgedEntries = new LinkedList<HitObjectLifetimeEntry>();
         }
 
         [BackgroundDependencyLoader]
@@ -270,15 +271,16 @@ namespace osu.Game.Rulesets.UI
             }
 
             // When rewinding, revert future judgements in the reverse order.
-            while (judgedEntries.Count > 0)
+            while (judgedEntries.Last is not null)
             {
-                var result = judgedEntries.Peek().Result;
+                var result = judgedEntries.Last.Value.Result;
                 Debug.Assert(result?.RawTime != null);
 
                 if (Time.Current >= result.RawTime.Value)
                     break;
 
-                revertResult(judgedEntries.Pop());
+                revertResult(judgedEntries.Last.Value);
+                judgedEntries.RemoveLast();
             }
         }
 
@@ -471,10 +473,31 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
+        private void onHitObjectUpdated(HitObject _)
+        {
+            // The time of judged entries may have changed, so we need to re-sort the list to preserve the invariant of monotone time.
+            // Insertion sort on linked-list is O(n) for nearly-sorted lists, which is the case here.
+            var current = judgedEntries.First;
+
+            while (current?.Next is not null)
+            {
+                var next = current.Next;
+
+                if (current.Value.Result?.RawTime > next.Value.Result?.RawTime)
+                {
+                    judgedEntries.Remove(next);
+                    judgedEntries.AddBefore(current, next);
+                    current = next.Previous;
+                }
+                else
+                    current = next;
+            }
+        }
+
         private void onNewResult(DrawableHitObject drawable, JudgementResult result)
         {
             Debug.Assert(result != null && drawable.Entry?.Result == result && result.RawTime != null);
-            judgedEntries.Push(drawable.Entry.AsNonNull());
+            judgedEntries.AddLast(drawable.Entry.AsNonNull());
 
             NewResult?.Invoke(drawable, result);
         }

From 90f2acaf0a9d1bfa5ac8d4cc653798604a3fdf21 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 11 Aug 2023 23:50:00 +0200
Subject: [PATCH 0158/2296] Fix typo

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

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index e919e4d088..76cfc049e3 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.UI
 
         private void unbindUpdated(DrawableHitObject hitObject)
         {
-            hitObject.DefaultsApplied += onDefaultsApplied;
+            hitObject.DefaultsApplied -= onDefaultsApplied;
         }
 
         private void unbindAllUpdated()

From 37361cd6837b4714a3f161a1e05873ef3f39456f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Aug 2023 00:49:39 +0200
Subject: [PATCH 0159/2296] Repurpose `Flat{File -> }WorkingBeatmap`

---
 osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs |  2 +-
 ...orkingBeatmap.cs => FlatWorkingBeatmap.cs} | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)
 rename osu.Game/Beatmaps/{FlatFileWorkingBeatmap.cs => FlatWorkingBeatmap.cs} (76%)

diff --git a/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs b/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs
index 5d950eef55..d1ac42f22b 100644
--- a/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs
+++ b/osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs
@@ -75,7 +75,7 @@ namespace osu.Desktop.LegacyIpc
                 case LegacyIpcDifficultyCalculationRequest req:
                     try
                     {
-                        WorkingBeatmap beatmap = new FlatFileWorkingBeatmap(req.BeatmapFile);
+                        WorkingBeatmap beatmap = new FlatWorkingBeatmap(req.BeatmapFile);
                         var ruleset = beatmap.BeatmapInfo.Ruleset.CreateInstance();
                         Mod[] mods = ruleset.ConvertFromLegacyMods((LegacyMods)req.Mods).ToArray();
 
diff --git a/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs b/osu.Game/Beatmaps/FlatWorkingBeatmap.cs
similarity index 76%
rename from osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
rename to osu.Game/Beatmaps/FlatWorkingBeatmap.cs
index d20baf1edb..c2505ec109 100644
--- a/osu.Game/Beatmaps/FlatFileWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/FlatWorkingBeatmap.cs
@@ -12,25 +12,26 @@ using osu.Game.Skinning;
 namespace osu.Game.Beatmaps
 {
     /// <summary>
-    /// A <see cref="WorkingBeatmap"/> which can be constructed directly from a .osu file, providing an implementation for
+    /// A <see cref="WorkingBeatmap"/> which can be constructed directly from an .osu file (via <see cref="FlatWorkingBeatmap(string, int?)"/>)
+    /// or an <see cref="IBeatmap"/> instance (via <see cref="FlatWorkingBeatmap(IBeatmap)"/>,
+    /// providing an implementation for
     /// <see cref="WorkingBeatmap.GetPlayableBeatmap(osu.Game.Rulesets.IRulesetInfo,System.Collections.Generic.IReadOnlyList{osu.Game.Rulesets.Mods.Mod})"/>.
     /// </summary>
-    public class FlatFileWorkingBeatmap : WorkingBeatmap
+    public class FlatWorkingBeatmap : WorkingBeatmap
     {
-        private readonly Beatmap beatmap;
+        private readonly IBeatmap beatmap;
 
-        public FlatFileWorkingBeatmap(string file, int? beatmapId = null)
-            : this(readFromFile(file), beatmapId)
+        public FlatWorkingBeatmap(string file, int? beatmapId = null)
+            : this(readFromFile(file))
         {
+            if (beatmapId.HasValue)
+                beatmap.BeatmapInfo.OnlineID = beatmapId.Value;
         }
 
-        private FlatFileWorkingBeatmap(Beatmap beatmap, int? beatmapId = null)
+        public FlatWorkingBeatmap(IBeatmap beatmap)
             : base(beatmap.BeatmapInfo, null)
         {
             this.beatmap = beatmap;
-
-            if (beatmapId.HasValue)
-                beatmap.BeatmapInfo.OnlineID = beatmapId.Value;
         }
 
         private static Beatmap readFromFile(string filename)

From 253392409e70f5914988c8af85d3a7aabec25c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Aug 2023 00:50:31 +0200
Subject: [PATCH 0160/2296] Fix `LegacyBeatmapExporter` not converting beatmap
 between decode and re-encode

---
 osu.Game/Database/LegacyBeatmapExporter.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index e054652efa..a874353f73 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -29,9 +29,9 @@ namespace osu.Game.Database
 
         protected override Stream? GetFileContents(BeatmapSetInfo model, INamedFileUsage file)
         {
-            bool isBeatmap = model.Beatmaps.Any(o => o.Hash == file.File.Hash);
+            var beatmapInfo = model.Beatmaps.SingleOrDefault(o => o.Hash == file.File.Hash);
 
-            if (!isBeatmap)
+            if (beatmapInfo == null)
                 return base.GetFileContents(model, file);
 
             // Read the beatmap contents and skin
@@ -43,6 +43,9 @@ namespace osu.Game.Database
             using var contentStreamReader = new LineBufferedReader(contentStream);
             var beatmapContent = new LegacyBeatmapDecoder().Decode(contentStreamReader);
 
+            var workingBeatmap = new FlatWorkingBeatmap(beatmapContent);
+            var playableBeatmap = workingBeatmap.GetPlayableBeatmap(beatmapInfo.Ruleset);
+
             using var skinStream = base.GetFileContents(model, file);
 
             if (skinStream == null)
@@ -56,10 +59,10 @@ namespace osu.Game.Database
 
             // Convert beatmap elements to be compatible with legacy format
             // So we truncate time and position values to integers, and convert paths with multiple segments to bezier curves
-            foreach (var controlPoint in beatmapContent.ControlPointInfo.AllControlPoints)
+            foreach (var controlPoint in playableBeatmap.ControlPointInfo.AllControlPoints)
                 controlPoint.Time = Math.Floor(controlPoint.Time);
 
-            foreach (var hitObject in beatmapContent.HitObjects)
+            foreach (var hitObject in playableBeatmap.HitObjects)
             {
                 // Truncate end time before truncating start time because end time is dependent on start time
                 if (hitObject is IHasDuration hasDuration && hitObject is not IHasPath)
@@ -86,7 +89,7 @@ namespace osu.Game.Database
             // Encode to legacy format
             var stream = new MemoryStream();
             using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                new LegacyBeatmapEncoder(beatmapContent, beatmapSkin).Encode(sw);
+                new LegacyBeatmapEncoder(playableBeatmap, beatmapSkin).Encode(sw);
 
             stream.Seek(0, SeekOrigin.Begin);
 

From 562af8b46d1cbe3bf028e70cd044b3f93e71aaa4 Mon Sep 17 00:00:00 2001
From: QuantumSno <ben.czaja@protonmail.com>
Date: Sat, 12 Aug 2023 00:18:10 -0400
Subject: [PATCH 0161/2296] Updated test TestSceneGameplayChatDisplay.cs. Now
 uses new default bind for toggle chat (enter)

---
 .../Multiplayer/TestSceneGameplayChatDisplay.cs    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
index 979cb4424e..99b898efda 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
@@ -84,12 +84,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        public void TestFocusOnTabKeyWhenExpanded()
+        public void TestFocusOnEnterKeyWhenExpanded()
         {
             setLocalUserPlaying(true);
 
             assertChatFocused(false);
-            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
             assertChatFocused(true);
         }
 
@@ -99,19 +99,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
             setLocalUserPlaying(true);
 
             assertChatFocused(false);
-            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
             assertChatFocused(true);
             AddStep("press escape", () => InputManager.Key(Key.Escape));
             assertChatFocused(false);
         }
 
         [Test]
-        public void TestFocusOnTabKeyWhenNotExpanded()
+        public void TestFocusOnEnterKeyWhenNotExpanded()
         {
             AddStep("set not expanded", () => chatDisplay.Expanded.Value = false);
             AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
 
-            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
             assertChatFocused(true);
             AddUntilStep("is visible", () => chatDisplay.IsPresent);
 
@@ -126,11 +126,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("set not expanded", () => chatDisplay.Expanded.Value = false);
             AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
 
-            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
             assertChatFocused(true);
             AddUntilStep("is visible", () => chatDisplay.IsPresent);
 
-            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
             assertChatFocused(false);
             AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
         }

From 0eaa38312078352184e8bb3b581daa2c85534cbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 12 Aug 2023 17:54:05 +0900
Subject: [PATCH 0162/2296] Update framework

---
 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 1ac85532b8..46f3247a8c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.811.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.812.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index dd6f9b3a96..cba200489d 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="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.811.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.812.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0cf1fe9c28..0c049e65b3 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.811.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.812.0" />
   </ItemGroup>
 </Project>

From 8912a0e91e79e05264b56754493fe4be5e355b40 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sat, 12 Aug 2023 20:30:48 +0200
Subject: [PATCH 0163/2296] Fix sliders being reversed incorrectly in the
 editor.

---
 osu.Game/Rulesets/Objects/SliderPath.cs       |  2 +-
 .../Rulesets/Objects/SliderPathExtensions.cs  | 57 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 028f8b6839..f48ffbe5a4 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Objects
         {
             ensureValid();
 
-            return segmentEnds.Select(i => cumulativeLength[i] / calculatedLength);
+            return segmentEnds.Select(i => cumulativeLength[Math.Clamp(i, 0, cumulativeLength.Count - 1)] / calculatedLength);
         }
 
         private void invalidate()
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 92a3b570fb..a312f872b8 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -1,7 +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.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -26,10 +29,58 @@ namespace osu.Game.Rulesets.Objects
         /// <param name="positionalOffset">The positional offset of the resulting path. It should be added to the start position of this path.</param>
         public static void Reverse(this SliderPath sliderPath, out Vector2 positionalOffset)
         {
-            var points = sliderPath.ControlPoints.ToArray();
+            var controlPoints = sliderPath.ControlPoints;
+            double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
+            double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
+
+            // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
+            if (segmentEnds[^1] == segmentEnds[^2] && distinctSegmentEnds.Length > 1)
+            {
+                int numVisibleSegments = distinctSegmentEnds.Length - 2;
+                var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();
+
+                var lastVisibleControlPoint = nonInheritedControlPoints[numVisibleSegments];
+                int lastVisibleControlPointIndex = controlPoints.IndexOf(lastVisibleControlPoint);
+
+                if (controlPoints.Count > lastVisibleControlPointIndex + 1)
+                {
+                    // Make sure to include all inherited control points directly after the last visible non-inherited control point.
+                    do
+                    {
+                        lastVisibleControlPointIndex++;
+                    } while (lastVisibleControlPointIndex + 1 < controlPoints.Count && controlPoints[lastVisibleControlPointIndex].Type is null);
+                }
+
+                // Remove all control points after the first invisible non-inherited control point.
+                controlPoints.RemoveRange(lastVisibleControlPointIndex + 1, controlPoints.Count - lastVisibleControlPointIndex - 1);
+            }
+
+            // Recalculate perfect curve at the end of the slider path.
+            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 1)
+            {
+                double lastSegmentStart = distinctSegmentEnds[^2];
+                double lastSegmentEnd = distinctSegmentEnds[^1];
+
+                var oldCircleArcPath = new List<Vector2>();
+                sliderPath.GetPathToProgress(oldCircleArcPath, lastSegmentStart / lastSegmentEnd, 1);
+
+                var newCircleArcPoints = new[]
+                {
+                    oldCircleArcPath[0],
+                    oldCircleArcPath[oldCircleArcPath.Count / 2],
+                    oldCircleArcPath[^1]
+                };
+
+                var newCircleArcPath = PathApproximator.ApproximateCircularArc(newCircleArcPoints.AsSpan());
+                controlPoints[^2].Position = newCircleArcPath[newCircleArcPath.Count / 2];
+            }
+
+            // Reverse the control points.
+
+            var points = controlPoints.ToArray();
             positionalOffset = sliderPath.PositionAt(1);
 
-            sliderPath.ControlPoints.Clear();
+            controlPoints.Clear();
 
             PathType? lastType = null;
 
@@ -47,7 +98,7 @@ namespace osu.Game.Rulesets.Objects
                 else if (p.Type != null)
                     (p.Type, lastType) = (lastType, p.Type);
 
-                sliderPath.ControlPoints.Insert(0, p);
+                controlPoints.Insert(0, p);
             }
         }
     }

From 3178865cd32b83f8f9d78819303d7e6a4620b28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Aug 2023 21:55:20 +0200
Subject: [PATCH 0164/2296] Fix playfield skinnable layer bounds being
 incorrectly calculated with multiple stages

Closes #24514.

The original PR was _supposed_ to be handling this, and had code that
_looked_ like it would handle it, but was in fact subtly wrong, as the
union of `RectangleF.Empty` (initial value of `area`) and an arbitrary
other rectangle is _not_ the second rectangle, but rather a rectangle
that contains _both_ the second rectangle and the point (0,0),
thus leading to the bound calculation fail.
---
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index 7b00447238..314d199944 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -30,15 +30,15 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             get
             {
-                if (Stages.Count == 1)
-                    return Stages.First().ScreenSpaceDrawQuad;
+                RectangleF totalArea = RectangleF.Empty;
 
-                RectangleF area = RectangleF.Empty;
+                for (int i = 0; i < Stages.Count; ++i)
+                {
+                    var stageArea = Stages[i].ScreenSpaceDrawQuad.AABBFloat;
+                    totalArea = i == 0 ? stageArea : RectangleF.Union(totalArea, stageArea);
+                }
 
-                foreach (var stage in Stages)
-                    area = RectangleF.Union(area, stage.ScreenSpaceDrawQuad.AABBFloat);
-
-                return area;
+                return totalArea;
             }
         }
 

From 4152b4e5238e23ac50cee0c2d480b120fb224bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Aug 2023 22:46:18 +0200
Subject: [PATCH 0165/2296] Remove duplicated test case

---
 .../Multiplayer/TestSceneGameplayChatDisplay.cs   | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
index 99b898efda..d1a914300f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
@@ -120,21 +120,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
         }
 
-        [Test]
-        public void TestFocusToggleViaAction()
-        {
-            AddStep("set not expanded", () => chatDisplay.Expanded.Value = false);
-            AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
-
-            AddStep("press enter", () => InputManager.Key(Key.Enter));
-            assertChatFocused(true);
-            AddUntilStep("is visible", () => chatDisplay.IsPresent);
-
-            AddStep("press enter", () => InputManager.Key(Key.Enter));
-            assertChatFocused(false);
-            AddUntilStep("is not visible", () => !chatDisplay.IsPresent);
-        }
-
         private void assertChatFocused(bool isFocused) =>
             AddAssert($"chat {(isFocused ? "focused" : "not focused")}", () => textBox.HasFocus == isFocused);
 

From b9d0a8a9f69fadacf1d1578fccd9101798583d47 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 13 Aug 2023 15:15:37 +0200
Subject: [PATCH 0166/2296] Fix TestSceneFruitRandomness

---
 osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index de3d9d6530..8e7f77285c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddSliderStep("start time", 500, 600, 0, x =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = x;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
         }
 
@@ -44,6 +46,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("Initialize start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
 
                 fruitRotation = drawableFruit.DisplayRotation;
                 bananaRotation = drawableBanana.DisplayRotation;
@@ -54,6 +58,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("change start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = another_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("fruit rotation is changed", () => drawableFruit.DisplayRotation != fruitRotation);
@@ -64,6 +70,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("reset start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("rotation and size restored", () =>

From e7b34cd4da77e9b1de5efd950f5351a3d35b6794 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 14 Aug 2023 03:43:16 +0900
Subject: [PATCH 0167/2296] declare BeatmapSet is not null

---
 .../Online/TestSceneReplayMissingBeatmap.cs   | 21 +++++++------------
 .../Import/ReplayMissingBeatmapScreen.cs      | 21 ++-----------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
index a260cc8593..eb84d80051 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
@@ -21,15 +21,14 @@ namespace osu.Game.Tests.Visual.Online
         {
             var beatmap = new APIBeatmap
             {
-                OnlineBeatmapSetID = 173612
+                OnlineBeatmapSetID = 173612,
+                BeatmapSet = new APIBeatmapSet
+                {
+                    OnlineID = 173612
+                }
             };
 
-            var beatmapset = new APIBeatmapSet
-            {
-                OnlineID = 173612,
-            };
-
-            setupBeatmapResponse(beatmap, beatmapset);
+            setupBeatmapResponse(beatmap);
 
             AddStep("import score", () =>
             {
@@ -62,7 +61,7 @@ namespace osu.Game.Tests.Visual.Online
             AddUntilStep("Replay missing screen not show", () => Game.ScreenStack.CurrentScreen.GetType() != typeof(ReplayMissingBeatmapScreen));
         }
 
-        private void setupBeatmapResponse(APIBeatmap b, APIBeatmapSet s)
+        private void setupBeatmapResponse(APIBeatmap b)
             => AddStep("setup response", () =>
             {
                 dummyAPI.HandleRequest = request =>
@@ -73,12 +72,6 @@ namespace osu.Game.Tests.Visual.Online
                         return true;
                     }
 
-                    if (request is GetBeatmapSetRequest getBeatmapSetRequest)
-                    {
-                        getBeatmapSetRequest.TriggerSuccess(s);
-                        return true;
-                    }
-
                     return false;
                 };
             });
diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index 2e0e7a8e3f..ffd6942b9b 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -18,7 +18,6 @@ using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
@@ -57,14 +56,12 @@ namespace osu.Game.Screens.Import
         private SettingsCheckbox automaticDownload = null!;
 
         private readonly MemoryStream scoreStream;
-        private readonly APIBeatmap beatmap;
 
-        private APIBeatmapSet? beatmapSetInfo;
+        private readonly APIBeatmapSet beatmapSetInfo;
 
         public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream scoreStream)
         {
-            this.beatmap = beatmap;
-            beatmapSetInfo = beatmap.BeatmapSet;
+            beatmapSetInfo = beatmap.BeatmapSet!;
 
             this.scoreStream = scoreStream;
         }
@@ -147,18 +144,6 @@ namespace osu.Game.Screens.Import
         {
             base.LoadComplete();
 
-            if (beatmapSetInfo == null)
-            {
-                var onlineBeatmapRequest = new GetBeatmapSetRequest(beatmap.OnlineBeatmapSetID);
-
-                onlineBeatmapRequest.Success += res =>
-                {
-                    beatmapSetInfo = res;
-                    updateStatus();
-                };
-                api.Queue(onlineBeatmapRequest);
-            }
-
             updateStatus();
             realmSubscription = realm.RegisterForNotifications(
                 realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
@@ -185,8 +170,6 @@ namespace osu.Game.Screens.Import
         {
             if (changes?.InsertedIndices == null) return;
 
-            if (beatmapSetInfo == null) return;
-
             if (!scoreStream.CanRead) return;
 
             if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))

From 71a96e8be2e19397e7ab6b14e39a272517c9927e Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 13 Aug 2023 21:47:13 +0200
Subject: [PATCH 0168/2296] Remove SV from DrumRoll

---
 .../Beatmaps/TaikoBeatmapConverter.cs         |  1 -
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   | 19 +++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index dddd1e3c5a..5f3d0f898e 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -139,7 +139,6 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                             StartTime = obj.StartTime,
                             Samples = obj.Samples,
                             Duration = taikoDuration,
-                            SliderVelocity = obj is IHasSliderVelocity velocityData ? velocityData.SliderVelocity : 1
                         };
                     }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 083b8cc547..5f47d486e6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Rulesets.Objects.Types;
 using System.Threading;
-using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
@@ -14,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoStrongableHitObject, IHasPath, IHasSliderVelocity
+    public class DrumRoll : TaikoStrongableHitObject, IHasPath
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
@@ -34,19 +33,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public double Velocity { get; private set; }
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1)
-        {
-            Precision = 0.01,
-            MinValue = 0.1,
-            MaxValue = 10
-        };
-
-        public double SliderVelocity
-        {
-            get => SliderVelocityBindable.Value;
-            set => SliderVelocityBindable.Value = value;
-        }
-
         /// <summary>
         /// Numer of ticks per beat length.
         /// </summary>
@@ -63,8 +49,9 @@ namespace osu.Game.Rulesets.Taiko.Objects
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
+            EffectControlPoint effectPoint = controlPointInfo.EffectPointAt(StartTime);
 
-            double scoringDistance = base_distance * difficulty.SliderMultiplier * SliderVelocity;
+            double scoringDistance = base_distance * difficulty.SliderMultiplier * effectPoint.ScrollSpeed;
             Velocity = scoringDistance / timingPoint.BeatLength;
 
             TickRate = difficulty.SliderTickRate == 3 ? 3 : 4;

From d1a4a46fd3888663852b9f9f9e729f4c2633a159 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 14 Aug 2023 16:59:01 +0900
Subject: [PATCH 0169/2296] Temporarily allow new difficulty attributes to not
 exist

---
 osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index 5a01faa417..d6a3bd7f07 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -104,9 +104,11 @@ namespace osu.Game.Rulesets.Difficulty
         public virtual void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
             MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
-            LegacyAccuracyScore = (int)values[ATTRIB_ID_LEGACY_ACCURACY_SCORE];
-            LegacyComboScore = (int)values[ATTRIB_ID_LEGACY_COMBO_SCORE];
-            LegacyBonusScoreRatio = (int)values[ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO];
+
+            // Temporarily allow these attributes to not exist so as to not block releases of server-side components while these attributes aren't populated/used yet.
+            LegacyAccuracyScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_ACCURACY_SCORE);
+            LegacyComboScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_COMBO_SCORE);
+            LegacyBonusScoreRatio = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO);
         }
     }
 }

From f42b3603b34546609ed9cd829053b770510e9847 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 14:08:02 +0200
Subject: [PATCH 0170/2296] Fix linear sliders sometimes being reversed
 incorrectly Extract control point reversing to separate method

---
 .../Rulesets/Objects/SliderPathExtensions.cs  | 44 +++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index a312f872b8..2c8a6393af 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
@@ -30,31 +31,40 @@ namespace osu.Game.Rulesets.Objects
         public static void Reverse(this SliderPath sliderPath, out Vector2 positionalOffset)
         {
             var controlPoints = sliderPath.ControlPoints;
+            var originalControlPointTypes = controlPoints.Select(p => p.Type).ToArray();
+
+            controlPoints[0].Type ??= PathType.Linear;
+
+            // Inherited points after a linear point should be treated as linear points.
+            controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.Linear).ForEach(p => p.Type = PathType.Linear);
+
             double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
             double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
 
             // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
-            if (segmentEnds[^1] == segmentEnds[^2] && distinctSegmentEnds.Length > 1)
+            if (Math.Abs(segmentEnds[^1] - segmentEnds[^2]) < 1e-10 && distinctSegmentEnds.Length > 1)
             {
                 int numVisibleSegments = distinctSegmentEnds.Length - 2;
                 var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();
 
-                var lastVisibleControlPoint = nonInheritedControlPoints[numVisibleSegments];
-                int lastVisibleControlPointIndex = controlPoints.IndexOf(lastVisibleControlPoint);
+                int lastVisibleControlPointIndex = controlPoints.IndexOf(nonInheritedControlPoints[numVisibleSegments]);
 
-                if (controlPoints.Count > lastVisibleControlPointIndex + 1)
+                // Make sure to include all inherited control points directly after the last visible non-inherited control point.
+                while (lastVisibleControlPointIndex + 1 < controlPoints.Count)
                 {
-                    // Make sure to include all inherited control points directly after the last visible non-inherited control point.
-                    do
-                    {
-                        lastVisibleControlPointIndex++;
-                    } while (lastVisibleControlPointIndex + 1 < controlPoints.Count && controlPoints[lastVisibleControlPointIndex].Type is null);
+                    lastVisibleControlPointIndex++;
+
+                    if (controlPoints[lastVisibleControlPointIndex].Type is not null)
+                        break;
                 }
 
                 // Remove all control points after the first invisible non-inherited control point.
                 controlPoints.RemoveRange(lastVisibleControlPointIndex + 1, controlPoints.Count - lastVisibleControlPointIndex - 1);
             }
 
+            // Restore original control point types.
+            controlPoints.Zip(originalControlPointTypes).ForEach(x => x.First.Type = x.Second);
+
             // Recalculate perfect curve at the end of the slider path.
             if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 1)
             {
@@ -75,12 +85,20 @@ namespace osu.Game.Rulesets.Objects
                 controlPoints[^2].Position = newCircleArcPath[newCircleArcPath.Count / 2];
             }
 
-            // Reverse the control points.
+            sliderPath.reverseControlPoints(out positionalOffset);
+        }
 
-            var points = controlPoints.ToArray();
+        /// <summary>
+        /// Reverses the order of the provided <see cref="SliderPath"/>'s <see cref="PathControlPoint"/>s.
+        /// </summary>
+        /// <param name="sliderPath">The <see cref="SliderPath"/>.</param>
+        /// <param name="positionalOffset">The positional offset of the resulting path. It should be added to the start position of this path.</param>
+        private static void reverseControlPoints(this SliderPath sliderPath, out Vector2 positionalOffset)
+        {
+            var points = sliderPath.ControlPoints.ToArray();
             positionalOffset = sliderPath.PositionAt(1);
 
-            controlPoints.Clear();
+            sliderPath.ControlPoints.Clear();
 
             PathType? lastType = null;
 
@@ -98,7 +116,7 @@ namespace osu.Game.Rulesets.Objects
                 else if (p.Type != null)
                     (p.Type, lastType) = (lastType, p.Type);
 
-                controlPoints.Insert(0, p);
+                sliderPath.ControlPoints.Insert(0, p);
             }
         }
     }

From 55ac942e7abe42d60958007b8819ebf58f72df2d Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 14:09:08 +0200
Subject: [PATCH 0171/2296] Fix `IndexOutOfRangeException` when trying to
 reverse a zero-length slider

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

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 2c8a6393af..1bc9668258 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Objects
             double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
 
             // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
-            if (Math.Abs(segmentEnds[^1] - segmentEnds[^2]) < 1e-10 && distinctSegmentEnds.Length > 1)
+            if (segmentEnds.Length >= 2 && Math.Abs(segmentEnds[^1] - segmentEnds[^2]) < 1e-10 && distinctSegmentEnds.Length > 1)
             {
                 int numVisibleSegments = distinctSegmentEnds.Length - 2;
                 var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();

From bbd91e3ee47a66e7107b398db60b716eacae3c67 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 14:14:11 +0200
Subject: [PATCH 0172/2296] Add `TestSceneSliderReversal`

---
 .../Editor/TestSceneSliderReversal.cs         | 102 ++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
new file mode 100644
index 0000000000..ddef74deb1
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.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;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    public partial class TestSceneSliderReversal : TestSceneOsuEditor
+    {
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(Ruleset.Value, false);
+
+        private readonly PathControlPoint[][] paths =
+        {
+            createPathSegment(
+                PathType.PerfectCurve,
+                new Vector2(200, -50),
+                new Vector2(250, 0)
+            ),
+            createPathSegment(
+                PathType.Linear,
+                new Vector2(100, 0),
+                new Vector2(100, 100)
+            )
+        };
+
+        private static PathControlPoint[] createPathSegment(PathType type, params Vector2[] positions)
+        {
+            return new[]
+            {
+                new PathControlPoint
+                {
+                    Type = type
+                },
+            }.Concat(positions.Select(p => new PathControlPoint
+            {
+                Position = p
+            })).ToArray();
+        }
+
+        [TestCase(0, 250)]
+        [TestCase(0, 200)]
+        [TestCase(1, 80)]
+        [TestCase(1, 120)]
+        public void TestSliderReversal(int pathIndex, double length)
+        {
+            var controlPoints = paths[pathIndex];
+
+            Vector2 oldStartPos = default;
+            Vector2 oldEndPos = default;
+            double oldDistance = default;
+
+            AddStep("Add slider", () =>
+            {
+                var slider = new Slider
+                {
+                    Position = new Vector2(OsuPlayfield.BASE_SIZE.X / 2, OsuPlayfield.BASE_SIZE.Y / 2),
+                    Path = new SliderPath(controlPoints)
+                    {
+                        ExpectedDistance = { Value = length }
+                    }
+                };
+
+                EditorBeatmap.Add(slider);
+
+                oldStartPos = slider.Position;
+                oldEndPos = slider.EndPosition;
+                oldDistance = slider.Path.Distance;
+            });
+
+            AddStep("Select slider", () =>
+            {
+                var slider = (Slider)EditorBeatmap.HitObjects[0];
+                EditorBeatmap.SelectedHitObjects.Add(slider);
+            });
+
+            AddStep("Reverse slider", () =>
+            {
+                InputManager.PressKey(Key.LControl);
+                InputManager.Key(Key.G);
+                InputManager.ReleaseKey(Key.LControl);
+            });
+
+            AddAssert("Slider was reversed correctly", () =>
+            {
+                var slider = (Slider)EditorBeatmap.SelectedHitObjects[0];
+                return Vector2.Distance(slider.Position, oldEndPos) < 1
+                       && Vector2.Distance(slider.EndPosition, oldStartPos) < 1
+                       && Math.Abs(slider.Path.Distance - oldDistance) < 1e-10;
+            });
+        }
+    }
+}

From 34c761946c970ecc321688cec200901447bf2bd3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Aug 2023 23:55:56 +0900
Subject: [PATCH 0173/2296] Don't completely fade FPS counter out when running
 at full FPS

I've heard multiple times from uses that this is distracting or
confusing.
---
 osu.Game/Graphics/UserInterface/FPSCounter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/FPSCounter.cs b/osu.Game/Graphics/UserInterface/FPSCounter.cs
index c1ef573848..000b85b900 100644
--- a/osu.Game/Graphics/UserInterface/FPSCounter.cs
+++ b/osu.Game/Graphics/UserInterface/FPSCounter.cs
@@ -213,7 +213,7 @@ namespace osu.Game.Graphics.UserInterface
                 requestDisplay();
             else if (isDisplayed && Time.Current - lastDisplayRequiredTime > 2000 && !IsHovered)
             {
-                mainContent.FadeTo(0, 300, Easing.OutQuint);
+                mainContent.FadeTo(0.7f, 300, Easing.OutQuint);
                 isDisplayed = false;
             }
         }

From 90d7e46e20fa5a633c856f2835eedd1b8451fad4 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 00:58:13 +0900
Subject: [PATCH 0174/2296] Fix incorrect truncation to int

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

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index d6a3bd7f07..f62eeab5d7 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Difficulty
             // Temporarily allow these attributes to not exist so as to not block releases of server-side components while these attributes aren't populated/used yet.
             LegacyAccuracyScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_ACCURACY_SCORE);
             LegacyComboScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_COMBO_SCORE);
-            LegacyBonusScoreRatio = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO);
+            LegacyBonusScoreRatio = values.GetValueOrDefault(ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO);
         }
     }
 }

From 19c8b74a47fbbb001bc5acf57d3ad921482ec597 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 21:09:58 +0200
Subject: [PATCH 0175/2296] Remove unnecessary circle arc approximation

---
 osu.Game/Rulesets/Objects/SliderPathExtensions.cs | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 1bc9668258..cb753229ae 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -71,18 +70,10 @@ namespace osu.Game.Rulesets.Objects
                 double lastSegmentStart = distinctSegmentEnds[^2];
                 double lastSegmentEnd = distinctSegmentEnds[^1];
 
-                var oldCircleArcPath = new List<Vector2>();
-                sliderPath.GetPathToProgress(oldCircleArcPath, lastSegmentStart / lastSegmentEnd, 1);
+                var circleArcPath = new List<Vector2>();
+                sliderPath.GetPathToProgress(circleArcPath, lastSegmentStart / lastSegmentEnd, 1);
 
-                var newCircleArcPoints = new[]
-                {
-                    oldCircleArcPath[0],
-                    oldCircleArcPath[oldCircleArcPath.Count / 2],
-                    oldCircleArcPath[^1]
-                };
-
-                var newCircleArcPath = PathApproximator.ApproximateCircularArc(newCircleArcPoints.AsSpan());
-                controlPoints[^2].Position = newCircleArcPath[newCircleArcPath.Count / 2];
+                controlPoints[^2].Position = circleArcPath[circleArcPath.Count / 2];
             }
 
             sliderPath.reverseControlPoints(out positionalOffset);

From 449bee98cc1c1194d0fd111ae36afadb75fed117 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 21:56:08 +0200
Subject: [PATCH 0176/2296] Code cleanup

---
 .../Editor/TestSceneSliderReversal.cs               | 13 +++++--------
 osu.Game/Rulesets/Objects/SliderPathExtensions.cs   |  9 ++++++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
index ddef74deb1..f26a889ec6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
@@ -35,16 +35,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         private static PathControlPoint[] createPathSegment(PathType type, params Vector2[] positions)
         {
-            return new[]
-            {
-                new PathControlPoint
-                {
-                    Type = type
-                },
-            }.Concat(positions.Select(p => new PathControlPoint
+            return positions.Select(p => new PathControlPoint
             {
                 Position = p
-            })).ToArray();
+            }).Prepend(new PathControlPoint
+            {
+                Type = type
+            }).ToArray();
         }
 
         [TestCase(0, 250)]
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index cb753229ae..9e9b542961 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -1,10 +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.Extensions.IEnumerableExtensions;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Objects
             double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
 
             // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
-            if (segmentEnds.Length >= 2 && Math.Abs(segmentEnds[^1] - segmentEnds[^2]) < 1e-10 && distinctSegmentEnds.Length > 1)
+            if (segmentEnds.Length >= 2 && Precision.AlmostEquals(segmentEnds[^1], segmentEnds[^2]) && distinctSegmentEnds.Length > 1)
             {
                 int numVisibleSegments = distinctSegmentEnds.Length - 2;
                 var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();
@@ -62,7 +62,10 @@ namespace osu.Game.Rulesets.Objects
             }
 
             // Restore original control point types.
-            controlPoints.Zip(originalControlPointTypes).ForEach(x => x.First.Type = x.Second);
+            for (int i = 0; i < controlPoints.Count; i++)
+            {
+                controlPoints[i].Type = originalControlPointTypes[i];
+            }
 
             // Recalculate perfect curve at the end of the slider path.
             if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 1)

From 28994166bca85c7b2c83ec779d896d25b281cf6c Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 22:09:12 +0200
Subject: [PATCH 0177/2296] Split up assertions

---
 .../Editor/TestSceneSliderReversal.cs          | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
index f26a889ec6..9f6b278609 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -44,6 +45,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             }).ToArray();
         }
 
+        private Slider SelectedSlider => (Slider)EditorBeatmap.SelectedHitObjects[0];
+
         [TestCase(0, 250)]
         [TestCase(0, 200)]
         [TestCase(1, 80)]
@@ -87,13 +90,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 InputManager.ReleaseKey(Key.LControl);
             });
 
-            AddAssert("Slider was reversed correctly", () =>
-            {
-                var slider = (Slider)EditorBeatmap.SelectedHitObjects[0];
-                return Vector2.Distance(slider.Position, oldEndPos) < 1
-                       && Vector2.Distance(slider.EndPosition, oldStartPos) < 1
-                       && Math.Abs(slider.Path.Distance - oldDistance) < 1e-10;
-            });
+            AddAssert("Slider has correct length", () =>
+                Precision.AlmostEquals(SelectedSlider.Path.Distance, oldDistance));
+
+            AddAssert("Slider has correct start position", () =>
+                Vector2.Distance(SelectedSlider.Position, oldEndPos) < 1);
+
+            AddAssert("Slider has correct end position", () =>
+                Vector2.Distance(SelectedSlider.EndPosition, oldStartPos) < 1);
         }
     }
 }

From cd706734636cd3d8da5bef4e9078c4b4d70cd5f9 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 14 Aug 2023 22:41:25 +0200
Subject: [PATCH 0178/2296] Fix property name

---
 .../Editor/TestSceneSliderReversal.cs                    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
index 9f6b278609..b804680f0d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.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.Linq;
 using NUnit.Framework;
 using osu.Framework.Utils;
@@ -45,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             }).ToArray();
         }
 
-        private Slider SelectedSlider => (Slider)EditorBeatmap.SelectedHitObjects[0];
+        private Slider selectedSlider => (Slider)EditorBeatmap.SelectedHitObjects[0];
 
         [TestCase(0, 250)]
         [TestCase(0, 200)]
@@ -91,13 +90,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
 
             AddAssert("Slider has correct length", () =>
-                Precision.AlmostEquals(SelectedSlider.Path.Distance, oldDistance));
+                Precision.AlmostEquals(selectedSlider.Path.Distance, oldDistance));
 
             AddAssert("Slider has correct start position", () =>
-                Vector2.Distance(SelectedSlider.Position, oldEndPos) < 1);
+                Vector2.Distance(selectedSlider.Position, oldEndPos) < 1);
 
             AddAssert("Slider has correct end position", () =>
-                Vector2.Distance(SelectedSlider.EndPosition, oldStartPos) < 1);
+                Vector2.Distance(selectedSlider.EndPosition, oldStartPos) < 1);
         }
     }
 }

From 6a7b0786c9231df3313d918ad752a15b31b796a9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 13:33:49 +0900
Subject: [PATCH 0179/2296] Add barline pooling for mania

---
 .../ManiaSkinComponentLookup.cs               |  1 +
 osu.Game.Rulesets.Mania/Objects/BarLine.cs    | 11 ++-
 .../Objects/Drawables/DrawableBarLine.cs      | 60 ++++++++--------
 .../Skinning/Default/DefaultBarLine.cs        | 72 +++++++++++++++++++
 .../Legacy/ManiaLegacySkinTransformer.cs      |  3 +
 osu.Game.Rulesets.Mania/UI/Stage.cs           |  4 +-
 6 files changed, 118 insertions(+), 33 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs

diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs
index c9ee5af809..44120e16e6 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponentLookup.cs
@@ -33,5 +33,6 @@ namespace osu.Game.Rulesets.Mania
         HitExplosion,
         StageBackground,
         StageForeground,
+        BarLine
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/BarLine.cs b/osu.Game.Rulesets.Mania/Objects/BarLine.cs
index 09a746042b..cf576239ed 100644
--- a/osu.Game.Rulesets.Mania/Objects/BarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/BarLine.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 osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 
@@ -8,7 +9,15 @@ namespace osu.Game.Rulesets.Mania.Objects
 {
     public class BarLine : ManiaHitObject, IBarLine
     {
-        public bool Major { get; set; }
+        private HitObjectProperty<bool> major;
+
+        public Bindable<bool> MajorBindable => major.Bindable;
+
+        public bool Major
+        {
+            get => major.Value;
+            set => major.Value = value;
+        }
 
         public override Judgement CreateJudgement() => new IgnoreJudgement();
     }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
index 8381b8b24b..25fed1a84c 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
@@ -1,9 +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.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osuTK;
+using osu.Game.Rulesets.Mania.Skinning.Default;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -13,45 +15,41 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     /// </summary>
     public partial class DrawableBarLine : DrawableManiaHitObject<BarLine>
     {
+        public readonly Bindable<bool> Major = new Bindable<bool>();
+
+        public DrawableBarLine()
+            : this(null!)
+        {
+        }
+
         public DrawableBarLine(BarLine barLine)
             : base(barLine)
         {
             RelativeSizeAxes = Axes.X;
-            Height = barLine.Major ? 1.7f : 1.2f;
+        }
 
-            AddInternal(new Box
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.BarLine), _ => new DefaultBarLine())
             {
-                Name = "Bar line",
-                Anchor = Anchor.BottomCentre,
-                Origin = Anchor.BottomCentre,
-                RelativeSizeAxes = Axes.Both,
-                Alpha = barLine.Major ? 0.5f : 0.2f
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
             });
 
-            if (barLine.Major)
-            {
-                Vector2 size = new Vector2(22, 6);
-                const float line_offset = 4;
+            Major.BindValueChanged(major => Height = major.NewValue ? 1.7f : 1.2f, true);
+        }
 
-                AddInternal(new Circle
-                {
-                    Name = "Left line",
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreRight,
+        protected override void OnApply()
+        {
+            base.OnApply();
+            Major.BindTo(HitObject.MajorBindable);
+        }
 
-                    Size = size,
-                    X = -line_offset,
-                });
-
-                AddInternal(new Circle
-                {
-                    Name = "Right line",
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreLeft,
-                    Size = size,
-                    X = line_offset,
-                });
-            }
+        protected override void OnFree()
+        {
+            base.OnFree();
+            Major.UnbindFrom(HitObject.MajorBindable);
         }
 
         protected override void UpdateStartTimeStateTransforms() => this.FadeOut(150);
diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
new file mode 100644
index 0000000000..cd85901a65
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
@@ -0,0 +1,72 @@
+// 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.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Default
+{
+    public partial class DefaultBarLine : CompositeDrawable
+    {
+        private Bindable<bool> major = null!;
+
+        private Drawable mainLine = null!;
+        private Drawable leftAnchor = null!;
+        private Drawable rightAnchor = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableHitObject)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            AddInternal(mainLine = new Box
+            {
+                Name = "Bar line",
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+                RelativeSizeAxes = Axes.Both,
+            });
+
+            Vector2 size = new Vector2(22, 6);
+            const float line_offset = 4;
+
+            AddInternal(leftAnchor = new Circle
+            {
+                Name = "Left anchor",
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreRight,
+                Size = size,
+                X = -line_offset,
+            });
+
+            AddInternal(rightAnchor = new Circle
+            {
+                Name = "Right anchor",
+                Anchor = Anchor.CentreRight,
+                Origin = Anchor.CentreLeft,
+                Size = size,
+                X = line_offset,
+            });
+
+            major = ((DrawableBarLine)drawableHitObject).Major.GetBoundCopy();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            major.BindValueChanged(updateMajor, true);
+        }
+
+        private void updateMajor(ValueChangedEvent<bool> major)
+        {
+            mainLine.Alpha = major.NewValue ? 0.5f : 0.2f;
+            leftAnchor.Alpha = rightAnchor.Alpha = major.NewValue ? 1 : 0;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index f8519beb22..446dfae0f6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -119,6 +119,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                         case ManiaSkinComponents.StageForeground:
                             return new LegacyStageForeground();
 
+                        case ManiaSkinComponents.BarLine:
+                            return null; // Not yet implemented.
+
                         default:
                             throw new UnsupportedSkinComponentException(lookup);
                     }
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 879c704450..4382f8e84a 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -136,6 +136,8 @@ namespace osu.Game.Rulesets.Mania.UI
                 columnFlow.SetContentForColumn(i, column);
                 AddNested(column);
             }
+
+            RegisterPool<BarLine, DrawableBarLine>(50, 200);
         }
 
         private ISkinSource currentSkin;
@@ -186,7 +188,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public override bool Remove(DrawableHitObject h) => Columns.ElementAt(((ManiaHitObject)h.HitObject).Column - firstColumnIndex).Remove(h);
 
-        public void Add(BarLine barLine) => base.Add(new DrawableBarLine(barLine));
+        public void Add(BarLine barLine) => base.Add(barLine);
 
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {

From e9621e7d6ebe3f117017b8e87b1fbcbb6d5a40f0 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 13:34:02 +0900
Subject: [PATCH 0180/2296] Adjust test to share barline between stages

---
 osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
index 86499a7c6e..fee3ba3e39 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
@@ -117,18 +117,16 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private void createBarLine(bool major)
         {
-            foreach (var stage in stages)
+            var obj = new BarLine
             {
-                var obj = new BarLine
-                {
-                    StartTime = Time.Current + 2000,
-                    Major = major,
-                };
+                StartTime = Time.Current + 2000,
+                Major = major,
+            };
 
-                obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
+            foreach (var stage in stages)
                 stage.Add(obj);
-            }
         }
 
         private ScrollingTestContainer createStage(ScrollingDirection direction, ManiaAction action)

From 8c14ff674e8460cd419693654a2d48aa39f152d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Aug 2023 14:33:21 +0900
Subject: [PATCH 0181/2296] Update framework

---
 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 46f3247a8c..d64855e5c1 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.812.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.815.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cba200489d..a5a9387e36 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="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.812.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.815.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0c049e65b3..d93dfaf67c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.812.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.815.0" />
   </ItemGroup>
 </Project>

From ab1d5235284bb0b3f98c602736262403da9eb6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 15 Aug 2023 07:44:05 +0200
Subject: [PATCH 0182/2296] Fix kiai stars flickering on and off during
 gameplay

Closes #24503.

The problematic reset of `lastParticleAdded` has been moved to a place
that should hopefully (a) not cause such problems and (b) be much more
explicit about what's happening.
---
 osu.Game/Graphics/ParticleSpewer.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/ParticleSpewer.cs b/osu.Game/Graphics/ParticleSpewer.cs
index 37a4fe77bd..64c70095bf 100644
--- a/osu.Game/Graphics/ParticleSpewer.cs
+++ b/osu.Game/Graphics/ParticleSpewer.cs
@@ -49,6 +49,18 @@ namespace osu.Game.Graphics
             this.maxDuration = maxDuration;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Active.BindValueChanged(active =>
+            {
+                // ensure that particles can be spawned immediately after the spewer becomes active.
+                if (active.NewValue)
+                    lastParticleAdded = null;
+            });
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -56,12 +68,8 @@ namespace osu.Game.Graphics
             Invalidate(Invalidation.DrawNode);
 
             if (!Active.Value || !CanSpawnParticles)
-            {
-                lastParticleAdded = null;
                 return;
-            }
 
-            // Always want to spawn the first particle in an activation immediately.
             if (lastParticleAdded == null)
             {
                 lastParticleAdded = Time.Current;

From e8bde6504a176c2cd138d721e267fa97db079520 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Aug 2023 16:08:11 +0900
Subject: [PATCH 0183/2296] Fix score being cloned in async method causing
 random crashes

Closes https://github.com/ppy/osu/issues/24445.
---
 osu.Game/Screens/Play/Player.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 5f8e061d89..8c5828fc92 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -810,10 +810,13 @@ namespace osu.Game.Screens.Play
             if (!canShowResults && !forceImport)
                 return Task.FromResult<ScoreInfo>(null);
 
+            // Clone score before beginning any async processing.
+            // - Must be run synchronously as the score may potentially be mutated in the background.
+            // - Must be cloned for the same reason.
+            Score scoreCopy = Score.DeepClone();
+
             return prepareScoreForDisplayTask = Task.Run(async () =>
             {
-                var scoreCopy = Score.DeepClone();
-
                 try
                 {
                     await PrepareScoreForResultsAsync(scoreCopy).ConfigureAwait(false);

From ec9e7f14a81165f3bdd21eeef6f8fd0f3ea5dae2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 18:51:24 +0900
Subject: [PATCH 0184/2296] Disable SVs from being visualised in mania editor

---
 osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index f480fa516b..dadd725a2f 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osuTK;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -19,6 +20,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods)
             : base(ruleset, beatmap, mods)
         {
+            ScrollMethod = ScrollVisualisationMethod.Constant;
         }
 
         protected override Playfield CreatePlayfield() => new ManiaEditorPlayfield(Beatmap.Stages)

From e34a9a00014d63249582320f5b08e9cce6ec29cc Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 19:30:37 +0900
Subject: [PATCH 0185/2296] Disable hold end conversion for mania HoldOff mod

---
 osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
index 2b0098744f..a94fdeda6b 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
@@ -46,19 +46,6 @@ namespace osu.Game.Rulesets.Mania.Mods
                     StartTime = h.StartTime,
                     Samples = h.GetNodeSamples(0)
                 });
-
-                // Don't add an end note if the duration is shorter than the threshold
-                double noteValue = GetNoteDurationInBeatLength(h, maniaBeatmap); // 1/1, 1/2, 1/4, etc.
-
-                if (noteValue >= END_NOTE_ALLOW_THRESHOLD)
-                {
-                    newObjects.Add(new Note
-                    {
-                        Column = h.Column,
-                        StartTime = h.EndTime,
-                        Samples = h.GetNodeSamples((h.NodeSamples?.Count - 1) ?? 1)
-                    });
-                }
             }
 
             maniaBeatmap.HitObjects = maniaBeatmap.HitObjects.OfType<Note>().Concat(newObjects).OrderBy(h => h.StartTime).ToList();

From 5678db4e707bf37736bb9b2ea8ad29538f886c4b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 19:42:32 +0900
Subject: [PATCH 0186/2296] Fix test + cleanup

---
 .../Mods/TestSceneManiaModHoldOff.cs          | 37 +------------------
 .../Mods/ManiaModHoldOff.cs                   |  8 ----
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs
index 3011a93755..f5117b61af 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs
@@ -6,7 +6,6 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Tests.Visual;
-using System.Collections.Generic;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -24,21 +23,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             Assert.False(testBeatmap.HitObjects.OfType<HoldNote>().Any());
         }
 
-        [Test]
-        public void TestCorrectNoteValues()
-        {
-            var testBeatmap = createRawBeatmap();
-            var noteValues = new List<double>(testBeatmap.HitObjects.OfType<HoldNote>().Count());
-
-            foreach (HoldNote h in testBeatmap.HitObjects.OfType<HoldNote>())
-            {
-                noteValues.Add(ManiaModHoldOff.GetNoteDurationInBeatLength(h, testBeatmap));
-            }
-
-            noteValues.Sort();
-            Assert.AreEqual(noteValues, new List<double> { 0.125, 0.250, 0.500, 1.000, 2.000 });
-        }
-
         [Test]
         public void TestCorrectObjectCount()
         {
@@ -47,25 +31,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             var rawBeatmap = createRawBeatmap();
             var testBeatmap = createModdedBeatmap();
 
-            // Calculate expected number of objects
-            int expectedObjectCount = 0;
-
-            foreach (ManiaHitObject h in rawBeatmap.HitObjects)
-            {
-                // Both notes and hold notes account for at least one object
-                expectedObjectCount++;
-
-                if (h.GetType() == typeof(HoldNote))
-                {
-                    double noteValue = ManiaModHoldOff.GetNoteDurationInBeatLength((HoldNote)h, rawBeatmap);
-
-                    if (noteValue >= ManiaModHoldOff.END_NOTE_ALLOW_THRESHOLD)
-                    {
-                        // Should generate an end note if it's longer than the minimum note value
-                        expectedObjectCount++;
-                    }
-                }
-            }
+            // Both notes and hold notes account for at least one object
+            int expectedObjectCount = rawBeatmap.HitObjects.Count;
 
             Assert.That(testBeatmap.HitObjects.Count == expectedObjectCount);
         }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
index a94fdeda6b..4e6cc4f1d6 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHoldOff.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Rulesets.Mania.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(ManiaModInvert) };
 
-        public const double END_NOTE_ALLOW_THRESHOLD = 0.5;
-
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
             var maniaBeatmap = (ManiaBeatmap)beatmap;
@@ -50,11 +48,5 @@ namespace osu.Game.Rulesets.Mania.Mods
 
             maniaBeatmap.HitObjects = maniaBeatmap.HitObjects.OfType<Note>().Concat(newObjects).OrderBy(h => h.StartTime).ToList();
         }
-
-        public static double GetNoteDurationInBeatLength(HoldNote holdNote, ManiaBeatmap beatmap)
-        {
-            double beatLength = beatmap.ControlPointInfo.TimingPointAt(holdNote.StartTime).BeatLength;
-            return holdNote.Duration / beatLength;
-        }
     }
 }

From 6346872c3931b795fd20bad5326b1d62acff776e Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Tue, 15 Aug 2023 23:27:12 +0200
Subject: [PATCH 0187/2296] Improve code readability and add assertion to test
 scene

---
 .../Editor/TestSceneSliderReversal.cs         | 10 +++++++++-
 .../Rulesets/Objects/SliderPathExtensions.cs  | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
index b804680f0d..9c5eb83e3c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
@@ -48,8 +48,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         [TestCase(0, 250)]
         [TestCase(0, 200)]
-        [TestCase(1, 80)]
         [TestCase(1, 120)]
+        [TestCase(1, 80)]
         public void TestSliderReversal(int pathIndex, double length)
         {
             var controlPoints = paths[pathIndex];
@@ -57,6 +57,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             Vector2 oldStartPos = default;
             Vector2 oldEndPos = default;
             double oldDistance = default;
+            var oldControlPointTypes = controlPoints.Select(p => p.Type);
 
             AddStep("Add slider", () =>
             {
@@ -97,6 +98,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddAssert("Slider has correct end position", () =>
                 Vector2.Distance(selectedSlider.EndPosition, oldStartPos) < 1);
+
+            AddAssert("Control points have correct types", () =>
+            {
+                var newControlPointTypes = selectedSlider.Path.ControlPoints.Select(p => p.Type).ToArray();
+
+                return oldControlPointTypes.Take(newControlPointTypes.Length).SequenceEqual(newControlPointTypes);
+            });
         }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 9e9b542961..682e31fa96 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
@@ -30,12 +29,17 @@ namespace osu.Game.Rulesets.Objects
         public static void Reverse(this SliderPath sliderPath, out Vector2 positionalOffset)
         {
             var controlPoints = sliderPath.ControlPoints;
-            var originalControlPointTypes = controlPoints.Select(p => p.Type).ToArray();
 
-            controlPoints[0].Type ??= PathType.Linear;
+            var inheritedLinearPoints = controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.Linear && p.Type is null).ToList();
 
-            // Inherited points after a linear point should be treated as linear points.
-            controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.Linear).ForEach(p => p.Type = PathType.Linear);
+            if (controlPoints[0].Type == null)
+            {
+                inheritedLinearPoints.Add(controlPoints[0]);
+            }
+
+            // Inherited points after a linear point, as well as the first control point if it inherited,
+            // should be treated as linear points, so their types are temporarily changed to linear.
+            inheritedLinearPoints.ForEach(p => p.Type = PathType.Linear);
 
             double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
             double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
@@ -62,10 +66,7 @@ namespace osu.Game.Rulesets.Objects
             }
 
             // Restore original control point types.
-            for (int i = 0; i < controlPoints.Count; i++)
-            {
-                controlPoints[i].Type = originalControlPointTypes[i];
-            }
+            inheritedLinearPoints.ForEach(p => p.Type = null);
 
             // Recalculate perfect curve at the end of the slider path.
             if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 1)

From e7e0c49f428075debc22c7607fcf44697e28c4ac Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Wed, 16 Aug 2023 01:14:25 +0200
Subject: [PATCH 0188/2296] Replace `.Distinct()` with
 `truncateEndingDuplicates()`

---
 .../Rulesets/Objects/SliderPathExtensions.cs  | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 682e31fa96..2fa460ec01 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Objects
             inheritedLinearPoints.ForEach(p => p.Type = PathType.Linear);
 
             double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
-            double[] distinctSegmentEnds = segmentEnds.Distinct().ToArray();
+            double[] distinctSegmentEnds = truncateEndingDuplicates(segmentEnds);
 
             // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
             if (segmentEnds.Length >= 2 && Precision.AlmostEquals(segmentEnds[^1], segmentEnds[^2]) && distinctSegmentEnds.Length > 1)
@@ -83,6 +83,24 @@ namespace osu.Game.Rulesets.Objects
             sliderPath.reverseControlPoints(out positionalOffset);
         }
 
+        /// <summary>
+        /// Keeps removing the last element of the provided array until the last two elements are not equal.
+        /// </summary>
+        /// <param name="arr">The array to truncate.</param>
+        /// <returns>The truncated array.</returns>
+        private static double[] truncateEndingDuplicates(double[] arr)
+        {
+            if (arr.Length < 2)
+                return arr;
+
+            var result = arr.ToList();
+
+            while (Precision.AlmostEquals(result[^1], result[^2]))
+                result.RemoveAt(result.Count - 1);
+
+            return result.ToArray();
+        }
+
         /// <summary>
         /// Reverses the order of the provided <see cref="SliderPath"/>'s <see cref="PathControlPoint"/>s.
         /// </summary>

From 58bffa13cd284891ebd735c216ca9bdab94ca8c8 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Wed, 16 Aug 2023 01:19:41 +0200
Subject: [PATCH 0189/2296] Fix possible `IndexOutOfRangeException`

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

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 2fa460ec01..21448404ef 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Objects
 
             var result = arr.ToList();
 
-            while (Precision.AlmostEquals(result[^1], result[^2]))
+            while (Precision.AlmostEquals(result[^1], result[^2]) && result.Count > 1)
                 result.RemoveAt(result.Count - 1);
 
             return result.ToArray();

From 6001f7e5c783b67a9236f81aeda28214ad2a0832 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 13:52:23 +0900
Subject: [PATCH 0190/2296] Rename "dummy" local user to something more
 descriptive

This created weird cases in logs which are very hard to understand. The
one which really got me was this:

```
[runtime] 2023-08-13 07:48:27 [verbose]: Invalidating working beatmap cache for unknown artist - unknown title (Dummy)
```

Which looks like a dummy working beatmap was invalidated, but it turns
out that's just the local user which was populated when creating a new
local beatmap.
---
 osu.Game/Online/API/DummyAPIAccess.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 01169828b0..2764247f5c 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Online.API
 
         public Bindable<APIUser> LocalUser { get; } = new Bindable<APIUser>(new APIUser
         {
-            Username = @"Dummy",
+            Username = @"Local user",
             Id = DUMMY_USER_ID,
         });
 

From 502844a8583e6ee8537f0479d71f2e6a8ab62178 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 14:23:01 +0900
Subject: [PATCH 0191/2296] Add ability to construct `RealmLive` from `ID`

---
 osu.Game/Database/RealmLive.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmLive.cs b/osu.Game/Database/RealmLive.cs
index 509fabec59..1134636756 100644
--- a/osu.Game/Database/RealmLive.cs
+++ b/osu.Game/Database/RealmLive.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Construct a new instance of live realm data.
         /// </summary>
-        /// <param name="data">The realm data.</param>
+        /// <param name="data">The realm data. Must be managed (see <see cref="IRealmObject.IsManaged"/>).</param>
         /// <param name="realm">The realm factory the data was sourced from. May be null for an unmanaged object.</param>
         public RealmLive(T data, RealmAccess realm)
             : base(data.ID)
@@ -41,6 +41,24 @@ namespace osu.Game.Database
             dataIsFromUpdateThread = ThreadSafety.IsUpdateThread;
         }
 
+        /// <summary>
+        /// Construct a new instance of live realm data from an ID.
+        /// </summary>
+        /// <param name="id">The ID of an already-persisting realm instance.</param>
+        /// <param name="realm">The realm factory the data was sourced from. May be null for an unmanaged object.</param>
+        public RealmLive(Guid id, RealmAccess realm)
+            : base(id)
+        {
+            data = retrieveFromID(realm.Realm);
+
+            if (data.IsNull())
+                throw new ArgumentException("Realm instance for provided ID could not be found.", nameof(id));
+
+            this.realm = realm;
+
+            dataIsFromUpdateThread = ThreadSafety.IsUpdateThread;
+        }
+
         /// <summary>
         /// Perform a read operation on this live object.
         /// </summary>

From 5bd7370439c1e79a739be0d46dce060f57444ffe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 14:23:17 +0900
Subject: [PATCH 0192/2296] Add log output when editor is creating a fresh
 beatmap

---
 osu.Game/Screens/Edit/Editor.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 35d8bb4ab7..1cdca5754d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -199,6 +199,8 @@ namespace osu.Game.Screens.Edit
 
             if (loadableBeatmap is DummyWorkingBeatmap)
             {
+                Logger.Log("Editor was loaded without a valid beatmap; creating a new beatmap.");
+
                 isNewBeatmap = true;
 
                 loadableBeatmap = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);

From 531794b26b6af72f3f25d609694e135fc960cf64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 14:23:30 +0900
Subject: [PATCH 0193/2296] Fix `ModelManager` not correctly re-retrieving
 realm objects before performing operations

Falls into the age-old trap of attempting to retrieve an item from realm
without first ensuring that realm is in an up-to-date state.

Consider this scenario:

- Editor is entered from main menu, causing it to create a new beatmap
  from its async `load()` method.
- Editor opens correctly, then main thread performs a file operations on
  the same beatmap.
- Main thread is potentially not refreshed yet, and will result in `null`
  instance when performing the re-fetch in `performFileOperation`.

I've fixed this by using the safe implementation inside `RealmLive<T>`.
Feels like we want this is one place which is always used as the correct
method.

On a quick search, there are 10-20 other usages of `Realm.Find<T>` which
could also have similar issues, but it'll be a bit of a pain to go
through and fix each of these. In 99.9% of cases, the accesses are on
instances which couldn't have just been created (or the usage of
recently-imported/created is blocked by realm subscription flows, ie.
baetmap import) so I'm not touching them for now.

Something to keep in mind when working with realm going forward though.
---
 osu.Game/Database/ModelManager.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 47feb8a8f9..6b538e62ea 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -48,16 +48,13 @@ namespace osu.Game.Database
             // This method should be removed as soon as all the surrounding pieces support non-detached operations.
             if (!item.IsManaged)
             {
-                // Importantly, begin the realm write *before* re-fetching, else the update realm may not be in a consistent state
-                // (ie. if an async import finished very recently).
-                Realm.Realm.Write(realm =>
+                // We use RealmLive here as it handled re-retrieval and refreshing of realm if required.
+                new RealmLive<TModel>(item.ID, Realm).PerformWrite(i =>
                 {
-                    var managed = realm.Find<TModel>(item.ID);
-                    Debug.Assert(managed != null);
-                    operation(managed);
+                    operation(i);
 
                     item.Files.Clear();
-                    item.Files.AddRange(managed.Files.Detach());
+                    item.Files.AddRange(i.Files.Detach());
                 });
             }
             else

From a8824c8c8ad4b6d8184f68a34ebc2672fb299716 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 14:30:10 +0900
Subject: [PATCH 0194/2296] Remove flaky test documentation for fixed test

---
 .../Editing/TestSceneEditorBeatmapCreation.cs | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 37cb43a43a..920e560018 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -92,25 +92,6 @@ namespace osu.Game.Tests.Visual.Editing
         }
 
         [Test]
-        [FlakyTest]
-        /*
-         * Fail rate around 1.2%.
-         *
-         * Failing with realm refetch occasionally being null.
-         * My only guess is that the WorkingBeatmap at SetupScreen is dummy instead of the true one.
-         * If it's something else, we have larger issues with realm, but I don't think that's the case.
-         *
-         * at osu.Framework.Logging.ThrowingTraceListener.Fail(String message1, String message2)
-         * at System.Diagnostics.TraceInternal.Fail(String message, String detailMessage)
-         * at System.Diagnostics.TraceInternal.TraceProvider.Fail(String message, String detailMessage)
-         * at System.Diagnostics.Debug.Fail(String message, String detailMessage)
-         * at osu.Game.Database.ModelManager`1.<>c__DisplayClass8_0.<performFileOperation>b__0(Realm realm) ModelManager.cs:line 50
-         * at osu.Game.Database.RealmExtensions.Write(Realm realm, Action`1 function) RealmExtensions.cs:line 14
-         * at osu.Game.Database.ModelManager`1.performFileOperation(TModel item, Action`1 operation) ModelManager.cs:line 47
-         * at osu.Game.Database.ModelManager`1.AddFile(TModel item, Stream contents, String filename) ModelManager.cs:line 37
-         * at osu.Game.Screens.Edit.Setup.ResourcesSection.ChangeAudioTrack(FileInfo source) ResourcesSection.cs:line 115
-         * at osu.Game.Tests.Visual.Editing.TestSceneEditorBeatmapCreation.<TestAddAudioTrack>b__11_0() TestSceneEditorBeatmapCreation.cs:line 101
-         */
         public void TestAddAudioTrack()
         {
             AddAssert("track is virtual", () => Beatmap.Value.Track is TrackVirtual);

From 6c4c76350fbecd1032709e2724b9abd9ee979e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 16 Aug 2023 07:36:56 +0200
Subject: [PATCH 0195/2296] Remove unused using directive

---
 osu.Game/Database/ModelManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 6b538e62ea..56aa0843a0 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using osu.Framework.Platform;

From 88295a49aa4655fcf48c317c1efac5a19dbc7342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 16 Aug 2023 07:38:31 +0200
Subject: [PATCH 0196/2296] Fix invalid reference in xmldoc

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

diff --git a/osu.Game/Database/RealmLive.cs b/osu.Game/Database/RealmLive.cs
index 1134636756..bfb755c42a 100644
--- a/osu.Game/Database/RealmLive.cs
+++ b/osu.Game/Database/RealmLive.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Construct a new instance of live realm data.
         /// </summary>
-        /// <param name="data">The realm data. Must be managed (see <see cref="IRealmObject.IsManaged"/>).</param>
+        /// <param name="data">The realm data. Must be managed (see <see cref="IRealmObjectBase.IsManaged"/>).</param>
         /// <param name="realm">The realm factory the data was sourced from. May be null for an unmanaged object.</param>
         public RealmLive(T data, RealmAccess realm)
             : base(data.ID)

From 6e11162ab10734b86b88f13b4967ae0bf68b6abd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 15:36:31 +0900
Subject: [PATCH 0197/2296] Add helper method for safer realm `Find<T>`

---
 osu.Game/Database/ModelManager.cs    | 12 +++++---
 osu.Game/Database/RealmExtensions.cs | 25 +++++++++++++++++
 osu.Game/Database/RealmLive.cs       | 41 +++-------------------------
 3 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 56aa0843a0..39dae61d36 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using osu.Framework.Platform;
@@ -47,13 +48,16 @@ namespace osu.Game.Database
             // This method should be removed as soon as all the surrounding pieces support non-detached operations.
             if (!item.IsManaged)
             {
-                // We use RealmLive here as it handled re-retrieval and refreshing of realm if required.
-                new RealmLive<TModel>(item.ID, Realm).PerformWrite(i =>
+                // Importantly, begin the realm write *before* re-fetching, else the update realm may not be in a consistent state
+                // (ie. if an async import finished very recently).
+                Realm.Realm.Write(realm =>
                 {
-                    operation(i);
+                    var managed = realm.FindWithRefresh<TModel>(item.ID);
+                    Debug.Assert(managed != null);
+                    operation(managed);
 
                     item.Files.Clear();
-                    item.Files.AddRange(i.Files.Detach());
+                    item.Files.AddRange(managed.Files.Detach());
                 });
             }
             else
diff --git a/osu.Game/Database/RealmExtensions.cs b/osu.Game/Database/RealmExtensions.cs
index 13c4defb83..ee76f1aa79 100644
--- a/osu.Game/Database/RealmExtensions.cs
+++ b/osu.Game/Database/RealmExtensions.cs
@@ -8,6 +8,31 @@ namespace osu.Game.Database
 {
     public static class RealmExtensions
     {
+        /// <summary>
+        /// Performs a <see cref="Realm.Find{T}(System.Nullable{long})"/>.
+        /// If a match was not found, a <see cref="Realm.Refresh"/> is performed before trying a second time.
+        /// This ensures that an instance is found even if the realm requested against was not in a consistent state.
+        /// </summary>
+        /// <param name="realm"></param>
+        /// <param name="id"></param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public static T? FindWithRefresh<T>(this Realm realm, Guid id) where T : IRealmObject
+        {
+            var found = realm.Find<T>(id);
+
+            if (found == null)
+            {
+                // It may be that we access this from the update thread before a refresh has taken place.
+                // To ensure that behaviour matches what we'd expect (the object *is* available), force
+                // a refresh to bring in any off-thread changes immediately.
+                realm.Refresh();
+                found = realm.Find<T>(id);
+            }
+
+            return found;
+        }
+
         /// <summary>
         /// Perform a write operation against the provided realm instance.
         /// </summary>
diff --git a/osu.Game/Database/RealmLive.cs b/osu.Game/Database/RealmLive.cs
index bfb755c42a..9e99cba45c 100644
--- a/osu.Game/Database/RealmLive.cs
+++ b/osu.Game/Database/RealmLive.cs
@@ -41,24 +41,6 @@ namespace osu.Game.Database
             dataIsFromUpdateThread = ThreadSafety.IsUpdateThread;
         }
 
-        /// <summary>
-        /// Construct a new instance of live realm data from an ID.
-        /// </summary>
-        /// <param name="id">The ID of an already-persisting realm instance.</param>
-        /// <param name="realm">The realm factory the data was sourced from. May be null for an unmanaged object.</param>
-        public RealmLive(Guid id, RealmAccess realm)
-            : base(id)
-        {
-            data = retrieveFromID(realm.Realm);
-
-            if (data.IsNull())
-                throw new ArgumentException("Realm instance for provided ID could not be found.", nameof(id));
-
-            this.realm = realm;
-
-            dataIsFromUpdateThread = ThreadSafety.IsUpdateThread;
-        }
-
         /// <summary>
         /// Perform a read operation on this live object.
         /// </summary>
@@ -80,7 +62,7 @@ namespace osu.Game.Database
                     return;
                 }
 
-                perform(retrieveFromID(r));
+                perform(r.FindWithRefresh<T>(ID)!);
                 RealmLiveStatistics.USAGE_ASYNC.Value++;
             });
         }
@@ -102,7 +84,7 @@ namespace osu.Game.Database
 
             return realm.Run(r =>
             {
-                var returnData = perform(retrieveFromID(r));
+                var returnData = perform(r.FindWithRefresh<T>(ID)!);
                 RealmLiveStatistics.USAGE_ASYNC.Value++;
 
                 if (returnData is RealmObjectBase realmObject && realmObject.IsManaged)
@@ -159,25 +141,10 @@ namespace osu.Game.Database
             }
 
             dataIsFromUpdateThread = true;
-            data = retrieveFromID(realm.Realm);
+            data = realm.Realm.FindWithRefresh<T>(ID)!;
+
             RealmLiveStatistics.USAGE_UPDATE_REFETCH.Value++;
         }
-
-        private T retrieveFromID(Realm realm)
-        {
-            var found = realm.Find<T>(ID);
-
-            if (found == null)
-            {
-                // It may be that we access this from the update thread before a refresh has taken place.
-                // To ensure that behaviour matches what we'd expect (the object *is* available), force
-                // a refresh to bring in any off-thread changes immediately.
-                realm.Refresh();
-                found = realm.Find<T>(ID)!;
-            }
-
-            return found;
-        }
     }
 
     internal static class RealmLiveStatistics

From c885b71f3ad7a35438b3eba37c87cefff53c8a2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 16:17:56 +0900
Subject: [PATCH 0198/2296] Add leaderboard toggle as tracked setting to give
 better use visibility

---
 osu.Game/Configuration/OsuConfigManager.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index edcbb94368..921284ad4d 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -237,6 +237,12 @@ namespace osu.Game.Configuration
                     value: disabledState ? CommonStrings.Disabled.ToLower() : CommonStrings.Enabled.ToLower(),
                     shortcut: LookupKeyBindings(GlobalAction.ToggleGameplayMouseButtons))
                 ),
+                new TrackedSetting<bool>(OsuSetting.GameplayLeaderboard, state => new SettingDescription(
+                    rawValue: state,
+                    name: GlobalActionKeyBindingStrings.ToggleInGameLeaderboard,
+                    value: state ? CommonStrings.Enabled.ToLower() : CommonStrings.Disabled.ToLower(),
+                    shortcut: LookupKeyBindings(GlobalAction.ToggleInGameLeaderboard))
+                ),
                 new TrackedSetting<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode, visibilityMode => new SettingDescription(
                     rawValue: visibilityMode,
                     name: GameplaySettingsStrings.HUDVisibilityMode,

From 68db112882b03ec4f361e0066245208ef789de60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 16:19:56 +0900
Subject: [PATCH 0199/2296] Re-date migration

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

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 90e39da201..b729fdd8e8 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Database
         /// 30   2023-06-16    Run migration of old lazer scores again. This time with more correct rounding considerations.
         /// 31   2023-06-26    Add Version and LegacyTotalScore to ScoreInfo, set Version to 30000002 and copy TotalScore into LegacyTotalScore for legacy scores.
         /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
-        /// 33   2023-08-01    Reset default chat toggle keybind to avoid conflict with leaderboard toggle keybind.
+        /// 33   2023-08-16    Reset default chat toggle key binding to avoid conflict with newly added leaderboard toggle key binding.
         /// </summary>
         private const int schema_version = 33;
 

From caf0fd074296aa21fad8a5bd9dda96912ece8414 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 16:21:42 +0900
Subject: [PATCH 0200/2296] Refactor migration to read the same as previous one

---
 osu.Game/Database/RealmAccess.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index b729fdd8e8..917d662255 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -1022,10 +1022,10 @@ namespace osu.Game.Database
                 {
                     // Clear default bindings for the chat focus toggle,
                     // as they would conflict with the newly-added leaderboard toggle.
-                    var newKeyBindings = migration.NewRealm.All<RealmKeyBinding>().ToList();
-                    var toggleChatBind = newKeyBindings.FirstOrDefault(bind => bind.ActionInt == (int)GlobalAction.ToggleChatFocus);
+                    var keyBindings = migration.NewRealm.All<RealmKeyBinding>();
 
-                    if (toggleChatBind != default && toggleChatBind.KeyCombination.Keys.SequenceEqual(new[] { InputKey.Tab }))
+                    var toggleChatBind = keyBindings.FirstOrDefault(bind => bind.ActionInt == (int)GlobalAction.ToggleChatFocus);
+                    if (toggleChatBind != null && toggleChatBind.KeyCombination.Keys.SequenceEqual(new[] { InputKey.Tab }))
                         migration.NewRealm.Remove(toggleChatBind);
 
                     break;

From bb98f10ff67b87794a542f8f51f4cc1aeb1f1743 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 16:38:49 +0900
Subject: [PATCH 0201/2296] Use `CurrentTime` instead of `StartTime` for hotfix
 seek (and update comment)

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 226108209a..a50c089d16 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -162,10 +162,18 @@ namespace osu.Game.Screens.Play
 
             // This is a workaround for the fact that DecoupleableInterpolatingFramedClock doesn't seek the source
             // if the source is not IsRunning. (see https://github.com/ppy/osu-framework/blob/2102638056dfcf85d21b4d85266d53b5dd018767/osu.Framework/Timing/DecoupleableInterpolatingFramedClock.cs#L209-L210)
-            //
-            // This breaks in multiplayer spectator.
             // I hope to remove this once we knock some sense into clocks in general.
-            (SourceClock as IAdjustableClock)?.Seek(StartTime);
+            //
+            // Without this seek, the multiplayer spectator start sequence breaks:
+            // - Individual clients' clocks are never updated to their expected time
+            // - The sync manager thinks they are running behind
+            // - Gameplay doesn't start when it should (until a timeout occurs because nothing is happening for 10+ seconds)
+            //
+            // In addition, we use `CurrentTime` for this seek instead of `StartTime` as the above seek may have applied inherent
+            // offsets which need to be accounted for (ie. FramedBeatmapClock.TotalApliedOffset).
+            //
+            // See https://github.com/ppy/osu/pull/24451/files/87fee001c786b29db34063ef3350e9a9f024d3ab#diff-28ca02979641e2d98a15fe5d5e806f56acf60ac100258a059fa72503b6cc54e8.
+            (SourceClock as IAdjustableClock)?.Seek(CurrentTime);
 
             if (!wasPaused || startClock)
                 Start();

From d70a9a5bc414c538ba67340c9a21d0666bd932d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 16 Aug 2023 09:40:46 +0200
Subject: [PATCH 0202/2296] Fill out xmldoc and adjust inline commentary

---
 osu.Game/Database/RealmExtensions.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/RealmExtensions.cs b/osu.Game/Database/RealmExtensions.cs
index ee76f1aa79..c84e1e35b8 100644
--- a/osu.Game/Database/RealmExtensions.cs
+++ b/osu.Game/Database/RealmExtensions.cs
@@ -13,10 +13,13 @@ namespace osu.Game.Database
         /// If a match was not found, a <see cref="Realm.Refresh"/> is performed before trying a second time.
         /// This ensures that an instance is found even if the realm requested against was not in a consistent state.
         /// </summary>
-        /// <param name="realm"></param>
-        /// <param name="id"></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
+        /// <param name="realm">The realm to operate on.</param>
+        /// <param name="id">The ID of the entity to find in the realm.</param>
+        /// <typeparam name="T">The type of the entity to find in the realm.</typeparam>
+        /// <returns>
+        /// The retrieved entity of type <typeparamref name="T"/>.
+        /// Can be <see langword="null"/> if the entity is still not found by <paramref name="id"/> even after a refresh.
+        /// </returns>
         public static T? FindWithRefresh<T>(this Realm realm, Guid id) where T : IRealmObject
         {
             var found = realm.Find<T>(id);
@@ -24,7 +27,7 @@ namespace osu.Game.Database
             if (found == null)
             {
                 // It may be that we access this from the update thread before a refresh has taken place.
-                // To ensure that behaviour matches what we'd expect (the object *is* available), force
+                // To ensure that behaviour matches what we'd expect (the object generally *should be* available), force
                 // a refresh to bring in any off-thread changes immediately.
                 realm.Refresh();
                 found = realm.Find<T>(id);

From 56a4989f7158a071bf78b009e4524944f172493b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 16:55:48 +0900
Subject: [PATCH 0203/2296] Disable IPC binding in tournament client to allow
 running concurrently

---
 osu.Desktop/Program.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index 5a1373e040..a33e845f5b 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -85,7 +85,7 @@ namespace osu.Desktop
                 }
             }
 
-            using (DesktopGameHost host = Host.GetSuitableDesktopHost(gameName, new HostOptions { BindIPC = true }))
+            using (DesktopGameHost host = Host.GetSuitableDesktopHost(gameName, new HostOptions { BindIPC = !tournamentClient }))
             {
                 if (!host.IsPrimaryInstance)
                 {

From add1ef77d0b1ef4cb41ce083a937b9154eacc7b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 16 Aug 2023 10:07:12 +0200
Subject: [PATCH 0204/2296] Fix typo in comment

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

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index a50c089d16..20bf6c3829 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Play
             // - Gameplay doesn't start when it should (until a timeout occurs because nothing is happening for 10+ seconds)
             //
             // In addition, we use `CurrentTime` for this seek instead of `StartTime` as the above seek may have applied inherent
-            // offsets which need to be accounted for (ie. FramedBeatmapClock.TotalApliedOffset).
+            // offsets which need to be accounted for (ie. FramedBeatmapClock.TotalAppliedOffset).
             //
             // See https://github.com/ppy/osu/pull/24451/files/87fee001c786b29db34063ef3350e9a9f024d3ab#diff-28ca02979641e2d98a15fe5d5e806f56acf60ac100258a059fa72503b6cc54e8.
             (SourceClock as IAdjustableClock)?.Seek(CurrentTime);

From 965da343a409fbcf714c05226ddcd8bbffdb9fdd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 14:56:02 +0900
Subject: [PATCH 0205/2296] Fix tournament song bar tests not showing anything
 by default

---
 .../Components/TestSceneSongBar.cs                  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
index 762cfa2519..0f31192a9c 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
@@ -17,11 +18,11 @@ namespace osu.Game.Tournament.Tests.Components
         [Cached]
         private readonly LadderInfo ladder = new LadderInfo();
 
-        [Test]
-        public void TestSongBar()
-        {
-            SongBar songBar = null!;
+        private SongBar songBar = null!;
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
             AddStep("create bar", () => Child = songBar = new SongBar
             {
                 RelativeSizeAxes = Axes.X,
@@ -29,7 +30,11 @@ namespace osu.Game.Tournament.Tests.Components
                 Origin = Anchor.Centre
             });
             AddUntilStep("wait for loaded", () => songBar.IsLoaded);
+        }
 
+        [Test]
+        public void TestSongBar()
+        {
             AddStep("set beatmap", () =>
             {
                 var beatmap = CreateAPIBeatmap(Ruleset.Value);

From 56eb44d15bd2e119dec201562f1db41d22534e0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Aug 2023 16:07:03 +0900
Subject: [PATCH 0206/2296] Change `TestSpectatorClient` to provide some better
 fake data for score / acc

---
 .../Multiplayer/TestSceneMultiSpectatorLeaderboard.cs      | 2 ++
 osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs     | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index 049c02ffde..4bf2ebc1a4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -49,6 +49,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(clocks.Keys.Select(id => new MultiplayerRoomUser(id)).ToArray())
                 {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Expanded = { Value = true }
                 }, Add);
             });
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index 305a615102..5db08810ca 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -124,7 +124,12 @@ namespace osu.Game.Tests.Visual.Spectator
                 if (frames.Count == 0)
                     return;
 
-                var bundle = new FrameDataBundle(new ScoreInfo { Combo = currentFrameIndex }, new ScoreProcessor(rulesetStore.GetRuleset(0)!.CreateInstance()), frames.ToArray());
+                var bundle = new FrameDataBundle(new ScoreInfo
+                {
+                    Combo = currentFrameIndex,
+                    TotalScore = (long)(currentFrameIndex * 123478 * RNG.NextDouble(0.99, 1.01)),
+                    Accuracy = RNG.NextDouble(0.98, 1),
+                }, new ScoreProcessor(rulesetStore.GetRuleset(0)!.CreateInstance()), frames.ToArray());
                 ((ISpectatorClient)this).UserSentFrames(userId, bundle);
 
                 frames.Clear();

From 26d05afadcbacaa9a8dacfb2c98d79a3c4483e81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 18:28:06 +0900
Subject: [PATCH 0207/2296] Add more test coverage to multi spectator screen

---
 .../TestSceneMultiSpectatorScreen.cs          | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index a61c3f1234..cebc75f90c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -79,6 +79,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddWaitStep("wait a bit", 20);
         }
 
+        [TestCase(2)]
+        [TestCase(16)]
+        public void TestTeams(int count)
+        {
+            int[] userIds = getPlayerIds(count);
+
+            start(userIds, teams: true);
+            loadSpectateScreen();
+
+            sendFrames(userIds, 1000);
+            AddWaitStep("wait a bit", 20);
+        }
+
         [Test]
         public void TestMultipleStartRequests()
         {
@@ -450,16 +463,18 @@ 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, APIMod[]? mods = null)
+        private void start(int[] userIds, int? beatmapId = null, APIMod[]? mods = null, bool teams = false)
         {
             AddStep("start play", () =>
             {
-                foreach (int id in userIds)
+                for (int i = 0; i < userIds.Length; i++)
                 {
+                    int id = userIds[i];
                     var user = new MultiplayerRoomUser(id)
                     {
                         User = new APIUser { Id = id },
                         Mods = mods ?? Array.Empty<APIMod>(),
+                        MatchState = teams ? new TeamVersusUserState { TeamID = i % 2 } : null,
                     };
 
                     OnlinePlayDependencies.MultiplayerClient.AddUser(user, true);

From f02416f877c758d4d8e7a3fbe78b413260c7b997 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 14:56:48 +0900
Subject: [PATCH 0208/2296] Improve visuals of tournament song bar

This is a stop-gap until we add new versions (and share between game and tournament client).
---
 osu.Game.Tournament/Components/SongBar.cs     | 39 ++++++++++++++-----
 .../Components/TournamentBeatmapPanel.cs      |  6 +--
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index fa0cbda16b..3d060600f7 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -14,7 +14,6 @@ using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Menu;
-using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 
@@ -22,14 +21,14 @@ namespace osu.Game.Tournament.Components
 {
     public partial class SongBar : CompositeDrawable
     {
-        private TournamentBeatmap? beatmap;
+        private IBeatmapInfo? beatmap;
 
         public const float HEIGHT = 145 / 2f;
 
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
-        public TournamentBeatmap? Beatmap
+        public IBeatmapInfo? Beatmap
         {
             set
             {
@@ -37,7 +36,7 @@ namespace osu.Game.Tournament.Components
                     return;
 
                 beatmap = value;
-                update();
+                refreshContent();
             }
         }
 
@@ -49,7 +48,7 @@ namespace osu.Game.Tournament.Components
             set
             {
                 mods = value;
-                update();
+                refreshContent();
             }
         }
 
@@ -71,19 +70,25 @@ namespace osu.Game.Tournament.Components
         protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
+            Masking = true;
+            CornerRadius = 5;
+
             InternalChildren = new Drawable[]
             {
+                new Box
+                {
+                    Colour = colours.Gray3,
+                    RelativeSizeAxes = Axes.Both,
+                },
                 flow = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    LayoutDuration = 500,
-                    LayoutEasing = Easing.OutQuint,
                     Direction = FillDirection.Full,
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -93,7 +98,7 @@ namespace osu.Game.Tournament.Components
             Expanded = true;
         }
 
-        private void update()
+        private void refreshContent()
         {
             if (beatmap == null)
             {
@@ -229,7 +234,7 @@ namespace osu.Game.Tournament.Components
                         }
                     }
                 },
-                new TournamentBeatmapPanel(beatmap)
+                new UnmaskedTournamentBeatmapPanel(beatmap)
                 {
                     RelativeSizeAxes = Axes.X,
                     Width = 0.5f,
@@ -272,4 +277,18 @@ namespace osu.Game.Tournament.Components
             }
         }
     }
+
+    internal partial class UnmaskedTournamentBeatmapPanel : TournamentBeatmapPanel
+    {
+        public UnmaskedTournamentBeatmapPanel(IBeatmapInfo? beatmap, string mod = "")
+            : base(beatmap, mod)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Masking = false;
+        }
+    }
 }
diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index ba922c7c7b..4e0adb30ac 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tournament.Components
 {
     public partial class TournamentBeatmapPanel : CompositeDrawable
     {
-        public readonly TournamentBeatmap? Beatmap;
+        public readonly IBeatmapInfo? Beatmap;
 
         private readonly string mod;
 
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament.Components
 
         private Box flash = null!;
 
-        public TournamentBeatmapPanel(TournamentBeatmap? beatmap, string mod = "")
+        public TournamentBeatmapPanel(IBeatmapInfo? beatmap, string mod = "")
         {
             Beatmap = beatmap;
             this.mod = mod;
@@ -58,7 +58,7 @@ namespace osu.Game.Tournament.Components
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = OsuColour.Gray(0.5f),
-                    OnlineInfo = Beatmap,
+                    OnlineInfo = (Beatmap as IBeatmapSetOnlineInfo),
                 },
                 new FillFlowContainer
                 {

From ab826c35b7515619535fb2bc4959f57afab1fe97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Aug 2023 18:28:59 +0900
Subject: [PATCH 0209/2296] Add score diff display to multiplayer spectator

Basically pulling changes over from the tournament client implementation
---
 .../Screens/Play/HUD/MatchScoreDisplay.cs     | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs b/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
index 58bf4eea4b..e1e388d872 100644
--- a/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Play.HUD
         private Drawable score1Bar;
         private Drawable score2Bar;
 
+        private MatchScoreDiffCounter scoreDiffText;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -98,6 +100,16 @@ namespace osu.Game.Screens.Play.HUD
                         },
                     }
                 },
+                scoreDiffText = new MatchScoreDiffCounter
+                {
+                    Anchor = Anchor.TopCentre,
+                    Margin = new MarginPadding
+                    {
+                        Top = bar_height / 4,
+                        Horizontal = 8
+                    },
+                    Alpha = 0
+                }
             };
         }
 
@@ -139,6 +151,10 @@ namespace osu.Game.Screens.Play.HUD
 
             losingBar.ResizeWidthTo(0, 400, Easing.OutQuint);
             winningBar.ResizeWidthTo(Math.Min(0.4f, MathF.Pow(diff / 1500000f, 0.5f) / 2), 400, Easing.OutQuint);
+
+            scoreDiffText.Alpha = diff != 0 ? 1 : 0;
+            scoreDiffText.Current.Value = -diff;
+            scoreDiffText.Origin = Team1Score.Value > Team2Score.Value ? Anchor.TopLeft : Anchor.TopRight;
         }
 
         protected override void UpdateAfterChildren()
@@ -174,5 +190,14 @@ namespace osu.Game.Screens.Play.HUD
                     ? OsuFont.Torus.With(weight: FontWeight.Bold, size: font_size, fixedWidth: true)
                     : OsuFont.Torus.With(weight: FontWeight.Regular, size: font_size * 0.8f, fixedWidth: true);
         }
+
+        private partial class MatchScoreDiffCounter : CommaSeparatedScoreCounter
+        {
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
+            {
+                s.Spacing = new Vector2(-2);
+                s.Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: bar_height, fixedWidth: true);
+            });
+        }
     }
 }

From 8b9759c569590687ee78591aa713bdbd99d3c4a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 17:22:55 +0900
Subject: [PATCH 0210/2296] Apply nullability to `MatchScoreDisplay`

---
 osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs b/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
index e1e388d872..4a61c7fd1b 100644
--- a/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/MatchScoreDisplay.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.Allocation;
 using osu.Framework.Bindables;
@@ -24,13 +22,13 @@ namespace osu.Game.Screens.Play.HUD
         public BindableLong Team1Score = new BindableLong();
         public BindableLong Team2Score = new BindableLong();
 
-        protected MatchScoreCounter Score1Text;
-        protected MatchScoreCounter Score2Text;
+        protected MatchScoreCounter Score1Text = null!;
+        protected MatchScoreCounter Score2Text = null!;
 
-        private Drawable score1Bar;
-        private Drawable score2Bar;
+        private Drawable score1Bar = null!;
+        private Drawable score2Bar = null!;
 
-        private MatchScoreDiffCounter scoreDiffText;
+        private MatchScoreDiffCounter scoreDiffText = null!;
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
@@ -166,7 +164,7 @@ namespace osu.Game.Screens.Play.HUD
 
         protected partial class MatchScoreCounter : CommaSeparatedScoreCounter
         {
-            private OsuSpriteText displayedSpriteText;
+            private OsuSpriteText displayedSpriteText = null!;
 
             public MatchScoreCounter()
             {

From d309865b0daac418ad4f7de6a3f512ab4dd2b51b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 17:25:25 +0900
Subject: [PATCH 0211/2296] Update `TournamentMatchScoreDisplay` to share base
 implementation

---
 osu.Game.Tournament/IPC/MatchIPCInfo.cs       |   4 +-
 .../Components/TournamentMatchScoreDisplay.cs | 170 +-----------------
 2 files changed, 6 insertions(+), 168 deletions(-)

diff --git a/osu.Game.Tournament/IPC/MatchIPCInfo.cs b/osu.Game.Tournament/IPC/MatchIPCInfo.cs
index f57518971f..b4575144e7 100644
--- a/osu.Game.Tournament/IPC/MatchIPCInfo.cs
+++ b/osu.Game.Tournament/IPC/MatchIPCInfo.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tournament.IPC
         public Bindable<LegacyMods> Mods { get; } = new Bindable<LegacyMods>();
         public Bindable<TourneyState> State { get; } = new Bindable<TourneyState>();
         public Bindable<string> ChatChannel { get; } = new Bindable<string>();
-        public BindableInt Score1 { get; } = new BindableInt();
-        public BindableInt Score2 { get; } = new BindableInt();
+        public BindableLong Score1 { get; } = new BindableLong();
+        public BindableLong Score2 { get; } = new BindableLong();
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
index 7ae20acc77..f8de34a511 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
@@ -1,181 +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.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Tournament.IPC;
-using osuTK;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
-    // TODO: Update to derive from osu-side class?
-    public partial class TournamentMatchScoreDisplay : CompositeDrawable
+    public partial class TournamentMatchScoreDisplay : MatchScoreDisplay
     {
-        private const float bar_height = 18;
-
-        private readonly BindableInt score1 = new BindableInt();
-        private readonly BindableInt score2 = new BindableInt();
-
-        private readonly MatchScoreCounter score1Text;
-        private readonly MatchScoreCounter score2Text;
-
-        private readonly MatchScoreDiffCounter scoreDiffText;
-
-        private readonly Drawable score1Bar;
-        private readonly Drawable score2Bar;
-
-        public TournamentMatchScoreDisplay()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            InternalChildren = new[]
-            {
-                new Box
-                {
-                    Name = "top bar red (static)",
-                    RelativeSizeAxes = Axes.X,
-                    Height = bar_height / 4,
-                    Width = 0.5f,
-                    Colour = TournamentGame.COLOUR_RED,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopRight
-                },
-                new Box
-                {
-                    Name = "top bar blue (static)",
-                    RelativeSizeAxes = Axes.X,
-                    Height = bar_height / 4,
-                    Width = 0.5f,
-                    Colour = TournamentGame.COLOUR_BLUE,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopLeft
-                },
-                score1Bar = new Box
-                {
-                    Name = "top bar red",
-                    RelativeSizeAxes = Axes.X,
-                    Height = bar_height,
-                    Width = 0,
-                    Colour = TournamentGame.COLOUR_RED,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopRight
-                },
-                score1Text = new MatchScoreCounter
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre
-                },
-                score2Bar = new Box
-                {
-                    Name = "top bar blue",
-                    RelativeSizeAxes = Axes.X,
-                    Height = bar_height,
-                    Width = 0,
-                    Colour = TournamentGame.COLOUR_BLUE,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopLeft
-                },
-                score2Text = new MatchScoreCounter
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre
-                },
-                scoreDiffText = new MatchScoreDiffCounter
-                {
-                    Anchor = Anchor.TopCentre,
-                    Margin = new MarginPadding
-                    {
-                        Top = bar_height / 4,
-                        Horizontal = 8
-                    },
-                    Alpha = 0
-                }
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load(MatchIPCInfo ipc)
         {
-            score1.BindValueChanged(_ => updateScores());
-            score1.BindTo(ipc.Score1);
-
-            score2.BindValueChanged(_ => updateScores());
-            score2.BindTo(ipc.Score2);
-        }
-
-        private void updateScores()
-        {
-            score1Text.Current.Value = score1.Value;
-            score2Text.Current.Value = score2.Value;
-
-            var winningText = score1.Value > score2.Value ? score1Text : score2Text;
-            var losingText = score1.Value <= score2.Value ? score1Text : score2Text;
-
-            winningText.Winning = true;
-            losingText.Winning = false;
-
-            var winningBar = score1.Value > score2.Value ? score1Bar : score2Bar;
-            var losingBar = score1.Value <= score2.Value ? score1Bar : score2Bar;
-
-            int diff = Math.Max(score1.Value, score2.Value) - Math.Min(score1.Value, score2.Value);
-
-            losingBar.ResizeWidthTo(0, 400, Easing.OutQuint);
-            winningBar.ResizeWidthTo(Math.Min(0.4f, MathF.Pow(diff / 1500000f, 0.5f) / 2), 400, Easing.OutQuint);
-
-            scoreDiffText.Alpha = diff != 0 ? 1 : 0;
-            scoreDiffText.Current.Value = -diff;
-            scoreDiffText.Origin = score1.Value > score2.Value ? Anchor.TopLeft : Anchor.TopRight;
-        }
-
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-            score1Text.X = -Math.Max(5 + score1Text.DrawWidth / 2, score1Bar.DrawWidth);
-            score2Text.X = Math.Max(5 + score2Text.DrawWidth / 2, score2Bar.DrawWidth);
-        }
-
-        private partial class MatchScoreCounter : CommaSeparatedScoreCounter
-        {
-            private OsuSpriteText displayedSpriteText = null!;
-
-            public MatchScoreCounter()
-            {
-                Margin = new MarginPadding { Top = bar_height, Horizontal = 10 };
-            }
-
-            public bool Winning
-            {
-                set => updateFont(value);
-            }
-
-            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
-            {
-                displayedSpriteText = s;
-                displayedSpriteText.Spacing = new Vector2(-6);
-                updateFont(false);
-            });
-
-            private void updateFont(bool winning)
-                => displayedSpriteText.Font = winning
-                    ? OsuFont.Torus.With(weight: FontWeight.Bold, size: 50, fixedWidth: true)
-                    : OsuFont.Torus.With(weight: FontWeight.Regular, size: 40, fixedWidth: true);
-        }
-
-        private partial class MatchScoreDiffCounter : CommaSeparatedScoreCounter
-        {
-            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
-            {
-                s.Spacing = new Vector2(-2);
-                s.Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: bar_height, fixedWidth: true);
-            });
+            Team1Score.BindTo(ipc.Score1);
+            Team2Score.BindTo(ipc.Score2);
         }
     }
 }

From 19f892687a0607afbe4e0d010366dc2a66236073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 21:00:35 +0200
Subject: [PATCH 0212/2296] Add precise rotation control to osu! editor

---
 .../Edit/OsuHitObjectComposer.cs              |   5 +
 .../Edit/PreciseRotationPopover.cs            | 107 ++++++++++++++++++
 .../Edit/TransformToolboxGroup.cs             |  80 +++++++++++++
 .../UserInterfaceV2/LabelledTextBox.cs        |   1 +
 .../UserInterfaceV2/SliderWithTextBoxInput.cs |   2 +
 .../Input/Bindings/GlobalActionContainer.cs   |   4 +
 .../GlobalActionKeyBindingStrings.cs          |   5 +
 .../Edit/Components/EditorToolButton.cs       | 107 ++++++++++++++++++
 .../Compose/Components/BlueprintContainer.cs  |   2 +-
 .../Compose/Components/SelectionHandler.cs    |   2 +-
 10 files changed, 313 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
 create mode 100644 osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs
 create mode 100644 osu.Game/Screens/Edit/Components/EditorToolButton.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 0b80750a02..cff2171cbd 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -85,6 +85,11 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             // we may be entering the screen with a selection already active
             updateDistanceSnapGrid();
+
+            RightToolbox.Add(new TransformToolboxGroup
+            {
+                RotationHandler = BlueprintContainer.SelectionHandler.RotationHandler
+            });
         }
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
diff --git a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
new file mode 100644
index 0000000000..0bc7e72751
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.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.
+
+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.Game.Graphics.UserInterfaceV2;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Screens.Edit.Components.RadioButtons;
+using osu.Game.Screens.Edit.Compose.Components;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public partial class PreciseRotationPopover : OsuPopover
+    {
+        private readonly SelectionRotationHandler rotationHandler;
+
+        private readonly Bindable<PreciseRotationInfo> rotationInfo = new Bindable<PreciseRotationInfo>(new PreciseRotationInfo(0, RotationOrigin.PlayfieldCentre));
+
+        private SliderWithTextBoxInput<float> angleInput = null!;
+        private EditorRadioButtonCollection rotationOrigin = null!;
+
+        public PreciseRotationPopover(SelectionRotationHandler rotationHandler)
+        {
+            this.rotationHandler = rotationHandler;
+
+            AllowableAnchors = new[] { Anchor.CentreLeft, Anchor.CentreRight };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new FillFlowContainer
+            {
+                Width = 220,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(20),
+                Children = new Drawable[]
+                {
+                    angleInput = new SliderWithTextBoxInput<float>("Angle (degrees):")
+                    {
+                        Current = new BindableNumber<float>
+                        {
+                            MinValue = -180,
+                            MaxValue = 180,
+                            Precision = 1
+                        },
+                        Instantaneous = true
+                    },
+                    rotationOrigin = new EditorRadioButtonCollection
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Items = new[]
+                        {
+                            new RadioButton("Playfield centre",
+                                () => rotationInfo.Value = rotationInfo.Value with { Origin = RotationOrigin.PlayfieldCentre },
+                                () => new SpriteIcon { Icon = FontAwesome.Regular.Square }),
+                            new RadioButton("Selection centre",
+                                () => rotationInfo.Value = rotationInfo.Value with { Origin = RotationOrigin.SelectionCentre },
+                                () => new SpriteIcon { Icon = FontAwesome.Solid.ObjectGroup })
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ScheduleAfterChildren(() => angleInput.TakeFocus());
+            angleInput.Current.BindValueChanged(angle => rotationInfo.Value = rotationInfo.Value with { Degrees = angle.NewValue });
+            rotationOrigin.Items.First().Select();
+
+            rotationInfo.BindValueChanged(rotation =>
+            {
+                rotationHandler.Update(rotation.NewValue.Degrees, rotation.NewValue.Origin == RotationOrigin.PlayfieldCentre ? OsuPlayfield.BASE_SIZE / 2 : null);
+            });
+        }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+            rotationHandler.Begin();
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+
+            if (IsLoaded)
+                rotationHandler.Commit();
+        }
+    }
+
+    public enum RotationOrigin
+    {
+        PlayfieldCentre,
+        SelectionCentre
+    }
+
+    public record PreciseRotationInfo(float Degrees, RotationOrigin Origin);
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.cs
new file mode 100644
index 0000000000..3da9f5b69b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/TransformToolboxGroup.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Game.Input.Bindings;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Screens.Edit.Components;
+using osu.Game.Screens.Edit.Compose.Components;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public partial class TransformToolboxGroup : EditorToolboxGroup, IKeyBindingHandler<GlobalAction>
+    {
+        private readonly Bindable<bool> canRotate = new BindableBool();
+
+        private EditorToolButton rotateButton = null!;
+
+        public SelectionRotationHandler RotationHandler { get; init; } = null!;
+
+        public TransformToolboxGroup()
+            : base("transform")
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(5),
+                Children = new Drawable[]
+                {
+                    rotateButton = new EditorToolButton("Rotate",
+                        () => new SpriteIcon { Icon = FontAwesome.Solid.Undo },
+                        () => new PreciseRotationPopover(RotationHandler)),
+                    // TODO: scale
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // bindings to `Enabled` on the buttons are decoupled on purpose
+            // due to the weird `OsuButton` behaviour of resetting `Enabled` to `false` when `Action` is set.
+            canRotate.BindTo(RotationHandler.CanRotate);
+            canRotate.BindValueChanged(_ => rotateButton.Enabled.Value = canRotate.Value, true);
+        }
+
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            if (e.Repeat) return false;
+
+            switch (e.Action)
+            {
+                case GlobalAction.EditorToggleRotateControl:
+                {
+                    rotateButton.TriggerClick();
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
index 454be02d0b..8b9d35e343 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
         public string Text
         {
+            get => Component.Text;
             set => Component.Text = value;
         }
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
index fc0e4d2083..37ea2a3f96 100644
--- a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
@@ -85,6 +85,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
             Current.BindValueChanged(updateTextBoxFromSlider, true);
         }
 
+        public bool TakeFocus() => GetContainingInputManager().ChangeFocus(textBox);
+
         private bool updatingFromTextBox;
 
         private void textChanged(ValueChangedEvent<string> change)
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 1090eeb462..9a0a2d5c15 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -105,6 +105,7 @@ namespace osu.Game.Input.Bindings
             // See https://github.com/ppy/osu-framework/blob/master/osu.Framework/Input/StateChanges/MouseScrollRelativeInput.cs#L37-L38.
             new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.MouseWheelRight }, GlobalAction.EditorCyclePreviousBeatSnapDivisor),
             new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.MouseWheelLeft }, GlobalAction.EditorCycleNextBeatSnapDivisor),
+            new KeyBinding(new[] { InputKey.Control, InputKey.R }, GlobalAction.EditorToggleRotateControl),
         };
 
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
@@ -378,5 +379,8 @@ namespace osu.Game.Input.Bindings
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleInGameLeaderboard))]
         ToggleInGameLeaderboard,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorToggleRotateControl))]
+        EditorToggleRotateControl,
     }
 }
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index ceefc27968..8356c480dd 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -344,6 +344,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ExportReplay => new TranslatableString(getKey(@"export_replay"), @"Export replay");
 
+        /// <summary>
+        /// "Toggle rotate control"
+        /// </summary>
+        public static LocalisableString EditorToggleRotateControl => new TranslatableString(getKey(@"editor_toggle_rotate_control"), @"Toggle rotate control");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Screens/Edit/Components/EditorToolButton.cs b/osu.Game/Screens/Edit/Components/EditorToolButton.cs
new file mode 100644
index 0000000000..6550362687
--- /dev/null
+++ b/osu.Game/Screens/Edit/Components/EditorToolButton.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.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Components
+{
+    public partial class EditorToolButton : OsuButton, IHasPopover
+    {
+        public BindableBool Selected { get; } = new BindableBool();
+
+        private readonly Func<Drawable> createIcon;
+        private readonly Func<Popover?> createPopover;
+
+        private Color4 defaultBackgroundColour;
+        private Color4 defaultIconColour;
+        private Color4 selectedBackgroundColour;
+        private Color4 selectedIconColour;
+
+        private Drawable icon = null!;
+
+        public EditorToolButton(LocalisableString text, Func<Drawable> createIcon, Func<Popover?> createPopover)
+        {
+            Text = text;
+            this.createIcon = createIcon;
+            this.createPopover = createPopover;
+
+            RelativeSizeAxes = Axes.X;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            defaultBackgroundColour = colourProvider.Background3;
+            selectedBackgroundColour = colourProvider.Background1;
+
+            defaultIconColour = defaultBackgroundColour.Darken(0.5f);
+            selectedIconColour = selectedBackgroundColour.Lighten(0.5f);
+
+            Add(icon = createIcon().With(b =>
+            {
+                b.Blending = BlendingParameters.Additive;
+                b.Anchor = Anchor.CentreLeft;
+                b.Origin = Anchor.CentreLeft;
+                b.Size = new Vector2(20);
+                b.X = 10;
+            }));
+
+            Action = Selected.Toggle;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Selected.BindValueChanged(_ => updateSelectionState(), true);
+        }
+
+        private void updateSelectionState()
+        {
+            if (!IsLoaded)
+                return;
+
+            BackgroundColour = Selected.Value ? selectedBackgroundColour : defaultBackgroundColour;
+            icon.Colour = Selected.Value ? selectedIconColour : defaultIconColour;
+
+            if (Selected.Value)
+                this.ShowPopover();
+            else
+                this.HidePopover();
+        }
+
+        protected override SpriteText CreateText() => new OsuSpriteText
+        {
+            Depth = -1,
+            Origin = Anchor.CentreLeft,
+            Anchor = Anchor.CentreLeft,
+            X = 40f
+        };
+
+        public Popover? GetPopover() => Enabled.Value
+            ? createPopover()?.With(p =>
+            {
+                p.State.BindValueChanged(state =>
+                {
+                    if (state.NewValue == Visibility.Hidden)
+                        Selected.Value = false;
+                });
+            })
+            : null;
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 1de6c8364c..110beb0fa6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public Container<SelectionBlueprint<T>> SelectionBlueprints { get; private set; }
 
-        protected SelectionHandler<T> SelectionHandler { get; private set; }
+        public SelectionHandler<T> SelectionHandler { get; private set; }
 
         private readonly Dictionary<T, SelectionBlueprint<T>> blueprintMap = new Dictionary<T, SelectionBlueprint<T>>();
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 158b4066bc..3c859c65ff 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved(CanBeNull = true)]
         protected IEditorChangeHandler ChangeHandler { get; private set; }
 
-        protected SelectionRotationHandler RotationHandler { get; private set; }
+        public SelectionRotationHandler RotationHandler { get; private set; }
 
         protected SelectionHandler()
         {

From 5219b8a13b328341d1afad565f6638cceedbdbca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 16 Aug 2023 11:35:09 +0200
Subject: [PATCH 0213/2296] Add test coverage for precise rotation control

---
 .../Editor/TestScenePreciseRotation.cs        | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs
new file mode 100644
index 0000000000..d7dd30d608
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePreciseRotation.cs
@@ -0,0 +1,95 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Edit;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Screens.Edit.Components.RadioButtons;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    public partial class TestScenePreciseRotation : TestSceneOsuEditor
+    {
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset);
+
+        [Test]
+        public void TestHotkeyHandling()
+        {
+            AddStep("select single circle", () => EditorBeatmap.SelectedHitObjects.Add(EditorBeatmap.HitObjects.OfType<HitCircle>().First()));
+            AddStep("press rotate hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddUntilStep("no popover present", () => this.ChildrenOfType<PreciseRotationPopover>().Count(), () => Is.Zero);
+
+            AddStep("select first three objects", () =>
+            {
+                EditorBeatmap.SelectedHitObjects.Clear();
+                EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects.Take(3));
+            });
+            AddStep("press rotate hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddUntilStep("popover present", () => this.ChildrenOfType<PreciseRotationPopover>().Count(), () => Is.EqualTo(1));
+            AddStep("press rotate hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddUntilStep("no popover present", () => this.ChildrenOfType<PreciseRotationPopover>().Count(), () => Is.Zero);
+        }
+
+        [Test]
+        public void TestRotateCorrectness()
+        {
+            AddStep("replace objects", () =>
+            {
+                EditorBeatmap.Clear();
+                EditorBeatmap.AddRange(new HitObject[]
+                {
+                    new HitCircle { Position = new Vector2(100) },
+                    new HitCircle { Position = new Vector2(200) },
+                });
+            });
+            AddStep("select both circles", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
+            AddStep("press rotate hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.R);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+            AddUntilStep("popover present", getPopover, () => Is.Not.Null);
+
+            AddStep("rotate by 180deg", () => getPopover().ChildrenOfType<TextBox>().Single().Current.Value = "180");
+            AddAssert("first object rotated 180deg around playfield centre",
+                () => EditorBeatmap.HitObjects.OfType<HitCircle>().ElementAt(0).Position,
+                () => Is.EqualTo(OsuPlayfield.BASE_SIZE - new Vector2(100)));
+            AddAssert("second object rotated 180deg around playfield centre",
+                () => EditorBeatmap.HitObjects.OfType<HitCircle>().ElementAt(1).Position,
+                () => Is.EqualTo(OsuPlayfield.BASE_SIZE - new Vector2(200)));
+
+            AddStep("change rotation origin", () => getPopover().ChildrenOfType<EditorRadioButton>().ElementAt(1).TriggerClick());
+            AddAssert("first object rotated 90deg around selection centre",
+                () => EditorBeatmap.HitObjects.OfType<HitCircle>().ElementAt(0).Position, () => Is.EqualTo(new Vector2(200, 200)));
+            AddAssert("second object rotated 90deg around selection centre",
+                () => EditorBeatmap.HitObjects.OfType<HitCircle>().ElementAt(1).Position, () => Is.EqualTo(new Vector2(100, 100)));
+
+            PreciseRotationPopover? getPopover() => this.ChildrenOfType<PreciseRotationPopover>().SingleOrDefault();
+        }
+    }
+}

From 49fc9655d28d3ec6da285ac4f2fdec609893163a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2023 19:34:37 +0900
Subject: [PATCH 0214/2296] Apply NRT to `osu.Game.Betamaps.Formats` namespace

---
 osu.Game/Beatmaps/Formats/Decoder.cs             |  7 ++-----
 osu.Game/Beatmaps/Formats/IHasComboColours.cs    |  4 +---
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs     | 10 ++++------
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs     | 16 ++++++----------
 .../Beatmaps/Formats/LegacyStoryboardDecoder.cs  |  8 +++-----
 osu.Game/Skinning/ArgonSkin.cs                   |  2 +-
 osu.Game/Skinning/TrianglesSkin.cs               |  2 +-
 7 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/Decoder.cs b/osu.Game/Beatmaps/Formats/Decoder.cs
index 4f0f11d053..c007f5dcdc 100644
--- a/osu.Game/Beatmaps/Formats/Decoder.cs
+++ b/osu.Game/Beatmaps/Formats/Decoder.cs
@@ -1,13 +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.Collections.Generic;
 using System.IO;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Game.IO;
 using osu.Game.Rulesets;
 
@@ -45,7 +42,7 @@ namespace osu.Game.Beatmaps.Formats
         /// Register dependencies for use with static decoder classes.
         /// </summary>
         /// <param name="rulesets">A store containing all available rulesets (used by <see cref="LegacyBeatmapDecoder"/>).</param>
-        public static void RegisterDependencies([NotNull] RulesetStore rulesets)
+        public static void RegisterDependencies(RulesetStore rulesets)
         {
             LegacyBeatmapDecoder.RulesetStore = rulesets ?? throw new ArgumentNullException(nameof(rulesets));
         }
@@ -63,7 +60,7 @@ namespace osu.Game.Beatmaps.Formats
                 throw new IOException(@"Unknown decoder type");
 
             // start off with the first line of the file
-            string line = stream.PeekLine()?.Trim();
+            string? line = stream.PeekLine()?.Trim();
 
             while (line != null && line.Length == 0)
             {
diff --git a/osu.Game/Beatmaps/Formats/IHasComboColours.cs b/osu.Game/Beatmaps/Formats/IHasComboColours.cs
index 1d9cc0be65..1608adee7d 100644
--- a/osu.Game/Beatmaps/Formats/IHasComboColours.cs
+++ b/osu.Game/Beatmaps/Formats/IHasComboColours.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 osuTK.Graphics;
 
@@ -13,7 +11,7 @@ namespace osu.Game.Beatmaps.Formats
         /// <summary>
         /// Retrieves the list of combo colours for presentation only.
         /// </summary>
-        IReadOnlyList<Color4> ComboColours { get; }
+        IReadOnlyList<Color4>? ComboColours { get; }
 
         /// <summary>
         /// The list of custom combo colours.
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 65a01befb4..5da51f6c8e 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.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
-
 #pragma warning disable 618
 
 using System;
@@ -36,11 +34,11 @@ namespace osu.Game.Beatmaps.Formats
         /// </summary>
         private const double control_point_leniency = 1;
 
-        internal static RulesetStore RulesetStore;
+        internal static RulesetStore? RulesetStore;
 
-        private Beatmap beatmap;
+        private Beatmap beatmap = null!;
 
-        private ConvertHitObjectParser parser;
+        private ConvertHitObjectParser? parser;
 
         private LegacySampleBank defaultSampleBank;
         private int defaultSampleVolume = 100;
@@ -222,7 +220,7 @@ namespace osu.Game.Beatmaps.Formats
                 case @"Mode":
                     int rulesetID = Parsing.ParseInt(pair.Value);
 
-                    beatmap.BeatmapInfo.Ruleset = RulesetStore.GetRuleset(rulesetID) ?? throw new ArgumentException("Ruleset is not available locally.");
+                    beatmap.BeatmapInfo.Ruleset = RulesetStore?.GetRuleset(rulesetID) ?? throw new ArgumentException("Ruleset is not available locally.");
 
                     switch (rulesetID)
                     {
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 041b00c7e1..fc9de13c89 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.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 System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
-using JetBrains.Annotations;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Legacy;
@@ -34,8 +31,7 @@ namespace osu.Game.Beatmaps.Formats
 
         private readonly IBeatmap beatmap;
 
-        [CanBeNull]
-        private readonly ISkin skin;
+        private readonly ISkin? skin;
 
         private readonly int onlineRulesetID;
 
@@ -44,7 +40,7 @@ namespace osu.Game.Beatmaps.Formats
         /// </summary>
         /// <param name="beatmap">The beatmap to encode.</param>
         /// <param name="skin">The beatmap's skin, used for encoding combo colours.</param>
-        public LegacyBeatmapEncoder(IBeatmap beatmap, [CanBeNull] ISkin skin)
+        public LegacyBeatmapEncoder(IBeatmap beatmap, ISkin? skin)
         {
             this.beatmap = beatmap;
             this.skin = skin;
@@ -180,8 +176,8 @@ namespace osu.Game.Beatmaps.Formats
 
             writer.WriteLine("[TimingPoints]");
 
-            SampleControlPoint lastRelevantSamplePoint = null;
-            DifficultyControlPoint lastRelevantDifficultyPoint = null;
+            SampleControlPoint? lastRelevantSamplePoint = null;
+            DifficultyControlPoint? lastRelevantDifficultyPoint = null;
 
             // In osu!taiko and osu!mania, a scroll speed is stored as "slider velocity" in legacy formats.
             // In that case, a scrolling speed change is a global effect and per-hit object difficulty control points are ignored.
@@ -585,7 +581,7 @@ namespace osu.Game.Beatmaps.Formats
             return type;
         }
 
-        private LegacySampleBank toLegacySampleBank(string sampleBank)
+        private LegacySampleBank toLegacySampleBank(string? sampleBank)
         {
             switch (sampleBank?.ToLowerInvariant())
             {
@@ -603,7 +599,7 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
-        private int toLegacyCustomSampleBank(HitSampleInfo hitSampleInfo)
+        private int toLegacyCustomSampleBank(HitSampleInfo? hitSampleInfo)
         {
             if (hitSampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy)
                 return legacy.CustomSampleBank;
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index df5d3edb55..cf4700bf85 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.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;
@@ -19,10 +17,10 @@ namespace osu.Game.Beatmaps.Formats
 {
     public class LegacyStoryboardDecoder : LegacyDecoder<Storyboard>
     {
-        private StoryboardSprite storyboardSprite;
-        private CommandTimelineGroup timelineGroup;
+        private StoryboardSprite? storyboardSprite;
+        private CommandTimelineGroup? timelineGroup;
 
-        private Storyboard storyboard;
+        private Storyboard storyboard = null!;
 
         private readonly Dictionary<string, string> variables = new Dictionary<string, string>();
 
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index ba392386de..61b0dc5aa1 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -232,6 +232,6 @@ namespace osu.Game.Skinning
         }
 
         private static Color4 getComboColour(IHasComboColours source, int colourIndex)
-            => source.ComboColours[colourIndex % source.ComboColours.Count];
+            => source.ComboColours![colourIndex % source.ComboColours.Count];
     }
 }
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index a68a7fd5b9..0957f60579 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -203,6 +203,6 @@ namespace osu.Game.Skinning
         }
 
         private static Color4 getComboColour(IHasComboColours source, int colourIndex)
-            => source.ComboColours[colourIndex % source.ComboColours.Count];
+            => source.ComboColours![colourIndex % source.ComboColours.Count];
     }
 }

From 8686b6b1e6ea2a7e3fd096ec838ec0e344f55acd Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 16 Aug 2023 16:44:08 +0200
Subject: [PATCH 0215/2296] fix The last slider point has effect on previous
 inherited

---
 osu.Game/Database/LegacyBeatmapExporter.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index a874353f73..c00977d072 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -70,7 +70,13 @@ namespace osu.Game.Database
 
                 hitObject.StartTime = Math.Floor(hitObject.StartTime);
 
-                if (hitObject is not IHasPath hasPath || BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1) continue;
+                if (hitObject is not IHasPath hasPath) continue;
+
+                // Make sure the last control point is inherit type
+                if (hasPath.Path.ControlPoints.Count > 1)
+                    hasPath.Path.ControlPoints[^1].Type = null;
+
+                if (BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1) continue;
 
                 var newControlPoints = BezierConverter.ConvertToModernBezier(hasPath.Path.ControlPoints);
 

From 59abb59ee862cc83145e7af2efb6f2e17dfcb407 Mon Sep 17 00:00:00 2001
From: Krzysztof Gutkowski <krzysio.gutkowski@gmail.com>
Date: Thu, 17 Aug 2023 00:49:48 +0200
Subject: [PATCH 0216/2296] Set correct date added value when importing stable
 beatmapsets

---
 .../Database/LegacyBeatmapImporterTest.cs     | 31 ++++++++++++++-
 osu.Game/Beatmaps/BeatmapImporter.cs          | 38 ++++++++++++++++++-
 .../Archives/LegacyDirectoryArchiveReader.cs  |  4 +-
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
index b237556d11..638ad94472 100644
--- a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
@@ -1,19 +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 System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.IO;
+using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Database
 {
     [TestFixture]
-    public class LegacyBeatmapImporterTest
+    public class LegacyBeatmapImporterTest : RealmTest
     {
         private readonly TestLegacyBeatmapImporter importer = new TestLegacyBeatmapImporter();
 
@@ -60,6 +63,32 @@ namespace osu.Game.Tests.Database
             }
         }
 
+        [Test]
+        public void TestStableDateAddedApplied()
+        {
+            RunTestWithRealmAsync(async (realm, storage) =>
+            {
+                using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+                using (var tmpStorage = new TemporaryNativeStorage("stable-songs-folder"))
+                {
+                    var stableStorage = new StableStorage(tmpStorage.GetFullPath(""), host);
+                    var songsStorage = stableStorage.GetStorageForDirectory(StableStorage.STABLE_DEFAULT_SONGS_PATH);
+
+                    System.IO.Compression.ZipFile.ExtractToDirectory(TestResources.GetQuickTestBeatmapForImport(), songsStorage.GetFullPath("renatus"));
+
+                    string[] beatmaps = Directory.GetFiles(songsStorage.GetFullPath("renatus"), "*.osu", SearchOption.TopDirectoryOnly);
+
+                    File.SetLastWriteTimeUtc(beatmaps[beatmaps.Length / 2], new DateTime(2000, 1, 1, 12, 0, 0));
+
+                    await new LegacyBeatmapImporter(new BeatmapImporter(storage, realm)).ImportFromStableAsync(stableStorage);
+
+                    var set = realm.Realm.All<BeatmapSetInfo>();
+
+                    Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1, 12, 0, 0, DateTimeKind.Utc)), set.First().DateAdded);
+                }
+            });
+        }
+
         private class TestLegacyBeatmapImporter : LegacyBeatmapImporter
         {
             public TestLegacyBeatmapImporter()
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index c840b4fa94..6c3f393069 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -302,14 +302,50 @@ namespace osu.Game.Beatmaps
                 beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
             }
 
+            var dateAdded = DateTimeOffset.UtcNow;
+
+            // Apply proper date added for a beatmapset when importing from stable.
+            // Stable tracks said date using the filesystem last modified date on the .osu file.
+            if (reader is LegacyDirectoryArchiveReader legacyReader)
+            {
+                dateAdded = determineDateAdded(legacyReader);
+            }
+
             return new BeatmapSetInfo
             {
                 OnlineID = beatmap.BeatmapInfo.BeatmapSet?.OnlineID ?? -1,
                 // Metadata = beatmap.Metadata,
-                DateAdded = DateTimeOffset.UtcNow
+                DateAdded = dateAdded
             };
         }
 
+        /// <summary>
+        /// Used for beatmapsets in legacy (stable) storage.
+        /// Determine the date a given beatmapset has been added to the game.
+        /// The specific date is determined based on the oldest `.osu` file existing
+        /// in the beatmapset directory.
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <returns></returns>
+        private DateTimeOffset determineDateAdded(LegacyDirectoryArchiveReader reader)
+        {
+            var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
+
+            var dateAdded = File.GetLastWriteTimeUtc(reader.GetPath(beatmaps.First()));
+
+            foreach (string beatmapName in beatmaps)
+            {
+                var currentDateAdded = File.GetLastWriteTimeUtc(reader.GetPath(beatmapName));
+
+                if (currentDateAdded < dateAdded)
+                {
+                    dateAdded = currentDateAdded;
+                }
+            }
+
+            return new DateTimeOffset(dateAdded);
+        }
+
         /// <summary>
         /// Create all required <see cref="BeatmapInfo"/>s for the provided archive.
         /// </summary>
diff --git a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
index dfae58aed7..8a576e33d8 100644
--- a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
+++ b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
@@ -21,7 +21,9 @@ namespace osu.Game.IO.Archives
             this.path = Path.GetFullPath(path);
         }
 
-        public override Stream GetStream(string name) => File.OpenRead(Path.Combine(path, name));
+        public override Stream GetStream(string name) => File.OpenRead(GetPath(name));
+
+        public string GetPath(string name) => Path.Combine(path, name);
 
         public override void Dispose()
         {

From 046cc62db2b3c58096a3a9697c4f6a3ed76a232f Mon Sep 17 00:00:00 2001
From: Krzysztof Gutkowski <krzysio.gutkowski@gmail.com>
Date: Thu, 17 Aug 2023 01:11:09 +0200
Subject: [PATCH 0217/2296] Cleanup tests

---
 osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
index 638ad94472..d6056fa71b 100644
--- a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
@@ -82,9 +82,10 @@ namespace osu.Game.Tests.Database
 
                     await new LegacyBeatmapImporter(new BeatmapImporter(storage, realm)).ImportFromStableAsync(stableStorage);
 
-                    var set = realm.Realm.All<BeatmapSetInfo>();
+                    var beatmapset = realm.Realm.All<BeatmapSetInfo>().First();
 
-                    Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1, 12, 0, 0, DateTimeKind.Utc)), set.First().DateAdded);
+                    Assert.NotNull(beatmapset);
+                    Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1, 12, 0, 0, DateTimeKind.Utc)), beatmapset.DateAdded);
                 }
             });
         }

From 3a3951ebf414aa449319b159e13081e42da60bdd Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 17 Aug 2023 17:26:00 +0900
Subject: [PATCH 0218/2296] remove useless api resolved

---
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index ffd6942b9b..4e1355b52f 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -34,9 +34,6 @@ namespace osu.Game.Screens.Import
         [Resolved]
         private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
 
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
-
         [Resolved]
         private ScoreManager scoreManager { get; set; } = null!;
 

From 61a1460f093b2d5f2af7c6f4252140718119c0bc Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 17 Aug 2023 17:27:14 +0900
Subject: [PATCH 0219/2296] remove useless Using

---
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index 4e1355b52f..3566b50421 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -17,7 +17,6 @@ using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;

From 0db82e5286dc301f5b86cab1c19ae639b8e0d0d9 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 17 Aug 2023 17:27:50 +0900
Subject: [PATCH 0220/2296] beatmapSetInfo never be null

---
 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
index 3566b50421..614d652f47 100644
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
@@ -147,8 +147,6 @@ namespace osu.Game.Screens.Import
 
         private void updateStatus()
         {
-            if (beatmapSetInfo == null) return;
-
             beatmapPanelContainer.Clear();
             beatmapPanelContainer.Child = new BeatmapCardNormal(beatmapSetInfo, allowExpansion: false);
             checkForAutomaticDownload(beatmapSetInfo);

From e2cb0d7afb1223eb8b0f85bdd585a8211a431fb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Aug 2023 17:59:22 +0900
Subject: [PATCH 0221/2296] Update framework

---
 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 d64855e5c1..8ebfde8047 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.815.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.817.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index a5a9387e36..7d4a721c91 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="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.815.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.817.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index d93dfaf67c..fd1ba0f6d1 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.815.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.817.0" />
   </ItemGroup>
 </Project>

From 0858bef66e8adf93bbd4a220232a0c2505a0e948 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Aug 2023 18:12:04 +0900
Subject: [PATCH 0222/2296] Update `SmokeSegment` in line with framework vertex
 changes

---
 osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
index 9d64c354e2..d818c8baee 100644
--- a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
@@ -257,7 +257,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 texture.Bind();
 
                 for (int i = 0; i < points.Count; i++)
-                    drawPointQuad(points[i], textureRect, i + firstVisiblePointIndex);
+                    drawPointQuad(renderer, points[i], textureRect, i + firstVisiblePointIndex);
 
                 UnbindTextureShader(renderer);
                 renderer.PopLocalMatrix();
@@ -325,7 +325,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             private float getRotation(int index) => max_rotation * (StatelessRNG.NextSingle(rotationSeed, index) * 2 - 1);
 
-            private void drawPointQuad(SmokePoint point, RectangleF textureRect, int index)
+            private void drawPointQuad(IRenderer renderer, SmokePoint point, RectangleF textureRect, int index)
             {
                 Debug.Assert(quadBatch != null);
 
@@ -347,25 +347,25 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 var localBotLeft = point.Position + ortho - dir;
                 var localBotRight = point.Position + ortho + dir;
 
-                quadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D(renderer)
                 {
                     Position = localTopLeft,
                     TexturePosition = textureRect.TopLeft,
                     Colour = Color4Extensions.Multiply(ColourAtPosition(localTopLeft), colour),
                 });
-                quadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D(renderer)
                 {
                     Position = localTopRight,
                     TexturePosition = textureRect.TopRight,
                     Colour = Color4Extensions.Multiply(ColourAtPosition(localTopRight), colour),
                 });
-                quadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D(renderer)
                 {
                     Position = localBotRight,
                     TexturePosition = textureRect.BottomRight,
                     Colour = Color4Extensions.Multiply(ColourAtPosition(localBotRight), colour),
                 });
-                quadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D(renderer)
                 {
                     Position = localBotLeft,
                     TexturePosition = textureRect.BottomLeft,

From b15a54c91428cd8a0af019f6acc17c3b0a21318b Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 17 Aug 2023 11:36:00 +0900
Subject: [PATCH 0223/2296] Use new overlay pop-in/pop-out samples

---
 osu.Game/Overlays/ChatOverlay.cs                         | 3 +++
 osu.Game/Overlays/WaveOverlayContainer.cs                | 1 +
 osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 87df08ceec..a47d10c565 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -55,6 +55,9 @@ namespace osu.Game.Overlays
         private const float side_bar_width = 190;
         private const float chat_bar_height = 60;
 
+        protected override string PopInSampleName => @"UI/overlay-big-pop-in";
+        protected override string PopOutSampleName => @"UI/overlay-big-pop-out";
+
         [Resolved]
         private OsuConfigManager config { get; set; } = null!;
 
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index 153f7f5412..848d9e60b7 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Overlays
         protected override bool StartHidden => true;
 
         protected override string PopInSampleName => "UI/wave-pop-in";
+        protected override string PopOutSampleName => "UI/overlay-big-pop-out";
 
         public const float HORIZONTAL_PADDING = 50;
 
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
index 5753c268d9..7b631ebfea 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -32,6 +32,9 @@ namespace osu.Game.Screens.Select.Options
 
         public override bool BlockScreenWideMouse => false;
 
+        protected override string PopInSampleName => "SongSelect/options-pop-in";
+        protected override string PopOutSampleName => "SongSelect/options-pop-out";
+
         public BeatmapOptionsOverlay()
         {
             AutoSizeAxes = Axes.Y;

From 04a1f6a5085e0cc076abba71068d4b8d1031c0ab Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 17 Aug 2023 11:37:07 +0900
Subject: [PATCH 0224/2296] Add panning to certain overlay pop-in/pop-outs

---
 .../Containers/OsuFocusedOverlayContainer.cs      | 15 +++++++++++----
 osu.Game/Overlays/LoginOverlay.cs                 |  2 ++
 osu.Game/Overlays/NotificationOverlay.cs          |  2 ++
 osu.Game/Overlays/SettingsPanel.cs                |  1 +
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index f92cfc2306..162c4b6a59 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Graphics.Containers
         private Sample samplePopOut;
         protected virtual string PopInSampleName => "UI/overlay-pop-in";
         protected virtual string PopOutSampleName => "UI/overlay-pop-out";
+        protected virtual double PopInOutSampleBalance => 0;
 
         protected override bool BlockNonPositionalInput => true;
 
@@ -133,15 +134,21 @@ namespace osu.Game.Graphics.Containers
                         return;
                     }
 
-                    if (didChange)
-                        samplePopIn?.Play();
+                    if (didChange && samplePopIn != null)
+                    {
+                        samplePopIn.Balance.Value = PopInOutSampleBalance;
+                        samplePopIn.Play();
+                    }
 
                     if (BlockScreenWideMouse && DimMainContent) overlayManager?.ShowBlockingOverlay(this);
                     break;
 
                 case Visibility.Hidden:
-                    if (didChange)
-                        samplePopOut?.Play();
+                    if (didChange && samplePopOut != null)
+                    {
+                        samplePopOut.Balance.Value = PopInOutSampleBalance;
+                        samplePopOut.Play();
+                    }
 
                     if (BlockScreenWideMouse) overlayManager?.HideBlockingOverlay(this);
                     break;
diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index a575253e71..8a4bda89d9 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Overlays
 
         private const float transition_time = 400;
 
+        protected override double PopInOutSampleBalance => OsuGameBase.SFX_STEREO_STRENGTH;
+
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index c9d09848f8..ef181830b7 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Overlays
         public LocalisableString Title => NotificationsStrings.HeaderTitle;
         public LocalisableString Description => NotificationsStrings.HeaderDescription;
 
+        protected override double PopInOutSampleBalance => OsuGameBase.SFX_STEREO_STRENGTH;
+
         public const float WIDTH = 320;
 
         public const float TRANSITION_LENGTH = 600;
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index d7f39a9d8f..58c56a5514 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Overlays
         private SeekLimitedSearchTextBox searchTextBox;
 
         protected override string PopInSampleName => "UI/settings-pop-in";
+        protected override double PopInOutSampleBalance => -OsuGameBase.SFX_STEREO_STRENGTH;
 
         private readonly bool showSidebar;
 

From 3d7ba0e18cdc9c739119125243c73a205e3f4fcb Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 17 Aug 2023 17:03:45 +0900
Subject: [PATCH 0225/2296] Add pop-in/pop-out sfx to more overlays

---
 .../Collections/ManageCollectionsDialog.cs    |  3 +++
 .../Graphics/UserInterfaceV2/OsuPopover.cs    | 25 ++++++++++++++++++-
 .../Screens/Edit/Setup/LabelledFileChooser.cs |  3 +++
 .../OnlinePlay/Lounge/DrawableLoungeRoom.cs   |  2 ++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Collections/ManageCollectionsDialog.cs b/osu.Game/Collections/ManageCollectionsDialog.cs
index 31016b807b..cc0f23d030 100644
--- a/osu.Game/Collections/ManageCollectionsDialog.cs
+++ b/osu.Game/Collections/ManageCollectionsDialog.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Collections
 
         private AudioFilter lowPassFilter = null!;
 
+        protected override string PopInSampleName => @"UI/overlay-big-pop-in";
+        protected override string PopOutSampleName => @"UI/overlay-big-pop-out";
+
         public ManageCollectionsDialog()
         {
             Anchor = Anchor.Centre;
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
index 381193d539..2aa42d0d50 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -21,6 +23,16 @@ namespace osu.Game.Graphics.UserInterfaceV2
         private const float fade_duration = 250;
         private const double scale_duration = 500;
 
+        private Sample? samplePopIn;
+        private Sample? samplePopOut;
+        protected virtual string PopInSampleName => "UI/overlay-pop-in";
+        protected virtual string PopOutSampleName => "UI/overlay-pop-out";
+
+        // required due to LoadAsyncComplete() calling PopOut() during load - similar workaround to `OsuDropdownMenu`
+        private bool wasOpened;
+
+        protected virtual bool PlayPopInOutSamples => true;
+
         public OsuPopover(bool withPadding = true)
         {
             Content.Padding = withPadding ? new MarginPadding(20) : new MarginPadding();
@@ -38,9 +50,11 @@ namespace osu.Game.Graphics.UserInterfaceV2
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OverlayColourProvider? colourProvider, OsuColour colours)
+        private void load(OverlayColourProvider? colourProvider, OsuColour colours, AudioManager audio)
         {
             Background.Colour = Arrow.Colour = colourProvider?.Background4 ?? colours.GreySeaFoamDarker;
+            samplePopIn = audio.Samples.Get(PopInSampleName);
+            samplePopOut = audio.Samples.Get(PopOutSampleName);
         }
 
         protected override Drawable CreateArrow() => Empty();
@@ -49,12 +63,21 @@ namespace osu.Game.Graphics.UserInterfaceV2
         {
             this.ScaleTo(1, scale_duration, Easing.OutElasticHalf);
             this.FadeIn(fade_duration, Easing.OutQuint);
+
+            if (PlayPopInOutSamples)
+            {
+                samplePopIn?.Play();
+                wasOpened = true;
+            }
         }
 
         protected override void PopOut()
         {
             this.ScaleTo(0.7f, scale_duration, Easing.OutQuint);
             this.FadeOut(fade_duration, Easing.OutQuint);
+
+            if (wasOpened && PlayPopInOutSamples)
+                samplePopOut?.Play();
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
diff --git a/osu.Game/Screens/Edit/Setup/LabelledFileChooser.cs b/osu.Game/Screens/Edit/Setup/LabelledFileChooser.cs
index d14357e875..61f33c4bdc 100644
--- a/osu.Game/Screens/Edit/Setup/LabelledFileChooser.cs
+++ b/osu.Game/Screens/Edit/Setup/LabelledFileChooser.cs
@@ -114,6 +114,9 @@ namespace osu.Game.Screens.Edit.Setup
 
         private partial class FileChooserPopover : OsuPopover
         {
+            protected override string PopInSampleName => "UI/overlay-big-pop-in";
+            protected override string PopOutSampleName => "UI/overlay-big-pop-out";
+
             public FileChooserPopover(string[] handledExtensions, Bindable<FileInfo?> currentFile, string? chooserPath)
             {
                 Child = new Container
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
index 70e4b2a589..030408de84 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
@@ -191,6 +191,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             protected override bool BlockNonPositionalInput => true;
 
+            protected override bool PlayPopInOutSamples => false;
+
             public PasswordEntryPopover(Room room)
             {
                 this.room = room;

From d10d7b6ea41f994c586725e127647b171634fae9 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 17 Aug 2023 17:07:02 +0900
Subject: [PATCH 0226/2296] Change some component samples to go better with
 overlay pop-in samples

---
 osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs         | 4 ++--
 osu.Game/Graphics/UserInterface/ShearedToggleButton.cs       | 5 +++++
 osu.Game/Overlays/Mods/AddPresetButton.cs                    | 2 ++
 .../Screens/Edit/Compose/Components/BeatDivisorControl.cs    | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
index de4df96942..0eec04541c 100644
--- a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs
@@ -46,8 +46,8 @@ namespace osu.Game.Graphics.UserInterface
         private readonly Container content;
         private readonly Box hover;
 
-        public OsuAnimatedButton()
-            : base(HoverSampleSet.Button)
+        public OsuAnimatedButton(HoverSampleSet sampleSet = HoverSampleSet.Button)
+            : base(sampleSet)
         {
             base.Content.Add(content = new Container
             {
diff --git a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
index d5e0abe9d8..07ee26749a 100644
--- a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Graphics.UserInterface
         private Sample? sampleOff;
         private Sample? sampleOn;
 
+        protected virtual bool PlayClickSampleOnly => false;
+
         /// <summary>
         /// Whether this button is currently toggled to an active state.
         /// </summary>
@@ -68,6 +70,9 @@ namespace osu.Game.Graphics.UserInterface
         {
             sampleClick?.Play();
 
+            if (PlayClickSampleOnly)
+                return;
+
             if (Active.Value)
                 sampleOn?.Play();
             else
diff --git a/osu.Game/Overlays/Mods/AddPresetButton.cs b/osu.Game/Overlays/Mods/AddPresetButton.cs
index 731079d1d9..9063fd54f5 100644
--- a/osu.Game/Overlays/Mods/AddPresetButton.cs
+++ b/osu.Game/Overlays/Mods/AddPresetButton.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Overlays.Mods
 {
     public partial class AddPresetButton : ShearedToggleButton, IHasPopover
     {
+        protected override bool PlayClickSampleOnly => true;
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 59b0bd1785..e36f1e9cad 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -262,6 +262,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             private readonly OsuSpriteText divisorText;
 
             public DivisorDisplay()
+                : base(HoverSampleSet.Default)
             {
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;

From 63080d049f254c2051f47de6c3e77b5f3170eec6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Aug 2023 19:08:18 +0900
Subject: [PATCH 0227/2296] Adjust icons slightly

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

diff --git a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
index 0bc7e72751..86112d9751 100644
--- a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
+++ b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                                 () => new SpriteIcon { Icon = FontAwesome.Regular.Square }),
                             new RadioButton("Selection centre",
                                 () => rotationInfo.Value = rotationInfo.Value with { Origin = RotationOrigin.SelectionCentre },
-                                () => new SpriteIcon { Icon = FontAwesome.Solid.ObjectGroup })
+                                () => new SpriteIcon { Icon = FontAwesome.Solid.VectorSquare })
                         }
                     }
                 }

From c811546868cb8754a32049bdfbd9bc22ab0be171 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Aug 2023 21:09:50 +0900
Subject: [PATCH 0228/2296] Update resources

---
 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 a5a9387e36..a2afcd7a9f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.815.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.817.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 360f9750e1c3311928c57198d77c82b02ae4cfde Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Thu, 17 Aug 2023 16:30:18 +0200
Subject: [PATCH 0229/2296] Allow selecting empty control point groups

---
 osu.Game/Screens/Edit/Timing/ControlPointList.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointList.cs b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
index 555c36aac0..64e2d5c1a8 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointList.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
@@ -147,6 +147,10 @@ namespace osu.Game.Screens.Edit.Timing
                 trackedType = null;
             else
             {
+                // If the selected group has no control points, clear the tracked type.
+                // Otherwise the user will be unable to select a group with no control points.
+                if (selectedGroup.Value.ControlPoints.Count == 0)
+                    trackedType = null;
                 // If the selected group only has one control point, update the tracking type.
                 if (selectedGroup.Value.ControlPoints.Count == 1)
                     trackedType = selectedGroup.Value?.ControlPoints.Single().GetType();

From 3481c41a2212750937c87125c5db62d246da54ff Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Fri, 18 Aug 2023 04:34:10 +0200
Subject: [PATCH 0230/2296] Fix `segmentEnds` being calculated incorrectly

---
 osu.Game/Rulesets/Objects/SliderPath.cs       | 19 +++++++++++--------
 .../Rulesets/Objects/SliderPathExtensions.cs  | 10 +++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index f48ffbe5a4..171298e6c0 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Objects
         {
             ensureValid();
 
-            return segmentEnds.Select(i => cumulativeLength[Math.Clamp(i, 0, cumulativeLength.Count - 1)] / calculatedLength);
+            return segmentEnds.Select(i => cumulativeLength[i] / Distance);
         }
 
         private void invalidate()
@@ -251,8 +251,9 @@ namespace osu.Game.Rulesets.Objects
                         calculatedPath.Add(t);
                 }
 
-                // Remember the index of the segment end
-                segmentEnds.Add(calculatedPath.Count - 1);
+                if (i > 0)
+                    // Remember the index of the segment end
+                    segmentEnds.Add(calculatedPath.Count - 1);
 
                 // Start the new segment at the current vertex
                 start = i;
@@ -314,15 +315,11 @@ namespace osu.Game.Rulesets.Objects
 
                 if (calculatedLength > expectedDistance)
                 {
-                    // The path will be shortened further, in which case we should trim any more unnecessary lengths and their associated path segments
+                    // The path will be shortened further, in which case we should trim any more unnecessary lengths
                     while (cumulativeLength.Count > 0 && cumulativeLength[^1] >= expectedDistance)
                     {
                         cumulativeLength.RemoveAt(cumulativeLength.Count - 1);
                         calculatedPath.RemoveAt(pathEndIndex--);
-
-                        // Shorten the last segment to the expected distance
-                        if (segmentEnds.Count > 0)
-                            segmentEnds[^1]--;
                     }
                 }
 
@@ -339,6 +336,12 @@ namespace osu.Game.Rulesets.Objects
 
                 calculatedPath[pathEndIndex] = calculatedPath[pathEndIndex - 1] + dir * (float)(expectedDistance - cumulativeLength[^1]);
                 cumulativeLength.Add(expectedDistance);
+
+                // Shorten the segments to the expected distance
+                for (int i = 0; i < segmentEnds.Count; i++)
+                {
+                    segmentEnds[i] = Math.Min(segmentEnds[i], cumulativeLength.Count - 1);
+                }
             }
         }
 
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 21448404ef..58ce20cd32 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -45,9 +45,9 @@ namespace osu.Game.Rulesets.Objects
             double[] distinctSegmentEnds = truncateEndingDuplicates(segmentEnds);
 
             // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
-            if (segmentEnds.Length >= 2 && Precision.AlmostEquals(segmentEnds[^1], segmentEnds[^2]) && distinctSegmentEnds.Length > 1)
+            if (segmentEnds.Length >= 2 && Precision.AlmostEquals(segmentEnds[^1], segmentEnds[^2]) && distinctSegmentEnds.Length > 0)
             {
-                int numVisibleSegments = distinctSegmentEnds.Length - 2;
+                int numVisibleSegments = distinctSegmentEnds.Length - 1;
                 var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();
 
                 int lastVisibleControlPointIndex = controlPoints.IndexOf(nonInheritedControlPoints[numVisibleSegments]);
@@ -69,9 +69,9 @@ namespace osu.Game.Rulesets.Objects
             inheritedLinearPoints.ForEach(p => p.Type = null);
 
             // Recalculate perfect curve at the end of the slider path.
-            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 1)
+            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 0)
             {
-                double lastSegmentStart = distinctSegmentEnds[^2];
+                double lastSegmentStart = distinctSegmentEnds.Length > 1 ? distinctSegmentEnds[^2] : 0;
                 double lastSegmentEnd = distinctSegmentEnds[^1];
 
                 var circleArcPath = new List<Vector2>();
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Objects
 
             var result = arr.ToList();
 
-            while (Precision.AlmostEquals(result[^1], result[^2]) && result.Count > 1)
+            while (result.Count > 1 && Precision.AlmostEquals(result[^1], result[^2]))
                 result.RemoveAt(result.Count - 1);
 
             return result.ToArray();

From fc2fac577fcdb1d329b83e2cb2e30fc5e7ea78ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:05:25 +0900
Subject: [PATCH 0231/2296] Inverse and xmldoc `ShearedToggleButton` sample
 allowance bool

---
 .../UserInterface/ShearedToggleButton.cs      | 20 +++++++++++--------
 osu.Game/Overlays/Mods/AddPresetButton.cs     |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
index 07ee26749a..05ed531d02 100644
--- a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
@@ -14,7 +14,11 @@ namespace osu.Game.Graphics.UserInterface
         private Sample? sampleOff;
         private Sample? sampleOn;
 
-        protected virtual bool PlayClickSampleOnly => false;
+        /// <summary>
+        /// Sheared toggle buttons by default play two samples when toggled: a click and a toggle (on/off).
+        /// Sometimes this might be too much. Setting this to <c>false</c> will silence the toggle sound.
+        /// </summary>
+        protected virtual bool PlayToggleSamples => true;
 
         /// <summary>
         /// Whether this button is currently toggled to an active state.
@@ -70,13 +74,13 @@ namespace osu.Game.Graphics.UserInterface
         {
             sampleClick?.Play();
 
-            if (PlayClickSampleOnly)
-                return;
-
-            if (Active.Value)
-                sampleOn?.Play();
-            else
-                sampleOff?.Play();
+            if (PlayToggleSamples)
+            {
+                if (Active.Value)
+                    sampleOn?.Play();
+                else
+                    sampleOff?.Play();
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/AddPresetButton.cs b/osu.Game/Overlays/Mods/AddPresetButton.cs
index 9063fd54f5..276afd9bec 100644
--- a/osu.Game/Overlays/Mods/AddPresetButton.cs
+++ b/osu.Game/Overlays/Mods/AddPresetButton.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Mods
 {
     public partial class AddPresetButton : ShearedToggleButton, IHasPopover
     {
-        protected override bool PlayClickSampleOnly => true;
+        protected override bool PlayToggleSamples => false;
 
         [Resolved]
         private OsuColour colours { get; set; } = null!;

From 75750957c7cd93a2cac7d0090d146c214239eed2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:09:13 +0900
Subject: [PATCH 0232/2296] Add note about why pop in samples are disabled for
 `PasswordEntryPopover`

---
 osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
index 030408de84..a45583a2ec 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
@@ -191,6 +191,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             protected override bool BlockNonPositionalInput => true;
 
+            // When a room is clicked, it already plays a click sound, which clashes pretty badly with the pop in sound.
+            // Dunno about this one. I'd probably remove the click sound from the panel in cases they are password protected and play these pop in / out sounds.
             protected override bool PlayPopInOutSamples => false;
 
             public PasswordEntryPopover(Room room)

From 9023059bc0cbbbe7caaa6e7fe8dd7be913f478e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:27:09 +0900
Subject: [PATCH 0233/2296] Convert to switch statement

---
 .../Screens/Edit/Timing/ControlPointList.cs   | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointList.cs b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
index 64e2d5c1a8..22e37b9efb 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointList.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
@@ -147,17 +147,25 @@ namespace osu.Game.Screens.Edit.Timing
                 trackedType = null;
             else
             {
-                // If the selected group has no control points, clear the tracked type.
-                // Otherwise the user will be unable to select a group with no control points.
-                if (selectedGroup.Value.ControlPoints.Count == 0)
-                    trackedType = null;
-                // If the selected group only has one control point, update the tracking type.
-                if (selectedGroup.Value.ControlPoints.Count == 1)
-                    trackedType = selectedGroup.Value?.ControlPoints.Single().GetType();
-                // If the selected group has more than one control point, choose the first as the tracking type
-                // if we don't already have a singular tracked type.
-                else if (trackedType == null)
-                    trackedType = selectedGroup.Value?.ControlPoints.FirstOrDefault()?.GetType();
+                switch (selectedGroup.Value.ControlPoints.Count)
+                {
+                    // If the selected group has no control points, clear the tracked type.
+                    // Otherwise the user will be unable to select a group with no control points.
+                    case 0:
+                        trackedType = null;
+                        break;
+
+                    // If the selected group only has one control point, update the tracking type.
+                    case 1:
+                        trackedType = selectedGroup.Value?.ControlPoints.Single().GetType();
+                        break;
+
+                    // If the selected group has more than one control point, choose the first as the tracking type
+                    // if we don't already have a singular tracked type.
+                    default:
+                        trackedType ??= selectedGroup.Value?.ControlPoints.FirstOrDefault()?.GetType();
+                        break;
+                }
             }
 
             if (trackedType != null)

From eb2460d18014d3a14d0b2001be69b1bc778cfd5e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:40:00 +0900
Subject: [PATCH 0234/2296] Remove dead metadata transfer code

---
 osu.Game/Beatmaps/BeatmapImporter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 6c3f393069..21a694b3ba 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -314,7 +314,6 @@ namespace osu.Game.Beatmaps
             return new BeatmapSetInfo
             {
                 OnlineID = beatmap.BeatmapInfo.BeatmapSet?.OnlineID ?? -1,
-                // Metadata = beatmap.Metadata,
                 DateAdded = dateAdded
             };
         }

From 864f1bdb3e6781dd8c947f517d830610c5a376b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:54:39 +0900
Subject: [PATCH 0235/2296] Move population of import time to the `Populate`
 method

Feels like a better place to be doing this. I think we want to keep any
kind of potentially expensive work in the `Populate` method.
---
 osu.Game/Beatmaps/BeatmapImporter.cs | 40 +++++++++++-----------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 21a694b3ba..7e82516bed 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -152,6 +152,8 @@ namespace osu.Game.Beatmaps
             if (archive != null)
                 beatmapSet.Beatmaps.AddRange(createBeatmapDifficulties(beatmapSet, realm));
 
+            beatmapSet.DateAdded = getDateAdded(archive);
+
             foreach (BeatmapInfo b in beatmapSet.Beatmaps)
             {
                 b.BeatmapSet = beatmapSet;
@@ -302,47 +304,37 @@ namespace osu.Game.Beatmaps
                 beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
             }
 
-            var dateAdded = DateTimeOffset.UtcNow;
-
-            // Apply proper date added for a beatmapset when importing from stable.
-            // Stable tracks said date using the filesystem last modified date on the .osu file.
-            if (reader is LegacyDirectoryArchiveReader legacyReader)
-            {
-                dateAdded = determineDateAdded(legacyReader);
-            }
-
             return new BeatmapSetInfo
             {
                 OnlineID = beatmap.BeatmapInfo.BeatmapSet?.OnlineID ?? -1,
-                DateAdded = dateAdded
             };
         }
 
         /// <summary>
-        /// Used for beatmapsets in legacy (stable) storage.
         /// Determine the date a given beatmapset has been added to the game.
-        /// The specific date is determined based on the oldest `.osu` file existing
-        /// in the beatmapset directory.
+        /// For legacy imports, we can use the oldest file write time for any `.osu` file in the directory.
+        /// For any other import types, use "now".
         /// </summary>
-        /// <param name="reader"></param>
-        /// <returns></returns>
-        private DateTimeOffset determineDateAdded(LegacyDirectoryArchiveReader reader)
+        private DateTimeOffset getDateAdded(ArchiveReader? reader)
         {
-            var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
+            DateTimeOffset dateAdded = DateTimeOffset.UtcNow;
 
-            var dateAdded = File.GetLastWriteTimeUtc(reader.GetPath(beatmaps.First()));
-
-            foreach (string beatmapName in beatmaps)
+            if (reader is LegacyDirectoryArchiveReader legacyReader)
             {
-                var currentDateAdded = File.GetLastWriteTimeUtc(reader.GetPath(beatmapName));
+                var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
 
-                if (currentDateAdded < dateAdded)
+                dateAdded = File.GetLastWriteTimeUtc(legacyReader.GetPath(beatmaps.First()));
+
+                foreach (string beatmapName in beatmaps)
                 {
-                    dateAdded = currentDateAdded;
+                    var currentDateAdded = File.GetLastWriteTimeUtc(legacyReader.GetPath(beatmapName));
+
+                    if (currentDateAdded < dateAdded)
+                        dateAdded = currentDateAdded;
                 }
             }
 
-            return new DateTimeOffset(dateAdded);
+            return dateAdded;
         }
 
         /// <summary>

From 5e0b89a1a862c20a938dc3b7d1e63be87e717ff9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 17:56:43 +0900
Subject: [PATCH 0236/2296] Rename `GetPath` to `GetFullPath` to better match
 expectations

---
 osu.Game/Beatmaps/BeatmapImporter.cs                 | 4 ++--
 osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 7e82516bed..14719da1bc 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -323,11 +323,11 @@ namespace osu.Game.Beatmaps
             {
                 var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
 
-                dateAdded = File.GetLastWriteTimeUtc(legacyReader.GetPath(beatmaps.First()));
+                dateAdded = File.GetLastWriteTimeUtc(legacyReader.GetFullPath(beatmaps.First()));
 
                 foreach (string beatmapName in beatmaps)
                 {
-                    var currentDateAdded = File.GetLastWriteTimeUtc(legacyReader.GetPath(beatmapName));
+                    var currentDateAdded = File.GetLastWriteTimeUtc(legacyReader.GetFullPath(beatmapName));
 
                     if (currentDateAdded < dateAdded)
                         dateAdded = currentDateAdded;
diff --git a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
index 8a576e33d8..1503705022 100644
--- a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
+++ b/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
@@ -21,9 +21,9 @@ namespace osu.Game.IO.Archives
             this.path = Path.GetFullPath(path);
         }
 
-        public override Stream GetStream(string name) => File.OpenRead(GetPath(name));
+        public override Stream GetStream(string name) => File.OpenRead(GetFullPath(name));
 
-        public string GetPath(string name) => Path.Combine(path, name);
+        public string GetFullPath(string filename) => Path.Combine(path, filename);
 
         public override void Dispose()
         {

From 80a143ae85cd2e2b53213c891c6521b8457cd7a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Aug 2023 18:00:33 +0900
Subject: [PATCH 0237/2296] Tidy up test a bit more

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

diff --git a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
index d6056fa71b..0144c0bf97 100644
--- a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Platform;
@@ -74,7 +75,7 @@ namespace osu.Game.Tests.Database
                     var stableStorage = new StableStorage(tmpStorage.GetFullPath(""), host);
                     var songsStorage = stableStorage.GetStorageForDirectory(StableStorage.STABLE_DEFAULT_SONGS_PATH);
 
-                    System.IO.Compression.ZipFile.ExtractToDirectory(TestResources.GetQuickTestBeatmapForImport(), songsStorage.GetFullPath("renatus"));
+                    ZipFile.ExtractToDirectory(TestResources.GetQuickTestBeatmapForImport(), songsStorage.GetFullPath("renatus"));
 
                     string[] beatmaps = Directory.GetFiles(songsStorage.GetFullPath("renatus"), "*.osu", SearchOption.TopDirectoryOnly);
 
@@ -82,10 +83,10 @@ namespace osu.Game.Tests.Database
 
                     await new LegacyBeatmapImporter(new BeatmapImporter(storage, realm)).ImportFromStableAsync(stableStorage);
 
-                    var beatmapset = realm.Realm.All<BeatmapSetInfo>().First();
+                    var importedSet = realm.Realm.All<BeatmapSetInfo>().Single();
 
-                    Assert.NotNull(beatmapset);
-                    Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1, 12, 0, 0, DateTimeKind.Utc)), beatmapset.DateAdded);
+                    Assert.NotNull(importedSet);
+                    Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1, 12, 0, 0, DateTimeKind.Utc)), importedSet.DateAdded);
                 }
             });
         }

From a2fd7707a16bccb055dd25997644173198851633 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Aug 2023 20:38:17 +0900
Subject: [PATCH 0238/2296] Allow toggling SVs in the editor

---
 .../UI/DrawableCatchRuleset.cs                |  3 +-
 .../Skinning/ManiaSkinnableTestScene.cs       |  2 +-
 .../Edit/DrawableManiaEditorRuleset.cs        | 17 ++++++-
 .../Edit/ManiaHitObjectComposer.cs            | 28 +++++++++-
 .../Mods/ManiaModConstantSpeed.cs             |  2 +-
 .../UI/DrawableManiaRuleset.cs                | 17 ++-----
 .../UI/DrawableTaikoRuleset.cs                |  3 +-
 .../TestSceneDrawableScrollingRuleset.cs      |  3 +-
 .../UI/Scrolling/DrawableScrollingRuleset.cs  | 51 ++++++++++++-------
 .../Rulesets/UI/Scrolling/IScrollingInfo.cs   |  4 +-
 .../Scrolling/ScrollingHitObjectContainer.cs  | 14 +++--
 .../TernaryButtons/DrawableTernaryButton.cs   |  2 +-
 .../Tests/Visual/ScrollingTestContainer.cs    |  2 +-
 13 files changed, 98 insertions(+), 50 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index 7930a07551..f0a327d7ac 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public partial class DrawableCatchRuleset : DrawableScrollingRuleset<CatchHitObject>
     {
-        protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Constant;
-
         protected override bool UserScrollSpeedAdjustment => false;
 
         public DrawableCatchRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods = null)
@@ -30,6 +28,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             Direction.Value = ScrollingDirection.Down;
             TimeRange.Value = GetTimeRange(beatmap.Difficulty.ApproachRate);
+            VisualisationMethod = ScrollVisualisationMethod.Constant;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index ba0c97a121..abf01aa4a4 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 
             IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
             IBindable<double> IScrollingInfo.TimeRange { get; } = new Bindable<double>(5000);
-            IScrollAlgorithm IScrollingInfo.Algorithm { get; } = new ConstantScrollAlgorithm();
+            IBindable<IScrollAlgorithm> IScrollingInfo.Algorithm { get; } = new Bindable<IScrollAlgorithm>(new ConstantScrollAlgorithm());
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index dadd725a2f..013dd3dcbd 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osuTK;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -15,12 +17,25 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public partial class DrawableManiaEditorRuleset : DrawableManiaRuleset
     {
+        public readonly IBindable<TernaryState> ShowSpeedChanges = new Bindable<TernaryState>();
+
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
         public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods)
             : base(ruleset, beatmap, mods)
         {
-            ScrollMethod = ScrollVisualisationMethod.Constant;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ShowSpeedChanges.BindValueChanged(state =>
+            {
+                VisualisationMethod = state.NewValue == TernaryState.True
+                    ? ScrollVisualisationMethod.Sequential
+                    : ScrollVisualisationMethod.Constant;
+            }, true);
         }
 
         protected override Playfield CreatePlayfield() => new ManiaEditorPlayfield(Beatmap.Stages)
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 5e577a2964..44e238efac 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -6,8 +6,13 @@
 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.Input;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Objects;
@@ -16,6 +21,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
@@ -23,6 +29,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public partial class ManiaHitObjectComposer : HitObjectComposer<ManiaHitObject>
     {
+        private readonly Bindable<TernaryState> showSpeedChanges = new Bindable<TernaryState>();
+
         private DrawableManiaEditorRuleset drawableRuleset;
         private ManiaBeatSnapGrid beatSnapGrid;
         private InputManager inputManager;
@@ -36,6 +44,21 @@ namespace osu.Game.Rulesets.Mania.Edit
         private void load()
         {
             AddInternal(beatSnapGrid = new ManiaBeatSnapGrid());
+
+            LeftToolbox.Add(new EditorToolboxGroup("playfield")
+            {
+                Child = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0, 5),
+                    Children = new[]
+                    {
+                        new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
+                    }
+                },
+            });
         }
 
         protected override void LoadComplete()
@@ -59,7 +82,10 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
-            drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods);
+            drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods)
+            {
+                ShowSpeedChanges = { BindTarget = showSpeedChanges }
+            };
 
             // This is the earliest we can cache the scrolling info to ourselves, before masks are added to the hierarchy and inject it
             dependencies.CacheAs(drawableRuleset.ScrollingInfo);
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
index 66269f5572..d8e6bcd424 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {
             var maniaRuleset = (DrawableManiaRuleset)drawableRuleset;
-            maniaRuleset.ScrollMethod = ScrollVisualisationMethod.Constant;
+            maniaRuleset.VisualisationMethod = ScrollVisualisationMethod.Constant;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 2d373c0471..eb99434e04 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -52,22 +51,12 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
-        public ScrollVisualisationMethod ScrollMethod
+        public new ScrollVisualisationMethod VisualisationMethod
         {
-            get => scrollMethod;
-            set
-            {
-                if (IsLoaded)
-                    throw new InvalidOperationException($"Can't alter {nameof(ScrollMethod)} after ruleset is already loaded");
-
-                scrollMethod = value;
-            }
+            get => base.VisualisationMethod;
+            set => base.VisualisationMethod = value;
         }
 
-        private ScrollVisualisationMethod scrollMethod = ScrollVisualisationMethod.Sequential;
-
-        protected override ScrollVisualisationMethod VisualisationMethod => scrollMethod;
-
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
         private readonly BindableInt configScrollSpeed = new BindableInt();
         private double smoothTimeRange;
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 64d406a308..979e03f201 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public new TaikoInputManager KeyBindingInputManager => (TaikoInputManager)base.KeyBindingInputManager;
 
-        protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Overlapping;
-
         protected override bool UserScrollSpeedAdjustment => false;
 
         private SkinnableDrawable scroller;
@@ -45,6 +43,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             : base(ruleset, beatmap, mods)
         {
             Direction.Value = ScrollingDirection.Left;
+            VisualisationMethod = ScrollVisualisationMethod.Overlapping;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 287b7d43b4..4c898feb48 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -311,14 +311,13 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             protected override bool RelativeScaleBeatLengths => RelativeScaleBeatLengthsOverride;
 
-            protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Overlapping;
-
             public new Bindable<double> TimeRange => base.TimeRange;
 
             public TestDrawableScrollingRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
                 : base(ruleset, beatmap, mods)
             {
                 TimeRange.Value = time_range;
+                VisualisationMethod = ScrollVisualisationMethod.Overlapping;
             }
 
             public override DrawableHitObject<TestHitObject> CreateDrawableRepresentation(TestHitObject h)
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index 4c7564b791..d082d26792 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -64,8 +64,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
             MaxValue = time_span_max
         };
 
-        protected virtual ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Sequential;
-
         ScrollVisualisationMethod IDrawableScrollingRuleset.VisualisationMethod => VisualisationMethod;
 
         /// <summary>
@@ -99,20 +97,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         [BackgroundDependencyLoader]
         private void load()
         {
-            switch (VisualisationMethod)
-            {
-                case ScrollVisualisationMethod.Sequential:
-                    scrollingInfo.Algorithm = new SequentialScrollAlgorithm(ControlPoints);
-                    break;
-
-                case ScrollVisualisationMethod.Overlapping:
-                    scrollingInfo.Algorithm = new OverlappingScrollAlgorithm(ControlPoints);
-                    break;
-
-                case ScrollVisualisationMethod.Constant:
-                    scrollingInfo.Algorithm = new ConstantScrollAlgorithm();
-                    break;
-            }
+            updateScrollAlgorithm();
 
             double lastObjectTime = Beatmap.HitObjects.Any() ? Beatmap.GetLastObjectTime() : double.MaxValue;
             double baseBeatLength = TimingControlPoint.DEFAULT_BEAT_LENGTH;
@@ -178,6 +163,36 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 throw new ArgumentException($"{nameof(Playfield)} must be a {nameof(ScrollingPlayfield)} when using {nameof(DrawableScrollingRuleset<TObject>)}.");
         }
 
+        private ScrollVisualisationMethod visualisationMethod = ScrollVisualisationMethod.Sequential;
+
+        protected ScrollVisualisationMethod VisualisationMethod
+        {
+            get => visualisationMethod;
+            set
+            {
+                visualisationMethod = value;
+                updateScrollAlgorithm();
+            }
+        }
+
+        private void updateScrollAlgorithm()
+        {
+            switch (VisualisationMethod)
+            {
+                case ScrollVisualisationMethod.Sequential:
+                    scrollingInfo.Algorithm.Value = new SequentialScrollAlgorithm(ControlPoints);
+                    break;
+
+                case ScrollVisualisationMethod.Overlapping:
+                    scrollingInfo.Algorithm.Value = new OverlappingScrollAlgorithm(ControlPoints);
+                    break;
+
+                case ScrollVisualisationMethod.Constant:
+                    scrollingInfo.Algorithm.Value = new ConstantScrollAlgorithm();
+                    break;
+            }
+        }
+
         /// <summary>
         /// Adjusts the scroll speed of <see cref="HitObject"/>s.
         /// </summary>
@@ -217,7 +232,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             public IBindable<double> TimeRange { get; } = new BindableDouble();
 
-            public IScrollAlgorithm Algorithm { get; set; }
+            public readonly Bindable<IScrollAlgorithm> Algorithm = new Bindable<IScrollAlgorithm>(new ConstantScrollAlgorithm());
+
+            IBindable<IScrollAlgorithm> IScrollingInfo.Algorithm => Algorithm;
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs b/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs
index cd85932599..4a79c1a447 100644
--- a/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/IScrollingInfo.cs
@@ -15,13 +15,13 @@ namespace osu.Game.Rulesets.UI.Scrolling
         IBindable<ScrollingDirection> Direction { get; }
 
         /// <summary>
-        ///
+        /// The span of time that is visible by the length of the scrolling axes.
         /// </summary>
         IBindable<double> TimeRange { get; }
 
         /// <summary>
         /// The algorithm which controls <see cref="HitObject"/> positions and sizes.
         /// </summary>
-        IScrollAlgorithm Algorithm { get; }
+        IBindable<IScrollAlgorithm> Algorithm { get; }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index b93a427196..129918da14 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -13,6 +13,7 @@ using osu.Framework.Layout;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI.Scrolling
@@ -21,6 +22,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
     {
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        private readonly IBindable<IScrollAlgorithm> algorithm = new Bindable<IScrollAlgorithm>();
 
         /// <summary>
         /// Whether the scrolling direction is horizontal or vertical.
@@ -59,9 +61,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             direction.BindTo(scrollingInfo.Direction);
             timeRange.BindTo(scrollingInfo.TimeRange);
+            algorithm.BindTo(scrollingInfo.Algorithm);
 
             direction.ValueChanged += _ => layoutCache.Invalidate();
             timeRange.ValueChanged += _ => layoutCache.Invalidate();
+            algorithm.ValueChanged += _ => layoutCache.Invalidate();
         }
 
         /// <summary>
@@ -73,7 +77,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         public double TimeAtPosition(float localPosition, double currentTime)
         {
             float scrollPosition = axisInverted ? -localPosition : localPosition;
-            return scrollingInfo.Algorithm.TimeAt(scrollPosition, currentTime, timeRange.Value, scrollLength);
+            return algorithm.Value.TimeAt(scrollPosition, currentTime, timeRange.Value, scrollLength);
         }
 
         /// <summary>
@@ -95,7 +99,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// </summary>
         public float PositionAtTime(double time, double currentTime, double? originTime = null)
         {
-            float scrollPosition = scrollingInfo.Algorithm.PositionAt(time, currentTime, timeRange.Value, scrollLength, originTime);
+            float scrollPosition = algorithm.Value.PositionAt(time, currentTime, timeRange.Value, scrollLength, originTime);
             return axisInverted ? -scrollPosition : scrollPosition;
         }
 
@@ -122,7 +126,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// </summary>
         public float LengthAtTime(double startTime, double endTime)
         {
-            return scrollingInfo.Algorithm.GetLength(startTime, endTime, timeRange.Value, scrollLength);
+            return algorithm.Value.GetLength(startTime, endTime, timeRange.Value, scrollLength);
         }
 
         private float scrollLength => scrollingAxis == Direction.Horizontal ? DrawWidth : DrawHeight;
@@ -169,7 +173,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
             foreach (var entry in Entries)
                 setComputedLifetimeStart(entry);
 
-            scrollingInfo.Algorithm.Reset();
+            algorithm.Value.Reset();
 
             layoutCache.Validate();
         }
@@ -224,7 +228,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
 
-            return scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
+            return algorithm.Value.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
         }
 
         private void setComputedLifetimeStart(HitObjectLifetimeEntry entry)
diff --git a/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs b/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
index 873551db77..95d5dd36d8 100644
--- a/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
+++ b/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
@@ -14,7 +14,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.TernaryButtons
 {
-    internal partial class DrawableTernaryButton : OsuButton
+    public partial class DrawableTernaryButton : OsuButton
     {
         private Color4 defaultBackgroundColour;
         private Color4 defaultIconColour;
diff --git a/osu.Game/Tests/Visual/ScrollingTestContainer.cs b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
index b8b39e16b5..bce4299688 100644
--- a/osu.Game/Tests/Visual/ScrollingTestContainer.cs
+++ b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual
             IBindable<double> IScrollingInfo.TimeRange => TimeRange;
 
             public readonly TestScrollAlgorithm Algorithm = new TestScrollAlgorithm();
-            IScrollAlgorithm IScrollingInfo.Algorithm => Algorithm;
+            IBindable<IScrollAlgorithm> IScrollingInfo.Algorithm => new Bindable<IScrollAlgorithm>(Algorithm);
         }
 
         public class TestScrollAlgorithm : IScrollAlgorithm

From ff07fbae150998b2da9fb64c07e374ce2036c48d Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 18 Aug 2023 12:20:40 +0200
Subject: [PATCH 0239/2296] fix GetSegmentEnds

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 028f8b6839..e6d5949d7c 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -40,11 +40,13 @@ namespace osu.Game.Rulesets.Objects
 
         private readonly List<Vector2> calculatedPath = new List<Vector2>();
         private readonly List<double> cumulativeLength = new List<double>();
-        private readonly List<int> segmentEnds = new List<int>();
         private readonly Cached pathCache = new Cached();
 
         private double calculatedLength;
 
+        private readonly List<int> segmentEnds = new List<int>();
+        private double[] segmentEndDistances = Array.Empty<double>();
+
         /// <summary>
         /// Creates a new <see cref="SliderPath"/>.
         /// </summary>
@@ -202,7 +204,7 @@ namespace osu.Game.Rulesets.Objects
         {
             ensureValid();
 
-            return segmentEnds.Select(i => cumulativeLength[i] / calculatedLength);
+            return segmentEndDistances.Select(d => d / Distance);
         }
 
         private void invalidate()
@@ -251,8 +253,9 @@ namespace osu.Game.Rulesets.Objects
                         calculatedPath.Add(t);
                 }
 
-                // Remember the index of the segment end
-                segmentEnds.Add(calculatedPath.Count - 1);
+                if (i > 0)
+                    // Remember the index of the segment end
+                    segmentEnds.Add(calculatedPath.Count - 1);
 
                 // Start the new segment at the current vertex
                 start = i;
@@ -298,6 +301,14 @@ namespace osu.Game.Rulesets.Objects
                 cumulativeLength.Add(calculatedLength);
             }
 
+            // Store the distances of the segment ends now, because after shortening the indices may be out of range
+            segmentEndDistances = new double[segmentEnds.Count];
+
+            for (int i = 0; i < segmentEnds.Count; i++)
+            {
+                segmentEndDistances[i] = cumulativeLength[segmentEnds[i]];
+            }
+
             if (ExpectedDistance.Value is double expectedDistance && calculatedLength != expectedDistance)
             {
                 // In osu-stable, if the last two control points of a slider are equal, extension is not performed.
@@ -319,10 +330,6 @@ namespace osu.Game.Rulesets.Objects
                     {
                         cumulativeLength.RemoveAt(cumulativeLength.Count - 1);
                         calculatedPath.RemoveAt(pathEndIndex--);
-
-                        // Shorten the last segment to the expected distance
-                        if (segmentEnds.Count > 0)
-                            segmentEnds[^1]--;
                     }
                 }
 

From fbf4d3ac81c5d377670c45beb815306281cf660d Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Fri, 18 Aug 2023 12:36:34 +0200
Subject: [PATCH 0240/2296] Add test

---
 .../Visual/Gameplay/TestSceneSliderPath.cs    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
index dfa9fdf03b..4a2794c14f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
@@ -185,6 +185,34 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("shorten to -10 length", () => path.ExpectedDistance.Value = -10);
         }
 
+        [Test]
+        public void TestGetSegmentEnds()
+        {
+            var positions = new[]
+            {
+                Vector2.Zero,
+                new Vector2(100, 0),
+                new Vector2(100),
+                new Vector2(200, 100),
+            };
+            double[] distances = { 100d, 200d, 300d };
+
+            AddStep("create path", () => path.ControlPoints.AddRange(positions.Select(p => new PathControlPoint(p, PathType.Linear))));
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 300)));
+            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(positions.Skip(1)));
+            AddStep("lengthen last segment", () => path.ExpectedDistance.Value = 400);
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 400)));
+            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(positions.Skip(1)));
+            AddStep("shorten last segment", () => path.ExpectedDistance.Value = 150);
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 150)));
+            AddAssert("segment end positions not recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(new[]
+            {
+                positions[1],
+                new Vector2(100, 50),
+                new Vector2(100, 50),
+            }));
+        }
+
         private List<PathControlPoint> createSegment(PathType type, params Vector2[] controlPoints)
         {
             var points = controlPoints.Select(p => new PathControlPoint { Position = p }).ToList();

From 8d84ea3712cc6e38fdc80a24a5c4a53e078518fb Mon Sep 17 00:00:00 2001
From: FreezyLemon <contact@freezylemon.com>
Date: Fri, 18 Aug 2023 21:05:12 +0200
Subject: [PATCH 0241/2296] Allow "none" value in LastYearPlacing

This "none" value (zero) will be the default value for
any new team and will display as "N/A" in the SeedingScreen.
---
 osu.Game.Tournament/Models/TournamentTeam.cs           | 2 +-
 osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 5df8c2a620..ae0ac77936 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tournament.Models
 
         public Bindable<int> LastYearPlacing = new BindableInt
         {
-            MinValue = 1,
+            MinValue = 0,
             MaxValue = 256
         };
 
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index 120a76c127..899d462e4e 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -274,7 +274,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                             new TeamDisplay(team) { Margin = new MarginPadding { Bottom = 30 } },
                             new RowDisplay("Average Rank:", $"#{team.AverageRank:#,0}"),
                             new RowDisplay("Seed:", team.Seed.Value),
-                            new RowDisplay("Last year's placing:", team.LastYearPlacing.Value > 0 ? $"#{team.LastYearPlacing:#,0}" : "0"),
+                            new RowDisplay("Last year's placing:", team.LastYearPlacing.Value > 0 ? $"#{team.LastYearPlacing:#,0}" : "N/A"),
                             new Container { Margin = new MarginPadding { Bottom = 30 } },
                         }
                     },

From 0e691d5935255c58ac04ea35de99e3ebe6096f76 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sat, 19 Aug 2023 00:16:05 +0200
Subject: [PATCH 0242/2296] Revert changes in `SliderPath`

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 171298e6c0..028f8b6839 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Objects
         {
             ensureValid();
 
-            return segmentEnds.Select(i => cumulativeLength[i] / Distance);
+            return segmentEnds.Select(i => cumulativeLength[i] / calculatedLength);
         }
 
         private void invalidate()
@@ -251,9 +251,8 @@ namespace osu.Game.Rulesets.Objects
                         calculatedPath.Add(t);
                 }
 
-                if (i > 0)
-                    // Remember the index of the segment end
-                    segmentEnds.Add(calculatedPath.Count - 1);
+                // Remember the index of the segment end
+                segmentEnds.Add(calculatedPath.Count - 1);
 
                 // Start the new segment at the current vertex
                 start = i;
@@ -315,11 +314,15 @@ namespace osu.Game.Rulesets.Objects
 
                 if (calculatedLength > expectedDistance)
                 {
-                    // The path will be shortened further, in which case we should trim any more unnecessary lengths
+                    // The path will be shortened further, in which case we should trim any more unnecessary lengths and their associated path segments
                     while (cumulativeLength.Count > 0 && cumulativeLength[^1] >= expectedDistance)
                     {
                         cumulativeLength.RemoveAt(cumulativeLength.Count - 1);
                         calculatedPath.RemoveAt(pathEndIndex--);
+
+                        // Shorten the last segment to the expected distance
+                        if (segmentEnds.Count > 0)
+                            segmentEnds[^1]--;
                     }
                 }
 
@@ -336,12 +339,6 @@ namespace osu.Game.Rulesets.Objects
 
                 calculatedPath[pathEndIndex] = calculatedPath[pathEndIndex - 1] + dir * (float)(expectedDistance - cumulativeLength[^1]);
                 cumulativeLength.Add(expectedDistance);
-
-                // Shorten the segments to the expected distance
-                for (int i = 0; i < segmentEnds.Count; i++)
-                {
-                    segmentEnds[i] = Math.Min(segmentEnds[i], cumulativeLength.Count - 1);
-                }
             }
         }
 

From 44a85139e483adc31709dd13dde0b671c65dd804 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sat, 19 Aug 2023 02:40:18 +0200
Subject: [PATCH 0243/2296] Update `Reverse()` based on the changes in #24581

---
 .../Rulesets/Objects/SliderPathExtensions.cs  | 54 ++++---------------
 1 file changed, 10 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 58ce20cd32..6c88f01249 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -32,47 +31,32 @@ namespace osu.Game.Rulesets.Objects
 
             var inheritedLinearPoints = controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.Linear && p.Type is null).ToList();
 
-            if (controlPoints[0].Type == null)
-            {
-                inheritedLinearPoints.Add(controlPoints[0]);
-            }
-
             // Inherited points after a linear point, as well as the first control point if it inherited,
             // should be treated as linear points, so their types are temporarily changed to linear.
             inheritedLinearPoints.ForEach(p => p.Type = PathType.Linear);
 
             double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
-            double[] distinctSegmentEnds = truncateEndingDuplicates(segmentEnds);
 
-            // Remove control points at the end which do not affect the visual slider path ("invisible" control points).
-            if (segmentEnds.Length >= 2 && Precision.AlmostEquals(segmentEnds[^1], segmentEnds[^2]) && distinctSegmentEnds.Length > 0)
+            // Remove segments after the end of the slider.
+            for (int numSegmentsToRemove = segmentEnds.Count(se => se >= 1) - 1; numSegmentsToRemove > 0 && controlPoints.Count > 0;)
             {
-                int numVisibleSegments = distinctSegmentEnds.Length - 1;
-                var nonInheritedControlPoints = controlPoints.Where(p => p.Type is not null).ToList();
-
-                int lastVisibleControlPointIndex = controlPoints.IndexOf(nonInheritedControlPoints[numVisibleSegments]);
-
-                // Make sure to include all inherited control points directly after the last visible non-inherited control point.
-                while (lastVisibleControlPointIndex + 1 < controlPoints.Count)
+                if (controlPoints.Last().Type is not null)
                 {
-                    lastVisibleControlPointIndex++;
-
-                    if (controlPoints[lastVisibleControlPointIndex].Type is not null)
-                        break;
+                    numSegmentsToRemove--;
+                    segmentEnds = segmentEnds[..^1];
                 }
 
-                // Remove all control points after the first invisible non-inherited control point.
-                controlPoints.RemoveRange(lastVisibleControlPointIndex + 1, controlPoints.Count - lastVisibleControlPointIndex - 1);
+                controlPoints.RemoveAt(controlPoints.Count - 1);
             }
 
             // Restore original control point types.
             inheritedLinearPoints.ForEach(p => p.Type = null);
 
-            // Recalculate perfect curve at the end of the slider path.
-            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && distinctSegmentEnds.Length > 0)
+            // Recalculate middle perfect curve control points at the end of the slider path.
+            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && segmentEnds.Any())
             {
-                double lastSegmentStart = distinctSegmentEnds.Length > 1 ? distinctSegmentEnds[^2] : 0;
-                double lastSegmentEnd = distinctSegmentEnds[^1];
+                double lastSegmentStart = segmentEnds.Length > 1 ? segmentEnds[^2] : 0;
+                double lastSegmentEnd = segmentEnds[^1];
 
                 var circleArcPath = new List<Vector2>();
                 sliderPath.GetPathToProgress(circleArcPath, lastSegmentStart / lastSegmentEnd, 1);
@@ -83,24 +67,6 @@ namespace osu.Game.Rulesets.Objects
             sliderPath.reverseControlPoints(out positionalOffset);
         }
 
-        /// <summary>
-        /// Keeps removing the last element of the provided array until the last two elements are not equal.
-        /// </summary>
-        /// <param name="arr">The array to truncate.</param>
-        /// <returns>The truncated array.</returns>
-        private static double[] truncateEndingDuplicates(double[] arr)
-        {
-            if (arr.Length < 2)
-                return arr;
-
-            var result = arr.ToList();
-
-            while (result.Count > 1 && Precision.AlmostEquals(result[^1], result[^2]))
-                result.RemoveAt(result.Count - 1);
-
-            return result.ToArray();
-        }
-
         /// <summary>
         /// Reverses the order of the provided <see cref="SliderPath"/>'s <see cref="PathControlPoint"/>s.
         /// </summary>

From 548e6dc23b68f1941829890fc17d18be49855d94 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Sat, 19 Aug 2023 03:04:09 +0200
Subject: [PATCH 0244/2296] feat(MessageNotifier): flash window on PM or
 mention

---
 osu.Game/Online/Chat/MessageNotifier.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index 65aac723da..b91cf06847 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -127,6 +127,8 @@ namespace osu.Game.Online.Chat
             if (!notifyOnPrivateMessage.Value || channel.Type != ChannelType.PM)
                 return false;
 
+            (host as DesktopGameHost)?.FlashWindow();
+
             notifications.Post(new PrivateMessageNotification(message, channel));
             return true;
         }
@@ -135,6 +137,8 @@ namespace osu.Game.Online.Chat
         {
             if (!notifyOnUsername.Value || !CheckContainsUsername(message.Content, localUser.Value.Username)) return;
 
+            (host as DesktopGameHost)?.FlashWindow();
+
             notifications.Post(new MentionNotification(message, channel));
         }
 

From 2b0959482356e0bf5e0774c263747529b0b88f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Aug 2023 14:33:26 +0200
Subject: [PATCH 0245/2296] Use nunit constraints in test for better debug
 experience

---
 .../Visual/Gameplay/TestSceneSliderPath.cs         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
index 4a2794c14f..16e4ae13d9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
@@ -198,14 +198,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             double[] distances = { 100d, 200d, 300d };
 
             AddStep("create path", () => path.ControlPoints.AddRange(positions.Select(p => new PathControlPoint(p, PathType.Linear))));
-            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 300)));
-            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(positions.Skip(1)));
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds(), () => Is.EqualTo(distances.Select(d => d / 300)));
+            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)), () => Is.EqualTo(positions.Skip(1)));
+
             AddStep("lengthen last segment", () => path.ExpectedDistance.Value = 400);
-            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 400)));
-            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(positions.Skip(1)));
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds(), () => Is.EqualTo(distances.Select(d => d / 400)));
+            AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)), () => Is.EqualTo(positions.Skip(1)));
+
             AddStep("shorten last segment", () => path.ExpectedDistance.Value = 150);
-            AddAssert("segment ends are correct", () => path.GetSegmentEnds().SequenceEqual(distances.Select(d => d / 150)));
-            AddAssert("segment end positions not recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)).SequenceEqual(new[]
+            AddAssert("segment ends are correct", () => path.GetSegmentEnds(), () => Is.EqualTo(distances.Select(d => d / 150)));
+            AddAssert("segment end positions not recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)), () => Is.EqualTo(new[]
             {
                 positions[1],
                 new Vector2(100, 50),

From 0a55830c16c8adfcd29b3dd931cc806d64cd2e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Aug 2023 14:34:20 +0200
Subject: [PATCH 0246/2296] Add braces for clarification

I like no-braces for single-line ifs as much as anyone, but with inline
comments involved it gets rather dicey.
---
 osu.Game/Rulesets/Objects/SliderPath.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index e6d5949d7c..12fd45257a 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -254,8 +254,10 @@ namespace osu.Game.Rulesets.Objects
                 }
 
                 if (i > 0)
+                {
                     // Remember the index of the segment end
                     segmentEnds.Add(calculatedPath.Count - 1);
+                }
 
                 // Start the new segment at the current vertex
                 start = i;

From 3d52a1267e722596ec9438a55df9d5e49643b3e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Aug 2023 15:08:30 +0200
Subject: [PATCH 0247/2296] Fix test failures via test-local popover containers

---
 .../Editor/TestSceneOsuDistanceSnapGrid.cs                   | 5 +++--
 .../Editing/TestSceneHitObjectComposerDistanceSnapping.cs    | 3 ++-
 osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index 0c064ecfa6..9338d5453d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -9,6 +9,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
@@ -70,12 +71,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             base.Content.Children = new Drawable[]
             {
                 editorClock = new EditorClock(editorBeatmap),
-                snapProvider,
+                new PopoverContainer { Child = snapProvider },
                 Content
             };
         }
 
-        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+        protected override Container<Drawable> Content { get; } = new PopoverContainer { RelativeSizeAxes = Axes.Both };
 
         [SetUp]
         public void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 6399507aa0..e30caac95e 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps.ControlPoints;
@@ -29,7 +30,7 @@ namespace osu.Game.Tests.Editing
         [Cached(typeof(IBeatSnapProvider))]
         private readonly EditorBeatmap editorBeatmap;
 
-        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+        protected override Container<Drawable> Content { get; } = new PopoverContainer { RelativeSizeAxes = Axes.Both };
 
         public TestSceneHitObjectComposerDistanceSnapping()
         {
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
index a38c481003..ed3bffe5c2 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -178,7 +178,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("distance spacing increased by 0.5", () => editorBeatmap.BeatmapInfo.DistanceSpacing == originalSpacing + 0.5);
         }
 
-        public partial class EditorBeatmapContainer : Container
+        public partial class EditorBeatmapContainer : PopoverContainer
         {
             private readonly IWorkingBeatmap working;
 

From 3c191ff9ea5a35f507fb85d32b44b73c37b489ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Aug 2023 15:09:59 +0200
Subject: [PATCH 0248/2296] Expand allowable rotation range to [-360, 360]

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

diff --git a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
index 86112d9751..f09d6b78e6 100644
--- a/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
+++ b/osu.Game.Rulesets.Osu/Edit/PreciseRotationPopover.cs
@@ -45,8 +45,8 @@ namespace osu.Game.Rulesets.Osu.Edit
                     {
                         Current = new BindableNumber<float>
                         {
-                            MinValue = -180,
-                            MaxValue = 180,
+                            MinValue = -360,
+                            MaxValue = 360,
                             Precision = 1
                         },
                         Instantaneous = true

From 56b1062c2f441773e8097403491b3f9601178543 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sat, 19 Aug 2023 19:39:29 +0200
Subject: [PATCH 0249/2296] expand xmldoc

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 12fd45257a..1c02b18a0f 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -198,8 +198,16 @@ namespace osu.Game.Rulesets.Objects
         }
 
         /// <summary>
-        /// Returns the progress values at which segments of the path end.
+        /// Returns the progress values at which (control point) segments of the path end.
+        /// Ranges from 0 (beginning of the path) to 1 (end of the path) to infinity (beyond the end of the path).
         /// </summary>
+        /// <example>In case <see cref="Distance"/> is less than <see cref="CalculatedDistance"/>,
+        /// the last segment ends after the end of the path, hence it returns a value greater than 1.
+        /// <para/>
+        /// In case <see cref="Distance"/> is greater than <see cref="CalculatedDistance"/>,
+        /// the last segment ends before the end of the path, hence it returns a value less than 1.</example>
+        /// <remarks><see cref="PositionAt"/> truncates the progression values to [0,1],
+        /// so you can't use this method to retrieve the positions of segment ends beyond the end of the path.</remarks>
         public IEnumerable<double> GetSegmentEnds()
         {
             ensureValid();

From d2798c7a1ca1d9c79438fd8319662b5aba098c4e Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Sun, 20 Aug 2023 17:55:19 +0200
Subject: [PATCH 0250/2296] don't allow negative scaling

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 72216f040e..a952cf3035 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -71,6 +71,9 @@ namespace osu.Game.Overlays.SkinEditor
                     scale.Y = scale.X / selectionRect.Width * selectionRect.Height;
             }
 
+            // If scaling reverses the selection, don't scale.
+            if (adjustedRect.Width + scale.X < 0 || adjustedRect.Height + scale.Y < 0) return true;
+
             if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
             if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
 
@@ -79,8 +82,8 @@ namespace osu.Game.Overlays.SkinEditor
 
             // scale adjust applied to each individual item should match that of the quad itself.
             var scaledDelta = new Vector2(
-                MathF.Max(adjustedRect.Width / selectionRect.Width, 0),
-                MathF.Max(adjustedRect.Height / selectionRect.Height, 0)
+                adjustedRect.Width / selectionRect.Width,
+                adjustedRect.Height / selectionRect.Height
             );
 
             foreach (var b in SelectedBlueprints)

From 249dcc2ced2e14eca2938fbd48362518edefd691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Aug 2023 23:36:07 +0200
Subject: [PATCH 0251/2296] Bump Android target SDK version to 33

---
 osu.Android/AndroidManifest.xml                           | 2 +-
 osu.Game.Rulesets.Catch.Tests.Android/AndroidManifest.xml | 2 +-
 osu.Game.Rulesets.Mania.Tests.Android/AndroidManifest.xml | 2 +-
 osu.Game.Rulesets.Osu.Tests.Android/AndroidManifest.xml   | 2 +-
 osu.Game.Rulesets.Taiko.Tests.Android/AndroidManifest.xml | 2 +-
 osu.Game.Tests.Android/AndroidManifest.xml                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Android/AndroidManifest.xml b/osu.Android/AndroidManifest.xml
index bc2f49b1a9..fb54c8e151 100644
--- a/osu.Android/AndroidManifest.xml
+++ b/osu.Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="sh.ppy.osulazer" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!" android:icon="@drawable/lazer" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests.Android/AndroidManifest.xml b/osu.Game.Rulesets.Catch.Tests.Android/AndroidManifest.xml
index bf7c0bfeca..52b34959b9 100644
--- a/osu.Game.Rulesets.Catch.Tests.Android/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Catch.Tests.Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- using a different name because package name cannot contain 'catch' -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Catch_Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!catch Test" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests.Android/AndroidManifest.xml b/osu.Game.Rulesets.Mania.Tests.Android/AndroidManifest.xml
index 4a1545a423..f5a49210ea 100644
--- a/osu.Game.Rulesets.Mania.Tests.Android/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Mania.Tests.Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Mania.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!mania Test" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests.Android/AndroidManifest.xml b/osu.Game.Rulesets.Osu.Tests.Android/AndroidManifest.xml
index 45d27dda70..ed4725dd94 100644
--- a/osu.Game.Rulesets.Osu.Tests.Android/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Osu.Tests.Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Osu.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!standard Test" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/AndroidManifest.xml b/osu.Game.Rulesets.Taiko.Tests.Android/AndroidManifest.xml
index 452b9683ec..cc88d3080a 100644
--- a/osu.Game.Rulesets.Taiko.Tests.Android/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Taiko.Tests.Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Taiko.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!taiko Test" />
 </manifest>
\ No newline at end of file
diff --git a/osu.Game.Tests.Android/AndroidManifest.xml b/osu.Game.Tests.Android/AndroidManifest.xml
index f25b2e5328..6f91fb928c 100644
--- a/osu.Game.Tests.Android/AndroidManifest.xml
+++ b/osu.Game.Tests.Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!visual Test" />
 </manifest>
\ No newline at end of file

From 912f31dabc7160fbd32ccb0a47fd733e427274e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Aug 2023 23:37:11 +0200
Subject: [PATCH 0252/2296] Declare media permissions in game project for
 editor usage

---
 osu.Android/AndroidManifest.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Android/AndroidManifest.xml b/osu.Android/AndroidManifest.xml
index fb54c8e151..af102a1e4e 100644
--- a/osu.Android/AndroidManifest.xml
+++ b/osu.Android/AndroidManifest.xml
@@ -2,4 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="sh.ppy.osulazer" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!" android:icon="@drawable/lazer" />
+	<!-- for editor usage -->
+	<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+	<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
 </manifest>
\ No newline at end of file

From a942b6ff745193ff9b3b0f8c624d5905a4495225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 07:27:02 +0200
Subject: [PATCH 0253/2296] Replace inline comment with actual explanation of
 what's happening

---
 osu.Game/Database/LegacyBeatmapExporter.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index c00977d072..ece705f685 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -72,7 +72,16 @@ namespace osu.Game.Database
 
                 if (hitObject is not IHasPath hasPath) continue;
 
-                // Make sure the last control point is inherit type
+                // stable's hit object parsing expects the entire slider to use only one type of curve,
+                // and happens to use the last non-empty curve type read for the entire slider.
+                // this clear of the last control point type handles an edge case
+                // wherein the last control point of an otherwise-single-segment slider path has a different type than previous,
+                // which would lead to sliders being mangled when exported back to stable.
+                // normally, that would be handled by the `BezierConverter.ConvertToModernBezier()` call below,
+                // which outputs a slider path containing only Bezier control points,
+                // but a non-inherited last control point is (rightly) not considered to be starting a new segment,
+                // therefore it would fail to clear the `CountSegments() <= 1` check.
+                // by clearing explicitly we both fix the issue and avoid unnecessary conversions to Bezier.
                 if (hasPath.Path.ControlPoints.Count > 1)
                     hasPath.Path.ControlPoints[^1].Type = null;
 

From dd1ac461db2c779c5f9a24bfedbdb3437f503c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 08:23:58 +0200
Subject: [PATCH 0254/2296] Reformat xmldoc

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 1c02b18a0f..34113285a4 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -201,13 +201,20 @@ namespace osu.Game.Rulesets.Objects
         /// Returns the progress values at which (control point) segments of the path end.
         /// Ranges from 0 (beginning of the path) to 1 (end of the path) to infinity (beyond the end of the path).
         /// </summary>
-        /// <example>In case <see cref="Distance"/> is less than <see cref="CalculatedDistance"/>,
+        /// <remarks>
+        /// <see cref="PositionAt"/> truncates the progression values to [0,1],
+        /// so you can't use this method in conjunction with that one to retrieve the positions of segment ends beyond the end of the path.
+        /// </remarks>
+        /// <example>
+        /// <para>
+        /// In case <see cref="Distance"/> is less than <see cref="CalculatedDistance"/>,
         /// the last segment ends after the end of the path, hence it returns a value greater than 1.
-        /// <para/>
+        /// </para>
+        /// <para>
         /// In case <see cref="Distance"/> is greater than <see cref="CalculatedDistance"/>,
-        /// the last segment ends before the end of the path, hence it returns a value less than 1.</example>
-        /// <remarks><see cref="PositionAt"/> truncates the progression values to [0,1],
-        /// so you can't use this method to retrieve the positions of segment ends beyond the end of the path.</remarks>
+        /// the last segment ends before the end of the path, hence it returns a value less than 1.
+        /// </para>
+        /// </example>
         public IEnumerable<double> GetSegmentEnds()
         {
             ensureValid();

From 479c463751e0159049bb63fe27937072a9b836c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 08:27:08 +0200
Subject: [PATCH 0255/2296] Explain why segment end positions are not recovered
 in test

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
index 16e4ae13d9..635d9f9604 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
@@ -207,6 +207,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("shorten last segment", () => path.ExpectedDistance.Value = 150);
             AddAssert("segment ends are correct", () => path.GetSegmentEnds(), () => Is.EqualTo(distances.Select(d => d / 150)));
+            // see remarks in `GetSegmentEnds()` xmldoc (`SliderPath.PositionAt()` clamps progress to [0,1]).
             AddAssert("segment end positions not recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)), () => Is.EqualTo(new[]
             {
                 positions[1],

From 5009fd379421f928bca35028b00e6b88374bdb5e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 20 Aug 2023 17:57:45 +0900
Subject: [PATCH 0256/2296] Add test coverage of song bar crash

---
 .../Components/TestSceneSongBar.cs            | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
index 0f31192a9c..d52b453185 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
@@ -2,27 +2,34 @@
 // 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.Testing;
 using osu.Game.Beatmaps.Legacy;
-using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Tests.Components
 {
     [TestFixture]
-    public partial class TestSceneSongBar : OsuTestScene
+    public partial class TestSceneSongBar : TournamentTestScene
     {
-        [Cached]
-        private readonly LadderInfo ladder = new LadderInfo();
-
         private SongBar songBar = null!;
 
         [SetUpSteps]
-        public void SetUpSteps()
+        public override void SetUpSteps()
         {
+            base.SetUpSteps();
+
+            AddStep("setup picks bans", () =>
+            {
+                Ladder.CurrentMatch.Value!.PicksBans.Add(new BeatmapChoice
+                {
+                    BeatmapID = CreateSampleBeatmap().OnlineID,
+                    Team = TeamColour.Red,
+                    Type = ChoiceType.Pick,
+                });
+            });
+
             AddStep("create bar", () => Child = songBar = new SongBar
             {
                 RelativeSizeAxes = Axes.X,
@@ -38,12 +45,14 @@ namespace osu.Game.Tournament.Tests.Components
             AddStep("set beatmap", () =>
             {
                 var beatmap = CreateAPIBeatmap(Ruleset.Value);
+
                 beatmap.CircleSize = 3.4f;
                 beatmap.ApproachRate = 6.8f;
                 beatmap.OverallDifficulty = 5.5f;
                 beatmap.StarRating = 4.56f;
                 beatmap.Length = 123456;
                 beatmap.BPM = 133;
+                beatmap.OnlineID = CreateSampleBeatmap().OnlineID;
 
                 songBar.Beatmap = new TournamentBeatmap(beatmap);
             });

From 1067769b24e924bb34d4cc8975e94e162c7198c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 15:33:58 +0900
Subject: [PATCH 0257/2296] Remove masking on song bar

Turns out this breaks when a border style is applied for picks/bans, and it wasn't doing much for visuals anyway.
---
 osu.Game.Tournament/Components/SongBar.cs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 3d060600f7..cde826628e 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -234,7 +234,7 @@ namespace osu.Game.Tournament.Components
                         }
                     }
                 },
-                new UnmaskedTournamentBeatmapPanel(beatmap)
+                new TournamentBeatmapPanel(beatmap)
                 {
                     RelativeSizeAxes = Axes.X,
                     Width = 0.5f,
@@ -277,18 +277,4 @@ namespace osu.Game.Tournament.Components
             }
         }
     }
-
-    internal partial class UnmaskedTournamentBeatmapPanel : TournamentBeatmapPanel
-    {
-        public UnmaskedTournamentBeatmapPanel(IBeatmapInfo? beatmap, string mod = "")
-            : base(beatmap, mod)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Masking = false;
-        }
-    }
 }

From f03c64462e5bd6a21626e7030cfaaf13a50c2e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 08:58:49 +0200
Subject: [PATCH 0258/2296] Better convey meaning of zero last year placement
 via tooltip

---
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 241692d515..250d5acaae 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -10,7 +10,9 @@ using osu.Framework.Extensions;
 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.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Models;
@@ -128,7 +130,7 @@ namespace osu.Game.Tournament.Screens.Editors
                                 Width = 0.2f,
                                 Current = Model.Seed
                             },
-                            new SettingsSlider<int>
+                            new SettingsSlider<int, LastYearPlacementSlider>
                             {
                                 LabelText = "Last Year Placement",
                                 Width = 0.33f,
@@ -175,6 +177,11 @@ namespace osu.Game.Tournament.Screens.Editors
                 };
             }
 
+            private partial class LastYearPlacementSlider : RoundedSliderBar<int>
+            {
+                public override LocalisableString TooltipText => Current.Value == 0 ? "N/A" : base.TooltipText;
+            }
+
             public partial class PlayerEditor : CompositeDrawable
             {
                 private readonly TournamentTeam team;

From 827d48adcc5fb3d334c5175879898b604871b4d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 16:10:48 +0900
Subject: [PATCH 0259/2296] Fix test coverage not actually covering crash

---
 osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
index d52b453185..e0444b6126 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Tournament.Tests.Components
     public partial class TestSceneSongBar : TournamentTestScene
     {
         private SongBar songBar = null!;
+        private TournamentBeatmap ladderBeatmap = null!;
 
         [SetUpSteps]
         public override void SetUpSteps()
@@ -22,9 +23,10 @@ namespace osu.Game.Tournament.Tests.Components
 
             AddStep("setup picks bans", () =>
             {
+                ladderBeatmap = CreateSampleBeatmap();
                 Ladder.CurrentMatch.Value!.PicksBans.Add(new BeatmapChoice
                 {
-                    BeatmapID = CreateSampleBeatmap().OnlineID,
+                    BeatmapID = ladderBeatmap.OnlineID,
                     Team = TeamColour.Red,
                     Type = ChoiceType.Pick,
                 });
@@ -52,7 +54,7 @@ namespace osu.Game.Tournament.Tests.Components
                 beatmap.StarRating = 4.56f;
                 beatmap.Length = 123456;
                 beatmap.BPM = 133;
-                beatmap.OnlineID = CreateSampleBeatmap().OnlineID;
+                beatmap.OnlineID = ladderBeatmap.OnlineID;
 
                 songBar.Beatmap = new TournamentBeatmap(beatmap);
             });

From e7d61e00022a4a09e8164eb809e2a1dc6b34dfa6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 17:59:24 +0900
Subject: [PATCH 0260/2296] Fix star fountain directions not matching stable

---
 .../Visual/Menus/TestSceneStarFountain.cs     |  2 +-
 osu.Game/Screens/Menu/KiaiMenuFountains.cs    | 30 +++++++++++++++----
 osu.Game/Screens/Menu/StarFountain.cs         |  6 ++--
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs b/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs
index b12f3e7946..bb327e5962 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneStarFountain.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Menus
                 foreach (var fountain in Children.OfType<StarFountain>())
                 {
                     if (RNG.NextSingle() > 0.8f)
-                        fountain.Shoot();
+                        fountain.Shoot(RNG.Next(-1, 2));
                 }
             }, 150);
         }
diff --git a/osu.Game/Screens/Menu/KiaiMenuFountains.cs b/osu.Game/Screens/Menu/KiaiMenuFountains.cs
index a4d58e398a..07c06dcdb9 100644
--- a/osu.Game/Screens/Menu/KiaiMenuFountains.cs
+++ b/osu.Game/Screens/Menu/KiaiMenuFountains.cs
@@ -2,10 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 
@@ -13,6 +13,9 @@ namespace osu.Game.Screens.Menu
 {
     public partial class KiaiMenuFountains : BeatSyncedContainer
     {
+        private StarFountain leftFountain = null!;
+        private StarFountain rightFountain = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -20,13 +23,13 @@ namespace osu.Game.Screens.Menu
 
             Children = new[]
             {
-                new StarFountain
+                leftFountain = new StarFountain
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     X = 250,
                 },
-                new StarFountain
+                rightFountain = new StarFountain
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -58,8 +61,25 @@ namespace osu.Game.Screens.Menu
             if (lastTrigger != null && Clock.CurrentTime - lastTrigger < 500)
                 return;
 
-            foreach (var fountain in Children.OfType<StarFountain>())
-                fountain.Shoot();
+            int direction = RNG.Next(-1, 2);
+
+            switch (direction)
+            {
+                case -1:
+                    leftFountain.Shoot(1);
+                    rightFountain.Shoot(-1);
+                    break;
+
+                case 0:
+                    leftFountain.Shoot(0);
+                    rightFountain.Shoot(0);
+                    break;
+
+                case 1:
+                    leftFountain.Shoot(-1);
+                    rightFountain.Shoot(1);
+                    break;
+            }
 
             lastTrigger = Clock.CurrentTime;
         }
diff --git a/osu.Game/Screens/Menu/StarFountain.cs b/osu.Game/Screens/Menu/StarFountain.cs
index 0d35f6e0e0..fd59ec3573 100644
--- a/osu.Game/Screens/Menu/StarFountain.cs
+++ b/osu.Game/Screens/Menu/StarFountain.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Menu
             InternalChild = spewer = new StarFountainSpewer();
         }
 
-        public void Shoot() => spewer.Shoot();
+        public void Shoot(int direction) => spewer.Shoot(direction);
 
         protected override void SkinChanged(ISkinSource skin)
         {
@@ -81,10 +81,10 @@ namespace osu.Game.Screens.Menu
                 return lastShootDirection * x_velocity_from_direction * (float)(1 - 2 * (Clock.CurrentTime - lastShootTime!.Value) / shoot_duration) + getRandomVariance(x_velocity_random_variance);
             }
 
-            public void Shoot()
+            public void Shoot(int direction)
             {
                 lastShootTime = Clock.CurrentTime;
-                lastShootDirection = RNG.Next(-1, 2);
+                lastShootDirection = direction;
             }
 
             private static float getRandomVariance(float variance) => RNG.NextSingle(-variance, variance);

From 5f040a991b3f1492c97d247799a3245b2b825ee1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 19:05:20 +0900
Subject: [PATCH 0261/2296] Fix potential crash when loading menu items due to
 cross-thread ops

---
 osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index eb046932e6..2f2cb7e5f8 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -40,8 +40,14 @@ namespace osu.Game.Graphics.UserInterface
             AddInternal(hoverClickSounds = new HoverClickSounds());
 
             updateTextColour();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             Item.Action.BindDisabledChanged(_ => updateState(), true);
+            FinishTransforms();
         }
 
         private void updateTextColour()

From 662073c47220d513ed3ef510d70ab0ccb850e334 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 19:35:04 +0900
Subject: [PATCH 0262/2296] Fix some incorrect comments / test step
 descriptions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs | 2 +-
 osu.Game/Scoring/ScoreInfo.cs                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index 23b88b7395..f766faec9a 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Database
         {
             ScoreInfo scoreInfo = null!;
 
-            AddStep("Add score which requires upgrade (but has no beatmap)", () =>
+            AddStep("Add score which requires upgrade (and has beatmap)", () =>
             {
                 Realm.Write(r =>
                 {
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index c3a45332e4..526c4217ef 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Scoring
         /// Should be used to ensure we don't repeatedly attempt to update the same scores each startup even though we already know they will fail.
         /// </summary>
         /// <remarks>
-        /// See https://github.com/ppy/osu/issues/24301 for one example of how this can occur(missing beatmap file on disk).
+        /// See https://github.com/ppy/osu/issues/24301 for one example of how this can occur (missing beatmap file on disk).
         /// </remarks>
         public bool TotalScoreUpgradeFailed { get; set; }
 

From b3e7416972f097242bf8c9fe407dec3567d489d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Aug 2023 19:36:22 +0900
Subject: [PATCH 0263/2296] Rename new flag and update xmldoc to match

---
 .../Database/BackgroundDataStoreProcessorTests.cs         | 4 ++--
 osu.Game/BackgroundDataStoreProcessor.cs                  | 8 ++++----
 osu.Game/Scoring/ScoreInfo.cs                             | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index f766faec9a..da46392e4b 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Tests.Database
             AddStep("Run background processor", () => Add(new TestBackgroundDataStoreProcessor()));
 
             AddUntilStep("Score version upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(LegacyScoreEncoder.LATEST_VERSION));
-            AddAssert("Score not marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed), () => Is.False);
+            AddAssert("Score not marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.BackgroundReprocessingFailed), () => Is.False);
         }
 
         [Test]
@@ -174,7 +174,7 @@ namespace osu.Game.Tests.Database
 
             AddStep("Run background processor", () => Add(new TestBackgroundDataStoreProcessor()));
 
-            AddUntilStep("Score marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreUpgradeFailed), () => Is.True);
+            AddUntilStep("Score marked as failed", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.BackgroundReprocessingFailed), () => Is.True);
             AddAssert("Score version not upgraded", () => Realm.Run(r => r.Find<ScoreInfo>(scoreInfo.ID)!.TotalScoreVersion), () => Is.EqualTo(30000002));
         }
 
diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index ae9e9527de..f29b100ee8 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -186,7 +186,7 @@ namespace osu.Game
 
             realmAccess.Run(r =>
             {
-                foreach (var score in r.All<ScoreInfo>().Where(s => !s.TotalScoreUpgradeFailed))
+                foreach (var score in r.All<ScoreInfo>().Where(s => !s.BackgroundReprocessingFailed))
                 {
                     if (score.BeatmapInfo != null
                         && score.Statistics.Sum(kvp => kvp.Value) > 0
@@ -225,7 +225,7 @@ namespace osu.Game
                 catch (Exception e)
                 {
                     Logger.Log(@$"Failed to populate maximum statistics for {id}: {e}");
-                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.TotalScoreUpgradeFailed = true);
+                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.BackgroundReprocessingFailed = true);
                 }
             }
         }
@@ -235,7 +235,7 @@ namespace osu.Game
             Logger.Log("Querying for scores that need total score conversion...");
 
             HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>()
-                                                                             .Where(s => !s.TotalScoreUpgradeFailed && s.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
+                                                                             .Where(s => !s.BackgroundReprocessingFailed && s.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
                                                                              .AsEnumerable().Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
@@ -284,7 +284,7 @@ namespace osu.Game
                 catch (Exception e)
                 {
                     Logger.Log($"Failed to convert total score for {id}: {e}");
-                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.TotalScoreUpgradeFailed = true);
+                    realmAccess.Write(r => r.Find<ScoreInfo>(id)!.BackgroundReprocessingFailed = true);
                     ++failedCount;
                 }
             }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 526c4217ef..2efea2105c 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -82,13 +82,13 @@ namespace osu.Game.Scoring
         public long? LegacyTotalScore { get; set; }
 
         /// <summary>
-        /// If an reprocess of total score failed to update this score to the latest version, this flag will become <c>true</c>.
-        /// Should be used to ensure we don't repeatedly attempt to update the same scores each startup even though we already know they will fail.
+        /// If background processing of this beatmap failed in some way, this flag will become <c>true</c>.
+        /// Should be used to ensure we don't repeatedly attempt to reprocess the same scores each startup even though we already know they will fail.
         /// </summary>
         /// <remarks>
         /// See https://github.com/ppy/osu/issues/24301 for one example of how this can occur (missing beatmap file on disk).
         /// </remarks>
-        public bool TotalScoreUpgradeFailed { get; set; }
+        public bool BackgroundReprocessingFailed { get; set; }
 
         public int MaxCombo { get; set; }
 

From 82de7385d1c07dc0bd3e21a46ee6220e82a59244 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 21 Aug 2023 12:59:58 +0200
Subject: [PATCH 0264/2296] Revert "Fix TestSceneFruitRandomness"

This reverts commit b9d0a8a9f69fadacf1d1578fccd9101798583d47.
---
 osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index 8e7f77285c..de3d9d6530 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddSliderStep("start time", 500, 600, 0, x =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = x;
-                drawableFruit.RefreshStateTransforms();
-                drawableBanana.RefreshStateTransforms();
             });
         }
 
@@ -46,8 +44,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("Initialize start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
-                drawableFruit.RefreshStateTransforms();
-                drawableBanana.RefreshStateTransforms();
 
                 fruitRotation = drawableFruit.DisplayRotation;
                 bananaRotation = drawableBanana.DisplayRotation;
@@ -58,8 +54,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("change start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = another_start_time;
-                drawableFruit.RefreshStateTransforms();
-                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("fruit rotation is changed", () => drawableFruit.DisplayRotation != fruitRotation);
@@ -70,8 +64,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("reset start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
-                drawableFruit.RefreshStateTransforms();
-                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("rotation and size restored", () =>

From c7b1c75379983860a2dec8bd2de92d4331a0fc75 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 21 Aug 2023 13:00:01 +0200
Subject: [PATCH 0265/2296] Revert "Fix typo"

This reverts commit 90f2acaf0a9d1bfa5ac8d4cc653798604a3fdf21.
---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 76cfc049e3..e919e4d088 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.UI
 
         private void unbindUpdated(DrawableHitObject hitObject)
         {
-            hitObject.DefaultsApplied -= onDefaultsApplied;
+            hitObject.DefaultsApplied += onDefaultsApplied;
         }
 
         private void unbindAllUpdated()

From 5bc11ed35806ac8fac87c82118ff904905df3127 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 21 Aug 2023 13:02:23 +0200
Subject: [PATCH 0266/2296] Revert "Ensure invariant of monotone time"

This reverts commit 5d1ccc2601a739e2d8ed61b8d9b64a0efa580f7f.
---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 30 +------------------
 osu.Game/Rulesets/UI/Playfield.cs          | 35 ++++------------------
 2 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index e919e4d088..099be486b3 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -51,11 +51,6 @@ namespace osu.Game.Rulesets.UI
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
-        /// <summary>
-        /// Invoked when a <see cref="HitObject"/> is updated.
-        /// </summary>
-        public event Action<HitObject> HitObjectUpdated;
-
         public HitObjectContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -113,7 +108,6 @@ namespace osu.Game.Rulesets.UI
             drawable.OnNewResult += onNewResult;
 
             bindStartTime(drawable);
-            bindUpdated(drawable);
             AddInternal(drawable);
         }
 
@@ -122,7 +116,7 @@ namespace osu.Game.Rulesets.UI
             drawable.OnNewResult -= onNewResult;
 
             unbindStartTime(drawable);
-            unbindUpdated(drawable);
+
             RemoveInternal(drawable, false);
         }
 
@@ -182,27 +176,6 @@ namespace osu.Game.Rulesets.UI
             startTimeMap.Clear();
         }
 
-        private void bindUpdated(DrawableHitObject hitObject)
-        {
-            hitObject.DefaultsApplied += onDefaultsApplied;
-        }
-
-        private void unbindUpdated(DrawableHitObject hitObject)
-        {
-            hitObject.DefaultsApplied += onDefaultsApplied;
-        }
-
-        private void unbindAllUpdated()
-        {
-            foreach (var h in AliveObjects)
-                unbindUpdated(h);
-        }
-
-        private void onDefaultsApplied(DrawableHitObject obj)
-        {
-            HitObjectUpdated?.Invoke(obj.HitObject);
-        }
-
         protected override int Compare(Drawable x, Drawable y)
         {
             if (!(x is DrawableHitObject xObj) || !(y is DrawableHitObject yObj))
@@ -219,7 +192,6 @@ namespace osu.Game.Rulesets.UI
         {
             base.Dispose(isDisposing);
             unbindAllStartTimes();
-            unbindAllUpdated();
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 9a4d082a06..e9c35555c8 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.UI
 
         private readonly HitObjectEntryManager entryManager = new HitObjectEntryManager();
 
-        private readonly LinkedList<HitObjectLifetimeEntry> judgedEntries;
+        private readonly Stack<HitObjectLifetimeEntry> judgedEntries;
 
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
@@ -125,13 +125,12 @@ namespace osu.Game.Rulesets.UI
                 h.NewResult += onNewResult;
                 h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
                 h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
-                h.HitObjectUpdated += onHitObjectUpdated;
             }));
 
             entryManager.OnEntryAdded += onEntryAdded;
             entryManager.OnEntryRemoved += onEntryRemoved;
 
-            judgedEntries = new LinkedList<HitObjectLifetimeEntry>();
+            judgedEntries = new Stack<HitObjectLifetimeEntry>();
         }
 
         [BackgroundDependencyLoader]
@@ -271,16 +270,15 @@ namespace osu.Game.Rulesets.UI
             }
 
             // When rewinding, revert future judgements in the reverse order.
-            while (judgedEntries.Last is not null)
+            while (judgedEntries.Count > 0)
             {
-                var result = judgedEntries.Last.Value.Result;
+                var result = judgedEntries.Peek().Result;
                 Debug.Assert(result?.RawTime != null);
 
                 if (Time.Current >= result.RawTime.Value)
                     break;
 
-                revertResult(judgedEntries.Last.Value);
-                judgedEntries.RemoveLast();
+                revertResult(judgedEntries.Pop());
             }
         }
 
@@ -473,31 +471,10 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
-        private void onHitObjectUpdated(HitObject _)
-        {
-            // The time of judged entries may have changed, so we need to re-sort the list to preserve the invariant of monotone time.
-            // Insertion sort on linked-list is O(n) for nearly-sorted lists, which is the case here.
-            var current = judgedEntries.First;
-
-            while (current?.Next is not null)
-            {
-                var next = current.Next;
-
-                if (current.Value.Result?.RawTime > next.Value.Result?.RawTime)
-                {
-                    judgedEntries.Remove(next);
-                    judgedEntries.AddBefore(current, next);
-                    current = next.Previous;
-                }
-                else
-                    current = next;
-            }
-        }
-
         private void onNewResult(DrawableHitObject drawable, JudgementResult result)
         {
             Debug.Assert(result != null && drawable.Entry?.Result == result && result.RawTime != null);
-            judgedEntries.AddLast(drawable.Entry.AsNonNull());
+            judgedEntries.Push(drawable.Entry.AsNonNull());
 
             NewResult?.Invoke(drawable, result);
         }

From c82e997644529adb475bec516ead328d260c1fda Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 21 Aug 2023 13:02:41 +0200
Subject: [PATCH 0267/2296] Revert "Revert "Fix TestSceneFruitRandomness""

This reverts commit 82de7385d1c07dc0bd3e21a46ee6220e82a59244.
---
 osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
index de3d9d6530..8e7f77285c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddSliderStep("start time", 500, 600, 0, x =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = x;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
         }
 
@@ -44,6 +46,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("Initialize start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
 
                 fruitRotation = drawableFruit.DisplayRotation;
                 bananaRotation = drawableBanana.DisplayRotation;
@@ -54,6 +58,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("change start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = another_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("fruit rotation is changed", () => drawableFruit.DisplayRotation != fruitRotation);
@@ -64,6 +70,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("reset start time", () =>
             {
                 drawableFruit.HitObject.StartTime = drawableBanana.HitObject.StartTime = initial_start_time;
+                drawableFruit.RefreshStateTransforms();
+                drawableBanana.RefreshStateTransforms();
             });
 
             AddAssert("rotation and size restored", () =>

From e283aa2843104bf58bf027486cee0d595c65fa3a Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 21 Aug 2023 13:09:31 +0200
Subject: [PATCH 0268/2296] Update inline comments

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index f141263e27..c442fac0b8 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -330,7 +330,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             ClearNestedHitObjects();
 
             // Changes in state trigger defaults applied trigger state updates.
-            // When a new hitobject is applied, OnApply() automatically performs a state update anyway.
+            // When a new hitobject is applied, OnApply() automatically performs a state update.
             HitObject.DefaultsApplied -= onDefaultsApplied;
 
             entry.RevertResult -= onRevertResult;
@@ -391,6 +391,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Apply(Entry);
 
             // Applied defaults indicate a change in hit object state.
+            // We need to update the judgement result time to the new end time
+            // and update state to ensure the hit object fades out at the correct time.
             if (Result is not null)
             {
                 Result.TimeOffset = 0;

From bdac05263164d51af00fa23d4fe84f1e1fcf905c Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Mon, 21 Aug 2023 15:29:41 +0200
Subject: [PATCH 0269/2296] refactor(MessageNotifier): apply changes required
 by framework

---
 osu.Game/Online/Chat/MessageNotifier.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index b91cf06847..de38d3ef26 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Online.Chat
             if (!notifyOnPrivateMessage.Value || channel.Type != ChannelType.PM)
                 return false;
 
-            (host as DesktopGameHost)?.FlashWindow();
+            host.Window?.Flash();
 
             notifications.Post(new PrivateMessageNotification(message, channel));
             return true;
@@ -137,7 +137,7 @@ namespace osu.Game.Online.Chat
         {
             if (!notifyOnUsername.Value || !CheckContainsUsername(message.Content, localUser.Value.Username)) return;
 
-            (host as DesktopGameHost)?.FlashWindow();
+            host.Window?.Flash();
 
             notifications.Post(new MentionNotification(message, channel));
         }

From 8533cba0bf6a02b05b8e9bfe99aaee2822dfe5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 17:27:05 +0200
Subject: [PATCH 0270/2296] Fix mismatching schema version in comment

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

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 36781b0454..db4f0d9864 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Database
         /// 31   2023-06-26    Add Version and LegacyTotalScore to ScoreInfo, set Version to 30000002 and copy TotalScore into LegacyTotalScore for legacy scores.
         /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
         /// 33   2023-08-16    Reset default chat toggle key binding to avoid conflict with newly added leaderboard toggle key binding.
-        /// 35   2023-08-21    Add TotalScoreUpgradeFailed flag to ScoreInfo to track upgrade failures.
+        /// 34   2023-08-21    Add TotalScoreUpgradeFailed flag to ScoreInfo to track upgrade failures.
         /// </summary>
         private const int schema_version = 34;
 

From 273dcf9150f441c475c524455b12376a96d3930f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 21 Aug 2023 17:44:35 +0200
Subject: [PATCH 0271/2296] Also update the reference to added flag in schema
 change breakdown

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

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index db4f0d9864..cd97bb6430 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Database
         /// 31   2023-06-26    Add Version and LegacyTotalScore to ScoreInfo, set Version to 30000002 and copy TotalScore into LegacyTotalScore for legacy scores.
         /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
         /// 33   2023-08-16    Reset default chat toggle key binding to avoid conflict with newly added leaderboard toggle key binding.
-        /// 34   2023-08-21    Add TotalScoreUpgradeFailed flag to ScoreInfo to track upgrade failures.
+        /// 34   2023-08-21    Add BackgroundReprocessingFailed flag to ScoreInfo to track upgrade failures.
         /// </summary>
         private const int schema_version = 34;
 

From 5454d1caa1927428fe339e3d5b47ddfe45f9dfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 6 Aug 2023 17:40:55 +0200
Subject: [PATCH 0272/2296] Remove global action container input queue
 workaround

As described in #24248, the workaround employed by
`GlobalActionContainer`, wherein it tried to handle actions with
priority before its children by being placed in front of the children
and not _actually containing_ said children, is blocking the resolution
of some rather major input handling issues that allow key releases to be
received by deparented drawables.

To resolve, migrate `GlobalActionContainer` to use `Prioritised`, which
can be done without regressing certain mouse button flows after
ppy/osu-framework#5966.
---
 .../Input/Bindings/GlobalActionContainer.cs   | 34 +++++--------------
 osu.Game/OsuGameBase.cs                       | 19 ++++++-----
 .../Visual/OsuManualInputManagerTestScene.cs  |  8 ++++-
 3 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 9a0a2d5c15..296232d9ea 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -3,33 +3,26 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Localisation;
 
 namespace osu.Game.Input.Bindings
 {
-    public partial class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput
+    public partial class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput, IKeyBindingHandler<GlobalAction>
     {
-        private readonly Drawable? handler;
-
-        private InputManager? parentInputManager;
+        private readonly IKeyBindingHandler<GlobalAction>? handler;
 
         public GlobalActionContainer(OsuGameBase? game)
             : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
-            if (game is IKeyBindingHandler<GlobalAction>)
-                handler = game;
+            if (game is IKeyBindingHandler<GlobalAction> h)
+                handler = h;
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            parentInputManager = GetContainingInputManager();
-        }
+        protected override bool Prioritised => true;
 
         // IMPORTANT: Take care when changing order of the items in the enumerable.
         // It is used to decide the order of precedence, with the earlier items having higher precedence.
@@ -161,20 +154,9 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
         };
 
-        protected override IEnumerable<Drawable> KeyBindingInputQueue
-        {
-            get
-            {
-                // To ensure the global actions are handled with priority, this GlobalActionContainer is actually placed after game content.
-                // It does not contain children as expected, so we need to forward the NonPositionalInputQueue from the parent input manager to correctly
-                // allow the whole game to handle these actions.
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) => handler?.OnPressed(e) == true;
 
-                // An eventual solution to this hack is to create localised action containers for individual components like SongSelect, but this will take some rearranging.
-                var inputQueue = parentInputManager?.NonPositionalInputQueue ?? base.KeyBindingInputQueue;
-
-                return handler != null ? inputQueue.Prepend(handler) : inputQueue;
-            }
-        }
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => handler?.OnReleased(e);
     }
 
     public enum GlobalAction
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 6737caa5f9..75b46a0a4d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -392,17 +392,18 @@ namespace osu.Game
             {
                 SafeAreaOverrideEdges = SafeAreaOverrideEdges,
                 RelativeSizeAxes = Axes.Both,
-                Child = CreateScalingContainer().WithChildren(new Drawable[]
+                Child = CreateScalingContainer().WithChild(globalBindings = new GlobalActionContainer(this)
                 {
-                    (GlobalCursorDisplay = new GlobalCursorDisplay
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both
-                    }).WithChild(content = new OsuTooltipContainer(GlobalCursorDisplay.MenuCursor)
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    }),
-                    // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
-                    globalBindings = new GlobalActionContainer(this)
+                        (GlobalCursorDisplay = new GlobalCursorDisplay
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }).WithChild(content = new OsuTooltipContainer(GlobalCursorDisplay.MenuCursor)
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }),
+                    }
                 })
             });
 
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index 37260b3b13..ffe40243ab 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -57,7 +57,13 @@ namespace osu.Game.Tests.Visual
             }
 
             if (CreateNestedActionContainer)
-                mainContent.Add(new GlobalActionContainer(null));
+            {
+                var globalActionContainer = new GlobalActionContainer(null)
+                {
+                    Child = mainContent
+                };
+                mainContent = globalActionContainer;
+            }
 
             base.Content.AddRange(new Drawable[]
             {

From 9f4f81c150895ddc08bb4680bbcbd981a03f9d0d Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Mon, 21 Aug 2023 19:36:11 +0200
Subject: [PATCH 0273/2296] accumulating negative scaling

---
 .../SkinEditor/SkinSelectionHandler.cs        | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index a952cf3035..c90a1d8edf 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Overlays.SkinEditor
             UpdatePosition = updateDrawablePosition
         };
 
+        private float accumulatedNegativeScaling;
+
         public override bool HandleScale(Vector2 scale, Anchor anchor)
         {
             // convert scale to screen space
@@ -71,8 +73,25 @@ namespace osu.Game.Overlays.SkinEditor
                     scale.Y = scale.X / selectionRect.Width * selectionRect.Height;
             }
 
-            // If scaling reverses the selection, don't scale.
-            if (adjustedRect.Width + scale.X < 0 || adjustedRect.Height + scale.Y < 0) return true;
+            // If scaling reverses the selection, don't scale and accumulate the amount of scaling.
+            if (adjustedRect.Width + scale.X < 0 || adjustedRect.Height + scale.Y < 0)
+            {
+                accumulatedNegativeScaling += scale.Length; // - new Vector2(selectionRect.Width, selectionRect.Height).Length;
+
+                return true;
+            }
+
+            // Compensate for accumulated negative scaling.
+            if (Precision.AlmostBigger(accumulatedNegativeScaling, 0) && !Precision.AlmostEquals(accumulatedNegativeScaling, 0))
+            {
+                float length = scale.Length;
+                accumulatedNegativeScaling -= length;
+
+                // If the accumulated negative scaling is still positive, don't scale.
+                if (Precision.AlmostBigger(accumulatedNegativeScaling, 0)) return true;
+                scale *= Math.Abs(accumulatedNegativeScaling) / length;
+                accumulatedNegativeScaling = 0;
+            }
 
             if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
             if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
@@ -150,6 +169,12 @@ namespace osu.Game.Overlays.SkinEditor
 
         public static void ApplyClosestAnchor(Drawable drawable) => applyAnchor(drawable, getClosestAnchor(drawable));
 
+        protected override void OnOperationEnded()
+        {
+            base.OnOperationEnded();
+            accumulatedNegativeScaling = 0;
+        }
+
         protected override void OnSelectionChanged()
         {
             base.OnSelectionChanged();

From 96c58c86ea85c1e2e85cb578a730be649993351d Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Mon, 21 Aug 2023 23:36:54 +0200
Subject: [PATCH 0274/2296] refactor: make flashing available in
 `Notifications`

This will be used in `NotificationOverlay` when a `Notification` is posted.
---
 osu.Game/Online/Chat/MessageNotifier.cs         | 4 ----
 osu.Game/Overlays/NotificationOverlay.cs        | 9 +++++++++
 osu.Game/Overlays/Notifications/Notification.cs | 5 +++++
 osu.Game/Screens/Play/PlayerLoader.cs           | 2 ++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index de38d3ef26..65aac723da 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -127,8 +127,6 @@ namespace osu.Game.Online.Chat
             if (!notifyOnPrivateMessage.Value || channel.Type != ChannelType.PM)
                 return false;
 
-            host.Window?.Flash();
-
             notifications.Post(new PrivateMessageNotification(message, channel));
             return true;
         }
@@ -137,8 +135,6 @@ namespace osu.Game.Online.Chat
         {
             if (!notifyOnUsername.Value || !CheckContainsUsername(message.Content, localUser.Value.Username)) return;
 
-            host.Window?.Flash();
-
             notifications.Post(new MentionNotification(message, channel));
         }
 
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index c9d09848f8..08c567af82 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -43,6 +43,9 @@ namespace osu.Game.Overlays
         [Resolved]
         private AudioManager audio { get; set; } = null!;
 
+        [Resolved]
+        private OsuGame game { get; set; } = null!;
+
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
@@ -176,6 +179,12 @@ namespace osu.Game.Overlays
 
             playDebouncedSample(notification.PopInSampleName);
 
+            if (notification.FlashTaskbar)
+            {
+                game.Window?.Flash(notification.IsImportant);
+                notification.Closed += () => game.Window?.CancelFlash();
+            }
+
             if (State.Value == Visibility.Hidden)
             {
                 notification.IsInToastTray = true;
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 8cdc373417..53fc152c96 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -38,6 +38,11 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public virtual bool IsImportant => true;
 
+        /// <summary>
+        /// Whether this notification should trigger a taskbar flash if the window is un-focused when posted.
+        /// </summary>
+        public bool FlashTaskbar { get; init; } = true;
+
         /// <summary>
         /// Run on user activating the notification. Return true to close.
         /// </summary>
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 872425e3fd..eccfc4dc7b 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -568,6 +568,7 @@ namespace osu.Game.Screens.Play
             public MutedNotification()
             {
                 Text = NotificationsStrings.GameVolumeTooLow;
+                FlashTaskbar = false;
             }
 
             [BackgroundDependencyLoader]
@@ -623,6 +624,7 @@ namespace osu.Game.Screens.Play
             public BatteryWarningNotification()
             {
                 Text = NotificationsStrings.BatteryLow;
+                FlashTaskbar = false;
             }
 
             [BackgroundDependencyLoader]

From e321303ef665a623436a9bf0e04cf91aebd3323b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 12:32:42 +0900
Subject: [PATCH 0275/2296] Add application category type to enable game mode
 on new macOS versions

---
 osu.iOS/Info.plist | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.iOS/Info.plist b/osu.iOS/Info.plist
index 0ce1d952d0..cf51fe995b 100644
--- a/osu.iOS/Info.plist
+++ b/osu.iOS/Info.plist
@@ -34,9 +34,9 @@
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>
-	<string>We don&apos;t really use the camera.</string>
+	<string>We don't really use the camera.</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>We don&apos;t really use the microphone.</string>
+	<string>We don't really use the microphone.</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationLandscapeRight</string>
@@ -130,5 +130,7 @@
 			<string>Editor</string>
 		</dict>
 	</array>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.music-games</string>
 </dict>
 </plist>

From e8337c592a69e1905e75d459bf5ff6aad6c0d47f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 22 Aug 2023 12:50:13 +0900
Subject: [PATCH 0276/2296] Update framework and apply changes to support
 masking SSBO

---
 .../UI/Cursor/CursorTrail.cs                  | 20 ++++++++++++++-----
 .../Resources/Shaders/sh_TestVertex.vs        |  2 +-
 osu.Game/Screens/Loader.cs                    |  5 +----
 osu.Game/osu.Game.csproj                      |  2 +-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index a29faac5a0..0774d34488 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     if (time - part.Time >= 1)
                         continue;
 
-                    vertexBatch.Add(new TexturedTrailVertex
+                    vertexBatch.Add(new TexturedTrailVertex(renderer)
                     {
                         Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomLeft,
@@ -295,7 +295,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex
+                    vertexBatch.Add(new TexturedTrailVertex(renderer)
                     {
                         Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomRight,
@@ -304,7 +304,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex
+                    vertexBatch.Add(new TexturedTrailVertex(renderer)
                     {
                         Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopRight,
@@ -313,7 +313,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex
+                    vertexBatch.Add(new TexturedTrailVertex(renderer)
                     {
                         Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopLeft,
@@ -362,12 +362,22 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             [VertexMember(1, VertexAttribPointerType.Float)]
             public float Time;
 
+            [VertexMember(1, VertexAttribPointerType.Int)]
+            private readonly int maskingIndex;
+
+            public TexturedTrailVertex(IRenderer renderer)
+            {
+                this = default;
+                maskingIndex = renderer.CurrentMaskingIndex;
+            }
+
             public bool Equals(TexturedTrailVertex other)
             {
                 return Position.Equals(other.Position)
                        && TexturePosition.Equals(other.TexturePosition)
                        && Colour.Equals(other.Colour)
-                       && Time.Equals(other.Time);
+                       && Time.Equals(other.Time)
+                       && maskingIndex == other.maskingIndex;
             }
         }
     }
diff --git a/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs b/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
index 505554bb33..80ed686ba5 100644
--- a/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
+++ b/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
@@ -13,7 +13,7 @@ layout(location = 4) out mediump vec2 v_BlendRange;
 void main(void)
 {
 	// Transform from screen space to masking space.
-	highp vec3 maskingPos = g_ToMaskingSpace * vec3(m_Position, 1.0);
+	highp vec3 maskingPos = g_MaskingInfo.ToMaskingSpace * vec3(m_Position, 1.0);
 	v_MaskingPosition = maskingPos.xy / maskingPos.z;
 
 	v_Colour = m_Colour;
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index 372cfe748e..962c7d9d14 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -126,12 +126,9 @@ namespace osu.Game.Screens
             private void load(ShaderManager manager)
             {
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE));
-                loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.BLUR));
-
+                loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2_NO_MASKING, FragmentShaderDescriptor.BLUR));
                 loadTargets.Add(manager.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE));
-
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, "TriangleBorder"));
-
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_3, FragmentShaderDescriptor.TEXTURE));
             }
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7d4a721c91..08107c2fad 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="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.817.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.822.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />

From f09b81841810df3e63a9bc6bfa11a369803f0d89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 13:17:12 +0900
Subject: [PATCH 0277/2296] Update resources

---
 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 08107c2fad..4c3205178a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.822.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.719.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.822.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From be1a712f33bfa755a049d9b2763a22f45f8a1498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 08:54:41 +0200
Subject: [PATCH 0278/2296] Make `OsuGame` dependency nullable

---
 osu.Game/Overlays/NotificationOverlay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 08c567af82..6dd344ca99 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays
         private AudioManager audio { get; set; } = null!;
 
         [Resolved]
-        private OsuGame game { get; set; } = null!;
+        private OsuGame? game { get; set; }
 
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
@@ -181,8 +181,8 @@ namespace osu.Game.Overlays
 
             if (notification.FlashTaskbar)
             {
-                game.Window?.Flash(notification.IsImportant);
-                notification.Closed += () => game.Window?.CancelFlash();
+                game?.Window?.Flash(notification.IsImportant);
+                notification.Closed += () => game?.Window?.CancelFlash();
             }
 
             if (State.Value == Visibility.Hidden)

From aa29e00578a01768d1ee7bf537e5b2a335c46b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 08:58:10 +0200
Subject: [PATCH 0279/2296] Remove `FlashTaskbar` and use `IsImportant`
 directly instead

---
 osu.Game/Overlays/NotificationOverlay.cs        | 4 ++--
 osu.Game/Overlays/Notifications/Notification.cs | 5 -----
 osu.Game/Screens/Play/PlayerLoader.cs           | 2 --
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 6dd344ca99..b93d5f1e12 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -179,9 +179,9 @@ namespace osu.Game.Overlays
 
             playDebouncedSample(notification.PopInSampleName);
 
-            if (notification.FlashTaskbar)
+            if (notification.IsImportant)
             {
-                game?.Window?.Flash(notification.IsImportant);
+                game?.Window?.Flash();
                 notification.Closed += () => game?.Window?.CancelFlash();
             }
 
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 53fc152c96..8cdc373417 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -38,11 +38,6 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public virtual bool IsImportant => true;
 
-        /// <summary>
-        /// Whether this notification should trigger a taskbar flash if the window is un-focused when posted.
-        /// </summary>
-        public bool FlashTaskbar { get; init; } = true;
-
         /// <summary>
         /// Run on user activating the notification. Return true to close.
         /// </summary>
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index eccfc4dc7b..872425e3fd 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -568,7 +568,6 @@ namespace osu.Game.Screens.Play
             public MutedNotification()
             {
                 Text = NotificationsStrings.GameVolumeTooLow;
-                FlashTaskbar = false;
             }
 
             [BackgroundDependencyLoader]
@@ -624,7 +623,6 @@ namespace osu.Game.Screens.Play
             public BatteryWarningNotification()
             {
                 Text = NotificationsStrings.BatteryLow;
-                FlashTaskbar = false;
             }
 
             [BackgroundDependencyLoader]

From 142abe1fd0a87a2144ee4f61c40cff1c96ce4605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 09:00:59 +0200
Subject: [PATCH 0280/2296] Make highlight messages important in order to
 trigger window flash

---
 osu.Game/Online/Chat/MessageNotifier.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index 65aac723da..56f490cb21 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -182,8 +182,6 @@ namespace osu.Game.Online.Chat
             private readonly Message message;
             private readonly Channel channel;
 
-            public override bool IsImportant => false;
-
             [BackgroundDependencyLoader]
             private void load(OsuColour colours, ChatOverlay chatOverlay, INotificationOverlay notificationOverlay)
             {

From bbe4635a5080befefc78cccdf61d196d0941bc5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 16:07:48 +0900
Subject: [PATCH 0281/2296] Remove unused usings

---
 osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
index dfdf3c58fd..97980c6d18 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.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 osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;

From 5dee43815c2051cd2bae237082f0307f68e1a283 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 16:13:01 +0900
Subject: [PATCH 0282/2296] Bump version to allow migration to re-run

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 2 +-
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index fbc53b9d70..7a77434f23 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Database
             if (score.IsLegacyScore)
                 return false;
 
-            if (score.TotalScoreVersion > 30000002)
+            if (score.TotalScoreVersion > 30000003)
                 return false;
 
             // Recalculate the old-style standardised score to see if this was an old lazer score.
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 6868c89d26..a1f984484e 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -30,9 +30,10 @@ namespace osu.Game.Scoring.Legacy
         /// <item><description>30000001: Appends <see cref="LegacyReplaySoloScoreInfo"/> to the end of scores.</description></item>
         /// <item><description>30000002: Score stored to replay calculated using the Score V2 algorithm. Legacy scores on this version are candidate to Score V1 -> V2 conversion.</description></item>
         /// <item><description>30000003: First version after converting legacy total score to standardised.</description></item>
+        /// <item><description>30000004: First version after converting legacy total score to standardised (with combo exponent adjustment).</description></item>
         /// </list>
         /// </remarks>
-        public const int LATEST_VERSION = 30000003;
+        public const int LATEST_VERSION = 30000004;
 
         /// <summary>
         /// The first stable-compatible YYYYMMDD format version given to lazer usage of replays.

From 5be533578499d25c54e18ea76ec2aae2a32a9b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 09:37:54 +0200
Subject: [PATCH 0283/2296] Reword comment to be better

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index c442fac0b8..e31656e0ff 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -329,8 +329,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Entry.NestedEntries.RemoveAll(nestedEntry => nestedEntry is SyntheticHitObjectEntry);
             ClearNestedHitObjects();
 
-            // Changes in state trigger defaults applied trigger state updates.
-            // When a new hitobject is applied, OnApply() automatically performs a state update.
+            // Changes to `HitObject` properties trigger default application, which triggers `State` updates.
+            // When a new hitobject is applied, `OnApply()` automatically performs a state update.
             HitObject.DefaultsApplied -= onDefaultsApplied;
 
             entry.RevertResult -= onRevertResult;

From 290d18ad690accc2a54c3290e3403f6c2534fb45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 17:31:19 +0900
Subject: [PATCH 0284/2296] Split out difficulties in beatmap carousel in a bit
 of a hacky way

Seems like the simplest path forward for now, without a full rewrite.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 82 ++++++++++++++++------
 osu.Game/Screens/Select/FilterCriteria.cs  |  5 ++
 2 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 9af9a0ce72..d1a9b4176b 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -78,6 +78,8 @@ namespace osu.Game.Screens.Select
 
         private CarouselBeatmapSet? selectedBeatmapSet;
 
+        private IEnumerable<BeatmapSetInfo> originalBeatmapSetsDetached = Enumerable.Empty<BeatmapSetInfo>();
+
         /// <summary>
         /// Raised when the <see cref="SelectedBeatmapInfo"/> is changed.
         /// </summary>
@@ -127,13 +129,29 @@ namespace osu.Game.Screens.Select
 
         private void loadBeatmapSets(IEnumerable<BeatmapSetInfo> beatmapSets)
         {
+            originalBeatmapSetsDetached = beatmapSets.Detach();
+
             CarouselRoot newRoot = new CarouselRoot(this);
 
-            newRoot.AddItems(beatmapSets.Select(s => createCarouselSet(s.Detach())).OfType<CarouselBeatmapSet>());
+            if (beatmapsSplitOut)
+            {
+                var carouselBeatmapSets = originalBeatmapSetsDetached.SelectMany(s => s.Beatmaps).Select(b =>
+                {
+                    var set = new BeatmapSetInfo(new[] { b });
+                    return createCarouselSet(set);
+                }).OfType<CarouselBeatmapSet>();
+
+                newRoot.AddItems(carouselBeatmapSets);
+            }
+            else
+            {
+                var carouselBeatmapSets = originalBeatmapSetsDetached.Select(createCarouselSet).OfType<CarouselBeatmapSet>();
+                newRoot.AddItems(carouselBeatmapSets);
+            }
 
             root = newRoot;
 
-            if (selectedBeatmapSet != null && !beatmapSets.Contains(selectedBeatmapSet.BeatmapSet))
+            if (selectedBeatmapSet != null && !originalBeatmapSetsDetached.Contains(selectedBeatmapSet.BeatmapSet))
                 selectedBeatmapSet = null;
 
             Scroll.Clear(false);
@@ -330,8 +348,8 @@ namespace osu.Game.Screens.Select
 
                 // Only require to action here if the beatmap is missing.
                 // This avoids processing these events unnecessarily when new beatmaps are imported, for example.
-                if (root.BeatmapSetsByID.TryGetValue(beatmapSet.ID, out var existingSet)
-                    && existingSet.BeatmapSet.Beatmaps.All(b => b.ID != beatmapInfo.ID))
+                if (root.BeatmapSetsByID.TryGetValue(beatmapSet.ID, out var existingSets)
+                    && existingSets.SelectMany(s => s.Beatmaps).All(b => b.BeatmapInfo.ID != beatmapInfo.ID))
                 {
                     UpdateBeatmapSet(beatmapSet.Detach());
                 }
@@ -345,15 +363,18 @@ namespace osu.Game.Screens.Select
 
         private void removeBeatmapSet(Guid beatmapSetID) => Schedule(() =>
         {
-            if (!root.BeatmapSetsByID.TryGetValue(beatmapSetID, out var existingSet))
+            if (!root.BeatmapSetsByID.TryGetValue(beatmapSetID, out var existingSets))
                 return;
 
-            foreach (var beatmap in existingSet.Beatmaps)
-                randomSelectedBeatmaps.Remove(beatmap);
+            foreach (var set in existingSets)
+            {
+                foreach (var beatmap in set.Beatmaps)
+                    randomSelectedBeatmaps.Remove(beatmap);
+                previouslyVisitedRandomSets.Remove(set);
 
-            previouslyVisitedRandomSets.Remove(existingSet);
+                root.RemoveItem(set);
+            }
 
-            root.RemoveItem(existingSet);
             itemsCache.Invalidate();
 
             if (!Scroll.UserScrolling)
@@ -371,13 +392,16 @@ namespace osu.Game.Screens.Select
                 previouslySelectedID = selectedBeatmap?.BeatmapInfo.ID;
 
             var newSet = createCarouselSet(beatmapSet);
-            var removedSet = root.RemoveChild(beatmapSet.ID);
+            var removedSets = root.RemoveChild(beatmapSet.ID);
 
-            // If we don't remove this here, it may remain in a hidden state until scrolled off screen.
-            // Doesn't really affect anything during actual user interaction, but makes testing annoying.
-            var removedDrawable = Scroll.FirstOrDefault(c => c.Item == removedSet);
-            if (removedDrawable != null)
-                expirePanelImmediately(removedDrawable);
+            foreach (var removedSet in removedSets)
+            {
+                // If we don't remove this here, it may remain in a hidden state until scrolled off screen.
+                // Doesn't really affect anything during actual user interaction, but makes testing annoying.
+                var removedDrawable = Scroll.FirstOrDefault(c => c.Item == removedSet);
+                if (removedDrawable != null)
+                    expirePanelImmediately(removedDrawable);
+            }
 
             if (newSet != null)
             {
@@ -632,6 +656,8 @@ namespace osu.Game.Screens.Select
             applyActiveCriteria(debounce);
         }
 
+        private bool beatmapsSplitOut;
+
         private void applyActiveCriteria(bool debounce, bool alwaysResetScrollPosition = true)
         {
             PendingFilter?.Cancel();
@@ -652,6 +678,13 @@ namespace osu.Game.Screens.Select
             {
                 PendingFilter = null;
 
+                if (activeCriteria.SplitOutDifficulties != beatmapsSplitOut)
+                {
+                    beatmapsSplitOut = activeCriteria.SplitOutDifficulties;
+                    loadBeatmapSets(originalBeatmapSetsDetached);
+                    return;
+                }
+
                 root.Filter(activeCriteria);
                 itemsCache.Invalidate();
 
@@ -1055,7 +1088,7 @@ namespace osu.Game.Screens.Select
             // May only be null during construction (State.Value set causes PerformSelection to be triggered).
             private readonly BeatmapCarousel? carousel;
 
-            public readonly Dictionary<Guid, CarouselBeatmapSet> BeatmapSetsByID = new Dictionary<Guid, CarouselBeatmapSet>();
+            public readonly Dictionary<Guid, List<CarouselBeatmapSet>> BeatmapSetsByID = new Dictionary<Guid, List<CarouselBeatmapSet>>();
 
             public CarouselRoot(BeatmapCarousel carousel)
             {
@@ -1069,20 +1102,25 @@ namespace osu.Game.Screens.Select
             public override void AddItem(CarouselItem i)
             {
                 CarouselBeatmapSet set = (CarouselBeatmapSet)i;
-                BeatmapSetsByID.Add(set.BeatmapSet.ID, set);
+                if (BeatmapSetsByID.TryGetValue(set.BeatmapSet.ID, out var sets))
+                    sets.Add(set);
+                else
+                    BeatmapSetsByID.Add(set.BeatmapSet.ID, new List<CarouselBeatmapSet> { set });
 
                 base.AddItem(i);
             }
 
-            public CarouselBeatmapSet? RemoveChild(Guid beatmapSetID)
+            public IEnumerable<CarouselBeatmapSet> RemoveChild(Guid beatmapSetID)
             {
-                if (BeatmapSetsByID.TryGetValue(beatmapSetID, out var carouselBeatmapSet))
+                if (BeatmapSetsByID.TryGetValue(beatmapSetID, out var carouselBeatmapSets))
                 {
-                    RemoveItem(carouselBeatmapSet);
-                    return carouselBeatmapSet;
+                    foreach (var set in carouselBeatmapSets)
+                        RemoveItem(set);
+
+                    return carouselBeatmapSets;
                 }
 
-                return null;
+                return Enumerable.Empty<CarouselBeatmapSet>();
             }
 
             public override void RemoveItem(CarouselItem i)
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index ab4f85fc92..a2ae114126 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -19,6 +19,11 @@ namespace osu.Game.Screens.Select
         public GroupMode Group;
         public SortMode Sort;
 
+        /// <summary>
+        /// Whether the display of beatmap sets should be split apart per-difficulty for the current criteria.
+        /// </summary>
+        public bool SplitOutDifficulties => Sort == SortMode.Difficulty;
+
         public BeatmapSetInfo? SelectedBeatmapSet;
 
         public OptionalRange<double> StarDifficulty;

From 2b1c6ae612cb4e6cecbd6736748da942fa724e39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 18:38:23 +0900
Subject: [PATCH 0285/2296] Ensure ID is maintained in temporary
 `BeatmapSetInfo`s

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index d1a9b4176b..5157e37a31 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -137,8 +137,10 @@ namespace osu.Game.Screens.Select
             {
                 var carouselBeatmapSets = originalBeatmapSetsDetached.SelectMany(s => s.Beatmaps).Select(b =>
                 {
-                    var set = new BeatmapSetInfo(new[] { b });
-                    return createCarouselSet(set);
+                    return createCarouselSet(new BeatmapSetInfo(new[] { b })
+                    {
+                        ID = b.BeatmapSet!.ID,
+                    });
                 }).OfType<CarouselBeatmapSet>();
 
                 newRoot.AddItems(carouselBeatmapSets);

From ecbf0f138e2c7b3cf5716020a1aad4f8a834dfd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 18:38:43 +0900
Subject: [PATCH 0286/2296] Fix incorrect handling when new beatmaps arrive

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 35 ++++++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 5157e37a31..2227eb801a 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -393,7 +393,6 @@ namespace osu.Game.Screens.Select
             if (selectedBeatmapSet?.BeatmapSet.ID == beatmapSet.ID)
                 previouslySelectedID = selectedBeatmap?.BeatmapInfo.ID;
 
-            var newSet = createCarouselSet(beatmapSet);
             var removedSets = root.RemoveChild(beatmapSet.ID);
 
             foreach (var removedSet in removedSets)
@@ -405,13 +404,37 @@ namespace osu.Game.Screens.Select
                     expirePanelImmediately(removedDrawable);
             }
 
-            if (newSet != null)
+            if (beatmapsSplitOut)
             {
-                root.AddItem(newSet);
+                foreach (var beatmap in beatmapSet.Beatmaps)
+                {
+                    var newSet = createCarouselSet(new BeatmapSetInfo(new[] { beatmap })
+                    {
+                        ID = beatmapSet.ID
+                    });
 
-                // check if we can/need to maintain our current selection.
-                if (previouslySelectedID != null)
-                    select((CarouselItem?)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
+                    if (newSet != null)
+                    {
+                        root.AddItem(newSet);
+
+                        // check if we can/need to maintain our current selection.
+                        if (previouslySelectedID != null)
+                            select((CarouselItem?)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
+                    }
+                }
+            }
+            else
+            {
+                var newSet = createCarouselSet(beatmapSet);
+
+                if (newSet != null)
+                {
+                    root.AddItem(newSet);
+
+                    // check if we can/need to maintain our current selection.
+                    if (previouslySelectedID != null)
+                        select((CarouselItem?)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
+                }
             }
 
             itemsCache.Invalidate();

From 018be4c20f408ee98bb00a3897e2658b4f016596 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Aug 2023 18:40:34 +0900
Subject: [PATCH 0287/2296] Fix selection not being retained when switching
 between split mode

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

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 2227eb801a..c5e46a00b6 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -131,6 +131,12 @@ namespace osu.Game.Screens.Select
         {
             originalBeatmapSetsDetached = beatmapSets.Detach();
 
+            if (selectedBeatmapSet != null && !originalBeatmapSetsDetached.Contains(selectedBeatmapSet.BeatmapSet))
+                selectedBeatmapSet = null;
+
+            var selectedSetBefore = selectedBeatmapSet;
+            var selectedBetmapBefore = selectedBeatmap;
+
             CarouselRoot newRoot = new CarouselRoot(this);
 
             if (beatmapsSplitOut)
@@ -148,14 +154,12 @@ namespace osu.Game.Screens.Select
             else
             {
                 var carouselBeatmapSets = originalBeatmapSetsDetached.Select(createCarouselSet).OfType<CarouselBeatmapSet>();
+
                 newRoot.AddItems(carouselBeatmapSets);
             }
 
             root = newRoot;
 
-            if (selectedBeatmapSet != null && !originalBeatmapSetsDetached.Contains(selectedBeatmapSet.BeatmapSet))
-                selectedBeatmapSet = null;
-
             Scroll.Clear(false);
             itemsCache.Invalidate();
             ScrollToSelected();
@@ -164,6 +168,15 @@ namespace osu.Game.Screens.Select
 
             if (loadedTestBeatmaps)
                 signalBeatmapsLoaded();
+
+            // Restore selection
+            if (selectedBetmapBefore != null && selectedSetBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedSetBefore.BeatmapSet.ID, out var newSelectionCandidates))
+            {
+                CarouselBeatmap? found = newSelectionCandidates.SelectMany(s => s.Beatmaps).SingleOrDefault(b => b.BeatmapInfo.ID == selectedBetmapBefore.BeatmapInfo.ID);
+
+                if (found != null)
+                    found.State.Value = CarouselItemState.Selected;
+            }
         }
 
         private readonly List<CarouselItem> visibleItems = new List<CarouselItem>();

From c9f611a713916ea36f9a98eb93de4c02c11cbfc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 14:30:55 +0200
Subject: [PATCH 0288/2296] Enable NRT in `TestSceneObjectOrderedHitPolicy`

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index ee70441688..8c2d8ea84e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.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;
@@ -380,7 +378,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => judgementResults.Single(r => r.HitObject == hitObject).Type, () => Is.EqualTo(result));
         }
 
-        private void addJudgementAssert(string name, Func<OsuHitObject> hitObject, HitResult result)
+        private void addJudgementAssert(string name, Func<OsuHitObject?> hitObject, HitResult result)
         {
             AddAssert($"{name} judgement is {result}",
                 () => judgementResults.Single(r => r.HitObject == hitObject()).Type == result);
@@ -392,8 +390,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, offset, 100));
         }
 
-        private ScoreAccessibleReplayPlayer currentPlayer;
-        private List<JudgementResult> judgementResults;
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
+        private List<JudgementResult> judgementResults = null!;
 
         private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames)
         {

From ab4d47b594dd45358110db8b68a76705e1089b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 14:37:58 +0200
Subject: [PATCH 0289/2296] Rewrite assertions to use nunit constraints

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 8c2d8ea84e..9ee55d95a5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -381,13 +381,13 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void addJudgementAssert(string name, Func<OsuHitObject?> hitObject, HitResult result)
         {
             AddAssert($"{name} judgement is {result}",
-                () => judgementResults.Single(r => r.HitObject == hitObject()).Type == result);
+                () => judgementResults.Single(r => r.HitObject == hitObject()).Type, () => Is.EqualTo(result));
         }
 
         private void addJudgementOffsetAssert(OsuHitObject hitObject, double offset)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",
-                () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, offset, 100));
+                () => judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, () => Is.EqualTo(offset).Within(100));
         }
 
         private ScoreAccessibleReplayPlayer currentPlayer = null!;

From 9fd59b807f23c27f298d146c25f737305d73ecfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 15:06:06 +0200
Subject: [PATCH 0290/2296] Rewrite `TestSceneObjectOrderedHitPolicy` to not
 rely on custom hitwindows

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 117 +++++++-----------
 1 file changed, 47 insertions(+), 70 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 9ee55d95a5..1dd9116da2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Screens;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
@@ -17,6 +16,7 @@ using osu.Game.Rulesets.Objects.Types;
 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.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -28,8 +28,13 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public partial class TestSceneObjectOrderedHitPolicy : RateAdjustedBeatmapTestScene
     {
-        private const double early_miss_window = 1000; // time after -1000 to -500 is considered a miss
-        private const double late_miss_window = 500; // time after +500 is considered a miss
+        private readonly OsuHitWindows referenceHitWindows;
+
+        public TestSceneObjectOrderedHitPolicy()
+        {
+            referenceHitWindows = new OsuHitWindows();
+            referenceHitWindows.SetDifficulty(0);
+        }
 
         /// <summary>
         /// Tests clicking a future circle before the first circle's start time, while the first circle HAS NOT been judged.
@@ -44,12 +49,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_first_circle,
                     Position = positionFirstCircle
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_second_circle,
                     Position = positionSecondCircle
@@ -63,7 +68,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
-            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+            // note lock prevented the object from being hit, so the judgement offset should be very late.
+            addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
         }
 
         /// <summary>
@@ -79,12 +85,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_first_circle,
                     Position = positionFirstCircle
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_second_circle,
                     Position = positionSecondCircle
@@ -98,7 +104,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
-            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+            // note lock prevented the object from being hit, so the judgement offset should be very late.
+            addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
         }
 
         /// <summary>
@@ -114,12 +121,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_first_circle,
                     Position = positionFirstCircle
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_second_circle,
                     Position = positionSecondCircle
@@ -133,7 +140,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
-            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+            // note lock prevented the object from being hit, so the judgement offset should be very late.
+            addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
         }
 
         /// <summary>
@@ -149,12 +157,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_first_circle,
                     Position = positionFirstCircle
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_second_circle,
                     Position = positionSecondCircle
@@ -167,8 +175,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Time = time_first_circle - 100, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
             });
 
-            addJudgementAssert(hitObjects[0], HitResult.Great);
-            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert(hitObjects[0], HitResult.Meh);
+            addJudgementAssert(hitObjects[1], HitResult.Meh);
             addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
             addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
         }
@@ -186,12 +194,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_first_circle,
                     Position = positionFirstCircle
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_second_circle,
                     Position = positionSecondCircle
@@ -204,8 +212,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Time = time_first_circle, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
             });
 
-            addJudgementAssert(hitObjects[0], HitResult.Great);
-            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert(hitObjects[0], HitResult.Meh);
+            addJudgementAssert(hitObjects[1], HitResult.Ok);
             addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
             addJudgementOffsetAssert(hitObjects[1], -100); // time_second_circle - first_circle_time
         }
@@ -223,19 +231,19 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_circle,
                     Position = positionCircle
                 },
-                new TestSlider
+                new Slider
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
-                        new Vector2(25, 0),
+                        new Vector2(50, 0),
                     })
                 }
             };
@@ -265,19 +273,19 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_circle,
                     Position = positionCircle
                 },
-                new TestSlider
+                new Slider
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
-                        new Vector2(25, 0),
+                        new Vector2(50, 0),
                     })
                 }
             };
@@ -285,11 +293,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             performTest(hitObjects, new List<ReplayFrame>
             {
                 new OsuReplayFrame { Time = time_slider, Position = positionSlider, Actions = { OsuAction.LeftButton } },
-                new OsuReplayFrame { Time = time_circle + late_miss_window - 100, Position = positionCircle, Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_circle + late_miss_window - 90, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_circle + referenceHitWindows.WindowFor(HitResult.Meh) - 100, Position = positionCircle, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_circle + referenceHitWindows.WindowFor(HitResult.Meh) - 90, Position = positionSlider, Actions = { OsuAction.LeftButton } },
             });
 
-            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[0], HitResult.Ok);
             addJudgementAssert(hitObjects[1], HitResult.Great);
             addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
@@ -302,7 +310,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestHitCircleBeforeSpinner()
         {
             const double time_spinner = 1500;
-            const double time_circle = 1800;
+            const double time_circle = 1600;
             Vector2 positionCircle = Vector2.Zero;
 
             var hitObjects = new List<OsuHitObject>
@@ -313,7 +321,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     Position = new Vector2(256, 192),
                     EndTime = time_spinner + 1000,
                 },
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_circle,
                     Position = positionCircle
@@ -331,7 +339,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
-            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Meh);
         }
 
         [Test]
@@ -344,12 +352,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             var hitObjects = new List<OsuHitObject>
             {
-                new TestHitCircle
+                new HitCircle
                 {
                     StartTime = time_circle,
                     Position = positionCircle
                 },
-                new TestSlider
+                new Slider
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
@@ -400,7 +408,11 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
                 {
                     HitObjects = hitObjects,
-                    Difficulty = new BeatmapDifficulty { SliderTickRate = 3 },
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        OverallDifficulty = 0,
+                        SliderTickRate = 3
+                    },
                     BeatmapInfo =
                     {
                         Ruleset = new OsuRuleset().RulesetInfo
@@ -428,28 +440,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
-        private class TestHitCircle : HitCircle
-        {
-            protected override HitWindows CreateHitWindows() => new TestHitWindows();
-        }
-
-        private class TestSlider : Slider
-        {
-            public TestSlider()
-            {
-                SliderVelocity = 0.1f;
-
-                DefaultsApplied += _ =>
-                {
-                    HeadCircle.HitWindows = new TestHitWindows();
-                    TailCircle.HitWindows = new TestHitWindows();
-
-                    HeadCircle.HitWindows.SetDifficulty(0);
-                    TailCircle.HitWindows.SetDifficulty(0);
-                };
-            }
-        }
-
         private class TestSpinner : Spinner
         {
             protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
@@ -459,19 +449,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             }
         }
 
-        private class TestHitWindows : HitWindows
-        {
-            private static readonly DifficultyRange[] ranges =
-            {
-                new DifficultyRange(HitResult.Great, 500, 500, 500),
-                new DifficultyRange(HitResult.Miss, early_miss_window, early_miss_window, early_miss_window),
-            };
-
-            public override bool IsHitResultAllowed(HitResult result) => result == HitResult.Great || result == HitResult.Miss;
-
-            protected override DifficultyRange[] GetRanges() => ranges;
-        }
-
         private partial class ScoreAccessibleReplayPlayer : ReplayPlayer
         {
             public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;

From a1b4a5621592234f4787d26a88d1b03830661c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 18:04:20 +0200
Subject: [PATCH 0291/2296] Add capability to export ordered object policy test
 cases for stable crosscheck

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 86 ++++++++++++++++++-
 1 file changed, 83 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 1dd9116da2..5205400a7e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -3,12 +3,17 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
 using NUnit.Framework;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Formats;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -20,6 +25,7 @@ using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual;
 using osuTK;
@@ -30,6 +36,13 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         private readonly OsuHitWindows referenceHitWindows;
 
+        /// <summary>
+        /// This is provided as a convenience for testing note lock behaviour against osu!stable.
+        /// Setting this field to a non-null path will cause beatmap files and replays used in all test cases
+        /// to be exported to disk so that they can be cross-checked against stable.
+        /// </summary>
+        private readonly string? exportLocation = null;
+
         public TestSceneObjectOrderedHitPolicy()
         {
             referenceHitWindows = new OsuHitWindows();
@@ -401,12 +414,21 @@ namespace osu.Game.Rulesets.Osu.Tests
         private ScoreAccessibleReplayPlayer currentPlayer = null!;
         private List<JudgementResult> judgementResults = null!;
 
-        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames)
+        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames, [CallerMemberName] string testCaseName = "")
         {
-            AddStep("load player", () =>
+            IBeatmap playableBeatmap = null!;
+            Score score = null!;
+
+            AddStep("create beatmap", () =>
             {
+                var cpi = new ControlPointInfo();
+                cpi.Add(0, new TimingControlPoint { BeatLength = 1000 });
                 Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
                 {
+                    Metadata =
+                    {
+                        Title = testCaseName
+                    },
                     HitObjects = hitObjects,
                     Difficulty = new BeatmapDifficulty
                     {
@@ -417,11 +439,69 @@ namespace osu.Game.Rulesets.Osu.Tests
                     {
                         Ruleset = new OsuRuleset().RulesetInfo
                     },
+                    ControlPointInfo = cpi
+                });
+                playableBeatmap = Beatmap.Value.GetPlayableBeatmap(new OsuRuleset().RulesetInfo);
+            });
+
+            AddStep("create score", () =>
+            {
+                score = new Score
+                {
+                    Replay = new Replay
+                    {
+                        Frames = new List<ReplayFrame>
+                        {
+                            // required for correct playback in stable
+                            new OsuReplayFrame(0, new Vector2(256, -500)),
+                            new OsuReplayFrame(0, new Vector2(256, -500))
+                        }.Concat(frames).ToList()
+                    },
+                    ScoreInfo =
+                    {
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapInfo = playableBeatmap.BeatmapInfo
+                    }
+                };
+            });
+
+            if (exportLocation != null)
+            {
+                AddStep("create beatmap", () =>
+                {
+                    var beatmapEncoder = new LegacyBeatmapEncoder(playableBeatmap, null);
+
+                    using (var stream = File.Open(Path.Combine(exportLocation, $"{testCaseName}.osu"), FileMode.Create))
+                    {
+                        var memoryStream = new MemoryStream();
+                        using (var writer = new StreamWriter(memoryStream, Encoding.UTF8, leaveOpen: true))
+                            beatmapEncoder.Encode(writer);
+
+                        memoryStream.Seek(0, SeekOrigin.Begin);
+                        memoryStream.CopyTo(stream);
+                        memoryStream.Seek(0, SeekOrigin.Begin);
+                        playableBeatmap.BeatmapInfo.MD5Hash = memoryStream.ComputeMD5Hash();
+                    }
                 });
 
+                AddStep("export score", () =>
+                {
+                    var scoreToEncode = score.DeepClone();
+                    scoreToEncode.Replay.Frames = scoreToEncode.Replay.Frames.Cast<OsuReplayFrame>()
+                                                               .Select(frame => new OsuReplayFrame(frame.Time + LegacyBeatmapDecoder.EARLY_VERSION_TIMING_OFFSET, frame.Position, frame.Actions.ToArray()))
+                                                               .ToList<ReplayFrame>();
+
+                    using var stream = File.Open(Path.Combine(exportLocation, $"{testCaseName}.osr"), FileMode.Create);
+                    var encoder = new LegacyScoreEncoder(scoreToEncode, playableBeatmap);
+                    encoder.Encode(stream);
+                });
+            }
+
+            AddStep("load player", () =>
+            {
                 SelectedMods.Value = new[] { new OsuModClassic() };
 
-                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+                var p = new ScoreAccessibleReplayPlayer(score);
 
                 p.OnLoadComplete += _ =>
                 {

From 64786aaee8d99de8757648635cf1daa3d7ec75d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 10:43:48 +0200
Subject: [PATCH 0292/2296] Adjust test cases slightly to avoid running into
 hitwindow edge issue

Some note lock test cases do not play out correctly when exported out
to stable due to a completely separate issue, namely #11311.
Adjust the test cases for now to isolate failure vectors.
---
 .../TestSceneObjectOrderedHitPolicy.cs             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 5205400a7e..fd8973c375 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -184,14 +184,14 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_first_circle - 200, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
-                new OsuReplayFrame { Time = time_first_circle - 100, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
+                new OsuReplayFrame { Time = time_first_circle - 190, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle - 90, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Meh);
             addJudgementAssert(hitObjects[1], HitResult.Meh);
-            addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
-            addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
+            addJudgementOffsetAssert(hitObjects[0], -190); // time_first_circle - 190
+            addJudgementOffsetAssert(hitObjects[0], -90); // time_second_circle - first_circle_time - 90
         }
 
         /// <summary>
@@ -221,13 +221,13 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_first_circle - 200, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle - 190, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_first_circle, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
             });
 
             addJudgementAssert(hitObjects[0], HitResult.Meh);
             addJudgementAssert(hitObjects[1], HitResult.Ok);
-            addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
+            addJudgementOffsetAssert(hitObjects[0], -190); // time_first_circle - 190
             addJudgementOffsetAssert(hitObjects[1], -100); // time_second_circle - first_circle_time
         }
 
@@ -343,7 +343,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             performTest(hitObjects, new List<ReplayFrame>
             {
-                new OsuReplayFrame { Time = time_spinner - 100, Position = positionCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_spinner - 90, Position = positionCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_spinner + 10, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
                 new OsuReplayFrame { Time = time_spinner + 20, Position = new Vector2(256, 172), Actions = { OsuAction.RightButton } },
                 new OsuReplayFrame { Time = time_spinner + 30, Position = new Vector2(276, 192), Actions = { OsuAction.RightButton } },

From 91c2cadb4737839e36d087c02658b4872cd2456a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 19:13:32 +0900
Subject: [PATCH 0293/2296] Add missing colon in mod settings tooltip

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index f9812d6c00..6d40826afe 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Mods
                     var bindable = (IBindable)property.GetValue(this)!;
 
                     if (!bindable.IsDefault)
-                        tooltipTexts.Add($"{attr.Label} {bindable}");
+                        tooltipTexts.Add($"{attr.Label}: {bindable}");
                 }
 
                 return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));

From 5555f73e97f22f9c6f0425bc4c9459bef88f3be5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 19:38:18 +0900
Subject: [PATCH 0294/2296] Update test to match new behaviour

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 61f95dc628..b0aff8b4db 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -758,7 +758,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        public void TestSortingWithFiltered()
+        public void TestSortingWithDifficultyFiltered()
         {
             List<BeatmapSetInfo> sets = new List<BeatmapSetInfo>();
 
@@ -777,13 +777,32 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             loadBeatmaps(sets);
 
+            AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
+
+            checkVisibleItemCount(false, 9);
+            checkVisibleItemCount(true, 1);
+
             AddStep("Filter to normal", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Normal" }, false));
-            AddAssert("Check first set at end", () => carousel.BeatmapSets.First().Equals(sets.Last()));
-            AddAssert("Check last set at start", () => carousel.BeatmapSets.Last().Equals(sets.First()));
+            checkVisibleItemCount(false, 3);
+            checkVisibleItemCount(true, 1);
+
+            AddUntilStep("Check all visible sets have one normal", () =>
+            {
+                return carousel.Items.OfType<DrawableCarouselBeatmapSet>()
+                               .Where(p => p.IsPresent)
+                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Normal", StringComparison.Ordinal)) == 3;
+            });
 
             AddStep("Filter to insane", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Insane" }, false));
-            AddAssert("Check first set at start", () => carousel.BeatmapSets.First().Equals(sets.First()));
-            AddAssert("Check last set at end", () => carousel.BeatmapSets.Last().Equals(sets.Last()));
+            checkVisibleItemCount(false, 3);
+            checkVisibleItemCount(true, 1);
+
+            AddUntilStep("Check all visible sets have one insane", () =>
+            {
+                return carousel.Items.OfType<DrawableCarouselBeatmapSet>()
+                               .Where(p => p.IsPresent)
+                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Insane", StringComparison.Ordinal)) == 3;
+            });
         }
 
         [Test]

From a64381f8553dd49b9c5c5142aa2934c333b101a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 19:43:08 +0900
Subject: [PATCH 0295/2296] Add test coverage of add/remove when difficulties
 are split out

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 47 +++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index b0aff8b4db..5af6d862b2 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         private BeatmapInfo currentSelection => carousel.SelectedBeatmapInfo;
 
         private const int set_count = 5;
+        private const int diff_count = 3;
 
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
@@ -501,6 +502,36 @@ namespace osu.Game.Tests.Visual.SongSelect
             waitForSelection(set_count);
         }
 
+        [Test]
+        public void TestAddRemoveDifficultySort()
+        {
+            loadBeatmaps();
+
+            AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
+
+            checkVisibleItemCount(false, set_count * diff_count);
+
+            var firstAdded = TestResources.CreateTestBeatmapSetInfo(diff_count);
+            var secondAdded = TestResources.CreateTestBeatmapSetInfo(diff_count);
+
+            AddStep("Add new set", () => carousel.UpdateBeatmapSet(firstAdded));
+            AddStep("Add new set", () => carousel.UpdateBeatmapSet(secondAdded));
+
+            checkVisibleItemCount(false, (set_count + 2) * diff_count);
+
+            AddStep("Remove set", () => carousel.RemoveBeatmapSet(firstAdded));
+
+            checkVisibleItemCount(false, (set_count + 1) * diff_count);
+
+            setSelected(set_count + 1, 1);
+
+            AddStep("Remove set", () => carousel.RemoveBeatmapSet(secondAdded));
+
+            checkVisibleItemCount(false, (set_count) * diff_count);
+
+            waitForSelection(set_count);
+        }
+
         [Test]
         public void TestSelectionEnteringFromEmptyRuleset()
         {
@@ -662,7 +693,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 for (int i = 0; i < 3; i++)
                 {
-                    var set = TestResources.CreateTestBeatmapSetInfo(3);
+                    var set = TestResources.CreateTestBeatmapSetInfo(diff_count);
 
                     // only need to set the first as they are a shared reference.
                     var beatmap = set.Beatmaps.First();
@@ -709,7 +740,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 for (int i = 0; i < 3; i++)
                 {
-                    var set = TestResources.CreateTestBeatmapSetInfo(3);
+                    var set = TestResources.CreateTestBeatmapSetInfo(diff_count);
 
                     // only need to set the first as they are a shared reference.
                     var beatmap = set.Beatmaps.First();
@@ -768,7 +799,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 for (int i = 0; i < 3; i++)
                 {
-                    var set = TestResources.CreateTestBeatmapSetInfo(3);
+                    var set = TestResources.CreateTestBeatmapSetInfo(diff_count);
                     set.Beatmaps[0].StarRating = 3 - i;
                     set.Beatmaps[2].StarRating = 6 + i;
                     sets.Add(set);
@@ -857,7 +888,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("create hidden set", () =>
             {
-                hidingSet = TestResources.CreateTestBeatmapSetInfo(3);
+                hidingSet = TestResources.CreateTestBeatmapSetInfo(diff_count);
                 hidingSet.Beatmaps[1].Hidden = true;
 
                 hiddenList.Clear();
@@ -904,7 +935,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("add mixed ruleset beatmapset", () =>
             {
-                testMixed = TestResources.CreateTestBeatmapSetInfo(3);
+                testMixed = TestResources.CreateTestBeatmapSetInfo(diff_count);
 
                 for (int i = 0; i <= 2; i++)
                 {
@@ -926,7 +957,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             BeatmapSetInfo testSingle = null;
             AddStep("add single ruleset beatmapset", () =>
             {
-                testSingle = TestResources.CreateTestBeatmapSetInfo(3);
+                testSingle = TestResources.CreateTestBeatmapSetInfo(diff_count);
                 testSingle.Beatmaps.ForEach(b =>
                 {
                     b.Ruleset = rulesets.AvailableRulesets.ElementAt(1);
@@ -949,7 +980,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 manySets.Clear();
 
                 for (int i = 1; i <= 50; i++)
-                    manySets.Add(TestResources.CreateTestBeatmapSetInfo(3));
+                    manySets.Add(TestResources.CreateTestBeatmapSetInfo(diff_count));
             });
 
             loadBeatmaps(manySets);
@@ -1113,7 +1144,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 {
                     beatmapSets.Add(randomDifficulties
                         ? TestResources.CreateTestBeatmapSetInfo()
-                        : TestResources.CreateTestBeatmapSetInfo(3));
+                        : TestResources.CreateTestBeatmapSetInfo(diff_count));
                 }
             }
 

From 5eac604f8b2cf59a5346956d99a7fea0fdda0cd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 19:44:39 +0900
Subject: [PATCH 0296/2296] Add coverage of selection retention when
 difficulties are split out

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 5af6d862b2..daa8c9c4c2 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -1005,6 +1005,43 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selection was remembered", () => eagerSelectedIDs.Count == 1);
         }
 
+        [Test]
+        public void TestCarouselRemembersSelectionDifficultySort()
+        {
+            List<BeatmapSetInfo> manySets = new List<BeatmapSetInfo>();
+
+            AddStep("Populuate beatmap sets", () =>
+            {
+                manySets.Clear();
+
+                for (int i = 1; i <= 50; i++)
+                    manySets.Add(TestResources.CreateTestBeatmapSetInfo(diff_count));
+            });
+
+            loadBeatmaps(manySets);
+
+            AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
+
+            advanceSelection(direction: 1, diff: false);
+
+            for (int i = 0; i < 5; i++)
+            {
+                AddStep("Toggle non-matching filter", () =>
+                {
+                    carousel.Filter(new FilterCriteria { SearchText = Guid.NewGuid().ToString() }, false);
+                });
+
+                AddStep("Restore no filter", () =>
+                {
+                    carousel.Filter(new FilterCriteria(), false);
+                    eagerSelectedIDs.Add(carousel.SelectedBeatmapSet!.ID);
+                });
+            }
+
+            // always returns to same selection as long as it's available.
+            AddAssert("Selection was remembered", () => eagerSelectedIDs.Count == 1);
+        }
+
         [Test]
         public void TestFilteringByUserStarDifficulty()
         {

From d6aded3ac31b232884f0642bedc793f41b377b2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 20:11:55 +0900
Subject: [PATCH 0297/2296] Update framework

---
 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 8ebfde8047..2d15bce85a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.817.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.823.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4c3205178a..cd57c33109 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="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.822.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.823.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.822.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index fd1ba0f6d1..d515a035da 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.817.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.823.0" />
   </ItemGroup>
 </Project>

From 72d27152225f760c6526d3ecc186d3ff469224c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Aug 2023 20:21:43 +0900
Subject: [PATCH 0298/2296] Show mod settings as "on" or "off" rather than
 "True" or "False"

---
 osu.Game/Rulesets/Mods/Mod.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 6d40826afe..a9ecf89df1 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -71,8 +71,21 @@ namespace osu.Game.Rulesets.Mods
                 {
                     var bindable = (IBindable)property.GetValue(this)!;
 
+                    string valueText;
+
+                    switch (bindable)
+                    {
+                        case Bindable<bool> b:
+                            valueText = b.Value ? "on" : "off";
+                            break;
+
+                        default:
+                            valueText = bindable.ToString() ?? string.Empty;
+                            break;
+                    }
+
                     if (!bindable.IsDefault)
-                        tooltipTexts.Add($"{attr.Label}: {bindable}");
+                        tooltipTexts.Add($"{attr.Label}: {valueText}");
                 }
 
                 return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));

From 052bf2a6e07745ba9832345e896249ab6452ca44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 13:54:11 +0200
Subject: [PATCH 0299/2296] Use alternative solution for timing offset woes on
 export

---
 .../TestSceneObjectOrderedHitPolicy.cs                 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index fd8973c375..eff96febaa 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -437,7 +437,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                     },
                     BeatmapInfo =
                     {
-                        Ruleset = new OsuRuleset().RulesetInfo
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapVersion = LegacyBeatmapEncoder.FIRST_LAZER_VERSION // for correct offset treatment by score encoder
                     },
                     ControlPointInfo = cpi
                 });
@@ -486,13 +487,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 AddStep("export score", () =>
                 {
-                    var scoreToEncode = score.DeepClone();
-                    scoreToEncode.Replay.Frames = scoreToEncode.Replay.Frames.Cast<OsuReplayFrame>()
-                                                               .Select(frame => new OsuReplayFrame(frame.Time + LegacyBeatmapDecoder.EARLY_VERSION_TIMING_OFFSET, frame.Position, frame.Actions.ToArray()))
-                                                               .ToList<ReplayFrame>();
-
                     using var stream = File.Open(Path.Combine(exportLocation, $"{testCaseName}.osr"), FileMode.Create);
-                    var encoder = new LegacyScoreEncoder(scoreToEncode, playableBeatmap);
+                    var encoder = new LegacyScoreEncoder(score, playableBeatmap);
                     encoder.Encode(stream);
                 });
             }

From a8e4237e34d198d97106d76a86950846ce2bc54d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 03:23:18 +0900
Subject: [PATCH 0300/2296] Enable sentry "global mode" as per recommendation

Sentry documentation suggests this should be on for a client-facing app.

We haven't run into issues without it until now, but might as well set it correctly?
---
 osu.Game/Utils/SentryLogger.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
index 8c39a2d15a..61622a7122 100644
--- a/osu.Game/Utils/SentryLogger.cs
+++ b/osu.Game/Utils/SentryLogger.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Utils
 
                 options.AutoSessionTracking = true;
                 options.IsEnvironmentUser = false;
+                options.IsGlobalModeEnabled = true;
                 // The reported release needs to match version as reported to Sentry in .github/workflows/sentry-release.yml
                 options.Release = $"osu@{game.Version.Replace($@"-{OsuGameBase.BUILD_SUFFIX}", string.Empty)}";
             });

From 4881130caeccc728dbb789665fd161da1cfb0b53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 03:32:12 +0900
Subject: [PATCH 0301/2296] Limit set/diff count in test to better fit on
 screen

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index daa8c9c4c2..d68fa6100c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -791,17 +791,20 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestSortingWithDifficultyFiltered()
         {
+            const int local_diff_count = 3;
+            const int local_set_count = 2;
+
             List<BeatmapSetInfo> sets = new List<BeatmapSetInfo>();
 
             AddStep("Populuate beatmap sets", () =>
             {
                 sets.Clear();
 
-                for (int i = 0; i < 3; i++)
+                for (int i = 0; i < local_set_count; i++)
                 {
-                    var set = TestResources.CreateTestBeatmapSetInfo(diff_count);
+                    var set = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
                     set.Beatmaps[0].StarRating = 3 - i;
-                    set.Beatmaps[2].StarRating = 6 + i;
+                    set.Beatmaps[1].StarRating = 6 + i;
                     sets.Add(set);
                 }
             });
@@ -810,29 +813,29 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
 
-            checkVisibleItemCount(false, 9);
+            checkVisibleItemCount(false, local_set_count * local_diff_count);
             checkVisibleItemCount(true, 1);
 
             AddStep("Filter to normal", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Normal" }, false));
-            checkVisibleItemCount(false, 3);
+            checkVisibleItemCount(false, local_set_count);
             checkVisibleItemCount(true, 1);
 
             AddUntilStep("Check all visible sets have one normal", () =>
             {
                 return carousel.Items.OfType<DrawableCarouselBeatmapSet>()
                                .Where(p => p.IsPresent)
-                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Normal", StringComparison.Ordinal)) == 3;
+                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Normal", StringComparison.Ordinal)) == local_set_count;
             });
 
             AddStep("Filter to insane", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty, SearchText = "Insane" }, false));
-            checkVisibleItemCount(false, 3);
+            checkVisibleItemCount(false, local_set_count);
             checkVisibleItemCount(true, 1);
 
             AddUntilStep("Check all visible sets have one insane", () =>
             {
                 return carousel.Items.OfType<DrawableCarouselBeatmapSet>()
                                .Where(p => p.IsPresent)
-                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Insane", StringComparison.Ordinal)) == 3;
+                               .Count(p => ((CarouselBeatmapSet)p.Item)!.Beatmaps.Single().BeatmapInfo.DifficultyName.StartsWith("Insane", StringComparison.Ordinal)) == local_set_count;
             });
         }
 

From c8f42f73e87029f3e235b92d3a97ba776d6327f9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 24 Aug 2023 11:17:41 +0900
Subject: [PATCH 0302/2296] Adjust mania hit windows with gameplay rate

---
 .../Mods/IManiaRateAdjustmentMod.cs           | 47 +++++++++++++++++++
 .../Mods/ManiaModDaycore.cs                   |  5 +-
 .../Mods/ManiaModDoubleTime.cs                |  5 +-
 .../Mods/ManiaModHalfTime.cs                  |  5 +-
 .../Mods/ManiaModNightcore.cs                 |  5 +-
 .../Scoring/ManiaHitWindows.cs                | 20 ++++++++
 6 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Mods/IManiaRateAdjustmentMod.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/IManiaRateAdjustmentMod.cs b/osu.Game.Rulesets.Mania/Mods/IManiaRateAdjustmentMod.cs
new file mode 100644
index 0000000000..ea01bd4436
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/IManiaRateAdjustmentMod.cs
@@ -0,0 +1,47 @@
+// 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.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    /// <summary>
+    /// May be attached to rate-adjustment mods to adjust hit windows adjust relative to gameplay rate.
+    /// </summary>
+    /// <remarks>
+    /// Historically, in osu!mania, hit windows are expected to adjust relative to the gameplay rate such that the real-world hit window remains the same.
+    /// </remarks>
+    public interface IManiaRateAdjustmentMod : IApplicableToDifficulty, IApplicableToHitObject
+    {
+        BindableNumber<double> SpeedChange { get; }
+
+        HitWindows HitWindows { get; set; }
+
+        void IApplicableToDifficulty.ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            HitWindows = new ManiaHitWindows(SpeedChange.Value);
+            HitWindows.SetDifficulty(difficulty.OverallDifficulty);
+        }
+
+        void IApplicableToHitObject.ApplyToHitObject(HitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case Note:
+                    hitObject.HitWindows = HitWindows;
+                    break;
+
+                case HoldNote hold:
+                    hold.Head.HitWindows = HitWindows;
+                    hold.Tail.HitWindows = HitWindows;
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModDaycore.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModDaycore.cs
index 309393b664..dbe2a9a9fc 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModDaycore.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModDaycore.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.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModDaycore : ModDaycore
+    public class ManiaModDaycore : ModDaycore, IManiaRateAdjustmentMod
     {
+        public HitWindows HitWindows { get; set; } = new ManiaHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs
index f4b9cf3b88..a841a8ab37 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.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.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModDoubleTime : ModDoubleTime
+    public class ManiaModDoubleTime : ModDoubleTime, IManiaRateAdjustmentMod
     {
+        public HitWindows HitWindows { get; set; } = new ManiaHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHalfTime.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHalfTime.cs
index 8d48e3acde..b0fbb11396 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHalfTime.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHalfTime.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.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModHalfTime : ModHalfTime
+    public class ManiaModHalfTime : ModHalfTime, IManiaRateAdjustmentMod
     {
+        public HitWindows HitWindows { get; set; } = new ManiaHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs
index 748725af9f..f64f7ae31a 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModNightcore : ModNightcore<ManiaHitObject>
+    public class ManiaModNightcore : ModNightcore<ManiaHitObject>, IManiaRateAdjustmentMod
     {
+        public HitWindows HitWindows { get; set; } = new ManiaHitWindows();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
index 289f8a00ef..627f48f391 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaHitWindows.cs
@@ -1,12 +1,25 @@
 // 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.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Scoring
 {
     public class ManiaHitWindows : HitWindows
     {
+        private readonly double multiplier;
+
+        public ManiaHitWindows()
+            : this(1)
+        {
+        }
+
+        public ManiaHitWindows(double multiplier)
+        {
+            this.multiplier = multiplier;
+        }
+
         public override bool IsHitResultAllowed(HitResult result)
         {
             switch (result)
@@ -22,5 +35,12 @@ namespace osu.Game.Rulesets.Mania.Scoring
 
             return false;
         }
+
+        protected override DifficultyRange[] GetRanges() => base.GetRanges().Select(r =>
+            new DifficultyRange(
+                r.Result,
+                r.Min * multiplier,
+                r.Average * multiplier,
+                r.Max * multiplier)).ToArray();
     }
 }

From ba70d48d2cc0013fbc42338e0867cbe1e6ea8c82 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 13:31:33 +0900
Subject: [PATCH 0303/2296] Fix one more test probably going off-screen

---
 .../SongSelect/TestSceneBeatmapCarousel.cs    | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index d68fa6100c..8a38e2a84b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestScrollPositionMaintainedOnAdd()
         {
-            loadBeatmaps(count: 1, randomDifficulties: false);
+            loadBeatmaps(setCount: 1);
 
             for (int i = 0; i < 10; i++)
             {
@@ -125,7 +125,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestDeletion()
         {
-            loadBeatmaps(count: 5, randomDifficulties: true);
+            loadBeatmaps(setCount: 5, randomDifficulties: true);
 
             AddStep("remove first set", () => carousel.RemoveBeatmapSet(carousel.Items.Select(item => item.Item).OfType<CarouselBeatmapSet>().First().BeatmapSet));
             AddUntilStep("4 beatmap sets visible", () => this.ChildrenOfType<DrawableCarouselBeatmapSet>().Count(set => set.Alpha > 0) == 4);
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestScrollPositionMaintainedOnDelete()
         {
-            loadBeatmaps(count: 50, randomDifficulties: false);
+            loadBeatmaps(setCount: 50);
 
             for (int i = 0; i < 10; i++)
             {
@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestManyPanels()
         {
-            loadBeatmaps(count: 5000, randomDifficulties: true);
+            loadBeatmaps(setCount: 5000, randomDifficulties: true);
         }
 
         [Test]
@@ -505,31 +505,34 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestAddRemoveDifficultySort()
         {
-            loadBeatmaps();
+            const int local_set_count = 1;
+            const int local_diff_count = 1;
+
+            loadBeatmaps(setCount: local_set_count, diffCount: local_diff_count);
 
             AddStep("Sort by difficulty", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }, false));
 
-            checkVisibleItemCount(false, set_count * diff_count);
+            checkVisibleItemCount(false, local_set_count * local_diff_count);
 
-            var firstAdded = TestResources.CreateTestBeatmapSetInfo(diff_count);
-            var secondAdded = TestResources.CreateTestBeatmapSetInfo(diff_count);
+            var firstAdded = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
+            var secondAdded = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
 
             AddStep("Add new set", () => carousel.UpdateBeatmapSet(firstAdded));
             AddStep("Add new set", () => carousel.UpdateBeatmapSet(secondAdded));
 
-            checkVisibleItemCount(false, (set_count + 2) * diff_count);
+            checkVisibleItemCount(false, (local_set_count + 2) * local_diff_count);
 
             AddStep("Remove set", () => carousel.RemoveBeatmapSet(firstAdded));
 
-            checkVisibleItemCount(false, (set_count + 1) * diff_count);
+            checkVisibleItemCount(false, (local_set_count + 1) * local_diff_count);
 
-            setSelected(set_count + 1, 1);
+            setSelected(local_set_count + 1, 1);
 
             AddStep("Remove set", () => carousel.RemoveBeatmapSet(secondAdded));
 
-            checkVisibleItemCount(false, (set_count) * diff_count);
+            checkVisibleItemCount(false, (local_set_count) * local_diff_count);
 
-            waitForSelection(set_count);
+            waitForSelection(local_set_count);
         }
 
         [Test]
@@ -1171,8 +1174,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             }
         }
 
-        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null, Action<BeatmapCarousel> carouselAdjust = null, int? count = null,
-                                  bool randomDifficulties = false)
+        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null, Action<BeatmapCarousel> carouselAdjust = null,
+                                  int? setCount = null, int? diffCount = null, bool randomDifficulties = false)
         {
             bool changed = false;
 
@@ -1180,11 +1183,11 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 beatmapSets = new List<BeatmapSetInfo>();
 
-                for (int i = 1; i <= (count ?? set_count); i++)
+                for (int i = 1; i <= (setCount ?? set_count); i++)
                 {
                     beatmapSets.Add(randomDifficulties
                         ? TestResources.CreateTestBeatmapSetInfo()
-                        : TestResources.CreateTestBeatmapSetInfo(diff_count));
+                        : TestResources.CreateTestBeatmapSetInfo(diffCount ?? diff_count));
                 }
             }
 

From 981e0c1ad7f46372e497828ea744b2f05f444206 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 14:26:26 +0900
Subject: [PATCH 0304/2296] Rename export test step to better fit purpose

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index eff96febaa..f52c23d7e2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -468,7 +468,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             if (exportLocation != null)
             {
-                AddStep("create beatmap", () =>
+                AddStep("export beatmap", () =>
                 {
                     var beatmapEncoder = new LegacyBeatmapEncoder(playableBeatmap, null);
 

From 5ddb10281b06ad3696582a4b13706d710b30c284 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 14:55:24 +0900
Subject: [PATCH 0305/2296] Move combo exponent to shared constant

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 12 +++++-------
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs          | 10 +++++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 7a77434f23..92290fcf1c 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -270,14 +270,12 @@ namespace osu.Game.Database
             switch (score.Ruleset.OnlineID)
             {
                 case 0:
-                    if(score.MaxCombo == 0 || score.Accuracy == 0)
+                    if (score.MaxCombo == 0 || score.Accuracy == 0)
                         return (long)Math.Round((
                             0
                             + 300000 * Math.Pow(score.Accuracy, 8)
                             + bonusProportion) * modMultiplier);
 
-                    double v3exp = 0.5; // Scorev3 combo exponent
-
                     // Assumption :
                     // - sliders and slider-ticks are uniformly spread arround the beatmap
                     //      thus we can ignore them without losing much precision (consider a map of hit-circles only !)
@@ -287,12 +285,12 @@ namespace osu.Game.Database
                     // This is the ComboScore of v1/v3 were we remove all (map-)constant multipliers and accuracy multipliers (including hit results),
                     // based on the previous assumptions. For Scorev1, this is basically the sum of squared combos (because without sliders: object_count == combo).
                     double maxStrippedV1 = Math.Pow(maximumLegacyCombo, 2);
-                    double maxStrippedV3 = Math.Pow(maximumLegacyCombo, 1 + v3exp);
+                    double maxStrippedV3 = Math.Pow(maximumLegacyCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
                     double strippedV1 = maxStrippedV1 * comboProportion / score.Accuracy;
 
                     double strippedV1FromMaxCombo = Math.Pow(score.MaxCombo, 2);
-                    double strippedV3FromMaxCombo = Math.Pow(score.MaxCombo, 1 + v3exp);
+                    double strippedV3FromMaxCombo = Math.Pow(score.MaxCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
                     // Compute approximate lower estimate scorev3 for that play
                     // That is, a play were we made biggest amount of big combos (Repeat MaxCombo + 1 remaining big combo)
@@ -301,7 +299,7 @@ namespace osu.Game.Database
                     double strippedV1FromMaxComboRepeat = possibleMaxComboRepeat * strippedV1FromMaxCombo;
                     double remainingStrippedV1 = strippedV1 - strippedV1FromMaxComboRepeat;
                     double remainingCombo = Math.Sqrt(remainingStrippedV1);
-                    double remainingStrippedV3 = Math.Pow(remainingCombo, 1 + v3exp);
+                    double remainingStrippedV3 = Math.Pow(remainingCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
                     double newLowerStrippedV3 = (possibleMaxComboRepeat * strippedV3FromMaxCombo) + remainingStrippedV3;
 
@@ -310,7 +308,7 @@ namespace osu.Game.Database
                     remainingStrippedV1 = strippedV1 - strippedV1FromMaxCombo;
                     double remainingComboObjects = maximumLegacyCombo - score.MaxCombo - score.Statistics[HitResult.Miss];
                     double remainingAverageCombo = remainingComboObjects > 0 ? remainingStrippedV1 / remainingComboObjects : 0;
-                    remainingStrippedV3 = remainingComboObjects * Math.Pow(remainingAverageCombo, v3exp);
+                    remainingStrippedV3 = remainingComboObjects * Math.Pow(remainingAverageCombo, ScoreProcessor.COMBO_EXPONENT);
 
                     double newUpperStrippedV3 = strippedV3FromMaxCombo + remainingStrippedV3;
 
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index ea1140ef71..514630b351 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -21,6 +21,14 @@ namespace osu.Game.Rulesets.Scoring
 {
     public partial class ScoreProcessor : JudgementProcessor
     {
+        /// <summary>
+        /// The exponent applied to combo in the default implementation of <see cref="GetComboScoreChange"/>.
+        /// </summary>
+        /// <remarks>
+        /// If a custom implementation overrides <see cref="GetComboScoreChange"/> this may not be relevant.
+        /// </remarks>
+        public const double COMBO_EXPONENT = 0.5;
+
         public const double MAX_SCORE = 1000000;
 
         private const double accuracy_cutoff_x = 1;
@@ -293,7 +301,7 @@ namespace osu.Game.Rulesets.Scoring
 
         protected virtual double GetBonusScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type);
 
-        protected virtual double GetComboScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type) * Math.Pow(result.ComboAfterJudgement, 0.5);
+        protected virtual double GetComboScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT);
 
         protected virtual void ApplyScoreChange(JudgementResult result)
         {

From a045cb71fc3d94f7d0d4f2bc0ab4ff770a1e0878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 19:44:22 +0200
Subject: [PATCH 0306/2296] Add assertions checking action type taken by legacy
 hit policy

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 35 +++++++++++++++++++
 osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs   |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index 8a38bf2b08..afda805d26 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -11,17 +11,20 @@ using NUnit.Framework;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 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.UI;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -83,6 +86,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // note lock prevented the object from being hit, so the judgement offset should be very late.
             addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
+            addClickActionAssert(0, ClickAction.Shake);
         }
 
         /// <summary>
@@ -119,6 +123,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // note lock prevented the object from being hit, so the judgement offset should be very late.
             addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
+            addClickActionAssert(0, ClickAction.Shake);
         }
 
         /// <summary>
@@ -155,6 +160,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // note lock prevented the object from being hit, so the judgement offset should be very late.
             addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
+            addClickActionAssert(0, ClickAction.Shake);
         }
 
         /// <summary>
@@ -192,6 +198,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Meh);
             addJudgementOffsetAssert(hitObjects[0], -190); // time_first_circle - 190
             addJudgementOffsetAssert(hitObjects[0], -90); // time_second_circle - first_circle_time - 90
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
         }
 
         /// <summary>
@@ -229,6 +237,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Ok);
             addJudgementOffsetAssert(hitObjects[0], -190); // time_first_circle - 190
             addJudgementOffsetAssert(hitObjects[1], -100); // time_second_circle - first_circle_time
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
         }
 
         /// <summary>
@@ -271,6 +281,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Great);
             addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
         }
 
         /// <summary>
@@ -314,6 +326,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.Great);
             addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
         }
 
         /// <summary>
@@ -353,6 +367,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Meh);
+            addClickActionAssert(0, ClickAction.Hit);
         }
 
         [Test]
@@ -391,6 +406,9 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Great);
+            addClickActionAssert(0, ClickAction.Shake);
+            addClickActionAssert(1, ClickAction.Hit);
+            addClickActionAssert(2, ClickAction.Hit);
         }
 
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
@@ -411,8 +429,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, () => Is.EqualTo(offset).Within(100));
         }
 
+        private void addClickActionAssert(int inputIndex, ClickAction action)
+            => AddAssert($"input #{inputIndex} resulted in {action}", () => testPolicy.ClickActions[inputIndex], () => Is.EqualTo(action));
+
         private ScoreAccessibleReplayPlayer currentPlayer = null!;
         private List<JudgementResult> judgementResults = null!;
+        private TestLegacyHitPolicy testPolicy = null!;
 
         private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames, [CallerMemberName] string testCaseName = "")
         {
@@ -513,6 +535,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+            AddStep("Substitute hit policy", () => currentPlayer.ChildrenOfType<OsuPlayfield>().Single().HitPolicy = testPolicy = new TestLegacyHitPolicy());
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
@@ -540,5 +563,17 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
             }
         }
+
+        private class TestLegacyHitPolicy : LegacyHitPolicy
+        {
+            public List<ClickAction> ClickActions { get; } = new List<ClickAction>();
+
+            public override ClickAction CheckHittable(DrawableHitObject hitObject, double time)
+            {
+                var action = base.CheckHittable(hitObject, time);
+                ClickActions.Add(action);
+                return action;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
index c35d4a1b56..6a740a6839 100644
--- a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.UI
         {
         }
 
-        public ClickAction CheckHittable(DrawableHitObject hitObject, double time)
+        public virtual ClickAction CheckHittable(DrawableHitObject hitObject, double time)
         {
             var aliveObjects = HitObjectContainer.AliveObjects.ToList();
             int index = aliveObjects.IndexOf(hitObject);

From 9ffc6cdd6110a94524c37b8d2c5bd3eaabb7e5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 19:58:31 +0200
Subject: [PATCH 0307/2296] Add test case covering overlapping slider fail case

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index afda805d26..fbbac91af5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -411,6 +411,53 @@ namespace osu.Game.Rulesets.Osu.Tests
             addClickActionAssert(2, ClickAction.Hit);
         }
 
+        [Test]
+        public void TestOverlappingSliders()
+        {
+            const double time_first_slider = 1000;
+            const double time_second_slider = 1200;
+            Vector2 positionFirstSlider = new Vector2(100, 50);
+            Vector2 positionSecondSlider = new Vector2(100, 80);
+            var midpoint = (positionFirstSlider + positionSecondSlider) / 2;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new Slider
+                {
+                    StartTime = time_first_slider,
+                    Position = positionFirstSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                },
+                new Slider
+                {
+                    StartTime = time_second_slider,
+                    Position = positionSecondSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_slider, Position = midpoint, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_first_slider + 25, Position = midpoint, Actions = { OsuAction.LeftButton, OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_first_slider + 50, Position = midpoint },
+                new OsuReplayFrame { Time = time_second_slider, Position = positionSecondSlider + new Vector2(0, 10), Actions = { OsuAction.LeftButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Ok);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",

From 48b3f7dced93f0600fdf22837c5b9c94308bf1f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Aug 2023 20:34:36 +0200
Subject: [PATCH 0308/2296] Add test case covering stacks not shaking

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
index fbbac91af5..738d1a0739 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -458,6 +458,26 @@ namespace osu.Game.Rulesets.Osu.Tests
             addClickActionAssert(1, ClickAction.Hit);
         }
 
+        [Test]
+        public void TestStacksDoNotShake()
+        {
+            const double time_stack_start = 1000;
+            Vector2 position = new Vector2(80);
+
+            var hitObjects = Enumerable.Range(0, 20).Select(i => new HitCircle
+            {
+                StartTime = time_stack_start + i * 100,
+                Position = position
+            }).Cast<OsuHitObject>().ToList();
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_stack_start - 450, Position = new Vector2(55), Actions = { OsuAction.LeftButton } },
+            });
+
+            addClickActionAssert(0, ClickAction.Ignore);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",

From 64b36a73b10691c38889fb5ed530e7c08e53c0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 12:43:53 +0200
Subject: [PATCH 0309/2296] Rename test scene to match tested class

---
 ...eObjectOrderedHitPolicy.cs => TestSceneLegacyHitPolicy.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Rulesets.Osu.Tests/{TestSceneObjectOrderedHitPolicy.cs => TestSceneLegacyHitPolicy.cs} (99%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
rename to osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 738d1a0739..6366a185f2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -35,7 +35,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public partial class TestSceneObjectOrderedHitPolicy : RateAdjustedBeatmapTestScene
+    public partial class TestSceneLegacyHitPolicy : RateAdjustedBeatmapTestScene
     {
         private readonly OsuHitWindows referenceHitWindows;
 
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// </summary>
         private readonly string? exportLocation = null;
 
-        public TestSceneObjectOrderedHitPolicy()
+        public TestSceneLegacyHitPolicy()
         {
             referenceHitWindows = new OsuHitWindows();
             referenceHitWindows.SetDifficulty(0);

From ed2b1a07540fe4038b03424abe14582de495b661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 13:12:18 +0200
Subject: [PATCH 0310/2296] Contain entirety of legacy notelock badness inside
 the hit policy

---
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs        | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs  | 4 ++--
 .../Objects/Drawables/DrawableHitCircle.cs               | 9 +++------
 .../Objects/Drawables/DrawableOsuHitObject.cs            | 3 ++-
 .../Objects/Drawables/DrawableSliderHead.cs              | 2 +-
 osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs            | 3 ++-
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs                   | 4 +++-
 osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs              | 6 +++++-
 osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs    | 5 +++--
 9 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index c818a361df..af02087d1a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (auto && !userTriggered && timeOffset > hitOffset && CheckHittable?.Invoke(this, Time.Current) == ClickAction.Hit)
+                if (auto && !userTriggered && timeOffset > hitOffset && CheckHittable?.Invoke(this, Time.Current, HitResult.Great) == ClickAction.Hit)
                 {
                     // force success
                     ApplyResult(r => r.Type = HitResult.Great);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 6366a185f2..3accf4fad7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -635,9 +635,9 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             public List<ClickAction> ClickActions { get; } = new List<ClickAction>();
 
-            public override ClickAction CheckHittable(DrawableHitObject hitObject, double time)
+            public override ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result)
             {
-                var action = base.CheckHittable(hitObject, time);
+                var action = base.CheckHittable(hitObject, time, result);
                 ClickActions.Add(action);
                 return action;
             }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 09d818def8..932f6d3fff 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -155,15 +155,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             var result = ResultFor(timeOffset);
-            var clickAction = CheckHittable?.Invoke(this, Time.Current);
+            var clickAction = CheckHittable?.Invoke(this, Time.Current, result);
 
-            if (clickAction == ClickAction.Shake || (result == HitResult.None && clickAction != ClickAction.Ignore))
-            {
+            if (clickAction == ClickAction.Shake)
                 Shake();
-                return;
-            }
 
-            if (result == HitResult.None)
+            if (result == HitResult.None || clickAction != ClickAction.Hit)
                 return;
 
             ApplyResult(r =>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index a8ce2118c8..920dfcab03 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -37,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// and <see cref="ClickAction.Shake"/>, and this hit object will be shaken for return values of
         /// <see cref="ClickAction.Shake"/>.
         /// </summary>
-        public Func<DrawableHitObject, double, ClickAction> CheckHittable;
+        public Func<DrawableHitObject, double, HitResult, ClickAction> CheckHittable;
 
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index a4cf69ee31..41f6a40c0a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             pathVersion.BindTo(DrawableSlider.PathVersion);
 
-            CheckHittable = (d, t) => DrawableSlider.CheckHittable?.Invoke(d, t) ?? ClickAction.Hit;
+            CheckHittable = (d, t, r) => DrawableSlider.CheckHittable?.Invoke(d, t, r) ?? ClickAction.Hit;
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
index 7503c43e0b..69bd360b5e 100644
--- a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -15,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
-        public ClickAction CheckHittable(DrawableHitObject hitObject, double time) => ClickAction.Hit;
+        public ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result) => ClickAction.Hit;
 
         public void HandleHit(DrawableHitObject hitObject)
         {
diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
index 9820b8c188..44d3b37408 100644
--- a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
@@ -3,6 +3,7 @@
 
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -19,8 +20,9 @@ namespace osu.Game.Rulesets.Osu.UI
         /// </summary>
         /// <param name="hitObject">The <see cref="DrawableHitObject"/> to check.</param>
         /// <param name="time">The time to check.</param>
+        /// <param name="result">The result that the object would be judged with if hit.</param>
         /// <returns>Whether <paramref name="hitObject"/> can be hit at the given <paramref name="time"/>.</returns>
-        ClickAction CheckHittable(DrawableHitObject hitObject, double time);
+        ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result);
 
         /// <summary>
         /// Handles a <see cref="HitObject"/> being hit.
diff --git a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
index 6a740a6839..5260215345 100644
--- a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -26,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.UI
         {
         }
 
-        public virtual ClickAction CheckHittable(DrawableHitObject hitObject, double time)
+        public virtual ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result)
         {
             var aliveObjects = HitObjectContainer.AliveObjects.ToList();
             int index = aliveObjects.IndexOf(hitObject);
@@ -38,6 +39,9 @@ namespace osu.Game.Rulesets.Osu.UI
                     return ClickAction.Ignore;
             }
 
+            if (result == HitResult.None)
+                return ClickAction.Shake;
+
             foreach (DrawableHitObject testObject in aliveObjects)
             {
                 if (testObject.AllJudged)
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index f33ca58aef..6fd0b512be 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -24,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
-        public ClickAction CheckHittable(DrawableHitObject hitObject, double time)
+        public ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult _)
         {
             DrawableHitObject blockingObject = null;
 
@@ -51,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
 
-            if (CheckHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset) != ClickAction.Hit)
+            if (CheckHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset, hitObject.Result.Type) != ClickAction.Hit)
                 throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
 
             // Miss all hitobjects prior to the hit one.

From a3160364603211a7dd1d06e1996c8603d5c700df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 13:20:38 +0200
Subject: [PATCH 0311/2296] Add failing test case for special autopilot
 hittable range

---
 .../TestSceneLegacyHitPolicy.cs               | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 3accf4fad7..cc5c27a62c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -17,6 +17,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
@@ -478,6 +479,32 @@ namespace osu.Game.Rulesets.Osu.Tests
             addClickActionAssert(0, ClickAction.Ignore);
         }
 
+        [Test]
+        public void TestAutopilotReducesHittableRange()
+        {
+            const double time_circle = 1500;
+            Vector2 positionCircle = Vector2.Zero;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new HitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_circle - 250, Position = positionCircle, Actions = { OsuAction.LeftButton } }
+            }, new Mod[] { new OsuModAutopilot() });
+
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            // note lock prevented the object from being hit, so the judgement offset should be very late.
+            addJudgementOffsetAssert(hitObjects[0], referenceHitWindows.WindowFor(HitResult.Meh));
+            addClickActionAssert(0, ClickAction.Shake);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
@@ -503,11 +530,20 @@ namespace osu.Game.Rulesets.Osu.Tests
         private List<JudgementResult> judgementResults = null!;
         private TestLegacyHitPolicy testPolicy = null!;
 
-        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames, [CallerMemberName] string testCaseName = "")
+        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames, IEnumerable<Mod>? extraMods = null, [CallerMemberName] string testCaseName = "")
         {
+            List<Mod> mods = null!;
             IBeatmap playableBeatmap = null!;
             Score score = null!;
 
+            AddStep("set up mods", () =>
+            {
+                mods = new List<Mod> { new OsuModClassic() };
+
+                if (extraMods != null)
+                    mods.AddRange(extraMods);
+            });
+
             AddStep("create beatmap", () =>
             {
                 var cpi = new ControlPointInfo();
@@ -550,7 +586,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                     ScoreInfo =
                     {
                         Ruleset = new OsuRuleset().RulesetInfo,
-                        BeatmapInfo = playableBeatmap.BeatmapInfo
+                        BeatmapInfo = playableBeatmap.BeatmapInfo,
+                        Mods = mods.ToArray()
                     }
                 };
             });
@@ -584,7 +621,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddStep("load player", () =>
             {
-                SelectedMods.Value = new[] { new OsuModClassic() };
+                SelectedMods.Value = mods.ToArray();
 
                 var p = new ScoreAccessibleReplayPlayer(score);
 

From 7f215f163ffc307ce9060e9d32f572162996e5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Aug 2023 13:37:39 +0200
Subject: [PATCH 0312/2296] Use reduced hittable range with autopilot active

---
 .../TestSceneLegacyHitPolicy.cs                  | 16 ++++++++++++++--
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs      |  6 +++++-
 osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs      | 14 +++++++++-----
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index cc5c27a62c..b4ab53a658 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -639,7 +639,12 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
-            AddStep("Substitute hit policy", () => currentPlayer.ChildrenOfType<OsuPlayfield>().Single().HitPolicy = testPolicy = new TestLegacyHitPolicy());
+            AddStep("Substitute hit policy", () =>
+            {
+                var playfield = currentPlayer.ChildrenOfType<OsuPlayfield>().Single();
+                var currentPolicy = playfield.HitPolicy;
+                playfield.HitPolicy = testPolicy = new TestLegacyHitPolicy(currentPolicy);
+            });
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
@@ -670,11 +675,18 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class TestLegacyHitPolicy : LegacyHitPolicy
         {
+            private readonly IHitPolicy currentPolicy;
+
+            public TestLegacyHitPolicy(IHitPolicy currentPolicy)
+            {
+                this.currentPolicy = currentPolicy;
+            }
+
             public List<ClickAction> ClickActions { get; } = new List<ClickAction>();
 
             public override ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result)
             {
-                var action = base.CheckHittable(hitObject, time, result);
+                var action = currentPolicy.CheckHittable(hitObject, time, result);
                 ClickActions.Add(action);
                 return action;
             }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 229f80c2bd..82deec41f5 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
@@ -57,7 +58,10 @@ namespace osu.Game.Rulesets.Osu.Mods
             var osuRuleset = (DrawableOsuRuleset)drawableRuleset;
 
             if (ClassicNoteLock.Value)
-                osuRuleset.Playfield.HitPolicy = new LegacyHitPolicy();
+            {
+                double hittableRange = OsuHitWindows.MISS_WINDOW - (drawableRuleset.Mods.OfType<OsuModAutopilot>().Any() ? 200 : 0);
+                osuRuleset.Playfield.HitPolicy = new LegacyHitPolicy(hittableRange);
+            }
 
             usingHiddenFading = drawableRuleset.Mods.OfType<OsuModHidden>().SingleOrDefault()?.OnlyFadeApproachCircles.Value == false;
         }
diff --git a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
index 5260215345..2b6359fb46 100644
--- a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
@@ -23,6 +24,13 @@ namespace osu.Game.Rulesets.Osu.UI
     {
         public IHitObjectContainer HitObjectContainer { get; set; }
 
+        private readonly double hittableRange;
+
+        public LegacyHitPolicy(double hittableRange = OsuHitWindows.MISS_WINDOW)
+        {
+            this.hittableRange = hittableRange;
+        }
+
         public void HandleHit(DrawableHitObject hitObject)
         {
         }
@@ -57,11 +65,7 @@ namespace osu.Game.Rulesets.Osu.UI
                     return ClickAction.Shake;
             }
 
-            // stable has `const HitObjectManager.HITTABLE_RANGE = 400;`, which is only used for notelock code.
-            // probably not a coincidence that this is equivalent to lazer's OsuHitWindows.MISS_WINDOW.
-
-            // TODO stable compares to 200 when autopilot is enabled, instead of 400.
-            return Math.Abs(hitObject.HitObject.StartTime - time) < 400 ? ClickAction.Hit : ClickAction.Shake;
+            return Math.Abs(hitObject.HitObject.StartTime - time) < hittableRange ? ClickAction.Hit : ClickAction.Shake;
         }
     }
 }

From 38e34593911801c0f31a8ca787b142c18f54b9fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Aug 2023 08:54:38 +0200
Subject: [PATCH 0313/2296] Fix broken assertion

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index b4ab53a658..2cfbe6611f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -198,7 +198,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[0], HitResult.Meh);
             addJudgementAssert(hitObjects[1], HitResult.Meh);
             addJudgementOffsetAssert(hitObjects[0], -190); // time_first_circle - 190
-            addJudgementOffsetAssert(hitObjects[0], -90); // time_second_circle - first_circle_time - 90
+            addJudgementOffsetAssert(hitObjects[1], -190); // time_second_circle - first_circle_time - 90
             addClickActionAssert(0, ClickAction.Hit);
             addClickActionAssert(1, ClickAction.Hit);
         }
@@ -520,7 +520,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void addJudgementOffsetAssert(OsuHitObject hitObject, double offset)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judged at {offset}",
-                () => judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, () => Is.EqualTo(offset).Within(100));
+                () => judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, () => Is.EqualTo(offset).Within(50));
         }
 
         private void addClickActionAssert(int inputIndex, ClickAction action)

From 2e27a476bb3c4b90d08384cfda3da7e60774e278 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 24 Aug 2023 18:04:47 +0900
Subject: [PATCH 0314/2296] Re-enable sample playback for
 `PasswordEntryPopover` and remove `sampleJoin` playback instead

---
 osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs       | 11 +++--------
 .../Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs   |  5 -----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
index 2aa42d0d50..551468beb9 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
         // required due to LoadAsyncComplete() calling PopOut() during load - similar workaround to `OsuDropdownMenu`
         private bool wasOpened;
 
-        protected virtual bool PlayPopInOutSamples => true;
-
         public OsuPopover(bool withPadding = true)
         {
             Content.Padding = withPadding ? new MarginPadding(20) : new MarginPadding();
@@ -64,11 +62,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
             this.ScaleTo(1, scale_duration, Easing.OutElasticHalf);
             this.FadeIn(fade_duration, Easing.OutQuint);
 
-            if (PlayPopInOutSamples)
-            {
-                samplePopIn?.Play();
-                wasOpened = true;
-            }
+            samplePopIn?.Play();
+            wasOpened = true;
         }
 
         protected override void PopOut()
@@ -76,7 +71,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
             this.ScaleTo(0.7f, scale_duration, Easing.OutQuint);
             this.FadeOut(fade_duration, Easing.OutQuint);
 
-            if (wasOpened && PlayPopInOutSamples)
+            if (wasOpened)
                 samplePopOut?.Play();
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
index a45583a2ec..5cf2f91ff4 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
@@ -170,7 +170,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             if (Room.HasPassword.Value)
             {
-                sampleJoin?.Play();
                 this.ShowPopover();
                 return true;
             }
@@ -191,10 +190,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             protected override bool BlockNonPositionalInput => true;
 
-            // When a room is clicked, it already plays a click sound, which clashes pretty badly with the pop in sound.
-            // Dunno about this one. I'd probably remove the click sound from the panel in cases they are password protected and play these pop in / out sounds.
-            protected override bool PlayPopInOutSamples => false;
-
             public PasswordEntryPopover(Room room)
             {
                 this.room = room;

From 7ef5a71e91a56a3e8340393376a97973ceb3e266 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 24 Aug 2023 18:13:23 +0900
Subject: [PATCH 0315/2296] Move PopIn/PopOut sample playback from
 `WaveOverlayContainer` to `WaveContainer` (so Multiplayer/Lounge plays the
 samples)

---
 osu.Game/Graphics/Containers/WaveContainer.cs | 22 +++++++++++++++++++
 osu.Game/Overlays/WaveOverlayContainer.cs     |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/WaveContainer.cs b/osu.Game/Graphics/Containers/WaveContainer.cs
index 9fd3d103c9..0b1d44ccba 100644
--- a/osu.Game/Graphics/Containers/WaveContainer.cs
+++ b/osu.Game/Graphics/Containers/WaveContainer.cs
@@ -2,6 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -32,6 +35,13 @@ namespace osu.Game.Graphics.Containers
 
         protected override bool StartHidden => true;
 
+        private Sample? samplePopIn;
+        private Sample? samplePopOut;
+        protected virtual string PopInSampleName => "UI/wave-pop-in";
+        protected virtual string PopOutSampleName => "UI/overlay-big-pop-out";
+
+        private bool wasShown = false;
+
         public Color4 FirstWaveColour
         {
             get => firstWave.Colour;
@@ -56,6 +66,13 @@ namespace osu.Game.Graphics.Containers
             set => fourthWave.Colour = value;
         }
 
+        [BackgroundDependencyLoader(true)]
+        private void load(AudioManager audio)
+        {
+            samplePopIn = audio.Samples.Get(PopInSampleName);
+            samplePopOut = audio.Samples.Get(PopOutSampleName);
+        }
+
         public WaveContainer()
         {
             Masking = true;
@@ -110,6 +127,8 @@ namespace osu.Game.Graphics.Containers
                 w.Show();
 
             contentContainer.MoveToY(0, APPEAR_DURATION, Easing.OutQuint);
+            samplePopIn?.Play();
+            wasShown = true;
         }
 
         protected override void PopOut()
@@ -118,6 +137,9 @@ namespace osu.Game.Graphics.Containers
                 w.Hide();
 
             contentContainer.MoveToY(2, DISAPPEAR_DURATION, Easing.In);
+
+            if (wasShown)
+                samplePopOut?.Play();
         }
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index 848d9e60b7..b0ddef5c2b 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -18,8 +18,9 @@ namespace osu.Game.Overlays
 
         protected override bool StartHidden => true;
 
-        protected override string PopInSampleName => "UI/wave-pop-in";
-        protected override string PopOutSampleName => "UI/overlay-big-pop-out";
+        // `WaveContainer` plays PopIn/PopOut samples, so we disable the overlay-level one as to not double-up sample playback.
+        protected override string PopInSampleName => "";
+        protected override string PopOutSampleName => "";
 
         public const float HORIZONTAL_PADDING = 50;
 

From f4415a5bab9aec67ea77af89c794921dae6a8c4e Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 24 Aug 2023 18:20:36 +0900
Subject: [PATCH 0316/2296] Add more detail to comment

---
 osu.Game/Graphics/Containers/WaveContainer.cs   | 3 ++-
 osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/WaveContainer.cs b/osu.Game/Graphics/Containers/WaveContainer.cs
index 0b1d44ccba..09d1f7e9a4 100644
--- a/osu.Game/Graphics/Containers/WaveContainer.cs
+++ b/osu.Game/Graphics/Containers/WaveContainer.cs
@@ -40,7 +40,8 @@ namespace osu.Game.Graphics.Containers
         protected virtual string PopInSampleName => "UI/wave-pop-in";
         protected virtual string PopOutSampleName => "UI/overlay-big-pop-out";
 
-        private bool wasShown = false;
+        // required due to LoadAsyncComplete() in `VisibilityContainer` calling PopOut() during load - similar workaround to `OsuDropdownMenu`
+        private bool wasShown;
 
         public Color4 FirstWaveColour
         {
diff --git a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
index 551468beb9..9b4689958c 100644
--- a/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/OsuPopover.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         protected virtual string PopInSampleName => "UI/overlay-pop-in";
         protected virtual string PopOutSampleName => "UI/overlay-pop-out";
 
-        // required due to LoadAsyncComplete() calling PopOut() during load - similar workaround to `OsuDropdownMenu`
+        // required due to LoadAsyncComplete() in `VisibilityContainer` calling PopOut() during load - similar workaround to `OsuDropdownMenu`
         private bool wasOpened;
 
         public OsuPopover(bool withPadding = true)

From b471ab07a62dc225275154efdfd15c46646f0104 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 18:30:59 +0900
Subject: [PATCH 0317/2296] Fix typo in test step
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 8a38e2a84b..110466f6d5 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -1016,7 +1016,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             List<BeatmapSetInfo> manySets = new List<BeatmapSetInfo>();
 
-            AddStep("Populuate beatmap sets", () =>
+            AddStep("Populate beatmap sets", () =>
             {
                 manySets.Clear();
 

From 9e94f3809103b6079a158e19050f9bc15829235a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2023 18:33:15 +0900
Subject: [PATCH 0318/2296] Fix typo in local variable

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index c5e46a00b6..91d1ced9d9 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Select
                 selectedBeatmapSet = null;
 
             var selectedSetBefore = selectedBeatmapSet;
-            var selectedBetmapBefore = selectedBeatmap;
+            var selectedBeatmapBefore = selectedBeatmap;
 
             CarouselRoot newRoot = new CarouselRoot(this);
 
@@ -170,9 +170,9 @@ namespace osu.Game.Screens.Select
                 signalBeatmapsLoaded();
 
             // Restore selection
-            if (selectedBetmapBefore != null && selectedSetBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedSetBefore.BeatmapSet.ID, out var newSelectionCandidates))
+            if (selectedBeatmapBefore != null && selectedSetBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedSetBefore.BeatmapSet.ID, out var newSelectionCandidates))
             {
-                CarouselBeatmap? found = newSelectionCandidates.SelectMany(s => s.Beatmaps).SingleOrDefault(b => b.BeatmapInfo.ID == selectedBetmapBefore.BeatmapInfo.ID);
+                CarouselBeatmap? found = newSelectionCandidates.SelectMany(s => s.Beatmaps).SingleOrDefault(b => b.BeatmapInfo.ID == selectedBeatmapBefore.BeatmapInfo.ID);
 
                 if (found != null)
                     found.State.Value = CarouselItemState.Selected;

From 49598774e0886279bd17caacdcbe4a57af646481 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Thu, 24 Aug 2023 15:00:32 +0300
Subject: [PATCH 0319/2296] Added a "Adjust pitch" switch

Adjust pitch switch in DoubleTime and HalfTime mods
Also Nightcore and Daycore is now inherit from RateAdjust
---
 osu.Game/Rulesets/Mods/ModDaycore.cs    | 26 +++++++++++++++++++++-
 osu.Game/Rulesets/Mods/ModDoubleTime.cs | 26 ++++++++++++++++++++++
 osu.Game/Rulesets/Mods/ModHalfTime.cs   | 26 ++++++++++++++++++++++
 osu.Game/Rulesets/Mods/ModNightcore.cs  | 29 ++++++++++++++++++++++++-
 osu.Game/Rulesets/Mods/ModRateAdjust.cs |  5 +----
 5 files changed, 106 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index de1a5ab56c..c5810cc9e5 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -5,16 +5,26 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModDaycore : ModHalfTime
+    public abstract class ModDaycore : ModRateAdjust
     {
         public override string Name => "Daycore";
         public override string Acronym => "DC";
         public override IconUsage? Icon => null;
+        public override ModType Type => ModType.DifficultyReduction;
         public override LocalisableString Description => "Whoaaaaa...";
 
+        [SettingSource("Speed decrease", "The actual decrease to apply")]
+        public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(0.75)
+        {
+            MinValue = 0.5,
+            MaxValue = 0.99,
+            Precision = 0.01,
+        };
+
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
         private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
 
@@ -33,5 +43,19 @@ namespace osu.Game.Rulesets.Mods
             track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
+
+        public override double ScoreMultiplier
+        {
+            get
+            {
+                // Round to the nearest multiple of 0.1.
+                double value = (int)(SpeedChange.Value * 10) / 10.0;
+
+                // Offset back to 0.
+                value -= 1;
+
+                return 1 + value;
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 733610c040..ad196ec83c 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.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 osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -25,6 +26,31 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
+        private IAdjustableAudioComponent? track;
+
+        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
+        public virtual BindableBool AdjustPitch { get; } = new BindableBool(false);
+
+        protected ModDoubleTime()
+        {
+            AdjustPitch.BindValueChanged(adjustPitchChanged);
+        }
+
+        private void adjustPitchChanged(ValueChangedEvent<bool> adjustPitchSetting)
+        {
+            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
+            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
+        }
+
+        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
+            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
+
+        public override void ApplyToTrack(IAdjustableAudioComponent track)
+        {
+            this.track = track;
+            AdjustPitch.TriggerChange();
+        }
+
         public override double ScoreMultiplier
         {
             get
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 06c7750035..047dd4bd04 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.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 osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -25,6 +26,31 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
+        private IAdjustableAudioComponent? track;
+
+        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
+        public virtual BindableBool AdjustPitch { get; } = new BindableBool(false);
+
+        protected ModHalfTime()
+        {
+            AdjustPitch.BindValueChanged(adjustPitchChanged);
+        }
+
+        private void adjustPitchChanged(ValueChangedEvent<bool> adjustPitchSetting)
+        {
+            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
+            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
+        }
+
+        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
+            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
+
+        public override void ApplyToTrack(IAdjustableAudioComponent track)
+        {
+            this.track = track;
+            AdjustPitch.TriggerChange();
+        }
+
         public override double ScoreMultiplier
         {
             get
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 9b1f7d5cf7..80b9314aec 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -11,6 +11,7 @@ using osu.Framework.Localisation;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
@@ -19,12 +20,38 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModNightcore : ModDoubleTime
+    public abstract class ModNightcore : ModRateAdjust
     {
         public override string Name => "Nightcore";
         public override string Acronym => "NC";
         public override IconUsage? Icon => OsuIcon.ModNightcore;
+        public override ModType Type => ModType.DifficultyIncrease;
         public override LocalisableString Description => "Uguuuuuuuu...";
+
+        [SettingSource("Speed increase", "The actual increase to apply")]
+        public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(1.5)
+        {
+            MinValue = 1.01,
+            MaxValue = 2,
+            Precision = 0.01,
+        };
+
+        public override double ScoreMultiplier
+        {
+            get
+            {
+                // Round to the nearest multiple of 0.1.
+                double value = (int)(SpeedChange.Value * 10) / 10.0;
+
+                // Offset back to 0.
+                value -= 1;
+
+                // Each 0.1 multiple changes score multiplier by 0.02.
+                value /= 5;
+
+                return 1 + value;
+            }
+        }
     }
 
     public abstract partial class ModNightcore<TObject> : ModNightcore, IApplicableToDrawableRuleset<TObject>
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index 7b55ba4ad0..6bf4b65e3b 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -13,10 +13,7 @@ namespace osu.Game.Rulesets.Mods
 
         public abstract BindableNumber<double> SpeedChange { get; }
 
-        public virtual void ApplyToTrack(IAdjustableAudioComponent track)
-        {
-            track.AddAdjustment(AdjustableProperty.Tempo, SpeedChange);
-        }
+        public abstract void ApplyToTrack(IAdjustableAudioComponent track);
 
         public virtual void ApplyToSample(IAdjustableAudioComponent sample)
         {

From ed886a4dc3e8cd7c0f722471dae0f42fd557b927 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Thu, 24 Aug 2023 16:49:42 +0300
Subject: [PATCH 0320/2296] Added a true AR/OD display when using DT/HT

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index a383298faa..c88bb2cb77 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -126,6 +126,22 @@ namespace osu.Game.Screens.Select.Details
                     mod.ApplyToDifficulty(adjustedDifficulty);
             }
 
+            if (baseDifficulty != null && mods.Value.Any(m => m is ModRateAdjust))
+            {
+                adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
+
+                foreach (var mod in mods.Value.OfType<ModRateAdjust>())
+                {
+                    double speedChange = (float)mod.SpeedChange.Value;
+
+                    double preempt = (int)IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.ApproachRate, 1800, 1200, 450) / speedChange;
+                    adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5);
+
+                    float hitwindow300 = (80.0f - 6 * adjustedDifficulty.OverallDifficulty) / (float)speedChange;
+                    adjustedDifficulty.OverallDifficulty = (80.0f - hitwindow300) / 6;
+                }
+            }
+
             switch (BeatmapInfo?.Ruleset.OnlineID)
             {
                 case 3:

From 89eeff515b42a9724ffd2e552f9e7d462f848d5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2023 00:52:54 +0900
Subject: [PATCH 0321/2296] Reduce complexity of selection restore

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 91d1ced9d9..d52b5592f8 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -134,8 +134,7 @@ namespace osu.Game.Screens.Select
             if (selectedBeatmapSet != null && !originalBeatmapSetsDetached.Contains(selectedBeatmapSet.BeatmapSet))
                 selectedBeatmapSet = null;
 
-            var selectedSetBefore = selectedBeatmapSet;
-            var selectedBeatmapBefore = selectedBeatmap;
+            var selectedBeatmapBefore = selectedBeatmap?.BeatmapInfo;
 
             CarouselRoot newRoot = new CarouselRoot(this);
 
@@ -170,9 +169,9 @@ namespace osu.Game.Screens.Select
                 signalBeatmapsLoaded();
 
             // Restore selection
-            if (selectedBeatmapBefore != null && selectedSetBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedSetBefore.BeatmapSet.ID, out var newSelectionCandidates))
+            if (selectedBeatmapBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedBeatmapBefore.BeatmapSet!.ID, out var newSelectionCandidates))
             {
-                CarouselBeatmap? found = newSelectionCandidates.SelectMany(s => s.Beatmaps).SingleOrDefault(b => b.BeatmapInfo.ID == selectedBeatmapBefore.BeatmapInfo.ID);
+                CarouselBeatmap? found = newSelectionCandidates.SelectMany(s => s.Beatmaps).SingleOrDefault(b => b.BeatmapInfo.ID == selectedBeatmapBefore.ID);
 
                 if (found != null)
                     found.State.Value = CarouselItemState.Selected;

From 35cdd6d8661b2b4df2735e4128c3334fd014670f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2023 01:07:07 +0900
Subject: [PATCH 0322/2296] Use `string.Empty`

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

diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index b0ddef5c2b..0295ff467a 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Overlays
         protected override bool StartHidden => true;
 
         // `WaveContainer` plays PopIn/PopOut samples, so we disable the overlay-level one as to not double-up sample playback.
-        protected override string PopInSampleName => "";
-        protected override string PopOutSampleName => "";
+        protected override string PopInSampleName => string.Empty;
+        protected override string PopOutSampleName => string.Empty;
 
         public const float HORIZONTAL_PADDING = 50;
 

From bf0f4fddad3c2c5e6a54b41333fea68daef82b2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2023 01:08:22 +0900
Subject: [PATCH 0323/2296] Localise non-overridden samples

---
 osu.Game/Graphics/Containers/WaveContainer.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/WaveContainer.cs b/osu.Game/Graphics/Containers/WaveContainer.cs
index 09d1f7e9a4..e84cb276a4 100644
--- a/osu.Game/Graphics/Containers/WaveContainer.cs
+++ b/osu.Game/Graphics/Containers/WaveContainer.cs
@@ -37,8 +37,6 @@ namespace osu.Game.Graphics.Containers
 
         private Sample? samplePopIn;
         private Sample? samplePopOut;
-        protected virtual string PopInSampleName => "UI/wave-pop-in";
-        protected virtual string PopOutSampleName => "UI/overlay-big-pop-out";
 
         // required due to LoadAsyncComplete() in `VisibilityContainer` calling PopOut() during load - similar workaround to `OsuDropdownMenu`
         private bool wasShown;
@@ -70,8 +68,8 @@ namespace osu.Game.Graphics.Containers
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio)
         {
-            samplePopIn = audio.Samples.Get(PopInSampleName);
-            samplePopOut = audio.Samples.Get(PopOutSampleName);
+            samplePopIn = audio.Samples.Get("UI/wave-pop-in");
+            samplePopOut = audio.Samples.Get("UI/overlay-big-pop-out");
         }
 
         public WaveContainer()

From 4fd165c0a7dc6b9c49cb0e675de6084ed47fbdc0 Mon Sep 17 00:00:00 2001
From: Dreamurrrr <21233238+Dreamurrrr@users.noreply.github.com>
Date: Thu, 24 Aug 2023 13:28:17 -0500
Subject: [PATCH 0324/2296] Update README.md to include VS Code plugin
 prerequisites

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf7ce35791..792e2d646a 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Please make sure you have the following prerequisites:
 
 - A desktop platform with the [.NET 6.0 SDK](https://dotnet.microsoft.com/download) installed.
 
-When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as the latest version of [Visual Studio](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
+When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as the latest version of [Visual Studio](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/), or [Visual Studio Code](https://code.visualstudio.com/) with the [EditorConfig](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig) and [C#](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) plugin installed.
 
 ### Downloading the source code
 

From a885bf6ebf5081c52cf3c0eaa36d13ccafe1d5b0 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 24 Aug 2023 21:05:40 +0200
Subject: [PATCH 0325/2296] feat(editor/checks): check for delayed hitsounds

I really just borrowed the implementation from MapsetVerifier
---
 .../Checks/CheckDelayedHitsoundsTest.cs       |  97 ++++++++++++
 .../Samples/hitsound-consequent-delay.wav     | Bin 0 -> 49994 bytes
 .../Resources/Samples/hitsound-delay.wav      | Bin 0 -> 49274 bytes
 .../Samples/hitsound-minor-delay.wav          | Bin 0 -> 48562 bytes
 .../Resources/Samples/hitsound-no-delay.wav   | Bin 0 -> 48210 bytes
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |   1 +
 .../Edit/Checks/CheckDelayedHitsounds.cs      | 138 ++++++++++++++++++
 7 files changed, 236 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs
 create mode 100644 osu.Game.Tests/Resources/Samples/hitsound-consequent-delay.wav
 create mode 100644 osu.Game.Tests/Resources/Samples/hitsound-delay.wav
 create mode 100644 osu.Game.Tests/Resources/Samples/hitsound-minor-delay.wav
 create mode 100644 osu.Game.Tests/Resources/Samples/hitsound-no-delay.wav
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs b/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs
new file mode 100644
index 0000000000..5be76327b3
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.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.IO;
+using System.Linq;
+using ManagedBass;
+using Moq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Models;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Resources;
+using osuTK.Audio;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckDelayedHitsoundsTest
+    {
+        private CheckDelayedHitsounds check = null!;
+        private IBeatmap beatmap = null!;
+
+        [SetUp]
+        public void SetUp()
+        {
+            check = new CheckDelayedHitsounds();
+            beatmap = new Beatmap<HitObject>
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    BeatmapSet = new BeatmapSetInfo
+                    {
+                        Files =
+                        {
+                            new RealmNamedFileUsage(new RealmFile { Hash = "abcdef" }, "normal-hitnormal.wav"),
+                        }
+                    }
+                }
+            };
+
+            if (!Bass.Init(0) && Bass.LastError != Errors.Already)
+                throw new AudioException("Could not initialize Bass.");
+        }
+
+        [Test]
+        public void TestNoDelayedHitsounds()
+        {
+            using var resourceStream = TestResources.OpenResource("Samples/hitsound-no-delay.wav");
+            Assert.IsEmpty(check.Run(getContext(resourceStream)));
+        }
+
+        [Test]
+        public void TestMinorDelayedHitsounds()
+        {
+            using (var resourceStream = TestResources.OpenResource("Samples/hitsound-minor-delay.wav"))
+            {
+                var issues = check.Run(getContext(resourceStream)).ToList();
+
+                Assert.That(issues, Has.Count.EqualTo(1));
+                Assert.That(issues.Single().Template is CheckDelayedHitsounds.IssuTemplateMinorDelay);
+            }
+        }
+
+        [Test]
+        public void TestDelayedHitsounds()
+        {
+            using var resourceStream = TestResources.OpenResource("Samples/hitsound-delay.wav");
+
+            var issues = check.Run(getContext(resourceStream)).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckDelayedHitsounds.IssueTemplateDelay);
+        }
+
+        [Test]
+        public void TestConsequentlyDelayedHitsounds()
+        {
+            using var resourceStream = TestResources.OpenResource("Samples/hitsound-consequent-delay.wav");
+
+            var issues = check.Run(getContext(resourceStream)).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckDelayedHitsounds.IssueTemplateConsequentDelay);
+        }
+
+        private BeatmapVerifierContext getContext(Stream? resourceStream)
+        {
+            var mockWorkingBeatmap = new Mock<TestWorkingBeatmap>(beatmap, null, null);
+            mockWorkingBeatmap.Setup(w => w.GetStream(It.IsAny<string>())).Returns(resourceStream);
+
+            return new BeatmapVerifierContext(beatmap, mockWorkingBeatmap.Object);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Resources/Samples/hitsound-consequent-delay.wav b/osu.Game.Tests/Resources/Samples/hitsound-consequent-delay.wav
new file mode 100644
index 0000000000000000000000000000000000000000..049e54c62f62e0c42f6b8445c3aa3ee77d773146
GIT binary patch
literal 49994
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
O^Y8-?*>m4R%l`u6nW#+w

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/Samples/hitsound-delay.wav b/osu.Game.Tests/Resources/Samples/hitsound-delay.wav
new file mode 100644
index 0000000000000000000000000000000000000000..4a3be92f9c6bfde6aeb1d27b27703b4ec2ea6028
GIT binary patch
literal 49274
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
Lc*tJ+9h&|ROxJj)

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/Samples/hitsound-minor-delay.wav b/osu.Game.Tests/Resources/Samples/hitsound-minor-delay.wav
new file mode 100644
index 0000000000000000000000000000000000000000..76dbce77f47e62f2f43c293b81ad3f031c5c1b8a
GIT binary patch
literal 48562
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
av)-y}tiC!wOMd>KeUCcq@O=+DBK{vTTq`*M

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/Samples/hitsound-no-delay.wav b/osu.Game.Tests/Resources/Samples/hitsound-no-delay.wav
new file mode 100644
index 0000000000000000000000000000000000000000..cdda5709b8ab904d2f5980228ad02010f4fe368a
GIT binary patch
literal 48210
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

literal 0
HcmV?d00001

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 6782c4324a..dcf5eb4da9 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Rulesets.Edit
             new CheckFewHitsounds(),
             new CheckTooShortAudioFiles(),
             new CheckAudioInVideo(),
+            new CheckDelayedHitsounds(),
 
             // Files
             new CheckZeroByteFiles(),
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
new file mode 100644
index 0000000000..b4fe6c70ef
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -0,0 +1,138 @@
+// 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.IO;
+using System.Linq;
+using osu.Framework.Audio.Track;
+using osu.Game.Audio;
+using osu.Game.Extensions;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckDelayedHitsounds : ICheck
+    {
+        /// <summary>
+        /// Threshold at which point the sample is considered silent.
+        /// </summary>
+        private const float silence_threshold = 0.001f;
+
+        private const float falloff_factor = 0.95f;
+        private const int delay_threshold = 5;
+        private const int delay_threshold_negligible = 1;
+
+        private readonly string[] audioExtensions = { "mp3", "ogg", "wav" };
+        private readonly string[] sampleBankPrefixes = { HitSampleInfo.BANK_NORMAL, HitSampleInfo.BANK_SOFT, HitSampleInfo.BANK_DRUM };
+
+        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Audio, "Delayed hit sounds.");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateConsequentDelay(this),
+            new IssueTemplateDelay(this),
+            new IssuTemplateMinorDelay(this)
+        };
+
+        private float getAverageAmplitude(Waveform.Point point) => (point.AmplitudeLeft + point.AmplitudeRight) / 2;
+
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
+        {
+            var beatmapSet = context.Beatmap.BeatmapInfo.BeatmapSet;
+
+            if (beatmapSet == null)
+                yield break;
+
+            foreach (var file in beatmapSet.Files)
+            {
+                using (Stream stream = context.WorkingBeatmap.GetStream(file.File.GetStoragePath()))
+                {
+                    if (stream == null)
+                        continue;
+
+                    if (!hasAudioExtension(file.Filename))
+                        continue;
+
+                    if (!isHitSound(file.Filename))
+                        continue;
+
+                    Waveform waveform = new Waveform(stream);
+
+                    var points = waveform.GetPoints();
+
+                    // Skip muted samples
+                    if (points.Length == 0 || points.Sum(getAverageAmplitude) <= silence_threshold)
+                        continue;
+
+                    float maxAmplitude = points.Select(getAverageAmplitude).Max();
+
+                    int consequentDelay = 0;
+                    int delay = 0;
+                    float amplitude = 0;
+
+                    while (delay + consequentDelay < points.Length)
+                    {
+                        amplitude += getAverageAmplitude(points[delay]);
+
+                        // Reached peak amplitude/transient
+                        if (amplitude >= maxAmplitude)
+                            break;
+
+                        amplitude *= falloff_factor;
+
+                        if (amplitude < silence_threshold)
+                        {
+                            amplitude = 0;
+                            consequentDelay++;
+                        }
+
+                        delay++;
+                    }
+
+                    if (consequentDelay >= delay_threshold)
+                        yield return new IssueTemplateConsequentDelay(this).Create(file.Filename, consequentDelay);
+                    else if (consequentDelay + delay >= delay_threshold)
+                        yield return new IssueTemplateDelay(this).Create(file.Filename, consequentDelay, delay);
+                    else if (consequentDelay + delay >= delay_threshold_negligible)
+                        yield return new IssuTemplateMinorDelay(this).Create(file.Filename, consequentDelay, delay);
+                }
+            }
+        }
+
+        private bool hasAudioExtension(string filename) => audioExtensions.Any(filename.ToLowerInvariant().EndsWith);
+        private bool isHitSound(string filename) => sampleBankPrefixes.Select(p => p + "-").Any(filename.ToLowerInvariant().StartsWith);
+
+        public class IssueTemplateConsequentDelay : IssueTemplate
+        {
+            public IssueTemplateConsequentDelay(ICheck check)
+                : base(check, IssueType.Error,
+                    "\"{0}\" has a {1:0.##} ms period of complete silence at the start.")
+            {
+            }
+
+            public Issue Create(string filename, int pureDelay) => new Issue(this, filename, pureDelay);
+        }
+
+        public class IssueTemplateDelay : IssueTemplate
+        {
+            public IssueTemplateDelay(ICheck check)
+                : base(check, IssueType.Warning,
+                    "\"{0}\" has a transient delay of ~{1:0.##} ms, of which {2:0.##} ms is complete silence.")
+            {
+            }
+
+            public Issue Create(string filename, int pureDelay, int delay) => new Issue(this, filename, delay, pureDelay);
+        }
+
+        public class IssuTemplateMinorDelay : IssueTemplate
+        {
+            public IssuTemplateMinorDelay(ICheck check)
+                : base(check, IssueType.Negligible,
+                    "\"{0}\"has a transient delay of ~{1:0.##} ms, of which {2:0.##} ms is complete silence.")
+            {
+            }
+
+            public Issue Create(string filename, int pureDelay, int delay) => new Issue(this, filename, delay, pureDelay);
+        }
+    }
+}

From df55a2f6839e399fb530476327086713c840f177 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 24 Aug 2023 21:31:04 +0200
Subject: [PATCH 0326/2296] style(editor/checks): fix inconsistent argument
 names

---
 osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index b4fe6c70ef..0591ad866d 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         public class IssueTemplateConsequentDelay : IssueTemplate
         {
             public IssueTemplateConsequentDelay(ICheck check)
-                : base(check, IssueType.Error,
+                : base(check, IssueType.Problem,
                     "\"{0}\" has a {1:0.##} ms period of complete silence at the start.")
             {
             }
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             {
             }
 
-            public Issue Create(string filename, int pureDelay, int delay) => new Issue(this, filename, delay, pureDelay);
+            public Issue Create(string filename, int consequentDelay, int delay) => new Issue(this, filename, delay, consequentDelay);
         }
 
         public class IssuTemplateMinorDelay : IssueTemplate
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             {
             }
 
-            public Issue Create(string filename, int pureDelay, int delay) => new Issue(this, filename, delay, pureDelay);
+            public Issue Create(string filename, int consequentDelay, int delay) => new Issue(this, filename, delay, consequentDelay);
         }
     }
 }

From 208e94e9be533129024b500b996bb48b41931368 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 24 Aug 2023 21:33:54 +0200
Subject: [PATCH 0327/2296] style(editor/checks): add type nullability for
 `Stream`

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

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index 0591ad866d..6afc8d7a5d 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             foreach (var file in beatmapSet.Files)
             {
-                using (Stream stream = context.WorkingBeatmap.GetStream(file.File.GetStoragePath()))
+                using (Stream? stream = context.WorkingBeatmap.GetStream(file.File.GetStoragePath()))
                 {
                     if (stream == null)
                         continue;

From 273593a0eefecf091ed64674ceacc286d965023b Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 24 Aug 2023 23:25:42 +0200
Subject: [PATCH 0328/2296] style: typo

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

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index 6afc8d7a5d..1c2ef94815 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         {
             public IssuTemplateMinorDelay(ICheck check)
                 : base(check, IssueType.Negligible,
-                    "\"{0}\"has a transient delay of ~{1:0.##} ms, of which {2:0.##} ms is complete silence.")
+                    "\"{0}\" has a transient delay of ~{1:0.##} ms, of which {2:0.##} ms is complete silence.")
             {
             }
 

From f7599c5bc4d89a96b4d204e091098ea7b3caff77 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 24 Aug 2023 23:41:56 +0200
Subject: [PATCH 0329/2296] style: reword

---
 osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index 1c2ef94815..3064a41eef 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         {
             public IssueTemplateDelay(ICheck check)
                 : base(check, IssueType.Warning,
-                    "\"{0}\" has a transient delay of ~{1:0.##} ms, of which {2:0.##} ms is complete silence.")
+                    "\"{0}\" has its transient delayed by ~{1:0.##} ms, preceded by {2:0.##} ms of complete silence.")
             {
             }
 
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         {
             public IssuTemplateMinorDelay(ICheck check)
                 : base(check, IssueType.Negligible,
-                    "\"{0}\" has a transient delay of ~{1:0.##} ms, of which {2:0.##} ms is complete silence.")
+                    "\"{0}\" has its transient delayed by ~{1:0.##} ms, preceded by {2:0.##} ms of complete silence.")
             {
             }
 

From 50dbf564a58d75b096fa0e76673f0c845db12168 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Thu, 24 Aug 2023 23:51:34 +0200
Subject: [PATCH 0330/2296] revert: use old wording

This makes more sense wrt to the complete silence thing.

Refs: f7599c5b
---
 osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index 3064a41eef..1c2ef94815 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         {
             public IssueTemplateDelay(ICheck check)
                 : base(check, IssueType.Warning,
-                    "\"{0}\" has its transient delayed by ~{1:0.##} ms, preceded by {2:0.##} ms of complete silence.")
+                    "\"{0}\" has a transient delay of ~{1:0.##} ms, of which {2:0.##} ms is complete silence.")
             {
             }
 
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         {
             public IssuTemplateMinorDelay(ICheck check)
                 : base(check, IssueType.Negligible,
-                    "\"{0}\" has its transient delayed by ~{1:0.##} ms, preceded by {2:0.##} ms of complete silence.")
+                    "\"{0}\" has a transient delay of ~{1:0.##} ms, of which {2:0.##} ms is complete silence.")
             {
             }
 

From 17b9b1649a0434b41df43a0ffe24363efbb9ac2e Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 25 Aug 2023 00:58:26 +0300
Subject: [PATCH 0331/2296] Fixed "works only for std" problem

1) Now it use AR/OD calculation from Ruleset class
2) Implemented needed functions in each of default rulesets
---
 osu.Game.Rulesets.Catch/CatchRuleset.cs          | 4 ++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs          | 4 ++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs              | 7 +++++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs          | 3 +++
 osu.Game/Rulesets/Ruleset.cs                     | 8 ++++++++
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 8 +++-----
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index bd6b857fe8..a63e604204 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -232,5 +232,9 @@ namespace osu.Game.Rulesets.Catch
                 }),
             };
         }
+
+        public override double PreemptFromAr(float AR) => AR < 5 ? (1200.0 + 600.0 * (5 - AR) / 5) : (1200.0 - 750.0 * (AR - 5) / 5);
+        public override float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150)) + 5;
+        public override float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 4507015169..181e932788 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -427,6 +427,10 @@ namespace osu.Game.Rulesets.Mania
         public override RulesetSetupSection CreateEditorSetupSection() => new ManiaSetupSection();
 
         public override DifficultySection CreateEditorDifficultySection() => new ManiaDifficultySection();
+
+        public override double HitwindowFromOd(float OD) => 64.0 - 3 * OD;
+        public override float OdFromHitwindow(double hitwindow300) => (float)(64.0 - hitwindow300) / 3;
+        public override float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
     }
 
     public enum PlayfieldType
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 220dc53705..fa575192c6 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -328,5 +328,12 @@ namespace osu.Game.Rulesets.Osu
         }
 
         public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
+
+        public override double PreemptFromAr(float AR) => AR < 5 ? (1200.0 + 600.0 * (5 - AR) / 5) : (1200.0 - 750.0 * (AR - 5) / 5);
+        public override float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150)) + 5;
+        public override double HitwindowFromOd(float OD) => 80.0 - 6 * OD;
+        public override float OdFromHitwindow(double hitwindow300) => (float)(80.0 - hitwindow300) / 6;
+        public override float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
+        public override float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 584a91bfdc..23d732645e 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -263,5 +263,8 @@ namespace osu.Game.Rulesets.Taiko
                 }), true)
             };
         }
+        public override double HitwindowFromOd(float OD) => 35.0 - 15.0 * (OD - 5) / 5;
+        public override float OdFromHitwindow(double hitwindow300) => (float)(5 * (35 - hitwindow300) / 15 + 5);
+        public override float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index be0d757e06..ed4bc0ea7a 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -389,5 +389,13 @@ namespace osu.Game.Rulesets
         /// Can be overridden to alter the difficulty section to the editor beatmap setup screen.
         /// </summary>
         public virtual DifficultySection? CreateEditorDifficultySection() => null;
+
+        public virtual double PreemptFromAr(float AR) => 0;
+        public virtual float ArFromPreempt(double preempt) => 5;
+        public virtual double HitwindowFromOd(float OD) => 0;
+        public virtual float OdFromHitwindow(double hitwindow300) => 0;
+
+        public virtual float ChangeArFromRate(float AR, double rate) => AR;
+        public virtual float ChangeOdFromRate(float OD, double rate) => OD;
     }
 }
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index c88bb2cb77..2f97c9ddf8 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -133,12 +133,10 @@ namespace osu.Game.Screens.Select.Details
                 foreach (var mod in mods.Value.OfType<ModRateAdjust>())
                 {
                     double speedChange = (float)mod.SpeedChange.Value;
+                    Ruleset ruleset = gameRuleset.Value.CreateInstance();
 
-                    double preempt = (int)IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.ApproachRate, 1800, 1200, 450) / speedChange;
-                    adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5);
-
-                    float hitwindow300 = (80.0f - 6 * adjustedDifficulty.OverallDifficulty) / (float)speedChange;
-                    adjustedDifficulty.OverallDifficulty = (80.0f - hitwindow300) / 6;
+                    adjustedDifficulty.ApproachRate = ruleset.ChangeArFromRate(adjustedDifficulty.ApproachRate, speedChange);
+                    adjustedDifficulty.OverallDifficulty = ruleset.ChangeOdFromRate(adjustedDifficulty.OverallDifficulty, speedChange);
                 }
             }
 

From 772633178ca95956fbc75ceea4870f1bc755c9a0 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 25 Aug 2023 01:02:12 +0300
Subject: [PATCH 0332/2296] Moved ruleset decl in right place

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

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 2f97c9ddf8..5e698204ae 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -129,11 +129,11 @@ namespace osu.Game.Screens.Select.Details
             if (baseDifficulty != null && mods.Value.Any(m => m is ModRateAdjust))
             {
                 adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
+                Ruleset ruleset = gameRuleset.Value.CreateInstance();
 
                 foreach (var mod in mods.Value.OfType<ModRateAdjust>())
                 {
                     double speedChange = (float)mod.SpeedChange.Value;
-                    Ruleset ruleset = gameRuleset.Value.CreateInstance();
 
                     adjustedDifficulty.ApproachRate = ruleset.ChangeArFromRate(adjustedDifficulty.ApproachRate, speedChange);
                     adjustedDifficulty.OverallDifficulty = ruleset.ChangeOdFromRate(adjustedDifficulty.OverallDifficulty, speedChange);

From f05659a1c0e3f542c9aa9cd5975fe0c4fb7f6b5b Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 25 Aug 2023 00:10:21 +0200
Subject: [PATCH 0333/2296] test: explicit samples timings

---
 .../Editing/Checks/CheckDelayedHitsoundsTest.cs           | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs b/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs
index 5be76327b3..912b916a84 100644
--- a/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs
@@ -55,6 +55,9 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestMinorDelayedHitsounds()
         {
+            // 1 ms of silence -> 1 ms of noise at 0.3 amplitude -> hitsound transient
+            // => The transient is delayed by 2 ms
+            // Waveform: https://github.com/ppy/osu/assets/39100084/d5b9edbe-0ba2-401d-94b0-6d57228bdbd3
             using (var resourceStream = TestResources.OpenResource("Samples/hitsound-minor-delay.wav"))
             {
                 var issues = check.Run(getContext(resourceStream)).ToList();
@@ -67,6 +70,9 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestDelayedHitsounds()
         {
+            // 3 ms of silence -> 3 ms of noise at 0.3 amplitude -> hitsound transient
+            // => The transient is delayed by 6 ms
+            // Waveform: https://github.com/ppy/osu/assets/39100084/2509ff35-d908-414b-b7b9-583681348772
             using var resourceStream = TestResources.OpenResource("Samples/hitsound-delay.wav");
 
             var issues = check.Run(getContext(resourceStream)).ToList();
@@ -78,6 +84,8 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestConsequentlyDelayedHitsounds()
         {
+            // The hitsound is delayed by 10 ms
+            // Waveform: https://github.com/ppy/osu/assets/39100084/3a7ede0d-8523-4b99-a222-3624cd208267
             using var resourceStream = TestResources.OpenResource("Samples/hitsound-consequent-delay.wav");
 
             var issues = check.Run(getContext(resourceStream)).ToList();

From d5ac93f631dd5b9ef7e4f753a21224921efddc9a Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 25 Aug 2023 01:25:12 +0300
Subject: [PATCH 0334/2296] Added "value is rate changed" indication

Now if AR or OD value is not "true" and changed through rate - it will appear with symbol `*`
Instead of `11` it wil show as `11*`
---
 .../Screens/Select/Details/AdvancedStats.cs   | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 5e698204ae..4b7eee380d 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -44,6 +44,9 @@ namespace osu.Game.Screens.Select.Details
         protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate;
         private readonly StatisticRow starDifficulty;
 
+        private bool isArRateAdjusted { get; set; }
+        private bool isOdRateAdjusted { get; set; }
+
         private IBeatmapInfo beatmapInfo;
 
         public IBeatmapInfo BeatmapInfo
@@ -117,6 +120,8 @@ namespace osu.Game.Screens.Select.Details
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
             BeatmapDifficulty adjustedDifficulty = null;
+            isArRateAdjusted = false;
+            isOdRateAdjusted = false;
 
             if (baseDifficulty != null && mods.Value.Any(m => m is IApplicableToDifficulty))
             {
@@ -135,8 +140,14 @@ namespace osu.Game.Screens.Select.Details
                 {
                     double speedChange = (float)mod.SpeedChange.Value;
 
-                    adjustedDifficulty.ApproachRate = ruleset.ChangeArFromRate(adjustedDifficulty.ApproachRate, speedChange);
-                    adjustedDifficulty.OverallDifficulty = ruleset.ChangeOdFromRate(adjustedDifficulty.OverallDifficulty, speedChange);
+                    float ar = adjustedDifficulty.ApproachRate;
+                    float od = adjustedDifficulty.OverallDifficulty;
+
+                    adjustedDifficulty.ApproachRate = ruleset.ChangeArFromRate(ar, speedChange);
+                    adjustedDifficulty.OverallDifficulty = ruleset.ChangeOdFromRate(od, speedChange);
+
+                    if (adjustedDifficulty.ApproachRate != ar) isArRateAdjusted = true;
+                    if (adjustedDifficulty.OverallDifficulty != od) isOdRateAdjusted = true;
                 }
             }
 
@@ -146,18 +157,18 @@ namespace osu.Game.Screens.Select.Details
                     // Account for mania differences locally for now
                     // Eventually this should be handled in a more modular way, allowing rulesets to return arbitrary difficulty attributes
                     FirstValue.Title = BeatmapsetsStrings.ShowStatsCsMania;
-                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, null);
+                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, null, false);
                     break;
 
                 default:
                     FirstValue.Title = BeatmapsetsStrings.ShowStatsCs;
-                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
+                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize, false);
                     break;
             }
 
-            HpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate);
-            Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty);
-            ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
+            HpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate, false);
+            Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty, isOdRateAdjusted);
+            ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate, isArRateAdjusted);
 
             updateStarDifficulty();
         }
@@ -191,7 +202,7 @@ namespace osu.Game.Screens.Select.Details
                 if (normalDifficulty == null || moddedDifficulty == null)
                     return;
 
-                starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
+                starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars, false);
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         });
 
@@ -222,11 +233,11 @@ namespace osu.Game.Screens.Select.Details
                 set => name.Text = value;
             }
 
-            private (float baseValue, float? adjustedValue)? value;
+            private (float baseValue, float? adjustedValue, bool isRateAdjusted)? value;
 
-            public (float baseValue, float? adjustedValue) Value
+            public (float baseValue, float? adjustedValue, bool isRateAdjusted) Value
             {
-                get => value ?? (0, null);
+                get => value ?? (0, null, false);
                 set
                 {
                     if (value == this.value)
@@ -237,6 +248,7 @@ namespace osu.Game.Screens.Select.Details
                     bar.Length = value.baseValue / maxValue;
 
                     valueText.Text = (value.adjustedValue ?? value.baseValue).ToString(forceDecimalPlaces ? "0.00" : "0.##");
+                    if (value.isRateAdjusted) valueText.Text += "*";
                     ModBar.Length = (value.adjustedValue ?? 0) / maxValue;
 
                     if (Precision.AlmostEquals(value.baseValue, value.adjustedValue ?? value.baseValue, 0.05f))

From 4c32e9a479b411df17649b52a7f0f4c6f528dff1 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 25 Aug 2023 00:37:45 +0200
Subject: [PATCH 0335/2296] style: use more rigorous hitsound filtering

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

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index 1c2ef94815..124a549088 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Rulesets.Edit.Checks
         private const int delay_threshold_negligible = 1;
 
         private readonly string[] audioExtensions = { "mp3", "ogg", "wav" };
-        private readonly string[] sampleBankPrefixes = { HitSampleInfo.BANK_NORMAL, HitSampleInfo.BANK_SOFT, HitSampleInfo.BANK_DRUM };
+        private readonly string[] bankNames = { HitSampleInfo.BANK_NORMAL, HitSampleInfo.BANK_SOFT, HitSampleInfo.BANK_DRUM };
+        private readonly string[] sampleSets = { HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_WHISTLE, HitSampleInfo.HIT_FINISH, HitSampleInfo.HIT_CLAP };
 
         public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Audio, "Delayed hit sounds.");
 
@@ -100,7 +101,20 @@ namespace osu.Game.Rulesets.Edit.Checks
         }
 
         private bool hasAudioExtension(string filename) => audioExtensions.Any(filename.ToLowerInvariant().EndsWith);
-        private bool isHitSound(string filename) => sampleBankPrefixes.Select(p => p + "-").Any(filename.ToLowerInvariant().StartsWith);
+
+        private bool isHitSound(string filename)
+        {
+            // <bank>-<sampleset>
+            string[] parts = filename.ToLowerInvariant().Split('-');
+
+            if (parts.Length != 2)
+                return false;
+
+            string bank = parts[0];
+            string sampleSet = parts[1];
+
+            return bankNames.Contains(bank) && sampleSets.Any(sampleSet.StartsWith);
+        }
 
         public class IssueTemplateConsequentDelay : IssueTemplate
         {

From 84f4fab9cfad4a122a271977ed7902f9e504904b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2023 18:09:51 +0900
Subject: [PATCH 0336/2296] Adjust test to actually test diff splitting

---
 .../SongSelect/TestSceneBeatmapCarousel.cs       | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 110466f6d5..040b341584 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -505,8 +505,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestAddRemoveDifficultySort()
         {
-            const int local_set_count = 1;
-            const int local_diff_count = 1;
+            const int local_set_count = 2;
+            const int local_diff_count = 2;
 
             loadBeatmaps(setCount: local_set_count, diffCount: local_diff_count);
 
@@ -515,23 +515,17 @@ namespace osu.Game.Tests.Visual.SongSelect
             checkVisibleItemCount(false, local_set_count * local_diff_count);
 
             var firstAdded = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
-            var secondAdded = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
 
             AddStep("Add new set", () => carousel.UpdateBeatmapSet(firstAdded));
-            AddStep("Add new set", () => carousel.UpdateBeatmapSet(secondAdded));
-
-            checkVisibleItemCount(false, (local_set_count + 2) * local_diff_count);
-
-            AddStep("Remove set", () => carousel.RemoveBeatmapSet(firstAdded));
 
             checkVisibleItemCount(false, (local_set_count + 1) * local_diff_count);
 
-            setSelected(local_set_count + 1, 1);
-
-            AddStep("Remove set", () => carousel.RemoveBeatmapSet(secondAdded));
+            AddStep("Remove set", () => carousel.RemoveBeatmapSet(firstAdded));
 
             checkVisibleItemCount(false, (local_set_count) * local_diff_count);
 
+            setSelected(local_set_count, 1);
+
             waitForSelection(local_set_count);
         }
 

From 10b14501380320939f43fe715b033970b8af4a2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Aug 2023 18:10:54 +0900
Subject: [PATCH 0337/2296] Rename remove method to better explain return type
 being `IEnumerable`

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index d52b5592f8..a8da5dc742 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -405,7 +405,7 @@ namespace osu.Game.Screens.Select
             if (selectedBeatmapSet?.BeatmapSet.ID == beatmapSet.ID)
                 previouslySelectedID = selectedBeatmap?.BeatmapInfo.ID;
 
-            var removedSets = root.RemoveChild(beatmapSet.ID);
+            var removedSets = root.RemoveItemsByID(beatmapSet.ID);
 
             foreach (var removedSet in removedSets)
             {
@@ -1147,7 +1147,7 @@ namespace osu.Game.Screens.Select
                 base.AddItem(i);
             }
 
-            public IEnumerable<CarouselBeatmapSet> RemoveChild(Guid beatmapSetID)
+            public IEnumerable<CarouselBeatmapSet> RemoveItemsByID(Guid beatmapSetID)
             {
                 if (BeatmapSetsByID.TryGetValue(beatmapSetID, out var carouselBeatmapSets))
                 {

From 29a46f5b368273e8acf874a8c7182a93293b35fd Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 25 Aug 2023 11:46:09 +0200
Subject: [PATCH 0338/2296] style(editor/checks): add issues for delays with no
 silence

---
 .../Edit/Checks/CheckDelayedHitsounds.cs      | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index 124a549088..323888a450 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -32,7 +32,9 @@ namespace osu.Game.Rulesets.Edit.Checks
         {
             new IssueTemplateConsequentDelay(this),
             new IssueTemplateDelay(this),
-            new IssuTemplateMinorDelay(this)
+            new IssueTemplateDelayNoSilence(this),
+            new IssuTemplateMinorDelay(this),
+            new IssuTemplateMinorDelayNoSilence(this),
         };
 
         private float getAverageAmplitude(Waveform.Point point) => (point.AmplitudeLeft + point.AmplitudeRight) / 2;
@@ -93,9 +95,19 @@ namespace osu.Game.Rulesets.Edit.Checks
                     if (consequentDelay >= delay_threshold)
                         yield return new IssueTemplateConsequentDelay(this).Create(file.Filename, consequentDelay);
                     else if (consequentDelay + delay >= delay_threshold)
-                        yield return new IssueTemplateDelay(this).Create(file.Filename, consequentDelay, delay);
+                    {
+                        if (consequentDelay > 0)
+                            yield return new IssueTemplateDelay(this).Create(file.Filename, consequentDelay, delay);
+                        else
+                            yield return new IssueTemplateDelayNoSilence(this).Create(file.Filename, delay);
+                    }
                     else if (consequentDelay + delay >= delay_threshold_negligible)
-                        yield return new IssuTemplateMinorDelay(this).Create(file.Filename, consequentDelay, delay);
+                    {
+                        if (consequentDelay > 0)
+                            yield return new IssuTemplateMinorDelay(this).Create(file.Filename, consequentDelay, delay);
+                        else
+                            yield return new IssuTemplateMinorDelayNoSilence(this).Create(file.Filename, delay);
+                    }
                 }
             }
         }
@@ -138,6 +150,17 @@ namespace osu.Game.Rulesets.Edit.Checks
             public Issue Create(string filename, int consequentDelay, int delay) => new Issue(this, filename, delay, consequentDelay);
         }
 
+        public class IssueTemplateDelayNoSilence : IssueTemplate
+        {
+            public IssueTemplateDelayNoSilence(ICheck check)
+                : base(check, IssueType.Warning,
+                    "\"{0}\" has a transient delay of ~{1:0.##} ms.")
+            {
+            }
+
+            public Issue Create(string filename, int delay) => new Issue(this, filename, delay);
+        }
+
         public class IssuTemplateMinorDelay : IssueTemplate
         {
             public IssuTemplateMinorDelay(ICheck check)
@@ -148,5 +171,16 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             public Issue Create(string filename, int consequentDelay, int delay) => new Issue(this, filename, delay, consequentDelay);
         }
+
+        public class IssuTemplateMinorDelayNoSilence : IssueTemplate
+        {
+            public IssuTemplateMinorDelayNoSilence(ICheck check)
+                : base(check, IssueType.Negligible,
+                    "\"{0}\" has a transient delay of ~{1:0.##} ms.")
+            {
+            }
+
+            public Issue Create(string filename, int delay) => new Issue(this, filename, delay);
+        }
     }
 }

From 8a1fc7c340070e1f04d5ffca1488cfde70a054be Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sat, 26 Aug 2023 01:20:41 +0300
Subject: [PATCH 0339/2296] Basic stuff (not working for now)

---
 osu.Game/Overlays/Mods/ModMapInfoDisplay.cs   | 203 ++++++++++++++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  18 ++
 osu.Game/Screens/Select/BeatmapDetails.cs     |   6 +
 .../Screens/Select/Details/AdvancedStats.cs   |  21 ++
 osu.Game/Screens/Select/SongSelect.cs         |   3 +
 5 files changed, 251 insertions(+)
 create mode 100644 osu.Game/Overlays/Mods/ModMapInfoDisplay.cs

diff --git a/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs b/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
new file mode 100644
index 0000000000..20666391d6
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
@@ -0,0 +1,203 @@
+// 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.LocalisationExtensions;
+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;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Select.Details;
+using osu.Game.Localisation;
+using osuTK;
+
+
+namespace osu.Game.Overlays.Mods
+{
+    public partial class ModMapInfoDisplay : Container, IHasCurrentValue<MapStats>
+    {
+        public const float HEIGHT = 42;
+        private const float transition_duration = 200;
+
+        private readonly Box contentBackground;
+        private readonly Box labelBackground;
+        private readonly FillFlowContainer content;
+
+        public Bindable<MapStats> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+        private readonly BindableWithCurrent<MapStats> current = new BindableWithCurrent<MapStats>();
+
+        [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 LocalisableString Label => CommonStrings.Finish;
+        //protected string Label { get; }
+
+        protected virtual float ValueAreaWidth => 56;
+
+        protected virtual string CounterFormat => @"N0";
+
+        protected override Container<Drawable> Content => content;
+
+        protected readonly RollingCounter<double> Counter;
+
+        public ModMapInfoDisplay()
+        {
+            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 = ValueAreaWidth + ModSelectPanel.CORNER_RADIUS
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        AutoSizeAxes = Axes.X,
+                        ColumnDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension(GridSizeMode.Absolute, ValueAreaWidth)
+                        },
+                        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 FillFlowContainer
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Direction = FillDirection.Horizontal,
+                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    Spacing = new Vector2(2, 0),
+                                    Child = Counter = new EffectCounter(CounterFormat)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Current = { BindTarget = Current.Value.StarRating }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            labelBackground.Colour = colourProvider.Background4;
+        }
+
+        protected override void LoadComplete()
+        {
+            Current.BindValueChanged(e =>
+            {
+                //var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
+                setColours(e.NewValue.StarRating.Value);
+            }, true);
+        }
+
+        /// <summary>
+        /// Fades colours of text and its background according to displayed value.
+        /// </summary>
+        /// <param name="stars">random number.</param>
+        private void setColours(double stars)
+        {
+            contentBackground.FadeColour(colours.ForStarDifficulty(stars), transition_duration, Easing.OutQuint);
+        }
+
+        /// <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. 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;
+            if (comparison < 0)
+                return ModEffect.DifficultyReduction;
+
+            return ModEffect.DifficultyIncrease;
+        }
+
+        protected enum ModEffect
+        {
+            NotChanged,
+            DifficultyReduction,
+            DifficultyIncrease
+        }
+
+        private partial 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)
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 9e92e9d959..ef5f6cf323 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -25,6 +25,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Select.Details;
 using osu.Game.Utils;
 using osuTK;
 using osuTK.Input;
@@ -123,6 +124,7 @@ namespace osu.Game.Overlays.Mods
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
+        private ModMapInfoDisplay mapInfoDisplay = null!;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -219,6 +221,12 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
+            aboveColumnsContent.Add(mapInfoDisplay = new ModMapInfoDisplay
+            {
+                Anchor = Anchor.TopLeft,
+                Origin = Anchor.TopLeft
+            });
+
             FooterContent.Child = footerButtonFlow = new FillFlowContainer<ShearedButton>
             {
                 RelativeSizeAxes = Axes.X,
@@ -244,6 +252,10 @@ namespace osu.Game.Overlays.Mods
             globalAvailableMods.BindTo(game.AvailableMods);
         }
 
+        public void SetBindedMapStats(Bindable<MapStats> stats)
+        {
+            mapInfoDisplay.Current = stats;
+        }
         public override void Hide()
         {
             base.Hide();
@@ -399,6 +411,12 @@ namespace osu.Game.Overlays.Mods
             multiplierDisplay.Current.Value = multiplier;
         }
 
+        private void updateMapInfo()
+        {
+            if (mapInfoDisplay == null)
+                return;
+        }
+
         private void updateCustomisation()
         {
             if (CustomisationButton == null)
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 712b610515..c56411bef5 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -273,6 +274,11 @@ namespace osu.Game.Screens.Select
             loading.Hide();
         }
 
+        public Bindable<MapStats> GetBindedAdjustedMapStats()
+        {
+            return advanced.AdjustedMapStats.GetBoundCopy();
+        }
+
         private partial class DetailBox : Container
         {
             private readonly Container content;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index a383298faa..016e4ff2df 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -113,6 +113,8 @@ namespace osu.Game.Screens.Select.Details
             updateStatistics();
         }
 
+        public Bindable<MapStats> AdjustedMapStats = new Bindable<MapStats>();
+
         private void updateStatistics()
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
@@ -146,6 +148,14 @@ namespace osu.Game.Screens.Select.Details
             ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
 
             updateStarDifficulty();
+
+            var temp = AdjustedMapStats.Value;
+            temp.CS.Value = FirstValue.Value.adjustedValue ?? 0;
+            temp.HP.Value = HpDrain.Value.adjustedValue ?? 0;
+            temp.OD.Value = Accuracy.Value.adjustedValue ?? 0;
+            temp.AR.Value = ApproachRate.Value.adjustedValue ?? 5;
+            AdjustedMapStats.Value = temp;
+
         }
 
         private CancellationTokenSource starDifficultyCancellationSource;
@@ -178,6 +188,11 @@ namespace osu.Game.Screens.Select.Details
                     return;
 
                 starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
+
+                var temp = AdjustedMapStats.Value;
+                temp.StarRating.Value = moddedDifficulty.Value.Stars;
+                AdjustedMapStats.Value = temp;
+
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         });
 
@@ -296,4 +311,10 @@ namespace osu.Game.Screens.Select.Details
             }
         }
     }
+    public struct MapStats
+    {
+        public Bindable<double> StarRating;
+        public Bindable<double> MinBPM, MaxBPM, AvgBPM;
+        public Bindable<float> CS, HP, AR, OD;
+    }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 58755878d0..17b1b1f870 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -305,6 +305,9 @@ namespace osu.Game.Screens.Select
             // therein it will be registered at the `OsuGame` level to properly function as a blocking overlay.
             LoadComponent(ModSelect = CreateModSelectOverlay());
 
+            var bindedStats = BeatmapDetails.Details.GetBindedAdjustedMapStats();
+            ModSelect.SetBindedMapStats(bindedStats);
+
             if (Footer != null)
             {
                 foreach (var (button, overlay) in CreateFooterButtons())

From 290f8db341c7dc168bf7a93a80a364199bc19dcc Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sat, 26 Aug 2023 02:13:14 +0300
Subject: [PATCH 0340/2296] fixed stated problems

removed functions from `Ruleset.cs` and added a `GetEffectiveDifficulty()` instead
---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       | 40 ++++++++++++++--
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 38 +++++++++++++--
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 46 ++++++++++++++++---
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 37 +++++++++++++--
 osu.Game/Rulesets/Ruleset.cs                  |  9 +---
 .../Screens/Select/Details/AdvancedStats.cs   | 37 ++-------------
 6 files changed, 152 insertions(+), 55 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index a63e604204..4f499cee62 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
@@ -233,8 +234,41 @@ namespace osu.Game.Rulesets.Catch
             };
         }
 
-        public override double PreemptFromAr(float AR) => AR < 5 ? (1200.0 + 600.0 * (5 - AR) / 5) : (1200.0 - 750.0 * (AR - 5) / 5);
-        public override float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150)) + 5;
-        public override float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
+        public double PreemptFromAr(float AR) => AR < 5 ? (1200.0 + 600.0 * (5 - AR) / 5) : (1200.0 - 750.0 * (AR - 5) / 5);
+        public float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150)) + 5;
+        public float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
+
+        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (bool AR, bool OD) isRateAdjusted)
+        {
+            BeatmapDifficulty? adjustedDifficulty = null;
+            isRateAdjusted = (false, false);
+
+            if (mods.Any(m => m is IApplicableToDifficulty))
+            {
+                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
+
+                foreach (var mod in mods.OfType<IApplicableToDifficulty>())
+                    mod.ApplyToDifficulty(adjustedDifficulty);
+            }
+
+            if (mods.Any(m => m is ModRateAdjust))
+            {
+                adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
+
+                foreach (var mod in mods.OfType<ModRateAdjust>())
+                {
+                    double speedChange = (float)mod.SpeedChange.Value;
+
+                    float ar = adjustedDifficulty.ApproachRate;
+                    float od = adjustedDifficulty.OverallDifficulty;
+
+                    adjustedDifficulty.ApproachRate = ChangeArFromRate(ar, speedChange);
+
+                    if (adjustedDifficulty.ApproachRate != ar) isRateAdjusted.AR = true;
+                }
+            }
+
+            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 181e932788..7d16806397 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -428,9 +428,41 @@ namespace osu.Game.Rulesets.Mania
 
         public override DifficultySection CreateEditorDifficultySection() => new ManiaDifficultySection();
 
-        public override double HitwindowFromOd(float OD) => 64.0 - 3 * OD;
-        public override float OdFromHitwindow(double hitwindow300) => (float)(64.0 - hitwindow300) / 3;
-        public override float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
+        public double HitwindowFromOd(float OD) => 64.0 - 3 * OD;
+        public float OdFromHitwindow(double hitwindow300) => (float)(64.0 - hitwindow300) / 3;
+        public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
+        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (bool AR, bool OD) isRateAdjusted)
+        {
+            BeatmapDifficulty? adjustedDifficulty = null;
+            isRateAdjusted = (false, false);
+
+            if (mods.Any(m => m is IApplicableToDifficulty))
+            {
+                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
+
+                foreach (var mod in mods.OfType<IApplicableToDifficulty>())
+                    mod.ApplyToDifficulty(adjustedDifficulty);
+            }
+
+            if (mods.Any(m => m is ModRateAdjust))
+            {
+                adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
+
+                foreach (var mod in mods.OfType<ModRateAdjust>())
+                {
+                    double speedChange = (float)mod.SpeedChange.Value;
+
+                    float od = adjustedDifficulty.OverallDifficulty;
+
+                    adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(od, speedChange);
+
+                    if (adjustedDifficulty.OverallDifficulty != od) isRateAdjusted.OD = true;
+                }
+            }
+
+            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+        }
+
     }
 
     public enum PlayfieldType
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index fa575192c6..250685ec0f 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -329,11 +329,45 @@ namespace osu.Game.Rulesets.Osu
 
         public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
 
-        public override double PreemptFromAr(float AR) => AR < 5 ? (1200.0 + 600.0 * (5 - AR) / 5) : (1200.0 - 750.0 * (AR - 5) / 5);
-        public override float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150)) + 5;
-        public override double HitwindowFromOd(float OD) => 80.0 - 6 * OD;
-        public override float OdFromHitwindow(double hitwindow300) => (float)(80.0 - hitwindow300) / 6;
-        public override float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
-        public override float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
+        public double PreemptFromAr(float AR) => AR < 5 ? (1200.0 + 600.0 * (5 - AR) / 5) : (1200.0 - 750.0 * (AR - 5) / 5);
+        public float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150)) + 5;
+        public double HitwindowFromOd(float OD) => 80.0 - 6 * OD;
+        public float OdFromHitwindow(double hitwindow300) => (float)(80.0 - hitwindow300) / 6;
+        public float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
+        public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
+        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (bool AR, bool OD) isRateAdjusted)
+        {
+            BeatmapDifficulty? adjustedDifficulty = null;
+            isRateAdjusted = (false, false);
+
+            if (mods.Any(m => m is IApplicableToDifficulty))
+            {
+                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
+
+                foreach (var mod in mods.OfType<IApplicableToDifficulty>())
+                    mod.ApplyToDifficulty(adjustedDifficulty);
+            }
+
+            if (mods.Any(m => m is ModRateAdjust))
+            {
+                adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
+
+                foreach (var mod in mods.OfType<ModRateAdjust>())
+                {
+                    double speedChange = (float)mod.SpeedChange.Value;
+
+                    float ar = adjustedDifficulty.ApproachRate;
+                    float od = adjustedDifficulty.OverallDifficulty;
+
+                    adjustedDifficulty.ApproachRate = ChangeArFromRate(ar, speedChange);
+                    adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(od, speedChange);
+
+                    if (adjustedDifficulty.ApproachRate != ar) isRateAdjusted.AR = true;
+                    if (adjustedDifficulty.OverallDifficulty != od) isRateAdjusted.OD = true;
+                }
+            }
+
+            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 23d732645e..801e46f9c3 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -263,8 +263,39 @@ namespace osu.Game.Rulesets.Taiko
                 }), true)
             };
         }
-        public override double HitwindowFromOd(float OD) => 35.0 - 15.0 * (OD - 5) / 5;
-        public override float OdFromHitwindow(double hitwindow300) => (float)(5 * (35 - hitwindow300) / 15 + 5);
-        public override float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
+        public double HitwindowFromOd(float OD) => 35.0 - 15.0 * (OD - 5) / 5;
+        public float OdFromHitwindow(double hitwindow300) => (float)(5 * (35 - hitwindow300) / 15 + 5);
+        public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
+        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (bool AR, bool OD) isRateAdjusted)
+        {
+            BeatmapDifficulty? adjustedDifficulty = null;
+            isRateAdjusted = (false, false);
+
+            if (mods.Any(m => m is IApplicableToDifficulty))
+            {
+                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
+
+                foreach (var mod in mods.OfType<IApplicableToDifficulty>())
+                    mod.ApplyToDifficulty(adjustedDifficulty);
+            }
+
+            if (mods.Any(m => m is ModRateAdjust))
+            {
+                adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
+
+                foreach (var mod in mods.OfType<ModRateAdjust>())
+                {
+                    double speedChange = (float)mod.SpeedChange.Value;
+
+                    float od = adjustedDifficulty.OverallDifficulty;
+
+                    adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(od, speedChange);
+
+                    if (adjustedDifficulty.OverallDifficulty != od) isRateAdjusted.OD = true;
+                }
+            }
+
+            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index ed4bc0ea7a..0f7655812a 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -389,13 +389,6 @@ namespace osu.Game.Rulesets
         /// Can be overridden to alter the difficulty section to the editor beatmap setup screen.
         /// </summary>
         public virtual DifficultySection? CreateEditorDifficultySection() => null;
-
-        public virtual double PreemptFromAr(float AR) => 0;
-        public virtual float ArFromPreempt(double preempt) => 5;
-        public virtual double HitwindowFromOd(float OD) => 0;
-        public virtual float OdFromHitwindow(double hitwindow300) => 0;
-
-        public virtual float ChangeArFromRate(float AR, double rate) => AR;
-        public virtual float ChangeOdFromRate(float OD, double rate) => OD;
+        public virtual BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (bool AR, bool OD) isRateAdjusted) => (BeatmapDifficulty)baseDifficulty;
     }
 }
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 4b7eee380d..4a0eed86f8 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -15,7 +15,6 @@ using osu.Game.Beatmaps;
 using osu.Framework.Bindables;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Mods;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Extensions;
@@ -44,9 +43,6 @@ namespace osu.Game.Screens.Select.Details
         protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate;
         private readonly StatisticRow starDifficulty;
 
-        private bool isArRateAdjusted { get; set; }
-        private bool isOdRateAdjusted { get; set; }
-
         private IBeatmapInfo beatmapInfo;
 
         public IBeatmapInfo BeatmapInfo
@@ -120,35 +116,12 @@ namespace osu.Game.Screens.Select.Details
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
             BeatmapDifficulty adjustedDifficulty = null;
-            isArRateAdjusted = false;
-            isOdRateAdjusted = false;
+            (bool AR, bool OD) isRateAdjusted = (false, false);
 
-            if (baseDifficulty != null && mods.Value.Any(m => m is IApplicableToDifficulty))
+            if (baseDifficulty != null)
             {
-                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
-
-                foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
-                    mod.ApplyToDifficulty(adjustedDifficulty);
-            }
-
-            if (baseDifficulty != null && mods.Value.Any(m => m is ModRateAdjust))
-            {
-                adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
                 Ruleset ruleset = gameRuleset.Value.CreateInstance();
-
-                foreach (var mod in mods.Value.OfType<ModRateAdjust>())
-                {
-                    double speedChange = (float)mod.SpeedChange.Value;
-
-                    float ar = adjustedDifficulty.ApproachRate;
-                    float od = adjustedDifficulty.OverallDifficulty;
-
-                    adjustedDifficulty.ApproachRate = ruleset.ChangeArFromRate(ar, speedChange);
-                    adjustedDifficulty.OverallDifficulty = ruleset.ChangeOdFromRate(od, speedChange);
-
-                    if (adjustedDifficulty.ApproachRate != ar) isArRateAdjusted = true;
-                    if (adjustedDifficulty.OverallDifficulty != od) isOdRateAdjusted = true;
-                }
+                adjustedDifficulty = ruleset.GetEffectiveDifficulty(baseDifficulty, mods.Value, ref isRateAdjusted);
             }
 
             switch (BeatmapInfo?.Ruleset.OnlineID)
@@ -167,8 +140,8 @@ namespace osu.Game.Screens.Select.Details
             }
 
             HpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate, false);
-            Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty, isOdRateAdjusted);
-            ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate, isArRateAdjusted);
+            Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty, isRateAdjusted.OD);
+            ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate, isRateAdjusted.AR);
 
             updateStarDifficulty();
         }

From e77581f64134f7c75b36776d223d7812bb9e4b42 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 27 Aug 2023 01:25:50 +0300
Subject: [PATCH 0341/2296] `wholeSpins` -> `currentSpins`

---
 .../Objects/Drawables/DrawableSpinner.cs               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 0ceda1d4b0..2d2a4a05ac 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
-        private int wholeSpins;
+        private int currentSpins;
 
         private void updateBonusScore()
         {
@@ -295,14 +295,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             int spins = (int)(Result.RateAdjustedRotation / 360);
 
-            if (spins < wholeSpins)
+            if (spins < currentSpins)
             {
                 // rewinding, silently handle
-                wholeSpins = spins;
+                currentSpins = spins;
                 return;
             }
 
-            while (wholeSpins != spins)
+            while (currentSpins != spins)
             {
                 var tick = ticks.FirstOrDefault(t => !t.Result.HasResult);
 
@@ -315,7 +315,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                         gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequired);
                 }
 
-                wholeSpins++;
+                currentSpins++;
             }
         }
     }

From d614e745b8ff9e45bd46093741d810b18d255203 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 27 Aug 2023 01:27:19 +0300
Subject: [PATCH 0342/2296] Calculate spinner ticks as "whole spins" without
 arbitrary factors

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index b800b03c92..f32c6ae979 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -42,15 +42,10 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            // spinning doesn't match 1:1 with stable, so let's fudge them easier for the time being.
-            const double stable_matching_fudge = 0.6;
-
-            // close to 477rpm
-            const double maximum_rotations_per_second = 8;
+            const double maximum_rotations_per_second = 477f / 60f;
 
             double secondsDuration = Duration / 1000;
-
-            double minimumRotationsPerSecond = stable_matching_fudge * IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, 3, 5, 7.5);
+            double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, 1.5, 2.5, 3.75);
 
             SpinsRequired = (int)(secondsDuration * minimumRotationsPerSecond);
             MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration);

From 3bcddf3cc8cb76f9ad154e4baeb39d30fc306e64 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 27 Aug 2023 01:27:48 +0300
Subject: [PATCH 0343/2296] Add gap of two whole spins before achieving bonus
 score

---
 .../Objects/Drawables/DrawableSpinner.cs         |  2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs         | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2d2a4a05ac..20bbb9a1d1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -312,7 +312,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     tick.TriggerResult(true);
 
                     if (tick is DrawableSpinnerBonusTick)
-                        gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequired);
+                        gainedBonus.Value = score_per_tick * (spins - HitObject.FirstBonusSpin);
                 }
 
                 currentSpins++;
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index f32c6ae979..a26cb7b090 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -31,11 +31,21 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public int SpinsRequired { get; protected set; } = 1;
 
+        /// <summary>
+        /// The gap between spinner completion and the first bonus-awarding spin.
+        /// </summary>
+        private const int bonus_spins_gap = 2;
+
         /// <summary>
         /// Number of spins available to give bonus, beyond <see cref="SpinsRequired"/>.
         /// </summary>
         public int MaximumBonusSpins { get; protected set; } = 1;
 
+        /// <summary>
+        /// The first spin awarding bonus score.
+        /// </summary>
+        public int FirstBonusSpin => SpinsRequired + bonus_spins_gap;
+
         public override Vector2 StackOffset => Vector2.Zero;
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
@@ -48,14 +58,14 @@ namespace osu.Game.Rulesets.Osu.Objects
             double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, 1.5, 2.5, 3.75);
 
             SpinsRequired = (int)(secondsDuration * minimumRotationsPerSecond);
-            MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration);
+            MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration) - bonus_spins_gap;
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             base.CreateNestedHitObjects(cancellationToken);
 
-            int totalSpins = MaximumBonusSpins + SpinsRequired;
+            int totalSpins = MaximumBonusSpins + SpinsRequired + bonus_spins_gap;
 
             for (int i = 0; i < totalSpins; i++)
             {
@@ -63,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
                 double startTime = StartTime + (float)(i + 1) / totalSpins * Duration;
 
-                AddNested(i < SpinsRequired
+                AddNested(i < FirstBonusSpin
                     ? new SpinnerTick { StartTime = startTime, SpinnerDuration = Duration }
                     : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration, Samples = new[] { CreateHitSampleInfo("spinnerbonus") } });
             }

From 3a6920c3067f90c53578d021f3ecf7e89d368c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 09:51:37 +0200
Subject: [PATCH 0344/2296] Add failing test coverage of beatmap update flow w/
 split diffs

---
 .../TestSceneUpdateBeatmapSetButton.cs        | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
index 11d55bc0bd..585d93d3af 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
@@ -15,6 +15,7 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Carousel;
+using osu.Game.Screens.Select.Filter;
 using osu.Game.Tests.Online;
 using osu.Game.Tests.Resources;
 using osuTK.Input;
@@ -192,6 +193,57 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
         }
 
+        [Test]
+        public void TestSplitDisplay()
+        {
+            ArchiveDownloadRequest<IBeatmapSetInfo>? downloadRequest = null;
+
+            AddStep("set difficulty sort mode", () => carousel.Filter(new FilterCriteria { Sort = SortMode.Difficulty }));
+            AddStep("update online hash", () =>
+            {
+                testBeatmapSetInfo.Beatmaps.First().OnlineMD5Hash = "different hash";
+                testBeatmapSetInfo.Beatmaps.First().LastOnlineUpdate = DateTimeOffset.Now;
+
+                carousel.UpdateBeatmapSet(testBeatmapSetInfo);
+            });
+
+            AddUntilStep("multiple \"sets\" visible", () => carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().Count(), () => Is.GreaterThan(1));
+            AddUntilStep("update button visible", getUpdateButton, () => Is.Not.Null);
+
+            AddStep("click button", () => getUpdateButton()?.TriggerClick());
+
+            AddUntilStep("wait for download started", () =>
+            {
+                downloadRequest = beatmapDownloader.GetExistingDownload(testBeatmapSetInfo);
+                return downloadRequest != null;
+            });
+
+            AddUntilStep("wait for button disabled", () => getUpdateButton()?.Enabled.Value == false);
+
+            AddUntilStep("progress download to completion", () =>
+            {
+                if (downloadRequest is TestSceneOnlinePlayBeatmapAvailabilityTracker.TestDownloadRequest testRequest)
+                {
+                    testRequest.SetProgress(testRequest.Progress + 0.1f);
+
+                    if (testRequest.Progress >= 1)
+                    {
+                        testRequest.TriggerSuccess();
+
+                        // usually this would be done by the import process.
+                        testBeatmapSetInfo.Beatmaps.First().MD5Hash = "different hash";
+                        testBeatmapSetInfo.Beatmaps.First().LastOnlineUpdate = DateTimeOffset.Now;
+
+                        // usually this would be done by a realm subscription.
+                        carousel.UpdateBeatmapSet(testBeatmapSetInfo);
+                        return true;
+                    }
+                }
+
+                return false;
+            });
+        }
+
         private BeatmapCarousel createCarousel()
         {
             return carousel = new BeatmapCarousel

From 6251803868588f188ca7b78f74ad4c9e18d4b10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 10:02:05 +0200
Subject: [PATCH 0345/2296] Add failing test coverage of selection not being
 retained on song select

---
 .../TestSceneBeatmapEditorNavigation.cs       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index 54ee1659e1..d0fa5fc737 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -9,6 +9,7 @@ using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
@@ -16,6 +17,7 @@ using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.GameplayTest;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
 using osu.Game.Tests.Resources;
 using osuTK.Input;
 
@@ -203,6 +205,33 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("wait for music stopped", () => !Game.MusicController.IsPlaying);
         }
 
+        [TestCase(SortMode.Title)]
+        [TestCase(SortMode.Difficulty)]
+        public void TestSelectionRetainedOnExit(SortMode sortMode)
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("import test beatmap", () => Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely());
+            AddStep("retrieve beatmap", () => beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach());
+
+            AddStep($"set sort mode to {sortMode}", () => Game.LocalConfig.SetValue(OsuSetting.SongSelectSortingMode, sortMode));
+            AddStep("present beatmap", () => Game.PresentBeatmap(beatmapSet));
+            AddUntilStep("wait for song select",
+                () => Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
+                      && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
+                      && songSelect.IsLoaded);
+
+            AddStep("open editor", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).Edit(beatmapSet.Beatmaps.First(beatmap => beatmap.Ruleset.OnlineID == 0)));
+            AddUntilStep("wait for editor open", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.ReadyForUse);
+
+            AddStep("exit editor", () => InputManager.Key(Key.Escape));
+            AddUntilStep("wait for editor exit", () => Game.ScreenStack.CurrentScreen is not Editor);
+
+            AddUntilStep("selection retained on song select",
+                () => Game.Beatmap.Value.BeatmapInfo.ID,
+                () => Is.EqualTo(beatmapSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0).ID));
+        }
+
         private EditorBeatmap getEditorBeatmap() => getEditor().ChildrenOfType<EditorBeatmap>().Single();
 
         private Editor getEditor() => (Editor)Game.ScreenStack.CurrentScreen;

From 0af6cc1394f7fe521bdf94773b423b5ff61c2bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 10:02:30 +0200
Subject: [PATCH 0346/2296] Fix online ID not being propagated in split
 difficulty mode

Would result in failures to re-download the beatmap in update flows, for
instance.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index a8da5dc742..0354e72803 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -145,6 +145,7 @@ namespace osu.Game.Screens.Select
                     return createCarouselSet(new BeatmapSetInfo(new[] { b })
                     {
                         ID = b.BeatmapSet!.ID,
+                        OnlineID = b.BeatmapSet!.OnlineID
                     });
                 }).OfType<CarouselBeatmapSet>();
 
@@ -422,7 +423,8 @@ namespace osu.Game.Screens.Select
                 {
                     var newSet = createCarouselSet(new BeatmapSetInfo(new[] { beatmap })
                     {
-                        ID = beatmapSet.ID
+                        ID = beatmapSet.ID,
+                        OnlineID = beatmapSet.OnlineID
                     });
 
                     if (newSet != null)

From 80ec18d117fc7ae252731bcde4e65a71be838ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 10:06:26 +0200
Subject: [PATCH 0347/2296] Fix incorrect selection restore code in split case

The fallback to "any of the added sets" needs to be applied after
they've all been added, rather than with every added one. Otherwise, in
flows that expect a particular difficulty to be selected in the end
(such as exiting from editor) would end up switching away from the
edited beatmap.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 0354e72803..861385f453 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -419,6 +419,8 @@ namespace osu.Game.Screens.Select
 
             if (beatmapsSplitOut)
             {
+                var newSets = new List<CarouselBeatmapSet>();
+
                 foreach (var beatmap in beatmapSet.Beatmaps)
                 {
                     var newSet = createCarouselSet(new BeatmapSetInfo(new[] { beatmap })
@@ -429,13 +431,18 @@ namespace osu.Game.Screens.Select
 
                     if (newSet != null)
                     {
+                        newSets.Add(newSet);
                         root.AddItem(newSet);
-
-                        // check if we can/need to maintain our current selection.
-                        if (previouslySelectedID != null)
-                            select((CarouselItem?)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
                     }
                 }
+
+                // check if we can/need to maintain our current selection.
+                if (previouslySelectedID != null)
+                {
+                    var toSelect = newSets.FirstOrDefault(s => s.Beatmaps.Any(b => b.BeatmapInfo.ID == previouslySelectedID))
+                                   ?? newSets.FirstOrDefault();
+                    select(toSelect);
+                }
             }
             else
             {

From b9795eb3d4e09d66c9e2950da6e8742637dd8dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 11:02:22 +0200
Subject: [PATCH 0348/2296] Fix changes to beatmap sets being undone on
 switching sort mode

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 861385f453..9ea94b2a52 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Select
 
         private CarouselBeatmapSet? selectedBeatmapSet;
 
-        private IEnumerable<BeatmapSetInfo> originalBeatmapSetsDetached = Enumerable.Empty<BeatmapSetInfo>();
+        private List<BeatmapSetInfo> originalBeatmapSetsDetached = new List<BeatmapSetInfo>();
 
         /// <summary>
         /// Raised when the <see cref="SelectedBeatmapInfo"/> is changed.
@@ -381,6 +381,8 @@ namespace osu.Game.Screens.Select
             if (!root.BeatmapSetsByID.TryGetValue(beatmapSetID, out var existingSets))
                 return;
 
+            originalBeatmapSetsDetached.RemoveAll(set => set.ID == beatmapSetID);
+
             foreach (var set in existingSets)
             {
                 foreach (var beatmap in set.Beatmaps)
@@ -402,6 +404,9 @@ namespace osu.Game.Screens.Select
         {
             Guid? previouslySelectedID = null;
 
+            originalBeatmapSetsDetached.RemoveAll(set => set.ID == beatmapSet.ID);
+            originalBeatmapSetsDetached.Add(beatmapSet.Detach());
+
             // If the selected beatmap is about to be removed, store its ID so it can be re-selected if required
             if (selectedBeatmapSet?.BeatmapSet.ID == beatmapSet.ID)
                 previouslySelectedID = selectedBeatmap?.BeatmapInfo.ID;

From ba1f6439bf0dc3d5d283c5cf32ce35d8b93acebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 12:44:57 +0200
Subject: [PATCH 0349/2296] Disable redundant verbatim string prefix
 inspections

For some reason this started flaring up recently all over for me and
showing inspections all over, which are _technically_ valid, but
interfere with our convention of using verbatim string prefixes to
denote non-localisable strings. This, as a result, led to circular
inspections (addressing the r# inspection results in getting the
osu-localisation-analyser one, addresssing that one results in
getting the r# inspection back, etc. ad nauseam).
---
 osu.sln.DotSettings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index ef39c12768..c2778ca5b1 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -170,7 +170,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantStringInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimPrefix/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimStringPrefix/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimStringPrefix/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002EFalse/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002ETrue/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E1/@EntryIndexedValue">WARNING</s:String>

From 99d5ff9efbd7b7197497acd53f757345dc1666b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 13:50:52 +0200
Subject: [PATCH 0350/2296] Switch download requests to new API endpoint

This API endpoint is intended for usage with the entire `solo_scores`
machinery and ID schema, rather than the legacy `*_scores_high` ID
schema. It also supports automagically falling back to downloading
legacy replays if a stable-imported score is requested for download
(internally this happens via `legacy_score_id` in the `data` json).

This change will allow replays to be downloaded, but it will still not
yield 100% correct behaviour, as there is further work to be done in
that respect. The download tracker is expecting score hashes to arrive
from web to verify the integrity of the incoming download, but the API
does not expose such a facility right now; we will have to decide as to
whether we want to add one web-side, or whether we want to disable the
checking client-side.
---
 osu.Game/Online/API/Requests/DownloadReplayRequest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/DownloadReplayRequest.cs b/osu.Game/Online/API/Requests/DownloadReplayRequest.cs
index 77174f0bb5..3ea57cf637 100644
--- a/osu.Game/Online/API/Requests/DownloadReplayRequest.cs
+++ b/osu.Game/Online/API/Requests/DownloadReplayRequest.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Online.API.Requests
 
         protected override string FileExtension => ".osr";
 
-        protected override string Target => $@"scores/{Model.Ruleset.ShortName}/{Model.OnlineID}/download";
+        protected override string Target => $@"scores/{Model.OnlineID}/download";
     }
 }

From 118c86df342340da729c3931a4c58a1ed72e0f12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Aug 2023 14:57:00 +0200
Subject: [PATCH 0351/2296] Fix `TestSceneUpdateBeatmapSetButton` using random
 difficulty count

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
index 585d93d3af..6d97be730b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneUpdateBeatmapSetButton.cs
@@ -251,7 +251,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 RelativeSizeAxes = Axes.Both,
                 BeatmapSets = new List<BeatmapSetInfo>
                 {
-                    (testBeatmapSetInfo = TestResources.CreateTestBeatmapSetInfo()),
+                    (testBeatmapSetInfo = TestResources.CreateTestBeatmapSetInfo(5)),
                 }
             };
         }

From 07e126241da902fcf7471e28576c5204fc8b826d Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Mon, 28 Aug 2023 16:41:55 +0200
Subject: [PATCH 0352/2296] working negative scaling

---
 .../SkinEditor/SkinSelectionHandler.cs        | 41 ++++++-------------
 .../Edit/Compose/Components/SelectionBox.cs   |  2 +
 .../SelectionBoxDragHandleContainer.cs        | 12 ++++++
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index c90a1d8edf..ae0a3d0635 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Overlays.SkinEditor
             UpdatePosition = updateDrawablePosition
         };
 
-        private float accumulatedNegativeScaling;
-
         public override bool HandleScale(Vector2 scale, Anchor anchor)
         {
             // convert scale to screen space
@@ -73,32 +71,25 @@ namespace osu.Game.Overlays.SkinEditor
                     scale.Y = scale.X / selectionRect.Width * selectionRect.Height;
             }
 
-            // If scaling reverses the selection, don't scale and accumulate the amount of scaling.
-            if (adjustedRect.Width + scale.X < 0 || adjustedRect.Height + scale.Y < 0)
-            {
-                accumulatedNegativeScaling += scale.Length; // - new Vector2(selectionRect.Width, selectionRect.Height).Length;
-
-                return true;
-            }
-
-            // Compensate for accumulated negative scaling.
-            if (Precision.AlmostBigger(accumulatedNegativeScaling, 0) && !Precision.AlmostEquals(accumulatedNegativeScaling, 0))
-            {
-                float length = scale.Length;
-                accumulatedNegativeScaling -= length;
-
-                // If the accumulated negative scaling is still positive, don't scale.
-                if (Precision.AlmostBigger(accumulatedNegativeScaling, 0)) return true;
-                scale *= Math.Abs(accumulatedNegativeScaling) / length;
-                accumulatedNegativeScaling = 0;
-            }
-
             if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
             if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
 
             adjustedRect.Width += scale.X;
             adjustedRect.Height += scale.Y;
 
+            if (adjustedRect.Width < 0)
+            {
+                SelectionBox.ScaleHandlesFlip(Direction.Horizontal);
+                HandleFlip(Direction.Horizontal, false);
+            }
+            if (adjustedRect.Height < 0)
+            {
+                SelectionBox.ScaleHandlesFlip(Direction.Vertical);
+                HandleFlip(Direction.Vertical, false);
+            }
+            if (adjustedRect.Width < 0 || adjustedRect.Height < 0)
+                return true;
+
             // scale adjust applied to each individual item should match that of the quad itself.
             var scaledDelta = new Vector2(
                 adjustedRect.Width / selectionRect.Width,
@@ -169,12 +160,6 @@ namespace osu.Game.Overlays.SkinEditor
 
         public static void ApplyClosestAnchor(Drawable drawable) => applyAnchor(drawable, getClosestAnchor(drawable));
 
-        protected override void OnOperationEnded()
-        {
-            base.OnOperationEnded();
-            accumulatedNegativeScaling = 0;
-        }
-
         protected override void OnSelectionChanged()
         {
             base.OnSelectionChanged();
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 876e8ccbe9..a261b635b3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -307,6 +307,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return button;
         }
 
+        public void ScaleHandlesFlip(Direction direction) => dragHandles.ScaleHandlesFlip(direction);
+
         private void addScaleHandle(Anchor anchor)
         {
             var handle = new SelectionBoxScaleHandle
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 5c87271493..4fd2e9aba9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
@@ -69,6 +70,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
             allDragHandles.Add(handle);
         }
 
+        public void ScaleHandlesFlip(Direction direction)
+        {
+            foreach (var handle in scaleHandles)
+            {
+                if (direction == Direction.Horizontal && !handle.Anchor.HasFlagFast(Anchor.x1))
+                    handle.Anchor ^= Anchor.x0 | Anchor.x2;
+                if (direction == Direction.Vertical && !handle.Anchor.HasFlagFast(Anchor.y1))
+                    handle.Anchor ^= Anchor.y0 | Anchor.y2;
+            }
+        }
+
         private SelectionBoxRotationHandle displayedRotationHandle;
         private SelectionBoxDragHandle activeHandle;
 

From 390b6f649dd9b9c6408d96b8a9347ba71b12c4a1 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 29 Aug 2023 03:46:11 +0900
Subject: [PATCH 0353/2296] Add test

---
 .../Mods/TestSceneManiaModDoubleTime.cs       | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
new file mode 100644
index 0000000000..08e83b04b5
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -0,0 +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.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests.Mods
+{
+    public partial class TestSceneManiaModDoubleTime : ModTestScene
+    {
+        private const double offset = 18;
+
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
+        [Test]
+        public void TestHitWindowWithoutDoubleTime() => CreateModTest(new ModTestData
+        {
+            Mod = new ModNoMod(),
+            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value != 1,
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+                Difficulty = { OverallDifficulty = 10 },
+                HitObjects = new List<HitObject>
+                {
+                    new Note { StartTime = 1000 }
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(1000 + offset, ManiaAction.Key1)
+            }
+        });
+
+        [Test]
+        public void TestHitWindowWithDoubleTime() => CreateModTest(new ModTestData
+        {
+            Mod = new ManiaModDoubleTime(),
+            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1,
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+                Difficulty = { OverallDifficulty = 10 },
+                HitObjects = new List<HitObject>
+                {
+                    new Note { StartTime = 1000 }
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(1000 + offset, ManiaAction.Key1)
+            }
+        });
+    }
+}

From 50235cc2459c43802099b7b803396fbacf208af6 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Mon, 28 Aug 2023 23:16:33 +0300
Subject: [PATCH 0354/2296] somewhat working prototype

---
 osu.Game/Overlays/Mods/ModMapInfoContainer.cs | 58 ++++++++++++++++
 osu.Game/Overlays/Mods/ModMapInfoDisplay.cs   | 66 +++++++------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 17 +++--
 osu.Game/Screens/Select/BeatmapDetailArea.cs  |  4 ++
 osu.Game/Screens/Select/BeatmapDetails.cs     |  5 --
 .../Screens/Select/Details/AdvancedStats.cs   | 40 +++++------
 osu.Game/Screens/Select/SongSelect.cs         |  8 ++-
 7 files changed, 121 insertions(+), 77 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/ModMapInfoContainer.cs

diff --git a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
new file mode 100644
index 0000000000..eb5291b0a8
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
@@ -0,0 +1,58 @@
+// 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.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.BeatmapSet;
+using osu.Game.Resources.Localisation.Web;
+using osu.Game.Screens.Select.Details;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Mods
+{
+    public partial class ModMapInfoContainer : Container
+    {
+        private ModMapInfoDisplay starRatingDisplay = null!;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private Bindable<BeatmapInfo> adjustedInfo { get; set; } = null!;
+        private Bindable<double> starRatingValue = new Bindable<double>();
+
+        //public ModMapInfoContainer()
+        //{
+        //    
+        //}
+
+        protected override void LoadComplete()
+        {
+            starRatingDisplay = new ModMapInfoDisplay("Star Rating", colours.ForStarDifficulty);
+            starRatingDisplay.Current.BindTo(starRatingValue);
+
+            Content.Add(starRatingDisplay);
+
+            adjustedInfo.BindValueChanged(e => { updateValues(); }, true);
+        }
+
+        private void updateValues()
+        {
+            starRatingValue.Value = adjustedInfo.Value.StarRating;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs b/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
index 20666391d6..ca815984ce 100644
--- a/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModMapInfoDisplay.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
@@ -12,14 +13,13 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Select.Details;
 using osu.Game.Localisation;
 using osuTK;
 
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModMapInfoDisplay : Container, IHasCurrentValue<MapStats>
+    public partial class ModMapInfoDisplay : Container, IHasCurrentValue<double>
     {
         public const float HEIGHT = 42;
         private const float transition_duration = 200;
@@ -28,36 +28,40 @@ namespace osu.Game.Overlays.Mods
         private readonly Box labelBackground;
         private readonly FillFlowContainer content;
 
-        public Bindable<MapStats> Current
-        {
-            get => current.Current;
-            set => current.Current = value;
-        }
-        private readonly BindableWithCurrent<MapStats> current = new BindableWithCurrent<MapStats>();
+        //public Bindable<double> Current
+        //{
+        //    get => current.Current;
+        //    set => current.Current = value;
+        //}
+        //private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
 
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
+        public Bindable<double> Current { get; set; } = new BindableWithCurrent<double>();
+
+        //[Resolved]
+        //private OsuColour colours { get; set; } = null!;
 
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        protected Func<double, osuTK.Graphics.Color4> GetColor;
+
         /// <summary>
         /// Text to display in the left area of the display.
         /// </summary>
-        //protected abstract LocalisableString Label { get; }
-        protected LocalisableString Label => CommonStrings.Finish;
-        //protected string Label { get; }
+        protected LocalisableString Label;
 
         protected virtual float ValueAreaWidth => 56;
 
-        protected virtual string CounterFormat => @"N0";
+        protected virtual string CounterFormat => @"0.00";
 
         protected override Container<Drawable> Content => content;
 
         protected readonly RollingCounter<double> Counter;
 
-        public ModMapInfoDisplay()
+        public ModMapInfoDisplay(LocalisableString label, Func<double, osuTK.Graphics.Color4> colorFunc)
         {
+            Label = label;
+            GetColor = colorFunc;
             Height = HEIGHT;
             AutoSizeAxes = Axes.X;
 
@@ -125,7 +129,7 @@ namespace osu.Game.Overlays.Mods
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
-                                        Current = { BindTarget = Current.Value.StarRating }
+                                        Current = { BindTarget = Current }
                                     }
                                 }
                             }
@@ -146,39 +150,17 @@ namespace osu.Game.Overlays.Mods
             Current.BindValueChanged(e =>
             {
                 //var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
-                setColours(e.NewValue.StarRating.Value);
+                setColours(e.NewValue);
             }, true);
         }
 
         /// <summary>
         /// Fades colours of text and its background according to displayed value.
         /// </summary>
-        /// <param name="stars">random number.</param>
-        private void setColours(double stars)
+        /// <param name="value">value</param>
+        private void setColours(double value)
         {
-            contentBackground.FadeColour(colours.ForStarDifficulty(stars), transition_duration, Easing.OutQuint);
-        }
-
-        /// <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. 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;
-            if (comparison < 0)
-                return ModEffect.DifficultyReduction;
-
-            return ModEffect.DifficultyIncrease;
-        }
-
-        protected enum ModEffect
-        {
-            NotChanged,
-            DifficultyReduction,
-            DifficultyIncrease
+            contentBackground.FadeColour(GetColor(value), transition_duration, Easing.OutQuint);
         }
 
         private partial class EffectCounter : RollingCounter<double>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ef5f6cf323..a178f2e9dc 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -25,9 +25,9 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Select.Details;
 using osu.Game.Utils;
 using osuTK;
+using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Overlays.Mods
@@ -124,7 +124,8 @@ namespace osu.Game.Overlays.Mods
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
-        private ModMapInfoDisplay mapInfoDisplay = null!;
+
+        private ModMapInfoContainer mapInfoContainer = null!;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -221,7 +222,7 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
-            aboveColumnsContent.Add(mapInfoDisplay = new ModMapInfoDisplay
+            aboveColumnsContent.Add(mapInfoContainer = new ModMapInfoContainer
             {
                 Anchor = Anchor.TopLeft,
                 Origin = Anchor.TopLeft
@@ -251,11 +252,6 @@ namespace osu.Game.Overlays.Mods
 
             globalAvailableMods.BindTo(game.AvailableMods);
         }
-
-        public void SetBindedMapStats(Bindable<MapStats> stats)
-        {
-            mapInfoDisplay.Current = stats;
-        }
         public override void Hide()
         {
             base.Hide();
@@ -282,6 +278,7 @@ namespace osu.Game.Overlays.Mods
 
             SelectedMods.BindValueChanged(_ =>
             {
+                updateMapInfo();
                 updateMultiplier();
                 updateFromExternalSelection();
                 updateCustomisation();
@@ -413,8 +410,10 @@ namespace osu.Game.Overlays.Mods
 
         private void updateMapInfo()
         {
-            if (mapInfoDisplay == null)
+            if (mapInfoContainer == null)
                 return;
+
+            //mapInfoDisplay.Current.Value = 5;
         }
 
         private void updateCustomisation()
diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs
index 595b86924b..d43831e576 100644
--- a/osu.Game/Screens/Select/BeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -30,6 +31,9 @@ namespace osu.Game.Screens.Select
 
         public readonly BeatmapDetails Details;
 
+        //[Cached]
+        //public Bindable<BeatmapInfo> AdjustedInfo { get; private set; } = new Bindable<BeatmapInfo>();
+
         protected Bindable<BeatmapDetailAreaTabItem> CurrentTab => tabControl.Current;
 
         protected Bindable<bool> CurrentModsFilter => tabControl.CurrentModsFilter;
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index c56411bef5..6ebdca1b8d 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -274,11 +274,6 @@ namespace osu.Game.Screens.Select
             loading.Hide();
         }
 
-        public Bindable<MapStats> GetBindedAdjustedMapStats()
-        {
-            return advanced.AdjustedMapStats.GetBoundCopy();
-        }
-
         private partial class DetailBox : Container
         {
             private readonly Container content;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 016e4ff2df..8f609888df 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -46,6 +46,11 @@ namespace osu.Game.Screens.Select.Details
 
         private IBeatmapInfo beatmapInfo;
 
+#nullable enable
+        [Resolved]
+        private Bindable<BeatmapInfo>? adjustedInfo { get; set; } = null;
+#nullable disable
+
         public IBeatmapInfo BeatmapInfo
         {
             get => beatmapInfo;
@@ -99,6 +104,21 @@ namespace osu.Game.Screens.Select.Details
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedStatisticsUpdate;
 
+        private void updateBindedInfo()
+        {
+            if (adjustedInfo == null) return;
+
+            BeatmapInfo adjusted = (BeatmapInfo)beatmapInfo;
+            adjusted.Difficulty.CircleSize = FirstValue.Value.adjustedValue ?? 0;
+            adjusted.Difficulty.DrainRate = HpDrain.Value.adjustedValue ?? 0;
+            adjusted.Difficulty.ApproachRate = ApproachRate.Value.adjustedValue ?? 5;
+            adjusted.Difficulty.OverallDifficulty = Accuracy.Value.adjustedValue ?? 0;
+            adjusted.StarRating = starDifficulty.Value.adjustedValue ?? 0;
+
+            adjustedInfo.Value = adjusted;
+            adjustedInfo.TriggerChange();
+        }
+
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             modSettingChangeTracker?.Dispose();
@@ -113,8 +133,6 @@ namespace osu.Game.Screens.Select.Details
             updateStatistics();
         }
 
-        public Bindable<MapStats> AdjustedMapStats = new Bindable<MapStats>();
-
         private void updateStatistics()
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
@@ -149,13 +167,6 @@ namespace osu.Game.Screens.Select.Details
 
             updateStarDifficulty();
 
-            var temp = AdjustedMapStats.Value;
-            temp.CS.Value = FirstValue.Value.adjustedValue ?? 0;
-            temp.HP.Value = HpDrain.Value.adjustedValue ?? 0;
-            temp.OD.Value = Accuracy.Value.adjustedValue ?? 0;
-            temp.AR.Value = ApproachRate.Value.adjustedValue ?? 5;
-            AdjustedMapStats.Value = temp;
-
         }
 
         private CancellationTokenSource starDifficultyCancellationSource;
@@ -188,10 +199,7 @@ namespace osu.Game.Screens.Select.Details
                     return;
 
                 starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
-
-                var temp = AdjustedMapStats.Value;
-                temp.StarRating.Value = moddedDifficulty.Value.Stars;
-                AdjustedMapStats.Value = temp;
+                updateBindedInfo();
 
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         });
@@ -311,10 +319,4 @@ namespace osu.Game.Screens.Select.Details
             }
         }
     }
-    public struct MapStats
-    {
-        public Bindable<double> StarRating;
-        public Bindable<double> MinBPM, MaxBPM, AvgBPM;
-        public Bindable<float> CS, HP, AR, OD;
-    }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 17b1b1f870..4567869e8e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -99,6 +99,9 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
 
+        [Cached]
+        private Bindable<BeatmapInfo> adjustedInfo { get; set; } = new Bindable<BeatmapInfo>();
+
         protected BeatmapCarousel Carousel { get; private set; } = null!;
 
         private ParallaxContainer wedgeBackground = null!;
@@ -305,8 +308,8 @@ namespace osu.Game.Screens.Select
             // therein it will be registered at the `OsuGame` level to properly function as a blocking overlay.
             LoadComponent(ModSelect = CreateModSelectOverlay());
 
-            var bindedStats = BeatmapDetails.Details.GetBindedAdjustedMapStats();
-            ModSelect.SetBindedMapStats(bindedStats);
+            //var bindedStats = BeatmapDetails.Details.GetBindedAdjustedMapStats();
+            //ModSelect.SetBindedMapStats(bindedStats);
 
             if (Footer != null)
             {
@@ -583,6 +586,7 @@ namespace osu.Game.Screens.Select
             FilterControl.Activate();
 
             ModSelect.SelectedMods.BindTo(selectedMods);
+            //BeatmapDetails.AdjustedInfo.BindTo(adjustedInfo);
 
             beginLooping();
         }

From d07530b24102faaf6929ce12221bc5903d126095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Aug 2023 11:48:47 +0200
Subject: [PATCH 0355/2296] Mark "Score V2" mod as not user-playable

The mod generally will only be present on scores imported from stable.
As such, it's probably ok to mark it as such.

The primary reason for this change is to address #24436 (Score V2 being
visible on beatmap overlay leaderboard mod selector).

There is one possibly-unintended consequence of this change, namely that
the results screen uses `UserPlayable` to determine as to whether
animations should be played back, with the intention of turning off the
animation playback for autoplay scores specifically. Therefore, turning
off this flag will mean that the results screen animations will not play
out for Score V2 scores - but I tend to consider this as either largely
unimportant, or something that should be fixed in some other way
(possibly by checking against the autoplay mod directly).

Other usages of `UserPlayable` are either innocuous, or straight-up good
safeties going forward in the context of Score V2 (guards against
selection in mod select overlays, against score submission with
the mod).
---
 osu.Game/Rulesets/Mods/ModScoreV2.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Mods/ModScoreV2.cs b/osu.Game/Rulesets/Mods/ModScoreV2.cs
index 6d56b2d86f..df83d96769 100644
--- a/osu.Game/Rulesets/Mods/ModScoreV2.cs
+++ b/osu.Game/Rulesets/Mods/ModScoreV2.cs
@@ -16,5 +16,6 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.System;
         public override LocalisableString Description => "Score set on earlier osu! versions with the V2 scoring algorithm active.";
         public override double ScoreMultiplier => 1;
+        public override bool UserPlayable => false;
     }
 }

From 3c575516ab2f642431e0e4db16f6303d5b3c7e42 Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Tue, 29 Aug 2023 17:06:23 +0200
Subject: [PATCH 0356/2296] add correct scaling for 90 degrees rotation

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index ae0a3d0635..ff6b52ca4d 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -48,10 +48,6 @@ namespace osu.Game.Overlays.SkinEditor
             // copy to mutate, as we will need to compare to the original later on.
             var adjustedRect = selectionRect;
 
-            // first, remove any scale axis we are not interested in.
-            if (anchor.HasFlagFast(Anchor.x1)) scale.X = 0;
-            if (anchor.HasFlagFast(Anchor.y1)) scale.Y = 0;
-
             // for now aspect lock scale adjustments that occur at corners..
             if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
             {
@@ -61,7 +57,7 @@ namespace osu.Game.Overlays.SkinEditor
             }
             // ..or if any of the selection have been rotated.
             // this is to avoid requiring skew logic (which would likely not be the user's expected transform anyway).
-            else if (SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation, 0)))
+            else if (SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation % 90, 0)))
             {
                 if (anchor.HasFlagFast(Anchor.x1))
                     // if dragging from the horizontal centre, only a vertical component is available.
@@ -115,6 +111,11 @@ namespace osu.Game.Overlays.SkinEditor
                 );
 
                 updateDrawablePosition(drawableItem, newPositionInAdjusted);
+
+                if (Precision.AlmostEquals(MathF.Abs(drawableItem.Rotation) % 180, 90))
+                {
+                    scaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
+                }
                 drawableItem.Scale *= scaledDelta;
             }
 

From d56ab0fe9af86a96ebf2fe3047d0b059b29aedbb Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Tue, 29 Aug 2023 17:25:52 +0200
Subject: [PATCH 0357/2296] change names

---
 .../SkinEditor/SkinSelectionHandler.cs        | 25 ++++++++++---------
 .../Edit/Compose/Components/SelectionBox.cs   |  2 +-
 .../SelectionBoxDragHandleContainer.cs        |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index ff6b52ca4d..afa592dfba 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -73,18 +73,20 @@ namespace osu.Game.Overlays.SkinEditor
             adjustedRect.Width += scale.X;
             adjustedRect.Height += scale.Y;
 
-            if (adjustedRect.Width < 0)
-            {
-                SelectionBox.ScaleHandlesFlip(Direction.Horizontal);
-                HandleFlip(Direction.Horizontal, false);
-            }
-            if (adjustedRect.Height < 0)
-            {
-                SelectionBox.ScaleHandlesFlip(Direction.Vertical);
-                HandleFlip(Direction.Vertical, false);
-            }
             if (adjustedRect.Width < 0 || adjustedRect.Height < 0)
+            {
+                if (adjustedRect.Width < 0)
+                {
+                    SelectionBox.FlipScaleHandles(Direction.Horizontal);
+                    HandleFlip(Direction.Horizontal, false);
+                }
+                if (adjustedRect.Height < 0)
+                {
+                    SelectionBox.FlipScaleHandles(Direction.Vertical);
+                    HandleFlip(Direction.Vertical, false);
+                }
                 return true;
+            }
 
             // scale adjust applied to each individual item should match that of the quad itself.
             var scaledDelta = new Vector2(
@@ -113,9 +115,8 @@ namespace osu.Game.Overlays.SkinEditor
                 updateDrawablePosition(drawableItem, newPositionInAdjusted);
 
                 if (Precision.AlmostEquals(MathF.Abs(drawableItem.Rotation) % 180, 90))
-                {
                     scaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
-                }
+
                 drawableItem.Scale *= scaledDelta;
             }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index a261b635b3..bbf9ea8c3c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -307,7 +307,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return button;
         }
 
-        public void ScaleHandlesFlip(Direction direction) => dragHandles.ScaleHandlesFlip(direction);
+        public void FlipScaleHandles(Direction direction) => dragHandles.FlipScaleHandles(direction);
 
         private void addScaleHandle(Anchor anchor)
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 4fd2e9aba9..e7f69b7b37 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             allDragHandles.Add(handle);
         }
 
-        public void ScaleHandlesFlip(Direction direction)
+        public void FlipScaleHandles(Direction direction)
         {
             foreach (var handle in scaleHandles)
             {

From 586ce6e8d3e6d9ebdbb629d3dff76a6539739cd4 Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Tue, 29 Aug 2023 17:47:42 +0200
Subject: [PATCH 0358/2296] fix multiple selected

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index afa592dfba..971ea3d266 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -73,14 +73,14 @@ namespace osu.Game.Overlays.SkinEditor
             adjustedRect.Width += scale.X;
             adjustedRect.Height += scale.Y;
 
-            if (adjustedRect.Width < 0 || adjustedRect.Height < 0)
+            if (adjustedRect.Width <= 0 || adjustedRect.Height <= 0)
             {
-                if (adjustedRect.Width < 0)
+                if (adjustedRect.Width <= 0)
                 {
                     SelectionBox.FlipScaleHandles(Direction.Horizontal);
                     HandleFlip(Direction.Horizontal, false);
                 }
-                if (adjustedRect.Height < 0)
+                if (adjustedRect.Height <= 0)
                 {
                     SelectionBox.FlipScaleHandles(Direction.Vertical);
                     HandleFlip(Direction.Vertical, false);
@@ -114,10 +114,11 @@ namespace osu.Game.Overlays.SkinEditor
 
                 updateDrawablePosition(drawableItem, newPositionInAdjusted);
 
+                var currentScaledDelta = scaledDelta;
                 if (Precision.AlmostEquals(MathF.Abs(drawableItem.Rotation) % 180, 90))
-                    scaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
+                    currentScaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
 
-                drawableItem.Scale *= scaledDelta;
+                drawableItem.Scale *= currentScaledDelta;
             }
 
             return true;

From ce1bc7156727ec30c059ab44dab689c4c6d990cc Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Tue, 29 Aug 2023 18:41:56 +0200
Subject: [PATCH 0359/2296] formatting

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

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 971ea3d266..2acddff0e4 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -80,11 +80,13 @@ namespace osu.Game.Overlays.SkinEditor
                     SelectionBox.FlipScaleHandles(Direction.Horizontal);
                     HandleFlip(Direction.Horizontal, false);
                 }
+
                 if (adjustedRect.Height <= 0)
                 {
                     SelectionBox.FlipScaleHandles(Direction.Vertical);
                     HandleFlip(Direction.Vertical, false);
                 }
+
                 return true;
             }
 

From a04333c17bdc8ed82b99a57ce04b609b6f9a6b5b Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Tue, 29 Aug 2023 19:42:37 +0200
Subject: [PATCH 0360/2296] style: use `HitSampleInfo.All` properties

---
 osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index 323888a450..bd4649f065 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Rulesets.Edit.Checks
         private const int delay_threshold_negligible = 1;
 
         private readonly string[] audioExtensions = { "mp3", "ogg", "wav" };
-        private readonly string[] bankNames = { HitSampleInfo.BANK_NORMAL, HitSampleInfo.BANK_SOFT, HitSampleInfo.BANK_DRUM };
-        private readonly string[] sampleSets = { HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_WHISTLE, HitSampleInfo.HIT_FINISH, HitSampleInfo.HIT_CLAP };
 
         public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Audio, "Delayed hit sounds.");
 
@@ -125,7 +123,8 @@ namespace osu.Game.Rulesets.Edit.Checks
             string bank = parts[0];
             string sampleSet = parts[1];
 
-            return bankNames.Contains(bank) && sampleSets.Any(sampleSet.StartsWith);
+            return HitSampleInfo.AllBanks.Contains(bank)
+                   && HitSampleInfo.AllAdditions.Concat(new[] { HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_FLOURISH }).Any(sampleSet.StartsWith);
         }
 
         public class IssueTemplateConsequentDelay : IssueTemplate

From a7a64b57e93280624ac39481568050a9bf6dc8de Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Tue, 29 Aug 2023 19:45:11 +0200
Subject: [PATCH 0361/2296] fix: use `using` statement for waveform
 auto-disposal

---
 .../Edit/Checks/CheckDelayedHitsounds.cs      | 83 ++++++++++---------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index bd4649f065..e4be2e7198 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -57,54 +57,55 @@ namespace osu.Game.Rulesets.Edit.Checks
                     if (!isHitSound(file.Filename))
                         continue;
 
-                    Waveform waveform = new Waveform(stream);
-
-                    var points = waveform.GetPoints();
-
-                    // Skip muted samples
-                    if (points.Length == 0 || points.Sum(getAverageAmplitude) <= silence_threshold)
-                        continue;
-
-                    float maxAmplitude = points.Select(getAverageAmplitude).Max();
-
-                    int consequentDelay = 0;
-                    int delay = 0;
-                    float amplitude = 0;
-
-                    while (delay + consequentDelay < points.Length)
+                    using (Waveform waveform = new Waveform(stream))
                     {
-                        amplitude += getAverageAmplitude(points[delay]);
+                        var points = waveform.GetPoints();
 
-                        // Reached peak amplitude/transient
-                        if (amplitude >= maxAmplitude)
-                            break;
+                        // Skip muted samples
+                        if (points.Length == 0 || points.Sum(getAverageAmplitude) <= silence_threshold)
+                            continue;
 
-                        amplitude *= falloff_factor;
+                        float maxAmplitude = points.Select(getAverageAmplitude).Max();
 
-                        if (amplitude < silence_threshold)
+                        int consequentDelay = 0;
+                        int delay = 0;
+                        float amplitude = 0;
+
+                        while (delay + consequentDelay < points.Length)
                         {
-                            amplitude = 0;
-                            consequentDelay++;
+                            amplitude += getAverageAmplitude(points[delay]);
+
+                            // Reached peak amplitude/transient
+                            if (amplitude >= maxAmplitude)
+                                break;
+
+                            amplitude *= falloff_factor;
+
+                            if (amplitude < silence_threshold)
+                            {
+                                amplitude = 0;
+                                consequentDelay++;
+                            }
+
+                            delay++;
                         }
 
-                        delay++;
-                    }
-
-                    if (consequentDelay >= delay_threshold)
-                        yield return new IssueTemplateConsequentDelay(this).Create(file.Filename, consequentDelay);
-                    else if (consequentDelay + delay >= delay_threshold)
-                    {
-                        if (consequentDelay > 0)
-                            yield return new IssueTemplateDelay(this).Create(file.Filename, consequentDelay, delay);
-                        else
-                            yield return new IssueTemplateDelayNoSilence(this).Create(file.Filename, delay);
-                    }
-                    else if (consequentDelay + delay >= delay_threshold_negligible)
-                    {
-                        if (consequentDelay > 0)
-                            yield return new IssuTemplateMinorDelay(this).Create(file.Filename, consequentDelay, delay);
-                        else
-                            yield return new IssuTemplateMinorDelayNoSilence(this).Create(file.Filename, delay);
+                        if (consequentDelay >= delay_threshold)
+                            yield return new IssueTemplateConsequentDelay(this).Create(file.Filename, consequentDelay);
+                        else if (consequentDelay + delay >= delay_threshold)
+                        {
+                            if (consequentDelay > 0)
+                                yield return new IssueTemplateDelay(this).Create(file.Filename, consequentDelay, delay);
+                            else
+                                yield return new IssueTemplateDelayNoSilence(this).Create(file.Filename, delay);
+                        }
+                        else if (consequentDelay + delay >= delay_threshold_negligible)
+                        {
+                            if (consequentDelay > 0)
+                                yield return new IssuTemplateMinorDelay(this).Create(file.Filename, consequentDelay, delay);
+                            else
+                                yield return new IssuTemplateMinorDelayNoSilence(this).Create(file.Filename, delay);
+                        }
                     }
                 }
             }

From c1a7ad09b4cf9f47b2fb559c91a1620481cf99d7 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Tue, 29 Aug 2023 20:10:35 +0200
Subject: [PATCH 0362/2296] style: move common audio utils to separate static
 class

---
 .../Rulesets/Edit/Checks/CheckDelayedHitsounds.cs     | 10 +++-------
 .../Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs   |  6 +-----
 .../Edit/Checks/Components/AudioCheckUtils.cs         | 11 +++++++++++
 3 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index e4be2e7198..fab7cdb7e4 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Rulesets.Edit.Checks
         private const int delay_threshold = 5;
         private const int delay_threshold_negligible = 1;
 
-        private readonly string[] audioExtensions = { "mp3", "ogg", "wav" };
-
         public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Audio, "Delayed hit sounds.");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
@@ -51,9 +49,6 @@ namespace osu.Game.Rulesets.Edit.Checks
                     if (stream == null)
                         continue;
 
-                    if (!hasAudioExtension(file.Filename))
-                        continue;
-
                     if (!isHitSound(file.Filename))
                         continue;
 
@@ -111,10 +106,11 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
         }
 
-        private bool hasAudioExtension(string filename) => audioExtensions.Any(filename.ToLowerInvariant().EndsWith);
-
         private bool isHitSound(string filename)
         {
+            if (!AudioCheckUtils.HasAudioExtension(filename))
+                return false;
+
             // <bank>-<sampleset>
             string[] parts = filename.ToLowerInvariant().Split('-');
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs b/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs
index 1c2ea36948..32a3aa5ad9 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckTooShortAudioFiles.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using ManagedBass;
 using osu.Framework.Audio.Callbacks;
 using osu.Game.Extensions;
@@ -16,8 +15,6 @@ namespace osu.Game.Rulesets.Edit.Checks
         private const int ms_threshold = 25;
         private const int min_bytes_threshold = 100;
 
-        private readonly string[] audioExtensions = { "mp3", "ogg", "wav" };
-
         public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Audio, "Too short audio files");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
@@ -46,7 +43,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                         {
                             // If the file is not likely to be properly parsed by Bass, we don't produce Error issues about it.
                             // Image files and audio files devoid of audio data both fail, for example, but neither would be issues in this check.
-                            if (hasAudioExtension(file.Filename) && probablyHasAudioData(data))
+                            if (AudioCheckUtils.HasAudioExtension(file.Filename) && probablyHasAudioData(data))
                                 yield return new IssueTemplateBadFormat(this).Create(file.Filename);
 
                             continue;
@@ -63,7 +60,6 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
         }
 
-        private bool hasAudioExtension(string filename) => audioExtensions.Any(filename.ToLowerInvariant().EndsWith);
         private bool probablyHasAudioData(Stream data) => data.Length > min_bytes_threshold;
 
         public class IssueTemplateTooShort : IssueTemplate
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs b/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs
new file mode 100644
index 0000000000..b2cc950b94
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs
@@ -0,0 +1,11 @@
+using System.Linq;
+
+namespace osu.Game.Rulesets.Edit.Checks.Components
+{
+    public static class AudioCheckUtils
+    {
+        public static readonly string[] AUDIO_EXTENSIONS = { "mp3", "ogg", "wav" };
+
+        public static bool HasAudioExtension(string filename) => AUDIO_EXTENSIONS.Any(filename.ToLowerInvariant().EndsWith);
+    }
+}
\ No newline at end of file

From b3d432b0d520c3b4be2cb941d9f772842e6a37b7 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Tue, 29 Aug 2023 20:15:33 +0200
Subject: [PATCH 0363/2296] fix: issue template typo in `CheckDelayedHitsounds`

---
 .../Editing/Checks/CheckDelayedHitsoundsTest.cs  |  2 +-
 .../Edit/Checks/CheckDelayedHitsounds.cs         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs b/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs
index 912b916a84..20b9643ab4 100644
--- a/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckDelayedHitsoundsTest.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Editing.Checks
                 var issues = check.Run(getContext(resourceStream)).ToList();
 
                 Assert.That(issues, Has.Count.EqualTo(1));
-                Assert.That(issues.Single().Template is CheckDelayedHitsounds.IssuTemplateMinorDelay);
+                Assert.That(issues.Single().Template is CheckDelayedHitsounds.IssueTemplateMinorDelay);
             }
         }
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index fab7cdb7e4..5d12c3fea8 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateConsequentDelay(this),
             new IssueTemplateDelay(this),
             new IssueTemplateDelayNoSilence(this),
-            new IssuTemplateMinorDelay(this),
-            new IssuTemplateMinorDelayNoSilence(this),
+            new IssueTemplateMinorDelay(this),
+            new IssueTemplateMinorDelayNoSilence(this),
         };
 
         private float getAverageAmplitude(Waveform.Point point) => (point.AmplitudeLeft + point.AmplitudeRight) / 2;
@@ -97,9 +97,9 @@ namespace osu.Game.Rulesets.Edit.Checks
                         else if (consequentDelay + delay >= delay_threshold_negligible)
                         {
                             if (consequentDelay > 0)
-                                yield return new IssuTemplateMinorDelay(this).Create(file.Filename, consequentDelay, delay);
+                                yield return new IssueTemplateMinorDelay(this).Create(file.Filename, consequentDelay, delay);
                             else
-                                yield return new IssuTemplateMinorDelayNoSilence(this).Create(file.Filename, delay);
+                                yield return new IssueTemplateMinorDelayNoSilence(this).Create(file.Filename, delay);
                         }
                     }
                 }
@@ -157,9 +157,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             public Issue Create(string filename, int delay) => new Issue(this, filename, delay);
         }
 
-        public class IssuTemplateMinorDelay : IssueTemplate
+        public class IssueTemplateMinorDelay : IssueTemplate
         {
-            public IssuTemplateMinorDelay(ICheck check)
+            public IssueTemplateMinorDelay(ICheck check)
                 : base(check, IssueType.Negligible,
                     "\"{0}\" has a transient delay of ~{1:0.##} ms, of which {2:0.##} ms is complete silence.")
             {
@@ -168,9 +168,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             public Issue Create(string filename, int consequentDelay, int delay) => new Issue(this, filename, delay, consequentDelay);
         }
 
-        public class IssuTemplateMinorDelayNoSilence : IssueTemplate
+        public class IssueTemplateMinorDelayNoSilence : IssueTemplate
         {
-            public IssuTemplateMinorDelayNoSilence(ICheck check)
+            public IssueTemplateMinorDelayNoSilence(ICheck check)
                 : base(check, IssueType.Negligible,
                     "\"{0}\" has a transient delay of ~{1:0.##} ms.")
             {

From 5ecd5142d8ddc61d1394868e0627ceebc702e1ad Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Tue, 29 Aug 2023 23:27:15 +0200
Subject: [PATCH 0364/2296] fix(AudioCheckUtils): add license header

---
 osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs b/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs
index b2cc950b94..782369d72a 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs
@@ -1,3 +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;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
@@ -8,4 +11,4 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
 
         public static bool HasAudioExtension(string filename) => AUDIO_EXTENSIONS.Any(filename.ToLowerInvariant().EndsWith);
     }
-}
\ No newline at end of file
+}

From b658b0e3462170adcb3a57901de17ee514a8d9c1 Mon Sep 17 00:00:00 2001
From: Nabile Rahmani <nabile13.pc@gmail.com>
Date: Tue, 29 Aug 2023 23:28:50 +0200
Subject: [PATCH 0365/2296] Fix and use score user's IsBot property in results
 screen animation

While a mod-created replay did flag itself as performed by a bot, the extension method converting it into a Score did not copy all the generated properties.

As noted, it might be preferable for ModCreatedUser to inherit APIUser and forward it as-is to the Score instance.

Related to PR #24675
---
 osu.Game/Rulesets/Mods/ModExtensions.cs   | 4 +++-
 osu.Game/Screens/Ranking/ResultsScreen.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModExtensions.cs b/osu.Game/Rulesets/Mods/ModExtensions.cs
index b22030414b..49a3c9178a 100644
--- a/osu.Game/Rulesets/Mods/ModExtensions.cs
+++ b/osu.Game/Rulesets/Mods/ModExtensions.cs
@@ -21,8 +21,10 @@ namespace osu.Game.Rulesets.Mods
                 {
                     User = new APIUser
                     {
-                        Id = APIUser.SYSTEM_USER_ID,
+                        // TODO: Some fields weren't copied from replayData.User (namely IsBot and Id). Should ModCreatedUser inherit from APIUser so we could pass it verbatim to avoid future mistakes ?
+                        Id = replayData.User.OnlineID,
                         Username = replayData.User.Username,
+                        IsBot = replayData.User.IsBot,
                     }
                 }
             };
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 1d0499c909..03231f9329 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Screens.Ranking
             if (Score != null)
             {
                 // only show flair / animation when arriving after watching a play that isn't autoplay.
-                bool shouldFlair = player != null && Score.Mods.All(m => m.UserPlayable);
+                bool shouldFlair = player != null && !Score.User.IsBot;
 
                 ScorePanelList.AddScore(Score, shouldFlair);
             }

From 270e2a66009b7b551837ad39ed45be9d3cdbf3b9 Mon Sep 17 00:00:00 2001
From: Nabile Rahmani <nabile13.pc@gmail.com>
Date: Tue, 29 Aug 2023 23:59:08 +0200
Subject: [PATCH 0366/2296] Update osu.Game/Rulesets/Mods/ModExtensions.cs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Rulesets/Mods/ModExtensions.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModExtensions.cs b/osu.Game/Rulesets/Mods/ModExtensions.cs
index 49a3c9178a..aa106f1203 100644
--- a/osu.Game/Rulesets/Mods/ModExtensions.cs
+++ b/osu.Game/Rulesets/Mods/ModExtensions.cs
@@ -21,7 +21,6 @@ namespace osu.Game.Rulesets.Mods
                 {
                     User = new APIUser
                     {
-                        // TODO: Some fields weren't copied from replayData.User (namely IsBot and Id). Should ModCreatedUser inherit from APIUser so we could pass it verbatim to avoid future mistakes ?
                         Id = replayData.User.OnlineID,
                         Username = replayData.User.Username,
                         IsBot = replayData.User.IsBot,

From a85f0d57911fd880bb7a406cd5bd82d3934f0b50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Aug 2023 13:29:08 +0900
Subject: [PATCH 0367/2296] Allow saving changes in tournament system using
 `Ctrl`+`S`

---
 osu.Game.Tournament/SaveChangesOverlay.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/SaveChangesOverlay.cs b/osu.Game.Tournament/SaveChangesOverlay.cs
index 7838d4ba48..0b5194a51f 100644
--- a/osu.Game.Tournament/SaveChangesOverlay.cs
+++ b/osu.Game.Tournament/SaveChangesOverlay.cs
@@ -7,13 +7,16 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
 using osuTK;
 
 namespace osu.Game.Tournament
 {
-    internal partial class SaveChangesOverlay : CompositeDrawable
+    internal partial class SaveChangesOverlay : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         [Resolved]
         private TournamentGame tournamentGame { get; set; } = null!;
@@ -78,6 +81,21 @@ namespace osu.Game.Tournament
             scheduleNextCheck();
         }
 
+        public bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
+        {
+            if (e.Action == PlatformAction.Save && !e.Repeat)
+            {
+                saveChangesButton.TriggerClick();
+                return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<PlatformAction> e)
+        {
+        }
+
         private void scheduleNextCheck() => Scheduler.AddDelayed(() => checkForChanges().FireAndForget(), 1000);
 
         private void saveChanges()

From 24d6cbefe12b5ac570db353ebaeb2c7e3e192dad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Aug 2023 13:44:59 +0900
Subject: [PATCH 0368/2296] Remove tournament client minimum window size

This seemed like a good idea but people were using it with smaller
resolutions, do let's just not do it.

Addresses https://github.com/ppy/osu/discussions/24670.
---
 osu.Game.Tournament/TournamentGame.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index ba3b17b513..9baa448ab8 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -48,8 +48,6 @@ namespace osu.Game.Tournament
         {
             frameworkConfig.BindWith(FrameworkSetting.WindowedSize, windowSize);
 
-            windowSize.MinValue = new Size(TournamentSceneManager.REQUIRED_WIDTH, TournamentSceneManager.STREAM_AREA_HEIGHT);
-
             windowMode = frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
 
             Add(loadingSpinner = new LoadingSpinner(true, true)

From 0f123fd8e0be4127405236fec5cb4a114a5893fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 30 Aug 2023 08:20:57 +0200
Subject: [PATCH 0369/2296] Remove unused using directive

---
 osu.Game.Tournament/TournamentGame.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 9baa448ab8..25dc8ae1e5 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.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.Drawing;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;

From f277909470749c7ecadae849f4b25e30b1bf0260 Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Wed, 30 Aug 2023 09:16:16 +0200
Subject: [PATCH 0370/2296] maintain rotated selection's centre position

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 2acddff0e4..ff53095e22 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Overlays.SkinEditor
 
             // copy to mutate, as we will need to compare to the original later on.
             var adjustedRect = selectionRect;
+            bool isRotated = false;
 
             // for now aspect lock scale adjustments that occur at corners..
             if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
@@ -59,6 +60,7 @@ namespace osu.Game.Overlays.SkinEditor
             // this is to avoid requiring skew logic (which would likely not be the user's expected transform anyway).
             else if (SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation % 90, 0)))
             {
+                isRotated = true;
                 if (anchor.HasFlagFast(Anchor.x1))
                     // if dragging from the horizontal centre, only a vertical component is available.
                     scale.X = scale.Y / selectionRect.Height * selectionRect.Width;
@@ -70,6 +72,10 @@ namespace osu.Game.Overlays.SkinEditor
             if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
             if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
 
+            // Maintain the selection's centre position if dragging from the centre anchors and selection is rotated.
+            if (isRotated && anchor.HasFlagFast(Anchor.x1)) adjustedRect.X -= scale.X / 2;
+            if (isRotated && anchor.HasFlagFast(Anchor.y1)) adjustedRect.Y -= scale.Y / 2;
+
             adjustedRect.Width += scale.X;
             adjustedRect.Height += scale.Y;
 

From c91031604c20043e5e9315ef2eff5de6c708344d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 30 Aug 2023 21:41:57 +0300
Subject: [PATCH 0371/2296] Add test cases for hitting hit circles with "early
 fade" behaviour

---
 .../TestSceneHitCircleLateFade.cs             | 74 ++++++++++++++++---
 1 file changed, 64 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index 3c32b4fa65..149fd61311 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -3,8 +3,10 @@
 
 using System;
 using System.Linq;
+using FFmpeg.AutoGen;
 using NUnit.Framework;
 using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;
@@ -13,6 +15,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Tests.Visual;
 using osuTK;
 
@@ -23,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private float? alphaAtMiss;
 
         [Test]
-        public void TestHitCircleClassicMod()
+        public void TestHitCircleClassicModMiss()
         {
             AddStep("Create hit circle", () =>
             {
@@ -61,8 +64,21 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Transparent when missed", () => alphaAtMiss == 0);
         }
 
+        /// <summary>
+        /// No early fade is expected to be applied if the hit circle has been hit.
+        /// </summary>
         [Test]
-        public void TestHitCircleNoMod()
+        public void TestHitCircleClassicModHit()
+        {
+            AddStep("Create hit circle", () =>
+            {
+                SelectedMods.Value = new Mod[] { new OsuModClassic() };
+                createCircle(true);
+            });
+        }
+
+        [Test]
+        public void TestHitCircleNoModMiss()
         {
             AddStep("Create hit circle", () =>
             {
@@ -74,6 +90,16 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Opaque when missed", () => alphaAtMiss == 1);
         }
 
+        [Test]
+        public void TestHitCircleNoModHit()
+        {
+            AddStep("Create hit circle", () =>
+            {
+                SelectedMods.Value = Array.Empty<Mod>();
+                createCircle(true);
+            });
+        }
+
         [Test]
         public void TestSliderClassicMod()
         {
@@ -100,24 +126,27 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Head circle opaque when missed", () => alphaAtMiss == 1);
         }
 
-        private void createCircle()
+        private void createCircle(bool auto = false)
         {
             alphaAtMiss = null;
 
-            DrawableHitCircle drawableHitCircle = new DrawableHitCircle(new HitCircle
+            TestDrawableHitCircle drawableHitCircle = new TestDrawableHitCircle(new HitCircle
             {
                 StartTime = Time.Current + 500,
-                Position = new Vector2(250)
-            });
+                Position = new Vector2(250),
+            }, auto);
+
+            drawableHitCircle.Scale = new Vector2(2f);
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObject>())
                 mod.ApplyToDrawableHitObject(drawableHitCircle);
 
             drawableHitCircle.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            drawableHitCircle.OnNewResult += (_, _) =>
+            drawableHitCircle.OnNewResult += (_, result) =>
             {
-                alphaAtMiss = drawableHitCircle.Alpha;
+                if (!result.IsHit)
+                    alphaAtMiss = drawableHitCircle.Alpha;
             };
 
             Child = drawableHitCircle;
@@ -138,6 +167,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 })
             });
 
+            drawableSlider.Scale = new Vector2(2f);
+
             drawableSlider.HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             drawableSlider.OnLoadComplete += _ =>
@@ -145,12 +176,35 @@ namespace osu.Game.Rulesets.Osu.Tests
                 foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObject>())
                     mod.ApplyToDrawableHitObject(drawableSlider.HeadCircle);
 
-                drawableSlider.HeadCircle.OnNewResult += (_, _) =>
+                drawableSlider.HeadCircle.OnNewResult += (_, result) =>
                 {
-                    alphaAtMiss = drawableSlider.HeadCircle.Alpha;
+                    if (!result.IsHit)
+                        alphaAtMiss = drawableSlider.HeadCircle.Alpha;
                 };
             };
             Child = drawableSlider;
         }
+
+        protected partial class TestDrawableHitCircle : DrawableHitCircle
+        {
+            private readonly bool auto;
+
+            public TestDrawableHitCircle(HitCircle h, bool auto)
+                : base(h)
+            {
+                this.auto = auto;
+            }
+
+            protected override void CheckForResult(bool userTriggered, double timeOffset)
+            {
+                if (auto && !userTriggered && timeOffset >= 0 && CheckHittable?.Invoke(this, Time.Current) != false)
+                {
+                    // force success
+                    ApplyResult(r => r.Type = HitResult.Great);
+                }
+                else
+                    base.CheckForResult(userTriggered, timeOffset);
+            }
+        }
     }
 }

From 993cebe785a07d8c9054a4e7bf6c36567b65ef61 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 30 Aug 2023 21:42:47 +0300
Subject: [PATCH 0372/2296] Fix mod "Classic" interfering with
 `DrawableHitCircle` animation while in hit state

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 250d97c537..e740e6d201 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -85,13 +85,16 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private void applyEarlyFading(DrawableHitCircle circle)
         {
-            circle.ApplyCustomUpdateState += (o, _) =>
+            circle.ApplyCustomUpdateState += (dho, state) =>
             {
-                using (o.BeginAbsoluteSequence(o.StateUpdateTime))
+                using (dho.BeginAbsoluteSequence(dho.StateUpdateTime))
                 {
-                    double okWindow = o.HitObject.HitWindows.WindowFor(HitResult.Ok);
-                    double lateMissFadeTime = o.HitObject.HitWindows.WindowFor(HitResult.Meh) - okWindow;
-                    o.Delay(okWindow).FadeOut(lateMissFadeTime);
+                    if (state != ArmedState.Hit)
+                    {
+                        double okWindow = dho.HitObject.HitWindows.WindowFor(HitResult.Ok);
+                        double lateMissFadeTime = dho.HitObject.HitWindows.WindowFor(HitResult.Meh) - okWindow;
+                        dho.Delay(okWindow).FadeOut(lateMissFadeTime);
+                    }
                 }
             };
         }

From b8df714f56c162376396efa2ee71a8c14894e276 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 30 Aug 2023 21:50:52 +0300
Subject: [PATCH 0373/2296] Remove unused using directives

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index 149fd61311..1557afbf84 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -3,10 +3,8 @@
 
 using System;
 using System.Linq;
-using FFmpeg.AutoGen;
 using NUnit.Framework;
 using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;

From 2d88135198c245a1185fe904b0d61abbd483319f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 16:18:18 +0900
Subject: [PATCH 0374/2296] Add automated test coverage for new test

---
 .../TestSceneHitCircleLateFade.cs             | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index 1557afbf84..3b051912fd 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -68,11 +68,17 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestHitCircleClassicModHit()
         {
+            TestDrawableHitCircle circle = null!;
+
             AddStep("Create hit circle", () =>
             {
                 SelectedMods.Value = new Mod[] { new OsuModClassic() };
-                createCircle(true);
+                circle = createCircle(true);
             });
+
+            AddUntilStep("Wait until circle is hit", () => circle.Result?.Type == HitResult.Great);
+            AddUntilStep("Wait for miss window", () => Clock.CurrentTime, () => Is.GreaterThanOrEqualTo(circle.HitObject.StartTime + circle.HitObject.HitWindows.WindowFor(HitResult.Miss)));
+            AddAssert("Check circle is still visible", () => circle.Alpha, () => Is.GreaterThan(0));
         }
 
         [Test]
@@ -124,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Head circle opaque when missed", () => alphaAtMiss == 1);
         }
 
-        private void createCircle(bool auto = false)
+        private TestDrawableHitCircle createCircle(bool shouldHit = false)
         {
             alphaAtMiss = null;
 
@@ -132,7 +138,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + 500,
                 Position = new Vector2(250),
-            }, auto);
+            }, shouldHit);
 
             drawableHitCircle.Scale = new Vector2(2f);
 
@@ -148,6 +154,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             };
 
             Child = drawableHitCircle;
+
+            return drawableHitCircle;
         }
 
         private void createSlider()
@@ -180,22 +188,23 @@ namespace osu.Game.Rulesets.Osu.Tests
                         alphaAtMiss = drawableSlider.HeadCircle.Alpha;
                 };
             };
+
             Child = drawableSlider;
         }
 
         protected partial class TestDrawableHitCircle : DrawableHitCircle
         {
-            private readonly bool auto;
+            private readonly bool shouldHit;
 
-            public TestDrawableHitCircle(HitCircle h, bool auto)
+            public TestDrawableHitCircle(HitCircle h, bool shouldHit)
                 : base(h)
             {
-                this.auto = auto;
+                this.shouldHit = shouldHit;
             }
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (auto && !userTriggered && timeOffset >= 0 && CheckHittable?.Invoke(this, Time.Current) != false)
+                if (shouldHit && !userTriggered && timeOffset >= 0 && CheckHittable?.Invoke(this, Time.Current) != false)
                 {
                     // force success
                     ApplyResult(r => r.Type = HitResult.Great);

From 5241634c491e058aae4026a0a81a34d80e1dffde Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 31 Aug 2023 16:31:54 +0900
Subject: [PATCH 0375/2296] Add one more test

---
 .../TestSceneHoldNoteInput.cs                 | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 77db1b0bd8..ebf25d7a9b 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -192,6 +192,25 @@ namespace osu.Game.Rulesets.Mania.Tests
             assertTailJudgement(HitResult.Miss);
         }
 
+        /// <summary>
+        ///     -----[           ]-----
+        ///          xox         o
+        /// </summary>
+        [Test]
+        public void TestPressAtStartThenReleaseAndImmediatelyRepress()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(time_head, ManiaAction.Key1),
+                new ManiaReplayFrame(time_head + 1),
+                new ManiaReplayFrame(time_head + 2, ManiaAction.Key1),
+                new ManiaReplayFrame(time_tail),
+            });
+
+            assertHeadJudgement(HitResult.Perfect);
+            assertTailJudgement(HitResult.Meh);
+        }
+
         /// <summary>
         ///     -----[           ]-----
         ///          xo  x               o

From c60f13dd92133d8d7359450cf1e3284bbfda2bc3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 31 Aug 2023 17:30:27 +0900
Subject: [PATCH 0376/2296] Remove mania hold note ticks

---
 .../TestSceneHoldNoteInput.cs                 |  57 ---------
 .../Objects/Drawables/DrawableHoldNote.cs     |  17 ---
 .../Objects/Drawables/DrawableHoldNoteTick.cs | 110 ------------------
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   |  34 ------
 .../Objects/HoldNoteTick.cs                   |  19 ---
 osu.Game.Rulesets.Mania/UI/Column.cs          |   1 -
 osu.Game.Rulesets.Mania/UI/Stage.cs           |   4 -
 7 files changed, 242 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
 delete mode 100644 osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index ebf25d7a9b..1bf768012e 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -54,7 +54,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
             assertNoteJudgement(HitResult.IgnoreMiss);
         }
@@ -73,7 +72,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Perfect);
             assertNoteJudgement(HitResult.IgnoreHit);
         }
@@ -92,7 +90,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
             assertNoteJudgement(HitResult.IgnoreMiss);
         }
@@ -111,7 +108,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -129,7 +125,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -149,7 +144,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -169,7 +163,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Perfect);
         }
 
@@ -188,7 +181,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -227,7 +219,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -247,7 +238,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Meh);
         }
 
@@ -265,7 +255,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Miss);
         }
 
@@ -283,7 +272,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.Meh);
         }
 
@@ -377,7 +365,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             }, beatmap);
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
 
             assertHitObjectJudgement(note, HitResult.Good);
@@ -424,7 +411,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             }, beatmap);
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Miss);
 
             assertHitObjectJudgement(note, HitResult.Great);
@@ -444,7 +430,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Miss);
-            assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Meh);
         }
 
@@ -495,42 +480,6 @@ namespace osu.Game.Rulesets.Mania.Tests
                                                                        .All(j => j.Type.IsHit()));
         }
 
-        [Test]
-        public void TestHitTailBeforeLastTick()
-        {
-            const int tick_rate = 8;
-            const double tick_spacing = TimingControlPoint.DEFAULT_BEAT_LENGTH / tick_rate;
-            const double time_last_tick = time_head + tick_spacing * (int)((time_tail - time_head) / tick_spacing - 1);
-
-            var beatmap = new Beatmap<ManiaHitObject>
-            {
-                HitObjects =
-                {
-                    new HoldNote
-                    {
-                        StartTime = time_head,
-                        Duration = time_tail - time_head,
-                        Column = 0,
-                    }
-                },
-                BeatmapInfo =
-                {
-                    Difficulty = new BeatmapDifficulty { SliderTickRate = tick_rate },
-                    Ruleset = new ManiaRuleset().RulesetInfo
-                },
-            };
-
-            performTest(new List<ReplayFrame>
-            {
-                new ManiaReplayFrame(time_head, ManiaAction.Key1),
-                new ManiaReplayFrame(time_last_tick - 5)
-            }, beatmap);
-
-            assertHeadJudgement(HitResult.Perfect);
-            assertLastTickJudgement(HitResult.LargeTickMiss);
-            assertTailJudgement(HitResult.Ok);
-        }
-
         [Test]
         public void TestZeroLength()
         {
@@ -570,12 +519,6 @@ namespace osu.Game.Rulesets.Mania.Tests
         private void assertNoteJudgement(HitResult result)
             => AddAssert($"hold note judged as {result}", () => judgementResults.Single(j => j.HitObject is HoldNote).Type, () => Is.EqualTo(result));
 
-        private void assertTickJudgement(HitResult result)
-            => AddAssert($"any tick judged as {result}", () => judgementResults.Where(j => j.HitObject is HoldNoteTick).Select(j => j.Type), () => Does.Contain(result));
-
-        private void assertLastTickJudgement(HitResult result)
-            => AddAssert($"last tick judged as {result}", () => judgementResults.Last(j => j.HitObject is HoldNoteTick).Type, () => Is.EqualTo(result));
-
         private ScoreAccessibleReplayPlayer currentPlayer = null!;
 
         private void performTest(List<ReplayFrame> frames, Beatmap<ManiaHitObject>? beatmap = null)
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index c3fec92b92..3032a3ee39 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -38,7 +38,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private Container<DrawableHoldNoteHead> headContainer;
         private Container<DrawableHoldNoteTail> tailContainer;
-        private Container<DrawableHoldNoteTick> tickContainer;
 
         private PausableSkinnableSound slidingSample;
 
@@ -110,7 +109,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 {
                     RelativeSizeAxes = Axes.X
                 },
-                tickContainer = new Container<DrawableHoldNoteTick> { RelativeSizeAxes = Axes.Both },
                 tailContainer = new Container<DrawableHoldNoteTail> { RelativeSizeAxes = Axes.Both },
                 slidingSample = new PausableSkinnableSound { Looping = true }
             });
@@ -118,7 +116,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             maskedContents.AddRange(new[]
             {
                 bodyPiece.CreateProxy(),
-                tickContainer.CreateProxy(),
                 tailContainer.CreateProxy(),
             });
         }
@@ -153,10 +150,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 case DrawableHoldNoteTail tail:
                     tailContainer.Child = tail;
                     break;
-
-                case DrawableHoldNoteTick tick:
-                    tickContainer.Add(tick);
-                    break;
             }
         }
 
@@ -165,7 +158,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             base.ClearNestedHitObjects();
             headContainer.Clear(false);
             tailContainer.Clear(false);
-            tickContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
@@ -177,9 +169,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
                 case HeadNote head:
                     return new DrawableHoldNoteHead(head);
-
-                case HoldNoteTick tick:
-                    return new DrawableHoldNoteTick(tick);
             }
 
             return base.CreateNestedHitObject(hitObject);
@@ -266,12 +255,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             if (Tail.AllJudged)
             {
-                foreach (var tick in tickContainer)
-                {
-                    if (!tick.Judged)
-                        tick.MissForcefully();
-                }
-
                 if (Tail.IsHit)
                     ApplyResult(r => r.Type = r.Judgement.MaxResult);
                 else
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
deleted file mode 100644
index ce6a83f79f..0000000000
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.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 System;
-using System.Diagnostics;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
-
-namespace osu.Game.Rulesets.Mania.Objects.Drawables
-{
-    /// <summary>
-    /// Visualises a <see cref="HoldNoteTick"/> hit object.
-    /// </summary>
-    public partial class DrawableHoldNoteTick : DrawableManiaHitObject<HoldNoteTick>
-    {
-        /// <summary>
-        /// References the time at which the user started holding the hold note.
-        /// </summary>
-        private Func<double?> holdStartTime;
-
-        private Container glowContainer;
-
-        public DrawableHoldNoteTick()
-            : this(null)
-        {
-        }
-
-        public DrawableHoldNoteTick(HoldNoteTick hitObject)
-            : base(hitObject)
-        {
-            Anchor = Anchor.TopCentre;
-            Origin = Anchor.TopCentre;
-
-            RelativeSizeAxes = Axes.X;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AddInternal(glowContainer = new CircularContainer
-            {
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                Children = new[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                        AlwaysPresent = true
-                    }
-                }
-            });
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            AccentColour.BindValueChanged(colour =>
-            {
-                glowContainer.EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Glow,
-                    Radius = 2f,
-                    Roundness = 15f,
-                    Colour = colour.NewValue.Opacity(0.3f)
-                };
-            }, true);
-        }
-
-        protected override void OnApply()
-        {
-            base.OnApply();
-
-            Debug.Assert(ParentHitObject != null);
-
-            var holdNote = (DrawableHoldNote)ParentHitObject;
-            holdStartTime = () => holdNote.HoldStartTime;
-        }
-
-        protected override void OnFree()
-        {
-            base.OnFree();
-
-            holdStartTime = null;
-        }
-
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
-        {
-            if (Time.Current < HitObject.StartTime)
-                return;
-
-            double? startTime = holdStartTime?.Invoke();
-
-            if (startTime == null || startTime > HitObject.StartTime)
-                ApplyResult(r => r.Type = r.Judgement.MinResult);
-            else
-                ApplyResult(r => r.Type = r.Judgement.MaxResult);
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index c367886efe..333912dd0c 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -6,8 +6,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using osu.Game.Audio;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
@@ -83,25 +81,10 @@ namespace osu.Game.Rulesets.Mania.Objects
 
         public override double MaximumJudgementOffset => Tail.MaximumJudgementOffset;
 
-        /// <summary>
-        /// The time between ticks of this hold.
-        /// </summary>
-        private double tickSpacing = 50;
-
-        protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
-        {
-            base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
-
-            TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
-            tickSpacing = timingPoint.BeatLength / difficulty.SliderTickRate;
-        }
-
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             base.CreateNestedHitObjects(cancellationToken);
 
-            createTicks(cancellationToken);
-
             AddNested(Head = new HeadNote
             {
                 StartTime = StartTime,
@@ -117,23 +100,6 @@ namespace osu.Game.Rulesets.Mania.Objects
             });
         }
 
-        private void createTicks(CancellationToken cancellationToken)
-        {
-            if (tickSpacing == 0)
-                return;
-
-            for (double t = StartTime + tickSpacing; t <= EndTime - tickSpacing; t += tickSpacing)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                AddNested(new HoldNoteTick
-                {
-                    StartTime = t,
-                    Column = Column
-                });
-            }
-        }
-
         public override Judgement CreateJudgement() => new IgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs
deleted file mode 100644
index e5c5260a49..0000000000
--- a/osu.Game.Rulesets.Mania/Objects/HoldNoteTick.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 osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Judgements;
-using osu.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Mania.Objects
-{
-    /// <summary>
-    /// A scoring tick of a hold note.
-    /// </summary>
-    public class HoldNoteTick : ManiaHitObject
-    {
-        public override Judgement CreateJudgement() => new HoldNoteTickJudgement();
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index f38571a6d3..1c4f0462ec 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -112,7 +112,6 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);
-            RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 250);
         }
 
         private void onSourceChanged()
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 4382f8e84a..fa9af6d157 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -195,10 +195,6 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            // Tick judgements should not display text.
-            if (judgedObject is DrawableHoldNoteTick)
-                return;
-
             judgements.Clear(false);
             judgements.Add(judgementPool.Get(j =>
             {

From 5fa31b7b359ca15a5a0cde035df2279a22f695d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 18:05:34 +0900
Subject: [PATCH 0377/2296] Fix schedule screen not responding to new matches
 being added

---
 .../Screens/Schedule/ScheduleScreen.cs        | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 063c231add..ee4b762be3 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.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.Allocation;
 using osu.Framework.Bindables;
@@ -19,6 +20,7 @@ namespace osu.Game.Tournament.Screens.Schedule
 {
     public partial class ScheduleScreen : TournamentScreen
     {
+        private readonly BindableList<TournamentMatch> allMatches = new BindableList<TournamentMatch>();
         private readonly Bindable<TournamentMatch?> currentMatch = new Bindable<TournamentMatch?>();
         private Container mainContainer = null!;
         private LadderInfo ladder = null!;
@@ -101,16 +103,23 @@ namespace osu.Game.Tournament.Screens.Schedule
         {
             base.LoadComplete();
 
+            allMatches.BindTo(ladder.Matches);
+            allMatches.BindCollectionChanged((_, _) => refresh());
+
             currentMatch.BindTo(ladder.CurrentMatch);
-            currentMatch.BindValueChanged(matchChanged, true);
+            currentMatch.BindValueChanged(_ => refresh(), true);
         }
 
-        private void matchChanged(ValueChangedEvent<TournamentMatch?> match)
+        private void refresh()
         {
-            var upcoming = ladder.Matches.Where(p => !p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4);
-            var conditionals = ladder
-                               .Matches.Where(p => !p.Completed.Value && (p.Team1.Value == null || p.Team2.Value == null) && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
-                               .SelectMany(m => m.ConditionalMatches.Where(cp => m.Acronyms.TrueForAll(a => cp.Acronyms.Contains(a))));
+            IEnumerable<TournamentMatch> upcoming =
+                allMatches
+                    .Where(p => !p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4);
+
+            IEnumerable<ConditionalTournamentMatch> conditionals =
+                allMatches
+                    .Where(p => !p.Completed.Value && (p.Team1.Value == null || p.Team2.Value == null) && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
+                    .SelectMany(m => m.ConditionalMatches.Where(cp => m.Acronyms.TrueForAll(a => cp.Acronyms.Contains(a))));
 
             upcoming = upcoming.Concat(conditionals);
             upcoming = upcoming.OrderBy(p => p.Date.Value).Take(8);
@@ -137,12 +146,12 @@ namespace osu.Game.Tournament.Screens.Schedule
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Width = 0.4f,
-                                    ChildrenEnumerable = ladder.Matches
-                                                               .Where(p => p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null
-                                                                           && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
-                                                               .OrderByDescending(p => p.Date.Value)
-                                                               .Take(8)
-                                                               .Select(p => new ScheduleMatch(p))
+                                    ChildrenEnumerable = allMatches
+                                                         .Where(p => p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null
+                                                                     && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
+                                                         .OrderByDescending(p => p.Date.Value)
+                                                         .Take(8)
+                                                         .Select(p => new ScheduleMatch(p))
                                 },
                                 new ScheduleContainer("upcoming matches")
                                 {
@@ -161,7 +170,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                 }
             };
 
-            if (match.NewValue != null)
+            if (currentMatch.Value != null)
             {
                 comingUpNext.Child = new FillFlowContainer
                 {
@@ -170,12 +179,12 @@ namespace osu.Game.Tournament.Screens.Schedule
                     Spacing = new Vector2(30),
                     Children = new Drawable[]
                     {
-                        new ScheduleMatch(match.NewValue, false)
+                        new ScheduleMatch(currentMatch.Value, false)
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                         },
-                        new TournamentSpriteTextWithBackground(match.NewValue.Round.Value?.Name.Value ?? string.Empty)
+                        new TournamentSpriteTextWithBackground(currentMatch.Value.Round.Value?.Name.Value ?? string.Empty)
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
@@ -185,7 +194,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Text = match.NewValue.Team1.Value?.FullName + " vs " + match.NewValue.Team2.Value?.FullName,
+                            Text = currentMatch.Value.Team1.Value?.FullName + " vs " + currentMatch.Value.Team2.Value?.FullName,
                             Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold)
                         },
                         new FillFlowContainer
@@ -196,7 +205,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                             Origin = Anchor.CentreLeft,
                             Children = new Drawable[]
                             {
-                                new ScheduleMatchDate(match.NewValue.Date.Value)
+                                new ScheduleMatchDate(currentMatch.Value.Date.Value)
                                 {
                                     Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
                                 }

From 7aa1505062cd3d15082d3e10dbf9cc232048b6c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 18:13:36 +0900
Subject: [PATCH 0378/2296] Improve legibility of LINQ queries for
 recent/upcoming matches

---
 .../Screens/Schedule/ScheduleScreen.cs        | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index ee4b762be3..62c54daa75 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -112,17 +112,25 @@ namespace osu.Game.Tournament.Screens.Schedule
 
         private void refresh()
         {
-            IEnumerable<TournamentMatch> upcoming =
-                allMatches
-                    .Where(p => !p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4);
+            const int days_for_displays = 4;
 
             IEnumerable<ConditionalTournamentMatch> conditionals =
                 allMatches
-                    .Where(p => !p.Completed.Value && (p.Team1.Value == null || p.Team2.Value == null) && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
+                    .Where(m => !m.Completed.Value && (m.Team1.Value == null || m.Team2.Value == null) && Math.Abs(m.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < days_for_displays)
                     .SelectMany(m => m.ConditionalMatches.Where(cp => m.Acronyms.TrueForAll(a => cp.Acronyms.Contains(a))));
 
-            upcoming = upcoming.Concat(conditionals);
-            upcoming = upcoming.OrderBy(p => p.Date.Value).Take(8);
+            IEnumerable<TournamentMatch> upcoming =
+                allMatches
+                    .Where(m => !m.Completed.Value && m.Team1.Value != null && m.Team2.Value != null && Math.Abs(m.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < days_for_displays)
+                    .Concat(conditionals)
+                    .OrderBy(m => m.Date.Value)
+                    .Take(8);
+
+            var recent =
+                allMatches
+                    .Where(m => m.Completed.Value && m.Team1.Value != null && m.Team2.Value != null && Math.Abs(m.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < days_for_displays)
+                    .OrderByDescending(m => m.Date.Value)
+                    .Take(8);
 
             ScheduleContainer comingUpNext;
 
@@ -146,12 +154,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Width = 0.4f,
-                                    ChildrenEnumerable = allMatches
-                                                         .Where(p => p.Completed.Value && p.Team1.Value != null && p.Team2.Value != null
-                                                                     && Math.Abs(p.Date.Value.DayOfYear - DateTimeOffset.UtcNow.DayOfYear) < 4)
-                                                         .OrderByDescending(p => p.Date.Value)
-                                                         .Take(8)
-                                                         .Select(p => new ScheduleMatch(p))
+                                    ChildrenEnumerable = recent.Select(p => new ScheduleMatch(p))
                                 },
                                 new ScheduleContainer("upcoming matches")
                                 {

From 4b68493084a4f9b87bbead6fdb02367d5d062832 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 18:05:18 +0900
Subject: [PATCH 0379/2296] Add ability to test recent / upcoming matches on
 schedule screen

---
 .../Screens/TestSceneScheduleScreen.cs        | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index f3c3fdec97..a58f09d13a 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
@@ -12,6 +12,13 @@ namespace osu.Game.Tournament.Tests.Screens
 {
     public partial class TestSceneScheduleScreen : TournamentScreenTestScene
     {
+        public override void SetUpSteps()
+        {
+            AddStep("clear matches", () => Ladder.Matches.Clear());
+
+            base.SetUpSteps();
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -34,6 +41,36 @@ namespace osu.Game.Tournament.Tests.Screens
             AddStep("Set null current match", () => Ladder.CurrentMatch.Value = null);
         }
 
+        [Test]
+        public void TestUpcomingMatches()
+        {
+            AddStep("Add upcoming match", () =>
+            {
+                var tournamentMatch = CreateSampleMatch();
+
+                tournamentMatch.Date.Value = DateTimeOffset.UtcNow.AddMinutes(5);
+                tournamentMatch.Completed.Value = false;
+
+                Ladder.Matches.Add(tournamentMatch);
+            });
+        }
+
+        [Test]
+        public void TestRecentMatches()
+        {
+            AddStep("Add recent match", () =>
+            {
+                var tournamentMatch = CreateSampleMatch();
+
+                tournamentMatch.Date.Value = DateTimeOffset.UtcNow;
+                tournamentMatch.Completed.Value = true;
+                tournamentMatch.Team1Score.Value = tournamentMatch.PointsToWin;
+                tournamentMatch.Team2Score.Value = tournamentMatch.PointsToWin / 2;
+
+                Ladder.Matches.Add(tournamentMatch);
+            });
+        }
+
         private void setMatchDate(TimeSpan relativeTime)
             // Humanizer cannot handle negative timespans.
             => AddStep($"start time is {relativeTime}", () =>

From 540c58c359ed47ee758519da0b089621be41b7cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 18:46:47 +0900
Subject: [PATCH 0380/2296] Fix tournament screen tests not matching
 `OsuGameBase` resolution

This would cause things to look completely out of whack.

The numbers here match `DrawSizePreservingFillContainer` defaults as
used by `OsuGameBase.CreateScalingContainer()`.
---
 osu.Game.Tournament.Tests/TournamentScreenTestScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs b/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
index 8adffe1468..e8cca00c92 100644
--- a/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentScreenTestScene.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tournament.Tests
         {
             public TournamentScalingContainer()
             {
-                TargetDrawSize = new Vector2(1920, 1080);
+                TargetDrawSize = new Vector2(1024, 768);
                 RelativeSizeAxes = Axes.Both;
             }
 

From 4bdaca3816ad8cf6ddd3125fce83c5c11e975a20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 18:05:04 +0900
Subject: [PATCH 0381/2296] Fix regression in spacing on schedule screen

---
 osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 62c54daa75..d02559d6b7 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -294,6 +294,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                             {
                                 Direction = FillDirection.Vertical,
                                 RelativeSizeAxes = Axes.Both,
+                                Spacing = new Vector2(0, -6),
                                 Margin = new MarginPadding(10)
                             },
                         }

From 34b279845bf4d4569b8cc9897cba0b58e4219c20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 19:03:56 +0900
Subject: [PATCH 0382/2296] Add more testability for song bar

---
 osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
index e0444b6126..95d6b6d107 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
@@ -58,9 +58,14 @@ namespace osu.Game.Tournament.Tests.Components
 
                 songBar.Beatmap = new TournamentBeatmap(beatmap);
             });
+
             AddStep("set mods to HR", () => songBar.Mods = LegacyMods.HardRock);
             AddStep("set mods to DT", () => songBar.Mods = LegacyMods.DoubleTime);
             AddStep("unset mods", () => songBar.Mods = LegacyMods.None);
+
+            AddToggleStep("toggle expanded", expanded => songBar.Expanded = expanded);
+
+            AddStep("set null beatmap", () => songBar.Beatmap = null);
         }
     }
 }

From cf9c8120c5292774b8aec7d2b0282003cdca32d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Aug 2023 19:04:06 +0900
Subject: [PATCH 0383/2296] Fix potential race condition in song bar beatmap
 lookup flow

Cancelling a web request may not necessarily cancel the callbacks.

This might help with https://github.com/ppy/osu/issues/24598.
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index bf835122cc..5407c21079 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -92,8 +92,16 @@ namespace osu.Game.Tournament.IPC
                                     else
                                     {
                                         beatmapLookupRequest = new GetBeatmapRequest(new APIBeatmap { OnlineID = beatmapId });
-                                        beatmapLookupRequest.Success += b => Beatmap.Value = new TournamentBeatmap(b);
-                                        beatmapLookupRequest.Failure += _ => Beatmap.Value = null;
+                                        beatmapLookupRequest.Success += b =>
+                                        {
+                                            if (lastBeatmapId == beatmapId)
+                                                Beatmap.Value = new TournamentBeatmap(b);
+                                        };
+                                        beatmapLookupRequest.Failure += _ =>
+                                        {
+                                            if (lastBeatmapId == beatmapId)
+                                                Beatmap.Value = null;
+                                        };
                                         API.Queue(beatmapLookupRequest);
                                     }
                                 }

From 47160f7744823a4f53716fbc001b707003430a15 Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Thu, 31 Aug 2023 20:24:26 +0200
Subject: [PATCH 0384/2296] make getClosestAnchor work with rotated drawable

---
 .../SkinEditor/SkinSelectionHandler.cs        | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 72216f040e..fe2816db6f 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -291,7 +291,7 @@ namespace osu.Game.Overlays.SkinEditor
             if (parent == null)
                 return drawable.Anchor;
 
-            var screenPosition = getScreenPosition();
+            var screenPosition = drawable.ToScreenSpace(drawable.OriginPosition);
 
             var absolutePosition = parent.ToLocalSpace(screenPosition);
             var factor = parent.RelativeToAbsoluteFactor;
@@ -313,26 +313,6 @@ namespace osu.Game.Overlays.SkinEditor
             result |= getAnchorFromPosition(absolutePosition.Y / factor.Y, Anchor.y0, Anchor.y1, Anchor.y2);
 
             return result;
-
-            Vector2 getScreenPosition()
-            {
-                var quad = drawable.ScreenSpaceDrawQuad;
-                var origin = drawable.Origin;
-
-                var pos = quad.TopLeft;
-
-                if (origin.HasFlagFast(Anchor.x2))
-                    pos.X += quad.Width;
-                else if (origin.HasFlagFast(Anchor.x1))
-                    pos.X += quad.Width / 2f;
-
-                if (origin.HasFlagFast(Anchor.y2))
-                    pos.Y += quad.Height;
-                else if (origin.HasFlagFast(Anchor.y1))
-                    pos.Y += quad.Height / 2f;
-
-                return pos;
-            }
         }
 
         private static void applyAnchor(Drawable drawable, Anchor anchor)

From c75b14c72994c51a54b4f01fc16a4f52c22d9c4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 Sep 2023 16:54:35 +0900
Subject: [PATCH 0385/2296] Apply NRT to new `LegacyHitPolicy` class (and other
 implementations)

---
 osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs      |  4 +---
 osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs        |  7 ++++---
 .../UI/StartTimeOrderedHitPolicy.cs                | 14 +++++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
index 69bd360b5e..2c6895d7ec 100644
--- a/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/AnyOrderHitPolicy.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.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
@@ -14,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class AnyOrderHitPolicy : IHitPolicy
     {
-        public IHitObjectContainer HitObjectContainer { get; set; }
+        public IHitObjectContainer HitObjectContainer { get; set; } = null!;
 
         public ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result) => ClickAction.Hit;
 
diff --git a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
index 2b6359fb46..daf498581e 100644
--- a/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/LegacyHitPolicy.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 osu.Game.Rulesets.Objects;
@@ -22,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class LegacyHitPolicy : IHitPolicy
     {
-        public IHitObjectContainer HitObjectContainer { get; set; }
+        public IHitObjectContainer? HitObjectContainer { get; set; }
 
         private readonly double hittableRange;
 
@@ -37,6 +35,9 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public virtual ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult result)
         {
+            if (HitObjectContainer == null)
+                throw new InvalidOperationException($"{nameof(HitObjectContainer)} should be set before {nameof(CheckHittable)} is called.");
+
             var aliveObjects = HitObjectContainer.AliveObjects.ToList();
             int index = aliveObjects.IndexOf(hitObject);
 
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 6fd0b512be..2b24fb9398 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.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.Game.Rulesets.Objects;
@@ -23,11 +21,14 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class StartTimeOrderedHitPolicy : IHitPolicy
     {
-        public IHitObjectContainer HitObjectContainer { get; set; }
+        public IHitObjectContainer? HitObjectContainer { get; set; }
 
         public ClickAction CheckHittable(DrawableHitObject hitObject, double time, HitResult _)
         {
-            DrawableHitObject blockingObject = null;
+            if (HitObjectContainer == null)
+                throw new InvalidOperationException($"{nameof(HitObjectContainer)} should be set before {nameof(CheckHittable)} is called.");
+
+            DrawableHitObject? blockingObject = null;
 
             foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))
             {
@@ -48,6 +49,9 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public void HandleHit(DrawableHitObject hitObject)
         {
+            if (HitObjectContainer == null)
+                throw new InvalidOperationException($"{nameof(HitObjectContainer)} should be set before {nameof(HandleHit)} is called.");
+
             // Hitobjects which themselves don't block future hitobjects don't cause misses (e.g. slider ticks, spinners).
             if (!hitObjectCanBlockFutureHits(hitObject))
                 return;
@@ -75,7 +79,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
         {
-            foreach (var obj in HitObjectContainer.AliveObjects)
+            foreach (var obj in HitObjectContainer!.AliveObjects)
             {
                 if (obj.HitObject.StartTime >= targetTime)
                     yield break;

From ede9fae38166e69e85ee7fbd643109b218eea4d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 Sep 2023 17:19:39 +0900
Subject: [PATCH 0386/2296] Remove broken check from
 `TestSceneHitCircleLateFade`

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index 3b051912fd..d74a31ada4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -204,7 +204,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (shouldHit && !userTriggered && timeOffset >= 0 && CheckHittable?.Invoke(this, Time.Current) != false)
+                if (shouldHit && !userTriggered && timeOffset >= 0)
                 {
                     // force success
                     ApplyResult(r => r.Type = HitResult.Great);

From 6ce251fbb5023705bc01325741e61b548b33502d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 Sep 2023 19:17:53 +0900
Subject: [PATCH 0387/2296] Expose base `VisualisationMethod` so we don't need
 to `new` it locally per ruleset

---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs         | 7 -------
 osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index eb99434e04..9169599798 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Configuration;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -51,12 +50,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
-        public new ScrollVisualisationMethod VisualisationMethod
-        {
-            get => base.VisualisationMethod;
-            set => base.VisualisationMethod = value;
-        }
-
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
         private readonly BindableInt configScrollSpeed = new BindableInt();
         private double smoothTimeRange;
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index d082d26792..6abfc6ee49 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         private ScrollVisualisationMethod visualisationMethod = ScrollVisualisationMethod.Sequential;
 
-        protected ScrollVisualisationMethod VisualisationMethod
+        public ScrollVisualisationMethod VisualisationMethod
         {
             get => visualisationMethod;
             set

From 37c2b330a235a99fe999be7975c256325fa8c50a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 1 Sep 2023 19:49:57 +0900
Subject: [PATCH 0388/2296] Move toggle implementation to work on all scrolling
 rulesets automatically

---
 .../Edit/CatchHitObjectComposer.cs            |  1 +
 .../Mods/TestSceneManiaModConstantSpeed.cs    |  2 +-
 .../Edit/DrawableManiaEditorRuleset.cs        | 19 +-----
 .../Edit/ManiaHitObjectComposer.cs            | 30 +--------
 .../Edit/TaikoHitObjectComposer.cs            |  2 +-
 .../Edit/DistancedHitObjectComposer.cs        |  2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  5 +-
 .../Edit/ScrollingHitObjectComposer.cs        | 62 +++++++++++++++++++
 8 files changed, 73 insertions(+), 50 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index f2877572e8..136a78b343 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -26,6 +26,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Catch.Edit
 {
     public partial class CatchHitObjectComposer : DistancedHitObjectComposer<CatchHitObject>
+        // we're also a ScrollingHitObjectComposer candidate, but can't be everything can we?
     {
         private const float distance_snap_radius = 50;
 
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs
index dc4f660a45..474430414c 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             PassCondition = () =>
             {
                 var hitObject = Player.ChildrenOfType<DrawableManiaHitObject>().FirstOrDefault();
-                return hitObject?.Dependencies.Get<IScrollingInfo>().Algorithm is ConstantScrollAlgorithm;
+                return hitObject?.Dependencies.Get<IScrollingInfo>().Algorithm.Value is ConstantScrollAlgorithm;
             }
         });
     }
diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index 013dd3dcbd..1741dad5d6 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -2,23 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osuTK;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
     public partial class DrawableManiaEditorRuleset : DrawableManiaRuleset
     {
-        public readonly IBindable<TernaryState> ShowSpeedChanges = new Bindable<TernaryState>();
-
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
         public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods)
@@ -26,18 +21,6 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            ShowSpeedChanges.BindValueChanged(state =>
-            {
-                VisualisationMethod = state.NewValue == TernaryState.True
-                    ? ScrollVisualisationMethod.Sequential
-                    : ScrollVisualisationMethod.Constant;
-            }, true);
-        }
-
         protected override Playfield CreatePlayfield() => new ManiaEditorPlayfield(Beatmap.Stages)
         {
             Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 44e238efac..9bde9485b2 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -6,13 +6,8 @@
 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.Input;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Objects;
@@ -21,16 +16,13 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public partial class ManiaHitObjectComposer : HitObjectComposer<ManiaHitObject>
+    public partial class ManiaHitObjectComposer : ScrollingHitObjectComposer<ManiaHitObject>
     {
-        private readonly Bindable<TernaryState> showSpeedChanges = new Bindable<TernaryState>();
-
         private DrawableManiaEditorRuleset drawableRuleset;
         private ManiaBeatSnapGrid beatSnapGrid;
         private InputManager inputManager;
@@ -44,21 +36,6 @@ namespace osu.Game.Rulesets.Mania.Edit
         private void load()
         {
             AddInternal(beatSnapGrid = new ManiaBeatSnapGrid());
-
-            LeftToolbox.Add(new EditorToolboxGroup("playfield")
-            {
-                Child = new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(0, 5),
-                    Children = new[]
-                    {
-                        new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
-                    }
-                },
-            });
         }
 
         protected override void LoadComplete()
@@ -82,10 +59,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
-            drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods)
-            {
-                ShowSpeedChanges = { BindTarget = showSpeedChanges }
-            };
+            drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods);
 
             // This is the earliest we can cache the scrolling info to ourselves, before masks are added to the hierarchy and inject it
             dependencies.CacheAs(drawableRuleset.ScrollingInfo);
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index 3e63d624e7..fbad8c7fad 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -9,7 +9,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Taiko.Edit
 {
-    public partial class TaikoHitObjectComposer : HitObjectComposer<TaikoHitObject>
+    public partial class TaikoHitObjectComposer : ScrollingHitObjectComposer<TaikoHitObject>
     {
         protected override bool ApplyHorizontalCentering => false;
 
diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index 817e8bd5fe..d1db8cb1f1 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Edit
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load()
         {
             RightToolbox.Add(new EditorToolboxGroup("snapping")
             {
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index c967187b5c..295a016c7b 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -87,6 +87,8 @@ namespace osu.Game.Rulesets.Edit
         private IBindable<bool> hasTiming;
         private Bindable<bool> autoSeekOnPlacement;
 
+        protected DrawableRuleset<TObject> DrawableRuleset { get; private set; }
+
         protected HitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
@@ -104,7 +106,8 @@ namespace osu.Game.Rulesets.Edit
 
             try
             {
-                drawableRulesetWrapper = new DrawableEditorRulesetWrapper<TObject>(CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap, new[] { Ruleset.GetAutoplayMod() }))
+                DrawableRuleset = CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap, new[] { Ruleset.GetAutoplayMod() });
+                drawableRulesetWrapper = new DrawableEditorRulesetWrapper<TObject>(DrawableRuleset)
                 {
                     Clock = EditorClock,
                     ProcessCustomClock = false
diff --git a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
new file mode 100644
index 0000000000..0340354016
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
@@ -0,0 +1,62 @@
+// 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.Sprites;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
+using osuTK;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public abstract partial class ScrollingHitObjectComposer<TObject> : HitObjectComposer<TObject>
+        where TObject : HitObject
+    {
+        private readonly Bindable<TernaryState> showSpeedChanges = new Bindable<TernaryState>();
+
+        protected ScrollingHitObjectComposer(Ruleset ruleset)
+            : base(ruleset)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (DrawableRuleset is DrawableScrollingRuleset<TObject> drawableScrollingRuleset)
+            {
+                var originalVisualisationMethod = drawableScrollingRuleset.VisualisationMethod;
+
+                if (originalVisualisationMethod != ScrollVisualisationMethod.Constant)
+                {
+                    LeftToolbox.Add(new EditorToolboxGroup("playfield")
+                    {
+                        Child = new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(0, 5),
+                            Children = new[]
+                            {
+                                new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
+                            }
+                        },
+                    });
+
+                    showSpeedChanges.BindValueChanged(state =>
+                    {
+                        drawableScrollingRuleset.VisualisationMethod = state.NewValue == TernaryState.True
+                            ? originalVisualisationMethod
+                            : ScrollVisualisationMethod.Constant;
+                    }, true);
+                }
+            }
+        }
+    }
+}

From fc4069f794e91e6ea1eb4a4b28c334b12e301a85 Mon Sep 17 00:00:00 2001
From: Wleter <marcraftzastepczy@gmail.com>
Date: Fri, 1 Sep 2023 13:01:51 +0200
Subject: [PATCH 0389/2296] let SelectionBox perform flip with scale handles

---
 .../SkinEditor/SkinSelectionHandler.cs        | 14 ++++---------
 .../Edit/Compose/Components/SelectionBox.cs   | 20 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index ff53095e22..b30351f61b 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -81,18 +81,12 @@ namespace osu.Game.Overlays.SkinEditor
 
             if (adjustedRect.Width <= 0 || adjustedRect.Height <= 0)
             {
-                if (adjustedRect.Width <= 0)
-                {
-                    SelectionBox.FlipScaleHandles(Direction.Horizontal);
-                    HandleFlip(Direction.Horizontal, false);
-                }
+                Axes toFlip = Axes.None;
 
-                if (adjustedRect.Height <= 0)
-                {
-                    SelectionBox.FlipScaleHandles(Direction.Vertical);
-                    HandleFlip(Direction.Vertical, false);
-                }
+                if (adjustedRect.Width <= 0) toFlip |= Axes.X;
+                if (adjustedRect.Height <= 0) toFlip |= Axes.Y;
 
+                SelectionBox.PerformFlipFromScaleHandles(toFlip);
                 return true;
             }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index bbf9ea8c3c..0c19f6c62e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -307,7 +308,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return button;
         }
 
-        public void FlipScaleHandles(Direction direction) => dragHandles.FlipScaleHandles(direction);
+        /// <remarks>
+        /// This method should be called when a selection needs to be flipped
+        /// because of an ongoing scale handle drag that would otherwise cause width or height to go negative.
+        /// </remarks>
+        public void PerformFlipFromScaleHandles(Axes axes)
+        {
+            if (axes.HasFlagFast(Axes.X))
+            {
+                dragHandles.FlipScaleHandles(Direction.Horizontal);
+                OnFlip?.Invoke(Direction.Horizontal, false);
+            }
+
+            if (axes.HasFlagFast(Axes.Y))
+            {
+                dragHandles.FlipScaleHandles(Direction.Vertical);
+                OnFlip?.Invoke(Direction.Vertical, false);
+            }
+        }
 
         private void addScaleHandle(Anchor anchor)
         {

From 0fd445f913d44c2e89c2a291147167ac14c2735f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 1 Sep 2023 20:42:27 +0900
Subject: [PATCH 0390/2296] Adjust test to fail

---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 1bf768012e..5bc477535d 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -200,7 +200,9 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
+            assertCombo(1);
             assertTailJudgement(HitResult.Meh);
+            assertCombo(1);
         }
 
         /// <summary>
@@ -519,6 +521,9 @@ namespace osu.Game.Rulesets.Mania.Tests
         private void assertNoteJudgement(HitResult result)
             => AddAssert($"hold note judged as {result}", () => judgementResults.Single(j => j.HitObject is HoldNote).Type, () => Is.EqualTo(result));
 
+        private void assertCombo(int combo)
+            => AddAssert($"combo is {combo}", () => currentPlayer.ScoreProcessor.Combo.Value, () => Is.EqualTo(combo));
+
         private ScoreAccessibleReplayPlayer currentPlayer = null!;
 
         private void performTest(List<ReplayFrame> frames, Beatmap<ManiaHitObject>? beatmap = null)

From 5f00d3e2a44a32bac0a2a42366b84c4fa0a797a1 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 1 Sep 2023 20:54:02 +0200
Subject: [PATCH 0391/2296] style: convert to `using` declaration for less
 nesting

---
 .../Edit/Checks/CheckDelayedHitsounds.cs      | 83 +++++++++----------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index 5d12c3fea8..0040deec80 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -52,55 +52,54 @@ namespace osu.Game.Rulesets.Edit.Checks
                     if (!isHitSound(file.Filename))
                         continue;
 
-                    using (Waveform waveform = new Waveform(stream))
+                    using Waveform waveform = new Waveform(stream);
+
+                    var points = waveform.GetPoints();
+
+                    // Skip muted samples
+                    if (points.Length == 0 || points.Sum(getAverageAmplitude) <= silence_threshold)
+                        continue;
+
+                    float maxAmplitude = points.Select(getAverageAmplitude).Max();
+
+                    int consequentDelay = 0;
+                    int delay = 0;
+                    float amplitude = 0;
+
+                    while (delay + consequentDelay < points.Length)
                     {
-                        var points = waveform.GetPoints();
+                        amplitude += getAverageAmplitude(points[delay]);
 
-                        // Skip muted samples
-                        if (points.Length == 0 || points.Sum(getAverageAmplitude) <= silence_threshold)
-                            continue;
+                        // Reached peak amplitude/transient
+                        if (amplitude >= maxAmplitude)
+                            break;
 
-                        float maxAmplitude = points.Select(getAverageAmplitude).Max();
+                        amplitude *= falloff_factor;
 
-                        int consequentDelay = 0;
-                        int delay = 0;
-                        float amplitude = 0;
-
-                        while (delay + consequentDelay < points.Length)
+                        if (amplitude < silence_threshold)
                         {
-                            amplitude += getAverageAmplitude(points[delay]);
-
-                            // Reached peak amplitude/transient
-                            if (amplitude >= maxAmplitude)
-                                break;
-
-                            amplitude *= falloff_factor;
-
-                            if (amplitude < silence_threshold)
-                            {
-                                amplitude = 0;
-                                consequentDelay++;
-                            }
-
-                            delay++;
+                            amplitude = 0;
+                            consequentDelay++;
                         }
 
-                        if (consequentDelay >= delay_threshold)
-                            yield return new IssueTemplateConsequentDelay(this).Create(file.Filename, consequentDelay);
-                        else if (consequentDelay + delay >= delay_threshold)
-                        {
-                            if (consequentDelay > 0)
-                                yield return new IssueTemplateDelay(this).Create(file.Filename, consequentDelay, delay);
-                            else
-                                yield return new IssueTemplateDelayNoSilence(this).Create(file.Filename, delay);
-                        }
-                        else if (consequentDelay + delay >= delay_threshold_negligible)
-                        {
-                            if (consequentDelay > 0)
-                                yield return new IssueTemplateMinorDelay(this).Create(file.Filename, consequentDelay, delay);
-                            else
-                                yield return new IssueTemplateMinorDelayNoSilence(this).Create(file.Filename, delay);
-                        }
+                        delay++;
+                    }
+
+                    if (consequentDelay >= delay_threshold)
+                        yield return new IssueTemplateConsequentDelay(this).Create(file.Filename, consequentDelay);
+                    else if (consequentDelay + delay >= delay_threshold)
+                    {
+                        if (consequentDelay > 0)
+                            yield return new IssueTemplateDelay(this).Create(file.Filename, consequentDelay, delay);
+                        else
+                            yield return new IssueTemplateDelayNoSilence(this).Create(file.Filename, delay);
+                    }
+                    else if (consequentDelay + delay >= delay_threshold_negligible)
+                    {
+                        if (consequentDelay > 0)
+                            yield return new IssueTemplateMinorDelay(this).Create(file.Filename, consequentDelay, delay);
+                        else
+                            yield return new IssueTemplateMinorDelayNoSilence(this).Create(file.Filename, delay);
                     }
                 }
             }

From 2e2dcd99a6230aee8344fee3f45f4c33a0804d32 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 1 Sep 2023 20:56:42 +0200
Subject: [PATCH 0392/2296] fix(AudioCheckUtils): use `Path.GetExtension()`

To avoid filename escaping
---
 osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs b/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs
index 782369d72a..b8cbe63c1e 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/AudioCheckUtils.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.IO;
 using System.Linq;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
@@ -9,6 +10,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
     {
         public static readonly string[] AUDIO_EXTENSIONS = { "mp3", "ogg", "wav" };
 
-        public static bool HasAudioExtension(string filename) => AUDIO_EXTENSIONS.Any(filename.ToLowerInvariant().EndsWith);
+        public static bool HasAudioExtension(string filename) => AUDIO_EXTENSIONS.Any(Path.GetExtension(filename).ToLowerInvariant().EndsWith);
     }
 }

From a4e146ad9b8d01da1d4981ec59e87d6c7c284466 Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Fri, 1 Sep 2023 21:02:43 +0200
Subject: [PATCH 0393/2296] style: remove usage of `HIT_FLOURISH`

Unaware clueless usage
---
 osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
index 0040deec80..d6cd4f4caa 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckDelayedHitsounds.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             string sampleSet = parts[1];
 
             return HitSampleInfo.AllBanks.Contains(bank)
-                   && HitSampleInfo.AllAdditions.Concat(new[] { HitSampleInfo.HIT_NORMAL, HitSampleInfo.HIT_FLOURISH }).Any(sampleSet.StartsWith);
+                   && HitSampleInfo.AllAdditions.Append(HitSampleInfo.HIT_NORMAL).Any(sampleSet.StartsWith);
         }
 
         public class IssueTemplateConsequentDelay : IssueTemplate

From f74dfa9c6cc23c2807225b3e69be4f6ba446adac Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Sep 2023 22:55:32 +0300
Subject: [PATCH 0394/2296] Apply flashlight slider dim immediately to match
 osu!(stable)

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index efeac9a180..765af80959 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             public void OnSliderTrackingChange(ValueChangedEvent<bool> e)
             {
                 // If a slider is in a tracking state, a further dim should be applied to the (remaining) visible portion of the playfield over a brief duration.
-                this.TransformTo(nameof(FlashlightDim), e.NewValue ? 0.8f : 0.0f, 50);
+                FlashlightDim = e.NewValue ? 0.8f : 0.0f;
             }
 
             protected override bool OnMouseMove(MouseMoveEvent e)

From 920c6fa48facbd43c5edbae6ea1e66468fadc9b3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Sep 2023 23:29:51 +0300
Subject: [PATCH 0395/2296] Update comment

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index 765af80959..252d7e2762 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             public void OnSliderTrackingChange(ValueChangedEvent<bool> e)
             {
-                // If a slider is in a tracking state, a further dim should be applied to the (remaining) visible portion of the playfield over a brief duration.
+                // If a slider is in a tracking state, a further dim should be applied to the (remaining) visible portion of the playfield.
                 FlashlightDim = e.NewValue ? 0.8f : 0.0f;
             }
 

From b0398b62595bbf099ce957cafe9af3ea9769f16a Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 3 Sep 2023 02:09:01 +0300
Subject: [PATCH 0396/2296] functionality is done

---
 osu.Game/Beatmaps/BeatmapShortInfo.cs         |  29 +++
 osu.Game/Overlays/Mods/ModMapInfoContainer.cs | 171 +++++++++++++---
 osu.Game/Overlays/Mods/ModMapInfoDisplay.cs   | 185 ------------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  17 +-
 .../Overlays/Mods/VerticalAttributeDisplay.cs |  76 +++++++
 osu.Game/Screens/Select/BeatmapDetailArea.cs  |   4 -
 .../Screens/Select/Details/AdvancedStats.cs   |  33 ++--
 osu.Game/Screens/Select/SongSelect.cs         |   2 +-
 8 files changed, 287 insertions(+), 230 deletions(-)
 create mode 100644 osu.Game/Beatmaps/BeatmapShortInfo.cs
 delete mode 100644 osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
 create mode 100644 osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs

diff --git a/osu.Game/Beatmaps/BeatmapShortInfo.cs b/osu.Game/Beatmaps/BeatmapShortInfo.cs
new file mode 100644
index 0000000000..633e12d1b2
--- /dev/null
+++ b/osu.Game/Beatmaps/BeatmapShortInfo.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 System;
+
+namespace osu.Game.Beatmaps
+{
+    public class BeatmapShortInfo : IEquatable<BeatmapShortInfo>
+    {
+        public StarDifficulty StarDifficulty;
+        public float CircleSize;
+        public float DrainRate;
+        public float ApproachRate;
+        public float OverallDifficulty;
+        public double BPM;
+        public bool Equals(BeatmapShortInfo? other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return StarDifficulty.Stars == other.StarDifficulty.Stars &&
+                   CircleSize.Equals(other.CircleSize) &&
+                   DrainRate.Equals(other.DrainRate) &&
+                   ApproachRate.Equals(other.ApproachRate) &&
+                   OverallDifficulty.Equals(other.OverallDifficulty) &&
+                   BPM.Equals(other.BPM);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
index eb5291b0a8..378e6f6057 100644
--- a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
+++ b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
@@ -1,24 +1,21 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
+#nullable disable
+
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Overlays.BeatmapSet;
-using osu.Game.Resources.Localisation.Web;
-using osu.Game.Screens.Select.Details;
 using osuTK;
 using osuTK.Graphics;
 
@@ -26,33 +23,161 @@ namespace osu.Game.Overlays.Mods
 {
     public partial class ModMapInfoContainer : Container
     {
-        private ModMapInfoDisplay starRatingDisplay = null!;
+        private Container content;
+        private Container innerContent;
+
+        private Box background;
+        private Box innerBackground;
+
+        private StarRatingDisplay starRatingDisplay;
+        private BPMDisplay bpmDisplay;
+
+        private VerticalAttributeDisplay circleSizeDisplay;
+        private VerticalAttributeDisplay drainRateDisplay;
+        private VerticalAttributeDisplay approachRateDisplay;
+        private VerticalAttributeDisplay overallDifficultyDisplay;
 
         [Resolved]
-        private OsuColour colours { get; set; } = null!;
+        private OverlayColourProvider colourProvider { get; set; }
 
         [Resolved]
-        private Bindable<BeatmapInfo> adjustedInfo { get; set; } = null!;
-        private Bindable<double> starRatingValue = new Bindable<double>();
+        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; }
 
-        //public ModMapInfoContainer()
-        //{
-        //    
-        //}
+        public ModMapInfoContainer()
+        {
+            // values as ModSelectOverlay footer buttons
+            const float shear = ShearedOverlayContainer.SHEAR;
+            const float corner_radius = 7;
+            const float border_thickness = 2;
 
+            InternalChild = content = new InputBlockingContainer
+            {
+                Origin = Anchor.BottomRight,
+                Anchor = Anchor.BottomRight,
+                AutoSizeAxes = Axes.X,
+                Height = 50, // as ModSelectOverlay footer buttons
+                Shear = new Vector2(shear, 0),
+                CornerRadius = corner_radius,
+                BorderThickness = border_thickness,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new FillFlowContainer // divide inner and outer content
+                    {
+                        Origin = Anchor.BottomLeft,
+                        Anchor = Anchor.BottomLeft,
+                        AutoSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Y,
+                        Direction = FillDirection.Horizontal,
+                        Children = new Drawable[]
+                        {
+                            innerContent = new Container
+                            {
+                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Y,
+                                BorderThickness = border_thickness,
+                                CornerRadius = corner_radius,
+                                Masking = true,
+                                Children = new Drawable[]
+                                {
+                                    innerBackground = new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both
+                                    },
+                                    new FillFlowContainer // actual inner content
+                                    {
+                                        Origin = Anchor.CentreLeft,
+                                        Anchor = Anchor.CentreLeft,
+                                        AutoSizeAxes = Axes.X,
+                                        Direction = FillDirection.Horizontal,
+                                        Margin = new MarginPadding { Horizontal = 15 },
+                                        Children = new Drawable[]
+                                        {
+                                            new Container // wrap to reserve space for StarRatingDisplay
+                                            {
+                                                Width = 70, // can be up to 70px on extra high SR
+                                                Child = starRatingDisplay = new StarRatingDisplay(default, animated: true)
+                                                {
+                                                    Origin = Anchor.CentreLeft,
+                                                    Anchor = Anchor.CentreLeft,
+                                                    Shear = new Vector2(-shear, 0),
+                                                }
+                                            },
+                                            new Container // wrap to reserve space for BPM
+                                            {
+                                                Origin = Anchor.CentreLeft,
+                                                Anchor = Anchor.CentreLeft,
+                                                Width = 70,
+                                                Child = bpmDisplay = new BPMDisplay
+                                                {
+                                                    Origin = Anchor.CentreLeft,
+                                                    Anchor = Anchor.CentreLeft,
+                                                    Shear = new Vector2(-shear, 0),
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            new FillFlowContainer<VerticalAttributeDisplay> // outer content
+                            {
+                                Origin = Anchor.CentreLeft,
+                                Anchor = Anchor.CentreLeft,
+                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Y,
+                                Direction = FillDirection.Horizontal,
+                                Children = new[]
+                                {
+                                    circleSizeDisplay = new VerticalAttributeDisplay("CS"),
+                                    drainRateDisplay = new VerticalAttributeDisplay("HP"),
+                                    approachRateDisplay = new VerticalAttributeDisplay("AR"),
+                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD"),
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
         protected override void LoadComplete()
         {
-            starRatingDisplay = new ModMapInfoDisplay("Star Rating", colours.ForStarDifficulty);
-            starRatingDisplay.Current.BindTo(starRatingValue);
+            adjustedInfo.BindValueChanged(e => { UpdateValues(); }, true);
 
-            Content.Add(starRatingDisplay);
+            background.Colour = colourProvider.Background4;
+            innerBackground.Colour = colourProvider.Background3;
+            Color4 glow_colour = colourProvider.Background1;
 
-            adjustedInfo.BindValueChanged(e => { updateValues(); }, true);
+            content.BorderColour = ColourInfo.GradientVertical(background.Colour, glow_colour);
+            innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glow_colour);
         }
 
-        private void updateValues()
+        public void UpdateValues()
         {
-            starRatingValue.Value = adjustedInfo.Value.StarRating;
+            if (adjustedInfo.Value == null) return;
+
+            starRatingDisplay.Current.Value = adjustedInfo.Value.StarDifficulty;
+            bpmDisplay.Current.Value = adjustedInfo.Value.BPM;
+
+            circleSizeDisplay.Current.Value = adjustedInfo.Value.CircleSize;
+            drainRateDisplay.Current.Value = adjustedInfo.Value.DrainRate;
+            approachRateDisplay.Current.Value = adjustedInfo.Value.ApproachRate;
+            overallDifficultyDisplay.Current.Value = adjustedInfo.Value.OverallDifficulty;
+        }
+
+        private partial class BPMDisplay : RollingCounter<double>
+        {
+            protected override double RollingDuration => 500;
+
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0 BPM");
+
+            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
+            {
+                Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold)
+            };
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs b/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
deleted file mode 100644
index ca815984ce..0000000000
--- a/osu.Game/Overlays/Mods/ModMapInfoDisplay.cs
+++ /dev/null
@@ -1,185 +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.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.UserInterface;
-using osu.Framework.Localisation;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Localisation;
-using osuTK;
-
-
-namespace osu.Game.Overlays.Mods
-{
-    public partial class ModMapInfoDisplay : Container, IHasCurrentValue<double>
-    {
-        public const float HEIGHT = 42;
-        private const float transition_duration = 200;
-
-        private readonly Box contentBackground;
-        private readonly Box labelBackground;
-        private readonly FillFlowContainer content;
-
-        //public Bindable<double> Current
-        //{
-        //    get => current.Current;
-        //    set => current.Current = value;
-        //}
-        //private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
-
-        public Bindable<double> Current { get; set; } = new BindableWithCurrent<double>();
-
-        //[Resolved]
-        //private OsuColour colours { get; set; } = null!;
-
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
-
-        protected Func<double, osuTK.Graphics.Color4> GetColor;
-
-        /// <summary>
-        /// Text to display in the left area of the display.
-        /// </summary>
-        protected LocalisableString Label;
-
-        protected virtual float ValueAreaWidth => 56;
-
-        protected virtual string CounterFormat => @"0.00";
-
-        protected override Container<Drawable> Content => content;
-
-        protected readonly RollingCounter<double> Counter;
-
-        public ModMapInfoDisplay(LocalisableString label, Func<double, osuTK.Graphics.Color4> colorFunc)
-        {
-            Label = label;
-            GetColor = colorFunc;
-            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 = ValueAreaWidth + ModSelectPanel.CORNER_RADIUS
-                    },
-                    new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Y,
-                        AutoSizeAxes = Axes.X,
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, ValueAreaWidth)
-                        },
-                        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 FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Direction = FillDirection.Horizontal,
-                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    Spacing = new Vector2(2, 0),
-                                    Child = Counter = new EffectCounter(CounterFormat)
-                                    {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        Current = { BindTarget = Current }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            labelBackground.Colour = colourProvider.Background4;
-        }
-
-        protected override void LoadComplete()
-        {
-            Current.BindValueChanged(e =>
-            {
-                //var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
-                setColours(e.NewValue);
-            }, true);
-        }
-
-        /// <summary>
-        /// Fades colours of text and its background according to displayed value.
-        /// </summary>
-        /// <param name="value">value</param>
-        private void setColours(double value)
-        {
-            contentBackground.FadeColour(GetColor(value), transition_duration, Easing.OutQuint);
-        }
-
-        private partial 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)
-            };
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a178f2e9dc..426c424541 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -222,13 +222,18 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
-            aboveColumnsContent.Add(mapInfoContainer = new ModMapInfoContainer
+            FooterContent.Add(mapInfoContainer = new ModMapInfoContainer
             {
-                Anchor = Anchor.TopLeft,
-                Origin = Anchor.TopLeft
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
+                Padding = new MarginPadding
+                {
+                    Vertical = PADDING,
+                    Horizontal = 70
+                },
             });
 
-            FooterContent.Child = footerButtonFlow = new FillFlowContainer<ShearedButton>
+            FooterContent.Add(footerButtonFlow = new FillFlowContainer<ShearedButton>
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
@@ -248,7 +253,7 @@ namespace osu.Game.Overlays.Mods
                     DarkerColour = colours.Pink2,
                     LighterColour = colours.Pink1
                 })
-            };
+            });
 
             globalAvailableMods.BindTo(game.AvailableMods);
         }
@@ -413,7 +418,7 @@ namespace osu.Game.Overlays.Mods
             if (mapInfoContainer == null)
                 return;
 
-            //mapInfoDisplay.Current.Value = 5;
+            mapInfoContainer.UpdateValues();
         }
 
         private void updateCustomisation()
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
new file mode 100644
index 0000000000..2ad420657c
--- /dev/null
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -0,0 +1,76 @@
+// 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.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+
+namespace osu.Game.Overlays.Mods
+{
+    public partial class VerticalAttributeDisplay : Container, IHasCurrentValue<double>
+    {
+        public Bindable<double> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+        private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
+
+        /// <summary>
+        /// Text to display in the top area of the display.
+        /// </summary>
+        public LocalisableString Label { get; protected set; }
+
+        public VerticalAttributeDisplay(LocalisableString label)
+        {
+            Label = label;
+            AutoSizeAxes = Axes.X;
+            Origin = Anchor = Anchor.CentreLeft;
+            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0);
+            InternalChild = new FillFlowContainer
+            {
+                Origin = Anchor.CentreLeft,
+                Anchor = Anchor.CentreLeft,
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Text = Label,
+                        Margin = new MarginPadding { Horizontal = 15 }, // to reserve space for 0.XX value
+                        Font = OsuFont.Default.With(size: 20, weight: FontWeight.Bold)
+                    },
+                    new EffectCounter()
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Current = { BindTarget = Current }
+                    }
+                }
+            };
+        }
+
+        private partial class EffectCounter : RollingCounter<double>
+        {
+            protected override double RollingDuration => 500;
+
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.##");
+
+            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
+            {
+                Font = OsuFont.Default.With(size: 18, weight: FontWeight.SemiBold)
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs
index d43831e576..595b86924b 100644
--- a/osu.Game/Screens/Select/BeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using System;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -31,9 +30,6 @@ namespace osu.Game.Screens.Select
 
         public readonly BeatmapDetails Details;
 
-        //[Cached]
-        //public Bindable<BeatmapInfo> AdjustedInfo { get; private set; } = new Bindable<BeatmapInfo>();
-
         protected Bindable<BeatmapDetailAreaTabItem> CurrentTab => tabControl.Current;
 
         protected Bindable<bool> CurrentModsFilter => tabControl.CurrentModsFilter;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 8f609888df..31fac8b4a0 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -46,10 +46,8 @@ namespace osu.Game.Screens.Select.Details
 
         private IBeatmapInfo beatmapInfo;
 
-#nullable enable
-        [Resolved]
-        private Bindable<BeatmapInfo>? adjustedInfo { get; set; } = null;
-#nullable disable
+        [Resolved(canBeNull: true)]
+        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; } = null;
 
         public IBeatmapInfo BeatmapInfo
         {
@@ -104,19 +102,30 @@ namespace osu.Game.Screens.Select.Details
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedStatisticsUpdate;
 
+        private StarDifficulty latestStarDifficulty = new StarDifficulty();
         private void updateBindedInfo()
         {
             if (adjustedInfo == null) return;
 
-            BeatmapInfo adjusted = (BeatmapInfo)beatmapInfo;
-            adjusted.Difficulty.CircleSize = FirstValue.Value.adjustedValue ?? 0;
-            adjusted.Difficulty.DrainRate = HpDrain.Value.adjustedValue ?? 0;
-            adjusted.Difficulty.ApproachRate = ApproachRate.Value.adjustedValue ?? 5;
-            adjusted.Difficulty.OverallDifficulty = Accuracy.Value.adjustedValue ?? 0;
-            adjusted.StarRating = starDifficulty.Value.adjustedValue ?? 0;
+            // sadly need to calculate this to prevent additional data transportation
+            double rate = 1;
+            foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                rate = mod.ApplyToRate(0, rate);
+
+            double bpm = 0;
+            if (beatmapInfo != null) bpm = beatmapInfo.BPM * rate;
+
+            BeatmapShortInfo adjusted = new BeatmapShortInfo()
+            {
+                CircleSize = FirstValue.Value.adjustedValue ?? FirstValue.Value.baseValue,
+                DrainRate = HpDrain.Value.adjustedValue ?? HpDrain.Value.baseValue,
+                ApproachRate = ApproachRate.Value.adjustedValue ?? ApproachRate.Value.baseValue,
+                OverallDifficulty = Accuracy.Value.adjustedValue ?? Accuracy.Value.baseValue,
+                BPM = bpm,
+                StarDifficulty = latestStarDifficulty
+            };
 
             adjustedInfo.Value = adjusted;
-            adjustedInfo.TriggerChange();
         }
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
@@ -165,6 +174,7 @@ namespace osu.Game.Screens.Select.Details
             Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty);
             ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
 
+            updateBindedInfo(); // to faster UI response (without SR calculation)
             updateStarDifficulty();
 
         }
@@ -199,6 +209,7 @@ namespace osu.Game.Screens.Select.Details
                     return;
 
                 starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
+                latestStarDifficulty = moddedDifficulty ?? default;
                 updateBindedInfo();
 
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4567869e8e..ad98d1721b 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Select
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
 
         [Cached]
-        private Bindable<BeatmapInfo> adjustedInfo { get; set; } = new Bindable<BeatmapInfo>();
+        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; } = new Bindable<BeatmapShortInfo>();
 
         protected BeatmapCarousel Carousel { get; private set; } = null!;
 

From 0779cd8f4f998c2d9b29fd71787681875bec9979 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 3 Sep 2023 02:17:04 +0300
Subject: [PATCH 0397/2296] minor design fixes

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 59 ++++++++++++----------
 osu.Game/Screens/Select/SongSelect.cs      |  4 --
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 426c424541..8de4447b31 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -222,41 +222,44 @@ namespace osu.Game.Overlays.Mods
                 });
             }
 
-            FooterContent.Add(mapInfoContainer = new ModMapInfoContainer
+            FooterContent.Children = new Drawable[]
             {
-                Anchor = Anchor.BottomRight,
-                Origin = Anchor.BottomRight,
-                Padding = new MarginPadding
+                mapInfoContainer = new ModMapInfoContainer
                 {
-                    Vertical = PADDING,
-                    Horizontal = 70
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    Padding = new MarginPadding
+                    {
+                        Vertical = PADDING,
+                        Horizontal = 70
+                    }
                 },
-            });
-
-            FooterContent.Add(footerButtonFlow = new FillFlowContainer<ShearedButton>
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Horizontal,
-                Anchor = Anchor.BottomLeft,
-                Origin = Anchor.BottomLeft,
-                Padding = new MarginPadding
+                footerButtonFlow = new FillFlowContainer<ShearedButton>
                 {
-                    Vertical = PADDING,
-                    Horizontal = 70
-                },
-                Spacing = new Vector2(10),
-                ChildrenEnumerable = CreateFooterButtons().Prepend(BackButton = new ShearedButton(BUTTON_WIDTH)
-                {
-                    Text = CommonStrings.Back,
-                    Action = Hide,
-                    DarkerColour = colours.Pink2,
-                    LighterColour = colours.Pink1
-                })
-            });
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Horizontal,
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Padding = new MarginPadding
+                    {
+                        Vertical = PADDING,
+                        Horizontal = 70
+                    },
+                    Spacing = new Vector2(10),
+                    ChildrenEnumerable = CreateFooterButtons().Prepend(BackButton = new ShearedButton(BUTTON_WIDTH)
+                    {
+                        Text = CommonStrings.Back,
+                        Action = Hide,
+                        DarkerColour = colours.Pink2,
+                        LighterColour = colours.Pink1
+                    })
+                }
+            };
 
             globalAvailableMods.BindTo(game.AvailableMods);
         }
+
         public override void Hide()
         {
             base.Hide();
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ad98d1721b..7749e3937a 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -308,9 +308,6 @@ namespace osu.Game.Screens.Select
             // therein it will be registered at the `OsuGame` level to properly function as a blocking overlay.
             LoadComponent(ModSelect = CreateModSelectOverlay());
 
-            //var bindedStats = BeatmapDetails.Details.GetBindedAdjustedMapStats();
-            //ModSelect.SetBindedMapStats(bindedStats);
-
             if (Footer != null)
             {
                 foreach (var (button, overlay) in CreateFooterButtons())
@@ -586,7 +583,6 @@ namespace osu.Game.Screens.Select
             FilterControl.Activate();
 
             ModSelect.SelectedMods.BindTo(selectedMods);
-            //BeatmapDetails.AdjustedInfo.BindTo(adjustedInfo);
 
             beginLooping();
         }

From 5e5fe84a88d15af428ee6bff7ecd3e46b26bbf65 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 3 Sep 2023 02:19:02 +0300
Subject: [PATCH 0398/2296] Update AdvancedStats.cs

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 31fac8b4a0..a12323ab70 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -176,7 +176,6 @@ namespace osu.Game.Screens.Select.Details
 
             updateBindedInfo(); // to faster UI response (without SR calculation)
             updateStarDifficulty();
-
         }
 
         private CancellationTokenSource starDifficultyCancellationSource;

From 2c81fe5613e79e2e9370f19d40a1839e28a20c45 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 2 Sep 2023 01:29:57 +0300
Subject: [PATCH 0399/2296] Make gameplay skin elements in `special-skin`
 awfully large

---
 .../special-skin/fruit-apple-overlay.png      | Bin 4677 -> 26684 bytes
 .../Resources/special-skin/fruit-apple.png    | Bin 4677 -> 26685 bytes
 .../special-skin/fruit-bananas-overlay.png    | Bin 4949 -> 23898 bytes
 .../Resources/special-skin/fruit-bananas.png  | Bin 4949 -> 23899 bytes
 .../special-skin/fruit-drop-overlay.png       | Bin 4677 -> 26684 bytes
 .../Resources/special-skin/fruit-drop.png     | Bin 4677 -> 26684 bytes
 .../special-skin/fruit-grapes-overlay.png     | Bin 4677 -> 26684 bytes
 .../Resources/special-skin/fruit-grapes.png   | Bin 4633 -> 26684 bytes
 .../special-skin/fruit-orange-overlay.png     | Bin 4633 -> 26685 bytes
 .../Resources/special-skin/fruit-orange.png   | Bin 4633 -> 26685 bytes
 .../special-skin/fruit-pear-overlay.png       | Bin 4633 -> 26685 bytes
 .../Resources/special-skin/fruit-pear.png     | Bin 4633 -> 26686 bytes
 .../Resources/special-skin/hitcircle@2x.png   | Bin 245645 -> 295339 bytes
 .../special-skin/hitcircleoverlay-0@2x.png    | Bin 26595 -> 87032 bytes
 .../special-skin/hitcircleoverlay-1@2x.png    | Bin 40858 -> 119975 bytes
 .../Resources/old-skin/taiko-roll-end.png     | Bin 0 -> 2095 bytes
 .../Resources/old-skin/taiko-roll-middle.png  | Bin 0 -> 140 bytes
 .../special-skin/taiko-drum-inner.png         | Bin 0 -> 1926 bytes
 .../special-skin/taiko-drum-outer.png         | Bin 0 -> 3749 bytes
 .../Resources/special-skin/taiko-roll-end.png | Bin 0 -> 14570 bytes
 .../special-skin/taiko-roll-middle.png        | Bin 0 -> 4791 bytes
 ...ikobigcircle@2x.png => taikobigcircle.png} | Bin
 .../special-skin/taikobigcircleoverlay.png    | Bin 0 -> 66280 bytes
 .../Resources/special-skin/taikohitcircle.png | Bin 0 -> 12374 bytes
 .../special-skin/taikohitcircleoverlay.png    | Bin 0 -> 66281 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png
 rename osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/{taikobigcircle@2x.png => taikobigcircle.png} (100%)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png
index fe567d158d0b47f06c39eca9d055b9c8361b040a..c6e27996b92328a0c6fbcf3fb9f4f6b6598bbdfb 100755
GIT binary patch
literal 26684
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

literal 4677
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
Hu0mjfgVw2;

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png
index 17f3be9c262953cac52da794d601bb853d8dc276..6a862572faca191c265bd1bdd76283c08fdab790 100755
GIT binary patch
literal 26685
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
B13Lf!

literal 4677
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
Hu0mjf9r&r4

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png
index 2c94ea78bfdba901614472a3215401d7b0a2dd71..9d1d6d1177b9e36bcef557251ba3914fa5acbae2 100755
GIT binary patch
literal 23898
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

literal 4949
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
TP9|;Z00000NkvXXu0mjfQL*|-

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png
index 2c94ea78bfdba901614472a3215401d7b0a2dd71..88bc33b592a04625c97fafdea8040090e64d5cfc 100755
GIT binary patch
literal 23899
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

literal 4949
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
TP9|;Z00000NkvXXu0mjfQL*|-

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png
index 56bf4a92fb295a63fb88ac81e8ffe76e83710444..8fec652ed51a5cf6085cac0b208d3efba4112b2b 100755
GIT binary patch
literal 26684
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
A!2kdN

literal 4677
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
Hu0mjfi%6-N

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png
index f259684055ad3ce25b2c3cdb5c3a53062b60a8e9..b3d7e39dcdec42cc39c96f004690d7f6a7337be3 100755
GIT binary patch
literal 26684
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

literal 4677
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
Hu0mjfQGBVH

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png
index 17f3be9c262953cac52da794d601bb853d8dc276..2529b5cd1928637c69a512b292d5533fee42a48c 100755
GIT binary patch
literal 26684
zcmeFZWl&_zvM$`XyE`=Q+PJ&Bd*kjpxVyW%yTc%Z4LZ2npaTqpGlL8aT;6x@v(G;9
z-9IPdyZ`oz=;&HinNMaul~rr4j$9q1sw{(oNQejk08r#)CDj1{i1#K003Q1N>)y}w
z0sx@@{XtXLLmli*?&9WbW$R!`?&0fVNp9(5YXt!KY&PWEdXaRchQFEPI3r|7eKQrT
z@}8f*VpWyWZ?!S-cS50(GFp}ThE9+oo4)b(EHeIbBJ$?Son>Rj0P4zT{$v(6<2_J)
z|Fm)?V}1DN@n*W8Ea>;Z)63!=-!-4$o7&y82HCE+h|$=`S)K1uNGngT<Bv}w`u@Vt
zzpIe?ow3`2b9g`cRsC48U+%~*`$dDCrjNC!le*aM?|cKcZ312i1K__IKi>g^UcH%g
zov8;1`gVt4rpM90!a)B)q45~7d7z9tC_A+Ob9SY$W1ie}{`0A>rL?SKjMe0)!Pno9
zQ!g6^3!hjKf;ik>UtYdFBq*5pean4~@=pB4sTlY>FmWJobU|fxZP#5}=%KJDj+C=<
z_DU&0U&-Y9<B-8=Lmk+51NW7NMeXux>`Go!rLXh6J#2RgbmF?^y1=})<N6#}=+ruT
z+I17b+E*mJ?Yye$e|PtR^{h)^U~dJ7LAh}4g8gx>qx-pYM%jJ0;dXZVM*XTg`%q@!
z&zAoK+^iY{ul0|r2HmU&4({pXlb<PB`xxHFWtH}ONxMO>)SqAlvn?zuWJj70dq!n1
z(Wv0p7DDi7ghjp|OnqPtj`8_1YGybH<uem;)Y|s>`G7dGp0~QqgRGRyXRzW3FYYIM
zc)WA%n!z3A=bfzIM^Bym&%p$RvJ_FF&JzOpIOf1W`T9{+6^hU4>dMqB%j$C!<N0p0
z)JWKV2;>%W)LH6wwiRot=1QP7b$iDSo?Xb|9DS#Xl~w(#KI@aIf}+d5;)i`1d{-*Y
zTe`AD?%!1YR{6HadR7IF_uq7M_r|B{>OXFtZ8?hDju&`+wOrfr5((c#I37(?7XG%p
zr2O`C^T(=5V9<#D<*(dNg^NhjRcnt<^ki8sp=ne_`)tmoBZpEf<i-8|R&{X;)9$x9
zj)Nw$g;F$64t&1IXk!=t{Ffu%V<My(C$Aa1iZLQjGjCmmoNhZjLJxJj1Gk&%1i5SG
zD!5bC+{pniZ;d-^jb;zi))H3Xe1P%;{t{3#^{3DzQ}j!@xV*%$$Bh8TBq6I=*Q3ry
zvosR(lVoYgB(s*r3f+S7QPJ&06#pio<vibpk2P*oK&{krL))?R9;k7m&xdfZJ0*?0
zitr;a;EueR@k6`avM+3jMwVmqbGi+D+uv@RkxowLb*IjI#{~T*eIt~3@dv(PvOF}J
z!8O%=<ev*Je{8-O-SAA<QI_jhy6(pGn5kNKP%N1nEA6h4Bu2?bp-Z~+x?TFk*3%Kw
zv3>dSV_DtI#H(q>&9%<tYsN<hXXfV=#!SXQLY*m>x?uuC;|^&Yic$xAu+LP5xxi^|
zzzA2ErDx_w**HWF&XMUF0jDL@?K4NIN;<`GqyZ(Z8<ulUgpITH2V}2Ba#-)-4fAp~
zMB#k_Mn&SZ3nr^8t`A!azl}E=B_UcaMpVPmm9|Lpl$CtJ;CwDb<B9EcLEW~!?T=Lt
z_0fd#mUY|QWFy<YN6#vX+6*NU*P8K%0qryN>vq74!r{Pvlo>fE$Fy0y$8e@`SU-b$
zo(CGWOqcSbukv4Sl1(YQu^f}&2D7alrQl$X3MpNzabeHQEkbiGam7Jf*+#_o@rV7Z
zPJZMiR)eo7khl|?BFB8;(_X%5yHSQ)4@ArvIKzLY9%|=63DPkqjG>6qDT^^L*NF$=
z`WyYYCIf36zh%}R49Il+8h^P~_>p{l?#DFQv3KMRQQVNR^>vhmuA9q{h1miU7{VA|
z55qgD57j#8p@F~Sz?o*<A!Uc;CuI{AD!bG5C{CN6EAhUryv&aq0Y-)9?h_+?)hEe5
zji1pEf$%!x>bkgy_crAkKzW?NPt5OQh&W8{#WHpZ1Lw1Rre)Jv4UjN>JmDRKAB3DX
zS`1yNbRpP+nI+ZhCJI#GRTh1anq<Wv9&aPrata{kQ9y)FQ2uUK5ig;i)6XYinkhqs
zS9L=*7k4mL_N?tmMRQ-z4>y|;HR+)3sYdwI=OOzZLJfDAhL<yQpa@)=$-VYJKd*DA
zWAq=xM5dIDGSWd1w|>#sMo1Ppm5Ora#kF$*$8pSBg*a}lW@yQ+6yNK**Oa?a2{2ST
zEwjm!r1%%`$7K2PvoL*jdDavH78fyBPgbbO*iXx;rkQ@imJfkxQQF32*A$Q!cQqIr
z0z}~`_l=PN8j+$&U036O+<OSO!e?5<lo%4xNjdiG!3Scf@dikmMis}z_@ize$u=K~
zXU!qw6QRL<!X6F2LH}~AVX172Ci<C_&wP0!sh}7kGDekUqMjh`oF!q+e1i?a?(@TS
z2;mlO4MSwtBT|g+A6yQu^`@ekxn1&pH>ZYh;l)B2mrz;L<xb+D5(K6B`D8;`TEw(i
z134%C_2}e~y~^OxLC2IYnl%WJAzV~2@nZAKZqVj6qInKPhT50psr+AHf;vA`&{awc
zpW{YAG{3>nmLFYxdys}2V^74y*~9mB6%t|m0?U#L8M1gX7!AvbOw87!PJg7evF@g^
z2rthhNZ4*GArgFlS|Z^;ohAsRGqm<lk$ue0rNH?$QvB;nHWVIOZ933VGC0ura%LZ~
z1mRO}qqH1K9}O#<dr9kKKr4hOCbh*7X`}Mj7uF}{N~P_F0nK)&7S?Fo(PxA6Nt7T3
zGJ+;`oBZx{Vr_)bfVe0-0liyXv|{+E!8hld`L%DjXl(YKW#QK>JZyPq^#(9LL-sxt
z(p39P*t&`cG<ID??y=~}xC7IAh6y?#(L{X?E8%fjaU|N{rZ$}z-L5nmDvX{Z!#Nxm
zeUd9IODu0?M1`;2W3B$^+1+kE`dHd0r9S|97%tG`bEWg7#BC48HgfPz`f-+ihzGXw
z0C8=P5~*Mb95P4{G6Ax^9E`Fnd3aWhk~qd2W)QE-{Z~|C?Tuc-m7xnv5;{uLc3%^}
z45!2|b4Hoa(?tHkb;Hgz!`pxx__s*(v|poZmQ4P1q`ZR}SR0Co;X9o14I?;_CMh5>
zJo@eW!=vGu1{~#CKW1STIzLP}`o@AmMjjq<2>LW+#pmR9S-5Up$xkWp-^$_pAUD~H
zHCzNN2?d!Cgf)Zw_?f&N*MAi0UHl2nyFJjv>DC9$CX?JO5cR0QLw-i2iAinjZZGDU
z2*B0}d$e*L$Jl^|#9=$2%|>9#&TtiZNn^x$jL2ncgV(RNtin)c8~Df)bkHdle~8N_
zE{XQX7=<aqayUqTy$x~~`lHNTa+IS6@4RJaBf^A|8hJCN8j${LHczgR!gzeJl>>f{
zo|%<b$LM14g``C+KRWlA82H3VXhQwQATkZrKvNtFXSA7N&_%5^ShOg7Nn0m)z!_f?
zVrIcp%~K$C0_L(p0f(=vF3%hGsNB&#27##{HQm^Fcy1UmGQcP1%)YxXoGYSjHm9?p
zie(%n9P-DkAp@a<7-r#^*$?9hzEos}5f~!>ROEys>#%&YuhO~0DtO+({4u-){s)JJ
zeqe{}NL{9(iLMKJimO>m>*D~LHF85WmEaFb@`x<Dg$5mQHqa-&0>C^~RP?Jf7zS0;
z@2Zd_KIJq$7C4`t%IzyPE(<=YdETXU$ijyKTpT29g^?m#inRgy*o?Ey+ELny%QELn
zlSO@z=s1B)A;`%;!)l})9A?x_k1LQ$z#kTGOOVQ8BEFR%t*zdv<6aftcb$Fiuud!W
znSjCBq!PzA4lz~;o<qk`VDM9`5N)0zYy9RX5o<-B3azxaLt2*gxv55&+5vi&U()zD
zFsZs#+w-Fe{L-KS-%zJ%Z;$Za$S3sPAJDh0DC<ai&^P2uU`mYI%-mK&UzAr(Q>YDI
z$&$*;HdsTg=irqga<v1y`<`#6kpPzu!g)!o4yCbc3etONg<F6T@?v94q6^l8FDvk)
zH=5_Az~Cf=RZYfRTwk5=Ox>147C~}|@dD-i3yvD7586MmR3~*(wD|EqyOc455l<C;
z-C#4rX&I^cgW=PQEfJi%scN7!6BW;(8r5>3`CuWgL8OqCD<%&3Ne-Js9`rj#658W>
zhDhIIM1EpCR#|11KvP}y^h9Q%8*3^s2zst!peuiK2Wew3;P#Oclg5tnaeJc%nA{9v
zHe>qhA|0qx)Bxv{^M?~Zvx39YP2pohf-D4SKrr{iY4uoPcvZi(A$TY*7@LT{X&WN_
zrp<=#nJhmTjWkt<uAK`Je81$aQ)a@dCbJ}dz(!@*L06VpURKgFj9n0A-rEXon;%Pd
zawCQ0XdI$ShsCX1xU8L4vWRvDG*dK(xTo^&e?{$qA*B_m@Tp=cErWlM^ug+BZlJG@
zR6H%rjiQjpt5>=>NetHa&_LuNVJSdIEKc#IWr0b+9(<l+Hnr8w(Kv~_?noDA>7-P1
zO1+22-r0T3ht~;Lpd8QqMb5Ec8!5^~4<p_u1#Iy_@(>d>MYDjD)mz4Qu@_g=?`D7>
z_`u}<>$f$euvJRgo*Cn*tX$Oqoxf&@6!g$}@lM${jyitenwS};4dq_s8QheM(07=!
zz}cI&@KgV;u8!tC+j>}$I^5e$$a4hMENt7tYkpbjRJ1lipA8l~#W;vkdutm!)Jgty
z>Xm*Crb(<R*OKhoqKuR}M^jP?RE$tjb=LS)=s#a8D?uk8jU=XH;XI44tMt)!pp5qr
zEi)<utKMWK+Uc3<cRFE+)9P<fsw-AgqlEQLeO73&(1FcjWWCK<T*ws?`XSO2R5nnc
z;Y<RKPIUaPOzE<1O7&!OI=eGW)x3N_VDKB9c7wdV=Pn&7b8=rT)zD{=d2AY*=v`Pq
zeKLbQEIbq$AS)y&oLQVhlMS7(Hqr6B@}L?f2$j!h<#Y-HcO@Ay4l>7?78+ZN2XGt(
zKehwm63mm3O*?x{2WIewcue~UU!5qC0{4EqCIyQ{nv$srs>)P4an?LhDUIWg)86jK
zvTgSC2N!KokzU&)76F??nWCO-tRhYFa$G%aV5%i+)esSD!|f^at5<`e`ij1VDg_(D
z*$G@`x%-PMNSp+8A~<oB_d2n%*UeBSeo9=Y#1=?f*Fy^JU6aH1#NR@6BsX3V!+KQj
z)#CS0R9*<T<z0rJ)bU!mgu+3%{4Rx4bL$2py*FmcGDfY{(TmaJyoIc#<#g4uETgIF
z-H)pX{o5}jQpoWpyr9f#KR3b=g;=gX9Wh>~#t>0{IGnUltq>+SD%>>?&m~U^diw6Q
zORoIEIr3+=-D*b2Yy5a!Q`~8A7&jz(b=l87WHwlo)I-rBt~21Mj$hESkv{~Az!=)P
zZ#adzOR{UKT-;AWNOh4m{mxA}0}EfH)2r+<eOA|E4lvNC?~7nD2pfq7{3m24RS}ab
zSvlL!kQ~*6#0dX$S1>9h&QaWO64HkJq_plZape$p!&M{f3`pvw#JO@d<o1#M^XF%|
z{<oM2{~_tXhc?1_bgBc^foj<bf#b462FP-yJviJLf?5($%1L+A3lOC1Wkfd?C$&A|
z0nM@-2F9eSV<?dw8UXUT+H1LYB?7O*v05C*E!cy)k2V{B0yQ0*A#J??snY;wIPyy~
z7Uj;pI+M4M8EDx~aR+{^tkV)kr}}8PF>hBhboSsE=|>2j1gFxnS$-)94m7V|me4QY
zaVG?AjSgF=f_RwK3-Gv$x&USMj9s$b9<7UMwRv=EbJu-g*Xm{AZ*e<2xNCaWENIXL
zTy5X-R?8|%^;DO}yo~gAtymr&IO1fIp#n;+N0mjDXLtezl##-4W<N+ffgQSE&7T~?
z_ahOu!z34%C=?loC9fcgayBp-qm@Ql?G1@(kPk3Q^T#g4E?6411*HShvJX_uM?9C1
zRH^$|N`DU^w)+K1j6kk>D-7i#%86|{R&mKbJfu-5J1f+#k{-}6;38ackOEZ_%u+I}
zSIlbc`E4=+FRRdy?GC1rhk%8}NW6+PRR`QGOJDw_mPon&UVNChoXRk6^m2)$o!m7%
z*A8F1v;@!^8#_NL#grRzEgke|4HbQ`gqEJzi&TE0s*2@y#Gq%(02@ECT<=J2Cv!j(
z?9ySfLPZ%9v4tM0^@__qlhysi=wQY#zPEvr+!4twd(C;qSDH-xVpAKp0XC@i0EA^2
zODj{=NoWj9vP2=(0u_x(v=`kAs~ovw8S4jh%LX>6Q4rU+czPR(ws^3Zfz~lwKyF{9
zqN6aBQ@&x`(6VH>;TVTGqgyClZu%e8i{UlRMU{}umvSy{dVNfr>v;fd^J|*8Tg3e0
z2u@W-S2$NDT@cXSC^(iFIp$pH8bVV2bsF`8tY}80f3I$i(VRjTbhWql)d=2{u(s5*
z-l9&*yf%^N26K{mRSJ3A%d;!Fgh?Dlsx(wyx+FA;%CEi5XJn?&ab)vAQ-fp=Mv6)M
za7tL#v7&%kP(GH3D7FkE@l;R}0Pl0QQv)GcqU1tx6rk?sBYxhKtrT?@9*i$ZHO%gF
zEA%ZGK(dKK(>#fyt=M<skTAN;v&po*QCF!NGbK84H5m5!$W?>wfDKUrTQZd<{BpPl
zrQf5gza`rX5ngK#Jm&(^!X6L*Wh-EduSJ`nRIHRr$o*0$F<*a9ArMltk<>q}29@3p
zka68mU(kM&OlGRIB7Tq&2HDtrww5tCigx&l!$clL%Vn#lITnmVeoS$G3Wfjs=O8K|
zzVA!AP1#s|!KMpAdb5CV8&^}<u?*~9Rvcp}G=d)rU;Ou*Y=J&yc|!s*Q36$B{zWDV
zqo_{1Y8KOwkstM1e`K7C{xEf+rPJEvIl^zFk&pG;GLi-5)q7RwGCt{I#WL9DsS)Wz
z*BVHG^1aoXl6xsPy0O^gR6pH+N%wTr#*Q&>omB%>t@z_r__1yy`Z=fMp7;c{*Rh4m
znn8^3GWViRkAjOabrvIo_s8W`lXxwDB_-o&25ACP36=JT0P%EosCjmDP+|bURZ0S6
z5CgHH&#I*z+!zsIO;c&};FoO2O93*RYY&|y>=`DTKY5beyE89MA{wnNd5;u4vMgIT
zcOYoQmZ9+$R9Bf|wK1+$Ho4|};J3KwDj!_xO;Sv_NC7W(IOFm_as{ekz-|2nLw5`e
z=_RaEbh<ckhE>EhB(j!=?Y7c@TIJBF!E^rsKw)#W?5oc&Dxt*`d{TSgOjxM~)oLYv
zwSvB}8=CmWqrwME2i0EXjC|bWqRnJ)YOD@d8!n2HU+uo$R&c9^E16ZDu5vV~@D)w$
z1R$f*g<2gXGPS(Y(oTB25=`ZbZeJm#PK<Hv%XY!|Y4OEK)#k6oI7DhyKXrFlGt2fM
zO3^-J>Uheo3l`1Tj&|RRzDTr%qs%jDr!0?2lQ7>5w6#~w7}TXdGj)GM%)R<96sv-J
zATK1ljxH$thu_fj)%9a=Z16xYN`QFbCPWGBvv%Yyge_f8<BSL=a5^P+jH!YKWXg3}
z@<pnu#u34mn5lv?4uNIQR7*=nC4Rkik1|=r1bL;o@B$Tv#2yvsieV?0r^!2@PRSmz
z_*}hkwxVYzpg~9&*||suoEjkVe5qNU9~6A~B#U|XEFv0guFB-rD$v-FsY@L6pl=#M
z@%viNv)MFuU2Lqk!mSN6^XqnGI5~c)st`d*5&}p`MyXAy;h+uFV<sjW8&%{YuSIEA
z%nYQf_xXl=p2$QsdX9NsbZ#WIws(?gCS0R96AyVYvkq&Mk=Q?fVAoI*A2oh5Nt#D5
ze8l0<i$NT*h~qa2K~PHy6TDgy6CVD-K@yTc*+_WvN&GFvdGYDg)Cr8^2(#klwJ<BD
zjYmRC=LUmEvzI)4a0t$+dY1m9K|n)PlbmtBdc45rig9YYb^`P1g$KSEFS_{gO<e3_
z5UtdXTvY14VsCYZAF9;b?=1cWTnO7Vev@R1{<DCDjt8wd`=6;v&u?{G3dbXWAj=Z_
z;9cF$ry%zElZZx$*ZpIslPfX@izbFZgZxih``dcG>v64qlyjnkOWV$;D8s~@LM2(i
zO#^>S0tg=TQ2<s*5LoHdax<MEVZNH^M9EOhsETVCO)0*HFw(5g43Zj#&Jq4~hS!26
z_GOaSN3>#*{t&qi2D!4Apekis<D8Qki>1@I*iL9Y6VzBkzzfa`tBWo*_{CbyEsdqy
zZ$plKkN_Vp)q~XBtn~mm_h61}BToe|Db`D01eUq#E(Gt$Ur=eZ-+WvttH^vqddu4l
z*oShQr$Y%dw5f9)({FkxZi9`fX25~AxQ5*#x&}rjsz%XzgPy>K4PoVMLI@^B4g%Lf
zC}yQM>U1!s_F<*pPcD8IWULrTsT2{F51u*N2;rdgl|_o+Fn1Y@I!h5@WMU@t<6Lz1
zDHnEytuf}e%UsBr|193Y?VzQVRRH0U6^D-$f$!yd4M4-7nSwce9l-Nf=(h2K$J2n|
zPUMSKH5``td(@F@J}<Q@jvh(TmnLY(we9E`m##{TZgr}tuCg;x348I3pBs9NVjn3P
z;7%@U59Z5rL2k`OtBu@fve-Z@f~dxYb%J=@dr7K~F3;{~zip?4?IHP8OLQtux8#6!
zOB=)HzDOFY3v45mH1_MOV&b9q_8e4Y_Mh;1$<JQo2_qz=oH0J7yGSo(Cw~Azh+AqR
z>uO0xbd{DQ5p+B2_AkK$;x^Cb9B*b;CrR)q_6heEc`>~t1%_ZxQY#~R3`TQSzMhjm
zU0G0`=dp6|_DCIpY`gZAM2GJQ(NOICx>J6UqIlYH39)}pvHU1-_K3$h^me`Ra*R~c
zDf6h|E-hklaRJ;cCtGFFZO=|ArP3$GRls6PQLp6_uks4`iV^3Bfw&C)5M3;1RI-c9
zBfTm~uWE578YjBMM(fF2=ZMK3PCcx$*bdD?H&_gt6RN-C7UC?)#G>n4=LhXL%bfzG
zE}d}i2d7#?IzG}@LwShU(U?=(Mw4AU@QIPsl__d<l$F5IU(E(kO2r_dv=1432^g7Q
z3zWps{65sYXu|R@b`PGjQ^de$icXNa1WNeDLwku)vK(IJ=kn)hy)c&5wLAad3W)Mk
zn>Yg$Y~A*Z#2A0Hu)|dC%h&0J3?j60n<NCKz`N?0XPPp0U1WvPlvk}rqVD~n3g?0-
zv9$*=y8}ZHeRDIVQ6|<iY*f}bWLOFwmO9QIcQWB4SGhR`;c#-htgr8rb~8h^j%S%Z
z359Kmyk--BwNQ+ZhJ69@tYK7`Q!ZBd`JH^fepV)_OuAo~49l16l})q{hq72X#?bkc
zVD(u1hq(B$_X*+d5CEeJN~G!cECd8!9VVjwD#d`#^bqh$sf|=yo<vXuqgj#_XHGJy
zDFI5i3QT<$=1*U>eLZXtS?PhH!TEF8Z`$?xhj!J{9W#RT!=bqg4)DU^zafn}O{`*E
zsBxd6-Gk*WuI%hLzEx+^MG`jJv^GZYZjlt07!$&C-cC*i=i;UJb`&9{dw)H7fEe^g
zVvmeum4DEX<!cu@twYsA*OKn%jUH6f^kfK&Tyr>FN-1xxz`B)-S;~!^Zz7A;CrtLw
z;048jSS&o02cIg%q|?E9-e(=N{V#6U2#?f;0X12Xte4xr)-+;{o5nCbp(*51^2gl~
z3%LLYj%GH>3}ZRwM<<9IUCd*V5J$1CD43I=A3@8#O^|N3BA~J>3;kMWwA_edmWQn{
zSY+_<*jg2w(6Vieoqjc30nQn=xsxuUqdgjC9>XuBT++qQ0X6%`^0nW{h#e#~zIh8c
zovCipc`IPG)Ldi+@?cjLC~X~i7Uq4xMzYhvE>S&0NtlG_XijhAWcl2Bc8}q&%->L|
zm(oKN-Ra$hhr9l9Omu?qqIicLodKed;j5rKx$?M!|IN)#fS-O=;_xbqnS>q$`H@ft
zF+H5yh*j|fIWAiqu}38I`o=LV7XIVx@2cnN-zim_9aMu8@Pop3KSFT^k<H`^>(^X3
zzkijIi0@3u9Ww?~tF*OZc;P=eYS%`f*7*5l)YRA~S$*oCYGnENA)^E)tcQ;O4iF@F
zcz}_Zg*R%d)*6EaA70rni->4ucWtDE1gA@=E8m_mY=8+lW((hkw#XG=AayD@$&464
zVjfbWxuPGky}Ll{gNqsFA$bd#hp{?Y%CJkEV50^1K~0kA<!i|Zh`e2%T`5l%<k%4s
z=Cumv+I{IEzPb(5(!8@HH$aQwqmzY-e7EkygYk#3b`$z&N6MdQ{EFtlk$Bfn^$@>f
zgs{E9t&79b)yK8lAV<T3)^2pO&mgBv>oxY!mXR|F_IY00N<P_)sV=fRQlP?ZyRC~q
z@Kh(l>Z{O@weznkE3KVf+m06_35~MI*UFKt&JRob7y2EvL{4k9wm<#hViL+YgTz%Y
zDrx-7eIbBP;#%``A#H@_5lAT+xzkI_dnZ<QY%NSxV$C7aA4lj-Q6-}sqWNFft9f$H
zN&!bAB#Vxs;U1B3S=A9iGBtgixkWu~n#s>S;X1{a%7k|ht=mkFVu^nFP8;kiu~ZzY
zP0xjM6q#be?ZJHMV^^eTvAM2)u<UZ1Oz*l>IbQ{ftpcq_U%~?_E2H5JNf>L8J~m0C
z`wQD|!!1Gz8Rv>%;w%s3K1iNwUQmF#l%dcM`60&UjEu;mi9QBRL4Mq_?c@{Jjt|Ud
z^;b9Wvp0$KJCs@vQ`l^DYOAgeHh2zK8`<L!TRn--zxL*x*;d+UR3#Gm=_8tqpe_W(
zJ13~wccUU(!t*Q;M41JFmDa_H)Tk+3<-82ZqL7E9zTdhldMhW%;#kRC(3L80a0a8E
zB_}P)g%xRNBT-NL<HT!wQ5r4WXK!j=i#^JVBvF|Z-HNhcnci?jo7tr}AyygN34d#u
zzK+Fe#*V9}e#h6cX;4sh+YS;}jcxF^HzfCu^m}>2V6EFWuC*_m5OoA9c5?-_)vu^S
zU(KBfulQ$CC0RO3Y-!1X+6${6i>-cXelG(OX|8C%0Q0p%!i}La_SU!Ak%~%h%)jGA
zD=JVi--N;KllzkEU=G8yev%DyFR><XSZ{D|g(z(BZ7<##6G*BYXF5W!egk-{Dx)5k
z-|i8hab8(Lt5hsmB`G7)B=8He)m3r;pW=VrJ+*$~HMR=mH>tdkO0eTU{Ui+`WGoIR
zlom{B12?*1joA!+F{ltPoEAJbG#e`o!Hh|9tx=0TWWutQrTfNN2mk3SrEpm+BqqwU
zP+6=YiX=PLT7g#n-DM3dXb)8PxHFsNJCOWy33pzgDyJ_pqKHpvACvCsi>-9sx0Byr
zY(LDn8_7kr?32F#mc5^YrL@g*c9?_pxj0R?+r2b9J9x!sNeH{#9C`DD_p)B}WFoAy
z&76w6-RCZQ)7obL-=_7oJ6c{JI6@dl9dXB4&T460Q~KtrD|=AY!NDRS#&b-LWTOXe
z_c;~cSma0%H3F?{`}<$_3#D?15JCW;U4iMta)`_0Uo#@r7XEWaIq@Gn=7ty_a|kUj
zg?us=InCLFcr7mlq+e|?w_MR4qvKhf0ZxmWGXA0llf!ggTA)?@$Tcg*t5WR~jP@ay
z5^KUi;<^0LnJd*Yj6Y{CvNp!5OSc4e4o5IPz?;~)q7rGJAY2)!6;I-hWr5|>%~qmd
zPVZW^;@tM2vy5fJ^?Ba(LbBqTIQ|SWbS%5&W!1yNtlxnzdi>f>m*A45nqLK1gU#Kg
zm`L@+`vjX`5IVP4e@YfaBG%99+Rsug-|{554x0ByqEXZmB1gcu1hlY)5-OYC!HgGw
z_ZyUjqP6;T_^|2ZU<&_W3lezBw@hms#(ZERvXVd$vEJ}#mM{yegNOCh#P@#Yl1RTl
zTuU7x<j)SGP`k5*XcOXW#;RW#{ZkOKqHX3YV=6{|5tp7suwI_xN1Iz?jUb3~=0u+0
z_~z;{?C&c1Em`P{?nm+#DkCwS6&`BF$_L)!=kwf`xvOj;w_P<`uz4Ke2G?c%1$phf
z5LqL_jh~H%3|MUDVgA?!bMoSFzOwTUj{uyY><HXAC;7Z7wN2_+vZTmwLcdC0y_VvU
z5V$iAU(C=>^5UQXrb$RBZOvkmP1MT%sLU68B>I7_xuRAK?lTQMcp6E`Xf(%#^N0}j
z_ykdc=v!N8vZ%}0(<N!*ii_UrMs%fbeCddU=vtBNYZmeDi|DNuw9z64)kC4gCchMJ
z*DOT{!N#xB3QTX~1~oB-V5k}x`(MSu)dT|2Zv@_PMyc#}D&kQ;F0YFtCHAU2zf<YT
zAYDt$kUFxT<Z{WK#ky{HeU!>jPkLJ&-{&vzV&pgEL3k=<`H;Ld$El#hwaVSIT5t@+
zYQ|t(^ork<7%@Sy`nGrCkPl^h9q2zh2KJdTym)ZP-=)Pt$vSn&htR5l+x!YBE*x<k
zwNNbBgQ!g67gA%w7sD{!JtFGZwEdz@d%Hq~;VB}@?5Yuz0py3R+sCu}6I&45P^HHU
z(l*mXpkzUp_<^c0T-iVml-WPce$$=%&MV+4k7?wBHco-4Hb>bPbx7D!-*zy!&pWMh
z=3+=dQ@3wYL&+cH^`{X2Lneju!Gjl?fT9l&zMvgT38GT)d!NtlN6hU{I#iOYf@3-N
zd>w%&Upc-WF!ydE=2E7vHS^}$b&iqrZrPEy&ac4lH{9nw@fyO3>`#R!bBk>X-AWm&
zBKI%VpHJ8k4fZ)KyO^$(=<t?lO@FXgT=%J%a~x2|2b(_g@$j$oXpdhO5@``-YCiMw
zOo@cCeG)m5{)HW7YTBoiMD7xBO2<Go9(z&}A%`K!zwywHydtDTWd4;o^`nRS^3K3{
z?X`EAwV*CYdYL9Ty-A>&h^z8yQI#G~R!XQH3bMjnSohu+c`1N@df8S~eB$wSXTzmh
zVPllCaK#qG(Y@T&qcSohxGqz+(!o7PdSeA6v{y~?TrKSC4nN<^kbCOtl0l!Ib>52G
zM!jN@MkW>^+7l78psKQ4kf}8-mKAIz%Mo+3a$LG+r>DD0Uo|y8`NOeuV$S`ieiCNz
zg<9j+vNbuhNQ}YXem`?ZOZD{%`YQEz($>!2LIwGcZ+w~jX$pGvZ}@N<4?{J!Iyg0&
z%IGFTUw5E{`*&^I!+0fRoF+3sGeTCCdcS|QPqedRgA{%eb5d?)RA2B}Y0sf;m;5pw
zXxsfn(crAY6tsXvWR%25x8#C#mGdgkm3i%2X@c@cb=a@cgzG8v$i0#*<I4<lMDsnu
z7!%u@pMw>NPzW_NXg#%XurvYclx~<sAOV76IyLh5kl`Zbg`yB0OjB_c{Nyr<XAb(}
z$lO=jX8*R~Ky2MRnFt}R@s@U&#``bSNJ@s=Sy@cHN*qE-e7>l7I0ZCI5Xg(W)rv##
zQB;C3QtoFY^!Oe%X&7|`MsSNzG(wniasqVsZnz9MHqV0OqOKlYoMJBx#?z{EX;XFP
zBWfC=?$v%1;@onE9(kr;0zO2b1{nzTL-v^V(u036jinryF#w@b2Gywmql?uku`KbL
z<ByY6=$2=FIY){zZb#Ksc7yf_BK#2{hV`5CniR_3ngRkO?i2<KKnvEoC}MGVflR94
zbaI&_YPvahNw&^uP#+qmo{Ypzb<#6A21cF4x=k>|AEV$j*p-#Lg=S$uLw|=i;1BO%
zPa9bw5%l73kq_2{;SS!vfAaslS}%ICbMq2L^Mts|>{kKP&oMO=ie@yS-h8mhzVGeb
zMEO01E)1tgt^&eSm-#qO50VNfj1m(3M}f=(|CQDyb$nsmjiFS<bJ7o=1O|h6SO=D0
z%vZ*jI~W1^HLJmi=LUdOeY20SzZy9)jMQT`o2t(D<qFaZ`Prjrqof0QYE<ly$jct!
z+^)E4T&;DH7iHa-cLT^r0w8A)36=g36X0GzlfL?_PVNxDIrN;JL-^v5#*|_?@ss=<
zWhJhWKO8z;2CpS=SSF;}*)0~jqC-iciIrNRgWVM{OH49o7Im3_WUq<eGP#NUaa|IP
zSN?@*^wR)p7Eo7eXC>q=CZ@g<po>W(mZF2g`6=nM=xMdZ_P7~-EsgL(&GJbPK81$C
zFV)CrU1Z0G(-!>PAFP02Zr%2|P`G&^m!koLr5aR{>b?_nNbYrsIoN9phzxHHRCKwx
zSczYvV{xrOHpc~oW5hHC@nR2;dS-0Iqi27nCi6D*gBM}4x@}tic)p@>b2S%Fb-kpR
z`QX8u53zH1!Hp-^AvtqcA2<CTP5p&gPZKc;de@qxY?AaX&Te1|c0=~gd=S`%m~Ezq
z%X^ORvYWMy<_E6tve}?@zI;%`M~=W|YTjtr_Ygt@)Wh!lWD2_$L}S{)@_f4TBAw$K
zJbi=6OgSEG4-JuiF9`+ON=T^6Nl5%x73h2IXMRC)i~NWxcH}3?1qOb45=p8s`=QUu
zELs%sIA-;xp7LqfadOCV@;4~{SOM9np?i$ojJ(ggr+cQjti-QLBYbZ`S1?<0!|jIK
zVO({HYgZ_&Q984?M2ze08zng5mS6AsgcDBgaHdZc#(h9@e|$4byOAs0wQ!H6U{*uA
z1?t>J7`UC`UQ-^$&LwSeV~R$5)d&f=djoS7N61v%^E!BYd3gd>xLIiP5BAy2rozKx
z6S*`_vRR(hvqFRY<i%~p>%S^;;_#HJE3-tEhRAl=PHffQ30A}(v8QCobyH?kO^&==
zJ#3Ea_1kuw_^LvC+KX8xjbFdQ|BzVsiCp;+S-*PK1^VLgBPVF!2I=F4sxo<9Mf`g$
zEwSx;&8)7HBEPw_BMaEV+02r~$I<1zrWODY6!CEZo7-D@kegXr+d2sWuX;ZL$!#r!
zfI1*0HYFDcOB-9+4{nwkACxuCKiHe|SpY?Z5e0qt-vJygJ;3BXjt)-l{60d!zj68B
z+kbVl0?Gdt@vs*H>ME&{OE|k(l5??ev9K{q`Ph1K0EH3B1>G#H_|+w){|WJaCIqzc
z@NnU0W%c&<X7T1^adxw2W#{ALV`bxD<=|j`mtc1Hb@BlFFgv+Z{sr+53`t9Ob2nQT
z4_jv^^1m>_X3m}-LO|gAIQf71=jfuO^e=cP_kXhR&IhXx*oBpyg^ktGk@ep-+&!ec
z-a-E9(EnA#UGu&4m{r}<-PzO4+)~QR(#eDJ-ytl_|E2HZ>E`fvI2PutmJXJV@1pMS
zR@wiDNf|jM)qiRHMS-=gqs!k~?_~cENe^4A|0e5y`1aSx-{JhbBk$_}!u=o8{}ub+
z!tYW_O8k<}=AM7KCnqTc{L4PSg|oS>1^?eoE-o`ZE^{6WW;QEJHfAm`CnvKRo0%oE
zIf&PSmyg5D?7i`CP;yT09$+VP%fF!B!C7qIao!Pl*g#ws%w`sRmhTX}mds#Fc5Y@6
zFPoVa4~T=CkAvgiAXMCJ-?I|z@b6yz1!eILWx;M{!DYqA!OX!0vSQ}q;9zIw<+k8s
z=CJ@-v0HL-nzM1R{|#kf&M)ok<_LbDPFqK?wI!>Ill9*Ne-X|vrYa`{<X~a@?;ceL
zu!q&Vf)G#%Y)-DC@!unwwvLt>9^k*|WasAN<mTgIV`pRIWM}6C{kM>|rJMVED*gq^
z&c?#|58%J%h5tR8cV@wVCF(oC-x}}1@JqN^f<2twG@YFtgn)nfME;lN-}y~0_>WnU
zwRL}&@ck?0|C#g}mahLe`^Oq^u>E_8oc!;+<p-Pp!-zZB%hKX+L+^V37&5m3J6T)4
zFYte6)PMEc{@-SciwpD~Bo8wOn4N?9ed@WH`8dq2n0eT^*f=aKta!{U{xRYILU(tz
z^6&<`S&CV|NBSPkdj|a-4LRLExTOD|&Uo8c{zViU2PZQdA2S=LCL23HCnrBA8zUPh
zKN}m6^`8;5{<W_ED`Y{|{|_mGe+&HEM)0opkG}T}=6%0n{nv)|PtyM4@&DoR&&l|I
zXyG0DKSusn{Qifo|IqcnV&H!z{GaUl4_*H&2L4yV|H-cZ-{?a8??)a>r}x_+@An59
z8KJDP_lF@!GX)t*0H8L3lH>gh!9`Zj9RNVW`s)J$$j!%p?}YP^Q<8!^L4d@iAVuxk
z1_A)&069r9O`pw+0y$@cjgG6JsPc6lO!^eNhOtyfxlU>x`mDOtTEtYmJ^-4xi->3f
z$HX*UwOlar<sK^Ja(S|vF)YCfTz6O;+|gHZ-<onl9xVm~rz7ds50jYG>Snv{pN9Bk
zsOCz(DW}RkF+spGk)-DNHT*KUFg7^QO%WAexBaXF7r1FtmZ9zM<FY>*f(6H|&t^Ux
zio&T1lu6;BMm(BGrjdxnX7`Fl2j@9<#w3$7;=nAnY_codG5yMV!6<p_Kw#u1UT-lU
zVW{W5IT(q8Lvs@BcG({cQF^i+3Pr%OipavWDvn2ZKRC6|d0h`GGrT@VV^Au`#!sZ+
z`MMoVq*BNfwt9(SemY80YO7OEv+sq06Xu7<EDiH|X+Ic>DZtflHdT8CnUBRIaMDC9
zkb}h`p)H}w(bMTQN)=-;rDCz^lB+~RAo&)lqFW@=nYj_#q~aCb%f!Q)UQC|Q=Fj>G
zdLfUM1s|`k5JUkYj@>px{_t`1snj*_gPlNtni-WWV<e@5TyM`U4;%DeF&F8VZiGcC
zG$D^AIRLBIxA91n9~8MA98$MOlWAIk2a@Zi1)x<Q`D`lc7%TB`SflT#jvXJI$3l>J
zoVKA)OY@vQoYKe=-Sc$MGYN$2Stod|`pSn>$)%Q0XqJVHqB=$b`dU}>uIE1^z@DB!
zi}`oE9E`@0{2($mD`c`=ESJNe{KBEY^!`c`W;ziWN_nJ(54Cj5;pea<@_?V5gMj|W
z7Sh;+AR~qp+9`%Orq)qJuo+c!T7~Y$r8E|NO$g`{3{L^Fdo1{a?RXRs9!ot+oo1*Y
zy*gD)%M63Npj9GDs(Oi9im09F3=eoDAqhb78y_4F7VkD*>|taaG6*TX)li4*YsI{d
z=}$^ePgYfjl;X5vno^0wR2?8b#+GZDByRiCI!uFMMm1TZ7d9pqD$NC<9E!{~W*d1r
z8i$8=pJgSQOT~UbC6_`am5a>hc0{LIDjTwBj5!{z2X>1~WpdjajUd8vvV=j^H(q>y
zy%L>v7WPiiEK+J%eUlC1*>(U6%`x_C61zCr0G@tHadEgMU+d9i3WZ!gevD9)ppusg
zKvOZ9T~xew(OVC29t-GpJsgU{<3V-MZ86sfoz28EG>FHs%28`Jje`FEmxmk>q#p_P
z1*^VO$}*A~vX(zkyNzy`#jzPUV1c7}>06I*tnjd*$caK)%>cD&-87%!v;R7U0A<;H
zPDEmLgtn;)BPa3L)3QUDGck#U?hV&_e?2wZ(n!AV8x46>gZ|xx&-Ky_x_Q2JH2Lg_
zyrLKDi+n2i6fRf_P%0^xnjsI@HVKIU9!n$=36uhadhCsd`LPmrh&+rehUc81a(-!3
zPKVw=#KhiJ)vLr%430ymROFZf7`5+@MSkaFRlwS(x36!Vjm%Hm<%HzB#Xeg}Fm|uf
zZ)P|iN;Ikw^H@}374pCse9GTpN~4@aRna?w=*qFwkngvo*~1bpW9ZrqjSDV)!o#PD
z{=p}vE!}da#;t3e0a{(Bk|%W4yw|)jpvr$lSdc*L_gIQCxxpu%L(tR+&pFHtg~m|F
zX84lqeY#E=jCtZmu!niVCq)*xz5cNB!lbsUXIe<T8iPrxl#5K@_Uot7f&EvJ;EuqV
z=U@Ah!;w&M%K4AiOG+XV$cqU<yFWd0nB+?9ud@aG=O7X2-zt+u`OPZp-dYx<lZB;w
zzVOmsU;bdDl1nBZ*3izj4xt`SNHg3}(1-bMolNoj6j<y*xqj~pj>oy={EW;PzCrOo
z1BCjH;((j|{fH?|kwY<gHJ~p*ECe3u3;Q(ihu`N+L+XBpC90*D@J}Q|-j4`D=Am1g
zCI-zHICUQhOvAyj2<KQ#nX)Yk*?dm!d43LkG4cl({`v_!?~6kwTEp-N@-Vzv&>Y2*
zV|1N*m{7&%3lpPcxuQ9q4m9Slm?>-6MpzNIKW`y;8(NCHXO4NmIupfgWn*~vw%6Pm
zG9Q|6L~E8)HhR^1a|%en?K6R#q)Ri*;=0(;IiMzA|8cP+T*+1eX@1;x48H<tob#}c
zsn?-(f@{s!WqCt<8iUQ~Pm)pl!U#Q$Zx+U8A((91;@u4zBtg^2@$ku&r0+y!!(S^`
zD8;lbDyrGQhY0o#%|qxEknO8dkOBqm3vvKB$1ky3UXu6KFA(3OxyZhFuuoF6aEPPN
zaXOgCFxhXPu%O*@i5R4mNH;avPi<g&3ASSv7pcv%E6;J(5{5z|41c*5(onohKUnbB
znZ|I4q+;^<ZkF!dJ&HeM?cc=2-np@d;N3HB-bp7f-iwg1Ypm8GPQjrr?a(raN#xM-
zS&rX!yoxgbQycQ}=5Q!14X!?pSBe7F;Ix8r9-h%y`Hqr>U7Tm&qmW=LC)WtcCEFaX
z!01Y|tnsnQ6a9?D+vKO^-!R;L?F&QbCwz13oCUjr?5jDJv8=w5FV}ZaQP-DPiaG;*
z1hit2J)=?a3&v~T8B@)&l#X+bQ6DzQo7P^AX+px2n-?c}PjXD7(HrJYT_;*+kl##W
z`G(6^zKX{nROTT-q$8S;rTLFS2egCho_*PId*-|aEwm=jbeOL+0+&YP-_m!Nfgy%s
zr{9pX2&@4nI|<V*BZy1>Lyp?0U2Z;uS1$&EI#0veFF)NAy?u&?KEf0N={t4JBDehK
zfHh-|1^n~%C2<fe9FzD^?T3wrxS5kJgKOJIEDDm7b?3jmUmF%MOq+Bu%|gAqhY7^H
z&-~R>sP49paMAQA<ZD0r-m1JD;IqG~yp(ostV9$E&$@&#BCmj8Lb3A%k6?LntnQj)
zjo=;=gN{!!Sie(E&|Tf3p8WXmM+(!SWz?wAJ!xgkHkntP>Uw@!uhA_L%VV#G5gL5y
zlIEOEp{Q@UQS{_n1`IC!gZtYz$-8HQ+|jfDmE^d424v+krQA{0ru58i^}>D8f$BzN
z6o1E(hP*ao|7`;tVqkbego{SW<09%COwU4ZqL_U>KSD+3k^`atL$`~|;0x!BxBqzS
z>Y=m9YVNLag?lL#wPdPNsf8@Mbu?;0O*`grA_=2ZeSHkHWlw@@tU^L0;C-VU9)lM-
z78?8BV7@hVq<h4_>zX9hIZ4+8{3?!B>^3MS0G0oZ<BCIdT#qHyEWyw4@Jf(|HUrJA
z2^9d5d8*T~8=nLbI2fgfx%lfB!mXqpIJc>LCKbEx73hrhY|jxXUS45|VV*@Lg_&Qh
zw4`P+B!h&iKVfR6HcB^1*DM)SMjpJ#`+W~t<WNZZd;QW*8ue7b>n!$NxSZDc>xuuD
zEt#S_*A9_A-~@WsBm1Ezf9#aS#va7(H6CdyUv=c#nshLcp<2hTIFW?mew5<!6QoqC
z;5T-jC%B~OwXtVs%I9y+M&Hmzr6NgEWy|@b@Gc3zX1gpVkYLGu`4UGG%YnGPH<c$1
zuvCwVV-FmA&Zp6=qIb*k9XKi4250a}jc!>#6#YPx)xBPv_7y$?hVjGcCtIh<_|KSR
zQ+Tqa$r(dIFu<UJD-*ztw-U2UwMfsm=WKHih9~?AD>%Yoe^y?D(bdHyW75QvsjHAm
zs2x1aWPlJ~Vye%O`jn0LK+t<8=~@U_Ua(IDB1gy#p33tVE?GqWGf>0W%g4>z1AkJT
zi6(m~js}7~2Y|yYI=nKnccw@U`4EEXvS}$(kj9M6KVu=U5sI`9UbQ2AvL1fe1!Xdm
zUZbpad{=xoZ=s<EKuEEQVX{O_C#WbJD@tv~9E~-N;<z)@nL+A1^9@}S-S6)XN`IS7
z!ly0&aZBGejM8|+tWt|a_~~Q~cFyysU!akJtiU8%_Y}@=uAB7YL7IoB)VG77AIC7p
z5D-VT?SeWeJbzw-AF>CVmR`B?6z`~cax%PX@obwvk^cF}&oH4tBrZJeP*FcwGeKus
zBAE_U07iz^H7&AUBSNw%X%(5Ei5x>o|7iX+sxfeEKVTjb4rGa1UUu=XUR0zcA7YZa
z9rZ1OP?}tiEmFH(e^jvK*!a0X9;{lAqs*VP$AEXbobwa=$M%83fMpB!p>^|{?^H(=
zq?E191eVfy`u9dY9(oyQOyA+7b@cCu)`<*=$)|e^WG<P?Mw?Zm{BK8$1J*I=ds=u8
zUMH}kqOnrYQkedO$*?fz;k*jOSSBqmwN)j|P2Fsafn(iMmLEL%-ndkHKI`~TyH(6O
zH@{`LK}pfm;L<^mDtfG(cOcLT83I+(iPchqaHQJ$UWP@*+u4Ww3@zZhj#D^@{6A;;
z&vDpFJfi_%7MaY)6eG#li(}xokyFgGIF=S8ePG^|wnL$V^>_*P;0(dCS&d)Nt#X^5
zGO6En;9=y|#hD;z`mzxYs`pJ8C8#D_7#GVWzgudYXX?xc(gx%o8qKbJ2X7qnn{ZgJ
zzd}90WU?)ZCqA4mIoJ}N&|jyQJGhxB?<=z2uhUK}EvJNMkf-&H5Qyi_H;HCP86MIg
zsmGU=3(=a-GnNKJOVN)3d3weqI+xQojb-tVxOB3q=;~!}Puo;baUp~?I(9>|z`_Rs
z;{0DPU6Sk-*=fiBMBbCJAyWB-CIE0}F_$Ogq8~6EuqbJ8MoGs}*AcMyzHwz`TgYNP
z;mNfQDmh)3r~cwx4;sW6O3Xfi)i%@x{efhGm1~tvjRLyCD;E!|a~k;%M*aNG@G6I!
zeW2ik0cw9kS0kTd9*omkVkHMxB%xu9u2=j#cy{)ULF-x?qRYas>KOAzKU&}OYvde>
zG`!(#f7??7P)R1DSi#eEQE8ENa4t;oA{<AzP|xA{U{EyojYf5`4+$V+%?}0@(j`68
zuECQ%dI*R8{EdH1h<V`y%5TOn&1SU7NnJJ3L@2_7dC~s$sx&Oen$<1YWkq9^L-)`#
z$)!+^vK915Cz?xL*)thX3OaP6KKF1>QTPc@OT$O_c<}>a@M;;Y1H&RbF5Y&w?fud;
zy!#ZY6>HZu7e3S=QH-#H5e2OCAKKNciBDIb7{|xMr-)XnJ=kN+3l@65GEbL_{5~J8
zn2S@HbAWLp-&CY_BY>>V7y&64&70)H867o{Ytfg18ku7eRX@=eO?GV-LylBn_>F;L
z=kEOi!gw4r?KpMq7p4&<`$<QwST^5x-~iTuKQXd<N{iowX?W|TgiHBp#G##Y*jM`6
z#_SFH&VSr-I72w7Z0m$g?t&0goFSUo>98b8duGxMjZ(6E8g~n*vwx&O8LZLq){y@V
z2=y^>7usFXy(#r!j)0gSa;k<d*&?QQ8=NRP1I66VF(@^=$e`tVTY(|k^2Q9EW09K7
z^3e6!aiH$<k)1yvDfFH{T0vcr>6XOFAB0a1rW~c}t&gkTj%Mw5BOMGC{B}}bd2K*7
ziMjTe=tz0@K$8j)>pn2kwN5}@Er-(OmT7d^Ds3pB^%S8vXl!1ZCpLz^+7VEZeZs=Y
zl*VrM#*>XT(flRgl0&8T7($=`nRATXN$v9jo^){kc~McEA+Vary#2FM<6U}R%Cp~y
zYVryFTE@ociUrLCwb{9B@3SQg^RsBY9PcSO)K%Z!n04fh`Lcx)f%57tQcX0P<Z@vQ
z{sLqrTAJYs6vWQ6@HyU3`Ev{K5=VB8#mbE{RA+K4imI;_3MwMn_JR7@gLq-9?K=^G
z%VjnA89|v{(&p2%0@E`uKB+W*l?oJdD9PmtD%;EY-WXAFQq38G;XZfZ=CwBcM*^~d
z_%^Y#jT2bKcj-VDwiuJU6G0;XY3!6g1xR6uV=$_(3D-gz;hv<QisV@Kf;!8bK8)q%
zhDSL`dv1I}&iitcOsyXIuq(Rop01=E<FFgKaDwq{@?F=ajZO7)w-EUroRT79N?x>M
z0hi6jIoIZ@63K#c4!O_gcCFH4u)K2KN}Nw^Fs5kg?`qO`v$?eL4(?F`4sucw&qT;D
zhz_n%0+M!`OW|qC(tHtB1C!iBQ0kl6dwrExpA;ieE;%F=1M{fOABciGwZ<;pih2d9
z%f4gS915P;);YKSpa`bQ59j?XH`CID{6i2NqSSi3^^>S~7qHy;{?A1;cY@%C4|~FU
z$N#5=^A2b8d;fS6F@jpLXNuUhM~o7q2x62ftt}K)4W&huAhq|Xt*SO{t+uFE?7gY*
zp^d$3v>z=+e))W_-@oU%&vmZrKF@Q`x!>>Cb3`lYAmSC9!Z<ealL@1jo(RZZK<ZQ9
zTCO7A8LW*<!6ywJ<i;kXNT-qmC%{3q$f&4i`G_YV{lSmHd7bV{wJISPaasE}@hyZF
zUWn(eo}p&@m%0S~tk!l+@on{GwsBJ@V`}{H!(&?aIlj2d5~+uU{Uh~Oc^z*prB{<`
zFM!2oppxMDYhc7^+=l9R89s`pz^Q(U4)@p#rJ8(avp(9;tC$#c4D2oxgWYLP$9<)(
zCy5OJp5?1%AX0;k1IY`Gx>wR!<BrpedQ?J+v}qta@5(K~BzF#~y}&6W@o)JcY@UGN
zVOp*$xq!eNcZ8$en*m3Aw&M}H;!IY(N7sRW9G)@Abtlbav11Mtg-x^1S1gj3{E%lh
zw^q1QLyQfeZ&1NJp4_Q6z5dA%7Sejw*yUziV_yLLlAPS|&lTg2>M>fGCPRbi@?8%+
zYrCHNPmZsqjfh~LuW($3jJ%P-6Z+ngK2hBix<|iUYva$aGd3kLL)T5bi8k)yTHx(+
zYioqDe80@6n}hXa^a^bj(ZhC5)=%6(P9V7E;*$>$JAq;b7UnY%z)d4HCu9cq9KPJk
zJA<?%ina0JkruDY)VDs=YMpYkT<Y89Le8T{%(^iTIPI-0F2gZ<0aVi#xA={ly4YC%
zz4`Wf^ug<w(3UmlaA5|5&@5Lgj|<YB{By6qvu*5^d{u*_5k5$jILVk5pfmvRv(MAX
zq%PTEBmge*X(p6+WuWPb$8b3sm3Sdo86)cpd+P(fB`7YO2Frk24#{SA>Fb6#(qc10
zIE{HPB1YN45@a#Vx7qVal#uwL%^$x7_l^R<)${xe*9_|ag`l}0$OP&Q6_87LGAz<W
z)MbHzH7anWmI6>liJHoIf9omPfMq`^HPrA8-WIJo3C%sxBlv|XtIabg8ibe-v4DaZ
zR>q%M65i<3ar6^7yYl{gj9{qpiB7+2fq^lv3ZbG*SW?)RWil(q!%4FijI8RY8wGe$
z<gpeT`MrqDGa&U!-A@}40Fyny;08eSlpp!Af)+L^RlD;mRlxmrLEMSP^Xa-BJzeqZ
zfva^j)N~AfdK~>FhJY+amx6{`w87J&F7K~)vvjy3CJldvL@9t6e=ub0?K88cicG=i
z{6xjNhPTVFvMGfn)+K|Qkie|tlzf?E+}K&s7tTH73#uQaL7@|?1en9^m(jRnCV_K?
z08yf_4<3gWq&J)w)-})Udk@VTf0hd{68P&3GtX)fi&3tcH%=2X%xbC79Wl4uXhr$c
zH-pmPX1Pg|;DvVO>I7trylb-LJ5~UnK%kcoU|vH`v8vkZPBOSLh`OYR$yZMo_jqAf
z7-`!_e#!l59{&rf!j%Red0`0fZH5wLUD;gVCAA>Wc~8@Q&}BhG0opjC7Djk106c^e
zq~uWn4#bK<;2Kf24VQuztsngmlViK!)f<Chdt4Zd^-f`2kK+bmeZk0aQwG^~L_>jB
zZ=$slt-}xMnUhSOnL?YFIoA+}Q$Ag(%%3V)+mZPQh&y{vLkS47Ql_$~?A~ugFo>;S
zbttAz6D=PWr1TISNEfay;F*X@eGCP*^8zI@M9se<AT#I9Pi{(>I?NHLqjGTZs-tBg
z15gq3&i|hLdY;c9!6II9L?zSWtumQ#Hx>Y4V^7LNj#>y+BP?OMda(f6TL2l}%B$5+
zi6t8q!jKGJwR(D>jD`@*+W^on!)Ck_2DkwTYZJAM6qTd`rtpA7gIqrg0|b}+4}~T5
z0Vzd*GUNNfK7En>cqpY1GQk8Yyw)8>|4V5~>Bd7pdD=O|%h*!_^8lDZ?_i&<m?mw|
zS|Bsu%pRy@vzmv`oWa}?USc-JO&2s$C1^29l(5IT*1Cfj!H96WwAnm>rd_@3EFE%Q
z9@swv&QbwQfH?2S?}AH^os^al@K%VFD=;(V0w!UlXwuowL^Z@)Y?3QqkS6c#^9AHu
zPtHw8>a3u;@R+WfMt~t25WgmH;&mGyl1MF`VGf{Yzam7sb_l$~!nxFY7{h#c0>d?v
z_m^otQ)6D?%M?Ito+E}zq=wQ^Ee<;Tb1ktu%Akp;UP6rf4Y503lZQ5zCBCJ0I@-!C
zq-#i=;tgnN3c#4=Z)y=>OY@xC1HVV5<$Q<H=dt44_-{K2*lavAWxNN6zyx-gwLp+d
zUyU>?B^77yHofye_E7Ie4PgCl8=leuJn^&HEG6l=@`lD|x5tzO@_>jt%9m@#ca0}+
zR^A>#;#MU93*W|Ns?Wp-t}sFa6!3KE+jw()V3D6y?2r05-BDRUXz`1I42ARw0q%Oz
zlmM4fRqJ3BLuE`QTv61lC$OJz2g?V-?tux(m1D3pN9d;@i{!Q-_t%U*o<5z9zuAKw
zfnJ@-{gi)eV*te((Z~~UNy$^9exk$Gv)YCbw3#yiRzjU>Ud>QORB3pv50KVwZyv~w
ze#!fZ*z=1OkfFsgRGCLp3qu;HnSP7nlY8uHTh?Dv0bl2}S9;tYWC-ky&m{_1@Lk>N
zNw$8JSfx8^!lvrb5)^_1DSSX1#BZlu`9SKa%;b*FR{<T)@X$Jl870NVFKM_Ntb0!_
zupZN>h}(NlqoZTByjS+}%VfOS+AwL!03an@)U&G|>Fkgx3>tL2w^M-{Rx_b|kq+Pz
z$8OV*s9+}7448$%lk0_Hl}Sr2iWMQ=2SePN0&UWf0S57DIr3MXB^w>dwvwwuxf|u5
zrQJ{b=xSMU4}>x6rmq8h8_M-@FkKEHqmNIGIN<oYo;nBc!;XXWS6$l2>QI+BU8Rf+
za0YgU1F$Zo4n4kTyhBN3tdJ0s2+z!n=yFe@^AmA{WWd@E42QoWCtxUBvMmD85eN>n
zU;6wBj2_@JFhF@35Rwwj^?0}BtLFD2;>;KGMX@iyR*wgVL6&0rg>gR&AzasgttdZk
zh#y2TU*{Fvh-bZO7}KZ-)04^&txE(K{+f!mek}GOdDK^U!FCCGPXIo~=9yV$1HJ(O
zW9&91y^DVRTFFW_`t;v2zVE|?v|7p6@wB^_++0T#TkllftxKOIrpmS*C2)$c`%bac
zQ_C#{dY`u_*Vd)KkOEnrmKy><fo$>`_<}5%7Ir2dYL_=%_pPtUi29s?C_44FuopfG
z%?qO0?n-SE1IuJ$iYlcRZi8JigWT5c*E@BgbuL<xmwfeZhKSD+WBC15r9y;m0Zc^W
z>Z?C_ER3>5w}4}WCNL*L4vdOrR^PNV@$okG-)yL__`k6G`UmJo!_y^F?NqLN#o}rE
zvHSpKQ<|!)H!BU`CpP~E>1Nz`VZ5W)2?gV+29Y>1Jpc+phmG<>)8%5~Z)9Xx-slCt
ztdcWr94Ive)KNs(kCOs3flMwqzqZ5sp}<U;dgGh6>lPT`pQO(Y1S!)VpEfEuKX|Ls
zVw8?o{5fylWt~)0ruG@ctETman@oe5$>sXJnKAmY`c7WfoB3k?aw1726?1wO?TdCd
zax72h-Jktzk{|4=@i;GVi9ysg+xeLp>UFjI|HYueE~VM5F-J4!3d3UeeP=zNn#~rA
zc({!y80m3A7@_k2#c;cb5b9+?#)o)&w*W9~Ru>=|r!*|%U!*_T4bk&SB~|u`sllGr
zxZ#Re#J6VEf6za?|K5%jmpaQOp6i~{LbH9B4jW_rXN`;8N8G0=`(9<Tx32setc-Sv
zLNtw}v)tnU4#kbna@`}k<e^toQcB`g4S9OSlf)(sKa$zrBq^E{^mQaQ4Jz_s%A`_u
zA2Ld2z(zpQ`AH=?(}kT6XQ=s#W&Wsld!xZ=p3kYfM3s#IwbaN#I?lL5<4wASZ43??
z=#mNFXYR9AW4X}nrEJcHE;w^E1kuT#8fX06ht^UA0QndFxOM#5<NMzTNtxz-i1H1p
z|33^%osikx19v=udy3tRpGp&^HGqdz4>K^4_Nu5k?xzg<g&u{f-OOGtf4}!3?s>mc
zn2l0)^|ZHC!ch*{^+xJlGEKt2lW$u|uNJ;u;)c!D&**7xa#!BU1T45c_gI=w4F$n~
zS>?(FS{v~d@@plrnT)o_K-0b#YJdke{p9GvGFqciD%3_uPeoQ~o!oZ8jvizW8>_kJ
zRU9-isNOddhU{qgdj(lkvvbD1%3p*~c34_wdJ_Nj;ZAidz&MShz)XZWDxnt5G&j{P
zV(YoXk<s&HPK{iW*1pOQ=R9RTEs{d~8T$Ho8@E`uhJ~GIoj2=Gg|Uz}f1c?cKAE#8
zlilEZDknNdx$xqxJD0zq07!`_+-?)tlpltRX6Y_`^?eKK3)`m^zeoyb^gGw-&d(~b
z=_nt+d4PtWqF*oeSqOFJ>)eI-=OG}Hvhru(?=sbtH_Bm+?W%yz>&2DFy_cqPNq`z5
z`R<wuS=jQX4A&M^a0H|af9E@4HMKb~M|R^BJj=xte&A)wiEA1fY1$`;YvcHJ{EqQP
zGMP1}pA&Wa5NKwm(`!1aEk`t4?%CB$p@>oL=oTMA<AxFU;w|2=;(MT)W1wWin83o(
zN;R7h!y86yq`*z#=T*$tXav4o<XARF+-oJ^`Yxc9nO5Gt>7!%)VE*^$)h>1?^Qku>
zjnUF&_E+oFO)(Qznn2sO)*%iJ<p@dEjk^_bTK`<?Fay(AP@HrMM&bf07jW5_IP6Qh
zUE$B)X}JUA7AO@r_a^rgAtL2Lv3xfO6@S4(3gPPEMAZ*Ha15G=N`$r#dn_bd>pvX(
zTUj*hQ0}Zoe5z>9asdD^Q&?ABo1DL9O*QYx9Wap1Gh<zRD_Xj!+3n5BBL-bDRK2X5
z=naTyK;L${ND05{{7(M!0-&rCDz@S*=U(*PMKKwUVy>D45rB80#0Bv8p@K=J=SFj^
zE89rZaA_e_o*2Q7u^w$o3?EZ`b)PKD;+}rcTKkne{g*Lxp&yL6#XrzE=>B7?F^cn?
z(LWCoRZ5K-gPeaOO<bKim?b*1DT16m<5ZJ*#e+u#1e<hiYgQ=Q3Nl%|zEfrIkII{v
z0A)*;Oo0`}#q$Ny)YYkXxAs4hJmQ3o-;Vv2gKlWd5yOiAjkqd~9iOMviFZfXz9wZn
zQY3(L5XrZV69N@ou{$hYdb8npe9p9kTNH4Ku0_6SaRvBEZlh4g2oPQy%&|tNH2izS
zs}u-*Y<}pjUCNbs=08pIktwo5n(_U_u+e$0_EPrYrxE#H_pUVq4qE4V@VWV^vDJ$y
zw`9r1KSwiRbr79Z%Jh1yfm1|Jo=lB~d~@ZGxbk;+&F)@;<kzz1q3G|QivcrXhfLE5
zZWz)CJvo{1(mE`TB>f_(o%E^_5Y;{$TR2s8G2S#PLvdX0k@vov(i5C)<%g{W6`$w)
z#MfXfy3Dz_23g@oHfxOR2<82cY%W=~4l`)7bW=B@wbq(s`9)KNoDg-@!&@to&Tf4c
z1siqs1-b!y!Y%Lz+|NL??@kif&hkjH4l_mP9BcOLFT;ARTZ74^6b-S}gQBJ#$>R#X
z<iqW}JmT1?SA>o9*mV^xNrYx+fE_+I(_xujKYvK5%x+oLT1!~=a~6l{XQKPlNBD%E
zkS?7+`RJw1=71Nq4l88}xAx?lh1B#N)@t4!FoO%iMs<Sq3QMb2h>=$b_k5ILW$nZ@
zRi-xo`!~C7qYAH@q-RKEQbt0)|K1Bbz-B9fRqp2Bi#1v#sTSOHS~?hK`Uc)p7xuQr
zPTyeIgm~lMN7oW1EZtBEJYNWr^Wj_<4jU0z-Tv^_1G2^wdn<8VN79tNlb-?`%;ctn
zj6amm&o^JMELz*7M>5(DcI`Ig3VZOieKiL0{}lW@628xi3#B-Y_G=XFrIvdbdQGlF
zqTD^07y5=6$P^!M9v&CX27ghGj|9DYb75|dO@HYhZ(cP10#kf&n!kOa5y5N;IN{8`
zm&tQ(*WlXg)FdxXm4yO$Hk6&vb4wf!edu_Zc%H_<=*6^}HQ3O{K9}nXJz8lX-={;4
z@_uYF<Pnn9%U_N2Y&!)od&-AJ&V9JhA>DH*x%-4u+9;Rja_maiyW)uV?R_g#GOi-{
zY)ISvw&!cbx=<c7yPl{*t~6&A*Q|t-SC9(n_GUWfXor<&vfIthKh9daRVwU5^G3b{
z=?LIyDP*?Y<^iU`ZEi{4t0GZoxi{vyy|)o}b{AKP_w1yhUNHBDKzJ9pNMnB-x(+0d
zs?}NDyhg5-$XTD|tiBVJPNLX!x!mFgrpYWCJOndA3TmGskbc{WWbHoTAaHiQ<E>Z6
zt!9N0kGBEo+R3}(5-c0q&X1z|*Q73IYbEBS^EWL1m^s$PQ#_kga<8a1`Wd~V?-A}{
zOK0;=756v7qavMn7O2BA#TJ|RbNl#n#K+T)ux_nSJB#BMPKbXg7Z8x{aa2hqItsdU
zrN%1-dRY>5g>225T~>gu>4puq-m8W~QYNc)+S`1XtluqN>UzA-SlNjySHEM6Xfb8S
z!=9H+vh<|!a|b7Eo(#je8iY`z4}|D!`cE6;c4e%x@POzGl`>TlJ%nMYefX0D#`qBt
zx|Z@i_B`*Q9n93;#(!minzYHmE)g%_Nm*IPSY`~swtB>RSN*QR{J7VFwR{^TVjDRJ
zr@QM~Lf8iLUW+vG5&bXAe4fTAcn~@KlK16hex}YtEOog_u3L(tW|sWwoTK`_Cmrqn
zuOn(^lopxLb(j0+N7Ayg&=FJRR?Q>pyTuZ}Pvzb!S(v;z8{`jm2Vu*jKsQ+7raWA5
z!|fRi?X_mN{#a;aA~mZR++>F)?9x_Ho?MtJ?bKo4LZ>+3p}poSKrNN&kx3iYt)?aF
zIC&{eD;)mrhUu?b=N>a@Dw7SVDy5%MT2?PwyK~HjdGx5L*rBA?FCpPQA?BpHT+4Y=
z#z%=Ahu0GKYOd>;(#luv17dW3&z*sI5{QzD=BXP~_7J|ScaGdT^=s`gcQIL}Z@(!<
zl(_v)$HqOTK@59*^FYpRT`QPV`SJ70TrT|X(K)l5*>@nC{H6QU#Grn_nJ7F4r#bQ#
zRCayMtSQdDqWQ)Bc{@KxyQ3ZKR(rVgb%zZ_DC4A6>_wVey5yzMN4whK%i|QaBtYT2
zF@_%F^nSBq8U1FTE<LE<;-5oOXD6dYZ_1(??BU=^!<VY?f)k%l2W82!6emlxyLmQ5
zx7d-hrB}tT-nbzuYm?cAof&^QWFhT5hDuZTwkhzRm1K1Qx7(1NYwfSe3T8m#Vx7j0
zWjD7fsVoFM*zv8y=r5iz^`X(xJ<iOBKR!^k16C?+I25O3(qEgUXjMX%rw-@z`26(1
z*r`7K20eo^>3$ygWsh76Yd5(^u15L;XQ41s=w1s!lX1C533oS5ctqb1o9V4uGrdI{
z67(HdyVUXXVYZyl>*Vk;|L4DXdhYbMaiAJ{*_0MHo^qm4&sUSd6o1Q+5u1+c+p5%G
zm8xalup`~~!{)$C_c*35iy}0^57!RA)a7W4ou;8egJMxO3m)lz&5m#?ABb-ReZKBx
zcUzpIAH0hxvenpf%`#2e6?=Lsw_{l9<7w1CbvB_FOydIAEo;1e<X1&|P_jRP?#;Vw
z{8CJNje}4>rBN!?^#P=YU%s3xyhj3R7LdX6CMZa#(O0QkC(kVfJ+-Gk5Ibr1h%N_-
zzCD;Nfr3!1K2i7z<Mf+EdO{R4r6`*;#4&La*))4@yuD*iUa-medMQr6S$nFwT%OEC
zquw9Vx7~B|cGu6n#xZ{DutAX(iYF6vuK)lH9AttpIJF_VH67gA{cK>Sm$Lu(D)u}6
z_?dgHH9$h8W8>}?iG8)uJ(p#lLaXS_?{<u{tAz|$uduIg;JO#1_1kIu4)`O}=qc{<
zCya3h1`iWNf5-U>X>PmVoG6H(TV53rF5AfA;qxoW^;V39(_6=2FE|0xhZsg&N9-^y
zaIqV+c)pOV$hEcjBY4TGxlO0m6Z2Bg+&}V(`tt)G{oWxAyQm!r$h_vwmAzsF_5K3k
z(>3JwDAc|2Q(zpCoF~%f{`OH~e;w<shu(;=NS(DrSh-IGO#C_rg?hQFj|XaazYzh8
zIkeCz^Z*<KC%Y9{8%!O_24`#LVgek83d*l&+~5C<zfyU)B7zjE<nhSz;~!t#<^SYc
zKOpe-2#57(>u2@avZ|VuI~D0zBUkOcUw)m*DjN{l6ePA-Ya?u$<S1OH(C_YP4;S{x
zCx8)j6T@_s2#RKX=jb}spY?;*&g*_h*PDD<M8uz*UOc=UkUL#{_0BGoiVy6mp*~D4
z#v>N@@Fjy6m|A#5sb3~h3$7Q%j%rkS!VSnY`w6{#4F0|>ex3~RyC3m@!lrQvo(C!s
z=(-u%O4jp?4o%DA8hZIZw)9?Ct=Ye{N)KEcd53{S7rG>wCQVk>@_yCBWPmAll1Cmj
zryZu&zcJ?N{AVT_ZcG}K!lEV8{{GT!?OrF}&8{Q^_1xUryW}&#<)fQcJaCDHo64Wt
zw%tRASUifTH|*VtB>bn!2Ggqly&~nj&!DYAA;>z7{<UyI5wRpfJX9{cjY5Fwh92(T
zX}!O+$PX#4JC36;WTmR#bSmfo5=*;J|Cx_U1S}O|l2C>_fvmG8=wfA5hG=|aXZ~>$
zD(lx|kvegA>B)+?LF(~zybuM}MC=CsvdIif-+ka2+@<k9$nDQsHeY)IJ<vyW`bM1f
ze*j()1;D#341!GgHg)pW)-`o<Dkx$GGvG!kTF<G3Zi`Pwaqy|`5gS$sMzlqN)27Tt
z&8uNQYMMmnU88RZVhj3xO{&!%^nELXRDr`E_XcSUa&M}m{ys{*l0^X;^(l81uo*z0
zVk4Za!h30mmc>Y<UT(wkD~i%YdBa8HgqZyb5&op$l+z5Ahyw9ND`g#%sJhT=n+2v=
z6=Sn<W#hm{2@vy1qcmHsHq(ih>*&omX;A&BD(mC8OkvYV(0_dF&70vvS*$}HvwvN>
z%Fgfi;dvN1?_@>XtzYdj<pVBw-v$#B_o?S{ga>6^ZG%UYQ|%uX(&QS-1GAAsk+eEj
z&E>lg-M?0zz2cy!PXJn?DRig*iYWWbt2geP-u1JPFd5qOfIxl<Ha#HLuMpx*8@2`8
zgE{_jQUIQ44DOxXPiz?CR~l&?5wl{$NO64mI0M$|7pGI~;jZL?;ko1l_vAuuJ&06B
zx!nT6j2IdLSrQVUk{?ld6g5^F<kIaV0?__%viA4h{kCW8iEruzrRKRt9u|B&P4)%V
zJOim|gTU&Y@*<4TP{aK&9UAsQ=|g7)pod8Ughge}ZTL`bp9i4i*$ZxV=}cIMQ`Z~k
zU)jj@Nb%@0Ai`(qR69CZk(mxh6V-G`xqZsc6zZ4uuV+q?I648WAY7+7Ec3{Bz-XEG
z(PXk0NQ(TPM2Myp(mmU{mj*0<KQe=RYA@E$R4da+V3Wpk$cb7n?fK;5ZnM%s1=|pv
zFsfgZk<47Og@}fZG7s%wsWdn`KPzM2*)^T|MTkjM!0O9jpNU!c;f!a%2!g$GL?36~
zw*4x{NuzlFHdZ-Hq>r<<uCY&p&w%}-(ygOk>krJm-kvCeNwX8kE_?yZ@z<0o^VRd<
z6OfWRUb9^=_J5%A0d*0i)VHxus#XhbmJ#sieS^v$6LK~g@W6I1$x*TsaYX8U*PIr_
zLa^X_+jft|>16^2#pWI>@sBT?XQG5ZTUmBvR)z7k{byAA044@j8N{JvUMthW(R2*0
zxau7*s|-y}850+A+7Pj_8lh7u*?%kRzzJ{@leQ{kF^HOe%{bE%>|#2o)i+?=>*?q4
zpfvk7TI{u0)JNMqfV661@X=HPg%w|H!Aj1D&KoyNbh&gUK_sk8tK>f;Q~2!zFvjUH
z-6Vv9TMsIoLWs8?o4t@Z&G(IJEH`qTd}_){%Bymz%mxU6|A((X<pH;1-L2(c-9Q~=
zW%Xdwh1JUmqJMvB8pPGVvEgRJ6x{u1cals?kNc&lRU05j;qd{e8|DUY^<1L<4<i2I
AUjP6A

literal 4677
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
Hu0mjf9r&r4

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png
index 3dc60464cf31e3ba07d5585542d75d616f63da03..f2bbf26ad759fb2ca151a839d4e61a983ac45f2a 100755
GIT binary patch
literal 26684
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%0DY>5Wp99*Ft
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

literal 4633
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
P00000NkvXXu0mjfY&D(f

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png
index 3dc60464cf31e3ba07d5585542d75d616f63da03..254a6f32bca09ab3009cb6d25ca4d57c048ba97a 100755
GIT binary patch
literal 26685
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
B;9~#)

literal 4633
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
P00000NkvXXu0mjfY&D(f

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png
index 3dc60464cf31e3ba07d5585542d75d616f63da03..998f5fb3cb6f04dd8541efdc151bde4014aa69db 100755
GIT binary patch
literal 26685
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
CK^Lk3

literal 4633
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
P00000NkvXXu0mjfY&D(f

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png
index 3dc60464cf31e3ba07d5585542d75d616f63da03..0d8d037a5f0357f90e13ff9cb05544cbd6d7d931 100755
GIT binary patch
literal 26685
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

literal 4633
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
P00000NkvXXu0mjfY&D(f

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png
index 3dc60464cf31e3ba07d5585542d75d616f63da03..c8acaaa58349b47893c0c3ab3bbd4a2d472c8721 100755
GIT binary patch
literal 26686
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
B?Uw)m

literal 4633
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
P00000NkvXXu0mjfY&D(f

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircle@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircle@2x.png
index 919d8f405ca7f40c921e71b91e7a81655db1f94b..207ce15dfabab74df8b5c13932506d94ef19dcfe 100755
GIT binary patch
delta 95844
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
K?H<|qr~Dr=#f2~c

delta 42344
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

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-0@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-0@2x.png
index 8e50cd033596fb3daacd173247d6779168cc8f99..ccd1494cdf1a9d19a9c860b88d240392ef1919ea 100755
GIT binary patch
literal 87032
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
CAgN>k

literal 26595
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

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-1@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-1@2x.png
index 3b5e886933d2f7a8803a44304c5439058ef86fa2..e611add3ba9861baf68614ec51d63d3f94c8592a 100755
GIT binary patch
literal 119975
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
E0Oy=DQvd(}

literal 40858
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
U^GtX>4gf!<m#-R@=)2(m2kI%UfdBvi

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..60e2d3328f89df794d7b894fd2f6e2dfbb44ba82
GIT binary patch
literal 2095
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
ZzyR4Xd;=*Q?iv69002ovPDHLkV1gL3>M{TT

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..03ebd1904875ab54fa71cbe948304fbb6266d69a
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^j6ht&!3HE(th_Z1NJ*BsMwA5Sr<If^7Ns&crsOB3
zDtP85rl$s_CZ<#to=mj?D$?_GaSW-rmGtBPe|u(OW&s5b0RuL{{})vhSj1!(AJJe`
mnsM{yP3eNAb2c+DvN1d<;HnQh5Offzlfl!~&t;ucLK6U8&?-Ox

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png
new file mode 100644
index 0000000000000000000000000000000000000000..27fe5a4e8d16eb92aa3342865479515ab0788ac8
GIT binary patch
literal 1926
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png
new file mode 100644
index 0000000000000000000000000000000000000000..87ead80a08146adfa553d242f315f764a467506e
GIT binary patch
literal 3749
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
DZJ4!X

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..778c231f20ca9253e64ccffb64a0aa39a3b97a76
GIT binary patch
literal 14570
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce79780fda8e5de5e89a958e4b7000ab6c6de7ed
GIT binary patch
literal 4791
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
PK2D*pzfZY$bjE)HM$sIi

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle.png
similarity index 100%
rename from osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png
rename to osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle.png
diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..6dca33317131cd69ef449c0a6c0122f0f39cd84c
GIT binary patch
literal 66280
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d8b60da9e79009e8b3e78b2003d883974b139a5
GIT binary patch
literal 12374
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
Qd;A||`ImC#G8P~IA7%MrKL7v#

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..2626c394dcdccdb7d74da5460ec3f6d6570ad9a5
GIT binary patch
literal 66281
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

literal 0
HcmV?d00001


From 6674c702800ad0d876808e06ade20e43f2b694e8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Sep 2023 01:20:01 +0300
Subject: [PATCH 0400/2296] Add support for limiting skin texture/animation
 dimensions

---
 osu.Game/Skinning/IAnimationTimeReference.cs  |  3 +-
 osu.Game/Skinning/LegacySkinExtensions.cs     | 35 ++++++++++++++-----
 .../Drawables/DrawableStoryboardAnimation.cs  |  2 +-
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Skinning/IAnimationTimeReference.cs b/osu.Game/Skinning/IAnimationTimeReference.cs
index b6a944ddf8..91f1171a72 100644
--- a/osu.Game/Skinning/IAnimationTimeReference.cs
+++ b/osu.Game/Skinning/IAnimationTimeReference.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Timing;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -13,7 +14,7 @@ namespace osu.Game.Skinning
     /// </summary>
     /// <remarks>
     /// This should not be used to start an animation immediately at the current time.
-    /// To do so, use <see cref="LegacySkinExtensions.GetAnimation(ISkin, string, WrapMode, WrapMode, bool, bool, bool, string, bool, double?)"/> with <code>startAtCurrentTime = true</code> instead.
+    /// To do so, use <see cref="LegacySkinExtensions.GetAnimation(ISkin, string, WrapMode, WrapMode, bool, bool, bool, string, bool, double?, Vector2?)"/> with <code>startAtCurrentTime = true</code> instead.
     /// </remarks>
     [Cached]
     public interface IAnimationTimeReference
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 0d2461567f..ad3b10edd3 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osuTK;
 using static osu.Game.Skinning.SkinConfiguration;
 
 namespace osu.Game.Skinning
@@ -18,16 +19,16 @@ namespace osu.Game.Skinning
     public static partial class LegacySkinExtensions
     {
         public static Drawable? GetAnimation(this ISkin? source, string componentName, bool animatable, bool looping, bool applyConfigFrameRate = false, string animationSeparator = "-",
-                                             bool startAtCurrentTime = true, double? frameLength = null)
-            => source.GetAnimation(componentName, default, default, animatable, looping, applyConfigFrameRate, animationSeparator, startAtCurrentTime, frameLength);
+                                             bool startAtCurrentTime = true, double? frameLength = null, Vector2? maxSize = null)
+            => source.GetAnimation(componentName, default, default, animatable, looping, applyConfigFrameRate, animationSeparator, startAtCurrentTime, frameLength, maxSize);
 
         public static Drawable? GetAnimation(this ISkin? source, string componentName, WrapMode wrapModeS, WrapMode wrapModeT, bool animatable, bool looping, bool applyConfigFrameRate = false,
-                                             string animationSeparator = "-", bool startAtCurrentTime = true, double? frameLength = null)
+                                             string animationSeparator = "-", bool startAtCurrentTime = true, double? frameLength = null, Vector2? maxSize = null)
         {
             if (source == null)
                 return null;
 
-            var textures = GetTextures(source, componentName, wrapModeS, wrapModeT, animatable, animationSeparator, out var retrievalSource);
+            var textures = GetTextures(source, componentName, wrapModeS, wrapModeT, animatable, animationSeparator, maxSize, out var retrievalSource);
 
             switch (textures.Length)
             {
@@ -53,7 +54,7 @@ namespace osu.Game.Skinning
             }
         }
 
-        public static Texture[] GetTextures(this ISkin? source, string componentName, WrapMode wrapModeS, WrapMode wrapModeT, bool animatable, string animationSeparator, out ISkin? retrievalSource)
+        public static Texture[] GetTextures(this ISkin? source, string componentName, WrapMode wrapModeS, WrapMode wrapModeT, bool animatable, string animationSeparator, Vector2? maxSize, out ISkin? retrievalSource)
         {
             retrievalSource = null;
 
@@ -78,7 +79,9 @@ namespace osu.Game.Skinning
             }
 
             // if an animation was not allowed or not found, fall back to a sprite retrieval.
-            var singleTexture = retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
+            var singleTexture = maxSize != null
+                ? retrievalSource.GetTextureWithMaxSize(componentName, maxSize.Value, wrapModeS, wrapModeT)
+                : retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
 
             return singleTexture != null
                 ? new[] { singleTexture }
@@ -88,9 +91,11 @@ namespace osu.Game.Skinning
             {
                 for (int i = 0; true; i++)
                 {
-                    Texture? texture;
+                    var texture = maxSize != null
+                        ? skin.GetTextureWithMaxSize(getFrameName(i), maxSize.Value, wrapModeS, wrapModeT)
+                        : skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT);
 
-                    if ((texture = skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT)) == null)
+                    if (texture == null)
                         break;
 
                     yield return texture;
@@ -100,6 +105,20 @@ namespace osu.Game.Skinning
             string getFrameName(int frameIndex) => $"{componentName}{animationSeparator}{frameIndex}";
         }
 
+        public static Texture? GetTextureWithMaxSize(this ISkin source, string componentName, Vector2 maxSize, WrapMode wrapModeS = WrapMode.None, WrapMode wrapModeT = WrapMode.None)
+        {
+            var texture = source.GetTexture(componentName, wrapModeS, wrapModeT);
+            if (texture == null)
+                return texture;
+
+            if (texture.DisplayWidth <= maxSize.X && texture.DisplayHeight <= maxSize.Y)
+                return texture;
+
+            // use scale adjust property for downscaling the texture in order to meet the specified maximum dimensions.
+            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.X, texture.DisplayHeight / maxSize.Y);
+            return texture;
+        }
+
         public static bool HasFont(this ISkin source, LegacyFont font)
         {
             return source.GetTexture($"{source.GetFontPrefix(font)}-0") != null;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 82c01ea6a1..309ca63896 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Storyboards.Drawables
 
             // When reading from a skin, we match stables weird behaviour where `FrameCount` is ignored
             // and resources are retrieved until the end of the animation.
-            foreach (var texture in skin.GetTextures(Path.GetFileNameWithoutExtension(Animation.Path)!, default, default, true, string.Empty, out _))
+            foreach (var texture in skin.GetTextures(Path.GetFileNameWithoutExtension(Animation.Path)!, default, default, true, string.Empty, null, out _))
                 AddFrame(texture, Animation.FrameDelay);
         }
 

From 351081eb278ff0f48fff992ba9f0e0de2cf98814 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Sep 2023 01:20:40 +0300
Subject: [PATCH 0401/2296] Add limit to osu! hit circle elements

---
 .../Skinning/Legacy/LegacyMainCirclePiece.cs              | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index cadac4d319..45a18152c2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public partial class LegacyMainCirclePiece : CompositeDrawable
     {
+        private static readonly Vector2 circle_piece_size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+
         public override bool RemoveCompletedTransforms => false;
 
         /// <summary>
@@ -51,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             this.priorityLookupPrefix = priorityLookupPrefix;
             this.hasNumber = hasNumber;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = circle_piece_size;
         }
 
         [BackgroundDependencyLoader]
@@ -68,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTextureWithMaxSize(circleName, circle_piece_size) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -77,7 +79,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d))
+                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: circle_piece_size))
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,

From d286816ba8b1beefe81457dd2533ecc9c937b449 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Sep 2023 01:21:02 +0300
Subject: [PATCH 0402/2296] Add limit to taiko hit elements

---
 .../Skinning/Legacy/LegacyCirclePiece.cs                  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 5516e025cd..c94016d2b1 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public partial class LegacyCirclePiece : CompositeDrawable, IHasAccentColour
     {
+        private static readonly Vector2 circle_piece_size = new Vector2(128);
+
         private Drawable backgroundLayer = null!;
         private Drawable? foregroundLayer;
 
@@ -52,9 +54,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
                 string prefix = ((drawableHitObject.HitObject as TaikoStrongableHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
-                return skin.GetAnimation($"{prefix}{lookup}", true, false) ??
+                return skin.GetAnimation($"{prefix}{lookup}", true, false, maxSize: circle_piece_size) ??
                        // fallback to regular size if "big" version doesn't exist.
-                       skin.GetAnimation($"{normal_hit}{lookup}", true, false);
+                       skin.GetAnimation($"{normal_hit}{lookup}", true, false, maxSize: circle_piece_size);
             }
 
             // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer.
@@ -96,7 +98,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             // Not all skins (including the default osu-stable) have similar sizes for "hitcircle" and "hitcircleoverlay".
             // This ensures they are scaled relative to each other but also match the expected DrawableHit size.
             foreach (var c in InternalChildren)
-                c.Scale = new Vector2(DrawHeight / 128);
+                c.Scale = new Vector2(DrawHeight / circle_piece_size.Y);
 
             if (foregroundLayer is IFramedAnimation animatableForegroundLayer)
                 animateForegroundLayer(animatableForegroundLayer);

From f182f571cbaa019ed3ad3272ff208dea98ac51a0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Sep 2023 02:22:41 +0300
Subject: [PATCH 0403/2296] Add limit to catch palpable object elements

---
 .../Skinning/Legacy/LegacyBananaPiece.cs             |  8 ++++++--
 .../Skinning/Legacy/LegacyDropletPiece.cs            |  7 +++++--
 .../Skinning/Legacy/LegacyFruitPiece.cs              | 12 ++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
index 26832b7271..9f99e3a586 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
@@ -2,17 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public partial class LegacyBananaPiece : LegacyCatchHitObjectPiece
     {
+        private static readonly Vector2 banana_max_size = new Vector2(128);
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTexture("fruit-bananas");
-            Texture? overlayTexture = Skin.GetTexture("fruit-bananas-overlay");
+            Texture? texture = Skin.GetTextureWithMaxSize("fruit-bananas", banana_max_size);
+            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-bananas-overlay", banana_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index 7ffd682698..63be1bcf91 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -2,12 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public partial class LegacyDropletPiece : LegacyCatchHitObjectPiece
     {
+        private static readonly Vector2 droplet_max_size = new Vector2(100);
+
         public LegacyDropletPiece()
         {
             Scale = new Vector2(0.8f);
@@ -17,8 +20,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTexture("fruit-drop");
-            Texture? overlayTexture = Skin.GetTexture("fruit-drop-overlay");
+            Texture? texture = Skin.GetTextureWithMaxSize("fruit-drop", droplet_max_size);
+            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-drop-overlay", droplet_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index 85b60561dd..e4d25e036b 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -2,11 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     internal partial class LegacyFruitPiece : LegacyCatchHitObjectPiece
     {
+        private static readonly Vector2 fruit_max_size = new Vector2(128);
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -22,19 +26,19 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             switch (visualRepresentation)
             {
                 case FruitVisualRepresentation.Pear:
-                    SetTexture(Skin.GetTexture("fruit-pear"), Skin.GetTexture("fruit-pear-overlay"));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-pear", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-pear-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    SetTexture(Skin.GetTexture("fruit-grapes"), Skin.GetTexture("fruit-grapes-overlay"));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-grapes", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-grapes-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    SetTexture(Skin.GetTexture("fruit-apple"), Skin.GetTexture("fruit-apple-overlay"));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-apple", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-apple-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    SetTexture(Skin.GetTexture("fruit-orange"), Skin.GetTexture("fruit-orange-overlay"));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-orange", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-orange-overlay", fruit_max_size));
                     break;
             }
         }

From d674856e29d230fb6efd6b5a9c0873f6db628050 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Sat, 2 Sep 2023 22:49:29 -0400
Subject: [PATCH 0404/2296] Use existing localisations in `BeatmapInfoWedge`

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 81759f6787..8bbf569566 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -30,6 +30,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Graphics.Containers;
+using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Screens.Select
 {
@@ -371,7 +372,7 @@ namespace osu.Game.Screens.Select
                     {
                         new InfoLabel(new BeatmapStatistic
                         {
-                            Name = $"Length (Drain: {playableBeatmap.CalculateDrainLength().ToFormattedDuration().ToString()})",
+                            Name = BeatmapsetsStrings.ShowStatsTotalLength(playableBeatmap.CalculateDrainLength().ToFormattedDuration()),
                             CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
                             Content = working.BeatmapInfo.Length.ToFormattedDuration().ToString(),
                         }),
@@ -415,7 +416,7 @@ namespace osu.Game.Screens.Select
 
                 bpmLabelContainer.Child = new InfoLabel(new BeatmapStatistic
                 {
-                    Name = "BPM",
+                    Name = BeatmapsetsStrings.ShowStatsBpm,
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Bpm),
                     Content = labelText
                 });

From 40dbf098d2d31730ddecf38032da48a8d2461910 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Sat, 2 Sep 2023 22:51:08 -0400
Subject: [PATCH 0405/2296] Use existing localisation for "view profile"

---
 osu.Game/Graphics/Containers/LinkFlowContainer.cs | 3 ++-
 osu.Game/Users/Drawables/ClickableAvatar.cs       | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 2d27ce906b..40e883f8ac 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -15,6 +15,7 @@ using osu.Framework.Localisation;
 using osu.Framework.Platform;
 using osu.Game.Online;
 using osu.Game.Users;
+using osu.Game.Localisation;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -74,7 +75,7 @@ namespace osu.Game.Graphics.Containers
         }
 
         public void AddUserLink(IUser user, Action<SpriteText> creationParameters = null)
-            => createLink(CreateChunkFor(user.Username, true, CreateSpriteText, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user), "view profile");
+            => createLink(CreateChunkFor(user.Username, true, CreateSpriteText, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user), ContextMenuStrings.ViewProfile);
 
         private void createLink(ITextPart textPart, LinkDetails link, LocalisableString tooltipText, Action action = null)
         {
diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index e74ffc9d54..677a8fff36 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -6,14 +6,13 @@ using osu.Framework.Allocation;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
+using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Users.Drawables
 {
     public partial class ClickableAvatar : OsuClickableContainer
     {
-        private const string default_tooltip_text = "view profile";
-
         public override LocalisableString TooltipText
         {
             get
@@ -21,7 +20,7 @@ namespace osu.Game.Users.Drawables
                 if (!Enabled.Value)
                     return string.Empty;
 
-                return ShowUsernameTooltip ? (user?.Username ?? string.Empty) : default_tooltip_text;
+                return ShowUsernameTooltip ? (user?.Username ?? string.Empty) : ContextMenuStrings.ViewProfile;
             }
             set => throw new NotSupportedException();
         }

From ae9c901b94201de270a3c2fd6ccdbed59107da05 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Sun, 3 Sep 2023 01:45:22 -0400
Subject: [PATCH 0406/2296] Fix `BeatmapInfoWedge` tests failing due to BPM

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index a470ed47d4..7cd4f06bce 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -15,6 +15,7 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
@@ -188,7 +189,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             AddUntilStep($"displayed bpm is {target}", () =>
             {
-                var label = infoWedge.DisplayedContent.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Single(l => l.Statistic.Name == "BPM");
+                var label = infoWedge.DisplayedContent.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Single(l => l.Statistic.Name == BeatmapsetsStrings.ShowStatsBpm);
                 return label.Statistic.Content == target;
             });
         }

From 079792644886a6c57fb03eee397d9594419e5847 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 3 Sep 2023 12:19:03 +0300
Subject: [PATCH 0407/2296] Update VerticalAttributeDisplay.cs

---
 osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index 2ad420657c..95d979ebd2 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -12,7 +12,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 
-
 namespace osu.Game.Overlays.Mods
 {
     public partial class VerticalAttributeDisplay : Container, IHasCurrentValue<double>

From 8281ed5173af43556f8b2e5ba937a2e66eff7f3a Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 3 Sep 2023 14:51:53 +0300
Subject: [PATCH 0408/2296] Fixed "no animations" issue

---
 osu.Game/Overlays/Mods/ModMapInfoContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
index 378e6f6057..281fe8abe5 100644
--- a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
+++ b/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Overlays.Mods
             const float corner_radius = 7;
             const float border_thickness = 2;
 
+            AutoSizeAxes = Axes.Both;
             InternalChild = content = new InputBlockingContainer
             {
                 Origin = Anchor.BottomRight,

From b17a55d6a84aba14c6387a03d64053f5b82d4751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=E1=BB=93=20Nguy=C3=AAn=20Minh?= <honguyenminh@outlook.com>
Date: Mon, 4 Sep 2023 10:43:05 +0700
Subject: [PATCH 0409/2296] Add length check for slider velocity

---
 .../Edit/Compose/Components/Timeline/DifficultyPointPiece.cs     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 173a665d5c..366518eb58 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -177,6 +177,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             AddHeader("Final velocity");
             AddValue($"{beatmapVelocity * current.Value:#,0.00}x");
 
+            if (sliderVelocities.Length == 0) return;
             if (sliderVelocities.First() != sliderVelocities.Last())
             {
                 AddHeader("Beatmap velocity range");

From d5a89c4c45eddff8eb2d88cb7739c08e3260fecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=E1=BB=93=20Nguy=C3=AAn=20Minh?= <honguyenminh@outlook.com>
Date: Mon, 4 Sep 2023 13:32:42 +0700
Subject: [PATCH 0410/2296] Fix formatting

---
 .../Compose/Components/Timeline/DifficultyPointPiece.cs     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 366518eb58..99fb2ab874 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -177,7 +177,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             AddHeader("Final velocity");
             AddValue($"{beatmapVelocity * current.Value:#,0.00}x");
 
-            if (sliderVelocities.Length == 0) return;
+            if (sliderVelocities.Length == 0)
+            {
+                return;
+            }
+
             if (sliderVelocities.First() != sliderVelocities.Last())
             {
                 AddHeader("Beatmap velocity range");

From 0a1ba2ebe08877717f4617cb4d3070ea33d3b3b9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Sep 2023 15:56:32 +0900
Subject: [PATCH 0411/2296] Remove ModNoMod usage

---
 .../Mods/TestSceneManiaModDoubleTime.cs                         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index 08e83b04b5..00b79529a9 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -7,7 +7,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Replays;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Tests.Visual;
@@ -23,7 +22,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         [Test]
         public void TestHitWindowWithoutDoubleTime() => CreateModTest(new ModTestData
         {
-            Mod = new ModNoMod(),
             PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value != 1,
             Autoplay = false,
             Beatmap = new Beatmap

From 58844092d6984f96e5b7f1fd263d675979c8b879 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 4 Sep 2023 16:17:21 +0900
Subject: [PATCH 0412/2296] post a notification instead a screen

---
 .../Online/TestSceneReplayMissingBeatmap.cs   |  14 +-
 .../Database/MissingBeatmapNotification.cs    | 157 ++++++++++++++
 osu.Game/OsuGame.cs                           |   2 -
 osu.Game/Scoring/ScoreImporter.cs             |  10 +-
 osu.Game/Scoring/ScoreManager.cs              |   7 -
 .../Import/ReplayMissingBeatmapScreen.cs      | 199 ------------------
 6 files changed, 169 insertions(+), 220 deletions(-)
 create mode 100644 osu.Game/Database/MissingBeatmapNotification.cs
 delete mode 100644 osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
index eb84d80051..60197e0eb7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneReplayMissingBeatmap.cs
@@ -1,13 +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.Linq;
 using System.Net;
 using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Screens.Import;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Visual.Online
@@ -24,6 +26,12 @@ namespace osu.Game.Tests.Visual.Online
                 OnlineBeatmapSetID = 173612,
                 BeatmapSet = new APIBeatmapSet
                 {
+                    Title = "FREEDOM Dive",
+                    Artist = "xi",
+                    Covers = new BeatmapSetOnlineCovers
+                    {
+                        Card = "https://assets.ppy.sh/beatmaps/173612/covers/card@2x.jpg"
+                    },
                     OnlineID = 173612
                 }
             };
@@ -40,7 +48,7 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            AddUntilStep("Replay missing screen show", () => Game.ScreenStack.CurrentScreen.GetType() == typeof(ReplayMissingBeatmapScreen));
+            AddUntilStep("Replay missing notification show", () => Game.Notifications.ChildrenOfType<MissingBeatmapNotification>().Any());
         }
 
         [Test]
@@ -58,7 +66,7 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            AddUntilStep("Replay missing screen not show", () => Game.ScreenStack.CurrentScreen.GetType() != typeof(ReplayMissingBeatmapScreen));
+            AddUntilStep("Replay missing notification not show", () => !Game.Notifications.ChildrenOfType<MissingBeatmapNotification>().Any());
         }
 
         private void setupBeatmapResponse(APIBeatmap b)
diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
new file mode 100644
index 0000000000..2587160a57
--- /dev/null
+++ b/osu.Game/Database/MissingBeatmapNotification.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 System.IO;
+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.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
+using osu.Game.Scoring;
+using osuTK.Graphics;
+
+namespace osu.Game.Database
+{
+    public partial class MissingBeatmapNotification : ProgressNotification
+    {
+        [Resolved]
+        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
+
+        [Resolved]
+        private ScoreManager scoreManager { get; set; } = null!;
+
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        [Resolved]
+        private BeatmapSetOverlay? beatmapSetOverlay { get; set; }
+
+        private Container beatmapPanelContainer = null!;
+
+        private readonly MemoryStream scoreStream;
+
+        private readonly APIBeatmapSet beatmapSetInfo;
+
+        private BeatmapDownloadTracker? downloadTracker;
+
+        private Bindable<bool> autodownloadConfig = null!;
+
+        public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream)
+        {
+            beatmapSetInfo = beatmap.BeatmapSet!;
+
+            this.scoreStream = scoreStream;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, OsuConfigManager config)
+        {
+            autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
+
+            Text = "You do not have the required beatmap for this replay";
+
+            Content.Add(beatmapPanelContainer = new ClickableContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = 70,
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.TopLeft,
+                Action = () => beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmapSetInfo.OnlineID)
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            downloadTracker = new BeatmapDownloadTracker(beatmapSetInfo);
+            downloadTracker.State.BindValueChanged(downloadStatusChanged, true);
+
+            beatmapPanelContainer.Clear();
+            beatmapPanelContainer.Child = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                CornerRadius = 4,
+                Children = new Drawable[]
+                {
+                    downloadTracker,
+                    new DelayedLoadWrapper(() => new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.Card)
+                    {
+                        OnlineInfo = beatmapSetInfo,
+                        RelativeSizeAxes = Axes.Both
+                    })
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                        Alpha = 0.4f
+                    },
+                    new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding
+                        {
+                            Left = 10f,
+                            Top = 5f
+                        },
+                        Children = new Drawable[]
+                        {
+                            new TruncatingSpriteText
+                            {
+                                Text = beatmapSetInfo.Title,
+                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                            },
+                            new TruncatingSpriteText
+                            {
+                                Text = beatmapSetInfo.Artist,
+                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 12, italics: true),
+                                RelativeSizeAxes = Axes.X,
+                            }
+                        }
+                    },
+                    new DownloadButton
+                    {
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        Width = 50,
+                        Height = 30,
+                        Margin = new MarginPadding
+                        {
+                            Bottom = 1f
+                        },
+                        Action = () => beatmapDownloader.Download(beatmapSetInfo),
+                        State = { BindTarget = downloadTracker.State }
+                    }
+                }
+            };
+
+            if (autodownloadConfig.Value)
+                beatmapDownloader.Download(beatmapSetInfo);
+        }
+
+        private void downloadStatusChanged(ValueChangedEvent<DownloadState> status)
+        {
+            if (status.NewValue != DownloadState.LocallyAvailable)
+                return;
+
+            var importTask = new ImportTask(scoreStream, "score.osr");
+            scoreManager.Import(this, new[] { importTask });
+        }
+    }
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5d130af6d4..c60bff9e4c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -854,8 +854,6 @@ namespace osu.Game
 
             MultiplayerClient.PostNotification = n => Notifications.Post(n);
 
-            ScoreManager.Performer = this;
-
             // 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/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 5c354ac3d1..e3fce4a82a 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -10,7 +10,6 @@ using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.IO.Archives;
@@ -21,8 +20,6 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens;
-using osu.Game.Screens.Import;
 using Realms;
 
 namespace osu.Game.Scoring
@@ -31,8 +28,6 @@ namespace osu.Game.Scoring
     {
         public override IEnumerable<string> HandledExtensions => new[] { ".osr" };
 
-        public IPerformFromScreenRunner? Performer { get; set; }
-
         protected override string[] HashableFileTypes => new[] { ".osr" };
 
         private readonly RulesetStore rulesets;
@@ -69,9 +64,6 @@ namespace osu.Game.Scoring
 
         private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e, ArchiveReader archive, string name)
         {
-            if (Performer == null)
-                return;
-
             var stream = new MemoryStream();
 
             // stream will close after exception throw, so fetch the stream again.
@@ -87,7 +79,7 @@ namespace osu.Game.Scoring
 
             req.Success += res =>
             {
-                Performer.PerformFromScreen(screen => screen.Push(new ReplayMissingBeatmapScreen(res, stream)));
+                PostNotification?.Invoke(new MissingBeatmapNotification(res, stream));
             };
 
             api.Queue(req);
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 9331168ab0..31b5bd8365 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -21,7 +21,6 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Online.API;
 using osu.Game.Scoring.Legacy;
-using osu.Game.Screens;
 
 namespace osu.Game.Scoring
 {
@@ -31,12 +30,6 @@ namespace osu.Game.Scoring
         private readonly ScoreImporter scoreImporter;
         private readonly LegacyScoreExporter scoreExporter;
 
-        [CanBeNull]
-        public IPerformFromScreenRunner Performer
-        {
-            set => scoreImporter.Performer = value;
-        }
-
         public override bool PauseImports
         {
             get => base.PauseImports;
diff --git a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs b/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
deleted file mode 100644
index 614d652f47..0000000000
--- a/osu.Game/Screens/Import/ReplayMissingBeatmapScreen.cs
+++ /dev/null
@@ -1,199 +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.IO;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Audio;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables.Cards;
-using osu.Game.Configuration;
-using osu.Game.Database;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Settings;
-using osu.Game.Scoring;
-using osu.Game.Screens.Ranking;
-using osuTK;
-using Realms;
-
-namespace osu.Game.Screens.Import
-{
-    [Cached(typeof(IPreviewTrackOwner))]
-    public partial class ReplayMissingBeatmapScreen : OsuScreen, IPreviewTrackOwner
-    {
-        [Resolved]
-        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
-
-        [Resolved]
-        private ScoreManager scoreManager { get; set; } = null!;
-
-        [Resolved]
-        private RealmAccess realm { get; set; } = null!;
-
-        private IDisposable? realmSubscription;
-
-        [Cached]
-        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        [Resolved]
-        private INotificationOverlay? notificationOverlay { get; set; }
-
-        private Container beatmapPanelContainer = null!;
-        private ReplayDownloadButton replayDownloadButton = null!;
-        private SettingsCheckbox automaticDownload = null!;
-
-        private readonly MemoryStream scoreStream;
-
-        private readonly APIBeatmapSet beatmapSetInfo;
-
-        public ReplayMissingBeatmapScreen(APIBeatmap beatmap, MemoryStream scoreStream)
-        {
-            beatmapSetInfo = beatmap.BeatmapSet!;
-
-            this.scoreStream = scoreStream;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OsuConfigManager config)
-        {
-            InternalChildren = new Drawable[]
-            {
-                new Container
-                {
-                    Masking = true,
-                    CornerRadius = 20,
-                    AutoSizeAxes = Axes.Both,
-                    AutoSizeDuration = 500,
-                    AutoSizeEasing = Easing.OutQuint,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = colours.Gray5,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new FillFlowContainer
-                        {
-                            Margin = new MarginPadding(20),
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Vertical,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Spacing = new Vector2(15),
-                            Children = new Drawable[]
-                            {
-                                new OsuSpriteText
-                                {
-                                    Text = "Beatmap info",
-                                    Font = OsuFont.Default.With(size: 30),
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                },
-                                new FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Direction = FillDirection.Horizontal,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Spacing = new Vector2(15),
-                                    Children = new Drawable[]
-                                    {
-                                        beatmapPanelContainer = new Container
-                                        {
-                                            AutoSizeAxes = Axes.Both,
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                        },
-                                    }
-                                },
-                                automaticDownload = new SettingsCheckbox
-                                {
-                                    LabelText = "Automatically download beatmaps",
-                                    Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                },
-                                replayDownloadButton = new ReplayDownloadButton(new ScoreInfo())
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                },
-                            }
-                        }
-                    }
-                },
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            updateStatus();
-            realmSubscription = realm.RegisterForNotifications(
-                realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
-        }
-
-        private void updateStatus()
-        {
-            beatmapPanelContainer.Clear();
-            beatmapPanelContainer.Child = new BeatmapCardNormal(beatmapSetInfo, allowExpansion: false);
-            checkForAutomaticDownload(beatmapSetInfo);
-        }
-
-        private void checkForAutomaticDownload(APIBeatmapSet beatmap)
-        {
-            if (!automaticDownload.Current.Value)
-                return;
-
-            beatmapDownloader.Download(beatmap);
-        }
-
-        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
-        {
-            if (changes?.InsertedIndices == null) return;
-
-            if (!scoreStream.CanRead) return;
-
-            if (sender.Any(b => b.OnlineID == beatmapSetInfo.OnlineID))
-            {
-                var progressNotification = new ImportProgressNotification();
-                var importTask = new ImportTask(scoreStream, "score.osr");
-                scoreManager.Import(progressNotification, new[] { importTask })
-                            .ContinueWith(s =>
-                            {
-                                s.GetResultSafely<IEnumerable<Live<ScoreInfo>>>().FirstOrDefault()?.PerformRead(score =>
-                                {
-                                    Guid scoreid = score.ID;
-                                    Scheduler.Add(() =>
-                                    {
-                                        replayDownloadButton.Score.Value = realm.Realm.Find<ScoreInfo>(scoreid) ?? new ScoreInfo();
-                                    });
-                                });
-                            });
-
-                notificationOverlay?.Post(progressNotification);
-
-                realmSubscription?.Dispose();
-            }
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            realmSubscription?.Dispose();
-        }
-    }
-}

From 5abf271b56e24adeecffbcb60ca3edd8c62e667c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 3 Sep 2023 21:49:29 -0700
Subject: [PATCH 0413/2296] Implement beatmap options popover

---
 .../SongSelect/TestSceneSongSelectFooterV2.cs |   7 +-
 .../Select/FooterV2/BeatmapOptionsPopover.cs  | 148 ++++++++++++++++++
 .../Select/FooterV2/FooterButtonOptionsV2.cs  |  37 ++++-
 osu.Game/Screens/Select/FooterV2/FooterV2.cs  |  10 +-
 osu.Game/Screens/Select/SongSelect.cs         |  18 +--
 5 files changed, 205 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
index 72adbfc104..ed2ae67ae5 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Testing;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -37,10 +38,10 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             Children = new Drawable[]
             {
-                footer = new FooterV2
+                new PopoverContainer
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
+                    RelativeSizeAxes = Axes.Both,
+                    Child = footer = new FooterV2(),
                 },
                 overlay = new DummyOverlay()
             };
diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
new file mode 100644
index 0000000000..ec35c6ff38
--- /dev/null
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -0,0 +1,148 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.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.Input.Events;
+using osu.Framework.Localisation;
+using osu.Game.Collections;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Overlays;
+using osuTK;
+using osuTK.Graphics;
+using osuTK.Input;
+
+namespace osu.Game.Screens.Select.FooterV2
+{
+    public partial class BeatmapOptionsPopover : OsuPopover
+    {
+        private FillFlowContainer<OptionButton> buttonFlow = null!;
+        private readonly FooterButtonOptionsV2 footerButton;
+
+        public BeatmapOptionsPopover(FooterButtonOptionsV2 footerButton)
+        {
+            this.footerButton = footerButton;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours)
+        {
+            Content.Padding = new MarginPadding(5);
+
+            Child = buttonFlow = new FillFlowContainer<OptionButton>
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(3),
+            };
+
+            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
+            addButton(@"Delete all difficulties", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(), colours.Red);
+            addButton(@"Remove from unplayed", FontAwesome.Regular.TimesCircle, null);
+            addButton(@"Clear local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores());
+
+            if (songSelect != null && songSelect.AllowEditing)
+                addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit());
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(this));
+        }
+
+        private void addButton(LocalisableString text, IconUsage icon, Action? action, Color4? colour = null)
+        {
+            var button = new OptionButton
+            {
+                Text = text,
+                Icon = icon,
+                TextColour = colour,
+                Action = () =>
+                {
+                    Hide();
+                    action?.Invoke();
+                },
+            };
+
+            buttonFlow.Add(button);
+        }
+
+        private partial class OptionButton : OsuButton
+        {
+            public IconUsage Icon { get; init; }
+            public Color4? TextColour { get; init; }
+
+            public OptionButton()
+            {
+                Size = new Vector2(265, 50);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                BackgroundColour = colourProvider.Background3;
+
+                SpriteText.Colour = TextColour ?? Color4.White;
+                Content.CornerRadius = 10;
+
+                Add(new SpriteIcon
+                {
+                    Blending = BlendingParameters.Additive,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Size = new Vector2(17),
+                    X = 15,
+                    Icon = Icon,
+                    Colour = TextColour ?? Color4.White,
+                });
+            }
+
+            protected override SpriteText CreateText() => new OsuSpriteText
+            {
+                Depth = -1,
+                Origin = Anchor.CentreLeft,
+                Anchor = Anchor.CentreLeft,
+                X = 40
+            };
+        }
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            // don't absorb control as ToolbarRulesetSelector uses control + number to navigate
+            if (e.ControlPressed) return false;
+
+            if (!e.Repeat && e.Key >= Key.Number1 && e.Key <= Key.Number9)
+            {
+                int requested = e.Key - Key.Number1;
+
+                OptionButton? found = buttonFlow.Children.ElementAtOrDefault(requested);
+
+                if (found != null)
+                {
+                    found.TriggerClick();
+                    return true;
+                }
+            }
+
+            return base.OnKeyDown(e);
+        }
+
+        protected override void UpdateState(ValueChangedEvent<Visibility> state)
+        {
+            base.UpdateState(state);
+
+            if (state.NewValue == Visibility.Hidden)
+                footerButton.IsActive.Value = false;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs b/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs
index 87cca0042a..a1559d32dc 100644
--- a/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs
+++ b/osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.cs
@@ -2,14 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select.FooterV2
 {
-    public partial class FooterButtonOptionsV2 : FooterButtonV2
+    public partial class FooterButtonOptionsV2 : FooterButtonV2, IHasPopover
     {
+        public readonly BindableBool IsActive = new BindableBool();
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colour)
         {
@@ -17,6 +24,34 @@ namespace osu.Game.Screens.Select.FooterV2
             Icon = FontAwesome.Solid.Cog;
             AccentColour = colour.Purple1;
             Hotkey = GlobalAction.ToggleBeatmapOptions;
+
+            Action = () => IsActive.Toggle();
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            IsActive.BindValueChanged(active =>
+            {
+                OverlayState.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
+            });
+
+            OverlayState.BindValueChanged(state =>
+            {
+                switch (state.NewValue)
+                {
+                    case Visibility.Hidden:
+                        this.HidePopover();
+                        break;
+
+                    case Visibility.Visible:
+                        this.ShowPopover();
+                        break;
+                }
+            });
+        }
+
+        public Popover GetPopover() => new BeatmapOptionsPopover(this);
     }
 }
diff --git a/osu.Game/Screens/Select/FooterV2/FooterV2.cs b/osu.Game/Screens/Select/FooterV2/FooterV2.cs
index cd95f3eb6c..0529f0d082 100644
--- a/osu.Game/Screens/Select/FooterV2/FooterV2.cs
+++ b/osu.Game/Screens/Select/FooterV2/FooterV2.cs
@@ -48,11 +48,17 @@ namespace osu.Game.Screens.Select.FooterV2
 
         private FillFlowContainer<FooterButtonV2> buttons = null!;
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        public FooterV2()
         {
             RelativeSizeAxes = Axes.X;
             Height = height;
+            Anchor = Anchor.BottomLeft;
+            Origin = Anchor.BottomLeft;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
             InternalChildren = new Drawable[]
             {
                 new Box
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 58755878d0..4ce7a6167e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -311,9 +311,9 @@ namespace osu.Game.Screens.Select
                     Footer.AddButton(button, overlay);
 
                 BeatmapOptions.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, () => manageCollectionsDialog?.Show());
-                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo));
+                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, DeleteBeatmap);
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
-                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo));
+                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, ClearScores);
             }
 
             sampleChangeDifficulty = audio.Samples.Get(@"SongSelect/select-difficulty");
@@ -916,18 +916,18 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        private void delete(BeatmapSetInfo? beatmap)
+        public void DeleteBeatmap()
         {
-            if (beatmap == null) return;
+            if (Beatmap.Value.BeatmapSetInfo == null) return;
 
-            dialogOverlay?.Push(new BeatmapDeleteDialog(beatmap));
+            dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap.Value.BeatmapSetInfo));
         }
 
-        private void clearScores(BeatmapInfo? beatmapInfo)
+        public void ClearScores()
         {
-            if (beatmapInfo == null) return;
+            if (Beatmap.Value.BeatmapInfo == null) return;
 
-            dialogOverlay?.Push(new BeatmapClearScoresDialog(beatmapInfo, () =>
+            dialogOverlay?.Push(new BeatmapClearScoresDialog(Beatmap.Value.BeatmapInfo, () =>
                 // schedule done here rather than inside the dialog as the dialog may fade out and never callback.
                 Schedule(() => BeatmapDetails.Refresh())));
         }
@@ -963,7 +963,7 @@ namespace osu.Game.Screens.Select
                     if (e.ShiftPressed)
                     {
                         if (!Beatmap.IsDefault)
-                            delete(Beatmap.Value.BeatmapSetInfo);
+                            DeleteBeatmap();
                         return true;
                     }
 

From 6c0bd13308589a8efcc2ba83738bc6ed0c2c6ca9 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 00:21:48 -0700
Subject: [PATCH 0414/2296] Add xmldoc to newly exposed methods

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4ce7a6167e..f6fc55b2a5 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -916,6 +916,9 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
+        /// <summary>
+        /// Request to delete the current beatmap.
+        /// </summary>
         public void DeleteBeatmap()
         {
             if (Beatmap.Value.BeatmapSetInfo == null) return;
@@ -923,6 +926,9 @@ namespace osu.Game.Screens.Select
             dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap.Value.BeatmapSetInfo));
         }
 
+        /// <summary>
+        /// Request to clear the scores of the current beatmap.
+        /// </summary>
         public void ClearScores()
         {
             if (Beatmap.Value.BeatmapInfo == null) return;

From 3decadaf519c26a6c4b941d065d41ce441589821 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 4 Sep 2023 16:18:14 +0900
Subject: [PATCH 0415/2296] use realm query

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 3 ++-
 osu.Game/Beatmaps/WorkingBeatmapCache.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index d71d7b7f67..1f551f1218 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -26,6 +26,7 @@ using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osu.Game.Utils;
+using Realms;
 
 namespace osu.Game.Beatmaps
 {
@@ -284,7 +285,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>The first result for the provided query, or null if no results were found.</returns>
-        public BeatmapInfo? QueryBeatmap(Expression<Func<BeatmapInfo, bool>> query) => Realm.Run(r => r.All<BeatmapInfo>().FirstOrDefault(query)?.Detach());
+        public BeatmapInfo? QueryBeatmap(Expression<Func<BeatmapInfo, bool>> query) => Realm.Run(r => r.All<BeatmapInfo>().Filter($"{nameof(BeatmapInfo.BeatmapSet)}.{nameof(BeatmapSetInfo.DeletePending)} == false").FirstOrDefault(query)?.Detach());
 
         /// <summary>
         /// A default representation of a WorkingBeatmap to use when no beatmap is available.
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index c06f4da4ae..78eed626f2 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Beatmaps
 
         public virtual WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo)
         {
-            if (beatmapInfo?.BeatmapSet == null || beatmapInfo.BeatmapSet?.DeletePending == true)
+            if (beatmapInfo?.BeatmapSet == null)
                 return DefaultBeatmap;
 
             lock (workingCache)

From 164f61f59034f2d713cdb4676f7327a4f41b512f Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 4 Sep 2023 17:14:04 +0900
Subject: [PATCH 0416/2296] clean up

---
 .../Database/MissingBeatmapNotification.cs    | 53 +++++++------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 2587160a57..7a39c6307b 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -7,6 +7,7 @@ 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.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Configuration;
@@ -30,21 +31,12 @@ namespace osu.Game.Database
         [Resolved]
         private ScoreManager scoreManager { get; set; } = null!;
 
-        [Cached]
-        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        [Resolved]
-        private BeatmapSetOverlay? beatmapSetOverlay { get; set; }
-
-        private Container beatmapPanelContainer = null!;
-
         private readonly MemoryStream scoreStream;
 
         private readonly APIBeatmapSet beatmapSetInfo;
 
-        private BeatmapDownloadTracker? downloadTracker;
-
         private Bindable<bool> autodownloadConfig = null!;
+        private Bindable<bool> noVideoSetting = null!;
 
         public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream)
         {
@@ -54,35 +46,25 @@ namespace osu.Game.Database
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OsuConfigManager config)
+        private void load(OsuConfigManager config, BeatmapSetOverlay? beatmapSetOverlay)
         {
+            BeatmapDownloadTracker downloadTracker = new BeatmapDownloadTracker(beatmapSetInfo);
+            downloadTracker.State.BindValueChanged(downloadStatusChanged);
+
             autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
+            noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
             Text = "You do not have the required beatmap for this replay";
 
-            Content.Add(beatmapPanelContainer = new ClickableContainer
+            Content.Add(new ClickableContainer
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 70,
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.TopLeft,
-                Action = () => beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmapSetInfo.OnlineID)
-            });
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            downloadTracker = new BeatmapDownloadTracker(beatmapSetInfo);
-            downloadTracker.State.BindValueChanged(downloadStatusChanged, true);
-
-            beatmapPanelContainer.Clear();
-            beatmapPanelContainer.Child = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Masking = true,
                 CornerRadius = 4,
+                Masking = true,
+                Action = () => beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmapSetInfo.OnlineID),
                 Children = new Drawable[]
                 {
                     downloadTracker,
@@ -125,7 +107,7 @@ namespace osu.Game.Database
                             }
                         }
                     },
-                    new DownloadButton
+                    new BeatmapDownloadButton(beatmapSetInfo)
                     {
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
@@ -134,15 +116,18 @@ namespace osu.Game.Database
                         Margin = new MarginPadding
                         {
                             Bottom = 1f
-                        },
-                        Action = () => beatmapDownloader.Download(beatmapSetInfo),
-                        State = { BindTarget = downloadTracker.State }
+                        }
                     }
                 }
-            };
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             if (autodownloadConfig.Value)
-                beatmapDownloader.Download(beatmapSetInfo);
+                beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
         }
 
         private void downloadStatusChanged(ValueChangedEvent<DownloadState> status)

From f68a12003a6df0dc32d9eefc391ec5228d1e9ddf Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 4 Sep 2023 17:37:31 +0900
Subject: [PATCH 0417/2296] check beatmap hash before try to import

---
 .../Database/MissingBeatmapNotification.cs    | 33 ++++++++++++++-----
 osu.Game/Scoring/ScoreImporter.cs             |  2 +-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 7a39c6307b..92b33e20be 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -2,18 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.IO;
+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;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
@@ -31,31 +30,43 @@ namespace osu.Game.Database
         [Resolved]
         private ScoreManager scoreManager { get; set; } = null!;
 
-        private readonly MemoryStream scoreStream;
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
 
+        private readonly MemoryStream scoreStream;
         private readonly APIBeatmapSet beatmapSetInfo;
+        private readonly string beatmapHash;
 
         private Bindable<bool> autodownloadConfig = null!;
         private Bindable<bool> noVideoSetting = null!;
 
-        public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream)
+        public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream, string beatmapHash)
         {
             beatmapSetInfo = beatmap.BeatmapSet!;
 
+            this.beatmapHash = beatmapHash;
             this.scoreStream = scoreStream;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, BeatmapSetOverlay? beatmapSetOverlay)
         {
+            Text = "You do not have the required beatmap for this replay";
+
+            realm.Run(r =>
+            {
+                if (r.All<BeatmapSetInfo>().Any(s => s.OnlineID == beatmapSetInfo.OnlineID))
+                {
+                    Text = "You have the corresponding beatmapset but no beatmap, you may need to update the beatmap.";
+                }
+            });
+
             BeatmapDownloadTracker downloadTracker = new BeatmapDownloadTracker(beatmapSetInfo);
             downloadTracker.State.BindValueChanged(downloadStatusChanged);
 
             autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
             noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
-            Text = "You do not have the required beatmap for this replay";
-
             Content.Add(new ClickableContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -135,8 +146,14 @@ namespace osu.Game.Database
             if (status.NewValue != DownloadState.LocallyAvailable)
                 return;
 
-            var importTask = new ImportTask(scoreStream, "score.osr");
-            scoreManager.Import(this, new[] { importTask });
+            realm.Run(r =>
+            {
+                if (r.All<BeatmapInfo>().Any(s => s.MD5Hash == beatmapHash))
+                {
+                    var importTask = new ImportTask(scoreStream, "score.osr");
+                    scoreManager.Import(this, new[] { importTask });
+                }
+            });
         }
     }
 }
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index e3fce4a82a..650e25a512 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Scoring
 
             req.Success += res =>
             {
-                PostNotification?.Invoke(new MissingBeatmapNotification(res, stream));
+                PostNotification?.Invoke(new MissingBeatmapNotification(res, stream, e.Hash));
             };
 
             api.Queue(req);

From 87aa191c121214c18e0a4270e7f20f856da40ab2 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 4 Sep 2023 17:53:12 +0900
Subject: [PATCH 0418/2296] use realm Subscription instead of Beatmap Download
 Tracker

---
 .../Database/MissingBeatmapNotification.cs    | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 92b33e20be..86522d0864 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.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.IO;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -13,12 +14,12 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 using osuTK.Graphics;
+using Realms;
 
 namespace osu.Game.Database
 {
@@ -40,6 +41,8 @@ namespace osu.Game.Database
         private Bindable<bool> autodownloadConfig = null!;
         private Bindable<bool> noVideoSetting = null!;
 
+        private IDisposable? realmSubscription;
+
         public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream, string beatmapHash)
         {
             beatmapSetInfo = beatmap.BeatmapSet!;
@@ -53,17 +56,17 @@ namespace osu.Game.Database
         {
             Text = "You do not have the required beatmap for this replay";
 
+            realmSubscription = realm.RegisterForNotifications(
+                realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
+
             realm.Run(r =>
             {
-                if (r.All<BeatmapSetInfo>().Any(s => s.OnlineID == beatmapSetInfo.OnlineID))
+                if (r.All<BeatmapSetInfo>().Any(s => !s.DeletePending && s.OnlineID == beatmapSetInfo.OnlineID))
                 {
-                    Text = "You have the corresponding beatmapset but no beatmap, you may need to update the beatmap.";
+                    Text = "You have the corresponding beatmapset but no beatmap, you may need to update the beatmapset.";
                 }
             });
 
-            BeatmapDownloadTracker downloadTracker = new BeatmapDownloadTracker(beatmapSetInfo);
-            downloadTracker.State.BindValueChanged(downloadStatusChanged);
-
             autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
             noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
@@ -78,7 +81,6 @@ namespace osu.Game.Database
                 Action = () => beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmapSetInfo.OnlineID),
                 Children = new Drawable[]
                 {
-                    downloadTracker,
                     new DelayedLoadWrapper(() => new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.Card)
                     {
                         OnlineInfo = beatmapSetInfo,
@@ -141,19 +143,16 @@ namespace osu.Game.Database
                 beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
         }
 
-        private void downloadStatusChanged(ValueChangedEvent<DownloadState> status)
+        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
         {
-            if (status.NewValue != DownloadState.LocallyAvailable)
-                return;
+            if (changes?.InsertedIndices == null) return;
 
-            realm.Run(r =>
+            if (sender.Any(s => s.Beatmaps.Any(b => b.MD5Hash == beatmapHash)))
             {
-                if (r.All<BeatmapInfo>().Any(s => s.MD5Hash == beatmapHash))
-                {
-                    var importTask = new ImportTask(scoreStream, "score.osr");
-                    scoreManager.Import(this, new[] { importTask });
-                }
-            });
+                var importTask = new ImportTask(scoreStream, "score.osr");
+                scoreManager.Import(this, new[] { importTask });
+                realmSubscription?.Dispose();
+            }
         }
     }
 }

From fd1fce486a18c6b12859b3fa197c707bac583751 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 5 Sep 2023 00:21:08 +0900
Subject: [PATCH 0419/2296] ensure dispose realmSubscription

---
 osu.Game/Database/MissingBeatmapNotification.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 86522d0864..d6674b9434 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -154,5 +154,11 @@ namespace osu.Game.Database
                 realmSubscription?.Dispose();
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            realmSubscription?.Dispose();
+        }
     }
 }

From f616648730ac9fd438cc2d15aeb7eb065f875cae Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 09:40:35 -0700
Subject: [PATCH 0420/2296] Remove icon blending

---
 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index ec35c6ff38..4e1334fd11 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -97,7 +97,6 @@ namespace osu.Game.Screens.Select.FooterV2
 
                 Add(new SpriteIcon
                 {
-                    Blending = BlendingParameters.Additive,
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     Size = new Vector2(17),

From bf71099e5743efb966482d5b145a551b0208729f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 11:34:21 -0700
Subject: [PATCH 0421/2296] Fix truncating sprite text usage

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index b7b60cffab..7821aa5be0 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -280,15 +280,14 @@ namespace osu.Game.Screens.Select
                         RelativeSizeAxes = Axes.X,
                         Children = new Drawable[]
                         {
-                            TitleLabel = new OsuSpriteText
+                            TitleLabel = new TruncatingSpriteText
                             {
                                 Shadow = true,
                                 Current = { BindTarget = titleBinding },
                                 Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true
                             },
-                            ArtistLabel = new OsuSpriteText
+                            ArtistLabel = new TruncatingSpriteText
                             {
                                 // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
                                 Shadow = true,
@@ -296,7 +295,6 @@ namespace osu.Game.Screens.Select
                                 // Not sure if this should be semi bold or medium
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
-                                Truncate = true
                             }
                         }
                     }

From e8a793425bf28e19ba3667c8c712c4db96fc09fa Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 12:38:40 -0700
Subject: [PATCH 0422/2296] Use right padding instead of negative x offset

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 7821aa5be0..284f14cd9e 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -155,18 +155,21 @@ namespace osu.Game.Screens.Select
 
                 LoadComponentAsync(loadingInfo = new Container
                 {
-                    Masking = true,
-                    // We offset this by the portion of the colour bar underneath we wish to show
-                    X = -colour_bar_width,
-                    CornerRadius = corner_radius,
+                    Padding = new MarginPadding { Right = colour_bar_width },
                     RelativeSizeAxes = Axes.Both,
                     Depth = DisplayedContent?.Depth + 1 ?? 0,
-                    Children = new Drawable[]
+                    Child = new Container
                     {
-                        // TODO: New wedge design uses a coloured horizontal gradient for its background, however this lacks implementation information in the figma draft.
-                        // pending https://www.figma.com/file/DXKwqZhD5yyb1igc3mKo1P?node-id=2980:3361#340801912 being answered.
-                        new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
-                        Info = new WedgeInfoText(beatmap) { Shear = -Shear }
+                        Masking = true,
+                        CornerRadius = corner_radius,
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            // TODO: New wedge design uses a coloured horizontal gradient for its background, however this lacks implementation information in the figma draft.
+                            // pending https://www.figma.com/file/DXKwqZhD5yyb1igc3mKo1P?node-id=2980:3361#340801912 being answered.
+                            new BeatmapInfoWedgeBackground(beatmap) { Shear = -Shear },
+                            Info = new WedgeInfoText(beatmap) { Shear = -Shear }
+                        }
                     }
                 }, loaded =>
                 {

From 2df20027355ddbf24bd43401ef5feabf5a7e1823 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 12:42:01 -0700
Subject: [PATCH 0423/2296] Move negative corner radius margin to constructor

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs    | 16 ++++++++++------
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs    |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 09b93119cc..ae5b739c4d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -50,13 +50,17 @@ namespace osu.Game.Tests.Visual.SongSelect
                     RelativeSizeAxes = Axes.X,
                     Margin = new MarginPadding { Top = 20, Left = -10 }
                 },
-                infoWedge = new TestBeatmapInfoWedgeV2
+                new Container
                 {
-                    State = { Value = Visibility.Visible },
-                    Width = 0.6f,
-                    RelativeSizeAxes = Axes.X,
-                    Margin = new MarginPadding { Top = 20, Left = -10 }
-                },
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Top = 20 },
+                    Child = infoWedge = new TestBeatmapInfoWedgeV2
+                    {
+                        State = { Value = Visibility.Visible },
+                        Width = 0.6f,
+                        RelativeSizeAxes = Axes.X,
+                    },
+                }
             });
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 284f14cd9e..742d9011b9 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -55,6 +55,7 @@ namespace osu.Game.Screens.Select
             Height = WEDGE_HEIGHT;
             Shear = wedged_container_shear;
             Masking = true;
+            Margin = new MarginPadding { Left = -corner_radius };
             EdgeEffect = new EdgeEffectParameters
             {
                 Colour = Colour4.Black.Opacity(0.2f),

From e70510ef191ef345eee35b490a12118fbb29a755 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 12:56:20 -0700
Subject: [PATCH 0424/2296] Move drawable and binding logic to standard places

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 742d9011b9..de3e634819 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -46,9 +46,9 @@ namespace osu.Game.Screens.Select
 
         protected WedgeInfoText? Info { get; private set; }
 
-        private readonly Container difficultyColourBar;
-        private readonly StarCounter starCounter;
-        private readonly BufferedContainer bufferedContent;
+        private Container difficultyColourBar = null!;
+        private StarCounter starCounter = null!;
+        private BufferedContainer bufferedContent = null!;
 
         public BeatmapInfoWedgeV2()
         {
@@ -63,7 +63,11 @@ namespace osu.Game.Screens.Select
                 Radius = 3,
             };
             CornerRadius = corner_radius;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             // We want to buffer the wedge to avoid weird transparency overlaps between the colour bar and the background.
             Child = bufferedContent = new BufferedContainer(pixelSnapping: true)
             {
@@ -107,9 +111,10 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             ruleset.BindValueChanged(_ => updateDisplay());
         }
 
@@ -228,6 +233,8 @@ namespace osu.Game.Screens.Select
             public WedgeInfoText(WorkingBeatmap working)
             {
                 this.working = working;
+
+                RelativeSizeAxes = Axes.Both;
             }
 
             [BackgroundDependencyLoader]
@@ -236,8 +243,6 @@ namespace osu.Game.Screens.Select
                 var beatmapInfo = working.BeatmapInfo;
                 var metadata = working.Metadata;
 
-                RelativeSizeAxes = Axes.Both;
-
                 titleBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
                 artistBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
 

From 82fb9dc2ef5eb03f2db25426f11a19f836e62f68 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 12:59:21 -0700
Subject: [PATCH 0425/2296] Simplify text initialization

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index de3e634819..fd655c50ca 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -212,9 +212,6 @@ namespace osu.Game.Screens.Select
 
             private StarRatingDisplay starRatingDisplay = null!;
 
-            private ILocalisedBindableString titleBinding = null!;
-            private ILocalisedBindableString artistBinding = null!;
-
             private readonly WorkingBeatmap working;
 
             public IBindable<double> DisplayedStars => starRatingDisplay.DisplayedStars;
@@ -238,14 +235,11 @@ namespace osu.Game.Screens.Select
             }
 
             [BackgroundDependencyLoader]
-            private void load(LocalisationManager localisation)
+            private void load()
             {
                 var beatmapInfo = working.BeatmapInfo;
                 var metadata = working.Metadata;
 
-                titleBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
-                artistBinding = localisation.GetLocalisedBindableString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
-
                 Children = new Drawable[]
                 {
                     new FillFlowContainer
@@ -292,7 +286,7 @@ namespace osu.Game.Screens.Select
                             TitleLabel = new TruncatingSpriteText
                             {
                                 Shadow = true,
-                                Current = { BindTarget = titleBinding },
+                                Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
                                 Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,
                             },
@@ -300,7 +294,7 @@ namespace osu.Game.Screens.Select
                             {
                                 // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
                                 Shadow = true,
-                                Current = { BindTarget = artistBinding },
+                                Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
                                 // Not sure if this should be semi bold or medium
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                 RelativeSizeAxes = Axes.X,

From e0a9c7e9a9680004b98a8086354fb758b65daa51 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 14:54:58 -0700
Subject: [PATCH 0426/2296] Fix wedge showing abruptly in test

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index ae5b739c4d..3236841dc3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Padding = new MarginPadding { Top = 20 },
                     Child = infoWedge = new TestBeatmapInfoWedgeV2
                     {
-                        State = { Value = Visibility.Visible },
                         Width = 0.6f,
                         RelativeSizeAxes = Axes.X,
                     },
@@ -165,6 +164,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 containerBefore = infoWedge.DisplayedContent;
                 infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
+                infoWedge.Show();
             });
 
             AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);

From 854bb323cc09e0a296ebd2ca948e4a6074950044 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 15:02:00 -0700
Subject: [PATCH 0427/2296] Remove weird red edge effect visibility

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 3236841dc3..827d23c0fc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -7,7 +7,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
@@ -94,17 +93,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestWedgeVisibility()
         {
-            // Mostly just in case someone runs this test before others,
-            // leading to the shadow being very hard to see if it is black
-            AddStep("make shadow red for test visibility", () =>
-            {
-                infoWedge.EdgeEffect = new EdgeEffectParameters
-                {
-                    Colour = Colour4.Red,
-                    Type = EdgeEffectType.Shadow,
-                    Radius = 5,
-                };
-            });
             AddStep("hide", () => { infoWedge.Hide(); });
             AddWaitStep("wait for hide", 3);
             AddAssert("check visibility", () => infoWedge.Alpha == 0);

From 9accd0ded262e451792a10013762e442b5523441 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 15:02:38 -0700
Subject: [PATCH 0428/2296] Fix star rating rolling counter regression

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index fd655c50ca..5316b4620b 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -314,7 +314,7 @@ namespace osu.Game.Screens.Select
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
-                    if (starRatingDisplay.Alpha > 0)
+                    if (!starRatingDisplay.IsPresent)
                         starRatingDisplay.FinishTransforms(true);
 
                     starRatingDisplay.FadeIn(transition_duration);

From 98d027d207143532178e4588c279368abb391d8b Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 21:34:53 -0700
Subject: [PATCH 0429/2296] Fix star counter animating weird and delayed

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 5316b4620b..de930ff837 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -187,11 +187,16 @@ namespace osu.Game.Screens.Select
 
                     Info.DisplayedStars.BindValueChanged(s =>
                     {
-                        starCounter.Current = (float)s.NewValue;
                         starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
 
                         difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
                     }, true);
+
+                    Info.ActualStars.BindValueChanged(s =>
+                    {
+                        // use actual stars as star counter has its own animation
+                        starCounter.Current = (float)s.NewValue;
+                    });
                 });
             });
 
@@ -215,6 +220,7 @@ namespace osu.Game.Screens.Select
             private readonly WorkingBeatmap working;
 
             public IBindable<double> DisplayedStars => starRatingDisplay.DisplayedStars;
+            public Bindable<double> ActualStars = new Bindable<double>();
 
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
@@ -312,6 +318,7 @@ namespace osu.Game.Screens.Select
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
+                    ActualStars.Value = s.NewValue?.Stars ?? 0;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
                     if (!starRatingDisplay.IsPresent)

From 94516133912a4c32048dddc52c53fb9696bb0477 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 4 Sep 2023 21:39:26 -0700
Subject: [PATCH 0430/2296] Rename null beatmap test to indicate there's a
 background

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index 827d23c0fc..a8484caf1c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        public void TestNullBeatmap()
+        public void TestNullBeatmapWithBackground()
         {
             selectBeatmap(null);
             AddAssert("check default title", () => infoWedge.Info!.TitleLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Title);

From 1215ad7ace400cb404121d9a8ead9ac81f2ad2a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 15:40:00 +0900
Subject: [PATCH 0431/2296] Update framework

---
 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 2d15bce85a..2bfdce5ab8 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.823.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.904.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cd57c33109..052528f93b 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="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.823.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.904.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.822.0" />
     <PackageReference Include="Sentry" Version="3.28.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index d515a035da..760ea2e31e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.823.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.904.0" />
   </ItemGroup>
 </Project>

From a8c9c2bf17e7c1ecaf00fb5061e35b793c2b28de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 15:45:13 +0900
Subject: [PATCH 0432/2296] Remove buffered container (doesn't seem like it's
 doing anything anymore)

---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index de930ff837..0ebd875cbe 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Select
 
         private Container difficultyColourBar = null!;
         private StarCounter starCounter = null!;
-        private BufferedContainer bufferedContent = null!;
+        private Container content = null!;
 
         public BeatmapInfoWedgeV2()
         {
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             // We want to buffer the wedge to avoid weird transparency overlaps between the colour bar and the background.
-            Child = bufferedContent = new BufferedContainer(pixelSnapping: true)
+            Child = content = new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
@@ -177,13 +177,13 @@ namespace osu.Game.Screens.Select
                             Info = new WedgeInfoText(beatmap) { Shear = -Shear }
                         }
                     }
-                }, loaded =>
+                }, d =>
                 {
                     // Ensure we are the most recent loaded wedge.
-                    if (loaded != loadingInfo) return;
+                    if (d != loadingInfo) return;
 
                     removeOldInfo();
-                    bufferedContent.Add(DisplayedContent = loaded);
+                    content.Add(DisplayedContent = d);
 
                     Info.DisplayedStars.BindValueChanged(s =>
                     {

From 340edf68d3555ecf852221b6728933175fbd5afa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 15:58:53 +0900
Subject: [PATCH 0433/2296] Fix test scene not updating all star counters

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index a8484caf1c..a7070f845e 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -63,6 +63,12 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
             {
+                // Difficulty cache lookup is a pain in the ass to work with.
+                // This logic is ugly and needs to be reconsidered.
+
+                if (infoWedge.Info != null)
+                    infoWedge.Info!.ActualStars.Value = v;
+
                 foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
                     hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
             });

From 4ff3630484cbf09d562de96ab5e0eb2bbbb1d3e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 16:14:01 +0900
Subject: [PATCH 0434/2296] Add a slight delay before hiding the popover to
 better visualise button click

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

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 4e1334fd11..aa338c4496 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Select.FooterV2
                 TextColour = colour,
                 Action = () =>
                 {
-                    Hide();
+                    Scheduler.AddDelayed(Hide, 50);
                     action?.Invoke();
                 },
             };

From 02fefff5e7b09d070ed4e2616ea449f7b1fde39f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 16:44:22 +0900
Subject: [PATCH 0435/2296] Add better testing of options popover

---
 .../SongSelect/TestSceneSongSelectFooterV2.cs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
index ed2ae67ae5..013bad55bc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Testing;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Select.FooterV2;
 using osuTK.Input;
 
@@ -57,6 +58,24 @@ namespace osu.Game.Tests.Visual.SongSelect
             overlay.Hide();
         });
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("set beatmap", () => Beatmap.Value = CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)));
+        }
+
+        [Test]
+        public void TestShowOptions()
+        {
+            AddStep("enable options", () =>
+            {
+                var optionsButton = this.ChildrenOfType<FooterButtonV2>().Last();
+
+                optionsButton.Enabled.Value = true;
+                optionsButton.TriggerClick();
+            });
+        }
+
         [Test]
         public void TestState()
         {

From 84d8d33ad723c5fbeb6a3a49787964bc88ba589b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 16:44:55 +0900
Subject: [PATCH 0436/2296] Add headers and generally improve the UI of the
 popover

---
 .../Select/FooterV2/BeatmapOptionsPopover.cs  | 60 ++++++++++++++++---
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index aa338c4496..3e37bdc2ea 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -10,8 +10,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
@@ -24,33 +26,48 @@ namespace osu.Game.Screens.Select.FooterV2
 {
     public partial class BeatmapOptionsPopover : OsuPopover
     {
-        private FillFlowContainer<OptionButton> buttonFlow = null!;
+        private FillFlowContainer buttonFlow = null!;
         private readonly FooterButtonOptionsV2 footerButton;
 
+        private WorkingBeatmap beatmapWhenOpening = null!;
+
         public BeatmapOptionsPopover(FooterButtonOptionsV2 footerButton)
         {
             this.footerButton = footerButton;
         }
 
         [BackgroundDependencyLoader]
-        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours)
+        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours, IBindable<WorkingBeatmap> beatmap)
         {
             Content.Padding = new MarginPadding(5);
 
-            Child = buttonFlow = new FillFlowContainer<OptionButton>
+            Child = buttonFlow = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
                 Spacing = new Vector2(3),
             };
 
-            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
-            addButton(@"Delete all difficulties", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(), colours.Red);
-            addButton(@"Remove from unplayed", FontAwesome.Regular.TimesCircle, null);
-            addButton(@"Clear local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores());
+            beatmapWhenOpening = beatmap.Value;
+
+            addHeader("For all difficulties", beatmapWhenOpening.BeatmapSetInfo.ToString());
+
+            addButton(@"Delete beatmap", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(), colours.Red1);
+
+            addHeader("For selected difficulty", beatmapWhenOpening.BeatmapInfo.DifficultyName);
+
+            // TODO: make work, and make show "unplayed" or "played" based on status.
+            addButton(@"Mark as played", FontAwesome.Regular.TimesCircle, null);
+
+            addButton(@"Hide", FontAwesome.Solid.Magic, null);
+            addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
                 addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit());
+
+            addHeader("General");
+
+            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
         }
 
         protected override void LoadComplete()
@@ -60,6 +77,33 @@ namespace osu.Game.Screens.Select.FooterV2
             ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(this));
         }
 
+        [Resolved]
+        private OverlayColourProvider overlayColourProvider { get; set; } = null!;
+
+        private void addHeader(string text, string? context = null)
+        {
+            var textFlow = new OsuTextFlowContainer
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Padding = new MarginPadding(10),
+            };
+
+            textFlow.AddText(text, t => t.Font = OsuFont.Default.With(weight: FontWeight.SemiBold));
+
+            if (context != null)
+            {
+                textFlow.NewLine();
+                textFlow.AddText(context, t =>
+                {
+                    t.Colour = overlayColourProvider.Content2;
+                    t.Font = t.Font.With(size: 13);
+                });
+            }
+
+            buttonFlow.Add(textFlow);
+        }
+
         private void addButton(LocalisableString text, IconUsage icon, Action? action, Color4? colour = null)
         {
             var button = new OptionButton
@@ -124,7 +168,7 @@ namespace osu.Game.Screens.Select.FooterV2
             {
                 int requested = e.Key - Key.Number1;
 
-                OptionButton? found = buttonFlow.Children.ElementAtOrDefault(requested);
+                OptionButton? found = buttonFlow.Children.OfType<OptionButton>().ElementAtOrDefault(requested);
 
                 if (found != null)
                 {

From 4cd4eb3b0a2aec1683efa72ab73d5ad7d449385f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 16:46:49 +0900
Subject: [PATCH 0437/2296] Move "general" to top for key binding compatibility

---
 .../Screens/Select/FooterV2/BeatmapOptionsPopover.cs   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 3e37bdc2ea..550b3e5cf6 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -50,24 +50,20 @@ namespace osu.Game.Screens.Select.FooterV2
 
             beatmapWhenOpening = beatmap.Value;
 
-            addHeader("For all difficulties", beatmapWhenOpening.BeatmapSetInfo.ToString());
+            addHeader("General");
+            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
 
+            addHeader("For all difficulties", beatmapWhenOpening.BeatmapSetInfo.ToString());
             addButton(@"Delete beatmap", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(), colours.Red1);
 
             addHeader("For selected difficulty", beatmapWhenOpening.BeatmapInfo.DifficultyName);
-
             // TODO: make work, and make show "unplayed" or "played" based on status.
             addButton(@"Mark as played", FontAwesome.Regular.TimesCircle, null);
-
             addButton(@"Hide", FontAwesome.Solid.Magic, null);
             addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
                 addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit());
-
-            addHeader("General");
-
-            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
         }
 
         protected override void LoadComplete()

From 691c08ebde66fbca9f078040fb2c54047a644c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Sep 2023 10:24:21 +0200
Subject: [PATCH 0438/2296] Update spectator server development endpoint URLs

With the way `dev.ppy.sh` was previously configured, the `osu-web`
`/multiplayer` routes and `osu-server-spectator` `/multiplayer` routes
would conflict with each other, with the `osu-server-spectator` route
taking precedence. This would mean that some `osu-web` pages would just
straight up not be available on dev.

To counteract this, the `osu-server-spectator` routes are now exposed
under `https://dev.ppy.sh/signalr/`. This PR updates the client-side
configuration to use these new routes.
---
 osu.Game/Online/DevelopmentEndpointConfiguration.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/DevelopmentEndpointConfiguration.cs b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
index 69276f452a..5f3c353f4d 100644
--- a/osu.Game/Online/DevelopmentEndpointConfiguration.cs
+++ b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
@@ -10,9 +10,9 @@ namespace osu.Game.Online
             WebsiteRootUrl = APIEndpointUrl = @"https://dev.ppy.sh";
             APIClientSecret = @"3LP2mhUrV89xxzD1YKNndXHEhWWCRLPNKioZ9ymT";
             APIClientID = "5";
-            SpectatorEndpointUrl = $"{APIEndpointUrl}/spectator";
-            MultiplayerEndpointUrl = $"{APIEndpointUrl}/multiplayer";
-            MetadataEndpointUrl = $"{APIEndpointUrl}/metadata";
+            SpectatorEndpointUrl = $@"{APIEndpointUrl}/signalr/spectator";
+            MultiplayerEndpointUrl = $@"{APIEndpointUrl}/signalr/multiplayer";
+            MetadataEndpointUrl = $@"{APIEndpointUrl}/signalr/metadata";
         }
     }
 }

From 96f12cfbaac4cfc0d8782de0d2890aa8b63e3fdb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 18:01:09 +0900
Subject: [PATCH 0439/2296] Update `GetTexture` signature rather than creating
 new overload

---
 .../Skinning/Legacy/LegacyBananaPiece.cs      |  5 ++--
 .../Skinning/Legacy/LegacyDropletPiece.cs     |  5 ++--
 .../Skinning/Legacy/LegacyFruitPiece.cs       |  9 ++++----
 .../LegacyMainCirclePieceTest.cs              |  5 ++--
 .../TestSceneCursorTrail.cs                   |  2 +-
 .../TestSceneGameplayCursor.cs                |  2 +-
 .../TestSceneSkinFallbacks.cs                 |  3 ++-
 .../Skinning/Legacy/LegacyMainCirclePiece.cs  |  2 +-
 .../TestSceneHitObjectAccentColour.cs         |  3 ++-
 .../Skinning/LegacySkinAnimationTest.cs       |  3 ++-
 .../TestSceneRulesetSkinProvidingContainer.cs |  3 ++-
 .../Skins/SkinDeserialisationTest.cs          |  3 ++-
 .../TestSceneBeatmapSkinLookupDisables.cs     |  4 +++-
 .../Skins/TestSceneSkinConfigurationLookup.cs |  4 +++-
 .../Skins/TestSceneSkinProvidingContainer.cs  |  3 ++-
 .../Skins/TestSceneSkinResources.cs           |  3 ++-
 .../Gameplay/TestSceneSkinnableDrawable.cs    |  6 ++---
 .../Gameplay/TestSceneSkinnableSound.cs       |  6 ++++-
 osu.Game/Screens/Edit/EditorBeatmapSkin.cs    |  6 ++++-
 osu.Game/Skinning/ArgonSkin.cs                |  3 ++-
 osu.Game/Skinning/ISkin.cs                    | 11 +++------
 osu.Game/Skinning/LegacySkin.cs               |  5 ++--
 osu.Game/Skinning/LegacySkinExtensions.cs     | 23 +++++++------------
 osu.Game/Skinning/ResourceStoreBackedSkin.cs  |  4 +++-
 osu.Game/Skinning/Skin.cs                     |  5 ++--
 osu.Game/Skinning/SkinManager.cs              |  4 +++-
 osu.Game/Skinning/SkinProvidingContainer.cs   | 11 +++++----
 osu.Game/Skinning/SkinTransformer.cs          |  5 ++--
 osu.Game/Skinning/TrianglesSkin.cs            |  3 ++-
 osu.Game/Tests/Visual/SkinnableTestScene.cs   |  6 ++---
 30 files changed, 84 insertions(+), 73 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
index 9f99e3a586..d471a7ee32 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -15,8 +14,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTextureWithMaxSize("fruit-bananas", banana_max_size);
-            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-bananas-overlay", banana_max_size);
+            Texture? texture = Skin.GetTexture("fruit-bananas", banana_max_size);
+            Texture? overlayTexture = Skin.GetTexture("fruit-bananas-overlay", banana_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index 63be1bcf91..f1b1b45288 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -20,8 +19,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTextureWithMaxSize("fruit-drop", droplet_max_size);
-            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-drop-overlay", droplet_max_size);
+            Texture? texture = Skin.GetTexture("fruit-drop", droplet_max_size);
+            Texture? overlayTexture = Skin.GetTexture("fruit-drop-overlay", droplet_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index e4d25e036b..3c853e5d3d 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -26,19 +25,19 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             switch (visualRepresentation)
             {
                 case FruitVisualRepresentation.Pear:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-pear", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-pear-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-pear", fruit_max_size), Skin.GetTexture("fruit-pear-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-grapes", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-grapes-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-grapes", fruit_max_size), Skin.GetTexture("fruit-grapes-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-apple", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-apple-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-apple", fruit_max_size), Skin.GetTexture("fruit-apple-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-orange", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-orange-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-orange", fruit_max_size), Skin.GetTexture("fruit-orange-overlay", fruit_max_size));
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
index baaa24959f..dbeae2a76e 100644
--- a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
@@ -14,6 +14,7 @@ using osu.Framework.Testing;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -77,9 +78,9 @@ namespace osu.Game.Rulesets.Osu.Tests
                 // shouldn't be required as GetTexture(string) calls GetTexture(string, WrapMode, WrapMode) by default,
                 // but moq doesn't handle that well, therefore explicitly requiring to use `CallBase`:
                 // https://github.com/moq/moq4/issues/972
-                skin.Setup(s => s.GetTexture(It.IsAny<string>())).CallBase();
+                skin.Setup(s => s.GetTexture(It.IsAny<string>(), It.IsAny<Vector2>(), It.IsAny<WrapMode>(), It.IsAny<WrapMode>())).CallBase();
 
-                skin.Setup(s => s.GetTexture(It.IsIn(textureFilenames), It.IsAny<WrapMode>(), It.IsAny<WrapMode>()))
+                skin.Setup(s => s.GetTexture(It.IsIn(textureFilenames), It.IsAny<Vector2>(), It.IsAny<WrapMode>(), It.IsAny<WrapMode>()))
                     .Returns((string componentName, WrapMode _, WrapMode _) =>
                     {
                         var tex = renderer.CreateTexture(1, 1);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index 9582ee491b..22111d4412 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => null;
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
             {
                 switch (componentName)
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index c84a6ab70f..29dffd029e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private class TopLeftCursorSkin : ISkin
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => null;
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => null;
             public ISample GetSample(ISampleInfo sampleInfo) => null;
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 09b906cb10..da959b6be0 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -25,6 +25,7 @@ using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -163,7 +164,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 };
             }
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => null;
 
             public ISample GetSample(ISampleInfo sampleInfo) => null;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 45a18152c2..cf91ac4596 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTextureWithMaxSize(circleName, circle_piece_size) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName, circle_piece_size) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index f38c2c9416..bf8f5fd1e8 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Gameplay
@@ -140,7 +141,7 @@ namespace osu.Game.Tests.Gameplay
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => throw new NotImplementedException();
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
index 197e9404ff..34ea459988 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -18,6 +18,7 @@ using osu.Framework.Timing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Tests.NonVisual.Skinning
 {
@@ -68,7 +69,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
                 this.renderer = renderer;
             }
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
             {
                 return lookup_names.Contains(componentName) ? renderer.WhitePixel : null;
             }
diff --git a/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs b/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
index 11f3fe660d..705fd19d93 100644
--- a/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osu.Game.Tests.Testing;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Tests.Rulesets
 {
@@ -80,7 +81,7 @@ namespace osu.Game.Tests.Rulesets
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => skin.GetTexture(componentName);
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => skin.GetTexture(componentName);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index 82d204f134..79ce4de720 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -16,6 +16,7 @@ using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
+using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -133,7 +134,7 @@ namespace osu.Game.Tests.Skins
             {
             }
 
-            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
index 0bbf4406fb..5144f57f8d 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -100,7 +101,8 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+                skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index 816834989c..a433b67bfb 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Visual;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Skins
@@ -223,7 +224,8 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+                skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs b/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
index df314b56a9..4acd127a58 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
@@ -16,6 +16,7 @@ using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -89,7 +90,7 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => throw new System.NotImplementedException();
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
             {
                 if (componentName == TEXTURE_NAME)
                     return renderer.WhitePixel;
diff --git a/osu.Game.Tests/Skins/TestSceneSkinResources.cs b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
index aaec319b57..636f1071dd 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
@@ -22,6 +22,7 @@ using osu.Game.IO;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -100,7 +101,7 @@ namespace osu.Game.Tests.Skins
             {
             }
 
-            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index c02cec8c75..326e233e3f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -297,7 +297,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                     : null;
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
@@ -308,7 +308,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup componentLookupName) => new SecondarySourceBox();
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
@@ -320,7 +320,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup componentLookupName) => new BaseSourceBox();
 
-            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 3f78dbfd96..0071c7e2c0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -163,7 +164,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => SamplePlaybackDisabled;
 
             public Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => source.GetDrawableComponent(lookup);
-            public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source.GetTexture(componentName, wrapModeS, wrapModeT);
+
+            public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+                source.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+
             public ISample? GetSample(ISampleInfo sampleInfo) => OverridingSample ?? source.GetSample(sampleInfo);
 
             public IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
diff --git a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
index 80239504d8..d04bb72bd9 100644
--- a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit
@@ -54,7 +55,10 @@ namespace osu.Game.Screens.Edit
         #region Delegated ISkin implementation
 
         public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => Skin.GetDrawableComponent(lookup);
-        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Skin.GetTexture(componentName, wrapModeS, wrapModeT);
+
+        public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+            Skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+
         public ISample GetSample(ISampleInfo sampleInfo) => Skin.GetSample(sampleInfo);
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Skin.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 61b0dc5aa1..3d14df70ce 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -67,7 +67,8 @@ namespace osu.Game.Skinning
             };
         }
 
-        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Textures?.Get(componentName, wrapModeS, wrapModeT);
+        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+            Textures?.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
 
         public override ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index fa04dda202..5cc677ad1c 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -25,17 +26,11 @@ namespace osu.Game.Skinning
         /// Retrieve a <see cref="Texture"/>.
         /// </summary>
         /// <param name="componentName">The requested texture.</param>
-        /// <returns>A matching texture, or null if unavailable.</returns>
-        Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
-
-        /// <summary>
-        /// Retrieve a <see cref="Texture"/>.
-        /// </summary>
-        /// <param name="componentName">The requested texture.</param>
+        /// <param name="maxSize">The maximum dimensions that the texture should be.</param>
         /// <param name="wrapModeS">The texture wrap mode in horizontal direction.</param>
         /// <param name="wrapModeT">The texture wrap mode in vertical direction.</param>
         /// <returns>A matching texture, or null if unavailable.</returns>
-        Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT);
+        Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default);
 
         /// <summary>
         /// Retrieve a <see cref="SampleChannel"/>.
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index cf51fa8f74..1b0b1be585 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -466,7 +466,7 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
         {
             switch (componentName)
             {
@@ -497,7 +497,8 @@ namespace osu.Game.Skinning
                     continue;
 
                 texture.ScaleAdjust = ratio;
-                return texture;
+
+                return texture.WithMaximumSize(maxSize);
             }
 
             return null;
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index ad3b10edd3..bd38eda259 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
                 if (animatable && s.GetTexture(getFrameName(0)) != null)
                     return true;
 
-                return s.GetTexture(componentName, wrapModeS, wrapModeT) != null;
+                return s.GetTexture(componentName, maxSize, wrapModeS, wrapModeT) != null;
             }) ?? source;
 
             if (animatable)
@@ -79,21 +79,15 @@ namespace osu.Game.Skinning
             }
 
             // if an animation was not allowed or not found, fall back to a sprite retrieval.
-            var singleTexture = maxSize != null
-                ? retrievalSource.GetTextureWithMaxSize(componentName, maxSize.Value, wrapModeS, wrapModeT)
-                : retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
+            var singleTexture = retrievalSource.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
-            return singleTexture != null
-                ? new[] { singleTexture }
-                : Array.Empty<Texture>();
+            return singleTexture != null ? new[] { singleTexture } : Array.Empty<Texture>();
 
             IEnumerable<Texture> getTextures(ISkin skin)
             {
                 for (int i = 0; true; i++)
                 {
-                    var texture = maxSize != null
-                        ? skin.GetTextureWithMaxSize(getFrameName(i), maxSize.Value, wrapModeS, wrapModeT)
-                        : skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT);
+                    var texture = skin.GetTexture(getFrameName(i), maxSize, wrapModeS, wrapModeT);
 
                     if (texture == null)
                         break;
@@ -105,17 +99,16 @@ namespace osu.Game.Skinning
             string getFrameName(int frameIndex) => $"{componentName}{animationSeparator}{frameIndex}";
         }
 
-        public static Texture? GetTextureWithMaxSize(this ISkin source, string componentName, Vector2 maxSize, WrapMode wrapModeS = WrapMode.None, WrapMode wrapModeT = WrapMode.None)
+        public static Texture? WithMaximumSize(this Texture? texture, Vector2? maxSize)
         {
-            var texture = source.GetTexture(componentName, wrapModeS, wrapModeT);
-            if (texture == null)
+            if (texture == null || maxSize == null)
                 return texture;
 
-            if (texture.DisplayWidth <= maxSize.X && texture.DisplayHeight <= maxSize.Y)
+            if (texture.DisplayWidth <= maxSize.Value.X && texture.DisplayHeight <= maxSize.Value.Y)
                 return texture;
 
             // use scale adjust property for downscaling the texture in order to meet the specified maximum dimensions.
-            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.X, texture.DisplayHeight / maxSize.Y);
+            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.Value.X, texture.DisplayHeight / maxSize.Value.Y);
             return texture;
         }
 
diff --git a/osu.Game/Skinning/ResourceStoreBackedSkin.cs b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
index f5c6192ba5..35165c2e6f 100644
--- a/osu.Game/Skinning/ResourceStoreBackedSkin.cs
+++ b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Game.Audio;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -29,7 +30,8 @@ namespace osu.Game.Skinning
 
         public Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => null;
 
-        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => textures.Get(componentName, wrapModeS, wrapModeT);
+        public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+            textures.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
 
         public ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index a6250d7488..0e96feaccc 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -18,6 +18,7 @@ using osu.Framework.Logging;
 using osu.Game.Audio;
 using osu.Game.Database;
 using osu.Game.IO;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -44,9 +45,7 @@ namespace osu.Game.Skinning
 
         public abstract ISample? GetSample(ISampleInfo sampleInfo);
 
-        public Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
-
-        public abstract Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT);
+        public abstract Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default);
 
         public abstract IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
             where TLookup : notnull
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 51605c6045..f0819211c0 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -25,6 +25,7 @@ using osu.Game.Database;
 using osu.Game.IO;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Utils;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -223,7 +224,8 @@ namespace osu.Game.Skinning
 
         public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => lookupWithFallback(s => s.GetDrawableComponent(lookup));
 
-        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => lookupWithFallback(s => s.GetTexture(componentName, wrapModeS, wrapModeT));
+        public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+            lookupWithFallback(s => s.GetTexture(componentName, maxSize, wrapModeS, wrapModeT));
 
         public ISample GetSample(ISampleInfo sampleInfo) => lookupWithFallback(s => s.GetSample(sampleInfo));
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 2612e0b47c..342d6d8009 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -127,19 +128,19 @@ namespace osu.Game.Skinning
             return ParentSource?.GetDrawableComponent(lookup);
         }
 
-        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+        public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
         {
             foreach (var (_, lookupWrapper) in skinSources)
             {
                 Texture? sourceTexture;
-                if ((sourceTexture = lookupWrapper.GetTexture(componentName, wrapModeS, wrapModeT)) != null)
+                if ((sourceTexture = lookupWrapper.GetTexture(componentName, maxSize, wrapModeS, wrapModeT)) != null)
                     return sourceTexture;
             }
 
             if (!AllowFallingBackToParent)
                 return null;
 
-            return ParentSource?.GetTexture(componentName, wrapModeS, wrapModeT);
+            return ParentSource?.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
         }
 
         public ISample? GetSample(ISampleInfo sampleInfo)
@@ -251,10 +252,10 @@ namespace osu.Game.Skinning
                 return null;
             }
 
-            public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
             {
                 if (provider.AllowTextureLookup(componentName))
-                    return skin.GetTexture(componentName, wrapModeS, wrapModeT);
+                    return skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
                 return null;
             }
diff --git a/osu.Game/Skinning/SkinTransformer.cs b/osu.Game/Skinning/SkinTransformer.cs
index ed5b04da1e..cd7755b854 100644
--- a/osu.Game/Skinning/SkinTransformer.cs
+++ b/osu.Game/Skinning/SkinTransformer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -28,9 +29,7 @@ namespace osu.Game.Skinning
 
         public virtual Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => Skin.GetDrawableComponent(lookup);
 
-        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 Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => Skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
         public virtual ISample? GetSample(ISampleInfo sampleInfo) => Skin.GetSample(sampleInfo);
 
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index 0957f60579..d1d094b301 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -44,7 +44,8 @@ namespace osu.Game.Skinning
             this.resources = resources;
         }
 
-        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Textures?.Get(componentName, wrapModeS, wrapModeT);
+        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
+            Textures?.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
 
         public override ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index aab1b72990..6c286f37c7 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -207,9 +207,9 @@ namespace osu.Game.Tests.Visual
                 this.extrapolateAnimations = extrapolateAnimations;
             }
 
-            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
             {
-                var lookup = base.GetTexture(componentName, wrapModeS, wrapModeT);
+                var lookup = base.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
 
                 if (lookup != null)
                     return lookup;
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Visual
                     var match = Regex.Match(componentName, "-([0-9]*)");
 
                     if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out int number) && number < 60)
-                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
+                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), maxSize, wrapModeS, wrapModeT);
                 }
 
                 return null;

From 9d1753977858dd0e1e0c4312db964749931c11f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Sep 2023 17:35:28 +0900
Subject: [PATCH 0440/2296] Add size limitations for taiko drum rolls

---
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
index 5543a31ec9..33f85328fa 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
@@ -47,13 +48,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-end", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
+                    Texture = skin.GetTexture("taiko-roll-end", new Vector2(128, 256), WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                     FillMode = FillMode.Fit,
                 },
                 body = new Sprite
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-middle", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
+                    Texture = skin.GetTexture("taiko-roll-middle", new Vector2(2, 256), WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                 },
                 headCircle = new LegacyCirclePiece
                 {

From 6e6dd86a511f34aa7de1dcb8b5831cc620c396e1 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 11:09:35 -0700
Subject: [PATCH 0441/2296] Remove buffered container comment

While it is true that there is a transparency overlap, it is only seen when entering/exiting song select. And there are other components game-wide that exhibit the same issue when transparency changes. Should be reconsidered another time.
---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 0ebd875cbe..270d063dfa 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -68,7 +68,6 @@ namespace osu.Game.Screens.Select
         [BackgroundDependencyLoader]
         private void load()
         {
-            // We want to buffer the wedge to avoid weird transparency overlaps between the colour bar and the background.
             Child = content = new Container
             {
                 RelativeSizeAxes = Axes.Both,

From b63c1e42574952f62eafa6c5e5645af616b39915 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 12:14:17 -0700
Subject: [PATCH 0442/2296] Remove mods dependency

BPM is not in the wedge anymore.
---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 270d063dfa..834b3f07a0 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using osuTK;
 using osu.Framework.Allocation;
@@ -16,10 +15,8 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
-using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.Select
 {
@@ -221,14 +218,9 @@ namespace osu.Game.Screens.Select
             public IBindable<double> DisplayedStars => starRatingDisplay.DisplayedStars;
             public Bindable<double> ActualStars = new Bindable<double>();
 
-            [Resolved]
-            private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
-
             [Resolved]
             private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
-            private ModSettingChangeTracker? settingChangeTracker;
-
             private IBindable<StarDifficulty?>? starDifficulty;
             private CancellationTokenSource? cancellationSource;
 
@@ -325,13 +317,6 @@ namespace osu.Game.Screens.Select
 
                     starRatingDisplay.FadeIn(transition_duration);
                 });
-
-                mods.BindValueChanged(m =>
-                {
-                    settingChangeTracker?.Dispose();
-
-                    settingChangeTracker = new ModSettingChangeTracker(m.NewValue);
-                }, true);
             }
 
             protected override void Dispose(bool isDisposing)
@@ -339,7 +324,6 @@ namespace osu.Game.Screens.Select
                 base.Dispose(isDisposing);
 
                 cancellationSource?.Cancel();
-                settingChangeTracker?.Dispose();
             }
         }
     }

From 40d1196aea1871751f6094d8878a4457045854ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Sep 2023 11:15:35 +0200
Subject: [PATCH 0443/2296] Add test cases covering overlapping slider input
 expectations

---
 .../TestSceneLegacyHitPolicy.cs               | 54 +++++++++++++++++++
 .../TestSceneStartTimeOrderedHitPolicy.cs     | 52 ++++++++++++++++++
 2 files changed, 106 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 2cfbe6611f..c9aa44eb5a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -505,6 +505,54 @@ namespace osu.Game.Rulesets.Osu.Tests
             addClickActionAssert(0, ClickAction.Shake);
         }
 
+        [Test]
+        public void TestInputDoesNotFallThroughOverlappingSliders()
+        {
+            const double time_first_slider = 1000;
+            const double time_second_slider = 1250;
+            Vector2 positionFirstSlider = new Vector2(100, 50);
+            Vector2 positionSecondSlider = new Vector2(100, 80);
+            var midpoint = (positionFirstSlider + positionSecondSlider) / 2;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new Slider
+                {
+                    StartTime = time_first_slider,
+                    Position = positionFirstSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                },
+                new Slider
+                {
+                    StartTime = time_second_slider,
+                    Position = positionSecondSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_slider, Position = midpoint, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_first_slider + 25, Position = midpoint, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_slider + 50, Position = midpoint },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Ok);
+            addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
+            addJudgementAssert(hitObjects[1], HitResult.Miss);
+            // the slider head of the first slider prevents the second slider's head from being hit, so the judgement offset should be very late.
+            addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, referenceHitWindows.WindowFor(HitResult.Meh));
+            addClickActionAssert(0, ClickAction.Hit);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
@@ -523,6 +571,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, () => Is.EqualTo(offset).Within(50));
         }
 
+        private void addJudgementOffsetAssert(string name, Func<OsuHitObject?> hitObject, double offset)
+        {
+            AddAssert($"{name} @ judged at {offset}",
+                () => judgementResults.Single(r => r.HitObject == hitObject()).TimeOffset, () => Is.EqualTo(offset).Within(50));
+        }
+
         private void addClickActionAssert(int inputIndex, ClickAction action)
             => AddAssert($"input #{inputIndex} resulted in {action}", () => testPolicy.ClickActions[inputIndex], () => Is.EqualTo(action));
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index f4257a9ee7..909eb821cf 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -336,6 +336,52 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[1], HitResult.IgnoreHit);
         }
 
+        [Test]
+        public void TestInputFallsThroughJudgedSliders()
+        {
+            const double time_first_slider = 1000;
+            const double time_second_slider = 1250;
+            Vector2 positionFirstSlider = new Vector2(100, 50);
+            Vector2 positionSecondSlider = new Vector2(100, 80);
+            var midpoint = (positionFirstSlider + positionSecondSlider) / 2;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestSlider
+                {
+                    StartTime = time_first_slider,
+                    Position = positionFirstSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                },
+                new TestSlider
+                {
+                    StartTime = time_second_slider,
+                    Position = positionSecondSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_slider, Position = midpoint, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_first_slider + 25, Position = midpoint, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_slider + 50, Position = midpoint },
+            });
+
+            addJudgementAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, HitResult.Great);
+            addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
+            addJudgementAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.Great);
+            addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, -200);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
@@ -354,6 +400,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => Precision.AlmostEquals(judgementResults.Single(r => r.HitObject == hitObject).TimeOffset, offset, 100));
         }
 
+        private void addJudgementOffsetAssert(string name, Func<OsuHitObject> hitObject, double offset)
+        {
+            AddAssert($"{name} @ judged at {offset}",
+                () => judgementResults.Single(r => r.HitObject == hitObject()).TimeOffset, () => Is.EqualTo(offset).Within(50));
+        }
+
         private ScoreAccessibleReplayPlayer currentPlayer;
         private List<JudgementResult> judgementResults;
 

From 03c61a573ec9f8f1e83cd98193fd84bd18a75043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Sep 2023 11:38:19 +0200
Subject: [PATCH 0444/2296] Block input to objects lying under already-hit
 hitcircles when classic note lock is active

---
 .../TestSceneLegacyHitPolicy.cs               |  2 ++
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   | 23 +++++++++++++++++++
 .../Objects/Drawables/DrawableHitCircle.cs    |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index c9aa44eb5a..615044b642 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -549,6 +549,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // the slider head of the first slider prevents the second slider's head from being hit, so the judgement offset should be very late.
+            // this is not strictly done by the hit policy implementation itself (see `OsuModClassic.blockInputToUnderlyingObjects()`),
+            // but we're testing this here anyways to just keep everything related to input handling and note lock in one place.
             addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, referenceHitWindows.WindowFor(HitResult.Meh));
             addClickActionAssert(0, ClickAction.Hit);
         }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 5dbf23f7ea..1d95f833b0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -74,6 +74,10 @@ namespace osu.Game.Rulesets.Osu.Mods
                     head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(head);
+
+                    if (ClassicNoteLock.Value)
+                        blockInputToUnderlyingObjects(head);
+
                     break;
 
                 case DrawableSliderTail tail:
@@ -83,10 +87,29 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableHitCircle circle:
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(circle);
+
+                    if (ClassicNoteLock.Value)
+                        blockInputToUnderlyingObjects(circle);
+
                     break;
             }
         }
 
+        /// <summary>
+        /// On stable, hitcircles that have already been hit block input from reaching objects that may be underneath them.
+        /// The purpose of this method is to restore that behaviour.
+        /// In order to avoid introducing yet another confusing config option, this behaviour is roped into the general notion of "note lock".
+        /// </summary>
+        private static void blockInputToUnderlyingObjects(DrawableHitCircle circle)
+        {
+            var oldHitAction = circle.HitArea.Hit;
+            circle.HitArea.Hit = () =>
+            {
+                oldHitAction?.Invoke();
+                return true;
+            };
+        }
+
         private void applyEarlyFading(DrawableHitCircle circle)
         {
             circle.ApplyCustomUpdateState += (dho, state) =>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 932f6d3fff..6beed0294d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     case OsuAction.RightButton:
                         if (IsHovered && (Hit?.Invoke() ?? false))
                         {
-                            HitAction = e.Action;
+                            HitAction ??= e.Action;
                             return true;
                         }
 

From 912c8b0901aba37b5d99eb06a4fa57d0e4267b83 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 6 Sep 2023 00:10:41 +0300
Subject: [PATCH 0445/2296] `currentSpins` -> `completedFullSpins`

---
 .../Objects/Drawables/DrawableSpinner.cs               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2d2a4a05ac..6611cca2bd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
-        private int currentSpins;
+        private int completedFullSpins;
 
         private void updateBonusScore()
         {
@@ -295,14 +295,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             int spins = (int)(Result.RateAdjustedRotation / 360);
 
-            if (spins < currentSpins)
+            if (spins < completedFullSpins)
             {
                 // rewinding, silently handle
-                currentSpins = spins;
+                completedFullSpins = spins;
                 return;
             }
 
-            while (currentSpins != spins)
+            while (completedFullSpins != spins)
             {
                 var tick = ticks.FirstOrDefault(t => !t.Result.HasResult);
 
@@ -315,7 +315,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                         gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequired);
                 }
 
-                currentSpins++;
+                completedFullSpins++;
             }
         }
     }

From 6d3a6b7a5dfb55abadb5e841dae457634b0dffbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Sep 2023 23:35:03 +0200
Subject: [PATCH 0446/2296] Fix `HitCircleLateFade` failures due to hitcircle
 not being loaded when applying mods

---
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index d74a31ada4..483155e646 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -142,6 +142,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             drawableHitCircle.Scale = new Vector2(2f);
 
+            LoadComponent(drawableHitCircle);
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObject>())
                 mod.ApplyToDrawableHitObject(drawableHitCircle);
 

From 5becac64312dccfeac0d91ad5bfb9893f743c1f6 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 14:43:43 -0700
Subject: [PATCH 0447/2296] Make beatmap non-nullable

Doesn't seem like it'll be null after first set: https://github.com/ppy/osu/blob/5454d1caa1927428fe339e3d5b47ddfe45f9dfb6/osu.Game/OsuGameBase.cs#L363
---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 834b3f07a0..52fe99d6b8 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -128,9 +128,9 @@ namespace osu.Game.Screens.Select
             this.FadeOut(200, Easing.OutQuint);
         }
 
-        private WorkingBeatmap? beatmap;
+        private WorkingBeatmap beatmap = null!;
 
-        public WorkingBeatmap? Beatmap
+        public WorkingBeatmap Beatmap
         {
             get => beatmap;
             set
@@ -149,12 +149,6 @@ namespace osu.Game.Screens.Select
         {
             Scheduler.AddOnce(() =>
             {
-                if (beatmap == null)
-                {
-                    removeOldInfo();
-                    return;
-                }
-
                 LoadComponentAsync(loadingInfo = new Container
                 {
                     Padding = new MarginPadding { Right = colour_bar_width },
@@ -198,8 +192,6 @@ namespace osu.Game.Screens.Select
 
             void removeOldInfo()
             {
-                State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
-
                 DisplayedContent?.FadeOut(transition_duration);
                 DisplayedContent?.Expire();
                 DisplayedContent = null;

From 676240928ea9ebb2dc86a3504c5128fb0550042b Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 14:57:55 -0700
Subject: [PATCH 0448/2296] Move actual star updating to star rating display

---
 .../Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs      | 6 ------
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs             | 8 ++++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index a7070f845e..a8484caf1c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -63,12 +63,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
             {
-                // Difficulty cache lookup is a pain in the ass to work with.
-                // This logic is ugly and needs to be reconsidered.
-
-                if (infoWedge.Info != null)
-                    infoWedge.Info!.ActualStars.Value = v;
-
                 foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
                     hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
             });
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 52fe99d6b8..596f90827f 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -186,7 +186,7 @@ namespace osu.Game.Screens.Select
                     {
                         // use actual stars as star counter has its own animation
                         starCounter.Current = (float)s.NewValue;
-                    });
+                    }, true);
                 });
             });
 
@@ -301,7 +301,6 @@ namespace osu.Game.Screens.Select
                 starDifficulty.BindValueChanged(s =>
                 {
                     starRatingDisplay.Current.Value = s.NewValue ?? default;
-                    ActualStars.Value = s.NewValue?.Stars ?? 0;
 
                     // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
                     if (!starRatingDisplay.IsPresent)
@@ -309,6 +308,11 @@ namespace osu.Game.Screens.Select
 
                     starRatingDisplay.FadeIn(transition_duration);
                 });
+
+                starRatingDisplay.Current.BindValueChanged(s =>
+                {
+                    ActualStars.Value = s.NewValue.Stars;
+                });
             }
 
             protected override void Dispose(bool isDisposing)

From 3f92dae55c38414521cde874eb6c2464b570e01b Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 15:20:20 -0700
Subject: [PATCH 0449/2296] Move star rating display and status pill out of
 reloadable content

---
 .../SongSelect/TestSceneBeatmapInfoWedgeV2.cs |   2 +-
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 201 ++++++++----------
 2 files changed, 92 insertions(+), 111 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
index a8484caf1c..2a3269ea0a 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedgeV2.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddSliderStep("change star difficulty", 0, 11.9, 5.55, v =>
             {
-                foreach (var hasCurrentValue in infoWedge.Info.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
+                foreach (var hasCurrentValue in infoWedge.ChildrenOfType<IHasCurrentValue<StarDifficulty>>())
                     hasCurrentValue.Current.Value = new StarDifficulty(v, 0);
             });
         }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 596f90827f..bde9df97d7 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -39,14 +39,22 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
+        [Resolved]
+        private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
+
         protected Container? DisplayedContent { get; private set; }
 
         protected WedgeInfoText? Info { get; private set; }
 
         private Container difficultyColourBar = null!;
         private StarCounter starCounter = null!;
+        private StarRatingDisplay starRatingDisplay = null!;
+        private BeatmapSetOnlineStatusPill statusPill = null!;
         private Container content = null!;
 
+        private IBindable<StarDifficulty?>? starDifficulty;
+        private CancellationTokenSource? cancellationSource;
+
         public BeatmapInfoWedgeV2()
         {
             Height = WEDGE_HEIGHT;
@@ -102,7 +110,38 @@ namespace osu.Game.Screens.Select
                             Scale = new Vector2(0.35f),
                             Direction = FillDirection.Vertical
                         }
-                    }
+                    },
+                    new FillFlowContainer
+                    {
+                        Name = "Topright-aligned metadata",
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding { Top = 3, Right = colour_bar_width + 8 },
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(0, 5),
+                        Depth = float.MinValue,
+                        Children = new Drawable[]
+                        {
+                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                Alpha = 0,
+                            },
+                            statusPill = new BeatmapSetOnlineStatusPill
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                TextSize = 11,
+                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
+                                Alpha = 0,
+                            }
+                        }
+                    },
                 }
             };
         }
@@ -112,6 +151,19 @@ namespace osu.Game.Screens.Select
             base.LoadComplete();
 
             ruleset.BindValueChanged(_ => updateDisplay());
+
+            starRatingDisplay.Current.BindValueChanged(s =>
+            {
+                // use actual stars as star counter has its own animation
+                starCounter.Current = (float)s.NewValue.Stars;
+            }, true);
+
+            starRatingDisplay.DisplayedStars.BindValueChanged(s =>
+            {
+                // sync color with star rating display
+                starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
+                difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
+            }, true);
         }
 
         private const double animation_duration = 600;
@@ -147,6 +199,17 @@ namespace osu.Game.Screens.Select
 
         private void updateDisplay()
         {
+            statusPill.Status = beatmap.BeatmapInfo.Status;
+
+            starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+
+            starDifficulty.BindValueChanged(s =>
+            {
+                starRatingDisplay.Current.Value = s.NewValue ?? default;
+
+                starRatingDisplay.FadeIn(transition_duration);
+            });
+
             Scheduler.AddOnce(() =>
             {
                 LoadComponentAsync(loadingInfo = new Container
@@ -174,19 +237,6 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     content.Add(DisplayedContent = d);
-
-                    Info.DisplayedStars.BindValueChanged(s =>
-                    {
-                        starCounter.Colour = s.NewValue >= 6.5 ? colours.Orange1 : Colour4.Black.Opacity(0.75f);
-
-                        difficultyColourBar.FadeColour(colours.ForStarDifficulty(s.NewValue));
-                    }, true);
-
-                    Info.ActualStars.BindValueChanged(s =>
-                    {
-                        // use actual stars as star counter has its own animation
-                        starCounter.Current = (float)s.NewValue;
-                    }, true);
                 });
             });
 
@@ -198,24 +248,20 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            cancellationSource?.Cancel();
+        }
+
         public partial class WedgeInfoText : Container
         {
             public OsuSpriteText TitleLabel { get; private set; } = null!;
             public OsuSpriteText ArtistLabel { get; private set; } = null!;
 
-            private StarRatingDisplay starRatingDisplay = null!;
-
             private readonly WorkingBeatmap working;
 
-            public IBindable<double> DisplayedStars => starRatingDisplay.DisplayedStars;
-            public Bindable<double> ActualStars = new Bindable<double>();
-
-            [Resolved]
-            private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
-
-            private IBindable<StarDifficulty?>? starDifficulty;
-            private CancellationTokenSource? cancellationSource;
-
             public WedgeInfoText(WorkingBeatmap working)
             {
                 this.working = working;
@@ -226,101 +272,36 @@ namespace osu.Game.Screens.Select
             [BackgroundDependencyLoader]
             private void load()
             {
-                var beatmapInfo = working.BeatmapInfo;
                 var metadata = working.Metadata;
 
-                Children = new Drawable[]
+                Child = new FillFlowContainer
                 {
-                    new FillFlowContainer
+                    Name = "Top-left aligned metadata",
+                    Direction = FillDirection.Vertical,
+                    Padding = new MarginPadding { Horizontal = text_margin + shear_width, Top = 12 },
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Children = new Drawable[]
                     {
-                        Name = "Topright-aligned metadata",
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Top = 3, Right = 8 },
-                        AutoSizeAxes = Axes.Both,
-                        Shear = wedged_container_shear,
-                        Spacing = new Vector2(0f, 5f),
-                        Children = new Drawable[]
+                        TitleLabel = new TruncatingSpriteText
                         {
-                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Shear = -wedged_container_shear,
-                                Alpha = 0f,
-                            },
-                            new BeatmapSetOnlineStatusPill
-                            {
-                                AutoSizeAxes = Axes.Both,
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Shear = -wedged_container_shear,
-                                TextSize = 11,
-                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
-                                Status = beatmapInfo.Status,
-                                Alpha = string.IsNullOrEmpty(beatmapInfo.DifficultyName) ? 0 : 1
-                            }
-                        }
-                    },
-                    new FillFlowContainer
-                    {
-                        Name = "Top-left aligned metadata",
-                        Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding { Horizontal = text_margin + shear_width, Top = 12 },
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Children = new Drawable[]
+                            Shadow = true,
+                            Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
+                            Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
+                            RelativeSizeAxes = Axes.X,
+                        },
+                        ArtistLabel = new TruncatingSpriteText
                         {
-                            TitleLabel = new TruncatingSpriteText
-                            {
-                                Shadow = true,
-                                Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
-                                Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
-                                RelativeSizeAxes = Axes.X,
-                            },
-                            ArtistLabel = new TruncatingSpriteText
-                            {
-                                // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
-                                Shadow = true,
-                                Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
-                                // Not sure if this should be semi bold or medium
-                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
-                                RelativeSizeAxes = Axes.X,
-                            }
+                            // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
+                            Shadow = true,
+                            Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
+                            // Not sure if this should be semi bold or medium
+                            Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
+                            RelativeSizeAxes = Axes.X,
                         }
                     }
                 };
             }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                starDifficulty = difficultyCache.GetBindableDifficulty(working.BeatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
-                starDifficulty.BindValueChanged(s =>
-                {
-                    starRatingDisplay.Current.Value = s.NewValue ?? default;
-
-                    // Don't roll the counter on initial display (but still allow it to roll on applying mods etc.)
-                    if (!starRatingDisplay.IsPresent)
-                        starRatingDisplay.FinishTransforms(true);
-
-                    starRatingDisplay.FadeIn(transition_duration);
-                });
-
-                starRatingDisplay.Current.BindValueChanged(s =>
-                {
-                    ActualStars.Value = s.NewValue.Stars;
-                });
-            }
-
-            protected override void Dispose(bool isDisposing)
-            {
-                base.Dispose(isDisposing);
-
-                cancellationSource?.Cancel();
-            }
         }
     }
 }

From 8e8fae0fbaa3c94f74ea44175f57299d63c8a9f8 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 15:21:23 -0700
Subject: [PATCH 0450/2296] Fix left padding adding shear width

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index bde9df97d7..a7bfbc8214 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -278,7 +278,7 @@ namespace osu.Game.Screens.Select
                 {
                     Name = "Top-left aligned metadata",
                     Direction = FillDirection.Vertical,
-                    Padding = new MarginPadding { Horizontal = text_margin + shear_width, Top = 12 },
+                    Padding = new MarginPadding { Left = text_margin, Right = text_margin + shear_width, Top = 12 },
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
                     Children = new Drawable[]

From 9f10082ffcf292ec421a085acd815368f88c8f6f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 18:23:11 -0700
Subject: [PATCH 0451/2296] Revert param removal of delete beatmap and clear
 scores methods

---
 .../Select/FooterV2/BeatmapOptionsPopover.cs  |  4 ++--
 osu.Game/Screens/Select/SongSelect.cs         | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 550b3e5cf6..91f315f0d3 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -54,13 +54,13 @@ namespace osu.Game.Screens.Select.FooterV2
             addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
 
             addHeader("For all difficulties", beatmapWhenOpening.BeatmapSetInfo.ToString());
-            addButton(@"Delete beatmap", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(), colours.Red1);
+            addButton(@"Delete beatmap", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(beatmapWhenOpening.BeatmapSetInfo), colours.Red1);
 
             addHeader("For selected difficulty", beatmapWhenOpening.BeatmapInfo.DifficultyName);
             // TODO: make work, and make show "unplayed" or "played" based on status.
             addButton(@"Mark as played", FontAwesome.Regular.TimesCircle, null);
             addButton(@"Hide", FontAwesome.Solid.Magic, null);
-            addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(), colours.Red1);
+            addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(beatmapWhenOpening.BeatmapInfo), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
                 addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit());
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f6fc55b2a5..cca18b93af 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -311,9 +311,9 @@ namespace osu.Game.Screens.Select
                     Footer.AddButton(button, overlay);
 
                 BeatmapOptions.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, () => manageCollectionsDialog?.Show());
-                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, DeleteBeatmap);
+                BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => DeleteBeatmap(Beatmap.Value.BeatmapSetInfo));
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
-                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, ClearScores);
+                BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => ClearScores(Beatmap.Value.BeatmapInfo));
             }
 
             sampleChangeDifficulty = audio.Samples.Get(@"SongSelect/select-difficulty");
@@ -917,23 +917,23 @@ namespace osu.Game.Screens.Select
         }
 
         /// <summary>
-        /// Request to delete the current beatmap.
+        /// Request to delete a specific beatmap.
         /// </summary>
-        public void DeleteBeatmap()
+        public void DeleteBeatmap(BeatmapSetInfo? beatmap)
         {
-            if (Beatmap.Value.BeatmapSetInfo == null) return;
+            if (beatmap == null) return;
 
-            dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap.Value.BeatmapSetInfo));
+            dialogOverlay?.Push(new BeatmapDeleteDialog(beatmap));
         }
 
         /// <summary>
-        /// Request to clear the scores of the current beatmap.
+        /// Request to clear the scores of a specific beatmap.
         /// </summary>
-        public void ClearScores()
+        public void ClearScores(BeatmapInfo? beatmapInfo)
         {
-            if (Beatmap.Value.BeatmapInfo == null) return;
+            if (beatmapInfo == null) return;
 
-            dialogOverlay?.Push(new BeatmapClearScoresDialog(Beatmap.Value.BeatmapInfo, () =>
+            dialogOverlay?.Push(new BeatmapClearScoresDialog(beatmapInfo, () =>
                 // schedule done here rather than inside the dialog as the dialog may fade out and never callback.
                 Schedule(() => BeatmapDetails.Refresh())));
         }
@@ -969,7 +969,7 @@ namespace osu.Game.Screens.Select
                     if (e.ShiftPressed)
                     {
                         if (!Beatmap.IsDefault)
-                            DeleteBeatmap();
+                            DeleteBeatmap(Beatmap.Value.BeatmapSetInfo);
                         return true;
                     }
 

From 9565039192b87c9cf8db95e86d104725a0058f40 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 18:18:45 -0700
Subject: [PATCH 0452/2296] Hide beatmap options popover when beatmap changes

---
 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 91f315f0d3..2194d4946b 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -31,13 +31,16 @@ namespace osu.Game.Screens.Select.FooterV2
 
         private WorkingBeatmap beatmapWhenOpening = null!;
 
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
+
         public BeatmapOptionsPopover(FooterButtonOptionsV2 footerButton)
         {
             this.footerButton = footerButton;
         }
 
         [BackgroundDependencyLoader]
-        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours, IBindable<WorkingBeatmap> beatmap)
+        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours)
         {
             Content.Padding = new MarginPadding(5);
 
@@ -71,6 +74,8 @@ namespace osu.Game.Screens.Select.FooterV2
             base.LoadComplete();
 
             ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(this));
+
+            beatmap.BindValueChanged(_ => Hide());
         }
 
         [Resolved]

From 69fa8747f0f04b305be4de4f3cb3c708b199796d Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 18:35:35 -0700
Subject: [PATCH 0453/2296] Explicitly add beatmapinfo param to edit call

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

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 2194d4946b..817b05bdeb 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Select.FooterV2
             addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(beatmapWhenOpening.BeatmapInfo), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
-                addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit());
+                addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
         }
 
         protected override void LoadComplete()

From 6d2e57b73e5aa7ffcf099e6dd7b9751e3142e861 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 18:43:42 -0700
Subject: [PATCH 0454/2296] Add localisation support to beatmap options popover

---
 osu.Game/Localisation/SongSelectStrings.cs    | 40 +++++++++++++++++++
 .../Select/FooterV2/BeatmapOptionsPopover.cs  | 23 ++++++-----
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Localisation/SongSelectStrings.cs b/osu.Game/Localisation/SongSelectStrings.cs
index e1ac328420..72c5643d52 100644
--- a/osu.Game/Localisation/SongSelectStrings.cs
+++ b/osu.Game/Localisation/SongSelectStrings.cs
@@ -19,6 +19,46 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString LocallyModifiedTooltip => new TranslatableString(getKey(@"locally_modified_tooltip"), @"Has been locally modified");
 
+        /// <summary>
+        /// "General"
+        /// </summary>
+        public static LocalisableString General => new TranslatableString(getKey(@"general"), @"General");
+
+        /// <summary>
+        /// "Manage collections"
+        /// </summary>
+        public static LocalisableString ManageCollections => new TranslatableString(getKey(@"manage_collections"), @"Manage collections");
+
+        /// <summary>
+        /// "For all difficulties"
+        /// </summary>
+        public static LocalisableString ForAllDifficulties => new TranslatableString(getKey(@"for_all_difficulties"), @"For all difficulties");
+
+        /// <summary>
+        /// "Delete beatmap"
+        /// </summary>
+        public static LocalisableString DeleteBeatmap => new TranslatableString(getKey(@"delete_beatmap"), @"Delete beatmap");
+
+        /// <summary>
+        /// "For selected difficulty"
+        /// </summary>
+        public static LocalisableString ForSelectedDifficulty => new TranslatableString(getKey(@"for_selected_difficulty"), @"For selected difficulty");
+
+        /// <summary>
+        /// "Mark as played"
+        /// </summary>
+        public static LocalisableString MarkAsPlayed => new TranslatableString(getKey(@"mark_as_played"), @"Mark as played");
+
+        /// <summary>
+        /// "Clear all local scores"
+        /// </summary>
+        public static LocalisableString ClearAllLocalScores => new TranslatableString(getKey(@"clear_all_local_scores"), @"Clear all local scores");
+
+        /// <summary>
+        /// "Edit beatmap"
+        /// </summary>
+        public static LocalisableString EditBeatmap => new TranslatableString(getKey(@"edit_beatmap"), @"Edit beatmap");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 817b05bdeb..20b9da4778 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 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.Sprites;
@@ -21,6 +22,8 @@ using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
+using osu.Game.Localisation;
+using CommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
 
 namespace osu.Game.Screens.Select.FooterV2
 {
@@ -53,20 +56,20 @@ namespace osu.Game.Screens.Select.FooterV2
 
             beatmapWhenOpening = beatmap.Value;
 
-            addHeader("General");
-            addButton(@"Manage collections", FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
+            addHeader(SongSelectStrings.General);
+            addButton(SongSelectStrings.ManageCollections, FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
 
-            addHeader("For all difficulties", beatmapWhenOpening.BeatmapSetInfo.ToString());
-            addButton(@"Delete beatmap", FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(beatmapWhenOpening.BeatmapSetInfo), colours.Red1);
+            addHeader(SongSelectStrings.ForAllDifficulties, beatmapWhenOpening.BeatmapSetInfo.ToString());
+            addButton(SongSelectStrings.DeleteBeatmap, FontAwesome.Solid.Trash, () => songSelect?.DeleteBeatmap(beatmapWhenOpening.BeatmapSetInfo), colours.Red1);
 
-            addHeader("For selected difficulty", beatmapWhenOpening.BeatmapInfo.DifficultyName);
+            addHeader(SongSelectStrings.ForSelectedDifficulty, beatmapWhenOpening.BeatmapInfo.DifficultyName);
             // TODO: make work, and make show "unplayed" or "played" based on status.
-            addButton(@"Mark as played", FontAwesome.Regular.TimesCircle, null);
-            addButton(@"Hide", FontAwesome.Solid.Magic, null);
-            addButton(@"Clear all local scores", FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(beatmapWhenOpening.BeatmapInfo), colours.Red1);
+            addButton(SongSelectStrings.MarkAsPlayed, FontAwesome.Regular.TimesCircle, null);
+            addButton(CommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, null);
+            addButton(SongSelectStrings.ClearAllLocalScores, FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(beatmapWhenOpening.BeatmapInfo), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
-                addButton(@"Edit beatmap", FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
+                addButton(SongSelectStrings.EditBeatmap, FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
         }
 
         protected override void LoadComplete()
@@ -81,7 +84,7 @@ namespace osu.Game.Screens.Select.FooterV2
         [Resolved]
         private OverlayColourProvider overlayColourProvider { get; set; } = null!;
 
-        private void addHeader(string text, string? context = null)
+        private void addHeader(LocalisableString text, string? context = null)
         {
             var textFlow = new OsuTextFlowContainer
             {

From 701e24e8d30467b52f5eadd871e42e4633d3cf5e Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 18:50:24 -0700
Subject: [PATCH 0455/2296] Move hide button to end and make it work

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

diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 20b9da4778..0a874cb653 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Select.FooterV2
         }
 
         [BackgroundDependencyLoader]
-        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours)
+        private void load(ManageCollectionsDialog? manageCollectionsDialog, SongSelect? songSelect, OsuColour colours, BeatmapManager? beatmapManager)
         {
             Content.Padding = new MarginPadding(5);
 
@@ -65,11 +65,12 @@ namespace osu.Game.Screens.Select.FooterV2
             addHeader(SongSelectStrings.ForSelectedDifficulty, beatmapWhenOpening.BeatmapInfo.DifficultyName);
             // TODO: make work, and make show "unplayed" or "played" based on status.
             addButton(SongSelectStrings.MarkAsPlayed, FontAwesome.Regular.TimesCircle, null);
-            addButton(CommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, null);
             addButton(SongSelectStrings.ClearAllLocalScores, FontAwesome.Solid.Eraser, () => songSelect?.ClearScores(beatmapWhenOpening.BeatmapInfo), colours.Red1);
 
             if (songSelect != null && songSelect.AllowEditing)
                 addButton(SongSelectStrings.EditBeatmap, FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
+
+            addButton(CommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, () => beatmapManager?.Hide(beatmapWhenOpening.BeatmapInfo));
         }
 
         protected override void LoadComplete()

From 73604d171ab5b31a0307d08e11bc37acafccf3d5 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 5 Sep 2023 23:00:07 -0700
Subject: [PATCH 0456/2296] Make "general" a common string

---
 osu.Game/Localisation/CommonStrings.cs                    | 5 +++++
 osu.Game/Localisation/DebugSettingsStrings.cs             | 5 -----
 osu.Game/Localisation/GameplaySettingsStrings.cs          | 5 -----
 osu.Game/Localisation/GeneralSettingsStrings.cs           | 5 -----
 osu.Game/Localisation/SongSelectStrings.cs                | 5 -----
 osu.Game/Localisation/UserInterfaceStrings.cs             | 5 -----
 osu.Game/Overlays/OSD/CopyUrlToast.cs                     | 2 +-
 .../Settings/Sections/DebugSettings/GeneralSettings.cs    | 2 +-
 .../Settings/Sections/Gameplay/GeneralSettings.cs         | 2 +-
 osu.Game/Overlays/Settings/Sections/GeneralSection.cs     | 2 +-
 .../Settings/Sections/UserInterface/GeneralSettings.cs    | 2 +-
 osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs | 8 ++++----
 12 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index 480d68619d..2c377a81d9 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -169,6 +169,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString RevertToDefault => new TranslatableString(getKey(@"revert_to_default"), @"Revert to default");
 
+        /// <summary>
+        /// "General"
+        /// </summary>
+        public static LocalisableString General => new TranslatableString(getKey(@"general"), @"General");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Localisation/DebugSettingsStrings.cs b/osu.Game/Localisation/DebugSettingsStrings.cs
index dd21739096..18fd3e83da 100644
--- a/osu.Game/Localisation/DebugSettingsStrings.cs
+++ b/osu.Game/Localisation/DebugSettingsStrings.cs
@@ -14,11 +14,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString DebugSectionHeader => new TranslatableString(getKey(@"debug_section_header"), @"Debug");
 
-        /// <summary>
-        /// "General"
-        /// </summary>
-        public static LocalisableString GeneralHeader => new TranslatableString(getKey(@"general_header"), @"General");
-
         /// <summary>
         /// "Show log overlay"
         /// </summary>
diff --git a/osu.Game/Localisation/GameplaySettingsStrings.cs b/osu.Game/Localisation/GameplaySettingsStrings.cs
index f52f6abb89..8ee76fdd55 100644
--- a/osu.Game/Localisation/GameplaySettingsStrings.cs
+++ b/osu.Game/Localisation/GameplaySettingsStrings.cs
@@ -19,11 +19,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString BeatmapHeader => new TranslatableString(getKey(@"beatmap_header"), @"Beatmap");
 
-        /// <summary>
-        /// "General"
-        /// </summary>
-        public static LocalisableString GeneralHeader => new TranslatableString(getKey(@"general_header"), @"General");
-
         /// <summary>
         /// "Audio"
         /// </summary>
diff --git a/osu.Game/Localisation/GeneralSettingsStrings.cs b/osu.Game/Localisation/GeneralSettingsStrings.cs
index a525af508b..ebf57d8109 100644
--- a/osu.Game/Localisation/GeneralSettingsStrings.cs
+++ b/osu.Game/Localisation/GeneralSettingsStrings.cs
@@ -9,11 +9,6 @@ namespace osu.Game.Localisation
     {
         private const string prefix = @"osu.Game.Resources.Localisation.GeneralSettings";
 
-        /// <summary>
-        /// "General"
-        /// </summary>
-        public static LocalisableString GeneralSectionHeader => new TranslatableString(getKey(@"general_section_header"), @"General");
-
         /// <summary>
         /// "Language"
         /// </summary>
diff --git a/osu.Game/Localisation/SongSelectStrings.cs b/osu.Game/Localisation/SongSelectStrings.cs
index 72c5643d52..e715ba8880 100644
--- a/osu.Game/Localisation/SongSelectStrings.cs
+++ b/osu.Game/Localisation/SongSelectStrings.cs
@@ -19,11 +19,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString LocallyModifiedTooltip => new TranslatableString(getKey(@"locally_modified_tooltip"), @"Has been locally modified");
 
-        /// <summary>
-        /// "General"
-        /// </summary>
-        public static LocalisableString General => new TranslatableString(getKey(@"general"), @"General");
-
         /// <summary>
         /// "Manage collections"
         /// </summary>
diff --git a/osu.Game/Localisation/UserInterfaceStrings.cs b/osu.Game/Localisation/UserInterfaceStrings.cs
index ea664d7b50..612668171c 100644
--- a/osu.Game/Localisation/UserInterfaceStrings.cs
+++ b/osu.Game/Localisation/UserInterfaceStrings.cs
@@ -14,11 +14,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString UserInterfaceSectionHeader => new TranslatableString(getKey(@"user_interface_section_header"), @"User Interface");
 
-        /// <summary>
-        /// "General"
-        /// </summary>
-        public static LocalisableString GeneralHeader => new TranslatableString(getKey(@"general_header"), @"General");
-
         /// <summary>
         /// "Rotate cursor when dragging"
         /// </summary>
diff --git a/osu.Game/Overlays/OSD/CopyUrlToast.cs b/osu.Game/Overlays/OSD/CopyUrlToast.cs
index ce5a5f56c4..2c5a9179f2 100644
--- a/osu.Game/Overlays/OSD/CopyUrlToast.cs
+++ b/osu.Game/Overlays/OSD/CopyUrlToast.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Overlays.OSD
     public partial class CopyUrlToast : Toast
     {
         public CopyUrlToast()
-            : base(UserInterfaceStrings.GeneralHeader, ToastStrings.UrlCopied, "")
+            : base(CommonStrings.General, ToastStrings.UrlCopied, "")
         {
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
index cf97743fde..049ccedf37 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSettings/GeneralSettings.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
 {
     public partial class GeneralSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => DebugSettingsStrings.GeneralHeader;
+        protected override LocalisableString Header => CommonStrings.General;
 
         [BackgroundDependencyLoader]
         private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, IPerformFromScreenRunner? performer)
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index c7f5aa5665..83e9140b33 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
 {
     public partial class GeneralSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => GameplaySettingsStrings.GeneralHeader;
+        protected override LocalisableString Header => CommonStrings.General;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
diff --git a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
index f4a79d65e6..2b043d40bc 100644
--- a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections
         [Resolved(CanBeNull = true)]
         private OsuGame? game { get; set; }
 
-        public override LocalisableString Header => GeneralSettingsStrings.GeneralSectionHeader;
+        public override LocalisableString Header => CommonStrings.General;
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
index 844b8aeac6..3f39980b43 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/GeneralSettings.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
     public partial class GeneralSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => UserInterfaceStrings.GeneralHeader;
+        protected override LocalisableString Header => CommonStrings.General;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
diff --git a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
index 0a874cb653..f81036f745 100644
--- a/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
+++ b/osu.Game/Screens/Select/FooterV2/BeatmapOptionsPopover.cs
@@ -18,12 +18,12 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
-using osu.Game.Localisation;
-using CommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
+using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
 
 namespace osu.Game.Screens.Select.FooterV2
 {
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Select.FooterV2
 
             beatmapWhenOpening = beatmap.Value;
 
-            addHeader(SongSelectStrings.General);
+            addHeader(CommonStrings.General);
             addButton(SongSelectStrings.ManageCollections, FontAwesome.Solid.Book, () => manageCollectionsDialog?.Show());
 
             addHeader(SongSelectStrings.ForAllDifficulties, beatmapWhenOpening.BeatmapSetInfo.ToString());
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Select.FooterV2
             if (songSelect != null && songSelect.AllowEditing)
                 addButton(SongSelectStrings.EditBeatmap, FontAwesome.Solid.PencilAlt, () => songSelect.Edit(beatmapWhenOpening.BeatmapInfo));
 
-            addButton(CommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, () => beatmapManager?.Hide(beatmapWhenOpening.BeatmapInfo));
+            addButton(WebCommonStrings.ButtonsHide.ToSentence(), FontAwesome.Solid.Magic, () => beatmapManager?.Hide(beatmapWhenOpening.BeatmapInfo));
         }
 
         protected override void LoadComplete()

From 034c887dcb3c71a2be8dd92911c86ac128ada2dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 15:04:25 +0900
Subject: [PATCH 0457/2296] Add animation support for beatmap status pills

To be used in conjunction with https://github.com/ppy/osu/pull/22116
---
 .../TestSceneBeatmapSetOnlineStatusPill.cs    | 28 +++++++++++++++++
 .../Drawables/BeatmapSetOnlineStatusPill.cs   | 30 +++++++++++++++----
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs
index 88e47ea560..dcc4654437 100644
--- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs
@@ -47,7 +47,35 @@ namespace osu.Game.Tests.Visual.Beatmaps
                 pill.AutoSizeAxes = Axes.Y;
                 pill.Width = 90;
             }));
+
             AddStep("unset fixed width", () => statusPills.ForEach(pill => pill.AutoSizeAxes = Axes.Both));
         }
+
+        [Test]
+        public void TestChangeLabels()
+        {
+            AddStep("Change labels", () =>
+            {
+                foreach (var pill in this.ChildrenOfType<BeatmapSetOnlineStatusPill>())
+                {
+                    switch (pill.Status)
+                    {
+                        // cycle at end
+                        case BeatmapOnlineStatus.Loved:
+                            pill.Status = BeatmapOnlineStatus.LocallyModified;
+                            break;
+
+                        // skip none
+                        case BeatmapOnlineStatus.LocallyModified:
+                            pill.Status = BeatmapOnlineStatus.Graveyard;
+                            break;
+
+                        default:
+                            pill.Status = (pill.Status + 1);
+                            break;
+                    }
+                }
+            });
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
index c353b9e904..f18355505a 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Beatmaps.Drawables
 {
     public partial class BeatmapSetOnlineStatusPill : CircularContainer, IHasTooltip
     {
+        private const double animation_duration = 400;
+
         private BeatmapOnlineStatus status;
 
         public BeatmapOnlineStatus Status
@@ -32,7 +34,12 @@ namespace osu.Game.Beatmaps.Drawables
                 status = value;
 
                 if (IsLoaded)
+                {
+                    AutoSizeDuration = (float)animation_duration;
+                    AutoSizeEasing = Easing.OutQuint;
+
                     updateState();
+                }
             }
         }
 
@@ -61,6 +68,8 @@ namespace osu.Game.Beatmaps.Drawables
         {
             Masking = true;
 
+            Alpha = 0;
+
             Children = new Drawable[]
             {
                 background = new Box
@@ -83,21 +92,32 @@ namespace osu.Game.Beatmaps.Drawables
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
             updateState();
+            FinishTransforms(true);
         }
 
         private void updateState()
         {
-            Alpha = Status == BeatmapOnlineStatus.None ? 0 : 1;
+            if (Status == BeatmapOnlineStatus.None)
+            {
+                this.FadeOut(animation_duration, Easing.OutQuint);
+                return;
+            }
 
-            statusText.Text = Status.GetLocalisableDescription().ToUpper();
+            this.FadeIn(animation_duration, Easing.OutQuint);
+
+            Color4 statusTextColour;
 
             if (colourProvider != null)
-                statusText.Colour = status == BeatmapOnlineStatus.Graveyard ? colourProvider.Background1 : colourProvider.Background3;
+                statusTextColour = status == BeatmapOnlineStatus.Graveyard ? colourProvider.Background1 : colourProvider.Background3;
             else
-                statusText.Colour = status == BeatmapOnlineStatus.Graveyard ? colours.GreySeaFoamLight : Color4.Black;
+                statusTextColour = status == BeatmapOnlineStatus.Graveyard ? colours.GreySeaFoamLight : Color4.Black;
 
-            background.Colour = OsuColour.ForBeatmapSetOnlineStatus(Status) ?? colourProvider?.Light1 ?? colours.GreySeaFoamLighter;
+            statusText.FadeColour(statusTextColour, animation_duration, Easing.OutQuint);
+            background.FadeColour(OsuColour.ForBeatmapSetOnlineStatus(Status) ?? colourProvider?.Light1 ?? colours.GreySeaFoamLighter, animation_duration, Easing.OutQuint);
+
+            statusText.Text = Status.GetLocalisableDescription().ToUpper();
         }
 
         public LocalisableString TooltipText

From b884f1af4aada2a8e196be5b0102b19c354df79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Sep 2023 08:18:39 +0200
Subject: [PATCH 0458/2296] Assign random statuses to beatmap sets in carousel
 test

Just to have visual coverage of the statuses before fixing them not
propagating to split difficulty mode.
---
 .../Visual/SongSelect/TestSceneBeatmapCarousel.cs     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 040b341584..c509d40e07 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -515,6 +515,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             checkVisibleItemCount(false, local_set_count * local_diff_count);
 
             var firstAdded = TestResources.CreateTestBeatmapSetInfo(local_diff_count);
+            firstAdded.Status = BeatmapOnlineStatus.Loved;
 
             AddStep("Add new set", () => carousel.UpdateBeatmapSet(firstAdded));
 
@@ -1176,12 +1177,18 @@ namespace osu.Game.Tests.Visual.SongSelect
             if (beatmapSets == null)
             {
                 beatmapSets = new List<BeatmapSetInfo>();
+                var statuses = Enum.GetValues<BeatmapOnlineStatus>()
+                                   .Except(new[] { BeatmapOnlineStatus.None }) // make sure a badge is always shown.
+                                   .ToArray();
 
                 for (int i = 1; i <= (setCount ?? set_count); i++)
                 {
-                    beatmapSets.Add(randomDifficulties
+                    var set = randomDifficulties
                         ? TestResources.CreateTestBeatmapSetInfo()
-                        : TestResources.CreateTestBeatmapSetInfo(diffCount ?? diff_count));
+                        : TestResources.CreateTestBeatmapSetInfo(diffCount ?? diff_count);
+                    set.Status = statuses[RNG.Next(statuses.Length)];
+
+                    beatmapSets.Add(set);
                 }
             }
 

From 63e92f8fabe450cd317e69286d8dbf033041b755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Sep 2023 08:25:19 +0200
Subject: [PATCH 0459/2296] Fix status on carousel beatmap set not showing in
 split difficulty mode

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 9ea94b2a52..16ae54b413 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -145,7 +145,8 @@ namespace osu.Game.Screens.Select
                     return createCarouselSet(new BeatmapSetInfo(new[] { b })
                     {
                         ID = b.BeatmapSet!.ID,
-                        OnlineID = b.BeatmapSet!.OnlineID
+                        OnlineID = b.BeatmapSet!.OnlineID,
+                        Status = b.BeatmapSet!.Status,
                     });
                 }).OfType<CarouselBeatmapSet>();
 
@@ -431,7 +432,8 @@ namespace osu.Game.Screens.Select
                     var newSet = createCarouselSet(new BeatmapSetInfo(new[] { beatmap })
                     {
                         ID = beatmapSet.ID,
-                        OnlineID = beatmapSet.OnlineID
+                        OnlineID = beatmapSet.OnlineID,
+                        Status = beatmapSet.Status,
                     });
 
                     if (newSet != null)

From 6c95b88589d60f1406959437e6aa2f04d202d722 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 17:37:17 +0900
Subject: [PATCH 0460/2296] Add debug output for skin configuration lookups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We've struggle with debugging these over the years so I think this was
worth a couple of hours of work.

Example of osu! lookups:

```log
[runtime] 2023-09-06 08:38:30 [verbose]: BeatmapSkinProvidingContainer.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacyBeatmapSkin{ Name: Vickeblanka - Lucky Ending (TV Size) (tears_) [Normal] } } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: SpinnerFrequencyModulate) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: SpinnerFrequencyModulate) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: osu.Game.Skinning.ResourceStoreBackedSkin }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-osu.Game.Skinning.ResourceStoreBackedSkin.GetConfig(lookup: SpinnerFrequencyModulate) 🔴
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: TrianglesSkin{ Name: osu! "triangles" (2017) } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-TrianglesSkin{ Name: osu! "triangles" (2017) }.GetConfig(lookup: SpinnerFrequencyModulate) 🔴
[runtime] 2023-09-06 08:38:30 [verbose]:
[runtime] 2023-09-06 08:38:30 [verbose]: BeatmapSkinProvidingContainer.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacyBeatmapSkin{ Name: Vickeblanka - Lucky Ending (TV Size) (tears_) [Normal] } } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: ScorePrefix) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: ScorePrefix) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: osu.Game.Skinning.ResourceStoreBackedSkin }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-osu.Game.Skinning.ResourceStoreBackedSkin.GetConfig(lookup: ScorePrefix) 🔴
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: TrianglesSkin{ Name: osu! "triangles" (2017) } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-TrianglesSkin{ Name: osu! "triangles" (2017) }.GetConfig(lookup: ScorePrefix) 🔴
```

Example of osu!mania lookups:

```log
[runtime] 2023-09-06 08:28:34 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnWidth col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnWidth col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4]) 🔴
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnWidth col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4]) 🟢
[runtime] 2023-09-06 08:28:34 [verbose]:
[runtime] 2023-09-06 08:28:34 [verbose]: BeatmapSkinProvidingContainer.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacyBeatmapSkin{ Name: antiPLUR - Runengon (Raveille) [Easy] } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4]) 🔴
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4]) 🟢
[runtime] 2023-09-06 08:28:34 [verbose]:

```
---
 .../Skinning/ManiaSkinConfigurationLookup.cs  |  2 +
 osu.Game/Skinning/ArgonSkin.cs                |  5 ++
 osu.Game/Skinning/LegacyBeatmapSkin.cs        |  2 +
 .../LegacyManiaSkinConfigurationLookup.cs     |  2 +
 osu.Game/Skinning/LegacySkin.cs               | 74 +++++++++++--------
 osu.Game/Skinning/ResourceStoreBackedSkin.cs  |  5 +-
 osu.Game/Skinning/Skin.cs                     | 52 +++++++++++++
 osu.Game/Skinning/SkinManager.cs              | 19 +++--
 osu.Game/Skinning/SkinProvidingContainer.cs   | 65 ++++++++++------
 osu.Game/Skinning/SkinTransformer.cs          | 15 +++-
 osu.Game/Skinning/TrianglesSkin.cs            |  5 ++
 11 files changed, 185 insertions(+), 61 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
index 6c39ffdcc3..aa50aeb130 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
@@ -30,5 +30,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             Lookup = lookup;
             ColumnIndex = columnIndex;
         }
+
+        public override string ToString() => $"[{nameof(ManiaSkinConfigurationLookup)} lookup:{Lookup} col:{ColumnIndex}]";
     }
 }
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 61b0dc5aa1..6e17458082 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -219,15 +219,20 @@ namespace osu.Game.Skinning
                     switch (global)
                     {
                         case GlobalSkinColours.ComboColours:
+                        {
+                            LogLookupDebug(this, lookup, LookupDebugType.Hit);
                             return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>?>(Configuration.ComboColours));
+                        }
                     }
 
                     break;
 
                 case SkinComboColourLookup comboColour:
+                    LogLookupDebug(this, lookup, LookupDebugType.Hit);
                     return SkinUtils.As<TValue>(new Bindable<Color4>(getComboColour(Configuration, comboColour.ColourIndex)));
             }
 
+            LogLookupDebug(this, lookup, LookupDebugType.Miss);
             return null;
         }
 
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 1cbfda16cf..83dcc3895d 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -72,6 +72,8 @@ namespace osu.Game.Skinning
                     // If it is decided that we need this due to beatmaps somehow using it, the default (1.0 specified in LegacySkinDecoder.CreateTemplateObject)
                     // needs to be removed else it will cause incorrect skin behaviours. This is due to the config lookup having no context of which skin
                     // it should be returning the version for.
+
+                    Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Miss);
                     return null;
             }
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index a2408a92bb..784e57708e 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Skinning
             Lookup = lookup;
             ColumnIndex = columnIndex;
         }
+
+        public override string ToString() => $"[{nameof(LegacyManiaSkinConfigurationLookup)} lookup:{Lookup} col:{ColumnIndex} totalcols:{TotalColumns}]";
     }
 
     public enum LegacyManiaSkinConfigurationLookups
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index cf51fa8f74..ab0d608d3e 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -84,48 +84,58 @@ namespace osu.Game.Skinning
 
         public override IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
         {
-            switch (lookup)
+            bool wasHit = true;
+
+            try
             {
-                case GlobalSkinColours colour:
-                    switch (colour)
-                    {
-                        case GlobalSkinColours.ComboColours:
-                            var comboColours = Configuration.ComboColours;
-                            if (comboColours != null)
-                                return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>>(comboColours));
+                switch (lookup)
+                {
+                    case GlobalSkinColours colour:
+                        switch (colour)
+                        {
+                            case GlobalSkinColours.ComboColours:
+                                var comboColours = Configuration.ComboColours;
+                                if (comboColours != null)
+                                    return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>>(comboColours));
 
-                            break;
+                                break;
 
-                        default:
-                            return SkinUtils.As<TValue>(getCustomColour(Configuration, colour.ToString()));
-                    }
+                            default:
+                                return SkinUtils.As<TValue>(getCustomColour(Configuration, colour.ToString()));
+                        }
 
-                    break;
-
-                case SkinComboColourLookup comboColour:
-                    return SkinUtils.As<TValue>(GetComboColour(Configuration, comboColour.ColourIndex, comboColour.Combo));
-
-                case SkinCustomColourLookup customColour:
-                    return SkinUtils.As<TValue>(getCustomColour(Configuration, customColour.Lookup.ToString() ?? string.Empty));
-
-                case LegacyManiaSkinConfigurationLookup maniaLookup:
-                    if (!AllowManiaSkin)
                         break;
 
-                    var result = lookupForMania<TValue>(maniaLookup);
-                    if (result != null)
-                        return result;
+                    case SkinComboColourLookup comboColour:
+                        return SkinUtils.As<TValue>(GetComboColour(Configuration, comboColour.ColourIndex, comboColour.Combo));
 
-                    break;
+                    case SkinCustomColourLookup customColour:
+                        return SkinUtils.As<TValue>(getCustomColour(Configuration, customColour.Lookup.ToString() ?? string.Empty));
 
-                case SkinConfiguration.LegacySetting legacy:
-                    return legacySettingLookup<TValue>(legacy);
+                    case LegacyManiaSkinConfigurationLookup maniaLookup:
+                        if (!AllowManiaSkin)
+                            break;
 
-                default:
-                    return genericLookup<TLookup, TValue>(lookup);
+                        var result = lookupForMania<TValue>(maniaLookup);
+                        if (result != null)
+                            return result;
+
+                        break;
+
+                    case SkinConfiguration.LegacySetting legacy:
+                        return legacySettingLookup<TValue>(legacy);
+
+                    default:
+                        return genericLookup<TLookup, TValue>(lookup);
+                }
+
+                wasHit = false;
+                return null;
+            }
+            finally
+            {
+                LogLookupDebug(this, lookup, wasHit ? LookupDebugType.Hit : LookupDebugType.Miss);
             }
-
-            return null;
         }
 
         private IBindable<TValue>? lookupForMania<TValue>(LegacyManiaSkinConfigurationLookup maniaLookup)
diff --git a/osu.Game/Skinning/ResourceStoreBackedSkin.cs b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
index f5c6192ba5..206c400a88 100644
--- a/osu.Game/Skinning/ResourceStoreBackedSkin.cs
+++ b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
@@ -46,7 +46,10 @@ namespace osu.Game.Skinning
         public IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
             where TLookup : notnull
             where TValue : notnull
-            => null;
+        {
+            Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Miss);
+            return null;
+        }
 
         public void Dispose()
         {
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index a6250d7488..d979cab72b 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -6,10 +6,13 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
+using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
@@ -54,6 +57,8 @@ namespace osu.Game.Skinning
 
         private readonly RealmBackedResourceStore<SkinInfo>? realmBackedStorage;
 
+        public string Name { get; }
+
         /// <summary>
         /// Construct a new skin.
         /// </summary>
@@ -63,6 +68,8 @@ namespace osu.Game.Skinning
         /// <param name="configurationFilename">An optional filename to read the skin configuration from. If not provided, the configuration will be retrieved from the storage using "skin.ini".</param>
         protected Skin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? storage = null, string configurationFilename = @"skin.ini")
         {
+            Name = skin.Name;
+
             if (resources != null)
             {
                 SkinInfo = skin.ToLive(resources.RealmAccess);
@@ -239,5 +246,50 @@ namespace osu.Game.Skinning
         }
 
         #endregion
+
+        public override string ToString() => $"{GetType().ReadableName()}{{ Name: {Name} }}";
+
+        private static readonly ThreadLocal<int> nested_level = new ThreadLocal<int>(() => 0);
+
+        [Conditional("SKIN_LOOKUP_DEBUG")]
+        internal static void LogLookupDebug(object callingClass, object lookup, LookupDebugType type, [CallerMemberName] string callerMethod = "")
+        {
+            string icon = string.Empty;
+            int level = nested_level.Value;
+
+            switch (type)
+            {
+                case LookupDebugType.Hit:
+                    icon = "🟢";
+                    break;
+
+                case LookupDebugType.Miss:
+                    icon = "🔴";
+                    break;
+
+                case LookupDebugType.Enter:
+                    nested_level.Value++;
+                    break;
+
+                case LookupDebugType.Exit:
+                    nested_level.Value--;
+                    if (nested_level.Value == 0)
+                        Logger.Log(string.Empty);
+                    return;
+            }
+
+            string lookupString = lookup.ToString() ?? string.Empty;
+            string callingClassString = callingClass.ToString() ?? string.Empty;
+
+            Logger.Log($"{string.Join(null, Enumerable.Repeat("|-", level))}{callingClassString}.{callerMethod}(lookup: {lookupString}) {icon}");
+        }
+
+        internal enum LookupDebugType
+        {
+            Hit,
+            Miss,
+            Enter,
+            Exit
+        }
     }
 }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 51605c6045..ca46d3af0c 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -261,13 +261,22 @@ namespace osu.Game.Skinning
         private T lookupWithFallback<T>(Func<ISkin, T> lookupFunction)
             where T : class
         {
-            foreach (var source in AllSources)
+            try
             {
-                if (lookupFunction(source) is T skinSourced)
-                    return skinSourced;
-            }
+                Skin.LogLookupDebug(this, lookupFunction, Skin.LookupDebugType.Enter);
 
-            return null;
+                foreach (var source in AllSources)
+                {
+                    if (lookupFunction(source) is T skinSourced)
+                        return skinSourced;
+                }
+
+                return null;
+            }
+            finally
+            {
+                Skin.LogLookupDebug(this, lookupFunction, Skin.LookupDebugType.Exit);
+            }
         }
 
         #region IResourceStorageProvider
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 2612e0b47c..2d2a2e48f6 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
@@ -161,17 +162,26 @@ namespace osu.Game.Skinning
             where TLookup : notnull
             where TValue : notnull
         {
-            foreach (var (_, lookupWrapper) in skinSources)
+            try
             {
-                IBindable<TValue>? bindable;
-                if ((bindable = lookupWrapper.GetConfig<TLookup, TValue>(lookup)) != null)
-                    return bindable;
+                Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Enter);
+
+                foreach (var (_, lookupWrapper) in skinSources)
+                {
+                    IBindable<TValue>? bindable;
+                    if ((bindable = lookupWrapper.GetConfig<TLookup, TValue>(lookup)) != null)
+                        return bindable;
+                }
+
+                if (!AllowFallingBackToParent)
+                    return null;
+
+                return ParentSource?.GetConfig<TLookup, TValue>(lookup);
+            }
+            finally
+            {
+                Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Exit);
             }
-
-            if (!AllowFallingBackToParent)
-                return null;
-
-            return ParentSource?.GetConfig<TLookup, TValue>(lookup);
         }
 
         /// <summary>
@@ -271,25 +281,36 @@ namespace osu.Game.Skinning
                 where TLookup : notnull
                 where TValue : notnull
             {
-                switch (lookup)
+                try
                 {
-                    case GlobalSkinColours:
-                    case SkinComboColourLookup:
-                    case SkinCustomColourLookup:
-                        if (provider.AllowColourLookup)
-                            return skin.GetConfig<TLookup, TValue>(lookup);
+                    Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Enter);
 
-                        break;
+                    switch (lookup)
+                    {
+                        case GlobalSkinColours:
+                        case SkinComboColourLookup:
+                        case SkinCustomColourLookup:
+                            if (provider.AllowColourLookup)
+                                return skin.GetConfig<TLookup, TValue>(lookup);
 
-                    default:
-                        if (provider.AllowConfigurationLookup)
-                            return skin.GetConfig<TLookup, TValue>(lookup);
+                            break;
 
-                        break;
+                        default:
+                            if (provider.AllowConfigurationLookup)
+                                return skin.GetConfig<TLookup, TValue>(lookup);
+
+                            break;
+                    }
+
+                    return null;
+                }
+                finally
+                {
+                    Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Exit);
                 }
-
-                return null;
             }
+
+            public override string ToString() => $"{GetType().ReadableName()}{{ skin: {skin} }}";
         }
     }
 }
diff --git a/osu.Game/Skinning/SkinTransformer.cs b/osu.Game/Skinning/SkinTransformer.cs
index ed5b04da1e..4e7dd4f222 100644
--- a/osu.Game/Skinning/SkinTransformer.cs
+++ b/osu.Game/Skinning/SkinTransformer.cs
@@ -34,6 +34,19 @@ namespace osu.Game.Skinning
 
         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);
+        public virtual IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup) where TLookup : notnull where TValue : notnull
+        {
+            try
+            {
+                Skinning.Skin.LogLookupDebug(this, lookup, Skinning.Skin.LookupDebugType.Enter);
+                return Skin.GetConfig<TLookup, TValue>(lookup);
+            }
+            finally
+            {
+                Skinning.Skin.LogLookupDebug(this, lookup, Skinning.Skin.LookupDebugType.Exit);
+            }
+        }
+
+        public override string ToString() => $"{nameof(SkinTransformer)}{{ Skin: {Skin} }}";
     }
 }
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index 0957f60579..a2dca5d333 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -190,15 +190,20 @@ namespace osu.Game.Skinning
                     switch (global)
                     {
                         case GlobalSkinColours.ComboColours:
+                        {
+                            LogLookupDebug(this, lookup, LookupDebugType.Hit);
                             return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>?>(Configuration.ComboColours));
+                        }
                     }
 
                     break;
 
                 case SkinComboColourLookup comboColour:
+                    LogLookupDebug(this, lookup, LookupDebugType.Hit);
                     return SkinUtils.As<TValue>(new Bindable<Color4>(getComboColour(Configuration, comboColour.ColourIndex)));
             }
 
+            LogLookupDebug(this, lookup, LookupDebugType.Miss);
             return null;
         }
 

From 14936677fc9182cf525a158d6bfa46d736b22785 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 17:57:32 +0900
Subject: [PATCH 0461/2296] Ignore unused thing inspection

---
 osu.Game/Skinning/LegacySkin.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index ab0d608d3e..f286dfb776 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -84,6 +84,7 @@ namespace osu.Game.Skinning
 
         public override IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
         {
+            // ReSharper disable once RedundantAssignment (used in `finally` debug logic)
             bool wasHit = true;
 
             try

From 88b9d3237aeac4809500788387da75c8db09c0f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 18:00:49 +0900
Subject: [PATCH 0462/2296] Fix osu!mania legacy skin configurations not
 working when notes are not skinned

---
 osu.Game/Skinning/LegacyBeatmapSkin.cs |  2 +-
 osu.Game/Skinning/LegacySkin.cs        | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 83dcc3895d..90eb5fa013 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Skinning
 {
     public class LegacyBeatmapSkin : LegacySkin
     {
-        protected override bool AllowManiaSkin => false;
+        protected override bool AllowManiaConfigLookups => false;
         protected override bool UseCustomSampleBanks => true;
 
         /// <summary>
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index f286dfb776..1f485cbdf6 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -29,13 +29,7 @@ namespace osu.Game.Skinning
 {
     public class LegacySkin : Skin
     {
-        /// <summary>
-        /// Whether texture for the keys exists.
-        /// Used to determine if the mania ruleset is skinned.
-        /// </summary>
-        private readonly Lazy<bool> hasKeyTexture;
-
-        protected virtual bool AllowManiaSkin => hasKeyTexture.Value;
+        protected virtual bool AllowManiaConfigLookups => true;
 
         /// <summary>
         /// Whether this skin can use samples with a custom bank (custom sample set in stable terminology).
@@ -61,10 +55,6 @@ namespace osu.Game.Skinning
         protected LegacySkin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? storage, string configurationFilename = @"skin.ini")
             : base(skin, resources, storage, configurationFilename)
         {
-            // todo: this shouldn't really be duplicated here (from ManiaLegacySkinTransformer). we need to come up with a better solution.
-            hasKeyTexture = new Lazy<bool>(() => this.GetAnimation(
-                lookupForMania<string>(new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value ?? "mania-key1", true,
-                true) != null);
         }
 
         protected override void ParseConfigurationStream(Stream stream)
@@ -114,7 +104,7 @@ namespace osu.Game.Skinning
                         return SkinUtils.As<TValue>(getCustomColour(Configuration, customColour.Lookup.ToString() ?? string.Empty));
 
                     case LegacyManiaSkinConfigurationLookup maniaLookup:
-                        if (!AllowManiaSkin)
+                        if (!AllowManiaConfigLookups)
                             break;
 
                         var result = lookupForMania<TValue>(maniaLookup);

From d06490220d323c5ee5de302e62bcc2ff6cb24d20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 18:58:58 +0900
Subject: [PATCH 0463/2296] Add better xmldoc for `Slider.Velocity`

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 4189f8ba1e..9c0dda1ed3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         public double SpanDuration => Duration / this.SpanCount();
 
         /// <summary>
-        /// Velocity of this <see cref="Slider"/>.
+        /// The computed velocity of this <see cref="Slider"/>. This is the amount of path distance travelled in 1 ms.
         /// </summary>
         public double Velocity { get; private set; }
 

From 1a37543d288fa3b62d19a34d443ee97943920fbd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Sep 2023 18:59:15 +0900
Subject: [PATCH 0464/2296] Rename `SliderVelocity` to
 `SliderVelocityMultiplier` to distinguish from `Velocity`

---
 .../Editor/TestSceneJuiceStreamPlacementBlueprint.cs |  4 ++--
 .../Editor/TestSceneJuiceStreamSelectionBlueprint.cs |  4 ++--
 .../Beatmaps/CatchBeatmapConverter.cs                |  2 +-
 .../Edit/Blueprints/Components/EditablePath.cs       |  2 +-
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs       | 12 ++++++------
 .../Legacy/DistanceObjectPatternGenerator.cs         |  2 +-
 .../Mods/TestSceneOsuModAutoplay.cs                  |  2 +-
 .../TestSceneSliderFollowCircleInput.cs              |  2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs  |  2 +-
 .../TestSceneStartTimeOrderedHitPolicy.cs            |  2 +-
 .../Beatmaps/OsuBeatmapConverter.cs                  |  2 +-
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs   |  4 ++--
 osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs   |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs              | 10 +++++-----
 .../Beatmaps/TaikoBeatmapConverter.cs                |  4 ++--
 .../TestSceneHitObjectComposerDistanceSnapping.cs    |  6 +++---
 .../TestSceneHitObjectDifficultyPointAdjustments.cs  |  6 +++---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs    |  2 +-
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs    |  2 +-
 osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs |  2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs    | 10 +++++-----
 .../Rulesets/Objects/Types/IHasSliderVelocity.cs     |  4 ++--
 .../Edit/Compose/Components/HitObjectInspector.cs    |  2 +-
 .../Components/Timeline/DifficultyPointPiece.cs      | 10 +++++-----
 .../Timeline/TimelineHitObjectBlueprint.cs           |  6 +++---
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs  |  2 +-
 26 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
index 2426f8c886..d010bb02ad 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
             AddAssert("end time is correct", () => Precision.AlmostEquals(lastObject.EndTime, times[1]));
             AddAssert("start position is correct", () => Precision.AlmostEquals(lastObject.OriginalX, positions[0]));
             AddAssert("end position is correct", () => Precision.AlmostEquals(lastObject.EndX, positions[1]));
-            AddAssert("default slider velocity", () => lastObject.SliderVelocityBindable.IsDefault);
+            AddAssert("default slider velocity", () => lastObject.SliderVelocityMultiplierBindable.IsDefault);
         }
 
         [Test]
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
             addPlacementSteps(times, positions);
             addPathCheckStep(times, positions);
 
-            AddAssert("slider velocity changed", () => !lastObject.SliderVelocityBindable.IsDefault);
+            AddAssert("slider velocity changed", () => !lastObject.SliderVelocityMultiplierBindable.IsDefault);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
index beba5811fe..05d7a38a95 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
@@ -108,11 +108,11 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
             double[] times = { 100, 300 };
             float[] positions = { 200, 300 };
             addBlueprintStep(times, positions);
-            AddAssert("default slider velocity", () => hitObject.SliderVelocityBindable.IsDefault);
+            AddAssert("default slider velocity", () => hitObject.SliderVelocityMultiplierBindable.IsDefault);
 
             addDragStartStep(times[1], positions[1]);
             AddMouseMoveStep(times[1], 400);
-            AddAssert("slider velocity changed", () => !hitObject.SliderVelocityBindable.IsDefault);
+            AddAssert("slider velocity changed", () => !hitObject.SliderVelocityMultiplierBindable.IsDefault);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 2c8ef9eae0..5e8a0b1216 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         ComboOffset = comboData?.ComboOffset ?? 0,
                         LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0,
                         LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y,
-                        SliderVelocity = sliderVelocityData?.SliderVelocity ?? 1
+                        SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1
                     }.Yield();
 
                 case IHasDuration endTime:
diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
index 7a577f8a83..df76bf0a8c 100644
--- a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
+++ b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
         public void UpdateHitObjectFromPath(JuiceStream hitObject)
         {
             // The SV setting may need to be changed for the current path.
-            var svBindable = hitObject.SliderVelocityBindable;
+            var svBindable = hitObject.SliderVelocityMultiplierBindable;
             double svToVelocityFactor = hitObject.Velocity / svBindable.Value;
             double requiredVelocity = path.ComputeRequiredVelocity();
 
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 169e99c90c..724bdc3401 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -28,17 +28,17 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public int RepeatCount { get; set; }
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1)
+        public BindableNumber<double> SliderVelocityMultiplierBindable { get; } = new BindableDouble(1)
         {
             Precision = 0.01,
             MinValue = 0.1,
             MaxValue = 10
         };
 
-        public double SliderVelocity
+        public double SliderVelocityMultiplier
         {
-            get => SliderVelocityBindable.Value;
-            set => SliderVelocityBindable.Value = value;
+            get => SliderVelocityMultiplierBindable.Value;
+            set => SliderVelocityMultiplierBindable.Value = value;
         }
 
         [JsonIgnore]
@@ -48,10 +48,10 @@ namespace osu.Game.Rulesets.Catch.Objects
         private double tickDistanceFactor;
 
         [JsonIgnore]
-        public double Velocity => velocityFactor * SliderVelocity;
+        public double Velocity => velocityFactor * SliderVelocityMultiplier;
 
         [JsonIgnore]
-        public double TickDistance => tickDistanceFactor * SliderVelocity;
+        public double TickDistance => tickDistanceFactor * SliderVelocityMultiplier;
 
         /// <summary>
         /// The length of one span of this <see cref="JuiceStream"/>.
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 91b7be6e8f..49c1a055a6 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             if (hitObject.LegacyBpmMultiplier.HasValue)
                 beatLength = timingPoint.BeatLength * hitObject.LegacyBpmMultiplier.Value;
             else if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocity;
+                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocityMultiplier;
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index 32028823ae..6980438b59 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                                 new PathControlPoint(new Vector2(0, 6.25f))
                             }),
                             RepeatCount = 1,
-                            SliderVelocity = 10
+                            SliderVelocityMultiplier = 10
                         }
                     }
                 },
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
index fc2e6d1f72..5adc50859f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     {
                         StartTime = time_slider_start,
                         Position = new Vector2(0, 0),
-                        SliderVelocity = velocity,
+                        SliderVelocityMultiplier = velocity,
                         Path = new SliderPath(PathType.Linear, new[]
                         {
                             Vector2.Zero,
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index d83926ab9b..644524f532 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -349,7 +349,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                         {
                             StartTime = time_slider_start,
                             Position = new Vector2(0, 0),
-                            SliderVelocity = 0.1f,
+                            SliderVelocityMultiplier = 0.1f,
                             Path = new SliderPath(PathType.PerfectCurve, new[]
                             {
                                 Vector2.Zero,
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index 909eb821cf..f0af3f0c39 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -451,7 +451,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             public TestSlider()
             {
-                SliderVelocity = 0.1f;
+                SliderVelocityMultiplier = 0.1f;
 
                 DefaultsApplied += _ =>
                 {
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index 9e786caf0c..f3aaf831d3 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         // this results in more (or less) ticks being generated in <v8 maps for the same time duration.
                         TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(original.StartTime).SliderVelocity : 1,
                         GenerateTicks = generateTicksData?.GenerateTicks ?? true,
-                        SliderVelocity = sliderVelocityData?.SliderVelocity ?? 1,
+                        SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1,
                     }.Yield();
 
                 case IHasDuration endTimeData:
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 966092c6fe..ba7b855511 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -85,9 +85,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     BeginPlacement();
 
                     double? nearestSliderVelocity = (editorBeatmap.HitObjects
-                                                                  .LastOrDefault(h => h is Slider && h.GetEndTime() < HitObject.StartTime) as Slider)?.SliderVelocity;
+                                                                  .LastOrDefault(h => h is Slider && h.GetEndTime() < HitObject.StartTime) as Slider)?.SliderVelocityMultiplier;
 
-                    HitObject.SliderVelocity = nearestSliderVelocity ?? 1;
+                    HitObject.SliderVelocityMultiplier = nearestSliderVelocity ?? 1;
                     HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
 
                     // Replacing the DifficultyControlPoint above doesn't trigger any kind of invalidation.
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
index 72031b4958..9b5d405025 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 ComboOffset = original.ComboOffset;
                 LegacyLastTickOffset = original.LegacyLastTickOffset;
                 TickDistanceMultiplier = original.TickDistanceMultiplier;
-                SliderVelocity = original.SliderVelocity;
+                SliderVelocityMultiplier = original.SliderVelocityMultiplier;
             }
 
             protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 9c0dda1ed3..1e7e8e2981 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -134,17 +134,17 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public bool OnlyJudgeNestedObjects = true;
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1)
+        public BindableNumber<double> SliderVelocityMultiplierBindable { get; } = new BindableDouble(1)
         {
             Precision = 0.01,
             MinValue = 0.1,
             MaxValue = 10
         };
 
-        public double SliderVelocity
+        public double SliderVelocityMultiplier
         {
-            get => SliderVelocityBindable.Value;
-            set => SliderVelocityBindable.Value = value;
+            get => SliderVelocityMultiplierBindable.Value;
+            set => SliderVelocityMultiplierBindable.Value = value;
         }
 
         public bool GenerateTicks { get; set; } = true;
@@ -167,7 +167,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * SliderVelocity;
+            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * SliderVelocityMultiplier;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 5f3d0f898e..3e9252e1fd 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 {
                     if (hitObject is not IHasSliderVelocity hasSliderVelocity) continue;
 
-                    double nextScrollSpeed = hasSliderVelocity.SliderVelocity;
+                    double nextScrollSpeed = hasSliderVelocity.SliderVelocityMultiplier;
                     EffectControlPoint currentEffectPoint = converted.ControlPointInfo.EffectPointAt(hitObject.StartTime);
 
                     if (!Precision.AlmostEquals(lastScrollSpeed, nextScrollSpeed, acceptableDifference: currentEffectPoint.ScrollSpeedBindable.Precision))
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             if (obj.LegacyBpmMultiplier.HasValue)
                 beatLength = timingPoint.BeatLength * obj.LegacyBpmMultiplier.Value;
             else if (obj is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocity;
+                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocityMultiplier;
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index e30caac95e..6b78eea009 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Editing
         {
             assertSnapDistance(100, new Slider
             {
-                SliderVelocity = multiplier
+                SliderVelocityMultiplier = multiplier
             }, false);
         }
 
@@ -88,7 +88,7 @@ namespace osu.Game.Tests.Editing
         {
             assertSnapDistance(100 * multiplier, new Slider
             {
-                SliderVelocity = multiplier
+                SliderVelocityMultiplier = multiplier
             }, true);
         }
 
@@ -112,7 +112,7 @@ namespace osu.Game.Tests.Editing
 
             var referenceObject = new Slider
             {
-                SliderVelocity = slider_velocity
+                SliderVelocityMultiplier = slider_velocity
             };
 
             assertSnapDistance(base_distance * slider_velocity, referenceObject, true);
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
index c78f50c821..530b3db208 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Editing
                             new PathControlPoint(new Vector2(100, 0))
                         }
                     },
-                    SliderVelocity = 2
+                    SliderVelocityMultiplier = 2
                 });
             });
         }
@@ -110,7 +110,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("unify slider velocity", () =>
             {
                 foreach (var h in EditorBeatmap.HitObjects.OfType<IHasSliderVelocity>())
-                    h.SliderVelocity = 1.5;
+                    h.SliderVelocityMultiplier = 1.5;
             });
 
             AddStep("select both objects", () => EditorBeatmap.SelectedHitObjects.AddRange(EditorBeatmap.HitObjects));
@@ -194,7 +194,7 @@ namespace osu.Game.Tests.Visual.Editing
         private void hitObjectHasVelocity(int objectIndex, double velocity) => AddAssert($"{objectIndex.ToOrdinalWords()} has velocity {velocity}", () =>
         {
             var h = EditorBeatmap.HitObjects.ElementAt(objectIndex);
-            return h is IHasSliderVelocity hasSliderVelocity && hasSliderVelocity.SliderVelocity == velocity;
+            return h is IHasSliderVelocity hasSliderVelocity && hasSliderVelocity.SliderVelocityMultiplier == velocity;
         });
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 5da51f6c8e..7c375b7604 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Beatmaps.Formats
             }
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                hasSliderVelocity.SliderVelocity = difficultyControlPoint.SliderVelocity;
+                hasSliderVelocity.SliderVelocityMultiplier = difficultyControlPoint.SliderVelocity;
 
             hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty);
         }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index fc9de13c89..4f8e935ee4 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -269,7 +269,7 @@ namespace osu.Game.Beatmaps.Formats
                 foreach (var hitObject in hitObjects)
                 {
                     if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                        yield return new DifficultyControlPoint { Time = hitObject.StartTime, SliderVelocity = hasSliderVelocity.SliderVelocity };
+                        yield return new DifficultyControlPoint { Time = hitObject.StartTime, SliderVelocity = hasSliderVelocity.SliderVelocityMultiplier };
                 }
             }
 
diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index 817e8bd5fe..e08cb41a26 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -244,7 +244,7 @@ namespace osu.Game.Rulesets.Edit
 
         public virtual float GetBeatSnapDistanceAt(HitObject referenceObject, bool useReferenceSliderVelocity = true)
         {
-            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocity : 1) * EditorBeatmap.Difficulty.SliderMultiplier * 1
+            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocityMultiplier : 1) * EditorBeatmap.Difficulty.SliderMultiplier * 1
                            / BeatSnapProvider.BeatDivisor);
         }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 7ddd372dc9..d91ecf956a 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -41,12 +41,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
         public double Velocity = 1;
 
-        public BindableNumber<double> SliderVelocityBindable { get; } = new BindableDouble(1);
+        public BindableNumber<double> SliderVelocityMultiplierBindable { get; } = new BindableDouble(1);
 
-        public double SliderVelocity
+        public double SliderVelocityMultiplier
         {
-            get => SliderVelocityBindable.Value;
-            set => SliderVelocityBindable.Value = value;
+            get => SliderVelocityMultiplierBindable.Value;
+            set => SliderVelocityMultiplierBindable.Value = value;
         }
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier * SliderVelocity;
+            double scoringDistance = base_scoring_distance * difficulty.SliderMultiplier * SliderVelocityMultiplier;
 
             Velocity = scoringDistance / timingPoint.BeatLength;
         }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
index 80fd8dd8dc..e665dcc752 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// The slider velocity multiplier.
         /// </summary>
-        double SliderVelocity { get; set; }
+        double SliderVelocityMultiplier { get; set; }
 
-        BindableNumber<double> SliderVelocityBindable { get; }
+        BindableNumber<double> SliderVelocityMultiplierBindable { get; }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
index 7beaf7d086..ac339dc9d9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectInspector.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     if (selected is IHasSliderVelocity sliderVelocity)
                     {
                         AddHeader("Slider Velocity");
-                        AddValue($"{sliderVelocity.SliderVelocity:#,0.00}x ({sliderVelocity.SliderVelocity * EditorBeatmap.Difficulty.SliderMultiplier:#,0.00}x)");
+                        AddValue($"{sliderVelocity.SliderVelocityMultiplier:#,0.00}x ({sliderVelocity.SliderVelocityMultiplier * EditorBeatmap.Difficulty.SliderMultiplier:#,0.00}x)");
                     }
 
                     if (selected is IHasRepeats repeats)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 99fb2ab874..ca1e9a5d9b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             HitObject = hitObject;
 
-            speedMultiplier = (hitObject as IHasSliderVelocity)?.SliderVelocityBindable.GetBoundCopy();
+            speedMultiplier = (hitObject as IHasSliderVelocity)?.SliderVelocityMultiplierBindable.GetBoundCopy();
         }
 
         protected override Color4 GetRepresentingColour(OsuColour colours) => colours.Lime1;
@@ -106,8 +106,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 var relevantObjects = (beatmap.SelectedHitObjects.Contains(hitObject) ? beatmap.SelectedHitObjects : hitObject.Yield()).Where(o => o is IHasSliderVelocity).ToArray();
 
                 // even if there are multiple objects selected, we can still display a value if they all have the same value.
-                var selectedPointBindable = relevantObjects.Select(point => ((IHasSliderVelocity)point).SliderVelocity).Distinct().Count() == 1
-                    ? ((IHasSliderVelocity)relevantObjects.First()).SliderVelocityBindable
+                var selectedPointBindable = relevantObjects.Select(point => ((IHasSliderVelocity)point).SliderVelocityMultiplier).Distinct().Count() == 1
+                    ? ((IHasSliderVelocity)relevantObjects.First()).SliderVelocityMultiplierBindable
                     : null;
 
                 if (selectedPointBindable != null)
@@ -127,7 +127,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                     foreach (var h in relevantObjects)
                     {
-                        ((IHasSliderVelocity)h).SliderVelocity = val.NewValue.Value;
+                        ((IHasSliderVelocity)h).SliderVelocityMultiplier = val.NewValue.Value;
                         beatmap.Update(h);
                     }
 
@@ -169,7 +169,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             InspectorText.Clear();
 
-            double[] sliderVelocities = EditorBeatmap.HitObjects.OfType<IHasSliderVelocity>().Select(sv => sv.SliderVelocity).OrderBy(v => v).ToArray();
+            double[] sliderVelocities = EditorBeatmap.HitObjects.OfType<IHasSliderVelocity>().Select(sv => sv.SliderVelocityMultiplier).OrderBy(v => v).ToArray();
 
             AddHeader("Base velocity (from beatmap setup)");
             AddValue($"{beatmapVelocity:#,0.00}x");
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 55f122669d..77afad2d4f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -395,12 +395,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                                 if (e.CurrentState.Keyboard.ShiftPressed && hitObject is IHasSliderVelocity hasSliderVelocity)
                                 {
-                                    double newVelocity = hasSliderVelocity.SliderVelocity * (repeatHitObject.Duration / proposedDuration);
+                                    double newVelocity = hasSliderVelocity.SliderVelocityMultiplier * (repeatHitObject.Duration / proposedDuration);
 
-                                    if (Precision.AlmostEquals(newVelocity, hasSliderVelocity.SliderVelocity))
+                                    if (Precision.AlmostEquals(newVelocity, hasSliderVelocity.SliderVelocityMultiplier))
                                         return;
 
-                                    hasSliderVelocity.SliderVelocity = newVelocity;
+                                    hasSliderVelocity.SliderVelocityMultiplier = newVelocity;
                                     beatmap.Update(hitObject);
                                 }
                                 else
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index 565379f391..fe0d4a7822 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Edit
                     continue;
 
                 if (oldObject is IHasSliderVelocity oldWithVelocity && newObject is IHasSliderVelocity newWithVelocity)
-                    oldWithVelocity.SliderVelocity = newWithVelocity.SliderVelocity;
+                    oldWithVelocity.SliderVelocityMultiplier = newWithVelocity.SliderVelocityMultiplier;
 
                 oldObject.Samples = newObject.Samples;
 

From 68752f95e516459ea1ab814812919b381d78c45d Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 6 Sep 2023 22:49:13 +0900
Subject: [PATCH 0465/2296] color friend score to pink

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  | 31 +++++++++++++++++++
 .../Play/HUD/GameplayLeaderboardScore.cs      | 15 ++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index d4000c07e7..418e0ad981 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -6,11 +6,14 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.PolygonExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -139,6 +142,29 @@ namespace osu.Game.Tests.Visual.Gameplay
                 => AddAssert($"leaderboard height is {panelCount} panels high", () => leaderboard.DrawHeight == (GameplayLeaderboardScore.PANEL_HEIGHT + leaderboard.Spacing) * panelCount);
         }
 
+        [Test]
+        public void TestFriendScore()
+        {
+            APIUser friend = new APIUser { Username = "my friend", Id = 10000 };
+
+            createLeaderboard();
+            addLocalPlayer();
+
+            AddStep("initialize api", () =>
+            {
+                var api = (DummyAPIAccess)API;
+
+                api.Friends.Add(friend);
+            });
+
+            int playerNumber = 1;
+            AddRepeatStep("add 3 other players", () => createRandomScore(new APIUser { Username = $"Player {playerNumber++}" }), 3);
+            AddUntilStep("there are no pink color score", () => leaderboard.ChildrenOfType<Box>().All(b => b.Colour != Color4Extensions.FromHex("ff549a")));
+
+            AddRepeatStep("add 3 friend score", () => createRandomScore(friend), 3);
+            AddUntilStep("there are pink color for friend score", () => leaderboard.GetScoreByUsername("my friend").ChildrenOfType<Box>().Any(b => b.Colour == Color4Extensions.FromHex("ff549a")));
+        }
+
         private void addLocalPlayer()
         {
             AddStep("add local player", () =>
@@ -179,6 +205,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }
+
+            public GameplayLeaderboardScore GetScoreByUsername(string username)
+            {
+                return Flow.FirstOrDefault(i => i.User?.Username == username);
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index dcb2c1071e..502303e80c 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -11,6 +12,8 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
@@ -107,6 +110,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private IBindable<ScoringMode> scoreDisplayMode = null!;
 
+        private readonly IBindableList<APIUser> apiFriends = new BindableList<APIUser>();
+
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
         /// </summary>
@@ -124,7 +129,7 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OsuConfigManager osuConfigManager)
+        private void load(OsuColour colours, OsuConfigManager osuConfigManager, IAPIProvider api)
         {
             Container avatarContainer;
 
@@ -311,6 +316,9 @@ namespace osu.Game.Screens.Play.HUD
             }, true);
 
             HasQuit.BindValueChanged(_ => updateState());
+
+            apiFriends.BindTo(api.Friends);
+            apiFriends.BindCollectionChanged((_, _) => updateState());
         }
 
         protected override void LoadComplete()
@@ -389,6 +397,11 @@ namespace osu.Game.Screens.Play.HUD
                 panelColour = BackgroundColour ?? Color4Extensions.FromHex("ffd966");
                 textColour = TextColour ?? Color4Extensions.FromHex("2e576b");
             }
+            else if (apiFriends.Any(f => User?.Equals(f) == true))
+            {
+                panelColour = BackgroundColour ?? Color4Extensions.FromHex("ff549a");
+                textColour = TextColour ?? Color4.White;
+            }
             else
             {
                 panelColour = BackgroundColour ?? Color4Extensions.FromHex("3399cc");

From dce6adb8955e4f660e96b3687e9a6dfdf08ca752 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 01:23:56 +0900
Subject: [PATCH 0466/2296] Add text explanation of icons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Skinning/Skin.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index d979cab72b..5bc5549889 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -260,11 +260,11 @@ namespace osu.Game.Skinning
             switch (type)
             {
                 case LookupDebugType.Hit:
-                    icon = "🟢";
+                    icon = "🟢 hit";
                     break;
 
                 case LookupDebugType.Miss:
-                    icon = "🔴";
+                    icon = "🔴 miss";
                     break;
 
                 case LookupDebugType.Enter:

From f9db0fad8871b9f052544d682579b101d158a26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Sep 2023 17:57:26 +0200
Subject: [PATCH 0467/2296] Ignore unused thing inspection harder

---
 osu.Game/Skinning/LegacySkin.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index f286dfb776..98e2d3e862 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
@@ -82,9 +83,9 @@ namespace osu.Game.Skinning
             }
         }
 
+        [SuppressMessage("ReSharper", "RedundantAssignment")] // for `wasHit` assignments used in `finally` debug logic
         public override IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
         {
-            // ReSharper disable once RedundantAssignment (used in `finally` debug logic)
             bool wasHit = true;
 
             try

From fe3683ed5b2d977fd14d49697cdef3b0df33f0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Sep 2023 17:46:42 +0200
Subject: [PATCH 0468/2296] Adjust formatting slightly

The uneven spacing was bothering me...
---
 osu.Game/Skinning/Skin.cs                   | 2 +-
 osu.Game/Skinning/SkinProvidingContainer.cs | 2 +-
 osu.Game/Skinning/SkinTransformer.cs        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 5bc5549889..659edc6f5f 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Skinning
 
         #endregion
 
-        public override string ToString() => $"{GetType().ReadableName()}{{ Name: {Name} }}";
+        public override string ToString() => $"{GetType().ReadableName()} {{ Name: {Name} }}";
 
         private static readonly ThreadLocal<int> nested_level = new ThreadLocal<int>(() => 0);
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 2d2a2e48f6..acb15da80e 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -310,7 +310,7 @@ namespace osu.Game.Skinning
                 }
             }
 
-            public override string ToString() => $"{GetType().ReadableName()}{{ skin: {skin} }}";
+            public override string ToString() => $"{GetType().ReadableName()} {{ Skin: {skin} }}";
         }
     }
 }
diff --git a/osu.Game/Skinning/SkinTransformer.cs b/osu.Game/Skinning/SkinTransformer.cs
index 4e7dd4f222..95572aa7b1 100644
--- a/osu.Game/Skinning/SkinTransformer.cs
+++ b/osu.Game/Skinning/SkinTransformer.cs
@@ -47,6 +47,6 @@ namespace osu.Game.Skinning
             }
         }
 
-        public override string ToString() => $"{nameof(SkinTransformer)}{{ Skin: {Skin} }}";
+        public override string ToString() => $"{nameof(SkinTransformer)} {{ Skin: {Skin} }}";
     }
 }

From 3db0d0d3415b423c28e46f20ea9f8b7501c64fea Mon Sep 17 00:00:00 2001
From: isakvik <hjeisa14@gmail.com>
Date: Wed, 6 Sep 2023 23:26:34 +0200
Subject: [PATCH 0469/2296] extendable minimum AR value for osu!std diff adjust
 mod, set to -10

---
 .../Mods/OsuModDifficultyAdjust.cs            |  1 +
 osu.Game/Rulesets/Mods/DifficultyBindable.cs  | 34 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 3a6b232f9f..5eb41ff189 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             Precision = 0.1f,
             MinValue = 0,
             MaxValue = 10,
+            ExtendedMinValue = -10,
             ExtendedMaxValue = 11,
             ReadCurrentFromDifficulty = diff => diff.ApproachRate,
         };
diff --git a/osu.Game/Rulesets/Mods/DifficultyBindable.cs b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
index c21ce756c9..4afeb6c8b2 100644
--- a/osu.Game/Rulesets/Mods/DifficultyBindable.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
@@ -34,9 +34,18 @@ namespace osu.Game.Rulesets.Mods
             set => CurrentNumber.Precision = value;
         }
 
+        private float minValue;
+
         public float MinValue
         {
-            set => CurrentNumber.MinValue = value;
+            set
+            {
+                if (value == minValue)
+                    return;
+
+                minValue = value;
+                updateMinValue();
+            }
         }
 
         private float maxValue;
@@ -53,6 +62,23 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
+        private float? extendedMinValue;
+
+        /// <summary>
+        /// The minimum value to be used when extended limits are applied.
+        /// </summary>
+        public float? ExtendedMinValue
+        {
+            set
+            {
+                if (value == extendedMinValue)
+                    return;
+
+                extendedMinValue = value;
+                updateMinValue();
+            }
+        }
+
         private float? extendedMaxValue;
 
         /// <summary>
@@ -78,6 +104,7 @@ namespace osu.Game.Rulesets.Mods
         public DifficultyBindable(float? defaultValue = null)
             : base(defaultValue)
         {
+            ExtendedLimits.BindValueChanged(_ => updateMinValue());
             ExtendedLimits.BindValueChanged(_ => updateMaxValue());
         }
 
@@ -94,6 +121,11 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
+        private void updateMinValue()
+        {
+            CurrentNumber.MinValue = ExtendedLimits.Value && extendedMinValue != null ? extendedMinValue.Value : minValue;
+        }
+
         private void updateMaxValue()
         {
             CurrentNumber.MaxValue = ExtendedLimits.Value && extendedMaxValue != null ? extendedMaxValue.Value : maxValue;

From 97bd90c0ffa9f090bc8ba323aaf3dbb993ac614f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 6 Sep 2023 14:08:16 -0700
Subject: [PATCH 0470/2296] Link new song select wedge title and artist to
 search text box

---
 osu.Game/Screens/Select/BeatmapDetails.cs     | 12 ++---
 osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs | 50 +++++++++++++------
 osu.Game/Screens/Select/SongSelect.cs         |  9 ++++
 3 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 712b610515..179323176a 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -141,9 +141,9 @@ namespace osu.Game.Screens.Select
                                                     LayoutEasing = Easing.OutQuad,
                                                     Children = new[]
                                                     {
-                                                        description = new MetadataSectionDescription(searchOnSongSelect),
-                                                        source = new MetadataSectionSource(searchOnSongSelect),
-                                                        tags = new MetadataSectionTags(searchOnSongSelect),
+                                                        description = new MetadataSectionDescription(query => songSelect?.Search(query)),
+                                                        source = new MetadataSectionSource(query => songSelect?.Search(query)),
+                                                        tags = new MetadataSectionTags(query => songSelect?.Search(query)),
                                                     },
                                                 },
                                             },
@@ -176,12 +176,6 @@ namespace osu.Game.Screens.Select
                 },
                 loading = new LoadingLayer(true)
             };
-
-            void searchOnSongSelect(string text)
-            {
-                if (songSelect != null)
-                    songSelect.FilterControl.CurrentTextSearch.Value = text;
-            }
         }
 
         private void updateStatistics()
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index a7bfbc8214..1c1a20b596 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -15,6 +15,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 
@@ -270,38 +271,57 @@ namespace osu.Game.Screens.Select
             }
 
             [BackgroundDependencyLoader]
-            private void load()
+            private void load(SongSelect? songSelect, LocalisationManager localisation)
             {
                 var metadata = working.Metadata;
 
+                var titleText = new RomanisableString(metadata.TitleUnicode, metadata.Title);
+                var artistText = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
+
                 Child = new FillFlowContainer
                 {
                     Name = "Top-left aligned metadata",
                     Direction = FillDirection.Vertical,
-                    Padding = new MarginPadding { Left = text_margin, Right = text_margin + shear_width, Top = 12 },
+                    Padding = new MarginPadding { Left = text_margin, Top = 12 },
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        TitleLabel = new TruncatingSpriteText
+                        new OsuHoverContainer
                         {
-                            Shadow = true,
-                            Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
-                            Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
-                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Both,
+                            Action = () => songSelect?.Search(titleText.GetPreferred(localisation.CurrentParameters.Value.PreferOriginalScript)),
+                            Child = TitleLabel = new TruncatingSpriteText
+                            {
+                                Shadow = true,
+                                Text = titleText,
+                                Font = OsuFont.TorusAlternate.With(size: 40, weight: FontWeight.SemiBold),
+                            },
                         },
-                        ArtistLabel = new TruncatingSpriteText
+                        new OsuHoverContainer
                         {
-                            // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
-                            Shadow = true,
-                            Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
-                            // Not sure if this should be semi bold or medium
-                            Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
-                            RelativeSizeAxes = Axes.X,
-                        }
+                            AutoSizeAxes = Axes.Both,
+                            Action = () => songSelect?.Search(artistText.GetPreferred(localisation.CurrentParameters.Value.PreferOriginalScript)),
+                            Child = ArtistLabel = new TruncatingSpriteText
+                            {
+                                // TODO : figma design has a diffused shadow, instead of the solid one present here, not possible currently as far as i'm aware.
+                                Shadow = true,
+                                Text = artistText,
+                                // Not sure if this should be semi bold or medium
+                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
+                            },
+                        },
                     }
                 };
             }
+
+            protected override void UpdateAfterChildren()
+            {
+                base.UpdateAfterChildren();
+
+                TitleLabel.MaxWidth = DrawWidth - text_margin * 2 - shear_width;
+                ArtistLabel.MaxWidth = DrawWidth - text_margin - shear_width;
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index cca18b93af..809ffb307c 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -390,6 +390,15 @@ namespace osu.Game.Screens.Select
             this.Push(new EditorLoader());
         }
 
+        /// <summary>
+        /// Set the query to the search text box.
+        /// </summary>
+        /// <param name="query">The string to search.</param>
+        public void Search(string query)
+        {
+            FilterControl.CurrentTextSearch.Value = query;
+        }
+
         /// <summary>
         /// Call to make a selection and perform the default action for this SongSelect.
         /// </summary>

From d0780fb765d231f565d58058a8771e5c5dd3d3a4 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 6 Sep 2023 15:01:55 -0700
Subject: [PATCH 0471/2296] Add comment explaining the max width

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
index 1c1a20b596..3c76ae1f08 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeV2.cs
@@ -319,6 +319,8 @@ namespace osu.Game.Screens.Select
             {
                 base.UpdateAfterChildren();
 
+                // best effort to confine the auto-sized text to wedge bounds
+                // the artist label doesn't have an extra text_margin as it doesn't touch the right metadata
                 TitleLabel.MaxWidth = DrawWidth - text_margin * 2 - shear_width;
                 ArtistLabel.MaxWidth = DrawWidth - text_margin - shear_width;
             }

From 5ee412cc9a1975196d0fc0127875227f474410e5 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 6 Sep 2023 16:17:53 -0700
Subject: [PATCH 0472/2296] Use `@2x` variant of profile badges

---
 osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs | 6 ++++--
 osu.Game/Users/Badge.cs                                     | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index 4278c46d6a..b57b0b7312 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -134,14 +134,16 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     AwardedAt = DateTimeOffset.FromUnixTimeSeconds(1505741569),
                     Description = "Outstanding help by being a voluntary test subject.",
-                    ImageUrl = "https://assets.ppy.sh/profile-badges/contributor.jpg",
+                    ImageUrl = "https://assets.ppy.sh/profile-badges/contributor-new@2x.png",
+                    ImageUrlLowRes = "https://assets.ppy.sh/profile-badges/contributor-new.png",
                     Url = "https://osu.ppy.sh/wiki/en/People/Community_Contributors",
                 },
                 new Badge
                 {
                     AwardedAt = DateTimeOffset.FromUnixTimeSeconds(1505741569),
                     Description = "Badge without a url.",
-                    ImageUrl = "https://assets.ppy.sh/profile-badges/contributor.jpg",
+                    ImageUrl = "https://assets.ppy.sh/profile-badges/contributor@2x.png",
+                    ImageUrlLowRes = "https://assets.ppy.sh/profile-badges/contributor.png",
                 },
             },
             Title = "osu!volunteer",
diff --git a/osu.Game/Users/Badge.cs b/osu.Game/Users/Badge.cs
index b87e2ddecd..42f2234744 100644
--- a/osu.Game/Users/Badge.cs
+++ b/osu.Game/Users/Badge.cs
@@ -16,9 +16,12 @@ namespace osu.Game.Users
         [JsonProperty("description")]
         public string Description;
 
-        [JsonProperty("image_url")]
+        [JsonProperty("image@2x_url")]
         public string ImageUrl;
 
+        [JsonProperty("image_url")]
+        public string ImageUrlLowRes;
+
         [JsonProperty("url")]
         public string Url;
     }

From 2ab11ab568e3869526682e647e4b24ae5ed0b5b0 Mon Sep 17 00:00:00 2001
From: isakvik <hjeisa14@gmail.com>
Date: Thu, 7 Sep 2023 01:41:22 +0200
Subject: [PATCH 0473/2296] adds new diffsetting control that shows millisecond
 values for approach rate override

---
 .../Mods/OsuModDifficultyAdjust.cs            |  2 +-
 .../Graphics/UserInterface/OsuSliderBar.cs    |  2 +-
 ...oachRateDifficultyAdjustSettingsControl.cs | 36 +++++++++++++++++++
 .../Mods/DifficultyAdjustSettingsControl.cs   | 22 ++++++------
 4 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 5eb41ff189..c09e108b5a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             ReadCurrentFromDifficulty = diff => diff.CircleSize,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1, SettingControlType = typeof(DifficultyAdjustSettingsControl))]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1, SettingControlType = typeof(ApproachRateDifficultyAdjustSettingsControl))]
         public DifficultyBindable ApproachRate { get; } = new DifficultyBindable
         {
             Precision = 0.1f,
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index e5f5f97eb7..cf3cb3b734 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Graphics.UserInterface
             channel.Play();
         }
 
-        private LocalisableString getTooltipText(T value)
+        protected LocalisableString getTooltipText(T value)
         {
             if (CurrentNumber.IsInteger)
                 return value.ToInt32(NumberFormatInfo.InvariantInfo).ToString("N0");
diff --git a/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs
new file mode 100644
index 0000000000..21cde7d8e2
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs
@@ -0,0 +1,36 @@
+// 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.Localisation;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public partial class ApproachRateDifficultyAdjustSettingsControl : DifficultyAdjustSettingsControl
+    {
+        protected override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent,
+            new ApproachRateSlider
+            {
+                RelativeSizeAxes = Axes.X,
+                Current = sliderDisplayCurrent,
+                KeyboardStep = 0.1f,
+            }
+        );
+
+        /// <summary>
+        /// A slider bar with more detailed approach rate info for its given value
+        /// </summary>
+        public partial class ApproachRateSlider : RoundedSliderBar<float>
+        {
+            public override LocalisableString TooltipText =>
+                $"{base.TooltipText} ({millisecondsFromApproachRate(Current.Value, 1.0f)} ms)";
+
+            private double millisecondsFromApproachRate(float value, float clockRate)
+            {
+                return Math.Round(1800 - Math.Min(value, 5) * 120 - (value >= 5 ? (value - 5) * 150 : 0) / clockRate);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
index a941c0a1db..62fc299c68 100644
--- a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
@@ -27,9 +27,16 @@ namespace osu.Game.Rulesets.Mods
         /// When the mod is overriding a default, this will match the value of <see cref="Current"/>.
         /// When there is no override (ie. <see cref="Current"/> is null), this value will match the beatmap provided default via <see cref="updateCurrentFromSlider"/>.
         /// </remarks>
-        private readonly BindableNumber<float> sliderDisplayCurrent = new BindableNumber<float>();
+        protected readonly BindableNumber<float> sliderDisplayCurrent = new BindableNumber<float>();
 
-        protected override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent);
+        protected override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent,
+            new RoundedSliderBar<float>
+            {
+                RelativeSizeAxes = Axes.X,
+                Current = sliderDisplayCurrent,
+                KeyboardStep = 0.1f,
+            }
+        );
 
         /// <summary>
         /// Guards against beatmap values displayed on slider bars being transferred to user override.
@@ -88,7 +95,7 @@ namespace osu.Game.Rulesets.Mods
             isInternalChange = false;
         }
 
-        private partial class SliderControl : CompositeDrawable, IHasCurrentValue<float?>
+        protected partial class SliderControl : CompositeDrawable, IHasCurrentValue<float?>
         {
             // This is required as SettingsItem relies heavily on this bindable for internal use.
             // The actual update flow is done via the bindable provided in the constructor.
@@ -100,16 +107,11 @@ namespace osu.Game.Rulesets.Mods
                 set => current.Current = value;
             }
 
-            public SliderControl(BindableNumber<float> currentNumber)
+            public SliderControl(BindableNumber<float> currentNumber, RoundedSliderBar<float> slider)
             {
                 InternalChildren = new Drawable[]
                 {
-                    new RoundedSliderBar<float>
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Current = currentNumber,
-                        KeyboardStep = 0.1f,
-                    }
+                    slider
                 };
 
                 AutoSizeAxes = Axes.Y;

From 0bbe28dcc9501c72b6b1f8f9babcd39ed2ab21b2 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 6 Sep 2023 16:43:32 -0700
Subject: [PATCH 0474/2296] Update badge header background color in line with
 web

---
 osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs | 4 ++--
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs
index 24be6ce2f5..af9ec32421 100644
--- a/osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BadgeHeaderContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Profile.Header
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background5,
+                    Colour = colourProvider.Background4,
                 },
                 new Container // artificial shadow
                 {
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Profile.Header
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Spacing = new Vector2(10, 10),
-                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING, Top = 10 },
+                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING, Vertical = 10 },
                 }
             };
         }
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index de678cb5d1..dc47ce6e30 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Overlays.Profile.Header
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background4,
+                    Colour = colourProvider.Background3,
                 },
                 new FillFlowContainer
                 {

From d2a62351350459d763f5fc43e60b6d2328c19613 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 14:19:15 +0900
Subject: [PATCH 0475/2296] Fix code quality issues

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs |  2 +-
 osu.Game/Rulesets/Mods/DifficultyBindable.cs    | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index cf3cb3b734..e5f5f97eb7 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Graphics.UserInterface
             channel.Play();
         }
 
-        protected LocalisableString getTooltipText(T value)
+        private LocalisableString getTooltipText(T value)
         {
             if (CurrentNumber.IsInteger)
                 return value.ToInt32(NumberFormatInfo.InvariantInfo).ToString("N0");
diff --git a/osu.Game/Rulesets/Mods/DifficultyBindable.cs b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
index 4afeb6c8b2..a207048882 100644
--- a/osu.Game/Rulesets/Mods/DifficultyBindable.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyBindable.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mods
                     return;
 
                 minValue = value;
-                updateMinValue();
+                updateExtents();
             }
         }
 
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Mods
                     return;
 
                 maxValue = value;
-                updateMaxValue();
+                updateExtents();
             }
         }
 
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Mods
                     return;
 
                 extendedMinValue = value;
-                updateMinValue();
+                updateExtents();
             }
         }
 
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Mods
                     return;
 
                 extendedMaxValue = value;
-                updateMaxValue();
+                updateExtents();
             }
         }
 
@@ -104,8 +104,7 @@ namespace osu.Game.Rulesets.Mods
         public DifficultyBindable(float? defaultValue = null)
             : base(defaultValue)
         {
-            ExtendedLimits.BindValueChanged(_ => updateMinValue());
-            ExtendedLimits.BindValueChanged(_ => updateMaxValue());
+            ExtendedLimits.BindValueChanged(_ => updateExtents());
         }
 
         public override float? Value
@@ -121,13 +120,9 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
-        private void updateMinValue()
+        private void updateExtents()
         {
             CurrentNumber.MinValue = ExtendedLimits.Value && extendedMinValue != null ? extendedMinValue.Value : minValue;
-        }
-
-        private void updateMaxValue()
-        {
             CurrentNumber.MaxValue = ExtendedLimits.Value && extendedMaxValue != null ? extendedMaxValue.Value : maxValue;
         }
 

From e05d7d5f8d3dbd29b861fbf4457ed3330be05935 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 14:20:19 +0900
Subject: [PATCH 0476/2296] Inline local control

---
 .../Mods/OsuModDifficultyAdjust.cs            | 34 ++++++++++++++++--
 ...oachRateDifficultyAdjustSettingsControl.cs | 36 -------------------
 .../Mods/DifficultyAdjustSettingsControl.cs   | 14 ++++----
 3 files changed, 39 insertions(+), 45 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index c09e108b5a..2b11546a4b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -1,14 +1,18 @@
 // 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.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModDifficultyAdjust : ModDifficultyAdjust
+    public partial class OsuModDifficultyAdjust : ModDifficultyAdjust
     {
         [SettingSource("Circle Size", "Override a beatmap's set CS.", FIRST_SETTING_ORDER - 1, SettingControlType = typeof(DifficultyAdjustSettingsControl))]
         public DifficultyBindable CircleSize { get; } = new DifficultyBindable
@@ -20,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             ReadCurrentFromDifficulty = diff => diff.CircleSize,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1, SettingControlType = typeof(ApproachRateDifficultyAdjustSettingsControl))]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1, SettingControlType = typeof(ApproachRateSettingsControl))]
         public DifficultyBindable ApproachRate { get; } = new DifficultyBindable
         {
             Precision = 0.1f,
@@ -54,5 +58,31 @@ namespace osu.Game.Rulesets.Osu.Mods
             if (CircleSize.Value != null) difficulty.CircleSize = CircleSize.Value.Value;
             if (ApproachRate.Value != null) difficulty.ApproachRate = ApproachRate.Value.Value;
         }
+
+        private partial class ApproachRateSettingsControl : DifficultyAdjustSettingsControl
+        {
+            protected override Drawable CreateControl() => new SliderControl(SliderDisplayCurrent,
+                new ApproachRateSlider
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Current = SliderDisplayCurrent,
+                    KeyboardStep = 0.1f,
+                }
+            );
+
+            /// <summary>
+            /// A slider bar with more detailed approach rate info for its given value
+            /// </summary>
+            public partial class ApproachRateSlider : RoundedSliderBar<float>
+            {
+                public override LocalisableString TooltipText =>
+                    $"{base.TooltipText} ({millisecondsFromApproachRate(Current.Value, 1.0f)} ms)";
+
+                private double millisecondsFromApproachRate(float value, float clockRate)
+                {
+                    return Math.Round(1800 - Math.Min(value, 5) * 120 - (value >= 5 ? (value - 5) * 150 : 0) / clockRate);
+                }
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.cs
deleted file mode 100644
index 21cde7d8e2..0000000000
--- a/osu.Game/Rulesets/Mods/ApproachRateDifficultyAdjustSettingsControl.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 System;
-using osu.Framework.Graphics;
-using osu.Framework.Localisation;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Rulesets.Mods
-{
-    public partial class ApproachRateDifficultyAdjustSettingsControl : DifficultyAdjustSettingsControl
-    {
-        protected override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent,
-            new ApproachRateSlider
-            {
-                RelativeSizeAxes = Axes.X,
-                Current = sliderDisplayCurrent,
-                KeyboardStep = 0.1f,
-            }
-        );
-
-        /// <summary>
-        /// A slider bar with more detailed approach rate info for its given value
-        /// </summary>
-        public partial class ApproachRateSlider : RoundedSliderBar<float>
-        {
-            public override LocalisableString TooltipText =>
-                $"{base.TooltipText} ({millisecondsFromApproachRate(Current.Value, 1.0f)} ms)";
-
-            private double millisecondsFromApproachRate(float value, float clockRate)
-            {
-                return Math.Round(1800 - Math.Min(value, 5) * 120 - (value >= 5 ? (value - 5) * 150 : 0) / clockRate);
-            }
-        }
-    }
-}
diff --git a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
index 62fc299c68..1e66b1966f 100644
--- a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
@@ -27,13 +27,13 @@ namespace osu.Game.Rulesets.Mods
         /// When the mod is overriding a default, this will match the value of <see cref="Current"/>.
         /// When there is no override (ie. <see cref="Current"/> is null), this value will match the beatmap provided default via <see cref="updateCurrentFromSlider"/>.
         /// </remarks>
-        protected readonly BindableNumber<float> sliderDisplayCurrent = new BindableNumber<float>();
+        protected readonly BindableNumber<float> SliderDisplayCurrent = new BindableNumber<float>();
 
-        protected override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent,
+        protected override Drawable CreateControl() => new SliderControl(SliderDisplayCurrent,
             new RoundedSliderBar<float>
             {
                 RelativeSizeAxes = Axes.X,
-                Current = sliderDisplayCurrent,
+                Current = SliderDisplayCurrent,
                 KeyboardStep = 0.1f,
             }
         );
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mods
                 // Intercept and extract the internal number bindable from DifficultyBindable.
                 // This will provide bounds and precision specifications for the slider bar.
                 difficultyBindable = (DifficultyBindable)value.GetBoundCopy();
-                sliderDisplayCurrent.BindTo(difficultyBindable.CurrentNumber);
+                SliderDisplayCurrent.BindTo(difficultyBindable.CurrentNumber);
 
                 base.Current = difficultyBindable;
             }
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Mods
             Current.BindValueChanged(_ => updateCurrentFromSlider());
             beatmap.BindValueChanged(_ => updateCurrentFromSlider(), true);
 
-            sliderDisplayCurrent.BindValueChanged(number =>
+            SliderDisplayCurrent.BindValueChanged(number =>
             {
                 // this handles the transfer of the slider value to the main bindable.
                 // as such, should be skipped if the slider is being updated via updateFromDifficulty().
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mods
             if (Current.Value != null)
             {
                 // a user override has been added or updated.
-                sliderDisplayCurrent.Value = Current.Value.Value;
+                SliderDisplayCurrent.Value = Current.Value.Value;
                 return;
             }
 
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Mods
                 return;
 
             isInternalChange = true;
-            sliderDisplayCurrent.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
+            SliderDisplayCurrent.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
             isInternalChange = false;
         }
 

From 87ec33bb66bd35e15b67ce86ddced6d62adfe80b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 14:50:22 +0900
Subject: [PATCH 0477/2296] Tidy up test

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 418e0ad981..65f943d36b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -150,14 +150,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             createLeaderboard();
             addLocalPlayer();
 
-            AddStep("initialize api", () =>
+            AddStep("Add friend to API", () =>
             {
                 var api = (DummyAPIAccess)API;
 
+                api.Friends.Clear();
                 api.Friends.Add(friend);
             });
 
             int playerNumber = 1;
+
             AddRepeatStep("add 3 other players", () => createRandomScore(new APIUser { Username = $"Player {playerNumber++}" }), 3);
             AddUntilStep("there are no pink color score", () => leaderboard.ChildrenOfType<Box>().All(b => b.Colour != Color4Extensions.FromHex("ff549a")));
 

From 9c6f77b26eb7242c02fbc62c9b3a930035e2821f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 08:11:04 +0200
Subject: [PATCH 0478/2296] Fix too many things being exposed

---
 .../Mods/OsuModDifficultyAdjust.cs            |  8 ++---
 .../Mods/DifficultyAdjustSettingsControl.cs   | 32 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 2b11546a4b..933771321c 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
@@ -61,14 +62,13 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private partial class ApproachRateSettingsControl : DifficultyAdjustSettingsControl
         {
-            protected override Drawable CreateControl() => new SliderControl(SliderDisplayCurrent,
+            protected override RoundedSliderBar<float> CreateSlider(BindableNumber<float> current) =>
                 new ApproachRateSlider
                 {
                     RelativeSizeAxes = Axes.X,
-                    Current = SliderDisplayCurrent,
+                    Current = current,
                     KeyboardStep = 0.1f,
-                }
-            );
+                };
 
             /// <summary>
             /// A slider bar with more detailed approach rate info for its given value
diff --git a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
index 1e66b1966f..d04d7636ec 100644
--- a/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
+++ b/osu.Game/Rulesets/Mods/DifficultyAdjustSettingsControl.cs
@@ -27,16 +27,16 @@ namespace osu.Game.Rulesets.Mods
         /// When the mod is overriding a default, this will match the value of <see cref="Current"/>.
         /// When there is no override (ie. <see cref="Current"/> is null), this value will match the beatmap provided default via <see cref="updateCurrentFromSlider"/>.
         /// </remarks>
-        protected readonly BindableNumber<float> SliderDisplayCurrent = new BindableNumber<float>();
+        private readonly BindableNumber<float> sliderDisplayCurrent = new BindableNumber<float>();
 
-        protected override Drawable CreateControl() => new SliderControl(SliderDisplayCurrent,
-            new RoundedSliderBar<float>
-            {
-                RelativeSizeAxes = Axes.X,
-                Current = SliderDisplayCurrent,
-                KeyboardStep = 0.1f,
-            }
-        );
+        protected sealed override Drawable CreateControl() => new SliderControl(sliderDisplayCurrent, CreateSlider);
+
+        protected virtual RoundedSliderBar<float> CreateSlider(BindableNumber<float> current) => new RoundedSliderBar<float>
+        {
+            RelativeSizeAxes = Axes.X,
+            Current = current,
+            KeyboardStep = 0.1f,
+        };
 
         /// <summary>
         /// Guards against beatmap values displayed on slider bars being transferred to user override.
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mods
                 // Intercept and extract the internal number bindable from DifficultyBindable.
                 // This will provide bounds and precision specifications for the slider bar.
                 difficultyBindable = (DifficultyBindable)value.GetBoundCopy();
-                SliderDisplayCurrent.BindTo(difficultyBindable.CurrentNumber);
+                sliderDisplayCurrent.BindTo(difficultyBindable.CurrentNumber);
 
                 base.Current = difficultyBindable;
             }
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Mods
             Current.BindValueChanged(_ => updateCurrentFromSlider());
             beatmap.BindValueChanged(_ => updateCurrentFromSlider(), true);
 
-            SliderDisplayCurrent.BindValueChanged(number =>
+            sliderDisplayCurrent.BindValueChanged(number =>
             {
                 // this handles the transfer of the slider value to the main bindable.
                 // as such, should be skipped if the slider is being updated via updateFromDifficulty().
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mods
             if (Current.Value != null)
             {
                 // a user override has been added or updated.
-                SliderDisplayCurrent.Value = Current.Value.Value;
+                sliderDisplayCurrent.Value = Current.Value.Value;
                 return;
             }
 
@@ -91,11 +91,11 @@ namespace osu.Game.Rulesets.Mods
                 return;
 
             isInternalChange = true;
-            SliderDisplayCurrent.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
+            sliderDisplayCurrent.Value = difficultyBindable.ReadCurrentFromDifficulty(difficulty);
             isInternalChange = false;
         }
 
-        protected partial class SliderControl : CompositeDrawable, IHasCurrentValue<float?>
+        private partial class SliderControl : CompositeDrawable, IHasCurrentValue<float?>
         {
             // This is required as SettingsItem relies heavily on this bindable for internal use.
             // The actual update flow is done via the bindable provided in the constructor.
@@ -107,11 +107,11 @@ namespace osu.Game.Rulesets.Mods
                 set => current.Current = value;
             }
 
-            public SliderControl(BindableNumber<float> currentNumber, RoundedSliderBar<float> slider)
+            public SliderControl(BindableNumber<float> currentNumber, Func<BindableNumber<float>, RoundedSliderBar<float>> createSlider)
             {
                 InternalChildren = new Drawable[]
                 {
-                    slider
+                    createSlider(currentNumber)
                 };
 
                 AutoSizeAxes = Axes.Y;

From bd633889e79da9db86f1163cc24463f19a682602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 08:23:39 +0200
Subject: [PATCH 0479/2296] Remove local preempt time calculation

And just use a hitcircle, and read the actual value. Comes with 100%
less chance of forgetting to update either place in the future.
---
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 933771321c..be41355846 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -1,15 +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 System;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -76,11 +77,13 @@ namespace osu.Game.Rulesets.Osu.Mods
             public partial class ApproachRateSlider : RoundedSliderBar<float>
             {
                 public override LocalisableString TooltipText =>
-                    $"{base.TooltipText} ({millisecondsFromApproachRate(Current.Value, 1.0f)} ms)";
+                    $"{base.TooltipText} ({getPreemptTime(Current.Value):0} ms)";
 
-                private double millisecondsFromApproachRate(float value, float clockRate)
+                private double getPreemptTime(float approachRate)
                 {
-                    return Math.Round(1800 - Math.Min(value, 5) * 120 - (value >= 5 ? (value - 5) * 150 : 0) / clockRate);
+                    var hitCircle = new HitCircle();
+                    hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { ApproachRate = approachRate });
+                    return hitCircle.TimePreempt;
                 }
             }
         }

From 323a4f4522040f92dc8023b65b5add32198a01ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 08:30:02 +0200
Subject: [PATCH 0480/2296] Only show preempt time when limits are extended

---
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index be41355846..f35b1abc42 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -77,7 +77,9 @@ namespace osu.Game.Rulesets.Osu.Mods
             public partial class ApproachRateSlider : RoundedSliderBar<float>
             {
                 public override LocalisableString TooltipText =>
-                    $"{base.TooltipText} ({getPreemptTime(Current.Value):0} ms)";
+                    (Current as BindableNumber<float>)?.MinValue < 0
+                        ? $"{base.TooltipText} ({getPreemptTime(Current.Value):0} ms)"
+                        : base.TooltipText;
 
                 private double getPreemptTime(float approachRate)
                 {

From b34a36f6cec639d1ac8d987002dd0a893214c9cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 17:41:28 +0900
Subject: [PATCH 0481/2296] Remove all usage of `LegacyDifficultyControlPoint`

---
 .../Legacy/DistanceObjectPatternGenerator.cs  | 13 +++--
 .../Beatmaps/TaikoBeatmapConverter.cs         |  7 +--
 .../Formats/LegacyBeatmapDecoderTest.cs       |  4 +-
 .../ControlPoints/DifficultyControlPoint.cs   | 12 +++-
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 11 ++--
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    | 57 -------------------
 osu.Game/Rulesets/Objects/HitObject.cs        |  6 --
 .../Objects/Types/IHasSliderVelocity.cs       | 19 +++++++
 8 files changed, 46 insertions(+), 83 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 49c1a055a6..fec4dbf285 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -10,10 +10,10 @@ using System.Linq;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
@@ -50,10 +50,11 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
 
             double beatLength;
-            if (hitObject.LegacyBpmMultiplier.HasValue)
-                beatLength = timingPoint.BeatLength * hitObject.LegacyBpmMultiplier.Value;
-            else if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocityMultiplier;
+
+            if (hitObject is IHasSliderVelocity hasSliderVelocity)
+            {
+                beatLength = timingPoint.BeatLength / hasSliderVelocity.GetPrecisionAdjustedSliderVelocityMultiplier(ManiaRuleset.SHORT_NAME);
+            }
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 3e9252e1fd..339c671943 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -186,10 +186,9 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime);
 
             double beatLength;
-            if (obj.LegacyBpmMultiplier.HasValue)
-                beatLength = timingPoint.BeatLength * obj.LegacyBpmMultiplier.Value;
-            else if (obj is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.SliderVelocityMultiplier;
+
+            if (obj is IHasSliderVelocity hasSliderVelocity)
+                beatLength = timingPoint.BeatLength / hasSliderVelocity.GetPrecisionAdjustedSliderVelocityMultiplier(TaikoRuleset.SHORT_NAME);
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 970b6aaf60..65ea228996 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -1025,8 +1025,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(controlPoints.DifficultyPointAt(3000).SliderVelocity, Is.EqualTo(1));
 
 #pragma warning disable 618
-                Assert.That(((LegacyBeatmapDecoder.LegacyDifficultyControlPoint)controlPoints.DifficultyPointAt(2000)).GenerateTicks, Is.False);
-                Assert.That(((LegacyBeatmapDecoder.LegacyDifficultyControlPoint)controlPoints.DifficultyPointAt(3000)).GenerateTicks, Is.True);
+                Assert.That(controlPoints.DifficultyPointAt(2000).GenerateTicks, Is.False);
+                Assert.That(controlPoints.DifficultyPointAt(3000).GenerateTicks, Is.True);
 #pragma warning restore 618
             }
         }
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index e6f1609d7f..2827ea6513 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -28,6 +28,12 @@ namespace osu.Game.Beatmaps.ControlPoints
             MaxValue = 10
         };
 
+        /// <summary>
+        /// Whether or not slider ticks should be generated at this control point.
+        /// This exists for backwards compatibility with maps that abuse NaN slider velocity behavior on osu!stable (e.g. /b/2628991).
+        /// </summary>
+        public bool GenerateTicks { get; set; } = true;
+
         public override Color4 GetRepresentingColour(OsuColour colours) => colours.Lime1;
 
         /// <summary>
@@ -41,11 +47,13 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public override bool IsRedundant(ControlPoint? existing)
             => existing is DifficultyControlPoint existingDifficulty
+               && GenerateTicks == existingDifficulty.GenerateTicks
                && SliderVelocity == existingDifficulty.SliderVelocity;
 
         public override void CopyFrom(ControlPoint other)
         {
             SliderVelocity = ((DifficultyControlPoint)other).SliderVelocity;
+            GenerateTicks = ((DifficultyControlPoint)other).GenerateTicks;
 
             base.CopyFrom(other);
         }
@@ -56,8 +64,10 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         public bool Equals(DifficultyControlPoint? other)
             => base.Equals(other)
+               && GenerateTicks == other.GenerateTicks
                && SliderVelocity == other.SliderVelocity;
 
-        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), SliderVelocity);
+        // ReSharper disable once NonReadonlyMemberInGetHashCode
+        public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), SliderVelocity, GenerateTicks);
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 7c375b7604..f47a555847 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -103,12 +103,8 @@ namespace osu.Game.Beatmaps.Formats
         {
             DifficultyControlPoint difficultyControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.DifficultyPointAt(hitObject.StartTime) ?? DifficultyControlPoint.DEFAULT;
 
-            if (difficultyControlPoint is LegacyDifficultyControlPoint legacyDifficultyControlPoint)
-            {
-                hitObject.LegacyBpmMultiplier = legacyDifficultyControlPoint.BpmMultiplier;
-                if (hitObject is IHasGenerateTicks hasGenerateTicks)
-                    hasGenerateTicks.GenerateTicks = legacyDifficultyControlPoint.GenerateTicks;
-            }
+            if (hitObject is IHasGenerateTicks hasGenerateTicks)
+                hasGenerateTicks.GenerateTicks = difficultyControlPoint.GenerateTicks;
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
                 hasSliderVelocity.SliderVelocityMultiplier = difficultyControlPoint.SliderVelocity;
@@ -497,8 +493,9 @@ namespace osu.Game.Beatmaps.Formats
 
             int onlineRulesetID = beatmap.BeatmapInfo.Ruleset.OnlineID;
 
-            addControlPoint(time, new LegacyDifficultyControlPoint(onlineRulesetID, beatLength)
+            addControlPoint(time, new DifficultyControlPoint
             {
+                GenerateTicks = !double.IsNaN(beatLength),
                 SliderVelocity = speedMultiplier,
             }, timingChange);
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 23440b8a1d..93af9cf41c 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -163,63 +163,6 @@ namespace osu.Game.Beatmaps.Formats
             Mania,
         }
 
-        [Obsolete("Do not use unless you're a legacy ruleset and 100% sure.")]
-        public class LegacyDifficultyControlPoint : DifficultyControlPoint, IEquatable<LegacyDifficultyControlPoint>
-        {
-            /// <summary>
-            /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
-            /// DO NOT USE THIS UNLESS 100% SURE.
-            /// </summary>
-            public double BpmMultiplier { get; private set; }
-
-            /// <summary>
-            /// Whether or not slider ticks should be generated at this control point.
-            /// This exists for backwards compatibility with maps that abuse NaN slider velocity behavior on osu!stable (e.g. /b/2628991).
-            /// </summary>
-            public bool GenerateTicks { get; private set; } = true;
-
-            public LegacyDifficultyControlPoint(int rulesetId, double beatLength)
-                : this()
-            {
-                // Note: In stable, the division occurs on floats, but with compiler optimisations turned on actually seems to occur on doubles via some .NET black magic (possibly inlining?).
-                if (rulesetId == 1 || rulesetId == 3)
-                    BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100.0 : 1;
-                else
-                    BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 1000) / 100.0 : 1;
-
-                GenerateTicks = !double.IsNaN(beatLength);
-            }
-
-            public LegacyDifficultyControlPoint()
-            {
-                SliderVelocityBindable.Precision = double.Epsilon;
-            }
-
-            public override bool IsRedundant(ControlPoint? existing)
-                => base.IsRedundant(existing)
-                   && GenerateTicks == ((existing as LegacyDifficultyControlPoint)?.GenerateTicks ?? true);
-
-            public override void CopyFrom(ControlPoint other)
-            {
-                base.CopyFrom(other);
-
-                BpmMultiplier = ((LegacyDifficultyControlPoint)other).BpmMultiplier;
-                GenerateTicks = ((LegacyDifficultyControlPoint)other).GenerateTicks;
-            }
-
-            public override bool Equals(ControlPoint? other)
-                => other is LegacyDifficultyControlPoint otherLegacyDifficultyControlPoint
-                   && Equals(otherLegacyDifficultyControlPoint);
-
-            public bool Equals(LegacyDifficultyControlPoint? other)
-                => base.Equals(other)
-                   && BpmMultiplier == other.BpmMultiplier
-                   && GenerateTicks == other.GenerateTicks;
-
-            // ReSharper disable twice NonReadonlyMemberInGetHashCode
-            public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), BpmMultiplier, GenerateTicks);
-        }
-
         internal class LegacySampleControlPoint : SampleControlPoint, IEquatable<LegacySampleControlPoint>
         {
             public int CustomSampleBank;
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index ed3d3a6eb2..ec2a4a31f6 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -76,12 +76,6 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public virtual IList<HitSampleInfo> AuxiliarySamples => ImmutableList<HitSampleInfo>.Empty;
 
-        /// <summary>
-        /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
-        /// DO NOT USE THIS UNLESS 100% SURE.
-        /// </summary>
-        public double? LegacyBpmMultiplier { get; set; }
-
         /// <summary>
         /// Whether this <see cref="HitObject"/> is in Kiai time.
         /// </summary>
diff --git a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
index e665dcc752..34c2bda05c 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.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 osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Objects.Types
@@ -16,5 +17,23 @@ namespace osu.Game.Rulesets.Objects.Types
         double SliderVelocityMultiplier { get; set; }
 
         BindableNumber<double> SliderVelocityMultiplierBindable { get; }
+
+        /// <summary>
+        /// Introduces floating-point errors for rulesets that depend on it.
+        /// </summary>
+        public double GetPrecisionAdjustedSliderVelocityMultiplier(string rulesetShortName)
+        {
+            double beatLength = -100 / SliderVelocityMultiplier;
+
+            switch (rulesetShortName)
+            {
+                case "taiko":
+                case "mania":
+                    return 1 / (beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100.0 : 1);
+
+                default:
+                    return 1 / (beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 1000) / 100.0 : 1);
+            }
+        }
     }
 }

From dcbdc114ce9669146544f37c6b1d3cac0e44537e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 17:41:50 +0900
Subject: [PATCH 0482/2296] Remove precision limitations of `SliderVelocity`

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs                   | 1 -
 osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 1e7e8e2981..8bf19f030f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -136,7 +136,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public BindableNumber<double> SliderVelocityMultiplierBindable { get; } = new BindableDouble(1)
         {
-            Precision = 0.01,
             MinValue = 0.1,
             MaxValue = 10
         };
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 2827ea6513..05230c85f4 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         public readonly BindableDouble SliderVelocityBindable = new BindableDouble(1)
         {
-            Precision = 0.01,
             MinValue = 0.1,
             MaxValue = 10
         };

From 64baa4d01ae7bb9a2659a83c3e3238d2fbb07ef2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 18:20:07 +0900
Subject: [PATCH 0483/2296] Add test coverage of failing slider tick generation
 edge case

---
 .../OsuBeatmapConversionTest.cs               |  1 +
 ...r-ticks-edge-case-expected-conversion.json | 39 +++++++++++++++++++
 .../Beatmaps/slider-ticks-edge-case.osu       | 31 +++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index b94e9f38c6..08eea35425 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase("basic")]
         [TestCase("colinear-perfect-curve")]
         [TestCase("slider-ticks")]
+        [TestCase("slider-ticks-edge-case")]
         [TestCase("repeat-slider")]
         [TestCase("uneven-repeat-slider")]
         [TestCase("old-stacking")]
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
new file mode 100644
index 0000000000..657121d812
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
@@ -0,0 +1,39 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 7493.0,
+      "Objects": [
+        {
+          "StartTime": 7493.0,
+          "EndTime": 7493.0,
+          "X": 130.0,
+          "Y": 232.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 7843.0,
+          "EndTime": 7843.0,
+          "X": 33.7820168,
+          "Y": 208.9957,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 7817.0,
+          "EndTime": 7817.0,
+          "X": 30.9946651,
+          "Y": 208.5157,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu
new file mode 100644
index 0000000000..daf35e1d2b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu
@@ -0,0 +1,31 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:3.4
+OverallDifficulty:4
+ApproachRate:5.5
+SliderMultiplier:1.1
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+0,0,"aa.jpg",0,0
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+6967,350.877192982456,6,2,1,55,1,0
+6967,-100,3,2,1,55,0,0
+7493,-111.111111111111,3,2,1,55,0,0
+
+[HitObjects]
+130,232,7493,6,0,P|78:218|28:208,1,101.82149697876,0|0,3:2|2:0,2:0:0:0:

From 22ee64cfdad8af87baf37cf9a925b59f9ca6837c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Sep 2023 18:19:54 +0900
Subject: [PATCH 0484/2296] Fix sliders not always being the correct length

This is another similar case where stable floating point precision comes
into play due to use of `hitObjectManager.Beatmap.BpmMultiplierAt` (see
https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/GameplayElements/HitObjects/Osu/SliderOsu.cs#L680)

Closes #24708.
---
 osu.Game.Rulesets.Osu/Objects/Slider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 8bf19f030f..f40c301220 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * SliderVelocityMultiplier;
+            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * ((IHasSliderVelocity)this).GetPrecisionAdjustedSliderVelocityMultiplier(OsuRuleset.SHORT_NAME);
 
             Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;

From 2334be1987deb34344bca65445e08788fd2acef7 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Sep 2023 17:43:23 +0900
Subject: [PATCH 0485/2296] Split legacy scoring attributes into a separate
 object

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  1 +
 .../Difficulty/CatchDifficultyCalculator.cs   | 12 -----
 .../Difficulty/CatchLegacyScoreSimulator.cs   | 35 +++++++------
 .../Difficulty/ManiaDifficultyCalculator.cs   | 13 -----
 .../Difficulty/ManiaLegacyScoreSimulator.cs   | 18 ++-----
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  1 +
 .../Difficulty/OsuDifficultyCalculator.cs     | 12 -----
 .../Difficulty/OsuLegacyScoreSimulator.cs     | 37 +++++++-------
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  1 +
 .../Difficulty/TaikoDifficultyCalculator.cs   | 12 -----
 .../Difficulty/TaikoLegacyScoreSimulator.cs   | 50 +++++++++----------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  1 +
 .../StandardisedScoreMigrationTools.cs        | 20 +++-----
 .../Difficulty/DifficultyAttributes.cs        | 11 ----
 .../Difficulty/DifficultyCalculator.cs        |  7 ---
 osu.Game/Rulesets/ILegacyRuleset.cs           |  2 +-
 .../Rulesets/Scoring/ILegacyScoreSimulator.cs | 40 ---------------
 .../Scoring/Legacy/ILegacyScoreSimulator.cs   | 20 ++++++++
 .../Scoring/Legacy/LegacyScoreAttributes.cs   | 23 +++++++++
 19 files changed, 117 insertions(+), 199 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
 create mode 100644 osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
 create mode 100644 osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index bd6b857fe8..efd4b46782 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -25,6 +25,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking.Statistics;
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 0b56405299..b826c1f546 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -25,12 +25,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
         public override int Version => 20220701;
 
-        private readonly IWorkingBeatmap workingBeatmap;
-
         public CatchDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
-            workingBeatmap = beatmap;
         }
 
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
@@ -49,15 +46,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                 MaxCombo = beatmap.HitObjects.Count(h => h is Fruit) + beatmap.HitObjects.OfType<JuiceStream>().SelectMany(j => j.NestedHitObjects).Count(h => !(h is TinyDroplet)),
             };
 
-            if (ComputeLegacyScoringValues)
-            {
-                CatchLegacyScoreSimulator sv1Simulator = new CatchLegacyScoreSimulator();
-                sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
-                attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
-                attributes.LegacyComboScore = sv1Simulator.ComboScore;
-                attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
-            }
-
             return attributes;
         }
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index c79fd36d96..0183d723b2 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -2,33 +2,26 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
 {
     internal class CatchLegacyScoreSimulator : ILegacyScoreSimulator
     {
-        public int AccuracyScore { get; private set; }
-
-        public int ComboScore { get; private set; }
-
-        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
-
         private int legacyBonusScore;
-        private int modernBonusScore;
+        private int standardisedBonusScore;
         private int combo;
 
         private double scoreMultiplier;
 
-        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
             IBeatmap baseBeatmap = workingBeatmap.Beatmap;
 
@@ -70,13 +63,19 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                  + baseBeatmap.Difficulty.CircleSize
                  + Math.Clamp((float)objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
-            scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+            scoreMultiplier = difficultyPeppyStars;
+
+            LegacyScoreAttributes attributes = new LegacyScoreAttributes();
 
             foreach (var obj in playableBeatmap.HitObjects)
-                simulateHit(obj);
+                simulateHit(obj, ref attributes);
+
+            attributes.BonusScoreRatio = legacyBonusScore == 0 ? 0 : (double)standardisedBonusScore / legacyBonusScore;
+
+            return attributes;
         }
 
-        private void simulateHit(HitObject hitObject)
+        private void simulateHit(HitObject hitObject, ref LegacyScoreAttributes attributes)
         {
             bool increaseCombo = true;
             bool addScoreComboMultiplier = false;
@@ -112,28 +111,28 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
                 case JuiceStream:
                     foreach (var nested in hitObject.NestedHitObjects)
-                        simulateHit(nested);
+                        simulateHit(nested, ref attributes);
                     return;
 
                 case BananaShower:
                     foreach (var nested in hitObject.NestedHitObjects)
-                        simulateHit(nested);
+                        simulateHit(nested, ref attributes);
                     return;
             }
 
             if (addScoreComboMultiplier)
             {
                 // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
-                ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * scoreMultiplier));
+                attributes.ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * scoreMultiplier));
             }
 
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                modernBonusScore += Judgement.ToNumericResult(bonusResult);
+                standardisedBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else
-                AccuracyScore += scoreIncrease;
+                attributes.AccuracyScore += scoreIncrease;
 
             if (increaseCombo)
                 combo++;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index de9f0d91ae..6bb6879052 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -31,13 +31,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty
 
         public override int Version => 20220902;
 
-        private readonly IWorkingBeatmap workingBeatmap;
-
         public ManiaDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
-            workingBeatmap = beatmap;
-
             isForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.MatchesOnlineID(ruleset);
             originalOverallDifficulty = beatmap.BeatmapInfo.Difficulty.OverallDifficulty;
         }
@@ -60,15 +56,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                 MaxCombo = beatmap.HitObjects.Sum(maxComboForObject),
             };
 
-            if (ComputeLegacyScoringValues)
-            {
-                ManiaLegacyScoreSimulator sv1Simulator = new ManiaLegacyScoreSimulator();
-                sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
-                attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
-                attributes.LegacyComboScore = sv1Simulator.ComboScore;
-                attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
-            }
-
             return attributes;
         }
 
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
index e544428979..098ccdf21d 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
@@ -1,28 +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 System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mania.Mods;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets.Mania.Difficulty
 {
     internal class ManiaLegacyScoreSimulator : ILegacyScoreSimulator
     {
-        public int AccuracyScore => 0;
-        public int ComboScore { get; private set; }
-        public double BonusScoreRatio => 0;
-
-        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
-            double multiplier = mods.Where(m => m is not (ModHidden or ModHardRock or ModDoubleTime or ModFlashlight or ManiaModFadeIn))
-                                    .Select(m => m.ScoreMultiplier)
-                                    .Aggregate(1.0, (c, n) => c * n);
-
-            ComboScore = (int)(1000000 * multiplier);
+            return new LegacyScoreAttributes { ComboScore = 1000000 };
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 4507015169..b977c07dfb 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -33,6 +33,7 @@ using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Edit.Setup;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index b92092c674..3b580a5b59 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -26,12 +26,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         public override int Version => 20220902;
 
-        private readonly IWorkingBeatmap workingBeatmap;
-
         public OsuDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
-            workingBeatmap = beatmap;
         }
 
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
@@ -109,15 +106,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 SpinnerCount = spinnerCount,
             };
 
-            if (ComputeLegacyScoringValues)
-            {
-                OsuLegacyScoreSimulator sv1Simulator = new OsuLegacyScoreSimulator();
-                sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
-                attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
-                attributes.LegacyComboScore = sv1Simulator.ComboScore;
-                attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
-            }
-
             return attributes;
         }
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 980d86e4ad..3448a7b033 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -2,34 +2,27 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets.Osu.Difficulty
 {
     internal class OsuLegacyScoreSimulator : ILegacyScoreSimulator
     {
-        public int AccuracyScore { get; private set; }
-
-        public int ComboScore { get; private set; }
-
-        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
-
         private int legacyBonusScore;
-        private int modernBonusScore;
+        private int standardisedBonusScore;
         private int combo;
 
         private double scoreMultiplier;
         private IBeatmap playableBeatmap = null!;
 
-        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
             this.playableBeatmap = playableBeatmap;
 
@@ -73,13 +66,19 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                  + baseBeatmap.Difficulty.CircleSize
                  + Math.Clamp((float)objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
-            scoreMultiplier = difficultyPeppyStars * mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+            scoreMultiplier = difficultyPeppyStars;
+
+            LegacyScoreAttributes attributes = new LegacyScoreAttributes();
 
             foreach (var obj in playableBeatmap.HitObjects)
-                simulateHit(obj);
+                simulateHit(obj, ref attributes);
+
+            attributes.BonusScoreRatio = legacyBonusScore == 0 ? 0 : (double)standardisedBonusScore / legacyBonusScore;
+
+            return attributes;
         }
 
-        private void simulateHit(HitObject hitObject)
+        private void simulateHit(HitObject hitObject, ref LegacyScoreAttributes attributes)
         {
             bool increaseCombo = true;
             bool addScoreComboMultiplier = false;
@@ -122,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
                 case Slider:
                     foreach (var nested in hitObject.NestedHitObjects)
-                        simulateHit(nested);
+                        simulateHit(nested, ref attributes);
 
                     scoreIncrease = 300;
                     increaseCombo = false;
@@ -146,9 +145,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     for (int i = 0; i <= totalHalfSpinsPossible; i++)
                     {
                         if (i > halfSpinsRequiredBeforeBonus && (i - halfSpinsRequiredBeforeBonus) % 2 == 0)
-                            simulateHit(new SpinnerBonusTick());
+                            simulateHit(new SpinnerBonusTick(), ref attributes);
                         else if (i > 1 && i % 2 == 0)
-                            simulateHit(new SpinnerTick());
+                            simulateHit(new SpinnerTick(), ref attributes);
                     }
 
                     scoreIncrease = 300;
@@ -159,16 +158,16 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (addScoreComboMultiplier)
             {
                 // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
-                ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * scoreMultiplier));
+                attributes.ComboScore += (int)(Math.Max(0, combo - 1) * (scoreIncrease / 25 * scoreMultiplier));
             }
 
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                modernBonusScore += Judgement.ToNumericResult(bonusResult);
+                standardisedBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else
-                AccuracyScore += scoreIncrease;
+                attributes.AccuracyScore += scoreIncrease;
 
             if (increaseCombo)
                 combo++;
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 220dc53705..607b83d379 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -33,6 +33,7 @@ using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Edit.Setup;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 25adba5ab6..ab193caaa3 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -25,12 +25,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         public override int Version => 20220902;
 
-        private readonly IWorkingBeatmap workingBeatmap;
-
         public TaikoDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
-            workingBeatmap = beatmap;
         }
 
         protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate)
@@ -99,15 +96,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 MaxCombo = beatmap.HitObjects.Count(h => h is Hit),
             };
 
-            if (ComputeLegacyScoringValues)
-            {
-                TaikoLegacyScoreSimulator sv1Simulator = new TaikoLegacyScoreSimulator();
-                sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
-                attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
-                attributes.LegacyComboScore = sv1Simulator.ComboScore;
-                attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
-            }
-
             return attributes;
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index e77327d622..149552604f 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -2,39 +2,29 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
 {
     internal class TaikoLegacyScoreSimulator : ILegacyScoreSimulator
     {
-        public int AccuracyScore { get; private set; }
-
-        public int ComboScore { get; private set; }
-
-        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
-
         private int legacyBonusScore;
-        private int modernBonusScore;
+        private int standardisedBonusScore;
         private int combo;
 
-        private double modMultiplier;
         private int difficultyPeppyStars;
         private IBeatmap playableBeatmap = null!;
-        private IReadOnlyList<Mod> mods = null!;
 
-        public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
+        public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
             this.playableBeatmap = playableBeatmap;
-            this.mods = mods;
 
             IBeatmap baseBeatmap = workingBeatmap.Beatmap;
 
@@ -76,13 +66,17 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                  + baseBeatmap.Difficulty.CircleSize
                  + Math.Clamp((float)objectCount / drainLength * 8, 0, 16)) / 38 * 5);
 
-            modMultiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
+            LegacyScoreAttributes attributes = new LegacyScoreAttributes();
 
             foreach (var obj in playableBeatmap.HitObjects)
-                simulateHit(obj);
+                simulateHit(obj, ref attributes);
+
+            attributes.BonusScoreRatio = legacyBonusScore == 0 ? 0 : (double)standardisedBonusScore / legacyBonusScore;
+
+            return attributes;
         }
 
-        private void simulateHit(HitObject hitObject)
+        private void simulateHit(HitObject hitObject, ref LegacyScoreAttributes attributes)
         {
             bool increaseCombo = true;
             bool addScoreComboMultiplier = false;
@@ -117,13 +111,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
                     halfSpinsRequiredForCompletion = (int)Math.Max(1, halfSpinsRequiredForCompletion * 1.65f);
 
-                    if (mods.Any(m => m is ModDoubleTime))
-                        halfSpinsRequiredForCompletion = Math.Max(1, (int)(halfSpinsRequiredForCompletion * 0.75f));
-                    if (mods.Any(m => m is ModHalfTime))
-                        halfSpinsRequiredForCompletion = Math.Max(1, (int)(halfSpinsRequiredForCompletion * 1.5f));
+                    //
+                    // Normally, this multiplier depends on the active mods (DT = 0.75, HT = 1.5). For simplicity, however, we'll only consider the worst case.
+                    // This way, scores remain beatable at the cost of the conversion being slightly inaccurate.
+                    //   - A perfect DT/NM score will have less than 1M total score (excluding bonus).
+                    //   - A perfect HT score will have 1M total score (excluding bonus).
+                    //
+                    halfSpinsRequiredForCompletion = Math.Max(1, (int)(halfSpinsRequiredForCompletion * 1.5f));
 
                     for (int i = 0; i <= halfSpinsRequiredForCompletion; i++)
-                        simulateHit(new SwellTick());
+                        simulateHit(new SwellTick(), ref attributes);
 
                     scoreIncrease = 300;
                     addScoreComboMultiplier = true;
@@ -139,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
                 case DrumRoll:
                     foreach (var nested in hitObject.NestedHitObjects)
-                        simulateHit(nested);
+                        simulateHit(nested, ref attributes);
                     return;
             }
 
@@ -159,8 +156,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             {
                 int oldScoreIncrease = scoreIncrease;
 
-                // ReSharper disable once PossibleLossOfFraction (intentional to match osu-stable...)
-                scoreIncrease += (int)(scoreIncrease / 35 * 2 * (difficultyPeppyStars + 1) * modMultiplier) * (Math.Min(100, combo) / 10);
+                scoreIncrease += (int)(scoreIncrease / 35f * 2 * (difficultyPeppyStars + 1)) * (Math.Min(100, combo) / 10);
 
                 if (hitObject is Swell)
                 {
@@ -185,15 +181,15 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             scoreIncrease -= comboScoreIncrease;
 
             if (addScoreComboMultiplier)
-                ComboScore += comboScoreIncrease;
+                attributes.ComboScore += comboScoreIncrease;
 
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                modernBonusScore += Judgement.ToNumericResult(bonusResult);
+                standardisedBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else
-                AccuracyScore += scoreIncrease;
+                attributes.AccuracyScore += scoreIncrease;
 
             if (increaseCombo)
                 combo++;
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 584a91bfdc..072653dcbf 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -34,6 +34,7 @@ using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.Taiko.Configuration;
 
 namespace osu.Game.Rulesets.Taiko
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 11a5e252a3..d1020aea3b 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Scoring;
 
 namespace osu.Game.Database
@@ -222,15 +223,9 @@ namespace osu.Game.Database
                 throw new InvalidOperationException("Beatmap contains no hit objects!");
 
             ILegacyScoreSimulator sv1Simulator = legacyRuleset.CreateLegacyScoreSimulator();
+            LegacyScoreAttributes attributes = sv1Simulator.Simulate(beatmap, playableBeatmap);
 
-            sv1Simulator.Simulate(beatmap, playableBeatmap, mods);
-
-            return ConvertFromLegacyTotalScore(score, new DifficultyAttributes
-            {
-                LegacyAccuracyScore = sv1Simulator.AccuracyScore,
-                LegacyComboScore = sv1Simulator.ComboScore,
-                LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio
-            });
+            return ConvertFromLegacyTotalScore(score, attributes);
         }
 
         /// <summary>
@@ -241,18 +236,19 @@ namespace osu.Game.Database
         /// (<see cref="DifficultyAttributes.LegacyAccuracyScore"/>, <see cref="DifficultyAttributes.LegacyComboScore"/>, and <see cref="DifficultyAttributes.LegacyBonusScoreRatio"/>)
         /// for the beatmap which the score was set on.</param>
         /// <returns>The standardised total score.</returns>
-        public static long ConvertFromLegacyTotalScore(ScoreInfo score, DifficultyAttributes attributes)
+        public static long ConvertFromLegacyTotalScore(ScoreInfo score, LegacyScoreAttributes attributes)
         {
             if (!score.IsLegacyScore)
                 return score.TotalScore;
 
             Debug.Assert(score.LegacyTotalScore != null);
 
-            int maximumLegacyAccuracyScore = attributes.LegacyAccuracyScore;
-            int maximumLegacyComboScore = attributes.LegacyComboScore;
-            double maximumLegacyBonusRatio = attributes.LegacyBonusScoreRatio;
             double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
 
+            int maximumLegacyAccuracyScore = attributes.AccuracyScore;
+            int maximumLegacyComboScore = (int)Math.Round(attributes.ComboScore * modMultiplier);
+            double maximumLegacyBonusRatio = attributes.BonusScoreRatio;
+
             // The part of total score that doesn't include bonus.
             int maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
 
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index f62eeab5d7..6043731e6e 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -27,9 +27,6 @@ namespace osu.Game.Rulesets.Difficulty
         protected const int ATTRIB_ID_FLASHLIGHT = 17;
         protected const int ATTRIB_ID_SLIDER_FACTOR = 19;
         protected const int ATTRIB_ID_SPEED_NOTE_COUNT = 21;
-        protected const int ATTRIB_ID_LEGACY_ACCURACY_SCORE = 23;
-        protected const int ATTRIB_ID_LEGACY_COMBO_SCORE = 25;
-        protected const int ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO = 27;
 
         /// <summary>
         /// The mods which were applied to the beatmap.
@@ -91,9 +88,6 @@ namespace osu.Game.Rulesets.Difficulty
         public virtual IEnumerable<(int attributeId, object value)> ToDatabaseAttributes()
         {
             yield return (ATTRIB_ID_MAX_COMBO, MaxCombo);
-            yield return (ATTRIB_ID_LEGACY_ACCURACY_SCORE, LegacyAccuracyScore);
-            yield return (ATTRIB_ID_LEGACY_COMBO_SCORE, LegacyComboScore);
-            yield return (ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO, LegacyBonusScoreRatio);
         }
 
         /// <summary>
@@ -104,11 +98,6 @@ namespace osu.Game.Rulesets.Difficulty
         public virtual void FromDatabaseAttributes(IReadOnlyDictionary<int, double> values, IBeatmapOnlineInfo onlineInfo)
         {
             MaxCombo = (int)values[ATTRIB_ID_MAX_COMBO];
-
-            // Temporarily allow these attributes to not exist so as to not block releases of server-side components while these attributes aren't populated/used yet.
-            LegacyAccuracyScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_ACCURACY_SCORE);
-            LegacyComboScore = (int)values.GetValueOrDefault(ATTRIB_ID_LEGACY_COMBO_SCORE);
-            LegacyBonusScoreRatio = values.GetValueOrDefault(ATTRIB_ID_LEGACY_BONUS_SCORE_RATIO);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index d005bbfc7a..00c90bd317 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -23,13 +23,6 @@ namespace osu.Game.Rulesets.Difficulty
 {
     public abstract class DifficultyCalculator
     {
-        /// <summary>
-        /// Whether legacy scoring values (ScoreV1) should be computed to populate the difficulty attributes
-        /// <see cref="DifficultyAttributes.LegacyAccuracyScore"/>, <see cref="DifficultyAttributes.LegacyComboScore"/>,
-        /// and <see cref="DifficultyAttributes.LegacyBonusScoreRatio"/>.
-        /// </summary>
-        public bool ComputeLegacyScoringValues;
-
         /// <summary>
         /// The beatmap for which difficulty will be calculated.
         /// </summary>
diff --git a/osu.Game/Rulesets/ILegacyRuleset.cs b/osu.Game/Rulesets/ILegacyRuleset.cs
index 24aa672219..6900afa243 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.
 
-using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets
 {
diff --git a/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs b/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
deleted file mode 100644
index 7240f0d73e..0000000000
--- a/osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
+++ /dev/null
@@ -1,40 +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 osu.Game.Beatmaps;
-using osu.Game.Rulesets.Mods;
-
-namespace osu.Game.Rulesets.Scoring
-{
-    /// <summary>
-    /// Generates attributes which are required to calculate old-style Score V1 scores.
-    /// </summary>
-    public interface ILegacyScoreSimulator
-    {
-        /// <summary>
-        /// The accuracy portion of the legacy (ScoreV1) total score.
-        /// </summary>
-        int AccuracyScore { get; }
-
-        /// <summary>
-        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
-        /// </summary>
-        int ComboScore { get; }
-
-        /// <summary>
-        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
-        /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
-        /// </summary>
-        double BonusScoreRatio { get; }
-
-        /// <summary>
-        /// Performs the simulation, computing the maximum <see cref="AccuracyScore"/>, <see cref="ComboScore"/>,
-        /// and <see cref="BonusScoreRatio"/> achievable for the given beatmap.
-        /// </summary>
-        /// <param name="workingBeatmap">The working beatmap.</param>
-        /// <param name="playableBeatmap">A playable version of the beatmap for the ruleset.</param>
-        /// <param name="mods">The applied mods.</param>
-        void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods);
-    }
-}
diff --git a/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
new file mode 100644
index 0000000000..3cea58b2b7
--- /dev/null
+++ b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.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 osu.Game.Beatmaps;
+
+namespace osu.Game.Rulesets.Scoring.Legacy
+{
+    /// <summary>
+    /// Generates attributes which are required to calculate old-style Score V1 scores.
+    /// </summary>
+    public interface ILegacyScoreSimulator
+    {
+        /// <summary>
+        /// Performs the simulation, scoring values achievable for the given beatmap.
+        /// </summary>
+        /// <param name="workingBeatmap">The working beatmap.</param>
+        /// <param name="playableBeatmap">A playable version of the beatmap for the ruleset.</param>
+        LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap);
+    }
+}
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs
new file mode 100644
index 0000000000..47ab68bf88
--- /dev/null
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs
@@ -0,0 +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.
+
+namespace osu.Game.Rulesets.Scoring.Legacy
+{
+    public struct LegacyScoreAttributes
+    {
+        /// <summary>
+        /// The accuracy portion of the legacy (ScoreV1) total score.
+        /// </summary>
+        public int AccuracyScore;
+
+        /// <summary>
+        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
+        /// </summary>
+        public long ComboScore;
+
+        /// <summary>
+        /// A ratio of standardised score to legacy score for the bonus part of total score.
+        /// </summary>
+        public double BonusScoreRatio;
+    }
+}

From 4198e025fae71703ad546695c980222d69924bee Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 8 Sep 2023 00:27:01 +0900
Subject: [PATCH 0486/2296] Fix overflow

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

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index d1020aea3b..dd7d7c7b1b 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -246,11 +246,11 @@ namespace osu.Game.Database
             double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
 
             int maximumLegacyAccuracyScore = attributes.AccuracyScore;
-            int maximumLegacyComboScore = (int)Math.Round(attributes.ComboScore * modMultiplier);
+            long maximumLegacyComboScore = (long)Math.Round(attributes.ComboScore * modMultiplier);
             double maximumLegacyBonusRatio = attributes.BonusScoreRatio;
 
             // The part of total score that doesn't include bonus.
-            int maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
+            long maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
 
             // The combo proportion is calculated as a proportion of maximumLegacyBaseScore.
             double comboProportion = Math.Min(1, (double)score.LegacyTotalScore / maximumLegacyBaseScore);

From 2bb869732e1b64c0886b33b070a0c78b693cdc07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 18:41:40 +0200
Subject: [PATCH 0487/2296] Delete outdated warning disables

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs | 2 --
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs           | 2 --
 2 files changed, 4 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 65ea228996..be53a3e18a 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -1024,10 +1024,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(controlPoints.DifficultyPointAt(2000).SliderVelocity, Is.EqualTo(1));
                 Assert.That(controlPoints.DifficultyPointAt(3000).SliderVelocity, Is.EqualTo(1));
 
-#pragma warning disable 618
                 Assert.That(controlPoints.DifficultyPointAt(2000).GenerateTicks, Is.False);
                 Assert.That(controlPoints.DifficultyPointAt(3000).GenerateTicks, Is.True);
-#pragma warning restore 618
             }
         }
     }
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index f47a555847..37aa7950d3 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.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.
 
-#pragma warning disable 618
-
 using System;
 using System.Collections.Generic;
 using System.IO;

From e71fef4b6aa60812eae044916330071acd049758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 18:43:36 +0200
Subject: [PATCH 0488/2296] Remove braces

---
 .../Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index fec4dbf285..749ab78fa5 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -52,9 +52,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             double beatLength;
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
-            {
                 beatLength = timingPoint.BeatLength / hasSliderVelocity.GetPrecisionAdjustedSliderVelocityMultiplier(ManiaRuleset.SHORT_NAME);
-            }
             else
                 beatLength = timingPoint.BeatLength;
 

From 59bd6d827e9897ad9a166593ffca850f356cd793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Sep 2023 10:01:32 +0200
Subject: [PATCH 0489/2296] Add failing test case for overlapping objects
 blocking each other when not intended

---
 .../TestSceneLegacyHitPolicy.cs               | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 615044b642..c4413bf7ca 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -555,6 +555,54 @@ namespace osu.Game.Rulesets.Osu.Tests
             addClickActionAssert(0, ClickAction.Hit);
         }
 
+        [Test]
+        public void TestOverlappingObjectsDontBlockEachOtherWhenFullyFadedOut()
+        {
+            const double time_first_circle = 1000;
+            const double time_second_circle = 1200;
+            const double time_third_circle = 1400;
+            Vector2 positionFirstCircle = new Vector2(100);
+            Vector2 positionSecondCircle = new Vector2(200);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new HitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle,
+                },
+                new HitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle,
+                },
+                new HitCircle
+                {
+                    StartTime = time_third_circle,
+                    Position = positionFirstCircle,
+                },
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle + 50, Position = positionFirstCircle },
+                new OsuReplayFrame { Time = time_second_circle, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_second_circle + 50, Position = positionSecondCircle },
+                new OsuReplayFrame { Time = time_third_circle, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_third_circle + 50, Position = positionFirstCircle },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], 0);
+
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[1], 0);
+
+            addJudgementAssert(hitObjects[2], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[2], 0);
+        }
+
         private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
         {
             AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",

From 168a828f23407f036edf7b2105a83da2c92c3e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Sep 2023 10:10:03 +0200
Subject: [PATCH 0490/2296] Revert "Block input to objects lying under
 already-hit hitcircles when classic note lock is active"

This reverts commit 03c61a573ec9f8f1e83cd98193fd84bd18a75043.

The goal here was to handle an edge case discovered during work on note
lock, wherein it was determined that on stable hit circles would block
input from reaching objects underneath them. However, the change
mentioned above did that _too_ hard and caused overlaps to also be
blocked even long past a hit circle has been faded out.

Revert the change pending further (and more careful) investigation.
---
 .../TestSceneLegacyHitPolicy.cs               |  3 +--
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   | 23 -------------------
 .../Objects/Drawables/DrawableHitCircle.cs    |  2 +-
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index c4413bf7ca..8c311cce91 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -506,6 +506,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
+        [Ignore("Currently broken, first attempt at fixing broke even harder. See https://github.com/ppy/osu/issues/24743.")]
         public void TestInputDoesNotFallThroughOverlappingSliders()
         {
             const double time_first_slider = 1000;
@@ -549,8 +550,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // the slider head of the first slider prevents the second slider's head from being hit, so the judgement offset should be very late.
-            // this is not strictly done by the hit policy implementation itself (see `OsuModClassic.blockInputToUnderlyingObjects()`),
-            // but we're testing this here anyways to just keep everything related to input handling and note lock in one place.
             addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, referenceHitWindows.WindowFor(HitResult.Meh));
             addClickActionAssert(0, ClickAction.Hit);
         }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 1d95f833b0..5dbf23f7ea 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -74,10 +74,6 @@ namespace osu.Game.Rulesets.Osu.Mods
                     head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(head);
-
-                    if (ClassicNoteLock.Value)
-                        blockInputToUnderlyingObjects(head);
-
                     break;
 
                 case DrawableSliderTail tail:
@@ -87,29 +83,10 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableHitCircle circle:
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(circle);
-
-                    if (ClassicNoteLock.Value)
-                        blockInputToUnderlyingObjects(circle);
-
                     break;
             }
         }
 
-        /// <summary>
-        /// On stable, hitcircles that have already been hit block input from reaching objects that may be underneath them.
-        /// The purpose of this method is to restore that behaviour.
-        /// In order to avoid introducing yet another confusing config option, this behaviour is roped into the general notion of "note lock".
-        /// </summary>
-        private static void blockInputToUnderlyingObjects(DrawableHitCircle circle)
-        {
-            var oldHitAction = circle.HitArea.Hit;
-            circle.HitArea.Hit = () =>
-            {
-                oldHitAction?.Invoke();
-                return true;
-            };
-        }
-
         private void applyEarlyFading(DrawableHitCircle circle)
         {
             circle.ApplyCustomUpdateState += (dho, state) =>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 6beed0294d..932f6d3fff 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     case OsuAction.RightButton:
                         if (IsHovered && (Hit?.Invoke() ?? false))
                         {
-                            HitAction ??= e.Action;
+                            HitAction = e.Action;
                             return true;
                         }
 

From e9b08219e934ecebdfa66b92ffbfccf1589dc1c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Sep 2023 11:08:25 +0200
Subject: [PATCH 0491/2296] Block input to objects lying under already-hit
 slider heads before slider is fully judged when classic note lock is active

---
 .../TestSceneLegacyHitPolicy.cs               |  3 ++-
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   | 21 +++++++++++++++++++
 .../Objects/Drawables/DrawableHitCircle.cs    |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 8c311cce91..0a3639b9ab 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -506,7 +506,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
-        [Ignore("Currently broken, first attempt at fixing broke even harder. See https://github.com/ppy/osu/issues/24743.")]
         public void TestInputDoesNotFallThroughOverlappingSliders()
         {
             const double time_first_slider = 1000;
@@ -550,6 +549,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
             addJudgementAssert(hitObjects[1], HitResult.Miss);
             // the slider head of the first slider prevents the second slider's head from being hit, so the judgement offset should be very late.
+            // this is not strictly done by the hit policy implementation itself (see `OsuModClassic.blockInputToObjectsUnderSliderHead()`),
+            // but we're testing this here anyways to just keep everything related to input handling and note lock in one place.
             addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, referenceHitWindows.WindowFor(HitResult.Meh));
             addClickActionAssert(0, ClickAction.Hit);
         }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 5dbf23f7ea..0148ec1987 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -74,6 +74,10 @@ namespace osu.Game.Rulesets.Osu.Mods
                     head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(head);
+
+                    if (ClassicNoteLock.Value)
+                        blockInputToObjectsUnderSliderHead(head);
+
                     break;
 
                 case DrawableSliderTail tail:
@@ -83,10 +87,27 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableHitCircle circle:
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(circle);
+
                     break;
             }
         }
 
+        /// <summary>
+        /// On stable, slider heads that have already been hit block input from reaching objects that may be underneath them
+        /// until the sliders they're part of have been fully judged.
+        /// The purpose of this method is to restore that behaviour.
+        /// In order to avoid introducing yet another confusing config option, this behaviour is roped into the general notion of "note lock".
+        /// </summary>
+        private static void blockInputToObjectsUnderSliderHead(DrawableSliderHead slider)
+        {
+            var oldHitAction = slider.HitArea.Hit;
+            slider.HitArea.Hit = () =>
+            {
+                oldHitAction?.Invoke();
+                return !slider.DrawableSlider.AllJudged;
+            };
+        }
+
         private void applyEarlyFading(DrawableHitCircle circle)
         {
             circle.ApplyCustomUpdateState += (dho, state) =>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 932f6d3fff..6beed0294d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     case OsuAction.RightButton:
                         if (IsHovered && (Hit?.Invoke() ?? false))
                         {
-                            HitAction = e.Action;
+                            HitAction ??= e.Action;
                             return true;
                         }
 

From 628517569bb22a6223c801c570e666118b83ac9b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 8 Sep 2023 21:08:09 +0900
Subject: [PATCH 0492/2296] Fix another difficulty-specific value

---
 .../Difficulty/OsuLegacyScoreSimulator.cs              | 10 +++++-----
 .../Difficulty/TaikoLegacyScoreSimulator.cs            | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 3448a7b033..a8ac52714c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -20,12 +20,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         private int combo;
 
         private double scoreMultiplier;
-        private IBeatmap playableBeatmap = null!;
 
         public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
-            this.playableBeatmap = playableBeatmap;
-
             IBeatmap baseBeatmap = workingBeatmap.Beatmap;
 
             int countNormal = 0;
@@ -132,13 +129,16 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     // The spinner object applies a lenience because gameplay mechanics differ from osu-stable.
                     // We'll redo the calculations to match osu-stable here...
                     const double maximum_rotations_per_second = 477.0 / 60;
-                    double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(playableBeatmap.Difficulty.OverallDifficulty, 3, 5, 7.5);
+
+                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that maximises rotations.
+                    const double minimum_rotations_per_second = 7.5;
+
                     double secondsDuration = spinner.Duration / 1000;
 
                     // The total amount of half spins possible for the entire spinner.
                     int totalHalfSpinsPossible = (int)(secondsDuration * maximum_rotations_per_second * 2);
                     // The amount of half spins that are required to successfully complete the spinner (i.e. get a 300).
-                    int halfSpinsRequiredForCompletion = (int)(secondsDuration * minimumRotationsPerSecond);
+                    int halfSpinsRequiredForCompletion = (int)(secondsDuration * minimum_rotations_per_second);
                     // To be able to receive bonus points, the spinner must be rotated another 1.5 times.
                     int halfSpinsRequiredBeforeBonus = halfSpinsRequiredForCompletion + 3;
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index 149552604f..f3f318f2f2 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -103,16 +103,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 case Swell swell:
                     // The taiko swell generally does not match the osu-stable implementation in any way.
                     // We'll redo the calculations to match osu-stable here...
-                    double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(playableBeatmap.Difficulty.OverallDifficulty, 3, 5, 7.5);
-                    double secondsDuration = swell.Duration / 1000;
+
+                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that maximises rotations.
+                    const double minimum_rotations_per_second = 7.5;
 
                     // The amount of half spins that are required to successfully complete the spinner (i.e. get a 300).
-                    int halfSpinsRequiredForCompletion = (int)(secondsDuration * minimumRotationsPerSecond);
-
+                    int halfSpinsRequiredForCompletion = (int)(swell.Duration / 1000 * minimum_rotations_per_second);
                     halfSpinsRequiredForCompletion = (int)Math.Max(1, halfSpinsRequiredForCompletion * 1.65f);
 
                     //
-                    // Normally, this multiplier depends on the active mods (DT = 0.75, HT = 1.5). For simplicity, however, we'll only consider the worst case.
+                    // Normally, this multiplier depends on the active mods (DT = 0.75, HT = 1.5). For simplicity, we'll only consider the worst case that maximises rotations.
                     // This way, scores remain beatable at the cost of the conversion being slightly inaccurate.
                     //   - A perfect DT/NM score will have less than 1M total score (excluding bonus).
                     //   - A perfect HT score will have 1M total score (excluding bonus).

From c68b76d9f421be0a5476c723ccaf25eae1ef5969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Sep 2023 13:53:13 +0200
Subject: [PATCH 0493/2296] Add more test cases for input handling with
 overlapping objects

---
 .../TestSceneLegacyHitPolicy.cs               | 93 ++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index 0a3639b9ab..a2ef72fe57 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -556,7 +556,96 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
-        public void TestOverlappingObjectsDontBlockEachOtherWhenFullyFadedOut()
+        public void TestOverlappingSlidersDontBlockEachOtherWhenFullyJudged()
+        {
+            const double time_first_slider = 1000;
+            const double time_second_slider = 1600;
+            Vector2 positionFirstSlider = new Vector2(100, 50);
+            Vector2 positionSecondSlider = new Vector2(100, 80);
+            var midpoint = (positionFirstSlider + positionSecondSlider) / 2;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new Slider
+                {
+                    StartTime = time_first_slider,
+                    Position = positionFirstSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                },
+                new Slider
+                {
+                    StartTime = time_second_slider,
+                    Position = positionSecondSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_slider, Position = midpoint, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_first_slider + 25, Position = midpoint },
+                // this frame doesn't do anything on lazer, but is REQUIRED for correct playback on stable,
+                // because stable during replay playback only updates game state _when it encounters a replay frame_
+                new OsuReplayFrame { Time = 1250, Position = midpoint },
+                new OsuReplayFrame { Time = time_second_slider + 50, Position = midpoint, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_second_slider + 75, Position = midpoint },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Ok);
+            addJudgementOffsetAssert("first slider head", () => ((Slider)hitObjects[0]).HeadCircle, 0);
+            addJudgementAssert(hitObjects[1], HitResult.Ok);
+            addJudgementOffsetAssert("second slider head", () => ((Slider)hitObjects[1]).HeadCircle, 50);
+            addClickActionAssert(0, ClickAction.Hit);
+            addClickActionAssert(1, ClickAction.Hit);
+        }
+
+        [Test]
+        public void TestOverlappingHitCirclesDontBlockEachOtherWhenBothVisible()
+        {
+            const double time_first_circle = 1000;
+            const double time_second_circle = 1200;
+            Vector2 positionFirstCircle = new Vector2(100);
+            Vector2 positionSecondCircle = new Vector2(120);
+            var midpoint = (positionFirstCircle + positionSecondCircle) / 2;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new HitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle,
+                },
+                new HitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle,
+                },
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle, Position = midpoint, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle + 25, Position = midpoint },
+                new OsuReplayFrame { Time = time_first_circle + 50, Position = midpoint, Actions = { OsuAction.RightButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], 0);
+
+            addJudgementAssert(hitObjects[1], HitResult.Meh);
+            addJudgementOffsetAssert(hitObjects[1], -150);
+        }
+
+        [Test]
+        public void TestOverlappingHitCirclesDontBlockEachOtherWhenFullyFadedOut()
         {
             const double time_first_circle = 1000;
             const double time_second_circle = 1200;
@@ -587,8 +676,10 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 new OsuReplayFrame { Time = time_first_circle, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_first_circle + 50, Position = positionFirstCircle },
+                new OsuReplayFrame { Time = time_second_circle - 50, Position = positionSecondCircle },
                 new OsuReplayFrame { Time = time_second_circle, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_second_circle + 50, Position = positionSecondCircle },
+                new OsuReplayFrame { Time = time_third_circle - 50, Position = positionFirstCircle },
                 new OsuReplayFrame { Time = time_third_circle, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
                 new OsuReplayFrame { Time = time_third_circle + 50, Position = positionFirstCircle },
             });

From 02e2b8546c4089598a60fe99e18a813b59e7ea1b Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 8 Sep 2023 20:32:55 +0300
Subject: [PATCH 0494/2296] fixed all stated problems

---
 osu.Game/Beatmaps/BeatmapShortInfo.cs         | 29 -------
 ...oContainer.cs => ModEffectPreviewPanel.cs} | 82 +++++++++++++++----
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 38 +++++----
 osu.Game/Screens/Select/BeatmapDetails.cs     |  1 -
 .../Screens/Select/Details/AdvancedStats.cs   | 33 --------
 osu.Game/Screens/Select/SongSelect.cs         |  5 +-
 6 files changed, 90 insertions(+), 98 deletions(-)
 delete mode 100644 osu.Game/Beatmaps/BeatmapShortInfo.cs
 rename osu.Game/Overlays/Mods/{ModMapInfoContainer.cs => ModEffectPreviewPanel.cs} (75%)

diff --git a/osu.Game/Beatmaps/BeatmapShortInfo.cs b/osu.Game/Beatmaps/BeatmapShortInfo.cs
deleted file mode 100644
index 633e12d1b2..0000000000
--- a/osu.Game/Beatmaps/BeatmapShortInfo.cs
+++ /dev/null
@@ -1,29 +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;
-
-namespace osu.Game.Beatmaps
-{
-    public class BeatmapShortInfo : IEquatable<BeatmapShortInfo>
-    {
-        public StarDifficulty StarDifficulty;
-        public float CircleSize;
-        public float DrainRate;
-        public float ApproachRate;
-        public float OverallDifficulty;
-        public double BPM;
-        public bool Equals(BeatmapShortInfo? other)
-        {
-            if (ReferenceEquals(null, other)) return false;
-            if (ReferenceEquals(this, other)) return true;
-
-            return StarDifficulty.Stars == other.StarDifficulty.Stars &&
-                   CircleSize.Equals(other.CircleSize) &&
-                   DrainRate.Equals(other.DrainRate) &&
-                   ApproachRate.Equals(other.ApproachRate) &&
-                   OverallDifficulty.Equals(other.OverallDifficulty) &&
-                   BPM.Equals(other.BPM);
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
similarity index 75%
rename from osu.Game/Overlays/Mods/ModMapInfoContainer.cs
rename to osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 281fe8abe5..b6a8dfe827 100644
--- a/osu.Game/Overlays/Mods/ModMapInfoContainer.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.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.
 
-#nullable disable
-
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
@@ -16,12 +16,14 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
+using System.Threading;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModMapInfoContainer : Container
+    public partial class ModEffectPreviewPanel : CompositeDrawable
     {
         private Container content;
         private Container innerContent;
@@ -37,13 +39,37 @@ namespace osu.Game.Overlays.Mods
         private VerticalAttributeDisplay approachRateDisplay;
         private VerticalAttributeDisplay overallDifficultyDisplay;
 
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        public const float HEIGHT = 50; // as ModSelectOverlay footer buttons
+        private const float transition_duration = 250;
+
+        private IBeatmapInfo beatmapInfo = null!;
+
+        public IBeatmapInfo BeatmapInfo
+        {
+            get => beatmapInfo;
+            set
+            {
+                if (value == beatmapInfo) return;
+
+                beatmapInfo = value;
+                updateStarDifficultyBind();
+                UpdateValues();
+            }
+        }
 
         [Resolved]
-        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; }
+        private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
-        public ModMapInfoContainer()
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        [Resolved]
+        private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
+
+        private CancellationTokenSource cancellationSource = null!;
+        private IBindable<StarDifficulty?> starDifficulty = null!;
+
+        public ModEffectPreviewPanel()
         {
             // values as ModSelectOverlay footer buttons
             const float shear = ShearedOverlayContainer.SHEAR;
@@ -56,7 +82,7 @@ namespace osu.Game.Overlays.Mods
                 Origin = Anchor.BottomRight,
                 Anchor = Anchor.BottomRight,
                 AutoSizeAxes = Axes.X,
-                Height = 50, // as ModSelectOverlay footer buttons
+                Height = HEIGHT,
                 Shear = new Vector2(shear, 0),
                 CornerRadius = corner_radius,
                 BorderThickness = border_thickness,
@@ -146,27 +172,47 @@ namespace osu.Game.Overlays.Mods
         }
         protected override void LoadComplete()
         {
-            adjustedInfo.BindValueChanged(e => { UpdateValues(); }, true);
-
             background.Colour = colourProvider.Background4;
             innerBackground.Colour = colourProvider.Background3;
             Color4 glow_colour = colourProvider.Background1;
 
             content.BorderColour = ColourInfo.GradientVertical(background.Colour, glow_colour);
             innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glow_colour);
-        }
 
+            updateStarDifficultyBind();
+        }
+        private void updateStarDifficultyBind()
+        {
+            if (cancellationSource != null) cancellationSource.Cancel();
+            starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+            starDifficulty.BindValueChanged(s =>
+            {
+                starRatingDisplay.Current.Value = s.NewValue ?? default;
+
+                if (!starRatingDisplay.IsPresent)
+                    starRatingDisplay.FinishTransforms(true);
+
+                starRatingDisplay.FadeIn(transition_duration);
+            });
+        }
         public void UpdateValues()
         {
-            if (adjustedInfo.Value == null) return;
+            if (beatmapInfo == null) return;
 
-            starRatingDisplay.Current.Value = adjustedInfo.Value.StarDifficulty;
-            bpmDisplay.Current.Value = adjustedInfo.Value.BPM;
+            double rate = 1;
+            foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                rate = mod.ApplyToRate(0, rate);
 
-            circleSizeDisplay.Current.Value = adjustedInfo.Value.CircleSize;
-            drainRateDisplay.Current.Value = adjustedInfo.Value.DrainRate;
-            approachRateDisplay.Current.Value = adjustedInfo.Value.ApproachRate;
-            overallDifficultyDisplay.Current.Value = adjustedInfo.Value.OverallDifficulty;
+            bpmDisplay.Current.Value = beatmapInfo.BPM * rate;
+
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(BeatmapInfo.Difficulty);
+            foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
+                mod.ApplyToDifficulty(adjustedDifficulty);
+
+            circleSizeDisplay.Current.Value = adjustedDifficulty.CircleSize;
+            drainRateDisplay.Current.Value = adjustedDifficulty.DrainRate;
+            approachRateDisplay.Current.Value = adjustedDifficulty.ApproachRate;
+            overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
         }
 
         private partial class BPMDisplay : RollingCounter<double>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 8de4447b31..4989c55d49 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -17,6 +17,7 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -27,7 +28,6 @@ using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Utils;
 using osuTK;
-using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Overlays.Mods
@@ -125,7 +125,7 @@ namespace osu.Game.Overlays.Mods
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
 
-        private ModMapInfoContainer mapInfoContainer = null!;
+        private ModEffectPreviewPanel modEffectPreviewPanel = null!;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -133,6 +133,20 @@ namespace osu.Game.Overlays.Mods
 
         private Sample? columnAppearSample;
 
+        private WorkingBeatmap beatmap = null!;
+
+        public WorkingBeatmap Beatmap
+        {
+            get => beatmap;
+            set
+            {
+                if (beatmap == value) return;
+
+                beatmap = value;
+                modEffectPreviewPanel.BeatmapInfo = beatmap.BeatmapInfo;
+            }
+        }
+
         protected ModSelectOverlay(OverlayColourScheme colourScheme = OverlayColourScheme.Green)
             : base(colourScheme)
         {
@@ -224,11 +238,11 @@ namespace osu.Game.Overlays.Mods
 
             FooterContent.Children = new Drawable[]
             {
-                mapInfoContainer = new ModMapInfoContainer
+                modEffectPreviewPanel = new ModEffectPreviewPanel
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
-                    Padding = new MarginPadding
+                    Margin = new MarginPadding
                     {
                         Vertical = PADDING,
                         Horizontal = 70
@@ -286,7 +300,7 @@ namespace osu.Game.Overlays.Mods
 
             SelectedMods.BindValueChanged(_ =>
             {
-                updateMapInfo();
+                modEffectPreviewPanel.UpdateValues();
                 updateMultiplier();
                 updateFromExternalSelection();
                 updateCustomisation();
@@ -300,7 +314,11 @@ namespace osu.Game.Overlays.Mods
                     //
                     // See https://github.com/ppy/osu/pull/23284#issuecomment-1529056988
                     modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);
-                    modSettingChangeTracker.SettingChanged += _ => updateMultiplier();
+                    modSettingChangeTracker.SettingChanged += _ =>
+                    {
+                        modEffectPreviewPanel.UpdateValues();
+                        updateMultiplier();
+                    };
                 }
             }, true);
 
@@ -416,14 +434,6 @@ namespace osu.Game.Overlays.Mods
             multiplierDisplay.Current.Value = multiplier;
         }
 
-        private void updateMapInfo()
-        {
-            if (mapInfoContainer == null)
-                return;
-
-            mapInfoContainer.UpdateValues();
-        }
-
         private void updateCustomisation()
         {
             if (CustomisationButton == null)
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 6ebdca1b8d..712b610515 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -3,7 +3,6 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index a12323ab70..f77ed28dae 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -46,9 +46,6 @@ namespace osu.Game.Screens.Select.Details
 
         private IBeatmapInfo beatmapInfo;
 
-        [Resolved(canBeNull: true)]
-        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; } = null;
-
         public IBeatmapInfo BeatmapInfo
         {
             get => beatmapInfo;
@@ -101,33 +98,6 @@ namespace osu.Game.Screens.Select.Details
 
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedStatisticsUpdate;
-
-        private StarDifficulty latestStarDifficulty = new StarDifficulty();
-        private void updateBindedInfo()
-        {
-            if (adjustedInfo == null) return;
-
-            // sadly need to calculate this to prevent additional data transportation
-            double rate = 1;
-            foreach (var mod in mods.Value.OfType<IApplicableToRate>())
-                rate = mod.ApplyToRate(0, rate);
-
-            double bpm = 0;
-            if (beatmapInfo != null) bpm = beatmapInfo.BPM * rate;
-
-            BeatmapShortInfo adjusted = new BeatmapShortInfo()
-            {
-                CircleSize = FirstValue.Value.adjustedValue ?? FirstValue.Value.baseValue,
-                DrainRate = HpDrain.Value.adjustedValue ?? HpDrain.Value.baseValue,
-                ApproachRate = ApproachRate.Value.adjustedValue ?? ApproachRate.Value.baseValue,
-                OverallDifficulty = Accuracy.Value.adjustedValue ?? Accuracy.Value.baseValue,
-                BPM = bpm,
-                StarDifficulty = latestStarDifficulty
-            };
-
-            adjustedInfo.Value = adjusted;
-        }
-
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             modSettingChangeTracker?.Dispose();
@@ -174,7 +144,6 @@ namespace osu.Game.Screens.Select.Details
             Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty);
             ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
 
-            updateBindedInfo(); // to faster UI response (without SR calculation)
             updateStarDifficulty();
         }
 
@@ -208,8 +177,6 @@ namespace osu.Game.Screens.Select.Details
                     return;
 
                 starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
-                latestStarDifficulty = moddedDifficulty ?? default;
-                updateBindedInfo();
 
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         });
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 7749e3937a..f9d41f98ea 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -99,9 +99,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; } = null!;
 
-        [Cached]
-        private Bindable<BeatmapShortInfo> adjustedInfo { get; set; } = new Bindable<BeatmapShortInfo>();
-
         protected BeatmapCarousel Carousel { get; private set; } = null!;
 
         private ParallaxContainer wedgeBackground = null!;
@@ -786,6 +783,8 @@ namespace osu.Game.Screens.Select
 
             BeatmapDetails.Beatmap = beatmap;
 
+            ModSelect.Beatmap = beatmap;
+
             bool beatmapSelected = beatmap is not DummyWorkingBeatmap;
 
             if (beatmapSelected)

From a01537c76301ff6de5c5d68080c7a90e68d23903 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 8 Sep 2023 20:37:07 +0300
Subject: [PATCH 0495/2296] minor format fix

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

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index f77ed28dae..23298c694b 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -98,6 +98,7 @@ namespace osu.Game.Screens.Select.Details
 
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedStatisticsUpdate;
+
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             modSettingChangeTracker?.Dispose();
@@ -175,7 +176,6 @@ namespace osu.Game.Screens.Select.Details
 
                 if (normalDifficulty == null || moddedDifficulty == null)
                     return;
-
                 starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
 
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);

From ed213dad6c369e66f9277869f3d41dd07135a8ce Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 8 Sep 2023 20:38:24 +0300
Subject: [PATCH 0496/2296] minor format fix (again)

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

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 23298c694b..a383298faa 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -176,8 +176,8 @@ namespace osu.Game.Screens.Select.Details
 
                 if (normalDifficulty == null || moddedDifficulty == null)
                     return;
-                starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
 
+                starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         });
 

From 507f9642cc7db892326e4ca8a813063def813bba Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 8 Sep 2023 22:15:30 +0300
Subject: [PATCH 0497/2296] Better counter formatization

Now CS and HP have 1 decimal point precision, while AR and OD is kept with 2 because of future support of rate-changed AR/OD
---
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs    | 8 ++++----
 osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index b6a8dfe827..6a101bd9f9 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -159,10 +159,10 @@ namespace osu.Game.Overlays.Mods
                                 Direction = FillDirection.Horizontal,
                                 Children = new[]
                                 {
-                                    circleSizeDisplay = new VerticalAttributeDisplay("CS"),
-                                    drainRateDisplay = new VerticalAttributeDisplay("HP"),
-                                    approachRateDisplay = new VerticalAttributeDisplay("AR"),
-                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD"),
+                                    circleSizeDisplay = new VerticalAttributeDisplay("CS", "0.#"),
+                                    drainRateDisplay = new VerticalAttributeDisplay("HP", "0.#"),
+                                    approachRateDisplay = new VerticalAttributeDisplay("AR", "0.##"),
+                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD", "0.##"),
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index 95d979ebd2..503b07f3b9 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         public LocalisableString Label { get; protected set; }
 
-        public VerticalAttributeDisplay(LocalisableString label)
+        public VerticalAttributeDisplay(LocalisableString label, string format = "0.#")
         {
             Label = label;
             AutoSizeAxes = Axes.X;
@@ -54,7 +54,8 @@ namespace osu.Game.Overlays.Mods
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
-                        Current = { BindTarget = Current }
+                        Current = { BindTarget = Current },
+                        Format = format
                     }
                 }
             };
@@ -64,7 +65,9 @@ namespace osu.Game.Overlays.Mods
         {
             protected override double RollingDuration => 500;
 
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.##");
+            public string Format = "0.#";
+
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(Format);
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {

From 23c4a038487c51fc654eba1a17a409d87856cb4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 08:26:05 +0200
Subject: [PATCH 0498/2296] Fix code inspections

---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 6a101bd9f9..79172a595c 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -25,26 +25,26 @@ namespace osu.Game.Overlays.Mods
 {
     public partial class ModEffectPreviewPanel : CompositeDrawable
     {
-        private Container content;
-        private Container innerContent;
+        private Container content = null!;
+        private Container innerContent = null!;
 
-        private Box background;
-        private Box innerBackground;
+        private Box background = null!;
+        private Box innerBackground = null!;
 
-        private StarRatingDisplay starRatingDisplay;
-        private BPMDisplay bpmDisplay;
+        private StarRatingDisplay starRatingDisplay = null!;
+        private BPMDisplay bpmDisplay = null!;
 
-        private VerticalAttributeDisplay circleSizeDisplay;
-        private VerticalAttributeDisplay drainRateDisplay;
-        private VerticalAttributeDisplay approachRateDisplay;
-        private VerticalAttributeDisplay overallDifficultyDisplay;
+        private VerticalAttributeDisplay circleSizeDisplay = null!;
+        private VerticalAttributeDisplay drainRateDisplay = null!;
+        private VerticalAttributeDisplay approachRateDisplay = null!;
+        private VerticalAttributeDisplay overallDifficultyDisplay = null!;
 
         public const float HEIGHT = 50; // as ModSelectOverlay footer buttons
         private const float transition_duration = 250;
 
-        private IBeatmapInfo beatmapInfo = null!;
+        private IBeatmapInfo? beatmapInfo;
 
-        public IBeatmapInfo BeatmapInfo
+        public IBeatmapInfo? BeatmapInfo
         {
             get => beatmapInfo;
             set
@@ -66,10 +66,11 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
-        private CancellationTokenSource cancellationSource = null!;
+        private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
-        public ModEffectPreviewPanel()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             // values as ModSelectOverlay footer buttons
             const float shear = ShearedOverlayContainer.SHEAR;
@@ -170,20 +171,25 @@ namespace osu.Game.Overlays.Mods
                 }
             };
         }
+
         protected override void LoadComplete()
         {
             background.Colour = colourProvider.Background4;
             innerBackground.Colour = colourProvider.Background3;
-            Color4 glow_colour = colourProvider.Background1;
+            Color4 glowColour = colourProvider.Background1;
 
-            content.BorderColour = ColourInfo.GradientVertical(background.Colour, glow_colour);
-            innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glow_colour);
+            content.BorderColour = ColourInfo.GradientVertical(background.Colour, glowColour);
+            innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glowColour);
 
             updateStarDifficultyBind();
         }
+
         private void updateStarDifficultyBind()
         {
-            if (cancellationSource != null) cancellationSource.Cancel();
+            if (beatmapInfo == null)
+                return;
+
+            cancellationSource?.Cancel();
             starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
             starDifficulty.BindValueChanged(s =>
             {
@@ -195,9 +201,11 @@ namespace osu.Game.Overlays.Mods
                 starRatingDisplay.FadeIn(transition_duration);
             });
         }
+
         public void UpdateValues()
         {
-            if (beatmapInfo == null) return;
+            if (beatmapInfo == null)
+                return;
 
             double rate = 1;
             foreach (var mod in mods.Value.OfType<IApplicableToRate>())
@@ -205,7 +213,7 @@ namespace osu.Game.Overlays.Mods
 
             bpmDisplay.Current.Value = beatmapInfo.BPM * rate;
 
-            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(BeatmapInfo.Difficulty);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(beatmapInfo.Difficulty);
             foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
                 mod.ApplyToDifficulty(adjustedDifficulty);
 

From c1a2b86f3f95142b5f0c73b2d2ae5acbd4006aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 08:29:37 +0200
Subject: [PATCH 0499/2296] Extract constants properly

---
 osu.Game/Graphics/UserInterface/ShearedButton.cs | 14 ++++++++------
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs  | 13 +++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ShearedButton.cs b/osu.Game/Graphics/UserInterface/ShearedButton.cs
index f1afacb2f4..b1e7066a01 100644
--- a/osu.Game/Graphics/UserInterface/ShearedButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedButton.cs
@@ -17,6 +17,10 @@ namespace osu.Game.Graphics.UserInterface
 {
     public partial class ShearedButton : OsuClickableContainer
     {
+        public const float HEIGHT = 50;
+        public const float CORNER_RADIUS = 7;
+        public const float BORDER_THICKNESS = 2;
+
         public LocalisableString Text
         {
             get => text.Text;
@@ -83,12 +87,10 @@ namespace osu.Game.Graphics.UserInterface
         /// </param>
         public ShearedButton(float? width = null)
         {
-            Height = 50;
+            Height = HEIGHT;
             Padding = new MarginPadding { Horizontal = shear * 50 };
 
-            const float corner_radius = 7;
-
-            Content.CornerRadius = corner_radius;
+            Content.CornerRadius = CORNER_RADIUS;
             Content.Shear = new Vector2(shear, 0);
             Content.Masking = true;
             Content.Anchor = Content.Origin = Anchor.Centre;
@@ -98,9 +100,9 @@ namespace osu.Game.Graphics.UserInterface
                 backgroundLayer = new Container
                 {
                     RelativeSizeAxes = Axes.Y,
-                    CornerRadius = corner_radius,
+                    CornerRadius = CORNER_RADIUS,
                     Masking = true,
-                    BorderThickness = 2,
+                    BorderThickness = BORDER_THICKNESS,
                     Children = new Drawable[]
                     {
                         background = new Box
diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 79172a595c..aa7ddc47bc 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Overlays.Mods
         private VerticalAttributeDisplay approachRateDisplay = null!;
         private VerticalAttributeDisplay overallDifficultyDisplay = null!;
 
-        public const float HEIGHT = 50; // as ModSelectOverlay footer buttons
         private const float transition_duration = 250;
 
         private IBeatmapInfo? beatmapInfo;
@@ -74,8 +73,6 @@ namespace osu.Game.Overlays.Mods
         {
             // values as ModSelectOverlay footer buttons
             const float shear = ShearedOverlayContainer.SHEAR;
-            const float corner_radius = 7;
-            const float border_thickness = 2;
 
             AutoSizeAxes = Axes.Both;
             InternalChild = content = new InputBlockingContainer
@@ -83,10 +80,10 @@ namespace osu.Game.Overlays.Mods
                 Origin = Anchor.BottomRight,
                 Anchor = Anchor.BottomRight,
                 AutoSizeAxes = Axes.X,
-                Height = HEIGHT,
+                Height = ShearedButton.HEIGHT,
                 Shear = new Vector2(shear, 0),
-                CornerRadius = corner_radius,
-                BorderThickness = border_thickness,
+                CornerRadius = ShearedButton.CORNER_RADIUS,
+                BorderThickness = ShearedButton.BORDER_THICKNESS,
                 Masking = true,
                 Children = new Drawable[]
                 {
@@ -107,8 +104,8 @@ namespace osu.Game.Overlays.Mods
                             {
                                 AutoSizeAxes = Axes.X,
                                 RelativeSizeAxes = Axes.Y,
-                                BorderThickness = border_thickness,
-                                CornerRadius = corner_radius,
+                                BorderThickness = ShearedButton.BORDER_THICKNESS,
+                                CornerRadius = ShearedButton.CORNER_RADIUS,
                                 Masking = true,
                                 Children = new Drawable[]
                                 {

From f591a30ea77eb11e0fb0a7a2a3c1f02f9871181a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 08:44:25 +0200
Subject: [PATCH 0500/2296] Refactor preview panel to be more self-contained

---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 47 ++++++++-----------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  9 +---
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index aa7ddc47bc..dde3761c4a 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
 using System.Threading;
+using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -41,24 +42,13 @@ namespace osu.Game.Overlays.Mods
 
         private const float transition_duration = 250;
 
-        private IBeatmapInfo? beatmapInfo;
-
-        public IBeatmapInfo? BeatmapInfo
-        {
-            get => beatmapInfo;
-            set
-            {
-                if (value == beatmapInfo) return;
-
-                beatmapInfo = value;
-                updateStarDifficultyBind();
-                UpdateValues();
-            }
-        }
+        public Bindable<IBeatmapInfo?> BeatmapInfo { get; } = new Bindable<IBeatmapInfo?>();
 
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
+        private ModSettingChangeTracker? modSettingChangeTracker;
+
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
@@ -178,16 +168,25 @@ namespace osu.Game.Overlays.Mods
             content.BorderColour = ColourInfo.GradientVertical(background.Colour, glowColour);
             innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glowColour);
 
-            updateStarDifficultyBind();
+            BeatmapInfo.BindValueChanged(_ => updateValues(), true);
+
+            mods.BindValueChanged(_ =>
+            {
+                modSettingChangeTracker?.Dispose();
+
+                modSettingChangeTracker = new ModSettingChangeTracker(mods.Value);
+                modSettingChangeTracker.SettingChanged += _ => updateValues();
+                updateValues();
+            });
         }
 
-        private void updateStarDifficultyBind()
+        private void updateValues() => Scheduler.AddOnce(() =>
         {
-            if (beatmapInfo == null)
+            if (BeatmapInfo.Value == null)
                 return;
 
             cancellationSource?.Cancel();
-            starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, (cancellationSource = new CancellationTokenSource()).Token);
+            starDifficulty = difficultyCache.GetBindableDifficulty(BeatmapInfo.Value, (cancellationSource = new CancellationTokenSource()).Token);
             starDifficulty.BindValueChanged(s =>
             {
                 starRatingDisplay.Current.Value = s.NewValue ?? default;
@@ -197,20 +196,14 @@ namespace osu.Game.Overlays.Mods
 
                 starRatingDisplay.FadeIn(transition_duration);
             });
-        }
-
-        public void UpdateValues()
-        {
-            if (beatmapInfo == null)
-                return;
 
             double rate = 1;
             foreach (var mod in mods.Value.OfType<IApplicableToRate>())
                 rate = mod.ApplyToRate(0, rate);
 
-            bpmDisplay.Current.Value = beatmapInfo.BPM * rate;
+            bpmDisplay.Current.Value = BeatmapInfo.Value.BPM * rate;
 
-            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(beatmapInfo.Difficulty);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
             foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
                 mod.ApplyToDifficulty(adjustedDifficulty);
 
@@ -218,7 +211,7 @@ namespace osu.Game.Overlays.Mods
             drainRateDisplay.Current.Value = adjustedDifficulty.DrainRate;
             approachRateDisplay.Current.Value = adjustedDifficulty.ApproachRate;
             overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
-        }
+        });
 
         private partial class BPMDisplay : RollingCounter<double>
         {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 4989c55d49..f2f2dc970c 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Overlays.Mods
                 if (beatmap == value) return;
 
                 beatmap = value;
-                modEffectPreviewPanel.BeatmapInfo = beatmap.BeatmapInfo;
+                modEffectPreviewPanel.BeatmapInfo.Value = beatmap.BeatmapInfo;
             }
         }
 
@@ -300,7 +300,6 @@ namespace osu.Game.Overlays.Mods
 
             SelectedMods.BindValueChanged(_ =>
             {
-                modEffectPreviewPanel.UpdateValues();
                 updateMultiplier();
                 updateFromExternalSelection();
                 updateCustomisation();
@@ -314,11 +313,7 @@ namespace osu.Game.Overlays.Mods
                     //
                     // See https://github.com/ppy/osu/pull/23284#issuecomment-1529056988
                     modSettingChangeTracker = new ModSettingChangeTracker(SelectedMods.Value);
-                    modSettingChangeTracker.SettingChanged += _ =>
-                    {
-                        modEffectPreviewPanel.UpdateValues();
-                        updateMultiplier();
-                    };
+                    modSettingChangeTracker.SettingChanged += _ => updateMultiplier();
                 }
             }, true);
 

From a631fae6dfb2a0ab74ee8fd1e90a6224beb66f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 09:19:37 +0200
Subject: [PATCH 0501/2296] Add actual testing

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
new file mode 100644
index 0000000000..e3afb874db
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
@@ -0,0 +1,128 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Tests.Beatmaps;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    [TestFixture]
+    public partial class TestSceneModEffectPreviewPanel : OsuTestScene
+    {
+        [Cached(typeof(BeatmapDifficultyCache))]
+        private TestBeatmapDifficultyCache difficultyCache = new TestBeatmapDifficultyCache();
+
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
+        private Container content = null!;
+        private ModEffectPreviewPanel panel = null!;
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("set up cache", () => Children = new Drawable[]
+            {
+                difficultyCache,
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both
+                }
+            });
+        }
+
+        [Test]
+        public void TestDisplay()
+        {
+            OsuModDifficultyAdjust difficultyAdjust = new OsuModDifficultyAdjust();
+            OsuModDoubleTime doubleTime = new OsuModDoubleTime();
+
+            AddStep("create display", () => content.Child = panel = new ModEffectPreviewPanel
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            AddStep("set beatmap", () =>
+            {
+                var beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo)
+                {
+                    BeatmapInfo =
+                    {
+                        BPM = 120
+                    }
+                };
+
+                Ruleset.Value = beatmap.BeatmapInfo.Ruleset;
+                panel.BeatmapInfo.Value = beatmap.BeatmapInfo;
+            });
+
+            AddSliderStep("change star rating", 0, 10d, 5, stars =>
+            {
+                if (panel.IsNotNull())
+                    previewStarRating(stars);
+            });
+            AddStep("preview ridiculously high SR", () => previewStarRating(1234));
+
+            AddStep("add DA to mods", () => SelectedMods.Value = new[] { difficultyAdjust });
+
+            AddSliderStep("change AR", 0, 10f, 5, ar =>
+            {
+                if (panel.IsNotNull())
+                    difficultyAdjust.ApproachRate.Value = ar;
+            });
+            AddSliderStep("change CS", 0, 10f, 5, cs =>
+            {
+                if (panel.IsNotNull())
+                    difficultyAdjust.CircleSize.Value = cs;
+            });
+            AddSliderStep("change HP", 0, 10f, 5, hp =>
+            {
+                if (panel.IsNotNull())
+                    difficultyAdjust.DrainRate.Value = hp;
+            });
+            AddSliderStep("change OD", 0, 10f, 5, od =>
+            {
+                if (panel.IsNotNull())
+                    difficultyAdjust.OverallDifficulty.Value = od;
+            });
+
+            AddStep("add DT to mods", () => SelectedMods.Value = new Mod[] { difficultyAdjust, doubleTime });
+            AddSliderStep("change rate", 1.01d, 2d, 1.5d, rate =>
+            {
+                if (panel.IsNotNull())
+                    doubleTime.SpeedChange.Value = rate;
+            });
+        }
+
+        private void previewStarRating(double stars)
+        {
+            difficultyCache.Difficulty = new StarDifficulty(stars, 0);
+            panel.BeatmapInfo.TriggerChange();
+        }
+
+        private partial class TestBeatmapDifficultyCache : BeatmapDifficultyCache
+        {
+            public StarDifficulty? Difficulty { get; set; }
+
+            public override Task<StarDifficulty?> GetDifficultyAsync(IBeatmapInfo beatmapInfo, IRulesetInfo? rulesetInfo = null, IEnumerable<Mod>? mods = null,
+                                                                     CancellationToken cancellationToken = default)
+                => Task.FromResult(Difficulty);
+        }
+    }
+}

From 552230af9d23f53e83cc57a06a425c0486e36c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 09:37:25 +0200
Subject: [PATCH 0502/2296] Refactor layout of display

---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 48 ++++++++-----------
 .../Overlays/Mods/VerticalAttributeDisplay.cs | 10 ++--
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index dde3761c4a..1a5d1e98c7 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -61,7 +61,6 @@ namespace osu.Game.Overlays.Mods
         [BackgroundDependencyLoader]
         private void load()
         {
-            // values as ModSelectOverlay footer buttons
             const float shear = ShearedOverlayContainer.SHEAR;
 
             AutoSizeAxes = Axes.Both;
@@ -103,36 +102,26 @@ namespace osu.Game.Overlays.Mods
                                     {
                                         RelativeSizeAxes = Axes.Both
                                     },
-                                    new FillFlowContainer // actual inner content
+                                    new Container // actual inner content
                                     {
-                                        Origin = Anchor.CentreLeft,
-                                        Anchor = Anchor.CentreLeft,
-                                        AutoSizeAxes = Axes.X,
-                                        Direction = FillDirection.Horizontal,
+                                        Origin = Anchor.Centre,
+                                        Anchor = Anchor.Centre,
+                                        Width = 140,
+                                        RelativeSizeAxes = Axes.Y,
                                         Margin = new MarginPadding { Horizontal = 15 },
                                         Children = new Drawable[]
                                         {
-                                            new Container // wrap to reserve space for StarRatingDisplay
-                                            {
-                                                Width = 70, // can be up to 70px on extra high SR
-                                                Child = starRatingDisplay = new StarRatingDisplay(default, animated: true)
-                                                {
-                                                    Origin = Anchor.CentreLeft,
-                                                    Anchor = Anchor.CentreLeft,
-                                                    Shear = new Vector2(-shear, 0),
-                                                }
-                                            },
-                                            new Container // wrap to reserve space for BPM
+                                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
                                             {
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
-                                                Width = 70,
-                                                Child = bpmDisplay = new BPMDisplay
-                                                {
-                                                    Origin = Anchor.CentreLeft,
-                                                    Anchor = Anchor.CentreLeft,
-                                                    Shear = new Vector2(-shear, 0),
-                                                }
+                                                Shear = new Vector2(-shear, 0),
+                                            },
+                                            bpmDisplay = new BPMDisplay
+                                            {
+                                                Origin = Anchor.CentreRight,
+                                                Anchor = Anchor.CentreRight,
+                                                Shear = new Vector2(-shear, 0),
                                             }
                                         }
                                     }
@@ -147,10 +136,10 @@ namespace osu.Game.Overlays.Mods
                                 Direction = FillDirection.Horizontal,
                                 Children = new[]
                                 {
-                                    circleSizeDisplay = new VerticalAttributeDisplay("CS", "0.#"),
-                                    drainRateDisplay = new VerticalAttributeDisplay("HP", "0.#"),
-                                    approachRateDisplay = new VerticalAttributeDisplay("AR", "0.##"),
-                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD", "0.##"),
+                                    circleSizeDisplay = new VerticalAttributeDisplay("CS"),
+                                    drainRateDisplay = new VerticalAttributeDisplay("HP"),
+                                    approachRateDisplay = new VerticalAttributeDisplay("AR"),
+                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD"),
                                 }
                             }
                         }
@@ -221,7 +210,8 @@ namespace osu.Game.Overlays.Mods
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {
-                Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold)
+                Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold),
+                UseFullGlyphHeight = false,
             };
         }
     }
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index 503b07f3b9..ba8efd1c2b 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Overlays.Mods
             get => current.Current;
             set => current.Current = value;
         }
+
         private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
 
         /// <summary>
@@ -28,7 +29,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         public LocalisableString Label { get; protected set; }
 
-        public VerticalAttributeDisplay(LocalisableString label, string format = "0.#")
+        public VerticalAttributeDisplay(LocalisableString label)
         {
             Label = label;
             AutoSizeAxes = Axes.X;
@@ -50,12 +51,11 @@ namespace osu.Game.Overlays.Mods
                         Margin = new MarginPadding { Horizontal = 15 }, // to reserve space for 0.XX value
                         Font = OsuFont.Default.With(size: 20, weight: FontWeight.Bold)
                     },
-                    new EffectCounter()
+                    new EffectCounter
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         Current = { BindTarget = Current },
-                        Format = format
                     }
                 }
             };
@@ -65,9 +65,7 @@ namespace osu.Game.Overlays.Mods
         {
             protected override double RollingDuration => 500;
 
-            public string Format = "0.#";
-
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(Format);
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.0");
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {

From 53c30dca64e7e7eb44f882ffe5f26d44a2adec54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 09:52:43 +0200
Subject: [PATCH 0503/2296] Fix data flow being sometimes incorrect

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs  |  2 ++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs             | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index ad79865ad9..029a7f8b9e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("clear contents", Clear);
             AddStep("reset ruleset", () => Ruleset.Value = rulesetStore.GetRuleset(0));
             AddStep("reset mods", () => SelectedMods.SetDefault());
+            AddStep("set beatmap", () => Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo));
             AddStep("set up presets", () =>
             {
                 Realm.Write(r =>
@@ -92,6 +93,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             {
                 RelativeSizeAxes = Axes.Both,
                 State = { Value = Visibility.Visible },
+                Beatmap = Beatmap.Value,
                 SelectedMods = { BindTarget = SelectedMods }
             });
             waitForColumnLoad();
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index f2f2dc970c..1c5fc5abde 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -133,9 +133,9 @@ namespace osu.Game.Overlays.Mods
 
         private Sample? columnAppearSample;
 
-        private WorkingBeatmap beatmap = null!;
+        private WorkingBeatmap? beatmap;
 
-        public WorkingBeatmap Beatmap
+        public WorkingBeatmap? Beatmap
         {
             get => beatmap;
             set
@@ -143,7 +143,8 @@ namespace osu.Game.Overlays.Mods
                 if (beatmap == value) return;
 
                 beatmap = value;
-                modEffectPreviewPanel.BeatmapInfo.Value = beatmap.BeatmapInfo;
+                if (IsLoaded)
+                    modEffectPreviewPanel.BeatmapInfo.Value = beatmap?.BeatmapInfo;
             }
         }
 
@@ -246,7 +247,8 @@ namespace osu.Game.Overlays.Mods
                     {
                         Vertical = PADDING,
                         Horizontal = 70
-                    }
+                    },
+                    BeatmapInfo = { Value = beatmap?.BeatmapInfo }
                 },
                 footerButtonFlow = new FillFlowContainer<ShearedButton>
                 {

From 76bf82d900ccc46e1b89a1544f1748b25c74bbad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 09:55:45 +0200
Subject: [PATCH 0504/2296] Do not show mod effects on free mod select

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 56 +++++++++----------
 .../OnlinePlay/FreeModSelectOverlay.cs        |  2 +-
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1c5fc5abde..80340d2253 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -78,9 +78,9 @@ namespace osu.Game.Overlays.Mods
         public ShearedSearchTextBox SearchTextBox { get; private set; } = null!;
 
         /// <summary>
-        /// Whether the total score multiplier calculated from the current selected set of mods should be shown.
+        /// Whether the effects (on score multiplier, on or beatmap difficulty) of the current selected set of mods should be shown.
         /// </summary>
-        protected virtual bool ShowTotalMultiplier => true;
+        protected virtual bool ShowModEffects => true;
 
         /// <summary>
         /// Whether per-mod customisation controls are visible.
@@ -228,18 +228,15 @@ namespace osu.Game.Overlays.Mods
                 }
             });
 
-            if (ShowTotalMultiplier)
+            if (ShowModEffects)
             {
                 aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight
                 });
-            }
 
-            FooterContent.Children = new Drawable[]
-            {
-                modEffectPreviewPanel = new ModEffectPreviewPanel
+                FooterContent.Add(modEffectPreviewPanel = new ModEffectPreviewPanel
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -249,29 +246,30 @@ namespace osu.Game.Overlays.Mods
                         Horizontal = 70
                     },
                     BeatmapInfo = { Value = beatmap?.BeatmapInfo }
-                },
-                footerButtonFlow = new FillFlowContainer<ShearedButton>
+                });
+            }
+
+            FooterContent.Add(footerButtonFlow = new FillFlowContainer<ShearedButton>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Horizontal,
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
+                Padding = new MarginPadding
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Horizontal,
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    Padding = new MarginPadding
-                    {
-                        Vertical = PADDING,
-                        Horizontal = 70
-                    },
-                    Spacing = new Vector2(10),
-                    ChildrenEnumerable = CreateFooterButtons().Prepend(BackButton = new ShearedButton(BUTTON_WIDTH)
-                    {
-                        Text = CommonStrings.Back,
-                        Action = Hide,
-                        DarkerColour = colours.Pink2,
-                        LighterColour = colours.Pink1
-                    })
-                }
-            };
+                    Vertical = PADDING,
+                    Horizontal = 70
+                },
+                Spacing = new Vector2(10),
+                ChildrenEnumerable = CreateFooterButtons().Prepend(BackButton = new ShearedButton(BUTTON_WIDTH)
+                {
+                    Text = CommonStrings.Back,
+                    Action = Hide,
+                    DarkerColour = colours.Pink2,
+                    LighterColour = colours.Pink1
+                })
+            });
 
             globalAvailableMods.BindTo(game.AvailableMods);
         }
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 4d5d724089..7f090aca57 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay
 {
     public partial class FreeModSelectOverlay : ModSelectOverlay
     {
-        protected override bool ShowTotalMultiplier => false;
+        protected override bool ShowModEffects => false;
 
         protected override bool AllowCustomisation => false;
 

From 97665e029b8fbcf6f3a034a9d06592ff2859f755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:00:44 +0200
Subject: [PATCH 0505/2296] Remove weird fade

---
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 1a5d1e98c7..1b08b88740 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -182,8 +182,6 @@ namespace osu.Game.Overlays.Mods
 
                 if (!starRatingDisplay.IsPresent)
                     starRatingDisplay.FinishTransforms(true);
-
-                starRatingDisplay.FadeIn(transition_duration);
             });
 
             double rate = 1;

From ff6bf0bc2c3754a838be06d99937b2e6e917d51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:16:09 +0200
Subject: [PATCH 0506/2296] Fix slightly wrong binding setup

---
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 1b08b88740..7ace402a24 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -157,8 +157,7 @@ namespace osu.Game.Overlays.Mods
             content.BorderColour = ColourInfo.GradientVertical(background.Colour, glowColour);
             innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glowColour);
 
-            BeatmapInfo.BindValueChanged(_ => updateValues(), true);
-
+            BeatmapInfo.BindValueChanged(_ => updateValues());
             mods.BindValueChanged(_ =>
             {
                 modSettingChangeTracker?.Dispose();
@@ -166,7 +165,7 @@ namespace osu.Game.Overlays.Mods
                 modSettingChangeTracker = new ModSettingChangeTracker(mods.Value);
                 modSettingChangeTracker.SettingChanged += _ => updateValues();
                 updateValues();
-            });
+            }, true);
         }
 
         private void updateValues() => Scheduler.AddOnce(() =>

From f9d4fbee56eebed60cbbe6a273062beeee30903f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:16:24 +0200
Subject: [PATCH 0507/2296] Add collapsed state to effect preview panel

---
 .../UserInterface/TestSceneModEffectPreviewPanel.cs      | 2 ++
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs          | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
index e3afb874db..f958b231f9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
@@ -108,6 +108,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 if (panel.IsNotNull())
                     doubleTime.SpeedChange.Value = rate;
             });
+
+            AddToggleStep("toggle collapsed", collapsed => panel.Collapsed.Value = collapsed);
         }
 
         private void previewStarRating(double stars)
diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 7ace402a24..e03beb8649 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Overlays.Mods
         private StarRatingDisplay starRatingDisplay = null!;
         private BPMDisplay bpmDisplay = null!;
 
+        private FillFlowContainer<VerticalAttributeDisplay> outerContent = null!;
         private VerticalAttributeDisplay circleSizeDisplay = null!;
         private VerticalAttributeDisplay drainRateDisplay = null!;
         private VerticalAttributeDisplay approachRateDisplay = null!;
@@ -44,6 +45,8 @@ namespace osu.Game.Overlays.Mods
 
         public Bindable<IBeatmapInfo?> BeatmapInfo { get; } = new Bindable<IBeatmapInfo?>();
 
+        public BindableBool Collapsed { get; } = new BindableBool();
+
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
@@ -69,6 +72,8 @@ namespace osu.Game.Overlays.Mods
                 Origin = Anchor.BottomRight,
                 Anchor = Anchor.BottomRight,
                 AutoSizeAxes = Axes.X,
+                AutoSizeEasing = Easing.OutQuint,
+                AutoSizeDuration = transition_duration,
                 Height = ShearedButton.HEIGHT,
                 Shear = new Vector2(shear, 0),
                 CornerRadius = ShearedButton.CORNER_RADIUS,
@@ -127,7 +132,7 @@ namespace osu.Game.Overlays.Mods
                                     }
                                 }
                             },
-                            new FillFlowContainer<VerticalAttributeDisplay> // outer content
+                            outerContent = new FillFlowContainer<VerticalAttributeDisplay>
                             {
                                 Origin = Anchor.CentreLeft,
                                 Anchor = Anchor.CentreLeft,
@@ -166,6 +171,8 @@ namespace osu.Game.Overlays.Mods
                 modSettingChangeTracker.SettingChanged += _ => updateValues();
                 updateValues();
             }, true);
+
+            Collapsed.BindValueChanged(collapsed => outerContent.FadeTo(collapsed.NewValue ? 0 : 1, transition_duration, Easing.OutQuint), true);
         }
 
         private void updateValues() => Scheduler.AddOnce(() =>

From 0822e8b925b6bf9fd9d78c30fd71f740d96dd08a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:18:24 +0200
Subject: [PATCH 0508/2296] Fix preview panel not being marked nullable

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 80340d2253..1287c26c99 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -124,8 +124,7 @@ namespace osu.Game.Overlays.Mods
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
-
-        private ModEffectPreviewPanel modEffectPreviewPanel = null!;
+        private ModEffectPreviewPanel? modEffectPreviewPanel;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -143,7 +142,7 @@ namespace osu.Game.Overlays.Mods
                 if (beatmap == value) return;
 
                 beatmap = value;
-                if (IsLoaded)
+                if (IsLoaded && modEffectPreviewPanel != null)
                     modEffectPreviewPanel.BeatmapInfo.Value = beatmap?.BeatmapInfo;
             }
         }

From 3deb6cb4ec3eb13135bb93def1b8b9d38d49094c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:19:02 +0200
Subject: [PATCH 0509/2296] Fix z-order of mod preview panel

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1287c26c99..ca16b90852 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -227,27 +227,6 @@ namespace osu.Game.Overlays.Mods
                 }
             });
 
-            if (ShowModEffects)
-            {
-                aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight
-                });
-
-                FooterContent.Add(modEffectPreviewPanel = new ModEffectPreviewPanel
-                {
-                    Anchor = Anchor.BottomRight,
-                    Origin = Anchor.BottomRight,
-                    Margin = new MarginPadding
-                    {
-                        Vertical = PADDING,
-                        Horizontal = 70
-                    },
-                    BeatmapInfo = { Value = beatmap?.BeatmapInfo }
-                });
-            }
-
             FooterContent.Add(footerButtonFlow = new FillFlowContainer<ShearedButton>
             {
                 RelativeSizeAxes = Axes.X,
@@ -270,6 +249,27 @@ namespace osu.Game.Overlays.Mods
                 })
             });
 
+            if (ShowModEffects)
+            {
+                aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight
+                });
+
+                FooterContent.Add(modEffectPreviewPanel = new ModEffectPreviewPanel
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    Margin = new MarginPadding
+                    {
+                        Vertical = PADDING,
+                        Horizontal = 70
+                    },
+                    BeatmapInfo = { Value = beatmap?.BeatmapInfo }
+                });
+            }
+
             globalAvailableMods.BindTo(game.AvailableMods);
         }
 

From d51396fdaf3838addb8ad7c0d268c7661d25aa95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:46:07 +0200
Subject: [PATCH 0510/2296] Collapse mod effect preview when it's not wide
 enough to fit

---
 osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs | 3 ++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs      | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index e03beb8649..5eb1671570 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Mods
 
         public Bindable<IBeatmapInfo?> BeatmapInfo { get; } = new Bindable<IBeatmapInfo?>();
 
-        public BindableBool Collapsed { get; } = new BindableBool();
+        public BindableBool Collapsed { get; } = new BindableBool(true);
 
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
@@ -173,6 +173,7 @@ namespace osu.Game.Overlays.Mods
             }, true);
 
             Collapsed.BindValueChanged(collapsed => outerContent.FadeTo(collapsed.NewValue ? 0 : 1, transition_duration, Easing.OutQuint), true);
+            FinishTransforms(true);
         }
 
         private void updateValues() => Scheduler.AddOnce(() =>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ca16b90852..069fdf1af0 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -338,6 +338,15 @@ namespace osu.Game.Overlays.Mods
             base.Update();
 
             SearchTextBox.PlaceholderText = SearchTextBox.HasFocus ? Resources.Localisation.Web.CommonStrings.InputSearch : ModSelectOverlayStrings.TabToSearch;
+
+            if (modEffectPreviewPanel != null)
+            {
+                float rightEdgeOfLastButton = footerButtonFlow.Last().ScreenSpaceDrawQuad.TopRight.X;
+                // this is cheating a bit; the 375 value is hardcoded based on how wide the expanded panel _generally_ is.
+                // due to the transition applied, the raw screenspace quad of the panel cannot be used, as it will trigger an ugly feedback cycle of expanding and collapsing.
+                float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(375 + 70, 0)).X;
+                modEffectPreviewPanel.Collapsed.Value = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
+            }
         }
 
         /// <summary>

From eebacfb982be3e1d0eaf834c2c78f15ec81686be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 10:59:19 +0200
Subject: [PATCH 0511/2296] Make mod effect preview uncollapse on hover

---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 26 +++++++++++++++++--
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  3 +++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index 5eb1671570..a6d7732cba 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
 using System.Threading;
+using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
@@ -67,7 +68,7 @@ namespace osu.Game.Overlays.Mods
             const float shear = ShearedOverlayContainer.SHEAR;
 
             AutoSizeAxes = Axes.Both;
-            InternalChild = content = new InputBlockingContainer
+            InternalChild = content = new Container
             {
                 Origin = Anchor.BottomRight,
                 Anchor = Anchor.BottomRight,
@@ -172,10 +173,26 @@ namespace osu.Game.Overlays.Mods
                 updateValues();
             }, true);
 
-            Collapsed.BindValueChanged(collapsed => outerContent.FadeTo(collapsed.NewValue ? 0 : 1, transition_duration, Easing.OutQuint), true);
+            Collapsed.BindValueChanged(_ => updateCollapsedState(), true);
             FinishTransforms(true);
         }
 
+        protected override bool OnHover(HoverEvent e)
+        {
+            updateCollapsedState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            updateCollapsedState();
+            base.OnHoverLost(e);
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
+
         private void updateValues() => Scheduler.AddOnce(() =>
         {
             if (BeatmapInfo.Value == null)
@@ -207,6 +224,11 @@ namespace osu.Game.Overlays.Mods
             overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
         });
 
+        private void updateCollapsedState()
+        {
+            outerContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
+        }
+
         private partial class BPMDisplay : RollingCounter<double>
         {
             protected override double RollingDuration => 500;
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 069fdf1af0..d52782cf11 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -924,6 +924,9 @@ namespace osu.Game.Overlays.Mods
                         OnClicked?.Invoke();
                         return true;
 
+                    case HoverEvent:
+                        return false;
+
                     case MouseEvent:
                         return true;
                 }

From 86330a7cc46b939e2b6c293f2cf492f569a1b03d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 11 Sep 2023 18:01:53 +0900
Subject: [PATCH 0512/2296] Adjust comment

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index a8ac52714c..03c6876bae 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     // We'll redo the calculations to match osu-stable here...
                     const double maximum_rotations_per_second = 477.0 / 60;
 
-                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that maximises rotations.
+                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that minimises bonus score.
                     const double minimum_rotations_per_second = 7.5;
 
                     double secondsDuration = spinner.Duration / 1000;

From 293b81106261b1a3aad47d9461a8b2a7f550c8b6 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 13:09:49 +0200
Subject: [PATCH 0513/2296] feat(OsuColours): add B6

---
 osu.Game/Graphics/OsuColour.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 1b21f79c0a..481015de85 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -383,6 +383,7 @@ namespace osu.Game.Graphics
 
         // Content Background
         public readonly Color4 B5 = Color4Extensions.FromHex(@"222a28");
+        public readonly Color4 B6 = Color4Extensions.FromHex(@"1c1719"); // hsl(333,10%,10%)
 
         public readonly Color4 RedLighter = Color4Extensions.FromHex(@"ffeded");
         public readonly Color4 RedLight = Color4Extensions.FromHex(@"ed7787");

From f6031bc15f46a2a00103c8f8e63e3d1fa62e6b11 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 13:41:32 +0200
Subject: [PATCH 0514/2296] fix: prevent flickering when hovering out

---
 osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
index b722fe92e0..953a14a241 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
@@ -84,6 +84,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Full,
+                                AlwaysPresent = true,
                                 Margin = new MarginPadding { Bottom = margin, Top = margin / 2f }
                             }
                         }

From 200b3f87fff5ce4a7de5948f990cc85a70c89060 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 14:26:10 +0200
Subject: [PATCH 0515/2296] fix: adjust values according to osu-web

---
 .../Overlays/Profile/Header/Components/PreviousUsernames.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
index 953a14a241..18257e96c4 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             AutoSizeAxes = Axes.Y;
             Width = width;
             Masking = true;
-            CornerRadius = 5;
+            CornerRadius = 6;
 
             AddRangeInternal(new Drawable[]
             {
@@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            background.Colour = colours.GreySeaFoamDarker;
+            background.Colour = colours.B6;
         }
 
         protected override void LoadComplete()
@@ -157,7 +157,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 {
                     Margin = new MarginPadding { Top = 6, Left = margin, Right = margin * 2 },
                     Size = new Vector2(15),
-                    Icon = FontAwesome.Solid.IdCard,
+                    Icon = FontAwesome.Solid.AddressCard,
                 };
             }
 

From 8c137353b62ac8a43e197d2d31a3efa2a9219357 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 15:02:19 +0200
Subject: [PATCH 0516/2296] feat: integrate previous usernames tooltip to
 profile overlay

---
 .../Online/TestSceneUserProfileHeader.cs      | 26 +++++++++++++++++++
 .../Profile/Header/TopHeaderContainer.cs      | 14 ++++++++++
 2 files changed, 40 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
index 640e895b6c..4f28baa849 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
@@ -110,5 +110,31 @@ namespace osu.Game.Tests.Visual.Online
                 }
             }, new OsuRuleset().RulesetInfo));
         }
+
+        [Test]
+        public void TestPreviousUsernames()
+        {
+            AddStep("Show user w/ previous usernames", () => header.User.Value = new UserProfileData(new APIUser
+            {
+                Id = 727,
+                Username = "SomeoneIndecisive",
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
+                Groups = new[]
+                {
+                    new APIUserGroup { Colour = "#EB47D0", ShortName = "DEV", Name = "Developers" },
+                },
+                Statistics = new UserStatistics
+                {
+                    IsRanked = false,
+                    // web will sometimes return non-empty rank history even for unranked users.
+                    RankHistory = new APIRankHistory
+                    {
+                        Mode = @"osu",
+                        Data = Enumerable.Range(2345, 85).ToArray()
+                    },
+                },
+                PreviousUsernames = new[] { "tsrk.", "quoicoubeh", "apagnan", "epita" }
+            }, new OsuRuleset().RulesetInfo));
+        }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index dc47ce6e30..f4f962cdfb 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Overlays.Profile.Header
         private OsuSpriteText userCountryText = null!;
         private GroupBadgeFlow groupBadgeFlow = null!;
         private ToggleCoverButton coverToggle = null!;
+        private PreviousUsernames previousUsernames = null!;
 
         private Bindable<bool> coverExpanded = null!;
 
@@ -143,6 +144,18 @@ namespace osu.Game.Overlays.Profile.Header
                                                             Anchor = Anchor.CentreLeft,
                                                             Origin = Anchor.CentreLeft,
                                                         },
+                                                        new Container
+                                                        {
+                                                            Child = previousUsernames = new PreviousUsernames
+                                                            {
+                                                                Anchor = Anchor.TopLeft,
+                                                                Origin = Anchor.TopLeft,
+                                                            },
+                                                            Anchor = Anchor.TopLeft,
+                                                            Origin = Anchor.TopLeft,
+                                                            Size = new Vector2(0),
+                                                            Position = new Vector2(10)
+                                                        }
                                                     }
                                                 },
                                                 titleText = new OsuSpriteText
@@ -216,6 +229,7 @@ namespace osu.Game.Overlays.Profile.Header
             titleText.Text = user?.Title ?? string.Empty;
             titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");
             groupBadgeFlow.User.Value = user;
+            previousUsernames.User.Value = user;
         }
 
         private void updateCoverState()

From 65f3feb044dc77518e0c767bd36da68ec71cb08b Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 15:21:51 +0200
Subject: [PATCH 0517/2296] refactor: remove container position

---
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index f4f962cdfb..8aae13ebc5 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -154,7 +154,6 @@ namespace osu.Game.Overlays.Profile.Header
                                                             Anchor = Anchor.TopLeft,
                                                             Origin = Anchor.TopLeft,
                                                             Size = new Vector2(0),
-                                                            Position = new Vector2(10)
                                                         }
                                                     }
                                                 },

From c6e8a77f08d13f9790c40a7d6697e089bc9f0fa8 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 15:22:23 +0200
Subject: [PATCH 0518/2296] refactor: slightly offset to make it look good

---
 .../Profile/Header/Components/PreviousUsernames.cs        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
index 18257e96c4..686f6b2918 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
@@ -22,8 +22,9 @@ namespace osu.Game.Overlays.Profile.Header.Components
     {
         private const int duration = 200;
         private const int margin = 10;
-        private const int width = 310;
+        private const int width = 300;
         private const int move_offset = 15;
+        private const int base_y_offset = -3; // eye balled to make it look good
 
         public readonly Bindable<APIUser?> User = new Bindable<APIUser?>();
 
@@ -39,6 +40,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             Width = width;
             Masking = true;
             CornerRadius = 6;
+            Y = base_y_offset;
 
             AddRangeInternal(new Drawable[]
             {
@@ -135,7 +137,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             text.FadeIn(duration, Easing.OutQuint);
             header.FadeIn(duration, Easing.OutQuint);
             background.FadeIn(duration, Easing.OutQuint);
-            this.MoveToY(-move_offset, duration, Easing.OutQuint);
+            this.MoveToY(base_y_offset - move_offset, duration, Easing.OutQuint);
         }
 
         private void hideContent()
@@ -143,7 +145,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             text.FadeOut(duration, Easing.OutQuint);
             header.FadeOut(duration, Easing.OutQuint);
             background.FadeOut(duration, Easing.OutQuint);
-            this.MoveToY(0, duration, Easing.OutQuint);
+            this.MoveToY(base_y_offset, duration, Easing.OutQuint);
         }
 
         private partial class HoverIconContainer : Container

From 8c989d77bdf020f2f34a84095ea95ac24f21bdd2 Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 16:00:46 +0200
Subject: [PATCH 0519/2296] revert: use `OverlayColourProvider` for B6

Refs: 293b81106261b1a3aad47d9461a8ba7f550c8b6
---
 osu.Game/Graphics/OsuColour.cs                                | 1 -
 .../Overlays/Profile/Header/Components/PreviousUsernames.cs   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 481015de85..1b21f79c0a 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -383,7 +383,6 @@ namespace osu.Game.Graphics
 
         // Content Background
         public readonly Color4 B5 = Color4Extensions.FromHex(@"222a28");
-        public readonly Color4 B6 = Color4Extensions.FromHex(@"1c1719"); // hsl(333,10%,10%)
 
         public readonly Color4 RedLighter = Color4Extensions.FromHex(@"ffeded");
         public readonly Color4 RedLight = Color4Extensions.FromHex(@"ed7787");
diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
index 686f6b2918..2ea175d1f0 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
@@ -99,9 +99,9 @@ namespace osu.Game.Overlays.Profile.Header.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colours)
         {
-            background.Colour = colours.B6;
+            background.Colour = colours.Background6;
         }
 
         protected override void LoadComplete()

From f331f921518f1bf470480a255d7a6d4a448aad8d Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Mon, 11 Sep 2023 16:06:06 +0200
Subject: [PATCH 0520/2296] chore: explain `f6031bc1`

---
 .../Overlays/Profile/Header/Components/PreviousUsernames.cs    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
index 2ea175d1f0..42f54ea43e 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
@@ -86,6 +86,9 @@ namespace osu.Game.Overlays.Profile.Header.Components
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Full,
+                                // Prevents the tooltip of having a sudden size reduction
+                                // and flickering when the text is being faded out.
+                                // Also prevents a potential OnHover/HoverLost infinite loop
                                 AlwaysPresent = true,
                                 Margin = new MarginPadding { Bottom = margin, Top = margin / 2f }
                             }

From 824416067e0c95bdd4ca74f3da59f0cebfea9827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Sep 2023 20:53:17 +0200
Subject: [PATCH 0521/2296] Fix test failure

---
 .../UserInterface/TestSceneModEffectPreviewPanel.cs   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
index f958b231f9..adb12ad249 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
@@ -9,7 +9,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -31,12 +30,14 @@ namespace osu.Game.Tests.Visual.UserInterface
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
 
         private Container content = null!;
+        protected override Container<Drawable> Content => content;
+
         private ModEffectPreviewPanel panel = null!;
 
-        [SetUpSteps]
-        public void SetUpSteps()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            AddStep("set up cache", () => Children = new Drawable[]
+            base.Content.AddRange(new Drawable[]
             {
                 difficultyCache,
                 content = new Container
@@ -52,7 +53,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuModDifficultyAdjust difficultyAdjust = new OsuModDifficultyAdjust();
             OsuModDoubleTime doubleTime = new OsuModDoubleTime();
 
-            AddStep("create display", () => content.Child = panel = new ModEffectPreviewPanel
+            AddStep("create display", () => Child = panel = new ModEffectPreviewPanel
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

From dbc07bc6dc50f5da76cf529cebcfdaa60105361e Mon Sep 17 00:00:00 2001
From: "tsrk." <tsrk@tsrk.me>
Date: Tue, 12 Sep 2023 01:34:17 +0200
Subject: [PATCH 0522/2296] fix: provide `OverlayColourProvider` as a dep in
 tests

---
 .../Online/TestSceneUserProfilePreviousUsernames.cs   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
index 921738d331..4310710624 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
@@ -5,6 +5,7 @@ using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Profile.Header.Components;
 
 namespace osu.Game.Tests.Visual.Online
@@ -13,12 +14,20 @@ namespace osu.Game.Tests.Visual.Online
     public partial class TestSceneUserProfilePreviousUsernames : OsuTestScene
     {
         private PreviousUsernames container = null!;
+        private OverlayColourProvider colourProvider = null!;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            Child = container = new PreviousUsernames
+            colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
+            Child = new DependencyProvidingContainer
             {
+                Child = container = new PreviousUsernames
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                CachedDependencies = new (Type, object)[] { (typeof(OverlayColourProvider), colourProvider) },
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };

From 04ab44bb7a057851ad68e198e8746334e9827bc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 15:28:55 +0900
Subject: [PATCH 0523/2296] Reword xmldoc to read better
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
index 3cea58b2b7..fe7843a682 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Scoring.Legacy
     public interface ILegacyScoreSimulator
     {
         /// <summary>
-        /// Performs the simulation, scoring values achievable for the given beatmap.
+        /// Performs the simulation, computing the maximum scoring values achievable for the given beatmap.
         /// </summary>
         /// <param name="workingBeatmap">The working beatmap.</param>
         /// <param name="playableBeatmap">A playable version of the beatmap for the ruleset.</param>

From b4bedee49e0a8fc2104fbc5d98e2abb5d38edca4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 15:43:59 +0900
Subject: [PATCH 0524/2296] Adjust naming of component to give more context

---
 ...s.cs => TestSceneUserProfilePreviousUsernamesDisplay.cs} | 6 +++---
 .../{PreviousUsernames.cs => PreviousUsernamesDisplay.cs}   | 4 ++--
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs      | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Visual/Online/{TestSceneUserProfilePreviousUsernames.cs => TestSceneUserProfilePreviousUsernamesDisplay.cs} (92%)
 rename osu.Game/Overlays/Profile/Header/Components/{PreviousUsernames.cs => PreviousUsernamesDisplay.cs} (98%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernamesDisplay.cs
similarity index 92%
rename from osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
rename to osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernamesDisplay.cs
index 4310710624..c1140f60af 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernames.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfilePreviousUsernamesDisplay.cs
@@ -11,9 +11,9 @@ using osu.Game.Overlays.Profile.Header.Components;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public partial class TestSceneUserProfilePreviousUsernames : OsuTestScene
+    public partial class TestSceneUserProfilePreviousUsernamesDisplay : OsuTestScene
     {
-        private PreviousUsernames container = null!;
+        private PreviousUsernamesDisplay container = null!;
         private OverlayColourProvider colourProvider = null!;
 
         [SetUp]
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Online
             colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
             Child = new DependencyProvidingContainer
             {
-                Child = container = new PreviousUsernames
+                Child = container = new PreviousUsernamesDisplay
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
similarity index 98%
rename from osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
rename to osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
index 42f54ea43e..634e6c5209 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
@@ -18,7 +18,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public partial class PreviousUsernames : CompositeDrawable
+    public partial class PreviousUsernamesDisplay : CompositeDrawable
     {
         private const int duration = 200;
         private const int margin = 10;
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private readonly Box background;
         private readonly SpriteText header;
 
-        public PreviousUsernames()
+        public PreviousUsernamesDisplay()
         {
             HoverIconContainer hoverIcon;
 
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 8aae13ebc5..146e38d389 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Profile.Header
         private OsuSpriteText userCountryText = null!;
         private GroupBadgeFlow groupBadgeFlow = null!;
         private ToggleCoverButton coverToggle = null!;
-        private PreviousUsernames previousUsernames = null!;
+        private PreviousUsernamesDisplay previousUsernamesDisplay = null!;
 
         private Bindable<bool> coverExpanded = null!;
 
@@ -146,7 +146,7 @@ namespace osu.Game.Overlays.Profile.Header
                                                         },
                                                         new Container
                                                         {
-                                                            Child = previousUsernames = new PreviousUsernames
+                                                            Child = previousUsernamesDisplay = new PreviousUsernamesDisplay
                                                             {
                                                                 Anchor = Anchor.TopLeft,
                                                                 Origin = Anchor.TopLeft,
@@ -228,7 +228,7 @@ namespace osu.Game.Overlays.Profile.Header
             titleText.Text = user?.Title ?? string.Empty;
             titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");
             groupBadgeFlow.User.Value = user;
-            previousUsernames.User.Value = user;
+            previousUsernamesDisplay.User.Value = user;
         }
 
         private void updateCoverState()

From a6acd00908ffd82ce1b43b8e1f1d839ee3906ec7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 15:46:05 +0900
Subject: [PATCH 0525/2296] Reword inline comment

---
 .../Profile/Header/Components/PreviousUsernamesDisplay.cs    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
index 634e6c5209..dce5c84d12 100644
--- a/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/PreviousUsernamesDisplay.cs
@@ -86,9 +86,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Full,
-                                // Prevents the tooltip of having a sudden size reduction
-                                // and flickering when the text is being faded out.
-                                // Also prevents a potential OnHover/HoverLost infinite loop
+                                // Prevents the tooltip of having a sudden size reduction and flickering when the text is being faded out.
+                                // Also prevents a potential OnHover/HoverLost feedback loop.
                                 AlwaysPresent = true,
                                 Margin = new MarginPadding { Bottom = margin, Top = margin / 2f }
                             }

From 23521ad394dbab69b8be597f800475dc06db4ddf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 15:53:27 +0900
Subject: [PATCH 0526/2296] Simplify container structure and mention why a
 zero-size container is being used

---
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 146e38d389..36bd8a5af5 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -146,14 +146,8 @@ namespace osu.Game.Overlays.Profile.Header
                                                         },
                                                         new Container
                                                         {
-                                                            Child = previousUsernamesDisplay = new PreviousUsernamesDisplay
-                                                            {
-                                                                Anchor = Anchor.TopLeft,
-                                                                Origin = Anchor.TopLeft,
-                                                            },
-                                                            Anchor = Anchor.TopLeft,
-                                                            Origin = Anchor.TopLeft,
-                                                            Size = new Vector2(0),
+                                                            // Intentionally use a zero-size container, else the fill flow will adjust to (and cancel) the upwards animation.
+                                                            Child = previousUsernamesDisplay = new PreviousUsernamesDisplay(),
                                                         }
                                                     }
                                                 },

From e40eaa73774804646f928989672054ce9d56f15a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 17:00:06 +0900
Subject: [PATCH 0527/2296] Improve collapse/expand animations

Especially when on a screen resolution where it would start collapsed.
---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 23 +++++++++++++++----
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  4 +++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index a6d7732cba..b9511cc544 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -73,8 +73,6 @@ namespace osu.Game.Overlays.Mods
                 Origin = Anchor.BottomRight,
                 Anchor = Anchor.BottomRight,
                 AutoSizeAxes = Axes.X,
-                AutoSizeEasing = Easing.OutQuint,
-                AutoSizeDuration = transition_duration,
                 Height = ShearedButton.HEIGHT,
                 Shear = new Vector2(shear, 0),
                 CornerRadius = ShearedButton.CORNER_RADIUS,
@@ -135,6 +133,7 @@ namespace osu.Game.Overlays.Mods
                             },
                             outerContent = new FillFlowContainer<VerticalAttributeDisplay>
                             {
+                                Alpha = 0,
                                 Origin = Anchor.CentreLeft,
                                 Anchor = Anchor.CentreLeft,
                                 AutoSizeAxes = Axes.X,
@@ -163,7 +162,6 @@ namespace osu.Game.Overlays.Mods
             content.BorderColour = ColourInfo.GradientVertical(background.Colour, glowColour);
             innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glowColour);
 
-            BeatmapInfo.BindValueChanged(_ => updateValues());
             mods.BindValueChanged(_ =>
             {
                 modSettingChangeTracker?.Dispose();
@@ -173,12 +171,20 @@ namespace osu.Game.Overlays.Mods
                 updateValues();
             }, true);
 
-            Collapsed.BindValueChanged(_ => updateCollapsedState(), true);
-            FinishTransforms(true);
+            Collapsed.BindValueChanged(_ =>
+            {
+                // Only start autosize animations on first collapse toggle. This avoids an ugly initial presentation.
+                startAnimating();
+
+                updateCollapsedState();
+            });
+
+            BeatmapInfo.BindValueChanged(_ => updateValues(), true);
         }
 
         protected override bool OnHover(HoverEvent e)
         {
+            startAnimating();
             updateCollapsedState();
             return true;
         }
@@ -193,12 +199,19 @@ namespace osu.Game.Overlays.Mods
 
         protected override bool OnClick(ClickEvent e) => true;
 
+        private void startAnimating()
+        {
+            content.AutoSizeEasing = Easing.OutQuint;
+            content.AutoSizeDuration = transition_duration;
+        }
+
         private void updateValues() => Scheduler.AddOnce(() =>
         {
             if (BeatmapInfo.Value == null)
                 return;
 
             cancellationSource?.Cancel();
+
             starDifficulty = difficultyCache.GetBindableDifficulty(BeatmapInfo.Value, (cancellationSource = new CancellationTokenSource()).Token);
             starDifficulty.BindValueChanged(s =>
             {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index d52782cf11..242f883068 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -339,9 +339,11 @@ namespace osu.Game.Overlays.Mods
 
             SearchTextBox.PlaceholderText = SearchTextBox.HasFocus ? Resources.Localisation.Web.CommonStrings.InputSearch : ModSelectOverlayStrings.TabToSearch;
 
-            if (modEffectPreviewPanel != null)
+            // only update preview panel's collapsed state after we are fully visible, to ensure all the buttons are where we expect them to be.
+            if (modEffectPreviewPanel != null && Alpha == 1)
             {
                 float rightEdgeOfLastButton = footerButtonFlow.Last().ScreenSpaceDrawQuad.TopRight.X;
+
                 // this is cheating a bit; the 375 value is hardcoded based on how wide the expanded panel _generally_ is.
                 // due to the transition applied, the raw screenspace quad of the panel cannot be used, as it will trigger an ugly feedback cycle of expanding and collapsing.
                 float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(375 + 70, 0)).X;

From 3da30485b2766242f626798c206940cc52c9f90f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 17:06:42 +0900
Subject: [PATCH 0528/2296] Move shear spec to correct location

---
 .../Overlays/Mods/ModEffectPreviewPanel.cs    | 20 +++++++++++++++----
 .../Overlays/Mods/VerticalAttributeDisplay.cs |  8 +++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
index b9511cc544..c961235cb2 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
@@ -141,10 +141,22 @@ namespace osu.Game.Overlays.Mods
                                 Direction = FillDirection.Horizontal,
                                 Children = new[]
                                 {
-                                    circleSizeDisplay = new VerticalAttributeDisplay("CS"),
-                                    drainRateDisplay = new VerticalAttributeDisplay("HP"),
-                                    approachRateDisplay = new VerticalAttributeDisplay("AR"),
-                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD"),
+                                    circleSizeDisplay = new VerticalAttributeDisplay("CS")
+                                    {
+                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    },
+                                    drainRateDisplay = new VerticalAttributeDisplay("HP")
+                                    {
+                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    },
+                                    approachRateDisplay = new VerticalAttributeDisplay("AR")
+                                    {
+                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    },
+                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD")
+                                    {
+                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    },
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index ba8efd1c2b..60cc875dbb 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -10,7 +10,6 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -32,9 +31,12 @@ namespace osu.Game.Overlays.Mods
         public VerticalAttributeDisplay(LocalisableString label)
         {
             Label = label;
+
             AutoSizeAxes = Axes.X;
-            Origin = Anchor = Anchor.CentreLeft;
-            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0);
+
+            Origin = Anchor.CentreLeft;
+            Anchor = Anchor.CentreLeft;
+
             InternalChild = new FillFlowContainer
             {
                 Origin = Anchor.CentreLeft,

From 7e3652284db7ab6bc14695ea4c4bb345edaf0bf1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 17:15:16 +0900
Subject: [PATCH 0529/2296] Adjust various class naming and add some xmldoc

---
 .../UserInterface/TestSceneModEffectPreviewPanel.cs       | 4 ++--
 .../Visual/UserInterface/TestSceneModsEffectDisplay.cs    | 2 +-
 ...dEffectPreviewPanel.cs => BeatmapAttributesDisplay.cs} | 6 +++++-
 osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs     | 2 +-
 .../Mods/{ModsEffectDisplay.cs => ModCounterDisplay.cs}   | 6 +++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                | 8 ++++----
 6 files changed, 16 insertions(+), 12 deletions(-)
 rename osu.Game/Overlays/Mods/{ModEffectPreviewPanel.cs => BeatmapAttributesDisplay.cs} (97%)
 rename osu.Game/Overlays/Mods/{ModsEffectDisplay.cs => ModCounterDisplay.cs} (97%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
index adb12ad249..b3ad5a499e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModEffectPreviewPanel.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private Container content = null!;
         protected override Container<Drawable> Content => content;
 
-        private ModEffectPreviewPanel panel = null!;
+        private BeatmapAttributesDisplay panel = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuModDifficultyAdjust difficultyAdjust = new OsuModDifficultyAdjust();
             OsuModDoubleTime doubleTime = new OsuModDoubleTime();
 
-            AddStep("create display", () => Child = panel = new ModEffectPreviewPanel
+            AddStep("create display", () => Child = panel = new BeatmapAttributesDisplay
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
index a1c8bef1de..bf6a718167 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyIncrease));
         }
 
-        private partial class TestDisplay : ModsEffectDisplay
+        private partial class TestDisplay : ModCounterDisplay
         {
             public Container<Drawable> Container => Content;
 
diff --git a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
similarity index 97%
rename from osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
rename to osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index c961235cb2..2aea53090a 100644
--- a/osu.Game/Overlays/Mods/ModEffectPreviewPanel.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -25,7 +25,11 @@ using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class ModEffectPreviewPanel : CompositeDrawable
+    /// <summary>
+    /// On the mod select overlay, this provides a local updating view of BPM, star rating and other
+    /// difficulty attributes so the user can have a better insight into what mods are changing.
+    /// </summary>
+    public partial class BeatmapAttributesDisplay : CompositeDrawable
     {
         private Container content = null!;
         private Container innerContent = null!;
diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 9e16aa926f..9f4d187879 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Mods
 {
-    public sealed partial class DifficultyMultiplierDisplay : ModsEffectDisplay
+    public sealed partial class DifficultyMultiplierDisplay : ModCounterDisplay
     {
         protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
 
diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
similarity index 97%
rename from osu.Game/Overlays/Mods/ModsEffectDisplay.cs
rename to osu.Game/Overlays/Mods/ModCounterDisplay.cs
index 3f31736ee1..3bec27d290 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
@@ -19,9 +19,9 @@ using osuTK;
 namespace osu.Game.Overlays.Mods
 {
     /// <summary>
-    /// Base class for displays of mods effects.
+    /// Base class for displays of singular counters. Not to be confused with <see cref="BeatmapAttributesDisplay"/> which aggregates multiple attributes.
     /// </summary>
-    public abstract partial class ModsEffectDisplay : Container, IHasCurrentValue<double>
+    public abstract partial class ModCounterDisplay : Container, IHasCurrentValue<double>
     {
         public const float HEIGHT = 42;
         private const float transition_duration = 200;
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly RollingCounter<double> Counter;
 
-        protected ModsEffectDisplay()
+        protected ModCounterDisplay()
         {
             Height = HEIGHT;
             AutoSizeAxes = Axes.X;
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 242f883068..666e2849e8 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.Mods
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
-        private ModEffectPreviewPanel? modEffectPreviewPanel;
+        private BeatmapAttributesDisplay? modEffectPreviewPanel;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -181,7 +181,7 @@ namespace osu.Game.Overlays.Mods
                 aboveColumnsContent = new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = ModsEffectDisplay.HEIGHT,
+                    Height = ModCounterDisplay.HEIGHT,
                     Padding = new MarginPadding { Horizontal = 100 },
                     Child = SearchTextBox = new ShearedSearchTextBox
                     {
@@ -196,7 +196,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = ModsEffectDisplay.HEIGHT + PADDING,
+                            Top = ModCounterDisplay.HEIGHT + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,
@@ -257,7 +257,7 @@ namespace osu.Game.Overlays.Mods
                     Origin = Anchor.TopRight
                 });
 
-                FooterContent.Add(modEffectPreviewPanel = new ModEffectPreviewPanel
+                FooterContent.Add(modEffectPreviewPanel = new BeatmapAttributesDisplay
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,

From 95d15a703eb33b37baa10d90d56fdc0ce4df550f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 11:36:41 +0200
Subject: [PATCH 0530/2296] Improve legibility of scoring test scene

- Add black background to avoid clashes with background images.
- Use sorta-tetradic colours for the four plots.
---
 .../Visual/Gameplay/TestSceneScoring.cs         | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index c722d67ac9..4cbc046877 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -5,6 +5,7 @@ using System;
 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.Graphics.Containers;
@@ -36,6 +37,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private FillFlowContainer legend = null!;
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         [Test]
         public void TestBasic()
         {
@@ -43,6 +47,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 Children = new Drawable[]
                 {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Colour4.Black
+                    },
                     new GridContainer
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -125,8 +134,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Clear();
             legend.Clear();
 
-            runForProcessor("lazer-standardised", Color4.YellowGreen, new OsuScoreProcessor(), ScoringMode.Standardised);
-            runForProcessor("lazer-classic", Color4.MediumPurple, new OsuScoreProcessor(), ScoringMode.Classic);
+            runForProcessor("lazer-standardised", colours.Green1, new OsuScoreProcessor(), ScoringMode.Standardised);
+            runForProcessor("lazer-classic", colours.Blue1, new OsuScoreProcessor(), ScoringMode.Classic);
 
             runScoreV1();
             runScoreV2();
@@ -156,7 +165,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 currentCombo++;
             }
 
-            runForAlgorithm("ScoreV1 (classic)", Color4.Purple,
+            runForAlgorithm("ScoreV1 (classic)", colours.Purple1,
                 () => applyHitV1(base_great),
                 () => applyHitV1(base_ok),
                 () => applyHitV1(0),
@@ -199,7 +208,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 currentHits++;
             }
 
-            runForAlgorithm("ScoreV2", Color4.OrangeRed,
+            runForAlgorithm("ScoreV2", colours.Red1,
                 () => applyHitV2(base_great),
                 () => applyHitV2(base_ok),
                 () =>

From 4ecc4632aa9849865f438401783172169d6aac71 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 18:41:08 +0900
Subject: [PATCH 0531/2296] Make rounding error even less precise

Basically matching the old code more closely to avoid too much precision
from doing math in a slightly different way.
---
 .../Legacy/DistanceObjectPatternGenerator.cs   |  2 +-
 .../Beatmaps/TaikoBeatmapConverter.cs          |  2 +-
 .../Objects/Types/IHasSliderVelocity.cs        | 18 +++++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 749ab78fa5..476bcda36f 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             double beatLength;
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.GetPrecisionAdjustedSliderVelocityMultiplier(ManiaRuleset.SHORT_NAME);
+                beatLength = hasSliderVelocity.GetPrecisionAdjustedBeatLength(timingPoint, ManiaRuleset.SHORT_NAME);
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 339c671943..ff6809e69a 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             double beatLength;
 
             if (obj is IHasSliderVelocity hasSliderVelocity)
-                beatLength = timingPoint.BeatLength / hasSliderVelocity.GetPrecisionAdjustedSliderVelocityMultiplier(TaikoRuleset.SHORT_NAME);
+                beatLength = hasSliderVelocity.GetPrecisionAdjustedBeatLength(timingPoint, TaikoRuleset.SHORT_NAME);
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
index 34c2bda05c..73582b8fdc 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Bindables;
+using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
@@ -19,21 +20,28 @@ namespace osu.Game.Rulesets.Objects.Types
         BindableNumber<double> SliderVelocityMultiplierBindable { get; }
 
         /// <summary>
-        /// Introduces floating-point errors for rulesets that depend on it.
+        /// Introduces floating-point errors to post-multiplied beat length for rulesets that depend on it.
         /// </summary>
-        public double GetPrecisionAdjustedSliderVelocityMultiplier(string rulesetShortName)
+        public double GetPrecisionAdjustedBeatLength(TimingControlPoint timingControlPoint, string rulesetShortName)
         {
-            double beatLength = -100 / SliderVelocityMultiplier;
+            double sliderVelocityAsBeatLength = -100 / SliderVelocityMultiplier;
+
+            // Note: In stable, the division occurs on floats, but with compiler optimisations turned on actually seems to occur on doubles via some .NET black magic (possibly inlining?).
+            double bpmMultiplier;
 
             switch (rulesetShortName)
             {
                 case "taiko":
                 case "mania":
-                    return 1 / (beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100.0 : 1);
+                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 10000) / 100.0 : 1;
+                    break;
 
                 default:
-                    return 1 / (beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 1000) / 100.0 : 1);
+                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 1000) / 100.0 : 1;
+                    break;
             }
+
+            return timingControlPoint.BeatLength * bpmMultiplier;
         }
     }
 }

From 3cf8082aa7b2877a7f533074ad697b4329cf391f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 12:07:12 +0200
Subject: [PATCH 0532/2296] Add capability to toggle visibility of graph

---
 .../Visual/Gameplay/TestSceneScoring.cs       | 92 ++++++++++++++++---
 1 file changed, 77 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index 4cbc046877..d7974b63e7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using NUnit.Framework;
 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.Cursor;
@@ -75,7 +76,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                                 legend = new FillFlowContainer
                                 {
                                     Padding = new MarginPadding(20),
-                                    Direction = FillDirection.Full,
+                                    Direction = FillDirection.Vertical,
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
                                 },
@@ -263,7 +264,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 results.Add(getTotalScore());
             }
 
-            graphs.Add(new LineGraph
+            LineGraph graph;
+            graphs.Add(graph = new LineGraph
             {
                 Name = name,
                 RelativeSizeAxes = Axes.Both,
@@ -271,20 +273,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Values = results
             });
 
-            legend.Add(new OsuSpriteText
+            legend.Add(new LegendEntry(name, getTotalScore(), graph)
             {
-                Colour = colour,
-                RelativeSizeAxes = Axes.X,
-                Width = 0.5f,
-                Text = $"{FontAwesome.Solid.Circle.Icon} {name}"
-            });
-
-            legend.Add(new OsuSpriteText
-            {
-                Colour = colour,
-                RelativeSizeAxes = Axes.X,
-                Width = 0.5f,
-                Text = $"final score {getTotalScore():#,0}"
+                AccentColour = colour
             });
         }
     }
@@ -505,4 +496,75 @@ namespace osu.Game.Tests.Visual.Gameplay
             public void Move(Vector2 pos) => this.MoveTo(pos);
         }
     }
+
+    public partial class LegendEntry : OsuClickableContainer, IHasAccentColour
+    {
+        public Color4 AccentColour { get; set; }
+
+        public BindableBool Visible { get; } = new BindableBool(true);
+
+        private readonly string description;
+        private readonly long finalScore;
+        private readonly LineGraph lineGraph;
+
+        private OsuSpriteText descriptionText = null!;
+        private OsuSpriteText finalScoreText = null!;
+
+        public LegendEntry(string description, long finalScore, LineGraph lineGraph)
+        {
+            this.description = description;
+            this.finalScore = finalScore;
+            this.lineGraph = lineGraph;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Content.RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Content.AutoSizeAxes = Axes.Y;
+
+            Children = new Drawable[]
+            {
+                descriptionText = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+                finalScoreText = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Font = OsuFont.Default.With(fixedWidth: true)
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Visible.BindValueChanged(_ => updateState(), true);
+            Action = Visible.Toggle;
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            updateState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            updateState();
+            base.OnHoverLost(e);
+        }
+
+        private void updateState()
+        {
+            Colour = IsHovered ? AccentColour.Lighten(0.2f) : AccentColour;
+
+            descriptionText.Text = $"{(Visible.Value ? FontAwesome.Solid.CheckCircle.Icon : FontAwesome.Solid.Circle.Icon)} {description}";
+            finalScoreText.Text = finalScore.ToString("#,0");
+            lineGraph.Alpha = Visible.Value ? 1 : 0;
+        }
+    }
 }

From 607ceeccb98e8cfd269bdf17156cbf2432eaab98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 12:19:50 +0200
Subject: [PATCH 0533/2296] Persist visibility state of graphs

---
 .../Visual/Gameplay/TestSceneScoring.cs       | 99 +++++++++++++------
 1 file changed, 67 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index d7974b63e7..0162d57cd5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -38,6 +38,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private FillFlowContainer legend = null!;
 
+        private readonly BindableBool standardisedVisible = new BindableBool(true);
+        private readonly BindableBool classicVisible = new BindableBool(true);
+        private readonly BindableBool scoreV1Visible = new BindableBool(true);
+        private readonly BindableBool scoreV2Visible = new BindableBool(true);
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -135,8 +140,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Clear();
             legend.Clear();
 
-            runForProcessor("lazer-standardised", colours.Green1, new OsuScoreProcessor(), ScoringMode.Standardised);
-            runForProcessor("lazer-classic", colours.Blue1, new OsuScoreProcessor(), ScoringMode.Classic);
+            runForProcessor("lazer-standardised", colours.Green1, new OsuScoreProcessor(), ScoringMode.Standardised, standardisedVisible);
+            runForProcessor("lazer-classic", colours.Blue1, new OsuScoreProcessor(), ScoringMode.Classic, classicVisible);
 
             runScoreV1();
             runScoreV2();
@@ -166,17 +171,22 @@ namespace osu.Game.Tests.Visual.Gameplay
                 currentCombo++;
             }
 
-            runForAlgorithm("ScoreV1 (classic)", colours.Purple1,
-                () => applyHitV1(base_great),
-                () => applyHitV1(base_ok),
-                () => applyHitV1(0),
-                () =>
+            runForAlgorithm(new ScoringAlgorithm
+            {
+                Name = "ScoreV1 (classic)",
+                Colour = colours.Purple1,
+                ApplyHit = () => applyHitV1(base_great),
+                ApplyNonPerfect = () => applyHitV1(base_ok),
+                ApplyMiss = () => applyHitV1(0),
+                GetTotalScore = () =>
                 {
                     // Arbitrary value chosen towards the upper range.
                     const double score_multiplier = 4;
 
                     return (int)(totalScore * score_multiplier);
-                });
+                },
+                Visible = scoreV1Visible
+            });
         }
 
         private void runScoreV2()
@@ -209,15 +219,19 @@ namespace osu.Game.Tests.Visual.Gameplay
                 currentHits++;
             }
 
-            runForAlgorithm("ScoreV2", colours.Red1,
-                () => applyHitV2(base_great),
-                () => applyHitV2(base_ok),
-                () =>
+            runForAlgorithm(new ScoringAlgorithm
+            {
+                Name = "ScoreV2",
+                Colour = colours.Red1,
+                ApplyHit = () => applyHitV2(base_great),
+                ApplyNonPerfect = () => applyHitV2(base_ok),
+                ApplyMiss = () =>
                 {
                     currentHits++;
                     maxBaseScore += base_great;
                     currentCombo = 0;
-                }, () =>
+                },
+                GetTotalScore = () =>
                 {
                     double accuracy = currentBaseScore / maxBaseScore;
 
@@ -226,10 +240,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                         700000 * comboPortion / comboPortionMax +
                         300000 * Math.Pow(accuracy, 10) * ((double)currentHits / maxCombo)
                     );
-                });
+                },
+                Visible = scoreV2Visible
+            });
         }
 
-        private void runForProcessor(string name, Color4 colour, ScoreProcessor processor, ScoringMode mode)
+        private void runForProcessor(string name, Color4 colour, ScoreProcessor processor, ScoringMode mode, BindableBool visibility)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
 
@@ -239,14 +255,19 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             processor.ApplyBeatmap(beatmap);
 
-            runForAlgorithm(name, colour,
-                () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great }),
-                () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok }),
-                () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss }),
-                () => processor.GetDisplayScore(mode));
+            runForAlgorithm(new ScoringAlgorithm
+            {
+                Name = name,
+                Colour = colour,
+                ApplyHit = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great }),
+                ApplyNonPerfect = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok }),
+                ApplyMiss = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss }),
+                GetTotalScore = () => processor.GetDisplayScore(mode),
+                Visible = visibility
+            });
         }
 
-        private void runForAlgorithm(string name, Color4 colour, Action applyHit, Action applyNonPerfect, Action applyMiss, Func<long> getTotalScore)
+        private void runForAlgorithm(ScoringAlgorithm scoringAlgorithm)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
 
@@ -255,31 +276,42 @@ namespace osu.Game.Tests.Visual.Gameplay
             for (int i = 0; i < maxCombo; i++)
             {
                 if (graphs.MissLocations.Contains(i))
-                    applyMiss();
+                    scoringAlgorithm.ApplyMiss();
                 else if (graphs.NonPerfectLocations.Contains(i))
-                    applyNonPerfect();
+                    scoringAlgorithm.ApplyNonPerfect();
                 else
-                    applyHit();
+                    scoringAlgorithm.ApplyHit();
 
-                results.Add(getTotalScore());
+                results.Add(scoringAlgorithm.GetTotalScore());
             }
 
             LineGraph graph;
             graphs.Add(graph = new LineGraph
             {
-                Name = name,
+                Name = scoringAlgorithm.Name,
                 RelativeSizeAxes = Axes.Both,
-                LineColour = colour,
+                LineColour = scoringAlgorithm.Colour,
                 Values = results
             });
 
-            legend.Add(new LegendEntry(name, getTotalScore(), graph)
+            legend.Add(new LegendEntry(scoringAlgorithm, graph)
             {
-                AccentColour = colour
+                AccentColour = scoringAlgorithm.Colour,
             });
         }
     }
 
+    public class ScoringAlgorithm
+    {
+        public string Name { get; init; } = null!;
+        public Color4 Colour { get; init; }
+        public Action ApplyHit { get; init; } = () => { };
+        public Action ApplyNonPerfect { get; init; } = () => { };
+        public Action ApplyMiss { get; init; } = () => { };
+        public Func<long> GetTotalScore { get; init; } = null!;
+        public BindableBool Visible { get; init; } = null!;
+    }
+
     public partial class GraphContainer : Container, IHasCustomTooltip<IEnumerable<LineGraph>>
     {
         public readonly BindableList<double> MissLocations = new BindableList<double>();
@@ -510,10 +542,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         private OsuSpriteText descriptionText = null!;
         private OsuSpriteText finalScoreText = null!;
 
-        public LegendEntry(string description, long finalScore, LineGraph lineGraph)
+        public LegendEntry(ScoringAlgorithm scoringAlgorithm, LineGraph lineGraph)
         {
-            this.description = description;
-            this.finalScore = finalScore;
+            description = scoringAlgorithm.Name;
+            finalScore = scoringAlgorithm.GetTotalScore();
+            AccentColour = scoringAlgorithm.Colour;
+            Visible.BindTo(scoringAlgorithm.Visible);
+
             this.lineGraph = lineGraph;
         }
 

From 15708ee46546562ffea09cd21e1af76491df17ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 13:27:40 +0200
Subject: [PATCH 0534/2296] Add toggle for showing relative/absolute score
 values

---
 .../Visual/Gameplay/TestSceneScoring.cs       | 59 +++++++++++++++----
 1 file changed, 46 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index 0162d57cd5..3cd79fa729 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -35,8 +35,9 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private GraphContainer graphs = null!;
         private SettingsSlider<int> sliderMaxCombo = null!;
+        private SettingsCheckbox scaleToMax = null!;
 
-        private FillFlowContainer legend = null!;
+        private FillFlowContainer<LegendEntry> legend = null!;
 
         private readonly BindableBool standardisedVisible = new BindableBool(true);
         private readonly BindableBool classicVisible = new BindableBool(true);
@@ -78,7 +79,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                             },
                             new Drawable[]
                             {
-                                legend = new FillFlowContainer
+                                legend = new FillFlowContainer<LegendEntry>
                                 {
                                     Padding = new MarginPadding(20),
                                     Direction = FillDirection.Vertical,
@@ -93,26 +94,31 @@ namespace osu.Game.Tests.Visual.Gameplay
                                     Padding = new MarginPadding(20),
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
-                                    Direction = FillDirection.Full,
+                                    Direction = FillDirection.Vertical,
+                                    Spacing = new Vector2(10),
                                     Children = new Drawable[]
                                     {
                                         sliderMaxCombo = new SettingsSlider<int>
                                         {
-                                            Width = 0.5f,
                                             TransferValueOnCommit = true,
                                             Current = new BindableInt(1024)
                                             {
                                                 MinValue = 96,
                                                 MaxValue = 8192,
                                             },
-                                            LabelText = "max combo",
+                                            LabelText = "Max combo",
+                                        },
+                                        scaleToMax = new SettingsCheckbox
+                                        {
+                                            LabelText = "Rescale plots to 100%",
+                                            Current = { Value = true, Default = true }
                                         },
                                         new OsuTextFlowContainer
                                         {
                                             RelativeSizeAxes = Axes.X,
-                                            Width = 0.5f,
                                             AutoSizeAxes = Axes.Y,
-                                            Text = $"Left click to add miss\nRight click to add OK/{base_ok}"
+                                            Text = $"Left click to add miss\nRight click to add OK/{base_ok}",
+                                            Margin = new MarginPadding { Top = 20 }
                                         }
                                     }
                                 },
@@ -122,6 +128,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                 };
 
                 sliderMaxCombo.Current.BindValueChanged(_ => rerun());
+                scaleToMax.Current.BindValueChanged(_ => rerun());
+
+                standardisedVisible.BindValueChanged(_ => rescalePlots());
+                classicVisible.BindValueChanged(_ => rescalePlots());
+                scoreV1Visible.BindValueChanged(_ => rescalePlots());
+                scoreV2Visible.BindValueChanged(_ => rescalePlots());
 
                 graphs.MissLocations.BindCollectionChanged((_, __) => rerun());
                 graphs.NonPerfectLocations.BindCollectionChanged((_, __) => rerun());
@@ -145,6 +157,24 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             runScoreV1();
             runScoreV2();
+
+            rescalePlots();
+        }
+
+        private void rescalePlots()
+        {
+            if (!scaleToMax.Current.Value && legend.Any(entry => entry.Visible.Value))
+            {
+                long maxScore = legend.Where(entry => entry.Visible.Value).Max(entry => entry.FinalScore);
+
+                foreach (var graph in graphs)
+                    graph.Height = graph.Values.Max() / maxScore;
+            }
+            else
+            {
+                foreach (var graph in graphs)
+                    graph.Height = 1;
+            }
         }
 
         private void runScoreV1()
@@ -289,6 +319,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Add(graph = new LineGraph
             {
                 Name = scoringAlgorithm.Name,
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
                 RelativeSizeAxes = Axes.Both,
                 LineColour = scoringAlgorithm.Colour,
                 Values = results
@@ -312,14 +344,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         public BindableBool Visible { get; init; } = null!;
     }
 
-    public partial class GraphContainer : Container, IHasCustomTooltip<IEnumerable<LineGraph>>
+    public partial class GraphContainer : Container<LineGraph>, IHasCustomTooltip<IEnumerable<LineGraph>>
     {
         public readonly BindableList<double> MissLocations = new BindableList<double>();
         public readonly BindableList<double> NonPerfectLocations = new BindableList<double>();
 
         public Bindable<int> MaxCombo = new Bindable<int>();
 
-        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+        protected override Container<LineGraph> Content { get; } = new Container<LineGraph> { RelativeSizeAxes = Axes.Both };
 
         private readonly Box hoverLine;
 
@@ -470,7 +502,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public ITooltip<IEnumerable<LineGraph>> GetCustomTooltip() => tooltip ??= new GraphTooltip(this);
 
-        public IEnumerable<LineGraph> TooltipContent => Content.OfType<LineGraph>();
+        public IEnumerable<LineGraph> TooltipContent => Content;
 
         public partial class GraphTooltip : CompositeDrawable, ITooltip<IEnumerable<LineGraph>>
         {
@@ -535,8 +567,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public BindableBool Visible { get; } = new BindableBool(true);
 
+        public readonly long FinalScore;
+
         private readonly string description;
-        private readonly long finalScore;
         private readonly LineGraph lineGraph;
 
         private OsuSpriteText descriptionText = null!;
@@ -545,7 +578,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public LegendEntry(ScoringAlgorithm scoringAlgorithm, LineGraph lineGraph)
         {
             description = scoringAlgorithm.Name;
-            finalScore = scoringAlgorithm.GetTotalScore();
+            FinalScore = scoringAlgorithm.GetTotalScore();
             AccentColour = scoringAlgorithm.Colour;
             Visible.BindTo(scoringAlgorithm.Visible);
 
@@ -598,7 +631,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             Colour = IsHovered ? AccentColour.Lighten(0.2f) : AccentColour;
 
             descriptionText.Text = $"{(Visible.Value ? FontAwesome.Solid.CheckCircle.Icon : FontAwesome.Solid.Circle.Icon)} {description}";
-            finalScoreText.Text = finalScore.ToString("#,0");
+            finalScoreText.Text = FinalScore.ToString("#,0");
             lineGraph.Alpha = Visible.Value ? 1 : 0;
         }
     }

From 3981e2e957ab14d1d8f23b2e65d8f910c18765fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 13:29:02 +0200
Subject: [PATCH 0535/2296] Only show visible graph values in tooltip

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index 3cd79fa729..0e64af9920 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -550,6 +550,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 foreach (var graph in content)
                 {
+                    if (graph.Alpha == 0) continue;
+
                     float valueAtHover = graph.Values.ElementAt(relevantCombo);
                     float ofTotal = valueAtHover / graph.Values.Last();
 

From e810abf1e61aa032ad9bc3d3a4a18cd366cacbc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Sep 2023 20:51:22 +0900
Subject: [PATCH 0536/2296] Rename variable

---
 .../Objects/Drawables/DrawableSpinner.cs             |  2 +-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs             | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index c30ac6b88b..24446db92a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -312,7 +312,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     tick.TriggerResult(true);
 
                     if (tick is DrawableSpinnerBonusTick)
-                        gainedBonus.Value = score_per_tick * (spins - HitObject.FirstBonusSpin);
+                        gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequiredForBonus);
                 }
 
                 completedFullSpins++;
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index a26cb7b090..5ef670c739 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -31,6 +31,11 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public int SpinsRequired { get; protected set; } = 1;
 
+        /// <summary>
+        /// The number of spins required to start receiving bonus score. The first bonus is awarded on this spin count.
+        /// </summary>
+        public int SpinsRequiredForBonus => SpinsRequired + bonus_spins_gap;
+
         /// <summary>
         /// The gap between spinner completion and the first bonus-awarding spin.
         /// </summary>
@@ -41,11 +46,6 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public int MaximumBonusSpins { get; protected set; } = 1;
 
-        /// <summary>
-        /// The first spin awarding bonus score.
-        /// </summary>
-        public int FirstBonusSpin => SpinsRequired + bonus_spins_gap;
-
         public override Vector2 StackOffset => Vector2.Zero;
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
                 double startTime = StartTime + (float)(i + 1) / totalSpins * Duration;
 
-                AddNested(i < FirstBonusSpin
+                AddNested(i < SpinsRequiredForBonus
                     ? new SpinnerTick { StartTime = startTime, SpinnerDuration = Duration }
                     : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration, Samples = new[] { CreateHitSampleInfo("spinnerbonus") } });
             }

From 1a70110a4eed3e663ae6bbba81a9ed8a4b15cbf5 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Tue, 12 Sep 2023 16:44:44 +0300
Subject: [PATCH 0537/2296] Added BeatmapAttributesDisplay support

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  6 +--
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  6 +--
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  8 ++--
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  6 +--
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 17 +++++--
 .../Overlays/Mods/VerticalAttributeDisplay.cs | 46 +++++++++++++++++--
 osu.Game/Rulesets/Ruleset.cs                  | 17 ++++++-
 .../Screens/Select/Details/AdvancedStats.cs   |  8 ++--
 8 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 4f499cee62..f0b20c68c4 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -238,10 +238,10 @@ namespace osu.Game.Rulesets.Catch
         public float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150)) + 5;
         public float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
 
-        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (bool AR, bool OD) isRateAdjusted)
+        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (RateAdjustType AR, RateAdjustType OD) rateAdjustedInfo)
         {
             BeatmapDifficulty? adjustedDifficulty = null;
-            isRateAdjusted = (false, false);
+            rateAdjustedInfo = (RateAdjustType.NotChanged, RateAdjustType.NotChanged);
 
             if (mods.Any(m => m is IApplicableToDifficulty))
             {
@@ -264,7 +264,7 @@ namespace osu.Game.Rulesets.Catch
 
                     adjustedDifficulty.ApproachRate = ChangeArFromRate(ar, speedChange);
 
-                    if (adjustedDifficulty.ApproachRate != ar) isRateAdjusted.AR = true;
+                    rateAdjustedInfo.AR = GetRateAdjustType(ar, adjustedDifficulty.ApproachRate);
                 }
             }
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 7d16806397..a8a54ebf05 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -431,10 +431,10 @@ namespace osu.Game.Rulesets.Mania
         public double HitwindowFromOd(float OD) => 64.0 - 3 * OD;
         public float OdFromHitwindow(double hitwindow300) => (float)(64.0 - hitwindow300) / 3;
         public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
-        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (bool AR, bool OD) isRateAdjusted)
+        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (RateAdjustType AR, RateAdjustType OD) rateAdjustedInfo)
         {
             BeatmapDifficulty? adjustedDifficulty = null;
-            isRateAdjusted = (false, false);
+            rateAdjustedInfo = (RateAdjustType.NotChanged, RateAdjustType.NotChanged);
 
             if (mods.Any(m => m is IApplicableToDifficulty))
             {
@@ -456,7 +456,7 @@ namespace osu.Game.Rulesets.Mania
 
                     adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(od, speedChange);
 
-                    if (adjustedDifficulty.OverallDifficulty != od) isRateAdjusted.OD = true;
+                    rateAdjustedInfo.OD = GetRateAdjustType(od, adjustedDifficulty.OverallDifficulty);
                 }
             }
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 250685ec0f..4810be5db2 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -335,10 +335,10 @@ namespace osu.Game.Rulesets.Osu
         public float OdFromHitwindow(double hitwindow300) => (float)(80.0 - hitwindow300) / 6;
         public float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
         public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
-        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (bool AR, bool OD) isRateAdjusted)
+        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (RateAdjustType AR, RateAdjustType OD) rateAdjustedInfo)
         {
             BeatmapDifficulty? adjustedDifficulty = null;
-            isRateAdjusted = (false, false);
+            rateAdjustedInfo = (RateAdjustType.NotChanged, RateAdjustType.NotChanged);
 
             if (mods.Any(m => m is IApplicableToDifficulty))
             {
@@ -362,8 +362,8 @@ namespace osu.Game.Rulesets.Osu
                     adjustedDifficulty.ApproachRate = ChangeArFromRate(ar, speedChange);
                     adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(od, speedChange);
 
-                    if (adjustedDifficulty.ApproachRate != ar) isRateAdjusted.AR = true;
-                    if (adjustedDifficulty.OverallDifficulty != od) isRateAdjusted.OD = true;
+                    rateAdjustedInfo.AR = GetRateAdjustType(ar, adjustedDifficulty.ApproachRate);
+                    rateAdjustedInfo.OD = GetRateAdjustType(od, adjustedDifficulty.OverallDifficulty);
                 }
             }
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 801e46f9c3..a9abbea251 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -266,10 +266,10 @@ namespace osu.Game.Rulesets.Taiko
         public double HitwindowFromOd(float OD) => 35.0 - 15.0 * (OD - 5) / 5;
         public float OdFromHitwindow(double hitwindow300) => (float)(5 * (35 - hitwindow300) / 15 + 5);
         public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
-        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (bool AR, bool OD) isRateAdjusted)
+        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (RateAdjustType AR, RateAdjustType OD) rateAdjustedInfo)
         {
             BeatmapDifficulty? adjustedDifficulty = null;
-            isRateAdjusted = (false, false);
+            rateAdjustedInfo = (RateAdjustType.NotChanged, RateAdjustType.NotChanged);
 
             if (mods.Any(m => m is IApplicableToDifficulty))
             {
@@ -291,7 +291,7 @@ namespace osu.Game.Rulesets.Taiko
 
                     adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(od, speedChange);
 
-                    if (adjustedDifficulty.OverallDifficulty != od) isRateAdjusted.OD = true;
+                    rateAdjustedInfo.OD = GetRateAdjustType(od, adjustedDifficulty.OverallDifficulty);
                 }
             }
 
diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 2aea53090a..d0ee9750b2 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -16,6 +16,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
@@ -63,6 +64,10 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
+        [Resolved]
+        private OsuGameBase game { get; set; } = null!;
+        private IBindable<RulesetInfo> gameRuleset = null!;
+
         private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
@@ -195,6 +200,9 @@ namespace osu.Game.Overlays.Mods
                 updateCollapsedState();
             });
 
+            gameRuleset = game.Ruleset.GetBoundCopy();
+            gameRuleset.BindValueChanged(_ => updateValues());
+
             BeatmapInfo.BindValueChanged(_ => updateValues(), true);
         }
 
@@ -243,9 +251,12 @@ namespace osu.Game.Overlays.Mods
 
             bpmDisplay.Current.Value = BeatmapInfo.Value.BPM * rate;
 
-            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
-            foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
-                mod.ApplyToDifficulty(adjustedDifficulty);
+            (Ruleset.RateAdjustType AR, Ruleset.RateAdjustType OD) rateAdjustType = (Ruleset.RateAdjustType.NotChanged, Ruleset.RateAdjustType.NotChanged);
+
+            Ruleset ruleset = gameRuleset.Value.CreateInstance();
+            BeatmapDifficulty adjustedDifficulty = ruleset.GetEffectiveDifficulty(BeatmapInfo.Value.Difficulty, mods.Value, ref rateAdjustType);
+            approachRateDisplay.RateChangeType.Value = rateAdjustType.AR;
+            overallDifficultyDisplay.RateChangeType.Value = rateAdjustType.OD;
 
             circleSizeDisplay.Current.Value = adjustedDifficulty.CircleSize;
             drainRateDisplay.Current.Value = adjustedDifficulty.DrainRate;
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index 60cc875dbb..16d75cd448 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
@@ -10,6 +12,9 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -23,11 +28,43 @@ namespace osu.Game.Overlays.Mods
 
         private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
 
+        public Bindable<Ruleset.RateAdjustType> RateChangeType = new Bindable<Ruleset.RateAdjustType>(Ruleset.RateAdjustType.NotChanged);
+
         /// <summary>
         /// Text to display in the top area of the display.
         /// </summary>
         public LocalisableString Label { get; protected set; }
 
+        private EffectCounter counter;
+        private OsuSpriteText text;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+        private void updateTextColor()
+        {
+            Color4 newColor;
+            switch (RateChangeType.Value)
+            {
+                case Ruleset.RateAdjustType.NotChanged:
+                    newColor = Color4.White;
+                    break;
+
+                case Ruleset.RateAdjustType.DifficultyReduction:
+                    newColor = colours.ForModType(ModType.DifficultyReduction);
+                    break;
+
+                case Ruleset.RateAdjustType.DifficultyIncrease:
+                    newColor = colours.ForModType(ModType.DifficultyIncrease);
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(RateChangeType.Value));
+            }
+
+            text.Colour = newColor;
+            counter.Colour = newColor;
+        }
+
         public VerticalAttributeDisplay(LocalisableString label)
         {
             Label = label;
@@ -37,6 +74,8 @@ namespace osu.Game.Overlays.Mods
             Origin = Anchor.CentreLeft;
             Anchor = Anchor.CentreLeft;
 
+            RateChangeType.BindValueChanged(_ => updateTextColor());
+
             InternalChild = new FillFlowContainer
             {
                 Origin = Anchor.CentreLeft,
@@ -45,7 +84,7 @@ namespace osu.Game.Overlays.Mods
                 Direction = FillDirection.Vertical,
                 Children = new Drawable[]
                 {
-                    new OsuSpriteText
+                    text = new OsuSpriteText
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
@@ -53,7 +92,7 @@ namespace osu.Game.Overlays.Mods
                         Margin = new MarginPadding { Horizontal = 15 }, // to reserve space for 0.XX value
                         Font = OsuFont.Default.With(size: 20, weight: FontWeight.Bold)
                     },
-                    new EffectCounter
+                    counter = new EffectCounter
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
@@ -62,12 +101,11 @@ namespace osu.Game.Overlays.Mods
                 }
             };
         }
-
         private partial class EffectCounter : RollingCounter<double>
         {
             protected override double RollingDuration => 500;
 
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.0");
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.0#");
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 0f7655812a..7a09bff4aa 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -389,6 +389,21 @@ namespace osu.Game.Rulesets
         /// Can be overridden to alter the difficulty section to the editor beatmap setup screen.
         /// </summary>
         public virtual DifficultySection? CreateEditorDifficultySection() => null;
-        public virtual BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (bool AR, bool OD) isRateAdjusted) => (BeatmapDifficulty)baseDifficulty;
+        public virtual BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (RateAdjustType AR, RateAdjustType OD) rateAdjustedInfo) => (BeatmapDifficulty)baseDifficulty;
+        public enum RateAdjustType
+        {
+            NotChanged,
+            DifficultyReduction,
+            DifficultyIncrease
+        }
+
+        protected RateAdjustType GetRateAdjustType(float baseValue, float adjustedValue)
+        {
+            if (adjustedValue > baseValue)
+                return RateAdjustType.DifficultyIncrease;
+            if (adjustedValue < baseValue)
+                return RateAdjustType.DifficultyReduction;
+            return RateAdjustType.NotChanged;
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 4a0eed86f8..867d86a69b 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -116,12 +116,12 @@ namespace osu.Game.Screens.Select.Details
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
             BeatmapDifficulty adjustedDifficulty = null;
-            (bool AR, bool OD) isRateAdjusted = (false, false);
+            (Ruleset.RateAdjustType AR, Ruleset.RateAdjustType OD) rateAdjustInfo = (Ruleset.RateAdjustType.NotChanged, Ruleset.RateAdjustType.NotChanged);
 
             if (baseDifficulty != null)
             {
                 Ruleset ruleset = gameRuleset.Value.CreateInstance();
-                adjustedDifficulty = ruleset.GetEffectiveDifficulty(baseDifficulty, mods.Value, ref isRateAdjusted);
+                adjustedDifficulty = ruleset.GetEffectiveDifficulty(baseDifficulty, mods.Value, ref rateAdjustInfo);
             }
 
             switch (BeatmapInfo?.Ruleset.OnlineID)
@@ -140,8 +140,8 @@ namespace osu.Game.Screens.Select.Details
             }
 
             HpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate, false);
-            Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty, isRateAdjusted.OD);
-            ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate, isRateAdjusted.AR);
+            Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty, rateAdjustInfo.OD != Ruleset.RateAdjustType.NotChanged);
+            ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate, rateAdjustInfo.OD != Ruleset.RateAdjustType.NotChanged);
 
             updateStarDifficulty();
         }

From 7c65a9de75e3342e46240e4d588291fda430c9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 20:31:49 +0200
Subject: [PATCH 0538/2296] Fix Score V1 simulation in scoring test scene
 incorrectly applying multiplier

`TestSceneScoring` included a local simulation of stable's Score V1
algorithm. One of the parts of said algorithm is a mysterious
"score multiplier", influenced by - among others - the beatmap's drain
rate, overall difficulty, circle size, object count, drain length,
and active mods. (An implementation of this already exists in lazer
source, in `OsuLegacyScoreSimulator`, but more on this later.)

However, `TestSceneScoring` had this multiplier in _two_ places, with
_two_ distinct values, one of which being 1 (i.e. basically off).
Unfortunately, the place that had 1 as the multiplier was the wrong one.

Stable calculates the score increase for every hit in two stages;
first, it takes the raw numerical value of the judgement, but then
applies a combo-based bonus on top of it:

    scoreIncrease += (int)(Math.Max(0, ComboCounter.HitCombo - 1) * (scoreIncrease / 25 * ScoreMultiplier));

On the face of it, it may appear that the `ScoreMultiplier` factor
can be factored out and applied at the end only when returning total
score. However, once the above formula is rewritten as:

    scoreIncrease = scoreIncrease + (int)(Math.Max(0, ComboCounter.HitCombo - 1) * (scoreIncrease / 25 * ScoreMultiplier));
                  = scoreIncrease * (1 + (Math.Max(0, ComboCounter.HitCombo - 1) / 25 * ScoreMultiplier))

it becomes clear that that assumption is actually _incorrect_,
and the `ScoreMultiplier` _must_ be applied to every score increase
individually.

The above was cross-checked experimentally against stable source
on an example test map with 100 objects, and a replay hitting them
perfectly.
---
 osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
index 0e64af9920..5db05ea67c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
@@ -190,7 +190,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                     return;
                 }
 
-                const float score_multiplier = 1;
+                // this corresponds to stable's `ScoreMultiplier`.
+                // value is chosen arbitrarily, towards the upper range.
+                const float score_multiplier = 4;
 
                 totalScore += baseScore;
 
@@ -208,13 +210,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 ApplyHit = () => applyHitV1(base_great),
                 ApplyNonPerfect = () => applyHitV1(base_ok),
                 ApplyMiss = () => applyHitV1(0),
-                GetTotalScore = () =>
-                {
-                    // Arbitrary value chosen towards the upper range.
-                    const double score_multiplier = 4;
-
-                    return (int)(totalScore * score_multiplier);
-                },
+                GetTotalScore = () => totalScore,
                 Visible = scoreV1Visible
             });
         }

From d146da95466e5251f37376da8fbbf07701e6c1d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 16:43:06 +0900
Subject: [PATCH 0539/2296] Fix rate adjust mods not showing "x" prefix on
 customisation slider's tooltip

---
 .../Settings/MultiplierSettingsSlider.cs      | 24 +++++++++++++++++++
 osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs    |  3 ++-
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       |  3 ++-
 osu.Game/Rulesets/Mods/ModHalfTime.cs         |  3 ++-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  5 ++--
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/MultiplierSettingsSlider.cs

diff --git a/osu.Game/Overlays/Settings/MultiplierSettingsSlider.cs b/osu.Game/Overlays/Settings/MultiplierSettingsSlider.cs
new file mode 100644
index 0000000000..bd5b8f92b6
--- /dev/null
+++ b/osu.Game/Overlays/Settings/MultiplierSettingsSlider.cs
@@ -0,0 +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.
+
+using osu.Framework.Localisation;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings
+{
+    public partial class MultiplierSettingsSlider : SettingsSlider<double, MultiplierSettingsSlider.MultiplierRoundedSliderBar>
+    {
+        public MultiplierSettingsSlider()
+        {
+            KeyboardStep = 0.01f;
+        }
+
+        /// <summary>
+        /// A slider bar which adds a "x" to the end of the tooltip string.
+        /// </summary>
+        public partial class MultiplierRoundedSliderBar : RoundedSliderBar<double>
+        {
+            public override LocalisableString TooltipText => $"{base.TooltipText}x";
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
index e7127abcf0..f62ba21827 100644
--- a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
+++ b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
@@ -10,6 +10,7 @@ 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.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -35,7 +36,7 @@ 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")]
+        [SettingSource("Initial rate", "The starting speed of the track", SettingControlType = typeof(MultiplierSettingsSlider))]
         public BindableNumber<double> InitialRate { get; } = new BindableDouble(1)
         {
             MinValue = 0.5,
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 733610c040..27e594edfe 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -17,7 +18,7 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyIncrease;
         public override LocalisableString Description => "Zoooooooooom...";
 
-        [SettingSource("Speed increase", "The actual increase to apply")]
+        [SettingSource("Speed increase", "The actual increase to apply", SettingControlType = typeof(MultiplierSettingsSlider))]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(1.5)
         {
             MinValue = 1.01,
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 06c7750035..7415c94cd8 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -17,7 +18,7 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyReduction;
         public override LocalisableString Description => "Less zoom...";
 
-        [SettingSource("Speed decrease", "The actual decrease to apply")]
+        [SettingSource("Speed decrease", "The actual decrease to apply", SettingControlType = typeof(MultiplierSettingsSlider))]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(0.75)
         {
             MinValue = 0.5,
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 7285315c3b..54ee0cd3bf 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -7,6 +7,7 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mods
@@ -20,10 +21,10 @@ namespace osu.Game.Rulesets.Mods
 
         public override double ScoreMultiplier => 0.5;
 
-        [SettingSource("Initial rate", "The starting speed of the track")]
+        [SettingSource("Initial rate", "The starting speed of the track", SettingControlType = typeof(MultiplierSettingsSlider))]
         public abstract BindableNumber<double> InitialRate { get; }
 
-        [SettingSource("Final rate", "The final speed to ramp to")]
+        [SettingSource("Final rate", "The final speed to ramp to", SettingControlType = typeof(MultiplierSettingsSlider))]
         public abstract BindableNumber<double> FinalRate { get; }
 
         [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]

From f5cee22db79eca51c234da2fc1865ee1606ef1de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 17:05:42 +0900
Subject: [PATCH 0540/2296] Collapse mod presets column slightly when not in
 use

---
 osu.Game/Overlays/Mods/ModPresetColumn.cs | 10 +++++++++-
 osu.Game/Overlays/Mods/ModSelectColumn.cs |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPresetColumn.cs b/osu.Game/Overlays/Mods/ModPresetColumn.cs
index 3b12eec195..0803389f45 100644
--- a/osu.Game/Overlays/Mods/ModPresetColumn.cs
+++ b/osu.Game/Overlays/Mods/ModPresetColumn.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
+        private const float contracted_width = WIDTH - 120;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -42,6 +44,8 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             ruleset.BindValueChanged(_ => rulesetChanged(), true);
+
+            Width = contracted_width;
         }
 
         private IDisposable? presetSubscription;
@@ -65,7 +69,11 @@ namespace osu.Game.Overlays.Mods
         {
             cancellationTokenSource?.Cancel();
 
-            if (!presets.Any())
+            bool hasPresets = presets.Any();
+
+            this.ResizeWidthTo(hasPresets ? WIDTH : contracted_width, 200, Easing.OutQuint);
+
+            if (!hasPresets)
             {
                 removeAndDisposePresetPanels();
                 return;
diff --git a/osu.Game/Overlays/Mods/ModSelectColumn.cs b/osu.Game/Overlays/Mods/ModSelectColumn.cs
index 338ebdaef4..1c56763bd9 100644
--- a/osu.Game/Overlays/Mods/ModSelectColumn.cs
+++ b/osu.Game/Overlays/Mods/ModSelectColumn.cs
@@ -61,9 +61,11 @@ namespace osu.Game.Overlays.Mods
 
         private const float header_height = 42;
 
+        protected const float WIDTH = 320;
+
         protected ModSelectColumn()
         {
-            Width = 320;
+            Width = WIDTH;
             RelativeSizeAxes = Axes.Y;
             Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0);
 

From be373391f8ef90c5b1da0ca63dca62a7fc76a9f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 17:43:41 +0900
Subject: [PATCH 0541/2296] Simplify multiplier display implementation

---
 osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs | 1 +
 osu.Game/Overlays/Mods/ModCounterDisplay.cs           | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 9f4d187879..7f92a4e644 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Overlays.Mods
         {
             Current.Default = 1d;
             Current.Value = 1d;
+
             Add(new SpriteIcon
             {
                 Anchor = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/Mods/ModCounterDisplay.cs b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
index 3bec27d290..de8f4433f4 100644
--- a/osu.Game/Overlays/Mods/ModCounterDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
@@ -49,8 +49,6 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected abstract LocalisableString Label { get; }
 
-        protected virtual float ValueAreaWidth => 56;
-
         protected virtual string CounterFormat => @"N0";
 
         protected override Container<Drawable> Content => content;
@@ -59,7 +57,7 @@ namespace osu.Game.Overlays.Mods
 
         protected ModCounterDisplay()
         {
-            Height = HEIGHT;
+            Height = ShearedButton.HEIGHT;
             AutoSizeAxes = Axes.X;
 
             InternalChild = new InputBlockingContainer
@@ -75,8 +73,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.CentreRight,
-                        RelativeSizeAxes = Axes.Y,
-                        Width = ValueAreaWidth + ModSelectPanel.CORNER_RADIUS
+                        RelativeSizeAxes = Axes.Both,
                     },
                     new GridContainer
                     {
@@ -85,7 +82,7 @@ namespace osu.Game.Overlays.Mods
                         ColumnDimensions = new[]
                         {
                             new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, ValueAreaWidth)
+                            new Dimension(GridSizeMode.Absolute, 56)
                         },
                         Content = new[]
                         {

From 49114430ed9ac71858c2cb1adbde90d28683ab6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 17:43:55 +0900
Subject: [PATCH 0542/2296] Move multiplier display to bottom of sceen to make
 visible while customising

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 47 +++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 666e2849e8..fb28c41395 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -120,11 +120,12 @@ namespace osu.Game.Overlays.Mods
         private ColumnScrollContainer columnScroll = null!;
         private ColumnFlowContainer columnFlow = null!;
         private FillFlowContainer<ShearedButton> footerButtonFlow = null!;
+        private FillFlowContainer footerContentFlow = null!;
         private DeselectAllModsButton deselectAllModsButton = null!;
 
         private Container aboveColumnsContent = null!;
         private DifficultyMultiplierDisplay? multiplierDisplay;
-        private BeatmapAttributesDisplay? modEffectPreviewPanel;
+        private BeatmapAttributesDisplay? beatmapAttributesDisplay;
 
         protected ShearedButton BackButton { get; private set; } = null!;
         protected ShearedToggleButton? CustomisationButton { get; private set; }
@@ -142,8 +143,8 @@ namespace osu.Game.Overlays.Mods
                 if (beatmap == value) return;
 
                 beatmap = value;
-                if (IsLoaded && modEffectPreviewPanel != null)
-                    modEffectPreviewPanel.BeatmapInfo.Value = beatmap?.BeatmapInfo;
+                if (IsLoaded && beatmapAttributesDisplay != null)
+                    beatmapAttributesDisplay.BeatmapInfo.Value = beatmap?.BeatmapInfo;
             }
         }
 
@@ -251,22 +252,32 @@ namespace osu.Game.Overlays.Mods
 
             if (ShowModEffects)
             {
-                aboveColumnsContent.Add(multiplierDisplay = new DifficultyMultiplierDisplay
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight
-                });
-
-                FooterContent.Add(modEffectPreviewPanel = new BeatmapAttributesDisplay
+                FooterContent.Add(footerContentFlow = new FillFlowContainer
                 {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(30, 10),
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
                     Margin = new MarginPadding
                     {
                         Vertical = PADDING,
-                        Horizontal = 70
+                        Horizontal = 20
                     },
-                    BeatmapInfo = { Value = beatmap?.BeatmapInfo }
+                    Children = new Drawable[]
+                    {
+                        beatmapAttributesDisplay = new BeatmapAttributesDisplay
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            BeatmapInfo = { Value = beatmap?.BeatmapInfo }
+                        },
+                        multiplierDisplay = new DifficultyMultiplierDisplay
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight
+                        },
+                    }
                 });
             }
 
@@ -340,14 +351,22 @@ namespace osu.Game.Overlays.Mods
             SearchTextBox.PlaceholderText = SearchTextBox.HasFocus ? Resources.Localisation.Web.CommonStrings.InputSearch : ModSelectOverlayStrings.TabToSearch;
 
             // only update preview panel's collapsed state after we are fully visible, to ensure all the buttons are where we expect them to be.
-            if (modEffectPreviewPanel != null && Alpha == 1)
+            if (beatmapAttributesDisplay != null && Alpha == 1)
             {
                 float rightEdgeOfLastButton = footerButtonFlow.Last().ScreenSpaceDrawQuad.TopRight.X;
 
                 // this is cheating a bit; the 375 value is hardcoded based on how wide the expanded panel _generally_ is.
                 // due to the transition applied, the raw screenspace quad of the panel cannot be used, as it will trigger an ugly feedback cycle of expanding and collapsing.
                 float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(375 + 70, 0)).X;
-                modEffectPreviewPanel.Collapsed.Value = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
+
+                bool screenIsntWideEnough = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
+
+                beatmapAttributesDisplay.Collapsed.Value = screenIsntWideEnough;
+                footerContentFlow.Direction = screenIsntWideEnough ? FillDirection.Vertical : FillDirection.Horizontal;
+
+                int layout = screenIsntWideEnough ? -1 : 1;
+                if (footerContentFlow.GetLayoutPosition(beatmapAttributesDisplay) != layout)
+                    footerContentFlow.SetLayoutPosition(beatmapAttributesDisplay, layout);
             }
         }
 

From e241e41f2a692351d426db65b9e84b003e3f4d47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 17:55:21 +0900
Subject: [PATCH 0543/2296] Fix layout decision to account for new multiplier
 addition

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index fb28c41395..95104eb29e 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -355,9 +355,9 @@ namespace osu.Game.Overlays.Mods
             {
                 float rightEdgeOfLastButton = footerButtonFlow.Last().ScreenSpaceDrawQuad.TopRight.X;
 
-                // this is cheating a bit; the 375 value is hardcoded based on how wide the expanded panel _generally_ is.
+                // this is cheating a bit; the 640 value is hardcoded based on how wide the expanded panel _generally_ is.
                 // due to the transition applied, the raw screenspace quad of the panel cannot be used, as it will trigger an ugly feedback cycle of expanding and collapsing.
-                float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(375 + 70, 0)).X;
+                float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(640, 0)).X;
 
                 bool screenIsntWideEnough = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
 

From 21252c1c2381e169586458e61314f4b30d59f854 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 17:55:25 +0900
Subject: [PATCH 0544/2296] Fix animations

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 95104eb29e..a18ee65612 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -266,16 +266,16 @@ namespace osu.Game.Overlays.Mods
                     },
                     Children = new Drawable[]
                     {
-                        beatmapAttributesDisplay = new BeatmapAttributesDisplay
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            BeatmapInfo = { Value = beatmap?.BeatmapInfo }
-                        },
                         multiplierDisplay = new DifficultyMultiplierDisplay
                         {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight
+                        },
+                        beatmapAttributesDisplay = new BeatmapAttributesDisplay
+                        {
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight,
+                            BeatmapInfo = { Value = beatmap?.BeatmapInfo }
                         },
                     }
                 });
@@ -350,8 +350,7 @@ namespace osu.Game.Overlays.Mods
 
             SearchTextBox.PlaceholderText = SearchTextBox.HasFocus ? Resources.Localisation.Web.CommonStrings.InputSearch : ModSelectOverlayStrings.TabToSearch;
 
-            // only update preview panel's collapsed state after we are fully visible, to ensure all the buttons are where we expect them to be.
-            if (beatmapAttributesDisplay != null && Alpha == 1)
+            if (beatmapAttributesDisplay != null)
             {
                 float rightEdgeOfLastButton = footerButtonFlow.Last().ScreenSpaceDrawQuad.TopRight.X;
 
@@ -361,12 +360,13 @@ namespace osu.Game.Overlays.Mods
 
                 bool screenIsntWideEnough = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
 
-                beatmapAttributesDisplay.Collapsed.Value = screenIsntWideEnough;
-                footerContentFlow.Direction = screenIsntWideEnough ? FillDirection.Vertical : FillDirection.Horizontal;
+                // only update preview panel's collapsed state after we are fully visible, to ensure all the buttons are where we expect them to be.
+                if (Alpha == 1)
+                    beatmapAttributesDisplay.Collapsed.Value = screenIsntWideEnough;
 
-                int layout = screenIsntWideEnough ? -1 : 1;
-                if (footerContentFlow.GetLayoutPosition(beatmapAttributesDisplay) != layout)
-                    footerContentFlow.SetLayoutPosition(beatmapAttributesDisplay, layout);
+                footerContentFlow.LayoutDuration = 200;
+                footerContentFlow.LayoutEasing = Easing.OutQuint;
+                footerContentFlow.Direction = screenIsntWideEnough ? FillDirection.Vertical : FillDirection.Horizontal;
             }
         }
 

From 923c2a16edb66b7af3f3f3cc1d7c228290cd9ae7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 18:11:16 +0900
Subject: [PATCH 0545/2296] Fix weird centering of multiplier "x"

---
 .../Overlays/Mods/DifficultyMultiplierDisplay.cs   | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 7f92a4e644..a2d3e4b385 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.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.
 
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osuTK;
 using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Mods
@@ -13,21 +10,12 @@ namespace osu.Game.Overlays.Mods
     {
         protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
 
-        protected override string CounterFormat => @"N2";
+        protected override string CounterFormat => @"0.0x";
 
         public DifficultyMultiplierDisplay()
         {
             Current.Default = 1d;
             Current.Value = 1d;
-
-            Add(new SpriteIcon
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Icon = FontAwesome.Solid.Times,
-                Size = new Vector2(7),
-                Margin = new MarginPadding { Top = 1 }
-            });
         }
 
         protected override void LoadComplete()

From 41b0619533f15f7aac4c5899acdc3d71c4b3afb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 18:19:42 +0900
Subject: [PATCH 0546/2296] Fix shear being included on wrong side of
 `ModCounterDisplay`

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

diff --git a/osu.Game/Overlays/Mods/ModCounterDisplay.cs b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
index de8f4433f4..2b6d1953ee 100644
--- a/osu.Game/Overlays/Mods/ModCounterDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
@@ -67,6 +67,8 @@ namespace osu.Game.Overlays.Mods
                 Masking = true,
                 CornerRadius = ModSelectPanel.CORNER_RADIUS,
                 Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
                 Children = new Drawable[]
                 {
                     contentBackground = new Box

From 491d94c5ac0d65d8d275f2622b7ab0f04e27b624 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 18:51:48 +0900
Subject: [PATCH 0547/2296] Use local shear definition

---
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 2aea53090a..770e792736 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -72,6 +72,7 @@ namespace osu.Game.Overlays.Mods
             const float shear = ShearedOverlayContainer.SHEAR;
 
             AutoSizeAxes = Axes.Both;
+
             InternalChild = content = new Container
             {
                 Origin = Anchor.BottomRight,
@@ -145,22 +146,10 @@ namespace osu.Game.Overlays.Mods
                                 Direction = FillDirection.Horizontal,
                                 Children = new[]
                                 {
-                                    circleSizeDisplay = new VerticalAttributeDisplay("CS")
-                                    {
-                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    },
-                                    drainRateDisplay = new VerticalAttributeDisplay("HP")
-                                    {
-                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    },
-                                    approachRateDisplay = new VerticalAttributeDisplay("AR")
-                                    {
-                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    },
-                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD")
-                                    {
-                                        Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    },
+                                    circleSizeDisplay = new VerticalAttributeDisplay("CS") { Shear = new Vector2(-shear, 0), },
+                                    drainRateDisplay = new VerticalAttributeDisplay("HP") { Shear = new Vector2(-shear, 0), },
+                                    approachRateDisplay = new VerticalAttributeDisplay("AR") { Shear = new Vector2(-shear, 0), },
+                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD") { Shear = new Vector2(-shear, 0), },
                                 }
                             }
                         }

From 35840bf6719923053584d442594c0ba65737f40e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 18:51:31 +0900
Subject: [PATCH 0548/2296] Combine `ModCounterDisplay` and
 `DifficultyMultiplierDisplay` into one class

---
 .../TestSceneModsEffectDisplay.cs             |  68 ------
 .../Mods/DifficultyMultiplierDisplay.cs       | 216 ++++++++++++++++-
 osu.Game/Overlays/Mods/ModCounterDisplay.cs   | 222 ------------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |   4 +-
 4 files changed, 213 insertions(+), 297 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
 delete mode 100644 osu.Game/Overlays/Mods/ModCounterDisplay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
deleted file mode 100644
index bf6a718167..0000000000
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
+++ /dev/null
@@ -1,68 +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.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.Overlays;
-using osu.Game.Overlays.Mods;
-using osu.Game.Rulesets.Mods;
-using osuTK.Graphics;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    [TestFixture]
-    public partial class TestSceneModsEffectDisplay : OsuTestScene
-    {
-        [Cached]
-        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
-
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
-
-        [Test]
-        public void TestModsEffectDisplay()
-        {
-            TestDisplay testDisplay = null!;
-            Box background = null!;
-
-            AddStep("add display", () =>
-            {
-                Add(testDisplay = new TestDisplay
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
-                });
-                var boxes = testDisplay.ChildrenOfType<Box>();
-                background = boxes.First();
-            });
-
-            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.Current.Value = 40);
-            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyReduction));
-
-            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 partial class TestDisplay : ModCounterDisplay
-        {
-            public Container<Drawable> Container => Content;
-
-            protected override LocalisableString Label => "Test display";
-
-            public TestDisplay()
-            {
-                Current.Default = 50;
-            }
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index a2d3e4b385..3c14e3aa60 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -1,30 +1,236 @@
-// 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;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+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;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
+using osu.Game.Rulesets.Mods;
+using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    public sealed partial class DifficultyMultiplierDisplay : ModCounterDisplay
+    /// <summary>
+    /// Base class for displays of singular counters. Not to be confused with <see cref="BeatmapAttributesDisplay"/> which aggregates multiple attributes.
+    /// </summary>
+    public partial class DifficultyMultiplierDisplay : Container, IHasCurrentValue<double>
     {
-        protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
+        public const float HEIGHT = 42;
+        private const float transition_duration = 200;
 
-        protected override string CounterFormat => @"0.0x";
+        private readonly Box background;
+        private readonly Box labelBackground;
+        private readonly FillFlowContainer content;
+
+        public Bindable<double> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
+
+        [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 LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
+
+        protected virtual string CounterFormat => @"0.0x";
+
+        protected override Container<Drawable> Content => content;
+
+        protected readonly RollingCounter<double> Counter;
+
+        private readonly InputBlockingContainer topContent;
 
         public DifficultyMultiplierDisplay()
         {
             Current.Default = 1d;
             Current.Value = 1d;
+
+            const float shear = ShearedOverlayContainer.SHEAR;
+
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = topContent = new InputBlockingContainer
+            {
+                Origin = Anchor.BottomRight,
+                Anchor = Anchor.BottomRight,
+                AutoSizeAxes = Axes.X,
+                Height = ShearedButton.HEIGHT,
+                Shear = new Vector2(shear, 0),
+                CornerRadius = ShearedButton.CORNER_RADIUS,
+                BorderThickness = ShearedButton.BORDER_THICKNESS,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        AutoSizeAxes = Axes.X,
+                        ColumnDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension(GridSizeMode.Absolute, 56)
+                        },
+                        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(-shear, 0),
+                                            Text = Label,
+                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+                                        }
+                                    }
+                                },
+                                content = new FillFlowContainer
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Direction = FillDirection.Horizontal,
+                                    Shear = new Vector2(-shear, 0),
+                                    Spacing = new Vector2(2, 0),
+                                    Child = Counter = new EffectCounter(CounterFormat)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Current = { BindTarget = Current }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            background.Colour = colourProvider.Background4;
+            topContent.BorderColour = ColourInfo.GradientVertical(background.Colour, colourProvider.Background1);
+
+            labelBackground.Colour = colourProvider.Background4;
         }
 
         protected override void LoadComplete()
         {
-            base.LoadComplete();
+            Current.BindValueChanged(e =>
+            {
+                var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
+                setColours(effect);
+            }, true);
 
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
             Counter.SetCountWithoutRolling(Current.Value);
         }
+
+        /// <summary>
+        /// Fades colours of text and its background according to displayed value.
+        /// </summary>
+        /// <param name="effect">Effect of the value.</param>
+        private void setColours(ModEffect effect)
+        {
+            switch (effect)
+            {
+                case ModEffect.NotChanged:
+                    background.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
+                    content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
+                    break;
+
+                case ModEffect.DifficultyReduction:
+                    background.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
+                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    break;
+
+                case ModEffect.DifficultyIncrease:
+                    background.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
+                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(effect));
+            }
+        }
+
+        /// <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. 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;
+            if (comparison < 0)
+                return ModEffect.DifficultyReduction;
+
+            return ModEffect.DifficultyIncrease;
+        }
+
+        protected enum ModEffect
+        {
+            NotChanged,
+            DifficultyReduction,
+            DifficultyIncrease
+        }
+
+        private partial 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)
+            };
+        }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModCounterDisplay.cs b/osu.Game/Overlays/Mods/ModCounterDisplay.cs
deleted file mode 100644
index 2b6d1953ee..0000000000
--- a/osu.Game/Overlays/Mods/ModCounterDisplay.cs
+++ /dev/null
@@ -1,222 +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.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.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;
-
-namespace osu.Game.Overlays.Mods
-{
-    /// <summary>
-    /// Base class for displays of singular counters. Not to be confused with <see cref="BeatmapAttributesDisplay"/> which aggregates multiple attributes.
-    /// </summary>
-    public abstract partial class ModCounterDisplay : Container, IHasCurrentValue<double>
-    {
-        public const float HEIGHT = 42;
-        private const float transition_duration = 200;
-
-        private readonly Box contentBackground;
-        private readonly Box labelBackground;
-        private readonly FillFlowContainer content;
-
-        public Bindable<double> Current
-        {
-            get => current.Current;
-            set => current.Current = value;
-        }
-
-        private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
-
-        [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 virtual string CounterFormat => @"N0";
-
-        protected override Container<Drawable> Content => content;
-
-        protected readonly RollingCounter<double> Counter;
-
-        protected ModCounterDisplay()
-        {
-            Height = ShearedButton.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),
-                Anchor = Anchor.BottomRight,
-                Origin = Anchor.BottomRight,
-                Children = new Drawable[]
-                {
-                    contentBackground = new Box
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Y,
-                        AutoSizeAxes = Axes.X,
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, 56)
-                        },
-                        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 FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Direction = FillDirection.Horizontal,
-                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    Spacing = new Vector2(2, 0),
-                                    Child = Counter = new EffectCounter(CounterFormat)
-                                    {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        Current = { BindTarget = Current }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            labelBackground.Colour = colourProvider.Background4;
-        }
-
-        protected override void LoadComplete()
-        {
-            Current.BindValueChanged(e =>
-            {
-                var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
-                setColours(effect);
-            }, true);
-        }
-
-        /// <summary>
-        /// Fades colours of text and its background according to displayed value.
-        /// </summary>
-        /// <param name="effect">Effect of the value.</param>
-        private void setColours(ModEffect effect)
-        {
-            switch (effect)
-            {
-                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));
-            }
-        }
-
-        /// <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. 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;
-            if (comparison < 0)
-                return ModEffect.DifficultyReduction;
-
-            return ModEffect.DifficultyIncrease;
-        }
-
-        protected enum ModEffect
-        {
-            NotChanged,
-            DifficultyReduction,
-            DifficultyIncrease
-        }
-
-        private partial 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)
-            };
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a18ee65612..7e3082652a 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Overlays.Mods
                 aboveColumnsContent = new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = ModCounterDisplay.HEIGHT,
+                    Height = DifficultyMultiplierDisplay.HEIGHT,
                     Padding = new MarginPadding { Horizontal = 100 },
                     Child = SearchTextBox = new ShearedSearchTextBox
                     {
@@ -197,7 +197,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = ModCounterDisplay.HEIGHT + PADDING,
+                            Top = DifficultyMultiplierDisplay.HEIGHT + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,

From 9a7d1ed98bb5ab10f41a84403876854d45980f48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 18:55:17 +0900
Subject: [PATCH 0549/2296] Tidy up `DifficultyMultiplierDisplay`

---
 .../Mods/DifficultyMultiplierDisplay.cs       | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 3c14e3aa60..7d0f9f1b31 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -21,7 +21,7 @@ using osuTK;
 namespace osu.Game.Overlays.Mods
 {
     /// <summary>
-    /// Base class for displays of singular counters. Not to be confused with <see cref="BeatmapAttributesDisplay"/> which aggregates multiple attributes.
+    /// On the mod select overlay, this provides a local updating view of the aggregate score multiplier coming from mods.
     /// </summary>
     public partial class DifficultyMultiplierDisplay : Container, IHasCurrentValue<double>
     {
@@ -46,16 +46,7 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        /// <summary>
-        /// Text to display in the left area of the display.
-        /// </summary>
-        protected LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
-
-        protected virtual string CounterFormat => @"0.0x";
-
-        protected override Container<Drawable> Content => content;
-
-        protected readonly RollingCounter<double> Counter;
+        private readonly RollingCounter<double> counter;
 
         private readonly InputBlockingContainer topContent;
 
@@ -115,7 +106,7 @@ namespace osu.Game.Overlays.Mods
                                             Origin = Anchor.Centre,
                                             Margin = new MarginPadding { Horizontal = 18 },
                                             Shear = new Vector2(-shear, 0),
-                                            Text = Label,
+                                            Text = DifficultyMultiplierDisplayStrings.DifficultyMultiplier,
                                             Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
                                         }
                                     }
@@ -128,7 +119,7 @@ namespace osu.Game.Overlays.Mods
                                     Direction = FillDirection.Horizontal,
                                     Shear = new Vector2(-shear, 0),
                                     Spacing = new Vector2(2, 0),
-                                    Child = Counter = new EffectCounter(CounterFormat)
+                                    Child = counter = new EffectCounter(@"0.0x")
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
@@ -155,13 +146,13 @@ namespace osu.Game.Overlays.Mods
         {
             Current.BindValueChanged(e =>
             {
-                var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
+                var effect = calculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
                 setColours(effect);
             }, true);
 
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
-            Counter.SetCountWithoutRolling(Current.Value);
+            counter.SetCountWithoutRolling(Current.Value);
         }
 
         /// <summary>
@@ -197,7 +188,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <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)
+        private static ModEffect calculateEffectForComparison(int comparison)
         {
             if (comparison == 0)
                 return ModEffect.NotChanged;

From 46d5aa59bfa4e7ae6f28eaafe9dd195f7227116d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 19:33:30 +0900
Subject: [PATCH 0550/2296] Split base design out of `BeatmapAttributesDisplay`

---
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 175 ++++--------------
 .../Mods/ModFooterInformationDisplay.cs       | 153 +++++++++++++++
 2 files changed, 184 insertions(+), 144 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 770e792736..8828e017fd 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -7,9 +7,6 @@ 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.Colour;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
@@ -18,9 +15,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
 using osuTK;
-using osuTK.Graphics;
 using System.Threading;
-using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
@@ -29,143 +24,69 @@ namespace osu.Game.Overlays.Mods
     /// On the mod select overlay, this provides a local updating view of BPM, star rating and other
     /// difficulty attributes so the user can have a better insight into what mods are changing.
     /// </summary>
-    public partial class BeatmapAttributesDisplay : CompositeDrawable
+    public partial class BeatmapAttributesDisplay : ModFooterInformationDisplay
     {
-        private Container content = null!;
-        private Container innerContent = null!;
-
-        private Box background = null!;
-        private Box innerBackground = null!;
-
         private StarRatingDisplay starRatingDisplay = null!;
         private BPMDisplay bpmDisplay = null!;
 
-        private FillFlowContainer<VerticalAttributeDisplay> outerContent = null!;
         private VerticalAttributeDisplay circleSizeDisplay = null!;
         private VerticalAttributeDisplay drainRateDisplay = null!;
         private VerticalAttributeDisplay approachRateDisplay = null!;
         private VerticalAttributeDisplay overallDifficultyDisplay = null!;
 
-        private const float transition_duration = 250;
-
         public Bindable<IBeatmapInfo?> BeatmapInfo { get; } = new Bindable<IBeatmapInfo?>();
 
-        public BindableBool Collapsed { get; } = new BindableBool(true);
-
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
         private ModSettingChangeTracker? modSettingChangeTracker;
 
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
-
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
 
         private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
+        public BeatmapAttributesDisplay()
+        {
+            Collapsed.Value = true;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
             const float shear = ShearedOverlayContainer.SHEAR;
 
-            AutoSizeAxes = Axes.Both;
-
-            InternalChild = content = new Container
+            LeftContent.AddRange(new Drawable[]
             {
-                Origin = Anchor.BottomRight,
-                Anchor = Anchor.BottomRight,
-                AutoSizeAxes = Axes.X,
-                Height = ShearedButton.HEIGHT,
-                Shear = new Vector2(shear, 0),
-                CornerRadius = ShearedButton.CORNER_RADIUS,
-                BorderThickness = ShearedButton.BORDER_THICKNESS,
-                Masking = true,
-                Children = new Drawable[]
+                starRatingDisplay = new StarRatingDisplay(default, animated: true)
                 {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                    new FillFlowContainer // divide inner and outer content
-                    {
-                        Origin = Anchor.BottomLeft,
-                        Anchor = Anchor.BottomLeft,
-                        AutoSizeAxes = Axes.X,
-                        RelativeSizeAxes = Axes.Y,
-                        Direction = FillDirection.Horizontal,
-                        Children = new Drawable[]
-                        {
-                            innerContent = new Container
-                            {
-                                AutoSizeAxes = Axes.X,
-                                RelativeSizeAxes = Axes.Y,
-                                BorderThickness = ShearedButton.BORDER_THICKNESS,
-                                CornerRadius = ShearedButton.CORNER_RADIUS,
-                                Masking = true,
-                                Children = new Drawable[]
-                                {
-                                    innerBackground = new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both
-                                    },
-                                    new Container // actual inner content
-                                    {
-                                        Origin = Anchor.Centre,
-                                        Anchor = Anchor.Centre,
-                                        Width = 140,
-                                        RelativeSizeAxes = Axes.Y,
-                                        Margin = new MarginPadding { Horizontal = 15 },
-                                        Children = new Drawable[]
-                                        {
-                                            starRatingDisplay = new StarRatingDisplay(default, animated: true)
-                                            {
-                                                Origin = Anchor.CentreLeft,
-                                                Anchor = Anchor.CentreLeft,
-                                                Shear = new Vector2(-shear, 0),
-                                            },
-                                            bpmDisplay = new BPMDisplay
-                                            {
-                                                Origin = Anchor.CentreRight,
-                                                Anchor = Anchor.CentreRight,
-                                                Shear = new Vector2(-shear, 0),
-                                            }
-                                        }
-                                    }
-                                }
-                            },
-                            outerContent = new FillFlowContainer<VerticalAttributeDisplay>
-                            {
-                                Alpha = 0,
-                                Origin = Anchor.CentreLeft,
-                                Anchor = Anchor.CentreLeft,
-                                AutoSizeAxes = Axes.X,
-                                RelativeSizeAxes = Axes.Y,
-                                Direction = FillDirection.Horizontal,
-                                Children = new[]
-                                {
-                                    circleSizeDisplay = new VerticalAttributeDisplay("CS") { Shear = new Vector2(-shear, 0), },
-                                    drainRateDisplay = new VerticalAttributeDisplay("HP") { Shear = new Vector2(-shear, 0), },
-                                    approachRateDisplay = new VerticalAttributeDisplay("AR") { Shear = new Vector2(-shear, 0), },
-                                    overallDifficultyDisplay = new VerticalAttributeDisplay("OD") { Shear = new Vector2(-shear, 0), },
-                                }
-                            }
-                        }
-                    }
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Shear = new Vector2(-shear, 0),
+                },
+                bpmDisplay = new BPMDisplay
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Shear = new Vector2(-shear, 0),
+                    AutoSizeAxes = Axes.Y,
+                    Width = 75,
                 }
-            };
+            });
+
+            RightContent.AddRange(new Drawable[]
+            {
+                circleSizeDisplay = new VerticalAttributeDisplay("CS") { Shear = new Vector2(-shear, 0), },
+                drainRateDisplay = new VerticalAttributeDisplay("HP") { Shear = new Vector2(-shear, 0), },
+                approachRateDisplay = new VerticalAttributeDisplay("AR") { Shear = new Vector2(-shear, 0), },
+                overallDifficultyDisplay = new VerticalAttributeDisplay("OD") { Shear = new Vector2(-shear, 0), },
+            });
         }
 
         protected override void LoadComplete()
         {
-            background.Colour = colourProvider.Background4;
-            innerBackground.Colour = colourProvider.Background3;
-            Color4 glowColour = colourProvider.Background1;
-
-            content.BorderColour = ColourInfo.GradientVertical(background.Colour, glowColour);
-            innerContent.BorderColour = ColourInfo.GradientVertical(innerBackground.Colour, glowColour);
+            base.LoadComplete();
 
             mods.BindValueChanged(_ =>
             {
@@ -176,40 +97,9 @@ namespace osu.Game.Overlays.Mods
                 updateValues();
             }, true);
 
-            Collapsed.BindValueChanged(_ =>
-            {
-                // Only start autosize animations on first collapse toggle. This avoids an ugly initial presentation.
-                startAnimating();
-
-                updateCollapsedState();
-            });
-
             BeatmapInfo.BindValueChanged(_ => updateValues(), true);
         }
 
-        protected override bool OnHover(HoverEvent e)
-        {
-            startAnimating();
-            updateCollapsedState();
-            return true;
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            updateCollapsedState();
-            base.OnHoverLost(e);
-        }
-
-        protected override bool OnMouseDown(MouseDownEvent e) => true;
-
-        protected override bool OnClick(ClickEvent e) => true;
-
-        private void startAnimating()
-        {
-            content.AutoSizeEasing = Easing.OutQuint;
-            content.AutoSizeDuration = transition_duration;
-        }
-
         private void updateValues() => Scheduler.AddOnce(() =>
         {
             if (BeatmapInfo.Value == null)
@@ -242,11 +132,6 @@ namespace osu.Game.Overlays.Mods
             overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
         });
 
-        private void updateCollapsedState()
-        {
-            outerContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
-        }
-
         private partial class BPMDisplay : RollingCounter<double>
         {
             protected override double RollingDuration => 500;
@@ -255,6 +140,8 @@ namespace osu.Game.Overlays.Mods
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {
+                Anchor = Anchor.CentreRight,
+                Origin = Anchor.CentreRight,
                 Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold),
                 UseFullGlyphHeight = false,
             };
diff --git a/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
new file mode 100644
index 0000000000..ca9c13e75f
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
@@ -0,0 +1,153 @@
+// 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.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Mods
+{
+    public abstract partial class ModFooterInformationDisplay : CompositeDrawable
+    {
+        protected FillFlowContainer LeftContent { get; private set; } = null!;
+        protected FillFlowContainer RightContent { get; private set; } = null!;
+        protected Container Content { get; private set; } = null!;
+
+        public BindableBool Collapsed { get; } = new BindableBool();
+
+        private Container innerContent = null!;
+
+        protected Box MainBackground { get; private set; } = null!;
+        protected Box FrontBackground { get; private set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        private const float transition_duration = 250;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = Content = new Container
+            {
+                Origin = Anchor.BottomRight,
+                Anchor = Anchor.BottomRight,
+                AutoSizeAxes = Axes.X,
+                Height = ShearedButton.HEIGHT,
+                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                CornerRadius = ShearedButton.CORNER_RADIUS,
+                BorderThickness = ShearedButton.BORDER_THICKNESS,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    MainBackground = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new FillFlowContainer // divide inner and outer content
+                    {
+                        Origin = Anchor.BottomLeft,
+                        Anchor = Anchor.BottomLeft,
+                        AutoSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Y,
+                        Direction = FillDirection.Horizontal,
+                        Children = new Drawable[]
+                        {
+                            innerContent = new Container
+                            {
+                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Y,
+                                BorderThickness = ShearedButton.BORDER_THICKNESS,
+                                CornerRadius = ShearedButton.CORNER_RADIUS,
+                                Masking = true,
+                                Children = new Drawable[]
+                                {
+                                    FrontBackground = new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both
+                                    },
+                                    LeftContent = new FillFlowContainer // actual inner content
+                                    {
+                                        Origin = Anchor.Centre,
+                                        Anchor = Anchor.Centre,
+                                        RelativeSizeAxes = Axes.Y,
+                                        AutoSizeAxes = Axes.X,
+                                        Margin = new MarginPadding { Horizontal = 15 },
+                                        Spacing = new Vector2(10),
+                                    }
+                                }
+                            },
+                            RightContent = new FillFlowContainer
+                            {
+                                Alpha = 0,
+                                Origin = Anchor.CentreLeft,
+                                Anchor = Anchor.CentreLeft,
+                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Y,
+                                Direction = FillDirection.Horizontal,
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            MainBackground.Colour = colourProvider.Background4;
+            FrontBackground.Colour = colourProvider.Background3;
+            Color4 glowColour = colourProvider.Background1;
+
+            Content.BorderColour = ColourInfo.GradientVertical(MainBackground.Colour, glowColour);
+            innerContent.BorderColour = ColourInfo.GradientVertical(FrontBackground.Colour, glowColour);
+
+            Collapsed.BindValueChanged(_ =>
+            {
+                // Only start autosize animations on first collapse toggle. This avoids an ugly initial presentation.
+                startAnimating();
+                updateCollapsedState();
+            });
+
+            updateCollapsedState();
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            startAnimating();
+            updateCollapsedState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            updateCollapsedState();
+            base.OnHoverLost(e);
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
+
+        private void startAnimating()
+        {
+            Content.AutoSizeEasing = Easing.OutQuint;
+            Content.AutoSizeDuration = transition_duration;
+        }
+
+        private void updateCollapsedState()
+        {
+            RightContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
+        }
+    }
+}

From 5b2af7f264cba42dbb4ad4dababb38a48eff2cf9 Mon Sep 17 00:00:00 2001
From: sw1tchbl4d3 <sw1tchbl4d3@sw1tchbl4d3.com>
Date: Wed, 13 Sep 2023 12:44:00 +0200
Subject: [PATCH 0551/2296] Default to none bank if invalid samplebank is
 specified

---
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 3dbe7b6519..339e9bb5bc 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -193,10 +193,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
             var addBank = (LegacySampleBank)Parsing.ParseInt(split[1]);
 
             string stringBank = bank.ToString().ToLowerInvariant();
-            if (stringBank == @"none")
+            if (stringBank == @"none" || !Enum.IsDefined(bank))
                 stringBank = null;
             string stringAddBank = addBank.ToString().ToLowerInvariant();
-            if (stringAddBank == @"none")
+            if (stringAddBank == @"none" || !Enum.IsDefined(addBank))
                 stringAddBank = null;
 
             bankInfo.BankForNormal = stringBank;

From 824a3e4adc5eee76168dde693205067ce8632f61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 19:33:39 +0900
Subject: [PATCH 0552/2296] Update `DifficultyMultiplierDisplay` to use new
 shared design

---
 .../Mods/DifficultyMultiplierDisplay.cs       | 144 +++++-------------
 1 file changed, 37 insertions(+), 107 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 7d0f9f1b31..98dc3fa62e 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -6,9 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
@@ -23,14 +20,9 @@ namespace osu.Game.Overlays.Mods
     /// <summary>
     /// On the mod select overlay, this provides a local updating view of the aggregate score multiplier coming from mods.
     /// </summary>
-    public partial class DifficultyMultiplierDisplay : Container, IHasCurrentValue<double>
+    public partial class DifficultyMultiplierDisplay : ModFooterInformationDisplay, IHasCurrentValue<double>
     {
         public const float HEIGHT = 42;
-        private const float transition_duration = 200;
-
-        private readonly Box background;
-        private readonly Box labelBackground;
-        private readonly FillFlowContainer content;
 
         public Bindable<double> Current
         {
@@ -40,110 +32,53 @@ namespace osu.Game.Overlays.Mods
 
         private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
 
+        private const float transition_duration = 200;
+
+        private RollingCounter<double> counter = null!;
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        private readonly RollingCounter<double> counter;
-
-        private readonly InputBlockingContainer topContent;
-
         public DifficultyMultiplierDisplay()
         {
             Current.Default = 1d;
             Current.Value = 1d;
-
-            const float shear = ShearedOverlayContainer.SHEAR;
-
-            AutoSizeAxes = Axes.Both;
-
-            InternalChild = topContent = new InputBlockingContainer
-            {
-                Origin = Anchor.BottomRight,
-                Anchor = Anchor.BottomRight,
-                AutoSizeAxes = Axes.X,
-                Height = ShearedButton.HEIGHT,
-                Shear = new Vector2(shear, 0),
-                CornerRadius = ShearedButton.CORNER_RADIUS,
-                BorderThickness = ShearedButton.BORDER_THICKNESS,
-                Masking = true,
-                Children = new Drawable[]
-                {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Y,
-                        AutoSizeAxes = Axes.X,
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, 56)
-                        },
-                        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(-shear, 0),
-                                            Text = DifficultyMultiplierDisplayStrings.DifficultyMultiplier,
-                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
-                                        }
-                                    }
-                                },
-                                content = new FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Direction = FillDirection.Horizontal,
-                                    Shear = new Vector2(-shear, 0),
-                                    Spacing = new Vector2(2, 0),
-                                    Child = counter = new EffectCounter(@"0.0x")
-                                    {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        Current = { BindTarget = Current }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            background.Colour = colourProvider.Background4;
-            topContent.BorderColour = ColourInfo.GradientVertical(background.Colour, colourProvider.Background1);
+            LeftContent.AddRange(new Drawable[]
+            {
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                    Text = DifficultyMultiplierDisplayStrings.DifficultyMultiplier,
+                    Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+                }
+            });
 
-            labelBackground.Colour = colourProvider.Background4;
+            RightContent.Add(counter = new EffectCounter
+            {
+                Margin = new MarginPadding(10),
+                AutoSizeAxes = Axes.Y,
+                Width = 40,
+                Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Current = { BindTarget = Current }
+            });
         }
 
         protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             Current.BindValueChanged(e =>
             {
                 var effect = calculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
@@ -164,18 +99,18 @@ namespace osu.Game.Overlays.Mods
             switch (effect)
             {
                 case ModEffect.NotChanged:
-                    background.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
-                    content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
+                    MainBackground.FadeColour(colourProvider.Background4, transition_duration, Easing.OutQuint);
+                    counter.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
                     break;
 
                 case ModEffect.DifficultyReduction:
-                    background.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
-                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    MainBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
+                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
                     break;
 
                 case ModEffect.DifficultyIncrease:
-                    background.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
-                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    MainBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
+                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
                     break;
 
                 default:
@@ -207,19 +142,14 @@ namespace osu.Game.Overlays.Mods
 
         private partial 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 LocalisableString FormatCount(double count) => count.ToLocalisableString(@"0.00x");
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
                 Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
             };
         }

From 3e1388c73f9230c19fb258ea1a750d5a7223b92f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 19:57:48 +0900
Subject: [PATCH 0553/2296] Add vertical animation when difficulty multiplier
 is changed

---
 .../Mods/DifficultyMultiplierDisplay.cs       | 95 ++++++++-----------
 1 file changed, 38 insertions(+), 57 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 98dc3fa62e..879df73861 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -6,6 +6,7 @@ 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.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
@@ -14,6 +15,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -63,15 +65,20 @@ namespace osu.Game.Overlays.Mods
                 }
             });
 
-            RightContent.Add(counter = new EffectCounter
+            RightContent.Add(new Container
             {
-                Margin = new MarginPadding(10),
-                AutoSizeAxes = Axes.Y,
                 Width = 40,
-                Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                RelativeSizeAxes = Axes.Y,
+                Margin = new MarginPadding(10),
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Current = { BindTarget = Current }
+                Child = counter = new EffectCounter
+                {
+                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Current = { BindTarget = Current }
+                }
             });
         }
 
@@ -81,8 +88,32 @@ namespace osu.Game.Overlays.Mods
 
             Current.BindValueChanged(e =>
             {
-                var effect = calculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
-                setColours(effect);
+                if (e.NewValue > Current.Default)
+                {
+                    MainBackground
+                        .FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
+                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                }
+                else if (e.NewValue < Current.Default)
+                {
+                    MainBackground
+                        .FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
+                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                }
+                else
+                {
+                    MainBackground.FadeColour(colourProvider.Background4, transition_duration, Easing.OutQuint);
+                    counter.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
+                }
+
+                if (e.NewValue != Current.Default)
+                    MainBackground.FlashColour(Color4.White, 500, Easing.OutQuint);
+
+                const float move_amount = 4;
+                if (e.NewValue > e.OldValue)
+                    counter.MoveToY(Math.Max(-move_amount * 2, counter.Y - move_amount)).Then().MoveToY(0, transition_duration * 2, Easing.OutQuint);
+                else
+                    counter.MoveToY(Math.Min(move_amount * 2, counter.Y + move_amount)).Then().MoveToY(0, transition_duration * 2, Easing.OutQuint);
             }, true);
 
             // required to prevent the counter initially rolling up from 0 to 1
@@ -90,56 +121,6 @@ namespace osu.Game.Overlays.Mods
             counter.SetCountWithoutRolling(Current.Value);
         }
 
-        /// <summary>
-        /// Fades colours of text and its background according to displayed value.
-        /// </summary>
-        /// <param name="effect">Effect of the value.</param>
-        private void setColours(ModEffect effect)
-        {
-            switch (effect)
-            {
-                case ModEffect.NotChanged:
-                    MainBackground.FadeColour(colourProvider.Background4, transition_duration, Easing.OutQuint);
-                    counter.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
-                    break;
-
-                case ModEffect.DifficultyReduction:
-                    MainBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
-                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
-                    break;
-
-                case ModEffect.DifficultyIncrease:
-                    MainBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
-                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(effect));
-            }
-        }
-
-        /// <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. 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>
-        private static ModEffect calculateEffectForComparison(int comparison)
-        {
-            if (comparison == 0)
-                return ModEffect.NotChanged;
-            if (comparison < 0)
-                return ModEffect.DifficultyReduction;
-
-            return ModEffect.DifficultyIncrease;
-        }
-
-        protected enum ModEffect
-        {
-            NotChanged,
-            DifficultyReduction,
-            DifficultyIncrease
-        }
-
         private partial class EffectCounter : RollingCounter<double>
         {
             protected override double RollingDuration => 500;

From 32946413de83efceb75b51571802536e88dc708f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Sep 2023 20:00:06 +0900
Subject: [PATCH 0554/2296] Change display text from "difficulty" to "score"
 multiplier

---
 .../TestSceneModSelectOverlay.cs              |  8 ++++----
 ....cs => TestSceneScoreMultiplierDisplay.cs} | 13 ++++++-------
 .../DifficultyMultiplierDisplayStrings.cs     | 19 -------------------
 .../Localisation/ModSelectOverlayStrings.cs   |  7 ++++++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  8 ++++----
 ...erDisplay.cs => ScoreMultiplierDisplay.cs} |  6 +++---
 6 files changed, 23 insertions(+), 38 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestSceneDifficultyMultiplierDisplay.cs => TestSceneScoreMultiplierDisplay.cs} (79%)
 delete mode 100644 osu.Game/Localisation/DifficultyMultiplierDisplayStrings.cs
 rename osu.Game/Overlays/Mods/{DifficultyMultiplierDisplay.cs => ScoreMultiplierDisplay.cs} (95%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 029a7f8b9e..3728fb3f21 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("mod multiplier correct", () =>
             {
                 double multiplier = SelectedMods.Value.Aggregate(1d, (m, mod) => m * mod.ScoreMultiplier);
-                return Precision.AlmostEquals(multiplier, modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value);
+                return Precision.AlmostEquals(multiplier, modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value);
             });
             assertCustomisationToggleState(disabled: false, active: false);
             AddAssert("setting items created", () => modSelectOverlay.ChildrenOfType<ISettingsItem>().Any());
@@ -130,7 +130,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("mod multiplier correct", () =>
             {
                 double multiplier = SelectedMods.Value.Aggregate(1d, (m, mod) => m * mod.ScoreMultiplier);
-                return Precision.AlmostEquals(multiplier, modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value);
+                return Precision.AlmostEquals(multiplier, modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value);
             });
             assertCustomisationToggleState(disabled: false, active: false);
             AddAssert("setting items created", () => modSelectOverlay.ChildrenOfType<ISettingsItem>().Any());
@@ -787,7 +787,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.MoveMouseTo(this.ChildrenOfType<ModPresetPanel>().Single(preset => preset.Preset.Value.Name == "Half Time 0.5x"));
                 InputManager.Click(MouseButton.Left);
             });
-            AddAssert("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.5));
+            AddAssert("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.5));
 
             // this is highly unorthodox in a test, but because the `ModSettingChangeTracker` machinery heavily leans on events and object disposal and re-creation,
             // it is instrumental in the reproduction of the failure scenario that this test is supposed to cover.
@@ -796,7 +796,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("open customisation area", () => modSelectOverlay.CustomisationButton!.TriggerClick());
             AddStep("reset half time speed to default", () => modSelectOverlay.ChildrenOfType<ModSettingsArea>().Single()
                                                                               .ChildrenOfType<RevertToDefaultButton<double>>().Single().TriggerClick());
-            AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.7));
+            AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.7));
         }
 
         private void waitForColumnLoad() => AddUntilStep("all column content loaded",
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDifficultyMultiplierDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneScoreMultiplierDisplay.cs
similarity index 79%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneDifficultyMultiplierDisplay.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneScoreMultiplierDisplay.cs
index 890c7295b4..c2ddd814b7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDifficultyMultiplierDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneScoreMultiplierDisplay.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 NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -12,17 +11,17 @@ using osu.Game.Overlays.Mods;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public partial class TestSceneDifficultyMultiplierDisplay : OsuTestScene
+    public partial class TestSceneScoreMultiplierDisplay : OsuTestScene
     {
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
         [Test]
-        public void TestDifficultyMultiplierDisplay()
+        public void TestBasic()
         {
-            DifficultyMultiplierDisplay multiplierDisplay = null;
+            ScoreMultiplierDisplay multiplierDisplay = null!;
 
-            AddStep("create content", () => Child = multiplierDisplay = new DifficultyMultiplierDisplay
+            AddStep("create content", () => Child = multiplierDisplay = new ScoreMultiplierDisplay
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre
@@ -34,7 +33,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddSliderStep("set multiplier", 0, 2, 1d, multiplier =>
             {
-                if (multiplierDisplay != null)
+                if (multiplierDisplay.IsNotNull())
                     multiplierDisplay.Current.Value = multiplier;
             });
         }
diff --git a/osu.Game/Localisation/DifficultyMultiplierDisplayStrings.cs b/osu.Game/Localisation/DifficultyMultiplierDisplayStrings.cs
deleted file mode 100644
index 952ca22678..0000000000
--- a/osu.Game/Localisation/DifficultyMultiplierDisplayStrings.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 osu.Framework.Localisation;
-
-namespace osu.Game.Localisation
-{
-    public static class DifficultyMultiplierDisplayStrings
-    {
-        private const string prefix = @"osu.Game.Resources.Localisation.DifficultyMultiplierDisplay";
-
-        /// <summary>
-        /// "Difficulty Multiplier"
-        /// </summary>
-        public static LocalisableString DifficultyMultiplier => new TranslatableString(getKey(@"difficulty_multiplier"), @"Difficulty Multiplier");
-
-        private static string getKey(string key) => $@"{prefix}:{key}";
-    }
-}
diff --git a/osu.Game/Localisation/ModSelectOverlayStrings.cs b/osu.Game/Localisation/ModSelectOverlayStrings.cs
index 05dcf138d7..86ebebd293 100644
--- a/osu.Game/Localisation/ModSelectOverlayStrings.cs
+++ b/osu.Game/Localisation/ModSelectOverlayStrings.cs
@@ -44,6 +44,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString TabToSearch => new TranslatableString(getKey(@"tab_to_search"), @"tab to search...");
 
+        /// <summary>
+        /// "Score Multiplier"
+        /// </summary>
+        public static LocalisableString ScoreMultiplier => new TranslatableString(getKey(@"score_multiplier"), @"Score Multiplier");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 7e3082652a..bdea8a126c 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.Mods
         private DeselectAllModsButton deselectAllModsButton = null!;
 
         private Container aboveColumnsContent = null!;
-        private DifficultyMultiplierDisplay? multiplierDisplay;
+        private ScoreMultiplierDisplay? multiplierDisplay;
         private BeatmapAttributesDisplay? beatmapAttributesDisplay;
 
         protected ShearedButton BackButton { get; private set; } = null!;
@@ -182,7 +182,7 @@ namespace osu.Game.Overlays.Mods
                 aboveColumnsContent = new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = DifficultyMultiplierDisplay.HEIGHT,
+                    Height = ScoreMultiplierDisplay.HEIGHT,
                     Padding = new MarginPadding { Horizontal = 100 },
                     Child = SearchTextBox = new ShearedSearchTextBox
                     {
@@ -197,7 +197,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = DifficultyMultiplierDisplay.HEIGHT + PADDING,
+                            Top = ScoreMultiplierDisplay.HEIGHT + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,
@@ -266,7 +266,7 @@ namespace osu.Game.Overlays.Mods
                     },
                     Children = new Drawable[]
                     {
-                        multiplierDisplay = new DifficultyMultiplierDisplay
+                        multiplierDisplay = new ScoreMultiplierDisplay
                         {
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight
diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
similarity index 95%
rename from osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
rename to osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
index 879df73861..2b075442e4 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Mods
     /// <summary>
     /// On the mod select overlay, this provides a local updating view of the aggregate score multiplier coming from mods.
     /// </summary>
-    public partial class DifficultyMultiplierDisplay : ModFooterInformationDisplay, IHasCurrentValue<double>
+    public partial class ScoreMultiplierDisplay : ModFooterInformationDisplay, IHasCurrentValue<double>
     {
         public const float HEIGHT = 42;
 
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        public DifficultyMultiplierDisplay()
+        public ScoreMultiplierDisplay()
         {
             Current.Default = 1d;
             Current.Value = 1d;
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Mods
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                    Text = DifficultyMultiplierDisplayStrings.DifficultyMultiplier,
+                    Text = ModSelectOverlayStrings.ScoreMultiplier,
                     Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
                 }
             });

From 8f9cde01aae3ea874a8225c40fedacd637ec0c2e Mon Sep 17 00:00:00 2001
From: sw1tchbl4d3 <sw1tchbl4d3@sw1tchbl4d3.com>
Date: Wed, 13 Sep 2023 13:38:13 +0200
Subject: [PATCH 0555/2296] Add test

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 27 +++++++++++++++++++
 osu.Game.Tests/Resources/invalid-bank.osu     | 11 ++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/invalid-bank.osu

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 970b6aaf60..6fe9c902bb 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -621,6 +621,33 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestInvalidBankDefaultsToNone()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("invalid-bank.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var hitObjects = decoder.Decode(stream).HitObjects;
+
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[0].Samples[0].Bank);
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[0].Samples[1].Bank);
+
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[1].Samples[0].Bank);
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[1].Samples[1].Bank);
+
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[2].Samples[0].Bank);
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[2].Samples[1].Bank);
+
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[3].Samples[0].Bank);
+                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[3].Samples[1].Bank);
+
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[4].Samples[0].Bank);
+                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[4].Samples[1].Bank);
+            }
+        }
+
         [Test]
         public void TestFallbackDecoderForCorruptedHeader()
         {
diff --git a/osu.Game.Tests/Resources/invalid-bank.osu b/osu.Game.Tests/Resources/invalid-bank.osu
new file mode 100644
index 0000000000..fb54a61fd3
--- /dev/null
+++ b/osu.Game.Tests/Resources/invalid-bank.osu
@@ -0,0 +1,11 @@
+osu file format v14
+
+[General]
+SampleSet: Normal
+
+[HitObjects]
+256,192,1000,1,8,0:0:0:0:
+256,192,2000,1,8,1:2:0:0:
+256,192,3000,1,8,2:62:0:0:
+256,192,4000,1,8,41:2:0:0:
+256,192,5000,1,8,41:62:0:0:

From 753c1c877c48527c9a5b4d3f5ecc6608581d0e89 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Sep 2023 23:10:13 +0900
Subject: [PATCH 0556/2296] Revert masking SSBO changes

---
 .../UI/Cursor/CursorTrail.cs                  | 20 +++++--------------
 .../Resources/Shaders/sh_TestVertex.vs        |  2 +-
 osu.Game/Screens/Loader.cs                    |  5 ++++-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index 0774d34488..a29faac5a0 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     if (time - part.Time >= 1)
                         continue;
 
-                    vertexBatch.Add(new TexturedTrailVertex(renderer)
+                    vertexBatch.Add(new TexturedTrailVertex
                     {
                         Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomLeft,
@@ -295,7 +295,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex(renderer)
+                    vertexBatch.Add(new TexturedTrailVertex
                     {
                         Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomRight,
@@ -304,7 +304,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex(renderer)
+                    vertexBatch.Add(new TexturedTrailVertex
                     {
                         Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopRight,
@@ -313,7 +313,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Time = part.Time
                     });
 
-                    vertexBatch.Add(new TexturedTrailVertex(renderer)
+                    vertexBatch.Add(new TexturedTrailVertex
                     {
                         Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopLeft,
@@ -362,22 +362,12 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             [VertexMember(1, VertexAttribPointerType.Float)]
             public float Time;
 
-            [VertexMember(1, VertexAttribPointerType.Int)]
-            private readonly int maskingIndex;
-
-            public TexturedTrailVertex(IRenderer renderer)
-            {
-                this = default;
-                maskingIndex = renderer.CurrentMaskingIndex;
-            }
-
             public bool Equals(TexturedTrailVertex other)
             {
                 return Position.Equals(other.Position)
                        && TexturePosition.Equals(other.TexturePosition)
                        && Colour.Equals(other.Colour)
-                       && Time.Equals(other.Time)
-                       && maskingIndex == other.maskingIndex;
+                       && Time.Equals(other.Time);
             }
         }
     }
diff --git a/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs b/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
index 80ed686ba5..505554bb33 100644
--- a/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
+++ b/osu.Game.Tests/Resources/Shaders/sh_TestVertex.vs
@@ -13,7 +13,7 @@ layout(location = 4) out mediump vec2 v_BlendRange;
 void main(void)
 {
 	// Transform from screen space to masking space.
-	highp vec3 maskingPos = g_MaskingInfo.ToMaskingSpace * vec3(m_Position, 1.0);
+	highp vec3 maskingPos = g_ToMaskingSpace * vec3(m_Position, 1.0);
 	v_MaskingPosition = maskingPos.xy / maskingPos.z;
 
 	v_Colour = m_Colour;
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index 962c7d9d14..372cfe748e 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -126,9 +126,12 @@ namespace osu.Game.Screens
             private void load(ShaderManager manager)
             {
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE));
-                loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2_NO_MASKING, FragmentShaderDescriptor.BLUR));
+                loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.BLUR));
+
                 loadTargets.Add(manager.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE));
+
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_2, "TriangleBorder"));
+
                 loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_3, FragmentShaderDescriptor.TEXTURE));
             }
 

From b5902a873688d547dd114be1ede034b946e825b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 13:29:29 +0900
Subject: [PATCH 0557/2296] Avoid `MemoryStream` overhead for incoming
 non-`MemoryStream` in `ImportTask`

---
 osu.Game/Database/ImportTask.cs | 38 ++++++++++++---------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index def20bc1fb..bf5b377a07 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -46,9 +46,19 @@ namespace osu.Game.Database
         /// </summary>
         public ArchiveReader GetReader()
         {
-            return Stream != null
-                ? getReaderFrom(Stream)
-                : getReaderFrom(Path);
+            if (Stream == null)
+                return getReaderFromPath(Path);
+
+            if (Stream is MemoryStream memoryStream)
+            {
+                if (ZipUtils.IsZipArchive(memoryStream))
+                    return new ZipArchiveReader(memoryStream, Path);
+
+                return new LegacyByteArrayReader(memoryStream.ToArray(), Path);
+            }
+
+            // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
+            return new LegacyByteArrayReader(Stream.ReadAllBytesToArray(), Path);
         }
 
         /// <summary>
@@ -60,32 +70,12 @@ namespace osu.Game.Database
                 File.Delete(Path);
         }
 
-        /// <summary>
-        /// Creates an <see cref="ArchiveReader"/> from a stream.
-        /// </summary>
-        /// <param name="stream">A seekable stream containing the archive content.</param>
-        /// <returns>A reader giving access to the archive's content.</returns>
-        private ArchiveReader getReaderFrom(Stream stream)
-        {
-            if (!(stream is MemoryStream memoryStream))
-            {
-                // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
-                memoryStream = new MemoryStream(stream.ReadAllBytesToArray());
-                stream.Dispose();
-            }
-
-            if (ZipUtils.IsZipArchive(memoryStream))
-                return new ZipArchiveReader(memoryStream, Path);
-
-            return new LegacyByteArrayReader(memoryStream.ToArray(), Path);
-        }
-
         /// <summary>
         /// Creates an <see cref="ArchiveReader"/> from a valid storage path.
         /// </summary>
         /// <param name="path">A file or folder path resolving the archive content.</param>
         /// <returns>A reader giving access to the archive's content.</returns>
-        private ArchiveReader getReaderFrom(string path)
+        private ArchiveReader getReaderFromPath(string path)
         {
             if (ZipUtils.IsZipArchive(path))
                 return new ZipArchiveReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read), System.IO.Path.GetFileName(path));

From 0657b551964986fc5504a202eaa5e699d1c72f00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 13:33:25 +0900
Subject: [PATCH 0558/2296] Avoid `MemoryStream.ToArray` overhead in
 `LegacyByteArrayReader`

---
 osu.Game/Database/ImportTask.cs               |  2 +-
 .../IO/Archives/MemoryStreamArchiveReader.cs  | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/IO/Archives/MemoryStreamArchiveReader.cs

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index bf5b377a07..962eab9fa5 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Database
                 if (ZipUtils.IsZipArchive(memoryStream))
                     return new ZipArchiveReader(memoryStream, Path);
 
-                return new LegacyByteArrayReader(memoryStream.ToArray(), Path);
+                return new MemoryStreamArchiveReader(memoryStream, Path);
             }
 
             // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
diff --git a/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs b/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs
new file mode 100644
index 0000000000..37ce1e508e
--- /dev/null
+++ b/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs
@@ -0,0 +1,30 @@
+// 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.IO;
+
+namespace osu.Game.IO.Archives
+{
+    /// <summary>
+    /// Allows reading a single file from the provided memory stream.
+    /// </summary>
+    public class MemoryStreamArchiveReader : ArchiveReader
+    {
+        private readonly MemoryStream stream;
+
+        public MemoryStreamArchiveReader(MemoryStream stream, string filename)
+            : base(filename)
+        {
+            this.stream = stream;
+        }
+
+        public override Stream GetStream(string name) => new MemoryStream(stream.GetBuffer(), 0, (int)stream.Length);
+
+        public override void Dispose()
+        {
+        }
+
+        public override IEnumerable<string> Filenames => new[] { Name };
+    }
+}

From 541cd972e1e19ba641b1e3397bb1b073d53121bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 13:36:07 +0900
Subject: [PATCH 0559/2296] Rename `ArchiveReader` implementations to read
 better

---
 osu.Game/Beatmaps/BeatmapImporter.cs                        | 2 +-
 osu.Game/Database/ImportTask.cs                             | 6 +++---
 .../{LegacyByteArrayReader.cs => ByteArrayArchiveReader.cs} | 4 ++--
 ...yDirectoryArchiveReader.cs => DirectoryArchiveReader.cs} | 6 +++---
 ...egacyFileArchiveReader.cs => SingleFileArchiveReader.cs} | 6 +++---
 osu.Game/Screens/Play/Player.cs                             | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename osu.Game/IO/Archives/{LegacyByteArrayReader.cs => ByteArrayArchiveReader.cs} (84%)
 rename osu.Game/IO/Archives/{LegacyDirectoryArchiveReader.cs => DirectoryArchiveReader.cs} (85%)
 rename osu.Game/IO/Archives/{LegacyFileArchiveReader.cs => SingleFileArchiveReader.cs} (83%)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 14719da1bc..b497b8e8dc 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -319,7 +319,7 @@ namespace osu.Game.Beatmaps
         {
             DateTimeOffset dateAdded = DateTimeOffset.UtcNow;
 
-            if (reader is LegacyDirectoryArchiveReader legacyReader)
+            if (reader is DirectoryArchiveReader legacyReader)
             {
                 var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
 
diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index 962eab9fa5..cbc5c9005c 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Database
             }
 
             // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
-            return new LegacyByteArrayReader(Stream.ReadAllBytesToArray(), Path);
+            return new ByteArrayArchiveReader(Stream.ReadAllBytesToArray(), Path);
         }
 
         /// <summary>
@@ -80,9 +80,9 @@ namespace osu.Game.Database
             if (ZipUtils.IsZipArchive(path))
                 return new ZipArchiveReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read), System.IO.Path.GetFileName(path));
             if (Directory.Exists(path))
-                return new LegacyDirectoryArchiveReader(path);
+                return new DirectoryArchiveReader(path);
             if (File.Exists(path))
-                return new LegacyFileArchiveReader(path);
+                return new SingleFileArchiveReader(path);
 
             throw new InvalidFormatException($"{path} is not a valid archive");
         }
diff --git a/osu.Game/IO/Archives/LegacyByteArrayReader.cs b/osu.Game/IO/Archives/ByteArrayArchiveReader.cs
similarity index 84%
rename from osu.Game/IO/Archives/LegacyByteArrayReader.cs
rename to osu.Game/IO/Archives/ByteArrayArchiveReader.cs
index 06db02b335..0e2dee3456 100644
--- a/osu.Game/IO/Archives/LegacyByteArrayReader.cs
+++ b/osu.Game/IO/Archives/ByteArrayArchiveReader.cs
@@ -9,11 +9,11 @@ namespace osu.Game.IO.Archives
     /// <summary>
     /// Allows reading a single file from the provided byte array.
     /// </summary>
-    public class LegacyByteArrayReader : ArchiveReader
+    public class ByteArrayArchiveReader : ArchiveReader
     {
         private readonly byte[] content;
 
-        public LegacyByteArrayReader(byte[] content, string filename)
+        public ByteArrayArchiveReader(byte[] content, string filename)
             : base(filename)
         {
             this.content = content;
diff --git a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs b/osu.Game/IO/Archives/DirectoryArchiveReader.cs
similarity index 85%
rename from osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
rename to osu.Game/IO/Archives/DirectoryArchiveReader.cs
index 1503705022..f2012b7b49 100644
--- a/osu.Game/IO/Archives/LegacyDirectoryArchiveReader.cs
+++ b/osu.Game/IO/Archives/DirectoryArchiveReader.cs
@@ -8,13 +8,13 @@ using System.Linq;
 namespace osu.Game.IO.Archives
 {
     /// <summary>
-    /// Reads an archive from a directory on disk.
+    /// Reads an archive directly from a directory on disk.
     /// </summary>
-    public class LegacyDirectoryArchiveReader : ArchiveReader
+    public class DirectoryArchiveReader : ArchiveReader
     {
         private readonly string path;
 
-        public LegacyDirectoryArchiveReader(string path)
+        public DirectoryArchiveReader(string path)
             : base(Path.GetFileName(path))
         {
             // re-get full path to standardise with Directory.GetFiles return values below.
diff --git a/osu.Game/IO/Archives/LegacyFileArchiveReader.cs b/osu.Game/IO/Archives/SingleFileArchiveReader.cs
similarity index 83%
rename from osu.Game/IO/Archives/LegacyFileArchiveReader.cs
rename to osu.Game/IO/Archives/SingleFileArchiveReader.cs
index c317cae5fc..79d9c5de71 100644
--- a/osu.Game/IO/Archives/LegacyFileArchiveReader.cs
+++ b/osu.Game/IO/Archives/SingleFileArchiveReader.cs
@@ -7,14 +7,14 @@ using System.IO;
 namespace osu.Game.IO.Archives
 {
     /// <summary>
-    /// Reads a file on disk as an archive.
+    /// Reads a single file on disk as an archive.
     /// Note: In this case, the file is not an extractable archive, use <see cref="ZipArchiveReader"/> instead.
     /// </summary>
-    public class LegacyFileArchiveReader : ArchiveReader
+    public class SingleFileArchiveReader : ArchiveReader
     {
         private readonly string path;
 
-        public LegacyFileArchiveReader(string path)
+        public SingleFileArchiveReader(string path)
             : base(Path.GetFileName(path))
         {
             // re-get full path to standardise
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8c5828fc92..60806a73c5 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1144,14 +1144,14 @@ namespace osu.Game.Screens.Play
             if (DrawableRuleset.ReplayScore != null)
                 return Task.CompletedTask;
 
-            LegacyByteArrayReader replayReader = null;
+            ByteArrayArchiveReader replayReader = null;
 
             if (score.ScoreInfo.Ruleset.IsLegacyRuleset())
             {
                 using (var stream = new MemoryStream())
                 {
                     new LegacyScoreEncoder(score, GameplayState.Beatmap).Encode(stream);
-                    replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
+                    replayReader = new ByteArrayArchiveReader(stream.ToArray(), "replay.osr");
                 }
             }
 

From 364094fcf29e1a2e8e9f9af9dbd2dab55b28b2d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 13:38:23 +0900
Subject: [PATCH 0560/2296] Inline all archive reader pathing

---
 osu.Game/Database/ImportTask.cs | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index cbc5c9005c..6d432aac25 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -47,7 +47,16 @@ namespace osu.Game.Database
         public ArchiveReader GetReader()
         {
             if (Stream == null)
-                return getReaderFromPath(Path);
+            {
+                if (ZipUtils.IsZipArchive(Path))
+                    return new ZipArchiveReader(File.Open(Path, FileMode.Open, FileAccess.Read, FileShare.Read), System.IO.Path.GetFileName(Path));
+                if (Directory.Exists(Path))
+                    return new DirectoryArchiveReader(Path);
+                if (File.Exists(Path))
+                    return new SingleFileArchiveReader(Path);
+
+                throw new InvalidFormatException($"{Path} is not a valid archive");
+            }
 
             if (Stream is MemoryStream memoryStream)
             {
@@ -70,23 +79,6 @@ namespace osu.Game.Database
                 File.Delete(Path);
         }
 
-        /// <summary>
-        /// Creates an <see cref="ArchiveReader"/> from a valid storage path.
-        /// </summary>
-        /// <param name="path">A file or folder path resolving the archive content.</param>
-        /// <returns>A reader giving access to the archive's content.</returns>
-        private ArchiveReader getReaderFromPath(string path)
-        {
-            if (ZipUtils.IsZipArchive(path))
-                return new ZipArchiveReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read), System.IO.Path.GetFileName(path));
-            if (Directory.Exists(path))
-                return new DirectoryArchiveReader(path);
-            if (File.Exists(path))
-                return new SingleFileArchiveReader(path);
-
-            throw new InvalidFormatException($"{path} is not a valid archive");
-        }
-
         public override string ToString() => System.IO.Path.GetFileName(Path);
     }
 }

From 7bf0a22112bbd2d48bdef9f2f8d41dd804a5ad62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 13:57:56 +0900
Subject: [PATCH 0561/2296] Improve flash effect

---
 .../Mods/ModFooterInformationDisplay.cs       |  8 ++--
 .../Overlays/Mods/ScoreMultiplierDisplay.cs   | 40 ++++++++++++++-----
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
index ca9c13e75f..f4a277eb63 100644
--- a/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Mods
         protected Box FrontBackground { get; private set; } = null!;
 
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
+        protected OverlayColourProvider ColourProvider { get; private set; } = null!;
 
         private const float transition_duration = 250;
 
@@ -105,9 +105,9 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            MainBackground.Colour = colourProvider.Background4;
-            FrontBackground.Colour = colourProvider.Background3;
-            Color4 glowColour = colourProvider.Background1;
+            MainBackground.Colour = ColourProvider.Background4;
+            FrontBackground.Colour = ColourProvider.Background3;
+            Color4 glowColour = ColourProvider.Background1;
 
             Content.BorderColour = ColourInfo.GradientVertical(MainBackground.Colour, glowColour);
             innerContent.BorderColour = ColourInfo.GradientVertical(FrontBackground.Colour, glowColour);
diff --git a/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
index 2b075442e4..c758632392 100644
--- a/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
@@ -7,6 +7,7 @@ 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.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
@@ -15,7 +16,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -38,11 +38,10 @@ namespace osu.Game.Overlays.Mods
 
         private RollingCounter<double> counter = null!;
 
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
+        private Box flashLayer = null!;
 
         [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
+        private OsuColour colours { get; set; } = null!;
 
         public ScoreMultiplierDisplay()
         {
@@ -53,6 +52,27 @@ namespace osu.Game.Overlays.Mods
         [BackgroundDependencyLoader]
         private void load()
         {
+            // You would think that we could add this to `Content`, but borders don't mix well
+            // with additive blending children elements.
+            AddInternal(new Container
+            {
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
+                RelativeSizeAxes = Axes.Both,
+                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                CornerRadius = ShearedButton.CORNER_RADIUS,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    flashLayer = new Box
+                    {
+                        Alpha = 0,
+                        Blending = BlendingParameters.Additive,
+                        RelativeSizeAxes = Axes.Both,
+                    }
+                }
+            });
+
             LeftContent.AddRange(new Drawable[]
             {
                 new OsuSpriteText
@@ -92,22 +112,24 @@ namespace osu.Game.Overlays.Mods
                 {
                     MainBackground
                         .FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
-                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    counter.FadeColour(ColourProvider.Background5, transition_duration, Easing.OutQuint);
                 }
                 else if (e.NewValue < Current.Default)
                 {
                     MainBackground
                         .FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
-                    counter.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    counter.FadeColour(ColourProvider.Background5, transition_duration, Easing.OutQuint);
                 }
                 else
                 {
-                    MainBackground.FadeColour(colourProvider.Background4, transition_duration, Easing.OutQuint);
+                    MainBackground.FadeColour(ColourProvider.Background4, transition_duration, Easing.OutQuint);
                     counter.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
                 }
 
-                if (e.NewValue != Current.Default)
-                    MainBackground.FlashColour(Color4.White, 500, Easing.OutQuint);
+                flashLayer
+                    .FadeOutFromOne()
+                    .FadeTo(0.15f, 60, Easing.OutQuint)
+                    .Then().FadeOut(500, Easing.OutQuint);
 
                 const float move_amount = 4;
                 if (e.NewValue > e.OldValue)

From 68323671ec689160ffc4790e8fd84a573979c3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Sep 2023 08:24:18 +0200
Subject: [PATCH 0562/2296] Update framework and resources

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

diff --git a/osu.Android.props b/osu.Android.props
index 2bfdce5ab8..10cee77b09 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.904.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.914.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 052528f93b..d109345518 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,8 +36,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.1.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.904.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.822.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.914.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
     <PackageReference Include="Sentry" Version="3.28.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 760ea2e31e..b754b156b3 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.904.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.914.0" />
   </ItemGroup>
 </Project>

From 900376b662ab31b975cda9d6cd4e21dca72e4932 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 16:06:59 +0900
Subject: [PATCH 0563/2296] Refactor storyboard resource lookup to be more
 streamlined

---
 .../Drawables/DrawableStoryboard.cs           | 53 ++++++++++++++++---
 .../Drawables/DrawableStoryboardAnimation.cs  |  6 +--
 .../Drawables/DrawableStoryboardSprite.cs     |  2 +-
 osu.Game/Storyboards/Storyboard.cs            | 13 ++---
 4 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index e674e7512c..6931cea81e 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -1,22 +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 System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
-using osuTK;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
+using osuTK;
 
 namespace osu.Game.Storyboards.Drawables
 {
@@ -57,12 +58,18 @@ namespace osu.Game.Storyboards.Drawables
         [Cached(typeof(IReadOnlyList<Mod>))]
         public IReadOnlyList<Mod> Mods { get; }
 
-        private DependencyContainer dependencies;
+        [Resolved]
+        private GameHost host { get; set; } = null!;
+
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
+
+        private DependencyContainer dependencies = null!;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-        public DrawableStoryboard(Storyboard storyboard, IReadOnlyList<Mod> mods = null)
+        public DrawableStoryboard(Storyboard storyboard, IReadOnlyList<Mod>? mods = null)
         {
             Storyboard = storyboard;
             Mods = mods ?? Array.Empty<Mod>();
@@ -85,12 +92,15 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(IGameplayClock clock, CancellationToken? cancellationToken, GameHost host, RealmAccess realm)
+        private void load(IGameplayClock? clock, CancellationToken? cancellationToken)
         {
             if (clock != null)
                 Clock = clock;
 
-            dependencies.Cache(new TextureStore(host.Renderer, host.CreateTextureLoaderStore(new RealmFileStore(realm, host.Storage).Store), false, scaleAdjust: 1));
+            dependencies.CacheAs(typeof(TextureStore),
+                new TextureStore(host.Renderer, host.CreateTextureLoaderStore(
+                    CreateResourceLookupStore()
+                ), false, scaleAdjust: 1));
 
             foreach (var layer in Storyboard.Layers)
             {
@@ -102,6 +112,8 @@ namespace osu.Game.Storyboards.Drawables
             lastEventEndTime = Storyboard.LatestEventTime;
         }
 
+        protected virtual IResourceStore<byte[]> CreateResourceLookupStore() => new StoryboardResourceLookupStore(Storyboard, realm, host);
+
         protected override void Update()
         {
             base.Update();
@@ -115,5 +127,32 @@ namespace osu.Game.Storyboards.Drawables
             foreach (var layer in Children)
                 layer.Enabled = passing ? layer.Layer.VisibleWhenPassing : layer.Layer.VisibleWhenFailing;
         }
+
+        private class StoryboardResourceLookupStore : IResourceStore<byte[]>
+        {
+            private readonly IResourceStore<byte[]> realmFileStore;
+            private readonly Storyboard storyboard;
+
+            public StoryboardResourceLookupStore(Storyboard storyboard, RealmAccess realm, GameHost host)
+            {
+                realmFileStore = new RealmFileStore(realm, host.Storage).Store;
+                this.storyboard = storyboard;
+            }
+
+            public void Dispose() =>
+                realmFileStore.Dispose();
+
+            public byte[] Get(string name) =>
+                realmFileStore.Get(storyboard.GetStoragePathFromStoryboardPath(name));
+
+            public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken()) =>
+                realmFileStore.GetAsync(storyboard.GetStoragePathFromStoryboardPath(name), cancellationToken);
+
+            public Stream GetStream(string name) =>
+                realmFileStore.GetStream(storyboard.GetStoragePathFromStoryboardPath(name));
+
+            public IEnumerable<string> GetAvailableResources() =>
+                realmFileStore.GetAvailableResources();
+        }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 82c01ea6a1..054a50456b 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -99,15 +99,13 @@ namespace osu.Game.Storyboards.Drawables
         {
             int frameIndex = 0;
 
-            Texture frameTexture = storyboard.GetTextureFromPath(getFramePath(frameIndex), textureStore);
+            Texture frameTexture = textureStore.Get(getFramePath(frameIndex));
 
             if (frameTexture != null)
             {
                 // sourcing from storyboard.
                 for (frameIndex = 0; frameIndex < Animation.FrameCount; frameIndex++)
-                {
-                    AddFrame(storyboard.GetTextureFromPath(getFramePath(frameIndex), textureStore), Animation.FrameDelay);
-                }
+                    AddFrame(textureStore.Get(getFramePath(frameIndex)), Animation.FrameDelay);
             }
             else if (storyboard.UseSkinSprites)
             {
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index ec0cb7ca19..379de1a497 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Storyboards.Drawables
         [BackgroundDependencyLoader]
         private void load(TextureStore textureStore, Storyboard storyboard)
         {
-            Texture = storyboard.GetTextureFromPath(Sprite.Path, textureStore);
+            Texture = textureStore.Get(Sprite.Path);
 
             if (Texture == null && storyboard.UseSkinSprites)
             {
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 566e064aad..1892855d3d 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Storyboards.Drawables;
@@ -92,7 +91,7 @@ namespace osu.Game.Storyboards
 
         private static readonly string[] image_extensions = { @".png", @".jpg" };
 
-        public Texture? GetTextureFromPath(string path, TextureStore textureStore)
+        public virtual string? GetStoragePathFromStoryboardPath(string path)
         {
             string? resolvedPath = null;
 
@@ -102,10 +101,7 @@ namespace osu.Game.Storyboards
             }
             else
             {
-                // Just doing this extension logic locally here for simplicity.
-                //
-                // A more "sane" path may be to use the ISkinSource.GetTexture path (which will use the extensions of the underlying TextureStore),
-                // but comes with potential complexity (what happens if the user has beatmap skins disabled?).
+                // Some old storyboards don't include a file extension, so let's best guess at one.
                 foreach (string ext in image_extensions)
                 {
                     if ((resolvedPath = BeatmapInfo.BeatmapSet?.GetPathForFile($"{path}{ext}")) != null)
@@ -113,10 +109,7 @@ namespace osu.Game.Storyboards
                 }
             }
 
-            if (!string.IsNullOrEmpty(resolvedPath))
-                return textureStore.Get(resolvedPath);
-
-            return null;
+            return resolvedPath;
         }
     }
 }

From 46126719ebb3d6c56fc479bb097eb9fecf5caaa2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 16:57:17 +0900
Subject: [PATCH 0564/2296] Fix slider tests not correctly passing slider
 velocity to slideres

---
 .../TestSceneSlider.cs                        | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index 4ad78a3190..6c78ac51b4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -19,7 +19,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Testing;
-using osu.Game.Beatmaps.Legacy;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Judgements;
@@ -206,7 +205,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 StackHeight = 10
             };
 
-            return createDrawable(slider, 2, 2);
+            return createDrawable(slider, 2);
         }
 
         private Drawable testSimpleMedium(int repeats = 0) => createSlider(5, repeats: repeats);
@@ -229,6 +228,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             var slider = new Slider
             {
+                SliderVelocityMultiplier = speedMultiplier,
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(0, -(distance / 2)),
                 Path = new SliderPath(PathType.PerfectCurve, new[]
@@ -240,7 +240,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 StackHeight = stackHeight
             };
 
-            return createDrawable(slider, circleSize, speedMultiplier);
+            return createDrawable(slider, circleSize);
         }
 
         private Drawable testPerfect(int repeats = 0)
@@ -258,7 +258,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 RepeatCount = repeats,
             };
 
-            return createDrawable(slider, 2, 3);
+            return createDrawable(slider, 2);
         }
 
         private Drawable testLinear(int repeats = 0) => createLinear(repeats);
@@ -281,7 +281,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 RepeatCount = repeats,
             };
 
-            return createDrawable(slider, 2, 3);
+            return createDrawable(slider, 2);
         }
 
         private Drawable testBezier(int repeats = 0) => createBezier(repeats);
@@ -303,7 +303,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 RepeatCount = repeats,
             };
 
-            return createDrawable(slider, 2, 3);
+            return createDrawable(slider, 2);
         }
 
         private Drawable testLinearOverlapping(int repeats = 0) => createOverlapping(repeats);
@@ -326,7 +326,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 RepeatCount = repeats,
             };
 
-            return createDrawable(slider, 2, 3);
+            return createDrawable(slider, 2);
         }
 
         private Drawable testCatmull(int repeats = 0) => createCatmull(repeats);
@@ -352,15 +352,12 @@ namespace osu.Game.Rulesets.Osu.Tests
                 NodeSamples = repeatSamples
             };
 
-            return createDrawable(slider, 3, 1);
+            return createDrawable(slider, 3);
         }
 
-        private Drawable createDrawable(Slider slider, float circleSize, double speedMultiplier)
+        private Drawable createDrawable(Slider slider, float circleSize)
         {
-            var cpi = new LegacyControlPointInfo();
-            cpi.Add(0, new DifficultyControlPoint { SliderVelocity = speedMultiplier });
-
-            slider.ApplyDefaults(cpi, new BeatmapDifficulty
+            slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty
             {
                 CircleSize = circleSize,
                 SliderTickRate = 3

From e3e7a81ad9f88936ae6a58e7a3402e8716dc590d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 16:58:47 +0900
Subject: [PATCH 0565/2296] Remove slider head circle movement (and remove
 setting from "classic" mod)

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   |  4 ---
 .../Objects/Drawables/DrawableSliderHead.cs   | 25 -------------------
 .../Skinning/Default/PlaySliderBody.cs        | 16 ------------
 3 files changed, 45 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 0148ec1987..8930b4ad70 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -25,9 +25,6 @@ namespace osu.Game.Rulesets.Osu.Mods
         [SettingSource("No slider head accuracy requirement", "Scores sliders proportionally to the number of ticks hit.")]
         public Bindable<bool> NoSliderHeadAccuracy { get; } = new BindableBool(true);
 
-        [SettingSource("No slider head movement", "Pins slider heads at their starting position, regardless of time.")]
-        public Bindable<bool> NoSliderHeadMovement { get; } = new BindableBool(true);
-
         [SettingSource("Apply classic note lock", "Applies note lock to the full hit window.")]
         public Bindable<bool> ClassicNoteLock { get; } = new BindableBool(true);
 
@@ -71,7 +68,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             switch (obj)
             {
                 case DrawableSliderHead head:
-                    head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                     if (FadeHitCircleEarly.Value && !usingHiddenFading)
                         applyEarlyFading(head);
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 41f6a40c0a..2dea05da2f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -3,11 +3,9 @@
 
 #nullable disable
 
-using System;
 using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 
@@ -24,12 +22,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => HitObject?.JudgeAsNormalHitCircle ?? base.DisplayResult;
 
-        /// <summary>
-        /// Makes this <see cref="DrawableSliderHead"/> track the follow circle when the start time is reached.
-        /// If <c>false</c>, this <see cref="DrawableSliderHead"/> will be pinned to its initial position in the slider.
-        /// </summary>
-        public bool TrackFollowCircle = true;
-
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
         protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
@@ -64,23 +56,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             CheckHittable = (d, t, r) => DrawableSlider.CheckHittable?.Invoke(d, t, r) ?? ClickAction.Hit;
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            Debug.Assert(Slider != null);
-            Debug.Assert(HitObject != null);
-
-            if (TrackFollowCircle)
-            {
-                double completionProgress = Math.Clamp((Time.Current - Slider.StartTime) / Slider.Duration, 0, 1);
-
-                //todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
-                if (!IsHit)
-                    Position = Slider.CurvePositionAt(completionProgress);
-            }
-        }
-
         protected override HitResult ResultFor(double timeOffset)
         {
             Debug.Assert(HitObject != null);
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index 539777dd6b..aa507cbaf0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -46,22 +46,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
             BorderSize = skin.GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.SliderBorderSize)?.Value ?? 1;
             BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White;
-
-            drawableObject.HitObjectApplied += onHitObjectApplied;
-        }
-
-        private void onHitObjectApplied(DrawableHitObject obj)
-        {
-            var drawableSlider = (DrawableSlider)obj;
-            if (drawableSlider.HitObject == null)
-                return;
-
-            // When not tracking the follow circle, unbind from the config and forcefully disable snaking out - it looks better that way.
-            if (!drawableSlider.HeadCircle.TrackFollowCircle)
-            {
-                SnakingOut.UnbindFrom(configSnakingOut);
-                SnakingOut.Value = false;
-            }
         }
 
         protected virtual Color4 GetBodyAccentColour(ISkinSource skin, Color4 hitObjectAccentColour) =>

From 1ef0c92962a54b7173e6d4211129015f0b9d3742 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 17:23:57 +0900
Subject: [PATCH 0566/2296] Inverse snaking toggle

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index 6c78ac51b4..7a38e72bc9 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -34,16 +34,16 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         private int depthIndex;
 
-        private readonly BindableBool snakingIn = new BindableBool();
-        private readonly BindableBool snakingOut = new BindableBool();
+        private readonly BindableBool snakingIn = new BindableBool(true);
+        private readonly BindableBool snakingOut = new BindableBool(true);
 
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddToggleStep("toggle snaking", v =>
+            AddToggleStep("disable snaking", v =>
             {
-                snakingIn.Value = v;
-                snakingOut.Value = v;
+                snakingIn.Value = !v;
+                snakingOut.Value = !v;
             });
         }
 

From ec824140900bb03a0502903e88f64e6144310907 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 17:49:22 +0900
Subject: [PATCH 0567/2296] Allow testing hitting sliders are certain points in
 tests

---
 .../TestSceneSlider.cs                        | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index 7a38e72bc9..e005d7cac3 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Audio;
@@ -37,14 +38,22 @@ namespace osu.Game.Rulesets.Osu.Tests
         private readonly BindableBool snakingIn = new BindableBool(true);
         private readonly BindableBool snakingOut = new BindableBool(true);
 
-        [SetUpSteps]
-        public void SetUpSteps()
+        private float progressToHit;
+
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             AddToggleStep("disable snaking", v =>
             {
                 snakingIn.Value = !v;
                 snakingOut.Value = !v;
             });
+
+            AddSliderStep("hit at", 0f, 1f, 0f, v =>
+            {
+                progressToHit = v;
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -55,6 +64,18 @@ namespace osu.Game.Rulesets.Osu.Tests
             config.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            foreach (var slider in this.ChildrenOfType<DrawableSlider>())
+            {
+                double completionProgress = Math.Clamp((Time.Current - slider.HitObject.StartTime) / slider.HitObject.Duration, 0, 1);
+                if (completionProgress > progressToHit && !slider.IsHit)
+                    slider.HeadCircle.HitArea.Hit();
+            }
+        }
+
         [Test]
         public void TestVariousSliders()
         {

From cf9ca60b0902ae267aac8d50d46e934deb5759ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 17:49:38 +0900
Subject: [PATCH 0568/2296] Change slider body to not animate snaking until
 head circle is (successfully) hit

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 01174d4d61..09d98654c3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             double completionProgress = Math.Clamp((Time.Current - HitObject.StartTime) / HitObject.Duration, 0, 1);
 
             Ball.UpdateProgress(completionProgress);
-            SliderBody?.UpdateProgress(completionProgress);
+            SliderBody?.UpdateProgress(HeadCircle.IsHit ? completionProgress : 0);
 
             foreach (DrawableHitObject hitObject in NestedHitObjects)
             {

From 25dbd0a1d38caae7fe00266ecde01dbc03d4fa28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Sep 2023 11:24:53 +0200
Subject: [PATCH 0569/2296] Rename variable to reflect new "beatmap attributes
 display" naming

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a18ee65612..4ebb622bb6 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -356,9 +356,9 @@ namespace osu.Game.Overlays.Mods
 
                 // this is cheating a bit; the 640 value is hardcoded based on how wide the expanded panel _generally_ is.
                 // due to the transition applied, the raw screenspace quad of the panel cannot be used, as it will trigger an ugly feedback cycle of expanding and collapsing.
-                float projectedLeftEdgeOfExpandedModEffectPreviewPanel = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(640, 0)).X;
+                float projectedLeftEdgeOfExpandedBeatmapAttributesDisplay = footerButtonFlow.ToScreenSpace(footerButtonFlow.DrawSize - new Vector2(640, 0)).X;
 
-                bool screenIsntWideEnough = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedModEffectPreviewPanel;
+                bool screenIsntWideEnough = rightEdgeOfLastButton > projectedLeftEdgeOfExpandedBeatmapAttributesDisplay;
 
                 // only update preview panel's collapsed state after we are fully visible, to ensure all the buttons are where we expect them to be.
                 if (Alpha == 1)

From 94cdcfd7ce845ba8010fbc829d56443196903bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Sep 2023 14:56:58 +0200
Subject: [PATCH 0570/2296] Move collapsed bindable back to
 `BeatmapAttributesDisplay` for now

Better to have it only in one place that needs it, rather than have it
not work as expected when someone inherits
`ModFooterInformationDisplay`.
---
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 46 +++++++++++++++++--
 .../Mods/ModFooterInformationDisplay.cs       | 44 ------------------
 2 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 8828e017fd..44c29e313b 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
 using osuTK;
 using System.Threading;
+using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Mods
@@ -39,6 +40,8 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
+        public BindableBool Collapsed { get; } = new BindableBool(true);
+
         private ModSettingChangeTracker? modSettingChangeTracker;
 
         [Resolved]
@@ -47,10 +50,7 @@ namespace osu.Game.Overlays.Mods
         private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
-        public BeatmapAttributesDisplay()
-        {
-            Collapsed.Value = true;
-        }
+        private const float transition_duration = 250;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -75,6 +75,7 @@ namespace osu.Game.Overlays.Mods
                 }
             });
 
+            RightContent.Alpha = 0;
             RightContent.AddRange(new Drawable[]
             {
                 circleSizeDisplay = new VerticalAttributeDisplay("CS") { Shear = new Vector2(-shear, 0), },
@@ -98,6 +99,43 @@ namespace osu.Game.Overlays.Mods
             }, true);
 
             BeatmapInfo.BindValueChanged(_ => updateValues(), true);
+
+            Collapsed.BindValueChanged(_ =>
+            {
+                // Only start autosize animations on first collapse toggle. This avoids an ugly initial presentation.
+                startAnimating();
+                updateCollapsedState();
+            });
+
+            updateCollapsedState();
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            startAnimating();
+            updateCollapsedState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            updateCollapsedState();
+            base.OnHoverLost(e);
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
+
+        private void startAnimating()
+        {
+            Content.AutoSizeEasing = Easing.OutQuint;
+            Content.AutoSizeDuration = transition_duration;
+        }
+
+        private void updateCollapsedState()
+        {
+            RightContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
         }
 
         private void updateValues() => Scheduler.AddOnce(() =>
diff --git a/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
index ca9c13e75f..b55717fc17 100644
--- a/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModFooterInformationDisplay.cs
@@ -2,12 +2,10 @@
 // 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.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
@@ -20,8 +18,6 @@ namespace osu.Game.Overlays.Mods
         protected FillFlowContainer RightContent { get; private set; } = null!;
         protected Container Content { get; private set; } = null!;
 
-        public BindableBool Collapsed { get; } = new BindableBool();
-
         private Container innerContent = null!;
 
         protected Box MainBackground { get; private set; } = null!;
@@ -30,8 +26,6 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
-        private const float transition_duration = 250;
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -88,7 +82,6 @@ namespace osu.Game.Overlays.Mods
                             },
                             RightContent = new FillFlowContainer
                             {
-                                Alpha = 0,
                                 Origin = Anchor.CentreLeft,
                                 Anchor = Anchor.CentreLeft,
                                 AutoSizeAxes = Axes.X,
@@ -111,43 +104,6 @@ namespace osu.Game.Overlays.Mods
 
             Content.BorderColour = ColourInfo.GradientVertical(MainBackground.Colour, glowColour);
             innerContent.BorderColour = ColourInfo.GradientVertical(FrontBackground.Colour, glowColour);
-
-            Collapsed.BindValueChanged(_ =>
-            {
-                // Only start autosize animations on first collapse toggle. This avoids an ugly initial presentation.
-                startAnimating();
-                updateCollapsedState();
-            });
-
-            updateCollapsedState();
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            startAnimating();
-            updateCollapsedState();
-            return true;
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            updateCollapsedState();
-            base.OnHoverLost(e);
-        }
-
-        protected override bool OnMouseDown(MouseDownEvent e) => true;
-
-        protected override bool OnClick(ClickEvent e) => true;
-
-        private void startAnimating()
-        {
-            Content.AutoSizeEasing = Easing.OutQuint;
-            Content.AutoSizeDuration = transition_duration;
-        }
-
-        private void updateCollapsedState()
-        {
-            RightContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
         }
     }
 }

From 57f32b177dbecff2c10cceeaef82e7bc6243d931 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 22:19:18 +0900
Subject: [PATCH 0571/2296] Fix incorrect handling of non-`MemoryStream`
 pathway

---
 osu.Game/Database/ImportTask.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index 6d432aac25..f02f12f8b7 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -58,16 +58,14 @@ namespace osu.Game.Database
                 throw new InvalidFormatException($"{Path} is not a valid archive");
             }
 
-            if (Stream is MemoryStream memoryStream)
-            {
-                if (ZipUtils.IsZipArchive(memoryStream))
-                    return new ZipArchiveReader(memoryStream, Path);
+            if (Stream is not MemoryStream memoryStream)
+                // Path used primarily in tests (converting `ManifestResourceStream`s to `MemoryStream`s).
+                memoryStream = new MemoryStream(Stream.ReadAllBytesToArray());
 
-                return new MemoryStreamArchiveReader(memoryStream, Path);
-            }
+            if (ZipUtils.IsZipArchive(memoryStream))
+                return new ZipArchiveReader(memoryStream, Path);
 
-            // This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
-            return new ByteArrayArchiveReader(Stream.ReadAllBytesToArray(), Path);
+            return new MemoryStreamArchiveReader(memoryStream, Path);
         }
 
         /// <summary>

From 66751ef5bbd21e5426815795917216506cf36069 Mon Sep 17 00:00:00 2001
From: Lukynka CZE <lukynka@capollomedia.com>
Date: Thu, 14 Sep 2023 17:46:29 +0200
Subject: [PATCH 0572/2296] add regex

---
 osu.Game/Online/Chat/MessageFormatter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 10a005d71a..d04d971213 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Online.Chat
         //      http[s]://<domain>.<tld>[:port][/path][?query][#fragment]
         private static readonly Regex advanced_link_regex = new Regex(
             // protocol
-            @"(?<link>[a-z]*?:\/\/" +
+            @"(?<link>(https?|osu)[a-z]*?://" +
             // domain + tld
             @"(?<domain>(?:[a-z0-9]\.|[a-z0-9][a-z0-9-]*[a-z0-9]\.)*[a-z0-9-]*[a-z0-9]" +
             // port (optional)

From 25926af78258e25a32d2bec79d03c8a0fddd17e7 Mon Sep 17 00:00:00 2001
From: Lukynka CZE <lukynka@capollomedia.com>
Date: Thu, 14 Sep 2023 17:46:42 +0200
Subject: [PATCH 0573/2296] add unit test

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 47f4410b07..f0dcd527a4 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -32,8 +32,17 @@ namespace osu.Game.Tests.Chat
             Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a gopher://really-old-protocol we don't support." });
 
             Assert.AreEqual(result.Content, result.DisplayContent);
-            Assert.AreEqual(1, result.Links.Count);
-            Assert.AreEqual("gopher://really-old-protocol", result.Links[0].Url);
+            Assert.AreEqual(0, result.Links.Count);
+        }
+
+        [Test]
+        public void TestSupportedProtocolLinkParsing()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "forgotspacehttps://dev.ppy.sh joinmyosump://12345 jointheosu://chan/#english" });
+
+            Assert.AreEqual("https://dev.ppy.sh", result.Links[0].Url);
+            Assert.AreEqual("osump://12345", result.Links[1].Url);
+            Assert.AreEqual("osu://chan/#english", result.Links[2].Url);
         }
 
         [Test]

From 2a18f76b026441189224c5c61a9737ff06c7aea1 Mon Sep 17 00:00:00 2001
From: Lukynka CZE <lukynka@capollomedia.com>
Date: Thu, 14 Sep 2023 17:48:10 +0200
Subject: [PATCH 0574/2296] add visual test

---
 osu.Game.Tests/Visual/Online/TestSceneChatLink.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index ecf9b68297..7616b9b83c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -64,6 +64,9 @@ namespace osu.Game.Tests.Visual.Online
             addMessageWithChecks("test!");
             addMessageWithChecks("dev.ppy.sh!");
             addMessageWithChecks("https://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("http://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("forgothttps://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("forgothttp://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
             addMessageWithChecks("00:12:345 (1,2) - Test?", 1, expectedActions: LinkAction.OpenEditorTimestamp);
             addMessageWithChecks("Wiki link for tasty [[Performance Points]]", 1, expectedActions: LinkAction.OpenWiki);
             addMessageWithChecks("(osu forums)[https://dev.ppy.sh/forum] (old link format)", 1, expectedActions: LinkAction.External);
@@ -84,9 +87,11 @@ namespace osu.Game.Tests.Visual.Online
             addMessageWithChecks("feels important", 0, true, true);
             addMessageWithChecks("likes to post this [https://dev.ppy.sh/home link].", 1, true, true, expectedActions: LinkAction.External);
             addMessageWithChecks("Join my multiplayer game osump://12346.", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
+            addMessageWithChecks("Join my multiplayer gameosump://12346.", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
             addMessageWithChecks("Join my [multiplayer game](osump://12346).", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
             addMessageWithChecks($"Join my [#english]({OsuGameBase.OSU_PROTOCOL}chan/#english).", 1, expectedActions: LinkAction.OpenChannel);
             addMessageWithChecks($"Join my {OsuGameBase.OSU_PROTOCOL}chan/#english.", 1, expectedActions: LinkAction.OpenChannel);
+            addMessageWithChecks($"Join my{OsuGameBase.OSU_PROTOCOL}chan/#english.", 1, expectedActions: LinkAction.OpenChannel);
             addMessageWithChecks("Join my #english or #japanese channels.", 2, expectedActions: new[] { LinkAction.OpenChannel, LinkAction.OpenChannel });
             addMessageWithChecks("Join my #english or #nonexistent #hashtag channels.", 1, expectedActions: LinkAction.OpenChannel);
             addMessageWithChecks("Hello world\uD83D\uDE12(<--This is an emoji). There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20");

From 9b8fdcbcdc7fef881d9804cd4afc93c4a448536b Mon Sep 17 00:00:00 2001
From: Lukynka CZE <lukynka@capollomedia.com>
Date: Thu, 14 Sep 2023 17:55:53 +0200
Subject: [PATCH 0575/2296] somehow accidentally removed backslashes

---
 osu.Game/Online/Chat/MessageFormatter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index d04d971213..db4d0b1363 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Online.Chat
         //      http[s]://<domain>.<tld>[:port][/path][?query][#fragment]
         private static readonly Regex advanced_link_regex = new Regex(
             // protocol
-            @"(?<link>(https?|osu)[a-z]*?://" +
+            @"(?<link>(https?|osu)[a-z]*?:\/\/" +
             // domain + tld
             @"(?<domain>(?:[a-z0-9]\.|[a-z0-9][a-z0-9-]*[a-z0-9]\.)*[a-z0-9-]*[a-z0-9]" +
             // port (optional)

From c8b18acd4dd1d98170a069240b6666cea3d5da07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Sep 2023 19:36:33 +0200
Subject: [PATCH 0576/2296] Bring back disposal of stream after copy-out to
 `MemoryStream`

Was there in previous code and got removed in the refactor. I'd rather
have it than not.
---
 osu.Game/Database/ImportTask.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Database/ImportTask.cs b/osu.Game/Database/ImportTask.cs
index f02f12f8b7..8f2752020b 100644
--- a/osu.Game/Database/ImportTask.cs
+++ b/osu.Game/Database/ImportTask.cs
@@ -59,8 +59,11 @@ namespace osu.Game.Database
             }
 
             if (Stream is not MemoryStream memoryStream)
+            {
                 // Path used primarily in tests (converting `ManifestResourceStream`s to `MemoryStream`s).
                 memoryStream = new MemoryStream(Stream.ReadAllBytesToArray());
+                Stream.Dispose();
+            }
 
             if (ZipUtils.IsZipArchive(memoryStream))
                 return new ZipArchiveReader(memoryStream, Path);

From ed295effc5206fcb347d2e73cadc5c5abb9251db Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Sep 2023 15:51:05 +0900
Subject: [PATCH 0577/2296] Maximise bonus score

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 03c6876bae..f92bf6f5ea 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -130,8 +130,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     // We'll redo the calculations to match osu-stable here...
                     const double maximum_rotations_per_second = 477.0 / 60;
 
-                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that minimises bonus score.
-                    const double minimum_rotations_per_second = 7.5;
+                    // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that maximises bonus score.
+                    const double minimum_rotations_per_second = 3;
 
                     double secondsDuration = spinner.Duration / 1000;
 

From 0031da76ffa68b8d7e3a7eae1155393e2ec85cf7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Sep 2023 17:38:34 +0900
Subject: [PATCH 0578/2296] Move to extension method and throw on non-legacy
 ruleset

---
 .../Legacy/DistanceObjectPatternGenerator.cs  |  1 +
 .../Beatmaps/TaikoBeatmapConverter.cs         |  1 +
 .../Objects/Legacy/LegacyRulesetExtensions.cs | 42 +++++++++++++++++++
 .../Objects/Types/IHasSliderVelocity.cs       | 27 ------------
 4 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 476bcda36f..07df79783c 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Utils;
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index ff6809e69a..054ae9a011 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -14,6 +14,7 @@ using JetBrains.Annotations;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
+using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Rulesets.Taiko.Beatmaps
 {
diff --git a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
new file mode 100644
index 0000000000..0bce269668
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.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.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Rulesets.Objects.Legacy
+{
+    public static class LegacyRulesetExtensions
+    {
+        /// <summary>
+        /// Introduces floating-point errors to post-multiplied beat length for legacy rulesets that depend on it.
+        /// You should definitely not use this unless you know exactly what you're doing.
+        /// </summary>
+        public static double GetPrecisionAdjustedBeatLength(this IHasSliderVelocity hasSliderVelocity, TimingControlPoint timingControlPoint, string rulesetShortName)
+        {
+            double sliderVelocityAsBeatLength = -100 / hasSliderVelocity.SliderVelocityMultiplier;
+
+            // Note: In stable, the division occurs on floats, but with compiler optimisations turned on actually seems to occur on doubles via some .NET black magic (possibly inlining?).
+            double bpmMultiplier;
+
+            switch (rulesetShortName)
+            {
+                case "taiko":
+                case "mania":
+                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 10000) / 100.0 : 1;
+                    break;
+
+                case "osu":
+                case "fruits":
+                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 1000) / 100.0 : 1;
+                    break;
+
+                default:
+                    throw new ArgumentException("Must be a legacy ruleset", nameof(rulesetShortName));
+            }
+
+            return timingControlPoint.BeatLength * bpmMultiplier;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
index 73582b8fdc..e665dcc752 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasSliderVelocity.cs
@@ -1,9 +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 osu.Framework.Bindables;
-using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
@@ -18,30 +16,5 @@ namespace osu.Game.Rulesets.Objects.Types
         double SliderVelocityMultiplier { get; set; }
 
         BindableNumber<double> SliderVelocityMultiplierBindable { get; }
-
-        /// <summary>
-        /// Introduces floating-point errors to post-multiplied beat length for rulesets that depend on it.
-        /// </summary>
-        public double GetPrecisionAdjustedBeatLength(TimingControlPoint timingControlPoint, string rulesetShortName)
-        {
-            double sliderVelocityAsBeatLength = -100 / SliderVelocityMultiplier;
-
-            // Note: In stable, the division occurs on floats, but with compiler optimisations turned on actually seems to occur on doubles via some .NET black magic (possibly inlining?).
-            double bpmMultiplier;
-
-            switch (rulesetShortName)
-            {
-                case "taiko":
-                case "mania":
-                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 10000) / 100.0 : 1;
-                    break;
-
-                default:
-                    bpmMultiplier = sliderVelocityAsBeatLength < 0 ? Math.Clamp((float)-sliderVelocityAsBeatLength, 10, 1000) / 100.0 : 1;
-                    break;
-            }
-
-            return timingControlPoint.BeatLength * bpmMultiplier;
-        }
     }
 }

From 56cc2b62f01c930d433a25c4cd65402c0ec2396d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Sep 2023 18:13:04 +0900
Subject: [PATCH 0579/2296] Make not extension method

---
 .../Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs  | 2 +-
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs       | 2 +-
 osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 07df79783c..cce0944564 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             double beatLength;
 
             if (hitObject is IHasSliderVelocity hasSliderVelocity)
-                beatLength = hasSliderVelocity.GetPrecisionAdjustedBeatLength(timingPoint, ManiaRuleset.SHORT_NAME);
+                beatLength = LegacyRulesetExtensions.GetPrecisionAdjustedBeatLength(hasSliderVelocity, timingPoint, ManiaRuleset.SHORT_NAME);
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 054ae9a011..e46e2ec09c 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             double beatLength;
 
             if (obj is IHasSliderVelocity hasSliderVelocity)
-                beatLength = hasSliderVelocity.GetPrecisionAdjustedBeatLength(timingPoint, TaikoRuleset.SHORT_NAME);
+                beatLength = LegacyRulesetExtensions.GetPrecisionAdjustedBeatLength(hasSliderVelocity, timingPoint, TaikoRuleset.SHORT_NAME);
             else
                 beatLength = timingPoint.BeatLength;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
index 0bce269668..6cff4b12c4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// Introduces floating-point errors to post-multiplied beat length for legacy rulesets that depend on it.
         /// You should definitely not use this unless you know exactly what you're doing.
         /// </summary>
-        public static double GetPrecisionAdjustedBeatLength(this IHasSliderVelocity hasSliderVelocity, TimingControlPoint timingControlPoint, string rulesetShortName)
+        public static double GetPrecisionAdjustedBeatLength(IHasSliderVelocity hasSliderVelocity, TimingControlPoint timingControlPoint, string rulesetShortName)
         {
             double sliderVelocityAsBeatLength = -100 / hasSliderVelocity.SliderVelocityMultiplier;
 

From 2abef4ade5d9b7d63a9d1cb2da5172c74aff9e9b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Sep 2023 18:35:17 +0900
Subject: [PATCH 0580/2296] Expand comment to justify maximising bonus score
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index f92bf6f5ea..952ffa5e7a 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -131,6 +131,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     const double maximum_rotations_per_second = 477.0 / 60;
 
                     // Normally, this value depends on the final overall difficulty. For simplicity, we'll only consider the worst case that maximises bonus score.
+                    // As we're primarily concerned with computing the maximum theoretical final score,
+                    // this will have the final effect of slightly underestimating bonus score achieved on stable when converting from score V1.
                     const double minimum_rotations_per_second = 3;
 
                     double secondsDuration = spinner.Duration / 1000;

From 86c46a5b3f6bebc56b01ce585bf3c01795c68449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Sep 2023 12:07:59 +0200
Subject: [PATCH 0581/2296] Manually reorder objects in expected mapping

The test added in 64baa4d01ae7bb9a2659a83c3e3238d2fbb07ef2 was
previously failing despite applying a fix. This was caused by the fact
that in stable, the last `sliderScoreTimingPoint` (i.e. the
`LegacyLastTick` is pulled back by 36ms, but the list of all of them
is not re-sorted afterwards, causing objects to be exported in
non-chronological order to the resultant conversion mapping.
lazer correctly sorts the objects, causing a false positive.
---
 ...ider-ticks-edge-case-expected-conversion.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
index 657121d812..6d97b643b1 100644
--- a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
@@ -14,20 +14,20 @@
           }
         },
         {
-          "StartTime": 7843.0,
-          "EndTime": 7843.0,
-          "X": 33.7820168,
-          "Y": 208.9957,
+          "StartTime": 7817.0,
+          "EndTime": 7817.0,
+          "X": 30.9946651,
+          "Y": 208.5157,
           "StackOffset": {
             "X": 0.0,
             "Y": 0.0
           }
         },
         {
-          "StartTime": 7817.0,
-          "EndTime": 7817.0,
-          "X": 30.9946651,
-          "Y": 208.5157,
+          "StartTime": 7843.0,
+          "EndTime": 7843.0,
+          "X": 33.7820168,
+          "Y": 208.9957,
           "StackOffset": {
             "X": 0.0,
             "Y": 0.0

From 5c6cd879ddae01fd86b29622d51652847b99a5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Sep 2023 12:21:58 +0200
Subject: [PATCH 0582/2296] Adjust slider calculations to new method API

Code originally read

	Velocity = scoringDistance / beatLength
		 = BASE_SCORING_DISTANCE * SliderMultiplier * GetPrecisionAdjustedSliderVelocityMultiplier() / beatLength

Given (mathematically, floats are not generally as forgiving):

	GetPrecisionAdjustedBeatLength() = beatLength / GetPrecisionAdjustedSliderVelocityMultiplier()

it follows that (inverting both sides):

	1 / GetPrecisionAdjustedBeatLength() = GetPrecisionAdjustedSliderVelocityMultiplier() / beatLength

and therefore

	Velocity = BASE_SCORING_DISTANCE * SliderMultiplier * GetPrecisionAdjustedSliderVelocityMultiplier() / beatLength
		 = BASE_SCORING_DISTANCE * SliderMultiplier / GetPrecisionAdjustedBeatLength()

and to recover `scoringDistance`

	scoringDistance = Velocity * beatLength
---
 osu.Game.Rulesets.Osu/Objects/Slider.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index f40c301220..e05dbd8ea6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -16,6 +16,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
@@ -166,9 +167,11 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
 
-            double scoringDistance = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier * ((IHasSliderVelocity)this).GetPrecisionAdjustedSliderVelocityMultiplier(OsuRuleset.SHORT_NAME);
+            Velocity = BASE_SCORING_DISTANCE * difficulty.SliderMultiplier / LegacyRulesetExtensions.GetPrecisionAdjustedBeatLength(this, timingPoint, OsuRuleset.SHORT_NAME);
+            // WARNING: this is intentionally not computed as `BASE_SCORING_DISTANCE * difficulty.SliderMultiplier`
+            // for backwards compatibility reasons (intentionally introducing floating point errors to match stable).
+            double scoringDistance = Velocity * timingPoint.BeatLength;
 
-            Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = GenerateTicks ? (scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier) : double.PositiveInfinity;
         }
 

From 45751dd1f2cf5610daf4d9cb966347fb453ef570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Sep 2023 14:05:58 +0200
Subject: [PATCH 0583/2296] Minimum viable changes for ruleset-specific scoring
 test scenes

---
 .../TestSceneScoring.cs                       |  33 ++
 .../Tests/Visual/Gameplay/ScoringTestScene.cs | 556 +++++++++---------
 2 files changed, 311 insertions(+), 278 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
 rename osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs => osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs (53%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
new file mode 100644
index 0000000000..5dbfc8d3a1
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.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 NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual.Gameplay;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public partial class TestSceneScoring : ScoringTestScene
+    {
+        protected override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
+
+        protected override IBeatmap CreateBeatmap(int maxCombo)
+        {
+            var beatmap = new OsuBeatmap();
+            for (int i = 0; i < maxCombo; i++)
+                beatmap.HitObjects.Add(new HitCircle());
+            return beatmap;
+        }
+
+        protected override JudgementResult CreatePerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great };
+        protected override JudgementResult CreateNonPerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok };
+        protected override JudgementResult CreateMissJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss };
+    }
+}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
similarity index 53%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
rename to osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index 5db05ea67c..ecf55419a2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
@@ -14,15 +14,13 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
-using osu.Game.Rulesets.Osu.Scoring;
-using osu.Game.Rulesets.Osu.Beatmaps;
-using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring.Legacy;
 using osuTK;
@@ -31,8 +29,14 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public partial class TestSceneScoring : OsuTestScene
+    public abstract partial class ScoringTestScene : OsuTestScene
     {
+        protected abstract ScoreProcessor CreateScoreProcessor();
+        protected abstract IBeatmap CreateBeatmap(int maxCombo);
+        protected abstract JudgementResult CreatePerfectJudgementResult();
+        protected abstract JudgementResult CreateNonPerfectJudgementResult();
+        protected abstract JudgementResult CreateMissJudgementResult();
+
         private GraphContainer graphs = null!;
         private SettingsSlider<int> sliderMaxCombo = null!;
         private SettingsCheckbox scaleToMax = null!;
@@ -152,8 +156,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Clear();
             legend.Clear();
 
-            runForProcessor("lazer-standardised", colours.Green1, new OsuScoreProcessor(), ScoringMode.Standardised, standardisedVisible);
-            runForProcessor("lazer-classic", colours.Blue1, new OsuScoreProcessor(), ScoringMode.Classic, classicVisible);
+            runForProcessor("lazer-standardised", colours.Green1, CreateScoreProcessor(), ScoringMode.Standardised, standardisedVisible);
+            runForProcessor("lazer-classic", colours.Blue1, CreateScoreProcessor(), ScoringMode.Classic, classicVisible);
 
             runScoreV1();
             runScoreV2();
@@ -274,20 +278,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         private void runForProcessor(string name, Color4 colour, ScoreProcessor processor, ScoringMode mode, BindableBool visibility)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
-
-            var beatmap = new OsuBeatmap();
-            for (int i = 0; i < maxCombo; i++)
-                beatmap.HitObjects.Add(new HitCircle());
-
+            var beatmap = CreateBeatmap(maxCombo);
             processor.ApplyBeatmap(beatmap);
 
             runForAlgorithm(new ScoringAlgorithm
             {
                 Name = name,
                 Colour = colour,
-                ApplyHit = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great }),
-                ApplyNonPerfect = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok }),
-                ApplyMiss = () => processor.ApplyResult(new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss }),
+                ApplyHit = () => processor.ApplyResult(CreatePerfectJudgementResult()),
+                ApplyNonPerfect = () => processor.ApplyResult(CreateNonPerfectJudgementResult()),
+                ApplyMiss = () => processor.ApplyResult(CreateMissJudgementResult()),
                 GetTotalScore = () => processor.GetDisplayScore(mode),
                 Visible = visibility
             });
@@ -327,310 +327,310 @@ namespace osu.Game.Tests.Visual.Gameplay
                 AccentColour = scoringAlgorithm.Colour,
             });
         }
-    }
 
-    public class ScoringAlgorithm
-    {
-        public string Name { get; init; } = null!;
-        public Color4 Colour { get; init; }
-        public Action ApplyHit { get; init; } = () => { };
-        public Action ApplyNonPerfect { get; init; } = () => { };
-        public Action ApplyMiss { get; init; } = () => { };
-        public Func<long> GetTotalScore { get; init; } = null!;
-        public BindableBool Visible { get; init; } = null!;
-    }
-
-    public partial class GraphContainer : Container<LineGraph>, IHasCustomTooltip<IEnumerable<LineGraph>>
-    {
-        public readonly BindableList<double> MissLocations = new BindableList<double>();
-        public readonly BindableList<double> NonPerfectLocations = new BindableList<double>();
-
-        public Bindable<int> MaxCombo = new Bindable<int>();
-
-        protected override Container<LineGraph> Content { get; } = new Container<LineGraph> { RelativeSizeAxes = Axes.Both };
-
-        private readonly Box hoverLine;
-
-        private readonly Container missLines;
-        private readonly Container verticalGridLines;
-
-        public int CurrentHoverCombo { get; private set; }
-
-        public GraphContainer()
+        private class ScoringAlgorithm
         {
-            InternalChild = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = OsuColour.Gray(0.1f),
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    verticalGridLines = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    hoverLine = new Box
-                    {
-                        Colour = Color4.Yellow,
-                        RelativeSizeAxes = Axes.Y,
-                        Origin = Anchor.TopCentre,
-                        Alpha = 0,
-                        Width = 1,
-                    },
-                    missLines = new Container
-                    {
-                        Alpha = 0.6f,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    Content,
-                }
-            };
-
-            MissLocations.BindCollectionChanged((_, _) => updateMissLocations());
-            NonPerfectLocations.BindCollectionChanged((_, _) => updateMissLocations());
-
-            MaxCombo.BindValueChanged(_ =>
-            {
-                updateMissLocations();
-                updateVerticalGridLines();
-            }, true);
+            public string Name { get; init; } = null!;
+            public Color4 Colour { get; init; }
+            public Action ApplyHit { get; init; } = () => { };
+            public Action ApplyNonPerfect { get; init; } = () => { };
+            public Action ApplyMiss { get; init; } = () => { };
+            public Func<long> GetTotalScore { get; init; } = null!;
+            public BindableBool Visible { get; init; } = null!;
         }
 
-        private void updateVerticalGridLines()
+        public partial class GraphContainer : Container<LineGraph>, IHasCustomTooltip<IEnumerable<LineGraph>>
         {
-            verticalGridLines.Clear();
+            public readonly BindableList<double> MissLocations = new BindableList<double>();
+            public readonly BindableList<double> NonPerfectLocations = new BindableList<double>();
 
-            for (int i = 0; i < MaxCombo.Value; i++)
+            public Bindable<int> MaxCombo = new Bindable<int>();
+
+            protected override Container<LineGraph> Content { get; } = new Container<LineGraph> { RelativeSizeAxes = Axes.Both };
+
+            private readonly Box hoverLine;
+
+            private readonly Container missLines;
+            private readonly Container verticalGridLines;
+
+            public int CurrentHoverCombo { get; private set; }
+
+            public GraphContainer()
             {
-                if (i % 100 == 0)
+                InternalChild = new Container
                 {
-                    verticalGridLines.AddRange(new Drawable[]
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
                     {
                         new Box
                         {
-                            Colour = OsuColour.Gray(0.2f),
-                            Origin = Anchor.TopCentre,
-                            Width = 1,
-                            RelativeSizeAxes = Axes.Y,
-                            RelativePositionAxes = Axes.X,
-                            X = (float)i / MaxCombo.Value,
+                            Colour = OsuColour.Gray(0.1f),
+                            RelativeSizeAxes = Axes.Both,
                         },
-                        new OsuSpriteText
+                        verticalGridLines = new Container
                         {
-                            RelativePositionAxes = Axes.X,
-                            X = (float)i / MaxCombo.Value,
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            Text = $"{i:#,0}",
-                            Rotation = -30,
-                            Y = -20,
-                        }
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        hoverLine = new Box
+                        {
+                            Colour = Color4.Yellow,
+                            RelativeSizeAxes = Axes.Y,
+                            Origin = Anchor.TopCentre,
+                            Alpha = 0,
+                            Width = 1,
+                        },
+                        missLines = new Container
+                        {
+                            Alpha = 0.6f,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        Content,
+                    }
+                };
+
+                MissLocations.BindCollectionChanged((_, _) => updateMissLocations());
+                NonPerfectLocations.BindCollectionChanged((_, _) => updateMissLocations());
+
+                MaxCombo.BindValueChanged(_ =>
+                {
+                    updateMissLocations();
+                    updateVerticalGridLines();
+                }, true);
+            }
+
+            private void updateVerticalGridLines()
+            {
+                verticalGridLines.Clear();
+
+                for (int i = 0; i < MaxCombo.Value; i++)
+                {
+                    if (i % 100 == 0)
+                    {
+                        verticalGridLines.AddRange(new Drawable[]
+                        {
+                            new Box
+                            {
+                                Colour = OsuColour.Gray(0.2f),
+                                Origin = Anchor.TopCentre,
+                                Width = 1,
+                                RelativeSizeAxes = Axes.Y,
+                                RelativePositionAxes = Axes.X,
+                                X = (float)i / MaxCombo.Value,
+                            },
+                            new OsuSpriteText
+                            {
+                                RelativePositionAxes = Axes.X,
+                                X = (float)i / MaxCombo.Value,
+                                Anchor = Anchor.BottomLeft,
+                                Origin = Anchor.BottomLeft,
+                                Text = $"{i:#,0}",
+                                Rotation = -30,
+                                Y = -20,
+                            }
+                        });
+                    }
+                }
+            }
+
+            private void updateMissLocations()
+            {
+                missLines.Clear();
+
+                foreach (int miss in MissLocations)
+                {
+                    missLines.Add(new Box
+                    {
+                        Colour = Color4.Red,
+                        Origin = Anchor.TopCentre,
+                        Width = 1,
+                        RelativeSizeAxes = Axes.Y,
+                        RelativePositionAxes = Axes.X,
+                        X = (float)miss / MaxCombo.Value,
+                    });
+                }
+
+                foreach (int miss in NonPerfectLocations)
+                {
+                    missLines.Add(new Box
+                    {
+                        Colour = Color4.Orange,
+                        Origin = Anchor.TopCentre,
+                        Width = 1,
+                        RelativeSizeAxes = Axes.Y,
+                        RelativePositionAxes = Axes.X,
+                        X = (float)miss / MaxCombo.Value,
                     });
                 }
             }
-        }
 
-        private void updateMissLocations()
-        {
-            missLines.Clear();
-
-            foreach (int miss in MissLocations)
+            protected override bool OnHover(HoverEvent e)
             {
-                missLines.Add(new Box
-                {
-                    Colour = Color4.Red,
-                    Origin = Anchor.TopCentre,
-                    Width = 1,
-                    RelativeSizeAxes = Axes.Y,
-                    RelativePositionAxes = Axes.X,
-                    X = (float)miss / MaxCombo.Value,
-                });
+                hoverLine.Show();
+                return base.OnHover(e);
             }
 
-            foreach (int miss in NonPerfectLocations)
+            protected override void OnHoverLost(HoverLostEvent e)
             {
-                missLines.Add(new Box
-                {
-                    Colour = Color4.Orange,
-                    Origin = Anchor.TopCentre,
-                    Width = 1,
-                    RelativeSizeAxes = Axes.Y,
-                    RelativePositionAxes = Axes.X,
-                    X = (float)miss / MaxCombo.Value,
-                });
+                hoverLine.Hide();
+                base.OnHoverLost(e);
             }
-        }
 
-        protected override bool OnHover(HoverEvent e)
-        {
-            hoverLine.Show();
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            hoverLine.Hide();
-            base.OnHoverLost(e);
-        }
-
-        protected override bool OnMouseMove(MouseMoveEvent e)
-        {
-            CurrentHoverCombo = (int)(e.MousePosition.X / DrawWidth * MaxCombo.Value);
-
-            hoverLine.X = e.MousePosition.X;
-            return base.OnMouseMove(e);
-        }
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            if (e.Button == MouseButton.Left)
-                MissLocations.Add(CurrentHoverCombo);
-            else
-                NonPerfectLocations.Add(CurrentHoverCombo);
-
-            return true;
-        }
-
-        private GraphTooltip? tooltip;
-
-        public ITooltip<IEnumerable<LineGraph>> GetCustomTooltip() => tooltip ??= new GraphTooltip(this);
-
-        public IEnumerable<LineGraph> TooltipContent => Content;
-
-        public partial class GraphTooltip : CompositeDrawable, ITooltip<IEnumerable<LineGraph>>
-        {
-            private readonly GraphContainer graphContainer;
-
-            private readonly OsuTextFlowContainer textFlow;
-
-            public GraphTooltip(GraphContainer graphContainer)
+            protected override bool OnMouseMove(MouseMoveEvent e)
             {
-                this.graphContainer = graphContainer;
-                AutoSizeAxes = Axes.Both;
+                CurrentHoverCombo = (int)(e.MousePosition.X / DrawWidth * MaxCombo.Value);
 
-                Masking = true;
-                CornerRadius = 10;
+                hoverLine.X = e.MousePosition.X;
+                return base.OnMouseMove(e);
+            }
 
-                InternalChildren = new Drawable[]
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                if (e.Button == MouseButton.Left)
+                    MissLocations.Add(CurrentHoverCombo);
+                else
+                    NonPerfectLocations.Add(CurrentHoverCombo);
+
+                return true;
+            }
+
+            private GraphTooltip? tooltip;
+
+            public ITooltip<IEnumerable<LineGraph>> GetCustomTooltip() => tooltip ??= new GraphTooltip(this);
+
+            public IEnumerable<LineGraph> TooltipContent => Content;
+
+            public partial class GraphTooltip : CompositeDrawable, ITooltip<IEnumerable<LineGraph>>
+            {
+                private readonly GraphContainer graphContainer;
+
+                private readonly OsuTextFlowContainer textFlow;
+
+                public GraphTooltip(GraphContainer graphContainer)
                 {
-                    new Box
+                    this.graphContainer = graphContainer;
+                    AutoSizeAxes = Axes.Both;
+
+                    Masking = true;
+                    CornerRadius = 10;
+
+                    InternalChildren = new Drawable[]
                     {
-                        Colour = OsuColour.Gray(0.15f),
-                        RelativeSizeAxes = Axes.Both,
+                        new Box
+                        {
+                            Colour = OsuColour.Gray(0.15f),
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        textFlow = new OsuTextFlowContainer
+                        {
+                            Colour = Color4.White,
+                            AutoSizeAxes = Axes.Both,
+                            Padding = new MarginPadding(10),
+                        }
+                    };
+                }
+
+                private int? lastContentCombo;
+
+                public void SetContent(IEnumerable<LineGraph> content)
+                {
+                    int relevantCombo = graphContainer.CurrentHoverCombo;
+
+                    if (lastContentCombo == relevantCombo)
+                        return;
+
+                    lastContentCombo = relevantCombo;
+                    textFlow.Clear();
+
+                    textFlow.AddParagraph($"At combo {relevantCombo}:");
+
+                    foreach (var graph in content)
+                    {
+                        if (graph.Alpha == 0) continue;
+
+                        float valueAtHover = graph.Values.ElementAt(relevantCombo);
+                        float ofTotal = valueAtHover / graph.Values.Last();
+
+                        textFlow.AddParagraph($"{graph.Name}: {valueAtHover:#,0} ({ofTotal * 100:N0}% of final)\n", st => st.Colour = graph.LineColour);
+                    }
+                }
+
+                public void Move(Vector2 pos) => this.MoveTo(pos);
+            }
+        }
+
+        private partial class LegendEntry : OsuClickableContainer, IHasAccentColour
+        {
+            public Color4 AccentColour { get; set; }
+
+            public BindableBool Visible { get; } = new BindableBool(true);
+
+            public readonly long FinalScore;
+
+            private readonly string description;
+            private readonly LineGraph lineGraph;
+
+            private OsuSpriteText descriptionText = null!;
+            private OsuSpriteText finalScoreText = null!;
+
+            public LegendEntry(ScoringAlgorithm scoringAlgorithm, LineGraph lineGraph)
+            {
+                description = scoringAlgorithm.Name;
+                FinalScore = scoringAlgorithm.GetTotalScore();
+                AccentColour = scoringAlgorithm.Colour;
+                Visible.BindTo(scoringAlgorithm.Visible);
+
+                this.lineGraph = lineGraph;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RelativeSizeAxes = Content.RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Content.AutoSizeAxes = Axes.Y;
+
+                Children = new Drawable[]
+                {
+                    descriptionText = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
                     },
-                    textFlow = new OsuTextFlowContainer
+                    finalScoreText = new OsuSpriteText
                     {
-                        Colour = Color4.White,
-                        AutoSizeAxes = Axes.Both,
-                        Padding = new MarginPadding(10),
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Font = OsuFont.Default.With(fixedWidth: true)
                     }
                 };
             }
 
-            private int? lastContentCombo;
-
-            public void SetContent(IEnumerable<LineGraph> content)
+            protected override void LoadComplete()
             {
-                int relevantCombo = graphContainer.CurrentHoverCombo;
-
-                if (lastContentCombo == relevantCombo)
-                    return;
-
-                lastContentCombo = relevantCombo;
-                textFlow.Clear();
-
-                textFlow.AddParagraph($"At combo {relevantCombo}:");
-
-                foreach (var graph in content)
-                {
-                    if (graph.Alpha == 0) continue;
-
-                    float valueAtHover = graph.Values.ElementAt(relevantCombo);
-                    float ofTotal = valueAtHover / graph.Values.Last();
-
-                    textFlow.AddParagraph($"{graph.Name}: {valueAtHover:#,0} ({ofTotal * 100:N0}% of final)\n", st => st.Colour = graph.LineColour);
-                }
+                base.LoadComplete();
+                Visible.BindValueChanged(_ => updateState(), true);
+                Action = Visible.Toggle;
             }
 
-            public void Move(Vector2 pos) => this.MoveTo(pos);
-        }
-    }
-
-    public partial class LegendEntry : OsuClickableContainer, IHasAccentColour
-    {
-        public Color4 AccentColour { get; set; }
-
-        public BindableBool Visible { get; } = new BindableBool(true);
-
-        public readonly long FinalScore;
-
-        private readonly string description;
-        private readonly LineGraph lineGraph;
-
-        private OsuSpriteText descriptionText = null!;
-        private OsuSpriteText finalScoreText = null!;
-
-        public LegendEntry(ScoringAlgorithm scoringAlgorithm, LineGraph lineGraph)
-        {
-            description = scoringAlgorithm.Name;
-            FinalScore = scoringAlgorithm.GetTotalScore();
-            AccentColour = scoringAlgorithm.Colour;
-            Visible.BindTo(scoringAlgorithm.Visible);
-
-            this.lineGraph = lineGraph;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            RelativeSizeAxes = Content.RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Content.AutoSizeAxes = Axes.Y;
-
-            Children = new Drawable[]
+            protected override bool OnHover(HoverEvent e)
             {
-                descriptionText = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                },
-                finalScoreText = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Font = OsuFont.Default.With(fixedWidth: true)
-                }
-            };
-        }
+                updateState();
+                return true;
+            }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            Visible.BindValueChanged(_ => updateState(), true);
-            Action = Visible.Toggle;
-        }
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateState();
+                base.OnHoverLost(e);
+            }
 
-        protected override bool OnHover(HoverEvent e)
-        {
-            updateState();
-            return true;
-        }
+            private void updateState()
+            {
+                Colour = IsHovered ? AccentColour.Lighten(0.2f) : AccentColour;
 
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            updateState();
-            base.OnHoverLost(e);
-        }
-
-        private void updateState()
-        {
-            Colour = IsHovered ? AccentColour.Lighten(0.2f) : AccentColour;
-
-            descriptionText.Text = $"{(Visible.Value ? FontAwesome.Solid.CheckCircle.Icon : FontAwesome.Solid.Circle.Icon)} {description}";
-            finalScoreText.Text = FinalScore.ToString("#,0");
-            lineGraph.Alpha = Visible.Value ? 1 : 0;
+                descriptionText.Text = $"{(Visible.Value ? FontAwesome.Solid.CheckCircle.Icon : FontAwesome.Solid.Circle.Icon)} {description}";
+                finalScoreText.Text = FinalScore.ToString("#,0");
+                lineGraph.Alpha = Visible.Value ? 1 : 0;
+            }
         }
     }
 }

From 27b6bc3062cc7e531677e914ffd762671089555a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 14:35:07 +0200
Subject: [PATCH 0584/2296] Add skeleton of catch scoring test

---
 .../TestSceneScoring.cs                       | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
new file mode 100644
index 0000000000..7330e40568
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.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 System;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Beatmaps;
+using osu.Game.Rulesets.Catch.Judgements;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Scoring;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual.Gameplay;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public partial class TestSceneScoring : ScoringTestScene
+    {
+        protected override IBeatmap CreateBeatmap(int maxCombo)
+        {
+            var beatmap = new CatchBeatmap();
+            for (int i = 0; i < maxCombo; ++i)
+                beatmap.HitObjects.Add(new Fruit());
+            return beatmap;
+        }
+
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1();
+
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new CatchProcessorBasedScoringAlgorithm(beatmap, mode);
+
+        private class ScoreV1 : IScoringAlgorithm
+        {
+            public void ApplyHit()
+            {
+            }
+
+            public void ApplyNonPerfect()
+            {
+            }
+
+            public void ApplyMiss()
+            {
+            }
+
+            public long TotalScore => 0;
+        }
+
+        private class ScoreV2 : IScoringAlgorithm
+        {
+            private readonly int maxCombo;
+
+            public ScoreV2(int maxCombo)
+            {
+                this.maxCombo = maxCombo;
+            }
+
+            public void ApplyHit()
+            {
+            }
+
+            public void ApplyNonPerfect()
+            {
+            }
+
+            public void ApplyMiss()
+            {
+            }
+
+            public long TotalScore => 0;
+        }
+
+        private class CatchProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
+        {
+            public CatchProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+                : base(beatmap, mode)
+            {
+            }
+
+            protected override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor();
+
+            protected override JudgementResult CreatePerfectJudgementResult() => new CatchJudgementResult(new Fruit(), new CatchJudgement()) { Type = HitResult.Great };
+
+            protected override JudgementResult CreateNonPerfectJudgementResult() => throw new NotSupportedException("catch does not have \"non-perfect\" judgements.");
+
+            protected override JudgementResult CreateMissJudgementResult() => new CatchJudgementResult(new Fruit(), new CatchJudgement()) { Type = HitResult.Miss };
+        }
+    }
+}

From 0c22ff2a8093efe5754f060dbab424af81571c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 10:13:53 +0200
Subject: [PATCH 0585/2296] Refactor further to allow extensibility to other
 rulesets

---
 .../TestSceneScoring.cs                       | 118 +++++++++-
 .../Tests/Visual/Gameplay/ScoringTestScene.cs | 207 +++++++-----------
 2 files changed, 187 insertions(+), 138 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
index 5dbfc8d3a1..36485b93ab 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.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 NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
@@ -16,8 +17,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public partial class TestSceneScoring : ScoringTestScene
     {
-        protected override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
-
         protected override IBeatmap CreateBeatmap(int maxCombo)
         {
             var beatmap = new OsuBeatmap();
@@ -26,8 +25,117 @@ namespace osu.Game.Rulesets.Osu.Tests
             return beatmap;
         }
 
-        protected override JudgementResult CreatePerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great };
-        protected override JudgementResult CreateNonPerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok };
-        protected override JudgementResult CreateMissJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss };
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1();
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new OsuProcessorBasedScoringAlgorithm(beatmap, mode);
+
+        private const int base_great = 300;
+        private const int base_ok = 100;
+
+        private class ScoreV1 : IScoringAlgorithm
+        {
+            private int currentCombo;
+
+            // this corresponds to stable's `ScoreMultiplier`.
+            // value is chosen arbitrarily, towards the upper range.
+            private const float score_multiplier = 4;
+
+            public void ApplyHit() => applyHitV1(base_great);
+            public void ApplyNonPerfect() => applyHitV1(base_ok);
+            public void ApplyMiss() => applyHitV1(0);
+
+            private void applyHitV1(int baseScore)
+            {
+                if (baseScore == 0)
+                {
+                    currentCombo = 0;
+                    return;
+                }
+
+                TotalScore += baseScore;
+
+                // combo multiplier
+                // ReSharper disable once PossibleLossOfFraction
+                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * score_multiplier));
+
+                currentCombo++;
+            }
+
+            public long TotalScore { get; private set; }
+        }
+
+        private class ScoreV2 : IScoringAlgorithm
+        {
+            private int currentCombo;
+            private double comboPortion;
+            private double currentBaseScore;
+            private double maxBaseScore;
+            private int currentHits;
+
+            private readonly double comboPortionMax;
+            private readonly int maxCombo;
+
+            public ScoreV2(int maxCombo)
+            {
+                this.maxCombo = maxCombo;
+
+                for (int i = 0; i < this.maxCombo; i++)
+                    ApplyHit();
+
+                comboPortionMax = comboPortion;
+
+                currentCombo = 0;
+                comboPortion = 0;
+                currentBaseScore = 0;
+                maxBaseScore = 0;
+                currentHits = 0;
+            }
+
+            public void ApplyHit() => applyHitV2(base_great);
+            public void ApplyNonPerfect() => applyHitV2(base_ok);
+
+            private void applyHitV2(int baseScore)
+            {
+                maxBaseScore += base_great;
+                currentBaseScore += baseScore;
+                comboPortion += baseScore * (1 + ++currentCombo / 10.0);
+
+                currentHits++;
+            }
+
+            public void ApplyMiss()
+            {
+                currentHits++;
+                maxBaseScore += base_great;
+                currentCombo = 0;
+            }
+
+            public long TotalScore
+            {
+                get
+                {
+                    double accuracy = currentBaseScore / maxBaseScore;
+
+                    return (int)Math.Round
+                    (
+                        700000 * comboPortion / comboPortionMax +
+                        300000 * Math.Pow(accuracy, 10) * ((double)currentHits / maxCombo)
+                    );
+                }
+            }
+        }
+
+        private class OsuProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
+        {
+            public OsuProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+                : base(beatmap, mode)
+            {
+            }
+
+            protected override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
+            protected override JudgementResult CreatePerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Great };
+            protected override JudgementResult CreateNonPerfectJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Ok };
+            protected override JudgementResult CreateMissJudgementResult() => new OsuJudgementResult(new HitCircle(), new OsuJudgement()) { Type = HitResult.Miss };
+        }
     }
 }
diff --git a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index ecf55419a2..331f1bb9aa 100644
--- a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.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 NUnit.Framework;
@@ -31,11 +30,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public abstract partial class ScoringTestScene : OsuTestScene
     {
-        protected abstract ScoreProcessor CreateScoreProcessor();
         protected abstract IBeatmap CreateBeatmap(int maxCombo);
-        protected abstract JudgementResult CreatePerfectJudgementResult();
-        protected abstract JudgementResult CreateNonPerfectJudgementResult();
-        protected abstract JudgementResult CreateMissJudgementResult();
+
+        protected abstract IScoringAlgorithm CreateScoreV1();
+        protected abstract IScoringAlgorithm CreateScoreV2(int maxCombo);
+        protected abstract ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode);
 
         private GraphContainer graphs = null!;
         private SettingsSlider<int> sliderMaxCombo = null!;
@@ -121,7 +120,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
-                                            Text = $"Left click to add miss\nRight click to add OK/{base_ok}",
+                                            Text = "Left click to add miss\nRight click to add OK",
                                             Margin = new MarginPadding { Top = 20 }
                                         }
                                     }
@@ -148,19 +147,28 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
-        private const int base_great = 300;
-        private const int base_ok = 100;
-
         private void rerun()
         {
             graphs.Clear();
             legend.Clear();
 
-            runForProcessor("lazer-standardised", colours.Green1, CreateScoreProcessor(), ScoringMode.Standardised, standardisedVisible);
-            runForProcessor("lazer-classic", colours.Blue1, CreateScoreProcessor(), ScoringMode.Classic, classicVisible);
+            runForProcessor("lazer-standardised", colours.Green1, ScoringMode.Standardised, standardisedVisible);
+            runForProcessor("lazer-classic", colours.Blue1, ScoringMode.Classic, classicVisible);
 
-            runScoreV1();
-            runScoreV2();
+            runForAlgorithm(new ScoringAlgorithmInfo
+            {
+                Name = "ScoreV1 (classic)",
+                Colour = colours.Purple1,
+                Algorithm = CreateScoreV1(),
+                Visible = scoreV1Visible
+            });
+            runForAlgorithm(new ScoringAlgorithmInfo
+            {
+                Name = "ScoreV2",
+                Colour = colours.Red1,
+                Algorithm = CreateScoreV2(sliderMaxCombo.Current.Value),
+                Visible = scoreV2Visible
+            });
 
             rescalePlots();
         }
@@ -181,119 +189,22 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        private void runScoreV1()
-        {
-            int totalScore = 0;
-            int currentCombo = 0;
-
-            void applyHitV1(int baseScore)
-            {
-                if (baseScore == 0)
-                {
-                    currentCombo = 0;
-                    return;
-                }
-
-                // this corresponds to stable's `ScoreMultiplier`.
-                // value is chosen arbitrarily, towards the upper range.
-                const float score_multiplier = 4;
-
-                totalScore += baseScore;
-
-                // combo multiplier
-                // ReSharper disable once PossibleLossOfFraction
-                totalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * score_multiplier));
-
-                currentCombo++;
-            }
-
-            runForAlgorithm(new ScoringAlgorithm
-            {
-                Name = "ScoreV1 (classic)",
-                Colour = colours.Purple1,
-                ApplyHit = () => applyHitV1(base_great),
-                ApplyNonPerfect = () => applyHitV1(base_ok),
-                ApplyMiss = () => applyHitV1(0),
-                GetTotalScore = () => totalScore,
-                Visible = scoreV1Visible
-            });
-        }
-
-        private void runScoreV2()
-        {
-            int maxCombo = sliderMaxCombo.Current.Value;
-
-            int currentCombo = 0;
-            double comboPortion = 0;
-            double currentBaseScore = 0;
-            double maxBaseScore = 0;
-            int currentHits = 0;
-
-            for (int i = 0; i < maxCombo; i++)
-                applyHitV2(base_great);
-
-            double comboPortionMax = comboPortion;
-
-            currentCombo = 0;
-            comboPortion = 0;
-            currentBaseScore = 0;
-            maxBaseScore = 0;
-            currentHits = 0;
-
-            void applyHitV2(int baseScore)
-            {
-                maxBaseScore += base_great;
-                currentBaseScore += baseScore;
-                comboPortion += baseScore * (1 + ++currentCombo / 10.0);
-
-                currentHits++;
-            }
-
-            runForAlgorithm(new ScoringAlgorithm
-            {
-                Name = "ScoreV2",
-                Colour = colours.Red1,
-                ApplyHit = () => applyHitV2(base_great),
-                ApplyNonPerfect = () => applyHitV2(base_ok),
-                ApplyMiss = () =>
-                {
-                    currentHits++;
-                    maxBaseScore += base_great;
-                    currentCombo = 0;
-                },
-                GetTotalScore = () =>
-                {
-                    double accuracy = currentBaseScore / maxBaseScore;
-
-                    return (int)Math.Round
-                    (
-                        700000 * comboPortion / comboPortionMax +
-                        300000 * Math.Pow(accuracy, 10) * ((double)currentHits / maxCombo)
-                    );
-                },
-                Visible = scoreV2Visible
-            });
-        }
-
-        private void runForProcessor(string name, Color4 colour, ScoreProcessor processor, ScoringMode mode, BindableBool visibility)
+        private void runForProcessor(string name, Color4 colour, ScoringMode scoringMode, BindableBool visibility)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
             var beatmap = CreateBeatmap(maxCombo);
-            processor.ApplyBeatmap(beatmap);
+            var algorithm = CreateScoreAlgorithm(beatmap, scoringMode);
 
-            runForAlgorithm(new ScoringAlgorithm
+            runForAlgorithm(new ScoringAlgorithmInfo
             {
                 Name = name,
                 Colour = colour,
-                ApplyHit = () => processor.ApplyResult(CreatePerfectJudgementResult()),
-                ApplyNonPerfect = () => processor.ApplyResult(CreateNonPerfectJudgementResult()),
-                ApplyMiss = () => processor.ApplyResult(CreateMissJudgementResult()),
-                GetTotalScore = () => processor.GetDisplayScore(mode),
+                Algorithm = algorithm,
                 Visible = visibility
             });
         }
 
-        private void runForAlgorithm(ScoringAlgorithm scoringAlgorithm)
+        private void runForAlgorithm(ScoringAlgorithmInfo algorithmInfo)
         {
             int maxCombo = sliderMaxCombo.Current.Value;
 
@@ -302,43 +213,73 @@ namespace osu.Game.Tests.Visual.Gameplay
             for (int i = 0; i < maxCombo; i++)
             {
                 if (graphs.MissLocations.Contains(i))
-                    scoringAlgorithm.ApplyMiss();
+                    algorithmInfo.Algorithm.ApplyMiss();
                 else if (graphs.NonPerfectLocations.Contains(i))
-                    scoringAlgorithm.ApplyNonPerfect();
+                    algorithmInfo.Algorithm.ApplyNonPerfect();
                 else
-                    scoringAlgorithm.ApplyHit();
+                    algorithmInfo.Algorithm.ApplyHit();
 
-                results.Add(scoringAlgorithm.GetTotalScore());
+                results.Add(algorithmInfo.Algorithm.TotalScore);
             }
 
             LineGraph graph;
             graphs.Add(graph = new LineGraph
             {
-                Name = scoringAlgorithm.Name,
+                Name = algorithmInfo.Name,
                 Anchor = Anchor.BottomLeft,
                 Origin = Anchor.BottomLeft,
                 RelativeSizeAxes = Axes.Both,
-                LineColour = scoringAlgorithm.Colour,
+                LineColour = algorithmInfo.Colour,
                 Values = results
             });
 
-            legend.Add(new LegendEntry(scoringAlgorithm, graph)
+            legend.Add(new LegendEntry(algorithmInfo, graph)
             {
-                AccentColour = scoringAlgorithm.Colour,
+                AccentColour = algorithmInfo.Colour,
             });
         }
 
-        private class ScoringAlgorithm
+        private class ScoringAlgorithmInfo
         {
             public string Name { get; init; } = null!;
             public Color4 Colour { get; init; }
-            public Action ApplyHit { get; init; } = () => { };
-            public Action ApplyNonPerfect { get; init; } = () => { };
-            public Action ApplyMiss { get; init; } = () => { };
-            public Func<long> GetTotalScore { get; init; } = null!;
+            public IScoringAlgorithm Algorithm { get; init; } = null!;
             public BindableBool Visible { get; init; } = null!;
         }
 
+        protected interface IScoringAlgorithm
+        {
+            void ApplyHit();
+            void ApplyNonPerfect();
+            void ApplyMiss();
+
+            long TotalScore { get; }
+        }
+
+        protected abstract class ProcessorBasedScoringAlgorithm : IScoringAlgorithm
+        {
+            protected abstract ScoreProcessor CreateScoreProcessor();
+            protected abstract JudgementResult CreatePerfectJudgementResult();
+            protected abstract JudgementResult CreateNonPerfectJudgementResult();
+            protected abstract JudgementResult CreateMissJudgementResult();
+
+            private readonly ScoreProcessor scoreProcessor;
+            private readonly ScoringMode mode;
+
+            protected ProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+            {
+                this.mode = mode;
+                scoreProcessor = CreateScoreProcessor();
+                scoreProcessor.ApplyBeatmap(beatmap);
+            }
+
+            public void ApplyHit() => scoreProcessor.ApplyResult(CreatePerfectJudgementResult());
+            public void ApplyNonPerfect() => scoreProcessor.ApplyResult(CreateNonPerfectJudgementResult());
+            public void ApplyMiss() => scoreProcessor.ApplyResult(CreateMissJudgementResult());
+
+            public long TotalScore => scoreProcessor.GetDisplayScore(mode);
+        }
+
         public partial class GraphContainer : Container<LineGraph>, IHasCustomTooltip<IEnumerable<LineGraph>>
         {
             public readonly BindableList<double> MissLocations = new BindableList<double>();
@@ -572,12 +513,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             private OsuSpriteText descriptionText = null!;
             private OsuSpriteText finalScoreText = null!;
 
-            public LegendEntry(ScoringAlgorithm scoringAlgorithm, LineGraph lineGraph)
+            public LegendEntry(ScoringAlgorithmInfo scoringAlgorithmInfo, LineGraph lineGraph)
             {
-                description = scoringAlgorithm.Name;
-                FinalScore = scoringAlgorithm.GetTotalScore();
-                AccentColour = scoringAlgorithm.Colour;
-                Visible.BindTo(scoringAlgorithm.Visible);
+                description = scoringAlgorithmInfo.Name;
+                FinalScore = scoringAlgorithmInfo.Algorithm.TotalScore;
+                AccentColour = scoringAlgorithmInfo.Colour;
+                Visible.BindTo(scoringAlgorithmInfo.Visible);
 
                 this.lineGraph = lineGraph;
             }

From 5eccc771c2f3a7b26536366f3766e7f1246ff73c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 14:40:24 +0200
Subject: [PATCH 0586/2296] Turn off non-perfect judgements for catch scoring
 test scene

---
 .../TestSceneScoring.cs                       |  5 ++++
 .../Tests/Visual/Gameplay/ScoringTestScene.cs | 25 +++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
index 7330e40568..44823607b8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
@@ -17,6 +17,11 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public partial class TestSceneScoring : ScoringTestScene
     {
+        public TestSceneScoring()
+            : base(supportsNonPerfectJudgements: false)
+        {
+        }
+
         protected override IBeatmap CreateBeatmap(int maxCombo)
         {
             var beatmap = new CatchBeatmap();
diff --git a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index c213a17185..de4688a6fe 100644
--- a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected BindableList<double> NonPerfectLocations => graphs.NonPerfectLocations;
         protected BindableList<double> MissLocations => graphs.MissLocations;
 
+        private readonly bool supportsNonPerfectJudgements;
+
         private GraphContainer graphs = null!;
         private SettingsSlider<int> sliderMaxCombo = null!;
         private SettingsCheckbox scaleToMax = null!;
@@ -54,11 +56,18 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
+        protected ScoringTestScene(bool supportsNonPerfectJudgements = true)
+        {
+            this.supportsNonPerfectJudgements = supportsNonPerfectJudgements;
+        }
+
         [SetUpSteps]
         public void SetUpSteps()
         {
             AddStep("setup tests", () =>
             {
+                OsuTextFlowContainer clickExplainer;
+
                 Children = new Drawable[]
                 {
                     new Box
@@ -79,7 +88,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         {
                             new Drawable[]
                             {
-                                graphs = new GraphContainer
+                                graphs = new GraphContainer(supportsNonPerfectJudgements)
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                 },
@@ -120,11 +129,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                                             LabelText = "Rescale plots to 100%",
                                             Current = { Value = true, Default = true }
                                         },
-                                        new OsuTextFlowContainer
+                                        clickExplainer = new OsuTextFlowContainer
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
-                                            Text = "Left click to add miss\nRight click to add OK",
                                             Margin = new MarginPadding { Top = 20 }
                                         }
                                     }
@@ -134,6 +142,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                 };
 
+                clickExplainer.AddParagraph("Left click to add miss");
+                if (supportsNonPerfectJudgements)
+                    clickExplainer.AddParagraph("Right click to add OK");
+
                 sliderMaxCombo.Current.BindValueChanged(_ => Rerun());
                 scaleToMax.Current.BindValueChanged(_ => Rerun());
 
@@ -286,6 +298,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public partial class GraphContainer : Container<LineGraph>, IHasCustomTooltip<IEnumerable<LineGraph>>
         {
+            private readonly bool supportsNonPerfectJudgements;
+
             public readonly BindableList<double> MissLocations = new BindableList<double>();
             public readonly BindableList<double> NonPerfectLocations = new BindableList<double>();
 
@@ -300,8 +314,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public int CurrentHoverCombo { get; private set; }
 
-            public GraphContainer()
+            public GraphContainer(bool supportsNonPerfectJudgements)
             {
+                this.supportsNonPerfectJudgements = supportsNonPerfectJudgements;
                 InternalChild = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -432,7 +447,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 if (e.Button == MouseButton.Left)
                     MissLocations.Add(CurrentHoverCombo);
-                else
+                else if (supportsNonPerfectJudgements)
                     NonPerfectLocations.Add(CurrentHoverCombo);
 
                 return true;

From ebdc501e5b6f3dbea0af959ca4fdbb96e3b3ba13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 14:19:49 +0200
Subject: [PATCH 0587/2296] Add example scenarios and configurable score
 multiplier

---
 .../TestSceneScoring.cs                       | 45 ++++++++++++++++---
 .../Tests/Visual/Gameplay/ScoringTestScene.cs | 22 +++++----
 2 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
index 36485b93ab..bb09328ab7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
@@ -3,6 +3,7 @@
 
 using System;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Beatmaps;
@@ -17,6 +18,12 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public partial class TestSceneScoring : ScoringTestScene
     {
+        private Bindable<double> scoreMultiplier { get; } = new BindableDouble
+        {
+            Default = 4,
+            Value = 4
+        };
+
         protected override IBeatmap CreateBeatmap(int maxCombo)
         {
             var beatmap = new OsuBeatmap();
@@ -25,10 +32,40 @@ namespace osu.Game.Rulesets.Osu.Tests
             return beatmap;
         }
 
-        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1();
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
         protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
         protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new OsuProcessorBasedScoringAlgorithm(beatmap, mode);
 
+        [Test]
+        public void TestBasicScenarios()
+        {
+            AddStep("set up score multiplier", () =>
+            {
+                scoreMultiplier.BindValueChanged(_ => Rerun());
+            });
+            AddStep("set max combo to 100", () => MaxCombo.Value = 100);
+            AddStep("set perfect score", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+            });
+            AddStep("set score with misses", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddStep("set score with misses and OKs", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+
+                NonPerfectLocations.AddRange(new[] { 9d, 19, 29, 39, 59, 69, 79, 89, 99 });
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddSliderStep("adjust score multiplier", 0, 10, (int)scoreMultiplier.Default, multiplier => scoreMultiplier.Value = multiplier);
+        }
+
         private const int base_great = 300;
         private const int base_ok = 100;
 
@@ -36,9 +73,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             private int currentCombo;
 
-            // this corresponds to stable's `ScoreMultiplier`.
-            // value is chosen arbitrarily, towards the upper range.
-            private const float score_multiplier = 4;
+            public BindableDouble ScoreMultiplier { get; } = new BindableDouble();
 
             public void ApplyHit() => applyHitV1(base_great);
             public void ApplyNonPerfect() => applyHitV1(base_ok);
@@ -56,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 // combo multiplier
                 // ReSharper disable once PossibleLossOfFraction
-                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * score_multiplier));
+                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * ScoreMultiplier.Value));
 
                 currentCombo++;
             }
diff --git a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index 331f1bb9aa..c213a17185 100644
--- a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -13,6 +12,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -36,6 +36,10 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected abstract IScoringAlgorithm CreateScoreV2(int maxCombo);
         protected abstract ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode);
 
+        protected Bindable<int> MaxCombo => sliderMaxCombo.Current;
+        protected BindableList<double> NonPerfectLocations => graphs.NonPerfectLocations;
+        protected BindableList<double> MissLocations => graphs.MissLocations;
+
         private GraphContainer graphs = null!;
         private SettingsSlider<int> sliderMaxCombo = null!;
         private SettingsCheckbox scaleToMax = null!;
@@ -50,8 +54,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
-        [Test]
-        public void TestBasic()
+        [SetUpSteps]
+        public void SetUpSteps()
         {
             AddStep("setup tests", () =>
             {
@@ -130,24 +134,24 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                 };
 
-                sliderMaxCombo.Current.BindValueChanged(_ => rerun());
-                scaleToMax.Current.BindValueChanged(_ => rerun());
+                sliderMaxCombo.Current.BindValueChanged(_ => Rerun());
+                scaleToMax.Current.BindValueChanged(_ => Rerun());
 
                 standardisedVisible.BindValueChanged(_ => rescalePlots());
                 classicVisible.BindValueChanged(_ => rescalePlots());
                 scoreV1Visible.BindValueChanged(_ => rescalePlots());
                 scoreV2Visible.BindValueChanged(_ => rescalePlots());
 
-                graphs.MissLocations.BindCollectionChanged((_, __) => rerun());
-                graphs.NonPerfectLocations.BindCollectionChanged((_, __) => rerun());
+                graphs.MissLocations.BindCollectionChanged((_, __) => Rerun());
+                graphs.NonPerfectLocations.BindCollectionChanged((_, __) => Rerun());
 
                 graphs.MaxCombo.BindTo(sliderMaxCombo.Current);
 
-                rerun();
+                Rerun();
             });
         }
 
-        private void rerun()
+        protected void Rerun()
         {
             graphs.Clear();
             legend.Clear();

From c6445a327b1fa76d40b5629a8fa72f7abf9c8836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 13:14:01 +0200
Subject: [PATCH 0588/2296] Add taiko scoring test scene

---
 .../TestSceneScoring.cs                       | 185 ++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs
new file mode 100644
index 0000000000..e065070822
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs
@@ -0,0 +1,185 @@
+// 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.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Beatmaps;
+using osu.Game.Rulesets.Taiko.Judgements;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Scoring;
+using osu.Game.Tests.Visual.Gameplay;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    [TestFixture]
+    public partial class TestSceneScoring : ScoringTestScene
+    {
+        private Bindable<double> scoreMultiplier { get; } = new BindableDouble
+        {
+            Default = 4,
+            Value = 4
+        };
+
+        protected override IBeatmap CreateBeatmap(int maxCombo)
+        {
+            var beatmap = new TaikoBeatmap();
+            for (int i = 0; i < maxCombo; ++i)
+                beatmap.HitObjects.Add(new Hit());
+            return beatmap;
+        }
+
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new TaikoProcessorBasedScoringAlgorithm(beatmap, mode);
+
+        [Test]
+        public void TestBasicScenarios()
+        {
+            AddStep("set up score multiplier", () =>
+            {
+                scoreMultiplier.BindValueChanged(_ => Rerun());
+            });
+            AddStep("set max combo to 100", () => MaxCombo.Value = 100);
+            AddStep("set perfect score", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+            });
+            AddStep("set score with misses", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddStep("set score with misses and OKs", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+
+                NonPerfectLocations.AddRange(new[] { 9d, 19, 29, 39, 59, 69, 79, 89, 99 });
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddSliderStep("adjust score multiplier", 0, 10, (int)scoreMultiplier.Default, multiplier => scoreMultiplier.Value = multiplier);
+        }
+
+        private const int base_great = 300;
+        private const int base_ok = 150;
+
+        private class ScoreV1 : IScoringAlgorithm
+        {
+            private int currentCombo;
+
+            public BindableDouble ScoreMultiplier { get; } = new BindableDouble();
+
+            public void ApplyHit() => applyHitV1(base_great);
+
+            public void ApplyNonPerfect() => applyHitV1(base_ok);
+
+            public void ApplyMiss() => applyHitV1(0);
+
+            private void applyHitV1(int baseScore)
+            {
+                if (baseScore == 0)
+                {
+                    currentCombo = 0;
+                    return;
+                }
+
+                TotalScore += baseScore;
+
+                // combo multiplier
+                // ReSharper disable once PossibleLossOfFraction
+                TotalScore += (int)((baseScore / 35) * 2 * (ScoreMultiplier.Value + 1)) * (Math.Min(100, currentCombo) / 10);
+
+                currentCombo++;
+            }
+
+            public long TotalScore { get; private set; }
+        }
+
+        private class ScoreV2 : IScoringAlgorithm
+        {
+            private int currentCombo;
+            private double comboPortion;
+            private double currentBaseScore;
+            private double maxBaseScore;
+            private int currentHits;
+
+            private readonly double comboPortionMax;
+            private readonly int maxCombo;
+
+            private const double combo_base = 4;
+
+            public ScoreV2(int maxCombo)
+            {
+                this.maxCombo = maxCombo;
+
+                for (int i = 0; i < this.maxCombo; i++)
+                    ApplyHit();
+
+                comboPortionMax = comboPortion;
+
+                currentCombo = 0;
+                comboPortion = 0;
+                currentBaseScore = 0;
+                maxBaseScore = 0;
+                currentHits = 0;
+            }
+
+            public void ApplyHit() => applyHitV2(base_great);
+
+            public void ApplyNonPerfect() => applyHitV2(base_ok);
+
+            private void applyHitV2(int baseScore)
+            {
+                maxBaseScore += base_great;
+                currentBaseScore += baseScore;
+
+                currentHits++;
+
+                // `base_great` is INTENTIONALLY used above here instead of `baseScore`
+                // see `BaseHitValue` override in `ScoreChangeTaiko` on stable
+                comboPortion += base_great * Math.Min(Math.Max(0.5, Math.Log(++currentCombo, combo_base)), Math.Log(400, combo_base));
+            }
+
+            public void ApplyMiss()
+            {
+                currentHits++;
+                maxBaseScore += base_great;
+                currentCombo = 0;
+            }
+
+            public long TotalScore
+            {
+                get
+                {
+                    double accuracy = currentBaseScore / maxBaseScore;
+
+                    return (int)Math.Round
+                    (
+                        250000 * comboPortion / comboPortionMax +
+                        750000 * Math.Pow(accuracy, 3.6) * ((double)currentHits / maxCombo)
+                    );
+                }
+            }
+        }
+
+        private class TaikoProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
+        {
+            public TaikoProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+                : base(beatmap, mode)
+            {
+            }
+
+            protected override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor();
+            protected override JudgementResult CreatePerfectJudgementResult() => new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great };
+            protected override JudgementResult CreateNonPerfectJudgementResult() => new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Ok };
+            protected override JudgementResult CreateMissJudgementResult() => new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Miss };
+        }
+    }
+}

From aa8aa14a57ff48bdc707d7221490482714380bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 15:27:35 +0200
Subject: [PATCH 0589/2296] Add catch scoring algorithms to test scene

---
 .../TestSceneScoring.cs                       | 97 +++++++++++++++----
 1 file changed, 79 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
index 44823607b8..dfdde0a325 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
@@ -3,6 +3,7 @@
 
 using System;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Judgements;
@@ -22,6 +23,12 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
         }
 
+        private Bindable<double> scoreMultiplier { get; } = new BindableDouble
+        {
+            Default = 4,
+            Value = 4
+        };
+
         protected override IBeatmap CreateBeatmap(int maxCombo)
         {
             var beatmap = new CatchBeatmap();
@@ -30,51 +37,105 @@ namespace osu.Game.Rulesets.Catch.Tests
             return beatmap;
         }
 
-        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1();
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
 
         protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
 
         protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new CatchProcessorBasedScoringAlgorithm(beatmap, mode);
 
+        [Test]
+        public void TestBasicScenarios()
+        {
+            AddStep("set up score multiplier", () =>
+            {
+                scoreMultiplier.BindValueChanged(_ => Rerun());
+            });
+            AddStep("set max combo to 100", () => MaxCombo.Value = 100);
+            AddStep("set perfect score", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+            });
+            AddStep("set score with misses", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddSliderStep("adjust score multiplier", 0, 10, (int)scoreMultiplier.Default, multiplier => scoreMultiplier.Value = multiplier);
+        }
+
+        private const int base_great = 300;
+
         private class ScoreV1 : IScoringAlgorithm
         {
-            public void ApplyHit()
+            private int currentCombo;
+
+            public BindableDouble ScoreMultiplier { get; } = new BindableDouble();
+
+            public void ApplyHit() => applyHitV1(base_great);
+
+            public void ApplyNonPerfect() => throw new NotSupportedException("catch does not have \"non-perfect\" judgements.");
+
+            public void ApplyMiss() => applyHitV1(0);
+
+            private void applyHitV1(int baseScore)
             {
+                if (baseScore == 0)
+                {
+                    currentCombo = 0;
+                    return;
+                }
+
+                TotalScore += baseScore;
+
+                // combo multiplier
+                // ReSharper disable once PossibleLossOfFraction
+                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * ScoreMultiplier.Value));
+
+                currentCombo++;
             }
 
-            public void ApplyNonPerfect()
-            {
-            }
-
-            public void ApplyMiss()
-            {
-            }
-
-            public long TotalScore => 0;
+            public long TotalScore { get; private set; }
         }
 
         private class ScoreV2 : IScoringAlgorithm
         {
-            private readonly int maxCombo;
+            private int currentCombo;
+            private double comboPortion;
+
+            private readonly double comboPortionMax;
+
+            private const double combo_base = 4;
+            private const int combo_cap = 200;
 
             public ScoreV2(int maxCombo)
             {
-                this.maxCombo = maxCombo;
+                for (int i = 0; i < maxCombo; i++)
+                    ApplyHit();
+
+                comboPortionMax = comboPortion;
+
+                currentCombo = 0;
+                comboPortion = 0;
             }
 
-            public void ApplyHit()
-            {
-            }
+            public void ApplyHit() => applyHitV2(base_great);
 
-            public void ApplyNonPerfect()
+            public void ApplyNonPerfect() => throw new NotSupportedException("catch does not have \"non-perfect\" judgements.");
+
+            private void applyHitV2(int baseScore)
             {
+                comboPortion += baseScore * Math.Min(Math.Max(0.5, Math.Log(++currentCombo, combo_base)), Math.Log(combo_cap, combo_base));
             }
 
             public void ApplyMiss()
             {
+                currentCombo = 0;
             }
 
-            public long TotalScore => 0;
+            public long TotalScore
+                => (int)Math.Round(1000000 * comboPortion / comboPortionMax); // vast simplification, as we're not doing ticks here.
         }
 
         private class CatchProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm

From 5640dd2f74b44b8a2a4c03b9eb22e94e3e7e4f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Sep 2023 20:06:59 +0200
Subject: [PATCH 0590/2296] Add mania scoring test scene

---
 .../TestSceneScoring.cs                       | 175 ++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs
new file mode 100644
index 0000000000..ae3ea861ea
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.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.
+
+using System;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Judgements;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual.Gameplay;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public partial class TestSceneScoring : ScoringTestScene
+    {
+        protected override IBeatmap CreateBeatmap(int maxCombo)
+        {
+            var beatmap = new ManiaBeatmap(new StageDefinition(5));
+            for (int i = 0; i < maxCombo; ++i)
+                beatmap.HitObjects.Add(new Note());
+            return beatmap;
+        }
+
+        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1(MaxCombo.Value);
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new ManiaProcessorBasedScoringAlgorithm(beatmap, mode);
+
+        [Test]
+        public void TestBasicScenarios()
+        {
+            AddStep("set max combo to 100", () => MaxCombo.Value = 100);
+            AddStep("set perfect score", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+            });
+            AddStep("set score with misses", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+            AddStep("set score with misses and OKs", () =>
+            {
+                NonPerfectLocations.Clear();
+                MissLocations.Clear();
+
+                NonPerfectLocations.AddRange(new[] { 9d, 19, 29, 39, 59, 69, 79, 89, 99 });
+                MissLocations.AddRange(new[] { 24d, 49 });
+            });
+        }
+
+        private class ScoreV1 : IScoringAlgorithm
+        {
+            private int currentCombo;
+            private double comboAddition = 100;
+            private double totalScoreDouble;
+            private readonly double scoreMultiplier;
+
+            public ScoreV1(int maxCombo)
+            {
+                scoreMultiplier = 500000d / maxCombo;
+            }
+
+            public void ApplyHit() => applyHitV1(320, add => add + 2, 32);
+            public void ApplyNonPerfect() => applyHitV1(100, add => add - 24, 8);
+            public void ApplyMiss() => applyHitV1(0, _ => -56, 0);
+
+            private void applyHitV1(int scoreIncrease, Func<double, double> comboAdditionFunc, int delta)
+            {
+                comboAddition = comboAdditionFunc(comboAddition);
+                if (currentCombo != 0 && currentCombo % 384 == 0)
+                    comboAddition = 100;
+                comboAddition = Math.Max(0, Math.Min(comboAddition, 100));
+                double scoreIncreaseD = Math.Sqrt(comboAddition) * delta * scoreMultiplier / 320;
+
+                TotalScore = (long)totalScoreDouble;
+
+                scoreIncreaseD += scoreIncrease * scoreMultiplier / 320;
+                scoreIncrease = (int)scoreIncreaseD;
+
+                TotalScore += scoreIncrease;
+                totalScoreDouble += scoreIncreaseD;
+
+                if (scoreIncrease > 0)
+                    currentCombo++;
+            }
+
+            public long TotalScore { get; private set; }
+        }
+
+        private class ScoreV2 : IScoringAlgorithm
+        {
+            private int currentCombo;
+            private double comboPortion;
+            private double currentBaseScore;
+            private double maxBaseScore;
+            private int currentHits;
+
+            private readonly double comboPortionMax;
+            private readonly int maxCombo;
+
+            private const double combo_base = 4;
+
+            public ScoreV2(int maxCombo)
+            {
+                this.maxCombo = maxCombo;
+
+                for (int i = 0; i < this.maxCombo; i++)
+                    ApplyHit();
+
+                comboPortionMax = comboPortion;
+
+                currentCombo = 0;
+                comboPortion = 0;
+                currentBaseScore = 0;
+                maxBaseScore = 0;
+                currentHits = 0;
+            }
+
+            public void ApplyHit() => applyHitV2(305, 300);
+            public void ApplyNonPerfect() => applyHitV2(100, 100);
+
+            private void applyHitV2(int hitValue, int baseHitValue)
+            {
+                maxBaseScore += 305;
+                currentBaseScore += hitValue;
+                comboPortion += baseHitValue * Math.Min(Math.Max(0.5, Math.Log(++currentCombo, combo_base)), Math.Log(400, combo_base));
+
+                currentHits++;
+            }
+
+            public void ApplyMiss()
+            {
+                currentHits++;
+                maxBaseScore += 305;
+                currentCombo = 0;
+            }
+
+            public long TotalScore
+            {
+                get
+                {
+                    float accuracy = (float)(currentBaseScore / maxBaseScore);
+
+                    return (int)Math.Round
+                    (
+                        200000 * comboPortion / comboPortionMax +
+                        800000 * Math.Pow(accuracy, 2 + 2 * accuracy) * ((double)currentHits / maxCombo)
+                    );
+                }
+            }
+        }
+
+        private class ManiaProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
+        {
+            public ManiaProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+                : base(beatmap, mode)
+            {
+            }
+
+            protected override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
+
+            protected override JudgementResult CreatePerfectJudgementResult() => new JudgementResult(new Note(), new ManiaJudgement()) { Type = HitResult.Perfect };
+
+            protected override JudgementResult CreateNonPerfectJudgementResult() => new JudgementResult(new Note(), new ManiaJudgement()) { Type = HitResult.Ok };
+
+            protected override JudgementResult CreateMissJudgementResult() => new JudgementResult(new Note(), new ManiaJudgement()) { Type = HitResult.Miss };
+        }
+    }
+}

From c2685da94c8c1ff329c6fb966de5035d6eddb98d Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 13 Sep 2023 23:38:54 -0700
Subject: [PATCH 0591/2296] Fix dummy beatmap showing AR 5 on song select

---
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index 8089d789c1..e2e541811d 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -36,9 +36,10 @@ namespace osu.Game.Beatmaps
                 BeatmapSet = new BeatmapSetInfo(),
                 Difficulty = new BeatmapDifficulty
                 {
-                    DrainRate = 0,
                     CircleSize = 0,
+                    DrainRate = 0,
                     OverallDifficulty = 0,
+                    ApproachRate = 0,
                 },
                 Ruleset = new DummyRuleset().RulesetInfo
             }, audio)

From 56b5f52e838f39aeabc2209e0d765603e7ebc477 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 16 Sep 2023 14:31:33 +0900
Subject: [PATCH 0592/2296] Update all dependencies (except for Moq)

---
 ...u.Game.Rulesets.EmptyFreeform.Tests.csproj |  4 ++--
 .../osu.Game.Rulesets.Pippidon.Tests.csproj   |  4 ++--
 ....Game.Rulesets.EmptyScrolling.Tests.csproj |  4 ++--
 .../osu.Game.Rulesets.Pippidon.Tests.csproj   |  4 ++--
 osu.Desktop/osu.Desktop.csproj                |  2 +-
 .../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          |  4 ++--
 .../osu.Game.Tournament.Tests.csproj          |  4 ++--
 .../API/ModSettingsDictionaryFormatter.cs     |  4 ++--
 .../Multiplayer/TestMultiplayerClient.cs      |  2 +-
 osu.Game/osu.Game.csproj                      | 20 +++++++++----------
 15 files changed, 36 insertions(+), 36 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 a1c53ece03..2baa7ee0e0 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.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </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 683e9fd5e8..a2308e6dfc 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.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </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 b7a7fff18a..e839d2657c 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.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </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 683e9fd5e8..a2308e6dfc 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.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </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 25f4cff00e..1d43e118a3 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Clowd.Squirrel" Version="2.9.42" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="7.0.0" />
-    <PackageReference Include="DiscordRichPresence" Version="1.1.4.20" />
+    <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />
diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index 4719d54138..febe353b81 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.4" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </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 01922b2a96..c45c85833c 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.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </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 027bf60a0c..b991db408c 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.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </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 57900bffd7..ea033cda45 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.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </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 0c39ad988b..48465bb119 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.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </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 59a786a11d..ef6c16f2c4 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -2,10 +2,10 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="DeepEqual" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
   </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 5847079161..2cc07dd9ed 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.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index 8df2d3fc2d..3fad032531 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -35,8 +35,8 @@ namespace osu.Game.Online.API
 
             for (int i = 0; i < itemCount; i++)
             {
-                output[reader.ReadString()] =
-                    PrimitiveObjectFormatter.Instance.Deserialize(ref reader, options);
+                output[reader.ReadString()!] =
+                    PrimitiveObjectFormatter.Instance.Deserialize(ref reader, options)!;
             }
 
             return output;
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index c27e30d5bb..9dc24eff69 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -635,7 +635,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private T clone<T>(T incoming)
         {
-            byte[]? serialized = MessagePackSerializer.Serialize(typeof(T), incoming, SignalRUnionWorkaroundResolver.OPTIONS);
+            byte[] serialized = MessagePackSerializer.Serialize(typeof(T), incoming, SignalRUnionWorkaroundResolver.OPTIONS);
             return MessagePackSerializer.Deserialize<T>(serialized, SignalRUnionWorkaroundResolver.OPTIONS);
         }
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d109345518..b247ea80f6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,13 +21,13 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="AutoMapper" Version="12.0.1" />
     <PackageReference Include="DiffPlex" Version="1.7.1" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.53" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
-    <PackageReference Include="MessagePack" Version="2.4.59" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.2" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.2" />
+    <PackageReference Include="MessagePack" Version="2.5.124" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.11" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.11" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
@@ -35,13 +35,13 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Realm" Version="11.1.2" />
+    <PackageReference Include="Realm" Version="11.4.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.914.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
-    <PackageReference Include="Sentry" Version="3.28.1" />
-    <PackageReference Include="SharpCompress" Version="0.32.2" />
+    <PackageReference Include="Sentry" Version="3.39.1" />
+    <PackageReference Include="SharpCompress" Version="0.33.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.4" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.6" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="TagLibSharp" Version="2.3.0" />
 

From be026f7ff16b95f85d8a47023506f00572fbf763 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 Sep 2023 01:27:43 +0900
Subject: [PATCH 0593/2296] Bump realm once more

---
 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 b247ea80f6..d88b568244 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Realm" Version="11.4.0" />
+    <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.914.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />

From a2df123c6d7271bfdbe867247f3d7064d6973d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 09:19:12 +0200
Subject: [PATCH 0594/2296] Add failing test case for fake (but still
 incorrectly allowed) protocol

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index f0dcd527a4..1baa737a9c 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -35,6 +35,15 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(0, result.Links.Count);
         }
 
+        [Test]
+        public void TestFakeProtocolLink()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a osunotarealprotocol://completely-made-up-protocol we don't support." });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(0, result.Links.Count);
+        }
+
         [Test]
         public void TestSupportedProtocolLinkParsing()
         {

From d3cc6dbaa09a1ad8396db068c3635bc18b7723d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 09:20:14 +0200
Subject: [PATCH 0595/2296] Fix link protocol allowlist allowing too much

---
 osu.Game/Online/Chat/MessageFormatter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index db4d0b1363..667175117f 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Online.Chat
         //      http[s]://<domain>.<tld>[:port][/path][?query][#fragment]
         private static readonly Regex advanced_link_regex = new Regex(
             // protocol
-            @"(?<link>(https?|osu)[a-z]*?:\/\/" +
+            @"(?<link>(https?|osu(mp)?):\/\/" +
             // domain + tld
             @"(?<domain>(?:[a-z0-9]\.|[a-z0-9][a-z0-9-]*[a-z0-9]\.)*[a-z0-9-]*[a-z0-9]" +
             // port (optional)

From 59b9a636d372b4167ce2475376bc31394c30fb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 10:46:14 +0200
Subject: [PATCH 0596/2296] Fix grammar in comment

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

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 650e25a512..2875035e1b 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Scoring
         {
             var stream = new MemoryStream();
 
-            // stream will close after exception throw, so fetch the stream again.
+            // stream will be closed after the exception was thrown, so fetch the stream again.
             using (var scoreStream = archive.GetStream(name))
             {
                 scoreStream.CopyTo(stream);

From 5c2413c06b5a79658cd245871654c7814c558e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 11:30:14 +0200
Subject: [PATCH 0597/2296] Implement nano beatmap card

---
 .../Visual/Beatmaps/TestSceneBeatmapCard.cs   |   6 +
 .../Beatmaps/Drawables/Cards/BeatmapCard.cs   |   3 +
 .../Drawables/Cards/BeatmapCardNano.cs        | 166 ++++++++++++++++++
 .../Drawables/Cards/BeatmapCardSize.cs        |   1 +
 .../BeatmapListingCardSizeTabControl.cs       |   4 +
 5 files changed, 180 insertions(+)
 create mode 100644 osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs

diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs
index d4018be7fc..fed26d8acb 100644
--- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs
@@ -260,6 +260,12 @@ namespace osu.Game.Tests.Visual.Beatmaps
                 AddStep($"set {scheme} scheme", () => Child = createContent(scheme, creationFunc));
         }
 
+        [Test]
+        public void TestNano()
+        {
+            createTestCase(beatmapSetInfo => new BeatmapCardNano(beatmapSetInfo));
+        }
+
         [Test]
         public void TestNormal()
         {
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
index 94b2956b4e..a16f6d5689 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
@@ -89,6 +89,9 @@ namespace osu.Game.Beatmaps.Drawables.Cards
         {
             switch (size)
             {
+                case BeatmapCardSize.Nano:
+                    return new BeatmapCardNano(beatmapSet);
+
                 case BeatmapCardSize.Normal:
                     return new BeatmapCardNormal(beatmapSet, allowExpansion);
 
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
new file mode 100644
index 0000000000..ba2142d28f
--- /dev/null
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
@@ -0,0 +1,166 @@
+// 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.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Resources.Localisation.Web;
+using osuTK;
+
+namespace osu.Game.Beatmaps.Drawables.Cards
+{
+    public partial class BeatmapCardNano : BeatmapCard
+    {
+        protected override Drawable IdleContent => idleBottomContent;
+        protected override Drawable DownloadInProgressContent => downloadProgressBar;
+
+        private const float height = 60;
+        private const float width = 300;
+        private const float cover_width = 80;
+
+        [Cached]
+        private readonly BeatmapCardContent content;
+
+        private BeatmapCardThumbnail thumbnail = null!;
+        private CollapsibleButtonContainer buttonContainer = null!;
+
+        private FillFlowContainer idleBottomContent = null!;
+        private BeatmapCardDownloadProgressBar downloadProgressBar = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        public BeatmapCardNano(APIBeatmapSet beatmapSet)
+            : base(beatmapSet, false)
+        {
+            content = new BeatmapCardContent(height);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Width = width;
+            Height = height;
+
+            Child = content.With(c =>
+            {
+                c.MainContent = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        thumbnail = new BeatmapCardThumbnail(BeatmapSet)
+                        {
+                            Name = @"Left (icon) area",
+                            Size = new Vector2(cover_width, height),
+                            Padding = new MarginPadding { Right = CORNER_RADIUS },
+                        },
+                        buttonContainer = new CollapsibleButtonContainer(BeatmapSet)
+                        {
+                            X = cover_width - CORNER_RADIUS,
+                            Width = width - cover_width + CORNER_RADIUS,
+                            FavouriteState = { BindTarget = FavouriteState },
+                            ButtonsCollapsedWidth = CORNER_RADIUS,
+                            ButtonsExpandedWidth = 30,
+                            Children = new Drawable[]
+                            {
+                                new FillFlowContainer
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Vertical,
+                                    Children = new Drawable[]
+                                    {
+                                        new TruncatingSpriteText
+                                        {
+                                            Text = new RomanisableString(BeatmapSet.TitleUnicode, BeatmapSet.Title),
+                                            Font = OsuFont.Default.With(size: 19, weight: FontWeight.SemiBold),
+                                            RelativeSizeAxes = Axes.X,
+                                        },
+                                        new TruncatingSpriteText
+                                        {
+                                            Text = createArtistText(),
+                                            Font = OsuFont.Default.With(size: 16, weight: FontWeight.SemiBold),
+                                            RelativeSizeAxes = Axes.X,
+                                        },
+                                    }
+                                },
+                                new Container
+                                {
+                                    Name = @"Bottom content",
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Children = new Drawable[]
+                                    {
+                                        idleBottomContent = new FillFlowContainer
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 3),
+                                            AlwaysPresent = true,
+                                            Children = new Drawable[]
+                                            {
+                                                new LinkFlowContainer(s =>
+                                                {
+                                                    s.Shadow = false;
+                                                    s.Font = OsuFont.GetFont(size: 16, weight: FontWeight.SemiBold);
+                                                }).With(d =>
+                                                {
+                                                    d.AutoSizeAxes = Axes.Both;
+                                                    d.Margin = new MarginPadding { Top = 2 };
+                                                    d.AddText("mapped by ", t => t.Colour = colourProvider.Content2);
+                                                    d.AddUserLink(BeatmapSet.Author);
+                                                }),
+                                            }
+                                        },
+                                        downloadProgressBar = new BeatmapCardDownloadProgressBar
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            Height = 6,
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            State = { BindTarget = DownloadTracker.State },
+                                            Progress = { BindTarget = DownloadTracker.Progress }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                };
+                c.ExpandedContent = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding { Horizontal = 10, Vertical = 13 },
+                    Child = new BeatmapCardDifficultyList(BeatmapSet)
+                };
+                c.Expanded.BindTarget = Expanded;
+            });
+        }
+
+        private LocalisableString createArtistText()
+        {
+            var romanisableArtist = new RomanisableString(BeatmapSet.ArtistUnicode, BeatmapSet.Artist);
+            return BeatmapsetsStrings.ShowDetailsByArtist(romanisableArtist);
+        }
+
+        protected override void UpdateState()
+        {
+            base.UpdateState();
+
+            bool showDetails = IsHovered;
+
+            buttonContainer.ShowDetails.Value = showDetails;
+            thumbnail.Dimmed.Value = showDetails;
+        }
+    }
+}
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
index 098265506d..0b5acc4a05 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardSize.cs
@@ -8,6 +8,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
     /// </summary>
     public enum BeatmapCardSize
     {
+        Nano,
         Normal,
         Extra
     }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs
index feb0c27ee7..9cd0031e3d 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingCardSizeTabControl.cs
@@ -22,8 +22,12 @@ namespace osu.Game.Overlays.BeatmapListing
         public BeatmapListingCardSizeTabControl()
         {
             AutoSizeAxes = Axes.Both;
+
+            Items = new[] { BeatmapCardSize.Normal, BeatmapCardSize.Extra };
         }
 
+        protected override bool AddEnumEntriesAutomatically => false;
+
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
         {
             AutoSizeAxes = Axes.Both,

From e57d7d1205c2e6914b352ddc451167138d4c3dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 11:50:36 +0200
Subject: [PATCH 0598/2296] Fix `MemoryStreamArchiveReader.GetStream()` failing
 in some cases

`MemoryStreamArchiveReader` introduced in
0657b551964986fc5504a202eaa5e699d1c72f00 would previously use
`MemoryStream.GetBuffer()` to retrieve the underlying byte buffer with
stream data. However, this is not generally the method you would want,
for two reasons:

1. It can fail if the stream wasn't created in the way that supports it.
2. As per

	https://learn.microsoft.com/en-us/dotnet/api/system.io.memorystream.getbuffer?view=net-7.0#system-io-memorystream-getbuffer,

   it will return the _raw_ contents of the buffer, including
   potentially unused bytes.

To fix, use `MemoryStream.ToArray()` instead, which avoids both
pitfalls. Notably, `ToArray()` always returns the full contents of the
buffer, regardless of `Position`, as documented in:

    https://learn.microsoft.com/en-us/dotnet/api/system.io.memorystream.toarray?view=net-7.0#system-io-memorystream-toarray
---
 osu.Game/IO/Archives/MemoryStreamArchiveReader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs b/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs
index 37ce1e508e..d8e1199e93 100644
--- a/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs
+++ b/osu.Game/IO/Archives/MemoryStreamArchiveReader.cs
@@ -19,7 +19,7 @@ namespace osu.Game.IO.Archives
             this.stream = stream;
         }
 
-        public override Stream GetStream(string name) => new MemoryStream(stream.GetBuffer(), 0, (int)stream.Length);
+        public override Stream GetStream(string name) => new MemoryStream(stream.ToArray(), 0, (int)stream.Length);
 
         public override void Dispose()
         {

From 5fcd7363320485cf35d25715edaf057cf646f6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 13:52:45 +0200
Subject: [PATCH 0599/2296] Redo nano beatmap card design to fit needs better

Wanting to use this inside notification, it turns out that the original
design did not work very well at such narrow widths, and additionally
the typical button setup borrowed from elsewhere resulted in teeny tiny
action buttons.

To that end, slim down the design (get rid of thumbnail, audio preview,
make expandable right side slimmer), as well as change the entire panel
so that it has only one action associated with it at all times, and
clicking the panel in any place triggers that action.
---
 .../Drawables/Cards/BeatmapCardNano.cs        |  37 +--
 .../Cards/CollapsibleButtonContainerSlim.cs   | 246 ++++++++++++++++++
 2 files changed, 267 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
index ba2142d28f..2f46bc51d6 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
@@ -20,15 +20,25 @@ namespace osu.Game.Beatmaps.Drawables.Cards
         protected override Drawable IdleContent => idleBottomContent;
         protected override Drawable DownloadInProgressContent => downloadProgressBar;
 
+        public override float Width
+        {
+            get => base.Width;
+            set
+            {
+                base.Width = value;
+
+                if (LoadState >= LoadState.Ready)
+                    buttonContainer.Width = value;
+            }
+        }
+
         private const float height = 60;
         private const float width = 300;
-        private const float cover_width = 80;
 
         [Cached]
         private readonly BeatmapCardContent content;
 
-        private BeatmapCardThumbnail thumbnail = null!;
-        private CollapsibleButtonContainer buttonContainer = null!;
+        private CollapsibleButtonContainerSlim buttonContainer = null!;
 
         private FillFlowContainer idleBottomContent = null!;
         private BeatmapCardDownloadProgressBar downloadProgressBar = null!;
@@ -52,22 +62,16 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             {
                 c.MainContent = new Container
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    Height = height,
                     Children = new Drawable[]
                     {
-                        thumbnail = new BeatmapCardThumbnail(BeatmapSet)
+                        buttonContainer = new CollapsibleButtonContainerSlim(BeatmapSet)
                         {
-                            Name = @"Left (icon) area",
-                            Size = new Vector2(cover_width, height),
-                            Padding = new MarginPadding { Right = CORNER_RADIUS },
-                        },
-                        buttonContainer = new CollapsibleButtonContainer(BeatmapSet)
-                        {
-                            X = cover_width - CORNER_RADIUS,
-                            Width = width - cover_width + CORNER_RADIUS,
+                            Width = Width,
                             FavouriteState = { BindTarget = FavouriteState },
-                            ButtonsCollapsedWidth = CORNER_RADIUS,
-                            ButtonsExpandedWidth = 30,
+                            ButtonsCollapsedWidth = 5,
+                            ButtonsExpandedWidth = 20,
                             Children = new Drawable[]
                             {
                                 new FillFlowContainer
@@ -145,6 +149,8 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                 };
                 c.Expanded.BindTarget = Expanded;
             });
+
+            Action = () => buttonContainer.TriggerClick();
         }
 
         private LocalisableString createArtistText()
@@ -160,7 +166,6 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             bool showDetails = IsHovered;
 
             buttonContainer.ShowDetails.Value = showDetails;
-            thumbnail.Dimmed.Value = showDetails;
         }
     }
 }
diff --git a/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs b/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
new file mode 100644
index 0000000000..d17ff0d759
--- /dev/null
+++ b/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
@@ -0,0 +1,246 @@
+// 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.Configuration;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Resources.Localisation.Web;
+using osuTK;
+
+namespace osu.Game.Beatmaps.Drawables.Cards
+{
+    public partial class CollapsibleButtonContainerSlim : OsuClickableContainer
+    {
+        public Bindable<bool> ShowDetails = new Bindable<bool>();
+        public Bindable<BeatmapSetFavouriteState> FavouriteState = new Bindable<BeatmapSetFavouriteState>();
+
+        private readonly BeatmapDownloadTracker downloadTracker;
+
+        private float buttonsExpandedWidth;
+
+        public float ButtonsExpandedWidth
+        {
+            get => buttonsExpandedWidth;
+            set
+            {
+                buttonsExpandedWidth = value;
+                buttonArea.Width = value;
+                if (IsLoaded)
+                    updateState();
+            }
+        }
+
+        private float buttonsCollapsedWidth;
+
+        public float ButtonsCollapsedWidth
+        {
+            get => buttonsCollapsedWidth;
+            set
+            {
+                buttonsCollapsedWidth = value;
+                if (IsLoaded)
+                    updateState();
+            }
+        }
+
+        protected override Container<Drawable> Content => mainContent;
+
+        private readonly APIBeatmapSet beatmapSet;
+
+        private readonly Container background;
+
+        private readonly Container buttonArea;
+
+        private readonly Container mainArea;
+        private readonly Container mainContent;
+
+        private readonly Container icons;
+        private readonly SpriteIcon downloadIcon;
+        private readonly LoadingSpinner spinner;
+        private readonly SpriteIcon goToBeatmapIcon;
+
+        private const int icon_size = 12;
+
+        private Bindable<bool> preferNoVideo = null!;
+
+        [Resolved]
+        private BeatmapModelDownloader beatmaps { get; set; } = null!;
+
+        [Resolved]
+        private OsuGame? game { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        public CollapsibleButtonContainerSlim(APIBeatmapSet beatmapSet)
+        {
+            this.beatmapSet = beatmapSet;
+
+            downloadTracker = new BeatmapDownloadTracker(beatmapSet);
+
+            RelativeSizeAxes = Axes.Y;
+            Masking = true;
+            CornerRadius = BeatmapCard.CORNER_RADIUS;
+
+            base.Content.AddRange(new Drawable[]
+            {
+                downloadTracker,
+                background = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Colour4.White
+                    },
+                },
+                buttonArea = new Container
+                {
+                    Name = @"Right (button) area",
+                    RelativeSizeAxes = Axes.Y,
+                    Origin = Anchor.TopRight,
+                    Anchor = Anchor.TopRight,
+                    Child = icons = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            downloadIcon = new SpriteIcon
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = new Vector2(icon_size),
+                                Icon = FontAwesome.Solid.Download
+                            },
+                            spinner = new LoadingSpinner
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = new Vector2(icon_size)
+                            },
+                            goToBeatmapIcon = new SpriteIcon
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = new Vector2(icon_size),
+                                Icon = FontAwesome.Solid.AngleDoubleRight
+                            },
+                        }
+                    }
+                },
+                mainArea = new Container
+                {
+                    Name = @"Main content",
+                    RelativeSizeAxes = Axes.Y,
+                    CornerRadius = BeatmapCard.CORNER_RADIUS,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        new BeatmapCardContentBackground(beatmapSet)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Dimmed = { BindTarget = ShowDetails }
+                        },
+                        mainContent = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding
+                            {
+                                Horizontal = 10,
+                                Vertical = 4
+                            },
+                        }
+                    }
+                }
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            preferNoVideo = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
+
+            downloadIcon.Colour = spinner.Colour = colourProvider.Content1;
+            goToBeatmapIcon.Colour = colourProvider.Foreground1;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            preferNoVideo.BindValueChanged(_ => updateState());
+            downloadTracker.State.BindValueChanged(_ => updateState());
+            ShowDetails.BindValueChanged(_ => updateState(), true);
+            FinishTransforms(true);
+        }
+
+        private void updateState()
+        {
+            float targetWidth = Width - (ShowDetails.Value ? ButtonsExpandedWidth : ButtonsCollapsedWidth);
+
+            mainArea.ResizeWidthTo(targetWidth, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+            var backgroundColour = downloadTracker.State.Value == DownloadState.LocallyAvailable ? colours.Lime0 : colourProvider.Background3;
+            if (ShowDetails.Value)
+                backgroundColour = backgroundColour.Lighten(0.2f);
+
+            background.FadeColour(backgroundColour, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            icons.FadeTo(ShowDetails.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+            if (beatmapSet.Availability.DownloadDisabled)
+            {
+                Enabled.Value = false;
+                TooltipText = BeatmapsetsStrings.AvailabilityDisabled;
+                return;
+            }
+
+            switch (downloadTracker.State.Value)
+            {
+                case DownloadState.NotDownloaded:
+                    Action = () => beatmaps.Download(beatmapSet, preferNoVideo.Value);
+                    break;
+
+                case DownloadState.LocallyAvailable:
+                    Action = () => game?.PresentBeatmap(beatmapSet);
+                    break;
+
+                default:
+                    Action = null;
+                    break;
+            }
+
+            downloadIcon.FadeTo(downloadTracker.State.Value == DownloadState.NotDownloaded ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            spinner.FadeTo(downloadTracker.State.Value == DownloadState.Downloading || downloadTracker.State.Value == DownloadState.Importing ? 1 : 0,
+                BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            goToBeatmapIcon.FadeTo(downloadTracker.State.Value == DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+            if (downloadTracker.State.Value == DownloadState.NotDownloaded)
+            {
+                if (!beatmapSet.HasVideo)
+                    TooltipText = BeatmapsetsStrings.PanelDownloadAll;
+                else
+                    TooltipText = preferNoVideo.Value ? BeatmapsetsStrings.PanelDownloadNoVideo : BeatmapsetsStrings.PanelDownloadVideo;
+            }
+            else
+            {
+                TooltipText = default;
+            }
+        }
+    }
+}

From 47764b301290bb64a3fcf6c35466861cb3778532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 13:54:57 +0200
Subject: [PATCH 0600/2296] Fix `OsuTestScene.CreateAPIBeatmapSet()` not
 backlinking set beatmaps to the set

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 0ec5a4c5c2..3ccb795a57 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -265,7 +265,7 @@ namespace osu.Game.Tests.Visual
         {
             Debug.Assert(original.BeatmapSet != null);
 
-            return new APIBeatmapSet
+            var result = new APIBeatmapSet
             {
                 OnlineID = original.BeatmapSet.OnlineID,
                 Status = BeatmapOnlineStatus.Ranked,
@@ -301,6 +301,11 @@ namespace osu.Game.Tests.Visual
                     }
                 }
             };
+
+            foreach (var beatmap in result.Beatmaps)
+                beatmap.BeatmapSet = result;
+
+            return result;
         }
 
         protected WorkingBeatmap CreateWorkingBeatmap(RulesetInfo ruleset) =>

From 775f96f06187edb24bc4dbbfa7577c4545ddacc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 13:55:03 +0200
Subject: [PATCH 0601/2296] Add very basic visual tests for missing beatmap
 notification

The full-stack test using the whole 9 `OsuGameTest` yards is unusable
for rapid development. I don't really get how you could ever design
anything using it without tossing your computer out the window.
---
 .../TestSceneMissingBeatmapNotification.cs    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs
new file mode 100644
index 0000000000..23b9c5f76a
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs
@@ -0,0 +1,34 @@
+// 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.IO;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Database;
+using osu.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    [TestFixture]
+    public partial class TestSceneMissingBeatmapNotification : OsuTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new Container
+            {
+                Width = 280,
+                AutoSizeAxes = Axes.Y,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Child = new MissingBeatmapNotification(CreateAPIBeatmapSet(Ruleset.Value).Beatmaps.First(), new MemoryStream(), "deadbeef")
+            };
+        }
+    }
+}

From 2709c6cd6773d1e770589c22d1f258faaa8d9895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:03:55 +0200
Subject: [PATCH 0602/2296] Integrate nano beatmap card into the notification

---
 .../Database/MissingBeatmapNotification.cs    | 86 +++----------------
 .../Overlays/Notifications/Notification.cs    |  6 +-
 2 files changed, 18 insertions(+), 74 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index d6674b9434..329d362bc4 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -6,19 +6,13 @@ using System.IO;
 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;
+using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
+using osu.Game.Beatmaps.Drawables.Cards;
 using osu.Game.Configuration;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
-using osuTK.Graphics;
 using Realms;
 
 namespace osu.Game.Database
@@ -40,6 +34,7 @@ namespace osu.Game.Database
 
         private Bindable<bool> autodownloadConfig = null!;
         private Bindable<bool> noVideoSetting = null!;
+        private BeatmapCardNano card = null!;
 
         private IDisposable? realmSubscription;
 
@@ -52,7 +47,7 @@ namespace osu.Game.Database
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, BeatmapSetOverlay? beatmapSetOverlay)
+        private void load(OsuConfigManager config)
         {
             Text = "You do not have the required beatmap for this replay";
 
@@ -70,69 +65,7 @@ namespace osu.Game.Database
             autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
             noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
-            Content.Add(new ClickableContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                Height = 70,
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.TopLeft,
-                CornerRadius = 4,
-                Masking = true,
-                Action = () => beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmapSetInfo.OnlineID),
-                Children = new Drawable[]
-                {
-                    new DelayedLoadWrapper(() => new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.Card)
-                    {
-                        OnlineInfo = beatmapSetInfo,
-                        RelativeSizeAxes = Axes.Both
-                    })
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
-                        Alpha = 0.4f
-                    },
-                    new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Padding = new MarginPadding
-                        {
-                            Left = 10f,
-                            Top = 5f
-                        },
-                        Children = new Drawable[]
-                        {
-                            new TruncatingSpriteText
-                            {
-                                Text = beatmapSetInfo.Title,
-                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
-                                RelativeSizeAxes = Axes.X,
-                            },
-                            new TruncatingSpriteText
-                            {
-                                Text = beatmapSetInfo.Artist,
-                                Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 12, italics: true),
-                                RelativeSizeAxes = Axes.X,
-                            }
-                        }
-                    },
-                    new BeatmapDownloadButton(beatmapSetInfo)
-                    {
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.BottomCentre,
-                        Width = 50,
-                        Height = 30,
-                        Margin = new MarginPadding
-                        {
-                            Bottom = 1f
-                        }
-                    }
-                }
-            });
+            Content.Add(card = new BeatmapCardNano(beatmapSetInfo));
         }
 
         protected override void LoadComplete()
@@ -143,6 +76,15 @@ namespace osu.Game.Database
                 beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            card.Width = Content.DrawWidth;
+        }
+
+        protected override bool OnHover(HoverEvent e) => false;
+        protected override void OnHoverLost(HoverLostEvent e) { }
+
         private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
         {
             if (changes?.InsertedIndices == null) return;
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 8cdc373417..805604c274 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed { get; private set; }
 
-        private readonly Container content;
+        private readonly FillFlowContainer content;
 
         protected override Container<Drawable> Content => content;
 
@@ -166,11 +166,13 @@ namespace osu.Game.Overlays.Notifications
                                         Padding = new MarginPadding(10),
                                         Children = new Drawable[]
                                         {
-                                            content = new Container
+                                            content = new FillFlowContainer
                                             {
                                                 Masking = true,
                                                 RelativeSizeAxes = Axes.X,
                                                 AutoSizeAxes = Axes.Y,
+                                                Direction = FillDirection.Vertical,
+                                                Spacing = new Vector2(15)
                                             },
                                         }
                                     },

From b2c98da3307a57be00ba7cb7ea710735f29a1067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:09:06 +0200
Subject: [PATCH 0603/2296] Reword and localise copy

---
 osu.Game/Database/MissingBeatmapNotification.cs |  5 +++--
 osu.Game/Localisation/NotificationsStrings.cs   | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 329d362bc4..e2c72f35de 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -14,6 +14,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 using Realms;
+using osu.Game.Localisation;
 
 namespace osu.Game.Database
 {
@@ -49,7 +50,7 @@ namespace osu.Game.Database
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            Text = "You do not have the required beatmap for this replay";
+            Text = NotificationsStrings.MissingBeatmapForReplay;
 
             realmSubscription = realm.RegisterForNotifications(
                 realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
@@ -58,7 +59,7 @@ namespace osu.Game.Database
             {
                 if (r.All<BeatmapSetInfo>().Any(s => !s.DeletePending && s.OnlineID == beatmapSetInfo.OnlineID))
                 {
-                    Text = "You have the corresponding beatmapset but no beatmap, you may need to update the beatmapset.";
+                    Text = NotificationsStrings.MismatchingBeatmapForReplay;
                 }
             });
 
diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index 53687f2b28..194a1fa399 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -93,6 +93,16 @@ Please try changing your audio device to a working setting.");
         /// </summary>
         public static LocalisableString YourNameWasMentioned(string username) => new TranslatableString(getKey(@"your_name_was_mentioned"), @"Your name was mentioned in chat by '{0}'. Click to find out why!", username);
 
+        /// <summary>
+        /// "You do not have the beatmap for this replay."
+        /// </summary>
+        public static LocalisableString MissingBeatmapForReplay => new TranslatableString(getKey(@"missing_beatmap_for_replay"), @"You do not have the beatmap for this replay.");
+
+        /// <summary>
+        /// "Your local copy of the beatmap for this replay appears to be different than expected. You may need to update or re-download it."
+        /// </summary>
+        public static LocalisableString MismatchingBeatmapForReplay => new TranslatableString(getKey(@"mismatching_beatmap_for_replay"), @"Your local copy of the beatmap for this replay appears to be different than expected. You may need to update or re-download it.");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }

From 27471ad170bfaf4e2df5e42520f9c19613bf67eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:30:06 +0200
Subject: [PATCH 0604/2296] Make missing beatmap notification simple

Progress didn't work for several reasons:

- It was spinning when nothing was actually happening yet
  (especially egregious with autodownload off)

- It was blocking exits (as all progress notifications do)

- When actually going to download, two progress notifications would
  pertain to one thing

- It wasn't helping much with the actual implementation of score
  re-import, cancelling the progress notification would result in
  similarly jank UX of beatmap importing but not the score.
---
 osu.Game/Database/MissingBeatmapNotification.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index e2c72f35de..07382a0e3b 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -18,7 +18,7 @@ using osu.Game.Localisation;
 
 namespace osu.Game.Database
 {
-    public partial class MissingBeatmapNotification : ProgressNotification
+    public partial class MissingBeatmapNotification : SimpleNotification
     {
         [Resolved]
         private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
@@ -93,7 +93,7 @@ namespace osu.Game.Database
             if (sender.Any(s => s.Beatmaps.Any(b => b.MD5Hash == beatmapHash)))
             {
                 var importTask = new ImportTask(scoreStream, "score.osr");
-                scoreManager.Import(this, new[] { importTask });
+                scoreManager.Import(new[] { importTask });
                 realmSubscription?.Dispose();
             }
         }

From 3bddf4bf9a1ba6f5de548d565ec260acd6035b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:46:24 +0200
Subject: [PATCH 0605/2296] Rename spectator-specific settings to more generic
 (with backwards migration)

---
 osu.Game/Configuration/OsuConfigManager.cs    | 14 ++++++++++++--
 .../Database/MissingBeatmapNotification.cs    |  6 +++---
 .../Localisation/OnlineSettingsStrings.cs     |  5 +++++
 osu.Game/Localisation/WebSettingsStrings.cs   | 19 +++++++++++++++++++
 .../Settings/Sections/Online/WebSettings.cs   |  6 +++---
 osu.Game/Screens/Play/SoloSpectator.cs        |  2 +-
 6 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Localisation/WebSettingsStrings.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 921284ad4d..b5253d3500 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.Username, string.Empty);
             SetDefault(OsuSetting.Token, string.Empty);
 
-            SetDefault(OsuSetting.AutomaticallyDownloadWhenSpectating, false);
+            SetDefault(OsuSetting.AutomaticallyDownloadMissingBeatmaps, false);
 
             SetDefault(OsuSetting.SavePassword, false).ValueChanged += enabled =>
             {
@@ -215,6 +215,12 @@ namespace osu.Game.Configuration
 
             // migrations can be added here using a condition like:
             // if (combined < 20220103) { performMigration() }
+            if (combined < 20230918)
+            {
+#pragma warning disable CS0618 // Type or member is obsolete
+                SetValue(OsuSetting.AutomaticallyDownloadMissingBeatmaps, Get<OsuSetting>(OsuSetting.AutomaticallyDownloadWhenSpectating)); // can be removed 20240618
+#pragma warning restore CS0618 // Type or member is obsolete
+            }
         }
 
         public override TrackedSettings CreateTrackedSettings()
@@ -383,13 +389,17 @@ namespace osu.Game.Configuration
         EditorShowHitMarkers,
         EditorAutoSeekOnPlacement,
         DiscordRichPresence,
+
+        [Obsolete($"Use {nameof(AutomaticallyDownloadMissingBeatmaps)} instead.")] // can be removed 20240318
         AutomaticallyDownloadWhenSpectating,
+
         ShowOnlineExplicitContent,
         LastProcessedMetadataId,
         SafeAreaConsiderations,
         ComboColourNormalisationAmount,
         ProfileCoverExpanded,
         EditorLimitedDistanceSnap,
-        ReplaySettingsOverlay
+        ReplaySettingsOverlay,
+        AutomaticallyDownloadMissingBeatmaps,
     }
 }
diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 07382a0e3b..9ae6ac3b58 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Database
         private readonly APIBeatmapSet beatmapSetInfo;
         private readonly string beatmapHash;
 
-        private Bindable<bool> autodownloadConfig = null!;
+        private Bindable<bool> autoDownloadConfig = null!;
         private Bindable<bool> noVideoSetting = null!;
         private BeatmapCardNano card = null!;
 
@@ -63,7 +63,7 @@ namespace osu.Game.Database
                 }
             });
 
-            autodownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating);
+            autoDownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadMissingBeatmaps);
             noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
             Content.Add(card = new BeatmapCardNano(beatmapSetInfo));
@@ -73,7 +73,7 @@ namespace osu.Game.Database
         {
             base.LoadComplete();
 
-            if (autodownloadConfig.Value)
+            if (autoDownloadConfig.Value)
                 beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
         }
 
diff --git a/osu.Game/Localisation/OnlineSettingsStrings.cs b/osu.Game/Localisation/OnlineSettingsStrings.cs
index 3200b1c75c..5ea53a13bf 100644
--- a/osu.Game/Localisation/OnlineSettingsStrings.cs
+++ b/osu.Game/Localisation/OnlineSettingsStrings.cs
@@ -59,6 +59,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString AutomaticallyDownloadWhenSpectating => new TranslatableString(getKey(@"automatically_download_when_spectating"), @"Automatically download beatmaps when spectating");
 
+        /// <summary>
+        /// "Automatically download missing beatmaps"
+        /// </summary>
+        public static LocalisableString AutomaticallyDownloadMissingBeatmaps => new TranslatableString(getKey(@"automatically_download_missing_beatmaps"), @"Automatically download missing beatmaps");
+
         /// <summary>
         /// "Show explicit content in search results"
         /// </summary>
diff --git a/osu.Game/Localisation/WebSettingsStrings.cs b/osu.Game/Localisation/WebSettingsStrings.cs
new file mode 100644
index 0000000000..b3033524dc
--- /dev/null
+++ b/osu.Game/Localisation/WebSettingsStrings.cs
@@ -0,0 +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.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class WebSettingsStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.WebSettings";
+
+        /// <summary>
+        /// "Automatically download missing beatmaps"
+        /// </summary>
+        public static LocalisableString AutomaticallyDownloadMissingBeatmaps => new TranslatableString(getKey(@"automatically_download_missing_beatmaps"), @"Automatically download missing beatmaps");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index d34b01ebf3..ce5c85bed0 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -31,9 +31,9 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = OnlineSettingsStrings.AutomaticallyDownloadWhenSpectating,
-                    Keywords = new[] { "spectator" },
-                    Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
+                    LabelText = OnlineSettingsStrings.AutomaticallyDownloadMissingBeatmaps,
+                    Keywords = new[] { "spectator", "replay" },
+                    Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadMissingBeatmaps),
                 },
                 new SettingsCheckbox
                 {
diff --git a/osu.Game/Screens/Play/SoloSpectator.cs b/osu.Game/Screens/Play/SoloSpectator.cs
index a5c84e97ab..f5af2684d3 100644
--- a/osu.Game/Screens/Play/SoloSpectator.cs
+++ b/osu.Game/Screens/Play/SoloSpectator.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Play
                             automaticDownload = new SettingsCheckbox
                             {
                                 LabelText = "Automatically download beatmaps",
-                                Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
+                                Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadMissingBeatmaps),
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
                             },

From 4cdd19bb5a90c709baf08f322eabcd862ecb08e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:54:25 +0200
Subject: [PATCH 0606/2296] Use different copy when auto-downloading

---
 osu.Game/Database/MissingBeatmapNotification.cs | 4 ++--
 osu.Game/Localisation/NotificationsStrings.cs   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 9ae6ac3b58..d9054980b1 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -50,8 +50,6 @@ namespace osu.Game.Database
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            Text = NotificationsStrings.MissingBeatmapForReplay;
-
             realmSubscription = realm.RegisterForNotifications(
                 realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
 
@@ -75,6 +73,8 @@ namespace osu.Game.Database
 
             if (autoDownloadConfig.Value)
                 beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
+
+            Text = autoDownloadConfig.Value ? NotificationsStrings.DownloadingBeatmapForReplay : NotificationsStrings.MissingBeatmapForReplay;
         }
 
         protected override void Update()
diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index 194a1fa399..adbd7a354b 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -98,6 +98,11 @@ Please try changing your audio device to a working setting.");
         /// </summary>
         public static LocalisableString MissingBeatmapForReplay => new TranslatableString(getKey(@"missing_beatmap_for_replay"), @"You do not have the beatmap for this replay.");
 
+        /// <summary>
+        /// "Downloading missing beatmap for this replay..."
+        /// </summary>
+        public static LocalisableString DownloadingBeatmapForReplay => new TranslatableString(getKey(@"downloading_beatmap_for_replay"), @"Downloading missing beatmap for this replay...");
+
         /// <summary>
         /// "Your local copy of the beatmap for this replay appears to be different than expected. You may need to update or re-download it."
         /// </summary>

From 25e43bd7d718489c81c35ae115b72a5a50a3de85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Sep 2023 14:54:36 +0200
Subject: [PATCH 0607/2296] Auto-close notification after successful download

---
 osu.Game/Database/MissingBeatmapNotification.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index d9054980b1..d98c07ce1f 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -95,6 +95,7 @@ namespace osu.Game.Database
                 var importTask = new ImportTask(scoreStream, "score.osr");
                 scoreManager.Import(new[] { importTask });
                 realmSubscription?.Dispose();
+                Close(false);
             }
         }
 

From 83584519e639c6ce387ebcfb47155e1f5fdbefa1 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Mon, 18 Sep 2023 11:40:00 -0400
Subject: [PATCH 0608/2296] Fix extension check using control points instead of
 path points

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 34113285a4..05960ec416 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -328,8 +328,8 @@ namespace osu.Game.Rulesets.Objects
 
             if (ExpectedDistance.Value is double expectedDistance && calculatedLength != expectedDistance)
             {
-                // In osu-stable, if the last two control points of a slider are equal, extension is not performed.
-                if (ControlPoints.Count >= 2 && ControlPoints[^1].Position == ControlPoints[^2].Position && expectedDistance > calculatedLength)
+                // In osu-stable, if the last two path points of a slider are equal, extension is not performed.
+                if (calculatedPath.Count >= 2 && calculatedPath[^1] == calculatedPath[^2] && expectedDistance > calculatedLength)
                 {
                     cumulativeLength.Add(calculatedLength);
                     return;

From bd7dab1d86fdaaa7d13edc1464cc912e26789f92 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Mon, 18 Sep 2023 12:02:20 -0400
Subject: [PATCH 0609/2296] Add test for slider path edge case

---
 .../OsuBeatmapConversionTest.cs               |  1 +
 ...r-paths-edge-case-expected-conversion.json | 94 +++++++++++++++++++
 .../Beatmaps/slider-paths-edge-case.osu       | 19 ++++
 3 files changed, 114 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case.osu

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index 08eea35425..11e69dc133 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase("colinear-perfect-curve")]
         [TestCase("slider-ticks")]
         [TestCase("slider-ticks-edge-case")]
+        [TestCase("slider-paths-edge-case")]
         [TestCase("repeat-slider")]
         [TestCase("uneven-repeat-slider")]
         [TestCase("old-stacking")]
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json
new file mode 100644
index 0000000000..5b04027cd6
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json
@@ -0,0 +1,94 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 46060.0,
+      "Objects": [
+        {
+          "StartTime": 46060.0,
+          "EndTime": 46060.0,
+          "X": 160.0,
+          "Y": 208.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 46398.0,
+          "EndTime": 46398.0,
+          "X": 160.980164,
+          "Y": 317.779083,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 46737.0,
+          "EndTime": 46737.0,
+          "X": 268.887268,
+          "Y": 320.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 47040.0,
+          "EndTime": 47040.0,
+          "X": 378.995544,
+          "Y": 320.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        }
+      ]
+    },
+    {
+      "StartTime": 123348.0,
+      "Objects": [
+        {
+          "StartTime": 123348.0,
+          "EndTime": 123348.0,
+          "X": 352.0,
+          "Y": 160.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 123686.0,
+          "EndTime": 123686.0,
+          "X": 351.019836,
+          "Y": 50.2209129,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 124025.0,
+          "EndTime": 124025.0,
+          "X": 243.112747,
+          "Y": 48.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 124328.0,
+          "EndTime": 124328.0,
+          "X": 133.004471,
+          "Y": 48.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case.osu
new file mode 100644
index 0000000000..1b6cd0417b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case.osu
@@ -0,0 +1,19 @@
+osu file format v6
+
+[General]
+StackLeniency: 0.7
+
+[Difficulty]
+HPDrainRate:1
+CircleSize:3
+OverallDifficulty:1
+SliderMultiplier:1.1
+SliderTickRate:1
+
+[TimingPoints]
+-41,338.983050847458,4,1,0,70,1,0
+93648,-100,4,1,0,70,0,0
+
+[HitObjects]
+160,208,46060,6,0,B|161:320|161:320|271:320|271:320,1,330,8|0
+352,160,123348,6,0,B|351:48|351:48|241:48|241:48,1,330,8|0

From 57dc76b345c97b8ee76abdf8de1c596d757ec9ed Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 03:17:07 +0300
Subject: [PATCH 0610/2296] Revert "Update `GetTexture` signature rather than
 creating new overload"

This reverts commit 96f12cfbaac4cfc0d8782de0d2890aa8b63e3fdb.
---
 .../Skinning/Legacy/LegacyBananaPiece.cs      |  5 ++--
 .../Skinning/Legacy/LegacyDropletPiece.cs     |  5 ++--
 .../Skinning/Legacy/LegacyFruitPiece.cs       |  9 ++++----
 .../LegacyMainCirclePieceTest.cs              |  5 ++--
 .../TestSceneCursorTrail.cs                   |  2 +-
 .../TestSceneGameplayCursor.cs                |  2 +-
 .../TestSceneSkinFallbacks.cs                 |  3 +--
 .../Skinning/Legacy/LegacyMainCirclePiece.cs  |  2 +-
 .../TestSceneHitObjectAccentColour.cs         |  3 +--
 .../Skinning/LegacySkinAnimationTest.cs       |  3 +--
 .../TestSceneRulesetSkinProvidingContainer.cs |  3 +--
 .../Skins/SkinDeserialisationTest.cs          |  3 +--
 .../TestSceneBeatmapSkinLookupDisables.cs     |  4 +---
 .../Skins/TestSceneSkinConfigurationLookup.cs |  4 +---
 .../Skins/TestSceneSkinProvidingContainer.cs  |  3 +--
 .../Skins/TestSceneSkinResources.cs           |  3 +--
 .../Gameplay/TestSceneSkinnableDrawable.cs    |  6 ++---
 .../Gameplay/TestSceneSkinnableSound.cs       |  6 +----
 osu.Game/Screens/Edit/EditorBeatmapSkin.cs    |  6 +----
 osu.Game/Skinning/ArgonSkin.cs                |  3 +--
 osu.Game/Skinning/ISkin.cs                    | 11 ++++++---
 osu.Game/Skinning/LegacySkin.cs               |  5 ++--
 osu.Game/Skinning/LegacySkinExtensions.cs     | 23 ++++++++++++-------
 osu.Game/Skinning/ResourceStoreBackedSkin.cs  |  4 +---
 osu.Game/Skinning/Skin.cs                     |  5 ++--
 osu.Game/Skinning/SkinManager.cs              |  4 +---
 osu.Game/Skinning/SkinProvidingContainer.cs   | 11 ++++-----
 osu.Game/Skinning/SkinTransformer.cs          |  5 ++--
 osu.Game/Skinning/TrianglesSkin.cs            |  3 +--
 osu.Game/Tests/Visual/SkinnableTestScene.cs   |  6 ++---
 30 files changed, 73 insertions(+), 84 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
index d471a7ee32..9f99e3a586 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -14,8 +15,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTexture("fruit-bananas", banana_max_size);
-            Texture? overlayTexture = Skin.GetTexture("fruit-bananas-overlay", banana_max_size);
+            Texture? texture = Skin.GetTextureWithMaxSize("fruit-bananas", banana_max_size);
+            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-bananas-overlay", banana_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index f1b1b45288..63be1bcf91 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Textures;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -19,8 +20,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTexture("fruit-drop", droplet_max_size);
-            Texture? overlayTexture = Skin.GetTexture("fruit-drop-overlay", droplet_max_size);
+            Texture? texture = Skin.GetTextureWithMaxSize("fruit-drop", droplet_max_size);
+            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-drop-overlay", droplet_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index 3c853e5d3d..e4d25e036b 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
@@ -25,19 +26,19 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             switch (visualRepresentation)
             {
                 case FruitVisualRepresentation.Pear:
-                    SetTexture(Skin.GetTexture("fruit-pear", fruit_max_size), Skin.GetTexture("fruit-pear-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-pear", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-pear-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    SetTexture(Skin.GetTexture("fruit-grapes", fruit_max_size), Skin.GetTexture("fruit-grapes-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-grapes", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-grapes-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    SetTexture(Skin.GetTexture("fruit-apple", fruit_max_size), Skin.GetTexture("fruit-apple-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-apple", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-apple-overlay", fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    SetTexture(Skin.GetTexture("fruit-orange", fruit_max_size), Skin.GetTexture("fruit-orange-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTextureWithMaxSize("fruit-orange", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-orange-overlay", fruit_max_size));
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
index dbeae2a76e..baaa24959f 100644
--- a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
@@ -14,7 +14,6 @@ using osu.Framework.Testing;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -78,9 +77,9 @@ namespace osu.Game.Rulesets.Osu.Tests
                 // shouldn't be required as GetTexture(string) calls GetTexture(string, WrapMode, WrapMode) by default,
                 // but moq doesn't handle that well, therefore explicitly requiring to use `CallBase`:
                 // https://github.com/moq/moq4/issues/972
-                skin.Setup(s => s.GetTexture(It.IsAny<string>(), It.IsAny<Vector2>(), It.IsAny<WrapMode>(), It.IsAny<WrapMode>())).CallBase();
+                skin.Setup(s => s.GetTexture(It.IsAny<string>())).CallBase();
 
-                skin.Setup(s => s.GetTexture(It.IsIn(textureFilenames), It.IsAny<Vector2>(), It.IsAny<WrapMode>(), It.IsAny<WrapMode>()))
+                skin.Setup(s => s.GetTexture(It.IsIn(textureFilenames), It.IsAny<WrapMode>(), It.IsAny<WrapMode>()))
                     .Returns((string componentName, WrapMode _, WrapMode _) =>
                     {
                         var tex = renderer.CreateTexture(1, 1);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index 22111d4412..9582ee491b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => null;
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 switch (componentName)
                 {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 29dffd029e..c84a6ab70f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private class TopLeftCursorSkin : ISkin
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => null;
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => null;
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
             public ISample GetSample(ISampleInfo sampleInfo) => null;
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index da959b6be0..09b906cb10 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -25,7 +25,6 @@ using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -164,7 +163,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 };
             }
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => null;
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
             public ISample GetSample(ISampleInfo sampleInfo) => null;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index cf91ac4596..45a18152c2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName, circle_piece_size) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTextureWithMaxSize(circleName, circle_piece_size) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index bf8f5fd1e8..f38c2c9416 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -20,7 +20,6 @@ using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Gameplay
@@ -141,7 +140,7 @@ namespace osu.Game.Tests.Gameplay
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => throw new NotImplementedException();
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
index 34ea459988..197e9404ff 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -18,7 +18,6 @@ using osu.Framework.Timing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Tests.NonVisual.Skinning
 {
@@ -69,7 +68,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
                 this.renderer = renderer;
             }
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 return lookup_names.Contains(componentName) ? renderer.WhitePixel : null;
             }
diff --git a/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs b/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
index 705fd19d93..11f3fe660d 100644
--- a/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneRulesetSkinProvidingContainer.cs
@@ -17,7 +17,6 @@ using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osu.Game.Tests.Testing;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Tests.Rulesets
 {
@@ -81,7 +80,7 @@ namespace osu.Game.Tests.Rulesets
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => skin.GetTexture(componentName);
+            public Texture GetTexture(string componentName, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => skin.GetTexture(componentName);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index 79ce4de720..82d204f134 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -16,7 +16,6 @@ using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
-using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -134,7 +133,7 @@ namespace osu.Game.Tests.Skins
             {
             }
 
-            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
index 5144f57f8d..0bbf4406fb 100644
--- a/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
@@ -18,7 +18,6 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -101,8 +100,7 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-                skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index a433b67bfb..816834989c 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -21,7 +21,6 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Visual;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Skins
@@ -224,8 +223,7 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => skin.GetDrawableComponent(lookup);
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-                skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
             public ISample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs b/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
index 4acd127a58..df314b56a9 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinProvidingContainer.cs
@@ -16,7 +16,6 @@ using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -90,7 +89,7 @@ namespace osu.Game.Tests.Skins
 
             public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => throw new System.NotImplementedException();
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 if (componentName == TEXTURE_NAME)
                     return renderer.WhitePixel;
diff --git a/osu.Game.Tests/Skins/TestSceneSkinResources.cs b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
index 636f1071dd..aaec319b57 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
@@ -22,7 +22,6 @@ using osu.Game.IO;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Tests.Skins
 {
@@ -101,7 +100,7 @@ namespace osu.Game.Tests.Skins
             {
             }
 
-            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index 326e233e3f..c02cec8c75 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -297,7 +297,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                     : null;
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
@@ -308,7 +308,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup componentLookupName) => new SecondarySourceBox();
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
@@ -320,7 +320,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public Drawable GetDrawableComponent(ISkinComponentLookup componentLookupName) => new BaseSourceBox();
 
-            public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => throw new NotImplementedException();
+            public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
             public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 0071c7e2c0..3f78dbfd96 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -15,7 +15,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -164,10 +163,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             IBindable<bool> ISamplePlaybackDisabler.SamplePlaybackDisabled => SamplePlaybackDisabled;
 
             public Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => source.GetDrawableComponent(lookup);
-
-            public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-                source.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
-
+            public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source.GetTexture(componentName, wrapModeS, wrapModeT);
             public ISample? GetSample(ISampleInfo sampleInfo) => OverridingSample ?? source.GetSample(sampleInfo);
 
             public IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
diff --git a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
index d04bb72bd9..80239504d8 100644
--- a/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmapSkin.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit
@@ -55,10 +54,7 @@ namespace osu.Game.Screens.Edit
         #region Delegated ISkin implementation
 
         public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => Skin.GetDrawableComponent(lookup);
-
-        public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-            Skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
-
+        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) => Skin.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 3d14df70ce..61b0dc5aa1 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -67,8 +67,7 @@ namespace osu.Game.Skinning
             };
         }
 
-        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-            Textures?.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
+        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Textures?.Get(componentName, wrapModeS, wrapModeT);
 
         public override ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index 5cc677ad1c..fa04dda202 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -26,11 +25,17 @@ namespace osu.Game.Skinning
         /// Retrieve a <see cref="Texture"/>.
         /// </summary>
         /// <param name="componentName">The requested texture.</param>
-        /// <param name="maxSize">The maximum dimensions that the texture should be.</param>
+        /// <returns>A matching texture, or null if unavailable.</returns>
+        Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
+
+        /// <summary>
+        /// Retrieve a <see cref="Texture"/>.
+        /// </summary>
+        /// <param name="componentName">The requested texture.</param>
         /// <param name="wrapModeS">The texture wrap mode in horizontal direction.</param>
         /// <param name="wrapModeT">The texture wrap mode in vertical direction.</param>
         /// <returns>A matching texture, or null if unavailable.</returns>
-        Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default);
+        Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT);
 
         /// <summary>
         /// Retrieve a <see cref="SampleChannel"/>.
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 1b0b1be585..cf51fa8f74 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -466,7 +466,7 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
         {
             switch (componentName)
             {
@@ -497,8 +497,7 @@ namespace osu.Game.Skinning
                     continue;
 
                 texture.ScaleAdjust = ratio;
-
-                return texture.WithMaximumSize(maxSize);
+                return texture;
             }
 
             return null;
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index bd38eda259..ad3b10edd3 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
                 if (animatable && s.GetTexture(getFrameName(0)) != null)
                     return true;
 
-                return s.GetTexture(componentName, maxSize, wrapModeS, wrapModeT) != null;
+                return s.GetTexture(componentName, wrapModeS, wrapModeT) != null;
             }) ?? source;
 
             if (animatable)
@@ -79,15 +79,21 @@ namespace osu.Game.Skinning
             }
 
             // if an animation was not allowed or not found, fall back to a sprite retrieval.
-            var singleTexture = retrievalSource.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+            var singleTexture = maxSize != null
+                ? retrievalSource.GetTextureWithMaxSize(componentName, maxSize.Value, wrapModeS, wrapModeT)
+                : retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
 
-            return singleTexture != null ? new[] { singleTexture } : Array.Empty<Texture>();
+            return singleTexture != null
+                ? new[] { singleTexture }
+                : Array.Empty<Texture>();
 
             IEnumerable<Texture> getTextures(ISkin skin)
             {
                 for (int i = 0; true; i++)
                 {
-                    var texture = skin.GetTexture(getFrameName(i), maxSize, wrapModeS, wrapModeT);
+                    var texture = maxSize != null
+                        ? skin.GetTextureWithMaxSize(getFrameName(i), maxSize.Value, wrapModeS, wrapModeT)
+                        : skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT);
 
                     if (texture == null)
                         break;
@@ -99,16 +105,17 @@ namespace osu.Game.Skinning
             string getFrameName(int frameIndex) => $"{componentName}{animationSeparator}{frameIndex}";
         }
 
-        public static Texture? WithMaximumSize(this Texture? texture, Vector2? maxSize)
+        public static Texture? GetTextureWithMaxSize(this ISkin source, string componentName, Vector2 maxSize, WrapMode wrapModeS = WrapMode.None, WrapMode wrapModeT = WrapMode.None)
         {
-            if (texture == null || maxSize == null)
+            var texture = source.GetTexture(componentName, wrapModeS, wrapModeT);
+            if (texture == null)
                 return texture;
 
-            if (texture.DisplayWidth <= maxSize.Value.X && texture.DisplayHeight <= maxSize.Value.Y)
+            if (texture.DisplayWidth <= maxSize.X && texture.DisplayHeight <= maxSize.Y)
                 return texture;
 
             // use scale adjust property for downscaling the texture in order to meet the specified maximum dimensions.
-            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.Value.X, texture.DisplayHeight / maxSize.Value.Y);
+            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.X, texture.DisplayHeight / maxSize.Y);
             return texture;
         }
 
diff --git a/osu.Game/Skinning/ResourceStoreBackedSkin.cs b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
index 35165c2e6f..f5c6192ba5 100644
--- a/osu.Game/Skinning/ResourceStoreBackedSkin.cs
+++ b/osu.Game/Skinning/ResourceStoreBackedSkin.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Game.Audio;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -30,8 +29,7 @@ namespace osu.Game.Skinning
 
         public Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => null;
 
-        public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-            textures.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
+        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => textures.Get(componentName, wrapModeS, wrapModeT);
 
         public ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 0e96feaccc..a6250d7488 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -18,7 +18,6 @@ using osu.Framework.Logging;
 using osu.Game.Audio;
 using osu.Game.Database;
 using osu.Game.IO;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -45,7 +44,9 @@ namespace osu.Game.Skinning
 
         public abstract ISample? GetSample(ISampleInfo sampleInfo);
 
-        public abstract Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default);
+        public Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
+
+        public abstract Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT);
 
         public abstract IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
             where TLookup : notnull
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index f0819211c0..51605c6045 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -25,7 +25,6 @@ using osu.Game.Database;
 using osu.Game.IO;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Utils;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -224,8 +223,7 @@ namespace osu.Game.Skinning
 
         public Drawable GetDrawableComponent(ISkinComponentLookup lookup) => lookupWithFallback(s => s.GetDrawableComponent(lookup));
 
-        public Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-            lookupWithFallback(s => s.GetTexture(componentName, maxSize, wrapModeS, wrapModeT));
+        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => lookupWithFallback(s => s.GetTexture(componentName, wrapModeS, wrapModeT));
 
         public ISample GetSample(ISampleInfo sampleInfo) => lookupWithFallback(s => s.GetSample(sampleInfo));
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 342d6d8009..2612e0b47c 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -128,19 +127,19 @@ namespace osu.Game.Skinning
             return ParentSource?.GetDrawableComponent(lookup);
         }
 
-        public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
         {
             foreach (var (_, lookupWrapper) in skinSources)
             {
                 Texture? sourceTexture;
-                if ((sourceTexture = lookupWrapper.GetTexture(componentName, maxSize, wrapModeS, wrapModeT)) != null)
+                if ((sourceTexture = lookupWrapper.GetTexture(componentName, wrapModeS, wrapModeT)) != null)
                     return sourceTexture;
             }
 
             if (!AllowFallingBackToParent)
                 return null;
 
-            return ParentSource?.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+            return ParentSource?.GetTexture(componentName, wrapModeS, wrapModeT);
         }
 
         public ISample? GetSample(ISampleInfo sampleInfo)
@@ -252,10 +251,10 @@ namespace osu.Game.Skinning
                 return null;
             }
 
-            public Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+            public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
                 if (provider.AllowTextureLookup(componentName))
-                    return skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+                    return skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
                 return null;
             }
diff --git a/osu.Game/Skinning/SkinTransformer.cs b/osu.Game/Skinning/SkinTransformer.cs
index cd7755b854..ed5b04da1e 100644
--- a/osu.Game/Skinning/SkinTransformer.cs
+++ b/osu.Game/Skinning/SkinTransformer.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -29,7 +28,9 @@ namespace osu.Game.Skinning
 
         public virtual Drawable? GetDrawableComponent(ISkinComponentLookup lookup) => Skin.GetDrawableComponent(lookup);
 
-        public virtual Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) => Skin.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+        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);
 
diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs
index d1d094b301..0957f60579 100644
--- a/osu.Game/Skinning/TrianglesSkin.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -44,8 +44,7 @@ namespace osu.Game.Skinning
             this.resources = resources;
         }
 
-        public override Texture? GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default) =>
-            Textures?.Get(componentName, wrapModeS, wrapModeT).WithMaximumSize(maxSize);
+        public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Textures?.Get(componentName, wrapModeS, wrapModeT);
 
         public override ISample? GetSample(ISampleInfo sampleInfo)
         {
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 6c286f37c7..aab1b72990 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -207,9 +207,9 @@ namespace osu.Game.Tests.Visual
                 this.extrapolateAnimations = extrapolateAnimations;
             }
 
-            public override Texture GetTexture(string componentName, Vector2? maxSize = null, WrapMode wrapModeS = default, WrapMode wrapModeT = default)
+            public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
-                var lookup = base.GetTexture(componentName, maxSize, wrapModeS, wrapModeT);
+                var lookup = base.GetTexture(componentName, wrapModeS, wrapModeT);
 
                 if (lookup != null)
                     return lookup;
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Visual
                     var match = Regex.Match(componentName, "-([0-9]*)");
 
                     if (match.Length > 0 && int.TryParse(match.Groups[1].Value, out int number) && number < 60)
-                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), maxSize, wrapModeS, wrapModeT);
+                        return base.GetTexture(componentName.Replace($"-{number}", $"-{number % 2}"), wrapModeS, wrapModeT);
                 }
 
                 return null;

From 291a91be6687c214072b510644cd0b2436b630c8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 03:29:43 +0300
Subject: [PATCH 0611/2296] Change extension from retrieval to post-processing
 instead

---
 .../Skinning/Legacy/LegacyBananaPiece.cs      |  4 ++--
 .../Skinning/Legacy/LegacyDropletPiece.cs     |  4 ++--
 .../Skinning/Legacy/LegacyFruitPiece.cs       |  8 ++++----
 .../Skinning/Legacy/LegacyMainCirclePiece.cs  |  2 +-
 .../Skinning/Legacy/LegacyDrumRoll.cs         |  4 ++--
 osu.Game/Skinning/LegacySkinExtensions.cs     | 20 +++++++++----------
 6 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
index 9f99e3a586..c6f32e2014 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
@@ -15,8 +15,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTextureWithMaxSize("fruit-bananas", banana_max_size);
-            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-bananas-overlay", banana_max_size);
+            Texture? texture = Skin.GetTexture("fruit-bananas")?.WithMaximumSize(banana_max_size);
+            Texture? overlayTexture = Skin.GetTexture("fruit-bananas-overlay")?.WithMaximumSize(banana_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index 63be1bcf91..581259a9c4 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             base.LoadComplete();
 
-            Texture? texture = Skin.GetTextureWithMaxSize("fruit-drop", droplet_max_size);
-            Texture? overlayTexture = Skin.GetTextureWithMaxSize("fruit-drop-overlay", droplet_max_size);
+            Texture? texture = Skin.GetTexture("fruit-drop")?.WithMaximumSize(droplet_max_size);
+            Texture? overlayTexture = Skin.GetTexture("fruit-drop-overlay")?.WithMaximumSize(droplet_max_size);
 
             SetTexture(texture, overlayTexture);
         }
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index e4d25e036b..eacda1dc64 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -26,19 +26,19 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             switch (visualRepresentation)
             {
                 case FruitVisualRepresentation.Pear:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-pear", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-pear-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-pear")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-pear-overlay")?.WithMaximumSize(fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-grapes", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-grapes-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-grapes")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-grapes-overlay")?.WithMaximumSize(fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-apple", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-apple-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-apple")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-apple-overlay")?.WithMaximumSize(fruit_max_size));
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    SetTexture(Skin.GetTextureWithMaxSize("fruit-orange", fruit_max_size), Skin.GetTextureWithMaxSize("fruit-orange-overlay", fruit_max_size));
+                    SetTexture(Skin.GetTexture("fruit-orange")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-orange-overlay")?.WithMaximumSize(fruit_max_size));
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 45a18152c2..18010cdb2c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTextureWithMaxSize(circleName, circle_piece_size) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(circle_piece_size) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
index 33f85328fa..83f05fe6ec 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
@@ -48,13 +48,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-end", new Vector2(128, 256), WrapMode.ClampToEdge, WrapMode.ClampToEdge),
+                    Texture = skin.GetTexture("taiko-roll-end", WrapMode.ClampToEdge, WrapMode.ClampToEdge)?.WithMaximumSize(new Vector2(128, 256)),
                     FillMode = FillMode.Fit,
                 },
                 body = new Sprite
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-middle", new Vector2(2, 256), WrapMode.ClampToEdge, WrapMode.ClampToEdge),
+                    Texture = skin.GetTexture("taiko-roll-middle", WrapMode.ClampToEdge, WrapMode.ClampToEdge)?.WithMaximumSize(new Vector2(2, 256)),
                 },
                 headCircle = new LegacyCirclePiece
                 {
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index ad3b10edd3..dde6c1fa29 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -79,9 +79,10 @@ namespace osu.Game.Skinning
             }
 
             // if an animation was not allowed or not found, fall back to a sprite retrieval.
-            var singleTexture = maxSize != null
-                ? retrievalSource.GetTextureWithMaxSize(componentName, maxSize.Value, wrapModeS, wrapModeT)
-                : retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
+            var singleTexture = retrievalSource.GetTexture(componentName, wrapModeS, wrapModeT);
+
+            if (singleTexture != null && maxSize != null)
+                singleTexture = singleTexture.WithMaximumSize(maxSize.Value);
 
             return singleTexture != null
                 ? new[] { singleTexture }
@@ -91,13 +92,14 @@ namespace osu.Game.Skinning
             {
                 for (int i = 0; true; i++)
                 {
-                    var texture = maxSize != null
-                        ? skin.GetTextureWithMaxSize(getFrameName(i), maxSize.Value, wrapModeS, wrapModeT)
-                        : skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT);
+                    var texture = skin.GetTexture(getFrameName(i), wrapModeS, wrapModeT);
 
                     if (texture == null)
                         break;
 
+                    if (maxSize != null)
+                        texture = texture.WithMaximumSize(maxSize.Value);
+
                     yield return texture;
                 }
             }
@@ -105,12 +107,8 @@ namespace osu.Game.Skinning
             string getFrameName(int frameIndex) => $"{componentName}{animationSeparator}{frameIndex}";
         }
 
-        public static Texture? GetTextureWithMaxSize(this ISkin source, string componentName, Vector2 maxSize, WrapMode wrapModeS = WrapMode.None, WrapMode wrapModeT = WrapMode.None)
+        public static Texture WithMaximumSize(this Texture texture, Vector2 maxSize)
         {
-            var texture = source.GetTexture(componentName, wrapModeS, wrapModeT);
-            if (texture == null)
-                return texture;
-
             if (texture.DisplayWidth <= maxSize.X && texture.DisplayHeight <= maxSize.Y)
                 return texture;
 

From a373d71b3ebe021eca147a220f728ad8372d87fb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 03:15:37 +0300
Subject: [PATCH 0612/2296] Add basic test scene upscaling all skin elements

---
 .../TestSceneGameplayElementDimensions.cs     | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
new file mode 100644
index 0000000000..20e6e5658c
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
@@ -0,0 +1,73 @@
+// 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.Textures;
+using osu.Framework.Testing;
+using osu.Game.IO;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public partial class TestSceneGameplayElementDimensions : TestSceneAllRulesetPlayers
+    {
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+            // for now this only applies to legacy skins, as modern skins don't have texture-based gameplay elements yet.
+            dependencies.CacheAs<ISkinSource>(new UpscaledLegacySkin(dependencies.Get<SkinManager>()));
+
+            return dependencies;
+        }
+
+        protected override void AddCheckSteps()
+        {
+        }
+
+        protected override Player CreatePlayer(Ruleset ruleset)
+        {
+            var player = base.CreatePlayer(ruleset);
+            player.OnLoadComplete += _ =>
+            {
+                // this test scene focuses on gameplay elements, so let's hide the hud.
+                var hudOverlay = player.ChildrenOfType<HUDOverlay>().Single();
+                hudOverlay.ShowHud.Value = false;
+                hudOverlay.ShowHud.Disabled = true;
+            };
+            return player;
+        }
+
+        private class UpscaledLegacySkin : DefaultLegacySkin, ISkinSource
+        {
+            public UpscaledLegacySkin(IStorageResourceProvider resources)
+                : base(resources)
+            {
+            }
+
+            public event Action? SourceChanged
+            {
+                add { }
+                remove { }
+            }
+
+            public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            {
+                var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
+
+                if (texture != null)
+                    texture.ScaleAdjust /= 5f;
+
+                return texture;
+            }
+
+            public ISkin? FindProvider(Func<ISkin, bool> lookupFunction) => this;
+            public IEnumerable<ISkin> AllSources => new[] { this };
+        }
+    }
+}

From fc1a39ede3f713ff3bae8e5a556db9515042b675 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 03:57:22 +0300
Subject: [PATCH 0613/2296] Add size limitations for slider balls

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs   | 6 ++++--
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs             | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 2aa843581e..145a8a50af 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -7,8 +7,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -46,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-nd"),
+                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(new Vector2(OsuHitObject.OBJECT_RADIUS * 2)),
                     Colour = new Color4(5, 5, 5, 255),
                 },
                 LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
@@ -58,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-spec"),
+                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(new Vector2(OsuHitObject.OBJECT_RADIUS * 2)),
                     Blending = BlendingParameters.Additive,
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index f049aa088f..8efe77b510 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -20,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         /// Their hittable area is 128px, but the actual circle portion is 118px.
         /// We must account for some gameplay elements such as slider bodies, where this padding is not present.
         /// </summary>
-        public const float LEGACY_CIRCLE_RADIUS = 64 - 5;
+        public const float LEGACY_CIRCLE_RADIUS = OsuHitObject.OBJECT_RADIUS - 5;
 
         public OsuLegacySkinTransformer(ISkin skin)
             : base(skin)
@@ -48,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return null;
 
                     case OsuSkinComponents.SliderBall:
-                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "");
+                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2));
 
                         // todo: slider ball has a custom frame delay based on velocity
                         // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);

From f963a921dbc59c267c9028eef5a9473cc2af3601 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 03:57:33 +0300
Subject: [PATCH 0614/2296] Add size limitation for slider follow circle

---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 8efe77b510..d176041015 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return this.GetAnimation("sliderscorepoint", false, false);
 
                     case OsuSkinComponents.SliderFollowCircle:
-                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true);
+                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: new Vector2(308f));
                         if (followCircleContent != null)
                             return new LegacyFollowCircle(followCircleContent);
 

From b823507b2a96a06f8306d522530124494a5a0f4a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 04:36:40 +0300
Subject: [PATCH 0615/2296] Add size limitation for approach circles

---
 .../Skinning/Legacy/LegacyApproachCircle.cs      |  4 +++-
 osu.Game/Skinning/Skin.cs                        |  2 +-
 osu.Game/Skinning/SkinnableSprite.cs             | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
index e9342bbdbb..cdc61ebd9b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
@@ -5,12 +5,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
+    // todo: this should probably not be a SkinnableSprite, as this is always created for legacy skins and is recreated on skin change.
     public partial class LegacyApproachCircle : SkinnableSprite
     {
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
@@ -19,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private DrawableHitObject drawableObject { get; set; } = null!;
 
         public LegacyApproachCircle()
-            : base("Gameplay/osu/approachcircle")
+            : base("Gameplay/osu/approachcircle", new Vector2(OsuHitObject.OBJECT_RADIUS * 2))
         {
         }
 
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index a6250d7488..e8446d9ffb 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Skinning
             {
                 // This fallback is important for user skins which use SkinnableSprites.
                 case SkinnableSprite.SpriteComponentLookup sprite:
-                    return this.GetAnimation(sprite.LookupName, false, false);
+                    return this.GetAnimation(sprite.LookupName, false, false, maxSize: sprite.MaxSize);
 
                 case SkinComponentsContainerLookup containerLookup:
 
diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs
index 1d97566470..9effb483c4 100644
--- a/osu.Game/Skinning/SkinnableSprite.cs
+++ b/osu.Game/Skinning/SkinnableSprite.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Skinning
         [Resolved]
         private ISkinSource source { get; set; } = null!;
 
-        public SkinnableSprite(string textureName, ConfineMode confineMode = ConfineMode.NoScaling)
-            : base(new SpriteComponentLookup(textureName), confineMode)
+        public SkinnableSprite(string textureName, Vector2? maxSize = null, ConfineMode confineMode = ConfineMode.NoScaling)
+            : base(new SpriteComponentLookup(textureName, maxSize), confineMode)
         {
             SpriteName.Value = textureName;
         }
@@ -56,10 +56,14 @@ namespace osu.Game.Skinning
 
         protected override Drawable CreateDefault(ISkinComponentLookup lookup)
         {
-            var texture = textures.Get(((SpriteComponentLookup)lookup).LookupName);
+            var spriteLookup = (SpriteComponentLookup)lookup;
+            var texture = textures.Get(spriteLookup.LookupName);
 
             if (texture == null)
-                return new SpriteNotFound(((SpriteComponentLookup)lookup).LookupName);
+                return new SpriteNotFound(spriteLookup.LookupName);
+
+            if (spriteLookup.MaxSize != null)
+                texture = texture.WithMaximumSize(spriteLookup.MaxSize.Value);
 
             return new Sprite { Texture = texture };
         }
@@ -69,10 +73,12 @@ namespace osu.Game.Skinning
         internal class SpriteComponentLookup : ISkinComponentLookup
         {
             public string LookupName { get; set; }
+            public Vector2? MaxSize { get; set; }
 
-            public SpriteComponentLookup(string textureName)
+            public SpriteComponentLookup(string textureName, Vector2? maxSize = null)
             {
                 LookupName = textureName;
+                MaxSize = maxSize;
             }
         }
 

From ab5226832a70099d76ec6737e9197e5da707e74a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 04:37:09 +0300
Subject: [PATCH 0616/2296] Add size limitation for slider reverse arrow piece

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index e6166e9441..293df6b3a0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -7,8 +7,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -35,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
 
-            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true) ?? Empty());
+            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2)) ?? Empty());
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
         }
 

From 922f6f36f2d496b82f7550e02b997aba755514e5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 04:37:51 +0300
Subject: [PATCH 0617/2296] Add size limitation for hit object numbers

---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs    |  2 +-
 osu.Game/Skinning/LegacySpriteText.cs              | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index d176041015..2564dbf335 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         if (!this.HasFont(LegacyFont.HitCircle))
                             return null;
 
-                        return new LegacySpriteText(LegacyFont.HitCircle)
+                        return new LegacySpriteText(LegacyFont.HitCircle, new Vector2(OsuHitObject.OBJECT_RADIUS * 2))
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
                             Scale = new Vector2(0.8f),
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index d6af52855b..f021a99102 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -13,6 +13,7 @@ namespace osu.Game.Skinning
     public sealed partial class LegacySpriteText : OsuSpriteText
     {
         private readonly LegacyFont font;
+        private readonly Vector2? maxSize;
 
         private LegacyGlyphStore glyphStore = null!;
 
@@ -20,9 +21,11 @@ namespace osu.Game.Skinning
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(LegacyFont font)
+        public LegacySpriteText(LegacyFont font, Vector2? maxSize = null)
         {
             this.font = font;
+            this.maxSize = maxSize;
+
             Shadow = false;
             UseFullGlyphHeight = false;
         }
@@ -33,7 +36,7 @@ namespace osu.Game.Skinning
             Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
 
-            glyphStore = new LegacyGlyphStore(skin);
+            glyphStore = new LegacyGlyphStore(skin, maxSize);
         }
 
         protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);
@@ -41,10 +44,12 @@ namespace osu.Game.Skinning
         private class LegacyGlyphStore : ITexturedGlyphLookupStore
         {
             private readonly ISkin skin;
+            private readonly Vector2? maxSize;
 
-            public LegacyGlyphStore(ISkin skin)
+            public LegacyGlyphStore(ISkin skin, Vector2? maxSize)
             {
                 this.skin = skin;
+                this.maxSize = maxSize;
             }
 
             public ITexturedCharacterGlyph? Get(string fontName, char character)
@@ -56,6 +61,9 @@ namespace osu.Game.Skinning
                 if (texture == null)
                     return null;
 
+                if (maxSize != null)
+                    texture = texture.WithMaximumSize(maxSize.Value);
+
                 return new TexturedCharacterGlyph(new CharacterGlyph(character, 0, 0, texture.Width, texture.Height, null), texture, 1f / texture.ScaleAdjust);
             }
 

From 8e992de763c53230ef37b03a2c9b3807d81ff05d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 05:09:01 +0300
Subject: [PATCH 0618/2296] Fix crash when loading player instance without
 exiting previous instance

---
 .../Visual/Gameplay/TestSceneAllRulesetPlayers.cs           | 5 +++++
 osu.Game/Tests/Visual/PlayerTestScene.cs                    | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
index e86302bbd1..63fc4e47f9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
@@ -67,6 +67,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private Player loadPlayerFor(RulesetInfo rulesetInfo)
         {
+            // if a player screen is present already, we must exit that before loading another one,
+            // otherwise it'll crash on SpectatorClient.BeginPlaying being called while client is in "playing" state already.
+            if (Stack.CurrentScreen is Player)
+                Stack.Exit();
+
             Ruleset.Value = rulesetInfo;
             var ruleset = rulesetInfo.CreateInstance();
 
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 0392e3ae52..ee184c1f35 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -12,6 +12,7 @@ using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
@@ -79,6 +80,11 @@ namespace osu.Game.Tests.Visual
 
         protected void LoadPlayer(Mod[] mods)
         {
+            // if a player screen is present already, we must exit that before loading another one,
+            // otherwise it'll crash on SpectatorClient.BeginPlaying being called while client is in "playing" state already.
+            if (Stack.CurrentScreen is Player)
+                Stack.Exit();
+
             var ruleset = CreatePlayerRuleset();
             Ruleset.Value = ruleset.RulesetInfo;
 

From 8f5d1b57a38365fdccad24db4206955375e9bc27 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Sep 2023 05:21:19 +0300
Subject: [PATCH 0619/2296] Revert "Make gameplay skin elements in
 `special-skin` awfully large"

This reverts commit 2c81fe5613e79e2e9370f19d40a1839e28a20c45.

Not needed in favour of `TestSceneGameplayElementDimensions`.
---
 .../special-skin/fruit-apple-overlay.png      | Bin 26684 -> 4677 bytes
 .../Resources/special-skin/fruit-apple.png    | Bin 26685 -> 4677 bytes
 .../special-skin/fruit-bananas-overlay.png    | Bin 23898 -> 4949 bytes
 .../Resources/special-skin/fruit-bananas.png  | Bin 23899 -> 4949 bytes
 .../special-skin/fruit-drop-overlay.png       | Bin 26684 -> 4677 bytes
 .../Resources/special-skin/fruit-drop.png     | Bin 26684 -> 4677 bytes
 .../special-skin/fruit-grapes-overlay.png     | Bin 26684 -> 4677 bytes
 .../Resources/special-skin/fruit-grapes.png   | Bin 26684 -> 4633 bytes
 .../special-skin/fruit-orange-overlay.png     | Bin 26685 -> 4633 bytes
 .../Resources/special-skin/fruit-orange.png   | Bin 26685 -> 4633 bytes
 .../special-skin/fruit-pear-overlay.png       | Bin 26685 -> 4633 bytes
 .../Resources/special-skin/fruit-pear.png     | Bin 26686 -> 4633 bytes
 .../Resources/special-skin/hitcircle@2x.png   | Bin 295339 -> 245645 bytes
 .../special-skin/hitcircleoverlay-0@2x.png    | Bin 87032 -> 26595 bytes
 .../special-skin/hitcircleoverlay-1@2x.png    | Bin 119975 -> 40858 bytes
 .../Resources/old-skin/taiko-roll-end.png     | Bin 2095 -> 0 bytes
 .../Resources/old-skin/taiko-roll-middle.png  | Bin 140 -> 0 bytes
 .../special-skin/taiko-drum-inner.png         | Bin 1926 -> 0 bytes
 .../special-skin/taiko-drum-outer.png         | Bin 3749 -> 0 bytes
 .../Resources/special-skin/taiko-roll-end.png | Bin 14570 -> 0 bytes
 .../special-skin/taiko-roll-middle.png        | Bin 4791 -> 0 bytes
 ...ikobigcircle.png => taikobigcircle@2x.png} | Bin
 .../special-skin/taikobigcircleoverlay.png    | Bin 66280 -> 0 bytes
 .../Resources/special-skin/taikohitcircle.png | Bin 12374 -> 0 bytes
 .../special-skin/taikohitcircleoverlay.png    | Bin 66281 -> 0 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png
 rename osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/{taikobigcircle.png => taikobigcircle@2x.png} (100%)
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png
index c6e27996b92328a0c6fbcf3fb9f4f6b6598bbdfb..fe567d158d0b47f06c39eca9d055b9c8361b040a 100755
GIT binary patch
literal 4677
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
Hu0mjfgVw2;

literal 26684
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png
index 6a862572faca191c265bd1bdd76283c08fdab790..17f3be9c262953cac52da794d601bb853d8dc276 100755
GIT binary patch
literal 4677
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
Hu0mjf9r&r4

literal 26685
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
B13Lf!

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png
index 9d1d6d1177b9e36bcef557251ba3914fa5acbae2..2c94ea78bfdba901614472a3215401d7b0a2dd71 100755
GIT binary patch
literal 4949
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
TP9|;Z00000NkvXXu0mjfQL*|-

literal 23898
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png
index 88bc33b592a04625c97fafdea8040090e64d5cfc..2c94ea78bfdba901614472a3215401d7b0a2dd71 100755
GIT binary patch
literal 4949
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
TP9|;Z00000NkvXXu0mjfQL*|-

literal 23899
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png
index 8fec652ed51a5cf6085cac0b208d3efba4112b2b..56bf4a92fb295a63fb88ac81e8ffe76e83710444 100755
GIT binary patch
literal 4677
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
Hu0mjfi%6-N

literal 26684
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
A!2kdN

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png
index b3d7e39dcdec42cc39c96f004690d7f6a7337be3..f259684055ad3ce25b2c3cdb5c3a53062b60a8e9 100755
GIT binary patch
literal 4677
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
Hu0mjfQGBVH

literal 26684
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png
index 2529b5cd1928637c69a512b292d5533fee42a48c..17f3be9c262953cac52da794d601bb853d8dc276 100755
GIT binary patch
literal 4677
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
Hu0mjf9r&r4

literal 26684
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
AUjP6A

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png
index f2bbf26ad759fb2ca151a839d4e61a983ac45f2a..3dc60464cf31e3ba07d5585542d75d616f63da03 100755
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 26684
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%0DY>5Wp99*Ft
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png
index 254a6f32bca09ab3009cb6d25ca4d57c048ba97a..3dc60464cf31e3ba07d5585542d75d616f63da03 100755
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 26685
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
B;9~#)

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png
index 998f5fb3cb6f04dd8541efdc151bde4014aa69db..3dc60464cf31e3ba07d5585542d75d616f63da03 100755
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 26685
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
CK^Lk3

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png
index 0d8d037a5f0357f90e13ff9cb05544cbd6d7d931..3dc60464cf31e3ba07d5585542d75d616f63da03 100755
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 26685
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

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png
index c8acaaa58349b47893c0c3ab3bbd4a2d472c8721..3dc60464cf31e3ba07d5585542d75d616f63da03 100755
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 26686
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
B?Uw)m

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircle@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircle@2x.png
index 207ce15dfabab74df8b5c13932506d94ef19dcfe..919d8f405ca7f40c921e71b91e7a81655db1f94b 100755
GIT binary patch
delta 42344
zcma&u30O=G|3Cg_DlO8UBGg1eh`O_s6h$aP_Gm>^ge(zFg~%3;97JU+gd~Kd5|WTT
zgd)Tpil}Ir-{(DZ=6s*$|NmXr_xD`a`}KLB{mj%cxILw>*WE7BG>@A&!L@^WXLSVy
zg$`rKxJ*`15Kt8;sJ5dqd)bNkv@n=?tI<*1Yga;i-nhbv`kV5MN8LI+P4#`{5{pR_
zL!K3E8|$^jbVj=K?lWVZ6Z~}-pB4Yr-m$pr?APmr7On*&eyFWgymfND^9Bv&trfox
zRSfO&KycK*>`?5a*!mgiE1&E-TV3+faQ;4F)P#M<SEjE}(6(55)2O0WHL7fU&i8+A
zH;b)JQpbrEyZh!C&l7D{f0+09WV?Y%_fnFBw6&s6PIzUj?csEiZ8n~$zD%Mp?(Xlk
z+CEV)!yHVu4b9hB<|A<LIwv@4)^5$GGi#@moSHZD@%Nr1dc>>j-|@iaipi$9aeB`l
zO)|VwtLQt>BxG>cE7LBX&iyTJbI>WPpSL*KRn@7lgW=2(;Vy^!i>DgdGd2E2OFC)R
z`mLEVH)rsYY(e|%QI}?I{Mm7srdT2WwnuBdr{f)Z>(rKvnHi>_pm`G!Bv@)1D=4m6
z%IIl&2uzs(&3;ZJ=7##uGo3MhqN#J}vU#Sq{Rj0682FE^>ENOL2M)6NXXwzrrq%-n
z4zU_A#A={Tzk!47{uy9rZEec^&ulo8ra6+S(d?#f8onrGahP5Bq9x2u?T(C<ma4#v
zDb(uAxNF-o9klv0j#`fGxt+q6PoBrbYa3!O=Cqa`vr*epeu8=73$dv)&G}XX`wy@(
zql1>%IWL>%w>)&&l+e%+rqsxU8Lnr^<WRQi^<(mMIx=EiBj$i^FJ_>QF;m#poT=2F
zz%17pV_>>`;r#h_9?KTaTfE$F`NGh}4rT+*m?m9Q##qmkd82DI$rM+za}Es&UFNyO
zFJPX7*&th68(TBk`iTp}=Y`C0S-5E4;xOsa*0zKGbJNWK&!*v~!&vb%#V+cm!<NmR
zZ#U8}a5%Hg)S4-z{G|*OSu+bL$&}}m4rbPj3nhYbp7Moa+TEI&PT4`ZMQNef^sr`v
zD2FL8C|c&$%xKCw$^}Xd#jK|_Gn2BDQbcK^*jiXKA(W$(R}`II*31}+m~x5ojnbpH
zHRDCuO)2hey}OS!GnlfNa-8y-qGxH%jH5(TE>mhLJ^NZSb0~W#B@|&lYi1~A2_=p4
zmSWJ~nsKMBr(C7{p!Bk`W_&1nDfcN#1FRW)$}-AHN+rc`pfxjrvXOF)Qcvk)ZO!;m
z_EAbH?QE<W2g-6vI^{j3(?8bCM9L=0b;@r_Ut4P?fO3HHh@v{knsKD8q@1CApcoIf
zW+qeODEX8|O8+6&%sk3L$`gwEP-|ucC7hB$`9$ezXU$BZY^B_w{Gkl6w`Kw<Nt9<4
zjbYY|Gi41Wlk%Bj;$Y28qim<#q%>2khg&lXDJhgPil(DAGm5g7l12HKB66~3W>DfO
zw<)cZe@0j{!IUGEmlW-h){HA9l5&yqmD1hWnwdq}MY%(fPzJeJGm9w4DCHF0QP#{@
zN)#oV@||Kn+M1b7VJLSg0#|Eh2qlz~N_j)kA7jn9QDP`pD0LKzvDS<?C4q8}qBzc)
zv7;=doS;-tI=Wdi<0%^`Ih3E2-tN|nFNLK%peT>GW`<G1D5ogzC`J>k84pS<C71Gx
zV(DSc_*3>%9#T{$S~J5bD=4QaRg}(?teHua&6GS!1Et?&Yi2Gbk@A?L=4s71QC3mT
zQa)0;OtEG>DO)H7lqQPRRBL8F<q+j5rTsK(W+Y`b<s7A&(rvmmGnKN9Qb_qr890L;
ze@ZgtIi<r)di*I7l=GA?6w_Js_)~UJZc$n&HeU4jQw~#JP_$;#<4;*fxj?C*n9ZTb
zpR$uuL}{bgdeh@iIZAm&(ea_jpCYDQqI{$D@TJF}vYS%uYrWf#9)HSW%5lnTik?3`
z{*-9SWlAljX8=9^ls%LZif}GH{*)z@G|F3w!905WDeEa$DL*K^=F{U(*-N=kQ3|BT
zpR$Z{l2S=ATtJUMWh3PprJmAfAwB+-eUws4yC8b}Da$G8l=qZQ!Swi3Hc_rqepC8}
z(Bn@zKzT$_T||#RWhLbd<pafdF+Kj2I7&XHk<veu9)HR~$`gwE5_<e8;gk%@Cra0)
z^!QV@Qf^TGPzEfc$Dfi!c}CF)qsO1JhLTD7Ofgwbk3VHQ<tC+>V!eVMe@Y6ajH0=c
z9)HSON*3i`if9!*{*-viZAvTUpKyBoDMu(TDcY;)@ux&mE>gZyy04+fpR$W`ha#a2
zilE1za*R?=(OpZAKP8HiP5DkSUq_EWg`wP~2qNk6r-V{cDQ_tHVtV{3F_bHmI*LUU
zJ^qvg$~}r=G(G;5rIZtt3QETqdi*IHC^?j$l-}#<@u#qq2NdNE^!QW4D5ogzC`KFU
z@u$R6aw)$kma+8sQ}$CHQdBn4<4;*ZIZdgeblyylKV>r|kJ3Qt7e|jjC6V%&qPB$|
zf66M#S;|LBm#y^pQ?^hFC`}ZrZS?q44pE*`+Ha@FpR$^Aj#5qOwu2sj$~H<N<=svL
zMk{^@O;aW$zOQuVa#M4sY}rRTMNH;SOWN*E5iy>-&`p`6yJY+P;^wH`vgN(ptmftr
zMz%hVo3FTOxkt8sEjRDe{E=YFbW4!UP;TZ+r@M5U|6bX)EN&{XvgN7VOyy=HH^=Og
zZQsw$f4OPDU$%Z5O+h04zKfgv4`5luL>;h{&PUSeF5PEYqHNznZt5SDEzjfTC2p!5
zlC7V?&6C{x%T2c=+4h6n{Kn1U$$c4}6cMvC*-|>+NvFH?+A%4zW1euc$6?v>3U1!!
zrs0vkjOe&2vw)jdxT$_rw%&`Ir@7h6%?Zb3+mpFjC!OweE)l~Vx0KEg+_X)_vMIAM
zRd&pCZd#<tmczMO%+1axWb1>ud5xPLPRiDMb2EeHz*8bdaLSUVyR;vbb`kT7Ca&p{
zE;}ZHo1eHj__S>OW^TUZW}h>%^%2~>$IY&1W$PEy9FZYn^3PgIr%nc@JH?bapMh<r
zjN&=joWjlH+-%^cYo=`bK5l;Drrmkj`mNl2&CPyUvh|VNEaj%@g}%(B3+~cu-k^?a
z>s^%1x!k<S&32b$>!)+`1ULV1b6mD;dm=Z#a?|0mZ2b<JepgJH3h5Lv1Fu-pvb%KM
z<14al-LJ~#a&F$@X2%@a`ao`8=BC;;+4@=BOy_0`H^=A7wkL73mYYu3`!Y+fyHi9=
z)pgv5DPxl-+jj#upK-HizHI#}Zr<T$rvlmfAa3SxQ{#qg{Tyzd<)(z26ASw?(S`05
z5mR3%ySDR9*)e;#`H`E0Zpqef;^qr(_P#A!zlNJ7-0V^$Tfd0rt~(+ougFq5weQHL
zpLDuQ*C`fTGKcS*GM>eKrSlj!e{*y6UD<k;o1eKkv_!Uk3pdNT+4r7o{W@+w;HJra
z+4?2Y=`OvN?t{Ke=41NPH#aYEQ@K>Oei}E^xY@+bu@7b24{)=Fo5LQ-)^F$LTW(rC
zmaUJHPItPdi0S^sQaYD&^A<NdK9#KxlulD7`>E_$)n~Fflbffw+00G%=d$gGxcQx%
zj%9tBf-(`atIU$7yR_T9Ko>C^xcQ7G-UsuSvU9BDW)U}yUdh%k<mOdwwl9~hpUurP
zG#|YdF_Lmi>74i)(~LRtx(`iv={n~(vTb{~`H`E0-qL65J5wh1Eqyl9EaPUc3fb~%
zZr<glaiwg12sd-Nsre4;MU3w|oR2=grPE#7J>SdL9g|K|=GS}KIYw2<=3Z`Ab92ZC
z+4?wczT&3kN7?$d+`P}tZlCD0^^=HM^2t&<3#8Ls+5@U(uP>`wcC6B8*__JFRBkqM
zbIcdn_Wj)amz(zg%GPhADflX4-u_FU*EFqaWHXAJkED}6Lup&sSJ}3k+%)(mTb@r7
z@Aai`(sQc#{WEBub$}nE^UGYie#Up%wN7&LFE`z4W$O=e^BXsZ*U8q$)71GPV&2u!
z=lKtJX<z>XUBo=)ruk3V@=9(Nanq<?wtgW^+}o9U**VpJ$)*=KPjj=Cn-hM^wkLD5
zj;5%=okE}E4fGjG^8?L+&8Eyhjr4g-b0asObJL<pwmzJj#oX-tN47qgo7cG6;je7H
zH#ak6b9XaVyHiBW(PmtdKE|b!KE_*Qha_<G6E_F9%GPh@=1Xq&X_Kvw;O0GUc9qE1
zFXm>Rq;J9qfha*oU`f**FE8P|K)MgBDB#Kzc{wgG4OG}k$^ui?RVZ)!`1XZwc8c<?
zTlw~yZ~c_yTO;{a$~RMG*;aSig>G<*rmS8&`C)VUc9C!GRODNy^X&xR{_t&_s(imh
zzJ2AJgPMHn4!%|JZGbv$^-~wP12guix}Xo5i0#o{U@2=W_;#Cbh8nbWsTRF!ff{rI
zX}iofwGQ%iv-p<Iw-&yQ*Oc#<#5ECHrztzLh#jFNYwkF`h^^ulO<5al`C%LQ_Ka^m
zb>v%D@$C-ZI_b){2JtP2ZyI{?t#kNxmTwZYXnneuN&0ka)TFm&%Kp@sALeWzZ+rOm
zk#B=K($-y_=v~{yw-<ctZ7AQmhHoW&>tZC|x`=Pr`KHxLzSWm&?y?IBJIgnC^6ePk
ze)Da#v3x(4Z=d-#w2OS}7QU79t#4QP)^&V)fOfbWy;r8)=)ID*rCf7oGrQA!pld?A
zNLv8kF7Qp+RK9f@-_rQj#J8~``F;oZR>QYpX7a7u`SzA;B6dJ`x;4535gW}lcebDx
z-I`esI!xNa_;!<T2Ilgu^ZAy|H`Si<tuy&{if_$)bGMN1cZhG_`R3S5wpGOL>P0t6
z_u|ez>PNR`-J3Q@+j_n|<(qjQ`PP+uE8?4xrF`o`zFp;8`@Zt6v-x(0Z*6?@=qKMV
zg=^AV6S2<y=}zg^MC=}}nX(`H%XhZ5lDAmCmGQ0D0QuI{e7nmx<AL(6A$-f_o2E5w
zb+i@?W+Om0s0UUyL@-DLRlwvQ!V9qA3DB}7+`uMK2qeIM5U~nmfm&cWm<R+%K?N`#
zLQDq?C<X0@60Tr9$OFw_upJQwGC&QmuqOgQGAIXz!w63h4@!WF1K|wBAO|!8o8d$#
zNC(xRyCdP_D6nUf(aM3L6X6NsK?zV9K{x|3$N`POW+V{`(m^%o?o9ZAL{J9wTnG=a
z6%+x*QG_Fi0NJ1(SdAuvK^mw6Ca#2+E8S@#S{cwALwJC#pa>|AB^*Hn$OiSmY8(*^
z(m)k3aU;9{3!VTicft*90);>V?8g(UKo+P4mJ{fPf+tW*169DpgYW_@cmlL05^i7<
zC<GE<KZ#fcvOq1coJ<6Qqo4v9dlJ(D14=>rDTFIn5Ar}W7(A5-0~w$OSWF`VKr$!?
zhSLd85D!X#$_&C8h(Qi$1U55?P>>F)LHAjN4@d-MK+lWt09!#3P@GLTf(Vce>Vef9
zA{eBBDq!MGcmWnX0a`wU8`uO2fdtt5601NKs0EgOL?Ac{DuA&+F&!|V6toW@T)}#f
z2b#g)xkMPq05!m39uWYNK{+s-Pk4fOPy$o}31=V%IiL~PEFeNbI;aNS7ZN@o5tISF
zAi@J|1w}wHm~aFUARE*Js}Ld>q=716vWV~kEO-L6787n@6DR}{U>{1X0$HFISS}#~
z!BJ2FjF%GA0Ru`w`(=bHSP$|*GZ-93gn<lD11y#k0U#Na1H%=BCx{0nKxHN248$M@
zGy<DdL?}oH)u4Mg;R6yu8PHozcz~^-2q>;096<!g2KB%yf(Qm_pbD6*CA<I&o&c?N
zgd5ld3V{UJM-r<*7N`Z5Vj>V61r@+JikJ=<Pzu^d6Ru!A$OFw_a10R!GC&QmSWg6i
zWKa$aHxQm69+Uu;jf680gB;KZY+{K}kPfOr_f3QkNCag-Z!_Tmwt^y{7)LmQ2#^ix
zfz=iw7^HzJV6v6)0xWm}w6+m$U=t_=5@5fbSOu~`EwJ1{1cIZW0vN{=(*XlYLHnJA
zD_9TmKr<M;iwFZ5paxj%CIUb*C<lfN;R)hF2~gQXI0G@r0gb>Wfd~cZpc-`FOZb39
zPzLl^!UJptML=;M;Rqr?HmC<y`-xzX2C9I`0m2Kg;0e%5B;3FzPzWTz{vfdmWPw^>
zd58!EM?nQJP9mlQ29$#K$%HFd5Ar}W7@R_cfecUsEDjR^AQ_Yc!y|+zhzBJ=<tX6{
z#2^PW0-Iw*C`bp@p!;#c2PA?rpqEN`fUTeiD5epPAOd8AdSG>e2nK1O3YeTEyZ{TH
z0IgGm8`uO2fdts66RSWLs0Eg%i9m1^Q~={M#B{)bQqcY^;R@D+JkSgVXAof^1JnSE
zb3_102Iasolkf!bpaiI#C!B#8<bXzClSPDrbWjbtUm$!yA}9lT7YPrr6%+x*ON1kc
z0NJ1(SY;EzAPrOjlgoq`V8Iihb%k&Pn?NCu0Q;-NDv$+gfn^R62#$gZV0?|34j51h
z+UF9kU_HnK&0z3#A`E1J8eow}1b}2v4h-`NPY@4EfJy=348$M@Gy<C&L?}oH)u4MJ
z;R6yu8PK~)cz~^-2q@kn96<!g2KB(|HW3WcKou}4BD??#o&c>ogd5ld3V{UJ7Za;M
z7N`Z5cZoo76jT7?5@I@FKq+W{k8lO+K^|xZgYOezAOq9@iw8siNCxG=u$1rw@t_2#
zJS3cf803IPVDpFw1?i9IH@!9B@Kb>vJN&W0Le|#t?Hb>j|FdbaW1k3&WINLaO?J~0
zL8t#%y#3#c+b$|{TL(RrT|=K;`BcyoN7%^@tLHZ8vDVMzx3LuM&@<ZQHF)@f{<t~p
zIbBHFBKUTdZ-4kUq)fiwD!yIf+i$-8^FqGgRDqB?v+D=hI_V|N*e<p7Qt6Ur?2?zV
zCSuRNlppquZ+&0M*9G(K6yLsZO`kO`r&m6@oL<pJa1%torY}Ip*YtX+>9f;b(=ODw
z4NtfYdaUjn*)DqQ&Nl*GHsFoGKz1xGN{^Lp&|=@dp*xkHls0IwUEluK;_UxkO#JV~
zSO2}Z_W6GuJEP*i7TNz?)MTGk(0d@it|n_(_g{<Bcj$k%s{Hz|t&b}IYf<~1d~w7(
z`D=^fTOQxq-qBx0_<f}JZ^V1rPuilmCSvcur?b#H5vx%pZ%J?DZ41Aym~X21>PwH1
zejiAi_jlPkGxqiedik`@j8*<9Z!TQ3!v=Hq)<^oH;IO@)<Y#i^TO`-?*o;r|yZz3$
ze%11IA$&_mE32mOg`HpMvO_-8Wu<Ku-;(jwmadb2?W9fmWs|nBFS4!D6VTtfexbXf
z4brB>+Wbp*`#+1z_{B5-%J=(<rd~sLFyb4%&9iIhhNLZ#Z?E{)>8pI}48E~kGh?Oq
zOvjqBJ-*RhQInq3j6K3Fnz8TrX8K*Wiy7;~H4%FVUkN%)#J=X6ajksaEWYjMTmQfE
zt<vvC>9N!BeJO1TT+?H3*U4{O`G>r@@NGTcZtzX;llBw+rnkh2Z(_b(=UeN4HeGf?
zJ-y@7!)SvRyQQ99<^L=e|L3A6D}6?!TZjCTUu_lNF7fR**X(dAeRlb8`UNEUH@&-W
zLDvRiHb?}oK&M7x2AKFq{&+~6^r4WpK~3~FN!tp(nS2*0vsaqv8qy8YCxe<fdo@UC
zfOXRIaldNPq8VHFhh88x5i9*txc{YHwt~Art(h1DHUU8^y`3+c>7`1WQH#7y=b9ON
zyoJt3Tg})HT$3JV&dzJ4H&(jgaI1WmO0J36Zf*2pXsd{w!!><2zKz}{TBpa}Z<Ak0
zLn3c(eA~jeVtGqY6<Q_?5!xlJqFfT%u>*ucGuBWbG?KMxd`sY(Ia?;6w}|#LXD>I=
ztx}U7CSrFA>9dCxMQkbGG!<!GUq#v_7@PuMz&mB39&4{8w2-wme7nN8Ca#&W9jfS^
zpd-xK&tvG;q)mEj)TF1P|M=35E<}qWHi~Qd?D=-Wp0d-|wUb}SN=4ol^X&}ZzM>ha
z(n+U-z2F(pS0g;ZZtw_bs}mkz2e=P3+7oVI3n&H!9q6SRYtWgcZ5H45^X&!S3_Hm8
zo5r^UuG#I?q|-TqNRSI!fV~#623!G6V6Zl^5?lnofQ=5Z3}k{j4t>^Hm)@$yy29aX
zCWjuYq9?Ru2kX&(E5SwZ3)tur%RnZm16BsaVsHk01(qF&AaD|V1{Q|I;ZF39tTv=q
zDs7kf*2uR(M)IvIjOaFG`|;}<`8KE%zaQ7Q)7N9sq%&R38yo_!fw3_$3+x9kjOj%i
zcfmTaAG`pDU5RNR0XzkI-H6Fx7kCJ?Oo$0!JGckhn-b$d9Jm8iM8s&Y5k#BOdr&5#
zo0PVWX7V<bYuqkR_zk+<<-1Jc+fKA=-RXSIz^(_e8e9gAV30Yn0$c#~z`7@~6r2OK
zpuYvN2%H8rpieJiAvgi5fnOiG@u9uxy3!WTw`{&Oa7~{b)Q7&WXg}_-tUh#D1s1zm
z5_7;oP!2lxC1!$spbT{EM@$8Kz!RX`pO^%8f>NMqMT`gAtmq3`3Umh$lLpf5E*L=9
zm9{j#ed3$>K-pG0DRw@J#nOQ|sWnatwprt(Xqq-y2eyF{8`_}x57vQgpaiJf5@W$;
zPz2fyB1VA?pb!WL6C*$r$OCP_fqq?P*Mc1I7YrRrgoA9*0Br4u<sb_Tw5OM#Y)>zN
z8n?KfThwE3@J%pGwhMjk^G(dR>wIhF+b{=u5JMd3r0L*a(0e$s0HlFWz}%6T3yy;K
zK;%UDf@JU(bR9u&o$m;&18+gsk;H6}2ws6s&cqDBg6Gb3n9gW=m3>|4B}iK^-%j!E
z3*UN;lJ6JDw^Y7;<QjeCkEYYdg9o64E8z~dg1bO%3^4|50=I$kSi%LY2RDFV9O1;F
z&oblaF}RM!Rxr$shyYi?A27t7SOqSD-{8l1dX=u@>F%X1mT$MX#_i%fLB2~2-wNby
zuZMi2Bi|y?PI=HJzJOj6i9nDFK7t;ThyZW|yaT3_2_KLI-heKigcmpfUIL>j#B}gz
zD!qb}Q|M~a_L*-MQ|0UC^X)j-xWl?nqg_0v(OGtY`#@tl;Rd#VVxT&Ma0Rj87Eqc=
zID;5aFq6J#lx7jGvuH6E+yY8ogfoZ%1swXU{%rb+(V`wZc{Y99OIyNhx*=(M$~V0^
z@^zEZBInRqazV=+x|*XmwMdW)T7bO|u?AcLO<=Guu@YPazkrP&onWOO)`4HZ#-GUa
z7wWUI{&auTq>Fm2VgOy77WLSXe2eB=KHns0mUHQ_AaD|V1{U*(`QSMC0J_g7{J~*R
z2}}YBZ*T~_2F44BSzteS0Sp%s(?9}v3iN`A$wBn8b_LU&o(Q6Qk+y2S^$eD;o5wZ!
zsKw4z{06fS`7VBF+e7H2_dxqabmj?*sBH)LK>NkSI1mT!0F_W;G}s7k0>veC?C2#}
z2W|qzrNl@O4f25m3|~g91J^(^unQwrgUg^13|daC02e?#uwFqITCoD_z|xiU+S;w8
z*CB1AxW;WL<TnUc(JuX0(GiQlX;1_DgcA$F2~Z7st|sPzW1tF{ts(qC#Txqk`^7c%
z`*&*eK^#HM0S7@j=)9Jg6iK%hvX-tZZRvdbmv6o4{~Rpax`1zKeEY;V^GMl#^no2o
zXD$VrVq!el21<Z>6fqWT21TG<G%*Tn0EIvpLyQ1XAP=+whxNo-kOTgLp&N*SvGiiL
zZlK$cw!3^&+bCZ*hHsnrcAIa?v9kT_*d?*_70dz+v2<qJO~i7L1%85on~5bL1AGVl
z;)oEC9!JN1N9(r*>p(jA7xdmrEC8bIbkA3}(siZn58sAtldoIFw@ZBc%{BVG-A-po
z25&*v9mH&q2ws6s@x%<kg6F_sCou&u;4#qIMN9<o-~s5cn{WqP!Cj!n5M#h5a2qJ^
zAzb#*i{6BG8z?7W9as-;0Kr}v`s|dw^otuU>an}`(o2=LM|{&}<?B57wu5i?`KGZ?
zzMmW4w(O%{%&+dF3;h8@_7khXCGZ>kbASi~=fMv!Adv_KXTdkn_aG4rPJu6=*C8Sh
zq=Jv2M-mYL-X+m1x|l?FMU7juNtP|@vCH_D$+tSRE-AFL7dQZ30;9vkbg&mZ1Nuh@
zPp}(20@_Cj53mE=2O7r+H?Rd11J&b%D~LT#U#McBkxF=^(z+esKF~-b+`tx43{+1L
zt{@iN0!k+dXHamGKCSki#HT5@sK@G^qL)RB^x?|4U3`1UH?4H}eiQh%op1N}*8Vho
zRqapH)z*M3r|HI9(Cp7(9k>FTz~HmQN^lYU0yY`MGLQ-CfYmu-F*pOh0?SMy2%H3;
zfyH@ZJ~$3OoTrOhWMLgR4nBbH7l^|b=tZx%Krf3Lw^+|D(tkC$DBGaNF6G-fwAUAD
zXX8u6EU+KE0EXGbG>`zEX4AzDFJm1@08fG56=E{j1s(#etHcDb9oz%$bBO3%y2&{?
zbX{pX$hUI7b-pIwI+Jhv_*TZZj=A#vrgDuwNOS2L5-|Kau?}1V&A={?SPd?NMldL!
zSOG48dSG2ZECuI4E$DxPSOiXk8qlYZSO`u4zgzU${ua_*N!!qy@)pjwY`!({&GwdT
zKRY(%7QMw)pyzF3Avg_cfprmGV<|WXYC-=y#3FDS)PO$4#6oZaR2S2+eePl%I034G
z-+j8>p(VIDS~%abOXyo(y6!K(Zs<LJKfY!2t$}Owhw}UMG}5v3Vn7Ax_JEiJ4ubLr
zbVJ=rv5v!#%_<dkXUnnJ`5`eA>;q+><0E1!*aMyb-N(cvuoIL5%_qcounm*|^{2#G
zuo)CRrHiXS!#c1T6oGcniBVt!C<MYXVg!dC%aqZ3K#O|pW4`IUkguD_w|Kri;9G~6
zwBOK|biQzq4I03}ays9bSF}~yHgQd#EqX=oB(2kD+m*{2eeRdj5gFh+==Yik0qNjh
z(EAOs0HlFW!2B&S7aRrefvAG;1<Bwo=vqn428rMm==6@>u-Wgh4!i=L-V-wb3!Vdm
zDq;#?s_2O4Xa*m!4lv*`(D^7sj}7=pFPawh*du&<$2ZeY@~u96OXAxbzICal{l-+&
zNjHJpK>0J_0@i~Y!08LUlLlYtoup>Riotcz3WohlM1ZT{4;WHItO7s2(M=ZD(1oN;
z^(#Fe(&qM6zHSTOiutDcO}^EYZ?Sy4#Wm^a4cJlN>37Z2lg50f!_I!E>wW`$Yl&cR
z3Vf-hceigH)`3&t3+VNO2n4C%Bk1vy2mnXGJ78K*_<$tv26XvFc!2}pB{2F;Ob2_x
zGoar<c!Ea_^p+fNpgX0;Ep~5|E$XrUd^^myO1_yi$@lX{+tNfQC<dy32v-mbZULpg
zgfoZ%1;pNFDvlr$<bsxFdRrV@uny$52#4=&rQ!%8K`v+k_HD!(a0N7h!4hI6xCnkp
zgu@dCE7~QjRHV;sfudf*9Yy*>FcnrsAaA4jwvlVHeOX1Je3y|zMfz9uIBX-@MWNzw
zwn<3m9IQyJRHVf#XiZ?S64rr>;1{q_CYFIrPzS8q5sSeY@D*695JBK1_zVuK(RJ-q
z>0YF5HQz4tt&wko)MWe7KRi%Vq<?szCO<(vw}E~Op-#JatJ6InR;R6%z@$Cl4Gw|V
zz*vKr1@?m%z_0@`4J3f4V3#J{Ur$XsDK&j|z9wCl8n>Z}+n~pqX~}lcWBvG+!nX>v
z_S$sVI1mT!02Li#G}s7k0!3Y7B!~w2KmvyA5$nJ;&<yPKiPhjTXaq|;(mjtgpi4^I
zX1*2itzAd?)=^xO9;VOU>_{(AdYI5qzRL)-MTT_d)1U_QF(MX%6QCOO>_p51$3PV@
z>rD886i@-W8548BK~N4lcOhniePB{IdI|q_q3cRp@2>K;fNyDh`@}c%ZnFKj6CA~2
zX*W8brU@|~Yy%}g-IN#$HiIJ2PDG3X8$cltnh_&F6vzW@z@a;_7UY1xU}z5_9AtwA
zFt8`Rm@(#bFVeP&Z@0NdAD=zxZKti=&g*;1cfP?lfd#GWXF<D!fOPOL=-rE00MfuG
zVBVXU3yy;KK-7ou1<Bwo=xRyK28rMm=+u{(0qDP6(uZMxy8ADE>EhDXtDn3D@-3Bb
zAGt<<Snf~9#)Ai-gB9Tpwt~ArZ2&O_Yy!7|@<74`tOqxMz?yIZVsIU_f?+m91h@+R
zfFb`7tH34j8~kHSgn=Kn^kQz=(o3MmEjka9E$Xo`d@GQ*y@TZ&9npg6*IV`!_yT$j
zAp$`v_y~FoB?7<^@D7;T5k4RZya8S82`_K}yaYzWi0NQ2c;rBL`*|2$SK2Hb<ZV9J
z^x0Gg`o^KH+|J#H%XjhT+hM*{^3BAN_H%Qj!?u88pz1`pf>>}1D2*VTK@2D$_Ku|D
z2qHl)XaV-l#2Rn~G=ae`#7b}x`~sPy=v9p#MK>UA8@VRkpwB9erWYjLFmkkfmuSA_
zqkSDsXR&l8g1|}e8CZ-V=7Zzl1L!`M@CS!MB`_IBc!NXWH86G~W`X_S1u%3crhx?T
z6zGj7c8$kp!Fak;YSKme8`|-7YqUt81ry}Wk8de_tKeHV587{>2b~}e+yN>RiP2yq
zxCs;|5hFn~$OjTId@`{PTm#L(&XZUTE`vreXbQ1(D&5-VDRfC`E8<(bsq%HBxW?^V
z$Zrr%lkYNuZ&7Hcr_q^fK%eQvLU009gPt>pdEgkR0%kJ_Kac_{K(|@M9B>engU(*W
zOfYE<-FUheT}|5l<y-IB@^uUNmd3YFd^4XT+mHSjHiynv3N*cm@n9P$0qQ=)Sg;us
zfp)&cD6jz(0-+x<0z`p4&;}g*iM1dH`~^b;h;Wb%8i4IwVmZhHKf%CxGW6K>^XPVI
zk^XBX-vsmJ>zw!|MoXVhhy4qB2NDZF8u$dv7Z7v7QScs!781T78N3BugNWH65xfGO
zf{7V`{_P6=0Sf3WqPyx9Lf4hHK)$8&?IYK?odXuhcRqslU=f|A!(zf6Yz23LS|~9F
zYy!7|@)E)YtOqxMU@74Q#2g0flckF0Y%3OrEh8epRqzK42_t?iryJiAMt2}>#e7p;
zE??)$w^+X2;u?1X=N0muW6;j7pfi61eeqlHU~me20liicfglxp1U<ru0B{7n1E#A9
zACLszfG%qYFK__71V$0WqqX!pf+FbR(sq(>pZR97R=#yU-;Q&Q{z7yeoy7y}0QZ4L
zB;f|OfMTF3CR{-*xCNA=2xkxj3W&YYR2)Gh$OSFHK89EWu7D;mcs;QaTm+dL=(VV9
zpu3f}(R|y;HR&$&iLeo$2pi~ETxYK7vC$jpurnL!EMI|TED;1wg3rKW6EPng2OmK9
z&4fQV3@U+19N`TPf!Dxz3o#4q2QPr(R$>}R08fG5He%N{dL8q&(G5|PF6y%%w&Ak@
z8_c%LHqajo_?E)A3bgh+=&*4h4%`7M@x*Ab5!?idJBg7X8sq~B7`}^G2d;r;V7HrC
zx`*yy+itpsw3YBposq8_%eT#ZE8<(bJ+l4u+0lFG713GfZ}vF!S;YieM~nLGNVG)>
zwDmNo0e$uo3&9Cc4SKS~Ja7zD0keICA4mZepxb_84mb$PLFWU+Ot24>fsTp9RImp;
z0lEi?NgVXgSq{=mphZ3QJ>Nu!<m-IVwjH7)N`QJ2F&1nFMW9_WF$!z|g+Q1>i~vy}
z53~V?!^B#U1O9@cM~HBc4H|&$QDQmB0t1iH{V5-#d!fcHuICo%bAWGx<FZ}oU#;*>
z%(v@&YenmwN~c-?(!eKRo<__CN5Oj_Izjk?WbhVrJxR<4i9qKx-QTy9bW&;SdrIDd
z`F4tLU-;H5UA|u+-%|PZk!#%P15V3#K7#h(G+npD8NwZG1$TkkSz-*>1a1T648jGh
z2S2jtcAsU?S)@(>oV<DRZ8zT@@l88ZwjcfL(oFh4JJ7Kr_8{NN`PTWoeCtfU?c-Y+
z-#TW=_nXQ!Gq$`y(FkWYW5=wff6GZtdb{*9DlW)(-pRMp|7<F(!9_(~*<Fpt{~1Gi
zf71V31~ol4_oDn&w(!mVl6>77wA4#<wU3}jHW9#K#`d{RcSVaLR(P4tY<iit`hX<x
z20Y54Ygk>Ovq;-wzMbLQSH4+ZmG2kCH4&SAmCj7Zir5CeUAik@w>(GQI^B>p?vmZF
z$xr3ax5Ip^MAOKn`*Q<ZKrv9gE<?mFxK8JzMG^bpro4T^I;A|?#Tmqa0%C7I6-N*W
zazP8QFCf-%h}c&JbUZDJSn1tL+YH>dw6T19j`r&Y9h+H5Z{O%bx?5@6$Te<5{!K+q
zR<VNq4X<>oba5i?R=%jk?z~A~BKabB7RgQd`G((;w{?8GhW7auUEJa}F&`WUA3*ma
z!XF$4CU@vt(lCpzL5*9Cx+7Z@vDfd=y}ZT-<6>f03B8y_#dLaUJI%KmzV*2)-@5QW
zn--gWmrg1@j5cVpuB+)qOBZ{V$d8!EHR*-u!?Xk+rnscpJ^3zvd`m&QcaQ$YPwPH0
z86<!g!1w{-4Gx13z@n500%t%Suz5(V1Xn-{aC}6>fLlQIG2sSwfJZ?82{9cU0B?Zl
zQz8JQf-j)&GsWTUO@~>@f2=pV_L-u|P}5=b)5*t=w;QuCjD9@%YWnft*zP%RDc3?4
znuaYOwQ{+gUx4hVj|bofna`VR#v~gUGoJe9Ot!wo?yffKR{R0XcH>UWX=5X%kAan{
z?0g{$naoZGbchqvts{2t!ksl>f#2f5d2=1itjzx71hRdNnG+q&Y5$IldMBO#^%&Vj
zUH|8T1%`&qTf<5JvqFB>oksufXO*4Aj0x@Z|9dIMjHHw7M5{ah@3$wv__xmH%p~Lg
z{Vn)^e>u;({J))1eh2vJ@{^1Wm{dL8-CcV#hTU`q{NKMA((e@6cY@V_f0HnNCVI?W
z6DKCzWCEjUI!?@eTe-{&3s|;r3BFP2yFq&VWS7yX;rPM&i{>r&qXoxs`Z4vv^Ol>=
zTTEa0WoC}Uy$78btf1g59_un<O8CKV>t?QeedqkKr8`}=yf;00>TS)aU&6mx)88iN
zMrCh~Y@8OyxQx?JYukK5uboG{THM?T;&;`R3ToD_8}=t^>AZ+ow{BGS;x{XwG)!+5
zTwPIf$*xA};hAzxFN-Kz`@&AJyyjBjbF~z&?5>w4D7?A)?c56C=jV$yozZj3UThz7
zNa5;=a=-t}AuEUcJ5y3Gnb0!u>UiIXxPaQFXI}32&)A>0LhN<1wM-Hed3T8L^QCd+
z&Px9@Hb1yz5s_0ctU_46*y?<C;&6$<A)`Te?F6T@XI6e!95N<k(|r4#lI&wC867mD
zgA3aFHd|ylSX?r^$BfCgy)Z$cCg6FN<q0i?Yl&U+*l%w_Jk8F%t?(4&ubttWd%3#x
z%Jg%N4=z=lcewwc_d@Y7``Sl~Zar7?U6JZ^EUjl{g-D@AG3w~cq^N31?@EIYZ)?iK
z%<KKvS-DS4a5~56M=FLZ)CFIXIM`=ws1r(l=j85MAq@A*8knQfQ1$YMic3bu?%@Vc
zA}YHjwq$*ZwmEJz#a#PqylRg+g-VOHlk1kLzu8M~)ZWmJzto$mUWyxZoUM|D*RFei
ze-Uxeu6m|s-P@`?{&lJ&o)tI<MJ+dXYTI?XMwgh8H0hPsL$T5l>vEI(51y2i-K=St
zJx*}VKya*~p-a7C52aJ<D^#~scFTVgQoCz}MU43ji>QV7=hyVEQTwZRb6?VrwGT>a
z_m}l+?GPu)tah6w%t<QM86o~2x+$x5V3fyZzZ+IcW~QA6%s%&Q<6=D=?4Fyu=C4QA
zc3qzlwFy;yPk6@XRww92(fvKsj#3Uk#hU)!7jb`M7g39M^=8qH_?M}7Q_^GNPV43S
zkFGQ^Thr{JFhR$ubVIj~xytK0RJuv3x)ye^dZo5+>krSOlRf<Y75~Z>_vmy`VTkh`
zo!5#@JDl20QFiaP(#&Y#A%)xf=l^gt)p+XZQfVUU_rudPTbzA7ciLoyy{-xY`E9$K
zlDl*|CwXV|F5AJiM@+4%UyQDx;;7g06~YBJ%EKL=4!u!1tl(O9hVr%S<KrR&rU)KR
z5ZW%wb5Zbio>bCKBcjKcOM$AD60v6G{FN>352+rY@8OsFbAOE<TInJ9*}6s2DZO3L
zqSIxi0>@E8+Yi1|1%+p9G~y~PMvi<G`C##m6~Zxz<CZ3-*g5a{`}K}n^drS{WvO0a
z2iG_>Cr$esQJGymEG2v_{jjqc1JYFU?He}dCn?6Batc$<R&~iACMel_vNpT^xtchC
z@b5wDEnzn&Cn-m6XFYy@iLhx3QagN1eR=%NfCI{7;}m8MyFNHA-##!on_ZpZaI+?V
zSxs-DS}&a!m#P-q)F=)3C#G8A@Ilu~pL;vvwR3*aKjc_-@W5R!n_Jl%m4Z}#HJUsX
z8XtHG$8@c=@U|GG)VCl>czLu&hZk-S3x%2D2?_<Os<+uadkpE@z<*kvQcK6Ev`e}(
z_l%60+%3gL!S;uE>`zwV`yyMVOg7xdT-a0N<<_O!wY$9*J(zr<BFuu`H>F~c|CKN8
zW2z;aQ<RqJEuEa79F&zY(^yxb@Vep<arUQMjZW7$O#k`Q{9*Ru9#OhFFM{q{D6pz(
zg~?)71I5-I_6u{|71T}dwzgNQOMjgqxUTY4@!t9?4YSW!rxcZJ>~^w6C|2}U{iVCJ
z-;3n?SEfC5j2~9?&~%hiOVTu**=D_BOg7KiXm8x{YahXhO+!ZS{PXLth3c}rJsaEv
zPtM*9+xf@q`;cs%Un`YO*R?*Kucow5Wl7NS<iPq>bHrUg8w_9KmeRN*H>~+VMZ?Dz
z-Gyyhg@YG8x$dIc{zSW#)?+URE2U%(&ut4-s!KN0(De9Tea)d@K|x@AzX9KdYJK=?
z7qaV_t?;erY**hvgH+X`_6EadCJT=}cwf~;Jm+)Oq;6g}>Ne-cIIQ^Yduh6v>6f~k
zhxL~Grs~w$eVOuAZ0TZqF6>J595aROzvH#9wHhi3n>K&`?N;eAHoX1f()!eEnT@L^
zh(5JByia+yLb0jw^%0SGf2T(8+a`5Y!7=eYoX*vRTu<IyvfknDTTk8I&)yxf-x<(B
z5VFI!wB`P8g=Z$!p|j1Vw0|-FL|(zP^8VUUJ#X%NC()?1jQJHf-cg+3`=s9d;TrFp
zSpCzk;`kY5!$;2^?BtM})}?7(?mfv2x2a0QJSNnZ&Wz}xIHBfvP~F~kmK!^tl+=$@
zJS9w5ZF)Ji!@1%b#hA{%$189BY4Zv!pP-=rL2Gkno1xO5+VL-nSGT+xlIXQX;h)82
zAM=-IYR}QC>-tHMeD|}JdU$Yy__yk2#nlJzica*Y{N-(5n*6x@>_1<NC9hLmQcgJ;
zMEB{EB-wm<MzPAx*ZGPoqm(Y~SJ?A0UdOsce6QhjjfbG6@OII*s`vqYC#`b{v1*H2
z{d3=|toV!i@2>eL>7O>V==8e#gWuKXeM8<{JbXhhR>_y`E*^Ppf|BHV%bd8$g8O2n
zcinE(j^8-uMsCu&vu7T(53v+1xK`>?VWPU!v0$n&vd`+k5$pE7C=cs0d$wYozE0EZ
z!IinID^@71J@c~k?-rwAy(LAeQU1O1>nc@7u1lJm;&($7n_|(a?qE!-nzPwNbKg>d
zvst)RGTUQaT*{0~gRIVNS8^JV=dAE@I(<Wl&4l-Q-U)JuRR6kZe^}?zu=@%^pE9Kj
zDL$+6*?YReXGVhC$MctuchVIUN3B-uprtui(j&rLF<sqA{eymi<&i#9jyEi7SiR5i
zMIYT4J%tbFRzxU;N>qe`0dKS8u6JqjiV9VW+P`{2*WrnaPJS%7r2K2>liCw=^DE-&
z`;Sq|7H|HRbGpwk|1k<mj?s%7lg!TbNcj_Oc+>ju_z!PQ2WbktMk<w$RG3vEiPEl?
z#O?eV5NDO}vUJ`rhm?r?vc7E*H@p1`(}*tpdFcMD+5^Y$M2Q~vz7gtbc6r1-!(KX{
z=f_p5)lco}CJdVOCPi=PttDM%2bAnyU+$!!{xx7jxTIA4vdyUe+cjJ7ymntZHm$5n
zD&6tzYLxe<NOpX2Vp)uz-m@n|-|JV@8huim?2`XY&3WWRU4_^_QK_N=wb+0U>Pxo_
zl&lI^^h7Ox{@*->ruHKQ$Np_Tsgyka?L~#;AFY4B=6dKjM5;vQzI?r{p{~9$cXSWo
zS^clOu9^!x1g~~RiBpRU3STzYT)uL1?-bQR`xW$COx~?`{P;Wf>RPp?OUi6!&6lqZ
zR@&3mXC)Lhwmb6ed-}!M-u^Euin<H$8ypmA7uX&#J9l_Qhfd+5=u?7z2Hg^?XPaq1
z9L?mX>PE##lthmj4gL3LD78&K7+P?)=<2W+%CXGmYn?WfoS(AEJ4n3c^r3$ft=nt1
zA8njhQ=fWikC~~?LH{8+@wrOgy~|3J>9n@H3j{ZQw{Ck^d+t$>b8$+(1rn8!_r%eD
z`>oi|ZpE#u;&Sh<yM5e8yPaZr+_xB!XX2sP{%IAjJ{g7jcSt^(;rgV{mex0u$B$1s
z<~@2;p{}4_>FdcMBfeJVIKL7%M~ofe+jd~J+Q>87v+qdOCFWL--kqPS6QvUQyJcnF
zzfr}jTlMR%1bTh%{r+pg)|Y|42OVweR+#n<H~4UH!O^U`<-#4`j%MF=x*v0I_wfnt
zk7vd;#HJ3ay-}8Q<Co1VYqPW_Z_x(j5Zi`jPTh2Rb(&$DVjwgZw0awl6(+hUhzEVj
zKA$(GJmbgTj!g$Qu8LVwkY_fbYiil_p+h#VwyAyLP^4-1T`baEekeA0L}-E5F$1Um
z%g-Oyj@$LE#Lh1+$X(5^&+ZR36IU!eU)Mcm`t_vT+R#1GK9dz^iF~~)6>q#an(MDv
z7(HI3kdRh%LPfmjv_!LBDSz_Q-onq4{D<NikKT>nH0&oFd$f1v;#Z=yCrhV(ul}j<
zH}ZL3)oV=^Jv~-jJ^#S>Lu$4|*}mBop{IY;*R5GFv_W-5hu1eOVjkZvYh0$dSLs)y
zx!PAh#WB8~stTKrU(c+}KD4G|)78xV)&32UJ_BcWS>7ij)FJmlQq_h|Z+lM<Ed8=!
z{~k8Gn~%7{%2gpr<wE}0*5_-Cmp}h;MQ6`R`|k0!R*oqyb=~MHCDr4jyFOTYcaKv4
z0WFIzx?FyKNlhugeX}65xLWwFGCRrf;=sbv#=q7Pr_+`D1s%vgnpV9iQ+#jGrToX`
zPo9)tseN8m7T(rbIe*;*wHFmhdGS*xg~WY&vwP;i%tO1xTXhSfzkUlEJ6$y|czan!
zYZrPkuUc-jyVrHbD&fRBA79nT#EqBe)2QuWnd8X1Up_iLB!M?=g?}Qq?)%;FwujN)
zETgiBxM897!^9K*rY%!gbFh2Vl<T)XX+-+&v+^~#HDSxoPouXDY+XCZeW;77TBP}P
zFZGryr2%83?tWFz6fX*2G}iZ!nv<SG;O1|+uDv4KX78<t@iv$I`MR!cUsuncR((7T
zntnAnYFk`8m%hD2zmvBH-quyPx3qXz{E%3MUk4_>TkHDyL%^!!344z8nXyMzH8Qf}
z_|M%Qyv^IQCuDW#ZiQy0@Hc05&RU#H?Q!lby>nrk2aIWR+WEeyF6-_|@noOkn&3qe
zn~{s(Y2EBAIkLM#D6tUMh0ZVU=RdjBOXKKXg`h<7EY+yyr+d?{hAZW7AF8QaY2cqH
z87kBnu+nFP>eJ{2i=!U+nndqhR`KjWYpeJDTEWe|%XOPNJP&t>UeQCLt?t#wMuVka
zQajfsE9O1Vq~F$Fwla$G$!ZDMCQb=h*Jg2~I%jmq3{l;gqU?N+T~6b_CfBzNORkTx
zRoZ!1xyz6um8{yen=iW?jh$3}YUr*lQC-t-H2wKJY<YQdZgynZtgO8BL-utBKd!bp
zg^cjF)SclfRET9FuA6C(P;WW8!AG-YTce|Bn!)u4-SUdUGZZzL2&Fb#|FPquGsNcC
zx(JTxM=4*QUX#2<;a6q{#mO5EdI~k3G}#Yuxjf2red#_6;q{g21A8=?CO_NlRP(zb
z($idEXLZW%o6Zbluff8~TdU(Q$5wQTO?g_dx8#?X*}2NV1wTwwT?+rU&G2wm7%m$3
zI#{XF$1l8gP0eqII#xBm{_mB?CKGGdP3|OK8m|yECCXLd>T7nT?J{$}o}<Ppy?t|F
z*0$u*-A-{+#`Or27;X+|()f|Hbo|YW<J9Q~1iv^|F@3|n0m_jcf(6e9SN|y;pcT1h
z-@w$RZ4NOi&9R?<uMo9w-=g2-mMI?F@FaDN@Kt@kKT-OEUTVVv#;8tFy0^c@sf$)a
z<o15IOU3CfKF$gaOZyl7G|MPSIQinjitV;;xQasI<-9>v$&BP)%d9#{oN8ol?=k5o
z%hJlOx`d3nU);L8(aO9v$foVeW1qWyKVR`VW?iY1FNm!ys~8<R=tk^`jLm0WtjuIP
zmKQC_jDJ<l-mtW?$iExab9M5$o|pP7<r{6c{HwiB+~?7-_{rs!0R@uepWV8+oN3td
z`FAb-K5(!`?a;=k!%DxRe73ZnDe@?eOmSCu8xY)4qqnf~ZF`j<-Sy)Xy6L<a>v46<
zfUX-Bl`I~(+v&^di*pY&&v7(c>usm_Npad);qz#P)3g1pC)nhje3AE|^<qxx?UsOo
zj81Jns@@Xgs64Sw_3^BEWs2e*3PI+Qt!ww{3SN|Y2XyNdq-JWMJFL(mCNMCg-2P_8
z*y-AB8wX6AalWf(?}w)yCVoG3XX?zaVZR!OxVR5_();wN;l6WJox~}#A6v11N}v64
z^s}oAj+LnAJ7#@rS2)9`c7JuW<HtY2@7I|}4V)?2eQ}Di_W%zC@s(>)y3xwlf46y?
z?QzME6s`=}aVYI@4`0EeV%y(d)pwk_zV7tC!_=1@u0B!9H`(-9BK&jNG2xHLioXjF
z`RGLk6nGR%6a_7k(FzhR4fgn&Wer2?%J%#@{mb=z=J#(ujNCpdUiSFduHjJb;+6;F
zl)9<S5I%h9R6C)iQ|7kv&bs0SUv}hKRAjZQds`ujxUVwXbVov9y(DyTdJlzuB?kkB
zf43@*yx){&EwR|wv1Lz-#578x>s(CFXHttt!k=aNq2n9+tylOpWR${z4vm{DmFr#d
ztDH6B28`O>GJgL&@$GY4!*q1dl^vaTbm5Tvf%kq}?$?^}<=Ek=dJ0)>_r9JIZ*Utc
znSI8mptM;K#FXv}aa4Khp|oEzSlE=IJ^lFj=)5Vl8H?&pZXfTExXkxU@Q=>92a47l
zG!wchyw39-qjdb?m^de~Buu0HcJTJN0*{}a!tYP^%`jJ8*XpS;)^}bX->FKz$0b8!
zpG0_7MY;+1%nGTUqtw#($E2SU;~%$oiLdI$zZq8Qv*nLNsn#Afg$Dt_XB4;jK5!`Q
zuH^8%DC4}vX9wXq7vHH-)0HQk`<Xr8J7wyRnYv^8o!l#o{C;g}uKWDAexrJv8z=NF
zEDb#77HK<EY}{_a?c~b9$(gspf7I$6Ys=Hl7q9<wYiQrP+?(`k(V5KQ6SeMTe#*V=
z{jOF#t-~=@`h(o@Z?<7c;wKfWLT<2Q?R&<rUi2;SPS>;>Lep4bvW{MnrJCZj5ej?S
zW-l#b+UQ$3wJh22n}<@&;qway#z-{j8(_PrX~nzyT?BjPihDob6n5}@w$ZTXRn>2k
zohsbAM7UH6UMtT0chxwZ!hNr`9Da9tZ~H8GNY5_fhne>$Rtlq)lI}IG){6)hp40s-
ztbbf_S8}j=x^?Bjwo=tf$D+$~cg9GJ&6-}mKAMtU^Ydfp$ZO%^NtGEr7B7Em@7gZo
zXQQqT{eeUEYv_kv!kulcO_vjtKA+g3eS5cV<k;;WMk;r$n(gvIGt;Vad_sO7)u_0<
z_AaaUD(3Z+h?l()yZ>D{C%kV{txmo~qP;t^PxG1TMpe^~e>}SdF;TVq$BAo)#k;wr
zln?(j;zP8?K9$Y~Tf4m~6zrJ(>6B5!Y6Igpnjc%D>)$lJc`05J?Ig^*ziP(STysI4
z8#AeNz`;F}PBo{EjB-}$Iq!Ap<qX>|)zQgGJ^_&)4G~Hc6UAT4=T>@oZBT6*l0EZb
z_aE0@2L_o7?ylHdJEUF6vH{t>_s`VzU9TN6_VSqG#Mw33Jr%Y`TyQTu)3YJl__)OI
z<}&}_$MHW~Ed1|D2CuD4dmm|R@hQKwKqEw@?#y<PuuUANG%PMz=s3P)=M<rnv0B~A
zcOkCx-7=<$mR)I|`~9!@`V=F>&3&TA`F?5GtCT<CM3_d&GTTh?+4^|LZfRRD^=$Rl
zDG+a5eu;kZ^6VNpv^Z~3e)jW`N>)a($`_R;2HRb47;x=n;P!>zx9BlrntGR(PEI{#
zcuJ6{-SSVwH+vWVnOAcS1P`0*-CpH1?)8^E9sNaO;5>Cw#3Z#g6{UPuoFA%|AKXB{
zVM~gtO*GC=)La{E>ylC(awT(Whwzo_|NOXRlsEs{g5j0IrNt}Fqjfv=qR){9=YMou
zdN%)YQGu6EROE>H0b!ZqpzoIx+GgLYw|SLyP3cqjkrA~OMm<|DJe|I!IX5KlJpBsi
zw5BdJD`B%!fyBR!el%TXUU||`@u!vR2kbaus@Asd>8_|t?ZqR$DjhF+UXxKZttk4w
z%7T$~N|ThAtnK&gZH&Ux=48LNhBreEcGkCDjdj%9a^|r_NA%~$+qPg0w{^WMt9M5p
z*R41k-g<DRRcY9B?+=o`I>(ZZN@})e25S_K`Lu1;NWmw?>;7Ye=H@BmJsQHgnl^~L
z4rsiv+@P+bl2ffXc44k#;GdT}kKFbic&{lqRIK^yVr8lAhVbNhhG)$ChA(Zi3f!v@
za`uaQ=9ZgFQsyt!zMk4=*4f`DK91O-k}jM)Rgf;6VKC#W`iwz>7gir_Tlb8~Pj5Eq
z-qI9s+%d3WPWL-)ZZ36YJzB<9*6z-GyDZ45K%A*6c(F6;+nY66+B<TdPpq`@SMzWd
z7;Dz;3pl9$=zUb5%631xt#>oFDCw!tI`V5{sPc7lLC?19zDARuzG^SL+^JFQeDHC)
zlZSch<kr@c=RH&+Uk<a~IazomuY5^CiSm-utxlI4uI=w#H0|4r$;EBTnHvI&HcnVH
z&3vbuYUEAvMCD=ABU9&l^%R_FbR1>ZP!<w$wx#Gp2m7?!W5k1+&)sh{_J4j+zqUF*
zdF!7uE9%nD^c?KVtPkp4no;H6n7!Gv=>IhG9*$J~fBg8l*S)yNULjeRY!WH!HYnTM
z4k0&tmSj8kN>VbCRfL9Y*SwT*uM){DWrmws8TTTtaozj9pWp8f_<rv{aL(&_U+1|V
zBSQL#n702VEIFmLOMy#7=j&$mBVs>Wrn41a&w;f{y+PC@jCj+ucF8Hjypg{5G0tQS
z>G$x^L&NP$zYj<YFQKxRWK*^cFSWG)$igJ{x+rxw!Rj(JSkpDyFZc(4eu)T4hN>J3
zI7M1w+0`uO8F2&1FZNEDyPXfZ1}m{$7X0YlY4(iq{jH^uujtCrNnWRa6{ZJE`XC!)
zt2zhvy<Kxz(JK92Y*IaOIzQYj+VWJ15{c_Z(CNaak`_=&%8Ac&RN}>o`l9mH*TK(V
z#Pc07AiailPmvrNiwLl2r01oWNB>Y;Sc*P!>zRvXganWAbC2xu*8bP`b)ufia>Jsq
z<Y?oP*xw>qd2+kW*D8*Qq>|3%-pN%uF)It(F9XOkY-i^h>elJo?M9(<!P^LA<25kt
zF!&@x5M1w=J&Y9ht&t-w0k?04VZv%o^7eEyyB~dft)8Ht3F*JxiZqOJ_d6ZoQK}#8
zA>%2d_Z6DGc`;uY0t4!s>(`Sc_L?`q^c&hQdzyZ&@NW+qmbMxp4`b69!PUvIy+Z-1
z8YRz@H!R#_E5~vRy8q^vakO5MuybesUrpl&?S<kWAj>h{d_dm9ZVcT{M8*kvbEbHf
z(7ZgH8vD?>*1vBna+u(v`~;JDGM@*o+f$^0)7{Z@!W<;E7I_9=v~f_cg7T!GCz2tR
zfbBl8EMh2qD!cC~wqFW38fh1(%1aycW*Gec!3<;uQ#DukUup~(c!D<SS^?fji4`}`
zE9B{&lKn8zYAlE4*)l@f35Dsz8akkqq_6Ui4ErcU|5{w*FB}Lk@UQXTx_CSrtTO%V
z4E0QQ5TOP=Jo<Bl<0}O%AFBVDt&+=(nG5N!{~204Zi0K(QS>fwxJ}PPHa*W}vZmn$
zcPheIore_sh_6##NJHdZMFg1OprZ}>&662$So5&=Dys#3(mhe^HI-m|YP(L~j^#j*
zV*ZVA58Tgv#K?gKq(~XF#;laNb_>M@4vbL{Qxd-oD6WMz@W<C?&Ik5OVPpps{tJ-H
zZ_#`!ws2I;8@hb!o)r1^n#aPC-ro2}Gr77Hj;QXipLK7}n!x=&DK&#RDHt4;Z^5y3
zXewJB|6ro}sTuu;JVblH%wlT(=-e<vOmowTlWzZk=Qqhi#QX_Ha(Z=wpW~<W;}du1
zo67-*TCV$nA25RM`A!A;T+XbJa@shdSsro?TL0^E-<e&)h4Y(vPZ>!5I`Vk1cJ6yg
zBxNN9vy#vIhQn_VZUf>Q1&g-nig6=*F$&ITXq}3-JiVolV7<H(@OYNN{cHXjx%mC>
z=A};Vy`5&;Q#Q7cm~>`Ny5;Cz!!f~hj2|E|S8-3-NUJ~aica8&qJ_6v$e72v$v&<F
zrrpD7wcGhAtT{LLO))$!kG|@!{St$`mnBBh)Pq&XxcV%C{^#7t|2els-ypILIE@Q8
zC?YVMghBgUd(61J>3*ml!n~)J5X;q8Z!6-4_1L1%#zwgE^xuaTaa>h|#M2%-3%46f
znAh|XGeq$sv1r4UBY!Ry`9T&7W8lDh|JU10hH6kR=iq5>y?R^z(ErGD!SSl4P?r=;
zFM+p*{}4P3bij;J%Gg<MTitE4+>}wWZf$rpPO}qd4O=eG<qv#ZYV-xP+S$qPh-Iud
ziV0=PKr+~)ER6d!O7L>*Tu&prdqnqn1{SJIWpxfABHG^XZMUs!MKH1Qdb(%Z9O!e>
z8anEZ9JJ=6qg>eez47t22&E-xKseMM;#S*+1i4Da@s<~~4S<Rwpz>j}6d;vgs;=X|
zNx!N4B5y{CLFVlMEu)90V|u{YYC-7tJDj)O(vGpD^E#j`ol3H>@dlr!KIr5?NlHq0
zC)MF#4gZMtl*=MROUABD_@<xgP6U|{Jyr=_i=y;!DsbHD!%Y<dQZd2TBkOv$%Z9+G
zHu9!0s|x_EMy-<lu{kvB>K?rJCL<cR<JMkm$1-ymS{zNpDRTbZ#gwb{CPD7bbdAYL
zc?{17OS@(RpRb;@387bP((#ionP){ujrQd7mM|k#FD69d!#Y4?s=0lFL_Pbls+)xQ
z<rB*S8?S?upjS=#t60}W@J3Lu)VBX%jd@IsVp>0hDcxGdU(e-)2bd?>L(m@poz0Q|
zmg_t_I-iT&&cG`QVMG`o&-tPy#2HmIoF+e!CAp6v))#6D<SVe02z-!#UIty$w!(V!
zrXFM2(5#iXI^qJ)Or_e1Hsp&3+wq|+X@t;pyB#pT=3Cyv{Y615(3;+&gyG&@*CxBP
zBtZ(jhHg1(x$CC?A>BR#N?}q1fi>B{8OhC!!SUy8QkU>L=h~%CYmK9=uXl@4BFO}U
zTw92$T#5KcKxr`V%kYJf1ftC^d^aQDPQL2H+vCCxK<-1cZ^+&#r6+H*7|qRe?yZ>y
zP15*HlJ#ZZQ5SBoNvKvr&Flv8Lk`AR2tY_tr2~X8J=!%eiulJx4^B$><&lRswpAl6
z4fx9u@CgBw@90I~?&I-Om~6#e$G1ShJSaD`+GC1RrTQ$u(N*$?bXRPs2ku@%tg6F$
z1rnOo#WF9WRTB*)54;m<yxodz7yd!@E4T=GgK`xZXV!m8|L?#b`MsYNN#i}VCM(!9
zx?;893tQAePckG%U_{KW-49tJtZ;B%a@S<?6$hrlM1W6~xUyX?=kiocot?N6+-dgB
zC=a%VcXi}|hoc|12m~U5<@aYo$EMid;C}F{wc$TM{qwHxW`L?03jKQQfZ)#cg&`J7
zj%HYa&^C1Q4~VsppWVpoLY(IGCnuJ;=Mj(2(Hy2H6qLd`oLTc3P>q!i-jbbkg36%t
zerTzyWdrVM*WH3VS|f-<u!*wz4OQH2FQ2l!56p(!{(b(g@oOp3SO~+9`Vw&S7~!fp
z!-#i5bC4cO3Qc3QttaQSC;ZiP01AfoT#(>)57S}bbH`YLGGN&9Z@K0nYMSkZmOFcY
zcTEvtI;5bCZhNyN)}g4GWSzECFIN{P>G^~g!)2ePIvdSHYhE%EQ-=zng3}0Zpyw5X
zaHU@0A@zA7=0vRa+t$7(sK3#(`;I@kf*#40I6>-`k!OO~N5pz<AU6Mdi#+-aXghY=
z=gjePG;ZwspC$eT?S0@A=~RK28YV&N$Tiq!R0$(C>TIEYF=M;U(z|qXF|9*vTM$F9
z5kC7<{fvm`6Ezv{`s^PX&s2SzGJ&U>HQt0Q!8QEMZosa7$fPK1(<xw;vbz+Q`fr?o
ztLD-*dA}k^%;&`*k6Yva++vFYTZH@Xv&2;Al)3b$?dLkraw4Axf8oWf1cU<z$6d6Z
zefi*0)y!Bh!2NqagP-ns3<(X2USDorPTQ~7b(y?Fa$9aleq!tW#HF9P4SJK{1fRh)
zc{PE<_o1mu7?<j(6_Z%d^E_1aP#=lagpsiCci+vtuV_wxQU9y-1UVH1qDo;zp1RKr
zSEwlZ-0sF$u$lO3Sarpn7UVx;%^x?bY=C#;{_!<}zYP%MHLj`AFELc=SiSbcJCW{z
z*&WSL=iOB%D+8eeXVxc^=~qm?hHJ|$ogAg>zaxZ^nC3nHnfJk&mXieyerjIQ(EKfP
z3qI?~?OpJFL}0xe8GJ;KAD9SGJ+U10S`el5<U{f!O}w9Qvule>BRXinx$%f4)xKW%
z?g!?3RQNp7JSK!zzpC&sWXz>^=+%#^`s+!vfob>(=D0c;ScF@x&G0X$h^4l3E<7<-
zNDL`;iSv(3TlWmUmaX%kK1T`QocjKt?}z=ls!AlR?%3s7W00a|X4&uEvX0k86UAL;
z(+mOz#kbM7nrsYjJlSY-YKq<XF5-O0(cw#@_2ixUs$I}$TJ4%rdsA=fkXKDaN$L3U
z8mRDpz`?R&)s54gR>}wp^t&3)O<e5Gbb`3-j=`U~hD=orm};-y@OV@lnS5}55dS$*
z$}u6zB6n&n5TvmALyQo_*=Oajy^!Et0+aaSc$0b0YBpTauwX05cT)0UP7;7oN4t25
z%=9D!xxnpImAkgTa~pCsKWggij=2@xvHtZjwieE~$l>`&0+o8lGzV~ie9r=qqM>+a
zSH5xt;(c&g&PBpE(fY08vyJ}m3UbN-v*SlU_jAByz-;m`>rK7fh^+{cbJchveD@q~
zu4}gD)9UJMo7UZ-+vpC*16Ogo3*r-k%z>SKAlU6^<B~ilk+z;|Cud{J#-!_*xf||G
z%nlXd98QN;XTS-aV`ditb71$<crs+yJy7)_s=wPMFW3P(#(8I2ZCk(nsO<{$a0qQ3
z4USDHFO$6|Wf*qp;df-hnBQq$l3!m?)>YwmGYuWn0fE<ef0xW5&6l9eaqTI%8#306
z?rkfGSdUj$C5G=+;f)no{JFBcDkLcT`VI5>)2f7Ciq{*RSm`q7r!~{dE~>vf(yV;f
z*4G@?x8lqVQ72aXD6g6EGC^d$*E0hHp_H>zq0QZ?x03cXh)+XRqcK(-|4YHH%7-<y
zm3(F@okxm5zn_Be#J&#t4^EnqZvNL5Zc5B`Ro#T1kYRERFxk-05JDApy~TcF<=n&X
zy5~_8x*X=YCi;TwQ&`h*GY4wh=XEd#90mP+<e|tlqK{ggaeS6}?n9jzIAR8?=(cGY
z#DCYe^xm^8aoWc{YDCgo(CtVzPs{q2({Rs5s-#^h!0;L}g6?U@b~r-!0Fvyt8>nM^
zccxEl6FsziPBAk0dfb#DG!xN<=c`|S$vi+h%)Ji&4~`-+k#!_rIgEnY)dvt55#*=Y
zcXFO;XMW?KITozrkRZf|@h8Y-fx*UwC^3OVnPCE6Y5N=crYZsbmlg3c6Lycwwyt_q
z>F}T&4NZcEM)c~IE1}wmu8`>)H6$aA-Up)TjbnR^vov0!UAH2C-6q42!ZOMS5bV?L
z)O%!k6nU5(Z|E_*flB96K>&t)cWfv0`;k%Rr18yH3lGrX<Nde7`#5PeW#AFEaD}=^
z@Cs?NG-kF#M;g1F&iF>IJ$919hrB=}Mix*Im1pTa1(dKPh!4u{F%hM-tzvYwHXTHX
zPCL?Lo$E+WvBq*wo27yE`KpJ$`V>3J&(~=)QJb@}b&Vpd-;-fQc_Y+6_~Xmbpn)TC
z{0k!zWM5c?Y0`1W1^&vBHF1E;7VtdMl@ktJCXFpZY&QwZkc1nCb}pxvAyL=~u{8+c
zGOK||UA!YS;mbAWeK1j@N0gB_;Mn@RIb8JAeW-9K=cFKvWSZp$)i7oaVtvISYR9b)
z4SQ4qRe@yRhE&*;RAB}i#K@st#aTx`oxwv!(ycAV*+iP}{E!kxcwq73hEG8vfDvsg
z+X9foxc~9CxPvv*lOZ?#<yitRVQQiHQT>sXzqGpxL8AgNsHiftM>YSc?M$ik{2O#q
zJmKCO%Tl0-_js**(I#ftpzpGPyy^`iB9Wu64`t1loehjQ5aq8`QPuAQ4^qII<uZ13
z;A7hOW;MD)o2Mke>(}1N{B)qH?}CxDIW2S>V77to)moQ@GG(#ZTq+e9E9k0k#j5@E
z8XAk+V#t2T7qg=`KEi)GjNN3gOcg9;={T^LSoCUmKIZV0B#B^7`k~JsV=-j*;ZLzY
zxd-aYU;*~1mL0t9vJqPxsAu*2sP_w_m>vBLRuaDFS_O1Fr=ka@?3q<*C3@Xah^VqM
z6Es@)>ZZ#v-75nV%MESU;X$20q8KiuDyXObvqudMbgh>!lo>ywK&i@yu@>0?>@5<A
z3CU5=CW1Zs$}Y>*s*w~gEiT=Ub#lL>8OHV~1?-Q4NXvlJjCWwZhd8L4o^C@v!fN=`
zWDTb6^Yhuzt%Vu?yTrT%jpIrRfo4or1*X$IZCzHLWtdO=tbVi;2itArhmcj@+2+bk
z+U$hqGDG45y+wuImANMwu|*JM{k{6N%gW1+nI3>#y><;^!hacj?>3tgKCk{rhOn`B
z04phLgFo(p;Ut_ilzjBQrswuIg7#>rDMo2a;)cqPG5Wb$<|bm}gxBs|h@$?RMWaje
zrtL;`642Hw+3TttM7k~)OXq8Yjh7s{@Gxw&kc~{D#9r*FI!Q;_BiD99$UnLWJGwmL
zkNP}G@6}CfEWrfg9MO>r1Gof)DvB`tlpH{kHv#NE>1WM)`|t985E@aI3p0zxT0yHC
z1^4W}5f*nM7QWw37r&c>muDnMRXQ=DvMR`Pi=bz6PTtJzLc+ei=!oqxN`8|uy!}e%
ztzy1;U02~CQ;uc+q$Vq9e+&O!M_}&i)^<BXAxSeldH24N{kuw<$C*Q%RoLl*=YT!^
z6zJJ&4?A-_DwT2%UkNNj)qJKkr!Haz`4+RVFJQU8@8<M>tc}heUE6I#NvPM<8=WAj
zE<Xj)Ss1zOz9l2x&VS$EF7cfHEtyQ3>&;}h-AXZl&@NmXt5WT?ffqve5<kD%ef8aq
z{j=|wvp_!KRP4~Zkko4xW5volrEfap2f*$*kt9tmpGjOSa5e?4dKTXyR}zu^kFL5z
z32<eFw0rHnG?IaKn$XL#uxC>S4gL)v8<jBH*Kmrjbu=&8$pGgODx(2JkEc7-s~B+s
z&|_rd2+KZ3W=A(8_w&R8|5}`^OWJHwfl3L?N_X2m*gA`Ywep<YYY(%BoJ~;$JDWuw
z%wUUo)zl6fT-B2upzfk0rk*iXJG7eFxx`|tc}}kxf-p^y%#d@f;TX~ENuP+d_<k4~
ze4P1DPEw%%;a6@$B=?#XFh;eN7%~154&CSR!g!ylsUXDO?)>jahgCU^7pi~v!%N1u
z*Y*w{X_&Yy(*$ULk2*GUIQ2lgQlrl0#Yu3gfgLru$_=S|APOxO$;hxPMOnj}tOh)<
zQDk3njBHs{anxZp<TN_cAOwC??Lb))v6_)L*;CKlk`(jy*r!rk>Io-8;|BW*!0)-H
zz;MbEua2GH>5+c;_i{{Nw*&b3TQj1Ir*Vajy`|g~LjqrP+*QDWf2xIP%?)!gAe?a}
zDQoUz$}jK0`HY;(z@}J++uHCJ)ppUSP9F+*oz8p_2dj2~Xq%$kojYfRUUB&K!PkZj
zdwmCR27ZW=Y}j{l-xm`F?5AKp3e$v9WiNyG;uj<4GEeib1CqBE={knvU5Xhx94{YK
z=%(kD$}#-<<v~E+q?7qshbs}~VTgnc10kE(d#nTQhrH6$heF#z5OY9mo5?EBSUHb)
z+#)<V{By{87<Y@|l%#np<<=}i>=GGAQh$O{+x2kS%3zw$0?AvyB{bh<*+Gh^PPx8n
zB#!#tV$Fm!|4?FaN(+*z#xV$;Ym-uch&~iUy$3;0CsladhKT82M{#h>220|lgGU;y
zE`f9u?62wv=YL+HH9WiB=!LxaLwVd$m1+TS=Gm>(&kaQ!Q6}x5VGP4%2jK7(&KK9~
z9?bnHYqAo^a~^ZmSzTdf_jhD>Tkh+}9xHE0lfacVRYVy2^qzH-FEi7*pR2|3b`bc9
zU}K{b+e$R(I2_`OGni~=WHTRuVdj*Nai*C}SOjwea||B!mCENpM9#+pF8qluLVJ%&
zfc(~ak(*q5(!<oD>EZbob9a@SckpsF{gJ$^1kfvPtQdX3dV}k2J6O9>+)pDsq_WK>
z1No<J=#ddJ&IYVaFM%$ci2DjV7<Xv^P5}cf#FOYmidwJsBzWku>)er`%D2XWXu6s(
z6R7(+S{z9s<QWvi(=WCz*BmoKwdNA|y#9sellPfyh2R;6Fhuz&^(b~%7zQM%TlVN*
z8ko(q2fD~hunFI=`%!^mr=x>U)n&AX0HG~weT_c@Ck(C?l(h6+fP)9M6<9IcaPMrj
zq587AX+ps!BOHHA0)O+!;lM-YvBB6MyP{&N(y_xiDNk?3G^4TEM}R&2r>Ac3lsS7A
zu&ZGY+(qNFl~C$_!KcD7D9M$4GNL@%ka`zwbxHkZZT9bu4Lt7!?!BLR&*N?*jHV}E
zPqSU7FyJI3pI+5<a1r(In-QNEJv3ka&>vos4K&Rbb8ii{8&UAE5+zKFvy5{vdkN5B
zdZBGIQ9`y7GiHMkNH#<l0qvZ>qE$jQj0#r#9zI!V54dNjuyb6eD*!u;R^GRJ8WW@(
z`sFZ|<l8}j(@+*8Gfd=I?AGx(=FnVfRLOC^*P}cV#R*QkGRvGd_hISeaOi?>22i9y
z7CIx?dL{Gbm6Tt`=2t`*WKn6&HwaXMTC;ub`JJ=!A`X1zViP(te(=tf9n%5#8Y2;^
zE2UWaDxGn;6%PZ=`>Yq}{gXb8bmnxfKK?0MZElnG8Q9Fk?kX{XT%k?Bm!LtqCFijA
zrzkw&Jm48OcM)36wde)%{3C{;$a;*G__GDR6L(}pIpeIiVjJdUftt;2=Prf_hJm$N
zztKYwq6MMaE{md(f97ndU}49s_UyzVOQ<=3dK|gI+o_@cS#M9S<OQ~pwYqG?2D1iY
zq<I4^^x*r^5RkO-k*&i)C3oP?NSRq0SYQH6g&LJ^Fu~#0Ih_NIX<QMgvZuX4xCk(`
zU;SJ0=?Yz?mv+zX1QEX18Vxf+U@`L-o)bw=WFV5UFERXG1|ROvV?2ZA_{rD!Da4IW
zwK@sS_gtSQ>W|eCmCudwW2r6Pt{c>9NGG*zvUa#|#X9F8Xu#<0ph&*;&=HuXfj@QB
zk>p`MZ+$E59=?>U(8vswXF1gQ!)O8%FdqwiE2lHeAckeG$!1y9C?cFcyu0w6_qG|T
zpnyFFdEWZin-pMZp+)MR*vNJ(EH2}-ohDejSk`eQOq=>W3QdrL{?mi*5u|l!`sZCO
z*Kp{9Z^du6mS;~oAA<mz;O;x)R#b(fg*7~i*wEXO!gAle6sgG06%PITlABk~Rqbx`
zO2^OpA}3v-_WX6dWB&@-zK?Y|*jiKs=A6fWDHo!>^C{*L)!C=r&tE^unQ*s&t~DLP
z=bJH>O}nkd$lq&w-m&p*`7kdi2S!O0ZP|95brEhd)f!}3Z2uzp3Jh8x{*nqb<$!L>
zmE7CnxI|oGJqrnaD3vE?d%ErsQC>0po`OSPd9z!b(fx5Mv6zWwK4-9X@6Hl<=jq{(
z`*&Hs>IpFE7b?ToGD4ZF+J2lFBM`>b{_bB{%_C+T%~4n8LGBpBX3JoohY@4e<D2Fd
zj%^*d{j_HzEv;>XWhmz5m@v@Jl)=VlPiIBDeGyXe5?<VGh0!!g)}M|f_l%^k#^b3)
zui|g>SavavL1;P~I7@md(fZGDeIx%LYgcW^De;CU4@5#vUP7YGkDU%}`>2n2Y|8%i
zurc}%pm|8+SvDmRqpOK60mP>%VyufPL>7AX%}i)VQ56U=1V0KwqTG#^j-LHl(dRa!
zTl=}nnWP;%r^3u=c;6}<Tf&AAtzu%%j3HiqYO@S)#;h?f0SBVq<-VE|;XkW5fGw6x
za2&#>VgemN`qB1z=Djl6*jZ#nrl-zvj|G-ft&vY`VV=WXw2s}jw?k!b2xUD%R^75a
z_U%mmFJMLwhfx?<Q8M8vHBd9L*nrNsXmMa5#Y6x3=HxW(qh!8$we!KKqa}c<eqejI
z{)JQ7F=f6t7a<wEd(H-D7&`KL1K5E$IO3Ndo?s$zhIS|$$FGZe?=wJ9ggA%VemR!S
zf4`Lcj42wNvwt-l!?1lZ*H5cjB%o4u2%wBvg1F(>^BB5vc9)UP1|v;3c86`YbwS;G
z^&&vShVZJL_Ab<6pA0LJW89z*H!@d%4}J&h>N2_NBghZ;mv5sLg;1H{p=|#Jph`bL
zb$j14i8s`v_Fg2k?zT}Lk0O$$0`UtU7P*WY7JAupHNn$;mvQ!DpS2b}Lo^uxnS2rR
zp}(Y%k-MpFrBmm50bYT`wN|fF6vgdA-|g1ylC4<*QL|p*(M-(Eh{qbICN=LqAQ>lo
zw7zT5H_QFT?RZ7D2&S>6x0LLYA!7RP8jg&elZC{@&sH8PLm`DXoabFx_w07)_WSA)
zgJ(7fAF`bGgPS9y0WoI9yO0eg^olOCVD4~nEMCC%aH6am*b!kQEd>f6wq1=+B=Sw6
zJ*CVZRgvyy4m~gke+MDQHvbR5wyu!kj2onFN9r59H8LbF;pSpG{04fMUqT`eea??c
zcmE0A*LXX*(WZm9f)Ts=Sfza?wKtdVL);Bfs%3!S<@ZFtsw@A2fZwY}a$#vvxXaw-
zSsZ={w)UTxqasur^y+;(_XeEtZdp44zkPa)ae6v@YeL4om;e`f`ZcMTEn#?j9GFXP
zjyt;2#JBk^_ys#4N)H=PQ6fq36%uWZy-_h{pFP~X*zov_52ixQ^I2wTrB?U1;S<T5
zrCBI5cy>d-BJ?xp0AG7&KR;~eq%)bfMK4-ocG1`9vM?E+Y7qNti|o?puYJPR{u#r>
z;!7!W)iHB6?;l#XRp%CA>OCKjwvREt%s+x%=0hoaYJaR1*%C}e<_1lsYOWohKiF(x
z-?Dos<zPO<?9UYQIS~I2t8&<-6b{2@jYJNWDMmvHuR%`O2j9ZsRU?yUe<I_1!c+;M
zw9bMb9t^?}+}Uyk3DUW=F|&iwu_u5#U#S6jnOn4GZn_ZF&lA+~CX1+*JaZGRpYF(^
zJE9mk%;$@V@3rBJD*7bu7x&W)KwrYRK(GGT5B|urWN1MDvle;o%D+9al?=EcFQ`5n
zkXpn5IqLfq@+eg`RAnXsr)T{v*8;tHi%yK;2YA79g{0ITY-0vV5tA=K;=wH+%a=Iy
zZ+`Pt@#~|ZOJkzkyZ{%c6<=0HOUmW2j9>cOZq@#XlFLwyUhQJNE6}mkJa&w@0bSE8
zF=Lhv8-*6nQTcvFc3c1$b19at6;XumD<F<QNI&UN>!!Pi2qqjAOugp^G>Qf7L+2e>
z13ZTHhSN?Lx?fO+p)Wx_*@gKb5X$ij$q855rD3t`LG%7!D=|(dMuz<|%03?iI(ndK
zb}-}a$&&NoqX|Wh3(awt-NNqK#RT@p3DdM^i;shjf@5lbe1l&gfE1%OmJi1EAit+a
zLORU0J~Utfjzs9o$h|ha(fVaXbOD3ET=Iy-{e<f(j7L<>XlaQh;37o#@VjsI4n3EN
ztJ^GtsOpqLDO!3luSnvri;~ZOy2AEQw0KEgh37~2M9I_F;!DLq%a-EwuLR%29P0k~
z#CriigNDWNvQ7GSZ+X`6U-bq*ubYrJV|P2J;!fk|3VT+fUqZ}1jC`kOg3uo_Ese!w
z7Qfhx9WG`i(t@;03E3?zso`~k2Yg>gLE^}?de%?7g~+#y1Y?*{m3p&#u_VZ~hpUq&
zvFY3c{2t>vrMaJTHa)>8VC|GpIe@_?e0kbh<aj%W?icTv0fozC1{k<|JYPZTc+}1x
zVI(PD^6;JhaOhHpSzHgbx3Tx{AMGn8<dzgg|HkgfG=Qc&V4jdh4i|`Z=^D<OpYov@
zObbFiy_u{(xv+G7#P^u^)pI#8!6XmfDp+bI#KlZVLYmveL5|>C{NOS%yeO#o;RiuP
zRC7YY*@CWdo$F8rcy)-6QawA-^RmLC!?2N-m$JGWnCpRchcc%;wYd)!Ya9vbUCmTF
zahaJK!4co?)0}K}k6^a^&Kcn_)bOi&Ym)V*_X9k?o^KZOSP{}J^69haPpqhJ_Q8h_
zDoH||Daw?HUzVW}MUkS*etYNR))mu=i#gW0>lZdSu<YQ~bm6^O!=;_@AHtjo*T+L;
zi9A8V5a1GjtJaD-Z|ONxBKQ9o!dd>6FiAc&+ELKq;~QmDf;S+R9t)nk*VucUE?=~H
z)iAq?=v<knQfG(FHzx7dLmU++wtjv02|r`RCo<N4x%!oczD#R4(K<Tb{P}@iquov@
zS1j!;2Mr`H^8uu%!0>;FOqf1&1f9X9LRs(0#F)MxP6;6HR$3#VoGSc@)axn}9)*nl
zj*Kh_^*LJ|gH45va;8Jantk>~JzXd{Ts26?D8g;)z}+k72YiPn&Y9q;g<!&>5V%Se
z3+#&0Ip?RGq}`zOKUiH}Pzqmn8$0UF$JGC@oCNb&wkISrn98sP?`LqsP?pGh6OKnG
zw&MjPCpx|rjYnLAGKA)D-w;<k{GpQrVD<|!iB#xENB3ctF~F$V-z#0Zi#mBXomaSB
zh_AecqukDwV{eYHE41vIa(OtZ<@Q`wn+UWaXHSfeb{+@HcJT!1{4c<s5g3s*P%Amr
zWFk|FjV^Iqf7spbWR+NJSDZ)NZ1bLKil^NmwD_ek7Q9!2SD~1@R@N5xZ>_G7wss0H
zQ8-<J1kdgN?}#~nJT$-+>3DZV#d1`OG-l?z-4RMIQLEc0-}_Ey@cT{b3b~(y6}&Q(
zCq)Si>30xciG65@#9Zk%1~2J8Am!~Br{RO80MDyX0<W5=I?aiT%w|)`yI9Gho`NvR
z;A(OohQy_nz_QufLv+bn!Bvw<NC&}>ib{(3%dVs{R0xC&VTw3b=zO<M5J29PloJUD
zCv>Lp_nD)t!i{Gp>IaI+-WSKF0tK*aKDd{_+&%NyYchN3QRd)3t)xc~SG2Zu-QZ2n
z3%JcA7O!coaK#{S7ZXZFk_aVS36{Hm-a{Az=_i-KmLB{=z)!-{E#0)h$63B9O-~V8
z;x&?1qA+0!GXvOCSe{;wHG{1^VI=)J<NSgnP><_u8gCH%qJu!&_QdP}!X_wUY{-Pu
zFE*&FDBzc+H@KGr<VUt%2tsy#WF7b`9yom!K(*Ugrv%oGK6Ufdt+?{^o+M;VZv}DN
zfh8z=Gri+cm-f8U2c~|~$U3XxMZ~HFyD&wGjIhwd{bHL>JoRt4;^y^qre@AVnd-2m
zHAx)~Vg&9UxFQlfV-bL87O>h3lP=o}kSLOcigP=I-l&oo64mk3OC`@NbKl{~XW`G)
z>;4j}PN@`#s_?eYU5!QFxj5PpbiVDY@@VO8l?u6_n(x#~{dNHg((B5vd;4=WO~K58
z#qiwK{e4WPg#O1m57a`aULAF?J|>|pdL;)aTKvh9ED+TCgtwgI&Z{&BHhiT<sVzlc
zkK|+mo_VX#_jP*o<LaWsbW8y>+`o~(xVPe4Z4G%&W=OVVajx>F#~1ty=CxmxT9WMe
z=G$%i63)k#CMgi)ZY;$X6Z%l4Ewe|R>u@6inr_wd199%WW^X~X(`aV_^xaNAheWdW
zd(GOGK#{1;cDAX)v%}cVu?1!6y6(vPq@8Q?;B-J=Xs`%7riat)?s$H-U0lSElX}YP
zrR=*)^++hZ1&KKtU`(L(sIyARvf;C_ol0=^JCutjcs!>9s@$&+2aXvoz33PpMv`r3
z4Ocep7I!eZ5qlgL=!~MHG{PsV2{k@Ig9{<adkLz94d){B-}G%+62$UDOr_ZTc=EyB
zTmGZ_`{zn;oGmb_Lkvynx}qb8S<3K&nDC@0TU(`~bMglh=rHYRM)oj4i&(ZU1{t}7
z%7lqloxV`6b(k+DN1<xiL&w@&PG4oJu_?3vTwmk{dV?G9h;i(s=n?+bB2Ap+T6i!2
z#lHTP_KpPkN`siAK&DK5c>3J51IQdE?j_Zqj2*5Kqj;?f@-gY@>yzikp)v76T_I;Z
z^G7k;)SscyNrEnD9X%;{%c42wW@paf*y@~2%+U+DVQ?M-;}gze&r&!a%L;a7Nbp4^
zWwJ!{jg}ETWB~O)PL&+aHqIA6^I@()Rli8B%&3y=h-FG&KV87_iEzFI|1MA`{a0bU
z7U3+}kMGtJlHo|1iA!=2>#UW<=r8?c>{2aVlhbH&<j8`=UU*VTNsR-Wwx>FzcszYu
zBZSup@hz-W{5-_Dk!8}3#cjXWyj+n<kkxo#BLfTdP~H#hA{&g6$p#_PST}yP=98RJ
zaKpfZ$Q1YDDwsdLqyThQ0Osy^o;Hoj(5M^YOTo;<R1CyC;&r*;F1!EaTv@D~<SKPn
z@_!QQJPw4*XX%}|!vu~v_hNCbJhoAq@mcf>;9C#m60+n*mnsyI$=(!cbOlh9`3!0A
zS&-cp-HIBZuGF)k4qM-_2cU|k_Y$%X3SDpMO(%GER*z$g!FnseyOG5KJs{qF`16Hl
z5xbfD!KZV*1M$j~@Lu9SSmya5KFA37-PKJ*oYe`R+t&Y66Eaoi<!4WPRu@$>k55EF
z&0u7{z$4T%u53Y!G~^Ba<TEsRQ?$`DKpHS8Rz@xhvMxkkKZ^-u)p%Eyc6COKsgTzl
zr2(#9&muti;~Lk>S0Mq{JLTp)l;{c(Tq`u^ZFXW&D1y(7!O}hFG~JAd>+t_ObeCf3
z{Q?ly`eMuN=*U&8>GtoVE9*cO#D+DN<EP>~j{@3uXCAfH1o3-8g0#M^QgOPIf&F!{
zgs=qaQAC)&2&4J@kd@;a=RWy&D2P@j+CPwH^1q%Fq&JOr;|8gllCdiWHskcPm)OLj
zS$FcI0lA<IvI5iRVf6Xg@(K>!(!86VOl4|+^2*KlkWhyDPU~{pcYUk%^>gaa0`e?m
ze@7_YqVAeAAJnfUF6jqNy&3j6N-x;zkLrxW*_=rarc*(>fjVyVKH{KQw3em3ggV<Y
z4JI+I7xsM`C(T$37eYm7Bc;T(J9BPD#Hm*Z)ZvNtaQC>-GS1a+p0kP4I;nFP7$#!~
zQn0EqtBMH!TCSk8qkTlCi)^N&EthsN)1N@DSbjtBpBp?yvjg6yCY<#}{Z1^)Dy;7O
zC>D2)MGA00`~p5M5$>#`GI)0jJMvsXis4fc+;j)Ly>_R}JgI_%bXg+4I7FFw>{Ya|
zpd4%(neVc+G7?m}L{vdIk5omDi_W@sjk{`pu3|*GGWGX$vp!vo53X`##)nv9-Pm5n
ztH%##bJUGShA(x71ctl-boy<9SQA&{k{#w$d}7hnGZu$CI)8T+UxoLed*y{N`59IJ
hZ#EkLH|LE*hS5n5uhrcvRRHs6YHW46_M&Iv{{fFK>c9X1

delta 95844
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
K?H<|qr~Dr=#f2~c

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-0@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-0@2x.png
index ccd1494cdf1a9d19a9c860b88d240392ef1919ea..8e50cd033596fb3daacd173247d6779168cc8f99 100755
GIT binary patch
literal 26595
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

literal 87032
zcmeFYcT^Nlw>H`{3_0hdM3E#p=PXFhNsu_?obwDBBqN9fB`86VC>eo4B#1~B5Rj+@
z$vMy5(cgQ{dC$7v{o|~4zyA(v^-$AY^;GR=KYLeIcTb|OwkjbW9UcGxgpbse^#K5k
zE`k9ZEcCyVps6bWpcx7=H1*TB31sr}@pN!@gEILAdqJ6?LCy{U5Hwes=j?MwqPY}h
zN7)GhsMmb>^G=BtkFKR~^f@`-R~p_blgrSotPm}%5WqW*<xuDCsNQZebsx?d;}FhQ
zu(#z5*nD}Yo9+F;gRNU6lDd2G_E-4%TJ+%K{&88xsY8jl{qt_V6Muqelgo1a@FnSC
zD>)}C#!qMSv0WbabQy7V-MmxXa%qLcidT8xF7G(rNEY9o!Xm;if6T&=0dn0LTzYf4
z+h)lFQNa=U;XejXmfXB{_5*)PKkVOj`s&S}RET(z!g4FafFe0K2u1whW4xg{c+s`k
zvb1U#aR>HcKLW}06GpU?w5Y@SbZsDIjgOV(P9N%KzZ|jHF(2;hK*dT~V%l~8ROZ?F
zkoW36{<ALQi?=tUA8Pi?k0);qlH5GHZ+<$)GO*;fGRNM1*t!z48&v<%HktF4sYHKk
zN#}Xqx7oFj+(%cqV#b2a)fwfdf_V=j;#M=k-<L*10$mq^v9(holQ6rEROR+`bZ*KE
zLvs`<UW9pB_1IeIefz|pC2_khEJ(IzqI-;ga6Y<^YE2&!^3MCX@M8Jk*f%k^*QyE1
zH{KtdyH=i}_@kCTtKw&CpaXx8S|neO4@b`ojVlhMA)}~g>~*R5XZb-14=mbeX3Szd
zzo)}W+Yd%kBqA2E(*~8BZL=4~4DNB4YTiywRTO9Nlo$AZ7HL^H<}lX(T-vIi1a~*A
zdb@7!QeAx}nb$Ps!(H7x9YQY?fN}1_*LgM_$`~C=R3m+H<m7QMl04~<7yR7JF+V(2
z<?>zQ5m!}B^A(+x$Gm(mZ^vHqH3Rz{^{qG0bR@pL47j4rG4BYN{Mxb*GQS&mGdO2r
zj5<5EvgZkd@^oo#eYj$E{qT6(M9F|xn_6#V&{Q)r*+id&W3!^*l1l&SP=U{SM>>xx
zR&I9w-7EpY7usF|O9(N!wrg%*l>edyCrZ%su={g?!EYpW?sbM(;BS*fB(v+|h2|&y
zvX&JLClAjLFP&MNnY%(%&z~e`)3?k*e@ZItb@0J>YK70f+--F_H^k^Ywi*6xB{$Sa
z{>6SzXm<<8T|NI;6*T&>;$B(K<Flgy^1b($F0x$<{R40K_dX>j=?G;C^Um)SkS^GI
z^z99GP|}}<yJC`ALsQ!~27S{Y{j}9T291Z7!n|8XV~hL3?;}Ljv3)k~civUV*gn)0
zimq>(6L(z{bbL&}dE`C6#Y<+$7dEbLI#cfDlk36#i3y{7byn(%woF8O&Ot~{O|UXa
zz2jShewcYQ9?g;X`g|o@Y!*ht{rGcrC8W;49UR@t1?i1PZGBSHxVNU3H3b&V4C4=3
zpM*kPs+$Gmgrx2K9cajeG>7?};@%&RTWScM#N!cG;l0=4@HJR`9oR4G`ru$LZ|bu0
znU9OGN_WIAl#>`wYFzu*j=)>~n&6J6U++fVvs%pN@|+6qz2ROf33~5%F?9)XzD^J^
z@LVH+=Um5lIpZwHAKm+jU*V21Rz{|6I>uTOvoLDk;!x%yrvGUL@jL&w+S*iCu7XGS
zsT*=fFnVx;lyDYqT+Sl)xy-Sn1sX;6Fk8(;892#)M5|(c6Qs2QlWHGL61pGF)^)rv
zmRk9NlZA~HxAtyHwlMBfcm9tB0S`h0Q4$cBFDh6J0nMd!%*-9^gN0^=^q<{i5|f|L
z5&N=8d?JxI2Zh^8X^%jXlV!aFLD((lrU}{>p)>i4R=|GooMU7`vmB84LyxA!DXkzz
zxuYa}yVTUN`x{8mZ!taO&G^IWo4cwszO}^ifIJTpLi>6@{2@DQBLm!!+^OrCQu?~c
z>Xg`e;+7vbTcnF~O6hpu(;ZPkG832g&FPfvUyz1zMir*~GtE_#`h{9reloqCgfE`B
z-rK`0L|}7TQLg9JI?VmZ9=Z1uDje~{x_q1@Rqt2OkaYG3T|OcG^LPhy>Vl47MXm50
zG8Lw33lFDI0u*o0oi-SO(35j4nasiz1y}3mV#oPn{MX0{ed`=sz=%$S;`ih19F9KG
zhdeKfGI*(T)1GE0voN%-&&eY323~bNVGCosW2iH}`Pl2N=k_ke*ieT^tXh_pLak8z
zXJNhEri@Sb>?7V+B#ezYy?C_oE6hkA!4JU3-dsJ;k9oOTY=Lv1Uq>a9A+V3uq+jjA
z0kMIXl}X}1c9l-m<Y^Y9pkXNWJU+>HtoOK?hR?mBCo>@ZV+NTgOXJAh?H`t(+rnqW
zkHNB&X87ux%5TG%?Xw&(IB=!p!r9w_R!pz0HQZt!;=N3}l64%8XHO0%gh?q3`h)N#
z%`^M(Lo~bIn!HeMR}NTDB4SMe@!LOe7V-AH*JN+45nm80o|F4yp+?G9+bNzt_aK9!
zU|zz8(OjCOC!5LcYGMZ8&|_JdO?T!+aBY68i!`Scf1R@fh~%YbY5{@luhx5+$sWrG
zf+ac*v-&jxe3dZ8!j}&MCw{7tP_qTt2WxB}5Hd9*zMfoD<ZX;kuv~=&f==UW`(Kg2
zZjtYi=aJ84Ex~ErxlTWbeZW2@F(mTT4%CvB=$PObkeFqxKzL9@GOaFW>_^Z$-*cxt
z=!U)2M_21@0v7YDFTqoogM*lB42mzc-m}|dK!4O?O3$1I>f+M328#81hh}@!dkuI4
zt!>E}#T&X7?IW0{E-K@Psie;KqqCY9MPW3*`~65+-M&3)B6@URUT9K)I~I>ziQ&2k
zA5JuPKmxI{B4Oc$Pv`nkE9l0*`+2cfgiXpvQs<KE<A~S6Kgdrv&@KeJ7f>hTM1t$H
zA3Py(uZ&50jFz?SctU@Mg-odW8wquig~;I3J$W8aWxX<4(xwW{ZasT4A+50VdX9R7
z&>6PP3ZWl~S2kC_^_IpSL9<S)?*dcb<=C`~-#vNWimmn3t0q%K8KEaz=}qdAe>|zo
zJgy9(t(*5P&YHjz&c}ARU!u!=doqTJSQk*%_je&u@P)3A5s|5UwaKuJGu@_jN#)+z
zyCjcNhJO5>k!Tcy%lTt7kUcS)y*N|5oCL5oJYNZP!w$}~A14Y~Cwt%4a<|($vp<<$
z9W^*?rup?wFeHs+T=OaZlUD3OEG*#kL5y3E3&w|M%WX`4`^f;VJ!SxJl&B=a&zh8P
zB8AgrA|6s56V-Z|LSTf8s2oR;6vqi+!{hW+uqTUbqXlYL8fMBb#ai58{&INMAj#7n
z+5%h%hABqMw^bS%P($PkB~?-*S^r!9L9e%Rrd4s_bE?uSBv@qeMe@%#UFICFW<G}(
zC>gU5cB~HKdWQ^okyDnqSkiIw3wl3xSs=O{SEjr_3MZI=MLMsFn+KR<KmV*rt-AV#
zr;W&I;6&=#ZNzXFmbCz(KU+Xzizw!>wXoVfq&G)ia?fj>Xo~8dbP^D|iLFl-2SHHw
z{RHbF&<P8r|As^sgsQ|vJ;5Q0@Yg_}u1t-TpU#zW4lB1H5q)PMy?HtlR%Hq=hu=M8
z%ng?HK5_Y_3iHN{sp9X?nK&=RU0D4}z%L;pcfVaJ_<tBr)ag6JKmN2p_BGzo>2u&f
zEd2~vUVG8$jxatn@<0;cpN1rfNgg~5Ua|6S#5gyqGmLp4EvG(nC3*LOjLkFr*={=C
zY`Xg;P{MEg>+t7&oz<+V<ZZ@pippbTUZ$`peCamoPQ;Z;O2?*U=A*isF=9`XuHy;k
zS;i$=#^D`I__1JC=3%Fjz#?OTT{aTCkxZw5=OY>KRm@_xloGGLtVU81#Zks@MZSl2
z6%~)8QsOkMj(n77(xvg32-C8Q+nSlGcZkv+^oaZ1CFrTr{E2mx0qE7rb5aq(o3$Jy
z#t9pjpGQ}e$QwF=FPLfySf>auKZ?a?Vh!{N+z|Jrz>0oukqpK?6Peq&-;k-_klg;N
z5_Z|8`SZl2a42LO^-=UD%&)r><VV%LE7DUSTWym4q8$rAb2kC^>4n$@@%{$xf^pwN
z-xENT@VBALd>KJqb*#2~{sR`xWkE#rbV0(GV8Q1vxOSbE6HnzxOMk1Lr*gUcW>U|5
zM^b%o!<?c@<`7f^{8ozfy2Vb`ScKyayP1|IVPRyZ;nOaZH+W+lm^ZMBHBY>uX0*~P
zCyx(8Fjq&_I*O`THI6n25G5;X51O};wNlt)6Mn0}Sx}D3*vNV?p{%-x!6<VN)2C2h
z^MuPhe@;dh>a{y4>QWCDiQ;V@o@x1cp8-tkHpVQjS5M>utgOmrcI)!XQeG;N!rS%~
z7!>4Fba#Xe$|j3GjI-voSMh*mjMZ>df4{4S#VDNbdmVbJ4&ruL4n|CK35gpy?>)V=
zNIeYxZ29}nECOb6K&<az-@wRDw_ur$fqfWB^Qp?~W7KgzoqKT6wB5?xYH)8)J@%t>
z+!B?jAcZ#%1>jy~p08QGTDJCID;IpulPIR**!cQdnzq5)Gef%yyI;zZ58uC!O~WN2
z_ff`!0*oKgPx~p9afxcP$3;j5NThv$)JH!Pqxy(nV_cDo!sLYtpIk?a2g-X3C@9Nr
z*-bSKVyFIa_>}0_oAkynK4#M1l%JP?(9(0LeML0rStMw`!h+Y}fQ3}Lf5s`p4WmTd
z{nKNm<Rja#Ih5n1s<l9ynfJYM^LG|sk|`+K&+UT<JEQVS%rEf;%=MgHqf;6QZ*+b~
zi{RQ15hF{$an6>R?}&}Wol>N)p8gmxaqhq!Mur@sf~C!~o;mt9X&B9=kL_C8Oy*H)
zhvp84W_>&=0$LyT4En1`9BpqYYSDPHr+Z6o;@!u#1R!(d6D$pv?1)Qi_7BGfhUO7F
zsxzz+YLp=VCDKz8UPkluK*HOc7d+;JRXYz>#6{^iZW4;9ri#8Cy?srA0v1uX<Ke`2
z1BrOF9x7wOVn`IS8@=E2WyUC0P*5K#Izw-82h#*)BdofA$cyNNd|;a;2?o<4cJDsS
zs>c|Mj7!6~_>O;YYEMo0)t&82Rp9cFARid}I=VAEIh?(VW+Poljcb80PH@XIu31ZI
zlSz7W*0!n`CJ^!c2OGp9XlO`^BhA(P)76^8?PQq>3cSMa8Qj_KfNuobCj)E71k&r3
zct||B&!x=6grNBOeY-!~FmwL5+1&MRr_kzbqD^phUXr<pDvuk7|K5zTN)mNLEX{-q
ztzqYbIKrZ@l{8=0?ovGOnOtL0uCkyC*Muf1%o#NXQ@_T2iqk<jIiWSnqagF^2k3mY
zDSce~Tc#?Bxa+TO8}6^cCrl@WyBWRREcvJ~Ke^8FXRs+1NPS`^>!r;;F_wZsAz?Jr
zRCt;rDMz<dh#DPPu}c2B6iH|7DviQ6Lp5LWOXYA4%#BECi7Eg3mmVd}f<&_i-$mlF
zj8<Nen48<EjNLfVOUPbuhf{!O+hqiAabq-BZ^?0voJ_d)(vzQe@%c{)0+H|C1W9&%
zI=oX>Ue~-?JKT(2Nxs^l``kr)-woIE*^Ja`%{(@<9u0@gg2BLvivU$hT)(@h)T)9h
zi{<<J$8#^n$c|H-s*;11OhO=IosfL#ACCLDpSsLWj{N2(Ty&-y%;lYmyVUIleaBpK
zGm8~60+s1J5E-q(4kh=gA7YCsdu6cTc!%~uhO~n*x$@TQJ{3h=WG*ew--d=^=O{c}
z=Gwl<+RzY1Vv`;|DJIQ8jThsEPaWy&#Kfiz@&Q%{t%p=RpSH$RvUQVsFTh;nfl%iX
z9IR7M3kD`Tm%9wr<S9%#B7?tnwrum~cLk$kG6j2bXnv%V^3d$O_HQm6<He{Y61bxx
zfcstqdO@2036?1GTE9#CbUJ?8*S=)kLPBO{l4eQybGSts2E(U~1{vRY&Uw38was!U
zZ%*I+eVlvM^!@Y19ZM0K8eJ6yRazWKhSuyf=4T~+>1^57CswX_O)$;ErBH)G#!2?I
z%C7>sUH54~R7_)Ue!RzU+<XhNubjU8K!yMO%ud&mAOZt+en*)lp>GD!#8#ZI_qJNH
zdhzv*hcjcq-6K#k!}*N)NJ_t?r^1$*Ii&M*mN&TtmywJ!7yhUImn#C{WUdKq7jXQs
zO;%k}LlV%L`Hdry=eO8>T_a73=@QsVQ>yHFQ)|lu8%HNI+xs8x3MpZR>c<H{^aP|3
z?Dtc*SAZrucv^yWIMs&TGe0Sgd=4OEF0n5c>rTvE5o&`_Oa`A{J|*xG$2<pnWehGy
z>(t;$k#g49>m?ySrz?hiO-1bJz)C;+13sg-a#9IWUB9muDXtdG3t8}z<FA@2{lMBa
zlkC*2IGv{jZm!o3F=ezRm4;u<F~}6UL~v~z8}DV<4-Zl?;GIBJ^djp$6{dHjkh2PJ
zO5c1sj9B3T_hoshl8z2R8jbtzokejM=40U1KK~?2W;gQkh1(B5kutr|ZI-j@SV$x@
zO9@uBmNO&htNKM7YuB%=h|?H77Y9o9M1>?Tl@n3U!j@FE7I<X>vxjd3t3AoDqIQnZ
z`wvxj)In}1#E)u2ewSjU6-4A4POT%5RB6o}wD-;evvuoA^sc)Ptq*!;%PRY7#y#yc
z8EcFadT1Mszvj|vSbrQ?3H>Id`+U$WtTIVs_VH4~hI`WIZ!Mk2P5y8l)VnIOhWCh$
z(e}zAGOD1B63!4hBH|R9w+D1VCK>wXPxs|^!8C%E6-znglkvu<eGz9=it=aM#j`Ih
zCRQJYf(7h|@)ovf>5aeRi8r^>RlilyZBOU#vV_RYfG03nznskO4R9Km+l(!W8#$h6
zl&ui8!YV4*hBy<u1PN{+5Zb{Q|9ralAHB9DJ`$YIPZP;Ds3iUVBok%j#c$x67@2Lb
zH6zRUxlcDNb63@_DtFv$S;l$n>GPhM32|!~^T<eMulsR^Rd-%9#fUTiDpLVh)ZtqO
z;>4~d17AO;ZRko<|K_2~>T82%G(!fH0)(4>(xp;80=hCq()}XoDogE(5Y>`Pi`A;`
z2CC$=O!Z~AM0z?LJRdmHC)gZ#w^dfQg0Ye)<jZnX@e}s^aQjxbBGh!bJsRaWGfa=n
zPi8%j%S>89$#qwN;)!VE-N^ijNz%DZHrWes7;NU@uIxd`!VAY2GS5s86!7KXF$|7M
zMNsMM+6dfwxN6C#x2ZmzuBCmCn`nXrQi5t9w&*^ub}q&dfEmfF(Z_h-EXuz+oxV0h
z@V<A=zGz?7Q-EZ=+0rAFhgJqKd7PX*`Gi6G=yB+a+4479Fa4Hke4kS)k*!PXLPt2{
zmK|N*S4Nv`xQ^Bit8kyy%E)nGb<#{umx$<(Hy$6%+#!Xh&dn&{&`6yC7Z_DKct08?
z_Niyfz6SF=Eg4<e*P5h%(SEx@0=%7B*wbkb4P#cD{y9()qV|#1&B4CzKroKlNb0kf
zR9Q_4<ilA#zkh){O}XsPs#JzE1tVj>+lmA1F0e?7kP;u0*XN|R!$xAm1iN7x86KJM
zM03<bsO59ApM|Xw5h)Wy3}3N)m9?}Ax*CU~3JW~X=_ZcQA2zYm-5QVd->}D)$;4Eo
z82zra`B^T1S2_?Q1yNdy$XeZUT44SV(Q*8Q^Wn9qOm~GyDk<Spw-w<VP?n-qQx^YW
z&v&WoP(DVFVp*o_>$Zk~G*HdklyA{@rYK3)aG#a$3h_>Pv(7F)jeB4yl7gG3wdv*Z
z#bUkkgDUCZh5_pVW!K}!-*JLp7=k%;U!8#;1{GYzw1-E_ct(<1orsm*e76bJEYkY<
zWUs9}%$>#c_Cj))Y)q#f_!dH7I0%c<HP3Iq%~EMB)zP!CsEH;WoHXsrG)*F4&9B6#
zA{EoX(UvFGnTj=Vf>*w*>;e*1HVrK+aE6rAw9MqY{niPQs}wYaZCAHDc%tSJ3ZpfH
za+3^&jwT3BnT{i8;>)KE&eE&0_<=Wq6g+L+k2oOU7KE@1wP~6*|Fg=@4pUK{G5h#^
zl{-({SD>viNerrttX+A_)Kb)~;>PqWJ*_DQrKtHedGm6E*aOTLDXBF2!$(m2KxcCG
zb#gjf9<|cI-9GHy%;i~mPnkRL-;|NVL05*iSwwH-GjMz0t(<eCA0}-Qpxqg^!v37X
zkBY=S;A3xM8#P#3+E$gvODx7A@~1UyEa%5uvWrAMJSN7aVF9J`jcoyy44sK%0*N)A
zm-Mr?L}QW9p;;xV-(5m}uin0^ynArpsOt1?Btwz$n0{gQr+v0QIrAjNTk&eTA}U19
z+uLx8CaXbx8N#>E564<nJ+_=9o76Os!|AK*NHrRV7d_s@=jSR_lx4b$1mnkE^;?l#
zX?sD}lNYQ&%Gv~m8@@GmFVRg13*wu$(@V)KX5~`a9%&CtkZMOO2A)#M8eTAs(v)w3
zIlWSV?uqM*vudfPPzxCS%hSjkRrvO}@~5b&iJ51Kmc*zoc5+(d>1T-?cg-%6ibl8T
zN<QD+B`!+6hdti8D=<OAntem#%qXB==I7^m2N)rW(eGBvj9`tqj!^i%^y82MMSQ1t
z#KHX4mrMWvaXKq0=_=TJ+CrK1RTY^y1SBNHInfU^3hb<{1-<;deV}C4)`MTUIq`e~
z^%D}3^{wSb5&ei^04woxA7&~DB+C@=B;pAd2G&JDN+hYW)ih>qEN2?E7aKK2Hn1fp
z@0OKmUNDS6I05#KIXM(SAMFP4o#oMY>oY8p4vu?+w1cu>`{PojSrhr4dpOs)36_u(
zNct`28`-<V4y!;uhRqlFEZbX3rcl~~V|=b8!AT)?3IZM;9?ClgN6+*rqqvha^nH^k
zrH?a@lkkp`$Tai~;4aL27#Io(in<BTfQY$M=B8&9KtW70y&>;)A^7yALIShAkFy?a
z*5^Tc%@=9>cBv4IXp}w{)^j-=foD&!;xHu%2yP5WZC&CB2*6ha1lQ{Tfauq`#algb
zLO&w9<BWb3WU8epY3J$AYx9RZ-XM1`^rIpGkd_Pbvaxf8`Z3u;9i2U7SoS-*S(u#d
zWmrr^wD`5Wl%P(|Y9T&QgAi>)yAW49340bfSv=_=Ni={v)X#<~$lcAuS29S3<u9%z
zy8P!f9}CmpDt@jqET&qzOiG?UP$pqsVP1Y7l_2K;K^9p&CTSmg2T6V9hyQ{=f0JQx
z^7HeO<l_qr4CD<I;`Q`#<U>1Hf{$O2Pf(BtU4zFr*u&2zh{wa1^$)~97|KvzJ0E8+
zKW9%5razcAwx0feGAu0U>rDSKK6fuIt^b7g@ckDHXg>IYY`pjcc=`F<-TD5#g|DAV
z02<_91NuL<@HIp~QRCBx`g;2N*g;hSpdNm#{|;eq_n+;({C(X1nqzOr2X%wGqpSL&
zdlmR^U8+9P(*4gCe<*NtcK7<*3QhKZtLf+L@Ly#8x3T@X^4FYy9|*enf8zeP+W%qu
z-^%D(T3V9Io_79!hWAKWhUHKHlJ=f<&i0aji(+>6VzvT;0z6^@0wO%ZwzgtCwonlv
z9(x;M2RmC^0TFv~p?`yV<l*aQ<6#H=1BC|Xbw=X|3PbJe?9q<o7Z4HV5w@`t=CQH0
z{rlC{K@=)sFUSx5HwYacXS6D9-2Q!3f1vEqP*6J?AzLwVVIDzy2?-uyAyH8taUmgF
z9x+i{5izKst$?tN$X_UXJIRNhKJGSXcRIV<I70cnJRJXC_(Qm)g6<<37C~PA|2m`V
zX5;68ZXm;=Wn;&rWAI;B44vJf27Wew=oAo@5EA7V6A};<6BZYd_{Z+QfW}ZCU$hke
zfC}*Q3jG88$1jp-YtYQv{1GY|;4duN7)d1`sEwbekD;fhn+(ez2&O+R|LU7b`X8^T
zIs2k(1pkrzzeH~U_5SDEKQZ9u{Pz+Q(_h_6+SvWmiLXrn)c$Wr=yv~HvU9TWaD<`*
z{9lUtkMqv|2XEPk3W<qA`9*m|1nh-)gasu8c_bw4Y<Qp&{Pu#P{DS=A{QnsKpXk1x
z4t{|)K2QZmw54ck&<gr%4HL&dTyp;R!2~)%{}9D5D8$1r!NV_T$S)u%C@v`^$jvV#
z$<NQi_b-e2{>1fvm@Lir{~|^DZ-swL1n74EoI@uVbiU&I&xG|a(*E%HfAQ~M&iKFB
z0~-2&JNX~+`@eMkFJ1p52L4Bt|5siAOV|I1f&WqE|5exjZ*<}P*OmwBfnEj$qBk_i
zHz6<ozc-g08UMSv{6B0ir;b?E(K|>iTMbp^zk5mGQmF%mF5!BqnfU?$(WgHLD4Uyz
z9(@wq?~#@Y_69D9>JC#&(*5rMzyv%}Rxk{j+v(hhT5D|(egULt=I%*2rgkoMeU?Sa
zehDn^NG6cMWje<O1aZfQjEuy-zt+osqi-f4$im7>`(VH)3=xScv?XU8^6-=EI9#g<
zm$KM8G(j0X**a`#znx3#IJ>>dxj^|?jNpCo-tV=FfP6WOP4h*d7UoR{=Ec31L=;dH
z*PggYxBD0Mudd4%_K?H%Yv<$V9X+YF7}ycz;c3yi=X~gnzLRhIJQy&szRGFX8LcD>
ziv=%Jox><Px}W3Kb6|X_=K#Lc-x1?A<OA6U{5tnEV+w0l1XN|0+Rk-scEcIdSa%py
zr|>^~oO%BrwfT|64p$q%UNs)v_i5Ua5eShu8tEuKGj_ef1qn34qEfMzpu$8SWiSb+
zrQh`}9EQA{sUEn<8GRt`g=qfZV0j&~xbW_)!&9CigwF#!^r49w+Bv0yqcSiNwUC<@
z`;L|{lyO?8A+6~L@IPauC~^d&+T<ffd>0x33F=KbR}jAm^NZDGxtt8E5|ZR#%yn%B
zprF<e&F&w_F!g?z7F8(m{ZZbF7oh;k@fdUA<Dp!@eA_VnXpk)0ATOTM<<-LT5}XGE
zB><Wt4q-m%>Wux7uZJUb7@yTRO%Q%BBYmqo(d3@(w-dV&Jse&=qIC``@q_Ef@?n2X
zjG*n8yKlGD0MLYV?7O}Ux#o#Pnaj(aH>H|{EJ!@KxHIjsv>)2V*<z(3A+GvXT$RU+
zBJ!6h1^m~=N$jr$fe!-9g{<R+*B^X)kW{jfOZ5N(<gg#LLGe(AT?n4SLAue;a320L
z$>bkKBk22KJc&p;Od$XBi6`bwP8@dll<Os(5OSk#y*Q0NBvcdh;x$CGld<-ullSRA
z+=eA89??zQn1cA5bj3Hk4e*m(uSwS_3>l3en%_YP4^zOeeuH;<v7Eq9V4In3nXUu4
zif}L}XFM1l?YQ%od~cC{SZY3s0Ta>IQjd!W|0>$s_IuEg6I_$M5A!Gt<CS8(4k|$G
zZ7c?)R(d7cdX0?2^dQge^nmAUE|_Z~KabwR!`=H~TN{PPZG4<DBe!=g=r1;aF~em$
zp&rk7I%zV)g()0BxEuX_St4x1Sk7l8mcy`I2Gdj(kZGz;@5QM9vDJHk#_lL5;-(D&
ztC<>o*mYm@P~tmncMGQ*spDci>x0lr@`z;0!pXD&+;`zS*D@Pxhf({4%k7gGNi21D
zlE8I$-an1<{c*DqwJFkbWj^CO760~p9G|hRdfRUOCi&{cF3lPvxU~i!fd6i_Je3Y0
z3OcuZPn*^OL0r#DXd6;o0m14%tAaBBfH4kTY|t&#m;n~%6bp10*YY8o0a(B*P)NvD
zdy13_h%rc8^e~Vgt4@hprN(IVdLnpfQPfa+S*@5qyM8UZwwy{ihl1L-yXEaZ-@jZ{
z@b#kntbQM}at3lOabHpNKoq*W5ZtjZI%*NNF&92h&w<x!KyU#1RkR&AhHbqGNCm(p
zF#R6^R$w?&OJeGL93J+!<4f<K+p$E=qaj^7qQ@bcpw^#FVq&4i+pa$QR{y9k_HfiE
z%_{%U>iq!ht-9CS5Pp@K7N%VtAfV6!?0fjxf2OpG>EIzAk*KbG4^Hns*#0}{ifW;Q
zm$I#<;JP0Vb0ut~%{|uj67cG`tJxxLjb*9(`L8gtq(!j-(k+BuZ}G-3uPl!~%=G>Y
z2XF|};~{8(h*5U~e85xLrqvh($4G{~1B#Zd{3#%oIhhto48P<R1M_V(IpIRHa?#G6
z$oc_)P7>;GC~6LL5-2#xSrc=-8N>KA<8ZS9K5Jr}36!x%tU(s8O(ii8vO&nE;QS|w
zK3m{$PsnC@5JvxSbh!M)44CHkWfiFr0(xA6vAJ97#VgU)`CE^KYr|a9%CXSai+8)9
zUYcmRT{c#>h*4d|f+F&d=9U@{^53uQ<q;HWwW7!<t%q)vb{2i%OW;7pqWHUTIb-00
zzjI*85xK_NH#RHIk_<e%?uzmjT7ID;ugL){Xh<AfWL98-+huTljleN0xk%15dVS#P
zNnsA~+cb&^k@=t%t;vJO0w~`Xw<3|KJN+ZP7p=^7feO#gb~=7u!0RqW0Jp)uF1hSq
zfsbw&{OHg7Ep9ioA8TT!ceM<d?#xcXF|BZWd7|o9nS}5Z9`XjO3XGNB8G8i5T${u(
zn3a6>7Ge=vxjbPBQA&pCf&ZlB2-1GJ(_Po|Nt-Azf;Wi1XzATd-yRQ>!C6<pVnAde
z72tYwK~ko1Wf^`Yz$7QOyg@Y&jN)Q~H_xaw-DzhPnb>pQttm1Zq`N-8GrQqu1fJQ4
z%j`sOt?jpWYJjZCDdSzyzN-0~<6;k&3J!HJH+?+|S+{+$cPu3eqi&vCTmdi@*=guy
zxPHXa4YE!1_Wg&5QM0=X8$z3|Y^Lcol20RxOPKt5a}8)(-7zXjhMlP`N+6n#G|-;;
zn>xkuX-0lH!`zo0y<XYNm6CY%Waph#yzBNcy^aHJo7WU0m$<;;f?dSDg2=3rZIk<C
zZh&|hgv5+L;2WrtghE>&{mh~vHHvAU6X&Ngv}lx---sC=xzX0b0@VG){yTX{uESD-
zk)c9JjmXY@?{F+xysJh&9R(x^VEEe9=~nz>vRqT{-p*qD3dt*h$sb4U`6KtQ@uGO6
zi<!6-wm2}RgwnzCioEr0+AC8Ux&#y$c8ehRN=$EC+BLybgxMrGiL4Gi^B&g6-t7=L
zNIN|%SG(~28p^vFNPE^yv}v#myNBqGJ(TUjJ`O$m;(fW~&WLjwjJKc}#fy?x$BUfh
z#39osd6OzB|24*L2tjhpc#P-QNz9to5yt|^>@ZsE0e}3xH*zr$VdATLRnrvXIE)Zu
zBZs{+1vX!~?}NjKj>NEL3ke42U575>-`o~6Aa$9W?l4x-5O6|j;^EDB54Ovf8FMw<
zYRH}F36e5wi?}_DbiUH)OI}fc;LZm4zS;2N0(c+&UqkW*!e8`^lyd<FrMH|%U9JnE
zOhr0;X=5iRmSy`5Vb{U&Ps@H?guzf*xS?a6xpf+MIbPZ_u^|{G`T!#=rz&gh{G#pc
zmmg2!XD>vg!9j6&bwL<^Oz=S5)Nbt+HcYMSFBiVY^xO>3+3gr_FUGhczH5z|>OJF`
zEQc=*9OcXm)|QhIyv3mU;M@-wVYcH%;mj?9Tv+^)B5Mp);9H%jw@*O@Z*eT_=vUlS
ztp5p!nlJGFrvUuRs(&r!iCvHMA~4zV07VMCB3zb}LU@K=xr*;@8Px4_$30)02~9C=
z9x9gluG{n05w1->rnszDV<#>`);<I`Vh}&c$1V>7m2qHg2p)4vku41LpjQ>>g^0z-
z#fBh?lUZOV3cQ?$kZTsrX$Y69+NZl@z#W_Xf_`_49{VI*+<%wv0ZgK-0>dL8-i$*A
zzERz<oyWAqQp8>B!0Ug3Di{C_>#)XTDB5xCY&~GJ)`R?EXM}rdWcN~s2jIoLD4xG=
zIJ0DB#6<4jbt@dY4%dXak&gI0_zj5vmLGdfFeVyVg}3uk5g|fyw#!9h0N#_hJJxsA
z@d8Cs#J33lll5?iQ4?)Q&ieX|H@h!cSJEhfy$c4+aLIB{5Q@G{ntZw3ZRrZ!{{nf`
z(sgH}0z+vCzI$$9#KeM$h_rB1uzn1QH6ZXyA=fqnkLck6Bl8yGs?0Rdn}7Mzf!f9G
zqn#(`;V5R<%-8+1GiR%%h8xeHd0<%1r+pqxn1shk9=$%+G}Z^kq8}_pv51}uFm?%%
zZZ~|Jax;%XSLg-mPU*6RQPI9*(?9aywMY7{pO;4=Ey`efyOx;pGYegq5qMWr2Ph`Q
ze(HYP`z!oOtJKjFf>v6LJ@H~5Am9yCQJ;K{^B51-x**EeW8dyvspV7v1yx4}&GWU7
zQEu9e`)&Ftnu<|SSkB=jX_stnA-H?@@bPlt$Fm$e30ZU6y1wdrmDA5IubX4xr#OC;
zV9Q-lpul)K3%`i!@*T>eQF4HF81`MTl>@+ElZ(F8vANiw0t^(wf7`{;$oU^XHYmiu
z;$3UG4X2x$>^sZp{_*R=ZAiY5%Q`x)LI=(T_7JevirzaxSf~Jw(nQvai(vTSy&m5W
zpf6bnw5%|{1B1krn7(*$2|!Nt<4oVh52P&G@4$hW)A@zv^1ki0#(4Xk!po-Zb%L?y
zIaOib!55xbH%p0<^7x?N<TM75t64eii@8zEX<ko&zV+_kgt07Ui<}ucC<I@%07!|)
z7aVKl>>Y9i_;-K3whLn}SU=!{m47+RHUhyX!y(3`UWCzxq;=GD3~0C!8>E2@$Y26<
zAQJ;b<@slj16qPNqZwBlRAAnVP*#LzE^-Oy0v0`adE3=?`^z-dYQ=vqV<ySR5R~tK
zn8E?3LJv=n-w<aogT;DiMq=a8a;H#>BPP!9pB&SD_qh8kWbrXZcmAAe<dWo7^)M<B
z`-bx%koKA?7bX!wt%8WE{-GfM49mT4tcMf4SmaDR_8DYCDo>M2Cp*Ip@VoQ%6l~Xk
zZT`gmatlZ6Yyz0y=uEC0c)@zvu_9wYi&`q?IiFl+n3-*XBRPDmuay%D&-n7UP(0lu
zk%eTZctKuyiQ{5)QbwfK+5%&JCx_s^<vae?Zj;NUTd{xE%2t_|=aI+)!tf0+a&~|~
zAVPBe<Ru)rG>DsYhIWkA!VQKdHYs)wqt0l?X4i%^)~JjazqMsI+jK-cAr&aO{#U^y
z>blH9R#HM<1{_*~^C3fV8R%t*<a`QPDDVI;nmw%(4*As41m84c&Xm?5HE2*Y2am;s
zpd5{kkA6jbxo}P^>_0(H3&IG8X2V&O<lT_*SOcFQ`-jWpL44U|B<8L&7E{TS;8<<B
z;m?59%OCaYBkK|Uo0iD}*RVKt#)(S_n9?t}KL;2sz-R-v$3_S$u#}TIMl(rKq@tT5
zv)68kgVVF+DdnC&^Rdq8pZxar5o`wMpzV2&=Qq#|3>z+odjZ=9kSf2~lV3%3fB9Vx
z3N9rf)!UjUF}js=>W0b@Z2KTS#A<2De@U3$sB(>?8<~gIV!bnq-ntU)cWHH8FY*-Z
z-$m`(EdE5$+9BZY*AwSlK%C$RyS^e<A9xx5{V`>N$0Ez$EIMN4L6gZ*ITk=!Fh+Yb
zp>{5r>Cqn#=Tx3to1$nYyP+U?wqWXu>YlW`Ym0-H&*8iWq22gv`*vq){B)5wg<x@0
zClkEvu4&Kh!0d^A?$`?5yeRqN@CUCLzHYF2iY(V^#GF~#YJ3v2t|84IKQD+D8liPe
zrZ3nSUbE<~O}k<)csAg3weSXBR9GLeFJ^$}^wHXcS(`G_(TQ&;B(B+PEQKaOjJT5c
zflu5Gkc5YxG7Dc_TCsjXWgd393Ppr^zr59fT%aIunE1P;hi3sP$G1Z;yO{3=rhQbe
zXVfgCCF%H8g%PO<>RiscPdMMc$>b<C)c=Oc(SPJysNWD=5L|UT{7|l<mQ*VRX!5X5
z0$-_?ehaY{8F#ckm;;B0f8{Ci9T7io9oR*+1%Fvs4_;V%<yg};aPs&=@IAX>X;Qlr
zvwW7w_s?y0@yW{|7lc`06H<~?77_^;1il{RZ0sFt84_N91Aokc0c^12Y1<%^#L!7Y
z7OEi9cYsY!gKEMDT1NL3p3UeGM!<v+D0Z7$n7rM=V-yi$$$0lv3n!t{;Y5VAmbSgp
z<_EYL)0Y!XwHjM?dP!Ueb1a#<8fPh)`sR75p(5V#xMD7fn=_V&(v37yoimFaGZI|Q
zP=R%oNFZ;1R`e^Bh%Q1x7jfSD>#!hr!47M&ZR2vd#nZPi^wq}YtI_b$wXO}{!s}NX
z!3!H*8=(=FWEZcja&QWK(<tz(6?-BuwKaN#sWkIH2KT*OINRm`i@FQNOn#1JFCmc5
zS6se3_fVn35#f$s(b4@TE*uPe;YIHWE=q=BPp9N&e#x<A@86l;C!g;2hNJf54h@#e
z!z1XvUsttVS;pyHZxim2!%ftkX`YKb&|r?u(jQVc)>mWZ()+A#SVE>~cqPMm;;xUw
z%xwv9aK>T=L!Sa!R44xRaQ)9$?%*3^*D-jl3mcI99@q(#*J<pp!Ct6y_xKe-h-@UW
zZYDX9Hh?&Jc;bNzoxRRqV1*WLuOc>N&x4mQ7tX`^4lqW~G58L^=z`oqxRn+5E6+WF
z*ccOP2%3y{<Fvo85TfjeEv}n9JP`Dos485W;EqBl=$+UyCf)lY9*AHGR)Wwsc-vMq
za9j>~{sFxzxbTUc%DO~q+=I0OHysPNjia7+p*#nV56XSIw|7ub_>#?KLW1t&LxN1Q
zHcL*!=S^s<Nv_<Bm#Xa9xS3<pvn!O}qCV>zmb_CpdmhVCsh?%Utf4p5z*WkLJysXa
zmd(#pJ0^_vV3XCnISo(iJE+nd0-s1Hh8vbTB`3VZ1cb4qA46!w02(Z!vbUq+8;G_6
zX#<+Nhm>`F!13?-uytAyrh_o5i%4p$V(P16YAkL~%9se6ny~Q4%kdGLu@O!~;3fPI
zh;x6N<;z$5*X{fV;iEH|AXaryZ9bKGuYA8bIf0ecU27schGU%BFRa23dsrK9L8}BJ
zaH}FZ&0Mlg@Ch3qTJ2o~$Av8CR`WjxY#6q!6goyx>>woi#rx@V$d7QO73kuvMz`o1
zcg6JyM|S2@^$UIV;uwd+1~Ma~rwv?HiWDX9hAM^kbBs7O^jr|s+3%Fmh02D?H*Gq`
zMsL;ihSUw!)grU8V1~2s_De;1<|r)K*I&Dh@DeJeuZQz?aQk;&F*3PkU1eXj2LO@R
z>(eFJ1+CY#YY1^WhI1N60`U!bX$(XzF9CRTql*_Dv>E?|B*uaojOHYg`ihzOW(+@{
zMS&VifhI;_GhTt_-Ay(lmJJD{xb_rd>AbDB3N)#R&WMh9;E~e<g)d_lNd*|3tmQ~J
zMcxfO@HJ%i3pbjVK1~tpRCE3^93VLqv#hI=1BBklI=_(9%sQ*p1H8ofhBq<>Z>dgD
zk4(FvM3&)5zR*=Ssa5)IY5$eSkF3;~W02j?cTT(2F+$nY^$b<a5<U!9eHhN)W~qJJ
zkRFQ_Vnmx>`$nEQW&&>YR$Wd?osBNe^Xkn0g7LQn;FfmP)PGy&xWK5Y^ZW<w{SU00
zId1FfAV1}F@yp1$Gn%z!0c{F!;g%v|ql@|gLEO4OgBQsOR_wx4^rWo$aO!gRU2ju2
zQU113>yZ+SGDcyUzK@CD9kMi|61frDWz|Bkz!`Iv1+ud;pz*TWH~#KB<27Hgr+S3U
z54IraWmdG@K}~l>)}vzs7d`#)_1p}sUwev-%!o|tXhj(Bp(f!-xnl1Nn9#ezp<AnP
zJz{;5>d;H93;NJkTkVen_$n*k4RP@uS8^nwKLz=cDmjk1YVq`pV+X$|QW!DgTLNm9
zBotT|+|cix&rcEy_}I8GE}CMNhEbE+5O)K(-dTq)W?f6CKovlPv*Y{}6zEadwgo#u
zHCO9i<I1-XYbuPn(9f>Qqr-vm$iMZ-cxA{c-W6^9tx?_4^vV!%bapq9F_Oyyd)tfh
zU9W%Z#LOQ-EMrG{FmFb|X9;8kQ`H=a^F6m+t3c>wUODE@8-$K;Fq?ZMGx}F&cnFC{
zQA(4*-z{um7rZ?%ld%wS<qjKz-lBG_Z>N6j_fTscxUSg}o;mFvl9lSKe<zZ~4CC3_
zhC!dK8yVXh<&{J89F5H1pvx?LzIw)Szf4Le8X}5^hJfyj<5IGIDY)+F4L7E}MXm9D
zoVrQ4oF5l$m2KVGT0-6U*XIsRDn-79Qmmf!d8M>8yOpeCU@nZf=^DqRsE`k1jRcKL
zaFAFm+?^g0f#_xWS=_x^#)dG7JR|wzc{BH$T^D+{nSASx#kl-$_f6xsttsDqG^)dM
z!!I@>3F>+!YyCtf(o~1Ov0LY?Z$wo%EU7YrUKPF4?I`b!!-0;C5P5xrhjIXhn41{K
zY(mzYfNa)fn#>*@CW0c`$^;}IdOP*=yoF&Jb(ij$)kW+t<g-^1c54PHLROC+{k*B<
z5E<J*6QT0NLB$vft?}d*%*Zy&rpz5YvapBVKNieUG1^@0w7HnBuKnKi{MebXQ2nH$
z?h#7J>hw_w+<zy3Kao_l)-Fb^lChd7E_Ym40rAj`(#}Hz@b~PrK{bXr^`B|c@Hd`g
zy(od_I>WrCz||BqzQy~O!`jpruSUaOlQ@Z3@4A0XX))WjwI=t7I(1pA?e(w2ooQz>
ztyVhbGmWj{KS@zs#_k%(PsCWg_wGv`-%r|2$sF`nXK!<vRoE_i>YiFB$nIU|D4$o;
zjQ_wWqw3Shk@?+VRG`V9wO0c*9ewa&4*?>c8!lIU6&`;&&(DZ|gA$Ad?(X`og?1CH
zvAZqde$<=(U?Oy@KPB3Ujs!uz1}^Rf7M=;g&zXXsC%L{(a`8-X&1hP!o3G{sn>jV}
zsq<`W2u0TlUCV!q>y&JmN&KPkWjQog3S762JbMkmBlEXSxIrnVaL2(CjB~RKB`0q?
zd2T$CEagoOAbD5&loMA|L{D!0ZTcHxMZ5cr&%5Sy5aFYa=s@AGtBz`F5mo7FH^yr2
z=?$TG6C+*;Xd-N>`s&g-2SJBQoB~Z;S2K+{6w!$HTQt%LtLp{Va$J}m40uUX)CEsr
zCJ0p}EP4hu#HGQw&?v)fH-z)Xy6S<RgO_WDVcHE=jIE;?H<zETx75-JalC&aVM-k{
zOMO?}=wE7l?(q}|?>&nJh3jQqS(TwE%`&ndPV-H&@Jvd-osgz<er1+uMP*bxRLP$i
zQOd>a66YBm=(O|-g4Ab^ARo{nyPW%aEBZzZ+WXnOTXb7)i^$Y~>4XQBi;sjXEAX8b
zyFzJ&pn%kE5EkTyRxm`))f3OY-AFzfX)(!6r=7|p2ih3IBBwQA#!r6BPhcEI`R+o}
zA~gS7|5A-uPe9XY%eH%+rKeKp_jjTz{WmZu5<RWXL%LF=N^&u%vb*5E=~%e+sfvhK
z>^s6FJdpM&;1SZ8!Wo;O9@RCVi5amY!RTL)LZ?hTc*lpLG75|tntgiT3xk96#80Yb
zC^>=y6n@^J?9f%X`0gnzq*+Hf0_u32k};aRVU+jFgy_rYB+KVjme1s0FW$dVPcpPu
zx&NMpIu<ixcZ&V^yd3U1dFo>KB<VXV^u%AE|IxbRS4}YVs_D3U7w~(b!yWvh!Dpx8
z=Bp5>8A(9Hbb1Vevn&RGiIXzR6(WVZLyICXw#OLS!;7%eLso(9TctAV<&cR&Du@;m
zz9F!LZ(1=A38Tz2j^qX34185Os0+qnoF-oBUH3k%TdZlWa&N8wEnoC4l4-09G<qCH
zF8`BO1^$dPVYCL%@1@j&au1<1@oY;qm(w@+MA(NPf)!XaNRjU_69@Smx;hS!2FNRL
zT}}nFHM@67<Vr6d&BrE+p6+$w%WW%|z%*=Pp1oMwpN80bm)b0s+Uyk--N7@#&(Bys
zKjZpZJzPr*Gq!K2z;pfi9!qw90K36wBW7hL3>ov??n}tNV93z&xcTiPo$gY)^r7<G
z<05XPc?#H1b|m~FhAgK^yYmxm+NW7ZR9bi~4MwWdYHS@ZUtV7ij?=5O3?`P_47Ki8
z<fU){-6Ba!F!w^}0!CWs1E*jt#VWiYbJ8Fj2GM!zj)*^W^z>fYl;TJ4y1ZYk5nTys
zBAVfrGO}jJ(_}7+jjUax^wRoxcB3#4ep~{1_jQ-KksY&w4sfhP-<U&CoGlqqJWxmI
z0}I)gOXN4#K0VdFOJ`T8Z_Jk+L@1s8y>f21-^rmy<p*ZXweiP8CBt9dsU5vhYj~3|
zA)Yo-kvv(E{JvH5$ncE{*U`t+onOs`o@)VG?`rNqFWhy@hhL3s%q)T2@zb+E@Tedb
zD-*sfy>!^LKhka}>^Hn(7T^95*Z)m*rNuvUPp`}D3(YLQt$h=2x&ro^r%Wx@@pM5k
zC&?g~3GYhlaEt>|X^aCGASxZfH8j49bA!0RGF}WZqQ*d{jcqv(hTef)gNw#+yu#+R
z?f9>~zin>o%xguf{9Dbdql`>-$b%%|6(cN=k!qHs#CeRpMz|5NB@7YAf$^Mw_7O;m
zmm?$#u7MT@>9PaHUrxfrj~PRDL~<i?s%E;ZcaIoyP7PjL%~+ru9d0*cmKq7dB{jMO
z_NgB(@?}2w`b?U4RhW160q^Svyw8MdgpYNgPkuFU;G4}|hUpdShA>#=p2}9zPDVfX
z+vgACnw*q>bycPM&fs!R7S2$Xwu^;bjhlxX>2ZI5;gfl1G&$qSPhR<O77^1p9*3oC
zW_f$>5@r%;u?elX9{NX<wS|2Ykn%{S@+aWFM#Z9ZR)ep2#rlR1He&HUSd;}1^)fA2
zc^OqlH?>%L9><@eLnoZzm1tTqFAjrAnHD;DTB@{K&8mA(T_|flB8a0AVvk}zWb*-q
z;wJD28HSTI!p9=k+l>$wA0&y4IwD=rD}xN@C2J*m`9T4+gclEQofaAZ2Z_UlU22R)
z0#~<_AeiLhjMxmyj8?AlOk0NYO}d{OAGZ(Tb#UH*nT4`*ma4Pioym%X$%?1%P4lmw
z8vcaxrhG_K6rDeQBRGFFr@8cSCu*{zRwL3_VJ!7K=FvU&&M@|B9f^$2)Fj4idT<P@
z=AyI-*QNV^ybF+~_+jX>>g&aKd3oL56K8LDD*qF1{7=jAh7wG)puyjFRlaJ2&C_WP
zJV9Oc7)-gczz7W!3xB_S-hjsa3;`m_TAJF{BfPZBSL_&a)**S;mL9IP2)l#UaJ*M7
zI#ul9W@uHJ%%28ynr#JxC5@eqF$Z1jt_`dUPj04v5!SIrPjjg8HM1=%NvXHGsso-C
z1b%NZlvF<YXxew<A2T{2XDsHWvJVY%<Wi2BXpyM<2$YT!{cU^mS$IHy?ch@jy~Ikc
z%7#BNmGn-n;hs*zy|ninX_Ku96KX<8;hIe8nhEJ_vy9Ir5A2yA9N?E`K~%6XUCVS<
z?$DQ6(IfA)En2?a=AH9?idAF~a_{4eVCZxZP*=M4njAEy4(#y0Y7d}(kFQ;mHBM}6
z`VvP?3(mvVU3_V*S0sf!mxSJ^5es)0hA}v1*H@G0jVt{CkBxr$%~kd!jG*8dKTAK&
z2E&D9P(t-hdhN$-58`(%i@jF@L36TLY54;O&ex403$ir~Vmg1K?aJmDEvi4!W>y`=
zFB}Uu!VG%fe__B**!~!6S38nb_!@#_q3$q%Kg6Af^wfMpxW2(VdrM$B1N1(M;t#m4
zt%0EL+XoM$%rSxZ;KYcjU!H8RFIOlGt?oi~By-qN8<J{m<~IE90QyEz<xtrndanNE
z{rsml)yBY2Cq9)dhA-ktRrfTM&C!cn!47L|fBCdGu0D@7mw*rWM@<50yz>&?8_&$7
z2I%GI!0b=pynRJb@EdiIj6@ql6z|zmnB^LKi_jBN-d?$2h;PW1A+1vro_1E$^MYDT
z7?!Xq@c0@#&j<K?EYR=v8o>{XYg$R?!06{L0y3g)pK4O7k?32SWxqS{`9<B8{QgC3
z#AdZgzE8*81#vz$%KMl`+P$!MBYxxCaqscf<x22vYp?}cUeo#C96E_+=D0~V6^ld(
zk94YW_@nSo3hchYDTT=~m>YAVRo3k`vj9X;)N(cYDJky7OG>yDKgzchC6Qd%5JA85
z-v1s7rP#5As#ZEeCBN%VI?P8#u$^2yL9cWj?ji5JM=+LVfRKN3wfd1VdImq9_;fI&
z{^<L=38M<cgG&jUEA^({kU7o5m^1OuVbhHK>zGaq*qu)!kHvR50CV>!5GL@raDR>+
zKj7nm4h0a%C|?yTp9Epo8-t#VY+zvDBqr$A@_D%8p4yg_Sv&o3RL61u?#hj^;3oPr
zSxHF0;uuqNmSpLjC|W-~umxF6o%!+uGzX`R;U%$%hb=g0-PBF5#YE^{L%QHB^55V?
z{5OzB+yhD=0zja^2oz?g!Sas<$8t!_Yb*<m|A(hHkB930-+<4IeaRLYDuXCn*($r4
z52;Am$vO%liLzyzIh06>>|`xV*^^L~nNrAJDrK7~30Ve%!7S%FeSgpMyv+RTb>H`S
zpX<F`*L{sBsQvFG;6AWg8-mC2n%(3RPiDGz#(&@^7NL4&&YFI5-Ez52XK~Kj(@RYK
z#!9K5+EXmu`!p|UpPubBbh;P*tdLpeDW6O;hkPl@*rRr(&@JPO%~mKp&I;|IJw7Li
zXi6l1Tt!IVgO0D&f9P!sipVnxClln?=tZwDhy(3^1D;$O*R@v=RN~kT(02gF=^SeZ
zLMN}6NH0nvwBEdHJ!t&p`XOEPFz~2wGSw1c`Y>6!Lj25Ig&Et1^sHQ`*OmgsJkDz0
z-r8LI75i$+Fw^RB<*$XG%Fxzo;N~(MAI$Be(bL9(GCHY?%YEX=E14s7R`-$BNF(IR
zPR%({-qJPsA1(9|At9t+45Ixui)<l!F%yKvEUj9!;wqtrqJ0D9S1?ZNkkI*OsXlB-
zAsxy-dvhrxj(|(WeMun>+;2KdQ#iM-^q|ozY9Q$gPG(aHm*su$_@S7_rpH@lr|yaQ
zcjN7VXG2AJqk=O7QDNtR3)KDI+bdq<1D&IpWJhLUGd7|goyZ^e?KJj%z!OZm2IbP-
z)XMr3ZJf`n%sm~u6GwYOmAOug6svF^8ATjx4e55JE1yQ!Q_pmRnp`PsZxTu}O}bHg
zEkF^Zs?Cc=6$g($T1T~{DqrYU^sI}ZljoN0*v!=f<KIZMtw>r^?6_YsDLjxLQO&#k
z>I^01!k+ITXMtssW`uW|G{@1M-hm!|Ti)RLVSZGfkoBRISiz;71$dg)s!YRFa%r3-
zTiuSmR#3mZ3Gw9PF<DH^6cVjvn#eElxv8_U>R)vuxq7506is~@+deG3Rtm2|<-)6{
z7}XF5$MXc7a(Nsva9&%%<Hsjst=_SX4XfNv2mY(v({F+@f6_Ihou(rY1;$o(vJ~+2
zj|qOi(;|bLSxtln4_4jfH>SIoFj?E~;R_u|p`BNO$R!*8;A|7mX?S>qSYAM0i{$?6
zk34le0b8r4#GR}vZlNK^sah>YYqWk|oUD7l!|T?wt;N8dRydEh4DYn`1XWX0$uHrr
z&am*Xs|#<<yD${@f8Q;nt|bUG4%>5<JXIMtFDo(SE2;1r7Yn8#-+;J5h2Z}s@Z$I#
z+~w^>S8@P@MKJN&U<fxcSSP>Fy&T+XNoV|h<}o!>pIr59y-`VPlsuLKr5*fb+MFu9
zBc~_c^BzgKd~+wv0$2FKDw=UTKWA&(^)T`7Bf17lGHomcFW-f}yfxJGlW(-XlIy~w
zXtmzqgPQHTANNeLj8m>~6ucMIl>$P2AJuZXctzFS#Ex;(mAOL1<6Xve-rkPw1M)Ko
zj;bR3X*WDA5hFc$k4(Ii1f?=8;?v?Cp4j?0thW#N<X6gH$oQLk`m3CtBx5^`KwxIa
zMl+iur|}ao%AQPpoH%%;!~Jn^sqE_Q5+MoXP~p4zr?^qm`#sl0J<o7H*Bg;e6Zk9!
zA}CbX6P6DDpoAZ^>S3x6(kj&tk5i$HvusHwblpDgXwys#CLuH_@N??sWf{3s&RIS-
zlI06jUmIzk#O++?Zel9^gQi~Yjm}fzX2%3<ROIf+tA@8lGtP^G;Mv^Hs|76nBigJG
z6n@{!pqqeIUi<QSLCx?xkEWrISKdxYhBXaOt4oIt@q5-PT{Nazax{tG{)2Z?&aD=a
zJ;BzzQYogNiI}z&)S#50kUAfbK`zJ?&AWm1pviLu?Y*2Tsv%i_o~JaPJ&@rQ_I;%~
zmRZYWZ+C37w~e5G->vO}MH9-6rxJ*cXcGM~*Qu~}QRhk~-%!?<i<7egy!Z4edQ}R8
z0)Ss&k|BcWqYqD2I@M^!f43rNtz#n>HW|VQ!UUDTJr(hk#kP{$cha)WdFYV$9%ge-
z@xctQsIx*pjE%q8LUMYUFA(hZ5rIhQGlW1?*=M$Y5OHwTs({sZY01lyaJY+lX^WL2
zW3UpDe`KVeWgZGl(+uxETp~;GCpj)sZz;>4G&AXMA7k&dsuki_^!VR~`hbX_JmiZl
zK9N=G8o!ct@7tzU_|9;Gc$IjTO26$Dv%~3XwNH+#q<(y%tB}ZyUN>T}w*zU*KPUdc
zxrNaX*^od|5qvj7kJ-3Zl;+53Y}&3dbquB3S3W0>{FbtGB`tF(<Y6So9|hiH|CqfP
zX}A|$r)n{Nh!P<<?U4M5<ans^#!g1A+stB){=adtjii~QcVzmJyKCsr?oH<+J{=>U
zVZ@-R{Ynq2z5@h3(su2Vm6V|ka>NE1Wr)zdw=nw7Q>Y8=wRPuH>ciy+WzZ}BjJ7QB
zPl)Dm%l&biRls+vMzz~K`Lr=S5U$MiEmPN2F87(B#+Q;Ia}QCDA>HP;#Wsq7uB`kF
zsg>=nT!B@7Xsdj<{Jn*}O1-q1ti{8xa??3IJ*GEec0HJD8)w+?-x^GtufbqxSc5+K
zufE`SswQcFj4!%}I{6^eiXz-Fr-i=Iajx?zz*&aXO_#@7`tiB7aWyI-h_?`{KVaEI
zaIvr7E(=QNUVwy0g@PHZVgyrp@!Lp!nVOjc{0?04$v*O?r&uQ4^iAs4k7MIsZxS+3
zJ6!9AZ%?PL>0HMfwbWmw1ZYO(>_oJ(eYIH5f`oz}1}Q~N2e|RAtPsfi)QgO^Nf$29
z&E(>hAO7ANxd)QGUj^k{)+iGnu;#t6B>?BuzQ)~bos#=IUUq`u4(d19o+o3ifB8*0
zFRB<E=yNMGb1`$aKMi*k8D48Wqv#!aCG~NTFu577E|$CgTzbi;v#8;gAjcio(-9Ra
zf)c!<HMtgC$@xYw-ky&#r1z;%1oc>O+x}ns8^c2Wl+0s?kc#tJY@zc+h%hh_o=|T<
zhWMgb(uGMcas1B1>vM;nVvOD=hVG+&p1P6KafZ5cY+Rz}VkLdSp?!REY<OG3`ODM!
zrH*fi4Gya)#+SXpLZij~tCbqjiJxW^K=eGd&FrJQ2lg8?F)F!}7Vr`@7<v7Tev;p$
z`0_~gzl{&sa2FI|f<3>l^J{SPw(}jh%rE+SI(R@_V<=i8?unXxcBR$@FHyxuaK!)3
zm4U-9d0X!o`_`9a(#)S5ZSFy1i@_a2w>4IcFb!+(4s848Nd^yx$TV>b#H^p(<Ww-K
z1xww)096EWQ}V64D-gQDu79)|q56l~8Hf}7w&YvLc3f{6D89?!EaqfRtl+2Sa$qLO
z!NI{})-2oCIrHmG%tzyKU+TZWZ)1v}`{2M=fIHnkpKol^weUU)c&`<0QVlPSI=>tN
z3v;wsk%9#Mmv9HxPZ<v2XyWI*GvSC3%$;`i1UjiSXAKz@4>zt-E6sTa{<J|`-ajfF
zy(0PU$SDtm!C}9zK%n&TQH~^zWU$5vnJ~0h#JR}9JUi1yGUtZ$J{!qdGMcy#PJa`X
zgLbc-gHA4bcJRl`!lMD5WD>mflKXew422mNT;TrRGkegCG^rd1%ct%)^WwwQN%eI=
zg8;~O86YpyU1<aS`98*wECs@hgzrumLc<zltMbrHi*NgPH^MvB;Lhy9XQing#)i>&
zdD~3%7CvT}zE)~j(E|@nqqK2*n0rw~E&8j$m~WilM<;?(5kr@En|y#HvCu<Gk@7(2
z?N4n#kfyZ&Bl0dOtgoANE)T=<m}g>G<7f4b+gmn?-*G{B(lX=oKkctKv`qlNJ_l%7
zh;Ek-=vX~ir#Z5XTuMTW(c*3=W3^9M-?NZ#DCJ04KXuAq?aA+p@H=qW*|s9m<#%c%
z{NAgePYS!v2sa2M=KCWY>mAwi^1#5(gNSE{$=BcOU&#)aM!6uz?2&J<#CpZm{wgG{
z4nPI7tg?1{R@%5|RF@eB@1R!kKMd3yfN&+}!SK9c-;cDGl1gzE#d3T7-b%I2^rDOO
zof*@{`&$dg#(mo6jV8`8ex)6Nn=muSGRKv%qa1tK87N}bntKc3+^>izM$@z0?v4Ga
zga}YrN@9t|Y3aFjq#ryT0~{rVfv;W;2AhhKSo#n6M|P(tCw4PA={r}sNP5c;mAM?{
zMt}=Li%CKax9{z_Yu*R?BQ%C|!y~zFxgYQ>RPvkP?%nn_!<IHWBQM^wmGF^!DPR5B
zuy*5a|Ffjet=lsT(f<H(2L?pr>oPhpARgqtgt~=@D(cajIe-f8HZ~I_>0hT6ID%t0
z*fren*;pfYf8)8kj1dL#=WyrwwjCru&4%J%yTm&?!dzEs4z5D=2ndp+P!BU=m9{fH
zh%$?NuNc)A&5aGQf2S=yiCxFvI!As;g^_VK@fPlMp2wi8{cCe-z%DaHiomgvoXeEX
zhR2JQM*&rOizLhQ$SC^nY|Fr%W0YafE%z5hFVYlOje8$yk1FZY@CPssdE(ZaP#?U@
z@h`*ojV%64Y$2&|hWpAoa1V^d{ykXI2YC6_nODbsrPTjmK6e77p8S~iDoUMbMsQSM
z78T5}%4u#YwY>HhlWk`YpOGE9ELv_OQGO%O`$nFma~?e8cl3dKv8v|k<qAiRP&{yx
z!o1yqaF0Z^&wVa$e}_Fs@vtCWwD~8XxU(~SY1a!KQR_|Y48<7CSn2GrFhVrQ{v$qH
z`>{C2=AMPP!=;Oa^n)3ujj8mHj5VXkv73bE`&&MlGSv!J=i_lUbDOFT^??5UwTM=x
za&-`W>(dV)>B6mH^K&H&TlCF!|0?oA3?z6ZH83wG^gjA__EKt@%Z;o!R|%x4W%2d3
z$Kn?6H&Ta<&lKOJsBpP2r%I+pC~+K|j%(He%M`&A{l0>a9lG2-5d9mECmI}qE2_xd
z)GX!lT>E4`Wt(1$tS2K3?sdzuNL$57+r!RoWyAiDBz|<!x?29;@apFNS~abXZAYNp
zIY-*Tx~09wr5*lni{1a@o6lh0pfE`AaL9P2S{XsiM{01hO%Ia-hPG4VAY#b^y=|aa
zpH*-3vuJR)_IFSeYy7v<AG7?*ycHVyGkxAD64S0&-_x?h+Ac!>GL@=))Z1s7?eM&6
z%aC}8u0t*E+HP|JVmnw{;@Fw#i0Iwh9WgH04UL$-^o1GqE9>*(0vyS2J51u1=w~I@
z1@SA=zo$N&HR?k=kd|4OY<QzQQY+Xx9oHQOT0%V|OZuLJUZKt)cz!x=MuL)}?d{^x
z5Q(VB&n@E(zMIsGnoH_UlY3dul~9$3B0W*DcPY~v+$*|xF6)nfmZWnQOo%y>`zn|1
zUbzS9z-fg)9=lU?VXrr-byGb?OtIwtT59BDalPW{cY8G)1(}T&q)K(5j>PQYM{v^&
z0WTxy*lHyL1BK@j&(mKv5_!-8TTidKnkzae!ep#PN0H8hQPZ22;h&C0Vmd3SJuMr{
z+eOr;?l;apgsDn-^_vdKwtR}#AMdWY{vZl1+cfh;8P7yesUd4KU^J07GyWMLviCJH
z<ENG9R<Fx&sykYTyS;Xf)j-TV`4r9g?9O#5{U*hbnr1?Y;{BTq&K%TT6AZQ7yHO)*
zYy-I1A+;qCj5S`M;8LLu2o4-;Nmt5B6H}FI5Hpc@VsDn$U(<UECQD(~)TQhL+Q$PQ
zeXCBUC3T{9ysk^ujSCOR&_`}@7^~=j@$JH_X|OINfQ*~eD+1+oFpH0%OCSppvmjB$
zINx)Ng8|-5n#>RKX@>FMKM;YJR!Jeo3qRa^b<2Ano%eY(D|3_j%bkgjv6|irT3Gyf
zG&*&f7Tc~qb6nE-5nsly#OzJGk&|2iSG2pJQrNMXAPxu{M0nppb_BSib}~@LUPlC?
z-t11qTFNjoXm2E;7+th~Y--AbRJHv2*H(J-w*26Kf$K|lypzQ*0^uM*80;OHmGV16
z6^`bD)8gx7Ab3b5bRQsPdhn=cj6j8~^)u@mX5HN995NFu?pszws-&w)I2Soa<~f*U
zIb}V&^PT^Nd(f=DTm3*8h*L-HwiY5cn5{C_$Tz(CQ)t<bUVl^&*X|;Ly_x^iED8Vy
zmZV;0jjimA`r-Dk(qPDFS-_)(+2MggSML)PRc-8j9_>$r<c#09`Q@}9oKA0<aor8S
zH5~q_4$iWDDO(E~XyvR^N9h5i7SRrV@gI{B`dgJs--j<T>n6!?%2j8SQf9X{c%pZ_
z1d9=a^NCy6-X_4u!C1UiFJ8hO^TS+}<QW|B(|)$3^FItagiv889xq45x+6DkasT!C
z?~n)LTZ;Iv17-jU`DFkttw@>{_WPAI7-n}*>uDL^W0i}U2?PD@eSI~3>otA%+xz<4
znOocE4X?|5h<fE*A0I4nD=t+A;9<Q-|K8(yuysbdd`cNfUpxSVPbP43+v$5fx8-?m
zX1aMC(Ns)!KL7;`?L@>uFA;=(CM0|b?l`-K0XBc&v(&Wm@a=v6kFMO1R%G}Uw;v?W
zjCBR9N8K8n77p5(=G>iEAU-)UN}gMBs(J*u=CSSfw2IE4L#YuP8?I7}3pN_Pt2|Mg
zythO%dWP}W-$vqQ(r#jZFx?VB1&N~H;<<DCHv~1bF(V5Sema~r7|(3^5+i`5`vh;;
z^5M3!G?<qSjE#Yz*Q}MxN0b3?$1->(^C;`}8dv5MF^5g1gv{z%mxQb3Gk0QNUf=E#
zjK3~Al0*C)R(I^*5l@Gba*-nroH2S>$cG=4GAFpxQ_b09+=PfPsqqj&KNo7T0$@`i
zKci`<<i>&Ic6jn_RMF!d5tF)SyD}(o>{`T^4*cM*wsSH+-0U5k5Ba+?#=^g2X5Gx*
zY7GQwD8gO`&Z%V5mm=eERfMl*Ooa3Bk<05j;tzD}gvNKS`6_c3+Hq(MY6rjDe&7Vk
zdEMeNBW*EW>4T&+#Lb$QTq06R#u`V#-T|)6bibK|{;Eu~y!&prDp(MMsj{`7urRzP
zQ|40ZR9Zi_hl8%G$@{Kw7*oSTcr#S(UQ_5nKhHDpAysp0*i%=o!A@#>$pgfF<scod
z0>&;bPqYk;^|3Q|M$3)SZ~DgGJuz2!>W_CWqcJkz1c09+9#&`M{9azoraqy|U+{V)
znWuEVB-Pr4gCM{>7(u-0P4Hre#C0z3DM`V_=?@PQeytRL9u1nhz<(z|GltpWlxAfo
zRIt{q#~)|Hb+8e79zQZ8HBaN$xUw8SGs@vcXBtQ#ybEq{pYH@lXMlnb?LDMNa$3KQ
zMv>=#)(m`?b!>#ED9>sJydC{AJU#w2ij*r=+uApZ*&1Khsea&6I<#lCm8T%&+s(`P
zb}@>W?g2mfu=6~j5*&5{1<x12`^exke+bGm=&O8g@^pFv)6jrI-D0*>SZ_ZIC1&@N
zPw!kY%dU*fKbQ{Z|E&{?gehW0RC^Haw6of}mXnWz%1b6sdHM(vIu=2^x*rPtuY}6O
z>30+HMv5>hW=)%98g;N<6m{C6C?l;?_IDwNT$ZnmP>pS{L_!JcFM31pJEN@~Ia<lH
z(T%-M<2+zSl4iC#8%&;s0@cB6wm~HqD*clrr?;(nnnkh&zv3N@t5`Xj*1pI`PG)&d
zvvzWwMll(-9|y0zdP@>UqGPBWm7IQ}BS#p*5&%UUd2Cf!8EI+;GER6r;U)PxB0H;)
zq|<fkS&SXQ1#%d}u8Ryw0Z?20daczy$MqbOOb2HlpDW!Ap?{@Llu<kUe8+x=LHWxM
zsUPI@vi%?R!t9OW(l43kPFvru5N|{fSi0#ft3mvbQpw((YTgp7P#S%6>)@a1vC#;r
zcDS(?+j_T(agz&9P7IGOooiZ&;?_@&|Ie%>C<<H8Kce~0QM5q@Kr+9ffnL<i6-R`W
z{M;K+k^{8~>#mVo{=H-_TpX5frb$RTJWtkgip=Y8A273-Z4@sTv4!lOeK|Z?qe&up
zbNgw9K+13xEM&0aB&2%?F`YhX%+0Km5AMcY3X)s%iQtaOM^XkNA-QaVK(|#8t)y_-
zYK|E=T-?V-3$XoIt9^CL5(<4|4eXX}A1J?F#^ZBKmus`Z3fvS{H=PZ5T5K!5{oo7k
zG2`%S#^B5@oPxUR#n;qQ+IA{8wyco;+)=xk3y+<b)u+0kDvSS$6H88VX$3z3=YwB&
zYmb~1ZN^jGJ>s5^atKPzZyB3b^M3J<kIHW7@a}a0Ja?PGNKNo^vqJ^;ufxGtIwfM|
zYSku^<^DYO4vJ+WH&tgH19hr{6Xr{)kun;T0|U&iLc(nOQ(mkeozZq|D{U_b707!k
z0e;ttN#+YXKQh7k3c%8NKBV><^rDmacy;ay1EPn-5dy-39AJd_Z7!*3(|$jEZSm&`
z_G^N<$CmoSBHQ7}u8&PtPC^!Qxz9sjNjr))$f{7pYC(mw#^9GTBagp0%`sa3J7~aI
zKLiK%>zJGcbrf_@A|7E{u_&dx!%DrybxmHD5B1lYAKL;u>{amw5B-Pua*V^^pr>X0
zvt>n>={bs}03bVcj-)rn;_)%$0R1YtS~dBkgM=L$?aQCpdq`G2vv5wfb$pU;!mnJO
zX>0!6I?(awRSB%f7uCCKrWKr%@+AVR%N5uq;Hv%}Qo&r|1V2iJ_m7&Gi#VtXvQXQ?
zAK6}?NA+k>_|vcaO{G+W<7=JSI|QL0WNf9qg}Jh~GHk}XZaDO7Dfhq(eI}auW{d(w
z-7+Vqw*7*q01D^4VJJy==y+x2{E@u1wCDz{c@SMSnvMXIYn_J;NIuNk8p5yn2p>qf
zBX*zKWD)+Hg-0$s$Bz4g3*w<~3HPnL8STijgP_9ud3)tx2?PbO$n$*r<^e@gAteA?
z9}R6bky>>~LSkQhQJkl0Mo^)m16${xa_8Px@=*-aTzw|<HR@IOh_I<}%&PGj(UEfC
ztSu1w9PtH}bdWTBIv0-?da%jxRpdIxMcU-QeXId9wn@%env-TLZMO|Tm|*F3+9isW
z9jo{6bSQfNM*>|8nuIJp==DD));f|tKeM3O!=?J<nz0K2li#Bg<^<wVx`7e185yik
zBU7U2XG;(XKRQ?m3y|#xlS+$`{BQFb!Ebyee@S4qc73%uMIP)=1KOVQDvb#2W@<ZF
ztM9-3Ug2UiVyOvMbaGsU?WyL+Q?^y?Wiv?@e>;#q4pp||wMeY<-naY?C{JDmqg9Uk
zpaV}=&M7YIgSCKc0^kF!Y>K-{UF89oNb@+f2T-6%#Z-#4-dTuv%?d<d^B@c*w47S$
z$@Y#7a)3+PKmOsCsqp-!r#^9PJ`9p3F5y1sumU<$Bg`^S%d6fLV88lZZ{M|5u3tZ9
z6?Ep5wI|>q*BrHen4MG5+fXke+i2wRc>;}Oz?+Qf1C9!*ukl|@;{nS0?+*67a@1BS
zPkWhh0D*nzatM3fX-^9Zati`Cxny<F{s)@;$kt+6=~ZGT4ko=8_V4a+e}pC4D$ko+
zKR7g)km(#00PV(k=TI&1wUoEj4D4sOC4<U+z~fsJx#_F^?Euk42-t4})IFjGsdw(&
zo{Z0G-S7PWX#s?2FW}jY#sMnBhN50wB^H^r&%dam=l3&rHe+miZpD`wLf4Kp=$vKv
z;SNX2uWRLGi6~_{Po2wagKs2l?z*nv^@pv>p}Y_#<rw=$TzfTovS(>u4DJiUR;@__
z5mD6@c<{?p=Cvf~>u!8Jyh+bwIcJ?3r+q5EF2Dv8QV0S+o5o8Ty)rGqPd(GueOA>V
zR<81(=L~P@RYj5?KEREGlS1$mB^^k4q5^_fFrX{ITgf|r8JZIr#vR*7>EZ`f2N=TU
zkXOPxJ+rtoBsk5m?;M^@)q;4oOY|V=<5?a*U6UK(((~-P0z8V^X0_gjG3e9q)G!Rc
z=^Y2B*S&5&`=$2jt#PBREx-2k5%asmE9;-10U6P(Wm0i=8?MlMGa_g<WE4_@uUr5$
z?fIqUVh#3(50I-0hnF3vy=cjmxBt}x*jUELFTe@mqCdP}s1uWfe6(jJmu_(G%pO2U
zFq6&EV!-uReNUR43Cl&&R;9G8s!U@Lczy@YIti_(Pmvtv6M+NZjqX5>-w(Nfv=FK(
z4-GCCWG(kgQKQg37Y#S&kTH2N;BXy0mYQ`Bsm3{xi~lfOS0Qx-A)=bx;k0|XaOp_7
zl9}_Y&-FRRzv_3RG5Q{U3I84wq5gxh)}i}%vjdi1d5NZH@3ib?Wt!Z(8D3AG#&k`Q
z4SL8e3H2Yg-NP~O*zm<MxAJGgVs7=o<><>K8}7;Th>nl(*_G9!{)n3Uz=#^UB8sEr
zBgRuuD)`|u@WfNnGfOZ>#P&%VOh_u1@`33V-@nTC9beGc=pu0p&lR|Sygen#q5D>4
z$r?Fn0{rL8+1iZ-@#-XTGfxX!&#@WIviY301dubtNY!L@GUgsKSbWPR#e}#bh;Tf0
zZAFmH3uH&?{4_SpKI5OcG!x4VzjYtKf<KK3$7GCka1#v3K@3*-wX-k7?;T@Q-XMB)
zu<P_7^A+|BJ-p%6JDtoAL=E<AYqmTE&%7s(t>pd=%8%r!eb+l`t$xHL48B*|j^O@-
zQgOE~`OFvpr4UTw2l8`|F7LtGi75GJ0?*5AT@zYO1m#YlV{mki?E?!;7c<az=!Ls6
z@X3bLTG3PO5I6{g(F59a(J&$OXCL=iJ{`TtvRj27BVzhsVr<2A?;pbOUg_^r1UdL_
z!IOdY8lNr3Ylal-7W9ZY+2PH&<#gI#VZCvLV)c?4COWdPo>R*QuDoWCHk0n9P^XRW
zueAWNc|ULu4OEd$sQGpN*2>)rW+gh#4MmbzZvM$0=Vwnu-^IR0ggx(%D@Fc(^9>s+
zzGqPYdn(NWw1>O&6#f#(*$R+X;hgjv88HK$V?&3@DS_2>d@oy6uv`z0U`<;5gL?%u
zP9D}xNZNydo&bR5O_tRTm)m|O!wp(#MRP%f{U<0dIGEJ6s%Nud_iW9T&0vBj{fKkm
zmNo_Y2N)+l;$M8Ejinb`ORf$U5MvpcpH#VQ%?qX%BX*hNQ`BP!>7l<pJ5nq!%D;z_
zTg^LS7<a+U^V%HHLGT*`GypD3DmOfew`|$S5<Ms#1k8*S?)StzHBj{QOntQ8hL4jn
zyI^W0Yf+vBL~G7*vP$JZo+7GdYR0?yZ*zvHbK8T4Uh`i#ALo!NO=(6}H0M+zAyhSb
zT{tFpA4T;r!sF1Nh`z9~8sahodaMCGu;E(~V2=!Kw0PkYw?&9&sGs^*X1B)}sW1qh
zS#Kl^3V$rMY&<3IQ>yaZY5QAB@y5Dh-?1D*z{0S3J+4^qbTn)8?4{w!&O^&|1SC76
zzTJ7C#rlW7)#<$vLK{a_uPP%?I)NO(>bEBFvS3O&`4)#RP&GXXQ(BLd5uB&~Uc!11
zE9^TC+6V2B`f7G0qkcLWo%SQLVUS<NQbjyTuU3QU@}3;$b<;F*8Y=;j3#y(=QP)LR
z7k;y>9DspfR)jL*TA2t+MY3XGXY~G_-O?HSmo*4YW548J)3v%Ua!-N8OYDEUJ4k-0
z-j*|8KZX00N-tiR_<5Av!%!KtyR;6MspzZLM@Sw=*m^hd%c7)F_`_v9)q#J?SHR8K
z@ZM}oA^1HcTw?aGJxa#<KEx)<kF>;!SSETX`;^692*MsTeJ@dR`HiPW0(N;%L$S>n
z&e16Z3FH{>84alhN&)cFJuvBAI-o7;-5Y<EAMunE0I6|2ByjO`w>vyeNd^|0kf##G
zJcae*SP>G4kncuE9j{1m(czXNormH=W1H3#=d){O$k*u%^+zn?-c{mUEAIY|)03*?
zDy7ecgIjCHcue~l7#AKAIv@$wca|lNt`3v%j{e!bwsQop!UfzJM)M!WgbYw6INzgp
z6Z+^z$XL~ZqjPR&UpMgp&O;PsAsHI6XX80%RTk>|I`<c;J7J=wBB&{??|19IWdbVK
zD0|Z4<olcQ$MSy6*A8>oo)93}KLtwk_We}3SW8MI%~bG$ZIXzh*VE~aSf69%cATMR
z+`=y)z1oG&81Ms!#v@qzz&7?Q)Pie|v%zoSJ*jPvCgJkeBXFxufvc%6bz#nIdvi7F
z_!Z)O4<i*G^LZ@Im}bpBSF38|CYZ%d=20t`i2buc&Tsu|g4)Qb+R>~zI4yl89w;^w
zo$nV#IdB43A~{gzqM;!iYQ3uExpA6?g<^i02p#p33nJH!rFTwW{TsB7U3TR(M+zHi
z{2@iFB2FG61#;P!@y;jjDf-2iD^C?x<b3l1E`C{o;-K=~l)4w40sEn)tK>5r>}G1v
zTj=Q(mepHaKl{WsbPKw{TwJc-?pZmr8+EH6rkGFsIZ{5jk;9^~9>|ZhTL~b>CH;K4
z+`cTL3+Hes=w{4cl~Tf0PYXQQ|Blg)IB+ZII>_1(M7dnlwnLKMKIA>Q46hatmAWa`
zTMn7Ku0NKbc#cPH+>@T)&6NjFb7M@j#V+QbLo7Q24oK914%dZ`Jo9#3#)bN@c7q}~
z29?v;bMZtg74yeyLFWmf-=MCy7<HQb$8>KrbtZ?^zc#lrw^mOlUhZe6ek|=vuGz!>
z4q|+EjtXNBZrt|tCLYVdSg#UK*Ax7T{ulSE%E;IqL=OA{^Vs*rG&rBItl&fe^1)Vz
zUZrzy7q$bxM4ttQ-Br|<cS!p%byf{AxI37tii|Ot_ERm94T_lMbbAWSUtZle%Q4w6
zuqqJ`uAErehn?7<2iXA|gS+IZ)iWdvT&d*mK-3ASJL(Jd6|8K$O_ZSpkjU3IGeWbA
z2k3{Y9KR7G4~)1G#%Algo43v{Z3++4{=p8;T@=+XoC{CW^p~mw`el`TDmiPyOMbMQ
zbnEH32XcE#GUMY%+X3Lz)##aJc~Yljd3tSN;lO(-c_Z|=Jf*W68(}yijR<+dJ;Fk`
ztKLyp2JT*DR}S*DIwOMbE)wASu0MsacsN$eGiZ(lc}){e5-z@-%ERb461tee(#%&&
z^`oqTlf>(*V<jsMghPu`8Nzv-eotate?VVmasA9gu8i&|RtV{T=Q%5msN{Wyxqep%
z;BFSomj^HK$vPFtjn&&sEVe`<dI3Wrkk_*6uzCqQMUqq?UxEj`PE$u0d9vi!(MORh
zL4sv(1BXXWa@Z<jMHB(bmI24H?oY1D2y`uwlA!Juy+RD=sIQeqml{!n4nkzh8zSkc
zuY2yzzF!W?*}VwQm2r>``!(a!W%kNRq9iTi%+A@>)J1lsGyD87q?H4GUc|u`D`$bq
zvwqi$DSKcLcy^(JbAvUmoAg`IHIetfz2ar$D^d3;AAL*BfcVD830bzARo<LHMyOy)
zMkuLSEI1W?Vv|EDWTn{*bU<E{qeLOy6e*Gh9B=T|=qm2Xmq705VzCyT;NMMbo6gz#
zcc^TR@d?&;?9jf$KkNB+{9m)6sDE!4tA5+Ji>cbhw6QQhy){07JF@e2*!>*j-Uke>
zw@|ElK-Xi?Jy%A>#x4UsUp9ONUOevg4x(@xc)}@oUFuo|XPPE=K}f~%D`6{Qe!0fq
z%;RO~03y$Rz3E8ceQ-CdUjg{yj6BYl_9&!rM`~M!p37*3hhyPdBo&}Zq``vJ5y71j
z$+4m@u_^`g71gooVJsRSC5XX>v<8U%YlMA2$erI6Ps(9V{-kcMhBIF<o=>r<m<v&C
zZssK<E$9Iv{a49X?h?uhNT}~8TnixoJ7F_EKUKuW=I5LP-`ji|j1&O?w0Qo8H#mY1
zyvN;)i=R^I#bWMCrDBiNT;+W));GReKN8NJcEc`4qZ`z&TTU*myKeaBhF5UAlL45I
zRDH+RwiO&fk~(9n3lZ*Bq{L`Mod@7nO2@n!6ZRG73Y{ifKqr^xa3d)U)}AIbrRX8_
z%@Lzq4i{#Y>k3aBAzV=Y4zW;+5KKb5tvU_0V>$|fXy0t26wfsi!d*AEkt-wH1G>q)
zZUJ`PwMve&2_p4gK=@hl&2JhOAe81O6@ddNo;rFIHsYpdhVV!!rxFYQJeJ_XM>&Af
z=+>(z4oCSk{6M`2e;kdcD<LO8f=B#Xko@p>NRw;G=kGpEhHE6k*bZ*s5X^v7=IdC9
z@K_$)V)=JN4?YoBYKt`>dRO!YTyi}bfN~G`Y7!<Sv0?d3W0%<nX{_Werorw`h&%gS
zJwY$qD_+NQKnJg{SR(4=e{y(}<Qb3y#zx+xbQ=K6zp>ZFI3~<UNn#{G)Oo7Nv*rrZ
zu@X$XCfd|8#crq|?KzGIC*8Cvc^j4p*NsU9&%tVO4qPpeo4&16F57zg(#RMcYI)7<
zVwO%CEe!WAZC*y_FGF7Rne7?YnGG+vD8zJ1^e9v{%G+@>&*Txa=r(e>(*)HY^+y>K
zpNLmFi<J<!p7#?LHr0EmHM|4s+yxj#Ql?h*?eR!NN#><>AcX^CF0?`N>J=?dx61-P
zT<k{OP7V=9jamS{;~p0YMDDfN)!3oe5j=LX4+JV|J;wQAs2CH!bseD*p+Yg;i=@^9
zmQpWTk1rA|zSIxyK#wo6p!m^F$mlKFrZn9azU5o3HoReh>-eg^+y9=?DdQ1xaQ*3C
zHtZMCv}Xjtj-|1jLU#UPY`>-*ANa!#`KFMURL~9_Hv?|#^CTT|Kn~1#raV6N_J$&0
zp(Me2qc=lBjX^2Oq$uPPm)^~Ah6*T&_$DlS7U6jxtZTy34z;`3%92{+R#!T~Y6)Q9
zVYYkMCMJtD`V1Ga`_i0X#mS^<QG>7-%@uu=```;_%v_la_on+E;p#o;Hgwp(sp2nj
zCQlx56eh=ng|;Jx=%dd;_@N8T;2v@<%|&ty6^b?7CDpZq`g&=L3^zs6<jFI9SkJ7>
zX54_F;fm&v9!+<yU@QTw<2VbKs6;1GQlUI0XyiKAhB6|=1z|c6>*wm}#23+Whm^Vs
z2r9CtR2GZlF%NcMEs^iCS{Gxf{Org_b2k5I7c@K@c?vIV4K6G{F0x<gzE2EqCQ294
ziYIBsB<6w)_+gfKp#KKijFPU57!kwxWSvwmF&8pCio9Tm$jAZ;B}zh@fqE1$W4RAm
z5Is2~Gv)(!Gt&}E^W0i}MX_IT0lbz4@)Va^@K_IonjkXlNlsdbqAq4z89{&D_dLOU
zKYImWC)p}HIArzSZ%=xu`>*StT@_<ZvXb!akmdBlAh;ULK5{>HrI%Tl2mRlQe9S20
zc1R1aHC85&j>>Jc*Xp(yrv0aikfAjlAQ`SW^MU`7VA;d19y;Mr$_*CKB!N927aA=~
zinK$RPJ`q=PF+XEsV8$*>h7xe+O^>=7Mk*~0yAObWT7Ib^2q7+g`IO-@D%ju?hadf
z_XQ)ba|yQ|+g_h;_{hw;_hBtQ!iVjCot>})J0VV5@jVMV;<o0!DC_dYHY5`OyHU4_
z#5|M1Cu&Q#Jh^}Yn&C>M4E)fJaan4E+GrHb@MSqT6?I&sWQt#jZ~MpvQ3_0~6!4=0
z_Dv271m8depQaKl<NzlX{>kZK*o!2P3|&8mSKIFIUc;3|=CAx;N9_@gfgfM-#|idP
z1BFDbL0cQg@}=>=5dwee?O%Qz_F)^r9UBB2q6j-8cPn^cVd%_l-MLr`FhJ1ImCus|
zI#^aX^QUO?wqvV-e})Dj0YbkAdZCmZnK`-&Qt7av6sfWn6wG%77kPAHGZTFY4OO{S
z7Z3P1m5?icslstAJu@JSZR)pcd~$WJ_)nldl{&>VyT0BMHUcwzO0fL;rP96hsT=z`
zmOP&PTWbG`;)Ge7)<-e;h(~Eo=kH>Q-qSDmuwkwwYP#5)o#9RN>4X7rW+n@~`;b1z
zrO|ysrXKtCV;l$`xD}8{A|-iNijl+@oscNdTP)W*&FOW#;GLePC2F*>fMGFXaxQKk
zDz#*dD_*!DS_Y79ixv15$hWToI6L@ilf&&ZKQJ$B_%5zzI!ui6)DVazVK!Prl0je`
zb{2%G0QBiSt(6<~6LSw1>Iah5Qqz?pQ>Wp|^Bjzdha#tl|GNHeXSL);YZHF6%P|P^
z0(I%rK>+^R5HVxNE*p1*iMULSf%&b+$I1V?<%<t@EC5946`bAENJL=gt^9q~a~#-!
zL{J%7;(KaU;RyCdf}k^f1rX{L2fYPzy{nW2lAP60UIX;lKOw2nu;&Dst~<7c)jlZl
z*8~h{UFN@}gC^y_JIY8cC5!7usFc)?L2}wqaVdbh%ml^;A$lQh6=R856}A%`DS)ES
zLQ!qSnXpqp*1kxY${TO))7KW+Cw5;$dF@Lce_wS*<~_G?R4ViHrMI1n&iva+K+@3t
z8xeC1bH$ef|1<j3QY3-vNxXbfXMi7aCDDx0Oi=#_xFqBm^;AT|VN8wJ;$-nlPQEKY
z(|Qb77zkk&i8e@#(uYkIqk=|iTX?n}B=`a%Qi`$(;l`xb@cXwHSpAeh`oTpSn8rNb
zKKI&zGEC-U5b3?RJ=L4x#73nVwV{8F;RLZ8ZVYE~rmBlJgVtGDX(kIE#N!kX`tE~)
z`m||G<s5Dw*WPrN+i5B{OReMIX-}viGib;pSZc`GYQVW<2%S<S71fK17_G#ad_W<U
z0PkL`@`seY04FaOP=M%FdXPI8X@=r79N_}!M&ubdX6S~Ce5<XMcAP&eCOFzobJXsW
zRkR?L*MiR{kZqlvpYD*(bpY%=gjQ3`oe<K&!&S(woWF0_5a0PBNHV_@3e3ZN5eU7y
zYPGIlaJXlCd0P^O*<ZzNaPPiWt9v*R?%kb}KgVO5NjT-qTS&HU*D~fk^O6`X@qcI%
zbJ(op7}6z=#9@3OA`w{L)UhBn6##Ag)|e#C4<kmiV`kV#7DLVww~T3q#ff;*ZQ0f5
zVxG6-b@TU_28Sq;(#_sToRqTw3Sl_m^5h8~-r-&;5}7B@Cq~^9qe$|F@Zaq`L3G@u
zx~xTqEZ~$AO!#4Kl#eB04JP;SKRVw3zvL}C-84@kuSR+m<HP1;zL5E3Cp3!7g<#Lu
zC!B6IoPvKiHM~h8)(ZiLYqdy&zBem4Ie9-w-L9dmr^%=e)7CY3BPl$1$^t=#UZa}E
zpiFF#T=xNzJb|hdVGgFK4ad#gZ~VD494Id~5W&m8PF?LvkXq`fhcFwrSJK(b`M3b)
z%R_|W5t*H~o%@oaS@soF+}|=HoKSJ}`ZahY{2ONEs9ww4>Q%P<Msws9>Qm&x24hdd
zm>zJYoVr~A-3i1O=CK86xQDZ_V+M(@{y<!Ql(e78WzR#y+TN%6J<n^!<%xNo73Vu#
z_Wp^A;;<Mc<poI?wmk8G4KC&rVQZ5jf4+-~fXGUtHh4WL_HMUeE~yFbUjJRe)~o1l
zJIpzB3^)ucOdSjhy4dc%l|E3cKVj*vx<$sukt{C4;|+S$tp|h^Tsl19ZBC6y;D${6
zyNchBf5j!Pp^9+6>j4tr7TZ5~`0P8f!XKjdE}T%9NDET05Tc4xwgj)XahMyK>nYd6
zN|oWU<`qmsloW{p)+urvKGRO{jRC>rDr-Y8`PB$B3d2y)(F1h{_95}0@E9utE04s#
zzdEsMaQsl*89y!Lq`W8pC8IN3xwJ6cZ?4s#jjr}4I%e+0vF)~Q%;GKqG<ePagn~jp
z7mJuVWSeJuCvK;~A{D`HVp-6u84RqE&9oOQU;Nv1A&0=RrTb{7cxXph3sU?M1j98f
zw|yn8@$J8pbY*LIJ%l}9LpSy}>AzAW7PxCEyrSH&DDYSrVK&VJc#5gmD02fg(wajZ
z@`5HZu(Jy6ud;iIa$|VroA|tTx8bn1MOW>fxKP{x*-|uE;VO1T9N--lUktGaa#&=A
zLnPw5@LB<bG9X`CO%HlNAfPBM6o@k-l*J*hbcmJnMD3;FpwLInNP|u@^~5naO42*g
z5oX>8pe&KIm+^0}?_?;geGvd($zv}Pk4j!J#lvU+y#PvIYB|uq7NCr%?P)XM1foKa
zQDPjMNhQWJS{&>XT|8LsgRg<^y(5=v1W{Maj_IXVIW+u=Lq}Z_fj_%Nnq1$^|0~cI
zUX|GaLRCo8y{RQE;E@etz79520b1V+Xv}pAs{-BjV89>7C=NwU3t}Iq1i3@kDZ}Ss
z64ydm*+;obMRi@i?^h^#`4=28%r`IvORwLNGtTtCF3D8-FSo<chgD0+{~9ri6uiRd
zf@Az06D9!g=M_sjV^R7dz{W))Ud)LPJ9Pd4fYg5tNH4`L<N=}IF+8<!<cNz{%2wxI
zPWgB{Ldj@l%|T?{K_sday;~u&`aq17>l7r^KAZaRm|zsxeM%<Jgd~mh$BK|54LB;E
z0Xja=OMcK`gRSnqWm<i*pY1*dJt!y4?Alp4G>Vxyi<@Vc!6B3Ti1>SRH5=Cc<$0S&
zw-u*b({|sC5q@z2<rAFPaUi34w-EflRZA+uS9h?-KN@$raxVIV-J7Yvq!(zR%HbIW
z`E>wEf>}c-0Q*uKtLQ9mw31aF{Gm&B!|`n&E@4r2bt9?7*9cMYBL<9qg<P`73NAZh
z5mO!jxZ}!EZ`L}zj@)))%hzerF%Bn6mdIOyowrw55Z{BvVhc#8zI`zgvY2C{N4?f%
zI$)}><sX(TKXI4xebig+mY$2dc5`R(*7O@(eWr>1_g40cW#(A%K7aewRY&5n7R<Z<
zJ9Q2i8EP~eX!8^DNzV=;C7w8L4eAL1OV<Gnj`$KRVkSk|U9hB+yJGN;;9Jgo&5!mT
zvn1{AcqJtc3}rERrrznXte^>o7fGhIUx}5yN!>C<)H;%M{MzAyl_HJ20SFAklbqN4
zD6j)ac?T475VEg((T(Y6*DjJ93DiGJM5&$8I!L~M=D0<84}JR|-?@T&Id#LS+uv>0
zM=s%6@Xc<_!lu_t(wz7C`jDxX&-)lAc*#F-S--ZZiuf+Vm@WV_<UvH&o8XaA<c8bR
zOl0@|X7WvFq72K`tIKifgEd*m)?EC_yMh~1l{X}AA;@<gUprXG%0ll}lkRYb48u87
z-*>y>X<SX>#c@XxLfTYz4{xKW`PdLo>+^jS$-|`A9R$=PYvAq!Lg-g2xipa3)}K$l
z@*&8GihJ)|u>3T3Jv_$BgRZ^+Cm_t>9+jiE&i5?%+L|i8{t(q?$j<=lAlB15_V@wa
z!X07FM6S7i5r0FG^qOGFXI=3h308;veU1P)9fJ701ySSf9N0-H);vxS#e4YCJ&STP
z6{8i0#o)sFuB;ZJvA6neJaK5w&N)T}0Q}JmpZWS$9OoCHhXjq9?EZ!Oq9@x_g(Pk_
zbG`$3%0+q*4dtk@7Wx<v&+z~}Rg69X5^WDJ*Po>wH+Y|T@itU#zB`fQ|0uaiMPllE
zqLDeFPzw6Khds1~$^F30xkH4j67mJU+<er$IO6z8l-}HcB*N`Rn_`1DUjw&Vy0~9D
z5@jc-m|^WuZV{;>^s%Tme#A9#KjC2AZ4F-5h%oE0LQ+U-2tHAs^nj1uW&_BN;6d^6
zTF}_=wzdPPhmU*N4zMNgXJczvwp*Bui^Ahx1ji>YK0|va-){Tv$G}1vTbPY@aPf}J
zJPj+^j|9QtzPw$*VEd~j!z8h|(*7-+!S+-cu`Y#xoFC-JEpk{ZP<URvGz;F{RR6(-
zecXxFVw4pjKck1imLZbQe;iRc^*icwQpnKR(MQVm-^JeZNw&fVE*1az+--#nYxBD`
z13m@aYOC=#JI1~LXN400@5huZ90OZe4C(q(w1+xeuM7OO%Y!(VdA^%^@ix^0Ipq<`
zNEqaol%?w`xVQJQ!J*gG16x)Exs4nX)t4BEur=NEBGAoW`a|FO#zNX81PPPx1s-*K
zF)0k372(uz{xabG=4OmmxOYM}Dl{T2>_l?VuEEKvlPq=RGLbM>otAZ%*s0DHf;;;S
zM5IDacn{3ufXKzFX2(LEMXGUGzCLR(lF5T`Kf_`C+3&&>b%J3sD+~a8DVU*qahlyv
z{Sjoj5$8Ks1I6Om18*yiQicj%7a|T-VuJ!?yHVx}VTqbm<1R1Ozxj+=r7Jq;l}q)H
zs{Kp}8A4TFKQ6L2g@yiuy0f37P>1A8LMk;GOWw*nN9i&rX`6w=ODuJxL@J$XNnm3b
zYXTi#)`ss8O7Hl+>9&UG{jB<a{pK(Kzb^olfg=;L;EhxfgUIgAIZu{d6w8~w62BbU
zhbbSyE(WL~zp#&kiwkrb`@(TuG2ZSN=H~IrJAG&XIPCe3^NvUKNy7)IQz=nA*!ZNQ
z3gX|S{i}H!9Q4AG*hO)_yU0h5ys9b7nP8z1iFab;p5p1iu`02gUyQBuVntsf^WhAe
zai`MoyzO;YM6QU*@x#9<FR*uhWn3YC(vU_S6UeV-qQ4^5{P`Y=BG{(UQ0YP{jz#p?
zu6&hk+gG>vrmF7mBFhEuj-e7_Sz!>1<+K^bx*GI#aEGZ{?t@#Tvl!d$(0mASm>AYp
z%t%~zV19}uJYymNPoxO}XiMsm8EGZ&iEq9p{GM0TWRjOc5uaxQhuHxCB~y9Xaz!z*
z>WYAo+BbYdw_Ft>vySKuXQa%TX9xF59ZIpaoU#Y;FJwpb20ca^R7=ceo`dD_TfCBh
zSy6<807)q36aLp`s&&ktV$QF`#gE(Xh+PLEw`W-v7TPp2svcs{S@c;t3yOUl2?azh
z|834LT)Gy7qqAaayN%gz+X>W-%IMRcP&l!OGxrk``+qT{h<KVWHc{8H<wAel%p>nL
zUVS3m81Y?<rT<sBB&AKZ`}AHg?Ns4X=+w7$7mv1KSX7zrV3tjjS542XH2lfuo2hB3
z(JgN9?WZ3sC=}Ty^ztGxk3_k4h2rWqYvi*at8gwuR)g_XsS&I6+b4)n!!86ZJ-&gr
z*{pwb+Qq-TEWL3dzqzLN=kP3zJvJM$6UlPN^__ES$yz#P;JBs=AM#5YyDJ{OfA!T%
zfc-Wc^M41vrGZEd6n=l!Uwb<!42bgMI>kh!)v}GwgYRu4o_q~+{dg{N;j==m)y_SM
zAIcxo2VNmjF9bN0o|F;ac{u||ctc%4vW$SpF##9t*N@L}eyf`e!f_w3+#=hthFLPk
zCu2C=HX(w?DnYmknqkYm9wOR*cBQ$-x)b||#|T+Ob>d?EL_~Bw^~r*ZVwpYL4U%06
zksy99ZGkkXR8__lC#j|f`m>C;-r)eiT1%1}FMkBLZY4Iv@lx5NZj1d4ViE>;*ZY?{
z=@YN4&u7FDesSBXihxfYodWoC<MIYy%^Wk$@{dI3SMpiudcgt0SNc9?;zhMbk`ve&
zt=ap4`>t19$eK+(v$GrdK0P5(?DkPUQo5ukwVIXjm%Q)t_E$*tAY@6#nSV8x%Ww7%
z3Lm6Wt3}!H7V=%g_J&P7n_eDHp#?gz;1`lTccYTnAp`weEs4|cHXrZ*7F+&GU^z*t
zEb9_tcRB8*9in%X^I{Mncc*UR^i<X3?Kk)nk@-25H54;P1wJc1-vYaLO5M5EmQ$%=
z3If<qUt(7F=e;29mrmun9>&f5SOn(&9QiXB)s3R$dyzf(IZHREA?VtcMBQ#V4>a@N
zNkm%USh$1T*D*#pvmKvJh=q<3aCn^@MugLeEDcw-VOKGaJ@izz{(<0`fa7%=n_J6x
zkr@O)8kcIx;#*}Rb|*<^xt7mTtm8dXx5ye2VA|(avh?@x+N!gP$LK-nhy6qPF3c($
zlsm&vn0`3r=IIAIBA@2Z8p)a{b;hg+?5PFjL{Ov1n&&(82H?fqj|b*R5gUkV&i$~8
z?QG40gwOY|mGYZ~it_bTjlQ!^22M>@MQ?^NjzMpjodgfU7`cV|XXP|Ivz*PK5L;)1
zp6t@+S+abq>}zL+3AOU@Z>*3wPoZ_XIN^Y8nA3Y=L;!rnnr^6&uJ36w2kmWNx!+$2
zQ%;|V2pO_k$}C=qbWw<OEaN-3)Gccw@;0}m>i{yR8wssn1PKL_p4X*8qitk~l)hJL
zBf50CgW$v}zD=Q45$*~dXDu9rnrv<J{}OBZ|3(oraV^6PYCrDl+-CLbY$uynS%1|w
zsZn&t&D7>+?AQoWUL>L8Bo)&#C43QHWkdO{urT&PBA1B(8<6(D!zX`|NoND6^`BXn
zAaV=&Nqw9*YES%UYyRcl1*gFBiyz;^|5v&3iT+&W?}Fmb1I<X3kD!-{Mn!0V!>;VR
z7uX!mn9@tmBZpjoJ03M$-!lNiYC17-PtqXE;4jp5#gk9pWrzB%IkWNAJ7R#(0SJ%7
zI}z)P2g}<-vus!f^-zyJ)IlS&BMC$zv3W{Zg#Z8=Eqi5~jYfpG{<OHWfg)|nx97kE
zO*l;~iYd7`{CEyB)4$F!2Znd_20yErXB@wjq8&fj2+(qVK0Shb_kv_~{Gh=9L(`YX
zL;ZdKzh=h1OLm3qA$v#~Nyr*Xmh2U>C$i5dDrGHX%aVQH2{D6ED*L`mA^SdznR)$Q
z^Zxw4j|cy~=AL`cJ<Ic)d+xb2xs)_Ilvz2H0akGIqoOzJqhRt^M~^KKl%iiSKruBE
z>c^5FO&U+vJ+vA7010L&Q3_d^H98Kl(Ylj=e%;RN9+BD?oJt2Ku5DuyCvSYA1_0|+
zv@GrG8n`40@Vuzu8uJ=+nad$MA)mxq0I%w{l8jDdWc~Ox?P*N&J>}i5_eavG(*7=M
z%Lg~D@@}S82|Gljm4~0@|Htxr;LD{=nIG_tLHJL~{myzI6uy(aKX2QQs(V36vqGA0
z<(#|=%KRg$E!v5-R6H)lo6q)EPLC7!_gZR7z>3F@C!>rcBu;(Q*$<96?|@e(W;j72
z?LO&0v(##U6(Ua%TY{ik%C<$IcZTi&V{}f2EMs)8F$wSVo_#jEYsUQ|d)nEzIm2CY
zA*0|{ns=Y7QV?3`9NftY&0MMCC#4bD;0kku5iG6HH=Q*a_NnLA#xY5Ic6w(BO(^9j
zyGX?YQs{72=S9@|abX1asoU10jY`6okh^3fx_z22z24&9tbI$Oo^ylxH@H%QI`<G}
zKL??LFRy7QHkb!K2y#)I!E(#POU+<hZjNoS@$4*m5+=j-C1v`7O?FfLKb(ol7%{IC
z>r@fTv^_<KL^(~G!0;RPtA<NGMbcJ)Ive!JE~=8lo|AXyH8Xb3;9p@T7^qQwT!7R$
zA}I}NPdN6Frh3cqt)a<T<MX5AzkU*wJ%sYlzWC+U4{+_y8;xRYs@Z9w#uLyhM*x~%
z7`9FV!m!VnmBl#ym#<qF!0Svc9HOhbU&3ySO2nJ47P$Q_Z;tApzPE4w<*rwuuhj$S
zI$B__Wj~zdjd;WO@dlS%k15D6FBI-6Ri*ty4c=gZSm(dLG#mn)-z3V&(fB5TGpkt&
zMAeYl%GSUnQ$0Gt=BZd>>Ka&!{}QS+kJG<*Ie+6pVgCB2o6<2!a+51Ouo9(ogdcC!
z^%iECQQu~6hd4+$XMo<PzWvRBQb0>l&J3pOwtia4I@D_b%Z@At%Iad~$ILApq^gHB
z{hQq{Ld<L?&)Gk)v~N;Xy2dPdM|d$>;c*#^rQ<c<D$8mm{ZZ-~^MeAorZn2Nh_G_;
zxU&w}_|6WVp|AP?+j%B?DpO)c;-5WL9>wsUx|QHfZA<#6oexj(Ep0Px){V>ebS3e;
z3vm49QPkIUR30985BGc+ny1R83Gkc5z~JWA&o{=D6E?7KW$d<TbOJoQ#o67RDs`s1
zy2aMRbSxjHpPi~9M^}E||M<o?Dc@ESVAE7obrG=7qtw07wI(Lt1|&U%jS&DxyJ6$D
zG5!-En~|L`la<3w1<MIs%DND6-R={CpBDT%VdpF9Re;BY-OU>B@Aky6JCj-`LuIh*
zb0=QE54THCoovB`i^y)%=w(o_8*<?<CehbYUXp-nUkQ2kg>5?To2=#uHjqH(D|Kwi
z@i?S2xD@AYX%((Fn2+yGg+egC@po&G<lGOa#pBiQrhT6W;r0fKL#rBZu@iMuV7x0L
zB<DK4fJw-W1xV>^i;tb`<{6G4-M+6`l^D2DPU_@TxPR<>=djX)DLb!jnv_=3mi%FF
z9d8Li)b$_4p=3XaX@_Ox+Oe|xetHlQHz}2Nh>t5FC1}6>|LUEaf|eaPB>@w>lon}p
ztIsIy&4|;!-p!I44$<XQ_T7TF8y#6F$iv}&mtS2eJV?xvZ<J3tqZdQp?yeE4y|GVx
zJlFc^P?;wLmTZBpFGi0(4jVspTe>#A)9Jx@;1WrT<+VUp;lT5Ez_4wQYi&NZ_;WR;
z*<&i$ue8nU!`eRnE^59l-I^TGBx};t|2Zy9Vp_rb4g6rnpHANa-MFtnzJ||=*q`xH
z&bT?X7})&iHPNVk&nlfdO<_co(d3nebj0nu)<2*j+Pvm}Iq%-(6<sLreJ5oY&>@k3
z)+w4+RL6s!VS3DA5g%i~i{(bRp3S0|kY}$FvGww&dcgYv%+#{i?~1!{7xUv&$h4gf
zc<KwjY9>KJw9UQIhoRDyqc~y<zBzOZ+O~ee=_qPu*Z8I+j+HI@lP!oeC*B}K<;-6c
zSDh|qBP$cf-iXh<r{Xd0)AQ&7ocZAOU(fh`f~@2Z2z9r4W*zpN<l@EWOD{;*NPRzJ
zq$(D1yKFbX3az?`r{<{xlz66q92vCsbOF3U9-f{7``*p(8G9x0>C$`#9+_tnHp#hj
zuGM}i>wM5rZX|NPQU5UXv;?#L;mCac=CG2Ut{e@x%m-yxP*1;6q_mvN*~MoyiD+cw
zA-jZ9W0O@y4g9qHoAoes(D9$qSyg5Tt-Ms-e3rNBV5N7Mez!heQ`sih^Ux+_US<=w
zSxRcNDY5peOl$DGGU%swcxN+#Iv*pkGuvHZ=Q7nM>M}>|?6xuUsn+_J|F`av^B$p^
z2cIS4b8kCxC)yGD=T13IE&ie=@BeUvAW#XzA!>82fTsjy+y(mfAQka5xuXXWv^$=T
zG$a66;E$(RrEw~5^>sfg+ecvb`t;TDA+n~tSxt17*RxB~_2zoraG|H3ZJu_c^<T^%
znq7v#pe9{$y?+vpmAc@qzWWUZA?EIH&Y$;VGhexv;c-{MO+zN#c=e{hUQ9l2dzrL7
z+S)vWDV4D%&X=~hOm$PD)D`ig0duI9rL6JO@%MA64W8?V&~}n;MWO99e|@wzn`L_=
z|B+-_Or?Jqm5`?PY}P6NU9&5%UnK+m4zwm2-1eI7Y-w{jub`G#Qle-2+VzxS_*a74
z*gLci-9~*v$4x4G<0Om-!t&Fl4o-KYn<ox-pO-vP(tg|Jr{$G@>+$lm8ott%HlyY>
zNwW{8vxa&Hjx%fLwR@0t%g4CaYy5Z+V$S!KrM0FZFR_>m8#YF>fTNs&8xQaAwp5<3
zl&J+L$xCTK%_ZxTM&Th!b~vw2_{hUqe-E+z#0HPxKl<!e6KWjTdRPdDeFb~f7}c?>
zyS5txcE+yRZwsa0KM(G7p}dZ6?gxXfVo8*(D3eA%-%_tbvedVQj?d$^k8J0)hP#77
zvm|h!GwrA@s0WD){n3iLO@!<oD(DdTo<+(PhOd=zNm_GVROBh%yPR)S4|wEm9U6wr
zW2}Sy?=|Ah$F=DNn8u)ff#Gc&3kbt!6Yi5SwK|BZWo%0nY-0a~=R;uZ8ewgIP_%jt
zoS4I$>D!;@2Jg&2Q#%?Tsd=w?SOTWbVdi!gRY@mG$T#jM(=(^9$jN~(X|xk1l&{w^
z;~i{HBVDcg`Y5H*rh3mzi%P1U!l8XXJ+hhYwZ5x#ci7)UazwulkmFdm7eP63hPRPo
z?-jjM&C;t5UQ&qLUnI`)<8yb3J4WYOh^NpDOkX#bPS;#o*AFZ<;Qu!?Tl#trRe<A9
z-5+1dM19>gj?=9Xl%^d{Ohr9~%+$^^c~}mIfWJRwWbBa+kxJD5YlKnX@J(s7GOKsx
z*6$~nr*@5%WS<8O*<5NZ7#Xiu@}eFPHXUjH+@RRkmP9+j6Q^vmYV2}2f!iu3gzjc#
zNjI&5$N9*)8PvF+&FG!O^5(k`$b3?OtXCrLvX?L)lKk$#)OwRoQQ|J2=+O&g;oZH3
z{e2So94?W;G|(nEU?h$HSa(LVXi9;)c}8Xw8UYHSY{t2z(P2>>0%s8~ePTX6lv}v(
zKwRpb50$Z`nbYU~&LNFWOJLbO1FW2G_mlYB4tmy!l7f*g%>|Vt8Js>@VlC$*s|oCF
zO<=_w26Oh?+^SXF&r97=*o|aq8Uk6NGiknpz|H>VHt{EY0P*A`g+oKKJpatth2u*V
zf9qRjWMZ6PX%()KXA3@@UXez>_3-_9*-|{Ov3tDL>iISORQjP{ZnVxaNSp*~LlfqN
zMnRKS)E{0jB?;4rKPB1NZ9!&lwz=7(?C<tcE9$SAjh>;xf_f_`poX490>CjZocL#k
z`{aZBAUuMhXl*=4=nx@|z7tF7@~6Dn58@-S4K?0a!il)zlzq<yQV=Zdv<)v>MivNm
zToW3<d<z)REU2pQm{+4@=_8%eqUXg_mqjm|v+3yy@(PhkEB}^57BWpg&|}+ABF%Gp
z23(#)rqv%E4!x5#v^?g6go4Cs+1}7Ev>CoTd2A+)-ltsU@vGGLk*I{s>(Kol);3Ca
zXP=fk!0P0@kvr_Po8j{pC@<YSEd;`NvIb4zJL2>^ulMafANQCD>&x^F7hU{8`e8%|
z8L)M?z;c<t`Av5lD?A_n4J093aLC@MQxq3(@PAP{8pXp_WkxT%{RYn_jozDux%riP
z&gOqn9N)8=FA273ygMA_$$~iV8{Pe8hKt_2PGRBk%RLwG`6a8fVMe#_6Sr+s7|!W}
zxWEFFnBE4rmJ*3{Yd>ho^=)&No2|`13f%r=6YgDZpBX-7{&%So7kBW7pXLC16%5P&
zj_YR)#d}}Yn{~kTggP7g0k21XY_L7s*}sQj9)@u5(jNtntrocvlnq_RMsUL6QCQCU
z@B1!vb&Bje2V6ucD*G**bS)@I+@=?f-6b|kKFfbs0wFn%;knY_&?dVz2;SV6%q47V
z6;k)3Q1>Z4*36`(z7JIFAGmBo76Bk7w4+{eVAZG(yK8;5?IOQyhEL72X0JCS-^-<R
zxrEaXt=#e(zU(1JCAV<BXFY>!zzY#k?HR|99p*yUXA(`vs{eK@ucA;!dv||h=FpmY
z5^96~e%4CL=>X)-tj(1N>*|Y1t<h#N5t4fAhOOY@7Sl^x_lwWX8;Loj1hO@V>jy;L
zHKbB-sAy4+)lgz>0VUVRPF<l$D#q|3I__s!tK?BbXt4D&fDjd5HK5bVlfyN@-s0tw
z^3>XwYR1Z?vTOZ2j;&680J+}bSPOd1(aSr(+mU+QJIe<NV9*L?%^XsJWpmq>lHv!F
zSKjmS=(*lGlvH$pC#!=i4TPA|P;UYP0KmQ!@bwM*1=R01wZ)<W70^7|bt&D^nvbsB
z{%8KQq$V9sR_Rhtzio!qujrmwioPfq(f`@cjjh7SqsNXK9PpDd{;dT1w}YVE!#{%G
zi`hV0iHKSJz4=}@Uul`m*0#4(N2L6tf8Z^S5~5#{!Z2`jw0VP+a-=z&&fh?U0cfPS
z9M`$Fgu5%^?yo*MJoKL6pcw&$IQ+k|9C!fI5bhYa5!ybqx&K2ySh5nb3uR*H5vx*!
z@$|&kbjhF(Q$XC;DfL~v4iCCK7iB#H%CLcgUI&$%Qw?Q5md$6=+yXs3N6SmodJjnX
z44&djE<j>SyLk{OL|OJ>k?K1((*s4`lu84t<VMOMHn<CkF9r`wQ3xCWqD8Cf61C}X
zD<yro+t`<RXlVH%mNH&XGSXIz>MFI5%+2)*biW>4TY#REusVjU(@>93rNA}`<?EP(
zM(*-YNN##+=byN3kJ^lQlt-}WJ^m+CMDw(8$u?1W`1ys<(!thwdRrFvQ}RwEtf52&
zcU;5rI<GneB?nztD>~APG(gu#p{uFQach^LHMAy=H@o+WKBc-^MS3EI-VR!CY;EG?
z|L}WPp@E`86eyj49acbkcITT!wx*_Yp4cmtZzb0uYJ8Ne9W`x<<I7fa%{9eZ)Ai6b
zJ{#@gZvEhH1C5j}?U7QKTa$FH5Fd7&DT!Gwu<i@(Nm1zC$<jxCk2{%kMf|4gYuqpT
zNP9tM;xewJY`wu%ZP3s3mNSiago6EQ$a-U&v5O0$ED*l&5b%$KwdoPJYqD!UP@Xu_
zgpB+uPBb;u8}!#EqAD4oe=nQORn!VWc@^yW2y(xr|KmB?zRMr;2YqGd%bpF8gCn~t
zdUv$8+^Mf(T4I{&4HFe5bjTrS@$s*b#R|hjl+n1M$acLeVrJdi3^G?_M8ju+cH#z{
zLs5Ib?LPC`N8Lh=DPl#b>^G^Wd<7pYQ|>5a-}ne_#0aQOa_`!OdU^gWZ%P`kDAS*O
zV@@klFEdi>x-8ss|EKnidy;3Js0yBPK~h23{f<4@nGW^86pXNVh1IYZPps2_t`{g-
zIa~fk35TB>@tA#D!)AJ}Swwc3*89jYyAqXd%@&eEWnb=G<##&Iafs3dF+WfGhrmah
zl_sEa<JuVhH&Te^oMK^^oy6G>0d~Xfj{M4><TvdCm66>OArp4B+zMpUw4+E(V&F<2
z5-FFmRumsAWt5)Tx@6K`Y@9u2Rb0(Au-2AVQl4J1ex<l<?^H$3UIo7GxWH}5y(2vg
zSO=48v%C&ruWhhXxUZ18B5Xgb1zV5%v!JsVNDS88{M>#tpEY#T0WVmCj-eud%a0F9
z!BhLp$+ic|SJF!CW|17L|Dm|R0lP8y&y4W*BCf24*qKRQwNf!_c>aLl^tYNzUG>fN
z<9p`!Iu$jxX}znsWZhr9sz6&8LhX#*=l&w9{_$QW#5%XhY=D?R<Z<;HYQ!4U6O6`#
zwjX}ge`&z&jU^dM@C;rQ%s(G&D2eHexR8c!PY=3EhrV5g<Ie?OFhVy*fgQ10*x;{1
zCo9xb|07;_cUXy#_Sp7GI!3TrgoReZPsr--<^0bd8n+%dv|aWauhXPiv_K>5o~JO!
zA}JfqX~4X5J3@@W-0q6oJ{Y#lHUt{q191nK#2WVUqUmPI^<c=fK(-3k2I{@)L)l(f
z4>A@XI@OW11`C!s7f#6XXx)zLj778FsHziTfxK5}KgyngARWFOaE};<4i4S+{9E68
z57*#XQo&vx|HK86y;KO3mtpEYgD$`HCD`fkF}$iF+1vMJc)<Z?Jv77rfjY8+lw_`_
zC-L#H@*g-qT_f>ux?azMb@kf`^FRB0kvus3tf89!(S9T8W-!=}dGog)24ScEZ@}e`
zerD3x0R8M|b5xAxV6=A77vUm1_A;pX#wM8)U+&@>%C-$h@AR>09C@IZxX@Kx{=2d_
zc3sgHAzhNY&)$p3PNvIg)kKT1cFgSY;}R+f*#4Xh_rv)pBS@l?4JV<$q+d1%qnLL^
zcDVhb{dvu8)F_cI2!v)}{Pu+23N3PPL_`|v@2sK7EvtA7trbftp57v!UQ?P@;$byS
z#pP}vX8;f`qxsnyrKqP`<O42;y^pDDpP^h}jPq5GlU?!|1>5Jq2K+r!p8c$5h<D4j
z^V228TEq3Gy8jaSh31P}`%ntj;6X&e8(|5u6!7aYj9mmLxOt|}sBAO5{@o|3=O&$Z
z$8fy2r1)!VTcbbUKq{P@18DupCJ-IP(53Uck!#=M7M*qru%mYu)Aic^pJwP_Cm#_t
zvVl1&Lp>Bqt9V=jkxdWwd)9~2Yqnv5&~zfLg)hlEyEU6^h5)rX;7VA=mOoXU^OZF}
zL^s#BI@m>@%B|VidYINQtwf#z<rVK60@~{yz!y`C%E0Y1Ll*m*cek<`+fgyF9cTVo
z0?2K6dhV6UZ9R$6$z4p1#I&`a+qU22sG+o4%aL-MS+6KeEd%UM4jV30UM46%tA*SF
zmOlk%aE-qn{)m5?)7knXOs5S-Y6J2Up*+!A_ZwKLwe{tP)BYaQCoQnp8%1yT4R;BL
zShpl%rd%jr%WHMZAGTEXp2SM<#d&su*fP?OoP=(8CPZK{w3ZaSqHtQ7Sjgp90^wnG
z><ROK+Zq>lB58%brMbi4jBQWsazWgYp-{{OJ`EdMm)2a0jG}#L-Dt?020v$!nV{?N
z<)Qk{FqDMQe8fus$ND2k=qHj;TPEj7RC%3N0CCN3@Ts4fA4IcpZSJn&UrVrr^6h-r
z-$djS(hC)`J}pJH_d}=6E43@<WcPD|+!jiT|FkwgduTK1qcKgT;>jbxM{Ushc{Ri*
z<Q$d<Q6;7wm-(vf&Q@?(O4B3?wJay<uX3L#6TxB#EzL~np$#6|K?ye!Tg5uJE;{KP
zaQYGKSf_xJuAt)%KPM?p6>$lbo$m@r=iN3O|5hV$b28Cm^v<uhg)qn8#}l^b^7c^u
z=q-$q|JC-HZT&tJ={QRtm|+gE0OupETL?OSHS22)|4Itne>88D6eJpsTdZKdpTDR$
z_U=f5sIZ2rn?CUx<b*^9An8W|Rw`ngA7O<nyRwW6hv=0;SbV%TgN0I()Ow9%dQJIs
zLG6$5I~ew(l>I9su!!A+oZ~0iTtYjydC^4K7f}znsu_B+z<!gE-FCBWaWzb3UgD=L
zu<}QP`$dz+dY79xr$fyAdAd`xT>YrZwu}SPqBukt6);-Ks!3yAfk7U5+wD1lzR?>?
zGpSKZLp;;3S)E}8!vL2<3}+#%q=4hD4P7pxY6(3Q(CPL`LfgXlasx2~w$lSsP&}gW
zmfm|LIQDqkjk$}tX7@s)Fsz#X0Hvbi!`Fr%ziFGFbVl!6L+w6TfZtAQNVrfz;unLt
zt)c#SFfy%{imV{*$!xF>htYsDYEgp=1CNmnhKOve7&eQ_Wy%UNF0<=3wX_<T^T*iE
zE24UtGKc@y7vLRk8pz=X=D1!oc5i3GCe%QTpOSYOxP1@&6Msr8SRS7PMzYjw@|Y+m
z<$&vYiZ;1dB<k*%O8&h_Y~Op<h(`*){?hYP6}(P>5?eqphohn@uUrRlT(%>0g!_BV
z?y@VIlrhHRP|j{jClr;xl{a8GUQ|+{W%<Eo_KwYT{YTj)w5ebh&4r*F*w8u}=6e)9
z1Yr5vQ<hhL5v<tVdwl=YjnKhi0ay25uwRFJKhTE2O$pmaDEuw`NuhDCzTUmr$TC#N
zi=Uh7P<;&*5%Q~7(Kn_|gR2u60@<*vo*7FORb-Fz2FVprY+&#QrSnG&$BRqK^KSu=
ze5Li(0G=Ng5@fD_OMG>yDL7)!x)FXfNj<k4;r4^7BQ6El8Q4XhE<bKLxL)^Z6FQwO
zEm$ilP^<-OhE4TRAM?idQJHwuZ;x|LZ|%3Bh=;K9Cal%_{HJ0xK5!VwypgSr%TKn_
zU823MlwUMeQaau2adVnhB*L_F2<N<V&E*P{g%;i4^4u`}3e+G5)qfeQG~KRBg%tr*
zdGKJ*By?P*dr>6P2ZR!{Yb6b5?plA>uJb1t8x|OheuH`IQat(so=RX;w?TA5itt6U
zAV3((onhm7ZVSxa7TsYZod9h?%bjE0yn0hQT8TSCR+f$RWzn~1>R=J^rV@enNgNzM
zE*VvLP-VOwciRo7kT?6g-5PN9{b-c{OeKh5%)E>-rIXMaR)X{w`m>oG`NUT4KZG1-
z(KPe=M*>$yL3-|Q@zve(_sRJ~plb2{{b|Mp_4Y5elJ}V-@M{&EVG`walPnXjOUj!|
zikq9u)dX)ACMH@*Mn3905EC$$dX<ZI^F#;#_T%3lR|MkvxL!`j&M^CJ93gQpp-e?$
zZ#1Z6GkM2mbVQpV=6;AQSU%m2$JRNU5aT*po^+qiKO-Rykq~Vy`p^FYn;Lilj}$5{
z+N##%@SZWK>julmk`^l~Is56lm{cm+P9VtDbdgpH%`amEuM)G}iW+TE1gvYKWQBZ2
zk<8Cg2BXIZE#G*6??z8Qxvp1~lzLhaCF^*k!9xb2AZ`2Rv>_4B+y_o?aY$`?Wmz)M
zKRF9A(Y2(`0=Ya=-BZmytKmXN40Cmcz)wYu>7ttA5F|Rc2j-;aOAtouSfJHQQJkQs
zJX^t$3WM|@xJ6C-3&m6o`Xwd|>BVrPYf7iB8f;1<&IZLljb0D7GyQFHQnAPHT;h_8
zL+v;{$3ub!To@Er;hhab#|x%xP-(F3*YBp5_c*s`zyD+?Ssu?K3M)#}n@Ab-`@}}H
z1@ht!5Hy9$PZa0qWyh%|df{69`sOA0)=`YHa|98*O+;ytR<+LQi3?f{@=#%4UwI%2
z6$Nc@qZ1JJ?*58L9|$9-^XU#SGLw&uIf)6DYqzlT5b)npi3x0u=7S|T0C`Yq;N#<F
zZF58Ev<B947d458WQ((jUR2a5LS(zlzIFDR*<u4)cNncpQQ#{YZgdm>pMRs6X<&j@
zaH@jMZ~S$0Ig~s%rE%Cm>DZ9|G0JnR9Lnp(P|b-~9nCHinFYxU|1H8d^_f?|V*cfU
zR%vASt*$!kej!3}NcUpY#uI_NkZ`wX*V#y3nf%V#1n*<-(^rEv)BuC`($xcU+>Fp}
z$ZxEvd9x>FiHWBEHEiWB%?)l^(@Hh9bKv8vG@n{|udg%i=eazT{%XFBBJZt1zYp(S
zj%Nt1+{vjE^^4;yM|~k1qOgcF&Ffa9b@lF3&9yHzKHf2XT%M%)#y%$Q@n27gj7AmM
z7M^}wJhFTg1BS--defq19;s*ntIHsCNT@5=Qo(LG{kqvL`nb}Llq)tj<Rln1rvhRs
zNOAIHqJYK4Pu-##)&;Q3$FS^bQJ~8)+|=}0jTr>Ln%(a6YCtcO`cYnWJnL<Ab^8oj
zY3Yl!l!jv4_GVAzT~IJ-Q5(2n-B~y<YeW)Dy3+>~d9GKu^4bxUk>LDFyvr~FoH@dL
zk6{>r_7m7BT^^`O3Q}QQ;QzTF2Doss-QPj5n68@F)wsG%^1^Qk-jz9jV-+hbz?Wq_
z_=RerkPQ}KNCCB^&~Yh)?Qo;LGk4>6G2yWIntza^@VnPo?+W|2N&t(}=C42w<uohZ
z*(RimyeiqKOS$_BrWTuXOez=0mI;938PlQ$x4Xkfcsap5mIg*|;Z*$#wCH{yK562u
zxg)NOW=E_SRAof#14A@1yMzU=dF|q)Cu#r#;`ZAHw<MOq6V$-~0qi}(<lj3x0zx#Z
zmhOM0Uy<TzKwSI5tU*&eU7@6j?REm{l%dKKwh(FmicRRvNVwD$*p{U@%e7(|;3*Po
zZoI@le*+2+^5P#+Yp6$q#m59N-s~ta0+)15K&DNS#xXSQ1k_J5N(F#w0eOze$gH>v
z7^EdsW&nsh6@z3Urpy2)5ph=Ydk&?y0B(^Nej;~}K-(<B2+*;irH$(n9loxD6J7kZ
z6yMzaO-*l!Xo;mka$x<oz~iCh6%mGDg{RNs&odthq8M)zPWV59)T{y!G54!KOhQtp
zBnd#>n3Z0!^<YVJX}&A0u0x9QojSeuLY(oVH>>rRv1zvkHtZUdcD%md4`FxW5eA^V
zh^|n%JKSCyXwe?=5VD3MzsMT6Mjr8K0LxEl_xyw`;K%9mXrBu^T1fPuZ;;WJOCBP=
znXQ#cqrpZpNZ)=`4SxP3#W5{<c;J^R{2E^;_mtR<^_2EmGdU>Oau$Ovdzf|7WV2{C
ze0py<e!PVmu796<jQMhpXBi|1P&ZYv*TVo^w}_n(LW6<)yGyhz<r`X(YJ;}~%a}A=
z%cHa>t_~_JS-QWk$O3LFVve4@<<~eqTs^CCJb!$PGb{tdY(X8A*nu|<ZZ{=o2$*v)
zK2Jm$Yln+FgB%TsV+CBXlS=`~$NkQ%Fv&0=pn)&r5TQXD;UD4>jIp`u9cOOkmY>H_
zV^;3+P||9!`6HlxE9?QUz%uoYi(m}r?;vBPjeOSSv#%F5U#PDA{+IeGeO}SFPZL`I
zbj4jLKaaO#+(L!fj|Hs~Pp!cG6HvAJ@slO05o8g0h4yB0g*whF8T{A_BD~|20qGW^
z{#e`K>yr6(@tS@%g;RaP@Q-Jq6i|rrB!UfS&WX28r?TjJ$0jhf8!-`ljpG&&djR5;
zfnFp3jsWHQn%dvUQWC#<m=w*ycG`E3i0+64+g6wZi67dlOcuJqFZ|d8hNA~IE(6{%
zU_jm_KIq*86JAp*LBag3uUI%aLDCzhun@lC>CQJG17-1-@-1Q;<$>ULXjQ6(cn<6;
zW9@WC#Oed*f1uIP5$2i<(gzqJ-d}y*X_h7N=^L)1AB18eU}1%}U6+PS1#a}V+2qR(
z(eCyL>%bCCUOlDfO-aapX+C`k+o6In>B0#rz2{%&wpgG=#IUVTHGh5+h>`{R858<o
z1BOuNV#pY`R3vEzk-(t36EE?N)^<{Y>4+T@n&UYJr|wWdw@+5v9T(x~W0=5IlLMXi
z=$(z&kDIm(T+%OVcQvifX*gT;*07yNct>OD`(*(+g=`%<ToK#CnEM5WgKB0B<-(<m
zb6vnO6M77x3njk1-T{I?DbN_AaolRopkehY@HsL{Llz_}ukn?+LdeM3{Z(I~QBem&
zoh@P#56RFRGG2qUEgTjSf9vDpbm5vZzz5)G6!3xI$FZa~$$H#)2YMu?iEj&rW*O3x
zP^J<$=r1t)xQgFJqNMs`6YXOZFY66Nb!Ek>=tWkCy-ST<mH3}rW<3Cwv@~@3rWbwM
zYJa2&Wh=b!SwU*^ILuG{YDh8>yE6O6Jdgp+^QfCi7}?F{cMYL2fN;b#^(1`ctk1j5
zzzv*lS`~T+%qjqSB}Pw^D_oNjKaB&?j3O@!z^AvqD!#by3oytdHr0$Ec?1>~J462z
zouS=|Q-L4N|2-rf7NKi-0Ex&b32h1$M}SEW?%1W6<p7Lb-mkcDnNk*adVcD8AZN${
z6Ofm%KAvLtaW&fKg(5vV(fs|_CskoQVJ~&g0b*1)SfCnOV4?UHR@0$joRuZG{o0k)
z@;Xibv$q=|Ij=|>W3p()GO0ut&b%#+TLm03P7ktnOz`%72=uQzpw2Ac3;OsTfD1(B
z<R^Dl6(T9KL)jPh`GD{}vijb**qVa}bA+-hDR#6G@yfif$;i2dtH|xH*cFMt_S9wd
zW7L-$oTMOM;Fu2c`*V6Pmvu5l&OKks;*TS9B`N7L5e1bRXsS$WODEO?nM}a}+t)P1
zL}kwaL8XYJM@0f8G99tVj{1H7An}%fYpTOe&KQ2)ATRFx_}iw>OkIA6>*qw6q;oq@
z=AzatOo(R6SQ|6ImmMXQKw}Mr!MzQ3x6_XGB#ZMQzttDwQXC-%y*+=I-#uAl>BRWp
z1<$o*3rZ$5v<p=@@2t%9+E{dp3dPxslcfNbDhew}55mJd==!ItIN*x!<vG{N<q~yQ
zjQQ)o?@lP5j9oZ_CHG>c5p8ihLW6eyvV=ny>T#8Ox9xTh9_cnie^l5QjypYCXkE3S
zgeai-Dbib4O2?|JrPW1g@gIRp*FIY~oP*WhF{M``yc?Q;l`buR>HMrWXhE%!$$sy9
z?As`tnKL#%tH<*KU1pxl=<mPs0$)6kAq_9#?#Dszk9fw|s6himx@cT@CfOezo!tJf
zdc8%vpfx)29prf;6JJuUMxr18zU!@VL1Vze0;x==!dZyQ0Nf2(#ChmBV$XxTXR`}H
z<OoU6B|p!Zpm2F@@I_6(9Na;a^Va6rv;Rh4*rqwyHGbp||Gd^02pro!zfo2N-N<ed
z)^IVq-@E&~Y3Vu2z4_9EF;s+32#{PvclpL$zQfFPTu%U?D|i!mT3Pob6V>+1>}v;S
z<WYie)So}WWWnDtehoUQEgbgX^TY0l&Sl{%7#He*OiuJrr5puay`R1`y6_Zm56!eF
zcygZ}o8Esf78XzB9r1E+7-Mxh1b6sIE453)Fq;DgIXd!8Gua8PKAwt`3p|WvF5d7x
z1f1s))r^=nO;JpT!Nql|q7Y0trzqfd0eh0A{2QThIc#ZYe7WdNAuao-cK#+-4Ker~
zJ)WcjHrF!hf70fCZKkpW9(NcyOEM0Z$>^+bnO^u_Q>QwBiXNhC`g|e3>Mv$Z8A1*J
zz9U6!CCYXYyH|RF?2n_!xrAaqcAj7vozb|*x=y6ryyS38wpfvvr3lS_57_+{nh7`!
zG+~{t)4%0tx5x`=o|Jqap28d!vSuDhW<Oy-bF@-vxW!!`dqrHGURoPViTQ8_ts{RH
zY%0QCAMm-L;dQg}-@xbV8mC7B`J-RgmA^3kZ$!}j%VSA<E}<`~3c^X6L)~2Y271{&
zk2G}LDZjeR*v1Wl$TyY!8E~3f_BXM@-SxqCr(KNxXEfHXBNm##ZlTjLX>@IBF-pCP
zk_DO|lj^#dHB8KTN1nc_j@?`Q&uNUzT<Vr0@QCmBEs-Q;nD^82S3(TfVXO7HV?fG;
zox(7Z?iCjhnAC!yv$!Q;Xsl5>M>VvWu&1qQUg=s{iTocsUpzs7Gspg_cKp#<-yNhV
zyUg1SRYTX<0-Bb`^uJ>-9w&35rR7fYuK~iJvGF9N0e$w<O4vZ}F{l=`%(8PR{(j~l
z_TRq^RGyz=>n*Y{c^jPBd9M(Z<jkds@ZY_0c(Y(cGtEaM|8TGslx^sfhU4WBXyr#N
z0i8~r29%hEf~ps2fBtO6OF+<7O4%cHn7#LnxE`Q$c2EN<)dsNo^5OrQ)P7TE`f{CK
zQ4p>ldc>Mt_ZM803}3N8D^c0so3Y)49n;dY#9rk4Lou-(J<uzz6hj+t2zzO0%oFnr
z=8h3X)gRdNa2JzaDJ4NO1XPMHWvT@S4>pDcQ1c#1qHyUBzymL;KZBr78t}Ew56M32
zbp*rmW(s$Uew_kzmcu=lhovc=1ffl?aczYU+}Ns;us-m79WR@fpK4Dp01Zi~`}Q^~
zH>fYo#%rFZNQ??QSL=$p@kP6vX(AeN(VDn!qN~ave8zg^9eUO$eIwv`lYwJYiAot>
z=luR~B?Zr1_G)PEDbBBMm6}>P>HM#^+CRfORw7f$I5R+m8{Mhp5R%6H8>y}aBKZiH
zj0}6e9#lOsvO4AGv>T|tg65)U$pvxpIO9W@hRf77mBb_dhe1J7L#vEwNtexl>%Zo`
zUTO{>Vya_IN>i!J=*g;ti4&X%V0yI@EX+EPYXh8LDy`SlW4!rj9<CuXjAA{@ISyLb
zgHms<B^UEegSgXcQ^GKLSr-N^^py^#MM1<)8N3d6j^3*>OA4Te<_T1ml9bQ7kqC{b
zh8A(OSls^aE*74jxTy=iE+l?03iQ2eneQy!TVK~BI~7uUCHFL1(yt$4E}QS}bLUXW
zAfXYCpD9qdXl_uiTstC$92(>(YjLPOAO#(9_TM2vr!}^{z?T9>H2!Br7R7C+;O@U_
zPCu!mrL%>UnaK1>hTK?fudyVN=bjSrNZ8INI=Sd_V@lN>&A7|J-bcc$xds$!u1oR+
z8_~1_WO{_gThCJi#(KEjRM&TZ%q2pv3xXdSfv}+JS1ZpN2+GUI=6P7v!5p^XJb89r
z@VHNCTU`bzh3ueVZYTN;6QEKN5fpS^L`}xAltZA56sJoOw4^iMZ!#BFkm_NQJwgVA
z08cIUij~Mw;B%8y!N0};Q~O``M;forj&8V4-XT1XV{D$|UEn<pfMfrC<tKj+468hM
zx>=xntthEFWt?VnMu#w?wcsj1Z7Uo$IqfVD<i+#&@42=n7XA0NEN73X>T}IDZo(qv
z!|0pyrgygAwEkJ(+!48cFSi<YVBkenf+Bxe#-6x4F&IqA_ZbMdMynEGiPWPw?pQ#o
zoW?b1k(C$NiB?e<qdSmXw*96jaG?AaXrv;2phRIRwmCsTirP@}HvwVwC-{HW`Oon^
zKFQdY|13UM^K5s(A6)EaB}y$b2_S?%4!%lw$r@G<u#$g*3LtEwI=PUAM|14fD~@Y%
zOH!%}j&YeW40GJkEZsCt(X*#Zb3)`#flOBC*D(rQOPGg4zus0Fzb*fh{WjF+j6Lbq
z=`-q{CyL+xBUoj=xg>j>-to@<d6ZLHE8RhUI9ObrboIpXkkzvHr80v<G|Tm`a)3$)
z94$+>pnx^K1?K5jE+?(~QIq4Tuh>5XiPBoUec0kC6Zkvwd|L6(2$HR!YiC$i`L74Q
zSUCA70?|SNQH-nf`tolSSN+VDd(Mvi34d#Gs-XV9mCy7<=tHzaG);SoJ+5IvKnLI;
z{{*n5v2<B+sytwJ=z+(Yr@KCttu?asZhzJGV&afQ+s^eqoWyVJy6`QS-ktn80hg^~
z0?2TrgkFz&<+4=z(^i5aB<Ol*B9%rCXB~uw8d%(gc~V%;UUn%MN59zkFN_8adF%ym
zc_&Z_VOpaNcTe6eEcOiVU_d!qbY_zV@l9j@pnL?&dy1dXRnD<r6Thy<rACs-F&9)n
zz_2~h_{P!*!I6&d6vjq>Bdqq?O~w^I-}sD{u8W|%c2GL^aKAgAbZ>)^$Lr3{F@o<O
zjr}Tl7qOVOFU*eDy|>nV47p-1y|#b;n%~aW?pz=3M&sAz4+_AmS|D5l!5S?mLcykq
zr^0?~8r+^>P>gN5cGVlk<s_qzeVdx=btUh*9ogr~yp9NZLh5@(yWtn&^Nq0fed&3?
zpcr+sL&2rC&n6mAi`db&CjqpGs;53KqC%>fq-PbV3aEyJPl!^O%gKOncEH~qugBm2
zD1!GR#jMa`7Fm1<HteJZUzMx#Lf5A)zcWqAj;mq68l|MdhdEL|k5lmRQ#$^{n`wnV
z5G~rKC6UHwDD@5=RCf%W#_jGb-`2FDw;!U~3A)a+_|I=KQ<mpU<REX^t8|Iv1hPCV
z_(7@91szsbt|8v6m1>umQx&D}!uRuyWv|CN`0r9KcHaFX_sAyac<y6sb#MY~z&cCd
zUH&&n(EmWsX;86g()w{v$<~C6ju@$oRg3)4Xy1<}sU7iEn!h2lm;c^ke@1RV2w?oF
zW7+qd@%fk+EA6d}JGbrMEq+R#{%Tx78mC)_+y_N!cka{YS^3|-MV`+^>}-IW=}zx~
zH&J2~J9EEh$A3>=J2K0z&YnjxJ%Gjq_{^APGFpid*TO!NhG+yg*+Yyt$IQU5_77+e
zKCOY=W%xV~;{kv6MUE~9DOkYumoD=hnzZ>NFHvXS0D~4#<-6xjZI|E)uR+ejycl^v
zV|s&ro2$P=cIOItaU`P5v@|-AMT@p8`Jt$h>(Qq=vF-|_h$qsG6Rquo2ietNRjELB
zgo!ngO_^r(E{Q9~lcO%-LK@2r`VnN=1uDoFb-q!LkRuIpx89jM?02AUdHEzxK$E5*
z(NWK`A13hB<&eMIe35<J*l7&4hG6+&`nB8OuQT^T_RMxMw>Ec9;!y*ZlnJ2V4}K_Z
zman}k4HqV_JeG#kQdrrbcEk*|#CzGk^F87SLz9!)cl8sqS_OWd?VjB-f@S?Kjf|OU
zG?iu%^G*S1Ea8w`;G_8~^Du6ncJBVd9g*f_^|fm2KPh3)$>nfBrr%iZ#Ki0rh54VW
zxK>!<U4p<dPv28XQf{JycIquSRc%x5xurTzv#$Ae!2OpjK}zK3oded!h<xWNABYQQ
zpk%VvjAM4>M}SQkd(8pMD+7<qbWSYSg!lkO*(w`7WhJONPjzQv?JN%dIt0T+vQ>t^
z=E`}X3lud5AH}~ju9O8@E)vUWv14JanK>6b4F2j0W}7WLX$CO@4vDGm(gQB5slCXb
z3_e;EHU6wqq&4tTc{}fa(?3J2G-MTrY^18-Ek*GOGpSrSi><Z@j{#WBH05#`6xODI
z2KMUD$OVa8*s;&eN{_tuU=~59t?|XjoIw*@*;&MdIRu(Tk2`;)4*o5G&OTXZ;vgkn
z=XEhCI7bF-lJd__e7RIPaffY$<hj-;If|ywni9F)K4Z!sk$KG7%EEy4JD@cZ_PY2G
z7om9gm<l*`1LXXPD4jw3@lQUFZfBmwRuWbkV6k2WP<M<I40+x=ILD_KmqzQuIxW4p
zA1Kn%xVUh9HfHFI=6+c4-9V!KQU~8-%BmEg=wm+{siIL9sE!ssQbOIyd0Pcgx9%1x
z!(^LMp>svGg|OUyfz1pRfa&eWd#l1<`qlsQ4l)Mtop1RM|5o34E_-FX^(>b7$|Tif
z`q5<xw6)rcxJEb=8(PUflyiynQvwh(UESzeJOv1H8p@O!5<-cx1~fN6^HX3Q3Rc@5
zRC=5l6><pc4mv}gIO-V{3-K#2k*OP2g<<q}q?-|=eMG@x(jlwlv}}&hi1iP)dkoV(
zP{sqRsg)<3Q|EpG43p=t`!fR$BkvUJoME>YMmOS~Ic8nj1HA)Sw1S{Pk8z?@yM~q5
ztvQ3Ksu6Mvcre0o*zr+>i4a2Z6!`W)b5VdwBfv*#%xc^v3$Xyz1U7MKykhc}e&eHR
zPO*x)o?P&+@v`6p!}DL>*f~YiS8jL0ZYmPmh_j4^|HA=gE}wBBF>ep5vUpSG6*WJ{
znO!os-&jRGx4G{_S@8A}_2CPrxhvIU__(EuwZ`aY_wQ^}%duw5Sg2fV^p)l*gk@*Q
zcSv+5%Ho(7eU3OQ4&DZ7AP+t<g;H+LKVSCTTOr@U1FFt8=kfw5F0URnhXKX&6wuXN
z8o<zCvCbJ_XpLrVU%jor5PuiP4b-10R2JcJy9QWiy2Qc)B015#!vYPA8r)8a3P#)y
zQ&L+2pQu;J_NWBRsgEpT&G)5JxP1iGb8oW0>@R*b-ZyO#xZ2Q8<s7uJfpfYsfB*6_
zGR5Sj>QbT{8^Pv_ss%%Z^BHtJYy!V_)9K2zk6eJ@@POoGuMaJHdd%Q8H)US*lkQs`
zpXDe!M$F)jvzV^VhJ`3z`yvGP2kq;nl&5yY8$0AIiSxbSMI-cIQ~v&}_1vpiX0Y>$
zgH|;yiFPR>JwUUV8xY_+R|;sE;ZYSunfer$Z{|o}1A<n%@XsU1tANnTmuLD^3<ES(
zS0YSeJsKZ9@wHd<p&Pr7ak(8Cn~Y?xNw{rMBYA_I$G{fshi*k5rhWP5hCA9n$=RQG
z;l9sLQNUMO4|YXA`Kc;KYb@@ZK@|+xS`v}JD{IdV^B+N4$4Gp8#Erfejc|0P(l9(U
zHp{GuC`?q)rpXCiJ(?m+2nFxFOLh`@!LS+OASnP5x~h77Y7M-gL<S_Z$J8J?p9LnN
zkmm=s0fDo=-MSrSX?ux2-4gj_Sum~D+c0|zVvp$h!OP<>QLup5*DRV=$HMqLX(Cu^
z*3lAwr5q%TEj!NiiYu>&6Qu_05E)Zuyp*fU<!F<Yo`fsx4RFZQV%dxieX#yn#sx5M
z@5{L!)<EmNosjz-@LG#L)Jf{eyQ+w^=kg9ekAML;26RMBPQQ4;;eB}av#|HJ$2;5r
z5~c!$2?@qMY??HGqpO8)rRKO#XiV5|a3c)8SSIMm@B_>{2GgX`TqlpJMRi#q%<@$p
zpfwEaP;nYD?fvSM6gL519R{T}i>~k9#RlE@i{YC8Zr~j^NN;TkiAhL*(D?t=0<3<a
zM@86J7{fC-ft*BzzB8Ev5x%`#J?9bVtBCCD)NjPnKMl;7V+WW5+$9*SVUU6?1SWU~
z(%WxHF}crv==YbQ3RnxjW|E!g*sWs3B^CueL}-jaGt-e=L}Ir#!B_n)ZoCVbS_1Ac
z#iOMv=vdmYi>pZjfCPohnO2{s@ol&+vN}9h4JLcksPXf1?DBiye~Z*{rs%Yc=6sH{
zEnz>^L$)EXVVL?4JsCVy0*e_wy{B^Mc9WfWY4kP3!td2Fe|$y9$Da?Vf-M1@a~QpV
z0l+j(_j(Wu$o5)5TV|=bx%$$<{VFV~aFJO(PmCTYpwAkA29HhwbjciDSVUu10j^2d
zf^~~Q+?I*4!&!Q5O-}>p>_Pe>TQ8T>7&TBCBY1653{q%L9q0&I>AXzW9+W54e|)1g
z9HwGGGa*A!a|)>ZRdk@$=PJw)Nj&q&ApQ9qDI2!=48HKnAHFb|_uybf$14`1heoMs
zuL#Fx6iPa87d=g%hoN=UfPt#farLoiSThBdBQY^J7+_NCBdSb&dMFxt3sLoh+TLxs
z>giz4lieK-jey~a%h+s$J?&yNZauu!`nppsn|&RF;|8FTw*M?ksz5t;kd5Jj21G01
z_&)Op_<r!3I`6UA3T}dRfcSFLmg@nstT<y<_J_DohRDd-_d<B^o8zUk!{g#}@PMz>
z_Io8={;;1X#8)kVBLg}Xa!T~5<+sjrHqWEDDIX-tX|p9)jie~E=#`7eW?niz9Lajy
zXA*o4_UqmEMc@B&l|cI2D`&YX)w^J_Z3ue;u9*>?AqR>769p6P)O|qUxab^UP3NlK
z2}JZ)C$b!5y=UY+_!ikO0_Z$?TfwNI`Zsz%qTrSuTPBMUBmIIj#hxMQ3&78mxaCX1
zfMW>%FWlU?_A{3OyLvzLC(N6Wky*eSxa{!)c3X2uIKLuiW*F?@U-qTNLX}!dFF`GY
ztd5PiB8N<bE%54Lbf>0(ky&Py)OU++v);fgAfN-2fcJgCUYC+^Nd+EDpuqkYu$-4z
zF4za#38WWH=zwI_ojM@VG@~lw!PQ*Lch!kvKdmXA)+I|W!xp*$_B5}2&;lXL`3L7c
z9<=;>nkLjog9$BHO&@+Ha|a@n_CV1g$`!#Smkpgmq>3?WYZb<#ojS1r_nB9~_W#H=
zP$hgLpvoe7&f?@=@GJTQ2S#CHr#vxij?ZZwBOLk+4zt9#^#eM%>MNe~$N*2|>OM+*
z!gVio{XuWg?D@97oOl&o1<X3!La)&1$_e_PjdynKR#>9b<$5?_sX`r#UbOgDBV=#9
z+2dNQgalH^$PImN<&&+7Gwa@Ed`zay8ZeO#;Lh26V1;tXnzBx3#jXlkz8jSK70|)f
zC!X7i=RYS8`z+>PQ4A{6Q+(Ivx!(Upq*{z|8ZhcwHAe7t@HX87v?UA!duxQ3T;Flq
z0llx;;P}~7?~w-=RJp(Fg`DVqHb2v&V7WuiFra7s)@KOd>PT1TSBx@<JQEc81}2lf
z;}j0HnEmQ94>}i6#>;ERPy^SV5>WEmcDWu0plP(N0n?a2Y~vw}<xL|jO^6#kH#k^9
z@hDMl8onT*tf`^ReI&&PahJq|u{h#7hDF4pea9&;Xh0Mv{IZSv`zI#fbbc%ozXl?!
z8g4kUTmh^&&=!d72oXg?`81L92w8Vn#<S?q^9YtVt2fk$S$9C<(sw=k`5*AF-CU1P
zcZ=Tm?5iut0?|)0W#6~wOZ}yN_%oe?MqU>cljz0Xv_UPqO+ym~kpp%Dt~aWHNLAn6
zH3G6b_ow3psi#?NnsS91c~^6|jV;siq#S5-6HWERQ<WnE^>!dxaI5nmp~~@DG20u|
zoNt|LShHX*ESgC~mx1slG?WLpjbTGSY2i{?lu#(;Q@<gA*!)MT-=t$))>wcXIh4*~
zBvJnYsjbl2ZJjp`jk%Vu3c9`<9FhH&q0lEyG^V+7hq{R4_i_f+!r&UeprQ+~qggfI
z3ID1H+>QUv*Tf0%3JQp1$R&IC$<N_@#GM|g4t$=DqdG*%93zlq0s%h%_#Xn=E2}T|
z!S@}Ps$ktTLVDtki3y2?+Q2vHa&m+vz5QbXY9N6L9k%|Zq1x9F0ktj23aua4Lc2+6
zZ1|pgAYcFC`_okw=q1(pC|c2I3uUbE!@#uapZwHM%lWQ;iW61-=J*ni=EsT`qg}~F
z*^x*1wfD7qccC|#PWcz3-zOF-8Y}34zIrjwug-y?kKqe+E8UVAq01pjL-X8?&ON{f
zML?hXb?gKABwQySh7+p_pZW+`zT3SZZ2*^j4Kulo!O3fWU~=C@?7Z(EEQ$)2yRZ)q
zkRxWa?o+zHZf_Fm!bCSwvvK7oX!g=9Gydu?mjsTh`tp6La<B#_w9YB02D9Jn`W3G_
z&U^<9+NusN1RAOU2v0fznm4jnbZ*pg0A`M7(2C#RU6l;Te5B35wU6N1D!k6x+{KK=
zy<-ridqf1Xm&pKZV)7ibGgnNixiOKy;wd;uKz2$P-^yIR+E14$YT3c<Og#+d_*XD;
zp;KsfdRkGq)(3*=7C*$t!iu~z2fYw{xd?BstL-VKdJKs8y$iqIU;Sm-Yt~^o!kk?g
zadZqb*qTap1(f^ghRN)dwQe!&|Dkk<oVo^X)3!njr|{{HKDA4$g?=e@t7#Ulq5|;y
zhP>JxDg+z5f2danjnR7J_!c#_&p5#z$5Gy<p3w;4qRLA&={C(2g|t2(`B8N3pW-mU
z*Rm}5;7=T9&|QemP8I`6VdeKKpA8?zDh*`rMmR5ns`}o^kED!!GYbRX{jV*6cvlKb
z1QRz*%Ox9hs(#{0vBSy{Iy5E53qPHivTNPr><Sad6#D4WV^1IhU!*|M`#xjkR^Og*
zp@hD;Zw30gPE>Rq(V7U{E)vBq{^GmTxLSOXypan?L#mF4j}sKeMnj<L^tP$2h&U}S
zHqB^!mWZP9lgCbx3V>tcgyEAO!to`hZbjd)>N4f4ujZhqLhN0x4kK}YR07UKCx=Ge
zxR=W#cxNiko5y~0dp=Zwb-%z7>T+Q?^!0%srT+V9*<QJ>vup-+9VPRy@@j3a(rY`F
zcvwJq8%C+VX;g7&>L0~M>1$SPU1~kfXLhc)so_xRtkFPLdQFF%^yoW0YMOwNT&1bG
zutS<DOmWm!HF_WY$F+S=amDqWD6Il5AlMrG)1-a=9@wJt@9lEq*Qq8g``vB3VITt4
z;7ska>c)549^2IPGe(m}FhZfvG;{CjufT-ASB>S<o){I?`gL<9cxQMGP%L0&E^^`1
z4XPHZh3(r`n0Lu3;^qF1?<fC{rtfg1`uqQX-C^&&Dtl#TNA8V`2%(S>k?c_t4fkGB
z31uW?OVKd1NA4w~WHpRJ_eNIP>vGrY_wxRHe}91Mb<TOt$9bH`Q!EV3yS`Vx5QX|K
zRDYAMUF4YLG<3S~a{Wj4!txev;My$qkN3)$V@Z2-P?$}{m<fW{d4HDdUC2gIxqi1g
zsDjTln#%VWkx|}<P2fFwLj&;D`OWq@Lsj`}yuTf%l~@>CkF`o=LnY1A=lGQBt;Xtv
z&;}w%-eaHQD)n4id%rBcwD*<^`W(>kxc8xTU;oe$s#nNn(9r&{_94Ov0W|CL1RuLf
z3hMKPbRlD#ExF&yz9|k6i7hdOOgJGDqySrY2W~e3LyvaC$AIp_>sn88_CM!K;;5ag
z0VA+Ob>b5?k`FI%oe_XC@?eIHN({6=wvPRxibon|iAU~gY@fOE@W>SRgd&UP!Dj$w
zB(Jj*sCGKf5A7)d#=f|EeCXSpt8W<^d&(*?S(i_D8Txk*fRf9M1(E)zkJ8m)i5GzI
zhn?=T<kUB7y5=(;;j%hRw=n!9q!d!XS_$HfolY;{4`%Pqz!;|aM#qy<*}5)P2Vler
z8x9*QxK5AGKU<8eBu=O-Wo&y(=0`>@_!yWA5g8A%M?s4j{cV~92?(J1M06Q^%199k
z97?LNI;IcWQ-$6w;^d^to@@!=3>T(aT&cVtA14=3W7Soz{_0^Ud8hm`@HsSM2p7L?
z*?%+Za{I@m?(G<Mr~%Tn))F(?f1qC)E~=%?r72h38M4$keXw?blkkp=U;7cy%s~*^
z!N$0y&eyZ{COQNSV%aA_jR6{JE}uWhVCJd$DbyMGWjPbdw`-9`K-XT|_}g-OVE$e5
ziRX7)c(7V&MCJ&w$7q%xaI!?<vVnL1w-;7h-xXl0wvI;JR*!Vo4X&s50!?-Z<9Z1o
z3Cf!5#LI~14++j|VC-M;YKf)h$%L~5ue3nrckx0O(gmSGW~XySVK|2*d;qmbQX*K#
z6R5vgA8vL)FV{P_d8?19`_;n;-5LQzZ!fIKPQT?nV8N1hpp6xYnYo$!EkQovnI6Fh
zM?B6|6R3|HlPy<)mb<5+2%|rIrGE=tI}ci-SbY*^66EFVBX14aL)#^16Ioc3NoIh1
z5g>M4Ci<!tB&4I(z4Tt|*0%BG1*Tzol}irN>rccM=4>`_C^Gy43TP8e^go>|cp*K1
z)5-C&;w&4%pe(`LG;xr9FwrXfsOS$l-6d^v+H3!4M2vn@-?@|w;e+ghL#d8f-Ub;L
z77sse8y=J2LA~?E&WA+*#m0+i*Ma6Yd=wN81T@(e@|}F%g1(L5Jv!D!lz7%d4nGgy
z<E5jrfn^7J_$A=`0MD&g+ysvL9G^N7so$p^UzlGT8vb-(yH_&%%3&6{xY0n|?<;2R
zHxLONsy?YudyYeCOXOfo*ca<kSML4v-55=xpp3@~C`H<K?{rEbNvQ=|zF=Uwobl;q
zEl`?8#HYk5%vH2+9^B~_ZP&$E>H@5xrTY+&#X3lZ?H$LJ_QG!KO37!Ism?)?S>?-_
zg_{BzU-RXS_cwG1X-|iU%MMRfj=c3a=q`s-LD;NeIiqi5R?t4W$+(QMz^42)zhF}U
z<p*W^EuE-syzK#><qp*g4`MC9?PKfHVH01Eus*?g+Tq-Lx#!i-J#U`)J+gu;<W1A;
z50Q|vvHPKX!cVbHTC*hO>z8=ar!X8L_|_GDz*Jz>yIsQDj?R+;RW*C|^018_lmI)*
zz%14iOrc=kQ54G<eJPF^n+fxQL(s1n`jvlw3|?(xWFM;E>(fYTdzK?Q1ZrpjwK?rS
z@DD;*8L4tiwNQ%Xc749o{NZBT2T%Rn!z?dSw62iha^`O9GAC+PKPmYi5-?5I=hCdA
zRjT7uA6k!W>JTb!0QHawl7_jqli!0sE;8aN*xi2<M&)c59YNV4gQ1KR;iZQ{ftMP=
z_ZD<X_5Qc<Iiiz5v;3IJwZm<VFm<}04fe<+r)V(Z&=a6oi^F>yQEq<2dU#(MioFWP
z(l^Yc6mmG@ei5ZsBH^8tlc<1^VoCyGa|#szZ9D-hBQbGf%ytxfUxppAzoeu6$o!7U
z4W0f_CR~n#1t;BWq>e8^f<mkSW1mv6j~Ffi7kry~M7*Oeucs^H8mcvJ!uL?yTwFc`
z**+L`GSSf*>JU{2_mxrd3o~kleu}@KNhlN42Pu!_XwzSmzDA3u!tI{E2_C`~A0R^5
zJ2c`1)pA4oJIB0eY2uN$_T2aRRxiCvmWpf_SbhUK-IzJ}nK?xxMmFat2)%P7O7!(~
zx@xuiEo1B}F4_W(yWEW_@G8F(E`pM`4N{V>h2m1mAw&P#1pS?m|HT(fHWz#fU=OoT
z^Lsh{oy)mv@&Ze96~*luASn9A&?nGpPvg9JS8gyQz=us^(FRYb_&BL!`LnB2dP7)M
zX>+$4r>pbfJ?_`~lXPaY7)`TSmJVcX?Vifdq5I%vWCVYyn0WYZ9>-p7C9bw_Mu=I8
z*7;#z;Z+YhOcZy3Lp+fiPTH<C@DJa=8NnQqBk1V;GI7jR_L0!n9I1Odi56d7$@t(3
zt<F=j%g_Vjz6+G)^LdlbvXzz~K;w!F;O#Ro<BZl0nvmp#a>I$ZBld9A5v>v)BQX8s
z@6`98g`DQ~$Q2K=XwV{dIUoGB8M*14UuUfHH9?WBG-YQSysC_T#lV}h|Ax2+8WO16
zYLSq`puE~@a-`GjV?7-1n6KBpE-&FiE6wF^8Grifgn_Kb&~U*YO8o+eTgRP_<ub2p
z+Zi){x=O4UYkTkU9CVM2gg4kjf|x~`h|z6?Mb@4Z__#$LLf2}qGK{t&F?M$Q%1}AU
z1+m?80ah3A*B3%UpYR{GFAR4Vga(F@5{iQ!UwwEFka0`~*Uf8CTm)tR3mGpD!bEc9
zE%je9=|Y9Nn!CF+?)NX|3V`9O%m)kr)NyHp{{7*%G<pk`9OF-Szsz((B%J1v?*tjh
zwf<*^K_f@{+BXohvnJA6JBPB5WN>UGGJ6l-OGrK6$q})05odM+c1X>fRXWoVYFGSE
z7Z$#Yq&T;~wBrn@h*MU;%tJKD<*UryT59M;9$o{4>3`xRu8?Yjll}dj`Qfwm%d`dU
zx|kfQelKc3020Um4F@xf|I@y)Yy<Drfssr#rvIFx+&RMQg^8c;Ctv)hzsU9d)Bq3R
z2i$8!D&F9_IAI>RVqP=N715u({65BJc>meLg--s$v(~SmK|V_=p*NUQLMzzAX)S@k
z`hlB(9cVn}vF-5t#XBgsXY`^d#)r-ywwmvTusXx+H-?63(2v;POuusa?*P_g9ea;L
z6an`e_kslgNX}u@z#5_}{o;5=O{VLi1x^D{-wf!Fgr9&dCy``gRel|N!dK{;bvZ%H
zLa8h#?dmYLTDzDW-ubOLWgg-D8k@Ke#V0SX9m~|&+HpzoHRi6`y6a!|!*5yS^`LTm
zdPSjvB>$a&kx2NbmYB~;^&gj)p=Sn?DvT!q#!S&CKTy1W_w>DtX)j;DXp4OO6_Bbo
z;Ue(^WYdJ$G}$w86$15IOx7_OP_`_L{Kg!kGSpt<L+Iq}7s+0}&V1-R^_MN`+wkVv
zK~ud~${#<nbA3oiNKMt->pCM(6E*}gMfP4zpWhx#VZ03AH~jp~crKqjk6JX?@G_vT
ziF8!a-}^DZvs?sO`$iWIUU!~5=Dzkg-zZ>yUM7LJUrF1CK+7yhZrZMl(N_iRl}kCD
z&h!o8Vp?7L8Gp_1pDg>!e?Gw!Mj{<D(1XF%4!%O*0+8ZU79d+v===MGPn3=r>C~+o
z^%_H;cOS-8GL%1v*)J&@)i%wXxT!J}m@f280OXr#>^yvt9({2D!lkly@WbqkCu`CH
zZHsHr6aNz?dhE5CTqmgaub13jM_O%d=NHwHzui9Yg2H*7+TeKTdv<$Gk^6d2<eIfC
zeem*@=>OFVvLoONGJXay5Z^GnEVohTuer&gdwIgmXN;kc0`-AQEitoe<>c*ryx&c?
z7l9d%uYf#Lw1qs<enqqaqg;4qP4?cdx+KnZ{a1#l@wH1GqMCP39^#0wf|J6I9b9KR
z4)L$L;-HV&b#9k8$6N`_aIpCCQ7r9@arx;Aa;l;@ZZ8XMX*H0<s`&lDQfaewampOL
zLK`h8izhDwYb&t=E2Do7t(L>?ETEuH`m4;r#;Dyyz4tGtWzGd=UCWBFR+djV^n;fA
z5N!MkqLk}>H=;M`e@>%FKkxOJn7R-+#82@(xCP(yL5JxhTahICc45cd0tSUU%vS$n
z?!~58zNP1c$33&395?=p5weWx+YI}kB{8OCja^187a?Y8n8dKG+_2A@hqiXleIu(C
z3H5IYbsu`LwLd_cv&%yeyUhU%?;X=3G;mC2+$_eyB2;m~h&!bsNieNr+i9M>-5isU
zasGPO^bJY{_Bsu2KqNH54_Ka#kzHA;5cY;%Oh3X5<{<XPbPo0*I0Hz@PO5&U9nroM
zUPYGtOMf8eZBV*0hRR=0D0~;+QS|Ex`I|fBycg2v1CLcPywn)f-I@Gq2C?E7);R?u
zjHt<Ks0d}*_7YW0SsV$@hq3wR`$6$)%LzIQzqOv*w}ys|ZM3_@6f<+u(bzh{F5d^}
z&-~pDK+Lbv{>dXcz8Zo`{`3LyV-VoBPG+Y3_yx|~yuV&=l@v-(-e%CXMa&x+d|zEa
zIs0Q!bx1qdSE2A9hA6)a8Rhv`E!gBWt}(WHu$YoIOFC!;WAH+(Rgp2q=KBtyR>c3c
z{x!k#qscHQS>}OXNs+r(G4{m4ETyc?%<UoE#o>pl=V=aVKxgNp#~-kV)XliH=X?Hp
zXf2t}6+$)65KI~F-MA^fLQgG+DY%20@`B~Y(&o-J(Ee^-rC1S@npEw#RCh$cVzcB|
z@*70Q^tR~j@bEj26@b*s0=M5~8VVP?UxGd6M;!M@o3fVlifKZD)R1Zrdl|BLNb&M!
z){9K7E0N~>AvxFX;@qj{kUO8t$~e@Ie1!u7&=E0K`%%VuW4FL>J%JO2k1jvyNJ6F%
zF8?diVw5b*44~{JKlSa)8ZG#1Q~C^|OR<Zh3#f#$8NBNbQSBV~pInWwAJFK$>YfkZ
zF}?QtAJ8=oteW5IiI+0I$~=$+MfPDezwYGaZvHG@>zpRxwB_$`&VMS3Zn)RCrT(kF
z@VZ(#YE3@=(=W)xqN2<GYem~$FA{#dL@DlGY~O;sj&iYm!CWtjVHB~gp}>gj30<UD
zkF@{A2H)|F1XA7se;#y3t+jR;x}fn~>yLOTNj1QO=^Er@I(q14;XHJd3(#KBW@+h#
z$#tIm-HF=to9~3ZkMXow{>Og<6A1WHGHUke=7(Q+T^8~4;6my)WClfB2M7%`TyO?;
z=COhuq>7XrOboCFt05)h`p_T0%xd$NZ?4}*5&NYQ&Oj19`xifE7Gh_gpXB_g<SRCO
zOPDmi@3M=zwNOs$b}Y=eBtv3z!)?qYErsFkVZ`MQD*hr-TJ})YkFIhQ2X=zm)DLEs
z|H&+xpe_}F$H9J&ouUoZOPO3V_*vxnqmFcJ$w@lO|3*_oJn{WbICrWYY<Zf$dG|Lz
zZoTK4-RTF02pM}0LgEjewDOy`)Q9$=g98o3gr)4Y`&W8DT0$b7VA8}|EwkX4C7iAr
zaOR-h8E2u=A7cY7R>HY{EMI6|S@u|@3z%w_L*NUMYL6O{+;1^h_)qMY-(uqJEl|B|
zx;<y!ZBiXJ;l7V*-&spXdY=wW6plACr8Xct6bYlgFm<J{tcZ`cp*=WNn|Is!1$C+4
zEE!iBA59=*QZ}m7VROY5xB*{-VHU&(h~R;UY(miP0p5VMoWpxu_}x6j_Iu;Uc-`x}
z&Oza8_-e+J%=~xSkzIJ`XD~yzHj1|B*r+uk6BzuWczUvpSho{Csu>W-xvr?u_4D3?
z9~sd37ip^!F6l>xb9M_{ylf7IiaETU<bL&5HI(3HZ)SW;FzFQW{*xdyEt4oYEzEib
z`tJs<n?)RZvd-RruODxO7pmG)e@tOb4L?1}hvESZI!emF?R30Q_|0^o3tcB>i)Nu7
zwQ+Lo*<X|b!|3O}eYhWxb#%|)0D8rb8`0S3=;^`rt*~gi0sW$pRM=+p6X3EW<dT_1
zuDKywOj7SD*lvK-yeVn>7PKmU5E=)WgXCwpx6bXb(BoV2bs3yv9h376fp1jM;Ju<V
z{%O%Wr$YG){i3s(t{cRS4v=wf(&Lc3HuyurY{#^{(Dukjcx;XG-HDrV!Kcwm%-2<M
z8u<p$VDW0E;(;0<FdbS2v;i7MeCxe+I_2+;Nb$l1FP9~ibC##kuW$vE;>~9Nql2>2
z+;4$T<bc7p=ltRCTZ5l+7ikRACC2dsVKk}%_62?jzu7c1xWm{_z6IV=xF1_GZV0Zt
zTTnDAJR8or%X(s-v-w4Sd-29%cZp86Hna5;)f12p%+d<6uEL~za|L*!<f5$#?1?mA
z;yI9U18o*uBBVy>YD8NdTp|-iY2(7=l%dA-S!~P^I~}K9sl=3_Z&qtX<$v-aq0w2I
z3e^A){a`*zFUqpXlAeA;1aI=?`}md9biD2jb$O;dcjgfJ_1TYDs(p$`NB9y8A>fAq
zp{Rg%ij^*Dx+r40n7}*3DjoDh<WBeC${iU0(9N(0K(ag)I%Vu&WqU)@Uj?^=w`0z3
z(v=Nkr=%+fZQt^JMasT_fX#oWQ7PVE@wajVQiR50Q;GBsBSXhNc7(M`zBp{s#~N7K
zVBhn@KE3VBbkPB=M%Mhx{eEo6xa1O@X9zptZ#nxjE{;o-|85C6_4Y8RQ}-SO{Ul@8
zP}uWp*hif=jyJyi0jfO(3zZ?RjgYqlrlv9uyP{EKqtqqT`8!_9vV;aLflE5`ryPm*
zXx}(I0s^#Nd{Ra&NG_0R*tu$o+r`}AC?QCL-tGn@WS;3*MzlXuFVBAIk#1Kv^R<*6
zaQIiAy53{i&t1=4TY~C5N6DV6v)J%!!_Oki+RB4#)gE%-)>r`k1gnSd)Fwx5zsI~$
z{Tw!#kt3GQmyYB+L!8S!32$uUB1p-IlKFg9XiKu*LpnDSS#1WrhOT8raztET`g!w8
zL3lCM$ejK=RPGKQa;wB{b_VTH=Gn_B={l_RA6bZP4TIS=Ln@Ci)@)nyE6A>1KG$)d
zff{Gc*8}#j4`F~NSk&vnfX{2f7ZTVvFu2)|8rKlOvtal~tGk<eCvdUv1gw>xdL*4G
zJN>Nkoo!1cW>xZS5w&Qr_IP7o8T4eSG||*IMJph!7<M;+m0vS}z>C<GWoC`n3Q*l_
zS^-|9q?-JHE&#8YYNI9MXR~5Q+*uCXYI%L?lLrj$755~9$1+Jo!Q1fjg&~`C@LZ>4
z4IFB}E5v~11u~lXHCC|>d+ag`{HFH<M(CevPjZ`b)2FhjD}Igr$DS!<*ql_3t^R>E
z?${;l@Y#(|;&t}dJWBAZ8&Oe3?`IyEDCY_g1q&|;_2%B4;1^|AZUoK(XgFPzq+pLh
zBCP}Pa!M*+qZ+CXah#QW{NRe$;d5`@pa)2$T;e*tLbqJj`RYfJqAoAK;OJ&LTD^~0
zJbHzs#P6a3hiG5iy1tOeEhO@88MRVl5qq$Jwpt+a9EcG1*4Y>qj`3O8UmcXDd()Gi
zf>Ay}mULeke#a~F#4Ps~HT|VlSAX-dVTN+anijPPUWp=or$kqM^eU}G#M~VvEL-b<
zx!i1|ceb4=Bg!Q?J}iJrA3R2l;Et)jt9YxLiP!i^;Jbe3rN)UedusXLrF9R~4L4kG
zK&6Ak^q2iYSWOD<B)J1Wt;@<ycQ*l8r2#itULQ094jXZc{z!b^T=f;MdWLW<t1f?B
z25hMVPYR64)6+HSI%l>e5?}Pie~Wm<!<v8<yys4CJ38j$vYHWEYwPmk=-_2dYG2+k
z1F|U<&}@UEy9k~)k5veG5G;n{t(;{_@<|aR@O7hlS-U&Y!vd<f2qNnJCyvg>rUYKN
zi3s61eC)@!jn}uPP|m5;zOt~R=k*($txNQ}MLA|VpX~HXiPi@c@y0WA@`@gVzj`Rm
zTHL7}D9$Pa@FG}Wv3!VIvQ*#&9_zuN?Y@?^#jknYVFxv{!=rlV(u|klUyieQbJ{BX
zWSaO!INcS;9}m%eE?c|oCxs_JnyP9PrkB58BUaPi|6Z2#HpX8W=)frNE#!w|!=6M$
zd5=Ihmb#I<X|_3eyrS;#_pfFo02&hz{g}zBL<I4xiw}qMW_3MTJjs`qdEr@Ta_Ek$
z$$4lI^R9<~nnjIN20i*J&ZX5GFninukt>Rx6$NTIf#Q?emyzwu!+T*rrNk4OBAHbE
z4@^Zu5PW+c)U1aO{n%Y7F+skKJDiM8bG)Cy;r4=QQdpuzEgCx8D}K&bUYmnm9AN9)
zKcORdmN&nbK@FF;ch>Dg=xxpj?~D5<I$B{lrt4QPq59whSD8|@U>Fp7;zBG7PS@3@
zIKe##c4&H4pUGO<FYE#?=yr^;$q~%haNolG{@!u}&@1Y@uo*y*g2jucd;@rGN2bG;
z18{o|fT&LI`%`Duwu*kUyXN5LppPzs?H55J^EHSk53w)2a)e)0JeT<N{LlOK@V1`{
zlTQoi3xS2!(l3d7A`kecS?LdqLQJ<o<aju}ZA?5SY7>IoHD{P}N||y#aCdtxWT+7G
zm#U08YGA=^XS@xVo9_t&d^L4UWiqx<Yp>T+cI&wD_%L;Wvb6qPFSJx5kE6KZORqLi
zmbWhe=rE_@mQKYNr~r>f*>kv8WZ?r5Osf09fld6HIZh7xgDRn5Lub7DfU`5kpxzqR
zJ!CE{DmyI6_TmfktR$V^+nx#7-^-{&PN0wuF#a6dJR;XFILBkM`j6JYNifv&9@3BV
z&%LLmfMz-DTv0{isNg2l0s5ox7zG@!k8J!sL1>P^+dEHJ9#j7Yg03fy9LalAb$;}_
zTd-e>-o>9R0i3)G+<@tbYpcu+CQ&$&Q?z~-p@XcrOUhRvfRi{wD(nAwU$zYRT7}{#
zTr5JnxxMDk;GTn&@HV>f>g#>-jJeaDdOa2)E|ZsC!s^a<K%57ggtT}E3pVLLy&tg^
zdN(7)-N8GE;@|CLY()SuWEad}CV3nqO{vd$Sd%6~uNtqX7Q-f(RS9YhK-CEaw9?D2
zh{8lU<!|pyg!}$p1<##WE&6K~6~Z$n9FX}Hk}pH&Sh40`XPU5pp@Y$;gp^h|d?1|g
zj#(Pi%HpZf{Lk&G%o*GOm&rUB6CwD^q>6&t*!FUy_dUd_uX&}NGx+V*@?`Q_c4(5V
zbD3Xmq8wjJq^WX4D?aZzm{!331@zLaXLuS>Sz=lc-p-rEU~yb+7s#)M6T8Hu-U9E6
zA%#OyQ4ltxyWNS_{|=upOH1?ijBuNOd&@oS?ZSu1_tm>AjOK9n(V&-^dX*<DbyMV#
z85~u>NMpN^3-07d2UBeo@J$zn>lLDq_!75ZGa`GATiJE_b7!>fl?F(z|A`ls1&d$#
z4g=TEfv<;Aj`SiM+H8vNQAa2|Pi9KoY-;`7IH#wgMzKdsO17Mzu}@&Qi<U9yeWPUt
zyJYcEF!&1SA_9J4Cf)ml8xMe0dEU_UW22=81MD@Aae2WoRshGrk|C3Bp5gz`$8+s%
z?ADz-RYg3*q0{GD!-6a8;pUlzR;=y4LL|kI=`)frqZnc!LOlScE{(g#<~nqZ(ee?T
zqN@)uSo#_1Oz67vpg%vDNQ(b+x_7L{ZMEO?o%`BmRP9i*-0)>yirFvhuB0$HLLu|d
zf$m{+iOPS~en4*$!=?dn!Xi8%X<i?~Sq`+<zP9Ib+Iy+95uM-UY@IJWJN(c0J<8Yx
ziUwtGR3!K+&cAJFoWlphm*b_b6{ryGKu8NNt+4H=r1$Hs1K*mj0V3%P`sBmE*pLsz
z7k^P-X$Wbg*d?WAsn=(I9QE3o4pLlmZVPdTj1>x8UVGm-z%aTByFTNDsXhJnKca3O
z7_7&bmN^t~gBu`h%M@h?!G`FhjZkqrq3l8!>uj9igcc#R9;munmcVbv^~58|c<@`4
zlRkB{15>p-SaQ6c8dU8zy6D{CCh@3O1@3V*`Y0~43V6#Q1)QR?5`I?!eV=ZQ6W(sY
zgb#{}{RJ7&<qhMi&Ogb58jX+p_!pElQ(XRfs@DC7X)mleZ0OZ%?^c4ctGA+{PV{Jt
z;M62zs_M7IbFhZ{1k)mjT1#P6ziy}w1BOb#T7};Yssuv_v2CG!)&(vZ*Z9Le4qilu
zNm(eB<X;W@5SKfDHuQ~I)GKmd?0b|+ldb!|ve5c5@%k@6MQ2@aBZ@!CyWmEd0%r4p
z@-}$u_-hUxw@nz7g6G<Ee%yITl=OK6>ijEe28zB^fL1&9_sJ(M#L_*|j6eM-b4{KO
z%ATrRtytGk`FgGl0%-)SUxDgjcXaaaGiZJEl`o(n5r0#58<ZIa-SvP-iM!eF0AGBf
zfd~}2I$-N=xV$<52Oy81EdF>ot7_}KlWyOYwR+&Z=WAcj*UrkN^^?Mj7{PDyh>JIv
z02mPaP6f(z>(2WChd@pKoa#r=90S_Xi4OaozwvfEYg34VzeT<>j;;O9cidMq+D6qU
zD;xKZd(Ax?aO}Ld-i3<hyTdbww*;}~i`cawCk{z{D*iRsy4unMn=b@k33x1v@B*B+
zl!J@vhEFZC@yQ__?OM{iQsHBRn1*U-3nMF12TK|o3C;~SECJEvok|tp;f>sb<CajF
zT49eELr2&WD(>J`nL7R#n6AiRu`fIRkfXEkb}f?K<e~F)Uy-eUud)4_d~9lU@!|cI
z&0fTpZD|w{M`-wxd}fE)3~{2X2=B2X=Dz>-(yc9GuoI{bTWSgfAdTFZ(7T$70whOu
z0`?H1CJxf<Tge5Ac&!38*_HClVk@|JN=&{(MdOLLt*@h|$9^sW^{aZwcs3+f#1odl
zi$rwndOhXwCM4Jrx{y!?<=8|e(@u=;!||YZ7Rr8S?E(;wR6f>kI*M<0U;ElN=-H^;
zbm7_4!#nm%Z50%*FWBbn`Bc7b(BT>Qgml}Q4rXx@<aNPA!ro_CZ~}NaCWwM2G~s||
zn{5H~ec`+hrv(TvKl1Cdze*ka9TTwI7wfKT0%`sK447>Ix?Q(XlR`k*BufQM>LZIL
zk`;gll>YWGL63jQ>(Kfy%P&Yirp1=@rK{+qQ0S#X?`vyPx8L6Of5kY#fo3zeR)(0~
z3fhfF$7oP8g>3PiXG`68Y{ttBn@%NPy`zisJ=p%;g-UGgCit_R(Xvd)D`7MR0T=7!
z*WHAHO9t%gbvbEF6J4)`aa~-p@v*mUS*4-NOBZI53)A0MN{;JL|Bf8`>wCL`+j_|v
z3X@~viM4g~i-IwoLf(8Pw~VB6OE!foP`sW;2!SRzGulPfMbS7|m)AjovQU&v`(O%{
zooDvwTAS1d>3EUzpia*I?KxCAr_-~vV=5DkQ~hl_v90bao3^#eP?a(D#>;}H3L~m*
zk|7PDwPAox9RO>e;@9p$?|G3ic7r_HIXD|t;EX1m-L6TKz9fzl+RlTEO=-$B+px+d
zob^tLtejRVJ~7ruah0UEk{ZufhE0wsRX!a>?1{bigd@AFDTt!w)Vt+Uwb(v)1e>(p
z)ikN%-c_>BN0!7Z;H3rpe};=Xw4XX1KD8DOD%ky&{7#DaTqKD&Yua`Q>#{gaEnmW6
zRyA5)jBPdvk>9p$V`8(zKZmZm(60>{zN~`b@)Q`4*uXml8+F(siU<b?%q#C{=(0z|
zoruxph^U3dyc8yVjn$|HBFcOn9sG9{C-~4g+)AXw^?)~^B;7snv{T0Arke;9W}_k@
z%PBF@i*kDVrYb7<0<av-B$}uBsvxY0u($Rjc4{6WYNm4%&=jv9WeL!HtXyOJumDrc
zeBv*A&QG@gl?Nz}{Rfh%=fRR&k_bPn()_;wx;K(n5L^B?`reV()H_L{i>yi|O3j3G
zSFS&;-ltPcS|+Fbqu;jO@vPV~uI)m#{T+7%*EFeQU4_fJU_`^bV!PcwiiPg=f!jlu
zidA7IiR%Fu32@T0u)sG)TW{kb<0MwI)u`NknbvBRToIVJdsZ^fH#X#LtK)gkz?V<I
zxHXk&l?^j5N}@{DBu0oqocZ&JV(DIXz*E3Gnn?=&+y$QVL_rEePzc)p&r`8pe^5Ic
z4;$W}s3i7m&!F4K2e<m5%tsY{zqUG?gfE~js9>5}ZC3Tk`_q5biJ4iHY}5X*QH?t}
z>lzl|=)D;p5wse?h{_260t_S;KO5xtc*2=DVg&EnACRnqDP4NS)I8mYX7!0zewiOx
z_*W<J+~jKRo7a<XDi7?RM_sz+i@L%DG;E|%>}~?D=B;CrgkSS&xI`1Skq&}o2Ham8
zCep~Fe$c^f{gcJwe)|+X`zTquUR3)G8pW1Er9b3h{W}WY7}QXN65RlMqkHHaeO~?c
z#MDCDXrmJIcd)IS{#bq(6CE|j<Kl}kMNwTk7p6@2!Lkm}T?<&q2O{QpZrO40G7js(
zek0~AVJ3&qc4;13EYmQZ@qop1q$>vgtbf}W_HWnqf<kei#B}|mFF$d5;vNEk_Y>Ho
zF91@pi5ZU5vJ=2P)&l+^(b?h#XV~*UAaRj$-Kk&yx6fvOQX}-1)?Vycp2o@@rO^k7
zLi@^iY=A^}*s48$`iP9$9^|#u!Pr~)j^P_`J!|`2ZWg|HO)}N&7d>hEOLkeZ_Z}9D
zTtq#ly+23$&EAc5B7(^hIEe)~;E~NM%8=>H(iVjF-N&7@vWqlO;gZjc=zXU5P}T9J
z+i2r?PhH5=TVJ0aJ@@9kbyKTutf`b}>F=*&Xuxy@`(hkvkc}4M*Rf*1vo!R7mD$CQ
zL?ZY%1$^=Xb?odui#8YrUAU@Y6W}kMw-uYEATD!M?R@mVwm+ZeZ7@w8DtbK%P2aIH
zhO?eypwR@Qmmh@MqQ#&=!%5=pIeL)}JklQw9|Q(2A*zJ52TrqZpVjANp{yn``n6yt
zhdx$wbi9uFJ~YGT*#AoNe(-C7mzi%qLt|FTDk1UU+*=cXt1vY9s+Waom{(i?1}`jF
zlBc9UOv4^?XsIjnqJw9jz}vz<uW=fXUC*>I{jVmPO9v}fFcG;Ml5%wEU2{+l`V@xI
zH?LQS2x-(t7QSPTsK}G|U>Orx1O*z0GQYxp9lkRW)?!hE-IdrV--lSNsU&6Vu$>vU
zs+Ru#l-%C@E6|yX5ZnMjVtY>U1kFPqgJE6fCpp7ZS&`X-X8^XBnQRJYa$f{hj=ecw
zd94%uCQ!n&so{&8SmjeK@B0HuHzo?Y!vMdK6Kf5yg4+ZICh>73XAY1p7vSOazpxTd
zv;RfDcL%;tX2X4{D2hq<u3$8o<FQ0(?2u^Lu@XP$&FP?pB+#tZeWgFDL;b6qEm9!f
zu|Kis#MJj4{g#MT9$@cqnFwQweV=%J_aKa@LGvQ43nqc?cmjw<v41?o!Mn=VTp%?<
zPnD8S5mR`SdDNlxe5kuVq`um4EgTYkdg|CaA@e4dL<Hz8Avi8>c-sX+5D=PMT(FfF
za0rkVK;w%2*tgqn3=&i?kq*F>;fJ)^HgV5itK*iNg;HS7t|e!Bhdo7B_7y6IxIl~S
zJuSoURwh4Ld1LcZWD(|v$)9M*%7?~HR)(1wQu3?iw}xjxLEJ~8r`p4N*y>t(?A|ii
z!$mL(fX!4Jj+>UqQs#|ZRf>6-H{AeXAu#U(f(^ipBG%89xk*&IjUIiO8I)@=YFnAt
z=wSOzG_?Ne5HM0U$p_`rd<7=QW0##XoeL(0bzz!iY|U407oYt0fJx2ppv}{`OZz~5
zk7@Jro{jXLqSA)t=>-9>)*4CtOtkFkIQi3uc^gIzMyYA8QR$tGjo(qj*?j(=`^;e;
zG_$|N)b!X5o_kmgWd;zABBKJ4RRwfn5=`_%y6-Xps-j<dLK8IzYixULW6ZA2%u<{z
zo3_CFon#>xoBa2P-kV3ip7OI+d3kPn>`hoOB!m|9)1r+TNcmzdF?|zyu#GN)OypY+
zEs8wqhJcYzN#RZkXa?UV$v+P~&FL|8%>=cXD!@>e29qc0_j|Ag)IROg*mPo%LsAAu
zuA(8-<YDkF_8lSkKjeQ@ANR22V=7zcn$1zp+vLJGpx!G9Y|G5rYp_UjfSURg^d$&h
zjAIP$t8B0w1FDs1+5LmTuDG0Dwk9UVk~n}@Qu-wvQ|ExgZb0g-h+a;8g>TOs+?Fg_
zP@&((Y%3vz_<W^<n?xvQ{m5UK8J|4U(L5o|R&DR+YzA#7B9ho#`4Lci>cz1?ys_`q
zHm#w=D52n07`~^mCBird3j+bUr^=oSH$Dx2*tKE!ZJnK}jP`q$eN&<C*QUSFgC<79
z<JS=LW)U^D8@;j&$}bZ0m1#w8NLK9;lMWI~i-IHpRs6dVy~K{UXGsZ-Yl>oOhUE{l
zq?w9`)`vZXG>M>bv<+bm#~uYe8ir`Y{5mjAXk2>>tkq<!2j&$3Z>0_f4tCWP|F1W_
z_z{&zhN3Nt82G|#UORVtArE08#+Twd?}Pa-@IfD0)1t9D7X5OEN_N2iT1#E8dIR!m
zGPunqi!8yWO{$kQce@zJ`V6!8ePQp4h~bqxqydfDDdL8blrZwjh$S*IM$rYG!{hzx
zlB1QwqRgn<+p^GelZ~wom5?<<LTFzrwRZib)arkRbLsRhz_(AwWu9Gp2O2v?^dn;~
z6^pR^4_%Q0wf;yVck^XHrCDsw_V^%$s)iNbk34hA^mE1Kwrh%#dOS<nE7>!cSTBki
z*3l|3l0ocQgM`avw=aO;eW%|<!5z>okC=ZeCW|R%X&D^jBplL_1T~#fI&I+bT@E-A
z<dxOIV3^NI(x4?|mr5@Qaa*SpEP^W~MqfEM?1GaP!KL+I+4D(WQN$;nhyLWlRzCz(
z#HMjZGpA_6E{ck}A&nFWYjPvS<wqWnU^)f&r2^P3#O@wIZs8a%F?#f?-BfX$KoRKO
zGOWD$K=}`<Y_m^`h%MTDkbmurx%KCYKhggRXzyaJ@F9{(P^$bL$q;xp(Sm<Oi4FgY
zs(%a~DF)B(k=-VVFDIp1SEjkC#S5E;joyDT;|fTM13G6h^Ek8Ay%M$c`6}S^NXbd5
z1b%BKfiA1kr_<c8D)oy;E1g>d-Ltu0JbG;_A`-%x{|ByA$?4X`&8c-C-e5&yS0Lav
z90-xu;IvY$j~wXklV-fy%qJsjuCqXKgo79C#v3I_VnVWp@glTA3kK$2k;no$1qXU0
zC5))gyRe^5s`s9}rn0KfvosDp)9>7;yZq>XKxeg9GM7VAYTmhz9kHiB;M>HrEP@(~
z+4O-DMs)#*jrk2G{s(s%h5}u4gVw&B03lEhJ>!ZKynh>>LtUHNCdZlN74e$J#gQzo
zDE!lbK{?)`GVEz6km<n8xz~(#Ki7vbYn&+ka>9lbR@8&+HiY%6tC;*a?42U^oUUXT
z0ZrVf%b%124L@O=nt0mj<tAYAM^rvkuiF_p<L--rIqM030*4ysoQ*@&R=}E-WNg-D
zs6KJ*SCUTf#y)D_VYBQmq>#A?nG0ZpEy1uGyVZ@)(*?8}0D~`_1SV$h<?O2~N@yks
zDYwP>!}$$7g|Gi}z_}kj!+N$?F56KeH1!J<Kb%`ftyR9gf&g2z7*p>=7~v?w0^?uB
zcGeBXuY>$}$QCDN!^ycTz}dt)1IZ4Z=7yqRSTb!vj%qt?(mJ|k+6W46TAor_mJr5@
z3W6rHMOOlQ$M)T(LRY_5w`uHWub5qJ>TripyD#_XXM2^T{~UIv-Pe`2qf+$&n#T5b
zsFT-Vqdn99hZ5P-j+)FHVi5CS&6%7rkBmq!KgZJ$>M{xhf5h3C2cED?5R+a$1!j|y
zuAl|E0whox=$Gl}ru-5{*qaFnDs5#vJ);dPzN9Vy_&$sSp1e(9VT(H{P_xVnfnO%P
z`>FB_+t8i7xh=_)4A~yZz9hV0#{6kJ{hs@%kRut@lNvuDr`?2{Hf+<jQ1NC~;;Cc3
zV$$0ulJO6L-}(kG8D<bhmqi~qPxXQ~7v;fXKCrNm?u2M|q`^c>?_54hb22#01hn`4
z^=4^_iwq-d(yUcV8}zILr@=NR-!m)l`0L-1?f2OTue;HB^N1I0gv7}UH&`K;luV%2
zYKw98U|poJcYOcYAA9yCs)HZuUb<z#>bVb;k}1KwcUH;9=@0+pM_PZpEl0n%BM0r_
zHzBM&9mI{lWz5c)od1LBiCU8t$F;D<v2L02Rb6E|$32JT$;BB5!A;#sgU<kX0sxD6
zjvi4LoJc}EmEctJ1yb~WhI4+Mw%<9f;C)OhB85$}z>8q;wD{Sdn^}k9kf%*bgEr3?
z3@GN~RW^BKFiwF@)amfmx$)_2+P~f44Jat<&y^|F9kaju^&z932o?lAzV8&=tidRx
z5ZlBzAYik>4lr<<#S}1;m>}ZOZ(m@mmub8i-sQ)$q2xUv6ybD&U?o6!RL=~!@2y~f
zIYGF!%Iqcpq}1A<U0A^KK#}0&w<cJ4t6A~wv~2ZDh9J5db)Hr|v|Z%7c3b<8y^^N2
zgQlJ1v#;knW}@FhVT+y{JB?90(#Z2Rw1rCuq}@%zmow;7V029+h&8LGU<b?ak&BG4
z1K8cZUqQQ|12o?(fe@LC%hrTB!A|nucLRpu?b*6D<vXnW?3wJmQ@GO&Upy7P!BE+F
zK0@|I&9iyDKZY;C6|TX3l8a%c1P#USzNvlB0u+PgHK)VFuChVLx{%EHjyDTJh489h
zrWj#6@bAqSPR@8J>U#XKS7z$Gr@{!v;5%$ORy(fXS30tICLdgLS?z})c?d~m5*hnv
zzkVVaYfL65V;Ca$FMv(#G{f;j?d~%~OFcm2G;4c<N^zVC#ew+|nqL>jO7ALm*N06H
z0p#giZaxVd=0cj*&v-0!nc5H@cI6n%{~Fv*HJ&-~GmB=d2`=u!r?}2iZ50hE3*!SU
z4h!GJ3SdFkjc8%~$QtU>&TXyD^2~Ved^s6;s0?l!wZlwf2BA;Q@@n#OfoyZM)m7wX
zMtR0(^1xndGFEhl%EEabH2H^8WvrD@P~*sUciDB7hrp$IjfgNbZ|mbUb1w9;F8D~E
zm(*0U2<wCbdg2H{5l|{sl_x1I1B*d&rlHS($cJp`N5u~dzap>udE9Ma4KfM>X1+0p
z9^wlqt=7N!UvnDiNb@S)M19&OM`DkS00s)h8Z^&%qH7~o^GGv}=Aaq(`pjah>qgsX
z0j-sqOTR&O-|(Zpgesi5R#*47qU3$~Zp>UXO~`(b9=m}}CKP4sFk`*=NQuHEwcNPc
z`y|~efU{6kaCw=i4ZFy}yT;z!aD*`QGhK>TN>J&Ehj<^d`DbdFPz_XlIWsJs8bCu0
zO;|ugjS=BJkF|=*uB`A}FxO%kqY)jfd4B>Yr73cQwY|hfDu6!=vR}OMOpyc4|23`r
z82#?k4umb*WokOM_4%4>oWUfPd9&}FLj8bshx^JOC?YL4O^5eD8ElkJ!89oA9fnS&
zw+B2yXJA&>l0mSUnS@&1H9JcSe@VgWKF9w10s8v@Wf?GHzYyu_)x9PZMvxG%KnRB2
z5g>7(un!c~;kc9N7glU%*U#Xt3ZrXY6JqVrY1fO6KVVCYW^r}E(Oc@j@V0W?ftN6I
zCGcMN1&B)9g+TV9J-2K^7pv;R+T*?Q!maT)G|R7yTP(oRF$zl+4#!wax-9}1yi6Uo
zVC?6vIUDUqQS&SrhgT$Jut{V8K)W8ISKy2g{^B+nujv5+s9+i+6~qLOf^CY7*!#?+
z+yp{X1XF^aW{27`FW)V%SFEBqSKdXua0@-Ei(!>{77m=brc7rlHtXsY)%f0&3%p#*
z_4@x@fX_%BlQWSrii9=p2zO+sI7jV=zlD70yTuKwFIYR+)|bti%?OGt9b@t}0f?-v
zXmiHG75XKCb(yDF{n@o4rBO*8=EF15gTR?9)CVTmt~707X{-$uY^1if5{)Zp@kJ(c
zsk_ODUkfn>*<MI8m+CZ#T2-s3JyN5HsZhj!+3jG@&k%{PVa*AQg+y32bZuG!rXAVz
z8h1y$R@pligoFyaJLL+5i*mfIOzZ?4R7!{t;@)$Yv;l|Sl*aGMsRryda6#3xpTwE*
zTnU}T$AOD4?sQDtowi(La7MGH9Mem-fvz8x3df;O{~d`f>&FfdQw^pzqcf%@AHxo{
zS|0Lewh&+-q0*ksb53PG9Rypbm3!}^>aiW_n{vZ)*%{hH$|bufmNmUyvS0@h-26~N
z2cvqx=yBfeEWFlVP*;`EV&QFPw*F5a2rp*Bac~mynE~%Yh2kjaO)k3$k0`(g-3ALr
zY+VK5;%KSNZCl*%BF_i{E_w>B(|fKn)u2E$Ky}^{IQtWGOnz0b4~QAWjs2Ww4VZa|
zskbJ4X$N8|ZKNztC+m3|;$;pT!RzH_(Iz>XENvjX>YEJ~w}nr!lAa}?dLLRcqTd?r
z`%&eosA#+pewyCcTBi-ZvkL7FccIm)FxC$5MkZX`UP#8<Q@0{PVH1lT@cD5{v>z~Z
zsW);Gv7o~-t_NTQ(Iw-^7zL;e=&-R$YqQG{P>|X)q}?|eUqMKJzo`1=gR6iy{uT2G
z=@{IDrG%?^P(&xdg}V&^;&I{*0-+Ecg)Q#Vwc=q8%^R!X7m&uoNKPHNc0G)FK=I3<
zy1!xe#fFIZ<qr$=oLnN_Lj4uZQyZwo6W`LVCcto*^Wo#FoUtH`B00DlZ32eP<Dr<;
z2ra~JT|@-CDcyq&`IIU`?|~NZ>(?48x{X-gk}=&5i}5ohy_~!VVF~s}Q2Nhd6nnU{
zR6X;%=wLYTD3bZQEgHvMWApup>gZze4I*-)vF9PkJK{z^{QXAkBj+p$DM8rsD*)EE
zfzy`Z&OpRo#AUNgq^7nZ+eKfgENVBv7&0xI@X!0piP#z9w>ri~REPgL1}~MWMT;rl
zRV>-#@vI|_g1f<voZrC&pz~V@c<zec@9@~{J5k!8)k@K6X_VOp`8mF3@AhA?t*tS2
zkWTzL&k{jzrj$Lz78Sq@9&DD+gRJ4%f(BVUym~N3xYzcFF7T2qKw|Sbg1jx|V+NdO
zdd15tcofZrOSA}nL=W%03h?S6EXY3S#c5bUbM<Eq^t$rBs^prbcqo9bvtRF#RB(+$
zOGLbjidZjJPa#~xsCA=?DT-$?#zzv*F+^`u5uL=CcU}{$2}+XF6?lL6R9|4uiv2ga
z(mbC*$e;p~!SS!5yLHm2r9T7UdtZ$27b1Qt&z{=$k|^n2$W8jtjVY>y<vigHun>={
z9WL04T1bIQ1;AN3bzvPa?~!t(bxe6P>5~FLaJp+XZS%8Xi}mEjsZ;mZPfEiB>{&=L
zCb)0#fDuR#zrHaAkVbw10(=S0_dAV{9$|zLdGA&-NjwytvMgc&`2hcnqzbK&?RH$h
zr0G-q;hjkbv^VUK0+s0*V77zzXQA*)i3?&o4F<pFS8WO5y@-l-E8zl+v9@bYAr+%*
zzR7s}4eAVd;wYnpi1OID&9#Ga{#f3T9SlvF2|!M0tcx3ubLNO~S<o1+>QMj7yUI~~
z@{5RUDS*0w&2IJ<<zx2I7h2Bg)EwkczGRiAL!CYHrtIshvkycRs1hd;#j!ZvVvCVt
zt_*?@FKvEADxkDeRL8qAzHm$*I*}3PVi;oD`uDoSVP9C+1N9(|a#5Jea&}TfJ{f8{
z!C1ZxeArm3=sv}a>P6(uhZdF#a25a;5hSMglw+4O`98@*uP{QB9+lGZm%XCBK0g?Q
z%J9S8)TFr4HQ6NWp?|9@m`fX|>@6^>1B?4S$uOC|*#s4nRk%na#6U{C1i0CE4c5zW
z?p%m*D3)ZYA%%-;!bI<^kcF7zxj5M6U{;C4)6Wx_w@w&)yN?P1xWE#w$~2M=4Dkr3
zcNn2*#l77WTp5~KqlMPVQD-Bxm*{yb$nt`>FCnwGmUuyl0ZQAIlDvOBbh^_g3_~1!
z^&@996;_%O(eJ>1dQ->$-yO9hdgM>pE910(t2P^cTYe4hOdB2Qli=NSd~`TH;nyme
zI6|erUmPB$j}F9RhRC2JGwIFo7ENIM5!ZZS<RXeOnQU#P$?Yvr3UL0?UmHMf-y;0x
z<YSXgxS+-JJ4Mz!$$sy<&m(bIr#>vPDyNO8bZf(_NMr<jFsP{kaEX5xuP@jy)#~kT
zLsr=G0ac^S`A;x~pLkqF<L25$W+aQL8(pX>%7di~sHHbxU=}E~_<&QGvUe5zVDau1
zneWI`#{u?L3YtGXO-60vMuQOfU)%QQU7PuN`dpY_6XhmUvo^3{=}|1i4T_`)Hk?cq
z$xmV&6-{EyGw5R-AXX0%ai7hgoGIrscl)2yI^#zc^8j&8Ku2k><D?Z_ffNf}bczO)
z>Os&1{-c;*H{QY2(+QWz8X6#6vx4iPV6xGv+ijBF01$K+cS75HP5U}q$|}ER@5H0-
z@c=~c4fazh1Xs*|HON>ZibhjLfj>CGXLSsN&)8FQsh4=uu&7-!M0I)0@b5lK7myBo
z_B6yPqz7t4DN$ryau3!iEb06e7YcVHrL#?e*3(0rq%#Dhuo@Jqo+B+hl&r0d2fvVs
z68oSvC!ysIZrnJ1ewlOK=B{ynxvXs5h`8ua1d*#i3h9o#-TI}Yn@##VSdtRa%PL<F
zk<We%hn{U3;ogf<T-6R(!Q5>JbZ|e5<3^4wdcZpZ6QkL-t-L<u=n*!V%`CjHmlK}(
zcR`W`cfWK&{L2k<-O9gfYuA#N`@+agJ@+tHV9@~OY7LK6|0e1t-f4gKH6CJ7@IHJA
z8a=`_?fV@o^>bc7;6@w(94py0=%{W&R|EPz|21QNxvc7YETKDhU+qzuP`_41k{FEm
zl12LulY<oO1w2?i0!$s3B*_~gj0H$}xFS9Yw5%|2m-z4Y1Oh6MrC{U82;#Fgu_8Y}
zDJldoe@ko7JBd686bl_ad}Y7nOEFcd_|iq(IDk}-v(na_kRPdLhl_q=ZobngEvwn+
z<n8mB<cdKLu&P!;<|j16lZX4^PE~+ln+j|iML%l}6@!hSHsgt@yh;t$SnF3J)Gy~d
zuC*`@7BfC`iF)=|_1b3$a!;!G$e%73&$ik~DN$kU4K+ybQm~OdAb#3iiIOY?R)5;V
zzb0Y>f%y`!#hgCnO42n#v=0kHR!|#)BZt9{>t*oz@TTnqpHziXOai}!l3#*@oxyDP
z8%*HVb*a$l?<21)CS$yH+z{}Sz5{_5fuQaQdCfOmIE?B@Fv2bp5%Q=vOmIXCuHD3G
zH_x)2@$Vj=>(FQ-HYe=F@Gv%h@578FJ3~`cDrJvy_X5gpkTP2f@EdQCqZf<L7AHu(
z<TUg<6>)k~4x;T0u8l=Q7`HV29o^A5<VgQ?kUIrebV|Wdvs1aGK3V(@D6V;)2I@M}
zcvjs`_>pg~RAAp+$nk-j?3|zfAdXY<fI000tm8{8zkK}B6G&cB3wU2CuEwU9-17K`
zO^Wn=0M077D;yuEfaA9loBMtgA^OrX9$Az+tTqO46~jVS1g6~RQbQc;AH8_$fzqD<
z7Ui2F_L(bU6-eFN$mGju^Q*xM8d(tZIUtEjXr;X1p>D~yln-4d0YKIE)`LVznIzQi
zj)3Hv4aGvLaHkKNzDFbuGVX?A9$E!tT@G;%*`KDU@B1i&Gnh!Pm|Cx_%NM!?J{kIF
zp0#d=rc)&2<GvLaVG#suOOsX)c-xPLzcspMImo~YK~2DyPC;4Cg{`thFoF{pS>uek
z@8n4^Q~-$7=ax9$rdFjFTo0p|p_@9{cn+BaxqP;+q7H~JX=!}U^4_DTOh=)4)gNvI
zYKo7Dr*nG3{p(?2`J`)zkYBh#u85v-gW8je!Xpc(3Oh&ogd!)8ce}-{#~%q~ve1Rw
z6oBQr%%wUYutde*U2s}lAisQ1op@Opo8Br}=`)_aZL*O{s<?o%$OTT-f4&pahjK-J
z@1rQxpRs9F)`QksWDG(7Jb6?ZL28s9s<&B}A8WNiuJ%Z!#f}WG!8SpW?SHYeIYjpX
z#&2jIyiFlbIB=yIqDmto!`i+B`JdTxg5Xx`7P1ynS70BFyhyDIfY`O@bhNe7?@Xs5
z10fI1A%oczhapkv1m^@}y~Kb#;GSEcA1|+tOnf8CE*nAefQx%)=@F8d9@T12<6yQr
z%-8W+y?_?;aG2O~xL#budN*|63nkMcRf9+>sf&}AYX!P>qsFApge-7S?r*tMEzW~6
zx$Dt`6)5NZ2fHYZJ>TzoROklsm`deDcx-q&IA5~vgO^b|rnoB*H?dZlgiqbuIf?4n
z1Dnhk7dNo4_lEypP1hYy)&Kv`9k}-9s$^zlQ=;TvGubN?qR1*MD;f7%QDl^|M+*%r
zGUHwvq`0Dx(X}$Nu5r2Uz3%;;KHtah@i>3@hwGmAYrS8u=kxg@?}M!ouJ>+Bdy0-s
z3>)io;u-oUF1!#`Ud9UDtCQS@t>Z@!Kc3Tun6)ce+Q4+=unyKNf{yCvSwxL*o{t~g
zAa7r(&FtqNZ_-dXp46ta9A~%D#36n88TVk^4fVD=o}O$c%KOJ2ciD1I--d#4X(!a+
zb=Dif8oy05WjO_8-Lt+Q1Xef;s4b2f?tez6afTBetO>hpjTkJ&CMaDTGWRz=-+r$r
zni=MM@H_@n_no)f&%;{xys_c-iOQ9$Dv__N-+O@inMJ8|upu~Et@6hM#CZ0~@>?Q6
zEzXVL?ZZk8ve^7aIwpS;rM-ty;S9M;#hllwQwN-dmNcC4xrF$P)1Q?NVHI~IsI(98
z4i4*4*h79fK>sZ}0Q2-1<l?itCFeN^gwQ@0l#iU~4Y-NcleQbvZcAyRy|kM^ORhC@
znD#QCYNMZhFV|3RNnjuR7Qz{R39D+LKEm}ev|F?hnnW`p)aXV-IkiapIq@#VUgMa@
zS*W+$CiR^%4NSWTROU$_FZRHpfl+q_kKL+FzKuaC4n3$%fA@lZiuaeOGyUJ3ZTl_f
zUT6U$H@0+kBL_#=W2%h;^uupN@S;o+>qUl|;*JB^Gm}XCM%fzz-b+z2E3p7lkuKYI
z)|>T*n6~E|2!#X!Sk2pW(PyNdgHEpaB17|xh-ad?s-Lthf7bi>Nz_T&+~uEvFN#F&
zkMvckYWE&vX>*4<`@!f6_@_}`pv!*F?|N+Dg*OM@HH~+r@sn`-z4|)Khw_Iwl4}w)
zDh<AIDXS(Deh9;@vwM>y^w-0DY4TQG$yq4MxY0*m?N_4(Fs}%VJgI1BpO8<Upm|m8
z_6!o$T36`@6F;3Mt2c&dWTV}>R>Fo;)TfF@2E)?lrI6}Kp8emZv@UryM*XOVy8=CU
zh9&_^#kqAc8@cgf&iL!wkjsZek1)>!aXC8DC9cHoN|a@Rw=b^o93VLc<_5#-EV_ks
zJ?FCwIj<|oX3g>>S(|pR5w7&JQAP6jpeaN$@h1yc4%00Vt46UF1PmUOw~N!bli<*5
zGyxILOG!DB5Z2DR5WvC;{aB!ym?B0&K9|6hT=$_pYtE{ovhAhwp?F63cn)E$r%*${
zw-R#HKA=zLRr$M^@kHo>k7ngc?6IcTCGUxom0;unjkOHKO5QA~1$9H-I_}Kq$3Nla
zYPrv=#)w~FGRvE3`?HwL-Lm71+WY$*AEiBR!1cebGM%ph3*`rSB8-=E_+o!9!<ce0
zf1u(JgukA31CcujjEO^&rVN%QA-Q&4@P~R&?wYws3mi|;W89)<W~IvOjhu4_@%Dv&
za25_nn>8BTK#8}dihHnT?7CJsr>7s=iO+t|zH7rEGJ}E0o7du$&rNsNB-B*FzK!cn
zzk|X|J;xlm#FAgk<5aq{1f=E);^{4JeM@^`bi^MUUve3hLZd}kK{KfPHf!-s<r8Zq
z4Za8N_MR;}Jt;K4E}iq<=6#KxD_3PeEXPe;D*>D%|C$PLzR_m|&b&e082{tLptO+K
zwUSS~n^T$xJqo+^vl7zGItpQGeNRLg?{bCtht9xR!bq(9z~Wfq^`i<}N&IOk38{B$
zHMEUpyEd3-J;ImNVn6bAmlL?2e$0fz^DOTr%WKZuHOm)zz@e((_2%|C>Rrsux-Nr3
zBw9U9TgCQpBYWa>6X)e0tUF66AHLJ`5`WmjQ>Ii7y|oeXSO`6RQQeU7@2fjm2T5gc
z_UrazaVldL>MI(Ib}g1s`>#pe;vH?3K2)hSly4JCbTbQl4LqLe#}NngD^&!^uM!_5
z%cC3OGo1D{yR$X!B(gs^rl{2LAn<ER_>BJk!Gb>VQTtU8{WSE7?x6S_v2cKVBg8~V
zE>_2LyL1tGk*^MzoHed%wDG6BqP7QW%X`dr4IqqTPw23^v%IH|CiIHTpryKim!f_2
z4)T4l6Skd$byrr_4Dlk@whxqxWLM4iPCO?4<fY}s<AT(+#pb^~+csOVw}P_Bc0U6H
zFZ~Qic@+%hyFc=|0&?hnnqLM_BP5OW<Wsdlr&ELNEQ6Afw}Hc^-s+xkR>g!}qTDxr
zb%!sB>MkymPd-^(N|5xqg*El+M_Y2Ladk~d)2)9>yxt3?oZ&7g)NMG(K6)mV(msUR
z-5lGKkYX4-kqFx3ycdI_^%!i*`(2BM%?Gc=Wwd*i6<4PV6CXd`+N;8}j|;!P@dzXo
zywLt>qdwxm@Z#!Y6JnlLV9b0YiZW61*-YI+=Hv4iOwqRgVXWvp?AtZ?f;J>CG0{*2
zkBN)8W6M*P>yY(<rU_YpdJRAJntNr0?V_FJqUFslft--N&(F>Br)PV`YRh&(z?<Bw
zfWHaugGgxFp$t>B5f;gPh~M_GB&)$0V#jw@%Ty}tbGa{IDwbe<W{{1Amk(8HArhW}
z_J!$H3S$kpx=i}<*O7^N((_qYd48MA?%F4#%-3k2pFAXXRVk>OQf0ib>0jcWm0~{H
zeMFHcsej`M0`R9Ou8(m`8-n)$+HBSXiwAwVk1uwOeli7dl>*N6uygy1CTcqm6GN@p
zpXnc_Cnd)_d_q+m7|nx00i#qefsZ(kY54ou*Mx!bWt|p~QEz6?Z$Bg1h@i5TccSIv
z4$0v?zOe%?Vj58i29LR?N5t_gqRRXaDy3%%Kr?9ga4Ki8=YRmxKqil_^!dYboi0HF
z;Oz=7?Xy7|g_Vr&<x{+Ve6}l3TqPAI=Q6NjesESfLy(hGGpv!cmQ=Z(U{{S+-YFX5
z3jf~CUs%%5mmI^TTBluBsEhY!`!x32(|bXmbEbzgiq$V3zRa5sV1EU~W2@?Le4Axy
z2R>D_&_TYP&Umn3%6Moj3+f;>{R0vQeVV$R_Zx(kwv*jERhsv~$%V<K=XWgyzog9P
zPTcqOOJOT}PH`3lZxw_=2FGvf=~G}4t_@m354bRy!922)rNyal{7K&jN=JBp69@QR
z)pxxQ%;Y4|;eHCpL?QYoM8P#!e%&)5r#HFse4j(kma%NAajy(UfIK|&^6afZ^aPTn
z@BU)kIy1HzTi^p+{)pIVXZ2}elgnn_=*L?i6R!_$9oAwCrqFc*9}Jw}s5PKyJiwh8
zmQaT{SM3vdHlqfxzy2~vaT_a(8SOg6Tw(t%5VpVC2Zp>(iw*6lUqSD_Hh*dYCvl*5
znU%40$zZJonTCD@j&v}I!^yb8zoNmr4qfE!A;k0xc1+k0X4v0PLqP2G!_^0*;7kW_
z{}tvXdzE}!-%Fko2{ZOjc!3Z<1mDoLTu@41>c<+dXK|=pbhks!J>@STKU>*iYi_S+
z<0oNJVt&6Rn3rsDDzN%+im6gy?Dt*AcP2EMAjoS7a*TNyk4T<?^S7DKoZdrc3*EBQ
zQdjWILnhV%-TvP*3KHuLK~<NK6{lE^FJ-?E!j0z2j}#0OzY2Bp9!{~)IuN{vX)45N
z?cR_59s5yY9FppU7mUE1+m8AYpDS6(r7I{atoY?&M)lT7V(#Hq*R}s)#v}JZI^Rm{
zBhiaF*EB8QqWWX0v2}eYR&<|m1a7QHhRI|DhwdL9ePUKCV8X6hfucG^!Y}gv!16h{
zx{5#IU$W7TSppf~UVYYl4FP0#(o^(jSq`_s{aPLt3z+NvvAp>OT&kk?#iZ0n+Tv~8
z@!<}kw*oe(<4wM6PxKYW9oxE`l&bM-LTJ~<DL+8E8T%dWwmDkU;_(F$ZlV#+3Fqo^
z+ru*Z2_sy|ChO8h(?x7Yd_`36y{+-)3HqgR*>Ec_`(QdMu~NG~41ww-igiic@xosJ
zK@VNPi~(-xlsF>|B+U44JTpFvy7u?C<8yFe)TBCcvw8drXylO~*(CCHU?-UV3Lg2V
zQg!!!#~(r*=(kuEyDig*5Gqsrvr+tS=>7-cDyBg9zx2lxVx6{kBUwbUe!GGgI0*^!
zwVDy6JS)PkCkEj8o)1W2b8S%q(}|p_twImvrG;C+-71}@N%#M1{$~XLe4g~<=<8>%
z#xFI$Itj8k-;wvT+E|X*1cN0MXzMH!$G8IqkM0+hW6N6DR)0=evC$>*c;$Y)%VwE3
zg5JYj8au%55MoZ?ddHHfn_t+9d(=i-9nH$7>y~s2z2(Jp))NW}|D=kqv=+oO10&Oz
zt2c=3?B9b(GK2EW(t(3o6M7RQ-*&G(*4n(JH;es2FQ|Yu<8uJA-c<e)Ya;iX#=Jpt
z6&U|3G_7Rw614^tUaTg~#m-3|7G>h3=b5#@KB}u_oLQaCeD^ipN0^=hq0lXX_n}(q
zsq8w<wUV*+O2}8P7Nc-d)(z<G(*XY0oqP|uc~CEIK2cu!(ZvUM_4==sE)Xt05FaZ0
zvUx_7Jj{3*t*`$N3u<&|`1rM4{W%f!HbM5wUlHN#iIA<0$J|%4)o+<9O$%Nv`Lprf
zr@VGH<op@+3yw*MiF5+4%H^urYmY<X@860QKi@hh6Q!o-+Jj6AiwFpKjC%1~BKC6H
zB#pPYWR2}pyvra><6}A>MuI2YddeopAv5tGCQapSVz65k0YujSjtFO-R%?(Z+jSO)
zuCK*Kj_^_vs!*zo`$~+gn%>l2qT24hb|SqpmJxgsnjbdBbd_e}lwja@zja;?Z&85N
zk(UgT>}Hib$_eTj>$<q(drm?!Wsad01Z0y1XCo2nrefRo(Z>aH`YeU~Rqr)Un_N1I
zL&d$0*E^^J`wwfKr>j6p!?3noI44pT%d`AU&NHL5A5pFWGsO$fNqXSdl<Jn4iB9Ee
zf3D1&`xx4fM`)=J^59!e1`F7gwO=mUref<Sh<#!@7w6?WecO|$HyuLRfAt_R_A@Ar
z;Vea(fzV*<uTD%SuQ2sM=jv5(WBF{>Qv9q*e1WBZ>HH1%H=ioTz?MtVDo7`CxUmhE
zhkb9p>HQUTLs;uR%N?@OT;WZ}c`U{pQDiV#04D51b^N*fjcuGs6O$-6#|)kT+zN!!
zoKLW*S#jz0{KNG)T>M!I@srWUbJe_-kmWg&4N)~1JoX^69j+q?!ZpkuT8j9qrZ;Ar
zIIV6=>`OiRwb?VA^>>ls+kjdR#M(L-y}tCU?l33*T?W=ebhUwH_98}9Pv{t;beQ8-
z9G+ck`rf%WVrlsa>p`$PlE-I9)mb$D@)TjixVs#;H-}g~w`fMlgLt21h^izl#|P3=
znDVfIAvClReCEsq@8QHW2qI`NP2#pOhI>|mmD<uD$KL-Sqx!9IR0Cr^sKX-akLrX_
z(fe=C|8!iWhm1L-Vsq8V7M=R4-#6SgQP>OH%pPG(?G96-?g<KIdXHJ`jT;T3wO5Q4
zwMO{+1N!oUB&TKUs3zn}SoyiaOhr4-F@yrp>)B$w^x^V6W6K|(Z+#f8a3$Fe>|9uq
zk}XPmjlIvyZ9nI`=5%i(i^xMP?Q}+!#sB!nc-?Pt?x9u{Hq}#s>I_$5y>xzj*V}Sc
zr<Uez7MaAHiPTGww0ww81b?_qg;r4F`8702x&4kJ(u<2VMeVYg(Ajk2P5PPg-F`iv
z=^?XOfwx)wj9z6N^Yjco9>G+TK2ZEl{DCM317_59YK14yY}86ij@_MsVViAPu$j7b
zp<ZO-s?4cB+Eb4w!d-*5Kp;k6qosrVmf+bb8`PIK64H3V1u8gd!DX&zr8BjPRd-ui
zw%GEUr#8m<ySjl`0Xa|Wqj;C^=X5p>-Qtv!41&{jGu0vbqU|X&r7M#sA**0KE#+Bi
z1aFmSu@{c&123|r9~OLj=vMRgCa%xoB14%M^J0H<Vy^k`;xOSKP4&pDq*tphXr*c&
zEvQJo;GpLsv+C@<(ekd0b~rxcI!lcw>l@SQA68)42oZJ&xubzJq9$EOMP4<0-{lp*
z#nJwet2nI0!*ExlJGK5|JP`u#vT&9@@N3#2qU`pK>i!TOxkH~T;llWF+dG2(XAc_9
zI6IF!f#}sgHIv6CerivNOx$=>tGT!gBIhanaghmGWb&MRKDp-;Ds%S$L?EFy_P%$b
zrs4vSqV$fFTR5SOGp9B;^318UN-bbCgZ10t_&B6L^s0~N>ZfNi^F-4dXdZ1PEQ?G6
zc$2;zh=m#W{Q~lklKFi0W;uP1KIi2?f4Sy#)aln>k_s)JzPZx@w$`<6dKPzW#T_p=
zx7poy0yE4?Lk9L7NxUOVUlf2OxnY;kzgqqu3t+8-@W~ccM>Cw&VN<Y?so-9|@Tzz`
zA6FmwT7~C54P-Eg8{K#>ip=1r7eFzYR)xm9Nz4JRWC_gFFEdo(T52*TdldC#i?<*l
zEUoNc2ltOL$Ke@QSzYjkRSUAd9~XJM1`S)ao*#`?UljG1P8NFV@!P09J2R_{oI3i>
zWqBj);Oy4kCt@XS&3!YtR)NuM%)rDnGHpN-ST{W5BwO$oc!may`b_~(Ap9*i;%T23
zdZWXq-^Pwj(8lg|1G35dePDCp<^+7+zclw^w8Hk!&Tme%;EU08#?Bh$!+n<0Ou}0I
z=~r#l5fe?mNXU>>+zBwHC^A)LdqpwnRC1Nm^d%oaTFz6%Xz;`AMN5!Q6>`ZS$?nsc
z$BBLy2|qCVLr717UpQdqTtDH08RkY4k%gUn8jIf`rtWg(LlPgRm1&qJH;~CG7!~bL
z+P@x8c(;%HSWo9I+-)GUE9yol#jr`Eur`U*53?Je;(yOEW3cp&F+wFxJaHCvZW+Tl
zkGac^#TbT>Y`g(gVVWz5u9AUZ#_!sp4`;x;>#@O5V^SPu)eKLDumXH9-A^vS6FVHx
z_l#vV-$@z1{nq!P%|)UU6^8;l4WK2^8=~J*fg*`POATl|4jUOU;@NUpM}gs!_CvlA
z8gf#Lj}Njfme?ie)hlGF=PUhrdPnRI>(r@?g|iZ?K}GXIun?Z_yb4TyZ(e6<`uYl_
z`+}K7g)c3{np54A)sSCO>>S<g5(@L6URntx9d1U{p9h&17Z+E;-QNsfxa<R78VbG%
zC_Wc*Lx?WSMegw>k~VV)GATa^G~Pj_17?T`)5BnsH!%KW@#(VP0%WybX4w$nmcvW3
zv&170V+EgKPv5?>KkH#~1FgW5JJ`d9(K)uHYRj5121vzZ+nc{Jwk0_}*R<Js{_Wm}
z+qlzjw#hRwou^|l)OZSG=NWaM{w%t29}@T{DcKqc;r^U`ejXLV3Ql40RZhTZS>A^H
zgw8u`F^C0Cc-*_w`?uZ2%C2&KetiQacdPcR%k)E3`g$e*LEYz`TqYU8oL?z9NBwXO
zCEswczH-aLqjEj#0h3BNY(#&+E`7~#Th<qxFkR?eD7vb0>XY1*&;<AzhBTFi%SoJF
z?GYUvZKz&lx-r*lw&TKFpW>N3eqbzMvPS+!Eo`EiJNI5F#RX^5G2~y&Zs5IyAh<HI
zUR1zRZ~sFmTJS#1Fc4kENukL7E0Wvec;jTI9pE6?KTP#`w&tUYvxN!XCAELrD50SL
z&r#;~&ylzHeYYDi0lQ!vaFIAu?>T)4{p@a6yaf8xHk&%yO{<({h4xERc`xoYT?H8h
zzWK1Snql;fLT=iL#h!It4m6z6@lt2NBW03v<htHZ8F7U2mlki>NZ+n?E^<2Xx<zwK
zmS99JO2wg?x~2MgJMx387B<@Nh8#gd$5D>tuLDDQ4bn=K;~t^3$;<LZu_Zd89)*=A
zg~$9Kq#2v5>iQNtn0Mf_jIW$8dqGLPihHKSxV*ZzQBI;oGj(4uTcJ!5F(&60v+@K`
zmd38m|2InvqUj~ecM4>9*s`3s#0|Jc;o#JH^cK4+5-GyY@niXMhbva23vP2uTC<=}
zTIIooPV-S3dFI^a9BFPj^)UAs9hg9@P8h}g00~DGftFw~VR!giE;r+Qr51DWET1%;
z5zkL8>*9jL58iPZ>>WAe#nHV7R*)pznGnQ|Nw;x{!AAu*tHqCLaqp!N&U@A<{yU}2
zP;ZHP<~BbgJ32pMhh~`N#npxGm$(j1J2)hyC}0>nbFPcU%Ea)kY(olhe;+iBi=r#x
zCAAKx=4|Z!IdRiZ(>Ed%<2zV4x4-SrUANcUU=G_IFxGgN77t>g`U8CJ8B{|ffOE^^
z5Y{7sU0rJoTVLUMT%k(*3e?cllchr^+v<dr#1Hls^F-`NK2i|GTyfhAQps(mS#S*0
zw0eCb!bNoD17Wf3+@2G25;bCzS_$4h-ei*PE`Y74QhwV$g{K+cMaUCSv39o8j#&&3
z2o=@C#idVZfIwjC=~5&@Z3~vo5|Yf_jhK~CXLER`?c%<KOmU6~QEwf%l`Nbez-MjG
zl*^6_FT039#b$D+M`tY%q~ebFLs<hD`eJ-JlD5y?FXKFm&2k2fWlz|IU0?oc4)VyZ
zKC1n9N>0CytGopdOgi+jzG4e0txQ)*<*w<`vX>Ov$^#thr)@^|786E|X6BA<oHRta
zWHW~VI)^1%XQONg>NdpMXty`Tnu5EjR_8^Mb~UKwBxR}WEA!sR^`3SuBJhF(p=%it
z_tBu1cfn&&^hKhK$EK%@*7Jc-DbXWAKxLsyF^*Y;Eb`n;{V$0(ailRva1F?5NVO*t
zK0gUdph}$Xzz+(m_i<sxzWs{R3Q+;wB<7<KmlF@K7!2vfQ*p*du$Ci!nI%}Do^S)~
zxzj$59xfvj&QZJ~QCuTbYsolNk3<^7@DCGB7aiEsoy!k7?@%zL+<&p)@%wKUVBZz&
zK|i=qZ|xM>S>~;2VP9bGK@s!H;QyS4GP_+kyInFiD>^{K@Y*tQ;({dcJKKyfb7tNN
zXq_bU1%&b_ADo+@Mi9w+cNJ^ZWh8Gv1CShW*QIUfEz$v|Fg+bN7~S@e&#<a~A5t8u
z+EN#kAZztj_Vv9+Gv{A_>vZ+RG5SnB{dI{fR2k-<B+Pgl>uPDjv%|cNfnJxYGe-K_
z*|PnvHhxbC{>=qTW<{WcAcmD{h?o03^>dbY@MrHOP1qD9b}Ax}Ns51&lVLhOLg0GD
zt|Nr~Ry$zUU!RFI;;YynFrWZQZ<vB){X2=D_zlX-8rgnBkpsJHM=ebiG|z3zOD}Ix
z)8EX$FrkCF%p0_ge>TxStQ?wBCNEu1^-rd33Q9BT%I`!ouC!!{(xM+>^fq`;nvV)m
zb+5;X&NF>L1Zqd2%?4LX_!(;<8@;fy`aMENPQiv?ojHbegqoM=F473YvH=usfWZsI
zMr;I6^>kby4Y$B6?g;}RHS0Ub*m@Tb@fsv1S`DAL;P4Zq6^p<6u(?dSaWNtOgzedN
z%*gMPA*6QJOYPxR7pnaq{lzr}LM@wBTZqbjcRmqC?YP^Xk=Q<U_H3-DrXdqE&o8l1
z-B-Z90mUyU1a;WlUW^g@v?VJ*c(KpzV>s8_=`lLdanJNdY?6B-G9HsuAxT<^>SHKA
z-)Lv6U641+wi_qx6$tOXIRE+mE8I6H&}W`kQr%}Z7HA;nTX!)-^E0ABN`L)2TO7$(
znGSp~^RU^+Bt041APy41B^rNb^hXg4RbjfKlcxcL6GrmS$F^qR$E2TVgqHilG6y+X
ziacefWs*_hucuiI%Ns80n&MBh`r#41-!!2Y?H*l>2J!TB!!w(d7R;-ods#mpjv|hf
z6&-}uy0w+RqWYk(SH~JewL(YCks7eb+n%h20P%>+WUzI1{Nl*o*E=6H5*=o*i~`|h
zH*N=@{1jr3ZOo-Wy-{ATB#!aVUcUz!$S9OxXVpa7LT5%KqELb}yJJ$fG(Uj3ST8ek
znf}BBleWXp&X;&rFeMEneE+cjmvB>_?LW*|I6sgMUYwooX)0YS5Poa+RTjLPfX~C1
zmd3}AZHSOFq~a;h(@>@d`a`Fl)0v2DCX+Q6v%29NoJR4`T=B^Mmuxu&0pD!qNlX06
z46HA#<=MU#;BrQLI^7EvA9e#T4%~Q}1EdgU1X_&QU48`Rw2xeR?ey-Ie^EuyO2w<!
zR9o@aM(=8Odk!`?N#U{MsH2#5iT3aK;jYtcyBC@h22X<ce9(u+6{_!VswQB?kk46p
z(xVAN#RfZrpLp0Z46v*18F*40tmG<@t2alG74Xpnf*W~n9r~4($;sNw@CMY8g5jME
zzx3&}Y~D&_(r<axwat~EOsS!s%-OxK(bPxpK`eos*5hMhVc>?{gNuskZ!G(Ma8T_F
zzBtO+b11?ay7lvZ6914fTVkk;3^AiV<{7So17@ZI^K1r<M&#HeJYih<&pP-m@#oZ`
zo18DX+sH0QZiQ?FC+1*95dswNacsVTq!}MK)WDESBiH_wn3tu3lx%ZN!mEM5Ubo-$
zy?L|yiAsqb1GP*lK|vlzP>^S(^5CHt%WnS+cvW4fdevqhF}zd}82;?gTyoN9<o(k1
z(bHxkM?_+|K0|b#(~?fUFWEzR!`lou>h<pi@p|GQfaLc|F5=yL@f4*aeu&Gt0w<0v
z#C$yZ^x(Vc69SMd$%E&*3JWb4MZ-@R=}64(l(HayUo+=a_e0#Sm)Lx&e@0~K@s@37
zaj3M8yuDc=30ya2x-A>#hvU0;>7KNbcd3x3jh5Iw>htVGtuEb_!Fax3v}Jx&hMUDJ
z>=tv~7AHzO;OXdNx|M?c9R|z38W+CO3tE9p2ph-dz0c8Vrk$$gGy}>*Zs1G2V4bJ6
zr@J)ZEBx93iWc_7qsdE8!n1MYlH#=p=s$aTS?yH*DvSK&w!XeIA$1Yd{<#$kCgdzy
zC3T<Vh;lV8*L7rzc$4`m=#{lv`Fp>RLa{X8gZjvFFB*-uV-jb1fTF*LU<S|1$st&l
zZm071VV+Cju>vhkoSd)UcMY?g6)a1+!W_gf>Zm>89qci<nMTx-iJTupK~lj*{luM}
zyTs3_iR{uXU^id6Urno2UhM0zVQzuDm%Gok2bHbh)ml#a(cSFs{#};J;^;!$=(g*{
z8P6tiG$#t*IH=Z0`BcSZzq9^K5yMn@8t0XaVc%5i#asb?7qh38p^;OI)nf@7d4T2n
z^6pl5VRaxCTfzAY3%|3Hf(jHI?BSG=2DbztjkuOqlP*;~ZkDz?U-Zt(;Z(H4bCZZ(
zo}Z^Z{t4j(U?xWiJ#p8_5CRBnAg*Q+`a8#6m9FHU0O$Ro{z)VDRrg1d`mu6#tWOuI
zFtD5lmSI$yiFrJiI}1c>dJ3*{MCqf5qoCU#*1c0;yQ~F0(<+lNtboe+O!2A9myaKx
z{&GP3iBHNg%;y&JgWR6HaYrJ9k1;qd>O+Qw$~l-TxI8ChYgl(b*LU8z_;_B=MyvE#
zYwy2xG;$5Hg3%AYDu40zo7rwS$Xqxl`jeOnXL3v*H$8aQuCHgBi^CLg?D`X*kjj*n
zz_JaAwfT2>g>Ft9xr6;ip&$=upVsz-0egdISUOvpRa_E0k7mI2JG3Pg?)YHw_rG6O
zEN=vr{RkW<dMaM6m3f8L-GfXZj+DMyoC`aMy;W1jL(sl9=+6TB(*+0r!<s+FvY%kZ
z2jg}~7w_PCcdR5<y`(>8iASE2vLW6Vy?uGw@qozAoy0qhRY!6Ql@gd`??*Z5Ts)Ux
zdS3>S)(8B2w35#{M?}g46<B+JpF+s3qAK|HO{3|m56kSmb0_MKs;Yca6DW*qI4EB9
z2a)lj(U*GlzIe-Nfei@roDjuTX4rskrNO1LtiPZ1n|Sp{?{r#xLJ9FZ^N^Xz@#$s6
z`8~EBL!3O4clWy%$AK#g9iK=SWu0!&f@n}N+=A+#08lgS(C3FRBP+cARrpAaotcdG
zv_k;wD)z3YQ4AOK7&=Yrv-*dOio($TN3-U=+BtzkjaI{rV1fpp)W5b8pn_Hv51G-z
zODv3g7rfVF6jsF(#6-VXso1&=nQE+Fj^y9rhD6eUJ6sS`Zq8ComeLAdlVog{BtWpI
z%iUxTry)GKHs`)#X88J`W&{<kJqF0}4vDZK6(Z$eSCtpSm@2b9+#21yobhV2UcCiV
zc;7|pP|$3HU)i<ueI<2SzUSrWuE)WNk7I?V@PjBJ6uAHMsPe+{6Nb7sMYJsl^qpxA
z8aPU(#|ci`Vcz$i>sMZ_t=}sU725wVw6tqNbmqLm+@T~Wt7NCml7J`A6zv<9+a(YW
z+o57<{MwS?9CS@Wj;HmyN<2tI%#93yROecW_)WA`7yWx)R{NBnJ`vNyv&swlPAIX(
zr(Czqbb8G3)vK((F3zul0zk@tmgGo~M$Y$3M&J07Em9IUPF&@<gP77_EoqW$d0PPK
zA~Gd*!$0&M*pxk6_!btk6Q+KY6+YXUCWUOpoXac{ymJM+n)K2@b~c@()3wzi$KL#g
zY^|hIhuTXacB>W>+Fi?wa-hG65gumv`m1Udu)m(NiJsLavCFl1s=mn5bSABZ5ape&
zik_i-Ek7XX@*Ssp{b2gqQkWtA*ycTPPvq*eE0-ggFHC{y+mD#7-8e}mI9$jU6)BB=
z(BZ^ZK65iS_`NHL%0o0j^*E=ArIRW636`EQtjASlzGJ;l(sxcK^Ihe75ouliZr1$#
zu}4GZCj*D?G<Ac5B$?!TeWxBUX%`yBH8x*J-L-Xfnhw!xN*%w>di>8xSapEavrAJ=
z)&B3MtjgbMz6xe#eT;erv%<zK+`{0l`*hD62s-s!5Bo}Md#XpYjD57OchpJZM0O?_
z^-q`gWl7!E`Gr{8U4wrjir<5$Rc^BzeMa8wLmd9LBmPd!zEF<c;#!|QIPk1c=4ZDt
zk+v_`GM4K;n0XSIr8O{F(I@zvnclx!xx~=;!90sTz~EnYGubQVVm(~x9uJm$<!WB|
z{FkTgEP=}{2ZbNe*yb?KkL-zho-o5o{Mns0piHubwMa$%(P1oZ;Ae1o=|(<e&9m(-
z9o@rqqVFU;Q=)3MjOs^*-4_=;a%fT7FN<7XU1Wa2D)3@Lg)iHihVqDLSdiP`2B-R^
z>xg^~8+UXae972i8pAaB%xn1kD6)Wzt6&%Zm8D_44r0qG@gdA7k5M2+i8GFmP270%
zsS$PHRS%Nik}qqECC@R$KvvXoY?d&@vs^j(ovO#r9+j&vx|`*0Vx=;;XQ+R#(bZuY
zS7s2ly;6SA;`g~T9@n<#YP*Ap;zC!EKp?_8^>_0wx$GIeHV`T@k5dOW`k?Rsuuu+F
zcq$u^9$0v8AhD#i=|XJ%B-SH9S>2Nb=qg{n$%4gR!N)q3Kf3ANX|H|f))?Q39_pB5
z#5FPKb)6fTRzJa2D4=3s^<Q&Pg3a}3587<WjpfzP>Hv@_o;%`XTjkg*Ft(Yn+`~2)
zy&t%X9{d61cQv6iPM6g8_)_+LO#vB3{E?X8rJ=(d+jqjSl3j#hO4B&h#CiT@jLZ*C
z3f9irO<E$yEgY(^DDXHf`68jyJJI5C$d~74x1?oll286UCOvcc9Z@*;YBe=T@Y=>G
zZ*D3M8_XOcE0`WUsYMl&!RC1xK&BmGs(%Ne$loX)Afl|QMa>sXxasV8EeX`32s*#)
zuzISPq?W$OTZr^kSR~{yX`0aid(Eu?)t=5f#A&Jj*=RH_s<B?({qTz1;H3#C{3-ZB
z8CbkF1r;_m4Rw!Xa%A?`>uaY{2gfIlpOUM(Fif3(GSV2hawy64)b8uUFD5_)YLw2>
zjH#g)_2X5YU$#h)zn^CjwyT@@ko$to_tZYR<nL3;Po0j7O44kf*yM|@@h=$1WN35;
z?&{YECtkYkVXr7_k@8|kups2zoK}~tXt7q;kv8AmEHz5Tcy&zfm@LpdFYoqoxZ^V)
zX8G&P*x1Gr-+@hCVkatTmRZ@ZVthabXRj|NXbZOVQPo|I|MF_q?e8<axSsW}ukycj
z!R4~7maT9-7zy5??a3Awg!Rxmq75w@S5f~(E?s|m&Wr1oJOl|eL(Q&Nrwm<+U^V(#
z4-cHXm>BOpcslfo!%6Fav5{B)0T(9Z(4bhy-=^>HaQ&HFxe=l#K-Tn>oDo74=|7Qw
zE9Z$Q^7CV3!TbDo?gAgwpMEEPJs*k5#YqhA%CFoMe;akRW9F*3p+cQ?V-LG87mHwS
zm;qc6^aGYT;}8SgxgT*EZCM&$SQ=zIryp3zwM-XtelD>u<InrJNa|49FS(NiENep#
zy0s20s!*|38&CGgG+PO#hz}*zt`o#3HrMU-KVi)D&Ekr|sOV^kFaC(mze|T)UJ%jg
zVU_iC2bAhg0~;cUU)VuS%GWlQ0gv-+`?^h44CY$N%Iyi$w<esT=bL)0^}f(hGvACO
ziwSR4pl4B7D94LV$5V%dOxE?;WcZT}FG;svuWj2gM3`nGMyA*&HSdSKlFpYGEWM>a
zLyA3JV*R0Zczb#O1PcsT5ox?`gp4nVziF!;(&lMx*m4Cq>Cd6}IP}vqKU8t^>4gak
zwnPs2ya?O%s6^`IWYCipv9BMXYD$~Fp^J(!n!$u~sF~f04QfTvy}b&N4n~m3LF)3#
zR2+((=8ho}qgIz`of~q=m{IaDlk8x`aH~c=i(T*cSlRRWBR_SSv~ZJ}%V*#|rRGX|
zzQW96+hdN+P>mAM=A^Kjbe;hT_;mF{tnFEBsaRdqW%Tv;s>ZMui|O;(Slp*g`D&G<
zViD4s63GYUcK8vrtl~$z&#V4m*To}t?LnL$)39uO_ve%eZZ_)8M|nP|>+ura)=clj
zp0*-#6T<334lNE|L4H;Qbhtmbq14$}!qnAyjtFId&v4z-P!2v3dr5&K^WN8=9yUpr
zI?4TRLZ4=3AFJ3mcaPo_*j960F0W&Lttj#)v0=&PDoWhp_2p5`+>Q43nqV5ErhP?@
zm*BovT#H*-Z>w=t+LlM5&i+l@xwvQ2Fx{q$r4wIkp6TpB#~+_$>ZBiFQb=0s%!&|9
z&5Dg3U;$(cFzr{fSfC*qvRLSPslYla53#y-#PiT#|B2}<pAX9XTqPv42#qD;A!>f;
znESOVCTz$W&K&Vkd+55hOLvlPg8B=-JGw3|or^!Z&&Qrh;jY|_9*2eU!0&`2ZRWNd
zhB2f4{_Lm9X5zRWUqm?E_WU(7Snch3U~#u(yRgFlJWq2;HtNhlO+ornp;+^&Ddpbb
zH4~Ej4<dO=h%4NEbT@D`!X4+P#IZFVxgXC@chaF<JLS&s`PH2#-mz-)UL;TACjCfD
zn1R~f4yM4w<ET9)I-|C>w{~RgcX3l^_E;sAIzu-AR7>H>OX$EokG7iuuugUXl1h%q
zt%u^U)^IH0q{Uu*`})4oO1Xs7jGY|sq`imwfXAtn)TAQ;-}F3Pj$!1uzmn#@-w#4k
zaC$dbrM|GkCpMbY&Rwi0zB$@<@j@O;bCKLe#CvkT?2oCTbEEIvC#($c$~0+tVqfC>
zV<=SIuxiJxu%GxXd;kG;u_`2m2X%}t4_jYs(jVBqJ{c@N6XOk_9kqY)Ch|Z->|`a$
z?Tywvmby$nNR<JrY`5<rd;_dSe>&<?CA%j3pg+Vza&WTyx>fL~{FekgNs|{B@V3P~
zQaU7C{f+FE0`IymZoO-sROY)M!BgG0rt(5uA(W^0BdRlFTL189Nco8#uPeycy1Q%7
zJE&Px_G!vF!KT#3NLE7o0`=>#fJe=gCEq?Ly%gHw!NGKvqQ9-glzT-kPdLmw2fmdk
zMj`Moa8Fdokj2X~ft4SYm#-9i{dfoQSd>IZa`yTszO^MCcYvAaT~>IwsySwPZ0KQ(
zQ^^SA1Esq^J^RYZ-K+DYwteg*n+rD=$Esj?5iqY_c1;xbNJx2BWx4C|p~fxcKtb|W
zD98hV4gCH~X~o-EZ$A8az!ZewWvT<?h-bSo$#ZJ#K$`k5Uih^6UG$fEJfEV@sBD*G
z92%9rf2Qy+>{dJ;=ex;t7z8d#NV2g{3GstK=?BO+q4*<*29J~f7XInk2}%f%!)~MQ
z+6pz4=5#QNw$)q}KlypqxAK0uA1~dyKM@KhF%O=toM^^5DLN)P*`tXp{%BEt-1$#g
z-=^1F2?XBC7KkR=xkKw0=Qx4lr;sEH`aui_T}D5*GtCowjsqi*fR%#=cU~`-Q?&i)
zIexw_`pM{5Yt&KhQE7=x4NWV9XOV2X?v*vsQVXY6msB<k+*4)5QKQqb!rg>{GCSPr
zqMHB8vpxv+0zJ&5$VCzeE`-kya4JZ_PNo4Ye%Ro6Ac~8`1u2ywrAk93mRKENKffd(
zpsG6$=SNCnYs3&w7#n??4NIt@@vjns@nw`eM4am1W}Ud5y(D0AwMgIhGTv^TD3$~;
zumRGl$Bbb|S@<c+X+ZD^*;Mw31b{95GLXcIdvZ#RdK1H=`!SVhu}Z-qdTQ-3{RaAv
z0jX0!UF^GiC=mqy=L0Msq&#_!mmm9Mt?&$Aq^UG1RT7H(UU(=w0sGq*sI_`?T@XWj
zAAiyF>snKm`Hn*-COE+(lO*`lf5QlaLI7si#gyNm#M{|${Iz>;vXIZy@TbP5zn$af
zqt~PXqMX0e%c0AVH`hby0^469`ZhUxeIDLlH+!i2FAXL6IDxdk!W4r+1E8i5{yctB
z*Bz?AS0)YPei0?tIKo0%V5{>42~V)VcGg>Or+xVmApzKSR{b<|d1W3;(yjih9m3yv
z?@uh;zuoeR`I;}D(f3sCH5D^-DebihW>S%1Ob$D^@S6TFq695}c(&OREUN2ac(mBS
zQvB0v^10B`JsA?W%6An@3=0(WDKuJ?>$mqFFj91DBjB6bmwX{cusKEI(Zu3fv_mHG
z_?9s(340`mP_UW`2H}Uso*S2;y5aa)`rW?kEWK#>t+Ir@#%jTA$7!u<cbJ5~3UVHe
zKgU8k^tnxTCU36M!Q`znRTIZFUU|>RowH#-W2d`bSpork_LBfl;n;kaJpn|Azx_MN
z%N_(j7AfY(k%nCj++~4U!gctvz3vz}0tPB0y1$<Zh0?Yn2D)p-aYFGIzY`wPtWz?}
zju*@K5q#=HBLIM-{=Bh)BiZ53Txxj|fQ5V0xvvfoXBm4B63#Bh8Dn2!C$CS#td^K_
zN4R1|Adpc+?-N6j<JeK{5j$(t!Y-Nhl1Iuk#_lO|N`~&0Fh>mg{dY%Yop@=Dcaay0
zy)b>+P!_*9U~vX^6^=h<JR+8cHkzpczx)V7U6|qyhiLL;C#AIb)j21y_5x0Um1;dZ
zjHheUM?1n6oI{h<aUzVfiNS$WN>guoF14_2vO@5EvXFY*7u^6@+A10H&dflbrvkdy
zP=_l^VF*@}p_Xhqd=#^Zvuxh?@TZ&sZ{YRE<*z41Wa0}3sHsiWu{T$4{Lb9-*MGjm
zyK^(Ov(StvO^<<M16t#CFnqupy{PpVqmv0?F%|4>07OBGh5G*YU&pIIVlG9UeOR50
zdpY+E0ng`H5;Dl(lH~gwqcp#B?XpLwHjZ;9uieXhCQl`{zU!>6O002@biC+(M{>Nc
zH^r?R`tSdSKHfg|4&nsm3p;SC3_iwoy9QeUbyLEN!~fw6ix6D;FFmJAI9Ox7v51$6
zu0pZ*bmGpw*hm#P2sT_|iX;Gw<kpmp%AU2n8v|j_Nv=@fX?P8oaC*t0Rfz9gS$NGI
zl2Ci>do&35eRhi~X@a0E#+Ja|rWS4=oJLaSb#?frg%V_8mMo`DSkY`jHl&OB<e)tJ
zofo7PqjddImg1#9k?&vjN8d~-)l3A-2=twm=`91GZomwB74uqVS12t9E5uUXyAQ6q
zhYM$);os%glw3wDNM@6vr>!JU$pyf0Ht&6Zmrg(AyIc^3aWbe-t5xG&-ZHXA{pik9
zn%79ERiw8jX1Rd@VT2`a?9aNQZG#AYtL1(UGCAHfl2=`L+H?A@QzPMN4JQJ1I}yu!
zk7Ehit!lt_2tFh#zblnmThckO9Cn$QH!*5mR!dVfCXO~sTqi!`NI+ZjWh?Dy<ec;P
z_t%vK6CSie&SfXqW)cm7Dw4jtQu!BvQ>T*sx1y#bZ-Mmmb?}GjXRvw^qwK_O-Iy}J
zJ9V9r)VCfU((%!>Gl4PWYf>I&J1Rw6wli@Wo3(!^7D-rdG|&Uubp(U=E0SgGaL2|P
zPj++M6vPUv6H<-kLA3aN&6CT1nYdT#iDreyP9<?5<~!jXsXUEBHldQFfv6n~U%lIz
zf`Pu4W?jDTYr|;NY*p0b;pWxuJb|6bl}y6}Z#}SZ!$wHSVm0BPhg58f5H4<v(v`So
zBX9HoGCLeS!rOZq8vW6pr9&EC{|lyZDI|U4Q!Yj4-rl@L>c-0Vyp-4{bLZhKD80ns
z2<owJYvGz&Df-A?h9lNAgdqvI<ZaK48>eAwU8fP!d^CL%sPgDa8G8<-LnDU=aa0eI
zzyo+oN`Apwi@5|K>>qMeccH@!YMUol3@N`0KjfJ)^915bMn|7Ajcg$zbYEfH4F1Ys
z{)OTzXC4>OYS$=I^WcX#8^RmQE0*y5##n_Z6I*KBJ+8*a62smgMro5`5}Qp39|yvo
z4C}c4Epx~#-3yaGxmQo_C~faJA!dB+Q9~Y7ZF}#fUZ+S*G~LmVX*38~CjIfsG_5R?
z8LW3|cL`!1$t;5sxHBc-z{<V5*es6Z;#e!`X{ccZ!8L&8DsxImjKqC3Kv;aRCr*+t
z`y_0ur8000s~=9qpJP>?&=UNW&VTp=QTg1YitxHr#)d-1=DV+X`?1k_(NLhQAulzY
z^0G^>Rod;eFJ{A3FNV5nH}&u2Wn?8yfB^%zq3YR4+|SL$Y>31$@K79}9^-iVUGUte
zrT8R!Jtd9VcEEx6AM5ljZLy>j`_M|PU*`O|J=K}5xDHDFoU^RLppHj7%>^PMtaBhB
z%_jqB2-r?+x+Vhu#UUkmnDM4NYnCLmo>mC$u_+i$>1+}T*3C^oZ-j0|<wzP-2pW2$
z9THUekd(ii<7T#e*MG_O73qr#Q0>^)`1t7A6TX{_9KQIq`D^v1s^grkw9v|yHdu|!
zX`c|Afk0(2*d3OJS}m*<8sp6oyDiM2#cT`qaQ6gjnaS6+QGW~d`M8$K@y<5?4oZ>b
zUW;9s%bl&=wvEf29U^}B=i-P=dylfSHNW?cn5XZWL$PigA;}+za}>pG-)RaMHEOZ}
zmv)u_!GwH=r~+AhRLNKRU)o;9XW`Vegvd4fmKZ`@oTTKE;$%?Ou+Sm`Ff_wtzyU&n
zB>M8)GkDTsr_{_+bxlkbFdEK~+SIR{OU(x3Tms@f2fxC8t7AW!d(S3k@p_31^6Lz3
zK{y<eDq+s%0>_;ke3%<^pFODR0>QZ-1y7E9e(O?~-K{0-)o54arl#%RGK>&9Sa7+V
zGJsDGOlui)^_n5B3P~DE@3Jbrw91NoTG~f;J<V$0<!r93BFxZ$?9D`9ObDKWFS<Rw
zlyvmRp<Y<ee?D4oENKd{AHdWm5u%F=8?l--4f<*pm!v9%LkJ;H1R(eCuUM5d=<J=H
zbqVt-es+`UNZQD{t9t}2seq9gV|>(aL-?CB0++<wAGx_C-g6WOuDSW@+7w(Z6(FC5
zB^A$f=H|PI*Z=IelycVDc<)Ar!<inB+qgd)Y*Ia7Mme2~n773WoN~YIkpaxN9oXNq
z69ArfsvR8u!ND2^P5D9i$pM&8hP|Y02uC|F6Ccw~Vdwt+;wx*o;ocv<1UZsH{ws=2
zP9hQ#l3OD#2@?z9m#&is(%31#A+{%B3B@#v?a@|<NkDLn5_=shq&30dylw6<j`x3`
z&&gjmlqk?#w6b&E!*`i=Y;MxQB>EVF>9(=>KvGf|IS)s)Cb~(Fy{nxN1aez$>%{-F
zI%gSJJ>#}$D6@WB*EmtYSkmc?WC>;oCny6w2M1mf?~<c-FBzcw0lf5Esnp<Boa~qa
zyO8-ZqFDdmdn=NHzL<h3_5_9gIVOu2g%1w&)I_xJoGqqZj(SuR#x^w&I`Hn^S^x_m
z5>+N>+_mYI0C>79^DC?!RVdLxhS58>rJ&O>t8xaK_K+kaAp1{{`%GLbT=HCb7{b6B
z3;EyKl8y1RRn^v=roTJpW2@UzpCvPURk1SAgz;{VuQL*2z-lP@e`XZ?0Fk_IVRbaT
zAWQJ}<XAMPuGx2}$62g}EmlaZr3vs1=F7GK%#&kl^EZCo=Y?j1;hpSr7tIcqZ8fjI
zd*Jeptj4LvDD+*&rMfTdhp}V0<vq>-I?8<iJFVL*-gtW@&xmm;-;TT^E(j9`(t9t7
zU8~tn3ogLC3ZK(VSf0<B_;;{SF`cnLBjMBUYO42RuhZ9S3@F4)fNfDGe)->9m^#8g
zX2g26*(>XUAwoHZcU~X$${2B32~ow5Sk-lY##h@!`taZT0=-OAtZL?OQ6Irq4WhG1
z`z0QZvC57ASXa`Z8~5KiD!*y-mYmObpz(in!+iU`s8`kjpFTPHrxlvekr-=?hgAOa
zk(7u8Z^_XYivo%H(-L-Hh;B<X$|MBasrG30O9VxCaeAj74b;`CW^;X9=OyptMIK!$
z%OY>Lf7=$}kFKU;UJggF6{Fq?6D~0Jyso%^qoTa;T5I2-AVCET061@AZCqpMnfQO3
CAgN>k

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-1@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/hitcircleoverlay-1@2x.png
index e611add3ba9861baf68614ec51d63d3f94c8592a..3b5e886933d2f7a8803a44304c5439058ef86fa2 100755
GIT binary patch
literal 40858
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
U^GtX>4gf!<m#-R@=)2(m2kI%UfdBvi

literal 119975
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
E0Oy=DQvd(}

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-end.png
deleted file mode 100644
index 60e2d3328f89df794d7b894fd2f6e2dfbb44ba82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2095
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
ZzyR4Xd;=*Q?iv69002ovPDHLkV1gL3>M{TT

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/old-skin/taiko-roll-middle.png
deleted file mode 100644
index 03ebd1904875ab54fa71cbe948304fbb6266d69a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^j6ht&!3HE(th_Z1NJ*BsMwA5Sr<If^7Ns&crsOB3
zDtP85rl$s_CZ<#to=mj?D$?_GaSW-rmGtBPe|u(OW&s5b0RuL{{})vhSj1!(AJJe`
mnsM{yP3eNAb2c+DvN1d<;HnQh5Offzlfl!~&t;ucLK6U8&?-Ox

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-inner.png
deleted file mode 100644
index 27fe5a4e8d16eb92aa3342865479515ab0788ac8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1926
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-drum-outer.png
deleted file mode 100644
index 87ead80a08146adfa553d242f315f764a467506e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3749
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
DZJ4!X

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-end.png
deleted file mode 100644
index 778c231f20ca9253e64ccffb64a0aa39a3b97a76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14570
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taiko-roll-middle.png
deleted file mode 100644
index ce79780fda8e5de5e89a958e4b7000ab6c6de7ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4791
zcmeHKX;c$g7LH(p(ux9tjet`G6_u`}vXe;I0!nNHVUa~asiZ0pAPY$$5p6&O7qqoO
zL1h5N7IjomN6~S?twB@}+YLbh6~!GCH*jg4mw<|A`j6*K|05?=sk+Pe?)~n4_v9@X
z`%fEgHpYxZA`KV%`2>MqBXIQ$F#-3}$2qe}Bx9SDkZ>XhO@`DOl}w(1L&SVF4&gev
zj6~91FU^~sZ|^u{$;~L=d<e>@-FvifjRW@PO~sSqhxKllC4YQ=R{FxYtggrRhk1x6
z&Kf2>uRY7%yd~ExjBsl$?aY^4?}+O0OK})+d865=?}9qRE=>DK^A9jSxc$LHXF+TI
z(#Nj^!kS~pZFv@FvtwVqqlK(;y#3DD!T8mj(7Ni57nbFTwTzGc#>IOI?(RlEb}7%y
z3G1=A=Qz%y?95Ql1}Cq{JpAAgGq~hJ?#1jz+LFwLdD~(pxiq<4d0BdC?!}asr>2xu
zP4jKdE!_CLw#)PFYp>$eo_+W4ZmZdS=T6m_w%M<*F=Dz8U0XTx%G#Vq3vFJ7pX>B`
znz5q&y0Ld{<89joXB@-e?W>|%_E@JRba^X6mMw}8+U%b<;TPDBmAPIwm`$v=s~t<w
zD9!B3{gXv(aYtKp6Z`eJ_bamw+_0S8*lJ%q#Vc><=^??#qJB?yt~<2KDDb_Xdz)m=
z*{MIQXpSo}Au|JllAL=2Z+@?E8anIDa~}D-<&{dSb(d;HkllXIK*y&HzlPO=whSq^
zKKW}pX?xB@yjfH?HPeSjnweRj+ha5+sC^a0U5@QZoKsG#j@|ih`V!;Qi5nJWwk@=6
zywyA?bb9um(zAP)?#P}n^L*T+S^H&YC&kw{JwH5Z=kn6%xTd=1?3tqj%8Of?D|K+>
z;B{N`BX{X0m4^20+7n4T;$70Pf_msu>FsmtqEhpAvJ*Du7aVBbHQ%LdUgxF6w3p3g
z3#gUmV;ZMB4R@H|_$+X0QDa>2sTsjB#q6K+BQ{=nV1J|g?eI8ad)I`DQ60kJzsW{e
z?Ju{Asw1rwkVhWOBH0y;-uGawB~`N`;>Z7d@UiuJBx#Ua7@uS=OS-f;>efFWkh|wL
zXOxaszTbWKly|pClcsr>J!|gqk^{?IwyDRn%=~Yz*H)}GJyjIk*}b{J_g+<rZ_3g7
zjJb{pb(7hqd9{|F4UJQp%PG6I`SVP2D?X%7-%UR{;{DF|2sT8+KJD#f6X$#HL`76r
zZGMT_p(Ek`)Y}}zq4xAWp*F)wq(PZ-fj}%22tMr)urCUK&f)w0?rC2=H@I{%Y;Kd&
z_G<|*Vx)EAmC2(@ytiA=N<t2$daqeBuDUu<4ZHU24Np=hHe5Y9bL3zT&&a64QBhl}
zK90|_p^dfgzSB}!(=x>~He`L=ykCrW$ZY@R6Iq9aRiAK4af}{mk%`G3X>-?R-tRfQ
zboK6JT5<c&ofj<5wTn!8eA*(m+SzoObiLeKs%>>P-<MnH<nBC{@gSpWb!1p%>YYd;
z{MH84si?r&+-gO&c_?pv-mpAfwrfE!>)dEM<-V&bG1P_CaM(EwMRu3{s4cpOScX?w
zj$0-c3v8{!mtEYEBO&{~OB|6_)%DZepffW~oNA1Ah#jY-KJ(~lDT`QNs9uwixanQ>
z0gtKaCn$gHy79VuuYwam`p8h1R{VL@1bHD$sVwtdo&G^_tL<>vqy;D1&5@T|YL`6m
zOD*s&AsyX#k%KQ<G<%ckd`DTu>dU5(C~CYaeX$^VzhBeiu}?c6KIyp0DEp8~8h=!?
z>`IaM4lv2=<zQlki)QeoDg_0_R1%z`Q>ej2Baz%ZbZS%@j}wptkC7|+<fliDlOZ|A
zCx@{_h)6BKW95D+8az0~KSY`mFXdun4|g*+9S;B~Z~}#NiUg&Wr{j|ixIFNz7gNcQ
z!GwtClfy+~NTAZ-5R<~BAh54aK95dzH-p?Xn2Z<XGqn!_yz$Ag1fk|psmaO7lw<})
zrHP@^xLht3p;PH}7+ApC`AP!S!Ah-@9-<e+2iHn9ay21WDIq;3Dp4g7d@>p6p-=HC
z)FRPmc%`<F1;7VYhpMSG3PM#VsQo>(gzr26(ihNQdT2wy;HL)RT2+!piu=yPm4s7&
z2u%9fU!9~$Fr<S?sdxge0H#{7D($N!rwK*k&mMXTV&n?7!3&W6l_epUeIe_s*z_7h
zI{gCy?w@hLvi_92!5CPHL_8mrG)W(x(1%afug}9&QaQ#mJaRF*gpRq=V2tC6!%PmF
z4x<tY9cI$mC|infrCe8fKPaJ6OQ1?Au7?8P6gj{_*i1H)OOwGe1YyBUCW8xefdJ;<
zn1sb*aA+6}>jx2_k%O*86Z%J`hr$39Q_7IB*c=pQ(ojTyW5Xya!(dmA%$3b_#iUG`
z!~lg!c~eyy1q#Y3SD-OCRjrIMDD;H$yu?C2nNC5zNW=*!Ap;J4vIvzz0l{B1A#w#C
zOrUx?X>2Y7d|6x$i_T#p{oF%wjTW?`9+ZYq7`+;OU3efHz$~h7Q~+Rr1<CLP8XP55
znh=#Lflt=Q1nE5u{SCSGR>e=Q1s3!5E#KGl!FXctTkjr7kQ-DGWawKSD(ziFi_XJ)
z`2>EwDrqdLjKRSM@9U^fa`|6Wi_4a<FqV`J%UDcMX08;4QJlqqr3j0INw_G3&Se|Y
z_>8Vq$%tfBgL}n*OhGoFgACa~6MMOw^tE|%EUqUCp)+8F3nPpWgvO(@c?^yV!r%c?
zseKt!_51o$%5K#EA;ryL&~Fd`zg`&_FkoI$KM$-v()2w3ji0_^{EaIB=z&GPiQfUb
z2I%@G2ENI7pt}a>`X&ax$#|f<{%>@deL3>rO7J%*860T5hF#tc4nroApQia3jzy$5
zf+K0*X{g#SLQ5ijZ>7HmkqQcb076qjDDpMEKh(%(%=pFT*WH0APUzzm;#bqrKr>56
zhGpIM$UX0*v%7FD-a7ja2C=q&EM#7?__wRH4emx%TdSTBGT9})pvh#@33KQKEt*v8
zcit;_`my~LGLl4=Hp6_d(IQXi*;`6?t3&CiY4uHk@%RT*@vSkg|0uF+Pjq-OtMYY@
PK2D*pzfZY$bjE)HM$sIi

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png
similarity index 100%
rename from osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle.png
rename to osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircle@2x.png
diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikobigcircleoverlay.png
deleted file mode 100644
index 6dca33317131cd69ef449c0a6c0122f0f39cd84c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 66280
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

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircle.png
deleted file mode 100644
index 5d8b60da9e79009e8b3e78b2003d883974b139a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12374
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
Qd;A||`ImC#G8P~IA7%MrKL7v#

diff --git a/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png b/osu.Game.Rulesets.Taiko.Tests/Resources/special-skin/taikohitcircleoverlay.png
deleted file mode 100644
index 2626c394dcdccdb7d74da5460ec3f6d6570ad9a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 66281
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


From a9b45c6fdcba03437cca43f9613f85c60f98c0c2 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Tue, 19 Sep 2023 01:31:26 -0400
Subject: [PATCH 0620/2296] Fix slider path calculations for edge cases

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 05960ec416..cf6d0d212b 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -261,10 +261,14 @@ namespace osu.Game.Rulesets.Objects
                 // The current vertex ends the segment
                 var segmentVertices = vertices.AsSpan().Slice(start, i - start + 1);
                 var segmentType = ControlPoints[start].Type ?? PathType.Linear;
-
-                foreach (Vector2 t in calculateSubPath(segmentVertices, segmentType))
+                // No need to calculate path when there is only 1 vertex
+                if (segmentVertices.Length == 1)
+                    calculatedPath.Add(segmentVertices[0]);
+                else if (segmentVertices.Length > 1)
                 {
-                    if (calculatedPath.Count == 0 || calculatedPath.Last() != t)
+                    // Skip the first vertex if it is the same as the last vertex from the previous segment
+                    int skipFirst = calculatedPath.Last() == segmentVertices[0] ? 1 : 0;
+                    foreach (Vector2 t in calculateSubPath(segmentVertices, segmentType).Skip(skipFirst))
                         calculatedPath.Add(t);
                 }
 

From 0360646e9b8858ef52ab4ad5599a32dbdc3ddbb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 14:38:53 +0900
Subject: [PATCH 0621/2296] Avoid fast fade out if slider head was not hit

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 09d98654c3..1a6a0a9ecc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -317,7 +317,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             switch (state)
             {
                 case ArmedState.Hit:
-                    if (SliderBody?.SnakingOut.Value == true)
+                    if (HeadCircle.IsHit && SliderBody?.SnakingOut.Value == true)
                         Body.FadeOut(40); // short fade to allow for any body colour to smoothly disappear.
                     break;
             }

From 4504c9fc43f6783d07041275a40d3fdff29d8f02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 14:42:07 +0900
Subject: [PATCH 0622/2296] Update tests in line with new slider snaking
 behaviour

---
 .../TestSceneSliderSnaking.cs                       | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 630049f408..aef7dcaa59 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -135,9 +135,9 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
-        public void TestRepeatArrowDoesNotMoveWhenHit()
+        public void TestRepeatArrowDoesNotMove([Values] bool useAutoplay)
         {
-            AddStep("enable autoplay", () => autoplay = true);
+            AddStep($"set autoplay to {useAutoplay}", () => autoplay = useAutoplay);
             setSnaking(true);
             CreateTest();
             // repeat might have a chance to update its position depending on where in the frame its hit,
@@ -145,15 +145,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             addCheckPositionChangeSteps(() => 16600, getSliderRepeat, positionAlmostSame);
         }
 
-        [Test]
-        public void TestRepeatArrowMovesWhenNotHit()
-        {
-            AddStep("disable autoplay", () => autoplay = false);
-            setSnaking(true);
-            CreateTest();
-            addCheckPositionChangeSteps(() => 16600, getSliderRepeat, positionDecreased);
-        }
-
         private void retrieveSlider(int index)
         {
             AddStep("retrieve slider at index", () => slider = (Slider)beatmap.HitObjects[index]);

From 046e96afcd9ce4c32fcf2a7c1bcaafe9ba811782 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 14:51:03 +0900
Subject: [PATCH 0623/2296] Apply NRT to slider snaking tests

---
 .../TestSceneSliderSnaking.cs                 | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index aef7dcaa59..13166c2b6b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.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;
@@ -33,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests
     public partial class TestSceneSliderSnaking : TestSceneOsuPlayer
     {
         [Resolved]
-        private AudioManager audioManager { get; set; }
+        private AudioManager audioManager { get; set; } = null!;
 
         protected override bool Autoplay => autoplay;
         private bool autoplay;
@@ -41,12 +39,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         private readonly BindableBool snakingIn = new BindableBool();
         private readonly BindableBool snakingOut = new BindableBool();
 
-        private IBeatmap beatmap;
+        private IBeatmap beatmap = null!;
 
         private const double duration_of_span = 3605;
         private const double fade_in_modifier = -1200;
 
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard? storyboard = null)
             => new ClockBackedTestWorkingBeatmap(this.beatmap = beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
 
         [BackgroundDependencyLoader]
@@ -57,15 +55,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             config.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
         }
 
-        private Slider slider;
-        private DrawableSlider drawableSlider;
-
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            slider = null;
-            drawableSlider = null;
-        });
+        private Slider slider = null!;
+        private DrawableSlider? drawableSlider;
 
         protected override bool HasCustomSteps => true;
 
@@ -150,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("retrieve slider at index", () => slider = (Slider)beatmap.HitObjects[index]);
             addSeekStep(() => slider.StartTime);
             AddUntilStep("retrieve drawable slider", () =>
-                (drawableSlider = (DrawableSlider)Player.DrawableRuleset.Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == slider)) != null);
+                (drawableSlider = (DrawableSlider?)Player.DrawableRuleset.Playfield.AllHitObjects.SingleOrDefault(d => d.HitObject == slider)) != null);
         }
 
         private void addEnsureSnakingInSteps(Func<double> startTime) => addCheckPositionChangeSteps(startTime, getSliderEnd, positionIncreased);
@@ -170,7 +161,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private Func<double> timeAtRepeat(Func<double> startTime, int repeatIndex) => () => startTime() + 100 + duration_of_span * repeatIndex;
         private Func<Vector2> positionAtRepeat(int repeatIndex) => repeatIndex % 2 == 0 ? getSliderStart : getSliderEnd;
 
-        private List<Vector2> getSliderCurve() => ((PlaySliderBody)drawableSlider.Body.Drawable).CurrentCurve;
+        private List<Vector2> getSliderCurve() => ((PlaySliderBody)drawableSlider!.Body.Drawable).CurrentCurve;
         private Vector2 getSliderStart() => getSliderCurve().First();
         private Vector2 getSliderEnd() => getSliderCurve().Last();
 

From c0f603eb0e4007cf8a35e8af4e25d9e01441b1ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 15:27:55 +0900
Subject: [PATCH 0624/2296] Fix typo in comment

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 07dc2bea54..f80f43bb77 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Tournament.Screens.MapPool
             if (CurrentMatch.Value == null || CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) < 2)
                 return;
 
-            // if bans have already been placed, beatmap changes result in a selection being made autoamtically
+            // if bans have already been placed, beatmap changes result in a selection being made automatically
             if (beatmap.NewValue?.OnlineID > 0)
                 addForBeatmap(beatmap.NewValue.OnlineID);
         }

From 73db68a49a8226b57c2c41be024fbab946094fd6 Mon Sep 17 00:00:00 2001
From: Magnus-Cosmos <maximuscosmos@gmail.com>
Date: Tue, 19 Sep 2023 02:28:28 -0400
Subject: [PATCH 0625/2296] Check if path lists are empty

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index cf6d0d212b..0ac057578b 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -261,14 +261,17 @@ namespace osu.Game.Rulesets.Objects
                 // The current vertex ends the segment
                 var segmentVertices = vertices.AsSpan().Slice(start, i - start + 1);
                 var segmentType = ControlPoints[start].Type ?? PathType.Linear;
+
                 // No need to calculate path when there is only 1 vertex
                 if (segmentVertices.Length == 1)
                     calculatedPath.Add(segmentVertices[0]);
                 else if (segmentVertices.Length > 1)
                 {
+                    List<Vector2> subPath = calculateSubPath(segmentVertices, segmentType);
                     // Skip the first vertex if it is the same as the last vertex from the previous segment
-                    int skipFirst = calculatedPath.Last() == segmentVertices[0] ? 1 : 0;
-                    foreach (Vector2 t in calculateSubPath(segmentVertices, segmentType).Skip(skipFirst))
+                    int skipFirst = calculatedPath.Count > 0 && subPath.Count > 0 && calculatedPath.Last() == subPath[0] ? 1 : 0;
+
+                    foreach (Vector2 t in subPath.Skip(skipFirst))
                         calculatedPath.Add(t);
                 }
 

From 8e199de78ac57a7d9ed959378eb17df40c7354e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 08:30:17 +0200
Subject: [PATCH 0626/2296] Tweak nano beatmap card UX further to meet
 expectations

---
 .../Drawables/Cards/BeatmapCardNano.cs        |   2 -
 .../Cards/CollapsibleButtonContainerSlim.cs   | 237 +++++++++++-------
 2 files changed, 142 insertions(+), 97 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
index 2f46bc51d6..29f9d7ed2c 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
@@ -149,8 +149,6 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                 };
                 c.Expanded.BindTarget = Expanded;
             });
-
-            Action = () => buttonContainer.TriggerClick();
         }
 
         private LocalisableString createArtistText()
diff --git a/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs b/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
index d17ff0d759..151c91f4c1 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -17,10 +18,11 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables.Cards
 {
-    public partial class CollapsibleButtonContainerSlim : OsuClickableContainer
+    public partial class CollapsibleButtonContainerSlim : Container
     {
         public Bindable<bool> ShowDetails = new Bindable<bool>();
         public Bindable<BeatmapSetFavouriteState> FavouriteState = new Bindable<BeatmapSetFavouriteState>();
@@ -56,30 +58,15 @@ namespace osu.Game.Beatmaps.Drawables.Cards
 
         protected override Container<Drawable> Content => mainContent;
 
-        private readonly APIBeatmapSet beatmapSet;
-
         private readonly Container background;
 
-        private readonly Container buttonArea;
+        private readonly OsuClickableContainer buttonArea;
 
         private readonly Container mainArea;
         private readonly Container mainContent;
 
-        private readonly Container icons;
-        private readonly SpriteIcon downloadIcon;
-        private readonly LoadingSpinner spinner;
-        private readonly SpriteIcon goToBeatmapIcon;
-
         private const int icon_size = 12;
 
-        private Bindable<bool> preferNoVideo = null!;
-
-        [Resolved]
-        private BeatmapModelDownloader beatmaps { get; set; } = null!;
-
-        [Resolved]
-        private OsuGame? game { get; set; }
-
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -88,15 +75,13 @@ namespace osu.Game.Beatmaps.Drawables.Cards
 
         public CollapsibleButtonContainerSlim(APIBeatmapSet beatmapSet)
         {
-            this.beatmapSet = beatmapSet;
-
             downloadTracker = new BeatmapDownloadTracker(beatmapSet);
 
             RelativeSizeAxes = Axes.Y;
             Masking = true;
             CornerRadius = BeatmapCard.CORNER_RADIUS;
 
-            base.Content.AddRange(new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 downloadTracker,
                 background = new Container
@@ -110,39 +95,10 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                         Colour = Colour4.White
                     },
                 },
-                buttonArea = new Container
+                buttonArea = new ButtonArea(beatmapSet)
                 {
                     Name = @"Right (button) area",
-                    RelativeSizeAxes = Axes.Y,
-                    Origin = Anchor.TopRight,
-                    Anchor = Anchor.TopRight,
-                    Child = icons = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            downloadIcon = new SpriteIcon
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Size = new Vector2(icon_size),
-                                Icon = FontAwesome.Solid.Download
-                            },
-                            spinner = new LoadingSpinner
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Size = new Vector2(icon_size)
-                            },
-                            goToBeatmapIcon = new SpriteIcon
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Size = new Vector2(icon_size),
-                                Icon = FontAwesome.Solid.AngleDoubleRight
-                            },
-                        }
-                    }
+                    State = { BindTarget = downloadTracker.State }
                 },
                 mainArea = new Container
                 {
@@ -168,23 +124,13 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                         }
                     }
                 }
-            });
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            preferNoVideo = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
-
-            downloadIcon.Colour = spinner.Colour = colourProvider.Content1;
-            goToBeatmapIcon.Colour = colourProvider.Foreground1;
+            };
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            preferNoVideo.BindValueChanged(_ => updateState());
             downloadTracker.State.BindValueChanged(_ => updateState());
             ShowDetails.BindValueChanged(_ => updateState(), true);
             FinishTransforms(true);
@@ -195,51 +141,152 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             float targetWidth = Width - (ShowDetails.Value ? ButtonsExpandedWidth : ButtonsCollapsedWidth);
 
             mainArea.ResizeWidthTo(targetWidth, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            background.FadeColour(downloadTracker.State.Value == DownloadState.LocallyAvailable ? colours.Lime0 : colourProvider.Background3, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            buttonArea.FadeTo(ShowDetails.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+        }
 
-            var backgroundColour = downloadTracker.State.Value == DownloadState.LocallyAvailable ? colours.Lime0 : colourProvider.Background3;
-            if (ShowDetails.Value)
-                backgroundColour = backgroundColour.Lighten(0.2f);
+        private partial class ButtonArea : OsuClickableContainer
+        {
+            public Bindable<DownloadState> State { get; } = new Bindable<DownloadState>();
 
-            background.FadeColour(backgroundColour, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            icons.FadeTo(ShowDetails.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            private readonly APIBeatmapSet beatmapSet;
 
-            if (beatmapSet.Availability.DownloadDisabled)
+            private Box hoverLayer = null!;
+            private SpriteIcon downloadIcon = null!;
+            private LoadingSpinner spinner = null!;
+            private SpriteIcon goToBeatmapIcon = null!;
+
+            private Bindable<bool> preferNoVideo = null!;
+
+            [Resolved]
+            private OverlayColourProvider colourProvider { get; set; } = null!;
+
+            [Resolved]
+            private BeatmapModelDownloader beatmaps { get; set; } = null!;
+
+            [Resolved]
+            private OsuGame? game { get; set; }
+
+            public ButtonArea(APIBeatmapSet beatmapSet)
             {
-                Enabled.Value = false;
-                TooltipText = BeatmapsetsStrings.AvailabilityDisabled;
-                return;
+                this.beatmapSet = beatmapSet;
             }
 
-            switch (downloadTracker.State.Value)
+            [BackgroundDependencyLoader]
+            private void load(OsuConfigManager config)
             {
-                case DownloadState.NotDownloaded:
-                    Action = () => beatmaps.Download(beatmapSet, preferNoVideo.Value);
-                    break;
+                RelativeSizeAxes = Axes.Y;
+                Origin = Anchor.TopRight;
+                Anchor = Anchor.TopRight;
+                Child = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Left = -BeatmapCard.CORNER_RADIUS },
+                            Child = hoverLayer = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Colour4.White.Opacity(0.1f),
+                                Blending = BlendingParameters.Additive
+                            }
+                        },
+                        downloadIcon = new SpriteIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(icon_size),
+                            Icon = FontAwesome.Solid.Download
+                        },
+                        spinner = new LoadingSpinner
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(icon_size)
+                        },
+                        goToBeatmapIcon = new SpriteIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(icon_size),
+                            Icon = FontAwesome.Solid.AngleDoubleRight
+                        },
+                    }
+                };
 
-                case DownloadState.LocallyAvailable:
-                    Action = () => game?.PresentBeatmap(beatmapSet);
-                    break;
-
-                default:
-                    Action = null;
-                    break;
+                preferNoVideo = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
             }
 
-            downloadIcon.FadeTo(downloadTracker.State.Value == DownloadState.NotDownloaded ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            spinner.FadeTo(downloadTracker.State.Value == DownloadState.Downloading || downloadTracker.State.Value == DownloadState.Importing ? 1 : 0,
-                BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            goToBeatmapIcon.FadeTo(downloadTracker.State.Value == DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-
-            if (downloadTracker.State.Value == DownloadState.NotDownloaded)
+            protected override void LoadComplete()
             {
-                if (!beatmapSet.HasVideo)
-                    TooltipText = BeatmapsetsStrings.PanelDownloadAll;
+                base.LoadComplete();
+
+                State.BindValueChanged(_ => updateState(), true);
+                FinishTransforms(true);
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateState();
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateState();
+                base.OnHoverLost(e);
+            }
+
+            private void updateState()
+            {
+                hoverLayer.FadeTo(IsHovered ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+                downloadIcon.FadeTo(State.Value == DownloadState.NotDownloaded ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+                downloadIcon.FadeColour(IsHovered ? colourProvider.Content1 : colourProvider.Light1, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+                spinner.FadeTo(State.Value == DownloadState.Downloading || State.Value == DownloadState.Importing ? 1 : 0,
+                    BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+                spinner.FadeColour(IsHovered ? colourProvider.Content1 : colourProvider.Light1, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+                goToBeatmapIcon.FadeTo(State.Value == DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+                goToBeatmapIcon.FadeColour(IsHovered ? colourProvider.Foreground1 : colourProvider.Background3, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+
+                switch (State.Value)
+                {
+                    case DownloadState.NotDownloaded:
+                        Action = () => beatmaps.Download(beatmapSet, preferNoVideo.Value);
+                        break;
+
+                    case DownloadState.LocallyAvailable:
+                        Action = () => game?.PresentBeatmap(beatmapSet);
+                        break;
+
+                    default:
+                        Action = null;
+                        break;
+                }
+
+                if (beatmapSet.Availability.DownloadDisabled)
+                {
+                    Enabled.Value = false;
+                    TooltipText = BeatmapsetsStrings.AvailabilityDisabled;
+                    return;
+                }
+
+                if (State.Value == DownloadState.NotDownloaded)
+                {
+                    if (!beatmapSet.HasVideo)
+                        TooltipText = BeatmapsetsStrings.PanelDownloadAll;
+                    else
+                        TooltipText = preferNoVideo.Value ? BeatmapsetsStrings.PanelDownloadNoVideo : BeatmapsetsStrings.PanelDownloadVideo;
+                }
                 else
-                    TooltipText = preferNoVideo.Value ? BeatmapsetsStrings.PanelDownloadNoVideo : BeatmapsetsStrings.PanelDownloadVideo;
-            }
-            else
-            {
-                TooltipText = default;
+                {
+                    TooltipText = default;
+                }
             }
         }
     }

From 0555d22eb8cc5edd3eaf1ab20e63d474bc75194c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 16:35:22 +0900
Subject: [PATCH 0627/2296] Add comment mentioning why hover is disabled on the
 notification type

---
 osu.Game/Database/MissingBeatmapNotification.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index d98c07ce1f..f2f7315e8b 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -83,6 +83,7 @@ namespace osu.Game.Database
             card.Width = Content.DrawWidth;
         }
 
+        // Disable hover so we don't have silly colour conflicts with the nested beatmap card.
         protected override bool OnHover(HoverEvent e) => false;
         protected override void OnHoverLost(HoverLostEvent e) { }
 

From 7f30354e61d6d9fa8bc931b894f5040ff6d25c4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 17:20:58 +0900
Subject: [PATCH 0628/2296] Adjust sizing slightly to remove need for
 `CollapsibleButtonContainerSlim`

---
 .../Drawables/Cards/BeatmapCardNano.cs        |   6 +-
 .../Cards/CollapsibleButtonContainerSlim.cs   | 293 ------------------
 .../Database/MissingBeatmapNotification.cs    |   4 -
 3 files changed, 3 insertions(+), 300 deletions(-)
 delete mode 100644 osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
index 29f9d7ed2c..4ab2b0c973 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNano.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
         [Cached]
         private readonly BeatmapCardContent content;
 
-        private CollapsibleButtonContainerSlim buttonContainer = null!;
+        private CollapsibleButtonContainer buttonContainer = null!;
 
         private FillFlowContainer idleBottomContent = null!;
         private BeatmapCardDownloadProgressBar downloadProgressBar = null!;
@@ -66,12 +66,12 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                     Height = height,
                     Children = new Drawable[]
                     {
-                        buttonContainer = new CollapsibleButtonContainerSlim(BeatmapSet)
+                        buttonContainer = new CollapsibleButtonContainer(BeatmapSet)
                         {
                             Width = Width,
                             FavouriteState = { BindTarget = FavouriteState },
                             ButtonsCollapsedWidth = 5,
-                            ButtonsExpandedWidth = 20,
+                            ButtonsExpandedWidth = 30,
                             Children = new Drawable[]
                             {
                                 new FillFlowContainer
diff --git a/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs b/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
deleted file mode 100644
index 151c91f4c1..0000000000
--- a/osu.Game/Beatmaps/Drawables/Cards/CollapsibleButtonContainerSlim.cs
+++ /dev/null
@@ -1,293 +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.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
-using osu.Game.Configuration;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
-using osu.Game.Resources.Localisation.Web;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Beatmaps.Drawables.Cards
-{
-    public partial class CollapsibleButtonContainerSlim : Container
-    {
-        public Bindable<bool> ShowDetails = new Bindable<bool>();
-        public Bindable<BeatmapSetFavouriteState> FavouriteState = new Bindable<BeatmapSetFavouriteState>();
-
-        private readonly BeatmapDownloadTracker downloadTracker;
-
-        private float buttonsExpandedWidth;
-
-        public float ButtonsExpandedWidth
-        {
-            get => buttonsExpandedWidth;
-            set
-            {
-                buttonsExpandedWidth = value;
-                buttonArea.Width = value;
-                if (IsLoaded)
-                    updateState();
-            }
-        }
-
-        private float buttonsCollapsedWidth;
-
-        public float ButtonsCollapsedWidth
-        {
-            get => buttonsCollapsedWidth;
-            set
-            {
-                buttonsCollapsedWidth = value;
-                if (IsLoaded)
-                    updateState();
-            }
-        }
-
-        protected override Container<Drawable> Content => mainContent;
-
-        private readonly Container background;
-
-        private readonly OsuClickableContainer buttonArea;
-
-        private readonly Container mainArea;
-        private readonly Container mainContent;
-
-        private const int icon_size = 12;
-
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
-
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; } = null!;
-
-        public CollapsibleButtonContainerSlim(APIBeatmapSet beatmapSet)
-        {
-            downloadTracker = new BeatmapDownloadTracker(beatmapSet);
-
-            RelativeSizeAxes = Axes.Y;
-            Masking = true;
-            CornerRadius = BeatmapCard.CORNER_RADIUS;
-
-            InternalChildren = new Drawable[]
-            {
-                downloadTracker,
-                background = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Colour4.White
-                    },
-                },
-                buttonArea = new ButtonArea(beatmapSet)
-                {
-                    Name = @"Right (button) area",
-                    State = { BindTarget = downloadTracker.State }
-                },
-                mainArea = new Container
-                {
-                    Name = @"Main content",
-                    RelativeSizeAxes = Axes.Y,
-                    CornerRadius = BeatmapCard.CORNER_RADIUS,
-                    Masking = true,
-                    Children = new Drawable[]
-                    {
-                        new BeatmapCardContentBackground(beatmapSet)
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Dimmed = { BindTarget = ShowDetails }
-                        },
-                        mainContent = new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding
-                            {
-                                Horizontal = 10,
-                                Vertical = 4
-                            },
-                        }
-                    }
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            downloadTracker.State.BindValueChanged(_ => updateState());
-            ShowDetails.BindValueChanged(_ => updateState(), true);
-            FinishTransforms(true);
-        }
-
-        private void updateState()
-        {
-            float targetWidth = Width - (ShowDetails.Value ? ButtonsExpandedWidth : ButtonsCollapsedWidth);
-
-            mainArea.ResizeWidthTo(targetWidth, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            background.FadeColour(downloadTracker.State.Value == DownloadState.LocallyAvailable ? colours.Lime0 : colourProvider.Background3, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            buttonArea.FadeTo(ShowDetails.Value ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-        }
-
-        private partial class ButtonArea : OsuClickableContainer
-        {
-            public Bindable<DownloadState> State { get; } = new Bindable<DownloadState>();
-
-            private readonly APIBeatmapSet beatmapSet;
-
-            private Box hoverLayer = null!;
-            private SpriteIcon downloadIcon = null!;
-            private LoadingSpinner spinner = null!;
-            private SpriteIcon goToBeatmapIcon = null!;
-
-            private Bindable<bool> preferNoVideo = null!;
-
-            [Resolved]
-            private OverlayColourProvider colourProvider { get; set; } = null!;
-
-            [Resolved]
-            private BeatmapModelDownloader beatmaps { get; set; } = null!;
-
-            [Resolved]
-            private OsuGame? game { get; set; }
-
-            public ButtonArea(APIBeatmapSet beatmapSet)
-            {
-                this.beatmapSet = beatmapSet;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuConfigManager config)
-            {
-                RelativeSizeAxes = Axes.Y;
-                Origin = Anchor.TopRight;
-                Anchor = Anchor.TopRight;
-                Child = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = -BeatmapCard.CORNER_RADIUS },
-                            Child = hoverLayer = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Colour4.White.Opacity(0.1f),
-                                Blending = BlendingParameters.Additive
-                            }
-                        },
-                        downloadIcon = new SpriteIcon
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(icon_size),
-                            Icon = FontAwesome.Solid.Download
-                        },
-                        spinner = new LoadingSpinner
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(icon_size)
-                        },
-                        goToBeatmapIcon = new SpriteIcon
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Size = new Vector2(icon_size),
-                            Icon = FontAwesome.Solid.AngleDoubleRight
-                        },
-                    }
-                };
-
-                preferNoVideo = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                State.BindValueChanged(_ => updateState(), true);
-                FinishTransforms(true);
-            }
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                updateState();
-                return base.OnHover(e);
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                updateState();
-                base.OnHoverLost(e);
-            }
-
-            private void updateState()
-            {
-                hoverLayer.FadeTo(IsHovered ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-
-                downloadIcon.FadeTo(State.Value == DownloadState.NotDownloaded ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-                downloadIcon.FadeColour(IsHovered ? colourProvider.Content1 : colourProvider.Light1, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-
-                spinner.FadeTo(State.Value == DownloadState.Downloading || State.Value == DownloadState.Importing ? 1 : 0,
-                    BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-                spinner.FadeColour(IsHovered ? colourProvider.Content1 : colourProvider.Light1, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-
-                goToBeatmapIcon.FadeTo(State.Value == DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-                goToBeatmapIcon.FadeColour(IsHovered ? colourProvider.Foreground1 : colourProvider.Background3, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-
-                switch (State.Value)
-                {
-                    case DownloadState.NotDownloaded:
-                        Action = () => beatmaps.Download(beatmapSet, preferNoVideo.Value);
-                        break;
-
-                    case DownloadState.LocallyAvailable:
-                        Action = () => game?.PresentBeatmap(beatmapSet);
-                        break;
-
-                    default:
-                        Action = null;
-                        break;
-                }
-
-                if (beatmapSet.Availability.DownloadDisabled)
-                {
-                    Enabled.Value = false;
-                    TooltipText = BeatmapsetsStrings.AvailabilityDisabled;
-                    return;
-                }
-
-                if (State.Value == DownloadState.NotDownloaded)
-                {
-                    if (!beatmapSet.HasVideo)
-                        TooltipText = BeatmapsetsStrings.PanelDownloadAll;
-                    else
-                        TooltipText = preferNoVideo.Value ? BeatmapsetsStrings.PanelDownloadNoVideo : BeatmapsetsStrings.PanelDownloadVideo;
-                }
-                else
-                {
-                    TooltipText = default;
-                }
-            }
-        }
-    }
-}
diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index f2f7315e8b..bc96625ead 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -83,10 +83,6 @@ namespace osu.Game.Database
             card.Width = Content.DrawWidth;
         }
 
-        // Disable hover so we don't have silly colour conflicts with the nested beatmap card.
-        protected override bool OnHover(HoverEvent e) => false;
-        protected override void OnHoverLost(HoverLostEvent e) { }
-
         private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)
         {
             if (changes?.InsertedIndices == null) return;

From 62f97a8d83a5baa59da76cdcea179b6be500360a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 10:27:24 +0200
Subject: [PATCH 0629/2296] Adjust beatmap card thumbnail dim state to match
 web better

---
 .../Drawables/Cards/BeatmapCardThumbnail.cs   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
index ad91615031..5a26a988fb 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardThumbnail.cs
@@ -3,15 +3,15 @@
 
 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.Beatmaps.Drawables.Cards.Buttons;
-using osu.Game.Graphics;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Framework.Graphics.UserInterface;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables.Cards
 {
@@ -25,7 +25,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             set => foreground.Padding = value;
         }
 
-        private readonly UpdateableOnlineBeatmapSetCover cover;
+        private readonly Box background;
         private readonly Container foreground;
         private readonly PlayButton playButton;
         private readonly CircularProgress progress;
@@ -33,15 +33,22 @@ namespace osu.Game.Beatmaps.Drawables.Cards
 
         protected override Container<Drawable> Content => content;
 
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
         public BeatmapCardThumbnail(APIBeatmapSet beatmapSetInfo)
         {
             InternalChildren = new Drawable[]
             {
-                cover = new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.List)
+                new UpdateableOnlineBeatmapSetCover(BeatmapSetCoverType.List)
                 {
                     RelativeSizeAxes = Axes.Both,
                     OnlineInfo = beatmapSetInfo
                 },
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
                 foreground = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -68,7 +75,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load()
         {
             progress.Colour = colourProvider.Highlight1;
         }
@@ -89,7 +96,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
             bool shouldDim = Dimmed.Value || playButton.Playing.Value;
 
             playButton.FadeTo(shouldDim ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
-            cover.FadeColour(shouldDim ? OsuColour.Gray(0.2f) : Color4.White, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
+            background.FadeColour(colourProvider.Background6.Opacity(shouldDim ? 0.8f : 0f), BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
         }
     }
 }

From 0593c76c57436757e7da3ada6556c683396fdbfa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 17:34:24 +0900
Subject: [PATCH 0630/2296] Fix log output using incorrect name

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

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 2875035e1b..26594fb815 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Scoring
                 catch (LegacyScoreDecoder.BeatmapNotFoundException e)
                 {
                     onMissingBeatmap(e, archive, name);
-                    Logger.Log($@"Score '{name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
+                    Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
                     return null;
                 }
             }

From f726c38215b6ff35305969b7c7e79f89a25818f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 17:41:00 +0900
Subject: [PATCH 0631/2296] Pass `ArchiveReader` instead of `Stream` to
 simplify resolution code

---
 .../TestSceneMissingBeatmapNotification.cs    |  4 +--
 .../Database/MissingBeatmapNotification.cs    | 14 ++++-----
 osu.Game/Scoring/ScoreImporter.cs             | 30 ++++---------------
 3 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs
index 23b9c5f76a..f5506edf3b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneMissingBeatmapNotification.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.IO;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -9,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Database;
 using osu.Game.Overlays;
+using osu.Game.Tests.Scores.IO;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 AutoSizeAxes = Axes.Y,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Child = new MissingBeatmapNotification(CreateAPIBeatmapSet(Ruleset.Value).Beatmaps.First(), new MemoryStream(), "deadbeef")
+                Child = new MissingBeatmapNotification(CreateAPIBeatmapSet(Ruleset.Value).Beatmaps.First(), new ImportScoreTest.TestArchiveReader(), "deadbeef")
             };
         }
     }
diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index bc96625ead..261de2a938 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -2,19 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables.Cards;
 using osu.Game.Configuration;
+using osu.Game.IO.Archives;
+using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 using Realms;
-using osu.Game.Localisation;
 
 namespace osu.Game.Database
 {
@@ -29,7 +28,7 @@ namespace osu.Game.Database
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
 
-        private readonly MemoryStream scoreStream;
+        private readonly ArchiveReader scoreArchive;
         private readonly APIBeatmapSet beatmapSetInfo;
         private readonly string beatmapHash;
 
@@ -39,12 +38,12 @@ namespace osu.Game.Database
 
         private IDisposable? realmSubscription;
 
-        public MissingBeatmapNotification(APIBeatmap beatmap, MemoryStream scoreStream, string beatmapHash)
+        public MissingBeatmapNotification(APIBeatmap beatmap, ArchiveReader scoreArchive, string beatmapHash)
         {
             beatmapSetInfo = beatmap.BeatmapSet!;
 
             this.beatmapHash = beatmapHash;
-            this.scoreStream = scoreStream;
+            this.scoreArchive = scoreArchive;
         }
 
         [BackgroundDependencyLoader]
@@ -89,7 +88,8 @@ namespace osu.Game.Database
 
             if (sender.Any(s => s.Beatmaps.Any(b => b.MD5Hash == beatmapHash)))
             {
-                var importTask = new ImportTask(scoreStream, "score.osr");
+                string name = scoreArchive.Filenames.First(f => f.EndsWith(".osr", StringComparison.OrdinalIgnoreCase));
+                var importTask = new ImportTask(scoreArchive.GetStream(name), name);
                 scoreManager.Import(new[] { importTask });
                 realmSubscription?.Dispose();
                 Close(false);
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 26594fb815..b85b6a066e 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using Newtonsoft.Json;
@@ -55,36 +54,17 @@ namespace osu.Game.Scoring
                 }
                 catch (LegacyScoreDecoder.BeatmapNotFoundException e)
                 {
-                    onMissingBeatmap(e, archive, name);
                     Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
+
+                    // In the case of a missing beatmap, let's attempt to resolve it and show a prompt to the user to download the required beatmap.
+                    var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = e.Hash });
+                    req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, e.Hash));
+                    api.Queue(req);
                     return null;
                 }
             }
         }
 
-        private void onMissingBeatmap(LegacyScoreDecoder.BeatmapNotFoundException e, ArchiveReader archive, string name)
-        {
-            var stream = new MemoryStream();
-
-            // stream will be closed after the exception was thrown, so fetch the stream again.
-            using (var scoreStream = archive.GetStream(name))
-            {
-                scoreStream.CopyTo(stream);
-            }
-
-            var req = new GetBeatmapRequest(new BeatmapInfo
-            {
-                MD5Hash = e.Hash
-            });
-
-            req.Success += res =>
-            {
-                PostNotification?.Invoke(new MissingBeatmapNotification(res, stream, e.Hash));
-            };
-
-            api.Queue(req);
-        }
-
         public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);
 
         protected override void Populate(ScoreInfo model, ArchiveReader? archive, Realm realm, CancellationToken cancellationToken = default)

From cdb5fea513f06bf18eefc62a8b0d4997d4c8a91d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 17:53:00 +0900
Subject: [PATCH 0632/2296] Remove unused translations

---
 .../Localisation/OnlineSettingsStrings.cs     |  5 -----
 osu.Game/Localisation/WebSettingsStrings.cs   | 19 -------------------
 2 files changed, 24 deletions(-)
 delete mode 100644 osu.Game/Localisation/WebSettingsStrings.cs

diff --git a/osu.Game/Localisation/OnlineSettingsStrings.cs b/osu.Game/Localisation/OnlineSettingsStrings.cs
index 5ea53a13bf..0660bac172 100644
--- a/osu.Game/Localisation/OnlineSettingsStrings.cs
+++ b/osu.Game/Localisation/OnlineSettingsStrings.cs
@@ -54,11 +54,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString PreferNoVideo => new TranslatableString(getKey(@"prefer_no_video"), @"Prefer downloads without video");
 
-        /// <summary>
-        /// "Automatically download beatmaps when spectating"
-        /// </summary>
-        public static LocalisableString AutomaticallyDownloadWhenSpectating => new TranslatableString(getKey(@"automatically_download_when_spectating"), @"Automatically download beatmaps when spectating");
-
         /// <summary>
         /// "Automatically download missing beatmaps"
         /// </summary>
diff --git a/osu.Game/Localisation/WebSettingsStrings.cs b/osu.Game/Localisation/WebSettingsStrings.cs
deleted file mode 100644
index b3033524dc..0000000000
--- a/osu.Game/Localisation/WebSettingsStrings.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 osu.Framework.Localisation;
-
-namespace osu.Game.Localisation
-{
-    public static class WebSettingsStrings
-    {
-        private const string prefix = @"osu.Game.Resources.Localisation.WebSettings";
-
-        /// <summary>
-        /// "Automatically download missing beatmaps"
-        /// </summary>
-        public static LocalisableString AutomaticallyDownloadMissingBeatmaps => new TranslatableString(getKey(@"automatically_download_missing_beatmaps"), @"Automatically download missing beatmaps");
-
-        private static string getKey(string key) => $@"{prefix}:{key}";
-    }
-}
\ No newline at end of file

From 05e05f8160a73dd9f270147874ba0632897d2670 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 18:02:08 +0900
Subject: [PATCH 0633/2296] Increase transition speed slightly

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

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
index a16f6d5689..25e42bcbf7 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
 {
     public abstract partial class BeatmapCard : OsuClickableContainer, IHasContextMenu
     {
-        public const float TRANSITION_DURATION = 400;
+        public const float TRANSITION_DURATION = 340;
         public const float CORNER_RADIUS = 10;
 
         protected const float WIDTH = 430;

From ed9039f60f31415089be387e9075e6439099ee58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 11:09:23 +0200
Subject: [PATCH 0634/2296] Fix notification text sets overwriting each other

---
 .../Database/MissingBeatmapNotification.cs     | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Database/MissingBeatmapNotification.cs b/osu.Game/Database/MissingBeatmapNotification.cs
index 261de2a938..584b2675f3 100644
--- a/osu.Game/Database/MissingBeatmapNotification.cs
+++ b/osu.Game/Database/MissingBeatmapNotification.cs
@@ -52,14 +52,6 @@ namespace osu.Game.Database
             realmSubscription = realm.RegisterForNotifications(
                 realm => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
 
-            realm.Run(r =>
-            {
-                if (r.All<BeatmapSetInfo>().Any(s => !s.DeletePending && s.OnlineID == beatmapSetInfo.OnlineID))
-                {
-                    Text = NotificationsStrings.MismatchingBeatmapForReplay;
-                }
-            });
-
             autoDownloadConfig = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadMissingBeatmaps);
             noVideoSetting = config.GetBindable<bool>(OsuSetting.PreferNoVideo);
 
@@ -71,9 +63,15 @@ namespace osu.Game.Database
             base.LoadComplete();
 
             if (autoDownloadConfig.Value)
+            {
+                Text = NotificationsStrings.DownloadingBeatmapForReplay;
                 beatmapDownloader.Download(beatmapSetInfo, noVideoSetting.Value);
-
-            Text = autoDownloadConfig.Value ? NotificationsStrings.DownloadingBeatmapForReplay : NotificationsStrings.MissingBeatmapForReplay;
+            }
+            else
+            {
+                bool missingSetMatchesExistingOnlineId = realm.Run(r => r.All<BeatmapSetInfo>().Any(s => !s.DeletePending && s.OnlineID == beatmapSetInfo.OnlineID));
+                Text = missingSetMatchesExistingOnlineId ? NotificationsStrings.MismatchingBeatmapForReplay : NotificationsStrings.MissingBeatmapForReplay;
+            }
         }
 
         protected override void Update()

From 773ec469898c9d616c2211723ebb3a9742dc76c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Sep 2023 23:59:44 +0900
Subject: [PATCH 0635/2296] Expose some storyboard pieces to allow better
 testability

---
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs      | 4 +++-
 osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs | 5 ++++-
 osu.Game/Storyboards/Storyboard.cs                        | 2 +-
 osu.Game/Storyboards/StoryboardVideo.cs                   | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 6931cea81e..a11251ed22 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -23,7 +23,9 @@ namespace osu.Game.Storyboards.Drawables
 {
     public partial class DrawableStoryboard : Container<DrawableStoryboardLayer>
     {
-        [Cached]
+        public Vector2 AppliedScale { get; private set; }
+
+        [Cached(typeof(Storyboard))]
         public Storyboard Storyboard { get; }
 
         /// <summary>
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
index 38e7ff1c70..40842fe7ed 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.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.Collections.Generic;
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -30,10 +31,12 @@ namespace osu.Game.Storyboards.Drawables
             InternalChild = ElementContainer = new LayerElementContainer(layer);
         }
 
-        protected partial class LayerElementContainer : LifetimeManagementContainer
+        public partial class LayerElementContainer : LifetimeManagementContainer
         {
             private readonly StoryboardLayer storyboardLayer;
 
+            public IEnumerable<Drawable> Elements => InternalChildren;
+
             public LayerElementContainer(StoryboardLayer layer)
             {
                 storyboardLayer = layer;
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 1892855d3d..03e30d6272 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Storyboards
             }
         }
 
-        public DrawableStoryboard CreateDrawable(IReadOnlyList<Mod>? mods = null) =>
+        public virtual DrawableStoryboard CreateDrawable(IReadOnlyList<Mod>? mods = null) =>
             new DrawableStoryboard(this, mods);
 
         private static readonly string[] image_extensions = { @".png", @".jpg" };
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
index 4652e45852..8c11e19a06 100644
--- a/osu.Game/Storyboards/StoryboardVideo.cs
+++ b/osu.Game/Storyboards/StoryboardVideo.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
-        public StoryboardVideo(string path, int offset)
+        public StoryboardVideo(string path, double offset)
         {
             Path = path;
             StartTime = offset;

From 2f020f8682aece5fcf4b54f879c4492149485ff6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 19:44:41 +0900
Subject: [PATCH 0636/2296] Add test coverage of storyboard preferring skin
 when specified

---
 .../TestSceneDrawableStoryboardSprite.cs      | 176 +++++++++++++++---
 1 file changed, 150 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
index ec4bb1a86b..d20c7c2f7a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
@@ -2,17 +2,23 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Storyboards;
 using osu.Game.Storyboards.Drawables;
+using osu.Game.Tests.Resources;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -21,17 +27,21 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
-        [Cached]
-        private Storyboard storyboard { get; set; } = new Storyboard();
+        [Cached(typeof(Storyboard))]
+        private TestStoryboard storyboard { get; set; } = new TestStoryboard();
 
         private IEnumerable<DrawableStoryboardSprite> sprites => this.ChildrenOfType<DrawableStoryboardSprite>();
 
+        private const string lookup_name = "hitcircleoverlay";
+
         [Test]
         public void TestSkinSpriteDisallowedByDefault()
         {
-            const string lookup_name = "hitcircleoverlay";
-
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = false);
+            AddStep("disallow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = false;
+                storyboard.AlwaysProvideTexture = false;
+            });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
 
@@ -40,11 +50,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestAllowLookupFromSkin()
+        public void TestLookupFromStoryboard()
         {
-            const string lookup_name = "hitcircleoverlay";
-
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
+            AddStep("allow storyboard lookup", () =>
+            {
+                storyboard.UseSkinSprites = false;
+                storyboard.AlwaysProvideTexture = true;
+            });
 
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
 
@@ -52,16 +64,54 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("sprite found texture", () =>
                 sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Texture != null)));
 
-            AddAssert("skinnable sprite has correct size", () =>
-                sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Size == new Vector2(128))));
+            assertStoryboardSourced();
+        }
+
+        [Test]
+        public void TestSkinLookupPreferredOverStoryboard()
+        {
+            AddStep("allow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = true;
+            });
+
+            AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
+
+            // Only checking for at least one sprite that succeeded, as not all skins in this test provide the hitcircleoverlay texture.
+            AddAssert("sprite found texture", () =>
+                sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Texture != null)));
+
+            assertSkinSourced();
+        }
+
+        [Test]
+        public void TestAllowLookupFromSkin()
+        {
+            AddStep("allow skin lookup", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = false;
+            });
+
+            AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
+
+            // Only checking for at least one sprite that succeeded, as not all skins in this test provide the hitcircleoverlay texture.
+            AddAssert("sprite found texture", () =>
+                sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Texture != null)));
+
+            assertSkinSourced();
         }
 
         [Test]
         public void TestFlippedSprite()
         {
-            const string lookup_name = "hitcircleoverlay";
+            AddStep("allow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = true;
+            });
 
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
             AddStep("flip sprites", () => sprites.ForEach(s =>
             {
@@ -74,9 +124,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestZeroScale()
         {
-            const string lookup_name = "hitcircleoverlay";
+            AddStep("allow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = true;
+            });
 
-            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)));
@@ -86,9 +139,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestNegativeScale()
         {
-            const string lookup_name = "hitcircleoverlay";
+            AddStep("allow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = true;
+            });
 
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
             AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(-1)));
             AddAssert("origin flipped", () => sprites.All(s => s.Origin == Anchor.BottomRight));
@@ -97,9 +153,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestNegativeScaleWithFlippedSprite()
         {
-            const string lookup_name = "hitcircleoverlay";
+            AddStep("allow all lookups", () =>
+            {
+                storyboard.UseSkinSprites = true;
+                storyboard.AlwaysProvideTexture = true;
+            });
 
-            AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
             AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(-1)));
             AddAssert("origin flipped", () => sprites.All(s => s.Origin == Anchor.BottomRight));
@@ -111,13 +170,78 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("origin back", () => sprites.All(s => s.Origin == Anchor.TopLeft));
         }
 
-        private DrawableStoryboardSprite createSprite(string lookupName, Anchor origin, Vector2 initialPosition)
-            => new DrawableStoryboardSprite(
-                new StoryboardSprite(lookupName, origin, initialPosition)
-            ).With(s =>
+        private DrawableStoryboard createSprite(string lookupName, Anchor origin, Vector2 initialPosition)
+        {
+            var layer = storyboard.GetLayer("Background");
+
+            var sprite = new StoryboardSprite(lookupName, origin, initialPosition);
+            sprite.AddLoop(Time.Current, 100).Alpha.Add(Easing.None, 0, 10000, 1, 1);
+
+            layer.Elements.Clear();
+            layer.Add(sprite);
+
+            return storyboard.CreateDrawable();
+        }
+
+        private void assertStoryboardSourced()
+        {
+            AddAssert("sprite came from storyboard", () =>
+                sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Size == new Vector2(200))));
+        }
+
+        private void assertSkinSourced()
+        {
+            AddAssert("sprite came from skin", () =>
+                sprites.Any(sprite => sprite.ChildrenOfType<Sprite>().All(s => s.Size == new Vector2(128))));
+        }
+
+        private partial class TestStoryboard : Storyboard
+        {
+            public override DrawableStoryboard CreateDrawable(IReadOnlyList<Mod>? mods = null)
             {
-                s.LifetimeStart = double.MinValue;
-                s.LifetimeEnd = double.MaxValue;
-            });
+                return new TestDrawableStoryboard(this, mods);
+            }
+
+            public bool AlwaysProvideTexture { get; set; }
+
+            public override string GetStoragePathFromStoryboardPath(string path) => AlwaysProvideTexture ? path : string.Empty;
+
+            private partial class TestDrawableStoryboard : DrawableStoryboard
+            {
+                private readonly bool alwaysProvideTexture;
+
+                public TestDrawableStoryboard(TestStoryboard storyboard, IReadOnlyList<Mod>? mods)
+                    : base(storyboard, mods)
+                {
+                    alwaysProvideTexture = storyboard.AlwaysProvideTexture;
+                }
+
+                protected override IResourceStore<byte[]> CreateResourceLookupStore() => alwaysProvideTexture
+                    ? new AlwaysReturnsTextureStore()
+                    : new ResourceStore<byte[]>();
+
+                internal class AlwaysReturnsTextureStore : IResourceStore<byte[]>
+                {
+                    private const string test_image = "Resources/Textures/test-image.png";
+
+                    private readonly DllResourceStore store;
+
+                    public AlwaysReturnsTextureStore()
+                    {
+                        store = TestResources.GetStore();
+                    }
+
+                    public void Dispose() => store.Dispose();
+
+                    public byte[] Get(string name) => store.Get(test_image);
+
+                    public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken()) => store.GetAsync(test_image, cancellationToken);
+
+                    public Stream GetStream(string name) => store.GetStream(test_image);
+
+                    public IEnumerable<string> GetAvailableResources() => store.GetAvailableResources();
+                }
+            }
+        }
     }
 }

From 4a7dc4d7927aaba2b1f527e6b2939fa179189535 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Sep 2023 19:13:58 +0900
Subject: [PATCH 0637/2296] Fix storyboard `UseSkinSprites` being implemented
 incorrectly

This was implemented as a "fallback", but it's actually intended to be
an "override". As in it allows storyboarders to *prefer* a skin sprite
before falling back to a local version contained within the storyboard.

Can be tested with https://osu.ppy.sh/beatmapsets/832364#osu/1743837.

Closes https://github.com/ppy/osu/issues/24813.
---
 .../Drawables/DrawableStoryboardSprite.cs     | 23 ++++++++++++-------
 osu.Game/Storyboards/Storyboard.cs            |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 379de1a497..14132654d1 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
@@ -74,6 +75,15 @@ namespace osu.Game.Storyboards.Drawables
         public override bool IsPresent
             => !float.IsNaN(DrawPosition.X) && !float.IsNaN(DrawPosition.Y) && base.IsPresent;
 
+        [Resolved]
+        private ISkinSource skin { get; set; } = null!;
+
+        [Resolved]
+        private Storyboard storyboard { get; set; } = null!;
+
+        [Resolved]
+        private TextureStore textureStore { get; set; } = null!;
+
         public DrawableStoryboardSprite(StoryboardSprite sprite)
         {
             Sprite = sprite;
@@ -84,24 +94,21 @@ namespace osu.Game.Storyboards.Drawables
             LifetimeEnd = sprite.EndTimeForDisplay;
         }
 
-        [Resolved]
-        private ISkinSource skin { get; set; } = null!;
-
         [BackgroundDependencyLoader]
-        private void load(TextureStore textureStore, Storyboard storyboard)
+        private void load()
         {
-            Texture = textureStore.Get(Sprite.Path);
-
-            if (Texture == null && storyboard.UseSkinSprites)
+            if (storyboard.UseSkinSprites)
             {
                 skin.SourceChanged += skinSourceChanged;
                 skinSourceChanged();
             }
+            else
+                Texture = textureStore.Get(Sprite.Path);
 
             Sprite.ApplyTransforms(this);
         }
 
-        private void skinSourceChanged() => Texture = skin.GetTexture(Sprite.Path);
+        private void skinSourceChanged() => Texture = skin.GetTexture(Sprite.Path) ?? textureStore.Get(Sprite.Path);
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 03e30d6272..21342831b0 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Storyboards
         public BeatmapInfo BeatmapInfo = new BeatmapInfo();
 
         /// <summary>
-        /// Whether the storyboard can fall back to skin sprites in case no matching storyboard sprites are found.
+        /// Whether the storyboard should prefer textures from the current skin before using local storyboard textures.
         /// </summary>
         public bool UseSkinSprites { get; set; }
 

From 320a9fc17169c81b082c42d16fb750b9fc7e6026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 13:47:46 +0200
Subject: [PATCH 0638/2296] Replace test with better test

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 29 +++++++++++--------
 osu.Game.Tests/Resources/invalid-bank.osu     | 18 ++++++++----
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 6fe9c902bb..1ba63f4037 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -622,7 +622,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         }
 
         [Test]
-        public void TestInvalidBankDefaultsToNone()
+        public void TestInvalidBankDefaultsToNormal()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
 
@@ -631,20 +631,25 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
 
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[0].Samples[0].Bank);
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[0].Samples[1].Bank);
+                assertObjectHasBanks(hitObjects[0], HitSampleInfo.BANK_DRUM);
+                assertObjectHasBanks(hitObjects[1], HitSampleInfo.BANK_NORMAL);
+                assertObjectHasBanks(hitObjects[2], HitSampleInfo.BANK_SOFT);
+                assertObjectHasBanks(hitObjects[3], HitSampleInfo.BANK_DRUM);
+                assertObjectHasBanks(hitObjects[4], HitSampleInfo.BANK_NORMAL);
 
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[1].Samples[0].Bank);
-                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[1].Samples[1].Bank);
+                assertObjectHasBanks(hitObjects[5], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_DRUM);
+                assertObjectHasBanks(hitObjects[6], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_NORMAL);
+                assertObjectHasBanks(hitObjects[7], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_SOFT);
+                assertObjectHasBanks(hitObjects[8], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_DRUM);
+                assertObjectHasBanks(hitObjects[9], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_NORMAL);
+            }
 
-                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[2].Samples[0].Bank);
-                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[2].Samples[1].Bank);
+            void assertObjectHasBanks(HitObject hitObject, string normalBank, string? additionsBank = null)
+            {
+                Assert.AreEqual(normalBank, hitObject.Samples[0].Bank);
 
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[3].Samples[0].Bank);
-                Assert.AreEqual(HitSampleInfo.BANK_SOFT, hitObjects[3].Samples[1].Bank);
-
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[4].Samples[0].Bank);
-                Assert.AreEqual(HitSampleInfo.BANK_NORMAL, hitObjects[4].Samples[1].Bank);
+                if (additionsBank != null)
+                    Assert.AreEqual(additionsBank, hitObject.Samples[1].Bank);
             }
         }
 
diff --git a/osu.Game.Tests/Resources/invalid-bank.osu b/osu.Game.Tests/Resources/invalid-bank.osu
index fb54a61fd3..8c554cc17f 100644
--- a/osu.Game.Tests/Resources/invalid-bank.osu
+++ b/osu.Game.Tests/Resources/invalid-bank.osu
@@ -3,9 +3,17 @@ osu file format v14
 [General]
 SampleSet: Normal
 
+[TimingPoints]
+0,500,4,3,0,100,1,0
+
 [HitObjects]
-256,192,1000,1,8,0:0:0:0:
-256,192,2000,1,8,1:2:0:0:
-256,192,3000,1,8,2:62:0:0:
-256,192,4000,1,8,41:2:0:0:
-256,192,5000,1,8,41:62:0:0:
+256,192,1000,5,0,0:0:0:0:
+256,192,2000,1,0,1:0:0:0:
+256,192,3000,1,0,2:0:0:0:
+256,192,4000,1,0,3:0:0:0:
+256,192,5000,1,0,42:0:0:0:
+256,192,6000,5,4,0:0:0:0:
+256,192,7000,1,4,0:1:0:0:
+256,192,8000,1,4,0:2:0:0:
+256,192,9000,1,4,0:3:0:0:
+256,192,10000,1,4,0:42:0:0:

From c4a0ca326ed5e02a9219dee579cb9a01c554960b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 13:53:49 +0200
Subject: [PATCH 0639/2296] Replace sample bank fix with more correct fix

stable does not treat unknown enum members as `None` / `Auto`, it treats
them as `Normal`:

    switch (sampleSet)
    {
        case SampleSet.Normal:
        default:
            sample = 0;
            break;
        case SampleSet.None:
        case SampleSet.Soft:
            sample = 1;
            break;
        case SampleSet.Drum:
            sample = 2;
            break;
    }

    (from https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/Audio/AudioEngine.cs#L1158-L1171).
---
 .../Rulesets/Objects/Legacy/ConvertHitObjectParser.cs    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 339e9bb5bc..d20f2d31bb 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -190,13 +190,18 @@ namespace osu.Game.Rulesets.Objects.Legacy
             string[] split = str.Split(':');
 
             var bank = (LegacySampleBank)Parsing.ParseInt(split[0]);
+            if (!Enum.IsDefined(bank))
+                bank = LegacySampleBank.Normal;
+
             var addBank = (LegacySampleBank)Parsing.ParseInt(split[1]);
+            if (!Enum.IsDefined(addBank))
+                addBank = LegacySampleBank.Normal;
 
             string stringBank = bank.ToString().ToLowerInvariant();
-            if (stringBank == @"none" || !Enum.IsDefined(bank))
+            if (stringBank == @"none")
                 stringBank = null;
             string stringAddBank = addBank.ToString().ToLowerInvariant();
-            if (stringAddBank == @"none" || !Enum.IsDefined(addBank))
+            if (stringAddBank == @"none")
                 stringAddBank = null;
 
             bankInfo.BankForNormal = stringBank;

From ba518e1da8442d8aaf17a235d227a394f077689e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 20:11:16 +0200
Subject: [PATCH 0640/2296] Fix `StoryboardResourceLookupStore` dying on
 failure to unmap path

Before the introduction of `StoryboardResourceLookupStore`, missing
files would softly fail by use of null fallbacks. After the
aforementioned class was added, however, the fallbacks would not work
anymore if for whatever reason `GetStoragePathFromStoryboardPath()`
failed to unmap the storyboard asset name to a storage path.
---
 .../Drawables/DrawableStoryboard.cs           | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 6931cea81e..c2a58d46ef 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -142,14 +142,32 @@ namespace osu.Game.Storyboards.Drawables
             public void Dispose() =>
                 realmFileStore.Dispose();
 
-            public byte[] Get(string name) =>
-                realmFileStore.Get(storyboard.GetStoragePathFromStoryboardPath(name));
+            public byte[] Get(string name)
+            {
+                string? storagePath = storyboard.GetStoragePathFromStoryboardPath(name);
 
-            public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken()) =>
-                realmFileStore.GetAsync(storyboard.GetStoragePathFromStoryboardPath(name), cancellationToken);
+                return string.IsNullOrEmpty(storagePath)
+                    ? null!
+                    : realmFileStore.Get(storagePath);
+            }
 
-            public Stream GetStream(string name) =>
-                realmFileStore.GetStream(storyboard.GetStoragePathFromStoryboardPath(name));
+            public Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken())
+            {
+                string? storagePath = storyboard.GetStoragePathFromStoryboardPath(name);
+
+                return string.IsNullOrEmpty(storagePath)
+                    ? Task.FromResult<byte[]>(null!)
+                    : realmFileStore.GetAsync(storagePath, cancellationToken);
+            }
+
+            public Stream? GetStream(string name)
+            {
+                string? storagePath = storyboard.GetStoragePathFromStoryboardPath(name);
+
+                return string.IsNullOrEmpty(storagePath)
+                    ? null
+                    : realmFileStore.GetStream(storagePath);
+            }
 
             public IEnumerable<string> GetAvailableResources() =>
                 realmFileStore.GetAvailableResources();

From 641e651bf282aeeb11050756e63e3a98cc136bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 20:18:33 +0200
Subject: [PATCH 0641/2296] Fix `DrawableStoryboardVideo` attempting to unmap
 path once too much

The `StoryboardResourceLookupStore` cached at storyboard level is
supposed to already be handling that; no need for local logic anymore.
---
 osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index eec2cd6a60..9a5db4bb39 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -29,12 +29,7 @@ namespace osu.Game.Storyboards.Drawables
         [BackgroundDependencyLoader(true)]
         private void load(IBindable<WorkingBeatmap> beatmap, TextureStore textureStore)
         {
-            string? path = beatmap.Value.BeatmapSetInfo?.GetPathForFile(Video.Path);
-
-            if (path == null)
-                return;
-
-            var stream = textureStore.GetStream(path);
+            var stream = textureStore.GetStream(Video.Path);
 
             if (stream == null)
                 return;

From 333b839e0d7b859aa677a6a27163cb894c7d5563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Sep 2023 21:37:44 +0200
Subject: [PATCH 0642/2296] Fix broken automatic beatmap download setting
 migration

---
 osu.Game/Configuration/OsuConfigManager.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index b5253d3500..db71ff4e84 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -64,6 +64,12 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.Username, string.Empty);
             SetDefault(OsuSetting.Token, string.Empty);
 
+#pragma warning disable CS0618 // Type or member is obsolete
+            // this default set MUST remain despite the setting being deprecated, because `SetDefault()` calls are implicitly used to declare the type returned for the lookup.
+            // if this is removed, the setting will be interpreted as a string, and `Migrate()` will fail due to cast failure.
+            // can be removed 20240618
+            SetDefault(OsuSetting.AutomaticallyDownloadWhenSpectating, false);
+#pragma warning restore CS0618 // Type or member is obsolete
             SetDefault(OsuSetting.AutomaticallyDownloadMissingBeatmaps, false);
 
             SetDefault(OsuSetting.SavePassword, false).ValueChanged += enabled =>
@@ -218,7 +224,7 @@ namespace osu.Game.Configuration
             if (combined < 20230918)
             {
 #pragma warning disable CS0618 // Type or member is obsolete
-                SetValue(OsuSetting.AutomaticallyDownloadMissingBeatmaps, Get<OsuSetting>(OsuSetting.AutomaticallyDownloadWhenSpectating)); // can be removed 20240618
+                SetValue(OsuSetting.AutomaticallyDownloadMissingBeatmaps, Get<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating)); // can be removed 20240618
 #pragma warning restore CS0618 // Type or member is obsolete
             }
         }

From 8e16b1d50784e62123d4ab308985b186e3c4ecb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 12:48:15 +0900
Subject: [PATCH 0643/2296] Simplify some maximum size specs

---
 .../Skinning/Legacy/LegacyFruitPiece.cs             | 13 +++++++++----
 .../HitCircles/Components/HitCircleOverlapMarker.cs |  2 +-
 .../HitCircles/Components/HitCirclePiece.cs         |  2 +-
 .../Objects/Drawables/DrawableHitCircle.cs          |  2 +-
 .../Objects/Drawables/DrawableSliderBall.cs         |  2 +-
 .../Objects/Drawables/DrawableSliderRepeat.cs       |  2 +-
 .../Objects/Drawables/DrawableSliderTail.cs         |  2 +-
 .../Objects/Drawables/DrawableSliderTick.cs         |  2 +-
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs       |  5 +++++
 .../Skinning/Argon/ArgonMainCirclePiece.cs          |  2 +-
 .../Skinning/Argon/ArgonReverseArrow.cs             |  2 +-
 .../Skinning/Default/CirclePiece.cs                 |  3 +--
 .../Skinning/Default/ExplodePiece.cs                |  3 +--
 .../Skinning/Default/FlashPiece.cs                  |  3 +--
 .../Skinning/Default/MainCirclePiece.cs             |  3 +--
 .../Skinning/Default/ReverseArrowPiece.cs           |  2 +-
 osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs |  3 +--
 .../Skinning/Legacy/LegacyApproachCircle.cs         |  2 +-
 .../Skinning/Legacy/LegacyMainCirclePiece.cs        |  9 +++------
 .../Skinning/Legacy/LegacyReverseArrow.cs           |  3 +--
 .../Skinning/Legacy/LegacySliderBall.cs             |  5 ++---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs     |  4 ++--
 .../UI/Cursor/CursorRippleVisualiser.cs             |  2 +-
 23 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index eacda1dc64..62097d79bd 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -26,21 +26,26 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
             switch (visualRepresentation)
             {
                 case FruitVisualRepresentation.Pear:
-                    SetTexture(Skin.GetTexture("fruit-pear")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-pear-overlay")?.WithMaximumSize(fruit_max_size));
+                    setTextures("pear");
                     break;
 
                 case FruitVisualRepresentation.Grape:
-                    SetTexture(Skin.GetTexture("fruit-grapes")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-grapes-overlay")?.WithMaximumSize(fruit_max_size));
+                    setTextures("grapes");
                     break;
 
                 case FruitVisualRepresentation.Pineapple:
-                    SetTexture(Skin.GetTexture("fruit-apple")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-apple-overlay")?.WithMaximumSize(fruit_max_size));
+                    setTextures("apple");
                     break;
 
                 case FruitVisualRepresentation.Raspberry:
-                    SetTexture(Skin.GetTexture("fruit-orange")?.WithMaximumSize(fruit_max_size), Skin.GetTexture("fruit-orange-overlay")?.WithMaximumSize(fruit_max_size));
+                    setTextures("orange");
                     break;
             }
+
+            void setTextures(string fruitName) => SetTexture(
+                Skin.GetTexture($"fruit-{fruitName}")?.WithMaximumSize(fruit_max_size),
+                Skin.GetTexture($"fruit-{fruitName}-overlay")?.WithMaximumSize(fruit_max_size)
+            );
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs
index e5cc8595d1..3cba0610a1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCircleOverlapMarker.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
         {
             Origin = Anchor.Centre;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             InternalChild = content = new Container
             {
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
index 670e98ca50..c585f09b00 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
         {
             Origin = Anchor.Centre;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             CornerRadius = Size.X / 2;
             CornerExponent = 2;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 3458069dd1..999979c491 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             public HitReceptor()
             {
-                Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+                Size = OsuHitObject.OBJECT_DIMENSIONS;
 
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index d06fb5b4de..47214f1e53 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Origin = Anchor.Centre;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Children = new[]
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index fc4863f164..5721328057 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private void load()
         {
             Origin = Anchor.Centre;
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             AddInternal(scaleContainer = new Container
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index d9501f7d58..9fbc97c484 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private void load()
         {
             Origin = Anchor.Centre;
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             AddRangeInternal(new Drawable[]
             {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 6d0ae93e62..a947580d2f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
             Origin = Anchor.Centre;
 
             AddInternal(scaleContainer = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.SliderScorePoint), _ => new CircularContainer
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index fd5741698a..0bdbfaa760 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -21,6 +21,11 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public const float OBJECT_RADIUS = 64;
 
+        /// <summary>
+        /// The width and height any element participating in display of a hitcircle (or similarly sized object) should be.
+        /// </summary>
+        public static readonly Vector2 OBJECT_DIMENSIONS = new Vector2(OBJECT_RADIUS * 2);
+
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second (ie. the speed slider balls move through their track).
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index 3427031dc8..7508a689d2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
         private Bindable<bool> configHitLighting = null!;
 
-        private static readonly Vector2 circle_size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+        private static readonly Vector2 circle_size = OsuHitObject.OBJECT_DIMENSIONS;
 
         [Resolved]
         private DrawableHitObject drawableObject { get; set; } = null!;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index f93e26b2ca..67fc1b2304 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             InternalChildren = new Drawable[]
             {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
index f4761e0ea8..65a7b1328b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/CirclePiece.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
@@ -22,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public CirclePiece()
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
             Masking = true;
 
             CornerRadius = Size.X / 2;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
index 91bf75617a..7beb16f7d7 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/ExplodePiece.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
@@ -20,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public ExplodePiece()
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
index 789137117e..86087ac50d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/FlashPiece.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
@@ -13,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
     {
         public FlashPiece()
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
index 20fa4e5342..bcea33f63c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
@@ -25,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public MainCirclePiece()
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
index 3fe7872ff7..27868db2f6 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Child = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow), _ => new SpriteIcon
             {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
index 46d48f62e7..c3bbd89ab6 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Osu.Objects;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
@@ -14,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
     {
         public RingPiece(float thickness = 9)
         {
-            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
index cdc61ebd9b..403a14214e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private DrawableHitObject drawableObject { get; set; } = null!;
 
         public LegacyApproachCircle()
-            : base("Gameplay/osu/approachcircle", new Vector2(OsuHitObject.OBJECT_RADIUS * 2))
+            : base("Gameplay/osu/approachcircle", OsuHitObject.OBJECT_DIMENSIONS)
         {
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 18010cdb2c..8990204931 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -14,15 +14,12 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public partial class LegacyMainCirclePiece : CompositeDrawable
     {
-        private static readonly Vector2 circle_piece_size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
-
         public override bool RemoveCompletedTransforms => false;
 
         /// <summary>
@@ -53,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             this.priorityLookupPrefix = priorityLookupPrefix;
             this.hasNumber = hasNumber;
 
-            Size = circle_piece_size;
+            Size = OsuHitObject.OBJECT_DIMENSIONS;
         }
 
         [BackgroundDependencyLoader]
@@ -70,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(circle_piece_size) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -79,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: circle_piece_size))
+                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: OsuHitObject.OBJECT_DIMENSIONS))
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 293df6b3a0..3a80607522 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -37,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
 
-            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2)) ?? Empty());
+            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty());
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 145a8a50af..c3beb5bc35 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -48,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(new Vector2(OsuHitObject.OBJECT_RADIUS * 2)),
+                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS),
                     Colour = new Color4(5, 5, 5, 255),
                 },
                 LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
@@ -60,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(new Vector2(OsuHitObject.OBJECT_RADIUS * 2)),
+                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS),
                     Blending = BlendingParameters.Additive,
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 2564dbf335..ea6f6fe6ce 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return null;
 
                     case OsuSkinComponents.SliderBall:
-                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2));
+                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: OsuHitObject.OBJECT_DIMENSIONS);
 
                         // todo: slider ball has a custom frame delay based on velocity
                         // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         if (!this.HasFont(LegacyFont.HitCircle))
                             return null;
 
-                        return new LegacySpriteText(LegacyFont.HitCircle, new Vector2(OsuHitObject.OBJECT_RADIUS * 2))
+                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS)
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
                             Scale = new Vector2(0.8f),
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
index 076d97d06a..52486b701a 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorRippleVisualiser.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 {
                     new RingPiece(3)
                     {
-                        Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2),
+                        Size = OsuHitObject.OBJECT_DIMENSIONS,
                         Alpha = 0.1f,
                     }
                 };

From 50adb5f7a7991dcfd84eba98bb28155b65e32175 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 12:54:28 +0900
Subject: [PATCH 0644/2296] Remove incorrectly merge conflict resolved

---
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index a11251ed22..352246c533 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Storyboards.Drawables
 {
     public partial class DrawableStoryboard : Container<DrawableStoryboardLayer>
     {
-        public Vector2 AppliedScale { get; private set; }
-
         [Cached(typeof(Storyboard))]
         public Storyboard Storyboard { get; }
 

From b5e64d933c9d09196c0553d548e5dde0bbec8ed2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 12:54:36 +0900
Subject: [PATCH 0645/2296] Apply same fix to `DrawableStoryboardAnimation`

---
 .../Drawables/DrawableStoryboardAnimation.cs  | 43 ++++++++++++-------
 .../Drawables/DrawableStoryboardSprite.cs     |  6 +--
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 054a50456b..33f7a3c6f2 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -94,25 +94,19 @@ namespace osu.Game.Storyboards.Drawables
         [Resolved]
         private IBeatSyncProvider beatSyncProvider { get; set; }
 
+        [Resolved]
+        private TextureStore textureStore { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(TextureStore textureStore, Storyboard storyboard)
+        private void load(Storyboard storyboard)
         {
-            int frameIndex = 0;
-
-            Texture frameTexture = textureStore.Get(getFramePath(frameIndex));
-
-            if (frameTexture != null)
+            if (storyboard.UseSkinSprites)
             {
-                // sourcing from storyboard.
-                for (frameIndex = 0; frameIndex < Animation.FrameCount; frameIndex++)
-                    AddFrame(textureStore.Get(getFramePath(frameIndex)), Animation.FrameDelay);
-            }
-            else if (storyboard.UseSkinSprites)
-            {
-                // fallback to skin if required.
                 skin.SourceChanged += skinSourceChanged;
                 skinSourceChanged();
             }
+            else
+                addFramesFromStoryboardSource();
 
             Animation.ApplyTransforms(this);
         }
@@ -135,11 +129,28 @@ namespace osu.Game.Storyboards.Drawables
 
             // When reading from a skin, we match stables weird behaviour where `FrameCount` is ignored
             // and resources are retrieved until the end of the animation.
-            foreach (var texture in skin.GetTextures(Path.GetFileNameWithoutExtension(Animation.Path)!, default, default, true, string.Empty, out _))
-                AddFrame(texture, Animation.FrameDelay);
+            var skinTextures = skin.GetTextures(Path.GetFileNameWithoutExtension(Animation.Path)!, default, default, true, string.Empty, out _);
+
+            if (skinTextures.Length > 0)
+            {
+                foreach (var texture in skinTextures)
+                    AddFrame(texture, Animation.FrameDelay);
+            }
+            else
+            {
+                addFramesFromStoryboardSource();
+            }
         }
 
-        private string getFramePath(int i) => Animation.Path.Replace(".", $"{i}.");
+        private void addFramesFromStoryboardSource()
+        {
+            int frameIndex;
+            // sourcing from storyboard.
+            for (frameIndex = 0; frameIndex < Animation.FrameCount; frameIndex++)
+                AddFrame(textureStore.Get(getFramePath(frameIndex)), Animation.FrameDelay);
+
+            string getFramePath(int i) => Animation.Path.Replace(".", $"{i}.");
+        }
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 14132654d1..ad344b6bd4 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
@@ -78,9 +77,6 @@ namespace osu.Game.Storyboards.Drawables
         [Resolved]
         private ISkinSource skin { get; set; } = null!;
 
-        [Resolved]
-        private Storyboard storyboard { get; set; } = null!;
-
         [Resolved]
         private TextureStore textureStore { get; set; } = null!;
 
@@ -95,7 +91,7 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(Storyboard storyboard)
         {
             if (storyboard.UseSkinSprites)
             {

From bd66285bd47859569618a26eebbf2563d65d9f93 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 12:59:40 +0900
Subject: [PATCH 0646/2296] Rename parameter on `LegacySpriteText` to better
 imply the maximum size is per glyph

---
 osu.Game/Skinning/LegacySpriteText.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index f021a99102..7eb92126fa 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Skinning
     public sealed partial class LegacySpriteText : OsuSpriteText
     {
         private readonly LegacyFont font;
-        private readonly Vector2? maxSize;
+        private readonly Vector2? maxSizePerGlyph;
 
         private LegacyGlyphStore glyphStore = null!;
 
@@ -21,10 +21,10 @@ namespace osu.Game.Skinning
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(LegacyFont font, Vector2? maxSize = null)
+        public LegacySpriteText(LegacyFont font, Vector2? maxSizePerGlyph = null)
         {
             this.font = font;
-            this.maxSize = maxSize;
+            this.maxSizePerGlyph = maxSizePerGlyph;
 
             Shadow = false;
             UseFullGlyphHeight = false;
@@ -36,7 +36,7 @@ namespace osu.Game.Skinning
             Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
 
-            glyphStore = new LegacyGlyphStore(skin, maxSize);
+            glyphStore = new LegacyGlyphStore(skin, maxSizePerGlyph);
         }
 
         protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);

From 1316403180f1f4f095e71e205221eead5a481912 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 13:02:40 +0900
Subject: [PATCH 0647/2296] Fix inspection in new test scene

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
index 20e6e5658c..ff7cf2a124 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 return texture;
             }
 
-            public ISkin? FindProvider(Func<ISkin, bool> lookupFunction) => this;
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => this;
             public IEnumerable<ISkin> AllSources => new[] { this };
         }
     }

From 71ac5cfc792a2aec35720e08f6d02d87e69995be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 14:14:37 +0900
Subject: [PATCH 0648/2296] Don't bother binding to friends changes for score
 display purposes

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

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 502303e80c..7471955493 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -13,7 +13,6 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
@@ -110,7 +109,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private IBindable<ScoringMode> scoreDisplayMode = null!;
 
-        private readonly IBindableList<APIUser> apiFriends = new BindableList<APIUser>();
+        private bool isFriend;
 
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
@@ -317,8 +316,7 @@ namespace osu.Game.Screens.Play.HUD
 
             HasQuit.BindValueChanged(_ => updateState());
 
-            apiFriends.BindTo(api.Friends);
-            apiFriends.BindCollectionChanged((_, _) => updateState());
+            isFriend = User != null && api.Friends.Any(u => User.OnlineID == u.Id);
         }
 
         protected override void LoadComplete()
@@ -397,7 +395,7 @@ namespace osu.Game.Screens.Play.HUD
                 panelColour = BackgroundColour ?? Color4Extensions.FromHex("ffd966");
                 textColour = TextColour ?? Color4Extensions.FromHex("2e576b");
             }
-            else if (apiFriends.Any(f => User?.Equals(f) == true))
+            else if (isFriend)
             {
                 panelColour = BackgroundColour ?? Color4Extensions.FromHex("ff549a");
                 textColour = TextColour ?? Color4.White;

From c6cc858967ccc3068aa0b19a7e308451b6e16d97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 15:27:30 +0900
Subject: [PATCH 0649/2296] Change implementation of "show speed changes" to
 require explicit ruleset support

---
 .../Edit/ScrollingHitObjectComposer.cs        | 37 +++++++------------
 .../ISupportConstantAlgorithmToggle.cs        | 15 ++++++++
 2 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/Scrolling/ISupportConstantAlgorithmToggle.cs

diff --git a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
index 0340354016..75305a0c20 100644
--- a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -28,34 +27,24 @@ namespace osu.Game.Rulesets.Edit
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (DrawableRuleset is DrawableScrollingRuleset<TObject> drawableScrollingRuleset)
+            if (DrawableRuleset is ISupportConstantAlgorithmToggle toggleRuleset)
             {
-                var originalVisualisationMethod = drawableScrollingRuleset.VisualisationMethod;
-
-                if (originalVisualisationMethod != ScrollVisualisationMethod.Constant)
+                LeftToolbox.Add(new EditorToolboxGroup("playfield")
                 {
-                    LeftToolbox.Add(new EditorToolboxGroup("playfield")
+                    Child = new FillFlowContainer
                     {
-                        Child = new FillFlowContainer
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 5),
+                        Children = new[]
                         {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(0, 5),
-                            Children = new[]
-                            {
-                                new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
-                            }
-                        },
-                    });
+                            new DrawableTernaryButton(new TernaryButton(showSpeedChanges, "Show speed changes", () => new SpriteIcon { Icon = FontAwesome.Solid.TachometerAlt }))
+                        }
+                    },
+                });
 
-                    showSpeedChanges.BindValueChanged(state =>
-                    {
-                        drawableScrollingRuleset.VisualisationMethod = state.NewValue == TernaryState.True
-                            ? originalVisualisationMethod
-                            : ScrollVisualisationMethod.Constant;
-                    }, true);
-                }
+                showSpeedChanges.BindValueChanged(state => toggleRuleset.ShowSpeedChanges.Value = state.NewValue == TernaryState.True, true);
             }
         }
     }
diff --git a/osu.Game/Rulesets/UI/Scrolling/ISupportConstantAlgorithmToggle.cs b/osu.Game/Rulesets/UI/Scrolling/ISupportConstantAlgorithmToggle.cs
new file mode 100644
index 0000000000..aaa635350e
--- /dev/null
+++ b/osu.Game/Rulesets/UI/Scrolling/ISupportConstantAlgorithmToggle.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.Bindables;
+
+namespace osu.Game.Rulesets.UI.Scrolling
+{
+    /// <summary>
+    /// Denotes a <see cref="IDrawableScrollingRuleset"/> which supports toggling constant algorithm for better display in the editor.
+    /// </summary>
+    public interface ISupportConstantAlgorithmToggle : IDrawableScrollingRuleset
+    {
+        public BindableBool ShowSpeedChanges { get; }
+    }
+}

From 41a8239e49d87fec622135874bddcf2660ae0000 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 15:27:50 +0900
Subject: [PATCH 0650/2296] Remvoe null default for mods which can't be null

---
 osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs | 2 +-
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 2 +-
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs     | 2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 136a78b343..d74e6194fb 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Catch.Edit
             return base.OnPressed(e);
         }
 
-        protected override DrawableRuleset<CatchHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) =>
+        protected override DrawableRuleset<CatchHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
             new DrawableCatchEditorRuleset(ruleset, beatmap, mods)
             {
                 TimeRangeMultiplier = { BindTarget = timeRangeMultiplier, }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 9bde9485b2..8e61baca81 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         protected override Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpacePosition) =>
             Playfield.GetColumnByPosition(screenSpacePosition);
 
-        protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+        protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
         {
             drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods);
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index cff2171cbd..fdc11be42c 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        protected override DrawableRuleset<OsuHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+        protected override DrawableRuleset<OsuHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             => new DrawableOsuEditorRuleset(ruleset, beatmap, mods);
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 295a016c7b..f9a6b5083e 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -307,7 +307,7 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="beatmap">The loaded beatmap.</param>
         /// <param name="mods">The mods to be applied.</param>
         /// <returns>An editor-relevant <see cref="DrawableRuleset{TObject}"/>.</returns>
-        protected virtual DrawableRuleset<TObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+        protected virtual DrawableRuleset<TObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             => (DrawableRuleset<TObject>)ruleset.CreateDrawableRulesetWith(beatmap, mods);
 
         #region Tool selection logic

From cb0226f84356ae0fe991cae3664590b3c6dcc708 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Sep 2023 15:28:13 +0900
Subject: [PATCH 0651/2296] Implement new interface-based speed change
 visualisation support on mania/taiko

---
 .../Edit/DrawableManiaEditorRuleset.cs        | 13 ++++++-
 .../Edit/DrawableTaikoEditorRuleset.cs        | 37 +++++++++++++++++++
 .../Edit/TaikoHitObjectComposer.cs            |  6 +++
 .../UI/DrawableTaikoRuleset.cs                |  7 +++-
 4 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index 1741dad5d6..7b019a2bdf 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -12,8 +14,10 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public partial class DrawableManiaEditorRuleset : DrawableManiaRuleset
+    public partial class DrawableManiaEditorRuleset : DrawableManiaRuleset, ISupportConstantAlgorithmToggle
     {
+        public BindableBool ShowSpeedChanges { get; set; } = new BindableBool();
+
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
         public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod>? mods)
@@ -21,6 +25,13 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ShowSpeedChanges.BindValueChanged(showChanges => VisualisationMethod = showChanges.NewValue ? ScrollVisualisationMethod.Sequential : ScrollVisualisationMethod.Constant, true);
+        }
+
         protected override Playfield CreatePlayfield() => new ManiaEditorPlayfield(Beatmap.Stages)
         {
             Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs b/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
new file mode 100644
index 0000000000..963ddec0b3
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
@@ -0,0 +1,37 @@
+// 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.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public partial class DrawableTaikoEditorRuleset : DrawableTaikoRuleset, ISupportConstantAlgorithmToggle
+    {
+        public BindableBool ShowSpeedChanges { get; set; } = new BindableBool();
+
+        public DrawableTaikoEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
+            : base(ruleset, beatmap, mods)
+        {
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ShowSpeedChanges.BindValueChanged(showChanges => VisualisationMethod = showChanges.NewValue ? ScrollVisualisationMethod.Overlapping : ScrollVisualisationMethod.Constant, true);
+        }
+
+        protected override double ComputeTimeRange()
+        {
+            // Adjust when we're using constant algorithm to not be sluggish.
+            double multiplier = ShowSpeedChanges.Value ? 1 : 4;
+            return base.ComputeTimeRange() / multiplier;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index fbad8c7fad..5ae4757b8f 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -2,9 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Taiko.Edit
@@ -25,6 +28,9 @@ namespace osu.Game.Rulesets.Taiko.Edit
             new SwellCompositionTool()
         };
 
+        protected override DrawableRuleset<TaikoHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
+            new DrawableTaikoEditorRuleset(ruleset, beatmap, mods);
+
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new TaikoBlueprintContainer(this);
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 979e03f201..2af4c0c2e8 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -64,6 +64,11 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             base.Update();
 
+            TimeRange.Value = ComputeTimeRange();
+        }
+
+        protected virtual double ComputeTimeRange()
+        {
             // Taiko scrolls at a constant 100px per 1000ms. More notes become visible as the playfield is lengthened.
             const float scroll_rate = 10;
 
@@ -72,7 +77,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             // We clamp the ratio to the maximum aspect ratio to keep scroll speed consistent on widths lower than the default.
             float ratio = Math.Max(DrawSize.X / 768f, TaikoPlayfieldAdjustmentContainer.MAXIMUM_ASPECT);
 
-            TimeRange.Value = (Playfield.HitObjectContainer.DrawWidth / ratio) * scroll_rate;
+            return (Playfield.HitObjectContainer.DrawWidth / ratio) * scroll_rate;
         }
 
         protected override void UpdateAfterChildren()

From d7129da8ea708f5485e023a18012940b1d5d3dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Sep 2023 12:05:23 +0200
Subject: [PATCH 0652/2296] Fix `TestSceneDrawableStoryboardSprite` not
 displaying anything

---
 .../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 d20c7c2f7a..32693c2bb2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             layer.Elements.Clear();
             layer.Add(sprite);
 
-            return storyboard.CreateDrawable();
+            return storyboard.CreateDrawable().With(s => s.RelativeSizeAxes = Axes.Both);
         }
 
         private void assertStoryboardSourced()

From f2791d4f3e1c3067d8a2b9fcbab013edcd5eeefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Sep 2023 12:22:05 +0200
Subject: [PATCH 0653/2296] Move comment a bit to fix formatting

Would otherwise trigger IDE0055, but that isn't resolveable without
an inspection cycle with resharper, so just move in a more sane place.
---
 osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index d74e6194fb..dc3a4416a5 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -25,8 +25,8 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit
 {
+    // we're also a ScrollingHitObjectComposer candidate, but can't be everything can we?
     public partial class CatchHitObjectComposer : DistancedHitObjectComposer<CatchHitObject>
-        // we're also a ScrollingHitObjectComposer candidate, but can't be everything can we?
     {
         private const float distance_snap_radius = 50;
 

From bf984388b364ba4a3a35139df08b09fa0aac93c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Sep 2023 19:12:55 +0900
Subject: [PATCH 0654/2296] Update clocks in line with framework changes

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs         | 2 --
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 2 --
 osu.Game/Screens/Edit/EditorClock.cs            | 2 --
 osu.Game/Screens/Play/GameplayClockContainer.cs | 2 --
 4 files changed, 8 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 9577d1e38b..62484fa12b 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -216,8 +216,6 @@ namespace osu.Game.Beatmaps
 
         public double FramesPerSecond => finalClockSource.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => finalClockSource.TimeInfo;
-
         #endregion
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 90cffab714..2af9916a6b 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -264,8 +264,6 @@ namespace osu.Game.Rulesets.UI
 
         public double FramesPerSecond => framedClock.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => framedClock.TimeInfo;
-
         public double StartTime => parentGameplayClock?.StartTime ?? 0;
 
         private readonly AudioAdjustments gameplayAdjustments = new AudioAdjustments();
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index e5e88a04d9..a05a873101 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -231,8 +231,6 @@ namespace osu.Game.Screens.Edit
 
         public double FramesPerSecond => underlyingClock.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
-
         public void ChangeSource(IClock source)
         {
             track.Value = source as Track;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 20bf6c3829..2478af1dd4 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -234,7 +234,5 @@ namespace osu.Game.Screens.Play
         public double ElapsedFrameTime => GameplayClock.ElapsedFrameTime;
 
         public double FramesPerSecond => GameplayClock.FramesPerSecond;
-
-        public FrameTimeInfo TimeInfo => GameplayClock.TimeInfo;
     }
 }

From 8a3d412ffc3374c4ad99cd4b26b00edf77e4cf35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 11:38:16 +0900
Subject: [PATCH 0655/2296] Remove mention of no-heated-gameplay-mechanics
 discussions

We're kinda at the point we're allowing this now.
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 792e2d646a..ce9fe4d053 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,6 @@ The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Curre
 
 This project is under constant development, but we aim to keep things in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
 
-**IMPORTANT:** Gameplay mechanics (and other features which you may have come to know and love) are in a constant state of flux. Game balance and final quality-of-life passes come at the end of development, preceded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to a [stable release](https://osu.ppy.sh/home/download) of osu!. We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
-
 We are accepting bug reports (please report with as much detail as possible and follow the existing issue templates). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features. A few resources are available as starting points to getting involved and understanding the project:
 
 - Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer).

From 2954ad78349e126482c02687f98fcf00055314ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 11:56:23 +0900
Subject: [PATCH 0656/2296] Update language across whole readme to read better

---
 README.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ce9fe4d053..a9dac3d6cf 100644
--- a/README.md
+++ b/README.md
@@ -12,33 +12,35 @@
 
 A free-to-win rhythm game. Rhythm is just a *click* away!
 
-The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Currently known by and released under the release codename "*lazer*". As in sharper than cutting-edge.
+This is the future – and final – iteration of the [osu!](https://osu.ppy.sh) game client and marks the beginning of an open era! Currently known by and released under the release codename "*lazer*". As in sharper than cutting-edge.
 
 ## Status
 
-This project is under constant development, but we aim to keep things in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
+This project is under constant development, but we do our best to keep things in a stable state. Players are encouraged to install from a release alongside their stable *osu!* client. This project will continue to evolve until we eventually reach the point where most users prefer it over the previous "osu!stable" release.
 
-We are accepting bug reports (please report with as much detail as possible and follow the existing issue templates). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features. A few resources are available as starting points to getting involved and understanding the project:
+A few resources are available as starting points to getting involved and understanding the project:
 
 - Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer).
 - You can learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
 
 ## Running osu!
 
-If you are looking to install or test osu! without setting up a development environment, you can consume our [releases](https://github.com/ppy/osu/releases). You can also generally download a version for your current device from the [osu! site](https://osu.ppy.sh/home/download). Failing that, you may use the links below to download the latest version for your operating system of choice:
+If you are just looking to give the game a whirl, you can grab the latest release for your platform:
 
-**Latest release:**
+### Latest release:
 
 | [Windows 8.1+ (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe) | macOS 10.15+ ([Intel](https://github.com/ppy/osu/releases/latest/download/osu.app.Intel.zip), [Apple Silicon](https://github.com/ppy/osu/releases/latest/download/osu.app.Apple.Silicon.zip)) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.AppImage) | [iOS 13.4+](https://osu.ppy.sh/home/testflight) | [Android 5+](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk) |
 | ------------- | ------------- | ------------- | ------------- | ------------- |
 
-- The iOS testflight link may fill up (Apple has a hard limit of 10,000 users). We reset it occasionally when this happens. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements of link resets.
+You can also generally download a version for your current device from the [osu! site](https://osu.ppy.sh/home/download)
 
 If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
 
+**For iOS/iPadOS users**: The iOS testflight link fills up very fast (Apple has a hard limit of 10,000 users). We reset it occasionally. Please do not ask about this. Check back regularly for link resets or follow [peppy](https://twitter.com/ppy) on twitter for announcements. Our goal is to get the game on mobile app stores in early 2024.
+
 ## Developing a custom ruleset
 
-osu! is designed to have extensible modular gameplay modes, called "rulesets". Building one of these allows a developer to harness the power of osu! for their own game style. To get started working on a ruleset, we have some templates available [here](https://github.com/ppy/osu/tree/master/Templates).
+osu! is designed to allow user-created gameplay variations, called "rulesets". Building one of these allows a developer to harness the power of the osu! beatmap library, game engine, and general UX for a new style of gameplay. To get started working on a ruleset, we have some templates available [here](https://github.com/ppy/osu/tree/master/Templates).
 
 You can see some examples of custom rulesets by visiting the [custom ruleset directory](https://github.com/ppy/osu/discussions/13096).
 

From c76853c32c6267110657ef7c31c81f58e47d7191 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 11:56:32 +0900
Subject: [PATCH 0657/2296] Add mention of new project

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a9dac3d6cf..2cf3b4bf6b 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ A few resources are available as starting points to getting involved and underst
 
 - Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer).
 - You can learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
+- Track our current efforts [towards full "ranked play" support](https://github.com/orgs/ppy/projects/13?query=is%3Aopen+sort%3Aupdated-desc)
 
 ## Running osu!
 

From fc6abae968011aecada1d7f81484b78f2a2b0d64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 11:56:49 +0900
Subject: [PATCH 0658/2296] Remove note about `dotnet` CLI tools not working
 (less relevant post-EF)

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 2cf3b4bf6b..3966a9258a 100644
--- a/README.md
+++ b/README.md
@@ -84,8 +84,6 @@ If you are not interested in debugging *osu!*, you can add `-c Release` to gain
 
 If the build fails, try to restore NuGet packages with `dotnet restore`.
 
-_Due to a historical feature gap between .NET Core and Xamarin, running `dotnet` CLI from the root directory will not work for most commands. This can be resolved by specifying a target `.csproj` or the helper project at `build/Desktop.proj`. Configurations have been provided to work around this issue for all supported IDEs mentioned above._
-
 ### Testing with resource/framework modifications
 
 Sometimes it may be necessary to cross-test changes in [osu-resources](https://github.com/ppy/osu-resources) or [osu-framework](https://github.com/ppy/osu-framework). This can be quickly achieved using included commands:

From 9629f49afbd26dcf65674b6cf0a2672e67018920 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 11:57:10 +0900
Subject: [PATCH 0659/2296] Update build instructions to be more clear about
 `slnf` files and mention `workload`s

---
 README.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3966a9258a..6009ff4d59 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,8 @@ You can see some examples of custom rulesets by visiting the [custom ruleset dir
 
 ## Developing osu!
 
+### Prerequisites
+
 Please make sure you have the following prerequisites:
 
 - A desktop platform with the [.NET 6.0 SDK](https://dotnet.microsoft.com/download) installed.
@@ -70,9 +72,19 @@ git pull
 
 ### Building
 
-Build configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this is provided [below](#contributing).
+#### From an IDE
 
-- Visual Studio / Rider users should load the project via one of the platform-specific `.slnf` files, rather than the main `.sln`. This will allow access to template run configurations.
+You should load the solution via one of the platform-specific `.slnf` files, rather than the main `.sln`. This will reduce dependencies and hide platforms that you don't care about. Valid `.slnf` files are:
+
+- `osu.Desktop.slnf` (most common)
+- `osu.Android.slnf`
+- `osu.iOS.slnf`
+
+Run configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this is provided [below](#contributing).
+
+To build for mobile platforms, you will likely need to run `sudo dotnet workload restore` if you haven't done so previously. This will install android/iOS tooling required to complete the build.
+
+#### From CLI
 
 You can also build and run *osu!* from the command-line with a single command:
 

From 262916787ecfde13d2499aa733611a845fa13e13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 13:27:00 +0900
Subject: [PATCH 0660/2296] Apply punctuation and terminology fixes

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6009ff4d59..946a6b03d9 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ A few resources are available as starting points to getting involved and underst
 
 - Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer).
 - You can learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
-- Track our current efforts [towards full "ranked play" support](https://github.com/orgs/ppy/projects/13?query=is%3Aopen+sort%3Aupdated-desc)
+- Track our current efforts [towards full "ranked play" support](https://github.com/orgs/ppy/projects/13?query=is%3Aopen+sort%3Aupdated-desc).
 
 ## Running osu!
 
@@ -33,7 +33,7 @@ If you are just looking to give the game a whirl, you can grab the latest releas
 | [Windows 8.1+ (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe) | macOS 10.15+ ([Intel](https://github.com/ppy/osu/releases/latest/download/osu.app.Intel.zip), [Apple Silicon](https://github.com/ppy/osu/releases/latest/download/osu.app.Apple.Silicon.zip)) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.AppImage) | [iOS 13.4+](https://osu.ppy.sh/home/testflight) | [Android 5+](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk) |
 | ------------- | ------------- | ------------- | ------------- | ------------- |
 
-You can also generally download a version for your current device from the [osu! site](https://osu.ppy.sh/home/download)
+You can also generally download a version for your current device from the [osu! site](https://osu.ppy.sh/home/download).
 
 If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
 
@@ -80,9 +80,9 @@ You should load the solution via one of the platform-specific `.slnf` files, rat
 - `osu.Android.slnf`
 - `osu.iOS.slnf`
 
-Run configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `VisualTests` project/configuration. More information on this is provided [below](#contributing).
+Run configurations for the recommended IDEs (listed above) are included. You should use the provided Build/Run functionality of your IDE to get things going. When testing or building new components, it's highly encouraged you use the `osu! (Tests)` project/configuration. More information on this is provided [below](#contributing).
 
-To build for mobile platforms, you will likely need to run `sudo dotnet workload restore` if you haven't done so previously. This will install android/iOS tooling required to complete the build.
+To build for mobile platforms, you will likely need to run `sudo dotnet workload restore` if you haven't done so previously. This will install Android/iOS tooling required to complete the build.
 
 #### From CLI
 

From 0eab4c5364d23e3bb996894ae3fd58b4842f0914 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 14:47:55 +0900
Subject: [PATCH 0661/2296] Reword sentence with multiple `and`s
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 946a6b03d9..f7a4936e50 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 
 A free-to-win rhythm game. Rhythm is just a *click* away!
 
-This is the future – and final – iteration of the [osu!](https://osu.ppy.sh) game client and marks the beginning of an open era! Currently known by and released under the release codename "*lazer*". As in sharper than cutting-edge.
+This is the future – and final – iteration of the [osu!](https://osu.ppy.sh) game client which marks the beginning of an open era! Currently known by and released under the release codename "*lazer*". As in sharper than cutting-edge.
 
 ## Status
 

From 8ef0ef09db1381df7fc0bf0f65701d4ca2ca8a1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 14:59:37 +0900
Subject: [PATCH 0662/2296] Reword release build disclaimer

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f7a4936e50..d5dc0723af 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ You can also build and run *osu!* from the command-line with a single command:
 dotnet run --project osu.Desktop
 ```
 
-If you are not interested in debugging *osu!*, you can add `-c Release` to gain performance. In this case, you must replace `Debug` with `Release` in any commands mentioned in this document.
+When running locally to do any kind of performance testing, make sure to add `-c Release` to the build command, as the overhead of running with the default `Debug` configuration can be large (especially when testing with local framework modifications as below).
 
 If the build fails, try to restore NuGet packages with `dotnet restore`.
 

From c4fc4199d190b6bff29d10c65341b9c7a011fca9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 21 Sep 2023 19:02:31 +0300
Subject: [PATCH 0663/2296] Use correct maximum size for droplets

---
 osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index 581259a9c4..c6c0839fba 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public partial class LegacyDropletPiece : LegacyCatchHitObjectPiece
     {
-        private static readonly Vector2 droplet_max_size = new Vector2(100);
+        private static readonly Vector2 droplet_max_size = new Vector2(82, 103);
 
         public LegacyDropletPiece()
         {

From ad86bf2d56cb85e5bd4b84e74a92d1ed63aaf578 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 21 Sep 2023 19:03:08 +0300
Subject: [PATCH 0664/2296] Revert redundant size limitations

Already handled by the sprites themselves being resized.
---
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
index 83f05fe6ec..5543a31ec9 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyDrumRoll.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
@@ -48,13 +47,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreLeft,
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-end", WrapMode.ClampToEdge, WrapMode.ClampToEdge)?.WithMaximumSize(new Vector2(128, 256)),
+                    Texture = skin.GetTexture("taiko-roll-end", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                     FillMode = FillMode.Fit,
                 },
                 body = new Sprite
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Texture = skin.GetTexture("taiko-roll-middle", WrapMode.ClampToEdge, WrapMode.ClampToEdge)?.WithMaximumSize(new Vector2(2, 256)),
+                    Texture = skin.GetTexture("taiko-roll-middle", WrapMode.ClampToEdge, WrapMode.ClampToEdge),
                 },
                 headCircle = new LegacyCirclePiece
                 {

From 9af4e75dfc5dd5cdfd5e70c227d1a48e2747205c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 01:24:24 +0900
Subject: [PATCH 0665/2296] Disable clipboard export for song select textbox

In combination with https://github.com/ppy/osu-framework/pull/5997,
closes https://github.com/ppy/osu/issues/24867
---
 osu.Game/Screens/Select/FilterControl.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 38520a85b7..614c9bd7ec 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -254,6 +254,8 @@ namespace osu.Game.Screens.Select
 
             public OsuSpriteText FilterText { get; private set; }
 
+            protected override bool AllowClipboardExport => false;
+
             public FilterControlTextBox()
             {
                 Height += filter_text_size;

From f1258a396367d4ccec91977c34f40ca13cb4dd6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 01:26:38 +0900
Subject: [PATCH 0666/2296] Update framework

---
 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 10cee77b09..20b0f220a3 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.914.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.922.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d88b568244..049d4275a4 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.914.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index b754b156b3..5508c2ab03 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.914.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.922.0" />
   </ItemGroup>
 </Project>

From 5266cdc7224954c1cc466769b503c6ea481b36cd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 21 Sep 2023 20:36:34 +0300
Subject: [PATCH 0667/2296] Add explanatory note

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

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 614c9bd7ec..b7dc18e46a 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -254,6 +254,7 @@ namespace osu.Game.Screens.Select
 
             public OsuSpriteText FilterText { get; private set; }
 
+            // clipboard is disabled because one of the "cut" platform key bindings (shift-delete) conflicts with the beatmap deletion action.
             protected override bool AllowClipboardExport => false;
 
             public FilterControlTextBox()

From d73f06fc89e3bcebb93cff36db24287d8ae6e7ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Sep 2023 20:01:59 +0200
Subject: [PATCH 0668/2296] Add test coverage for delete hotkey

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 0bff40f258..43a7da0c28 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -25,6 +25,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
@@ -1087,6 +1088,25 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("0 matching shown", () => songSelect.ChildrenOfType<FilterControl>().Single().InformationalText == "0 matches");
         }
 
+        [Test]
+        public void TestDeleteHotkey()
+        {
+            createSongSelect();
+
+            addRulesetImportStep(0);
+            AddAssert("3 matching shown", () => songSelect.ChildrenOfType<FilterControl>().Single().InformationalText == "3 matches");
+
+            AddStep("press shift-delete", () =>
+            {
+                InputManager.PressKey(Key.ShiftLeft);
+                InputManager.Key(Key.Delete);
+                InputManager.ReleaseKey(Key.ShiftLeft);
+            });
+            AddUntilStep("delete dialog shown", () => DialogOverlay.CurrentDialog, Is.InstanceOf<BeatmapDeleteDialog>);
+            AddStep("confirm deletion", () => DialogOverlay.CurrentDialog!.PerformAction<PopupDialogDangerousButton>());
+            AddAssert("0 matching shown", () => songSelect.ChildrenOfType<FilterControl>().Single().InformationalText == "0 matches");
+        }
+
         private void waitForInitialSelection()
         {
             AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);

From 9301a1907abdc0f97bc5f7486fb55aea20e61e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Sep 2023 21:05:41 +0200
Subject: [PATCH 0669/2296] Rewrite `TestFriendScore` assertions to constraint
 model

Allows to clearly see what the failure is:

	TearDown : System.TimeoutException : "friend score is pink" timed out: Expected: some item equal to "#FF549A"
	  But was:  < "#FFFFFF", "#7FCC33", "#444444" >

The #7FCC33 colour is used for the first score on the leaderboard.
---
 .../Visual/Gameplay/TestSceneGameplayLeaderboard.cs      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 65f943d36b..df1d56c94d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.PolygonExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -161,10 +160,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             int playerNumber = 1;
 
             AddRepeatStep("add 3 other players", () => createRandomScore(new APIUser { Username = $"Player {playerNumber++}" }), 3);
-            AddUntilStep("there are no pink color score", () => leaderboard.ChildrenOfType<Box>().All(b => b.Colour != Color4Extensions.FromHex("ff549a")));
+            AddUntilStep("no pink color scores",
+                () => leaderboard.ChildrenOfType<Box>().Select(b => ((Colour4)b.Colour).ToHex()),
+                () => Does.Not.Contain("#FF549A"));
 
             AddRepeatStep("add 3 friend score", () => createRandomScore(friend), 3);
-            AddUntilStep("there are pink color for friend score", () => leaderboard.GetScoreByUsername("my friend").ChildrenOfType<Box>().Any(b => b.Colour == Color4Extensions.FromHex("ff549a")));
+            AddUntilStep("friend score is pink",
+                () => leaderboard.GetScoreByUsername("my friend").ChildrenOfType<Box>().Select(b => ((Colour4)b.Colour).ToHex()),
+                () => Does.Contain("#FF549A"));
         }
 
         private void addLocalPlayer()

From e45d45632421c1091a93428b824f65f06a943cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Sep 2023 21:09:24 +0200
Subject: [PATCH 0670/2296] Fix `TestFriendScore` intermittently failing due to
 randomness

If `createRandomScore()` happened to randomly pick the highest total
score when called with `friend` as the sole argument, that particular
score would not be pink.

`GetScoreByUsername()` would arbitrarily pick the first score for the
user, so in this particular case where a friend had the number 1 score,
the test would wrongly fail.

Fix by checking whether any of the 3 added friend scores have received
the pink colour. Because there is more than 1 friend score in the test,
doing so ensures that at least one of those should eventually become
pink (because, obviously, you can't have two scores at number 1).
---
 .../Visual/Gameplay/TestSceneGameplayLeaderboard.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index df1d56c94d..193e8b2571 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
@@ -165,8 +166,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                 () => Does.Not.Contain("#FF549A"));
 
             AddRepeatStep("add 3 friend score", () => createRandomScore(friend), 3);
-            AddUntilStep("friend score is pink",
-                () => leaderboard.GetScoreByUsername("my friend").ChildrenOfType<Box>().Select(b => ((Colour4)b.Colour).ToHex()),
+            AddUntilStep("at least one friend score is pink",
+                () => leaderboard.GetAllScoresForUsername("my friend")
+                                 .SelectMany(score => score.ChildrenOfType<Box>())
+                                 .Select(b => ((Colour4)b.Colour).ToHex()),
                 () => Does.Contain("#FF549A"));
         }
 
@@ -211,10 +214,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }
 
-            public GameplayLeaderboardScore GetScoreByUsername(string username)
-            {
-                return Flow.FirstOrDefault(i => i.User?.Username == username);
-            }
+            public IEnumerable<GameplayLeaderboardScore> GetAllScoresForUsername(string username)
+                => Flow.Where(i => i.User?.Username == username);
         }
     }
 }

From 600651795b88563e77e5e8b3120aa71367329aee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 15:23:22 +0900
Subject: [PATCH 0671/2296] Change `FramedBeatmapClock` to always be decoupled

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs         | 10 +++-------
 osu.Game/Screens/Edit/EditorClock.cs            |  2 +-
 osu.Game/Screens/Play/GameplayClockContainer.cs |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 62484fa12b..1626fec9bd 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -13,6 +13,8 @@ using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Screens.Play;
 
+#pragma warning disable CS0618
+
 namespace osu.Game.Beatmaps
 {
     /// <summary>
@@ -66,19 +68,13 @@ namespace osu.Game.Beatmaps
 
         public bool IsRewinding { get; private set; }
 
-        public bool IsCoupled
-        {
-            get => decoupledClock.IsCoupled;
-            set => decoupledClock.IsCoupled = value;
-        }
-
         public FramedBeatmapClock(bool applyOffsets = false)
         {
             this.applyOffsets = applyOffsets;
 
             // A decoupled clock is used to ensure precise time values even when the host audio subsystem is not reporting
             // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
-            decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
+            decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
 
             if (applyOffsets)
             {
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index a05a873101..108552b61c 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Edit
 
             this.beatDivisor = beatDivisor ?? new BindableBeatDivisor();
 
-            underlyingClock = new FramedBeatmapClock(applyOffsets: true) { IsCoupled = false };
+            underlyingClock = new FramedBeatmapClock(applyOffsets: true);
             AddInternal(underlyingClock);
         }
 
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 2478af1dd4..6e069297d4 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
 
             InternalChildren = new Drawable[]
             {
-                GameplayClock = new FramedBeatmapClock(applyOffsets) { IsCoupled = false },
+                GameplayClock = new FramedBeatmapClock(applyOffsets),
                 Content
             };
         }

From 3f27be1f330103ced3937de808107376b350bcd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 15:24:03 +0900
Subject: [PATCH 0672/2296] Replace most usages of
 `DecoupleableInterpolatingFramedClock`

Except `FramedBeatmapClock`, which is the high-effort one.
---
 .../Visual/Gameplay/TestSceneStoryboard.cs          |  4 +---
 osu.Game/Screens/Menu/IntroTriangles.cs             | 13 +++----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
index a6663f3086..893b9f11f4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
@@ -106,14 +106,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             if (storyboard != null)
                 storyboardContainer.Remove(storyboard, true);
 
-            var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
-            storyboardContainer.Clock = decoupledClock;
+            storyboardContainer.Clock = new FramedClock(Beatmap.Value.Track);
 
             storyboard = toLoad.CreateDrawable(SelectedMods.Value);
             storyboard.Passing = false;
 
             storyboardContainer.Add(storyboard);
-            decoupledClock.ChangeSource(Beatmap.Value.Track);
         }
 
         private void loadStoryboard(string filename, Action<Storyboard>? setUpStoryboard = null)
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index a9c86b10c4..808680b9e5 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Screens.Menu
 
         private Sample welcome;
 
-        private DecoupleableInterpolatingFramedClock decoupledClock;
         private TrianglesIntroSequence intro;
 
         public IntroTriangles([CanBeNull] Func<MainMenu> createNextScreen = null)
@@ -59,18 +58,12 @@ namespace osu.Game.Screens.Menu
             {
                 PrepareMenuLoad();
 
-                decoupledClock = new DecoupleableInterpolatingFramedClock
-                {
-                    IsCoupled = false
-                };
-
-                if (UsingThemedIntro)
-                    decoupledClock.ChangeSource(Track);
+                var decouplingClock = new DecouplingClock(UsingThemedIntro ? Track : null);
 
                 LoadComponentAsync(intro = new TrianglesIntroSequence(logo, () => FadeInBackground())
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Clock = decoupledClock,
+                    Clock = new InterpolatingFramedClock(decouplingClock),
                     LoadMenu = LoadMenu
                 }, _ =>
                 {
@@ -94,7 +87,7 @@ namespace osu.Game.Screens.Menu
                         StartTrack();
 
                     // no-op for the case of themed intro, no harm in calling for both scenarios as a safety measure.
-                    decoupledClock.Start();
+                    decouplingClock.Start();
                 });
             }
         }

From 117cd74af671877a05600e261a93323a39fcd7e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 15:32:29 +0900
Subject: [PATCH 0673/2296] Update usage of
 `DecoupleableInterpolatingFramedClock` in `FramedBeatmapClock`

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs       | 33 +++++++++----------
 .../Screens/Play/GameplayClockContainer.cs    |  3 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 1626fec9bd..acd10cccf3 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -13,8 +13,6 @@ using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Screens.Play;
 
-#pragma warning disable CS0618
-
 namespace osu.Game.Beatmaps
 {
     /// <summary>
@@ -55,7 +53,7 @@ namespace osu.Game.Beatmaps
 
         private IDisposable? beatmapOffsetSubscription;
 
-        private readonly DecoupleableInterpolatingFramedClock decoupledClock;
+        private readonly DecouplingClock decoupledTrack;
 
         [Resolved]
         private OsuConfigManager config { get; set; } = null!;
@@ -74,13 +72,13 @@ namespace osu.Game.Beatmaps
 
             // A decoupled clock is used to ensure precise time values even when the host audio subsystem is not reporting
             // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
-            decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
+            decoupledTrack = new DecouplingClock();
 
             if (applyOffsets)
             {
                 // Audio timings in general with newer BASS versions don't match stable.
                 // This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
-                platformOffsetClock = new OffsetCorrectionClock(decoupledClock, ExternalPauseFrequencyAdjust) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
+                platformOffsetClock = new OffsetCorrectionClock(decoupledTrack, ExternalPauseFrequencyAdjust) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
 
                 // User global offset (set in settings) should also be applied.
                 userGlobalOffsetClock = new OffsetCorrectionClock(platformOffsetClock, ExternalPauseFrequencyAdjust);
@@ -90,7 +88,7 @@ namespace osu.Game.Beatmaps
             }
             else
             {
-                finalClockSource = decoupledClock;
+                finalClockSource = new InterpolatingFramedClock(decoupledTrack);
             }
         }
 
@@ -120,13 +118,12 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
-            if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < decoupledClock.CurrentTime - 100)
+            // TODO: necessary?
+            if (Source.CurrentTime < decoupledTrack.CurrentTime - 100)
             {
                 // 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);
             }
             else
@@ -156,43 +153,43 @@ namespace osu.Game.Beatmaps
         public void ChangeSource(IClock? source)
         {
             Track = source as Track ?? new TrackVirtual(60000);
-            decoupledClock.ChangeSource(source);
+            decoupledTrack.ChangeSource(Track);
         }
 
-        public IClock? Source => decoupledClock.Source;
+        public IClock Source => decoupledTrack.Source;
 
         public void Reset()
         {
-            decoupledClock.Reset();
+            decoupledTrack.Reset();
             finalClockSource.ProcessFrame();
         }
 
         public void Start()
         {
-            decoupledClock.Start();
+            decoupledTrack.Start();
             finalClockSource.ProcessFrame();
         }
 
         public void Stop()
         {
-            decoupledClock.Stop();
+            decoupledTrack.Stop();
             finalClockSource.ProcessFrame();
         }
 
         public bool Seek(double position)
         {
-            bool success = decoupledClock.Seek(position - TotalAppliedOffset);
+            bool success = decoupledTrack.Seek(position - TotalAppliedOffset);
             finalClockSource.ProcessFrame();
 
             return success;
         }
 
-        public void ResetSpeedAdjustments() => decoupledClock.ResetSpeedAdjustments();
+        public void ResetSpeedAdjustments() => decoupledTrack.ResetSpeedAdjustments();
 
         public double Rate
         {
-            get => decoupledClock.Rate;
-            set => decoupledClock.Rate = value;
+            get => decoupledTrack.Rate;
+            set => decoupledTrack.Rate = value;
         }
 
         #endregion
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6e069297d4..ba034b079f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -194,7 +194,8 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private void ensureSourceClockSet()
         {
-            if (GameplayClock.Source == null)
+            // TODO: does this need to exist?
+            if (GameplayClock.Source != SourceClock)
                 ChangeSource(SourceClock);
         }
 

From 04e6ec87158a0117f366b4ef8dc8289b18a6e285 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 17:02:31 +0900
Subject: [PATCH 0674/2296] Fix interpolation not being applied when
 `applyOffsets` is set

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

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index acd10cccf3..338a5d3056 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -74,11 +74,13 @@ namespace osu.Game.Beatmaps
             // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
             decoupledTrack = new DecouplingClock();
 
+            var interpolatedTrack = new InterpolatingFramedClock(decoupledTrack);
+
             if (applyOffsets)
             {
                 // Audio timings in general with newer BASS versions don't match stable.
                 // This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
-                platformOffsetClock = new OffsetCorrectionClock(decoupledTrack, ExternalPauseFrequencyAdjust) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
+                platformOffsetClock = new OffsetCorrectionClock(interpolatedTrack, ExternalPauseFrequencyAdjust) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
 
                 // User global offset (set in settings) should also be applied.
                 userGlobalOffsetClock = new OffsetCorrectionClock(platformOffsetClock, ExternalPauseFrequencyAdjust);
@@ -88,7 +90,7 @@ namespace osu.Game.Beatmaps
             }
             else
             {
-                finalClockSource = new InterpolatingFramedClock(decoupledTrack);
+                finalClockSource = new InterpolatingFramedClock(interpolatedTrack);
             }
         }
 

From 21a2e27e5fff1adfdb3ac8eae52804919ac987a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 18:39:55 +0900
Subject: [PATCH 0675/2296] Simplify some pieces of `FramedBeatmapClock`

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 338a5d3056..7a12528453 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -28,16 +28,6 @@ namespace osu.Game.Beatmaps
     {
         private readonly bool applyOffsets;
 
-        /// <summary>
-        /// The length of the underlying beatmap track. Will default to 60 seconds if unavailable.
-        /// </summary>
-        public double TrackLength => Track.Length;
-
-        /// <summary>
-        /// The underlying beatmap track, if available.
-        /// </summary>
-        public Track Track { get; private set; } = new TrackVirtual(60000);
-
         /// <summary>
         /// The total frequency adjustment from pause transforms. Should eventually be handled in a better way.
         /// </summary>
@@ -154,8 +144,7 @@ namespace osu.Game.Beatmaps
 
         public void ChangeSource(IClock? source)
         {
-            Track = source as Track ?? new TrackVirtual(60000);
-            decoupledTrack.ChangeSource(Track);
+            decoupledTrack.ChangeSource(source as Track ?? new TrackVirtual(60000));
         }
 
         public IClock Source => decoupledTrack.Source;

From 5f634f2812b42c6e6d404b19c2dc015db80b3575 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 18:45:34 +0900
Subject: [PATCH 0676/2296] Remove unnecessary encapsulation workaround

The new implementation of `DecouplingClock` will not mutate the
underlying clock in any way (unless attempting to start it when
approaching from a negative time value).

This should be quite safe as a result.
---
 osu.Game/Beatmaps/FramedBeatmapClock.cs |  5 +----
 osu.Game/OsuGameBase.cs                 | 11 +----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 7a12528453..cd349e6c29 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -142,10 +142,7 @@ namespace osu.Game.Beatmaps
 
         #region Delegation of IAdjustableClock / ISourceChangeableClock to decoupled clock.
 
-        public void ChangeSource(IClock? source)
-        {
-            decoupledTrack.ChangeSource(source as Track ?? new TrackVirtual(60000));
-        }
+        public void ChangeSource(IClock? source) => decoupledTrack.ChangeSource(source);
 
         public IClock Source => decoupledTrack.Source;
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 75b46a0a4d..c946362124 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -441,16 +441,7 @@ namespace osu.Game
             }
         }
 
-        private void onTrackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction)
-        {
-            // FramedBeatmapClock uses a decoupled clock internally which will mutate the source if it is an `IAdjustableClock`.
-            // We don't want this for now, as the intention of beatmapClock is to be a read-only source for beat sync components.
-            //
-            // Encapsulating in a FramedClock will avoid any mutations.
-            var framedClock = new FramedClock(beatmap.Track);
-
-            beatmapClock.ChangeSource(framedClock);
-        }
+        private void onTrackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction) => beatmapClock.ChangeSource(beatmap.Track);
 
         protected virtual void InitialiseFonts()
         {

From df08c4e1adf701068e9c00dd2e2fd40d248c9bb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 18:49:44 +0900
Subject: [PATCH 0677/2296] Disable decoupling for `OsuGameBase`'s beatmap
 implementation

This avoids it ever mutating the underlying track (aka attempting to start
it). Resolves the one caveat mentioned in
aeef92fa710648d4a00edc523e13c17ac6104125.
---
 osu.Game/Beatmaps/FramedBeatmapClock.cs         | 8 ++++----
 osu.Game/OsuGameBase.cs                         | 2 +-
 osu.Game/Screens/Edit/EditorClock.cs            | 2 +-
 osu.Game/Screens/Play/GameplayClockContainer.cs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index cd349e6c29..d738333a98 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -56,14 +56,14 @@ namespace osu.Game.Beatmaps
 
         public bool IsRewinding { get; private set; }
 
-        public FramedBeatmapClock(bool applyOffsets = false)
+        public FramedBeatmapClock(bool applyOffsets, bool requireDecoupling)
         {
             this.applyOffsets = applyOffsets;
 
-            // A decoupled clock is used to ensure precise time values even when the host audio subsystem is not reporting
-            // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
-            decoupledTrack = new DecouplingClock();
+            decoupledTrack = new DecouplingClock { AllowDecoupling = requireDecoupling };
 
+            // An interpolating clock is used to ensure precise time values even when the host audio subsystem is not reporting
+            // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
             var interpolatedTrack = new InterpolatingFramedClock(decoupledTrack);
 
             if (applyOffsets)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c946362124..1f46eb0c0d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -215,7 +215,7 @@ namespace osu.Game
         /// For now, this is used as a source specifically for beat synced components.
         /// Going forward, it could potentially be used as the single source-of-truth for beatmap timing.
         /// </summary>
-        private readonly FramedBeatmapClock beatmapClock = new FramedBeatmapClock(true);
+        private readonly FramedBeatmapClock beatmapClock = new FramedBeatmapClock(applyOffsets: true, requireDecoupling: false);
 
         protected override Container<Drawable> Content => content;
 
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 108552b61c..d4de1bae5f 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Edit
 
             this.beatDivisor = beatDivisor ?? new BindableBeatDivisor();
 
-            underlyingClock = new FramedBeatmapClock(applyOffsets: true);
+            underlyingClock = new FramedBeatmapClock(applyOffsets: true, requireDecoupling: true);
             AddInternal(underlyingClock);
         }
 
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ba034b079f..2a27d33047 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
 
             InternalChildren = new Drawable[]
             {
-                GameplayClock = new FramedBeatmapClock(applyOffsets),
+                GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling: true),
                 Content
             };
         }

From a451ab75dd4a72dcce21428ffffb27f4cf26cdc5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 19:10:14 +0900
Subject: [PATCH 0678/2296] Remove hopefully-unnecessary workaround

It was causing issues with the new implementation.
---
 osu.Game/Beatmaps/FramedBeatmapClock.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index d738333a98..c83874ded3 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -5,7 +5,6 @@ using System;
 using System.Diagnostics;
 using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
@@ -110,16 +109,7 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
-            // TODO: necessary?
-            if (Source.CurrentTime < decoupledTrack.CurrentTime - 100)
-            {
-                // 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.
-                Seek(Source.CurrentTime);
-            }
-            else
-                finalClockSource.ProcessFrame();
+            finalClockSource.ProcessFrame();
 
             if (Clock.ElapsedFrameTime != 0)
                 IsRewinding = Clock.ElapsedFrameTime < 0;

From a1e298930c6a0e697f9f3f2cf80be6d2c3b3704c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 19:39:15 +0900
Subject: [PATCH 0679/2296] Remove second hopefully-unnecessary workaround

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 2a27d33047..4c3aa301a6 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -160,21 +160,6 @@ namespace osu.Game.Screens.Play
 
             Seek(StartTime);
 
-            // This is a workaround for the fact that DecoupleableInterpolatingFramedClock doesn't seek the source
-            // if the source is not IsRunning. (see https://github.com/ppy/osu-framework/blob/2102638056dfcf85d21b4d85266d53b5dd018767/osu.Framework/Timing/DecoupleableInterpolatingFramedClock.cs#L209-L210)
-            // I hope to remove this once we knock some sense into clocks in general.
-            //
-            // Without this seek, the multiplayer spectator start sequence breaks:
-            // - Individual clients' clocks are never updated to their expected time
-            // - The sync manager thinks they are running behind
-            // - Gameplay doesn't start when it should (until a timeout occurs because nothing is happening for 10+ seconds)
-            //
-            // In addition, we use `CurrentTime` for this seek instead of `StartTime` as the above seek may have applied inherent
-            // offsets which need to be accounted for (ie. FramedBeatmapClock.TotalAppliedOffset).
-            //
-            // See https://github.com/ppy/osu/pull/24451/files/87fee001c786b29db34063ef3350e9a9f024d3ab#diff-28ca02979641e2d98a15fe5d5e806f56acf60ac100258a059fa72503b6cc54e8.
-            (SourceClock as IAdjustableClock)?.Seek(CurrentTime);
-
             if (!wasPaused || startClock)
                 Start();
         }

From 0200b63fd385eb8ed42b480d86d09e13e5b152e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Sep 2023 19:53:55 +0900
Subject: [PATCH 0680/2296] Add note about beatmap offset not being reapplied
 correctly on `ChangeSource`

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

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index c83874ded3..a3e1b9ae24 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -95,6 +95,7 @@ namespace osu.Game.Beatmaps
                 userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
                 userAudioOffset.BindValueChanged(offset => userGlobalOffsetClock.Offset = offset.NewValue, true);
 
+                // TODO: this doesn't update when using ChangeSource() to change beatmap.
                 beatmapOffsetSubscription = realm.SubscribeToPropertyChanged(
                     r => r.Find<BeatmapInfo>(beatmap.Value.BeatmapInfo.ID)?.UserSettings,
                     settings => settings.Offset,

From 59d6e6751255558aab0cbdba7de97105437dd8b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 04:10:57 +0900
Subject: [PATCH 0681/2296] Add missing `TestManualClock.Reset` implementation
 for safe measure

---
 osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 1d568a9dc2..63ebe5187f 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -188,6 +188,8 @@ namespace osu.Game.Tests.OnlinePlay
 
             public void Reset()
             {
+                IsRunning = false;
+                CurrentTime = 0;
             }
 
             public void ResetSpeedAdjustments()

From 586311d508c28ffb486de78e5e490639714b746a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 13:16:51 +0900
Subject: [PATCH 0682/2296] Fix souce clock not always being transferred to
 `FramedBeatmapClock` in time

---
 .../Spectate/MultiSpectatorPlayer.cs          |  2 +-
 .../Screens/Play/GameplayClockContainer.cs    | 29 ++-----------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 930bea4497..18a890c2b8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override void Update()
         {
             // The player clock's running state is controlled externally, but the local pausing state needs to be updated to start/stop gameplay.
-            if (GameplayClockContainer.SourceClock.IsRunning)
+            if (GameplayClockContainer.IsRunning)
                 GameplayClockContainer.Start();
             else
                 GameplayClockContainer.Stop();
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 4c3aa301a6..38e8fe0dc7 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -23,11 +23,6 @@ namespace osu.Game.Screens.Play
 
         public bool IsRewinding => GameplayClock.IsRewinding;
 
-        /// <summary>
-        /// The source clock. Should generally not be used for any timekeeping purposes.
-        /// </summary>
-        public IClock SourceClock { get; private set; }
-
         /// <summary>
         /// Invoked when a seek has been performed via <see cref="Seek"/>
         /// </summary>
@@ -62,8 +57,6 @@ namespace osu.Game.Screens.Play
         /// <param name="applyOffsets">Whether to apply platform, user and beatmap offsets to the mix.</param>
         public GameplayClockContainer(IClock sourceClock, bool applyOffsets = false)
         {
-            SourceClock = sourceClock;
-
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
@@ -71,6 +64,8 @@ namespace osu.Game.Screens.Play
                 GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling: true),
                 Content
             };
+
+            GameplayClock.ChangeSource(sourceClock);
         }
 
         /// <summary>
@@ -83,8 +78,6 @@ namespace osu.Game.Screens.Play
 
             isPaused.Value = false;
 
-            ensureSourceClockSet();
-
             PrepareStart();
 
             // The case which caused this to be added is FrameStabilityContainer, which manages its own current and elapsed time.
@@ -153,8 +146,6 @@ namespace osu.Game.Screens.Play
 
             Stop();
 
-            ensureSourceClockSet();
-
             if (time != null)
                 StartTime = time.Value;
 
@@ -168,21 +159,7 @@ namespace osu.Game.Screens.Play
         /// Changes the source clock.
         /// </summary>
         /// <param name="sourceClock">The new source.</param>
-        protected void ChangeSource(IClock sourceClock) => GameplayClock.ChangeSource(SourceClock = sourceClock);
-
-        /// <summary>
-        /// Ensures that the <see cref="GameplayClock"/> is set to <see cref="SourceClock"/>, if it hasn't been given a source yet.
-        /// This is usually done before a seek to avoid accidentally seeking only the adjustable source in decoupled mode,
-        /// but not the actual source clock.
-        /// That will pretty much only happen on the very first call of this method, as the source clock is passed in the constructor,
-        /// but it is not yet set on the adjustable source there.
-        /// </summary>
-        private void ensureSourceClockSet()
-        {
-            // TODO: does this need to exist?
-            if (GameplayClock.Source != SourceClock)
-                ChangeSource(SourceClock);
-        }
+        protected void ChangeSource(IClock sourceClock) => GameplayClock.ChangeSource(sourceClock);
 
         #region IAdjustableClock
 

From bf08fbe1962b613597fad898a5c75ee0baa9530f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 13:29:46 +0900
Subject: [PATCH 0683/2296] Set source directly in `FramedBeatmapClock` ctor

This isn't required, but avoids creating a temporary `StopwatchClock`
and generally just makes debug easier with less state changes.
---
 osu.Game/Beatmaps/FramedBeatmapClock.cs         | 4 ++--
 osu.Game/Screens/Play/GameplayClockContainer.cs | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index a3e1b9ae24..495a30b87c 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -55,11 +55,11 @@ namespace osu.Game.Beatmaps
 
         public bool IsRewinding { get; private set; }
 
-        public FramedBeatmapClock(bool applyOffsets, bool requireDecoupling)
+        public FramedBeatmapClock(bool applyOffsets, bool requireDecoupling, IClock? source = null)
         {
             this.applyOffsets = applyOffsets;
 
-            decoupledTrack = new DecouplingClock { AllowDecoupling = requireDecoupling };
+            decoupledTrack = new DecouplingClock(source) { AllowDecoupling = requireDecoupling };
 
             // An interpolating clock is used to ensure precise time values even when the host audio subsystem is not reporting
             // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 38e8fe0dc7..ace4778ac7 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -61,11 +61,9 @@ namespace osu.Game.Screens.Play
 
             InternalChildren = new Drawable[]
             {
-                GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling: true),
+                GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling: true, sourceClock),
                 Content
             };
-
-            GameplayClock.ChangeSource(sourceClock);
         }
 
         /// <summary>

From 3cb928fe6f4d09e43bd0336d22e53d90dde4c4cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 14:06:05 +0900
Subject: [PATCH 0684/2296] Add note about test not calling `ProcessFrame`

---
 osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 63ebe5187f..d601f187d8 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -15,6 +15,9 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.OnlinePlay
 {
+    // NOTE: This test scene never calls ProcessFrame on clocks.
+    // The current tests are fine without this as they are testing very static scenarios, but it's worth knowing
+    // if adding further tests to this class.
     [HeadlessTest]
     public partial class TestSceneCatchUpSyncManager : OsuTestScene
     {

From 6629a47ed38daff0356122f61d8676037e7e4319 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 14:10:26 +0900
Subject: [PATCH 0685/2296] Fix `FramedBeatmapClock`'s source not being
 processed

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

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 495a30b87c..5fdabaab46 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -110,6 +110,9 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
+            if (decoupledTrack.Source is IFrameBasedClock framedClock)
+                framedClock.ProcessFrame();
+
             finalClockSource.ProcessFrame();
 
             if (Clock.ElapsedFrameTime != 0)

From 8367bb6bee4ea92dc97771eb343f056cdd60d45d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 14:26:33 +0900
Subject: [PATCH 0686/2296] Don't apply decoupling to `SpectatorPlayerClock`s

See inline comment for reasoning. It's a bit complicated.
---
 .../TestSceneDrumSampleTriggerSource.cs                      | 2 +-
 osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs       | 2 +-
 osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs     | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs        | 2 +-
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs      | 2 +-
 .../Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs          | 2 +-
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs  | 5 ++++-
 osu.Game/Screens/Play/GameplayClockContainer.cs              | 5 +++--
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs        | 2 +-
 9 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
index ced2e4b98c..6c925f566b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumSampleTriggerSource.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            gameplayClock = new GameplayClockContainer(manualClock)
+            gameplayClock = new GameplayClockContainer(manualClock, false, false)
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
diff --git a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
index d67a3cb824..4b3163ad89 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.NonVisual
         private partial class TestGameplayClockContainer : GameplayClockContainer
         {
             public TestGameplayClockContainer(IFrameBasedClock underlyingClock)
-                : base(underlyingClock)
+                : base(underlyingClock, false, false)
             {
                 AdjustmentsFromMods.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(2.0));
             }
diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index d601f187d8..7b0b211899 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.OnlinePlay
         [SetUp]
         public void Setup()
         {
-            syncManager = new SpectatorSyncManager(master = new GameplayClockContainer(new TestManualClock()));
+            syncManager = new SpectatorSyncManager(master = new GameplayClockContainer(new TestManualClock(), false, false));
             player1 = syncManager.CreateManagedClock();
             player2 = syncManager.CreateManagedClock();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index aa89342926..22600172dd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock());
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
 
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.ChildrenOfType<SkinComponentsContainer>().First();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 81ce088b9d..f1e9c831a6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock());
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
 
         [Cached]
         public readonly EditorClipboard Clipboard = new EditorClipboard();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index a8580ebf77..782cbb0a85 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock());
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
 
         private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 18a890c2b8..8526e11e12 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -67,7 +67,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
         {
-            var gameplayClockContainer = new GameplayClockContainer(spectatorPlayerClock);
+            // Importantly, we don't want to apply decoupling because SpectatorPlayerClock updates its IsRunning directly.
+            // If we applied decoupling, this state change wouldn't actually cause the clock to stop.
+            // TODO: Can we just use Start/Stop rather than this workaround, now that DecouplingClock is more sane?
+            var gameplayClockContainer = new GameplayClockContainer(spectatorPlayerClock, applyOffsets: false, requireDecoupling: false);
             clockAdjustmentsFromMods.BindAdjustments(gameplayClockContainer.AdjustmentsFromMods);
             return gameplayClockContainer;
         }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ace4778ac7..e6a38a9946 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -55,13 +55,14 @@ namespace osu.Game.Screens.Play
         /// </summary>
         /// <param name="sourceClock">The source <see cref="IClock"/> used for timing.</param>
         /// <param name="applyOffsets">Whether to apply platform, user and beatmap offsets to the mix.</param>
-        public GameplayClockContainer(IClock sourceClock, bool applyOffsets = false)
+        /// <param name="requireDecoupling">Whether decoupling logic should be applied on the source clock.</param>
+        public GameplayClockContainer(IClock sourceClock, bool applyOffsets, bool requireDecoupling)
         {
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
             {
-                GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling: true, sourceClock),
+                GameplayClock = new FramedBeatmapClock(applyOffsets, requireDecoupling, sourceClock),
                 Content
             };
         }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 489a4ef8b3..9ecabd9c6b 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play
         /// <param name="beatmap">The beatmap to be used for time and metadata references.</param>
         /// <param name="skipTargetTime">The latest time which should be used when introducing gameplay. Will be used when skipping forward.</param>
         public MasterGameplayClockContainer(WorkingBeatmap beatmap, double skipTargetTime)
-            : base(beatmap.Track, true)
+            : base(beatmap.Track, applyOffsets: true, requireDecoupling: true)
         {
             this.beatmap = beatmap;
             this.skipTargetTime = skipTargetTime;

From a3e4d1993331bd9dc27d482c13def9c6b7019126 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 14:32:31 +0900
Subject: [PATCH 0687/2296] Update tests which were not using an
 `IAdjustableClock` as `GameplayClockContainer` source

---
 osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
index 4b3163ad89..65113add2d 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Screens.Play;
@@ -16,7 +17,7 @@ namespace osu.Game.Tests.NonVisual
         [TestCase(1)]
         public void TestTrueGameplayRateWithGameplayAdjustment(double underlyingClockRate)
         {
-            var framedClock = new FramedClock(new ManualClock { Rate = underlyingClockRate });
+            var framedClock = new TrackVirtual(60000) { Frequency = { Value = underlyingClockRate } };
             var gameplayClock = new TestGameplayClockContainer(framedClock);
 
             Assert.That(gameplayClock.GetTrueGameplayRate(), Is.EqualTo(2));
@@ -24,7 +25,7 @@ namespace osu.Game.Tests.NonVisual
 
         private partial class TestGameplayClockContainer : GameplayClockContainer
         {
-            public TestGameplayClockContainer(IFrameBasedClock underlyingClock)
+            public TestGameplayClockContainer(IClock underlyingClock)
                 : base(underlyingClock, false, false)
             {
                 AdjustmentsFromMods.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(2.0));

From c40bd741383107ec806680f4346468e224ea3dc1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 14:40:10 +0900
Subject: [PATCH 0688/2296] Update usages of `GameplayClockContainer` not using
 an adjustable source

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs         | 4 ++--
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs       | 4 ++--
 .../Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 22600172dd..f8226eb21d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -6,11 +6,11 @@ using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Mods;
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new TrackVirtual(60000), false, false);
 
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.ChildrenOfType<SkinComponentsContainer>().First();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index f1e9c831a6..656873e9ed 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -4,10 +4,10 @@
 #nullable disable
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Overlays.SkinEditor;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new TrackVirtual(60000), false, false);
 
         [Cached]
         public readonly EditorClipboard Clipboard = new EditorClipboard();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 782cbb0a85..4cb0d5c0ff 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -8,11 +8,11 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Extensions.IEnumerableExtensions;
 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.Mods;
 using osu.Game.Rulesets.Osu;
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
 
         [Cached(typeof(IGameplayClock))]
-        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new FramedClock(), false, false);
+        private readonly IGameplayClock gameplayClock = new GameplayClockContainer(new TrackVirtual(60000), false, false);
 
         private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
 

From faa0481fc6291226cf0c836f2f33c7f0f14831a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 16:11:02 +0900
Subject: [PATCH 0689/2296] Fix editor operating directly on track rather than
 decoupled clock

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 1cdca5754d..75d9820680 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -859,7 +859,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            Beatmap.Value.Track.Stop();
+            clock.Stop();
 
             if (seekToStart)
             {

From 251a85db435b4eb7958f4fb7dc444639b580b977 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 16:18:43 +0900
Subject: [PATCH 0690/2296] Fix `StopUsingBeatmapClock` not transferring time
 and running state

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

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 9ecabd9c6b..70d9ecd3e7 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -187,7 +187,13 @@ namespace osu.Game.Screens.Play
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-            ChangeSource(new TrackVirtual(beatmap.Track.Length));
+
+            var virtualTrack = new TrackVirtual(beatmap.Track.Length);
+            virtualTrack.Seek(CurrentTime);
+            if (IsRunning)
+                virtualTrack.Start();
+            ChangeSource(virtualTrack);
+
             addSourceClockAdjustments();
         }
 

From d019cb5167acdd6e77190a11993c4e3ddf0a1b02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Sep 2023 22:02:18 +0900
Subject: [PATCH 0691/2296] Update in line with framed clock changes

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs | 7 ++-----
 osu.Game/Screens/Menu/IntroTriangles.cs | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 5fdabaab46..316d1f8a34 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Beatmaps
 
         private IDisposable? beatmapOffsetSubscription;
 
-        private readonly DecouplingClock decoupledTrack;
+        private readonly DecouplingFramedClock decoupledTrack;
 
         [Resolved]
         private OsuConfigManager config { get; set; } = null!;
@@ -59,7 +59,7 @@ namespace osu.Game.Beatmaps
         {
             this.applyOffsets = applyOffsets;
 
-            decoupledTrack = new DecouplingClock(source) { AllowDecoupling = requireDecoupling };
+            decoupledTrack = new DecouplingFramedClock(source) { AllowDecoupling = requireDecoupling };
 
             // An interpolating clock is used to ensure precise time values even when the host audio subsystem is not reporting
             // high precision times (on windows there's generally only 5-10ms reporting intervals, as an example).
@@ -110,9 +110,6 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
-            if (decoupledTrack.Source is IFrameBasedClock framedClock)
-                framedClock.ProcessFrame();
-
             finalClockSource.ProcessFrame();
 
             if (Clock.ElapsedFrameTime != 0)
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 808680b9e5..aab3afcd24 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Menu
             {
                 PrepareMenuLoad();
 
-                var decouplingClock = new DecouplingClock(UsingThemedIntro ? Track : null);
+                var decouplingClock = new DecouplingFramedClock(UsingThemedIntro ? Track : null);
 
                 LoadComponentAsync(intro = new TrianglesIntroSequence(logo, () => FadeInBackground())
                 {

From 292273edbe6e14671c6ef03e6a44504b20736c23 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 23 Sep 2023 06:31:26 +0300
Subject: [PATCH 0692/2296] Add test scene

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
index ac80463d3a..97e1cae11c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
@@ -64,7 +64,8 @@ namespace osu.Game.Tests.Visual.Online
             new[] { "Plain", "This is plain comment" },
             new[] { "Pinned", "This is pinned comment" },
             new[] { "Link", "Please visit https://osu.ppy.sh" },
-
+            new[] { "Big Image", "![](Backgrounds/bg1)" },
+            new[] { "Small Image", "![](Cursor/cursortrail)" },
             new[]
             {
                 "Heading", @"# Heading 1

From 7c40072c4707a9fab3b3bf4c8ce743ddc871e3e7 Mon Sep 17 00:00:00 2001
From: Fabian van Oeffelt <fabiano2002@gmx.de>
Date: Sat, 23 Sep 2023 13:18:49 +0200
Subject: [PATCH 0693/2296] Get first Spinner,Slider or HitCircle instead of
 only HitCircle Fixes bug

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index b74b722bad..49c6fa65ed 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -61,11 +61,11 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
         {
+            OsuHitObject firstObject = drawableRuleset.Beatmap.HitObjects.Where(o => o is Spinner || o is Slider || o is HitCircle).First();
             // Multiplying by 2 results in an initial size that is too large, hence 1.90 has been chosen
             // Also avoids the HitObject bleeding around the edges of the bubble drawable at minimum size
-            bubbleSize = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.90f);
-            bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimePreempt * 2;
-
+            bubbleSize = (float)firstObject.Radius * 1.90f;
+            bubbleFade = firstObject.TimePreempt * 2;
             // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
             drawableRuleset.Playfield.DisplayJudgements.Value = false;
 

From 734ee0e68b62ec90c9ebf0d71de460e1211c3235 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 24 Sep 2023 02:22:50 +0300
Subject: [PATCH 0694/2296] Simplify code

---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 49c6fa65ed..9c0e43e96f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -61,11 +61,13 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
         {
-            OsuHitObject firstObject = drawableRuleset.Beatmap.HitObjects.Where(o => o is Spinner || o is Slider || o is HitCircle).First();
+            OsuHitObject firstObject = drawableRuleset.Beatmap.HitObjects.First();
+
             // Multiplying by 2 results in an initial size that is too large, hence 1.90 has been chosen
             // Also avoids the HitObject bleeding around the edges of the bubble drawable at minimum size
             bubbleSize = (float)firstObject.Radius * 1.90f;
             bubbleFade = firstObject.TimePreempt * 2;
+
             // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
             drawableRuleset.Playfield.DisplayJudgements.Value = false;
 

From 3c62521e69ff091b54cf9685eaa000fed1fd81ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 Sep 2023 10:50:07 +0900
Subject: [PATCH 0695/2296] Fix OAuth refresh attempt when no network available
 causing full logout

---
 osu.Game/Online/API/OAuth.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs
index 58306c1938..1f26ab5458 100644
--- a/osu.Game/Online/API/OAuth.cs
+++ b/osu.Game/Online/API/OAuth.cs
@@ -99,9 +99,14 @@ namespace osu.Game.Online.API
                     return true;
                 }
             }
+            catch (HttpRequestException)
+            {
+                // Network failure.
+                return false;
+            }
             catch
             {
-                //todo: potentially only kill the refresh token on certain exception types.
+                // Force a full re-reauthentication.
                 Token.Value = null;
                 return false;
             }

From 793d1bf9706dcbf6b26363b3085283898bc3033c Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 25 Sep 2023 12:52:49 +0200
Subject: [PATCH 0696/2296] Add ability to search for difficulty names

---
 .../Select/Carousel/CarouselBeatmap.cs        |  2 +
 osu.Game/Screens/Select/FilterCriteria.cs     | 47 ++++++++++++-------
 osu.Game/Screens/Select/FilterQueryParser.cs  | 19 ++++++++
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 6917bd1da2..f433e71cc3 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -64,6 +64,8 @@ namespace osu.Game.Screens.Select.Carousel
 
             if (!match) return false;
 
+            match &= criteria.DifficultySearchTerms.All(term => term.Matches(BeatmapInfo.DifficultyName));
+
             if (criteria.SearchTerms.Length > 0)
             {
                 var searchableTerms = BeatmapInfo.GetSearchableTerms();
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index a2ae114126..aa3909fa0e 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Screens.Select
         };
 
         public OptionalTextFilter[] SearchTerms = Array.Empty<OptionalTextFilter>();
+        public OptionalTextFilter[] DifficultySearchTerms = Array.Empty<OptionalTextFilter>();
 
         public RulesetInfo? Ruleset;
         public bool AllowConvertedBeatmaps;
@@ -64,24 +65,7 @@ namespace osu.Game.Screens.Select
             {
                 searchText = value;
 
-                List<OptionalTextFilter> terms = new List<OptionalTextFilter>();
-
-                string remainingText = value;
-
-                // First handle quoted segments to ensure we keep inline spaces in exact matches.
-                foreach (Match quotedSegment in Regex.Matches(searchText, "(\"[^\"]+\"[!]?)"))
-                {
-                    terms.Add(new OptionalTextFilter { SearchTerm = quotedSegment.Value });
-                    remainingText = remainingText.Replace(quotedSegment.Value, string.Empty);
-                }
-
-                // Then handle the rest splitting on any spaces.
-                terms.AddRange(remainingText.Split(' ', StringSplitOptions.RemoveEmptyEntries).Select(s => new OptionalTextFilter
-                {
-                    SearchTerm = s
-                }));
-
-                SearchTerms = terms.ToArray();
+                SearchTerms = getTermsFromSearchText(value);
 
                 SearchNumber = null;
 
@@ -90,6 +74,11 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        public string DifficultySearchText
+        {
+            set => DifficultySearchTerms = getTermsFromSearchText(value);
+        }
+
         /// <summary>
         /// Hashes from the <see cref="BeatmapCollection"/> to filter to.
         /// </summary>
@@ -97,6 +86,28 @@ namespace osu.Game.Screens.Select
 
         public IRulesetFilterCriteria? RulesetCriteria { get; set; }
 
+        private static OptionalTextFilter[] getTermsFromSearchText(string searchText)
+        {
+            List<OptionalTextFilter> terms = new List<OptionalTextFilter>();
+
+            string remainingText = searchText;
+
+            // First handle quoted segments to ensure we keep inline spaces in exact matches.
+            foreach (Match quotedSegment in Regex.Matches(searchText, "(\"[^\"]+\"[!]?)"))
+            {
+                terms.Add(new OptionalTextFilter { SearchTerm = quotedSegment.Value });
+                remainingText = remainingText.Replace(quotedSegment.Value, string.Empty);
+            }
+
+            // Then handle the rest splitting on any spaces.
+            terms.AddRange(remainingText.Split(' ', StringSplitOptions.RemoveEmptyEntries).Select(s => new OptionalTextFilter
+            {
+                SearchTerm = s
+            }));
+
+            return terms.ToArray();
+        }
+
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct
         {
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 1238173b41..797493189d 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -19,8 +19,27 @@ namespace osu.Game.Screens.Select
             @"\b(?<key>\w+)(?<op>(:|=|(>|<)(:|=)?))(?<value>("".*""[!]?)|(\S*))",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
+        private static readonly Regex difficulty_query_syntax_regex = new Regex(
+            @"(\s|^)((\[(?>\[(?<level>)|[^[\]]+|\](?<-level>))*(?(level)(?!))\](\s|$))|(\[.*))",
+            RegexOptions.Compiled);
+
         internal static void ApplyQueries(FilterCriteria criteria, string query)
         {
+            foreach (Match match in difficulty_query_syntax_regex.Matches(query))
+            {
+                // Trim the first character because it's always '[' (ignoring spaces)
+                string cleanDifficultyQuery = match.Value.Trim(' ')[1..];
+
+                if (cleanDifficultyQuery.EndsWith(']'))
+                    cleanDifficultyQuery = cleanDifficultyQuery[..^1];
+
+                criteria.DifficultySearchText = cleanDifficultyQuery;
+
+                // Insert whitespace if necessary so that the words before and after the difficulty query aren't joined together.
+                bool insertWhitespace = match.Value.StartsWith(' ') && match.Value.EndsWith(' ');
+                query = query.Replace(match.Value, insertWhitespace ? " " : "");
+            }
+
             foreach (Match match in query_syntax_regex.Matches(query))
             {
                 string key = match.Groups["key"].Value.ToLowerInvariant();

From ab57cbf6f5a1d438963469f4dea27974755559e7 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 25 Sep 2023 12:53:17 +0200
Subject: [PATCH 0697/2296] Add `TestSceneDifficultySearch`

---
 .../SongSelect/TestSceneDifficultySearch.cs   | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs

diff --git a/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs b/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
new file mode 100644
index 0000000000..63963d1101
--- /dev/null
+++ b/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.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 System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Carousel;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.SongSelect
+{
+    public partial class TestSceneDifficultySearch : OsuTestScene
+    {
+        private static readonly (string title, string difficultyName)[] beatmaps =
+        {
+            ("Title1", "Diff1"),
+            ("Title1", "Diff2"),
+            ("My[Favourite]Song", "Expert"),
+            ("Title", "My Favourite Diff"),
+            ("Another One", "diff ]with [[] brackets]]]"),
+        };
+
+        [TestCase("[1]", new[] { 0 })]
+        [TestCase("[1", new[] { 0 })]
+        [TestCase("My[Favourite", new[] { 2 })]
+        [TestCase("My[Favourite]", new[] { 2 })]
+        [TestCase("My[Favourite]Song", new[] { 2 })]
+        [TestCase("Favourite]", new[] { 2 })]
+        [TestCase("[Diff", new[] { 0, 1, 3, 4 })]
+        [TestCase("[Diff]", new[] { 0, 1, 3, 4 })]
+        [TestCase("[Favourite]", new[] { 3 })]
+        [TestCase("Title1 [Diff]", new[] { 0, 1 })]
+        [TestCase("Title1[Diff]", new int[] { })]
+        [TestCase("[diff ]with]", new[] { 4 })]
+        [TestCase("[diff ]with [[] brackets]]]]", new[] { 4 })]
+        public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
+        {
+            var carouselBeatmaps = createCarouselBeatmaps().ToList();
+
+            AddStep("filter beatmaps", () =>
+            {
+                var criteria = new FilterCriteria();
+                FilterQueryParser.ApplyQueries(criteria, query);
+                carouselBeatmaps.ForEach(b => b.Filter(criteria));
+            });
+
+            AddAssert("filtered correctly", () => carouselBeatmaps.All(b =>
+            {
+                int index = carouselBeatmaps.IndexOf(b);
+
+                bool filtered = b.Filtered.Value;
+
+                return filtered != expectedBeatmapIndexes.Contains(index);
+            }));
+        }
+
+        private static IEnumerable<CarouselBeatmap> createCarouselBeatmaps()
+        {
+            return beatmaps.Select(info => new CarouselBeatmap(new BeatmapInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Title = info.title
+                },
+                DifficultyName = info.difficultyName
+            }));
+        }
+    }
+}

From 74896fd6b2f271dfd5ec01c01aa04526a72125c3 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 25 Sep 2023 13:38:47 +0200
Subject: [PATCH 0698/2296] Fix multiple difficulty search queries not working
 in some cases.

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

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 797493189d..58e25adb5b 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -25,8 +25,12 @@ namespace osu.Game.Screens.Select
 
         internal static void ApplyQueries(FilterCriteria criteria, string query)
         {
-            foreach (Match match in difficulty_query_syntax_regex.Matches(query))
+            while (true)
             {
+                var match = difficulty_query_syntax_regex.Matches(query).FirstOrDefault();
+
+                if (match is null) break;
+
                 // Trim the first character because it's always '[' (ignoring spaces)
                 string cleanDifficultyQuery = match.Value.Trim(' ')[1..];
 

From 59d3143645ce5af731bd52fc4a08fc12cc0268be Mon Sep 17 00:00:00 2001
From: Fabian van Oeffelt <fabiano2002@gmx.de>
Date: Mon, 25 Sep 2023 16:53:40 +0200
Subject: [PATCH 0699/2296] Fix SR/BPM Display in Playlist rooms

---
 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 8d08de4168..cfae890323 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -32,6 +32,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Match
 {
@@ -437,6 +438,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
             }
             else
             {
+                var localBeatmap = selected.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineID == selected.Beatmap.OnlineID);
+                UserModsSelectOverlay.Beatmap = beatmapManager.GetWorkingBeatmap(localBeatmap);
                 UserModsSection?.Show();
                 UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());
             }

From 2a3391d83b0e1832a8127d2b8a9b7b6f3e940efb Mon Sep 17 00:00:00 2001
From: Fabian van Oeffelt <fabiano2002@gmx.de>
Date: Mon, 25 Sep 2023 16:56:34 +0200
Subject: [PATCH 0700/2296] Remove unused namepace

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

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index cfae890323..f9482b810a 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -32,7 +32,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
-using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Match
 {

From 2040dcabe067a9daa54f6d6cab490d3c97f4ef45 Mon Sep 17 00:00:00 2001
From: Fabian van Oeffelt <fabiano2002@gmx.de>
Date: Mon, 25 Sep 2023 17:51:39 +0200
Subject: [PATCH 0701/2296] Improve Code Quality

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index f9482b810a..ab29ac6d06 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -437,7 +437,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             }
             else
             {
-                var localBeatmap = selected.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineID == selected.Beatmap.OnlineID);
+                var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineID == selected.Beatmap.OnlineID);
                 UserModsSelectOverlay.Beatmap = beatmapManager.GetWorkingBeatmap(localBeatmap);
                 UserModsSection?.Show();
                 UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());

From 57c00e728b534baec9ff0f035cbf279f6927d0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Sep 2023 14:11:14 +0200
Subject: [PATCH 0702/2296] Update classic scoring algorithm to closer match
 stable score V1

---
 .../Scoring/Legacy/ScoreInfoExtensions.cs     | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index 980b742585..ba56e32268 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -27,44 +27,37 @@ namespace osu.Game.Scoring.Legacy
                                      .DefaultIfEmpty(0)
                                      .Sum();
 
-            // This gives a similar feeling to osu!stable scoring (ScoreV1) while keeping classic scoring as only a constant multiple of standardised scoring.
-            // The invariant is important to ensure that scores don't get re-ordered on leaderboards between the two scoring modes.
-            double scaledRawScore = score / ScoreProcessor.MAX_SCORE;
-
-            return (long)Math.Round(Math.Pow(scaledRawScore * Math.Max(1, maxBasicJudgements), 2) * getStandardisedToClassicMultiplier(rulesetId));
+            return convertStandardisedToClassic(rulesetId, score, maxBasicJudgements);
         }
 
         /// <summary>
-        /// Returns a ballpark multiplier which gives a similar "feel" for how large scores should get when displayed in "classic" mode.
+        /// Returns a ballpark "classic" score which gives a similar "feel" to stable.
         /// This is different per ruleset to match the different algorithms used in the scoring implementation.
         /// </summary>
-        private static double getStandardisedToClassicMultiplier(int rulesetId)
+        /// <remarks>
+        /// The coefficients chosen here were determined by a least-squares fit performed over all beatmaps
+        /// with the goal of minimising the relative error of maximum possible base score (without bonus).
+        /// The constant coefficients (100000, 1 / 10d) - while being detrimental to the least-squares fit - are forced,
+        /// so that every 10 points in standardised mode converts to at least 1 point in classic mode.
+        /// This is done to account for bonus judgements in a way that does not reorder scores.
+        /// </remarks>
+        private static long convertStandardisedToClassic(int rulesetId, long standardisedTotalScore, int objectCount)
         {
-            double multiplier;
-
             switch (rulesetId)
             {
-                // For non-legacy rulesets, just go with the same as the osu! ruleset.
-                // This is arbitrary, but at least allows the setting to do something to the score.
-                default:
                 case 0:
-                    multiplier = 36;
-                    break;
+                    return (long)Math.Round((objectCount * objectCount * 32.57 + 100000) * standardisedTotalScore / ScoreProcessor.MAX_SCORE);
 
                 case 1:
-                    multiplier = 22;
-                    break;
+                    return (long)Math.Round((objectCount * 1109 + 100000) * standardisedTotalScore / ScoreProcessor.MAX_SCORE);
 
                 case 2:
-                    multiplier = 28;
-                    break;
+                    return (long)Math.Round(Math.Pow(standardisedTotalScore / ScoreProcessor.MAX_SCORE * objectCount, 2) * 21.62 + standardisedTotalScore / 10d);
 
                 case 3:
-                    multiplier = 16;
-                    break;
+                default:
+                    return standardisedTotalScore;
             }
-
-            return multiplier;
         }
 
         public static int? GetCountGeki(this ScoreInfo scoreInfo)

From 72c61c3a6a879d66221bf85ed697bd5c7b7d7545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 25 Sep 2023 19:14:22 +0200
Subject: [PATCH 0703/2296] Update osu! scoring tests to match updated formulae

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index e5e96d2033..17a4c80f7f 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -45,9 +45,9 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.Meh, 116_667)]
         [TestCase(ScoringMode.Standardised, HitResult.Ok, 233_338)]
         [TestCase(ScoringMode.Standardised, HitResult.Great, 1_000_000)]
-        [TestCase(ScoringMode.Classic, HitResult.Meh, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.Ok, 2)]
-        [TestCase(ScoringMode.Classic, HitResult.Great, 36)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, 11_670)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, 23_341)]
+        [TestCase(ScoringMode.Classic, HitResult.Great, 100_033)]
         public void TestSingleOsuHit(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
         {
             scoreProcessor.ApplyBeatmap(beatmap);
@@ -84,17 +84,17 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)]
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 4)]
-        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 15)]
-        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 53)]
-        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 140)]
-        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 140)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 7_975)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 15_949)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 30_398)]
+        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 49_546)]
+        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 49_546)]
         [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 11)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 54_189)]
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 9)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 36)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 36)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 49_289)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 100_003)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 100_015)]
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
         {
             var minResult = new TestJudgement(hitResult).MinResult;

From 567bc8fcd346573f1b9086f6636c2020624bc04d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 14:13:51 +0900
Subject: [PATCH 0704/2296] Ensure `DrawableStoryboardSprite`'s texture size
 propagates corectly on skin change

---
 .../Storyboards/Drawables/DrawableStoryboardSprite.cs    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index ad344b6bd4..87c09c3e5e 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -104,7 +104,14 @@ namespace osu.Game.Storyboards.Drawables
             Sprite.ApplyTransforms(this);
         }
 
-        private void skinSourceChanged() => Texture = skin.GetTexture(Sprite.Path) ?? textureStore.Get(Sprite.Path);
+        private void skinSourceChanged()
+        {
+            // Setting texture will only update the size if it's zero.
+            // So let's force an update by setting to zero.
+            Size = Vector2.Zero;
+
+            Texture = skin.GetTexture(Sprite.Path) ?? textureStore.Get(Sprite.Path);
+        }
 
         protected override void Dispose(bool isDisposing)
         {

From d1d82d2b4952a179b5d55ac6f1ed144d07770993 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 15:00:56 +0900
Subject: [PATCH 0705/2296] Improve notification display when score import
 fails

---
 osu.Game/Database/RealmArchiveModelImporter.cs | 2 +-
 osu.Game/Scoring/ScoreImporter.cs              | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmArchiveModelImporter.cs b/osu.Game/Database/RealmArchiveModelImporter.cs
index 9d06c14b4b..d2de00d476 100644
--- a/osu.Game/Database/RealmArchiveModelImporter.cs
+++ b/osu.Game/Database/RealmArchiveModelImporter.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Database
                     return imported;
                 }
 
-                notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import failed!";
+                notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import failed! Check logs for more information.";
                 notification.State = ProgressNotificationState.Cancelled;
             }
             else
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index b85b6a066e..5af53c6f7b 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -62,6 +62,11 @@ namespace osu.Game.Scoring
                     api.Queue(req);
                     return null;
                 }
+                catch (Exception)
+                {
+                    Logger.Log($@"Score '{archive.Name}' failed to import: failed to parse replay headers.", LoggingTarget.Database);
+                    return null;
+                }
             }
         }
 

From ae31a8fadfaf92bf477f050b3f02f5b4fc267839 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 16:19:53 +0900
Subject: [PATCH 0706/2296] Reduce delay before loading beatmap after selection
 change at song select

This was originally set high because of performance concerns. We have
since improved things quite drastically. Even with a very low debounce
my song select is amazingly smooth.

This is about as low as we can got unless we want chaos when key
repeating left/right arrows (it's not as bad as you think, maybe worth
testing during review and see if it feels more expected?).

Of note, stable has key repeat disabled on left/right arrows and zero
debounce.

Addresses concerns in https://github.com/ppy/osu/discussions/24916.
---
 osu.Game/Screens/Select/SongSelect.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 34ee0ae4e8..9c2b1cfe37 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -525,7 +525,11 @@ namespace osu.Game.Screens.Select
             if (beatmapInfoNoDebounce == null)
                 run();
             else
-                selectionChangedDebounce = Scheduler.AddDelayed(run, 200);
+            {
+                // Intentionally slightly higher than repeat_tick_rate to avoid loading songs when holding left / right arrows.
+                // See https://github.com/ppy/osu-framework/blob/master/osu.Framework/Input/InputManager.cs#L44
+                selectionChangedDebounce = Scheduler.AddDelayed(run, 80);
+            }
 
             if (beatmap?.Equals(beatmapInfoPrevious) != true)
             {

From b1561b650f13aee7db98dcda3a5e10dd67029604 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 16:39:36 +0900
Subject: [PATCH 0707/2296] Rename test scene, add xmldoc and increase scale
 factor to something absurdly high

---
 ...tDimensions.cs => TestScenePlayerMaxDimensions.cs} | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneGameplayElementDimensions.cs => TestScenePlayerMaxDimensions.cs} (83%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
similarity index 83%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
rename to osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index ff7cf2a124..0d7a114c28 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayElementDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -14,7 +14,14 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public partial class TestSceneGameplayElementDimensions : TestSceneAllRulesetPlayers
+    /// <summary>
+    /// Upscales all gameplay sprites by a huge amount, to aid in manually checking skin texture size limits
+    /// on individual elements.
+    /// </summary>
+    /// <remarks>
+    /// The HUD is hidden as it does't really affect game balance if HUD elements are larger than they should be.
+    /// </remarks>
+    public partial class TestScenePlayerMaxDimensions : TestSceneAllRulesetPlayers
     {
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
@@ -61,7 +68,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
 
                 if (texture != null)
-                    texture.ScaleAdjust /= 5f;
+                    texture.ScaleAdjust /= 40f;
 
                 return texture;
             }

From 5150c5a64369ead0388136bfee902ffe71983c04 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 16:58:50 +0900
Subject: [PATCH 0708/2296] Adjust osu!mania "major" barlines to be less
 visually distracting

Applies to both "triangles" and "argon" skins.
---
 .../Skinning/Default/DefaultBarLine.cs        | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
index cd85901a65..806b9e0f93 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -33,25 +34,28 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
                 RelativeSizeAxes = Axes.Both,
             });
 
-            Vector2 size = new Vector2(22, 6);
-            const float line_offset = 4;
+            const float major_extension = 10;
 
-            AddInternal(leftAnchor = new Circle
+            AddInternal(leftAnchor = new Box
             {
                 Name = "Left anchor",
+                Blending = BlendingParameters.Additive,
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreRight,
-                Size = size,
-                X = -line_offset,
+                Width = major_extension,
+                RelativeSizeAxes = Axes.Y,
+                Colour = ColourInfo.GradientHorizontal(Colour4.Transparent, Colour4.White),
             });
 
-            AddInternal(rightAnchor = new Circle
+            AddInternal(rightAnchor = new Box
             {
                 Name = "Right anchor",
+                Blending = BlendingParameters.Additive,
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreLeft,
-                Size = size,
-                X = line_offset,
+                Width = major_extension,
+                RelativeSizeAxes = Axes.Y,
+                Colour = ColourInfo.GradientHorizontal(Colour4.White, Colour4.Transparent),
             });
 
             major = ((DrawableBarLine)drawableHitObject).Major.GetBoundCopy();
@@ -66,7 +70,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
         private void updateMajor(ValueChangedEvent<bool> major)
         {
             mainLine.Alpha = major.NewValue ? 0.5f : 0.2f;
-            leftAnchor.Alpha = rightAnchor.Alpha = major.NewValue ? 1 : 0;
+            leftAnchor.Alpha = rightAnchor.Alpha = major.NewValue ? mainLine.Alpha * 0.3f : 0;
         }
     }
 }

From 9949480ccd8d3ecca504cf58dfb2aabe8dbdd441 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 17:06:51 +0900
Subject: [PATCH 0709/2296] Add minor edge smoothing to fix flickering of
 barlines

In most cases.

Closes https://github.com/ppy/osu/issues/15184.
---
 osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
index 806b9e0f93..ef75e9df11 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/DefaultBarLine.cs
@@ -26,9 +26,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
         {
             RelativeSizeAxes = Axes.Both;
 
+            // Avoid flickering due to no anti-aliasing of boxes by default.
+            var edgeSmoothness = new Vector2(0.3f);
+
             AddInternal(mainLine = new Box
             {
                 Name = "Bar line",
+                EdgeSmoothness = edgeSmoothness,
                 Anchor = Anchor.BottomCentre,
                 Origin = Anchor.BottomCentre,
                 RelativeSizeAxes = Axes.Both,
@@ -39,6 +43,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
             AddInternal(leftAnchor = new Box
             {
                 Name = "Left anchor",
+                EdgeSmoothness = edgeSmoothness,
                 Blending = BlendingParameters.Additive,
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreRight,
@@ -50,6 +55,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
             AddInternal(rightAnchor = new Box
             {
                 Name = "Right anchor",
+                EdgeSmoothness = edgeSmoothness,
                 Blending = BlendingParameters.Additive,
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreLeft,

From 859155dda194066a5b06709112d5d4ec94004b78 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 26 Sep 2023 13:48:18 +0900
Subject: [PATCH 0710/2296] Cap maximum spinner RPM based on OD

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 5ef670c739..ca88701c07 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -18,6 +18,16 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class Spinner : OsuHitObject, IHasDuration
     {
+        /// <summary>
+        /// The RPM required to clear the spinner at ODs [ 0, 5, 10 ].
+        /// </summary>
+        private static readonly (int min, int mid, int max) clear_rpm_range = (90, 150, 225);
+
+        /// <summary>
+        /// The RPM required to complete the spinner and receive full score at ODs [ 0, 5, 10 ].
+        /// </summary>
+        private static readonly (int min, int mid, int max) complete_rpm_range = (250, 380, 430);
+
         public double EndTime
         {
             get => StartTime + Duration;
@@ -52,13 +62,16 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            const double maximum_rotations_per_second = 477f / 60f;
+            // The average RPS required over the length of the spinner to clear the spinner.
+            double minRps = IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, clear_rpm_range) / 60;
+
+            // The RPS required over the length of the spinner to receive full score (all normal + bonus ticks).
+            double maxRps = IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, complete_rpm_range) / 60;
 
             double secondsDuration = Duration / 1000;
-            double minimumRotationsPerSecond = IBeatmapDifficultyInfo.DifficultyRange(difficulty.OverallDifficulty, 1.5, 2.5, 3.75);
 
-            SpinsRequired = (int)(secondsDuration * minimumRotationsPerSecond);
-            MaximumBonusSpins = (int)((maximum_rotations_per_second - minimumRotationsPerSecond) * secondsDuration) - bonus_spins_gap;
+            SpinsRequired = (int)(minRps * secondsDuration);
+            MaximumBonusSpins = (int)(maxRps * secondsDuration) - bonus_spins_gap;
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)

From 40a548d372467047693b50352e25ebf217239775 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Sep 2023 17:30:30 +0900
Subject: [PATCH 0711/2296] Adjust new test scene to not be super broken

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index 0d7a114c28..a8ed44c7f8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
 
                 if (texture != null)
-                    texture.ScaleAdjust /= 40f;
+                    texture.ScaleAdjust /= 8f;
 
                 return texture;
             }

From 19a442a32a50f363204a51d81350d002f9c2355f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 26 Sep 2023 17:46:03 +0900
Subject: [PATCH 0712/2296] Fix incorrect change in taiko score simulator

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

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index f3f318f2f2..d4538d3c00 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             {
                 int oldScoreIncrease = scoreIncrease;
 
-                scoreIncrease += (int)(scoreIncrease / 35f * 2 * (difficultyPeppyStars + 1)) * (Math.Min(100, combo) / 10);
+                scoreIncrease += scoreIncrease / 35 * 2 * (difficultyPeppyStars + 1) * (Math.Min(100, combo) / 10);
 
                 if (hitObject is Swell)
                 {

From 05c9f0f9cc5fb811a341ec95e9cc18438afd7792 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 26 Sep 2023 18:11:27 +0900
Subject: [PATCH 0713/2296] Fix bonus requirement not considering number of
 normal ticks

---
 .../TestSceneSpinner.cs                       | 36 ++++++++++++++++++-
 osu.Game.Rulesets.Osu/Objects/Spinner.cs      |  2 +-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 8cfd674f88..b1d9c453d6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -43,7 +43,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("Pitch starts low", () => getSpinningSample().Frequency.Value < 0.8);
             AddUntilStep("Pitch increases", () => getSpinningSample().Frequency.Value > 0.8);
 
-            PausableSkinnableSound getSpinningSample() => drawableSpinner.ChildrenOfType<PausableSkinnableSound>().FirstOrDefault(s => s.Samples.Any(i => i.LookupNames.Any(l => l.Contains("spinnerspin"))));
+            PausableSkinnableSound getSpinningSample() =>
+                drawableSpinner.ChildrenOfType<PausableSkinnableSound>().FirstOrDefault(s => s.Samples.Any(i => i.LookupNames.Any(l => l.Contains("spinnerspin"))));
         }
 
         [TestCase(false)]
@@ -64,6 +65,39 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("Short spinner implicitly completes", () => drawableSpinner.Progress == 1);
         }
 
+        [TestCase(0, 4, 6)]
+        [TestCase(5, 7, 10)]
+        [TestCase(10, 11, 8)]
+        public void TestSpinnerSpinRequirements(int od, int normalTicks, int bonusTicks)
+        {
+            Spinner spinner = null;
+
+            AddStep("add spinner", () => SetContents(_ =>
+            {
+                spinner = new Spinner
+                {
+                    StartTime = Time.Current,
+                    EndTime = Time.Current + 3000,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
+                    }
+                };
+
+                spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { OverallDifficulty = od });
+
+                return drawableSpinner = new TestDrawableSpinner(spinner, true)
+                {
+                    Anchor = Anchor.Centre,
+                    Depth = depthIndex++,
+                    Scale = new Vector2(0.75f)
+                };
+            }));
+
+            AddAssert("number of normal ticks matches", () => spinner.SpinsRequired, () => Is.EqualTo(normalTicks));
+            AddAssert("number of bonus ticks matches", () => spinner.MaximumBonusSpins, () => Is.EqualTo(bonusTicks));
+        }
+
         private Drawable testSingle(float circleSize, bool auto = false, double length = 3000)
         {
             const double delay = 2000;
diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index ca88701c07..aca55c6bd9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             double secondsDuration = Duration / 1000;
 
             SpinsRequired = (int)(minRps * secondsDuration);
-            MaximumBonusSpins = (int)(maxRps * secondsDuration) - bonus_spins_gap;
+            MaximumBonusSpins = Math.Max(0, (int)(maxRps * secondsDuration) - SpinsRequired - bonus_spins_gap);
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)

From 12585c9f2764539a1feb60a6449cbf2c3c66bd0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Sep 2023 16:40:18 +0200
Subject: [PATCH 0714/2296] Fix flaky editor beatmap creation test

Came up as a failure when locally running tests for
ppy/osu-framework#6001 - but the test is actually a previously-known
flaky that I couldn't reproduce the failure of until the aforementioned
PR.

This appears to be a simple race; the test scene queries the track
length from update thread, but the length is actually set on the audio
thread. So it's not unreasonable that given unlucky timing, the length
will not be set by `TrackBass` before it is queried.

To fix, switch assert to until step. I'm generally not really willing
to give this more time of day until this change is proven insufficient.
---
 osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 920e560018..e6c3eea925 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Tests.Visual.Editing
             });
 
             AddAssert("track is not virtual", () => Beatmap.Value.Track is not TrackVirtual);
-            AddAssert("track length changed", () => Beatmap.Value.Track.Length > 60000);
+            AddUntilStep("track length changed", () => Beatmap.Value.Track.Length > 60000);
 
             AddStep("test play", () => Editor.TestGameplay());
 

From 84682b42273cae37a0f814a422ebc36b4970c340 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 16:49:59 +0900
Subject: [PATCH 0715/2296] Add test coverage of incorrect version on missing
 `skin.ini`

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 35 ++++++++++++-----------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 1c1ebe271e..ab3e099c3a 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("test skin", "skinner"), "skin.osk"));
 
             // When the import filename doesn't match, it should be appended (and update the skin.ini).
-            assertCorrectMetadata(import1, "test skin [skin]", "skinner", osu);
+            assertCorrectMetadata(import1, "test skin [skin]", "skinner", 1.0m, osu);
         });
 
         [Test]
@@ -36,7 +36,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("test skin", "skinner", iniFilename: "Skin.InI"), "skin.osk"));
 
             // When the import filename doesn't match, it should be appended (and update the skin.ini).
-            assertCorrectMetadata(import1, "test skin [skin]", "skinner", osu);
+            assertCorrectMetadata(import1, "test skin [skin]", "skinner", 1.0m, osu);
         });
 
         [Test]
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("test skin", "skinner", includeSectionHeader: false), "skin.osk"));
 
             // When the import filename doesn't match, it should be appended (and update the skin.ini).
-            assertCorrectMetadata(import1, "test skin [skin]", "skinner", osu);
+            assertCorrectMetadata(import1, "test skin [skin]", "skinner", 1.0m, osu);
         });
 
         [Test]
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("test skin", "skinner"), "test skin.osk"));
 
             // When the import filename matches it shouldn't be appended.
-            assertCorrectMetadata(import1, "test skin", "skinner", osu);
+            assertCorrectMetadata(import1, "test skin", "skinner", 1.0m, osu);
         });
 
         [Test]
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithNonIniFile(), "test skin.osk"));
 
             // When the import filename matches it shouldn't be appended.
-            assertCorrectMetadata(import1, "test skin", "Unknown", osu);
+            assertCorrectMetadata(import1, "test skin", "Unknown", SkinConfiguration.LATEST_VERSION, osu);
         });
 
         [Test]
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Skins.IO
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createEmptyOsk(), "test skin.osk"));
 
             // When the import filename matches it shouldn't be appended.
-            assertCorrectMetadata(import1, "test skin", "Unknown", osu);
+            assertCorrectMetadata(import1, "test skin", "Unknown", SkinConfiguration.LATEST_VERSION, osu);
         });
 
         #endregion
@@ -102,7 +102,7 @@ namespace osu.Game.Tests.Skins.IO
         public Task TestImportUpperCasedOskArchive() => runSkinTest(async osu =>
         {
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "name 1.OsK"));
-            assertCorrectMetadata(import1, "name 1", "author 1", osu);
+            assertCorrectMetadata(import1, "name 1", "author 1", 1.0m, osu);
 
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "name 1.oSK"));
 
@@ -115,14 +115,14 @@ namespace osu.Game.Tests.Skins.IO
             MemoryStream exportStream = new MemoryStream();
 
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "custom.osk"));
-            assertCorrectMetadata(import1, "name 1 [custom]", "author 1", osu);
+            assertCorrectMetadata(import1, "name 1 [custom]", "author 1", 1.0m, osu);
 
             await new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportToStreamAsync(import1, exportStream);
 
             string exportFilename = import1.GetDisplayString();
 
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(exportStream, $"{exportFilename}.osk"));
-            assertCorrectMetadata(import2, "name 1 [custom]", "author 1", osu);
+            assertCorrectMetadata(import2, "name 1 [custom]", "author 1", 1.0m, osu);
 
             assertImportedOnce(import1, import2);
         });
@@ -133,14 +133,14 @@ namespace osu.Game.Tests.Skins.IO
             MemoryStream exportStream = new MemoryStream();
 
             var import1 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 『1』", "author 1"), "custom.osk"));
-            assertCorrectMetadata(import1, "name 『1』 [custom]", "author 1", osu);
+            assertCorrectMetadata(import1, "name 『1』 [custom]", "author 1", 1.0m, osu);
 
             await new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportToStreamAsync(import1, exportStream);
 
             string exportFilename = import1.GetDisplayString().GetValidFilename();
 
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(exportStream, $"{exportFilename}.osk"));
-            assertCorrectMetadata(import2, "name 『1』 [custom]", "author 1", osu);
+            assertCorrectMetadata(import2, "name 『1』 [custom]", "author 1", 1.0m, osu);
         });
 
         [Test]
@@ -150,7 +150,7 @@ namespace osu.Game.Tests.Skins.IO
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "my custom skin 1"), batchImport);
 
             assertImportedOnce(import1, import2);
-            assertCorrectMetadata(import1, "name 1 [my custom skin 1]", "author 1", osu);
+            assertCorrectMetadata(import1, "name 1 [my custom skin 1]", "author 1", 1.0m, osu);
         });
 
         #endregion
@@ -183,8 +183,8 @@ namespace osu.Game.Tests.Skins.IO
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("test skin v2.1", "skinner"), "skin.osk"));
 
             assertImportedBoth(import1, import2);
-            assertCorrectMetadata(import1, "test skin v2 [skin]", "skinner", osu);
-            assertCorrectMetadata(import2, "test skin v2.1 [skin]", "skinner", osu);
+            assertCorrectMetadata(import1, "test skin v2 [skin]", "skinner", 1.0m, osu);
+            assertCorrectMetadata(import2, "test skin v2.1 [skin]", "skinner", 1.0m, osu);
         });
 
         [Test]
@@ -194,8 +194,8 @@ namespace osu.Game.Tests.Skins.IO
             var import2 = await loadSkinIntoOsu(osu, new ImportTask(createOskWithIni("name 1", "author 1"), "my custom skin 2"));
 
             assertImportedBoth(import1, import2);
-            assertCorrectMetadata(import1, "name 1 [my custom skin 1]", "author 1", osu);
-            assertCorrectMetadata(import2, "name 1 [my custom skin 2]", "author 1", osu);
+            assertCorrectMetadata(import1, "name 1 [my custom skin 1]", "author 1", 1.0m, osu);
+            assertCorrectMetadata(import2, "name 1 [my custom skin 2]", "author 1", 1.0m, osu);
         });
 
         [Test]
@@ -264,7 +264,7 @@ namespace osu.Game.Tests.Skins.IO
 
         #endregion
 
-        private void assertCorrectMetadata(Live<SkinInfo> import1, string name, string creator, OsuGameBase osu)
+        private void assertCorrectMetadata(Live<SkinInfo> import1, string name, string creator, decimal version, OsuGameBase osu)
         {
             import1.PerformRead(i =>
             {
@@ -276,6 +276,7 @@ namespace osu.Game.Tests.Skins.IO
 
                 Assert.That(instance.Configuration.SkinInfo.Name, Is.EqualTo(name));
                 Assert.That(instance.Configuration.SkinInfo.Creator, Is.EqualTo(creator));
+                Assert.That(instance.Configuration.LegacyVersion, Is.EqualTo(version));
             });
         }
 

From c44cca2c23042554cfdc8062939917575c8f15d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 16:45:38 +0900
Subject: [PATCH 0716/2296] Fix skin version being incorrectly set to `1.0`
 when skin is missing `skin.ini`

Closes https://github.com/ppy/osu/issues/24939.
---
 osu.Game/Skinning/Skin.cs         | 9 ++++++++-
 osu.Game/Skinning/SkinImporter.cs | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 5ae4852288..ccf49d722f 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -105,7 +105,14 @@ namespace osu.Game.Skinning
                 Debug.Assert(Configuration != null);
             }
             else
-                Configuration = new SkinConfiguration();
+            {
+                Configuration = new SkinConfiguration
+                {
+                    // generally won't be hit as we always write a `skin.ini` on import, but best be safe than sorry.
+                    // see https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/Graphics/Skinning/SkinManager.cs#L297-L298
+                    LegacyVersion = SkinConfiguration.LATEST_VERSION,
+                };
+            }
 
             // skininfo files may be null for default skin.
             foreach (SkinComponentsContainerLookup.TargetArea skinnableTarget in Enum.GetValues<SkinComponentsContainerLookup.TargetArea>())
diff --git a/osu.Game/Skinning/SkinImporter.cs b/osu.Game/Skinning/SkinImporter.cs
index f2103a45c4..1b6fa7f4ed 100644
--- a/osu.Game/Skinning/SkinImporter.cs
+++ b/osu.Game/Skinning/SkinImporter.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Skinning
             string nameLine = @$"Name: {item.Name}";
             string authorLine = @$"Author: {item.Creator}";
 
-            string[] newLines =
+            List<string> newLines = new List<string>
             {
                 @"// The following content was automatically added by osu! during import, based on filename / folder metadata.",
                 @"[General]",
@@ -130,6 +130,10 @@ namespace osu.Game.Skinning
 
             if (existingFile == null)
             {
+                // skins without a skin.ini are supposed to import using the "latest version" spec.
+                // see https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/Graphics/Skinning/SkinManager.cs#L297-L298
+                newLines.Add($"Version: {SkinConfiguration.LATEST_VERSION}");
+
                 // In the case a skin doesn't have a skin.ini yet, let's create one.
                 writeNewSkinIni();
             }

From 3708e79577472e2c5284fc635eb65a9dd022545f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 16:55:03 +0900
Subject: [PATCH 0717/2296] Adjust logging to still expose the underlying
 exception

---
 osu.Game/Scoring/ScoreImporter.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 5af53c6f7b..2314dbb63b 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -52,19 +52,19 @@ namespace osu.Game.Scoring
                 {
                     return new DatabasedLegacyScoreDecoder(rulesets, beatmaps()).Parse(stream).ScoreInfo;
                 }
-                catch (LegacyScoreDecoder.BeatmapNotFoundException e)
+                catch (LegacyScoreDecoder.BeatmapNotFoundException notFound)
                 {
-                    Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
+                    Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{notFound.Hash}' could be found.", LoggingTarget.Database);
 
                     // In the case of a missing beatmap, let's attempt to resolve it and show a prompt to the user to download the required beatmap.
-                    var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = e.Hash });
-                    req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, e.Hash));
+                    var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = notFound.Hash });
+                    req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, notFound.Hash));
                     api.Queue(req);
                     return null;
                 }
-                catch (Exception)
+                catch (Exception e)
                 {
-                    Logger.Log($@"Score '{archive.Name}' failed to import: failed to parse replay headers.", LoggingTarget.Database);
+                    Logger.Log($@"Failed to parse headers of score '{archive.Name}': {e}.", LoggingTarget.Database);
                     return null;
                 }
             }

From 2481c0b64bc2158d710f8cdc57d6efcc4b05f5f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 17:02:47 +0900
Subject: [PATCH 0718/2296] Don't show replay import "missing beatmap"
 notifications during stable import

Closes https://github.com/ppy/osu/issues/24926.
---
 osu.Game/Beatmaps/BeatmapImporter.cs           |  2 +-
 osu.Game/Database/RealmArchiveModelImporter.cs |  5 +++--
 osu.Game/Scoring/ScoreImporter.cs              | 14 +++++++++-----
 osu.Game/Skinning/SkinImporter.cs              |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index b497b8e8dc..e89e5339e1 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -280,7 +280,7 @@ namespace osu.Game.Beatmaps
 
         public override string HumanisedModelName => "beatmap";
 
-        protected override BeatmapSetInfo? CreateModel(ArchiveReader reader)
+        protected override BeatmapSetInfo? CreateModel(ArchiveReader reader, ImportParameters parameters)
         {
             // let's make sure there are actually .osu files to import.
             string? mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
diff --git a/osu.Game/Database/RealmArchiveModelImporter.cs b/osu.Game/Database/RealmArchiveModelImporter.cs
index 9d06c14b4b..581ed41f75 100644
--- a/osu.Game/Database/RealmArchiveModelImporter.cs
+++ b/osu.Game/Database/RealmArchiveModelImporter.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Database
 
             try
             {
-                model = CreateModel(archive);
+                model = CreateModel(archive, parameters);
 
                 if (model == null)
                     return null;
@@ -474,8 +474,9 @@ namespace osu.Game.Database
         /// Actual expensive population should be done in <see cref="Populate"/>; this should just prepare for duplicate checking.
         /// </summary>
         /// <param name="archive">The archive to create the model for.</param>
+        /// <param name="parameters">Parameters to further configure the import process.</param>
         /// <returns>A model populated with minimal information. Returning a null will abort importing silently.</returns>
-        protected abstract TModel? CreateModel(ArchiveReader archive);
+        protected abstract TModel? CreateModel(ArchiveReader archive, ImportParameters parameters);
 
         /// <summary>
         /// Populate the provided model completely from the given archive.
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index b85b6a066e..28e70cff4f 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Scoring
             this.api = api;
         }
 
-        protected override ScoreInfo? CreateModel(ArchiveReader archive)
+        protected override ScoreInfo? CreateModel(ArchiveReader archive, ImportParameters parameters)
         {
             string name = archive.Filenames.First(f => f.EndsWith(".osr", StringComparison.OrdinalIgnoreCase));
 
@@ -56,10 +56,14 @@ namespace osu.Game.Scoring
                 {
                     Logger.Log($@"Score '{archive.Name}' failed to import: no corresponding beatmap with the hash '{e.Hash}' could be found.", LoggingTarget.Database);
 
-                    // In the case of a missing beatmap, let's attempt to resolve it and show a prompt to the user to download the required beatmap.
-                    var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = e.Hash });
-                    req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, e.Hash));
-                    api.Queue(req);
+                    if (!parameters.Batch)
+                    {
+                        // In the case of a missing beatmap, let's attempt to resolve it and show a prompt to the user to download the required beatmap.
+                        var req = new GetBeatmapRequest(new BeatmapInfo { MD5Hash = e.Hash });
+                        req.Success += res => PostNotification?.Invoke(new MissingBeatmapNotification(res, archive, e.Hash));
+                        api.Queue(req);
+                    }
+
                     return null;
                 }
             }
diff --git a/osu.Game/Skinning/SkinImporter.cs b/osu.Game/Skinning/SkinImporter.cs
index f2103a45c4..b543197296 100644
--- a/osu.Game/Skinning/SkinImporter.cs
+++ b/osu.Game/Skinning/SkinImporter.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
 
         protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path).ToLowerInvariant() == @".osk";
 
-        protected override SkinInfo CreateModel(ArchiveReader archive) => new SkinInfo { Name = archive.Name ?? @"No name" };
+        protected override SkinInfo? CreateModel(ArchiveReader archive, ImportParameters parameters) => new SkinInfo { Name = archive.Name ?? @"No name" };
 
         private const string unknown_creator_string = @"Unknown";
 

From 3705c4c8d5b9cac2422ab1cb8e44244c1f5de085 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 17:16:45 +0900
Subject: [PATCH 0719/2296] Avoid potentially incorrect size adjustment when
 texture doesn't change

---
 .../Storyboards/Drawables/DrawableStoryboardSprite.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 87c09c3e5e..68892a6fc1 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -106,11 +106,11 @@ namespace osu.Game.Storyboards.Drawables
 
         private void skinSourceChanged()
         {
-            // Setting texture will only update the size if it's zero.
-            // So let's force an update by setting to zero.
-            Size = Vector2.Zero;
-
             Texture = skin.GetTexture(Sprite.Path) ?? textureStore.Get(Sprite.Path);
+
+            // Setting texture will only update the size if it's zero.
+            // So let's force an explicit update.
+            Size = new Vector2(Texture.DisplayWidth, Texture.DisplayHeight);
         }
 
         protected override void Dispose(bool isDisposing)

From 175cf68bd6003e61210929642ebf501725ad4b4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 18:13:07 +0900
Subject: [PATCH 0720/2296] Avoid re-fetching `WorkingBeatmap`

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

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index ab29ac6d06..2974035127 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -437,8 +437,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             }
             else
             {
-                var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineID == selected.Beatmap.OnlineID);
-                UserModsSelectOverlay.Beatmap = beatmapManager.GetWorkingBeatmap(localBeatmap);
+                UserModsSelectOverlay.Beatmap = Beatmap.Value;
                 UserModsSection?.Show();
                 UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());
             }

From a639e51ddb8c0de208ea5a6f7b54ffff5487370e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 18:17:25 +0900
Subject: [PATCH 0721/2296] Fix value not updating after missing beatmap is
 imported

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

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2974035127..b8887b3161 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -437,7 +437,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
             }
             else
             {
-                UserModsSelectOverlay.Beatmap = Beatmap.Value;
                 UserModsSection?.Show();
                 UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());
             }
@@ -453,7 +452,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
             var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineID == beatmap.OnlineID);
 
-            Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
+            UserModsSelectOverlay.Beatmap = Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
         protected virtual void UpdateMods()

From e314913aeb0f509b526198af5871ea49269c5952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Sep 2023 11:18:38 +0200
Subject: [PATCH 0722/2296] Handle null texture case

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

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 68892a6fc1..ec875219b6 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Storyboards.Drawables
 
             // Setting texture will only update the size if it's zero.
             // So let's force an explicit update.
-            Size = new Vector2(Texture.DisplayWidth, Texture.DisplayHeight);
+            Size = new Vector2(Texture?.DisplayWidth ?? 0, Texture?.DisplayHeight ?? 0);
         }
 
         protected override void Dispose(bool isDisposing)

From 16e752e07d9d2d37d0ddeb4f849c6a900cc0321d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 18:54:47 +0900
Subject: [PATCH 0723/2296] Add basic structure and test coverage for extended
 info on mod icon

---
 .../Visual/UserInterface/TestSceneModIcon.cs  | 52 +++++++++++++++++++
 osu.Game/Rulesets/Mods/IMod.cs                |  6 +++
 osu.Game/Rulesets/Mods/Mod.cs                 |  3 ++
 osu.Game/Rulesets/Mods/ModRateAdjust.cs       |  2 +
 osu.Game/Rulesets/UI/ModIcon.cs               | 37 +++++++++++--
 5 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
index 897d5fd9f5..15b3e5f310 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
@@ -1,10 +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 System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.UI;
@@ -25,6 +29,54 @@ namespace osu.Game.Tests.Visual.UserInterface
                     ChildrenEnumerable = Ruleset.Value.CreateInstance().CreateAllMods().Select(m => new ModIcon(m)),
                 };
             });
+
+            AddStep("toggle selected", () =>
+            {
+                foreach (var icon in this.ChildrenOfType<ModIcon>())
+                    icon.Selected.Toggle();
+            });
+        }
+
+        [Test]
+        public void TestShowRateAdjusts()
+        {
+            AddStep("create mod icons", () =>
+            {
+                Child = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Full,
+                    ChildrenEnumerable = Ruleset.Value.CreateInstance().CreateAllMods()
+                                                .OfType<ModRateAdjust>()
+                                                .SelectMany((m) =>
+                                                {
+                                                    List<ModIcon> icons = new List<ModIcon> { new ModIcon(m) };
+
+                                                    for (double i = m.SpeedChange.MinValue; i < m.SpeedChange.MaxValue; i += m.SpeedChange.Precision * 10)
+                                                    {
+                                                        m = (ModRateAdjust)m.DeepClone();
+                                                        m.SpeedChange.Value = i;
+                                                        icons.Add(new ModIcon(m));
+                                                    }
+
+                                                    return icons;
+                                                }),
+                };
+            });
+
+            AddStep("adjust rates", () =>
+            {
+                foreach (var icon in this.ChildrenOfType<ModIcon>())
+                {
+                    if (icon.Mod is ModRateAdjust rateAdjust)
+                    {
+                        if (RNG.NextDouble() > 0.9)
+                            rateAdjust.SpeedChange.Value = rateAdjust.SpeedChange.Default;
+                        else
+                            rateAdjust.SpeedChange.Value = RNG.NextDouble(rateAdjust.SpeedChange.MinValue, rateAdjust.SpeedChange.MaxValue);
+                    }
+                }
+            });
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/Mods/IMod.cs b/osu.Game/Rulesets/Mods/IMod.cs
index 05b2510e53..06c470ff2a 100644
--- a/osu.Game/Rulesets/Mods/IMod.cs
+++ b/osu.Game/Rulesets/Mods/IMod.cs
@@ -19,6 +19,12 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         string Name { get; }
 
+        /// <summary>
+        /// Short import information to display on the mod icon. For example, a rate adjust mod's rate
+        /// or similarly important setting.
+        /// </summary>
+        string ExtendedIconInformation { get; }
+
         /// <summary>
         /// The user readable description of this mod.
         /// </summary>
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index a9ecf89df1..a0bdc9ff51 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Rulesets.Mods
 
         public abstract string Acronym { get; }
 
+        [JsonIgnore]
+        public virtual string ExtendedIconInformation => string.Empty;
+
         [JsonIgnore]
         public virtual IconUsage? Icon => null;
 
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index 7b55ba4ad0..5dad01e015 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -28,5 +28,7 @@ namespace osu.Game.Rulesets.Mods
         public override Type[] IncompatibleMods => new[] { typeof(ModTimeRamp), typeof(ModAdaptiveSpeed), typeof(ModRateAdjust) };
 
         public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N2}x";
+
+        public override string ExtendedIconInformation => SettingDescription;
     }
 }
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index bf212ad72f..58f7f2c90d 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Mods;
 using osuTK;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
 
 namespace osu.Game.Rulesets.UI
@@ -27,9 +28,9 @@ namespace osu.Game.Rulesets.UI
     {
         public readonly BindableBool Selected = new BindableBool();
 
-        private readonly SpriteIcon modIcon;
-        private readonly SpriteText modAcronym;
-        private readonly SpriteIcon background;
+        private SpriteIcon modIcon;
+        private SpriteText modAcronym;
+        private SpriteIcon background;
 
         private const float size = 80;
 
@@ -55,6 +56,10 @@ namespace osu.Game.Rulesets.UI
 
         private Color4 backgroundColour;
 
+        private Sprite extendedBackground;
+
+        private OsuSpriteText extendedText;
+
         /// <summary>
         /// Construct a new instance.
         /// </summary>
@@ -64,8 +69,12 @@ namespace osu.Game.Rulesets.UI
         {
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
             this.showTooltip = showTooltip;
+        }
 
-            Size = new Vector2(size);
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            AutoSizeAxes = Axes.Both;
 
             Children = new Drawable[]
             {
@@ -77,6 +86,23 @@ namespace osu.Game.Rulesets.UI
                     Icon = OsuIcon.ModBg,
                     Shadow = true,
                 },
+                extendedBackground = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
+                    X = size - 3,
+                    Size = new Vector2(120, 55),
+                },
+                extendedText = new OsuSpriteText
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Font = OsuFont.Default.With(size: 30f, weight: FontWeight.Bold),
+                    UseFullGlyphHeight = false,
+                    X = size,
+                    Text = mod.ExtendedIconInformation,
+                },
                 modAcronym = new OsuSpriteText
                 {
                     Origin = Anchor.Centre,
@@ -129,7 +155,8 @@ namespace osu.Game.Rulesets.UI
 
         private void updateColour()
         {
-            background.Colour = Selected.Value ? backgroundColour.Lighten(0.2f) : backgroundColour;
+            extendedText.Colour = background.Colour = Selected.Value ? backgroundColour.Lighten(0.2f) : backgroundColour;
+            extendedBackground.Colour = Selected.Value ? backgroundColour.Darken(2.4f) : backgroundColour.Darken(2.8f);
         }
     }
 }

From 192eb541c0df560b126aca56fa8a9d8eb0d1c166 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 19:03:02 +0900
Subject: [PATCH 0724/2296] Adjust sizing to work better with expansion (no
 more centre anchoring)

---
 osu.Game/Rulesets/UI/ModIcon.cs | 105 ++++++++++++++++++++------------
 1 file changed, 66 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 58f7f2c90d..7d1ca412a7 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Rulesets.UI
 
         private OsuSpriteText extendedText;
 
+        private Container extendedContent;
+
         /// <summary>
         /// Construct a new instance.
         /// </summary>
@@ -67,6 +69,9 @@ namespace osu.Game.Rulesets.UI
         /// <param name="showTooltip">Whether a tooltip describing the mod should display on hover.</param>
         public ModIcon(IMod mod, bool showTooltip = true)
         {
+            AutoSizeAxes = Axes.X;
+            Height = size;
+
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
             this.showTooltip = showTooltip;
         }
@@ -74,52 +79,68 @@ namespace osu.Game.Rulesets.UI
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
         {
-            AutoSizeAxes = Axes.Both;
-
             Children = new Drawable[]
             {
-                background = new SpriteIcon
+                new Container
                 {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Name = "main content",
                     Size = new Vector2(size),
-                    Icon = OsuIcon.ModBg,
-                    Shadow = true,
+                    Children = new Drawable[]
+                    {
+                        background = new SpriteIcon
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Size = new Vector2(size),
+                            Icon = OsuIcon.ModBg,
+                            Shadow = true,
+                        },
+                        modAcronym = new OsuSpriteText
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Colour = OsuColour.Gray(84),
+                            Alpha = 0,
+                            Font = OsuFont.Numeric.With(null, 22f),
+                            UseFullGlyphHeight = false,
+                            Text = mod.Acronym
+                        },
+                        modIcon = new SpriteIcon
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Colour = OsuColour.Gray(84),
+                            Size = new Vector2(45),
+                            Icon = FontAwesome.Solid.Question
+                        },
+                    }
                 },
-                extendedBackground = new Sprite
+                extendedContent = new Container
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
-                    X = size - 3,
+                    Name = "extended content",
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
                     Size = new Vector2(120, 55),
-                },
-                extendedText = new OsuSpriteText
-                {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    Font = OsuFont.Default.With(size: 30f, weight: FontWeight.Bold),
-                    UseFullGlyphHeight = false,
-                    X = size,
-                    Text = mod.ExtendedIconInformation,
-                },
-                modAcronym = new OsuSpriteText
-                {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    Colour = OsuColour.Gray(84),
-                    Alpha = 0,
-                    Font = OsuFont.Numeric.With(null, 22f),
-                    UseFullGlyphHeight = false,
-                    Text = mod.Acronym
-                },
-                modIcon = new SpriteIcon
-                {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    Colour = OsuColour.Gray(84),
-                    Size = new Vector2(45),
-                    Icon = FontAwesome.Solid.Question
+                    X = size - 23,
+                    Children = new Drawable[]
+                    {
+                        extendedBackground = new Sprite
+                        {
+                            Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
+                            Size = new Vector2(120, 55),
+                        },
+                        extendedText = new OsuSpriteText
+                        {
+                            Font = OsuFont.Default.With(size: 30f, weight: FontWeight.Bold),
+                            UseFullGlyphHeight = false,
+                            Text = mod.ExtendedIconInformation,
+                            X = 5,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                    }
                 },
             };
         }
@@ -151,6 +172,12 @@ namespace osu.Game.Rulesets.UI
 
             backgroundColour = colours.ForModType(value.Type);
             updateColour();
+
+            bool hasExtended = !string.IsNullOrEmpty(mod.ExtendedIconInformation);
+
+            extendedContent.Alpha = hasExtended ? 1 : 0;
+
+            extendedText.Text = mod.ExtendedIconInformation;
         }
 
         private void updateColour()

From 6e602929a4e3a59b88446cb7bb2c38b23ea3476a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 19:16:31 +0900
Subject: [PATCH 0725/2296] Add support for tracking settings changes

---
 osu.Game/Rulesets/UI/ModIcon.cs | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 7d1ca412a7..6101efc436 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -18,6 +18,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
+using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -44,6 +45,9 @@ namespace osu.Game.Rulesets.UI
             get => mod;
             set
             {
+                if (mod == value)
+                    return;
+
                 mod = value;
 
                 if (IsLoaded)
@@ -62,6 +66,8 @@ namespace osu.Game.Rulesets.UI
 
         private Container extendedContent;
 
+        private ModSettingChangeTracker modSettingsChangeTracker;
+
         /// <summary>
         /// Construct a new instance.
         /// </summary>
@@ -123,7 +129,7 @@ namespace osu.Game.Rulesets.UI
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     Size = new Vector2(120, 55),
-                    X = size - 23,
+                    X = size - 22,
                     Children = new Drawable[]
                     {
                         extendedBackground = new Sprite
@@ -156,6 +162,14 @@ namespace osu.Game.Rulesets.UI
 
         private void updateMod(IMod value)
         {
+            modSettingsChangeTracker?.Dispose();
+
+            if (value is Mod actualMod)
+            {
+                modSettingsChangeTracker = new ModSettingChangeTracker(new[] { actualMod });
+                modSettingsChangeTracker.SettingChanged = _ => updateMod(actualMod);
+            }
+
             modAcronym.Text = value.Acronym;
             modIcon.Icon = value.Icon ?? FontAwesome.Solid.Question;
 
@@ -185,5 +199,11 @@ namespace osu.Game.Rulesets.UI
             extendedText.Colour = background.Colour = Selected.Value ? backgroundColour.Lighten(0.2f) : backgroundColour;
             extendedBackground.Colour = Selected.Value ? backgroundColour.Darken(2.4f) : backgroundColour.Darken(2.8f);
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            modSettingsChangeTracker?.Dispose();
+        }
     }
 }

From 9f4df2988094a19838a7d8b5e574020c933ff607 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 19:16:23 +0900
Subject: [PATCH 0726/2296] Adjust fade durations at player loader to better
 hide mod jank

---
 osu.Game/Screens/Play/PlayerLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 872425e3fd..4054e456b9 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Screens.Play
 
             contentIn();
 
-            MetadataInfo.Delay(750).FadeIn(500);
+            MetadataInfo.Delay(750).FadeIn(500, Easing.OutQuint);
 
             // after an initial delay, start the debounced load check.
             // this will continue to execute even after resuming back on restart.
@@ -420,7 +420,7 @@ namespace osu.Game.Screens.Play
         {
             MetadataInfo.Loading = true;
 
-            content.FadeInFromZero(400);
+            content.FadeInFromZero(500, Easing.OutQuint);
             content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
 
             settingsScroll.FadeInFromZero(500, Easing.Out)

From 1246f151869a99a7d7f404cc6a3c80e522f98f82 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Sep 2023 19:21:10 +0900
Subject: [PATCH 0727/2296] Don't show extended information where it duplicates
 already visible information

---
 .../Online/Leaderboards/LeaderboardScoreTooltip.cs     |  2 +-
 osu.Game/Rulesets/UI/ModIcon.cs                        | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
index 0b2e401f57..48e6be1b17 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Online.Leaderboards
                     Spacing = new Vector2(2f, 0f),
                     Children = new Drawable[]
                     {
-                        new ModIcon(mod, showTooltip: false).With(icon =>
+                        new ModIcon(mod, showTooltip: false, showExtendedInformation: false).With(icon =>
                         {
                             icon.Origin = Anchor.CentreLeft;
                             icon.Anchor = Anchor.CentreLeft;
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 6101efc436..f13ed0d89d 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -38,7 +38,9 @@ namespace osu.Game.Rulesets.UI
         public virtual LocalisableString TooltipText => showTooltip ? ((mod as Mod)?.IconTooltip ?? mod.Name) : null;
 
         private IMod mod;
+
         private readonly bool showTooltip;
+        private readonly bool showExtendedInformation;
 
         public IMod Mod
         {
@@ -73,13 +75,15 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         /// <param name="mod">The mod to be displayed</param>
         /// <param name="showTooltip">Whether a tooltip describing the mod should display on hover.</param>
-        public ModIcon(IMod mod, bool showTooltip = true)
+        /// <param name="showExtendedInformation">Whether to display a mod's extended information, if available.</param>
+        public ModIcon(IMod mod, bool showTooltip = true, bool showExtendedInformation = true)
         {
             AutoSizeAxes = Axes.X;
             Height = size;
 
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
             this.showTooltip = showTooltip;
+            this.showExtendedInformation = showExtendedInformation;
         }
 
         [BackgroundDependencyLoader]
@@ -187,9 +191,9 @@ namespace osu.Game.Rulesets.UI
             backgroundColour = colours.ForModType(value.Type);
             updateColour();
 
-            bool hasExtended = !string.IsNullOrEmpty(mod.ExtendedIconInformation);
+            bool showExtended = showExtendedInformation && !string.IsNullOrEmpty(mod.ExtendedIconInformation);
 
-            extendedContent.Alpha = hasExtended ? 1 : 0;
+            extendedContent.Alpha = showExtended ? 1 : 0;
 
             extendedText.Text = mod.ExtendedIconInformation;
         }

From 83bf1efc1cff73e82356915e5963f454ff0342af Mon Sep 17 00:00:00 2001
From: NiceAesth <nice@aesth.dev>
Date: Wed, 27 Sep 2023 16:29:29 +0300
Subject: [PATCH 0728/2296] Add `color` search alias for `colour` settings

---
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs             | 1 +
 .../Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index 065534eec4..30eca0636c 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Rulesets.Mania
                 },
                 new SettingsCheckbox
                 {
+                    Keywords = new[] { "color" },
                     LabelText = RulesetSettingsStrings.TimingBasedColouring,
                     Current = config.GetBindable<bool>(ManiaRulesetSetting.TimingBasedNoteColouring),
                 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
index 9efdfa9955..69566d85f4 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/BeatmapSettings.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 },
                 new SettingsCheckbox
                 {
-                    Keywords = new[] { "combo", "override" },
+                    Keywords = new[] { "combo", "override", "color" },
                     LabelText = SkinSettingsStrings.BeatmapColours,
                     Current = config.GetBindable<bool>(OsuSetting.BeatmapColours)
                 },
@@ -47,6 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 },
                 new SettingsSlider<float>
                 {
+                    Keywords = new[] { "color" },
                     LabelText = GraphicsSettingsStrings.ComboColourNormalisation,
                     Current = comboColourNormalisation,
                     DisplayAsPercentage = true,

From edf40cc091191d3e4ffdac906992afcfdd1bbfed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Sep 2023 17:09:42 +0200
Subject: [PATCH 0729/2296] Fix nullability inspection

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

diff --git a/osu.Game/Skinning/SkinImporter.cs b/osu.Game/Skinning/SkinImporter.cs
index b543197296..40585a3fd2 100644
--- a/osu.Game/Skinning/SkinImporter.cs
+++ b/osu.Game/Skinning/SkinImporter.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
 
         protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path).ToLowerInvariant() == @".osk";
 
-        protected override SkinInfo? CreateModel(ArchiveReader archive, ImportParameters parameters) => new SkinInfo { Name = archive.Name ?? @"No name" };
+        protected override SkinInfo CreateModel(ArchiveReader archive, ImportParameters parameters) => new SkinInfo { Name = archive.Name ?? @"No name" };
 
         private const string unknown_creator_string = @"Unknown";
 

From 7908b36b398ebd75576fa797eeb05471c3afab08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 15:15:09 +0900
Subject: [PATCH 0730/2296] Flash dialog popup when attempting to exit editor
 while exit is being blocked

---
 osu.Game/Overlays/Dialog/PopupDialog.cs | 27 +++++++++++++++++++++++++
 osu.Game/Screens/Edit/Editor.cs         |  5 ++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 2e9087fdbd..36a9baac67 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -3,6 +3,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -28,6 +31,9 @@ namespace osu.Game.Overlays.Dialog
         private readonly Vector2 ringMinifiedSize = new Vector2(20f);
         private readonly Vector2 buttonsEnterSpacing = new Vector2(0f, 50f);
 
+        private readonly Box flashLayer;
+        private Sample flashSample = null!;
+
         private readonly Container content;
         private readonly Container ring;
         private readonly FillFlowContainer<PopupDialogButton> buttonsContainer;
@@ -208,6 +214,13 @@ namespace osu.Game.Overlays.Dialog
                             AutoSizeAxes = Axes.Y,
                             Direction = FillDirection.Vertical,
                         },
+                        flashLayer = new Box
+                        {
+                            Alpha = 0,
+                            RelativeSizeAxes = Axes.Both,
+                            Blending = BlendingParameters.Additive,
+                            Colour = Color4Extensions.FromHex(@"221a21"),
+                        },
                     },
                 },
             };
@@ -217,6 +230,12 @@ namespace osu.Game.Overlays.Dialog
             Show();
         }
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            flashSample = audio.Samples.Get(@"UI/default-select-disabled");
+        }
+
         /// <summary>
         /// Programmatically clicks the first <see cref="PopupDialogOkButton"/>.
         /// </summary>
@@ -232,6 +251,14 @@ namespace osu.Game.Overlays.Dialog
             Scheduler.AddOnce(() => Buttons.OfType<T>().FirstOrDefault()?.TriggerClick());
         }
 
+        public void Flash()
+        {
+            flashLayer.FadeInFromZero(80, Easing.OutQuint)
+                      .Then()
+                      .FadeOutFromOne(1500, Easing.OutQuint);
+            flashSample.Play();
+        }
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.Repeat) return false;
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 1cdca5754d..1b2e4785db 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -714,8 +714,11 @@ namespace osu.Game.Screens.Edit
                 }
 
                 // if the dialog is already displayed, block exiting until the user explicitly makes a decision.
-                if (dialogOverlay.CurrentDialog is PromptForSaveDialog)
+                if (dialogOverlay.CurrentDialog is PromptForSaveDialog saveDialog)
+                {
+                    saveDialog.Flash();
                     return true;
+                }
 
                 if (isNewBeatmap || HasUnsavedChanges)
                 {

From 4d5b2477dc92cf231f0221581ba16d30d29e9080 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 15:59:06 +0900
Subject: [PATCH 0731/2296] Fix failing song select tack transfer test by using
 a real track

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 43a7da0c28..6737ec9739 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -312,7 +312,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             createSongSelect();
 
-            addRulesetImportStep(0);
+            // We need to use one real beatmap to trigger the "same-track-transfer" logic that we're looking to test here.
+            // See `SongSelect.ensurePlayingSelected` and `WorkingBeatmap.TryTransferTrack`.
+            AddStep("import test beatmap", () => manager.Import(new ImportTask(TestResources.GetTestBeatmapForImport())).WaitSafely());
             addRulesetImportStep(0);
 
             checkMusicPlaying(true);
@@ -321,6 +323,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("manual pause", () => music.TogglePause());
             checkMusicPlaying(false);
+
+            // Track should not have changed, so music should still not be playing.
             AddStep("select next difficulty", () => songSelect!.Carousel.SelectNext(skipDifficulties: false));
             checkMusicPlaying(false);
 

From 7d74d84e6c24e6938d27fae0d7322e113df4be94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 16:47:41 +0900
Subject: [PATCH 0732/2296] Display mod icons using stable ordering

In discussion with nanaya, we likely want this now that we're adding the
ability for some icons to be extended. Historically mod icons have been
displayed in a stable but arbitrary order (based on their position in
the `Mods` enum).

This change aims to make them stable across lazer scores (where they are
stored based on .. the order the user selected them).
---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs     |  3 ++-
 .../Online/Leaderboards/LeaderboardScoreTooltip.cs   |  2 +-
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs    |  3 ++-
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs   |  2 +-
 .../Profile/Sections/Ranks/DrawableProfileScore.cs   | 12 +++++-------
 osu.Game/Rulesets/Mods/ModExtensions.cs              |  5 +++++
 osu.Game/Screens/Play/HUD/ModDisplay.cs              |  2 +-
 osu.Game/Screens/Play/HUD/ModFlowDisplay.cs          |  2 +-
 8 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 229cfd2aa6..136c9cc8e7 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -31,6 +31,7 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Utils;
 
 namespace osu.Game.Online.Leaderboards
@@ -242,7 +243,7 @@ namespace osu.Game.Online.Leaderboards
                                     Origin = Anchor.BottomRight,
                                     AutoSizeAxes = Axes.Both,
                                     Direction = FillDirection.Horizontal,
-                                    ChildrenEnumerable = Score.Mods.Select(mod => new ModIcon(mod) { Scale = new Vector2(0.375f) })
+                                    ChildrenEnumerable = Score.Mods.AsOrdered().Select(mod => new ModIcon(mod) { Scale = new Vector2(0.375f) })
                                 },
                             },
                         },
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
index 0b2e401f57..a8c3b7f587 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Online.Leaderboards
             topScoreStatistics.Clear();
             bottomScoreStatistics.Clear();
 
-            foreach (var mod in score.Mods)
+            foreach (var mod in score.Mods.AsOrdered())
             {
                 modStatistics.Add(new ModCell(mod));
             }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 615a3e39af..1fc997fdad 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -24,6 +24,7 @@ using osu.Framework.Localisation;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring.Drawables;
 
 namespace osu.Game.Overlays.BeatmapSet.Scores
@@ -195,7 +196,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 Direction = FillDirection.Horizontal,
                 AutoSizeAxes = Axes.Both,
                 Spacing = new Vector2(1),
-                ChildrenEnumerable = score.Mods.Select(m => new ModIcon(m)
+                ChildrenEnumerable = score.Mods.AsOrdered().Select(m => new ModIcon(m)
                 {
                     AutoSizeAxes = Axes.Both,
                     Scale = new Vector2(0.3f)
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index c92b79cb4d..72e590b009 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -275,7 +275,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 set
                 {
                     modsContainer.Clear();
-                    modsContainer.Children = value.Select(mod => new ModIcon(mod)
+                    modsContainer.Children = value.AsOrdered().Select(mod => new ModIcon(mod)
                     {
                         AutoSizeAxes = Axes.Both,
                         Scale = new Vector2(0.25f),
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 529e78a7cf..c26f2f19ba 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -15,6 +15,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring.Drawables;
 using osu.Game.Utils;
@@ -48,6 +49,8 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
         {
+            var ruleset = rulesets.GetRuleset(Score.RulesetID)?.CreateInstance() ?? throw new InvalidOperationException($"Ruleset with ID of {Score.RulesetID} not found locally");
+
             AddInternal(new ProfileItemContainer
             {
                 Children = new Drawable[]
@@ -132,14 +135,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                         Origin = Anchor.CentreRight,
                                         Direction = FillDirection.Horizontal,
                                         Spacing = new Vector2(2),
-                                        Children = Score.Mods.Select(mod =>
+                                        Children = Score.Mods.Select(m => m.ToMod(ruleset)).AsOrdered().Select(mod => new ModIcon(mod)
                                         {
-                                            var ruleset = rulesets.GetRuleset(Score.RulesetID) ?? throw new InvalidOperationException($"Ruleset with ID of {Score.RulesetID} not found locally");
-
-                                            return new ModIcon(mod.ToMod(ruleset.CreateInstance()))
-                                            {
-                                                Scale = new Vector2(0.35f)
-                                            };
+                                            Scale = new Vector2(0.35f)
                                         }).ToList(),
                                     }
                                 }
diff --git a/osu.Game/Rulesets/Mods/ModExtensions.cs b/osu.Game/Rulesets/Mods/ModExtensions.cs
index aa106f1203..bd2d42f3eb 100644
--- a/osu.Game/Rulesets/Mods/ModExtensions.cs
+++ b/osu.Game/Rulesets/Mods/ModExtensions.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Scoring;
@@ -28,5 +29,9 @@ namespace osu.Game.Rulesets.Mods
                 }
             };
         }
+
+        public static IEnumerable<Mod> AsOrdered(this IEnumerable<Mod> mods) => mods
+                                                                                .OrderBy(m => m.Type)
+                                                                                .ThenBy(m => m.Acronym);
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index c064cdb040..ba948b516e 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             iconsContainer.Clear();
 
-            foreach (Mod mod in mods.NewValue)
+            foreach (Mod mod in mods.NewValue.AsOrdered())
                 iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
 
             appearTransform();
diff --git a/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs b/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs
index 0b2ce10ac3..f9cf025b47 100644
--- a/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModFlowDisplay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play.HUD
 
             Spacing = new Vector2(0, -12 * iconScale);
 
-            foreach (Mod mod in current.Value)
+            foreach (Mod mod in current.Value.AsOrdered())
             {
                 Add(new ModIcon(mod)
                 {

From 2800920ed97b129767bb5b1ac76a7b01c95d6f78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 16:10:55 +0900
Subject: [PATCH 0733/2296] Adjust font size slightly for better display when
 small

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

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index f13ed0d89d..a7bd8b4556 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.UI
                         },
                         extendedText = new OsuSpriteText
                         {
-                            Font = OsuFont.Default.With(size: 30f, weight: FontWeight.Bold),
+                            Font = OsuFont.Default.With(size: 34f, weight: FontWeight.Bold),
                             UseFullGlyphHeight = false,
                             Text = mod.ExtendedIconInformation,
                             X = 5,

From b8953e8ce1761d113e33193c489318012b148034 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 16:19:06 +0900
Subject: [PATCH 0734/2296] Code quality pass

---
 .../Visual/UserInterface/TestSceneModIcon.cs  |  9 ++++-----
 osu.Game/Rulesets/UI/ModIcon.cs               | 20 +++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
index 15b3e5f310..11cd122c99 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Direction = FillDirection.Full,
                     ChildrenEnumerable = Ruleset.Value.CreateInstance().CreateAllMods()
                                                 .OfType<ModRateAdjust>()
-                                                .SelectMany((m) =>
+                                                .SelectMany(m =>
                                                 {
                                                     List<ModIcon> icons = new List<ModIcon> { new ModIcon(m) };
 
@@ -70,10 +70,9 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     if (icon.Mod is ModRateAdjust rateAdjust)
                     {
-                        if (RNG.NextDouble() > 0.9)
-                            rateAdjust.SpeedChange.Value = rateAdjust.SpeedChange.Default;
-                        else
-                            rateAdjust.SpeedChange.Value = RNG.NextDouble(rateAdjust.SpeedChange.MinValue, rateAdjust.SpeedChange.MaxValue);
+                        rateAdjust.SpeedChange.Value = RNG.NextDouble() > 0.9
+                            ? rateAdjust.SpeedChange.Default
+                            : RNG.NextDouble(rateAdjust.SpeedChange.MinValue, rateAdjust.SpeedChange.MaxValue);
                     }
                 }
             });
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index a7bd8b4556..8aee7e22e6 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.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 osuTK.Graphics;
 using osu.Framework.Allocation;
@@ -29,13 +27,13 @@ namespace osu.Game.Rulesets.UI
     {
         public readonly BindableBool Selected = new BindableBool();
 
-        private SpriteIcon modIcon;
-        private SpriteText modAcronym;
-        private SpriteIcon background;
+        private SpriteIcon modIcon = null!;
+        private SpriteText modAcronym = null!;
+        private SpriteIcon background = null!;
 
         private const float size = 80;
 
-        public virtual LocalisableString TooltipText => showTooltip ? ((mod as Mod)?.IconTooltip ?? mod.Name) : null;
+        public virtual LocalisableString TooltipText => showTooltip ? ((mod as Mod)?.IconTooltip ?? mod.Name) : string.Empty;
 
         private IMod mod;
 
@@ -58,17 +56,17 @@ namespace osu.Game.Rulesets.UI
         }
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         private Color4 backgroundColour;
 
-        private Sprite extendedBackground;
+        private Sprite extendedBackground = null!;
 
-        private OsuSpriteText extendedText;
+        private OsuSpriteText extendedText = null!;
 
-        private Container extendedContent;
+        private Container extendedContent = null!;
 
-        private ModSettingChangeTracker modSettingsChangeTracker;
+        private ModSettingChangeTracker? modSettingsChangeTracker;
 
         /// <summary>
         /// Construct a new instance.

From 2ff376daa42384d7b394bd0471fef91f94e3ed52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 18:30:38 +0900
Subject: [PATCH 0735/2296] Adjust to include shadow, and use new main
 background sprite which includes shadow

---
 osu.Game/Rulesets/UI/ModIcon.cs | 85 +++++++++++++++++----------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 8aee7e22e6..f0b6a27bde 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -2,21 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK.Graphics;
 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.Cursor;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osuTK;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Localisation;
-using osu.Game.Configuration;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -29,9 +29,9 @@ namespace osu.Game.Rulesets.UI
 
         private SpriteIcon modIcon = null!;
         private SpriteText modAcronym = null!;
-        private SpriteIcon background = null!;
+        private Sprite background = null!;
 
-        private const float size = 80;
+        public static readonly Vector2 MOD_ICON_SIZE = new Vector2(80);
 
         public virtual LocalisableString TooltipText => showTooltip ? ((mod as Mod)?.IconTooltip ?? mod.Name) : string.Empty;
 
@@ -76,8 +76,9 @@ namespace osu.Game.Rulesets.UI
         /// <param name="showExtendedInformation">Whether to display a mod's extended information, if available.</param>
         public ModIcon(IMod mod, bool showTooltip = true, bool showExtendedInformation = true)
         {
+            // May expand due to expanded content, so autosize here.
             AutoSizeAxes = Axes.X;
-            Height = size;
+            Height = MOD_ICON_SIZE.Y;
 
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
             this.showTooltip = showTooltip;
@@ -89,21 +90,50 @@ namespace osu.Game.Rulesets.UI
         {
             Children = new Drawable[]
             {
+                extendedContent = new Container
+                {
+                    Name = "extended content",
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Size = new Vector2(116, MOD_ICON_SIZE.Y),
+                    X = MOD_ICON_SIZE.X - 22,
+                    Children = new Drawable[]
+                    {
+                        extendedBackground = new Sprite
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            FillMode = FillMode.Fit,
+                            Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            //Scale = SHADOW_FUDGE
+                        },
+                        extendedText = new OsuSpriteText
+                        {
+                            Font = OsuFont.Default.With(size: 34f, weight: FontWeight.Bold),
+                            UseFullGlyphHeight = false,
+                            Text = mod.ExtendedIconInformation,
+                            X = 5,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                    }
+                },
                 new Container
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     Name = "main content",
-                    Size = new Vector2(size),
+                    Size = MOD_ICON_SIZE,
                     Children = new Drawable[]
                     {
-                        background = new SpriteIcon
+                        background = new Sprite
                         {
-                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            FillMode = FillMode.Fit,
+                            Texture = textures.Get("Icons/BeatmapDetails/mod-icon"),
                             Anchor = Anchor.Centre,
-                            Size = new Vector2(size),
-                            Icon = OsuIcon.ModBg,
-                            Shadow = true,
+                            Origin = Anchor.Centre,
                         },
                         modAcronym = new OsuSpriteText
                         {
@@ -125,31 +155,6 @@ namespace osu.Game.Rulesets.UI
                         },
                     }
                 },
-                extendedContent = new Container
-                {
-                    Name = "extended content",
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    Size = new Vector2(120, 55),
-                    X = size - 22,
-                    Children = new Drawable[]
-                    {
-                        extendedBackground = new Sprite
-                        {
-                            Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
-                            Size = new Vector2(120, 55),
-                        },
-                        extendedText = new OsuSpriteText
-                        {
-                            Font = OsuFont.Default.With(size: 34f, weight: FontWeight.Bold),
-                            UseFullGlyphHeight = false,
-                            Text = mod.ExtendedIconInformation,
-                            X = 5,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        },
-                    }
-                },
             };
         }
 

From d4cf6e100fbd42d35c418263e45f231ae6d5914e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 18:40:00 +0900
Subject: [PATCH 0736/2296] Update other usages of `OsuIcon.ModBg` and remove

---
 osu.Game/Graphics/OsuIcon.cs           |  4 +++-
 osu.Game/Rulesets/UI/ModSwitchSmall.cs | 24 +++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Graphics/OsuIcon.cs b/osu.Game/Graphics/OsuIcon.cs
index 1f4d6a62da..15af8f000b 100644
--- a/osu.Game/Graphics/OsuIcon.cs
+++ b/osu.Game/Graphics/OsuIcon.cs
@@ -89,6 +89,8 @@ namespace osu.Game.Graphics
         public static IconUsage ModSpunOut => Get(0xe046);
         public static IconUsage ModSuddenDeath => Get(0xe047);
         public static IconUsage ModTarget => Get(0xe048);
-        public static IconUsage ModBg => Get(0xe04a);
+
+        // Use "Icons/BeatmapDetails/mod-icon" instead
+        // public static IconUsage ModBg => Get(0xe04a);
     }
 }
diff --git a/osu.Game/Rulesets/UI/ModSwitchSmall.cs b/osu.Game/Rulesets/UI/ModSwitchSmall.cs
index b6058c16ce..927379c684 100644
--- a/osu.Game/Rulesets/UI/ModSwitchSmall.cs
+++ b/osu.Game/Rulesets/UI/ModSwitchSmall.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
@@ -23,8 +24,8 @@ namespace osu.Game.Rulesets.UI
 
         private readonly IMod mod;
 
-        private readonly SpriteIcon background;
-        private readonly SpriteIcon? modIcon;
+        private Drawable background = null!;
+        private SpriteIcon? modIcon;
 
         private Color4 activeForegroundColour;
         private Color4 inactiveForegroundColour;
@@ -36,19 +37,24 @@ namespace osu.Game.Rulesets.UI
         {
             this.mod = mod;
 
-            AutoSizeAxes = Axes.Both;
+            Size = new Vector2(DEFAULT_SIZE);
+        }
 
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures, OsuColour colours, OverlayColourProvider? colourProvider)
+        {
             FillFlowContainer contentFlow;
             ModSwitchTiny tinySwitch;
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
-                background = new SpriteIcon
+                background = new Sprite
                 {
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode = FillMode.Fit,
+                    Texture = textures.Get("Icons/BeatmapDetails/mod-icon"),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(DEFAULT_SIZE),
-                    Icon = OsuIcon.ModBg
                 },
                 contentFlow = new FillFlowContainer
                 {
@@ -78,11 +84,7 @@ namespace osu.Game.Rulesets.UI
                 });
                 tinySwitch.Scale = new Vector2(0.3f);
             }
-        }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, OverlayColourProvider? colourProvider)
-        {
             inactiveForegroundColour = colourProvider?.Background5 ?? colours.Gray3;
             activeForegroundColour = colours.ForModType(mod.Type);
 

From fc4390884fbb70260c88d76dc6e945b613600d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Sep 2023 12:02:57 +0200
Subject: [PATCH 0737/2296] Add `GetDisplayScore()` extension for
 `SoloScoreInfo`

To be used server-side for ppy/osu-queue-score-statistics#134.
---
 osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index 980b742585..2cf4d0f957 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Scoring.Legacy
@@ -16,6 +17,9 @@ namespace osu.Game.Scoring.Legacy
         public static long GetDisplayScore(this ScoreInfo scoreInfo, ScoringMode mode)
             => getDisplayScore(scoreInfo.Ruleset.OnlineID, scoreInfo.TotalScore, mode, scoreInfo.MaximumStatistics);
 
+        public static long GetDisplayScore(this SoloScoreInfo soloScoreInfo, ScoringMode mode)
+            => getDisplayScore(soloScoreInfo.RulesetID, soloScoreInfo.TotalScore, mode, soloScoreInfo.MaximumStatistics);
+
         private static long getDisplayScore(int rulesetId, long score, ScoringMode mode, IReadOnlyDictionary<HitResult, int> maximumStatistics)
         {
             if (mode == ScoringMode.Standardised)

From e0e222c1fa5fa0012d3de7936fff697a67140283 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 22:10:30 +0900
Subject: [PATCH 0738/2296] Include mention of what to do when not using field
 in xmldoc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Rulesets/Mods/IMod.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/IMod.cs b/osu.Game/Rulesets/Mods/IMod.cs
index 06c470ff2a..ce2d123884 100644
--- a/osu.Game/Rulesets/Mods/IMod.cs
+++ b/osu.Game/Rulesets/Mods/IMod.cs
@@ -20,8 +20,9 @@ namespace osu.Game.Rulesets.Mods
         string Name { get; }
 
         /// <summary>
-        /// Short import information to display on the mod icon. For example, a rate adjust mod's rate
+        /// Short important information to display on the mod icon. For example, a rate adjust mod's rate
         /// or similarly important setting.
+        /// Use <see cref="string.Empty"/> if the icon should not display any additional info.
         /// </summary>
         string ExtendedIconInformation { get; }
 

From b1f680337167558d1d514dcf6b15c130ccaed5a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 22:11:03 +0900
Subject: [PATCH 0739/2296] Remove unused commented code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Rulesets/UI/ModIcon.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index f0b6a27bde..578db6dc5d 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -106,7 +106,6 @@ namespace osu.Game.Rulesets.UI
                             Texture = textures.Get("Icons/BeatmapDetails/mod-icon-extender"),
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            //Scale = SHADOW_FUDGE
                         },
                         extendedText = new OsuSpriteText
                         {

From e4fd3b65f4f10d06ad69b812bef7bb5a64419437 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 22:18:28 +0900
Subject: [PATCH 0740/2296] Avoid recreating `ModSettingChangeTracker` unless
 required

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

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 578db6dc5d..8c7c380a59 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.UI
             if (value is Mod actualMod)
             {
                 modSettingsChangeTracker = new ModSettingChangeTracker(new[] { actualMod });
-                modSettingsChangeTracker.SettingChanged = _ => updateMod(actualMod);
+                modSettingsChangeTracker.SettingChanged = _ => updateExtendedInformation();
             }
 
             modAcronym.Text = value.Acronym;
@@ -193,10 +193,14 @@ namespace osu.Game.Rulesets.UI
             backgroundColour = colours.ForModType(value.Type);
             updateColour();
 
+            updateExtendedInformation();
+        }
+
+        private void updateExtendedInformation()
+        {
             bool showExtended = showExtendedInformation && !string.IsNullOrEmpty(mod.ExtendedIconInformation);
 
             extendedContent.Alpha = showExtended ? 1 : 0;
-
             extendedText.Text = mod.ExtendedIconInformation;
         }
 

From f340bb99e807801a1a4ee1c1b1e9790859a7a4eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Sep 2023 22:23:45 +0900
Subject: [PATCH 0741/2296] Nudge text right 1 pixel

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

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 8c7c380a59..5fd1507039 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.UI
                             Font = OsuFont.Default.With(size: 34f, weight: FontWeight.Bold),
                             UseFullGlyphHeight = false,
                             Text = mod.ExtendedIconInformation,
-                            X = 5,
+                            X = 6,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         },

From 39d5025969b41590fa6001cb498fa2a12a276d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Sep 2023 16:58:21 +0200
Subject: [PATCH 0742/2296] Update resources

---
 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 049d4275a4..58e18d3187 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.914.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.928.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From c0728f0b2eeac4741cc236d44000221a75016c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Sep 2023 18:35:15 +0200
Subject: [PATCH 0743/2296] Replace local sort with new utility method

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

diff --git a/osu.Game/Overlays/Mods/ModSettingsArea.cs b/osu.Game/Overlays/Mods/ModSettingsArea.cs
index fe1d683d59..6158c2c70f 100644
--- a/osu.Game/Overlays/Mods/ModSettingsArea.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsArea.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Mods
         {
             modSettingsFlow.Clear();
 
-            foreach (var mod in SelectedMods.Value.OrderBy(mod => mod.Type).ThenBy(mod => mod.Acronym))
+            foreach (var mod in SelectedMods.Value.AsOrdered())
             {
                 var settings = mod.CreateSettingsControls().ToList();
 

From 9a49f44db0325178c9ef13d7e6ccc1347cc54c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Sep 2023 18:42:05 +0200
Subject: [PATCH 0744/2296] Use `AsOrdered()` when presenting mod presets too

---
 osu.Game/Overlays/Mods/EditPresetPopover.cs | 2 +-
 osu.Game/Overlays/Mods/ModPresetTooltip.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index d755825a95..571021b0f8 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Overlays.Mods
 
         private void updateState()
         {
-            scrollContent.ChildrenEnumerable = saveableMods.Select(mod => new ModPresetRow(mod));
+            scrollContent.ChildrenEnumerable = saveableMods.AsOrdered().Select(mod => new ModPresetRow(mod));
             useCurrentModsButton.Enabled.Value = checkSelectedModsDiffersFromSaved();
         }
 
diff --git a/osu.Game/Overlays/Mods/ModPresetTooltip.cs b/osu.Game/Overlays/Mods/ModPresetTooltip.cs
index 8e8259de45..077bd14751 100644
--- a/osu.Game/Overlays/Mods/ModPresetTooltip.cs
+++ b/osu.Game/Overlays/Mods/ModPresetTooltip.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Mods
                 return;
 
             lastPreset = preset;
-            Content.ChildrenEnumerable = preset.Mods.Select(mod => new ModPresetRow(mod));
+            Content.ChildrenEnumerable = preset.Mods.AsOrdered().Select(mod => new ModPresetRow(mod));
         }
 
         protected override void PopIn() => this.FadeIn(transition_duration, Easing.OutQuint);

From 9e90374a904b182eaf5e1020809fc09dab667d48 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 28 Sep 2023 16:48:29 -0700
Subject: [PATCH 0745/2296] Flash discard changes dialog popup when force
 quitting room/playlist creation with changes

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

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index b8887b3161..2cd8e45d28 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -371,8 +371,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 return true;
 
             // if the dialog is already displayed, block exiting until the user explicitly makes a decision.
-            if (dialogOverlay.CurrentDialog is ConfirmDiscardChangesDialog)
+            if (dialogOverlay.CurrentDialog is ConfirmDiscardChangesDialog discardChangesDialog)
+            {
+                discardChangesDialog.Flash();
                 return false;
+            }
 
             dialogOverlay.Push(new ConfirmDiscardChangesDialog(() =>
             {

From c0234ff254f0a4144abd5a893c1a3581aba9bbad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 12:44:26 +0900
Subject: [PATCH 0746/2296] Reduce approach circle's final opacity to match
 stable

Closes #24941.
---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 2f1cf57ebe..4de9a57acb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -191,7 +191,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             CirclePiece.FadeInFromZero(HitObject.TimeFadeIn);
 
-            ApproachCircle.FadeIn(Math.Min(HitObject.TimeFadeIn * 2, HitObject.TimePreempt));
+            ApproachCircle.FadeTo(0.9f, Math.Min(HitObject.TimeFadeIn * 2, HitObject.TimePreempt));
             ApproachCircle.ScaleTo(1f, HitObject.TimePreempt);
             ApproachCircle.Expire(true);
         }

From 81485c548c84226d4e6f59e9b7f221b376eb449d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 14:19:26 +0900
Subject: [PATCH 0747/2296] Move `LegacyLastTickOffset` specification to
 generation code and stop passing everywhere

---
 .../Beatmaps/CatchBeatmapConverter.cs         |  1 -
 .../Objects/JuiceStream.cs                    |  4 +---
 .../Editor/TestSceneSliderSplitting.cs        |  1 -
 .../Beatmaps/OsuBeatmapConverter.cs           |  1 -
 .../Sliders/SliderSelectionBlueprint.cs       |  1 -
 .../Mods/OsuModStrictTracking.cs              |  5 ++---
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  6 ++---
 .../Objects/SliderTailCircle.cs               |  2 +-
 .../Beatmaps/SliderEventGenerationTest.cs     | 16 +++++++-------
 .../Rulesets/Objects/Legacy/ConvertSlider.cs  |  4 +---
 .../Rulesets/Objects/SliderEventGenerator.cs  | 22 ++++++++++++++-----
 .../Objects/Types/IHasLegacyLastTickOffset.cs | 14 ------------
 12 files changed, 32 insertions(+), 45 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 5e8a0b1216..6a24c26844 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -41,7 +41,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         X = xPositionData?.X ?? 0,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
-                        LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0,
                         LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y,
                         SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1
                     }.Yield();
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 724bdc3401..87d316d36d 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Catch.Objects
             int nodeIndex = 0;
             SliderEventDescriptor? lastEvent = null;
 
-            foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken))
+            foreach (var e in SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), cancellationToken))
             {
                 // generate tiny droplets since the last point
                 if (lastEvent != null)
@@ -162,7 +162,5 @@ namespace osu.Game.Rulesets.Catch.Objects
         public double Distance => Path.Distance;
 
         public IList<IList<HitSampleInfo>> NodeSamples { get; set; } = new List<IList<HitSampleInfo>>();
-
-        public double? LegacyLastTickOffset { get; set; }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index 8ba97892fe..7315344295 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -163,7 +163,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 slider = new Slider
                 {
                     Position = new Vector2(0, 50),
-                    LegacyLastTickOffset = 36, // This is necessary for undo to retain the sample control point
                     Path = new SliderPath(new[]
                     {
                         new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
index f3aaf831d3..3c051a6bb1 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         Position = positionData?.Position ?? Vector2.Zero,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
-                        LegacyLastTickOffset = (original as IHasLegacyLastTickOffset)?.LegacyLastTickOffset,
                         // prior to v8, speed multipliers don't adjust for how many ticks are generated over the same distance.
                         // this results in more (or less) ticks being generated in <v8 maps for the same time duration.
                         TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1f / ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(original.StartTime).SliderVelocity : 1,
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 6685507ee0..02023decd6 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -315,7 +315,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     StartTime = HitObject.StartTime,
                     Position = HitObject.Position + splitControlPoints[0].Position,
                     NewCombo = HitObject.NewCombo,
-                    LegacyLastTickOffset = HitObject.LegacyLastTickOffset,
                     Samples = HitObject.Samples.Select(s => s.With()).ToList(),
                     RepeatCount = HitObject.RepeatCount,
                     NodeSamples = HitObject.NodeSamples.Select(n => (IList<HitSampleInfo>)n.Select(s => s.With()).ToList()).ToList(),
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
index 9b5d405025..78062a0632 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
@@ -96,14 +96,13 @@ namespace osu.Game.Rulesets.Osu.Mods
                 Position = original.Position;
                 NewCombo = original.NewCombo;
                 ComboOffset = original.ComboOffset;
-                LegacyLastTickOffset = original.LegacyLastTickOffset;
                 TickDistanceMultiplier = original.TickDistanceMultiplier;
                 SliderVelocityMultiplier = original.SliderVelocityMultiplier;
             }
 
             protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
             {
-                var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken);
+                var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), cancellationToken);
 
                 foreach (var e in sliderEvents)
                 {
@@ -130,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                             });
                             break;
 
-                        case SliderEventType.LegacyLastTick:
+                        case SliderEventType.LastTick:
                             AddNested(TailCircle = new StrictTrackingSliderTailCircle(this)
                             {
                                 RepeatIndex = e.SpanIndex,
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index e05dbd8ea6..9736c69e17 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -71,8 +71,6 @@ namespace osu.Game.Rulesets.Osu.Objects
             }
         }
 
-        public double? LegacyLastTickOffset { get; set; }
-
         /// <summary>
         /// The position of the cursor at the point of completion of this <see cref="Slider"/> if it was hit
         /// with as few movements as possible. This is set and used by difficulty calculation.
@@ -179,7 +177,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.CreateNestedHitObjects(cancellationToken);
 
-            var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), LegacyLastTickOffset, cancellationToken);
+            var sliderEvents = SliderEventGenerator.Generate(StartTime, SpanDuration, Velocity, TickDistance, Path.Distance, this.SpanCount(), cancellationToken);
 
             foreach (var e in sliderEvents)
             {
@@ -206,7 +204,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                         });
                         break;
 
-                    case SliderEventType.LegacyLastTick:
+                    case SliderEventType.LastTick:
                         // we need to use the LegacyLastTick here for compatibility reasons (difficulty).
                         // it is *okay* to use this because the TailCircle is not used for any meaningful purpose in gameplay.
                         // if this is to change, we should revisit this.
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index b4574791d2..fb81936837 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     /// <summary>
     /// Note that this should not be used for timing correctness.
-    /// See <see cref="SliderEventType.LegacyLastTick"/> usage in <see cref="Slider"/> for more information.
+    /// See <see cref="SliderEventType.LastTick"/> usage in <see cref="Slider"/> for more information.
     /// </summary>
     public class SliderTailCircle : SliderEndCircle
     {
diff --git a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
index a26c8121dd..37a91c8611 100644
--- a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
+++ b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestSingleSpan()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, null).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1).ToArray();
 
             Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
             Assert.That(events[0].Time, Is.EqualTo(start_time));
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestRepeat()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 2, null).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 2).ToArray();
 
             Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
             Assert.That(events[0].Time, Is.EqualTo(start_time));
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.Beatmaps
         [Test]
         public void TestNonEvenTicks()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, 300, span_duration, 2, null).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, 300, span_duration, 2).ToArray();
 
             Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
             Assert.That(events[0].Time, Is.EqualTo(start_time));
@@ -83,12 +83,12 @@ namespace osu.Game.Tests.Beatmaps
         }
 
         [Test]
-        public void TestLegacyLastTickOffset()
+        public void TestLastTickOffset()
         {
-            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, 100).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1).ToArray();
 
-            Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LegacyLastTick));
-            Assert.That(events[2].Time, Is.EqualTo(900));
+            Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LastTick));
+            Assert.That(events[2].Time, Is.EqualTo(span_duration + SliderEventGenerator.LAST_TICK_OFFSET));
         }
 
         [Test]
@@ -97,7 +97,7 @@ namespace osu.Game.Tests.Beatmaps
             const double velocity = 5;
             const double min_distance = velocity * 10;
 
-            var events = SliderEventGenerator.Generate(start_time, span_duration, velocity, velocity, span_duration, 2, 0).ToArray();
+            var events = SliderEventGenerator.Generate(start_time, span_duration, velocity, velocity, span_duration, 2).ToArray();
 
             Assert.Multiple(() =>
             {
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index d91ecf956a..ab8fd2c662 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -13,7 +13,7 @@ using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {
-    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset, IHasSliderVelocity
+    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasSliderVelocity
     {
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second.
@@ -59,7 +59,5 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             Velocity = scoringDistance / timingPoint.BeatLength;
         }
-
-        public double LegacyLastTickOffset => 36;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index 7013d32cbc..b3477a5fde 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -10,9 +10,17 @@ namespace osu.Game.Rulesets.Objects
 {
     public static class SliderEventGenerator
     {
-        // ReSharper disable once MethodOverloadWithOptionalParameter
+        /// <summary>
+        /// Historically, slider's final tick (aka the place where the slider would receive a final judgement) was offset by -36 ms. Originally this was
+        /// done to workaround a technical detail (unimportant), but over the years it has become an expectation of players that you don't need to hold
+        /// until the true end of the slider. This very small amount of leniency makes it easier to jump away from fast sliders to the next hit object.
+        ///
+        /// After discussion on how this should be handled going forward, players have unanimously stated that this lenience should remain in some way.
+        /// </summary>
+        public const double LAST_TICK_OFFSET = -36;
+
         public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
-                                                                  double? legacyLastTickOffset, CancellationToken cancellationToken = default)
+                                                                  CancellationToken cancellationToken = default)
         {
             // A very lenient maximum length of a slider for ticks to be generated.
             // This exists for edge cases such as /b/1573664 where the beatmap has been edited by the user, and should never be reached in normal usage.
@@ -76,14 +84,14 @@ namespace osu.Game.Rulesets.Objects
 
             int finalSpanIndex = spanCount - 1;
             double finalSpanStartTime = startTime + finalSpanIndex * spanDuration;
-            double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) - (legacyLastTickOffset ?? 0));
+            double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + LAST_TICK_OFFSET);
             double finalProgress = (finalSpanEndTime - finalSpanStartTime) / spanDuration;
 
             if (spanCount % 2 == 0) finalProgress = 1 - finalProgress;
 
             yield return new SliderEventDescriptor
             {
-                Type = SliderEventType.LegacyLastTick,
+                Type = SliderEventType.LastTick,
                 SpanIndex = finalSpanIndex,
                 SpanStartTime = finalSpanStartTime,
                 Time = finalSpanEndTime,
@@ -173,7 +181,11 @@ namespace osu.Game.Rulesets.Objects
     public enum SliderEventType
     {
         Tick,
-        LegacyLastTick,
+
+        /// <summary>
+        /// Occurs just before the tail. See <see cref="SliderEventGenerator.LAST_TICK_OFFSET"/>.
+        /// </summary>
+        LastTick,
         Head,
         Tail,
         Repeat
diff --git a/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs b/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs
deleted file mode 100644
index caf22c3023..0000000000
--- a/osu.Game/Rulesets/Objects/Types/IHasLegacyLastTickOffset.cs
+++ /dev/null
@@ -1,14 +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.Objects.Types
-{
-    /// <summary>
-    /// A type of <see cref="HitObject"/> which may require the last tick to be offset.
-    /// This is specific to osu!stable conversion, and should not be used elsewhere.
-    /// </summary>
-    public interface IHasLegacyLastTickOffset
-    {
-        double LegacyLastTickOffset { get; }
-    }
-}

From d7119674e8b5063d5350fbed78046aa873865a45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 14:40:44 +0900
Subject: [PATCH 0748/2296] Update comments to better explain what `LastTick`
 is doing

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs        |  4 ++--
 osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs       |  2 +-
 .../Objects/Drawables/DrawableSlider.cs               |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs               | 11 +++++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 87d316d36d..fb1a86d8c0 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -104,8 +104,8 @@ namespace osu.Game.Rulesets.Catch.Objects
                     }
                 }
 
-                // this also includes LegacyLastTick and this is used for TinyDroplet generation above.
-                // this means that the final segment of TinyDroplets are increasingly mistimed where LegacyLastTickOffset is being applied.
+                // this also includes LastTick and this is used for TinyDroplet generation above.
+                // this means that the final segment of TinyDroplets are increasingly mistimed where LastTick is being applied.
                 lastEvent = e;
 
                 switch (e.Type)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
index 9537f8b388..e1123807cd 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSynesthesia.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             d.HitObjectApplied += _ =>
             {
-                // slider tails are a painful edge case, as their start time is offset 36ms back (see `LegacyLastTick`).
+                // slider tails are a painful edge case, as their start time is offset 36ms back (see `LastTick`).
                 // to work around this, look up the slider tail's parenting slider's end time instead to ensure proper snap.
                 double snapTime = d is DrawableSliderTail tail
                     ? tail.Slider.GetEndTime()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 1a6a0a9ecc..77e60a1690 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public override void PlaySamples()
         {
             // rather than doing it this way, we should probably attach the sample to the tail circle.
-            // this can only be done after we stop using LegacyLastTick.
+            // this can only be done if we stop using LastTick.
             if (!TailCircle.SamplePlaysOnlyOnHit || TailCircle.IsHit)
                 base.PlaySamples();
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 9736c69e17..443e4229d2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -205,9 +205,10 @@ namespace osu.Game.Rulesets.Osu.Objects
                         break;
 
                     case SliderEventType.LastTick:
-                        // we need to use the LegacyLastTick here for compatibility reasons (difficulty).
-                        // it is *okay* to use this because the TailCircle is not used for any meaningful purpose in gameplay.
-                        // if this is to change, we should revisit this.
+                        // Of note, we are directly mapping LastTick (instead of `SliderEventType.Tail`)  to SliderTailCircle.
+                        // It is required as difficulty calculation and gameplay relies on reading this value.
+                        // (although it is displayed in classic skins, which may be a concern).
+                        // If this is to change, we should revisit this.
                         AddNested(TailCircle = new SliderTailCircle(this)
                         {
                             RepeatIndex = e.SpanIndex,
@@ -262,7 +263,9 @@ namespace osu.Game.Rulesets.Osu.Objects
             if (HeadCircle != null)
                 HeadCircle.Samples = this.GetNodeSamples(0);
 
-            // The samples should be attached to the slider tail, however this can only be done after LegacyLastTick is removed otherwise they would play earlier than they're intended to.
+            // The samples should be attached to the slider tail, however this can only be done if LastTick is removed otherwise they would play earlier than they're intended to.
+            // (see mapping logic in `CreateNestedHitObjects` above)
+            //
             // For now, the samples are played by the slider itself at the correct end time.
             TailSamples = this.GetNodeSamples(repeatCount + 1);
         }

From 55c623ff02d12c6d2d2d995903f9eb707310210d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 14:47:55 +0900
Subject: [PATCH 0749/2296] Apply NRT to `TestSceneSliderInput`

---
 .../TestSceneSliderInput.cs                        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 644524f532..4020d22910 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.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 NUnit.Framework;
@@ -33,7 +31,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         private const double time_during_slide_4 = 3800;
         private const double time_slider_end = 4000;
 
-        private List<JudgementResult> judgementResults;
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
+
+        private const float slider_path_length = 25;
+
+        private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
         [Test]
         public void TestPressBothKeysSimultaneouslyAndReleaseOne()
@@ -333,10 +335,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.SmallTickMiss;
 
-        private ScoreAccessibleReplayPlayer currentPlayer;
-
-        private const float slider_path_length = 25;
-
         private void performTest(List<ReplayFrame> frames)
         {
             AddStep("load player", () =>
@@ -375,7 +373,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 };
 
                 LoadScreen(currentPlayer = p);
-                judgementResults = new List<JudgementResult>();
+                judgementResults.Clear();
             });
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);

From 135d2497e7fe918c6a7bb9cc2fc1c542c40223c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 15:15:39 +0900
Subject: [PATCH 0750/2296] Add gameplay test coverage around last tick of
 slider

This includes proposed changes as per
https://github.com/ppy/osu/issues/22805#issuecomment-1740377493.
---
 .../TestSceneSliderInput.cs                   | 81 +++++++++++++++----
 1 file changed, 66 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 4020d22910..a9d8860369 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -37,6 +37,58 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
+        [Test]
+        public void TestTrackingAtTailButNotLastTick()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 350 },
+                new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 380 },
+            }, new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 10f,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(slider_path_length * 10, 0),
+                    new Vector2(slider_path_length * 10, slider_path_length),
+                    new Vector2(0, slider_path_length),
+                }),
+            });
+
+            AddAssert("Full judgement awarded", assertMaxJudge);
+        }
+
+        [Test]
+        public void TestTrackingAtLastTickButNotTail()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 350 },
+                new OsuReplayFrame { Position = new Vector2(100, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 380 },
+            }, new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 10f,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(slider_path_length * 10, 0),
+                    new Vector2(slider_path_length * 10, slider_path_length),
+                    new Vector2(0, slider_path_length),
+                }),
+            });
+
+            AddAssert("Full judgement awarded", assertMaxJudge);
+        }
+
         [Test]
         public void TestPressBothKeysSimultaneouslyAndReleaseOne()
         {
@@ -335,26 +387,25 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.SmallTickMiss;
 
-        private void performTest(List<ReplayFrame> frames)
+        private void performTest(List<ReplayFrame> frames, Slider? slider = null)
         {
+            slider ??= new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 0.1f,
+                Path = new SliderPath(PathType.PerfectCurve, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(slider_path_length, 0),
+                }, slider_path_length),
+            };
+
             AddStep("load player", () =>
             {
                 Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
                 {
-                    HitObjects =
-                    {
-                        new Slider
-                        {
-                            StartTime = time_slider_start,
-                            Position = new Vector2(0, 0),
-                            SliderVelocityMultiplier = 0.1f,
-                            Path = new SliderPath(PathType.PerfectCurve, new[]
-                            {
-                                Vector2.Zero,
-                                new Vector2(slider_path_length, 0),
-                            }, slider_path_length),
-                        }
-                    },
+                    HitObjects = { slider },
                     BeatmapInfo =
                     {
                         Difficulty = new BeatmapDifficulty { SliderTickRate = 3 },

From e3695d2be017d7acb88b6e1d57e5aaffe3f672ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 16:08:28 +0900
Subject: [PATCH 0751/2296] Adjust slider judgement logic to allow tracking
 anywhere after last tick

---
 .../Objects/Drawables/DrawableSlider.cs                |  2 +-
 .../Objects/Drawables/DrawableSliderTail.cs            | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 77e60a1690..f4138bdf91 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (userTriggered || Time.Current < HitObject.EndTime)
+            if (userTriggered || !TailCircle.Judged)
                 return;
 
             // If only the nested hitobjects are judged, then the slider's own judgement is ignored for scoring purposes.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 9fbc97c484..6344a6d30f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -8,6 +8,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
@@ -125,8 +126,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (!userTriggered && timeOffset >= 0)
-                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            if (userTriggered)
+                return;
+
+            if (timeOffset >= 0 && Tracking)
+                ApplyResult(r => r.Type = r.Judgement.MaxResult);
+            else if (timeOffset >= -SliderEventGenerator.LAST_TICK_OFFSET)
+                ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
 
         protected override void OnApply()

From dd6d09189e21d7a58df891823ba1daf9e8625c83 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 16:20:21 +0900
Subject: [PATCH 0752/2296] Remove usage of `LastTick` in osu! ruleset

---
 osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs          | 2 +-
 .../Objects/Drawables/DrawableSliderTail.cs                 | 6 ++++--
 osu.Game.Rulesets.Osu/Objects/Slider.cs                     | 6 +-----
 osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs           | 5 -----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
index 78062a0632..c465ab8732 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                             });
                             break;
 
-                        case SliderEventType.LastTick:
+                        case SliderEventType.Tail:
                             AddNested(TailCircle = new StrictTrackingSliderTailCircle(this)
                             {
                                 RepeatIndex = e.SpanIndex,
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 6344a6d30f..7daab820dd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -129,9 +129,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered)
                 return;
 
-            if (timeOffset >= 0 && Tracking)
+            // The player needs to have engaged in tracking at any point after the tail leniency cutoff.
+            // An actual tick miss should only occur if reaching the tick itself.
+            if (timeOffset >= SliderEventGenerator.TAIL_LENIENCY && Tracking)
                 ApplyResult(r => r.Type = r.Judgement.MaxResult);
-            else if (timeOffset >= -SliderEventGenerator.LAST_TICK_OFFSET)
+            else if (timeOffset >= 0)
                 ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 443e4229d2..c62659d67a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -204,11 +204,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                         });
                         break;
 
-                    case SliderEventType.LastTick:
-                        // Of note, we are directly mapping LastTick (instead of `SliderEventType.Tail`)  to SliderTailCircle.
-                        // It is required as difficulty calculation and gameplay relies on reading this value.
-                        // (although it is displayed in classic skins, which may be a concern).
-                        // If this is to change, we should revisit this.
+                    case SliderEventType.Tail:
                         AddNested(TailCircle = new SliderTailCircle(this)
                         {
                             RepeatIndex = e.SpanIndex,
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index fb81936837..54d2afb444 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -2,16 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
 {
-    /// <summary>
-    /// Note that this should not be used for timing correctness.
-    /// See <see cref="SliderEventType.LastTick"/> usage in <see cref="Slider"/> for more information.
-    /// </summary>
     public class SliderTailCircle : SliderEndCircle
     {
         public SliderTailCircle(Slider slider)

From 62bcb6284232833fbec4f30a8f79bfa635771ddf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 16:44:04 +0900
Subject: [PATCH 0753/2296] Document remaining pieces of `LastTick` and add
 back legacy prefix for generation flow

---
 .../Beatmaps/SliderEventGenerationTest.cs         |  4 ++--
 osu.Game/Rulesets/Objects/SliderEventGenerator.cs | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
index 37a91c8611..c7cf3fe956 100644
--- a/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
+++ b/osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
@@ -87,8 +87,8 @@ namespace osu.Game.Tests.Beatmaps
         {
             var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1).ToArray();
 
-            Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LastTick));
-            Assert.That(events[2].Time, Is.EqualTo(span_duration + SliderEventGenerator.LAST_TICK_OFFSET));
+            Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LegacyLastTick));
+            Assert.That(events[2].Time, Is.EqualTo(span_duration + SliderEventGenerator.TAIL_LENIENCY));
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index b3477a5fde..42c422a637 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -16,8 +16,12 @@ namespace osu.Game.Rulesets.Objects
         /// until the true end of the slider. This very small amount of leniency makes it easier to jump away from fast sliders to the next hit object.
         ///
         /// After discussion on how this should be handled going forward, players have unanimously stated that this lenience should remain in some way.
+        /// These days, this is implemented in the drawable implementation of Slider in the osu! ruleset.
+        ///
+        /// We need to keep the <see cref="SliderEventType.LegacyLastTick"/> *only* for osu!catch conversion, which relies on it to generate tiny ticks
+        /// correctly.
         /// </summary>
-        public const double LAST_TICK_OFFSET = -36;
+        public const double TAIL_LENIENCY = -36;
 
         public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
                                                                   CancellationToken cancellationToken = default)
@@ -84,14 +88,14 @@ namespace osu.Game.Rulesets.Objects
 
             int finalSpanIndex = spanCount - 1;
             double finalSpanStartTime = startTime + finalSpanIndex * spanDuration;
-            double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + LAST_TICK_OFFSET);
+            double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + TAIL_LENIENCY);
             double finalProgress = (finalSpanEndTime - finalSpanStartTime) / spanDuration;
 
             if (spanCount % 2 == 0) finalProgress = 1 - finalProgress;
 
             yield return new SliderEventDescriptor
             {
-                Type = SliderEventType.LastTick,
+                Type = SliderEventType.LegacyLastTick,
                 SpanIndex = finalSpanIndex,
                 SpanStartTime = finalSpanStartTime,
                 Time = finalSpanEndTime,
@@ -183,9 +187,10 @@ namespace osu.Game.Rulesets.Objects
         Tick,
 
         /// <summary>
-        /// Occurs just before the tail. See <see cref="SliderEventGenerator.LAST_TICK_OFFSET"/>.
+        /// Occurs just before the tail. See <see cref="SliderEventGenerator.TAIL_LENIENCY"/>.
+        /// Should generally be ignored.
         /// </summary>
-        LastTick,
+        LegacyLastTick,
         Head,
         Tail,
         Repeat

From 22cb168c0ffef3e1cef825e15f2e030135ac5039 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 17:17:04 +0900
Subject: [PATCH 0754/2296] Add test coverage of tracking inside lenience
 period but not at tick or end

---
 .../TestSceneSliderInput.cs                   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index a9d8860369..cf02e0eb32 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -37,6 +37,33 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
+        [Test]
+        public void TestTrackingBetweenLastTickAndTail()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 480 },
+                new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 500 },
+                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 520 },
+            }, new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 10f,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(slider_path_length * 10, 0),
+                    new Vector2(slider_path_length * 10, slider_path_length),
+                    new Vector2(0, slider_path_length),
+                }),
+            });
+
+            AddAssert("Full judgement awarded", assertMaxJudge);
+        }
+
         [Test]
         public void TestTrackingAtTailButNotLastTick()
         {

From 94f4268ae5de46ab33849e6ba6583f616f1a55b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 18:23:22 +0900
Subject: [PATCH 0755/2296] Fix object dim being applied to approach circles

Fixes half of https://github.com/ppy/osu/issues/24956.

The other half is high effort. The number portion is nested deeply and
with reason - depending on skin setting it changes the visual order.

I'm not sure how to fix that one, but I also think it's weird behaviour
and if people don't complain, it's probably fine to just dim the number
for consistency.

That said, the approach circle is an important one to ensure it matches
1:1, so I've fixed that here.
---
 .../Objects/Drawables/DrawableHitCircle.cs      |  6 ++++++
 .../Objects/Drawables/DrawableOsuHitObject.cs   | 17 ++++++++---------
 .../Objects/Drawables/DrawableSlider.cs         |  8 ++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 4de9a57acb..e87a075a11 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -34,6 +35,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public HitReceptor HitArea { get; private set; }
         public SkinnableDrawable CirclePiece { get; private set; }
 
+        protected override IEnumerable<Drawable> DimmablePieces => new[]
+        {
+            CirclePiece,
+        };
+
         Drawable IHasApproachCircle.ApproachCircle => ApproachCircle;
 
         private Container scaleContainer;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 920dfcab03..ed981d2d5d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -4,6 +4,8 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -71,20 +73,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
         }
 
+        protected virtual IEnumerable<Drawable> DimmablePieces => Enumerable.Empty<Drawable>();
+
         protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();
 
-            // Dim should only be applied at a top level, as it will be implicitly applied to nested objects.
-            if (ParentHitObject == null)
+            foreach (var piece in DimmablePieces)
             {
-                // 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);
+                piece.FadeColour(new Color4(195, 195, 195, 255));
+                using (piece.BeginDelayedSequence(InitialLifetimeOffset - OsuHitWindows.MISS_WINDOW))
+                    piece.FadeColour(Color4.White, 100);
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 1a6a0a9ecc..07e448937f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -35,6 +36,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private ShakeContainer shakeContainer;
 
+        protected override IEnumerable<Drawable> DimmablePieces => new Drawable[]
+        {
+            HeadCircle,
+            TailCircle,
+            Body,
+        };
+
         /// <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.

From 23c20ca5f44c6eb1a56ce5f6c932dd951e5945b5 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Fri, 29 Sep 2023 13:44:11 +0200
Subject: [PATCH 0756/2296] Add xmldocs

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

diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index aa3909fa0e..1bcff601e5 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -46,6 +46,10 @@ namespace osu.Game.Screens.Select
         };
 
         public OptionalTextFilter[] SearchTerms = Array.Empty<OptionalTextFilter>();
+
+        /// <summary>
+        /// Search terms that are used for searching difficulty names.
+        /// </summary>
         public OptionalTextFilter[] DifficultySearchTerms = Array.Empty<OptionalTextFilter>();
 
         public RulesetInfo? Ruleset;
@@ -74,6 +78,10 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        /// <summary>
+        /// Extracts the search terms from the provided <see cref="string"/>
+        /// and stores them in <see cref="DifficultySearchTerms"/>.
+        /// </summary>
         public string DifficultySearchText
         {
             set => DifficultySearchTerms = getTermsFromSearchText(value);

From c927f90a4834ccf2d5f7c8108feeebfb6ebbfd66 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Fri, 29 Sep 2023 13:44:42 +0200
Subject: [PATCH 0757/2296] Replace regex with a custom algorithm and update
 test scene.

---
 .../SongSelect/TestSceneDifficultySearch.cs   |  5 +-
 osu.Game/Screens/Select/FilterQueryParser.cs  | 90 ++++++++++++++-----
 2 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs b/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
index 63963d1101..f013d5c19a 100644
--- a/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
+++ b/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.SongSelect
             ("Title1", "Diff2"),
             ("My[Favourite]Song", "Expert"),
             ("Title", "My Favourite Diff"),
-            ("Another One", "diff ]with [[] brackets]]]"),
+            ("Another One", "diff ]with [[ brackets]]]"),
         };
 
         [TestCase("[1]", new[] { 0 })]
@@ -34,7 +34,8 @@ namespace osu.Game.Tests.SongSelect
         [TestCase("Title1 [Diff]", new[] { 0, 1 })]
         [TestCase("Title1[Diff]", new int[] { })]
         [TestCase("[diff ]with]", new[] { 4 })]
-        [TestCase("[diff ]with [[] brackets]]]]", new[] { 4 })]
+        [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
+        [TestCase("[diff] another [brackets]", new[] { 4 })]
         public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
         {
             var carouselBeatmaps = createCarouselBeatmaps().ToList();
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 58e25adb5b..08fe86713a 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -19,30 +19,9 @@ namespace osu.Game.Screens.Select
             @"\b(?<key>\w+)(?<op>(:|=|(>|<)(:|=)?))(?<value>("".*""[!]?)|(\S*))",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        private static readonly Regex difficulty_query_syntax_regex = new Regex(
-            @"(\s|^)((\[(?>\[(?<level>)|[^[\]]+|\](?<-level>))*(?(level)(?!))\](\s|$))|(\[.*))",
-            RegexOptions.Compiled);
-
         internal static void ApplyQueries(FilterCriteria criteria, string query)
         {
-            while (true)
-            {
-                var match = difficulty_query_syntax_regex.Matches(query).FirstOrDefault();
-
-                if (match is null) break;
-
-                // Trim the first character because it's always '[' (ignoring spaces)
-                string cleanDifficultyQuery = match.Value.Trim(' ')[1..];
-
-                if (cleanDifficultyQuery.EndsWith(']'))
-                    cleanDifficultyQuery = cleanDifficultyQuery[..^1];
-
-                criteria.DifficultySearchText = cleanDifficultyQuery;
-
-                // Insert whitespace if necessary so that the words before and after the difficulty query aren't joined together.
-                bool insertWhitespace = match.Value.StartsWith(' ') && match.Value.EndsWith(' ');
-                query = query.Replace(match.Value, insertWhitespace ? " " : "");
-            }
+            criteria.DifficultySearchText = extractDifficultySearchText(ref query);
 
             foreach (Match match in query_syntax_regex.Matches(query))
             {
@@ -57,6 +36,73 @@ namespace osu.Game.Screens.Select
             criteria.SearchText = query;
         }
 
+        /// <summary>
+        /// Extracts and returns the difficulty search text between square brackets.
+        /// </summary>
+        /// <param name="query">The search query. The difficulty search text will be removed from the query.</param>
+        /// <returns>The difficulty search text (without the square brackets).</returns>
+        private static string extractDifficultySearchText(ref string query)
+        {
+            var openingBracketIndexes = new List<int>();
+            var closingBracketIndexes = new List<int>();
+
+            populateIndexLists(ref query);
+
+            return performExtraction(ref query);
+
+            void populateIndexLists(ref string query)
+            {
+                bool currentlyBetweenBrackets = false;
+
+                for (int i = 0; i < query.Length; i++)
+                {
+                    switch (query[i])
+                    {
+                        case '[' when !currentlyBetweenBrackets && (i == 0 || query[i - 1] == ' '):
+                            currentlyBetweenBrackets = true;
+                            openingBracketIndexes.Add(i + 1);
+                            break;
+
+                        case ']' when currentlyBetweenBrackets && (i == query.Length - 1 || query[i + 1] == ' '):
+                            currentlyBetweenBrackets = false;
+                            closingBracketIndexes.Add(i);
+                            break;
+                    }
+                }
+
+                if (currentlyBetweenBrackets)
+                {
+                    // If there is no "]" closing the current difficulty search query, append it.
+                    query += ']';
+                    closingBracketIndexes.Add(query.Length - 1);
+                }
+            }
+
+            string performExtraction(ref string query)
+            {
+                var searchTexts = new List<string>();
+                string originalQuery = query;
+
+                for (int i = 0; i < openingBracketIndexes.Count; i++)
+                {
+                    int startIndex = openingBracketIndexes[i];
+                    int endIndex = closingBracketIndexes[i];
+
+                    string searchText = originalQuery[startIndex..endIndex];
+
+                    searchTexts.Add(searchText);
+
+                    query = query
+                            .Replace($" [{searchText}]", "")
+                            .Replace($"[{searchText}] ", "")
+                            .Replace($"[{searchText}]", "")
+                            .Replace($" [{searchText}] ", " ");
+                }
+
+                return string.Join(' ', searchTexts);
+            }
+        }
+
         private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key, string value, Operator op)
         {
             switch (key)

From 0bcb99f2c46cf08e0c05e1cd27a0662a4a1e375b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 30 Sep 2023 01:16:56 +0300
Subject: [PATCH 0758/2296] Crop oversized gameplay textures instead of
 downscaling them

---
 osu.Game/Skinning/LegacySkinExtensions.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index dde6c1fa29..868f36fb34 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osuTK;
@@ -112,9 +113,11 @@ namespace osu.Game.Skinning
             if (texture.DisplayWidth <= maxSize.X && texture.DisplayHeight <= maxSize.Y)
                 return texture;
 
-            // use scale adjust property for downscaling the texture in order to meet the specified maximum dimensions.
-            texture.ScaleAdjust *= Math.Max(texture.DisplayWidth / maxSize.X, texture.DisplayHeight / maxSize.Y);
-            return texture;
+            maxSize *= texture.ScaleAdjust;
+
+            var croppedTexture = texture.Crop(new RectangleF(texture.Width / 2f - maxSize.X / 2f, texture.Height / 2f - maxSize.Y / 2f, maxSize.X, maxSize.Y));
+            croppedTexture.ScaleAdjust = texture.ScaleAdjust;
+            return croppedTexture;
         }
 
         public static bool HasFont(this ISkin source, LegacyFont font)

From 314ecec65b34c73a293e7f8fbf14183c5dcfa6b4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 30 Sep 2023 01:17:59 +0300
Subject: [PATCH 0759/2296] Refactor player max dimensions test scene to
 actually upscale textures

---
 .../Gameplay/TestScenePlayerMaxDimensions.cs  | 77 ++++++++++++++++---
 osu.Game/Skinning/Skin.cs                     |  5 +-
 2 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index a8ed44c7f8..68443b234b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -3,14 +3,20 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Processing;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -23,6 +29,9 @@ namespace osu.Game.Tests.Visual.Gameplay
     /// </remarks>
     public partial class TestScenePlayerMaxDimensions : TestSceneAllRulesetPlayers
     {
+        // scale textures to 4 times their size.
+        private const int scale_factor = 4;
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
@@ -63,18 +72,66 @@ namespace osu.Game.Tests.Visual.Gameplay
                 remove { }
             }
 
-            public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
-            {
-                var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
-
-                if (texture != null)
-                    texture.ScaleAdjust /= 8f;
-
-                return texture;
-            }
-
             public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => this;
             public IEnumerable<ISkin> AllSources => new[] { this };
+
+            protected override IResourceStore<TextureUpload> CreateTextureLoaderStore(IStorageResourceProvider resources, IResourceStore<byte[]> storage)
+                => new UpscaledTextureLoaderStore(base.CreateTextureLoaderStore(resources, storage));
+
+            private class UpscaledTextureLoaderStore : IResourceStore<TextureUpload>
+            {
+                private readonly IResourceStore<TextureUpload>? textureStore;
+
+                public UpscaledTextureLoaderStore(IResourceStore<TextureUpload>? textureStore)
+                {
+                    this.textureStore = textureStore;
+                }
+
+                public void Dispose()
+                {
+                    textureStore?.Dispose();
+                }
+
+                public TextureUpload Get(string name)
+                {
+                    var textureUpload = textureStore?.Get(name);
+
+                    // NRT not enabled on framework side classes (IResourceStore / TextureLoaderStore), welp.
+                    if (textureUpload == null)
+                        return null!;
+
+                    return upscale(textureUpload);
+                }
+
+                public async Task<TextureUpload> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken())
+                {
+                    // NRT not enabled on framework side classes (IResourceStore / TextureLoaderStore), welp.
+                    if (textureStore == null)
+                        return null!;
+
+                    var textureUpload = await textureStore.GetAsync(name, cancellationToken).ConfigureAwait(false);
+
+                    if (textureUpload == null)
+                        return null!;
+
+                    return await Task.Run(() => upscale(textureUpload), cancellationToken).ConfigureAwait(false);
+                }
+
+                private TextureUpload upscale(TextureUpload textureUpload)
+                {
+                    var image = Image.LoadPixelData(textureUpload.Data.ToArray(), textureUpload.Width, textureUpload.Height);
+
+                    // The original texture upload will no longer be returned or used.
+                    textureUpload.Dispose();
+
+                    image.Mutate(i => i.Resize(new Size(textureUpload.Width, textureUpload.Height) * scale_factor));
+                    return new TextureUpload(image);
+                }
+
+                public Stream? GetStream(string name) => textureStore?.GetStream(name);
+
+                public IEnumerable<string> GetAvailableResources() => textureStore?.GetAvailableResources() ?? Array.Empty<string>();
+            }
         }
     }
 }
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index ccf49d722f..1e312142d7 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Skinning
                 }
 
                 Samples = samples;
-                Textures = new TextureStore(resources.Renderer, new MaxDimensionLimitedTextureLoaderStore(resources.CreateTextureLoaderStore(storage)));
+                Textures = new TextureStore(resources.Renderer, CreateTextureLoaderStore(resources, storage));
             }
             else
             {
@@ -171,6 +171,9 @@ namespace osu.Game.Skinning
             }
         }
 
+        protected virtual IResourceStore<TextureUpload> CreateTextureLoaderStore(IStorageResourceProvider resources, IResourceStore<byte[]> storage)
+            => new MaxDimensionLimitedTextureLoaderStore(resources.CreateTextureLoaderStore(storage));
+
         protected virtual void ParseConfigurationStream(Stream stream)
         {
             using (LineBufferedReader reader = new LineBufferedReader(stream, true))

From 869f8e5e1b21dfe53bb56a54a8479797956358f8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 00:20:53 +0300
Subject: [PATCH 0760/2296] Adjust test scene to apply miss judgements as well

---
 .../Gameplay/TestSceneSkinnableHealthDisplay.cs       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index b4ebb7c410..e3700a2a8b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -28,15 +29,21 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep(@"Reset all", delegate
             {
                 healthProcessor.Health.Value = 1;
+                healthProcessor.Failed += () => false; // health won't be updated if the processor gets into a "fail" state.
             });
         }
 
         [Test]
         public void TestHealthDisplayIncrementing()
         {
-            AddRepeatStep(@"decrease hp", delegate
+            AddRepeatStep("apply miss judgement", delegate
             {
-                healthProcessor.Health.Value -= 0.08f;
+                healthProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Miss });
+            }, 5);
+
+            AddRepeatStep(@"decrease hp slightly", delegate
+            {
+                healthProcessor.Health.Value -= 0.01f;
             }, 10);
 
             AddRepeatStep(@"increase hp without flash", delegate

From 33b0cb15a88ece545779bad5ac754f1a79275398 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 00:21:12 +0300
Subject: [PATCH 0761/2296] Add handling for miss judgements in `HealthDisplay`

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 9fdd735804..5131f93ca2 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -29,10 +29,22 @@ namespace osu.Game.Screens.Play.HUD
             MaxValue = 1
         };
 
+        /// <summary>
+        /// Triggered when a <see cref="Judgement"/> is a successful hit, signaling the health display to perform a flash animation (if designed to do so).
+        /// </summary>
+        /// <param name="result">The judgement result.</param>
         protected virtual void Flash(JudgementResult result)
         {
         }
 
+        /// <summary>
+        /// Triggered when a <see cref="Judgement"/> resulted in the player losing health.
+        /// </summary>
+        /// <param name="result">The judgement result.</param>
+        protected virtual void Miss(JudgementResult result)
+        {
+        }
+
         [Resolved]
         private HUDOverlay? hudOverlay { get; set; }
 
@@ -54,6 +66,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
                 Flash(judgement);
+            else if (judgement.Judgement.HealthIncreaseFor(judgement) < 0)
+                Miss(judgement);
         }
 
         protected override void Dispose(bool isDisposing)

From 776536e816075e179a595e42c56c275f989e039b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 26 Sep 2023 02:23:29 +0300
Subject: [PATCH 0762/2296] Add "Argon" health display implementation

---
 .../TestSceneSkinnableHealthDisplay.cs        |   3 +-
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 284 ++++++++++++++++++
 2 files changed, 286 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index e3700a2a8b..4d8ddcd581 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
+        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay();
         protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay();
         protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay();
 
@@ -61,4 +62,4 @@ namespace osu.Game.Tests.Visual.Gameplay
             }, 3);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
new file mode 100644
index 0000000000..ca7a4a6cf7
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -0,0 +1,284 @@
+// 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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Lines;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Threading;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonHealthDisplay : HealthDisplay, ISerialisableDrawable
+    {
+        private const float curve_start = 280;
+        private const float curve_end = 310;
+        private const float curve_smoothness = 10;
+
+        private const float bar_length = 350;
+        private const float bar_height = 32.5f;
+
+        private BarPath healthBar = null!;
+        private BarPath missBar = null!;
+
+        private SliderPath barPath = null!;
+
+        private static readonly Colour4 health_bar_colour = Colour4.White;
+
+        // the opacity isn't part of the design, it's only here to control glow intensity.
+        private static readonly Colour4 health_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.3f);
+        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.4f);
+
+        private static readonly Colour4 miss_bar_colour = Color4Extensions.FromHex("#FF9393");
+        private static readonly Colour4 miss_bar_glow_colour = Color4Extensions.FromHex("#FD0000");
+
+        // the "flashed" glow colour is just a lightened version of the original one, not part of the design.
+        private static readonly Colour4 miss_bar_flash_colour = Color4Extensions.FromHex("#FF5D5D");
+
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Anchor = Anchor.TopLeft;
+            Origin = Anchor.TopLeft;
+            AutoSizeAxes = Axes.Both;
+
+            Vector2 diagonalDir = (new Vector2(curve_end, bar_height) - new Vector2(curve_start, 0)).Normalized();
+
+            // todo: SliderPath or parts of it should be moved away to a utility class as they're useful for making curved paths in general, as done here.
+            barPath = new SliderPath(new[]
+            {
+                new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                new PathControlPoint(new Vector2(curve_start - curve_smoothness, 0), PathType.Bezier),
+                new PathControlPoint(new Vector2(curve_start, 0)),
+                new PathControlPoint(new Vector2(curve_start, 0) + diagonalDir * curve_smoothness, PathType.Linear),
+                new PathControlPoint(new Vector2(curve_end, bar_height) - diagonalDir * curve_smoothness, PathType.Bezier),
+                new PathControlPoint(new Vector2(curve_end, bar_height)),
+                new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_height), PathType.Linear),
+                new PathControlPoint(new Vector2(bar_length, bar_height)),
+            });
+
+            var vertices = new List<Vector2>();
+            barPath.GetPathToProgress(vertices, 0.0, 1.0);
+
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(4f, 0f),
+                Children = new Drawable[]
+                {
+                    new Circle
+                    {
+                        Margin = new MarginPadding { Top = 10f - 3f / 2f, Left = -2f },
+                        Size = new Vector2(50f, 3f),
+                    },
+                    new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            new BackgroundPath
+                            {
+                                PathRadius = 10f,
+                                Vertices = vertices,
+                            },
+                            missBar = new BarPath
+                            {
+                                AutoSizeAxes = Axes.None,
+                                RelativeSizeAxes = Axes.Both,
+                                BarColour = miss_bar_colour,
+                                GlowColour = miss_bar_glow_colour,
+                                Alpha = 0f,
+                                PathRadius = 10f,
+                                Vertices = vertices
+                            },
+                            healthBar = new BarPath
+                            {
+                                AutoSizeAxes = Axes.None,
+                                RelativeSizeAxes = Axes.Both,
+                                BarColour = health_bar_colour,
+                                GlowColour = health_bar_glow_colour,
+                                PathRadius = 10f,
+                                Vertices = vertices
+                            },
+                        }
+                    }
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(v =>
+            {
+                if (v.NewValue > MissBarValue)
+                {
+                    missBar.FadeOut(300, Easing.OutQuint);
+                    resetMissBarDelegate?.Cancel();
+                    resetMissBarDelegate = null;
+                }
+
+                if (v.NewValue == 0)
+                    healthBar.FadeOut(300, Easing.OutQuint);
+                else if (healthBar.Alpha < 1)
+                    healthBar.FadeIn(300, Easing.OutQuint);
+
+                this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
+            }, true);
+        }
+
+        private ScheduledDelegate? resetMissBarDelegate;
+
+        protected override void Miss(JudgementResult result)
+        {
+            base.Miss(result);
+
+            if (resetMissBarDelegate != null)
+                resetMissBarDelegate.Cancel();
+            else
+                this.TransformTo(nameof(MissBarValue), HealthBarValue);
+
+            this.Delay(500).Schedule(() =>
+            {
+                this.TransformTo(nameof(MissBarValue), Current.Value, 300, Easing.OutQuint);
+                resetMissBarDelegate = null;
+            }, out resetMissBarDelegate);
+
+            missBar.FadeIn(120, Easing.OutQuint);
+            missBar.Delay(500).FadeOut(300, Easing.InQuint);
+
+            missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour.Lighten(0.1f))
+                   .TransformTo(nameof(BarPath.BarColour), miss_bar_colour, 300, Easing.OutQuint);
+
+            missBar.TransformTo(nameof(BarPath.GlowColour), miss_bar_flash_colour)
+                   .TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour, 300, Easing.OutQuint);
+        }
+
+        protected override void Flash(JudgementResult result)
+        {
+            base.Flash(result);
+
+            healthBar.TransformTo(nameof(BarPath.GlowColour), health_bar_flash_colour)
+                     .TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.OutQuint);
+        }
+
+        private double missBarValue = 1.0;
+        private readonly List<Vector2> missBarVertices = new List<Vector2>();
+
+        public double MissBarValue
+        {
+            get => missBarValue;
+            set
+            {
+                if (missBarValue == value)
+                    return;
+
+                missBarValue = value;
+                updatePathVertices();
+            }
+        }
+
+        private double healthBarValue = 1.0;
+        private readonly List<Vector2> healthBarVertices = new List<Vector2>();
+
+        public double HealthBarValue
+        {
+            get => healthBarValue;
+            set
+            {
+                if (healthBarValue == value)
+                    return;
+
+                healthBarValue = value;
+                updatePathVertices();
+            }
+        }
+
+        private void updatePathVertices()
+        {
+            barPath.GetPathToProgress(healthBarVertices, 0.0, healthBarValue);
+            barPath.GetPathToProgress(missBarVertices, healthBarValue, Math.Max(missBarValue, healthBarValue));
+
+            if (healthBarVertices.Count == 0)
+                healthBarVertices.Add(Vector2.Zero);
+
+            if (missBarVertices.Count == 0)
+                missBarVertices.Add(Vector2.Zero);
+
+            missBar.Vertices = missBarVertices.Select(v => v - missBarVertices[0]).ToList();
+            missBar.Position = missBarVertices[0];
+
+            healthBar.Vertices = healthBarVertices.Select(v => v - healthBarVertices[0]).ToList();
+            healthBar.Position = healthBarVertices[0];
+        }
+
+        private partial class BackgroundPath : SmoothPath
+        {
+            protected override Color4 ColourAt(float position)
+            {
+                if (position <= 0.128f)
+                    return Color4.White.Opacity(0.3f);
+
+                position -= 0.128f;
+                return Interpolation.ValueAt(Math.Clamp(position, 0f, 1f), Color4.White.Opacity(0.5f), Color4.Black.Opacity(0.5f), -0.75f, 1f, Easing.OutQuart);
+            }
+        }
+
+        private partial class BarPath : SmoothPath
+        {
+            private Colour4 barColour;
+
+            public Colour4 BarColour
+            {
+                get => barColour;
+                set
+                {
+                    if (barColour == value)
+                        return;
+
+                    barColour = value;
+                    InvalidateTexture();
+                }
+            }
+
+            private Colour4 glowColour;
+
+            public Colour4 GlowColour
+            {
+                get => glowColour;
+                set
+                {
+                    if (glowColour == value)
+                        return;
+
+                    glowColour = value;
+                    InvalidateTexture();
+                }
+            }
+
+            protected override Color4 ColourAt(float position)
+            {
+                if (position >= 0.6f)
+                    return BarColour;
+
+                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, 0.6);
+            }
+        }
+    }
+}

From 319208ca3d985b1e733adc39c0be321e09f26f67 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 01:18:05 +0300
Subject: [PATCH 0763/2296] Adjust health bar glow intensity

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index ca7a4a6cf7..5035571820 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -38,8 +38,8 @@ namespace osu.Game.Screens.Play.HUD
         private static readonly Colour4 health_bar_colour = Colour4.White;
 
         // the opacity isn't part of the design, it's only here to control glow intensity.
-        private static readonly Colour4 health_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.3f);
-        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.4f);
+        private static readonly Colour4 health_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.5f);
+        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.6f);
 
         private static readonly Colour4 miss_bar_colour = Color4Extensions.FromHex("#FF9393");
         private static readonly Colour4 miss_bar_glow_colour = Color4Extensions.FromHex("#FD0000");

From a331fb993ae5dbc94b50283ffb7577d7efb08332 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 01:21:37 +0300
Subject: [PATCH 0764/2296] Adjust health bar outer stroke colour

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

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 5035571820..ed141a9a26 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -233,7 +233,7 @@ namespace osu.Game.Screens.Play.HUD
             protected override Color4 ColourAt(float position)
             {
                 if (position <= 0.128f)
-                    return Color4.White.Opacity(0.3f);
+                    return Color4.White.Opacity(0.5f);
 
                 position -= 0.128f;
                 return Interpolation.ValueAt(Math.Clamp(position, 0f, 1f), Color4.White.Opacity(0.5f), Color4.Black.Opacity(0.5f), -0.75f, 1f, Easing.OutQuart);

From 9e2b8254d9fc95986c1c3a7eebffe91d8b4f4b0b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 13:26:43 +0300
Subject: [PATCH 0765/2296] Add argon-specific health display test scene

---
 .../Gameplay/TestSceneArgonHealthDisplay.cs   | 78 +++++++++++++++++++
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    |  2 -
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
new file mode 100644
index 0000000000..12a2611a76
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -0,0 +1,78 @@
+// 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.Graphics.Shapes;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public partial class TestSceneArgonHealthDisplay : OsuTestScene
+    {
+        [Cached(typeof(HealthProcessor))]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep(@"Reset all", delegate
+            {
+                healthProcessor.Health.Value = 1;
+                healthProcessor.Failed += () => false; // health won't be updated if the processor gets into a "fail" state.
+
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                    },
+                    new ArgonHealthDisplay
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(2f),
+                    },
+                };
+            });
+        }
+
+        [Test]
+        public void TestHealthDisplayIncrementing()
+        {
+            AddRepeatStep("apply miss judgement", delegate
+            {
+                healthProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Miss });
+            }, 5);
+
+            AddRepeatStep(@"decrease hp slightly", delegate
+            {
+                healthProcessor.Health.Value -= 0.01f;
+            }, 10);
+
+            AddRepeatStep(@"increase hp without flash", delegate
+            {
+                healthProcessor.Health.Value += 0.1f;
+            }, 3);
+
+            AddRepeatStep(@"increase hp with flash", delegate
+            {
+                healthProcessor.Health.Value += 0.1f;
+                healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement())
+                {
+                    Type = HitResult.Perfect
+                });
+            }, 3);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index ed141a9a26..2db8e9d641 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -52,8 +52,6 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load()
         {
-            Anchor = Anchor.TopLeft;
-            Origin = Anchor.TopLeft;
             AutoSizeAxes = Axes.Both;
 
             Vector2 diagonalDir = (new Vector2(curve_end, bar_height) - new Vector2(curve_start, 0)).Normalized();

From 446c9c2efefa819fc835cc8a2bb266311f40babf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 13:39:36 +0300
Subject: [PATCH 0766/2296] Apply adjustments on the "miss" bar display

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 2db8e9d641..aeaaa19f33 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -96,21 +96,20 @@ namespace osu.Game.Screens.Play.HUD
                             },
                             missBar = new BarPath
                             {
-                                AutoSizeAxes = Axes.None,
-                                RelativeSizeAxes = Axes.Both,
                                 BarColour = miss_bar_colour,
                                 GlowColour = miss_bar_glow_colour,
                                 Alpha = 0f,
-                                PathRadius = 10f,
+                                PathRadius = 20f,
+                                GlowPortion = 0.75f,
+                                Margin = new MarginPadding(-10f),
                                 Vertices = vertices
                             },
                             healthBar = new BarPath
                             {
-                                AutoSizeAxes = Axes.None,
-                                RelativeSizeAxes = Axes.Both,
                                 BarColour = health_bar_colour,
                                 GlowColour = health_bar_glow_colour,
                                 PathRadius = 10f,
+                                GlowPortion = 0.6f,
                                 Vertices = vertices
                             },
                         }
@@ -270,9 +269,11 @@ namespace osu.Game.Screens.Play.HUD
                 }
             }
 
+            public float GlowPortion { get; init; }
+
             protected override Color4 ColourAt(float position)
             {
-                if (position >= 0.6f)
+                if (position >= GlowPortion)
                     return BarColour;
 
                 return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, 0.6);

From 30d9004ef9bc089f543bdbb68f3ac6ea7dbb99f8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 13:41:11 +0300
Subject: [PATCH 0767/2296] Fix small mistake

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

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index aeaaa19f33..434736d42a 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -276,7 +276,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (position >= GlowPortion)
                     return BarColour;
 
-                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, 0.6);
+                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion);
             }
         }
     }

From 8d389accf81ceb8b77eb6a9287419d1ffd689ab0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 15:12:24 +0300
Subject: [PATCH 0768/2296] Cover "Argon" helath display in skin
 deserialisation tests

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

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231001.osk b/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231001.osk
new file mode 100644
index 0000000000000000000000000000000000000000..081bb73b9ef7bd85d763007117d4f18fe4046fa4
GIT binary patch
literal 1834
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index 82d204f134..98008a003d 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -52,7 +52,9 @@ namespace osu.Game.Tests.Skins
             // Covers player avatar and flag.
             "Archives/modified-argon-20230305.osk",
             // Covers key counters
-            "Archives/modified-argon-pro-20230618.osk"
+            "Archives/modified-argon-pro-20230618.osk",
+            // Covers "Argon" health display
+            "Archives/modified-argon-pro-20231001.osk"
         };
 
         /// <summary>

From 7825bea959f41e6e1df8f14ed32eacd124ba0a20 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 15:25:23 +0300
Subject: [PATCH 0769/2296] Use interpolation for health bar opacity instead of
 transforms

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 434736d42a..c6c64ebcad 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -131,15 +131,18 @@ namespace osu.Game.Screens.Play.HUD
                     resetMissBarDelegate = null;
                 }
 
-                if (v.NewValue == 0)
-                    healthBar.FadeOut(300, Easing.OutQuint);
-                else if (healthBar.Alpha < 1)
-                    healthBar.FadeIn(300, Easing.OutQuint);
-
                 this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            float targetAlpha = Current.Value > 0 ? 1 : 0;
+            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, targetAlpha, 50.0, Time.Elapsed);
+        }
+
         private ScheduledDelegate? resetMissBarDelegate;
 
         protected override void Miss(JudgementResult result)

From eef099e69d347e9502d63142d8920f3edf74e332 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 1 Oct 2023 15:25:34 +0300
Subject: [PATCH 0770/2296] Do not display "miss" bar if health is already zero

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index c6c64ebcad..50ac100ed2 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -149,6 +149,10 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Miss(result);
 
+            if (result.HealthAtJudgement == 0.0)
+                // health is already empty, nothing should be displayed here.
+                return;
+
             if (resetMissBarDelegate != null)
                 resetMissBarDelegate.Cancel();
             else

From 22aa7ffd06af80f021023d5a97162d6f06adc7a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 1 Oct 2023 13:45:16 +0900
Subject: [PATCH 0771/2296] Use additive colour

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 50ac100ed2..023c5e47da 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -98,6 +98,7 @@ namespace osu.Game.Screens.Play.HUD
                             {
                                 BarColour = miss_bar_colour,
                                 GlowColour = miss_bar_glow_colour,
+                                Blending = BlendingParameters.Additive,
                                 Alpha = 0f,
                                 PathRadius = 20f,
                                 GlowPortion = 0.75f,
@@ -106,6 +107,9 @@ namespace osu.Game.Screens.Play.HUD
                             },
                             healthBar = new BarPath
                             {
+                                AutoSizeAxes = Axes.None,
+                                RelativeSizeAxes = Axes.Both,
+                                Blending = BlendingParameters.Additive,
                                 BarColour = health_bar_colour,
                                 GlowColour = health_bar_glow_colour,
                                 PathRadius = 10f,

From df51e612342a0aadecc86267df90c9e641a694de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 1 Oct 2023 21:20:03 +0900
Subject: [PATCH 0772/2296] Improve animation

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 023c5e47da..1419ab1b43 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -7,11 +7,13 @@ 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.Lines;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -96,13 +98,13 @@ namespace osu.Game.Screens.Play.HUD
                             },
                             missBar = new BarPath
                             {
-                                BarColour = miss_bar_colour,
-                                GlowColour = miss_bar_glow_colour,
+                                BarColour = Color4.White,
+                                GlowColour = OsuColour.Gray(0.5f),
                                 Blending = BlendingParameters.Additive,
-                                Alpha = 0f,
-                                PathRadius = 20f,
-                                GlowPortion = 0.75f,
-                                Margin = new MarginPadding(-10f),
+                                Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
+                                PathRadius = 40f,
+                                GlowPortion = 0.9f,
+                                Margin = new MarginPadding(-30f),
                                 Vertices = vertices
                             },
                             healthBar = new BarPath
@@ -130,7 +132,8 @@ namespace osu.Game.Screens.Play.HUD
             {
                 if (v.NewValue > MissBarValue)
                 {
-                    missBar.FadeOut(300, Easing.OutQuint);
+                    missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 300, Easing.OutQuint);
+                    missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 300, Easing.OutQuint);
                     resetMissBarDelegate?.Cancel();
                     resetMissBarDelegate = null;
                 }
@@ -158,19 +161,23 @@ namespace osu.Game.Screens.Play.HUD
                 return;
 
             if (resetMissBarDelegate != null)
+            {
                 resetMissBarDelegate.Cancel();
+                resetMissBarDelegate = null;
+            }
             else
                 this.TransformTo(nameof(MissBarValue), HealthBarValue);
 
             this.Delay(500).Schedule(() =>
             {
                 this.TransformTo(nameof(MissBarValue), Current.Value, 300, Easing.OutQuint);
+
+                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 300, Easing.OutQuint);
+                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 300, Easing.OutQuint);
+
                 resetMissBarDelegate = null;
             }, out resetMissBarDelegate);
 
-            missBar.FadeIn(120, Easing.OutQuint);
-            missBar.Delay(500).FadeOut(300, Easing.InQuint);
-
             missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour.Lighten(0.1f))
                    .TransformTo(nameof(BarPath.BarColour), miss_bar_colour, 300, Easing.OutQuint);
 
@@ -287,7 +294,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (position >= GlowPortion)
                     return BarColour;
 
-                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion);
+                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion, Easing.InQuart);
             }
         }
     }

From 88d608e1fab112e12cb31660191df51c93f69fd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 00:42:47 +0900
Subject: [PATCH 0773/2296] Tidy up common animation code

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 1419ab1b43..c64d065e50 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -131,14 +131,11 @@ namespace osu.Game.Screens.Play.HUD
             Current.BindValueChanged(v =>
             {
                 if (v.NewValue > MissBarValue)
-                {
-                    missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 300, Easing.OutQuint);
-                    missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 300, Easing.OutQuint);
-                    resetMissBarDelegate?.Cancel();
-                    resetMissBarDelegate = null;
-                }
+                    finishMissBarUsage();
 
                 this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
+                if (resetMissBarDelegate == null)
+                    this.TransformTo(nameof(MissBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
         }
 
@@ -146,8 +143,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Update();
 
-            float targetAlpha = Current.Value > 0 ? 1 : 0;
-            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, targetAlpha, 50.0, Time.Elapsed);
+            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, (float)(Current.Value > 0 ? 1 : 0), 40, Time.Elapsed);
+            missBar.Alpha = (float)Interpolation.DampContinuously(missBar.Alpha, (float)(MissBarValue > 0 ? 1 : 0), 40, Time.Elapsed);
         }
 
         private ScheduledDelegate? resetMissBarDelegate;
@@ -172,10 +169,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 this.TransformTo(nameof(MissBarValue), Current.Value, 300, Easing.OutQuint);
 
-                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 300, Easing.OutQuint);
-                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 300, Easing.OutQuint);
-
-                resetMissBarDelegate = null;
+                finishMissBarUsage();
             }, out resetMissBarDelegate);
 
             missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour.Lighten(0.1f))
@@ -185,6 +179,18 @@ namespace osu.Game.Screens.Play.HUD
                    .TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour, 300, Easing.OutQuint);
         }
 
+        private void finishMissBarUsage()
+        {
+            if (Current.Value > 0)
+            {
+                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.Gray, 300, Easing.OutQuint);
+                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.Gray, 300, Easing.OutQuint);
+            }
+
+            resetMissBarDelegate?.Cancel();
+            resetMissBarDelegate = null;
+        }
+
         protected override void Flash(JudgementResult result)
         {
             base.Flash(result);

From c4f47974bc044a63ec393375b4de5c2cea4a4eb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 00:56:29 +0900
Subject: [PATCH 0774/2296] Improve glow further

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index c64d065e50..97ae2cc7ec 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Play.HUD
             if (Current.Value > 0)
             {
                 missBar.TransformTo(nameof(BarPath.BarColour), Colour4.Gray, 300, Easing.OutQuint);
-                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.Gray, 300, Easing.OutQuint);
+                missBar.TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.OutQuint);
             }
 
             resetMissBarDelegate?.Cancel();
@@ -300,7 +300,7 @@ namespace osu.Game.Screens.Play.HUD
                 if (position >= GlowPortion)
                     return BarColour;
 
-                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion, Easing.InQuart);
+                return Interpolation.ValueAt(position, Colour4.Black.Opacity(0.0f), GlowColour, 0.0, GlowPortion, Easing.InQuint);
             }
         }
     }

From 3a45bcad15857029647b56a462b7de21522e25fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 02:03:45 +0900
Subject: [PATCH 0775/2296] Improve flash and glow further

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 97ae2cc7ec..6cf1daa102 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play.HUD
 
         // the opacity isn't part of the design, it's only here to control glow intensity.
         private static readonly Colour4 health_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.5f);
-        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.6f);
+        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.8f);
 
         private static readonly Colour4 miss_bar_colour = Color4Extensions.FromHex("#FF9393");
         private static readonly Colour4 miss_bar_glow_colour = Color4Extensions.FromHex("#FD0000");
@@ -130,13 +130,15 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(v =>
             {
-                if (v.NewValue > MissBarValue)
+                if (v.NewValue >= MissBarValue)
                     finishMissBarUsage();
 
                 this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
                 if (resetMissBarDelegate == null)
                     this.TransformTo(nameof(MissBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
+
+            updatePathVertices();
         }
 
         protected override void Update()
@@ -172,19 +174,20 @@ namespace osu.Game.Screens.Play.HUD
                 finishMissBarUsage();
             }, out resetMissBarDelegate);
 
-            missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour.Lighten(0.1f))
-                   .TransformTo(nameof(BarPath.BarColour), miss_bar_colour, 300, Easing.OutQuint);
+            missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour, 100, Easing.OutQuint)
+                   .Then()
+                   .TransformTo(nameof(BarPath.BarColour), miss_bar_flash_colour, 800, Easing.OutQuint);
 
-            missBar.TransformTo(nameof(BarPath.GlowColour), miss_bar_flash_colour)
-                   .TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour, 300, Easing.OutQuint);
+            missBar.TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour.Lighten(0.2f))
+                   .TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour, 800, Easing.OutQuint);
         }
 
         private void finishMissBarUsage()
         {
             if (Current.Value > 0)
             {
-                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.Gray, 300, Easing.OutQuint);
-                missBar.TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.OutQuint);
+                missBar.TransformTo(nameof(BarPath.BarColour), health_bar_colour, 300, Easing.In);
+                missBar.TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.In);
             }
 
             resetMissBarDelegate?.Cancel();
@@ -197,6 +200,16 @@ namespace osu.Game.Screens.Play.HUD
 
             healthBar.TransformTo(nameof(BarPath.GlowColour), health_bar_flash_colour)
                      .TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.OutQuint);
+
+            if (resetMissBarDelegate == null)
+            {
+                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
+                       .Then()
+                       .TransformTo(nameof(BarPath.BarColour), health_bar_colour, 800, Easing.OutQuint);
+
+                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
+                       .TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 800, Easing.OutQuint);
+            }
         }
 
         private double missBarValue = 1.0;

From 2410036003e75c4af046f5b15ea00f469328e679 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Sep 2023 17:31:02 +0900
Subject: [PATCH 0776/2296] Refactor tests to be easier to visually understand

---
 .../TestSceneSliderInput.cs                   | 91 ++++++-------------
 1 file changed, 27 insertions(+), 64 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index cf02e0eb32..bacc4fb218 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -37,16 +38,18 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
-        [Test]
-        public void TestTrackingBetweenLastTickAndTail()
+        [TestCase(300, false)]
+        [TestCase(200, true)]
+        [TestCase(150, true)]
+        [TestCase(120, true)]
+        [TestCase(60, true)]
+        [TestCase(10, true)]
+        public void TestTailLeniency(float finalPosition, bool hit)
         {
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 480 },
-                new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 500 },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 520 },
+                new OsuReplayFrame { Position = new Vector2(finalPosition, slider_path_length * 3), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 20 },
             }, new Slider
             {
                 StartTime = time_slider_start,
@@ -56,64 +59,18 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     Vector2.Zero,
                     new Vector2(slider_path_length * 10, 0),
-                    new Vector2(slider_path_length * 10, slider_path_length),
-                    new Vector2(0, slider_path_length),
+                    new Vector2(slider_path_length * 10, slider_path_length * 3),
+                    new Vector2(0, slider_path_length * 3),
                 }),
-            });
+            }, 240, 1);
 
-            AddAssert("Full judgement awarded", assertMaxJudge);
-        }
-
-        [Test]
-        public void TestTrackingAtTailButNotLastTick()
-        {
-            performTest(new List<ReplayFrame>
+            if (hit)
             {
-                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 350 },
-                new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 380 },
-            }, new Slider
-            {
-                StartTime = time_slider_start,
-                Position = new Vector2(0, 0),
-                SliderVelocityMultiplier = 10f,
-                Path = new SliderPath(PathType.Linear, new[]
-                {
-                    Vector2.Zero,
-                    new Vector2(slider_path_length * 10, 0),
-                    new Vector2(slider_path_length * 10, slider_path_length),
-                    new Vector2(0, slider_path_length),
-                }),
-            });
-
-            AddAssert("Full judgement awarded", assertMaxJudge);
-        }
-
-        [Test]
-        public void TestTrackingAtLastTickButNotTail()
-        {
-            performTest(new List<ReplayFrame>
-            {
-                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 50 },
-                new OsuReplayFrame { Position = new Vector2(200, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 350 },
-                new OsuReplayFrame { Position = new Vector2(100, 0), Actions = { OsuAction.RightButton }, Time = time_slider_start + 380 },
-            }, new Slider
-            {
-                StartTime = time_slider_start,
-                Position = new Vector2(0, 0),
-                SliderVelocityMultiplier = 10f,
-                Path = new SliderPath(PathType.Linear, new[]
-                {
-                    Vector2.Zero,
-                    new Vector2(slider_path_length * 10, 0),
-                    new Vector2(slider_path_length * 10, slider_path_length),
-                    new Vector2(0, slider_path_length),
-                }),
-            });
-
-            AddAssert("Full judgement awarded", assertMaxJudge);
+                AddAssert("Tracking retained", assertMaxJudge);
+                AddAssert("Full judgement awarded", assertMaxJudge);
+            }
+            else
+                AddAssert("Tracking dropped", assertMidSliderJudgementFail);
         }
 
         [Test]
@@ -414,7 +371,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.SmallTickMiss;
 
-        private void performTest(List<ReplayFrame> frames, Slider? slider = null)
+        private void performTest(List<ReplayFrame> frames, Slider? slider = null, double? bpm = null, int? tickRate = null)
         {
             slider ??= new Slider
             {
@@ -430,14 +387,20 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddStep("load player", () =>
             {
+                var cpi = new ControlPointInfo();
+
+                if (bpm != null)
+                    cpi.Add(0, new TimingControlPoint { BeatLength = 60000 / bpm.Value });
+
                 Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
                 {
                     HitObjects = { slider },
                     BeatmapInfo =
                     {
-                        Difficulty = new BeatmapDifficulty { SliderTickRate = 3 },
-                        Ruleset = new OsuRuleset().RulesetInfo
+                        Difficulty = new BeatmapDifficulty { SliderTickRate = tickRate ?? 3 },
+                        Ruleset = new OsuRuleset().RulesetInfo,
                     },
+                    ControlPointInfo = cpi,
                 });
 
                 var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });

From 07207ffc322108beb76a6ca9bee9566581eec150 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 13:31:42 +0900
Subject: [PATCH 0777/2296] Fix hitsounds playing too early on fast sliders

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs      | 9 ++++++++-
 .../Objects/Drawables/DrawableSlider.cs                  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index bacc4fb218..d920dfa859 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -46,11 +46,13 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(10, true)]
         public void TestTailLeniency(float finalPosition, bool hit)
         {
+            Slider slider;
+
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
                 new OsuReplayFrame { Position = new Vector2(finalPosition, slider_path_length * 3), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 20 },
-            }, new Slider
+            }, slider = new Slider
             {
                 StartTime = time_slider_start,
                 Position = new Vector2(0, 0),
@@ -71,6 +73,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             }
             else
                 AddAssert("Tracking dropped", assertMidSliderJudgementFail);
+
+            // Even if the last tick is hit early, the slider should always execute its final judgement at its endtime.
+            // If not, hitsounds will not play on time.
+            AddAssert("Judgement offset is zero", () => judgementResults.Last().TimeOffset == 0);
+            AddAssert("Slider judged at end time", () => judgementResults.Last().TimeAbsolute, () => Is.EqualTo(slider.EndTime));
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index f4138bdf91..5571332076 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (userTriggered || !TailCircle.Judged)
+            if (userTriggered || !TailCircle.Judged || Time.Current < HitObject.EndTime)
                 return;
 
             // If only the nested hitobjects are judged, then the slider's own judgement is ignored for scoring purposes.

From b683d55023c639f908f94a9d083563647756f379 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 13:41:49 +0900
Subject: [PATCH 0778/2296] Add a couple of extra tests

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index d920dfa859..ff6b68e1d2 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(120, true)]
         [TestCase(60, true)]
         [TestCase(10, true)]
+        [TestCase(0, true)]
+        [TestCase(-30, false)]
         public void TestTailLeniency(float finalPosition, bool hit)
         {
             Slider slider;

From 589abe2c52c221ad07a4f4869672f8e4ae579711 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 15:28:29 +0900
Subject: [PATCH 0779/2296] Add note about broken test

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index ff6b68e1d2..68f635baa1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(120, true)]
         [TestCase(60, true)]
         [TestCase(10, true)]
-        [TestCase(0, true)]
+        // [TestCase(0, true)] headless test doesn't run at high enough precision for this to always enter a tracking state in time.
         [TestCase(-30, false)]
         public void TestTailLeniency(float finalPosition, bool hit)
         {

From 393ec119dd3b6db47421f7fc2ca1e373bf9d3cf8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 13:42:30 +0900
Subject: [PATCH 0780/2296] Add test coverage of very short sliders

---
 .../TestSceneSliderInput.cs                   | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 68f635baa1..a3b9d40601 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.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;
@@ -38,6 +39,44 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
+        // Making these too short causes breakage from frames not being processed fast enough.
+        // To keep things simple, these tests are crafted to always be >16ms length.
+        // If sliders shorter than this are ever used in gameplay it will probably break things and we can revisit.
+        [TestCase(80, 0)]
+        [TestCase(80, 1)]
+        [TestCase(80, 10)]
+        public void TestVeryShortSlider(float sliderLength, int repeatCount)
+        {
+            Slider slider;
+
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = new Vector2(10, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start - 10 },
+                new OsuReplayFrame { Position = new Vector2(10, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 2000 },
+            }, slider = new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 10f,
+                RepeatCount = repeatCount,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(sliderLength, 0),
+                }),
+            }, 240, 1);
+
+            AddAssert("Slider is longer than one frame", () => slider.Duration / (slider.RepeatCount + 1), () => Is.GreaterThan(1000 / 60f));
+            AddAssert("Slider is shorter than lenience", () => slider.Duration / (slider.RepeatCount + 1), () => Is.LessThan(Math.Abs(SliderEventGenerator.TAIL_LENIENCY)));
+
+            assertAllMaxJudgements();
+
+            // Even if the last tick is hit early, the slider should always execute its final judgement at its endtime.
+            // If not, hitsounds will not play on time.
+            AddAssert("Judgement offset is zero", () => judgementResults.Last().TimeOffset == 0);
+            AddAssert("Slider judged at end time", () => judgementResults.Last().TimeAbsolute, () => Is.EqualTo(slider.EndTime));
+        }
+
         [TestCase(300, false)]
         [TestCase(200, true)]
         [TestCase(150, true)]
@@ -70,7 +109,6 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             if (hit)
             {
-                AddAssert("Tracking retained", assertMaxJudge);
                 AddAssert("Full judgement awarded", assertMaxJudge);
             }
             else

From 3a124a99ce49a39448725122c08eb80012819b8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 14:34:26 +0900
Subject: [PATCH 0781/2296] Improve test output for judgement checking

---
 .../TestSceneSliderInput.cs                   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index a3b9d40601..e98e7f45f6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -108,9 +108,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             }, 240, 1);
 
             if (hit)
-            {
-                AddAssert("Full judgement awarded", assertMaxJudge);
-            }
+                assertAllMaxJudgements();
             else
                 AddAssert("Tracking dropped", assertMidSliderJudgementFail);
 
@@ -129,7 +127,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.RightButton }, Time = time_during_slide_1 },
             });
 
-            AddAssert("Tracking retained", assertMaxJudge);
+            assertAllMaxJudgements();
         }
 
         /// <summary>
@@ -171,7 +169,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_2 },
             });
 
-            AddAssert("Tracking retained", assertMaxJudge);
+            assertAllMaxJudgements();
         }
 
         /// <summary>
@@ -192,7 +190,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_1 },
             });
 
-            AddAssert("Tracking retained", assertMaxJudge);
+            assertAllMaxJudgements();
         }
 
         /// <summary>
@@ -213,7 +211,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_1 },
             });
 
-            AddAssert("Tracking retained", assertMaxJudge);
+            assertAllMaxJudgements();
         }
 
         /// <summary>
@@ -386,7 +384,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.199f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
-            AddAssert("Tracking kept", assertMaxJudge);
+            assertAllMaxJudgements();
         }
 
         /// <summary>
@@ -410,7 +408,13 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Tracking dropped", assertMidSliderJudgementFail);
         }
 
-        private bool assertMaxJudge() => judgementResults.Any() && judgementResults.All(t => t.Type == t.Judgement.MaxResult);
+        private void assertAllMaxJudgements()
+        {
+            AddAssert("All judgements max", () =>
+            {
+                return judgementResults.Select(j => (j.HitObject, j.Type));
+            }, () => Is.EqualTo(judgementResults.Select(j => (j.HitObject, j.Judgement.MaxResult))));
+        }
 
         private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.SmallTickHit && !judgementResults.First().IsHit;
 

From 622cbc3af7e787257f8d5f31f0c98bfef8a97cf0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 16:07:45 +0900
Subject: [PATCH 0782/2296] Adjust test scene to actually make HP bars fit

---
 .../Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 4d8ddcd581..8d3eee2445 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -20,9 +21,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
-        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay();
-        protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay();
-        protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay();
+        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay { Scale = new Vector2(0.6f) };
+        protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay { Scale = new Vector2(0.6f) };
+        protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay { Scale = new Vector2(0.6f) };
 
         [SetUpSteps]
         public void SetUpSteps()
@@ -62,4 +63,4 @@ namespace osu.Game.Tests.Visual.Gameplay
             }, 3);
         }
     }
-}
\ No newline at end of file
+}

From b4b7a7ea5ed60e6da504b7d9df4ec9b054f020dc Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 2 Oct 2023 15:53:05 +0900
Subject: [PATCH 0783/2296] Add LegacyBeatmapConversionDifficultyInfo
 abstraction

---
 .../Beatmaps/ManiaBeatmapConverter.cs         | 53 ++++++++-------
 .../ManiaFilterCriteria.cs                    |  2 +-
 .../LegacyBeatmapConversionDifficultyInfo.cs  | 67 +++++++++++++++++++
 3 files changed, 96 insertions(+), 26 deletions(-)
 create mode 100644 osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index bdc5a00583..aaef69f119 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Utils;
 using osuTK;
 
@@ -43,39 +44,41 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             : base(beatmap, ruleset)
         {
             IsForCurrentRuleset = beatmap.BeatmapInfo.Ruleset.Equals(ruleset.RulesetInfo);
+            TargetColumns = GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmap(beatmap));
 
-            double roundedCircleSize = Math.Round(beatmap.Difficulty.CircleSize);
-            double roundedOverallDifficulty = Math.Round(beatmap.Difficulty.OverallDifficulty);
-
-            if (IsForCurrentRuleset)
+            if (IsForCurrentRuleset && TargetColumns > ManiaRuleset.MAX_STAGE_KEYS)
             {
-                TargetColumns = GetColumnCountForNonConvert(beatmap.BeatmapInfo);
-
-                if (TargetColumns > ManiaRuleset.MAX_STAGE_KEYS)
-                {
-                    TargetColumns /= 2;
-                    Dual = true;
-                }
-            }
-            else
-            {
-                float percentSliderOrSpinner = (float)beatmap.HitObjects.Count(h => h is IHasDuration) / beatmap.HitObjects.Count;
-                if (percentSliderOrSpinner < 0.2)
-                    TargetColumns = 7;
-                else if (percentSliderOrSpinner < 0.3 || roundedCircleSize >= 5)
-                    TargetColumns = roundedOverallDifficulty > 5 ? 7 : 6;
-                else if (percentSliderOrSpinner > 0.6)
-                    TargetColumns = roundedOverallDifficulty > 4 ? 5 : 4;
-                else
-                    TargetColumns = Math.Max(4, Math.Min((int)roundedOverallDifficulty + 1, 7));
+                TargetColumns /= 2;
+                Dual = true;
             }
 
             originalTargetColumns = TargetColumns;
         }
 
-        public static int GetColumnCountForNonConvert(BeatmapInfo beatmapInfo)
+        public static int GetColumnCount(LegacyBeatmapConversionDifficultyInfo difficulty)
         {
-            double roundedCircleSize = Math.Round(beatmapInfo.Difficulty.CircleSize);
+            if (new ManiaRuleset().RulesetInfo.Equals(difficulty.SourceRuleset))
+                return GetColumnCountForNonConvert(difficulty);
+
+            double roundedCircleSize = Math.Round(difficulty.CircleSize);
+            double roundedOverallDifficulty = Math.Round(difficulty.OverallDifficulty);
+
+            int countSliderOrSpinner = difficulty.TotalObjectCount - difficulty.CircleCount;
+            float percentSpecialObjects = (float)countSliderOrSpinner / difficulty.TotalObjectCount;
+
+            if (percentSpecialObjects < 0.2)
+                return 7;
+            if (percentSpecialObjects < 0.3 || roundedCircleSize >= 5)
+                return roundedOverallDifficulty > 5 ? 7 : 6;
+            if (percentSpecialObjects > 0.6)
+                return roundedOverallDifficulty > 4 ? 5 : 4;
+
+            return Math.Max(4, Math.Min((int)roundedOverallDifficulty + 1, 7));
+        }
+
+        public static int GetColumnCountForNonConvert(IBeatmapDifficultyInfo difficulty)
+        {
+            double roundedCircleSize = Math.Round(difficulty.CircleSize);
             return (int)Math.Max(1, roundedCircleSize);
         }
 
diff --git a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
index c8832dfdfb..7f8a00bf88 100644
--- a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
+++ b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania
 
         public bool Matches(BeatmapInfo beatmapInfo)
         {
-            return !keys.HasFilter || (beatmapInfo.Ruleset.OnlineID == new ManiaRuleset().LegacyID && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmapInfo)));
+            return !keys.HasFilter || (beatmapInfo.Ruleset.OnlineID == new ManiaRuleset().LegacyID && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmapInfo.Difficulty)));
         }
 
         public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
new file mode 100644
index 0000000000..97ccf787af
--- /dev/null
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
@@ -0,0 +1,67 @@
+// 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.Game.Beatmaps;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Rulesets.Scoring.Legacy
+{
+    /// <summary>
+    /// A set of properties that are required to facilitate beatmap conversion between legacy rulesets.
+    /// </summary>
+    public class LegacyBeatmapConversionDifficultyInfo : IBeatmapDifficultyInfo
+    {
+        /// <summary>
+        /// The beatmap's ruleset.
+        /// </summary>
+        public IRulesetInfo SourceRuleset { get; set; } = new RulesetInfo();
+
+        /// <summary>
+        /// The beatmap circle size.
+        /// </summary>
+        public float CircleSize { get; set; }
+
+        /// <summary>
+        /// The beatmap overall difficulty.
+        /// </summary>
+        public float OverallDifficulty { get; set; }
+
+        /// <summary>
+        /// The count of hitcircles in the beatmap.
+        /// </summary>
+        /// <remarks>
+        /// When converting from osu! ruleset beatmaps, this is equivalent to the sum of sliders and spinners in the beatmap.
+        /// </remarks>
+        public int CircleCount { get; set; }
+
+        /// <summary>
+        /// The total count of hitobjects in the beatmap.
+        /// </summary>
+        public int TotalObjectCount { get; set; }
+
+        float IBeatmapDifficultyInfo.DrainRate => 0;
+        float IBeatmapDifficultyInfo.ApproachRate => 0;
+        double IBeatmapDifficultyInfo.SliderMultiplier => 0;
+        double IBeatmapDifficultyInfo.SliderTickRate => 0;
+
+        public static LegacyBeatmapConversionDifficultyInfo FromAPIBeatmap(APIBeatmap apiBeatmap) => new LegacyBeatmapConversionDifficultyInfo
+        {
+            SourceRuleset = apiBeatmap.Ruleset,
+            CircleSize = apiBeatmap.CircleSize,
+            OverallDifficulty = apiBeatmap.OverallDifficulty,
+            CircleCount = apiBeatmap.CircleCount,
+            TotalObjectCount = apiBeatmap.SliderCount + apiBeatmap.SpinnerCount + apiBeatmap.CircleCount
+        };
+
+        public static LegacyBeatmapConversionDifficultyInfo FromBeatmap(IBeatmap beatmap) => new LegacyBeatmapConversionDifficultyInfo
+        {
+            SourceRuleset = beatmap.BeatmapInfo.Ruleset,
+            CircleSize = beatmap.Difficulty.CircleSize,
+            OverallDifficulty = beatmap.Difficulty.OverallDifficulty,
+            CircleCount = beatmap.HitObjects.Count(h => h is not IHasDuration),
+            TotalObjectCount = beatmap.HitObjects.Count
+        };
+    }
+}

From da2a4681d9201eadb3ad0e6cd1de486042437d3d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 2 Oct 2023 15:58:31 +0900
Subject: [PATCH 0784/2296] Add method to retrieve legacy score multiplier

---
 .../Difficulty/CatchLegacyScoreSimulator.cs   | 51 +++++++++++++++++
 .../Difficulty/ManiaLegacyScoreSimulator.cs   | 50 +++++++++++++++++
 .../Difficulty/OsuLegacyScoreSimulator.cs     | 56 +++++++++++++++++++
 .../Difficulty/TaikoLegacyScoreSimulator.cs   | 45 +++++++++++++++
 .../Scoring/Legacy/ILegacyScoreSimulator.cs   | 10 ++++
 5 files changed, 212 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index 0183d723b2..746f5713e4 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -2,10 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Mods;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
@@ -137,5 +140,53 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             if (increaseCombo)
                 combo++;
         }
+
+        public double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty)
+        {
+            bool scoreV2 = mods.Any(m => m is ModScoreV2);
+
+            double multiplier = 1.0;
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case CatchModNoFail:
+                        multiplier *= scoreV2 ? 1.0 : 0.5;
+                        break;
+
+                    case CatchModEasy:
+                        multiplier *= 0.5;
+                        break;
+
+                    case CatchModHalfTime:
+                    case CatchModDaycore:
+                        multiplier *= 0.3;
+                        break;
+
+                    case CatchModHidden:
+                        multiplier *= scoreV2 ? 1.0 : 1.06;
+                        break;
+
+                    case CatchModHardRock:
+                        multiplier *= 1.12;
+                        break;
+
+                    case CatchModDoubleTime:
+                    case CatchModNightcore:
+                        multiplier *= 1.06;
+                        break;
+
+                    case CatchModFlashlight:
+                        multiplier *= 1.12;
+                        break;
+
+                    case CatchModRelax:
+                        return 0;
+                }
+            }
+
+            return multiplier;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
index 098ccdf21d..ddb4b868a3 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
@@ -1,7 +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.Linq;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets.Mania.Difficulty
@@ -12,5 +17,50 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         {
             return new LegacyScoreAttributes { ComboScore = 1000000 };
         }
+
+        public double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty)
+        {
+            bool scoreV2 = mods.Any(m => m is ModScoreV2);
+
+            double multiplier = 1.0;
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case ManiaModNoFail:
+                        multiplier *= scoreV2 ? 1.0 : 0.5;
+                        break;
+
+                    case ManiaModEasy:
+                        multiplier *= 0.5;
+                        break;
+
+                    case ManiaModHalfTime:
+                    case ManiaModDaycore:
+                        multiplier *= 0.5;
+                        break;
+                }
+            }
+
+            if (new ManiaRuleset().RulesetInfo.Equals(difficulty.SourceRuleset))
+                return multiplier;
+
+            // Apply key mod multipliers.
+
+            int originalColumns = ManiaBeatmapConverter.GetColumnCount(difficulty);
+            int actualColumns = originalColumns;
+
+            actualColumns = mods.OfType<ManiaKeyMod>().SingleOrDefault()?.KeyCount ?? actualColumns;
+            if (mods.Any(m => m is ManiaModDualStages))
+                actualColumns *= 2;
+
+            if (actualColumns > originalColumns)
+                multiplier *= 0.9;
+            else if (actualColumns < originalColumns)
+                multiplier *= 0.9 - 0.04 * (originalColumns - actualColumns);
+
+            return multiplier;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 952ffa5e7a..3a905d77b1 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Scoring.Legacy;
@@ -174,5 +177,58 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (increaseCombo)
                 combo++;
         }
+
+        public double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty)
+        {
+            bool scoreV2 = mods.Any(m => m is ModScoreV2);
+
+            double multiplier = 1.0;
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case OsuModNoFail:
+                        multiplier *= scoreV2 ? 1.0 : 0.5;
+                        break;
+
+                    case OsuModEasy:
+                        multiplier *= 0.5;
+                        break;
+
+                    case OsuModHalfTime:
+                    case OsuModDaycore:
+                        multiplier *= 0.3;
+                        break;
+
+                    case OsuModHidden:
+                        multiplier *= 1.06;
+                        break;
+
+                    case OsuModHardRock:
+                        multiplier *= scoreV2 ? 1.10 : 1.06;
+                        break;
+
+                    case OsuModDoubleTime:
+                    case OsuModNightcore:
+                        multiplier *= scoreV2 ? 1.20 : 1.12;
+                        break;
+
+                    case OsuModFlashlight:
+                        multiplier *= 1.12;
+                        break;
+
+                    case OsuModSpunOut:
+                        multiplier *= 0.9;
+                        break;
+
+                    case OsuModRelax:
+                    case OsuModAutopilot:
+                        return 0;
+                }
+            }
+
+            return multiplier;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index d4538d3c00..6a3eb68a22 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -2,13 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Scoring.Legacy;
+using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
@@ -194,5 +197,47 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             if (increaseCombo)
                 combo++;
         }
+
+        public double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty)
+        {
+            bool scoreV2 = mods.Any(m => m is ModScoreV2);
+
+            double multiplier = 1.0;
+
+            foreach (var mod in mods)
+            {
+                switch (mod)
+                {
+                    case TaikoModNoFail:
+                        multiplier *= scoreV2 ? 1.0 : 0.5;
+                        break;
+
+                    case TaikoModEasy:
+                        multiplier *= 0.5;
+                        break;
+
+                    case TaikoModHalfTime:
+                    case TaikoModDaycore:
+                        multiplier *= 0.3;
+                        break;
+
+                    case TaikoModHidden:
+                    case TaikoModHardRock:
+                        multiplier *= 1.06;
+                        break;
+
+                    case TaikoModDoubleTime:
+                    case TaikoModNightcore:
+                    case TaikoModFlashlight:
+                        multiplier *= 1.12;
+                        break;
+
+                    case TaikoModRelax:
+                        return 0;
+                }
+            }
+
+            return multiplier;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
index fe7843a682..824f38fe2c 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/ILegacyScoreSimulator.cs
@@ -1,7 +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 osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Scoring.Legacy
 {
@@ -16,5 +18,13 @@ namespace osu.Game.Rulesets.Scoring.Legacy
         /// <param name="workingBeatmap">The working beatmap.</param>
         /// <param name="playableBeatmap">A playable version of the beatmap for the ruleset.</param>
         LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap);
+
+        /// <summary>
+        /// Returns the legacy score multiplier for the mods. This is only used during legacy score conversion.
+        /// </summary>
+        /// <param name="mods">The mods.</param>
+        /// <param name="difficulty">Extra difficulty parameters.</param>
+        /// <returns>The legacy multiplier.</returns>
+        double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty);
     }
 }

From b9ab4a2b7cf1306f761bc19b1636581211dae9ad Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 2 Oct 2023 16:54:46 +0900
Subject: [PATCH 0785/2296] Update score conversion to consider legacy
 multiplier

---
 .../BackgroundDataStoreProcessorTests.cs      |  7 ++++---
 osu.Game/BackgroundDataStoreProcessor.cs      |  4 +++-
 .../StandardisedScoreMigrationTools.cs        | 19 +++++++++++--------
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs |  3 ++-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index da46392e4b..e65088ca2e 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -127,8 +127,9 @@ namespace osu.Game.Tests.Database
             });
         }
 
-        [Test]
-        public void TestScoreUpgradeSuccess()
+        [TestCase(30000002)]
+        [TestCase(30000003)]
+        public void TestScoreUpgradeSuccess(int scoreVersion)
         {
             ScoreInfo scoreInfo = null!;
 
@@ -138,7 +139,7 @@ namespace osu.Game.Tests.Database
                 {
                     r.Add(scoreInfo = new ScoreInfo(ruleset: r.All<RulesetInfo>().First(), beatmap: r.All<BeatmapInfo>().First())
                     {
-                        TotalScoreVersion = 30000002,
+                        TotalScoreVersion = scoreVersion,
                         LegacyTotalScore = 123456,
                         IsLegacyScore = true,
                     });
diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index f29b100ee8..90e55dea6d 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -235,7 +235,9 @@ namespace osu.Game
             Logger.Log("Querying for scores that need total score conversion...");
 
             HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>()
-                                                                             .Where(s => !s.BackgroundReprocessingFailed && s.BeatmapInfo != null && s.TotalScoreVersion == 30000002)
+                                                                             .Where(s => !s.BackgroundReprocessingFailed && s.BeatmapInfo != null
+                                                                                                                         && (s.TotalScoreVersion == 30000002
+                                                                                                                             || s.TotalScoreVersion == 30000003))
                                                                              .AsEnumerable().Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index dd7d7c7b1b..3d48a5d233 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -10,7 +10,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Extensions;
 using osu.Game.IO.Legacy;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -225,28 +224,30 @@ namespace osu.Game.Database
             ILegacyScoreSimulator sv1Simulator = legacyRuleset.CreateLegacyScoreSimulator();
             LegacyScoreAttributes attributes = sv1Simulator.Simulate(beatmap, playableBeatmap);
 
-            return ConvertFromLegacyTotalScore(score, attributes);
+            return ConvertFromLegacyTotalScore(score, LegacyBeatmapConversionDifficultyInfo.FromBeatmap(beatmap.Beatmap), attributes);
         }
 
         /// <summary>
         /// Converts from <see cref="ScoreInfo.LegacyTotalScore"/> to the new standardised scoring of <see cref="ScoreProcessor"/>.
         /// </summary>
         /// <param name="score">The score to convert the total score of.</param>
-        /// <param name="attributes">Difficulty attributes providing the legacy scoring values
-        /// (<see cref="DifficultyAttributes.LegacyAccuracyScore"/>, <see cref="DifficultyAttributes.LegacyComboScore"/>, and <see cref="DifficultyAttributes.LegacyBonusScoreRatio"/>)
-        /// for the beatmap which the score was set on.</param>
+        /// <param name="difficulty">The beatmap difficulty.</param>
+        /// <param name="attributes">The legacy scoring attributes for the beatmap which the score was set on.</param>
         /// <returns>The standardised total score.</returns>
-        public static long ConvertFromLegacyTotalScore(ScoreInfo score, LegacyScoreAttributes attributes)
+        public static long ConvertFromLegacyTotalScore(ScoreInfo score, LegacyBeatmapConversionDifficultyInfo difficulty, LegacyScoreAttributes attributes)
         {
             if (!score.IsLegacyScore)
                 return score.TotalScore;
 
             Debug.Assert(score.LegacyTotalScore != null);
 
-            double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
+            Ruleset ruleset = score.Ruleset.CreateInstance();
+            if (ruleset is not ILegacyRuleset legacyRuleset)
+                return score.TotalScore;
 
+            double legacyModMultiplier = legacyRuleset.CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(score.Mods, difficulty);
             int maximumLegacyAccuracyScore = attributes.AccuracyScore;
-            long maximumLegacyComboScore = (long)Math.Round(attributes.ComboScore * modMultiplier);
+            long maximumLegacyComboScore = (long)Math.Round(attributes.ComboScore * legacyModMultiplier);
             double maximumLegacyBonusRatio = attributes.BonusScoreRatio;
 
             // The part of total score that doesn't include bonus.
@@ -258,6 +259,8 @@ namespace osu.Game.Database
             // The bonus proportion makes up the rest of the score that exceeds maximumLegacyBaseScore.
             double bonusProportion = Math.Max(0, ((long)score.LegacyTotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
 
+            double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
+
             switch (score.Ruleset.OnlineID)
             {
                 case 0:
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 6868c89d26..a95964ac52 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -30,9 +30,10 @@ namespace osu.Game.Scoring.Legacy
         /// <item><description>30000001: Appends <see cref="LegacyReplaySoloScoreInfo"/> to the end of scores.</description></item>
         /// <item><description>30000002: Score stored to replay calculated using the Score V2 algorithm. Legacy scores on this version are candidate to Score V1 -> V2 conversion.</description></item>
         /// <item><description>30000003: First version after converting legacy total score to standardised.</description></item>
+        /// <item><description>30000004: Fixed mod multipliers during legacy score conversion. Reconvert all scores.</description></item>
         /// </list>
         /// </remarks>
-        public const int LATEST_VERSION = 30000003;
+        public const int LATEST_VERSION = 30000004;
 
         /// <summary>
         /// The first stable-compatible YYYYMMDD format version given to lazer usage of replays.

From 82ba545358723a8560de4444568b107f029a6bfa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 17:01:56 +0900
Subject: [PATCH 0786/2296] Add initial animation for health bars

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    |  4 +-
 osu.Game/Screens/Play/HUD/HealthDisplay.cs    | 42 ++++++++++++++++++-
 osu.Game/Skinning/LegacyHealthDisplay.cs      |  1 +
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 6cf1daa102..68685d7eb5 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private double missBarValue = 1.0;
+        private double missBarValue;
         private readonly List<Vector2> missBarVertices = new List<Vector2>();
 
         public double MissBarValue
@@ -228,7 +228,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private double healthBarValue = 1.0;
+        private double healthBarValue;
         private readonly List<Vector2> healthBarVertices = new List<Vector2>();
 
         public double HealthBarValue
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 5131f93ca2..e4bb91e7ca 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -6,7 +6,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Threading;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
@@ -23,12 +25,16 @@ namespace osu.Game.Screens.Play.HUD
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; } = null!;
 
-        public Bindable<double> Current { get; } = new BindableDouble(1)
+        public Bindable<double> Current { get; } = new BindableDouble
         {
             MinValue = 0,
             MaxValue = 1
         };
 
+        private BindableNumber<double> health = null!;
+
+        private ScheduledDelegate? initialIncrease;
+
         /// <summary>
         /// Triggered when a <see cref="Judgement"/> is a successful hit, signaling the health display to perform a flash animation (if designed to do so).
         /// </summary>
@@ -52,14 +58,46 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            Current.BindTo(HealthProcessor.Health);
             HealthProcessor.NewJudgement += onNewJudgement;
 
+            // Don't bind directly so we can animate the startup procedure.
+            health = HealthProcessor.Health.GetBoundCopy();
+            health.BindValueChanged(h =>
+            {
+                Current.Value = h.NewValue;
+                finishInitialAnimation();
+            });
+
             if (hudOverlay != null)
                 showHealthBar.BindTo(hudOverlay.ShowHealthBar);
 
             // this probably shouldn't be operating on `this.`
             showHealthBar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
+
+            startInitialAnimation();
+        }
+
+        private void startInitialAnimation()
+        {
+            // TODO: this should run in gameplay time, including showing a larger increase when skipping.
+            // TODO: it should also start increasing relative to the first hitobject.
+            const double increase_delay = 150;
+
+            initialIncrease = Scheduler.AddDelayed(() =>
+            {
+                double newValue = Current.Value + 0.05f;
+                this.TransformBindableTo(Current, newValue, increase_delay);
+                Flash(new JudgementResult(new HitObject(), new Judgement()));
+
+                if (newValue >= 1)
+                    finishInitialAnimation();
+            }, increase_delay, true);
+        }
+
+        private void finishInitialAnimation()
+        {
+            initialIncrease?.Cancel();
+            initialIncrease = null;
         }
 
         private void onNewJudgement(JudgementResult judgement)
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index f785022f84..08add79fc1 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -66,6 +66,7 @@ namespace osu.Game.Skinning
             marker.Current.BindTo(Current);
 
             maxFillWidth = fill.Width;
+            fill.Width = 0;
         }
 
         protected override void Update()

From 7dd9951c448515bb438992ca4aa127a3f770e604 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 17:41:08 +0900
Subject: [PATCH 0787/2296] Split out reverse arrow implementations to allow
 better animation

---
 .../Objects/Drawables/DrawableSliderRepeat.cs |  8 +++-
 .../Skinning/Argon/ArgonReverseArrow.cs       | 48 ++++++++++++++-----
 ...seArrowPiece.cs => DefaultReverseArrow.cs} | 13 ++---
 .../Skinning/Legacy/LegacyReverseArrow.cs     | 18 ++++++-
 4 files changed, 63 insertions(+), 24 deletions(-)
 rename osu.Game.Rulesets.Osu/Skinning/Default/{ReverseArrowPiece.cs => DefaultReverseArrow.cs} (78%)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 5721328057..ac4d733672 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public SkinnableDrawable CirclePiece { get; private set; }
 
-        public ReverseArrowPiece Arrow { get; private set; }
+        public SkinnableDrawable Arrow { get; private set; }
 
         private Drawable scaleContainer;
 
@@ -65,7 +65,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                     },
-                    Arrow = new ReverseArrowPiece(),
+                    Arrow = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow), _ => new DefaultReverseArrow())
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
                 }
             });
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index 67fc1b2304..61077e08a4 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -2,12 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 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.Framework.Graphics.Textures;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
@@ -15,14 +19,19 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
-    public partial class ArgonReverseArrow : CompositeDrawable
+    public partial class ArgonReverseArrow : BeatSyncedContainer
     {
+        [Resolved]
+        private DrawableHitObject drawableRepeat { get; set; } = null!;
+
         private Bindable<Color4> accentColour = null!;
 
         private SpriteIcon icon = null!;
 
+        private Container main = null!;
+
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject hitObject)
+        private void load(TextureStore textures, DrawableHitObject hitObject)
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -31,24 +40,39 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             InternalChildren = new Drawable[]
             {
-                new Circle
+                main = new Container
                 {
-                    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),
+                    RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    Children = 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), true);
         }
+
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        {
+            if (!drawableRepeat.Judged)
+                main.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
similarity index 78%
rename from osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
index 27868db2f6..251f048fb6 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/ReverseArrowPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
@@ -9,17 +9,16 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public partial class ReverseArrowPiece : BeatSyncedContainer
+    public partial class DefaultReverseArrow : BeatSyncedContainer
     {
         [Resolved]
         private DrawableHitObject drawableRepeat { get; set; } = null!;
 
-        public ReverseArrowPiece()
+        public DefaultReverseArrow()
         {
             Divisor = 2;
             MinimumBeatLength = 200;
@@ -29,14 +28,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
             Size = OsuHitObject.OBJECT_DIMENSIONS;
 
-            Child = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow), _ => new SpriteIcon
+            Child = new SpriteIcon
             {
                 RelativeSizeAxes = Axes.Both,
                 Blending = BlendingParameters.Additive,
                 Icon = FontAwesome.Solid.ChevronRight,
-                Size = new Vector2(0.35f)
-            })
-            {
+                Size = new Vector2(0.35f),
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
@@ -44,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
-            if (!drawableRepeat.IsHit)
+            if (!drawableRepeat.Judged)
                 Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 3a80607522..c63ae35a3f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -3,9 +3,11 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -14,8 +16,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
-    public partial class LegacyReverseArrow : CompositeDrawable
+    public partial class LegacyReverseArrow : BeatSyncedContainer
     {
+        [Resolved]
+        private DrawableHitObject drawableRepeat { get; set; } = null!;
+
         [Resolved(canBeNull: true)]
         private DrawableHitObject? drawableHitObject { get; set; }
 
@@ -30,6 +35,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skinSource)
         {
+            Divisor = 2;
+            MinimumBeatLength = 200;
+
             AutoSizeAxes = Axes.Both;
 
             string lookupName = new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow).LookupName;
@@ -59,6 +67,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             }
         }
 
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        {
+            if (!drawableRepeat.Judged)
+                Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+        }
+
         private void onHitObjectApplied(DrawableHitObject drawableObject)
         {
             Debug.Assert(proxy.Parent == null);

From 455fc228ad5c572a772648a7da53084ea034dd5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 18:26:35 +0900
Subject: [PATCH 0788/2296] Add edge piece to argon reverse arrow

---
 .../Skinning/Argon/ArgonReverseArrow.cs       | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index 61077e08a4..aed7d1a55f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -29,10 +29,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         private SpriteIcon icon = null!;
 
         private Container main = null!;
+        private Sprite side = null!;
 
         [BackgroundDependencyLoader]
         private void load(TextureStore textures, DrawableHitObject hitObject)
         {
+            Divisor = 2;
+            MinimumBeatLength = 120;
+            EarlyActivationMilliseconds = 30;
+
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
@@ -63,6 +68,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                         },
                     }
                 },
+                side = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = textures.Get("Gameplay/osu/repeat-edge-piece"),
+                    Size = new Vector2(ArgonMainCirclePiece.OUTER_GRADIENT_SIZE),
+                }
             };
 
             accentColour = hitObject.AccentColour.GetBoundCopy();
@@ -72,7 +84,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
         {
             if (!drawableRepeat.Judged)
-                main.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+            {
+                main.ScaleTo(1.3f, 30, Easing.Out)
+                    .Then()
+                    .ScaleTo(1f, timingPoint.BeatLength / 2, Easing.Out);
+                side
+                    .MoveToX(-12, 30, Easing.Out)
+                    .Then()
+                    .MoveToX(0, timingPoint.BeatLength / 2, Easing.Out);
+            }
         }
     }
 }

From ad4e988520def03498327625be3c9369be0d0a7d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 18:34:21 +0900
Subject: [PATCH 0789/2296] Adjust reverse arrows to bounce more

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs  | 7 +++----
 .../Skinning/Default/DefaultReverseArrow.cs                | 2 +-
 .../Skinning/Legacy/LegacyReverseArrow.cs                  | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index aed7d1a55f..1ce3a32900 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -35,8 +35,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         private void load(TextureStore textures, DrawableHitObject hitObject)
         {
             Divisor = 2;
-            MinimumBeatLength = 120;
-            EarlyActivationMilliseconds = 30;
+            MinimumBeatLength = 150;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -85,11 +84,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         {
             if (!drawableRepeat.Judged)
             {
-                main.ScaleTo(1.3f, 30, Easing.Out)
+                main.ScaleTo(1.3f, timingPoint.BeatLength / 8, Easing.Out)
                     .Then()
                     .ScaleTo(1f, timingPoint.BeatLength / 2, Easing.Out);
                 side
-                    .MoveToX(-12, 30, Easing.Out)
+                    .MoveToX(-12, timingPoint.BeatLength / 8, Easing.Out)
                     .Then()
                     .MoveToX(0, timingPoint.BeatLength / 2, Easing.Out);
             }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
index 251f048fb6..f1deba7782 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         public DefaultReverseArrow()
         {
             Divisor = 2;
-            MinimumBeatLength = 200;
+            MinimumBeatLength = 150;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index c63ae35a3f..e1d1b088a2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private void load(ISkinSource skinSource)
         {
             Divisor = 2;
-            MinimumBeatLength = 200;
+            MinimumBeatLength = 150;
 
             AutoSizeAxes = Axes.Both;
 

From 8010410487c9e43434e4785af10f64156f4d81d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 19:09:57 +0900
Subject: [PATCH 0790/2296] Stop beat syncing (and close match stable's
 implementation of arrow animation)

---
 .../Skinning/Argon/ArgonReverseArrow.cs       | 50 +++++++++++--------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index 1ce3a32900..d4084a76f1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -10,8 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
@@ -19,24 +16,20 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
-    public partial class ArgonReverseArrow : BeatSyncedContainer
+    public partial class ArgonReverseArrow : CompositeDrawable
     {
         [Resolved]
-        private DrawableHitObject drawableRepeat { get; set; } = null!;
+        private DrawableHitObject drawableObject { get; set; } = null!;
 
         private Bindable<Color4> accentColour = null!;
 
         private SpriteIcon icon = null!;
-
         private Container main = null!;
         private Sprite side = null!;
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures, DrawableHitObject hitObject)
+        private void load(TextureStore textures)
         {
-            Divisor = 2;
-            MinimumBeatLength = 150;
-
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
@@ -76,22 +69,39 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 }
             };
 
-            accentColour = hitObject.AccentColour.GetBoundCopy();
+            accentColour = drawableObject.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4), true);
+
+            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
         {
-            if (!drawableRepeat.Judged)
+            const float move_distance = -12;
+            const double move_out_duration = 35;
+            const double move_in_duration = 250;
+            const double total = 300;
+
+            switch (state)
             {
-                main.ScaleTo(1.3f, timingPoint.BeatLength / 8, Easing.Out)
-                    .Then()
-                    .ScaleTo(1f, timingPoint.BeatLength / 2, Easing.Out);
-                side
-                    .MoveToX(-12, timingPoint.BeatLength / 8, Easing.Out)
-                    .Then()
-                    .MoveToX(0, timingPoint.BeatLength / 2, Easing.Out);
+                case ArmedState.Idle:
+                    main.ScaleTo(1.3f, move_out_duration, Easing.Out)
+                        .Then()
+                        .ScaleTo(1f, move_in_duration, Easing.Out)
+                        .Loop(total - (move_in_duration + move_out_duration));
+                    side
+                        .MoveToX(move_distance, move_out_duration, Easing.Out)
+                        .Then()
+                        .MoveToX(0, move_in_duration, Easing.Out)
+                        .Loop(total - (move_in_duration + move_out_duration));
+                    break;
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+        }
     }
 }

From e4ac8362ecd5329458356013e0c66eff310cf40d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 19:17:45 +0900
Subject: [PATCH 0791/2296] Update other implementations to use non-beat-sync
 logic

---
 .../Skinning/Default/DefaultReverseArrow.cs   | 42 +++++++++----
 .../Skinning/Legacy/LegacyReverseArrow.cs     | 61 ++++++++++---------
 2 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
index f1deba7782..a019a4767b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
@@ -2,33 +2,28 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public partial class DefaultReverseArrow : BeatSyncedContainer
+    public partial class DefaultReverseArrow : CompositeDrawable
     {
         [Resolved]
-        private DrawableHitObject drawableRepeat { get; set; } = null!;
+        private DrawableHitObject drawableObject { get; set; } = null!;
 
         public DefaultReverseArrow()
         {
-            Divisor = 2;
-            MinimumBeatLength = 150;
-
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
             Size = OsuHitObject.OBJECT_DIMENSIONS;
 
-            Child = new SpriteIcon
+            InternalChild = new SpriteIcon
             {
                 RelativeSizeAxes = Axes.Both,
                 Blending = BlendingParameters.Additive,
@@ -39,10 +34,33 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             };
         }
 
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            if (!drawableRepeat.Judged)
-                Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
+        }
+
+        private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
+        {
+            const double move_out_duration = 35;
+            const double move_in_duration = 250;
+            const double total = 300;
+
+            switch (state)
+            {
+                case ArmedState.Idle:
+                    InternalChild.ScaleTo(1.3f, move_out_duration, Easing.Out)
+                                 .Then()
+                                 .ScaleTo(1f, move_in_duration, Easing.Out)
+                                 .Loop(total - (move_in_duration + move_out_duration));
+                    break;
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index e1d1b088a2..98ac770dd0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -3,11 +3,9 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics.Containers;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -16,13 +14,10 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
-    public partial class LegacyReverseArrow : BeatSyncedContainer
+    public partial class LegacyReverseArrow : CompositeDrawable
     {
         [Resolved]
-        private DrawableHitObject drawableRepeat { get; set; } = null!;
-
-        [Resolved(canBeNull: true)]
-        private DrawableHitObject? drawableHitObject { get; set; }
+        private DrawableHitObject drawableObject { get; set; } = null!;
 
         private Drawable proxy = null!;
 
@@ -35,9 +30,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skinSource)
         {
-            Divisor = 2;
-            MinimumBeatLength = 150;
-
             AutoSizeAxes = Axes.Both;
 
             string lookupName = new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow).LookupName;
@@ -46,6 +38,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty());
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
+
+            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
         }
 
         protected override void LoadComplete()
@@ -54,23 +48,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             proxy = CreateProxy();
 
-            if (drawableHitObject != null)
+            drawableObject.HitObjectApplied += onHitObjectApplied;
+            onHitObjectApplied(drawableObject);
+
+            accentColour = drawableObject.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(c =>
             {
-                drawableHitObject.HitObjectApplied += onHitObjectApplied;
-                onHitObjectApplied(drawableHitObject);
-
-                accentColour = drawableHitObject.AccentColour.GetBoundCopy();
-                accentColour.BindValueChanged(c =>
-                {
-                    arrow.Colour = textureIsDefaultSkin && c.NewValue.R + c.NewValue.G + c.NewValue.B > (600 / 255f) ? Color4.Black : Color4.White;
-                }, true);
-            }
-        }
-
-        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
-        {
-            if (!drawableRepeat.Judged)
-                Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+                arrow.Colour = textureIsDefaultSkin && c.NewValue.R + c.NewValue.G + c.NewValue.B > (600 / 255f) ? Color4.Black : Color4.White;
+            }, true);
         }
 
         private void onHitObjectApplied(DrawableHitObject drawableObject)
@@ -82,11 +67,29 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                                                     .OverlayElementContainer.Add(proxy);
         }
 
+        private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
+        {
+            const double move_out_duration = 35;
+            const double move_in_duration = 250;
+            const double total = 300;
+
+            switch (state)
+            {
+                case ArmedState.Idle:
+                    InternalChild.ScaleTo(1.3f, move_out_duration, Easing.Out)
+                                 .Then()
+                                 .ScaleTo(1f, move_in_duration, Easing.Out)
+                                 .Loop(total - (move_in_duration + move_out_duration));
+                    break;
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            if (drawableHitObject != null)
-                drawableHitObject.HitObjectApplied -= onHitObjectApplied;
+
+            drawableObject.HitObjectApplied -= onHitObjectApplied;
+            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }

From 1bee7bf353d286978b1b975c1d202c2730ce7b2f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 19:22:24 +0900
Subject: [PATCH 0792/2296] Add note about rotation

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 98ac770dd0..81781bc6b0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -76,6 +76,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             switch (state)
             {
                 case ArmedState.Idle:
+                    // TODO: rotate slightly if Version < 1 (aka UseNewLayout)
                     InternalChild.ScaleTo(1.3f, move_out_duration, Easing.Out)
                                  .Then()
                                  .ScaleTo(1f, move_in_duration, Easing.Out)

From f0070eecf10ce1fe7193e973eee20ae1720e9a12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 20:09:39 +0900
Subject: [PATCH 0793/2296] Add rotation support for very old skins

---
 .../Resources/old-skin/reversearrow.png       | Bin 0 -> 4853 bytes
 .../Skinning/Legacy/LegacyReverseArrow.cs     |  26 ++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/reversearrow.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/reversearrow.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/reversearrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ebdec37d356490d018f711ae525abb3250be3fd
GIT binary patch
literal 4853
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
K&U<aAnEwHrcQ(ZU

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 81781bc6b0..09625c2aed 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private Drawable arrow = null!;
 
+        private bool shouldRotate;
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource skinSource)
         {
@@ -40,6 +42,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
 
             drawableObject.ApplyCustomUpdateState += updateStateTransforms;
+
+            shouldRotate = skinSource.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value <= 1;
         }
 
         protected override void LoadComplete()
@@ -76,11 +80,23 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             switch (state)
             {
                 case ArmedState.Idle:
-                    // TODO: rotate slightly if Version < 1 (aka UseNewLayout)
-                    InternalChild.ScaleTo(1.3f, move_out_duration, Easing.Out)
-                                 .Then()
-                                 .ScaleTo(1f, move_in_duration, Easing.Out)
-                                 .Loop(total - (move_in_duration + move_out_duration));
+                    if (shouldRotate)
+                    {
+                        InternalChild.ScaleTo(1.3f, move_out_duration)
+                                     .RotateTo(5.625f)
+                                     .Then()
+                                     .ScaleTo(1f, move_in_duration)
+                                     .RotateTo(-5.625f, move_in_duration)
+                                     .Loop(total - (move_in_duration + move_out_duration));
+                    }
+                    else
+                    {
+                        InternalChild.ScaleTo(1.3f)
+                                     .Then()
+                                     .ScaleTo(1f, move_in_duration)
+                                     .Loop(total - (move_in_duration + move_out_duration));
+                    }
+
                     break;
             }
         }

From 94e49a34fdd1d827a500d0235800e40fff1cab41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 22:26:57 +0900
Subject: [PATCH 0794/2296] Adjust legacy reverse arrow implementation to match
 stable more closely

---
 .../Skinning/Legacy/LegacyReverseArrow.cs     | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 09625c2aed..7e69c7a25b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -73,28 +73,26 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
         {
-            const double move_out_duration = 35;
-            const double move_in_duration = 250;
-            const double total = 300;
+            const double duration = 300;
+            const float rotation = 5.625f;
 
             switch (state)
             {
                 case ArmedState.Idle:
                     if (shouldRotate)
                     {
-                        InternalChild.ScaleTo(1.3f, move_out_duration)
-                                     .RotateTo(5.625f)
+                        InternalChild.ScaleTo(1.3f)
+                                     .RotateTo(rotation)
                                      .Then()
-                                     .ScaleTo(1f, move_in_duration)
-                                     .RotateTo(-5.625f, move_in_duration)
-                                     .Loop(total - (move_in_duration + move_out_duration));
+                                     .ScaleTo(1f, duration)
+                                     .RotateTo(-rotation, duration)
+                                     .Loop();
                     }
                     else
                     {
-                        InternalChild.ScaleTo(1.3f)
-                                     .Then()
-                                     .ScaleTo(1f, move_in_duration)
-                                     .Loop(total - (move_in_duration + move_out_duration));
+                        InternalChild.ScaleTo(1.3f).Then()
+                                     .ScaleTo(1f, duration, Easing.Out)
+                                     .Loop();
                     }
 
                     break;

From 3aa51301e8b9f94c7088b59af796daf7d011e3fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 22:28:33 +0900
Subject: [PATCH 0795/2296] Add null checks in disposal flow

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs | 5 ++++-
 .../Skinning/Default/DefaultReverseArrow.cs               | 5 ++++-
 .../Skinning/Legacy/LegacyReverseArrow.cs                 | 8 ++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index d4084a76f1..160edb6f67 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -4,6 +4,7 @@
 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.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -101,7 +102,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+
+            if (drawableObject.IsNotNull())
+                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
index a019a4767b..b44f6571b9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -60,7 +61,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+
+            if (drawableObject.IsNotNull())
+                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 7e69c7a25b..34bcf95e1d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -4,6 +4,7 @@
 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.Game.Rulesets.Objects.Drawables;
@@ -103,8 +104,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.Dispose(isDisposing);
 
-            drawableObject.HitObjectApplied -= onHitObjectApplied;
-            drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+            if (drawableObject.IsNotNull())
+            {
+                drawableObject.HitObjectApplied -= onHitObjectApplied;
+                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+            }
         }
     }
 }

From d19cdbdefb731664dda045512f0f7b07486cde75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 22:31:47 +0200
Subject: [PATCH 0796/2296] Add `InvitePlayer` method to multiplayer server

---
 osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs  |  7 +++++++
 osu.Game/Online/Multiplayer/MultiplayerClient.cs       |  2 ++
 osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs | 10 ++++++++++
 3 files changed, 19 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index b7a5faf7c9..64cd6df24d 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -99,5 +99,12 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         /// <param name="playlistItemId">The item to remove.</param>
         Task RemovePlaylistItem(long playlistItemId);
+
+        /// <summary>
+        /// Invites a player to the current room.
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task InvitePlayer(int userId);
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 5716b7ad3b..957f55406a 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -260,6 +260,8 @@ namespace osu.Game.Online.Multiplayer
 
         protected abstract Task LeaveRoomInternal();
 
+        public abstract Task InvitePlayer(int userId);
+
         /// <summary>
         /// Change the current <see cref="MultiplayerRoom"/> settings.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 8ff0ce4065..ebe89cf018 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -106,6 +106,16 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
         }
 
+        public override Task InvitePlayer(int userId)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            Debug.Assert(connection != null);
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.InvitePlayer), userId);
+        }
+
         public override Task TransferHost(int userId)
         {
             if (!IsConnected.Value)

From 574dc67a9ed12762d4a56b2bf20ab5cb128df7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 22:53:28 +0200
Subject: [PATCH 0797/2296] Add `Invited` task to multiplayer client

---
 osu.Game/Online/Multiplayer/IMultiplayerClient.cs |  7 +++++++
 osu.Game/Online/Multiplayer/MultiplayerClient.cs  | 15 +++++++++++++++
 .../Online/Multiplayer/OnlineMultiplayerClient.cs |  1 +
 .../Visual/Multiplayer/TestMultiplayerClient.cs   |  5 +++++
 4 files changed, 28 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 995bac1af5..f59ded93f8 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -42,6 +42,13 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="user">The user.</param>
         Task UserKicked(MultiplayerRoomUser user);
 
+        /// <summary>
+        /// Signals that a user has been invited into a multiplayer room.
+        /// </summary>
+        /// <param name="invitedBy">Id of user that invited the player.</param>
+        /// <param name="room">The room the user got invited to.</param>
+        Task Invited(int invitedBy, MultiplayerRoom room);
+
         /// <summary>
         /// Signal that the host of the room has changed.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 957f55406a..e438f9f96d 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -442,6 +442,21 @@ namespace osu.Game.Online.Multiplayer
             return handleUserLeft(user, UserKicked);
         }
 
+        async Task IMultiplayerClient.Invited(int invitedBy, MultiplayerRoom room)
+        {
+            var user = await userLookupCache.GetUserAsync(invitedBy).ConfigureAwait(false);
+
+            if (user == null) return;
+
+            Scheduler.Add(() =>
+            {
+                PostNotification?.Invoke(new SimpleNotification
+                {
+                    Text = "You got invited into a multiplayer match by " + user.Username + "!",
+                });
+            });
+        }
+
         private void addUserToAPIRoom(MultiplayerRoomUser user)
         {
             Debug.Assert(APIRoom != null);
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index ebe89cf018..0e327bbc83 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Online.Multiplayer
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserKicked), ((IMultiplayerClient)this).UserKicked);
+                    connection.On<int, MultiplayerRoom>(nameof(IMultiplayerClient.Invited), ((IMultiplayerClient)this).Invited);
                     connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
                     connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
                     connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index c27e30d5bb..d44eff47a3 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -263,6 +263,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
+        public override Task InvitePlayer(int userId)
+        {
+            return Task.CompletedTask;
+        }
+
         public override Task TransferHost(int userId)
         {
             userId = clone(userId);

From 7629b725a29834339bc029d1bd754c19e75a5199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 22:55:53 +0200
Subject: [PATCH 0798/2296] Add invite button to UserPanel context menu

---
 osu.Game/Users/UserPanel.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index e2dc511391..29a6c65555 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -18,6 +19,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Localisation;
+using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Users
 {
@@ -61,6 +63,9 @@ namespace osu.Game.Users
         [Resolved]
         protected OsuColour Colours { get; private set; } = null!;
 
+        [Resolved]
+        private MultiplayerClient multiplayerClient { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -117,6 +122,15 @@ namespace osu.Game.Users
                     }));
                 }
 
+                if (
+                    User.IsOnline &&
+                    multiplayerClient.Room != null &&
+                    multiplayerClient.Room.Users.All(u => u.UserID != User.Id)
+                )
+                {
+                    items.Add(new OsuMenuItem(ContextMenuStrings.InvitePlayer, MenuItemType.Standard, () => multiplayerClient.InvitePlayer(User.Id)));
+                }
+
                 return items.ToArray();
             }
         }

From 251e4d4de9d1bb5e44353ffec1f5bdacc546a3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 23:10:29 +0200
Subject: [PATCH 0799/2296] Add localisation for inviting a player

---
 osu.Game/Localisation/ContextMenuStrings.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Localisation/ContextMenuStrings.cs b/osu.Game/Localisation/ContextMenuStrings.cs
index 8bc213016b..029fba67d8 100644
--- a/osu.Game/Localisation/ContextMenuStrings.cs
+++ b/osu.Game/Localisation/ContextMenuStrings.cs
@@ -19,6 +19,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ViewBeatmap => new TranslatableString(getKey(@"view_beatmap"), @"View beatmap");
 
+        /// <summary>
+        /// "Invite player"
+        /// </summary>
+        public static LocalisableString InvitePlayer => new TranslatableString(getKey(@"invite_player"), @"Invite player");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }

From e81695bcacdde50284133c01db2fd33ecafabac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 23:10:51 +0200
Subject: [PATCH 0800/2296] Display avatar in invitation notification

---
 .../TestSceneNotificationOverlay.cs           | 17 ++++
 .../Online/Multiplayer/MultiplayerClient.cs   |  7 +-
 osu.Game/Overlays/NotificationOverlay.cs      |  2 +-
 .../Notifications/UserAvatarNotification.cs   | 78 +++++++++++++++++++
 4 files changed, 99 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Overlays/Notifications/UserAvatarNotification.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 4d3ae079e3..07bd722322 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -4,13 +4,17 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Database;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
@@ -31,6 +35,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         public double TimeToCompleteProgress { get; set; } = 2000;
 
+        private readonly UserLookupCache userLookupCache = new TestUserLookupCache();
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -60,6 +66,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep(@"simple #2", sendAmazingNotification);
             AddStep(@"progress #1", sendUploadProgress);
             AddStep(@"progress #2", sendDownloadProgress);
+            AddStep(@"User notification", sendUserNotification);
 
             checkProgressingCount(2);
 
@@ -537,6 +544,16 @@ namespace osu.Game.Tests.Visual.UserInterface
             progressingNotifications.Add(n);
         }
 
+        private async void sendUserNotification()
+        {
+            var user = await userLookupCache.GetUserAsync(0).ConfigureAwait(true);
+            if (user == null) return;
+
+            var n = new UserAvatarNotification(user, $"{user.Username} is telling you to NOT download Haitai!");
+
+            notificationOverlay.Post(n);
+        }
+
         private void sendUploadProgress()
         {
             var n = new ProgressNotification
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index e438f9f96d..bb953bae58 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -450,10 +450,9 @@ namespace osu.Game.Online.Multiplayer
 
             Scheduler.Add(() =>
             {
-                PostNotification?.Invoke(new SimpleNotification
-                {
-                    Text = "You got invited into a multiplayer match by " + user.Username + "!",
-                });
+                PostNotification?.Invoke(
+                    new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match!")
+                );
             });
         }
 
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 6e0ea23dd1..67cf868fb0 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.X,
                                     Children = new[]
                                     {
-                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(SimpleNotification) }),
+                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(SimpleNotification), typeof(UserAvatarNotification) }),
                                         new NotificationSection(NotificationsStrings.RunningTasks, new[] { typeof(ProgressNotification) }),
                                     }
                                 }
diff --git a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
new file mode 100644
index 0000000000..191d63a76f
--- /dev/null
+++ b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
@@ -0,0 +1,78 @@
+// 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.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users.Drawables;
+
+namespace osu.Game.Overlays.Notifications
+{
+    public partial class UserAvatarNotification : Notification
+    {
+        private LocalisableString text;
+
+        public override LocalisableString Text
+        {
+            get => text;
+            set
+            {
+                text = value;
+                if (textDrawable != null)
+                    textDrawable.Text = text;
+            }
+        }
+
+        private TextFlowContainer? textDrawable;
+
+        private APIUser user;
+
+        public UserAvatarNotification(APIUser user, LocalisableString text)
+        {
+            this.user = user;
+            Text = text;
+        }
+
+        private DrawableAvatar? avatar;
+
+        protected override IconUsage CloseButtonIcon => FontAwesome.Solid.Times;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            IconContent.Masking = true;
+
+            // Workaround for the corner radius on parent's mask breaking if we add masking to IconContent
+            IconContent.CornerRadius = 6;
+
+            IconContent.AddRange(new Drawable[]
+            {
+                new Box()
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background5,
+                },
+            });
+
+            avatar = new DrawableAvatar(user)
+            {
+                FillMode = FillMode.Fill,
+            };
+            LoadComponentAsync(avatar, IconContent.Add);
+
+            Content.Add(textDrawable = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 14, weight: FontWeight.Medium))
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Text = text
+            });
+        }
+    }
+}

From 3879775219991cf44e9f8f44e320dc233637f286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Mon, 2 Oct 2023 23:20:24 +0200
Subject: [PATCH 0801/2296] Add room name to invite notification

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

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index bb953bae58..6e46a5a3b9 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -451,7 +451,7 @@ namespace osu.Game.Online.Multiplayer
             Scheduler.Add(() =>
             {
                 PostNotification?.Invoke(
-                    new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match!")
+                    new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match:\"{room.Settings.Name}\"!")
                 );
             });
         }

From 8e73dbc894d4297b46aaf1a881d40acda797445f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Tue, 3 Oct 2023 01:22:25 +0200
Subject: [PATCH 0802/2296] Load api room before displaying notification

---
 .../Online/Multiplayer/IMultiplayerClient.cs  |  5 ++-
 .../Online/Multiplayer/MultiplayerClient.cs   | 41 +++++++++++++++++--
 .../Multiplayer/OnlineMultiplayerClient.cs    |  2 +-
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index f59ded93f8..ba9e8a237c 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -46,8 +46,9 @@ namespace osu.Game.Online.Multiplayer
         /// Signals that a user has been invited into a multiplayer room.
         /// </summary>
         /// <param name="invitedBy">Id of user that invited the player.</param>
-        /// <param name="room">The room the user got invited to.</param>
-        Task Invited(int invitedBy, MultiplayerRoom room);
+        /// <param name="roomID">Id of the room the user got invited to.</param>
+        /// <param name="password">Password to join the room.</param>
+        Task Invited(int invitedBy, long roomID, string password);
 
         /// <summary>
         /// Signal that the host of the room has changed.
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 6e46a5a3b9..61c2fa495a 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -11,6 +11,7 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Development;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Database;
@@ -30,6 +31,8 @@ namespace osu.Game.Online.Multiplayer
     {
         public Action<Notification>? PostNotification { protected get; set; }
 
+        public Action<Room, string>? InviteAccepted { protected get; set; }
+
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
         /// </summary>
@@ -442,20 +445,50 @@ namespace osu.Game.Online.Multiplayer
             return handleUserLeft(user, UserKicked);
         }
 
-        async Task IMultiplayerClient.Invited(int invitedBy, MultiplayerRoom room)
+        async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password)
         {
-            var user = await userLookupCache.GetUserAsync(invitedBy).ConfigureAwait(false);
+            var loadUserTask = userLookupCache.GetUserAsync(invitedBy);
+            var loadRoomTask = loadRoom(roomID);
 
-            if (user == null) return;
+            await Task.WhenAll(loadUserTask, loadRoomTask).ConfigureAwait(false);
+
+            APIUser? apiUser = loadUserTask.GetResultSafely();
+            Room? apiRoom = loadRoomTask.GetResultSafely();
+
+            if (apiUser == null || apiRoom == null) return;
 
             Scheduler.Add(() =>
             {
                 PostNotification?.Invoke(
-                    new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match:\"{room.Settings.Name}\"!")
+                    new UserAvatarNotification(apiUser, $"{apiUser.Username} invited you to a multiplayer match:\"{apiRoom.Name}\"!")
+                    {
+                        Activated = () =>
+                        {
+                            InviteAccepted?.Invoke(apiRoom, password);
+                            return true;
+                        }
+                    }
                 );
             });
         }
 
+        private Task<Room?> loadRoom(long id)
+        {
+            return Task.Run(() =>
+            {
+                var t = new TaskCompletionSource<Room?>();
+                var request = new GetRoomRequest(id);
+
+                request.Success += room => t.TrySetResult(room);
+
+                request.Failure += e => t.TrySetResult(null);
+
+                API.Queue(request);
+
+                return t.Task;
+            });
+        }
+
         private void addUserToAPIRoom(MultiplayerRoomUser user)
         {
             Debug.Assert(APIRoom != null);
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 0e327bbc83..5b5741ef1c 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Online.Multiplayer
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
                     connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserKicked), ((IMultiplayerClient)this).UserKicked);
-                    connection.On<int, MultiplayerRoom>(nameof(IMultiplayerClient.Invited), ((IMultiplayerClient)this).Invited);
+                    connection.On<int, long, string>(nameof(IMultiplayerClient.Invited), ((IMultiplayerClient)this).Invited);
                     connection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
                     connection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
                     connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);

From a171fa7649c7c4e59544a3c7a167694fba51bfe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Tue, 3 Oct 2023 01:31:30 +0200
Subject: [PATCH 0803/2296] Join multiplayer match when clicking the invite
 notification

---
 osu.Game/OsuGame.cs                           | 22 +++++++++++++++++++
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  6 +++++
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    | 13 ++++++-----
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index c60bff9e4c..5372f9227f 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -46,6 +46,7 @@ using osu.Game.IO;
 using osu.Game.Localisation;
 using osu.Game.Online;
 using osu.Game.Online.Chat;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Overlays.Music;
@@ -58,6 +59,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
@@ -643,6 +645,25 @@ namespace osu.Game
             });
         }
 
+        /// <summary>
+        /// Join a multiplayer match immediately.
+        /// </summary>
+        /// <param name="room">The room to join.</param>
+        /// <param name="password">The password to join the room, if any is given.</param>
+        public void PresentMultiplayerMatch(Room room, string password)
+        {
+            PerformFromScreen(screen =>
+            {
+                Multiplayer multiplayer = new Multiplayer();
+                multiplayer.OnLoadComplete += _ =>
+                {
+                    multiplayer.Join(room, password);
+                };
+
+                screen.Push(multiplayer);
+            });
+        }
+
         /// <summary>
         /// Present a score's replay immediately.
         /// The user should have already requested this interactively.
@@ -853,6 +874,7 @@ namespace osu.Game
             ScoreManager.PresentImport = items => PresentScore(items.First().Value);
 
             MultiplayerClient.PostNotification = n => Notifications.Post(n);
+            MultiplayerClient.InviteAccepted = PresentMultiplayerMatch;
 
             // 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.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 514b80b999..f74b5dd96e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Lounge;
 
@@ -90,6 +91,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override LoungeSubScreen CreateLounge() => new MultiplayerLoungeSubScreen();
 
+        public void Join(Room room, string? password)
+        {
+            LoungeSubScreen.Join(room, password);
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 37b50b4863..85eec7ac07 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -32,8 +32,9 @@ namespace osu.Game.Screens.OnlinePlay
         // while leases may be taken out by a subscreen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        protected LoungeSubScreen LoungeSubScreen;
+
         private MultiplayerWaveContainer waves;
-        private LoungeSubScreen loungeSubScreen;
         private ScreenStack screenStack;
 
         [Cached(Type = typeof(IRoomManager))]
@@ -89,7 +90,7 @@ namespace osu.Game.Screens.OnlinePlay
             screenStack.ScreenPushed += screenPushed;
             screenStack.ScreenExited += screenExited;
 
-            screenStack.Push(loungeSubScreen = CreateLounge());
+            screenStack.Push(LoungeSubScreen = CreateLounge());
 
             apiState.BindTo(API.State);
             apiState.BindValueChanged(onlineStateChanged, true);
@@ -120,10 +121,10 @@ namespace osu.Game.Screens.OnlinePlay
 
             Mods.SetDefault();
 
-            if (loungeSubScreen.IsCurrentScreen())
-                loungeSubScreen.OnEntering(e);
+            if (LoungeSubScreen.IsCurrentScreen())
+                LoungeSubScreen.OnEntering(e);
             else
-                loungeSubScreen.MakeCurrent();
+                LoungeSubScreen.MakeCurrent();
         }
 
         public override void OnResuming(ScreenTransitionEvent e)
@@ -158,7 +159,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         public override bool OnExiting(ScreenExitEvent e)
         {
-            while (screenStack.CurrentScreen != null && screenStack.CurrentScreen is not LoungeSubScreen)
+            while (screenStack.CurrentScreen != null && screenStack.CurrentScreen is not Lounge.LoungeSubScreen)
             {
                 var subScreen = (Screen)screenStack.CurrentScreen;
                 if (subScreen.IsLoaded && subScreen.OnExiting(e))

From 16fcc4eaaa9818989a1ad39cb6921822ab35abc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 12:32:52 +0900
Subject: [PATCH 0804/2296] Fix incorrect anchor/origin causing rotation to
 look wrong on legacy skin arrows

---
 .../Skinning/Legacy/LegacyReverseArrow.cs                  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 34bcf95e1d..25de6d2381 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -39,7 +39,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
 
-            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty());
+            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty()).With(d =>
+            {
+                d.Anchor = Anchor.Centre;
+                d.Origin = Anchor.Centre;
+            });
+
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
 
             drawableObject.ApplyCustomUpdateState += updateStateTransforms;

From b234a453da2319a4fc5101ecc5b5d41865232cce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 16:01:15 +0900
Subject: [PATCH 0805/2296] Fix legacy beatmap importer not always handling
 nested paths correctly

Addresses https://github.com/ppy/osu/discussions/24989.
---
 osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs | 8 +++++++-
 osu.Game/Database/LegacyBeatmapImporter.cs           | 5 ++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
index 0144c0bf97..5f722e381c 100644
--- a/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
+++ b/osu.Game.Tests/Database/LegacyBeatmapImporterTest.cs
@@ -44,17 +44,23 @@ namespace osu.Game.Tests.Database
                 createFile(subdirectory2, Path.Combine("beatmap5", "beatmap.osu"));
                 createFile(subdirectory2, Path.Combine("beatmap6", "beatmap.osu"));
 
+                // songs subdirectory with random file
+                var subdirectory3 = songsStorage.GetStorageForDirectory("subdirectory3");
+                createFile(subdirectory3, "silly readme.txt");
+                createFile(subdirectory3, Path.Combine("beatmap7", "beatmap.osu"));
+
                 // empty songs subdirectory
                 songsStorage.GetStorageForDirectory("subdirectory3");
 
                 string[] paths = importer.GetStableImportPaths(songsStorage).ToArray();
-                Assert.That(paths.Length, Is.EqualTo(6));
+                Assert.That(paths.Length, Is.EqualTo(7));
                 Assert.That(paths.Contains(songsStorage.GetFullPath("beatmap1")));
                 Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "beatmap2"))));
                 Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "beatmap3"))));
                 Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory", "sub-subdirectory", "beatmap4"))));
                 Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory2", "beatmap5"))));
                 Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory2", "beatmap6"))));
+                Assert.That(paths.Contains(songsStorage.GetFullPath(Path.Combine("subdirectory3", "beatmap7"))));
             }
 
             static void createFile(Storage storage, string path)
diff --git a/osu.Game/Database/LegacyBeatmapImporter.cs b/osu.Game/Database/LegacyBeatmapImporter.cs
index 20add54949..a090698a68 100644
--- a/osu.Game/Database/LegacyBeatmapImporter.cs
+++ b/osu.Game/Database/LegacyBeatmapImporter.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
@@ -34,9 +33,9 @@ namespace osu.Game.Database
 
                     try
                     {
-                        if (!directoryStorage.GetFiles(string.Empty).ExcludeSystemFileNames().Any())
+                        if (!directoryStorage.GetFiles(string.Empty, "*.osu").Any())
                         {
-                            // if a directory doesn't contain files, attempt looking for beatmaps inside of that directory.
+                            // if a directory doesn't contain any beatmap files, look for further nested beatmap directories.
                             // this is a special behaviour in stable for beatmaps only, see https://github.com/ppy/osu/issues/18615.
                             foreach (string subDirectory in GetStableImportPaths(directoryStorage))
                                 paths.Add(subDirectory);

From 2cbec6dbdf115562d64d44f515ee9ad520e20416 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:11:52 +0900
Subject: [PATCH 0806/2296] Update resources

---
 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 58e18d3187..0ee922e53a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.928.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 8178cf3a8dce61729699668898bd61b6b80ee5b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:17:11 +0900
Subject: [PATCH 0807/2296] Tidy up background colour gradient logic

This changes things visually a touch, but I think it feels better.
And reads better.
---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 6cf1daa102..f2f71ab64d 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -267,10 +267,12 @@ namespace osu.Game.Screens.Play.HUD
             protected override Color4 ColourAt(float position)
             {
                 if (position <= 0.128f)
-                    return Color4.White.Opacity(0.5f);
+                    return Color4.White.Opacity(0.8f);
 
-                position -= 0.128f;
-                return Interpolation.ValueAt(Math.Clamp(position, 0f, 1f), Color4.White.Opacity(0.5f), Color4.Black.Opacity(0.5f), -0.75f, 1f, Easing.OutQuart);
+                return Interpolation.ValueAt(position,
+                    Color4.White.Opacity(0.8f),
+                    Color4.Black.Opacity(0.2f),
+                    -0.5f, 1f, Easing.OutQuint);
             }
         }
 

From e1445fcc65cf60800fd6f86785db051d821b5f64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:17:42 +0900
Subject: [PATCH 0808/2296] Adjust health display test scene's background
 colour to better visualise background fill

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index 12a2611a76..06a7763711 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
+                        Colour = Color4.Gray,
                     },
                     new ArgonHealthDisplay
                     {

From 4f9daa1c14eda97baf27a5ab547add008fe46171 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:31:50 +0900
Subject: [PATCH 0809/2296] Tidy up `ArgonHealthDisplay` code quality

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 183 +++++++++---------
 1 file changed, 88 insertions(+), 95 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index f2f71ab64d..6d16915576 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -25,55 +25,64 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonHealthDisplay : HealthDisplay, ISerialisableDrawable
     {
+        public bool UsesFixedAnchor { get; set; }
+
         private const float curve_start = 280;
         private const float curve_end = 310;
         private const float curve_smoothness = 10;
 
         private const float bar_length = 350;
-        private const float bar_height = 32.5f;
+        private const float bar_verticality = 32.5f;
 
         private BarPath healthBar = null!;
         private BarPath missBar = null!;
+        private BackgroundPath background = null!;
 
         private SliderPath barPath = null!;
 
-        private static readonly Colour4 health_bar_colour = Colour4.White;
+        private static readonly Colour4 main_bar_colour = Colour4.White;
+        private static readonly Colour4 main_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.5f);
 
-        // the opacity isn't part of the design, it's only here to control glow intensity.
-        private static readonly Colour4 health_bar_glow_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.5f);
-        private static readonly Colour4 health_bar_flash_colour = Color4Extensions.FromHex("#7ED7FD").Opacity(0.8f);
+        private ScheduledDelegate? resetMissBarDelegate;
 
-        private static readonly Colour4 miss_bar_colour = Color4Extensions.FromHex("#FF9393");
-        private static readonly Colour4 miss_bar_glow_colour = Color4Extensions.FromHex("#FD0000");
+        private readonly List<Vector2> missBarVertices = new List<Vector2>();
+        private readonly List<Vector2> healthBarVertices = new List<Vector2>();
 
-        // the "flashed" glow colour is just a lightened version of the original one, not part of the design.
-        private static readonly Colour4 miss_bar_flash_colour = Color4Extensions.FromHex("#FF5D5D");
+        private double missBarValue = 1;
 
-        public bool UsesFixedAnchor { get; set; }
+        public double MissBarValue
+        {
+            get => missBarValue;
+            set
+            {
+                if (missBarValue == value)
+                    return;
+
+                missBarValue = value;
+                updatePathVertices();
+            }
+        }
+
+        private double healthBarValue = 1;
+
+        public double HealthBarValue
+        {
+            get => healthBarValue;
+            set
+            {
+                if (healthBarValue == value)
+                    return;
+
+                healthBarValue = value;
+                updatePathVertices();
+            }
+        }
 
         [BackgroundDependencyLoader]
         private void load()
         {
             AutoSizeAxes = Axes.Both;
 
-            Vector2 diagonalDir = (new Vector2(curve_end, bar_height) - new Vector2(curve_start, 0)).Normalized();
-
-            // todo: SliderPath or parts of it should be moved away to a utility class as they're useful for making curved paths in general, as done here.
-            barPath = new SliderPath(new[]
-            {
-                new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                new PathControlPoint(new Vector2(curve_start - curve_smoothness, 0), PathType.Bezier),
-                new PathControlPoint(new Vector2(curve_start, 0)),
-                new PathControlPoint(new Vector2(curve_start, 0) + diagonalDir * curve_smoothness, PathType.Linear),
-                new PathControlPoint(new Vector2(curve_end, bar_height) - diagonalDir * curve_smoothness, PathType.Bezier),
-                new PathControlPoint(new Vector2(curve_end, bar_height)),
-                new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_height), PathType.Linear),
-                new PathControlPoint(new Vector2(bar_length, bar_height)),
-            });
-
-            var vertices = new List<Vector2>();
-            barPath.GetPathToProgress(vertices, 0.0, 1.0);
-
             InternalChild = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
@@ -83,7 +92,7 @@ namespace osu.Game.Screens.Play.HUD
                 {
                     new Circle
                     {
-                        Margin = new MarginPadding { Top = 10f - 3f / 2f, Left = -2f },
+                        Margin = new MarginPadding { Top = 8.5f, Left = -2 },
                         Size = new Vector2(50f, 3f),
                     },
                     new Container
@@ -91,10 +100,9 @@ namespace osu.Game.Screens.Play.HUD
                         AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
-                            new BackgroundPath
+                            background = new BackgroundPath
                             {
                                 PathRadius = 10f,
-                                Vertices = vertices,
                             },
                             missBar = new BarPath
                             {
@@ -103,25 +111,26 @@ namespace osu.Game.Screens.Play.HUD
                                 Blending = BlendingParameters.Additive,
                                 Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
                                 PathRadius = 40f,
-                                GlowPortion = 0.9f,
+                                // Kinda hacky, but results in correct positioning with increased path radius.
                                 Margin = new MarginPadding(-30f),
-                                Vertices = vertices
+                                GlowPortion = 0.9f,
                             },
                             healthBar = new BarPath
                             {
                                 AutoSizeAxes = Axes.None,
                                 RelativeSizeAxes = Axes.Both,
                                 Blending = BlendingParameters.Additive,
-                                BarColour = health_bar_colour,
-                                GlowColour = health_bar_glow_colour,
+                                BarColour = main_bar_colour,
+                                GlowColour = main_bar_glow_colour,
                                 PathRadius = 10f,
                                 GlowPortion = 0.6f,
-                                Vertices = vertices
                             },
                         }
                     }
                 },
             };
+
+            updatePath();
         }
 
         protected override void LoadComplete()
@@ -137,28 +146,38 @@ namespace osu.Game.Screens.Play.HUD
                 if (resetMissBarDelegate == null)
                     this.TransformTo(nameof(MissBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
-
-            updatePathVertices();
         }
 
         protected override void Update()
         {
             base.Update();
 
-            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, (float)(Current.Value > 0 ? 1 : 0), 40, Time.Elapsed);
-            missBar.Alpha = (float)Interpolation.DampContinuously(missBar.Alpha, (float)(MissBarValue > 0 ? 1 : 0), 40, Time.Elapsed);
+            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, Current.Value > 0 ? 1 : 0, 40, Time.Elapsed);
+            missBar.Alpha = (float)Interpolation.DampContinuously(missBar.Alpha, MissBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
         }
 
-        private ScheduledDelegate? resetMissBarDelegate;
+        protected override void Flash(JudgementResult result)
+        {
+            base.Flash(result);
+
+            healthBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour.Opacity(0.8f))
+                     .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
+
+            if (resetMissBarDelegate == null)
+            {
+                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
+                       .Then()
+                       .TransformTo(nameof(BarPath.BarColour), main_bar_colour, 800, Easing.OutQuint);
+
+                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
+                       .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 800, Easing.OutQuint);
+            }
+        }
 
         protected override void Miss(JudgementResult result)
         {
             base.Miss(result);
 
-            if (result.HealthAtJudgement == 0.0)
-                // health is already empty, nothing should be displayed here.
-                return;
-
             if (resetMissBarDelegate != null)
             {
                 resetMissBarDelegate.Cancel();
@@ -170,78 +189,52 @@ namespace osu.Game.Screens.Play.HUD
             this.Delay(500).Schedule(() =>
             {
                 this.TransformTo(nameof(MissBarValue), Current.Value, 300, Easing.OutQuint);
-
                 finishMissBarUsage();
             }, out resetMissBarDelegate);
 
-            missBar.TransformTo(nameof(BarPath.BarColour), miss_bar_colour, 100, Easing.OutQuint)
-                   .Then()
-                   .TransformTo(nameof(BarPath.BarColour), miss_bar_flash_colour, 800, Easing.OutQuint);
+            missBar.TransformTo(nameof(BarPath.BarColour), new Colour4(255, 147, 147, 255), 100, Easing.OutQuint).Then()
+                   .TransformTo(nameof(BarPath.BarColour), new Colour4(255, 93, 93, 255), 800, Easing.OutQuint);
 
-            missBar.TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour.Lighten(0.2f))
-                   .TransformTo(nameof(BarPath.GlowColour), miss_bar_glow_colour, 800, Easing.OutQuint);
+            missBar.TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255).Lighten(0.2f))
+                   .TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255), 800, Easing.OutQuint);
         }
 
         private void finishMissBarUsage()
         {
             if (Current.Value > 0)
             {
-                missBar.TransformTo(nameof(BarPath.BarColour), health_bar_colour, 300, Easing.In);
-                missBar.TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.In);
+                missBar.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 300, Easing.In);
+                missBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.In);
             }
 
             resetMissBarDelegate?.Cancel();
             resetMissBarDelegate = null;
         }
 
-        protected override void Flash(JudgementResult result)
+        private void updatePath()
         {
-            base.Flash(result);
+            Vector2 diagonalDir = (new Vector2(curve_end, bar_verticality) - new Vector2(curve_start, 0)).Normalized();
 
-            healthBar.TransformTo(nameof(BarPath.GlowColour), health_bar_flash_colour)
-                     .TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 300, Easing.OutQuint);
-
-            if (resetMissBarDelegate == null)
+            barPath = new SliderPath(new[]
             {
-                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
-                       .Then()
-                       .TransformTo(nameof(BarPath.BarColour), health_bar_colour, 800, Easing.OutQuint);
+                new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                new PathControlPoint(new Vector2(curve_start - curve_smoothness, 0), PathType.Bezier),
+                new PathControlPoint(new Vector2(curve_start, 0)),
+                new PathControlPoint(new Vector2(curve_start, 0) + diagonalDir * curve_smoothness, PathType.Linear),
+                new PathControlPoint(new Vector2(curve_end, bar_verticality) - diagonalDir * curve_smoothness, PathType.Bezier),
+                new PathControlPoint(new Vector2(curve_end, bar_verticality)),
+                new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_verticality), PathType.Linear),
+                new PathControlPoint(new Vector2(bar_length, bar_verticality)),
+            });
 
-                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
-                       .TransformTo(nameof(BarPath.GlowColour), health_bar_glow_colour, 800, Easing.OutQuint);
-            }
-        }
+            List<Vector2> vertices = new List<Vector2>();
+            barPath.GetPathToProgress(vertices, 0.0, 1.0);
 
-        private double missBarValue = 1.0;
-        private readonly List<Vector2> missBarVertices = new List<Vector2>();
+            background.Vertices = vertices;
+            healthBar.Vertices = vertices;
+            missBar.Vertices = vertices;
 
-        public double MissBarValue
-        {
-            get => missBarValue;
-            set
-            {
-                if (missBarValue == value)
-                    return;
-
-                missBarValue = value;
-                updatePathVertices();
-            }
-        }
-
-        private double healthBarValue = 1.0;
-        private readonly List<Vector2> healthBarVertices = new List<Vector2>();
-
-        public double HealthBarValue
-        {
-            get => healthBarValue;
-            set
-            {
-                if (healthBarValue == value)
-                    return;
-
-                healthBarValue = value;
-                updatePathVertices();
-            }
+            updatePathVertices();
         }
 
         private void updatePathVertices()

From 32b2ac4974d13d98f9abf73f47b6c72a12cd65a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:41:10 +0900
Subject: [PATCH 0810/2296] Rename and refactor glow/miss bars to hopefully
 make more sense

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 74 ++++++++++---------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 6d16915576..f7b90fe563 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -34,8 +34,13 @@ namespace osu.Game.Screens.Play.HUD
         private const float bar_length = 350;
         private const float bar_verticality = 32.5f;
 
-        private BarPath healthBar = null!;
-        private BarPath missBar = null!;
+        private BarPath mainBar = null!;
+
+        /// <summary>
+        /// Used to show a glow at the end of the main bar, or red "damage" area when missing.
+        /// </summary>
+        private BarPath glowBar = null!;
+
         private BackgroundPath background = null!;
 
         private SliderPath barPath = null!;
@@ -48,17 +53,17 @@ namespace osu.Game.Screens.Play.HUD
         private readonly List<Vector2> missBarVertices = new List<Vector2>();
         private readonly List<Vector2> healthBarVertices = new List<Vector2>();
 
-        private double missBarValue = 1;
+        private double glowBarValue = 1;
 
-        public double MissBarValue
+        public double GlowBarValue
         {
-            get => missBarValue;
+            get => glowBarValue;
             set
             {
-                if (missBarValue == value)
+                if (glowBarValue == value)
                     return;
 
-                missBarValue = value;
+                glowBarValue = value;
                 updatePathVertices();
             }
         }
@@ -104,7 +109,7 @@ namespace osu.Game.Screens.Play.HUD
                             {
                                 PathRadius = 10f,
                             },
-                            missBar = new BarPath
+                            glowBar = new BarPath
                             {
                                 BarColour = Color4.White,
                                 GlowColour = OsuColour.Gray(0.5f),
@@ -115,7 +120,7 @@ namespace osu.Game.Screens.Play.HUD
                                 Margin = new MarginPadding(-30f),
                                 GlowPortion = 0.9f,
                             },
-                            healthBar = new BarPath
+                            mainBar = new BarPath
                             {
                                 AutoSizeAxes = Axes.None,
                                 RelativeSizeAxes = Axes.Both,
@@ -139,12 +144,12 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(v =>
             {
-                if (v.NewValue >= MissBarValue)
-                    finishMissBarUsage();
+                if (v.NewValue >= GlowBarValue)
+                    finishMissDisplay();
 
                 this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
                 if (resetMissBarDelegate == null)
-                    this.TransformTo(nameof(MissBarValue), v.NewValue, 300, Easing.OutQuint);
+                    this.TransformTo(nameof(GlowBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
         }
 
@@ -152,24 +157,24 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Update();
 
-            healthBar.Alpha = (float)Interpolation.DampContinuously(healthBar.Alpha, Current.Value > 0 ? 1 : 0, 40, Time.Elapsed);
-            missBar.Alpha = (float)Interpolation.DampContinuously(missBar.Alpha, MissBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
+            mainBar.Alpha = (float)Interpolation.DampContinuously(mainBar.Alpha, Current.Value > 0 ? 1 : 0, 40, Time.Elapsed);
+            glowBar.Alpha = (float)Interpolation.DampContinuously(glowBar.Alpha, GlowBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
         }
 
         protected override void Flash(JudgementResult result)
         {
             base.Flash(result);
 
-            healthBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour.Opacity(0.8f))
-                     .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
+            mainBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour.Opacity(0.8f))
+                   .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
 
             if (resetMissBarDelegate == null)
             {
-                missBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
+                glowBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
                        .Then()
                        .TransformTo(nameof(BarPath.BarColour), main_bar_colour, 800, Easing.OutQuint);
 
-                missBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
+                glowBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
                        .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 800, Easing.OutQuint);
             }
         }
@@ -184,27 +189,30 @@ namespace osu.Game.Screens.Play.HUD
                 resetMissBarDelegate = null;
             }
             else
-                this.TransformTo(nameof(MissBarValue), HealthBarValue);
+            {
+                // Reset any ongoing animation immediately, else things get weird.
+                this.TransformTo(nameof(GlowBarValue), HealthBarValue);
+            }
 
             this.Delay(500).Schedule(() =>
             {
-                this.TransformTo(nameof(MissBarValue), Current.Value, 300, Easing.OutQuint);
-                finishMissBarUsage();
+                this.TransformTo(nameof(GlowBarValue), Current.Value, 300, Easing.OutQuint);
+                finishMissDisplay();
             }, out resetMissBarDelegate);
 
-            missBar.TransformTo(nameof(BarPath.BarColour), new Colour4(255, 147, 147, 255), 100, Easing.OutQuint).Then()
+            glowBar.TransformTo(nameof(BarPath.BarColour), new Colour4(255, 147, 147, 255), 100, Easing.OutQuint).Then()
                    .TransformTo(nameof(BarPath.BarColour), new Colour4(255, 93, 93, 255), 800, Easing.OutQuint);
 
-            missBar.TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255).Lighten(0.2f))
+            glowBar.TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255).Lighten(0.2f))
                    .TransformTo(nameof(BarPath.GlowColour), new Colour4(253, 0, 0, 255), 800, Easing.OutQuint);
         }
 
-        private void finishMissBarUsage()
+        private void finishMissDisplay()
         {
             if (Current.Value > 0)
             {
-                missBar.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 300, Easing.In);
-                missBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.In);
+                glowBar.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 300, Easing.In);
+                glowBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.In);
             }
 
             resetMissBarDelegate?.Cancel();
@@ -231,8 +239,8 @@ namespace osu.Game.Screens.Play.HUD
             barPath.GetPathToProgress(vertices, 0.0, 1.0);
 
             background.Vertices = vertices;
-            healthBar.Vertices = vertices;
-            missBar.Vertices = vertices;
+            mainBar.Vertices = vertices;
+            glowBar.Vertices = vertices;
 
             updatePathVertices();
         }
@@ -240,7 +248,7 @@ namespace osu.Game.Screens.Play.HUD
         private void updatePathVertices()
         {
             barPath.GetPathToProgress(healthBarVertices, 0.0, healthBarValue);
-            barPath.GetPathToProgress(missBarVertices, healthBarValue, Math.Max(missBarValue, healthBarValue));
+            barPath.GetPathToProgress(missBarVertices, healthBarValue, Math.Max(glowBarValue, healthBarValue));
 
             if (healthBarVertices.Count == 0)
                 healthBarVertices.Add(Vector2.Zero);
@@ -248,11 +256,11 @@ namespace osu.Game.Screens.Play.HUD
             if (missBarVertices.Count == 0)
                 missBarVertices.Add(Vector2.Zero);
 
-            missBar.Vertices = missBarVertices.Select(v => v - missBarVertices[0]).ToList();
-            missBar.Position = missBarVertices[0];
+            glowBar.Vertices = missBarVertices.Select(v => v - missBarVertices[0]).ToList();
+            glowBar.Position = missBarVertices[0];
 
-            healthBar.Vertices = healthBarVertices.Select(v => v - healthBarVertices[0]).ToList();
-            healthBar.Position = healthBarVertices[0];
+            mainBar.Vertices = healthBarVertices.Select(v => v - healthBarVertices[0]).ToList();
+            mainBar.Position = healthBarVertices[0];
         }
 
         private partial class BackgroundPath : SmoothPath

From 4f3c433946173001e90f6768e9a06bc510c04f1b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 17:41:52 +0900
Subject: [PATCH 0811/2296] Move vertex related constants local to method

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index f7b90fe563..62a4b958c2 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -27,13 +27,6 @@ namespace osu.Game.Screens.Play.HUD
     {
         public bool UsesFixedAnchor { get; set; }
 
-        private const float curve_start = 280;
-        private const float curve_end = 310;
-        private const float curve_smoothness = 10;
-
-        private const float bar_length = 350;
-        private const float bar_verticality = 32.5f;
-
         private BarPath mainBar = null!;
 
         /// <summary>
@@ -221,6 +214,13 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updatePath()
         {
+            const float curve_start = 280;
+            const float curve_end = 310;
+            const float curve_smoothness = 10;
+
+            const float bar_length = 350;
+            const float bar_verticality = 32.5f;
+
             Vector2 diagonalDir = (new Vector2(curve_end, bar_verticality) - new Vector2(curve_start, 0)).Normalized();
 
             barPath = new SliderPath(new[]

From 00867593950322e5dbf46b1756a29eb5ea7c71bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 15:23:22 +0900
Subject: [PATCH 0812/2296] Fix slider tracking state being set to `false`
 after slider end

---
 .../Objects/Drawables/DrawableSliderBall.cs                | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index 47214f1e53..63e500d687 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -132,6 +132,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
+            if (Time.Current >= drawableSlider.HitObject.EndTime)
+                return;
+
             // from the point at which the head circle is hit, this will be non-null.
             // it may be null if the head circle was missed.
             var headCircleHitAction = GetInitialHitAction();
@@ -153,9 +156,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Tracking =
                 // in valid time range
-                Time.Current >= drawableSlider.HitObject.StartTime && Time.Current < drawableSlider.HitObject.EndTime &&
+                Time.Current >= drawableSlider.HitObject.StartTime
                 // in valid position range
-                lastScreenSpaceMousePosition.HasValue && followCircleReceptor.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
+                && lastScreenSpaceMousePosition.HasValue && followCircleReceptor.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
                 (actions?.Any(isValidTrackingAction) ?? false);
 

From 9a3c21c3206a9853e5379783f83c38e9439f2cb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Oct 2023 15:30:33 +0900
Subject: [PATCH 0813/2296] Change comparison of `timeOffset` to greater-than
 (in line with others)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 7daab820dd..9edf3808c5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             // An actual tick miss should only occur if reaching the tick itself.
             if (timeOffset >= SliderEventGenerator.TAIL_LENIENCY && Tracking)
                 ApplyResult(r => r.Type = r.Judgement.MaxResult);
-            else if (timeOffset >= 0)
+            else if (timeOffset > 0)
                 ApplyResult(r => r.Type = r.Judgement.MinResult);
         }
 

From 941f26d46233902f88a4088c3bfa354064e13dee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 18:35:01 +0900
Subject: [PATCH 0814/2296] Add extra test coverage to
 `TestSceneOsuModAutoplay` to cover fail case

Basically the slider needs to be slightly longer for this test to
correctly fail in headless tests, in conjunction with the new slider
tail leniency.

This is due to headless tests running at a fixed frame interval, and
these timings being *tight*.
---
 .../Mods/TestSceneOsuModAutoplay.cs             |  7 ++++---
 .../TestSceneSliderInput.cs                     | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index 6980438b59..ace7f23989 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -51,8 +51,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 FinalRate = { Value = 1.3 }
             });
 
-        [Test]
-        public void TestPerfectScoreOnShortSliderWithRepeat()
+        [TestCase(6.25f)]
+        [TestCase(20)]
+        public void TestPerfectScoreOnShortSliderWithRepeat(float pathLength)
         {
             AddStep("set score to standardised", () => LocalConfig.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
 
@@ -70,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                             Path = new SliderPath(new[]
                             {
                                 new PathControlPoint(),
-                                new PathControlPoint(new Vector2(0, 6.25f))
+                                new PathControlPoint(new Vector2(0, pathLength))
                             }),
                             RepeatCount = 1,
                             SliderVelocityMultiplier = 10
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index e98e7f45f6..9e83ca428b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.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 NUnit.Framework;
@@ -42,9 +41,17 @@ namespace osu.Game.Rulesets.Osu.Tests
         // Making these too short causes breakage from frames not being processed fast enough.
         // To keep things simple, these tests are crafted to always be >16ms length.
         // If sliders shorter than this are ever used in gameplay it will probably break things and we can revisit.
-        [TestCase(80, 0)]
+        [TestCase(30, 0)]
+        [TestCase(30, 1)]
+        [TestCase(40, 0)]
+        [TestCase(40, 1)]
+        [TestCase(50, 1)]
+        [TestCase(60, 1)]
+        [TestCase(70, 1)]
         [TestCase(80, 1)]
+        [TestCase(80, 0)]
         [TestCase(80, 10)]
+        [TestCase(90, 1)]
         public void TestVeryShortSlider(float sliderLength, int repeatCount)
         {
             Slider slider;
@@ -66,15 +73,15 @@ namespace osu.Game.Rulesets.Osu.Tests
                 }),
             }, 240, 1);
 
-            AddAssert("Slider is longer than one frame", () => slider.Duration / (slider.RepeatCount + 1), () => Is.GreaterThan(1000 / 60f));
-            AddAssert("Slider is shorter than lenience", () => slider.Duration / (slider.RepeatCount + 1), () => Is.LessThan(Math.Abs(SliderEventGenerator.TAIL_LENIENCY)));
-
             assertAllMaxJudgements();
 
             // Even if the last tick is hit early, the slider should always execute its final judgement at its endtime.
             // If not, hitsounds will not play on time.
             AddAssert("Judgement offset is zero", () => judgementResults.Last().TimeOffset == 0);
             AddAssert("Slider judged at end time", () => judgementResults.Last().TimeAbsolute, () => Is.EqualTo(slider.EndTime));
+
+            AddAssert("Slider is last judgement", () => judgementResults[^1].HitObject, Is.TypeOf<Slider>);
+            AddAssert("Tail is second last judgement", () => judgementResults[^2].HitObject, Is.TypeOf<SliderTailCircle>);
         }
 
         [TestCase(300, false)]

From 9e1fec0213d8541a813300d415d1956417979c6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 18:36:13 +0900
Subject: [PATCH 0815/2296] Fix potential out-of-order tail and ticks

---
 .../Objects/Drawables/DrawableSliderTail.cs                | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 9edf3808c5..df55f3e73f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -129,6 +129,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered)
                 return;
 
+            // Ensure the tail can only activate after all previous ticks already have.
+            //
+            // This covers the edge case where the lenience may allow the tail to activate before
+            // the last tick, changing ordering of score/combo awarding.
+            if (DrawableSlider.NestedHitObjects.Count > 1 && !DrawableSlider.NestedHitObjects[^2].Judged)
+                return;
+
             // The player needs to have engaged in tracking at any point after the tail leniency cutoff.
             // An actual tick miss should only occur if reaching the tick itself.
             if (timeOffset >= SliderEventGenerator.TAIL_LENIENCY && Tracking)

From 70ec4b060af1abd4752e483cacbab07b9c755692 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 19:20:37 +0900
Subject: [PATCH 0816/2296] Rename weird diffcalc parameter name

---
 .../Difficulty/Evaluators/AimEvaluator.cs                 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
index cf35b08822..3d1939acac 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
         /// <item><description>and slider difficulty.</description></item>
         /// </list>
         /// </summary>
-        public static double EvaluateDifficultyOf(DifficultyHitObject current, bool withSliders)
+        public static double EvaluateDifficultyOf(DifficultyHitObject current, bool withSliderTravelDistance)
         {
             if (current.BaseObject is Spinner || current.Index <= 1 || current.Previous(0).BaseObject is Spinner)
                 return 0;
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             double currVelocity = osuCurrObj.LazyJumpDistance / osuCurrObj.StrainTime;
 
             // But if the last object is a slider, then we extend the travel velocity through the slider into the current object.
-            if (osuLastObj.BaseObject is Slider && withSliders)
+            if (osuLastObj.BaseObject is Slider && withSliderTravelDistance)
             {
                 double travelVelocity = osuLastObj.TravelDistance / osuLastObj.TravelTime; // calculate the slider velocity from slider head to slider end.
                 double movementVelocity = osuCurrObj.MinimumJumpDistance / osuCurrObj.MinimumJumpTime; // calculate the movement velocity from slider end to current object
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             // As above, do the same for the previous hitobject.
             double prevVelocity = osuLastObj.LazyJumpDistance / osuLastObj.StrainTime;
 
-            if (osuLastLastObj.BaseObject is Slider && withSliders)
+            if (osuLastLastObj.BaseObject is Slider && withSliderTravelDistance)
             {
                 double travelVelocity = osuLastLastObj.TravelDistance / osuLastLastObj.TravelTime;
                 double movementVelocity = osuLastObj.MinimumJumpDistance / osuLastObj.MinimumJumpTime;
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             aimStrain += Math.Max(acuteAngleBonus * acute_angle_multiplier, wideAngleBonus * wide_angle_multiplier + velocityChangeBonus * velocity_change_multiplier);
 
             // Add in additional slider velocity bonus.
-            if (withSliders)
+            if (withSliderTravelDistance)
                 aimStrain += sliderBonus * slider_multiplier;
 
             return aimStrain;

From c4992d347975459823ee14ef3c07e42010470b98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 19:08:59 +0900
Subject: [PATCH 0817/2296] Fix one case of difficulty calculation no longer
 accounting for leniency

---
 .../Difficulty/Preprocessing/OsuDifficultyHitObject.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index e627c9ad67..00cb4acfb4 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -214,7 +214,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             if (slider.LazyEndPosition != null)
                 return;
 
-            slider.LazyTravelTime = slider.NestedHitObjects[^1].StartTime - slider.StartTime;
+            slider.LazyTravelTime = slider.NestedHitObjects[^1].StartTime + SliderEventGenerator.TAIL_LENIENCY - slider.StartTime;
 
             double endTimeMin = slider.LazyTravelTime / slider.SpanDuration;
             if (endTimeMin % 2 >= 1)

From 267d1ee7d442ef09bbdd5b7eb285c264d424ffb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Tue, 3 Oct 2023 22:08:14 +0200
Subject: [PATCH 0818/2296] Handle cases when player cannot be invited.

---
 .../Multiplayer/IMultiplayerRoomServer.cs     |  3 +-
 .../Multiplayer/OnlineMultiplayerClient.cs    | 29 +++++++++++++++++--
 .../Multiplayer/UserBlockedException.cs       | 26 +++++++++++++++++
 .../Multiplayer/UserBlocksPMsException.cs     | 26 +++++++++++++++++
 4 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/UserBlockedException.cs
 create mode 100644 osu.Game/Online/Multiplayer/UserBlocksPMsException.cs

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 64cd6df24d..e98570dc29 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -104,7 +104,8 @@ namespace osu.Game.Online.Multiplayer
         /// Invites a player to the current room.
         /// </summary>
         /// <param name="userId"></param>
-        /// <returns></returns>
+        /// <exception cref="UserBlockedException">The user has blocked or has been blocked by the invited user.</exception>
+        /// <exception cref="UserBlocksPMsException">The invited user does not accept private messages.</exception>
         Task InvitePlayer(int userId);
     }
 }
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 5b5741ef1c..08e82f2ad3 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -12,6 +12,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Notifications;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -107,14 +108,36 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
         }
 
-        public override Task InvitePlayer(int userId)
+        public override async Task InvitePlayer(int userId)
         {
             if (!IsConnected.Value)
-                return Task.CompletedTask;
+                return;
 
             Debug.Assert(connection != null);
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.InvitePlayer), userId);
+            try
+            {
+                await connection.InvokeAsync(nameof(IMultiplayerServer.InvitePlayer), userId).ConfigureAwait(false);
+            }
+            catch (HubException exception)
+            {
+                switch (exception.GetHubExceptionMessage())
+                {
+                    case UserBlockedException.MESSAGE:
+                        PostNotification?.Invoke(new SimpleErrorNotification
+                        {
+                            Text = "User cannot be invited by someone they have blocked or are blocked by."
+                        });
+                        break;
+
+                    case UserBlocksPMsException.MESSAGE:
+                        PostNotification?.Invoke(new SimpleErrorNotification
+                        {
+                            Text = "User cannot be invited because they cannot receive private messages from people not on their friends list."
+                        });
+                        break;
+                }
+            }
         }
 
         public override Task TransferHost(int userId)
diff --git a/osu.Game/Online/Multiplayer/UserBlockedException.cs b/osu.Game/Online/Multiplayer/UserBlockedException.cs
new file mode 100644
index 0000000000..363f878183
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/UserBlockedException.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 System;
+using System.Runtime.Serialization;
+using Microsoft.AspNetCore.SignalR;
+
+namespace osu.Game.Online.Multiplayer
+{
+    [Serializable]
+    public class UserBlockedException : HubException
+    {
+        public const string MESSAGE = "User cannot be invited by someone they have blocked or are blocked by.";
+
+        public UserBlockedException()
+            :
+            base(MESSAGE)
+        {
+        }
+
+        protected UserBlockedException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
new file mode 100644
index 0000000000..220a84cfe8
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/UserBlocksPMsException.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 System;
+using System.Runtime.Serialization;
+using Microsoft.AspNetCore.SignalR;
+
+namespace osu.Game.Online.Multiplayer
+{
+    [Serializable]
+    public class UserBlocksPMsException : HubException
+    {
+        public const string MESSAGE = "User cannot be invited because they have disabled private messages.";
+
+        public UserBlocksPMsException()
+            :
+            base(MESSAGE)
+        {
+        }
+
+        protected UserBlocksPMsException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}

From 32f69cd0ba58e9433214862751e830d33e70e748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 00:20:07 +0200
Subject: [PATCH 0819/2296] Make `UserAvatarNotification.user` readonly

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

diff --git a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
index 191d63a76f..8f32c9d395 100644
--- a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
+++ b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Notifications
 
         private TextFlowContainer? textDrawable;
 
-        private APIUser user;
+        private readonly APIUser user;
 
         public UserAvatarNotification(APIUser user, LocalisableString text)
         {

From 5678d904615f6f300613904363c1ac8d72b26a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 00:20:38 +0200
Subject: [PATCH 0820/2296] Reduce silliness of notification test case

---
 .../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 07bd722322..332053d71e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -549,7 +549,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             var user = await userLookupCache.GetUserAsync(0).ConfigureAwait(true);
             if (user == null) return;
 
-            var n = new UserAvatarNotification(user, $"{user.Username} is telling you to NOT download Haitai!");
+            var n = new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match!");
 
             notificationOverlay.Post(n);
         }

From 5469d134cb0919b70fc6168d24d948d3133b67ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 00:28:01 +0200
Subject: [PATCH 0821/2296] Add missing parameter description to docs.

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

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index e98570dc29..b7a608581c 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// Invites a player to the current room.
         /// </summary>
-        /// <param name="userId"></param>
+        /// <param name="userId">The user to invite.</param>
         /// <exception cref="UserBlockedException">The user has blocked or has been blocked by the invited user.</exception>
         /// <exception cref="UserBlocksPMsException">The invited user does not accept private messages.</exception>
         Task InvitePlayer(int userId);

From fe5177fa4fe29ea35b3fac74f50b330899dd7066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 00:50:48 +0200
Subject: [PATCH 0822/2296] Remove unused import

---
 osu.Game/Overlays/Notifications/UserAvatarNotification.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
index 8f32c9d395..af881a5008 100644
--- a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
+++ b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
@@ -2,7 +2,6 @@
 // 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.Shapes;

From 8d919912149a4853120612b67944492c27baa611 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Oct 2023 20:32:46 +0900
Subject: [PATCH 0823/2296] Fix difficulty calculation not correct handling
 slider leniency anymore

---
 .../Preprocessing/OsuDifficultyHitObject.cs           | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index 00cb4acfb4..5c2c85d69e 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
@@ -214,7 +215,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             if (slider.LazyEndPosition != null)
                 return;
 
-            slider.LazyTravelTime = slider.NestedHitObjects[^1].StartTime + SliderEventGenerator.TAIL_LENIENCY - slider.StartTime;
+            double trackingEndTime = Math.Max(
+                // SliderTailCircle always occurs at the final end time of the slider, but the player only needs to hold until within a lenience before it.
+                slider.NestedHitObjects.OfType<SliderTailCircle>().Single().StartTime + SliderEventGenerator.TAIL_LENIENCY,
+                // There's an edge case where one or more ticks/repeats fall within that leniency range.
+                // In such a case, the player needs to track until the final tick or repeat.
+                slider.NestedHitObjects.LastOrDefault(n => n is not SliderTailCircle)?.StartTime ?? double.MinValue
+            );
+
+            slider.LazyTravelTime = trackingEndTime - slider.StartTime;
 
             double endTimeMin = slider.LazyTravelTime / slider.SpanDuration;
             if (endTimeMin % 2 >= 1)

From 9361b1879c5e15667548b6d3c302c3bb43232d6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 12:54:13 +0900
Subject: [PATCH 0824/2296] Add note about early return in
 `DrawableSliderBall.Update`

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index 63e500d687..2fa2d4c0b5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -132,6 +132,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
+            // even in an edge case where current time has exceeded the slider's time, we may not have finished judging.
+            // we don't want to potentially update from Tracking=true to Tracking=false at this point.
             if (Time.Current >= drawableSlider.HitObject.EndTime)
                 return;
 

From cfb18e18c060f4270925b544fa545518ac48dea6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 13:33:06 +0900
Subject: [PATCH 0825/2296] Add better commenting around legacy last tick edge
 case

---
 .../Rulesets/Objects/SliderEventGenerator.cs  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
index 42c422a637..9b8375f208 100644
--- a/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
+++ b/osu.Game/Rulesets/Objects/SliderEventGenerator.cs
@@ -88,18 +88,27 @@ namespace osu.Game.Rulesets.Objects
 
             int finalSpanIndex = spanCount - 1;
             double finalSpanStartTime = startTime + finalSpanIndex * spanDuration;
-            double finalSpanEndTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + TAIL_LENIENCY);
-            double finalProgress = (finalSpanEndTime - finalSpanStartTime) / spanDuration;
 
-            if (spanCount % 2 == 0) finalProgress = 1 - finalProgress;
+            // Note that `finalSpanStartTime + spanDuration ≈ startTime + totalDuration`, but we write it like this to match floating point precision
+            // of stable.
+            //
+            // So thinking about this in a saner way, the time of the LegacyLastTick is
+            //
+            // `slider.StartTime + max(slider.Duration / 2, slider.Duration - 36)`
+            //
+            // As a slider gets shorter than 72 ms, the leniency offered falls below the 36 ms `TAIL_LENIENCY` constant.
+            double legacyLastTickTime = Math.Max(startTime + totalDuration / 2, (finalSpanStartTime + spanDuration) + TAIL_LENIENCY);
+            double legacyLastTickProgress = (legacyLastTickTime - finalSpanStartTime) / spanDuration;
+
+            if (spanCount % 2 == 0) legacyLastTickProgress = 1 - legacyLastTickProgress;
 
             yield return new SliderEventDescriptor
             {
                 Type = SliderEventType.LegacyLastTick,
                 SpanIndex = finalSpanIndex,
                 SpanStartTime = finalSpanStartTime,
-                Time = finalSpanEndTime,
-                PathProgress = finalProgress,
+                Time = legacyLastTickTime,
+                PathProgress = legacyLastTickProgress,
             };
 
             yield return new SliderEventDescriptor

From 48209872bfd73d347a7fa6f35958d77a659a6fbc Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 4 Oct 2023 13:53:33 +0900
Subject: [PATCH 0826/2296] Fix spinner requirements being susceptible to FP
 precision

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index aca55c6bd9..e3dfe8e69a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -70,8 +70,11 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             double secondsDuration = Duration / 1000;
 
-            SpinsRequired = (int)(minRps * secondsDuration);
-            MaximumBonusSpins = Math.Max(0, (int)(maxRps * secondsDuration) - SpinsRequired - bonus_spins_gap);
+            // Allow a 0.1ms floating point precision error in the calculation of the duration.
+            const double duration_error = 0.0001;
+
+            SpinsRequired = (int)(minRps * secondsDuration + duration_error);
+            MaximumBonusSpins = Math.Max(0, (int)(maxRps * secondsDuration + duration_error) - SpinsRequired - bonus_spins_gap);
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)

From d14d885d19a018343f9aa81ca7f67e84da917865 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 14:52:35 +0900
Subject: [PATCH 0827/2296] Add test coverage of very fast slider

---
 .../OsuDifficultyCalculatorTest.cs            |  3 +++
 .../Testing/Beatmaps/very-fast-slider.osu     | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/very-fast-slider.osu

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index 9c6449cfa9..f1c1c4734d 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -17,16 +17,19 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         [TestCase(6.7115569159190587d, 206, "diffcalc-test")]
         [TestCase(1.4391311903612753d, 45, "zero-length-sliders")]
+        [TestCase(0.42506480230838789d, 2, "very-fast-slider")]
         [TestCase(0.14102693012101306d, 1, "nan-slider")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)
             => base.Test(expectedStarRating, expectedMaxCombo, name);
 
         [TestCase(8.9757300665532966d, 206, "diffcalc-test")]
+        [TestCase(0.55071082800473514d, 2, "very-fast-slider")]
         [TestCase(1.7437232654020756d, 45, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModDoubleTime());
 
         [TestCase(6.7115569159190587d, 239, "diffcalc-test")]
+        [TestCase(0.42506480230838789d, 4, "very-fast-slider")]
         [TestCase(1.4391311903612753d, 54, "zero-length-sliders")]
         public void TestClassicMod(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModClassic());
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/very-fast-slider.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/very-fast-slider.osu
new file mode 100644
index 0000000000..58ef36e70c
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/very-fast-slider.osu
@@ -0,0 +1,21 @@
+osu file format v128
+
+[Difficulty]
+HPDrainRate: 3
+CircleSize: 4
+OverallDifficulty: 9
+ApproachRate: 9.3
+SliderMultiplier: 3.59999990463257
+SliderTickRate: 1
+
+[TimingPoints]
+812,342.857142857143,4,1,1,70,1,0
+57383,-28.5714285714286,4,1,1,70,0,0
+
+[HitObjects]
+// Taken from https://osu.ppy.sh/beatmapsets/881996#osu/1844019
+// This slider is 42 ms in length, triggering the LegacyLastTick edge case.
+// The tick will be at 21.5 ms (sliderDuration / 2) instead of 6 ms (sliderDuration - LAST_TICK_LENIENCE).
+416,41,57383,6,0,L|467:217,1,157.499997329712,2|0,3:3|3:0,3:0:0:0:
+// Include the next slider as well to cover the jump back to the start position.
+407,73,57469,2,0,L|470:215,1,129.599999730835,2|0,0:0|0:0,0:0:0:0:

From bfeafd6f70bcd0832c144b3bf8d7cbd75c148285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 08:30:48 +0200
Subject: [PATCH 0828/2296] Fix formatting

---
 osu.Game/Online/Multiplayer/UserBlockedException.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/UserBlockedException.cs b/osu.Game/Online/Multiplayer/UserBlockedException.cs
index 363f878183..f2b69411c7 100644
--- a/osu.Game/Online/Multiplayer/UserBlockedException.cs
+++ b/osu.Game/Online/Multiplayer/UserBlockedException.cs
@@ -13,8 +13,7 @@ namespace osu.Game.Online.Multiplayer
         public const string MESSAGE = "User cannot be invited by someone they have blocked or are blocked by.";
 
         public UserBlockedException()
-            :
-            base(MESSAGE)
+            : base(MESSAGE)
         {
         }
 

From 74ed3bc4ff8f8206188ec115c319222b0b31a99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 08:31:50 +0200
Subject: [PATCH 0829/2296] Rename `loadRoom` to `lookupRoom`

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 61c2fa495a..8b4c38a152 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -448,7 +448,7 @@ namespace osu.Game.Online.Multiplayer
         async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password)
         {
             var loadUserTask = userLookupCache.GetUserAsync(invitedBy);
-            var loadRoomTask = loadRoom(roomID);
+            var loadRoomTask = lookupRoom(roomID);
 
             await Task.WhenAll(loadUserTask, loadRoomTask).ConfigureAwait(false);
 
@@ -472,7 +472,7 @@ namespace osu.Game.Online.Multiplayer
             });
         }
 
-        private Task<Room?> loadRoom(long id)
+        private Task<Room?> lookupRoom(long id)
         {
             return Task.Run(() =>
             {

From 0726ccb9887a9be8c653cf61de6fbf0a4c31bbff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 08:32:18 +0200
Subject: [PATCH 0830/2296] Fix formatting

---
 osu.Game/Online/Multiplayer/UserBlocksPMsException.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
index 220a84cfe8..0fd4e1f0c1 100644
--- a/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
+++ b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
@@ -13,8 +13,7 @@ namespace osu.Game.Online.Multiplayer
         public const string MESSAGE = "User cannot be invited because they have disabled private messages.";
 
         public UserBlocksPMsException()
-            :
-            base(MESSAGE)
+            : base(MESSAGE)
         {
         }
 

From 6bd51b32b47919a69a096c09ff8eac76c8bbe477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 08:35:45 +0200
Subject: [PATCH 0831/2296] Make resolved `multiplayerClient` field nullable

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

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 29a6c65555..98b306e264 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Users
         protected OsuColour Colours { get; private set; } = null!;
 
         [Resolved]
-        private MultiplayerClient multiplayerClient { get; set; } = null!;
+        private MultiplayerClient? multiplayerClient { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -124,7 +124,7 @@ namespace osu.Game.Users
 
                 if (
                     User.IsOnline &&
-                    multiplayerClient.Room != null &&
+                    multiplayerClient?.Room != null &&
                     multiplayerClient.Room.Users.All(u => u.UserID != User.Id)
                 )
                 {

From 6d97f89399ec328b178f8f0561d0479650f2c86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Sch=C3=BCrz?= <minetoblend@gmail.com>
Date: Wed, 4 Oct 2023 08:37:22 +0200
Subject: [PATCH 0832/2296] Rename `OnlinePlayScreen.LoungeSubScreen` to
 `Lounge`

---
 .../Screens/OnlinePlay/Multiplayer/Multiplayer.cs    |  2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index f74b5dd96e..f899b24d30 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         public void Join(Room room, string? password)
         {
-            LoungeSubScreen.Join(room, password);
+            Lounge.Join(room, password);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 85eec7ac07..57e388f016 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.OnlinePlay
         // while leases may be taken out by a subscreen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
-        protected LoungeSubScreen LoungeSubScreen;
+        protected LoungeSubScreen Lounge;
 
         private MultiplayerWaveContainer waves;
         private ScreenStack screenStack;
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.OnlinePlay
             screenStack.ScreenPushed += screenPushed;
             screenStack.ScreenExited += screenExited;
 
-            screenStack.Push(LoungeSubScreen = CreateLounge());
+            screenStack.Push(Lounge = CreateLounge());
 
             apiState.BindTo(API.State);
             apiState.BindValueChanged(onlineStateChanged, true);
@@ -121,10 +121,10 @@ namespace osu.Game.Screens.OnlinePlay
 
             Mods.SetDefault();
 
-            if (LoungeSubScreen.IsCurrentScreen())
-                LoungeSubScreen.OnEntering(e);
+            if (Lounge.IsCurrentScreen())
+                Lounge.OnEntering(e);
             else
-                LoungeSubScreen.MakeCurrent();
+                Lounge.MakeCurrent();
         }
 
         public override void OnResuming(ScreenTransitionEvent e)
@@ -159,7 +159,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         public override bool OnExiting(ScreenExitEvent e)
         {
-            while (screenStack.CurrentScreen != null && screenStack.CurrentScreen is not Lounge.LoungeSubScreen)
+            while (screenStack.CurrentScreen != null && screenStack.CurrentScreen is not LoungeSubScreen)
             {
                 var subScreen = (Screen)screenStack.CurrentScreen;
                 if (subScreen.IsLoaded && subScreen.OnExiting(e))

From 658b6a166f711fd719f05b2d3f746cd33ca8e944 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 16:11:39 +0900
Subject: [PATCH 0833/2296] Fix regression in `Tracking` state handling

It turns out multiple components depend on `Tracking` eventually
becoming `false` at the end of a slider. With my previous changes, this
was no longer the case (as could be seen by the legacy cursor particles
test failure, and heard by slider slide taking too long to stop).
---
 .../Objects/Drawables/DrawableSliderBall.cs              | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index 2fa2d4c0b5..292f2ffd7d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Skinning.Default;
@@ -132,11 +133,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
-            // even in an edge case where current time has exceeded the slider's time, we may not have finished judging.
-            // we don't want to potentially update from Tracking=true to Tracking=false at this point.
-            if (Time.Current >= drawableSlider.HitObject.EndTime)
-                return;
-
             // from the point at which the head circle is hit, this will be non-null.
             // it may be null if the head circle was missed.
             var headCircleHitAction = GetInitialHitAction();
@@ -159,6 +155,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Tracking =
                 // in valid time range
                 Time.Current >= drawableSlider.HitObject.StartTime
+                // even in an edge case where current time has exceeded the slider's time, we may not have finished judging.
+                // we don't want to potentially update from Tracking=true to Tracking=false at this point.
+                && (!drawableSlider.AllJudged || Time.Current <= drawableSlider.HitObject.GetEndTime())
                 // in valid position range
                 && lastScreenSpaceMousePosition.HasValue && followCircleReceptor.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action

From a186d97edf53f2152bd52b852421a789c58cfabf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 16:57:54 +0900
Subject: [PATCH 0834/2296] Update framework

---
 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 20b0f220a3..85d5e66d44 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.922.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1004.1" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0ee922e53a..cf8e6b9b53 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.922.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1004.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 5508c2ab03..ba4deda4cd 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.922.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1004.1" />
   </ItemGroup>
 </Project>

From 20342d430dbec125927e36284ed84a92da7fc66c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 23:55:38 +0900
Subject: [PATCH 0835/2296] Update framework

---
 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 85d5e66d44..bc95e96a7b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1004.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1004.2" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cf8e6b9b53..622b59a725 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1004.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1004.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ba4deda4cd..16bccbbb53 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1004.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1004.2" />
   </ItemGroup>
 </Project>

From 2ae1a2435504f8c49391f6870286074af1a4781b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 4 Oct 2023 18:55:20 +0200
Subject: [PATCH 0836/2296] Add failing test covering counting multiple swell
 hits per frame

---
 .../Judgements/TestSceneSwellJudgements.cs    | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs
index 4abad98eab..6e42ae7eb5 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneSwellJudgements.cs
@@ -115,6 +115,48 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
             AddAssert("all tick offsets are 0", () => JudgementResults.Where(r => r.HitObject is SwellTick).All(r => r.TimeOffset == 0));
         }
 
+        [Test]
+        public void TestAtMostOneSwellTickJudgedPerFrame()
+        {
+            const double swell_time = 1000;
+
+            Swell swell = new Swell
+            {
+                StartTime = swell_time,
+                Duration = 1000,
+                RequiredHits = 10
+            };
+
+            List<ReplayFrame> frames = new List<ReplayFrame>
+            {
+                new TaikoReplayFrame(1000),
+                new TaikoReplayFrame(1250, TaikoAction.LeftCentre, TaikoAction.LeftRim),
+                new TaikoReplayFrame(1251),
+                new TaikoReplayFrame(1500, TaikoAction.LeftCentre, TaikoAction.LeftRim, TaikoAction.RightCentre, TaikoAction.RightRim),
+                new TaikoReplayFrame(1501),
+                new TaikoReplayFrame(2000),
+            };
+
+            PerformTest(frames, CreateBeatmap(swell));
+
+            AssertJudgementCount(11);
+
+            // this is a charitable interpretation of the inputs.
+            //
+            // for the frame at time 1250, we only count either one of the input actions - simple.
+            //
+            // for the frame at time 1500, we give the user the benefit of the doubt,
+            // and we ignore actions that wouldn't otherwise cause a hit due to not alternating,
+            // but we still count one (just one) of the actions that _would_ normally cause a hit.
+            // this is done as a courtesy to avoid stuff like key chattering after press blocking legitimate inputs.
+            for (int i = 0; i < 2; i++)
+                AssertResult<SwellTick>(i, HitResult.IgnoreHit);
+            for (int i = 2; i < swell.RequiredHits; i++)
+                AssertResult<SwellTick>(i, HitResult.IgnoreMiss);
+
+            AssertResult<Swell>(0, HitResult.IgnoreMiss);
+        }
+
         /// <summary>
         /// Ensure input is correctly sent to subsequent hits if a swell is fully completed.
         /// </summary>

From a1368df62f8bdcc72078c3672fd9c9f7630dfd0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 4 Oct 2023 19:03:12 +0200
Subject: [PATCH 0837/2296] Allow judging at most one swell tick per frame

---
 .../Objects/Drawables/DrawableSwell.cs                 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 3fa6f4b756..297ea93637 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private readonly CircularContainer targetRing;
         private readonly CircularContainer expandingRing;
 
+        private double? lastPressHandleTime;
+
         public override bool DisplayResult => false;
 
         public DrawableSwell()
@@ -140,6 +142,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             UnproxyContent();
 
             lastWasCentre = null;
+            lastPressHandleTime = null;
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
@@ -285,7 +288,14 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             if (lastWasCentre == isCentre)
                 return false;
 
+            // If we've already successfully judged a tick this frame, do not judge more.
+            // Note that the ordering is important here - this is intentionally placed after the alternating check.
+            // That is done to prevent accidental double inputs blocking simultaneous but legitimate hits from registering.
+            if (lastPressHandleTime == Time.Current)
+                return true;
+
             lastWasCentre = isCentre;
+            lastPressHandleTime = Time.Current;
 
             UpdateResult(true);
 

From 9f350ce13c58a16c47a0e5bd770c4495cc892455 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 5 Oct 2023 13:20:07 +0900
Subject: [PATCH 0838/2296] Add new difficulty calculation github action

---
 .github/workflows/diffcalc.yml | 481 +++++++++++++++++++++------------
 1 file changed, 302 insertions(+), 179 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 2c6ec17e18..ef1909dfae 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -1,206 +1,329 @@
-# Listens for new PR comments containing !pp check [id], and runs a diffcalc comparison against master.
-# Usage:
-#   !pp check 0        | Runs only the osu! ruleset.
-#   !pp check 0 2      | Runs only the osu! and catch rulesets.
-#
-
 name: Difficulty Calculation
+
+run-name: "${{ github.event_name == 'workflow_dispatch' && format('Manual run: {0}', inputs.osu-b) || 'Automatic comment trigger' }}"
+
 on:
   issue_comment:
     types: [ created ]
+  workflow_dispatch:
+    inputs:
+      osu-b:
+        description: "The target build of ppy/osu"
+        type: string
+        required: true
+      ruleset:
+        description: "The ruleset to process"
+        type: choice
+        required: true
+        options:
+          - osu
+          - taiko
+          - catch
+          - mania
+      converts:
+        description: "Include converted beatmaps"
+        type: boolean
+        required: false
+        default: true
+      ranked-only:
+        description: "Only ranked beatmaps"
+        type: boolean
+        required: false
+        default: true
+      generators:
+        description: "Comma-separated list of generators (available: [sr, pp, score])"
+        type: string
+        required: false
+        default: 'pp,sr'
+      osu-a:
+        description: "The source build of ppy/osu"
+        type: string
+        required: false
+        default: 'latest'
+      difficulty-calculator-a:
+        description: "The source build of ppy/osu-difficulty-calculator"
+        type: string
+        required: false
+        default: 'latest'
+      difficulty-calculator-b:
+        description: "The target build of ppy/osu-difficulty-calculator"
+        type: string
+        required: false
+        default: 'latest'
+      score-processor-a:
+        description: "The source build of ppy/osu-queue-score-statistics"
+        type: string
+        required: false
+        default: 'latest'
+      score-processor-b:
+        description: "The target build of ppy/osu-queue-score-statistics"
+        type: string
+        required: false
+        default: 'latest'
+
+permissions:
+  pull-requests: write
 
 env:
-  CONCURRENCY: 4
-  ALLOW_DOWNLOAD: 1
-  SAVE_DOWNLOADED: 1
-  SKIP_INSERT_ATTRIBUTES: 1
+  COMMENT_TAG: execution-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
 
 jobs:
-  metadata:
-    name: Check for requests
+  wait-for-queue:
+    name: "Wait for previous workflows"
+    runs-on: ubuntu-latest
+    if: ${{ !cancelled() && (github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER') }}
+    timeout-minutes: 50400 # 35 days, the maximum for jobs.
+    steps:
+      - uses: ahmadnassri/action-workflow-queue@v1
+        with:
+          timeout: 2147483647 # Around 24 days, maximum supported.
+          delay: 120000 # Poll every 2 minutes. API seems fairly low on this one.
+
+  create-comment:
+    name: Create PR comment
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER' }}
+    steps:
+      - name: Create comment
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: ${{ env.COMMENT_TAG }}
+          message: |
+            Difficulty calculation queued -- please wait! (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
+
+            *This comment will update on completion*
+
+  directory:
+    name: Prepare directory
+    needs: wait-for-queue
     runs-on: self-hosted
-    if: github.event.issue.pull_request && contains(github.event.comment.body, '!pp check') && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER')
+    if: ${{ !cancelled() && (github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER') }}
     outputs:
-      matrix: ${{ steps.generate-matrix.outputs.matrix }}
-      continue: ${{ steps.generate-matrix.outputs.continue }}
+      GENERATOR_DIR: ${{ steps.set-outputs.outputs.GENERATOR_DIR }}
+      GENERATOR_ENV: ${{ steps.set-outputs.outputs.GENERATOR_ENV }}
+      GOOGLE_CREDS_FILE: ${{ steps.set-outputs.outputs.GOOGLE_CREDS_FILE }}
     steps:
-      - name: Construct build matrix
-        id: generate-matrix
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Checkout diffcalc-sheet-generator
+        uses: actions/checkout@v3
+        with:
+          path: 'diffcalc-sheet-generator'
+          repository: 'smoogipoo/diffcalc-sheet-generator'
+
+      - name: Set outputs
+        id: set-outputs
         run: |
-          if [[ "${{ github.event.comment.body }}" =~ "osu" ]] ; then
-            MATRIX_PROJECTS_JSON+='{ "name": "osu", "id": 0 },'
-          fi
-          if [[ "${{ github.event.comment.body }}" =~ "taiko" ]] ; then
-            MATRIX_PROJECTS_JSON+='{ "name": "taiko", "id": 1 },'
-          fi
-          if [[ "${{ github.event.comment.body }}" =~ "catch" ]] ; then
-            MATRIX_PROJECTS_JSON+='{ "name": "catch", "id": 2 },'
-          fi
-          if [[ "${{ github.event.comment.body }}" =~ "mania" ]] ; then
-            MATRIX_PROJECTS_JSON+='{ "name": "mania", "id": 3 },'
-          fi
+          echo "GENERATOR_DIR=${{ github.workspace }}/diffcalc-sheet-generator" >> "${GITHUB_OUTPUT}"
+          echo "GENERATOR_ENV=${{ github.workspace }}/diffcalc-sheet-generator/.env" >> "${GITHUB_OUTPUT}"
+          echo "GOOGLE_CREDS_FILE=${{ github.workspace }}/diffcalc-sheet-generator/google-credentials.json" >> "${GITHUB_OUTPUT}"
 
-          if [[ "${MATRIX_PROJECTS_JSON}" != "" ]]; then
-            MATRIX_JSON="{ \"ruleset\": [ ${MATRIX_PROJECTS_JSON} ] }"
-            echo "${MATRIX_JSON}"
-            CONTINUE="yes"
-          else
-            CONTINUE="no"
-          fi
-
-          echo "continue=${CONTINUE}" >> $GITHUB_OUTPUT
-          echo "matrix=${MATRIX_JSON}" >> $GITHUB_OUTPUT
-  diffcalc:
-    name: Run
+  environment:
+    name: Setup environment
+    needs: directory
     runs-on: self-hosted
-    timeout-minutes: 1440
-    if: needs.metadata.outputs.continue == 'yes'
-    needs: metadata
-    strategy:
-      matrix: ${{ fromJson(needs.metadata.outputs.matrix) }}
+    if: ${{ !cancelled() && needs.directory.result == 'success' }}
+    env:
+      VARS_JSON: ${{ toJSON(vars) }}
     steps:
-      - name: Verify MySQL connection from host
+      - name: Add base environment
         run: |
-          mysql -e "SHOW DATABASES"
+          # Required by diffcalc-sheet-generator
+          cp '${{ github.workspace }}/diffcalc-sheet-generator/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
-      - name: Drop previous databases
-        run: |
-          for db in osu_master osu_pr
-          do
-            mysql -e "DROP DATABASE IF EXISTS $db"
+          # Add Google credentials
+          echo '${{ secrets.DIFFCALC_GOOGLE_CREDENTIALS }}' | base64 -d > "${{ needs.directory.outputs.GOOGLE_CREDS_FILE }}"
+
+          # Add repository variables
+          echo "${VARS_JSON}" | jq -c '. | to_entries | .[]' | while read -r line; do
+              opt=$(jq -r '.key' <<< ${line})
+              val=$(jq -r '.value' <<< ${line})
+
+              if [[ "${opt}" =~ ^DIFFCALC_ ]]; then
+                optNoPrefix=$(echo "${opt}" | cut -d '_' -f2-)
+                sed -i "s;^${optNoPrefix}=.*$;${optNoPrefix}=${val};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
+              fi
           done
 
-      - name: Create directory structure
+      - name: Add pull-request environment
+        if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
         run: |
-          mkdir -p $GITHUB_WORKSPACE/master/
-          mkdir -p $GITHUB_WORKSPACE/pr/
+          sed -i "s;^OSU_B=.*$;OSU_B=${{ github.event.issue.pull_request.url }};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
-      - name: Get upstream branch # https://akaimo.hatenablog.jp/entry/2020/05/16/101251
-        id: upstreambranch
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Add comment environment
+        if: ${{ github.event_name == 'issue_comment' }}
         run: |
-          echo "branchname=$(curl -H "Authorization: token ${GITHUB_TOKEN}" ${{ github.event.issue.pull_request.url }} | jq '.head.ref' | sed 's/\"//g')" >> $GITHUB_OUTPUT
-          echo "repo=$(curl -H "Authorization: token ${GITHUB_TOKEN}" ${{ github.event.issue.pull_request.url }} | jq '.head.repo.full_name' | sed 's/\"//g')" >> $GITHUB_OUTPUT
-
-      # Checkout osu
-      - name: Checkout osu (master)
-        uses: actions/checkout@v3
-        with:
-          path: 'master/osu'
-      - name: Checkout osu (pr)
-        uses: actions/checkout@v3
-        with:
-          path: 'pr/osu'
-          repository: ${{ steps.upstreambranch.outputs.repo }}
-          ref: ${{ steps.upstreambranch.outputs.branchname }}
-
-      - name: Checkout osu-difficulty-calculator (master)
-        uses: actions/checkout@v3
-        with:
-          repository: ppy/osu-difficulty-calculator
-          path: 'master/osu-difficulty-calculator'
-      - name: Checkout osu-difficulty-calculator (pr)
-        uses: actions/checkout@v3
-        with:
-          repository: ppy/osu-difficulty-calculator
-          path: 'pr/osu-difficulty-calculator'
-
-      - name: Install .NET 5.0.x
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: "5.0.x"
-
-      # Sanity checks to make sure diffcalc is not run when incompatible.
-      - name: Build diffcalc (master)
-        run: |
-          cd $GITHUB_WORKSPACE/master/osu-difficulty-calculator
-          ./UseLocalOsu.sh
-          dotnet build
-      - name: Build diffcalc (pr)
-        run: |
-          cd $GITHUB_WORKSPACE/pr/osu-difficulty-calculator
-          ./UseLocalOsu.sh
-          dotnet build
-
-      - name: Download + import data
-        run: |
-          PERFORMANCE_DATA_NAME=$(curl https://data.ppy.sh/ | grep performance_${{ matrix.ruleset.name }}_top_1000 | tail -1 | awk -F "\"" '{print $2}' | sed 's/\.tar\.bz2//g')
-          BEATMAPS_DATA_NAME=$(curl https://data.ppy.sh/ | grep osu_files | tail -1 | awk -F "\"" '{print $2}' | sed 's/\.tar\.bz2//g')
-
-          # Set env variable for further steps.
-          echo "BEATMAPS_PATH=$GITHUB_WORKSPACE/$BEATMAPS_DATA_NAME" >> $GITHUB_ENV
-
-          cd $GITHUB_WORKSPACE
-
-          echo "Downloading database dump $PERFORMANCE_DATA_NAME.."
-          wget -q -nc https://data.ppy.sh/$PERFORMANCE_DATA_NAME.tar.bz2
-          echo "Extracting.."
-          tar -xf $PERFORMANCE_DATA_NAME.tar.bz2
-
-          echo "Downloading beatmap dump $BEATMAPS_DATA_NAME.."
-          wget -q -nc https://data.ppy.sh/$BEATMAPS_DATA_NAME.tar.bz2
-          echo "Extracting.."
-          tar -xf $BEATMAPS_DATA_NAME.tar.bz2
-
-          cd $PERFORMANCE_DATA_NAME
-
-          for db in osu_master osu_pr
-          do
-            echo "Setting up database $db.."
-
-            mysql -e "CREATE DATABASE $db"
-
-            echo "Importing beatmaps.."
-            cat osu_beatmaps.sql | mysql $db
-            echo "Importing beatmapsets.."
-            cat osu_beatmapsets.sql | mysql $db
-
-            echo "Creating table structure.."
-            mysql $db -e 'CREATE TABLE `osu_beatmap_difficulty` (
-                `beatmap_id` int unsigned NOT NULL,
-                `mode` tinyint NOT NULL DEFAULT 0,
-                `mods` int unsigned NOT NULL,
-                `diff_unified` float NOT NULL,
-                `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                PRIMARY KEY (`beatmap_id`,`mode`,`mods`),
-                KEY `diff_sort` (`mode`,`mods`,`diff_unified`)
-              ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;'
+          # Add comment environment
+          echo '${{ github.event.comment.body }}' | sed -r 's/\r$//' | grep -E '^\w+=' | while read -r line; do
+              opt=$(echo ${line} | cut -d '=' -f1)
+              sed -i "s;^${opt}=.*$;${line};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
           done
 
-      - name: Run diffcalc (master)
-        env:
-          DB_NAME: osu_master
+      - name: Add dispatch environment
+        if: ${{ github.event_name == 'workflow_dispatch' }}
         run: |
-          cd $GITHUB_WORKSPACE/master/osu-difficulty-calculator/osu.Server.DifficultyCalculator
-          dotnet run -c:Release -- all -m ${{ matrix.ruleset.id }} -ac -c ${{ env.CONCURRENCY }}
-      - name: Run diffcalc (pr)
-        env:
-          DB_NAME: osu_pr
-        run: |
-          cd $GITHUB_WORKSPACE/pr/osu-difficulty-calculator/osu.Server.DifficultyCalculator
-          dotnet run -c:Release -- all -m ${{ matrix.ruleset.id }} -ac -c ${{ env.CONCURRENCY }}
+          sed -i 's;^OSU_B=.*$;OSU_B=${{ inputs.osu-b }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          sed -i 's/^RULESET=.*$/RULESET=${{ inputs.ruleset }}/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          sed -i 's/^GENERATORS=.*$/GENERATORS=${{ inputs.generators }}/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
-      - name: Print diffs
-        run: |
-          mysql -e "
-            SELECT
-              m.beatmap_id,
-              m.mods,
-              b.filename,
-              m.diff_unified as 'sr_master',
-              p.diff_unified as 'sr_pr',
-              (p.diff_unified - m.diff_unified) as 'diff'
-            FROM osu_master.osu_beatmap_difficulty m
-            JOIN osu_pr.osu_beatmap_difficulty p
-              ON m.beatmap_id = p.beatmap_id
-              AND m.mode = p.mode
-              AND m.mods = p.mods
-            JOIN osu_pr.osu_beatmaps b
-              ON b.beatmap_id = p.beatmap_id
-            WHERE abs(m.diff_unified - p.diff_unified) > 0.1
-            ORDER BY abs(m.diff_unified - p.diff_unified)
-              DESC
-            LIMIT 10000;"
+          if [[ '${{ inputs.osu-a }}' != 'latest' ]]; then
+              sed -i 's;^OSU_A=.*$;OSU_A=${{ inputs.osu-a }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
 
-      # Todo: Run ppcalc
+          if [[ '${{ inputs.difficulty-calculator-a }}' != 'latest' ]]; then
+              sed -i 's;^DIFFICULTY_CALCULATOR_A=.*$;DIFFICULTY_CALCULATOR_A=${{ inputs.difficulty-calculator-a }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.difficulty-calculator-b }}' != 'latest' ]]; then
+              sed -i 's;^DIFFICULTY_CALCULATOR_B=.*$;DIFFICULTY_CALCULATOR_B=${{ inputs.difficulty-calculator-b }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.score-processor-a }}' != 'latest' ]]; then
+              sed -i 's;^SCORE_PROCESSOR_A=.*$;SCORE_PROCESSOR_A=${{ inputs.score-processor-a }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.score-processor-b }}' != 'latest' ]]; then
+              sed -i 's;^SCORE_PROCESSOR_B=.*$;SCORE_PROCESSOR_B=${{ inputs.score-processor-b }};' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.converts }}' == 'true' ]]; then
+              sed -i 's/^NO_CONVERTS=.*$/NO_CONVERTS=0/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          else
+              sed -i 's/^NO_CONVERTS=.*$/NO_CONVERTS=1/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+          if [[ '${{ inputs.ranked-only }}' == 'true' ]]; then
+              sed -i 's/^RANKED_ONLY=.*$/RANKED_ONLY=1/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          else
+              sed -i 's/^RANKED_ONLY=.*$/RANKED_ONLY=0/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          fi
+
+  scores:
+    name: Setup scores
+    needs: [ directory, environment ]
+    runs-on: self-hosted
+    if: ${{ !cancelled() && needs.environment.result == 'success' }}
+    steps:
+      - name: Query latest data
+        id: query
+        run: |
+          ruleset=$(cat ${{ needs.directory.outputs.GENERATOR_ENV }} | grep -E '^RULESET=' | cut -d '=' -f2-)
+          performance_data_name=$(curl -s "https://data.ppy.sh/" | grep "performance_${ruleset}_top_1000\b" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g')
+
+          echo "TARGET_DIR=${{ needs.directory.outputs.GENERATOR_DIR }}/sql/${ruleset}" >> "${GITHUB_OUTPUT}"
+          echo "DATA_NAME=${performance_data_name}" >> "${GITHUB_OUTPUT}"
+
+      - name: Restore cache
+        id: restore-cache
+        uses: maxnowack/local-cache@v1
+        with:
+          path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
+          key: ${{ steps.query.outputs.DATA_NAME }}
+
+      - name: Download
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        run: |
+          wget -q -nc "https://data.ppy.sh/${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+
+      - name: Extract
+        run: |
+          tar -I lbzip2 -xf "${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+          rm -r "${{ steps.query.outputs.TARGET_DIR }}"
+          mv "${{ steps.query.outputs.DATA_NAME }}" "${{ steps.query.outputs.TARGET_DIR }}"
+
+  beatmaps:
+    name: Setup beatmaps
+    needs: directory
+    runs-on: self-hosted
+    if: ${{ !cancelled() && needs.directory.result == 'success' }}
+    steps:
+      - name: Query latest data
+        id: query
+        run: |
+          beatmaps_data_name=$(curl -s "https://data.ppy.sh/" | grep "osu_files" | tail -1 | awk -F "'" '{print $2}' | sed 's/\.tar\.bz2//g')
+
+          echo "TARGET_DIR=${{ needs.directory.outputs.GENERATOR_DIR }}/beatmaps" >> "${GITHUB_OUTPUT}"
+          echo "DATA_NAME=${beatmaps_data_name}" >> "${GITHUB_OUTPUT}"
+
+      - name: Restore cache
+        id: restore-cache
+        uses: maxnowack/local-cache@v1
+        with:
+          path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
+          key: ${{ steps.query.outputs.DATA_NAME }}
+
+      - name: Download
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        run: |
+          wget -q -nc "https://data.ppy.sh/${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+
+      - name: Extract
+        run: |
+          tar -I lbzip2 -xf "${{ steps.query.outputs.DATA_NAME }}.tar.bz2"
+          rm -r "${{ steps.query.outputs.TARGET_DIR }}"
+          mv "${{ steps.query.outputs.DATA_NAME }}" "${{ steps.query.outputs.TARGET_DIR }}"
+
+  generator:
+    name: Run generator
+    needs: [ directory, environment, scores, beatmaps ]
+    runs-on: self-hosted
+    timeout-minutes: 720
+    if: ${{ !cancelled() && needs.scores.result == 'success' && needs.beatmaps.result == 'success' }}
+    outputs:
+      TARGET: ${{ steps.run.outputs.TARGET }}
+      SPREADSHEET_LINK: ${{ steps.run.outputs.SPREADSHEET_LINK }}
+    steps:
+      - name: Run
+        id: run
+        run: |
+          # Add the GitHub token. This needs to be done here because it's unique per-job.
+          sed -i 's/^GH_TOKEN=.*$/GH_TOKEN=${{ github.token }}/' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+
+          cd "${{ needs.directory.outputs.GENERATOR_DIR }}"
+          docker-compose up --build generator
+
+          link=$(docker-compose logs generator -n 10 | grep 'http' | sed -E 's/^.*(http.*)$/\1/')
+          target=$(cat "${{ needs.directory.outputs.GENERATOR_ENV }}" | grep -E '^OSU_B=' | cut -d '=' -f2-)
+
+          echo "TARGET=${target}" >> "${GITHUB_OUTPUT}"
+          echo "SPREADSHEET_LINK=${link}" >> "${GITHUB_OUTPUT}"
+
+      - name: Shutdown
+        if: ${{ always() }}
+        run: |
+          cd "${{ needs.directory.outputs.GENERATOR_DIR }}"
+          docker-compose down
+
+      - name: Output info
+        if: ${{ success() }}
+        run: |
+          echo "Target: ${{ steps.run.outputs.TARGET }}"
+          echo "Spreadsheet: ${{ steps.run.outputs.SPREADSHEET_LINK }}"
+
+  update-comment:
+    name: Update PR comment
+    needs: [ create-comment, generator ]
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER' }}
+    steps:
+      - name: Update comment on success
+        if: ${{ needs.generator.result == 'success' }}
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: ${{ env.COMMENT_TAG }}
+          mode: upsert
+          create_if_not_exists: false
+          message: |
+            Target: ${{ needs.generator.outputs.TARGET }}
+            Spreadsheet: ${{ needs.generator.outputs.SPREADSHEET_LINK }}
+
+      - name: Update comment on failure
+        if: ${{ needs.generator.result == 'failure' }}
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: ${{ env.COMMENT_TAG }}
+          mode: upsert
+          create_if_not_exists: false
+          message: |
+            Difficulty calculation failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
\ No newline at end of file

From f8455af0d09360ace64371d847581d8faf73ad11 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Oct 2023 18:04:07 +0900
Subject: [PATCH 0839/2296] Fix double interpolation being applied when
 `applyOffsets=false`

---
 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 316d1f8a34..587e6bbeed 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Beatmaps
             }
             else
             {
-                finalClockSource = new InterpolatingFramedClock(interpolatedTrack);
+                finalClockSource = interpolatedTrack;
             }
         }
 

From bca257eeda9d3aac95011c5d1631a93af547de86 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 5 Oct 2023 13:32:20 +0900
Subject: [PATCH 0840/2296] Add description

---
 .github/workflows/diffcalc.yml | 42 ++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index ef1909dfae..168f411264 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -1,4 +1,42 @@
-name: Difficulty Calculation
+# ## Description
+#
+# Uses [diffcalc-sheet-generator](https://github.com/smoogipoo/diffcalc-sheet-generator) to run two builds of osu and generate an SR/PP/Score comparison spreadsheet.
+#
+# Can be dispatched both via GitHub -> Actions workflow, or via '!diffcalc' in an issue/PR comment.
+#
+# ## Requirements
+#
+# Self-hosted runner with installed:
+# - `docker >= 20.10.16`
+# - `docker-compose >= 2.5.1`
+# - `lbzip2`
+# - `jq`
+#
+# ## Usage
+#
+# The workflow can be run in two ways:
+# 1. Via workflow dispatch.
+# 2. By an owner of the repository posting a pull request or issue comment containing `!diffcalc`.  
+# For pull requests, the workflow will assume the pull request as the target to compare against (i.e. the `OSU_B` variable).  
+# Any lines in the comment of the form `KEY=VALUE` are treated as variables for the generator.
+#
+# ## Google Service Account
+#
+# Spreadsheets are uploaded to a Google Service Account, and exposed with read-only permissions to the wider audience.
+#
+# 1. Create a project at https://console.cloud.google.com
+# 2. Enable the `Google Sheets` and `Google Drive` APIs.
+# 3. Create a Service Account
+# 4. Generate a key in the JSON format.
+# 5. Encode the key as base64 and store as an **actions secret** with name **`DIFFCALC_GOOGLE_CREDENTIALS`**
+#
+# ## Environment variables
+#
+# The default environment may be configured via **actions variables**.
+#
+# Refer to [the sample environment](https://github.com/smoogipoo/diffcalc-sheet-generator/blob/master/.env.sample), and prefix each variable with `DIFFCALC_` (e.g. `DIFFCALC_THREADS`, `DIFFCALC_INNODB_BUFFER_SIZE`, etc...).
+
+name: Run difficulty calculation comparison
 
 run-name: "${{ github.event_name == 'workflow_dispatch' && format('Manual run: {0}', inputs.osu-b) || 'Automatic comment trigger' }}"
 
@@ -326,4 +364,4 @@ jobs:
           mode: upsert
           create_if_not_exists: false
           message: |
-            Difficulty calculation failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
\ No newline at end of file
+            Difficulty calculation failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

From 2e0ca457736cc15939342191ddc3873dda8a2788 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 5 Oct 2023 14:09:58 +0900
Subject: [PATCH 0841/2296] Remove duplicated usage instructions

---
 .github/workflows/diffcalc.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 168f411264..5fde6e2f1a 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -2,8 +2,6 @@
 #
 # Uses [diffcalc-sheet-generator](https://github.com/smoogipoo/diffcalc-sheet-generator) to run two builds of osu and generate an SR/PP/Score comparison spreadsheet.
 #
-# Can be dispatched both via GitHub -> Actions workflow, or via '!diffcalc' in an issue/PR comment.
-#
 # ## Requirements
 #
 # Self-hosted runner with installed:

From 5a0faaa0b118e4935c05a78e00ec4214c69a6b5f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 14:30:04 +0900
Subject: [PATCH 0842/2296] Fix `TestReplayExport` intermittent failure

The previous fix was not working as it was checking the path for the
prefix `_`, not the filename.

See https://github.com/ppy/osu/runs/17415814653#r0s2 which clearly shows
this.
---
 .../Visual/Gameplay/TestScenePlayerLocalScoreImport.cs         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index feda251744..6a7fab86d6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.IO;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -173,7 +174,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             string? filePath = null;
 
             // Files starting with _ are temporary, created by CreateFileSafely call.
-            AddUntilStep("wait for export file", () => filePath = LocalStorage.GetFiles("exports").SingleOrDefault(f => !f.StartsWith("_", StringComparison.Ordinal)), () => Is.Not.Null);
+            AddUntilStep("wait for export file", () => filePath = LocalStorage.GetFiles("exports").SingleOrDefault(f => !Path.GetFileName(f).StartsWith("_", StringComparison.Ordinal)), () => Is.Not.Null);
             AddAssert("filesize is non-zero", () =>
             {
                 using (var stream = LocalStorage.GetStream(filePath))

From 76cc2f9f22380d132500d6b5450ae1a76e868e49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 14:58:50 +0900
Subject: [PATCH 0843/2296] Fix `WaveformComparisonDisplay` potentially
 crashing on invalid track length

As seen at https://github.com/ppy/osu/runs/17415814918#r0s2.
---
 osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
index 3b3acea935..d598b2cfbf 100644
--- a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
+++ b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
@@ -191,6 +191,10 @@ namespace osu.Game.Screens.Edit.Timing
 
         private void regenerateDisplay(bool animated)
         {
+            // Before a track is loaded, it won't have a valid length, which will break things.
+            if (!beatmap.Value.Track.IsLoaded)
+                return;
+
             double index = (displayedTime - selectedGroupStartTime) / timingPoint.BeatLength;
 
             // Chosen as a pretty usable number across all BPMs.

From 61fd4186af8781af2791e6760d925760beba8f21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 22:55:23 +0900
Subject: [PATCH 0844/2296] Ensure `regenerateDisplay` is eventually performed
 if originally called before load

---
 osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
index d598b2cfbf..856bc7c303 100644
--- a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
+++ b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Screens.Edit.Timing
             controlPointGroups.BindTo(editorBeatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((_, _) => updateTimingGroup());
 
-            beatLength.BindValueChanged(_ => regenerateDisplay(true), true);
+            beatLength.BindValueChanged(_ => Scheduler.AddOnce(regenerateDisplay, true), true);
 
             displayLocked.BindValueChanged(locked =>
             {
@@ -186,14 +186,17 @@ namespace osu.Game.Screens.Edit.Timing
                 return;
 
             displayedTime = time;
-            regenerateDisplay(animated);
+            Scheduler.AddOnce(regenerateDisplay, animated);
         }
 
         private void regenerateDisplay(bool animated)
         {
             // Before a track is loaded, it won't have a valid length, which will break things.
             if (!beatmap.Value.Track.IsLoaded)
+            {
+                Scheduler.AddOnce(regenerateDisplay, animated);
                 return;
+            }
 
             double index = (displayedTime - selectedGroupStartTime) / timingPoint.BeatLength;
 

From d660395850c6934fc16bb0080cbc8812090750a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 23:02:45 +0900
Subject: [PATCH 0845/2296] Ensure there's no chance of a press being ignored
 during rewind flow

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 297ea93637..a8b48450e8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -17,6 +17,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Skinning.Default;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -269,6 +270,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 ProxyContent();
             else
                 UnproxyContent();
+
+            if ((Clock as IGameplayClock)?.IsRewinding == true)
+                lastPressHandleTime = null;
         }
 
         private bool? lastWasCentre;

From 0ae4a0f11f4b2d76b22351535ce3695b39c1fbfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 5 Oct 2023 20:37:10 +0200
Subject: [PATCH 0846/2296] Adjust gameplay element maximum size limits for
 backwards compatibility

The new limits were chosen by sampling across over 4000 skins. The
methodology for doing so is described in the following gist:

	https://gist.github.com/bdach/6228ba41d128b23d1f89142f404108a3
---
 .../Skinning/Legacy/LegacyBananaPiece.cs                    | 2 +-
 .../Skinning/Legacy/LegacyDropletPiece.cs                   | 2 +-
 osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs | 2 +-
 .../Skinning/Legacy/LegacyMainCirclePiece.cs                | 4 ++--
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs   | 4 ++--
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs             | 6 +++---
 .../Skinning/Legacy/LegacyCirclePiece.cs                    | 5 +++--
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
index c6f32e2014..ae530e94fc 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyBananaPiece.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public partial class LegacyBananaPiece : LegacyCatchHitObjectPiece
     {
-        private static readonly Vector2 banana_max_size = new Vector2(128);
+        private static readonly Vector2 banana_max_size = new Vector2(160);
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
index c6c0839fba..a121d20d3d 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyDropletPiece.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     public partial class LegacyDropletPiece : LegacyCatchHitObjectPiece
     {
-        private static readonly Vector2 droplet_max_size = new Vector2(82, 103);
+        private static readonly Vector2 droplet_max_size = new Vector2(160);
 
         public LegacyDropletPiece()
         {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
index 62097d79bd..3a8b5b427a 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyFruitPiece.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
     internal partial class LegacyFruitPiece : LegacyCatchHitObjectPiece
     {
-        private static readonly Vector2 fruit_max_size = new Vector2(128);
+        private static readonly Vector2 fruit_max_size = new Vector2(160);
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 8990204931..3ec914596a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: OsuHitObject.OBJECT_DIMENSIONS))
+                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2))
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 25de6d2381..9048a92e13 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
 
-            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS) ?? Empty()).With(d =>
+            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2) ?? Empty()).With(d =>
             {
                 d.Anchor = Anchor.Centre;
                 d.Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index c3beb5bc35..412fd30931 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS),
+                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2),
                     Colour = new Color4(5, 5, 5, 255),
                 },
                 LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS),
+                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2),
                     Blending = BlendingParameters.Additive,
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index ea6f6fe6ce..13b8fa912e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -42,14 +42,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return this.GetAnimation("sliderscorepoint", false, false);
 
                     case OsuSkinComponents.SliderFollowCircle:
-                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: new Vector2(308f));
+                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 3);
                         if (followCircleContent != null)
                             return new LegacyFollowCircle(followCircleContent);
 
                         return null;
 
                     case OsuSkinComponents.SliderBall:
-                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: OsuHitObject.OBJECT_DIMENSIONS);
+                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2);
 
                         // todo: slider ball has a custom frame delay based on velocity
                         // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         if (!this.HasFont(LegacyFont.HitCircle))
                             return null;
 
-                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS)
+                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS * 2)
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
                             Scale = new Vector2(0.8f),
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index c94016d2b1..4dce3f1d4a 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
     public partial class LegacyCirclePiece : CompositeDrawable, IHasAccentColour
     {
         private static readonly Vector2 circle_piece_size = new Vector2(128);
+        private static readonly Vector2 max_circle_sprite_size = new Vector2(160);
 
         private Drawable backgroundLayer = null!;
         private Drawable? foregroundLayer;
@@ -54,9 +55,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
                 string prefix = ((drawableHitObject.HitObject as TaikoStrongableHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
-                return skin.GetAnimation($"{prefix}{lookup}", true, false, maxSize: circle_piece_size) ??
+                return skin.GetAnimation($"{prefix}{lookup}", true, false, maxSize: max_circle_sprite_size) ??
                        // fallback to regular size if "big" version doesn't exist.
-                       skin.GetAnimation($"{normal_hit}{lookup}", true, false, maxSize: circle_piece_size);
+                       skin.GetAnimation($"{normal_hit}{lookup}", true, false, maxSize: max_circle_sprite_size);
             }
 
             // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer.

From 96bb8ed150e2828c82efcd8a8641019a64dbf857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 5 Oct 2023 22:33:49 +0200
Subject: [PATCH 0847/2296] Apply feedback regarding maximum osu! element
 sizings

- `default-N` number sprites maximum size increased by 1.25x to a total
  of 320x320 to counteract the 0.8x factor applied onto them when
  displayed on a hitcircle.

- `sliderb` and parts' maximum size increased to 384x384, to match
  `sliderfollowcircle`, as the two are apparently sometimes used
  interchangeably by skinners to achieve different visual effects.
---
 .../Skinning/Legacy/LegacySliderBall.cs       |  5 ++---
 .../Legacy/OsuLegacySkinTransformer.cs        | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 412fd30931..5535903c73 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK.Graphics;
@@ -47,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2),
+                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE),
                     Colour = new Color4(5, 5, 5, 255),
                 },
                 LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
@@ -59,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2),
+                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE),
                     Blending = BlendingParameters.Additive,
                 },
             };
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 13b8fa912e..88a4e17120 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -23,6 +23,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         /// </summary>
         public const float LEGACY_CIRCLE_RADIUS = OsuHitObject.OBJECT_RADIUS - 5;
 
+        /// <summary>
+        /// The maximum allowed size of sprites that reside in the follow circle area of a slider.
+        /// </summary>
+        /// <remarks>
+        /// The reason this is extracted out to a constant, rather than be inlined in the follow circle sprite retrieval,
+        /// is that some skins will use `sliderb` elements to emulate a slider follow circle with slightly different visual effects applied
+        /// (`sliderb` is always shown and doesn't pulsate; `sliderfollowcircle` isn't always shown and pulsates).
+        /// </remarks>
+        public static readonly Vector2 MAX_FOLLOW_CIRCLE_AREA_SIZE = OsuHitObject.OBJECT_DIMENSIONS * 3;
+
         public OsuLegacySkinTransformer(ISkin skin)
             : base(skin)
         {
@@ -42,14 +52,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return this.GetAnimation("sliderscorepoint", false, false);
 
                     case OsuSkinComponents.SliderFollowCircle:
-                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 3);
+                        var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: MAX_FOLLOW_CIRCLE_AREA_SIZE);
                         if (followCircleContent != null)
                             return new LegacyFollowCircle(followCircleContent);
 
                         return null;
 
                     case OsuSkinComponents.SliderBall:
-                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2);
+                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: MAX_FOLLOW_CIRCLE_AREA_SIZE);
 
                         // todo: slider ball has a custom frame delay based on velocity
                         // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
@@ -139,10 +149,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         if (!this.HasFont(LegacyFont.HitCircle))
                             return null;
 
-                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS * 2)
+                        const float hitcircle_text_scale = 0.8f;
+                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS * 2 / hitcircle_text_scale)
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
-                            Scale = new Vector2(0.8f),
+                            Scale = new Vector2(hitcircle_text_scale),
                         };
 
                     case OsuSkinComponents.SpinnerBody:

From 1005b7ac858c6d96780b33d199101f8044026e4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 14:32:53 +0900
Subject: [PATCH 0848/2296] Fix incorrect test assumption in
 `TestSceneEditorClock`

I don't know what this test was trying to do, but it was wrong. Any
offset which is applied should be invisible to the clock's final
`CurrentTime` (and to the user).
---
 osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs | 2 +-
 osu.Game/Screens/Edit/EditorClock.cs                  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index 82d2542190..ed58c59ff0 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("seek near end", () => EditorClock.Seek(EditorClock.TrackLength - 250));
             AddUntilStep("clock stops", () => !EditorClock.IsRunning);
 
-            AddUntilStep("clock stopped at end", () => EditorClock.CurrentTime - EditorClock.TotalAppliedOffset, () => Is.EqualTo(EditorClock.TrackLength));
+            AddUntilStep("clock stopped at end", () => EditorClock.CurrentTime, () => Is.EqualTo(EditorClock.TrackLength));
 
             AddStep("start clock again", () => EditorClock.Start());
             AddAssert("clock looped to start", () => EditorClock.IsRunning && EditorClock.CurrentTime < 500);
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index d4de1bae5f..d5ca6fc35e 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -158,8 +158,6 @@ namespace osu.Game.Screens.Edit
 
         public double CurrentTime => underlyingClock.CurrentTime;
 
-        public double TotalAppliedOffset => underlyingClock.TotalAppliedOffset;
-
         public void Reset()
         {
             ClearTransforms();

From f9021bf5512a3ee250ce732ff36d9564938afac9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Oct 2023 17:16:10 +0900
Subject: [PATCH 0849/2296] Remove pointless test class in
 `TestSceneStoryboardSamples`

---
 .../Gameplay/TestSceneStoryboardSamples.cs           | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 2cad7d33c2..4fb9db845b 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestSamplePlaybackWithBeatmapHitsoundsOff()
         {
             GameplayClockContainer gameplayContainer = null;
-            TestDrawableStoryboardSample sample = null;
+            DrawableStoryboardSample sample = null;
 
             AddStep("disable beatmap hitsounds", () => config.SetValue(OsuSetting.BeatmapHitsounds, false));
 
@@ -141,7 +141,7 @@ namespace osu.Game.Tests.Gameplay
                     Child = beatmapSkinSourceContainer
                 });
 
-                beatmapSkinSourceContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
+                beatmapSkinSourceContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
                 {
                     Clock = gameplayContainer
                 });
@@ -199,14 +199,6 @@ namespace osu.Game.Tests.Gameplay
             protected internal override ISkin GetSkin() => new TestSkin("test-sample", resources);
         }
 
-        private partial class TestDrawableStoryboardSample : DrawableStoryboardSample
-        {
-            public TestDrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
-                : base(sampleInfo)
-            {
-            }
-        }
-
         #region IResourceStorageProvider
 
         public IRenderer Renderer => host.Renderer;

From f2e56bbb651ca0b0e3f472fb8d6bbe759002f5e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 16:51:24 +0900
Subject: [PATCH 0850/2296] Fix publicly-settable bindables

---
 .../Edit/DrawableManiaEditorRuleset.cs               |  2 +-
 .../Edit/DrawableTaikoEditorRuleset.cs               |  2 +-
 osu.Game.Tests/Mods/SettingSourceAttributeTest.cs    | 12 ++++++------
 osu.Game.Tournament/Models/TournamentTeam.cs         |  2 +-
 osu.Game/Graphics/Containers/UserDimContainer.cs     |  2 +-
 .../HUD/JudgementCounter/JudgementCounterDisplay.cs  |  8 ++++----
 osu.Game/Screens/Play/HUD/PlayerAvatar.cs            |  2 +-
 osu.Game/Skinning/Components/BeatmapAttributeText.cs |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index 7b019a2bdf..8d34373f82 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public partial class DrawableManiaEditorRuleset : DrawableManiaRuleset, ISupportConstantAlgorithmToggle
     {
-        public BindableBool ShowSpeedChanges { get; set; } = new BindableBool();
+        public BindableBool ShowSpeedChanges { get; } = new BindableBool();
 
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
diff --git a/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs b/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
index 963ddec0b3..3c7a97c864 100644
--- a/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/DrawableTaikoEditorRuleset.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
 {
     public partial class DrawableTaikoEditorRuleset : DrawableTaikoRuleset, ISupportConstantAlgorithmToggle
     {
-        public BindableBool ShowSpeedChanges { get; set; } = new BindableBool();
+        public BindableBool ShowSpeedChanges { get; } = new BindableBool();
 
         public DrawableTaikoEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(ruleset, beatmap, mods)
diff --git a/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
index 5da303d3a7..83d5b66bd7 100644
--- a/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
+++ b/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
@@ -42,22 +42,22 @@ namespace osu.Game.Tests.Mods
         private class ClassWithSettings
         {
             [SettingSource("Unordered setting", "Should be last")]
-            public BindableFloat UnorderedSetting { get; set; } = new BindableFloat();
+            public BindableFloat UnorderedSetting { get; } = new BindableFloat();
 
             [SettingSource("Second setting", "Another description", 2)]
-            public BindableBool SecondSetting { get; set; } = new BindableBool();
+            public BindableBool SecondSetting { get; } = new BindableBool();
 
             [SettingSource("First setting", "A description", 1)]
-            public BindableDouble FirstSetting { get; set; } = new BindableDouble();
+            public BindableDouble FirstSetting { get; } = new BindableDouble();
 
             [SettingSource("Third setting", "Yet another description", 3)]
-            public BindableInt ThirdSetting { get; set; } = new BindableInt();
+            public BindableInt ThirdSetting { get; } = new BindableInt();
         }
 
         private class ClassWithCustomSettingControl
         {
             [SettingSource("Custom setting", "Should be a custom control", SettingControlType = typeof(CustomSettingsControl))]
-            public BindableInt UnorderedSetting { get; set; } = new BindableInt();
+            public BindableInt UnorderedSetting { get; } = new BindableInt();
         }
 
         private partial class CustomSettingsControl : SettingsItem<int>
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Mods
 
             private partial class CustomControl : Drawable, IHasCurrentValue<int>
             {
-                public Bindable<int> Current { get; set; } = new Bindable<int>();
+                public Bindable<int> Current { get; } = new Bindable<int>();
             }
         }
     }
diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index ae0ac77936..95858240a8 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tournament.Models
         };
 
         [JsonProperty]
-        public BindableList<TournamentUser> Players { get; set; } = new BindableList<TournamentUser>();
+        public BindableList<TournamentUser> Players { get; } = new BindableList<TournamentUser>();
 
         public TournamentTeam()
         {
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 625702ef6e..af5e7692b3 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// The amount of dim to be used when <see cref="IgnoreUserSettings"/> is <c>true</c>.
         /// </summary>
-        public Bindable<float> DimWhenUserSettingsIgnored { get; set; } = new Bindable<float>();
+        public Bindable<float> DimWhenUserSettingsIgnored { get; } = new Bindable<float>();
 
         protected Bindable<bool> LightenDuringBreaks { get; private set; } = null!;
 
diff --git a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
index 1dbee19ee3..128897ddde 100644
--- a/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
@@ -22,16 +22,16 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
         public bool UsesFixedAnchor { get; set; }
 
         [SettingSource(typeof(JudgementCounterDisplayStrings), nameof(JudgementCounterDisplayStrings.JudgementDisplayMode))]
-        public Bindable<DisplayMode> Mode { get; set; } = new Bindable<DisplayMode>();
+        public Bindable<DisplayMode> Mode { get; } = new Bindable<DisplayMode>();
 
         [SettingSource(typeof(JudgementCounterDisplayStrings), nameof(JudgementCounterDisplayStrings.FlowDirection))]
-        public Bindable<Direction> FlowDirection { get; set; } = new Bindable<Direction>();
+        public Bindable<Direction> FlowDirection { get; } = new Bindable<Direction>();
 
         [SettingSource(typeof(JudgementCounterDisplayStrings), nameof(JudgementCounterDisplayStrings.ShowJudgementNames))]
-        public BindableBool ShowJudgementNames { get; set; } = new BindableBool(true);
+        public BindableBool ShowJudgementNames { get; } = new BindableBool(true);
 
         [SettingSource(typeof(JudgementCounterDisplayStrings), nameof(JudgementCounterDisplayStrings.ShowMaxJudgement))]
-        public BindableBool ShowMaxJudgement { get; set; } = new BindableBool(true);
+        public BindableBool ShowMaxJudgement { get; } = new BindableBool(true);
 
         [Resolved]
         private JudgementCountController judgementCountController { get; set; } = null!;
diff --git a/osu.Game/Screens/Play/HUD/PlayerAvatar.cs b/osu.Game/Screens/Play/HUD/PlayerAvatar.cs
index 1d0331593a..1341a10d60 100644
--- a/osu.Game/Screens/Play/HUD/PlayerAvatar.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerAvatar.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.CornerRadius), nameof(SkinnableComponentStrings.CornerRadiusDescription),
             SettingControlType = typeof(SettingsPercentageSlider<float>))]
-        public new BindableFloat CornerRadius { get; set; } = new BindableFloat(0.25f)
+        public new BindableFloat CornerRadius { get; } = new BindableFloat(0.25f)
         {
             MinValue = 0,
             MaxValue = 0.5f,
diff --git a/osu.Game/Skinning/Components/BeatmapAttributeText.cs b/osu.Game/Skinning/Components/BeatmapAttributeText.cs
index 6523039a3f..52c439a624 100644
--- a/osu.Game/Skinning/Components/BeatmapAttributeText.cs
+++ b/osu.Game/Skinning/Components/BeatmapAttributeText.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Skinning.Components
         public Bindable<BeatmapAttribute> Attribute { get; } = new Bindable<BeatmapAttribute>(BeatmapAttribute.StarRating);
 
         [SettingSource(typeof(BeatmapAttributeTextStrings), nameof(BeatmapAttributeTextStrings.Template), nameof(BeatmapAttributeTextStrings.TemplateDescription))]
-        public Bindable<string> Template { get; set; } = new Bindable<string>("{Label}: {Value}");
+        public Bindable<string> Template { get; } = new Bindable<string>("{Label}: {Value}");
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;

From 1d7b8ea21a88f1eabe104ffd9c8d1c851813c5f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 16:51:40 +0900
Subject: [PATCH 0851/2296] Fix incorrect implementation of `IHasCurrentValue`
 in `FooterButtonFreeMods`

---
 osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
index 3825cf18b9..54cd36d05b 100644
--- a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
@@ -23,7 +23,18 @@ namespace osu.Game.Screens.OnlinePlay
 {
     public partial class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
     {
-        public Bindable<IReadOnlyList<Mod>> Current { get; set; } = new BindableWithCurrent<IReadOnlyList<Mod>>();
+        private readonly BindableWithCurrent<IReadOnlyList<Mod>> current = new BindableWithCurrent<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
+        public Bindable<IReadOnlyList<Mod>> Current
+        {
+            get => current.Current;
+            set
+            {
+                ArgumentNullException.ThrowIfNull(value);
+
+                current.Current = value;
+            }
+        }
 
         private OsuSpriteText count = null!;
 

From 936a21a661e2bd36e8072c26ec0a04507bcd7be5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 16:51:56 +0900
Subject: [PATCH 0852/2296] Fix redundant bindable initialisation in
 `SongSelect`

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 9c2b1cfe37..2e457f827d 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         internal IOverlayManager? OverlayManager { get; private set; }
 
-        private Bindable<bool> configBackgroundBlur { get; set; } = new BindableBool();
+        private Bindable<bool> configBackgroundBlur = null!;
 
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio, OsuColour colours, ManageCollectionsDialog? manageCollectionsDialog, DifficultyRecommender? recommender, OsuConfigManager config)

From 7227f5c881ad6cd4b39085dec0b0f4c2d0a029ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 18:13:02 +0900
Subject: [PATCH 0853/2296] Fix a couple of compilation errors

---
 osu.Game.Tests/Mods/SettingSourceAttributeTest.cs            | 2 +-
 .../Components/TestSceneTournamentMatchChatDisplay.cs        | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
index 83d5b66bd7..b1d8b7e7fa 100644
--- a/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
+++ b/osu.Game.Tests/Mods/SettingSourceAttributeTest.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Mods
 
             private partial class CustomControl : Drawable, IHasCurrentValue<int>
             {
-                public Bindable<int> Current { get; } = new Bindable<int>();
+                public Bindable<int> Current { get; set; } = new Bindable<int>();
             }
         }
     }
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index 044e5ebbbf..de91a66e56 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Online.API.Requests.Responses;
@@ -80,11 +79,11 @@ namespace osu.Game.Tournament.Tests.Components
             {
                 Team1 =
                 {
-                    Value = new TournamentTeam { Players = new BindableList<TournamentUser> { redUser } }
+                    Value = new TournamentTeam { Players = { redUser } }
                 },
                 Team2 =
                 {
-                    Value = new TournamentTeam { Players = new BindableList<TournamentUser> { blueUser, blueUserWithCustomColour } }
+                    Value = new TournamentTeam { Players = { blueUser, blueUserWithCustomColour } }
                 }
             });
 

From c78b5112c6630dc98607166c18e4655e47b32d59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 18:23:28 +0900
Subject: [PATCH 0854/2296] Fix OAuth refresh attempt when no network available
 causing full logout (part 2)

This time for `SocketException`s. I seem to recall looking at this and
deciding there was a reason to not catch socket exceptions, but on
revisiting it seems sane to do so.

This covers a fail case like reported:

```
2023-10-06 03:24:17 [verbose]: Request to https://lazer.ppy.sh/oauth/token failed with System.Net.Http.HttpRequestException: No such host is known. (lazer.ppy.sh:443)
2023-10-06 03:24:17 [verbose]: ---> System.Net.Sockets.SocketException (11001): No such host is known.
2023-10-06 03:24:17 [verbose]: at System.Net.Sockets.Socket.AwaitableSocketAsyncEventArgs.ThrowException(SocketError error, CancellationToken cancellationToken)
```

Closes https://github.com/ppy/osu/issues/24890 (again).
---
 osu.Game/Online/API/OAuth.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs
index 1f26ab5458..485274f349 100644
--- a/osu.Game/Online/API/OAuth.cs
+++ b/osu.Game/Online/API/OAuth.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Diagnostics;
 using System.Net.Http;
+using System.Net.Sockets;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 
@@ -99,6 +100,11 @@ namespace osu.Game.Online.API
                     return true;
                 }
             }
+            catch (SocketException)
+            {
+                // Network failure.
+                return false;
+            }
             catch (HttpRequestException)
             {
                 // Network failure.
@@ -106,7 +112,7 @@ namespace osu.Game.Online.API
             }
             catch
             {
-                // Force a full re-reauthentication.
+                // Force a full re-authentication.
                 Token.Value = null;
                 return false;
             }

From db5178e45306ce9df560b047a563b3e075a75ff6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 16:52:00 +0900
Subject: [PATCH 0855/2296] Change `ArgonHealthDisplay` to be relative sized
 for now

---
 .../Gameplay/TestSceneArgonHealthDisplay.cs   |  2 -
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 68 ++++++++++++++-----
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index 06a7763711..8261a1729e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -12,7 +12,6 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -41,7 +40,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Scale = new Vector2(2f),
                     },
                 };
             });
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 62a4b958c2..ad4b407692 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -5,14 +5,17 @@ using System;
 using System.Collections.Generic;
 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.Lines;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -27,6 +30,23 @@ namespace osu.Game.Screens.Play.HUD
     {
         public bool UsesFixedAnchor { get; set; }
 
+        [SettingSource("Bar height")]
+        public BindableFloat BarHeight { get; } = new BindableFloat
+        {
+            Default = 32,
+            MinValue = 0,
+            MaxValue = 64,
+            Precision = 1
+        };
+
+        [SettingSource("Bar length")]
+        public BindableFloat BarLength { get; } = new BindableFloat(1)
+        {
+            MinValue = 0.2f,
+            MaxValue = 1,
+            Precision = 0.01f,
+        };
+
         private BarPath mainBar = null!;
 
         /// <summary>
@@ -76,10 +96,13 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        private const float left_line_width = 50f;
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            AutoSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
 
             InternalChild = new FillFlowContainer
             {
@@ -91,7 +114,7 @@ namespace osu.Game.Screens.Play.HUD
                     new Circle
                     {
                         Margin = new MarginPadding { Top = 8.5f, Left = -2 },
-                        Size = new Vector2(50f, 3f),
+                        Size = new Vector2(left_line_width, 3f),
                     },
                     new Container
                     {
@@ -127,8 +150,6 @@ namespace osu.Game.Screens.Play.HUD
                     }
                 },
             };
-
-            updatePath();
         }
 
         protected override void LoadComplete()
@@ -144,6 +165,18 @@ namespace osu.Game.Screens.Play.HUD
                 if (resetMissBarDelegate == null)
                     this.TransformTo(nameof(GlowBarValue), v.NewValue, 300, Easing.OutQuint);
             }, true);
+
+            BarLength.BindValueChanged(l => Width = l.NewValue, true);
+            BarHeight.BindValueChanged(_ => updatePath());
+            updatePath();
+        }
+
+        protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
+        {
+            if ((invalidation & Invalidation.DrawSize) > 0)
+                updatePath();
+
+            return base.OnInvalidate(invalidation, source);
         }
 
         protected override void Update()
@@ -214,25 +247,24 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updatePath()
         {
-            const float curve_start = 280;
-            const float curve_end = 310;
+            float barLength = DrawWidth - left_line_width - 24;
+            float curveStart = barLength - 70;
+            float curveEnd = barLength - 40;
+
             const float curve_smoothness = 10;
 
-            const float bar_length = 350;
-            const float bar_verticality = 32.5f;
-
-            Vector2 diagonalDir = (new Vector2(curve_end, bar_verticality) - new Vector2(curve_start, 0)).Normalized();
+            Vector2 diagonalDir = (new Vector2(curveEnd, BarHeight.Value) - new Vector2(curveStart, 0)).Normalized();
 
             barPath = new SliderPath(new[]
             {
                 new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                new PathControlPoint(new Vector2(curve_start - curve_smoothness, 0), PathType.Bezier),
-                new PathControlPoint(new Vector2(curve_start, 0)),
-                new PathControlPoint(new Vector2(curve_start, 0) + diagonalDir * curve_smoothness, PathType.Linear),
-                new PathControlPoint(new Vector2(curve_end, bar_verticality) - diagonalDir * curve_smoothness, PathType.Bezier),
-                new PathControlPoint(new Vector2(curve_end, bar_verticality)),
-                new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_verticality), PathType.Linear),
-                new PathControlPoint(new Vector2(bar_length, bar_verticality)),
+                new PathControlPoint(new Vector2(curveStart - curve_smoothness, 0), PathType.Bezier),
+                new PathControlPoint(new Vector2(curveStart, 0)),
+                new PathControlPoint(new Vector2(curveStart, 0) + diagonalDir * curve_smoothness, PathType.Linear),
+                new PathControlPoint(new Vector2(curveEnd, BarHeight.Value) - diagonalDir * curve_smoothness, PathType.Bezier),
+                new PathControlPoint(new Vector2(curveEnd, BarHeight.Value)),
+                new PathControlPoint(new Vector2(curveEnd + curve_smoothness, BarHeight.Value), PathType.Linear),
+                new PathControlPoint(new Vector2(barLength, BarHeight.Value)),
             });
 
             List<Vector2> vertices = new List<Vector2>();
@@ -267,7 +299,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             protected override Color4 ColourAt(float position)
             {
-                if (position <= 0.128f)
+                if (position <= 0.16f)
                     return Color4.White.Opacity(0.8f);
 
                 return Interpolation.ValueAt(position,

From f40e910c51da3f4ad5779b854941ffb5b8e53a23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 18:56:31 +0900
Subject: [PATCH 0856/2296] Remove left line from health display

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 67 +++++++------------
 1 file changed, 26 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index ad4b407692..67f21a1c83 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
@@ -96,7 +95,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private const float left_line_width = 50f;
+        private const float main_path_radius = 10f;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -104,51 +103,37 @@ namespace osu.Game.Screens.Play.HUD
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = new FillFlowContainer
+            InternalChild = new Container
             {
                 AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(4f, 0f),
                 Children = new Drawable[]
                 {
-                    new Circle
+                    background = new BackgroundPath
                     {
-                        Margin = new MarginPadding { Top = 8.5f, Left = -2 },
-                        Size = new Vector2(left_line_width, 3f),
+                        PathRadius = main_path_radius,
                     },
-                    new Container
+                    glowBar = new BarPath
                     {
-                        AutoSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            background = new BackgroundPath
-                            {
-                                PathRadius = 10f,
-                            },
-                            glowBar = new BarPath
-                            {
-                                BarColour = Color4.White,
-                                GlowColour = OsuColour.Gray(0.5f),
-                                Blending = BlendingParameters.Additive,
-                                Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
-                                PathRadius = 40f,
-                                // Kinda hacky, but results in correct positioning with increased path radius.
-                                Margin = new MarginPadding(-30f),
-                                GlowPortion = 0.9f,
-                            },
-                            mainBar = new BarPath
-                            {
-                                AutoSizeAxes = Axes.None,
-                                RelativeSizeAxes = Axes.Both,
-                                Blending = BlendingParameters.Additive,
-                                BarColour = main_bar_colour,
-                                GlowColour = main_bar_glow_colour,
-                                PathRadius = 10f,
-                                GlowPortion = 0.6f,
-                            },
-                        }
-                    }
-                },
+                        BarColour = Color4.White,
+                        GlowColour = OsuColour.Gray(0.5f),
+                        Blending = BlendingParameters.Additive,
+                        Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
+                        PathRadius = 40f,
+                        // Kinda hacky, but results in correct positioning with increased path radius.
+                        Margin = new MarginPadding(-30f),
+                        GlowPortion = 0.9f,
+                    },
+                    mainBar = new BarPath
+                    {
+                        AutoSizeAxes = Axes.None,
+                        RelativeSizeAxes = Axes.Both,
+                        Blending = BlendingParameters.Additive,
+                        BarColour = main_bar_colour,
+                        GlowColour = main_bar_glow_colour,
+                        PathRadius = main_path_radius,
+                        GlowPortion = 0.6f,
+                    },
+                }
             };
         }
 
@@ -247,7 +232,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updatePath()
         {
-            float barLength = DrawWidth - left_line_width - 24;
+            float barLength = DrawWidth - main_path_radius * 2;
             float curveStart = barLength - 70;
             float curveEnd = barLength - 40;
 

From 71be3c8f8b783716d4bcb619d36e253b1ad79315 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 18:56:16 +0900
Subject: [PATCH 0857/2296] Add ability to adjust health bar settings in test
 scene

---
 .../Gameplay/TestSceneArgonHealthDisplay.cs     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index 8261a1729e..7bad623d7f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
@@ -21,6 +22,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
+        private ArgonHealthDisplay healthDisplay = null!;
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -36,13 +39,25 @@ namespace osu.Game.Tests.Visual.Gameplay
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4.Gray,
                     },
-                    new ArgonHealthDisplay
+                    healthDisplay = new ArgonHealthDisplay
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                     },
                 };
             });
+
+            AddSliderStep("Width", 0, 1f, 1f, val =>
+            {
+                if (healthDisplay.IsNotNull())
+                    healthDisplay.BarLength.Value = val;
+            });
+
+            AddSliderStep("Height", 0, 64, 0, val =>
+            {
+                if (healthDisplay.IsNotNull())
+                    healthDisplay.BarHeight.Value = val;
+            });
         }
 
         [Test]

From 3f2a00d90d2a967147e33e273dab24779fb03747 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 18:46:50 +0900
Subject: [PATCH 0858/2296] Add argon health display to default skin layout

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs |  5 ++---
 osu.Game/Skinning/ArgonSkin.cs                  | 10 +++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 67f21a1c83..755eaeaf33 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -30,16 +30,15 @@ namespace osu.Game.Screens.Play.HUD
         public bool UsesFixedAnchor { get; set; }
 
         [SettingSource("Bar height")]
-        public BindableFloat BarHeight { get; } = new BindableFloat
+        public BindableFloat BarHeight { get; } = new BindableFloat(20)
         {
-            Default = 32,
             MinValue = 0,
             MaxValue = 64,
             Precision = 1
         };
 
         [SettingSource("Bar length")]
-        public BindableFloat BarLength { get; } = new BindableFloat(1)
+        public BindableFloat BarLength { get; } = new BindableFloat(0.98f)
         {
             MinValue = 0.2f,
             MaxValue = 1,
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 6e17458082..d530efbfdd 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -109,6 +109,7 @@ namespace osu.Game.Skinning
                         case SkinComponentsContainerLookup.TargetArea.MainHUDComponents:
                             var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container =>
                             {
+                                var health = container.OfType<ArgonHealthDisplay>().FirstOrDefault();
                                 var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();
                                 var combo = container.OfType<DefaultComboCounter>().FirstOrDefault();
@@ -128,6 +129,13 @@ namespace osu.Game.Skinning
 
                                     score.Position = new Vector2(0, vertical_offset);
 
+                                    if (health != null)
+                                    {
+                                        health.Origin = Anchor.TopCentre;
+                                        health.Anchor = Anchor.TopCentre;
+                                        health.Y = 5;
+                                    }
+
                                     if (ppCounter != null)
                                     {
                                         ppCounter.Y = score.Position.Y + ppCounter.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).Y - 4;
@@ -191,7 +199,7 @@ namespace osu.Game.Skinning
                                     new DefaultComboCounter(),
                                     new DefaultScoreCounter(),
                                     new DefaultAccuracyCounter(),
-                                    new DefaultHealthDisplay(),
+                                    new ArgonHealthDisplay(),
                                     new ArgonSongProgress(),
                                     new ArgonKeyCounterDisplay(),
                                     new BarHitErrorMeter(),

From d87ab9c82dad1081c6a060ea8b6e401bbd29cdee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 19:34:38 +0900
Subject: [PATCH 0859/2296] Adjust transition time based on miss/hit

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 755eaeaf33..7af7fd9487 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -145,9 +145,11 @@ namespace osu.Game.Screens.Play.HUD
                 if (v.NewValue >= GlowBarValue)
                     finishMissDisplay();
 
-                this.TransformTo(nameof(HealthBarValue), v.NewValue, 300, Easing.OutQuint);
+                double time = v.NewValue > GlowBarValue ? 500 : 250;
+
+                this.TransformTo(nameof(HealthBarValue), v.NewValue, time, Easing.OutQuint);
                 if (resetMissBarDelegate == null)
-                    this.TransformTo(nameof(GlowBarValue), v.NewValue, 300, Easing.OutQuint);
+                    this.TransformTo(nameof(GlowBarValue), v.NewValue, time, Easing.OutQuint);
             }, true);
 
             BarLength.BindValueChanged(l => Width = l.NewValue, true);

From 8e5b2e78e58842721478fbf5dd7fdd7c7a1f66ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Oct 2023 21:01:23 +0900
Subject: [PATCH 0860/2296] Fix variable clash

---
 osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
index 54cd36d05b..dd6536cf26 100644
--- a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
@@ -117,17 +117,17 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void updateModDisplay()
         {
-            int current = Current.Value.Count;
+            int currentCount = Current.Value.Count;
 
-            if (current == allAvailableAndValidMods.Count())
+            if (currentCount == allAvailableAndValidMods.Count())
             {
                 count.Text = "all";
                 count.FadeColour(colours.Gray2, 200, Easing.OutQuint);
                 circle.FadeColour(colours.Yellow, 200, Easing.OutQuint);
             }
-            else if (current > 0)
+            else if (currentCount > 0)
             {
-                count.Text = $"{current} mods";
+                count.Text = $"{currentCount} mods";
                 count.FadeColour(colours.Gray2, 200, Easing.OutQuint);
                 circle.FadeColour(colours.YellowDark, 200, Easing.OutQuint);
             }

From 10ce5705ce67acb920f2f4f0d6b30e91178df5d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Oct 2023 14:11:41 +0200
Subject: [PATCH 0861/2296] Update framework

---
 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 bc95e96a7b..b3feccbbc0 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1004.2" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1006.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 622b59a725..1aa3a23cdc 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1004.2" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1006.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 16bccbbb53..bf772f20f4 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1004.2" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1006.0" />
   </ItemGroup>
 </Project>

From 58448d3dd95f64e7b1d0c43492516b64f34f6086 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Oct 2023 01:03:41 +0900
Subject: [PATCH 0862/2296] Fix health animation affecting failing tint

---
 osu.Game/Screens/Play/HUD/FailingLayer.cs  | 2 ++
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 67e7ae8f3f..3954e23cbe 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         public readonly Bindable<bool> ShowHealth = new Bindable<bool>();
 
+        protected override bool PlayInitialIncreaseAnimation => false;
+
         private const float max_alpha = 0.4f;
         private const int fade_time = 400;
         private const float gradient_size = 0.2f;
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index e4bb91e7ca..24af3051e3 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Play.HUD
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; } = null!;
 
+        protected virtual bool PlayInitialIncreaseAnimation => true;
+
         public Bindable<double> Current { get; } = new BindableDouble
         {
             MinValue = 0,
@@ -74,7 +76,10 @@ namespace osu.Game.Screens.Play.HUD
             // this probably shouldn't be operating on `this.`
             showHealthBar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
 
-            startInitialAnimation();
+            if (PlayInitialIncreaseAnimation)
+                startInitialAnimation();
+            else
+                Current.Value = 1;
         }
 
         private void startInitialAnimation()

From 5ea45e3e96b21996cb594805637f5f751ff3745b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Oct 2023 19:43:00 +0200
Subject: [PATCH 0863/2296] Rename local variable

---
 osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
index 65113add2d..07de4d1a01 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Tests.NonVisual
         [TestCase(1)]
         public void TestTrueGameplayRateWithGameplayAdjustment(double underlyingClockRate)
         {
-            var framedClock = new TrackVirtual(60000) { Frequency = { Value = underlyingClockRate } };
-            var gameplayClock = new TestGameplayClockContainer(framedClock);
+            var trackVirtual = new TrackVirtual(60000) { Frequency = { Value = underlyingClockRate } };
+            var gameplayClock = new TestGameplayClockContainer(trackVirtual);
 
             Assert.That(gameplayClock.GetTrueGameplayRate(), Is.EqualTo(2));
         }

From ce0d4bd0df26839eab2dec51f9312f5a614eb008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Oct 2023 21:30:41 +0200
Subject: [PATCH 0864/2296] Fix health display potentially desyncing from
 actual if health was changed during initial animation

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 24af3051e3..2ec63feeae 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -66,8 +66,8 @@ namespace osu.Game.Screens.Play.HUD
             health = HealthProcessor.Health.GetBoundCopy();
             health.BindValueChanged(h =>
             {
-                Current.Value = h.NewValue;
                 finishInitialAnimation();
+                Current.Value = h.NewValue;
             });
 
             if (hudOverlay != null)
@@ -103,6 +103,11 @@ namespace osu.Game.Screens.Play.HUD
         {
             initialIncrease?.Cancel();
             initialIncrease = null;
+
+            // aside from the repeating `initialIncrease` scheduled task,
+            // there may also be a `Current` transform in progress from that schedule.
+            // ensure it plays out fully, to prevent changes to `Current.Value` being discarded by the ongoing transform.
+            FinishTransforms();
         }
 
         private void onNewJudgement(JudgementResult judgement)

From b7d0bf37567fe198a9e15936f2ca46ccefe1a390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Oct 2023 21:39:29 +0200
Subject: [PATCH 0865/2296] Only flush the `Current` transform specifically

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 2ec63feeae..986efe3036 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -107,7 +107,9 @@ namespace osu.Game.Screens.Play.HUD
             // aside from the repeating `initialIncrease` scheduled task,
             // there may also be a `Current` transform in progress from that schedule.
             // ensure it plays out fully, to prevent changes to `Current.Value` being discarded by the ongoing transform.
-            FinishTransforms();
+            // and yes, this funky `targetMember` spec is seemingly the only way to do this
+            // (see: https://github.com/ppy/osu-framework/blob/fe2769171c6e26d1b6fdd6eb7ea8353162fe9065/osu.Framework/Graphics/Transforms/TransformBindable.cs#L21)
+            FinishTransforms(targetMember: $"{Current.GetHashCode()}.{nameof(Current.Value)}");
         }
 
         private void onNewJudgement(JudgementResult judgement)

From e5207167c810ea924fe27781ec1f31acb96a7a69 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Oct 2023 00:39:30 +0900
Subject: [PATCH 0866/2296] Rename `FailAnimation` to `FailAnimationContainer`

---
 ...{FailAnimation.cs => FailAnimationContainer.cs} |  6 +++---
 osu.Game/Screens/Play/Player.cs                    | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename osu.Game/Screens/Play/{FailAnimation.cs => FailAnimationContainer.cs} (97%)

diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimationContainer.cs
similarity index 97%
rename from osu.Game/Screens/Play/FailAnimation.cs
rename to osu.Game/Screens/Play/FailAnimationContainer.cs
index 57bdad079e..821c67e3cb 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimationContainer.cs
@@ -27,10 +27,10 @@ using osuTK.Graphics;
 namespace osu.Game.Screens.Play
 {
     /// <summary>
-    /// Manage the animation to be applied when a player fails.
+    /// Manage the animation to be applied when a player fails. Applies the animation to children.
     /// Single use and automatically disposed after use.
     /// </summary>
-    public partial class FailAnimation : Container
+    public partial class FailAnimationContainer : Container
     {
         public Action? OnComplete;
 
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public BackgroundScreen? Background { private get; set; }
 
-        public FailAnimation(DrawableRuleset drawableRuleset)
+        public FailAnimationContainer(DrawableRuleset drawableRuleset)
         {
             this.drawableRuleset = drawableRuleset;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 60806a73c5..ac9ce11cb5 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -257,7 +257,7 @@ namespace osu.Game.Screens.Play
 
             rulesetSkinProvider.AddRange(new Drawable[]
             {
-                failAnimationLayer = new FailAnimation(DrawableRuleset)
+                failAnimationContainer = new FailAnimationContainer(DrawableRuleset)
                 {
                     OnComplete = onFailComplete,
                     Children = new[]
@@ -310,7 +310,7 @@ namespace osu.Game.Screens.Play
             // add the overlay components as a separate step as they proxy some elements from the above underlay/gameplay components.
             // also give the overlays the ruleset skin provider to allow rulesets to potentially override HUD elements (used to disable combo counters etc.)
             // we may want to limit this in the future to disallow rulesets from outright replacing elements the user expects to be there.
-            failAnimationLayer.Add(createOverlayComponents(Beatmap.Value));
+            failAnimationContainer.Add(createOverlayComponents(Beatmap.Value));
 
             if (!DrawableRuleset.AllowGameplayOverlays)
             {
@@ -587,7 +587,7 @@ namespace osu.Game.Screens.Play
                 // if the fail animation is currently in progress, accelerate it (it will show the pause dialog on completion).
                 if (ValidForResume && GameplayState.HasFailed)
                 {
-                    failAnimationLayer.FinishTransforms(true);
+                    failAnimationContainer.FinishTransforms(true);
                     return;
                 }
 
@@ -888,7 +888,7 @@ namespace osu.Game.Screens.Play
 
         protected FailOverlay FailOverlay { get; private set; }
 
-        private FailAnimation failAnimationLayer;
+        private FailAnimationContainer failAnimationContainer;
 
         private bool onFail()
         {
@@ -913,7 +913,7 @@ namespace osu.Game.Screens.Play
             if (PauseOverlay.State.Value == Visibility.Visible)
                 PauseOverlay.Hide();
 
-            failAnimationLayer.Start();
+            failAnimationContainer.Start();
 
             if (GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
                 Restart(true);
@@ -1044,7 +1044,7 @@ namespace osu.Game.Screens.Play
 
                 b.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
 
-                failAnimationLayer.Background = b;
+                failAnimationContainer.Background = b;
             });
 
             HUDOverlay.IsPlaying.BindTo(localUserPlaying);
@@ -1099,7 +1099,7 @@ namespace osu.Game.Screens.Play
             screenSuspension?.RemoveAndDisposeImmediately();
 
             // Eagerly clean these up as disposal of child components is asynchronous and may leave sounds playing beyond user expectations.
-            failAnimationLayer?.Stop();
+            failAnimationContainer?.Stop();
             PauseOverlay?.StopAllSamples();
 
             if (LoadedBeatmapSuccessfully)

From b2d9c95441fb6679572d036344559fd8657f1946 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 08:17:27 +0900
Subject: [PATCH 0867/2296] Remove HoldNoteTickJudgement

---
 .../Judgements/HoldNoteTickJudgement.cs              | 12 ------------
 .../Skinning/Legacy/LegacyHitExplosion.cs            |  3 ---
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs    |  3 ---
 3 files changed, 18 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs

diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
deleted file mode 100644
index ae9e8bd287..0000000000
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.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.
-
-using osu.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Mania.Judgements
-{
-    public class HoldNoteTickJudgement : ManiaJudgement
-    {
-        public override HitResult MaxResult => HitResult.LargeTickHit;
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
index 6c56db613c..43489cf325 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
@@ -69,9 +69,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
         public void Animate(JudgementResult result)
         {
-            if (result.Judgement is HoldNoteTickJudgement)
-                return;
-
             (explosion as IFramedAnimation)?.GotoFrame(0);
 
             explosion?.FadeInFromZero(FADE_IN_DURATION)
diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index e0663e9878..223afafeb6 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -150,9 +150,6 @@ namespace osu.Game.Rulesets.Mania.UI
             // scale roughly in-line with visual appearance of notes
             Vector2 scale = new Vector2(1, 0.6f);
 
-            if (result.Judgement is HoldNoteTickJudgement)
-                scale *= 0.5f;
-
             this.ScaleTo(scale);
 
             largeFaint

From 9415fe4446cd586348534bc8ac7f37dde3d6fda7 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 09:47:00 +0900
Subject: [PATCH 0868/2296] Add mania hold note body + combo break judgement

---
 .../Skinning/TestSceneHitExplosion.cs         |   2 +-
 .../Judgements/HoldNoteHoldJudgement.cs       |  13 +++
 .../Objects/Drawables/DrawableHoldNote.cs     |  29 ++---
 .../Objects/Drawables/DrawableHoldNoteBody.cs |  30 +++++
 .../Objects/Drawables/DrawableHoldNoteTail.cs |   4 +-
 osu.Game.Rulesets.Mania/Objects/HeadNote.cs   |   3 +
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   |  12 ++
 .../Objects/HoldNoteBody.cs                   |  15 +++
 osu.Game.Rulesets.Mania/Objects/TailNote.cs   |   3 +
 .../Skinning/Legacy/LegacyBodyPiece.cs        |   3 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          |   1 +
 osu.Game/Rulesets/Judgements/Judgement.cs     |  39 ++++++-
 osu.Game/Rulesets/Scoring/HitResult.cs        | 109 ++++++++++++++++++
 13 files changed, 246 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs
 create mode 100644 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
 create mode 100644 osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
index 483c468c1e..a0833ff91f 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHitExplosion.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                 {
                     c.Add(hitExplosionPools[poolIndex].Get(e =>
                     {
-                        e.Apply(new JudgementResult(new HitObject(), runCount % 6 == 0 ? new HoldNoteTickJudgement() : new ManiaJudgement()));
+                        e.Apply(new JudgementResult(new HitObject(), new ManiaJudgement()));
 
                         e.Anchor = Anchor.Centre;
                         e.Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs
new file mode 100644
index 0000000000..0dbdd4afe6
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs
@@ -0,0 +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 osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Judgements
+{
+    public class HoldNoteHoldJudgement : ManiaJudgement
+    {
+        public override HitResult MaxResult => HitResult.IgnoreHit;
+        public override HitResult MinResult => HitResult.ComboBreak;
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 3032a3ee39..499f8c99b0 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -35,9 +35,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public DrawableHoldNoteHead Head => headContainer.Child;
         public DrawableHoldNoteTail Tail => tailContainer.Child;
+        public DrawableHoldNoteBody Body => bodyContainer.Child;
 
         private Container<DrawableHoldNoteHead> headContainer;
         private Container<DrawableHoldNoteTail> tailContainer;
+        private Container<DrawableHoldNoteBody> bodyContainer;
 
         private PausableSkinnableSound slidingSample;
 
@@ -58,11 +60,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// </summary>
         public double? HoldStartTime { get; private set; }
 
-        /// <summary>
-        /// Time at which the hold note has been broken, i.e. released too early, resulting in a reduced score.
-        /// </summary>
-        public double? HoldBrokenTime { get; private set; }
-
         /// <summary>
         /// Whether the hold note has been released potentially without having caused a break.
         /// </summary>
@@ -102,6 +99,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                         headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both }
                     }
                 },
+                bodyContainer = new Container<DrawableHoldNoteBody> { RelativeSizeAxes = Axes.Both },
                 bodyPiece = new SkinnableDrawable(new ManiaSkinComponentLookup(ManiaSkinComponents.HoldNoteBody), _ => new DefaultBodyPiece
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -133,7 +131,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             sizingContainer.Size = Vector2.One;
             HoldStartTime = null;
-            HoldBrokenTime = null;
             releaseTime = null;
         }
 
@@ -150,6 +147,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 case DrawableHoldNoteTail tail:
                     tailContainer.Child = tail;
                     break;
+
+                case DrawableHoldNoteBody body:
+                    bodyContainer.Child = body;
+                    break;
             }
         }
 
@@ -158,6 +159,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             base.ClearNestedHitObjects();
             headContainer.Clear(false);
             tailContainer.Clear(false);
+            bodyContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
@@ -169,6 +171,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
                 case HeadNote head:
                     return new DrawableHoldNoteHead(head);
+
+                case HoldNoteBody body:
+                    return new DrawableHoldNoteBody(body);
             }
 
             return base.CreateNestedHitObject(hitObject);
@@ -261,8 +266,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                     MissForcefully();
             }
 
-            if (Tail.Judged && !Tail.IsHit)
-                HoldBrokenTime = Time.Current;
+            // Make sure that the hold note is fully judged by giving the body a judgement.
+            if (Tail.AllJudged && !Body.AllJudged)
+                Body.TriggerResult(Tail.IsHit);
         }
 
         public override void MissForcefully()
@@ -325,12 +331,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 return;
 
             Tail.UpdateResult();
+            Body.TriggerResult(Tail.IsHit);
+
             endHold();
-
-            // If the key has been released too early, the user should not receive full score for the release
-            if (!Tail.IsHit)
-                HoldBrokenTime = Time.Current;
-
             releaseTime = Time.Current;
         }
 
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
new file mode 100644
index 0000000000..ded88af145
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
@@ -0,0 +1,30 @@
+// 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.Objects.Drawables
+{
+    public partial class DrawableHoldNoteBody : DrawableManiaHitObject<HoldNoteBody>
+    {
+        public bool HasHoldBreak => AllJudged && !IsHit;
+
+        public override bool DisplayResult => false;
+
+        public DrawableHoldNoteBody()
+            : this(null)
+        {
+        }
+
+        public DrawableHoldNoteBody(HoldNoteBody hitObject)
+            : base(hitObject)
+        {
+        }
+
+        internal void TriggerResult(bool hit)
+        {
+            if (!AllJudged)
+                ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index e7326df07d..a559e91f1b 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -55,7 +55,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             ApplyResult(r =>
             {
                 // If the head wasn't hit or the hold note was broken, cap the max score to Meh.
-                if (result > HitResult.Meh && (!HoldNote.Head.IsHit || HoldNote.HoldBrokenTime != null))
+                bool hasComboBreak = !HoldNote.Head.IsHit || HoldNote.Body.HasHoldBreak;
+
+                if (result > HitResult.Meh && hasComboBreak)
                     result = HitResult.Meh;
 
                 r.Type = result;
diff --git a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
index e69cc62aed..a2e89ea560 100644
--- a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
@@ -3,6 +3,9 @@
 
 namespace osu.Game.Rulesets.Mania.Objects
 {
+    /// <summary>
+    /// The head note of a <see cref="HoldNote"/>.
+    /// </summary>
     public class HeadNote : Note
     {
     }
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 333912dd0c..3f930a310b 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -79,6 +79,12 @@ namespace osu.Game.Rulesets.Mania.Objects
         /// </summary>
         public TailNote Tail { get; private set; }
 
+        /// <summary>
+        /// The body of the hold.
+        /// This is an invisible and silent object that tracks the holding state of the <see cref="HoldNote"/>.
+        /// </summary>
+        public HoldNoteBody Body { get; private set; }
+
         public override double MaximumJudgementOffset => Tail.MaximumJudgementOffset;
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
@@ -98,6 +104,12 @@ namespace osu.Game.Rulesets.Mania.Objects
                 Column = Column,
                 Samples = GetNodeSamples((NodeSamples?.Count - 1) ?? 1),
             });
+
+            AddNested(Body = new HoldNoteBody
+            {
+                StartTime = StartTime,
+                Column = Column
+            });
         }
 
         public override Judgement CreateJudgement() => new IgnoreJudgement();
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
new file mode 100644
index 0000000000..ea0643fbb8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.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.
+
+namespace osu.Game.Rulesets.Mania.Objects
+{
+    /// <summary>
+    /// The body of a <see cref="HoldNote"/>.
+    /// Mostly a dummy hitobject that provides the judgement for the "holding" state.<br />
+    /// On hit - the hold note was held correctly for the full duration.<br />
+    /// On miss - the hold note was released at some point during its judgement period.
+    /// </summary>
+    public class HoldNoteBody : ManiaHitObject
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/TailNote.cs b/osu.Game.Rulesets.Mania/Objects/TailNote.cs
index 71a594c6ce..def32880f1 100644
--- a/osu.Game.Rulesets.Mania/Objects/TailNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/TailNote.cs
@@ -6,6 +6,9 @@ using osu.Game.Rulesets.Mania.Judgements;
 
 namespace osu.Game.Rulesets.Mania.Objects
 {
+    /// <summary>
+    /// The tail note of a <see cref="HoldNote"/>.
+    /// </summary>
     public class TailNote : Note
     {
         /// <summary>
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index ef4810c40d..bd177d5c7a 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -209,7 +209,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         protected override void Update()
         {
             base.Update();
-            missFadeTime.Value ??= holdNote.HoldBrokenTime;
+
+            missFadeTime.Value = holdNote.Body.HasHoldBreak ? holdNote.Body.Result.TimeAbsolute : null;
 
             int scaleDirection = (direction.Value == ScrollingDirection.Down ? 1 : -1);
 
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 1c4f0462ec..6cd55bb099 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -112,6 +112,7 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);
+            RegisterPool<HoldNoteBody, DrawableHoldNoteBody>(10, 50);
         }
 
         private void onSourceChanged()
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 99dce82ec2..3de1b03583 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -35,7 +35,40 @@ namespace osu.Game.Rulesets.Judgements
         /// <summary>
         /// The minimum <see cref="HitResult"/> that can be achieved - the inverse of <see cref="MaxResult"/>.
         /// </summary>
-        public HitResult MinResult
+        /// <remarks>
+        /// Defaults to a sane value for the given <see cref="MaxResult"/>. May be overridden to provide a supported custom value:
+        /// <list type="table">
+        ///   <listheader>
+        ///     <term>Valid <see cref="MaxResult"/>s</term>
+        ///     <description>Valid <see cref="MinResult"/>s</description>
+        ///   </listheader>
+        /// <item>
+        ///   <term><see cref="HitResult.Perfect"/>, <see cref="HitResult.Great"/>, <see cref="HitResult.Good"/>, <see cref="HitResult.Ok"/>, <see cref="HitResult.Meh"/></term>
+        ///   <description><see cref="HitResult.Miss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        /// </item>
+        /// <item>
+        ///   <term><see cref="HitResult.LargeBonus"/></term>
+        ///   <description><see cref="HitResult.IgnoreMiss"/></description>
+        /// </item>
+        /// <item>
+        ///   <term><see cref="HitResult.SmallBonus"/></term>
+        ///   <description><see cref="HitResult.IgnoreMiss"/></description>
+        /// </item>
+        /// <item>
+        ///   <term><see cref="HitResult.SmallTickHit"/></term>
+        ///   <description><see cref="HitResult.SmallTickMiss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        /// </item>
+        /// <item>
+        ///   <term><see cref="HitResult.LargeTickHit"/></term>
+        ///   <description><see cref="HitResult.LargeTickMiss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        /// </item>
+        /// <item>
+        ///   <term><see cref="HitResult.IgnoreHit"/></term>
+        ///   <description><see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        public virtual HitResult MinResult
         {
             get
             {
@@ -58,6 +91,10 @@ namespace osu.Game.Rulesets.Judgements
             }
         }
 
+        public Judgement()
+        {
+        }
+
         /// <summary>
         /// The numeric score representation for the maximum achievable result.
         /// </summary>
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 0013a9f20d..6303062f03 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -120,6 +120,16 @@ namespace osu.Game.Rulesets.Scoring
         [Order(12)]
         IgnoreHit,
 
+        /// <summary>
+        /// Indicates that a combo break should occur, but does not otherwise affect score.
+        /// </summary>
+        /// <remarks>
+        /// May be paired with <see cref="IgnoreHit"/>.
+        /// </remarks>
+        [EnumMember(Value = "combo_break")]
+        [Order(15)]
+        ComboBreak,
+
         /// <summary>
         /// A special result used as a padding value for legacy rulesets. It is a hit type and affects combo, but does not affect the base score (does not affect accuracy).
         /// </summary>
@@ -291,6 +301,105 @@ namespace osu.Game.Rulesets.Scoring
         /// <param name="result">The <see cref="HitResult"/> to get the index of.</param>
         /// <returns>The index of <paramref name="result"/>.</returns>
         public static int GetIndexForOrderedDisplay(this HitResult result) => order.IndexOf(result);
+
+        public static void ValidateHitResultPair(HitResult maxResult, HitResult minResult)
+        {
+            // Check valid maximum judgements.
+            switch (maxResult)
+            {
+                case HitResult.Meh:
+                case HitResult.Ok:
+                case HitResult.Good:
+                case HitResult.Great:
+                case HitResult.Perfect:
+                case HitResult.SmallTickHit:
+                case HitResult.LargeTickHit:
+                case HitResult.SmallBonus:
+                case HitResult.LargeBonus:
+                case HitResult.IgnoreHit:
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(maxResult), $"{maxResult} is not a valid maximum judgement result.");
+            }
+
+            // Check valid minimum judgements.
+            switch (minResult)
+            {
+                case HitResult.Miss:
+                case HitResult.SmallTickMiss:
+                case HitResult.LargeTickMiss:
+                case HitResult.IgnoreMiss:
+                case HitResult.ComboBreak:
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum judgement result.");
+            }
+
+            // Check valid category pairings.
+            switch (maxResult)
+            {
+                case HitResult.SmallBonus:
+                case HitResult.LargeBonus:
+                    switch (minResult)
+                    {
+                        case HitResult.IgnoreMiss:
+                            break;
+
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.IgnoreMiss} is the only valid minimum result for a {maxResult} judgement.");
+                    }
+
+                    break;
+
+                case HitResult.SmallTickHit:
+                    switch (minResult)
+                    {
+                        case HitResult.SmallTickMiss:
+                        case HitResult.IgnoreMiss:
+                        case HitResult.ComboBreak:
+                            break;
+
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+                    }
+
+                    break;
+
+                case HitResult.LargeTickHit:
+                    switch (minResult)
+                    {
+                        case HitResult.LargeTickMiss:
+                        case HitResult.IgnoreMiss:
+                        case HitResult.ComboBreak:
+                            break;
+
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+                    }
+
+                    break;
+
+                case HitResult.Meh:
+                case HitResult.Ok:
+                case HitResult.Good:
+                case HitResult.Great:
+                case HitResult.Perfect:
+                    switch (minResult)
+                    {
+                        case HitResult.Miss:
+                        case HitResult.IgnoreMiss:
+                        case HitResult.ComboBreak:
+                            break;
+
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+                    }
+
+                    break;
+            }
+        }
     }
 #pragma warning restore CS0618
 }

From 65ac617be4403ffb7775c8ec08c1e00eec3d9633 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 10:45:29 +0900
Subject: [PATCH 0869/2296] Actually validate judgements

---
 osu.Game/Rulesets/Judgements/Judgement.cs       | 4 ----
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 3de1b03583..b9e88dce7a 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -91,10 +91,6 @@ namespace osu.Game.Rulesets.Judgements
             }
         }
 
-        public Judgement()
-        {
-        }
-
         /// <summary>
         /// The numeric score representation for the maximum achievable result.
         /// </summary>
diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index e9f3bcb949..bf6c2bfe28 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -151,6 +151,8 @@ namespace osu.Game.Rulesets.Scoring
             {
                 var judgement = obj.CreateJudgement();
 
+                HitResultExtensions.ValidateHitResultPair(judgement.MaxResult, judgement.MinResult);
+
                 var result = CreateResult(obj, judgement);
                 if (result == null)
                     throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");

From d988ef9b227184e06f6021cce38ac62a3a72f109 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 10:50:39 +0900
Subject: [PATCH 0870/2296] Revert functional change

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index bd177d5c7a..660f72e565 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -210,7 +210,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         {
             base.Update();
 
-            missFadeTime.Value = holdNote.Body.HasHoldBreak ? holdNote.Body.Result.TimeAbsolute : null;
+            if (holdNote.Body.HasHoldBreak)
+                missFadeTime.Value = holdNote.Body.Result.TimeAbsolute;
 
             int scaleDirection = (direction.Value == ScrollingDirection.Down ? 1 : -1);
 

From f0da7f016d74f7002c76e8d8c1b4b208e133a447 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 11:49:54 +0900
Subject: [PATCH 0871/2296] Actually use the judgement

---
 .../{HoldNoteHoldJudgement.cs => HoldNoteBodyJudgement.cs}    | 2 +-
 osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs               | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 rename osu.Game.Rulesets.Mania/Judgements/{HoldNoteHoldJudgement.cs => HoldNoteBodyJudgement.cs} (87%)

diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteBodyJudgement.cs
similarity index 87%
rename from osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs
rename to osu.Game.Rulesets.Mania/Judgements/HoldNoteBodyJudgement.cs
index 0dbdd4afe6..6719665cbe 100644
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteHoldJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteBodyJudgement.cs
@@ -5,7 +5,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Judgements
 {
-    public class HoldNoteHoldJudgement : ManiaJudgement
+    public class HoldNoteBodyJudgement : ManiaJudgement
     {
         public override HitResult MaxResult => HitResult.IgnoreHit;
         public override HitResult MinResult => HitResult.ComboBreak;
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
index ea0643fbb8..92baa25fa9 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
@@ -1,6 +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 osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Judgements;
+
 namespace osu.Game.Rulesets.Mania.Objects
 {
     /// <summary>
@@ -11,5 +14,6 @@ namespace osu.Game.Rulesets.Mania.Objects
     /// </summary>
     public class HoldNoteBody : ManiaHitObject
     {
+        public override Judgement CreateJudgement() => new HoldNoteBodyJudgement();
     }
 }

From 326702165f75cfea9b9eb9f110fb9cdfb2eeba3a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 11:50:17 +0900
Subject: [PATCH 0872/2296] Update HitResult helpers with new judgement

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 51 ++++++++++++++++++++------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 6303062f03..cc528e406f 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -175,6 +175,7 @@ namespace osu.Game.Rulesets.Scoring
                 case HitResult.LargeTickHit:
                 case HitResult.LargeTickMiss:
                 case HitResult.LegacyComboIncrease:
+                case HitResult.ComboBreak:
                     return true;
 
                 default:
@@ -187,11 +188,19 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public static bool AffectsAccuracy(this HitResult result)
         {
-            // LegacyComboIncrease is a special type which is neither a basic, tick, bonus, or accuracy-affecting result.
-            if (result == HitResult.LegacyComboIncrease)
-                return false;
+            switch (result)
+            {
+                // LegacyComboIncrease is a special non-gameplay type which is neither a basic, tick, bonus, or accuracy-affecting result.
+                case HitResult.LegacyComboIncrease:
+                    return false;
 
-            return IsScorable(result) && !IsBonus(result);
+                // ComboBreak is a special type that only affects combo. It cannot be considered as basic, tick, bonus, or accuracy-affecting.
+                case HitResult.ComboBreak:
+                    return false;
+
+                default:
+                    return IsScorable(result) && !IsBonus(result);
+            }
         }
 
         /// <summary>
@@ -199,11 +208,19 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public static bool IsBasic(this HitResult result)
         {
-            // LegacyComboIncrease is a special type which is neither a basic, tick, bonus, or accuracy-affecting result.
-            if (result == HitResult.LegacyComboIncrease)
-                return false;
+            switch (result)
+            {
+                // LegacyComboIncrease is a special non-gameplay type which is neither a basic, tick, bonus, or accuracy-affecting result.
+                case HitResult.LegacyComboIncrease:
+                    return false;
 
-            return IsScorable(result) && !IsTick(result) && !IsBonus(result);
+                // ComboBreak is a special type that only affects combo. It cannot be considered as basic, tick, bonus, or accuracy-affecting.
+                case HitResult.ComboBreak:
+                    return false;
+
+                default:
+                    return IsScorable(result) && !IsTick(result) && !IsBonus(result);
+            }
         }
 
         /// <summary>
@@ -252,6 +269,7 @@ namespace osu.Game.Rulesets.Scoring
                 case HitResult.Miss:
                 case HitResult.SmallTickMiss:
                 case HitResult.LargeTickMiss:
+                case HitResult.ComboBreak:
                     return false;
 
                 default:
@@ -264,11 +282,20 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public static bool IsScorable(this HitResult result)
         {
-            // LegacyComboIncrease is not actually scorable (in terms of usable by rulesets for that purpose), but needs to be defined as such to be correctly included in statistics output.
-            if (result == HitResult.LegacyComboIncrease)
-                return true;
+            switch (result)
+            {
+                // LegacyComboIncrease is not actually scorable (in terms of usable by rulesets for that purpose), but needs to be defined as such to be correctly included in statistics output.
+                case HitResult.LegacyComboIncrease:
+                    return true;
 
-            return result >= HitResult.Miss && result < HitResult.IgnoreMiss;
+                // ComboBreak is its own type that affects score via combo.
+                case HitResult.ComboBreak:
+                    return true;
+
+                default:
+                    // Note that IgnoreHit and IgnoreMiss are excluded as they do not affect score.
+                    return result >= HitResult.Miss && result < HitResult.IgnoreMiss;
+            }
         }
 
         /// <summary>

From b65c70018f08fefbad1db55eae62cfad413b18d5 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 11:58:24 +0900
Subject: [PATCH 0873/2296] Add test for the result

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 52 +++++++++++++++++--
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 17a4c80f7f..ff87b2a833 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
             for (int i = 0; i < 4; i++)
             {
-                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], new TestJudgement(maxResult))
+                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], beatmap.HitObjects[i].CreateJudgement())
                 {
                     Type = i == 2 ? minResult : hitResult
                 };
@@ -259,6 +259,41 @@ namespace osu.Game.Tests.Rulesets.Scoring
         }
 #pragma warning restore CS0618
 
+        [Test]
+        public void TestComboBreak()
+        {
+            Assert.That(HitResult.ComboBreak.IncreasesCombo(), Is.False);
+            Assert.That(HitResult.ComboBreak.BreaksCombo(), Is.True);
+            Assert.That(HitResult.ComboBreak.AffectsCombo(), Is.True);
+            Assert.That(HitResult.ComboBreak.AffectsAccuracy(), Is.False);
+            Assert.That(HitResult.ComboBreak.IsBasic(), Is.False);
+            Assert.That(HitResult.ComboBreak.IsTick(), Is.False);
+            Assert.That(HitResult.ComboBreak.IsBonus(), Is.False);
+            Assert.That(HitResult.ComboBreak.IsHit(), Is.False);
+            Assert.That(HitResult.ComboBreak.IsScorable(), Is.True);
+            Assert.That(HitResultExtensions.ALL_TYPES, Does.Contain(HitResult.ComboBreak));
+
+            beatmap = new TestBeatmap(new RulesetInfo())
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new TestHitObject(HitResult.Great, HitResult.ComboBreak),
+                    new TestHitObject(HitResult.Great, HitResult.ComboBreak),
+                }
+            };
+
+            scoreProcessor = new TestScoreProcessor();
+            scoreProcessor.ApplyBeatmap(beatmap);
+
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], beatmap.HitObjects[0].CreateJudgement()) { Type = HitResult.Great });
+            Assert.That(scoreProcessor.Combo.Value, Is.EqualTo(1));
+            Assert.That(scoreProcessor.Accuracy.Value, Is.EqualTo(1));
+
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[1], beatmap.HitObjects[1].CreateJudgement()) { Type = HitResult.ComboBreak });
+            Assert.That(scoreProcessor.Combo.Value, Is.EqualTo(0));
+            Assert.That(scoreProcessor.Accuracy.Value, Is.EqualTo(1));
+        }
+
         [Test]
         public void TestAccuracyWhenNearPerfect()
         {
@@ -275,7 +310,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
             for (int i = 0; i < beatmap.HitObjects.Count; i++)
             {
-                scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[i], new TestJudgement(HitResult.Great))
+                scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[i], beatmap.HitObjects[i].CreateJudgement())
                 {
                     Type = i == 0 ? HitResult.Miss : HitResult.Great
                 });
@@ -293,24 +328,31 @@ namespace osu.Game.Tests.Rulesets.Scoring
         {
             public override HitResult MaxResult { get; }
 
-            public TestJudgement(HitResult maxResult)
+            public override HitResult MinResult => minResult ?? base.MinResult;
+
+            private readonly HitResult? minResult;
+
+            public TestJudgement(HitResult maxResult, HitResult? minResult = null)
             {
                 MaxResult = maxResult;
+                this.minResult = minResult;
             }
         }
 
         private class TestHitObject : HitObject
         {
             private readonly HitResult maxResult;
+            private readonly HitResult? minResult;
 
             public override Judgement CreateJudgement()
             {
-                return new TestJudgement(maxResult);
+                return new TestJudgement(maxResult, minResult);
             }
 
-            public TestHitObject(HitResult maxResult)
+            public TestHitObject(HitResult maxResult, HitResult? minResult = null)
             {
                 this.maxResult = maxResult;
+                this.minResult = minResult;
             }
         }
 

From 142c61ab9b3ff76feb81baaa06a12e94635d9621 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Oct 2023 12:21:10 +0900
Subject: [PATCH 0874/2296] Move playlist item download button to left

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

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 3fab0fc180..9e07279be2 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -456,6 +456,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         private IEnumerable<Drawable> createButtons() => new[]
         {
+            beatmap == null ? Empty() : new PlaylistDownloadButton(beatmap),
             showResultsButton = new GrayButton(FontAwesome.Solid.ChartPie)
             {
                 Size = new Vector2(30, 30),
@@ -463,7 +464,6 @@ namespace osu.Game.Screens.OnlinePlay
                 Alpha = AllowShowingResults ? 1 : 0,
                 TooltipText = "View results"
             },
-            beatmap == null ? Empty() : new PlaylistDownloadButton(beatmap),
             editButton = new PlaylistEditButton
             {
                 Size = new Vector2(30, 30),

From e874ec81c938a922135275e159e08ab9769a2631 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 9 Oct 2023 12:22:08 +0900
Subject: [PATCH 0875/2296] Remove unused usings

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs | 1 -
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs             | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
index 43489cf325..1ec218644c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index 223afafeb6..e588951624 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;

From ad6f04cfb0030c32797621c896a3eb4a4e65e62a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Oct 2023 04:02:02 +0900
Subject: [PATCH 0876/2296] Hotfix approach circle cutoff

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
index 403a14214e..eea6606233 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyApproachCircle.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private DrawableHitObject drawableObject { get; set; } = null!;
 
         public LegacyApproachCircle()
-            : base("Gameplay/osu/approachcircle", OsuHitObject.OBJECT_DIMENSIONS)
+            : base("Gameplay/osu/approachcircle", OsuHitObject.OBJECT_DIMENSIONS * 2)
         {
         }
 

From 55064c387d4558e342e0287368bfb26178167062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Sep 2023 08:11:53 +0200
Subject: [PATCH 0877/2296] Add mod controls to scoring test scene

---
 .../Tests/Visual/Gameplay/ScoringTestScene.cs | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index de4688a6fe..879a5e8a2b 100644
--- a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
@@ -18,6 +18,9 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -53,6 +56,10 @@ namespace osu.Game.Tests.Visual.Gameplay
         private readonly BindableBool scoreV1Visible = new BindableBool(true);
         private readonly BindableBool scoreV2Visible = new BindableBool(true);
 
+        private RoundedButton changeModsButton = null!;
+        private OsuSpriteText modsText = null!;
+        private TestModSelectOverlay modSelect = null!;
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -83,6 +90,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                             new Dimension(),
                             new Dimension(GridSizeMode.AutoSize),
                             new Dimension(GridSizeMode.AutoSize),
+                            new Dimension(GridSizeMode.AutoSize),
                         },
                         Content = new[]
                         {
@@ -104,6 +112,47 @@ namespace osu.Game.Tests.Visual.Gameplay
                                 },
                             },
                             new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Padding = new MarginPadding { Horizontal = 20 },
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Text = "Selected mods",
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.CentreLeft,
+                                        },
+                                        new FillFlowContainer
+                                        {
+                                            Anchor = Anchor.TopRight,
+                                            Origin = Anchor.TopRight,
+                                            AutoSizeAxes = Axes.Both,
+                                            Direction = FillDirection.Horizontal,
+                                            Spacing = new Vector2(10),
+                                            Children = new Drawable[]
+                                            {
+                                                changeModsButton = new RoundedButton
+                                                {
+                                                    Text = "Change",
+                                                    Width = 100,
+                                                    Anchor = Anchor.CentreRight,
+                                                    Origin = Anchor.CentreRight,
+                                                },
+                                                modsText = new OsuSpriteText
+                                                {
+                                                    Anchor = Anchor.CentreRight,
+                                                    Origin = Anchor.CentreRight,
+                                                },
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            new Drawable[]
                             {
                                 new FillFlowContainer
                                 {
@@ -139,6 +188,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                                 },
                             },
                         }
+                    },
+                    modSelect = new TestModSelectOverlay
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        SelectedMods = { BindTarget = SelectedMods }
                     }
                 };
 
@@ -159,6 +213,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 graphs.MaxCombo.BindTo(sliderMaxCombo.Current);
 
+                changeModsButton.Action = () => modSelect.Show();
+                SelectedMods.BindValueChanged(mods => Rerun());
+
                 Rerun();
             });
         }
@@ -168,6 +225,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             graphs.Clear();
             legend.Clear();
 
+            modsText.Text = SelectedMods.Value.Any()
+                ? string.Join(", ", SelectedMods.Value.Select(mod => mod.Acronym))
+                : "(none)";
+
             runForProcessor("lazer-standardised", colours.Green1, ScoringMode.Standardised, standardisedVisible);
             runForProcessor("lazer-classic", colours.Blue1, ScoringMode.Classic, classicVisible);
 
@@ -592,5 +653,16 @@ namespace osu.Game.Tests.Visual.Gameplay
                 lineGraph.Alpha = Visible.Value ? 1 : 0;
             }
         }
+
+        private partial class TestModSelectOverlay : UserModSelectOverlay
+        {
+            protected override bool ShowModEffects => true;
+            protected override bool ShowPresets => false;
+
+            public TestModSelectOverlay()
+                : base(OverlayColourScheme.Aquamarine)
+            {
+            }
+        }
     }
 }

From 419cc8784a5f3cc10849a5c202250529933693ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Sep 2023 08:20:09 +0200
Subject: [PATCH 0878/2296] Apply mods to processor-based score algorithms

---
 osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs  |  9 ++++++---
 osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs  | 10 +++++++---
 osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs    | 10 +++++++---
 osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs  |  9 ++++++---
 osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs |  8 +++++---
 5 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
index dfdde0a325..886fbe7222 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -10,6 +11,7 @@ using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Scoring;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Tests.Visual.Gameplay;
 
@@ -41,7 +43,8 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
 
-        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new CatchProcessorBasedScoringAlgorithm(beatmap, mode);
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
+            => new CatchProcessorBasedScoringAlgorithm(beatmap, mode, selectedMods);
 
         [Test]
         public void TestBasicScenarios()
@@ -140,8 +143,8 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private class CatchProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
         {
-            public CatchProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
-                : base(beatmap, mode)
+            public CatchProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
+                : base(beatmap, mode, selectedMods)
             {
             }
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs
index ae3ea861ea..f37d130b87 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
@@ -9,6 +10,7 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Tests.Visual.Gameplay;
 
@@ -27,7 +29,9 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1(MaxCombo.Value);
         protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
-        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new ManiaProcessorBasedScoringAlgorithm(beatmap, mode);
+
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
+            => new ManiaProcessorBasedScoringAlgorithm(beatmap, mode, selectedMods);
 
         [Test]
         public void TestBasicScenarios()
@@ -158,8 +162,8 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private class ManiaProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
         {
-            public ManiaProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
-                : base(beatmap, mode)
+            public ManiaProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
+                : base(beatmap, mode, selectedMods)
             {
             }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
index bb09328ab7..671817d30f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.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.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
@@ -34,7 +36,9 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
         protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
-        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new OsuProcessorBasedScoringAlgorithm(beatmap, mode);
+
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> mods)
+            => new OsuProcessorBasedScoringAlgorithm(beatmap, mode, mods);
 
         [Test]
         public void TestBasicScenarios()
@@ -162,8 +166,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class OsuProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
         {
-            public OsuProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
-                : base(beatmap, mode)
+            public OsuProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
+                : base(beatmap, mode, selectedMods)
             {
             }
 
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs
index e065070822..90c866acdb 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.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.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Rulesets.Taiko.Judgements;
@@ -35,7 +37,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
         protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
         protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
 
-        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode) => new TaikoProcessorBasedScoringAlgorithm(beatmap, mode);
+        protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
+            => new TaikoProcessorBasedScoringAlgorithm(beatmap, mode, selectedMods);
 
         [Test]
         public void TestBasicScenarios()
@@ -171,8 +174,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private class TaikoProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
         {
-            public TaikoProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
-                : base(beatmap, mode)
+            public TaikoProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
+                : base(beatmap, mode, selectedMods)
             {
             }
 
diff --git a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index 879a5e8a2b..8a2a81ce96 100644
--- a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
@@ -23,6 +23,7 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring.Legacy;
 using osuTK;
@@ -37,7 +38,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected abstract IScoringAlgorithm CreateScoreV1();
         protected abstract IScoringAlgorithm CreateScoreV2(int maxCombo);
-        protected abstract ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode);
+        protected abstract ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> mods);
 
         protected Bindable<int> MaxCombo => sliderMaxCombo.Current;
         protected BindableList<double> NonPerfectLocations => graphs.NonPerfectLocations;
@@ -270,7 +271,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             int maxCombo = sliderMaxCombo.Current.Value;
             var beatmap = CreateBeatmap(maxCombo);
-            var algorithm = CreateScoreAlgorithm(beatmap, scoringMode);
+            var algorithm = CreateScoreAlgorithm(beatmap, scoringMode, SelectedMods.Value);
 
             runForAlgorithm(new ScoringAlgorithmInfo
             {
@@ -343,11 +344,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             private readonly ScoreProcessor scoreProcessor;
             private readonly ScoringMode mode;
 
-            protected ProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode)
+            protected ProcessorBasedScoringAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
             {
                 this.mode = mode;
                 scoreProcessor = CreateScoreProcessor();
                 scoreProcessor.ApplyBeatmap(beatmap);
+                scoreProcessor.Mods.Value = selectedMods;
             }
 
             public void ApplyHit() => scoreProcessor.ApplyResult(CreatePerfectJudgementResult());

From d7e891140de52b8c8c0eb623040fd60df729cf17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Sep 2023 08:44:32 +0200
Subject: [PATCH 0879/2296] Apply mod multipliers to local score V1/V2
 reimplementations

---
 .../TestSceneScoring.cs                       | 37 +++++++++++++---
 .../TestSceneScoring.cs                       | 31 ++++++++++----
 .../TestSceneScoring.cs                       | 42 +++++++++++++++----
 .../TestSceneScoring.cs                       | 40 +++++++++++++++---
 .../Tests/Visual/Gameplay/ScoringTestScene.cs |  8 ++--
 5 files changed, 128 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
index 886fbe7222..9f667358db 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneScoring.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -13,6 +14,7 @@ using osu.Game.Rulesets.Catch.Scoring;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Tests.Visual.Gameplay;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -39,9 +41,11 @@ namespace osu.Game.Rulesets.Catch.Tests
             return beatmap;
         }
 
-        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
+        protected override IScoringAlgorithm CreateScoreV1(IReadOnlyList<Mod> selectedMods)
+            => new ScoreV1(selectedMods) { ScoreMultiplier = { BindTarget = scoreMultiplier } };
 
-        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo, IReadOnlyList<Mod> selectedMods)
+            => new ScoreV2(maxCombo, selectedMods);
 
         protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
             => new CatchProcessorBasedScoringAlgorithm(beatmap, mode, selectedMods);
@@ -72,10 +76,21 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private class ScoreV1 : IScoringAlgorithm
         {
-            private int currentCombo;
+            private readonly double modMultiplier;
 
             public BindableDouble ScoreMultiplier { get; } = new BindableDouble();
 
+            private int currentCombo;
+
+            public ScoreV1(IReadOnlyList<Mod> selectedMods)
+            {
+                var ruleset = new CatchRuleset();
+                modMultiplier = ruleset.CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(selectedMods, new LegacyBeatmapConversionDifficultyInfo
+                {
+                    SourceRuleset = ruleset.RulesetInfo
+                });
+            }
+
             public void ApplyHit() => applyHitV1(base_great);
 
             public void ApplyNonPerfect() => throw new NotSupportedException("catch does not have \"non-perfect\" judgements.");
@@ -94,7 +109,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
                 // combo multiplier
                 // ReSharper disable once PossibleLossOfFraction
-                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * ScoreMultiplier.Value));
+                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * (ScoreMultiplier.Value * modMultiplier)));
 
                 currentCombo++;
             }
@@ -107,13 +122,23 @@ namespace osu.Game.Rulesets.Catch.Tests
             private int currentCombo;
             private double comboPortion;
 
+            private readonly double modMultiplier;
+
             private readonly double comboPortionMax;
 
             private const double combo_base = 4;
             private const int combo_cap = 200;
 
-            public ScoreV2(int maxCombo)
+            public ScoreV2(int maxCombo, IReadOnlyList<Mod> selectedMods)
             {
+                var ruleset = new CatchRuleset();
+                modMultiplier = ruleset.CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(
+                    selectedMods.Append(new ModScoreV2()).ToList(),
+                    new LegacyBeatmapConversionDifficultyInfo
+                    {
+                        SourceRuleset = ruleset.RulesetInfo
+                    });
+
                 for (int i = 0; i < maxCombo; i++)
                     ApplyHit();
 
@@ -138,7 +163,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             }
 
             public long TotalScore
-                => (int)Math.Round(1000000 * comboPortion / comboPortionMax); // vast simplification, as we're not doing ticks here.
+                => (int)Math.Round((1000000 * comboPortion / comboPortionMax) * modMultiplier); // vast simplification, as we're not doing ticks here.
         }
 
         private class CatchProcessorBasedScoringAlgorithm : ProcessorBasedScoringAlgorithm
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs
index f37d130b87..19d90e0551 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneScoring.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
@@ -12,6 +13,7 @@ using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Tests.Visual.Gameplay;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -27,8 +29,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             return beatmap;
         }
 
-        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1(MaxCombo.Value);
-        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+        protected override IScoringAlgorithm CreateScoreV1(IReadOnlyList<Mod> selectedMods) => new ScoreV1(MaxCombo.Value, selectedMods);
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo, IReadOnlyList<Mod> selectedMods) => new ScoreV2(maxCombo, selectedMods);
 
         protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
             => new ManiaProcessorBasedScoringAlgorithm(beatmap, mode, selectedMods);
@@ -63,11 +65,17 @@ namespace osu.Game.Rulesets.Mania.Tests
             private int currentCombo;
             private double comboAddition = 100;
             private double totalScoreDouble;
+
             private readonly double scoreMultiplier;
 
-            public ScoreV1(int maxCombo)
+            public ScoreV1(int maxCombo, IReadOnlyList<Mod> selectedMods)
             {
-                scoreMultiplier = 500000d / maxCombo;
+                var ruleset = new ManiaRuleset();
+
+                scoreMultiplier = 500000d / maxCombo * ruleset.CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(selectedMods, new LegacyBeatmapConversionDifficultyInfo
+                {
+                    SourceRuleset = ruleset.RulesetInfo
+                });
             }
 
             public void ApplyHit() => applyHitV1(320, add => add + 2, 32);
@@ -107,13 +115,22 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             private readonly double comboPortionMax;
             private readonly int maxCombo;
+            private readonly double modMultiplier;
 
             private const double combo_base = 4;
 
-            public ScoreV2(int maxCombo)
+            public ScoreV2(int maxCombo, IReadOnlyList<Mod> selectedMods)
             {
                 this.maxCombo = maxCombo;
 
+                var ruleset = new ManiaRuleset();
+                modMultiplier = new ManiaRuleset().CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(
+                    selectedMods.Append(new ModScoreV2()).ToArray(),
+                    new LegacyBeatmapConversionDifficultyInfo
+                    {
+                        SourceRuleset = ruleset.RulesetInfo
+                    });
+
                 for (int i = 0; i < this.maxCombo; i++)
                     ApplyHit();
 
@@ -152,10 +169,10 @@ namespace osu.Game.Rulesets.Mania.Tests
                     float accuracy = (float)(currentBaseScore / maxBaseScore);
 
                     return (int)Math.Round
-                    (
+                    ((
                         200000 * comboPortion / comboPortionMax +
                         800000 * Math.Pow(accuracy, 2 + 2 * accuracy) * ((double)currentHits / maxCombo)
-                    );
+                    ) * modMultiplier);
                 }
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
index 671817d30f..627c8f416e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneScoring.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -13,6 +14,7 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Tests.Visual.Gameplay;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -34,8 +36,14 @@ namespace osu.Game.Rulesets.Osu.Tests
             return beatmap;
         }
 
-        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
-        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+        protected override IScoringAlgorithm CreateScoreV1(IReadOnlyList<Mod> selectedMods)
+            => new ScoreV1(selectedMods)
+            {
+                ScoreMultiplier = { BindTarget = scoreMultiplier }
+            };
+
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo, IReadOnlyList<Mod> selectedMods)
+            => new ScoreV2(maxCombo, selectedMods);
 
         protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> mods)
             => new OsuProcessorBasedScoringAlgorithm(beatmap, mode, mods);
@@ -75,9 +83,19 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class ScoreV1 : IScoringAlgorithm
         {
+            private readonly double modMultiplier;
+            public BindableDouble ScoreMultiplier { get; } = new BindableDouble();
+
             private int currentCombo;
 
-            public BindableDouble ScoreMultiplier { get; } = new BindableDouble();
+            public ScoreV1(IReadOnlyList<Mod> selectedMods)
+            {
+                var ruleset = new OsuRuleset();
+                modMultiplier = ruleset.CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(selectedMods, new LegacyBeatmapConversionDifficultyInfo
+                {
+                    SourceRuleset = ruleset.RulesetInfo
+                });
+            }
 
             public void ApplyHit() => applyHitV1(base_great);
             public void ApplyNonPerfect() => applyHitV1(base_ok);
@@ -95,7 +113,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 // combo multiplier
                 // ReSharper disable once PossibleLossOfFraction
-                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * ScoreMultiplier.Value));
+                TotalScore += (int)(Math.Max(0, currentCombo - 1) * (baseScore / 25 * (ScoreMultiplier.Value * modMultiplier)));
 
                 currentCombo++;
             }
@@ -111,13 +129,23 @@ namespace osu.Game.Rulesets.Osu.Tests
             private double maxBaseScore;
             private int currentHits;
 
+            private readonly double modMultiplier;
+
             private readonly double comboPortionMax;
             private readonly int maxCombo;
 
-            public ScoreV2(int maxCombo)
+            public ScoreV2(int maxCombo, IReadOnlyList<Mod> selectedMods)
             {
                 this.maxCombo = maxCombo;
 
+                var ruleset = new OsuRuleset();
+                modMultiplier = ruleset.CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(
+                    selectedMods.Append(new ModScoreV2()).ToList(),
+                    new LegacyBeatmapConversionDifficultyInfo
+                    {
+                        SourceRuleset = ruleset.RulesetInfo
+                    });
+
                 for (int i = 0; i < this.maxCombo; i++)
                     ApplyHit();
 
@@ -156,10 +184,10 @@ namespace osu.Game.Rulesets.Osu.Tests
                     double accuracy = currentBaseScore / maxBaseScore;
 
                     return (int)Math.Round
-                    (
+                    ((
                         700000 * comboPortion / comboPortionMax +
                         300000 * Math.Pow(accuracy, 10) * ((double)currentHits / maxCombo)
-                    );
+                    ) * modMultiplier);
                 }
             }
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs
index 90c866acdb..cf8e3767da 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneScoring.cs
@@ -3,12 +3,14 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -34,8 +36,14 @@ namespace osu.Game.Rulesets.Taiko.Tests
             return beatmap;
         }
 
-        protected override IScoringAlgorithm CreateScoreV1() => new ScoreV1 { ScoreMultiplier = { BindTarget = scoreMultiplier } };
-        protected override IScoringAlgorithm CreateScoreV2(int maxCombo) => new ScoreV2(maxCombo);
+        protected override IScoringAlgorithm CreateScoreV1(IReadOnlyList<Mod> selectedMods)
+            => new ScoreV1(selectedMods)
+            {
+                ScoreMultiplier = { BindTarget = scoreMultiplier }
+            };
+
+        protected override IScoringAlgorithm CreateScoreV2(int maxCombo, IReadOnlyList<Mod> selectedMods)
+            => new ScoreV2(maxCombo, selectedMods);
 
         protected override ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> selectedMods)
             => new TaikoProcessorBasedScoringAlgorithm(beatmap, mode, selectedMods);
@@ -75,8 +83,19 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private class ScoreV1 : IScoringAlgorithm
         {
+            private readonly double modMultiplier;
+
             private int currentCombo;
 
+            public ScoreV1(IReadOnlyList<Mod> selectedMods)
+            {
+                var ruleset = new TaikoRuleset();
+                modMultiplier = ruleset.CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(selectedMods, new LegacyBeatmapConversionDifficultyInfo
+                {
+                    SourceRuleset = ruleset.RulesetInfo
+                });
+            }
+
             public BindableDouble ScoreMultiplier { get; } = new BindableDouble();
 
             public void ApplyHit() => applyHitV1(base_great);
@@ -97,7 +116,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
                 // combo multiplier
                 // ReSharper disable once PossibleLossOfFraction
-                TotalScore += (int)((baseScore / 35) * 2 * (ScoreMultiplier.Value + 1)) * (Math.Min(100, currentCombo) / 10);
+                TotalScore += (int)((baseScore / 35) * 2 * (ScoreMultiplier.Value + 1) * modMultiplier) * (Math.Min(100, currentCombo) / 10);
 
                 currentCombo++;
             }
@@ -113,15 +132,24 @@ namespace osu.Game.Rulesets.Taiko.Tests
             private double maxBaseScore;
             private int currentHits;
 
+            private readonly double modMultiplier;
             private readonly double comboPortionMax;
             private readonly int maxCombo;
 
             private const double combo_base = 4;
 
-            public ScoreV2(int maxCombo)
+            public ScoreV2(int maxCombo, IReadOnlyList<Mod> selectedMods)
             {
                 this.maxCombo = maxCombo;
 
+                var ruleset = new TaikoRuleset();
+                modMultiplier = ruleset.CreateLegacyScoreSimulator().GetLegacyScoreMultiplier(
+                    selectedMods.Append(new ModScoreV2()).ToArray(),
+                    new LegacyBeatmapConversionDifficultyInfo
+                    {
+                        SourceRuleset = ruleset.RulesetInfo
+                    });
+
                 for (int i = 0; i < this.maxCombo; i++)
                     ApplyHit();
 
@@ -164,10 +192,10 @@ namespace osu.Game.Rulesets.Taiko.Tests
                     double accuracy = currentBaseScore / maxBaseScore;
 
                     return (int)Math.Round
-                    (
+                    ((
                         250000 * comboPortion / comboPortionMax +
                         750000 * Math.Pow(accuracy, 3.6) * ((double)currentHits / maxCombo)
-                    );
+                    ) * modMultiplier);
                 }
             }
         }
diff --git a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
index 8a2a81ce96..e7053e4202 100644
--- a/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
+++ b/osu.Game/Tests/Visual/Gameplay/ScoringTestScene.cs
@@ -36,8 +36,8 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         protected abstract IBeatmap CreateBeatmap(int maxCombo);
 
-        protected abstract IScoringAlgorithm CreateScoreV1();
-        protected abstract IScoringAlgorithm CreateScoreV2(int maxCombo);
+        protected abstract IScoringAlgorithm CreateScoreV1(IReadOnlyList<Mod> selectedMods);
+        protected abstract IScoringAlgorithm CreateScoreV2(int maxCombo, IReadOnlyList<Mod> selectedMods);
         protected abstract ProcessorBasedScoringAlgorithm CreateScoreAlgorithm(IBeatmap beatmap, ScoringMode mode, IReadOnlyList<Mod> mods);
 
         protected Bindable<int> MaxCombo => sliderMaxCombo.Current;
@@ -237,14 +237,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 Name = "ScoreV1 (classic)",
                 Colour = colours.Purple1,
-                Algorithm = CreateScoreV1(),
+                Algorithm = CreateScoreV1(SelectedMods.Value),
                 Visible = scoreV1Visible
             });
             runForAlgorithm(new ScoringAlgorithmInfo
             {
                 Name = "ScoreV2",
                 Colour = colours.Red1,
-                Algorithm = CreateScoreV2(sliderMaxCombo.Current.Value),
+                Algorithm = CreateScoreV2(sliderMaxCombo.Current.Value, SelectedMods.Value),
                 Visible = scoreV2Visible
             });
 

From 0fb7895a52c8b3fd9cd374e34c603afa4b7396ec Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Sep 2023 23:39:12 +0300
Subject: [PATCH 0880/2296] Adjust catcher origin position to match 1:1 with
 stable

Change catcher origin position logic to 1:1 match stable on legacy skin
---
 .../Skinning/Argon/ArgonCatcher.cs            |  6 ++++-
 .../Skinning/Default/DefaultCatcher.cs        | 11 ++++++++
 .../Skinning/Legacy/LegacyCatcher.cs          | 27 +++++++++++++++++++
 .../UI/SkinnableCatcher.cs                    |  5 ++--
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/Argon/ArgonCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Argon/ArgonCatcher.cs
index 82374085c8..5a788a26fb 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Argon/ArgonCatcher.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Argon/ArgonCatcher.cs
@@ -15,7 +15,11 @@ namespace osu.Game.Rulesets.Catch.Skinning.Argon
         [BackgroundDependencyLoader]
         private void load()
         {
-            RelativeSizeAxes = Axes.Both;
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.Centre;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
 
             InternalChildren = new Drawable[]
             {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs
index 72208b763b..bcd4c73f04 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Catch.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Default
 {
@@ -22,6 +23,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
 
         public DefaultCatcher()
         {
+            Anchor = Anchor.TopCentre;
             RelativeSizeAxes = Axes.Both;
             InternalChild = sprite = new Sprite
             {
@@ -32,6 +34,15 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
             };
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // matches stable's origin position since we're using the same catcher sprite.
+            // see LegacyCatcher for more information.
+            OriginPosition = new Vector2(DrawWidth / 2, 16f);
+        }
+
         [BackgroundDependencyLoader]
         private void load(TextureStore store, Bindable<CatcherAnimationState> currentState)
         {
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
new file mode 100644
index 0000000000..cba2c671b0
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
@@ -0,0 +1,27 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Skinning.Legacy
+{
+    public abstract partial class LegacyCatcher : CompositeDrawable
+    {
+        protected LegacyCatcher()
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // stable sets the Y origin position of the catcher to 16px in order for the catching range and OD scaling to align with the top of the catcher's plate in the default skin.
+            OriginPosition = new Vector2(DrawWidth / 2, 16f);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/UI/SkinnableCatcher.cs b/osu.Game.Rulesets.Catch/UI/SkinnableCatcher.cs
index bcc59a5e4f..107b79c88e 100644
--- a/osu.Game.Rulesets.Catch/UI/SkinnableCatcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/SkinnableCatcher.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Skinning.Default;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -26,8 +25,8 @@ namespace osu.Game.Rulesets.Catch.UI
             : base(new CatchSkinComponentLookup(CatchSkinComponents.Catcher), _ => new DefaultCatcher())
         {
             Anchor = Anchor.TopCentre;
-            // Sets the origin roughly to the centre of the catcher's plate to allow for correct scaling.
-            OriginPosition = new Vector2(0.5f, 0.06f) * Catcher.BASE_SIZE;
+            Origin = Anchor.TopCentre;
+            CentreComponent = false;
         }
     }
 }

From fc63ee43be2a75d39f16606e85f53e1135022027 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Sep 2023 23:42:13 +0300
Subject: [PATCH 0881/2296] Fix legacy catcher sprites getting shrunk

---
 .../Skinning/Legacy/LegacyCatcher.cs          |  8 +++++++-
 .../Skinning/Legacy/LegacyCatcherNew.cs       | 19 ++-----------------
 .../Skinning/Legacy/LegacyCatcherOld.cs       | 15 +++------------
 3 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
index cba2c671b0..6cd8b14191 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcher.cs
@@ -13,7 +13,13 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         {
             Anchor = Anchor.TopCentre;
             Origin = Anchor.TopCentre;
-            RelativeSizeAxes = Axes.Both;
+
+            // in stable, catcher sprites are displayed in their raw size. stable also has catcher sprites displayed with the following scale factors applied:
+            //  1. 0.5x, affecting all sprites in the playfield, computed here based on lazer's catch playfield dimensions (see WIDTH/HEIGHT constants in CatchPlayfield),
+            //           source: https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/GameplayElements/HitObjectManager.cs#L483-L494
+            //  2. 0.7x, a constant scale applied to all catcher sprites on construction.
+            AutoSizeAxes = Axes.Both;
+            Scale = new Vector2(0.5f * 0.7f);
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherNew.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherNew.cs
index f6b2c52498..54d555b22a 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherNew.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherNew.cs
@@ -7,14 +7,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
-    public partial class LegacyCatcherNew : CompositeDrawable
+    public partial class LegacyCatcherNew : LegacyCatcher
     {
         [Resolved]
         private Bindable<CatcherAnimationState> currentState { get; set; } = null!;
@@ -23,25 +21,12 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
         private Drawable currentDrawable = null!;
 
-        public LegacyCatcherNew()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
             foreach (var state in Enum.GetValues<CatcherAnimationState>())
             {
-                AddInternal(drawables[state] = getDrawableFor(state).With(d =>
-                {
-                    d.Anchor = Anchor.TopCentre;
-                    d.Origin = Anchor.TopCentre;
-                    d.RelativeSizeAxes = Axes.Both;
-                    d.Size = Vector2.One;
-                    d.FillMode = FillMode.Fit;
-                    d.Alpha = 0;
-                }));
+                AddInternal(drawables[state] = getDrawableFor(state).With(d => d.Alpha = 0));
             }
 
             currentDrawable = drawables[CatcherAnimationState.Idle];
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherOld.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherOld.cs
index 1e21d8eab1..012200eedf 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherOld.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherOld.cs
@@ -3,30 +3,21 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
-    public partial class LegacyCatcherOld : CompositeDrawable
+    public partial class LegacyCatcherOld : LegacyCatcher
     {
         public LegacyCatcherOld()
         {
-            RelativeSizeAxes = Axes.Both;
+            AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            InternalChild = (skin.GetAnimation(@"fruit-ryuuta", true, true, true) ?? Empty()).With(d =>
-            {
-                d.Anchor = Anchor.TopCentre;
-                d.Origin = Anchor.TopCentre;
-                d.RelativeSizeAxes = Axes.Both;
-                d.Size = Vector2.One;
-                d.FillMode = FillMode.Fit;
-            });
+            InternalChild = skin.GetAnimation(@"fruit-ryuuta", true, true, true) ?? Empty();
         }
     }
 }

From fed0deac02d8cf132fdfad4b08a546ad173414cc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Sep 2023 23:43:43 +0300
Subject: [PATCH 0882/2296] Add brief explaination of `BASE_SIZE`

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index f77dab56c8..c5c9556ed7 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -29,6 +29,13 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// The size of the catcher at 1x scale.
         /// </summary>
+        /// <remarks>
+        /// This is mainly used to compute catching range, the actual catcher size may differ based on skin implementation and sprite textures.
+        /// This is also equivalent to the "catcherWidth" property in osu-stable when the game field and beatmap difficulty are set to default values.
+        /// </remarks>
+        /// <seealso cref="CatchPlayfield.WIDTH"/>
+        /// <seealso cref="CatchPlayfield.HEIGHT"/>
+        /// <seealso cref="IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY"/>
         public const float BASE_SIZE = 106.75f;
 
         /// <summary>

From 693b8d72db961844e2cde901622919127beceee3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 10 Oct 2023 01:23:00 +0300
Subject: [PATCH 0883/2296] Fix test catcher sprites in "special skin"
 incorrectly suffixed as being @2x

---
 ...t-catcher-fail@2x.png => fruit-catcher-fail.png} | Bin
 ...tcher-idle-0@2x.png => fruit-catcher-idle-0.png} | Bin
 ...tcher-idle-1@2x.png => fruit-catcher-idle-1.png} | Bin
 ...tcher-idle-2@2x.png => fruit-catcher-idle-2.png} | Bin
 ...tcher-idle-3@2x.png => fruit-catcher-idle-3.png} | Bin
 ...tcher-idle-4@2x.png => fruit-catcher-idle-4.png} | Bin
 ...tcher-idle-5@2x.png => fruit-catcher-idle-5.png} | Bin
 ...t-catcher-kiai@2x.png => fruit-catcher-kiai.png} | Bin
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-fail@2x.png => fruit-catcher-fail.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-0@2x.png => fruit-catcher-idle-0.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-1@2x.png => fruit-catcher-idle-1.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-2@2x.png => fruit-catcher-idle-2.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-3@2x.png => fruit-catcher-idle-3.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-4@2x.png => fruit-catcher-idle-4.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-idle-5@2x.png => fruit-catcher-idle-5.png} (100%)
 rename osu.Game.Rulesets.Catch.Tests/Resources/special-skin/{fruit-catcher-kiai@2x.png => fruit-catcher-kiai.png} (100%)

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5.png
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png
similarity index 100%
rename from osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai@2x.png
rename to osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png

From b2987caf7cc56248ba6638fc7d9b34708f96c80a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 10 Oct 2023 02:17:43 +0300
Subject: [PATCH 0884/2296] Adjust the catch playfield's position to match 1:1
 with stable

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

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
index 74cbc665c0..2ba41a38d5 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
@@ -17,12 +17,13 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public CatchPlayfieldAdjustmentContainer()
         {
-            // because we are using centre anchor/origin, we will need to limit visibility in the future
-            // to ensure tall windows do not get a readability advantage.
-            // it may be possible to bake the catch-specific offsets (-100..340 mentioned below) into new values
-            // which are compatible with TopCentre alignment.
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+
+            // playfields in stable are positioned vertically at three fourths the difference between the playfield height and the window height in stable.
+            // we can match that in lazer by using relative coordinates for Y and considering window height to be 1, and playfield height to be 0.8.
+            RelativePositionAxes = Axes.Y;
+            Y = (1 - playfield_size_adjust) / 4 * 3;
 
             Size = new Vector2(playfield_size_adjust);
 

From 7211c88e83bc1fa1d24c13041be7ea01357db149 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 08:32:35 +0900
Subject: [PATCH 0885/2296] Make combo assertion actually work as expected

---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 5bc477535d..93128c512f 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -200,9 +200,10 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertCombo(1);
+            assertComboAtJudgement(0, 1);
             assertTailJudgement(HitResult.Meh);
-            assertCombo(1);
+            assertComboAtJudgement(1, 0);
+            assertComboAtJudgement(2, 1);
         }
 
         /// <summary>
@@ -521,8 +522,8 @@ namespace osu.Game.Rulesets.Mania.Tests
         private void assertNoteJudgement(HitResult result)
             => AddAssert($"hold note judged as {result}", () => judgementResults.Single(j => j.HitObject is HoldNote).Type, () => Is.EqualTo(result));
 
-        private void assertCombo(int combo)
-            => AddAssert($"combo is {combo}", () => currentPlayer.ScoreProcessor.Combo.Value, () => Is.EqualTo(combo));
+        private void assertComboAtJudgement(int judgementIndex, int combo)
+            => AddAssert($"combo at judgement {judgementIndex} is {combo}", () => judgementResults.ElementAt(judgementIndex).ComboAfterJudgement, () => Is.EqualTo(combo));
 
         private ScoreAccessibleReplayPlayer currentPlayer = null!;
 

From 6073f3e756536d6765cf18a3cc34196bc15d464a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 10 Oct 2023 02:18:21 +0300
Subject: [PATCH 0886/2296] Refactor catch playfield size adjustment logic
 w.r.t. catcher position

---
 .../UI/CatchPlayfieldAdjustmentContainer.cs   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
index 2ba41a38d5..11531011ee 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs
@@ -43,18 +43,28 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         private partial class ScalingContainer : Container
         {
+            public ScalingContainer()
+            {
+                Anchor = Anchor.BottomCentre;
+                Origin = Anchor.BottomCentre;
+            }
+
             protected override void Update()
             {
                 base.Update();
 
-                // in stable, fruit fall vertically from -100 to 340.
-                // to emulate this, we want to make our playfield 440 gameplay pixels high.
-                // we then offset it -100 vertically in the position set below.
-                const float stable_v_offset_ratio = 440 / 384f;
+                // in stable, fruit fall vertically from 100 pixels above the playfield top down to the catcher's Y position (i.e. -100 to 340),
+                // see: https://github.com/peppy/osu-stable-reference/blob/1531237b63392e82c003c712faa028406073aa8f/osu!/GameplayElements/HitObjects/Fruits/HitCircleFruits.cs#L65
+                // we already have the playfield positioned similar to stable (see CatchPlayfieldAdjustmentContainer constructor),
+                // so we only need to increase this container's height 100 pixels above the playfield, and offset it to have the bottom at 340 rather than 384.
+                const float stable_fruit_start_position = -100;
+                const float stable_catcher_y_position = 340;
+                const float playfield_v_size_adjustment = (stable_catcher_y_position - stable_fruit_start_position) / CatchPlayfield.HEIGHT;
+                const float playfield_v_catcher_offset = stable_catcher_y_position - CatchPlayfield.HEIGHT;
 
-                Scale = new Vector2(Parent.ChildSize.X / CatchPlayfield.WIDTH);
-                Position = new Vector2(0, -100 * stable_v_offset_ratio + Scale.X);
-                Size = Vector2.Divide(new Vector2(1, stable_v_offset_ratio), Scale);
+                Scale = new Vector2(Parent!.ChildSize.X / CatchPlayfield.WIDTH);
+                Position = new Vector2(0f, playfield_v_catcher_offset * Scale.Y);
+                Size = Vector2.Divide(new Vector2(1, playfield_v_size_adjustment), Scale);
             }
         }
     }

From 594bcc2ab533c610909f1533eb2082c6822e1aef Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 09:56:26 +0900
Subject: [PATCH 0887/2296] Apply suggestion to condense method

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 102 +++----------------------
 1 file changed, 12 insertions(+), 90 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index cc528e406f..c2788b2dd6 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -331,101 +331,23 @@ namespace osu.Game.Rulesets.Scoring
 
         public static void ValidateHitResultPair(HitResult maxResult, HitResult minResult)
         {
-            // Check valid maximum judgements.
-            switch (maxResult)
-            {
-                case HitResult.Meh:
-                case HitResult.Ok:
-                case HitResult.Good:
-                case HitResult.Great:
-                case HitResult.Perfect:
-                case HitResult.SmallTickHit:
-                case HitResult.LargeTickHit:
-                case HitResult.SmallBonus:
-                case HitResult.LargeBonus:
-                case HitResult.IgnoreHit:
-                    break;
+            if (maxResult == HitResult.None || !IsHit(maxResult))
+                throw new ArgumentOutOfRangeException(nameof(maxResult), $"{maxResult} is not a valid maximum judgement result.");
 
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(maxResult), $"{maxResult} is not a valid maximum judgement result.");
-            }
+            if (minResult == HitResult.None || IsHit(minResult))
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum judgement result.");
 
-            // Check valid minimum judgements.
-            switch (minResult)
-            {
-                case HitResult.Miss:
-                case HitResult.SmallTickMiss:
-                case HitResult.LargeTickMiss:
-                case HitResult.IgnoreMiss:
-                case HitResult.ComboBreak:
-                    break;
+            if (maxResult.IsBonus() && minResult != HitResult.IgnoreMiss)
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.IgnoreMiss} is the only valid minimum result for a {maxResult} judgement.");
 
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum judgement result.");
-            }
+            if (maxResult == HitResult.LargeTickHit && minResult is not (HitResult.LargeTickMiss or HitResult.IgnoreMiss or HitResult.ComboBreak))
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
 
-            // Check valid category pairings.
-            switch (maxResult)
-            {
-                case HitResult.SmallBonus:
-                case HitResult.LargeBonus:
-                    switch (minResult)
-                    {
-                        case HitResult.IgnoreMiss:
-                            break;
+            if (maxResult == HitResult.SmallTickHit && minResult is not (HitResult.SmallTickMiss or HitResult.IgnoreMiss or HitResult.ComboBreak))
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
 
-                        default:
-                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.IgnoreMiss} is the only valid minimum result for a {maxResult} judgement.");
-                    }
-
-                    break;
-
-                case HitResult.SmallTickHit:
-                    switch (minResult)
-                    {
-                        case HitResult.SmallTickMiss:
-                        case HitResult.IgnoreMiss:
-                        case HitResult.ComboBreak:
-                            break;
-
-                        default:
-                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
-                    }
-
-                    break;
-
-                case HitResult.LargeTickHit:
-                    switch (minResult)
-                    {
-                        case HitResult.LargeTickMiss:
-                        case HitResult.IgnoreMiss:
-                        case HitResult.ComboBreak:
-                            break;
-
-                        default:
-                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
-                    }
-
-                    break;
-
-                case HitResult.Meh:
-                case HitResult.Ok:
-                case HitResult.Good:
-                case HitResult.Great:
-                case HitResult.Perfect:
-                    switch (minResult)
-                    {
-                        case HitResult.Miss:
-                        case HitResult.IgnoreMiss:
-                        case HitResult.ComboBreak:
-                            break;
-
-                        default:
-                            throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
-                    }
-
-                    break;
-            }
+            if (maxResult.IsBasic() && minResult is not (HitResult.Miss or HitResult.IgnoreMiss or HitResult.ComboBreak))
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
         }
     }
 #pragma warning restore CS0618

From 89a3be11cbc7b04ecb95f8ac8a476c335a4f1c0f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 09:56:35 +0900
Subject: [PATCH 0888/2296] Add validation test

---
 .../Rulesets/Scoring/HitResultTest.cs         | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs

diff --git a/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs b/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs
new file mode 100644
index 0000000000..68d7335055
--- /dev/null
+++ b/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs
@@ -0,0 +1,36 @@
+// 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.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Tests.Rulesets.Scoring
+{
+    [TestFixture]
+    public class HitResultTest
+    {
+        [TestCase(new[] { HitResult.Perfect, HitResult.Great, HitResult.Good, HitResult.Ok, HitResult.Meh }, new[] { HitResult.Miss })]
+        [TestCase(new[] { HitResult.LargeTickHit }, new[] { HitResult.LargeTickMiss })]
+        [TestCase(new[] { HitResult.SmallTickHit }, new[] { HitResult.SmallTickMiss })]
+        [TestCase(new[] { HitResult.LargeBonus, HitResult.SmallBonus }, new[] { HitResult.IgnoreMiss })]
+        [TestCase(new[] { HitResult.IgnoreHit }, new[] { HitResult.IgnoreMiss, HitResult.ComboBreak })]
+        public void TestValidResultPairs(HitResult[] maxResults, HitResult[] minResults)
+        {
+            HitResult[] unsupportedResults = HitResultExtensions.ALL_TYPES.Where(t => !minResults.Contains(t)).ToArray();
+
+            Assert.Multiple(() =>
+            {
+                foreach (var max in maxResults)
+                {
+                    foreach (var min in minResults)
+                        Assert.DoesNotThrow(() => HitResultExtensions.ValidateHitResultPair(max, min), $"{max} + {min} should be supported.");
+
+                    foreach (var unsupported in unsupportedResults)
+                        Assert.Throws<ArgumentOutOfRangeException>(() => HitResultExtensions.ValidateHitResultPair(max, unsupported), $"{max} + {unsupported} should not be supported.");
+                }
+            });
+        }
+    }
+}

From 04ce223e66d0d169500e35d636149796461f76e1 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 10:03:37 +0900
Subject: [PATCH 0889/2296] Remove pairings that shouldn't be valid

---
 osu.Game/Rulesets/Judgements/Judgement.cs |  6 +++---
 osu.Game/Rulesets/Scoring/HitResult.cs    | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index b9e88dce7a..d0c4c4395d 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Judgements
         ///   </listheader>
         /// <item>
         ///   <term><see cref="HitResult.Perfect"/>, <see cref="HitResult.Great"/>, <see cref="HitResult.Good"/>, <see cref="HitResult.Ok"/>, <see cref="HitResult.Meh"/></term>
-        ///   <description><see cref="HitResult.Miss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        ///   <description><see cref="HitResult.Miss"/></description>
         /// </item>
         /// <item>
         ///   <term><see cref="HitResult.LargeBonus"/></term>
@@ -56,11 +56,11 @@ namespace osu.Game.Rulesets.Judgements
         /// </item>
         /// <item>
         ///   <term><see cref="HitResult.SmallTickHit"/></term>
-        ///   <description><see cref="HitResult.SmallTickMiss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        ///   <description><see cref="HitResult.SmallTickMiss"/></description>
         /// </item>
         /// <item>
         ///   <term><see cref="HitResult.LargeTickHit"/></term>
-        ///   <description><see cref="HitResult.LargeTickMiss"/>, <see cref="HitResult.IgnoreMiss"/>, <see cref="HitResult.ComboBreak"/></description>
+        ///   <description><see cref="HitResult.LargeTickMiss"/></description>
         /// </item>
         /// <item>
         ///   <term><see cref="HitResult.IgnoreHit"/></term>
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index c2788b2dd6..ccd1f49de4 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -337,17 +337,20 @@ namespace osu.Game.Rulesets.Scoring
             if (minResult == HitResult.None || IsHit(minResult))
                 throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum judgement result.");
 
+            if (maxResult == HitResult.IgnoreHit && minResult is not (HitResult.IgnoreMiss or HitResult.ComboBreak))
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+
             if (maxResult.IsBonus() && minResult != HitResult.IgnoreMiss)
                 throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.IgnoreMiss} is the only valid minimum result for a {maxResult} judgement.");
 
-            if (maxResult == HitResult.LargeTickHit && minResult is not (HitResult.LargeTickMiss or HitResult.IgnoreMiss or HitResult.ComboBreak))
-                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+            if (maxResult == HitResult.LargeTickHit && minResult != HitResult.LargeTickMiss)
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.LargeTickMiss} is the only valid minimum result for a {maxResult} judgement.");
 
-            if (maxResult == HitResult.SmallTickHit && minResult is not (HitResult.SmallTickMiss or HitResult.IgnoreMiss or HitResult.ComboBreak))
-                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+            if (maxResult == HitResult.SmallTickHit && minResult != HitResult.SmallTickMiss)
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.SmallTickMiss} is the only valid minimum result for a {maxResult} judgement.");
 
-            if (maxResult.IsBasic() && minResult is not (HitResult.Miss or HitResult.IgnoreMiss or HitResult.ComboBreak))
-                throw new ArgumentOutOfRangeException(nameof(minResult), $"{minResult} is not a valid minimum result for a {maxResult} judgement.");
+            if (maxResult.IsBasic() && minResult != HitResult.Miss)
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.Miss} is the only valid minimum result for a {maxResult} judgement.");
         }
     }
 #pragma warning restore CS0618

From 1a60d6ade5c2a7258dc56f7005d54dd005f004cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 13:35:06 +0900
Subject: [PATCH 0890/2296] Use a `DrawablePool` for mania's beat snap grid

I'm not sure what the cause of the issue is, but I'm also not sure why
it wasn't using `DrawablePool` (was it not around back then?).

Either way, switching to a proper pool fixes things just fine.

Resolves https://github.com/ppy/osu/issues/25009.
---
 .../Edit/ManiaBeatSnapGrid.cs                 | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 9cc84450cc..4d45e16588 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -8,6 +8,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
@@ -23,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Edit
     /// <summary>
     /// A grid which displays coloured beat divisor lines in proximity to the selection or placement cursor.
     /// </summary>
-    public partial class ManiaBeatSnapGrid : Component
+    public partial class ManiaBeatSnapGrid : CompositeComponent
     {
         private const double visible_range = 750;
 
@@ -53,6 +55,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         private readonly List<ScrollingHitObjectContainer> grids = new List<ScrollingHitObjectContainer>();
 
+        private readonly DrawablePool<DrawableGridLine> linesPool = new DrawablePool<DrawableGridLine>(50);
+
         private readonly Cached lineCache = new Cached();
 
         private (double start, double end)? selectionTimeRange;
@@ -60,6 +64,8 @@ namespace osu.Game.Rulesets.Mania.Edit
         [BackgroundDependencyLoader]
         private void load(HitObjectComposer composer)
         {
+            AddInternal(linesPool);
+
             foreach (var stage in ((ManiaPlayfield)composer.Playfield).Stages)
             {
                 foreach (var column in stage.Columns)
@@ -85,17 +91,10 @@ namespace osu.Game.Rulesets.Mania.Edit
             }
         }
 
-        private readonly Stack<DrawableGridLine> availableLines = new Stack<DrawableGridLine>();
-
         private void createLines()
         {
             foreach (var grid in grids)
-            {
-                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
-                    availableLines.Push(line);
-
                 grid.Clear();
-            }
 
             if (selectionTimeRange == null)
                 return;
@@ -131,10 +130,13 @@ namespace osu.Game.Rulesets.Mania.Edit
 
                 foreach (var grid in grids)
                 {
-                    if (!availableLines.TryPop(out var line))
-                        line = new DrawableGridLine();
+                    var line = linesPool.Get();
+
+                    line.Apply(new HitObject
+                    {
+                        StartTime = time
+                    });
 
-                    line.HitObject.StartTime = time;
                     line.Colour = colour;
 
                     grid.Add(line);

From 8e26b3c4051762e9a4c9f4624b0b5babe14145e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:09:33 +0900
Subject: [PATCH 0891/2296] Fix argon health bar not completing flash animation
 correctly

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index aa3b6c1f41..4c63479d3d 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -221,6 +221,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void finishMissDisplay()
         {
+            if (resetMissBarDelegate == null)
+                return;
+
             if (Current.Value > 0)
             {
                 glowBar.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 300, Easing.In);

From aeb579eb54b0371682b5fd2ec5146ed56c2e5ee2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:10:27 +0900
Subject: [PATCH 0892/2296] Syncrhonise initial colour of `glowBar` for sanity

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 4c63479d3d..2a42023f83 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -15,7 +15,6 @@ using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -114,7 +113,7 @@ namespace osu.Game.Screens.Play.HUD
                     glowBar = new BarPath
                     {
                         BarColour = Color4.White,
-                        GlowColour = OsuColour.Gray(0.5f),
+                        GlowColour = main_bar_glow_colour,
                         Blending = BlendingParameters.Additive,
                         Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
                         PathRadius = 40f,

From 6ee958743e29bf5ad59f355a20f512fe116e6319 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:10:42 +0900
Subject: [PATCH 0893/2296] Adjust glow animation specifics slightly

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 2a42023f83..a3a35999fa 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -181,12 +181,13 @@ namespace osu.Game.Screens.Play.HUD
 
             if (resetMissBarDelegate == null)
             {
-                glowBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint)
+                glowBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 30, Easing.OutQuint)
                        .Then()
-                       .TransformTo(nameof(BarPath.BarColour), main_bar_colour, 800, Easing.OutQuint);
+                       .TransformTo(nameof(BarPath.BarColour), main_bar_colour, 1000, Easing.OutQuint);
 
-                glowBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White)
-                       .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 800, Easing.OutQuint);
+                glowBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 30, Easing.OutQuint)
+                       .Then()
+                       .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
             }
         }
 

From 57f588fa8697841524c070567659c8dece6817c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:23:50 +0900
Subject: [PATCH 0894/2296] Ensure health displays don't pile up transforms
 when off-screen

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs  | 15 +++++++++------
 .../Screens/Play/HUD/DefaultHealthDisplay.cs     | 16 +++++++---------
 osu.Game/Screens/Play/HUD/HealthDisplay.cs       |  8 +++++---
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index aa3b6c1f41..b6e2f494d1 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -142,14 +142,17 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(v =>
             {
-                if (v.NewValue >= GlowBarValue)
-                    finishMissDisplay();
+                Scheduler.AddOnce(() =>
+                {
+                    if (v.NewValue >= GlowBarValue)
+                        finishMissDisplay();
 
-                double time = v.NewValue > GlowBarValue ? 500 : 250;
+                    double time = v.NewValue > GlowBarValue ? 500 : 250;
 
-                this.TransformTo(nameof(HealthBarValue), v.NewValue, time, Easing.OutQuint);
-                if (resetMissBarDelegate == null)
-                    this.TransformTo(nameof(GlowBarValue), v.NewValue, time, Easing.OutQuint);
+                    this.TransformTo(nameof(HealthBarValue), v.NewValue, time, Easing.OutQuint);
+                    if (resetMissBarDelegate == null)
+                        this.TransformTo(nameof(GlowBarValue), v.NewValue, time, Easing.OutQuint);
+                });
             }, true);
 
             BarLength.BindValueChanged(l => Width = l.NewValue, true);
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index c4d04c5580..0d3bd8d46f 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -112,6 +112,13 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
+        protected override void Flash(JudgementResult result)
+        {
+            fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, Easing.OutQuint)
+                .Delay(glow_fade_delay)
+                .FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, Easing.OutQuint);
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -119,15 +126,6 @@ namespace osu.Game.Screens.Play.HUD
             GlowColour = colours.BlueDarker;
         }
 
-        protected override void Flash(JudgementResult result) => Scheduler.AddOnce(flash);
-
-        private void flash()
-        {
-            fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, Easing.OutQuint)
-                .Delay(glow_fade_delay)
-                .FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, Easing.OutQuint);
-        }
-
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 986efe3036..e297ffc411 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Screens.Play.HUD
 
         /// <summary>
         /// Triggered when a <see cref="Judgement"/> is a successful hit, signaling the health display to perform a flash animation (if designed to do so).
+        /// Calls to this method are debounced.
         /// </summary>
         /// <param name="result">The judgement result.</param>
         protected virtual void Flash(JudgementResult result)
@@ -47,6 +48,7 @@ namespace osu.Game.Screens.Play.HUD
 
         /// <summary>
         /// Triggered when a <see cref="Judgement"/> resulted in the player losing health.
+        /// Calls to this method are debounced.
         /// </summary>
         /// <param name="result">The judgement result.</param>
         protected virtual void Miss(JudgementResult result)
@@ -92,7 +94,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 double newValue = Current.Value + 0.05f;
                 this.TransformBindableTo(Current, newValue, increase_delay);
-                Flash(new JudgementResult(new HitObject(), new Judgement()));
+                Scheduler.AddOnce(Flash, new JudgementResult(new HitObject(), new Judgement()));
 
                 if (newValue >= 1)
                     finishInitialAnimation();
@@ -115,9 +117,9 @@ namespace osu.Game.Screens.Play.HUD
         private void onNewJudgement(JudgementResult judgement)
         {
             if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
-                Flash(judgement);
+                Scheduler.AddOnce(Flash, judgement);
             else if (judgement.Judgement.HealthIncreaseFor(judgement) < 0)
-                Miss(judgement);
+                Scheduler.AddOnce(Miss, judgement);
         }
 
         protected override void Dispose(bool isDisposing)

From 6c346874d3f191c34651943dd3fda84bc3dd2866 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:24:03 +0900
Subject: [PATCH 0895/2296] Add TODO mentioning that `ArgonHealthDisplay` is
 doing lerp wrong

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index b6e2f494d1..3c29d068e6 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -149,6 +149,7 @@ namespace osu.Game.Screens.Play.HUD
 
                     double time = v.NewValue > GlowBarValue ? 500 : 250;
 
+                    // TODO: this should probably use interpolation in update.
                     this.TransformTo(nameof(HealthBarValue), v.NewValue, time, Easing.OutQuint);
                     if (resetMissBarDelegate == null)
                         this.TransformTo(nameof(GlowBarValue), v.NewValue, time, Easing.OutQuint);

From 1eb6c93916d015524dad238672492470a2c7c94f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:45:35 +0900
Subject: [PATCH 0896/2296] Also debounce `updatePathVertices` to reduce
 overhead

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 3c29d068e6..9c7c0684b3 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Play.HUD
                     return;
 
                 glowBarValue = value;
-                updatePathVertices();
+                Scheduler.AddOnce(updatePathVertices);
             }
         }
 
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.Play.HUD
                     return;
 
                 healthBarValue = value;
-                updatePathVertices();
+                Scheduler.AddOnce(updatePathVertices);
             }
         }
 

From 7e68b6452632f48f3a1656633df977f88a069972 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 15:59:48 +0900
Subject: [PATCH 0897/2296] Avoid running `finishInitialAnimation` when already
 finished

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index e297ffc411..212a223e22 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -103,6 +103,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void finishInitialAnimation()
         {
+            if (initialIncrease == null)
+                return;
+
             initialIncrease?.Cancel();
             initialIncrease = null;
 

From 4674f6365541e6f9a8c289389fc01cc4903f1212 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 16:17:34 +0900
Subject: [PATCH 0898/2296] Fix `Scheduler.AddOnce` not working in one location

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 9c7c0684b3..bc095838ab 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -142,18 +142,8 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(v =>
             {
-                Scheduler.AddOnce(() =>
-                {
-                    if (v.NewValue >= GlowBarValue)
-                        finishMissDisplay();
-
-                    double time = v.NewValue > GlowBarValue ? 500 : 250;
-
-                    // TODO: this should probably use interpolation in update.
-                    this.TransformTo(nameof(HealthBarValue), v.NewValue, time, Easing.OutQuint);
-                    if (resetMissBarDelegate == null)
-                        this.TransformTo(nameof(GlowBarValue), v.NewValue, time, Easing.OutQuint);
-                });
+                // For some reason making the delegate inline here doesn't work correctly.
+                Scheduler.AddOnce(updateCurrent);
             }, true);
 
             BarLength.BindValueChanged(l => Width = l.NewValue, true);
@@ -169,6 +159,17 @@ namespace osu.Game.Screens.Play.HUD
             return base.OnInvalidate(invalidation, source);
         }
 
+        private void updateCurrent()
+        {
+            if (Current.Value >= GlowBarValue) finishMissDisplay();
+
+            double time = Current.Value > GlowBarValue ? 500 : 250;
+
+            // TODO: this should probably use interpolation in update.
+            this.TransformTo(nameof(HealthBarValue), Current.Value, time, Easing.OutQuint);
+            if (resetMissBarDelegate == null) this.TransformTo(nameof(GlowBarValue), Current.Value, time, Easing.OutQuint);
+        }
+
         protected override void Update()
         {
             base.Update();

From 08b1a3cbe28f51e05ef75d14a65037e3f98fa858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Oct 2023 09:18:57 +0200
Subject: [PATCH 0899/2296] Add failing test case for guest user being looked
 up in API

---
 .../TestScenePlayerLocalScoreImport.cs        | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 6a7fab86d6..8e21c3ea9f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -15,6 +15,9 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 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.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -26,6 +29,7 @@ using osu.Game.Screens;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Resources;
+using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -150,6 +154,40 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
         }
 
+        [Test]
+        public void TestGuestScoreIsStoredAsGuest()
+        {
+            AddStep("set up API", () => ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case GetUserRequest userRequest:
+                        userRequest.TriggerSuccess(new APIUser
+                        {
+                            Username = "Guest",
+                            CountryCode = CountryCode.JP,
+                            Id = 1234
+                        });
+                        return true;
+
+                    default:
+                        return false;
+                }
+            });
+
+            AddStep("log out", () => API.Logout());
+            CreateTest();
+
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
+            AddStep("log back in", () => API.Login("username", "password"));
+
+            AddStep("seek to completion", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
+
+            AddUntilStep("results displayed", () => Player.GetChildScreen() is ResultsScreen);
+            AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
+            AddAssert("score is not associated with online user", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID))!.UserID == APIUser.SYSTEM_USER_ID);
+        }
+
         [Test]
         public void TestReplayExport()
         {

From 24956588e906af6aa39d1f79e95870908f359a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Oct 2023 09:28:01 +0200
Subject: [PATCH 0900/2296] Fix score importer looking up guest user by
 username online

---
 osu.Game/Scoring/ScoreImporter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 886fb1379c..7473d887c3 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -190,6 +190,9 @@ namespace osu.Game.Scoring
         /// </summary>
         private void populateUserDetails(ScoreInfo model)
         {
+            if (model.RealmUser.OnlineID == APIUser.SYSTEM_USER_ID)
+                return;
+
             string username = model.RealmUser.Username;
 
             if (usernameLookupCache.TryGetValue(username, out var existing))

From ea400a9db770fd93bc5ff3cab43ab8f7e82722f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 10 Oct 2023 09:30:51 +0200
Subject: [PATCH 0901/2296] Fix cross-test interference

`TestLastPlayedUpdated` was implicitly relying on running first.
`TestGuestScoreIsStoredAsGuest` showing up changed test ordering,
causing the former test to fail if it didn't get to run first.
---
 .../Visual/Gameplay/TestScenePlayerLocalScoreImport.cs           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 8e21c3ea9f..1254aa0639 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -102,6 +102,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             DateTimeOffset? getLastPlayed() => Realm.Run(r => r.Find<BeatmapInfo>(Beatmap.Value.BeatmapInfo.ID)?.LastPlayed);
 
+            AddStep("reset last played", () => Realm.Write(r => r.Find<BeatmapInfo>(Beatmap.Value.BeatmapInfo.ID)!.LastPlayed = null));
             AddAssert("last played is null", () => getLastPlayed() == null);
 
             CreateTest();

From 94192644be4f865ad5fb90d1c28de54ced3536d1 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 16:51:24 +0900
Subject: [PATCH 0902/2296] Fix tests

---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index ff87b2a833..92e94bd02d 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
 
             for (int i = 0; i < 4; i++)
             {
-                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], beatmap.HitObjects[i].CreateJudgement())
+                var judgementResult = new JudgementResult(fourObjectBeatmap.HitObjects[i], fourObjectBeatmap.HitObjects[i].CreateJudgement())
                 {
                     Type = i == 2 ? minResult : hitResult
                 };
@@ -277,8 +277,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
             {
                 HitObjects = new List<HitObject>
                 {
-                    new TestHitObject(HitResult.Great, HitResult.ComboBreak),
-                    new TestHitObject(HitResult.Great, HitResult.ComboBreak),
+                    new TestHitObject(HitResult.Great),
+                    new TestHitObject(HitResult.IgnoreHit, HitResult.ComboBreak),
                 }
             };
 

From 8dc9453d8dd5886e2a92175e9948c9a174a90f32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 16:59:18 +0900
Subject: [PATCH 0903/2296] Apply some xmldoc and structural changes

---
 .../Objects/Drawables/DrawableHoldNote.cs     | 21 +++++++++++--------
 .../Objects/Drawables/DrawableHoldNoteBody.cs |  5 +++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 499f8c99b0..86920927dc 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         public double? HoldStartTime { get; private set; }
 
         /// <summary>
-        /// Whether the hold note has been released potentially without having caused a break.
+        /// Used to decide whether to visually clamp the hold note to the judgement line.
         /// </summary>
         private double? releaseTime;
 
@@ -322,19 +322,22 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (e.Action != Action.Value)
                 return;
 
-            // Make sure a hold was started
-            if (HoldStartTime == null)
-                return;
-
             // do not run any of this logic when rewinding, as it inverts order of presses/releases.
             if ((Clock as IGameplayClock)?.IsRewinding == true)
                 return;
 
-            Tail.UpdateResult();
-            Body.TriggerResult(Tail.IsHit);
+            // When our action is released and we are in the middle of a hold, there's a chance that
+            // the user has released too early (before the tail).
+            //
+            // In such a case, we want to record this against the DrawableHoldNoteBody.
+            if (HoldStartTime != null)
+            {
+                Tail.UpdateResult();
+                Body.TriggerResult(Tail.IsHit);
 
-            endHold();
-            releaseTime = Time.Current;
+                endHold();
+                releaseTime = Time.Current;
+            }
         }
 
         private void endHold()
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
index ded88af145..1b2efbafdf 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteBody.cs
@@ -23,8 +23,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         internal void TriggerResult(bool hit)
         {
-            if (!AllJudged)
-                ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            if (AllJudged) return;
+
+            ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
     }
 }

From 18d20cad8b896b8910ab4000b6f667e6e6344068 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 17:04:21 +0900
Subject: [PATCH 0904/2296] Adjust xmldoc for readability

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Rulesets/Judgements/Judgement.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index d0c4c4395d..f60b3a6c02 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Judgements
         /// Defaults to a sane value for the given <see cref="MaxResult"/>. May be overridden to provide a supported custom value:
         /// <list type="table">
         ///   <listheader>
-        ///     <term>Valid <see cref="MaxResult"/>s</term>
+        ///     <term><see cref="MaxResult"/>s</term>
         ///     <description>Valid <see cref="MinResult"/>s</description>
         ///   </listheader>
         /// <item>

From 4319b22db825fd39f99862642d42a6bc213821d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 17:55:35 +0900
Subject: [PATCH 0905/2296] Add failing test coverage of player not pausing
 track correctly

---
 .../Multiplayer/TestSceneMultiplayerPlayer.cs       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
index 45c5c67fff..cbeff770c9 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
@@ -11,6 +11,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -28,6 +29,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
             });
 
+            AddStep("Start track playing", () =>
+            {
+                Beatmap.Value.Track.Start();
+            });
+
             AddStep("initialise gameplay", () =>
             {
                 Stack.Push(player = new MultiplayerPlayer(MultiplayerClient.ServerAPIRoom, new PlaylistItem(Beatmap.Value.BeatmapInfo)
@@ -37,7 +43,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
 
             AddUntilStep("wait for player to be current", () => player.IsCurrentScreen() && player.IsLoaded);
+
+            AddAssert("gameplay clock is paused", () => player.ChildrenOfType<GameplayClockContainer>().Single().IsPaused.Value);
+            AddAssert("gameplay clock is not running", () => !player.ChildrenOfType<GameplayClockContainer>().Single().IsRunning);
+
             AddStep("start gameplay", () => ((IMultiplayerClient)MultiplayerClient).GameplayStarted());
+
+            AddUntilStep("gameplay clock is not paused", () => !player.ChildrenOfType<GameplayClockContainer>().Single().IsPaused.Value);
+            AddAssert("gameplay clock is running", () => player.ChildrenOfType<GameplayClockContainer>().Single().IsRunning);
         }
 
         [Test]

From eee7dc02da9611c00ac3d6bc16343507b11728a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 17:58:11 +0900
Subject: [PATCH 0906/2296] Reduce severity of clock running check to avoid
 production crashes

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ac9ce11cb5..91131b0aba 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1078,7 +1078,7 @@ namespace osu.Game.Screens.Play
         protected virtual void StartGameplay()
         {
             if (GameplayClockContainer.IsRunning)
-                throw new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running");
+                Logger.Error(new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running"), "Clock failure");
 
             GameplayClockContainer.Reset(startClock: true);
 

From 100c0cf5331ad7806424acfb7d1e3371c39553c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 17:58:37 +0900
Subject: [PATCH 0907/2296] Fix `MultiplayerPlayer` never calling `Reset` on
 `GameplayClockContainer`

This call is responsible for ensuring the clock is in a stopped state.
---
 osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 7b448e4b5c..e6d9dd4cd0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -148,6 +148,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 loadingDisplay.Show();
                 client.ChangeState(MultiplayerUserState.ReadyForGameplay);
             }
+
+            // This will pause the clock, pending the gameplay started callback from the server.
+            GameplayClockContainer.Reset();
         }
 
         private void failAndBail(string message = null)

From f0bd97539379ad11f54dbdf354f0adca7565044a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 18:16:12 +0900
Subject: [PATCH 0908/2296] Change `GameplayClockContainer.Reset` to directly
 call `GameplayClock.Stop`

The reasoning is explained in the inline comment, but basically this was
getting blocked by `isPaused` being in an initial `true` state (as it is
on construction), while the source clock was still `IsRunning`.

There's no real guarantee of sync between the source and the `isPaused`
bindable right now. Maybe there should be in the future, but to restore
sanity, let's ensure that a call to `Reset` can at least stop the track
as we expect.
---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index e6a38a9946..3c920babee 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -138,12 +138,15 @@ namespace osu.Game.Screens.Play
         /// Resets this <see cref="GameplayClockContainer"/> and the source to an initial state ready for gameplay.
         /// </summary>
         /// <param name="time">The time to seek to on resetting. If <c>null</c>, the existing <see cref="StartTime"/> will be used.</param>
-        /// <param name="startClock">Whether to start the clock immediately, if not already started.</param>
+        /// <param name="startClock">Whether to start the clock immediately. If <c>false</c>, the clock will remain stopped after this call.</param>
         public void Reset(double? time = null, bool startClock = false)
         {
             bool wasPaused = isPaused.Value;
 
-            Stop();
+            // The intention of the Reset method is to get things into a known sane state.
+            // As such, we intentionally stop the underlying clock directly here, bypassing Stop/StopGameplayClock.
+            // This is to avoid any kind of isPaused state checks and frequency ramping (as provided by MasterGameplayClockContainer).
+            GameplayClock.Stop();
 
             if (time != null)
                 StartTime = time.Value;

From 97e521acad28cdbcc7db526623038ebb1e6ea4a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 18:47:20 +0900
Subject: [PATCH 0909/2296] Reduce black fill of song bar

Closes https://github.com/ppy/osu/issues/24993.
---
 osu.Game.Tournament/Components/SongBar.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index cde826628e..cc1d00f62f 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -84,6 +84,7 @@ namespace osu.Game.Tournament.Components
                 {
                     Colour = colours.Gray3,
                     RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.4f,
                 },
                 flow = new FillFlowContainer
                 {

From 7220ca34f7dfc6f8e1eda76975712f02fe621322 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 19:05:01 +0900
Subject: [PATCH 0910/2296] Add failing test coverage of incorrect default
 preview time

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 28 ++++++++++++++++---
 .../Resources/beatmap-version-4.osu           |  4 +++
 ...tmap-version.osu => beatmap-version-6.osu} |  0
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/beatmap-version-4.osu
 rename osu.Game.Tests/Resources/{beatmap-version.osu => beatmap-version-6.osu} (100%)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 3d2de2914a..fec7f86eb2 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         [Test]
         public void TestDecodeBeatmapVersion()
         {
-            using (var resStream = TestResources.OpenResource("beatmap-version.osu"))
+            using (var resStream = TestResources.OpenResource("beatmap-version-6.osu"))
             using (var stream = new LineBufferedReader(resStream))
             {
                 var decoder = Decoder.GetDecoder<Beatmap>(stream);
@@ -45,6 +45,25 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestPreviewPointWithOffsets(bool applyOffsets)
+        {
+            using (var resStream = TestResources.OpenResource("beatmap-version-4.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var decoder = Decoder.GetDecoder<Beatmap>(stream);
+                ((LegacyBeatmapDecoder)decoder).ApplyOffsets = applyOffsets;
+                var working = new TestWorkingBeatmap(decoder.Decode(stream));
+
+                Assert.AreEqual(4, working.BeatmapInfo.BeatmapVersion);
+                Assert.AreEqual(4, working.Beatmap.BeatmapInfo.BeatmapVersion);
+                Assert.AreEqual(4, working.GetPlayableBeatmap(new OsuRuleset().RulesetInfo, Array.Empty<Mod>()).BeatmapInfo.BeatmapVersion);
+
+                Assert.AreEqual(-1, working.BeatmapInfo.Metadata.PreviewTime);
+            }
+        }
+
         [Test]
         public void TestDecodeBeatmapGeneral()
         {
@@ -915,10 +934,11 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        [Test]
-        public void TestLegacyDefaultsPreserved()
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestLegacyDefaultsPreserved(bool applyOffsets)
         {
-            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = applyOffsets };
 
             using (var memoryStream = new MemoryStream())
             using (var stream = new LineBufferedReader(memoryStream))
diff --git a/osu.Game.Tests/Resources/beatmap-version-4.osu b/osu.Game.Tests/Resources/beatmap-version-4.osu
new file mode 100644
index 0000000000..bba4ed46f1
--- /dev/null
+++ b/osu.Game.Tests/Resources/beatmap-version-4.osu
@@ -0,0 +1,4 @@
+osu file format v4
+
+[General]
+PreviewTime: -1
diff --git a/osu.Game.Tests/Resources/beatmap-version.osu b/osu.Game.Tests/Resources/beatmap-version-6.osu
similarity index 100%
rename from osu.Game.Tests/Resources/beatmap-version.osu
rename to osu.Game.Tests/Resources/beatmap-version-6.osu

From 27818461470c4892a3c5f9e916beffd5929521b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 19:02:04 +0900
Subject: [PATCH 0911/2296] Fix beatmaps with no preview point set getting
 incorrect default

Note that this will require a re-import to fix existing beatmaps
becuse.. it's stored to realm. Probably not worth worrying about for
now.
---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 37aa7950d3..8559ecfe69 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -196,7 +196,8 @@ namespace osu.Game.Beatmaps.Formats
                     break;
 
                 case @"PreviewTime":
-                    metadata.PreviewTime = getOffsetTime(Parsing.ParseInt(pair.Value));
+                    int time = Parsing.ParseInt(pair.Value);
+                    metadata.PreviewTime = time == -1 ? time : getOffsetTime(time);
                     break;
 
                 case @"SampleSet":

From a1a46e58fc09d8066d33ebbe98337fe1a33c3b16 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 10 Oct 2023 21:42:37 +0900
Subject: [PATCH 0912/2296] Move validation to DHO.ApplyResult()

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 ++
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs          | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e31656e0ff..3bb0e3dfb8 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -672,6 +672,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (!Result.HasResult)
                 throw new InvalidOperationException($"{GetType().ReadableName()} applied a {nameof(JudgementResult)} but did not update {nameof(JudgementResult.Type)}.");
 
+            HitResultExtensions.ValidateHitResultPair(Result.Judgement.MaxResult, Result.Judgement.MinResult);
+
             if (!Result.Type.IsValidHitResult(Result.Judgement.MinResult, Result.Judgement.MaxResult))
             {
                 throw new InvalidOperationException(
diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index bf6c2bfe28..e9f3bcb949 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -151,8 +151,6 @@ namespace osu.Game.Rulesets.Scoring
             {
                 var judgement = obj.CreateJudgement();
 
-                HitResultExtensions.ValidateHitResultPair(judgement.MaxResult, judgement.MinResult);
-
                 var result = CreateResult(obj, judgement);
                 if (result == null)
                     throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");

From 682aa06acf1928bbf08171d6edbf510a1c8d6fc8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 22:10:44 +0900
Subject: [PATCH 0913/2296] Remove `JudgementResult` from `Miss`/`Flash` as it
 is not used

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs   |  9 ++++-----
 osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs |  3 +--
 osu.Game/Screens/Play/HUD/HealthDisplay.cs        | 13 +++++--------
 osu.Game/Skinning/LegacyHealthDisplay.cs          |  7 +++----
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index bc095838ab..d101a8fd64 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -16,7 +16,6 @@ using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
@@ -178,9 +177,9 @@ namespace osu.Game.Screens.Play.HUD
             glowBar.Alpha = (float)Interpolation.DampContinuously(glowBar.Alpha, GlowBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
         }
 
-        protected override void Flash(JudgementResult result)
+        protected override void Flash()
         {
-            base.Flash(result);
+            base.Flash();
 
             mainBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour.Opacity(0.8f))
                    .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
@@ -196,9 +195,9 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        protected override void Miss(JudgementResult result)
+        protected override void Miss()
         {
-            base.Miss(result);
+            base.Miss();
 
             if (resetMissBarDelegate != null)
             {
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index 0d3bd8d46f..f531b1c609 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Judgements;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -112,7 +111,7 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
-        protected override void Flash(JudgementResult result)
+        protected override void Flash()
         {
             fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, Easing.OutQuint)
                 .Delay(glow_fade_delay)
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 212a223e22..2f96233939 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
@@ -41,8 +40,7 @@ namespace osu.Game.Screens.Play.HUD
         /// Triggered when a <see cref="Judgement"/> is a successful hit, signaling the health display to perform a flash animation (if designed to do so).
         /// Calls to this method are debounced.
         /// </summary>
-        /// <param name="result">The judgement result.</param>
-        protected virtual void Flash(JudgementResult result)
+        protected virtual void Flash()
         {
         }
 
@@ -50,8 +48,7 @@ namespace osu.Game.Screens.Play.HUD
         /// Triggered when a <see cref="Judgement"/> resulted in the player losing health.
         /// Calls to this method are debounced.
         /// </summary>
-        /// <param name="result">The judgement result.</param>
-        protected virtual void Miss(JudgementResult result)
+        protected virtual void Miss()
         {
         }
 
@@ -94,7 +91,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 double newValue = Current.Value + 0.05f;
                 this.TransformBindableTo(Current, newValue, increase_delay);
-                Scheduler.AddOnce(Flash, new JudgementResult(new HitObject(), new Judgement()));
+                Scheduler.AddOnce(Flash);
 
                 if (newValue >= 1)
                     finishInitialAnimation();
@@ -120,9 +117,9 @@ namespace osu.Game.Screens.Play.HUD
         private void onNewJudgement(JudgementResult judgement)
         {
             if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
-                Scheduler.AddOnce(Flash, judgement);
+                Scheduler.AddOnce(Flash);
             else if (judgement.Judgement.HealthIncreaseFor(judgement) < 0)
-                Scheduler.AddOnce(Miss, judgement);
+                Scheduler.AddOnce(Miss);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 08add79fc1..845fc77394 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Utils;
 using osuTK;
@@ -80,7 +79,7 @@ namespace osu.Game.Skinning
             marker.Position = fill.Position + new Vector2(fill.DrawWidth, isNewStyle ? fill.DrawHeight / 2 : 0);
         }
 
-        protected override void Flash(JudgementResult result) => marker.Flash(result);
+        protected override void Flash() => marker.Flash();
 
         private static Texture getTexture(ISkin skin, string name) => skin?.GetTexture($"scorebar-{name}");
 
@@ -238,7 +237,7 @@ namespace osu.Game.Skinning
                 });
             }
 
-            public override void Flash(JudgementResult result)
+            public override void Flash()
             {
                 bulgeMain();
 
@@ -257,7 +256,7 @@ namespace osu.Game.Skinning
         {
             public Bindable<double> Current { get; } = new Bindable<double>();
 
-            public virtual void Flash(JudgementResult result)
+            public virtual void Flash()
             {
             }
         }

From e2e28ef0ca07908b8430ed8c2ddd31fdf308e80d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 22:12:20 +0900
Subject: [PATCH 0914/2296] Remove comment regarding inlined delegate

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index d101a8fd64..9643eb8b48 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -139,11 +139,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            Current.BindValueChanged(v =>
-            {
-                // For some reason making the delegate inline here doesn't work correctly.
-                Scheduler.AddOnce(updateCurrent);
-            }, true);
+            Current.BindValueChanged(_ => Scheduler.AddOnce(updateCurrent), true);
 
             BarLength.BindValueChanged(l => Width = l.NewValue, true);
             BarHeight.BindValueChanged(_ => updatePath());

From b9dadc52b7c571f4e77e4295b83df69384803ae9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 22:54:19 +0900
Subject: [PATCH 0915/2296] Adjust comment to match current behaviour
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 3c920babee..5a713fdae7 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -138,7 +138,8 @@ namespace osu.Game.Screens.Play
         /// Resets this <see cref="GameplayClockContainer"/> and the source to an initial state ready for gameplay.
         /// </summary>
         /// <param name="time">The time to seek to on resetting. If <c>null</c>, the existing <see cref="StartTime"/> will be used.</param>
-        /// <param name="startClock">Whether to start the clock immediately. If <c>false</c>, the clock will remain stopped after this call.</param>
+        /// <param name="startClock">Whether to start the clock immediately. If <c>false</c> and the clock was already paused, the clock will remain paused after this call.
+        /// </param>
         public void Reset(double? time = null, bool startClock = false)
         {
             bool wasPaused = isPaused.Value;

From 1acc02405e9cda5f4d419451ab754b05be86f498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:18:48 +0200
Subject: [PATCH 0916/2296] Reorder `KeyBindingRow` members

---
 .../Settings/Sections/Input/KeyBindingRow.cs  | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 1e2283b58b..8fcf519a2e 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -39,14 +39,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// </summary>
         public Action<KeyBindingRow> BindingUpdated { get; set; }
 
-        private readonly object action;
-        private readonly IEnumerable<RealmKeyBinding> bindings;
+        public bool AllowMainMouseButtons;
 
-        private const float transition_time = 150;
+        public IEnumerable<KeyCombination> Defaults;
 
-        private const float height = 20;
-
-        private const float padding = 5;
+        #region IFilterable
 
         private bool matchingFilter;
 
@@ -60,23 +57,39 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }
         }
 
-        private Container content;
-
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            content.ReceivePositionalInputAt(screenSpacePos);
-
         public bool FilteringActive { get; set; }
 
+        public IEnumerable<LocalisableString> FilterTerms => bindings.Select(b => (LocalisableString)keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text);
+
+        #endregion
+
+        private readonly object action;
+        private readonly IEnumerable<RealmKeyBinding> bindings;
+
+        private Bindable<bool> isDefault { get; } = new BindableBool(true);
+
         [Resolved]
         private ReadableKeyCombinationProvider keyCombinationProvider { get; set; }
 
+        [Resolved]
+        private RealmAccess realm { get; set; }
+
+        private Container content;
+
         private OsuSpriteText text;
         private FillFlowContainer cancelAndClearButtons;
         private FillFlowContainer<KeyButton> buttons;
 
-        private Bindable<bool> isDefault { get; } = new BindableBool(true);
+        private KeyButton bindTarget;
 
-        public IEnumerable<LocalisableString> FilterTerms => bindings.Select(b => (LocalisableString)keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text);
+        private const float transition_time = 150;
+        private const float height = 20;
+        private const float padding = 5;
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            content.ReceivePositionalInputAt(screenSpacePos);
+
+        public override bool AcceptsFocus => bindTarget == null;
 
         public KeyBindingRow(object action, List<RealmKeyBinding> bindings)
         {
@@ -87,9 +100,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             AutoSizeAxes = Axes.Y;
         }
 
-        [Resolved]
-        private RealmAccess realm { get; set; }
-
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
@@ -205,14 +215,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             base.OnHoverLost(e);
         }
 
-        public override bool AcceptsFocus => bindTarget == null;
-
-        private KeyButton bindTarget;
-
-        public bool AllowMainMouseButtons;
-
-        public IEnumerable<KeyCombination> Defaults;
-
         private bool isModifier(Key k) => k < Key.F1;
 
         protected override bool OnClick(ClickEvent e) => true;

From 7ac874d17ac68e966953e8cd03d6d7fb843aea14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:20:25 +0200
Subject: [PATCH 0917/2296] Use init-only properties where applicable

---
 osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs  | 6 +++---
 .../Settings/Sections/Input/KeyBindingsSubsection.cs        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 8fcf519a2e..ac09843c96 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -37,11 +37,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
         /// </summary>
-        public Action<KeyBindingRow> BindingUpdated { get; set; }
+        public Action<KeyBindingRow> BindingUpdated { get; init; }
 
-        public bool AllowMainMouseButtons;
+        public bool AllowMainMouseButtons { get; init; }
 
-        public IEnumerable<KeyCombination> Defaults;
+        public IEnumerable<KeyCombination> Defaults { get; init; }
 
         #region IFilterable
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index d6d4abfa92..b138f54644 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// </summary>
         protected virtual bool AutoAdvanceTarget => false;
 
-        protected IEnumerable<Framework.Input.Bindings.KeyBinding> Defaults;
+        protected IEnumerable<Framework.Input.Bindings.KeyBinding> Defaults { get; init; }
 
         public RulesetInfo Ruleset { get; protected set; }
 

From 0b2b065383b337051e02892e306a21c1496ea7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:21:19 +0200
Subject: [PATCH 0918/2296] Add xmldoc

---
 .../Overlays/Settings/Sections/Input/KeyBindingRow.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index ac09843c96..54a51069e8 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -39,8 +39,14 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// </summary>
         public Action<KeyBindingRow> BindingUpdated { get; init; }
 
+        /// <summary>
+        /// Whether left and right mouse button clicks should be included in the edited bindings.
+        /// </summary>
         public bool AllowMainMouseButtons { get; init; }
 
+        /// <summary>
+        /// The default key bindings for this row.
+        /// </summary>
         public IEnumerable<KeyCombination> Defaults { get; init; }
 
         #region IFilterable
@@ -91,6 +97,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public override bool AcceptsFocus => bindTarget == null;
 
+        /// <summary>
+        /// Creates a new <see cref="KeyBindingRow"/>.
+        /// </summary>
+        /// <param name="action">The action that this row contains bindings for.</param>
+        /// <param name="bindings">The keybindings to display in this row.</param>
         public KeyBindingRow(object action, List<RealmKeyBinding> bindings)
         {
             this.action = action;

From 797109c05cf7c16e730fa4b10ab9f2f61f12971c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:30:04 +0200
Subject: [PATCH 0919/2296] Enable NRT in `KeyBindingRow`

---
 .../Settings/Sections/Input/KeyBindingRow.cs  | 49 +++++++++++++------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 54a51069e8..c0de7a1d16 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -1,15 +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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
         /// </summary>
-        public Action<KeyBindingRow> BindingUpdated { get; init; }
+        public Action<KeyBindingRow>? BindingUpdated { get; init; }
 
         /// <summary>
         /// Whether left and right mouse button clicks should be included in the edited bindings.
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// The default key bindings for this row.
         /// </summary>
-        public IEnumerable<KeyCombination> Defaults { get; init; }
+        public IEnumerable<KeyCombination> Defaults { get; init; } = Array.Empty<KeyCombination>();
 
         #region IFilterable
 
@@ -75,18 +75,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private Bindable<bool> isDefault { get; } = new BindableBool(true);
 
         [Resolved]
-        private ReadableKeyCombinationProvider keyCombinationProvider { get; set; }
+        private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
 
         [Resolved]
-        private RealmAccess realm { get; set; }
+        private RealmAccess realm { get; set; } = null!;
 
-        private Container content;
+        private Container content = null!;
 
-        private OsuSpriteText text;
-        private FillFlowContainer cancelAndClearButtons;
-        private FillFlowContainer<KeyButton> buttons;
+        private OsuSpriteText text = null!;
+        private FillFlowContainer cancelAndClearButtons = null!;
+        private FillFlowContainer<KeyButton> buttons = null!;
 
-        private KeyButton bindTarget;
+        private KeyButton? bindTarget;
 
         private const float transition_time = 150;
         private const float height = 20;
@@ -232,7 +232,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (!HasFocus || !bindTarget.IsHovered)
+            if (!HasFocus)
+                return base.OnMouseDown(e);
+
+            Debug.Assert(bindTarget != null);
+
+            if (!bindTarget.IsHovered)
                 return base.OnMouseDown(e);
 
             if (!AllowMainMouseButtons)
@@ -258,6 +263,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 return;
             }
 
+            Debug.Assert(bindTarget != null);
+
             if (bindTarget.IsHovered)
                 finalise(false);
             // prevent updating bind target before clear button's action
@@ -269,6 +276,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             if (HasFocus)
             {
+                Debug.Assert(bindTarget != null);
+
                 if (bindTarget.IsHovered)
                 {
                     bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState, e.ScrollDelta), KeyCombination.FromScrollDelta(e.ScrollDelta).First());
@@ -285,6 +294,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!HasFocus || e.Repeat)
                 return false;
 
+            Debug.Assert(bindTarget != null);
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromKey(e.Key));
             if (!isModifier(e.Key)) finalise();
 
@@ -307,6 +318,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!HasFocus)
                 return false;
 
+            Debug.Assert(bindTarget != null);
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromJoystickButton(e.Button));
             finalise();
 
@@ -329,6 +342,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!HasFocus)
                 return false;
 
+            Debug.Assert(bindTarget != null);
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromMidiKey(e.Key));
             finalise();
 
@@ -351,6 +366,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!HasFocus)
                 return false;
 
+            Debug.Assert(bindTarget != null);
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromTabletAuxiliaryButton(e.Button));
             finalise();
 
@@ -373,6 +390,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!HasFocus)
                 return false;
 
+            Debug.Assert(bindTarget != null);
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromTabletPenButton(e.Button));
             finalise();
 
@@ -486,10 +505,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public readonly OsuSpriteText Text;
 
             [Resolved]
-            private OverlayColourProvider colourProvider { get; set; }
+            private OverlayColourProvider colourProvider { get; set; } = null!;
 
             [Resolved]
-            private ReadableKeyCombinationProvider keyCombinationProvider { get; set; }
+            private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
 
             private bool isBinding;
 
@@ -612,7 +631,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 base.Dispose(isDisposing);
 
-                if (keyCombinationProvider != null)
+                if (keyCombinationProvider.IsNotNull())
                     keyCombinationProvider.KeymapChanged -= updateKeyCombinationText;
             }
         }

From 63843c79c3b3333e4cd8df844ae99257ed0579f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Oct 2023 21:12:04 +0900
Subject: [PATCH 0920/2296] Amend diffcalc to use something closer to the
 original calculation for now

---
 .../Preprocessing/OsuDifficultyHitObject.cs   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index 5c2c85d69e..f37452a79c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -215,13 +215,20 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             if (slider.LazyEndPosition != null)
                 return;
 
-            double trackingEndTime = Math.Max(
-                // SliderTailCircle always occurs at the final end time of the slider, but the player only needs to hold until within a lenience before it.
-                slider.NestedHitObjects.OfType<SliderTailCircle>().Single().StartTime + SliderEventGenerator.TAIL_LENIENCY,
-                // There's an edge case where one or more ticks/repeats fall within that leniency range.
-                // In such a case, the player needs to track until the final tick or repeat.
-                slider.NestedHitObjects.LastOrDefault(n => n is not SliderTailCircle)?.StartTime ?? double.MinValue
-            );
+            // This commented version is actually correct by the new lazer implementation, but intentionally held back from
+            // difficulty calculator to preserve known behaviour.
+            // double trackingEndTime = Math.Max(
+            //     // SliderTailCircle always occurs at the final end time of the slider, but the player only needs to hold until within a lenience before it.
+            //     slider.Duration + SliderEventGenerator.TAIL_LENIENCY,
+            //     // There's an edge case where one or more ticks/repeats fall within that leniency range.
+            //     // In such a case, the player needs to track until the final tick or repeat.
+            //     slider.NestedHitObjects.LastOrDefault(n => n is not SliderTailCircle)?.StartTime ?? double.MinValue
+            // );
+
+            double trackingEndTime = Math.Max(Math.Max(
+                slider.StartTime + slider.Duration + SliderEventGenerator.TAIL_LENIENCY,
+                slider.StartTime + slider.Duration / 2
+            ), slider.NestedHitObjects.OfType<SliderTick>().Last().StartTime);
 
             slider.LazyTravelTime = trackingEndTime - slider.StartTime;
 

From 3f29f27cd48261f7da0f96659fbc494177b0192e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 19:40:55 +0200
Subject: [PATCH 0921/2296] Assign empty hit windows to `HoldNoteBody`

It's not a timed object, so following precedent, it should have empty
hitwindows.

This is not actually just aesthetics; several components check whether a
hitobject has empty hitwindows to determine whether to include it on
various HUD displays and results screen components where timed objects
are explicitly involved.
---
 osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
index 92baa25fa9..47163d0d81 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNoteBody.cs
@@ -3,6 +3,7 @@
 
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects
 {
@@ -15,5 +16,6 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class HoldNoteBody : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new HoldNoteBodyJudgement();
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

From 041318e3e8b1e6bc139bdc1d72407c0a90598328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 19:44:46 +0200
Subject: [PATCH 0922/2296] Assign red colour to `ComboBreak` hit result

For a judgement result to show up on the colour hit error meter, it has
to be two things: be scorable, and not be bonus.

`ComboBreak` happens to meet both of those criteria - it impacts score
indirectly via decreasing the combo portion, and isn't bonus. Therefore
it would show up on the colour hit error meter, but because
`OsuColour.ForHitResult()` wasn't handling it explicitly, it was
painting the result in light blue, which isn't ideal for a miss type
judgement. Therefore, use red instead.

There is possibly an argument to be made that this judgement should not
show up on the colour hit error meter at all, but I think it's actually
okay for it to be this way. In any case it doesn't appear to be anything
so major as to warrant blocking the hold note tick removal at this time.
---
 osu.Game/Graphics/OsuColour.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 1b21f79c0a..d0e07a9e66 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -78,6 +78,7 @@ namespace osu.Game.Graphics
                 case HitResult.SmallTickMiss:
                 case HitResult.LargeTickMiss:
                 case HitResult.Miss:
+                case HitResult.ComboBreak:
                     return Red;
 
                 case HitResult.Meh:

From 712564ea4f5b527e6c0ea1a6789a1446e4f0f443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:49:52 +0200
Subject: [PATCH 0923/2296] Enable NRT in `KeyBindingsSubsection`

---
 .../TestSceneChangeAndUseGameplayBindings.cs           |  2 +-
 .../Settings/Sections/Input/KeyBindingsSubsection.cs   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs b/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs
index 5467a64b85..3a3af43cb1 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
         private KeyBindingsSubsection osuBindingSubsection => keyBindingPanel
                                                               .ChildrenOfType<VariantBindingsSubsection>()
-                                                              .FirstOrDefault(s => s.Ruleset.ShortName == "osu");
+                                                              .FirstOrDefault(s => s.Ruleset!.ShortName == "osu");
 
         private OsuButton configureBindingsButton => Game.Settings
                                                          .ChildrenOfType<BindingSettings>().SingleOrDefault()?
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index b138f54644..8285204bb3 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -1,13 +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.
 
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Localisation;
 using osu.Game.Database;
 using osu.Game.Input.Bindings;
@@ -25,9 +25,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// </summary>
         protected virtual bool AutoAdvanceTarget => false;
 
-        protected IEnumerable<Framework.Input.Bindings.KeyBinding> Defaults { get; init; }
+        protected IEnumerable<KeyBinding> Defaults { get; init; } = Array.Empty<KeyBinding>();
 
-        public RulesetInfo Ruleset { get; protected set; }
+        public RulesetInfo? Ruleset { get; protected set; }
 
         private readonly int? variant;
 
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load(RealmAccess realm)
         {
-            string rulesetName = Ruleset?.ShortName;
+            string? rulesetName = Ruleset?.ShortName;
 
             var bindings = realm.Run(r => r.All<RealmKeyBinding>()
                                            .Where(b => b.RulesetName == rulesetName && b.Variant == variant)

From 5ffc25c8e847d97b678de8946676338ed8ba379b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 03:19:43 +0900
Subject: [PATCH 0924/2296] Fix potential failure when slider has no ticks

---
 .../Difficulty/Preprocessing/OsuDifficultyHitObject.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index f37452a79c..959449fdbb 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             double trackingEndTime = Math.Max(Math.Max(
                 slider.StartTime + slider.Duration + SliderEventGenerator.TAIL_LENIENCY,
                 slider.StartTime + slider.Duration / 2
-            ), slider.NestedHitObjects.OfType<SliderTick>().Last().StartTime);
+            ), slider.NestedHitObjects.OfType<SliderTick>().LastOrDefault()?.StartTime ?? double.MinValue);
 
             slider.LazyTravelTime = trackingEndTime - slider.StartTime;
 

From 764f641bc9037c83c769f41230433cf79f1217a2 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 11 Oct 2023 12:47:12 -0700
Subject: [PATCH 0925/2296] Add extended info support to tiny mod switches

---
 .../UserInterface/TestSceneModSwitchTiny.cs   |  60 +++++++++-
 osu.Game/Rulesets/UI/ModSwitchTiny.cs         | 112 ++++++++++++++----
 2 files changed, 146 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs
index 2d953fe9ad..b7cf3fef9b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSwitchTiny.cs
@@ -2,16 +2,19 @@
 // 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.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Rulesets.UI;
@@ -34,6 +37,49 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestMania() => createSwitchTestFor(new ManiaRuleset());
 
+        [Test]
+        public void TestShowRateAdjusts()
+        {
+            AddStep("create mod icons", () =>
+            {
+                Child = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Full,
+                    ChildrenEnumerable = Ruleset.Value.CreateInstance().CreateAllMods()
+                                                .OfType<ModRateAdjust>()
+                                                .SelectMany(m =>
+                                                {
+                                                    List<TestModSwitchTiny> icons = new List<TestModSwitchTiny> { new TestModSwitchTiny(m) };
+
+                                                    for (double i = m.SpeedChange.MinValue; i < m.SpeedChange.MaxValue; i += m.SpeedChange.Precision * 10)
+                                                    {
+                                                        m = (ModRateAdjust)m.DeepClone();
+                                                        m.SpeedChange.Value = i;
+                                                        icons.Add(new TestModSwitchTiny(m, true));
+                                                    }
+
+                                                    return icons;
+                                                }),
+                };
+            });
+
+            AddStep("adjust rates", () =>
+            {
+                foreach (var icon in this.ChildrenOfType<TestModSwitchTiny>())
+                {
+                    if (icon.Mod is ModRateAdjust rateAdjust)
+                    {
+                        rateAdjust.SpeedChange.Value = RNG.NextDouble() > 0.9
+                            ? rateAdjust.SpeedChange.Default
+                            : RNG.NextDouble(rateAdjust.SpeedChange.MinValue, rateAdjust.SpeedChange.MaxValue);
+                    }
+                }
+            });
+
+            AddToggleStep("toggle active", active => this.ChildrenOfType<TestModSwitchTiny>().ForEach(s => s.Active.Value = active));
+        }
+
         private void createSwitchTestFor(Ruleset ruleset)
         {
             AddStep("no colour scheme", () => Child = createContent(ruleset, null));
@@ -43,7 +89,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 AddStep($"{scheme} colour scheme", () => Child = createContent(ruleset, scheme));
             }
 
-            AddToggleStep("toggle active", active => this.ChildrenOfType<ModSwitchTiny>().ForEach(s => s.Active.Value = active));
+            AddToggleStep("toggle active", active => this.ChildrenOfType<TestModSwitchTiny>().ForEach(s => s.Active.Value = active));
         }
 
         private static Drawable createContent(Ruleset ruleset, OverlayColourScheme? colourScheme)
@@ -62,7 +108,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                                                 AutoSizeAxes = Axes.Y,
                                                 Direction = FillDirection.Full,
                                                 Spacing = new Vector2(5),
-                                                ChildrenEnumerable = group.Select(mod => new ModSwitchTiny(mod))
+                                                ChildrenEnumerable = group.Select(mod => new TestModSwitchTiny(mod))
                                             })
             };
 
@@ -81,5 +127,15 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             return switchFlow;
         }
+
+        private partial class TestModSwitchTiny : ModSwitchTiny
+        {
+            public new IMod Mod => base.Mod;
+
+            public TestModSwitchTiny(IMod mod, bool showExtendedInformation = false)
+                : base(mod, showExtendedInformation)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/ModSwitchTiny.cs b/osu.Game/Rulesets/UI/ModSwitchTiny.cs
index a5cf75bd07..a3e325ace8 100644
--- a/osu.Game/Rulesets/UI/ModSwitchTiny.cs
+++ b/osu.Game/Rulesets/UI/ModSwitchTiny.cs
@@ -3,15 +3,16 @@
 
 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.Utils;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.UI
@@ -21,8 +22,10 @@ namespace osu.Game.Rulesets.UI
         public BindableBool Active { get; } = new BindableBool();
 
         public const float DEFAULT_HEIGHT = 30;
+        private const float width = 73;
 
-        private readonly IMod mod;
+        protected readonly IMod Mod;
+        private readonly bool showExtendedInformation;
 
         private readonly Box background;
         private readonly OsuSpriteText acronymText;
@@ -33,33 +36,69 @@ namespace osu.Game.Rulesets.UI
         private Color4 activeBackgroundColour;
         private Color4 inactiveBackgroundColour;
 
-        public ModSwitchTiny(IMod mod)
-        {
-            this.mod = mod;
-            Size = new Vector2(73, DEFAULT_HEIGHT);
+        private readonly CircularContainer extendedContent;
+        private readonly Box extendedBackground;
+        private readonly OsuSpriteText extendedText;
+        private ModSettingChangeTracker? modSettingsChangeTracker;
 
-            InternalChild = new CircularContainer
+        public ModSwitchTiny(IMod mod, bool showExtendedInformation = false)
+        {
+            Mod = mod;
+            this.showExtendedInformation = showExtendedInformation;
+            AutoSizeAxes = Axes.X;
+            Height = DEFAULT_HEIGHT;
+
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                Children = new Drawable[]
+                extendedContent = new CircularContainer
                 {
-                    background = new Box
+                    Name = "extended content",
+                    Width = 100 + DEFAULT_HEIGHT / 2,
+                    RelativeSizeAxes = Axes.Y,
+                    Masking = true,
+                    X = width,
+                    Margin = new MarginPadding { Left = -DEFAULT_HEIGHT },
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                    acronymText = new OsuSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Shadow = false,
-                        Font = OsuFont.Numeric.With(size: 24, weight: FontWeight.Black),
-                        Text = mod.Acronym,
-                        Margin = new MarginPadding
+                        extendedBackground = new Box
                         {
-                            Top = 4
-                        }
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        extendedText = new OsuSpriteText
+                        {
+                            Margin = new MarginPadding { Left = 3 * DEFAULT_HEIGHT / 4 },
+                            Font = OsuFont.Default.With(size: 30f, weight: FontWeight.Bold),
+                            UseFullGlyphHeight = false,
+                            Text = mod.ExtendedIconInformation,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
                     }
+                },
+                new CircularContainer
+                {
+                    Width = width,
+                    RelativeSizeAxes = Axes.Y,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        background = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        },
+                        acronymText = new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Shadow = false,
+                            Font = OsuFont.Numeric.With(size: 24, weight: FontWeight.Black),
+                            Text = mod.Acronym,
+                            Margin = new MarginPadding
+                            {
+                                Top = 4
+                            }
+                        },
+                    },
                 }
             };
         }
@@ -68,7 +107,7 @@ namespace osu.Game.Rulesets.UI
         private void load(OsuColour colours, OverlayColourProvider? colourProvider)
         {
             inactiveBackgroundColour = colourProvider?.Background5 ?? colours.Gray3;
-            activeBackgroundColour = colours.ForModType(mod.Type);
+            activeBackgroundColour = colours.ForModType(Mod.Type);
 
             inactiveForegroundColour = colourProvider?.Background2 ?? colours.Gray5;
             activeForegroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, activeForegroundColour, 0, 1);
@@ -80,12 +119,37 @@ namespace osu.Game.Rulesets.UI
 
             Active.BindValueChanged(_ => updateState(), true);
             FinishTransforms(true);
+
+            if (Mod is Mod actualMod)
+            {
+                modSettingsChangeTracker = new ModSettingChangeTracker(new[] { actualMod });
+                modSettingsChangeTracker.SettingChanged = _ => updateExtendedInformation();
+            }
+
+            updateExtendedInformation();
+        }
+
+        private void updateExtendedInformation()
+        {
+            bool showExtended = showExtendedInformation && !string.IsNullOrEmpty(Mod.ExtendedIconInformation);
+
+            extendedContent.Alpha = showExtended ? 1 : 0;
+            extendedText.Text = Mod.ExtendedIconInformation;
         }
 
         private void updateState()
         {
             acronymText.FadeColour(Active.Value ? activeForegroundColour : inactiveForegroundColour, 200, Easing.OutQuint);
             background.FadeColour(Active.Value ? activeBackgroundColour : inactiveBackgroundColour, 200, Easing.OutQuint);
+
+            extendedText.Colour = Active.Value ? activeBackgroundColour.Lighten(0.2f) : inactiveBackgroundColour;
+            extendedBackground.Colour = Active.Value ? activeBackgroundColour.Darken(2.4f) : inactiveBackgroundColour.Darken(2.8f);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            modSettingsChangeTracker?.Dispose();
         }
     }
 }

From 29eba3c58ac14df176150b8680fb197f1aae7518 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 14:05:06 +0900
Subject: [PATCH 0926/2296] Update framework

---
 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 b3feccbbc0..0575817460 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1006.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1012.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1aa3a23cdc..69675e9c1b 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1006.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
     <PackageReference Include="Sentry" Version="3.39.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index bf772f20f4..9b06b4a6a7 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1006.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1012.0" />
   </ItemGroup>
 </Project>

From 194ad9650dc695a8a6684266cb6b7c99b52b3940 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Oct 2023 18:48:50 +0900
Subject: [PATCH 0927/2296] Remove test scene background stack and use new
 `ChangeBackgroundColour` method

---
 osu.Game/Tests/OsuTestBrowser.cs      | 10 ----------
 osu.Game/Tests/Visual/OsuTestScene.cs |  7 +++++++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs
index 0bc51a0c1e..477ffb2908 100644
--- a/osu.Game/Tests/OsuTestBrowser.cs
+++ b/osu.Game/Tests/OsuTestBrowser.cs
@@ -1,12 +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.Platform;
-using osu.Framework.Screens;
 using osu.Framework.Testing;
-using osu.Game.Graphics;
-using osu.Game.Screens.Backgrounds;
 
 namespace osu.Game.Tests
 {
@@ -16,12 +12,6 @@ namespace osu.Game.Tests
         {
             base.LoadComplete();
 
-            LoadComponentAsync(new ScreenStack(new BackgroundScreenDefault { Colour = OsuColour.Gray(0.5f) })
-            {
-                Depth = 10,
-                RelativeSizeAxes = Axes.Both,
-            }, Add);
-
             // Have to construct this here, rather than in the constructor, because
             // we depend on some dependencies to be loaded within OsuGameBase.load().
             Add(new TestBrowser());
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 3ccb795a57..096917cf4f 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -16,6 +16,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
@@ -23,6 +24,7 @@ using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
+using osu.Game.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
@@ -158,10 +160,15 @@ namespace osu.Game.Tests.Visual
             return Dependencies;
         }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            ChangeBackgroundColour(ColourInfo.GradientVertical(colours.GreyCarmine, colours.GreyCarmineDarker));
+
             var parentBeatmap = Parent.Dependencies.Get<Bindable<WorkingBeatmap>>();
             parentBeatmap.Value = Beatmap.Value;
             Beatmap.BindTo(parentBeatmap);

From 5bb73632c4dfce3c15ee5754d8e0bbfa9381ec6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 14:55:16 +0900
Subject: [PATCH 0928/2296] Show maximum bonus statistics on results screen

Addresses https://github.com/ppy/osu/discussions/25088.
---
 osu.Game/Scoring/ScoreInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 2efea2105c..8531408555 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -346,7 +346,7 @@ namespace osu.Game.Scoring
                     case HitResult.LargeBonus:
                     case HitResult.SmallBonus:
                         if (MaximumStatistics.TryGetValue(r.result, out int count) && count > 0)
-                            yield return new HitResultDisplayStatistic(r.result, value, null, r.displayName);
+                            yield return new HitResultDisplayStatistic(r.result, value, count, r.displayName);
 
                         break;
 

From 256c95f0456721fdd23a27060857f6a0df141a60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 15:42:16 +0900
Subject: [PATCH 0929/2296] Add (failing) test coverage of exit/retry during
 progress to results

---
 .../Navigation/TestSceneScreenNavigation.cs   | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 3acc2f0384..fa1ebf5c56 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -215,6 +215,24 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("retry count is 1", () => player.RestartCount == 1);
         }
 
+        [Test]
+        public void TestRetryImmediatelyAfterCompletion()
+        {
+            var getOriginalPlayer = playToCompletion();
+
+            AddStep("attempt to retry", () => getOriginalPlayer().ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen != getOriginalPlayer() && Game.ScreenStack.CurrentScreen is Player);
+        }
+
+        [Test]
+        public void TestExitImmediatelyAfterCompletion()
+        {
+            var player = playToCompletion();
+
+            AddStep("attempt to exit", () => player().ChildrenOfType<HotkeyExitOverlay>().First().Action());
+            AddUntilStep("wait for results", () => Game.ScreenStack.CurrentScreen is ResultsScreen);
+        }
+
         [Test]
         public void TestRetryFromResults()
         {
@@ -778,6 +796,13 @@ namespace osu.Game.Tests.Visual.Navigation
         }
 
         private Func<Player> playToResults()
+        {
+            var player = playToCompletion();
+            AddUntilStep("wait for results", () => (Game.ScreenStack.CurrentScreen as ResultsScreen)?.IsLoaded == true);
+            return player;
+        }
+
+        private Func<Player> playToCompletion()
         {
             Player player = null;
 
@@ -803,7 +828,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             AddUntilStep("wait for track playing", () => beatmap().Track.IsRunning);
             AddStep("seek to near end", () => player.ChildrenOfType<GameplayClockContainer>().First().Seek(beatmap().Beatmap.HitObjects[^1].StartTime - 1000));
-            AddUntilStep("wait for pass", () => (Game.ScreenStack.CurrentScreen as ResultsScreen)?.IsLoaded == true);
+            AddUntilStep("wait for complete", () => player.GameplayState.HasPassed);
+
             return () => player;
         }
 

From 7c0d4967305a7290e26cb91224b843ae6439b748 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 14:42:45 +0900
Subject: [PATCH 0930/2296] Show results immediately if user hits "back" key
 after finishing gameplay

I've gone ahead and matched the osu!stable behaviour for this, as it
seems like it's what people are used to and they will settle for no
less.

Closes https://github.com/ppy/osu/issues/18089.
---
 osu.Game/Screens/Play/Player.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 91131b0aba..66b4b306f3 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -601,8 +601,13 @@ namespace osu.Game.Screens.Play
                 }
             }
 
-            // if an exit has been requested, cancel any pending completion (the user has shown intention to exit).
-            resultsDisplayDelegate?.Cancel();
+            // Matching osu!stable behaviour, if the results screen is pending and the user requests an exit,
+            // show the results instead.
+            if (resultsDisplayDelegate != null)
+            {
+                progressToResults(false);
+                return;
+            }
 
             // import current score if possible.
             prepareAndImportScoreAsync();

From 242a41371c10503b9221b4b16db8ec98bbfc1bdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 15:42:50 +0900
Subject: [PATCH 0931/2296] Fix `HotkeyOverlay` fade out occurring when exit is
 blocked

---
 osu.Game/Screens/Play/Player.cs | 39 ++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 66b4b306f3..ad796744fc 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -279,8 +279,10 @@ namespace osu.Game.Screens.Play
                     {
                         if (!this.IsCurrentScreen()) return;
 
-                        fadeOut(true);
-                        PerformExit(false);
+                        if (PerformExit(false))
+                            // The hotkey overlay dims the screen.
+                            // If the operation succeeds, we want to make sure we stay dimmed to keep continuity.
+                            fadeOut(true);
                     },
                 },
             });
@@ -298,8 +300,10 @@ namespace osu.Game.Screens.Play
                         {
                             if (!this.IsCurrentScreen()) return;
 
-                            fadeOut(true);
-                            Restart(true);
+                            if (Restart(true))
+                                // The hotkey overlay dims the screen.
+                                // If the operation succeeds, we want to make sure we stay dimmed to keep continuity.
+                                fadeOut(true);
                         },
                     },
                 });
@@ -565,7 +569,8 @@ namespace osu.Game.Screens.Play
         /// Whether the pause or fail dialog should be shown before performing an exit.
         /// If <see langword="true"/> and a dialog is not yet displayed, the exit will be blocked and the relevant dialog will display instead.
         /// </param>
-        protected void PerformExit(bool showDialogFirst)
+        /// <returns>Whether this call resulted in a final exit.</returns>
+        protected bool PerformExit(bool showDialogFirst)
         {
             // 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).
@@ -576,7 +581,7 @@ namespace osu.Game.Screens.Play
                 // in the potential case that this instance has already been exited, this is required to avoid a crash.
                 if (this.GetChildScreen() != null)
                     this.MakeCurrent();
-                return;
+                return true;
             }
 
             bool pauseOrFailDialogVisible =
@@ -588,7 +593,7 @@ namespace osu.Game.Screens.Play
                 if (ValidForResume && GameplayState.HasFailed)
                 {
                     failAnimationContainer.FinishTransforms(true);
-                    return;
+                    return false;
                 }
 
                 // even if this call has requested a dialog, there is a chance the current player mode doesn't support pausing.
@@ -597,16 +602,16 @@ namespace osu.Game.Screens.Play
                     // in the case a dialog needs to be shown, attempt to pause and show it.
                     // this may fail (see internal checks in Pause()) but the fail cases are temporary, so don't fall through to Exit().
                     Pause();
-                    return;
+                    return false;
                 }
             }
 
             // Matching osu!stable behaviour, if the results screen is pending and the user requests an exit,
             // show the results instead.
-            if (resultsDisplayDelegate != null)
+            if (resultsDisplayDelegate != null && !isRestarting)
             {
                 progressToResults(false);
-                return;
+                return false;
             }
 
             // import current score if possible.
@@ -617,6 +622,7 @@ namespace osu.Game.Screens.Play
             // - the pause / fail dialog was requested but is already displayed (user showing intention to exit).
             // - the pause / fail dialog was requested but couldn't be displayed due to the type or state of this Player instance.
             this.Exit();
+            return true;
         }
 
         private void performUserRequestedSkip()
@@ -665,10 +671,10 @@ namespace osu.Game.Screens.Play
         /// <remarks>This can be called from a child screen in order to trigger the restart process.</remarks>
         /// </summary>
         /// <param name="quickRestart">Whether a quick restart was requested (skipping intro etc.).</param>
-        public void Restart(bool quickRestart = false)
+        public bool Restart(bool quickRestart = false)
         {
             if (!Configuration.AllowRestart)
-                return;
+                return false;
 
             isRestarting = true;
 
@@ -678,7 +684,7 @@ namespace osu.Game.Screens.Play
 
             RestartRequested?.Invoke(quickRestart);
 
-            PerformExit(false);
+            return PerformExit(false);
         }
 
         /// <summary>
@@ -1205,8 +1211,11 @@ namespace osu.Game.Screens.Play
             float fadeOutDuration = instant ? 0 : 250;
             this.FadeOut(fadeOutDuration);
 
-            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
-            storyboardReplacesBackground.Value = false;
+            if (this.IsCurrentScreen())
+            {
+                ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+                storyboardReplacesBackground.Value = false;
+            }
         }
 
         #endregion

From 73b81467298301dc47d35d3b23c033f28c4b2664 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 14:49:07 +0900
Subject: [PATCH 0932/2296] Update tests in line with new behaviour

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 283866bef2..09f729e468 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("disable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, false));
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
-            AddAssert("player exited", () => Stack.CurrentScreen == null);
+            AddUntilStep("reached results screen", () => Stack.CurrentScreen is ResultsScreen);
         }
 
         [Test]

From 3023e4419607de57f8605a1c27f3a6274a3b45f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 15:52:48 +0900
Subject: [PATCH 0933/2296] Remove unused using statements

---
 .../Visual/UserInterface/TestSceneNotificationOverlay.cs       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 332053d71e..114c070acc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -4,9 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -14,7 +12,6 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;

From 55a9de034d9d79d8b9d9818e55ea914f8ab29e59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 16:00:23 +0900
Subject: [PATCH 0934/2296] Change `NotificationOverlay` type based logic to
 not require specifying every type of notification

---
 osu.Game/Overlays/NotificationOverlay.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 67cf868fb0..dd4924d07a 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -113,7 +113,8 @@ namespace osu.Game.Overlays
                                     RelativeSizeAxes = Axes.X,
                                     Children = new[]
                                     {
-                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(SimpleNotification), typeof(UserAvatarNotification) }),
+                                        // The main section adds as a catch-all for notifications which don't group into other sections.
+                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(Notification) }),
                                         new NotificationSection(NotificationsStrings.RunningTasks, new[] { typeof(ProgressNotification) }),
                                     }
                                 }
@@ -205,7 +206,7 @@ namespace osu.Game.Overlays
             var ourType = notification.GetType();
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
 
-            var section = sections.Children.First(s => s.AcceptedNotificationTypes.Any(accept => accept.IsAssignableFrom(ourType)));
+            var section = sections.Children.Last(s => s.AcceptedNotificationTypes.Any(accept => accept.IsAssignableFrom(ourType)));
 
             section.Add(notification, depth);
 

From e6103fea95ed8bffde81ca16bfd4da2631c91ad4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 16:00:36 +0900
Subject: [PATCH 0935/2296] Fix `async` usage in `TestSceneNotificationOverlay`

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 114c070acc..c584c7dba0 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -541,9 +542,9 @@ namespace osu.Game.Tests.Visual.UserInterface
             progressingNotifications.Add(n);
         }
 
-        private async void sendUserNotification()
+        private void sendUserNotification()
         {
-            var user = await userLookupCache.GetUserAsync(0).ConfigureAwait(true);
+            var user = userLookupCache.GetUserAsync(0).GetResultSafely();
             if (user == null) return;
 
             var n = new UserAvatarNotification(user, $"{user.Username} invited you to a multiplayer match!");

From aee8ba789c1f4f022eaa3abf90173afce1fcc591 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 16:02:19 +0900
Subject: [PATCH 0936/2296] Tidy up `UserAvatarNotification` implementation

---
 .../Overlays/Notifications/Notification.cs    |  4 +-
 .../Notifications/UserAvatarNotification.cs   | 39 ++++++++-----------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 8cdc373417..d619d1d3c3 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -53,6 +53,8 @@ namespace osu.Game.Overlays.Notifications
         public virtual string PopInSampleName => "UI/notification-default";
         public virtual string PopOutSampleName => "UI/overlay-pop-out";
 
+        protected const float CORNER_RADIUS = 6;
+
         protected NotificationLight Light;
 
         protected Container IconContent;
@@ -128,7 +130,7 @@ namespace osu.Game.Overlays.Notifications
                     AutoSizeAxes = Axes.Y,
                 }.WithChild(MainContent = new Container
                 {
-                    CornerRadius = 6,
+                    CornerRadius = CORNER_RADIUS,
                     Masking = true,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
diff --git a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
index af881a5008..04766f7743 100644
--- a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
+++ b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
@@ -39,39 +39,34 @@ namespace osu.Game.Overlays.Notifications
             Text = text;
         }
 
-        private DrawableAvatar? avatar;
-
         protected override IconUsage CloseButtonIcon => FontAwesome.Solid.Times;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            IconContent.Masking = true;
-
-            // Workaround for the corner radius on parent's mask breaking if we add masking to IconContent
-            IconContent.CornerRadius = 6;
-
-            IconContent.AddRange(new Drawable[]
-            {
-                new Box()
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background5,
-                },
-            });
-
-            avatar = new DrawableAvatar(user)
-            {
-                FillMode = FillMode.Fill,
-            };
-            LoadComponentAsync(avatar, IconContent.Add);
-
             Content.Add(textDrawable = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 14, weight: FontWeight.Medium))
             {
                 AutoSizeAxes = Axes.Y,
                 RelativeSizeAxes = Axes.X,
                 Text = text
             });
+
+            IconContent.Masking = true;
+            IconContent.CornerRadius = CORNER_RADIUS;
+
+            IconContent.AddRange(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background5,
+                },
+            });
+
+            LoadComponentAsync(new DrawableAvatar(user)
+            {
+                FillMode = FillMode.Fill,
+            }, IconContent.Add);
         }
     }
 }

From 20f32e2025a3d992bdd1b4b75eeb9360ea9932fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 16:05:48 +0900
Subject: [PATCH 0937/2296] Add light colouring for user notifications and
 adjust lighting slightly

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

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index d619d1d3c3..8108861dca 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -473,10 +473,9 @@ namespace osu.Game.Overlays.Notifications
                     base.Colour = value;
                     pulsateLayer.EdgeEffect = new EdgeEffectParameters
                     {
-                        Colour = ((Color4)value).Opacity(0.5f), //todo: avoid cast
+                        Colour = ((Color4)value).Opacity(0.18f),
                         Type = EdgeEffectType.Glow,
-                        Radius = 12,
-                        Roundness = 12,
+                        Radius = 14,
                     };
                 }
             }
diff --git a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
index 04766f7743..5a9241a2a1 100644
--- a/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
+++ b/osu.Game/Overlays/Notifications/UserAvatarNotification.cs
@@ -42,8 +42,10 @@ namespace osu.Game.Overlays.Notifications
         protected override IconUsage CloseButtonIcon => FontAwesome.Solid.Times;
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OsuColour colours, OverlayColourProvider colourProvider)
         {
+            Light.Colour = colours.Orange2;
+
             Content.Add(textDrawable = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 14, weight: FontWeight.Medium))
             {
                 AutoSizeAxes = Axes.Y,

From a512ef56379637181bd0eab2393295d5608d9726 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:41:31 +0900
Subject: [PATCH 0938/2296] Add exceptions to online state handling

---
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs | 5 ++++-
 osu.Game/Users/UserPanel.cs                            | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 5047992c8b..02f0a6e80d 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Overlays.Dashboard
                     {
                         users.GetUserAsync(userId).ContinueWith(task =>
                         {
-                            var user = task.GetResultSafely();
+                            APIUser user = task.GetResultSafely();
 
                             if (user == null)
                                 return;
@@ -130,6 +130,9 @@ namespace osu.Game.Overlays.Dashboard
                                 if (!playingUsers.Contains(user.Id))
                                     return;
 
+                                // TODO: remove this once online state is being updated more correctly.
+                                user.IsOnline = true;
+
                                 userFlow.Add(createUserPanel(user));
                             });
                         });
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 98b306e264..273faf9bd1 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -123,7 +123,8 @@ namespace osu.Game.Users
                 }
 
                 if (
-                    User.IsOnline &&
+                    // TODO: uncomment this once lazer / osu-web is updating online states
+                    // User.IsOnline &&
                     multiplayerClient?.Room != null &&
                     multiplayerClient.Room.Users.All(u => u.UserID != User.Id)
                 )

From 94d7a65e4062578ac13b96da10e9dc3c70b67899 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:42:02 +0900
Subject: [PATCH 0939/2296] Schedule `Join` operations rather than using
 `OnLoadComplete` for added safety

---
 osu.Game/OsuGame.cs                           | 11 +++---
 .../OnlinePlay/Lounge/LoungeSubScreen.cs      | 37 ++++++++++---------
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  5 +--
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    |  4 +-
 4 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5372f9227f..ecf27cd116 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -654,14 +654,13 @@ namespace osu.Game
         {
             PerformFromScreen(screen =>
             {
-                Multiplayer multiplayer = new Multiplayer();
-                multiplayer.OnLoadComplete += _ =>
-                {
-                    multiplayer.Join(room, password);
-                };
+                if (!(screen is Multiplayer multiplayer))
+                    screen.Push(multiplayer = new Multiplayer());
 
-                screen.Push(multiplayer);
+                multiplayer.Join(room, password);
             });
+            // TODO: We should really be able to use `validScreens: new[] { typeof(Multiplayer) }` here
+            // but `PerformFromScreen` doesn't understand nested stacks.
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index fc4a5357c6..04ea59621d 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -297,26 +297,29 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             popoverContainer.HidePopover();
         }
 
-        public virtual void Join(Room room, string password, Action<Room> onSuccess = null, Action<string> onFailure = null) => Schedule(() =>
+        public void Join(Room room, string password, Action<Room> onSuccess = null, Action<string> onFailure = null)
         {
-            if (joiningRoomOperation != null)
-                return;
-
-            joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
-
-            RoomManager?.JoinRoom(room, password, _ =>
+            Schedule(() =>
             {
-                Open(room);
-                joiningRoomOperation?.Dispose();
-                joiningRoomOperation = null;
-                onSuccess?.Invoke(room);
-            }, error =>
-            {
-                joiningRoomOperation?.Dispose();
-                joiningRoomOperation = null;
-                onFailure?.Invoke(error);
+                if (joiningRoomOperation != null)
+                    return;
+
+                joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
+
+                RoomManager?.JoinRoom(room, password, _ =>
+                {
+                    Open(room);
+                    joiningRoomOperation?.Dispose();
+                    joiningRoomOperation = null;
+                    onSuccess?.Invoke(room);
+                }, error =>
+                {
+                    joiningRoomOperation?.Dispose();
+                    joiningRoomOperation = null;
+                    onFailure?.Invoke(error);
+                });
             });
-        });
+        }
 
         /// <summary>
         /// Copies a room and opens it as a fresh (not-yet-created) one.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index f899b24d30..edf5ce276a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -91,10 +91,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override LoungeSubScreen CreateLounge() => new MultiplayerLoungeSubScreen();
 
-        public void Join(Room room, string? password)
-        {
-            Lounge.Join(room, password);
-        }
+        public void Join(Room room, string? password) => Schedule(() => Lounge.Join(room, password));
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 57e388f016..88bbff6b92 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Screens.OnlinePlay
         [Cached]
         protected readonly OverlayColourProvider ColourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);
 
+        public IScreen CurrentSubScreen => screenStack.CurrentScreen;
+
         public override bool CursorVisible => (screenStack?.CurrentScreen as IOnlinePlaySubScreen)?.CursorVisible ?? true;
 
         // this is required due to PlayerLoader eventually being pushed to the main stack
@@ -225,8 +227,6 @@ namespace osu.Game.Screens.OnlinePlay
                 ((IBindable<UserActivity>)Activity).BindTo(newOsuScreen.Activity);
         }
 
-        public IScreen CurrentSubScreen => screenStack.CurrentScreen;
-
         protected abstract string ScreenTitle { get; }
 
         protected virtual RoomManager CreateRoomManager() => new RoomManager();

From cde4fad61027010d411e444b25ac0d111db16dce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:55:14 +0900
Subject: [PATCH 0940/2296] Simplify `async` lookup logic in `Invited` handling

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 8b4c38a152..6ba7953c8d 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -11,7 +11,6 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Development;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Database;
@@ -447,13 +446,8 @@ namespace osu.Game.Online.Multiplayer
 
         async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password)
         {
-            var loadUserTask = userLookupCache.GetUserAsync(invitedBy);
-            var loadRoomTask = lookupRoom(roomID);
-
-            await Task.WhenAll(loadUserTask, loadRoomTask).ConfigureAwait(false);
-
-            APIUser? apiUser = loadUserTask.GetResultSafely();
-            Room? apiRoom = loadRoomTask.GetResultSafely();
+            APIUser? apiUser = await userLookupCache.GetUserAsync(invitedBy);
+            Room? apiRoom = await lookupRoom(roomID);
 
             if (apiUser == null || apiRoom == null) return;
 

From a1a9bb75b79097e3abace2fa2e533ef031c73848 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:55:58 +0900
Subject: [PATCH 0941/2296] Remove unnecessary schedule logic

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 6ba7953c8d..3f4a26bf6c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -451,19 +451,16 @@ namespace osu.Game.Online.Multiplayer
 
             if (apiUser == null || apiRoom == null) return;
 
-            Scheduler.Add(() =>
-            {
-                PostNotification?.Invoke(
-                    new UserAvatarNotification(apiUser, $"{apiUser.Username} invited you to a multiplayer match:\"{apiRoom.Name}\"!")
+            PostNotification?.Invoke(
+                new UserAvatarNotification(apiUser, $"{apiUser.Username} invited you to a multiplayer match:\"{apiRoom.Name}\"!")
+                {
+                    Activated = () =>
                     {
-                        Activated = () =>
-                        {
-                            InviteAccepted?.Invoke(apiRoom, password);
-                            return true;
-                        }
+                        InviteAccepted?.Invoke(apiRoom, password);
+                        return true;
                     }
-                );
-            });
+                }
+            );
         }
 
         private Task<Room?> lookupRoom(long id)

From d2aa601912c3cd75fd8d28491e06584b493b0294 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:59:08 +0900
Subject: [PATCH 0942/2296] Allow localisation of the invite notification

---
 osu.Game/Localisation/NotificationsStrings.cs    | 5 +++++
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
index 53687f2b28..9cb286bc91 100644
--- a/osu.Game/Localisation/NotificationsStrings.cs
+++ b/osu.Game/Localisation/NotificationsStrings.cs
@@ -93,6 +93,11 @@ Please try changing your audio device to a working setting.");
         /// </summary>
         public static LocalisableString YourNameWasMentioned(string username) => new TranslatableString(getKey(@"your_name_was_mentioned"), @"Your name was mentioned in chat by '{0}'. Click to find out why!", username);
 
+        /// <summary>
+        /// "{0} invited you to the multiplayer match &quot;{1}&quot;! Click to join."
+        /// </summary>
+        public static LocalisableString InvitedYouToTheMultiplayer(string username, string roomName) => new TranslatableString(getKey(@"invited_you_to_the_multiplayer"), @"{0} invited you to the multiplayer match ""{1}""! Click to join.", username, roomName);
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 3f4a26bf6c..e8653b86be 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -23,6 +23,7 @@ using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Utils;
+using osu.Game.Localisation;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -452,7 +453,7 @@ namespace osu.Game.Online.Multiplayer
             if (apiUser == null || apiRoom == null) return;
 
             PostNotification?.Invoke(
-                new UserAvatarNotification(apiUser, $"{apiUser.Username} invited you to a multiplayer match:\"{apiRoom.Name}\"!")
+                new UserAvatarNotification(apiUser, NotificationsStrings.InvitedYouToTheMultiplayer(apiUser.Username, apiRoom.Name.Value))
                 {
                     Activated = () =>
                     {

From 361d70f68affb6e422edc9cc521be89d66a0a66c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 17:59:47 +0900
Subject: [PATCH 0943/2296] Rename callback to match standards

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 4 ++--
 osu.Game/OsuGame.cs                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index e8653b86be..978eee505c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Online.Multiplayer
     {
         public Action<Notification>? PostNotification { protected get; set; }
 
-        public Action<Room, string>? InviteAccepted { protected get; set; }
+        public Action<Room, string>? PresentMatch { protected get; set; }
 
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
@@ -457,7 +457,7 @@ namespace osu.Game.Online.Multiplayer
                 {
                     Activated = () =>
                     {
-                        InviteAccepted?.Invoke(apiRoom, password);
+                        PresentMatch?.Invoke(apiRoom, password);
                         return true;
                     }
                 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ecf27cd116..885077a8e8 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -873,7 +873,7 @@ namespace osu.Game
             ScoreManager.PresentImport = items => PresentScore(items.First().Value);
 
             MultiplayerClient.PostNotification = n => Notifications.Post(n);
-            MultiplayerClient.InviteAccepted = PresentMultiplayerMatch;
+            MultiplayerClient.PresentMatch = PresentMultiplayerMatch;
 
             // 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.

From 5f62c225bf7e7b03950aa931962a2fc168216ffe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 18:07:03 +0900
Subject: [PATCH 0944/2296] Ad localisation (and adjust messaging) of invite
 failures

---
 osu.Game/Localisation/OnlinePlayStrings.cs            | 10 ++++++++++
 .../Online/Multiplayer/OnlineMultiplayerClient.cs     | 11 +++--------
 osu.Game/Online/Multiplayer/UserBlockedException.cs   |  2 +-
 osu.Game/Online/Multiplayer/UserBlocksPMsException.cs |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Localisation/OnlinePlayStrings.cs b/osu.Game/Localisation/OnlinePlayStrings.cs
index 1853cb753a..1918519d36 100644
--- a/osu.Game/Localisation/OnlinePlayStrings.cs
+++ b/osu.Game/Localisation/OnlinePlayStrings.cs
@@ -14,6 +14,16 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString SupporterOnlyDurationNotice => new TranslatableString(getKey(@"supporter_only_duration_notice"), @"Playlist durations longer than 2 weeks require an active osu!supporter tag.");
 
+        /// <summary>
+        /// "Can&#39;t invite this user as you have blocked them or they have blocked you."
+        /// </summary>
+        public static LocalisableString InviteFailedUserBlocked => new TranslatableString(getKey(@"cant_invite_this_user_as"), @"Can't invite this user as you have blocked them or they have blocked you.");
+
+        /// <summary>
+        /// "Can&#39;t invite this user as they have opted out of non-friend communications."
+        /// </summary>
+        public static LocalisableString InviteFailedUserOptOut => new TranslatableString(getKey(@"cant_invite_this_user_as1"), @"Can't invite this user as they have opted out of non-friend communications.");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 08e82f2ad3..20ec030eac 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -13,6 +13,7 @@ using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Localisation;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -124,17 +125,11 @@ namespace osu.Game.Online.Multiplayer
                 switch (exception.GetHubExceptionMessage())
                 {
                     case UserBlockedException.MESSAGE:
-                        PostNotification?.Invoke(new SimpleErrorNotification
-                        {
-                            Text = "User cannot be invited by someone they have blocked or are blocked by."
-                        });
+                        PostNotification?.Invoke(new SimpleErrorNotification { Text = OnlinePlayStrings.InviteFailedUserBlocked });
                         break;
 
                     case UserBlocksPMsException.MESSAGE:
-                        PostNotification?.Invoke(new SimpleErrorNotification
-                        {
-                            Text = "User cannot be invited because they cannot receive private messages from people not on their friends list."
-                        });
+                        PostNotification?.Invoke(new SimpleErrorNotification { Text = OnlinePlayStrings.InviteFailedUserOptOut });
                         break;
                 }
             }
diff --git a/osu.Game/Online/Multiplayer/UserBlockedException.cs b/osu.Game/Online/Multiplayer/UserBlockedException.cs
index f2b69411c7..e964b13c75 100644
--- a/osu.Game/Online/Multiplayer/UserBlockedException.cs
+++ b/osu.Game/Online/Multiplayer/UserBlockedException.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Online.Multiplayer
     [Serializable]
     public class UserBlockedException : HubException
     {
-        public const string MESSAGE = "User cannot be invited by someone they have blocked or are blocked by.";
+        public const string MESSAGE = @"Cannot perform action due to user being blocked.";
 
         public UserBlockedException()
             : base(MESSAGE)
diff --git a/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
index 0fd4e1f0c1..14ed6fc212 100644
--- a/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
+++ b/osu.Game/Online/Multiplayer/UserBlocksPMsException.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Online.Multiplayer
     [Serializable]
     public class UserBlocksPMsException : HubException
     {
-        public const string MESSAGE = "User cannot be invited because they have disabled private messages.";
+        public const string MESSAGE = "Cannot perform action because user has disabled non-friend communications.";
 
         public UserBlocksPMsException()
             : base(MESSAGE)

From a591af2b9754af0cd09ad5b1c1e28b2f07235c19 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 18:11:04 +0900
Subject: [PATCH 0945/2296] Fix too many tasks in `lookupRoom` method

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 978eee505c..dd131ee2e6 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -448,7 +448,7 @@ namespace osu.Game.Online.Multiplayer
         async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password)
         {
             APIUser? apiUser = await userLookupCache.GetUserAsync(invitedBy);
-            Room? apiRoom = await lookupRoom(roomID);
+            Room? apiRoom = await getRoomAsync(roomID);
 
             if (apiUser == null || apiRoom == null) return;
 
@@ -462,23 +462,19 @@ namespace osu.Game.Online.Multiplayer
                     }
                 }
             );
-        }
 
-        private Task<Room?> lookupRoom(long id)
-        {
-            return Task.Run(() =>
+            Task<Room?> getRoomAsync(long id)
             {
-                var t = new TaskCompletionSource<Room?>();
+                TaskCompletionSource<Room?> taskCompletionSource = new TaskCompletionSource<Room?>();
+
                 var request = new GetRoomRequest(id);
-
-                request.Success += room => t.TrySetResult(room);
-
-                request.Failure += e => t.TrySetResult(null);
+                request.Success += room => taskCompletionSource.TrySetResult(room);
+                request.Failure += _ => taskCompletionSource.TrySetResult(null);
 
                 API.Queue(request);
 
-                return t.Task;
-            });
+                return taskCompletionSource.Task;
+            }
         }
 
         private void addUserToAPIRoom(MultiplayerRoomUser user)

From e48c4fa430ca938b9c3648f906ac36525d770a32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 18:15:15 +0900
Subject: [PATCH 0946/2296] Add missing `ConfigureAwait` calls

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index dd131ee2e6..515a0dda08 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -447,8 +447,8 @@ namespace osu.Game.Online.Multiplayer
 
         async Task IMultiplayerClient.Invited(int invitedBy, long roomID, string password)
         {
-            APIUser? apiUser = await userLookupCache.GetUserAsync(invitedBy);
-            Room? apiRoom = await getRoomAsync(roomID);
+            APIUser? apiUser = await userLookupCache.GetUserAsync(invitedBy).ConfigureAwait(false);
+            Room? apiRoom = await getRoomAsync(roomID).ConfigureAwait(false);
 
             if (apiUser == null || apiRoom == null) return;
 

From a42e75452ecfd88fb065eda4357a98dbc0c390c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 11:16:51 +0200
Subject: [PATCH 0947/2296] Remove remaining usages of `LargeTickHit` in mania

---
 .../Judgements/ManiaJudgement.cs                    |  6 ------
 osu.Game.Rulesets.Mania/ManiaRuleset.cs             | 13 -------------
 2 files changed, 19 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
index d28b7bdf58..2b75bcdc3d 100644
--- a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs
@@ -12,12 +12,6 @@ namespace osu.Game.Rulesets.Mania.Judgements
         {
             switch (result)
             {
-                case HitResult.LargeTickHit:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.1;
-
-                case HitResult.LargeTickMiss:
-                    return -DEFAULT_MAX_HEALTH_INCREASE * 0.1;
-
                 case HitResult.Meh:
                     return -DEFAULT_MAX_HEALTH_INCREASE * 0.5;
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index b977c07dfb..ff34b69d19 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -385,22 +385,9 @@ namespace osu.Game.Rulesets.Mania
                 HitResult.Good,
                 HitResult.Ok,
                 HitResult.Meh,
-
-                HitResult.LargeTickHit,
             };
         }
 
-        public override LocalisableString GetDisplayNameForHitResult(HitResult result)
-        {
-            switch (result)
-            {
-                case HitResult.LargeTickHit:
-                    return "hold tick";
-            }
-
-            return base.GetDisplayNameForHitResult(result);
-        }
-
         public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
         {
             new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)

From fc1287b4c695d821465984f0a2835e17e6ad0f02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 18:25:20 +0900
Subject: [PATCH 0948/2296] Reword xmldoc on invite method to better describe
 what is happening

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

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index ba9e8a237c..327fb0d76a 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Online.Multiplayer
         Task UserKicked(MultiplayerRoomUser user);
 
         /// <summary>
-        /// Signals that a user has been invited into a multiplayer room.
+        /// Signals that the local user has been invited into a multiplayer room.
         /// </summary>
         /// <param name="invitedBy">Id of user that invited the player.</param>
         /// <param name="roomID">Id of the room the user got invited to.</param>

From 34bab38e80bb2bc410b9ef2cb876ca0d2020a4a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 11:34:59 +0200
Subject: [PATCH 0949/2296] Fix judgement counter test failure due to
 exploiting mania ruleset

Large ticks are not a thing in mania anymore, so the judgement counter
tests began to fail as `LargeTickHit` is no longer a valid hit result
in that ruleset.
---
 osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
index f117569657..dae6dc7b4b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
@@ -11,8 +11,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania;
 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.JudgementCounter;
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             };
         });
 
-        protected override Ruleset CreateRuleset() => new ManiaRuleset();
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
 
         private void applyOneJudgement(HitResult result)
         {

From 1ce268be3fe04c62b0bdae4ed100aa07011d500e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 18:58:42 +0900
Subject: [PATCH 0950/2296] Update some packages to match
 `osu.Server.Spectator`

---
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj |  2 +-
 osu.Game/osu.Game.csproj                       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index febe353b81..5de21a68d0 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
     <PackageReference Include="nunit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 69675e9c1b..f0a4b38c03 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,13 +21,13 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="AutoMapper" Version="12.0.1" />
     <PackageReference Include="DiffPlex" Version="1.7.1" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.53" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
-    <PackageReference Include="MessagePack" Version="2.5.124" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.11" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.11" />
+    <PackageReference Include="MessagePack" Version="2.5.129" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.12" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.12" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.12" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.12" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
@@ -38,8 +38,8 @@
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
-    <PackageReference Include="Sentry" Version="3.39.1" />
-    <PackageReference Include="SharpCompress" Version="0.33.0" />
+    <PackageReference Include="Sentry" Version="3.40.0" />
+    <PackageReference Include="SharpCompress" Version="0.34.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.6" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 32eda99c3a985fb88ba59cbffe0627eaab724b7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 19:06:19 +0900
Subject: [PATCH 0951/2296] Add missing xmldoc returns

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ad796744fc..54693a95cc 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -671,6 +671,7 @@ namespace osu.Game.Screens.Play
         /// <remarks>This can be called from a child screen in order to trigger the restart process.</remarks>
         /// </summary>
         /// <param name="quickRestart">Whether a quick restart was requested (skipping intro etc.).</param>
+        /// <returns>Whether this call resulted in a restart.</returns>
         public bool Restart(bool quickRestart = false)
         {
             if (!Configuration.AllowRestart)

From d174a6ce613c39efd24ec8167288a453d58dd90f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 19:09:43 +0900
Subject: [PATCH 0952/2296] Remove dead code which was only there for the
 exit-specific scenario

---
 osu.Game/Screens/Play/Player.cs       | 38 ++++++++++++---------------
 osu.Game/Screens/Play/PlayerLoader.cs |  2 ++
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 54693a95cc..50ebe8cd86 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -572,18 +572,6 @@ namespace osu.Game.Screens.Play
         /// <returns>Whether this call resulted in a final exit.</returns>
         protected bool PerformExit(bool showDialogFirst)
         {
-            // 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())
-            {
-                ValidForResume = false;
-
-                // in the potential case that this instance has already been exited, this is required to avoid a crash.
-                if (this.GetChildScreen() != null)
-                    this.MakeCurrent();
-                return true;
-            }
-
             bool pauseOrFailDialogVisible =
                 PauseOverlay.State.Value == Visibility.Visible || FailOverlay.State.Value == Visibility.Visible;
 
@@ -617,11 +605,16 @@ namespace osu.Game.Screens.Play
             // import current score if possible.
             prepareAndImportScoreAsync();
 
-            // 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).
-            // - the pause / fail dialog was requested but couldn't be displayed due to the type or state of this Player instance.
-            this.Exit();
+            // Screen may not be current if a restart has been performed.
+            if (this.IsCurrentScreen())
+            {
+                // 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).
+                // - the pause / fail dialog was requested but couldn't be displayed due to the type or state of this Player instance.
+                this.Exit();
+            }
+
             return true;
         }
 
@@ -741,9 +734,6 @@ namespace osu.Game.Screens.Play
             // is no chance that a user could return to the (already completed) Player instance from a child screen.
             ValidForResume = false;
 
-            if (!Configuration.ShowResults)
-                return;
-
             bool storyboardStillRunning = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
 
             // If the current beatmap has a storyboard, this method will be called again on storyboard completion.
@@ -766,10 +756,16 @@ namespace osu.Game.Screens.Play
         /// <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)
         {
-            resultsDisplayDelegate?.Cancel();
+            if (!Configuration.ShowResults)
+                return;
+
+            // Setting this early in the process means that even if something were to go wrong in the order of events following, there
+            // is no chance that a user could return to the (already completed) Player instance from a child screen.
+            ValidForResume = false;
 
             double delay = withDelay ? RESULTS_DISPLAY_DELAY : 0;
 
+            resultsDisplayDelegate?.Cancel();
             resultsDisplayDelegate = new ScheduledDelegate(() =>
             {
                 if (prepareScoreForDisplayTask == null)
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 4054e456b9..681189d184 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -414,6 +414,8 @@ namespace osu.Game.Screens.Play
             quickRestart = quickRestartRequested;
             hideOverlays = true;
             ValidForResume = true;
+
+            this.MakeCurrent();
         }
 
         private void contentIn()

From fa47309eeffbeba428af323b1ce317f4b761b63f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 19:26:32 +0900
Subject: [PATCH 0953/2296] Fix exit key during storyboard outro not
 progressing to results

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs           | 4 ++--
 osu.Game/Screens/Play/Player.cs                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 09f729e468..98825b27d4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -72,12 +72,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestStoryboardExitDuringOutroStillExits()
+        public void TestStoryboardExitDuringOutroProgressesToResults()
         {
             CreateTest();
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
-            AddAssert("player exited", () => !Player.IsCurrentScreen() && Player.GetChildScreen() == null);
+            AddUntilStep("reached results screen", () => Stack.CurrentScreen is ResultsScreen);
         }
 
         [TestCase(false)]
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 50ebe8cd86..97bfa35d49 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -596,7 +596,7 @@ namespace osu.Game.Screens.Play
 
             // Matching osu!stable behaviour, if the results screen is pending and the user requests an exit,
             // show the results instead.
-            if (resultsDisplayDelegate != null && !isRestarting)
+            if (GameplayState.HasPassed && !isRestarting)
             {
                 progressToResults(false);
                 return false;

From 3849b1164436d227f2418a645d062c96711934e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2023 19:48:45 +0900
Subject: [PATCH 0954/2296] Fix "Hard Rock" mod affecting CS/AR in osu!mania

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

Not sure if there are other exceptions we should account for here.
---
 osu.Game.Rulesets.Catch/Mods/CatchModHardRock.cs | 9 +++++++++
 osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs     | 9 +++++++++
 osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs | 3 +++
 osu.Game/Rulesets/Mods/ModHardRock.cs            | 9 ++++-----
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHardRock.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHardRock.cs
index 93eadcc13e..62fded0980 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHardRock.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHardRock.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 osu.Game.Rulesets.Mods;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Beatmaps;
@@ -16,5 +17,13 @@ namespace osu.Game.Rulesets.Catch.Mods
             var catchProcessor = (CatchBeatmapProcessor)beatmapProcessor;
             catchProcessor.HardRockOffsets = true;
         }
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            base.ApplyToDifficulty(difficulty);
+
+            difficulty.CircleSize = Math.Min(difficulty.CircleSize * 1.3f, 10.0f); // CS uses a custom 1.3 ratio.
+            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ADJUST_RATIO, 10.0f);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
index 19d4a1bf83..d24597eeed 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHardRock.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
@@ -22,5 +23,13 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             OsuHitObjectGenerationUtils.ReflectVerticallyAlongPlayfield(osuObject);
         }
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            base.ApplyToDifficulty(difficulty);
+
+            difficulty.CircleSize = Math.Min(difficulty.CircleSize * 1.3f, 10.0f); // CS uses a custom 1.3 ratio.
+            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ADJUST_RATIO, 10.0f);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
index ba41175461..37a630c8ad 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.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 osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 
@@ -23,7 +24,9 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
             base.ApplyToDifficulty(difficulty);
+
             difficulty.SliderMultiplier *= slider_multiplier;
+            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ADJUST_RATIO, 10.0f);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHardRock.cs b/osu.Game/Rulesets/Mods/ModHardRock.cs
index 2886e59c54..4b2d1d050e 100644
--- a/osu.Game/Rulesets/Mods/ModHardRock.cs
+++ b/osu.Game/Rulesets/Mods/ModHardRock.cs
@@ -18,17 +18,16 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Everything just got a bit harder...";
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModDifficultyAdjust) };
 
+        protected const float ADJUST_RATIO = 1.4f;
+
         public void ReadFromDifficulty(IBeatmapDifficultyInfo difficulty)
         {
         }
 
         public virtual void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
-            const float ratio = 1.4f;
-            difficulty.CircleSize = Math.Min(difficulty.CircleSize * 1.3f, 10.0f); // CS uses a custom 1.3 ratio.
-            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ratio, 10.0f);
-            difficulty.DrainRate = Math.Min(difficulty.DrainRate * ratio, 10.0f);
-            difficulty.OverallDifficulty = Math.Min(difficulty.OverallDifficulty * ratio, 10.0f);
+            difficulty.DrainRate = Math.Min(difficulty.DrainRate * ADJUST_RATIO, 10.0f);
+            difficulty.OverallDifficulty = Math.Min(difficulty.OverallDifficulty * ADJUST_RATIO, 10.0f);
         }
     }
 }

From 2a0e4c364d11c681b4a8ada723f56b0f1687666d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 14:06:39 +0200
Subject: [PATCH 0955/2296] Add method to unmap `RealmKeyBinding.Action` to
 actual enum-typed value

---
 osu.Game.Tests/Input/RealmKeyBindingTest.cs | 48 +++++++++++++++++++++
 osu.Game/Input/Bindings/RealmKeyBinding.cs  | 24 +++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 osu.Game.Tests/Input/RealmKeyBindingTest.cs

diff --git a/osu.Game.Tests/Input/RealmKeyBindingTest.cs b/osu.Game.Tests/Input/RealmKeyBindingTest.cs
new file mode 100644
index 0000000000..366d5ea825
--- /dev/null
+++ b/osu.Game.Tests/Input/RealmKeyBindingTest.cs
@@ -0,0 +1,48 @@
+// 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.Allocation;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Testing;
+using osu.Game.Input.Bindings;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
+using osu.Game.Tests.Visual;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Input
+{
+    [HeadlessTest]
+    public partial class RealmKeyBindingTest : OsuTestScene
+    {
+        [Resolved]
+        private RulesetStore rulesets { get; set; } = null!;
+
+        [Test]
+        public void TestUnmapGlobalAction()
+        {
+            var keyBinding = new RealmKeyBinding(GlobalAction.ToggleReplaySettings, KeyCombination.FromKey(Key.Z));
+
+            AddAssert("action is integer", () => keyBinding.Action, () => Is.EqualTo((int)GlobalAction.ToggleReplaySettings));
+            AddAssert("action unmaps correctly", () => keyBinding.GetAction(rulesets), () => Is.EqualTo(GlobalAction.ToggleReplaySettings));
+        }
+
+        [TestCase(typeof(OsuRuleset), OsuAction.Smoke, null)]
+        [TestCase(typeof(TaikoRuleset), TaikoAction.LeftCentre, null)]
+        [TestCase(typeof(CatchRuleset), CatchAction.MoveRight, null)]
+        [TestCase(typeof(ManiaRuleset), ManiaAction.Key7, 7)]
+        public void TestUnmapRulesetActions(Type rulesetType, object action, int? variant)
+        {
+            string rulesetName = ((Ruleset)Activator.CreateInstance(rulesetType)!).ShortName;
+            var keyBinding = new RealmKeyBinding(action, KeyCombination.FromKey(Key.Z), rulesetName, variant);
+
+            AddAssert("action is integer", () => keyBinding.Action, () => Is.EqualTo((int)action));
+            AddAssert("action unmaps correctly", () => keyBinding.GetAction(rulesets), () => Is.EqualTo(action));
+        }
+    }
+}
diff --git a/osu.Game/Input/Bindings/RealmKeyBinding.cs b/osu.Game/Input/Bindings/RealmKeyBinding.cs
index 4af0357535..28b142978b 100644
--- a/osu.Game/Input/Bindings/RealmKeyBinding.cs
+++ b/osu.Game/Input/Bindings/RealmKeyBinding.cs
@@ -2,9 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Input.Bindings;
 using osu.Game.Database;
+using osu.Game.Rulesets;
 using Realms;
 
 namespace osu.Game.Input.Bindings
@@ -26,6 +28,13 @@ namespace osu.Game.Input.Bindings
             set => KeyCombinationString = value.ToString();
         }
 
+        /// <summary>
+        /// The resultant action which is triggered by this binding.
+        /// </summary>
+        /// <remarks>
+        /// This implementation always returns an integer.
+        /// If wanting to get the actual enum-typed value, use <see cref="GetAction"/>.
+        /// </remarks>
         [Ignored]
         public object Action
         {
@@ -53,5 +62,20 @@ namespace osu.Game.Input.Bindings
         private RealmKeyBinding()
         {
         }
+
+        public object GetAction(RulesetStore rulesets)
+        {
+            if (string.IsNullOrEmpty(RulesetName))
+                return (GlobalAction)ActionInt;
+
+            var ruleset = rulesets.GetRuleset(RulesetName);
+            var actionType = ruleset!.CreateInstance()
+                                     .GetDefaultKeyBindings(Variant ?? 0)
+                                     .First() // let's just assume nobody does something stupid like mix multiple types...
+                                     .Action
+                                     .GetType();
+
+            return Enum.ToObject(actionType, ActionInt);
+        }
     }
 }

From 1c784c9abec3ca18a566b2bff1be2fd2fa7467aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 14:24:21 +0200
Subject: [PATCH 0956/2296] Add API for retrieving global key bindings per
 section

---
 .../Input/Bindings/GlobalActionContainer.cs   | 59 ++++++++++++++++---
 .../Input/GlobalKeyBindingsSection.cs         | 14 ++---
 2 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 296232d9ea..9419bd2a0e 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.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.Input;
@@ -37,7 +38,7 @@ namespace osu.Game.Input.Bindings
                                                                        // based on such usages potentially requiring a lot more key bindings that may be "shared" with global ones.
                                                                        .Concat(OverlayKeyBindings);
 
-        public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
+        public static IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {
             new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
             new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
@@ -67,7 +68,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F12, GlobalAction.TakeScreenshot),
         };
 
-        public IEnumerable<KeyBinding> OverlayKeyBindings => new[]
+        public static IEnumerable<KeyBinding> OverlayKeyBindings => new[]
         {
             new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
             new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
@@ -77,7 +78,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
         };
 
-        public IEnumerable<KeyBinding> EditorKeyBindings => new[]
+        public static IEnumerable<KeyBinding> EditorKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.F1 }, GlobalAction.EditorComposeMode),
             new KeyBinding(new[] { InputKey.F2 }, GlobalAction.EditorDesignMode),
@@ -101,7 +102,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.R }, GlobalAction.EditorToggleRotateControl),
         };
 
-        public IEnumerable<KeyBinding> InGameKeyBindings => new[]
+        public static IEnumerable<KeyBinding> InGameKeyBindings => new[]
         {
             new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene),
             new KeyBinding(InputKey.ExtraMouseButton2, GlobalAction.SkipCutscene),
@@ -118,7 +119,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F2, GlobalAction.ExportReplay),
         };
 
-        public IEnumerable<KeyBinding> ReplayKeyBindings => new[]
+        public static IEnumerable<KeyBinding> ReplayKeyBindings => new[]
         {
             new KeyBinding(InputKey.Space, GlobalAction.TogglePauseReplay),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.TogglePauseReplay),
@@ -127,7 +128,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.H }, GlobalAction.ToggleReplaySettings),
         };
 
-        public IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
+        public static IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
         {
             new KeyBinding(InputKey.F1, GlobalAction.ToggleModSelection),
             new KeyBinding(InputKey.F2, GlobalAction.SelectNextRandom),
@@ -136,7 +137,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.BackSpace, GlobalAction.DeselectAllMods),
         };
 
-        public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
+        public static IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.Alt, InputKey.Up }, GlobalAction.IncreaseVolume),
             new KeyBinding(new[] { InputKey.Alt, InputKey.Down }, GlobalAction.DecreaseVolume),
@@ -154,6 +155,39 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
         };
 
+        public static IEnumerable<KeyBinding> GetDefaultBindingsFor(GlobalActionCategory category)
+        {
+            switch (category)
+            {
+                case GlobalActionCategory.General:
+                    return GlobalKeyBindings;
+
+                case GlobalActionCategory.Editor:
+                    return EditorKeyBindings;
+
+                case GlobalActionCategory.InGame:
+                    return InGameKeyBindings;
+
+                case GlobalActionCategory.Replay:
+                    return ReplayKeyBindings;
+
+                case GlobalActionCategory.SongSelect:
+                    return SongSelectKeyBindings;
+
+                case GlobalActionCategory.AudioControl:
+                    return AudioControlKeyBindings;
+
+                case GlobalActionCategory.Overlays:
+                    return OverlayKeyBindings;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(category), category, $"Unexpected {nameof(GlobalActionCategory)}");
+            }
+        }
+
+        public static IEnumerable<GlobalAction> GetGlobalActionsFor(GlobalActionCategory category)
+            => GetDefaultBindingsFor(category).Select(binding => binding.Action).Cast<GlobalAction>().Distinct();
+
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) => handler?.OnPressed(e) == true;
 
         public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => handler?.OnReleased(e);
@@ -365,4 +399,15 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorToggleRotateControl))]
         EditorToggleRotateControl,
     }
+
+    public enum GlobalActionCategory
+    {
+        General,
+        Editor,
+        InGame,
+        Replay,
+        SongSelect,
+        AudioControl,
+        Overlays
+    }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
index 291e9a93cf..c1e7cf160f 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public DefaultBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.GlobalKeyBindings;
+                Defaults = GlobalActionContainer.GlobalKeyBindings;
             }
         }
 
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public OverlayBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.OverlayKeyBindings;
+                Defaults = GlobalActionContainer.OverlayKeyBindings;
             }
         }
 
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public SongSelectKeyBindingSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.SongSelectKeyBindings;
+                Defaults = GlobalActionContainer.SongSelectKeyBindings;
             }
         }
 
@@ -69,7 +69,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public InGameKeyBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.InGameKeyBindings;
+                Defaults = GlobalActionContainer.InGameKeyBindings;
             }
         }
 
@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public ReplayKeyBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.ReplayKeyBindings;
+                Defaults = GlobalActionContainer.ReplayKeyBindings;
             }
         }
 
@@ -91,7 +91,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public AudioControlKeyBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.AudioControlKeyBindings;
+                Defaults = GlobalActionContainer.AudioControlKeyBindings;
             }
         }
 
@@ -102,7 +102,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             public EditorKeyBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
-                Defaults = manager.EditorKeyBindings;
+                Defaults = GlobalActionContainer.EditorKeyBindings;
             }
         }
     }

From c2e92cbb704aa79f0c8b6ab04ad675ccd45f3075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 14:51:19 +0200
Subject: [PATCH 0957/2296] Refactor key binding panel leveraging new helper
 methods

---
 .../Input/GlobalKeyBindingsSection.cs         | 96 +++----------------
 .../Input/GlobalKeyBindingsSubsection.cs      | 36 +++++++
 .../Sections/Input/KeyBindingPanel.cs         |  5 +-
 .../Settings/Sections/Input/KeyBindingRow.cs  |  2 +-
 .../Sections/Input/KeyBindingsSubsection.cs   | 36 ++++---
 .../Sections/Input/RulesetBindingsSection.cs  |  5 +
 .../Input/VariantBindingsSubsection.cs        | 25 ++++-
 7 files changed, 97 insertions(+), 108 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSubsection.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
index c1e7cf160f..5a05d78905 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -18,92 +19,19 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public override LocalisableString Header => InputSettingsStrings.GlobalKeyBindingHeader;
 
-        public GlobalKeyBindingsSection(GlobalActionContainer manager)
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            Add(new DefaultBindingsSubsection(manager));
-            Add(new OverlayBindingsSubsection(manager));
-            Add(new AudioControlKeyBindingsSubsection(manager));
-            Add(new SongSelectKeyBindingSubsection(manager));
-            Add(new InGameKeyBindingsSubsection(manager));
-            Add(new ReplayKeyBindingsSubsection(manager));
-            Add(new EditorKeyBindingsSubsection(manager));
-        }
-
-        private partial class DefaultBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => string.Empty;
-
-            public DefaultBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
+            AddRange(new[]
             {
-                Defaults = GlobalActionContainer.GlobalKeyBindings;
-            }
-        }
-
-        private partial class OverlayBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.OverlaysSection;
-
-            public OverlayBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.OverlayKeyBindings;
-            }
-        }
-
-        private partial class SongSelectKeyBindingSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.SongSelectSection;
-
-            public SongSelectKeyBindingSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.SongSelectKeyBindings;
-            }
-        }
-
-        private partial class InGameKeyBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.InGameSection;
-
-            public InGameKeyBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.InGameKeyBindings;
-            }
-        }
-
-        private partial class ReplayKeyBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.ReplaySection;
-
-            public ReplayKeyBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.ReplayKeyBindings;
-            }
-        }
-
-        private partial class AudioControlKeyBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.AudioSection;
-
-            public AudioControlKeyBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.AudioControlKeyBindings;
-            }
-        }
-
-        private partial class EditorKeyBindingsSubsection : KeyBindingsSubsection
-        {
-            protected override LocalisableString Header => InputSettingsStrings.EditorSection;
-
-            public EditorKeyBindingsSubsection(GlobalActionContainer manager)
-                : base(null)
-            {
-                Defaults = GlobalActionContainer.EditorKeyBindings;
-            }
+                new GlobalKeyBindingsSubsection(string.Empty, GlobalActionCategory.General),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.OverlaysSection, GlobalActionCategory.Overlays),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.AudioSection, GlobalActionCategory.AudioControl),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.SongSelectSection, GlobalActionCategory.SongSelect),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.InGameSection, GlobalActionCategory.InGame),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.ReplaySection, GlobalActionCategory.Replay),
+                new GlobalKeyBindingsSubsection(InputSettingsStrings.EditorSection, GlobalActionCategory.Editor),
+            });
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSubsection.cs
new file mode 100644
index 0000000000..2e42e46330
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSubsection.cs
@@ -0,0 +1,36 @@
+// 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.Localisation;
+using osu.Game.Database;
+using osu.Game.Input.Bindings;
+using Realms;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public partial class GlobalKeyBindingsSubsection : KeyBindingsSubsection
+    {
+        protected override LocalisableString Header { get; }
+
+        private readonly GlobalActionCategory category;
+
+        public GlobalKeyBindingsSubsection(LocalisableString header, GlobalActionCategory category)
+        {
+            Header = header;
+            this.category = category;
+            Defaults = GlobalActionContainer.GetDefaultBindingsFor(category);
+        }
+
+        protected override IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm)
+        {
+            var bindings = realm.All<RealmKeyBinding>()
+                                .Where(b => b.RulesetName == null && b.Variant == null)
+                                .Detach();
+
+            var actionsInSection = GlobalActionContainer.GetGlobalActionsFor(category).Cast<int>().ToHashSet();
+            return bindings.Where(kb => actionsInSection.Contains(kb.ActionInt));
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs
index 7296003c7f..4c5610a15e 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingPanel.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Rulesets;
 
@@ -14,9 +13,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         protected override Drawable CreateHeader() => new SettingsHeader(InputSettingsStrings.KeyBindingPanelHeader, InputSettingsStrings.KeyBindingPanelDescription);
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(RulesetStore rulesets, GlobalActionContainer global)
+        private void load(RulesetStore rulesets)
         {
-            AddSection(new GlobalKeyBindingsSection(global));
+            AddSection(new GlobalKeyBindingsSection());
 
             foreach (var ruleset in rulesets.AvailableRulesets)
                 AddSection(new RulesetBindingsSection(ruleset));
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index c0de7a1d16..2e44d8b02d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
         /// </summary>
-        public Action<KeyBindingRow>? BindingUpdated { get; init; }
+        public Action<KeyBindingRow>? BindingUpdated { get; set; }
 
         /// <summary>
         /// Whether left and right mouse button clicks should be included in the edited bindings.
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index 8285204bb3..1ad9442631 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -11,9 +11,9 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Localisation;
 using osu.Game.Database;
 using osu.Game.Input.Bindings;
-using osu.Game.Rulesets;
 using osu.Game.Localisation;
 using osuTK;
+using Realms;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -27,37 +27,26 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected IEnumerable<KeyBinding> Defaults { get; init; } = Array.Empty<KeyBinding>();
 
-        public RulesetInfo? Ruleset { get; protected set; }
-
-        private readonly int? variant;
-
-        protected KeyBindingsSubsection(int? variant)
+        protected KeyBindingsSubsection()
         {
-            this.variant = variant;
-
             FlowContent.Spacing = new Vector2(0, 3);
         }
 
         [BackgroundDependencyLoader]
         private void load(RealmAccess realm)
         {
-            string? rulesetName = Ruleset?.ShortName;
-
-            var bindings = realm.Run(r => r.All<RealmKeyBinding>()
-                                           .Where(b => b.RulesetName == rulesetName && b.Variant == variant)
-                                           .Detach());
+            var bindings = realm.Run(r => GetKeyBindings(r).Detach());
 
             foreach (var defaultGroup in Defaults.GroupBy(d => d.Action))
             {
                 int intKey = (int)defaultGroup.Key;
 
                 // one row per valid action.
-                Add(new KeyBindingRow(defaultGroup.Key, bindings.Where(b => b.ActionInt.Equals(intKey)).ToList())
-                {
-                    AllowMainMouseButtons = Ruleset != null,
-                    Defaults = defaultGroup.Select(d => d.KeyCombination),
-                    BindingUpdated = onBindingUpdated
-                });
+                Add(CreateKeyBindingRow(
+                        defaultGroup.Key,
+                        bindings.Where(b => b.ActionInt.Equals(intKey)).ToList(),
+                        defaultGroup)
+                    .With(row => row.BindingUpdated = onBindingUpdated));
             }
 
             Add(new ResetButton
@@ -66,6 +55,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             });
         }
 
+        protected abstract IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm);
+
+        protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<RealmKeyBinding> keyBindings, IEnumerable<KeyBinding> defaults)
+            => new KeyBindingRow(action, keyBindings.ToList())
+            {
+                AllowMainMouseButtons = false,
+                Defaults = defaults.Select(d => d.KeyCombination),
+            };
+
         private void onBindingUpdated(KeyBindingRow sender)
         {
             if (AutoAdvanceTarget)
diff --git a/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs b/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
index 3b5002b423..f326592016 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/RulesetBindingsSection.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets;
@@ -18,7 +19,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public RulesetBindingsSection(RulesetInfo ruleset)
         {
             this.ruleset = ruleset;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             var r = ruleset.CreateInstance();
 
             foreach (int variant in r.AvailableVariants)
diff --git a/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
index d00de7f549..46da8a1453 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
@@ -1,8 +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.Collections.Generic;
+using System.Linq;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Localisation;
+using osu.Game.Input.Bindings;
 using osu.Game.Rulesets;
+using Realms;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -12,15 +17,33 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected override LocalisableString Header { get; }
 
+        public RulesetInfo Ruleset { get; }
+        private readonly int variant;
+
         public VariantBindingsSubsection(RulesetInfo ruleset, int variant)
-            : base(variant)
         {
             Ruleset = ruleset;
+            this.variant = variant;
 
             var rulesetInstance = ruleset.CreateInstance();
 
             Header = rulesetInstance.GetVariantName(variant);
             Defaults = rulesetInstance.GetDefaultKeyBindings(variant);
         }
+
+        protected override IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm)
+        {
+            string rulesetName = Ruleset.ShortName;
+
+            return realm.All<RealmKeyBinding>()
+                        .Where(b => b.RulesetName == rulesetName && b.Variant == variant);
+        }
+
+        protected override KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<RealmKeyBinding> keyBindings, IEnumerable<KeyBinding> defaults)
+            => new KeyBindingRow(action, keyBindings.ToList())
+            {
+                AllowMainMouseButtons = true,
+                Defaults = defaults.Select(d => d.KeyCombination),
+            };
     }
 }

From 5f0b1d69a508925fd326a374e119a2ec7dba2532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 11:08:10 +0200
Subject: [PATCH 0958/2296] Prepare `KeyBindingRow` for accepting external
 changes

---
 .../Settings/TestSceneKeyBindingPanel.cs      |  4 +-
 .../Visual/Settings/TestSceneKeyBindingRow.cs | 60 +++++++++++++++++++
 .../Settings/Sections/Input/KeyBindingRow.cs  | 58 +++++++++++-------
 .../Sections/Input/KeyBindingsSubsection.cs   | 13 ++--
 .../Input/VariantBindingsSubsection.cs        |  4 +-
 5 files changed, 108 insertions(+), 31 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneKeyBindingRow.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 449ca0f258..5a001ca127 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -207,7 +207,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddUntilStep("restore button hidden", () => settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First().Alpha == 0);
 
             AddAssert("binding cleared",
-                () => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0)));
+                () => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.Value.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0)));
         }
 
         [Test]
@@ -237,7 +237,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddUntilStep("restore button hidden", () => settingsKeyBindingRow.ChildrenOfType<RevertToDefaultButton<bool>>().First().Alpha == 0);
 
             AddAssert("binding cleared",
-                () => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0)));
+                () => settingsKeyBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.Value.KeyCombination.Equals(settingsKeyBindingRow.Defaults.ElementAt(0)));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingRow.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingRow.cs
new file mode 100644
index 0000000000..ff996a9ca1
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingRow.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Testing;
+using osu.Game.Input.Bindings;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Settings.Sections.Input;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    public partial class TestSceneKeyBindingRow : OsuTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
+        [Test]
+        public void TestChangesAfterConstruction()
+        {
+            KeyBindingRow row = null!;
+
+            AddStep("create row", () => Child = new Container
+            {
+                Width = 500,
+                AutoSizeAxes = Axes.Y,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Child = row = new KeyBindingRow(GlobalAction.Back)
+                {
+                    Defaults = new[]
+                    {
+                        new KeyCombination(InputKey.Escape),
+                        new KeyCombination(InputKey.ExtraMouseButton1)
+                    }
+                }
+            });
+
+            AddStep("change key bindings", () =>
+            {
+                row.KeyBindings.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.Escape)));
+                row.KeyBindings.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.ExtraMouseButton1)));
+            });
+            AddUntilStep("revert to default button not shown", () => row.ChildrenOfType<RevertToDefaultButton<bool>>().Single().Alpha, () => Is.Zero);
+
+            AddStep("change key bindings", () =>
+            {
+                row.KeyBindings.Clear();
+                row.KeyBindings.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.X)));
+                row.KeyBindings.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.Z)));
+                row.KeyBindings.Add(new RealmKeyBinding(GlobalAction.Back, new KeyCombination(InputKey.I)));
+            });
+            AddUntilStep("revert to default button not shown", () => row.ChildrenOfType<RevertToDefaultButton<bool>>().Single().Alpha, () => Is.Not.Zero);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 2e44d8b02d..0ba3dc9b9a 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -44,6 +44,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// </summary>
         public bool AllowMainMouseButtons { get; init; }
 
+        /// <summary>
+        /// The bindings to display in this row.
+        /// </summary>
+        public BindableList<RealmKeyBinding> KeyBindings { get; } = new BindableList<RealmKeyBinding>();
+
         /// <summary>
         /// The default key bindings for this row.
         /// </summary>
@@ -65,12 +70,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public bool FilteringActive { get; set; }
 
-        public IEnumerable<LocalisableString> FilterTerms => bindings.Select(b => (LocalisableString)keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text);
+        public IEnumerable<LocalisableString> FilterTerms => KeyBindings.Select(b => (LocalisableString)keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text);
 
         #endregion
 
         private readonly object action;
-        private readonly IEnumerable<RealmKeyBinding> bindings;
 
         private Bindable<bool> isDefault { get; } = new BindableBool(true);
 
@@ -101,11 +105,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// Creates a new <see cref="KeyBindingRow"/>.
         /// </summary>
         /// <param name="action">The action that this row contains bindings for.</param>
-        /// <param name="bindings">The keybindings to display in this row.</param>
-        public KeyBindingRow(object action, List<RealmKeyBinding> bindings)
+        public KeyBindingRow(object action)
         {
             this.action = action;
-            this.bindings = bindings;
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -191,10 +193,23 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 }
             };
 
-            foreach (var b in bindings)
-                buttons.Add(new KeyButton(b));
+            KeyBindings.BindCollectionChanged((_, _) =>
+            {
+                Scheduler.AddOnce(updateButtons);
+                updateIsDefaultValue();
+            }, true);
+        }
 
-            updateIsDefaultValue();
+        private void updateButtons()
+        {
+            if (buttons.Count > KeyBindings.Count)
+                buttons.RemoveRange(buttons.Skip(KeyBindings.Count).ToArray(), true);
+
+            while (buttons.Count < KeyBindings.Count)
+                buttons.Add(new KeyButton());
+
+            foreach (var (button, binding) in buttons.Zip(KeyBindings))
+                button.KeyBinding.Value = binding;
         }
 
         public void RestoreDefaults()
@@ -472,11 +487,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         }
 
         private void updateStoreFromButton(KeyButton button) =>
-            realm.WriteAsync(r => r.Find<RealmKeyBinding>(button.KeyBinding.ID)!.KeyCombinationString = button.KeyBinding.KeyCombinationString);
+            realm.WriteAsync(r => r.Find<RealmKeyBinding>(button.KeyBinding.Value.ID)!.KeyCombinationString = button.KeyBinding.Value.KeyCombinationString);
 
         private void updateIsDefaultValue()
         {
-            isDefault.Value = bindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
+            isDefault.Value = KeyBindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
         }
 
         private partial class CancelButton : RoundedButton
@@ -499,7 +514,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public partial class KeyButton : Container
         {
-            public readonly RealmKeyBinding KeyBinding;
+            public Bindable<RealmKeyBinding> KeyBinding { get; } = new Bindable<RealmKeyBinding>();
 
             private readonly Box box;
             public readonly OsuSpriteText Text;
@@ -525,13 +540,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 }
             }
 
-            public KeyButton(RealmKeyBinding keyBinding)
+            public KeyButton()
             {
-                if (keyBinding.IsManaged)
-                    throw new ArgumentException("Key binding should not be attached as we make temporary changes", nameof(keyBinding));
-
-                KeyBinding = keyBinding;
-
                 Margin = new MarginPadding(padding);
 
                 Masking = true;
@@ -567,6 +577,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 base.LoadComplete();
 
+                KeyBinding.BindValueChanged(_ =>
+                {
+                    if (KeyBinding.Value.IsManaged)
+                        throw new ArgumentException("Key binding should not be attached as we make temporary changes", nameof(KeyBinding));
+
+                    updateKeyCombinationText();
+                });
                 keyCombinationProvider.KeymapChanged += updateKeyCombinationText;
                 updateKeyCombinationText();
             }
@@ -575,6 +592,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             private void load()
             {
                 updateHoverState();
+                FinishTransforms(true);
             }
 
             protected override bool OnHover(HoverEvent e)
@@ -613,10 +631,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             public void UpdateKeyCombination(KeyCombination newCombination)
             {
-                if (KeyBinding.RulesetName != null && !RealmKeyBindingStore.CheckValidForGameplay(newCombination))
+                if (KeyBinding.Value.RulesetName != null && !RealmKeyBindingStore.CheckValidForGameplay(newCombination))
                     return;
 
-                KeyBinding.KeyCombination = newCombination;
+                KeyBinding.Value.KeyCombination = newCombination;
                 updateKeyCombinationText();
             }
 
@@ -624,7 +642,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 Scheduler.AddOnce(updateText);
 
-                void updateText() => Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.KeyCombination);
+                void updateText() => Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.Value.KeyCombination);
             }
 
             protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index 1ad9442631..f7e36e0dd2 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -42,11 +42,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 int intKey = (int)defaultGroup.Key;
 
                 // one row per valid action.
-                Add(CreateKeyBindingRow(
-                        defaultGroup.Key,
-                        bindings.Where(b => b.ActionInt.Equals(intKey)).ToList(),
-                        defaultGroup)
-                    .With(row => row.BindingUpdated = onBindingUpdated));
+                var row = CreateKeyBindingRow(defaultGroup.Key, defaultGroup)
+                    .With(row => row.BindingUpdated = onBindingUpdated);
+                row.KeyBindings.AddRange(bindings.Where(b => b.ActionInt.Equals(intKey)));
+                Add(row);
             }
 
             Add(new ResetButton
@@ -57,8 +56,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected abstract IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm);
 
-        protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<RealmKeyBinding> keyBindings, IEnumerable<KeyBinding> defaults)
-            => new KeyBindingRow(action, keyBindings.ToList())
+        protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<KeyBinding> defaults)
+            => new KeyBindingRow(action)
             {
                 AllowMainMouseButtons = false,
                 Defaults = defaults.Select(d => d.KeyCombination),
diff --git a/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
index 46da8a1453..6db8aa7259 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/VariantBindingsSubsection.cs
@@ -39,8 +39,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         .Where(b => b.RulesetName == rulesetName && b.Variant == variant);
         }
 
-        protected override KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<RealmKeyBinding> keyBindings, IEnumerable<KeyBinding> defaults)
-            => new KeyBindingRow(action, keyBindings.ToList())
+        protected override KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<KeyBinding> defaults)
+            => new KeyBindingRow(action)
             {
                 AllowMainMouseButtons = true,
                 Defaults = defaults.Select(d => d.KeyCombination),

From aa8dbd742e847fbb86ec19b84593b06c06745dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 11:25:19 +0200
Subject: [PATCH 0959/2296] Hoist database update to subsection level

The end goal here is to be able to better coordinate deconfliction of
bindings at the subsection level rather than try to jam that logic into
individual rows somehow.

The flipside is that this is going to require a flow to update the
individual rows after the subsection's intervention, but that's what the
previous commit was for.
---
 .../Settings/Sections/Input/KeyBindingRow.cs  | 21 +++++++------------
 .../Sections/Input/KeyBindingsSubsection.cs   |  9 ++++++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 0ba3dc9b9a..aab6ed6d74 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -18,7 +18,6 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -37,7 +36,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
         /// </summary>
-        public Action<KeyBindingRow>? BindingUpdated { get; set; }
+        public KeyBindingUpdated? BindingUpdated { get; set; }
+
+        public delegate void KeyBindingUpdated(KeyBindingRow sender, KeyBindingUpdatedEventArgs args);
+
+        public record KeyBindingUpdatedEventArgs(Guid KeyBindingID, string KeyCombinationString);
 
         /// <summary>
         /// Whether left and right mouse button clicks should be included in the edited bindings.
@@ -81,9 +84,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [Resolved]
         private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
 
-        [Resolved]
-        private RealmAccess realm { get; set; } = null!;
-
         private Container content = null!;
 
         private OsuSpriteText text = null!;
@@ -220,8 +220,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 var button = buttons[i++];
                 button.UpdateKeyCombination(d);
-
-                updateStoreFromButton(button);
+                finalise();
             }
 
             isDefault.Value = true;
@@ -437,17 +436,16 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             if (bindTarget != null)
             {
-                updateStoreFromButton(bindTarget);
-
                 updateIsDefaultValue();
 
                 bindTarget.IsBinding = false;
+                var args = new KeyBindingUpdatedEventArgs(bindTarget.KeyBinding.Value.ID, bindTarget.KeyBinding.Value.KeyCombinationString);
                 Schedule(() =>
                 {
                     // schedule to ensure we don't instantly get focus back on next OnMouseClick (see AcceptFocus impl.)
                     bindTarget = null;
                     if (hasChanged)
-                        BindingUpdated?.Invoke(this);
+                        BindingUpdated?.Invoke(this, args);
                 });
             }
 
@@ -486,9 +484,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (bindTarget != null) bindTarget.IsBinding = true;
         }
 
-        private void updateStoreFromButton(KeyButton button) =>
-            realm.WriteAsync(r => r.Find<RealmKeyBinding>(button.KeyBinding.Value.ID)!.KeyCombinationString = button.KeyBinding.Value.KeyCombinationString);
-
         private void updateIsDefaultValue()
         {
             isDefault.Value = KeyBindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index f7e36e0dd2..57f6e58058 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -27,13 +27,16 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected IEnumerable<KeyBinding> Defaults { get; init; } = Array.Empty<KeyBinding>();
 
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
+
         protected KeyBindingsSubsection()
         {
             FlowContent.Spacing = new Vector2(0, 3);
         }
 
         [BackgroundDependencyLoader]
-        private void load(RealmAccess realm)
+        private void load()
         {
             var bindings = realm.Run(r => GetKeyBindings(r).Detach());
 
@@ -63,8 +66,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Defaults = defaults.Select(d => d.KeyCombination),
             };
 
-        private void onBindingUpdated(KeyBindingRow sender)
+        private void onBindingUpdated(KeyBindingRow sender, KeyBindingRow.KeyBindingUpdatedEventArgs args)
         {
+            realm.WriteAsync(r => r.Find<RealmKeyBinding>(args.KeyBindingID)!.KeyCombinationString = args.KeyCombinationString);
+
             if (AutoAdvanceTarget)
             {
                 var next = Children.SkipWhile(c => c != sender).Skip(1).FirstOrDefault();

From 7b6563116ac9bfb57eacd19889d612d326f90489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 13:09:33 +0200
Subject: [PATCH 0960/2296] Implement visual appearance of key binding conflict
 popover

---
 .../TestSceneKeyBindingConflictPopover.cs     |  59 +++++
 .../Input/KeyBindingConflictPopover.cs        | 249 ++++++++++++++++++
 2 files changed, 308 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
new file mode 100644
index 0000000000..972e1cbe79
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Bindings;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Settings.Sections.Input;
+using osu.Game.Rulesets.Osu;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    public partial class TestSceneKeyBindingConflictPopover : OsuTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
+        [Test]
+        public void TestAppearance()
+        {
+            ButtonWithConflictPopover button = null!;
+
+            AddStep("create content", () =>
+            {
+                Child = new PopoverContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = button = new ButtonWithConflictPopover
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Text = "Open popover",
+                        Width = 300
+                    }
+                };
+            });
+            AddStep("show popover", () => button.TriggerClick());
+        }
+
+        private partial class ButtonWithConflictPopover : RoundedButton, IHasPopover
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Action = this.ShowPopover;
+            }
+
+            public Popover GetPopover() => new KeyBindingConflictPopover(
+                OsuAction.LeftButton,
+                OsuAction.RightButton,
+                new KeyCombination(InputKey.Z));
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
new file mode 100644
index 0000000000..55b4ee3390
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -0,0 +1,249 @@
+// 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;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public partial class KeyBindingConflictPopover : OsuPopover
+    {
+        private readonly object existingAction;
+        private readonly object newAction;
+        private readonly KeyCombination conflictingCombination;
+
+        private ConflictingKeyBindingPreview newPreview = null!;
+        private ConflictingKeyBindingPreview existingPreview = null!;
+        private HoverableRoundedButton keepExistingButton = null!;
+        private HoverableRoundedButton applyNewButton = null!;
+
+        public KeyBindingConflictPopover(object existingAction, object newAction, KeyCombination conflictingCombination)
+        {
+            this.existingAction = existingAction;
+            this.newAction = newAction;
+            this.conflictingCombination = conflictingCombination;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new FillFlowContainer
+            {
+                Width = 250,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(10),
+                Children = new Drawable[]
+                {
+                    new OsuTextFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Text = "The binding you've selected conflicts with another existing binding.",
+                        Margin = new MarginPadding { Bottom = 10 }
+                    },
+                    existingPreview = new ConflictingKeyBindingPreview(existingAction, conflictingCombination),
+                    newPreview = new ConflictingKeyBindingPreview(newAction, conflictingCombination),
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Margin = new MarginPadding { Top = 10 },
+                        Children = new[]
+                        {
+                            keepExistingButton = new HoverableRoundedButton
+                            {
+                                Text = "Keep existing",
+                                RelativeSizeAxes = Axes.X,
+                                Width = 0.48f,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                Action = Hide
+                            },
+                            applyNewButton = new HoverableRoundedButton
+                            {
+                                Text = "Apply new",
+                                RelativeSizeAxes = Axes.X,
+                                Width = 0.48f,
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Action = Hide
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            keepExistingButton.IsHoveredBindable.BindValueChanged(_ => updatePreviews());
+            applyNewButton.IsHoveredBindable.BindValueChanged(_ => updatePreviews());
+            updatePreviews();
+        }
+
+        private void updatePreviews()
+        {
+            if (!keepExistingButton.IsHovered && !applyNewButton.IsHovered)
+            {
+                existingPreview.IsChosen.Value = newPreview.IsChosen.Value = null;
+                return;
+            }
+
+            existingPreview.IsChosen.Value = keepExistingButton.IsHovered;
+            newPreview.IsChosen.Value = applyNewButton.IsHovered;
+        }
+
+        private partial class ConflictingKeyBindingPreview : CompositeDrawable
+        {
+            private readonly object action;
+            private readonly KeyCombination keyCombination;
+
+            private OsuSpriteText newBindingText = null!;
+
+            public Bindable<bool?> IsChosen { get; } = new Bindable<bool?>();
+
+            [Resolved]
+            private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
+
+            [Resolved]
+            private OsuColour colours { get; set; } = null!;
+
+            public ConflictingKeyBindingPreview(object action, KeyCombination keyCombination)
+            {
+                this.action = action;
+                this.keyCombination = keyCombination;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+
+                InternalChild = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    CornerRadius = 5,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = colourProvider.Background5
+                        },
+                        new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(),
+                                new Dimension(GridSizeMode.AutoSize, minSize: 80),
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new OsuSpriteText
+                                    {
+                                        Text = action.GetLocalisableDescription(),
+                                        Margin = new MarginPadding(7.5f),
+                                    },
+                                    new Container
+                                    {
+                                        AutoSizeAxes = Axes.Y,
+                                        RelativeSizeAxes = Axes.X,
+                                        CornerRadius = 5,
+                                        Masking = true,
+                                        Anchor = Anchor.CentreRight,
+                                        Origin = Anchor.CentreRight,
+                                        X = -5,
+                                        Children = new Drawable[]
+                                        {
+                                            new Box
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Colour = colourProvider.Background6
+                                            },
+                                            newBindingText = new OsuSpriteText
+                                            {
+                                                Font = OsuFont.Numeric.With(size: 10),
+                                                Margin = new MarginPadding(5),
+                                                Text = keyCombinationProvider.GetReadableString(keyCombination),
+                                                Anchor = Anchor.Centre,
+                                                Origin = Anchor.Centre
+                                            }
+                                        }
+                                    },
+                                }
+                            }
+                        }
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                IsChosen.BindValueChanged(_ => updateState(), true);
+            }
+
+            private void updateState()
+            {
+                switch (IsChosen.Value)
+                {
+                    case true:
+                        newBindingText.Text = keyCombinationProvider.GetReadableString(keyCombination);
+                        newBindingText.Colour = colours.Green1;
+                        break;
+
+                    case false:
+                        newBindingText.Text = "(none)";
+                        newBindingText.Colour = colours.Red1;
+                        break;
+
+                    case null:
+                        newBindingText.Text = keyCombinationProvider.GetReadableString(keyCombination);
+                        newBindingText.Colour = Colour4.White;
+                        break;
+                }
+            }
+        }
+
+        private partial class HoverableRoundedButton : RoundedButton
+        {
+            public BindableBool IsHoveredBindable { get; set; } = new BindableBool();
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                IsHoveredBindable.Value = IsHovered;
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                IsHoveredBindable.Value = IsHovered;
+                base.OnHoverLost(e);
+            }
+        }
+    }
+}

From f5a6781e5a439c5a364e38fd76a9c15b6dc2394d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 15:36:27 +0200
Subject: [PATCH 0961/2296] Integrate key binding conflict popover into
 keybindings panel

---
 .../TestSceneKeyBindingConflictPopover.cs     | 15 +++-
 .../Sections/Input/KeyBindingConflictInfo.cs  | 15 ++++
 .../Input/KeyBindingConflictPopover.cs        | 75 ++++++++++++++-----
 .../Settings/Sections/Input/KeyBindingRow.cs  | 42 ++++++++---
 .../Sections/Input/KeyBindingsSubsection.cs   | 44 ++++++++++-
 osu.Game/Overlays/SettingsPanel.cs            | 55 +++++++-------
 6 files changed, 184 insertions(+), 62 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
index 972e1cbe79..7251350616 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
@@ -12,6 +13,7 @@ using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Rulesets.Osu;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Settings
 {
@@ -50,10 +52,15 @@ namespace osu.Game.Tests.Visual.Settings
                 Action = this.ShowPopover;
             }
 
-            public Popover GetPopover() => new KeyBindingConflictPopover(
-                OsuAction.LeftButton,
-                OsuAction.RightButton,
-                new KeyCombination(InputKey.Z));
+            public Popover GetPopover() => new KeyBindingConflictPopover
+            {
+                ConflictInfo =
+                {
+                    Value = new KeyBindingConflictInfo(
+                        new ConflictingKeyBinding(Guid.NewGuid(), OsuAction.LeftButton, KeyCombination.FromKey(Key.X), new KeyCombination(InputKey.None)),
+                        new ConflictingKeyBinding(Guid.NewGuid(), OsuAction.RightButton, KeyCombination.FromKey(Key.Z), KeyCombination.FromKey(Key.X)))
+                }
+            };
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs
new file mode 100644
index 0000000000..ea127456af
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.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 System;
+using osu.Framework.Input.Bindings;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    /// <summary>
+    /// Contains information about the key binding conflict to be resolved.
+    /// </summary>
+    public record KeyBindingConflictInfo(ConflictingKeyBinding Existing, ConflictingKeyBinding New);
+
+    public record ConflictingKeyBinding(Guid ID, object Action, KeyCombination CombinationWhenChosen, KeyCombination CombinationWhenNotChosen);
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 55b4ee3390..4206380dfe 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -10,34 +11,34 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Input.Bindings;
 using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public partial class KeyBindingConflictPopover : OsuPopover
     {
-        private readonly object existingAction;
-        private readonly object newAction;
-        private readonly KeyCombination conflictingCombination;
+        public Bindable<KeyBindingConflictInfo> ConflictInfo { get; } = new Bindable<KeyBindingConflictInfo>();
+
+        public Action? BindingConflictResolved { get; init; }
 
         private ConflictingKeyBindingPreview newPreview = null!;
         private ConflictingKeyBindingPreview existingPreview = null!;
         private HoverableRoundedButton keepExistingButton = null!;
         private HoverableRoundedButton applyNewButton = null!;
 
-        public KeyBindingConflictPopover(object existingAction, object newAction, KeyCombination conflictingCombination)
-        {
-            this.existingAction = existingAction;
-            this.newAction = newAction;
-            this.conflictingCombination = conflictingCombination;
-        }
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load() => recreateDisplay();
+
+        private void recreateDisplay()
         {
             Child = new FillFlowContainer
             {
@@ -54,8 +55,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         Text = "The binding you've selected conflicts with another existing binding.",
                         Margin = new MarginPadding { Bottom = 10 }
                     },
-                    existingPreview = new ConflictingKeyBindingPreview(existingAction, conflictingCombination),
-                    newPreview = new ConflictingKeyBindingPreview(newAction, conflictingCombination),
+                    existingPreview = new ConflictingKeyBindingPreview(ConflictInfo.Value.Existing.Action, ConflictInfo.Value.Existing.CombinationWhenChosen, ConflictInfo.Value.Existing.CombinationWhenNotChosen),
+                    newPreview = new ConflictingKeyBindingPreview(ConflictInfo.Value.New.Action, ConflictInfo.Value.New.CombinationWhenChosen, ConflictInfo.Value.New.CombinationWhenNotChosen),
                     new Container
                     {
                         RelativeSizeAxes = Axes.X,
@@ -79,7 +80,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
-                                Action = Hide
+                                Action = applyNew
                             }
                         }
                     }
@@ -87,6 +88,32 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             };
         }
 
+        private void applyNew()
+        {
+            // only "apply new" needs to cause actual realm changes, since the flow in `KeyBindingsSubsection` does not actually make db changes
+            // if it detects a binding conflict.
+            // the temporary visual changes will be reverted by calling `Hide()` / `BindingConflictResolved`.
+            realm.Write(r =>
+            {
+                var existingBinding = r.Find<RealmKeyBinding>(ConflictInfo.Value.Existing.ID);
+                existingBinding!.KeyCombinationString = ConflictInfo.Value.Existing.CombinationWhenNotChosen.ToString();
+
+                var newBinding = r.Find<RealmKeyBinding>(ConflictInfo.Value.New.ID);
+                newBinding!.KeyCombinationString = ConflictInfo.Value.Existing.CombinationWhenChosen.ToString();
+            });
+
+            Hide();
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+
+            // workaround for `VisibilityContainer.PopOut()` being called in `LoadAsyncComplete()`
+            if (IsLoaded)
+                BindingConflictResolved?.Invoke();
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -111,7 +138,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private partial class ConflictingKeyBindingPreview : CompositeDrawable
         {
             private readonly object action;
-            private readonly KeyCombination keyCombination;
+            private readonly KeyCombination combinationWhenChosen;
+            private readonly KeyCombination combinationWhenNotChosen;
 
             private OsuSpriteText newBindingText = null!;
 
@@ -123,10 +151,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             [Resolved]
             private OsuColour colours { get; set; } = null!;
 
-            public ConflictingKeyBindingPreview(object action, KeyCombination keyCombination)
+            public ConflictingKeyBindingPreview(object action, KeyCombination combinationWhenChosen, KeyCombination combinationWhenNotChosen)
             {
                 this.action = action;
-                this.keyCombination = keyCombination;
+                this.combinationWhenChosen = combinationWhenChosen;
+                this.combinationWhenNotChosen = combinationWhenNotChosen;
             }
 
             [BackgroundDependencyLoader]
@@ -187,7 +216,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                                             {
                                                 Font = OsuFont.Numeric.With(size: 10),
                                                 Margin = new MarginPadding(5),
-                                                Text = keyCombinationProvider.GetReadableString(keyCombination),
                                                 Anchor = Anchor.Centre,
                                                 Origin = Anchor.Centre
                                             }
@@ -209,23 +237,30 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             private void updateState()
             {
+                string newBinding;
+
                 switch (IsChosen.Value)
                 {
                     case true:
-                        newBindingText.Text = keyCombinationProvider.GetReadableString(keyCombination);
+                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenChosen);
                         newBindingText.Colour = colours.Green1;
                         break;
 
                     case false:
-                        newBindingText.Text = "(none)";
+                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenNotChosen);
                         newBindingText.Colour = colours.Red1;
                         break;
 
                     case null:
-                        newBindingText.Text = keyCombinationProvider.GetReadableString(keyCombination);
+                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenChosen);
                         newBindingText.Colour = Colour4.White;
                         break;
                 }
+
+                if (string.IsNullOrEmpty(newBinding))
+                    newBinding = "(none)";
+
+                newBindingText.Text = newBinding;
             }
         }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index aab6ed6d74..c8d4f339da 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -12,8 +12,10 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
@@ -31,7 +33,7 @@ using osuTK.Input;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
-    public partial class KeyBindingRow : Container, IFilterable
+    public partial class KeyBindingRow : Container, IFilterable, IHasPopover
     {
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
@@ -40,7 +42,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public delegate void KeyBindingUpdated(KeyBindingRow sender, KeyBindingUpdatedEventArgs args);
 
-        public record KeyBindingUpdatedEventArgs(Guid KeyBindingID, string KeyCombinationString);
+        public record KeyBindingUpdatedEventArgs(object Action, Guid KeyBindingID, KeyCombination KeyCombination);
+
+        public Action? BindingConflictResolved { get; set; }
 
         /// <summary>
         /// Whether left and right mouse button clicks should be included in the edited bindings.
@@ -77,7 +81,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         #endregion
 
-        private readonly object action;
+        public readonly object Action;
 
         private Bindable<bool> isDefault { get; } = new BindableBool(true);
 
@@ -107,7 +111,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <param name="action">The action that this row contains bindings for.</param>
         public KeyBindingRow(object action)
         {
-            this.action = action;
+            this.Action = action;
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -163,7 +167,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                                 },
                                 text = new OsuSpriteText
                                 {
-                                    Text = action.GetLocalisableDescription(),
+                                    Text = Action.GetLocalisableDescription(),
                                     Margin = new MarginPadding(1.5f * padding),
                                 },
                                 buttons = new FillFlowContainer<KeyButton>
@@ -220,7 +224,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 var button = buttons[i++];
                 button.UpdateKeyCombination(d);
-                finalise();
+
+                var args = new KeyBindingUpdatedEventArgs(Action, button.KeyBinding.Value.ID, button.KeyBinding.Value.KeyCombination);
+                BindingUpdated?.Invoke(this, args);
             }
 
             isDefault.Value = true;
@@ -280,7 +286,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             Debug.Assert(bindTarget != null);
 
             if (bindTarget.IsHovered)
-                finalise(false);
+                finalise();
             // prevent updating bind target before clear button's action
             else if (!cancelAndClearButtons.Any(b => b.IsHovered))
                 updateBindTarget();
@@ -429,7 +435,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 return;
 
             bindTarget.UpdateKeyCombination(InputKey.None);
-            finalise(false);
+            finalise();
         }
 
         private void finalise(bool hasChanged = true)
@@ -439,7 +445,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 updateIsDefaultValue();
 
                 bindTarget.IsBinding = false;
-                var args = new KeyBindingUpdatedEventArgs(bindTarget.KeyBinding.Value.ID, bindTarget.KeyBinding.Value.KeyCombinationString);
+                var args = new KeyBindingUpdatedEventArgs(Action, bindTarget.KeyBinding.Value.ID, bindTarget.KeyBinding.Value.KeyCombination);
                 Schedule(() =>
                 {
                     // schedule to ensure we don't instantly get focus back on next OnMouseClick (see AcceptFocus impl.)
@@ -489,6 +495,24 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             isDefault.Value = KeyBindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
         }
 
+        #region Handling conflicts
+
+        private readonly Bindable<KeyBindingConflictInfo> keyBindingConflictInfo = new Bindable<KeyBindingConflictInfo>();
+
+        public Popover GetPopover() => new KeyBindingConflictPopover
+        {
+            ConflictInfo = { BindTarget = keyBindingConflictInfo },
+            BindingConflictResolved = BindingConflictResolved
+        };
+
+        public void ShowBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
+        {
+            keyBindingConflictInfo.Value = conflictInfo;
+            this.ShowPopover();
+        }
+
+        #endregion
+
         private partial class CancelButton : RoundedButton
         {
             public CancelButton()
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index 57f6e58058..6360877116 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -38,15 +38,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load()
         {
-            var bindings = realm.Run(r => GetKeyBindings(r).Detach());
+            var bindings = getAllBindings();
 
             foreach (var defaultGroup in Defaults.GroupBy(d => d.Action))
             {
                 int intKey = (int)defaultGroup.Key;
 
-                // one row per valid action.
                 var row = CreateKeyBindingRow(defaultGroup.Key, defaultGroup)
-                    .With(row => row.BindingUpdated = onBindingUpdated);
+                    .With(row =>
+                    {
+                        row.BindingUpdated = onBindingUpdated;
+                        row.BindingConflictResolved = reloadAllBindings;
+                    });
                 row.KeyBindings.AddRange(bindings.Where(b => b.ActionInt.Equals(intKey)));
                 Add(row);
             }
@@ -59,6 +62,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected abstract IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm);
 
+        private List<RealmKeyBinding> getAllBindings() => realm.Run(r => GetKeyBindings(r).Detach());
+
         protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<KeyBinding> defaults)
             => new KeyBindingRow(action)
             {
@@ -66,9 +71,40 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Defaults = defaults.Select(d => d.KeyCombination),
             };
 
+        private void reloadAllBindings()
+        {
+            var bindings = getAllBindings();
+
+            foreach (var row in Children.OfType<KeyBindingRow>())
+            {
+                row.KeyBindings.Clear();
+                row.KeyBindings.AddRange(bindings.Where(b => b.ActionInt.Equals((int)row.Action)));
+            }
+        }
+
         private void onBindingUpdated(KeyBindingRow sender, KeyBindingRow.KeyBindingUpdatedEventArgs args)
         {
-            realm.WriteAsync(r => r.Find<RealmKeyBinding>(args.KeyBindingID)!.KeyCombinationString = args.KeyCombinationString);
+            var bindings = getAllBindings();
+            var existingBinding = args.KeyCombination.Equals(new KeyCombination(InputKey.None))
+                ? null
+                : bindings.FirstOrDefault(kb => kb.ID != args.KeyBindingID && kb.KeyCombination.Equals(args.KeyCombination));
+
+            if (existingBinding != null)
+            {
+                // `RealmKeyBinding`'s  `Action` is just an int, always.
+                // we need more than that for proper display, so leverage `Defaults` (which have the correct enum-typed object in `Action` inside).
+                object existingAssignedAction = Defaults.First(binding => (int)binding.Action == existingBinding.ActionInt).Action;
+                var bindingBeforeUpdate = bindings.Single(binding => binding.ID == args.KeyBindingID);
+
+                sender.ShowBindingConflictPopover(
+                    new KeyBindingConflictInfo(
+                        new ConflictingKeyBinding(existingBinding.ID, existingAssignedAction, existingBinding.KeyCombination, new KeyCombination(InputKey.None)),
+                        new ConflictingKeyBinding(bindingBeforeUpdate.ID, args.Action, args.KeyCombination, bindingBeforeUpdate.KeyCombination)));
+
+                return;
+            }
+
+            realm.WriteAsync(r => r.Find<RealmKeyBinding>(args.KeyBindingID)!.KeyCombinationString = args.KeyCombination.ToString());
 
             if (AutoAdvanceTarget)
             {
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 58c56a5514..2517a58491 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -14,6 +14,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
@@ -106,39 +107,43 @@ namespace osu.Game.Overlays
                 }
             };
 
-            Add(SectionsContainer = new SettingsSectionsContainer
+            Add(new PopoverContainer
             {
-                Masking = true,
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Colour = Color4.Black.Opacity(0),
-                    Type = EdgeEffectType.Shadow,
-                    Hollow = true,
-                    Radius = 10
-                },
-                MaskingSmoothness = 0,
                 RelativeSizeAxes = Axes.Both,
-                ExpandableHeader = CreateHeader(),
-                SelectedSection = { BindTarget = CurrentSection },
-                FixedHeader = new Container
+                Child = SectionsContainer = new SettingsSectionsContainer
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
                     {
-                        Vertical = 20,
-                        Horizontal = CONTENT_MARGINS
+                        Colour = Color4.Black.Opacity(0),
+                        Type = EdgeEffectType.Shadow,
+                        Hollow = true,
+                        Radius = 10
                     },
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Child = searchTextBox = new SeekLimitedSearchTextBox
+                    MaskingSmoothness = 0,
+                    RelativeSizeAxes = Axes.Both,
+                    ExpandableHeader = CreateHeader(),
+                    SelectedSection = { BindTarget = CurrentSection },
+                    FixedHeader = new Container
                     {
                         RelativeSizeAxes = Axes.X,
-                        Origin = Anchor.TopCentre,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding
+                        {
+                            Vertical = 20,
+                            Horizontal = CONTENT_MARGINS
+                        },
                         Anchor = Anchor.TopCentre,
-                    }
-                },
-                Footer = CreateFooter().With(f => f.Alpha = 0)
+                        Origin = Anchor.TopCentre,
+                        Child = searchTextBox = new SeekLimitedSearchTextBox
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                        }
+                    },
+                    Footer = CreateFooter().With(f => f.Alpha = 0)
+                }
             });
 
             if (showSidebar)

From b09252a8f85e22132922b76c67bcc26ab9dbc5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 12:19:07 +0200
Subject: [PATCH 0962/2296] Fix restore-to-default button for entire section
 triggering conflicts

---
 .../Sections/Input/KeyBindingsSubsection.cs       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index 6360877116..31c57452a9 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Localisation;
@@ -56,7 +55,19 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             Add(new ResetButton
             {
-                Action = () => Children.OfType<KeyBindingRow>().ForEach(k => k.RestoreDefaults())
+                Action = () =>
+                {
+                    realm.Write(r =>
+                    {
+                        // can't use `RestoreDefaults()` for each key binding row here as it might trigger binding conflicts along the way.
+                        foreach (var row in Children.OfType<KeyBindingRow>())
+                        {
+                            foreach (var (currentBinding, defaultBinding) in row.KeyBindings.Zip(row.Defaults))
+                                r.Find<RealmKeyBinding>(currentBinding.ID)!.KeyCombinationString = defaultBinding.ToString();
+                        }
+                    });
+                    reloadAllBindings();
+                }
             });
         }
 

From 5d637520e702de574a10ec79728e051015bf34f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 Oct 2023 08:38:51 +0200
Subject: [PATCH 0963/2296] Add test coverage for key binding conflict
 resolution

---
 .../Settings/TestSceneKeyBindingPanel.cs      | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 5a001ca127..fcbb16bef6 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -10,8 +10,11 @@ using osu.Framework.Testing;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.Settings.Sections.Input;
+using osu.Game.Rulesets.Taiko;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Settings
@@ -288,6 +291,106 @@ namespace osu.Game.Tests.Visual.Settings
             AddUntilStep("all reset section bindings buttons shown", () => panel.ChildrenOfType<ResetButton>().All(button => button.Alpha == 1));
         }
 
+        [Test]
+        public void TestBindingConflictResolvedByRollback()
+        {
+            AddStep("reset taiko section to default", () =>
+            {
+                var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
+                section.ChildrenOfType<ResetButton>().Single().TriggerClick();
+            });
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
+            scrollToAndStartBinding("Left (rim)");
+            AddStep("attempt to bind M1 to two keys", () => InputManager.Click(MouseButton.Left));
+
+            KeyBindingConflictPopover popover = null;
+            AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
+            AddStep("click first button", () => popover.ChildrenOfType<RoundedButton>().First().TriggerClick());
+            checkBinding("Left (centre)", "M1");
+            checkBinding("Left (rim)", "M2");
+        }
+
+        [Test]
+        public void TestBindingConflictResolvedByOverwrite()
+        {
+            AddStep("reset taiko section to default", () =>
+            {
+                var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
+                section.ChildrenOfType<ResetButton>().Single().TriggerClick();
+            });
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
+            scrollToAndStartBinding("Left (rim)");
+            AddStep("attempt to bind M1 to two keys", () => InputManager.Click(MouseButton.Left));
+
+            KeyBindingConflictPopover popover = null;
+            AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
+            AddStep("click second button", () => popover.ChildrenOfType<RoundedButton>().ElementAt(1).TriggerClick());
+            checkBinding("Left (centre)", string.Empty);
+            checkBinding("Left (rim)", "M1");
+        }
+
+        [Test]
+        public void TestBindingConflictCausedByResetToDefaultOfSingleRow()
+        {
+            AddStep("reset taiko section to default", () =>
+            {
+                var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
+                section.ChildrenOfType<ResetButton>().Single().TriggerClick();
+            });
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
+            scrollToAndStartBinding("Left (centre)");
+            AddStep("clear binding", () =>
+            {
+                var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
+                row.ChildrenOfType<KeyBindingRow.ClearButton>().Single().TriggerClick();
+            });
+            scrollToAndStartBinding("Left (rim)");
+            AddStep("bind M1", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("reset Left (centre) to default", () =>
+            {
+                var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
+                row.ChildrenOfType<RevertToDefaultButton<bool>>().Single().TriggerClick();
+            });
+
+            KeyBindingConflictPopover popover = null;
+            AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
+            AddStep("click second button", () => popover.ChildrenOfType<RoundedButton>().ElementAt(1).TriggerClick());
+            checkBinding("Left (centre)", "M1");
+            checkBinding("Left (rim)", string.Empty);
+        }
+
+        [Test]
+        public void TestResettingEntireSectionDoesNotCauseBindingConflicts()
+        {
+            AddStep("reset taiko section to default", () =>
+            {
+                var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
+                section.ChildrenOfType<ResetButton>().Single().TriggerClick();
+            });
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
+            scrollToAndStartBinding("Left (centre)");
+            AddStep("clear binding", () =>
+            {
+                var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
+                row.ChildrenOfType<KeyBindingRow.ClearButton>().Single().TriggerClick();
+            });
+            scrollToAndStartBinding("Left (rim)");
+            AddStep("bind M1", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("reset taiko section to default", () =>
+            {
+                var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
+                section.ChildrenOfType<ResetButton>().Single().TriggerClick();
+            });
+            AddWaitStep("wait a bit", 3);
+            AddUntilStep("conflict popover not shown", () => panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Null);
+        }
+
         private void checkBinding(string name, string keyName)
         {
             AddAssert($"Check {name} is bound to {keyName}", () =>

From 9468371556fbf59175229f3e47110665a5ce5e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 13:05:50 +0200
Subject: [PATCH 0964/2296] Fix min width not really working as intended

---
 .../Settings/Sections/Input/KeyBindingConflictPopover.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 4206380dfe..9f5766f29d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             ColumnDimensions = new[]
                             {
                                 new Dimension(),
-                                new Dimension(GridSizeMode.AutoSize, minSize: 80),
+                                new Dimension(GridSizeMode.AutoSize),
                             },
                             Content = new[]
                             {
@@ -198,20 +198,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                                     },
                                     new Container
                                     {
-                                        AutoSizeAxes = Axes.Y,
-                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Both,
                                         CornerRadius = 5,
                                         Masking = true,
                                         Anchor = Anchor.CentreRight,
                                         Origin = Anchor.CentreRight,
                                         X = -5,
-                                        Children = new Drawable[]
+                                        Children = new[]
                                         {
                                             new Box
                                             {
                                                 RelativeSizeAxes = Axes.Both,
                                                 Colour = colourProvider.Background6
                                             },
+                                            Empty().With(d => d.Width = 80), // poor man's min-width
                                             newBindingText = new OsuSpriteText
                                             {
                                                 Font = OsuFont.Numeric.With(size: 10),

From 991e425b9ab8fa82985c95ccc5986d81dee6b166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 16:30:22 +0200
Subject: [PATCH 0965/2296] Refactor conflict handling flow to be less
 back-and-forth

---
 .../Settings/Sections/Input/KeyBindingRow.cs  | 54 ++++++++++++++-----
 .../Sections/Input/KeyBindingsSubsection.cs   | 33 ++++--------
 2 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index c8d4f339da..ef54cecf0a 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -20,6 +20,7 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -27,6 +28,7 @@ using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -42,9 +44,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public delegate void KeyBindingUpdated(KeyBindingRow sender, KeyBindingUpdatedEventArgs args);
 
-        public record KeyBindingUpdatedEventArgs(object Action, Guid KeyBindingID, KeyCombination KeyCombination);
+        public record KeyBindingUpdatedEventArgs(bool BindingConflictResolved, bool CanAdvanceToNextBinding);
 
-        public Action? BindingConflictResolved { get; set; }
+        public Func<List<RealmKeyBinding>> GetAllSectionBindings { get; set; } = null!;
 
         /// <summary>
         /// Whether left and right mouse button clicks should be included in the edited bindings.
@@ -85,6 +87,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private Bindable<bool> isDefault { get; } = new BindableBool(true);
 
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; } = null!;
+
         [Resolved]
         private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
 
@@ -111,7 +119,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <param name="action">The action that this row contains bindings for.</param>
         public KeyBindingRow(object action)
         {
-            this.Action = action;
+            Action = action;
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -225,8 +233,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 var button = buttons[i++];
                 button.UpdateKeyCombination(d);
 
-                var args = new KeyBindingUpdatedEventArgs(Action, button.KeyBinding.Value.ID, button.KeyBinding.Value.KeyCombination);
-                BindingUpdated?.Invoke(this, args);
+                tryPersistKeyBinding(button.KeyBinding.Value, advanceToNextBinding: false);
             }
 
             isDefault.Value = true;
@@ -286,7 +293,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             Debug.Assert(bindTarget != null);
 
             if (bindTarget.IsHovered)
-                finalise();
+                finalise(false);
             // prevent updating bind target before clear button's action
             else if (!cancelAndClearButtons.Any(b => b.IsHovered))
                 updateBindTarget();
@@ -435,23 +442,22 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 return;
 
             bindTarget.UpdateKeyCombination(InputKey.None);
-            finalise();
+            finalise(false);
         }
 
-        private void finalise(bool hasChanged = true)
+        private void finalise(bool advanceToNextBinding = true)
         {
             if (bindTarget != null)
             {
                 updateIsDefaultValue();
 
                 bindTarget.IsBinding = false;
-                var args = new KeyBindingUpdatedEventArgs(Action, bindTarget.KeyBinding.Value.ID, bindTarget.KeyBinding.Value.KeyCombination);
+                var bindingToPersist = bindTarget.KeyBinding.Value;
                 Schedule(() =>
                 {
                     // schedule to ensure we don't instantly get focus back on next OnMouseClick (see AcceptFocus impl.)
                     bindTarget = null;
-                    if (hasChanged)
-                        BindingUpdated?.Invoke(this, args);
+                    tryPersistKeyBinding(bindingToPersist, advanceToNextBinding);
                 });
             }
 
@@ -462,6 +468,28 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             cancelAndClearButtons.BypassAutoSizeAxes |= Axes.Y;
         }
 
+        private void tryPersistKeyBinding(RealmKeyBinding keyBinding, bool advanceToNextBinding)
+        {
+            var bindings = GetAllSectionBindings();
+            var existingBinding = keyBinding.KeyCombination.Equals(new KeyCombination(InputKey.None))
+                ? null
+                : bindings.FirstOrDefault(other => other.ID != keyBinding.ID && other.KeyCombination.Equals(keyBinding.KeyCombination));
+
+            if (existingBinding == null)
+            {
+                realm.WriteAsync(r => r.Find<RealmKeyBinding>(keyBinding.ID)!.KeyCombinationString = keyBinding.KeyCombination.ToString());
+                BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(BindingConflictResolved: false, advanceToNextBinding));
+                return;
+            }
+
+            var keyBindingBeforeUpdate = bindings.Single(other => other.ID == keyBinding.ID);
+
+            showBindingConflictPopover(
+                new KeyBindingConflictInfo(
+                    new ConflictingKeyBinding(existingBinding.ID, existingBinding.GetAction(rulesets), existingBinding.KeyCombination, new KeyCombination(InputKey.None)),
+                    new ConflictingKeyBinding(keyBindingBeforeUpdate.ID, Action, keyBinding.KeyCombination, keyBindingBeforeUpdate.KeyCombination)));
+        }
+
         protected override void OnFocus(FocusEvent e)
         {
             content.AutoSizeDuration = 500;
@@ -502,10 +530,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public Popover GetPopover() => new KeyBindingConflictPopover
         {
             ConflictInfo = { BindTarget = keyBindingConflictInfo },
-            BindingConflictResolved = BindingConflictResolved
+            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(BindingConflictResolved: true, CanAdvanceToNextBinding: false))
         };
 
-        public void ShowBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
+        private void showBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
         {
             keyBindingConflictInfo.Value = conflictInfo;
             this.ShowPopover();
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
index 31c57452a9..dd0a88bfb1 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingsSubsection.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     .With(row =>
                     {
                         row.BindingUpdated = onBindingUpdated;
-                        row.BindingConflictResolved = reloadAllBindings;
+                        row.GetAllSectionBindings = getAllBindings;
                     });
                 row.KeyBindings.AddRange(bindings.Where(b => b.ActionInt.Equals(intKey)));
                 Add(row);
@@ -73,7 +73,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         protected abstract IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm);
 
-        private List<RealmKeyBinding> getAllBindings() => realm.Run(r => GetKeyBindings(r).Detach());
+        private List<RealmKeyBinding> getAllBindings() => realm.Run(r =>
+        {
+            r.Refresh();
+            return GetKeyBindings(r).Detach();
+        });
 
         protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<KeyBinding> defaults)
             => new KeyBindingRow(action)
@@ -95,29 +99,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private void onBindingUpdated(KeyBindingRow sender, KeyBindingRow.KeyBindingUpdatedEventArgs args)
         {
-            var bindings = getAllBindings();
-            var existingBinding = args.KeyCombination.Equals(new KeyCombination(InputKey.None))
-                ? null
-                : bindings.FirstOrDefault(kb => kb.ID != args.KeyBindingID && kb.KeyCombination.Equals(args.KeyCombination));
+            if (args.BindingConflictResolved)
+                reloadAllBindings();
 
-            if (existingBinding != null)
-            {
-                // `RealmKeyBinding`'s  `Action` is just an int, always.
-                // we need more than that for proper display, so leverage `Defaults` (which have the correct enum-typed object in `Action` inside).
-                object existingAssignedAction = Defaults.First(binding => (int)binding.Action == existingBinding.ActionInt).Action;
-                var bindingBeforeUpdate = bindings.Single(binding => binding.ID == args.KeyBindingID);
-
-                sender.ShowBindingConflictPopover(
-                    new KeyBindingConflictInfo(
-                        new ConflictingKeyBinding(existingBinding.ID, existingAssignedAction, existingBinding.KeyCombination, new KeyCombination(InputKey.None)),
-                        new ConflictingKeyBinding(bindingBeforeUpdate.ID, args.Action, args.KeyCombination, bindingBeforeUpdate.KeyCombination)));
-
-                return;
-            }
-
-            realm.WriteAsync(r => r.Find<RealmKeyBinding>(args.KeyBindingID)!.KeyCombinationString = args.KeyCombination.ToString());
-
-            if (AutoAdvanceTarget)
+            if (AutoAdvanceTarget && args.CanAdvanceToNextBinding)
             {
                 var next = Children.SkipWhile(c => c != sender).Skip(1).FirstOrDefault();
                 if (next != null)

From 08bdea0036397bd2618aa9e8177c13483989c947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 19:04:47 +0200
Subject: [PATCH 0966/2296] Reformat code

---
 .../Sections/Input/KeyBindingConflictPopover.cs        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 9f5766f29d..9634f30451 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -55,8 +55,14 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         Text = "The binding you've selected conflicts with another existing binding.",
                         Margin = new MarginPadding { Bottom = 10 }
                     },
-                    existingPreview = new ConflictingKeyBindingPreview(ConflictInfo.Value.Existing.Action, ConflictInfo.Value.Existing.CombinationWhenChosen, ConflictInfo.Value.Existing.CombinationWhenNotChosen),
-                    newPreview = new ConflictingKeyBindingPreview(ConflictInfo.Value.New.Action, ConflictInfo.Value.New.CombinationWhenChosen, ConflictInfo.Value.New.CombinationWhenNotChosen),
+                    existingPreview = new ConflictingKeyBindingPreview(
+                        ConflictInfo.Value.Existing.Action,
+                        ConflictInfo.Value.Existing.CombinationWhenChosen,
+                        ConflictInfo.Value.Existing.CombinationWhenNotChosen),
+                    newPreview = new ConflictingKeyBindingPreview(
+                        ConflictInfo.Value.New.Action,
+                        ConflictInfo.Value.New.CombinationWhenChosen,
+                        ConflictInfo.Value.New.CombinationWhenNotChosen),
                     new Container
                     {
                         RelativeSizeAxes = Axes.X,

From f1c1ffbdfd0c830ca3610863f89385f748400429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 19:10:33 +0200
Subject: [PATCH 0967/2296] Add localisation support

---
 osu.Game/Localisation/InputSettingsStrings.cs | 20 +++++++++++++++++
 .../Input/KeyBindingConflictPopover.cs        | 22 ++++++++++---------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Localisation/InputSettingsStrings.cs b/osu.Game/Localisation/InputSettingsStrings.cs
index 2c9b175dfb..834609053b 100644
--- a/osu.Game/Localisation/InputSettingsStrings.cs
+++ b/osu.Game/Localisation/InputSettingsStrings.cs
@@ -64,6 +64,26 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString KeyBindingPanelDescription => new TranslatableString(getKey(@"key_binding_panel_description"), @"Customise your keys!");
 
+        /// <summary>
+        /// "The binding you&#39;ve selected conflicts with another existing binding."
+        /// </summary>
+        public static LocalisableString KeyBindingConflictDetected => new TranslatableString(getKey(@"key_binding_conflict_detected"), @"The binding you've selected conflicts with another existing binding.");
+
+        /// <summary>
+        /// "Keep existing"
+        /// </summary>
+        public static LocalisableString KeepExisting => new TranslatableString(getKey(@"keep_existing"), @"Keep existing");
+
+        /// <summary>
+        /// "Apply new"
+        /// </summary>
+        public static LocalisableString ApplyNew => new TranslatableString(getKey(@"apply_new"), @"Apply new");
+
+        /// <summary>
+        /// "(none)"
+        /// </summary>
+        public static LocalisableString EmptyBinding => new TranslatableString(getKey(@"none"), @"(none)");
+
         private static string getKey(string key) => $"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 9634f30451..8f836bd9c6 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -18,6 +19,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Input.Bindings;
 using osuTK;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -52,7 +54,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Text = "The binding you've selected conflicts with another existing binding.",
+                        Text = InputSettingsStrings.KeyBindingConflictDetected,
                         Margin = new MarginPadding { Bottom = 10 }
                     },
                     existingPreview = new ConflictingKeyBindingPreview(
@@ -72,7 +74,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         {
                             keepExistingButton = new HoverableRoundedButton
                             {
-                                Text = "Keep existing",
+                                Text = InputSettingsStrings.KeepExisting,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreLeft,
@@ -81,7 +83,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             },
                             applyNewButton = new HoverableRoundedButton
                             {
-                                Text = "Apply new",
+                                Text = InputSettingsStrings.ApplyNew,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreRight,
@@ -243,30 +245,30 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             private void updateState()
             {
-                string newBinding;
+                LocalisableString keyCombinationText;
 
                 switch (IsChosen.Value)
                 {
                     case true:
-                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenChosen);
+                        keyCombinationText = keyCombinationProvider.GetReadableString(combinationWhenChosen);
                         newBindingText.Colour = colours.Green1;
                         break;
 
                     case false:
-                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenNotChosen);
+                        keyCombinationText = keyCombinationProvider.GetReadableString(combinationWhenNotChosen);
                         newBindingText.Colour = colours.Red1;
                         break;
 
                     case null:
-                        newBinding = keyCombinationProvider.GetReadableString(combinationWhenChosen);
+                        keyCombinationText = keyCombinationProvider.GetReadableString(combinationWhenChosen);
                         newBindingText.Colour = Colour4.White;
                         break;
                 }
 
-                if (string.IsNullOrEmpty(newBinding))
-                    newBinding = "(none)";
+                if (LocalisableString.IsNullOrEmpty(keyCombinationText))
+                    keyCombinationText = InputSettingsStrings.EmptyBinding;
 
-                newBindingText.Text = newBinding;
+                newBindingText.Text = keyCombinationText;
             }
         }
 

From f083309e64e1901ee7167920adf498ed5b2c4896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 19:27:19 +0200
Subject: [PATCH 0968/2296] Move type back next to exposing class

---
 .../TestSceneKeyBindingConflictPopover.cs         |  6 +++---
 .../Sections/Input/KeyBindingConflictInfo.cs      | 15 ---------------
 .../Sections/Input/KeyBindingConflictPopover.cs   |  2 +-
 .../Settings/Sections/Input/KeyBindingRow.cs      |  7 +++++++
 4 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
index 7251350616..da5a9dd513 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
@@ -56,9 +56,9 @@ namespace osu.Game.Tests.Visual.Settings
             {
                 ConflictInfo =
                 {
-                    Value = new KeyBindingConflictInfo(
-                        new ConflictingKeyBinding(Guid.NewGuid(), OsuAction.LeftButton, KeyCombination.FromKey(Key.X), new KeyCombination(InputKey.None)),
-                        new ConflictingKeyBinding(Guid.NewGuid(), OsuAction.RightButton, KeyCombination.FromKey(Key.Z), KeyCombination.FromKey(Key.X)))
+                    Value = new KeyBindingRow.KeyBindingConflictInfo(
+                        new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.LeftButton, KeyCombination.FromKey(Key.X), new KeyCombination(InputKey.None)),
+                        new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.RightButton, KeyCombination.FromKey(Key.Z), KeyCombination.FromKey(Key.X)))
                 }
             };
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.cs
deleted file mode 100644
index ea127456af..0000000000
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictInfo.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 System;
-using osu.Framework.Input.Bindings;
-
-namespace osu.Game.Overlays.Settings.Sections.Input
-{
-    /// <summary>
-    /// Contains information about the key binding conflict to be resolved.
-    /// </summary>
-    public record KeyBindingConflictInfo(ConflictingKeyBinding Existing, ConflictingKeyBinding New);
-
-    public record ConflictingKeyBinding(Guid ID, object Action, KeyCombination CombinationWhenChosen, KeyCombination CombinationWhenNotChosen);
-}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 8f836bd9c6..a7e871d508 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public partial class KeyBindingConflictPopover : OsuPopover
     {
-        public Bindable<KeyBindingConflictInfo> ConflictInfo { get; } = new Bindable<KeyBindingConflictInfo>();
+        public Bindable<KeyBindingRow.KeyBindingConflictInfo> ConflictInfo { get; } = new Bindable<KeyBindingRow.KeyBindingConflictInfo>();
 
         public Action? BindingConflictResolved { get; init; }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index ef54cecf0a..8c645996c8 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -539,6 +539,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             this.ShowPopover();
         }
 
+        /// <summary>
+        /// Contains information about the key binding conflict to be resolved.
+        /// </summary>
+        public record KeyBindingConflictInfo(ConflictingKeyBinding Existing, ConflictingKeyBinding New);
+
+        public record ConflictingKeyBinding(Guid ID, object Action, KeyCombination CombinationWhenChosen, KeyCombination CombinationWhenNotChosen);
+
         #endregion
 
         private partial class CancelButton : RoundedButton

From 6c8490bc7ef47b521d3c90c59573c82ecc2f18bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 12 Oct 2023 20:39:04 +0200
Subject: [PATCH 0969/2296] Revert changes to `LoungeSubScreen.Join()`

- `virtual` modifier was used in mocking.
- The spacing change revert is just mostly to keep it out of the final
  diff.
---
 .../OnlinePlay/Lounge/LoungeSubScreen.cs      | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 04ea59621d..fc4a5357c6 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -297,29 +297,26 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             popoverContainer.HidePopover();
         }
 
-        public void Join(Room room, string password, Action<Room> onSuccess = null, Action<string> onFailure = null)
+        public virtual void Join(Room room, string password, Action<Room> onSuccess = null, Action<string> onFailure = null) => Schedule(() =>
         {
-            Schedule(() =>
+            if (joiningRoomOperation != null)
+                return;
+
+            joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
+
+            RoomManager?.JoinRoom(room, password, _ =>
             {
-                if (joiningRoomOperation != null)
-                    return;
-
-                joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
-
-                RoomManager?.JoinRoom(room, password, _ =>
-                {
-                    Open(room);
-                    joiningRoomOperation?.Dispose();
-                    joiningRoomOperation = null;
-                    onSuccess?.Invoke(room);
-                }, error =>
-                {
-                    joiningRoomOperation?.Dispose();
-                    joiningRoomOperation = null;
-                    onFailure?.Invoke(error);
-                });
+                Open(room);
+                joiningRoomOperation?.Dispose();
+                joiningRoomOperation = null;
+                onSuccess?.Invoke(room);
+            }, error =>
+            {
+                joiningRoomOperation?.Dispose();
+                joiningRoomOperation = null;
+                onFailure?.Invoke(error);
             });
-        }
+        });
 
         /// <summary>
         /// Copies a room and opens it as a fresh (not-yet-created) one.

From 9289c47cd4c45d9e77e32cb7030c456a61184baf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 13:47:51 +0900
Subject: [PATCH 0970/2296] Tidy up `GlobalActionContainer` a bit

---
 .../Input/Bindings/GlobalActionContainer.cs   | 115 +++++++++---------
 1 file changed, 60 insertions(+), 55 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 9419bd2a0e..20220d88cd 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Input.Bindings
 {
     public partial class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput, IKeyBindingHandler<GlobalAction>
     {
+        protected override bool Prioritised => true;
+
         private readonly IKeyBindingHandler<GlobalAction>? handler;
 
         public GlobalActionContainer(OsuGameBase? game)
@@ -23,22 +25,62 @@ namespace osu.Game.Input.Bindings
                 handler = h;
         }
 
-        protected override bool Prioritised => true;
-
-        // IMPORTANT: Take care when changing order of the items in the enumerable.
-        // It is used to decide the order of precedence, with the earlier items having higher precedence.
-        public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings
-                                                                       .Concat(EditorKeyBindings)
-                                                                       .Concat(InGameKeyBindings)
-                                                                       .Concat(ReplayKeyBindings)
-                                                                       .Concat(SongSelectKeyBindings)
-                                                                       .Concat(AudioControlKeyBindings)
+        /// <summary>
+        /// All default key bindings across all categories, ordered with highest priority first.
+        /// </summary>
+        /// <remarks>
+        /// IMPORTANT: Take care when changing order of the items in the enumerable.
+        /// It is used to decide the order of precedence, with the earlier items having higher precedence.
+        /// </remarks>
+        public override IEnumerable<IKeyBinding> DefaultKeyBindings => globalKeyBindings
+                                                                       .Concat(editorKeyBindings)
+                                                                       .Concat(inGameKeyBindings)
+                                                                       .Concat(replayKeyBindings)
+                                                                       .Concat(songSelectKeyBindings)
+                                                                       .Concat(audioControlKeyBindings)
                                                                        // Overlay bindings may conflict with more local cases like the editor so they are checked last.
                                                                        // It has generally been agreed on that local screens like the editor should have priority,
                                                                        // based on such usages potentially requiring a lot more key bindings that may be "shared" with global ones.
-                                                                       .Concat(OverlayKeyBindings);
+                                                                       .Concat(overlayKeyBindings);
 
-        public static IEnumerable<KeyBinding> GlobalKeyBindings => new[]
+        public static IEnumerable<KeyBinding> GetDefaultBindingsFor(GlobalActionCategory category)
+        {
+            switch (category)
+            {
+                case GlobalActionCategory.General:
+                    return globalKeyBindings;
+
+                case GlobalActionCategory.Editor:
+                    return editorKeyBindings;
+
+                case GlobalActionCategory.InGame:
+                    return inGameKeyBindings;
+
+                case GlobalActionCategory.Replay:
+                    return replayKeyBindings;
+
+                case GlobalActionCategory.SongSelect:
+                    return songSelectKeyBindings;
+
+                case GlobalActionCategory.AudioControl:
+                    return audioControlKeyBindings;
+
+                case GlobalActionCategory.Overlays:
+                    return overlayKeyBindings;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(category), category, $"Unexpected {nameof(GlobalActionCategory)}");
+            }
+        }
+
+        public static IEnumerable<GlobalAction> GetGlobalActionsFor(GlobalActionCategory category)
+            => GetDefaultBindingsFor(category).Select(binding => binding.Action).Cast<GlobalAction>().Distinct();
+
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) => handler?.OnPressed(e) == true;
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => handler?.OnReleased(e);
+
+        private static IEnumerable<KeyBinding> globalKeyBindings => new[]
         {
             new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
             new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
@@ -68,7 +110,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F12, GlobalAction.TakeScreenshot),
         };
 
-        public static IEnumerable<KeyBinding> OverlayKeyBindings => new[]
+        private static IEnumerable<KeyBinding> overlayKeyBindings => new[]
         {
             new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
             new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
@@ -78,7 +120,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
         };
 
-        public static IEnumerable<KeyBinding> EditorKeyBindings => new[]
+        private static IEnumerable<KeyBinding> editorKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.F1 }, GlobalAction.EditorComposeMode),
             new KeyBinding(new[] { InputKey.F2 }, GlobalAction.EditorDesignMode),
@@ -102,7 +144,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.R }, GlobalAction.EditorToggleRotateControl),
         };
 
-        public static IEnumerable<KeyBinding> InGameKeyBindings => new[]
+        private static IEnumerable<KeyBinding> inGameKeyBindings => new[]
         {
             new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene),
             new KeyBinding(InputKey.ExtraMouseButton2, GlobalAction.SkipCutscene),
@@ -119,7 +161,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F2, GlobalAction.ExportReplay),
         };
 
-        public static IEnumerable<KeyBinding> ReplayKeyBindings => new[]
+        private static IEnumerable<KeyBinding> replayKeyBindings => new[]
         {
             new KeyBinding(InputKey.Space, GlobalAction.TogglePauseReplay),
             new KeyBinding(InputKey.MouseMiddle, GlobalAction.TogglePauseReplay),
@@ -128,7 +170,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.H }, GlobalAction.ToggleReplaySettings),
         };
 
-        public static IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
+        private static IEnumerable<KeyBinding> songSelectKeyBindings => new[]
         {
             new KeyBinding(InputKey.F1, GlobalAction.ToggleModSelection),
             new KeyBinding(InputKey.F2, GlobalAction.SelectNextRandom),
@@ -137,7 +179,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.BackSpace, GlobalAction.DeselectAllMods),
         };
 
-        public static IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
+        private static IEnumerable<KeyBinding> audioControlKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.Alt, InputKey.Up }, GlobalAction.IncreaseVolume),
             new KeyBinding(new[] { InputKey.Alt, InputKey.Down }, GlobalAction.DecreaseVolume),
@@ -154,43 +196,6 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.PlayPause, GlobalAction.MusicPlay),
             new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
         };
-
-        public static IEnumerable<KeyBinding> GetDefaultBindingsFor(GlobalActionCategory category)
-        {
-            switch (category)
-            {
-                case GlobalActionCategory.General:
-                    return GlobalKeyBindings;
-
-                case GlobalActionCategory.Editor:
-                    return EditorKeyBindings;
-
-                case GlobalActionCategory.InGame:
-                    return InGameKeyBindings;
-
-                case GlobalActionCategory.Replay:
-                    return ReplayKeyBindings;
-
-                case GlobalActionCategory.SongSelect:
-                    return SongSelectKeyBindings;
-
-                case GlobalActionCategory.AudioControl:
-                    return AudioControlKeyBindings;
-
-                case GlobalActionCategory.Overlays:
-                    return OverlayKeyBindings;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(category), category, $"Unexpected {nameof(GlobalActionCategory)}");
-            }
-        }
-
-        public static IEnumerable<GlobalAction> GetGlobalActionsFor(GlobalActionCategory category)
-            => GetDefaultBindingsFor(category).Select(binding => binding.Action).Cast<GlobalAction>().Distinct();
-
-        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) => handler?.OnPressed(e) == true;
-
-        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => handler?.OnReleased(e);
     }
 
     public enum GlobalAction

From a3b21281e68a67fc609c719abe9bc4a488f8ee41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 14:25:38 +0900
Subject: [PATCH 0971/2296] Add reordering support to match existing diffcalc
 100%

---
 .../Preprocessing/OsuDifficultyHitObject.cs   | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index 959449fdbb..488d1e2e9f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             if (slider.LazyEndPosition != null)
                 return;
 
-            // This commented version is actually correct by the new lazer implementation, but intentionally held back from
+            // TODO: This commented version is actually correct by the new lazer implementation, but intentionally held back from
             // difficulty calculator to preserve known behaviour.
             // double trackingEndTime = Math.Max(
             //     // SliderTailCircle always occurs at the final end time of the slider, but the player only needs to hold until within a lenience before it.
@@ -225,10 +225,33 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             //     slider.NestedHitObjects.LastOrDefault(n => n is not SliderTailCircle)?.StartTime ?? double.MinValue
             // );
 
-            double trackingEndTime = Math.Max(Math.Max(
+            double trackingEndTime = Math.Max(
                 slider.StartTime + slider.Duration + SliderEventGenerator.TAIL_LENIENCY,
                 slider.StartTime + slider.Duration / 2
-            ), slider.NestedHitObjects.OfType<SliderTick>().LastOrDefault()?.StartTime ?? double.MinValue);
+            );
+
+            IList<HitObject> nestedObjects = slider.NestedHitObjects;
+
+            SliderTick? lastRealTick = slider.NestedHitObjects.OfType<SliderTick>().LastOrDefault();
+
+            if (lastRealTick?.StartTime > trackingEndTime)
+            {
+                trackingEndTime = lastRealTick.StartTime;
+
+                // When the last tick falls after the tracking end time, we need to re-sort the nested objects
+                // based on time. This creates a somewhat weird ordering which is counter to how a user would
+                // understand the slider, but allows a zero-diff with known diffcalc output.
+                //
+                // To reiterate, this is definitely not correct from a difficulty calculation perspective
+                // and should be revisited at a later date (likely by replacing this whole code with the commented
+                // version above).
+                List<HitObject> reordered = nestedObjects.ToList();
+
+                reordered.Remove(lastRealTick);
+                reordered.Add(lastRealTick);
+
+                nestedObjects = reordered;
+            }
 
             slider.LazyTravelTime = trackingEndTime - slider.StartTime;
 
@@ -239,12 +262,14 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
                 endTimeMin %= 1;
 
             slider.LazyEndPosition = slider.StackedPosition + slider.Path.PositionAt(endTimeMin); // temporary lazy end position until a real result can be derived.
-            var currCursorPosition = slider.StackedPosition;
+
+            Vector2 currCursorPosition = slider.StackedPosition;
+
             double scalingFactor = NORMALISED_RADIUS / slider.Radius; // lazySliderDistance is coded to be sensitive to scaling, this makes the maths easier with the thresholds being used.
 
-            for (int i = 1; i < slider.NestedHitObjects.Count; i++)
+            for (int i = 1; i < nestedObjects.Count; i++)
             {
-                var currMovementObj = (OsuHitObject)slider.NestedHitObjects[i];
+                var currMovementObj = (OsuHitObject)nestedObjects[i];
 
                 Vector2 currMovement = Vector2.Subtract(currMovementObj.StackedPosition, currCursorPosition);
                 double currMovementLength = scalingFactor * currMovement.Length;
@@ -252,7 +277,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
                 // Amount of movement required so that the cursor position needs to be updated.
                 double requiredMovement = assumed_slider_radius;
 
-                if (i == slider.NestedHitObjects.Count - 1)
+                if (i == nestedObjects.Count - 1)
                 {
                     // The end of a slider has special aim rules due to the relaxed time constraint on position.
                     // There is both a lazy end position as well as the actual end slider position. We assume the player takes the simpler movement.
@@ -279,7 +304,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
                     slider.LazyTravelDistance += (float)currMovementLength;
                 }
 
-                if (i == slider.NestedHitObjects.Count - 1)
+                if (i == nestedObjects.Count - 1)
                     slider.LazyEndPosition = currCursorPosition;
             }
         }

From 17df2fdf0104d8433be92f48384e783a32fcd03c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 15:42:49 +0900
Subject: [PATCH 0972/2296] Restrict `followpoint` size

See https://github.com/ppy/osu/issues/24940#issuecomment-1760980461.
---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 88a4e17120..f06cad7061 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 switch (osuComponent.Component)
                 {
                     case OsuSkinComponents.FollowPoint:
-                        return this.GetAnimation("followpoint", true, true, true, startAtCurrentTime: false);
+                        return this.GetAnimation("followpoint", true, true, true, startAtCurrentTime: false, maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2, OsuHitObject.OBJECT_RADIUS));
 
                     case OsuSkinComponents.SliderScorePoint:
                         return this.GetAnimation("sliderscorepoint", false, false);

From 0b64852181f219f05529d90d6c0c08807c81fa80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 15:43:18 +0900
Subject: [PATCH 0973/2296] Limit `sliderscorepoint` to hitcicle dimensions

You'd never use anything above this unless crazy.
---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index f06cad7061..3002cbe0ae 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return this.GetAnimation("followpoint", true, true, true, startAtCurrentTime: false, maxSize: new Vector2(OsuHitObject.OBJECT_RADIUS * 2, OsuHitObject.OBJECT_RADIUS));
 
                     case OsuSkinComponents.SliderScorePoint:
-                        return this.GetAnimation("sliderscorepoint", false, false);
+                        return this.GetAnimation("sliderscorepoint", false, false, maxSize: OsuHitObject.OBJECT_DIMENSIONS);
 
                     case OsuSkinComponents.SliderFollowCircle:
                         var followCircleContent = this.GetAnimation("sliderfollowcircle", true, true, true, maxSize: MAX_FOLLOW_CIRCLE_AREA_SIZE);

From 61b8d035fe938ef274694357ac15f0e0774b81d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 09:08:13 +0200
Subject: [PATCH 0974/2296] Use dangerous colour for "apply new" button

---
 .../Settings/Sections/Input/KeyBindingConflictPopover.cs      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index a7e871d508..297d8fab63 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -37,6 +37,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load() => recreateDisplay();
 
@@ -84,6 +87,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             applyNewButton = new HoverableRoundedButton
                             {
                                 Text = InputSettingsStrings.ApplyNew,
+                                BackgroundColour = colours.Pink3,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreRight,

From 37873484485dc59e3e1f1506a013ee57db849f4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 16:29:02 +0900
Subject: [PATCH 0975/2296] Change `Perfect` judgement to not give extra score

---
 osu.Game/Rulesets/Judgements/Judgement.cs | 5 ++---
 osu.Game/Rulesets/Scoring/HitResult.cs    | 7 +++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index f60b3a6c02..cd1e81046d 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -190,10 +190,9 @@ namespace osu.Game.Rulesets.Judgements
                     return 200;
 
                 case HitResult.Great:
-                    return 300;
-
+                // Perfect doesn't actually give more score / accuracy directly.
                 case HitResult.Perfect:
-                    return 315;
+                    return 300;
 
                 case HitResult.SmallBonus:
                     return SMALL_BONUS_SCORE;
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index ccd1f49de4..fed338b012 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -55,6 +55,13 @@ namespace osu.Game.Rulesets.Scoring
         [Order(1)]
         Great,
 
+        /// <summary>
+        /// This is an optional timing window tighter than <see cref="Great"/>.
+        /// </summary>
+        /// <remarks>
+        /// By default, this does not give any bonus accuracy or score.
+        /// To have it affect scoring, consider adding a nested bonus object.
+        /// </remarks>
         [Description(@"Perfect")]
         [EnumMember(Value = "perfect")]
         [Order(0)]

From 79cec7707d46b4381c59e5d51d5d258f779d45a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 09:56:46 +0200
Subject: [PATCH 0976/2296] Privatise setter

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

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 88bbff6b92..f652e88f5a 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.OnlinePlay
         // while leases may be taken out by a subscreen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
-        protected LoungeSubScreen Lounge;
+        protected LoungeSubScreen Lounge { get; private set; }
 
         private MultiplayerWaveContainer waves;
         private ScreenStack screenStack;

From 94b64044e01681d3ce3da221255b26822b52c8e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 17:01:48 +0900
Subject: [PATCH 0977/2296] Add nested bonus judgement to `DrawableNote` for
 perfect bonus score

---
 .../Objects/Drawables/DrawableNote.cs         | 39 +++++++++++++++++++
 .../Drawables/DrawablePerfectBonusNote.cs     | 25 ++++++++++++
 osu.Game.Rulesets.Mania/Objects/Note.cs       |  8 ++++
 .../Objects/PerfectBonusNote.cs               | 19 +++++++++
 osu.Game.Rulesets.Mania/UI/Column.cs          |  1 +
 5 files changed, 92 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
 create mode 100644 osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 0819e8401c..dbc9446585 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System.Diagnostics;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -13,6 +14,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Skinning.Default;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
@@ -38,6 +41,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private Drawable headPiece;
 
+        [CanBeNull]
+        private DrawablePerfectBonusNote bonusNote;
+
         public DrawableNote()
             : this(null)
         {
@@ -89,7 +95,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (!userTriggered)
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
+                {
+                    bonusNote!.TriggerResult(false);
                     ApplyResult(r => r.Type = r.Judgement.MinResult);
+                }
+
                 return;
             }
 
@@ -97,6 +107,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (result == HitResult.None)
                 return;
 
+            bonusNote!.TriggerResult(result == HitResult.Perfect);
             ApplyResult(r => r.Type = result);
         }
 
@@ -115,6 +126,34 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
         }
 
+        protected override void AddNestedHitObject(DrawableHitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case DrawablePerfectBonusNote bonus:
+                    AddInternal(bonusNote = bonus);
+                    break;
+            }
+        }
+
+        protected override void ClearNestedHitObjects()
+        {
+            if (bonusNote != null)
+                RemoveInternal(bonusNote, false);
+            bonusNote = null;
+        }
+
+        protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case PerfectBonusNote bonus:
+                    return new DrawablePerfectBonusNote(bonus);
+            }
+
+            return base.CreateNestedHitObject(hitObject);
+        }
+
         private void updateSnapColour()
         {
             if (beatmap == null || HitObject == null) return;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
new file mode 100644
index 0000000000..9f51f9c5b3
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
@@ -0,0 +1,25 @@
+// 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.Objects.Drawables
+{
+    public partial class DrawablePerfectBonusNote : DrawableManiaHitObject<PerfectBonusNote>
+    {
+        public DrawablePerfectBonusNote()
+            : this(null!)
+        {
+            AlwaysPresent = true;
+        }
+
+        public DrawablePerfectBonusNote(PerfectBonusNote hitObject)
+            : base(hitObject)
+        {
+        }
+
+        /// <summary>
+        /// Apply a judgement result.
+        /// </summary>
+        /// <param name="hit">Whether this tick was reached.</param>
+        internal void TriggerResult(bool hit) => ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 0035960c63..955d3e9c7d 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.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.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -12,5 +13,12 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class Note : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new ManiaJudgement();
+
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
+        {
+            base.CreateNestedHitObjects(cancellationToken);
+
+            AddNested(new PerfectBonusNote { StartTime = StartTime });
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
new file mode 100644
index 0000000000..b601a0614b
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
@@ -0,0 +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.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Judgements;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Objects
+{
+    public class PerfectBonusNote : ManiaHitObject
+    {
+        public override Judgement CreateJudgement() => new PerfectBonusNoteJudgement();
+
+        public class PerfectBonusNoteJudgement : ManiaJudgement
+        {
+            public override HitResult MaxResult => HitResult.SmallBonus;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 6cd55bb099..68d1e929be 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -109,6 +109,7 @@ namespace osu.Game.Rulesets.Mania.UI
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
             RegisterPool<Note, DrawableNote>(10, 50);
+            RegisterPool<PerfectBonusNote, DrawablePerfectBonusNote>(10, 50);
             RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);

From e04a57d67f68db5b45a9ab5767bc0ed57f0b1a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 10:31:00 +0200
Subject: [PATCH 0978/2296] Use less dodgy method of specifying allowable
 notification types

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

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index dd4924d07a..81233b4343 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Overlays
                                     Children = new[]
                                     {
                                         // The main section adds as a catch-all for notifications which don't group into other sections.
-                                        new NotificationSection(AccountsStrings.NotificationsTitle, new[] { typeof(Notification) }),
+                                        new NotificationSection(AccountsStrings.NotificationsTitle),
                                         new NotificationSection(NotificationsStrings.RunningTasks, new[] { typeof(ProgressNotification) }),
                                     }
                                 }
@@ -206,7 +206,8 @@ namespace osu.Game.Overlays
             var ourType = notification.GetType();
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
 
-            var section = sections.Children.Last(s => s.AcceptedNotificationTypes.Any(accept => accept.IsAssignableFrom(ourType)));
+            var section = sections.Children.FirstOrDefault(s => s.AcceptedNotificationTypes?.Any(accept => accept.IsAssignableFrom(ourType)) == true)
+                          ?? sections.First();
 
             section.Add(notification, depth);
 
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 10c2900d63..895f13ee9c 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -37,13 +37,17 @@ namespace osu.Game.Overlays.Notifications
             notifications.Insert((int)position, notification);
         }
 
-        public IEnumerable<Type> AcceptedNotificationTypes { get; }
+        /// <summary>
+        /// Enumerable of notification types accepted in this section.
+        /// If <see langword="null"/>, the section accepts any and all notifications.
+        /// </summary>
+        public IEnumerable<Type>? AcceptedNotificationTypes { get; }
 
         private readonly LocalisableString titleText;
 
-        public NotificationSection(LocalisableString title, IEnumerable<Type> acceptedNotificationTypes)
+        public NotificationSection(LocalisableString title, IEnumerable<Type>? acceptedNotificationTypes = null)
         {
-            AcceptedNotificationTypes = acceptedNotificationTypes.ToArray();
+            AcceptedNotificationTypes = acceptedNotificationTypes?.ToArray();
 
             titleText = title;
         }

From 125f28219dd32b8039f27a721bd2926eb3bfa48a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 17:36:19 +0900
Subject: [PATCH 0979/2296] Fix hodl tail notes not correctly handling nested
 bonus judgement

---
 .../Objects/Drawables/DrawableHoldNoteTail.cs | 35 +++++--------------
 .../Objects/Drawables/DrawableNote.cs         |  4 ++-
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index a559e91f1b..a183231310 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System.Diagnostics;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Scoring;
@@ -33,35 +32,19 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public void UpdateResult() => base.UpdateResult(true);
 
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
-        {
-            Debug.Assert(HitObject.HitWindows != null);
-
+        protected override void CheckForResult(bool userTriggered, double timeOffset) =>
             // Factor in the release lenience
-            timeOffset /= TailNote.RELEASE_WINDOW_LENIENCE;
+            base.CheckForResult(userTriggered, timeOffset / TailNote.RELEASE_WINDOW_LENIENCE);
 
-            if (!userTriggered)
-            {
-                if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                    ApplyResult(r => r.Type = r.Judgement.MinResult);
+        protected override HitResult MutateResultApplication(HitResult result)
+        {
+            // If the head wasn't hit or the hold note was broken, cap the max score to Meh.
+            bool hasComboBreak = !HoldNote.Head.IsHit || HoldNote.Body.HasHoldBreak;
 
-                return;
-            }
+            if (result > HitResult.Meh && hasComboBreak)
+                return HitResult.Meh;
 
-            var result = HitObject.HitWindows.ResultFor(timeOffset);
-            if (result == HitResult.None)
-                return;
-
-            ApplyResult(r =>
-            {
-                // If the head wasn't hit or the hold note was broken, cap the max score to Meh.
-                bool hasComboBreak = !HoldNote.Head.IsHit || HoldNote.Body.HasHoldBreak;
-
-                if (result > HitResult.Meh && hasComboBreak)
-                    result = HitResult.Meh;
-
-                r.Type = result;
-            });
+            return result;
         }
 
         public override bool OnPressed(KeyBindingPressEvent<ManiaAction> e) => false; // Handled by the hold note
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index dbc9446585..eaeac33a11 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -108,9 +108,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 return;
 
             bonusNote!.TriggerResult(result == HitResult.Perfect);
-            ApplyResult(r => r.Type = result);
+            ApplyResult(r => r.Type = MutateResultApplication(result));
         }
 
+        protected virtual HitResult MutateResultApplication(HitResult result) => result;
+
         public virtual bool OnPressed(KeyBindingPressEvent<ManiaAction> e)
         {
             if (e.Action != Action.Value)

From 850950ba610018e87980bb2e2dfa80c371b16578 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 17:36:30 +0900
Subject: [PATCH 0980/2296] Add note about why `SmallBonus` is not listed in
 `GetValidHitResults`

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index ff34b69d19..0055e10ada 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -385,6 +385,9 @@ namespace osu.Game.Rulesets.Mania
                 HitResult.Good,
                 HitResult.Ok,
                 HitResult.Meh,
+
+                // HitResult.SmallBonus is used for awarding perfect bonus score but is not included here as
+                // it would be a bit redundant to show this to the user.
             };
         }
 

From d7a06059f201420da2cd0b223f0a0a8aa33a2384 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 17:49:48 +0900
Subject: [PATCH 0981/2296] Rename string properties to give more hinting to
 localisers

---
 osu.Game/Localisation/InputSettingsStrings.cs               | 6 +++---
 .../Settings/Sections/Input/KeyBindingConflictPopover.cs    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Localisation/InputSettingsStrings.cs b/osu.Game/Localisation/InputSettingsStrings.cs
index 834609053b..a13a9dc498 100644
--- a/osu.Game/Localisation/InputSettingsStrings.cs
+++ b/osu.Game/Localisation/InputSettingsStrings.cs
@@ -72,17 +72,17 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "Keep existing"
         /// </summary>
-        public static LocalisableString KeepExisting => new TranslatableString(getKey(@"keep_existing"), @"Keep existing");
+        public static LocalisableString KeepExistingBinding => new TranslatableString(getKey(@"keep_existing"), @"Keep existing");
 
         /// <summary>
         /// "Apply new"
         /// </summary>
-        public static LocalisableString ApplyNew => new TranslatableString(getKey(@"apply_new"), @"Apply new");
+        public static LocalisableString ApplyNewBinding => new TranslatableString(getKey(@"apply_new"), @"Apply new");
 
         /// <summary>
         /// "(none)"
         /// </summary>
-        public static LocalisableString EmptyBinding => new TranslatableString(getKey(@"none"), @"(none)");
+        public static LocalisableString ActionHasNoKeyBinding => new TranslatableString(getKey(@"none"), @"(none)");
 
         private static string getKey(string key) => $"{prefix}:{key}";
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 297d8fab63..a0f6192587 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         {
                             keepExistingButton = new HoverableRoundedButton
                             {
-                                Text = InputSettingsStrings.KeepExisting,
+                                Text = InputSettingsStrings.KeepExistingBinding,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreLeft,
@@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             },
                             applyNewButton = new HoverableRoundedButton
                             {
-                                Text = InputSettingsStrings.ApplyNew,
+                                Text = InputSettingsStrings.ApplyNewBinding,
                                 BackgroundColour = colours.Pink3,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
@@ -270,7 +270,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 }
 
                 if (LocalisableString.IsNullOrEmpty(keyCombinationText))
-                    keyCombinationText = InputSettingsStrings.EmptyBinding;
+                    keyCombinationText = InputSettingsStrings.ActionHasNoKeyBinding;
 
                 newBindingText.Text = keyCombinationText;
             }

From 8e609b6f1dbfad804eca91394d5bccfcf20aaa75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 18:18:06 +0900
Subject: [PATCH 0982/2296] Switch records to classes for sanity

I don't have anything against records except for the capitalisation when
including the paramter names in a constructor.

ie. `new Record(This: 1);`
---
 .../Settings/Sections/Input/KeyBindingRow.cs  | 53 ++++++++++++++++---
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 8c645996c8..c7791f4412 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -44,8 +44,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         public delegate void KeyBindingUpdated(KeyBindingRow sender, KeyBindingUpdatedEventArgs args);
 
-        public record KeyBindingUpdatedEventArgs(bool BindingConflictResolved, bool CanAdvanceToNextBinding);
-
         public Func<List<RealmKeyBinding>> GetAllSectionBindings { get; set; } = null!;
 
         /// <summary>
@@ -470,15 +468,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private void tryPersistKeyBinding(RealmKeyBinding keyBinding, bool advanceToNextBinding)
         {
-            var bindings = GetAllSectionBindings();
-            var existingBinding = keyBinding.KeyCombination.Equals(new KeyCombination(InputKey.None))
+            List<RealmKeyBinding> bindings = GetAllSectionBindings();
+            RealmKeyBinding? existingBinding = keyBinding.KeyCombination.Equals(new KeyCombination(InputKey.None))
                 ? null
                 : bindings.FirstOrDefault(other => other.ID != keyBinding.ID && other.KeyCombination.Equals(keyBinding.KeyCombination));
 
             if (existingBinding == null)
             {
                 realm.WriteAsync(r => r.Find<RealmKeyBinding>(keyBinding.ID)!.KeyCombinationString = keyBinding.KeyCombination.ToString());
-                BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(BindingConflictResolved: false, advanceToNextBinding));
+                BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: false, advanceToNextBinding));
                 return;
             }
 
@@ -530,7 +528,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public Popover GetPopover() => new KeyBindingConflictPopover
         {
             ConflictInfo = { BindTarget = keyBindingConflictInfo },
-            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(BindingConflictResolved: true, CanAdvanceToNextBinding: false))
+            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: true, canAdvanceToNextBinding: false))
         };
 
         private void showBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
@@ -542,9 +540,48 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         /// <summary>
         /// Contains information about the key binding conflict to be resolved.
         /// </summary>
-        public record KeyBindingConflictInfo(ConflictingKeyBinding Existing, ConflictingKeyBinding New);
+        public class KeyBindingConflictInfo
+        {
+            public ConflictingKeyBinding Existing { get; }
+            public ConflictingKeyBinding New { get; }
 
-        public record ConflictingKeyBinding(Guid ID, object Action, KeyCombination CombinationWhenChosen, KeyCombination CombinationWhenNotChosen);
+            /// <summary>
+            /// Contains information about the key binding conflict to be resolved.
+            /// </summary>
+            public KeyBindingConflictInfo(ConflictingKeyBinding existingBinding, ConflictingKeyBinding newBinding)
+            {
+                Existing = existingBinding;
+                New = newBinding;
+            }
+        }
+
+        public class ConflictingKeyBinding
+        {
+            public Guid ID { get; }
+            public object Action { get; }
+            public KeyCombination CombinationWhenChosen { get; }
+            public KeyCombination CombinationWhenNotChosen { get; }
+
+            public ConflictingKeyBinding(Guid id, object action, KeyCombination combinationWhenChosen, KeyCombination combinationWhenNotChosen)
+            {
+                ID = id;
+                Action = action;
+                CombinationWhenChosen = combinationWhenChosen;
+                CombinationWhenNotChosen = combinationWhenNotChosen;
+            }
+        }
+
+        public class KeyBindingUpdatedEventArgs
+        {
+            public bool BindingConflictResolved { get; }
+            public bool CanAdvanceToNextBinding { get; }
+
+            public KeyBindingUpdatedEventArgs(bool bindingConflictResolved, bool canAdvanceToNextBinding)
+            {
+                BindingConflictResolved = bindingConflictResolved;
+                CanAdvanceToNextBinding = canAdvanceToNextBinding;
+            }
+        }
 
         #endregion
 

From 9b0c4acdefdcd47c0e98f55aa18d5a00bf272cb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 18:29:06 +0900
Subject: [PATCH 0983/2296] Split `KeyBindingRow` out into partial pieces

---
 .../Input/KeyBindingRow.ConflictResolution.cs |  75 +++++
 .../Sections/Input/KeyBindingRow.KeyButton.cs | 168 +++++++++++
 .../Settings/Sections/Input/KeyBindingRow.cs  | 278 +++---------------
 3 files changed, 276 insertions(+), 245 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
new file mode 100644
index 0000000000..8afa43b1ff
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
@@ -0,0 +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.
+
+using System;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Bindings;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public partial class KeyBindingRow : IHasPopover
+    {
+        private readonly Bindable<KeyBindingConflictInfo> keyBindingConflictInfo = new Bindable<KeyBindingConflictInfo>();
+
+        public Popover GetPopover() => new KeyBindingConflictPopover
+        {
+            ConflictInfo = { BindTarget = keyBindingConflictInfo },
+            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: true, canAdvanceToNextBinding: false))
+        };
+
+        private void showBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
+        {
+            keyBindingConflictInfo.Value = conflictInfo;
+            this.ShowPopover();
+        }
+
+        /// <summary>
+        /// Contains information about the key binding conflict to be resolved.
+        /// </summary>
+        public class KeyBindingConflictInfo
+        {
+            public ConflictingKeyBinding Existing { get; }
+            public ConflictingKeyBinding New { get; }
+
+            /// <summary>
+            /// Contains information about the key binding conflict to be resolved.
+            /// </summary>
+            public KeyBindingConflictInfo(ConflictingKeyBinding existingBinding, ConflictingKeyBinding newBinding)
+            {
+                Existing = existingBinding;
+                New = newBinding;
+            }
+        }
+
+        public class ConflictingKeyBinding
+        {
+            public Guid ID { get; }
+            public object Action { get; }
+            public KeyCombination CombinationWhenChosen { get; }
+            public KeyCombination CombinationWhenNotChosen { get; }
+
+            public ConflictingKeyBinding(Guid id, object action, KeyCombination combinationWhenChosen, KeyCombination combinationWhenNotChosen)
+            {
+                ID = id;
+                Action = action;
+                CombinationWhenChosen = combinationWhenChosen;
+                CombinationWhenNotChosen = combinationWhenNotChosen;
+            }
+        }
+
+        public class KeyBindingUpdatedEventArgs
+        {
+            public bool BindingConflictResolved { get; }
+            public bool CanAdvanceToNextBinding { get; }
+
+            public KeyBindingUpdatedEventArgs(bool bindingConflictResolved, bool canAdvanceToNextBinding)
+            {
+                BindingConflictResolved = bindingConflictResolved;
+                CanAdvanceToNextBinding = canAdvanceToNextBinding;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs
new file mode 100644
index 0000000000..cf26300fb6
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs
@@ -0,0 +1,168 @@
+// 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.Linq;
+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.Shapes;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Input;
+using osu.Game.Input.Bindings;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public partial class KeyBindingRow
+    {
+        public partial class KeyButton : Container
+        {
+            public Bindable<RealmKeyBinding> KeyBinding { get; } = new Bindable<RealmKeyBinding>();
+
+            private readonly Box box;
+            public readonly OsuSpriteText Text;
+
+            [Resolved]
+            private OverlayColourProvider colourProvider { get; set; } = null!;
+
+            [Resolved]
+            private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
+
+            private bool isBinding;
+
+            public bool IsBinding
+            {
+                get => isBinding;
+                set
+                {
+                    if (value == isBinding) return;
+
+                    isBinding = value;
+
+                    updateHoverState();
+                }
+            }
+
+            public KeyButton()
+            {
+                Margin = new MarginPadding(padding);
+
+                Masking = true;
+                CornerRadius = padding;
+
+                Height = height;
+                AutoSizeAxes = Axes.X;
+
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        AlwaysPresent = true,
+                        Width = 80,
+                        Height = height,
+                    },
+                    box = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    Text = new OsuSpriteText
+                    {
+                        Font = OsuFont.Numeric.With(size: 10),
+                        Margin = new MarginPadding(5),
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                    new HoverSounds()
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                KeyBinding.BindValueChanged(_ =>
+                {
+                    if (KeyBinding.Value.IsManaged)
+                        throw new ArgumentException("Key binding should not be attached as we make temporary changes", nameof(KeyBinding));
+
+                    updateKeyCombinationText();
+                });
+                keyCombinationProvider.KeymapChanged += updateKeyCombinationText;
+                updateKeyCombinationText();
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                updateHoverState();
+                FinishTransforms(true);
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateHoverState();
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateHoverState();
+                base.OnHoverLost(e);
+            }
+
+            private void updateHoverState()
+            {
+                if (isBinding)
+                {
+                    box.FadeColour(colourProvider.Light2, transition_time, Easing.OutQuint);
+                    Text.FadeColour(Color4.Black, transition_time, Easing.OutQuint);
+                }
+                else
+                {
+                    box.FadeColour(IsHovered ? colourProvider.Light4 : colourProvider.Background6, transition_time, Easing.OutQuint);
+                    Text.FadeColour(IsHovered ? Color4.Black : Color4.White, transition_time, Easing.OutQuint);
+                }
+            }
+
+            /// <summary>
+            /// Update from a key combination, only allowing a single non-modifier key to be specified.
+            /// </summary>
+            /// <param name="fullState">A <see cref="KeyCombination"/> generated from the full input state.</param>
+            /// <param name="triggerKey">The key which triggered this update, and should be used as the binding.</param>
+            public void UpdateKeyCombination(KeyCombination fullState, InputKey triggerKey) =>
+                UpdateKeyCombination(new KeyCombination(fullState.Keys.Where(KeyCombination.IsModifierKey).Append(triggerKey)));
+
+            public void UpdateKeyCombination(KeyCombination newCombination)
+            {
+                if (KeyBinding.Value.RulesetName != null && !RealmKeyBindingStore.CheckValidForGameplay(newCombination))
+                    return;
+
+                KeyBinding.Value.KeyCombination = newCombination;
+                updateKeyCombinationText();
+            }
+
+            private void updateKeyCombinationText()
+            {
+                Scheduler.AddOnce(updateText);
+
+                void updateText() => Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.Value.KeyCombination);
+            }
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+
+                if (keyCombinationProvider.IsNotNull())
+                    keyCombinationProvider.KeymapChanged -= updateKeyCombinationText;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index c7791f4412..7a5a269eb3 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -9,33 +9,27 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Database;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
 using osuTK;
-using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
-    public partial class KeyBindingRow : Container, IFilterable, IHasPopover
+    public partial class KeyBindingRow : Container, IFilterable
     {
         /// <summary>
         /// Invoked when the binding of this row is updated with a change being written.
@@ -210,18 +204,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
         }
 
-        private void updateButtons()
-        {
-            if (buttons.Count > KeyBindings.Count)
-                buttons.RemoveRange(buttons.Skip(KeyBindings.Count).ToArray(), true);
-
-            while (buttons.Count < KeyBindings.Count)
-                buttons.Add(new KeyButton());
-
-            foreach (var (button, binding) in buttons.Zip(KeyBindings))
-                button.KeyBinding.Value = binding;
-        }
-
         public void RestoreDefaults()
         {
             int i = 0;
@@ -251,8 +233,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             base.OnHoverLost(e);
         }
 
-        private bool isModifier(Key k) => k < Key.F1;
-
         protected override bool OnClick(ClickEvent e) => true;
 
         protected override bool OnMouseDown(MouseDownEvent e)
@@ -325,6 +305,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!isModifier(e.Key)) finalise();
 
             return true;
+
+            bool isModifier(Key k) => k < Key.F1;
         }
 
         protected override void OnKeyUp(KeyUpEvent e)
@@ -434,6 +416,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             finalise();
         }
 
+        private void updateButtons()
+        {
+            if (buttons.Count > KeyBindings.Count)
+                buttons.RemoveRange(buttons.Skip(KeyBindings.Count).ToArray(), true);
+
+            while (buttons.Count < KeyBindings.Count)
+                buttons.Add(new KeyButton());
+
+            foreach (var (button, binding) in buttons.Zip(KeyBindings))
+                button.KeyBinding.Value = binding;
+        }
+
         private void clear()
         {
             if (bindTarget == null)
@@ -466,6 +460,24 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             cancelAndClearButtons.BypassAutoSizeAxes |= Axes.Y;
         }
 
+        protected override void OnFocus(FocusEvent e)
+        {
+            content.AutoSizeDuration = 500;
+            content.AutoSizeEasing = Easing.OutQuint;
+
+            cancelAndClearButtons.FadeIn(300, Easing.OutQuint);
+            cancelAndClearButtons.BypassAutoSizeAxes &= ~Axes.Y;
+
+            updateBindTarget();
+            base.OnFocus(e);
+        }
+
+        protected override void OnFocusLost(FocusLostEvent e)
+        {
+            finalise(false);
+            base.OnFocusLost(e);
+        }
+
         private void tryPersistKeyBinding(RealmKeyBinding keyBinding, bool advanceToNextBinding)
         {
             List<RealmKeyBinding> bindings = GetAllSectionBindings();
@@ -488,24 +500,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     new ConflictingKeyBinding(keyBindingBeforeUpdate.ID, Action, keyBinding.KeyCombination, keyBindingBeforeUpdate.KeyCombination)));
         }
 
-        protected override void OnFocus(FocusEvent e)
-        {
-            content.AutoSizeDuration = 500;
-            content.AutoSizeEasing = Easing.OutQuint;
-
-            cancelAndClearButtons.FadeIn(300, Easing.OutQuint);
-            cancelAndClearButtons.BypassAutoSizeAxes &= ~Axes.Y;
-
-            updateBindTarget();
-            base.OnFocus(e);
-        }
-
-        protected override void OnFocusLost(FocusLostEvent e)
-        {
-            finalise(false);
-            base.OnFocusLost(e);
-        }
-
         /// <summary>
         /// Updates the bind target to the currently hovered key button or the first if clicked anywhere else.
         /// </summary>
@@ -521,70 +515,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             isDefault.Value = KeyBindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
         }
 
-        #region Handling conflicts
-
-        private readonly Bindable<KeyBindingConflictInfo> keyBindingConflictInfo = new Bindable<KeyBindingConflictInfo>();
-
-        public Popover GetPopover() => new KeyBindingConflictPopover
-        {
-            ConflictInfo = { BindTarget = keyBindingConflictInfo },
-            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: true, canAdvanceToNextBinding: false))
-        };
-
-        private void showBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
-        {
-            keyBindingConflictInfo.Value = conflictInfo;
-            this.ShowPopover();
-        }
-
-        /// <summary>
-        /// Contains information about the key binding conflict to be resolved.
-        /// </summary>
-        public class KeyBindingConflictInfo
-        {
-            public ConflictingKeyBinding Existing { get; }
-            public ConflictingKeyBinding New { get; }
-
-            /// <summary>
-            /// Contains information about the key binding conflict to be resolved.
-            /// </summary>
-            public KeyBindingConflictInfo(ConflictingKeyBinding existingBinding, ConflictingKeyBinding newBinding)
-            {
-                Existing = existingBinding;
-                New = newBinding;
-            }
-        }
-
-        public class ConflictingKeyBinding
-        {
-            public Guid ID { get; }
-            public object Action { get; }
-            public KeyCombination CombinationWhenChosen { get; }
-            public KeyCombination CombinationWhenNotChosen { get; }
-
-            public ConflictingKeyBinding(Guid id, object action, KeyCombination combinationWhenChosen, KeyCombination combinationWhenNotChosen)
-            {
-                ID = id;
-                Action = action;
-                CombinationWhenChosen = combinationWhenChosen;
-                CombinationWhenNotChosen = combinationWhenNotChosen;
-            }
-        }
-
-        public class KeyBindingUpdatedEventArgs
-        {
-            public bool BindingConflictResolved { get; }
-            public bool CanAdvanceToNextBinding { get; }
-
-            public KeyBindingUpdatedEventArgs(bool bindingConflictResolved, bool canAdvanceToNextBinding)
-            {
-                BindingConflictResolved = bindingConflictResolved;
-                CanAdvanceToNextBinding = canAdvanceToNextBinding;
-            }
-        }
-
-        #endregion
-
         private partial class CancelButton : RoundedButton
         {
             public CancelButton()
@@ -602,147 +532,5 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Size = new Vector2(80, 20);
             }
         }
-
-        public partial class KeyButton : Container
-        {
-            public Bindable<RealmKeyBinding> KeyBinding { get; } = new Bindable<RealmKeyBinding>();
-
-            private readonly Box box;
-            public readonly OsuSpriteText Text;
-
-            [Resolved]
-            private OverlayColourProvider colourProvider { get; set; } = null!;
-
-            [Resolved]
-            private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
-
-            private bool isBinding;
-
-            public bool IsBinding
-            {
-                get => isBinding;
-                set
-                {
-                    if (value == isBinding) return;
-
-                    isBinding = value;
-
-                    updateHoverState();
-                }
-            }
-
-            public KeyButton()
-            {
-                Margin = new MarginPadding(padding);
-
-                Masking = true;
-                CornerRadius = padding;
-
-                Height = height;
-                AutoSizeAxes = Axes.X;
-
-                Children = new Drawable[]
-                {
-                    new Container
-                    {
-                        AlwaysPresent = true,
-                        Width = 80,
-                        Height = height,
-                    },
-                    box = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    Text = new OsuSpriteText
-                    {
-                        Font = OsuFont.Numeric.With(size: 10),
-                        Margin = new MarginPadding(5),
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    },
-                    new HoverSounds()
-                };
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                KeyBinding.BindValueChanged(_ =>
-                {
-                    if (KeyBinding.Value.IsManaged)
-                        throw new ArgumentException("Key binding should not be attached as we make temporary changes", nameof(KeyBinding));
-
-                    updateKeyCombinationText();
-                });
-                keyCombinationProvider.KeymapChanged += updateKeyCombinationText;
-                updateKeyCombinationText();
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                updateHoverState();
-                FinishTransforms(true);
-            }
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                updateHoverState();
-                return base.OnHover(e);
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                updateHoverState();
-                base.OnHoverLost(e);
-            }
-
-            private void updateHoverState()
-            {
-                if (isBinding)
-                {
-                    box.FadeColour(colourProvider.Light2, transition_time, Easing.OutQuint);
-                    Text.FadeColour(Color4.Black, transition_time, Easing.OutQuint);
-                }
-                else
-                {
-                    box.FadeColour(IsHovered ? colourProvider.Light4 : colourProvider.Background6, transition_time, Easing.OutQuint);
-                    Text.FadeColour(IsHovered ? Color4.Black : Color4.White, transition_time, Easing.OutQuint);
-                }
-            }
-
-            /// <summary>
-            /// Update from a key combination, only allowing a single non-modifier key to be specified.
-            /// </summary>
-            /// <param name="fullState">A <see cref="KeyCombination"/> generated from the full input state.</param>
-            /// <param name="triggerKey">The key which triggered this update, and should be used as the binding.</param>
-            public void UpdateKeyCombination(KeyCombination fullState, InputKey triggerKey) =>
-                UpdateKeyCombination(new KeyCombination(fullState.Keys.Where(KeyCombination.IsModifierKey).Append(triggerKey)));
-
-            public void UpdateKeyCombination(KeyCombination newCombination)
-            {
-                if (KeyBinding.Value.RulesetName != null && !RealmKeyBindingStore.CheckValidForGameplay(newCombination))
-                    return;
-
-                KeyBinding.Value.KeyCombination = newCombination;
-                updateKeyCombinationText();
-            }
-
-            private void updateKeyCombinationText()
-            {
-                Scheduler.AddOnce(updateText);
-
-                void updateText() => Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.Value.KeyCombination);
-            }
-
-            protected override void Dispose(bool isDisposing)
-            {
-                base.Dispose(isDisposing);
-
-                if (keyCombinationProvider.IsNotNull())
-                    keyCombinationProvider.KeymapChanged -= updateKeyCombinationText;
-            }
-        }
     }
 }

From 17b6ebbfbff78622bb3a5933910d2e73ddadeec7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Oct 2023 18:38:49 +0900
Subject: [PATCH 0984/2296] Avoid using a bindable in
 `KeyBindingConflictPopover` where data is never mutated

---
 .../TestSceneKeyBindingConflictPopover.cs     | 15 ++++----
 .../Input/KeyBindingConflictPopover.cs        | 35 ++++++++++---------
 .../Input/KeyBindingRow.ConflictResolution.cs | 17 +++++----
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
index da5a9dd513..03f74fa35c 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingConflictPopover.cs
@@ -52,15 +52,12 @@ namespace osu.Game.Tests.Visual.Settings
                 Action = this.ShowPopover;
             }
 
-            public Popover GetPopover() => new KeyBindingConflictPopover
-            {
-                ConflictInfo =
-                {
-                    Value = new KeyBindingRow.KeyBindingConflictInfo(
-                        new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.LeftButton, KeyCombination.FromKey(Key.X), new KeyCombination(InputKey.None)),
-                        new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.RightButton, KeyCombination.FromKey(Key.Z), KeyCombination.FromKey(Key.X)))
-                }
-            };
+            public Popover GetPopover() => new KeyBindingConflictPopover(
+                new KeyBindingRow.KeyBindingConflictInfo(
+                    new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.LeftButton, KeyCombination.FromKey(Key.X), new KeyCombination(InputKey.None)),
+                    new KeyBindingRow.ConflictingKeyBinding(Guid.NewGuid(), OsuAction.RightButton, KeyCombination.FromKey(Key.Z), KeyCombination.FromKey(Key.X))
+                )
+            );
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index a0f6192587..610325e412 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -18,15 +18,13 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Input.Bindings;
-using osuTK;
 using osu.Game.Localisation;
+using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public partial class KeyBindingConflictPopover : OsuPopover
     {
-        public Bindable<KeyBindingRow.KeyBindingConflictInfo> ConflictInfo { get; } = new Bindable<KeyBindingRow.KeyBindingConflictInfo>();
-
         public Action? BindingConflictResolved { get; init; }
 
         private ConflictingKeyBindingPreview newPreview = null!;
@@ -40,10 +38,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
-        [BackgroundDependencyLoader]
-        private void load() => recreateDisplay();
+        private readonly KeyBindingRow.KeyBindingConflictInfo conflictInfo;
 
-        private void recreateDisplay()
+        public KeyBindingConflictPopover(KeyBindingRow.KeyBindingConflictInfo conflictInfo)
+        {
+            this.conflictInfo = conflictInfo;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
             Child = new FillFlowContainer
             {
@@ -61,13 +64,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         Margin = new MarginPadding { Bottom = 10 }
                     },
                     existingPreview = new ConflictingKeyBindingPreview(
-                        ConflictInfo.Value.Existing.Action,
-                        ConflictInfo.Value.Existing.CombinationWhenChosen,
-                        ConflictInfo.Value.Existing.CombinationWhenNotChosen),
+                        conflictInfo.Existing.Action,
+                        conflictInfo.Existing.CombinationWhenChosen,
+                        conflictInfo.Existing.CombinationWhenNotChosen),
                     newPreview = new ConflictingKeyBindingPreview(
-                        ConflictInfo.Value.New.Action,
-                        ConflictInfo.Value.New.CombinationWhenChosen,
-                        ConflictInfo.Value.New.CombinationWhenNotChosen),
+                        conflictInfo.New.Action,
+                        conflictInfo.New.CombinationWhenChosen,
+                        conflictInfo.New.CombinationWhenNotChosen),
                     new Container
                     {
                         RelativeSizeAxes = Axes.X,
@@ -107,11 +110,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             // the temporary visual changes will be reverted by calling `Hide()` / `BindingConflictResolved`.
             realm.Write(r =>
             {
-                var existingBinding = r.Find<RealmKeyBinding>(ConflictInfo.Value.Existing.ID);
-                existingBinding!.KeyCombinationString = ConflictInfo.Value.Existing.CombinationWhenNotChosen.ToString();
+                var existingBinding = r.Find<RealmKeyBinding>(conflictInfo.Existing.ID);
+                existingBinding!.KeyCombinationString = conflictInfo.Existing.CombinationWhenNotChosen.ToString();
 
-                var newBinding = r.Find<RealmKeyBinding>(ConflictInfo.Value.New.ID);
-                newBinding!.KeyCombinationString = ConflictInfo.Value.Existing.CombinationWhenChosen.ToString();
+                var newBinding = r.Find<RealmKeyBinding>(conflictInfo.New.ID);
+                newBinding!.KeyCombinationString = conflictInfo.Existing.CombinationWhenChosen.ToString();
             });
 
             Hide();
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
index 8afa43b1ff..b5d482b6b4 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Bindables;
+using System.Diagnostics;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
@@ -12,17 +12,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public partial class KeyBindingRow : IHasPopover
     {
-        private readonly Bindable<KeyBindingConflictInfo> keyBindingConflictInfo = new Bindable<KeyBindingConflictInfo>();
+        private KeyBindingConflictInfo? pendingKeyBindingConflict;
 
-        public Popover GetPopover() => new KeyBindingConflictPopover
+        public Popover GetPopover()
         {
-            ConflictInfo = { BindTarget = keyBindingConflictInfo },
-            BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: true, canAdvanceToNextBinding: false))
-        };
+            Debug.Assert(pendingKeyBindingConflict != null);
+            return new KeyBindingConflictPopover(pendingKeyBindingConflict)
+            {
+                BindingConflictResolved = () => BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: true, canAdvanceToNextBinding: false))
+            };
+        }
 
         private void showBindingConflictPopover(KeyBindingConflictInfo conflictInfo)
         {
-            keyBindingConflictInfo.Value = conflictInfo;
+            pendingKeyBindingConflict = conflictInfo;
             this.ShowPopover();
         }
 

From ea766b792d886907dbc9862a45556530bc93629a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 11:58:55 +0200
Subject: [PATCH 0985/2296] Update localisation keys to match localisable
 member names

---
 osu.Game/Localisation/InputSettingsStrings.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Localisation/InputSettingsStrings.cs b/osu.Game/Localisation/InputSettingsStrings.cs
index a13a9dc498..fcfe48bedb 100644
--- a/osu.Game/Localisation/InputSettingsStrings.cs
+++ b/osu.Game/Localisation/InputSettingsStrings.cs
@@ -72,17 +72,17 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "Keep existing"
         /// </summary>
-        public static LocalisableString KeepExistingBinding => new TranslatableString(getKey(@"keep_existing"), @"Keep existing");
+        public static LocalisableString KeepExistingBinding => new TranslatableString(getKey(@"keep_existing_binding"), @"Keep existing");
 
         /// <summary>
         /// "Apply new"
         /// </summary>
-        public static LocalisableString ApplyNewBinding => new TranslatableString(getKey(@"apply_new"), @"Apply new");
+        public static LocalisableString ApplyNewBinding => new TranslatableString(getKey(@"apply_new_binding"), @"Apply new");
 
         /// <summary>
         /// "(none)"
         /// </summary>
-        public static LocalisableString ActionHasNoKeyBinding => new TranslatableString(getKey(@"none"), @"(none)");
+        public static LocalisableString ActionHasNoKeyBinding => new TranslatableString(getKey(@"action_has_no_key_binding"), @"(none)");
 
         private static string getKey(string key) => $"{prefix}:{key}";
     }

From a1c68b66f212c9cfb178bc0b57281a6912f7b430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 12:06:25 +0200
Subject: [PATCH 0986/2296] Rename `KeyBindingRow` parts to appease
 CodeFileSanity

---
 ....ConflictResolution.cs => KeyBindingRow_ConflictResolution.cs} | 0
 .../{KeyBindingRow.KeyButton.cs => KeyBindingRow_KeyButton.cs}    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Overlays/Settings/Sections/Input/{KeyBindingRow.ConflictResolution.cs => KeyBindingRow_ConflictResolution.cs} (100%)
 rename osu.Game/Overlays/Settings/Sections/Input/{KeyBindingRow.KeyButton.cs => KeyBindingRow_KeyButton.cs} (100%)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_ConflictResolution.cs
similarity index 100%
rename from osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.ConflictResolution.cs
rename to osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_ConflictResolution.cs
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs
similarity index 100%
rename from osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.KeyButton.cs
rename to osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs

From a88779e5880f9a02b442ace50faf23c9a6bd4491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 13:10:04 +0200
Subject: [PATCH 0987/2296] Use dimmed placeholder text instead of empty box on
 cleared bindings

---
 .../Sections/Input/KeyBindingRow_KeyButton.cs   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs
index cf26300fb6..53d0f50605 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow_KeyButton.cs
@@ -12,11 +12,13 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
+using osu.Game.Localisation;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
@@ -153,7 +155,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 Scheduler.AddOnce(updateText);
 
-                void updateText() => Text.Text = keyCombinationProvider.GetReadableString(KeyBinding.Value.KeyCombination);
+                void updateText()
+                {
+                    LocalisableString keyCombinationString = keyCombinationProvider.GetReadableString(KeyBinding.Value.KeyCombination);
+                    float alpha = 1;
+
+                    if (LocalisableString.IsNullOrEmpty(keyCombinationString))
+                    {
+                        keyCombinationString = InputSettingsStrings.ActionHasNoKeyBinding;
+                        alpha = 0.4f;
+                    }
+
+                    Text.Text = keyCombinationString;
+                    Text.Alpha = alpha;
+                }
             }
 
             protected override void Dispose(bool isDisposing)

From af89d69fc4d405a6d02d6fb442c9d57e8f5045d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 13:16:24 +0200
Subject: [PATCH 0988/2296] Fix dangerous buttons using different shades of
 pink

---
 osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs   | 2 +-
 osu.Game/Graphics/OsuColour.cs                                  | 2 ++
 osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs       | 2 +-
 osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs              | 2 +-
 osu.Game/Overlays/Settings/DangerousSettingsButton.cs           | 2 +-
 .../Settings/Sections/Input/KeyBindingConflictPopover.cs        | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 9dd028fa79..aa3718150c 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Tournament.Screens.Editors
                         new TourneyButton
                         {
                             RelativeSizeAxes = Axes.X,
-                            BackgroundColour = colours.Pink3,
+                            BackgroundColour = colours.DangerousButtonColour,
                             Text = "Clear all",
                             Action = () =>
                             {
diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index d0e07a9e66..75d313d98c 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -397,5 +397,7 @@ namespace osu.Game.Graphics
 
         public Color4 SpotlightColour => Green2;
         public Color4 FeaturedArtistColour => Blue2;
+
+        public Color4 DangerousButtonColour => Pink3;
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs b/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs
index b237dd9b71..39ef7924b9 100644
--- a/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs
+++ b/osu.Game/Graphics/UserInterface/DangerousRoundedButton.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            BackgroundColour = colours.PinkDark;
+            BackgroundColour = colours.DangerousButtonColour;
         }
     }
 }
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs b/osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs
index 95af8ec0f3..31a56c9748 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenBehaviour.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Overlays.FirstRunSetup
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
-                                BackgroundColour = colours.Pink3,
+                                BackgroundColour = colours.DangerousButtonColour,
                                 Text = FirstRunSetupOverlayStrings.ClassicDefaults,
                                 RelativeSizeAxes = Axes.X,
                                 Action = applyClassic
diff --git a/osu.Game/Overlays/Settings/DangerousSettingsButton.cs b/osu.Game/Overlays/Settings/DangerousSettingsButton.cs
index 42b042ae75..9a9d40cada 100644
--- a/osu.Game/Overlays/Settings/DangerousSettingsButton.cs
+++ b/osu.Game/Overlays/Settings/DangerousSettingsButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Settings
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            BackgroundColour = colours.Pink3;
+            BackgroundColour = colours.DangerousButtonColour;
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 610325e412..15061857e1 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             applyNewButton = new HoverableRoundedButton
                             {
                                 Text = InputSettingsStrings.ApplyNewBinding,
-                                BackgroundColour = colours.Pink3,
+                                BackgroundColour = colours.DangerousButtonColour,
                                 RelativeSizeAxes = Axes.X,
                                 Width = 0.48f,
                                 Anchor = Anchor.CentreRight,

From d656306692f34dda17b163712b931828d276253a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 14:05:43 +0200
Subject: [PATCH 0989/2296] Remove approach rate adjustment from
 `TaikoModHardRock`

Approach rate does nothing in taiko.
---
 osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
index 37a630c8ad..ba41175461 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.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 osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 
@@ -24,9 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {
             base.ApplyToDifficulty(difficulty);
-
             difficulty.SliderMultiplier *= slider_multiplier;
-            difficulty.ApproachRate = Math.Min(difficulty.ApproachRate * ADJUST_RATIO, 10.0f);
         }
     }
 }

From d97b618d024ce01d17ec1f5121c2811ad7bb3c43 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 13 Oct 2023 21:06:50 +0900
Subject: [PATCH 0990/2296] Use new `generic-error` sample in appropriate
 places

---
 .../Settings/Sections/Input/KeyBindingConflictPopover.cs        | 2 ++
 osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
index 610325e412..357ffac458 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private readonly KeyBindingRow.KeyBindingConflictInfo conflictInfo;
 
+        protected override string PopInSampleName => @"UI/generic-error";
+
         public KeyBindingConflictPopover(KeyBindingRow.KeyBindingConflictInfo conflictInfo)
         {
             this.conflictInfo = conflictInfo;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
index 5cf2f91ff4..66bbf92e58 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
                     }
                 };
 
-                sampleJoinFail = audio.Samples.Get(@"UI/password-fail");
+                sampleJoinFail = audio.Samples.Get(@"UI/generic-error");
 
                 joinButton.Action = performJoin;
             }

From 9b474b656d40f3b452d5c981ee78461ac2f83cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 13 Oct 2023 15:03:41 +0200
Subject: [PATCH 0991/2296] Fix key binding panel test failures from
 introducing placeholder text

Whoops.
---
 .../Visual/Settings/TestSceneKeyBindingPanel.cs     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index fcbb16bef6..1c4e89e1a2 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -11,6 +11,7 @@ using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.Settings.Sections.Input;
@@ -157,7 +158,9 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("first binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text.ToString()));
+            AddAssert("first binding cleared",
+                () => multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text,
+                () => Is.EqualTo(InputSettingsStrings.ActionHasNoKeyBinding));
 
             AddStep("click second binding", () =>
             {
@@ -169,7 +172,9 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("second binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text.ToString()));
+            AddAssert("second binding cleared",
+                () => multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text,
+                () => Is.EqualTo(InputSettingsStrings.ActionHasNoKeyBinding));
 
             void clickClearButton()
             {
@@ -327,7 +332,7 @@ namespace osu.Game.Tests.Visual.Settings
             KeyBindingConflictPopover popover = null;
             AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
             AddStep("click second button", () => popover.ChildrenOfType<RoundedButton>().ElementAt(1).TriggerClick());
-            checkBinding("Left (centre)", string.Empty);
+            checkBinding("Left (centre)", InputSettingsStrings.ActionHasNoKeyBinding.ToString());
             checkBinding("Left (rim)", "M1");
         }
 
@@ -360,7 +365,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
             AddStep("click second button", () => popover.ChildrenOfType<RoundedButton>().ElementAt(1).TriggerClick());
             checkBinding("Left (centre)", "M1");
-            checkBinding("Left (rim)", string.Empty);
+            checkBinding("Left (rim)", InputSettingsStrings.ActionHasNoKeyBinding.ToString());
         }
 
         [Test]

From d4627a240261add2217d10c136935b4142433de9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 14 Oct 2023 03:48:59 +0900
Subject: [PATCH 0992/2296] Update resources

---
 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 f0a4b38c03..c289ae89ee 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1003.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1014.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <PackageReference Include="SharpCompress" Version="0.34.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 48832c64acedcc144bba60fd8487c9703766c0a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 13:09:22 +0900
Subject: [PATCH 0993/2296] Fix health bar animating when it shouldn't be

It wasn't correctly checking the current underlying health, which could
be zero in usages of `AccumulatingHealthProcessor`, for instance.

Closes #25046.
---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 2f96233939..fdbce15b40 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
@@ -78,22 +79,25 @@ namespace osu.Game.Screens.Play.HUD
             if (PlayInitialIncreaseAnimation)
                 startInitialAnimation();
             else
-                Current.Value = 1;
+                Current.Value = health.Value;
         }
 
         private void startInitialAnimation()
         {
+            if (Current.Value >= health.Value)
+                return;
+
             // TODO: this should run in gameplay time, including showing a larger increase when skipping.
             // TODO: it should also start increasing relative to the first hitobject.
             const double increase_delay = 150;
 
             initialIncrease = Scheduler.AddDelayed(() =>
             {
-                double newValue = Current.Value + 0.05f;
+                double newValue = Math.Min(Current.Value + 0.05f, health.Value);
                 this.TransformBindableTo(Current, newValue, increase_delay);
                 Scheduler.AddOnce(Flash);
 
-                if (newValue >= 1)
+                if (newValue >= health.Value)
                     finishInitialAnimation();
             }, increase_delay, true);
         }

From ddbda69751c8bb0c4674e35ee6cee86cdbdbb2aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 13:14:58 +0900
Subject: [PATCH 0994/2296] Remove nullability of `bonusNote`

---
 .../Objects/Drawables/DrawableNote.cs                  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index eaeac33a11..99bd66a147 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using System.Diagnostics;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -41,7 +40,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private Drawable headPiece;
 
-        [CanBeNull]
         private DrawablePerfectBonusNote bonusNote;
 
         public DrawableNote()
@@ -96,7 +94,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
                 {
-                    bonusNote!.TriggerResult(false);
+                    bonusNote.TriggerResult(false);
                     ApplyResult(r => r.Type = r.Judgement.MinResult);
                 }
 
@@ -107,7 +105,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (result == HitResult.None)
                 return;
 
-            bonusNote!.TriggerResult(result == HitResult.Perfect);
+            bonusNote.TriggerResult(result == HitResult.Perfect);
             ApplyResult(r => r.Type = MutateResultApplication(result));
         }
 
@@ -140,9 +138,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected override void ClearNestedHitObjects()
         {
-            if (bonusNote != null)
-                RemoveInternal(bonusNote, false);
-            bonusNote = null;
+            RemoveInternal(bonusNote, false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)

From e85c0397223c162720004bcb66c249cfbaf0b1d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 13:31:14 +0900
Subject: [PATCH 0995/2296] Adjust method flow to hopefully be more legible

---
 .../Objects/Drawables/DrawableHoldNoteTail.cs            | 2 +-
 .../Objects/Drawables/DrawableNote.cs                    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index a183231310..79002b3819 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // Factor in the release lenience
             base.CheckForResult(userTriggered, timeOffset / TailNote.RELEASE_WINDOW_LENIENCE);
 
-        protected override HitResult MutateResultApplication(HitResult result)
+        protected override HitResult GetCappedResult(HitResult result)
         {
             // If the head wasn't hit or the hold note was broken, cap the max score to Meh.
             bool hasComboBreak = !HoldNote.Head.IsHit || HoldNote.Body.HasHoldBreak;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 99bd66a147..c7eabaf616 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -105,11 +105,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (result == HitResult.None)
                 return;
 
+            result = GetCappedResult(result);
+
             bonusNote.TriggerResult(result == HitResult.Perfect);
-            ApplyResult(r => r.Type = MutateResultApplication(result));
+            ApplyResult(r => r.Type = result);
         }
 
-        protected virtual HitResult MutateResultApplication(HitResult result) => result;
+        /// <summary>
+        /// Some objects in mania may want to limit the max result.
+        /// </summary>
+        protected virtual HitResult GetCappedResult(HitResult result) => result;
 
         public virtual bool OnPressed(KeyBindingPressEvent<ManiaAction> e)
         {

From 7c49843411c750565a3ab80f64b9dbd7233484ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 14:01:47 +0900
Subject: [PATCH 0996/2296] Fix various tests

---
 .../Mods/TestSceneManiaModDoubleTime.cs       | 39 +++++++++++--------
 .../TestSceneHoldNoteInput.cs                 | 18 ++++-----
 .../TestSceneMaximumScore.cs                  |  4 +-
 .../Rulesets/Scoring/ScoreProcessorTest.cs    |  4 +-
 4 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index 00b79529a9..9f2530eb31 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -17,12 +17,14 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
     {
         private const double offset = 18;
 
+        protected override bool AllowFail => true;
+
         protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
 
         [Test]
         public void TestHitWindowWithoutDoubleTime() => CreateModTest(new ModTestData
         {
-            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value != 1,
+            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value == 1_000_000,
             Autoplay = false,
             Beatmap = new Beatmap
             {
@@ -40,24 +42,29 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         });
 
         [Test]
-        public void TestHitWindowWithDoubleTime() => CreateModTest(new ModTestData
+        public void TestHitWindowWithDoubleTime()
         {
-            Mod = new ManiaModDoubleTime(),
-            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1,
-            Autoplay = false,
-            Beatmap = new Beatmap
+            var doubleTime = new ManiaModDoubleTime();
+
+            CreateModTest(new ModTestData
             {
-                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
-                Difficulty = { OverallDifficulty = 10 },
-                HitObjects = new List<HitObject>
+                Mod = doubleTime,
+                PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value / doubleTime.ScoreMultiplier == 100010,
+                Autoplay = false,
+                Beatmap = new Beatmap
                 {
-                    new Note { StartTime = 1000 }
+                    BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+                    Difficulty = { OverallDifficulty = 10 },
+                    HitObjects = new List<HitObject>
+                    {
+                        new Note { StartTime = 1000 }
+                    },
                 },
-            },
-            ReplayFrames = new List<ReplayFrame>
-            {
-                new ManiaReplayFrame(1000 + offset, ManiaAction.Key1)
-            }
-        });
+                ReplayFrames = new List<ReplayFrame>
+                {
+                    new ManiaReplayFrame(1000 + offset, ManiaAction.Key1)
+                }
+            });
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 93128c512f..ccd5e0600d 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -200,10 +200,12 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            assertComboAtJudgement(0, 1);
+            // judgement combo offset by perfect bonus judgement. see logic in DrawableNote.CheckForResult.
+            assertComboAtJudgement(1, 1);
             assertTailJudgement(HitResult.Meh);
-            assertComboAtJudgement(1, 0);
-            assertComboAtJudgement(2, 1);
+            assertComboAtJudgement(2, 0);
+            // judgement combo offset by perfect bonus judgement. see logic in DrawableNote.CheckForResult.
+            assertComboAtJudgement(4, 1);
         }
 
         /// <summary>
@@ -392,13 +394,11 @@ namespace osu.Game.Rulesets.Mania.Tests
                         Duration = time_tail - time_head,
                         Column = 0,
                     },
+                    // Next note within tail lenience
+                    (ManiaHitObject)(note = new Note
                     {
-                        // Next note within tail lenience
-                        note = new Note
-                        {
-                            StartTime = time_tail + 50
-                        }
-                    }
+                        StartTime = time_tail + 50
+                    })
                 },
                 BeatmapInfo =
                 {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
index 3d0abaceb5..3a74f87f1a 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("all objects perfectly judged",
                 () => judgementResults.Select(result => result.Type),
                 () => Is.EquivalentTo(judgementResults.Select(result => result.Judgement.MaxResult)));
-            AddAssert("score is 1 million", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_000));
+            AddAssert("score is correct", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_030));
         }
 
         [Test]
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("all objects perfectly judged",
                 () => judgementResults.Select(result => result.Type),
                 () => Is.EquivalentTo(judgementResults.Select(result => result.Judgement.MaxResult)));
-            AddAssert("score is 1 million", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_000));
+            AddAssert("base score is 1 million", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_040));
         }
 
         private void performTest(List<ManiaHitObject> hitObjects, List<ReplayFrame> frames)
diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 92e94bd02d..cba90b2ebe 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 79_333)]
         [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 158_667)]
-        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 302_402)]
+        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 317_626)]
         [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 492_894)]
         [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 492_894)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
@@ -86,7 +86,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
         [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 7_975)]
         [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 15_949)]
-        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 30_398)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 31_928)]
         [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 49_546)]
         [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 49_546)]
         [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]

From 14fedffcc1c0d753a395b16a5521286c826ebb37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 14:53:36 +0900
Subject: [PATCH 0997/2296] Fix `MissForcefully` not considering the bonus
 object

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index c7eabaf616..27039d2f37 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -111,6 +111,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             ApplyResult(r => r.Type = result);
         }
 
+        public override void MissForcefully()
+        {
+            bonusNote.TriggerResult(false);
+            base.MissForcefully();
+        }
+
         /// <summary>
         /// Some objects in mania may want to limit the max result.
         /// </summary>

From 43f619f92a7761c95d9b4632373eb2b9ed0996a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 14:57:55 +0900
Subject: [PATCH 0998/2296] Add `DisplayResult` flag and remove unnecessary
 `AlwaysPresent`

---
 .../Objects/Drawables/DrawablePerfectBonusNote.cs              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
index 9f51f9c5b3..1761f675f5 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
@@ -5,10 +5,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
     public partial class DrawablePerfectBonusNote : DrawableManiaHitObject<PerfectBonusNote>
     {
+        public override bool DisplayResult => false;
+
         public DrawablePerfectBonusNote()
             : this(null!)
         {
-            AlwaysPresent = true;
         }
 
         public DrawablePerfectBonusNote(PerfectBonusNote hitObject)

From 1a957364aeb9aefa9c0ce5a08e1de5961e55db8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 14:58:49 +0900
Subject: [PATCH 0999/2296] Add empty hit windows on `PefectBonusNote`

---
 osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
index b601a0614b..e98b2ff1c1 100644
--- a/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
@@ -10,6 +10,7 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class PerfectBonusNote : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new PerfectBonusNoteJudgement();
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
         public class PerfectBonusNoteJudgement : ManiaJudgement
         {

From 3f09ed396f511bc45e4dfbe0eb1d205ae0e58a52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 15:11:33 +0900
Subject: [PATCH 1000/2296] Fix legacy skin body piece dimming when it
 shouldn't

---
 .../Skinning/Legacy/LegacyBodyPiece.cs            | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index 660f72e565..5c353887c3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -123,9 +123,18 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
         private void applyCustomUpdateState(DrawableHitObject hitObject, ArmedState state)
         {
-            // ensure that the hold note is also faded out when the head/tail/any tick is missed.
-            if (state == ArmedState.Miss)
-                missFadeTime.Value ??= hitObject.HitStateUpdateTime;
+            switch (hitObject)
+            {
+                // Ensure that the hold note is also faded out when the head/tail/any tick is missed.
+                // Importantly, we filter out unrelated objects like DrawablePerfectBonusNote.
+                case DrawableHoldNoteTail:
+                case DrawableHoldNoteHead:
+                case DrawableHoldNoteBody:
+                    if (state == ArmedState.Miss)
+                        missFadeTime.Value ??= hitObject.HitStateUpdateTime;
+
+                    break;
+            }
         }
 
         private void onIsHittingChanged(ValueChangedEvent<bool> isHitting)

From 4f1546c4743fea3a9ee89dded4086d710fd50557 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 15:14:26 +0900
Subject: [PATCH 1001/2296] Rename `PerfectBonusNote` to `NotePerfectBonus`

---
 .../Objects/Drawables/DrawableNote.cs          | 18 +++++++++---------
 ...onusNote.cs => DrawableNotePerfectBonus.cs} |  6 +++---
 osu.Game.Rulesets.Mania/Objects/Note.cs        |  2 +-
 ...PerfectBonusNote.cs => NotePerfectBonus.cs} |  6 +++---
 .../Skinning/Legacy/LegacyBodyPiece.cs         |  2 +-
 osu.Game.Rulesets.Mania/UI/Column.cs           |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)
 rename osu.Game.Rulesets.Mania/Objects/Drawables/{DrawablePerfectBonusNote.cs => DrawableNotePerfectBonus.cs} (76%)
 rename osu.Game.Rulesets.Mania/Objects/{PerfectBonusNote.cs => NotePerfectBonus.cs} (70%)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 27039d2f37..c70dfcb761 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private Drawable headPiece;
 
-        private DrawablePerfectBonusNote bonusNote;
+        private DrawableNotePerfectBonus perfectBonus;
 
         public DrawableNote()
             : this(null)
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
                 {
-                    bonusNote.TriggerResult(false);
+                    perfectBonus.TriggerResult(false);
                     ApplyResult(r => r.Type = r.Judgement.MinResult);
                 }
 
@@ -107,13 +107,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             result = GetCappedResult(result);
 
-            bonusNote.TriggerResult(result == HitResult.Perfect);
+            perfectBonus.TriggerResult(result == HitResult.Perfect);
             ApplyResult(r => r.Type = result);
         }
 
         public override void MissForcefully()
         {
-            bonusNote.TriggerResult(false);
+            perfectBonus.TriggerResult(false);
             base.MissForcefully();
         }
 
@@ -141,23 +141,23 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             switch (hitObject)
             {
-                case DrawablePerfectBonusNote bonus:
-                    AddInternal(bonusNote = bonus);
+                case DrawableNotePerfectBonus bonus:
+                    AddInternal(perfectBonus = bonus);
                     break;
             }
         }
 
         protected override void ClearNestedHitObjects()
         {
-            RemoveInternal(bonusNote, false);
+            RemoveInternal(perfectBonus, false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
         {
             switch (hitObject)
             {
-                case PerfectBonusNote bonus:
-                    return new DrawablePerfectBonusNote(bonus);
+                case NotePerfectBonus bonus:
+                    return new DrawableNotePerfectBonus(bonus);
             }
 
             return base.CreateNestedHitObject(hitObject);
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNotePerfectBonus.cs
similarity index 76%
rename from osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
rename to osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNotePerfectBonus.cs
index 1761f675f5..70ddb60296 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawablePerfectBonusNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNotePerfectBonus.cs
@@ -3,16 +3,16 @@
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
-    public partial class DrawablePerfectBonusNote : DrawableManiaHitObject<PerfectBonusNote>
+    public partial class DrawableNotePerfectBonus : DrawableManiaHitObject<NotePerfectBonus>
     {
         public override bool DisplayResult => false;
 
-        public DrawablePerfectBonusNote()
+        public DrawableNotePerfectBonus()
             : this(null!)
         {
         }
 
-        public DrawablePerfectBonusNote(PerfectBonusNote hitObject)
+        public DrawableNotePerfectBonus(NotePerfectBonus hitObject)
             : base(hitObject)
         {
         }
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 955d3e9c7d..5914132624 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Objects
         {
             base.CreateNestedHitObjects(cancellationToken);
 
-            AddNested(new PerfectBonusNote { StartTime = StartTime });
+            AddNested(new NotePerfectBonus { StartTime = StartTime });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs b/osu.Game.Rulesets.Mania/Objects/NotePerfectBonus.cs
similarity index 70%
rename from osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
rename to osu.Game.Rulesets.Mania/Objects/NotePerfectBonus.cs
index e98b2ff1c1..def4c01268 100644
--- a/osu.Game.Rulesets.Mania/Objects/PerfectBonusNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/NotePerfectBonus.cs
@@ -7,12 +7,12 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects
 {
-    public class PerfectBonusNote : ManiaHitObject
+    public class NotePerfectBonus : ManiaHitObject
     {
-        public override Judgement CreateJudgement() => new PerfectBonusNoteJudgement();
+        public override Judgement CreateJudgement() => new NotePerfectBonusJudgement();
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
-        public class PerfectBonusNoteJudgement : ManiaJudgement
+        public class NotePerfectBonusJudgement : ManiaJudgement
         {
             public override HitResult MaxResult => HitResult.SmallBonus;
         }
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index 5c353887c3..f27b3bdd5c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             switch (hitObject)
             {
                 // Ensure that the hold note is also faded out when the head/tail/any tick is missed.
-                // Importantly, we filter out unrelated objects like DrawablePerfectBonusNote.
+                // Importantly, we filter out unrelated objects like DrawableNotePerfectBonus.
                 case DrawableHoldNoteTail:
                 case DrawableHoldNoteHead:
                 case DrawableHoldNoteBody:
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 68d1e929be..9489281176 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Mania.UI
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
             RegisterPool<Note, DrawableNote>(10, 50);
-            RegisterPool<PerfectBonusNote, DrawablePerfectBonusNote>(10, 50);
+            RegisterPool<NotePerfectBonus, DrawableNotePerfectBonus>(10, 50);
             RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);

From d9d062915722a7fafe2c8d987067032157c21439 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 15:16:10 +0900
Subject: [PATCH 1002/2296] Fix code quality inspection (weird one)

---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index ccd5e0600d..044ce37832 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -382,7 +382,8 @@ namespace osu.Game.Rulesets.Mania.Tests
         [Test]
         public void TestPressAndReleaseJustAfterTailWithNearbyNote()
         {
-            Note note;
+            // Next note within tail lenience
+            Note note = new Note { StartTime = time_tail + 50 };
 
             var beatmap = new Beatmap<ManiaHitObject>
             {
@@ -394,11 +395,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                         Duration = time_tail - time_head,
                         Column = 0,
                     },
-                    // Next note within tail lenience
-                    (ManiaHitObject)(note = new Note
-                    {
-                        StartTime = time_tail + 50
-                    })
+                    note
                 },
                 BeatmapInfo =
                 {

From 36112302d671bae3df0477346caec9960ddde936 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 15:51:18 +0900
Subject: [PATCH 1003/2296] Remove drag handles from manage collections dialog
 for now

The realm implementation doesn't support this.
---
 osu.Game/Collections/DrawableCollectionListItem.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Collections/DrawableCollectionListItem.cs b/osu.Game/Collections/DrawableCollectionListItem.cs
index 4131148f3f..596bb5d673 100644
--- a/osu.Game/Collections/DrawableCollectionListItem.cs
+++ b/osu.Game/Collections/DrawableCollectionListItem.cs
@@ -36,7 +36,13 @@ namespace osu.Game.Collections
         public DrawableCollectionListItem(Live<BeatmapCollection> item, bool isCreated)
             : base(item)
         {
-            ShowDragHandle.Value = item.IsManaged;
+            // For now we don't support rearranging and always use alphabetical sort.
+            // Change this to:
+            //
+            // ShowDragHandle.Value = item.IsManaged;
+            //
+            // if we want to support user sorting (but changes will need to be made to realm to persist).
+            ShowDragHandle.Value = false;
         }
 
         protected override Drawable CreateContent() => new ItemContent(Model);

From db00b794a24bc21c1e637027d9c2c0ecd1fe057c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 08:52:32 +0200
Subject: [PATCH 1004/2296] Fix test failure due to missing zero (and FP
 shenanigans)

---
 .../Mods/TestSceneManiaModDoubleTime.cs                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index 9f2530eb31..f1a432cc06 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Mod = doubleTime,
-                PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value / doubleTime.ScoreMultiplier == 100010,
+                PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value == (long)(1000010 * doubleTime.ScoreMultiplier),
                 Autoplay = false,
                 Beatmap = new Beatmap
                 {

From b9a84127ac876c9f153f16f2cfe06da2cde3ff89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 08:57:35 +0200
Subject: [PATCH 1005/2296] Remove mention of "any tick"

They're very dead now.
---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index f27b3bdd5c..66e67136df 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         {
             switch (hitObject)
             {
-                // Ensure that the hold note is also faded out when the head/tail/any tick is missed.
+                // Ensure that the hold note is also faded out when the head/tail/body is missed.
                 // Importantly, we filter out unrelated objects like DrawableNotePerfectBonus.
                 case DrawableHoldNoteTail:
                 case DrawableHoldNoteHead:

From 7139592e431ee6da7a6fa48c47f43fd6cf316d15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 15:53:40 +0900
Subject: [PATCH 1006/2296] Fix collections not being sorted correctly in
 context menus

---
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs    | 6 +++++-
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs     | 6 +++++-
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs  | 7 ++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 9e07279be2..8f405399a7 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -500,7 +500,11 @@ namespace osu.Game.Screens.OnlinePlay
                 {
                     if (beatmaps.QueryBeatmap(b => b.OnlineID == beatmap.OnlineID) is BeatmapInfo local && !local.BeatmapSet.AsNonNull().DeletePending)
                     {
-                        var collectionItems = realm.Realm.All<BeatmapCollection>().AsEnumerable().Select(c => new CollectionToggleMenuItem(c.ToLive(realm), beatmap)).Cast<OsuMenuItem>().ToList();
+                        var collectionItems = realm.Realm.All<BeatmapCollection>()
+                                                   .OrderBy(c => c.Name)
+                                                   .AsEnumerable()
+                                                   .Select(c => new CollectionToggleMenuItem(c.ToLive(realm), beatmap)).Cast<OsuMenuItem>().ToList();
+
                         if (manageCollectionsDialog != null)
                             collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index f08d14720b..3dfd801f02 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -233,7 +233,11 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmapInfo.OnlineID > 0 && beatmapOverlay != null)
                     items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => beatmapOverlay.FetchAndShowBeatmap(beatmapInfo.OnlineID)));
 
-                var collectionItems = realm.Realm.All<BeatmapCollection>().AsEnumerable().Select(c => new CollectionToggleMenuItem(c.ToLive(realm), beatmapInfo)).Cast<OsuMenuItem>().ToList();
+                var collectionItems = realm.Realm.All<BeatmapCollection>()
+                                           .OrderBy(c => c.Name)
+                                           .AsEnumerable()
+                                           .Select(c => new CollectionToggleMenuItem(c.ToLive(realm), beatmapInfo)).Cast<OsuMenuItem>().ToList();
+
                 if (manageCollectionsDialog != null)
                     collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 4234184ad1..dd711b2513 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -225,7 +225,12 @@ namespace osu.Game.Screens.Select.Carousel
                 if (beatmapSet.OnlineID > 0 && viewDetails != null)
                     items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => viewDetails(beatmapSet.OnlineID)));
 
-                var collectionItems = realm.Realm.All<BeatmapCollection>().AsEnumerable().Select(createCollectionMenuItem).ToList();
+                var collectionItems = realm.Realm.All<BeatmapCollection>()
+                                           .OrderBy(c => c.Name)
+                                           .AsEnumerable()
+                                           .Select(createCollectionMenuItem)
+                                           .ToList();
+
                 if (manageCollectionsDialog != null)
                     collectionItems.Add(new OsuMenuItem("Manage...", MenuItemType.Standard, manageCollectionsDialog.Show));
 

From 624c05e0ff3b783ceb626e8461ce3e2d3c1e1ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 09:04:53 +0200
Subject: [PATCH 1007/2296] Rename test step

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

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
index 3a74f87f1a..edf866952b 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("all objects perfectly judged",
                 () => judgementResults.Select(result => result.Type),
                 () => Is.EquivalentTo(judgementResults.Select(result => result.Judgement.MaxResult)));
-            AddAssert("base score is 1 million", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_040));
+            AddAssert("score is correct", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_040));
         }
 
         private void performTest(List<ManiaHitObject> hitObjects, List<ReplayFrame> frames)

From c48142816c63d0d2d27f920f573435b47198b1d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 09:06:34 +0200
Subject: [PATCH 1008/2296] Reformat long lines

---
 .../Mods/TestSceneManiaModDoubleTime.cs                   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index f1a432cc06..c717f03f51 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -24,7 +24,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         [Test]
         public void TestHitWindowWithoutDoubleTime() => CreateModTest(new ModTestData
         {
-            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value == 1_000_000,
+            PassCondition = () => Player.ScoreProcessor.JudgedHits > 0
+                                  && Player.ScoreProcessor.Accuracy.Value == 1
+                                  && Player.ScoreProcessor.TotalScore.Value == 1_000_000,
             Autoplay = false,
             Beatmap = new Beatmap
             {
@@ -49,7 +51,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
             CreateModTest(new ModTestData
             {
                 Mod = doubleTime,
-                PassCondition = () => Player.ScoreProcessor.JudgedHits > 0 && Player.ScoreProcessor.Accuracy.Value == 1 && Player.ScoreProcessor.TotalScore.Value == (long)(1000010 * doubleTime.ScoreMultiplier),
+                PassCondition = () => Player.ScoreProcessor.JudgedHits > 0
+                                      && Player.ScoreProcessor.Accuracy.Value == 1
+                                      && Player.ScoreProcessor.TotalScore.Value == (long)(1_000_010 * doubleTime.ScoreMultiplier),
                 Autoplay = false,
                 Beatmap = new Beatmap
                 {

From 84be714d6bd100e69e464dafda6c471aa8e292e8 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 30 Sep 2023 02:19:11 +0900
Subject: [PATCH 1009/2296] Fix large instantaneous delta on first frame

Happens when the first update frame comes in before any mouse input.
---
 .../Default/SpinnerRotationTracker.cs         | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 719cf57d98..41d6e689b1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -22,11 +22,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private readonly DrawableSpinner drawableSpinner;
 
-        private Vector2 mousePosition;
+        private Vector2? mousePosition;
+        private float? lastAngle;
 
-        private float lastAngle;
         private float currentRotation;
-
         private bool rotationTransferred;
 
         [Resolved(canBeNull: true)]
@@ -63,17 +62,19 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         protected override void Update()
         {
             base.Update();
-            float thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
 
-            float delta = thisAngle - lastAngle;
+            if (mousePosition is Vector2 pos)
+            {
+                float thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(pos.X - DrawSize.X / 2, pos.Y - DrawSize.Y / 2));
+                float delta = lastAngle == null ? 0 : thisAngle - lastAngle.Value;
 
-            if (Tracking)
-                AddRotation(delta);
+                if (Tracking)
+                    AddRotation(delta);
 
-            lastAngle = thisAngle;
+                lastAngle = thisAngle;
+            }
 
             IsSpinning.Value = isSpinnableTime && Math.Abs(currentRotation - Rotation) > 10f;
-
             Rotation = (float)Interpolation.Damp(Rotation, currentRotation, 0.99, Math.Abs(Time.Elapsed));
         }
 
@@ -116,8 +117,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         {
             Tracking = false;
             IsSpinning.Value = false;
-            mousePosition = default;
-            lastAngle = currentRotation = Rotation = 0;
+            mousePosition = null;
+            lastAngle = null;
+            currentRotation = 0;
+            Rotation = 0;
             rotationTransferred = false;
         }
 

From c1a817fec607aa2577fab9ebf7223b352020d33e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 Sep 2023 07:47:07 +0200
Subject: [PATCH 1010/2296] Add `LegacyOnlineID` with backwards migration

---
 osu.Game/Database/RealmAccess.cs | 21 ++++++++++++++++++++-
 osu.Game/Scoring/ScoreInfo.cs    | 16 ++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index cd97bb6430..12d1753b9b 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -84,8 +84,9 @@ namespace osu.Game.Database
         /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
         /// 33   2023-08-16    Reset default chat toggle key binding to avoid conflict with newly added leaderboard toggle key binding.
         /// 34   2023-08-21    Add BackgroundReprocessingFailed flag to ScoreInfo to track upgrade failures.
+        /// 35   2023-09-01    Add LegacyOnlineID to ScoreInfo. Move osu_scores_*_high IDs stored in OnlineID to LegacyOnlineID. Reset anomalous OnlineIDs.
         /// </summary>
-        private const int schema_version = 34;
+        private const int schema_version = 35;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -1031,6 +1032,24 @@ namespace osu.Game.Database
 
                     break;
                 }
+
+                case 35:
+                {
+                    foreach (var score in migration.NewRealm.All<ScoreInfo>())
+                    {
+                        if (score.OnlineID > 0)
+                        {
+                            score.LegacyOnlineID = score.OnlineID;
+                            score.OnlineID = -1;
+                        }
+                        else
+                        {
+                            score.LegacyOnlineID = score.OnlineID = -1;
+                        }
+                    }
+
+                    break;
+                }
             }
 
             Logger.Log($"Migration completed in {stopwatch.ElapsedMilliseconds}ms");
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 8531408555..992271d072 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -100,9 +100,25 @@ namespace osu.Game.Scoring
 
         public double? PP { get; set; }
 
+        /// <summary>
+        /// The online ID of this score.
+        /// </summary>
+        /// <remarks>
+        /// In the osu-web database, this ID (if present) comes from the new <c>solo_scores</c> table.
+        /// </remarks>
         [Indexed]
         public long OnlineID { get; set; } = -1;
 
+        /// <summary>
+        /// The legacy online ID of this score.
+        /// </summary>
+        /// <remarks>
+        /// In the osu-web database, this ID (if present) comes from the legacy <c>osu_scores_*_high</c> tables.
+        /// This ID is also stored to replays set on osu!stable.
+        /// </remarks>
+        [Indexed]
+        public long LegacyOnlineID { get; set; } = -1;
+
         [MapTo("User")]
         public RealmUser RealmUser { get; set; } = null!;
 

From bfcb4f4f2d940835eb8e9f42eb620184d4ed877c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 Sep 2023 08:04:35 +0200
Subject: [PATCH 1011/2296] Add failing test for legacy online ID decoding

---
 .../Beatmaps/Formats/LegacyScoreDecoderTest.cs    |  14 ++++++++++++++
 .../taiko-replay-with-legacy-online-id.osr        | Bin 0 -> 238 bytes
 2 files changed, 14 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/Replays/taiko-replay-with-legacy-online-id.osr

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
index 93cda34ef7..c7fd3ba098 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
@@ -87,6 +87,20 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestDecodeLegacyOnlineID()
+        {
+            var decoder = new TestLegacyScoreDecoder();
+
+            using (var resourceStream = TestResources.OpenResource("Replays/taiko-replay-with-legacy-online-id.osr"))
+            {
+                var score = decoder.Parse(resourceStream);
+
+                Assert.That(score.ScoreInfo.OnlineID, Is.EqualTo(-1));
+                Assert.That(score.ScoreInfo.LegacyOnlineID, Is.EqualTo(255));
+            }
+        }
+
         [TestCase(3, true)]
         [TestCase(6, false)]
         [TestCase(LegacyBeatmapDecoder.LATEST_VERSION, false)]
diff --git a/osu.Game.Tests/Resources/Replays/taiko-replay-with-legacy-online-id.osr b/osu.Game.Tests/Resources/Replays/taiko-replay-with-legacy-online-id.osr
new file mode 100644
index 0000000000000000000000000000000000000000..85ad28c7ca3f9e32146cfff8994cb9fbcf584a6e
GIT binary patch
literal 238
zcmZSN=rUpCRxmU*PqQ>jN;EJ_HcqxoN;FS4NKLXxNl8jJvox|WwB+W>P0h|uOvx`U
zRpeGMNi{Y$H#9XgPc=7Av^2LcO*A!6v@}XiG&3+yPE9gmVE_RpF!@23fdRzlU|`@D
zG%_?ct})OvHr6pUG%%?#)JZt7C`od{EsiLlidY5)1qLgKE(Qj%9;dkG`r7Op-o=T*
z*CL8GF^jI?N!zpE@#WrB&!a^VpByr7JWzVO{9Crhvo#`$>L1#cZ&WQ%Oui9fe{Qpf
Zr?FkmyS<TzQ&=CTIWYVOyM%#(3jlWxMX3M)

literal 0
HcmV?d00001


From fa519984dfdbb5cff3425f170ba7e8698d5fd318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 Sep 2023 08:10:26 +0200
Subject: [PATCH 1012/2296] Move legacy online ID encode/decode to legacy
 property

---
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 4 ++--
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 8c00110909..1441a14aa0 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -101,9 +101,9 @@ namespace osu.Game.Scoring.Legacy
                 byte[] compressedReplay = sr.ReadByteArray();
 
                 if (version >= 20140721)
-                    scoreInfo.OnlineID = sr.ReadInt64();
+                    scoreInfo.LegacyOnlineID = sr.ReadInt64();
                 else if (version >= 20121008)
-                    scoreInfo.OnlineID = sr.ReadInt32();
+                    scoreInfo.LegacyOnlineID = sr.ReadInt32();
 
                 byte[] compressedScoreInfo = null;
 
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index a95964ac52..872f09dda6 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Scoring.Legacy
                 sw.Write(getHpGraphFormatted());
                 sw.Write(score.ScoreInfo.Date.DateTime);
                 sw.WriteByteArray(createReplayData());
-                sw.Write((long)0);
+                sw.Write(score.ScoreInfo.LegacyOnlineID);
                 writeModSpecificData(score.ScoreInfo, sw);
                 sw.WriteByteArray(createScoreInfoData());
             }

From c53f4c144cc109d0b0f710adf39ea31be12a29fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 Sep 2023 08:23:29 +0200
Subject: [PATCH 1013/2296] Encode/decode new `OnlineID` into/from
 `LegacyReplaySoloScoreInfo`

---
 osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs | 8 ++++++++
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs        | 1 +
 2 files changed, 9 insertions(+)

diff --git a/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs b/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
index f2e8cf141b..d34edf7bdf 100644
--- a/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
+++ b/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
@@ -19,6 +19,13 @@ namespace osu.Game.Scoring.Legacy
     [JsonObject(MemberSerialization.OptIn)]
     public class LegacyReplaySoloScoreInfo
     {
+        /// <remarks>
+        /// The value of this property should correspond to <see cref="ScoreInfo.OnlineID"/>
+        /// (i.e. come from the `solo_scores` ID scheme).
+        /// </remarks>
+        [JsonProperty("online_id")]
+        public long OnlineID { get; set; } = -1;
+
         [JsonProperty("mods")]
         public APIMod[] Mods { get; set; } = Array.Empty<APIMod>();
 
@@ -30,6 +37,7 @@ namespace osu.Game.Scoring.Legacy
 
         public static LegacyReplaySoloScoreInfo FromScore(ScoreInfo score) => new LegacyReplaySoloScoreInfo
         {
+            OnlineID = score.OnlineID,
             Mods = score.APIMods,
             Statistics = score.Statistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
             MaximumStatistics = score.MaximumStatistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 1441a14aa0..c5e6e3bcce 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -121,6 +121,7 @@ namespace osu.Game.Scoring.Legacy
 
                         Debug.Assert(readScore != null);
 
+                        score.ScoreInfo.OnlineID = readScore.OnlineID;
                         score.ScoreInfo.Statistics = readScore.Statistics;
                         score.ScoreInfo.MaximumStatistics = readScore.MaximumStatistics;
                         score.ScoreInfo.Mods = readScore.Mods.Select(m => m.ToMod(currentRuleset)).ToArray();

From b144cfd55c1a5546a42223d3e2de44aecc47c56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Sep 2023 12:21:23 +0200
Subject: [PATCH 1014/2296] Add `LegacyOnlineID` handling to places that
 definitely need it

Mostly places that can interact with imported replays.

There are other places that use the online ID as a sort tiebreaker, or
to check presence of a score on results screens, but they should
probably still continue to only use `OnlineID`, since all scores with a
legacy online ID should have an online ID, but the converse is not
generally true.
---
 osu.Game/Extensions/ModelExtensions.cs  | 20 ++++++++++++++++++--
 osu.Game/Online/ScoreDownloadTracker.cs |  4 +++-
 osu.Game/OsuGame.cs                     |  3 +++
 osu.Game/Scoring/IScoreInfo.cs          |  2 ++
 osu.Game/Scoring/ScoreManager.cs        |  6 +++++-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Extensions/ModelExtensions.cs b/osu.Game/Extensions/ModelExtensions.cs
index efb3c4d633..eef9b63b62 100644
--- a/osu.Game/Extensions/ModelExtensions.cs
+++ b/osu.Game/Extensions/ModelExtensions.cs
@@ -114,8 +114,24 @@ namespace osu.Game.Extensions
         /// </summary>
         /// <param name="instance">The instance to compare.</param>
         /// <param name="other">The other instance to compare against.</param>
-        /// <returns>Whether online IDs match. If either instance is missing an online ID, this will return false.</returns>
-        public static bool MatchesOnlineID(this IScoreInfo? instance, IScoreInfo? other) => matchesOnlineID(instance, other);
+        /// <returns>
+        /// Whether online IDs match.
+        /// Both <see cref="IHasOnlineID{T}.OnlineID"/> and <see cref="IScoreInfo.LegacyOnlineID"/> are checked, in that order.
+        /// If either instance is missing an online ID, this will return false.
+        /// </returns>
+        public static bool MatchesOnlineID(this IScoreInfo? instance, IScoreInfo? other)
+        {
+            if (matchesOnlineID(instance, other))
+                return true;
+
+            if (instance == null || other == null)
+                return false;
+
+            if (instance.LegacyOnlineID < 0 || other.LegacyOnlineID < 0)
+                return false;
+
+            return instance.LegacyOnlineID.Equals(other.LegacyOnlineID);
+        }
 
         private static bool matchesOnlineID(this IHasOnlineID<long>? instance, IHasOnlineID<long>? other)
         {
diff --git a/osu.Game/Online/ScoreDownloadTracker.cs b/osu.Game/Online/ScoreDownloadTracker.cs
index de42292372..dfdac24d19 100644
--- a/osu.Game/Online/ScoreDownloadTracker.cs
+++ b/osu.Game/Online/ScoreDownloadTracker.cs
@@ -39,7 +39,8 @@ namespace osu.Game.Online
             var scoreInfo = new ScoreInfo
             {
                 ID = TrackedItem.ID,
-                OnlineID = TrackedItem.OnlineID
+                OnlineID = TrackedItem.OnlineID,
+                LegacyOnlineID = TrackedItem.LegacyOnlineID
             };
 
             Downloader.DownloadBegan += downloadBegan;
@@ -47,6 +48,7 @@ namespace osu.Game.Online
 
             realmSubscription = realm.RegisterForNotifications(r => r.All<ScoreInfo>().Where(s =>
                 ((s.OnlineID > 0 && s.OnlineID == TrackedItem.OnlineID)
+                 || (s.LegacyOnlineID > 0 && s.LegacyOnlineID == TrackedItem.LegacyOnlineID)
                  || (!string.IsNullOrEmpty(s.Hash) && s.Hash == TrackedItem.Hash))
                 && !s.DeletePending), (items, _) =>
             {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 885077a8e8..2f11964f6a 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -678,6 +678,9 @@ namespace osu.Game
             if (score.OnlineID > 0)
                 databasedScoreInfo = ScoreManager.Query(s => s.OnlineID == score.OnlineID);
 
+            if (score.LegacyOnlineID > 0)
+                databasedScoreInfo ??= ScoreManager.Query(s => s.LegacyOnlineID == score.LegacyOnlineID);
+
             if (score is ScoreInfo scoreInfo)
                 databasedScoreInfo ??= ScoreManager.Query(s => s.Hash == scoreInfo.Hash);
 
diff --git a/osu.Game/Scoring/IScoreInfo.cs b/osu.Game/Scoring/IScoreInfo.cs
index d17558f800..4083d57fa0 100644
--- a/osu.Game/Scoring/IScoreInfo.cs
+++ b/osu.Game/Scoring/IScoreInfo.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Scoring
 
         bool HasReplay { get; }
 
+        long LegacyOnlineID { get; }
+
         DateTimeOffset Date { get; }
 
         double? PP { get; }
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 31b5bd8365..02d9e0a280 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -150,7 +150,11 @@ namespace osu.Game.Scoring
 
         public Task Import(ImportTask[] imports, ImportParameters parameters = default) => scoreImporter.Import(imports, parameters);
 
-        public override bool IsAvailableLocally(ScoreInfo model) => Realm.Run(realm => realm.All<ScoreInfo>().Any(s => s.OnlineID == model.OnlineID));
+        public override bool IsAvailableLocally(ScoreInfo model)
+            => Realm.Run(realm => realm.All<ScoreInfo>()
+                                       // this basically inlines `ModelExtension.MatchesOnlineID(IScoreInfo, IScoreInfo)`,
+                                       // because that method can't be used here, as realm can't translate it to its query language.
+                                       .Any(s => s.OnlineID == model.OnlineID || s.LegacyOnlineID == model.LegacyOnlineID));
 
         public IEnumerable<string> HandledExtensions => scoreImporter.HandledExtensions;
 

From d5a733d244ba5d5915f3b6370c7dfebb383fc600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 12:32:28 +0200
Subject: [PATCH 1015/2296] Use solo score ID as `OnlineID` when converting
 from `MultiplayerScore`

---
 .../Playlists/TestScenePlaylistsResultsScreen.cs    | 13 ++++++++++---
 osu.Game/Online/Rooms/MultiplayerScore.cs           |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index cb422d8c06..3f230099da 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -245,6 +245,7 @@ namespace osu.Game.Tests.Visual.Playlists
             var multiplayerUserScore = new MultiplayerScore
             {
                 ID = highestScoreId,
+                SoloScoreID = (ulong?)highestScoreId,
                 Accuracy = userScore.Accuracy,
                 Passed = userScore.Passed,
                 Rank = userScore.Rank,
@@ -262,9 +263,11 @@ namespace osu.Game.Tests.Visual.Playlists
 
             for (int i = 1; i <= scores_per_result; i++)
             {
+                int nextLowest = getNextLowestScoreId();
                 multiplayerUserScore.ScoresAround.Lower.Scores.Add(new MultiplayerScore
                 {
-                    ID = getNextLowestScoreId(),
+                    ID = nextLowest,
+                    SoloScoreID = (ulong?)nextLowest,
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -277,9 +280,11 @@ namespace osu.Game.Tests.Visual.Playlists
                     },
                 });
 
+                int nextHighest = getNextHighestScoreId();
                 multiplayerUserScore.ScoresAround.Higher.Scores.Add(new MultiplayerScore
                 {
-                    ID = getNextHighestScoreId(),
+                    ID = nextHighest,
+                    SoloScoreID = (ulong?)nextHighest,
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -309,9 +314,11 @@ namespace osu.Game.Tests.Visual.Playlists
 
             for (int i = 1; i <= scores_per_result; i++)
             {
+                int id = sort == "score_asc" ? getNextHighestScoreId() : getNextLowestScoreId();
                 result.Scores.Add(new MultiplayerScore
                 {
-                    ID = sort == "score_asc" ? getNextHighestScoreId() : getNextLowestScoreId(),
+                    ID = id,
+                    SoloScoreID = (ulong?)id,
                     Accuracy = 1,
                     Passed = true,
                     Rank = ScoreRank.X,
diff --git a/osu.Game/Online/Rooms/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
index d5e0c7a970..21aa8df54b 100644
--- a/osu.Game/Online/Rooms/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Online.Rooms
 
             var scoreInfo = new ScoreInfo
             {
-                OnlineID = ID,
+                OnlineID = (long?)SoloScoreID ?? -1,
                 TotalScore = TotalScore,
                 MaxCombo = MaxCombo,
                 BeatmapInfo = beatmap,

From c4af8591a5952fc760ec967b37153178017d7e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 09:39:10 +0200
Subject: [PATCH 1016/2296] Preserve `OnlineID` when importing scores

Previously, for lazer scores, the ID returned from `osu-web` was
discarded and replaced with -1, due to the fact that the appropriate
structures for unification with stable, as well as unification across
solo and multiplayer, were not in place yet.

Now we're at the point where scores from all the aforementioned sources
receive a `solo_scores` DB row, and as such, we can start treating
`solo_scores`-scheme IDs as canonical "online IDs" for a score.
---
 osu.Game/Screens/Play/Player.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 97bfa35d49..845615742d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1166,13 +1166,6 @@ namespace osu.Game.Screens.Play
             // the import process will re-attach managed beatmap/rulesets to this score. we don't want this for now, so create a temporary copy to import.
             var importableScore = score.ScoreInfo.DeepClone();
 
-            // For the time being, online ID responses are not really useful for anything.
-            // In addition, the IDs provided via new (lazer) endpoints are based on a different autoincrement from legacy (stable) scores.
-            //
-            // Until we better define the server-side logic behind this, let's not store the online ID to avoid potential unique constraint
-            // conflicts across various systems (ie. solo and multiplayer).
-            importableScore.OnlineID = -1;
-
             var imported = scoreManager.Import(importableScore, replayReader);
 
             imported.PerformRead(s =>

From fb2293821ab009304c11be3d4d352ee8aa92debe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Sep 2023 11:26:51 +0200
Subject: [PATCH 1017/2296] Allow watching replay from multi/playlist results
 screens

---
 osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs      | 2 +-
 osu.Game/Online/Rooms/MultiplayerScore.cs                    | 5 ++++-
 osu.Game/Scoring/ScoreInfo.cs                                | 5 ++++-
 .../OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs       | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index 15f4bace96..783522220b 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Online.API.Requests.Responses
                 Statistics = Statistics,
                 MaximumStatistics = MaximumStatistics,
                 Date = EndedAt,
-                Hash = HasReplay ? "online" : string.Empty, // TODO: temporary?
+                HasOnlineReplay = HasReplay,
                 Mods = mods,
                 PP = PP,
             };
diff --git a/osu.Game/Online/Rooms/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
index 21aa8df54b..e6307ab7f0 100644
--- a/osu.Game/Online/Rooms/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -58,6 +58,9 @@ namespace osu.Game.Online.Rooms
         [JsonProperty("position")]
         public int? Position { get; set; }
 
+        [JsonProperty("has_replay")]
+        public bool HasReplay { get; set; }
+
         /// <summary>
         /// Any scores in the room around this score.
         /// </summary>
@@ -84,7 +87,7 @@ namespace osu.Game.Online.Rooms
                 User = User,
                 Accuracy = Accuracy,
                 Date = EndedAt,
-                Hash = string.Empty, // todo: temporary?
+                HasOnlineReplay = HasReplay,
                 Rank = Rank,
                 Mods = Mods?.Select(m => m.ToMod(rulesetInstance)).ToArray() ?? Array.Empty<Mod>(),
                 Position = Position,
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 992271d072..6b03e876c4 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -94,7 +94,10 @@ namespace osu.Game.Scoring
 
         public double Accuracy { get; set; }
 
-        public bool HasReplay => !string.IsNullOrEmpty(Hash);
+        public bool HasReplay => !string.IsNullOrEmpty(Hash) || HasOnlineReplay;
+
+        [Ignored]
+        public bool HasOnlineReplay { get; set; }
 
         public DateTimeOffset Date { get; set; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
index 9708a94cd7..f665ed2d41 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public partial class MultiplayerResultsScreen : PlaylistsResultsScreen
     {
         public MultiplayerResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem)
-            : base(score, roomId, playlistItem, false, false)
+            : base(score, roomId, playlistItem, false)
         {
         }
     }

From 159b24acf767b07e1dc803d7875788bd8ebf8e72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 18:25:03 +0900
Subject: [PATCH 1018/2296] Rename `RateAdjustedRotation` to `TotalRotation`

---
 .../TestSceneSpinnerApplication.cs                   |  4 ++--
 .../TestSceneSpinnerRotation.cs                      | 12 ++++++------
 .../Judgements/OsuSpinnerJudgementResult.cs          |  2 +-
 .../Objects/Drawables/DrawableSpinner.cs             |  6 +++---
 .../Skinning/Argon/ArgonSpinnerDisc.cs               |  2 +-
 .../Skinning/Default/DefaultSpinnerDisc.cs           |  2 +-
 .../Skinning/Default/SpinnerRotationTracker.cs       |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
index 1ae17432be..dae81f4cff 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             AddStep("rotate some", () => dho.RotationTracker.AddRotation(180));
-            AddAssert("rotation is set", () => dho.Result.RateAdjustedRotation == 180);
+            AddAssert("rotation is set", () => dho.Result.TotalRotation == 180);
 
             AddStep("apply new spinner", () => dho.Apply(prepareObject(new Spinner
             {
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Duration = 1000,
             })));
 
-            AddAssert("rotation is reset", () => dho.Result.RateAdjustedRotation == 0);
+            AddAssert("rotation is reset", () => dho.Result.TotalRotation == 0);
         }
 
         private Spinner prepareObject(Spinner circle)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 116c974f32..8711aa9c09 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -63,11 +63,11 @@ namespace osu.Game.Rulesets.Osu.Tests
                 trackerRotationTolerance = Math.Abs(drawableSpinner.RotationTracker.Rotation * 0.1f);
             });
             AddAssert("is disc rotation not almost 0", () => drawableSpinner.RotationTracker.Rotation, () => Is.Not.EqualTo(0).Within(100));
-            AddAssert("is disc rotation absolute not almost 0", () => drawableSpinner.Result.RateAdjustedRotation, () => Is.Not.EqualTo(0).Within(100));
+            AddAssert("is disc rotation absolute not almost 0", () => drawableSpinner.Result.TotalRotation, () => Is.Not.EqualTo(0).Within(100));
 
             addSeekStep(0);
             AddAssert("is disc rotation almost 0", () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(0).Within(trackerRotationTolerance));
-            AddAssert("is disc rotation absolute almost 0", () => drawableSpinner.Result.RateAdjustedRotation, () => Is.EqualTo(0).Within(100));
+            AddAssert("is disc rotation absolute almost 0", () => drawableSpinner.Result.TotalRotation, () => Is.EqualTo(0).Within(100));
         }
 
         [Test]
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 finalTrackerRotation = drawableSpinner.RotationTracker.Rotation;
                 trackerRotationTolerance = Math.Abs(finalTrackerRotation * 0.05f);
             });
-            AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.Result.RateAdjustedRotation);
+            AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.Result.TotalRotation);
 
             addSeekStep(spinner_start_time + 2500);
             AddAssert("disc rotation rewound",
@@ -92,13 +92,13 @@ namespace osu.Game.Rulesets.Osu.Tests
                 () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(finalTrackerRotation / 2).Within(trackerRotationTolerance));
             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));
+                () => drawableSpinner.Result.TotalRotation, () => Is.EqualTo(finalCumulativeTrackerRotation / 2).Within(100));
 
             addSeekStep(spinner_start_time + 5000);
             AddAssert("is disc rotation almost same",
                 () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(finalTrackerRotation).Within(trackerRotationTolerance));
             AddAssert("is cumulative rotation almost same",
-                () => drawableSpinner.Result.RateAdjustedRotation, () => Is.EqualTo(finalCumulativeTrackerRotation).Within(100));
+                () => drawableSpinner.Result.TotalRotation, () => Is.EqualTo(finalCumulativeTrackerRotation).Within(100));
         }
 
         [Test]
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
                 long totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.Result.RateAdjustedRotation / 360) * new SpinnerTick().CreateJudgement().MaxNumericResult;
+                return totalScore == (int)(drawableSpinner.Result.TotalRotation / 360) * new SpinnerTick().CreateJudgement().MaxNumericResult;
             });
 
             addSeekStep(0);
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
index 941cb667cf..c5e15d63ea 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Judgements
         /// If Double Time is active instead (with a speed multiplier of 1.5x),
         /// in the same scenario the property will return 720 * 1.5 = 1080.
         /// </example>
-        public float RateAdjustedRotation;
+        public float TotalRotation;
 
         /// <summary>
         /// Time instant at which the spin was started (the first user input which caused an increase in spin).
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 24446db92a..9fa180cf93 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     // these become implicitly hit.
                     return 1;
 
-                return Math.Clamp(Result.RateAdjustedRotation / 360 / HitObject.SpinsRequired, 0, 1);
+                return Math.Clamp(Result.TotalRotation / 360 / HitObject.SpinsRequired, 0, 1);
             }
         }
 
@@ -279,7 +279,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             // don't update after end time to avoid the rate display dropping during fade out.
             // this shouldn't be limited to StartTime as it causes weirdness with the underlying calculation, which is expecting updates during that period.
             if (Time.Current <= HitObject.EndTime)
-                spmCalculator.SetRotation(Result.RateAdjustedRotation);
+                spmCalculator.SetRotation(Result.TotalRotation);
 
             updateBonusScore();
         }
@@ -293,7 +293,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (ticks.Count == 0)
                 return;
 
-            int spins = (int)(Result.RateAdjustedRotation / 360);
+            int spins = (int)(Result.TotalRotation / 360);
 
             if (spins < completedFullSpins)
             {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
index bdc93eb63f..079758c21e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         {
             get
             {
-                int rotations = (int)(drawableSpinner.Result.RateAdjustedRotation / 360);
+                int rotations = (int)(drawableSpinner.Result.TotalRotation / 360);
 
                 if (wholeRotationCount == rotations) return false;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
index 75f3247448..b498975a83 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         {
             get
             {
-                int rotations = (int)(drawableSpinner.Result.RateAdjustedRotation / 360);
+                int rotations = (int)(drawableSpinner.Result.TotalRotation / 360);
 
                 if (wholeRotationCount == rotations) return false;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 41d6e689b1..77d410887c 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?.GetTrueGameplayRate() ?? Clock.Rate));
+            drawableSpinner.Result.TotalRotation += (float)(Math.Abs(angle) * (gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate));
         }
 
         private void resetState(DrawableHitObject obj)

From cfa4adb24d2ed5282ef0e4c8616e3ab9f70c0b43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 18:25:40 +0900
Subject: [PATCH 1019/2296] Add `SpinFramesGenerator` class to simplify
 creating spinner tests

---
 .../SpinFramesGenerator.cs                    | 111 ++++++++++++++++++
 .../TestSceneLegacyHitPolicy.cs               |  15 +--
 .../TestSceneSpinnerJudgement.cs              |  26 +---
 .../TestSceneStartTimeOrderedHitPolicy.cs     |  15 +--
 4 files changed, 130 insertions(+), 37 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
new file mode 100644
index 0000000000..43adfb7f1f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
@@ -0,0 +1,111 @@
+// 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.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class SpinFramesGenerator
+    {
+        /// <summary>
+        /// A small amount to spin beyond a given angle to mitigate floating-point precision errors.
+        /// </summary>
+        public const float SPIN_ERROR = MathF.PI / 8;
+
+        /// <summary>
+        /// The offset from the centre of the spinner at which to spin.
+        /// </summary>
+        private const float centre_spin_offset = 50;
+
+        private readonly double startTime;
+        private readonly float startAngle;
+        private readonly List<(float deltaAngle, double duration)> sequences = new List<(float deltaAngle, double duration)>();
+
+        /// <summary>
+        /// Creates a new <see cref="SpinFramesGenerator"/> that can be used to generate spinner spin frames.
+        /// </summary>
+        /// <param name="startTime">The time at which to start spinning.</param>
+        /// <param name="startAngle">The angle, in radians, at which to start spinning from. Defaults to the positive-y-axis.</param>
+        public SpinFramesGenerator(double startTime, float startAngle = -MathF.PI / 2f)
+        {
+            this.startTime = startTime;
+            this.startAngle = startAngle;
+        }
+
+        /// <summary>
+        /// Performs a single spin.
+        /// </summary>
+        /// <param name="delta">The amount, relative to a full circle, to spin.</param>
+        /// <param name="duration">The time to spend to perform the spin.</param>
+        /// <returns>This <see cref="SpinFramesGenerator"/>.</returns>
+        public SpinFramesGenerator Spin(float delta, double duration)
+        {
+            sequences.Add((delta * 2 * MathF.PI, duration));
+            return this;
+        }
+
+        /// <summary>
+        /// Constructs the replay frames.
+        /// </summary>
+        /// <returns>The replay frames.</returns>
+        public List<ReplayFrame> Build()
+        {
+            List<ReplayFrame> frames = new List<ReplayFrame>();
+
+            double lastTime = startTime;
+            float lastAngle = startAngle;
+            int lastDirection = 0;
+
+            for (int i = 0; i < sequences.Count; i++)
+            {
+                var seq = sequences[i];
+
+                int seqDirection = Math.Sign(seq.deltaAngle);
+                float seqError = SPIN_ERROR * seqDirection;
+
+                if (seqDirection == lastDirection)
+                {
+                    // Spinning in the same direction, but the error was already added in the last rotation.
+                    seqError = 0;
+                }
+                else if (lastDirection != 0)
+                {
+                    // Spinning in a different direction, we need to account for the error of the start angle, so double it.
+                    seqError *= 2;
+                }
+
+                double seqStartTime = lastTime;
+                double seqEndTime = lastTime + seq.duration;
+                float seqStartAngle = lastAngle;
+                float seqEndAngle = seqStartAngle + seq.deltaAngle + seqError;
+
+                // Intermediate spin frames.
+                for (; lastTime < seqEndTime; lastTime += 10)
+                    frames.Add(new OsuReplayFrame(lastTime, calcOffsetAt((lastTime - seqStartTime) / (seqEndTime - seqStartTime), seqStartAngle, seqEndAngle), OsuAction.LeftButton));
+
+                // Final frame at the end of the current spin.
+                frames.Add(new OsuReplayFrame(lastTime, calcOffsetAt(1, seqStartAngle, seqEndAngle), OsuAction.LeftButton));
+
+                lastTime = seqEndTime;
+                lastAngle = seqEndAngle;
+                lastDirection = seqDirection;
+            }
+
+            // Key release frame.
+            if (frames.Count > 0)
+                frames.Add(new OsuReplayFrame(frames[^1].Time, ((OsuReplayFrame)frames[^1]).Position));
+
+            return frames;
+        }
+
+        private static Vector2 calcOffsetAt(double p, float startAngle, float endAngle)
+        {
+            float angle = startAngle + (endAngle - startAngle) * (float)p;
+            return new Vector2(256, 192) + centre_spin_offset * new Vector2(MathF.Cos(angle), MathF.Sin(angle));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index a2ef72fe57..e0a618b187 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -356,15 +356,16 @@ namespace osu.Game.Rulesets.Osu.Tests
                 },
             };
 
-            performTest(hitObjects, new List<ReplayFrame>
+            List<ReplayFrame> frames = new List<ReplayFrame>
             {
                 new OsuReplayFrame { Time = time_spinner - 90, Position = positionCircle, Actions = { OsuAction.LeftButton } },
-                new OsuReplayFrame { Time = time_spinner + 10, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 20, Position = new Vector2(256, 172), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 30, Position = new Vector2(276, 192), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 40, Position = new Vector2(256, 212), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 50, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
-            });
+            };
+
+            frames.AddRange(new SpinFramesGenerator(time_spinner + 10)
+                            .Spin(1, 500)
+                            .Build());
+
+            performTest(hitObjects, frames);
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Meh);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
index c969cb11b4..6a50f08508 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.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 NUnit.Framework;
@@ -11,14 +10,12 @@ using osu.Game.Beatmaps;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
-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.Screens.Play;
 using osu.Game.Tests.Visual;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -59,26 +56,9 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("all max judgements", () => judgementResults.All(result => result.Type == result.Judgement.MaxResult));
         }
 
-        private static List<ReplayFrame> generateReplay(int spins)
-        {
-            var replayFrames = new List<ReplayFrame>();
-
-            const int frames_per_spin = 30;
-
-            for (int i = 0; i < spins * frames_per_spin; ++i)
-            {
-                float totalProgress = i / (float)(spins * frames_per_spin);
-                float spinProgress = (i % frames_per_spin) / (float)frames_per_spin;
-                double time = time_spinner_start + (time_spinner_end - time_spinner_start) * totalProgress;
-                float posX = MathF.Cos(2 * MathF.PI * spinProgress);
-                float posY = MathF.Sin(2 * MathF.PI * spinProgress);
-                Vector2 finalPos = OsuPlayfield.BASE_SIZE / 2 + new Vector2(posX, posY) * 50;
-
-                replayFrames.Add(new OsuReplayFrame(time, finalPos, OsuAction.LeftButton));
-            }
-
-            return replayFrames;
-        }
+        private static List<ReplayFrame> generateReplay(int spins) => new SpinFramesGenerator(time_spinner_start)
+                                                                      .Spin(spins, time_spinner_end - time_spinner_start)
+                                                                      .Build();
 
         private void performTest(List<ReplayFrame> frames)
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index f0af3f0c39..19413a50a8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -284,15 +284,16 @@ namespace osu.Game.Rulesets.Osu.Tests
                 },
             };
 
-            performTest(hitObjects, new List<ReplayFrame>
+            List<ReplayFrame> frames = new List<ReplayFrame>
             {
                 new OsuReplayFrame { Time = time_spinner - 100, Position = positionCircle, Actions = { OsuAction.LeftButton } },
-                new OsuReplayFrame { Time = time_spinner + 10, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 20, Position = new Vector2(256, 172), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 30, Position = new Vector2(276, 192), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 40, Position = new Vector2(256, 212), Actions = { OsuAction.RightButton } },
-                new OsuReplayFrame { Time = time_spinner + 50, Position = new Vector2(236, 192), Actions = { OsuAction.RightButton } },
-            });
+            };
+
+            frames.AddRange(new SpinFramesGenerator(time_spinner + 10)
+                            .Spin(1, 500)
+                            .Build());
+
+            performTest(hitObjects, frames);
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Great);

From 28ee99f132bf48a3368bcac3f51fc2721b079225 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 18:31:01 +0900
Subject: [PATCH 1020/2296] Add prospective test coverage of spinner input
 handling

---
 .../TestSceneSpinnerInput.cs                  | 290 ++++++++++++++++++
 1 file changed, 290 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
new file mode 100644
index 0000000000..d7151f9370
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -0,0 +1,290 @@
+// 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.Screens;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Storyboards;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public partial class TestSceneSpinnerInput : RateAdjustedBeatmapTestScene
+    {
+        private const int centre_x = 256;
+        private const int centre_y = 192;
+        private const double time_spinner_start = 1500;
+        private const double time_spinner_end = 8000;
+
+        private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
+
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
+        private ManualClock? manualClock;
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard? storyboard = null)
+        {
+            return manualClock == null
+                ? base.CreateWorkingBeatmap(beatmap, storyboard)
+                : new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(manualClock), Audio);
+        }
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            manualClock = null;
+        });
+
+        /// <summary>
+        /// While off-centre, vibrates backwards and forwards on the x-axis, from centre-50 to centre+50, every 50ms.
+        /// </summary>
+        [Test]
+        [Ignore("An upcoming implementation will fix this case")]
+        public void TestVibrateWithoutSpinningOffCentre()
+        {
+            List<ReplayFrame> frames = new List<ReplayFrame>();
+
+            const int vibrate_time = 50;
+            const float y_pos = centre_y - 50;
+
+            int direction = -1;
+
+            for (double i = time_spinner_start; i <= time_spinner_end; i += vibrate_time)
+            {
+                frames.Add(new OsuReplayFrame(i, new Vector2(centre_x + direction * 50, y_pos), OsuAction.LeftButton));
+                frames.Add(new OsuReplayFrame(i + vibrate_time, new Vector2(centre_x - direction * 50, y_pos), OsuAction.LeftButton));
+
+                direction *= -1;
+            }
+
+            performTest(frames);
+
+            assertTicksHit(0);
+            assertSpinnerHit(false);
+        }
+
+        /// <summary>
+        /// While centred on the slider, vibrates backwards and forwards on the x-axis, from centre-50 to centre+50, every 50ms.
+        /// </summary>
+        [Test]
+        [Ignore("An upcoming implementation will fix this case")]
+        public void TestVibrateWithoutSpinningOnCentre()
+        {
+            List<ReplayFrame> frames = new List<ReplayFrame>();
+
+            const int vibrate_time = 50;
+
+            int direction = -1;
+
+            for (double i = time_spinner_start; i <= time_spinner_end; i += vibrate_time)
+            {
+                frames.Add(new OsuReplayFrame(i, new Vector2(centre_x + direction * 50, centre_y), OsuAction.LeftButton));
+                frames.Add(new OsuReplayFrame(i + vibrate_time, new Vector2(centre_x - direction * 50, centre_y), OsuAction.LeftButton));
+
+                direction *= -1;
+            }
+
+            performTest(frames);
+
+            assertTicksHit(0);
+            assertSpinnerHit(false);
+        }
+
+        /// <summary>
+        /// Spins in a single direction.
+        /// </summary>
+        [TestCase(0.5f, 0)]
+        [TestCase(-0.5f, 0)]
+        [TestCase(1, 1)]
+        [TestCase(-1, 1)]
+        [TestCase(1.5f, 1)]
+        [TestCase(-1.5f, 1)]
+        [TestCase(2f, 2)]
+        [TestCase(-2f, 2)]
+        public void TestSpinSingleDirection(float amount, int expectedTicks)
+        {
+            performTest(new SpinFramesGenerator(time_spinner_start)
+                        .Spin(amount, 500)
+                        .Build());
+
+            assertTicksHit(expectedTicks);
+            assertSpinnerHit(false);
+        }
+
+        /// <summary>
+        /// Spin half-way clockwise then perform one full spin counter-clockwise.
+        /// No ticks should be hit since the total rotation is -0.5 (0.5 CW + 1 CCW = 0.5 CCW).
+        /// </summary>
+        [Test]
+        [Ignore("An upcoming implementation will fix this case")]
+        public void TestSpinHalfBothDirections()
+        {
+            performTest(new SpinFramesGenerator(time_spinner_start)
+                        .Spin(0.5f, 500) // Rotate to +0.5.
+                        .Spin(-1f, 500) // Rotate to -0.5
+                        .Build());
+
+            assertTicksHit(0);
+            assertSpinnerHit(false);
+        }
+
+        /// <summary>
+        /// Spin in one direction then spin in the other.
+        /// </summary>
+        [TestCase(0.5f, -1.5f, 1)]
+        [TestCase(-0.5f, 1.5f, 1)]
+        [TestCase(0.5f, -2.5f, 2)]
+        [TestCase(-0.5f, 2.5f, 2)]
+        [Ignore("An upcoming implementation will fix this case")]
+        public void TestSpinOneDirectionThenChangeDirection(float direction1, float direction2, int expectedTicks)
+        {
+            performTest(new SpinFramesGenerator(time_spinner_start)
+                        .Spin(direction1, 500)
+                        .Spin(direction2, 500)
+                        .Build());
+
+            assertTicksHit(expectedTicks);
+            assertSpinnerHit(false);
+        }
+
+        [Test]
+        [Ignore("An upcoming implementation will fix this case")]
+        public void TestRewind()
+        {
+            AddStep("set manual clock", () => manualClock = new ManualClock { Rate = 1 });
+
+            List<ReplayFrame> frames = new SpinFramesGenerator(time_spinner_start)
+                                       .Spin(1f, 500) // 2000ms -> 1 full CW spin
+                                       .Spin(-0.5f, 500) // 2500ms -> 0.5 CCW spins
+                                       .Spin(0.25f, 500) // 3000ms -> 0.25 CW spins
+                                       .Spin(1.25f, 500) // 3500ms -> 1 full CW spin
+                                       .Spin(0.5f, 500) // 4000ms -> 0.5 CW spins
+                                       .Build();
+
+            loadPlayer(frames);
+
+            GameplayClockContainer clock = null!;
+            DrawableRuleset drawableRuleset = null!;
+            AddStep("get gameplay objects", () =>
+            {
+                clock = currentPlayer.ChildrenOfType<GameplayClockContainer>().Single();
+                drawableRuleset = currentPlayer.ChildrenOfType<DrawableRuleset>().Single();
+            });
+
+            addSeekStep(frames.Last().Time);
+
+            DrawableSpinner drawableSpinner = null!;
+            AddUntilStep("get spinner", () => (drawableSpinner = currentPlayer.ChildrenOfType<DrawableSpinner>().Single()) != null);
+
+            assertTotalRotation(4000, 900);
+            assertTotalRotation(3750, 810);
+            assertTotalRotation(3500, 720);
+            assertTotalRotation(3250, 530);
+            assertTotalRotation(3000, 540);
+            assertTotalRotation(2750, 540);
+            assertTotalRotation(2500, 540);
+            assertTotalRotation(2250, 360);
+            assertTotalRotation(2000, 180);
+            assertTotalRotation(1500, 0);
+
+            void assertTotalRotation(double time, float expected)
+            {
+                addSeekStep(time);
+                AddAssert($"total rotation @ {time} is {expected}", () => drawableSpinner.Result.TotalRotation,
+                    () => Is.EqualTo(expected).Within(MathHelper.RadiansToDegrees(SpinFramesGenerator.SPIN_ERROR * 2)));
+            }
+
+            void addSeekStep(double time)
+            {
+                AddStep($"seek to {time}", () => clock.Seek(time));
+                AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time));
+            }
+        }
+
+        private void assertTicksHit(int count)
+        {
+            AddAssert($"{count} ticks hit", () => judgementResults.Where(r => r.HitObject is SpinnerTick).Count(r => r.IsHit), () => Is.EqualTo(count));
+        }
+
+        private void assertSpinnerHit(bool shouldBeHit)
+        {
+            AddAssert($"spinner is {(shouldBeHit ? "hit" : "missed")}", () => judgementResults.Single(r => r.HitObject is Spinner).IsHit, () => Is.EqualTo(shouldBeHit));
+        }
+
+        private void loadPlayer(List<ReplayFrame> frames)
+        {
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
+                {
+                    HitObjects =
+                    {
+                        new Spinner
+                        {
+                            StartTime = time_spinner_start,
+                            EndTime = time_spinner_end,
+                            Position = new Vector2(centre_x, centre_y)
+                        }
+                    },
+                    BeatmapInfo =
+                    {
+                        Difficulty = new BeatmapDifficulty(),
+                        Ruleset = new OsuRuleset().RulesetInfo
+                    },
+                });
+
+                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+
+                p.OnLoadComplete += _ =>
+                {
+                    p.ScoreProcessor.NewJudgement += result =>
+                    {
+                        if (currentPlayer == p) judgementResults.Add(result);
+                    };
+                };
+
+                LoadScreen(currentPlayer = p);
+                judgementResults.Clear();
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+        }
+
+        private void performTest(List<ReplayFrame> frames)
+        {
+            loadPlayer(frames);
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
+        }
+
+        private partial class ScoreAccessibleReplayPlayer : ReplayPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            protected override bool PauseOnFocusLost => false;
+
+            public ScoreAccessibleReplayPlayer(Score score)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+            }
+        }
+    }
+}

From 04af46b8c72a03030aa61b69bc4a1ef72b8d9843 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 18:34:56 +0900
Subject: [PATCH 1021/2296] Change `SpinFramesGenerator` to take degrees as
 input

---
 .../SpinFramesGenerator.cs                    |  4 +-
 .../TestSceneLegacyHitPolicy.cs               |  2 +-
 .../TestSceneSpinnerInput.cs                  | 38 +++++++++----------
 .../TestSceneSpinnerJudgement.cs              |  2 +-
 .../TestSceneStartTimeOrderedHitPolicy.cs     |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
index 43adfb7f1f..dbdfa1f258 100644
--- a/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
+++ b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
@@ -39,12 +39,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// <summary>
         /// Performs a single spin.
         /// </summary>
-        /// <param name="delta">The amount, relative to a full circle, to spin.</param>
+        /// <param name="delta">The amount of degrees to spin.</param>
         /// <param name="duration">The time to spend to perform the spin.</param>
         /// <returns>This <see cref="SpinFramesGenerator"/>.</returns>
         public SpinFramesGenerator Spin(float delta, double duration)
         {
-            sequences.Add((delta * 2 * MathF.PI, duration));
+            sequences.Add((delta / 360 * 2 * MathF.PI, duration));
             return this;
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index e0a618b187..fa6aa580a3 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -362,7 +362,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             };
 
             frames.AddRange(new SpinFramesGenerator(time_spinner + 10)
-                            .Spin(1, 500)
+                            .Spin(360, 500)
                             .Build());
 
             performTest(hitObjects, frames);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index d7151f9370..c4bf0d4e2e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -107,14 +107,14 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// <summary>
         /// Spins in a single direction.
         /// </summary>
-        [TestCase(0.5f, 0)]
-        [TestCase(-0.5f, 0)]
-        [TestCase(1, 1)]
-        [TestCase(-1, 1)]
-        [TestCase(1.5f, 1)]
-        [TestCase(-1.5f, 1)]
-        [TestCase(2f, 2)]
-        [TestCase(-2f, 2)]
+        [TestCase(180, 0)]
+        [TestCase(-180, 0)]
+        [TestCase(360, 1)]
+        [TestCase(-360, 1)]
+        [TestCase(540, 1)]
+        [TestCase(-540, 1)]
+        [TestCase(720, 2)]
+        [TestCase(-720, 2)]
         public void TestSpinSingleDirection(float amount, int expectedTicks)
         {
             performTest(new SpinFramesGenerator(time_spinner_start)
@@ -134,8 +134,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestSpinHalfBothDirections()
         {
             performTest(new SpinFramesGenerator(time_spinner_start)
-                        .Spin(0.5f, 500) // Rotate to +0.5.
-                        .Spin(-1f, 500) // Rotate to -0.5
+                        .Spin(180, 500) // Rotate to +0.5.
+                        .Spin(-360, 500) // Rotate to -0.5
                         .Build());
 
             assertTicksHit(0);
@@ -145,10 +145,10 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// <summary>
         /// Spin in one direction then spin in the other.
         /// </summary>
-        [TestCase(0.5f, -1.5f, 1)]
-        [TestCase(-0.5f, 1.5f, 1)]
-        [TestCase(0.5f, -2.5f, 2)]
-        [TestCase(-0.5f, 2.5f, 2)]
+        [TestCase(180, -540, 1)]
+        [TestCase(-180, 540, 1)]
+        [TestCase(180, -900, 2)]
+        [TestCase(-180, 900, 2)]
         [Ignore("An upcoming implementation will fix this case")]
         public void TestSpinOneDirectionThenChangeDirection(float direction1, float direction2, int expectedTicks)
         {
@@ -168,11 +168,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("set manual clock", () => manualClock = new ManualClock { Rate = 1 });
 
             List<ReplayFrame> frames = new SpinFramesGenerator(time_spinner_start)
-                                       .Spin(1f, 500) // 2000ms -> 1 full CW spin
-                                       .Spin(-0.5f, 500) // 2500ms -> 0.5 CCW spins
-                                       .Spin(0.25f, 500) // 3000ms -> 0.25 CW spins
-                                       .Spin(1.25f, 500) // 3500ms -> 1 full CW spin
-                                       .Spin(0.5f, 500) // 4000ms -> 0.5 CW spins
+                                       .Spin(360, 500) // 2000ms -> 1 full CW spin
+                                       .Spin(-180, 500) // 2500ms -> 0.5 CCW spins
+                                       .Spin(90, 500) // 3000ms -> 0.25 CW spins
+                                       .Spin(450, 500) // 3500ms -> 1 full CW spin
+                                       .Spin(180, 500) // 4000ms -> 0.5 CW spins
                                        .Build();
 
             loadPlayer(frames);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
index 6a50f08508..8d8c2e9639 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerJudgement.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         private static List<ReplayFrame> generateReplay(int spins) => new SpinFramesGenerator(time_spinner_start)
-                                                                      .Spin(spins, time_spinner_end - time_spinner_start)
+                                                                      .Spin(spins * 360, time_spinner_end - time_spinner_start)
                                                                       .Build();
 
         private void performTest(List<ReplayFrame> frames)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index 19413a50a8..3475680c71 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -290,7 +290,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             };
 
             frames.AddRange(new SpinFramesGenerator(time_spinner + 10)
-                            .Spin(1, 500)
+                            .Spin(360, 500)
                             .Build());
 
             performTest(hitObjects, frames);

From e2192806e456a90f252f7265fff941b1cabf4f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 12:00:33 +0200
Subject: [PATCH 1022/2296] Use `ID` rather than `SoloScoreID`

The latter is apparently not going to be a thing anymore.
---
 .../Visual/Playlists/TestScenePlaylistsResultsScreen.cs       | 4 ----
 osu.Game/Online/Rooms/MultiplayerScore.cs                     | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 3f230099da..4d82631fc9 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -245,7 +245,6 @@ namespace osu.Game.Tests.Visual.Playlists
             var multiplayerUserScore = new MultiplayerScore
             {
                 ID = highestScoreId,
-                SoloScoreID = (ulong?)highestScoreId,
                 Accuracy = userScore.Accuracy,
                 Passed = userScore.Passed,
                 Rank = userScore.Rank,
@@ -267,7 +266,6 @@ namespace osu.Game.Tests.Visual.Playlists
                 multiplayerUserScore.ScoresAround.Lower.Scores.Add(new MultiplayerScore
                 {
                     ID = nextLowest,
-                    SoloScoreID = (ulong?)nextLowest,
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -284,7 +282,6 @@ namespace osu.Game.Tests.Visual.Playlists
                 multiplayerUserScore.ScoresAround.Higher.Scores.Add(new MultiplayerScore
                 {
                     ID = nextHighest,
-                    SoloScoreID = (ulong?)nextHighest,
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -318,7 +315,6 @@ namespace osu.Game.Tests.Visual.Playlists
                 result.Scores.Add(new MultiplayerScore
                 {
                     ID = id,
-                    SoloScoreID = (ulong?)id,
                     Accuracy = 1,
                     Passed = true,
                     Rank = ScoreRank.X,
diff --git a/osu.Game/Online/Rooms/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
index e6307ab7f0..f1b9584d57 100644
--- a/osu.Game/Online/Rooms/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Online.Rooms
 
             var scoreInfo = new ScoreInfo
             {
-                OnlineID = (long?)SoloScoreID ?? -1,
+                OnlineID = ID,
                 TotalScore = TotalScore,
                 MaxCombo = MaxCombo,
                 BeatmapInfo = beatmap,

From 10bab614412a17752af5ae50bfba5c65ecf6538a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 19:23:35 +0900
Subject: [PATCH 1023/2296] Tidy up `lastAngle` usage and add assertion of
 maximum delta

---
 .../Default/SpinnerRotationTracker.cs         | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 77d410887c..174ba1c402 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -2,6 +2,7 @@
 // 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;
@@ -68,6 +69,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 float thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(pos.X - DrawSize.X / 2, pos.Y - DrawSize.Y / 2));
                 float delta = lastAngle == null ? 0 : thisAngle - lastAngle.Value;
 
+                // Normalise the delta to -180 .. 180
+                if (delta > 180) delta -= 360;
+                if (delta < -180) delta += 360;
+
                 if (Tracking)
                     AddRotation(delta);
 
@@ -84,8 +89,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         /// <remarks>
         /// Will be a no-op if not a valid time to spin.
         /// </remarks>
-        /// <param name="angle">The delta angle.</param>
-        public void AddRotation(float angle)
+        /// <param name="delta">The delta angle.</param>
+        public void AddRotation(float delta)
         {
             if (!isSpinnableTime)
                 return;
@@ -96,21 +101,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 rotationTransferred = true;
             }
 
-            if (angle > 180)
-            {
-                lastAngle += 360;
-                angle -= 360;
-            }
-            else if (-angle > 180)
-            {
-                lastAngle -= 360;
-                angle += 360;
-            }
+            currentRotation += delta;
+
+            double rate = gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate;
+
+            Debug.Assert(Math.Abs(delta) <= 180);
 
-            currentRotation += angle;
             // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
             // (see: ModTimeRamp)
-            drawableSpinner.Result.TotalRotation += (float)(Math.Abs(angle) * (gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate));
+            drawableSpinner.Result.TotalRotation += (float)(Math.Abs(delta) * rate);
         }
 
         private void resetState(DrawableHitObject obj)

From 0bb95cfa88fb798f07ad7a35aca0ef61f755790d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 19:34:55 +0900
Subject: [PATCH 1024/2296] Fix incorrect initial rotation transfer value

Should have been removed as part of https://github.com/ppy/osu/pull/24360.
---
 .../Skinning/Default/SpinnerRotationTracker.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 174ba1c402..69c2bf3dd0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
             if (!rotationTransferred)
             {
-                currentRotation = Rotation * 2;
+                currentRotation = Rotation;
                 rotationTransferred = true;
             }
 

From f2436a5ecb96b7e4aa9a38d76caacc5e4687d879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 12:36:58 +0200
Subject: [PATCH 1025/2296] Remove no longer used scoring difficulty attributes

---
 .../Rulesets/Difficulty/DifficultyAttributes.cs | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
index 6043731e6e..9690924b1c 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Difficulty
 {
@@ -45,22 +44,6 @@ namespace osu.Game.Rulesets.Difficulty
         [JsonProperty("max_combo", Order = -2)]
         public int MaxCombo { get; set; }
 
-        /// <summary>
-        /// The accuracy portion of the legacy (ScoreV1) total score.
-        /// </summary>
-        public int LegacyAccuracyScore { get; set; }
-
-        /// <summary>
-        /// The combo-multiplied portion of the legacy (ScoreV1) total score.
-        /// </summary>
-        public int LegacyComboScore { get; set; }
-
-        /// <summary>
-        /// A ratio of <c>new_bonus_score / old_bonus_score</c> for converting the bonus score of legacy scores to the new scoring.
-        /// This is made up of all judgements that would be <see cref="HitResult.SmallBonus"/> or <see cref="HitResult.LargeBonus"/>.
-        /// </summary>
-        public double LegacyBonusScoreRatio { get; set; }
-
         /// <summary>
         /// Creates new <see cref="DifficultyAttributes"/>.
         /// </summary>

From 937694cd14802201f1dead09df55f4d32ac49120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 13:35:24 +0200
Subject: [PATCH 1026/2296] Fix conversion test failures

---
 .../OsuBeatmapConversionTest.cs               | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index 11e69dc133..ea07b69e78 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects;
@@ -33,8 +34,13 @@ namespace osu.Game.Rulesets.Osu.Tests
             switch (hitObject)
             {
                 case Slider slider:
+                    var objects = new List<ConvertValue>();
+
                     foreach (var nested in slider.NestedHitObjects)
-                        yield return createConvertValue((OsuHitObject)nested);
+                        objects.Add(createConvertValue((OsuHitObject)nested, slider));
+
+                    foreach (var obj in objects.OrderBy(cv => cv.StartTime))
+                        yield return obj;
 
                     break;
 
@@ -44,13 +50,25 @@ namespace osu.Game.Rulesets.Osu.Tests
                     break;
             }
 
-            static ConvertValue createConvertValue(OsuHitObject obj) => new ConvertValue
+            static ConvertValue createConvertValue(OsuHitObject obj, OsuHitObject? parent = null)
             {
-                StartTime = obj.StartTime,
-                EndTime = obj.GetEndTime(),
-                X = obj.StackedPosition.X,
-                Y = obj.StackedPosition.Y
-            };
+                double startTime = obj.StartTime;
+                double endTime = obj.GetEndTime();
+
+                if (obj is SliderTailCircle && parent is Slider slider)
+                {
+                    startTime = Math.Max(startTime + SliderEventGenerator.TAIL_LENIENCY, slider.StartTime + slider.Duration / 2);
+                    endTime = Math.Max(endTime + SliderEventGenerator.TAIL_LENIENCY, slider.StartTime + slider.Duration / 2);
+                }
+
+                return new ConvertValue
+                {
+                    StartTime = startTime,
+                    EndTime = endTime,
+                    X = obj.StackedPosition.X,
+                    Y = obj.StackedPosition.Y
+                };
+            }
         }
 
         protected override Ruleset CreateRuleset() => new OsuRuleset();

From b3d60c6d4fd037e28bc36b5c284aff974458e382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 13:40:45 +0200
Subject: [PATCH 1027/2296] Add inline commentary about workarounds in beatmap
 conversion test

---
 .../OsuBeatmapConversionTest.cs                      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index ea07b69e78..3e0a86d39c 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -39,6 +39,14 @@ namespace osu.Game.Rulesets.Osu.Tests
                     foreach (var nested in slider.NestedHitObjects)
                         objects.Add(createConvertValue((OsuHitObject)nested, slider));
 
+                    // stable does slider tail leniency by offsetting the last tick 36ms back.
+                    // based on player feedback, we're doing this a little different in lazer,
+                    // and the lazer method does not require offsetting the last tick
+                    // (see `DrawableSliderTail.CheckForResult()`).
+                    // however, in conversion tests, just so the output matches, we're bringing
+                    // the 36ms offset back locally.
+                    // in particular, on some sliders, this may rearrange nested objects,
+                    // so we sort them again by start time to prevent test failures.
                     foreach (var obj in objects.OrderBy(cv => cv.StartTime))
                         yield return obj;
 
@@ -55,6 +63,10 @@ namespace osu.Game.Rulesets.Osu.Tests
                 double startTime = obj.StartTime;
                 double endTime = obj.GetEndTime();
 
+                // as stated in the inline comment above, this is locally bringing back
+                // the stable treatment of the "legacy last tick" just to make sure
+                // that the conversion output matches.
+                // compare: `SliderEventGenerator.Generate()`, and the calculation of `legacyLastTickTime`.
                 if (obj is SliderTailCircle && parent is Slider slider)
                 {
                     startTime = Math.Max(startTime + SliderEventGenerator.TAIL_LENIENCY, slider.StartTime + slider.Duration / 2);

From 3065c9f23dfa7f9018320392e03a29ea25dee28b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 16 Oct 2023 22:49:41 +0900
Subject: [PATCH 1028/2296] Fix potential frame misordering in generator

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

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
index dbdfa1f258..e6dc72033a 100644
--- a/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
+++ b/osu.Game.Rulesets.Osu.Tests/SpinFramesGenerator.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     frames.Add(new OsuReplayFrame(lastTime, calcOffsetAt((lastTime - seqStartTime) / (seqEndTime - seqStartTime), seqStartAngle, seqEndAngle), OsuAction.LeftButton));
 
                 // Final frame at the end of the current spin.
-                frames.Add(new OsuReplayFrame(lastTime, calcOffsetAt(1, seqStartAngle, seqEndAngle), OsuAction.LeftButton));
+                frames.Add(new OsuReplayFrame(seqEndTime, calcOffsetAt(1, seqStartAngle, seqEndAngle), OsuAction.LeftButton));
 
                 lastTime = seqEndTime;
                 lastAngle = seqEndAngle;

From 79273b88f68c138b4bd8d9ab1cb47dca1cffcac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 20:42:42 +0200
Subject: [PATCH 1029/2296] Add stub of method to deduplicate bindings (and
 failing test)

---
 .../Input/RealmKeyBindingStoreTest.cs         | 90 +++++++++++++++++++
 osu.Game/Input/RealmKeyBindingStore.cs        | 11 +++
 2 files changed, 101 insertions(+)
 create mode 100644 osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs

diff --git a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
new file mode 100644
index 0000000000..0e8e73b8b4
--- /dev/null
+++ b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.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 System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Input.Bindings;
+using osu.Game.Input;
+using osu.Game.Input.Bindings;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Input
+{
+    [TestFixture]
+    public class RealmKeyBindingStoreTest
+    {
+        [Test]
+        public void TestBindingsWithoutDuplicatesAreNotModified()
+        {
+            var bindings = new List<RealmKeyBinding>
+            {
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromKey(Key.Escape)),
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromMouseButton(MouseButton.Button1)),
+                new RealmKeyBinding(GlobalAction.MusicPrev, KeyCombination.FromKey(Key.F1)),
+                new RealmKeyBinding(GlobalAction.MusicNext, KeyCombination.FromKey(Key.F5))
+            };
+
+            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(anyCleared, Is.False);
+
+                Assert.That(bindings[0].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[0].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.Escape)));
+
+                Assert.That(bindings[1].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[1].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.ExtraMouseButton1)));
+
+                Assert.That(bindings[2].Action, Is.EqualTo((int)GlobalAction.MusicPrev));
+                Assert.That(bindings[2].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.F1)));
+
+                Assert.That(bindings[3].Action, Is.EqualTo((int)GlobalAction.MusicNext));
+                Assert.That(bindings[3].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.F5)));
+            });
+        }
+
+        [Test]
+        public void TestDuplicateBindingsAreCleared()
+        {
+            var bindings = new List<RealmKeyBinding>
+            {
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromKey(Key.Escape)),
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromMouseButton(MouseButton.Button1)),
+                new RealmKeyBinding(GlobalAction.MusicPrev, KeyCombination.FromKey(Key.F1)),
+                new RealmKeyBinding(GlobalAction.IncreaseVolume, KeyCombination.FromKey(Key.Escape)),
+                new RealmKeyBinding(GlobalAction.MusicNext, KeyCombination.FromKey(Key.F5)),
+                new RealmKeyBinding(GlobalAction.ExportReplay, KeyCombination.FromKey(Key.F1)),
+                new RealmKeyBinding(GlobalAction.TakeScreenshot, KeyCombination.FromKey(Key.PrintScreen)),
+            };
+
+            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(anyCleared, Is.True);
+
+                Assert.That(bindings[0].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[0].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.None)));
+
+                Assert.That(bindings[1].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[1].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.ExtraMouseButton1)));
+
+                Assert.That(bindings[2].Action, Is.EqualTo((int)GlobalAction.MusicPrev));
+                Assert.That(bindings[2].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.None)));
+
+                Assert.That(bindings[3].Action, Is.EqualTo((int)GlobalAction.IncreaseVolume));
+                Assert.That(bindings[3].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.None)));
+
+                Assert.That(bindings[4].Action, Is.EqualTo((int)GlobalAction.MusicNext));
+                Assert.That(bindings[4].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.F5)));
+
+                Assert.That(bindings[5].Action, Is.EqualTo((int)GlobalAction.ExportReplay));
+                Assert.That(bindings[5].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.None)));
+
+                Assert.That(bindings[6].Action, Is.EqualTo((int)GlobalAction.TakeScreenshot));
+                Assert.That(bindings[6].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.PrintScreen)));
+            });
+        }
+    }
+}
diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index 10ad731037..6affdab277 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -130,5 +130,16 @@ namespace osu.Game.Input
 
             return true;
         }
+
+        /// <summary>
+        /// Clears all <see cref="RealmKeyBinding.KeyCombination"/>s from the provided <paramref name="keyBindings"/>
+        /// which are assigned to more than one binding.
+        /// </summary>
+        /// <param name="keyBindings">The <see cref="RealmKeyBinding"/>s to de-duplicate.</param>
+        /// <returns>Whether any bindings have been cleared.</returns>
+        public static bool ClearDuplicateBindings(IQueryable<RealmKeyBinding> keyBindings)
+        {
+            return false;
+        }
     }
 }

From 90c44cee5475ebfc4702e9c1cf64040aa1d4fe22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 20:46:20 +0200
Subject: [PATCH 1030/2296] Implement method to deduplicate keybindings

---
 .../Input/RealmKeyBindingStoreTest.cs           |  5 +++--
 osu.Game/Input/RealmKeyBindingStore.cs          | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
index 0e8e73b8b4..fb1e27d9a9 100644
--- a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
+++ b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
@@ -2,6 +2,7 @@
 // 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.Input.Bindings;
 using osu.Game.Input;
@@ -24,7 +25,7 @@ namespace osu.Game.Tests.Input
                 new RealmKeyBinding(GlobalAction.MusicNext, KeyCombination.FromKey(Key.F5))
             };
 
-            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
+            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings.AsQueryable());
 
             Assert.Multiple(() =>
             {
@@ -58,7 +59,7 @@ namespace osu.Game.Tests.Input
                 new RealmKeyBinding(GlobalAction.TakeScreenshot, KeyCombination.FromKey(Key.PrintScreen)),
             };
 
-            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
+            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings.AsQueryable());
 
             Assert.Multiple(() =>
             {
diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index 6affdab277..ceef751605 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -139,7 +139,22 @@ namespace osu.Game.Input
         /// <returns>Whether any bindings have been cleared.</returns>
         public static bool ClearDuplicateBindings(IQueryable<RealmKeyBinding> keyBindings)
         {
-            return false;
+            bool anyRemoved = false;
+
+            var lookup = keyBindings.ToLookup(kb => kb.KeyCombination);
+
+            foreach (var group in lookup)
+            {
+                if (group.Count() <= 1)
+                    continue;
+
+                foreach (var binding in group)
+                    binding.KeyCombination = new KeyCombination(InputKey.None);
+
+                anyRemoved = true;
+            }
+
+            return anyRemoved;
         }
     }
 }

From 639c96e60c6bc4590e65f0775d392788bf176d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 21:02:24 +0200
Subject: [PATCH 1031/2296] Prevent ruleset input managers from reading
 duplicate bindings

---
 osu.Game/Input/RealmKeyBindingStore.cs      | 2 +-
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index ceef751605..b09e29f48e 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Input
         /// </summary>
         /// <param name="keyBindings">The <see cref="RealmKeyBinding"/>s to de-duplicate.</param>
         /// <returns>Whether any bindings have been cleared.</returns>
-        public static bool ClearDuplicateBindings(IQueryable<RealmKeyBinding> keyBindings)
+        public static bool ClearDuplicateBindings(IQueryable<IKeyBinding> keyBindings)
         {
             bool anyRemoved = false;
 
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 26b9d06f73..7f081b6e8a 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -218,6 +218,7 @@ namespace osu.Game.Rulesets.UI
                 base.ReloadMappings(realmKeyBindings);
 
                 KeyBindings = KeyBindings.Where(b => RealmKeyBindingStore.CheckValidForGameplay(b.KeyCombination)).ToList();
+                RealmKeyBindingStore.ClearDuplicateBindings(KeyBindings.AsQueryable());
             }
         }
     }

From 9c6166ec3dcf9eb805ac0d38b63592f562d0e801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 21:26:46 +0200
Subject: [PATCH 1032/2296] Add migration to remove duplicate bindings

---
 .../Input/RealmKeyBindingStoreTest.cs         |  9 +++---
 osu.Game/Database/RealmAccess.cs              | 31 ++++++++++++++++++-
 osu.Game/Input/RealmKeyBindingStore.cs        | 10 +++---
 osu.Game/Rulesets/UI/RulesetInputManager.cs   |  2 +-
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
index fb1e27d9a9..a0c1b20cd7 100644
--- a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
+++ b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.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 NUnit.Framework;
 using osu.Framework.Input.Bindings;
 using osu.Game.Input;
@@ -25,11 +24,11 @@ namespace osu.Game.Tests.Input
                 new RealmKeyBinding(GlobalAction.MusicNext, KeyCombination.FromKey(Key.F5))
             };
 
-            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings.AsQueryable());
+            int countCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
 
             Assert.Multiple(() =>
             {
-                Assert.That(anyCleared, Is.False);
+                Assert.That(countCleared, Is.Zero);
 
                 Assert.That(bindings[0].Action, Is.EqualTo((int)GlobalAction.Back));
                 Assert.That(bindings[0].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.Escape)));
@@ -59,11 +58,11 @@ namespace osu.Game.Tests.Input
                 new RealmKeyBinding(GlobalAction.TakeScreenshot, KeyCombination.FromKey(Key.PrintScreen)),
             };
 
-            bool anyCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings.AsQueryable());
+            int countCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
 
             Assert.Multiple(() =>
             {
-                Assert.That(anyCleared, Is.True);
+                Assert.That(countCleared, Is.EqualTo(4));
 
                 Assert.That(bindings[0].Action, Is.EqualTo((int)GlobalAction.Back));
                 Assert.That(bindings[0].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.None)));
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index cd97bb6430..7d4d63a20e 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -25,6 +25,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
+using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Models;
 using osu.Game.Online.API;
@@ -84,8 +85,9 @@ namespace osu.Game.Database
         /// 32   2023-07-09    Populate legacy scores with the ScoreV2 mod (and restore TotalScore to the legacy total for such scores) using replay files.
         /// 33   2023-08-16    Reset default chat toggle key binding to avoid conflict with newly added leaderboard toggle key binding.
         /// 34   2023-08-21    Add BackgroundReprocessingFailed flag to ScoreInfo to track upgrade failures.
+        /// 35   2023-10-16    Clear key combinations of keybindings that are assigned to more than one action in a given settings section.
         /// </summary>
-        private const int schema_version = 34;
+        private const int schema_version = 35;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -1031,6 +1033,33 @@ namespace osu.Game.Database
 
                     break;
                 }
+
+                case 35:
+                {
+                    int countCleared = 0;
+
+                    var globalBindings = migration.NewRealm.All<RealmKeyBinding>().Where(kb => kb.RulesetName == null).ToList();
+
+                    foreach (var category in Enum.GetValues<GlobalActionCategory>())
+                    {
+                        var categoryActions = GlobalActionContainer.GetGlobalActionsFor(category).Cast<int>().ToHashSet();
+                        var categoryBindings = globalBindings.Where(kb => categoryActions.Contains(kb.ActionInt));
+                        countCleared += RealmKeyBindingStore.ClearDuplicateBindings(categoryBindings);
+                    }
+
+                    var rulesetBindings = migration.NewRealm.All<RealmKeyBinding>().Where(kb => kb.RulesetName != null).ToList();
+
+                    foreach (var variantGroup in rulesetBindings.GroupBy(kb => (kb.RulesetName, kb.Variant)))
+                        countCleared += RealmKeyBindingStore.ClearDuplicateBindings(variantGroup);
+
+                    if (countCleared > 0)
+                    {
+                        Logger.Log($"{countCleared} of your keybinding(s) have been cleared due to being bound to multiple actions. "
+                                   + "Please choose new unique ones in the settings panel.", level: LogLevel.Important);
+                    }
+
+                    break;
+                }
             }
 
             Logger.Log($"Migration completed in {stopwatch.ElapsedMilliseconds}ms");
diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index b09e29f48e..0c48a4c16c 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -136,10 +136,10 @@ namespace osu.Game.Input
         /// which are assigned to more than one binding.
         /// </summary>
         /// <param name="keyBindings">The <see cref="RealmKeyBinding"/>s to de-duplicate.</param>
-        /// <returns>Whether any bindings have been cleared.</returns>
-        public static bool ClearDuplicateBindings(IQueryable<IKeyBinding> keyBindings)
+        /// <returns>Number of bindings cleared.</returns>
+        public static int ClearDuplicateBindings(IEnumerable<IKeyBinding> keyBindings)
         {
-            bool anyRemoved = false;
+            int countRemoved = 0;
 
             var lookup = keyBindings.ToLookup(kb => kb.KeyCombination);
 
@@ -151,10 +151,10 @@ namespace osu.Game.Input
                 foreach (var binding in group)
                     binding.KeyCombination = new KeyCombination(InputKey.None);
 
-                anyRemoved = true;
+                countRemoved += group.Count();
             }
 
-            return anyRemoved;
+            return countRemoved;
         }
     }
 }
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 7f081b6e8a..39b83ecca1 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Rulesets.UI
                 base.ReloadMappings(realmKeyBindings);
 
                 KeyBindings = KeyBindings.Where(b => RealmKeyBindingStore.CheckValidForGameplay(b.KeyCombination)).ToList();
-                RealmKeyBindingStore.ClearDuplicateBindings(KeyBindings.AsQueryable());
+                RealmKeyBindingStore.ClearDuplicateBindings(KeyBindings);
             }
         }
     }

From 3aae07d1caa8242efd4a0318c6e705ebfc5c99ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 21:28:11 +0200
Subject: [PATCH 1033/2296] Add failing case for two bindings of single action
 bound to same key

---
 .../Input/RealmKeyBindingStoreTest.cs         | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
index a0c1b20cd7..ce31a9ea9d 100644
--- a/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
+++ b/osu.Game.Tests/Input/RealmKeyBindingStoreTest.cs
@@ -86,5 +86,32 @@ namespace osu.Game.Tests.Input
                 Assert.That(bindings[6].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.PrintScreen)));
             });
         }
+
+        [Test]
+        public void TestDuplicateBindingsAllowedIfBoundToSameAction()
+        {
+            var bindings = new List<RealmKeyBinding>
+            {
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromKey(Key.Escape)),
+                new RealmKeyBinding(GlobalAction.Back, KeyCombination.FromKey(Key.Escape)),
+                new RealmKeyBinding(GlobalAction.MusicPrev, KeyCombination.FromKey(Key.F1)),
+            };
+
+            int countCleared = RealmKeyBindingStore.ClearDuplicateBindings(bindings);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(countCleared, Is.EqualTo(0));
+
+                Assert.That(bindings[0].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[0].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.Escape)));
+
+                Assert.That(bindings[1].Action, Is.EqualTo((int)GlobalAction.Back));
+                Assert.That(bindings[1].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.Escape)));
+
+                Assert.That(bindings[2].Action, Is.EqualTo((int)GlobalAction.MusicPrev));
+                Assert.That(bindings[2].KeyCombination, Is.EqualTo(new KeyCombination(InputKey.F1)));
+            });
+        }
     }
 }

From 828cedea33d85879afd07c7906439284a78cc654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Oct 2023 21:29:42 +0200
Subject: [PATCH 1034/2296] Fix bindings being cleared if multiple bindings for
 same action have the same combination

This actually seems to be the case in catch (dash is bound to shift
twice). This is annoying but harmless, so let's work around it for now
to avoid ruining users' configs.
---
 osu.Game/Input/RealmKeyBindingStore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index 0c48a4c16c..48ace58235 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Input
 
             foreach (var group in lookup)
             {
-                if (group.Count() <= 1)
+                if (group.Select(kb => kb.Action).Distinct().Count() <= 1)
                     continue;
 
                 foreach (var binding in group)

From 165cd07428bf14430847bde593a4c73ec88af16d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 16:01:00 +0900
Subject: [PATCH 1035/2296] Persist the state of "show speed changes" between
 editor sessions

Addresses https://github.com/ppy/osu/discussions/25149.
---
 osu.Game/Configuration/OsuConfigManager.cs        |  2 ++
 .../Rulesets/Edit/ScrollingHitObjectComposer.cs   | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index db71ff4e84..5d2d782063 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -184,6 +184,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.EditorShowHitMarkers, true);
             SetDefault(OsuSetting.EditorAutoSeekOnPlacement, true);
             SetDefault(OsuSetting.EditorLimitedDistanceSnap, false);
+            SetDefault(OsuSetting.EditorShowSpeedChanges, false);
 
             SetDefault(OsuSetting.LastProcessedMetadataId, -1);
 
@@ -407,5 +408,6 @@ namespace osu.Game.Configuration
         EditorLimitedDistanceSnap,
         ReplaySettingsOverlay,
         AutomaticallyDownloadMissingBeatmaps,
+        EditorShowSpeedChanges
     }
 }
diff --git a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
index 75305a0c20..cb92ebbd15 100644
--- a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -18,6 +19,7 @@ namespace osu.Game.Rulesets.Edit
         where TObject : HitObject
     {
         private readonly Bindable<TernaryState> showSpeedChanges = new Bindable<TernaryState>();
+        private Bindable<bool> configShowSpeedChanges = null!;
 
         protected ScrollingHitObjectComposer(Ruleset ruleset)
             : base(ruleset)
@@ -25,7 +27,7 @@ namespace osu.Game.Rulesets.Edit
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuConfigManager config)
         {
             if (DrawableRuleset is ISupportConstantAlgorithmToggle toggleRuleset)
             {
@@ -44,7 +46,16 @@ namespace osu.Game.Rulesets.Edit
                     },
                 });
 
-                showSpeedChanges.BindValueChanged(state => toggleRuleset.ShowSpeedChanges.Value = state.NewValue == TernaryState.True, true);
+                configShowSpeedChanges = config.GetBindable<bool>(OsuSetting.EditorShowSpeedChanges);
+                configShowSpeedChanges.BindValueChanged(enabled => showSpeedChanges.Value = enabled.NewValue ? TernaryState.True : TernaryState.False, true);
+
+                showSpeedChanges.BindValueChanged(state =>
+                {
+                    bool enabled = state.NewValue == TernaryState.True;
+
+                    toggleRuleset.ShowSpeedChanges.Value = enabled;
+                    configShowSpeedChanges.Value = enabled;
+                }, true);
             }
         }
     }

From 79a4b985fed630c092f60ba7af2146d71687e94a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 09:30:44 +0200
Subject: [PATCH 1036/2296] Use left mouse as alternative default binding for
 catch dash

This mirrors stable. Although the way stable does this is pretty dodgy,
see:
	https://github.com/peppy/osu-stable-reference/blob/master/osu!/GameModes/Play/Rulesets/Fruits/RulesetFruits.cs#L274-L275
---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index efd4b46782..9ceb78893e 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Catch
             new KeyBinding(InputKey.X, CatchAction.MoveRight),
             new KeyBinding(InputKey.Right, CatchAction.MoveRight),
             new KeyBinding(InputKey.Shift, CatchAction.Dash),
-            new KeyBinding(InputKey.Shift, CatchAction.Dash),
+            new KeyBinding(InputKey.MouseLeft, CatchAction.Dash),
         };
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)

From d26d4b8b79dcfcce739dd0723c1cf7fb3f959dd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 16:42:22 +0900
Subject: [PATCH 1037/2296] Cache `IScrollingInfo` at a `HitObjectComposer`
 level automatically

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs   | 9 +--------
 osu.Game/Rulesets/Edit/HitObjectComposer.cs              | 3 +++
 .../Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs    | 2 +-
 .../Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs   | 2 ++
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 8e61baca81..7a0ec70611 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -57,16 +57,9 @@ namespace osu.Game.Rulesets.Mania.Edit
         protected override Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpacePosition) =>
             Playfield.GetColumnByPosition(screenSpacePosition);
 
-        protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
-        {
+        protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
             drawableRuleset = new DrawableManiaEditorRuleset(ruleset, beatmap, mods);
 
-            // This is the earliest we can cache the scrolling info to ourselves, before masks are added to the hierarchy and inject it
-            dependencies.CacheAs(drawableRuleset.ScrollingInfo);
-
-            return drawableRuleset;
-        }
-
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new ManiaBlueprintContainer(this);
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index f9a6b5083e..e1ae4b0199 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -119,6 +119,9 @@ namespace osu.Game.Rulesets.Edit
                 return;
             }
 
+            if (DrawableRuleset is IDrawableScrollingRuleset scrollingRuleset)
+                dependencies.CacheAs(scrollingRuleset.ScrollingInfo);
+
             dependencies.CacheAs(Playfield);
 
             InternalChildren = new Drawable[]
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index 6abfc6ee49..d23658ac33 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// </summary>
         protected readonly SortedList<MultiplierControlPoint> ControlPoints = new SortedList<MultiplierControlPoint>(Comparer<MultiplierControlPoint>.Default);
 
-        protected IScrollingInfo ScrollingInfo => scrollingInfo;
+        public IScrollingInfo ScrollingInfo => scrollingInfo;
 
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly LocalScrollingInfo scrollingInfo;
diff --git a/osu.Game/Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs
index f3a3bb18bd..b348a22009 100644
--- a/osu.Game/Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs
@@ -11,5 +11,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
     public interface IDrawableScrollingRuleset
     {
         ScrollVisualisationMethod VisualisationMethod { get; }
+
+        IScrollingInfo ScrollingInfo { get; }
     }
 }

From 1b9acdf55c5cbeff194c4c80a3a26402ea64ab9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 16:42:36 +0900
Subject: [PATCH 1038/2296] Abstract out common implementation of
 `BeatSnapGrid`

---
 .../Edit/CatchBeatSnapGrid.cs                 | 173 +--------------
 .../Edit/ManiaBeatSnapGrid.cs                 | 197 +----------------
 .../Edit/Compose/Components/BeatSnapGrid.cs   | 203 ++++++++++++++++++
 3 files changed, 216 insertions(+), 357 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs b/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
index 6862696b3a..40bd08455f 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchBeatSnapGrid.cs
@@ -1,180 +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 System.Collections.Generic;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Caching;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Screens.Edit;
-using osuTK.Graphics;
+using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Catch.Edit
 {
-    /// <summary>
-    /// A grid which displays coloured beat divisor lines in proximity to the selection or placement cursor.
-    /// </summary>
-    /// <remarks>
-    /// This class heavily borrows from osu!mania's implementation (ManiaBeatSnapGrid).
-    /// If further changes are to be made, they should also be applied there.
-    /// If the scale of the changes are large enough, abstracting may be a good path.
-    /// </remarks>
-    public partial class CatchBeatSnapGrid : Component
+    public partial class CatchBeatSnapGrid : BeatSnapGrid
     {
-        private const double visible_range = 750;
-
-        /// <summary>
-        /// The range of time values of the current selection.
-        /// </summary>
-        public (double start, double end)? SelectionTimeRange
+        protected override IEnumerable<Container> GetTargetContainers(HitObjectComposer composer) => new[]
         {
-            set
-            {
-                if (value == selectionTimeRange)
-                    return;
-
-                selectionTimeRange = value;
-                lineCache.Invalidate();
-            }
-        }
-
-        [Resolved]
-        private EditorBeatmap beatmap { get; set; } = null!;
-
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
-
-        [Resolved]
-        private BindableBeatDivisor beatDivisor { get; set; } = null!;
-
-        private readonly Cached lineCache = new Cached();
-
-        private (double start, double end)? selectionTimeRange;
-
-        private ScrollingHitObjectContainer lineContainer = null!;
-
-        [BackgroundDependencyLoader]
-        private void load(HitObjectComposer composer)
-        {
-            lineContainer = new ScrollingHitObjectContainer();
-
-            ((CatchPlayfield)composer.Playfield).UnderlayElements.Add(lineContainer);
-
-            beatDivisor.BindValueChanged(_ => createLines(), true);
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (!lineCache.IsValid)
-            {
-                lineCache.Validate();
-                createLines();
-            }
-        }
-
-        private readonly Stack<DrawableGridLine> availableLines = new Stack<DrawableGridLine>();
-
-        private void createLines()
-        {
-            foreach (var line in lineContainer.Objects.OfType<DrawableGridLine>())
-                availableLines.Push(line);
-
-            lineContainer.Clear();
-
-            if (selectionTimeRange == null)
-                return;
-
-            var range = selectionTimeRange.Value;
-
-            var timingPoint = beatmap.ControlPointInfo.TimingPointAt(range.start - visible_range);
-
-            double time = timingPoint.Time;
-            int beat = 0;
-
-            // progress time until in the visible range.
-            while (time < range.start - visible_range)
-            {
-                time += timingPoint.BeatLength / beatDivisor.Value;
-                beat++;
-            }
-
-            while (time < range.end + visible_range)
-            {
-                var nextTimingPoint = beatmap.ControlPointInfo.TimingPointAt(time);
-
-                // switch to the next timing point if we have reached it.
-                if (nextTimingPoint.Time > timingPoint.Time)
-                {
-                    beat = 0;
-                    time = nextTimingPoint.Time;
-                    timingPoint = nextTimingPoint;
-                }
-
-                Color4 colour = BindableBeatDivisor.GetColourFor(
-                    BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value), colours);
-
-                if (!availableLines.TryPop(out var line))
-                    line = new DrawableGridLine();
-
-                line.HitObject.StartTime = time;
-                line.Colour = colour;
-
-                lineContainer.Add(line);
-
-                beat++;
-                time += timingPoint.BeatLength / beatDivisor.Value;
-            }
-
-            // required to update ScrollingHitObjectContainer's cache.
-            lineContainer.UpdateSubTree();
-
-            foreach (var line in lineContainer.Objects.OfType<DrawableGridLine>())
-            {
-                time = line.HitObject.StartTime;
-
-                if (time >= range.start && time <= range.end)
-                    line.Alpha = 1;
-                else
-                {
-                    double timeSeparation = time < range.start ? range.start - time : time - range.end;
-                    line.Alpha = (float)Math.Max(0, 1 - timeSeparation / visible_range);
-                }
-            }
-        }
-
-        private partial class DrawableGridLine : DrawableHitObject
-        {
-            public DrawableGridLine()
-                : base(new HitObject())
-            {
-                RelativeSizeAxes = Axes.X;
-                Height = 2;
-
-                AddInternal(new Box { RelativeSizeAxes = Axes.Both });
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Origin = Anchor.BottomLeft;
-                Anchor = Anchor.BottomLeft;
-            }
-
-            protected override void UpdateInitialTransforms()
-            {
-                // don't perform any fading – we are handling that ourselves.
-                LifetimeEnd = HitObject.StartTime + visible_range;
-            }
-        }
+            ((CatchPlayfield)composer.Playfield).UnderlayElements
+        };
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index 4d45e16588..61c730912f 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -1,206 +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.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Caching;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Pooling;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.UI.Scrolling;
-using osu.Game.Screens.Edit;
-using osuTK.Graphics;
+using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    /// <summary>
-    /// A grid which displays coloured beat divisor lines in proximity to the selection or placement cursor.
-    /// </summary>
-    public partial class ManiaBeatSnapGrid : CompositeComponent
+    public partial class ManiaBeatSnapGrid : BeatSnapGrid
     {
-        private const double visible_range = 750;
-
-        /// <summary>
-        /// The range of time values of the current selection.
-        /// </summary>
-        public (double start, double end)? SelectionTimeRange
+        protected override IEnumerable<Container> GetTargetContainers(HitObjectComposer composer)
         {
-            set
-            {
-                if (value == selectionTimeRange)
-                    return;
-
-                selectionTimeRange = value;
-                lineCache.Invalidate();
-            }
-        }
-
-        [Resolved]
-        private EditorBeatmap beatmap { get; set; } = null!;
-
-        [Resolved]
-        private OsuColour colours { get; set; } = null!;
-
-        [Resolved]
-        private BindableBeatDivisor beatDivisor { get; set; } = null!;
-
-        private readonly List<ScrollingHitObjectContainer> grids = new List<ScrollingHitObjectContainer>();
-
-        private readonly DrawablePool<DrawableGridLine> linesPool = new DrawablePool<DrawableGridLine>(50);
-
-        private readonly Cached lineCache = new Cached();
-
-        private (double start, double end)? selectionTimeRange;
-
-        [BackgroundDependencyLoader]
-        private void load(HitObjectComposer composer)
-        {
-            AddInternal(linesPool);
-
-            foreach (var stage in ((ManiaPlayfield)composer.Playfield).Stages)
-            {
-                foreach (var column in stage.Columns)
-                {
-                    var lineContainer = new ScrollingHitObjectContainer();
-
-                    grids.Add(lineContainer);
-                    column.UnderlayElements.Add(lineContainer);
-                }
-            }
-
-            beatDivisor.BindValueChanged(_ => createLines(), true);
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (!lineCache.IsValid)
-            {
-                lineCache.Validate();
-                createLines();
-            }
-        }
-
-        private void createLines()
-        {
-            foreach (var grid in grids)
-                grid.Clear();
-
-            if (selectionTimeRange == null)
-                return;
-
-            var range = selectionTimeRange.Value;
-
-            var timingPoint = beatmap.ControlPointInfo.TimingPointAt(range.start - visible_range);
-
-            double time = timingPoint.Time;
-            int beat = 0;
-
-            // progress time until in the visible range.
-            while (time < range.start - visible_range)
-            {
-                time += timingPoint.BeatLength / beatDivisor.Value;
-                beat++;
-            }
-
-            while (time < range.end + visible_range)
-            {
-                var nextTimingPoint = beatmap.ControlPointInfo.TimingPointAt(time);
-
-                // switch to the next timing point if we have reached it.
-                if (nextTimingPoint.Time > timingPoint.Time)
-                {
-                    beat = 0;
-                    time = nextTimingPoint.Time;
-                    timingPoint = nextTimingPoint;
-                }
-
-                Color4 colour = BindableBeatDivisor.GetColourFor(
-                    BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value), colours);
-
-                foreach (var grid in grids)
-                {
-                    var line = linesPool.Get();
-
-                    line.Apply(new HitObject
-                    {
-                        StartTime = time
-                    });
-
-                    line.Colour = colour;
-
-                    grid.Add(line);
-                }
-
-                beat++;
-                time += timingPoint.BeatLength / beatDivisor.Value;
-            }
-
-            foreach (var grid in grids)
-            {
-                // required to update ScrollingHitObjectContainer's cache.
-                grid.UpdateSubTree();
-
-                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
-                {
-                    time = line.HitObject.StartTime;
-
-                    if (time >= range.start && time <= range.end)
-                        line.Alpha = 1;
-                    else
-                    {
-                        double timeSeparation = time < range.start ? range.start - time : time - range.end;
-                        line.Alpha = (float)Math.Max(0, 1 - timeSeparation / visible_range);
-                    }
-                }
-            }
-        }
-
-        private partial class DrawableGridLine : DrawableHitObject
-        {
-            [Resolved]
-            private IScrollingInfo scrollingInfo { get; set; } = null!;
-
-            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
-            public DrawableGridLine()
-                : base(new HitObject())
-            {
-                RelativeSizeAxes = Axes.X;
-                Height = 2;
-
-                AddInternal(new Box { RelativeSizeAxes = Axes.Both });
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                direction.BindTo(scrollingInfo.Direction);
-                direction.BindValueChanged(onDirectionChanged, true);
-            }
-
-            private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
-            {
-                Origin = Anchor = direction.NewValue == ScrollingDirection.Up
-                    ? Anchor.TopLeft
-                    : Anchor.BottomLeft;
-            }
-
-            protected override void UpdateInitialTransforms()
-            {
-                // don't perform any fading – we are handling that ourselves.
-                LifetimeEnd = HitObject.StartTime + visible_range;
-            }
+            return ((ManiaPlayfield)composer.Playfield)
+                   .Stages
+                   .SelectMany(stage => stage.Columns)
+                   .Select(column => column.UnderlayElements);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
new file mode 100644
index 0000000000..c7adaa5649
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
@@ -0,0 +1,203 @@
+// 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.Bindables;
+using osu.Framework.Caching;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// A grid which displays coloured beat divisor lines in proximity to the selection or placement cursor.
+    /// </summary>
+    public abstract partial class BeatSnapGrid : CompositeComponent
+    {
+        private const double visible_range = 750;
+
+        /// <summary>
+        /// The range of time values of the current selection.
+        /// </summary>
+        public (double start, double end)? SelectionTimeRange
+        {
+            set
+            {
+                if (value == selectionTimeRange)
+                    return;
+
+                selectionTimeRange = value;
+                lineCache.Invalidate();
+            }
+        }
+
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; } = null!;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private BindableBeatDivisor beatDivisor { get; set; } = null!;
+
+        private readonly List<ScrollingHitObjectContainer> grids = new List<ScrollingHitObjectContainer>();
+
+        private readonly DrawablePool<DrawableGridLine> linesPool = new DrawablePool<DrawableGridLine>(50);
+
+        private readonly Cached lineCache = new Cached();
+
+        private (double start, double end)? selectionTimeRange;
+
+        [BackgroundDependencyLoader]
+        private void load(HitObjectComposer composer)
+        {
+            AddInternal(linesPool);
+
+            foreach (var target in GetTargetContainers(composer))
+            {
+                var lineContainer = new ScrollingHitObjectContainer();
+
+                grids.Add(lineContainer);
+                target.Add(lineContainer);
+            }
+
+            beatDivisor.BindValueChanged(_ => createLines(), true);
+        }
+
+        protected abstract IEnumerable<Container> GetTargetContainers(HitObjectComposer composer);
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!lineCache.IsValid)
+            {
+                lineCache.Validate();
+                createLines();
+            }
+        }
+
+        private void createLines()
+        {
+            foreach (var grid in grids)
+                grid.Clear();
+
+            if (selectionTimeRange == null)
+                return;
+
+            var range = selectionTimeRange.Value;
+
+            var timingPoint = beatmap.ControlPointInfo.TimingPointAt(range.start - visible_range);
+
+            double time = timingPoint.Time;
+            int beat = 0;
+
+            // progress time until in the visible range.
+            while (time < range.start - visible_range)
+            {
+                time += timingPoint.BeatLength / beatDivisor.Value;
+                beat++;
+            }
+
+            while (time < range.end + visible_range)
+            {
+                var nextTimingPoint = beatmap.ControlPointInfo.TimingPointAt(time);
+
+                // switch to the next timing point if we have reached it.
+                if (nextTimingPoint.Time > timingPoint.Time)
+                {
+                    beat = 0;
+                    time = nextTimingPoint.Time;
+                    timingPoint = nextTimingPoint;
+                }
+
+                Color4 colour = BindableBeatDivisor.GetColourFor(
+                    BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value), colours);
+
+                foreach (var grid in grids)
+                {
+                    var line = linesPool.Get();
+
+                    line.Apply(new HitObject
+                    {
+                        StartTime = time
+                    });
+
+                    line.Colour = colour;
+
+                    grid.Add(line);
+                }
+
+                beat++;
+                time += timingPoint.BeatLength / beatDivisor.Value;
+            }
+
+            foreach (var grid in grids)
+            {
+                // required to update ScrollingHitObjectContainer's cache.
+                grid.UpdateSubTree();
+
+                foreach (var line in grid.Objects.OfType<DrawableGridLine>())
+                {
+                    time = line.HitObject.StartTime;
+
+                    if (time >= range.start && time <= range.end)
+                        line.Alpha = 1;
+                    else
+                    {
+                        double timeSeparation = time < range.start ? range.start - time : time - range.end;
+                        line.Alpha = (float)Math.Max(0, 1 - timeSeparation / visible_range);
+                    }
+                }
+            }
+        }
+
+        private partial class DrawableGridLine : DrawableHitObject
+        {
+            [Resolved]
+            private IScrollingInfo scrollingInfo { get; set; } = null!;
+
+            private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+            public DrawableGridLine()
+                : base(new HitObject())
+            {
+                RelativeSizeAxes = Axes.X;
+                Height = 2;
+
+                AddInternal(new Box { RelativeSizeAxes = Axes.Both });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                direction.BindTo(scrollingInfo.Direction);
+                direction.BindValueChanged(onDirectionChanged, true);
+            }
+
+            private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+            {
+                Origin = Anchor = direction.NewValue == ScrollingDirection.Up
+                    ? Anchor.TopLeft
+                    : Anchor.BottomLeft;
+            }
+
+            protected override void UpdateInitialTransforms()
+            {
+                // don't perform any fading – we are handling that ourselves.
+                LifetimeEnd = HitObject.StartTime + visible_range;
+            }
+        }
+    }
+}

From 4cfc95c673f2fe407f04c3884b083a7ab311795e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 09:43:17 +0200
Subject: [PATCH 1039/2296] Add backwards migration of catch dash binding

---
 osu.Game/Database/RealmAccess.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 7d4d63a20e..89bc631cfd 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -35,6 +35,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Skinning;
+using osuTK.Input;
 using Realms;
 using Realms.Exceptions;
 
@@ -1036,6 +1037,20 @@ namespace osu.Game.Database
 
                 case 35:
                 {
+                    // catch used `Shift` twice as a default key combination for dash, which generally was bothersome and causes issues elsewhere.
+                    // the duplicate binding logic below had to account for it, it could also break keybinding conflict resolution on revert-to-default.
+                    // as such, detect this situation and fix it before proceeding further.
+                    var catchDashBindings = migration.NewRealm.All<RealmKeyBinding>()
+                                                     .Where(kb => kb.RulesetName == @"fruits" && kb.ActionInt == 2)
+                                                     .ToList();
+
+                    if (catchDashBindings.All(kb => kb.KeyCombination.Equals(new KeyCombination(InputKey.Shift))))
+                    {
+                        Debug.Assert(catchDashBindings.Count == 2);
+                        catchDashBindings.Last().KeyCombination = KeyCombination.FromMouseButton(MouseButton.Left);
+                    }
+
+                    // with the catch case dealt with, de-duplicate the remaining bindings.
                     int countCleared = 0;
 
                     var globalBindings = migration.NewRealm.All<RealmKeyBinding>().Where(kb => kb.RulesetName == null).ToList();

From 2a89a257909712e79fff9578bfc5821016dacf66 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 16:54:59 +0900
Subject: [PATCH 1040/2296] Add beat snap grid to osu!taiko editor

Addresses https://github.com/ppy/osu/discussions/25150.
---
 .../Edit/TaikoBeatSnapGrid.cs                 | 19 ++++++++
 .../Edit/TaikoHitObjectComposer.cs            | 43 +++++++++++++++++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 11 ++++-
 .../Edit/Compose/Components/BeatSnapGrid.cs   | 16 +++++--
 4 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Edit/TaikoBeatSnapGrid.cs

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBeatSnapGrid.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBeatSnapGrid.cs
new file mode 100644
index 0000000000..1b6794974f
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBeatSnapGrid.cs
@@ -0,0 +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.Collections.Generic;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Screens.Edit.Compose.Components;
+
+namespace osu.Game.Rulesets.Taiko.Edit
+{
+    public partial class TaikoBeatSnapGrid : BeatSnapGrid
+    {
+        protected override IEnumerable<Container> GetTargetContainers(HitObjectComposer composer) => new[]
+        {
+            ((TaikoPlayfield)composer.Playfield).UnderlayElements
+        };
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index 5ae4757b8f..177f548238 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -2,10 +2,14 @@
 // 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.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -16,6 +20,9 @@ namespace osu.Game.Rulesets.Taiko.Edit
     {
         protected override bool ApplyHorizontalCentering => false;
 
+        private TaikoBeatSnapGrid beatSnapGrid = null!;
+        private InputManager inputManager = null!;
+
         public TaikoHitObjectComposer(TaikoRuleset ruleset)
             : base(ruleset)
         {
@@ -33,5 +40,41 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new TaikoBlueprintContainer(this);
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(beatSnapGrid = new TaikoBeatSnapGrid());
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            inputManager = GetContainingInputManager();
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            if (BlueprintContainer.CurrentTool is SelectTool)
+            {
+                if (EditorBeatmap.SelectedHitObjects.Any())
+                {
+                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
+                }
+                else
+                    beatSnapGrid.SelectionTimeRange = null;
+            }
+            else
+            {
+                var result = FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position);
+                if (result.Time is double time)
+                    beatSnapGrid.SelectionTimeRange = (time, time);
+                else
+                    beatSnapGrid.SelectionTimeRange = null;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 23ffac1f63..31f8171290 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Rulesets.Taiko.UI
         /// </summary>
         public Bindable<bool> ClassicHitTargetPosition = new BindableBool();
 
+        public Container UnderlayElements { get; private set; } = null!;
+
         private Container<HitExplosion> hitExplosionContainer;
         private Container<KiaiHitExplosion> kiaiExplosionContainer;
         private JudgementContainer<DrawableTaikoJudgement> judgementContainer;
@@ -130,7 +132,14 @@ namespace osu.Game.Rulesets.Taiko.UI
                         {
                             Name = "Bar line content",
                             RelativeSizeAxes = Axes.Both,
-                            Child = barLinePlayfield = new BarLinePlayfield(),
+                            Children = new Drawable[]
+                            {
+                                UnderlayElements = new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                },
+                                barLinePlayfield = new BarLinePlayfield(),
+                            }
                         },
                         hitObjectContent = new Container
                         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
index c7adaa5649..766d5b5601 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
@@ -173,9 +173,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             public DrawableGridLine()
                 : base(new HitObject())
             {
-                RelativeSizeAxes = Axes.X;
-                Height = 2;
-
                 AddInternal(new Box { RelativeSizeAxes = Axes.Both });
             }
 
@@ -191,6 +188,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 Origin = Anchor = direction.NewValue == ScrollingDirection.Up
                     ? Anchor.TopLeft
                     : Anchor.BottomLeft;
+
+                bool isHorizontal = direction.NewValue == ScrollingDirection.Left || direction.NewValue == ScrollingDirection.Right;
+
+                if (isHorizontal)
+                {
+                    RelativeSizeAxes = Axes.Y;
+                    Width = 2;
+                }
+                else
+                {
+                    RelativeSizeAxes = Axes.X;
+                    Height = 2;
+                }
             }
 
             protected override void UpdateInitialTransforms()

From 4381169a3fdf582414f82c0c0d3af52d85404ae6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 17:09:42 +0900
Subject: [PATCH 1041/2296] Combine selection and input handling logic for beat
 snap grids across all rulesets

---
 .../Edit/CatchHitObjectComposer.cs            | 41 ++-------------
 .../Edit/ManiaHitObjectComposer.cs            | 42 +--------------
 .../Edit/TaikoHitObjectComposer.cs            | 43 +---------------
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 51 +++++++++++++++++--
 4 files changed, 53 insertions(+), 124 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index dc3a4416a5..80a9731cc4 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
@@ -32,10 +31,6 @@ namespace osu.Game.Rulesets.Catch.Edit
 
         private CatchDistanceSnapGrid distanceSnapGrid = null!;
 
-        private InputManager inputManager = null!;
-
-        private CatchBeatSnapGrid beatSnapGrid = null!;
-
         private readonly BindableDouble timeRangeMultiplier = new BindableDouble(1)
         {
             MinValue = 1,
@@ -68,38 +63,6 @@ namespace osu.Game.Rulesets.Catch.Edit
                 Catcher.BASE_DASH_SPEED, -Catcher.BASE_DASH_SPEED,
                 Catcher.BASE_WALK_SPEED, -Catcher.BASE_WALK_SPEED,
             }));
-
-            AddInternal(beatSnapGrid = new CatchBeatSnapGrid());
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            inputManager = GetContainingInputManager();
-        }
-
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            if (BlueprintContainer.CurrentTool is SelectTool)
-            {
-                if (EditorBeatmap.SelectedHitObjects.Any())
-                {
-                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
-                }
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-            else
-            {
-                var result = FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position);
-                if (result.Time is double time)
-                    beatSnapGrid.SelectionTimeRange = (time, time);
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
         }
 
         protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
@@ -174,6 +137,8 @@ namespace osu.Game.Rulesets.Catch.Edit
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer() => new CatchBlueprintContainer(this);
 
+        protected override BeatSnapGrid CreateBeatSnapGrid() => new CatchBeatSnapGrid();
+
         private PalpableCatchHitObject? getLastSnappableHitObject(double time)
         {
             var hitObject = EditorBeatmap.HitObjects.OfType<CatchHitObject>().LastOrDefault(h => h.GetEndTime() < time && !(h is BananaShower));
@@ -214,7 +179,7 @@ namespace osu.Game.Rulesets.Catch.Edit
                             return null;
                     }
 
-                    double timeAtCursor = ((CatchPlayfield)Playfield).TimeAtScreenSpacePosition(inputManager.CurrentState.Mouse.Position);
+                    double timeAtCursor = ((CatchPlayfield)Playfield).TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
                     return getLastSnappableHitObject(timeAtCursor);
 
                 default:
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 7a0ec70611..91fe99f938 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -6,14 +6,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -24,27 +22,12 @@ namespace osu.Game.Rulesets.Mania.Edit
     public partial class ManiaHitObjectComposer : ScrollingHitObjectComposer<ManiaHitObject>
     {
         private DrawableManiaEditorRuleset drawableRuleset;
-        private ManiaBeatSnapGrid beatSnapGrid;
-        private InputManager inputManager;
 
         public ManiaHitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AddInternal(beatSnapGrid = new ManiaBeatSnapGrid());
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            inputManager = GetContainingInputManager();
-        }
-
         private DependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -63,35 +46,14 @@ namespace osu.Game.Rulesets.Mania.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new ManiaBlueprintContainer(this);
 
+        protected override BeatSnapGrid CreateBeatSnapGrid() => new ManiaBeatSnapGrid();
+
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
             new NoteCompositionTool(),
             new HoldNoteCompositionTool()
         };
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            if (BlueprintContainer.CurrentTool is SelectTool)
-            {
-                if (EditorBeatmap.SelectedHitObjects.Any())
-                {
-                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
-                }
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-            else
-            {
-                var result = FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position);
-                if (result.Time is double time)
-                    beatSnapGrid.SelectionTimeRange = (time, time);
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-        }
-
         public override string ConvertSelectionToString()
             => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime).Select(h => $"{h.StartTime}|{h.Column}"));
     }
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
index 177f548238..6020f6e04c 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoHitObjectComposer.cs
@@ -2,14 +2,10 @@
 // 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.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -20,9 +16,6 @@ namespace osu.Game.Rulesets.Taiko.Edit
     {
         protected override bool ApplyHorizontalCentering => false;
 
-        private TaikoBeatSnapGrid beatSnapGrid = null!;
-        private InputManager inputManager = null!;
-
         public TaikoHitObjectComposer(TaikoRuleset ruleset)
             : base(ruleset)
         {
@@ -41,40 +34,6 @@ namespace osu.Game.Rulesets.Taiko.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new TaikoBlueprintContainer(this);
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AddInternal(beatSnapGrid = new TaikoBeatSnapGrid());
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            inputManager = GetContainingInputManager();
-        }
-
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            if (BlueprintContainer.CurrentTool is SelectTool)
-            {
-                if (EditorBeatmap.SelectedHitObjects.Any())
-                {
-                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
-                }
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-            else
-            {
-                var result = FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position);
-                if (result.Time is double time)
-                    beatSnapGrid.SelectionTimeRange = (time, time);
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-        }
+        protected override BeatSnapGrid CreateBeatSnapGrid() => new TaikoBeatSnapGrid();
     }
 }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e1ae4b0199..2a859dad0d 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
@@ -76,7 +77,7 @@ namespace osu.Game.Rulesets.Edit
 
         protected readonly Container LayerBelowRuleset = new Container { RelativeSizeAxes = Axes.Both };
 
-        private InputManager inputManager;
+        protected InputManager InputManager { get; private set; }
 
         private EditorRadioButtonCollection toolboxCollection;
 
@@ -89,6 +90,9 @@ namespace osu.Game.Rulesets.Edit
 
         protected DrawableRuleset<TObject> DrawableRuleset { get; private set; }
 
+        [CanBeNull]
+        private BeatSnapGrid beatSnapGrid;
+
         protected HitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
@@ -204,7 +208,9 @@ namespace osu.Game.Rulesets.Edit
                             },
                         }
                     }
-                }
+                },
+                // Must be constructed after drawable ruleset above.
+                (beatSnapGrid = CreateBeatSnapGrid()) ?? Empty(),
             };
 
             toolboxCollection.Items = CompositionTools
@@ -235,7 +241,7 @@ namespace osu.Game.Rulesets.Edit
         {
             base.LoadComplete();
 
-            inputManager = GetContainingInputManager();
+            InputManager = GetContainingInputManager();
 
             hasTiming = EditorBeatmap.HasTiming.GetBoundCopy();
             hasTiming.BindValueChanged(timing =>
@@ -269,11 +275,42 @@ namespace osu.Game.Rulesets.Edit
             }
         }
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            updateBeatSnapGrid();
+        }
+
+        private void updateBeatSnapGrid()
+        {
+            if (beatSnapGrid == null)
+                return;
+
+            if (BlueprintContainer.CurrentTool is SelectTool)
+            {
+                if (EditorBeatmap.SelectedHitObjects.Any())
+                {
+                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
+                }
+                else
+                    beatSnapGrid.SelectionTimeRange = null;
+            }
+            else
+            {
+                var result = FindSnappedPositionAndTime(InputManager.CurrentState.Mouse.Position);
+                if (result.Time is double time)
+                    beatSnapGrid.SelectionTimeRange = (time, time);
+                else
+                    beatSnapGrid.SelectionTimeRange = null;
+            }
+        }
+
         public override Playfield Playfield => drawableRulesetWrapper.Playfield;
 
         public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
 
-        public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(inputManager.CurrentState.Mouse.Position);
+        public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(InputManager.CurrentState.Mouse.Position);
 
         /// <summary>
         /// Defines all available composition tools, listed on the left side of the editor screen as button controls.
@@ -299,6 +336,12 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         protected virtual ComposeBlueprintContainer CreateBlueprintContainer() => new ComposeBlueprintContainer(this);
 
+        /// <summary>
+        /// Construct an optional beat snap grid.
+        /// </summary>
+        [CanBeNull]
+        protected virtual BeatSnapGrid CreateBeatSnapGrid() => null;
+
         /// <summary>
         /// Construct a drawable ruleset for the provided ruleset.
         /// </summary>

From 7abd7fe658e51753a7ebc54f91d0ab042b5f7efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 10:26:02 +0200
Subject: [PATCH 1042/2296] Remove redundant explicit array type specification

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

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 2a859dad0d..129ab6751e 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Edit
 
             dependencies.CacheAs(Playfield);
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 PlayfieldContentContainer = new Container
                 {

From 22c1a963e722d4ce62cb24df907974fc1284d42f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 10:27:16 +0200
Subject: [PATCH 1043/2296] Remove unused field

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 91fe99f938..61ddaffb25 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -28,11 +28,6 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
-        private DependencyContainer dependencies;
-
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-            => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-
         public new ManiaPlayfield Playfield => ((ManiaPlayfield)drawableRuleset.Playfield);
 
         public IScrollingInfo ScrollingInfo => drawableRuleset.ScrollingInfo;

From 2192c9f2c28e5a34cc753f62218a19026c21755c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 10:30:01 +0200
Subject: [PATCH 1044/2296] Remove unused using directive

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 61ddaffb25..b9db4168f4 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -5,7 +5,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;

From 5341a335a6165ceef4d91e910fa2ea5aecbfd025 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 17:40:44 +0900
Subject: [PATCH 1045/2296] Bypass `Parent` nullability checks for now

---
 .../TestSceneCatchSkinConfiguration.cs                    | 2 +-
 .../Edit/CatchEditorPlayfieldAdjustmentContainer.cs       | 2 +-
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs         | 4 ++--
 .../Edit/Blueprints/ManiaSelectionBlueprint.cs            | 2 +-
 osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs    | 2 +-
 .../Editor/TestScenePathControlPointVisualiser.cs         | 2 +-
 .../Editor/TestSceneSliderControlPointPiece.cs            | 6 +++---
 .../Editor/TestSceneSliderSelectionBlueprint.cs           | 2 +-
 .../Editor/TestSceneSliderSnapping.cs                     | 2 +-
 .../Editor/TestSceneSliderSplitting.cs                    | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs | 2 +-
 .../Sliders/Components/PathControlPointVisualiser.cs      | 8 ++++----
 osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs                | 6 +++---
 .../Objects/Drawables/DrawableOsuHitObject.cs             | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs   | 2 +-
 .../Skinning/Default/SpinnerRotationTracker.cs            | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs | 2 +-
 .../UI/OsuPlayfieldAdjustmentContainer.cs                 | 6 +++---
 .../Edit/Blueprints/TaikoSelectionBlueprint.cs            | 4 ++--
 .../Objects/Drawables/DrawableSwell.cs                    | 2 +-
 .../Skinning/Argon/ArgonElongatedCirclePiece.cs           | 2 +-
 .../Skinning/Default/ElongatedCirclePiece.cs              | 2 +-
 .../UI/TaikoPlayfieldAdjustmentContainer.cs               | 2 +-
 .../Visual/Editing/TestSceneZoomableScrollContainer.cs    | 2 +-
 .../Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs      | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs | 2 +-
 .../Visual/Gameplay/TestSceneSpectatorPlayback.cs         | 2 +-
 .../Visual/Online/TestSceneBeatmapListingOverlay.cs       | 2 +-
 .../Visual/Playlists/TestScenePlaylistsRoomCreation.cs    | 4 ++--
 osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs   | 8 ++++----
 .../UserInterface/TestSceneLogoTrackingContainer.cs       | 4 ++--
 .../Screens/Ladder/Components/ProgressionPath.cs          | 4 ++--
 osu.Game/Extensions/DrawableExtensions.cs                 | 2 +-
 osu.Game/Graphics/Containers/LogoTrackingContainer.cs     | 6 +++---
 .../Containers/UprightAspectMaintainingContainer.cs       | 2 +-
 osu.Game/Graphics/Containers/WaveContainer.cs             | 4 ++--
 osu.Game/Overlays/ChatOverlay.cs                          | 2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                | 2 +-
 osu.Game/Overlays/NowPlayingOverlay.cs                    | 2 +-
 .../Settings/Sections/Input/TabletAreaSelection.cs        | 2 +-
 osu.Game/Overlays/SkinEditor/SkinBlueprint.cs             | 2 +-
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs      | 4 ++--
 osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs      | 2 +-
 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs | 4 ++--
 osu.Game/Overlays/Wiki/WikiPanelContainer.cs              | 2 +-
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs  | 4 ++--
 .../OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs    | 6 +++---
 osu.Game/Screens/Ranking/ResultsScreen.cs                 | 2 +-
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs      | 2 +-
 osu.Game/Tests/Visual/OsuTestScene.cs                     | 6 +++---
 50 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
index 75ab4ad9d2..e2fc31d869 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         private float getCaughtObjectPosition(Fruit fruit)
         {
             var caughtObject = catcher.ChildrenOfType<CaughtObject>().Single(c => c.HitObject == fruit);
-            return caughtObject.Parent.ToSpaceOfOtherDrawable(caughtObject.Position, catcher).X;
+            return caughtObject.Parent!.ToSpaceOfOtherDrawable(caughtObject.Position, catcher).X;
         }
 
         private void catchFruit(Fruit fruit, float x)
diff --git a/osu.Game.Rulesets.Catch/Edit/CatchEditorPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Catch/Edit/CatchEditorPlayfieldAdjustmentContainer.cs
index 0271005dd1..36aee792a8 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchEditorPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchEditorPlayfieldAdjustmentContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.Edit
             {
                 base.Update();
 
-                Scale = new Vector2(Math.Min(Parent.ChildSize.X / CatchPlayfield.WIDTH, Parent.ChildSize.Y / CatchPlayfield.HEIGHT));
+                Scale = new Vector2(Math.Min(Parent!.ChildSize.X / CatchPlayfield.WIDTH, Parent!.ChildSize.Y / CatchPlayfield.HEIGHT));
                 Height = 1 / Scale.Y;
             }
         }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index cb275a9aa4..02ad1655b5 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -44,8 +44,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             if (Column != null)
             {
-                headPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.StartTime)).Y;
-                tailPiece.Y = Parent.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.EndTime)).Y;
+                headPiece.Y = Parent!.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.StartTime)).Y;
+                tailPiece.Y = Parent!.ToLocalSpace(Column.ScreenSpacePositionAtTime(HitObject.EndTime)).Y;
 
                 switch (scrollingInfo.Direction.Value)
                 {
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 4c356367d3..1ae65dd8c0 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             foreach (var child in InternalChildren)
                 child.Anchor = child.Origin = anchor;
 
-            Position = Parent.ToLocalSpace(HitObjectContainer.ScreenSpacePositionAtTime(HitObject.StartTime)) - AnchorPosition;
+            Position = Parent!.ToLocalSpace(HitObjectContainer.ScreenSpacePositionAtTime(HitObject.StartTime)) - AnchorPosition;
             Width = HitObjectContainer.DrawWidth;
         }
     }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
index 09abe8d7f4..bc76c5cfe9 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Mods
             foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
             {
                 HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
-                Container hocParent = (Container)hoc.Parent;
+                Container hocParent = (Container)hoc.Parent!;
 
                 hocParent.Remove(hoc, false);
                 hocParent.Add(new PlayfieldCoveringWrapper(hoc).With(c =>
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 0d6841017e..c267cd1f63 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep($"move mouse to control point {index}", () =>
             {
                 Vector2 position = slider.Path.ControlPoints[index].Position;
-                InputManager.MoveMouseTo(visualiser.Pieces[0].Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(visualiser.Pieces[0].Parent!.ToScreenSpace(position));
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index db9eea4127..408205d6b2 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep($"move mouse to {relativePosition}", () =>
             {
                 Vector2 position = slider.Position + relativePosition;
-                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(drawableObject.Parent!.ToScreenSpace(position));
             });
 
         [Test]
@@ -331,7 +331,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep($"move mouse to {relativePosition}", () =>
             {
                 Vector2 position = slider.Position + relativePosition;
-                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(drawableObject.Parent!.ToScreenSpace(position));
             });
         }
 
@@ -340,7 +340,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep($"move mouse to control point {index}", () =>
             {
                 Vector2 position = slider.Position + slider.Path.ControlPoints[index].Position;
-                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(drawableObject.Parent!.ToScreenSpace(position));
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index 8ed77d45d7..413a3c3dfd 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -187,7 +187,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep($"move mouse to control point {index}", () =>
             {
                 Vector2 position = slider.Position + slider.Path.ControlPoints[index].Position;
-                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(drawableObject.Parent!.ToScreenSpace(position));
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
index f262a4334a..0ae14bdde8 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
                 var firstPiece = this.ChildrenOfType<PathControlPointPiece<Slider>>().Single(piece => piece.ControlPoint == slider.Path.ControlPoints[0]);
                 var pos = slider.Path.PositionAt(0.25d) + slider.Position;
-                InputManager.MoveMouseTo(firstPiece.Parent.ToScreenSpace(pos));
+                InputManager.MoveMouseTo(firstPiece.Parent!.ToScreenSpace(pos));
             });
             AddStep("move slider end", () =>
             {
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index 7315344295..60264572ab 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 if (slider is null || visualiser is null) return;
 
                 Vector2 position = slider.Path.ControlPoints[index].Position + slider.Position;
-                InputManager.MoveMouseTo(visualiser.Pieces[0].Parent.ToScreenSpace(position));
+                InputManager.MoveMouseTo(visualiser.Pieces[0].Parent!.ToScreenSpace(position));
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index 5da54f8fcf..874130233a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                         pool = pools[poolIndex];
 
                         // We need to make sure neither the pool nor the judgement get disposed when new content is set, and they both share the same parent.
-                        ((Container)pool.Parent).Clear(false);
+                        ((Container)pool.Parent!).Clear(false);
                     }
 
                     var container = new Container
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 c56ffcb140..f624ebc8b5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -288,10 +288,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (selectedControlPoints.Contains(hitObject.Path.ControlPoints[0]))
             {
                 // Special handling for selections containing head control point - the position of the hit object changes which means the snapped position and time have to be taken into account
-                Vector2 newHeadPosition = Parent.ToScreenSpace(e.MousePosition + (dragStartPositions[0] - dragStartPositions[draggedControlPointIndex]));
+                Vector2 newHeadPosition = Parent!.ToScreenSpace(e.MousePosition + (dragStartPositions[0] - dragStartPositions[draggedControlPointIndex]));
                 var result = snapProvider?.FindSnappedPositionAndTime(newHeadPosition);
 
-                Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? newHeadPosition) - hitObject.Position;
+                Vector2 movementDelta = Parent!.ToLocalSpace(result?.ScreenSpacePosition ?? newHeadPosition) - hitObject.Position;
 
                 hitObject.Position += movementDelta;
                 hitObject.StartTime = result?.Time ?? hitObject.StartTime;
@@ -309,9 +309,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
             {
-                var result = snapProvider?.FindSnappedPositionAndTime(Parent.ToScreenSpace(e.MousePosition), SnapType.GlobalGrids);
+                var result = snapProvider?.FindSnappedPositionAndTime(Parent!.ToScreenSpace(e.MousePosition), SnapType.GlobalGrids);
 
-                Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? Parent.ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - hitObject.Position;
+                Vector2 movementDelta = Parent!.ToLocalSpace(result?.ScreenSpacePosition ?? Parent!.ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - hitObject.Position;
 
                 for (int i = 0; i < controlPoints.Count; ++i)
                 {
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
index 2e2d320313..8b0adbe50f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
@@ -139,12 +139,12 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                 if (Precision.AlmostEquals(restrictTo.Rotation, 0))
                 {
-                    start = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopLeft).X;
-                    end = Parent.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopRight).X;
+                    start = Parent!.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopLeft).X;
+                    end = Parent!.ToLocalSpace(restrictTo.ScreenSpaceDrawQuad.TopRight).X;
                 }
                 else
                 {
-                    float center = restrictTo.ToSpaceOfOtherDrawable(restrictTo.OriginPosition, Parent).X;
+                    float center = restrictTo.ToSpaceOfOtherDrawable(restrictTo.OriginPosition, Parent!).X;
                     float halfDiagonal = (restrictTo.DrawSize / 2).LengthFast;
 
                     start = center - halfDiagonal;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index ed981d2d5d..bdd818cf18 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public void MissForcefully() => ApplyResult(r => r.Type = r.Judgement.MinResult);
 
-        private RectangleF parentScreenSpaceRectangle => ((DrawableOsuHitObject)ParentHitObject)?.parentScreenSpaceRectangle ?? Parent.ScreenSpaceDrawQuad.AABBFloat;
+        private RectangleF parentScreenSpaceRectangle => ((DrawableOsuHitObject)ParentHitObject)?.parentScreenSpaceRectangle ?? Parent!.ScreenSpaceDrawQuad.AABBFloat;
 
         /// <summary>
         /// Calculates the position of the given <paramref name="drawable"/> relative to the playfield area.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
index 461b4a3b45..325f0a22ad 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             base.Update();
 
             //undo rotation on layers which should not be rotated.
-            float appliedRotation = Parent.Rotation;
+            float appliedRotation = Parent!.Rotation;
 
             fill.Rotation = -appliedRotation;
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 69c2bf3dd0..c3c6629818 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            mousePosition = Parent.ToLocalSpace(e.ScreenSpaceMousePosition);
+            mousePosition = Parent!.ToLocalSpace(e.ScreenSpaceMousePosition);
             return base.OnMouseMove(e);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 5535903c73..593a0d18dd 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             base.UpdateAfterChildren();
 
             //undo rotation on layers which should not be rotated.
-            float appliedRotation = Parent.Rotation;
+            float appliedRotation = Parent!.Rotation;
 
             layerNd.Rotation = -appliedRotation;
             layerSpec.Rotation = -appliedRotation;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
index 2c3a77a6bc..b139296c61 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfieldAdjustmentContainer.cs
@@ -60,12 +60,12 @@ namespace osu.Game.Rulesets.Osu.UI
                 // game_size = DrawSizePreservingFillContainer.TargetSize = new Vector2(1024, 768)
                 //
                 // Parent is a 4:3 aspect enforced, using height as the constricting dimension
-                // Parent.ChildSize.X = min(game_size.X, game_size.Y * (4 / 3)) * playfield_size_adjust
-                // Parent.ChildSize.X = 819.2
+                // Parent!.ChildSize.X = min(game_size.X, game_size.Y * (4 / 3)) * playfield_size_adjust
+                // Parent!.ChildSize.X = 819.2
                 //
                 // Scale = 819.2 / 512
                 // Scale = 1.6
-                Scale = new Vector2(Parent.ChildSize.X / OsuPlayfield.BASE_SIZE.X);
+                Scale = new Vector2(Parent!.ChildSize.X / OsuPlayfield.BASE_SIZE.X);
                 Position = new Vector2(0, (PlayfieldShift ? 8f : 0f) * Scale.X);
                 // Size = 0.625
                 Size = Vector2.Divide(Vector2.One, Scale);
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
index 93b7c7061b..2a824d1f68 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
@@ -30,8 +30,8 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
             var topLeft = new Vector2(float.MaxValue, float.MaxValue);
             var bottomRight = new Vector2(float.MinValue, float.MinValue);
 
-            topLeft = Vector2.ComponentMin(topLeft, Parent.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.TopLeft));
-            bottomRight = Vector2.ComponentMax(bottomRight, Parent.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.BottomRight));
+            topLeft = Vector2.ComponentMin(topLeft, Parent!.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.TopLeft));
+            bottomRight = Vector2.ComponentMax(bottomRight, Parent!.ToLocalSpace(DrawableObject.ScreenSpaceDrawQuad.BottomRight));
 
             Size = bottomRight - topLeft;
             Position = topLeft;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index a8b48450e8..e4a083f218 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.Update();
 
-            Size = BaseSize * Parent.RelativeChildSize;
+            Size = BaseSize * Parent!.RelativeChildSize;
 
             // Make the swell stop at the hit target
             X = Math.Max(0, X);
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonElongatedCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonElongatedCirclePiece.cs
index 17386cc659..1ac2822a1b 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonElongatedCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonElongatedCirclePiece.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
         protected override void Update()
         {
             base.Update();
-            Width = Parent.DrawSize.X + DrawHeight;
+            Width = Parent!.DrawSize.X + DrawHeight;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
index 11d82a3714..c756b0fb66 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Default/ElongatedCirclePiece.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Default
         protected override void Update()
         {
             base.Update();
-            Width = Parent.DrawSize.X + DrawHeight;
+            Width = Parent!.DrawSize.X + DrawHeight;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
index 3587783104..54608b77de 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             // This is still a bit weird, because readability changes with window size, but it is what it is.
             if (LockPlayfieldAspectRange.Value)
             {
-                float currentAspect = Parent.ChildSize.X / Parent.ChildSize.Y;
+                float currentAspect = Parent!.ChildSize.X / Parent!.ChildSize.Y;
 
                 if (currentAspect > MAXIMUM_ASPECT)
                     height *= currentAspect / MAXIMUM_ASPECT;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
index a141e4d431..1c8a18e131 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestWidthUpdatesOnDrawSizeChanges()
         {
             AddStep("Shrink scroll container", () => scrollContainer.Width = 0.5f);
-            AddAssert("Scroll container width shrunk", () => scrollContainer.DrawWidth == scrollContainer.Parent.DrawWidth / 2);
+            AddAssert("Scroll container width shrunk", () => scrollContainer.DrawWidth == scrollContainer.Parent!.DrawWidth / 2);
             AddAssert("Inner container width matches scroll container", () => innerBox.DrawWidth == scrollContainer.DrawWidth);
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
index 18a180589b..a2ce62105e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             var expectedComponentsAdjustmentContainer = new DependencyProvidingContainer
             {
-                Position = actualComponentsContainer.Parent.ToSpaceOfOtherDrawable(actualComponentsContainer.DrawPosition, Content),
+                Position = actualComponentsContainer.Parent!.ToSpaceOfOtherDrawable(actualComponentsContainer.DrawPosition, Content),
                 Size = actualComponentsContainer.DrawSize,
                 Child = expectedComponentsContainer,
                 // proxy the same required dependencies that `actualComponentsContainer` is using.
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index 65b409a6f7..c51883b221 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public partial class TestInputConsumer : CompositeDrawable, IKeyBindingHandler<TestAction>
         {
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent.ReceivePositionalInputAt(screenSpacePos);
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent!.ReceivePositionalInputAt(screenSpacePos);
 
             private readonly Box box;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 794860b9ec..3a5b3864af 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -259,7 +259,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public partial class TestInputConsumer : CompositeDrawable, IKeyBindingHandler<TestAction>
         {
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent.ReceivePositionalInputAt(screenSpacePos);
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent!.ReceivePositionalInputAt(screenSpacePos);
 
             private readonly Box box;
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 5e49cb633e..8c32135cfd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Tests.Visual.Online
                 AddUntilStep("placeholder shown", () =>
                 {
                     var notFoundDrawable = overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault();
-                    return notFoundDrawable != null && notFoundDrawable.IsPresent && notFoundDrawable.Parent.DrawHeight > 0;
+                    return notFoundDrawable != null && notFoundDrawable.IsPresent && notFoundDrawable.Parent!.DrawHeight > 0;
                 });
         }
 
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs
index 6c732f4295..2f66309f04 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 });
             });
 
-            AddUntilStep("Progress details are hidden", () => match.ChildrenOfType<RoomLocalUserInfo>().FirstOrDefault()?.Parent.Alpha == 0);
+            AddUntilStep("Progress details are hidden", () => match.ChildrenOfType<RoomLocalUserInfo>().FirstOrDefault()?.Parent!.Alpha == 0);
 
             AddUntilStep("Leaderboard shows two aggregate scores", () => match.ChildrenOfType<MatchLeaderboardScore>().Count(s => s.ScoreText.Text != "0") == 2);
 
@@ -99,7 +99,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 });
             });
 
-            AddUntilStep("Progress details are visible", () => match.ChildrenOfType<RoomLocalUserInfo>().FirstOrDefault()?.Parent.Alpha == 1);
+            AddUntilStep("Progress details are visible", () => match.ChildrenOfType<RoomLocalUserInfo>().FirstOrDefault()?.Parent!.Alpha == 1);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
index ec0ad685c5..2926b11067 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
@@ -66,20 +66,20 @@ namespace osu.Game.Tests.Visual.Settings
             });
 
             AddStep("set non-default value", () => revertToDefaultButton.Current.Value = "non-default");
-            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, control.DrawHeight, 1));
+            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent!.DrawHeight, control.DrawHeight, 1));
 
             AddStep("set label", () => textBox.LabelText = "label text");
             AddAssert("default value button centre aligned to label size", () =>
             {
                 var label = textBox.ChildrenOfType<OsuSpriteText>().Single(spriteText => spriteText.Text == "label text");
-                return Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, label.DrawHeight, 1);
+                return Precision.AlmostEquals(revertToDefaultButton.Parent!.DrawHeight, label.DrawHeight, 1);
             });
 
             AddStep("clear label", () => textBox.LabelText = default);
-            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, control.DrawHeight, 1));
+            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent!.DrawHeight, control.DrawHeight, 1));
 
             AddStep("set warning text", () => textBox.SetNoticeText("This is some very important warning text! Hopefully it doesn't break the alignment of the default value indicator...", true));
-            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent.DrawHeight, control.DrawHeight, 1));
+            AddAssert("default value button centre aligned to control size", () => Precision.AlmostEquals(revertToDefaultButton.Parent!.DrawHeight, control.DrawHeight, 1));
         }
 
         /// <summary>
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
index 5926f07a11..57ea4ee58e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
@@ -269,8 +269,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             if (!logoFacade.Transforms.Any() && !transferContainer.Transforms.Any())
             {
                 Random random = new Random();
-                trackingContainer.Delay(500).MoveTo(new Vector2(random.Next(0, (int)logo.Parent.DrawWidth), random.Next(0, (int)logo.Parent.DrawHeight)), 300);
-                transferContainer.Delay(500).MoveTo(new Vector2(random.Next(0, (int)logo.Parent.DrawWidth), random.Next(0, (int)logo.Parent.DrawHeight)), 300);
+                trackingContainer.Delay(500).MoveTo(new Vector2(random.Next(0, (int)logo.Parent!.DrawWidth), random.Next(0, (int)logo.Parent!.DrawHeight)), 300);
+                transferContainer.Delay(500).MoveTo(new Vector2(random.Next(0, (int)logo.Parent!.DrawWidth), random.Next(0, (int)logo.Parent!.DrawHeight)), 300);
             }
 
             if (randomPositions)
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs b/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
index eae11dd8f1..90efac30fd 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/ProgressionPath.cs
@@ -61,8 +61,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             var topLeft = new Vector2(minX, minY);
 
             OriginPosition = new Vector2(PathRadius);
-            Position = Parent.ToLocalSpace(topLeft);
-            Vertices = points.Select(p => Parent.ToLocalSpace(p) - Parent.ToLocalSpace(topLeft)).ToList();
+            Position = Parent!.ToLocalSpace(topLeft);
+            Vertices = points.Select(p => Parent!.ToLocalSpace(p) - Parent!.ToLocalSpace(topLeft)).ToList();
         }
     }
 }
diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 6553ad3886..99d748b267 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Extensions
         /// <param name="delta">A delta in screen-space coordinates.</param>
         /// <returns>The delta vector in Parent's coordinates.</returns>
         public static Vector2 ScreenSpaceDeltaToParentSpace(this Drawable drawable, Vector2 delta) =>
-            drawable.Parent.ToLocalSpace(drawable.Parent.ToScreenSpace(Vector2.Zero) + delta);
+            drawable.Parent!.ToLocalSpace(drawable.Parent!.ToScreenSpace(Vector2.Zero) + delta);
 
         /// <summary>
         /// Some elements don't handle rewind correctly and fixing them is non-trivial.
diff --git a/osu.Game/Graphics/Containers/LogoTrackingContainer.cs b/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
index 984d60d35e..08eae25951 100644
--- a/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
+++ b/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
@@ -76,10 +76,10 @@ namespace osu.Game.Graphics.Containers
         /// <remarks>Will only be correct if the logo's <see cref="Drawable.RelativePositionAxes"/> are set to Axes.Both</remarks>
         protected Vector2 ComputeLogoTrackingPosition()
         {
-            var absolutePos = Logo.Parent.ToLocalSpace(LogoFacade.ScreenSpaceDrawQuad.Centre);
+            var absolutePos = Logo.Parent!.ToLocalSpace(LogoFacade.ScreenSpaceDrawQuad.Centre);
 
-            return new Vector2(absolutePos.X / Logo.Parent.RelativeToAbsoluteFactor.X,
-                absolutePos.Y / Logo.Parent.RelativeToAbsoluteFactor.Y);
+            return new Vector2(absolutePos.X / Logo.Parent!.RelativeToAbsoluteFactor.X,
+                absolutePos.Y / Logo.Parent!.RelativeToAbsoluteFactor.Y);
         }
 
         protected override void Update()
diff --git a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
index 38ab6deb97..f263ae36cb 100644
--- a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Graphics.Containers
         private void keepUprightAndUnstretched()
         {
             // Decomposes the inverse of the parent DrawInfo.Matrix into rotation, shear and scale.
-            var parentMatrix = Parent.DrawInfo.Matrix;
+            var parentMatrix = Parent!.DrawInfo.Matrix;
 
             // Remove Translation.>
             parentMatrix.M31 = 0.0f;
diff --git a/osu.Game/Graphics/Containers/WaveContainer.cs b/osu.Game/Graphics/Containers/WaveContainer.cs
index e84cb276a4..5abc66d2ac 100644
--- a/osu.Game/Graphics/Containers/WaveContainer.cs
+++ b/osu.Game/Graphics/Containers/WaveContainer.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Graphics.Containers
 
                 // We can not use RelativeSizeAxes for Height, because the height
                 // of our parent diminishes as the content moves up.
-                Height = Parent.Parent.DrawSize.Y * 1.5f;
+                Height = Parent!.Parent!.DrawSize.Y * 1.5f;
             }
 
             protected override void PopIn() => Schedule(() => this.MoveToY(FinalPosition, APPEAR_DURATION, easing_show));
@@ -188,7 +188,7 @@ namespace osu.Game.Graphics.Containers
                 double duration = IsLoaded ? DISAPPEAR_DURATION : 0;
 
                 // scheduling is required as parent may not be present at the time this is called.
-                Schedule(() => this.MoveToY(Parent.Parent.DrawSize.Y, duration, easing_hide));
+                Schedule(() => this.MoveToY(Parent!.Parent!.DrawSize.Y, duration, easing_hide));
             }
         }
     }
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index a47d10c565..724f77ad71 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -267,7 +267,7 @@ namespace osu.Game.Overlays
             if (!isDraggingTopBar)
                 return;
 
-            float targetChatHeight = dragStartChatHeight - (e.MousePosition.Y - e.MouseDownPosition.Y) / Parent.DrawSize.Y;
+            float targetChatHeight = dragStartChatHeight - (e.MousePosition.Y - e.MouseDownPosition.Y) / Parent!.DrawSize.Y;
             chatHeight.Value = targetChatHeight;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index e1a49f8636..f2b3264a84 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -604,7 +604,7 @@ namespace osu.Game.Overlays.Mods
                     if (columnNumber > 5 && !column.Active.Value) return;
 
                     // use X position of the column on screen as a basis for panning the sample
-                    float balance = column.Parent.BoundingBox.Centre.X / RelativeToAbsoluteFactor.X;
+                    float balance = column.Parent!.BoundingBox.Centre.X / RelativeToAbsoluteFactor.X;
 
                     // dip frequency and ramp volume of sample over the first 5 displayed columns
                     float progress = Math.Min(1, columnNumber / 5f);
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 6abde713b6..809c1af408 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Overlays
         {
             base.UpdateAfterChildren();
 
-            playlistContainer.Height = MathF.Min(Parent.DrawHeight - margin * 3 - player_height, PlaylistOverlay.PLAYLIST_HEIGHT);
+            playlistContainer.Height = MathF.Min(Parent!.DrawHeight - margin * 3 - player_height, PlaylistOverlay.PLAYLIST_HEIGHT);
 
             float height = player_height;
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 8b15bc8f72..686002fe71 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -241,7 +241,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         protected override void OnDrag(DragEvent e)
         {
             var newPos = Position + e.Delta;
-            this.MoveTo(Vector2.Clamp(newPos, Vector2.Zero, Parent.Size));
+            this.MoveTo(Vector2.Clamp(newPos, Vector2.Zero, Parent!.Size));
         }
 
         protected override void OnDragEnd(DragEndEvent e)
diff --git a/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs b/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
index c090878899..01cd3d97e0 100644
--- a/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Overlays.SkinEditor
             if (drawable.Parent == null)
                 return;
 
-            var newAnchor = drawable.Parent.ToSpaceOfOtherDrawable(drawable.AnchorPosition, this);
+            var newAnchor = drawable.Parent!.ToSpaceOfOtherDrawable(drawable.AnchorPosition, this);
             anchorPosition = tweenPosition(anchorPosition ?? newAnchor, newAnchor);
             anchorBox.Position = anchorPosition.Value;
 
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 94cf60a422..c4e2c4c6bd 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Overlays.SkinEditor
             {
                 var drawableItem = (Drawable)b.Item;
 
-                var flippedPosition = GeometryUtils.GetFlippedPosition(direction, flipOverOrigin ? drawableItem.Parent.ScreenSpaceDrawQuad : selectionQuad, b.ScreenSpaceSelectionPoint);
+                var flippedPosition = GeometryUtils.GetFlippedPosition(direction, flipOverOrigin ? drawableItem.Parent!.ScreenSpaceDrawQuad : selectionQuad, b.ScreenSpaceSelectionPoint);
 
                 updateDrawablePosition(drawableItem, flippedPosition);
 
@@ -242,7 +242,7 @@ namespace osu.Game.Overlays.SkinEditor
         private static void updateDrawablePosition(Drawable drawable, Vector2 screenSpacePosition)
         {
             drawable.Position =
-                drawable.Parent.ToLocalSpace(screenSpacePosition) - drawable.AnchorPosition;
+                drawable.Parent!.ToLocalSpace(screenSpacePosition) - drawable.AnchorPosition;
         }
 
         private void applyOrigins(Anchor origin)
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index 7d75acb9d1..88326d4048 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Overlays.Toolbar
 
             protected override bool OnClick(ClickEvent e)
             {
-                Parent.TriggerClick();
+                Parent!.TriggerClick();
                 return base.OnClick(e);
             }
         }
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
index bb7c232a13..cae2d0167a 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
@@ -81,10 +81,10 @@ namespace osu.Game.Overlays.Wiki.Markdown
                     {
                         base.Update();
 
-                        if (Width > Parent.DrawWidth)
+                        if (Width > Parent!.DrawWidth)
                         {
                             float ratio = Height / Width;
-                            Width = Parent.DrawWidth;
+                            Width = Parent!.DrawWidth;
                             Height = ratio * Width;
                         }
                     }
diff --git a/osu.Game/Overlays/Wiki/WikiPanelContainer.cs b/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
index ef31e9cfdd..c5b71cfeb6 100644
--- a/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
+++ b/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Wiki
         protected override void Update()
         {
             base.Update();
-            Height = Math.Max(panelContainer.Height, Parent.DrawHeight);
+            Height = Math.Max(panelContainer.Height, Parent!.DrawHeight);
         }
 
         private partial class WikiPanelMarkdownContainer : WikiMarkdownContainer
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 0c19f6c62e..72d96213ee 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -383,7 +383,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // Shrink the parent quad to give a bit of padding so the buttons don't stick *right* on the border.
             // AABBFloat assumes no rotation. one would hope the whole editor is not being rotated.
-            var parentQuad = Parent.ScreenSpaceDrawQuad.AABBFloat.Shrink(ToLocalSpace(thisQuad.TopLeft + new Vector2(button_padding * 2)));
+            var parentQuad = Parent!.ScreenSpaceDrawQuad.AABBFloat.Shrink(ToLocalSpace(thisQuad.TopLeft + new Vector2(button_padding * 2)));
 
             float topExcess = thisQuad.TopLeft.Y - parentQuad.TopLeft.Y;
             float bottomExcess = parentQuad.BottomLeft.Y - thisQuad.BottomLeft.Y;
@@ -396,7 +396,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 buttons.Anchor = Anchor.BottomCentre;
                 buttons.Origin = Anchor.BottomCentre;
-                buttons.Y = Math.Min(0, ToLocalSpace(Parent.ScreenSpaceDrawQuad.BottomLeft).Y - DrawHeight);
+                buttons.Y = Math.Min(0, ToLocalSpace(Parent!.ScreenSpaceDrawQuad.BottomLeft).Y - DrawHeight);
             }
             else if (topExcess > bottomExcess)
             {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index ffc2328dc0..bc31299615 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -95,11 +95,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             }
 
             private Vector2 getFinalPosition() =>
-                Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.Centre);
+                Parent!.ToLocalSpace(facade.ScreenSpaceDrawQuad.Centre);
 
             private Vector2 getFinalSize() =>
-                Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.BottomRight)
-                - Parent.ToLocalSpace(facade.ScreenSpaceDrawQuad.TopLeft);
+                Parent!.ToLocalSpace(facade.ScreenSpaceDrawQuad.BottomRight)
+                - Parent!.ToLocalSpace(facade.ScreenSpaceDrawQuad.TopLeft);
 
             protected override bool OnClick(ClickEvent e)
             {
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 03231f9329..e3d19725da 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -329,7 +329,7 @@ namespace osu.Game.Screens.Ranking
                 ScorePanelList.Attach(detachedPanel);
 
                 // Move into its original location in the attached container first, then to the final location.
-                float origLocation = detachedPanel.Parent.ToLocalSpace(screenSpacePos).X;
+                float origLocation = detachedPanel.Parent!.ToLocalSpace(screenSpacePos).X;
                 detachedPanel.MoveToX(origLocation)
                              .Then()
                              .MoveToX(0, 250, Easing.OutElasticQuarter);
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 6c14ec243b..fc5ef12fb8 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Storyboards.Drawables
 
         protected override Container<DrawableStoryboardLayer> Content { get; }
 
-        protected override Vector2 DrawScale => new Vector2(Parent.DrawHeight / 480);
+        protected override Vector2 DrawScale => new Vector2(Parent!.DrawHeight / 480);
 
         private bool passing = true;
 
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 096917cf4f..79df951396 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -169,15 +169,15 @@ namespace osu.Game.Tests.Visual
 
             ChangeBackgroundColour(ColourInfo.GradientVertical(colours.GreyCarmine, colours.GreyCarmineDarker));
 
-            var parentBeatmap = Parent.Dependencies.Get<Bindable<WorkingBeatmap>>();
+            var parentBeatmap = Parent!.Dependencies.Get<Bindable<WorkingBeatmap>>();
             parentBeatmap.Value = Beatmap.Value;
             Beatmap.BindTo(parentBeatmap);
 
-            var parentRuleset = Parent.Dependencies.Get<Bindable<RulesetInfo>>();
+            var parentRuleset = Parent!.Dependencies.Get<Bindable<RulesetInfo>>();
             parentRuleset.Value = Ruleset.Value;
             Ruleset.BindTo(parentRuleset);
 
-            var parentMods = Parent.Dependencies.Get<Bindable<IReadOnlyList<Mod>>>();
+            var parentMods = Parent!.Dependencies.Get<Bindable<IReadOnlyList<Mod>>>();
             parentMods.Value = SelectedMods.Value;
             SelectedMods.BindTo(parentMods);
         }

From e081fa48a21d2b89ab9d956e62495b95f4ea9c1f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 17:48:51 +0900
Subject: [PATCH 1046/2296] Fix various other inspections

---
 .../Editor/TestSceneObjectMerging.cs               |  6 +++---
 .../Editor/TestSceneSliderSplitting.cs             |  2 +-
 .../Editing/TestSceneEditorBeatmapCreation.cs      | 12 ++++++------
 osu.Game.Tournament/Components/DateTextBox.cs      |  2 +-
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs           | 14 ++++++++++----
 osu.Game/Beatmaps/WorkingBeatmapCache.cs           |  2 +-
 osu.Game/Graphics/Backgrounds/SkinBackground.cs    |  2 +-
 osu.Game/Graphics/Containers/SectionsContainer.cs  | 10 +++++-----
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs    |  2 +-
 osu.Game/IO/FileInfo.cs                            |  2 +-
 osu.Game/Online/API/Requests/Responses/APIUser.cs  |  2 +-
 osu.Game/Online/Placeholders/MessagePlaceholder.cs |  2 +-
 osu.Game/Overlays/FullscreenOverlay.cs             |  2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs  |  5 +++--
 .../Rulesets/UI/DrawableRulesetDependencies.cs     |  2 +-
 .../Screens/Backgrounds/BackgroundScreenCustom.cs  |  2 +-
 osu.Game/Screens/OsuScreen.cs                      |  4 ++--
 osu.Game/Screens/Play/SkipOverlay.cs               |  2 ++
 osu.Game/Screens/Select/SongSelect.cs              |  2 +-
 19 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
index b05c755bfd..8d8386cae1 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
 
             moveMouseToHitObject(1);
-            AddAssert("merge option available", () => selectionHandler.ContextMenuItems.Any(o => o.Text.Value == "Merge selection"));
+            AddAssert("merge option available", () => selectionHandler.ContextMenuItems?.Any(o => o.Text.Value == "Merge selection") == true);
 
             mergeSelection();
 
@@ -198,7 +198,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
 
             moveMouseToHitObject(1);
-            AddAssert("merge option not available", () => selectionHandler.ContextMenuItems.Length > 0 && selectionHandler.ContextMenuItems.All(o => o.Text.Value != "Merge selection"));
+            AddAssert("merge option not available", () => selectionHandler.ContextMenuItems?.Length > 0 && selectionHandler.ContextMenuItems.All(o => o.Text.Value != "Merge selection"));
             mergeSelection();
             AddAssert("circles not merged", () => circle1 is not null && circle2 is not null
                                                                       && EditorBeatmap.HitObjects.Contains(circle1) && EditorBeatmap.HitObjects.Contains(circle2));
@@ -222,7 +222,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
 
             moveMouseToHitObject(1);
-            AddAssert("merge option available", () => selectionHandler.ContextMenuItems.Any(o => o.Text.Value == "Merge selection"));
+            AddAssert("merge option available", () => selectionHandler.ContextMenuItems?.Any(o => o.Text.Value == "Merge selection") == true);
 
             mergeSelection();
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index 60264572ab..ad37258c9b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -241,7 +241,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
                 if (visualiser is null) return;
 
-                MenuItem? item = visualiser.ContextMenuItems.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
+                MenuItem? item = visualiser.ContextMenuItems?.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
 
                 item?.Action.Value?.Invoke();
             });
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index e6c3eea925..7a2ed23cae 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Tests.Visual.Editing
             if (sameRuleset)
             {
                 AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-                AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog.PerformOkAction());
+                AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
             }
 
             AddUntilStep("wait for created", () =>
@@ -269,7 +269,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
 
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation as a copy", () => DialogOverlay.CurrentDialog.Buttons.ElementAt(1).TriggerClick());
+            AddStep("confirm creation as a copy", () => DialogOverlay.CurrentDialog!.Buttons.ElementAt(1).TriggerClick());
 
             AddUntilStep("wait for created", () =>
             {
@@ -342,7 +342,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
 
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation as a copy", () => DialogOverlay.CurrentDialog.Buttons.ElementAt(1).TriggerClick());
+            AddStep("confirm creation as a copy", () => DialogOverlay.CurrentDialog!.Buttons.ElementAt(1).TriggerClick());
 
             AddUntilStep("wait for created", () =>
             {
@@ -380,7 +380,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("try to create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-            AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog.PerformOkAction());
+            AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
 
             AddUntilStep("wait for created", () =>
             {
@@ -415,7 +415,7 @@ namespace osu.Game.Tests.Visual.Editing
             if (sameRuleset)
             {
                 AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is CreateNewDifficultyDialog);
-                AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog.PerformOkAction());
+                AddStep("confirm creation with no objects", () => DialogOverlay.CurrentDialog!.PerformOkAction());
             }
 
             AddUntilStep("wait for created", () =>
@@ -476,7 +476,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("exit", () => Editor.Exit());
             AddUntilStep("wait for dialog", () => DialogOverlay.CurrentDialog is PromptForSaveDialog);
-            AddStep("attempt to save", () => DialogOverlay.CurrentDialog.PerformOkAction());
+            AddStep("attempt to save", () => DialogOverlay.CurrentDialog!.PerformOkAction());
             AddAssert("editor is still current", () => Editor.IsCurrentScreen());
         }
 
diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index 0993a4c05e..d87c091f77 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tournament.Components
         public new Bindable<DateTimeOffset>? Current
         {
             get => current;
-            set => current.Current = value;
+            set => current.Current = value!;
         }
 
         public DateTextBox()
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index e2e541811d..d254945a51 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -70,9 +70,9 @@ namespace osu.Game.Beatmaps
                 throw new NotImplementedException();
             }
 
-            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new DummyBeatmapConverter { Beatmap = beatmap };
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new DummyBeatmapConverter(beatmap);
 
-            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => null;
+            public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => throw new NotImplementedException();
 
             public override string Description => "dummy";
 
@@ -80,9 +80,15 @@ namespace osu.Game.Beatmaps
 
             private class DummyBeatmapConverter : IBeatmapConverter
             {
-                public event Action<HitObject, IEnumerable<HitObject>> ObjectConverted;
+                public IBeatmap Beatmap { get; }
 
-                public IBeatmap Beatmap { get; set; }
+                public DummyBeatmapConverter(IBeatmap beatmap)
+                {
+                    Beatmap = beatmap;
+                }
+
+                [CanBeNull]
+                public event Action<HitObject, IEnumerable<HitObject>> ObjectConverted;
 
                 public bool CanConvert() => true;
 
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index 78eed626f2..2c500146c5 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Beatmaps
 
         public event Action<WorkingBeatmap> OnInvalidated;
 
-        public virtual WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo)
+        public virtual WorkingBeatmap GetWorkingBeatmap([CanBeNull] BeatmapInfo beatmapInfo)
         {
             if (beatmapInfo?.BeatmapSet == null)
                 return DefaultBeatmap;
diff --git a/osu.Game/Graphics/Backgrounds/SkinBackground.cs b/osu.Game/Graphics/Backgrounds/SkinBackground.cs
index 17af5e6991..23806ae1d4 100644
--- a/osu.Game/Graphics/Backgrounds/SkinBackground.cs
+++ b/osu.Game/Graphics/Backgrounds/SkinBackground.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Graphics.Backgrounds
             Sprite.Texture = skin.GetTexture("menu-background") ?? Sprite.Texture;
         }
 
-        public override bool Equals(Background other)
+        public override bool Equals(Background? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 27ff6b851d..9f41c4eff2 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -119,11 +119,11 @@ namespace osu.Game.Graphics.Containers
                 headerBackgroundContainer.Clear();
                 headerBackground = value;
 
-                if (value == null) return;
-
-                headerBackgroundContainer.Add(headerBackground);
-
-                lastKnownScroll = null;
+                if (headerBackground != null)
+                {
+                    headerBackgroundContainer.Add(headerBackground);
+                    lastKnownScroll = null;
+                }
             }
         }
 
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index e5f5f97eb7..191a7ca246 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Graphics.UserInterface
             if (!PlaySamplesOnAdjust)
                 return;
 
-            if (Clock == null || Clock.CurrentTime - lastSampleTime <= 30)
+            if (Clock.CurrentTime - lastSampleTime <= 30)
                 return;
 
             if (value.Equals(lastSampleValue))
diff --git a/osu.Game/IO/FileInfo.cs b/osu.Game/IO/FileInfo.cs
index 3d32e7fb6d..b8a7f363e0 100644
--- a/osu.Game/IO/FileInfo.cs
+++ b/osu.Game/IO/FileInfo.cs
@@ -13,7 +13,7 @@ namespace osu.Game.IO
 
         public bool IsManaged => ID > 0;
 
-        public string Hash { get; set; }
+        public string Hash { get; set; } = string.Empty;
 
         public int ReferenceCount { get; set; }
     }
diff --git a/osu.Game/Online/API/Requests/Responses/APIUser.cs b/osu.Game/Online/API/Requests/Responses/APIUser.cs
index e63395fe26..d9208d0662 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUser.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Online.API.Requests.Responses
         public DateTimeOffset JoinDate;
 
         [JsonProperty(@"username")]
-        public string Username { get; set; }
+        public string Username { get; set; } = string.Empty;
 
         [JsonProperty(@"previous_usernames")]
         public string[] PreviousUsernames;
diff --git a/osu.Game/Online/Placeholders/MessagePlaceholder.cs b/osu.Game/Online/Placeholders/MessagePlaceholder.cs
index bef889a576..b4a9c2086b 100644
--- a/osu.Game/Online/Placeholders/MessagePlaceholder.cs
+++ b/osu.Game/Online/Placeholders/MessagePlaceholder.cs
@@ -22,6 +22,6 @@ namespace osu.Game.Online.Placeholders
             AddText(this.message = message);
         }
 
-        public override bool Equals(Placeholder other) => (other as MessagePlaceholder)?.message == message;
+        public override bool Equals(Placeholder? other) => (other as MessagePlaceholder)?.message == message;
     }
 }
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 7ae5167081..6ee045c492 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays
     public abstract partial class FullscreenOverlay<T> : WaveOverlayContainer, INamedOverlayComponent
         where T : OverlayHeader
     {
-        public virtual string IconTexture => Header.Title.IconTexture ?? string.Empty;
+        public virtual string IconTexture => Header.Title.IconTexture;
         public virtual LocalisableString Title => Header.Title.Title;
         public virtual LocalisableString Description => Header.Title.Description;
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index ab8fd2c662..683eefa8f4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -23,11 +23,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
         /// <summary>
         /// <see cref="ConvertSlider"/>s don't need a curve since they're converted to ruleset-specific hitobjects.
         /// </summary>
-        public SliderPath Path { get; set; }
+        public SliderPath Path { get; set; } = null!;
 
         public double Distance => Path.Distance;
 
-        public IList<IList<HitSampleInfo>> NodeSamples { get; set; }
+        public IList<IList<HitSampleInfo>> NodeSamples { get; set; } = null!;
+
         public int RepeatCount { get; set; }
 
         [JsonIgnore]
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index e34289c968..02c5bbb27e 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -186,7 +186,7 @@ namespace osu.Game.Rulesets.UI
                 this.fallback = fallback;
             }
 
-            public override Texture Get(string name, WrapMode wrapModeS, WrapMode wrapModeT)
+            public override Texture? Get(string name, WrapMode wrapModeS, WrapMode wrapModeT)
                 => primary.Get(name, wrapModeS, wrapModeT) ?? fallback.Get(name, wrapModeS, wrapModeT);
 
             protected override void Dispose(bool disposing)
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
index 14331c1978..3862e2a7e0 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Backgrounds
             AddInternal(new Background(textureName));
         }
 
-        public override bool Equals(BackgroundScreen other)
+        public override bool Equals(BackgroundScreen? other)
         {
             if (other is BackgroundScreenCustom backgroundScreenCustom)
                 return base.Equals(other) && textureName == backgroundScreenCustom.textureName;
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 2dc9d5d49d..490a1ae6b8 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -89,9 +89,9 @@ namespace osu.Game.Screens
 
         public virtual bool? AllowGlobalTrackControl => null;
 
-        public Bindable<WorkingBeatmap> Beatmap { get; private set; }
+        public Bindable<WorkingBeatmap> Beatmap { get; private set; } = null!;
 
-        public Bindable<RulesetInfo> Ruleset { get; private set; }
+        public Bindable<RulesetInfo> Ruleset { get; private set; } = null!;
 
         public Bindable<IReadOnlyList<Mod>> Mods { get; private set; }
 
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 7d69f0ca18..29b2e5229b 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -211,6 +212,7 @@ namespace osu.Game.Screens.Play
 
         public partial class FadeContainer : Container, IStateful<Visibility>
         {
+            [CanBeNull]
             public event Action<Visibility> StateChanged;
 
             private Visibility state;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 2e457f827d..bac84b8134 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -647,7 +647,7 @@ namespace osu.Game.Screens.Select
 
             beginLooping();
 
-            if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
+            if (!Beatmap.Value.BeatmapSetInfo.DeletePending)
             {
                 updateCarouselSelection();
 

From af7180a5b544570cbcaea0c172cf6a2c8e486956 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2023 19:07:03 +0900
Subject: [PATCH 1047/2296] Add `SpinnerSpinHistory` and tests

---
 .../SpinnerSpinHistoryTest.cs                 | 132 +++++++++++++++++
 .../TestSceneSpinnerInput.cs                  |   5 -
 .../Judgements/OsuSpinnerJudgementResult.cs   |  30 ++--
 .../Objects/Drawables/SpinnerSpinHistory.cs   | 138 ++++++++++++++++++
 .../Default/SpinnerRotationTracker.cs         |   8 +-
 5 files changed, 282 insertions(+), 31 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
new file mode 100644
index 0000000000..9fee5382ec
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
@@ -0,0 +1,132 @@
+// 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.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public class SpinnerSpinHistoryTest
+    {
+        private SpinnerSpinHistory history = null!;
+
+        [SetUp]
+        public void Setup()
+        {
+            history = new SpinnerSpinHistory();
+        }
+
+        [TestCase(0, 0)]
+        [TestCase(10, 10)]
+        [TestCase(180, 180)]
+        [TestCase(350, 350)]
+        [TestCase(360, 360)]
+        [TestCase(370, 370)]
+        [TestCase(540, 540)]
+        [TestCase(720, 720)]
+        // ---
+        [TestCase(-0, 0)]
+        [TestCase(-10, 10)]
+        [TestCase(-180, 180)]
+        [TestCase(-350, 350)]
+        [TestCase(-360, 360)]
+        [TestCase(-370, 370)]
+        [TestCase(-540, 540)]
+        [TestCase(-720, 720)]
+        public void TestSpinOneDirection(float spin, float expectedRotation)
+        {
+            history.ReportDelta(500, spin);
+            Assert.That(history.TotalRotation, Is.EqualTo(expectedRotation));
+        }
+
+        [TestCase(0, 0, 0, 0)]
+        // ---
+        [TestCase(10, -10, 0, 10)]
+        [TestCase(-10, 10, 0, 10)]
+        // ---
+        [TestCase(10, -20, 0, 10)]
+        [TestCase(-10, 20, 0, 10)]
+        // ---
+        [TestCase(20, -10, 0, 20)]
+        [TestCase(-20, 10, 0, 20)]
+        // ---
+        [TestCase(10, -360, 0, 350)]
+        [TestCase(-10, 360, 0, 350)]
+        // ---
+        [TestCase(360, -10, 0, 370)]
+        [TestCase(360, 10, 0, 370)]
+        [TestCase(-360, 10, 0, 370)]
+        [TestCase(-360, -10, 0, 370)]
+        // ---
+        [TestCase(10, 10, 10, 30)]
+        [TestCase(10, 10, -10, 20)]
+        [TestCase(10, -10, 10, 10)]
+        [TestCase(-10, -10, -10, 30)]
+        [TestCase(-10, -10, 10, 20)]
+        [TestCase(-10, 10, 10, 10)]
+        // ---
+        [TestCase(10, -20, -350, 360)]
+        [TestCase(10, -20, 350, 340)]
+        [TestCase(-10, 20, 350, 360)]
+        [TestCase(-10, 20, -350, 340)]
+        public void TestSpinMultipleDirections(float spin1, float spin2, float spin3, float expectedRotation)
+        {
+            history.ReportDelta(500, spin1);
+            history.ReportDelta(1000, spin2);
+            history.ReportDelta(1500, spin3);
+            Assert.That(history.TotalRotation, Is.EqualTo(expectedRotation));
+        }
+
+        // One spin
+        [TestCase(370, -50, 320)]
+        [TestCase(-370, 50, 320)]
+        // Two spins
+        [TestCase(740, -420, 320)]
+        [TestCase(-740, 420, 320)]
+        public void TestRemoveAndCrossFullSpin(float deltaToAdd, float deltaToRemove, float expectedRotation)
+        {
+            history.ReportDelta(1000, deltaToAdd);
+            history.ReportDelta(500, deltaToRemove);
+            Assert.That(history.TotalRotation, Is.EqualTo(expectedRotation));
+        }
+
+        // One spin + partial
+        [TestCase(400, -30, -50, 320)]
+        [TestCase(-400, 30, 50, 320)]
+        // Two spins + partial
+        [TestCase(800, -430, -50, 320)]
+        [TestCase(-800, 430, 50, 320)]
+        public void TestRemoveAndCrossFullAndPartialSpins(float deltaToAdd1, float deltaToAdd2, float deltaToRemove, float expectedRotation)
+        {
+            history.ReportDelta(1000, deltaToAdd1);
+            history.ReportDelta(1500, deltaToAdd2);
+            history.ReportDelta(500, deltaToRemove);
+            Assert.That(history.TotalRotation, Is.EqualTo(expectedRotation));
+        }
+
+        [Test]
+        public void TestRewindMultipleFullSpins()
+        {
+            history.ReportDelta(500, 360);
+            history.ReportDelta(1000, 720);
+
+            Assert.That(history.TotalRotation, Is.EqualTo(1080));
+
+            history.ReportDelta(250, -180);
+
+            Assert.That(history.TotalRotation, Is.EqualTo(180));
+        }
+
+        [Test]
+        public void TestRewindIntoSegmentThatHasNotCrossedZero()
+        {
+            history.ReportDelta(1000, -180);
+            history.ReportDelta(1500, 90);
+            history.ReportDelta(2000, 450);
+            history.ReportDelta(1750, -45);
+
+            Assert.That(history.TotalRotation, Is.EqualTo(180));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index c4bf0d4e2e..67c7dbdb66 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -53,7 +53,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// While off-centre, vibrates backwards and forwards on the x-axis, from centre-50 to centre+50, every 50ms.
         /// </summary>
         [Test]
-        [Ignore("An upcoming implementation will fix this case")]
         public void TestVibrateWithoutSpinningOffCentre()
         {
             List<ReplayFrame> frames = new List<ReplayFrame>();
@@ -81,7 +80,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// While centred on the slider, vibrates backwards and forwards on the x-axis, from centre-50 to centre+50, every 50ms.
         /// </summary>
         [Test]
-        [Ignore("An upcoming implementation will fix this case")]
         public void TestVibrateWithoutSpinningOnCentre()
         {
             List<ReplayFrame> frames = new List<ReplayFrame>();
@@ -130,7 +128,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// No ticks should be hit since the total rotation is -0.5 (0.5 CW + 1 CCW = 0.5 CCW).
         /// </summary>
         [Test]
-        [Ignore("An upcoming implementation will fix this case")]
         public void TestSpinHalfBothDirections()
         {
             performTest(new SpinFramesGenerator(time_spinner_start)
@@ -149,7 +146,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(-180, 540, 1)]
         [TestCase(180, -900, 2)]
         [TestCase(-180, 900, 2)]
-        [Ignore("An upcoming implementation will fix this case")]
         public void TestSpinOneDirectionThenChangeDirection(float direction1, float direction2, int expectedTicks)
         {
             performTest(new SpinFramesGenerator(time_spinner_start)
@@ -162,7 +158,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
-        [Ignore("An upcoming implementation will fix this case")]
         public void TestRewind()
         {
             AddStep("set manual clock", () => manualClock = new ManualClock { Rate = 1 });
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
index c5e15d63ea..e8fc1d99bc 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
@@ -4,6 +4,7 @@
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Judgements
 {
@@ -15,28 +16,15 @@ namespace osu.Game.Rulesets.Osu.Judgements
         public Spinner Spinner => (Spinner)HitObject;
 
         /// <summary>
-        /// The total rotation performed on the spinner disc, disregarding the spin direction,
-        /// adjusted for the track's playback rate.
+        /// The total amount that the spinner was rotated.
         /// </summary>
-        /// <remarks>
-        /// <para>
-        /// This value is always non-negative and is monotonically increasing with time
-        /// (i.e. will only increase if time is passing forward, but can decrease during rewind).
-        /// </para>
-        /// <para>
-        /// The rotation from each frame is multiplied by the clock's current playback rate.
-        /// The reason this is done is to ensure that spinners give the same score and require the same number of spins
-        /// regardless of whether speed-modifying mods are applied.
-        /// </para>
-        /// </remarks>
-        /// <example>
-        /// Assuming no speed-modifying mods are active,
-        /// if the spinner is spun 360 degrees clockwise and then 360 degrees counter-clockwise,
-        /// this property will return the value of 720 (as opposed to 0).
-        /// If Double Time is active instead (with a speed multiplier of 1.5x),
-        /// in the same scenario the property will return 720 * 1.5 = 1080.
-        /// </example>
-        public float TotalRotation;
+        public float TotalRotation => History.TotalRotation;
+
+        /// <summary>
+        /// Stores the spinning history of the spinner.<br />
+        /// Instants of movement deltas may be added or removed from this in order to calculate the total rotation for the spinner.
+        /// </summary>
+        public readonly SpinnerSpinHistory History = new SpinnerSpinHistory();
 
         /// <summary>
         /// Time instant at which the spin was started (the first user input which caused an increase in spin).
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
new file mode 100644
index 0000000000..0464ed422f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
@@ -0,0 +1,138 @@
+// 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;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    /// <summary>
+    /// Stores the spinning history of a single spinner.<br />
+    /// Instants of movement deltas may be added or removed from this in order to calculate the total rotation for the spinner.
+    /// </summary>
+    /// <remarks>
+    /// A single, full rotation of the spinner is defined as a 360-degree rotation of the spinner, starting from 0, going in a single direction.<br />
+    /// </remarks>
+    /// <example>
+    /// If the player spins 90-degrees clockwise, then changes direction, they need to spin 90-degrees counter-clockwise to return to 0
+    /// and then continue rotating the spinner for another 360-degrees in the same direction.
+    /// </example>
+    public class SpinnerSpinHistory
+    {
+        /// <summary>
+        /// The sum of all complete spins and any current partial spin, in degrees.
+        /// </summary>
+        /// <remarks>
+        /// This is the final scoring value.
+        /// </remarks>
+        public float TotalRotation => 360 * segments.Count + currentMaxRotation;
+
+        /// <summary>
+        /// The list of all segments where either:
+        /// <list type="bullet">
+        /// <item>The spinning direction was changed.</item>
+        /// <item>A full spin of 360 degrees was performed in either direction.</item>
+        /// </list>
+        /// </summary>
+        private readonly Stack<SpinSegment> segments = new Stack<SpinSegment>();
+
+        /// <summary>
+        /// The total accumulated rotation.
+        /// </summary>
+        private float currentAbsoluteRotation;
+
+        private float lastCompletionAbsoluteRotation;
+
+        /// <summary>
+        /// For the current spin, represents the maximum rotation (from 0..360) achieved by the user.
+        /// </summary>
+        private float currentMaxRotation;
+
+        /// <summary>
+        /// The current spin, from -360..360.
+        /// </summary>
+        private float currentRotation => currentAbsoluteRotation - lastCompletionAbsoluteRotation;
+
+        private double lastReportTime = double.NegativeInfinity;
+
+        /// <summary>
+        /// Report a delta update based on user input.
+        /// </summary>
+        /// <param name="currentTime">The current time.</param>
+        /// <param name="delta">The delta of the angle moved through since the last report.</param>
+        public void ReportDelta(double currentTime, float delta)
+        {
+            // TODO: Debug.Assert(Math.Abs(delta) < 180);
+            // This will require important frame guarantees.
+
+            currentAbsoluteRotation += delta;
+
+            if (currentTime >= lastReportTime)
+                addDelta(currentTime, delta);
+            else
+                rewindDelta(currentTime, delta);
+
+            lastReportTime = currentTime;
+        }
+
+        private void addDelta(double currentTime, float delta)
+        {
+            if (delta == 0)
+                return;
+
+            currentMaxRotation = Math.Max(currentMaxRotation, Math.Abs(currentRotation));
+
+            while (currentMaxRotation >= 360)
+            {
+                int direction = Math.Sign(currentRotation);
+
+                segments.Push(new SpinSegment(currentTime, direction));
+
+                lastCompletionAbsoluteRotation += direction * 360;
+                currentMaxRotation = Math.Abs(currentRotation);
+            }
+        }
+
+        private void rewindDelta(double currentTime, float delta)
+        {
+            while (segments.TryPeek(out var segment) && segment.StartTime > currentTime)
+            {
+                segments.Pop();
+                lastCompletionAbsoluteRotation -= segment.Direction * 360;
+                currentMaxRotation = Math.Abs(currentRotation);
+            }
+
+            currentMaxRotation = Math.Abs(currentRotation);
+        }
+
+        /// <summary>
+        /// Represents a single segment of history.
+        /// </summary>
+        /// <remarks>
+        /// Each time the player changes direction, a new segment is recorded.
+        /// A segment stores the current absolute angle of rotation. Generally this would be either -360 or 360 for a completed spin, or
+        /// a number representing the last incomplete spin.
+        /// </remarks>
+        private class SpinSegment
+        {
+            /// <summary>
+            /// The start time of this segment, when the direction change occurred.
+            /// </summary>
+            public readonly double StartTime;
+
+            /// <summary>
+            /// The direction this segment started in.
+            /// </summary>
+            public readonly int Direction;
+
+            public SpinSegment(double startTime, int direction)
+            {
+                Debug.Assert(direction == -1 || direction == 1);
+
+                StartTime = startTime;
+                Direction = direction;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 69c2bf3dd0..4bdcc4b381 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -101,15 +101,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 rotationTransferred = true;
             }
 
-            currentRotation += delta;
-
             double rate = gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate;
+            delta = (float)(delta * Math.Abs(rate));
 
             Debug.Assert(Math.Abs(delta) <= 180);
 
-            // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
-            // (see: ModTimeRamp)
-            drawableSpinner.Result.TotalRotation += (float)(Math.Abs(delta) * rate);
+            currentRotation += delta;
+            drawableSpinner.Result.History.ReportDelta(Time.Current, delta);
         }
 
         private void resetState(DrawableHitObject obj)

From 9011170c3e4df5ccf26ff762da2972c7f4d0bd0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 20:10:31 +0900
Subject: [PATCH 1048/2296] Adjust tests in line with new expectations

---
 .../SpinnerSpinHistoryTest.cs                 | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
index 9fee5382ec..c20a7bbfd9 100644
--- a/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             Assert.That(history.TotalRotation, Is.EqualTo(1080));
 
-            history.ReportDelta(250, -180);
+            history.ReportDelta(250, -900);
 
             Assert.That(history.TotalRotation, Is.EqualTo(180));
         }
@@ -122,11 +122,27 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestRewindIntoSegmentThatHasNotCrossedZero()
         {
             history.ReportDelta(1000, -180);
-            history.ReportDelta(1500, 90);
-            history.ReportDelta(2000, 450);
-            history.ReportDelta(1750, -45);
-
             Assert.That(history.TotalRotation, Is.EqualTo(180));
+            history.ReportDelta(1500, 90);
+            Assert.That(history.TotalRotation, Is.EqualTo(180));
+            history.ReportDelta(2000, 450);
+            Assert.That(history.TotalRotation, Is.EqualTo(360));
+            history.ReportDelta(1750, -45);
+            Assert.That(history.TotalRotation, Is.EqualTo(315));
+        }
+
+        [Test]
+        public void TestRewindOverDirectionChange()
+        {
+            history.ReportDelta(1000, 40); // max is now CW 40 degrees
+            Assert.That(history.TotalRotation, Is.EqualTo(40));
+            history.ReportDelta(1100, -90); // max is now CCW 50 degrees
+            Assert.That(history.TotalRotation, Is.EqualTo(50));
+            history.ReportDelta(1200, 110); // max is now CW 60 degrees
+            Assert.That(history.TotalRotation, Is.EqualTo(60));
+
+            history.ReportDelta(1000, -20);
+            Assert.That(history.TotalRotation, Is.EqualTo(40));
         }
     }
 }

From 80ac0c46d9895e40171445552551f76ff7f2b118 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 19:12:12 +0900
Subject: [PATCH 1049/2296] Fix final test

This looks to have been a WIP test, so I've brought it up to the point
of passing. I haven't given it much more attention than that, though.
---
 .../TestSceneSpinnerInput.cs                  | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index 67c7dbdb66..662734ddcd 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -162,13 +162,20 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("set manual clock", () => manualClock = new ManualClock { Rate = 1 });
 
-            List<ReplayFrame> frames = new SpinFramesGenerator(time_spinner_start)
-                                       .Spin(360, 500) // 2000ms -> 1 full CW spin
-                                       .Spin(-180, 500) // 2500ms -> 0.5 CCW spins
-                                       .Spin(90, 500) // 3000ms -> 0.25 CW spins
-                                       .Spin(450, 500) // 3500ms -> 1 full CW spin
-                                       .Spin(180, 500) // 4000ms -> 0.5 CW spins
-                                       .Build();
+            List<ReplayFrame> frames =
+                new SpinFramesGenerator(time_spinner_start)
+                    // 1500ms start
+                    .Spin(360, 500)
+                    // 2000ms -> 1 full CW spin
+                    .Spin(-180, 500)
+                    // 2500ms -> 1 full CW spin + 0.5 CCW spins
+                    .Spin(90, 500)
+                    // 3000ms -> 1 full CW spin + 0.25 CCW spins
+                    .Spin(450, 500)
+                    // 3500ms -> 2 full CW spins
+                    .Spin(180, 500)
+                    // 4000ms -> 2 full CW spins + 0.5 CW spins
+                    .Build();
 
             loadPlayer(frames);
 
@@ -189,11 +196,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertTotalRotation(3750, 810);
             assertTotalRotation(3500, 720);
             assertTotalRotation(3250, 530);
-            assertTotalRotation(3000, 540);
+            assertTotalRotation(3000, 450);
             assertTotalRotation(2750, 540);
             assertTotalRotation(2500, 540);
-            assertTotalRotation(2250, 360);
-            assertTotalRotation(2000, 180);
+            assertTotalRotation(2250, 450);
+            assertTotalRotation(2000, 360);
             assertTotalRotation(1500, 0);
 
             void assertTotalRotation(double time, float expected)
@@ -206,7 +213,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             void addSeekStep(double time)
             {
                 AddStep($"seek to {time}", () => clock.Seek(time));
-                AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time));
+                // Lenience is required due to interpolation running slightly ahead on a stalled clock.
+                AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time).Within(40));
             }
         }
 

From 4f0d55e1a900026ee43c678614cedf4598dcd4f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Oct 2023 19:39:15 +0900
Subject: [PATCH 1050/2296] Clean up code and add xmldoc and inline doc

---
 .../Objects/Drawables/SpinnerSpinHistory.cs   | 130 ++++++++++--------
 1 file changed, 69 insertions(+), 61 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
index 0464ed422f..3212ddc1ef 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
@@ -26,33 +26,33 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <remarks>
         /// This is the final scoring value.
         /// </remarks>
-        public float TotalRotation => 360 * segments.Count + currentMaxRotation;
+        public float TotalRotation => 360 * completedSpins.Count + currentSpinMaxRotation;
 
-        /// <summary>
-        /// The list of all segments where either:
-        /// <list type="bullet">
-        /// <item>The spinning direction was changed.</item>
-        /// <item>A full spin of 360 degrees was performed in either direction.</item>
-        /// </list>
-        /// </summary>
-        private readonly Stack<SpinSegment> segments = new Stack<SpinSegment>();
+        private readonly Stack<CompletedSpin> completedSpins = new Stack<CompletedSpin>();
 
         /// <summary>
         /// The total accumulated rotation.
         /// </summary>
-        private float currentAbsoluteRotation;
+        private float totalAbsoluteRotation;
 
-        private float lastCompletionAbsoluteRotation;
+        private float totalAbsoluteRotationsAtLastCompletion;
 
         /// <summary>
-        /// For the current spin, represents the maximum rotation (from 0..360) achieved by the user.
+        /// For the current spin, represents the maximum absolute rotation (from 0..360) achieved by the user.
         /// </summary>
-        private float currentMaxRotation;
+        /// <remarks>
+        /// This is used to report <see cref="TotalRotation"/> in the case a user spins backwards.
+        /// Basically it allows us to not reduce the total rotation in such a case.
+        ///
+        /// This also stops spinner "cheese" where a user may rapidly change directions and cause an increase
+        /// in rotations.
+        /// </remarks>
+        private float currentSpinMaxRotation;
 
         /// <summary>
         /// The current spin, from -360..360.
         /// </summary>
-        private float currentRotation => currentAbsoluteRotation - lastCompletionAbsoluteRotation;
+        private float currentSpinRotation => totalAbsoluteRotation - totalAbsoluteRotationsAtLastCompletion;
 
         private double lastReportTime = double.NegativeInfinity;
 
@@ -63,74 +63,82 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <param name="delta">The delta of the angle moved through since the last report.</param>
         public void ReportDelta(double currentTime, float delta)
         {
-            // TODO: Debug.Assert(Math.Abs(delta) < 180);
-            // This will require important frame guarantees.
+            if (delta == 0)
+                return;
 
-            currentAbsoluteRotation += delta;
+            // Importantly, outside of tests the max delta entering here is 180 degrees.
+            // If it wasn't for tests, we could add this line:
+            //
+            // Debug.Assert(Math.Abs(delta) < 180);
+            //
+            // For this to be 101% correct, we need to add the ability for important frames to be
+            // created based on gameplay intrinsics (ie. there should be one frame for any spinner delta 90 < n < 180 degrees).
+            //
+            // But this can come later.
+
+            totalAbsoluteRotation += delta;
 
             if (currentTime >= lastReportTime)
-                addDelta(currentTime, delta);
+            {
+                currentSpinMaxRotation = Math.Max(currentSpinMaxRotation, Math.Abs(currentSpinRotation));
+
+                // Handle the case where the user has completed another spin.
+                // Note that this does could be an `if` rather than `while` if the above assertion held true.
+                // It is a `while` loop to handle tests which throw larger values at this method.
+                while (currentSpinMaxRotation >= 360)
+                {
+                    int direction = Math.Sign(currentSpinRotation);
+
+                    completedSpins.Push(new CompletedSpin(currentTime, direction));
+
+                    // Incrementing the last completion point will cause `currentSpinRotation` to
+                    // hold the remaining spin that needs to be considered.
+                    totalAbsoluteRotationsAtLastCompletion += direction * 360;
+
+                    // Reset the current max as we are entering a new spin.
+                    // Importantly, carry over the remainder (which is now stored in `currentSpinRotation`).
+                    currentSpinMaxRotation = Math.Abs(currentSpinRotation);
+                }
+            }
             else
-                rewindDelta(currentTime, delta);
+            {
+                // When rewinding, the main thing we care about is getting `totalAbsoluteRotationsAtLastCompletion`
+                // to the correct value. We can used the stored history for this.
+                while (completedSpins.TryPeek(out var segment) && segment.CompletionTime > currentTime)
+                {
+                    completedSpins.Pop();
+                    totalAbsoluteRotationsAtLastCompletion -= segment.Direction * 360;
+                }
+
+                // This is a best effort. We may not have enough data to match this 1:1, but that's okay.
+                // We know that the player is somewhere in a spin.
+                // In the worst case, this will be lower than expected, and recover in forward playback.
+                currentSpinMaxRotation = Math.Abs(currentSpinRotation);
+            }
 
             lastReportTime = currentTime;
         }
 
-        private void addDelta(double currentTime, float delta)
-        {
-            if (delta == 0)
-                return;
-
-            currentMaxRotation = Math.Max(currentMaxRotation, Math.Abs(currentRotation));
-
-            while (currentMaxRotation >= 360)
-            {
-                int direction = Math.Sign(currentRotation);
-
-                segments.Push(new SpinSegment(currentTime, direction));
-
-                lastCompletionAbsoluteRotation += direction * 360;
-                currentMaxRotation = Math.Abs(currentRotation);
-            }
-        }
-
-        private void rewindDelta(double currentTime, float delta)
-        {
-            while (segments.TryPeek(out var segment) && segment.StartTime > currentTime)
-            {
-                segments.Pop();
-                lastCompletionAbsoluteRotation -= segment.Direction * 360;
-                currentMaxRotation = Math.Abs(currentRotation);
-            }
-
-            currentMaxRotation = Math.Abs(currentRotation);
-        }
-
         /// <summary>
-        /// Represents a single segment of history.
+        /// Represents a single completed spin.
         /// </summary>
-        /// <remarks>
-        /// Each time the player changes direction, a new segment is recorded.
-        /// A segment stores the current absolute angle of rotation. Generally this would be either -360 or 360 for a completed spin, or
-        /// a number representing the last incomplete spin.
-        /// </remarks>
-        private class SpinSegment
+        private class CompletedSpin
         {
             /// <summary>
-            /// The start time of this segment, when the direction change occurred.
+            /// The time at which this spin completion occurred.
             /// </summary>
-            public readonly double StartTime;
+            public readonly double CompletionTime;
 
             /// <summary>
-            /// The direction this segment started in.
+            /// The direction this spin completed in.
             /// </summary>
             public readonly int Direction;
 
-            public SpinSegment(double startTime, int direction)
+            public CompletedSpin(double completionTime, int direction)
             {
                 Debug.Assert(direction == -1 || direction == 1);
 
-                StartTime = startTime;
+                CompletionTime = completionTime;
                 Direction = direction;
             }
         }

From 08845ec1c691df95d457860112186b5cccb45a1d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 17 Oct 2023 20:15:00 +0900
Subject: [PATCH 1051/2296] Use action for GHA diffcalc workflow permissions
 check

---
 .github/workflows/diffcalc.yml | 49 +++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 5fde6e2f1a..d39dffc4b9 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -14,8 +14,8 @@
 #
 # The workflow can be run in two ways:
 # 1. Via workflow dispatch.
-# 2. By an owner of the repository posting a pull request or issue comment containing `!diffcalc`.  
-# For pull requests, the workflow will assume the pull request as the target to compare against (i.e. the `OSU_B` variable).  
+# 2. By an owner of the repository posting a pull request or issue comment containing `!diffcalc`.
+# For pull requests, the workflow will assume the pull request as the target to compare against (i.e. the `OSU_B` variable).
 # Any lines in the comment of the form `KEY=VALUE` are treated as variables for the generator.
 #
 # ## Google Service Account
@@ -104,21 +104,22 @@ env:
   COMMENT_TAG: execution-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
 
 jobs:
-  wait-for-queue:
-    name: "Wait for previous workflows"
+  check-permissions:
+    name: Check permissions
     runs-on: ubuntu-latest
-    if: ${{ !cancelled() && (github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER') }}
-    timeout-minutes: 50400 # 35 days, the maximum for jobs.
+    if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') }}
     steps:
-      - uses: ahmadnassri/action-workflow-queue@v1
+      - name: Check permissions
+        if: ${{ github.event_name != 'workflow_dispatch' }}
+        uses: actions-cool/check-user-permission@v2
         with:
-          timeout: 2147483647 # Around 24 days, maximum supported.
-          delay: 120000 # Poll every 2 minutes. API seems fairly low on this one.
+          require: 'write'
 
   create-comment:
     name: Create PR comment
+    needs: check-permissions
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER' }}
+    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
     steps:
       - name: Create comment
         uses: thollander/actions-comment-pull-request@v2
@@ -129,11 +130,21 @@ jobs:
 
             *This comment will update on completion*
 
+  wait-for-queue:
+    name: "Wait for previous workflows"
+    needs: check-permissions
+    runs-on: ubuntu-latest
+    timeout-minutes: 50400 # 35 days, the maximum for jobs.
+    steps:
+      - uses: ahmadnassri/action-workflow-queue@v1
+        with:
+          timeout: 2147483647 # Around 24 days, maximum supported.
+          delay: 120000 # Poll every 2 minutes. API seems fairly low on this one.
+
   directory:
     name: Prepare directory
     needs: wait-for-queue
     runs-on: self-hosted
-    if: ${{ !cancelled() && (github.event_name == 'workflow_dispatch' || contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER') }}
     outputs:
       GENERATOR_DIR: ${{ steps.set-outputs.outputs.GENERATOR_DIR }}
       GENERATOR_ENV: ${{ steps.set-outputs.outputs.GENERATOR_ENV }}
@@ -159,7 +170,6 @@ jobs:
     name: Setup environment
     needs: directory
     runs-on: self-hosted
-    if: ${{ !cancelled() && needs.directory.result == 'success' }}
     env:
       VARS_JSON: ${{ toJSON(vars) }}
     steps:
@@ -239,7 +249,6 @@ jobs:
     name: Setup scores
     needs: [ directory, environment ]
     runs-on: self-hosted
-    if: ${{ !cancelled() && needs.environment.result == 'success' }}
     steps:
       - name: Query latest data
         id: query
@@ -272,7 +281,6 @@ jobs:
     name: Setup beatmaps
     needs: directory
     runs-on: self-hosted
-    if: ${{ !cancelled() && needs.directory.result == 'success' }}
     steps:
       - name: Query latest data
         id: query
@@ -305,7 +313,6 @@ jobs:
     needs: [ directory, environment, scores, beatmaps ]
     runs-on: self-hosted
     timeout-minutes: 720
-    if: ${{ !cancelled() && needs.scores.result == 'success' && needs.beatmaps.result == 'success' }}
     outputs:
       TARGET: ${{ steps.run.outputs.TARGET }}
       SPREADSHEET_LINK: ${{ steps.run.outputs.SPREADSHEET_LINK }}
@@ -331,17 +338,21 @@ jobs:
           cd "${{ needs.directory.outputs.GENERATOR_DIR }}"
           docker-compose down
 
+  output-cli:
+    name: Output info
+    needs: generator
+    runs-on: ubuntu-latest
+    steps:
       - name: Output info
-        if: ${{ success() }}
         run: |
-          echo "Target: ${{ steps.run.outputs.TARGET }}"
-          echo "Spreadsheet: ${{ steps.run.outputs.SPREADSHEET_LINK }}"
+          echo "Target: ${{ needs.generator.outputs.TARGET }}"
+          echo "Spreadsheet: ${{ needs.generator.outputs.SPREADSHEET_LINK }}"
 
   update-comment:
     name: Update PR comment
     needs: [ create-comment, generator ]
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '!diffcalc') && github.event.comment.author_association == 'OWNER' }}
+    if: ${{ needs.create-comment.result == 'success' }}
     steps:
       - name: Update comment on success
         if: ${{ needs.generator.result == 'success' }}

From 566b09ff208feb6625ec4a52324f1b9f8770eac0 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 17 Oct 2023 20:36:24 +0900
Subject: [PATCH 1052/2296] Delete comment on cancellation

- Add always() pre-condition to force evaluation.

- Message is set as it's required by the action for a non-error status code.
---
 .github/workflows/diffcalc.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index d39dffc4b9..a8dc16af15 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -352,7 +352,7 @@ jobs:
     name: Update PR comment
     needs: [ create-comment, generator ]
     runs-on: ubuntu-latest
-    if: ${{ needs.create-comment.result == 'success' }}
+    if: ${{ always() && needs.create-comment.result == 'success' }}
     steps:
       - name: Update comment on success
         if: ${{ needs.generator.result == 'success' }}
@@ -374,3 +374,11 @@ jobs:
           create_if_not_exists: false
           message: |
             Difficulty calculation failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+      - name: Update comment on cancellation
+        if: ${{ needs.generator.result == 'cancelled' }}
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: ${{ env.COMMENT_TAG }}
+          mode: delete
+          message: '.' # Appears to be required by this action for non-error status code.

From 4946b437c9c5c639cfc9ea6a27aa3919ed33c250 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 17 Oct 2023 20:58:09 +0900
Subject: [PATCH 1053/2296] Run timeout job on self-hosted runner

---
 .github/workflows/diffcalc.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index a8dc16af15..c3d92b6d1f 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -133,13 +133,13 @@ jobs:
   wait-for-queue:
     name: "Wait for previous workflows"
     needs: check-permissions
-    runs-on: ubuntu-latest
-    timeout-minutes: 50400 # 35 days, the maximum for jobs.
+    runs-on: self-hosted
+    timeout-minutes: 50400 # 35 days, the maximum for jobs on self-hosted runners.
     steps:
       - uses: ahmadnassri/action-workflow-queue@v1
         with:
-          timeout: 2147483647 # Around 24 days, maximum supported.
-          delay: 120000 # Poll every 2 minutes. API seems fairly low on this one.
+          timeout: 2147483647 # Around 24 days - the maximum supported by JS setTimeout().
+          delay: 120000 # Poll every 2 minutes - the API limit seems fairly low on this one.
 
   directory:
     name: Prepare directory

From f116854c9fed7d6318ceb4021e0e99a62fbe58a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 14:15:17 +0200
Subject: [PATCH 1054/2296] Add test step for covering slider appearance with
 hidden active

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index e005d7cac3..b805e7ed63 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -27,6 +27,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Configuration;
+using osu.Game.Rulesets.Osu.Mods;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -50,6 +51,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 snakingOut.Value = !v;
             });
 
+            AddToggleStep("toggle hidden", hiddenActive => SelectedMods.Value = hiddenActive ? new[] { new OsuModHidden() } : Array.Empty<Mod>());
+
             AddSliderStep("hit at", 0f, 1f, 0f, v =>
             {
                 progressToHit = v;

From 30e5f470073399be071a7e947f6331c8056d3770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 13:39:52 +0200
Subject: [PATCH 1055/2296] Instantly fade out slider repeats when hidden is
 active

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 996ee1cddb..dd2befef4e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -98,6 +98,9 @@ namespace osu.Game.Rulesets.Osu.Mods
                         // only apply to circle piece – reverse arrow is not affected by hidden.
                         sliderRepeat.CirclePiece.FadeOut(fadeDuration);
 
+                    using (drawableObject.BeginAbsoluteSequence(drawableObject.HitStateUpdateTime))
+                        sliderRepeat.FadeOut();
+
                     break;
 
                 case DrawableHitCircle circle:

From f3cda5847448fa037b8739cf28815ebda4be0c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Oct 2023 14:33:57 +0200
Subject: [PATCH 1056/2296] Fix legacy slider repeats becoming much too large
 on hit

They had scale transforms applied to them in two places: the actual
legacy pieces themselves (esp. `LegacyHitCirclePiece`), and on the
`DrawableSliderRepeat` level.

This change moves all of the scale transforms to the skinnable pieces.
Argon and triangles have received a copy of the previous logic each,
so behaviour on those skins should not change.
---
 .../Objects/Drawables/DrawableSliderRepeat.cs |  5 ----
 .../Skinning/Argon/ArgonReverseArrow.cs       | 22 ++++++++++-----
 .../Skinning/Default/DefaultReverseArrow.cs   | 19 +++++++++----
 .../Skinning/Legacy/LegacyReverseArrow.cs     | 28 +++++++++++--------
 4 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index ac4d733672..0be571c229 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -118,11 +118,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                 case ArmedState.Hit:
                     this.FadeOut(animDuration, Easing.Out);
-
-                    const float final_scale = 1.5f;
-
-                    Arrow.ScaleTo(Scale * final_scale, animDuration, Easing.Out);
-                    CirclePiece.ScaleTo(Scale * final_scale, animDuration, Easing.Out);
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index 160edb6f67..87b89a07cf 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -12,6 +13,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
@@ -19,8 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
     public partial class ArgonReverseArrow : CompositeDrawable
     {
-        [Resolved]
-        private DrawableHitObject drawableObject { get; set; } = null!;
+        private DrawableSliderRepeat drawableRepeat { get; set; } = null!;
 
         private Bindable<Color4> accentColour = null!;
 
@@ -29,8 +30,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         private Sprite side = null!;
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        private void load(DrawableHitObject drawableObject, TextureStore textures)
         {
+            drawableRepeat = (DrawableSliderRepeat)drawableObject;
+
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
@@ -70,10 +73,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 }
             };
 
-            accentColour = drawableObject.AccentColour.GetBoundCopy();
+            accentColour = drawableRepeat.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4), true);
 
-            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
+            drawableRepeat.ApplyCustomUpdateState += updateStateTransforms;
         }
 
         private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
@@ -96,6 +99,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                         .MoveToX(0, move_in_duration, Easing.Out)
                         .Loop(total - (move_in_duration + move_out_duration));
                     break;
+
+                case ArmedState.Hit:
+                    double animDuration = Math.Min(300, drawableRepeat.HitObject.SpanDuration);
+                    this.ScaleTo(1.5f, animDuration, Easing.Out);
+                    break;
             }
         }
 
@@ -103,8 +111,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         {
             base.Dispose(isDisposing);
 
-            if (drawableObject.IsNotNull())
-                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+            if (drawableRepeat.IsNotNull())
+                drawableRepeat.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
index b44f6571b9..ad49150d81 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultReverseArrow.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 osu.Framework.Allocation;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
@@ -8,14 +9,14 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public partial class DefaultReverseArrow : CompositeDrawable
     {
-        [Resolved]
-        private DrawableHitObject drawableObject { get; set; } = null!;
+        private DrawableSliderRepeat drawableRepeat { get; set; } = null!;
 
         public DefaultReverseArrow()
         {
@@ -36,9 +37,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(DrawableHitObject drawableObject)
         {
-            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
+            drawableRepeat = (DrawableSliderRepeat)drawableObject;
+            drawableRepeat.ApplyCustomUpdateState += updateStateTransforms;
         }
 
         private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
@@ -55,6 +57,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                                  .ScaleTo(1f, move_in_duration, Easing.Out)
                                  .Loop(total - (move_in_duration + move_out_duration));
                     break;
+
+                case ArmedState.Hit:
+                    double animDuration = Math.Min(300, drawableRepeat.HitObject.SpanDuration);
+                    InternalChild.ScaleTo(1.5f, animDuration, Easing.Out);
+                    break;
             }
         }
 
@@ -62,8 +69,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         {
             base.Dispose(isDisposing);
 
-            if (drawableObject.IsNotNull())
-                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+            if (drawableRepeat.IsNotNull())
+                drawableRepeat.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index 9048a92e13..a535fbdbc3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -17,8 +18,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public partial class LegacyReverseArrow : CompositeDrawable
     {
-        [Resolved]
-        private DrawableHitObject drawableObject { get; set; } = null!;
+        private DrawableSliderRepeat drawableRepeat { get; set; } = null!;
 
         private Drawable proxy = null!;
 
@@ -31,8 +31,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private bool shouldRotate;
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skinSource)
+        private void load(DrawableHitObject drawableObject, ISkinSource skinSource)
         {
+            drawableRepeat = (DrawableSliderRepeat)drawableObject;
+
             AutoSizeAxes = Axes.Both;
 
             string lookupName = new OsuSkinComponentLookup(OsuSkinComponents.ReverseArrow).LookupName;
@@ -58,10 +60,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             proxy = CreateProxy();
 
-            drawableObject.HitObjectApplied += onHitObjectApplied;
-            onHitObjectApplied(drawableObject);
+            drawableRepeat.HitObjectApplied += onHitObjectApplied;
+            onHitObjectApplied(drawableRepeat);
 
-            accentColour = drawableObject.AccentColour.GetBoundCopy();
+            accentColour = drawableRepeat.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(c =>
             {
                 arrow.Colour = textureIsDefaultSkin && c.NewValue.R + c.NewValue.G + c.NewValue.B > (600 / 255f) ? Color4.Black : Color4.White;
@@ -73,8 +75,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             Debug.Assert(proxy.Parent == null);
 
             // see logic in LegacySliderHeadHitCircle.
-            (drawableObject as DrawableSliderRepeat)?.DrawableSlider
-                                                    .OverlayElementContainer.Add(proxy);
+            drawableRepeat.DrawableSlider.OverlayElementContainer.Add(proxy);
         }
 
         private void updateStateTransforms(DrawableHitObject hitObject, ArmedState state)
@@ -102,6 +103,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     }
 
                     break;
+
+                case ArmedState.Hit:
+                    double animDuration = Math.Min(300, drawableRepeat.HitObject.SpanDuration);
+                    InternalChild.ScaleTo(1.4f, animDuration, Easing.Out);
+                    break;
             }
         }
 
@@ -109,10 +115,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.Dispose(isDisposing);
 
-            if (drawableObject.IsNotNull())
+            if (drawableRepeat.IsNotNull())
             {
-                drawableObject.HitObjectApplied -= onHitObjectApplied;
-                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+                drawableRepeat.HitObjectApplied -= onHitObjectApplied;
+                drawableRepeat.ApplyCustomUpdateState -= updateStateTransforms;
             }
         }
     }

From 1a3a81c33b82ce881a33b5635a987c31cfe960cb Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 17 Oct 2023 21:41:00 -0700
Subject: [PATCH 1057/2296] Add slider nub double click revert to default test

---
 .../TestSceneRoundedSliderBar.cs              | 59 +++++++++++++++++++
 .../TestSceneShearedSliderBar.cs              | 26 +++++++-
 2 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
new file mode 100644
index 0000000000..419e88137c
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public partial class TestSceneRoundedSliderBar : OsuManualInputManagerTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private readonly BindableDouble current = new BindableDouble(5)
+        {
+            Precision = 0.1f,
+            MinValue = 0,
+            MaxValue = 15
+        };
+
+        private RoundedSliderBar<double> slider = null!;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = slider = new RoundedSliderBar<double>
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Current = current,
+                RelativeSizeAxes = Axes.X,
+                Width = 0.4f
+            };
+        }
+
+        [Test]
+        public void TestNubDoubleClickRevertToDefault()
+        {
+            AddStep("set slider to 1", () => slider.Current.Value = 1);
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(slider.ChildrenOfType<Nub>().Single()));
+
+            AddStep("double click nub", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("slider is default", () => slider.Current.IsDefault);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
index 766f22d867..d459a2c701 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
@@ -1,15 +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.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public partial class TestSceneShearedSliderBar : OsuTestScene
+    public partial class TestSceneShearedSliderBar : OsuManualInputManagerTestScene
     {
         [Cached]
         private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Purple);
@@ -21,10 +25,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             MaxValue = 15
         };
 
+        private ShearedSliderBar<double> slider = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new ShearedSliderBar<double>
+            Child = slider = new ShearedSliderBar<double>
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -33,5 +39,21 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Width = 0.4f
             };
         }
+
+        [Test]
+        public void TestNubDoubleClickRevertToDefault()
+        {
+            AddStep("set slider to 1", () => slider.Current.Value = 1);
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(slider.ChildrenOfType<ShearedNub>().Single()));
+
+            AddStep("double click nub", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("slider is default", () => slider.Current.IsDefault);
+        }
     }
 }

From 18e8ca624554386bb408cacbebb6b0c7dd937b9f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 17 Oct 2023 21:37:38 -0700
Subject: [PATCH 1058/2296] Add ability to revert slider settings to default
 when double-clicking nub

---
 .../Graphics/UserInterface/RoundedSliderBar.cs | 18 ++++++++++++++++--
 osu.Game/Graphics/UserInterface/ShearedNub.cs  | 11 +++++++++++
 .../Graphics/UserInterface/ShearedSliderBar.cs |  3 ++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
index 56af23ff10..e5976fe893 100644
--- a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
@@ -93,11 +93,12 @@ namespace osu.Game.Graphics.UserInterface
                 nubContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = Nub = new Nub
+                    Child = Nub = new SliderNub
                     {
                         Origin = Anchor.TopCentre,
                         RelativePositionAxes = Axes.X,
-                        Current = { Value = true }
+                        Current = { Value = true },
+                        OnDoubleClicked = () => Current.SetDefault(),
                     },
                 },
                 hoverClickSounds = new HoverClickSounds()
@@ -166,5 +167,18 @@ namespace osu.Game.Graphics.UserInterface
         {
             Nub.MoveToX(value, 250, Easing.OutQuint);
         }
+
+        public partial class SliderNub : Nub
+        {
+            public Action? OnDoubleClicked { get; init; }
+
+            protected override bool OnClick(ClickEvent e) => true;
+
+            protected override bool OnDoubleClick(DoubleClickEvent e)
+            {
+                OnDoubleClicked?.Invoke();
+                return true;
+            }
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/ShearedNub.cs b/osu.Game/Graphics/UserInterface/ShearedNub.cs
index 3a09fd7445..7485f68525 100644
--- a/osu.Game/Graphics/UserInterface/ShearedNub.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedNub.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
@@ -18,6 +19,8 @@ namespace osu.Game.Graphics.UserInterface
 {
     public partial class ShearedNub : Container, IHasCurrentValue<bool>, IHasAccentColour
     {
+        public Action? OnDoubleClicked { get; init; }
+
         protected const float BORDER_WIDTH = 3;
 
         public const int HEIGHT = 30;
@@ -179,5 +182,13 @@ namespace osu.Game.Graphics.UserInterface
                 main.TransformTo(nameof(BorderThickness), BORDER_WIDTH, duration, Easing.OutQuint);
             }
         }
+
+        protected override bool OnClick(ClickEvent e) => true;
+
+        protected override bool OnDoubleClick(DoubleClickEvent e)
+        {
+            OnDoubleClicked?.Invoke();
+            return true;
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs b/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
index a18a6a259c..9ef5f3073a 100644
--- a/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
@@ -100,7 +100,8 @@ namespace osu.Game.Graphics.UserInterface
                         X = -SHEAR.X * HEIGHT / 2f,
                         Origin = Anchor.TopCentre,
                         RelativePositionAxes = Axes.X,
-                        Current = { Value = true }
+                        Current = { Value = true },
+                        OnDoubleClicked = () => Current.SetDefault(),
                     },
                 },
                 hoverClickSounds = new HoverClickSounds()

From 7479830a8ea8b21b8c6517354f35ce3fa4ddb0ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 16:26:32 +0900
Subject: [PATCH 1059/2296] Comment flaky tests for now

Same issue as other commented test (clock precision not high enough).

Will probably want a solution to this at some point.
---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 9e83ca428b..7f81ccddf6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(80, 1)]
         [TestCase(80, 0)]
         [TestCase(80, 10)]
-        [TestCase(90, 1)]
+        // [TestCase(90, 1)] flaky
         public void TestVeryShortSlider(float sliderLength, int repeatCount)
         {
             Slider slider;
@@ -87,8 +87,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(300, false)]
         [TestCase(200, true)]
         [TestCase(150, true)]
-        [TestCase(120, true)]
-        [TestCase(60, true)]
+        // [TestCase(120, true)] flaky
+        // [TestCase(60, true)] flaky
         [TestCase(10, true)]
         // [TestCase(0, true)] headless test doesn't run at high enough precision for this to always enter a tracking state in time.
         [TestCase(-30, false)]

From 43238b0cee94f28ff6b8abebb7f4bfcbbc134f93 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 16:55:27 +0900
Subject: [PATCH 1060/2296] Split common functionality from rate adjust mods
 into helper class

---
 osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs    | 20 +++-------
 osu.Game/Rulesets/Mods/ModDaycore.cs          |  1 -
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       | 20 +++-------
 osu.Game/Rulesets/Mods/ModHalfTime.cs         | 20 +++-------
 osu.Game/Rulesets/Mods/ModNightcore.cs        | 40 +++++++++----------
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         | 20 ++--------
 osu.Game/Rulesets/Mods/RateAdjustModHelper.cs | 36 +++++++++++++++++
 7 files changed, 74 insertions(+), 83 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/RateAdjustModHelper.cs

diff --git a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
index f62ba21827..f122baed90 100644
--- a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
+++ b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
@@ -71,7 +71,6 @@ namespace osu.Game.Rulesets.Mods
         // Apply a fixed rate change when missing, allowing the player to catch up when the rate is too fast.
         private const double rate_change_on_miss = 0.95d;
 
-        private IAdjustableAudioComponent? track;
         private double targetRate = 1d;
 
         /// <summary>
@@ -123,24 +122,26 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         private readonly Dictionary<HitObject, double> ratesForRewinding = new Dictionary<HitObject, double>();
 
+        private readonly RateAdjustModHelper rateAdjustHelper;
+
         public ModAdaptiveSpeed()
         {
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+
             InitialRate.BindValueChanged(val =>
             {
                 SpeedChange.Value = val.NewValue;
                 targetRate = val.NewValue;
             });
-            AdjustPitch.BindValueChanged(adjustPitchChanged);
         }
 
         public void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            this.track = track;
-
             InitialRate.TriggerChange();
-            AdjustPitch.TriggerChange();
             recentRates.Clear();
             recentRates.AddRange(Enumerable.Repeat(InitialRate.Value, recent_rate_count));
+
+            rateAdjustHelper.ApplyToTrack(track);
         }
 
         public void ApplyToSample(IAdjustableAudioComponent sample)
@@ -199,15 +200,6 @@ namespace osu.Game.Rulesets.Mods
             }
         }
 
-        private void adjustPitchChanged(ValueChangedEvent<bool> adjustPitchSetting)
-        {
-            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
-            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
-        }
-
-        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
-            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
-
         private IEnumerable<HitObject> getAllApplicableHitObjects(IEnumerable<HitObject> hitObjects)
         {
             foreach (var hitObject in hitObjects)
diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index c5810cc9e5..60ce610d7d 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Rulesets.Mods
 
         public override void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
             track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index df17f4f963..938c6268e2 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -27,29 +27,19 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        private IAdjustableAudioComponent? track;
-
         [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
-        public virtual BindableBool AdjustPitch { get; } = new BindableBool(false);
+        public virtual BindableBool AdjustPitch { get; } = new BindableBool();
+
+        private readonly RateAdjustModHelper rateAdjustHelper;
 
         protected ModDoubleTime()
         {
-            AdjustPitch.BindValueChanged(adjustPitchChanged);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
         }
 
-        private void adjustPitchChanged(ValueChangedEvent<bool> adjustPitchSetting)
-        {
-            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
-            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
-        }
-
-        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
-            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
-
         public override void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            this.track = track;
-            AdjustPitch.TriggerChange();
+            rateAdjustHelper.ApplyToTrack(track);
         }
 
         public override double ScoreMultiplier
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 390d07d3ee..965e94efcb 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -27,29 +27,19 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        private IAdjustableAudioComponent? track;
-
         [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
-        public virtual BindableBool AdjustPitch { get; } = new BindableBool(false);
+        public virtual BindableBool AdjustPitch { get; } = new BindableBool();
+
+        private readonly RateAdjustModHelper rateAdjustHelper;
 
         protected ModHalfTime()
         {
-            AdjustPitch.BindValueChanged(adjustPitchChanged);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
         }
 
-        private void adjustPitchChanged(ValueChangedEvent<bool> adjustPitchSetting)
-        {
-            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
-            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
-        }
-
-        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
-            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
-
         public override void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            this.track = track;
-            AdjustPitch.TriggerChange();
+            rateAdjustHelper.ApplyToTrack(track);
         }
 
         public override double ScoreMultiplier
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 80b9314aec..520ee6319a 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -36,27 +36,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        public override double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(SpeedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                // Each 0.1 multiple changes score multiplier by 0.02.
-                value /= 5;
-
-                return 1 + value;
-            }
-        }
-    }
-
-    public abstract partial class ModNightcore<TObject> : ModNightcore, IApplicableToDrawableRuleset<TObject>
-        where TObject : HitObject
-    {
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
         private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
 
@@ -71,11 +50,28 @@ namespace osu.Game.Rulesets.Mods
 
         public override void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            // base.ApplyToTrack() intentionally not called (different tempo adjustment is applied)
             track.AddAdjustment(AdjustableProperty.Frequency, freqAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
 
+        public override double ScoreMultiplier
+        {
+            get
+            {
+                // Round to the nearest multiple of 0.1.
+                double value = (int)(SpeedChange.Value * 10) / 10.0;
+
+                // Offset back to 0.
+                value -= 1;
+
+                return 1 + value;
+            }
+        }
+    }
+
+    public abstract partial class ModNightcore<TObject> : ModNightcore, IApplicableToDrawableRuleset<TObject>
+        where TObject : HitObject
+    {
         public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
         {
             drawableRuleset.Overlays.Add(new NightcoreBeatContainer());
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 54ee0cd3bf..1048caa698 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -44,21 +44,20 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        private IAdjustableAudioComponent? track;
+        private readonly RateAdjustModHelper rateAdjustHelper;
 
         protected ModTimeRamp()
         {
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+
             // for preview purpose at song select. eventually we'll want to be able to update every frame.
             FinalRate.BindValueChanged(_ => applyRateAdjustment(double.PositiveInfinity), true);
-            AdjustPitch.BindValueChanged(applyPitchAdjustment);
         }
 
         public void ApplyToTrack(IAdjustableAudioComponent track)
         {
-            this.track = track;
-
+            rateAdjustHelper.ApplyToTrack(track);
             FinalRate.TriggerChange();
-            AdjustPitch.TriggerChange();
         }
 
         public void ApplyToSample(IAdjustableAudioComponent sample)
@@ -95,16 +94,5 @@ namespace osu.Game.Rulesets.Mods
         /// Adjust the rate along the specified ramp.
         /// </summary>
         private void applyRateAdjustment(double time) => SpeedChange.Value = ApplyToRate(time);
-
-        private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
-        {
-            // remove existing old adjustment
-            track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
-
-            track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
-        }
-
-        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
-            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
new file mode 100644
index 0000000000..a54be77338
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
@@ -0,0 +1,36 @@
+// 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;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public class RateAdjustModHelper : IApplicableToTrack
+    {
+        private readonly BindableBool? adjustPitch;
+        private IAdjustableAudioComponent? track;
+
+        public RateAdjustModHelper(BindableNumber<double> speedChange, BindableBool? adjustPitch)
+        {
+            this.adjustPitch = adjustPitch;
+
+            // When switching between pitch adjust, we need to update adjustments to time-shift or frequency-scale.
+            adjustPitch?.BindValueChanged(adjustPitchSetting =>
+            {
+                track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), speedChange);
+                track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), speedChange);
+
+                AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
+                    => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
+            });
+        }
+
+        public void ApplyToTrack(IAdjustableAudioComponent track)
+        {
+            this.track = track;
+
+            adjustPitch?.TriggerChange();
+        }
+    }
+}

From e56ff33271932eeda3776034562af8a91b05b178 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 17:23:14 +0900
Subject: [PATCH 1061/2296] Also share `ScoreMultiplier` implementation

---
 osu.Game/Rulesets/Mods/ModDaycore.cs          | 17 +++----------
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       | 17 +------------
 osu.Game/Rulesets/Mods/ModHalfTime.cs         | 14 +----------
 osu.Game/Rulesets/Mods/ModNightcore.cs        | 18 ++++---------
 osu.Game/Rulesets/Mods/RateAdjustModHelper.cs | 25 +++++++++++++++++--
 5 files changed, 34 insertions(+), 57 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index 60ce610d7d..0b32788bf3 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -27,9 +27,12 @@ namespace osu.Game.Rulesets.Mods
 
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
         private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
+        private readonly RateAdjustModHelper rateAdjustHelper;
 
         protected ModDaycore()
         {
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+
             SpeedChange.BindValueChanged(val =>
             {
                 freqAdjust.Value = SpeedChange.Default;
@@ -43,18 +46,6 @@ namespace osu.Game.Rulesets.Mods
             track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
 
-        public override double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(SpeedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                return 1 + value;
-            }
-        }
+        public override double ScoreMultiplier => rateAdjustHelper.ScoreMultiplier;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index 938c6268e2..f20cdcb18d 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -42,21 +42,6 @@ namespace osu.Game.Rulesets.Mods
             rateAdjustHelper.ApplyToTrack(track);
         }
 
-        public override double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(SpeedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                // Each 0.1 multiple changes score multiplier by 0.02.
-                value /= 5;
-
-                return 1 + value;
-            }
-        }
+        public override double ScoreMultiplier => rateAdjustHelper.ScoreMultiplier;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 965e94efcb..4d75ee16bd 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -42,18 +42,6 @@ namespace osu.Game.Rulesets.Mods
             rateAdjustHelper.ApplyToTrack(track);
         }
 
-        public override double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(SpeedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                return 1 + value;
-            }
-        }
+        public override double ScoreMultiplier => rateAdjustHelper.ScoreMultiplier;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 520ee6319a..933c9c9fc5 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -39,8 +39,12 @@ namespace osu.Game.Rulesets.Mods
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);
         private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
 
+        private readonly RateAdjustModHelper rateAdjustHelper;
+
         protected ModNightcore()
         {
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+
             SpeedChange.BindValueChanged(val =>
             {
                 freqAdjust.Value = SpeedChange.Default;
@@ -54,19 +58,7 @@ namespace osu.Game.Rulesets.Mods
             track.AddAdjustment(AdjustableProperty.Tempo, tempoAdjust);
         }
 
-        public override double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(SpeedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                return 1 + value;
-            }
-        }
+        public override double ScoreMultiplier => rateAdjustHelper.ScoreMultiplier;
     }
 
     public abstract partial class ModNightcore<TObject> : ModNightcore, IApplicableToDrawableRuleset<TObject>
diff --git a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
index a54be77338..034c20fc78 100644
--- a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
+++ b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
@@ -6,13 +6,18 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Mods
 {
+    /// <summary>
+    /// Provides common functionality shared across various rate adjust mods.
+    /// </summary>
     public class RateAdjustModHelper : IApplicableToTrack
     {
         private readonly BindableBool? adjustPitch;
+        private readonly BindableNumber<double> speedChange;
         private IAdjustableAudioComponent? track;
 
-        public RateAdjustModHelper(BindableNumber<double> speedChange, BindableBool? adjustPitch)
+        public RateAdjustModHelper(BindableNumber<double> speedChange, BindableBool? adjustPitch = null)
         {
+            this.speedChange = speedChange;
             this.adjustPitch = adjustPitch;
 
             // When switching between pitch adjust, we need to update adjustments to time-shift or frequency-scale.
@@ -29,8 +34,24 @@ namespace osu.Game.Rulesets.Mods
         public void ApplyToTrack(IAdjustableAudioComponent track)
         {
             this.track = track;
-
             adjustPitch?.TriggerChange();
         }
+
+        public double ScoreMultiplier
+        {
+            get
+            {
+                // Round to the nearest multiple of 0.1.
+                double value = (int)(speedChange.Value * 10) / 10.0;
+
+                // Offset back to 0.
+                value -= 1;
+
+                if (speedChange.Value >= 1)
+                    value /= 5;
+
+                return 1 + value;
+            }
+        }
     }
 }

From 161890292fc4c18c1f8dc2cefa8233fcdf0df2dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 17:38:11 +0900
Subject: [PATCH 1062/2296] Move audio adjustment hookup to own method for
 clarity

---
 osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs    |  3 +-
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       |  3 +-
 osu.Game/Rulesets/Mods/ModHalfTime.cs         |  3 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  3 +-
 osu.Game/Rulesets/Mods/RateAdjustModHelper.cs | 35 ++++++++++++++++---
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
index f122baed90..607e6b8399 100644
--- a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
+++ b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
@@ -126,7 +126,8 @@ namespace osu.Game.Rulesets.Mods
 
         public ModAdaptiveSpeed()
         {
-            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+            rateAdjustHelper.HandleAudioAdjustments(AdjustPitch);
 
             InitialRate.BindValueChanged(val =>
             {
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index f20cdcb18d..789291772d 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -34,7 +34,8 @@ namespace osu.Game.Rulesets.Mods
 
         protected ModDoubleTime()
         {
-            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+            rateAdjustHelper.HandleAudioAdjustments(AdjustPitch);
         }
 
         public override void ApplyToTrack(IAdjustableAudioComponent track)
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 4d75ee16bd..8b5dd39584 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -34,7 +34,8 @@ namespace osu.Game.Rulesets.Mods
 
         protected ModHalfTime()
         {
-            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+            rateAdjustHelper.HandleAudioAdjustments(AdjustPitch);
         }
 
         public override void ApplyToTrack(IAdjustableAudioComponent track)
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 1048caa698..d2772417db 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -48,7 +48,8 @@ namespace osu.Game.Rulesets.Mods
 
         protected ModTimeRamp()
         {
-            rateAdjustHelper = new RateAdjustModHelper(SpeedChange, AdjustPitch);
+            rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
+            rateAdjustHelper.HandleAudioAdjustments(AdjustPitch);
 
             // for preview purpose at song select. eventually we'll want to be able to update every frame.
             FinalRate.BindValueChanged(_ => applyRateAdjustment(double.PositiveInfinity), true);
diff --git a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
index 034c20fc78..701bad06bc 100644
--- a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
+++ b/osu.Game/Rulesets/Mods/RateAdjustModHelper.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 osu.Framework.Audio;
 using osu.Framework.Bindables;
 
@@ -11,17 +12,32 @@ namespace osu.Game.Rulesets.Mods
     /// </summary>
     public class RateAdjustModHelper : IApplicableToTrack
     {
-        private readonly BindableBool? adjustPitch;
         private readonly BindableNumber<double> speedChange;
+
         private IAdjustableAudioComponent? track;
 
-        public RateAdjustModHelper(BindableNumber<double> speedChange, BindableBool? adjustPitch = null)
+        private BindableBool? adjustPitch;
+
+        /// <summary>
+        /// Construct a new <see cref="RateAdjustModHelper"/>.
+        /// </summary>
+        /// <param name="speedChange">The main speed adjust parameter which is exposed to the user.</param>
+        public RateAdjustModHelper(BindableNumber<double> speedChange)
         {
             this.speedChange = speedChange;
+        }
+
+        /// <summary>
+        /// Setup audio track adjustments for a rate adjust mod.
+        /// Importantly, <see cref="ApplyToTrack"/> must be called when a track is obtained/changed for this to work.
+        /// </summary>
+        /// <param name="adjustPitch">The "adjust pitch" setting as exposed to the user.</param>
+        public void HandleAudioAdjustments(BindableBool adjustPitch)
+        {
             this.adjustPitch = adjustPitch;
 
             // When switching between pitch adjust, we need to update adjustments to time-shift or frequency-scale.
-            adjustPitch?.BindValueChanged(adjustPitchSetting =>
+            adjustPitch.BindValueChanged(adjustPitchSetting =>
             {
                 track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), speedChange);
                 track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), speedChange);
@@ -31,12 +47,23 @@ namespace osu.Game.Rulesets.Mods
             });
         }
 
+        /// <summary>
+        /// Should be invoked when a track is obtained / changed.
+        /// </summary>
+        /// <param name="track">The new track.</param>
+        /// <exception cref="InvalidOperationException">If this method is called before <see cref="HandleAudioAdjustments"/>.</exception>
         public void ApplyToTrack(IAdjustableAudioComponent track)
         {
+            if (adjustPitch == null)
+                throw new InvalidOperationException($"Must call {nameof(HandleAudioAdjustments)} first");
+
             this.track = track;
-            adjustPitch?.TriggerChange();
+            adjustPitch.TriggerChange();
         }
 
+        /// <summary>
+        /// The score multiplier for the current <see cref="speedChange"/>.
+        /// </summary>
         public double ScoreMultiplier
         {
             get

From 9907adc337dd7d4d14c2b0b0b8144695fcc475a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 17:39:11 +0900
Subject: [PATCH 1063/2296] Take in `IBindable`s and tidy up multiplier
 handling

---
 osu.Game/Rulesets/Mods/RateAdjustModHelper.cs | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
index 701bad06bc..ffd4de0e90 100644
--- a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
+++ b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
@@ -12,19 +12,39 @@ namespace osu.Game.Rulesets.Mods
     /// </summary>
     public class RateAdjustModHelper : IApplicableToTrack
     {
-        private readonly BindableNumber<double> speedChange;
+        public readonly IBindableNumber<double> SpeedChange;
 
         private IAdjustableAudioComponent? track;
 
         private BindableBool? adjustPitch;
 
+        /// <summary>
+        /// The score multiplier for the current <see cref="SpeedChange"/>.
+        /// </summary>
+        public double ScoreMultiplier
+        {
+            get
+            {
+                // Round to the nearest multiple of 0.1.
+                double value = (int)(SpeedChange.Value * 10) / 10.0;
+
+                // Offset back to 0.
+                value -= 1;
+
+                if (SpeedChange.Value >= 1)
+                    value /= 5;
+
+                return 1 + value;
+            }
+        }
+
         /// <summary>
         /// Construct a new <see cref="RateAdjustModHelper"/>.
         /// </summary>
         /// <param name="speedChange">The main speed adjust parameter which is exposed to the user.</param>
-        public RateAdjustModHelper(BindableNumber<double> speedChange)
+        public RateAdjustModHelper(IBindableNumber<double> speedChange)
         {
-            this.speedChange = speedChange;
+            SpeedChange = speedChange;
         }
 
         /// <summary>
@@ -39,8 +59,8 @@ namespace osu.Game.Rulesets.Mods
             // When switching between pitch adjust, we need to update adjustments to time-shift or frequency-scale.
             adjustPitch.BindValueChanged(adjustPitchSetting =>
             {
-                track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), speedChange);
-                track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), speedChange);
+                track?.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
+                track?.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
 
                 AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
                     => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
@@ -60,25 +80,5 @@ namespace osu.Game.Rulesets.Mods
             this.track = track;
             adjustPitch.TriggerChange();
         }
-
-        /// <summary>
-        /// The score multiplier for the current <see cref="speedChange"/>.
-        /// </summary>
-        public double ScoreMultiplier
-        {
-            get
-            {
-                // Round to the nearest multiple of 0.1.
-                double value = (int)(speedChange.Value * 10) / 10.0;
-
-                // Offset back to 0.
-                value -= 1;
-
-                if (speedChange.Value >= 1)
-                    value /= 5;
-
-                return 1 + value;
-            }
-        }
     }
 }

From 92524d42990747e5545194c4def191f073ee7e39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 17:44:01 +0900
Subject: [PATCH 1064/2296] Remove incorrect plural from variable

---
 .../Objects/Drawables/SpinnerSpinHistory.cs               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
index 3212ddc1ef..1cf511f526 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         private float totalAbsoluteRotation;
 
-        private float totalAbsoluteRotationsAtLastCompletion;
+        private float totalAbsoluteRotationAtLastCompletion;
 
         /// <summary>
         /// For the current spin, represents the maximum absolute rotation (from 0..360) achieved by the user.
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// The current spin, from -360..360.
         /// </summary>
-        private float currentSpinRotation => totalAbsoluteRotation - totalAbsoluteRotationsAtLastCompletion;
+        private float currentSpinRotation => totalAbsoluteRotation - totalAbsoluteRotationAtLastCompletion;
 
         private double lastReportTime = double.NegativeInfinity;
 
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                     // Incrementing the last completion point will cause `currentSpinRotation` to
                     // hold the remaining spin that needs to be considered.
-                    totalAbsoluteRotationsAtLastCompletion += direction * 360;
+                    totalAbsoluteRotationAtLastCompletion += direction * 360;
 
                     // Reset the current max as we are entering a new spin.
                     // Importantly, carry over the remainder (which is now stored in `currentSpinRotation`).
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 while (completedSpins.TryPeek(out var segment) && segment.CompletionTime > currentTime)
                 {
                     completedSpins.Pop();
-                    totalAbsoluteRotationsAtLastCompletion -= segment.Direction * 360;
+                    totalAbsoluteRotationAtLastCompletion -= segment.Direction * 360;
                 }
 
                 // This is a best effort. We may not have enough data to match this 1:1, but that's okay.

From be321e34e90ee47a2ba0076587c965ef72e0d24f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 17:46:14 +0900
Subject: [PATCH 1065/2296] Attempt to fix flaky tests with egregious retry
 rule

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 7f81ccddf6..ce78119861 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -51,7 +51,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(80, 1)]
         [TestCase(80, 0)]
         [TestCase(80, 10)]
-        // [TestCase(90, 1)] flaky
+        [TestCase(90, 1)]
+        [Retry(100)] // headless test doesn't run at high enough precision for this to always enter a tracking state in time.
         public void TestVeryShortSlider(float sliderLength, int repeatCount)
         {
             Slider slider;
@@ -87,11 +88,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(300, false)]
         [TestCase(200, true)]
         [TestCase(150, true)]
-        // [TestCase(120, true)] flaky
-        // [TestCase(60, true)] flaky
+        [TestCase(120, true)]
+        [TestCase(60, true)]
         [TestCase(10, true)]
-        // [TestCase(0, true)] headless test doesn't run at high enough precision for this to always enter a tracking state in time.
+        [TestCase(0, true)]
         [TestCase(-30, false)]
+        [Retry(100)] // headless test doesn't run at high enough precision for this to always enter a tracking state in time.
         public void TestTailLeniency(float finalPosition, bool hit)
         {
             Slider slider;

From 6ae82c5e73d27d91ad4d11d381cc59d3044784c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 18:35:08 +0900
Subject: [PATCH 1066/2296] Fix circle scale not matching stable due to missing
 multiplier

This multiplier has to exist.

I'm not guaranteeing that the rest is correct here. Should we be doing
proper cross-testing on this? Maybe, but it's going to be hard to get
right. We could likely check as far as "game pixels", but there's still
a chance that the osu-framework could be doing something weird in the
rest of the hierarchy where playfield scale is involved.

Closes https://github.com/ppy/osu/issues/25162. Tested to fix the linked
replay.
---
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 0bdbfaa760..80d3de75ea 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -155,7 +155,17 @@ namespace osu.Game.Rulesets.Osu.Objects
             // This adjustment is necessary for AR>10, otherwise TimePreempt can become smaller leading to hitcircles not fully fading in.
             TimeFadeIn = 400 * Math.Min(1, TimePreempt / PREEMPT_MIN);
 
-            Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
+            // The following comment is copied verbatim from osu-stable:
+            //
+            //   Builds of osu! up to 2013-05-04 had the gamefield being rounded down, which caused incorrect radius calculations
+            //   in widescreen cases. This ratio adjusts to allow for old replays to work post-fix, which in turn increases the lenience
+            //   for all plays, but by an amount so small it should only be effective in replays.
+            //
+            // To match expectations of gameplay we need to apply this multiplier to circle scale. It's weird but is what it is.
+            // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
+            const float broken_gamefield_rounding_allowance = 1.00041f;
+
+            Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2 * broken_gamefield_rounding_allowance;
         }
 
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();

From cff69d63a62c532957eb269c6eb492b441501c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 18 Oct 2023 12:27:16 +0200
Subject: [PATCH 1067/2296] Add inline commentary in `Mod{Day,Night}core` about
 different speed adjustments

---
 osu.Game/Rulesets/Mods/ModDaycore.cs   | 2 ++
 osu.Game/Rulesets/Mods/ModNightcore.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index 0b32788bf3..39ebd1fe4c 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Rulesets.Mods
         {
             rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
 
+            // intentionally not deferring the speed change handling to `RateAdjustModHelper`
+            // as the expected result of operation is not the same (daycore should preserve constant pitch).
             SpeedChange.BindValueChanged(val =>
             {
                 freqAdjust.Value = SpeedChange.Default;
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index 933c9c9fc5..b519ab4db7 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -45,6 +45,8 @@ namespace osu.Game.Rulesets.Mods
         {
             rateAdjustHelper = new RateAdjustModHelper(SpeedChange);
 
+            // intentionally not deferring the speed change handling to `RateAdjustModHelper`
+            // as the expected result of operation is not the same (nightcore should preserve constant pitch).
             SpeedChange.BindValueChanged(val =>
             {
                 freqAdjust.Value = SpeedChange.Default;

From 3a5490892ce669bc8d7ae66f1bbc90e33d2e1ed9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 19:50:42 +0900
Subject: [PATCH 1068/2296] Centralise and repair circle size calculations
 game-wide

---
 .../Objects/CatchHitObject.cs                 |  2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  9 ++-----
 .../TestSceneSliderFollowCircleInput.cs       |  2 +-
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs | 12 +---------
 .../Statistics/AccuracyHeatmap.cs             |  3 +--
 osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs   | 24 ++++++++++++++++++-
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index f4bd515995..1d536eb5cb 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             TimePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
 
-            Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
+            Scale = IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize);
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index c5c9556ed7..236a7290da 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch.UI
             Size = new Vector2(BASE_SIZE);
 
             if (difficulty != null)
-                Scale = calculateScale(difficulty);
+                Scale = new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize));
 
             CatchWidth = CalculateCatchWidth(Scale);
 
@@ -182,11 +182,6 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public Drawable CreateProxiedContent() => caughtObjectContainer.CreateProxy();
 
-        /// <summary>
-        /// Calculates the scale of the catcher based off the provided beatmap difficulty.
-        /// </summary>
-        private static Vector2 calculateScale(IBeatmapDifficultyInfo difficulty) => new Vector2(1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
-
         /// <summary>
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
@@ -197,7 +192,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
         /// <param name="difficulty">The beatmap difficulty.</param>
-        public static float CalculateCatchWidth(IBeatmapDifficultyInfo difficulty) => CalculateCatchWidth(calculateScale(difficulty));
+        public static float CalculateCatchWidth(IBeatmapDifficultyInfo difficulty) => CalculateCatchWidth(new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize)));
 
         /// <summary>
         /// Determine if this catcher can catch a <see cref="CatchHitObject"/> in the current position.
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
index 5adc50859f..0e5f8a8cf6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             const double time_slider_start = 1000;
 
-            float circleRadius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (circleSize - 5) / 5) / 2;
+            float circleRadius = OsuHitObject.OBJECT_RADIUS * IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(circleSize);
             float followCircleRadius = circleRadius * 1.2f;
 
             performTest(new Beatmap<OsuHitObject>
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 80d3de75ea..0b1f413362 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -155,17 +155,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             // This adjustment is necessary for AR>10, otherwise TimePreempt can become smaller leading to hitcircles not fully fading in.
             TimeFadeIn = 400 * Math.Min(1, TimePreempt / PREEMPT_MIN);
 
-            // The following comment is copied verbatim from osu-stable:
-            //
-            //   Builds of osu! up to 2013-05-04 had the gamefield being rounded down, which caused incorrect radius calculations
-            //   in widescreen cases. This ratio adjusts to allow for old replays to work post-fix, which in turn increases the lenience
-            //   for all plays, but by an amount so small it should only be effective in replays.
-            //
-            // To match expectations of gameplay we need to apply this multiplier to circle scale. It's weird but is what it is.
-            // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
-            const float broken_gamefield_rounding_allowance = 1.00041f;
-
-            Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2 * broken_gamefield_rounding_allowance;
+            Scale = IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize);
         }
 
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();
diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 6564a086fe..8a2c7ff13a 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -208,8 +208,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             if (score.HitEvents.Count == 0)
                 return;
 
-            // Todo: This should probably not be done like this.
-            float radius = OsuHitObject.OBJECT_RADIUS * (1.0f - 0.7f * (playableBeatmap.Difficulty.CircleSize - 5) / 5) / 2;
+            float radius = OsuHitObject.OBJECT_RADIUS * IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(playableBeatmap.Difficulty.CircleSize);
 
             foreach (var e in score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)))
             {
diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index 78234a9dd9..af943b62e7 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -44,6 +44,21 @@ namespace osu.Game.Beatmaps
         /// </summary>
         double SliderTickRate { get; }
 
+        static float CalculateScaleFromCircleSize(float circleSize)
+        {
+            // The following comment is copied verbatim from osu-stable:
+            //
+            //   Builds of osu! up to 2013-05-04 had the gamefield being rounded down, which caused incorrect radius calculations
+            //   in widescreen cases. This ratio adjusts to allow for old replays to work post-fix, which in turn increases the lenience
+            //   for all plays, but by an amount so small it should only be effective in replays.
+            //
+            // To match expectations of gameplay we need to apply this multiplier to circle scale. It's weird but is what it is.
+            // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
+            const float broken_gamefield_rounding_allowance = 1.00041f;
+
+            return (float)(1.0f - 0.7f * DifficultyRange(circleSize)) / 2 * broken_gamefield_rounding_allowance;
+        }
+
         /// <summary>
         /// Maps a difficulty value [0, 10] to a two-piece linear range of values.
         /// </summary>
@@ -55,13 +70,20 @@ namespace osu.Game.Beatmaps
         static double DifficultyRange(double difficulty, double min, double mid, double max)
         {
             if (difficulty > 5)
-                return mid + (max - mid) * (difficulty - 5) / 5;
+                return mid + (max - mid) * DifficultyRange(difficulty);
             if (difficulty < 5)
                 return mid - (mid - min) * (5 - difficulty) / 5;
 
             return mid;
         }
 
+        /// <summary>
+        /// Maps a difficulty value [0, 10] to a linear range of [-1, 1].
+        /// </summary>
+        /// <param name="difficulty">The difficulty value to be mapped.</param>
+        /// <returns>Value to which the difficulty value maps in the specified range.</returns>
+        static double DifficultyRange(double difficulty) => (difficulty - 5) / 5;
+
         /// <summary>
         /// Maps a difficulty value [0, 10] to a two-piece linear range of values.
         /// </summary>

From 78d3c3723dec9b46f1b271c32c4b86267555bffa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 20:12:14 +0900
Subject: [PATCH 1069/2296] Ignore instead of retry tests

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index ce78119861..247aa4f445 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(80, 0)]
         [TestCase(80, 10)]
         [TestCase(90, 1)]
-        [Retry(100)] // headless test doesn't run at high enough precision for this to always enter a tracking state in time.
+        [Ignore("headless test doesn't run at high enough precision for this to always enter a tracking state in time.")]
         public void TestVeryShortSlider(float sliderLength, int repeatCount)
         {
             Slider slider;
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(10, true)]
         [TestCase(0, true)]
         [TestCase(-30, false)]
-        [Retry(100)] // headless test doesn't run at high enough precision for this to always enter a tracking state in time.
+        [Ignore("headless test doesn't run at high enough precision for this to always enter a tracking state in time.")]
         public void TestTailLeniency(float finalPosition, bool hit)
         {
             Slider slider;

From 040d0970f219fbb58c10f72fca9c3c6b80c53a51 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 23:54:18 +0900
Subject: [PATCH 1070/2296] Use `DifficultyRange` helper method in one more
 place

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

diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index af943b62e7..19944afa1c 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Beatmaps
             if (difficulty > 5)
                 return mid + (max - mid) * DifficultyRange(difficulty);
             if (difficulty < 5)
-                return mid - (mid - min) * (5 - difficulty) / 5;
+                return mid + (mid - min) * DifficultyRange(difficulty);
 
             return mid;
         }

From 42087037aeea9409fac0723b9a9d05b9fe2d7e98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Oct 2023 23:56:15 +0900
Subject: [PATCH 1071/2296] Fix `Catcher` code change not accounting for double
 sizing requirement

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

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 236a7290da..f09614816d 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch.UI
             Size = new Vector2(BASE_SIZE);
 
             if (difficulty != null)
-                Scale = new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize));
+                Scale = calculateScale(difficulty);
 
             CatchWidth = CalculateCatchWidth(Scale);
 
@@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
         /// <param name="difficulty">The beatmap difficulty.</param>
-        public static float CalculateCatchWidth(IBeatmapDifficultyInfo difficulty) => CalculateCatchWidth(new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize)));
+        public static float CalculateCatchWidth(IBeatmapDifficultyInfo difficulty) => CalculateCatchWidth(calculateScale(difficulty));
 
         /// <summary>
         /// Determine if this catcher can catch a <see cref="CatchHitObject"/> in the current position.
@@ -466,6 +466,11 @@ namespace osu.Game.Rulesets.Catch.UI
             d.Expire();
         }
 
+        /// <summary>
+        /// Calculates the scale of the catcher based off the provided beatmap difficulty.
+        /// </summary>
+        private static Vector2 calculateScale(IBeatmapDifficultyInfo difficulty) => new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize) * 2);
+
         private enum DroppedObjectAnimation
         {
             Drop,

From 14cadd1eeb23fe59733b5237f46ce98eefbda33d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 19 Oct 2023 02:39:34 +0900
Subject: [PATCH 1072/2296] Pin third-party actions

---
 .github/workflows/diffcalc.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index c3d92b6d1f..ce8edc1d95 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -111,7 +111,7 @@ jobs:
     steps:
       - name: Check permissions
         if: ${{ github.event_name != 'workflow_dispatch' }}
-        uses: actions-cool/check-user-permission@v2
+        uses: actions-cool/check-user-permission@a0668c9aec87f3875fc56170b6452a453e9dd819 # v2.2.0
         with:
           require: 'write'
 
@@ -122,7 +122,7 @@ jobs:
     if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
     steps:
       - name: Create comment
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
           comment_tag: ${{ env.COMMENT_TAG }}
           message: |
@@ -136,7 +136,7 @@ jobs:
     runs-on: self-hosted
     timeout-minutes: 50400 # 35 days, the maximum for jobs on self-hosted runners.
     steps:
-      - uses: ahmadnassri/action-workflow-queue@v1
+      - uses: ahmadnassri/action-workflow-queue@f547ac848c16a9bb1b2ed4a850e0cc5098af2cf8 # v1.1.5
         with:
           timeout: 2147483647 # Around 24 days - the maximum supported by JS setTimeout().
           delay: 120000 # Poll every 2 minutes - the API limit seems fairly low on this one.
@@ -261,7 +261,7 @@ jobs:
 
       - name: Restore cache
         id: restore-cache
-        uses: maxnowack/local-cache@v1
+        uses: maxnowack/local-cache@038cc090b52e4f205fbc468bf5b0756df6f68775 # v1
         with:
           path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
           key: ${{ steps.query.outputs.DATA_NAME }}
@@ -292,7 +292,7 @@ jobs:
 
       - name: Restore cache
         id: restore-cache
-        uses: maxnowack/local-cache@v1
+        uses: maxnowack/local-cache@038cc090b52e4f205fbc468bf5b0756df6f68775 # v1
         with:
           path: ${{ steps.query.outputs.DATA_NAME }}.tar.bz2
           key: ${{ steps.query.outputs.DATA_NAME }}
@@ -356,7 +356,7 @@ jobs:
     steps:
       - name: Update comment on success
         if: ${{ needs.generator.result == 'success' }}
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
           comment_tag: ${{ env.COMMENT_TAG }}
           mode: upsert
@@ -367,7 +367,7 @@ jobs:
 
       - name: Update comment on failure
         if: ${{ needs.generator.result == 'failure' }}
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
           comment_tag: ${{ env.COMMENT_TAG }}
           mode: upsert
@@ -377,7 +377,7 @@ jobs:
 
       - name: Update comment on cancellation
         if: ${{ needs.generator.result == 'cancelled' }}
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
           comment_tag: ${{ env.COMMENT_TAG }}
           mode: delete

From 832ba861bb1054aa76e056f57fceb22bc98c6dfe Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 19 Oct 2023 15:19:51 +0900
Subject: [PATCH 1073/2296] Fix incorrect PR url in diffcalc workflow

---
 .github/workflows/diffcalc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index ce8edc1d95..dbb4067676 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -195,7 +195,7 @@ jobs:
       - name: Add pull-request environment
         if: ${{ github.event_name == 'issue_comment' && github.event.issue.pull_request }}
         run: |
-          sed -i "s;^OSU_B=.*$;OSU_B=${{ github.event.issue.pull_request.url }};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          sed -i "s;^OSU_B=.*$;OSU_B=${{ github.event.issue.pull_request.html_url }};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
       - name: Add comment environment
         if: ${{ github.event_name == 'issue_comment' }}

From 3ab083b696906a03a6c6cd575ab81b8fe5541c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 09:56:40 +0200
Subject: [PATCH 1074/2296] Split `IPositionSnapProvider` from
 `IDistanceSnapProvider`

In preparation to remove `DistancedHitObjectComposer`, split off
`IPositionSnapProvider` from `IDistanceSnapProvider`.

`DistancedHitObjectComposer` was not touching `IPositionSnapProvider`'s
only interface member at all, it was just forwarding it for subclasses
to override to their own leisure.
---
 .../Components/PathControlPointVisualiser.cs        | 13 ++++++++-----
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs  |  9 ++++++---
 .../Blueprints/Sliders/SliderSelectionBlueprint.cs  | 11 +++++++----
 osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs     |  2 +-
 4 files changed, 22 insertions(+), 13 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 f624ebc8b5..f891d23bbd 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -47,7 +47,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         public Action<List<PathControlPoint>> SplitControlPointsRequested;
 
         [Resolved(CanBeNull = true)]
-        private IDistanceSnapProvider snapProvider { get; set; }
+        private IPositionSnapProvider positionSnapProvider { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
         public PathControlPointVisualiser(T hitObject, bool allowSelection)
         {
@@ -289,7 +292,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             {
                 // Special handling for selections containing head control point - the position of the hit object changes which means the snapped position and time have to be taken into account
                 Vector2 newHeadPosition = Parent!.ToScreenSpace(e.MousePosition + (dragStartPositions[0] - dragStartPositions[draggedControlPointIndex]));
-                var result = snapProvider?.FindSnappedPositionAndTime(newHeadPosition);
+                var result = positionSnapProvider?.FindSnappedPositionAndTime(newHeadPosition);
 
                 Vector2 movementDelta = Parent!.ToLocalSpace(result?.ScreenSpacePosition ?? newHeadPosition) - hitObject.Position;
 
@@ -309,7 +312,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
             {
-                var result = snapProvider?.FindSnappedPositionAndTime(Parent!.ToScreenSpace(e.MousePosition), SnapType.GlobalGrids);
+                var result = positionSnapProvider?.FindSnappedPositionAndTime(Parent!.ToScreenSpace(e.MousePosition), SnapType.GlobalGrids);
 
                 Vector2 movementDelta = Parent!.ToLocalSpace(result?.ScreenSpacePosition ?? Parent!.ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - hitObject.Position;
 
@@ -322,7 +325,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
 
             // Snap the path to the current beat divisor before checking length validity.
-            hitObject.SnapTo(snapProvider);
+            hitObject.SnapTo(distanceSnapProvider);
 
             if (!hitObject.Path.HasValidLength)
             {
@@ -332,7 +335,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 hitObject.Position = oldPosition;
                 hitObject.StartTime = oldStartTime;
                 // Snap the path length again to undo the invalid length.
-                hitObject.SnapTo(snapProvider);
+                hitObject.SnapTo(distanceSnapProvider);
                 return;
             }
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index ba7b855511..9b6adc04cf 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -39,7 +39,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private int currentSegmentLength;
 
         [Resolved(CanBeNull = true)]
-        private IDistanceSnapProvider snapProvider { get; set; }
+        private IPositionSnapProvider positionSnapProvider { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
         protected override bool IsValidForPlacement => HitObject.Path.HasValidLength;
 
@@ -198,7 +201,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 }
 
                 // Update the cursor position.
-                var result = snapProvider?.FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position, state == SliderPlacementState.Body ? SnapType.GlobalGrids : SnapType.All);
+                var result = positionSnapProvider?.FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position, state == SliderPlacementState.Body ? SnapType.GlobalGrids : SnapType.All);
                 cursor.Position = ToLocalSpace(result?.ScreenSpacePosition ?? inputManager.CurrentState.Mouse.Position) - HitObject.Position;
             }
             else if (cursor != null)
@@ -230,7 +233,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void updateSlider()
         {
-            HitObject.Path.ExpectedDistance.Value = snapProvider?.FindSnappedDistance(HitObject, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
+            HitObject.Path.ExpectedDistance.Value = distanceSnapProvider?.FindSnappedDistance(HitObject, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
 
             bodyPiece.UpdateFrom(HitObject);
             headCirclePiece.UpdateFrom(HitObject.HeadCircle);
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 02023decd6..80c4cee7f2 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -40,7 +40,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         protected PathControlPointVisualiser<Slider> ControlPointVisualiser { get; private set; }
 
         [Resolved(CanBeNull = true)]
-        private IDistanceSnapProvider snapProvider { get; set; }
+        private IPositionSnapProvider positionSnapProvider { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
         [Resolved(CanBeNull = true)]
         private IPlacementHandler placementHandler { get; set; }
@@ -194,7 +197,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             if (placementControlPoint != null)
             {
-                var result = snapProvider?.FindSnappedPositionAndTime(ToScreenSpace(e.MousePosition));
+                var result = positionSnapProvider?.FindSnappedPositionAndTime(ToScreenSpace(e.MousePosition));
                 placementControlPoint.Position = ToLocalSpace(result?.ScreenSpacePosition ?? ToScreenSpace(e.MousePosition)) - HitObject.Position;
             }
         }
@@ -245,7 +248,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             // Move the control points from the insertion index onwards to make room for the insertion
             controlPoints.Insert(insertionIndex, pathControlPoint);
 
-            HitObject.SnapTo(snapProvider);
+            HitObject.SnapTo(distanceSnapProvider);
 
             return pathControlPoint;
         }
@@ -267,7 +270,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
 
             // Snap the slider to the current beat divisor before checking length validity.
-            HitObject.SnapTo(snapProvider);
+            HitObject.SnapTo(distanceSnapProvider);
 
             // If there are 0 or 1 remaining control points, or the slider has an invalid length, it is in a degenerate form and should be deleted
             if (controlPoints.Count <= 1 || !HitObject.Path.HasValidLength)
diff --git a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
index da44b42831..af9d02f5c4 100644
--- a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Edit
     /// A snap provider which given a reference hit object and proposed distance from it, offers a more correct duration or distance value.
     /// </summary>
     [Cached]
-    public interface IDistanceSnapProvider : IPositionSnapProvider
+    public interface IDistanceSnapProvider
     {
         /// <summary>
         /// A multiplier which changes the ratio of distance travelled per time unit.

From dcfd6a0a8a9ad298fe63ea988dbe6f70dae3cfad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 11:20:10 +0200
Subject: [PATCH 1075/2296] Remove `DistancedHitObjectComposer` inheritance
 from osu! composer

---
 .../Editor/TestSceneOsuDistanceSnapGrid.cs    |  28 +-
 .../Edit/OsuDistanceSnapProvider.cs           |  31 ++
 .../Edit/OsuHitObjectComposer.cs              |  44 +--
 ...tSceneHitObjectComposerDistanceSnapping.cs |  13 +-
 .../Editing/TestSceneDistanceSnapGrid.cs      |   4 +-
 .../Edit/ComposerDistanceSnapProvider.cs      | 311 ++++++++++++++++++
 .../Edit/DistancedHitObjectComposer.cs        |   4 +-
 .../Rulesets/Edit/IDistanceSnapProvider.cs    |   2 +-
 8 files changed, 392 insertions(+), 45 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/OsuDistanceSnapProvider.cs
 create mode 100644 osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index 9338d5453d..b70f932913 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -47,8 +47,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [Cached]
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
 
-        [Cached(typeof(IDistanceSnapProvider))]
-        private readonly OsuHitObjectComposer snapProvider = new OsuHitObjectComposer(new OsuRuleset())
+        private readonly TestHitObjectComposer composer = new TestHitObjectComposer
         {
             // Just used for the snap implementation, so let's hide from vision.
             AlwaysPresent = true,
@@ -71,11 +70,18 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             base.Content.Children = new Drawable[]
             {
                 editorClock = new EditorClock(editorBeatmap),
-                new PopoverContainer { Child = snapProvider },
+                new PopoverContainer { Child = composer },
                 Content
             };
         }
 
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.CacheAs(composer.DistanceSnapProvider);
+            return dependencies;
+        }
+
         protected override Container<Drawable> Content { get; } = new PopoverContainer { RelativeSizeAxes = Axes.Both };
 
         [SetUp]
@@ -84,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             editorBeatmap.Difficulty.SliderMultiplier = 1;
             editorBeatmap.ControlPointInfo.Clear();
             editorBeatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = beat_length });
-            snapProvider.DistanceSpacingMultiplier.Value = 1;
+            composer.DistanceSnapProvider.DistanceSpacingMultiplier.Value = 1;
 
             Children = new Drawable[]
             {
@@ -116,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [TestCase(0.5f)]
         public void TestDistanceSpacing(float multiplier)
         {
-            AddStep($"set distance spacing = {multiplier}", () => snapProvider.DistanceSpacingMultiplier.Value = multiplier);
+            AddStep($"set distance spacing = {multiplier}", () => composer.DistanceSnapProvider.DistanceSpacingMultiplier.Value = multiplier);
         }
 
         [Test]
@@ -153,7 +159,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [TestCase(2f, beat_length * 2)]
         public void TestDistanceSpacingAdjust(float multiplier, float expectedDistance)
         {
-            AddStep($"Set distance spacing to {multiplier}", () => snapProvider.DistanceSpacingMultiplier.Value = multiplier);
+            AddStep($"Set distance spacing to {multiplier}", () => composer.DistanceSnapProvider.DistanceSpacingMultiplier.Value = multiplier);
             AddStep("move mouse to point", () => InputManager.MoveMouseTo(grid.ToScreenSpace(grid_position + new Vector2(beat_length, 0) * 2)));
 
             assertSnappedDistance(expectedDistance);
@@ -266,5 +272,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 cursor.Position = LastSnappedPosition = GetSnapPosition.Invoke(inputManager.CurrentState.Mouse.Position);
             }
         }
+
+        private partial class TestHitObjectComposer : OsuHitObjectComposer
+        {
+            public new IDistanceSnapProvider DistanceSnapProvider => base.DistanceSnapProvider;
+
+            public TestHitObjectComposer()
+                : base(new OsuRuleset())
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuDistanceSnapProvider.cs b/osu.Game.Rulesets.Osu/Edit/OsuDistanceSnapProvider.cs
new file mode 100644
index 0000000000..522943df7d
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/OsuDistanceSnapProvider.cs
@@ -0,0 +1,31 @@
+// 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.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public partial class OsuDistanceSnapProvider : ComposerDistanceSnapProvider
+    {
+        protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
+        {
+            float expectedDistance = DurationToDistance(before, after.StartTime - before.GetEndTime());
+            float actualDistance = Vector2.Distance(((OsuHitObject)before).EndPosition, ((OsuHitObject)after).Position);
+
+            return actualDistance / expectedDistance;
+        }
+
+        protected override bool AdjustDistanceSpacing(GlobalAction action, float amount)
+        {
+            // To allow better visualisation, ensure that the spacing grid is visible before adjusting.
+            DistanceSnapToggle.Value = TernaryState.True;
+
+            return base.AdjustDistanceSpacing(action, amount);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index fdc11be42c..0f8c960b65 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -17,7 +17,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
@@ -30,7 +29,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public partial class OsuHitObjectComposer : DistancedHitObjectComposer<OsuHitObject>
+    public partial class OsuHitObjectComposer : HitObjectComposer<OsuHitObject>
     {
         public OsuHitObjectComposer(Ruleset ruleset)
             : base(ruleset)
@@ -49,18 +48,27 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private readonly Bindable<TernaryState> rectangularGridSnapToggle = new Bindable<TernaryState>();
 
-        protected override IEnumerable<TernaryButton> CreateTernaryButtons() => base.CreateTernaryButtons().Concat(new[]
-        {
-            new TernaryButton(rectangularGridSnapToggle, "Grid Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Th })
-        });
+        protected override IEnumerable<TernaryButton> CreateTernaryButtons()
+            => base.CreateTernaryButtons()
+                   .Concat(DistanceSnapProvider.CreateTernaryButtons())
+                   .Concat(new[]
+                   {
+                       new TernaryButton(rectangularGridSnapToggle, "Grid Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Th })
+                   });
 
         private BindableList<HitObject> selectedHitObjects;
 
         private Bindable<HitObject> placementObject;
 
+        [Cached(typeof(IDistanceSnapProvider))]
+        protected readonly OsuDistanceSnapProvider DistanceSnapProvider = new OsuDistanceSnapProvider();
+
         [BackgroundDependencyLoader]
         private void load()
         {
+            AddInternal(DistanceSnapProvider);
+            DistanceSnapProvider.AttachToToolbox(RightToolbox);
+
             // Give a bit of breathing room around the playfield content.
             PlayfieldContentContainer.Padding = new MarginPadding(10);
 
@@ -81,7 +89,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             placementObject = EditorBeatmap.PlacementObject.GetBoundCopy();
             placementObject.ValueChanged += _ => updateDistanceSnapGrid();
-            DistanceSnapToggle.ValueChanged += _ => updateDistanceSnapGrid();
+            DistanceSnapProvider.DistanceSnapToggle.ValueChanged += _ => updateDistanceSnapGrid();
 
             // we may be entering the screen with a selection already active
             updateDistanceSnapGrid();
@@ -106,14 +114,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private RectangularPositionSnapGrid rectangularPositionSnapGrid;
 
-        protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
-        {
-            float expectedDistance = DurationToDistance(before, after.StartTime - before.GetEndTime());
-            float actualDistance = Vector2.Distance(((OsuHitObject)before).EndPosition, ((OsuHitObject)after).Position);
-
-            return actualDistance / expectedDistance;
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -143,7 +143,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 // We want to ensure that in this particular case, the time-snapping component of distance snap is still applied.
                 // The easiest way to ensure this is to attempt application of distance snap after a nearby object is found, and copy over
                 // the time value if the proposed positions are roughly the same.
-                if (snapType.HasFlagFast(SnapType.RelativeGrids) && DistanceSnapToggle.Value == TernaryState.True && distanceSnapGrid != null)
+                if (snapType.HasFlagFast(SnapType.RelativeGrids) && DistanceSnapProvider.DistanceSnapToggle.Value == TernaryState.True && distanceSnapGrid != null)
                 {
                     (Vector2 distanceSnappedPosition, double distanceSnappedTime) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(snapResult.ScreenSpacePosition));
                     if (Precision.AlmostEquals(distanceSnapGrid.ToScreenSpace(distanceSnappedPosition), snapResult.ScreenSpacePosition, 1))
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             if (snapType.HasFlagFast(SnapType.RelativeGrids))
             {
-                if (DistanceSnapToggle.Value == TernaryState.True && distanceSnapGrid != null)
+                if (DistanceSnapProvider.DistanceSnapToggle.Value == TernaryState.True && distanceSnapGrid != null)
                 {
                     (Vector2 pos, double time) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(screenSpacePosition));
 
@@ -220,7 +220,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             distanceSnapGridCache.Invalidate();
             distanceSnapGrid = null;
 
-            if (DistanceSnapToggle.Value != TernaryState.True)
+            if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True)
                 return;
 
             switch (BlueprintContainer.CurrentTool)
@@ -262,14 +262,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             base.OnKeyUp(e);
         }
 
-        protected override bool AdjustDistanceSpacing(GlobalAction action, float amount)
-        {
-            // To allow better visualisation, ensure that the spacing grid is visible before adjusting.
-            DistanceSnapToggle.Value = TernaryState.True;
-
-            return base.AdjustDistanceSpacing(action, amount);
-        }
-
         private bool gridSnapMomentary;
 
         private void handleToggleViaKey(KeyboardEvent key)
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 6b78eea009..463287fb35 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -230,25 +229,25 @@ namespace osu.Game.Tests.Editing
         }
 
         private void assertSnapDistance(float expectedDistance, HitObject? referenceObject, bool includeSliderVelocity)
-            => AddAssert($"distance is {expectedDistance}", () => composer.GetBeatSnapDistanceAt(referenceObject ?? new HitObject(), includeSliderVelocity), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
+            => AddAssert($"distance is {expectedDistance}", () => composer.DistanceSnapProvider.GetBeatSnapDistanceAt(referenceObject ?? new HitObject(), includeSliderVelocity), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
 
         private void assertDurationToDistance(double duration, float expectedDistance, HitObject? referenceObject = null)
-            => AddAssert($"duration = {duration} -> distance = {expectedDistance}", () => composer.DurationToDistance(referenceObject ?? new HitObject(), duration), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
+            => AddAssert($"duration = {duration} -> distance = {expectedDistance}", () => composer.DistanceSnapProvider.DurationToDistance(referenceObject ?? new HitObject(), duration), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
 
         private void assertDistanceToDuration(float distance, double expectedDuration, HitObject? referenceObject = null)
-            => AddAssert($"distance = {distance} -> duration = {expectedDuration}", () => composer.DistanceToDuration(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDuration).Within(Precision.FLOAT_EPSILON));
+            => AddAssert($"distance = {distance} -> duration = {expectedDuration}", () => composer.DistanceSnapProvider.DistanceToDuration(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDuration).Within(Precision.FLOAT_EPSILON));
 
         private void assertSnappedDuration(float distance, double expectedDuration, HitObject? referenceObject = null)
-            => AddAssert($"distance = {distance} -> duration = {expectedDuration} (snapped)", () => composer.FindSnappedDuration(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDuration).Within(Precision.FLOAT_EPSILON));
+            => AddAssert($"distance = {distance} -> duration = {expectedDuration} (snapped)", () => composer.DistanceSnapProvider.FindSnappedDuration(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDuration).Within(Precision.FLOAT_EPSILON));
 
         private void assertSnappedDistance(float distance, float expectedDistance, HitObject? referenceObject = null)
-            => AddAssert($"distance = {distance} -> distance = {expectedDistance} (snapped)", () => composer.FindSnappedDistance(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
+            => AddAssert($"distance = {distance} -> distance = {expectedDistance} (snapped)", () => composer.DistanceSnapProvider.FindSnappedDistance(referenceObject ?? new HitObject(), distance), () => Is.EqualTo(expectedDistance).Within(Precision.FLOAT_EPSILON));
 
         private partial class TestHitObjectComposer : OsuHitObjectComposer
         {
             public new EditorBeatmap EditorBeatmap => base.EditorBeatmap;
 
-            public new Bindable<double> DistanceSpacingMultiplier => base.DistanceSpacingMultiplier;
+            public new IDistanceSnapProvider DistanceSnapProvider => base.DistanceSnapProvider;
 
             public TestHitObjectComposer()
                 : base(new OsuRuleset())
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index 70e4420a45..f2a015402a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -187,11 +187,9 @@ namespace osu.Game.Tests.Visual.Editing
 
         private class SnapProvider : IDistanceSnapProvider
         {
-            public SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.AllGrids) => new SnapResult(screenSpacePosition, 0);
-
             public Bindable<double> DistanceSpacingMultiplier { get; } = new BindableDouble(1);
 
-            IBindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
+            Bindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
 
             public float GetBeatSnapDistanceAt(HitObject referenceObject, bool useReferenceSliderVelocity = true) => beat_snap_distance;
 
diff --git a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
new file mode 100644
index 0000000000..0b1809e7d9
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
@@ -0,0 +1,311 @@
+// 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.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
+using osu.Framework.Utils;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
+using osu.Game.Overlays;
+using osu.Game.Overlays.OSD;
+using osu.Game.Overlays.Settings.Sections;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public abstract partial class ComposerDistanceSnapProvider : Component, IDistanceSnapProvider, IScrollBindingHandler<GlobalAction>
+    {
+        private const float adjust_step = 0.1f;
+
+        public BindableDouble DistanceSpacingMultiplier { get; } = new BindableDouble(1.0)
+        {
+            MinValue = 0.1,
+            MaxValue = 6.0,
+            Precision = 0.01,
+        };
+
+        Bindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
+
+        private ExpandableSlider<double, SizeSlider<double>> distanceSpacingSlider = null!;
+        private ExpandableButton currentDistanceSpacingButton = null!;
+
+        [Resolved]
+        private Playfield playfield { get; set; } = null!;
+
+        [Resolved]
+        private EditorClock editorClock { get; set; } = null!;
+
+        [Resolved]
+        private EditorBeatmap editorBeatmap { get; set; } = null!;
+
+        [Resolved]
+        private IBeatSnapProvider beatSnapProvider { get; set; } = null!;
+
+        [Resolved]
+        private OnScreenDisplay? onScreenDisplay { get; set; }
+
+        public readonly Bindable<TernaryState> DistanceSnapToggle = new Bindable<TernaryState>();
+
+        private bool distanceSnapMomentary;
+
+        private EditorToolboxGroup? toolboxGroup;
+
+        public void AttachToToolbox(ExpandingToolboxContainer toolboxContainer)
+        {
+            if (toolboxGroup != null)
+                throw new InvalidOperationException($"{nameof(AttachToToolbox)} may be called only once for a single {nameof(ComposerDistanceSnapProvider)} instance.");
+
+            toolboxContainer.Add(toolboxGroup = new EditorToolboxGroup("snapping")
+            {
+                Alpha = DistanceSpacingMultiplier.Disabled ? 0 : 1,
+                Children = new Drawable[]
+                {
+                    distanceSpacingSlider = new ExpandableSlider<double, SizeSlider<double>>
+                    {
+                        KeyboardStep = adjust_step,
+                        // Manual binding in LoadComplete to handle one-way event flow.
+                        Current = DistanceSpacingMultiplier.GetUnboundCopy(),
+                    },
+                    currentDistanceSpacingButton = new ExpandableButton
+                    {
+                        Action = () =>
+                        {
+                            (HitObject before, HitObject after)? objects = getObjectsOnEitherSideOfCurrentTime();
+
+                            Debug.Assert(objects != null);
+
+                            DistanceSpacingMultiplier.Value = ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after);
+                            DistanceSnapToggle.Value = TernaryState.True;
+                        },
+                        RelativeSizeAxes = Axes.X,
+                    }
+                }
+            });
+
+            if (DistanceSpacingMultiplier.Disabled)
+            {
+                distanceSpacingSlider.Hide();
+                return;
+            }
+
+            DistanceSpacingMultiplier.Value = editorBeatmap.BeatmapInfo.DistanceSpacing;
+            DistanceSpacingMultiplier.BindValueChanged(multiplier =>
+            {
+                distanceSpacingSlider.ContractedLabelText = $"D. S. ({multiplier.NewValue:0.##x})";
+                distanceSpacingSlider.ExpandedLabelText = $"Distance Spacing ({multiplier.NewValue:0.##x})";
+
+                if (multiplier.NewValue != multiplier.OldValue)
+                    onScreenDisplay?.Display(new DistanceSpacingToast(multiplier.NewValue.ToLocalisableString(@"0.##x"), multiplier));
+
+                editorBeatmap.BeatmapInfo.DistanceSpacing = multiplier.NewValue;
+            }, true);
+
+            // Manual binding to handle enabling distance spacing when the slider is interacted with.
+            distanceSpacingSlider.Current.BindValueChanged(spacing =>
+            {
+                DistanceSpacingMultiplier.Value = spacing.NewValue;
+                DistanceSnapToggle.Value = TernaryState.True;
+            });
+            DistanceSpacingMultiplier.BindValueChanged(spacing => distanceSpacingSlider.Current.Value = spacing.NewValue);
+        }
+
+        private (HitObject before, HitObject after)? getObjectsOnEitherSideOfCurrentTime()
+        {
+            HitObject? lastBefore = playfield.HitObjectContainer.AliveObjects.LastOrDefault(h => h.HitObject.StartTime < editorClock.CurrentTime)?.HitObject;
+
+            if (lastBefore == null)
+                return null;
+
+            HitObject? firstAfter = playfield.HitObjectContainer.AliveObjects.FirstOrDefault(h => h.HitObject.StartTime >= editorClock.CurrentTime)?.HitObject;
+
+            if (firstAfter == null)
+                return null;
+
+            if (lastBefore == firstAfter)
+                return null;
+
+            return (lastBefore, firstAfter);
+        }
+
+        protected abstract double ReadCurrentDistanceSnap(HitObject before, HitObject after);
+
+        protected override void Update()
+        {
+            base.Update();
+
+            (HitObject before, HitObject after)? objects = getObjectsOnEitherSideOfCurrentTime();
+
+            double currentSnap = objects == null
+                ? 0
+                : ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after);
+
+            if (currentSnap > DistanceSpacingMultiplier.MinValue)
+            {
+                currentDistanceSpacingButton.Enabled.Value = currentDistanceSpacingButton.Expanded.Value
+                                                             && !DistanceSpacingMultiplier.Disabled
+                                                             && !Precision.AlmostEquals(currentSnap, DistanceSpacingMultiplier.Value, DistanceSpacingMultiplier.Precision / 2);
+                currentDistanceSpacingButton.ContractedLabelText = $"current {currentSnap:N2}x";
+                currentDistanceSpacingButton.ExpandedLabelText = $"Use current ({currentSnap:N2}x)";
+            }
+            else
+            {
+                currentDistanceSpacingButton.Enabled.Value = false;
+                currentDistanceSpacingButton.ContractedLabelText = string.Empty;
+                currentDistanceSpacingButton.ExpandedLabelText = "Use current (unavailable)";
+            }
+        }
+
+        public IEnumerable<TernaryButton> CreateTernaryButtons() => new[]
+        {
+            new TernaryButton(DistanceSnapToggle, "Distance Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Ruler })
+        };
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (e.Repeat)
+                return false;
+
+            handleToggleViaKey(e);
+            return base.OnKeyDown(e);
+        }
+
+        protected override void OnKeyUp(KeyUpEvent e)
+        {
+            handleToggleViaKey(e);
+            base.OnKeyUp(e);
+        }
+
+        private void handleToggleViaKey(KeyboardEvent key)
+        {
+            bool altPressed = key.AltPressed;
+
+            if (altPressed != distanceSnapMomentary)
+            {
+                distanceSnapMomentary = altPressed;
+                DistanceSnapToggle.Value = DistanceSnapToggle.Value == TernaryState.False ? TernaryState.True : TernaryState.False;
+            }
+        }
+
+        public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            switch (e.Action)
+            {
+                case GlobalAction.EditorIncreaseDistanceSpacing:
+                case GlobalAction.EditorDecreaseDistanceSpacing:
+                    return AdjustDistanceSpacing(e.Action, adjust_step);
+            }
+
+            return false;
+        }
+
+        public virtual void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
+
+        public bool OnScroll(KeyBindingScrollEvent<GlobalAction> e)
+        {
+            switch (e.Action)
+            {
+                case GlobalAction.EditorIncreaseDistanceSpacing:
+                case GlobalAction.EditorDecreaseDistanceSpacing:
+                    return AdjustDistanceSpacing(e.Action, e.ScrollAmount * adjust_step);
+            }
+
+            return false;
+        }
+
+        protected virtual bool AdjustDistanceSpacing(GlobalAction action, float amount)
+        {
+            if (DistanceSpacingMultiplier.Disabled)
+                return false;
+
+            if (action == GlobalAction.EditorIncreaseDistanceSpacing)
+                DistanceSpacingMultiplier.Value += amount;
+            else if (action == GlobalAction.EditorDecreaseDistanceSpacing)
+                DistanceSpacingMultiplier.Value -= amount;
+
+            DistanceSnapToggle.Value = TernaryState.True;
+            return true;
+        }
+
+        #region IDistanceSnapProvider
+
+        public virtual float GetBeatSnapDistanceAt(HitObject referenceObject, bool useReferenceSliderVelocity = true)
+        {
+            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocityMultiplier : 1) * editorBeatmap.Difficulty.SliderMultiplier * 1
+                           / beatSnapProvider.BeatDivisor);
+        }
+
+        public virtual float DurationToDistance(HitObject referenceObject, double duration)
+        {
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceObject.StartTime);
+            return (float)(duration / beatLength * GetBeatSnapDistanceAt(referenceObject));
+        }
+
+        public virtual double DistanceToDuration(HitObject referenceObject, float distance)
+        {
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(referenceObject.StartTime);
+            return distance / GetBeatSnapDistanceAt(referenceObject) * beatLength;
+        }
+
+        public virtual double FindSnappedDuration(HitObject referenceObject, float distance)
+            => beatSnapProvider.SnapTime(referenceObject.StartTime + DistanceToDuration(referenceObject, distance), referenceObject.StartTime) - referenceObject.StartTime;
+
+        public virtual float FindSnappedDistance(HitObject referenceObject, float distance)
+        {
+            double startTime = referenceObject.StartTime;
+
+            double actualDuration = startTime + DistanceToDuration(referenceObject, distance);
+
+            double snappedEndTime = beatSnapProvider.SnapTime(actualDuration, startTime);
+
+            double beatLength = beatSnapProvider.GetBeatLengthAtTime(startTime);
+
+            // we don't want to exceed the actual duration and snap to a point in the future.
+            // as we are snapping to beat length via SnapTime (which will round-to-nearest), check for snapping in the forward direction and reverse it.
+            if (snappedEndTime > actualDuration + 1)
+                snappedEndTime -= beatLength;
+
+            return DurationToDistance(referenceObject, snappedEndTime - startTime);
+        }
+
+        #endregion
+
+        private partial class DistanceSpacingToast : Toast
+        {
+            private readonly ValueChangedEvent<double> change;
+
+            public DistanceSpacingToast(LocalisableString value, ValueChangedEvent<double> change)
+                : base(getAction(change).GetLocalisableDescription(), value, string.Empty)
+            {
+                this.change = change;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuConfigManager config)
+            {
+                ShortcutText.Text = config.LookupKeyBindings(getAction(change)).ToUpper();
+            }
+
+            private static GlobalAction getAction(ValueChangedEvent<double> change) => change.NewValue - change.OldValue > 0
+                ? GlobalAction.EditorIncreaseDistanceSpacing
+                : GlobalAction.EditorDecreaseDistanceSpacing;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
index 70b79c30f0..938e2d9011 100644
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Edit
             Precision = 0.01,
         };
 
-        IBindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
+        Bindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
 
         private ExpandableSlider<double, SizeSlider<double>> distanceSpacingSlider;
         private ExpandableButton currentDistanceSpacingButton;
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Edit
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
-        protected readonly Bindable<TernaryState> DistanceSnapToggle = new Bindable<TernaryState>();
+        public readonly Bindable<TernaryState> DistanceSnapToggle = new Bindable<TernaryState>();
 
         private bool distanceSnapMomentary;
 
diff --git a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
index af9d02f5c4..380038eadf 100644
--- a/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/IDistanceSnapProvider.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Edit
         /// Importantly, this is provided for manual usage, and not multiplied into any of the methods exposed by this interface.
         /// </summary>
         /// <seealso cref="BeatmapInfo.DistanceSpacing"/>
-        IBindable<double> DistanceSpacingMultiplier { get; }
+        Bindable<double> DistanceSpacingMultiplier { get; }
 
         /// <summary>
         /// Retrieves the distance between two points within a timing point that are one beat length apart.

From 31849192c39f555de03d34f1dc95cd24dce2834b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 11:42:40 +0200
Subject: [PATCH 1076/2296] Remove `DistancedHitObjectComposer` inheritance
 from catch composer

---
 .../Edit/CatchDistanceSnapProvider.cs         | 26 +++++++++++
 .../Edit/CatchHitObjectComposer.cs            | 44 ++++++++++---------
 2 files changed, 49 insertions(+), 21 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Edit/CatchDistanceSnapProvider.cs

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchDistanceSnapProvider.cs b/osu.Game.Rulesets.Catch/Edit/CatchDistanceSnapProvider.cs
new file mode 100644
index 0000000000..c3103bd204
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Edit/CatchDistanceSnapProvider.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 System;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Catch.Edit
+{
+    public partial class CatchDistanceSnapProvider : ComposerDistanceSnapProvider
+    {
+        protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
+        {
+            // osu!catch's distance snap implementation is limited, in that a custom spacing cannot be specified.
+            // Therefore this functionality is not currently used.
+            //
+            // The implementation below is probably correct but should be checked if/when exposed via controls.
+
+            float expectedDistance = DurationToDistance(before, after.StartTime - before.GetEndTime());
+            float actualDistance = Math.Abs(((CatchHitObject)before).EffectiveX - ((CatchHitObject)after).EffectiveX);
+
+            return actualDistance / expectedDistance;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index dc3a4416a5..50bc9ec157 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.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.Allocation;
@@ -9,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
@@ -20,13 +20,14 @@ using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit
 {
     // we're also a ScrollingHitObjectComposer candidate, but can't be everything can we?
-    public partial class CatchHitObjectComposer : DistancedHitObjectComposer<CatchHitObject>
+    public partial class CatchHitObjectComposer : HitObjectComposer<CatchHitObject>, IKeyBindingHandler<GlobalAction>
     {
         private const float distance_snap_radius = 50;
 
@@ -42,6 +43,9 @@ namespace osu.Game.Rulesets.Catch.Edit
             MaxValue = 10,
         };
 
+        [Cached(typeof(IDistanceSnapProvider))]
+        protected readonly CatchDistanceSnapProvider DistanceSnapProvider = new CatchDistanceSnapProvider();
+
         public CatchHitObjectComposer(CatchRuleset ruleset)
             : base(ruleset)
         {
@@ -50,8 +54,11 @@ namespace osu.Game.Rulesets.Catch.Edit
         [BackgroundDependencyLoader]
         private void load()
         {
+            AddInternal(DistanceSnapProvider);
+            DistanceSnapProvider.AttachToToolbox(RightToolbox);
+
             // todo: enable distance spacing once catch supports applying it to its existing distance snap grid implementation.
-            DistanceSpacingMultiplier.Disabled = true;
+            DistanceSnapProvider.DistanceSpacingMultiplier.Disabled = true;
 
             LayerBelowRuleset.Add(new PlayfieldBorder
             {
@@ -72,6 +79,10 @@ namespace osu.Game.Rulesets.Catch.Edit
             AddInternal(beatSnapGrid = new CatchBeatSnapGrid());
         }
 
+        protected override IEnumerable<TernaryButton> CreateTernaryButtons()
+            => base.CreateTernaryButtons()
+                   .Concat(DistanceSnapProvider.CreateTernaryButtons());
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -102,19 +113,6 @@ namespace osu.Game.Rulesets.Catch.Edit
             }
         }
 
-        protected override double ReadCurrentDistanceSnap(HitObject before, HitObject after)
-        {
-            // osu!catch's distance snap implementation is limited, in that a custom spacing cannot be specified.
-            // Therefore this functionality is not currently used.
-            //
-            // The implementation below is probably correct but should be checked if/when exposed via controls.
-
-            float expectedDistance = DurationToDistance(before, after.StartTime - before.GetEndTime());
-            float actualDistance = Math.Abs(((CatchHitObject)before).EffectiveX - ((CatchHitObject)after).EffectiveX);
-
-            return actualDistance / expectedDistance;
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -122,7 +120,7 @@ namespace osu.Game.Rulesets.Catch.Edit
             updateDistanceSnapGrid();
         }
 
-        public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
             {
@@ -131,14 +129,18 @@ namespace osu.Game.Rulesets.Catch.Edit
                 // May be worth considering standardising "zoom" behaviour with what the timeline uses (ie. alt-wheel) but that may cause new conflicts.
                 case GlobalAction.IncreaseScrollSpeed:
                     this.TransformBindableTo(timeRangeMultiplier, timeRangeMultiplier.Value - 1, 200, Easing.OutQuint);
-                    break;
+                    return true;
 
                 case GlobalAction.DecreaseScrollSpeed:
                     this.TransformBindableTo(timeRangeMultiplier, timeRangeMultiplier.Value + 1, 200, Easing.OutQuint);
-                    break;
+                    return true;
             }
 
-            return base.OnPressed(e);
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
         }
 
         protected override DrawableRuleset<CatchHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
@@ -224,7 +226,7 @@ namespace osu.Game.Rulesets.Catch.Edit
 
         private void updateDistanceSnapGrid()
         {
-            if (DistanceSnapToggle.Value != TernaryState.True)
+            if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True)
             {
                 distanceSnapGrid.Hide();
                 return;

From 144ef5a87c2b12d4fe525d15945b6ee0d844ff75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 11:43:11 +0200
Subject: [PATCH 1077/2296] Remove `DistancedHitObjectComposer`

---
 .../Edit/DistancedHitObjectComposer.cs        | 305 ------------------
 1 file changed, 305 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs

diff --git a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs b/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
deleted file mode 100644
index 938e2d9011..0000000000
--- a/osu.Game/Rulesets/Edit/DistancedHitObjectComposer.cs
+++ /dev/null
@@ -1,305 +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 System.Diagnostics;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions;
-using osu.Framework.Extensions.LocalisationExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
-using osu.Framework.Utils;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Input.Bindings;
-using osu.Game.Overlays;
-using osu.Game.Overlays.OSD;
-using osu.Game.Overlays.Settings.Sections;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Screens.Edit.Components.TernaryButtons;
-
-namespace osu.Game.Rulesets.Edit
-{
-    /// <summary>
-    /// Represents a <see cref="HitObjectComposer{TObject}"/> for rulesets with the concept of distances between objects.
-    /// </summary>
-    /// <typeparam name="TObject">The base type of supported objects.</typeparam>
-    public abstract partial class DistancedHitObjectComposer<TObject> : HitObjectComposer<TObject>, IDistanceSnapProvider, IScrollBindingHandler<GlobalAction>
-        where TObject : HitObject
-    {
-        private const float adjust_step = 0.1f;
-
-        public BindableDouble DistanceSpacingMultiplier { get; } = new BindableDouble(1.0)
-        {
-            MinValue = 0.1,
-            MaxValue = 6.0,
-            Precision = 0.01,
-        };
-
-        Bindable<double> IDistanceSnapProvider.DistanceSpacingMultiplier => DistanceSpacingMultiplier;
-
-        private ExpandableSlider<double, SizeSlider<double>> distanceSpacingSlider;
-        private ExpandableButton currentDistanceSpacingButton;
-
-        [Resolved(canBeNull: true)]
-        private OnScreenDisplay onScreenDisplay { get; set; }
-
-        public readonly Bindable<TernaryState> DistanceSnapToggle = new Bindable<TernaryState>();
-
-        private bool distanceSnapMomentary;
-
-        protected DistancedHitObjectComposer(Ruleset ruleset)
-            : base(ruleset)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            RightToolbox.Add(new EditorToolboxGroup("snapping")
-            {
-                Alpha = DistanceSpacingMultiplier.Disabled ? 0 : 1,
-                Children = new Drawable[]
-                {
-                    distanceSpacingSlider = new ExpandableSlider<double, SizeSlider<double>>
-                    {
-                        KeyboardStep = adjust_step,
-                        // Manual binding in LoadComplete to handle one-way event flow.
-                        Current = DistanceSpacingMultiplier.GetUnboundCopy(),
-                    },
-                    currentDistanceSpacingButton = new ExpandableButton
-                    {
-                        Action = () =>
-                        {
-                            (HitObject before, HitObject after)? objects = getObjectsOnEitherSideOfCurrentTime();
-
-                            Debug.Assert(objects != null);
-
-                            DistanceSpacingMultiplier.Value = ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after);
-                            DistanceSnapToggle.Value = TernaryState.True;
-                        },
-                        RelativeSizeAxes = Axes.X,
-                    }
-                }
-            });
-        }
-
-        private (HitObject before, HitObject after)? getObjectsOnEitherSideOfCurrentTime()
-        {
-            HitObject lastBefore = Playfield.HitObjectContainer.AliveObjects.LastOrDefault(h => h.HitObject.StartTime < EditorClock.CurrentTime)?.HitObject;
-
-            if (lastBefore == null)
-                return null;
-
-            HitObject firstAfter = Playfield.HitObjectContainer.AliveObjects.FirstOrDefault(h => h.HitObject.StartTime >= EditorClock.CurrentTime)?.HitObject;
-
-            if (firstAfter == null)
-                return null;
-
-            if (lastBefore == firstAfter)
-                return null;
-
-            return (lastBefore, firstAfter);
-        }
-
-        protected abstract double ReadCurrentDistanceSnap(HitObject before, HitObject after);
-
-        protected override void Update()
-        {
-            base.Update();
-
-            (HitObject before, HitObject after)? objects = getObjectsOnEitherSideOfCurrentTime();
-
-            double currentSnap = objects == null
-                ? 0
-                : ReadCurrentDistanceSnap(objects.Value.before, objects.Value.after);
-
-            if (currentSnap > DistanceSpacingMultiplier.MinValue)
-            {
-                currentDistanceSpacingButton.Enabled.Value = currentDistanceSpacingButton.Expanded.Value
-                                                             && !DistanceSpacingMultiplier.Disabled
-                                                             && !Precision.AlmostEquals(currentSnap, DistanceSpacingMultiplier.Value, DistanceSpacingMultiplier.Precision / 2);
-                currentDistanceSpacingButton.ContractedLabelText = $"current {currentSnap:N2}x";
-                currentDistanceSpacingButton.ExpandedLabelText = $"Use current ({currentSnap:N2}x)";
-            }
-            else
-            {
-                currentDistanceSpacingButton.Enabled.Value = false;
-                currentDistanceSpacingButton.ContractedLabelText = string.Empty;
-                currentDistanceSpacingButton.ExpandedLabelText = "Use current (unavailable)";
-            }
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            if (DistanceSpacingMultiplier.Disabled)
-            {
-                distanceSpacingSlider.Hide();
-                return;
-            }
-
-            DistanceSpacingMultiplier.Value = EditorBeatmap.BeatmapInfo.DistanceSpacing;
-            DistanceSpacingMultiplier.BindValueChanged(multiplier =>
-            {
-                distanceSpacingSlider.ContractedLabelText = $"D. S. ({multiplier.NewValue:0.##x})";
-                distanceSpacingSlider.ExpandedLabelText = $"Distance Spacing ({multiplier.NewValue:0.##x})";
-
-                if (multiplier.NewValue != multiplier.OldValue)
-                    onScreenDisplay?.Display(new DistanceSpacingToast(multiplier.NewValue.ToLocalisableString(@"0.##x"), multiplier));
-
-                EditorBeatmap.BeatmapInfo.DistanceSpacing = multiplier.NewValue;
-            }, true);
-
-            // Manual binding to handle enabling distance spacing when the slider is interacted with.
-            distanceSpacingSlider.Current.BindValueChanged(spacing =>
-            {
-                DistanceSpacingMultiplier.Value = spacing.NewValue;
-                DistanceSnapToggle.Value = TernaryState.True;
-            });
-            DistanceSpacingMultiplier.BindValueChanged(spacing => distanceSpacingSlider.Current.Value = spacing.NewValue);
-        }
-
-        protected override IEnumerable<TernaryButton> CreateTernaryButtons() => base.CreateTernaryButtons().Concat(new[]
-        {
-            new TernaryButton(DistanceSnapToggle, "Distance Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Ruler })
-        });
-
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            if (e.Repeat)
-                return false;
-
-            handleToggleViaKey(e);
-            return base.OnKeyDown(e);
-        }
-
-        protected override void OnKeyUp(KeyUpEvent e)
-        {
-            handleToggleViaKey(e);
-            base.OnKeyUp(e);
-        }
-
-        private void handleToggleViaKey(KeyboardEvent key)
-        {
-            bool altPressed = key.AltPressed;
-
-            if (altPressed != distanceSnapMomentary)
-            {
-                distanceSnapMomentary = altPressed;
-                DistanceSnapToggle.Value = DistanceSnapToggle.Value == TernaryState.False ? TernaryState.True : TernaryState.False;
-            }
-        }
-
-        public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
-        {
-            switch (e.Action)
-            {
-                case GlobalAction.EditorIncreaseDistanceSpacing:
-                case GlobalAction.EditorDecreaseDistanceSpacing:
-                    return AdjustDistanceSpacing(e.Action, adjust_step);
-            }
-
-            return false;
-        }
-
-        public virtual void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
-        {
-        }
-
-        public bool OnScroll(KeyBindingScrollEvent<GlobalAction> e)
-        {
-            switch (e.Action)
-            {
-                case GlobalAction.EditorIncreaseDistanceSpacing:
-                case GlobalAction.EditorDecreaseDistanceSpacing:
-                    return AdjustDistanceSpacing(e.Action, e.ScrollAmount * adjust_step);
-            }
-
-            return false;
-        }
-
-        protected virtual bool AdjustDistanceSpacing(GlobalAction action, float amount)
-        {
-            if (DistanceSpacingMultiplier.Disabled)
-                return false;
-
-            if (action == GlobalAction.EditorIncreaseDistanceSpacing)
-                DistanceSpacingMultiplier.Value += amount;
-            else if (action == GlobalAction.EditorDecreaseDistanceSpacing)
-                DistanceSpacingMultiplier.Value -= amount;
-
-            DistanceSnapToggle.Value = TernaryState.True;
-            return true;
-        }
-
-        public virtual float GetBeatSnapDistanceAt(HitObject referenceObject, bool useReferenceSliderVelocity = true)
-        {
-            return (float)(100 * (useReferenceSliderVelocity && referenceObject is IHasSliderVelocity hasSliderVelocity ? hasSliderVelocity.SliderVelocityMultiplier : 1) * EditorBeatmap.Difficulty.SliderMultiplier * 1
-                           / BeatSnapProvider.BeatDivisor);
-        }
-
-        public virtual float DurationToDistance(HitObject referenceObject, double duration)
-        {
-            double beatLength = BeatSnapProvider.GetBeatLengthAtTime(referenceObject.StartTime);
-            return (float)(duration / beatLength * GetBeatSnapDistanceAt(referenceObject));
-        }
-
-        public virtual double DistanceToDuration(HitObject referenceObject, float distance)
-        {
-            double beatLength = BeatSnapProvider.GetBeatLengthAtTime(referenceObject.StartTime);
-            return distance / GetBeatSnapDistanceAt(referenceObject) * beatLength;
-        }
-
-        public virtual double FindSnappedDuration(HitObject referenceObject, float distance)
-            => BeatSnapProvider.SnapTime(referenceObject.StartTime + DistanceToDuration(referenceObject, distance), referenceObject.StartTime) - referenceObject.StartTime;
-
-        public virtual float FindSnappedDistance(HitObject referenceObject, float distance)
-        {
-            double startTime = referenceObject.StartTime;
-
-            double actualDuration = startTime + DistanceToDuration(referenceObject, distance);
-
-            double snappedEndTime = BeatSnapProvider.SnapTime(actualDuration, startTime);
-
-            double beatLength = BeatSnapProvider.GetBeatLengthAtTime(startTime);
-
-            // we don't want to exceed the actual duration and snap to a point in the future.
-            // as we are snapping to beat length via SnapTime (which will round-to-nearest), check for snapping in the forward direction and reverse it.
-            if (snappedEndTime > actualDuration + 1)
-                snappedEndTime -= beatLength;
-
-            return DurationToDistance(referenceObject, snappedEndTime - startTime);
-        }
-
-        private partial class DistanceSpacingToast : Toast
-        {
-            private readonly ValueChangedEvent<double> change;
-
-            public DistanceSpacingToast(LocalisableString value, ValueChangedEvent<double> change)
-                : base(getAction(change).GetLocalisableDescription(), value, string.Empty)
-            {
-                this.change = change;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuConfigManager config)
-            {
-                ShortcutText.Text = config.LookupKeyBindings(getAction(change)).ToUpper();
-            }
-
-            private static GlobalAction getAction(ValueChangedEvent<double> change) => change.NewValue - change.OldValue > 0
-                ? GlobalAction.EditorIncreaseDistanceSpacing
-                : GlobalAction.EditorDecreaseDistanceSpacing;
-        }
-    }
-}

From 0c4e74c82dbc3423cb461cb73c2e1bd15867257c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 11:43:31 +0200
Subject: [PATCH 1078/2296] Inherit `ScrollingHitObjectComposer` in catch

---
 osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 50bc9ec157..04dd4827b6 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -26,8 +26,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit
 {
-    // we're also a ScrollingHitObjectComposer candidate, but can't be everything can we?
-    public partial class CatchHitObjectComposer : HitObjectComposer<CatchHitObject>, IKeyBindingHandler<GlobalAction>
+    public partial class CatchHitObjectComposer : ScrollingHitObjectComposer<CatchHitObject>, IKeyBindingHandler<GlobalAction>
     {
         private const float distance_snap_radius = 50;
 

From 013b5fa916d819ec7a8a93b1692d4aa027934a67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Oct 2023 23:54:34 +0900
Subject: [PATCH 1079/2296] Move beat snap grid implementation details to
 `ScrollingHitObjectComposer`

---
 .../Edit/CatchHitObjectComposer.cs            | 34 --------------
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 42 -----------------
 .../Edit/ScrollingHitObjectComposer.cs        | 46 +++++++++++++++++++
 3 files changed, 46 insertions(+), 76 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 2ccf99c6e6..9b258841b2 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -40,8 +40,6 @@ namespace osu.Game.Rulesets.Catch.Edit
         [Cached(typeof(IDistanceSnapProvider))]
         protected readonly CatchDistanceSnapProvider DistanceSnapProvider = new CatchDistanceSnapProvider();
 
-        private BeatSnapGrid beatSnapGrid = null!;
-
         public CatchHitObjectComposer(CatchRuleset ruleset)
             : base(ruleset)
         {
@@ -71,44 +69,12 @@ namespace osu.Game.Rulesets.Catch.Edit
                 Catcher.BASE_DASH_SPEED, -Catcher.BASE_DASH_SPEED,
                 Catcher.BASE_WALK_SPEED, -Catcher.BASE_WALK_SPEED,
             }));
-
-            AddInternal(beatSnapGrid = new CatchBeatSnapGrid());
         }
 
         protected override IEnumerable<TernaryButton> CreateTernaryButtons()
             => base.CreateTernaryButtons()
                    .Concat(DistanceSnapProvider.CreateTernaryButtons());
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            if (BlueprintContainer.CurrentTool is SelectTool)
-            {
-                if (EditorBeatmap.SelectedHitObjects.Any())
-                {
-                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
-                }
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-            else
-            {
-                var result = FindSnappedPositionAndTime(InputManager.CurrentState.Mouse.Position);
-                if (result.Time is double time)
-                    beatSnapGrid.SelectionTimeRange = (time, time);
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            updateDistanceSnapGrid();
-        }
-
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 129ab6751e..b68af49222 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -90,9 +90,6 @@ namespace osu.Game.Rulesets.Edit
 
         protected DrawableRuleset<TObject> DrawableRuleset { get; private set; }
 
-        [CanBeNull]
-        private BeatSnapGrid beatSnapGrid;
-
         protected HitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
@@ -209,8 +206,6 @@ namespace osu.Game.Rulesets.Edit
                         }
                     }
                 },
-                // Must be constructed after drawable ruleset above.
-                (beatSnapGrid = CreateBeatSnapGrid()) ?? Empty(),
             };
 
             toolboxCollection.Items = CompositionTools
@@ -275,37 +270,6 @@ namespace osu.Game.Rulesets.Edit
             }
         }
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            updateBeatSnapGrid();
-        }
-
-        private void updateBeatSnapGrid()
-        {
-            if (beatSnapGrid == null)
-                return;
-
-            if (BlueprintContainer.CurrentTool is SelectTool)
-            {
-                if (EditorBeatmap.SelectedHitObjects.Any())
-                {
-                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
-                }
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-            else
-            {
-                var result = FindSnappedPositionAndTime(InputManager.CurrentState.Mouse.Position);
-                if (result.Time is double time)
-                    beatSnapGrid.SelectionTimeRange = (time, time);
-                else
-                    beatSnapGrid.SelectionTimeRange = null;
-            }
-        }
-
         public override Playfield Playfield => drawableRulesetWrapper.Playfield;
 
         public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
@@ -336,12 +300,6 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         protected virtual ComposeBlueprintContainer CreateBlueprintContainer() => new ComposeBlueprintContainer(this);
 
-        /// <summary>
-        /// Construct an optional beat snap grid.
-        /// </summary>
-        [CanBeNull]
-        protected virtual BeatSnapGrid CreateBeatSnapGrid() => null;
-
         /// <summary>
         /// Construct a drawable ruleset for the provided ruleset.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
index cb92ebbd15..eb73cef01a 100644
--- a/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/ScrollingHitObjectComposer.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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -8,9 +9,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
+using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
 namespace osu.Game.Rulesets.Edit
@@ -21,6 +24,13 @@ namespace osu.Game.Rulesets.Edit
         private readonly Bindable<TernaryState> showSpeedChanges = new Bindable<TernaryState>();
         private Bindable<bool> configShowSpeedChanges = null!;
 
+        private BeatSnapGrid? beatSnapGrid;
+
+        /// <summary>
+        /// Construct an optional beat snap grid.
+        /// </summary>
+        protected virtual BeatSnapGrid? CreateBeatSnapGrid() => null;
+
         protected ScrollingHitObjectComposer(Ruleset ruleset)
             : base(ruleset)
         {
@@ -57,6 +67,42 @@ namespace osu.Game.Rulesets.Edit
                     configShowSpeedChanges.Value = enabled;
                 }, true);
             }
+
+            beatSnapGrid = CreateBeatSnapGrid();
+
+            if (beatSnapGrid != null)
+                AddInternal(beatSnapGrid);
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            updateBeatSnapGrid();
+        }
+
+        private void updateBeatSnapGrid()
+        {
+            if (beatSnapGrid == null)
+                return;
+
+            if (BlueprintContainer.CurrentTool is SelectTool)
+            {
+                if (EditorBeatmap.SelectedHitObjects.Any())
+                {
+                    beatSnapGrid.SelectionTimeRange = (EditorBeatmap.SelectedHitObjects.Min(h => h.StartTime), EditorBeatmap.SelectedHitObjects.Max(h => h.GetEndTime()));
+                }
+                else
+                    beatSnapGrid.SelectionTimeRange = null;
+            }
+            else
+            {
+                var result = FindSnappedPositionAndTime(InputManager.CurrentState.Mouse.Position);
+                if (result.Time is double time)
+                    beatSnapGrid.SelectionTimeRange = (time, time);
+                else
+                    beatSnapGrid.SelectionTimeRange = null;
+            }
         }
     }
 }

From 74b86349d58e5169e52bbdc70cef3dec81579a74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Oct 2023 23:57:36 +0900
Subject: [PATCH 1080/2296] Tidy up `CatchHitObjectComposer`

---
 .../Edit/CatchHitObjectComposer.cs            | 56 ++++++-------------
 1 file changed, 17 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 9b258841b2..6f0ee260ab 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
@@ -75,6 +74,23 @@ namespace osu.Game.Rulesets.Catch.Edit
             => base.CreateTernaryButtons()
                    .Concat(DistanceSnapProvider.CreateTernaryButtons());
 
+        protected override DrawableRuleset<CatchHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
+            new DrawableCatchEditorRuleset(ruleset, beatmap, mods)
+            {
+                TimeRangeMultiplier = { BindTarget = timeRangeMultiplier, }
+            };
+
+        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new CatchBlueprintContainer(this);
+
+        protected override BeatSnapGrid CreateBeatSnapGrid() => new CatchBeatSnapGrid();
+
+        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
+        {
+            new FruitCompositionTool(),
+            new JuiceStreamCompositionTool(),
+            new BananaShowerCompositionTool()
+        };
+
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
             switch (e.Action)
@@ -98,19 +114,6 @@ namespace osu.Game.Rulesets.Catch.Edit
         {
         }
 
-        protected override DrawableRuleset<CatchHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods) =>
-            new DrawableCatchEditorRuleset(ruleset, beatmap, mods)
-            {
-                TimeRangeMultiplier = { BindTarget = timeRangeMultiplier, }
-            };
-
-        protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
-        {
-            new FruitCompositionTool(),
-            new JuiceStreamCompositionTool(),
-            new BananaShowerCompositionTool()
-        };
-
         public override SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.All)
         {
             var result = base.FindSnappedPositionAndTime(screenSpacePosition, snapType);
@@ -129,10 +132,6 @@ namespace osu.Game.Rulesets.Catch.Edit
             return result;
         }
 
-        protected override ComposeBlueprintContainer CreateBlueprintContainer() => new CatchBlueprintContainer(this);
-
-        protected override BeatSnapGrid CreateBeatSnapGrid() => new CatchBeatSnapGrid();
-
         private PalpableCatchHitObject? getLastSnappableHitObject(double time)
         {
             var hitObject = EditorBeatmap.HitObjects.OfType<CatchHitObject>().LastOrDefault(h => h.GetEndTime() < time && !(h is BananaShower));
@@ -180,26 +179,5 @@ namespace osu.Game.Rulesets.Catch.Edit
                     return null;
             }
         }
-
-        private void updateDistanceSnapGrid()
-        {
-            if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True)
-            {
-                distanceSnapGrid.Hide();
-                return;
-            }
-
-            var sourceHitObject = getDistanceSnapGridSourceHitObject();
-
-            if (sourceHitObject == null)
-            {
-                distanceSnapGrid.Hide();
-                return;
-            }
-
-            distanceSnapGrid.Show();
-            distanceSnapGrid.StartTime = sourceHitObject.GetEndTime();
-            distanceSnapGrid.StartX = sourceHitObject.EffectiveX;
-        }
     }
 }

From cc1f1d2270043f452653bd82ea70e702ba41eacd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 19:47:49 +0200
Subject: [PATCH 1081/2296] Fix Floating Fruits not flipping playfield properly

Regressed by https://github.com/ppy/osu/pull/25070.
---
 .../Mods/TestSceneCatchModFloatingFruits.cs   | 21 +++++++++++++++++++
 .../Mods/CatchModFloatingFruits.cs            |  5 +----
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModFloatingFruits.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModFloatingFruits.cs
new file mode 100644
index 0000000000..73579d1c22
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModFloatingFruits.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Game.Rulesets.Catch.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Catch.Tests.Mods
+{
+    public partial class TestSceneCatchModFloatingFruits : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
+
+        [Test]
+        public void TestFloating() => CreateModTest(new ModTestData
+        {
+            Mod = new CatchModFloatingFruits(),
+            PassCondition = () => true
+        });
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index dd6757eac9..9d88c90576 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.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.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Catch.Objects;
@@ -21,10 +20,8 @@ namespace osu.Game.Rulesets.Catch.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
         {
-            drawableRuleset.PlayfieldAdjustmentContainer.Anchor = Anchor.Centre;
-            drawableRuleset.PlayfieldAdjustmentContainer.Origin = Anchor.Centre;
-
             drawableRuleset.PlayfieldAdjustmentContainer.Scale = new Vector2(1, -1);
+            drawableRuleset.PlayfieldAdjustmentContainer.Y = 1 - drawableRuleset.PlayfieldAdjustmentContainer.Y;
         }
     }
 }

From 2c6bf9e3469e4c004a41508dd802cad9b3882c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Oct 2023 20:45:47 +0200
Subject: [PATCH 1082/2296] Remove unused using directive

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b68af49222..07e5869e28 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;

From d73650331d05a11af6527627d54083d96e70acc8 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 03:26:12 +0900
Subject: [PATCH 1083/2296] Isolate diffcalc workflow runs

---
 .github/workflows/diffcalc.yml | 35 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index dbb4067676..67180f7ec2 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -101,7 +101,7 @@ permissions:
   pull-requests: write
 
 env:
-  COMMENT_TAG: execution-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+  EXECUTION_ID: execution-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
 
 jobs:
   check-permissions:
@@ -124,26 +124,15 @@ jobs:
       - name: Create comment
         uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
-          comment_tag: ${{ env.COMMENT_TAG }}
+          comment_tag: ${{ env.EXECUTION_ID }}
           message: |
             Difficulty calculation queued -- please wait! (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
             *This comment will update on completion*
 
-  wait-for-queue:
-    name: "Wait for previous workflows"
-    needs: check-permissions
-    runs-on: self-hosted
-    timeout-minutes: 50400 # 35 days, the maximum for jobs on self-hosted runners.
-    steps:
-      - uses: ahmadnassri/action-workflow-queue@f547ac848c16a9bb1b2ed4a850e0cc5098af2cf8 # v1.1.5
-        with:
-          timeout: 2147483647 # Around 24 days - the maximum supported by JS setTimeout().
-          delay: 120000 # Poll every 2 minutes - the API limit seems fairly low on this one.
-
   directory:
     name: Prepare directory
-    needs: wait-for-queue
+    needs: check-permissions
     runs-on: self-hosted
     outputs:
       GENERATOR_DIR: ${{ steps.set-outputs.outputs.GENERATOR_DIR }}
@@ -156,15 +145,15 @@ jobs:
       - name: Checkout diffcalc-sheet-generator
         uses: actions/checkout@v3
         with:
-          path: 'diffcalc-sheet-generator'
+          path: ${{ env.EXECUTION_ID }}
           repository: 'smoogipoo/diffcalc-sheet-generator'
 
       - name: Set outputs
         id: set-outputs
         run: |
-          echo "GENERATOR_DIR=${{ github.workspace }}/diffcalc-sheet-generator" >> "${GITHUB_OUTPUT}"
-          echo "GENERATOR_ENV=${{ github.workspace }}/diffcalc-sheet-generator/.env" >> "${GITHUB_OUTPUT}"
-          echo "GOOGLE_CREDS_FILE=${{ github.workspace }}/diffcalc-sheet-generator/google-credentials.json" >> "${GITHUB_OUTPUT}"
+          echo "GENERATOR_DIR=${{ github.workspace }}/${{ env.EXECUTION_ID }}" >> "${GITHUB_OUTPUT}"
+          echo "GENERATOR_ENV=${{ github.workspace }}/${{ env.EXECUTION_ID }}/.env" >> "${GITHUB_OUTPUT}"
+          echo "GOOGLE_CREDS_FILE=${{ github.workspace }}/${{ env.EXECUTION_ID }}/google-credentials.json" >> "${GITHUB_OUTPUT}"
 
   environment:
     name: Setup environment
@@ -176,7 +165,7 @@ jobs:
       - name: Add base environment
         run: |
           # Required by diffcalc-sheet-generator
-          cp '${{ github.workspace }}/diffcalc-sheet-generator/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          cp '${{ env.GENERATOR_DIR }}/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
           # Add Google credentials
           echo '${{ secrets.DIFFCALC_GOOGLE_CREDENTIALS }}' | base64 -d > "${{ needs.directory.outputs.GOOGLE_CREDS_FILE }}"
@@ -336,7 +325,7 @@ jobs:
         if: ${{ always() }}
         run: |
           cd "${{ needs.directory.outputs.GENERATOR_DIR }}"
-          docker-compose down
+          docker-compose down -v
 
   output-cli:
     name: Output info
@@ -358,7 +347,7 @@ jobs:
         if: ${{ needs.generator.result == 'success' }}
         uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
-          comment_tag: ${{ env.COMMENT_TAG }}
+          comment_tag: ${{ env.EXECUTION_ID }}
           mode: upsert
           create_if_not_exists: false
           message: |
@@ -369,7 +358,7 @@ jobs:
         if: ${{ needs.generator.result == 'failure' }}
         uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
-          comment_tag: ${{ env.COMMENT_TAG }}
+          comment_tag: ${{ env.EXECUTION_ID }}
           mode: upsert
           create_if_not_exists: false
           message: |
@@ -379,6 +368,6 @@ jobs:
         if: ${{ needs.generator.result == 'cancelled' }}
         uses: thollander/actions-comment-pull-request@363c6f6eae92cc5c3a66e95ba016fc771bb38943 # v2.4.2
         with:
-          comment_tag: ${{ env.COMMENT_TAG }}
+          comment_tag: ${{ env.EXECUTION_ID }}
           mode: delete
           message: '.' # Appears to be required by this action for non-error status code.

From 634323e71ee5ffa1aaa3c2ab0a5b77185f81536f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 11:24:16 +0900
Subject: [PATCH 1084/2296] Fix wrong variable

---
 .github/workflows/diffcalc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 67180f7ec2..6523903bb1 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -165,7 +165,7 @@ jobs:
       - name: Add base environment
         run: |
           # Required by diffcalc-sheet-generator
-          cp '${{ env.GENERATOR_DIR }}/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
+          cp '${{ needs.directory.outputs.GENERATOR_DIR }}/.env.sample' "${{ needs.directory.outputs.GENERATOR_ENV }}"
 
           # Add Google credentials
           echo '${{ secrets.DIFFCALC_GOOGLE_CREDENTIALS }}' | base64 -d > "${{ needs.directory.outputs.GOOGLE_CREDS_FILE }}"

From 6cf0cbf3a9042d1a39e9ed034f2431bd56ace9a2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 11:32:11 +0900
Subject: [PATCH 1085/2296] Remove repo checkout step

---
 .github/workflows/diffcalc.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 6523903bb1..11778b446b 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -139,9 +139,6 @@ jobs:
       GENERATOR_ENV: ${{ steps.set-outputs.outputs.GENERATOR_ENV }}
       GOOGLE_CREDS_FILE: ${{ steps.set-outputs.outputs.GOOGLE_CREDS_FILE }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
       - name: Checkout diffcalc-sheet-generator
         uses: actions/checkout@v3
         with:

From e3bbf293336facc07ccb8ecc76f64d27fb29bc01 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 11:34:08 +0900
Subject: [PATCH 1086/2296] Add cleanup step

---
 .github/workflows/diffcalc.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 11778b446b..99d8f25cc2 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -334,6 +334,14 @@ jobs:
           echo "Target: ${{ needs.generator.outputs.TARGET }}"
           echo "Spreadsheet: ${{ needs.generator.outputs.SPREADSHEET_LINK }}"
 
+  cleanup:
+    name: Cleanup
+    needs: [ directory, generator ]
+    if: ${{ always() }}
+    runs-on: self-hosted
+    run: |
+      rm -rf "${{ needs.directory.outputs.GENERATOR_DIR }}"
+
   update-comment:
     name: Update PR comment
     needs: [ create-comment, generator ]

From 6c61894514749dd1f545bee47aa7233045c364ca Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 11:35:31 +0900
Subject: [PATCH 1087/2296] Cleanup in a step

---
 .github/workflows/diffcalc.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index 99d8f25cc2..c5bac64ff2 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -339,8 +339,10 @@ jobs:
     needs: [ directory, generator ]
     if: ${{ always() }}
     runs-on: self-hosted
-    run: |
-      rm -rf "${{ needs.directory.outputs.GENERATOR_DIR }}"
+    steps:
+      - name: Cleanup
+        run: |
+          rm -rf "${{ needs.directory.outputs.GENERATOR_DIR }}"
 
   update-comment:
     name: Update PR comment

From f36a671eb41dce6dd08169891e8992962930aa9f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 15:38:00 +0900
Subject: [PATCH 1088/2296] Fix a couple of silly inspections

---
 osu.Game.Tests/Database/RealmTest.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Database/RealmTest.cs b/osu.Game.Tests/Database/RealmTest.cs
index d2779e3038..2812a97268 100644
--- a/osu.Game.Tests/Database/RealmTest.cs
+++ b/osu.Game.Tests/Database/RealmTest.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Tests.Database
                         Logger.Log($"Running test using realm file {testStorage.GetFullPath(realm.Filename)}");
                         testAction(realm, testStorage);
 
+                        // ReSharper disable once DisposeOnUsingVariable
                         realm.Dispose();
 
                         Logger.Log($"Final database size: {getFileSize(testStorage, realm)}");
@@ -58,6 +59,7 @@ namespace osu.Game.Tests.Database
                         Logger.Log($"Running test using realm file {testStorage.GetFullPath(realm.Filename)}");
                         await testAction(realm, testStorage);
 
+                        // ReSharper disable once DisposeOnUsingVariable
                         realm.Dispose();
 
                         Logger.Log($"Final database size: {getFileSize(testStorage, realm)}");

From f16400929d7eaddaddce0e0c56c30ae5254497e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 15:37:51 +0900
Subject: [PATCH 1089/2296] Update bindable flow to expose every spin, even
 after max bonus is reached

---
 .../Objects/Drawables/DrawableSpinner.cs      | 29 +++++++++----------
 .../Skinning/Argon/ArgonSpinner.cs            |  8 ++---
 .../Skinning/Default/DefaultSpinner.cs        |  8 ++---
 .../Skinning/Legacy/LegacySpinner.cs          |  8 ++---
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 9fa180cf93..72bf7bf1e9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -48,9 +48,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
         /// </summary>
-        public IBindable<double> GainedBonus => gainedBonus;
+        public double CurrentBonusScore => score_per_tick * (completedFullSpins.Value - HitObject.SpinsRequiredForBonus);
 
-        private readonly Bindable<double> gainedBonus = new BindableDouble();
+        /// <summary>
+        /// The maximum amount of bonus score which can be achieved from extra spins.
+        /// </summary>
+        public double MaximumBonusScore => score_per_tick * HitObject.MaximumBonusSpins;
+
+        public IBindable<int> CompletedFullSpins => completedFullSpins;
+
+        private readonly Bindable<int> completedFullSpins = new Bindable<int>();
 
         /// <summary>
         /// The number of spins per minute this spinner is spinning at, for display purposes.
@@ -286,8 +293,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
-        private int completedFullSpins;
-
         private void updateBonusScore()
         {
             if (ticks.Count == 0)
@@ -295,27 +300,21 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             int spins = (int)(Result.TotalRotation / 360);
 
-            if (spins < completedFullSpins)
+            if (spins < completedFullSpins.Value)
             {
                 // rewinding, silently handle
-                completedFullSpins = spins;
+                completedFullSpins.Value = spins;
                 return;
             }
 
-            while (completedFullSpins != spins)
+            while (completedFullSpins.Value != spins)
             {
                 var tick = ticks.FirstOrDefault(t => !t.Result.HasResult);
 
                 // tick may be null if we've hit the spin limit.
-                if (tick != null)
-                {
-                    tick.TriggerResult(true);
+                tick?.TriggerResult(true);
 
-                    if (tick is DrawableSpinnerBonusTick)
-                        gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequiredForBonus);
-                }
-
-                completedFullSpins++;
+                completedFullSpins.Value++;
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
index d5a9cf46c5..dc701aef53 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
@@ -85,17 +85,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             };
         }
 
-        private IBindable<double> gainedBonus = null!;
+        private IBindable<int> completedSpins = null!;
         private IBindable<double> spinsPerMinute = null!;
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
-            gainedBonus.BindValueChanged(bonus =>
+            completedSpins = drawableSpinner.CompletedFullSpins.GetBoundCopy();
+            completedSpins.BindValueChanged(bonus =>
             {
-                bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
+                bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
                 bonusCounter.FadeOutFromOne(1500);
                 bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
             });
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
index 071fbe6add..e001aeceae 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
@@ -80,17 +80,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             });
         }
 
-        private IBindable<double> gainedBonus = null!;
+        private IBindable<int> completedSpins = null!;
         private IBindable<double> spinsPerMinute = null!;
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
-            gainedBonus.BindValueChanged(bonus =>
+            completedSpins = drawableSpinner.CompletedFullSpins.GetBoundCopy();
+            completedSpins.BindValueChanged(bonus =>
             {
-                bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
+                bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
                 bonusCounter.FadeOutFromOne(1500);
                 bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
             });
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index d8f837ae5e..456f041554 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             });
         }
 
-        private IBindable<double> gainedBonus = null!;
+        private IBindable<int> completedSpins = null!;
         private IBindable<double> spinsPerMinute = null!;
 
         private readonly Bindable<bool> completed = new Bindable<bool>();
@@ -116,10 +116,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.LoadComplete();
 
-            gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
-            gainedBonus.BindValueChanged(bonus =>
+            completedSpins = DrawableSpinner.CompletedFullSpins.GetBoundCopy();
+            completedSpins.BindValueChanged(bonus =>
             {
-                bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
+                bonusCounter.Text = DrawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
                 bonusCounter.FadeOutFromOne(800, Easing.Out);
                 bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
             });

From 0da0855692ddc73c519a62aaa2dddf7355926de7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 16:10:50 +0900
Subject: [PATCH 1090/2296] Add ability to change spin speed in spinner test

---
 .../TestSceneSpinner.cs                       | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index b1d9c453d6..ea57a6a1b5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Audio;
@@ -26,6 +27,15 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private TestDrawableSpinner drawableSpinner;
 
+        private readonly BindableDouble spinRate = new BindableDouble();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AddSliderStep("Spin rate", 0.5, 5, 1, val => spinRate.Value = val);
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void TestVariousSpinners(bool autoplay)
@@ -86,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { OverallDifficulty = od });
 
-                return drawableSpinner = new TestDrawableSpinner(spinner, true)
+                return drawableSpinner = new TestDrawableSpinner(spinner, true, spinRate)
                 {
                     Anchor = Anchor.Centre,
                     Depth = depthIndex++,
@@ -114,7 +124,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });
 
-            drawableSpinner = new TestDrawableSpinner(spinner, auto)
+            drawableSpinner = new TestDrawableSpinner(spinner, auto, spinRate)
             {
                 Anchor = Anchor.Centre,
                 Depth = depthIndex++,
@@ -130,18 +140,20 @@ namespace osu.Game.Rulesets.Osu.Tests
         private partial class TestDrawableSpinner : DrawableSpinner
         {
             private readonly bool auto;
+            private readonly BindableDouble spinRate;
 
-            public TestDrawableSpinner(Spinner s, bool auto)
+            public TestDrawableSpinner(Spinner s, bool auto, BindableDouble spinRate)
                 : base(s)
             {
                 this.auto = auto;
+                this.spinRate = spinRate;
             }
 
             protected override void Update()
             {
                 base.Update();
                 if (auto)
-                    RotationTracker.AddRotation((float)(Clock.ElapsedFrameTime * 2));
+                    RotationTracker.AddRotation((float)(Clock.ElapsedFrameTime * spinRate.Value));
             }
         }
     }

From 3986cec949cac13b70a16d3d99d5211ce0e54516 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 15:57:13 +0900
Subject: [PATCH 1091/2296] Cap bonus score more correctly

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 72bf7bf1e9..d4e257d754 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
         /// </summary>
-        public double CurrentBonusScore => score_per_tick * (completedFullSpins.Value - HitObject.SpinsRequiredForBonus);
+        public double CurrentBonusScore => score_per_tick * Math.Clamp(completedFullSpins.Value - HitObject.SpinsRequiredForBonus, 0, HitObject.MaximumBonusSpins);
 
         /// <summary>
         /// The maximum amount of bonus score which can be achieved from extra spins.

From 181a98e8efd346e8f21c744af18239c402bc8f63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 16:05:29 +0900
Subject: [PATCH 1092/2296] Remove duplicate definition of bonus text in
 `ArgonSpinner`

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
index dc701aef53..b667c415fe 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
@@ -35,14 +35,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             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,

From ca3a3f600e61165d7f662ef63798e76d3dc18803 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 16:11:09 +0900
Subject: [PATCH 1093/2296] Update visuals of spinner implementations to show
 MAX score differently

---
 .../Skinning/Argon/ArgonSpinner.cs            | 22 ++++++++++++++----
 .../Skinning/Default/DefaultSpinner.cs        | 23 ++++++++++++++++---
 .../Skinning/Legacy/LegacySpinner.cs          | 16 +++++++++++--
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
index b667c415fe..ee9f228137 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
@@ -85,11 +85,25 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             base.LoadComplete();
 
             completedSpins = drawableSpinner.CompletedFullSpins.GetBoundCopy();
-            completedSpins.BindValueChanged(bonus =>
+            completedSpins.BindValueChanged(_ =>
             {
-                bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
-                bonusCounter.FadeOutFromOne(1500);
-                bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+                if (drawableSpinner.CurrentBonusScore <= 0)
+                    return;
+
+                if (drawableSpinner.CurrentBonusScore == drawableSpinner.MaximumBonusScore)
+                {
+                    bonusCounter.Text = "MAX";
+                    bonusCounter.ScaleTo(1.5f).Then().ScaleTo(2.8f, 1000, Easing.OutQuint);
+
+                    bonusCounter.FlashColour(Colour4.FromHex("FC618F"), 400);
+                    bonusCounter.FadeOutFromOne(500);
+                }
+                else
+                {
+                    bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
+                    bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+                    bonusCounter.FadeOutFromOne(1500);
+                }
             });
 
             spinsPerMinute = drawableSpinner.SpinsPerMinute.GetBoundCopy();
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
index e001aeceae..4a76a1aec4 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         private Container spmContainer = null!;
         private OsuSpriteText spmCounter = null!;
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         public DefaultSpinner()
         {
             RelativeSizeAxes = Axes.Both;
@@ -90,9 +93,23 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             completedSpins = drawableSpinner.CompletedFullSpins.GetBoundCopy();
             completedSpins.BindValueChanged(bonus =>
             {
-                bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
-                bonusCounter.FadeOutFromOne(1500);
-                bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+                if (drawableSpinner.CurrentBonusScore <= 0)
+                    return;
+
+                if (drawableSpinner.CurrentBonusScore == drawableSpinner.MaximumBonusScore)
+                {
+                    bonusCounter.Text = "MAX";
+                    bonusCounter.ScaleTo(1.5f).Then().ScaleTo(2.8f, 1000, Easing.OutQuint);
+
+                    bonusCounter.FlashColour(colours.YellowLight, 400);
+                    bonusCounter.FadeOutFromOne(500);
+                }
+                else
+                {
+                    bonusCounter.Text = drawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
+                    bonusCounter.FadeOutFromOne(1500);
+                    bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+                }
             });
 
             spinsPerMinute = drawableSpinner.SpinsPerMinute.GetBoundCopy();
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 456f041554..28acb4a996 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -119,9 +119,21 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             completedSpins = DrawableSpinner.CompletedFullSpins.GetBoundCopy();
             completedSpins.BindValueChanged(bonus =>
             {
+                if (DrawableSpinner.CurrentBonusScore <= 0)
+                    return;
+
                 bonusCounter.Text = DrawableSpinner.CurrentBonusScore.ToString(NumberFormatInfo.InvariantInfo);
-                bonusCounter.FadeOutFromOne(800, Easing.Out);
-                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+
+                if (DrawableSpinner.CurrentBonusScore == DrawableSpinner.MaximumBonusScore)
+                {
+                    bonusCounter.ScaleTo(1.4f).Then().ScaleTo(1.8f, 1000, Easing.Out);
+                    bonusCounter.FadeOutFromOne(500, Easing.Out);
+                }
+                else
+                {
+                    bonusCounter.FadeOutFromOne(800, Easing.Out);
+                    bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+                }
             });
 
             spinsPerMinute = DrawableSpinner.SpinsPerMinute.GetBoundCopy();

From 59a1915451e43e4619c68719ae770974f45bead3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 20 Oct 2023 10:25:28 +0200
Subject: [PATCH 1094/2296] Add failing test case for insufficient sample query
 leniency

---
 .../Beatmaps/Formats/LegacyBeatmapDecoderTest.cs    | 13 +++++++++++++
 osu.Game.Tests/Resources/sample-point-leniency.osu  | 10 ++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/sample-point-leniency.osu

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index fec7f86eb2..66151a51e6 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -1080,5 +1080,18 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(controlPoints.DifficultyPointAt(3000).GenerateTicks, Is.True);
             }
         }
+
+        [Test]
+        public void TestSamplePointLeniency()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("sample-point-leniency.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var hitObject = decoder.Decode(stream).HitObjects.Single();
+                Assert.That(hitObject.Samples.Select(s => s.Volume), Has.All.EqualTo(70));
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Resources/sample-point-leniency.osu b/osu.Game.Tests/Resources/sample-point-leniency.osu
new file mode 100644
index 0000000000..a44838007c
--- /dev/null
+++ b/osu.Game.Tests/Resources/sample-point-leniency.osu
@@ -0,0 +1,10 @@
+osu file format v14
+
+# extracted from https://osu.ppy.sh/beatmapsets/1859679#osu/3823636
+
+[TimingPoints]
+39166,-117.647058823529,4,2,1,5,0,0
+39262,-117.647058823529,4,2,1,70,0,0
+
+[HitObjects]
+440,70,39260,1,10,0:2:0:0:

From c89081589ccbaabef181530a203300116dd3ea00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 20 Oct 2023 10:26:16 +0200
Subject: [PATCH 1095/2296] Fix insufficient leniency when querying sample
 points

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 8559ecfe69..8c5e4971d5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -28,9 +28,12 @@ namespace osu.Game.Beatmaps.Formats
         public const int EARLY_VERSION_TIMING_OFFSET = 24;
 
         /// <summary>
-        /// A small adjustment to the start time of control points to account for rounding/precision errors.
+        /// A small adjustment to the start time of sample control points to account for rounding/precision errors.
         /// </summary>
-        private const double control_point_leniency = 1;
+        /// <remarks>
+        /// Compare: https://github.com/peppy/osu-stable-reference/blob/master/osu!/GameplayElements/HitObjects/HitObject.cs#L319
+        /// </remarks>
+        private const double control_point_leniency = 5;
 
         internal static RulesetStore? RulesetStore;
 

From 4a3a4ee17fd6fdae95e7d2143d61297477028c20 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 20 Oct 2023 11:47:00 +0200
Subject: [PATCH 1096/2296] Change beatmap listing key to B to match Ctrl-B
 shortcut

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 2ead18c3d6..9f881089c3 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -132,11 +132,9 @@ namespace osu.Game.Screens.Menu
             buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Playlists, @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH,
-                Key.P));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0,
-                Key.D));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));

From 3fb74cb5f936f4fb8380f29cf1430c7e4bda5da7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 18:57:14 +0900
Subject: [PATCH 1097/2296] Move helper method to `LegacyRulesetExtensions` and
 stop applying rounding allowance to catch

As discussed, it isn't used in stable like this. Was a mistake.
---
 .../Objects/CatchHitObject.cs                 |  3 ++-
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  3 ++-
 .../TestSceneSliderFollowCircleInput.cs       |  3 ++-
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs |  3 ++-
 .../Statistics/AccuracyHeatmap.cs             |  3 ++-
 osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs   | 15 ---------------
 .../Objects/Legacy/LegacyRulesetExtensions.cs | 19 +++++++++++++++++++
 7 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 1d536eb5cb..b9fef6bf8c 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -8,6 +8,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
@@ -151,7 +152,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             TimePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
 
-            Scale = IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize);
+            Scale = LegacyRulesetExtensions.CalculateScaleFromCircleSize(difficulty.CircleSize);
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index f09614816d..0c2c157d10 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Skinning;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -469,7 +470,7 @@ namespace osu.Game.Rulesets.Catch.UI
         /// <summary>
         /// Calculates the scale of the catcher based off the provided beatmap difficulty.
         /// </summary>
-        private static Vector2 calculateScale(IBeatmapDifficultyInfo difficulty) => new Vector2(IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize) * 2);
+        private static Vector2 calculateScale(IBeatmapDifficultyInfo difficulty) => new Vector2(LegacyRulesetExtensions.CalculateScaleFromCircleSize(difficulty.CircleSize) * 2);
 
         private enum DroppedObjectAnimation
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
index 0e5f8a8cf6..d4bb789a12 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
@@ -10,6 +10,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
@@ -35,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             const double time_slider_start = 1000;
 
-            float circleRadius = OsuHitObject.OBJECT_RADIUS * IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(circleSize);
+            float circleRadius = OsuHitObject.OBJECT_RADIUS * LegacyRulesetExtensions.CalculateScaleFromCircleSize(circleSize, true);
             float followCircleRadius = circleRadius * 1.2f;
 
             performTest(new Beatmap<OsuHitObject>
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 0b1f413362..d74d28c748 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
@@ -155,7 +156,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             // This adjustment is necessary for AR>10, otherwise TimePreempt can become smaller leading to hitcircles not fully fading in.
             TimeFadeIn = 400 * Math.Min(1, TimePreempt / PREEMPT_MIN);
 
-            Scale = IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(difficulty.CircleSize);
+            Scale = LegacyRulesetExtensions.CalculateScaleFromCircleSize(difficulty.CircleSize, true);
         }
 
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();
diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 8a2c7ff13a..83bab7dc01 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -13,6 +13,7 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
 using osuTK;
@@ -208,7 +209,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
             if (score.HitEvents.Count == 0)
                 return;
 
-            float radius = OsuHitObject.OBJECT_RADIUS * IBeatmapDifficultyInfo.CalculateScaleFromCircleSize(playableBeatmap.Difficulty.CircleSize);
+            float radius = OsuHitObject.OBJECT_RADIUS * LegacyRulesetExtensions.CalculateScaleFromCircleSize(playableBeatmap.Difficulty.CircleSize, true);
 
             foreach (var e in score.HitEvents.Where(e => e.HitObject is HitCircle && !(e.HitObject is SliderTailCircle)))
             {
diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index 19944afa1c..e7a3d87d0a 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -44,21 +44,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         double SliderTickRate { get; }
 
-        static float CalculateScaleFromCircleSize(float circleSize)
-        {
-            // The following comment is copied verbatim from osu-stable:
-            //
-            //   Builds of osu! up to 2013-05-04 had the gamefield being rounded down, which caused incorrect radius calculations
-            //   in widescreen cases. This ratio adjusts to allow for old replays to work post-fix, which in turn increases the lenience
-            //   for all plays, but by an amount so small it should only be effective in replays.
-            //
-            // To match expectations of gameplay we need to apply this multiplier to circle scale. It's weird but is what it is.
-            // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
-            const float broken_gamefield_rounding_allowance = 1.00041f;
-
-            return (float)(1.0f - 0.7f * DifficultyRange(circleSize)) / 2 * broken_gamefield_rounding_allowance;
-        }
-
         /// <summary>
         /// Maps a difficulty value [0, 10] to a two-piece linear range of values.
         /// </summary>
diff --git a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
index 6cff4b12c4..f006d5e998 100644
--- a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects.Types;
 
@@ -38,5 +39,23 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             return timingControlPoint.BeatLength * bpmMultiplier;
         }
+
+        /// <summary>
+        /// Calculates scale from a CS value, with an optional fudge that was historically applied to the osu! ruleset.
+        /// </summary>
+        public static float CalculateScaleFromCircleSize(float circleSize, bool applyFudge = false)
+        {
+            // The following comment is copied verbatim from osu-stable:
+            //
+            //   Builds of osu! up to 2013-05-04 had the gamefield being rounded down, which caused incorrect radius calculations
+            //   in widescreen cases. This ratio adjusts to allow for old replays to work post-fix, which in turn increases the lenience
+            //   for all plays, but by an amount so small it should only be effective in replays.
+            //
+            // To match expectations of gameplay we need to apply this multiplier to circle scale. It's weird but is what it is.
+            // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
+            const float broken_gamefield_rounding_allowance = 1.00041f;
+
+            return (float)(1.0f - 0.7f * IBeatmapDifficultyInfo.DifficultyRange(circleSize)) / 2 * broken_gamefield_rounding_allowance;
+        }
     }
 }

From 3c3b0a15a666e6be2d1a2cd7c7f82d841dd7cfed Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 20 Oct 2023 18:58:32 +0900
Subject: [PATCH 1098/2296] Only run cleanup if directory was created

---
 .github/workflows/diffcalc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index c5bac64ff2..e7c628e365 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -337,7 +337,7 @@ jobs:
   cleanup:
     name: Cleanup
     needs: [ directory, generator ]
-    if: ${{ always() }}
+    if: ${{ always() && needs.directory.result == 'success' }}
     runs-on: self-hosted
     steps:
       - name: Cleanup

From 1be49f5b93ed4c2738fb411b0a3d99ad34730f27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 19:04:24 +0900
Subject: [PATCH 1099/2296] Update osu! difficulty calculator tests to factor
 in fractional changes

---
 .../OsuDifficultyCalculatorTest.cs                   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index f1c1c4734d..7b7deb9c67 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -15,22 +15,22 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
 
-        [TestCase(6.7115569159190587d, 206, "diffcalc-test")]
-        [TestCase(1.4391311903612753d, 45, "zero-length-sliders")]
+        [TestCase(6.710442985146793d, 206, "diffcalc-test")]
+        [TestCase(1.4386882251130073d, 45, "zero-length-sliders")]
         [TestCase(0.42506480230838789d, 2, "very-fast-slider")]
         [TestCase(0.14102693012101306d, 1, "nan-slider")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)
             => base.Test(expectedStarRating, expectedMaxCombo, name);
 
-        [TestCase(8.9757300665532966d, 206, "diffcalc-test")]
+        [TestCase(8.9742952703071666d, 206, "diffcalc-test")]
         [TestCase(0.55071082800473514d, 2, "very-fast-slider")]
-        [TestCase(1.7437232654020756d, 45, "zero-length-sliders")]
+        [TestCase(1.743180218215227d, 45, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModDoubleTime());
 
-        [TestCase(6.7115569159190587d, 239, "diffcalc-test")]
+        [TestCase(6.710442985146793d, 239, "diffcalc-test")]
         [TestCase(0.42506480230838789d, 4, "very-fast-slider")]
-        [TestCase(1.4391311903612753d, 54, "zero-length-sliders")]
+        [TestCase(1.4386882251130073d, 54, "zero-length-sliders")]
         public void TestClassicMod(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModClassic());
 

From 5bbbca3e44c9c61964d86c2bb414674fc6cb6965 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 20 Oct 2023 12:22:00 +0200
Subject: [PATCH 1100/2296] Also support `D` for those with muscle memory from
 stable

---
 osu.Game/Screens/Menu/ButtonSystem.cs   | 2 +-
 osu.Game/Screens/Menu/MainMenuButton.cs | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 9f881089c3..bf2eba43c0 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Menu
 
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B, Key.D));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index cd3795711e..c3a96e36a1 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Linq;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -34,7 +35,7 @@ namespace osu.Game.Screens.Menu
     {
         public event Action<ButtonState> StateChanged;
 
-        public readonly Key TriggerKey;
+        public readonly Key[] TriggerKeys;
 
         private readonly Container iconText;
         private readonly Container box;
@@ -53,11 +54,11 @@ namespace osu.Game.Screens.Menu
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
-        public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
+        public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, params Key[] triggerKeys)
         {
             this.sampleName = sampleName;
             this.clickAction = clickAction;
-            TriggerKey = triggerKey;
+            TriggerKeys = triggerKeys;
 
             AutoSizeAxes = Axes.Both;
             Alpha = 0;
@@ -213,7 +214,7 @@ namespace osu.Game.Screens.Menu
             if (e.Repeat || e.ControlPressed || e.ShiftPressed || e.AltPressed || e.SuperPressed)
                 return false;
 
-            if (TriggerKey == e.Key && TriggerKey != Key.Unknown)
+            if (TriggerKeys.Contains(e.Key))
             {
                 trigger();
                 return true;

From 137a1d948dad5382af169b4660d57e7f31605253 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 20:04:11 +0900
Subject: [PATCH 1101/2296] Allow interacting with the carousel anywhere in
 empty space at song select

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

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 16ae54b413..eb47a7201a 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -1197,6 +1197,8 @@ namespace osu.Game.Screens.Select
         {
             private bool rightMouseScrollBlocked;
 
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
             public CarouselScrollContainer()
             {
                 // size is determined by the carousel itself, due to not all content necessarily being loaded.

From 0ae0b0c353618b7289d6fe6b6aac7c34ad9b9886 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 20:04:26 +0900
Subject: [PATCH 1102/2296] Fix carousel "reset position" marging not scaling
 with UI scale correctly

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index bac84b8134..f792f3e4f5 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -171,11 +171,6 @@ namespace osu.Game.Screens.Select
 
             AddRangeInternal(new Drawable[]
             {
-                new ResetScrollContainer(() => Carousel.ScrollToSelected())
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 250,
-                },
                 new VerticalMaskingContainer
                 {
                     Children = new Drawable[]
@@ -243,6 +238,10 @@ namespace osu.Game.Screens.Select
                                         Padding = new MarginPadding { Top = left_area_padding },
                                         Children = new Drawable[]
                                         {
+                                            new ResetScrollContainer(() => Carousel.ScrollToSelected())
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                            },
                                             beatmapInfoWedge = new BeatmapInfoWedge
                                             {
                                                 Height = WEDGE_HEIGHT,

From 906b700acac611deabd13f6c62ea0d467311940d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Oct 2023 20:18:14 +0900
Subject: [PATCH 1103/2296] Fix fudge not being applied

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

diff --git a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
index f006d5e998..53cf835248 100644
--- a/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/LegacyRulesetExtensions.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             // It works out to under 1 game pixel and is generally not meaningful to gameplay, but is to replay playback accuracy.
             const float broken_gamefield_rounding_allowance = 1.00041f;
 
-            return (float)(1.0f - 0.7f * IBeatmapDifficultyInfo.DifficultyRange(circleSize)) / 2 * broken_gamefield_rounding_allowance;
+            return (float)(1.0f - 0.7f * IBeatmapDifficultyInfo.DifficultyRange(circleSize)) / 2 * (applyFudge ? broken_gamefield_rounding_allowance : 1);
         }
     }
 }

From 6e8a4c2eff989fe560f93b886b3feef8c1e6995f Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 17:11:21 +0900
Subject: [PATCH 1104/2296] Fix toolbar ruleset buttons not having hover sounds

---
 osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index 88326d4048..20415f7507 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
@@ -38,6 +39,8 @@ namespace osu.Game.Overlays.Toolbar
 
         private partial class RulesetButton : ToolbarButton
         {
+            protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds(HoverSampleSet.Button);
+
             public bool Active
             {
                 set

From ba6e36bd675144cfcffb4e137c62d1f26cf2479e Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 17:18:50 +0900
Subject: [PATCH 1105/2296] Remove `NowPlayingOverlay` custom pop-in/pop-out
 samples in favour of the generic overlay ones

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 809c1af408..5bbf18a959 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -55,8 +55,7 @@ namespace osu.Game.Overlays
         private Container playerContainer = null!;
         private Container playlistContainer = null!;
 
-        protected override string PopInSampleName => "UI/now-playing-pop-in";
-        protected override string PopOutSampleName => "UI/now-playing-pop-out";
+        protected override double PopInOutSampleBalance => OsuGameBase.SFX_STEREO_STRENGTH * 0.75f;
 
         [Resolved]
         private MusicController musicController { get; set; } = null!;

From bf608a6b08a7f185e635bc7b24e8fb14829323e6 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 17:19:45 +0900
Subject: [PATCH 1106/2296] Use `Button` sample set for `NewsCard`

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

diff --git a/osu.Game/Overlays/News/NewsCard.cs b/osu.Game/Overlays/News/NewsCard.cs
index b12aa4509e..8a579a5ccc 100644
--- a/osu.Game/Overlays/News/NewsCard.cs
+++ b/osu.Game/Overlays/News/NewsCard.cs
@@ -14,6 +14,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.News
@@ -28,6 +29,7 @@ namespace osu.Game.Overlays.News
         private TextFlowContainer main = null!;
 
         public NewsCard(APINewsPost post)
+            : base(HoverSampleSet.Button)
         {
             this.post = post;
 

From e17c94d09d630972b90d92c117bf45f86ca01045 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 17:23:39 +0900
Subject: [PATCH 1107/2296] Change ruleset button hover samples to `Default`
 instead of `Button` to match other toolbar buttons

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

diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index 20415f7507..74f76c7c89 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Toolbar
 
         private partial class RulesetButton : ToolbarButton
         {
-            protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds(HoverSampleSet.Button);
+            protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds();
 
             public bool Active
             {

From 6dc4dbde137c71bc118e7aabcf135664874d04d7 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 17:24:51 +0900
Subject: [PATCH 1108/2296] Reduce `LoginOverlay` pop-in/pop-out sample panning
 to match `NowPlayingOverlay`

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

diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index 8a4bda89d9..c0aff6aae9 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays
 
         private const float transition_time = 400;
 
-        protected override double PopInOutSampleBalance => OsuGameBase.SFX_STEREO_STRENGTH;
+        protected override double PopInOutSampleBalance => OsuGameBase.SFX_STEREO_STRENGTH * 0.75f;
 
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);

From 6b28f8561567e5c8f25562760d8d34dabf302f36 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 20 Oct 2023 14:36:36 +0900
Subject: [PATCH 1109/2296] Change `RevertToDefaultButton` and `BackButton` to
 use `Default` sampleset instead

---
 osu.Game/Overlays/RevertToDefaultButton.cs  | 6 ------
 osu.Game/Overlays/Settings/SidebarButton.cs | 4 ++--
 osu.Game/Overlays/SettingsSubPanel.cs       | 6 ++++++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/RevertToDefaultButton.cs b/osu.Game/Overlays/RevertToDefaultButton.cs
index c43d233fc1..582138b0b4 100644
--- a/osu.Game/Overlays/RevertToDefaultButton.cs
+++ b/osu.Game/Overlays/RevertToDefaultButton.cs
@@ -13,7 +13,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osuTK;
 
@@ -56,11 +55,6 @@ namespace osu.Game.Overlays
             }
         }
 
-        public RevertToDefaultButton()
-            : base(HoverSampleSet.Button)
-        {
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Overlays/Settings/SidebarButton.cs b/osu.Game/Overlays/Settings/SidebarButton.cs
index 5fe0e1afc0..a63688762d 100644
--- a/osu.Game/Overlays/Settings/SidebarButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarButton.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Overlays.Settings
         [Resolved]
         protected OverlayColourProvider ColourProvider { get; private set; } = null!;
 
-        protected SidebarButton()
-            : base(HoverSampleSet.ButtonSidebar)
+        protected SidebarButton(HoverSampleSet? hoverSounds = HoverSampleSet.ButtonSidebar)
+            : base(hoverSounds)
         {
         }
 
diff --git a/osu.Game/Overlays/SettingsSubPanel.cs b/osu.Game/Overlays/SettingsSubPanel.cs
index 5890d1c8fa..1651975a74 100644
--- a/osu.Game/Overlays/SettingsSubPanel.cs
+++ b/osu.Game/Overlays/SettingsSubPanel.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
 using osuTK;
 
@@ -38,6 +39,11 @@ namespace osu.Game.Overlays
         {
             private Container content;
 
+            public BackButton()
+                : base(HoverSampleSet.Default)
+            {
+            }
+
             [BackgroundDependencyLoader]
             private void load()
             {

From fbf8f52f7d3e93955f20608161767f02df539cb9 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 20 Oct 2023 14:39:36 +0900
Subject: [PATCH 1110/2296] Add audio feedback for when keys are pressed during
 key binding

---
 osu.Game/Graphics/UserInterface/OsuTextBox.cs       |  1 +
 .../Settings/Sections/Input/KeyBindingRow.cs        | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 99803e2956..04ecfa7e9a 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -86,6 +86,7 @@ namespace osu.Game.Graphics.UserInterface
 
             Placeholder.Colour = colourProvider?.Foreground1 ?? new Color4(180, 180, 180, 255);
 
+            // Note that `KeyBindingRow` uses similar logic for input feedback, so remember to update there if changing here.
             var textAddedSamples = new Sample?[4];
             for (int i = 0; i < textAddedSamples.Length; i++)
                 textAddedSamples[i] = audio.Samples.Get($@"Keyboard/key-press-{1 + i}");
diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index 7a5a269eb3..c85fe4727a 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
@@ -17,6 +19,7 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -96,6 +99,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private KeyButton? bindTarget;
 
+        private Sample?[]? keypressSamples;
+
         private const float transition_time = 150;
         private const float height = 20;
         private const float padding = 5;
@@ -118,7 +123,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider, AudioManager audioManager)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -202,6 +207,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Scheduler.AddOnce(updateButtons);
                 updateIsDefaultValue();
             }, true);
+
+            keypressSamples = new Sample[4];
+            for (int i = 0; i < keypressSamples.Length; i++)
+                keypressSamples[i] = audioManager.Samples.Get($@"Keyboard/key-press-{1 + i}");
         }
 
         public void RestoreDefaults()
@@ -301,6 +310,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             Debug.Assert(bindTarget != null);
 
+            keypressSamples?[RNG.Next(0, keypressSamples.Length)]?.Play();
+
             bindTarget.UpdateKeyCombination(KeyCombination.FromInputState(e.CurrentState), KeyCombination.FromKey(e.Key));
             if (!isModifier(e.Key)) finalise();
 

From b321d556b68691e24183c366fccfed0eced5a81a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 20 Oct 2023 14:18:32 +0200
Subject: [PATCH 1111/2296] Enforce minimum gameplay sample volume of 5%

---
 .../Objects/Drawables/DrawableHoldNote.cs     |  6 ++++-
 .../Objects/Drawables/DrawableSlider.cs       |  6 ++++-
 .../Objects/Drawables/DrawableSpinner.cs      |  1 +
 .../Objects/Drawables/DrawableHitObject.cs    | 25 ++++++++++++++++++-
 .../UI/GameplaySampleTriggerSource.cs         |  6 ++++-
 osu.Game/Skinning/SkinnableSound.cs           |  8 +++++-
 6 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 86920927dc..3490d50871 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -108,7 +108,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                     RelativeSizeAxes = Axes.X
                 },
                 tailContainer = new Container<DrawableHoldNoteTail> { RelativeSizeAxes = Axes.Both },
-                slidingSample = new PausableSkinnableSound { Looping = true }
+                slidingSample = new PausableSkinnableSound
+                {
+                    Looping = true,
+                    MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME,
+                }
             });
 
             maskedContents.AddRange(new[]
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 09973ce5fd..b682d14879 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -107,7 +107,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
                 OverlayElementContainer = new Container { RelativeSizeAxes = Axes.Both, },
                 Ball,
-                slidingSample = new PausableSkinnableSound { Looping = true }
+                slidingSample = new PausableSkinnableSound
+                {
+                    Looping = true,
+                    MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME,
+                }
             });
 
             PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 9fa180cf93..1135ecc7d5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -99,6 +99,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 spinningSample = new PausableSkinnableSound
                 {
                     Volume = { Value = 0 },
+                    MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME,
                     Looping = true,
                     Frequency = { Value = spinning_sample_initial_frequency }
                 }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 3bb0e3dfb8..ce6475d3ce 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -159,6 +159,26 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         internal bool IsInitialized;
 
+        /// <summary>
+        /// The minimum allowable volume for sample playback.
+        /// <see cref="Samples"/> quieter than that will be forcibly played at this volume instead.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Drawable hitobjects adding their own custom samples, or other sample playback sources
+        /// (i.e. <see cref="GameplaySampleTriggerSource"/>) must enforce this themselves.
+        /// </para>
+        /// <para>
+        /// This sample volume floor is present in stable, although it is set at 8% rather than 5%.
+        /// See: https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/Audio/AudioEngine.cs#L1070,
+        /// https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/Audio/AudioEngine.cs#L1404-L1405.
+        /// The reason why it is 5% here is that the 8% cap was enforced in a silent manner
+        /// (i.e. the minimum selectable volume in the editor was 5%, but it would be played at 8% anyways),
+        /// which is confusing and arbitrary, so we're just doing 5% here at the cost of sacrificing strict parity.
+        /// </para>
+        /// </remarks>
+        public const int MINIMUM_SAMPLE_VOLUME = 5;
+
         /// <summary>
         /// Creates a new <see cref="DrawableHitObject"/>.
         /// </summary>
@@ -181,7 +201,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
             comboColourBrightness.BindTo(gameplaySettings.ComboColourNormalisationAmount);
 
             // Explicit non-virtual function call in case a DrawableHitObject overrides AddInternal.
-            base.AddInternal(Samples = new PausableSkinnableSound());
+            base.AddInternal(Samples = new PausableSkinnableSound
+            {
+                MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME
+            });
 
             CurrentSkin = skinSource;
             CurrentSkin.SourceChanged += skinSourceChanged;
diff --git a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
index fed262868d..b61e8d9674 100644
--- a/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
+++ b/osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
@@ -45,7 +46,10 @@ namespace osu.Game.Rulesets.UI
                 Child = hitSounds = new Container<SkinnableSound>
                 {
                     Name = "concurrent sample pool",
-                    ChildrenEnumerable = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new PausableSkinnableSound())
+                    ChildrenEnumerable = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new PausableSkinnableSound
+                    {
+                        MinimumSampleVolume = DrawableHitObject.MINIMUM_SAMPLE_VOLUME
+                    })
                 }
             };
         }
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 59b3799e0a..f866a4f8ec 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -20,6 +20,12 @@ namespace osu.Game.Skinning
     /// </summary>
     public partial class SkinnableSound : SkinReloadableDrawable, IAdjustableAudioComponent
     {
+        /// <summary>
+        /// The minimum allowable volume for <see cref="Samples"/>.
+        /// <see cref="Samples"/> that specify a lower <see cref="ISampleInfo.Volume"/> will be forcibly pulled up to this volume.
+        /// </summary>
+        public int MinimumSampleVolume { get; set; }
+
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
 
@@ -156,7 +162,7 @@ namespace osu.Game.Skinning
             {
                 var sample = samplePool?.GetPooledSample(s) ?? new PoolableSkinnableSample(s);
                 sample.Looping = Looping;
-                sample.Volume.Value = s.Volume / 100.0;
+                sample.Volume.Value = Math.Max(s.Volume, MinimumSampleVolume) / 100.0;
 
                 samplesContainer.Add(sample);
             }

From 12282fff5c23fefcbee4907c8d4e917801a8cf38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 20 Oct 2023 14:21:11 +0200
Subject: [PATCH 1112/2296] Disallow setting sample volume lower than 5% in
 editor

---
 .../Edit/Compose/Components/Timeline/SamplePointPiece.cs       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index b02cfb505e..28841fc9e5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -16,6 +16,7 @@ using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Edit.Timing;
 using osuTK;
 using osuTK.Graphics;
@@ -101,7 +102,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             },
                             volume = new IndeterminateSliderWithTextBoxInput<int>("Volume", new BindableInt(100)
                             {
-                                MinValue = 0,
+                                MinValue = DrawableHitObject.MINIMUM_SAMPLE_VOLUME,
                                 MaxValue = 100,
                             })
                         }

From ac8c2a173b2a2bedb4ea22fa46f0c7cf56a732e8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 20 Oct 2023 22:47:45 +0300
Subject: [PATCH 1113/2296] Apply velocity into legacy slider ball animation
 rate

---
 .../Skinning/Legacy/LegacySliderBall.cs       | 30 +++++++++++++------
 .../Legacy/OsuLegacySkinTransformer.cs        |  9 ++----
 osu.Game/Skinning/LegacySkinExtensions.cs     |  8 +++--
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 593a0d18dd..afc23921bf 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -1,8 +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 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.Sprites;
@@ -15,31 +17,41 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public partial class LegacySliderBall : CompositeDrawable
     {
-        private readonly Drawable animationContent;
-
         private readonly ISkin skin;
 
         [Resolved(canBeNull: true)]
         private DrawableHitObject? parentObject { get; set; }
 
-        public Color4 BallColour => animationContent.Colour;
-
         private Sprite layerNd = null!;
+        private Drawable ball = null!;
         private Sprite layerSpec = null!;
 
-        public LegacySliderBall(Drawable animationContent, ISkin skin)
+        public Color4 BallColour => ball.Colour;
+
+        public LegacySliderBall(ISkin skin)
         {
-            this.animationContent = animationContent;
             this.skin = skin;
 
             AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(DrawableHitObject drawableHitObject)
         {
             var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
 
+            DrawableSlider drawableSlider = (DrawableSlider)drawableHitObject;
+
+            // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
+            double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
+
+            double ballAnimationRate = Math.Max(
+                150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
+                LegacySkinExtensions.SIXTY_FRAME_TIME);
+
+            ball = skin.GetAnimation("sliderb", true, true, animationSeparator: "", frameLength: ballAnimationRate,
+                maxSize: OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE).AsNonNull();
+
             InternalChildren = new[]
             {
                 layerNd = new Sprite
@@ -49,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
+                LegacyColourCompatibility.ApplyWithDoubledAlpha(ball.With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;
@@ -78,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 if (skin.GetConfig<SkinConfiguration.LegacySetting, bool>(SkinConfiguration.LegacySetting.AllowSliderBallTint)?.Value == true)
                 {
                     accentColour.BindTo(parentObject.AccentColour);
-                    accentColour.BindValueChanged(a => animationContent.Colour = a.NewValue, true);
+                    accentColour.BindValueChanged(a => ball.Colour = a.NewValue, true);
                 }
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 3002cbe0ae..1de8fefaae 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -59,13 +59,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return null;
 
                     case OsuSkinComponents.SliderBall:
-                        var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "", maxSize: MAX_FOLLOW_CIRCLE_AREA_SIZE);
-
-                        // todo: slider ball has a custom frame delay based on velocity
-                        // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
-
-                        if (sliderBallContent != null)
-                            return new LegacySliderBall(sliderBallContent, this);
+                        if (GetTexture("sliderb") != null || GetTexture("sliderb0") != null)
+                            return new LegacySliderBall(this);
 
                         return null;
 
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 868f36fb34..62197fa8a7 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -200,7 +200,11 @@ namespace osu.Game.Skinning
             }
         }
 
-        private const double default_frame_time = 1000 / 60d;
+        /// <summary>
+        /// The frame length of each frame at a 60 FPS rate.
+        /// Default frame rate for legacy skin animations.
+        /// </summary>
+        public const double SIXTY_FRAME_TIME = 1000 / 60d;
 
         private static double getFrameLength(ISkin source, bool applyConfigFrameRate, Texture[] textures)
         {
@@ -214,7 +218,7 @@ namespace osu.Game.Skinning
                 return 1000f / textures.Length;
             }
 
-            return default_frame_time;
+            return SIXTY_FRAME_TIME;
         }
     }
 }

From 7373a9a784ce32d047d3a15eafe0dc946f2179d9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 20 Oct 2023 23:54:29 +0300
Subject: [PATCH 1114/2296] Remove unnecessary usage of `ApplyWithDoubledAlpha`

---
 .../Skinning/Legacy/LegacySliderBall.cs             | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index afc23921bf..5413b0c1d7 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -49,8 +50,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
                 LegacySkinExtensions.SIXTY_FRAME_TIME);
 
-            ball = skin.GetAnimation("sliderb", true, true, animationSeparator: "", frameLength: ballAnimationRate,
-                maxSize: OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE).AsNonNull();
+            Vector2 maxSize = OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE;
 
             InternalChildren = new[]
             {
@@ -58,19 +58,20 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE),
+                    Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(maxSize),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                LegacyColourCompatibility.ApplyWithDoubledAlpha(ball.With(d =>
+                ball = skin.GetAnimation("sliderb", true, true, animationSeparator: "", frameLength: ballAnimationRate, maxSize: maxSize).AsNonNull().With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;
-                }), ballColour),
+                    d.Colour = ballColour;
+                }),
                 layerSpec = new Sprite
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE),
+                    Texture = skin.GetTexture("sliderb-spec")?.WithMaximumSize(maxSize),
                     Blending = BlendingParameters.Additive,
                 },
             };

From 80ce78e05dc2e97947c21520fb9fc7264259a9ea Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 19 Oct 2023 13:59:07 +0300
Subject: [PATCH 1115/2296] Remove animation support from osu! hit circle
 overlay

---
 .../Skinning/Legacy/LegacyMainCirclePiece.cs               | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 3ec914596a..d8d86d1802 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -62,12 +63,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             // otherwise fall back to the default prefix "hitcircle".
             string circleName = (priorityLookupPrefix != null && skin.GetTexture(priorityLookupPrefix) != null) ? priorityLookupPrefix : @"hitcircle";
 
+            Vector2 maxSize = OsuHitObject.OBJECT_DIMENSIONS * 2;
+
             // at this point, any further texture fetches should be correctly using the priority source if the base texture was retrieved using it.
             // the conditional above handles the case where a sliderendcircle.png is retrieved from the skin, but sliderendcircleoverlay.png doesn't exist.
             // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
             InternalChildren = new[]
             {
-                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(OsuHitObject.OBJECT_DIMENSIONS * 2) })
+                CircleSprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(circleName)?.WithMaximumSize(maxSize) })
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -76,7 +79,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => skin.GetAnimation(@$"{circleName}overlay", true, true, frameLength: 1000 / 2d, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2))
+                    Child = OverlaySprite = new LegacyKiaiFlashingDrawable(() => new Sprite { Texture = skin.GetTexture(@$"{circleName}overlay")?.WithMaximumSize(maxSize) })
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,

From 2a70c331b9f9730c6e775fe3962cf1bf1c1e5fd1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 19 Oct 2023 14:01:13 +0300
Subject: [PATCH 1116/2296] Remove animation support from osu! slider reverse
 arrow

---
 .../Skinning/Legacy/LegacyReverseArrow.cs              | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
index a535fbdbc3..780084115d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyReverseArrow.cs
@@ -8,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -41,11 +42,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var skin = skinSource.FindProvider(s => s.GetTexture(lookupName) != null);
 
-            InternalChild = arrow = (skin?.GetAnimation(lookupName, true, true, maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2) ?? Empty()).With(d =>
+            InternalChild = arrow = new Sprite
             {
-                d.Anchor = Anchor.Centre;
-                d.Origin = Anchor.Centre;
-            });
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Texture = skin?.GetTexture(lookupName)?.WithMaximumSize(maxSize: OsuHitObject.OBJECT_DIMENSIONS * 2),
+            };
 
             textureIsDefaultSkin = skin is ISkinTransformer transformer && transformer.Skin is DefaultLegacySkin;
 

From badb1310a38484955250757f78c3103be93d38c2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 19 Oct 2023 14:00:13 +0300
Subject: [PATCH 1117/2296] Adjust frame length of osu!mania judgement
 animation

---
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 446dfae0f6..73c521b2ed 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result])?.Value
                               ?? default_hit_result_skin_filenames[result];
 
-            var animation = this.GetAnimation(filename, true, true);
+            var animation = this.GetAnimation(filename, true, true, frameLength: 1000 / 20d);
             return animation == null ? null : new LegacyManiaJudgementPiece(result, animation);
         }
 

From 517d0f65b646daa784423dfdf1aae528f8448aaa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 21 Oct 2023 00:22:29 +0300
Subject: [PATCH 1118/2296] Adjust frame length of osu!mania hold-note body
 animation

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index 66e67136df..ee274fc45e 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             direction.BindTo(scrollingInfo.Direction);
             isHitting.BindTo(holdNote.IsHitting);
 
-            bodySprite = skin.GetAnimation(imageName, wrapMode, wrapMode, true, true).With(d =>
+            bodySprite = skin.GetAnimation(imageName, wrapMode, wrapMode, true, true, frameLength: 30).With(d =>
             {
                 if (d == null)
                     return;

From 491f119988f37e6264ccb7ebe3dfe3bb9e9d4b36 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 18 Oct 2023 20:56:17 +0300
Subject: [PATCH 1119/2296] Add animation support for legacy osu!mania column
 lights

---
 .../special-skin/mania/stage-light-0.png      | Bin 0 -> 5122 bytes
 .../special-skin/mania/stage-light-1.png      | Bin 0 -> 5124 bytes
 .../special-skin/mania/stage-light-2.png      | Bin 0 -> 5126 bytes
 .../special-skin/mania/stage-light-3.png      | Bin 0 -> 5125 bytes
 .../Resources/special-skin/skin.ini           |   2 ++
 .../Skinning/Legacy/LegacyColumnBackground.cs |  22 +++++++++---------
 .../Skinning/LegacyManiaSkinConfiguration.cs  |   1 +
 .../LegacyManiaSkinConfigurationLookup.cs     |   3 ++-
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs   |   5 ++++
 osu.Game/Skinning/LegacySkin.cs               |   3 +++
 10 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-0.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-1.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-2.png
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-3.png

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-0.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..5044c2d15f038bd606159113b8d44da9b86557e4
GIT binary patch
literal 5122
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
D8YOfc

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-1.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a3d61473906eea5bb149b3f2ac756325279d09f
GIT binary patch
literal 5124
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
BXuALa

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-2.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0aa0b3a02a31cc9dc22a41d3844c6958abadb1c
GIT binary patch
literal 5126
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
HJumaW3u|fS

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-3.png b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/mania/stage-light-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f9155b8f770ee62fa9cbe53ffc6f7fb191a561d
GIT binary patch
literal 5125
zcmeHLc~}$I77vT42nYy@NHIn%0!}iSWCDpqf=PskQDhZ`*2!c7QL>OsAmV}|%BCP7
zDvQFiDrze}A8r*~sQS5!yrQ&dm4~&Ix=@$atv-7bP~pA)q2E{k<9^>HlY7tkopXNo
zH|NWp-0+zp_O|Y}6bi*&5-N%S-w3!~46y;9x3gT5C=|<I(xc{(5m*{ktJ5fy$pn>L
zq$Q|?QK_I%jBWQz!~W&rV<+zX>YFfu^HdpkNpa52V8(HVSM;*z+H-Xw1xZ7u_+&Zq
z1gr1f%1}I8A-c%)LYpRZ=B%IY8{hoUSaW1yp0aiF&?;tnX?9!_Md%gw_`gq<JQ=G?
zcRyT_w`Cdg$5(dyTUQhpEX`n%Ba81eKT>-Lw+AKMv?A?VZY$~P&ktRxt>-`PhO4up
zb5+-8jqkp7&hh9!9Bm&@@NznEHboFqL^asoYuiX`JCeP7=aq-n7SCO35`F!?yKwc%
z?5@%cOLqMB^QyGDxrKQRgSbK03m*wyl%02YwXw9M%JcYnY4_-H$HW<>-0Y^KiTAed
zSQFk^x9dzy>hN^?ut`GC_PGVCx5C)uQSvjp9#nH=h4x=Zj<YG1<l01+llKosX6NVb
zJ+azBKe%=R$)w+CT<f)GMu{}fE@j=lF^ip-y_mZAd*{X9eaVgSw2uDNZTyVqsSdX`
z!<|QLMGvjVp0QlU+&ll|TCw_SxRq16_s%0$f1K@Brnow`xZW{{Z7r{>M@YLm!>D8S
z3uZUpY+aS?VKu~QLrj3s(z1Hm*7ZK_bxz~fIS5>9>%7!d!S29zFYh8d&SA+M_sBH|
zef@+U)HAq^vu~VTa$eMl>5`OXlem||qno$wj*}+jUz@}wE^+65RwzUFxy*nn%I59+
zrQ_Vyx{CTydspSRH@6h$yE3-7<e`3(VlUQ)?>vxFvY~wSh6+@({c6GOZzEf`)Em0D
zw>AoGZWb10+m9t$^64Ji{SwmeT%aF6AMIVxwjTbrrL0C;MO^bnd9A<mGgi8PvY<f%
zi5Ew#Y`KSJUej;QAH6&!)VkxKW4qw7Y~<#M4zZe<Kd7l{;z>!uMH@&)-9(pdelma5
zvrmtledTm$e%Gooujya^^UBha8+&g|nLXyNe~bUVmm_Pdr#0TM__yEUJJ%#T4jvBr
z)$XP$N0WI=_1gbQtedk(>2FQ1hsWs|Rq?}r%A`;%vXnw$xI`#?qk5qA%B4m8(31kU
z)wg!!Mfhf>IvUP~Z=RHs7qGxJFMM2!?H=By_!onv?!_*nLK+XWw>QbIHlB`)9UL3%
z_=iP`Atiz=ay}kr3&|R8AI^Sy?CG5clLb3BmMIKttjg6DyF~F9<*}!0W3#S=jBqP1
zBQ8oJoR8hU>uGW9)@kF0j327L2)PtzHzem&-9=c{Vc*duz24q1%L5a~O_<{C$?D2H
zRTv)|xa@YkHm<$QiM6@hyTCDj6(^=`ldE*CF)v{E0^XfrqYI-i&#OG3D@D7{eeQO-
z%kM&b4Z6m9<UZ@6G?%E^Q%7@T`|oa>6WYA!#+jg>Urf;X{OG%)2)A%eT9**?Z0sKo
z_LNpt{#yJ^O7-K@DO08`uT7|)t*`9H&nPP?jfw5kHP8JF^M5LNGB+&W)8gp$6Q>Pf
zk-sm$@X7r4bL*tvmuBwITH<L8`a*Nw^3@?h(xtoe9(&Xb7nG-$Hdr_~tZ23*_P%VW
zuRp4JeU1I{snx^;U9O=k>pv8V14RkC&>ZOu9<EW*F}X%Y(2XiB=u#9)V31LZ;R^|p
zDkBn=YCf&I{y2@Ql=Eq^s1%lJg+!7vG+jqTrq7JR(--1gIW1_4ZJ?0{08|8tQH`o(
zwVr3>)6BR$aBrGs(5Pk;av`5KM;cBQYIFpZO=r_#NNiN5BD5*C)IgnF!HW=0>xBTn
z__QRF)bbdNw6rvO8jG&cB{G;?E|&o#3<QCI1*Bi3CNU$V){i$q^k9exJ+4z~Nu@?j
zHDO{hje+FTXkeZCCO?%{Dt!yD*7vdi_+S_@ErUsi87dW{uZNx#rvi}Pg#OY)9|f8@
zBZAOt3_6?;rxI#%d|wDT{?=b>&?TG8k>d;^nNR^!J&4Ne7cxX54S(xlq99SJ(we;h
z+5Id@rQ#h~{c<y{n9J##2ylOk+t2z<?Pg<OC6)3-8r)z?Pa@*eO!0Yg4X%{)%(pTG
z<**Qh3o#X3HpEsa*iZn%B_INo$vFt_uTT)IK2Q?1p2XBRVS)nSbS1!n5gC&S;|fTQ
zA~J}LzzBdK{2_z`6EcoJ*B^#ueIRD(lt7hOa^I{>P;vl;a{N(Tj<O+G#*{;BHpYRt
zh=PFF0jL5+Q3VbV%}{cjH%+5cVPHFzDlCy;Xw`}41ry=C;BX0_hS1@6GvUb?sQ?aq
zniRvSvm)QEL@8B7B#D{mWOBIv928;tBmOKVi;ccBiXn7*AVm`>6Q;9zfKB_t1JwX#
zF_TaMfY}2S!xQQVjMV6&G@4{S&6E?><Z0G7HLzz_LX~=8vB)I(UeQMqDLub>o`Gbg
zd5KCj>z0S%JwfzXDj_!q0)9P9coL>gB)|jStEe~g%D>nxf`!SM1i^whI0`5x6kLd_
z;1G~PA%_EG{&E(A{|~xeqaf2T9TA)eDh1U51(~a%PVC{*r++eONrZ_g7-2z77-9xQ
zAutc+@=(+dX7ON{#`yR(0vQn)#tDF!CM~gnv>_RcA`nOlh?|9=1pDu<kqI6H9*Xp@
zF_2;EU2nEEknw*T-(%3H*#T~P=0Fn#J(=;gDfg0Q(#l61y@LCQ5dic+kPqT_fUW_$
zK8S%2G9FOZ09_x%zy}!*sOxW|%l6%|j!=WYdTHR$Hb(TrQE=e1k%fhb%tt@Ub76f3
zxErbsjnh*o!$z1c3rcyV8<-qSN~Ge!owm--mh8o@o#2(01w|qXjsh>O+Jfy*z;;%G
zL%tbuE7WeOsJwx-GP0wpwd5-od5u@iAbrH6x$jrX>s3+7?qA02;B6gGw|vj>XlYKV
z&ye>YXQ5NhW31nEY;%**hav0o4n?GnvgkKPHx1kJ*`VF=lTXr3>`BBkMYU7sXZ{I_
C94z$!

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
index 7c51036d69..3a9d465f8d 100644
--- a/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini
@@ -4,6 +4,7 @@ Version: 2.5
 [Mania]
 Keys: 4
 ColumnLineWidth: 3,1,3,1,1
+LightFramePerSecond: 15
 // some skins found in the wild had configuration keys where the @2x suffix was included in the values.
 // the expected compatibility behaviour is that the presence of the @2x suffix shouldn't change anything
 // if @2x assets are present.
@@ -15,5 +16,6 @@ Hit300: mania/hit300@2x
 Hit300g: mania/hit300g@2x
 StageLeft: mania/stage-left
 StageRight: mania/stage-right
+StageLight: mania/stage-light
 NoteImage0L: LongNoteTailWang
 NoteImage1L: LongNoteTailWang
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
index ab996519a7..4c65707d70 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
@@ -5,7 +5,6 @@ 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.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -20,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Container lightContainer = null!;
-        private Sprite light = null!;
+        private Drawable? light = null!;
 
         public LegacyColumnBackground()
         {
@@ -39,6 +38,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             Color4 lightColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
                                  ?? Color4.White;
 
+            int lightFramePerSecond = skin.GetManiaSkinConfig<int>(LegacyManiaSkinConfigurationLookups.LightFramePerSecond)?.Value ?? 60;
+
             InternalChildren = new[]
             {
                 lightContainer = new Container
@@ -46,16 +47,15 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Bottom = lightPosition },
-                    Child = light = new Sprite
+                    Child = light = skin.GetAnimation(lightImage, true, true, frameLength: 1000d / lightFramePerSecond)?.With(l =>
                     {
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.BottomCentre,
-                        Colour = LegacyColourCompatibility.DisallowZeroAlpha(lightColour),
-                        Texture = skin.GetTexture(lightImage),
-                        RelativeSizeAxes = Axes.X,
-                        Width = 1,
-                        Alpha = 0
-                    }
+                        l.Anchor = Anchor.BottomCentre;
+                        l.Origin = Anchor.BottomCentre;
+                        l.Colour = LegacyColourCompatibility.DisallowZeroAlpha(lightColour);
+                        l.RelativeSizeAxes = Axes.X;
+                        l.Width = 1;
+                        l.Alpha = 0;
+                    }) ?? Empty(),
                 }
             };
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index f1c99a315d..9acb29a793 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Skinning
         public float ScorePosition = 300 * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
         public bool KeysUnderNotes;
+        public int LightFramePerSecond = 60;
 
         public LegacyNoteBodyStyle? NoteBodyStyle;
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 784e57708e..cacca0de23 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -74,6 +74,7 @@ namespace osu.Game.Skinning
         Hit50,
         Hit0,
         KeysUnderNotes,
-        NoteBodyStyle
+        NoteBodyStyle,
+        LightFramePerSecond
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index e880e3c1ed..b472afb74f 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -123,6 +123,11 @@ namespace osu.Game.Skinning
                         currentConfig.WidthForNoteHeightScale = (float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         break;
 
+                    case "LightFramePerSecond":
+                        int lightFramePerSecond = int.Parse(pair.Value, CultureInfo.InvariantCulture);
+                        currentConfig.LightFramePerSecond = lightFramePerSecond > 0 ? lightFramePerSecond : 24;
+                        break;
+
                     case string when pair.Key.StartsWith("Colour", StringComparison.Ordinal):
                         HandleColours(currentConfig, line, true);
                         break;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 76190d0abe..dc683f1dae 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -273,6 +273,9 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.KeysUnderNotes:
                     return SkinUtils.As<TValue>(new Bindable<bool>(existing.KeysUnderNotes));
+
+                case LegacyManiaSkinConfigurationLookups.LightFramePerSecond:
+                    return SkinUtils.As<TValue>(new Bindable<int>(existing.LightFramePerSecond));
             }
 
             return null;

From ab3b51e4a0a9042d1b20d08d64b2c47b2b6848bb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 19 Oct 2023 14:02:46 +0300
Subject: [PATCH 1120/2296] Refactor osu!taiko circle piece logic to read
 better

---
 .../Skinning/Legacy/LegacyCirclePiece.cs      | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 4dce3f1d4a..b512a46ce1 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         private static readonly Vector2 max_circle_sprite_size = new Vector2(160);
 
         private Drawable backgroundLayer = null!;
-        private Drawable? foregroundLayer;
+        private TextureAnimation? foregroundLayer;
 
         private Bindable<int> currentCombo { get; } = new BindableInt();
 
@@ -48,40 +48,44 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, DrawableHitObject drawableHitObject, IBeatSyncProvider? beatSyncProvider)
         {
-            Drawable? getDrawableFor(string lookup)
+            Drawable? getDrawableFor(string lookup, bool animatable)
             {
                 const string normal_hit = "taikohit";
                 const string big_hit = "taikobig";
 
                 string prefix = ((drawableHitObject.HitObject as TaikoStrongableHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
-                return skin.GetAnimation($"{prefix}{lookup}", true, false, maxSize: max_circle_sprite_size) ??
+                return skin.GetAnimation($"{prefix}{lookup}", animatable, false, maxSize: max_circle_sprite_size) ??
                        // fallback to regular size if "big" version doesn't exist.
-                       skin.GetAnimation($"{normal_hit}{lookup}", true, false, maxSize: max_circle_sprite_size);
+                       skin.GetAnimation($"{normal_hit}{lookup}", animatable, false, maxSize: max_circle_sprite_size);
             }
 
             // backgroundLayer is guaranteed to exist due to the pre-check in TaikoLegacySkinTransformer.
-            AddInternal(backgroundLayer = new LegacyKiaiFlashingDrawable(() => getDrawableFor("circle")));
+            AddInternal(backgroundLayer = new LegacyKiaiFlashingDrawable(() => getDrawableFor("circle", false))
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            });
+
+            foregroundLayer = (TextureAnimation?)getDrawableFor("circleoverlay", true);
 
-            foregroundLayer = getDrawableFor("circleoverlay");
             if (foregroundLayer != null)
+            {
+                foregroundLayer.Anchor = Anchor.Centre;
+                foregroundLayer.Origin = Anchor.Centre;
+
+                // Animations in taiko skins are used in a custom way (>150 combo and animating in time with beat).
+                // For now just stop at first frame for sanity.
+                foregroundLayer.Stop();
+
                 AddInternal(foregroundLayer);
+            }
 
             drawableHitObject.StartTimeBindable.BindValueChanged(startTime =>
             {
                 timingPoint = beatSyncProvider?.ControlPoints?.TimingPointAt(startTime.NewValue) ?? TimingControlPoint.DEFAULT;
             }, true);
 
-            // Animations in taiko skins are used in a custom way (>150 combo and animating in time with beat).
-            // For now just stop at first frame for sanity.
-            foreach (var c in InternalChildren)
-            {
-                (c as IFramedAnimation)?.Stop();
-
-                c.Anchor = Anchor.Centre;
-                c.Origin = Anchor.Centre;
-            }
-
             if (gameplayState != null)
                 currentCombo.BindTo(gameplayState.ScoreProcessor.Combo);
         }
@@ -101,12 +105,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             foreach (var c in InternalChildren)
                 c.Scale = new Vector2(DrawHeight / circle_piece_size.Y);
 
-            if (foregroundLayer is IFramedAnimation animatableForegroundLayer)
-                animateForegroundLayer(animatableForegroundLayer);
+            animateForegroundLayer();
         }
 
-        private void animateForegroundLayer(IFramedAnimation animatableForegroundLayer)
+        private void animateForegroundLayer()
         {
+            if (foregroundLayer == null)
+                return;
+
             int multiplier;
 
             if (currentCombo.Value >= 150)
@@ -119,12 +125,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             }
             else
             {
-                animatableForegroundLayer.GotoFrame(0);
+                foregroundLayer.GotoFrame(0);
                 return;
             }
 
             animationFrame = Math.Abs(Time.Current - timingPoint.Time) % ((timingPoint.BeatLength * 2) / multiplier) >= timingPoint.BeatLength / multiplier ? 0 : 1;
-            animatableForegroundLayer.GotoFrame(animationFrame);
+            foregroundLayer.GotoFrame(animationFrame);
         }
 
         private Color4 accentColour;

From 976ae62214a2314f2d2baa1249f6276374327e7e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 21 Oct 2023 01:10:06 +0300
Subject: [PATCH 1121/2296] Fix incorrect nullability specification

---
 .../Skinning/Legacy/LegacyColumnBackground.cs                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
index 4c65707d70..914ed79234 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Container lightContainer = null!;
-        private Drawable? light = null!;
+        private Drawable light = null!;
 
         public LegacyColumnBackground()
         {

From 71718bd761ffb237cd4f8d733352733a43aaf003 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 23 Sep 2023 07:04:51 +0300
Subject: [PATCH 1122/2296] Limit comment sprite height

---
 .../Comments/CommentMarkdownContainer.cs      | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index 278cef9112..c17e48ef8d 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -1,9 +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.
 
+#nullable disable
+
 using Markdig.Syntax;
+using Markdig.Syntax.Inlines;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics.Containers.Markdown;
+using osuTK;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -16,6 +24,8 @@ namespace osu.Game.Overlays.Comments
 
         protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new CommentMarkdownHeading(headingBlock);
 
+        public override MarkdownTextFlowContainer CreateTextFlow() => new CommentMarkdownTextFlowContainer();
+
         private partial class CommentMarkdownHeading : OsuMarkdownHeading
         {
             public CommentMarkdownHeading(HeadingBlock headingBlock)
@@ -40,5 +50,64 @@ namespace osu.Game.Overlays.Comments
                 }
             }
         }
+
+        private partial class CommentMarkdownTextFlowContainer : MarkdownTextFlowContainer
+        {
+            protected override void AddImage(LinkInline linkInline) => AddDrawable(new CommentMarkdownImage(linkInline.Url));
+
+            private partial class CommentMarkdownImage : MarkdownImage
+            {
+                public CommentMarkdownImage(string url)
+                    : base(url)
+                {
+                }
+
+                private DelayedLoadWrapper wrapper;
+
+                protected override Drawable CreateContent(string url) => wrapper = new DelayedLoadWrapper(CreateImageContainer(url));
+
+                protected override ImageContainer CreateImageContainer(string url)
+                {
+                    var container = new CommentImageContainer(url);
+                    container.OnLoadComplete += d =>
+                    {
+                        // The size of DelayedLoadWrapper depends on AutoSizeAxes of it's content.
+                        // But since it's set to None, we need to specify the size here manually.
+                        wrapper.Size = container.Size;
+                        d.FadeInFromZero(300, Easing.OutQuint);
+                    };
+                    return container;
+                }
+
+                private partial class CommentImageContainer : ImageContainer
+                {
+                    // https://github.com/ppy/osu-web/blob/3bd0f406dc78d60b356d955cd4201f8c3e1cca09/resources/css/bem/osu-md.less#L36
+                    // Web version defines max height in em units (6 em), which assuming default pixel size as 14 results in 84 px,
+                    // which also seems to match my observations upon expecting the web element.
+                    private const float max_height = 84f;
+
+                    public CommentImageContainer(string url)
+                        : base(url)
+                    {
+                        AutoSizeAxes = Axes.None;
+                    }
+
+                    protected override Sprite CreateImageSprite() => new Sprite
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    };
+
+                    protected override Texture GetImageTexture(TextureStore textures, string url)
+                    {
+                        Texture t = base.GetImageTexture(textures, url);
+
+                        if (t != null)
+                            Size = t.Height > 96 ? new Vector2(max_height / t.Height * t.Width, max_height) : t.Size;
+
+                        return t;
+                    }
+                }
+            }
+        }
     }
 }

From e1e9c3d7b377a574bc0dc32f7868683c858219a4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 22 Oct 2023 00:33:26 +0300
Subject: [PATCH 1123/2296] Fix incorrect height limit

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

diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index c17e48ef8d..39894c642e 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Overlays.Comments
                         Texture t = base.GetImageTexture(textures, url);
 
                         if (t != null)
-                            Size = t.Height > 96 ? new Vector2(max_height / t.Height * t.Width, max_height) : t.Size;
+                            Size = t.Height > max_height ? new Vector2(max_height / t.Height * t.Width, max_height) : t.Size;
 
                         return t;
                     }

From 12bb4b697c4c58e806cfdb4105940d10db52f657 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 22 Oct 2023 03:27:21 +0300
Subject: [PATCH 1124/2296] Support retrieving textures in argon skin from game
 resources

---
 osu.Game/Skinning/ArgonSkin.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index d530efbfdd..641715b2c7 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -8,6 +8,7 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Extensions;
@@ -40,7 +41,13 @@ namespace osu.Game.Skinning
 
         [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public ArgonSkin(SkinInfo skin, IStorageResourceProvider resources)
-            : base(skin, resources)
+            : base(
+                skin,
+                resources,
+                // In the case of the actual default legacy skin (ie. the fallback one, which a user hasn't applied any modifications to) we want to use the game provided resources.
+                // todo: I don't know if this is required.
+                skin.Protected ? new NamespacedResourceStore<byte[]>(resources.Resources, "Skins/Argon") : null
+            )
         {
             Resources = resources;
 

From 8ed660d863cc32fe754487ad98dd3140f75669aa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 23 Oct 2023 01:58:25 +0300
Subject: [PATCH 1125/2296] Remove incorrect logic

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

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 641715b2c7..26f2edf1aa 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -44,9 +44,7 @@ namespace osu.Game.Skinning
             : base(
                 skin,
                 resources,
-                // In the case of the actual default legacy skin (ie. the fallback one, which a user hasn't applied any modifications to) we want to use the game provided resources.
-                // todo: I don't know if this is required.
-                skin.Protected ? new NamespacedResourceStore<byte[]>(resources.Resources, "Skins/Argon") : null
+                new NamespacedResourceStore<byte[]>(resources.Resources, "Skins/Argon")
             )
         {
             Resources = resources;

From fc1254ba47268bb51a547b0dd26945f744e17047 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 16:15:56 +0900
Subject: [PATCH 1126/2296] Update resources

---
 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 c289ae89ee..848e17af1a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1014.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1023.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <PackageReference Include="SharpCompress" Version="0.34.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />

From 4e057b446a475e7b2886df925e6d70fafeb8e979 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 16:46:15 +0900
Subject: [PATCH 1127/2296] Rename accumulated rotation variable

---
 .../Objects/Drawables/SpinnerSpinHistory.cs        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
index 1cf511f526..1c6c5b5d02 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SpinnerSpinHistory.cs
@@ -31,11 +31,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private readonly Stack<CompletedSpin> completedSpins = new Stack<CompletedSpin>();
 
         /// <summary>
-        /// The total accumulated rotation.
+        /// The total accumulated (absolute) rotation.
         /// </summary>
-        private float totalAbsoluteRotation;
+        private float totalAccumulatedRotation;
 
-        private float totalAbsoluteRotationAtLastCompletion;
+        private float totalAccumulatedRotationAtLastCompletion;
 
         /// <summary>
         /// For the current spin, represents the maximum absolute rotation (from 0..360) achieved by the user.
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// The current spin, from -360..360.
         /// </summary>
-        private float currentSpinRotation => totalAbsoluteRotation - totalAbsoluteRotationAtLastCompletion;
+        private float currentSpinRotation => totalAccumulatedRotation - totalAccumulatedRotationAtLastCompletion;
 
         private double lastReportTime = double.NegativeInfinity;
 
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             //
             // But this can come later.
 
-            totalAbsoluteRotation += delta;
+            totalAccumulatedRotation += delta;
 
             if (currentTime >= lastReportTime)
             {
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                     // Incrementing the last completion point will cause `currentSpinRotation` to
                     // hold the remaining spin that needs to be considered.
-                    totalAbsoluteRotationAtLastCompletion += direction * 360;
+                    totalAccumulatedRotationAtLastCompletion += direction * 360;
 
                     // Reset the current max as we are entering a new spin.
                     // Importantly, carry over the remainder (which is now stored in `currentSpinRotation`).
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 while (completedSpins.TryPeek(out var segment) && segment.CompletionTime > currentTime)
                 {
                     completedSpins.Pop();
-                    totalAbsoluteRotationAtLastCompletion -= segment.Direction * 360;
+                    totalAccumulatedRotationAtLastCompletion -= segment.Direction * 360;
                 }
 
                 // This is a best effort. We may not have enough data to match this 1:1, but that's okay.

From 0cf572d0295d26e6b7c842b1bd78000d3683282e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 23 Oct 2023 11:46:21 +0300
Subject: [PATCH 1128/2296] Use existing property and fix nullability

---
 .../Skinning/Legacy/LegacySliderBall.cs       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 5413b0c1d7..147c77bc03 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -37,18 +37,23 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableHitObject)
+        private void load()
         {
             var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
 
-            DrawableSlider drawableSlider = (DrawableSlider)drawableHitObject;
+            double? ballAnimationRate = null;
 
-            // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
-            double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
+            if (parentObject != null)
+            {
+                DrawableSlider drawableSlider = (DrawableSlider)parentObject;
 
-            double ballAnimationRate = Math.Max(
-                150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
-                LegacySkinExtensions.SIXTY_FRAME_TIME);
+                // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
+                double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
+
+                ballAnimationRate = Math.Max(
+                    150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
+                    LegacySkinExtensions.SIXTY_FRAME_TIME);
+            }
 
             Vector2 maxSize = OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE;
 

From ac1783fa94ca445320044723f82daf3726d39364 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 23 Oct 2023 13:26:59 +0300
Subject: [PATCH 1129/2296] Fix comment

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

diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index 39894c642e..2ec2313500 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -82,8 +82,8 @@ namespace osu.Game.Overlays.Comments
                 private partial class CommentImageContainer : ImageContainer
                 {
                     // https://github.com/ppy/osu-web/blob/3bd0f406dc78d60b356d955cd4201f8c3e1cca09/resources/css/bem/osu-md.less#L36
-                    // Web version defines max height in em units (6 em), which assuming default pixel size as 14 results in 84 px,
-                    // which also seems to match my observations upon expecting the web element.
+                    // Web version defines max height in em units (6 em), which assuming default font size as 14 results in 84 px,
+                    // which also seems to match observations upon inspecting the web element.
                     private const float max_height = 84f;
 
                     public CommentImageContainer(string url)

From b18a5e63b74ac6122fe9c30109ee7fe757b07c8a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 23 Oct 2023 13:29:46 +0300
Subject: [PATCH 1130/2296] Remove nullable disable

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

diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index 2ec2313500..e48a52c787 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.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 Markdig.Syntax;
 using Markdig.Syntax.Inlines;
 using osu.Framework.Graphics;
@@ -62,7 +60,7 @@ namespace osu.Game.Overlays.Comments
                 {
                 }
 
-                private DelayedLoadWrapper wrapper;
+                private DelayedLoadWrapper wrapper = null!;
 
                 protected override Drawable CreateContent(string url) => wrapper = new DelayedLoadWrapper(CreateImageContainer(url));
 
@@ -104,7 +102,7 @@ namespace osu.Game.Overlays.Comments
                         if (t != null)
                             Size = t.Height > max_height ? new Vector2(max_height / t.Height * t.Width, max_height) : t.Size;
 
-                        return t;
+                        return t!;
                     }
                 }
             }

From 08b7c3d5ad30bed5353c171cf52b74fbb31a20a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 20:01:23 +0900
Subject: [PATCH 1131/2296] Remove test which makes less sense with new
 algorith

---
 .../SpinnerSpinHistoryTest.cs                       | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
index c20a7bbfd9..cd54873d36 100644
--- a/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/SpinnerSpinHistoryTest.cs
@@ -118,19 +118,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             Assert.That(history.TotalRotation, Is.EqualTo(180));
         }
 
-        [Test]
-        public void TestRewindIntoSegmentThatHasNotCrossedZero()
-        {
-            history.ReportDelta(1000, -180);
-            Assert.That(history.TotalRotation, Is.EqualTo(180));
-            history.ReportDelta(1500, 90);
-            Assert.That(history.TotalRotation, Is.EqualTo(180));
-            history.ReportDelta(2000, 450);
-            Assert.That(history.TotalRotation, Is.EqualTo(360));
-            history.ReportDelta(1750, -45);
-            Assert.That(history.TotalRotation, Is.EqualTo(315));
-        }
-
         [Test]
         public void TestRewindOverDirectionChange()
         {

From 15c1fcbf96cf1e64637ce7f583dde98333f1ca2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 20:28:12 +0900
Subject: [PATCH 1132/2296] Set `ManualClock` rate to 0 to avoid interpolation
 causing test errors

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs | 8 ++++++--
 osu.Game/Tests/Visual/OsuTestScene.cs                | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index 662734ddcd..531f88dff8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -160,7 +160,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestRewind()
         {
-            AddStep("set manual clock", () => manualClock = new ManualClock { Rate = 1 });
+            AddStep("set manual clock", () => manualClock = new ManualClock
+            {
+                // Avoids interpolation trying to run ahead during testing.
+                Rate = 0
+            });
 
             List<ReplayFrame> frames =
                 new SpinFramesGenerator(time_spinner_start)
@@ -214,7 +218,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 AddStep($"seek to {time}", () => clock.Seek(time));
                 // Lenience is required due to interpolation running slightly ahead on a stalled clock.
-                AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time).Within(40));
+                AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time));
             }
         }
 
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 096917cf4f..e1bbddd340 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -432,6 +432,8 @@ namespace osu.Game.Tests.Visual
 
                 private bool running;
 
+                public override double Rate => referenceClock.Rate;
+
                 public TrackVirtualManual(IFrameBasedClock referenceClock, string name = "virtual")
                     : base(name)
                 {

From d08ba764ddfb233125ade630490ef6e09ddaea6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 20:29:46 +0900
Subject: [PATCH 1133/2296] Add extended testing of rewind

---
 .../TestSceneSpinnerInput.cs                  | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index 531f88dff8..5a473409a4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             DrawableSpinner drawableSpinner = null!;
             AddUntilStep("get spinner", () => (drawableSpinner = currentPlayer.ChildrenOfType<DrawableSpinner>().Single()) != null);
 
-            assertTotalRotation(4000, 900);
+            assertFinalRotationCorrect();
             assertTotalRotation(3750, 810);
             assertTotalRotation(3500, 720);
             assertTotalRotation(3250, 530);
@@ -207,6 +207,26 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertTotalRotation(2000, 360);
             assertTotalRotation(1500, 0);
 
+            // same thing but always returning to final time to check.
+            assertFinalRotationCorrect();
+            assertTotalRotation(3750, 810);
+            assertFinalRotationCorrect();
+            assertTotalRotation(3500, 720);
+            assertFinalRotationCorrect();
+            assertTotalRotation(3250, 530);
+            assertFinalRotationCorrect();
+            assertTotalRotation(3000, 450);
+            assertFinalRotationCorrect();
+            assertTotalRotation(2750, 540);
+            assertFinalRotationCorrect();
+            assertTotalRotation(2500, 540);
+            assertFinalRotationCorrect();
+            assertTotalRotation(2250, 450);
+            assertFinalRotationCorrect();
+            assertTotalRotation(2000, 360);
+            assertFinalRotationCorrect();
+            assertTotalRotation(1500, 0);
+
             void assertTotalRotation(double time, float expected)
             {
                 addSeekStep(time);
@@ -220,6 +240,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 // Lenience is required due to interpolation running slightly ahead on a stalled clock.
                 AddUntilStep("wait for seek to finish", () => drawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time));
             }
+
+            void assertFinalRotationCorrect() => assertTotalRotation(4000, 900);
         }
 
         private void assertTicksHit(int count)

From baf4130f3adf314c3eac7deef89cde013cb9ba28 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Oct 2023 22:18:38 +0900
Subject: [PATCH 1134/2296] Fix test clock no longer accounting for rate
 changes

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index e1bbddd340..4860d3954e 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -432,7 +432,10 @@ namespace osu.Game.Tests.Visual
 
                 private bool running;
 
-                public override double Rate => referenceClock.Rate;
+                public override double Rate => base.Rate
+                                               // This is mainly to allow some tests to override the rate to zero
+                                               // and avoid interpolation.
+                                               * referenceClock.Rate;
 
                 public TrackVirtualManual(IFrameBasedClock referenceClock, string name = "virtual")
                     : base(name)

From cfd8d05fde5cb5cf0b45ff9284ae1182305e5c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 23 Oct 2023 21:26:25 +0200
Subject: [PATCH 1135/2296] Fix spinner ticks not playing samples correctly
 sometimes

Noticed this during work on https://github.com/ppy/osu/pull/25185.

In some circumstances, it seemed that spinner bonus ticks (and mostly
them specifically) would not always play with the correct volume.
Hours of debugging later pointed at a trace at
`DrawableAudioWrapper.refreshLayoutFromParent()` not firing sometimes.

Initially I thought it to be some sort of framework bug, but after
preparing a diff and running final checks, I noticed that sometimes
the sample was being played *by a `PoolableSkinnableSample` that wasn't
loaded*. And determining why *that* is the case turned out with this
diff.

As it happens, spinner ticks get assigned a start time proportionally,
i.e. the 1st of 10 ticks is placed at 10% of the duration, the 2nd
at 20%, and so on. The start time generally shouldn't matter,
because the spinner is manually judging the ticks. *However*, the ticks
*still* receive a lifetime start / end in the same way normal objects
do, which means that in some cases they can *not be alive* when they're
hit, which means that the `DrawableAudioWrapper` flow *hasn't had
a chance to run*, and rightly so.

To fix, ensure that all spinner ticks are alive throughout the entirety
of the spinner's duration.
---
 .../Objects/Drawables/DrawableSpinnerTick.cs  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 34253e3d4f..20fe7172ad 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -4,6 +4,8 @@
 #nullable disable
 
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -25,6 +27,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Origin = Anchor.Centre;
         }
 
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            // the tick can be theoretically judged at any point in the spinner's duration,
+            // so it must be alive throughout the spinner's entire lifetime.
+            // this mostly matters for correct sample playback.
+            LifetimeStart = DrawableSpinner.HitObject.StartTime;
+        }
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            base.UpdateHitStateTransforms(state);
+
+            // the tick can be theoretically judged at any point in the spinner's duration,
+            // so it must be alive throughout the spinner's entire lifetime (or until hit, whichever applies).
+            // this mostly matters for correct sample playback.
+            LifetimeEnd = (Result?.IsHit == true ? Result.TimeAbsolute : DrawableSpinner.HitObject.GetEndTime()) + (Samples?.Length ?? 0);
+        }
+
         /// <summary>
         /// Apply a judgement result.
         /// </summary>

From c5339f440e4a3c968a62235fc439b01539536dc4 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 23 Oct 2023 23:30:54 +0200
Subject: [PATCH 1136/2296] Apply code review suggestions

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

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 08fe86713a..33ddd08e09 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -46,11 +46,11 @@ namespace osu.Game.Screens.Select
             var openingBracketIndexes = new List<int>();
             var closingBracketIndexes = new List<int>();
 
-            populateIndexLists(ref query);
+            populateIndexLists(query);
 
             return performExtraction(ref query);
 
-            void populateIndexLists(ref string query)
+            void populateIndexLists(string query)
             {
                 bool currentlyBetweenBrackets = false;
 
@@ -58,24 +58,25 @@ namespace osu.Game.Screens.Select
                 {
                     switch (query[i])
                     {
-                        case '[' when !currentlyBetweenBrackets && (i == 0 || query[i - 1] == ' '):
-                            currentlyBetweenBrackets = true;
-                            openingBracketIndexes.Add(i + 1);
+                        case '[':
+                            if (!currentlyBetweenBrackets && (i == 0 || query[i - 1] == ' '))
+                            {
+                                currentlyBetweenBrackets = true;
+                                openingBracketIndexes.Add(i + 1);
+                            }
+
                             break;
 
-                        case ']' when currentlyBetweenBrackets && (i == query.Length - 1 || query[i + 1] == ' '):
-                            currentlyBetweenBrackets = false;
-                            closingBracketIndexes.Add(i);
+                        case ']':
+                            if (currentlyBetweenBrackets && (i == query.Length - 1 || query[i + 1] == ' '))
+                            {
+                                currentlyBetweenBrackets = false;
+                                closingBracketIndexes.Add(i);
+                            }
+
                             break;
                     }
                 }
-
-                if (currentlyBetweenBrackets)
-                {
-                    // If there is no "]" closing the current difficulty search query, append it.
-                    query += ']';
-                    closingBracketIndexes.Add(query.Length - 1);
-                }
             }
 
             string performExtraction(ref string query)
@@ -86,7 +87,10 @@ namespace osu.Game.Screens.Select
                 for (int i = 0; i < openingBracketIndexes.Count; i++)
                 {
                     int startIndex = openingBracketIndexes[i];
-                    int endIndex = closingBracketIndexes[i];
+
+                    int endIndex = closingBracketIndexes.Count > 0
+                        ? closingBracketIndexes[Math.Min(i, closingBracketIndexes.Count - 1)]
+                        : query.Length;
 
                     string searchText = originalQuery[startIndex..endIndex];
 
@@ -96,7 +100,9 @@ namespace osu.Game.Screens.Select
                             .Replace($" [{searchText}]", "")
                             .Replace($"[{searchText}] ", "")
                             .Replace($"[{searchText}]", "")
-                            .Replace($" [{searchText}] ", " ");
+                            .Replace($" [{searchText}] ", " ")
+                            .Replace($" [{searchText}", "")
+                            .Replace($"[{searchText}", "");
                 }
 
                 return string.Join(' ', searchTexts);

From ff66b74b0e5ab4f95967f3234a985f0b27e8a718 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 24 Oct 2023 02:24:00 +0300
Subject: [PATCH 1137/2296] Refactor logic to support DHO pooling

---
 .../Skinning/Legacy/LegacySliderBall.cs       | 77 ++++++++++++-------
 1 file changed, 51 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 147c77bc03..c3ffb6507c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -4,10 +4,11 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
@@ -24,10 +25,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private DrawableHitObject? parentObject { get; set; }
 
         private Sprite layerNd = null!;
-        private Drawable ball = null!;
         private Sprite layerSpec = null!;
 
-        public Color4 BallColour => ball.Colour;
+        private TextureAnimation ballAnimation = null!;
+        private Texture[] ballTextures = null!;
+
+        public Color4 BallColour => ballAnimation.Colour;
 
         public LegacySliderBall(ISkin skin)
         {
@@ -39,25 +42,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load()
         {
-            var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
-
-            double? ballAnimationRate = null;
-
-            if (parentObject != null)
-            {
-                DrawableSlider drawableSlider = (DrawableSlider)parentObject;
-
-                // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
-                double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
-
-                ballAnimationRate = Math.Max(
-                    150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
-                    LegacySkinExtensions.SIXTY_FRAME_TIME);
-            }
-
             Vector2 maxSize = OsuLegacySkinTransformer.MAX_FOLLOW_CIRCLE_AREA_SIZE;
 
-            InternalChildren = new[]
+            var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
+            ballTextures = skin.GetTextures("sliderb", default, default, true, "", maxSize, out _);
+
+            InternalChildren = new Drawable[]
             {
                 layerNd = new Sprite
                 {
@@ -66,12 +56,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     Texture = skin.GetTexture("sliderb-nd")?.WithMaximumSize(maxSize),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                ball = skin.GetAnimation("sliderb", true, true, animationSeparator: "", frameLength: ballAnimationRate, maxSize: maxSize).AsNonNull().With(d =>
+                ballAnimation = new LegacySkinExtensions.SkinnableTextureAnimation
                 {
-                    d.Anchor = Anchor.Centre;
-                    d.Origin = Anchor.Centre;
-                    d.Colour = ballColour;
-                }),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Colour = ballColour,
+                },
                 layerSpec = new Sprite
                 {
                     Anchor = Anchor.Centre,
@@ -80,6 +70,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     Blending = BlendingParameters.Additive,
                 },
             };
+
+            if (parentObject != null)
+                parentObject.HitObjectApplied += onHitObjectApplied;
+
+            onHitObjectApplied(parentObject);
         }
 
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
@@ -96,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 if (skin.GetConfig<SkinConfiguration.LegacySetting, bool>(SkinConfiguration.LegacySetting.AllowSliderBallTint)?.Value == true)
                 {
                     accentColour.BindTo(parentObject.AccentColour);
-                    accentColour.BindValueChanged(a => ball.Colour = a.NewValue, true);
+                    accentColour.BindValueChanged(a => ballAnimation.Colour = a.NewValue, true);
                 }
             }
         }
@@ -112,6 +107,33 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             layerSpec.Rotation = -appliedRotation;
         }
 
+        private void onHitObjectApplied(DrawableHitObject? drawableObject = null)
+        {
+            if (drawableObject != null && drawableObject is not DrawableSlider)
+                return;
+
+            ballAnimation.ClearFrames();
+
+            double frameDelay;
+
+            if (drawableObject?.HitObject != null)
+            {
+                DrawableSlider drawableSlider = (DrawableSlider)drawableObject;
+
+                // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
+                double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
+
+                frameDelay = Math.Max(
+                    150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
+                    LegacySkinExtensions.SIXTY_FRAME_TIME);
+            }
+            else
+                frameDelay = LegacySkinExtensions.SIXTY_FRAME_TIME;
+
+            foreach (var texture in ballTextures)
+                ballAnimation.AddFrame(texture, frameDelay);
+        }
+
         private void updateStateTransforms(DrawableHitObject drawableObject, ArmedState _)
         {
             // Gets called by slider ticks, tails, etc., leading to duplicated
@@ -132,7 +154,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             base.Dispose(isDisposing);
 
             if (parentObject != null)
+            {
+                parentObject.HitObjectApplied -= onHitObjectApplied;
                 parentObject.ApplyCustomUpdateState -= updateStateTransforms;
+            }
         }
     }
 }

From bcbb77d3839028edf18535ac7976668c02cc7c6f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 24 Oct 2023 02:29:07 +0300
Subject: [PATCH 1138/2296] Fix incorrect assumption in taiko circle piece
 logic

---
 .../Skinning/Legacy/LegacyCirclePiece.cs      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index b512a46ce1..dbc8718f02 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         private static readonly Vector2 max_circle_sprite_size = new Vector2(160);
 
         private Drawable backgroundLayer = null!;
-        private TextureAnimation? foregroundLayer;
+        private Drawable? foregroundLayer;
 
         private Bindable<int> currentCombo { get; } = new BindableInt();
 
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 Origin = Anchor.Centre
             });
 
-            foregroundLayer = (TextureAnimation?)getDrawableFor("circleoverlay", true);
+            foregroundLayer = getDrawableFor("circleoverlay", true);
 
             if (foregroundLayer != null)
             {
@@ -76,7 +76,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
                 // Animations in taiko skins are used in a custom way (>150 combo and animating in time with beat).
                 // For now just stop at first frame for sanity.
-                foregroundLayer.Stop();
+                if (foregroundLayer is IFramedAnimation animatedForegroundLayer)
+                    animatedForegroundLayer.Stop();
 
                 AddInternal(foregroundLayer);
             }
@@ -105,14 +106,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             foreach (var c in InternalChildren)
                 c.Scale = new Vector2(DrawHeight / circle_piece_size.Y);
 
-            animateForegroundLayer();
+            if (foregroundLayer is IFramedAnimation animatedForegroundLayer)
+                animateForegroundLayer(animatedForegroundLayer);
         }
 
-        private void animateForegroundLayer()
+        private void animateForegroundLayer(IFramedAnimation animation)
         {
-            if (foregroundLayer == null)
-                return;
-
             int multiplier;
 
             if (currentCombo.Value >= 150)
@@ -125,12 +124,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             }
             else
             {
-                foregroundLayer.GotoFrame(0);
+                animation.GotoFrame(0);
                 return;
             }
 
             animationFrame = Math.Abs(Time.Current - timingPoint.Time) % ((timingPoint.BeatLength * 2) / multiplier) >= timingPoint.BeatLength / multiplier ? 0 : 1;
-            foregroundLayer.GotoFrame(animationFrame);
+            animation.GotoFrame(animationFrame);
         }
 
         private Color4 accentColour;

From 1591246afbeb9f7e2f503e4359f43adf1913454b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 13:53:31 +0900
Subject: [PATCH 1139/2296] Update country code names to match database

Required for ASS / osu-web cross-compatibility
---
 osu.Game/Users/CountryCode.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs
index 775de2bcf5..00092c72be 100644
--- a/osu.Game/Users/CountryCode.cs
+++ b/osu.Game/Users/CountryCode.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Users
         [Description("Belize")]
         BZ,
 
-        [Description("Russia")]
+        [Description("Russian Federation")]
         RU,
 
         [Description("Rwanda")]
@@ -639,7 +639,7 @@ namespace osu.Game.Users
         [Description("Trinidad and Tobago")]
         TT,
 
-        [Description("Turkey")]
+        [Description("Türkiye")]
         TR,
 
         [Description("Sri Lanka")]

From ded99c4097539fde80d0901748a07bce9ba6b31e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 14:32:03 +0900
Subject: [PATCH 1140/2296] Simplify calculation

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index c3ffb6507c..19aa5d31f3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -120,11 +120,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             {
                 DrawableSlider drawableSlider = (DrawableSlider)drawableObject;
 
-                // stable apparently calculates slider velocity in units of seconds rather than milliseconds.
-                double stableSliderVelocity = drawableSlider.HitObject.Velocity * 1000;
-
                 frameDelay = Math.Max(
-                    150 / stableSliderVelocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
+                    0.15 / drawableSlider.HitObject.Velocity * LegacySkinExtensions.SIXTY_FRAME_TIME,
                     LegacySkinExtensions.SIXTY_FRAME_TIME);
             }
             else

From 11c949d09144d57099d1be3fcd725eeaefaa0a8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 14:45:25 +0900
Subject: [PATCH 1141/2296] Sort countries alphabetically

---
 osu.Game/Users/CountryCode.cs | 1094 ++++++++++++++++-----------------
 1 file changed, 547 insertions(+), 547 deletions(-)

diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs
index 00092c72be..3e28b946f9 100644
--- a/osu.Game/Users/CountryCode.cs
+++ b/osu.Game/Users/CountryCode.cs
@@ -15,6 +15,60 @@ namespace osu.Game.Users
         [Description("Unknown")]
         Unknown = 0,
 
+        [Description("Andorra")]
+        AD,
+
+        [Description("United Arab Emirates")]
+        AE,
+
+        [Description("Afghanistan")]
+        AF,
+
+        [Description("Antigua and Barbuda")]
+        AG,
+
+        [Description("Anguilla")]
+        AI,
+
+        [Description("Albania")]
+        AL,
+
+        [Description("Armenia")]
+        AM,
+
+        [Description("Angola")]
+        AO,
+
+        [Description("Antarctica")]
+        AQ,
+
+        [Description("Argentina")]
+        AR,
+
+        [Description("American Samoa")]
+        AS,
+
+        [Description("Austria")]
+        AT,
+
+        [Description("Australia")]
+        AU,
+
+        [Description("Aruba")]
+        AW,
+
+        [Description("Aland Islands")]
+        AX,
+
+        [Description("Azerbaijan")]
+        AZ,
+
+        [Description("Bosnia and Herzegovina")]
+        BA,
+
+        [Description("Barbados")]
+        BB,
+
         [Description("Bangladesh")]
         BD,
 
@@ -27,14 +81,14 @@ namespace osu.Game.Users
         [Description("Bulgaria")]
         BG,
 
-        [Description("Bosnia and Herzegovina")]
-        BA,
+        [Description("Bahrain")]
+        BH,
 
-        [Description("Barbados")]
-        BB,
+        [Description("Burundi")]
+        BI,
 
-        [Description("Wallis and Futuna")]
-        WF,
+        [Description("Benin")]
+        BJ,
 
         [Description("Saint Barthelemy")]
         BL,
@@ -48,30 +102,6 @@ namespace osu.Game.Users
         [Description("Bolivia")]
         BO,
 
-        [Description("Bahrain")]
-        BH,
-
-        [Description("Burundi")]
-        BI,
-
-        [Description("Benin")]
-        BJ,
-
-        [Description("Bhutan")]
-        BT,
-
-        [Description("Jamaica")]
-        JM,
-
-        [Description("Bouvet Island")]
-        BV,
-
-        [Description("Botswana")]
-        BW,
-
-        [Description("Samoa")]
-        WS,
-
         [Description("Bonaire, Saint Eustatius and Saba")]
         BQ,
 
@@ -81,8 +111,14 @@ namespace osu.Game.Users
         [Description("Bahamas")]
         BS,
 
-        [Description("Jersey")]
-        JE,
+        [Description("Bhutan")]
+        BT,
+
+        [Description("Bouvet Island")]
+        BV,
+
+        [Description("Botswana")]
+        BW,
 
         [Description("Belarus")]
         BY,
@@ -90,179 +126,83 @@ namespace osu.Game.Users
         [Description("Belize")]
         BZ,
 
-        [Description("Russian Federation")]
-        RU,
+        [Description("Canada")]
+        CA,
 
-        [Description("Rwanda")]
-        RW,
+        [Description("Cocos Islands")]
+        CC,
 
-        [Description("Serbia")]
-        RS,
+        [Description("Democratic Republic of the Congo")]
+        CD,
 
-        [Description("East Timor")]
-        TL,
+        [Description("Central African Republic")]
+        CF,
 
-        [Description("Reunion")]
-        RE,
+        [Description("Republic of the Congo")]
+        CG,
 
-        [Description("Turkmenistan")]
-        TM,
+        [Description("Switzerland")]
+        CH,
 
-        [Description("Tajikistan")]
-        TJ,
+        [Description("Ivory Coast")]
+        CI,
 
-        [Description("Romania")]
-        RO,
+        [Description("Cook Islands")]
+        CK,
 
-        [Description("Tokelau")]
-        TK,
+        [Description("Chile")]
+        CL,
 
-        [Description("Guinea-Bissau")]
-        GW,
+        [Description("Cameroon")]
+        CM,
 
-        [Description("Guam")]
-        GU,
+        [Description("China")]
+        CN,
 
-        [Description("Guatemala")]
-        GT,
+        [Description("Colombia")]
+        CO,
 
-        [Description("South Georgia and the South Sandwich Islands")]
-        GS,
+        [Description("Costa Rica")]
+        CR,
 
-        [Description("Greece")]
-        GR,
+        [Description("Cuba")]
+        CU,
 
-        [Description("Equatorial Guinea")]
-        GQ,
+        [Description("Cabo Verde")]
+        CV,
 
-        [Description("Guadeloupe")]
-        GP,
+        [Description("Curacao")]
+        CW,
 
-        [Description("Japan")]
-        JP,
+        [Description("Christmas Island")]
+        CX,
 
-        [Description("Guyana")]
-        GY,
+        [Description("Cyprus")]
+        CY,
 
-        [Description("Guernsey")]
-        GG,
+        [Description("Czech Republic")]
+        CZ,
 
-        [Description("French Guiana")]
-        GF,
+        [Description("Germany")]
+        DE,
 
-        [Description("Georgia")]
-        GE,
+        [Description("Djibouti")]
+        DJ,
 
-        [Description("Grenada")]
-        GD,
+        [Description("Denmark")]
+        DK,
 
-        [Description("United Kingdom")]
-        GB,
+        [Description("Dominica")]
+        DM,
 
-        [Description("Gabon")]
-        GA,
+        [Description("Dominican Republic")]
+        DO,
 
-        [Description("El Salvador")]
-        SV,
+        [Description("Algeria")]
+        DZ,
 
-        [Description("Guinea")]
-        GN,
-
-        [Description("Gambia")]
-        GM,
-
-        [Description("Greenland")]
-        GL,
-
-        [Description("Gibraltar")]
-        GI,
-
-        [Description("Ghana")]
-        GH,
-
-        [Description("Oman")]
-        OM,
-
-        [Description("Tunisia")]
-        TN,
-
-        [Description("Jordan")]
-        JO,
-
-        [Description("Croatia")]
-        HR,
-
-        [Description("Haiti")]
-        HT,
-
-        [Description("Hungary")]
-        HU,
-
-        [Description("Hong Kong")]
-        HK,
-
-        [Description("Honduras")]
-        HN,
-
-        [Description("Heard Island and McDonald Islands")]
-        HM,
-
-        [Description("Venezuela")]
-        VE,
-
-        [Description("Puerto Rico")]
-        PR,
-
-        [Description("Palestinian Territory")]
-        PS,
-
-        [Description("Palau")]
-        PW,
-
-        [Description("Portugal")]
-        PT,
-
-        [Description("Svalbard and Jan Mayen")]
-        SJ,
-
-        [Description("Paraguay")]
-        PY,
-
-        [Description("Iraq")]
-        IQ,
-
-        [Description("Panama")]
-        PA,
-
-        [Description("French Polynesia")]
-        PF,
-
-        [Description("Papua New Guinea")]
-        PG,
-
-        [Description("Peru")]
-        PE,
-
-        [Description("Pakistan")]
-        PK,
-
-        [Description("Philippines")]
-        PH,
-
-        [Description("Pitcairn")]
-        PN,
-
-        [Description("Poland")]
-        PL,
-
-        [Description("Saint Pierre and Miquelon")]
-        PM,
-
-        [Description("Zambia")]
-        ZM,
-
-        [Description("Western Sahara")]
-        EH,
+        [Description("Ecuador")]
+        EC,
 
         [Description("Estonia")]
         EE,
@@ -270,128 +210,17 @@ namespace osu.Game.Users
         [Description("Egypt")]
         EG,
 
-        [Description("South Africa")]
-        ZA,
-
-        [Description("Ecuador")]
-        EC,
-
-        [Description("Italy")]
-        IT,
-
-        [Description("Vietnam")]
-        VN,
-
-        [Description("Solomon Islands")]
-        SB,
-
-        [Description("Ethiopia")]
-        ET,
-
-        [Description("Somalia")]
-        SO,
-
-        [Description("Zimbabwe")]
-        ZW,
-
-        [Description("Saudi Arabia")]
-        SA,
-
-        [Description("Spain")]
-        ES,
+        [Description("Western Sahara")]
+        EH,
 
         [Description("Eritrea")]
         ER,
 
-        [Description("Montenegro")]
-        ME,
+        [Description("Spain")]
+        ES,
 
-        [Description("Moldova")]
-        MD,
-
-        [Description("Madagascar")]
-        MG,
-
-        [Description("Saint Martin")]
-        MF,
-
-        [Description("Morocco")]
-        MA,
-
-        [Description("Monaco")]
-        MC,
-
-        [Description("Uzbekistan")]
-        UZ,
-
-        [Description("Myanmar")]
-        MM,
-
-        [Description("Mali")]
-        ML,
-
-        [Description("Macao")]
-        MO,
-
-        [Description("Mongolia")]
-        MN,
-
-        [Description("Marshall Islands")]
-        MH,
-
-        [Description("North Macedonia")]
-        MK,
-
-        [Description("Mauritius")]
-        MU,
-
-        [Description("Malta")]
-        MT,
-
-        [Description("Malawi")]
-        MW,
-
-        [Description("Maldives")]
-        MV,
-
-        [Description("Martinique")]
-        MQ,
-
-        [Description("Northern Mariana Islands")]
-        MP,
-
-        [Description("Montserrat")]
-        MS,
-
-        [Description("Mauritania")]
-        MR,
-
-        [Description("Isle of Man")]
-        IM,
-
-        [Description("Uganda")]
-        UG,
-
-        [Description("Tanzania")]
-        TZ,
-
-        [Description("Malaysia")]
-        MY,
-
-        [Description("Mexico")]
-        MX,
-
-        [Description("Israel")]
-        IL,
-
-        [Description("France")]
-        FR,
-
-        [Description("British Indian Ocean Territory")]
-        IO,
-
-        [Description("Saint Helena")]
-        SH,
+        [Description("Ethiopia")]
+        ET,
 
         [Description("Finland")]
         FI,
@@ -408,21 +237,264 @@ namespace osu.Game.Users
         [Description("Faroe Islands")]
         FO,
 
-        [Description("Nicaragua")]
-        NI,
+        [Description("France")]
+        FR,
 
-        [Description("Netherlands")]
-        NL,
+        [Description("Gabon")]
+        GA,
 
-        [Description("Norway")]
-        NO,
+        [Description("United Kingdom")]
+        GB,
+
+        [Description("Grenada")]
+        GD,
+
+        [Description("Georgia")]
+        GE,
+
+        [Description("French Guiana")]
+        GF,
+
+        [Description("Guernsey")]
+        GG,
+
+        [Description("Ghana")]
+        GH,
+
+        [Description("Gibraltar")]
+        GI,
+
+        [Description("Greenland")]
+        GL,
+
+        [Description("Gambia")]
+        GM,
+
+        [Description("Guinea")]
+        GN,
+
+        [Description("Guadeloupe")]
+        GP,
+
+        [Description("Equatorial Guinea")]
+        GQ,
+
+        [Description("Greece")]
+        GR,
+
+        [Description("South Georgia and the South Sandwich Islands")]
+        GS,
+
+        [Description("Guatemala")]
+        GT,
+
+        [Description("Guam")]
+        GU,
+
+        [Description("Guinea-Bissau")]
+        GW,
+
+        [Description("Guyana")]
+        GY,
+
+        [Description("Hong Kong")]
+        HK,
+
+        [Description("Heard Island and McDonald Islands")]
+        HM,
+
+        [Description("Honduras")]
+        HN,
+
+        [Description("Croatia")]
+        HR,
+
+        [Description("Haiti")]
+        HT,
+
+        [Description("Hungary")]
+        HU,
+
+        [Description("Indonesia")]
+        ID,
+
+        [Description("Ireland")]
+        IE,
+
+        [Description("Israel")]
+        IL,
+
+        [Description("Isle of Man")]
+        IM,
+
+        [Description("India")]
+        IN,
+
+        [Description("British Indian Ocean Territory")]
+        IO,
+
+        [Description("Iraq")]
+        IQ,
+
+        [Description("Iran")]
+        IR,
+
+        [Description("Iceland")]
+        IS,
+
+        [Description("Italy")]
+        IT,
+
+        [Description("Jersey")]
+        JE,
+
+        [Description("Jamaica")]
+        JM,
+
+        [Description("Jordan")]
+        JO,
+
+        [Description("Japan")]
+        JP,
+
+        [Description("Kenya")]
+        KE,
+
+        [Description("Kyrgyzstan")]
+        KG,
+
+        [Description("Cambodia")]
+        KH,
+
+        [Description("Kiribati")]
+        KI,
+
+        [Description("Comoros")]
+        KM,
+
+        [Description("Saint Kitts and Nevis")]
+        KN,
+
+        [Description("North Korea")]
+        KP,
+
+        [Description("South Korea")]
+        KR,
+
+        [Description("Kuwait")]
+        KW,
+
+        [Description("Cayman Islands")]
+        KY,
+
+        [Description("Kazakhstan")]
+        KZ,
+
+        [Description("Laos")]
+        LA,
+
+        [Description("Lebanon")]
+        LB,
+
+        [Description("Saint Lucia")]
+        LC,
+
+        [Description("Liechtenstein")]
+        LI,
+
+        [Description("Sri Lanka")]
+        LK,
+
+        [Description("Liberia")]
+        LR,
+
+        [Description("Lesotho")]
+        LS,
+
+        [Description("Lithuania")]
+        LT,
+
+        [Description("Luxembourg")]
+        LU,
+
+        [Description("Latvia")]
+        LV,
+
+        [Description("Libya")]
+        LY,
+
+        [Description("Morocco")]
+        MA,
+
+        [Description("Monaco")]
+        MC,
+
+        [Description("Moldova")]
+        MD,
+
+        [Description("Montenegro")]
+        ME,
+
+        [Description("Saint Martin")]
+        MF,
+
+        [Description("Madagascar")]
+        MG,
+
+        [Description("Marshall Islands")]
+        MH,
+
+        [Description("North Macedonia")]
+        MK,
+
+        [Description("Mali")]
+        ML,
+
+        [Description("Myanmar")]
+        MM,
+
+        [Description("Mongolia")]
+        MN,
+
+        [Description("Macao")]
+        MO,
+
+        [Description("Northern Mariana Islands")]
+        MP,
+
+        [Description("Martinique")]
+        MQ,
+
+        [Description("Mauritania")]
+        MR,
+
+        [Description("Montserrat")]
+        MS,
+
+        [Description("Malta")]
+        MT,
+
+        [Description("Mauritius")]
+        MU,
+
+        [Description("Maldives")]
+        MV,
+
+        [Description("Malawi")]
+        MW,
+
+        [Description("Mexico")]
+        MX,
+
+        [Description("Malaysia")]
+        MY,
+
+        [Description("Mozambique")]
+        MZ,
 
         [Description("Namibia")]
         NA,
 
-        [Description("Vanuatu")]
-        VU,
-
         [Description("New Caledonia")]
         NC,
 
@@ -435,8 +507,14 @@ namespace osu.Game.Users
         [Description("Nigeria")]
         NG,
 
-        [Description("New Zealand")]
-        NZ,
+        [Description("Nicaragua")]
+        NI,
+
+        [Description("Netherlands")]
+        NL,
+
+        [Description("Norway")]
+        NO,
 
         [Description("Nepal")]
         NP,
@@ -447,227 +525,140 @@ namespace osu.Game.Users
         [Description("Niue")]
         NU,
 
-        [Description("Cook Islands")]
-        CK,
+        [Description("New Zealand")]
+        NZ,
 
-        [Description("Kosovo")]
-        XK,
+        [Description("Oman")]
+        OM,
 
-        [Description("Ivory Coast")]
-        CI,
+        [Description("Panama")]
+        PA,
 
-        [Description("Switzerland")]
-        CH,
+        [Description("Peru")]
+        PE,
 
-        [Description("Colombia")]
-        CO,
+        [Description("French Polynesia")]
+        PF,
 
-        [Description("China")]
-        CN,
+        [Description("Papua New Guinea")]
+        PG,
 
-        [Description("Cameroon")]
-        CM,
+        [Description("Philippines")]
+        PH,
 
-        [Description("Chile")]
-        CL,
+        [Description("Pakistan")]
+        PK,
 
-        [Description("Cocos Islands")]
-        CC,
+        [Description("Poland")]
+        PL,
 
-        [Description("Canada")]
-        CA,
+        [Description("Saint Pierre and Miquelon")]
+        PM,
 
-        [Description("Republic of the Congo")]
-        CG,
+        [Description("Pitcairn")]
+        PN,
 
-        [Description("Central African Republic")]
-        CF,
+        [Description("Puerto Rico")]
+        PR,
 
-        [Description("Democratic Republic of the Congo")]
-        CD,
+        [Description("Palestinian Territory")]
+        PS,
 
-        [Description("Czech Republic")]
-        CZ,
+        [Description("Portugal")]
+        PT,
 
-        [Description("Cyprus")]
-        CY,
+        [Description("Palau")]
+        PW,
 
-        [Description("Christmas Island")]
-        CX,
+        [Description("Paraguay")]
+        PY,
 
-        [Description("Costa Rica")]
-        CR,
+        [Description("Qatar")]
+        QA,
 
-        [Description("Curacao")]
-        CW,
+        [Description("Reunion")]
+        RE,
 
-        [Description("Cabo Verde")]
-        CV,
+        [Description("Romania")]
+        RO,
 
-        [Description("Cuba")]
-        CU,
+        [Description("Serbia")]
+        RS,
 
-        [Description("Eswatini")]
-        SZ,
+        [Description("Russian Federation")]
+        RU,
 
-        [Description("Syria")]
-        SY,
+        [Description("Rwanda")]
+        RW,
 
-        [Description("Sint Maarten")]
-        SX,
+        [Description("Saudi Arabia")]
+        SA,
 
-        [Description("Kyrgyzstan")]
-        KG,
-
-        [Description("Kenya")]
-        KE,
-
-        [Description("South Sudan")]
-        SS,
-
-        [Description("Suriname")]
-        SR,
-
-        [Description("Kiribati")]
-        KI,
-
-        [Description("Cambodia")]
-        KH,
-
-        [Description("Saint Kitts and Nevis")]
-        KN,
-
-        [Description("Comoros")]
-        KM,
-
-        [Description("Sao Tome and Principe")]
-        ST,
-
-        [Description("Slovakia")]
-        SK,
-
-        [Description("South Korea")]
-        KR,
-
-        [Description("Slovenia")]
-        SI,
-
-        [Description("North Korea")]
-        KP,
-
-        [Description("Kuwait")]
-        KW,
-
-        [Description("Senegal")]
-        SN,
-
-        [Description("San Marino")]
-        SM,
-
-        [Description("Sierra Leone")]
-        SL,
+        [Description("Solomon Islands")]
+        SB,
 
         [Description("Seychelles")]
         SC,
 
-        [Description("Kazakhstan")]
-        KZ,
-
-        [Description("Cayman Islands")]
-        KY,
-
-        [Description("Singapore")]
-        SG,
+        [Description("Sudan")]
+        SD,
 
         [Description("Sweden")]
         SE,
 
-        [Description("Sudan")]
-        SD,
+        [Description("Singapore")]
+        SG,
 
-        [Description("Dominican Republic")]
-        DO,
+        [Description("Saint Helena")]
+        SH,
 
-        [Description("Dominica")]
-        DM,
+        [Description("Slovenia")]
+        SI,
 
-        [Description("Djibouti")]
-        DJ,
+        [Description("Svalbard and Jan Mayen")]
+        SJ,
 
-        [Description("Denmark")]
-        DK,
+        [Description("Slovakia")]
+        SK,
 
-        [Description("British Virgin Islands")]
-        VG,
+        [Description("Sierra Leone")]
+        SL,
 
-        [Description("Germany")]
-        DE,
+        [Description("San Marino")]
+        SM,
 
-        [Description("Yemen")]
-        YE,
+        [Description("Senegal")]
+        SN,
 
-        [Description("Algeria")]
-        DZ,
+        [Description("Somalia")]
+        SO,
 
-        [Description("United States")]
-        US,
+        [Description("Suriname")]
+        SR,
 
-        [Description("Uruguay")]
-        UY,
+        [Description("South Sudan")]
+        SS,
 
-        [Description("Mayotte")]
-        YT,
+        [Description("Sao Tome and Principe")]
+        ST,
 
-        [Description("United States Minor Outlying Islands")]
-        UM,
+        [Description("El Salvador")]
+        SV,
 
-        [Description("Lebanon")]
-        LB,
+        [Description("Sint Maarten")]
+        SX,
 
-        [Description("Saint Lucia")]
-        LC,
+        [Description("Syria")]
+        SY,
 
-        [Description("Laos")]
-        LA,
+        [Description("Eswatini")]
+        SZ,
 
-        [Description("Tuvalu")]
-        TV,
+        [Description("Turks and Caicos Islands")]
+        TC,
 
-        [Description("Taiwan")]
-        TW,
-
-        [Description("Trinidad and Tobago")]
-        TT,
-
-        [Description("Türkiye")]
-        TR,
-
-        [Description("Sri Lanka")]
-        LK,
-
-        [Description("Liechtenstein")]
-        LI,
-
-        [Description("Latvia")]
-        LV,
-
-        [Description("Tonga")]
-        TO,
-
-        [Description("Lithuania")]
-        LT,
-
-        [Description("Luxembourg")]
-        LU,
-
-        [Description("Liberia")]
-        LR,
-
-        [Description("Lesotho")]
-        LS,
-
-        [Description("Thailand")]
-        TH,
+        [Description("Chad")]
+        TD,
 
         [Description("French Southern Territories")]
         TF,
@@ -675,14 +666,59 @@ namespace osu.Game.Users
         [Description("Togo")]
         TG,
 
-        [Description("Chad")]
-        TD,
+        [Description("Thailand")]
+        TH,
 
-        [Description("Turks and Caicos Islands")]
-        TC,
+        [Description("Tajikistan")]
+        TJ,
 
-        [Description("Libya")]
-        LY,
+        [Description("Tokelau")]
+        TK,
+
+        [Description("East Timor")]
+        TL,
+
+        [Description("Turkmenistan")]
+        TM,
+
+        [Description("Tunisia")]
+        TN,
+
+        [Description("Tonga")]
+        TO,
+
+        [Description("Türkiye")]
+        TR,
+
+        [Description("Trinidad and Tobago")]
+        TT,
+
+        [Description("Tuvalu")]
+        TV,
+
+        [Description("Taiwan")]
+        TW,
+
+        [Description("Tanzania")]
+        TZ,
+
+        [Description("Ukraine")]
+        UA,
+
+        [Description("Uganda")]
+        UG,
+
+        [Description("United States Minor Outlying Islands")]
+        UM,
+
+        [Description("United States")]
+        US,
+
+        [Description("Uruguay")]
+        UY,
+
+        [Description("Uzbekistan")]
+        UZ,
 
         [Description("Vatican")]
         VA,
@@ -690,79 +726,43 @@ namespace osu.Game.Users
         [Description("Saint Vincent and the Grenadines")]
         VC,
 
-        [Description("United Arab Emirates")]
-        AE,
+        [Description("Venezuela")]
+        VE,
 
-        [Description("Andorra")]
-        AD,
-
-        [Description("Antigua and Barbuda")]
-        AG,
-
-        [Description("Afghanistan")]
-        AF,
-
-        [Description("Anguilla")]
-        AI,
+        [Description("British Virgin Islands")]
+        VG,
 
         [Description("U.S. Virgin Islands")]
         VI,
 
-        [Description("Iceland")]
-        IS,
+        [Description("Vietnam")]
+        VN,
 
-        [Description("Iran")]
-        IR,
+        [Description("Vanuatu")]
+        VU,
 
-        [Description("Armenia")]
-        AM,
+        [Description("Wallis and Futuna")]
+        WF,
 
-        [Description("Albania")]
-        AL,
+        [Description("Samoa")]
+        WS,
 
-        [Description("Angola")]
-        AO,
+        [Description("Kosovo")]
+        XK,
 
-        [Description("Antarctica")]
-        AQ,
+        [Description("Yemen")]
+        YE,
 
-        [Description("American Samoa")]
-        AS,
+        [Description("Mayotte")]
+        YT,
 
-        [Description("Argentina")]
-        AR,
+        [Description("South Africa")]
+        ZA,
 
-        [Description("Australia")]
-        AU,
+        [Description("Zambia")]
+        ZM,
 
-        [Description("Austria")]
-        AT,
-
-        [Description("Aruba")]
-        AW,
-
-        [Description("India")]
-        IN,
-
-        [Description("Aland Islands")]
-        AX,
-
-        [Description("Azerbaijan")]
-        AZ,
-
-        [Description("Ireland")]
-        IE,
-
-        [Description("Indonesia")]
-        ID,
-
-        [Description("Ukraine")]
-        UA,
-
-        [Description("Qatar")]
-        QA,
-
-        [Description("Mozambique")]
-        MZ,
+        [Description("Zimbabwe")]
+        ZW,
     }
 }

From 17070707b5fbdbaeef32804b0154e45143f03b3d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 14:46:58 +0900
Subject: [PATCH 1142/2296] Update and add remaining country codes to match
 database

---
 osu.Game/Users/CountryCode.cs | 64 ++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs
index 3e28b946f9..e56cdf0dfd 100644
--- a/osu.Game/Users/CountryCode.cs
+++ b/osu.Game/Users/CountryCode.cs
@@ -15,6 +15,12 @@ namespace osu.Game.Users
         [Description("Unknown")]
         Unknown = 0,
 
+        [Description("Anonymous Proxy")]
+        A1,
+
+        [Description("Satellite Provider")]
+        A2,
+
         [Description("Andorra")]
         AD,
 
@@ -36,9 +42,15 @@ namespace osu.Game.Users
         [Description("Armenia")]
         AM,
 
+        [Description("Netherlands Antilles")]
+        AN,
+
         [Description("Angola")]
         AO,
 
+        [Description("Asia/Pacific Region")]
+        AP,
+
         [Description("Antarctica")]
         AQ,
 
@@ -102,7 +114,7 @@ namespace osu.Game.Users
         [Description("Bolivia")]
         BO,
 
-        [Description("Bonaire, Saint Eustatius and Saba")]
+        [Description("Caribbean Netherlands")]
         BQ,
 
         [Description("Brazil")]
@@ -129,22 +141,22 @@ namespace osu.Game.Users
         [Description("Canada")]
         CA,
 
-        [Description("Cocos Islands")]
+        [Description("Cocos (Keeling) Islands")]
         CC,
 
-        [Description("Democratic Republic of the Congo")]
+        [Description("The Democratic Republic of the Congo")]
         CD,
 
         [Description("Central African Republic")]
         CF,
 
-        [Description("Republic of the Congo")]
+        [Description("Congo")]
         CG,
 
         [Description("Switzerland")]
         CH,
 
-        [Description("Ivory Coast")]
+        [Description("Cote D'Ivoire")]
         CI,
 
         [Description("Cook Islands")]
@@ -171,7 +183,7 @@ namespace osu.Game.Users
         [Description("Cabo Verde")]
         CV,
 
-        [Description("Curacao")]
+        [Description("Curaçao")]
         CW,
 
         [Description("Christmas Island")]
@@ -180,7 +192,7 @@ namespace osu.Game.Users
         [Description("Cyprus")]
         CY,
 
-        [Description("Czech Republic")]
+        [Description("Czechia")]
         CZ,
 
         [Description("Germany")]
@@ -222,16 +234,19 @@ namespace osu.Game.Users
         [Description("Ethiopia")]
         ET,
 
+        [Description("Europe")]
+        EU,
+
         [Description("Finland")]
         FI,
 
         [Description("Fiji")]
         FJ,
 
-        [Description("Falkland Islands")]
+        [Description("Falkland Islands (Malvinas)")]
         FK,
 
-        [Description("Micronesia")]
+        [Description("Federated States of Micronesia")]
         FM,
 
         [Description("Faroe Islands")]
@@ -240,6 +255,9 @@ namespace osu.Game.Users
         [Description("France")]
         FR,
 
+        [Description("France, Metropolitan")]
+        FX,
+
         [Description("Gabon")]
         GA,
 
@@ -336,7 +354,7 @@ namespace osu.Game.Users
         [Description("Iraq")]
         IQ,
 
-        [Description("Iran")]
+        [Description("Islamic Republic of Iran")]
         IR,
 
         [Description("Iceland")]
@@ -375,7 +393,7 @@ namespace osu.Game.Users
         [Description("Saint Kitts and Nevis")]
         KN,
 
-        [Description("North Korea")]
+        [Description("Democratic People's Republic of Korea")]
         KP,
 
         [Description("South Korea")]
@@ -390,7 +408,7 @@ namespace osu.Game.Users
         [Description("Kazakhstan")]
         KZ,
 
-        [Description("Laos")]
+        [Description("Lao People's Democratic Republic")]
         LA,
 
         [Description("Lebanon")]
@@ -456,7 +474,7 @@ namespace osu.Game.Users
         [Description("Mongolia")]
         MN,
 
-        [Description("Macao")]
+        [Description("Macau")]
         MO,
 
         [Description("Northern Mariana Islands")]
@@ -528,6 +546,9 @@ namespace osu.Game.Users
         [Description("New Zealand")]
         NZ,
 
+        [Description("Other")]
+        O1,
+
         [Description("Oman")]
         OM,
 
@@ -561,7 +582,7 @@ namespace osu.Game.Users
         [Description("Puerto Rico")]
         PR,
 
-        [Description("Palestinian Territory")]
+        [Description("State of Palestine")]
         PS,
 
         [Description("Portugal")]
@@ -636,9 +657,6 @@ namespace osu.Game.Users
         [Description("Suriname")]
         SR,
 
-        [Description("South Sudan")]
-        SS,
-
         [Description("Sao Tome and Principe")]
         ST,
 
@@ -648,7 +666,7 @@ namespace osu.Game.Users
         [Description("Sint Maarten")]
         SX,
 
-        [Description("Syria")]
+        [Description("Syrian Arab Republic")]
         SY,
 
         [Description("Eswatini")]
@@ -675,7 +693,7 @@ namespace osu.Game.Users
         [Description("Tokelau")]
         TK,
 
-        [Description("East Timor")]
+        [Description("Timor-Leste")]
         TL,
 
         [Description("Turkmenistan")]
@@ -699,7 +717,7 @@ namespace osu.Game.Users
         [Description("Taiwan")]
         TW,
 
-        [Description("Tanzania")]
+        [Description("United Republic of Tanzania")]
         TZ,
 
         [Description("Ukraine")]
@@ -720,7 +738,7 @@ namespace osu.Game.Users
         [Description("Uzbekistan")]
         UZ,
 
-        [Description("Vatican")]
+        [Description("Holy See (Vatican City State)")]
         VA,
 
         [Description("Saint Vincent and the Grenadines")]
@@ -729,10 +747,10 @@ namespace osu.Game.Users
         [Description("Venezuela")]
         VE,
 
-        [Description("British Virgin Islands")]
+        [Description("Virgin Islands, British")]
         VG,
 
-        [Description("U.S. Virgin Islands")]
+        [Description("Virgin Islands, U.S.")]
         VI,
 
         [Description("Vietnam")]

From 127482919329740ef82670e0760c467c1d2e3718 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 14:51:40 +0900
Subject: [PATCH 1143/2296] Block scroll and click operations on the left side
 of song select

---
 osu.Game/Screens/Select/SongSelect.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f792f3e4f5..d5ec94ad71 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -238,7 +238,7 @@ namespace osu.Game.Screens.Select
                                         Padding = new MarginPadding { Top = left_area_padding },
                                         Children = new Drawable[]
                                         {
-                                            new ResetScrollContainer(() => Carousel.ScrollToSelected())
+                                            new LeftSideInteractionContainer(() => Carousel.ScrollToSelected())
                                             {
                                                 RelativeSizeAxes = Axes.Both,
                                             },
@@ -1016,18 +1016,25 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private partial class ResetScrollContainer : Container
+        /// <summary>
+        /// Handles mouse interactions required when moving away from the carousel.
+        /// </summary>
+        private partial class LeftSideInteractionContainer : Container
         {
-            private readonly Action? onHoverAction;
+            private readonly Action? resetCarouselPosition;
 
-            public ResetScrollContainer(Action onHoverAction)
+            public LeftSideInteractionContainer(Action resetCarouselPosition)
             {
-                this.onHoverAction = onHoverAction;
+                this.resetCarouselPosition = resetCarouselPosition;
             }
 
+            protected override bool OnScroll(ScrollEvent e) => true;
+
+            protected override bool OnMouseDown(MouseDownEvent e) => true;
+
             protected override bool OnHover(HoverEvent e)
             {
-                onHoverAction?.Invoke();
+                resetCarouselPosition?.Invoke();
                 return base.OnHover(e);
             }
         }

From 383d7153788152c5dd6cdc4abe1149e03bfb3d7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 14:59:21 +0900
Subject: [PATCH 1144/2296] Fix incorrectly named test

---
 .../{TestSceneDifficultySearch.cs => DifficultySearchTest.cs}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/SongSelect/{TestSceneDifficultySearch.cs => DifficultySearchTest.cs} (97%)

diff --git a/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs b/osu.Game.Tests/SongSelect/DifficultySearchTest.cs
similarity index 97%
rename from osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
rename to osu.Game.Tests/SongSelect/DifficultySearchTest.cs
index f013d5c19a..770e40d672 100644
--- a/osu.Game.Tests/SongSelect/TestSceneDifficultySearch.cs
+++ b/osu.Game.Tests/SongSelect/DifficultySearchTest.cs
@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.SongSelect
 {
-    public partial class TestSceneDifficultySearch : OsuTestScene
+    public partial class DifficultySearchTest : OsuTestScene
     {
         private static readonly (string title, string difficultyName)[] beatmaps =
         {

From b16ece32f42373a0dde565a830f19b414e21966e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 15:14:30 +0900
Subject: [PATCH 1145/2296] Put tests in more correct place

---
 .../Filtering/FilterQueryParserTest.cs        | 50 +++++++++++++
 .../SongSelect/DifficultySearchTest.cs        | 72 -------------------
 2 files changed, 50 insertions(+), 72 deletions(-)
 delete mode 100644 osu.Game.Tests/SongSelect/DifficultySearchTest.cs

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index ce95e921b9..d453954ae0 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Tests.NonVisual.Filtering
@@ -382,6 +384,54 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("unrecognised=keyword", filterCriteria.SearchText.Trim());
         }
 
+        [TestCase("[1]", new[] { 0 })]
+        [TestCase("[1", new[] { 0 })]
+        [TestCase("My[Favourite", new[] { 2 })]
+        [TestCase("My[Favourite]", new[] { 2 })]
+        [TestCase("My[Favourite]Song", new[] { 2 })]
+        [TestCase("Favourite]", new[] { 2 })]
+        [TestCase("[Diff", new[] { 0, 1, 3, 4 })]
+        [TestCase("[Diff]", new[] { 0, 1, 3, 4 })]
+        [TestCase("[Favourite]", new[] { 3 })]
+        [TestCase("Title1 [Diff]", new[] { 0, 1 })]
+        [TestCase("Title1[Diff]", new int[] { })]
+        [TestCase("[diff ]with]", new[] { 4 })]
+        [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
+        [TestCase("[diff] another [brackets]", new[] { 4 })]
+        public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
+        {
+            var carouselBeatmaps = (((string title, string difficultyName)[])new[]
+            {
+                ("Title1", "Diff1"),
+                ("Title1", "Diff2"),
+                ("My[Favourite]Song", "Expert"),
+                ("Title", "My Favourite Diff"),
+                ("Another One", "diff ]with [[ brackets]]]"),
+            }).Select(info => new CarouselBeatmap(new BeatmapInfo
+            {
+                Metadata = new BeatmapMetadata
+                {
+                    Title = info.title
+                },
+                DifficultyName = info.difficultyName
+            })).ToList();
+
+            var criteria = new FilterCriteria();
+
+            FilterQueryParser.ApplyQueries(criteria, query);
+            carouselBeatmaps.ForEach(b => b.Filter(criteria));
+
+            Assert.That(carouselBeatmaps.All(b =>
+            {
+                int index = carouselBeatmaps.IndexOf(b);
+
+                bool shouldBeVisible = expectedBeatmapIndexes.Contains(index);
+                bool isVisible = !b.Filtered.Value;
+
+                return isVisible == shouldBeVisible;
+            }));
+        }
+
         private class CustomFilterCriteria : IRulesetFilterCriteria
         {
             public string? CustomValue { get; set; }
diff --git a/osu.Game.Tests/SongSelect/DifficultySearchTest.cs b/osu.Game.Tests/SongSelect/DifficultySearchTest.cs
deleted file mode 100644
index 770e40d672..0000000000
--- a/osu.Game.Tests/SongSelect/DifficultySearchTest.cs
+++ /dev/null
@@ -1,72 +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.Game.Beatmaps;
-using osu.Game.Screens.Select;
-using osu.Game.Screens.Select.Carousel;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Tests.SongSelect
-{
-    public partial class DifficultySearchTest : OsuTestScene
-    {
-        private static readonly (string title, string difficultyName)[] beatmaps =
-        {
-            ("Title1", "Diff1"),
-            ("Title1", "Diff2"),
-            ("My[Favourite]Song", "Expert"),
-            ("Title", "My Favourite Diff"),
-            ("Another One", "diff ]with [[ brackets]]]"),
-        };
-
-        [TestCase("[1]", new[] { 0 })]
-        [TestCase("[1", new[] { 0 })]
-        [TestCase("My[Favourite", new[] { 2 })]
-        [TestCase("My[Favourite]", new[] { 2 })]
-        [TestCase("My[Favourite]Song", new[] { 2 })]
-        [TestCase("Favourite]", new[] { 2 })]
-        [TestCase("[Diff", new[] { 0, 1, 3, 4 })]
-        [TestCase("[Diff]", new[] { 0, 1, 3, 4 })]
-        [TestCase("[Favourite]", new[] { 3 })]
-        [TestCase("Title1 [Diff]", new[] { 0, 1 })]
-        [TestCase("Title1[Diff]", new int[] { })]
-        [TestCase("[diff ]with]", new[] { 4 })]
-        [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
-        [TestCase("[diff] another [brackets]", new[] { 4 })]
-        public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
-        {
-            var carouselBeatmaps = createCarouselBeatmaps().ToList();
-
-            AddStep("filter beatmaps", () =>
-            {
-                var criteria = new FilterCriteria();
-                FilterQueryParser.ApplyQueries(criteria, query);
-                carouselBeatmaps.ForEach(b => b.Filter(criteria));
-            });
-
-            AddAssert("filtered correctly", () => carouselBeatmaps.All(b =>
-            {
-                int index = carouselBeatmaps.IndexOf(b);
-
-                bool filtered = b.Filtered.Value;
-
-                return filtered != expectedBeatmapIndexes.Contains(index);
-            }));
-        }
-
-        private static IEnumerable<CarouselBeatmap> createCarouselBeatmaps()
-        {
-            return beatmaps.Select(info => new CarouselBeatmap(new BeatmapInfo
-            {
-                Metadata = new BeatmapMetadata
-                {
-                    Title = info.title
-                },
-                DifficultyName = info.difficultyName
-            }));
-        }
-    }
-}

From 794c3a2473024aa8119cd708acfa4fddebd10dc8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 15:22:27 +0900
Subject: [PATCH 1146/2296] Add a couple more tests for sanity

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

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index d453954ae0..499300ebf8 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -390,14 +390,16 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("My[Favourite]", new[] { 2 })]
         [TestCase("My[Favourite]Song", new[] { 2 })]
         [TestCase("Favourite]", new[] { 2 })]
-        [TestCase("[Diff", new[] { 0, 1, 3, 4 })]
-        [TestCase("[Diff]", new[] { 0, 1, 3, 4 })]
+        [TestCase("[Diff", new[] { 0, 1, 3, 4, 6 })]
+        [TestCase("[Diff]", new[] { 0, 1, 3, 4, 6 })]
         [TestCase("[Favourite]", new[] { 3 })]
         [TestCase("Title1 [Diff]", new[] { 0, 1 })]
         [TestCase("Title1[Diff]", new int[] { })]
         [TestCase("[diff ]with]", new[] { 4 })]
         [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
         [TestCase("[diff] another [brackets]", new[] { 4 })]
+        [TestCase("[Diff in title]", new int[] { })]
+        [TestCase("[Diff in diff]", new int[] { 6 })]
         public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
         {
             var carouselBeatmaps = (((string title, string difficultyName)[])new[]
@@ -407,6 +409,8 @@ namespace osu.Game.Tests.NonVisual.Filtering
                 ("My[Favourite]Song", "Expert"),
                 ("Title", "My Favourite Diff"),
                 ("Another One", "diff ]with [[ brackets]]]"),
+                ("Diff in title", "a"),
+                ("a", "Diff in diff"),
             }).Select(info => new CarouselBeatmap(new BeatmapInfo
             {
                 Metadata = new BeatmapMetadata

From 6865d8894de02cf68466d809875e45508d839bb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 16:01:32 +0900
Subject: [PATCH 1147/2296] Simplify implementation and remove unsupported test
 coverage

---
 .../Filtering/FilterQueryParserTest.cs        |  1 -
 .../Select/Carousel/CarouselBeatmap.cs        |  4 +-
 osu.Game/Screens/Select/FilterCriteria.cs     | 71 +++++++++---------
 osu.Game/Screens/Select/FilterQueryParser.cs  | 75 -------------------
 4 files changed, 36 insertions(+), 115 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 499300ebf8..508251f046 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -397,7 +397,6 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("Title1[Diff]", new int[] { })]
         [TestCase("[diff ]with]", new[] { 4 })]
         [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
-        [TestCase("[diff] another [brackets]", new[] { 4 })]
         [TestCase("[Diff in title]", new int[] { })]
         [TestCase("[Diff in diff]", new int[] { 6 })]
         public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index f433e71cc3..ff781db680 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -59,13 +59,13 @@ namespace osu.Game.Screens.Select.Carousel
                      criteria.Artist.Matches(BeatmapInfo.Metadata.ArtistUnicode);
             match &= !criteria.Title.HasFilter || criteria.Title.Matches(BeatmapInfo.Metadata.Title) ||
                      criteria.Title.Matches(BeatmapInfo.Metadata.TitleUnicode);
+            match &= !criteria.DifficultyName.HasFilter || criteria.DifficultyName.Matches(BeatmapInfo.DifficultyName) ||
+                     criteria.DifficultyName.Matches(BeatmapInfo.Metadata.TitleUnicode);
 
             match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating);
 
             if (!match) return false;
 
-            match &= criteria.DifficultySearchTerms.All(term => term.Matches(BeatmapInfo.DifficultyName));
-
             if (criteria.SearchTerms.Length > 0)
             {
                 var searchableTerms = BeatmapInfo.GetSearchableTerms();
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 1bcff601e5..5666f9d1d4 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Screens.Select
         public OptionalTextFilter Creator;
         public OptionalTextFilter Artist;
         public OptionalTextFilter Title;
+        public OptionalTextFilter DifficultyName;
 
         public OptionalRange<double> UserStarDifficulty = new OptionalRange<double>
         {
@@ -47,11 +48,6 @@ namespace osu.Game.Screens.Select
 
         public OptionalTextFilter[] SearchTerms = Array.Empty<OptionalTextFilter>();
 
-        /// <summary>
-        /// Search terms that are used for searching difficulty names.
-        /// </summary>
-        public OptionalTextFilter[] DifficultySearchTerms = Array.Empty<OptionalTextFilter>();
-
         public RulesetInfo? Ruleset;
         public bool AllowConvertedBeatmaps;
 
@@ -69,7 +65,39 @@ namespace osu.Game.Screens.Select
             {
                 searchText = value;
 
-                SearchTerms = getTermsFromSearchText(value);
+                List<OptionalTextFilter> terms = new List<OptionalTextFilter>();
+
+                string remainingText = value;
+
+                // Match either an open difficulty tag to the end of string,
+                // or match a closed one with a whitespace after it.
+                //
+                // To keep things simple, the closing ']' may be included in the match group,
+                // and is trimmer post-match.
+                foreach (Match quotedSegment in Regex.Matches(value, "(^|\\s)\\[(.*)(\\]\\s|$)"))
+                {
+                    DifficultyName = new OptionalTextFilter
+                    {
+                        SearchTerm = quotedSegment.Groups[2].Value.Trim(']')
+                    };
+
+                    remainingText = remainingText.Replace(quotedSegment.Value, string.Empty);
+                }
+
+                // First handle quoted segments to ensure we keep inline spaces in exact matches.
+                foreach (Match quotedSegment in Regex.Matches(value, "(\"[^\"]+\"[!]?)"))
+                {
+                    terms.Add(new OptionalTextFilter { SearchTerm = quotedSegment.Value });
+                    remainingText = remainingText.Replace(quotedSegment.Value, string.Empty);
+                }
+
+                // Then handle the rest splitting on any spaces.
+                terms.AddRange(remainingText.Split(' ', StringSplitOptions.RemoveEmptyEntries).Select(s => new OptionalTextFilter
+                {
+                    SearchTerm = s
+                }));
+
+                SearchTerms = terms.ToArray();
 
                 SearchNumber = null;
 
@@ -78,15 +106,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        /// <summary>
-        /// Extracts the search terms from the provided <see cref="string"/>
-        /// and stores them in <see cref="DifficultySearchTerms"/>.
-        /// </summary>
-        public string DifficultySearchText
-        {
-            set => DifficultySearchTerms = getTermsFromSearchText(value);
-        }
-
         /// <summary>
         /// Hashes from the <see cref="BeatmapCollection"/> to filter to.
         /// </summary>
@@ -94,28 +113,6 @@ namespace osu.Game.Screens.Select
 
         public IRulesetFilterCriteria? RulesetCriteria { get; set; }
 
-        private static OptionalTextFilter[] getTermsFromSearchText(string searchText)
-        {
-            List<OptionalTextFilter> terms = new List<OptionalTextFilter>();
-
-            string remainingText = searchText;
-
-            // First handle quoted segments to ensure we keep inline spaces in exact matches.
-            foreach (Match quotedSegment in Regex.Matches(searchText, "(\"[^\"]+\"[!]?)"))
-            {
-                terms.Add(new OptionalTextFilter { SearchTerm = quotedSegment.Value });
-                remainingText = remainingText.Replace(quotedSegment.Value, string.Empty);
-            }
-
-            // Then handle the rest splitting on any spaces.
-            terms.AddRange(remainingText.Split(' ', StringSplitOptions.RemoveEmptyEntries).Select(s => new OptionalTextFilter
-            {
-                SearchTerm = s
-            }));
-
-            return terms.ToArray();
-        }
-
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct
         {
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 33ddd08e09..1238173b41 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Screens.Select
 
         internal static void ApplyQueries(FilterCriteria criteria, string query)
         {
-            criteria.DifficultySearchText = extractDifficultySearchText(ref query);
-
             foreach (Match match in query_syntax_regex.Matches(query))
             {
                 string key = match.Groups["key"].Value.ToLowerInvariant();
@@ -36,79 +34,6 @@ namespace osu.Game.Screens.Select
             criteria.SearchText = query;
         }
 
-        /// <summary>
-        /// Extracts and returns the difficulty search text between square brackets.
-        /// </summary>
-        /// <param name="query">The search query. The difficulty search text will be removed from the query.</param>
-        /// <returns>The difficulty search text (without the square brackets).</returns>
-        private static string extractDifficultySearchText(ref string query)
-        {
-            var openingBracketIndexes = new List<int>();
-            var closingBracketIndexes = new List<int>();
-
-            populateIndexLists(query);
-
-            return performExtraction(ref query);
-
-            void populateIndexLists(string query)
-            {
-                bool currentlyBetweenBrackets = false;
-
-                for (int i = 0; i < query.Length; i++)
-                {
-                    switch (query[i])
-                    {
-                        case '[':
-                            if (!currentlyBetweenBrackets && (i == 0 || query[i - 1] == ' '))
-                            {
-                                currentlyBetweenBrackets = true;
-                                openingBracketIndexes.Add(i + 1);
-                            }
-
-                            break;
-
-                        case ']':
-                            if (currentlyBetweenBrackets && (i == query.Length - 1 || query[i + 1] == ' '))
-                            {
-                                currentlyBetweenBrackets = false;
-                                closingBracketIndexes.Add(i);
-                            }
-
-                            break;
-                    }
-                }
-            }
-
-            string performExtraction(ref string query)
-            {
-                var searchTexts = new List<string>();
-                string originalQuery = query;
-
-                for (int i = 0; i < openingBracketIndexes.Count; i++)
-                {
-                    int startIndex = openingBracketIndexes[i];
-
-                    int endIndex = closingBracketIndexes.Count > 0
-                        ? closingBracketIndexes[Math.Min(i, closingBracketIndexes.Count - 1)]
-                        : query.Length;
-
-                    string searchText = originalQuery[startIndex..endIndex];
-
-                    searchTexts.Add(searchText);
-
-                    query = query
-                            .Replace($" [{searchText}]", "")
-                            .Replace($"[{searchText}] ", "")
-                            .Replace($"[{searchText}]", "")
-                            .Replace($" [{searchText}] ", " ")
-                            .Replace($" [{searchText}", "")
-                            .Replace($"[{searchText}", "");
-                }
-
-                return string.Join(' ', searchTexts);
-            }
-        }
-
         private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key, string value, Operator op)
         {
             switch (key)

From fcb366af4db6736e4786c705de7a3cee59dc0e1d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 16:09:05 +0900
Subject: [PATCH 1148/2296] Add `diff=` support for more advanced usages

---
 .../NonVisual/Filtering/FilterQueryParserTest.cs | 16 ++++++++--------
 osu.Game/Screens/Select/FilterQueryParser.cs     |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 508251f046..74d47b43af 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -399,6 +399,10 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
         [TestCase("[Diff in title]", new int[] { })]
         [TestCase("[Diff in diff]", new int[] { 6 })]
+        [TestCase("diff=Diff", new[] { 0, 1, 3, 4, 6 })]
+        [TestCase("diff=Diff1", new[] { 0 })]
+        [TestCase("diff=\"Diff\"", new[] { 3, 4, 6 })]
+        [TestCase("diff=!\"Diff\"", new int[] {})]
         public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
         {
             var carouselBeatmaps = (((string title, string difficultyName)[])new[]
@@ -424,15 +428,11 @@ namespace osu.Game.Tests.NonVisual.Filtering
             FilterQueryParser.ApplyQueries(criteria, query);
             carouselBeatmaps.ForEach(b => b.Filter(criteria));
 
-            Assert.That(carouselBeatmaps.All(b =>
-            {
-                int index = carouselBeatmaps.IndexOf(b);
+            int[] visibleBeatmaps = carouselBeatmaps
+                                    .Where(b => !b.Filtered.Value)
+                                    .Select(b => carouselBeatmaps.IndexOf(b)).ToArray();
 
-                bool shouldBeVisible = expectedBeatmapIndexes.Contains(index);
-                bool isVisible = !b.Filtered.Value;
-
-                return isVisible == shouldBeVisible;
-            }));
+            Assert.That(visibleBeatmaps, Is.EqualTo(expectedBeatmapIndexes));
         }
 
         private class CustomFilterCriteria : IRulesetFilterCriteria
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 1238173b41..0d8905347b 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -76,6 +76,9 @@ namespace osu.Game.Screens.Select
                 case "title":
                     return TryUpdateCriteriaText(ref criteria.Title, op, value);
 
+                case "diff":
+                    return TryUpdateCriteriaText(ref criteria.DifficultyName, op, value);
+
                 default:
                     return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
             }

From b4cc12ab5aee4682359f874548f937793a075d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 24 Oct 2023 10:00:58 +0200
Subject: [PATCH 1149/2296] Fix formatting

---
 osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 74d47b43af..bfdd5f92a2 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -402,7 +402,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("diff=Diff", new[] { 0, 1, 3, 4, 6 })]
         [TestCase("diff=Diff1", new[] { 0 })]
         [TestCase("diff=\"Diff\"", new[] { 3, 4, 6 })]
-        [TestCase("diff=!\"Diff\"", new int[] {})]
+        [TestCase("diff=!\"Diff\"", new int[] { })]
         public void TestDifficultySearch(string query, int[] expectedBeatmapIndexes)
         {
             var carouselBeatmaps = (((string title, string difficultyName)[])new[]

From abfe2ce0fe28c8efc99ef622a6724fe399bb4ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 24 Oct 2023 10:05:20 +0200
Subject: [PATCH 1150/2296] Fix comment

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

diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 5666f9d1d4..812a16c484 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Select
                 // or match a closed one with a whitespace after it.
                 //
                 // To keep things simple, the closing ']' may be included in the match group,
-                // and is trimmer post-match.
+                // and is trimmed post-match.
                 foreach (Match quotedSegment in Regex.Matches(value, "(^|\\s)\\[(.*)(\\]\\s|$)"))
                 {
                     DifficultyName = new OptionalTextFilter

From c9161a7bfcbf09a9ce577e174c5867475e21476d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 17:32:01 +0900
Subject: [PATCH 1151/2296] Remove incorrect copy paste fail

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index ff781db680..1d40862df7 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -59,9 +59,7 @@ namespace osu.Game.Screens.Select.Carousel
                      criteria.Artist.Matches(BeatmapInfo.Metadata.ArtistUnicode);
             match &= !criteria.Title.HasFilter || criteria.Title.Matches(BeatmapInfo.Metadata.Title) ||
                      criteria.Title.Matches(BeatmapInfo.Metadata.TitleUnicode);
-            match &= !criteria.DifficultyName.HasFilter || criteria.DifficultyName.Matches(BeatmapInfo.DifficultyName) ||
-                     criteria.DifficultyName.Matches(BeatmapInfo.Metadata.TitleUnicode);
-
+            match &= !criteria.DifficultyName.HasFilter || criteria.DifficultyName.Matches(BeatmapInfo.DifficultyName);
             match &= !criteria.UserStarDifficulty.HasFilter || criteria.UserStarDifficulty.IsInRange(BeatmapInfo.StarRating);
 
             if (!match) return false;

From a0c8158033fcb59459bd10e7ceaba11310241ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 24 Oct 2023 10:42:03 +0200
Subject: [PATCH 1152/2296] Remove unnecessary `LifetimeEnd` specification

---
 .../Objects/Drawables/DrawableSpinnerTick.cs          | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 20fe7172ad..b2de4da01b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -5,7 +5,6 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -37,16 +36,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             LifetimeStart = DrawableSpinner.HitObject.StartTime;
         }
 
-        protected override void UpdateHitStateTransforms(ArmedState state)
-        {
-            base.UpdateHitStateTransforms(state);
-
-            // the tick can be theoretically judged at any point in the spinner's duration,
-            // so it must be alive throughout the spinner's entire lifetime (or until hit, whichever applies).
-            // this mostly matters for correct sample playback.
-            LifetimeEnd = (Result?.IsHit == true ? Result.TimeAbsolute : DrawableSpinner.HitObject.GetEndTime()) + (Samples?.Length ?? 0);
-        }
-
         /// <summary>
         /// Apply a judgement result.
         /// </summary>

From 68397f0e816f131dda8f20b6959298403d7a87b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:01:24 +0900
Subject: [PATCH 1153/2296] Remove unused using

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index b2de4da01b..a5785dd1f6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {

From 966decb0089631032a5eb29a1f547faf16e83cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 24 Oct 2023 11:25:37 +0200
Subject: [PATCH 1154/2296] Remove redundant explicit array type specification

---
 osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index bfdd5f92a2..739a72df08 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -398,7 +398,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
         [TestCase("[diff ]with]", new[] { 4 })]
         [TestCase("[diff ]with [[ brackets]]]]", new[] { 4 })]
         [TestCase("[Diff in title]", new int[] { })]
-        [TestCase("[Diff in diff]", new int[] { 6 })]
+        [TestCase("[Diff in diff]", new[] { 6 })]
         [TestCase("diff=Diff", new[] { 0, 1, 3, 4, 6 })]
         [TestCase("diff=Diff1", new[] { 0 })]
         [TestCase("diff=\"Diff\"", new[] { 3, 4, 6 })]

From 93147a5998efda1c9bf94aa4ae85aec35ff641c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:00:48 +0900
Subject: [PATCH 1155/2296] Change slider tail tick to only hold back judgement
 on ticks/repeats

---
 .../Objects/Drawables/DrawableSliderTail.cs                 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index df55f3e73f..73ee8a18a5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System.Diagnostics;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -129,11 +130,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered)
                 return;
 
-            // Ensure the tail can only activate after all previous ticks already have.
+            // Ensure the tail can only activate after all previous ticks/repeats already have.
             //
             // This covers the edge case where the lenience may allow the tail to activate before
             // the last tick, changing ordering of score/combo awarding.
-            if (DrawableSlider.NestedHitObjects.Count > 1 && !DrawableSlider.NestedHitObjects[^2].Judged)
+            var lastTick = DrawableSlider.NestedHitObjects.LastOrDefault(o => o.HitObject is SliderTick || o.HitObject is SliderRepeat);
+            if (lastTick?.Judged == false)
                 return;
 
             // The player needs to have engaged in tracking at any point after the tail leniency cutoff.

From 176cb0dd28b4847bbe59c8ffc1911af0e6f14906 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:33:35 +0900
Subject: [PATCH 1156/2296] Remove unused variable

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 2dea05da2f..be6c322668 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using System.Diagnostics;
-using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
@@ -15,9 +14,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public new SliderHeadCircle HitObject => (SliderHeadCircle)base.HitObject;
 
-        [CanBeNull]
-        public Slider Slider => DrawableSlider?.HitObject;
-
         public DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
 
         public override bool DisplayResult => HitObject?.JudgeAsNormalHitCircle ?? base.DisplayResult;

From 5eefc5323d8adc308352f46f17a81a3554b22d9b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:36:45 +0900
Subject: [PATCH 1157/2296] Standardise `DrawableSliderRepeat` /
 `DrawableSliderTick` judgement implementations

---
 .../Objects/Drawables/DrawableSliderRepeat.cs             | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 0be571c229..07e1b8af8c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -17,7 +17,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public partial class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking
+    public partial class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking, IRequireTracking
     {
         public new SliderRepeat HitObject => (SliderRepeat)base.HitObject;
 
@@ -36,6 +36,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => false;
 
+        public bool Tracking { get; set; }
+
         public DrawableSliderRepeat()
             : base(null)
         {
@@ -85,8 +87,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
-            if (HitObject.StartTime <= Time.Current)
-                ApplyResult(r => r.Type = DrawableSlider.Tracking.Value ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            if (timeOffset >= 0)
+                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
         }
 
         protected override void UpdateInitialTransforms()

From 550340790759db6f29c2a18613922503770239fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:40:12 +0900
Subject: [PATCH 1158/2296] Force miss head when a tick or repeat is
 successfully judged

---
 .../Objects/Drawables/DrawableSliderRepeat.cs             | 8 ++++++++
 .../Objects/Drawables/DrawableSliderTail.cs               | 5 +++++
 .../Objects/Drawables/DrawableSliderTick.cs               | 8 ++++++++
 3 files changed, 21 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 07e1b8af8c..7589afccb8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -87,8 +87,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
+            // shared implementation with DrawableSliderTick.
             if (timeOffset >= 0)
+            {
+                // Attempt to preserve correct ordering of judgements as best we can by forcing
+                // an un-judged head to be missed when the user has clearly skipped it.
+                if (Tracking && !DrawableSlider.HeadCircle.Judged)
+                    DrawableSlider.HeadCircle.MissForcefully();
+
                 ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            }
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 73ee8a18a5..4872119b35 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -138,6 +138,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (lastTick?.Judged == false)
                 return;
 
+            // Attempt to preserve correct ordering of judgements as best we can by forcing
+            // an un-judged head to be missed when the user has clearly skipped it.
+            if (Tracking && !DrawableSlider.HeadCircle.Judged)
+                DrawableSlider.HeadCircle.MissForcefully();
+
             // The player needs to have engaged in tracking at any point after the tail leniency cutoff.
             // An actual tick miss should only occur if reaching the tick itself.
             if (timeOffset >= SliderEventGenerator.TAIL_LENIENCY && Tracking)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index a947580d2f..15e99618f9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -75,8 +75,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
+            // shared implementation with DrawableSliderRepeat.
             if (timeOffset >= 0)
+            {
+                // Attempt to preserve correct ordering of judgements as best we can by forcing
+                // an un-judged head to be missed when the user has clearly skipped it.
+                if (Tracking && !DrawableSlider.HeadCircle.Judged)
+                    DrawableSlider.HeadCircle.MissForcefully();
+
                 ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            }
         }
 
         protected override void UpdateInitialTransforms()

From e79aeea3b04b709a2dcfa362455695318550bbec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Oct 2023 18:50:28 +0900
Subject: [PATCH 1159/2296] Add test coverage

---
 .../TestSceneSliderInput.cs                   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 247aa4f445..f718a5069f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -38,6 +38,42 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
 
+        [TestCase(30, 0)]
+        [TestCase(30, 1)]
+        [TestCase(40, 0)]
+        [TestCase(40, 1)]
+        [TestCase(50, 1)]
+        [TestCase(60, 1)]
+        [TestCase(70, 1)]
+        [TestCase(80, 1)]
+        [TestCase(80, 0)]
+        [TestCase(80, 10)]
+        [TestCase(90, 1)]
+        [Ignore("headless test doesn't run at high enough precision for this to always enter a tracking state in time.")]
+        public void TestVeryShortSliderMissHead(float sliderLength, int repeatCount)
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = new Vector2(50, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start - 10 },
+                new OsuReplayFrame { Position = new Vector2(50, 0), Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start + 2000 },
+            }, new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(0, 0),
+                SliderVelocityMultiplier = 10f,
+                RepeatCount = repeatCount,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(sliderLength, 0),
+                }),
+            }, 240, 1);
+
+            AddAssert("Head judgement is first", () => judgementResults[0].HitObject is SliderHeadCircle);
+            AddAssert("Tail judgement is second last", () => judgementResults[^2].HitObject is SliderTailCircle);
+            AddAssert("Slider judgement is last", () => judgementResults[^1].HitObject is Slider);
+        }
+
         // Making these too short causes breakage from frames not being processed fast enough.
         // To keep things simple, these tests are crafted to always be >16ms length.
         // If sliders shorter than this are ever used in gameplay it will probably break things and we can revisit.
@@ -76,6 +112,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             assertAllMaxJudgements();
 
+            AddAssert("Head judgement is first", () => judgementResults.First().HitObject is SliderHeadCircle);
+
             // Even if the last tick is hit early, the slider should always execute its final judgement at its endtime.
             // If not, hitsounds will not play on time.
             AddAssert("Judgement offset is zero", () => judgementResults.Last().TimeOffset == 0);
@@ -121,6 +159,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             else
                 AddAssert("Tracking dropped", assertMidSliderJudgementFail);
 
+            AddAssert("Head judgement is first", () => judgementResults.First().HitObject is SliderHeadCircle);
+
             // Even if the last tick is hit early, the slider should always execute its final judgement at its endtime.
             // If not, hitsounds will not play on time.
             AddAssert("Judgement offset is zero", () => judgementResults.Last().TimeOffset == 0);

From cd8b068f4c42097daa53e3fb19fd4d35eb6b65a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 13:01:23 +0900
Subject: [PATCH 1160/2296] Add fallback case to `CountryExtensions.GetAcronym`

---
 osu.Game.Tournament/CountryExtensions.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/CountryExtensions.cs b/osu.Game.Tournament/CountryExtensions.cs
index f2a583c8a5..b47c3f18ce 100644
--- a/osu.Game.Tournament/CountryExtensions.cs
+++ b/osu.Game.Tournament/CountryExtensions.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 osu.Game.Users;
 
 namespace osu.Game.Tournament
@@ -763,7 +762,7 @@ namespace osu.Game.Tournament
                     return "MOZ";
 
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(country));
+                    return country.ToString();
             }
         }
     }

From d9ec030cc8a2fca7b121d9d5353ea707064af876 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 13:02:15 +0900
Subject: [PATCH 1161/2296] Remove missing country

---
 osu.Game.Tournament/CountryExtensions.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Tournament/CountryExtensions.cs b/osu.Game.Tournament/CountryExtensions.cs
index b47c3f18ce..c66727bc77 100644
--- a/osu.Game.Tournament/CountryExtensions.cs
+++ b/osu.Game.Tournament/CountryExtensions.cs
@@ -518,9 +518,6 @@ namespace osu.Game.Tournament
                 case CountryCode.KE:
                     return "KEN";
 
-                case CountryCode.SS:
-                    return "SSD";
-
                 case CountryCode.SR:
                     return "SUR";
 

From da07066a744c6808d00fdaa82e0e0b141e34f9fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 13:03:03 +0900
Subject: [PATCH 1162/2296] Add note about `CountryCode` being at parity with
 `osu_countries`

---
 osu.Game/Users/CountryCode.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs
index e56cdf0dfd..edaa1562c7 100644
--- a/osu.Game/Users/CountryCode.cs
+++ b/osu.Game/Users/CountryCode.cs
@@ -8,6 +8,9 @@ using Newtonsoft.Json.Converters;
 
 namespace osu.Game.Users
 {
+    /// <summary>
+    /// Matches `osu_countries` database table.
+    /// </summary>
     [JsonConverter(typeof(StringEnumConverter))]
     [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
     public enum CountryCode

From 121fa6f165f504df061b0dc0350fb9e85da78221 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 13:53:20 +0900
Subject: [PATCH 1163/2296] Simplify pre-checks in `HitObjectApplied` delegate

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
index 19aa5d31f3..45c59e970b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBall.cs
@@ -109,11 +109,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private void onHitObjectApplied(DrawableHitObject? drawableObject = null)
         {
-            if (drawableObject != null && drawableObject is not DrawableSlider)
-                return;
-
-            ballAnimation.ClearFrames();
-
             double frameDelay;
 
             if (drawableObject?.HitObject != null)
@@ -127,6 +122,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             else
                 frameDelay = LegacySkinExtensions.SIXTY_FRAME_TIME;
 
+            ballAnimation.ClearFrames();
             foreach (var texture in ballTextures)
                 ballAnimation.AddFrame(texture, frameDelay);
         }

From 74f794a549f2f8b30a1fa1af8a7f9fc24ea9b92d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 14:01:55 +0900
Subject: [PATCH 1164/2296] Fix repeat circles on sliders not correctly getting
 dimmed

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index b682d14879..cdfe888c99 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             HeadCircle,
             TailCircle,
+            repeatContainer,
             Body,
         };
 

From 2886d2d4c27a536690dcc5095709112cec117e54 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 14:20:43 +0900
Subject: [PATCH 1165/2296] Apply same changes to "argon" osu!taiko barline
 design that were applied to osu!mania

---
 .../Skinning/Argon/ArgonBarLine.cs            | 85 +++++++++----------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonBarLine.cs b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonBarLine.cs
index 32afb8e6ac..6cb55f1111 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Argon/ArgonBarLine.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 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;
@@ -14,53 +15,54 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
 {
     public partial class ArgonBarLine : CompositeDrawable
     {
-        private Container majorEdgeContainer = null!;
-
         private Bindable<bool> major = null!;
 
+        private Box mainLine = null!;
+        private Drawable topAnchor = null!;
+        private Drawable bottomAnchor = null!;
+
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject)
         {
             RelativeSizeAxes = Axes.Both;
 
-            const float line_offset = 8;
-            var majorPieceSize = new Vector2(6, 20);
+            // Avoid flickering due to no anti-aliasing of boxes by default.
+            var edgeSmoothness = new Vector2(0.3f);
 
-            InternalChildren = new Drawable[]
+            AddInternal(mainLine = new Box
             {
-                line = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    EdgeSmoothness = new Vector2(0.5f, 0),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-                majorEdgeContainer = new Container
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new[]
-                    {
-                        new Circle
-                        {
-                            Name = "Top line",
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.BottomCentre,
-                            Size = majorPieceSize,
-                            Y = -line_offset,
-                        },
-                        new Circle
-                        {
-                            Name = "Bottom line",
-                            Anchor = Anchor.BottomCentre,
-                            Origin = Anchor.TopCentre,
-                            Size = majorPieceSize,
-                            Y = line_offset,
-                        },
-                    }
-                }
-            };
+                Name = "Bar line",
+                EdgeSmoothness = edgeSmoothness,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+            });
+
+            const float major_extension = 10;
+
+            AddInternal(topAnchor = new Box
+            {
+                Name = "Top anchor",
+                EdgeSmoothness = edgeSmoothness,
+                Blending = BlendingParameters.Additive,
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.BottomCentre,
+                Height = major_extension,
+                RelativeSizeAxes = Axes.X,
+                Colour = ColourInfo.GradientVertical(Colour4.Transparent, Colour4.White),
+            });
+
+            AddInternal(bottomAnchor = new Box
+            {
+                Name = "Bottom anchor",
+                EdgeSmoothness = edgeSmoothness,
+                Blending = BlendingParameters.Additive,
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.TopCentre,
+                Height = major_extension,
+                RelativeSizeAxes = Axes.X,
+                Colour = ColourInfo.GradientVertical(Colour4.White, Colour4.Transparent),
+            });
 
             major = ((DrawableBarLine)drawableHitObject).Major.GetBoundCopy();
         }
@@ -71,13 +73,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Argon
             major.BindValueChanged(updateMajor, true);
         }
 
-        private Box line = null!;
-
         private void updateMajor(ValueChangedEvent<bool> major)
         {
-            line.Alpha = major.NewValue ? 1f : 0.5f;
-            line.Width = major.NewValue ? 1 : 0.5f;
-            majorEdgeContainer.Alpha = major.NewValue ? 1 : 0;
+            mainLine.Alpha = major.NewValue ? 1f : 0.5f;
+            topAnchor.Alpha = bottomAnchor.Alpha = major.NewValue ? mainLine.Alpha * 0.3f : 0;
         }
     }
 }

From 6934e045df2525eeeab800b4c9b543eed8d38256 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 14:33:06 +0900
Subject: [PATCH 1166/2296] Fix editor not prompting before saving beatmap for
 export

---
 .../Editing/TestSceneEditorTestGameplay.cs    |  4 +--
 osu.Game/Screens/Edit/Editor.cs               | 35 ++++++++++++-------
 ...stDialog.cs => SaveRequiredPopupDialog.cs} | 12 +++----
 3 files changed, 31 insertions(+), 20 deletions(-)
 rename osu.Game/Screens/Edit/{GameplayTest/SaveBeforeGameplayTestDialog.cs => SaveRequiredPopupDialog.cs} (60%)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
index 007716bd6c..bbd7123f20 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Tests.Visual.Editing
                 InputManager.MoveMouseTo(button);
                 InputManager.Click(MouseButton.Left);
             });
-            AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveBeforeGameplayTestDialog);
+            AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveRequiredPopupDialog);
 
             AddStep("dismiss prompt", () =>
             {
@@ -165,7 +165,7 @@ namespace osu.Game.Tests.Visual.Editing
                 InputManager.MoveMouseTo(button);
                 InputManager.Click(MouseButton.Left);
             });
-            AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveBeforeGameplayTestDialog);
+            AddUntilStep("save prompt shown", () => DialogOverlay.CurrentDialog is SaveRequiredPopupDialog);
 
             AddStep("save changes", () => DialogOverlay.CurrentDialog.PerformOkAction());
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 899a782755..91c3c98f01 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -425,7 +425,7 @@ namespace osu.Game.Screens.Edit
         {
             if (HasUnsavedChanges)
             {
-                dialogOverlay.Push(new SaveBeforeGameplayTestDialog(() =>
+                dialogOverlay.Push(new SaveRequiredPopupDialog("The beatmap will be saved in order to test it.", () =>
                 {
                     if (!Save()) return;
 
@@ -1018,25 +1018,36 @@ namespace osu.Game.Screens.Edit
         {
             var exportItems = new List<MenuItem>
             {
-                new EditorMenuItem(EditorStrings.ExportForEditing, MenuItemType.Standard, exportBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
-                new EditorMenuItem(EditorStrings.ExportForCompatibility, MenuItemType.Standard, exportLegacyBeatmap) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+                new EditorMenuItem(EditorStrings.ExportForEditing, MenuItemType.Standard, () => exportBeatmap(false)) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+                new EditorMenuItem(EditorStrings.ExportForCompatibility, MenuItemType.Standard, () => exportBeatmap(true)) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
             };
 
             return new EditorMenuItem(CommonStrings.Export) { Items = exportItems };
         }
 
-        private void exportBeatmap()
+        private void exportBeatmap(bool legacy)
         {
-            if (!Save()) return;
+            if (HasUnsavedChanges)
+            {
+                dialogOverlay.Push(new SaveRequiredPopupDialog("The beatmap will be saved in order to export it.", () =>
+                {
+                    if (!Save()) return;
 
-            beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
-        }
+                    runExport();
+                }));
+            }
+            else
+            {
+                runExport();
+            }
 
-        private void exportLegacyBeatmap()
-        {
-            if (!Save()) return;
-
-            beatmapManager.ExportLegacy(Beatmap.Value.BeatmapSetInfo);
+            void runExport()
+            {
+                if (legacy)
+                    beatmapManager.ExportLegacy(Beatmap.Value.BeatmapSetInfo);
+                else
+                    beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/GameplayTest/SaveBeforeGameplayTestDialog.cs b/osu.Game/Screens/Edit/SaveRequiredPopupDialog.cs
similarity index 60%
rename from osu.Game/Screens/Edit/GameplayTest/SaveBeforeGameplayTestDialog.cs
rename to osu.Game/Screens/Edit/SaveRequiredPopupDialog.cs
index eb1df43ddd..3ca92876f1 100644
--- a/osu.Game/Screens/Edit/GameplayTest/SaveBeforeGameplayTestDialog.cs
+++ b/osu.Game/Screens/Edit/SaveRequiredPopupDialog.cs
@@ -1,17 +1,17 @@
-// 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;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
-namespace osu.Game.Screens.Edit.GameplayTest
+namespace osu.Game.Screens.Edit
 {
-    public partial class SaveBeforeGameplayTestDialog : PopupDialog
+    public partial class SaveRequiredPopupDialog : PopupDialog
     {
-        public SaveBeforeGameplayTestDialog(Action saveAndPreview)
+        public SaveRequiredPopupDialog(string headerText, Action saveAndAction)
         {
-            HeaderText = "The beatmap will be saved in order to test it.";
+            HeaderText = headerText;
 
             Icon = FontAwesome.Regular.Save;
 
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Edit.GameplayTest
                 new PopupDialogOkButton
                 {
                     Text = "Sounds good, let's go!",
-                    Action = saveAndPreview
+                    Action = saveAndAction
                 },
                 new PopupDialogCancelButton
                 {

From 6eafb66fdfedac1cae4e0568f81d75bd47ec41d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 15:44:42 +0900
Subject: [PATCH 1167/2296] Fix `DrawableSliderTail` potentially forcing miss
 on head too early

---
 .../Objects/Drawables/DrawableSliderTail.cs                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 4872119b35..9e8ff6ae52 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -138,6 +138,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (lastTick?.Judged == false)
                 return;
 
+            if (timeOffset < SliderEventGenerator.TAIL_LENIENCY)
+                return;
+
             // Attempt to preserve correct ordering of judgements as best we can by forcing
             // an un-judged head to be missed when the user has clearly skipped it.
             if (Tracking && !DrawableSlider.HeadCircle.Judged)
@@ -145,7 +148,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             // The player needs to have engaged in tracking at any point after the tail leniency cutoff.
             // An actual tick miss should only occur if reaching the tick itself.
-            if (timeOffset >= SliderEventGenerator.TAIL_LENIENCY && Tracking)
+            if (Tracking)
                 ApplyResult(r => r.Type = r.Judgement.MaxResult);
             else if (timeOffset > 0)
                 ApplyResult(r => r.Type = r.Judgement.MinResult);

From 2f95e7a284b0c014c37d41da5a69c01ac0bd4547 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 15:44:51 +0900
Subject: [PATCH 1168/2296] Add note about implementation being shared

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs | 2 ++
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs   | 2 ++
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 7589afccb8..cdfd96514e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -92,6 +92,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 // Attempt to preserve correct ordering of judgements as best we can by forcing
                 // an un-judged head to be missed when the user has clearly skipped it.
+                //
+                // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
                 if (Tracking && !DrawableSlider.HeadCircle.Judged)
                     DrawableSlider.HeadCircle.MissForcefully();
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 9e8ff6ae52..e3ed12a648 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -143,6 +143,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             // Attempt to preserve correct ordering of judgements as best we can by forcing
             // an un-judged head to be missed when the user has clearly skipped it.
+            //
+            // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
             if (Tracking && !DrawableSlider.HeadCircle.Judged)
                 DrawableSlider.HeadCircle.MissForcefully();
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 15e99618f9..172dca356e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -80,6 +80,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 // Attempt to preserve correct ordering of judgements as best we can by forcing
                 // an un-judged head to be missed when the user has clearly skipped it.
+                //
+                // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
                 if (Tracking && !DrawableSlider.HeadCircle.Judged)
                     DrawableSlider.HeadCircle.MissForcefully();
 

From 7dd11fc5bff3c4d4078a746c14941d5ec0ea43c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Oct 2023 17:55:55 +0900
Subject: [PATCH 1169/2296] Fix null check

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index 9582ee491b..421a32b9eb 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 RelativeSizeAxes = Axes.Both,
                 Size = new Vector2(0.8f),
-                Child = new MovingCursorInputManager { Child = createContent?.Invoke() }
+                Child = new MovingCursorInputManager { Child = createContent() }
             });
         });
 

From 9ca672d689ecf08c5f7c8a08d5e46ada684cac36 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 23 Oct 2023 01:58:41 +0300
Subject: [PATCH 1170/2296] Add "Argon" total score counter

---
 .../TestSceneSkinnableScoreCounter.cs         |   1 +
 .../Screens/Play/HUD/ArgonScoreCounter.cs     | 124 ++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
index 7079b93d3e..186680a79c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(ScoreProcessor))]
         private ScoreProcessor scoreProcessor = TestGameplayState.Create(new OsuRuleset()).ScoreProcessor;
 
+        protected override Drawable CreateArgonImplementation() => new ArgonScoreCounter();
         protected override Drawable CreateDefaultImplementation() => new DefaultScoreCounter();
         protected override Drawable CreateLegacyImplementation() => new LegacyScoreCounter();
 
diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
new file mode 100644
index 0000000000..cfda34578b
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
@@ -0,0 +1,124 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Threading.Tasks;
+using osu.Framework.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.Text;
+using osu.Game.Configuration;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonScoreCounter : GameplayScoreCounter, ISerialisableDrawable
+    {
+        [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
+        public BindableFloat WireframeOpactiy { get; } = new BindableFloat(0.4f)
+        {
+            Precision = 0.01f,
+            MinValue = 0,
+            MaxValue = 1,
+        };
+
+        public bool UsesFixedAnchor { get; set; }
+
+        protected override IHasText CreateText() => new ArgonScoreTextComponent
+        {
+            WireframeOpactiy = { BindTarget = WireframeOpactiy },
+        };
+
+        private partial class ArgonScoreTextComponent : CompositeDrawable, IHasText
+        {
+            private readonly ArgonScoreSpriteText wireframesPart;
+            private readonly ArgonScoreSpriteText textPart;
+
+            public IBindable<float> WireframeOpactiy { get; } = new BindableFloat();
+
+            public LocalisableString Text
+            {
+                get => textPart.Text;
+                set
+                {
+                    wireframesPart.Text = value;
+                    textPart.Text = value;
+                }
+            }
+
+            public ArgonScoreTextComponent()
+            {
+                AutoSizeAxes = Axes.Both;
+
+                InternalChildren = new[]
+                {
+                    wireframesPart = new ArgonScoreSpriteText(@"wireframes"),
+                    textPart = new ArgonScoreSpriteText(),
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                WireframeOpactiy.BindValueChanged(v => wireframesPart.Alpha = v.NewValue, true);
+            }
+
+            private partial class ArgonScoreSpriteText : OsuSpriteText
+            {
+                private readonly string? glyphLookupOverride;
+
+                private GlyphStore glyphStore = null!;
+
+                protected override char FixedWidthReferenceCharacter => '5';
+
+                public ArgonScoreSpriteText(string? glyphLookupOverride = null)
+                {
+                    this.glyphLookupOverride = glyphLookupOverride;
+
+                    Shadow = false;
+                    UseFullGlyphHeight = false;
+                }
+
+                [BackgroundDependencyLoader]
+                private void load(ISkinSource skin)
+                {
+                    Font = new FontUsage(@"argon-score", 1, fixedWidth: true);
+                    Spacing = new Vector2(-2, 0);
+
+                    glyphStore = new GlyphStore(skin, glyphLookupOverride);
+                }
+
+                protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);
+
+                private class GlyphStore : ITexturedGlyphLookupStore
+                {
+                    private readonly ISkin skin;
+                    private readonly string? glyphLookupOverride;
+
+                    public GlyphStore(ISkin skin, string? glyphLookupOverride)
+                    {
+                        this.skin = skin;
+                        this.glyphLookupOverride = glyphLookupOverride;
+                    }
+
+                    public ITexturedCharacterGlyph? Get(string fontName, char character)
+                    {
+                        string lookup = glyphLookupOverride ?? character.ToString();
+                        var texture = skin.GetTexture($"{fontName}-{lookup}");
+
+                        if (texture == null)
+                            return null;
+
+                        return new TexturedCharacterGlyph(new CharacterGlyph(character, 0, 0, texture.Width, texture.Height, null), texture, 0.25f);
+                    }
+
+                    public Task<ITexturedCharacterGlyph?> GetAsync(string fontName, char character) => Task.Run(() => Get(fontName, character));
+                }
+            }
+        }
+    }
+}

From 1f36acca1a6c31f4ca73c487ac63795fd35ddacf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 08:58:47 +0300
Subject: [PATCH 1171/2296] Add "Argon" accuracy counter

---
 .../TestSceneSkinnableAccuracyCounter.cs       |  1 +
 .../Screens/Play/HUD/ArgonAccuracyCounter.cs   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index 59a1f938e6..e088d2ca87 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
 
+        protected override Drawable CreateArgonImplementation() => new ArgonAccuracyCounter();
         protected override Drawable CreateDefaultImplementation() => new DefaultAccuracyCounter();
         protected override Drawable CreateLegacyImplementation() => new LegacyAccuracyCounter();
 
diff --git a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
new file mode 100644
index 0000000000..33223a526b
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
@@ -0,0 +1,18 @@
+// 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.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonAccuracyCounter : GameplayAccuracyCounter, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        protected override OsuSpriteText CreateSpriteText()
+            => base.CreateSpriteText().With(s => s.Font = OsuFont.Default.With(size: 19.2f));
+    }
+}

From 0aa0562dc0a5b645332c309bac55e7a444eb5c56 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 08:59:04 +0300
Subject: [PATCH 1172/2296] Add "Argon" combo counter

---
 .../TestSceneSkinnableComboCounter.cs         |  1 +
 .../Screens/Play/HUD/ArgonComboCounter.cs     | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonComboCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
index 0c351a93bb..72f40d9c6f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
 
+        protected override Drawable CreateArgonImplementation() => new ArgonComboCounter();
         protected override Drawable CreateDefaultImplementation() => new DefaultComboCounter();
         protected override Drawable CreateLegacyImplementation() => new LegacyComboCounter();
 
diff --git a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
new file mode 100644
index 0000000000..28c97c53aa
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonComboCounter.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.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonComboCounter : ComboCounter
+    {
+        [BackgroundDependencyLoader]
+        private void load(ScoreProcessor scoreProcessor)
+        {
+            Current.BindTo(scoreProcessor.Combo);
+        }
+
+        protected override OsuSpriteText CreateSpriteText()
+            => base.CreateSpriteText().With(s => s.Font = FontUsage.Default.With(size: 36f));
+
+        protected override LocalisableString FormatCount(int count)
+        {
+            return $@"{count}x";
+        }
+    }
+}

From daf4a03fd092ac84955a8f63fa3c45200a28cf04 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 08:59:47 +0300
Subject: [PATCH 1173/2296] Abstractify PP counter logic from the "Triangles"
 implementation

---
 .../HUD/GameplayPerformancePointsCounter.cs   | 186 ++++++++++++++++++
 .../Play/HUD/PerformancePointsCounter.cs      | 177 +----------------
 2 files changed, 190 insertions(+), 173 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/GameplayPerformancePointsCounter.cs

diff --git a/osu.Game/Screens/Play/HUD/GameplayPerformancePointsCounter.cs b/osu.Game/Screens/Play/HUD/GameplayPerformancePointsCounter.cs
new file mode 100644
index 0000000000..a812a3e043
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/GameplayPerformancePointsCounter.cs
@@ -0,0 +1,186 @@
+// 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;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public abstract partial class GameplayPerformancePointsCounter : RollingCounter<int>
+    {
+        protected override bool IsRollingProportional => true;
+
+        protected override double RollingDuration => 1000;
+
+        private const float alpha_when_invalid = 0.3f;
+
+        [Resolved]
+        private ScoreProcessor scoreProcessor { get; set; }
+
+        [Resolved]
+        private GameplayState gameplayState { get; set; }
+
+        [CanBeNull]
+        private List<TimedDifficultyAttributes> timedAttributes;
+
+        private readonly CancellationTokenSource loadCancellationSource = new CancellationTokenSource();
+
+        private JudgementResult lastJudgement;
+        private PerformanceCalculator performanceCalculator;
+        private ScoreInfo scoreInfo;
+
+        protected GameplayPerformancePointsCounter()
+        {
+            Current.Value = DisplayedCount = 0;
+        }
+
+        private Mod[] clonedMods;
+
+        [BackgroundDependencyLoader]
+        private void load(BeatmapDifficultyCache difficultyCache)
+        {
+            DrawableCount.Alpha = alpha_when_invalid;
+
+            if (gameplayState != null)
+            {
+                performanceCalculator = gameplayState.Ruleset.CreatePerformanceCalculator();
+                clonedMods = gameplayState.Mods.Select(m => m.DeepClone()).ToArray();
+
+                scoreInfo = new ScoreInfo(gameplayState.Score.ScoreInfo.BeatmapInfo, gameplayState.Score.ScoreInfo.Ruleset) { Mods = clonedMods };
+
+                var gameplayWorkingBeatmap = new GameplayWorkingBeatmap(gameplayState.Beatmap);
+                difficultyCache.GetTimedDifficultyAttributesAsync(gameplayWorkingBeatmap, gameplayState.Ruleset, clonedMods, loadCancellationSource.Token)
+                               .ContinueWith(task => Schedule(() =>
+                               {
+                                   timedAttributes = task.GetResultSafely();
+
+                                   IsValid = true;
+
+                                   if (lastJudgement != null)
+                                       onJudgementChanged(lastJudgement);
+                               }), TaskContinuationOptions.OnlyOnRanToCompletion);
+            }
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (scoreProcessor != null)
+            {
+                scoreProcessor.NewJudgement += onJudgementChanged;
+                scoreProcessor.JudgementReverted += onJudgementChanged;
+            }
+
+            if (gameplayState?.LastJudgementResult.Value != null)
+                onJudgementChanged(gameplayState.LastJudgementResult.Value);
+        }
+
+        private bool isValid;
+
+        protected bool IsValid
+        {
+            set
+            {
+                if (value == isValid)
+                    return;
+
+                isValid = value;
+                DrawableCount.FadeTo(isValid ? 1 : alpha_when_invalid, 1000, Easing.OutQuint);
+            }
+        }
+
+        private void onJudgementChanged(JudgementResult judgement)
+        {
+            lastJudgement = judgement;
+
+            var attrib = getAttributeAtTime(judgement);
+
+            if (gameplayState == null || attrib == null || scoreProcessor == null)
+            {
+                IsValid = false;
+                return;
+            }
+
+            scoreProcessor.PopulateScore(scoreInfo);
+            Current.Value = (int)Math.Round(performanceCalculator?.Calculate(scoreInfo, attrib).Total ?? 0, MidpointRounding.AwayFromZero);
+            IsValid = true;
+        }
+
+        [CanBeNull]
+        private DifficultyAttributes getAttributeAtTime(JudgementResult judgement)
+        {
+            if (timedAttributes == null || timedAttributes.Count == 0)
+                return null;
+
+            int attribIndex = timedAttributes.BinarySearch(new TimedDifficultyAttributes(judgement.HitObject.GetEndTime(), null));
+            if (attribIndex < 0)
+                attribIndex = ~attribIndex - 1;
+
+            return timedAttributes[Math.Clamp(attribIndex, 0, timedAttributes.Count - 1)].Attributes;
+        }
+
+        protected override LocalisableString FormatCount(int count) => count.ToString(@"D");
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (scoreProcessor != null)
+            {
+                scoreProcessor.NewJudgement -= onJudgementChanged;
+                scoreProcessor.JudgementReverted -= onJudgementChanged;
+            }
+
+            loadCancellationSource?.Cancel();
+        }
+
+        // TODO: This class shouldn't exist, but requires breaking changes to allow DifficultyCalculator to receive an IBeatmap.
+        private class GameplayWorkingBeatmap : WorkingBeatmap
+        {
+            private readonly IBeatmap gameplayBeatmap;
+
+            public GameplayWorkingBeatmap(IBeatmap gameplayBeatmap)
+                : base(gameplayBeatmap.BeatmapInfo, null)
+            {
+                this.gameplayBeatmap = gameplayBeatmap;
+            }
+
+            public override IBeatmap GetPlayableBeatmap(IRulesetInfo ruleset, IReadOnlyList<Mod> mods, CancellationToken cancellationToken)
+                => gameplayBeatmap;
+
+            protected override IBeatmap GetBeatmap() => gameplayBeatmap;
+
+            public override Texture GetBackground() => throw new NotImplementedException();
+
+            protected override Track GetBeatmapTrack() => throw new NotImplementedException();
+
+            protected internal override ISkin GetSkin() => throw new NotImplementedException();
+
+            public override Stream GetStream(string storagePath) => throw new NotImplementedException();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs b/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
index 82f116b4ae..76feae88af 100644
--- a/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
+++ b/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
@@ -1,175 +1,31 @@
 // 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;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Resources.Localisation.Web;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public partial class PerformancePointsCounter : RollingCounter<int>, ISerialisableDrawable
+    // todo: this should be renamed to DefaultPerformancePointsCounter, or probably even TrianglesPerformancePointsCounter once all other triangles components are renamed accordingly.
+    public partial class PerformancePointsCounter : GameplayPerformancePointsCounter, ISerialisableDrawable
     {
         public bool UsesFixedAnchor { get; set; }
 
-        protected override bool IsRollingProportional => true;
-
-        protected override double RollingDuration => 1000;
-
-        private const float alpha_when_invalid = 0.3f;
-
-        [Resolved]
-        private ScoreProcessor scoreProcessor { get; set; }
-
-        [Resolved]
-        private GameplayState gameplayState { get; set; }
-
-        [CanBeNull]
-        private List<TimedDifficultyAttributes> timedAttributes;
-
-        private readonly CancellationTokenSource loadCancellationSource = new CancellationTokenSource();
-
-        private JudgementResult lastJudgement;
-        private PerformanceCalculator performanceCalculator;
-        private ScoreInfo scoreInfo;
-
-        public PerformancePointsCounter()
-        {
-            Current.Value = DisplayedCount = 0;
-        }
-
-        private Mod[] clonedMods;
-
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
+        private void load(OsuColour colours)
         {
             Colour = colours.BlueLighter;
-
-            if (gameplayState != null)
-            {
-                performanceCalculator = gameplayState.Ruleset.CreatePerformanceCalculator();
-                clonedMods = gameplayState.Mods.Select(m => m.DeepClone()).ToArray();
-
-                scoreInfo = new ScoreInfo(gameplayState.Score.ScoreInfo.BeatmapInfo, gameplayState.Score.ScoreInfo.Ruleset) { Mods = clonedMods };
-
-                var gameplayWorkingBeatmap = new GameplayWorkingBeatmap(gameplayState.Beatmap);
-                difficultyCache.GetTimedDifficultyAttributesAsync(gameplayWorkingBeatmap, gameplayState.Ruleset, clonedMods, loadCancellationSource.Token)
-                               .ContinueWith(task => Schedule(() =>
-                               {
-                                   timedAttributes = task.GetResultSafely();
-
-                                   IsValid = true;
-
-                                   if (lastJudgement != null)
-                                       onJudgementChanged(lastJudgement);
-                               }), TaskContinuationOptions.OnlyOnRanToCompletion);
-            }
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            if (scoreProcessor != null)
-            {
-                scoreProcessor.NewJudgement += onJudgementChanged;
-                scoreProcessor.JudgementReverted += onJudgementChanged;
-            }
-
-            if (gameplayState?.LastJudgementResult.Value != null)
-                onJudgementChanged(gameplayState.LastJudgementResult.Value);
-        }
-
-        private bool isValid;
-
-        protected bool IsValid
-        {
-            set
-            {
-                if (value == isValid)
-                    return;
-
-                isValid = value;
-                DrawableCount.FadeTo(isValid ? 1 : alpha_when_invalid, 1000, Easing.OutQuint);
-            }
-        }
-
-        private void onJudgementChanged(JudgementResult judgement)
-        {
-            lastJudgement = judgement;
-
-            var attrib = getAttributeAtTime(judgement);
-
-            if (gameplayState == null || attrib == null || scoreProcessor == null)
-            {
-                IsValid = false;
-                return;
-            }
-
-            scoreProcessor.PopulateScore(scoreInfo);
-            Current.Value = (int)Math.Round(performanceCalculator?.Calculate(scoreInfo, attrib).Total ?? 0, MidpointRounding.AwayFromZero);
-            IsValid = true;
-        }
-
-        [CanBeNull]
-        private DifficultyAttributes getAttributeAtTime(JudgementResult judgement)
-        {
-            if (timedAttributes == null || timedAttributes.Count == 0)
-                return null;
-
-            int attribIndex = timedAttributes.BinarySearch(new TimedDifficultyAttributes(judgement.HitObject.GetEndTime(), null));
-            if (attribIndex < 0)
-                attribIndex = ~attribIndex - 1;
-
-            return timedAttributes[Math.Clamp(attribIndex, 0, timedAttributes.Count - 1)].Attributes;
-        }
-
-        protected override LocalisableString FormatCount(int count) => count.ToString(@"D");
-
-        protected override IHasText CreateText() => new TextComponent
-        {
-            Alpha = alpha_when_invalid
-        };
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (scoreProcessor != null)
-            {
-                scoreProcessor.NewJudgement -= onJudgementChanged;
-                scoreProcessor.JudgementReverted -= onJudgementChanged;
-            }
-
-            loadCancellationSource?.Cancel();
-        }
+        protected override IHasText CreateText() => new TextComponent();
 
         private partial class TextComponent : CompositeDrawable, IHasText
         {
@@ -209,30 +65,5 @@ namespace osu.Game.Screens.Play.HUD
                 };
             }
         }
-
-        // TODO: This class shouldn't exist, but requires breaking changes to allow DifficultyCalculator to receive an IBeatmap.
-        private class GameplayWorkingBeatmap : WorkingBeatmap
-        {
-            private readonly IBeatmap gameplayBeatmap;
-
-            public GameplayWorkingBeatmap(IBeatmap gameplayBeatmap)
-                : base(gameplayBeatmap.BeatmapInfo, null)
-            {
-                this.gameplayBeatmap = gameplayBeatmap;
-            }
-
-            public override IBeatmap GetPlayableBeatmap(IRulesetInfo ruleset, IReadOnlyList<Mod> mods, CancellationToken cancellationToken)
-                => gameplayBeatmap;
-
-            protected override IBeatmap GetBeatmap() => gameplayBeatmap;
-
-            public override Texture GetBackground() => throw new NotImplementedException();
-
-            protected override Track GetBeatmapTrack() => throw new NotImplementedException();
-
-            protected internal override ISkin GetSkin() => throw new NotImplementedException();
-
-            public override Stream GetStream(string storagePath) => throw new NotImplementedException();
-        }
     }
 }

From 56eeb117ce2011ad4b80cf32c3b015eb482d7c9b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 09:00:16 +0300
Subject: [PATCH 1174/2296] Add "Argon" performance points counter

---
 .../TestScenePerformancePointsCounter.cs      |  5 +-
 .../Play/ArgonPerformancePointsCounter.cs     | 62 +++++++++++++++++++
 2 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Screens/Play/ArgonPerformancePointsCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePerformancePointsCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePerformancePointsCounter.cs
index 9622caabf5..9b8346cf12 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePerformancePointsCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePerformancePointsCounter.cs
@@ -16,7 +16,6 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -30,7 +29,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private int iteration;
         private Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
-        private PerformancePointsCounter counter;
+        private ArgonPerformancePointsCounter counter;
 
         [SetUpSteps]
         public void SetUpSteps() => AddStep("create components", () =>
@@ -66,7 +65,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void createCounter() => AddStep("Create counter", () =>
         {
-            dependencyContainer.Child = counter = new PerformancePointsCounter
+            dependencyContainer.Child = counter = new ArgonPerformancePointsCounter
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Play/ArgonPerformancePointsCounter.cs b/osu.Game/Screens/Play/ArgonPerformancePointsCounter.cs
new file mode 100644
index 0000000000..f0e0e1f0a4
--- /dev/null
+++ b/osu.Game/Screens/Play/ArgonPerformancePointsCounter.cs
@@ -0,0 +1,62 @@
+// 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.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.Resources.Localisation.Web;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play
+{
+    public partial class ArgonPerformancePointsCounter : GameplayPerformancePointsCounter, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+        }
+
+        protected override IHasText CreateText() => new TextComponent();
+
+        private partial class TextComponent : CompositeDrawable, IHasText
+        {
+            private readonly OsuSpriteText text;
+
+            public LocalisableString Text
+            {
+                get => text.Text;
+                set => text.Text = value;
+            }
+
+            public TextComponent()
+            {
+                AutoSizeAxes = Axes.Both;
+
+                InternalChild = new FillFlowContainer
+                {
+                    Direction = FillDirection.Vertical,
+                    Children = new[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = BeatmapsetsStrings.ShowScoreboardHeaderspp.ToUpper(),
+                            Font = OsuFont.Torus.With(size: 12, weight: FontWeight.Bold),
+                        },
+                        text = new OsuSpriteText
+                        {
+                            Font = OsuFont.Torus.With(size: 16.8f, weight: FontWeight.Regular),
+                        }
+                    }
+                };
+            }
+        }
+    }
+}

From 50af1574cfea82a89933fc7fb969d4a94726a766 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 09:10:56 +0300
Subject: [PATCH 1175/2296] Add "Argon" background wedges

---
 osu.Game/Screens/Play/HUD/ArgonComboWedge.cs | 27 +++++++
 osu.Game/Screens/Play/HUD/ArgonRightWedge.cs | 29 +++++++
 osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs | 83 ++++++++++++++++++++
 osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs | 69 ++++++++++++++++
 4 files changed, 208 insertions(+)
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonComboWedge.cs
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonRightWedge.cs
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs

diff --git a/osu.Game/Screens/Play/HUD/ArgonComboWedge.cs b/osu.Game/Screens/Play/HUD/ArgonComboWedge.cs
new file mode 100644
index 0000000000..6da3727505
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonComboWedge.cs
@@ -0,0 +1,27 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonComboWedge : CompositeDrawable, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = new ArgonWedgePiece
+            {
+                WedgeWidth = { Value = 186 },
+                WedgeHeight = { Value = 33 },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/ArgonRightWedge.cs b/osu.Game/Screens/Play/HUD/ArgonRightWedge.cs
new file mode 100644
index 0000000000..6d01fecf13
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonRightWedge.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.Containers;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonRightWedge : CompositeDrawable, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = new ArgonWedgePiece
+            {
+                WedgeWidth = { Value = 274 },
+                WedgeHeight = { Value = 40 },
+                InvertShear = { Value = true },
+                EndOpacity = 0.5f,
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs b/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs
new file mode 100644
index 0000000000..dc0130fb8e
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs
@@ -0,0 +1,83 @@
+// 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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Lines;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonScoreWedge : CompositeDrawable, ISerialisableDrawable
+    {
+        private SliderPath barPath = null!;
+
+        private const float main_path_radius = 1f;
+
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            const float bar_length = 430 - main_path_radius * 2;
+            const float bar_top = 0;
+            const float bar_bottom = 80;
+            const float curve_start = bar_length - 105;
+            const float curve_end = bar_length - 35;
+
+            const float curve_smoothness = 10;
+
+            Vector2 diagonalDir = (new Vector2(curve_end, bar_top) - new Vector2(curve_start, bar_bottom)).Normalized();
+
+            barPath = new SliderPath(new[]
+            {
+                new PathControlPoint(new Vector2(0, bar_bottom), PathType.Linear),
+                new PathControlPoint(new Vector2(curve_start - curve_smoothness, bar_bottom), PathType.Bezier),
+                new PathControlPoint(new Vector2(curve_start, bar_bottom)),
+                new PathControlPoint(new Vector2(curve_start, bar_bottom) + diagonalDir * curve_smoothness, PathType.Linear),
+                new PathControlPoint(new Vector2(curve_end, bar_top) - diagonalDir * curve_smoothness, PathType.Bezier),
+                new PathControlPoint(new Vector2(curve_end, bar_top)),
+                new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_top), PathType.Linear),
+                new PathControlPoint(new Vector2(bar_length, bar_top)),
+            });
+
+            var vertices = new List<Vector2>();
+            barPath.GetPathToProgress(vertices, 0, 1);
+
+            InternalChildren = new Drawable[]
+            {
+                new ArgonWedgePiece
+                {
+                    WedgeWidth = { Value = 380 },
+                    WedgeHeight = { Value = 72 },
+                },
+                new ArgonWedgePiece
+                {
+                    WedgeWidth = { Value = 380 },
+                    WedgeHeight = { Value = 72 },
+                    Position = new Vector2(4, 5)
+                },
+                new SmoothPath
+                {
+                    Colour = Color4.White,
+                    PathRadius = 1f,
+                    Vertices = vertices,
+                },
+                new Circle
+                {
+                    Y = bar_bottom - 1.5f + main_path_radius,
+                    Size = new Vector2(300f, 3f),
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs b/osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs
new file mode 100644
index 0000000000..085e4c738f
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonWedgePiece.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.
+
+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.Configuration;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonWedgePiece : CompositeDrawable, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        public float EndOpacity { get; init; } = 0.25f;
+
+        [SettingSource("Wedge width")]
+        public BindableFloat WedgeWidth { get; } = new BindableFloat(400f)
+        {
+            MinValue = 0f,
+            MaxValue = 500f,
+            Precision = 1f,
+        };
+
+        [SettingSource("Wedge height")]
+        public BindableFloat WedgeHeight { get; } = new BindableFloat(100f)
+        {
+            MinValue = 0f,
+            MaxValue = 500f,
+            Precision = 1f,
+        };
+
+        [SettingSource("Inverted shear")]
+        public BindableBool InvertShear { get; } = new BindableBool();
+
+        public ArgonWedgePiece()
+        {
+            CornerRadius = 10f;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Masking = true;
+            Shear = new Vector2(0.8f, 0f);
+
+            InternalChild = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#66CCFF").Opacity(0.0f), Color4Extensions.FromHex("#66CCFF").Opacity(EndOpacity)),
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            WedgeWidth.BindValueChanged(v => Width = v.NewValue, true);
+            WedgeHeight.BindValueChanged(v => Height = v.NewValue, true);
+            InvertShear.BindValueChanged(v => Shear = new Vector2(0.8f, 0f) * (v.NewValue ? -1 : 1), true);
+        }
+    }
+}

From df80b4dcab1fdda9f120376bfcbbdb26f96ccb1b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 09:11:27 +0300
Subject: [PATCH 1176/2296] Update "Argon" health display specifications to
 match design

Also adds a little white bar next to the display to match with the
components below it (score/accuracy/combo counters).
---
 .../TestSceneSkinnableHealthDisplay.cs        |  2 +-
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 68 +++++++++++--------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 8d3eee2445..e9092bba1b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
-        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay { Scale = new Vector2(0.6f) };
+        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay { Scale = new Vector2(0.6f), BarLength = { Value = 1f } };
         protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay { Scale = new Vector2(0.6f) };
         protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay { Scale = new Vector2(0.6f) };
 
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 793d43f7ef..cc69acf8d6 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
@@ -28,7 +29,7 @@ namespace osu.Game.Screens.Play.HUD
         public bool UsesFixedAnchor { get; set; }
 
         [SettingSource("Bar height")]
-        public BindableFloat BarHeight { get; } = new BindableFloat(20)
+        public BindableFloat BarHeight { get; } = new BindableFloat(30)
         {
             MinValue = 0,
             MaxValue = 64,
@@ -36,7 +37,7 @@ namespace osu.Game.Screens.Play.HUD
         };
 
         [SettingSource("Bar length")]
-        public BindableFloat BarLength { get; } = new BindableFloat(0.98f)
+        public BindableFloat BarLength { get; } = new BindableFloat(0.35f)
         {
             MinValue = 0.2f,
             MaxValue = 1,
@@ -100,36 +101,45 @@ namespace osu.Game.Screens.Play.HUD
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = new Container
+            InternalChildren = new[]
             {
-                AutoSizeAxes = Axes.Both,
-                Children = new Drawable[]
+                new Circle
                 {
-                    background = new BackgroundPath
+                    Position = new Vector2(-4f, main_path_radius - 1.5f),
+                    Size = new Vector2(50f, 3f),
+                },
+                new Container
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Margin = new MarginPadding { Left = 50f },
+                    Children = new Drawable[]
                     {
-                        PathRadius = main_path_radius,
-                    },
-                    glowBar = new BarPath
-                    {
-                        BarColour = Color4.White,
-                        GlowColour = main_bar_glow_colour,
-                        Blending = BlendingParameters.Additive,
-                        Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
-                        PathRadius = 40f,
-                        // Kinda hacky, but results in correct positioning with increased path radius.
-                        Margin = new MarginPadding(-30f),
-                        GlowPortion = 0.9f,
-                    },
-                    mainBar = new BarPath
-                    {
-                        AutoSizeAxes = Axes.None,
-                        RelativeSizeAxes = Axes.Both,
-                        Blending = BlendingParameters.Additive,
-                        BarColour = main_bar_colour,
-                        GlowColour = main_bar_glow_colour,
-                        PathRadius = main_path_radius,
-                        GlowPortion = 0.6f,
-                    },
+                        background = new BackgroundPath
+                        {
+                            PathRadius = main_path_radius,
+                        },
+                        glowBar = new BarPath
+                        {
+                            BarColour = Color4.White,
+                            GlowColour = main_bar_glow_colour,
+                            Blending = BlendingParameters.Additive,
+                            Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
+                            PathRadius = 40f,
+                            // Kinda hacky, but results in correct positioning with increased path radius.
+                            Margin = new MarginPadding(-30f),
+                            GlowPortion = 0.9f,
+                        },
+                        mainBar = new BarPath
+                        {
+                            AutoSizeAxes = Axes.None,
+                            RelativeSizeAxes = Axes.Both,
+                            Blending = BlendingParameters.Additive,
+                            BarColour = main_bar_colour,
+                            GlowColour = main_bar_glow_colour,
+                            PathRadius = main_path_radius,
+                            GlowPortion = 0.6f,
+                        },
+                    }
                 }
             };
         }

From e119e045e47a5023531b5d41dfd4ed80fcc5e427 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 09:12:24 +0300
Subject: [PATCH 1177/2296] Update "Argon" skin components layout and use the
 new components

---
 osu.Game/Skinning/ArgonSkin.cs | 91 +++++++++++++++++++++-------------
 1 file changed, 56 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 26f2edf1aa..ee4a74ab6a 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -115,49 +115,67 @@ namespace osu.Game.Skinning
                             var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container =>
                             {
                                 var health = container.OfType<ArgonHealthDisplay>().FirstOrDefault();
-                                var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();
-                                var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();
-                                var combo = container.OfType<DefaultComboCounter>().FirstOrDefault();
-                                var ppCounter = container.OfType<PerformancePointsCounter>().FirstOrDefault();
+                                var scoreWedge = container.OfType<ArgonScoreWedge>().FirstOrDefault();
+                                var score = container.OfType<ArgonScoreCounter>().FirstOrDefault();
+                                var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
+                                var comboWedge = container.OfType<ArgonComboWedge>().FirstOrDefault();
+                                var combo = container.OfType<ArgonComboCounter>().FirstOrDefault();
+                                var rightWedge = container.OfType<ArgonRightWedge>().FirstOrDefault();
+                                var ppCounter = container.OfType<ArgonPerformancePointsCounter>().FirstOrDefault();
                                 var songProgress = container.OfType<ArgonSongProgress>().FirstOrDefault();
                                 var keyCounter = container.OfType<ArgonKeyCounterDisplay>().FirstOrDefault();
 
-                                if (score != null)
+                                if (health != null)
                                 {
-                                    score.Anchor = Anchor.TopCentre;
-                                    score.Origin = Anchor.TopCentre;
-
                                     // elements default to beneath the health bar
-                                    const float vertical_offset = 30;
+                                    const float components_x_offset = 50;
 
-                                    const float horizontal_padding = 20;
+                                    health.Anchor = Anchor.TopLeft;
+                                    health.Origin = Anchor.TopLeft;
+                                    health.Y = 15;
 
-                                    score.Position = new Vector2(0, vertical_offset);
-
-                                    if (health != null)
+                                    if (scoreWedge != null)
                                     {
-                                        health.Origin = Anchor.TopCentre;
-                                        health.Anchor = Anchor.TopCentre;
-                                        health.Y = 5;
+                                        scoreWedge.Position = new Vector2(-50, 50);
+
+                                        if (score != null)
+                                        {
+                                            score.Scale = new Vector2(0.5f);
+                                            score.Position = new Vector2(components_x_offset, scoreWedge.Y + 15);
+                                        }
+
+                                        if (accuracy != null)
+                                        {
+                                            // +4 to vertically align the accuracy counter with the score counter.
+                                            accuracy.Position = new Vector2(components_x_offset + 4, scoreWedge.Y + 45);
+                                            accuracy.Anchor = Anchor.TopLeft;
+                                            accuracy.Origin = Anchor.TopLeft;
+                                        }
                                     }
 
-                                    if (ppCounter != null)
+                                    if (comboWedge != 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;
+                                        comboWedge.Position = new Vector2(-12, 130);
 
                                         if (combo != null)
                                         {
-                                            combo.Position = new Vector2(accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 + horizontal_padding, vertical_offset + 5);
-                                            combo.Anchor = Anchor.TopCentre;
+                                            combo.Anchor = Anchor.TopLeft;
+                                            combo.Origin = Anchor.TopLeft;
+                                            combo.Position = new Vector2(components_x_offset, comboWedge.Y - 2);
+                                        }
+                                    }
+
+                                    if (rightWedge != null)
+                                    {
+                                        rightWedge.Anchor = Anchor.TopRight;
+                                        rightWedge.Origin = Anchor.TopRight;
+                                        rightWedge.Position = new Vector2(180, 20);
+
+                                        if (ppCounter != null)
+                                        {
+                                            ppCounter.Anchor = Anchor.TopRight;
+                                            ppCounter.Origin = Anchor.TopRight;
+                                            ppCounter.Position = new Vector2(rightWedge.X - 240, rightWedge.Y + 8);
                                         }
                                     }
 
@@ -201,15 +219,18 @@ namespace osu.Game.Skinning
                             {
                                 Children = new Drawable[]
                                 {
-                                    new DefaultComboCounter(),
-                                    new DefaultScoreCounter(),
-                                    new DefaultAccuracyCounter(),
                                     new ArgonHealthDisplay(),
+                                    new ArgonScoreWedge(),
+                                    new ArgonScoreCounter(),
+                                    new ArgonAccuracyCounter(),
+                                    new ArgonComboWedge(),
+                                    new ArgonComboCounter(),
+                                    new ArgonRightWedge(),
+                                    new ArgonPerformancePointsCounter(),
+                                    new BarHitErrorMeter(),
+                                    new BarHitErrorMeter(),
                                     new ArgonSongProgress(),
                                     new ArgonKeyCounterDisplay(),
-                                    new BarHitErrorMeter(),
-                                    new BarHitErrorMeter(),
-                                    new PerformancePointsCounter()
                                 }
                             };
 

From 07e7d533bfa211536e199ac92c308cfc6f5bfd45 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 10:01:27 +0300
Subject: [PATCH 1178/2296] Bake external scale factors into glyph scale

---
 osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs | 2 +-
 osu.Game/Skinning/ArgonSkin.cs                 | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
index cfda34578b..03635f2914 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Screens.Play.HUD
                         if (texture == null)
                             return null;
 
-                        return new TexturedCharacterGlyph(new CharacterGlyph(character, 0, 0, texture.Width, texture.Height, null), texture, 0.25f);
+                        return new TexturedCharacterGlyph(new CharacterGlyph(character, 0, 0, texture.Width, texture.Height, null), texture, 0.125f);
                     }
 
                     public Task<ITexturedCharacterGlyph?> GetAsync(string fontName, char character) => Task.Run(() => Get(fontName, character));
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index ee4a74ab6a..07d9afffac 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -139,10 +139,7 @@ namespace osu.Game.Skinning
                                         scoreWedge.Position = new Vector2(-50, 50);
 
                                         if (score != null)
-                                        {
-                                            score.Scale = new Vector2(0.5f);
                                             score.Position = new Vector2(components_x_offset, scoreWedge.Y + 15);
-                                        }
 
                                         if (accuracy != null)
                                         {

From 2ba02416c22b9bcd0283b79e28dcb65a41f414e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 09:14:59 +0200
Subject: [PATCH 1179/2296] Revert test changes fully to clean up diff

---
 .../Visual/Playlists/TestScenePlaylistsResultsScreen.cs  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 4d82631fc9..cb422d8c06 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -262,10 +262,9 @@ namespace osu.Game.Tests.Visual.Playlists
 
             for (int i = 1; i <= scores_per_result; i++)
             {
-                int nextLowest = getNextLowestScoreId();
                 multiplayerUserScore.ScoresAround.Lower.Scores.Add(new MultiplayerScore
                 {
-                    ID = nextLowest,
+                    ID = getNextLowestScoreId(),
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -278,10 +277,9 @@ namespace osu.Game.Tests.Visual.Playlists
                     },
                 });
 
-                int nextHighest = getNextHighestScoreId();
                 multiplayerUserScore.ScoresAround.Higher.Scores.Add(new MultiplayerScore
                 {
-                    ID = nextHighest,
+                    ID = getNextHighestScoreId(),
                     Accuracy = userScore.Accuracy,
                     Passed = true,
                     Rank = userScore.Rank,
@@ -311,10 +309,9 @@ namespace osu.Game.Tests.Visual.Playlists
 
             for (int i = 1; i <= scores_per_result; i++)
             {
-                int id = sort == "score_asc" ? getNextHighestScoreId() : getNextLowestScoreId();
                 result.Scores.Add(new MultiplayerScore
                 {
-                    ID = id,
+                    ID = sort == "score_asc" ? getNextHighestScoreId() : getNextLowestScoreId(),
                     Accuracy = 1,
                     Passed = true,
                     Rank = ScoreRank.X,

From e949b1f613a3015c4a8ae91a76e87e2229711570 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 10:36:57 +0300
Subject: [PATCH 1180/2296] Fix failing tests

---
 osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
index baaa24959f..5ad268a77b 100644
--- a/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/LegacyMainCirclePieceTest.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     Child = piece = new TestLegacyMainCirclePiece(priorityLookup),
                 };
 
-                var sprites = this.ChildrenOfType<Sprite>().Where(s => !string.IsNullOrEmpty(s.Texture.AssetName)).DistinctBy(s => s.Texture.AssetName).ToArray();
+                var sprites = this.ChildrenOfType<Sprite>().Where(s => !string.IsNullOrEmpty(s.Texture?.AssetName)).DistinctBy(s => s.Texture.AssetName).ToArray();
                 Debug.Assert(sprites.Length <= 2);
             });
 
@@ -103,8 +103,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private partial class TestLegacyMainCirclePiece : LegacyMainCirclePiece
         {
-            public new Sprite? CircleSprite => base.CircleSprite.ChildrenOfType<Sprite>().DistinctBy(s => s.Texture.AssetName).SingleOrDefault();
-            public new Sprite? OverlaySprite => base.OverlaySprite.ChildrenOfType<Sprite>().DistinctBy(s => s.Texture.AssetName).SingleOrDefault();
+            public new Sprite? CircleSprite => base.CircleSprite.ChildrenOfType<Sprite>().Where(s => !string.IsNullOrEmpty(s.Texture?.AssetName)).DistinctBy(s => s.Texture.AssetName).SingleOrDefault();
+            public new Sprite? OverlaySprite => base.OverlaySprite.ChildrenOfType<Sprite>().Where(s => !string.IsNullOrEmpty(s.Texture?.AssetName)).DistinctBy(s => s.Texture.AssetName).SingleOrDefault();
 
             public TestLegacyMainCirclePiece(string? priorityLookupPrefix)
                 : base(priorityLookupPrefix, false)

From 84102cd51ef34f1cf81b2ae41783807a5f2ebb2d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 10:46:04 +0300
Subject: [PATCH 1181/2296] Use current date as default value for tournament
 date text box

---
 osu.Game.Tournament/Components/DateTextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index d87c091f77..ab643a5cb5 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tournament.Components
 {
     public partial class DateTextBox : SettingsTextBox
     {
-        private readonly BindableWithCurrent<DateTimeOffset> current = new BindableWithCurrent<DateTimeOffset>();
+        private readonly BindableWithCurrent<DateTimeOffset> current = new BindableWithCurrent<DateTimeOffset>(DateTimeOffset.Now);
 
         public new Bindable<DateTimeOffset>? Current
         {

From 841c5bb4bd9d78a2dc191271d3a09a60446c35e6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 26 Oct 2023 11:04:55 +0300
Subject: [PATCH 1182/2296] Add modified skin for serialisation test coverage

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

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231026.osk b/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231026.osk
new file mode 100644
index 0000000000000000000000000000000000000000..e349c14d7403a13b92ae0b5fed2ee449273a199b
GIT binary patch
literal 2066
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
T(MS;c4*&qMuL_%9_ZRP9@fu;D

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index 98008a003d..b66a5b7862 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -54,7 +54,9 @@ namespace osu.Game.Tests.Skins
             // Covers key counters
             "Archives/modified-argon-pro-20230618.osk",
             // Covers "Argon" health display
-            "Archives/modified-argon-pro-20231001.osk"
+            "Archives/modified-argon-pro-20231001.osk",
+            // Covers "Argon" score/combo/accuracy/pp counters, and wedges
+            "Archives/modified-argon-pro-20231026.osk"
         };
 
         /// <summary>

From 4cca70ee1939118d719d5cbecd5b2d109fd07c94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Oct 2023 17:42:28 +0900
Subject: [PATCH 1183/2296] Fix iOS AOT compilation failure due to
 SharpCompress library upgrade

---
 osu.Game/osu.Game.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 848e17af1a..bf0a1fcbad 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -39,7 +39,8 @@
     <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1023.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
-    <PackageReference Include="SharpCompress" Version="0.34.1" />
+    <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
+    <PackageReference Include="SharpCompress" Version="0.33.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.6" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 910d74fdda85433e2cf6b1f62daa3edc4a75f816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 11:59:38 +0200
Subject: [PATCH 1184/2296] Add failing test coverage for double-click on
 disabled sliders

---
 .../UserInterface/TestSceneRoundedSliderBar.cs  | 17 +++++++++++++++++
 .../UserInterface/TestSceneShearedSliderBar.cs  | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
index 419e88137c..ae52c26fd2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
@@ -55,5 +55,22 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddAssert("slider is default", () => slider.Current.IsDefault);
         }
+
+        [Test]
+        public void TestNubDoubleClickOnDisabledSliderDoesNothing()
+        {
+            AddStep("set slider to 1", () => slider.Current.Value = 1);
+            AddStep("disable slider", () => slider.Current.Disabled = true);
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(slider.ChildrenOfType<Nub>().Single()));
+
+            AddStep("double click nub", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("slider is still at 1", () => slider.Current.Value, () => Is.EqualTo(1));
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
index d459a2c701..334fc4563a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
@@ -55,5 +55,22 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddAssert("slider is default", () => slider.Current.IsDefault);
         }
+
+        [Test]
+        public void TestNubDoubleClickOnDisabledSliderDoesNothing()
+        {
+            AddStep("set slider to 1", () => slider.Current.Value = 1);
+            AddStep("disable slider", () => slider.Current.Disabled = true);
+
+            AddStep("move mouse to nub", () => InputManager.MoveMouseTo(slider.ChildrenOfType<ShearedNub>().Single()));
+
+            AddStep("double click nub", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("slider is still at 1", () => slider.Current.Value, () => Is.EqualTo(1));
+        }
     }
 }

From 96437c4518a394c2354853b95c5f07853c6340d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 12:03:35 +0200
Subject: [PATCH 1185/2296] Fix tests specifying float precision for double
 bindable

Would cause assignments to `.Value` to become imprecise even if the
underlying bindable could represent the value 100% accurately.
---
 .../Visual/UserInterface/TestSceneRoundedSliderBar.cs           | 2 +-
 .../Visual/UserInterface/TestSceneShearedSliderBar.cs           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
index ae52c26fd2..311034d595 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly BindableDouble current = new BindableDouble(5)
         {
-            Precision = 0.1f,
+            Precision = 0.1,
             MinValue = 0,
             MaxValue = 15
         };
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
index 334fc4563a..a5072b4e60 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly BindableDouble current = new BindableDouble(5)
         {
-            Precision = 0.1f,
+            Precision = 0.1,
             MinValue = 0,
             MaxValue = 15
         };

From 89fec95b016364d2a97a30a1d6cbbbf6e46e19a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 12:11:25 +0200
Subject: [PATCH 1186/2296] Fix cross-test data dependency by recreating slider
 every time

---
 .../TestSceneRoundedSliderBar.cs              | 22 +++++++++----------
 .../TestSceneShearedSliderBar.cs              | 22 +++++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
index 311034d595..66d54c8562 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedSliderBar.cs
@@ -18,26 +18,24 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private readonly BindableDouble current = new BindableDouble(5)
-        {
-            Precision = 0.1,
-            MinValue = 0,
-            MaxValue = 15
-        };
-
         private RoundedSliderBar<double> slider = null!;
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [SetUpSteps]
+        public void SetUpSteps()
         {
-            Child = slider = new RoundedSliderBar<double>
+            AddStep("create slider", () => Child = slider = new RoundedSliderBar<double>
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Current = current,
+                Current = new BindableDouble(5)
+                {
+                    Precision = 0.1,
+                    MinValue = 0,
+                    MaxValue = 15
+                },
                 RelativeSizeAxes = Axes.X,
                 Width = 0.4f
-            };
+            });
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
index a5072b4e60..c3038ddb3d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneShearedSliderBar.cs
@@ -18,26 +18,24 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private OverlayColourProvider colourProvider { get; set; } = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private readonly BindableDouble current = new BindableDouble(5)
-        {
-            Precision = 0.1,
-            MinValue = 0,
-            MaxValue = 15
-        };
-
         private ShearedSliderBar<double> slider = null!;
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [SetUpSteps]
+        public void SetUpSteps()
         {
-            Child = slider = new ShearedSliderBar<double>
+            AddStep("create slider", () => Child = slider = new ShearedSliderBar<double>
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Current = current,
+                Current = new BindableDouble(5)
+                {
+                    Precision = 0.1,
+                    MinValue = 0,
+                    MaxValue = 15
+                },
                 RelativeSizeAxes = Axes.X,
                 Width = 0.4f
-            };
+            });
         }
 
         [Test]

From 3b9c4c9d530eeee26f29a920299b0b363cd7348c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 12:04:27 +0200
Subject: [PATCH 1187/2296] Do not revert to default value when double-clicking
 disabled slider

Closes https://github.com/ppy/osu/issues/25228.
---
 osu.Game/Graphics/UserInterface/RoundedSliderBar.cs | 6 +++++-
 osu.Game/Graphics/UserInterface/ShearedSliderBar.cs | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
index e5976fe893..0981881ead 100644
--- a/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/RoundedSliderBar.cs
@@ -98,7 +98,11 @@ namespace osu.Game.Graphics.UserInterface
                         Origin = Anchor.TopCentre,
                         RelativePositionAxes = Axes.X,
                         Current = { Value = true },
-                        OnDoubleClicked = () => Current.SetDefault(),
+                        OnDoubleClicked = () =>
+                        {
+                            if (!Current.Disabled)
+                                Current.SetDefault();
+                        },
                     },
                 },
                 hoverClickSounds = new HoverClickSounds()
diff --git a/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs b/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
index 9ef5f3073a..60a6670492 100644
--- a/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedSliderBar.cs
@@ -101,7 +101,11 @@ namespace osu.Game.Graphics.UserInterface
                         Origin = Anchor.TopCentre,
                         RelativePositionAxes = Axes.X,
                         Current = { Value = true },
-                        OnDoubleClicked = () => Current.SetDefault(),
+                        OnDoubleClicked = () =>
+                        {
+                            if (!Current.Disabled)
+                                Current.SetDefault();
+                        },
                     },
                 },
                 hoverClickSounds = new HoverClickSounds()

From dbb69419e6d49e6661d31eb22f2445e499e5e742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 12:39:07 +0200
Subject: [PATCH 1188/2296] Add test coverage for parsing new online ID

---
 .../Beatmaps/Formats/LegacyScoreDecoderTest.cs   |  14 ++++++++++++++
 .../Replays/taiko-replay-with-new-online-id.osr  | Bin 0 -> 1531 bytes
 2 files changed, 14 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/Replays/taiko-replay-with-new-online-id.osr

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
index c7fd3ba098..ab88be1511 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
@@ -101,6 +101,20 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestDecodeNewOnlineID()
+        {
+            var decoder = new TestLegacyScoreDecoder();
+
+            using (var resourceStream = TestResources.OpenResource("Replays/taiko-replay-with-new-online-id.osr"))
+            {
+                var score = decoder.Parse(resourceStream);
+
+                Assert.That(score.ScoreInfo.OnlineID, Is.EqualTo(258));
+                Assert.That(score.ScoreInfo.LegacyOnlineID, Is.EqualTo(-1));
+            }
+        }
+
         [TestCase(3, true)]
         [TestCase(6, false)]
         [TestCase(LegacyBeatmapDecoder.LATEST_VERSION, false)]
diff --git a/osu.Game.Tests/Resources/Replays/taiko-replay-with-new-online-id.osr b/osu.Game.Tests/Resources/Replays/taiko-replay-with-new-online-id.osr
new file mode 100644
index 0000000000000000000000000000000000000000..63e05f5fcdbda51e8f7c3322def87f4fc74f8da4
GIT binary patch
literal 1531
zcmV<X1qAv5gu}@J3m{`=HezODVK+51Gh#JiH8o{0Gcz`0V>vTrHZVD6F=Go4b8ul}
zWo=<@Utx4?VRJGIAU8K+FfnCiFg9f~Ic8-uIb%6xWnyJxW-~W5FgY}2Hc0>o00001
z0000000e#v08sz|000003jk|tWgGt0+X(9f003P803ZOTO#lD@000007K}rXlJKRA
z7M`&HOhZfu53FrP?1?N(Ce<_OIe53onYYKWQKjB!yy__GNTqRxRs4t|7d^=w?^a2;
z=;p=RN*NtHSfdZ7KM{`CJ^MjsRn>7amAkGdpDK+x=PDo#tk4aBL?k%f)$Ebh0t%Nn
zphxu;)QK_xDZ_`29#Sl<RhTPf=QajyFj9h54_k=pqBh6p$E&d%pEBAHNq~zC*dua$
zireaj)+hZVHmk$h1F^<FD<|WTztGx-;AshoV+E`18Gt&J)F^O<?cd*UZ8hd@9z!xb
zF;N9%E4A&TS=)p%l&r}vAE>z$-BsTX6oS*tEpL9Ev7g9I5ScQ++9#K`PS+Bg7YLtZ
zZhi6@^BMY%^-@>8#b8diGT>rK8W$eYWM@f+i3@MI*x2jwMoDv7i9dcH+Blva=xLAQ
zQ+tf$l}n5c>1hLZYL!1qq`!()(I1Bi(teRO5k6sX_aTq*mVFs>aNFfP7<L<4=&sD0
zU1I0nJ+?mI29b%hGlM_}u@@6ga?B+*WHR3Kdw0V&%_uvn5Q1(YY!3lzQQZ#|jX#aR
z<hY}g8}F#oW(BU#Q8ov)`=6{S*xozU*<>QeOX;b~w1IAj)Te-(%eMdm^#T`gS4`h=
z`(YRBu5x52OkrvA<c&q3>E;$$5Ka1rR+V@w)I!3+SveB0rxD~l$s=FEk0DPJXI01(
zX<*T#vp20$0MeFEDmFU3$xU;pcASo<?WMR**(C{*tX72%YRXivZ7U&VGJ(jSBZ32~
zb9o4B^z3(LYHaN3X%c1z0qheGx{5sEM?%8LN@$^VZUXy=nyS5D4;o=+Rd$kT>(q2)
zN#UlWQX+|aTA<j`k`qem#<8nJ9x@{-?d?n!ETm_@erp7-vxq9@-95hPu7n%rlV(z%
zp^jon16u`Hhi$|2RzUmJ*0Rvho(h|Ii1%B>rDrD&&we-Q#@5I>P@U#aZ7E_WVu}QZ
z{u?U)bPE60zy8;&*@>H#nKF^r<z?~40z{4I>iT4w%Ra_eUgCD(pFv%H+A(z{%SB~Z
zD*JNyOplwu9x#_r<KfAw6@FS+I4FrwA0NA8_g+~rn2ib%4)Y6Lnf*tfVrZL}zJOX_
z%m<$+DQ45Qeo_rb_d)94&c%|)^i2u71i7#5tXNa+=7A@vPKr25*{1Nv@1~TN`L<bx
zH(5d+z|x8)q@W8BVo{EZ;>abI#%4~0{9EZmm)IZ%cF!fh>HiAX@d}Izf*u8yw}?8+
zNnZ9YLWQcYNC*QlO6tVSziS_G!(qvFc@44`+vV{%9koFdUqvujoNp;)_jO1RN`{^0
zg=z?MuejP`10NKa5$Cxp-Se8FTJyl!tovh4wVKlspX4~-i8~TINGZ^#);*P#i)SE8
zzW1JsdM+A;?~>4&l@303`MAkXiv{_WIWc4$HYYGgMxnMFNGc{X2NX~R?2b@ZRs9cq
z$!to>PZGzdmXRl&AW$UR-r`TGqkjmloZEFshw0Jkawz&1Ok4MmYz+~Jhh=obE&;f{
z+ZS(WELeZ_C2m3BkbxZ&DAUVh89w}bvS8+#qHjecQMK`PKw!@~opfX|DAuPffrNhq
z<qvxEz0bC$>DizxF1oWO4uo1ML<2%wPOFapwVrJdCB~~#Tt?D*NdN!;|NsC0|Ahbm
z09^n8AOPI}000000000zf`AtsFAk^B)WLFNAyG7WV$N8-!j+hPu8$we_e;|#*+iNK
z$kRN=q&Sl0(d`|*oEU1|*~5eG@dH3Miy0i*F=j=X+_a<6T3%2U@VpmXv8`-JhNX1!
hacf^hACxf}U(1HP^l0fR;XoK|ePzq5Xz7uby&!FJ#7qDH

literal 0
HcmV?d00001


From 8b9b085ef5422976b6ec9ef8cd11406c235209fc Mon Sep 17 00:00:00 2001
From: Termincc <112787855+Termincc@users.noreply.github.com>
Date: Thu, 26 Oct 2023 22:15:10 +1000
Subject: [PATCH 1189/2296] Address mod incompatibilities

Makes FreezeFrame and Transform mods incompatible.
---
 osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
index 0a1aab9ef1..89a00d6c32 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => "Burn the notes into your memory.";
 
         //Alters the transforms of the approach circles, breaking the effects of these mods.
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModApproachDifferent) };
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModApproachDifferent), typeof(OsuModTransform) }).ToArray(); 
 
         public override ModType Type => ModType.Fun;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
index 2354cd50ae..92a499e735 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -21,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Fun;
         public override LocalisableString Description => "Everything rotates. EVERYTHING.";
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModWiggle), typeof(OsuModMagnetised), typeof(OsuModRepel) };
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModWiggle), typeof(OsuModMagnetised), typeof(OsuModRepel), typeof(OsuModFreezeFrame) }).ToArray();
 
         private float theta;
 

From 238e8175ae3b2ddb8e8b86dc969ddba2225e693f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 26 Oct 2023 21:26:26 +0900
Subject: [PATCH 1190/2296] Add ability to quick retry using Ctrl-R

Matches osu!stable
---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 20220d88cd..947cd5f54f 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -149,6 +149,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene),
             new KeyBinding(InputKey.ExtraMouseButton2, GlobalAction.SkipCutscene),
             new KeyBinding(InputKey.Tilde, GlobalAction.QuickRetry),
+            new KeyBinding(new[] { InputKey.Control, InputKey.R }, GlobalAction.QuickRetry),
             new KeyBinding(new[] { InputKey.Control, InputKey.Tilde }, GlobalAction.QuickExit),
             new KeyBinding(new[] { InputKey.F3 }, GlobalAction.DecreaseScrollSpeed),
             new KeyBinding(new[] { InputKey.F4 }, GlobalAction.IncreaseScrollSpeed),

From 526ee6e14070a2ba0d09ad544353be52796e698c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 14:46:24 +0200
Subject: [PATCH 1191/2296] Remove `IScoreInfo : IHasNamedFiles` inheritance

---
 osu.Game/Database/IHasRealmFiles.cs | 6 ++++--
 osu.Game/Scoring/IScoreInfo.cs      | 2 +-
 osu.Game/Scoring/ScoreInfo.cs       | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/IHasRealmFiles.cs b/osu.Game/Database/IHasRealmFiles.cs
index 79ea719583..b301bb04de 100644
--- a/osu.Game/Database/IHasRealmFiles.cs
+++ b/osu.Game/Database/IHasRealmFiles.cs
@@ -10,13 +10,15 @@ namespace osu.Game.Database
     /// <summary>
     /// A model that contains a list of files it is responsible for.
     /// </summary>
-    public interface IHasRealmFiles
+    public interface IHasRealmFiles : IHasNamedFiles
     {
         /// <summary>
         /// Available files in this model, with locally filenames.
         /// When performing lookups, consider using <see cref="BeatmapSetInfoExtensions.GetFile"/> or <see cref="BeatmapSetInfoExtensions.GetPathForFile"/> to do case-insensitive lookups.
         /// </summary>
-        IList<RealmNamedFileUsage> Files { get; }
+        new IList<RealmNamedFileUsage> Files { get; }
+
+        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
 
         /// <summary>
         /// A combined hash representing the model, based on the files it contains.
diff --git a/osu.Game/Scoring/IScoreInfo.cs b/osu.Game/Scoring/IScoreInfo.cs
index 4083d57fa0..cde48c3be3 100644
--- a/osu.Game/Scoring/IScoreInfo.cs
+++ b/osu.Game/Scoring/IScoreInfo.cs
@@ -9,7 +9,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Scoring
 {
-    public interface IScoreInfo : IHasOnlineID<long>, IHasNamedFiles
+    public interface IScoreInfo : IHasOnlineID<long>
     {
         IUser User { get; }
 
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 6b03e876c4..722d83cac8 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -187,7 +187,6 @@ namespace osu.Game.Scoring
         IRulesetInfo IScoreInfo.Ruleset => Ruleset;
         IBeatmapInfo? IScoreInfo.Beatmap => BeatmapInfo;
         IUser IScoreInfo.User => User;
-        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
 
         #region Properties required to make things work with existing usages
 

From 900530080ff7f4c33a19b6107214c80ff4f0f997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 14:56:22 +0200
Subject: [PATCH 1192/2296] Make `SoloScoreInfo` implement `IScoreInfo`

---
 .../API/Requests/Responses/SoloScoreInfo.cs    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index 783522220b..0e31f11dc1 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -7,16 +7,16 @@ using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
     [Serializable]
-    public class SoloScoreInfo : IHasOnlineID<long>
+    public class SoloScoreInfo : IScoreInfo
     {
         [JsonProperty("beatmap_id")]
         public int BeatmapID { get; set; }
@@ -138,6 +138,18 @@ namespace osu.Game.Online.API.Requests.Responses
 
         #endregion
 
+        #region IScoreInfo
+
+        public long OnlineID => (long?)ID ?? -1;
+
+        IUser IScoreInfo.User => User!;
+        DateTimeOffset IScoreInfo.Date => EndedAt;
+        long IScoreInfo.LegacyOnlineID => (long?)LegacyScoreId ?? -1;
+        IBeatmapInfo IScoreInfo.Beatmap => Beatmap!;
+        IRulesetInfo IScoreInfo.Ruleset => Beatmap!.Ruleset;
+
+        #endregion
+
         public override string ToString() => $"score_id: {ID} user_id: {UserID}";
 
         /// <summary>
@@ -223,7 +235,5 @@ namespace osu.Game.Online.API.Requests.Responses
             Statistics = score.Statistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
             MaximumStatistics = score.MaximumStatistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
         };
-
-        public long OnlineID => (long?)ID ?? -1;
     }
 }

From c3e9f5184f504f119867c3745af730c6fafe02de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 15:09:34 +0200
Subject: [PATCH 1193/2296] Fix `SoloScoreInfo` not copying over legacy score
 ID when converting to `ScoreInfo`

---
 osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index 0e31f11dc1..ac2d8152b1 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -190,6 +190,7 @@ namespace osu.Game.Online.API.Requests.Responses
             var score = new ScoreInfo
             {
                 OnlineID = OnlineID,
+                LegacyOnlineID = (long?)LegacyScoreId ?? -1,
                 User = User ?? new APIUser { Id = UserID },
                 BeatmapInfo = new BeatmapInfo { OnlineID = BeatmapID },
                 Ruleset = new RulesetInfo { OnlineID = RulesetID },

From cbb2a0dd70ddce70e2e156be7bac632bbc9b6480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 15:09:59 +0200
Subject: [PATCH 1194/2296] Use both score ID types to deduplicate score on
 solo results screen

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

diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index f187b8a302..da08a26a58 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
+using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Solo;
@@ -67,7 +68,7 @@ namespace osu.Game.Screens.Ranking
                 return null;
 
             getScoreRequest = new GetScoresRequest(Score.BeatmapInfo, Score.Ruleset);
-            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineID != Score.OnlineID).Select(s => s.ToScoreInfo(rulesets, Beatmap.Value.BeatmapInfo)));
+            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => !s.MatchesOnlineID(Score)).Select(s => s.ToScoreInfo(rulesets, Beatmap.Value.BeatmapInfo)));
             return getScoreRequest;
         }
 

From 359ae3120494d0b9d3b61599d6f50f5abe0330ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 15:40:46 +0200
Subject: [PATCH 1195/2296] Fix catch distance snap grid not moving

Regressed in https://github.com/ppy/osu/pull/25154.
Specifically, in 013b5fa916d819ec7a8a93b1692d4aa027934a67
and 74b86349d58e5169e52bbdc70cef3dec81579a74.

A simple case of too-much-code-deleted-itis.
---
 .../Edit/CatchHitObjectComposer.cs            | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
index 6f0ee260ab..4172720ada 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchHitObjectComposer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
@@ -179,5 +180,33 @@ namespace osu.Game.Rulesets.Catch.Edit
                     return null;
             }
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            updateDistanceSnapGrid();
+        }
+
+        private void updateDistanceSnapGrid()
+        {
+            if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True)
+            {
+                distanceSnapGrid.Hide();
+                return;
+            }
+
+            var sourceHitObject = getDistanceSnapGridSourceHitObject();
+
+            if (sourceHitObject == null)
+            {
+                distanceSnapGrid.Hide();
+                return;
+            }
+
+            distanceSnapGrid.Show();
+            distanceSnapGrid.StartTime = sourceHitObject.GetEndTime();
+            distanceSnapGrid.StartX = sourceHitObject.EffectiveX;
+        }
     }
 }

From 79910df9593b8478419b4eb2f4be12b0cfd1dbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 15:46:32 +0200
Subject: [PATCH 1196/2296] Fix catch distance snap provider not hiding slider
 properly

Regressed in https://github.com/ppy/osu/pull/25171.

The old code was kinda dependent on correct order of setting `Disabled`.
`CatchHitObjectComposer` would disable distance spacing in its BDL, and
then via the base `DistancedHitObjectComposer.LoadComplete()`, the
slider would be faded out. The switch to composition broke that
ordering.

To fix, stop relying on ordering and just respond to changes as they
come. That's what bindables are for.
---
 osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
index 0b1809e7d9..ddf539771d 100644
--- a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
@@ -98,12 +98,6 @@ namespace osu.Game.Rulesets.Edit
                 }
             });
 
-            if (DistanceSpacingMultiplier.Disabled)
-            {
-                distanceSpacingSlider.Hide();
-                return;
-            }
-
             DistanceSpacingMultiplier.Value = editorBeatmap.BeatmapInfo.DistanceSpacing;
             DistanceSpacingMultiplier.BindValueChanged(multiplier =>
             {
@@ -116,6 +110,8 @@ namespace osu.Game.Rulesets.Edit
                 editorBeatmap.BeatmapInfo.DistanceSpacing = multiplier.NewValue;
             }, true);
 
+            DistanceSpacingMultiplier.BindDisabledChanged(disabled => distanceSpacingSlider.Alpha = disabled ? 0 : 1, true);
+
             // Manual binding to handle enabling distance spacing when the slider is interacted with.
             distanceSpacingSlider.Current.BindValueChanged(spacing =>
             {

From 5d6a58d443cf6467bcc72b8db4d36875acbab7bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 16:19:53 +0200
Subject: [PATCH 1197/2296] Add failing test scene for scroll handling in song
 select

---
 .../Navigation/TestSceneScreenNavigation.cs   | 38 +++++++++++++++++++
 osu.Game/Screens/Select/SongSelect.cs         |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index fa1ebf5c56..a6d4fb0b52 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -7,6 +7,7 @@ using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -16,6 +17,7 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Configuration;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.Leaderboards;
@@ -34,6 +36,7 @@ using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Screens.Select.Options;
 using osu.Game.Tests.Beatmaps.IO;
@@ -165,6 +168,41 @@ namespace osu.Game.Tests.Visual.Navigation
             ConfirmAtMainMenu();
         }
 
+        [Test]
+        public void TestSongSelectScrollHandling()
+        {
+            TestPlaySongSelect songSelect = null;
+            double scrollPosition = 0;
+
+            AddStep("set game volume to max", () => Game.Dependencies.Get<FrameworkConfigManager>().SetValue(FrameworkSetting.VolumeUniversal, 1d));
+            AddUntilStep("wait for volume overlay to hide", () => Game.ChildrenOfType<VolumeOverlay>().Single().State.Value, () => Is.EqualTo(Visibility.Hidden));
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
+            AddUntilStep("wait for song select", () => songSelect.BeatmapSetsLoaded);
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("store scroll position", () => scrollPosition = getCarouselScrollPosition());
+
+            AddStep("move to left side", () => InputManager.MoveMouseTo(
+                songSelect.ChildrenOfType<Screens.Select.SongSelect.LeftSideInteractionContainer>().Single().ScreenSpaceDrawQuad.TopLeft + new Vector2(1)));
+            AddStep("scroll down", () => InputManager.ScrollVerticalBy(-1));
+            AddAssert("carousel didn't move", getCarouselScrollPosition, () => Is.EqualTo(scrollPosition));
+
+            AddRepeatStep("alt-scroll down", () =>
+            {
+                InputManager.PressKey(Key.AltLeft);
+                InputManager.ScrollVerticalBy(-1);
+                InputManager.ReleaseKey(Key.AltLeft);
+            }, 5);
+            AddAssert("game volume decreased", () => Game.Dependencies.Get<FrameworkConfigManager>().Get<double>(FrameworkSetting.VolumeUniversal), () => Is.LessThan(1));
+
+            AddStep("move to carousel", () => InputManager.MoveMouseTo(songSelect.ChildrenOfType<BeatmapCarousel>().Single()));
+            AddStep("scroll down", () => InputManager.ScrollVerticalBy(-1));
+            AddAssert("carousel moved", getCarouselScrollPosition, () => Is.Not.EqualTo(scrollPosition));
+
+            double getCarouselScrollPosition() => Game.ChildrenOfType<UserTrackingScrollContainer<DrawableCarouselItem>>().Single().Current;
+        }
+
         /// <summary>
         /// This tests that the F1 key will open the mod select overlay, and not be handled / blocked by the music controller (which has the same default binding
         /// but should be handled *after* song select).
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d5ec94ad71..827884f971 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -1019,7 +1019,7 @@ namespace osu.Game.Screens.Select
         /// <summary>
         /// Handles mouse interactions required when moving away from the carousel.
         /// </summary>
-        private partial class LeftSideInteractionContainer : Container
+        internal partial class LeftSideInteractionContainer : Container
         {
             private readonly Action? resetCarouselPosition;
 

From 2fa221738184c9ded7f091cea16bf40f4e02765d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 16:26:31 +0200
Subject: [PATCH 1198/2296] Fix left side of carousel blocking volume adjust
 hotkeys

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

A little ad-hoc, but probably fine...?
---
 osu.Game/Screens/Select/SongSelect.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 827884f971..dfea4e3794 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -1028,7 +1028,10 @@ namespace osu.Game.Screens.Select
                 this.resetCarouselPosition = resetCarouselPosition;
             }
 
-            protected override bool OnScroll(ScrollEvent e) => true;
+            // we want to block plain scrolls on the left side so that they don't scroll the carousel,
+            // but also we *don't* want to handle scrolls when they're combined with keyboard modifiers
+            // as those will usually correspond to other interactions like adjusting volume.
+            protected override bool OnScroll(ScrollEvent e) => !e.ControlPressed && !e.AltPressed && !e.ShiftPressed && !e.SuperPressed;
 
             protected override bool OnMouseDown(MouseDownEvent e) => true;
 

From 0482c05d7c031132a17e5e0fa3e4b605051cd2b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 19:27:05 +0200
Subject: [PATCH 1199/2296] Add failing test case

---
 .../TestSceneMasterGameplayClockContainer.cs  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
index 393217f371..1368b42a3c 100644
--- a/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
@@ -108,6 +108,28 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("gameplay clock time = 10000", () => gameplayClockContainer.CurrentTime, () => Is.EqualTo(10000).Within(10f));
         }
 
+        [Test]
+        public void TestStopUsingBeatmapClock()
+        {
+            ClockBackedTestWorkingBeatmap working = null;
+            MasterGameplayClockContainer gameplayClockContainer = null;
+            BindableDouble frequencyAdjustment = new BindableDouble(2);
+
+            AddStep("create container", () =>
+            {
+                working = new ClockBackedTestWorkingBeatmap(new OsuRuleset().RulesetInfo, new FramedClock(new ManualClock()), Audio);
+                Child = gameplayClockContainer = new MasterGameplayClockContainer(working, 0);
+
+                gameplayClockContainer.Reset(startClock: true);
+            });
+
+            AddStep("apply frequency adjustment", () => gameplayClockContainer.AdjustmentsFromMods.AddAdjustment(AdjustableProperty.Frequency, frequencyAdjustment));
+            AddAssert("track frequency changed", () => working.Track.AggregateFrequency.Value, () => Is.EqualTo(2));
+
+            AddStep("stop using beatmap clock", () => gameplayClockContainer.StopUsingBeatmapClock());
+            AddAssert("frequency adjustment unapplied", () => working.Track.AggregateFrequency.Value, () => Is.EqualTo(1));
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             localConfig?.Dispose();

From 565ae99e0dfddbecef6bc24828ba6c39c837f5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 19:27:50 +0200
Subject: [PATCH 1200/2296] Fix `StopUsingBeatmapClock()` applying adjustments
 to track it was supposed to stop using

- Closes https://github.com/ppy/osu/issues/25248
- Possibly also closes https://github.com/ppy/osu/issues/20475

Regressed in e33486a766044c17c2f254f5e8df6d72b29c341e.

`StopUsingBeatmapClock()` intends to, as the name says, stop operating
on the working beatmap clock to yield its usage to other components on
exit. As part of that it tries to unapply audio adjustments so that
other screens can apply theirs freely instead.

However, the aforementioned commit introduced a bug in this. Previously
to it, `track` was an alias for the `SourceClock`, which could be
mutated in an indirect way via `ChangeSource()` calls. The
aforementioned commit made `track` a `readonly` field, initialised in
constructor, which would _never_ change value. In particular, it would
_always_ be the beatmap track, which meant that
`StopUsingBeatmapClock()` would remove the adjustments from the beatmap
track, but then at the end of the method, _apply them onto that same
track again_.

This was only saved by the fact that clock adjustments are removed again
on disposal of the `MasterGameplayClockContainer()`. This - due to async
disposal pressure - could explain infrequently reported cases wherein
the track would just continue to speed up ad infinitum.

To fix, fully substitute the beatmap track for a virtual track at the
point of calling `StopUsingBeatmapClock()`.
---
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 70d9ecd3e7..6e07b01b5f 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play
 
         private readonly WorkingBeatmap beatmap;
 
-        private readonly Track track;
+        private Track track;
 
         private readonly double skipTargetTime;
 
@@ -188,11 +188,11 @@ namespace osu.Game.Screens.Play
         {
             removeSourceClockAdjustments();
 
-            var virtualTrack = new TrackVirtual(beatmap.Track.Length);
-            virtualTrack.Seek(CurrentTime);
+            track = new TrackVirtual(beatmap.Track.Length);
+            track.Seek(CurrentTime);
             if (IsRunning)
-                virtualTrack.Start();
-            ChangeSource(virtualTrack);
+                track.Start();
+            ChangeSource(track);
 
             addSourceClockAdjustments();
         }

From fdb81bfa4ca2d9819bb0c252059b7b84919af583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 26 Oct 2023 19:38:41 +0200
Subject: [PATCH 1201/2296] Rename methods to not mention "source clock"
 anymore

---
 .../Screens/Play/MasterGameplayClockContainer.cs     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 6e07b01b5f..1c860e9d4b 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Screens.Play
 
         protected override void StartGameplayClock()
         {
-            addSourceClockAdjustments();
+            addAdjustmentsToTrack();
 
             base.StartGameplayClock();
 
@@ -186,7 +186,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public void StopUsingBeatmapClock()
         {
-            removeSourceClockAdjustments();
+            removeAdjustmentsFromTrack();
 
             track = new TrackVirtual(beatmap.Track.Length);
             track.Seek(CurrentTime);
@@ -194,12 +194,12 @@ namespace osu.Game.Screens.Play
                 track.Start();
             ChangeSource(track);
 
-            addSourceClockAdjustments();
+            addAdjustmentsToTrack();
         }
 
         private bool speedAdjustmentsApplied;
 
-        private void addSourceClockAdjustments()
+        private void addAdjustmentsToTrack()
         {
             if (speedAdjustmentsApplied)
                 return;
@@ -213,7 +213,7 @@ namespace osu.Game.Screens.Play
             speedAdjustmentsApplied = true;
         }
 
-        private void removeSourceClockAdjustments()
+        private void removeAdjustmentsFromTrack()
         {
             if (!speedAdjustmentsApplied)
                 return;
@@ -228,7 +228,7 @@ namespace osu.Game.Screens.Play
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            removeSourceClockAdjustments();
+            removeAdjustmentsFromTrack();
         }
 
         ControlPointInfo IBeatSyncProvider.ControlPoints => beatmap.Beatmap.ControlPointInfo;

From 24b1d1e9558badb2f1a6cb5dc30a5aa6fc79f41d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Oct 2023 18:18:07 +0900
Subject: [PATCH 1202/2296] Fix code quality fail

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
index 89a00d6c32..f1197ce0cd 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => "Burn the notes into your memory.";
 
         //Alters the transforms of the approach circles, breaking the effects of these mods.
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModApproachDifferent), typeof(OsuModTransform) }).ToArray(); 
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModApproachDifferent), typeof(OsuModTransform) }).ToArray();
 
         public override ModType Type => ModType.Fun;
 

From f931f4c324f96063a3964fc660daf06d99e657d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 27 Oct 2023 18:19:44 +0900
Subject: [PATCH 1203/2296] Remove reundant interface specification

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

diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index c2b80b7ead..9763d3b57e 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Skinning
 {
     [MapTo("Skin")]
     [JsonObject(MemberSerialization.OptIn)]
-    public class SkinInfo : RealmObject, IHasRealmFiles, IEquatable<SkinInfo>, IHasGuidPrimaryKey, ISoftDelete, IHasNamedFiles
+    public class SkinInfo : RealmObject, IHasRealmFiles, IEquatable<SkinInfo>, IHasGuidPrimaryKey, ISoftDelete
     {
         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");

From 7140eee870bab0d86ab25c15f3d56dce1b68d627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 11:38:10 +0200
Subject: [PATCH 1204/2296] Add failing test coverage for quick retry after
 completion not changing rank

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

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index a6d4fb0b52..2f378917e6 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -259,6 +259,7 @@ namespace osu.Game.Tests.Visual.Navigation
             var getOriginalPlayer = playToCompletion();
 
             AddStep("attempt to retry", () => getOriginalPlayer().ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddAssert("original play isn't failed", () => getOriginalPlayer().Score.ScoreInfo.Rank, () => Is.Not.EqualTo(ScoreRank.F));
             AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen != getOriginalPlayer() && Game.ScreenStack.CurrentScreen is Player);
         }
 

From 86a8ab6db6548d211e5f0e5ff1a4feb4b7a506c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 11:39:43 +0200
Subject: [PATCH 1205/2296] Fix quick retry immediately after completion
 marking score as failed

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

The scenario involved here is as follows:

1. User completes beatmap by hitting all notes.
2. `checkScoreCompleted()` determines completion, and calls
   `progressToResults(withDelay: true)`.
3. `progressToResults()` schedules `resultsDisplayDelegate`, which
   includes a call to `prepareAndImportScoreAsync()`, a second in the
   future.
4. User presses quick retry hotkey.
   This calls `Player.Restart(quickRestart: true)`,
   which invokes `Player.RestartRequested`,
   which in turn calls `PlayerLoader.restartRequested(true)`,
   which in turn causes `PlayerLoader` to make itself current,
   which means that `Player.OnExiting()` will get called.
5. `Player.OnExiting()` sees that `prepareScoreForDisplayTask` is null
   (because `prepareAndImportScoreAsync()` - which sets it -
   is scheduled to happen in the future), and as such assumes that
   the score did not complete. Thus, it marks the score as failed.
6. `Player.Restart()` after invoking `RestartRequested` calls
   `PerformExit(false)`, which then will unconditionally call
   `prepareAndImportScoreAsync()`. But the score has already been marked
   as failed.

The flow above can be described as "convoluted", but I'm not sure I have
it in me right now to try and refactor it again. Therefore, to fix,
switch the `prepareScoreForDisplayTask` null check in
`Player.OnExiting()` to check `GameplayState.HasPassed` instead, as it
is not susceptible to the same out-of-order read issue.
---
 osu.Game/Screens/Play/Player.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 97bfa35d49..18d0a65d7a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1115,8 +1115,7 @@ namespace osu.Game.Screens.Play
                 if (!GameplayState.HasPassed && !GameplayState.HasFailed)
                     GameplayState.HasQuit = true;
 
-                // if arriving here and the results screen preparation task hasn't run, it's safe to say the user has not completed the beatmap.
-                if (prepareScoreForDisplayTask == null && DrawableRuleset.ReplayScore == null)
+                if (!GameplayState.HasPassed && DrawableRuleset.ReplayScore == null)
                     ScoreProcessor.FailScore(Score.ScoreInfo);
             }
 

From 3944b045ed4582b233066dc714be6075b47482f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 11:58:02 +0200
Subject: [PATCH 1206/2296] Add extra test coverage for marking score as failed

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

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 2f378917e6..7fa4f8c836 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -247,6 +247,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("end spectator before retry", () => Game.SpectatorClient.EndPlaying(player.GameplayState));
 
             AddStep("attempt to retry", () => player.ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddAssert("old player score marked failed", () => player.Score.ScoreInfo.Rank, () => Is.EqualTo(ScoreRank.F));
             AddUntilStep("wait for old player gone", () => Game.ScreenStack.CurrentScreen != player);
 
             AddUntilStep("get new player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);

From 96d784e06bd6068f09620eaaa45c4766d0da900d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 12:39:54 +0200
Subject: [PATCH 1207/2296] Delete `ScoreInfo.HasReplay` as no longer needed

---
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs | 2 +-
 osu.Game/Scoring/IScoreInfo.cs                                  | 2 --
 osu.Game/Scoring/ScoreInfo.cs                                   | 2 --
 osu.Game/Screens/Ranking/ReplayDownloadButton.cs                | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
index 6ccf73d8ff..5b32f380b9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
@@ -213,7 +213,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             OnlineID = hasOnlineId ? online_score_id : 0,
             Ruleset = new OsuRuleset().RulesetInfo,
             BeatmapInfo = beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps.First(),
-            Hash = replayAvailable ? "online" : string.Empty,
+            HasOnlineReplay = replayAvailable,
             User = new APIUser
             {
                 Id = 39828,
diff --git a/osu.Game/Scoring/IScoreInfo.cs b/osu.Game/Scoring/IScoreInfo.cs
index cde48c3be3..a1d076b8c2 100644
--- a/osu.Game/Scoring/IScoreInfo.cs
+++ b/osu.Game/Scoring/IScoreInfo.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Scoring
 
         double Accuracy { get; }
 
-        bool HasReplay { get; }
-
         long LegacyOnlineID { get; }
 
         DateTimeOffset Date { get; }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 722d83cac8..d712702331 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -94,8 +94,6 @@ namespace osu.Game.Scoring
 
         public double Accuracy { get; set; }
 
-        public bool HasReplay => !string.IsNullOrEmpty(Hash) || HasOnlineReplay;
-
         [Ignored]
         public bool HasOnlineReplay { get; set; }
 
diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index b6166e97f6..df5f9c7a8a 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Ranking
                 if (State.Value == DownloadState.LocallyAvailable)
                     return ReplayAvailability.Local;
 
-                if (Score.Value?.HasReplay == true)
+                if (Score.Value?.HasOnlineReplay == true)
                     return ReplayAvailability.Online;
 
                 return ReplayAvailability.NotAvailable;

From 32fc19ea0d2515aeab4e84248f6cf67ec7d7de98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 13:22:17 +0200
Subject: [PATCH 1208/2296] Fix results screen test failure

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 146482e6fb..ab2e867255 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -362,7 +362,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     var score = TestResources.CreateTestScoreInfo();
                     score.TotalScore += 10 - i;
-                    score.Hash = $"test{i}";
+                    score.HasOnlineReplay = true;
                     scores.Add(score);
                 }
 

From 2d5b1711f6ffc233ca308153a665d18dcbbccea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 13:27:48 +0200
Subject: [PATCH 1209/2296] Share `!HasPassed` condition

---
 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 18d0a65d7a..a1ec0b3167 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1110,12 +1110,12 @@ namespace osu.Game.Screens.Play
             failAnimationContainer?.Stop();
             PauseOverlay?.StopAllSamples();
 
-            if (LoadedBeatmapSuccessfully)
+            if (LoadedBeatmapSuccessfully && !GameplayState.HasPassed)
             {
-                if (!GameplayState.HasPassed && !GameplayState.HasFailed)
+                if (!GameplayState.HasFailed)
                     GameplayState.HasQuit = true;
 
-                if (!GameplayState.HasPassed && DrawableRuleset.ReplayScore == null)
+                if (DrawableRuleset.ReplayScore == null)
                     ScoreProcessor.FailScore(Score.ScoreInfo);
             }
 

From dc7f5cd6edc94275a56b3b5cdb5766c76c84181c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 13:30:51 +0200
Subject: [PATCH 1210/2296] Add preventive assertions concerning submission
 flow state

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a1ec0b3167..58c8c3389a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1112,6 +1112,8 @@ namespace osu.Game.Screens.Play
 
             if (LoadedBeatmapSuccessfully && !GameplayState.HasPassed)
             {
+                Debug.Assert(resultsDisplayDelegate == null && prepareScoreForDisplayTask == null);
+
                 if (!GameplayState.HasFailed)
                     GameplayState.HasQuit = true;
 

From 6789a522d6d79d6fd1d4f8c15b9c83b119ab61b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 14:15:30 +0200
Subject: [PATCH 1211/2296] Rename test to distinguish it from test-to-come

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

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index 88904bf85b..d08d53f747 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Navigation
         private SkinEditor skinEditor => Game.ChildrenOfType<SkinEditor>().FirstOrDefault();
 
         [Test]
-        public void TestEditComponentDuringGameplay()
+        public void TestEditComponentFromGameplayScene()
         {
             advanceToSongSelect();
             openSkinEditor();

From b5cb5380045b0d8be6031cbdffb4a799ac402bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 14:23:41 +0200
Subject: [PATCH 1212/2296] Add failing test case for skin editor freeze

---
 .../TestSceneSkinEditorNavigation.cs          | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index d08d53f747..c17a9ddf5f 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -5,6 +5,7 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
@@ -18,6 +19,7 @@ using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
+using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps.IO;
 using osuTK;
 using osuTK.Input;
@@ -69,6 +71,28 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("value is less than default", () => hitErrorMeter.JudgementLineThickness.Value < hitErrorMeter.JudgementLineThickness.Default);
         }
 
+        [Test]
+        public void TestMutateProtectedSkinDuringGameplay()
+        {
+            advanceToSongSelect();
+            AddStep("set default skin", () => Game.Dependencies.Get<SkinManager>().CurrentSkinInfo.SetDefault());
+
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("enable NF", () => Game.SelectedMods.Value = new[] { new OsuModNoFail() });
+            AddStep("enter gameplay", () => InputManager.Key(Key.Enter));
+
+            AddUntilStep("wait for player", () =>
+            {
+                DismissAnyNotifications();
+                return Game.ScreenStack.CurrentScreen is Player;
+            });
+
+            openSkinEditor();
+            AddUntilStep("current skin is mutable", () => !Game.Dependencies.Get<SkinManager>().CurrentSkin.Value.SkinInfo.Value.Protected);
+        }
+
         [Test]
         public void TestComponentsDeselectedOnSkinEditorHide()
         {

From 5ad962070c0448b81c8457b8816818b6e6041502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 14:34:30 +0200
Subject: [PATCH 1213/2296] Fix skin editor freezing game if opened during
 active gameplay

---
 osu.Game/Database/ImportParameters.cs          | 6 ++++++
 osu.Game/Database/RealmArchiveModelImporter.cs | 6 +++---
 osu.Game/Skinning/SkinManager.cs               | 5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/ImportParameters.cs b/osu.Game/Database/ImportParameters.cs
index 83ca0ac694..8d37597afc 100644
--- a/osu.Game/Database/ImportParameters.cs
+++ b/osu.Game/Database/ImportParameters.cs
@@ -21,5 +21,11 @@ namespace osu.Game.Database
         /// Whether this import should use hard links rather than file copy operations if available.
         /// </summary>
         public bool PreferHardLinks { get; set; }
+
+        /// <summary>
+        /// If set to <see langword="true"/>, this import will not respect <see cref="RealmArchiveModelImporter{TModel}.PauseImports"/>.
+        /// This is useful for cases where an import <em>must</em> complete even if gameplay is in progress.
+        /// </summary>
+        public bool ImportImmediately { get; set; }
     }
 }
diff --git a/osu.Game/Database/RealmArchiveModelImporter.cs b/osu.Game/Database/RealmArchiveModelImporter.cs
index 730465e1b0..5383040eb4 100644
--- a/osu.Game/Database/RealmArchiveModelImporter.cs
+++ b/osu.Game/Database/RealmArchiveModelImporter.cs
@@ -261,7 +261,7 @@ namespace osu.Game.Database
         /// <param name="cancellationToken">An optional cancellation token.</param>
         public virtual Live<TModel>? ImportModel(TModel item, ArchiveReader? archive = null, ImportParameters parameters = default, CancellationToken cancellationToken = default) => Realm.Run(realm =>
         {
-            pauseIfNecessary(cancellationToken);
+            pauseIfNecessary(parameters, cancellationToken);
 
             TModel? existing;
 
@@ -560,9 +560,9 @@ namespace osu.Game.Database
         /// <returns>Whether to perform deletion.</returns>
         protected virtual bool ShouldDeleteArchive(string path) => false;
 
-        private void pauseIfNecessary(CancellationToken cancellationToken)
+        private void pauseIfNecessary(ImportParameters importParameters, CancellationToken cancellationToken)
         {
-            if (!PauseImports)
+            if (!PauseImports || importParameters.ImportImmediately)
                 return;
 
             Logger.Log($@"{GetType().Name} is being paused.");
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index ca46d3af0c..59c2a8bca0 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -182,7 +182,10 @@ namespace osu.Game.Skinning
                     Name = NamingUtils.GetNextBestName(existingSkinNames, $@"{s.Name} (modified)")
                 };
 
-                var result = skinImporter.ImportModel(skinInfo);
+                var result = skinImporter.ImportModel(skinInfo, parameters: new ImportParameters
+                {
+                    ImportImmediately = true // to avoid possible deadlocks when editing skin during gameplay.
+                });
 
                 if (result != null)
                 {

From 35f30d6135b29b73b68d861bb68564cc951f1a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 14:39:58 +0200
Subject: [PATCH 1214/2296] Scale back debug assertion

The import preparation task can actually be non-null when exiting even
if the player hasn't passed:

- fail beatmap
- click import button to import the failed replay
---
 osu.Game/Screens/Play/Player.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 58c8c3389a..2392fd9f76 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1112,7 +1112,7 @@ namespace osu.Game.Screens.Play
 
             if (LoadedBeatmapSuccessfully && !GameplayState.HasPassed)
             {
-                Debug.Assert(resultsDisplayDelegate == null && prepareScoreForDisplayTask == null);
+                Debug.Assert(resultsDisplayDelegate == null);
 
                 if (!GameplayState.HasFailed)
                     GameplayState.HasQuit = true;

From 7a5f3b856f41d3288b2d7940cb9009dabf8d8770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 19:43:49 +0200
Subject: [PATCH 1215/2296] Add visual test coverage for displaying hitcircles
 with high combo index

---
 .../Resources/special-skin/display-0@2x.png      | Bin 0 -> 5085 bytes
 .../Resources/special-skin/display-1@2x.png      | Bin 0 -> 1262 bytes
 .../Resources/special-skin/display-2@2x.png      | Bin 0 -> 3534 bytes
 .../Resources/special-skin/display-3@2x.png      | Bin 0 -> 3456 bytes
 .../Resources/special-skin/display-4@2x.png      | Bin 0 -> 3213 bytes
 .../Resources/special-skin/display-5@2x.png      | Bin 0 -> 3647 bytes
 .../Resources/special-skin/display-6@2x.png      | Bin 0 -> 4954 bytes
 .../Resources/special-skin/display-7@2x.png      | Bin 0 -> 2503 bytes
 .../Resources/special-skin/display-8@2x.png      | Bin 0 -> 5710 bytes
 .../Resources/special-skin/display-9@2x.png      | Bin 0 -> 5195 bytes
 .../Resources/special-skin/skin.ini              |   1 +
 .../TestSceneHitCircle.cs                        |  10 ++++++----
 12 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-0@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-1@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-2@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-3@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-4@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-5@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-6@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-7@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-8@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-9@2x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-0@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-0@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..67d2e2cf04a71c59957a79a69ef6de8e02a6bbb2
GIT binary patch
literal 5085
zcmV<36C&)1P)<h;3K|Lk000e1NJLTq003D4003<W1^@s6%HYiu00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY6LLvJK~#8N?VZ_^
z6-5?@3lZ!_pk-?|*&7g0K^O!?15pPaa2p~fG=h2b#Xn*Gf_a;HG$z7VA|zsh2?xXl
zM-~MFK?D`q5m|(85Rk0_Mdy5Z>$G{Zvg+2_Ko7r&jI64AZ!KS)I(c%byum%)Q;$%u
zFuyIDIdkS>$yy~fnGNOZx}=Uhd-iOot==AWD`X4ma7p7OwMiN*saaAL>XdX|(qT!*
zB(+QGcIe##S>V1V*(^yjBmtE)sBhoCBP0)g`|UTf*!<UDe>J(P(f2i1_36{+jAR!i
z0i3i~(r$shO7hB88RXDvr%0MAX||+^O-)T>BsWrUjX)Iz>^n|#bMpyVJSu6Iqyv%;
zR%zX(Ll(I6BzsoUA0$ndG+f{si&foDz;@oRUq37y7jj6_PDvXD_IAljRjH6exA20b
zg<>t!*p~IeHLn`5`~3$Wd~ly+TO@s4wi_u0vSq!0lr%#C*ZEpinhPH^XizX<z<}U^
z2OconT=nV|f66y*+z2jRx)l8I!w+UX={UA@y?_7yST_E8y`<8tx-jGrFc!Q-9={oJ
z7ZL}!rKQC{9XN2HNux)P4n~X^!3CSok%Dyr-*?}A;ZjXkuU-vKpFSO&JbBXOKmPcm
zSw?Z^rR(<j$vFY~BT1{u09^>O1$dbNo)UK<E?{5|9y~Z`ZEX!6e)!>F`0(MukRe0N
zHkQd{f9AUi(gp1TXT7ttGdO?#ya9aT#EIbh@4q*>0zZEIc=+v_e1J87=%I%W%Hn&H
z3WLrKIS*jqjT$v7m@;KbFlNjclN7K*MG7zrU_0k`*REYNV9%U6V_=i^@82JsI&~^I
zeE4u8V9mvKl>)l{Y*Q*LVEim_r%#_AOrAVBm^yW;0WO72EU+Sgk^Mb@W8r)E?hOtc
zI1qgG)mH{K%g6^<RR-wZVV+u90OM<cI&a>*V8Ma~!BbB?W!8rc8x}}KBo<hifRR*2
zjEllGjUPYWxG8SD-sB4xE_eYWaX~|*ARi)&eWk3p*xufLs`g2GWrCaq@X(<{gD0PS
zGFZHLaWH@WeB&b6rcpy2u(AQ$y8r(ByI@b8IMKjn+b_TT5(vD=b?CYjs6*s>bAwI|
zISXK-11xvx(xt&;k3AN#+&ExW0=5NMo-)b=&h^%<TPFO&f2;Jm)a3zMEI$|M)R1Mz
zf01mt0G`$eFz(^G=bj5DOqgIENz@2fcLBE5yLWG*2va`Tpk2Va9)cbyi<bm46_->>
z1zD^Z3;weJp4U?Vs{oCE1~hI1(1d(0V9l>wxzZ{zd@s4y8v>emx}j1*4y|~xJZ3Gd
z_Y}Y?_62A{Nd--<(FLrzK<*>iS%Lgtv!Q_+LJqC?Pg24@&U#M+tYV))R?t8H{Id!3
ze4xdeTLknix$e$1*4z+sXvK>p3~KQKCSstFyPE;4*r$R9a-2mYfegD;)|?30wqhS(
zN@&6~qKLa4uq_2mV-ppbj*gBx!07Vj%Pn&KsjRtn*72e@W1<f*8asAuFlWx39tBuM
zrHLn$c-p;wYki_57$qv!lGTcvnwpF+Rw-Z#3j8n?4dP(b2v}CY*RNkUm4riw4h3I-
z{dMr|x8Ito@UdgZOf{K{CFZ3@SB0p!oI7{UShU8_HgJ4%8f%V)tiD(y3Z#HJ(4<L|
z%$=qtS7t>+!5%z#Fxa_sXRvMCw&1hRJ_~m3+7;~Cv!|>5fzN4Gqj17+{`AvN=J(Vn
z3CqfmxJlzKXvw2-$+c)CkQ@4D@7ahI(?9pJSn=H2mU_U%lvpus5fprJz;rzgV45lM
zeZbthb!+hHr=JF&fBv~?%wZcqfeBQWv2LvF=+UF5Rqea)zB3jl=WL#`vOr_awB~UW
ziJx7iv1ad?$PboE_JUZk>EW;eBdk~(dy2M202j;s^2;xSEnBt(8#it=P`~)%3-gEq
zPLJza(#4Ax&2IsWE8)9rqxL2hr&6pMYvvrW=6(C<p^B=JHOE0-A=!L^+}{O^72}6-
z6|OH<WdV#O0{4?oJ~3eNy?}DTx`1`vK0hoC(15>r^QHk!wOP+2ujsu|-<)907lhjx
zIX2@v>J)(-x{77;*v)YPlee|C87p>uu_`Oz_3PIMn>KAS{uj8&KAxScblrD;6o|MI
zx}pG0D2Dqe0vZ=YS<%3n&q=mdAV*wA1hTpcIjP9N6Yl8TxpRYOo_VIu7pu|&Mpzpb
z3}6Z~`#8Q_rRzSxc8>3+GC}Q)bL9zi&o_(gNW*8%0{N<B`{lYK4g0>^%U~3SQAJLi
z6Qy|&%WzLv*V6#TiYcvk?AVbSu*BhKB<+)$7Rkg@N#93Wh;HA$-4tF$gxh)a(ML_A
ze~bo6@_txn$?7V^4b1Ufz$1@5VtlcCpsav#6Zl{XJ1hhFj)w&72|1tLvPd`m$C4O?
za#9MloAMa<mdDuJXr=2!B2<*HW-3iZgf$c4sNc6Gez`v`!{?XlAj=nMn15Dajb+`w
zVD99sS+k70;9#mOfDvIDaW5enu#tTn&9Pj8`-QBoleAW1<iGPMhUr5&R|XTF70|aN
zH3{slF$B6Fbt#+!<%j&n_~^XCHv<`;PsgmQIKS+=3x=?o5ti<StE(VaWd%&(LBWBW
z&;rCg4!Hov64pw3OW^)hQe;FA+xSct-;%UeT-Xt|>wavX&9R7Fa2phiMMOkJ*%Tw-
z7*}h{h0L#;eHTvG{kU=Cy1MSO0%je*NKH+xz;_%hSQc>$Z~Nf73cvHVr2i;rU!jO^
z#{Xl9MMQZ-ijmhZyO8;U*@Jz8?39r`fJS)$BPtiT2-+U({oA>SM~(4lsk`69?*e;+
zJZZ6oA~%<cOA*0=CtAv{aLezKsDp^CEiBu*)CD>Gpp9CddxGL?j6bu(psav#6%;~*
zKRy6RtQa4%K8*#t3PJM(?2X$$AsCR0xD3iBAUALs40P|3ZOMEv*gY{GJ*uY?Hsu;R
zrMV81(oo7hPUt4+oZM(O<WP8X){EcV=kA}Jb`Tx5RYVQ^GG$ub>lrrWNTH{`4anL?
zkq0o664zWH0{~qBp%~7S$xXzFo3x{~we_s;I8;)Kx{L;XIU*afkqa0Rvf(Q70>)L~
z4}Gozg;u;PkDG86-lVOPObKTn2WiWlR^js~$uIj9fsAax#FdP=!6&1vfVnZa2q3$z
z!V-~vZD3kCV*J{1_c*M}O)yUs7M)iq{BoTlkZr)oSLkH{jEE|@Fp}@WMT}_$OeqqO
zy#H}n&f7#9$UZJ(-$+Ho)2%MFk-V0y;>5JjlSkTY%L<rvO7qK?FM9!p?GT4UFlCA-
z!_<A<<Kn((JgP{PYjq|b3)wy~7og@Ucf0GmX>#PkY+3s++f}H%E&~Br+e|7@q(b6_
ztS3h90@PgPZg&Cur27wDQ>m^(r7mOS$dO$xLq%5-uB%Al7bjnZBm&t6?5b?Q;@7Hj
z6)M_5BF?vr!mokqDkKdpS(O(sy}ehiTrrQR4LB44BHcA5iY{zg>mn*z_)%8TDi@==
z3P~zUR)DIsfDwhB-DR(U!~FxG_CYnGAn-yiTKHwDkfgR`RTjXA@Qqp?jY1CK?ofxM
zVr`o-%2FXoWyz|nfDsiCN^%!)cYsbR{E8||g(S5l=K+ie-}JHc?3YKmKDH}g-omd8
zrLB;pvgEvgZMpjma~@?L=_(al_;r^OE!kFH!1niSz*1;b9lqT$inU~0MJ!ll0}fSn
z_;$z0Yso4rp3Mzde}{ZG@c%)vkZr)KJQl3-0QPn|_C$Fh+u>Fb7ZE4+E0q*)r(;i4
z1aj3C2HkIXoJgl*Pn6e^6+{`Ji6b?ZbO57Br(*@8wqW`$Z<ivFeSnL&3c9bT9l3zZ
zxPd9vHI}4oQIk#6{!zIlOO@8VCB=B=?gp%5Ny0YXQbk)d&86D#m84XbTttkfq%j3+
zM$Y~tT{R`kj3ucpmMhw#flS+UBUNt6yt6?cA#Jao{Z<{uF|N!Dne$20?hvOe?a`I{
zWMu!|-hX?0d(~lFtUt~=K*bfl*zLEpRM+s8Xvt;Ey@6p~Nf?*pk7)y@nG!cvk?I=0
zVlBB$`NBBsI6#h!=`BIA{+KpkAZs~Mroy)Cx`r>WC943zW1(*n<rRe=kERDOs>(0N
z`ePvL>v0t*((n}vSwRq@&_}03tn!G*k}!_>h#bJ$g+5yzVcz8~Q<eE+ln^6F`YjWE
zGI1?~^9WTKESOge@nT*$x2whip6YG;v<h$7?5g~6mKYhu`eeJ}z|P8k*TS}Ffx*1W
z3re(RGlfKLv0i2P<18^UvLSbMpSv|P9*ZJA8L3}JHegGoSaW!z7KAr0qB8t()-fA4
zWYc}_0wxDC0|t4!Gq0##^WysxPdpKBsaF}+EWhOyIp%NXg-@@_@W)wVWYh&&yU!Uq
zWdla|Abc_dsPhWHJY&X;q&GSda9#*uWm5PXZqQ<%FGjOx&o(!@XnfqDVJOl$?E2)c
z?sFS7F9-6zht6J-S40;A!(6OSAsi|ZuVn#k0bVBim}EA3#0}=v-6H-tsnGMq$jF6k
zy3bupMuc&UmbbTM6&Kgw{bWD`X_=%{pdG;cQGr+7SZ*-KFQNv8p0{(@h1^y6xiIzh
ztRgN0agkhXoHe5m*2|LKknhI&=<u^QB)yyj7%^c}Q7c9;NO<8g5+frQvMKyrz^v<>
zKXNhQ)_hWH=Ax4nTJ(#O-V~UBvthH$Hd%aA(u?7DW3_0}qF~{|g@vscS3$ku?Af#7
zmWU#S9;$nRy}iBt*oYA$<~BDsPmt2nyb!Lyi8?5ic}a)a0*Z*?O<F?hE5JVS=Dnox
z0|pEjC#!98ZVM%0;mpagNZ>xscld6cm;eRH&p-dXiExVO$dMz#=FOXfk3M3$`>5nR
z@ge_(V{J=KzDY%Jn9~G6*PE#t*733=ul_RkkiIyXN3`YA#tdZU3&O`GNkFz(u%`*!
zX>6-~8ZQ7dfAdQ(y;OJ_2E@cu%<iSL8`ug9z0KmQ|5@AeyL^zDXJLA0XQzoZ?YJ3#
zOen_W&J9AbhT^GUKU8wkfJOqgA1Pc-RM~)W6-+|4d-v|hTo*_TfS2b#kk6PtqD~RW
zw#&GB^=h5VAjb;n93|dlrl}&bK{LK1$#rBA?txSmV8k3rOoRexp9Jy_$=-8a1&TmM
z>N2ifyB2wwomiQ|s|;&K3L5tzCu(kD-ollLg#vELk|o9mmjxIr1~Btw_|7fKRiHS?
z#$|{l8<*jN#)7eCB7~yWi~voejsC|7iT$R94P2(}(E<+8MGHAwSTVDH0otb|SAk+X
z@4^siMMp=6X=rglzxwK{!HN|t%*<M43ak0%n{P~_G^ZgZuAKm@=LX@r2+zuhgI#ex
z@4WL)@b0_snu())k{h~4vVXWWJyjB9;?g$-@*)>7qM_%NS6&HTfBp5+FAQ;U)UJRW
z*G@o}7Le^B2W5--l2)!<8LVEtI^0q(0ZfU#QUEhmk5`G^&}z-{7>uz2Bi5HMUv8}V
z>8GC#xArViyIZwtm2nd>)o37Zl8m{MVrMvTYkaPlD(t8aFye9MP8Xd&;!YG#5-~9o
zL?r;mink>JM&5!?B^JC_3c;yT@{iNt-v%z9o2kHv3@Etpkv&BecI(!y3*LYK{cuZE
zQs7~PYvEMe;#VU}M#h?1a4i~9&15=A3aXwWo=l!lnt0=s){0T0B_p3TyJ9A8hGS6x
zQ4rnD0`QtOYs}<;SaY1jiurI|BP&J?AtQl2RI>2`+1qr6+h8ab|7bwP;%)`4fH!Q|
zVEl2M#EO~qYqeOhxANgC739#GN6OtBEug)<ki6PUAE5Ra(9(7{`Dhz36ZOSO08_hT
zGV0aBCDk+osURbPOfTv%0X<4Udz%*l&4i~kY7^U1Al~U#O%#D!pn$_gBv~+$>t`aV
ze~A@;SliNAsUdUM1T-yRW8&Nf!gVn9Ikhy>o$NlaUM!a=f>15V2P3g!{O`Zhx(QWk
z$jEXVBL#HgNK9JP?o{_-TQ3z2a*QKM0+`ulK9EF9TQ&d3rwZLhvw$8VpcCiGRrf(o
zTQrt^J7Ftaz|!DDTLca9jT8dT{TH5@A%|{*$$R>y0gZ()wJu{7Xqd-e(?>=mLPe%K
zfV*&MvShiD^`fGHQSKr1Gk@=jUvm2N=^18Y3d!%xFewHgQcI+{ly=`T8+m}LjZ556
zZZ0>PiA~~K(tIidFv<-Xg`m6sd0k+8NAASQ1x~`9pfoLPHcV})(<g?+cFF{jKr)}F
zRanTC@(1CCAgcrx7R?y6g#vn-*_crPXE30S$j6NU*@driVQQN*u=7Aw30$hnSa4~7
zbzcf(<XH6-f$betnN==)RZ*C(Lb$Zi5Ge1K{T7~_RaF{fRcO@=fn6YJVp*`OQk8I3
zr9)QT>9D&4uBtM~DhoCd2rtTz24yWI%aDMj-GR7`sVgbiDut`69I{GaGbEN;B5x%z
zmY_`%z_q)ZyfFL_B%>?Mz{yZ7Gj8~>Bqm=yC~&)N?xSvl?8<_!wGrB?eel!D2FU;u
zdvqnCM@M&pwRPJd$H@aft!^vGd%CBdt|0gyKx8$ajM?KN00000NkvXXu0mjfQ7V3M

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-1@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-1@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2df10655efabdb9eefbad32abd4be42deef4fb02
GIT binary patch
literal 1262
zcmeAS@N?(olHy`uVBq!ia0vp^IzXJo!3HFcw{9)~QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XBc7rhE@gG;rfNGjOT^vIy;@-}&_Lp`PXb?Yi*oMiei6eZX
zfU1z7(2@mSQC`1P_AA)8sp&2}q+9ADa#Dn?(LsUB;Y2`!gFxIQQK=JW?)7fIcf0!C
z+nap9Jtu!%`@YQnSn+i03$r45E<f95s-~`P@9>#T>A1DjarutZbLY;Te{PxcT!RyJ
zZO@dCM0Z@jaos^q!A~K~@t5^`#;ikmY5SiP?ezEKPxkls-&0#x$Cs07uar}t)w!Uu
zs=9jmgQrTVyJY_t9yB^|rf8PqHP*QodX>47&wet>5R2UIy8PBp6|Ul0KG&Kf4p$ti
zef#RwEFu0^FJ2@#J3HqjBs6?)y?E`}&JQe??!9~R=G(VvckkTU@cQ*@tDF1w?bFQ=
zdvWA5M|oM9-$OH56C<NT%a$*{dE`jTdY-SR-%sXwxLtnJ-o0nNmI_(h*pyVuC~<a6
z%E`;8fByVACoiw>yP%1t=SibYQ|{=?Z{M`((6s5(Zyr0wcHgbw9}rk2`tx>gYPtU;
z^W-Xl=i(nZl(jMs<p=Flee%y@)2Ghfik8`tVnESV&41LUMmxRZpDg<OsrS4NcZ(P5
zCNm>h?(<J_wK?RWoZ{+X7StBHX;aG`p`!X*n>vgRw^U5fQT9IZw=nhS-=x$TCxXIM
zJj4RIy4it_X}L2$WLlr|pA^CVf(!l`ULYyXvj!7e*YtSV1+^XR=gyp>BV>8FMKkha
z#jNns&f2Hja!N|R$eO%QTyB$h+41h(yF7W8H}Bq+-5+jiVX<QC)1sO8OCBGnSj=z!
z|IZ8+8CltlckjlQ6*cjn`k(SpaSN00%SVrr*tgprQkW%f+*4RudX)Xn?c1x5{`+Sq
zzCJ|D=5%v&v&|$WuE{#*c+EeQ9$IKxQ(u4H&);A2j>G2z>dZZ7&-#Yxh(#_8c(DHb
z`SU;j?dsU1#gsi`0{g_<n>QQBNo6Yb>nm|RUf(A7WbUDqjcdbJzxnuaV*YETetl)G
zcqa?d_d>4I3<{?T99Pde6fpnC>II=Ylyn^bG~H;@X6cX7JHB}N^5r~%NB@R4FLj)t
z6BK^<-Q<@_N6b4|UH>%fFj4hp@vQc<I%DF(`1EPR_HKdwKl}77R^(ZBu$)wqduY+o
zJZnXwXlH9?fR*88B@Z!Al{J&5=1+LE=vPa~r_S_=`jwfF&GVEVx}8+IWjbeD$&HFA
zQyso_)l)mF_)KEk4twYx-sSSQWs7moi)qd>Ta4~-2&K=+=#)~E3KRos__o(YBFc2m
zR-H)}hnM}Y{-!)}gV(mytR1RGYbI@#{HC~-C;jN@vm4$S$A)Y%o?{v%DVF(bHOoaI
zQy-H>I&pct>8)kF>Aj+6Bq855_J1#&y5qI<&~zbTV`Jl-va)IV>V917w#7zACj&D`
zUca;5{BV8YzNYyfZrqTNmXo^{CD!=brQqk$j~_SQew^TPLuJ#4`ua;BmkOUdedfT=
zf;hjJ#PgRrdBDs!_5!<0=N!F0iKYIjhm3<&w|-q<-OBExIz4|`-`mdZZe_Mq1eQ?@
Mp00i_>zopr0AYwh{{R30

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-2@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-2@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..eeb8ec0edf1953c6a8b036e6e33207bb99f84bf6
GIT binary patch
literal 3534
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
IM6N<$f*~28E&u=k

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-3@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-3@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ee73f503aa11548b1dc44347629007b288ceefb
GIT binary patch
literal 3456
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-4@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-4@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..eab26e36a0ff5c205b47d5ada6aeb28e4fa4d4bf
GIT binary patch
literal 3213
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-5@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-5@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8056248a4b34ca98047c3342539f2a4ed978e206
GIT binary patch
literal 3647
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
RUbX-L002ovPDHLkV1o42t)Tz_

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-6@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-6@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7ca3de273a41466b8bc1b774d99a233df2c5a9d
GIT binary patch
literal 4954
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
Y0}Si?p@f|xQvd(}07*qoM6N<$f<sJf00000

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-7@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-7@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..49541c422833a70bad7dea18b22c2b6c76cf4132
GIT binary patch
literal 2503
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
RiXs32002ovPDHLkV1fweeP{px

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-8@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-8@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..343b60f4755f84746ad32a7ca25961be48ba31d2
GIT binary patch
literal 5710
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
A#sB~S

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-9@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/display-9@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..53b687fdea4d84005a44887e130fff5044936aa1
GIT binary patch
literal 5195
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
FV1j9g503x<

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/skin.ini b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/skin.ini
index 49ac2cf80d..9d16267d73 100644
--- a/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/skin.ini
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/special-skin/skin.ini
@@ -1,3 +1,4 @@
 [General]
 Version: latest
 HitCircleOverlayAboveNumber: 0
+HitCirclePrefix: display
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index af02087d1a..30b0451a3b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("Hit Big Stream", () => SetContents(_ => testStream(2, true)));
             AddStep("Hit Medium Stream", () => SetContents(_ => testStream(5, true)));
             AddStep("Hit Small Stream", () => SetContents(_ => testStream(7, true)));
+            AddStep("High combo index", () => SetContents(_ => testSingle(2, true, comboIndex: 15)));
         }
 
         [Test]
@@ -66,12 +67,12 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("Hit Big Single", () => SetContents(_ => testSingle(2, true)));
         }
 
-        private Drawable testSingle(float circleSize, bool auto = false, double timeOffset = 0, Vector2? positionOffset = null)
+        private Drawable testSingle(float circleSize, bool auto = false, double timeOffset = 0, Vector2? positionOffset = null, int comboIndex = 0)
         {
             var playfield = new TestOsuPlayfield();
 
             for (double t = timeOffset; t < timeOffset + 60000; t += 2000)
-                playfield.Add(createSingle(circleSize, auto, t, positionOffset));
+                playfield.Add(createSingle(circleSize, auto, t, positionOffset, comboIndex: comboIndex));
 
             return playfield;
         }
@@ -84,14 +85,14 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             for (int i = 0; i <= 1000; i += 100)
             {
-                playfield.Add(createSingle(circleSize, auto, i, pos, hitOffset));
+                playfield.Add(createSingle(circleSize, auto, i, pos, hitOffset, i / 100 - 1));
                 pos.X += 50;
             }
 
             return playfield;
         }
 
-        private TestDrawableHitCircle createSingle(float circleSize, bool auto, double timeOffset, Vector2? positionOffset, double hitOffset = 0)
+        private TestDrawableHitCircle createSingle(float circleSize, bool auto, double timeOffset, Vector2? positionOffset, double hitOffset = 0, int comboIndex = 0)
         {
             positionOffset ??= Vector2.Zero;
 
@@ -99,6 +100,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + 1000 + timeOffset,
                 Position = OsuPlayfield.BASE_SIZE / 4 + positionOffset.Value,
+                IndexInCurrentCombo = comboIndex,
             };
 
             circle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });

From c9cb0561f7a2ac5117d9add6792e02b53014c1a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 19:48:10 +0200
Subject: [PATCH 1216/2296] Move `maxSizePerGlyph` optional ctor param to
 init-only property

I'm doing this as I'm about to add more similar properties to
`LegacySpriteText` and I don't want to create a twenty-argument
constructor monstrosity.
---
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs           | 3 ++-
 osu.Game/Skinning/LegacySpriteText.cs                     | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 1de8fefaae..c01d28c8e1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -145,10 +145,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                             return null;
 
                         const float hitcircle_text_scale = 0.8f;
-                        return new LegacySpriteText(LegacyFont.HitCircle, OsuHitObject.OBJECT_DIMENSIONS * 2 / hitcircle_text_scale)
+                        return new LegacySpriteText(LegacyFont.HitCircle)
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
                             Scale = new Vector2(hitcircle_text_scale),
+                            MaxSizePerGlyph = OsuHitObject.OBJECT_DIMENSIONS * 2 / hitcircle_text_scale,
                         };
 
                     case OsuSkinComponents.SpinnerBody:
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index 7eb92126fa..a803ef8747 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -12,8 +12,9 @@ namespace osu.Game.Skinning
 {
     public sealed partial class LegacySpriteText : OsuSpriteText
     {
+        public Vector2? MaxSizePerGlyph { get; init; }
+
         private readonly LegacyFont font;
-        private readonly Vector2? maxSizePerGlyph;
 
         private LegacyGlyphStore glyphStore = null!;
 
@@ -21,10 +22,9 @@ namespace osu.Game.Skinning
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(LegacyFont font, Vector2? maxSizePerGlyph = null)
+        public LegacySpriteText(LegacyFont font)
         {
             this.font = font;
-            this.maxSizePerGlyph = maxSizePerGlyph;
 
             Shadow = false;
             UseFullGlyphHeight = false;
@@ -36,7 +36,7 @@ namespace osu.Game.Skinning
             Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
 
-            glyphStore = new LegacyGlyphStore(skin, maxSizePerGlyph);
+            glyphStore = new LegacyGlyphStore(skin, MaxSizePerGlyph);
         }
 
         protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);

From 99e590c8dd645c58b2fa6197e2f9bd7b003b9e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 20:10:36 +0200
Subject: [PATCH 1217/2296] Fix legacy sprite texts not matching stable with
 respect to fixed width

stable's `pSpriteText` has a `TextConstantSpacing` flag, that is
selectively enabled for some usages. In particular, these are:

- mania combo counter (not yet implemented)
- taiko combo counter (not yet implemented)
- score counter
- accuracy counter
- scoreboard entries (not yet implemented)

Everything else uses non-fixed-width fonts.

Hilariously, `LegacySpinner` _tried_ to account for this by changing
`Font` to have `fixedWidth: false` specified, only to fail to notice
that `LegacySpriteText` changes `Font` in its BDL, making the property
set do precisely nothing. For this reason, attempting to set `Font`
on a `LegacySpriteText` will now throw.
---
 .../Skinning/Legacy/LegacySpinner.cs                |  4 ++--
 osu.Game/Skinning/LegacyAccuracyCounter.cs          |  1 +
 osu.Game/Skinning/LegacyScoreCounter.cs             |  1 +
 osu.Game/Skinning/LegacySpriteText.cs               | 13 ++++++++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 28acb4a996..5a95eac0f1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Origin = Anchor.Centre,
                         Scale = new Vector2(SPRITE_SCALE),
                         Y = SPINNER_TOP_OFFSET + 299,
-                    }.With(s => s.Font = s.Font.With(fixedWidth: false)),
+                    },
                     spmBackground = new Sprite
                     {
                         Anchor = Anchor.TopCentre,
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Origin = Anchor.TopRight,
                         Scale = new Vector2(SPRITE_SCALE * 0.9f),
                         Position = new Vector2(80, 448 + spm_hide_offset),
-                    }.With(s => s.Font = s.Font.With(fixedWidth: false)),
+                    },
                 }
             });
         }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 326257c25f..ed12292eb3 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Skinning
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
+            FixedWidth = true,
         };
     }
 }
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index d238369be1..a86f122836 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Skinning
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
+            FixedWidth = true,
         };
     }
 }
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index a803ef8747..041a32e8de 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.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.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
@@ -13,6 +14,7 @@ namespace osu.Game.Skinning
     public sealed partial class LegacySpriteText : OsuSpriteText
     {
         public Vector2? MaxSizePerGlyph { get; init; }
+        public bool FixedWidth { get; init; }
 
         private readonly LegacyFont font;
 
@@ -22,6 +24,15 @@ namespace osu.Game.Skinning
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
+        // ReSharper disable once UnusedMember.Global
+        // being unused is the point here
+        public new FontUsage Font
+        {
+            get => base.Font;
+            set => throw new InvalidOperationException(@"Attempting to use this setter will not work correctly. "
+                                                       + $@"Use specific init-only properties exposed by {nameof(LegacySpriteText)} instead.");
+        }
+
         public LegacySpriteText(LegacyFont font)
         {
             this.font = font;
@@ -33,7 +44,7 @@ namespace osu.Game.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
+            base.Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: FixedWidth);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
 
             glyphStore = new LegacyGlyphStore(skin, MaxSizePerGlyph);

From 2f9b50172e0b0f261a94585d2c525405a77eaa48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 22:09:33 +0200
Subject: [PATCH 1218/2296] Add failing test coverage for video events
 affecting storyboard time bounds

---
 .../Formats/LegacyStoryboardDecoderTest.cs    | 21 +++++++++++++++++++
 .../video-background-events-ignored.osb       |  5 +++++
 2 files changed, 26 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/video-background-events-ignored.osb

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 34ff8bfd84..647c0aed75 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -287,5 +287,26 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(manyTimes.EndTime, Is.EqualTo(9000 + loop_duration));
             }
         }
+
+        [Test]
+        public void TestVideoAndBackgroundEventsDoNotAffectStoryboardBounds()
+        {
+            var decoder = new LegacyStoryboardDecoder();
+
+            using var resStream = TestResources.OpenResource("video-background-events-ignored.osb");
+            using var stream = new LineBufferedReader(resStream);
+
+            var storyboard = decoder.Decode(stream);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(storyboard.GetLayer(@"Video").Elements, Has.Count.EqualTo(1));
+                Assert.That(storyboard.GetLayer(@"Video").Elements.Single(), Is.InstanceOf<StoryboardVideo>());
+                Assert.That(storyboard.GetLayer(@"Video").Elements.Single().StartTime, Is.EqualTo(-5678));
+
+                Assert.That(storyboard.EarliestEventTime, Is.Null);
+                Assert.That(storyboard.LatestEventTime, Is.Null);
+            });
+        }
     }
 }
diff --git a/osu.Game.Tests/Resources/video-background-events-ignored.osb b/osu.Game.Tests/Resources/video-background-events-ignored.osb
new file mode 100644
index 0000000000..7525b1fee9
--- /dev/null
+++ b/osu.Game.Tests/Resources/video-background-events-ignored.osb
@@ -0,0 +1,5 @@
+osu file format v14
+
+[Events]
+0,-1234,"BG.jpg",0,0
+Video,-5678,"Video.avi",0,0
\ No newline at end of file

From 9ce2c1f49c37e63d3d6c18b8fb854ee3b4766adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 27 Oct 2023 22:10:03 +0200
Subject: [PATCH 1219/2296] Exclude video events from being accounted for when
 calculating storyboard time bounds

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

In some circumstances, stable allows skipping twice if a particularly
long storyboarded intro is being displayed:

    https://github.com/peppy/osu-stable-reference/blob/master/osu!/GameModes/Play/Player.cs#L1728-L1736

`AllowDoubleSkip` is calculated thus:

    https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/GameModes/Play/Player.cs#L1761-L1770

and `leadInTime` is calculated thus:

    https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/GameModes/Play/Player.cs#L1342-L1351

The key to watch out for here is `{first,last}EventTime`. `EventManager`
will calculate it on-the-fly as it adds storyboard elements:

    https://github.com/peppy/osu-stable-reference/blob/3ea48705eb67172c430371dcfc8a16a002ed0d3d/osu!/GameplayElements/Events/EventManager.cs#L253-L256

However, this pathway is only used for sprite, animation, sample,
and break events. Video and background events use the following pathway:

    https://github.com/peppy/osu-stable-reference/blob/master/osu!/GameplayElements/Events/EventManager.cs#L368

Note that this particular overload does not mutate either bound.
Which means that for the purposes of determining where a storyboard
starts and ends temporally, a video event's start time is essentially
ignored.

To reflect that, add a clause that excludes video events from
calculations of `{Earliest,Latest}EventTime`.
---
 osu.Game/Storyboards/Storyboard.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 21342831b0..a3137fe1b1 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -30,8 +30,11 @@ namespace osu.Game.Storyboards
         /// </summary>
         /// <remarks>
         /// This iterates all elements and as such should be used sparingly or stored locally.
+        /// Video and background events are not included to match stable.
         /// </remarks>
-        public double? EarliestEventTime => Layers.SelectMany(l => l.Elements).MinBy(e => e.StartTime)?.StartTime;
+        public double? EarliestEventTime => Layers.SelectMany(l => l.Elements)
+                                                  .Where(e => e is not StoryboardVideo)
+                                                  .MinBy(e => e.StartTime)?.StartTime;
 
         /// <summary>
         /// Across all layers, find the latest point in time that a storyboard element ends at.
@@ -39,9 +42,12 @@ namespace osu.Game.Storyboards
         /// </summary>
         /// <remarks>
         /// This iterates all elements and as such should be used sparingly or stored locally.
-        /// Videos and samples return StartTime as their EndTIme.
+        /// Samples return StartTime as their EndTIme.
+        /// Video and background events are not included to match stable.
         /// </remarks>
-        public double? LatestEventTime => Layers.SelectMany(l => l.Elements).MaxBy(e => e.GetEndTime())?.GetEndTime();
+        public double? LatestEventTime => Layers.SelectMany(l => l.Elements)
+                                                .Where(e => e is not StoryboardVideo)
+                                                .MaxBy(e => e.GetEndTime())?.GetEndTime();
 
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.

From bac306879a4c2965b780c8588f97e95c24e354d0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 03:18:13 +0300
Subject: [PATCH 1220/2296] Minor reword on documentation

---
 osu.Game/Storyboards/Storyboard.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index a3137fe1b1..8c43b99702 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Storyboards
         /// </summary>
         /// <remarks>
         /// This iterates all elements and as such should be used sparingly or stored locally.
+        /// Sample events use their start time as "end time" during this calculation.
         /// Video and background events are not included to match stable.
         /// </remarks>
         public double? EarliestEventTime => Layers.SelectMany(l => l.Elements)
@@ -42,7 +43,7 @@ namespace osu.Game.Storyboards
         /// </summary>
         /// <remarks>
         /// This iterates all elements and as such should be used sparingly or stored locally.
-        /// Samples return StartTime as their EndTIme.
+        /// Sample events use their start time as "end time" during this calculation.
         /// Video and background events are not included to match stable.
         /// </remarks>
         public double? LatestEventTime => Layers.SelectMany(l => l.Elements)

From 51b7c97cabd8944cc7dfd840ae4a247d42efeca7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 06:07:49 +0300
Subject: [PATCH 1221/2296] Fix `TestScenePlayerMaxDimensions` bottlenecking CI

---
 .../Gameplay/TestScenePlayerMaxDimensions.cs  | 68 +++----------------
 1 file changed, 10 insertions(+), 58 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index 68443b234b..741fc7d789 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -72,66 +72,18 @@ namespace osu.Game.Tests.Visual.Gameplay
                 remove { }
             }
 
+            public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+            {
+                var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
+
+                if (texture != null)
+                    texture.ScaleAdjust /= scale_factor;
+
+                return texture;
+            }
+
             public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => this;
             public IEnumerable<ISkin> AllSources => new[] { this };
-
-            protected override IResourceStore<TextureUpload> CreateTextureLoaderStore(IStorageResourceProvider resources, IResourceStore<byte[]> storage)
-                => new UpscaledTextureLoaderStore(base.CreateTextureLoaderStore(resources, storage));
-
-            private class UpscaledTextureLoaderStore : IResourceStore<TextureUpload>
-            {
-                private readonly IResourceStore<TextureUpload>? textureStore;
-
-                public UpscaledTextureLoaderStore(IResourceStore<TextureUpload>? textureStore)
-                {
-                    this.textureStore = textureStore;
-                }
-
-                public void Dispose()
-                {
-                    textureStore?.Dispose();
-                }
-
-                public TextureUpload Get(string name)
-                {
-                    var textureUpload = textureStore?.Get(name);
-
-                    // NRT not enabled on framework side classes (IResourceStore / TextureLoaderStore), welp.
-                    if (textureUpload == null)
-                        return null!;
-
-                    return upscale(textureUpload);
-                }
-
-                public async Task<TextureUpload> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken())
-                {
-                    // NRT not enabled on framework side classes (IResourceStore / TextureLoaderStore), welp.
-                    if (textureStore == null)
-                        return null!;
-
-                    var textureUpload = await textureStore.GetAsync(name, cancellationToken).ConfigureAwait(false);
-
-                    if (textureUpload == null)
-                        return null!;
-
-                    return await Task.Run(() => upscale(textureUpload), cancellationToken).ConfigureAwait(false);
-                }
-
-                private TextureUpload upscale(TextureUpload textureUpload)
-                {
-                    var image = Image.LoadPixelData(textureUpload.Data.ToArray(), textureUpload.Width, textureUpload.Height);
-
-                    // The original texture upload will no longer be returned or used.
-                    textureUpload.Dispose();
-
-                    image.Mutate(i => i.Resize(new Size(textureUpload.Width, textureUpload.Height) * scale_factor));
-                    return new TextureUpload(image);
-                }
-
-                public Stream? GetStream(string name) => textureStore?.GetStream(name);
-
-                public IEnumerable<string> GetAvailableResources() => textureStore?.GetAvailableResources() ?? Array.Empty<string>();
-            }
         }
     }
 }

From a53c0adae077847112830952a025df3de4cdfe68 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 06:56:12 +0300
Subject: [PATCH 1222/2296] Remove unused using directive

---
 .../Visual/Gameplay/TestScenePlayerMaxDimensions.cs         | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index 741fc7d789..6665295e99 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -3,20 +3,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {

From 28e331deed1c27de3f6177b3fe779bf673cc4b97 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 08:29:46 +0300
Subject: [PATCH 1223/2296] Support displaying team seed in `TeamDisplay`

---
 .../TestSceneDrawableTournamentTeam.cs        |  5 +--
 .../TournamentTestScene.cs                    |  3 +-
 .../Gameplay/Components/TeamDisplay.cs        | 34 ++++++++++++++++---
 .../Gameplay/Components/TeamScoreDisplay.cs   |  5 ++-
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
index a809d0747a..8a50cbbe13 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Tournament.Tests.Components
             {
                 FlagName = { Value = "AU" },
                 FullName = { Value = "Australia" },
+                Seed = { Value = "#5" },
                 Players =
                 {
                     new TournamentUser { Username = "ASecretBox" },
@@ -30,7 +31,7 @@ namespace osu.Game.Tournament.Tests.Components
                     new TournamentUser { Username = "Parkes" },
                     new TournamentUser { Username = "Shiroha" },
                     new TournamentUser { Username = "Jordan The Bear" },
-                }
+                },
             };
 
             var match = new TournamentMatch { Team1 = { Value = team } };
@@ -100,7 +101,7 @@ namespace osu.Game.Tournament.Tests.Components
             Cell(i).AddRange(new Drawable[]
             {
                 new TournamentSpriteText { Text = "TeamDisplay" },
-                new TeamDisplay(team, TeamColour.Red, new Bindable<int?>(2), 6)
+                new TeamDisplay(team, TeamColour.Red, new Bindable<int?>(2), 6, true)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index f24fc61d85..4106556ee1 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Tournament.Tests
                     FlagName = { Value = "JP" },
                     FullName = { Value = "Japan" },
                     LastYearPlacing = { Value = 10 },
-                    Seed = { Value = "Low" },
+                    Seed = { Value = "#12" },
                     SeedingResults =
                     {
                         new SeedingResult
@@ -140,6 +140,7 @@ namespace osu.Game.Tournament.Tests
                     Acronym = { Value = "USA" },
                     FlagName = { Value = "US" },
                     FullName = { Value = "United States" },
+                    Seed = { Value = "#3" },
                     Players =
                     {
                         new TournamentUser { Username = "Hello" },
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 3fdbbb5973..7e63b5b8db 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -14,9 +14,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
     {
         private readonly TeamScore score;
 
-        private readonly TournamentSpriteTextWithBackground teamText;
+        private readonly TournamentSpriteTextWithBackground teamNameText;
+        private readonly TournamentSpriteTextWithBackground teamSeedText;
 
         private readonly Bindable<string> teamName = new Bindable<string>("???");
+        private readonly Bindable<string> teamSeed = new Bindable<string>();
 
         private bool showScore;
 
@@ -35,7 +37,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             }
         }
 
-        public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
+        public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin, bool displaySeed)
             : base(team)
         {
             AutoSizeAxes = Axes.Both;
@@ -95,11 +97,29 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                                             }
                                         }
                                     },
-                                    teamText = new TournamentSpriteTextWithBackground
+                                    new FillFlowContainer
                                     {
-                                        Scale = new Vector2(0.5f),
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(5),
                                         Origin = anchor,
                                         Anchor = anchor,
+                                        Children = new Drawable[]
+                                        {
+                                            teamNameText = new TournamentSpriteTextWithBackground
+                                            {
+                                                Scale = new Vector2(0.5f),
+                                                Origin = anchor,
+                                                Anchor = anchor,
+                                            },
+                                            teamSeedText = new TournamentSpriteTextWithBackground
+                                            {
+                                                Scale = new Vector2(0.5f),
+                                                Origin = anchor,
+                                                Anchor = anchor,
+                                                Alpha = displaySeed ? 1 : 0,
+                                            }
+                                        }
                                     },
                                 }
                             },
@@ -117,9 +137,13 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             FinishTransforms(true);
 
             if (Team != null)
+            {
                 teamName.BindTo(Team.FullName);
+                teamSeed.BindTo(Team.Seed);
+            }
 
-            teamName.BindValueChanged(name => teamText.Text.Text = name.NewValue, true);
+            teamName.BindValueChanged(name => teamNameText.Text.Text = name.NewValue, true);
+            teamSeed.BindValueChanged(seed => teamSeedText.Text.Text = seed.NewValue, true);
         }
 
         private void updateDisplay()
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
index c7fcfae602..9c2922d030 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private TeamDisplay? teamDisplay;
 
+        public readonly BindableBool DisplaySeed = new BindableBool();
+
         public bool ShowScore
         {
             get => teamDisplay?.ShowScore ?? false;
@@ -48,6 +50,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             currentMatch.BindValueChanged(matchChanged);
 
             currentTeam.BindValueChanged(teamChanged);
+            DisplaySeed.BindValueChanged(_ => currentTeam.TriggerChange());
 
             updateMatch();
         }
@@ -101,7 +104,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
             InternalChildren = new Drawable[]
             {
-                teamDisplay = new TeamDisplay(team.NewValue, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0),
+                teamDisplay = new TeamDisplay(team.NewValue, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0, DisplaySeed.Value),
             };
 
             teamDisplay.ShowScore = wasShowingScores;

From e2788a22b153ac5763c9d47a3534f719b4fde497 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 08:30:33 +0300
Subject: [PATCH 1224/2296] Add setting to configure team seed display

---
 osu.Game.Tournament/Models/LadderInfo.cs             |  2 ++
 .../Screens/Gameplay/Components/MatchHeader.cs       |  5 +++++
 .../Screens/Gameplay/GameplayScreen.cs               | 12 +++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Models/LadderInfo.cs b/osu.Game.Tournament/Models/LadderInfo.cs
index 219a2a7bfb..f96dae8044 100644
--- a/osu.Game.Tournament/Models/LadderInfo.cs
+++ b/osu.Game.Tournament/Models/LadderInfo.cs
@@ -42,5 +42,7 @@ namespace osu.Game.Tournament.Models
         public Bindable<bool> AutoProgressScreens = new BindableBool(true);
 
         public Bindable<bool> SplitMapPoolByMods = new BindableBool(true);
+
+        public Bindable<bool> DisplayTeamSeeds = new BindableBool();
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index 69f150c8ac..edf1d810ed 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -2,6 +2,7 @@
 // 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.Game.Tournament.Components;
@@ -16,6 +17,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private TeamScoreDisplay teamDisplay2 = null!;
         private DrawableTournamentHeaderLogo logo = null!;
 
+        public readonly BindableBool DisplaySeeds = new BindableBool();
+
         private bool showScores = true;
 
         public bool ShowScores
@@ -88,11 +91,13 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 {
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
+                    DisplaySeed = { BindTarget = DisplaySeeds },
                 },
                 teamDisplay2 = new TeamScoreDisplay(TeamColour.Blue)
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
+                    DisplaySeed = { BindTarget = DisplaySeeds },
                 },
             };
         }
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 20188cc5dc..76d7f27421 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private Drawable chroma = null!;
 
         [BackgroundDependencyLoader]
-        private void load(LadderInfo ladder, MatchIPCInfo ipc)
+        private void load(MatchIPCInfo ipc)
         {
             this.ipc = ipc;
 
@@ -118,12 +118,18 @@ namespace osu.Game.Tournament.Screens.Gameplay
                             LabelText = "Players per team",
                             Current = LadderInfo.PlayersPerTeam,
                             KeyboardStep = 1,
-                        }
+                        },
+                        new SettingsCheckbox
+                        {
+                            LabelText = "Display team seeds",
+                            Current = LadderInfo.DisplayTeamSeeds,
+                        },
                     }
                 }
             });
 
-            ladder.ChromaKeyWidth.BindValueChanged(width => chroma.Width = width.NewValue, true);
+            LadderInfo.ChromaKeyWidth.BindValueChanged(width => chroma.Width = width.NewValue, true);
+            LadderInfo.DisplayTeamSeeds.BindValueChanged(v => header.DisplaySeeds.Value = v.NewValue, true);
 
             warmup.BindValueChanged(w =>
             {

From 832e30c31a3e68891c23a5f22ad156a3a6224fc4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 08:30:59 +0300
Subject: [PATCH 1225/2296] Adjust horizontal padding in tournament sprite text

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

diff --git a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
index 97cb610021..ce118727cd 100644
--- a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
+++ b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Tournament.Components
                 {
                     Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR,
                     Font = OsuFont.Torus.With(weight: FontWeight.SemiBold, size: 50),
-                    Padding = new MarginPadding { Left = 10, Right = 20 },
-                    Text = text
+                    Padding = new MarginPadding { Horizontal = 10 },
+                    Text = text,
                 }
             };
         }

From 4371a1ab57a5bfb9549d948121bb15f5b1237ecd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 08:42:29 +0300
Subject: [PATCH 1226/2296] Move team seed setting from gameplay screen

---
 osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs | 9 ++-------
 osu.Game.Tournament/Screens/Setup/SetupScreen.cs       | 6 ++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 76d7f27421..3e5ba90c52 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -49,7 +49,8 @@ namespace osu.Game.Tournament.Screens.Gameplay
                 },
                 header = new MatchHeader
                 {
-                    ShowLogo = false
+                    ShowLogo = false,
+                    DisplaySeeds = { BindTarget = LadderInfo.DisplayTeamSeeds },
                 },
                 new Container
                 {
@@ -119,17 +120,11 @@ namespace osu.Game.Tournament.Screens.Gameplay
                             Current = LadderInfo.PlayersPerTeam,
                             KeyboardStep = 1,
                         },
-                        new SettingsCheckbox
-                        {
-                            LabelText = "Display team seeds",
-                            Current = LadderInfo.DisplayTeamSeeds,
-                        },
                     }
                 }
             });
 
             LadderInfo.ChromaKeyWidth.BindValueChanged(width => chroma.Width = width.NewValue, true);
-            LadderInfo.DisplayTeamSeeds.BindValueChanged(v => header.DisplaySeeds.Value = v.NewValue, true);
 
             warmup.BindValueChanged(w =>
             {
diff --git a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
index df1ce69c33..fed9d625ee 100644
--- a/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
@@ -140,6 +140,12 @@ namespace osu.Game.Tournament.Screens.Setup
                     Description = "Screens will progress automatically from gameplay -> results -> map pool",
                     Current = LadderInfo.AutoProgressScreens,
                 },
+                new LabelledSwitchButton
+                {
+                    Label = "Display team seeds",
+                    Description = "Team seeds will display alongside each team at the top in gameplay/map pool screens.",
+                    Current = LadderInfo.DisplayTeamSeeds,
+                },
             };
         }
 

From 81c1634d4453ad31acceaacd48c5d59a868b73a7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 08:42:40 +0300
Subject: [PATCH 1227/2296] Display team seeds in map pool screen as well

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index f80f43bb77..15c6fdb2ae 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                 new MatchHeader
                 {
                     ShowScores = true,
+                    DisplaySeeds = { BindTarget = LadderInfo.DisplayTeamSeeds },
                 },
                 mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
                 {

From 7083c04c5923a9f4494bcdaadfc70de656a33c4d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 09:25:55 +0300
Subject: [PATCH 1228/2296] Refactor logic slightly to display team seed
 everywhere

This change makes the team seed display in "team intro" screen as well.
---
 .../TestSceneDrawableTournamentTeam.cs        |  2 +-
 .../Components/DrawableTeamSeed.cs            | 39 +++++++++++++++++++
 .../Components/DrawableTeamTitleWithHeader.cs | 12 +++++-
 .../Gameplay/Components/MatchHeader.cs        |  5 ---
 .../Gameplay/Components/TeamDisplay.cs        | 13 ++-----
 .../Gameplay/Components/TeamScoreDisplay.cs   |  5 +--
 .../Screens/Gameplay/GameplayScreen.cs        |  1 -
 .../Screens/MapPool/MapPoolScreen.cs          |  1 -
 8 files changed, 55 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game.Tournament/Components/DrawableTeamSeed.cs

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
index 8a50cbbe13..a6eb482d02 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Tournament.Tests.Components
             Cell(i).AddRange(new Drawable[]
             {
                 new TournamentSpriteText { Text = "TeamDisplay" },
-                new TeamDisplay(team, TeamColour.Red, new Bindable<int?>(2), 6, true)
+                new TeamDisplay(team, TeamColour.Red, new Bindable<int?>(2), 6)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tournament/Components/DrawableTeamSeed.cs b/osu.Game.Tournament/Components/DrawableTeamSeed.cs
new file mode 100644
index 0000000000..a79c63e979
--- /dev/null
+++ b/osu.Game.Tournament/Components/DrawableTeamSeed.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Components
+{
+    public partial class DrawableTeamSeed : TournamentSpriteTextWithBackground
+    {
+        private readonly TournamentTeam? team;
+
+        private IBindable<string> seed = null!;
+        private Bindable<bool> displaySeed = null!;
+
+        public DrawableTeamSeed(TournamentTeam? team)
+        {
+            this.team = team;
+        }
+
+        [Resolved]
+        private LadderInfo ladder { get; set; } = null!;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (team == null)
+                return;
+
+            seed = team.Seed.GetBoundCopy();
+            seed.BindValueChanged(s => Text.Text = s.NewValue, true);
+
+            displaySeed = ladder.DisplayTeamSeeds.GetBoundCopy();
+            displaySeed.BindValueChanged(v => Alpha = v.NewValue ? 1 : 0, true);
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
index 89f45fc1d3..fc4037d4e1 100644
--- a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
@@ -22,7 +22,17 @@ namespace osu.Game.Tournament.Components
                 Children = new Drawable[]
                 {
                     new DrawableTeamHeader(colour),
-                    new DrawableTeamTitle(team),
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(5),
+                        Children = new Drawable[]
+                        {
+                            new DrawableTeamTitle(team),
+                            new DrawableTeamSeed(team),
+                        }
+                    }
                 }
             };
         }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index edf1d810ed..69f150c8ac 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.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.Game.Tournament.Components;
@@ -17,8 +16,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private TeamScoreDisplay teamDisplay2 = null!;
         private DrawableTournamentHeaderLogo logo = null!;
 
-        public readonly BindableBool DisplaySeeds = new BindableBool();
-
         private bool showScores = true;
 
         public bool ShowScores
@@ -91,13 +88,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 {
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
-                    DisplaySeed = { BindTarget = DisplaySeeds },
                 },
                 teamDisplay2 = new TeamScoreDisplay(TeamColour.Blue)
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    DisplaySeed = { BindTarget = DisplaySeeds },
                 },
             };
         }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 7e63b5b8db..49fbc64397 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -15,10 +15,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private readonly TeamScore score;
 
         private readonly TournamentSpriteTextWithBackground teamNameText;
-        private readonly TournamentSpriteTextWithBackground teamSeedText;
 
         private readonly Bindable<string> teamName = new Bindable<string>("???");
-        private readonly Bindable<string> teamSeed = new Bindable<string>();
 
         private bool showScore;
 
@@ -37,7 +35,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             }
         }
 
-        public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin, bool displaySeed)
+        public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
             : base(team)
         {
             AutoSizeAxes = Axes.Both;
@@ -112,13 +110,12 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                                                 Origin = anchor,
                                                 Anchor = anchor,
                                             },
-                                            teamSeedText = new TournamentSpriteTextWithBackground
+                                            new DrawableTeamSeed(Team)
                                             {
                                                 Scale = new Vector2(0.5f),
                                                 Origin = anchor,
                                                 Anchor = anchor,
-                                                Alpha = displaySeed ? 1 : 0,
-                                            }
+                                            },
                                         }
                                     },
                                 }
@@ -137,13 +134,9 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             FinishTransforms(true);
 
             if (Team != null)
-            {
                 teamName.BindTo(Team.FullName);
-                teamSeed.BindTo(Team.Seed);
-            }
 
             teamName.BindValueChanged(name => teamNameText.Text.Text = name.NewValue, true);
-            teamSeed.BindValueChanged(seed => teamSeedText.Text.Text = seed.NewValue, true);
         }
 
         private void updateDisplay()
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
index 9c2922d030..c7fcfae602 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private TeamDisplay? teamDisplay;
 
-        public readonly BindableBool DisplaySeed = new BindableBool();
-
         public bool ShowScore
         {
             get => teamDisplay?.ShowScore ?? false;
@@ -50,7 +48,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             currentMatch.BindValueChanged(matchChanged);
 
             currentTeam.BindValueChanged(teamChanged);
-            DisplaySeed.BindValueChanged(_ => currentTeam.TriggerChange());
 
             updateMatch();
         }
@@ -104,7 +101,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
             InternalChildren = new Drawable[]
             {
-                teamDisplay = new TeamDisplay(team.NewValue, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0, DisplaySeed.Value),
+                teamDisplay = new TeamDisplay(team.NewValue, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0),
             };
 
             teamDisplay.ShowScore = wasShowingScores;
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 3e5ba90c52..b2152eaf3d 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -50,7 +50,6 @@ namespace osu.Game.Tournament.Screens.Gameplay
                 header = new MatchHeader
                 {
                     ShowLogo = false,
-                    DisplaySeeds = { BindTarget = LadderInfo.DisplayTeamSeeds },
                 },
                 new Container
                 {
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 15c6fdb2ae..f80f43bb77 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -50,7 +50,6 @@ namespace osu.Game.Tournament.Screens.MapPool
                 new MatchHeader
                 {
                     ShowScores = true,
-                    DisplaySeeds = { BindTarget = LadderInfo.DisplayTeamSeeds },
                 },
                 mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
                 {

From e76a5f9419276d8eaa8bea22c899fd1aa651c80b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 10:18:15 +0300
Subject: [PATCH 1229/2296] Fix failing tests

---
 .../Components/TestSceneDrawableTournamentTeam.cs           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
index a6eb482d02..43adcc61bf 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Tests.Visual;
@@ -14,9 +15,14 @@ namespace osu.Game.Tournament.Tests.Components
 {
     public partial class TestSceneDrawableTournamentTeam : OsuGridTestScene
     {
+        [Cached]
+        protected LadderInfo Ladder { get; private set; } = new LadderInfo();
+
         public TestSceneDrawableTournamentTeam()
             : base(4, 3)
         {
+            AddToggleStep("toggle seed view", v => Ladder.DisplayTeamSeeds.Value = v);
+
             var team = new TournamentTeam
             {
                 FlagName = { Value = "AU" },

From cfc0520481df18553b7252f1f63149ee89e4c9e9 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Sat, 28 Oct 2023 12:13:13 +0200
Subject: [PATCH 1230/2296] Add failing test

---
 .../SongSelect/TestScenePlaySongSelect.cs      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 6737ec9739..7313bde8fe 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -13,6 +13,7 @@ using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
@@ -1111,6 +1112,23 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("0 matching shown", () => songSelect.ChildrenOfType<FilterControl>().Single().InformationalText == "0 matches");
         }
 
+        [Test]
+        public void TestCutInFilterTextBox()
+        {
+            createSongSelect();
+
+            AddStep("set filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
+            AddStep("select all", () => InputManager.Keys(PlatformAction.SelectAll));
+            AddStep("press ctrl-x", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.X);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+
+            AddAssert("filter text cleared", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text, () => Is.Empty);
+        }
+
         private void waitForInitialSelection()
         {
             AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);

From 366e41f11182c1220b2c8e33bc74172fa7543986 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Sat, 28 Oct 2023 12:23:23 +0200
Subject: [PATCH 1231/2296] Use local workaround instead of disabling clipboard
 entirely

---
 osu.Game/Screens/Select/FilterControl.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index b7dc18e46a..c15bd76ef8 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Collections;
@@ -23,6 +24,7 @@ using osu.Game.Rulesets;
 using osu.Game.Screens.Select.Filter;
 using osuTK;
 using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Select
 {
@@ -254,9 +256,6 @@ namespace osu.Game.Screens.Select
 
             public OsuSpriteText FilterText { get; private set; }
 
-            // clipboard is disabled because one of the "cut" platform key bindings (shift-delete) conflicts with the beatmap deletion action.
-            protected override bool AllowClipboardExport => false;
-
             public FilterControlTextBox()
             {
                 Height += filter_text_size;
@@ -277,6 +276,15 @@ namespace osu.Game.Screens.Select
                     Colour = colours.Yellow
                 });
             }
+
+            public override bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
+            {
+                // the "cut" platform key binding (shift-delete) conflicts with the beatmap deletion action.
+                if (e.Action == PlatformAction.Cut && e.ShiftPressed && e.CurrentState.Keyboard.Keys.IsPressed(Key.Delete))
+                    return false;
+
+                return base.OnPressed(e);
+            }
         }
     }
 }

From c38c8e933ab0aba67d7a36ccff1413cde465dd8e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 28 Oct 2023 16:52:33 +0300
Subject: [PATCH 1232/2296] Change tournament date text box parsing to use
 invariant culture info

---
 osu.Game.Tournament/Components/DateTextBox.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/DateTextBox.cs b/osu.Game.Tournament/Components/DateTextBox.cs
index ab643a5cb5..dd70d5856d 100644
--- a/osu.Game.Tournament/Components/DateTextBox.cs
+++ b/osu.Game.Tournament/Components/DateTextBox.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Globalization;
 using osu.Framework.Bindables;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
@@ -23,13 +24,13 @@ namespace osu.Game.Tournament.Components
             base.Current = new Bindable<string>(string.Empty);
 
             current.BindValueChanged(dto =>
-                base.Current.Value = dto.NewValue.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"), true);
+                base.Current.Value = dto.NewValue.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ", DateTimeFormatInfo.InvariantInfo), true);
 
             ((OsuTextBox)Control).OnCommit += (sender, _) =>
             {
                 try
                 {
-                    current.Value = DateTimeOffset.Parse(sender.Text);
+                    current.Value = DateTimeOffset.Parse(sender.Text, DateTimeFormatInfo.InvariantInfo);
                 }
                 catch
                 {

From d877536dc0ec8d1f8f1889be73740a58ef29f869 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 29 Oct 2023 01:03:38 +0300
Subject: [PATCH 1233/2296] Select all text content in `SearchTextBox` on focus

---
 osu.Game/Graphics/UserInterface/SearchTextBox.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index a2e0ab6482..b554c2bbd8 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -18,6 +18,12 @@ namespace osu.Game.Graphics.UserInterface
             PlaceholderText = HomeStrings.SearchPlaceholder;
         }
 
+        protected override void OnFocus(FocusEvent e)
+        {
+            base.OnFocus(e);
+            SelectAll();
+        }
+
         public override bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
         {
             switch (e.Action)

From 31c6973bb646272b3ddcb2b3405d1802c8bf770c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 29 Oct 2023 01:03:45 +0300
Subject: [PATCH 1234/2296] Add test coverage

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs
new file mode 100644
index 0000000000..153525d24a
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public partial class TestSceneSearchTextBox : OsuTestScene
+    {
+        private SearchTextBox textBox = null!;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = textBox = new SearchTextBox
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Width = 400,
+                Scale = new Vector2(2f),
+                HoldFocus = true,
+            };
+        });
+
+        [Test]
+        public void TestSelectionOnFocus()
+        {
+            AddStep("set text", () => textBox.Text = "some text");
+            AddAssert("no text selected", () => textBox.SelectedText == string.Empty);
+            AddStep("hide text box", () => textBox.Hide());
+            AddStep("show text box", () => textBox.Show());
+            AddAssert("search text selected", () => textBox.SelectedText == textBox.Text);
+        }
+    }
+}

From ec9ae12bbd880f2f9a1c31adca3d09e516d0dbb4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 29 Oct 2023 01:43:49 +0300
Subject: [PATCH 1235/2296] Update API response model to accept array of
 tournament banners

---
 .../Online/TestSceneUserProfileOverlay.cs     | 27 +++++++++++++++----
 .../Online/API/Requests/Responses/APIUser.cs  |  5 ++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index b57b0b7312..a321a194a9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -121,12 +121,29 @@ namespace osu.Game.Tests.Visual.Online
                     Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
                 },
             },
-            TournamentBanner = new TournamentBanner
+            TournamentBanners = new[]
             {
-                Id = 13926,
-                TournamentId = 35,
-                ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2022/profile/winner_US.jpg",
-                Image = "https://assets.ppy.sh/tournament-banners/official/owc2022/profile/winner_US@2x.jpg",
+                new TournamentBanner
+                {
+                    Id = 15588,
+                    TournamentId = 41,
+                    ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CN.jpg",
+                    Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CN@2x.jpg"
+                },
+                new TournamentBanner
+                {
+                    Id = 15589,
+                    TournamentId = 41,
+                    ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PH.jpg",
+                    Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PH@2x.jpg"
+                },
+                new TournamentBanner
+                {
+                    Id = 15590,
+                    TournamentId = 41,
+                    ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CL.jpg",
+                    Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CL@2x.jpg"
+                }
             },
             Badges = new[]
             {
diff --git a/osu.Game/Online/API/Requests/Responses/APIUser.cs b/osu.Game/Online/API/Requests/Responses/APIUser.cs
index d9208d0662..7c4093006d 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUser.cs
@@ -234,9 +234,8 @@ namespace osu.Game.Online.API.Requests.Responses
             set => Statistics.RankHistory = value;
         }
 
-        [JsonProperty(@"active_tournament_banner")]
-        [CanBeNull]
-        public TournamentBanner TournamentBanner;
+        [JsonProperty(@"active_tournament_banners")]
+        public TournamentBanner[] TournamentBanners;
 
         [JsonProperty("badges")]
         public Badge[] Badges;

From 922ad80cfc9faf6fd63a0a5f01a266247924c4f8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 29 Oct 2023 01:44:21 +0300
Subject: [PATCH 1236/2296] Update user profile overlay to show more than one
 tournament banner

---
 .../Profile/Header/BannerHeaderContainer.cs       | 15 ++++++++-------
 .../Header/Components/DrawableTournamentBanner.cs |  9 ++++++++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs
index 8e6648dc4b..7ed58200ec 100644
--- a/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.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.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,7 +12,7 @@ using osu.Game.Overlays.Profile.Header.Components;
 
 namespace osu.Game.Overlays.Profile.Header
 {
-    public partial class BannerHeaderContainer : CompositeDrawable
+    public partial class BannerHeaderContainer : FillFlowContainer
     {
         public readonly Bindable<UserProfileData?> User = new Bindable<UserProfileData?>();
 
@@ -19,9 +20,9 @@ namespace osu.Game.Overlays.Profile.Header
         private void load()
         {
             Alpha = 0;
-            RelativeSizeAxes = Axes.Both;
-            FillMode = FillMode.Fit;
-            FillAspectRatio = 1000 / 60f;
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
         }
 
         protected override void LoadComplete()
@@ -40,13 +41,13 @@ namespace osu.Game.Overlays.Profile.Header
 
             ClearInternal();
 
-            var banner = user?.TournamentBanner;
+            var banners = user?.TournamentBanners;
 
-            if (banner != null)
+            if (banners?.Length > 0)
             {
                 Show();
 
-                LoadComponentAsync(new DrawableTournamentBanner(banner), AddInternal, cancellationTokenSource.Token);
+                LoadComponentsAsync(banners.Select(b => new DrawableTournamentBanner(b)), AddRangeInternal, cancellationTokenSource.Token);
             }
             else
             {
diff --git a/osu.Game/Overlays/Profile/Header/Components/DrawableTournamentBanner.cs b/osu.Game/Overlays/Profile/Header/Components/DrawableTournamentBanner.cs
index 26d333ff95..c099009ca4 100644
--- a/osu.Game/Overlays/Profile/Header/Components/DrawableTournamentBanner.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/DrawableTournamentBanner.cs
@@ -15,12 +15,13 @@ namespace osu.Game.Overlays.Profile.Header.Components
     [LongRunningLoad]
     public partial class DrawableTournamentBanner : OsuClickableContainer
     {
+        private const float banner_aspect_ratio = 60 / 1000f;
         private readonly TournamentBanner banner;
 
         public DrawableTournamentBanner(TournamentBanner banner)
         {
             this.banner = banner;
-            RelativeSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
         }
 
         [BackgroundDependencyLoader]
@@ -41,6 +42,12 @@ namespace osu.Game.Overlays.Profile.Header.Components
             this.FadeInFromZero(200);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            Height = DrawWidth * banner_aspect_ratio;
+        }
+
         public override LocalisableString TooltipText => "view in browser";
     }
 }

From 204ebfade7ecaf5a426bfc21a6b89cfa6393fed8 Mon Sep 17 00:00:00 2001
From: Rowe Wilson Frederisk Holme <frederisk@outlook.com>
Date: Sun, 29 Oct 2023 21:25:15 +0800
Subject: [PATCH 1237/2296] Small update to README of Templates

---
 Templates/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/README.md b/Templates/README.md
index cf25a89273..28aaee3290 100644
--- a/Templates/README.md
+++ b/Templates/README.md
@@ -7,7 +7,7 @@ Templates for use when creating osu! dependent projects. Create a fully-testable
 ```bash
 # install (or update) templates package.
 # this only needs to be done once
-dotnet new -i ppy.osu.Game.Templates
+dotnet new install ppy.osu.Game.Templates
 
 # create an empty freeform ruleset
 dotnet new ruleset -n MyCoolRuleset

From af10dbb76c4b2ab6217655f7b0eeee124acc3635 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 30 Oct 2023 06:19:52 +0300
Subject: [PATCH 1238/2296] Add test case with many tournament banners

---
 .../Online/TestSceneUserProfileHeader.cs      | 266 +++++++++++++++++-
 1 file changed, 265 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
index 4f28baa849..c9e5a3315c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
@@ -5,8 +5,10 @@ using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
+using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Profile;
@@ -28,7 +30,14 @@ namespace osu.Game.Tests.Visual.Online
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("create header", () => Child = header = new ProfileHeader());
+            AddStep("create header", () =>
+            {
+                Child = new OsuScrollContainer(Direction.Vertical)
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = header = new ProfileHeader()
+                };
+            });
         }
 
         [Test]
@@ -136,5 +145,260 @@ namespace osu.Game.Tests.Visual.Online
                 PreviousUsernames = new[] { "tsrk.", "quoicoubeh", "apagnan", "epita" }
             }, new OsuRuleset().RulesetInfo));
         }
+
+        [Test]
+        public void TestManyTournamentBanners()
+        {
+            AddStep("Show user w/ many tournament banners", () => header.User.Value = new UserProfileData(new APIUser
+            {
+                Id = 728,
+                Username = "Certain Guy",
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c2.jpg",
+                Statistics = new UserStatistics
+                {
+                    IsRanked = false,
+                    // web will sometimes return non-empty rank history even for unranked users.
+                    RankHistory = new APIRankHistory
+                    {
+                        Mode = @"osu",
+                        Data = Enumerable.Range(2345, 85).ToArray()
+                    },
+                },
+                TournamentBanners = new[]
+                {
+                    new TournamentBanner
+                    {
+                        Id = 15329,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_HK.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_HK@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15588,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CN.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CN@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15589,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PH.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PH@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15590,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CL.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CL@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15591,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_JP.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_JP@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15592,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_RU.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_RU@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15593,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_KR.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_KR@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15594,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NZ.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NZ@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15595,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_TH.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_TH@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15596,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_TW.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_TW@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15603,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_ID.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_ID@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15604,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_KZ.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_KZ@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15605,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_AR.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_AR@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15606,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_BR.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_BR@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15607,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PL.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PL@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15639,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_MX.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_MX@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15640,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_AU.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_AU@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15641,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_IT.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_IT@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15642,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_UA.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_UA@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15643,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NL.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NL@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15644,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_FI.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_FI@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15645,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_RO.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_RO@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15646,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_SG.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_SG@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15647,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_DE.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_DE@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15648,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_ES.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_ES@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15649,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_SE.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_SE@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15650,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CA.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_CA@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15651,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NO.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_NO@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15652,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_GB.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_GB@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15653,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_US.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_US@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15654,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PL.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_PL@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15655,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_FR.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_FR@2x.jpg"
+                    },
+                    new TournamentBanner
+                    {
+                        Id = 15686,
+                        TournamentId = 41,
+                        ImageLowRes = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_HK.jpg",
+                        Image = "https://assets.ppy.sh/tournament-banners/official/owc2023/profile/supporter_HK@2x.jpg"
+                    }
+                }
+            }, new OsuRuleset().RulesetInfo));
+        }
     }
 }

From 984c30ded662bc6091c980dc6d6fcf1da880479e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 30 Oct 2023 06:20:13 +0300
Subject: [PATCH 1239/2296] Load each tournament banner as soon as it is loaded

---
 .../Overlays/Profile/Header/BannerHeaderContainer.cs  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs
index 7ed58200ec..424ab4a529 100644
--- a/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BannerHeaderContainer.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 System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -47,7 +46,15 @@ namespace osu.Game.Overlays.Profile.Header
             {
                 Show();
 
-                LoadComponentsAsync(banners.Select(b => new DrawableTournamentBanner(b)), AddRangeInternal, cancellationTokenSource.Token);
+                for (int index = 0; index < banners.Length; index++)
+                {
+                    int displayIndex = index;
+                    LoadComponentAsync(new DrawableTournamentBanner(banners[index]), asyncBanner =>
+                    {
+                        // load in stable order regardless of async load order.
+                        Insert(displayIndex, asyncBanner);
+                    }, cancellationTokenSource.Token);
+                }
             }
             else
             {

From c7bc8e686543e4fe6e823d06b5d79be144d8ad6e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 30 Oct 2023 06:41:01 +0300
Subject: [PATCH 1240/2296] Move behaviour to settings search text box only

---
 .../Visual/Settings/TestSceneSettingsPanel.cs  | 11 +++++++++++
 .../Graphics/UserInterface/SearchTextBox.cs    |  6 ------
 osu.Game/Overlays/SettingsPanel.cs             |  2 +-
 osu.Game/Overlays/SettingsSearchTextBox.cs     | 18 ++++++++++++++++++
 4 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Overlays/SettingsSearchTextBox.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
index 24c2eee783..69e489b247 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
@@ -140,6 +140,17 @@ namespace osu.Game.Tests.Visual.Settings
             AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<FocusedTextBox>().FirstOrDefault()?.HasFocus == true);
         }
 
+        [Test]
+        public void TestSearchTextBoxSelectedOnShow()
+        {
+            SearchTextBox searchTextBox = null!;
+
+            AddStep("set text", () => (searchTextBox = settings.SectionsContainer.ChildrenOfType<SearchTextBox>().First()).Current.Value = "some text");
+            AddAssert("no text selected", () => searchTextBox.SelectedText == string.Empty);
+            AddRepeatStep("toggle visibility", () => settings.ToggleVisibility(), 2);
+            AddAssert("search text selected", () => searchTextBox.SelectedText == searchTextBox.Current.Value);
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index b554c2bbd8..a2e0ab6482 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -18,12 +18,6 @@ namespace osu.Game.Graphics.UserInterface
             PlaceholderText = HomeStrings.SearchPlaceholder;
         }
 
-        protected override void OnFocus(FocusEvent e)
-        {
-            base.OnFocus(e);
-            SelectAll();
-        }
-
         public override bool OnPressed(KeyBindingPressEvent<PlatformAction> e)
         {
             switch (e.Action)
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 2517a58491..3bac6c400f 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Overlays
                         },
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
-                        Child = searchTextBox = new SeekLimitedSearchTextBox
+                        Child = searchTextBox = new SettingsSearchTextBox
                         {
                             RelativeSizeAxes = Axes.X,
                             Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/SettingsSearchTextBox.cs b/osu.Game/Overlays/SettingsSearchTextBox.cs
new file mode 100644
index 0000000000..bafa6e26eb
--- /dev/null
+++ b/osu.Game/Overlays/SettingsSearchTextBox.cs
@@ -0,0 +1,18 @@
+// 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.Input.Events;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays
+{
+    public partial class SettingsSearchTextBox : SeekLimitedSearchTextBox
+    {
+        protected override void OnFocus(FocusEvent e)
+        {
+            base.OnFocus(e);
+            SelectAll();
+        }
+    }
+}

From d90f29a5ff4a4618955b7ac7c4e743d39b4aa03a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 15:07:26 +0900
Subject: [PATCH 1241/2296] Improve log output surrounding score submission

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 5fa6508a31..a75546f835 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -188,7 +188,10 @@ namespace osu.Game.Screens.Play
         {
             // token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
             if (token == null)
+            {
+                Logger.Log("No token, skipping score submission");
                 return Task.CompletedTask;
+            }
 
             if (scoreSubmissionSource != null)
                 return scoreSubmissionSource.Task;
@@ -197,6 +200,8 @@ namespace osu.Game.Screens.Play
             if (!score.ScoreInfo.Statistics.Any(s => s.Key.IsHit() && s.Value > 0))
                 return Task.CompletedTask;
 
+            Logger.Log($"Beginning score submission (token:{token.Value})...");
+
             scoreSubmissionSource = new TaskCompletionSource<bool>();
             var request = CreateSubmissionRequest(score, token.Value);
 
@@ -206,11 +211,12 @@ namespace osu.Game.Screens.Play
                 score.ScoreInfo.Position = s.Position;
 
                 scoreSubmissionSource.SetResult(true);
+                Logger.Log($"Score submission completed! (token:{token.Value} id:{s.ID})");
             };
 
             request.Failure += e =>
             {
-                Logger.Error(e, $"Failed to submit score ({e.Message})");
+                Logger.Error(e, $"Failed to submit score (token:{token.Value}): {e.Message}");
                 scoreSubmissionSource.SetResult(false);
             };
 

From a8c3f598457ee9079ba97d2f381f75f7774890dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 15:07:35 +0900
Subject: [PATCH 1242/2296] Clean up type display for web requests in logs

---
 osu.Game/Online/API/APIRequest.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index cd6e8df754..6b6b222043 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -7,6 +7,7 @@ using System;
 using System.Globalization;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
 using osu.Game.Extensions;
@@ -46,7 +47,7 @@ namespace osu.Game.Online.API
             if (WebRequest != null)
             {
                 Response = ((OsuJsonWebRequest<T>)WebRequest).ResponseObject;
-                Logger.Log($"{GetType()} finished with response size of {WebRequest.ResponseStream.Length:#,0} bytes", LoggingTarget.Network);
+                Logger.Log($"{GetType().ReadableName()} finished with response size of {WebRequest.ResponseStream.Length:#,0} bytes", LoggingTarget.Network);
             }
         }
 

From a91b704d21df8adeca8068dd448d2ac9424010c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 15:10:10 +0900
Subject: [PATCH 1243/2296] Fix some new nullable inspections

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs                 | 8 ++------
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs            | 2 ++
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs | 2 ++
 osu.Game/Screens/Play/SquareGraph.cs                    | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index c62659d67a..3cb9b96090 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -49,13 +49,9 @@ namespace osu.Game.Rulesets.Osu.Objects
             set
             {
                 path.ControlPoints.Clear();
-                path.ExpectedDistance.Value = null;
+                path.ControlPoints.AddRange(value.ControlPoints.Select(c => new PathControlPoint(c.Position, c.Type)));
 
-                if (value != null)
-                {
-                    path.ControlPoints.AddRange(value.ControlPoints.Select(c => new PathControlPoint(c.Position, c.Type)));
-                    path.ExpectedDistance.Value = value.ExpectedDistance.Value;
-                }
+                path.ExpectedDistance.Value = value.ExpectedDistance.Value;
             }
         }
 
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 158c3c102c..3ed7558bcb 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -51,6 +52,7 @@ namespace osu.Game.Rulesets.Edit
 
         private SelectionState state;
 
+        [CanBeNull]
         public event Action<SelectionState> StateChanged;
 
         public SelectionState State
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 1506b884b4..85ea881006 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -166,6 +166,8 @@ namespace osu.Game.Screens.Backgrounds
 
             public override void Add(Drawable drawable)
             {
+                ArgumentNullException.ThrowIfNull(drawable);
+
                 if (drawable is Background)
                     throw new InvalidOperationException($"Use {nameof(Background)} to set a background.");
 
diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index b53e86a41b..0c7b485755 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -190,6 +191,7 @@ namespace osu.Game.Screens.Play
             private const float padding = 2;
             public const float WIDTH = cube_size + padding;
 
+            [CanBeNull]
             public event Action<ColumnState> StateChanged;
 
             private readonly List<Box> drawableRows = new List<Box>();

From 96dd7b3333014cb5e8e404d129b163de1f72f6e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 15:44:16 +0900
Subject: [PATCH 1244/2296] Update the last played date of a beatmap when
 importing a replay by the local user

---
 osu.Game.Tests/ImportTest.cs                |  4 ++
 osu.Game.Tests/Scores/IO/ImportScoreTest.cs | 59 +++++++++++++++++++++
 osu.Game/Online/API/DummyAPIAccess.cs       |  2 +-
 osu.Game/Scoring/ScoreImporter.cs           |  3 ++
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/ImportTest.cs b/osu.Game.Tests/ImportTest.cs
index 3f0f8a4f14..27b8d3f21e 100644
--- a/osu.Game.Tests/ImportTest.cs
+++ b/osu.Game.Tests/ImportTest.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Platform;
 using osu.Game.Database;
+using osu.Game.Online.API;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests
@@ -46,12 +47,15 @@ namespace osu.Game.Tests
         public partial class TestOsuGameBase : OsuGameBase
         {
             public RealmAccess Realm => Dependencies.Get<RealmAccess>();
+            public new IAPIProvider API => base.API;
 
             private readonly bool withBeatmap;
 
             public TestOsuGameBase(bool withBeatmap)
             {
                 this.withBeatmap = withBeatmap;
+
+                base.API = new DummyAPIAccess();
             }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index 892ceea185..d1bacaaf69 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -12,6 +12,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Platform;
 using osu.Game.IO.Archives;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -67,6 +68,64 @@ namespace osu.Game.Tests.Scores.IO
             }
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestLastPlayedUpdate(bool isLocalUser)
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host, true);
+
+                    if (!isLocalUser)
+                        osu.API.Logout();
+
+                    var beatmap = BeatmapImportHelper.LoadOszIntoOsu(osu, TestResources.GetQuickTestBeatmapForImport()).GetResultSafely();
+                    var beatmapInfo = beatmap.Beatmaps.First();
+
+                    DateTimeOffset replayDate = DateTimeOffset.Now;
+
+                    var toImport = new ScoreInfo
+                    {
+                        Rank = ScoreRank.B,
+                        TotalScore = 987654,
+                        Accuracy = 0.8,
+                        MaxCombo = 500,
+                        Combo = 250,
+                        User = new APIUser
+                        {
+                            Username = "Test user",
+                            Id = DummyAPIAccess.DUMMY_USER_ID,
+                        },
+                        Date = replayDate,
+                        OnlineID = 12345,
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapInfo = beatmapInfo
+                    };
+
+                    var imported = LoadScoreIntoOsu(osu, toImport);
+
+                    Assert.AreEqual(toImport.Rank, imported.Rank);
+                    Assert.AreEqual(toImport.TotalScore, imported.TotalScore);
+                    Assert.AreEqual(toImport.Accuracy, imported.Accuracy);
+                    Assert.AreEqual(toImport.MaxCombo, imported.MaxCombo);
+                    Assert.AreEqual(toImport.User.Username, imported.User.Username);
+                    Assert.AreEqual(toImport.Date, imported.Date);
+                    Assert.AreEqual(toImport.OnlineID, imported.OnlineID);
+
+                    if (isLocalUser)
+                        Assert.That(imported.BeatmapInfo!.LastPlayed, Is.EqualTo(replayDate));
+                    else
+                        Assert.That(imported.BeatmapInfo!.LastPlayed, Is.Null);
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         [Test]
         public void TestImportMods()
         {
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 2764247f5c..d585124db6 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Online.API
             LocalUser.Value = new APIUser
             {
                 Username = username,
-                Id = 1001,
+                Id = DUMMY_USER_ID,
             };
 
             state.Value = APIState.Online;
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 7473d887c3..32a528f218 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -87,6 +87,9 @@ namespace osu.Game.Scoring
             if (!model.Ruleset.IsManaged)
                 model.Ruleset = realm.Find<RulesetInfo>(model.Ruleset.ShortName)!;
 
+            if (api.IsLoggedIn && api.LocalUser.Value.OnlineID == model.UserID && (model.BeatmapInfo.LastPlayed == null || model.Date > model.BeatmapInfo.LastPlayed))
+                model.BeatmapInfo.LastPlayed = model.Date;
+
             // These properties are known to be non-null, but these final checks ensure a null hasn't come from somewhere (or the refetch has failed).
             // Under no circumstance do we want these to be written to realm as null.
             ArgumentNullException.ThrowIfNull(model.BeatmapInfo);

From c1c8e2968f1f620851c4e608043051f07b944d8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 15:46:09 +0900
Subject: [PATCH 1245/2296] Move operation to after user population

---
 osu.Game/Scoring/ScoreImporter.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 32a528f218..b216c0897e 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -87,9 +87,6 @@ namespace osu.Game.Scoring
             if (!model.Ruleset.IsManaged)
                 model.Ruleset = realm.Find<RulesetInfo>(model.Ruleset.ShortName)!;
 
-            if (api.IsLoggedIn && api.LocalUser.Value.OnlineID == model.UserID && (model.BeatmapInfo.LastPlayed == null || model.Date > model.BeatmapInfo.LastPlayed))
-                model.BeatmapInfo.LastPlayed = model.Date;
-
             // These properties are known to be non-null, but these final checks ensure a null hasn't come from somewhere (or the refetch has failed).
             // Under no circumstance do we want these to be written to realm as null.
             ArgumentNullException.ThrowIfNull(model.BeatmapInfo);
@@ -185,6 +182,12 @@ namespace osu.Game.Scoring
             base.PostImport(model, realm, parameters);
 
             populateUserDetails(model);
+
+            Debug.Assert(model.BeatmapInfo != null);
+
+            // This needs to be run after user detail population to ensure we have a valid user id.
+            if (api.IsLoggedIn && api.LocalUser.Value.OnlineID == model.UserID && (model.BeatmapInfo.LastPlayed == null || model.Date > model.BeatmapInfo.LastPlayed))
+                model.BeatmapInfo.LastPlayed = model.Date;
         }
 
         /// <summary>

From 4ae9b40a7806d6637840c25349282f07ef6d66e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 16:35:14 +0900
Subject: [PATCH 1246/2296] Update resources

---
 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 bf0a1fcbad..4f03f398d5 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1023.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1030.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.33.0" />

From 0dfb41b7966de7823982f3f18b2a5adfa38ac1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 09:28:37 +0100
Subject: [PATCH 1247/2296] Add test coverage for not updating `LastPlayed` due
 to newer plays

---
 osu.Game.Tests/Scores/IO/ImportScoreTest.cs | 54 +++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index d1bacaaf69..dd724d268e 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -11,6 +11,8 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Platform;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
@@ -126,6 +128,58 @@ namespace osu.Game.Tests.Scores.IO
             }
         }
 
+        [Test]
+        public void TestLastPlayedNotUpdatedDueToNewerPlays()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host, true);
+
+                    var beatmap = BeatmapImportHelper.LoadOszIntoOsu(osu, TestResources.GetQuickTestBeatmapForImport()).GetResultSafely();
+                    var beatmapInfo = beatmap.Beatmaps.First();
+
+                    var realmAccess = osu.Dependencies.Get<RealmAccess>();
+                    realmAccess.Write(r => r.Find<BeatmapInfo>(beatmapInfo.ID)!.LastPlayed = new DateTimeOffset(2023, 10, 30, 0, 0, 0, TimeSpan.Zero));
+
+                    var toImport = new ScoreInfo
+                    {
+                        Rank = ScoreRank.B,
+                        TotalScore = 987654,
+                        Accuracy = 0.8,
+                        MaxCombo = 500,
+                        Combo = 250,
+                        User = new APIUser
+                        {
+                            Username = "Test user",
+                            Id = DummyAPIAccess.DUMMY_USER_ID,
+                        },
+                        Date = new DateTimeOffset(2023, 10, 27, 0, 0, 0, TimeSpan.Zero),
+                        OnlineID = 12345,
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                        BeatmapInfo = beatmapInfo
+                    };
+
+                    var imported = LoadScoreIntoOsu(osu, toImport);
+
+                    Assert.AreEqual(toImport.Rank, imported.Rank);
+                    Assert.AreEqual(toImport.TotalScore, imported.TotalScore);
+                    Assert.AreEqual(toImport.Accuracy, imported.Accuracy);
+                    Assert.AreEqual(toImport.MaxCombo, imported.MaxCombo);
+                    Assert.AreEqual(toImport.User.Username, imported.User.Username);
+                    Assert.AreEqual(toImport.Date, imported.Date);
+                    Assert.AreEqual(toImport.OnlineID, imported.OnlineID);
+
+                    Assert.That(imported.BeatmapInfo!.LastPlayed, Is.EqualTo(new DateTimeOffset(2023, 10, 30, 0, 0, 0, TimeSpan.Zero)));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         [Test]
         public void TestImportMods()
         {

From 39abb8e4085d17bc8ff64a80f19e268a3d4a5b7f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 30 Oct 2023 11:54:19 +0300
Subject: [PATCH 1248/2296] Only run "select all on focus" behaviour on desktop
 platforms

---
 osu.Game/Overlays/SettingsSearchTextBox.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SettingsSearchTextBox.cs b/osu.Game/Overlays/SettingsSearchTextBox.cs
index bafa6e26eb..84cff1b508 100644
--- a/osu.Game/Overlays/SettingsSearchTextBox.cs
+++ b/osu.Game/Overlays/SettingsSearchTextBox.cs
@@ -12,7 +12,11 @@ namespace osu.Game.Overlays
         protected override void OnFocus(FocusEvent e)
         {
             base.OnFocus(e);
-            SelectAll();
+
+            // on mobile platforms, focus is not held by the search text box, and the select all feature
+            // will not make sense on it, and might annoy the user when they try to focus manually.
+            if (HoldFocus)
+                SelectAll();
         }
     }
 }

From 6be02966b9e79dfbb94ad372b932decc78ee65f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 18:06:09 +0900
Subject: [PATCH 1249/2296] Add test coverage of failing context menu display

---
 .../Editing/TestSceneTimelineSelection.cs     | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
index 50eeb9a54b..0051488029 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
@@ -7,8 +7,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
@@ -44,6 +46,47 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        [Test]
+        public void TestContextMenuWithObjectBehind()
+        {
+            TimelineHitObjectBlueprint blueprint;
+
+            AddStep("add object", () =>
+            {
+                EditorBeatmap.Add(new HitCircle { StartTime = 3000 });
+            });
+
+            AddStep("enter slider placement", () =>
+            {
+                InputManager.Key(Key.Number3);
+                InputManager.MoveMouseTo(ScreenSpaceDrawQuad.Centre);
+            });
+
+            AddStep("start conflicting slider", () =>
+            {
+                InputManager.Click(MouseButton.Left);
+
+                blueprint = this.ChildrenOfType<TimelineHitObjectBlueprint>().First();
+                InputManager.MoveMouseTo(blueprint.ScreenSpaceDrawQuad.TopLeft - new Vector2(10, 0));
+            });
+
+            AddStep("end conflicting slider", () =>
+            {
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddStep("click object", () =>
+            {
+                InputManager.Key(Key.Number1);
+                blueprint = this.ChildrenOfType<TimelineHitObjectBlueprint>().First();
+                InputManager.MoveMouseTo(blueprint);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
+            AddAssert("context menu open", () => this.ChildrenOfType<OsuContextMenu>().SingleOrDefault()?.State == MenuState.Open);
+        }
+
         [Test]
         public void TestNudgeSelection()
         {

From 57d88a0ac459398a14aafd8923238ce1bc012e7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 17:46:04 +0900
Subject: [PATCH 1250/2296] Fix right clicks on timeline objects potentially
 getting eaten by playfield area

`SelectionHandler` is receiving input from anywhere out of necessity:

https://github.com/ppy/osu/blob/19f892687a0607afbe4e0d010366dc2a66236073/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs#L119-L125

Also important is that `BlueprintContainer` will selectively not block
right clicks to make sure they fall through to the
`ContextMenuContainer`:

https://github.com/ppy/osu/blob/19f892687a0607afbe4e0d010366dc2a66236073/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs#L122-L126

But because the whole editor is sharing a `ContextMenuContainer` and
it's at a higher level than both components, we observe here the
playfield's `SelectionHandler` intercepting the right click before it
can reach the `ContextMenuContainer`.

The fix here is similar to what we're already doing in
`TimelineBlueprintContaienr`.
---
 .../Compose/Components/ComposeBlueprintContainer.cs |  5 ++++-
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs   | 13 +++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index c8cfac454a..ba570a9251 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -40,11 +40,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public PlacementBlueprint CurrentPlacement { get; private set; }
 
+        [Resolved]
+        private EditorScreenWithTimeline editorScreen { get; set; }
+
         /// <remarks>
         /// Positional input must be received outside the container's bounds,
         /// in order to handle composer blueprints which are partially offscreen.
         /// </remarks>
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => editorScreen.MainContent.ReceivePositionalInputAt(screenSpacePos);
 
         public ComposeBlueprintContainer(HitObjectComposer composer)
             : base(composer)
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index ea2790b50a..e1ec1ad4ac 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -11,13 +11,14 @@ using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
 namespace osu.Game.Screens.Edit
 {
+    [Cached]
     public abstract partial class EditorScreenWithTimeline : EditorScreen
     {
         public const float PADDING = 10;
 
-        private Container timelineContainer = null!;
+        public Container TimelineContent = null!;
 
-        private Container mainContent = null!;
+        public Container MainContent = null!;
 
         private LoadingSpinner spinner = null!;
 
@@ -70,7 +71,7 @@ namespace osu.Game.Screens.Edit
                                         {
                                             new Drawable[]
                                             {
-                                                timelineContainer = new Container
+                                                TimelineContent = new Container
                                                 {
                                                     RelativeSizeAxes = Axes.X,
                                                     AutoSizeAxes = Axes.Y,
@@ -93,7 +94,7 @@ namespace osu.Game.Screens.Edit
                     },
                     new Drawable[]
                     {
-                        mainContent = new Container
+                        MainContent = new Container
                         {
                             Name = "Main content",
                             RelativeSizeAxes = Axes.Both,
@@ -116,10 +117,10 @@ namespace osu.Game.Screens.Edit
             {
                 spinner.State.Value = Visibility.Hidden;
 
-                mainContent.Add(content);
+                MainContent.Add(content);
                 content.FadeInFromZero(300, Easing.OutQuint);
 
-                LoadComponentAsync(new TimelineArea(CreateTimelineContent()), timelineContainer.Add);
+                LoadComponentAsync(new TimelineArea(CreateTimelineContent()), TimelineContent.Add);
             });
         }
 

From 63e6eaf53880e326d43a75efec66134bb36bfe30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Oct 2023 17:55:21 +0900
Subject: [PATCH 1251/2296] Fix failing tests

---
 osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs   | 2 +-
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
index 0051488029..d8219ff36e 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineSelection.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("click away", () =>
             {
-                InputManager.MoveMouseTo(Editor.ChildrenOfType<TimelineArea>().Single().ScreenSpaceDrawQuad.TopLeft + Vector2.One);
+                InputManager.MoveMouseTo(Editor.ChildrenOfType<Timeline>().First().ScreenSpaceDrawQuad.TopLeft + new Vector2(5));
                 InputManager.Click(MouseButton.Left);
             });
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index ba570a9251..c7c7c4aa83 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -40,14 +40,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public PlacementBlueprint CurrentPlacement { get; private set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private EditorScreenWithTimeline editorScreen { get; set; }
 
         /// <remarks>
         /// Positional input must be received outside the container's bounds,
         /// in order to handle composer blueprints which are partially offscreen.
         /// </remarks>
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => editorScreen.MainContent.ReceivePositionalInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => editorScreen?.MainContent.ReceivePositionalInputAt(screenSpacePos) ?? base.ReceivePositionalInputAt(screenSpacePos);
 
         public ComposeBlueprintContainer(HitObjectComposer composer)
             : base(composer)

From 0ed5f274f6e45ea22401a50e905e2a1d3406f170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 10:48:31 +0100
Subject: [PATCH 1252/2296] Enable NRT in `TestSceneSliderVelocityAdjust`

---
 .../Editor/TestSceneSliderVelocityAdjust.cs   | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
index bb8c52bdfc..d92c6ebb60 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.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.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
@@ -24,15 +22,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
     public partial class TestSceneSliderVelocityAdjust : OsuGameTestScene
     {
-        private Screens.Edit.Editor editor => Game.ScreenStack.CurrentScreen as Screens.Edit.Editor;
+        private Screens.Edit.Editor? editor => Game.ScreenStack.CurrentScreen as Screens.Edit.Editor;
 
-        private EditorBeatmap editorBeatmap => editor.ChildrenOfType<EditorBeatmap>().FirstOrDefault();
+        private EditorBeatmap editorBeatmap => editor.ChildrenOfType<EditorBeatmap>().FirstOrDefault()!;
 
-        private EditorClock editorClock => editor.ChildrenOfType<EditorClock>().FirstOrDefault();
+        private EditorClock editorClock => editor.ChildrenOfType<EditorClock>().FirstOrDefault()!;
 
-        private Slider slider => editorBeatmap.HitObjects.OfType<Slider>().FirstOrDefault();
+        private Slider? slider => editorBeatmap.HitObjects.OfType<Slider>().FirstOrDefault();
 
-        private TimelineHitObjectBlueprint blueprint => editor.ChildrenOfType<TimelineHitObjectBlueprint>().FirstOrDefault();
+        private TimelineHitObjectBlueprint blueprint => editor.ChildrenOfType<TimelineHitObjectBlueprint>().FirstOrDefault()!;
 
         private DifficultyPointPiece difficultyPointPiece => blueprint.ChildrenOfType<DifficultyPointPiece>().First();
 
@@ -66,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddAssert("ensure one slider placed", () => slider != null);
 
-            AddStep("store velocity", () => velocity = slider.Velocity);
+            AddStep("store velocity", () => velocity = slider!.Velocity);
 
             if (adjustVelocity)
             {
@@ -76,10 +74,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 AddAssert("velocity adjusted", () =>
                 {
                     Debug.Assert(velocity != null);
-                    return Precision.AlmostEquals(velocity.Value * 2, slider.Velocity);
+                    return Precision.AlmostEquals(velocity.Value * 2, slider!.Velocity);
                 });
 
-                AddStep("store velocity", () => velocity = slider.Velocity);
+                AddStep("store velocity", () => velocity = slider!.Velocity);
             }
 
             AddStep("save", () => InputManager.Keys(PlatformAction.Save));
@@ -88,8 +86,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("enter editor (again)", () => Game.ScreenStack.Push(new EditorLoader()));
             AddUntilStep("wait for editor load", () => editor?.ReadyForUse == true);
 
-            AddStep("seek to slider", () => editorClock.Seek(slider.StartTime));
-            AddAssert("slider has correct velocity", () => slider.Velocity == velocity);
+            AddStep("seek to slider", () => editorClock.Seek(slider!.StartTime));
+            AddAssert("slider has correct velocity", () => slider!.Velocity == velocity);
         }
     }
 }

From e1ff0d12c66db4c2f16bc5d88fdb568dd5341bf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 10:55:26 +0100
Subject: [PATCH 1253/2296] Update tests to NUnit-style assertions

---
 .../Editor/TestSceneSliderVelocityAdjust.cs    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
index d92c6ebb60..979801bc41 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.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.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Input;
@@ -45,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             double? velocity = null;
 
             AddStep("enter editor", () => Game.ScreenStack.Push(new EditorLoader()));
-            AddUntilStep("wait for editor load", () => editor?.ReadyForUse == true);
+            AddUntilStep("wait for editor load", () => editor?.ReadyForUse, () => Is.True);
 
             AddStep("seek to first control point", () => editorClock.Seek(editorBeatmap.ControlPointInfo.TimingPoints.First().Time));
             AddStep("enter slider placement mode", () => InputManager.Key(Key.Number3));
@@ -58,11 +57,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("exit placement mode", () => InputManager.Key(Key.Number1));
 
-            AddAssert("slider placed", () => slider != null);
+            AddAssert("slider placed", () => slider, () => Is.Not.Null);
 
             AddStep("select slider", () => editorBeatmap.SelectedHitObjects.Add(slider));
 
-            AddAssert("ensure one slider placed", () => slider != null);
+            AddAssert("ensure one slider placed", () => slider, () => Is.Not.Null);
 
             AddStep("store velocity", () => velocity = slider!.Velocity);
 
@@ -71,11 +70,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 AddStep("open velocity adjust panel", () => difficultyPointPiece.TriggerClick());
                 AddStep("change velocity", () => velocityTextBox.Current.Value = 2);
 
-                AddAssert("velocity adjusted", () =>
-                {
-                    Debug.Assert(velocity != null);
-                    return Precision.AlmostEquals(velocity.Value * 2, slider!.Velocity);
-                });
+                AddAssert("velocity adjusted", () => slider!.Velocity,
+                    () => Is.EqualTo(velocity!.Value * 2).Within(Precision.DOUBLE_EPSILON));
 
                 AddStep("store velocity", () => velocity = slider!.Velocity);
             }
@@ -84,10 +80,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("exit", () => InputManager.Key(Key.Escape));
 
             AddStep("enter editor (again)", () => Game.ScreenStack.Push(new EditorLoader()));
-            AddUntilStep("wait for editor load", () => editor?.ReadyForUse == true);
+            AddUntilStep("wait for editor load", () => editor?.ReadyForUse, () => Is.True);
 
             AddStep("seek to slider", () => editorClock.Seek(slider!.StartTime));
-            AddAssert("slider has correct velocity", () => slider!.Velocity == velocity);
+            AddAssert("slider has correct velocity", () => slider!.Velocity, () => Is.EqualTo(velocity));
         }
     }
 }

From b3369dbb7b188d99f226894924a70339478c21b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 10:57:48 +0100
Subject: [PATCH 1254/2296] Add failing test for slider velocity

---
 .../Editor/TestSceneSliderVelocityAdjust.cs   | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
index 979801bc41..175cbeca6e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderVelocityAdjust.cs
@@ -85,5 +85,50 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("seek to slider", () => editorClock.Seek(slider!.StartTime));
             AddAssert("slider has correct velocity", () => slider!.Velocity, () => Is.EqualTo(velocity));
         }
+
+        [Test]
+        public void TestVelocityUndo()
+        {
+            double? velocityBefore = null;
+            double? durationBefore = null;
+
+            AddStep("enter editor", () => Game.ScreenStack.Push(new EditorLoader()));
+            AddUntilStep("wait for editor load", () => editor?.ReadyForUse == true);
+
+            AddStep("seek to first control point", () => editorClock.Seek(editorBeatmap.ControlPointInfo.TimingPoints.First().Time));
+            AddStep("enter slider placement mode", () => InputManager.Key(Key.Number3));
+
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(editor.ChildrenOfType<Playfield>().First().ScreenSpaceDrawQuad.Centre));
+            AddStep("start placement", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("move mouse to bottom right", () => InputManager.MoveMouseTo(editor.ChildrenOfType<Playfield>().First().ScreenSpaceDrawQuad.BottomRight - new Vector2(10)));
+            AddStep("end placement", () => InputManager.Click(MouseButton.Right));
+
+            AddStep("exit placement mode", () => InputManager.Key(Key.Number1));
+
+            AddAssert("slider placed", () => slider, () => Is.Not.Null);
+            AddStep("select slider", () => editorBeatmap.SelectedHitObjects.Add(slider));
+
+            AddStep("store velocity", () =>
+            {
+                velocityBefore = slider!.Velocity;
+                durationBefore = slider.Duration;
+            });
+
+            AddStep("open velocity adjust panel", () => difficultyPointPiece.TriggerClick());
+            AddStep("change velocity", () => velocityTextBox.Current.Value = 2);
+
+            AddAssert("velocity adjusted", () => slider!.Velocity, () => Is.EqualTo(velocityBefore!.Value * 2).Within(Precision.DOUBLE_EPSILON));
+
+            AddStep("undo", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.Z);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+
+            AddAssert("slider has correct velocity", () => slider!.Velocity, () => Is.EqualTo(velocityBefore));
+            AddAssert("slider has correct duration", () => slider!.Duration, () => Is.EqualTo(durationBefore));
+        }
     }
 }

From de89b7e53c305c0bf048b3ee42c028775d2da2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 10:59:02 +0100
Subject: [PATCH 1255/2296] Fix slider velocity changes not being undone
 correctly

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

`LegacyEditorBeatmapPatcher.processHitObjectLocalData()` was already
supposed to be handling changes to hitobjects that will show up neither
when comparing the hitobjects themselves or the timing point with
"legacy" info stripped - so, in other words, changes to slider velocity
and samples.

However, a change to slider velocity requires default application to
take effect, so just resetting the value would visually fix the timeline
marker but not change the actual object. Calling
`EditorBeatmap.Update()` fixes this by way of triggering default
re-application.

This could probably be smarter (by only invoking the update when
strictly necessary, etc.) - but I'm not sure it's worth the hassle. This
is intended to be a quick fix, rather than a complete solution - the
complete solution would indeed likely entail a wholesale restructuring
of the editor's change handling.
---
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index fe0d4a7822..bb9f702cb5 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -123,6 +123,8 @@ namespace osu.Game.Screens.Edit
                     oldWithRepeats.NodeSamples.Clear();
                     oldWithRepeats.NodeSamples.AddRange(newWithRepeats.NodeSamples);
                 }
+
+                editorBeatmap.Update(oldObject);
             }
         }
 

From cea24298cb99c901077c6e8a23bdfa34da3ceafd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 12:42:34 +0100
Subject: [PATCH 1256/2296] Privatise setters

---
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index e1ec1ad4ac..575a66d421 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -16,9 +16,9 @@ namespace osu.Game.Screens.Edit
     {
         public const float PADDING = 10;
 
-        public Container TimelineContent = null!;
+        public Container TimelineContent { get; private set; } = null!;
 
-        public Container MainContent = null!;
+        public Container MainContent { get; private set; } = null!;
 
         private LoadingSpinner spinner = null!;
 

From 88e10dd051d33ca0e63a7cd5f82dac3d9b4e039c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 20:03:44 +0100
Subject: [PATCH 1257/2296] Update framework

---
 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 0575817460..2870696c03 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1012.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1030.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index bf0a1fcbad..60c71a736d 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1012.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1030.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1023.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index 9b06b4a6a7..f1159f58b9 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1012.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1030.0" />
   </ItemGroup>
 </Project>

From 06508d08fe1f289404bb20756f43403c209e0d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 20:22:41 +0100
Subject: [PATCH 1258/2296] Delete outdated test

---
 .../UserInterface/TestSceneSearchTextBox.cs   | 38 -------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs
deleted file mode 100644
index 153525d24a..0000000000
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSearchTextBox.cs
+++ /dev/null
@@ -1,38 +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 NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    public partial class TestSceneSearchTextBox : OsuTestScene
-    {
-        private SearchTextBox textBox = null!;
-
-        [SetUp]
-        public void SetUp() => Schedule(() =>
-        {
-            Child = textBox = new SearchTextBox
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Width = 400,
-                Scale = new Vector2(2f),
-                HoldFocus = true,
-            };
-        });
-
-        [Test]
-        public void TestSelectionOnFocus()
-        {
-            AddStep("set text", () => textBox.Text = "some text");
-            AddAssert("no text selected", () => textBox.SelectedText == string.Empty);
-            AddStep("hide text box", () => textBox.Hide());
-            AddStep("show text box", () => textBox.Show());
-            AddAssert("search text selected", () => textBox.SelectedText == textBox.Text);
-        }
-    }
-}

From f2c0bc821802067e8cb9c7e5bbf64215e6e4fc31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 21:15:04 +0100
Subject: [PATCH 1259/2296] Add failing test case

---
 .../TestSceneSpinnerInput.cs                  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index 5a473409a4..a6c15d5a67 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.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,8 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Replays;
@@ -47,6 +50,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void Setup() => Schedule(() =>
         {
             manualClock = null;
+            SelectedMods.Value = Array.Empty<Mod>();
         });
 
         /// <summary>
@@ -102,6 +106,34 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertSpinnerHit(false);
         }
 
+        [Test]
+        public void TestVibrateWithoutSpinningOnCentreWithDoubleTime()
+        {
+            List<ReplayFrame> frames = new List<ReplayFrame>();
+
+            const int rate = 2;
+            // the track clock is going to be playing twice as fast,
+            // so the vibration time in clock time needs to be twice as long
+            // to keep constant speed in real time.
+            const int vibrate_time = 50 * rate;
+
+            int direction = -1;
+
+            for (double i = time_spinner_start; i <= time_spinner_end; i += vibrate_time)
+            {
+                frames.Add(new OsuReplayFrame(i, new Vector2(centre_x + direction * 50, centre_y), OsuAction.LeftButton));
+                frames.Add(new OsuReplayFrame(i + vibrate_time, new Vector2(centre_x - direction * 50, centre_y), OsuAction.LeftButton));
+
+                direction *= -1;
+            }
+
+            AddStep("set DT", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = rate } } });
+            performTest(frames);
+
+            assertTicksHit(0);
+            assertSpinnerHit(false);
+        }
+
         /// <summary>
         /// Spins in a single direction.
         /// </summary>

From e5b51f769ce72e7394131df3b993a7a840115984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 21:15:40 +0100
Subject: [PATCH 1260/2296] Fix incorrect assertion placement in spinner
 rotation tracker

Checking the delta after the application of rate is not correct. The
delta is in screen-space *before* the rate from rate-changing mods were
applied; the point of the application of the rate is to compensate for
the fact that the spinner is still judged in "track time" - but the goal
is to keep the spinner's difficulty *independent* of rate, which means
that with DT active the user's spin is "twice as effective" to
compensate for the fact that the spinner is twice as short in real time.

In another formulation, with DT active, the user gets to record replay
frames "half as often" as in normal gameplay.
---
 .../Skinning/Default/SpinnerRotationTracker.cs                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 374f3f461b..1d75663fd9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -101,11 +101,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 rotationTransferred = true;
             }
 
+            Debug.Assert(Math.Abs(delta) <= 180);
+
             double rate = gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate;
             delta = (float)(delta * Math.Abs(rate));
 
-            Debug.Assert(Math.Abs(delta) <= 180);
-
             currentRotation += delta;
             drawableSpinner.Result.History.ReportDelta(Time.Current, delta);
         }

From 12ef93ac3b42a86c031c37a9f89e430bf90912b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 21:31:34 +0100
Subject: [PATCH 1261/2296] Remove no-longer-valid assertion

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
index a6c15d5a67..75bcd809c8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerInput.cs
@@ -130,7 +130,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("set DT", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = rate } } });
             performTest(frames);
 
-            assertTicksHit(0);
             assertSpinnerHit(false);
         }
 

From 87c9df937f85d3f7e9b220c2f21c13caae74b25b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 12:40:21 +0900
Subject: [PATCH 1262/2296] Move team seed to below team name

---
 .../Components/DrawableTeamSeed.cs            |  6 +++++
 .../TournamentSpriteTextWithBackground.cs     |  2 +-
 .../Gameplay/Components/TeamDisplay.cs        | 27 ++++++-------------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tournament/Components/DrawableTeamSeed.cs b/osu.Game.Tournament/Components/DrawableTeamSeed.cs
index a79c63e979..077185f5c0 100644
--- a/osu.Game.Tournament/Components/DrawableTeamSeed.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamSeed.cs
@@ -22,6 +22,12 @@ namespace osu.Game.Tournament.Components
         [Resolved]
         private LadderInfo ladder { get; set; } = null!;
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Text.Font = Text.Font.With(size: 36);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
index ce118727cd..21439482e3 100644
--- a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
+++ b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tournament.Components
                 {
                     Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR,
                     Font = OsuFont.Torus.With(weight: FontWeight.SemiBold, size: 50),
-                    Padding = new MarginPadding { Horizontal = 10 },
+                    Padding = new MarginPadding { Left = 10, Right = 20 },
                     Text = text,
                 }
             };
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 49fbc64397..3eec67c639 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -95,28 +95,17 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                                             }
                                         }
                                     },
-                                    new FillFlowContainer
+                                    teamNameText = new TournamentSpriteTextWithBackground
                                     {
-                                        AutoSizeAxes = Axes.Both,
-                                        Direction = FillDirection.Horizontal,
-                                        Spacing = new Vector2(5),
+                                        Scale = new Vector2(0.5f),
+                                        Origin = anchor,
+                                        Anchor = anchor,
+                                    },
+                                    new DrawableTeamSeed(Team)
+                                    {
+                                        Scale = new Vector2(0.5f),
                                         Origin = anchor,
                                         Anchor = anchor,
-                                        Children = new Drawable[]
-                                        {
-                                            teamNameText = new TournamentSpriteTextWithBackground
-                                            {
-                                                Scale = new Vector2(0.5f),
-                                                Origin = anchor,
-                                                Anchor = anchor,
-                                            },
-                                            new DrawableTeamSeed(Team)
-                                            {
-                                                Scale = new Vector2(0.5f),
-                                                Origin = anchor,
-                                                Anchor = anchor,
-                                            },
-                                        }
                                     },
                                 }
                             },

From feeb95e4c389b85a1e72b1f00d2a79131ecb2652 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 12:44:43 +0900
Subject: [PATCH 1263/2296] Adjust `DrawableTeamTitleWithHeader` to match new
 layout

---
 .../Components/DrawableTeamTitleWithHeader.cs     | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
index fc4037d4e1..7d8fc847d4 100644
--- a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
@@ -18,21 +18,12 @@ namespace osu.Game.Tournament.Components
             {
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 10),
+                Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
                     new DrawableTeamHeader(colour),
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Spacing = new Vector2(5),
-                        Children = new Drawable[]
-                        {
-                            new DrawableTeamTitle(team),
-                            new DrawableTeamSeed(team),
-                        }
-                    }
+                    new DrawableTeamTitle(team),
+                    new DrawableTeamSeed(team),
                 }
             };
         }

From a3dc9a73b19120c0c4ef4ba7199463fb63ad280c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 13:35:15 +0900
Subject: [PATCH 1264/2296] Revert behaviour changes of `MaxDimensions` test
 and ignore instead

---
 .../Gameplay/TestScenePlayerMaxDimensions.cs  | 76 ++++++++++++++++---
 1 file changed, 66 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
index 6665295e99..53a4abdd07 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerMaxDimensions.cs
@@ -3,14 +3,21 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Processing;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -21,6 +28,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     /// <remarks>
     /// The HUD is hidden as it does't really affect game balance if HUD elements are larger than they should be.
     /// </remarks>
+    [Ignore("This test is for visual testing, and has no value in being run in standard CI runs.")]
     public partial class TestScenePlayerMaxDimensions : TestSceneAllRulesetPlayers
     {
         // scale textures to 4 times their size.
@@ -66,18 +74,66 @@ namespace osu.Game.Tests.Visual.Gameplay
                 remove { }
             }
 
-            public override Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
-            {
-                var texture = base.GetTexture(componentName, wrapModeS, wrapModeT);
-
-                if (texture != null)
-                    texture.ScaleAdjust /= scale_factor;
-
-                return texture;
-            }
-
             public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => this;
             public IEnumerable<ISkin> AllSources => new[] { this };
+
+            protected override IResourceStore<TextureUpload> CreateTextureLoaderStore(IStorageResourceProvider resources, IResourceStore<byte[]> storage)
+                => new UpscaledTextureLoaderStore(base.CreateTextureLoaderStore(resources, storage));
+
+            private class UpscaledTextureLoaderStore : IResourceStore<TextureUpload>
+            {
+                private readonly IResourceStore<TextureUpload>? textureStore;
+
+                public UpscaledTextureLoaderStore(IResourceStore<TextureUpload>? textureStore)
+                {
+                    this.textureStore = textureStore;
+                }
+
+                public void Dispose()
+                {
+                    textureStore?.Dispose();
+                }
+
+                public TextureUpload Get(string name)
+                {
+                    var textureUpload = textureStore?.Get(name);
+
+                    // NRT not enabled on framework side classes (IResourceStore / TextureLoaderStore), welp.
+                    if (textureUpload == null)
+                        return null!;
+
+                    return upscale(textureUpload);
+                }
+
+                public async Task<TextureUpload> GetAsync(string name, CancellationToken cancellationToken = new CancellationToken())
+                {
+                    // NRT not enabled on framework side classes (IResourceStore / TextureLoaderStore), welp.
+                    if (textureStore == null)
+                        return null!;
+
+                    var textureUpload = await textureStore.GetAsync(name, cancellationToken).ConfigureAwait(false);
+
+                    if (textureUpload == null)
+                        return null!;
+
+                    return await Task.Run(() => upscale(textureUpload), cancellationToken).ConfigureAwait(false);
+                }
+
+                private TextureUpload upscale(TextureUpload textureUpload)
+                {
+                    var image = Image.LoadPixelData(textureUpload.Data.ToArray(), textureUpload.Width, textureUpload.Height);
+
+                    // The original texture upload will no longer be returned or used.
+                    textureUpload.Dispose();
+
+                    image.Mutate(i => i.Resize(new Size(textureUpload.Width, textureUpload.Height) * scale_factor));
+                    return new TextureUpload(image);
+                }
+
+                public Stream? GetStream(string name) => textureStore?.GetStream(name);
+
+                public IEnumerable<string> GetAvailableResources() => textureStore?.GetAvailableResources() ?? Array.Empty<string>();
+            }
         }
     }
 }

From 37ec10d4f592ebab514c9a9afc5f9dcb8dce7c2f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 13:49:39 +0900
Subject: [PATCH 1265/2296] Fix `TestSongSelectScrollHandling` not waiting for
 `VolumeOverlay` to load

See https://github.com/ppy/osu/actions/runs/6701786492/job/18210372721.
---
 osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 7fa4f8c836..9e743ef336 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Tests.Visual.Navigation
             double scrollPosition = 0;
 
             AddStep("set game volume to max", () => Game.Dependencies.Get<FrameworkConfigManager>().SetValue(FrameworkSetting.VolumeUniversal, 1d));
-            AddUntilStep("wait for volume overlay to hide", () => Game.ChildrenOfType<VolumeOverlay>().Single().State.Value, () => Is.EqualTo(Visibility.Hidden));
+            AddUntilStep("wait for volume overlay to hide", () => Game.ChildrenOfType<VolumeOverlay>().SingleOrDefault()?.State.Value, () => Is.EqualTo(Visibility.Hidden));
             PushAndConfirm(() => songSelect = new TestPlaySongSelect());
             AddUntilStep("wait for song select", () => songSelect.BeatmapSetsLoaded);
             AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());

From 89444d5544aad8c89be4eff311cd6beeedc1c421 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:00:49 +0900
Subject: [PATCH 1266/2296] Fix export test still occasionally failing due to
 file write in progress

https://github.com/ppy/osu/actions/runs/6701591401/job/18209826074

Basically, `File.Move` may not be an atomic operation.
---
 .../Gameplay/TestScenePlayerLocalScoreImport.cs    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 1254aa0639..0dd544bb30 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -214,10 +214,18 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             // Files starting with _ are temporary, created by CreateFileSafely call.
             AddUntilStep("wait for export file", () => filePath = LocalStorage.GetFiles("exports").SingleOrDefault(f => !Path.GetFileName(f).StartsWith("_", StringComparison.Ordinal)), () => Is.Not.Null);
-            AddAssert("filesize is non-zero", () =>
+            AddUntilStep("filesize is non-zero", () =>
             {
-                using (var stream = LocalStorage.GetStream(filePath))
-                    return stream.Length;
+                try
+                {
+                    using (var stream = LocalStorage.GetStream(filePath))
+                        return stream.Length;
+                }
+                catch (IOException)
+                {
+                    // file move may still be in progress.
+                    return 0;
+                }
             }, () => Is.Not.Zero);
         }
 

From 66b84d02cb1631302631d5b16afd31d0d420a13a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:20:11 +0900
Subject: [PATCH 1267/2296] Add note about `TestGameplayExitFlow` failure, and
 ignore for now

See:
https://github.com/ppy/osu/actions/runs/6695995685/job/18194110641
https://github.com/ppy/osu/actions/runs/6700910613/job/18208272419
---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 09624f63b7..16030d568b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -693,7 +693,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        [FlakyTest] // See above
+        [Ignore("Failing too often, needs revisiting in some future.")]
+        // This test is failing even after 10 retries (see https://github.com/ppy/osu/actions/runs/6700910613/job/18208272419)
+        // Something is stopping the ready button from changing states, over multiple runs.
         public void TestGameplayExitFlow()
         {
             Bindable<double>? holdDelay = null;

From bdd3f2847b8a27d1e34657297fdc290deeaf1e88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:26:00 +0900
Subject: [PATCH 1268/2296] Add an extra storyboard sample to avoid
 intermittent failures in `TestStoryboardSamplesStopOnSkip`

Probably CI running slow timing balls.

The point of failure is `waitUntilStoryboardSamplesPlay()`
after already testing the important part of the test (that
the samples stop on skip) so let's give it another possible
point to recover.

See https://github.com/ppy/osu/actions/runs/6698399814/job/18201753701.
---
 .../Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
index a9d4508f70..11dc0f9c30 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: -7000, volume: 20));
             backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: -5000, volume: 20));
             backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: 0, volume: 20));
+            backgroundLayer.Add(new StoryboardSampleInfo("Intro/welcome.mp3", time: 2000, volume: 20));
         }
 
         [SetUp]

From d379e553da920cfd8cbccca2f5a03786c8627dc6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:31:26 +0900
Subject: [PATCH 1269/2296] Fix back-to-front logging

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index b072ce191e..29c9381ee4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     alwaysGoingForward &= goingForward;
 
                     if (!goingForward)
-                        Logger.Log($"Backwards time occurred ({currentTime:N1} -> {lastTime:N1})");
+                        Logger.Log($"Backwards time occurred ({lastTime:N1} -> {currentTime:N1})");
 
                     lastTime = currentTime;
                 };

From 7ceced70122d51ffc030074d1f3738645367be59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:47:04 +0900
Subject: [PATCH 1270/2296] Scope `TestPauseWithLargeOffset` to focus on what
 matters See
 https://github.com/ppy/osu/actions/runs/6693917410/job/18186111009

This test is to make sure we don't seek before the original
pause time, so I've exposed that value precisely to avoid
CI woes.
---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 16 ++++++++++------
 .../Screens/Play/MasterGameplayClockContainer.cs | 12 ++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 29c9381ee4..ec3b3e0822 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestPauseWithLargeOffset()
         {
-            double lastTime;
+            double lastStopTime;
             bool alwaysGoingForward = true;
 
             AddStep("force large offset", () =>
@@ -84,20 +84,24 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("add time forward check hook", () =>
             {
-                lastTime = double.MinValue;
+                lastStopTime = double.MinValue;
                 alwaysGoingForward = true;
 
                 Player.OnUpdate += _ =>
                 {
-                    double currentTime = Player.GameplayClockContainer.CurrentTime;
-                    bool goingForward = currentTime >= lastTime - 500;
+                    var masterClock = (MasterGameplayClockContainer)Player.GameplayClockContainer;
+
+                    double currentTime = masterClock.CurrentTime;
+
+                    bool goingForward = currentTime >= (masterClock.LastStopTime ?? lastStopTime);
 
                     alwaysGoingForward &= goingForward;
 
                     if (!goingForward)
-                        Logger.Log($"Backwards time occurred ({lastTime:N1} -> {currentTime:N1})");
+                        Logger.Log($"Went too far backwards (last stop: {lastStopTime:N1} current: {currentTime:N1})");
 
-                    lastTime = currentTime;
+                    if (masterClock.LastStopTime != null)
+                        lastStopTime = masterClock.LastStopTime.Value;
                 };
             });
 
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 1c860e9d4b..54ed7ba626 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Play
         ///
         /// In the future I want to change this.
         /// </summary>
-        private double? actualStopTime;
+        internal double? LastStopTime;
 
         [Resolved]
         private MusicController musicController { get; set; } = null!;
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Play
 
         protected override void StopGameplayClock()
         {
-            actualStopTime = GameplayClock.CurrentTime;
+            LastStopTime = GameplayClock.CurrentTime;
 
             if (IsLoaded)
             {
@@ -127,17 +127,17 @@ namespace osu.Game.Screens.Play
         public override void Seek(double time)
         {
             // Safety in case the clock is seeked while stopped.
-            actualStopTime = null;
+            LastStopTime = null;
 
             base.Seek(time);
         }
 
         protected override void PrepareStart()
         {
-            if (actualStopTime != null)
+            if (LastStopTime != null)
             {
-                Seek(actualStopTime.Value);
-                actualStopTime = null;
+                Seek(LastStopTime.Value);
+                LastStopTime = null;
             }
             else
                 base.PrepareStart();

From 8c067dc584066527badb6a9029f5ef31a932bba8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 14:53:07 +0900
Subject: [PATCH 1271/2296] Fix mod tests not waiting for presets to finish
 loading

See https://github.com/ppy/osu/actions/runs/6692350567/job/18181352850.
---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 3728fb3f21..f0822ce2a8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -799,8 +799,11 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.7));
         }
 
-        private void waitForColumnLoad() => AddUntilStep("all column content loaded",
-            () => modSelectOverlay.ChildrenOfType<ModColumn>().Any() && modSelectOverlay.ChildrenOfType<ModColumn>().All(column => column.IsLoaded && column.ItemsLoaded));
+        private void waitForColumnLoad() => AddUntilStep("all column content loaded", () =>
+            modSelectOverlay.ChildrenOfType<ModColumn>().Any()
+            && modSelectOverlay.ChildrenOfType<ModColumn>().All(column => column.IsLoaded && column.ItemsLoaded)
+            && modSelectOverlay.ChildrenOfType<ModPresetColumn>().Any()
+            && modSelectOverlay.ChildrenOfType<ModPresetColumn>().All(column => column.IsLoaded));
 
         private void changeRuleset(int id)
         {

From 64efc3d251ef1c4ff39f2d3b2c25df4dc020ae6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 15:33:40 +0900
Subject: [PATCH 1272/2296] Decouple metronome tick playback from pendulum
 movement

Not super happy about doing this, but it seems like it's in the best
interest of editor usability.
---
 .../Screens/Edit/Timing/MetronomeDisplay.cs   | 74 +++++++++++++------
 1 file changed, 50 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs b/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
index 9f03281d0c..29e730c865 100644
--- a/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
+++ b/osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
@@ -34,16 +34,18 @@ namespace osu.Game.Screens.Edit.Timing
 
         private IAdjustableClock metronomeClock = null!;
 
-        private Sample? sampleTick;
-        private Sample? sampleTickDownbeat;
         private Sample? sampleLatch;
 
-        private ScheduledDelegate? tickPlaybackDelegate;
+        private readonly MetronomeTick metronomeTick = new MetronomeTick();
 
         [Resolved]
         private OverlayColourProvider overlayColourProvider { get; set; } = null!;
 
-        public bool EnableClicking { get; set; } = true;
+        public bool EnableClicking
+        {
+            get => metronomeTick.EnableClicking;
+            set => metronomeTick.EnableClicking = value;
+        }
 
         public MetronomeDisplay()
         {
@@ -53,8 +55,6 @@ namespace osu.Game.Screens.Edit.Timing
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            sampleTick = audio.Samples.Get(@"UI/metronome-tick");
-            sampleTickDownbeat = audio.Samples.Get(@"UI/metronome-tick-downbeat");
             sampleLatch = audio.Samples.Get(@"UI/metronome-latch");
 
             const float taper = 25;
@@ -67,8 +67,11 @@ namespace osu.Game.Screens.Edit.Timing
 
             AutoSizeAxes = Axes.Both;
 
+            metronomeTick.Ticked = onTickPlayed;
+
             InternalChildren = new Drawable[]
             {
+                metronomeTick,
                 new Container
                 {
                     Name = @"Taper adjust",
@@ -265,9 +268,6 @@ namespace osu.Game.Screens.Edit.Timing
 
                 isSwinging = false;
 
-                tickPlaybackDelegate?.Cancel();
-                tickPlaybackDelegate = null;
-
                 // instantly latch if pendulum arm is close enough to center (to prevent awkward delayed playback of latch sound)
                 if (Precision.AlmostEquals(swing.Rotation, 0, 1))
                 {
@@ -306,27 +306,53 @@ namespace osu.Game.Screens.Edit.Timing
             float targetAngle = currentAngle > 0 ? -angle : angle;
 
             swing.RotateTo(targetAngle, beatLength, Easing.InOutQuad);
+        }
 
-            if (currentAngle != 0 && Math.Abs(currentAngle - targetAngle) > angle * 1.8f && isSwinging)
+        private void onTickPlayed()
+        {
+            // Originally, this flash only occurred when the pendulum correctly passess the centre.
+            // Mappers weren't happy with the metronome tick not playing immediately after starting playback
+            // so now this matches the actual tick sample.
+            stick.FlashColour(overlayColourProvider.Content1, beatLength, Easing.OutQuint);
+        }
+
+        private partial class MetronomeTick : BeatSyncedContainer
+        {
+            public bool EnableClicking;
+
+            private Sample? sampleTick;
+            private Sample? sampleTickDownbeat;
+
+            public Action? Ticked;
+
+            public MetronomeTick()
             {
-                using (BeginDelayedSequence(beatLength / 2))
-                {
-                    stick.FlashColour(overlayColourProvider.Content1, beatLength, Easing.OutQuint);
+                AllowMistimedEventFiring = false;
+            }
 
-                    tickPlaybackDelegate = Schedule(() =>
-                    {
-                        if (!EnableClicking)
-                            return;
+            [BackgroundDependencyLoader]
+            private void load(AudioManager audio)
+            {
+                sampleTick = audio.Samples.Get(@"UI/metronome-tick");
+                sampleTickDownbeat = audio.Samples.Get(@"UI/metronome-tick-downbeat");
+            }
 
-                        var channel = beatIndex % timingPoint.TimeSignature.Numerator == 0 ? sampleTickDownbeat?.GetChannel() : sampleTick?.GetChannel();
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+            {
+                base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
-                        if (channel == null)
-                            return;
+                if (!IsBeatSyncedWithTrack || !EnableClicking)
+                    return;
 
-                        channel.Frequency.Value = RNG.NextDouble(0.98f, 1.02f);
-                        channel.Play();
-                    });
-                }
+                var channel = beatIndex % timingPoint.TimeSignature.Numerator == 0 ? sampleTickDownbeat?.GetChannel() : sampleTick?.GetChannel();
+
+                if (channel == null)
+                    return;
+
+                channel.Frequency.Value = RNG.NextDouble(0.98f, 1.02f);
+                channel.Play();
+
+                Ticked?.Invoke();
             }
         }
     }

From 144006fbe83e60b6ba5a0cab7856eb3c4416da28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 31 Oct 2023 08:38:22 +0100
Subject: [PATCH 1273/2296] Update autoselect implementation to work correctly
 with framework changes

---
 .../Edit/Compose/Components/BeatDivisorControl.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
index 7eba1fe1cd..b33edb9edb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
@@ -321,7 +321,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     Spacing = new Vector2(10),
                     Children = new Drawable[]
                     {
-                        divisorTextBox = new OsuNumberBox
+                        divisorTextBox = new AutoSelectTextBox
                         {
                             RelativeSizeAxes = Axes.X,
                             PlaceholderText = "Beat divisor"
@@ -341,8 +341,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 base.LoadComplete();
                 BeatDivisor.BindValueChanged(_ => updateState(), true);
                 divisorTextBox.OnCommit += (_, _) => setPresetsFromTextBoxEntry();
-
-                divisorTextBox.SelectAll();
             }
 
             private void setPresetsFromTextBoxEntry()
@@ -590,5 +588,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 }
             }
         }
+
+        private partial class AutoSelectTextBox : OsuNumberBox
+        {
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                GetContainingInputManager().ChangeFocus(this);
+                SelectAll();
+            }
+        }
     }
 }

From 0d44b5af90d606657e63c9c386574dcd5e18c89f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 31 Oct 2023 17:36:23 +0900
Subject: [PATCH 1274/2296] Fix potential texture corruption when cropping
 gameplay textures of weird aspet ratios

Closes https://github.com/ppy/osu/issues/25273.
---
 osu.Game/Skinning/LegacySkinExtensions.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 62197fa8a7..a8ec67d98b 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -115,7 +115,18 @@ namespace osu.Game.Skinning
 
             maxSize *= texture.ScaleAdjust;
 
-            var croppedTexture = texture.Crop(new RectangleF(texture.Width / 2f - maxSize.X / 2f, texture.Height / 2f - maxSize.Y / 2f, maxSize.X, maxSize.Y));
+            // Importantly, check per-axis for the minimum dimension to avoid accidentally inflating
+            // textures with weird aspect ratios.
+            float newWidth = Math.Min(texture.Width, maxSize.X);
+            float newHeight = Math.Min(texture.Height, maxSize.Y);
+
+            var croppedTexture = texture.Crop(new RectangleF(
+                texture.Width / 2f - newWidth / 2f,
+                texture.Height / 2f - newHeight / 2f,
+                newWidth,
+                newHeight
+            ));
+
             croppedTexture.ScaleAdjust = texture.ScaleAdjust;
             return croppedTexture;
         }

From 9f5a280bc22b1f88d20b7b885d4aa252f7feee7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 31 Oct 2023 12:25:08 +0100
Subject: [PATCH 1275/2296] Fix key binding row fire-and-forgetting writes

Intends to fix test failures as seen in https://github.com/ppy/osu/actions/runs/6692350567/job/18181352642#step:5:129

This is what happens if you carelessly fire and forget.

The working theory (that I'm not sure I have the tools to conclusively
confirm) is that the async write from the key binding changing could
fire _after_ the section is reset.

I briefly considered having the test wait for the change, but given that
the entirety of the surrounding flow is using sync operations, this just
looks like a bug to me. And there's no real sane way to inject async
into that flow due to dependence on `OsuButton.Action`.
---
 osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
index c85fe4727a..e82cebe9f4 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
@@ -498,7 +498,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             if (existingBinding == null)
             {
-                realm.WriteAsync(r => r.Find<RealmKeyBinding>(keyBinding.ID)!.KeyCombinationString = keyBinding.KeyCombination.ToString());
+                realm.Write(r => r.Find<RealmKeyBinding>(keyBinding.ID)!.KeyCombinationString = keyBinding.KeyCombination.ToString());
                 BindingUpdated?.Invoke(this, new KeyBindingUpdatedEventArgs(bindingConflictResolved: false, advanceToNextBinding));
                 return;
             }

From 7ea298a1b6a4f17a8ae3b505c599f04ac498e4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 31 Oct 2023 16:13:44 +0100
Subject: [PATCH 1276/2296] Add xmldoc to `Mod` playability flags

---
 osu.Game/Rulesets/Mods/Mod.cs | 40 +++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index a0bdc9ff51..49c2fdd394 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -107,12 +107,52 @@ namespace osu.Game.Rulesets.Mods
         [JsonIgnore]
         public virtual bool HasImplementation => this is IApplicableMod;
 
+        /// <summary>
+        /// Whether this mod can be played by a real human user.
+        /// Non-user-playable mods are not viable for single-player score submission.
+        /// </summary>
+        /// <example>
+        /// <list type="bullet">
+        /// <item><see cref="ModDoubleTime"/> is user-playable.</item>
+        /// <item><see cref="ModAutoplay"/> is not user-playable.</item>
+        /// </list>
+        /// </example>
         [JsonIgnore]
         public virtual bool UserPlayable => true;
 
+        /// <summary>
+        /// Whether this mod can be specified as a "required" mod in a multiplayer context.
+        /// </summary>
+        /// <example>
+        /// <list type="bullet">
+        /// <item><see cref="ModHardRock"/> is valid for multiplayer.</item>
+        /// <item>
+        /// <see cref="ModDoubleTime"/> is valid for multiplayer as long as it is a <b>required</b> mod,
+        /// as that ensures the same duration of gameplay for all users in the room.
+        /// </item>
+        /// <item>
+        /// <see cref="ModAdaptiveSpeed"/> is not valid for multiplayer, as it leads to varying
+        /// gameplay duration depending on how the users in the room play.
+        /// </item>
+        /// <item><see cref="ModAutoplay"/> is not valid for multiplayer.</item>
+        /// </list>
+        /// </example>
         [JsonIgnore]
         public virtual bool ValidForMultiplayer => true;
 
+        /// <summary>
+        /// Whether this mod can be specified as a "free" or "allowed" mod in a multiplayer context.
+        /// </summary>
+        /// <example>
+        /// <list type="bullet">
+        /// <item><see cref="ModHardRock"/> is valid for multiplayer as a free mod.</item>
+        /// <item>
+        /// <see cref="ModDoubleTime"/> is <b>not</b> valid for multiplayer as a free mod,
+        /// as it could to varying gameplay duration between users in the room depending on whether they picked it.
+        /// </item>
+        /// <item><see cref="ModAutoplay"/> is not valid for multiplayer as a free mod.</item>
+        /// </list>
+        /// </example>
         [JsonIgnore]
         public virtual bool ValidForMultiplayerAsFreeMod => true;
 

From 3a2645efb17dbe9bee7251b4a8ecc0868cf8799d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 31 Oct 2023 16:15:10 +0100
Subject: [PATCH 1277/2296] Seal `ModAutoplay` playability flags

Can't do much more than that due to the unfortunate fact of Cinema
inheriting from Autoplay.
---
 osu.Game/Rulesets/Mods/ModAutoplay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index a3a4adc53d..973fcffba8 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Watch a perfect automated play through the song.";
         public override double ScoreMultiplier => 1;
 
-        public override bool UserPlayable => false;
-        public override bool ValidForMultiplayer => false;
-        public override bool ValidForMultiplayerAsFreeMod => false;
+        public sealed override bool UserPlayable => false;
+        public sealed override bool ValidForMultiplayer => false;
+        public sealed override bool ValidForMultiplayerAsFreeMod => false;
 
         public override Type[] IncompatibleMods => new[] { typeof(ModCinema), typeof(ModRelax), typeof(ModAdaptiveSpeed) };
 

From 456f4ebba2208d4a764df157d02dcbbbe6dda544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 31 Oct 2023 16:16:14 +0100
Subject: [PATCH 1278/2296] Seal `ModScoreV2`

Nobody should ever need to extend it.
---
 osu.Game/Rulesets/Mods/ModScoreV2.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModScoreV2.cs b/osu.Game/Rulesets/Mods/ModScoreV2.cs
index df83d96769..52dcd71666 100644
--- a/osu.Game/Rulesets/Mods/ModScoreV2.cs
+++ b/osu.Game/Rulesets/Mods/ModScoreV2.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Mods
     /// This mod is used strictly to mark osu!stable scores set with the "Score V2" mod active.
     /// It should not be used in any real capacity going forward.
     /// </remarks>
-    public class ModScoreV2 : Mod
+    public sealed class ModScoreV2 : Mod
     {
         public override string Name => "Score V2";
         public override string Acronym => @"SV2";

From a644c75957247c8f16674ea47e1eec4a239f1159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 31 Oct 2023 16:16:57 +0100
Subject: [PATCH 1279/2296] Mark `ModScoreV2` as invalid for multiplayer

Doesn't do much for the client; mostly a safety for osu-web's sake,
as without the change it could theoretically fail to validate the mod
properly in multiplayer contexts.
---
 osu.Game/Rulesets/Mods/ModScoreV2.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModScoreV2.cs b/osu.Game/Rulesets/Mods/ModScoreV2.cs
index 52dcd71666..6a77cafa30 100644
--- a/osu.Game/Rulesets/Mods/ModScoreV2.cs
+++ b/osu.Game/Rulesets/Mods/ModScoreV2.cs
@@ -17,5 +17,7 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Score set on earlier osu! versions with the V2 scoring algorithm active.";
         public override double ScoreMultiplier => 1;
         public override bool UserPlayable => false;
+        public override bool ValidForMultiplayer => false;
+        public override bool ValidForMultiplayerAsFreeMod => false;
     }
 }

From 955e2ed05166aeaf6073938661a9bc7197d9b816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 31 Oct 2023 16:18:09 +0100
Subject: [PATCH 1280/2296] Seal `UnknownMod`

Not a class for extension.
---
 osu.Game/Rulesets/Mods/UnknownMod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/UnknownMod.cs b/osu.Game/Rulesets/Mods/UnknownMod.cs
index abe05996ff..31fc09b0a6 100644
--- a/osu.Game/Rulesets/Mods/UnknownMod.cs
+++ b/osu.Game/Rulesets/Mods/UnknownMod.cs
@@ -5,7 +5,7 @@ using osu.Framework.Localisation;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public class UnknownMod : Mod
+    public sealed class UnknownMod : Mod
     {
         /// <summary>
         /// The acronym of the mod which could not be resolved.

From a90f8dd4f63191209d593201a2bb1a00b7828a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 31 Oct 2023 16:20:33 +0100
Subject: [PATCH 1281/2296] Seal a few more multiplayer playability flags of
 rate-changing mods

Not really changing anything, just tightening things down to curb
possible funny business.
---
 osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs | 4 ++--
 osu.Game/Rulesets/Mods/ModRateAdjust.cs    | 2 +-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
index 607e6b8399..77aa5cdc15 100644
--- a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
+++ b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
@@ -31,8 +31,8 @@ namespace osu.Game.Rulesets.Mods
 
         public override double ScoreMultiplier => 0.5;
 
-        public override bool ValidForMultiplayer => false;
-        public override bool ValidForMultiplayerAsFreeMod => false;
+        public sealed override bool ValidForMultiplayer => false;
+        public sealed override bool ValidForMultiplayerAsFreeMod => false;
 
         public override Type[] IncompatibleMods => new[] { typeof(ModRateAdjust), typeof(ModTimeRamp), typeof(ModAutoplay) };
 
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index fa1c143585..e5af758b4f 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Mods
 {
     public abstract class ModRateAdjust : Mod, IApplicableToRate
     {
-        public override bool ValidForMultiplayerAsFreeMod => false;
+        public sealed override bool ValidForMultiplayerAsFreeMod => false;
 
         public abstract BindableNumber<double> SpeedChange { get; }
 
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index d2772417db..36e4522771 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
         public abstract BindableBool AdjustPitch { get; }
 
-        public override bool ValidForMultiplayerAsFreeMod => false;
+        public sealed override bool ValidForMultiplayerAsFreeMod => false;
 
         public override Type[] IncompatibleMods => new[] { typeof(ModRateAdjust), typeof(ModAdaptiveSpeed) };
 

From c2de03aa44c85fccb29e5542c63c01d46dc7145d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 1 Nov 2023 18:28:05 +0900
Subject: [PATCH 1282/2296] Fix all spinner ticks being alive and causing
 performance degradation

Regressed in https://github.com/ppy/osu/pull/25216.

The new logic will ensure at least one tick is ready for judgement.
There shouldn't be a case where more than one is needed in a single
frame.
---
 .../Objects/Drawables/DrawableSpinner.cs            | 13 +++++++++++++
 .../Objects/Drawables/DrawableSpinnerTick.cs        |  8 ++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index c092b4dd4b..2799ba4a25 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -275,6 +275,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (spinningSample != null && spinnerFrequencyModulate)
                 spinningSample.Frequency.Value = spinning_sample_modulated_base_frequency + Progress;
+
+            // Ticks can theoretically be judged at any point in the spinner's duration.
+            // For performance reasons, we only want to keep the next tick alive.
+            var next = NestedHitObjects.FirstOrDefault(h => !h.Judged);
+
+            // See default `LifetimeStart` as set in `DrawableSpinnerTick`.
+            if (next?.LifetimeStart == double.MaxValue)
+            {
+                // the tick can be theoretically judged at any point in the spinner's duration,
+                // so it must be alive throughout the spinner's entire lifetime.
+                // this mostly matters for correct sample playback.
+                next.LifetimeStart = HitObject.StartTime;
+            }
         }
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index a5785dd1f6..5b55533edd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -11,8 +11,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public override bool DisplayResult => false;
 
-        protected DrawableSpinner DrawableSpinner => (DrawableSpinner)ParentHitObject;
-
         public DrawableSpinnerTick()
             : this(null)
         {
@@ -29,10 +27,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.OnApply();
 
-            // the tick can be theoretically judged at any point in the spinner's duration,
-            // so it must be alive throughout the spinner's entire lifetime.
-            // this mostly matters for correct sample playback.
-            LifetimeStart = DrawableSpinner.HitObject.StartTime;
+            // Lifetime will be managed by `DrawableSpinner`.
+            LifetimeStart = double.MaxValue;
         }
 
         /// <summary>

From 48bdeaeff14f456abb371878307c91d79156832e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 02:42:36 +0900
Subject: [PATCH 1283/2296] Fix another potential crash in bubbles mod
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Storing `DrawableHitObject` for later use is not safe – especially
when accessing `HitObject` – as it's a pooled class. In the case here,
it's important to note that `PrepareForUse` can be called a frame or
more later in execution, which made this unsafe.

Closes https://github.com/ppy/osu/issues/24444.
---
 osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs | 77 ++++++++++-----------
 1 file changed, 36 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
index 9c0e43e96f..b34cc29741 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
@@ -2,11 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using System.Linq;
 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;
@@ -22,6 +20,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -90,21 +89,18 @@ namespace osu.Game.Rulesets.Osu.Mods
                         break;
 
                     default:
-                        addBubble();
+                        BubbleDrawable bubble = bubblePool.Get();
+
+                        bubble.WasHit = drawable.IsHit;
+                        bubble.Position = getPosition(drawableOsuHitObject);
+                        bubble.AccentColour = drawable.AccentColour.Value;
+                        bubble.InitialSize = new Vector2(bubbleSize);
+                        bubble.FadeTime = bubbleFade;
+                        bubble.MaxSize = maxSize;
+
+                        bubbleContainer.Add(bubble);
                         break;
                 }
-
-                void addBubble()
-                {
-                    BubbleDrawable bubble = bubblePool.Get();
-
-                    bubble.DrawableOsuHitObject = drawableOsuHitObject;
-                    bubble.InitialSize = new Vector2(bubbleSize);
-                    bubble.FadeTime = bubbleFade;
-                    bubble.MaxSize = maxSize;
-
-                    bubbleContainer.Add(bubble);
-                }
             };
 
             drawableObject.OnRevertResult += (drawable, _) =>
@@ -118,18 +114,38 @@ namespace osu.Game.Rulesets.Osu.Mods
             };
         }
 
+        private Vector2 getPosition(DrawableOsuHitObject drawableObject)
+        {
+            switch (drawableObject)
+            {
+                // SliderHeads are derived from HitCircles,
+                // so we must handle them before to avoid them using the wrong positioning logic
+                case DrawableSliderHead:
+                    return drawableObject.HitObject.Position;
+
+                // Using hitobject position will cause issues with HitCircle placement due to stack leniency.
+                case DrawableHitCircle:
+                    return drawableObject.Position;
+
+                default:
+                    return drawableObject.HitObject.Position;
+            }
+        }
+
         #region Pooled Bubble drawable
 
         private partial class BubbleDrawable : PoolableDrawable
         {
-            public DrawableOsuHitObject? DrawableOsuHitObject { get; set; }
-
             public Vector2 InitialSize { get; set; }
 
             public float MaxSize { get; set; }
 
             public double FadeTime { get; set; }
 
+            public bool WasHit { get; set; }
+
+            public Color4 AccentColour { get; set; }
+
             private readonly Box colourBox;
             private readonly CircularContainer content;
 
@@ -157,15 +173,12 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             protected override void PrepareForUse()
             {
-                Debug.Assert(DrawableOsuHitObject.IsNotNull());
-
-                Colour = DrawableOsuHitObject.IsHit ? Colour4.White : Colour4.Black;
+                Colour = WasHit ? Colour4.White : Colour4.Black;
                 Scale = new Vector2(1);
-                Position = getPosition(DrawableOsuHitObject);
                 Size = InitialSize;
 
                 //We want to fade to a darker colour to avoid colours such as white hiding the "ripple" effect.
-                ColourInfo colourDarker = DrawableOsuHitObject.AccentColour.Value.Darken(0.1f);
+                ColourInfo colourDarker = AccentColour.Darken(0.1f);
 
                 // The absolute length of the bubble's animation, can be used in fractions for animations of partial length
                 double duration = 1700 + Math.Pow(FadeTime, 1.07f);
@@ -178,7 +191,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     .ScaleTo(MaxSize * 1.5f, duration * 0.2f, Easing.OutQuint)
                     .FadeOut(duration * 0.2f, Easing.OutCirc).Expire();
 
-                if (!DrawableOsuHitObject.IsHit) return;
+                if (!WasHit) return;
 
                 content.BorderThickness = InitialSize.X / 3.5f;
                 content.BorderColour = Colour4.White;
@@ -192,24 +205,6 @@ namespace osu.Game.Rulesets.Osu.Mods
                        // Avoids transparency overlap issues during the bubble "pop"
                        .TransformTo(nameof(BorderThickness), 0f);
             }
-
-            private Vector2 getPosition(DrawableOsuHitObject drawableObject)
-            {
-                switch (drawableObject)
-                {
-                    // SliderHeads are derived from HitCircles,
-                    // so we must handle them before to avoid them using the wrong positioning logic
-                    case DrawableSliderHead:
-                        return drawableObject.HitObject.Position;
-
-                    // Using hitobject position will cause issues with HitCircle placement due to stack leniency.
-                    case DrawableHitCircle:
-                        return drawableObject.Position;
-
-                    default:
-                        return drawableObject.HitObject.Position;
-                }
-            }
         }
 
         #endregion

From 6dab5ee4cfbad32710777b649d5fd5e6cc1d2c3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 15:13:43 +0900
Subject: [PATCH 1284/2296] Add support for "argon" default skin to expand
 columns when on mobile device

Should ease those looking to play the game on mobile until we
(potentially) have a better solution in the future.

If this works out well, we can consider rolling it out to other skins.

Closes https://github.com/ppy/osu/issues/23377.
---
 .../Skinning/Argon/ManiaArgonSkinTransformer.cs      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index ddd6365c25..f74b7f1d02 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
@@ -99,9 +100,14 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                         return SkinUtils.As<TValue>(new Bindable<float>(30));
 
                     case LegacyManiaSkinConfigurationLookups.ColumnWidth:
-                        return SkinUtils.As<TValue>(new Bindable<float>(
-                            stage.IsSpecialColumn(columnIndex) ? 120 : 60
-                        ));
+
+                        float width = 60;
+
+                        // Best effort until we have better mobile support.
+                        if (RuntimeInfo.IsMobile)
+                            width = 180 * Math.Min(1, 7f / beatmap.TotalColumns);
+
+                        return SkinUtils.As<TValue>(new Bindable<float>(stage.IsSpecialColumn(columnIndex) ? width * 2 : width));
 
                     case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
 

From c83589cb742db95d7fb21df6aa2c00836a01be89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 15:49:10 +0900
Subject: [PATCH 1285/2296] Change osu!mania conversion mod ordering to be more
 appeasing

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 0055e10ada..0c317e0f8a 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -255,16 +255,6 @@ namespace osu.Game.Rulesets.Mania
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new MultiMod(new ManiaModKey4(),
-                            new ManiaModKey5(),
-                            new ManiaModKey6(),
-                            new ManiaModKey7(),
-                            new ManiaModKey8(),
-                            new ManiaModKey9(),
-                            new ManiaModKey10(),
-                            new ManiaModKey1(),
-                            new ManiaModKey2(),
-                            new ManiaModKey3()),
                         new ManiaModRandom(),
                         new ManiaModDualStages(),
                         new ManiaModMirror(),
@@ -272,7 +262,19 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModClassic(),
                         new ManiaModInvert(),
                         new ManiaModConstantSpeed(),
-                        new ManiaModHoldOff()
+                        new ManiaModHoldOff(),
+                        new MultiMod(
+                            new ManiaModKey1(),
+                            new ManiaModKey2(),
+                            new ManiaModKey3(),
+                            new ManiaModKey4(),
+                            new ManiaModKey5(),
+                            new ManiaModKey6(),
+                            new ManiaModKey7(),
+                            new ManiaModKey8(),
+                            new ManiaModKey9(),
+                            new ManiaModKey10()
+                        ),
                     };
 
                 case ModType.Automation:

From ad82ada030715427397d6ef5b0a08b475dbfef31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 08:18:37 +0100
Subject: [PATCH 1286/2296] Trim redundant comments

---
 .../Objects/Drawables/DrawableSpinner.cs                  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2799ba4a25..2e9a4d92ec 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -277,17 +277,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 spinningSample.Frequency.Value = spinning_sample_modulated_base_frequency + Progress;
 
             // Ticks can theoretically be judged at any point in the spinner's duration.
-            // For performance reasons, we only want to keep the next tick alive.
+            // A tick must be alive to correctly play back samples,
+            // but for performance reasons, we only want to keep the next tick alive.
             var next = NestedHitObjects.FirstOrDefault(h => !h.Judged);
 
             // See default `LifetimeStart` as set in `DrawableSpinnerTick`.
             if (next?.LifetimeStart == double.MaxValue)
-            {
-                // the tick can be theoretically judged at any point in the spinner's duration,
-                // so it must be alive throughout the spinner's entire lifetime.
-                // this mostly matters for correct sample playback.
                 next.LifetimeStart = HitObject.StartTime;
-            }
         }
 
         protected override void UpdateAfterChildren()

From 9c1f4b552e651a8d163cd7adf17a0c6ff3e49f08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 17:04:49 +0900
Subject: [PATCH 1287/2296] Rename and invert flags for slider classic
 behaviours

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   |  4 +-
 .../Objects/Drawables/DrawableSlider.cs       | 47 ++++++++++---------
 .../Objects/Drawables/DrawableSliderHead.cs   | 13 ++++-
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  8 +++-
 .../Objects/SliderHeadCircle.cs               |  4 +-
 5 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 8930b4ad70..c668119db7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -41,10 +41,10 @@ namespace osu.Game.Rulesets.Osu.Mods
             switch (hitObject)
             {
                 case Slider slider:
-                    slider.OnlyJudgeNestedObjects = !NoSliderHeadAccuracy.Value;
+                    slider.ClassicSliderBehaviour = NoSliderHeadAccuracy.Value;
 
                     foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
-                        head.JudgeAsNormalHitCircle = !NoSliderHeadAccuracy.Value;
+                        head.ClassicSliderBehaviour = NoSliderHeadAccuracy.Value;
 
                     break;
             }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index cdfe888c99..a053c99a53 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public Container OverlayElementContainer { get; private set; }
 
-        public override bool DisplayResult => !HitObject.OnlyJudgeNestedObjects;
+        public override bool DisplayResult => HitObject.ClassicSliderBehaviour;
 
         [CanBeNull]
         public PlaySliderBody SliderBody => Body.Drawable as PlaySliderBody;
@@ -272,30 +272,31 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || !TailCircle.Judged || Time.Current < HitObject.EndTime)
                 return;
 
-            // If only the nested hitobjects are judged, then the slider's own judgement is ignored for scoring purposes.
-            // But the slider needs to still be judged with a reasonable hit/miss result for visual purposes (hit/miss transforms, etc).
-            if (HitObject.OnlyJudgeNestedObjects)
+            if (HitObject.ClassicSliderBehaviour)
             {
-                ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
-                return;
-            }
-
-            // Otherwise, if this slider also needs to be judged, apply judgement proportionally to the number of nested hitobjects hit. This is the classic osu!stable scoring.
-            ApplyResult(r =>
-            {
-                int totalTicks = NestedHitObjects.Count;
-                int hitTicks = NestedHitObjects.Count(h => h.IsHit);
-
-                if (hitTicks == totalTicks)
-                    r.Type = HitResult.Great;
-                else if (hitTicks == 0)
-                    r.Type = HitResult.Miss;
-                else
+                // Classic behaviour means a slider is judged proportionally to the number of nested hitobjects hit. This is the classic osu!stable scoring.
+                ApplyResult(r =>
                 {
-                    double hitFraction = (double)hitTicks / totalTicks;
-                    r.Type = hitFraction >= 0.5 ? HitResult.Ok : HitResult.Meh;
-                }
-            });
+                    int totalTicks = NestedHitObjects.Count;
+                    int hitTicks = NestedHitObjects.Count(h => h.IsHit);
+
+                    if (hitTicks == totalTicks)
+                        r.Type = HitResult.Great;
+                    else if (hitTicks == 0)
+                        r.Type = HitResult.Miss;
+                    else
+                    {
+                        double hitFraction = (double)hitTicks / totalTicks;
+                        r.Type = hitFraction >= 0.5 ? HitResult.Ok : HitResult.Meh;
+                    }
+                });
+            }
+            else
+            {
+                // If only the nested hitobjects are judged, then the slider's own judgement is ignored for scoring purposes.
+                // But the slider needs to still be judged with a reasonable hit/miss result for visual purposes (hit/miss transforms, etc).
+                ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            }
         }
 
         public override void PlaySamples()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index be6c322668..d99ea70fbd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -16,7 +16,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
 
-        public override bool DisplayResult => HitObject?.JudgeAsNormalHitCircle ?? base.DisplayResult;
+        public override bool DisplayResult
+        {
+            get
+            {
+                if (HitObject?.ClassicSliderBehaviour == true)
+                    return false;
+
+                return base.DisplayResult;
+            }
+        }
 
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
@@ -56,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             Debug.Assert(HitObject != null);
 
-            if (HitObject.JudgeAsNormalHitCircle)
+            if (!HitObject.ClassicSliderBehaviour)
                 return base.ResultFor(timeOffset);
 
             // If not judged as a normal hitcircle, judge as a slider tick instead. This is the classic osu!stable scoring.
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 3cb9b96090..bcbed8b17f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// Whether this <see cref="Slider"/>'s judgement is fully handled by its nested <see cref="HitObject"/>s.
         /// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of nested <see cref="HitObject"/>s hit.
         /// </summary>
-        public bool OnlyJudgeNestedObjects = true;
+        public bool ClassicSliderBehaviour = false;
 
         public BindableNumber<double> SliderVelocityMultiplierBindable { get; } = new BindableDouble(1)
         {
@@ -262,7 +262,11 @@ namespace osu.Game.Rulesets.Osu.Objects
             TailSamples = this.GetNodeSamples(repeatCount + 1);
         }
 
-        public override Judgement CreateJudgement() => OnlyJudgeNestedObjects ? new OsuIgnoreJudgement() : new OsuJudgement();
+        public override Judgement CreateJudgement() => ClassicSliderBehaviour
+            // See logic in `DrawableSlider.CheckForResult()`
+            ? new OsuJudgement()
+            // Of note, this creates a combo discrepancy for non-classic-mod sliders (there is no combo increase for tail or slider judgement).
+            : new OsuIgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index 73c222653e..4712d61dfe 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -12,8 +12,8 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// Whether to treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
         /// If <c>false</c>, this <see cref="SliderHeadCircle"/> will be judged as a <see cref="SliderTick"/> instead.
         /// </summary>
-        public bool JudgeAsNormalHitCircle = true;
+        public bool ClassicSliderBehaviour;
 
-        public override Judgement CreateJudgement() => JudgeAsNormalHitCircle ? base.CreateJudgement() : new SliderTickJudgement();
+        public override Judgement CreateJudgement() => ClassicSliderBehaviour ? new SliderTickJudgement() : base.CreateJudgement();
     }
 }

From 9af2a5930cf3696ffecea558e94bcec01b642ace Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 17:39:41 +0900
Subject: [PATCH 1288/2296] Remove redundant passing of `Scale` to nested
 objects

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index bcbed8b17f..0859a6fe17 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -187,7 +187,6 @@ namespace osu.Game.Rulesets.Osu.Objects
                             StartTime = e.Time,
                             Position = Position + Path.PositionAt(e.PathProgress),
                             StackHeight = StackHeight,
-                            Scale = Scale,
                         });
                         break;
 
@@ -206,7 +205,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                             RepeatIndex = e.SpanIndex,
                             StartTime = e.Time,
                             Position = EndPosition,
-                            StackHeight = StackHeight
+                            StackHeight = StackHeight,
                         });
                         break;
 
@@ -217,7 +216,6 @@ namespace osu.Game.Rulesets.Osu.Objects
                             StartTime = StartTime + (e.SpanIndex + 1) * SpanDuration,
                             Position = Position + Path.PositionAt(e.PathProgress),
                             StackHeight = StackHeight,
-                            Scale = Scale,
                         });
                         break;
                 }

From a7705284e7b56bcedaee756ec8f37432f029d62c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 18:02:47 +0900
Subject: [PATCH 1289/2296] Add better commenting around `DrawableSliderHead`
 logic

---
 .../Objects/Drawables/DrawableSliderHead.cs        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index d99ea70fbd..8463c78319 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -65,12 +65,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             Debug.Assert(HitObject != null);
 
-            if (!HitObject.ClassicSliderBehaviour)
-                return base.ResultFor(timeOffset);
-
-            // If not judged as a normal hitcircle, judge as a slider tick instead. This is the classic osu!stable scoring.
-            var result = base.ResultFor(timeOffset);
-            return result.IsHit() ? HitResult.LargeTickHit : HitResult.LargeTickMiss;
+            return HitObject.ClassicSliderBehaviour
+                // In classic slider behaviour, heads are considered fully hit if in the largest hit window.
+                // We can't award a full Great because the true Great judgement is awarded on the Slider itself,
+                // reduced based on number of ticks hit.
+                //
+                // so we use the most suitable LargeTick judgement here instead.
+                ? base.ResultFor(timeOffset).IsHit() ? HitResult.LargeTickHit : HitResult.LargeTickMiss
+                : base.ResultFor(timeOffset);
         }
 
         public override void Shake()

From bf9f20705f06e3094ae7e772f4ac59fa45472856 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 17:39:23 +0900
Subject: [PATCH 1290/2296] Simplify classic behaviour flag to only need to be
 specified on the slider itself

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs |  4 ----
 osu.Game.Rulesets.Osu/Objects/Slider.cs     | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index c668119db7..f20f95b384 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -42,10 +42,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 case Slider slider:
                     slider.ClassicSliderBehaviour = NoSliderHeadAccuracy.Value;
-
-                    foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
-                        head.ClassicSliderBehaviour = NoSliderHeadAccuracy.Value;
-
                     break;
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 0859a6fe17..50791183f5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -127,7 +127,18 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// Whether this <see cref="Slider"/>'s judgement is fully handled by its nested <see cref="HitObject"/>s.
         /// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of nested <see cref="HitObject"/>s hit.
         /// </summary>
-        public bool ClassicSliderBehaviour = false;
+        public bool ClassicSliderBehaviour
+        {
+            get => classicSliderBehaviour;
+            set
+            {
+                classicSliderBehaviour = value;
+                if (HeadCircle != null)
+                    HeadCircle.ClassicSliderBehaviour = value;
+            }
+        }
+
+        private bool classicSliderBehaviour;
 
         public BindableNumber<double> SliderVelocityMultiplierBindable { get; } = new BindableDouble(1)
         {
@@ -196,6 +207,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                             StartTime = e.Time,
                             Position = Position,
                             StackHeight = StackHeight,
+                            ClassicSliderBehaviour = ClassicSliderBehaviour,
                         });
                         break;
 

From 818432fab4279b6691286483b6be88eb663e84c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 19:27:55 +0900
Subject: [PATCH 1291/2296] Fix non-classic osu! combo not matching
 expectations

---
 osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs |  9 +++++++++
 osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs    | 11 -----------
 .../Objects/SliderTailCircle.cs                  | 16 ++++++++++++++--
 osu.Game/Rulesets/Scoring/HitResult.cs           |  3 +++
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
index ddbbb300ca..88a34fcb8f 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderEndCircle.cs
@@ -3,6 +3,8 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
@@ -43,5 +45,12 @@ namespace osu.Game.Rulesets.Osu.Objects
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        public override Judgement CreateJudgement() => new SliderEndJudgement();
+
+        public class SliderEndJudgement : OsuJudgement
+        {
+            public override HitResult MaxResult => HitResult.LargeTickHit;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
index cca86361c2..e95cfd369d 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderRepeat.cs
@@ -1,10 +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.Judgements;
-using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Rulesets.Scoring;
-
 namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SliderRepeat : SliderEndCircle
@@ -13,12 +9,5 @@ namespace osu.Game.Rulesets.Osu.Objects
             : base(slider)
         {
         }
-
-        public override Judgement CreateJudgement() => new SliderRepeatJudgement();
-
-        public class SliderRepeatJudgement : OsuJudgement
-        {
-            public override HitResult MaxResult => HitResult.LargeTickHit;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index 54d2afb444..357476ed30 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -9,16 +9,28 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SliderTailCircle : SliderEndCircle
     {
+        /// <summary>
+        /// Whether to treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
+        /// If <c>false</c>, this <see cref="SliderHeadCircle"/> will be judged as a <see cref="SliderTick"/> instead.
+        /// </summary>
+        public bool ClassicSliderBehaviour;
+
         public SliderTailCircle(Slider slider)
             : base(slider)
         {
         }
 
-        public override Judgement CreateJudgement() => new SliderTailJudgement();
+        public override Judgement CreateJudgement() => ClassicSliderBehaviour ? new LegacyTailJudgement() : new TailJudgement();
 
-        public class SliderTailJudgement : OsuJudgement
+        public class LegacyTailJudgement : OsuJudgement
         {
             public override HitResult MaxResult => HitResult.SmallTickHit;
         }
+
+        public class TailJudgement : SliderEndJudgement
+        {
+            public override HitResult MaxResult => HitResult.LargeTickHit;
+            public override HitResult MinResult => HitResult.IgnoreMiss;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index fed338b012..6380b73558 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -350,6 +350,9 @@ namespace osu.Game.Rulesets.Scoring
             if (maxResult.IsBonus() && minResult != HitResult.IgnoreMiss)
                 throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.IgnoreMiss} is the only valid minimum result for a {maxResult} judgement.");
 
+            if (minResult == HitResult.IgnoreMiss)
+                return;
+
             if (maxResult == HitResult.LargeTickHit && minResult != HitResult.LargeTickMiss)
                 throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.LargeTickMiss} is the only valid minimum result for a {maxResult} judgement.");
 

From 704f5a6de3a4dba381efc0dc62a77ce1cb166f7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 19:40:20 +0900
Subject: [PATCH 1292/2296] Adjust sizing slightly to ensure we stay within
 1366 limits

---
 .../Skinning/Argon/ManiaArgonSkinTransformer.cs        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index f74b7f1d02..ca7f84cb4d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -101,13 +101,17 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                     case LegacyManiaSkinConfigurationLookups.ColumnWidth:
 
-                        float width = 60;
+                        float width;
+
+                        bool isSpecialColumn = stage.IsSpecialColumn(columnIndex);
 
                         // Best effort until we have better mobile support.
                         if (RuntimeInfo.IsMobile)
-                            width = 180 * Math.Min(1, 7f / beatmap.TotalColumns);
+                            width = 170 * Math.Min(1, 7f / beatmap.TotalColumns) * (isSpecialColumn ? 1.8f : 1);
+                        else
+                            width = 60 * (isSpecialColumn ? 2 : 1);
 
-                        return SkinUtils.As<TValue>(new Bindable<float>(stage.IsSpecialColumn(columnIndex) ? width * 2 : width));
+                        return SkinUtils.As<TValue>(new Bindable<float>(width));
 
                     case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
 

From f0f595ca40ab02cd0637a50ce0246d05423fc0c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 19:52:49 +0900
Subject: [PATCH 1293/2296] Continue to play spinner bonus sounds when MAX
 display occurs

---
 .../Objects/Drawables/DrawableSpinner.cs             | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 2e9a4d92ec..aa43532f65 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -303,6 +303,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
+        private int lastMaxSamplePlayback;
+
         private void updateBonusScore()
         {
             if (ticks.Count == 0)
@@ -322,7 +324,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 var tick = ticks.FirstOrDefault(t => !t.Result.HasResult);
 
                 // tick may be null if we've hit the spin limit.
-                tick?.TriggerResult(true);
+                if (tick == null)
+                {
+                    // we still want to play a sound. this will probably be a new sound in the future, but for now let's continue playing the bonus sound.
+                    // round robin to avoid hitting playback concurrency.
+                    tick = ticks.OfType<DrawableSpinnerBonusTick>().Skip(lastMaxSamplePlayback++ % HitObject.MaximumBonusSpins).First();
+                    tick.PlaySamples();
+                }
+                else
+                    tick.TriggerResult(true);
 
                 completedFullSpins.Value++;
             }

From ac6fb386d137a13eae242fa65cf417e3d6ec4abb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 2 Nov 2023 23:42:52 +0900
Subject: [PATCH 1294/2296] Remove nested ternary

---
 .../Objects/Drawables/DrawableSliderHead.cs           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 8463c78319..83882481a8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -65,14 +65,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             Debug.Assert(HitObject != null);
 
-            return HitObject.ClassicSliderBehaviour
-                // In classic slider behaviour, heads are considered fully hit if in the largest hit window.
+            if (HitObject.ClassicSliderBehaviour)
+            {
+                // With classic slider behaviour, heads are considered fully hit if in the largest hit window.
                 // We can't award a full Great because the true Great judgement is awarded on the Slider itself,
                 // reduced based on number of ticks hit.
                 //
                 // so we use the most suitable LargeTick judgement here instead.
-                ? base.ResultFor(timeOffset).IsHit() ? HitResult.LargeTickHit : HitResult.LargeTickMiss
-                : base.ResultFor(timeOffset);
+                return base.ResultFor(timeOffset).IsHit() ? HitResult.LargeTickHit : HitResult.LargeTickMiss;
+            }
+
+            return base.ResultFor(timeOffset);
         }
 
         public override void Shake()

From 86ede717cbeb705a7036276b49e5c53aeb6ecc53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 18:52:47 +0100
Subject: [PATCH 1295/2296] Clean up comment

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 83882481a8..ff690417a8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -69,8 +69,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 // With classic slider behaviour, heads are considered fully hit if in the largest hit window.
                 // We can't award a full Great because the true Great judgement is awarded on the Slider itself,
-                // reduced based on number of ticks hit.
-                //
+                // reduced based on number of ticks hit,
                 // so we use the most suitable LargeTick judgement here instead.
                 return base.ResultFor(timeOffset).IsHit() ? HitResult.LargeTickHit : HitResult.LargeTickMiss;
             }

From a0757ce13f3156c526d51b7d3be6afcd47436230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 18:58:14 +0100
Subject: [PATCH 1296/2296] Update xmldoc to match flipped flag semantics

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs           | 4 ++--
 osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 50791183f5..7f2d9592af 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -124,8 +124,8 @@ namespace osu.Game.Rulesets.Osu.Objects
         public double TickDistanceMultiplier = 1;
 
         /// <summary>
-        /// Whether this <see cref="Slider"/>'s judgement is fully handled by its nested <see cref="HitObject"/>s.
-        /// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of nested <see cref="HitObject"/>s hit.
+        /// If <see langword="false"/>, <see cref="Slider"/>'s judgement is fully handled by its nested <see cref="HitObject"/>s.
+        /// If <see langword="true"/>, this <see cref="Slider"/> will be judged proportionally to the number of nested <see cref="HitObject"/>s hit.
         /// </summary>
         public bool ClassicSliderBehaviour
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index 4712d61dfe..8305481788 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -9,8 +9,8 @@ namespace osu.Game.Rulesets.Osu.Objects
     public class SliderHeadCircle : HitCircle
     {
         /// <summary>
-        /// Whether to treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
-        /// If <c>false</c>, this <see cref="SliderHeadCircle"/> will be judged as a <see cref="SliderTick"/> instead.
+        /// If <see langword="false"/>, treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
+        /// If <see langword="true"/>, this <see cref="SliderHeadCircle"/> will be judged as a <see cref="SliderTick"/> instead.
         /// </summary>
         public bool ClassicSliderBehaviour;
 

From 9f11a04cc731159c6d2c0e4f7084238f6bd88360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 13:24:01 +0100
Subject: [PATCH 1297/2296] Generalise notion of 'touch device' mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs |  9 +--------
 osu.Game/Rulesets/Mods/ModTouchDevice.cs        | 16 ++++++++++++++++
 osu.Game/Rulesets/Ruleset.cs                    |  2 ++
 3 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ModTouchDevice.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
index fd5c46a226..abb67c519b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
@@ -1,18 +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.Localisation;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModTouchDevice : Mod
+    public class OsuModTouchDevice : ModTouchDevice
     {
-        public override string Name => "Touch Device";
-        public override string Acronym => "TD";
-        public override LocalisableString Description => "Automatically applied to plays on devices with a touchscreen.";
-        public override double ScoreMultiplier => 1;
-
-        public override ModType Type => ModType.System;
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTouchDevice.cs b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
new file mode 100644
index 0000000000..2daea8ea5d
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModTouchDevice.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.Localisation;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public class ModTouchDevice : Mod
+    {
+        public sealed override string Name => "Touch Device";
+        public sealed override string Acronym => "TD";
+        public sealed override LocalisableString Description => "Automatically applied to plays on devices with a touchscreen.";
+        public sealed override double ScoreMultiplier => 1;
+        public sealed override ModType Type => ModType.System;
+    }
+}
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index be0d757e06..f8aa6c9f57 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -204,6 +204,8 @@ namespace osu.Game.Rulesets
 
         public ModAutoplay? GetAutoplayMod() => CreateMod<ModAutoplay>();
 
+        public ModTouchDevice? GetTouchDeviceMod() => CreateMod<ModTouchDevice>();
+
         /// <summary>
         /// Create a transformer which adds lookups specific to a ruleset to skin sources.
         /// </summary>

From 68efb3c110aa3617fb801cb8afe6b7fb15afcba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 19:25:57 +0100
Subject: [PATCH 1298/2296] Mark `ModTouchDevice` as always valid for
 submission

---
 osu.Game/Rulesets/Mods/IMod.cs           | 7 +++++++
 osu.Game/Rulesets/Mods/Mod.cs            | 4 ++++
 osu.Game/Rulesets/Mods/ModTouchDevice.cs | 1 +
 3 files changed, 12 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/IMod.cs b/osu.Game/Rulesets/Mods/IMod.cs
index ce2d123884..744d02a4fa 100644
--- a/osu.Game/Rulesets/Mods/IMod.cs
+++ b/osu.Game/Rulesets/Mods/IMod.cs
@@ -59,6 +59,13 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         bool ValidForMultiplayerAsFreeMod { get; }
 
+        /// <summary>
+        /// Indicates that this mod is always permitted in scenarios wherein a user is submitting a score regardless of other circumstances.
+        /// Intended for mods that are informational in nature and do not really affect gameplay by themselves,
+        /// but are more of a gauge of increased/decreased difficulty due to the user's configuration (e.g. <see cref="ModTouchDevice"/>).
+        /// </summary>
+        bool AlwaysValidForSubmission { get; }
+
         /// <summary>
         /// Create a fresh <see cref="Mod"/> instance based on this mod.
         /// </summary>
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 49c2fdd394..775f6a0ed4 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -156,6 +156,10 @@ namespace osu.Game.Rulesets.Mods
         [JsonIgnore]
         public virtual bool ValidForMultiplayerAsFreeMod => true;
 
+        /// <inheritdoc/>
+        [JsonIgnore]
+        public virtual bool AlwaysValidForSubmission => false;
+
         /// <summary>
         /// Whether this mod requires configuration to apply changes to the game.
         /// </summary>
diff --git a/osu.Game/Rulesets/Mods/ModTouchDevice.cs b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
index 2daea8ea5d..0865603c8c 100644
--- a/osu.Game/Rulesets/Mods/ModTouchDevice.cs
+++ b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
@@ -12,5 +12,6 @@ namespace osu.Game.Rulesets.Mods
         public sealed override LocalisableString Description => "Automatically applied to plays on devices with a touchscreen.";
         public sealed override double ScoreMultiplier => 1;
         public sealed override ModType Type => ModType.System;
+        public sealed override bool AlwaysValidForSubmission => true;
     }
 }

From 980c900f43aa958e25d519e687a4a2e224d2399c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 14:08:56 +0100
Subject: [PATCH 1299/2296] Add component for game-wide touch detection

---
 .../Navigation/TestSceneScreenNavigation.cs   | 22 ++++++++++
 osu.Game/Configuration/SessionStatics.cs      | 10 ++++-
 osu.Game/Input/TouchInputInterceptor.cs       | 41 +++++++++++++++++++
 osu.Game/OsuGameBase.cs                       |  2 +
 4 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Input/TouchInputInterceptor.cs

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 9e743ef336..f4318da403 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -12,6 +12,7 @@ using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
@@ -835,6 +836,27 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("exit dialog is shown", () => Game.Dependencies.Get<IDialogOverlay>().CurrentDialog is ConfirmExitDialog);
         }
 
+        [Test]
+        public void TestTouchScreenDetection()
+        {
+            AddStep("touch logo", () =>
+            {
+                var button = Game.ChildrenOfType<OsuLogo>().Single();
+                var touch = new Touch(TouchSource.Touch1, button.ScreenSpaceDrawQuad.Centre);
+                InputManager.BeginTouch(touch);
+                InputManager.EndTouch(touch);
+            });
+            AddAssert("touch screen detected active", () => Game.Dependencies.Get<SessionStatics>().Get<bool>(Static.TouchInputActive), () => Is.True);
+
+            AddStep("click settings button", () =>
+            {
+                var button = Game.ChildrenOfType<MainMenuButton>().Last();
+                InputManager.MoveMouseTo(button);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("touch screen detected inactive", () => Game.Dependencies.Get<SessionStatics>().Get<bool>(Static.TouchInputActive), () => Is.False);
+        }
+
         private Func<Player> playToResults()
         {
             var player = playToCompletion();
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 5e2f0c2128..0fc2076a7e 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -24,6 +25,7 @@ namespace osu.Game.Configuration
             SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
             SetDefault(Static.LastModSelectPanelSamplePlaybackTime, (double?)null);
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
+            SetDefault(Static.TouchInputActive, false);
         }
 
         /// <summary>
@@ -63,6 +65,12 @@ namespace osu.Game.Configuration
         /// The last playback time in milliseconds of an on/off sample (from <see cref="ModSelectPanel"/>).
         /// Used to debounce <see cref="ModSelectPanel"/> on/off sounds game-wide to avoid volume saturation, especially in activating mod presets with many mods.
         /// </summary>
-        LastModSelectPanelSamplePlaybackTime
+        LastModSelectPanelSamplePlaybackTime,
+
+        /// <summary>
+        /// Whether the last positional input received was a touch input.
+        /// Used in touchscreen detection scenarios (<see cref="TouchInputInterceptor"/>).
+        /// </summary>
+        TouchInputActive,
     }
 }
diff --git a/osu.Game/Input/TouchInputInterceptor.cs b/osu.Game/Input/TouchInputInterceptor.cs
new file mode 100644
index 0000000000..377d3c6d9f
--- /dev/null
+++ b/osu.Game/Input/TouchInputInterceptor.cs
@@ -0,0 +1,41 @@
+// 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.Input.Events;
+using osu.Framework.Input.StateChanges;
+using osu.Game.Configuration;
+using osuTK;
+
+namespace osu.Game.Input
+{
+    /// <summary>
+    /// Intercepts all positional input events and sets the appropriate <see cref="Static.TouchInputActive"/> value
+    /// for consumption by particular game screens.
+    /// </summary>
+    public partial class TouchInputInterceptor : Component
+    {
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
+        [Resolved]
+        private SessionStatics statics { get; set; } = null!;
+
+        protected override bool Handle(UIEvent e)
+        {
+            switch (e)
+            {
+                case MouseEvent:
+                    if (e.CurrentState.Mouse.LastSource is not ISourcedFromTouch)
+                        statics.SetValue(Static.TouchInputActive, false);
+                    break;
+
+                case TouchEvent:
+                    statics.SetValue(Static.TouchInputActive, true);
+                    break;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 1f46eb0c0d..e4376d1c02 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -407,6 +407,8 @@ namespace osu.Game
                 })
             });
 
+            base.Content.Add(new TouchInputInterceptor());
+
             KeyBindingStore = new RealmKeyBindingStore(realm, keyCombinationProvider);
             KeyBindingStore.Register(globalBindings, RulesetStore.AvailableRulesets);
 

From 2f6ff893b550a18ec1f4791d45c96c5dcb3e99cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 14:38:20 +0100
Subject: [PATCH 1300/2296] Automatically activate and deactivate touch device
 mod in song select

---
 .../Navigation/TestSceneScreenNavigation.cs   | 42 ++++++++++++++
 osu.Game/Rulesets/Mods/ModTouchDevice.cs      |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  1 +
 .../Select/SongSelectTouchInputHandler.cs     | 56 +++++++++++++++++++
 osu.Game/Utils/ModUtils.cs                    |  2 +-
 5 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Screens/Select/SongSelectTouchInputHandler.cs

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index f4318da403..0ba8f7136d 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -855,6 +855,48 @@ namespace osu.Game.Tests.Visual.Navigation
                 InputManager.Click(MouseButton.Left);
             });
             AddAssert("touch screen detected inactive", () => Game.Dependencies.Get<SessionStatics>().Get<bool>(Static.TouchInputActive), () => Is.False);
+
+            AddStep("close settings sidebar", () => InputManager.Key(Key.Escape));
+
+            PushAndConfirm(() => new TestPlaySongSelect());
+            AddStep("switch to osu! ruleset", () =>
+            {
+                InputManager.PressKey(Key.LControl);
+                InputManager.Key(Key.Number1);
+                InputManager.ReleaseKey(Key.LControl);
+            });
+            AddStep("touch beatmap wedge", () =>
+            {
+                var wedge = Game.ChildrenOfType<BeatmapInfoWedge>().Single();
+                var touch = new Touch(TouchSource.Touch2, wedge.ScreenSpaceDrawQuad.Centre);
+                InputManager.BeginTouch(touch);
+                InputManager.EndTouch(touch);
+            });
+            AddUntilStep("touch device mod activated", () => Game.SelectedMods.Value, () => Has.One.InstanceOf<ModTouchDevice>());
+
+            AddStep("switch to mania ruleset", () =>
+            {
+                InputManager.PressKey(Key.LControl);
+                InputManager.Key(Key.Number4);
+                InputManager.ReleaseKey(Key.LControl);
+            });
+            AddUntilStep("touch device mod not activated", () => Game.SelectedMods.Value, () => Has.None.InstanceOf<ModTouchDevice>());
+            AddStep("touch beatmap wedge", () =>
+            {
+                var wedge = Game.ChildrenOfType<BeatmapInfoWedge>().Single();
+                var touch = new Touch(TouchSource.Touch2, wedge.ScreenSpaceDrawQuad.Centre);
+                InputManager.BeginTouch(touch);
+                InputManager.EndTouch(touch);
+            });
+            AddUntilStep("touch device mod not activated", () => Game.SelectedMods.Value, () => Has.None.InstanceOf<ModTouchDevice>());
+
+            AddStep("switch to osu! ruleset", () =>
+            {
+                InputManager.PressKey(Key.LControl);
+                InputManager.Key(Key.Number1);
+                InputManager.ReleaseKey(Key.LControl);
+            });
+            AddUntilStep("touch device mod activated", () => Game.SelectedMods.Value, () => Has.One.InstanceOf<ModTouchDevice>());
         }
 
         private Func<Player> playToResults()
diff --git a/osu.Game/Rulesets/Mods/ModTouchDevice.cs b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
index 0865603c8c..f532e7b19d 100644
--- a/osu.Game/Rulesets/Mods/ModTouchDevice.cs
+++ b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
@@ -5,7 +5,7 @@ using osu.Framework.Localisation;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public class ModTouchDevice : Mod
+    public class ModTouchDevice : Mod, IApplicableMod
     {
         public sealed override string Name => "Touch Device";
         public sealed override string Acronym => "TD";
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index dfea4e3794..74454713d1 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -279,6 +279,7 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
+                new SongSelectTouchInputHandler()
             });
 
             if (ShowFooter)
diff --git a/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs b/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs
new file mode 100644
index 0000000000..bf4761e871
--- /dev/null
+++ b/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs
@@ -0,0 +1,56 @@
+// 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.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Screens.Select
+{
+    public partial class SongSelectTouchInputHandler : Component
+    {
+        [Resolved]
+        private Bindable<RulesetInfo> ruleset { get; set; } = null!;
+
+        [Resolved]
+        private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
+
+        private IBindable<bool> touchActive = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(SessionStatics statics)
+        {
+            touchActive = statics.GetBindable<bool>(Static.TouchInputActive);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ruleset.BindValueChanged(_ => updateState());
+            mods.BindValueChanged(_ => updateState());
+            touchActive.BindValueChanged(_ => updateState());
+            updateState();
+        }
+
+        private void updateState()
+        {
+            var touchDeviceMod = ruleset.Value.CreateInstance().GetTouchDeviceMod();
+
+            if (touchDeviceMod == null)
+                return;
+
+            bool touchDeviceModEnabled = mods.Value.Any(mod => mod is ModTouchDevice);
+
+            if (touchActive.Value && !touchDeviceModEnabled)
+                mods.Value = mods.Value.Append(touchDeviceMod).ToArray();
+            if (!touchActive.Value && touchDeviceModEnabled)
+                mods.Value = mods.Value.Where(mod => mod is not ModTouchDevice).ToArray();
+        }
+    }
+}
diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index edf9cc80da..1bd60fcdde 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Utils
             if (!CheckCompatibleSet(mods, out invalidMods))
                 return false;
 
-            return checkValid(mods, m => m.Type != ModType.System && m.HasImplementation, out invalidMods);
+            return checkValid(mods, m => m.HasImplementation, out invalidMods);
         }
 
         /// <summary>

From 29d4d81eaab886e0f99bd2c579a1425a41b4b17f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 25 Oct 2023 19:56:51 +0200
Subject: [PATCH 1301/2296] Add test scene for basic touchscreen detection
 scenarios

---
 .../Mods/TestSceneOsuModTouchDevice.cs        | 134 ++++++++++++++++++
 .../Navigation/TestSceneScreenNavigation.cs   |   5 +-
 2 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
new file mode 100644
index 0000000000..9c84bcc241
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
@@ -0,0 +1,134 @@
+// 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.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Overlays;
+using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Tests.Visual;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public partial class TestSceneOsuModTouchDevice : PlayerTestScene
+    {
+        private TestOnScreenDisplay testOnScreenDisplay = null!;
+
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) =>
+            new OsuBeatmap
+            {
+                HitObjects =
+                {
+                    new HitCircle
+                    {
+                        Position = OsuPlayfield.BASE_SIZE / 2,
+                        StartTime = 0,
+                    },
+                    new HitCircle
+                    {
+                        Position = OsuPlayfield.BASE_SIZE / 2,
+                        StartTime = 5000,
+                    },
+                },
+                Breaks =
+                {
+                    new BreakPeriod(2000, 3000)
+                }
+            };
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Add(testOnScreenDisplay = new TestOnScreenDisplay());
+            Dependencies.CacheAs<OnScreenDisplay>(testOnScreenDisplay);
+        }
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("reset OSD toast count", () => testOnScreenDisplay.ToastCount = 0);
+        }
+
+        [Test]
+        public void TestFirstObjectTouched()
+        {
+            AddUntilStep("wait until 0 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0).Within(500));
+            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
+            AddUntilStep("wait until 0", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
+            AddStep("touch circle", () =>
+            {
+                var touch = new Touch(TouchSource.Touch1, Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                InputManager.BeginTouch(touch);
+                InputManager.EndTouch(touch);
+            });
+            AddAssert("touch device mod activated", () => Player.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
+            AddAssert("no toasts displayed", () => testOnScreenDisplay.ToastCount, () => Is.Zero);
+        }
+
+        [Test]
+        public void TestTouchDuringBreak()
+        {
+            AddUntilStep("wait until 2000 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(2000).Within(500));
+            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
+            AddUntilStep("wait until 2000", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(2000));
+            AddStep("touch playfield", () =>
+            {
+                var touch = new Touch(TouchSource.Touch1, Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                InputManager.BeginTouch(touch);
+                InputManager.EndTouch(touch);
+            });
+            AddAssert("touch device mod not activated", () => Player.Score.ScoreInfo.Mods, () => Has.None.InstanceOf<OsuModTouchDevice>());
+            AddAssert("no toasts displayed", () => testOnScreenDisplay.ToastCount, () => Is.Zero);
+        }
+
+        [Test]
+        public void TestSecondObjectTouched()
+        {
+            // ensure mouse is active (and that it's not suppressed due to touches in previous tests)
+            AddStep("click mouse", () => InputManager.Click(MouseButton.Left));
+
+            AddUntilStep("wait until 0 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0).Within(500));
+            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
+            AddUntilStep("wait until 0", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
+            AddStep("click circle", () =>
+            {
+                InputManager.MoveMouseTo(Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("touch device mod not activated", () => Player.Mods.Value, () => Has.No.InstanceOf<OsuModTouchDevice>());
+
+            AddStep("speed back up", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 1);
+            AddUntilStep("wait until 5000 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(5000).Within(500));
+            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
+            AddUntilStep("wait until 5000", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(5000));
+            AddStep("touch playfield", () =>
+            {
+                var touch = new Touch(TouchSource.Touch1, Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                InputManager.BeginTouch(touch);
+                InputManager.EndTouch(touch);
+            });
+            AddAssert("touch device mod activated", () => Player.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
+            AddAssert("toast displayed", () => testOnScreenDisplay.ToastCount, () => Is.EqualTo(1));
+        }
+
+        private partial class TestOnScreenDisplay : OnScreenDisplay
+        {
+            public int ToastCount { get; set; }
+
+            protected override void DisplayTemporarily(Drawable toDisplay)
+            {
+                base.DisplayTemporarily(toDisplay);
+                ToastCount++;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 0ba8f7136d..10c1104376 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -858,7 +858,10 @@ namespace osu.Game.Tests.Visual.Navigation
 
             AddStep("close settings sidebar", () => InputManager.Key(Key.Escape));
 
-            PushAndConfirm(() => new TestPlaySongSelect());
+            Screens.Select.SongSelect songSelect = null;
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
+            AddUntilStep("wait for song select", () => songSelect.BeatmapSetsLoaded);
+
             AddStep("switch to osu! ruleset", () =>
             {
                 InputManager.PressKey(Key.LControl);

From f2df02b60f7e78a4e1fad2c591c24dfe14271c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 25 Oct 2023 20:27:07 +0200
Subject: [PATCH 1302/2296] Automatically activate touch device mod in player

---
 .../Mods/TestSceneOsuModTouchDevice.cs        | 18 +++++-
 .../Overlays/OSD/TouchDeviceDetectedToast.cs  | 13 ++++
 osu.Game/Screens/Play/Player.cs               |  1 +
 .../Screens/Play/PlayerTouchInputHandler.cs   | 61 +++++++++++++++++++
 4 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs
 create mode 100644 osu.Game/Screens/Play/PlayerTouchInputHandler.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
index 9c84bcc241..5134265741 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
@@ -1,12 +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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Configuration;
+using osu.Game.Input;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Mods;
@@ -19,6 +22,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public partial class TestSceneOsuModTouchDevice : PlayerTestScene
     {
+        [Resolved]
+        private SessionStatics statics { get; set; } = null!;
+
         private TestOnScreenDisplay testOnScreenDisplay = null!;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
@@ -49,18 +55,26 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         private void load()
         {
             Add(testOnScreenDisplay = new TestOnScreenDisplay());
+            Add(new TouchInputInterceptor());
             Dependencies.CacheAs<OnScreenDisplay>(testOnScreenDisplay);
         }
 
         public override void SetUpSteps()
         {
-            base.SetUpSteps();
             AddStep("reset OSD toast count", () => testOnScreenDisplay.ToastCount = 0);
+            AddStep("reset static", () => statics.SetValue(Static.TouchInputActive, false));
+            base.SetUpSteps();
         }
 
         [Test]
-        public void TestFirstObjectTouched()
+        public void TestUserAlreadyHasTouchDeviceActive()
         {
+            // it is presumed that a previous screen (i.e. song select) will set this up
+            AddStep("set up touchscreen user", () =>
+            {
+                Player.Score.ScoreInfo.Mods = Player.Score.ScoreInfo.Mods.Append(new OsuModTouchDevice()).ToArray();
+                statics.SetValue(Static.TouchInputActive, true);
+            });
             AddUntilStep("wait until 0 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0).Within(500));
             AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
             AddUntilStep("wait until 0", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
diff --git a/osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs b/osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs
new file mode 100644
index 0000000000..0b5e3fffbe
--- /dev/null
+++ b/osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs
@@ -0,0 +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.
+
+namespace osu.Game.Overlays.OSD
+{
+    public partial class TouchDeviceDetectedToast : Toast
+    {
+        public TouchDeviceDetectedToast()
+            : base("osu!", "Touch device detected", "Touch Device mod applied to score")
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8c7fc551ba..a67e16912d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -285,6 +285,7 @@ namespace osu.Game.Screens.Play
                             fadeOut(true);
                     },
                 },
+                new PlayerTouchInputHandler()
             });
 
             if (cancellationToken.IsCancellationRequested)
diff --git a/osu.Game/Screens/Play/PlayerTouchInputHandler.cs b/osu.Game/Screens/Play/PlayerTouchInputHandler.cs
new file mode 100644
index 0000000000..0252ee9503
--- /dev/null
+++ b/osu.Game/Screens/Play/PlayerTouchInputHandler.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.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Overlays;
+using osu.Game.Overlays.OSD;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Screens.Play
+{
+    public partial class PlayerTouchInputHandler : Component
+    {
+        [Resolved]
+        private Player player { get; set; } = null!;
+
+        [Resolved]
+        private GameplayState gameplayState { get; set; } = null!;
+
+        [Resolved]
+        private OnScreenDisplay? onScreenDisplay { get; set; }
+
+        private IBindable<bool> touchActive = new BindableBool();
+
+        [BackgroundDependencyLoader]
+        private void load(SessionStatics statics)
+        {
+            touchActive = statics.GetBindable<bool>(Static.TouchInputActive);
+            touchActive.BindValueChanged(_ => updateState());
+        }
+
+        private void updateState()
+        {
+            if (!touchActive.Value)
+                return;
+
+            if (gameplayState.HasPassed || gameplayState.HasFailed || gameplayState.HasQuit)
+                return;
+
+            if (gameplayState.Score.ScoreInfo.Mods.OfType<ModTouchDevice>().Any())
+                return;
+
+            if (player.IsBreakTime.Value)
+                return;
+
+            var touchDeviceMod = gameplayState.Ruleset.GetTouchDeviceMod();
+            if (touchDeviceMod == null)
+                return;
+
+            onScreenDisplay?.Display(new TouchDeviceDetectedToast());
+
+            // TODO: this is kinda crude. `Player` (probably rightly so) assumes immutability of mods.
+            // this probably should be shown immediately on screen in the HUD,
+            // which means that immutability will probably need to be revisited.
+            player.Score.ScoreInfo.Mods = player.Score.ScoreInfo.Mods.Append(touchDeviceMod).ToArray();
+        }
+    }
+}

From 21a4da463b11d557a815581cdb09121a9ea0a94d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 31 Oct 2023 13:47:50 +0100
Subject: [PATCH 1303/2296] Add failing test covering crash scenario

---
 .../Navigation/TestSceneScreenNavigation.cs   | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 10c1104376..a1fd8768b6 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -900,6 +900,38 @@ namespace osu.Game.Tests.Visual.Navigation
                 InputManager.ReleaseKey(Key.LControl);
             });
             AddUntilStep("touch device mod activated", () => Game.SelectedMods.Value, () => Has.One.InstanceOf<ModTouchDevice>());
+
+            AddStep("click beatmap wedge", () =>
+            {
+                InputManager.MoveMouseTo(Game.ChildrenOfType<BeatmapInfoWedge>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+            AddUntilStep("touch device mod not activated", () => Game.SelectedMods.Value, () => Has.None.InstanceOf<ModTouchDevice>());
+
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+
+            Player player = null;
+
+            AddUntilStep("wait for player", () =>
+            {
+                DismissAnyNotifications();
+                return (player = Game.ScreenStack.CurrentScreen as Player) != null;
+            });
+
+            AddUntilStep("wait for track playing", () => Game.Beatmap.Value.Track.IsRunning);
+
+            AddStep("touch", () =>
+            {
+                var touch = new Touch(TouchSource.Touch2, Game.ScreenSpaceDrawQuad.Centre);
+                InputManager.BeginTouch(touch);
+                InputManager.EndTouch(touch);
+            });
+            AddUntilStep("touch device mod added to score", () => player.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<ModTouchDevice>());
+
+            AddStep("exit player", () => player.Exit());
+            AddUntilStep("touch device mod still active", () => Game.SelectedMods.Value, () => Has.One.InstanceOf<ModTouchDevice>());
         }
 
         private Func<Player> playToResults()

From ef555ed0cf442b98cb139de435e0e0815468c05e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 30 Oct 2023 15:48:00 +0100
Subject: [PATCH 1304/2296] Fix test failures

---
 osu.Game.Tests/Mods/ModUtilsTest.cs                         | 6 +++---
 .../Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs     | 1 +
 osu.Game/Overlays/Mods/SelectAllModsButton.cs               | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index aa41fd830b..9107ddd1ae 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -147,11 +147,11 @@ namespace osu.Game.Tests.Mods
                 new Mod[] { new OsuModDeflate(), new OsuModApproachDifferent() },
                 new[] { typeof(OsuModDeflate), typeof(OsuModApproachDifferent) }
             },
-            // system mod.
+            // system mod not applicable in lazer.
             new object[]
             {
-                new Mod[] { new OsuModHidden(), new OsuModTouchDevice() },
-                new[] { typeof(OsuModTouchDevice) }
+                new Mod[] { new OsuModHidden(), new ModScoreV2() },
+                new[] { typeof(ModScoreV2) }
             },
             // multi mod.
             new object[]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
index 66ba908879..f1674401cd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
@@ -133,6 +133,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private bool assertAllAvailableModsSelected()
         {
             var allAvailableMods = availableMods.Value
+                                                .Where(pair => pair.Key != ModType.System)
                                                 .SelectMany(pair => pair.Value)
                                                 .Where(mod => mod.UserPlayable && mod.HasImplementation)
                                                 .ToList();
diff --git a/osu.Game/Overlays/Mods/SelectAllModsButton.cs b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
index bb61cdc35d..b6b3051a0d 100644
--- a/osu.Game/Overlays/Mods/SelectAllModsButton.cs
+++ b/osu.Game/Overlays/Mods/SelectAllModsButton.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Overlays.Mods
         private void updateEnabledState()
         {
             Enabled.Value = availableMods.Value
+                                         .Where(pair => pair.Key != ModType.System)
                                          .SelectMany(pair => pair.Value)
                                          .Any(modState => !modState.Active.Value && modState.Visible);
         }

From c588f434e5f51bee3683c6114bc951fda40fb50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 31 Oct 2023 13:54:18 +0100
Subject: [PATCH 1305/2296] Fix song select touch handler causing crashes when
 song select is suspended

---
 osu.Game/Screens/Select/SongSelectTouchInputHandler.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs b/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs
index bf4761e871..5c27e59c5b 100644
--- a/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs
+++ b/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs
@@ -32,14 +32,18 @@ namespace osu.Game.Screens.Select
         {
             base.LoadComplete();
 
-            ruleset.BindValueChanged(_ => updateState());
-            mods.BindValueChanged(_ => updateState());
-            touchActive.BindValueChanged(_ => updateState());
+            ruleset.BindValueChanged(_ => Scheduler.AddOnce(updateState));
+            mods.BindValueChanged(_ => Scheduler.AddOnce(updateState));
+            mods.BindDisabledChanged(_ => Scheduler.AddOnce(updateState));
+            touchActive.BindValueChanged(_ => Scheduler.AddOnce(updateState));
             updateState();
         }
 
         private void updateState()
         {
+            if (mods.Disabled)
+                return;
+
             var touchDeviceMod = ruleset.Value.CreateInstance().GetTouchDeviceMod();
 
             if (touchDeviceMod == null)

From 4532d0ecdf12abd32b3d64cbab3b9e975f34c63d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 19:48:34 +0100
Subject: [PATCH 1306/2296] Add logging & debug facility for touch input
 interceptor

---
 osu.Game/Input/TouchInputInterceptor.cs | 27 +++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game/Input/TouchInputInterceptor.cs b/osu.Game/Input/TouchInputInterceptor.cs
index 377d3c6d9f..4e6177c70c 100644
--- a/osu.Game/Input/TouchInputInterceptor.cs
+++ b/osu.Game/Input/TouchInputInterceptor.cs
@@ -1,12 +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 System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges;
+using osu.Framework.Logging;
 using osu.Game.Configuration;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Input
 {
@@ -23,19 +27,42 @@ namespace osu.Game.Input
 
         protected override bool Handle(UIEvent e)
         {
+            bool touchInputWasActive = statics.Get<bool>(Static.TouchInputActive);
+
             switch (e)
             {
                 case MouseEvent:
                     if (e.CurrentState.Mouse.LastSource is not ISourcedFromTouch)
+                    {
+                        if (touchInputWasActive)
+                            Logger.Log($@"Touch input deactivated due to received {e.GetType().ReadableName()}", LoggingTarget.Input);
                         statics.SetValue(Static.TouchInputActive, false);
+                    }
+
                     break;
 
                 case TouchEvent:
+                    if (!touchInputWasActive)
+                        Logger.Log($@"Touch input activated due to received {e.GetType().ReadableName()}", LoggingTarget.Input);
                     statics.SetValue(Static.TouchInputActive, true);
                     break;
+
+                case KeyDownEvent keyDown:
+                    if (keyDown.Key == Key.T && keyDown.ControlPressed && keyDown.ShiftPressed)
+                        debugToggleTouchInputActive();
+                    break;
             }
 
             return false;
         }
+
+        [Conditional("TOUCH_INPUT_DEBUG")]
+        private void debugToggleTouchInputActive()
+        {
+            bool oldValue = statics.Get<bool>(Static.TouchInputActive);
+            bool newValue = !oldValue;
+            Logger.Log($@"Debug-toggling touch input to {(newValue ? @"active" : @"inactive")}", LoggingTarget.Input, LogLevel.Debug);
+            statics.SetValue(Static.TouchInputActive, newValue);
+        }
     }
 }

From 3a6d65d395c1bf3c0e30429fec90be5e4fedb7c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 19:51:21 +0100
Subject: [PATCH 1307/2296] Touch up `PlayerTouchInputHandler`

---
 osu.Game/Screens/Play/PlayerTouchInputHandler.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerTouchInputHandler.cs b/osu.Game/Screens/Play/PlayerTouchInputHandler.cs
index 0252ee9503..728b3c846b 100644
--- a/osu.Game/Screens/Play/PlayerTouchInputHandler.cs
+++ b/osu.Game/Screens/Play/PlayerTouchInputHandler.cs
@@ -9,6 +9,7 @@ using osu.Game.Configuration;
 using osu.Game.Overlays;
 using osu.Game.Overlays.OSD;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play
 {
@@ -50,11 +51,15 @@ namespace osu.Game.Screens.Play
             if (touchDeviceMod == null)
                 return;
 
-            onScreenDisplay?.Display(new TouchDeviceDetectedToast());
+            // do not show the toast if the user hasn't hit anything yet.
+            // we're kind of assuming that the user just switches to touch for gameplay
+            // and we don't want to spam them with obvious toasts.
+            if (gameplayState.ScoreProcessor.HitEvents.Any(ev => ev.Result.IsHit()))
+                onScreenDisplay?.Display(new TouchDeviceDetectedToast());
 
-            // TODO: this is kinda crude. `Player` (probably rightly so) assumes immutability of mods.
-            // this probably should be shown immediately on screen in the HUD,
-            // which means that immutability will probably need to be revisited.
+            // `Player` (probably rightly so) assumes immutability of mods,
+            // so this will not be shown immediately on the mod display in the top right.
+            // if this is to change, the mod immutability should be revisited.
             player.Score.ScoreInfo.Mods = player.Score.ScoreInfo.Mods.Append(touchDeviceMod).ToArray();
         }
     }

From d25b54c06d660455484762a011c162c6cb68dfd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 22:14:38 +0100
Subject: [PATCH 1308/2296] Split test into two

They would fail on CI when written as one, and I don't care why.
---
 .../Visual/Navigation/TestSceneScreenNavigation.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index a1fd8768b6..c6a668a714 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -837,7 +837,7 @@ namespace osu.Game.Tests.Visual.Navigation
         }
 
         [Test]
-        public void TestTouchScreenDetection()
+        public void TestTouchScreenDetectionAtSongSelect()
         {
             AddStep("touch logo", () =>
             {
@@ -859,8 +859,9 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("close settings sidebar", () => InputManager.Key(Key.Escape));
 
             Screens.Select.SongSelect songSelect = null;
-            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
-            AddUntilStep("wait for song select", () => songSelect.BeatmapSetsLoaded);
+            AddRepeatStep("go to solo", () => InputManager.Key(Key.P), 3);
+            AddUntilStep("wait for song select", () => (songSelect = Game.ScreenStack.CurrentScreen as Screens.Select.SongSelect) != null);
+            AddUntilStep("wait for beatmap sets loaded", () => songSelect.BeatmapSetsLoaded);
 
             AddStep("switch to osu! ruleset", () =>
             {
@@ -907,10 +908,15 @@ namespace osu.Game.Tests.Visual.Navigation
                 InputManager.Click(MouseButton.Left);
             });
             AddUntilStep("touch device mod not activated", () => Game.SelectedMods.Value, () => Has.None.InstanceOf<ModTouchDevice>());
+        }
 
+        [Test]
+        public void TestTouchScreenDetectionInGame()
+        {
+            PushAndConfirm(() => new TestPlaySongSelect());
             AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
             AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
-            AddStep("press enter", () => InputManager.Key(Key.Enter));
+            AddStep("select", () => InputManager.Key(Key.Enter));
 
             Player player = null;
 

From 8784dd42c0c4c1aba37cb0cc4f5cda8055811a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 22:20:17 +0100
Subject: [PATCH 1309/2296] Do not attempt to turn on Touch Device in song
 select with autoplay active

---
 osu.Game/Rulesets/Mods/ModAutoplay.cs                 |  2 +-
 osu.Game/Rulesets/Mods/ModTouchDevice.cs              |  2 ++
 .../Screens/Select/SongSelectTouchInputHandler.cs     | 11 ++++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index 973fcffba8..302cdf69c0 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Mods
         public sealed override bool ValidForMultiplayer => false;
         public sealed override bool ValidForMultiplayerAsFreeMod => false;
 
-        public override Type[] IncompatibleMods => new[] { typeof(ModCinema), typeof(ModRelax), typeof(ModAdaptiveSpeed) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModCinema), typeof(ModRelax), typeof(ModAdaptiveSpeed), typeof(ModTouchDevice) };
 
         public override bool HasImplementation => GetType().GenericTypeArguments.Length == 0;
 
diff --git a/osu.Game/Rulesets/Mods/ModTouchDevice.cs b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
index f532e7b19d..c29ff28f1a 100644
--- a/osu.Game/Rulesets/Mods/ModTouchDevice.cs
+++ b/osu.Game/Rulesets/Mods/ModTouchDevice.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 osu.Framework.Localisation;
 
 namespace osu.Game.Rulesets.Mods
@@ -13,5 +14,6 @@ namespace osu.Game.Rulesets.Mods
         public sealed override double ScoreMultiplier => 1;
         public sealed override ModType Type => ModType.System;
         public sealed override bool AlwaysValidForSubmission => true;
+        public sealed override Type[] IncompatibleMods => new[] { typeof(ICreateReplayData) };
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs b/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs
index 5c27e59c5b..973dc12e12 100644
--- a/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs
+++ b/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.Select
 {
@@ -52,7 +53,15 @@ namespace osu.Game.Screens.Select
             bool touchDeviceModEnabled = mods.Value.Any(mod => mod is ModTouchDevice);
 
             if (touchActive.Value && !touchDeviceModEnabled)
-                mods.Value = mods.Value.Append(touchDeviceMod).ToArray();
+            {
+                var candidateMods = mods.Value.Append(touchDeviceMod).ToArray();
+
+                if (!ModUtils.CheckCompatibleSet(candidateMods, out _))
+                    return;
+
+                mods.Value = candidateMods;
+            }
+
             if (!touchActive.Value && touchDeviceModEnabled)
                 mods.Value = mods.Value.Where(mod => mod is not ModTouchDevice).ToArray();
         }

From 0dd0a84312e224bb2cb5396cdc479e2b04688000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 22:26:52 +0100
Subject: [PATCH 1310/2296] Move player touch handler to `SubmittingPlayer`

Shouldn't be there in `ReplayPlayer`.
---
 osu.Game/Screens/Play/Player.cs           | 1 -
 osu.Game/Screens/Play/SubmittingPlayer.cs | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a67e16912d..8c7fc551ba 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -285,7 +285,6 @@ namespace osu.Game.Screens.Play
                             fadeOut(true);
                     },
                 },
-                new PlayerTouchInputHandler()
             });
 
             if (cancellationToken.IsCancellationRequested)
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index a75546f835..c34902aeb8 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -44,6 +44,12 @@ namespace osu.Game.Screens.Play
         {
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(new PlayerTouchInputHandler());
+        }
+
         protected override void LoadAsyncComplete()
         {
             base.LoadAsyncComplete();

From 8e9006b5d5c263cf79fed1e74532e7de5dfca122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 22:27:16 +0100
Subject: [PATCH 1311/2296] Declare Touch Device incompatible with Autopilot

With Autopilot active, Touch Device no longer matters.
---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs   | 3 ++-
 osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs | 3 +++
 osu.Game/Rulesets/Mods/ModTouchDevice.cs        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 3841c9c716..56bf0e08e9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -33,7 +33,8 @@ namespace osu.Game.Rulesets.Osu.Mods
             typeof(ModNoFail),
             typeof(ModAutoplay),
             typeof(OsuModMagnetised),
-            typeof(OsuModRepel)
+            typeof(OsuModRepel),
+            typeof(ModTouchDevice)
         };
 
         public bool PerformFail() => false;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
index abb67c519b..f1468d414e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.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 System;
+using System.Linq;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModTouchDevice : ModTouchDevice
     {
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTouchDevice.cs b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
index c29ff28f1a..a5dfe5448c 100644
--- a/osu.Game/Rulesets/Mods/ModTouchDevice.cs
+++ b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Mods
         public sealed override double ScoreMultiplier => 1;
         public sealed override ModType Type => ModType.System;
         public sealed override bool AlwaysValidForSubmission => true;
-        public sealed override Type[] IncompatibleMods => new[] { typeof(ICreateReplayData) };
+        public override Type[] IncompatibleMods => new[] { typeof(ICreateReplayData) };
     }
 }

From a613292802ce0fe5f53b31de761e6dcdf3135113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 2 Nov 2023 23:44:40 +0100
Subject: [PATCH 1312/2296] Fix unknown mod test failure

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index c34902aeb8..e018b8dab3 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -47,6 +47,12 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load()
         {
+            if (DrawableRuleset == null)
+            {
+                // base load must have failed (e.g. due to an unknown mod); bail.
+                return;
+            }
+
             AddInternal(new PlayerTouchInputHandler());
         }
 

From a78fab0e7d74d41b58ecefbe74854370ffee08c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 3 Nov 2023 00:17:29 +0100
Subject: [PATCH 1313/2296] Do not hardcode ruleset name in touch device
 detection toast

---
 osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs | 6 ++++--
 osu.Game/Screens/Play/PlayerTouchInputHandler.cs  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs b/osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs
index 0b5e3fffbe..266e10ab1f 100644
--- a/osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs
+++ b/osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs
@@ -1,12 +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.Game.Rulesets;
+
 namespace osu.Game.Overlays.OSD
 {
     public partial class TouchDeviceDetectedToast : Toast
     {
-        public TouchDeviceDetectedToast()
-            : base("osu!", "Touch device detected", "Touch Device mod applied to score")
+        public TouchDeviceDetectedToast(RulesetInfo ruleset)
+            : base(ruleset.Name, "Touch device detected", "Touch Device mod applied to score")
         {
         }
     }
diff --git a/osu.Game/Screens/Play/PlayerTouchInputHandler.cs b/osu.Game/Screens/Play/PlayerTouchInputHandler.cs
index 728b3c846b..a7d41de105 100644
--- a/osu.Game/Screens/Play/PlayerTouchInputHandler.cs
+++ b/osu.Game/Screens/Play/PlayerTouchInputHandler.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Play
             // we're kind of assuming that the user just switches to touch for gameplay
             // and we don't want to spam them with obvious toasts.
             if (gameplayState.ScoreProcessor.HitEvents.Any(ev => ev.Result.IsHit()))
-                onScreenDisplay?.Display(new TouchDeviceDetectedToast());
+                onScreenDisplay?.Display(new TouchDeviceDetectedToast(gameplayState.Ruleset.RulesetInfo));
 
             // `Player` (probably rightly so) assumes immutability of mods,
             // so this will not be shown immediately on the mod display in the top right.

From 090601b485bdec297ef3d723f7254b54ca335d3b Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 2 Nov 2023 18:12:39 -0700
Subject: [PATCH 1314/2296] Apply peppy's upright key counter attempt diff

Co-Authored-By: Dean Herbert <pe@ppy.sh>
---
 .../Visual/Gameplay/TestSceneKeyCounter.cs    | 20 ++++++++-
 osu.Game/Screens/Play/ArgonKeyCounter.cs      | 45 ++++++++++++-------
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 5a66a5c7a6..7e66106264 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -43,7 +43,25 @@ namespace osu.Game.Tests.Visual.Gameplay
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
-                        }
+                        },
+                        new ArgonKeyCounterDisplay
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Rotation = -90,
+                        },
+                        new ArgonKeyCounterDisplay
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Rotation = 90,
+                        },
+                        new ArgonKeyCounterDisplay
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Scale = new Vector2(1, -1)
+                        },
                     }
                 }
             };
diff --git a/osu.Game/Screens/Play/ArgonKeyCounter.cs b/osu.Game/Screens/Play/ArgonKeyCounter.cs
index 2d725898d8..ebf53abb30 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounter.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounter.cs
@@ -3,8 +3,10 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -40,26 +42,39 @@ namespace osu.Game.Screens.Play
             {
                 inputIndicator = new Circle
                 {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.X,
                     Height = line_height * scale_factor,
                     Alpha = 0.5f
                 },
-                keyNameText = new OsuSpriteText
+                new Container
                 {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    Position = new Vector2(0, -13) * scale_factor,
-                    Font = OsuFont.Torus.With(size: name_font_size * scale_factor, weight: FontWeight.Bold),
-                    Colour = colours.Blue0,
-                    Text = Trigger.Name
-                },
-                countText = new OsuSpriteText
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold),
+                    RelativeSizeAxes = Axes.X,
+                    Height = 40,
+                    Children = new Drawable[]
+                    {
+                        new UprightAspectMaintainingContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
+                            {
+                                keyNameText = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    Font = OsuFont.Torus.With(size: name_font_size * scale_factor, weight: FontWeight.Bold),
+                                    Colour = colours.Blue0,
+                                    Text = Trigger.Name
+                                },
+                                countText = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    Position = new Vector2(0, 13) * scale_factor,
+                                    Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold),
+                                },
+                            }
+                        }
+                    }
                 },
             };
 

From b3dfe19472a2a6a7f7d2b2d34570036df8f6b49c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 2 Nov 2023 18:17:25 -0700
Subject: [PATCH 1315/2296] Fix `UprightAspectMaintainingContainer` not being
 centred

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

diff --git a/osu.Game/Screens/Play/ArgonKeyCounter.cs b/osu.Game/Screens/Play/ArgonKeyCounter.cs
index ebf53abb30..6ff60c68b7 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounter.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounter.cs
@@ -55,6 +55,8 @@ namespace osu.Game.Screens.Play
                         new UprightAspectMaintainingContainer
                         {
                             RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
                             Children = new Drawable[]
                             {
                                 keyNameText = new OsuSpriteText

From 16731ff85ff90b8c9e20b40b0358bc2c128782c2 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 2 Nov 2023 18:20:15 -0700
Subject: [PATCH 1316/2296] Fix text positioning

---
 osu.Game/Screens/Play/ArgonKeyCounter.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/ArgonKeyCounter.cs b/osu.Game/Screens/Play/ArgonKeyCounter.cs
index 6ff60c68b7..bb5fe0daf2 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounter.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounter.cs
@@ -9,7 +9,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
-using osuTK;
 
 namespace osu.Game.Screens.Play
 {
@@ -27,6 +26,8 @@ namespace osu.Game.Screens.Play
         // Make things look bigger without using Scale
         private const float scale_factor = 1.5f;
 
+        private const float indicator_press_offset = 4;
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -48,8 +49,8 @@ namespace osu.Game.Screens.Play
                 },
                 new Container
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 40,
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Top = line_height * scale_factor + indicator_press_offset },
                     Children = new Drawable[]
                     {
                         new UprightAspectMaintainingContainer
@@ -69,9 +70,8 @@ namespace osu.Game.Screens.Play
                                 },
                                 countText = new OsuSpriteText
                                 {
-                                    Anchor = Anchor.TopCentre,
-                                    Origin = Anchor.TopCentre,
-                                    Position = new Vector2(0, 13) * scale_factor,
+                                    Anchor = Anchor.BottomCentre,
+                                    Origin = Anchor.BottomCentre,
                                     Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold),
                                 },
                             }
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Play
                 .FadeIn(10, Easing.OutQuint)
                 .MoveToY(0)
                 .Then()
-                .MoveToY(4, 60, Easing.OutQuint);
+                .MoveToY(indicator_press_offset, 60, Easing.OutQuint);
         }
 
         protected override void Deactivate(bool forwardPlayback = true)

From e3b3ce6c84102e34778c4fd25bb39e366dc0977f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 2 Nov 2023 18:44:56 -0700
Subject: [PATCH 1317/2296] Fix test overflowing on widescreen + add default
 (triangles) key counter testing

---
 .../Visual/Gameplay/TestSceneKeyCounter.cs    | 49 +++++++++++++++----
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 7e66106264..03302bae6a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -31,30 +31,24 @@ namespace osu.Game.Tests.Visual.Gameplay
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(72.7f),
-                    Children = new KeyCounterDisplay[]
+                    Spacing = new Vector2(20),
+                    Children = new Drawable[]
                     {
                         new DefaultKeyCounterDisplay
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
                         },
-                        new ArgonKeyCounterDisplay
+                        new DefaultKeyCounterDisplay
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
+                            Scale = new Vector2(1, -1)
                         },
                         new ArgonKeyCounterDisplay
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
-                            Rotation = -90,
-                        },
-                        new ArgonKeyCounterDisplay
-                        {
-                            Origin = Anchor.Centre,
-                            Anchor = Anchor.Centre,
-                            Rotation = 90,
                         },
                         new ArgonKeyCounterDisplay
                         {
@@ -62,6 +56,41 @@ namespace osu.Game.Tests.Visual.Gameplay
                             Anchor = Anchor.Centre,
                             Scale = new Vector2(1, -1)
                         },
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Spacing = new Vector2(20),
+                            Children = new Drawable[]
+                            {
+                                new DefaultKeyCounterDisplay
+                                {
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.Centre,
+                                    Rotation = -90,
+                                },
+                                new DefaultKeyCounterDisplay
+                                {
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.Centre,
+                                    Rotation = 90,
+                                },
+                                new ArgonKeyCounterDisplay
+                                {
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.Centre,
+                                    Rotation = -90,
+                                },
+                                new ArgonKeyCounterDisplay
+                                {
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.Centre,
+                                    Rotation = 90,
+                                },
+                            }
+                        },
                     }
                 }
             };

From 3f8baf913b46b884d9cbb5530721d58913403b5a Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 2 Nov 2023 19:46:09 -0700
Subject: [PATCH 1318/2296] Add 100 and 1000 key press step to test overflow

---
 osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 03302bae6a..2d2b6c3bed 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -124,8 +124,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("Disable counting", () => controller.IsCounting.Value = false);
             addPressKeyStep();
             AddAssert($"Check {testKey} count has not changed", () => testTrigger.ActivationCount.Value == 2);
+            AddStep("Enable counting", () => controller.IsCounting.Value = true);
+            addPressKeyStep(100);
+            addPressKeyStep(1000);
 
-            void addPressKeyStep() => AddStep($"Press {testKey} key", () => InputManager.Key(testKey));
+            void addPressKeyStep(int repeat = 1) => AddStep($"Press {testKey} key {repeat} times", () =>
+            {
+                for (int i = 0; i < repeat; i++)
+                    InputManager.Key(testKey);
+            });
         }
     }
 }

From 43ab7f49426626b3d9536af481221c98e7dca86a Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sat, 4 Nov 2023 02:01:18 +0100
Subject: [PATCH 1319/2296] Added OpenEditorTimestamp base implementation

---
 osu.Game/Localisation/EditorStrings.cs        |  15 +++
 osu.Game/OsuGame.cs                           |  48 +++++++++
 osu.Game/Screens/Edit/Editor.cs               |  34 ++++++
 .../Screens/Edit/EditorTimestampParser.cs     | 101 ++++++++++++++++++
 4 files changed, 198 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/EditorTimestampParser.cs

diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index 93e52746c5..227dbc5e0c 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -119,6 +119,21 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString LimitedDistanceSnap => new TranslatableString(getKey(@"limited_distance_snap_grid"), @"Limit distance snap placement to current time");
 
+        /// <summary>
+        /// "Must be in edit mode to handle editor links"
+        /// </summary>
+        public static LocalisableString MustBeInEdit => new TranslatableString(getKey(@"must_be_in_edit"), @"Must be in edit mode to handle editor links");
+
+        /// <summary>
+        /// "Failed to process timestamp"
+        /// </summary>
+        public static LocalisableString FailedToProcessTimestamp => new TranslatableString(getKey(@"failed_to_process_timestamp"), @"Failed to process timestamp");
+
+        /// <summary>
+        /// "The timestamp was too long to process"
+        /// </summary>
+        public static LocalisableString TooLongTimestamp => new TranslatableString(getKey(@"too_long_timestamp"), @"The timestamp was too long to process");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 2f11964f6a..439e112bd3 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -58,6 +58,7 @@ using osu.Game.Performance;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;
+using osu.Game.Screens.Edit;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.Play;
@@ -433,6 +434,9 @@ namespace osu.Game
                     break;
 
                 case LinkAction.OpenEditorTimestamp:
+                    SeekToTimestamp(argString);
+                    break;
+
                 case LinkAction.JoinMultiplayerMatch:
                 case LinkAction.Spectate:
                     waitForReady(() => Notifications, _ => Notifications.Post(new SimpleNotification
@@ -550,6 +554,50 @@ namespace osu.Game
         /// <param name="version">The build version of the update stream</param>
         public void ShowChangelogBuild(string updateStream, string version) => waitForReady(() => changelogOverlay, _ => changelogOverlay.ShowBuild(updateStream, version));
 
+        /// <summary>
+        /// Seek to a given timestamp in the Editor and select relevant HitObjects if needed
+        /// </summary>
+        /// <param name="timestamp">The timestamp and the selected objects</param>
+        public void SeekToTimestamp(string timestamp)
+        {
+            if (ScreenStack.CurrentScreen is not Editor editor)
+            {
+                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleErrorNotification
+                {
+                    Text = EditorStrings.MustBeInEdit,
+                }));
+                return;
+            }
+
+            string[] groups = EditorTimestampParser.GetRegexGroups(timestamp);
+
+            if (groups.Length != 2 || string.IsNullOrEmpty(groups[0]))
+            {
+                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleErrorNotification
+                {
+                    Text = EditorStrings.FailedToProcessTimestamp
+                }));
+                return;
+            }
+
+            string timeGroup = groups[0];
+            string objectsGroup = groups[1];
+            string timeMinutes = timeGroup.Split(':').FirstOrDefault() ?? string.Empty;
+
+            // Currently, lazer chat highlights infinite-long editor links like `10000000000:00:000 (1)`
+            // Limit timestamp link length at 30000 min (50 hr) to avoid parsing issues
+            if (timeMinutes.Length > 5 || double.Parse(timeMinutes) > 30_000)
+            {
+                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleErrorNotification
+                {
+                    Text = EditorStrings.TooLongTimestamp
+                }));
+                return;
+            }
+
+            editor.SeekToTimestamp(timeGroup, objectsGroup);
+        }
+
         /// <summary>
         /// Present a skin select immediately.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 91c3c98f01..b2fad55fed 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -39,6 +39,7 @@ using osu.Game.Overlays.Notifications;
 using osu.Game.Overlays.OSD;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Components.Menus;
 using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
@@ -1137,6 +1138,39 @@ namespace osu.Game.Screens.Edit
             loader?.CancelPendingDifficultySwitch();
         }
 
+        public void SeekToTimestamp(string timeGroup, string objectsGroup)
+        {
+            double position = EditorTimestampParser.GetTotalMilliseconds(timeGroup);
+            editorBeatmap.SelectedHitObjects.Clear();
+
+            if (string.IsNullOrEmpty(objectsGroup))
+            {
+                if (clock.IsRunning)
+                    clock.Stop();
+
+                clock.Seek(position);
+                return;
+            }
+
+            if (Mode.Value != EditorScreenMode.Compose)
+                Mode.Value = EditorScreenMode.Compose;
+
+            // Seek to the next closest HitObject's position
+            HitObject nextObject = editorBeatmap.HitObjects.FirstOrDefault(x => x.StartTime >= position);
+            if (nextObject != null && nextObject.StartTime > 0)
+                position = nextObject.StartTime;
+
+            List<HitObject> selected = EditorTimestampParser.GetSelectedHitObjects(editorBeatmap.HitObjects.ToList(), objectsGroup, position);
+
+            if (selected.Any())
+                editorBeatmap.SelectedHitObjects.AddRange(selected);
+
+            if (clock.IsRunning)
+                clock.Stop();
+
+            clock.Seek(position);
+        }
+
         public double SnapTime(double time, double? referenceTime) => editorBeatmap.SnapTime(time, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => editorBeatmap.GetBeatLengthAtTime(referenceTime);
diff --git a/osu.Game/Screens/Edit/EditorTimestampParser.cs b/osu.Game/Screens/Edit/EditorTimestampParser.cs
new file mode 100644
index 0000000000..44d614ca70
--- /dev/null
+++ b/osu.Game/Screens/Edit/EditorTimestampParser.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 System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text.RegularExpressions;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Screens.Edit
+{
+    public static class EditorTimestampParser
+    {
+        private static readonly Regex timestamp_regex = new Regex(@"^(\d+:\d+:\d+)(?: \((\d+(?:[|,]\d+)*)\))?$", RegexOptions.Compiled);
+
+        public static string[] GetRegexGroups(string timestamp)
+        {
+            Match match = timestamp_regex.Match(timestamp);
+            return match.Success
+                ? match.Groups.Values.Where(x => x is not Match).Select(x => x.Value).ToArray()
+                : Array.Empty<string>();
+        }
+
+        public static double GetTotalMilliseconds(string timeGroup)
+        {
+            int[] times = timeGroup.Split(':').Select(int.Parse).ToArray();
+
+            Debug.Assert(times.Length == 3);
+
+            return (times[0] * 60 + times[1]) * 1_000 + times[2];
+        }
+
+        public static List<HitObject> GetSelectedHitObjects(IEnumerable<HitObject> editorHitObjects, string objectsGroup, double position)
+        {
+            List<HitObject> hitObjects = editorHitObjects.Where(x => x.StartTime >= position).ToList();
+            List<HitObject> selectedObjects = new List<HitObject>();
+
+            string[] objectsToSelect = objectsGroup.Split(',').ToArray();
+
+            foreach (string objectInfo in objectsToSelect)
+            {
+                HitObject? current = hitObjects.FirstOrDefault(x => shouldHitObjectBeSelected(x, objectInfo));
+
+                if (current == null)
+                    continue;
+
+                selectedObjects.Add(current);
+                hitObjects = hitObjects.Where(x => x != current && x.StartTime >= current.StartTime).ToList();
+            }
+
+            // Stable behavior
+            // - always selects next closest object when `objectsGroup` only has one, non-Column item
+            if (objectsToSelect.Length != 1 || objectsGroup.Contains('|'))
+                return selectedObjects;
+
+            HitObject? nextClosest = editorHitObjects.FirstOrDefault(x => x.StartTime >= position);
+            if (nextClosest == null)
+                return selectedObjects;
+
+            if (nextClosest.StartTime <= (selectedObjects.FirstOrDefault()?.StartTime ?? position))
+            {
+                selectedObjects.Clear();
+                selectedObjects.Add(nextClosest);
+            }
+
+            return selectedObjects;
+        }
+
+        private static bool shouldHitObjectBeSelected(HitObject hitObject, string objectInfo)
+        {
+            switch (hitObject)
+            {
+                // (combo)
+                case IHasComboInformation comboInfo:
+                {
+                    if (!double.TryParse(objectInfo, out double comboValue) || comboValue < 1)
+                        return false;
+
+                    return comboInfo.IndexInCurrentCombo + 1 == comboValue;
+                }
+
+                // (time|column)
+                case IHasColumn column:
+                {
+                    double[] split = objectInfo.Split('|').Select(double.Parse).ToArray();
+                    if (split.Length != 2)
+                        return false;
+
+                    double timeValue = split[0];
+                    double columnValue = split[1];
+                    return hitObject.StartTime == timeValue && column.Column == columnValue;
+                }
+
+                default:
+                    return false;
+            }
+        }
+    }
+}

From f854e78bb03f6117b1cfb8b0579e867d1aae093f Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sat, 4 Nov 2023 03:29:05 +0100
Subject: [PATCH 1320/2296] Added ExclamationTriangle Icon to notifications

---
 osu.Game/OsuGame.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 439e112bd3..5acd958568 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -562,8 +562,9 @@ namespace osu.Game
         {
             if (ScreenStack.CurrentScreen is not Editor editor)
             {
-                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleErrorNotification
+                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleNotification
                 {
+                    Icon = FontAwesome.Solid.ExclamationTriangle,
                     Text = EditorStrings.MustBeInEdit,
                 }));
                 return;
@@ -573,8 +574,9 @@ namespace osu.Game
 
             if (groups.Length != 2 || string.IsNullOrEmpty(groups[0]))
             {
-                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleErrorNotification
+                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleNotification
                 {
+                    Icon = FontAwesome.Solid.ExclamationTriangle,
                     Text = EditorStrings.FailedToProcessTimestamp
                 }));
                 return;
@@ -588,8 +590,9 @@ namespace osu.Game
             // Limit timestamp link length at 30000 min (50 hr) to avoid parsing issues
             if (timeMinutes.Length > 5 || double.Parse(timeMinutes) > 30_000)
             {
-                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleErrorNotification
+                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleNotification
                 {
+                    Icon = FontAwesome.Solid.ExclamationTriangle,
                     Text = EditorStrings.TooLongTimestamp
                 }));
                 return;

From 60f62faec3712e1086af4d0a7462c60d0efbc257 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sat, 4 Nov 2023 03:30:38 +0100
Subject: [PATCH 1321/2296] Renamed Editor method

---
 osu.Game/OsuGame.cs             | 2 +-
 osu.Game/Screens/Edit/Editor.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5acd958568..a6bb6cc120 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -598,7 +598,7 @@ namespace osu.Game
                 return;
             }
 
-            editor.SeekToTimestamp(timeGroup, objectsGroup);
+            editor.SeekAndSelectHitObjects(timeGroup, objectsGroup);
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b2fad55fed..80e01d4eb7 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1138,7 +1138,7 @@ namespace osu.Game.Screens.Edit
             loader?.CancelPendingDifficultySwitch();
         }
 
-        public void SeekToTimestamp(string timeGroup, string objectsGroup)
+        public void SeekAndSelectHitObjects(string timeGroup, string objectsGroup)
         {
             double position = EditorTimestampParser.GetTotalMilliseconds(timeGroup);
             editorBeatmap.SelectedHitObjects.Clear();

From f867cff8c79c55f75708ea41c699c6d7a557485c Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sat, 4 Nov 2023 03:42:08 +0100
Subject: [PATCH 1322/2296] Added OpenEditorTimestamp Tests

---
 .../Editing/TestSceneOpenEditorTimestamp.cs   | 377 ++++++++++++++++++
 1 file changed, 377 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
new file mode 100644
index 0000000000..5ae0a20fd2
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
@@ -0,0 +1,377 @@
+// 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 NUnit.Framework;
+using osu.Framework.Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Localisation;
+using osu.Game.Online.Chat;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Menu;
+using osu.Game.Screens.Select;
+using osu.Game.Tests.Resources;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public partial class TestSceneOpenEditorTimestamp : OsuGameTestScene
+    {
+        protected Editor Editor => (Editor)Game.ScreenStack.CurrentScreen;
+        protected EditorBeatmap EditorBeatmap => Editor.ChildrenOfType<EditorBeatmap>().Single();
+        protected EditorClock EditorClock => Editor.ChildrenOfType<EditorClock>().Single();
+
+        protected void AddStepClickLink(string timestamp, string step = "")
+        {
+            AddStep(step + timestamp, () =>
+                Game.HandleLink(new LinkDetails(LinkAction.OpenEditorTimestamp, timestamp))
+            );
+        }
+
+        protected void AddStepScreenModeTo(EditorScreenMode screenMode)
+        {
+            AddStep("change screen to " + screenMode, () => Editor.Mode.Value = screenMode);
+        }
+
+        protected void AssertOnScreenAt(EditorScreenMode screen, double time, string text = "stays in")
+        {
+            AddAssert($"{text} {screen} at {time}", () =>
+                Editor.Mode.Value == screen
+                && EditorClock.CurrentTime == time
+            );
+        }
+
+        protected bool HasCombosInOrder(IEnumerable<HitObject> selected, params int[] comboNumbers)
+        {
+            List<HitObject> hitObjects = selected.ToList();
+            if (hitObjects.Count != comboNumbers.Length)
+                return false;
+
+            return !hitObjects.Select(x => (IHasComboInformation)x)
+                              .Where((combo, i) => combo.IndexInCurrentCombo + 1 != comboNumbers[i])
+                              .Any();
+        }
+
+        protected bool IsNoteAt(HitObject hitObject, double time, int column)
+        {
+            return hitObject is IHasColumn columnInfo
+                   && hitObject.StartTime == time
+                   && columnInfo.Column == column;
+        }
+
+        public void SetUpEditor(RulesetInfo ruleset)
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("Import test beatmap", () =>
+                Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely()
+            );
+            AddStep("Retrieve beatmap", () =>
+                beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach()
+            );
+            AddStep("Present beatmap", () => Game.PresentBeatmap(beatmapSet));
+            AddUntilStep("Wait for song select", () =>
+                Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
+                && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
+                && songSelect.IsLoaded
+            );
+            AddStep("Switch ruleset", () => Game.Ruleset.Value = ruleset);
+            AddStep("Open editor for ruleset", () =>
+                ((PlaySongSelect)Game.ScreenStack.CurrentScreen)
+                .Edit(beatmapSet.Beatmaps.Last(beatmap => beatmap.Ruleset.Name == ruleset.Name))
+            );
+            AddUntilStep("Wait for editor open", () => Editor.ReadyForUse);
+        }
+
+        [Test]
+        public void TestErrorNotifications()
+        {
+            RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
+
+            AddStepClickLink("00:00:000");
+            AddAssert("recieved 'must be in edit'", () =>
+                Game.Notifications.UnreadCount.Value == 1
+                && Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 1
+            );
+
+            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
+            AddAssert("entered song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+
+            AddStepClickLink("00:00:000 (1)");
+            AddAssert("recieved 'must be in edit'", () =>
+                Game.Notifications.UnreadCount.Value == 2
+                && Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 2
+            );
+
+            SetUpEditor(rulesetInfo);
+            AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
+
+            AddStepClickLink("00:000", "invalid link ");
+            AddAssert("recieved 'failed to process'", () =>
+                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 1
+            );
+
+            AddStepClickLink("00:00:00:000", "invalid link ");
+            AddAssert("recieved 'failed to process'", () =>
+                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 2
+            );
+
+            AddStepClickLink("00:00:000 ()", "invalid link ");
+            AddAssert("recieved 'failed to process'", () =>
+                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 3
+            );
+
+            AddStepClickLink("00:00:000 (-1)", "invalid link ");
+            AddAssert("recieved 'failed to process'", () =>
+                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 4
+            );
+
+            AddStepClickLink("50000:00:000", "too long link ");
+            AddAssert("recieved 'too long'", () =>
+                EditorClock.CurrentTime == 0
+                && Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.TooLongTimestamp) == 1
+            );
+        }
+
+        [Test]
+        public void TestHandleCurrentScreenChanges()
+        {
+            const long long_link_value = 1_000 * 60 * 1_000;
+            RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
+
+            SetUpEditor(rulesetInfo);
+            AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
+
+            AddStepClickLink("1000:00:000", "long link ");
+            AddAssert("moved to end of track", () =>
+                EditorClock.CurrentTime == long_link_value
+                || (EditorClock.TrackLength < long_link_value && EditorClock.CurrentTime == EditorClock.TrackLength)
+            );
+
+            AddStepScreenModeTo(EditorScreenMode.SongSetup);
+            AddStepClickLink("00:00:000");
+            AssertOnScreenAt(EditorScreenMode.SongSetup, 0);
+
+            AddStepClickLink("00:05:000 (0|0)");
+            AddAssert("seek and change screen", () =>
+                Editor.Mode.Value == EditorScreenMode.Compose
+                && EditorClock.CurrentTime == EditorBeatmap.HitObjects.First(x => x.StartTime >= 5_000).StartTime
+            );
+
+            AddStepScreenModeTo(EditorScreenMode.Design);
+            AddStepClickLink("00:10:000");
+            AssertOnScreenAt(EditorScreenMode.Design, 10_000);
+
+            AddStepClickLink("00:15:000 (1)");
+            AddAssert("seek and change screen", () =>
+                Editor.Mode.Value == EditorScreenMode.Compose
+                && EditorClock.CurrentTime == EditorBeatmap.HitObjects.First(x => x.StartTime >= 15_000).StartTime
+            );
+
+            AddStepScreenModeTo(EditorScreenMode.Timing);
+            AddStepClickLink("00:20:000");
+            AssertOnScreenAt(EditorScreenMode.Timing, 20_000);
+
+            AddStepClickLink("00:25:000 (0,1)");
+            AddAssert("seek and change screen", () =>
+                Editor.Mode.Value == EditorScreenMode.Compose
+                && EditorClock.CurrentTime == EditorBeatmap.HitObjects.First(x => x.StartTime >= 25_000).StartTime
+            );
+
+            AddStepScreenModeTo(EditorScreenMode.Verify);
+            AddStepClickLink("00:30:000");
+            AssertOnScreenAt(EditorScreenMode.Verify, 30_000);
+
+            AddStepClickLink("00:35:000 (0,1)");
+            AddAssert("seek and change screen", () =>
+                Editor.Mode.Value == EditorScreenMode.Compose
+                && EditorClock.CurrentTime == EditorBeatmap.HitObjects.First(x => x.StartTime >= 35_000).StartTime
+            );
+
+            AddStepClickLink("00:00:000");
+            AssertOnScreenAt(EditorScreenMode.Compose, 0);
+        }
+
+        [Test]
+        public void TestSelectionForOsu()
+        {
+            HitObject firstObject = null!;
+            RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
+
+            SetUpEditor(rulesetInfo);
+            AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
+
+            AddStepClickLink("00:00:956 (1,2,3)");
+            AddAssert("snap and select 1-2-3", () =>
+            {
+                firstObject = EditorBeatmap.HitObjects.First();
+                return EditorClock.CurrentTime == firstObject.StartTime
+                       && EditorBeatmap.SelectedHitObjects.Count == 3
+                       && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1, 2, 3);
+            });
+
+            AddStepClickLink("00:01:450 (2,3,4,1,2)");
+            AddAssert("snap and select 2-3-4-1-2", () =>
+                EditorClock.CurrentTime == 1_450
+                && EditorBeatmap.SelectedHitObjects.Count == 5
+                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 2, 3, 4, 1, 2)
+            );
+
+            AddStepClickLink("00:00:956 (1,1,1)");
+            AddAssert("snap and select 1-1-1", () =>
+                EditorClock.CurrentTime == firstObject.StartTime
+                && EditorBeatmap.SelectedHitObjects.Count == 3
+                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1, 1, 1)
+            );
+        }
+
+        [Test]
+        public void TestUnusualSelectionForOsu()
+        {
+            HitObject firstObject = null!;
+            RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
+
+            SetUpEditor(rulesetInfo);
+            AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
+
+            AddStepClickLink("00:00:000 (1,2,3)", "invalid offset ");
+            AddAssert("snap to next, select 1-2-3", () =>
+            {
+                firstObject = EditorBeatmap.HitObjects.First();
+                return EditorClock.CurrentTime == firstObject.StartTime
+                       && EditorBeatmap.SelectedHitObjects.Count == 3
+                       && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1, 2, 3);
+            });
+
+            AddStepClickLink("00:00:956 (2,3,4)", "invalid offset ");
+            AddAssert("snap to next, select 2-3-4", () =>
+                EditorClock.CurrentTime == EditorBeatmap.HitObjects.First(x => x.StartTime >= 956).StartTime
+                && EditorBeatmap.SelectedHitObjects.Count == 3
+                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 2, 3, 4)
+            );
+
+            AddStepClickLink("00:00:000 (0)", "invalid combo ");
+            AddAssert("snap to 1, select 1", () =>
+                EditorClock.CurrentTime == firstObject.StartTime
+                && EditorBeatmap.SelectedHitObjects.Count == 1
+                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1)
+            );
+
+            AddStepClickLink("00:00:000 (1)", "invalid offset ");
+            AddAssert("snap and select 1", () =>
+                EditorClock.CurrentTime == firstObject.StartTime
+                && EditorBeatmap.SelectedHitObjects.Count == 1
+                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1)
+            );
+
+            AddStepClickLink("00:00:000 (2)", "invalid offset ");
+            AddAssert("snap and select 1", () =>
+                EditorClock.CurrentTime == firstObject.StartTime
+                && EditorBeatmap.SelectedHitObjects.Count == 1
+                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1)
+            );
+
+            AddStepClickLink("00:00:000 (2,3)", "invalid offset ");
+            AddAssert("snap to 1, select 2-3", () =>
+                EditorClock.CurrentTime == firstObject.StartTime
+                && EditorBeatmap.SelectedHitObjects.Count == 2
+                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 2, 3)
+            );
+
+            AddStepClickLink("00:00:956 (956|1,956|2)", "mania link ");
+            AddAssert("snap to next, select none", () =>
+                EditorClock.CurrentTime == firstObject?.StartTime
+                && !EditorBeatmap.SelectedHitObjects.Any()
+            );
+
+            AddStepClickLink("00:00:000 (0|1)", "mania link ");
+            AddAssert("snap to 1, select none", () =>
+                EditorClock.CurrentTime == firstObject.StartTime
+                && !EditorBeatmap.SelectedHitObjects.Any()
+            );
+        }
+
+        [Test]
+        public void TestSelectionForMania()
+        {
+            RulesetInfo rulesetInfo = new ManiaRuleset().RulesetInfo;
+
+            SetUpEditor(rulesetInfo);
+            AddAssert("is editor Mania", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
+
+            AddStepClickLink("00:11:010 (11010|1,11175|5,11258|3,11340|5,11505|1)");
+            AddAssert("selected group", () =>
+                EditorClock.CurrentTime == 11010
+                && EditorBeatmap.SelectedHitObjects.Count == 5
+                && EditorBeatmap.SelectedHitObjects.All(x =>
+                    IsNoteAt(x, 11010, 1) || IsNoteAt(x, 11175, 5) ||
+                    IsNoteAt(x, 11258, 3) || IsNoteAt(x, 11340, 5) ||
+                    IsNoteAt(x, 11505, 1))
+            );
+
+            AddStepClickLink("00:00:956 (956|1,956|6,1285|3,1780|4)");
+            AddAssert("selected ungrouped", () =>
+                EditorClock.CurrentTime == 956
+                && EditorBeatmap.SelectedHitObjects.Count == 4
+                && EditorBeatmap.SelectedHitObjects.All(x =>
+                    IsNoteAt(x, 956, 1) || IsNoteAt(x, 956, 6) ||
+                    IsNoteAt(x, 1285, 3) || IsNoteAt(x, 1780, 4))
+            );
+
+            AddStepClickLink("02:36:560 (156560|1,156560|4,156560|6)");
+            AddAssert("selected in row", () =>
+                EditorClock.CurrentTime == 156560
+                && EditorBeatmap.SelectedHitObjects.Count == 3
+                && EditorBeatmap.SelectedHitObjects.All(x =>
+                    IsNoteAt(x, 156560, 1) || IsNoteAt(x, 156560, 4) ||
+                    IsNoteAt(x, 156560, 6))
+            );
+
+            AddStepClickLink("00:35:736 (35736|3,36395|3,36725|3,37384|3)");
+            AddAssert("selected in column", () =>
+                EditorClock.CurrentTime == 35736
+                && EditorBeatmap.SelectedHitObjects.Count == 4
+                && EditorBeatmap.SelectedHitObjects.All(x =>
+                    IsNoteAt(x, 35736, 3) || IsNoteAt(x, 36395, 3) ||
+                    IsNoteAt(x, 36725, 3) || IsNoteAt(x, 37384, 3))
+            );
+        }
+
+        [Test]
+        public void TestUnusualSelectionForMania()
+        {
+            RulesetInfo rulesetInfo = new ManiaRuleset().RulesetInfo;
+
+            SetUpEditor(rulesetInfo);
+            AddAssert("is editor Mania", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
+
+            AddStepClickLink("00:00:000 (0|1)", "invalid link ");
+            AddAssert("snap to 1, select none", () =>
+                EditorClock.CurrentTime == 956
+                && !EditorBeatmap.SelectedHitObjects.Any()
+            );
+
+            AddStepClickLink("00:00:000 (0)", "std link ");
+            AddAssert("snap and select 1", () =>
+                EditorClock.CurrentTime == 956
+                && EditorBeatmap.SelectedHitObjects.All(x => IsNoteAt(x, 956, 1))
+            );
+
+            AddStepClickLink("00:00:000 (1,2)", "std link ");
+            AddAssert("snap to 1, select none", () =>
+                EditorClock.CurrentTime == 956
+                && !EditorBeatmap.SelectedHitObjects.Any()
+            );
+        }
+    }
+}

From 19cdf99df8f101b5c676528826a39cb905c1efe5 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sat, 4 Nov 2023 12:04:58 +0100
Subject: [PATCH 1323/2296] Fixed up tests

---
 .../Editing/TestSceneOpenEditorTimestamp.cs   | 216 +++++++-----------
 1 file changed, 83 insertions(+), 133 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index 5ae0a20fd2..fea9334ff8 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected void AddStepClickLink(string timestamp, string step = "")
         {
-            AddStep(step + timestamp, () =>
+            AddStep($"{step} {timestamp}", () =>
                 Game.HandleLink(new LinkDetails(LinkAction.OpenEditorTimestamp, timestamp))
             );
         }
@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("change screen to " + screenMode, () => Editor.Mode.Value = screenMode);
         }
 
-        protected void AssertOnScreenAt(EditorScreenMode screen, double time, string text = "stays in")
+        protected void AssertOnScreenAt(EditorScreenMode screen, double time, string text = "stayed in")
         {
             AddAssert($"{text} {screen} at {time}", () =>
                 Editor.Mode.Value == screen
@@ -51,7 +51,34 @@ namespace osu.Game.Tests.Visual.Editing
             );
         }
 
-        protected bool HasCombosInOrder(IEnumerable<HitObject> selected, params int[] comboNumbers)
+        protected void AssertMovedScreenTo(EditorScreenMode screen, string text = "moved to")
+        {
+            AddAssert($"{text} {screen}", () => Editor.Mode.Value == screen);
+        }
+
+        private bool checkSnapAndSelectCombo(double startTime, params int[] comboNumbers)
+        {
+            bool checkCombos = comboNumbers.Any()
+                ? hasCombosInOrder(EditorBeatmap.SelectedHitObjects, comboNumbers)
+                : !EditorBeatmap.SelectedHitObjects.Any();
+
+            return EditorClock.CurrentTime == startTime
+                   && EditorBeatmap.SelectedHitObjects.Count == comboNumbers.Length
+                   && checkCombos;
+        }
+
+        private bool checkSnapAndSelectColumn(double startTime, List<(int, int)> columnPairs = null)
+        {
+            bool checkColumns = columnPairs != null
+                ? EditorBeatmap.SelectedHitObjects.All(x => columnPairs.Any(col => isNoteAt(x, col.Item1, col.Item2)))
+                : !EditorBeatmap.SelectedHitObjects.Any();
+
+            return EditorClock.CurrentTime == startTime
+                   && EditorBeatmap.SelectedHitObjects.Count == (columnPairs?.Count ?? 0)
+                   && checkColumns;
+        }
+
+        private bool hasCombosInOrder(IEnumerable<HitObject> selected, params int[] comboNumbers)
         {
             List<HitObject> hitObjects = selected.ToList();
             if (hitObjects.Count != comboNumbers.Length)
@@ -62,7 +89,7 @@ namespace osu.Game.Tests.Visual.Editing
                               .Any();
         }
 
-        protected bool IsNoteAt(HitObject hitObject, double time, int column)
+        private bool isNoteAt(HitObject hitObject, double time, int column)
         {
             return hitObject is IHasColumn columnInfo
                    && hitObject.StartTime == time
@@ -100,8 +127,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStepClickLink("00:00:000");
             AddAssert("recieved 'must be in edit'", () =>
-                Game.Notifications.UnreadCount.Value == 1
-                && Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 1
+                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 1
             );
 
             AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
@@ -109,37 +135,35 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStepClickLink("00:00:000 (1)");
             AddAssert("recieved 'must be in edit'", () =>
-                Game.Notifications.UnreadCount.Value == 2
-                && Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 2
+                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 2
             );
 
             SetUpEditor(rulesetInfo);
             AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
-            AddStepClickLink("00:000", "invalid link ");
+            AddStepClickLink("00:000", "invalid link");
             AddAssert("recieved 'failed to process'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 1
             );
 
-            AddStepClickLink("00:00:00:000", "invalid link ");
+            AddStepClickLink("00:00:00:000", "invalid link");
             AddAssert("recieved 'failed to process'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 2
             );
 
-            AddStepClickLink("00:00:000 ()", "invalid link ");
+            AddStepClickLink("00:00:000 ()", "invalid link");
             AddAssert("recieved 'failed to process'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 3
             );
 
-            AddStepClickLink("00:00:000 (-1)", "invalid link ");
+            AddStepClickLink("00:00:000 (-1)", "invalid link");
             AddAssert("recieved 'failed to process'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 4
             );
 
-            AddStepClickLink("50000:00:000", "too long link ");
+            AddStepClickLink("50000:00:000", "too long link");
             AddAssert("recieved 'too long'", () =>
-                EditorClock.CurrentTime == 0
-                && Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.TooLongTimestamp) == 1
+                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.TooLongTimestamp) == 1
             );
         }
 
@@ -152,7 +176,7 @@ namespace osu.Game.Tests.Visual.Editing
             SetUpEditor(rulesetInfo);
             AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
-            AddStepClickLink("1000:00:000", "long link ");
+            AddStepClickLink("1000:00:000", "long link");
             AddAssert("moved to end of track", () =>
                 EditorClock.CurrentTime == long_link_value
                 || (EditorClock.TrackLength < long_link_value && EditorClock.CurrentTime == EditorClock.TrackLength)
@@ -163,40 +187,28 @@ namespace osu.Game.Tests.Visual.Editing
             AssertOnScreenAt(EditorScreenMode.SongSetup, 0);
 
             AddStepClickLink("00:05:000 (0|0)");
-            AddAssert("seek and change screen", () =>
-                Editor.Mode.Value == EditorScreenMode.Compose
-                && EditorClock.CurrentTime == EditorBeatmap.HitObjects.First(x => x.StartTime >= 5_000).StartTime
-            );
+            AssertMovedScreenTo(EditorScreenMode.Compose);
 
             AddStepScreenModeTo(EditorScreenMode.Design);
             AddStepClickLink("00:10:000");
             AssertOnScreenAt(EditorScreenMode.Design, 10_000);
 
             AddStepClickLink("00:15:000 (1)");
-            AddAssert("seek and change screen", () =>
-                Editor.Mode.Value == EditorScreenMode.Compose
-                && EditorClock.CurrentTime == EditorBeatmap.HitObjects.First(x => x.StartTime >= 15_000).StartTime
-            );
+            AssertMovedScreenTo(EditorScreenMode.Compose);
 
             AddStepScreenModeTo(EditorScreenMode.Timing);
             AddStepClickLink("00:20:000");
             AssertOnScreenAt(EditorScreenMode.Timing, 20_000);
 
             AddStepClickLink("00:25:000 (0,1)");
-            AddAssert("seek and change screen", () =>
-                Editor.Mode.Value == EditorScreenMode.Compose
-                && EditorClock.CurrentTime == EditorBeatmap.HitObjects.First(x => x.StartTime >= 25_000).StartTime
-            );
+            AssertMovedScreenTo(EditorScreenMode.Compose);
 
             AddStepScreenModeTo(EditorScreenMode.Verify);
             AddStepClickLink("00:30:000");
             AssertOnScreenAt(EditorScreenMode.Verify, 30_000);
 
             AddStepClickLink("00:35:000 (0,1)");
-            AddAssert("seek and change screen", () =>
-                Editor.Mode.Value == EditorScreenMode.Compose
-                && EditorClock.CurrentTime == EditorBeatmap.HitObjects.First(x => x.StartTime >= 35_000).StartTime
-            );
+            AssertMovedScreenTo(EditorScreenMode.Compose);
 
             AddStepClickLink("00:00:000");
             AssertOnScreenAt(EditorScreenMode.Compose, 0);
@@ -215,24 +227,14 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("snap and select 1-2-3", () =>
             {
                 firstObject = EditorBeatmap.HitObjects.First();
-                return EditorClock.CurrentTime == firstObject.StartTime
-                       && EditorBeatmap.SelectedHitObjects.Count == 3
-                       && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1, 2, 3);
+                return checkSnapAndSelectCombo(firstObject.StartTime, 1, 2, 3);
             });
 
             AddStepClickLink("00:01:450 (2,3,4,1,2)");
-            AddAssert("snap and select 2-3-4-1-2", () =>
-                EditorClock.CurrentTime == 1_450
-                && EditorBeatmap.SelectedHitObjects.Count == 5
-                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 2, 3, 4, 1, 2)
-            );
+            AddAssert("snap and select 2-3-4-1-2", () => checkSnapAndSelectCombo(1_450, 2, 3, 4, 1, 2));
 
             AddStepClickLink("00:00:956 (1,1,1)");
-            AddAssert("snap and select 1-1-1", () =>
-                EditorClock.CurrentTime == firstObject.StartTime
-                && EditorBeatmap.SelectedHitObjects.Count == 3
-                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1, 1, 1)
-            );
+            AddAssert("snap and select 1-1-1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1, 1, 1));
         }
 
         [Test]
@@ -244,61 +246,33 @@ namespace osu.Game.Tests.Visual.Editing
             SetUpEditor(rulesetInfo);
             AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
-            AddStepClickLink("00:00:000 (1,2,3)", "invalid offset ");
+            AddStepClickLink("00:00:000 (1,2,3)", "invalid offset");
             AddAssert("snap to next, select 1-2-3", () =>
             {
                 firstObject = EditorBeatmap.HitObjects.First();
-                return EditorClock.CurrentTime == firstObject.StartTime
-                       && EditorBeatmap.SelectedHitObjects.Count == 3
-                       && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1, 2, 3);
+                return checkSnapAndSelectCombo(firstObject.StartTime, 1, 2, 3);
             });
 
-            AddStepClickLink("00:00:956 (2,3,4)", "invalid offset ");
-            AddAssert("snap to next, select 2-3-4", () =>
-                EditorClock.CurrentTime == EditorBeatmap.HitObjects.First(x => x.StartTime >= 956).StartTime
-                && EditorBeatmap.SelectedHitObjects.Count == 3
-                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 2, 3, 4)
-            );
+            AddStepClickLink("00:00:956 (2,3,4)", "invalid offset");
+            AddAssert("snap to next, select 2-3-4", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3, 4));
 
-            AddStepClickLink("00:00:000 (0)", "invalid combo ");
-            AddAssert("snap to 1, select 1", () =>
-                EditorClock.CurrentTime == firstObject.StartTime
-                && EditorBeatmap.SelectedHitObjects.Count == 1
-                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1)
-            );
+            AddStepClickLink("00:00:000 (0)", "invalid offset");
+            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
 
-            AddStepClickLink("00:00:000 (1)", "invalid offset ");
-            AddAssert("snap and select 1", () =>
-                EditorClock.CurrentTime == firstObject.StartTime
-                && EditorBeatmap.SelectedHitObjects.Count == 1
-                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1)
-            );
+            AddStepClickLink("00:00:000 (1)", "invalid offset");
+            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
 
-            AddStepClickLink("00:00:000 (2)", "invalid offset ");
-            AddAssert("snap and select 1", () =>
-                EditorClock.CurrentTime == firstObject.StartTime
-                && EditorBeatmap.SelectedHitObjects.Count == 1
-                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 1)
-            );
+            AddStepClickLink("00:00:000 (2)", "invalid offset");
+            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
 
-            AddStepClickLink("00:00:000 (2,3)", "invalid offset ");
-            AddAssert("snap to 1, select 2-3", () =>
-                EditorClock.CurrentTime == firstObject.StartTime
-                && EditorBeatmap.SelectedHitObjects.Count == 2
-                && HasCombosInOrder(EditorBeatmap.SelectedHitObjects, 2, 3)
-            );
+            AddStepClickLink("00:00:000 (2,3)", "invalid offset");
+            AddAssert("snap to 1, select 2-3", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3));
 
-            AddStepClickLink("00:00:956 (956|1,956|2)", "mania link ");
-            AddAssert("snap to next, select none", () =>
-                EditorClock.CurrentTime == firstObject?.StartTime
-                && !EditorBeatmap.SelectedHitObjects.Any()
-            );
+            AddStepClickLink("00:00:956 (956|1,956|2)", "mania link");
+            AddAssert("snap to next, select none", () => checkSnapAndSelectCombo(firstObject.StartTime));
 
-            AddStepClickLink("00:00:000 (0|1)", "mania link ");
-            AddAssert("snap to 1, select none", () =>
-                EditorClock.CurrentTime == firstObject.StartTime
-                && !EditorBeatmap.SelectedHitObjects.Any()
-            );
+            AddStepClickLink("00:00:000 (0|1)", "mania link");
+            AddAssert("snap to 1, select none", () => checkSnapAndSelectCombo(firstObject.StartTime));
         }
 
         [Test]
@@ -310,41 +284,24 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("is editor Mania", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
             AddStepClickLink("00:11:010 (11010|1,11175|5,11258|3,11340|5,11505|1)");
-            AddAssert("selected group", () =>
-                EditorClock.CurrentTime == 11010
-                && EditorBeatmap.SelectedHitObjects.Count == 5
-                && EditorBeatmap.SelectedHitObjects.All(x =>
-                    IsNoteAt(x, 11010, 1) || IsNoteAt(x, 11175, 5) ||
-                    IsNoteAt(x, 11258, 3) || IsNoteAt(x, 11340, 5) ||
-                    IsNoteAt(x, 11505, 1))
-            );
+            AddAssert("selected group", () => checkSnapAndSelectColumn(11010, new List<(int, int)>
+                { (11010, 1), (11175, 5), (11258, 3), (11340, 5), (11505, 1) }
+            ));
 
             AddStepClickLink("00:00:956 (956|1,956|6,1285|3,1780|4)");
-            AddAssert("selected ungrouped", () =>
-                EditorClock.CurrentTime == 956
-                && EditorBeatmap.SelectedHitObjects.Count == 4
-                && EditorBeatmap.SelectedHitObjects.All(x =>
-                    IsNoteAt(x, 956, 1) || IsNoteAt(x, 956, 6) ||
-                    IsNoteAt(x, 1285, 3) || IsNoteAt(x, 1780, 4))
-            );
+            AddAssert("selected ungrouped", () => checkSnapAndSelectColumn(956, new List<(int, int)>
+                { (956, 1), (956, 6), (1285, 3), (1780, 4) }
+            ));
 
             AddStepClickLink("02:36:560 (156560|1,156560|4,156560|6)");
-            AddAssert("selected in row", () =>
-                EditorClock.CurrentTime == 156560
-                && EditorBeatmap.SelectedHitObjects.Count == 3
-                && EditorBeatmap.SelectedHitObjects.All(x =>
-                    IsNoteAt(x, 156560, 1) || IsNoteAt(x, 156560, 4) ||
-                    IsNoteAt(x, 156560, 6))
-            );
+            AddAssert("selected in row", () => checkSnapAndSelectColumn(156560, new List<(int, int)>
+                { (156560, 1), (156560, 4), (156560, 6) }
+            ));
 
             AddStepClickLink("00:35:736 (35736|3,36395|3,36725|3,37384|3)");
-            AddAssert("selected in column", () =>
-                EditorClock.CurrentTime == 35736
-                && EditorBeatmap.SelectedHitObjects.Count == 4
-                && EditorBeatmap.SelectedHitObjects.All(x =>
-                    IsNoteAt(x, 35736, 3) || IsNoteAt(x, 36395, 3) ||
-                    IsNoteAt(x, 36725, 3) || IsNoteAt(x, 37384, 3))
-            );
+            AddAssert("selected in column", () => checkSnapAndSelectColumn(35736, new List<(int, int)>
+                { (35736, 3), (36395, 3), (36725, 3), (37384, 3) }
+            ));
         }
 
         [Test]
@@ -355,23 +312,16 @@ namespace osu.Game.Tests.Visual.Editing
             SetUpEditor(rulesetInfo);
             AddAssert("is editor Mania", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
-            AddStepClickLink("00:00:000 (0|1)", "invalid link ");
-            AddAssert("snap to 1, select none", () =>
-                EditorClock.CurrentTime == 956
-                && !EditorBeatmap.SelectedHitObjects.Any()
+            AddStepClickLink("00:00:000 (0|1)", "invalid link");
+            AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(956));
+
+            AddStepClickLink("00:00:000 (0)", "std link");
+            AddAssert("snap and select 1", () => checkSnapAndSelectColumn(956, new List<(int, int)>
+                { (956, 1) })
             );
 
-            AddStepClickLink("00:00:000 (0)", "std link ");
-            AddAssert("snap and select 1", () =>
-                EditorClock.CurrentTime == 956
-                && EditorBeatmap.SelectedHitObjects.All(x => IsNoteAt(x, 956, 1))
-            );
-
-            AddStepClickLink("00:00:000 (1,2)", "std link ");
-            AddAssert("snap to 1, select none", () =>
-                EditorClock.CurrentTime == 956
-                && !EditorBeatmap.SelectedHitObjects.Any()
-            );
+            AddStepClickLink("00:00:000 (1,2)", "std link");
+            AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(956));
         }
     }
 }

From 57170501cdadfa786d8d59bd67efa4f45a9ce81a Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sat, 4 Nov 2023 17:25:09 +0200
Subject: [PATCH 1324/2296] Improve code quality

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       | 31 +++-------------
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 30 +++-------------
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 33 +++--------------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 30 +++-------------
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 20 ++++++-----
 .../Overlays/Mods/VerticalAttributeDisplay.cs | 33 ++++++++++++-----
 osu.Game/Rulesets/Ruleset.cs                  | 17 +--------
 .../Screens/Select/Details/AdvancedStats.cs   | 35 ++++++++++++-------
 8 files changed, 76 insertions(+), 153 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index f0b20c68c4..2d0e34431d 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -238,37 +238,14 @@ namespace osu.Game.Rulesets.Catch
         public float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150)) + 5;
         public float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
 
-        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (RateAdjustType AR, RateAdjustType OD) rateAdjustedInfo)
+        public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
         {
-            BeatmapDifficulty? adjustedDifficulty = null;
-            rateAdjustedInfo = (RateAdjustType.NotChanged, RateAdjustType.NotChanged);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            if (mods.Any(m => m is IApplicableToDifficulty))
-            {
-                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
-
-                foreach (var mod in mods.OfType<IApplicableToDifficulty>())
-                    mod.ApplyToDifficulty(adjustedDifficulty);
-            }
-
-            if (mods.Any(m => m is ModRateAdjust))
-            {
-                adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
-
-                foreach (var mod in mods.OfType<ModRateAdjust>())
-                {
-                    double speedChange = (float)mod.SpeedChange.Value;
-
-                    float ar = adjustedDifficulty.ApproachRate;
-                    float od = adjustedDifficulty.OverallDifficulty;
-
-                    adjustedDifficulty.ApproachRate = ChangeArFromRate(ar, speedChange);
-
-                    rateAdjustedInfo.AR = GetRateAdjustType(ar, adjustedDifficulty.ApproachRate);
-                }
-            }
+            adjustedDifficulty.ApproachRate = ChangeArFromRate(adjustedDifficulty.ApproachRate, rate);
 
             return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
         }
+
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index a8a54ebf05..cfdfcbadee 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -431,34 +431,12 @@ namespace osu.Game.Rulesets.Mania
         public double HitwindowFromOd(float OD) => 64.0 - 3 * OD;
         public float OdFromHitwindow(double hitwindow300) => (float)(64.0 - hitwindow300) / 3;
         public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
-        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (RateAdjustType AR, RateAdjustType OD) rateAdjustedInfo)
+
+        public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
         {
-            BeatmapDifficulty? adjustedDifficulty = null;
-            rateAdjustedInfo = (RateAdjustType.NotChanged, RateAdjustType.NotChanged);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            if (mods.Any(m => m is IApplicableToDifficulty))
-            {
-                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
-
-                foreach (var mod in mods.OfType<IApplicableToDifficulty>())
-                    mod.ApplyToDifficulty(adjustedDifficulty);
-            }
-
-            if (mods.Any(m => m is ModRateAdjust))
-            {
-                adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
-
-                foreach (var mod in mods.OfType<ModRateAdjust>())
-                {
-                    double speedChange = (float)mod.SpeedChange.Value;
-
-                    float od = adjustedDifficulty.OverallDifficulty;
-
-                    adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(od, speedChange);
-
-                    rateAdjustedInfo.OD = GetRateAdjustType(od, adjustedDifficulty.OverallDifficulty);
-                }
-            }
+            adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(adjustedDifficulty.OverallDifficulty, rate);
 
             return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
         }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 4810be5db2..3a8f589c9f 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -335,37 +335,12 @@ namespace osu.Game.Rulesets.Osu
         public float OdFromHitwindow(double hitwindow300) => (float)(80.0 - hitwindow300) / 6;
         public float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
         public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
-        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (RateAdjustType AR, RateAdjustType OD) rateAdjustedInfo)
+        public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
         {
-            BeatmapDifficulty? adjustedDifficulty = null;
-            rateAdjustedInfo = (RateAdjustType.NotChanged, RateAdjustType.NotChanged);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            if (mods.Any(m => m is IApplicableToDifficulty))
-            {
-                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
-
-                foreach (var mod in mods.OfType<IApplicableToDifficulty>())
-                    mod.ApplyToDifficulty(adjustedDifficulty);
-            }
-
-            if (mods.Any(m => m is ModRateAdjust))
-            {
-                adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
-
-                foreach (var mod in mods.OfType<ModRateAdjust>())
-                {
-                    double speedChange = (float)mod.SpeedChange.Value;
-
-                    float ar = adjustedDifficulty.ApproachRate;
-                    float od = adjustedDifficulty.OverallDifficulty;
-
-                    adjustedDifficulty.ApproachRate = ChangeArFromRate(ar, speedChange);
-                    adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(od, speedChange);
-
-                    rateAdjustedInfo.AR = GetRateAdjustType(ar, adjustedDifficulty.ApproachRate);
-                    rateAdjustedInfo.OD = GetRateAdjustType(od, adjustedDifficulty.OverallDifficulty);
-                }
-            }
+            adjustedDifficulty.ApproachRate = ChangeArFromRate(adjustedDifficulty.ApproachRate, rate);
+            adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(adjustedDifficulty.OverallDifficulty, rate);
 
             return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
         }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index a9abbea251..026ac4f42e 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -266,34 +266,12 @@ namespace osu.Game.Rulesets.Taiko
         public double HitwindowFromOd(float OD) => 35.0 - 15.0 * (OD - 5) / 5;
         public float OdFromHitwindow(double hitwindow300) => (float)(5 * (35 - hitwindow300) / 15 + 5);
         public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
-        public override BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (RateAdjustType AR, RateAdjustType OD) rateAdjustedInfo)
+
+        public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
         {
-            BeatmapDifficulty? adjustedDifficulty = null;
-            rateAdjustedInfo = (RateAdjustType.NotChanged, RateAdjustType.NotChanged);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            if (mods.Any(m => m is IApplicableToDifficulty))
-            {
-                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
-
-                foreach (var mod in mods.OfType<IApplicableToDifficulty>())
-                    mod.ApplyToDifficulty(adjustedDifficulty);
-            }
-
-            if (mods.Any(m => m is ModRateAdjust))
-            {
-                adjustedDifficulty ??= new BeatmapDifficulty(baseDifficulty);
-
-                foreach (var mod in mods.OfType<ModRateAdjust>())
-                {
-                    double speedChange = (float)mod.SpeedChange.Value;
-
-                    float od = adjustedDifficulty.OverallDifficulty;
-
-                    adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(od, speedChange);
-
-                    rateAdjustedInfo.OD = GetRateAdjustType(od, adjustedDifficulty.OverallDifficulty);
-                }
-            }
+            adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(adjustedDifficulty.OverallDifficulty, rate);
 
             return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
         }
diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index d0ee9750b2..fd9ce8f5d9 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -251,17 +251,21 @@ namespace osu.Game.Overlays.Mods
 
             bpmDisplay.Current.Value = BeatmapInfo.Value.BPM * rate;
 
-            (Ruleset.RateAdjustType AR, Ruleset.RateAdjustType OD) rateAdjustType = (Ruleset.RateAdjustType.NotChanged, Ruleset.RateAdjustType.NotChanged);
+            var moddedDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
+
+            foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
+                mod.ApplyToDifficulty(moddedDifficulty);
 
             Ruleset ruleset = gameRuleset.Value.CreateInstance();
-            BeatmapDifficulty adjustedDifficulty = ruleset.GetEffectiveDifficulty(BeatmapInfo.Value.Difficulty, mods.Value, ref rateAdjustType);
-            approachRateDisplay.RateChangeType.Value = rateAdjustType.AR;
-            overallDifficultyDisplay.RateChangeType.Value = rateAdjustType.OD;
+            var rateAdjustedDifficulty = ruleset.GetRateAdjustedDifficulty(moddedDifficulty, rate);
 
-            circleSizeDisplay.Current.Value = adjustedDifficulty.CircleSize;
-            drainRateDisplay.Current.Value = adjustedDifficulty.DrainRate;
-            approachRateDisplay.Current.Value = adjustedDifficulty.ApproachRate;
-            overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
+            approachRateDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(moddedDifficulty.ApproachRate, rateAdjustedDifficulty.ApproachRate);
+            overallDifficultyDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(moddedDifficulty.OverallDifficulty, rateAdjustedDifficulty.OverallDifficulty);
+
+            circleSizeDisplay.Current.Value = rateAdjustedDifficulty.CircleSize;
+            drainRateDisplay.Current.Value = rateAdjustedDifficulty.DrainRate;
+            approachRateDisplay.Current.Value = rateAdjustedDifficulty.ApproachRate;
+            overallDifficultyDisplay.Current.Value = rateAdjustedDifficulty.OverallDifficulty;
         });
 
         private void updateCollapsedState()
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index 16d75cd448..0b0c49bc1b 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -12,7 +12,6 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osuTK.Graphics;
 
@@ -28,7 +27,7 @@ namespace osu.Game.Overlays.Mods
 
         private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
 
-        public Bindable<Ruleset.RateAdjustType> RateChangeType = new Bindable<Ruleset.RateAdjustType>(Ruleset.RateAdjustType.NotChanged);
+        public Bindable<ModEffect> AdjustType = new Bindable<ModEffect>();
 
         /// <summary>
         /// Text to display in the top area of the display.
@@ -43,22 +42,22 @@ namespace osu.Game.Overlays.Mods
         private void updateTextColor()
         {
             Color4 newColor;
-            switch (RateChangeType.Value)
+            switch (AdjustType.Value)
             {
-                case Ruleset.RateAdjustType.NotChanged:
+                case ModEffect.NotChanged:
                     newColor = Color4.White;
                     break;
 
-                case Ruleset.RateAdjustType.DifficultyReduction:
+                case ModEffect.DifficultyReduction:
                     newColor = colours.ForModType(ModType.DifficultyReduction);
                     break;
 
-                case Ruleset.RateAdjustType.DifficultyIncrease:
+                case ModEffect.DifficultyIncrease:
                     newColor = colours.ForModType(ModType.DifficultyIncrease);
                     break;
 
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(RateChangeType.Value));
+                    throw new ArgumentOutOfRangeException(nameof(AdjustType.Value));
             }
 
             text.Colour = newColor;
@@ -74,7 +73,7 @@ namespace osu.Game.Overlays.Mods
             Origin = Anchor.CentreLeft;
             Anchor = Anchor.CentreLeft;
 
-            RateChangeType.BindValueChanged(_ => updateTextColor());
+            AdjustType.BindValueChanged(_ => updateTextColor());
 
             InternalChild = new FillFlowContainer
             {
@@ -101,6 +100,24 @@ namespace osu.Game.Overlays.Mods
                 }
             };
         }
+
+        public static ModEffect CalculateEffect(double oldValue, double newValue)
+        {
+            if (newValue == oldValue)
+                return ModEffect.NotChanged;
+            if (newValue < oldValue)
+                return ModEffect.DifficultyReduction;
+
+            return ModEffect.DifficultyIncrease;
+        }
+
+        public enum ModEffect
+        {
+            NotChanged,
+            DifficultyReduction,
+            DifficultyIncrease,
+        }
+
         private partial class EffectCounter : RollingCounter<double>
         {
             protected override double RollingDuration => 500;
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 7a09bff4aa..fbeec5ff4b 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -389,21 +389,6 @@ namespace osu.Game.Rulesets
         /// Can be overridden to alter the difficulty section to the editor beatmap setup screen.
         /// </summary>
         public virtual DifficultySection? CreateEditorDifficultySection() => null;
-        public virtual BeatmapDifficulty GetEffectiveDifficulty(IBeatmapDifficultyInfo baseDifficulty, IReadOnlyList<Mod> mods, ref (RateAdjustType AR, RateAdjustType OD) rateAdjustedInfo) => (BeatmapDifficulty)baseDifficulty;
-        public enum RateAdjustType
-        {
-            NotChanged,
-            DifficultyReduction,
-            DifficultyIncrease
-        }
-
-        protected RateAdjustType GetRateAdjustType(float baseValue, float adjustedValue)
-        {
-            if (adjustedValue > baseValue)
-                return RateAdjustType.DifficultyIncrease;
-            if (adjustedValue < baseValue)
-                return RateAdjustType.DifficultyReduction;
-            return RateAdjustType.NotChanged;
-        }
+        public virtual BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate) => new BeatmapDifficulty(baseDifficulty);
     }
 }
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 867d86a69b..d143e12667 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -24,6 +24,7 @@ using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
+using System.Linq;
 
 namespace osu.Game.Screens.Select.Details
 {
@@ -116,12 +117,21 @@ namespace osu.Game.Screens.Select.Details
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
             BeatmapDifficulty adjustedDifficulty = null;
-            (Ruleset.RateAdjustType AR, Ruleset.RateAdjustType OD) rateAdjustInfo = (Ruleset.RateAdjustType.NotChanged, Ruleset.RateAdjustType.NotChanged);
 
             if (baseDifficulty != null)
             {
-                Ruleset ruleset = gameRuleset.Value.CreateInstance();
-                adjustedDifficulty = ruleset.GetEffectiveDifficulty(baseDifficulty, mods.Value, ref rateAdjustInfo);
+                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
+
+                foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
+                    mod.ApplyToDifficulty(adjustedDifficulty);
+
+                // For now we not using rate adjusted difficulty here
+
+                //Ruleset ruleset = gameRuleset.Value.CreateInstance();
+                //double rate = 1;
+                //foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                //    rate = mod.ApplyToRate(0, rate);
+                //adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(adjustedDifficulty, rate);
             }
 
             switch (BeatmapInfo?.Ruleset.OnlineID)
@@ -130,18 +140,18 @@ namespace osu.Game.Screens.Select.Details
                     // Account for mania differences locally for now
                     // Eventually this should be handled in a more modular way, allowing rulesets to return arbitrary difficulty attributes
                     FirstValue.Title = BeatmapsetsStrings.ShowStatsCsMania;
-                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, null, false);
+                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, null);
                     break;
 
                 default:
                     FirstValue.Title = BeatmapsetsStrings.ShowStatsCs;
-                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize, false);
+                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
                     break;
             }
 
-            HpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate, false);
-            Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty, rateAdjustInfo.OD != Ruleset.RateAdjustType.NotChanged);
-            ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate, rateAdjustInfo.OD != Ruleset.RateAdjustType.NotChanged);
+            HpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate);
+            Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty);
+            ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
 
             updateStarDifficulty();
         }
@@ -175,7 +185,7 @@ namespace osu.Game.Screens.Select.Details
                 if (normalDifficulty == null || moddedDifficulty == null)
                     return;
 
-                starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars, false);
+                starDifficulty.Value = ((float)normalDifficulty.Value.Stars, (float)moddedDifficulty.Value.Stars);
             }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         });
 
@@ -206,11 +216,11 @@ namespace osu.Game.Screens.Select.Details
                 set => name.Text = value;
             }
 
-            private (float baseValue, float? adjustedValue, bool isRateAdjusted)? value;
+            private (float baseValue, float? adjustedValue)? value;
 
-            public (float baseValue, float? adjustedValue, bool isRateAdjusted) Value
+            public (float baseValue, float? adjustedValue) Value
             {
-                get => value ?? (0, null, false);
+                get => value ?? (0, null);
                 set
                 {
                     if (value == this.value)
@@ -221,7 +231,6 @@ namespace osu.Game.Screens.Select.Details
                     bar.Length = value.baseValue / maxValue;
 
                     valueText.Text = (value.adjustedValue ?? value.baseValue).ToString(forceDecimalPlaces ? "0.00" : "0.##");
-                    if (value.isRateAdjusted) valueText.Text += "*";
                     ModBar.Length = (value.adjustedValue ?? 0) / maxValue;
 
                     if (Precision.AlmostEquals(value.baseValue, value.adjustedValue ?? value.baseValue, 0.05f))

From 440d57fb48ec4fc029452ceda9f54aad381fd32a Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sat, 4 Nov 2023 17:47:02 +0200
Subject: [PATCH 1325/2296] Basic rate-adjust tooltip

---
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index fd9ce8f5d9..fc0ef989e6 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -9,6 +9,7 @@ using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
@@ -23,6 +24,7 @@ using osuTK.Graphics;
 using System.Threading;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Difficulty;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -30,7 +32,7 @@ namespace osu.Game.Overlays.Mods
     /// On the mod select overlay, this provides a local updating view of BPM, star rating and other
     /// difficulty attributes so the user can have a better insight into what mods are changing.
     /// </summary>
-    public partial class BeatmapAttributesDisplay : CompositeDrawable
+    public partial class BeatmapAttributesDisplay : CompositeDrawable, IHasTooltip
     {
         private Container content = null!;
         private Container innerContent = null!;
@@ -71,6 +73,10 @@ namespace osu.Game.Overlays.Mods
         private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
+        private BeatmapDifficulty? baseDifficultyAttributes = null;
+
+        private bool haveRateChangedValues = false;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -256,9 +262,13 @@ namespace osu.Game.Overlays.Mods
             foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
                 mod.ApplyToDifficulty(moddedDifficulty);
 
+            baseDifficultyAttributes = moddedDifficulty;
+
             Ruleset ruleset = gameRuleset.Value.CreateInstance();
             var rateAdjustedDifficulty = ruleset.GetRateAdjustedDifficulty(moddedDifficulty, rate);
 
+            haveRateChangedValues = !haveEqualDifficulties(rateAdjustedDifficulty, moddedDifficulty);
+
             approachRateDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(moddedDifficulty.ApproachRate, rateAdjustedDifficulty.ApproachRate);
             overallDifficultyDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(moddedDifficulty.OverallDifficulty, rateAdjustedDifficulty.OverallDifficulty);
 
@@ -268,6 +278,19 @@ namespace osu.Game.Overlays.Mods
             overallDifficultyDisplay.Current.Value = rateAdjustedDifficulty.OverallDifficulty;
         });
 
+        private bool haveEqualDifficulties(BeatmapDifficulty? a, BeatmapDifficulty? b)
+        {
+            if (a == null && b == null) return true;
+            if (a == null || b == null) return false;
+
+            if (a.ApproachRate != b.ApproachRate) return false;
+            if (a.OverallDifficulty != b.OverallDifficulty) return false;
+            if (a.DrainRate != b.DrainRate) return false;
+            if (a.CircleSize != b.CircleSize) return false;
+
+            return true;
+        }
+
         private void updateCollapsedState()
         {
             outerContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
@@ -285,5 +308,17 @@ namespace osu.Game.Overlays.Mods
                 UseFullGlyphHeight = false,
             };
         }
+
+        public LocalisableString TooltipText
+        {
+            get
+            {
+                if (haveRateChangedValues)
+                {
+                    return "Some of the values are Rate-Adjusted.";
+                }
+                return "";
+            }
+        }
     }
 }

From 5597e819be1e400fb481f316b1b6fc47c76b94d7 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sat, 4 Nov 2023 18:01:10 +0200
Subject: [PATCH 1326/2296] fixed bug in AR formula

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 2d0e34431d..da84d12f59 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -235,7 +235,7 @@ namespace osu.Game.Rulesets.Catch
         }
 
         public double PreemptFromAr(float AR) => AR < 5 ? (1200.0 + 600.0 * (5 - AR) / 5) : (1200.0 - 750.0 * (AR - 5) / 5);
-        public float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150)) + 5;
+        public float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
         public float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
 
         public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 3a8f589c9f..bdbedf1409 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -330,7 +330,7 @@ namespace osu.Game.Rulesets.Osu
         public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
 
         public double PreemptFromAr(float AR) => AR < 5 ? (1200.0 + 600.0 * (5 - AR) / 5) : (1200.0 - 750.0 * (AR - 5) / 5);
-        public float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150)) + 5;
+        public float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
         public double HitwindowFromOd(float OD) => 80.0 - 6 * OD;
         public float OdFromHitwindow(double hitwindow300) => (float)(80.0 - hitwindow300) / 6;
         public float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);

From a70bfca501312bc587c230064a6269b20a714c82 Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Thu, 2 Nov 2023 09:16:25 +0100
Subject: [PATCH 1327/2296] added usergrid for tooltip

---
 osu.Game/Users/Drawables/ClickableAvatar.cs | 33 ++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index 677a8fff36..0ed9f56cc7 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -3,16 +3,27 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
 using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
+using osuTK;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class ClickableAvatar : OsuClickableContainer
+    public partial class ClickableAvatar : OsuClickableContainer, IHasCustomTooltip<UserGridPanel>
     {
+        public ITooltip<UserGridPanel> GetCustomTooltip() => new UserGridPanelTooltip();
+
+        public UserGridPanel TooltipContent => new UserGridPanel(user!)
+        {
+            Width = 300
+        };
+
         public override LocalisableString TooltipText
         {
             get
@@ -67,5 +78,25 @@ namespace osu.Game.Users.Drawables
 
             return base.OnClick(e);
         }
+
+        private partial class UserGridPanelTooltip : VisibilityContainer, ITooltip<UserGridPanel>
+        {
+            private UserGridPanel? displayedUser;
+
+            protected override void PopIn()
+            {
+                Child = displayedUser;
+                this.FadeIn(20, Easing.OutQuint);
+            }
+
+            protected override void PopOut() => this.FadeOut(80, Easing.OutQuint);
+
+            public void Move(Vector2 pos) => Position = pos;
+
+            public void SetContent(UserGridPanel userGridPanel)
+            {
+                displayedUser = userGridPanel;
+            }
+        }
     }
 }

From ec290ae953c9dffec44bb71e1fcde4e0785ef843 Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Sat, 4 Nov 2023 19:03:23 +0100
Subject: [PATCH 1328/2296] added tests

---
 .../Online/TestSceneUserClickableAvatar.cs    | 125 ++++++++++++++++++
 osu.Game/Users/Drawables/ClickableAvatar.cs   |  21 ---
 osu.Game/Users/Drawables/UpdateableAvatar.cs  |   1 -
 3 files changed, 125 insertions(+), 22 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
new file mode 100644
index 0000000000..13f559ac09
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Testing;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users;
+using osu.Game.Users.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public partial class TestSceneUserClickableAvatar : OsuManualInputManagerTestScene
+    {
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Spacing = new Vector2(10f),
+                Children = new Drawable[]
+                {
+                    new ClickableAvatar(new APIUser
+                    {
+                        Username = @"flyte", Id = 3103765, CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
+                    })
+                    {
+                        Width = 50,
+                        Height = 50,
+                        CornerRadius = 10,
+                        Masking = true,
+                        EdgeEffect = new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
+                        },
+                    },
+                    new ClickableAvatar(new APIUser
+                    {
+                        Username = @"peppy", Id = 2, Colour = "99EB47", CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                    })
+                    {
+                        Width = 50,
+                        Height = 50,
+                        CornerRadius = 10,
+                        Masking = true,
+                        EdgeEffect = new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
+                        },
+                    },
+                    new ClickableAvatar(new APIUser
+                    {
+                        Username = @"flyte",
+                        Id = 3103765,
+                        CountryCode = CountryCode.JP,
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
+                        Status =
+                        {
+                            Value = new UserStatusOnline()
+                        }
+                    })
+                    {
+                        Width = 50,
+                        Height = 50,
+                        CornerRadius = 10,
+                        Masking = true,
+                        EdgeEffect = new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
+                        },
+                    },
+                },
+            };
+        });
+
+        [Test]
+        public void TestClickableAvatarHover()
+        {
+            AddStep($"click {1}. {nameof(ClickableAvatar)}", () =>
+            {
+                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+                if (targets.Count < 1)
+                    return;
+
+                InputManager.MoveMouseTo(targets[0]);
+            });
+            AddWaitStep("wait for tooltip to show", 5);
+            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddWaitStep("wait for tooltip to hide", 3);
+
+            AddStep($"click {2}. {nameof(ClickableAvatar)}", () =>
+            {
+                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+                if (targets.Count < 2)
+                    return;
+
+                InputManager.MoveMouseTo(targets[1]);
+            });
+            AddWaitStep("wait for tooltip to show", 5);
+            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddWaitStep("wait for tooltip to hide", 3);
+
+            AddStep($"click {3}. {nameof(ClickableAvatar)}", () =>
+            {
+                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+                if (targets.Count < 3)
+                    return;
+
+                InputManager.MoveMouseTo(targets[2]);
+            });
+            AddWaitStep("wait for tooltip to show", 5);
+            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddWaitStep("wait for tooltip to hide", 3);
+        }
+    }
+}
diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index 0ed9f56cc7..d6c6afba0b 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.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.
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
-using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
@@ -24,24 +21,6 @@ namespace osu.Game.Users.Drawables
             Width = 300
         };
 
-        public override LocalisableString TooltipText
-        {
-            get
-            {
-                if (!Enabled.Value)
-                    return string.Empty;
-
-                return ShowUsernameTooltip ? (user?.Username ?? string.Empty) : ContextMenuStrings.ViewProfile;
-            }
-            set => throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// By default, the tooltip will show "view profile" as avatars are usually displayed next to a username.
-        /// Setting this to <c>true</c> exposes the username via tooltip for special cases where this is not true.
-        /// </summary>
-        public bool ShowUsernameTooltip { get; set; }
-
         private readonly APIUser? user;
 
         [Resolved]
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index c659685807..58b3646995 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -74,7 +74,6 @@ namespace osu.Game.Users.Drawables
             {
                 return new ClickableAvatar(user)
                 {
-                    ShowUsernameTooltip = showUsernameTooltip,
                     RelativeSizeAxes = Axes.Both,
                 };
             }

From 820519c37dcfa271235e75cdc2f9ad10d2f6f91e Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sat, 4 Nov 2023 21:55:46 +0200
Subject: [PATCH 1329/2296] improved tooltip

---
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 44 +++++++++----------
 .../Overlays/Mods/VerticalAttributeDisplay.cs |  3 +-
 .../Screens/Select/Details/AdvancedStats.cs   | 44 ++++++++++++++++---
 3 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index fc0ef989e6..c921e3e075 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Threading;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,9 +12,12 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -21,10 +25,6 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osuTK;
 using osuTK.Graphics;
-using System.Threading;
-using osu.Framework.Input.Events;
-using osu.Game.Configuration;
-using osu.Game.Rulesets.Difficulty;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -73,8 +73,7 @@ namespace osu.Game.Overlays.Mods
         private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
-        private BeatmapDifficulty? baseDifficultyAttributes = null;
-
+        private BeatmapDifficulty? originalDifficulty = null;
         private bool haveRateChangedValues = false;
 
         [BackgroundDependencyLoader]
@@ -257,36 +256,34 @@ namespace osu.Game.Overlays.Mods
 
             bpmDisplay.Current.Value = BeatmapInfo.Value.BPM * rate;
 
-            var moddedDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
+            var adjustedDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
 
             foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
-                mod.ApplyToDifficulty(moddedDifficulty);
+                mod.ApplyToDifficulty(adjustedDifficulty);
 
-            baseDifficultyAttributes = moddedDifficulty;
+            originalDifficulty = adjustedDifficulty;
 
             Ruleset ruleset = gameRuleset.Value.CreateInstance();
-            var rateAdjustedDifficulty = ruleset.GetRateAdjustedDifficulty(moddedDifficulty, rate);
+            adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(adjustedDifficulty, rate);
 
-            haveRateChangedValues = !haveEqualDifficulties(rateAdjustedDifficulty, moddedDifficulty);
+            haveRateChangedValues = !isDifferentArOd(originalDifficulty, adjustedDifficulty);
 
-            approachRateDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(moddedDifficulty.ApproachRate, rateAdjustedDifficulty.ApproachRate);
-            overallDifficultyDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(moddedDifficulty.OverallDifficulty, rateAdjustedDifficulty.OverallDifficulty);
+            approachRateDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
+            overallDifficultyDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
 
-            circleSizeDisplay.Current.Value = rateAdjustedDifficulty.CircleSize;
-            drainRateDisplay.Current.Value = rateAdjustedDifficulty.DrainRate;
-            approachRateDisplay.Current.Value = rateAdjustedDifficulty.ApproachRate;
-            overallDifficultyDisplay.Current.Value = rateAdjustedDifficulty.OverallDifficulty;
+            circleSizeDisplay.Current.Value = adjustedDifficulty.CircleSize;
+            drainRateDisplay.Current.Value = adjustedDifficulty.DrainRate;
+            approachRateDisplay.Current.Value = adjustedDifficulty.ApproachRate;
+            overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
         });
 
-        private bool haveEqualDifficulties(BeatmapDifficulty? a, BeatmapDifficulty? b)
+        private bool isDifferentArOd(BeatmapDifficulty? a, BeatmapDifficulty? b)
         {
             if (a == null && b == null) return true;
             if (a == null || b == null) return false;
 
-            if (a.ApproachRate != b.ApproachRate) return false;
-            if (a.OverallDifficulty != b.OverallDifficulty) return false;
-            if (a.DrainRate != b.DrainRate) return false;
-            if (a.CircleSize != b.CircleSize) return false;
+            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return false;
+            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return false;
 
             return true;
         }
@@ -315,7 +312,8 @@ namespace osu.Game.Overlays.Mods
             {
                 if (haveRateChangedValues)
                 {
-                    return "Some of the values are Rate-Adjusted.";
+                    return LocalisableString.Format("Values are changed by mods that change speed.\n" +
+                        "Original values: AR = {0}, OD = {1}", originalDifficulty?.ApproachRate ?? 0, originalDifficulty?.OverallDifficulty ?? 0);
                 }
                 return "";
             }
diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index 0b0c49bc1b..6ac7ebf159 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -103,7 +104,7 @@ namespace osu.Game.Overlays.Mods
 
         public static ModEffect CalculateEffect(double oldValue, double newValue)
         {
-            if (newValue == oldValue)
+            if (Precision.AlmostEquals(newValue, oldValue, 0.01))
                 return ModEffect.NotChanged;
             if (newValue < oldValue)
                 return ModEffect.DifficultyReduction;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index d143e12667..f9c6e95154 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -28,7 +29,7 @@ using System.Linq;
 
 namespace osu.Game.Screens.Select.Details
 {
-    public partial class AdvancedStats : Container
+    public partial class AdvancedStats : Container, IHasTooltip
     {
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
@@ -44,6 +45,9 @@ namespace osu.Game.Screens.Select.Details
         protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate;
         private readonly StatisticRow starDifficulty;
 
+        private BeatmapDifficulty originalDifficulty = null;
+        private bool haveRateChangedValues = false;
+
         private IBeatmapInfo beatmapInfo;
 
         public IBeatmapInfo BeatmapInfo
@@ -125,13 +129,15 @@ namespace osu.Game.Screens.Select.Details
                 foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
                     mod.ApplyToDifficulty(adjustedDifficulty);
 
-                // For now we not using rate adjusted difficulty here
+                originalDifficulty = adjustedDifficulty;
 
-                //Ruleset ruleset = gameRuleset.Value.CreateInstance();
-                //double rate = 1;
-                //foreach (var mod in mods.Value.OfType<IApplicableToRate>())
-                //    rate = mod.ApplyToRate(0, rate);
-                //adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(adjustedDifficulty, rate);
+                Ruleset ruleset = gameRuleset.Value.CreateInstance();
+                double rate = 1;
+                foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                    rate = mod.ApplyToRate(0, rate);
+                adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(adjustedDifficulty, rate);
+
+                haveRateChangedValues = !isDifferentArOd(originalDifficulty, adjustedDifficulty);
             }
 
             switch (BeatmapInfo?.Ruleset.OnlineID)
@@ -196,6 +202,30 @@ namespace osu.Game.Screens.Select.Details
             starDifficultyCancellationSource?.Cancel();
         }
 
+        private bool isDifferentArOd(BeatmapDifficulty a, BeatmapDifficulty b)
+        {
+            if (a == null && b == null) return true;
+            if (a == null || b == null) return false;
+
+            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return false;
+            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return false;
+
+            return true;
+        }
+
+        public LocalisableString TooltipText
+        {
+            get
+            {
+                if (haveRateChangedValues)
+                {
+                    return LocalisableString.Format("Values are changed by mods that change speed.\n" +
+                        "Original values: AR = {0}, OD = {1}", originalDifficulty?.ApproachRate ?? 0, originalDifficulty?.OverallDifficulty ?? 0);
+                }
+                return "";
+            }
+        }
+
         public partial class StatisticRow : Container, IHasAccentColour
         {
             private const float value_width = 25;

From 97caf18036efce177232e4ecfa3e36a5dba69fa0 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sat, 4 Nov 2023 21:57:17 +0200
Subject: [PATCH 1330/2296] Update CatchRuleset.cs

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index da84d12f59..816638ca87 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;

From d0b2b4f7b9eaf2bf93cc92532ec683e095707561 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sat, 4 Nov 2023 21:57:42 +0200
Subject: [PATCH 1331/2296] Update AdvancedStats.cs

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

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index f9c6e95154..54b76c48a4 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -16,6 +16,7 @@ using osu.Game.Beatmaps;
 using osu.Framework.Bindables;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Mods;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Extensions;
@@ -25,7 +26,6 @@ using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
-using System.Linq;
 
 namespace osu.Game.Screens.Select.Details
 {

From 7492d953aee303732df79ba0267f34dbacfbb3e9 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sat, 4 Nov 2023 21:17:58 +0100
Subject: [PATCH 1332/2296] Moved error checks into Editor - Invoke Action on
 error to Notify user - added some comments

---
 .../Editing/TestSceneOpenEditorTimestamp.cs   | 25 ++++++------
 osu.Game/OsuGame.cs                           | 39 ++++---------------
 osu.Game/Screens/Edit/Editor.cs               | 27 ++++++++++++-
 .../Screens/Edit/EditorTimestampParser.cs     |  4 +-
 4 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index fea9334ff8..f65aff922e 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
@@ -67,17 +67,6 @@ namespace osu.Game.Tests.Visual.Editing
                    && checkCombos;
         }
 
-        private bool checkSnapAndSelectColumn(double startTime, List<(int, int)> columnPairs = null)
-        {
-            bool checkColumns = columnPairs != null
-                ? EditorBeatmap.SelectedHitObjects.All(x => columnPairs.Any(col => isNoteAt(x, col.Item1, col.Item2)))
-                : !EditorBeatmap.SelectedHitObjects.Any();
-
-            return EditorClock.CurrentTime == startTime
-                   && EditorBeatmap.SelectedHitObjects.Count == (columnPairs?.Count ?? 0)
-                   && checkColumns;
-        }
-
         private bool hasCombosInOrder(IEnumerable<HitObject> selected, params int[] comboNumbers)
         {
             List<HitObject> hitObjects = selected.ToList();
@@ -89,6 +78,17 @@ namespace osu.Game.Tests.Visual.Editing
                               .Any();
         }
 
+        private bool checkSnapAndSelectColumn(double startTime, IReadOnlyCollection<(int, int)> columnPairs = null)
+        {
+            bool checkColumns = columnPairs != null
+                ? EditorBeatmap.SelectedHitObjects.All(x => columnPairs.Any(col => isNoteAt(x, col.Item1, col.Item2)))
+                : !EditorBeatmap.SelectedHitObjects.Any();
+
+            return EditorClock.CurrentTime == startTime
+                   && EditorBeatmap.SelectedHitObjects.Count == (columnPairs?.Count ?? 0)
+                   && checkColumns;
+        }
+
         private bool isNoteAt(HitObject hitObject, double time, int column)
         {
             return hitObject is IHasColumn columnInfo
@@ -96,7 +96,7 @@ namespace osu.Game.Tests.Visual.Editing
                    && columnInfo.Column == column;
         }
 
-        public void SetUpEditor(RulesetInfo ruleset)
+        protected void SetUpEditor(RulesetInfo ruleset)
         {
             BeatmapSetInfo beatmapSet = null!;
 
@@ -320,6 +320,7 @@ namespace osu.Game.Tests.Visual.Editing
                 { (956, 1) })
             );
 
+            // TODO: discuss - this selects the first 2 objects on Stable, do we want that or is this fine?
             AddStepClickLink("00:00:000 (1,2)", "std link");
             AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(956));
         }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a6bb6cc120..a9d4927e33 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -562,43 +562,18 @@ namespace osu.Game
         {
             if (ScreenStack.CurrentScreen is not Editor editor)
             {
-                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleNotification
-                {
-                    Icon = FontAwesome.Solid.ExclamationTriangle,
-                    Text = EditorStrings.MustBeInEdit,
-                }));
+                postNotification(EditorStrings.MustBeInEdit);
                 return;
             }
 
-            string[] groups = EditorTimestampParser.GetRegexGroups(timestamp);
+            editor.SeekAndSelectHitObjects(timestamp, onError: postNotification);
+            return;
 
-            if (groups.Length != 2 || string.IsNullOrEmpty(groups[0]))
+            void postNotification(LocalisableString message) => Schedule(() => Notifications.Post(new SimpleNotification
             {
-                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleNotification
-                {
-                    Icon = FontAwesome.Solid.ExclamationTriangle,
-                    Text = EditorStrings.FailedToProcessTimestamp
-                }));
-                return;
-            }
-
-            string timeGroup = groups[0];
-            string objectsGroup = groups[1];
-            string timeMinutes = timeGroup.Split(':').FirstOrDefault() ?? string.Empty;
-
-            // Currently, lazer chat highlights infinite-long editor links like `10000000000:00:000 (1)`
-            // Limit timestamp link length at 30000 min (50 hr) to avoid parsing issues
-            if (timeMinutes.Length > 5 || double.Parse(timeMinutes) > 30_000)
-            {
-                waitForReady(() => Notifications, _ => Notifications.Post(new SimpleNotification
-                {
-                    Icon = FontAwesome.Solid.ExclamationTriangle,
-                    Text = EditorStrings.TooLongTimestamp
-                }));
-                return;
-            }
-
-            editor.SeekAndSelectHitObjects(timeGroup, objectsGroup);
+                Icon = FontAwesome.Solid.ExclamationTriangle,
+                Text = message
+            }));
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 80e01d4eb7..60d26d9ec0 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1138,11 +1138,33 @@ namespace osu.Game.Screens.Edit
             loader?.CancelPendingDifficultySwitch();
         }
 
-        public void SeekAndSelectHitObjects(string timeGroup, string objectsGroup)
+        public void SeekAndSelectHitObjects(string timestamp, Action<LocalisableString> onError)
         {
+            string[] groups = EditorTimestampParser.GetRegexGroups(timestamp);
+
+            if (groups.Length != 2 || string.IsNullOrEmpty(groups[0]))
+            {
+                onError.Invoke(EditorStrings.FailedToProcessTimestamp);
+                return;
+            }
+
+            string timeGroup = groups[0];
+            string objectsGroup = groups[1];
+            string timeMinutes = timeGroup.Split(':').FirstOrDefault() ?? string.Empty;
+
+            // Currently, lazer chat highlights infinite-long editor links like `10000000000:00:000 (1)`
+            // Limit timestamp link length at 30000 min (50 hr) to avoid parsing issues
+            if (timeMinutes.Length > 5 || double.Parse(timeMinutes) > 30_000)
+            {
+                onError.Invoke(EditorStrings.TooLongTimestamp);
+                return;
+            }
+
             double position = EditorTimestampParser.GetTotalMilliseconds(timeGroup);
+
             editorBeatmap.SelectedHitObjects.Clear();
 
+            // Only seeking is necessary
             if (string.IsNullOrEmpty(objectsGroup))
             {
                 if (clock.IsRunning)
@@ -1155,8 +1177,9 @@ namespace osu.Game.Screens.Edit
             if (Mode.Value != EditorScreenMode.Compose)
                 Mode.Value = EditorScreenMode.Compose;
 
-            // Seek to the next closest HitObject's position
+            // Seek to the next closest HitObject
             HitObject nextObject = editorBeatmap.HitObjects.FirstOrDefault(x => x.StartTime >= position);
+
             if (nextObject != null && nextObject.StartTime > 0)
                 position = nextObject.StartTime;
 
diff --git a/osu.Game/Screens/Edit/EditorTimestampParser.cs b/osu.Game/Screens/Edit/EditorTimestampParser.cs
index 44d614ca70..2d8f8a8f4c 100644
--- a/osu.Game/Screens/Edit/EditorTimestampParser.cs
+++ b/osu.Game/Screens/Edit/EditorTimestampParser.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit
             return (times[0] * 60 + times[1]) * 1_000 + times[2];
         }
 
-        public static List<HitObject> GetSelectedHitObjects(IEnumerable<HitObject> editorHitObjects, string objectsGroup, double position)
+        public static List<HitObject> GetSelectedHitObjects(IReadOnlyList<HitObject> editorHitObjects, string objectsGroup, double position)
         {
             List<HitObject> hitObjects = editorHitObjects.Where(x => x.StartTime >= position).ToList();
             List<HitObject> selectedObjects = new List<HitObject>();
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit
             }
 
             // Stable behavior
-            // - always selects next closest object when `objectsGroup` only has one, non-Column item
+            // - always selects the next closest object when `objectsGroup` only has one (combo) item
             if (objectsToSelect.Length != 1 || objectsGroup.Contains('|'))
                 return selectedObjects;
 

From 91cf237fc12fcbecc6d1345310717407f559a32e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 4 Nov 2023 02:46:28 +0300
Subject: [PATCH 1333/2296] Revert health display settings changes

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index cc69acf8d6..1a213ddc6f 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Play.HUD
         public bool UsesFixedAnchor { get; set; }
 
         [SettingSource("Bar height")]
-        public BindableFloat BarHeight { get; } = new BindableFloat(30)
+        public BindableFloat BarHeight { get; } = new BindableFloat(20)
         {
             MinValue = 0,
             MaxValue = 64,
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Play.HUD
         };
 
         [SettingSource("Bar length")]
-        public BindableFloat BarLength { get; } = new BindableFloat(0.35f)
+        public BindableFloat BarLength { get; } = new BindableFloat(0.98f)
         {
             MinValue = 0.2f,
             MaxValue = 1,

From 1c844a155e97059e23cdae6470401d217fa88db3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 5 Nov 2023 01:52:12 +0300
Subject: [PATCH 1334/2296] Remove health line detail

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 64 ++++++++-----------
 osu.Game/Skinning/ArgonSkin.cs                |  4 +-
 2 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 1a213ddc6f..793d43f7ef 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
@@ -101,45 +100,36 @@ namespace osu.Game.Screens.Play.HUD
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChildren = new[]
+            InternalChild = new Container
             {
-                new Circle
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    Position = new Vector2(-4f, main_path_radius - 1.5f),
-                    Size = new Vector2(50f, 3f),
-                },
-                new Container
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Margin = new MarginPadding { Left = 50f },
-                    Children = new Drawable[]
+                    background = new BackgroundPath
                     {
-                        background = new BackgroundPath
-                        {
-                            PathRadius = main_path_radius,
-                        },
-                        glowBar = new BarPath
-                        {
-                            BarColour = Color4.White,
-                            GlowColour = main_bar_glow_colour,
-                            Blending = BlendingParameters.Additive,
-                            Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
-                            PathRadius = 40f,
-                            // Kinda hacky, but results in correct positioning with increased path radius.
-                            Margin = new MarginPadding(-30f),
-                            GlowPortion = 0.9f,
-                        },
-                        mainBar = new BarPath
-                        {
-                            AutoSizeAxes = Axes.None,
-                            RelativeSizeAxes = Axes.Both,
-                            Blending = BlendingParameters.Additive,
-                            BarColour = main_bar_colour,
-                            GlowColour = main_bar_glow_colour,
-                            PathRadius = main_path_radius,
-                            GlowPortion = 0.6f,
-                        },
-                    }
+                        PathRadius = main_path_radius,
+                    },
+                    glowBar = new BarPath
+                    {
+                        BarColour = Color4.White,
+                        GlowColour = main_bar_glow_colour,
+                        Blending = BlendingParameters.Additive,
+                        Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White),
+                        PathRadius = 40f,
+                        // Kinda hacky, but results in correct positioning with increased path radius.
+                        Margin = new MarginPadding(-30f),
+                        GlowPortion = 0.9f,
+                    },
+                    mainBar = new BarPath
+                    {
+                        AutoSizeAxes = Axes.None,
+                        RelativeSizeAxes = Axes.Both,
+                        Blending = BlendingParameters.Additive,
+                        BarColour = main_bar_colour,
+                        GlowColour = main_bar_glow_colour,
+                        PathRadius = main_path_radius,
+                        GlowPortion = 0.6f,
+                    },
                 }
             };
         }
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 07d9afffac..f850ae9cbd 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -130,8 +130,8 @@ namespace osu.Game.Skinning
                                     // elements default to beneath the health bar
                                     const float components_x_offset = 50;
 
-                                    health.Anchor = Anchor.TopLeft;
-                                    health.Origin = Anchor.TopLeft;
+                                    health.Anchor = Anchor.TopCentre;
+                                    health.Origin = Anchor.TopCentre;
                                     health.Y = 15;
 
                                     if (scoreWedge != null)

From 58a830fc5b2bd749ebccd7cf1b5e0f12b6f4c117 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 5 Nov 2023 01:55:12 +0300
Subject: [PATCH 1335/2296] Revert "Add "Argon" performance points counter"

This reverts commit 56eeb117ce2011ad4b80cf32c3b015eb482d7c9b.
---
 .../TestScenePerformancePointsCounter.cs      |  5 +-
 .../Play/ArgonPerformancePointsCounter.cs     | 62 -------------------
 2 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/ArgonPerformancePointsCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePerformancePointsCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePerformancePointsCounter.cs
index 9b8346cf12..9622caabf5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePerformancePointsCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePerformancePointsCounter.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -29,7 +30,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private int iteration;
         private Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
-        private ArgonPerformancePointsCounter counter;
+        private PerformancePointsCounter counter;
 
         [SetUpSteps]
         public void SetUpSteps() => AddStep("create components", () =>
@@ -65,7 +66,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void createCounter() => AddStep("Create counter", () =>
         {
-            dependencyContainer.Child = counter = new ArgonPerformancePointsCounter
+            dependencyContainer.Child = counter = new PerformancePointsCounter
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Play/ArgonPerformancePointsCounter.cs b/osu.Game/Screens/Play/ArgonPerformancePointsCounter.cs
deleted file mode 100644
index f0e0e1f0a4..0000000000
--- a/osu.Game/Screens/Play/ArgonPerformancePointsCounter.cs
+++ /dev/null
@@ -1,62 +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.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.Resources.Localisation.Web;
-using osu.Game.Screens.Play.HUD;
-using osu.Game.Skinning;
-
-namespace osu.Game.Screens.Play
-{
-    public partial class ArgonPerformancePointsCounter : GameplayPerformancePointsCounter, ISerialisableDrawable
-    {
-        public bool UsesFixedAnchor { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-        }
-
-        protected override IHasText CreateText() => new TextComponent();
-
-        private partial class TextComponent : CompositeDrawable, IHasText
-        {
-            private readonly OsuSpriteText text;
-
-            public LocalisableString Text
-            {
-                get => text.Text;
-                set => text.Text = value;
-            }
-
-            public TextComponent()
-            {
-                AutoSizeAxes = Axes.Both;
-
-                InternalChild = new FillFlowContainer
-                {
-                    Direction = FillDirection.Vertical,
-                    Children = new[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Text = BeatmapsetsStrings.ShowScoreboardHeaderspp.ToUpper(),
-                            Font = OsuFont.Torus.With(size: 12, weight: FontWeight.Bold),
-                        },
-                        text = new OsuSpriteText
-                        {
-                            Font = OsuFont.Torus.With(size: 16.8f, weight: FontWeight.Regular),
-                        }
-                    }
-                };
-            }
-        }
-    }
-}

From a23dfbeab55bb3e195407bcf436444f150d5a355 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 5 Nov 2023 01:55:13 +0300
Subject: [PATCH 1336/2296] Revert "Abstractify PP counter logic from the
 "Triangles" implementation"

This reverts commit daf4a03fd092ac84955a8f63fa3c45200a28cf04.
---
 .../HUD/GameplayPerformancePointsCounter.cs   | 186 ------------------
 .../Play/HUD/PerformancePointsCounter.cs      | 181 ++++++++++++++++-
 2 files changed, 175 insertions(+), 192 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/GameplayPerformancePointsCounter.cs

diff --git a/osu.Game/Screens/Play/HUD/GameplayPerformancePointsCounter.cs b/osu.Game/Screens/Play/HUD/GameplayPerformancePointsCounter.cs
deleted file mode 100644
index a812a3e043..0000000000
--- a/osu.Game/Screens/Play/HUD/GameplayPerformancePointsCounter.cs
+++ /dev/null
@@ -1,186 +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.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Localisation;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public abstract partial class GameplayPerformancePointsCounter : RollingCounter<int>
-    {
-        protected override bool IsRollingProportional => true;
-
-        protected override double RollingDuration => 1000;
-
-        private const float alpha_when_invalid = 0.3f;
-
-        [Resolved]
-        private ScoreProcessor scoreProcessor { get; set; }
-
-        [Resolved]
-        private GameplayState gameplayState { get; set; }
-
-        [CanBeNull]
-        private List<TimedDifficultyAttributes> timedAttributes;
-
-        private readonly CancellationTokenSource loadCancellationSource = new CancellationTokenSource();
-
-        private JudgementResult lastJudgement;
-        private PerformanceCalculator performanceCalculator;
-        private ScoreInfo scoreInfo;
-
-        protected GameplayPerformancePointsCounter()
-        {
-            Current.Value = DisplayedCount = 0;
-        }
-
-        private Mod[] clonedMods;
-
-        [BackgroundDependencyLoader]
-        private void load(BeatmapDifficultyCache difficultyCache)
-        {
-            DrawableCount.Alpha = alpha_when_invalid;
-
-            if (gameplayState != null)
-            {
-                performanceCalculator = gameplayState.Ruleset.CreatePerformanceCalculator();
-                clonedMods = gameplayState.Mods.Select(m => m.DeepClone()).ToArray();
-
-                scoreInfo = new ScoreInfo(gameplayState.Score.ScoreInfo.BeatmapInfo, gameplayState.Score.ScoreInfo.Ruleset) { Mods = clonedMods };
-
-                var gameplayWorkingBeatmap = new GameplayWorkingBeatmap(gameplayState.Beatmap);
-                difficultyCache.GetTimedDifficultyAttributesAsync(gameplayWorkingBeatmap, gameplayState.Ruleset, clonedMods, loadCancellationSource.Token)
-                               .ContinueWith(task => Schedule(() =>
-                               {
-                                   timedAttributes = task.GetResultSafely();
-
-                                   IsValid = true;
-
-                                   if (lastJudgement != null)
-                                       onJudgementChanged(lastJudgement);
-                               }), TaskContinuationOptions.OnlyOnRanToCompletion);
-            }
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            if (scoreProcessor != null)
-            {
-                scoreProcessor.NewJudgement += onJudgementChanged;
-                scoreProcessor.JudgementReverted += onJudgementChanged;
-            }
-
-            if (gameplayState?.LastJudgementResult.Value != null)
-                onJudgementChanged(gameplayState.LastJudgementResult.Value);
-        }
-
-        private bool isValid;
-
-        protected bool IsValid
-        {
-            set
-            {
-                if (value == isValid)
-                    return;
-
-                isValid = value;
-                DrawableCount.FadeTo(isValid ? 1 : alpha_when_invalid, 1000, Easing.OutQuint);
-            }
-        }
-
-        private void onJudgementChanged(JudgementResult judgement)
-        {
-            lastJudgement = judgement;
-
-            var attrib = getAttributeAtTime(judgement);
-
-            if (gameplayState == null || attrib == null || scoreProcessor == null)
-            {
-                IsValid = false;
-                return;
-            }
-
-            scoreProcessor.PopulateScore(scoreInfo);
-            Current.Value = (int)Math.Round(performanceCalculator?.Calculate(scoreInfo, attrib).Total ?? 0, MidpointRounding.AwayFromZero);
-            IsValid = true;
-        }
-
-        [CanBeNull]
-        private DifficultyAttributes getAttributeAtTime(JudgementResult judgement)
-        {
-            if (timedAttributes == null || timedAttributes.Count == 0)
-                return null;
-
-            int attribIndex = timedAttributes.BinarySearch(new TimedDifficultyAttributes(judgement.HitObject.GetEndTime(), null));
-            if (attribIndex < 0)
-                attribIndex = ~attribIndex - 1;
-
-            return timedAttributes[Math.Clamp(attribIndex, 0, timedAttributes.Count - 1)].Attributes;
-        }
-
-        protected override LocalisableString FormatCount(int count) => count.ToString(@"D");
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (scoreProcessor != null)
-            {
-                scoreProcessor.NewJudgement -= onJudgementChanged;
-                scoreProcessor.JudgementReverted -= onJudgementChanged;
-            }
-
-            loadCancellationSource?.Cancel();
-        }
-
-        // TODO: This class shouldn't exist, but requires breaking changes to allow DifficultyCalculator to receive an IBeatmap.
-        private class GameplayWorkingBeatmap : WorkingBeatmap
-        {
-            private readonly IBeatmap gameplayBeatmap;
-
-            public GameplayWorkingBeatmap(IBeatmap gameplayBeatmap)
-                : base(gameplayBeatmap.BeatmapInfo, null)
-            {
-                this.gameplayBeatmap = gameplayBeatmap;
-            }
-
-            public override IBeatmap GetPlayableBeatmap(IRulesetInfo ruleset, IReadOnlyList<Mod> mods, CancellationToken cancellationToken)
-                => gameplayBeatmap;
-
-            protected override IBeatmap GetBeatmap() => gameplayBeatmap;
-
-            public override Texture GetBackground() => throw new NotImplementedException();
-
-            protected override Track GetBeatmapTrack() => throw new NotImplementedException();
-
-            protected internal override ISkin GetSkin() => throw new NotImplementedException();
-
-            public override Stream GetStream(string storagePath) => throw new NotImplementedException();
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs b/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
index 76feae88af..82f116b4ae 100644
--- a/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
+++ b/osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
@@ -1,31 +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;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    // todo: this should be renamed to DefaultPerformancePointsCounter, or probably even TrianglesPerformancePointsCounter once all other triangles components are renamed accordingly.
-    public partial class PerformancePointsCounter : GameplayPerformancePointsCounter, ISerialisableDrawable
+    public partial class PerformancePointsCounter : RollingCounter<int>, ISerialisableDrawable
     {
         public bool UsesFixedAnchor { get; set; }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        protected override bool IsRollingProportional => true;
+
+        protected override double RollingDuration => 1000;
+
+        private const float alpha_when_invalid = 0.3f;
+
+        [Resolved]
+        private ScoreProcessor scoreProcessor { get; set; }
+
+        [Resolved]
+        private GameplayState gameplayState { get; set; }
+
+        [CanBeNull]
+        private List<TimedDifficultyAttributes> timedAttributes;
+
+        private readonly CancellationTokenSource loadCancellationSource = new CancellationTokenSource();
+
+        private JudgementResult lastJudgement;
+        private PerformanceCalculator performanceCalculator;
+        private ScoreInfo scoreInfo;
+
+        public PerformancePointsCounter()
         {
-            Colour = colours.BlueLighter;
+            Current.Value = DisplayedCount = 0;
         }
 
-        protected override IHasText CreateText() => new TextComponent();
+        private Mod[] clonedMods;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
+        {
+            Colour = colours.BlueLighter;
+
+            if (gameplayState != null)
+            {
+                performanceCalculator = gameplayState.Ruleset.CreatePerformanceCalculator();
+                clonedMods = gameplayState.Mods.Select(m => m.DeepClone()).ToArray();
+
+                scoreInfo = new ScoreInfo(gameplayState.Score.ScoreInfo.BeatmapInfo, gameplayState.Score.ScoreInfo.Ruleset) { Mods = clonedMods };
+
+                var gameplayWorkingBeatmap = new GameplayWorkingBeatmap(gameplayState.Beatmap);
+                difficultyCache.GetTimedDifficultyAttributesAsync(gameplayWorkingBeatmap, gameplayState.Ruleset, clonedMods, loadCancellationSource.Token)
+                               .ContinueWith(task => Schedule(() =>
+                               {
+                                   timedAttributes = task.GetResultSafely();
+
+                                   IsValid = true;
+
+                                   if (lastJudgement != null)
+                                       onJudgementChanged(lastJudgement);
+                               }), TaskContinuationOptions.OnlyOnRanToCompletion);
+            }
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (scoreProcessor != null)
+            {
+                scoreProcessor.NewJudgement += onJudgementChanged;
+                scoreProcessor.JudgementReverted += onJudgementChanged;
+            }
+
+            if (gameplayState?.LastJudgementResult.Value != null)
+                onJudgementChanged(gameplayState.LastJudgementResult.Value);
+        }
+
+        private bool isValid;
+
+        protected bool IsValid
+        {
+            set
+            {
+                if (value == isValid)
+                    return;
+
+                isValid = value;
+                DrawableCount.FadeTo(isValid ? 1 : alpha_when_invalid, 1000, Easing.OutQuint);
+            }
+        }
+
+        private void onJudgementChanged(JudgementResult judgement)
+        {
+            lastJudgement = judgement;
+
+            var attrib = getAttributeAtTime(judgement);
+
+            if (gameplayState == null || attrib == null || scoreProcessor == null)
+            {
+                IsValid = false;
+                return;
+            }
+
+            scoreProcessor.PopulateScore(scoreInfo);
+            Current.Value = (int)Math.Round(performanceCalculator?.Calculate(scoreInfo, attrib).Total ?? 0, MidpointRounding.AwayFromZero);
+            IsValid = true;
+        }
+
+        [CanBeNull]
+        private DifficultyAttributes getAttributeAtTime(JudgementResult judgement)
+        {
+            if (timedAttributes == null || timedAttributes.Count == 0)
+                return null;
+
+            int attribIndex = timedAttributes.BinarySearch(new TimedDifficultyAttributes(judgement.HitObject.GetEndTime(), null));
+            if (attribIndex < 0)
+                attribIndex = ~attribIndex - 1;
+
+            return timedAttributes[Math.Clamp(attribIndex, 0, timedAttributes.Count - 1)].Attributes;
+        }
+
+        protected override LocalisableString FormatCount(int count) => count.ToString(@"D");
+
+        protected override IHasText CreateText() => new TextComponent
+        {
+            Alpha = alpha_when_invalid
+        };
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (scoreProcessor != null)
+            {
+                scoreProcessor.NewJudgement -= onJudgementChanged;
+                scoreProcessor.JudgementReverted -= onJudgementChanged;
+            }
+
+            loadCancellationSource?.Cancel();
+        }
 
         private partial class TextComponent : CompositeDrawable, IHasText
         {
@@ -65,5 +209,30 @@ namespace osu.Game.Screens.Play.HUD
                 };
             }
         }
+
+        // TODO: This class shouldn't exist, but requires breaking changes to allow DifficultyCalculator to receive an IBeatmap.
+        private class GameplayWorkingBeatmap : WorkingBeatmap
+        {
+            private readonly IBeatmap gameplayBeatmap;
+
+            public GameplayWorkingBeatmap(IBeatmap gameplayBeatmap)
+                : base(gameplayBeatmap.BeatmapInfo, null)
+            {
+                this.gameplayBeatmap = gameplayBeatmap;
+            }
+
+            public override IBeatmap GetPlayableBeatmap(IRulesetInfo ruleset, IReadOnlyList<Mod> mods, CancellationToken cancellationToken)
+                => gameplayBeatmap;
+
+            protected override IBeatmap GetBeatmap() => gameplayBeatmap;
+
+            public override Texture GetBackground() => throw new NotImplementedException();
+
+            protected override Track GetBeatmapTrack() => throw new NotImplementedException();
+
+            protected internal override ISkin GetSkin() => throw new NotImplementedException();
+
+            public override Stream GetStream(string storagePath) => throw new NotImplementedException();
+        }
     }
 }

From 6c3169a0ed6e9f0f9e1e7d668993e04861f63540 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 5 Nov 2023 01:56:45 +0300
Subject: [PATCH 1337/2296] Remove PP wedge and logic for gameplay layout

---
 osu.Game/Screens/Play/HUD/ArgonRightWedge.cs | 29 --------------------
 osu.Game/Skinning/ArgonSkin.cs               | 18 ------------
 2 files changed, 47 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/ArgonRightWedge.cs

diff --git a/osu.Game/Screens/Play/HUD/ArgonRightWedge.cs b/osu.Game/Screens/Play/HUD/ArgonRightWedge.cs
deleted file mode 100644
index 6d01fecf13..0000000000
--- a/osu.Game/Screens/Play/HUD/ArgonRightWedge.cs
+++ /dev/null
@@ -1,29 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public partial class ArgonRightWedge : CompositeDrawable, ISerialisableDrawable
-    {
-        public bool UsesFixedAnchor { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AutoSizeAxes = Axes.Both;
-
-            InternalChild = new ArgonWedgePiece
-            {
-                WedgeWidth = { Value = 274 },
-                WedgeHeight = { Value = 40 },
-                InvertShear = { Value = true },
-                EndOpacity = 0.5f,
-            };
-        }
-    }
-}
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index f850ae9cbd..3262812d24 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -120,8 +120,6 @@ namespace osu.Game.Skinning
                                 var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
                                 var comboWedge = container.OfType<ArgonComboWedge>().FirstOrDefault();
                                 var combo = container.OfType<ArgonComboCounter>().FirstOrDefault();
-                                var rightWedge = container.OfType<ArgonRightWedge>().FirstOrDefault();
-                                var ppCounter = container.OfType<ArgonPerformancePointsCounter>().FirstOrDefault();
                                 var songProgress = container.OfType<ArgonSongProgress>().FirstOrDefault();
                                 var keyCounter = container.OfType<ArgonKeyCounterDisplay>().FirstOrDefault();
 
@@ -162,20 +160,6 @@ namespace osu.Game.Skinning
                                         }
                                     }
 
-                                    if (rightWedge != null)
-                                    {
-                                        rightWedge.Anchor = Anchor.TopRight;
-                                        rightWedge.Origin = Anchor.TopRight;
-                                        rightWedge.Position = new Vector2(180, 20);
-
-                                        if (ppCounter != null)
-                                        {
-                                            ppCounter.Anchor = Anchor.TopRight;
-                                            ppCounter.Origin = Anchor.TopRight;
-                                            ppCounter.Position = new Vector2(rightWedge.X - 240, rightWedge.Y + 8);
-                                        }
-                                    }
-
                                     var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
 
                                     if (hitError != null)
@@ -222,8 +206,6 @@ namespace osu.Game.Skinning
                                     new ArgonAccuracyCounter(),
                                     new ArgonComboWedge(),
                                     new ArgonComboCounter(),
-                                    new ArgonRightWedge(),
-                                    new ArgonPerformancePointsCounter(),
                                     new BarHitErrorMeter(),
                                     new BarHitErrorMeter(),
                                     new ArgonSongProgress(),

From 77f5a4cdf53fca660a71140b84c9897439ddbf2e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 5 Nov 2023 02:01:26 +0300
Subject: [PATCH 1338/2296] Update skin deserialisation archive

---
 .../Archives/modified-argon-pro-20231026.osk     | Bin 2066 -> 0 bytes
 .../Archives/modified-argon-pro-20231105.osk     | Bin 0 -> 1899 bytes
 osu.Game.Tests/Skins/SkinDeserialisationTest.cs  |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 osu.Game.Tests/Resources/Archives/modified-argon-pro-20231026.osk
 create mode 100644 osu.Game.Tests/Resources/Archives/modified-argon-pro-20231105.osk

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231026.osk b/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231026.osk
deleted file mode 100644
index e349c14d7403a13b92ae0b5fed2ee449273a199b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2066
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
T(MS;c4*&qMuL_%9_ZRP9@fu;D

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231105.osk b/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231105.osk
new file mode 100644
index 0000000000000000000000000000000000000000..16f89502eff0bc46df9922fec370ee1d804170f6
GIT binary patch
literal 1899
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
Irw--;0N9HQNB{r;

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index b66a5b7862..21a6e10d26 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -55,8 +55,8 @@ namespace osu.Game.Tests.Skins
             "Archives/modified-argon-pro-20230618.osk",
             // Covers "Argon" health display
             "Archives/modified-argon-pro-20231001.osk",
-            // Covers "Argon" score/combo/accuracy/pp counters, and wedges
-            "Archives/modified-argon-pro-20231026.osk"
+            // Covers "Argon" accuracy/score/combo counters, and wedges
+            "Archives/modified-argon-pro-20231105.osk",
         };
 
         /// <summary>

From 634795e45f12676c277be583bad61c29cc3ec22a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 5 Nov 2023 02:50:14 +0300
Subject: [PATCH 1339/2296] Adjust failing test scenes

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 4e5db5d46e..ec7d92faac 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("Begin drag top left", () =>
             {
-                InputManager.MoveMouseTo(box1.ScreenSpaceDrawQuad.TopLeft - new Vector2(box1.ScreenSpaceDrawQuad.Width / 4));
+                InputManager.MoveMouseTo(box1.ScreenSpaceDrawQuad.TopLeft - new Vector2(box1.ScreenSpaceDrawQuad.Width / 4, box1.ScreenSpaceDrawQuad.Height / 8));
                 InputManager.PressButton(MouseButton.Left);
             });
 
@@ -146,8 +146,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 AddStep("Add big black box", () =>
                 {
-                    InputManager.MoveMouseTo(skinEditor.ChildrenOfType<BigBlackBox>().First());
-                    InputManager.Click(MouseButton.Left);
+                    skinEditor.ChildrenOfType<SkinComponentToolbox.ToolboxComponentButton>().First(b => b.ChildrenOfType<BigBlackBox>().FirstOrDefault() != null).TriggerClick();
                 });
 
                 AddStep("store box", () =>

From 48a75f6152705c5377b116f0dc2b6cf598036bb3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 5 Nov 2023 06:28:10 +0300
Subject: [PATCH 1340/2296] Fix resume cursor following gameplay cursor scale
 setting

---
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index 555610a3b6..bcfefe856d 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -5,7 +5,6 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -14,7 +13,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -25,7 +23,6 @@ namespace osu.Game.Rulesets.Osu.UI
         private OsuClickToResumeCursor clickToResumeCursor;
 
         private OsuCursorContainer localCursorContainer;
-        private IBindable<float> localCursorScale;
 
         public override CursorContainer LocalCursor => State.Value == Visibility.Visible ? localCursorContainer : null;
 
@@ -49,13 +46,7 @@ namespace osu.Game.Rulesets.Osu.UI
             clickToResumeCursor.Appear();
 
             if (localCursorContainer == null)
-            {
                 Add(localCursorContainer = new OsuCursorContainer());
-
-                localCursorScale = new BindableFloat();
-                localCursorScale.BindTo(localCursorContainer.CursorScale);
-                localCursorScale.BindValueChanged(scale => cursorScaleContainer.Scale = new Vector2(scale.NewValue), true);
-            }
         }
 
         protected override void PopOut()

From 99405a2bbd38e999672d0fe89c83e56b845a0bdf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 5 Nov 2023 06:28:34 +0300
Subject: [PATCH 1341/2296] Tidy up resume overlay test scene

---
 .../TestSceneResumeOverlay.cs                 | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
index 0bb27cff0f..81dc64cda9 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -12,14 +13,15 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public partial class TestSceneResumeOverlay : OsuManualInputManagerTestScene
     {
-        public TestSceneResumeOverlay()
+        private ManualOsuInputManager osuInputManager = null!;
+        private CursorContainer cursor = null!;
+        private ResumeOverlay resume = null!;
+
+        private bool resumeFired;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
-            ManualOsuInputManager osuInputManager;
-            CursorContainer cursor;
-            ResumeOverlay resume;
-
-            bool resumeFired = false;
-
             Child = osuInputManager = new ManualOsuInputManager(new OsuRuleset().RulesetInfo)
             {
                 Children = new Drawable[]
@@ -32,8 +34,13 @@ namespace osu.Game.Rulesets.Osu.Tests
                 }
             };
 
+            resumeFired = false;
             resume.ResumeAction = () => resumeFired = true;
+        });
 
+        [Test]
+        public void TestResume()
+        {
             AddStep("move mouse to center", () => InputManager.MoveMouseTo(ScreenSpaceDrawQuad.Centre));
             AddStep("show", () => resume.Show());
 

From 9cb331641c39b9a1b54b192be3420e0db8b7ba68 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 5 Nov 2023 06:34:09 +0300
Subject: [PATCH 1342/2296] Rename container

---
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index bcfefe856d..12506c83b9 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.UI
 {
     public partial class OsuResumeOverlay : ResumeOverlay
     {
-        private Container cursorScaleContainer;
+        private Container resumeCursorContainer;
         private OsuClickToResumeCursor clickToResumeCursor;
 
         private OsuCursorContainer localCursorContainer;
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Add(cursorScaleContainer = new Container
+            Add(resumeCursorContainer = new Container
             {
                 Child = clickToResumeCursor = new OsuClickToResumeCursor { ResumeRequested = Resume }
             });
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.UI
             base.PopIn();
 
             GameplayCursor.ActiveCursor.Hide();
-            cursorScaleContainer.Position = ToLocalSpace(GameplayCursor.ActiveCursor.ScreenSpaceDrawQuad.Centre);
+            resumeCursorContainer.Position = ToLocalSpace(GameplayCursor.ActiveCursor.ScreenSpaceDrawQuad.Centre);
             clickToResumeCursor.Appear();
 
             if (localCursorContainer == null)

From 86fb33cb90b500dba57b2c199b381e7e8473b558 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Sun, 5 Nov 2023 12:40:06 +0100
Subject: [PATCH 1343/2296] Add disable taps checkbox to touch input settings

---
 osu.Android/OsuGameAndroid.cs                 |  4 +++
 osu.Game/Configuration/OsuConfigManager.cs    |  4 +++
 osu.Game/Localisation/TouchSettingsStrings.cs | 24 ++++++++++++++
 .../Settings/Sections/Input/TouchSettings.cs  | 32 ++++++++++++-------
 4 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game/Localisation/TouchSettingsStrings.cs

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index dea70e6b27..e4b934a387 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -11,6 +11,7 @@ using osu.Framework.Input.Handlers;
 using osu.Framework.Platform;
 using osu.Game;
 using osu.Game.Overlays.Settings;
+using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Updater;
 using osu.Game.Utils;
 
@@ -97,6 +98,9 @@ namespace osu.Android
                 case AndroidJoystickHandler jh:
                     return new AndroidJoystickSettings(jh);
 
+                case AndroidTouchHandler:
+                    return new TouchSettings(handler);
+
                 default:
                     return base.CreateSettingsSubsectionFor(handler);
             }
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 5d2d782063..339817985e 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -330,6 +330,10 @@ namespace osu.Game.Configuration
 
         ShowHealthDisplayWhenCantFail,
         FadePlayfieldWhenHealthLow,
+
+        /// <summary>
+        /// Disables mouse buttons clicks and touchscreen taps during gameplay.
+        /// </summary>
         MouseDisableButtons,
         MouseDisableWheel,
         ConfineMouseMode,
diff --git a/osu.Game/Localisation/TouchSettingsStrings.cs b/osu.Game/Localisation/TouchSettingsStrings.cs
new file mode 100644
index 0000000000..785b333100
--- /dev/null
+++ b/osu.Game/Localisation/TouchSettingsStrings.cs
@@ -0,0 +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.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public static class TouchSettingsStrings
+    {
+        private const string prefix = @"osu.Game.Resources.Localisation.TouchSettings";
+
+        /// <summary>
+        /// "Touch"
+        /// </summary>
+        public static LocalisableString Touch => new TranslatableString(getKey(@"touch"), @"Touch");
+
+        /// <summary>
+        /// "Disable taps during gameplay"
+        /// </summary>
+        public static LocalisableString DisableTapsDuringGameplay => new TranslatableString(getKey(@"disable_taps_during_gameplay"), @"Disable taps during gameplay");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
index 8d1b12d5b2..b1b1b59429 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
@@ -3,38 +3,48 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Input.Handlers.Touch;
+using osu.Framework.Input.Handlers;
 using osu.Framework.Localisation;
+using osu.Game.Configuration;
 using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
+    /// <summary>
+    /// Touch input settings subsection common to all touch handlers (even on different platforms).
+    /// </summary>
     public partial class TouchSettings : SettingsSubsection
     {
-        private readonly TouchHandler handler;
+        private readonly InputHandler handler;
 
-        public TouchSettings(TouchHandler handler)
+        protected override LocalisableString Header => TouchSettingsStrings.Touch;
+
+        public TouchSettings(InputHandler handler)
         {
             this.handler = handler;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuConfigManager osuConfig)
         {
-            Children = new Drawable[]
+            if (!RuntimeInfo.IsMobile) // don't allow disabling the only input method (touch) on mobile.
             {
-                new SettingsCheckbox
+                Add(new SettingsCheckbox
                 {
                     LabelText = CommonStrings.Enabled,
                     Current = handler.Enabled
-                },
-            };
+                });
+            }
+
+            Add(new SettingsCheckbox
+            {
+                LabelText = TouchSettingsStrings.DisableTapsDuringGameplay,
+                Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
+            });
         }
 
         public override IEnumerable<LocalisableString> FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { @"touchscreen" });
-
-        protected override LocalisableString Header => handler.Description;
     }
 }

From fa1d1df594d3f5307e01207952c4eb6be7ee3494 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Sun, 5 Nov 2023 12:43:14 +0100
Subject: [PATCH 1344/2296] Rename mouse button string to `Disable clicks
 during gameplay`

---
 osu.Android/AndroidMouseSettings.cs                        | 2 +-
 osu.Game/Localisation/MouseSettingsStrings.cs              | 6 +++---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 2 +-
 osu.Game/Screens/Play/PlayerSettings/InputSettings.cs      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Android/AndroidMouseSettings.cs b/osu.Android/AndroidMouseSettings.cs
index d6d7750448..fd01b11164 100644
--- a/osu.Android/AndroidMouseSettings.cs
+++ b/osu.Android/AndroidMouseSettings.cs
@@ -70,7 +70,7 @@ namespace osu.Android
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = MouseSettingsStrings.DisableMouseButtons,
+                    LabelText = MouseSettingsStrings.DisableClicksDuringGameplay,
                     Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons),
                 },
             });
diff --git a/osu.Game/Localisation/MouseSettingsStrings.cs b/osu.Game/Localisation/MouseSettingsStrings.cs
index 1772f03b29..e61af07364 100644
--- a/osu.Game/Localisation/MouseSettingsStrings.cs
+++ b/osu.Game/Localisation/MouseSettingsStrings.cs
@@ -40,14 +40,14 @@ namespace osu.Game.Localisation
         public static LocalisableString DisableMouseWheelVolumeAdjust => new TranslatableString(getKey(@"disable_mouse_wheel_volume_adjust"), @"Disable mouse wheel adjusting volume during gameplay");
 
         /// <summary>
-        /// "Volume can still be adjusted using the mouse wheel by holding "Alt""
+        /// "Volume can still be adjusted using the mouse wheel by holding &quot;Alt&quot;"
         /// </summary>
         public static LocalisableString DisableMouseWheelVolumeAdjustTooltip => new TranslatableString(getKey(@"disable_mouse_wheel_volume_adjust_tooltip"), @"Volume can still be adjusted using the mouse wheel by holding ""Alt""");
 
         /// <summary>
-        /// "Disable mouse buttons during gameplay"
+        /// "Disable clicks during gameplay"
         /// </summary>
-        public static LocalisableString DisableMouseButtons => new TranslatableString(getKey(@"disable_mouse_buttons"), @"Disable mouse buttons during gameplay");
+        public static LocalisableString DisableClicksDuringGameplay => new TranslatableString(getKey(@"disable_clicks"), @"Disable clicks during gameplay");
 
         /// <summary>
         /// "Enable high precision mouse to adjust sensitivity"
diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index dfaeafbf5d..6bf06f4f98 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = MouseSettingsStrings.DisableMouseButtons,
+                    LabelText = MouseSettingsStrings.DisableClicksDuringGameplay,
                     Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
                 },
             };
diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
index cf261ba49b..4076782ee1 100644
--- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
             {
                 mouseButtonsCheckbox = new PlayerCheckbox
                 {
-                    LabelText = MouseSettingsStrings.DisableMouseButtons
+                    LabelText = MouseSettingsStrings.DisableClicksDuringGameplay
                 }
             };
         }

From 0d8bfedf5d3693809e76471b9feb47ebf140e40b Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Sun, 5 Nov 2023 12:44:22 +0100
Subject: [PATCH 1345/2296] Rename popup/binding string to `Toggle gameplay
 clicks/taps`

---
 osu.Game/Configuration/OsuConfigManager.cs             | 2 +-
 osu.Game/Input/Bindings/GlobalActionContainer.cs       | 2 +-
 osu.Game/Localisation/GlobalActionKeyBindingStrings.cs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 339817985e..e3f950ce2c 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -246,7 +246,7 @@ namespace osu.Game.Configuration
                 ),
                 new TrackedSetting<bool>(OsuSetting.MouseDisableButtons, disabledState => new SettingDescription(
                     rawValue: !disabledState,
-                    name: GlobalActionKeyBindingStrings.ToggleGameplayMouseButtons,
+                    name: GlobalActionKeyBindingStrings.ToggleGameplayClicksTaps,
                     value: disabledState ? CommonStrings.Disabled.ToLower() : CommonStrings.Enabled.ToLower(),
                     shortcut: LookupKeyBindings(GlobalAction.ToggleGameplayMouseButtons))
                 ),
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 947cd5f54f..b8163cc3b1 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.TakeScreenshot))]
         TakeScreenshot,
 
-        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleGameplayMouseButtons))]
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleGameplayClicksTaps))]
         ToggleGameplayMouseButtons,
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.Back))]
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index 8356c480dd..1bbbbdc3bc 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -70,9 +70,9 @@ namespace osu.Game.Localisation
         public static LocalisableString TakeScreenshot => new TranslatableString(getKey(@"take_screenshot"), @"Take screenshot");
 
         /// <summary>
-        /// "Toggle gameplay mouse buttons"
+        /// "Toggle gameplay clicks/taps"
         /// </summary>
-        public static LocalisableString ToggleGameplayMouseButtons => new TranslatableString(getKey(@"toggle_gameplay_mouse_buttons"), @"Toggle gameplay mouse buttons");
+        public static LocalisableString ToggleGameplayClicksTaps => new TranslatableString(getKey(@"toggle_gameplay_clicks_taps"), @"Toggle gameplay clicks/taps");
 
         /// <summary>
         /// "Back"

From 9947897c5f83c7298c381015a95673902486b52d Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Sun, 5 Nov 2023 12:53:40 +0100
Subject: [PATCH 1346/2296] Use appropriate clicks/taps text in player loader
 input settings

---
 osu.Game/Screens/Play/PlayerSettings/InputSettings.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
index 4076782ee1..f6b0cddcf1 100644
--- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.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 osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
@@ -19,7 +20,8 @@ namespace osu.Game.Screens.Play.PlayerSettings
             {
                 mouseButtonsCheckbox = new PlayerCheckbox
                 {
-                    LabelText = MouseSettingsStrings.DisableClicksDuringGameplay
+                    // TODO: change to touchscreen detection once https://github.com/ppy/osu/pull/25348 makes it in
+                    LabelText = RuntimeInfo.IsDesktop ? MouseSettingsStrings.DisableClicksDuringGameplay : TouchSettingsStrings.DisableTapsDuringGameplay
                 }
             };
         }

From 277cf7dc127cfacaf62f51bc88e0a0a3c1474382 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sun, 5 Nov 2023 18:26:51 +0100
Subject: [PATCH 1347/2296] Ensure every SelectedItem is alive and has
 Blueprint

---
 .../Components/EditorBlueprintContainer.cs        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index ad0e8b124b..60959ca27a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -51,6 +52,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             Beatmap.HitObjectAdded += AddBlueprintFor;
             Beatmap.HitObjectRemoved += RemoveBlueprintFor;
 
+            // This makes sure HitObjects will have active Blueprints ready to display
+            // after clicking on an Editor Timestamp/Link
+            Beatmap.SelectedHitObjects.CollectionChanged += SetHitObjectsAlive;
+
             if (Composer != null)
             {
                 foreach (var obj in Composer.HitObjects)
@@ -144,6 +149,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
             SelectedItems.AddRange(Beatmap.HitObjects.Except(SelectedItems).ToArray());
         }
 
+        protected void SetHitObjectsAlive(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e == null || e.Action != NotifyCollectionChangedAction.Add || e.NewItems == null)
+                return;
+
+            foreach (HitObject item in e.NewItems)
+                Composer.Playfield.SetKeepAlive(item, true);
+        }
+
         protected override void OnBlueprintSelected(SelectionBlueprint<HitObject> blueprint)
         {
             base.OnBlueprintSelected(blueprint);
@@ -166,6 +180,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 Beatmap.HitObjectAdded -= AddBlueprintFor;
                 Beatmap.HitObjectRemoved -= RemoveBlueprintFor;
+                Beatmap.SelectedHitObjects.CollectionChanged -= SetHitObjectsAlive;
             }
 
             usageEventBuffer?.Dispose();

From e2b07628fb5719540ea3d1405de25a83b469b8da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 15:24:12 +0900
Subject: [PATCH 1348/2296] Add player name skin component

3 minute implementation.

Addresses https://github.com/ppy/osu/discussions/25340.
---
 osu.Game/Skinning/Components/PlayerName.cs | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 osu.Game/Skinning/Components/PlayerName.cs

diff --git a/osu.Game/Skinning/Components/PlayerName.cs b/osu.Game/Skinning/Components/PlayerName.cs
new file mode 100644
index 0000000000..34ace53d47
--- /dev/null
+++ b/osu.Game/Skinning/Components/PlayerName.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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Skinning.Components
+{
+    [UsedImplicitly]
+    public partial class PlayerName : FontAdjustableSkinComponent
+    {
+        private readonly OsuSpriteText text;
+
+        public PlayerName()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                text = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(GameplayState gameplayState)
+        {
+            text.Text = gameplayState.Score.ScoreInfo.User.Username;
+        }
+
+        protected override void SetFont(FontUsage font) => text.Font = font.With(size: 40);
+    }
+}

From 11bd801795f5a838cfc478e486586476fed2eb30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 07:44:25 +0100
Subject: [PATCH 1349/2296] Use more intelligent default for `TouchInputActive`

---
 osu.Game/Configuration/SessionStatics.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 0fc2076a7e..8f0a60b23d 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using osu.Framework;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Online.API.Requests.Responses;
@@ -25,7 +26,7 @@ namespace osu.Game.Configuration
             SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
             SetDefault(Static.LastModSelectPanelSamplePlaybackTime, (double?)null);
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
-            SetDefault(Static.TouchInputActive, false);
+            SetDefault(Static.TouchInputActive, RuntimeInfo.IsMobile);
         }
 
         /// <summary>

From 3c72c5bccd21b4127ceaae9346ec04e6b059db9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 07:48:09 +0100
Subject: [PATCH 1350/2296] Steer touch input flag via bindable rather than
 config manager

---
 osu.Game/Input/TouchInputInterceptor.cs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Input/TouchInputInterceptor.cs b/osu.Game/Input/TouchInputInterceptor.cs
index 4e6177c70c..b566113a2a 100644
--- a/osu.Game/Input/TouchInputInterceptor.cs
+++ b/osu.Game/Input/TouchInputInterceptor.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
@@ -22,12 +23,17 @@ namespace osu.Game.Input
     {
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
-        [Resolved]
-        private SessionStatics statics { get; set; } = null!;
+        private readonly BindableBool touchInputActive = new BindableBool();
+
+        [BackgroundDependencyLoader]
+        private void load(SessionStatics statics)
+        {
+            statics.BindWith(Static.TouchInputActive, touchInputActive);
+        }
 
         protected override bool Handle(UIEvent e)
         {
-            bool touchInputWasActive = statics.Get<bool>(Static.TouchInputActive);
+            bool touchInputWasActive = touchInputActive.Value;
 
             switch (e)
             {
@@ -36,7 +42,7 @@ namespace osu.Game.Input
                     {
                         if (touchInputWasActive)
                             Logger.Log($@"Touch input deactivated due to received {e.GetType().ReadableName()}", LoggingTarget.Input);
-                        statics.SetValue(Static.TouchInputActive, false);
+                        touchInputActive.Value = false;
                     }
 
                     break;
@@ -44,7 +50,7 @@ namespace osu.Game.Input
                 case TouchEvent:
                     if (!touchInputWasActive)
                         Logger.Log($@"Touch input activated due to received {e.GetType().ReadableName()}", LoggingTarget.Input);
-                    statics.SetValue(Static.TouchInputActive, true);
+                    touchInputActive.Value = true;
                     break;
 
                 case KeyDownEvent keyDown:
@@ -59,10 +65,8 @@ namespace osu.Game.Input
         [Conditional("TOUCH_INPUT_DEBUG")]
         private void debugToggleTouchInputActive()
         {
-            bool oldValue = statics.Get<bool>(Static.TouchInputActive);
-            bool newValue = !oldValue;
-            Logger.Log($@"Debug-toggling touch input to {(newValue ? @"active" : @"inactive")}", LoggingTarget.Input, LogLevel.Debug);
-            statics.SetValue(Static.TouchInputActive, newValue);
+            Logger.Log($@"Debug-toggling touch input to {(touchInputActive.Value ? @"inactive" : @"active")}", LoggingTarget.Input, LogLevel.Debug);
+            touchInputActive.Toggle();
         }
     }
 }

From adb9ca5a13cb920c6554457392a9f715b85038ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 07:56:09 +0100
Subject: [PATCH 1351/2296] Add failing test coverage for incorrect treatment
 of TD in mod presets

---
 .../UserInterface/TestSceneModPresetColumn.cs       | 13 +++++++++++--
 .../Visual/UserInterface/TestSceneModPresetPanel.cs |  8 ++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 1779b240cc..b7c1428397 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
-        public void TestAddingFlow()
+        public void TestAddingFlow([Values] bool withSystemModActive)
         {
             ModPresetColumn modPresetColumn = null!;
 
@@ -181,7 +181,13 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("items loaded", () => modPresetColumn.IsLoaded && modPresetColumn.ItemsLoaded);
             AddAssert("add preset button disabled", () => !this.ChildrenOfType<AddPresetButton>().Single().Enabled.Value);
 
-            AddStep("set mods", () => SelectedMods.Value = new Mod[] { new OsuModDaycore(), new OsuModClassic() });
+            AddStep("set mods", () =>
+            {
+                var newMods = new Mod[] { new OsuModDaycore(), new OsuModClassic() };
+                if (withSystemModActive)
+                    newMods = newMods.Append(new OsuModTouchDevice()).ToArray();
+                SelectedMods.Value = newMods;
+            });
             AddAssert("add preset button enabled", () => this.ChildrenOfType<AddPresetButton>().Single().Enabled.Value);
 
             AddStep("click add preset button", () =>
@@ -209,6 +215,9 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
             AddUntilStep("popover closed", () => !this.ChildrenOfType<OsuPopover>().Any());
             AddUntilStep("preset creation occurred", () => this.ChildrenOfType<ModPresetPanel>().Count() == 4);
+            AddAssert("preset has correct mods",
+                () => this.ChildrenOfType<ModPresetPanel>().Single(panel => panel.Preset.Value.Name == "new preset").Preset.Value.Mods,
+                () => Has.Count.EqualTo(2));
 
             AddStep("click add preset button", () =>
             {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
index 35e352534b..c79cbd3691 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetPanel.cs
@@ -86,6 +86,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("set mods to HD+HR+DT", () => SelectedMods.Value = new Mod[] { new OsuModHidden(), new OsuModHardRock(), new OsuModDoubleTime() });
             AddAssert("panel is not active", () => !panel.AsNonNull().Active.Value);
+
+            // system mods are not included in presets.
+            AddStep("set mods to HR+DT+TD", () => SelectedMods.Value = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime(), new OsuModTouchDevice() });
+            AddAssert("panel is active", () => panel.AsNonNull().Active.Value);
         }
 
         [Test]
@@ -113,6 +117,10 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("set customised mod", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = 1.25 } } });
             AddStep("activate panel", () => panel.AsNonNull().TriggerClick());
             assertSelectedModsEquivalentTo(new Mod[] { new OsuModHardRock(), new OsuModDoubleTime { SpeedChange = { Value = 1.5 } } });
+
+            AddStep("set system mod", () => SelectedMods.Value = new[] { new OsuModTouchDevice() });
+            AddStep("activate panel", () => panel.AsNonNull().TriggerClick());
+            assertSelectedModsEquivalentTo(new Mod[] { new OsuModTouchDevice(), new OsuModHardRock(), new OsuModDoubleTime { SpeedChange = { Value = 1.5 } } });
         }
 
         private void assertSelectedModsEquivalentTo(IEnumerable<Mod> mods)

From 7ba07ab5305dc0be39bddc06967d826e36bfeea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 08:05:42 +0100
Subject: [PATCH 1352/2296] Add protections against handling system mods in mod
 presets

---
 osu.Game/Overlays/Mods/AddPresetPopover.cs  |  2 +-
 osu.Game/Overlays/Mods/EditPresetPopover.cs |  4 ++--
 osu.Game/Overlays/Mods/ModPresetPanel.cs    | 14 +++++---------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Mods/AddPresetPopover.cs b/osu.Game/Overlays/Mods/AddPresetPopover.cs
index 638592a9b5..b782b5d6ba 100644
--- a/osu.Game/Overlays/Mods/AddPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/AddPresetPopover.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Overlays.Mods
             {
                 Name = nameTextBox.Current.Value,
                 Description = descriptionTextBox.Current.Value,
-                Mods = selectedMods.Value.ToArray(),
+                Mods = selectedMods.Value.Where(mod => mod.Type != ModType.System).ToArray(),
                 Ruleset = r.Find<RulesetInfo>(ruleset.Value.ShortName)!
             }));
 
diff --git a/osu.Game/Overlays/Mods/EditPresetPopover.cs b/osu.Game/Overlays/Mods/EditPresetPopover.cs
index 571021b0f8..8bce57c96a 100644
--- a/osu.Game/Overlays/Mods/EditPresetPopover.cs
+++ b/osu.Game/Overlays/Mods/EditPresetPopover.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Overlays.Mods
 
         private void useCurrentMods()
         {
-            saveableMods = selectedMods.Value.ToHashSet();
+            saveableMods = selectedMods.Value.Where(mod => mod.Type != ModType.System).ToHashSet();
             updateState();
         }
 
@@ -168,7 +168,7 @@ namespace osu.Game.Overlays.Mods
             if (!selectedMods.Value.Any())
                 return false;
 
-            return !saveableMods.SetEquals(selectedMods.Value);
+            return !saveableMods.SetEquals(selectedMods.Value.Where(mod => mod.Type != ModType.System));
         }
 
         private void save()
diff --git a/osu.Game/Overlays/Mods/ModPresetPanel.cs b/osu.Game/Overlays/Mods/ModPresetPanel.cs
index 00f6e36972..3982abeba7 100644
--- a/osu.Game/Overlays/Mods/ModPresetPanel.cs
+++ b/osu.Game/Overlays/Mods/ModPresetPanel.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.Allocation;
@@ -56,17 +55,14 @@ namespace osu.Game.Overlays.Mods
 
         protected override void Select()
         {
-            // if the preset is not active at the point of the user click, then set the mods using the preset directly, discarding any previous selections,
-            // which will also have the side effect of activating the preset (see `updateActiveState()`).
-            selectedMods.Value = Preset.Value.Mods.ToArray();
+            var selectedSystemMods = selectedMods.Value.Where(mod => mod.Type == ModType.System);
+            // will also have the side effect of activating the preset (see `updateActiveState()`).
+            selectedMods.Value = Preset.Value.Mods.Concat(selectedSystemMods).ToArray();
         }
 
         protected override void Deselect()
         {
-            // if the preset is active when the user has clicked it, then it means that the set of active mods is exactly equal to the set of mods in the preset
-            // (there are no other active mods than what the preset specifies, and the mod settings match exactly).
-            // therefore it's safe to just clear selected mods, since it will have the effect of toggling the preset off.
-            selectedMods.Value = Array.Empty<Mod>();
+            selectedMods.Value = selectedMods.Value.Except(Preset.Value.Mods).ToArray();
         }
 
         private void selectedModsChanged()
@@ -79,7 +75,7 @@ namespace osu.Game.Overlays.Mods
 
         private void updateActiveState()
         {
-            Active.Value = new HashSet<Mod>(Preset.Value.Mods).SetEquals(selectedMods.Value);
+            Active.Value = new HashSet<Mod>(Preset.Value.Mods).SetEquals(selectedMods.Value.Where(mod => mod.Type != ModType.System));
         }
 
         #region Filtering support

From 40d081ee2de0940600f94ff126259b019622483b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 16:05:50 +0900
Subject: [PATCH 1353/2296] Add note about `Width` requirement in
 `UserGridPanel`

---
 osu.Game/Users/UserGridPanel.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Users/UserGridPanel.cs b/osu.Game/Users/UserGridPanel.cs
index f4ec1475b1..aac2315b2f 100644
--- a/osu.Game/Users/UserGridPanel.cs
+++ b/osu.Game/Users/UserGridPanel.cs
@@ -10,6 +10,10 @@ using osuTK;
 
 namespace osu.Game.Users
 {
+    /// <summary>
+    /// A user "card", commonly used in a grid layout or in popovers.
+    /// Comes with a preset height, but width must be specified.
+    /// </summary>
     public partial class UserGridPanel : ExtendedUserPanel
     {
         private const int margin = 10;

From 1f0b914251bc61d82bf9e3db207e75399a600806 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 16:18:33 +0900
Subject: [PATCH 1354/2296] Add skin editor dropdown items to reset rotation
 and scale

---
 .../Overlays/SkinEditor/SkinSelectionHandler.cs    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index c4e2c4c6bd..df73b15101 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -198,12 +198,26 @@ namespace osu.Game.Overlays.SkinEditor
                 Items = createAnchorItems((d, o) => ((Drawable)d).Origin == o, applyOrigins).ToArray()
             };
 
+            yield return new EditorMenuItemSpacer();
+
             yield return new OsuMenuItem("Reset position", MenuItemType.Standard, () =>
             {
                 foreach (var blueprint in SelectedBlueprints)
                     ((Drawable)blueprint.Item).Position = Vector2.Zero;
             });
 
+            yield return new OsuMenuItem("Reset rotation", MenuItemType.Standard, () =>
+            {
+                foreach (var blueprint in SelectedBlueprints)
+                    ((Drawable)blueprint.Item).Rotation = 0;
+            });
+
+            yield return new OsuMenuItem("Reset scale", MenuItemType.Standard, () =>
+            {
+                foreach (var blueprint in SelectedBlueprints)
+                    ((Drawable)blueprint.Item).Scale = Vector2.One;
+            });
+
             yield return new EditorMenuItemSpacer();
 
             yield return new OsuMenuItem("Bring to front", MenuItemType.Standard, () => skinEditor.BringSelectionToFront());

From 0915ac8891f1a5036a325d95b870d29c0daeb733 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 16:32:12 +0900
Subject: [PATCH 1355/2296] Use left aligned text for non-rotate key counter

---
 osu.Game/Screens/Play/ArgonKeyCounter.cs | 28 +++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/ArgonKeyCounter.cs b/osu.Game/Screens/Play/ArgonKeyCounter.cs
index bb5fe0daf2..874fcde329 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounter.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounter.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,6 +19,8 @@ namespace osu.Game.Screens.Play
         private OsuSpriteText keyNameText = null!;
         private OsuSpriteText countText = null!;
 
+        private UprightAspectMaintainingContainer uprightContainer = null!;
+
         // These values were taken from Figma
         private const float line_height = 3;
         private const float name_font_size = 10;
@@ -53,7 +56,7 @@ namespace osu.Game.Screens.Play
                     Padding = new MarginPadding { Top = line_height * scale_factor + indicator_press_offset },
                     Children = new Drawable[]
                     {
-                        new UprightAspectMaintainingContainer
+                        uprightContainer = new UprightAspectMaintainingContainer
                         {
                             RelativeSizeAxes = Axes.Both,
                             Anchor = Anchor.Centre,
@@ -62,16 +65,16 @@ namespace osu.Game.Screens.Play
                             {
                                 keyNameText = new OsuSpriteText
                                 {
-                                    Anchor = Anchor.TopCentre,
-                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopLeft,
+                                    Origin = Anchor.TopLeft,
                                     Font = OsuFont.Torus.With(size: name_font_size * scale_factor, weight: FontWeight.Bold),
                                     Colour = colours.Blue0,
                                     Text = Trigger.Name
                                 },
                                 countText = new OsuSpriteText
                                 {
-                                    Anchor = Anchor.BottomCentre,
-                                    Origin = Anchor.BottomCentre,
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
                                     Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold),
                                 },
                             }
@@ -93,6 +96,21 @@ namespace osu.Game.Screens.Play
             CountPresses.BindValueChanged(e => countText.Text = e.NewValue.ToString(@"#,0"), true);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            const float allowance = 6;
+            float absRotation = Math.Abs(uprightContainer.Rotation) % 180;
+            bool isRotated = absRotation > allowance && absRotation < (180 - allowance);
+
+            keyNameText.Anchor =
+                keyNameText.Origin = isRotated ? Anchor.TopCentre : Anchor.TopLeft;
+
+            countText.Anchor =
+                countText.Origin = isRotated ? Anchor.BottomCentre : Anchor.BottomLeft;
+        }
+
         protected override void Activate(bool forwardPlayback = true)
         {
             base.Activate(forwardPlayback);

From b45d8c785cd662796c6098f72aadf589b99161e4 Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Mon, 6 Nov 2023 08:38:34 +0100
Subject: [PATCH 1356/2296] fixed review findings

---
 .../Online/TestSceneUserClickableAvatar.cs    | 26 +++++++++++++++++++
 osu.Game/Users/Drawables/ClickableAvatar.cs   | 21 +++++++++++++++
 osu.Game/Users/Drawables/UpdateableAvatar.cs  |  1 +
 3 files changed, 48 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
index 13f559ac09..a24581f7ed 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
@@ -78,6 +78,8 @@ namespace osu.Game.Tests.Visual.Online
                             Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
                         },
                     },
+                    new ClickableAvatar(),
+                    new ClickableAvatar(),
                 },
             };
         });
@@ -120,6 +122,30 @@ namespace osu.Game.Tests.Visual.Online
             AddWaitStep("wait for tooltip to show", 5);
             AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
             AddWaitStep("wait for tooltip to hide", 3);
+
+            AddStep($"click null user {4}. {nameof(ClickableAvatar)}", () =>
+            {
+                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+                if (targets.Count < 4)
+                    return;
+
+                InputManager.MoveMouseTo(targets[3]);
+            });
+            AddWaitStep("wait for tooltip to show", 5);
+            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddWaitStep("wait for tooltip to hide", 3);
+
+            AddStep($"click null user {5}. {nameof(ClickableAvatar)}", () =>
+            {
+                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+                if (targets.Count < 5)
+                    return;
+
+                InputManager.MoveMouseTo(targets[4]);
+            });
+            AddWaitStep("wait for tooltip to show", 5);
+            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddWaitStep("wait for tooltip to hide", 3);
         }
     }
 }
diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index d6c6afba0b..0ed9f56cc7 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -1,12 +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;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
+using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
@@ -21,6 +24,24 @@ namespace osu.Game.Users.Drawables
             Width = 300
         };
 
+        public override LocalisableString TooltipText
+        {
+            get
+            {
+                if (!Enabled.Value)
+                    return string.Empty;
+
+                return ShowUsernameTooltip ? (user?.Username ?? string.Empty) : ContextMenuStrings.ViewProfile;
+            }
+            set => throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// By default, the tooltip will show "view profile" as avatars are usually displayed next to a username.
+        /// Setting this to <c>true</c> exposes the username via tooltip for special cases where this is not true.
+        /// </summary>
+        public bool ShowUsernameTooltip { get; set; }
+
         private readonly APIUser? user;
 
         [Resolved]
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index 58b3646995..711e7ab799 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -75,6 +75,7 @@ namespace osu.Game.Users.Drawables
                 return new ClickableAvatar(user)
                 {
                     RelativeSizeAxes = Axes.Both,
+                    ShowUsernameTooltip = showUsernameTooltip,
                 };
             }
             else

From 69d6feb5a8b9137aaf74956945b897d7741fe3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 08:51:31 +0100
Subject: [PATCH 1357/2296] Add test coverage for player name skin component

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

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-20231106.osk b/osu.Game.Tests/Resources/Archives/modified-argon-20231106.osk
new file mode 100644
index 0000000000000000000000000000000000000000..70c4ff64d74b2efe0cd630812a41186f11f0467d
GIT binary patch
literal 1397
zcmWIWW@Zs#U|`^2`0JV$epO>m++rZ_AXtQfp*TA;PcJhsQ?+L!*C7W1*5ALomQQ8$
zRN?Tl(ze##D%fqh-IMQq+0!D$AGu<6llCVZ$xCSax#ym1WAgEgE7h`dx2y;i@;>BY
zo8cj)v2)g*`ldCh-M58r@f+Vz{8uC{Cv{oK{FVC3rel?2Ts@D>x5@}wOkC=+bLX2#
zi%I)u9S#Zke{oLIYNO+eVy33HxdyzJI$n0@t(Ea^#ZoElIZyPgx-5&|%=KzDx<5ld
z0L3F)-r3fd0zJ_S#JoTZ@<?W0TE1RZaem(FXF&l0pS;ibhHeT9IHj)_8qyKyrQ>z}
ze0N~b1p^}kqe~$dPMq~W>2uo0m(fVq$7E`WL)4t^AYt!M-445)K5zQ`>GWrXNAoI=
zs&-bY&g@j3`Ll9fW#-R-;;(la%U-air$2j|`fTZI%ceC9A4^0MCV9ndWk7YG!T++N
zdL{;jQ^E`kVnFx#CT8Y&gt|EA=N9DWrRJ3sgB|*Ix^Mn12Z6Ttf4I7hBN|o;ho4ex
z-L`VowiPOST_$cdYu=l>w>j;)O4yP5_qQxMJ?}baG`(!MR5;IL{J8d;?B?ydr?dJy
zV>de-V7EN}E&KJg8$G5%5(bIy^t-E9ZxP@3IfwJuWw)uf-bXThGf`n!`KB{rW^I|_
zw&MorD=#SfFv%opnFbu+#r;0weuId6<)zKt{>P<eKA7^r#c5S%XP>Dj^TEUY6Xrf<
zdeZ6Bno%xiHDke}TPZu<Z{KoX!nxjJgY5aweb%A=X*TDycbDf!hhM67J$tI8(we_7
z^90Kkv6XF8U;f^IqE73ugeJems)+pp{S|Q+S4-%NtSJA(miB%BOyh+MZV6_bO<nS7
z*(z5zLviCKn}<(BUk3{B-Y~n(V?%z~-dU-oRqY<Rr>h)p_#HM-6-)cAcKz?=l;;-K
z%xlUHocj7LJw}(e`%h%n?Mk~#%S9I2Fsqf=+!M(Sna}R|-TX=9TZM!t#}6!ykUsz5
z<K^dZj7FCVKla?4I6eNI-3R|bH{nAa4lCVWmj6C)KJToM-Q52R!jIRV-ep}c`gp6n
zVDz&V)1@Dpa=6#Ed0X!MuKRY~<6E}HymfAGcAfRQQ<%-ZW4H06>4MKBujhA8uxmWH
z{Ed0fHl5y6TVDPT*sAo_zTad2^35DV6K;veG_6mT(_1pLTP^R$ikkwg%bq-Mu0ATt
zzvF?G_R_tg5ghghr>=aySyZ5Vfu4>@DCeJ+i%ciNt+cPL*)OUb!SLwd_e1&Z^~u6z
z<+GI!|KD9;zq^3R#NBHKPhwL{Rw)Pj$z}1$>{SzD3N(G)s#{J9ExqX_-RCf$+sAj_
zpZ@lG$&Fd;#Z!J|2I=fuZx(2I!20>Ft^XKNldR0tq$)LFQq=@vJ|GUrNvurEOwCC_
z<f$S}FCBlMQ=VVXc%Kg66tse^i_!ISw|C>57ZD2Ur>zzPW&%bg5eD4l4bWH!XarHP
z(g$4^dgg}eVPI%H3DpJ9>gZb0^BqEKCL^v~h;9aYKp@PJVL=a;0B=?{kUR?zegx8a
IKotxO0R77}LjV8(

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index 98008a003d..67f9d20fce 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -54,7 +54,9 @@ namespace osu.Game.Tests.Skins
             // Covers key counters
             "Archives/modified-argon-pro-20230618.osk",
             // Covers "Argon" health display
-            "Archives/modified-argon-pro-20231001.osk"
+            "Archives/modified-argon-pro-20231001.osk",
+            // Covers player name text component.
+            "Archives/modified-argon-20231106.osk",
         };
 
         /// <summary>

From b62811633f07820848ec960e228989f02e30f68c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 17:17:19 +0900
Subject: [PATCH 1358/2296] Add test coverage of touching and missing not
 enabled touch mod

---
 .../Mods/TestSceneOsuModTouchDevice.cs         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
index 5134265741..bcfa407684 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
@@ -104,6 +104,24 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             AddAssert("no toasts displayed", () => testOnScreenDisplay.ToastCount, () => Is.Zero);
         }
 
+        [Test]
+        public void TestTouchMiss()
+        {
+            // ensure mouse is active (and that it's not suppressed due to touches in previous tests)
+            AddStep("click mouse", () => InputManager.Click(MouseButton.Left));
+
+            AddUntilStep("wait until 200 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(200).Within(500));
+            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
+            AddUntilStep("wait until 200", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(200));
+            AddStep("touch playfield", () =>
+            {
+                var touch = new Touch(TouchSource.Touch1, Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                InputManager.BeginTouch(touch);
+                InputManager.EndTouch(touch);
+            });
+            AddAssert("touch device mod not activated", () => Player.Mods.Value, () => Has.No.InstanceOf<OsuModTouchDevice>());
+        }
+
         [Test]
         public void TestSecondObjectTouched()
         {

From 4a70f2435c574b82829a5d2508ae29f7d2e3a2fb Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Mon, 6 Nov 2023 09:22:50 +0100
Subject: [PATCH 1359/2296] fixed showUsernameTooltip

---
 .../OnlinePlay/Components/ParticipantsList.cs |  2 +-
 .../DrawableRoomParticipantsList.cs           |  2 +-
 osu.Game/Users/Drawables/ClickableAvatar.cs   | 21 -------------------
 osu.Game/Users/Drawables/UpdateableAvatar.cs  |  6 +-----
 4 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
index 00f0889cc8..cb1a846d6c 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4Extensions.FromHex(@"27252d"),
                     },
-                    avatar = new UpdateableAvatar(showUsernameTooltip: true) { RelativeSizeAxes = Axes.Both },
+                    avatar = new UpdateableAvatar { RelativeSizeAxes = Axes.Both },
                 };
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
index 06f9f35479..1814f5359f 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
@@ -289,7 +289,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 set => avatar.User = value;
             }
 
-            private readonly UpdateableAvatar avatar = new UpdateableAvatar(showUsernameTooltip: true) { RelativeSizeAxes = Axes.Both };
+            private readonly UpdateableAvatar avatar = new UpdateableAvatar { RelativeSizeAxes = Axes.Both };
 
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colours)
diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index 0ed9f56cc7..d6c6afba0b 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.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.
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
-using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
@@ -24,24 +21,6 @@ namespace osu.Game.Users.Drawables
             Width = 300
         };
 
-        public override LocalisableString TooltipText
-        {
-            get
-            {
-                if (!Enabled.Value)
-                    return string.Empty;
-
-                return ShowUsernameTooltip ? (user?.Username ?? string.Empty) : ContextMenuStrings.ViewProfile;
-            }
-            set => throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// By default, the tooltip will show "view profile" as avatars are usually displayed next to a username.
-        /// Setting this to <c>true</c> exposes the username via tooltip for special cases where this is not true.
-        /// </summary>
-        public bool ShowUsernameTooltip { get; set; }
-
         private readonly APIUser? user;
 
         [Resolved]
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index 711e7ab799..3c72d7f7e0 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -46,7 +46,6 @@ namespace osu.Game.Users.Drawables
         protected override double LoadDelay => 200;
 
         private readonly bool isInteractive;
-        private readonly bool showUsernameTooltip;
         private readonly bool showGuestOnNull;
 
         /// <summary>
@@ -54,12 +53,10 @@ namespace osu.Game.Users.Drawables
         /// </summary>
         /// <param name="user">The initial user to display.</param>
         /// <param name="isInteractive">If set to true, hover/click sounds will play and clicking the avatar will open the user's profile.</param>
-        /// <param name="showUsernameTooltip">Whether to show the username rather than "view profile" on the tooltip. (note: this only applies if <paramref name="isInteractive"/> is also true)</param>
         /// <param name="showGuestOnNull">Whether to show a default guest representation on null user (as opposed to nothing).</param>
-        public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showUsernameTooltip = false, bool showGuestOnNull = true)
+        public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showGuestOnNull = true)
         {
             this.isInteractive = isInteractive;
-            this.showUsernameTooltip = showUsernameTooltip;
             this.showGuestOnNull = showGuestOnNull;
 
             User = user;
@@ -75,7 +72,6 @@ namespace osu.Game.Users.Drawables
                 return new ClickableAvatar(user)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    ShowUsernameTooltip = showUsernameTooltip,
                 };
             }
             else

From e2928cc6b96f816320f238e5f653bd75c5ed9ca3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 17:32:39 +0900
Subject: [PATCH 1360/2296] Fix incorrect assertion check targets (and flip
 assertion for miss case)

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
index bcfa407684..b77cc038c9 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 InputManager.BeginTouch(touch);
                 InputManager.EndTouch(touch);
             });
-            AddAssert("touch device mod not activated", () => Player.Mods.Value, () => Has.No.InstanceOf<OsuModTouchDevice>());
+            AddAssert("touch device mod activated", () => Player.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
         }
 
         [Test]
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 InputManager.MoveMouseTo(Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
                 InputManager.Click(MouseButton.Left);
             });
-            AddAssert("touch device mod not activated", () => Player.Mods.Value, () => Has.No.InstanceOf<OsuModTouchDevice>());
+            AddAssert("touch device mod not activated", () => Player.Score.ScoreInfo.Mods, () => Has.None.InstanceOf<OsuModTouchDevice>());
 
             AddStep("speed back up", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 1);
             AddUntilStep("wait until 5000 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(5000).Within(500));

From 97fee6143c7b81d169452396a490b8293b521527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 10:08:19 +0100
Subject: [PATCH 1361/2296] Rename touch "input handlers" to detectors

---
 .../{PlayerTouchInputHandler.cs => PlayerTouchInputDetector.cs} | 2 +-
 osu.Game/Screens/Play/SubmittingPlayer.cs                       | 2 +-
 osu.Game/Screens/Select/SongSelect.cs                           | 2 +-
 ...lectTouchInputHandler.cs => SongSelectTouchInputDetector.cs} | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Screens/Play/{PlayerTouchInputHandler.cs => PlayerTouchInputDetector.cs} (97%)
 rename osu.Game/Screens/Select/{SongSelectTouchInputHandler.cs => SongSelectTouchInputDetector.cs} (96%)

diff --git a/osu.Game/Screens/Play/PlayerTouchInputHandler.cs b/osu.Game/Screens/Play/PlayerTouchInputDetector.cs
similarity index 97%
rename from osu.Game/Screens/Play/PlayerTouchInputHandler.cs
rename to osu.Game/Screens/Play/PlayerTouchInputDetector.cs
index a7d41de105..8bef24b66c 100644
--- a/osu.Game/Screens/Play/PlayerTouchInputHandler.cs
+++ b/osu.Game/Screens/Play/PlayerTouchInputDetector.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play
 {
-    public partial class PlayerTouchInputHandler : Component
+    public partial class PlayerTouchInputDetector : Component
     {
         [Resolved]
         private Player player { get; set; } = null!;
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index e018b8dab3..30fecbe149 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            AddInternal(new PlayerTouchInputHandler());
+            AddInternal(new PlayerTouchInputDetector());
         }
 
         protected override void LoadAsyncComplete()
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 74454713d1..03083672d5 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -279,7 +279,7 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
-                new SongSelectTouchInputHandler()
+                new SongSelectTouchInputDetector()
             });
 
             if (ShowFooter)
diff --git a/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs b/osu.Game/Screens/Select/SongSelectTouchInputDetector.cs
similarity index 96%
rename from osu.Game/Screens/Select/SongSelectTouchInputHandler.cs
rename to osu.Game/Screens/Select/SongSelectTouchInputDetector.cs
index 973dc12e12..b726acb45f 100644
--- a/osu.Game/Screens/Select/SongSelectTouchInputHandler.cs
+++ b/osu.Game/Screens/Select/SongSelectTouchInputDetector.cs
@@ -13,7 +13,7 @@ using osu.Game.Utils;
 
 namespace osu.Game.Screens.Select
 {
-    public partial class SongSelectTouchInputHandler : Component
+    public partial class SongSelectTouchInputDetector : Component
     {
         [Resolved]
         private Bindable<RulesetInfo> ruleset { get; set; } = null!;

From 204cd541e2b8876089c619abd94e97baafb97b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 10:14:56 +0100
Subject: [PATCH 1362/2296] Use placeholder mod icon for touch device

---
 osu.Game/Rulesets/Mods/ModTouchDevice.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModTouchDevice.cs b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
index a5dfe5448c..b80b042f11 100644
--- a/osu.Game/Rulesets/Mods/ModTouchDevice.cs
+++ b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
@@ -2,7 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -10,6 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public sealed override string Name => "Touch Device";
         public sealed override string Acronym => "TD";
+        public sealed override IconUsage? Icon => OsuIcon.PlayStyleTouch;
         public sealed override LocalisableString Description => "Automatically applied to plays on devices with a touchscreen.";
         public sealed override double ScoreMultiplier => 1;
         public sealed override ModType Type => ModType.System;

From aa6f14b0247f2fe0768379b9a1ae03f75827ba86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 18:16:04 +0900
Subject: [PATCH 1363/2296] Fix spinner test hitting assertion when spinning
 too fast

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index ea57a6a1b5..9980e1a55f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -153,7 +154,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 base.Update();
                 if (auto)
-                    RotationTracker.AddRotation((float)(Clock.ElapsedFrameTime * spinRate.Value));
+                    RotationTracker.AddRotation((float)Math.Min(180, Clock.ElapsedFrameTime * spinRate.Value));
             }
         }
     }

From 86cf0a36cfb842cf97f074988a28c9958e9b0b81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 18:16:31 +0900
Subject: [PATCH 1364/2296] Add test coverage of spinner with no bonus ticks

---
 .../TestSceneSpinner.cs                       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 9980e1a55f..77b16dd0c5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -37,6 +37,12 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddSliderStep("Spin rate", 0.5, 5, 1, val => spinRate.Value = val);
         }
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("Reset rate", () => spinRate.Value = 1);
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void TestVariousSpinners(bool autoplay)
@@ -47,6 +53,36 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep($"{term} Small", () => SetContents(_ => testSingle(7, autoplay)));
         }
 
+        [Test]
+        public void TestSpinnerNoBonus()
+        {
+            AddStep("Set high spin rate", () => spinRate.Value = 5);
+
+            Spinner spinner;
+
+            AddStep("add spinner", () => SetContents(_ =>
+            {
+                spinner = new Spinner
+                {
+                    StartTime = Time.Current,
+                    EndTime = Time.Current + 750,
+                    Samples = new List<HitSampleInfo>
+                    {
+                        new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
+                    }
+                };
+
+                spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { OverallDifficulty = 0 });
+
+                return drawableSpinner = new TestDrawableSpinner(spinner, true, spinRate)
+                {
+                    Anchor = Anchor.Centre,
+                    Depth = depthIndex++,
+                    Scale = new Vector2(0.75f)
+                };
+            }));
+        }
+
         [Test]
         public void TestSpinningSamplePitchShift()
         {

From b219a371a93d82c3638df3b47f51e85d20f1fb94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 18:29:51 +0900
Subject: [PATCH 1365/2296] Move sample playback logic local to avoid edge case
 with no bonus ticks

Can't see a better way of doing this.
---
 .../Objects/Drawables/DrawableSpinner.cs        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index aa43532f65..e159d06a02 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -45,6 +45,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private const float spinning_sample_initial_frequency = 1.0f;
         private const float spinning_sample_modulated_base_frequency = 0.5f;
 
+        private SkinnableSound maxBonusSample;
+
         /// <summary>
         /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
         /// </summary>
@@ -109,6 +111,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME,
                     Looping = true,
                     Frequency = { Value = spinning_sample_initial_frequency }
+                },
+                maxBonusSample = new SkinnableSound
+                {
+                    MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME,
                 }
             });
 
@@ -128,6 +134,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.OnFree();
 
             spinningSample.ClearSamples();
+            maxBonusSample.ClearSamples();
         }
 
         protected override void LoadSamples()
@@ -136,6 +143,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             spinningSample.Samples = HitObject.CreateSpinningSamples().Cast<ISampleInfo>().ToArray();
             spinningSample.Frequency.Value = spinning_sample_initial_frequency;
+
+            maxBonusSample.Samples = new ISampleInfo[] { HitObject.CreateHitSampleInfo("spinnerbonus") };
         }
 
         private void updateSpinningSample(ValueChangedEvent<bool> tracking)
@@ -157,6 +166,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.StopAllSamples();
             spinningSample?.Stop();
+            maxBonusSample?.Stop();
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
@@ -303,8 +313,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
-        private int lastMaxSamplePlayback;
-
         private void updateBonusScore()
         {
             if (ticks.Count == 0)
@@ -327,9 +335,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 if (tick == null)
                 {
                     // we still want to play a sound. this will probably be a new sound in the future, but for now let's continue playing the bonus sound.
-                    // round robin to avoid hitting playback concurrency.
-                    tick = ticks.OfType<DrawableSpinnerBonusTick>().Skip(lastMaxSamplePlayback++ % HitObject.MaximumBonusSpins).First();
-                    tick.PlaySamples();
+                    // TODO: this doesn't concurrency. i can't figure out how to make it concurrency. samples are bad and need a refactor.
+                    maxBonusSample.Play();
                 }
                 else
                     tick.TriggerResult(true);

From 92e4a8666def6e4bcc66d008ca0d206ca6c6cbd8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 18:43:47 +0900
Subject: [PATCH 1366/2296] Add `spinnerbonus-max` support and fallback to
 `spinnerbonus`

---
 .../Objects/Drawables/DrawableSpinner.cs      | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index e159d06a02..c0c135d145 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -144,7 +145,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             spinningSample.Samples = HitObject.CreateSpinningSamples().Cast<ISampleInfo>().ToArray();
             spinningSample.Frequency.Value = spinning_sample_initial_frequency;
 
-            maxBonusSample.Samples = new ISampleInfo[] { HitObject.CreateHitSampleInfo("spinnerbonus") };
+            maxBonusSample.Samples = new ISampleInfo[] { new SpinnerBonusMaxSampleInfo(HitObject.CreateHitSampleInfo()) };
         }
 
         private void updateSpinningSample(ValueChangedEvent<bool> tracking)
@@ -344,5 +345,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 completedFullSpins.Value++;
             }
         }
+
+        public class SpinnerBonusMaxSampleInfo : HitSampleInfo
+        {
+            public override IEnumerable<string> LookupNames
+            {
+                get
+                {
+                    foreach (string name in base.LookupNames)
+                        yield return name;
+
+                    foreach (string name in base.LookupNames)
+                        yield return name.Replace("-max", string.Empty);
+                }
+            }
+
+            public SpinnerBonusMaxSampleInfo(HitSampleInfo sampleInfo)
+                : base("spinnerbonus-max", sampleInfo.Bank, sampleInfo.Suffix, sampleInfo.Volume)
+
+            {
+            }
+        }
     }
 }

From 682668ccf0f73bdbb98b800afcaff983399d391d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 10:54:32 +0100
Subject: [PATCH 1367/2296] Remove touch device toasts entirely

---
 .../Mods/TestSceneOsuModTouchDevice.cs        | 21 -------------------
 .../Overlays/OSD/TouchDeviceDetectedToast.cs  | 15 -------------
 .../Screens/Play/PlayerTouchInputDetector.cs  | 12 -----------
 3 files changed, 48 deletions(-)
 delete mode 100644 osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
index b77cc038c9..e41cc8cfbc 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
@@ -4,13 +4,11 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Configuration;
 using osu.Game.Input;
-using osu.Game.Overlays;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
@@ -25,8 +23,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         [Resolved]
         private SessionStatics statics { get; set; } = null!;
 
-        private TestOnScreenDisplay testOnScreenDisplay = null!;
-
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) =>
@@ -54,14 +50,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         [BackgroundDependencyLoader]
         private void load()
         {
-            Add(testOnScreenDisplay = new TestOnScreenDisplay());
             Add(new TouchInputInterceptor());
-            Dependencies.CacheAs<OnScreenDisplay>(testOnScreenDisplay);
         }
 
         public override void SetUpSteps()
         {
-            AddStep("reset OSD toast count", () => testOnScreenDisplay.ToastCount = 0);
             AddStep("reset static", () => statics.SetValue(Static.TouchInputActive, false));
             base.SetUpSteps();
         }
@@ -85,7 +78,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 InputManager.EndTouch(touch);
             });
             AddAssert("touch device mod activated", () => Player.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
-            AddAssert("no toasts displayed", () => testOnScreenDisplay.ToastCount, () => Is.Zero);
         }
 
         [Test]
@@ -101,7 +93,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 InputManager.EndTouch(touch);
             });
             AddAssert("touch device mod not activated", () => Player.Score.ScoreInfo.Mods, () => Has.None.InstanceOf<OsuModTouchDevice>());
-            AddAssert("no toasts displayed", () => testOnScreenDisplay.ToastCount, () => Is.Zero);
         }
 
         [Test]
@@ -149,18 +140,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 InputManager.EndTouch(touch);
             });
             AddAssert("touch device mod activated", () => Player.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
-            AddAssert("toast displayed", () => testOnScreenDisplay.ToastCount, () => Is.EqualTo(1));
-        }
-
-        private partial class TestOnScreenDisplay : OnScreenDisplay
-        {
-            public int ToastCount { get; set; }
-
-            protected override void DisplayTemporarily(Drawable toDisplay)
-            {
-                base.DisplayTemporarily(toDisplay);
-                ToastCount++;
-            }
         }
     }
 }
diff --git a/osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs b/osu.Game/Overlays/OSD/TouchDeviceDetectedToast.cs
deleted file mode 100644
index 266e10ab1f..0000000000
--- a/osu.Game/Overlays/OSD/TouchDeviceDetectedToast.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.Game.Rulesets;
-
-namespace osu.Game.Overlays.OSD
-{
-    public partial class TouchDeviceDetectedToast : Toast
-    {
-        public TouchDeviceDetectedToast(RulesetInfo ruleset)
-            : base(ruleset.Name, "Touch device detected", "Touch Device mod applied to score")
-        {
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/PlayerTouchInputDetector.cs b/osu.Game/Screens/Play/PlayerTouchInputDetector.cs
index 8bef24b66c..a5055dfb00 100644
--- a/osu.Game/Screens/Play/PlayerTouchInputDetector.cs
+++ b/osu.Game/Screens/Play/PlayerTouchInputDetector.cs
@@ -6,10 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
-using osu.Game.Overlays;
-using osu.Game.Overlays.OSD;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play
 {
@@ -21,9 +18,6 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private GameplayState gameplayState { get; set; } = null!;
 
-        [Resolved]
-        private OnScreenDisplay? onScreenDisplay { get; set; }
-
         private IBindable<bool> touchActive = new BindableBool();
 
         [BackgroundDependencyLoader]
@@ -51,12 +45,6 @@ namespace osu.Game.Screens.Play
             if (touchDeviceMod == null)
                 return;
 
-            // do not show the toast if the user hasn't hit anything yet.
-            // we're kind of assuming that the user just switches to touch for gameplay
-            // and we don't want to spam them with obvious toasts.
-            if (gameplayState.ScoreProcessor.HitEvents.Any(ev => ev.Result.IsHit()))
-                onScreenDisplay?.Display(new TouchDeviceDetectedToast(gameplayState.Ruleset.RulesetInfo));
-
             // `Player` (probably rightly so) assumes immutability of mods,
             // so this will not be shown immediately on the mod display in the top right.
             // if this is to change, the mod immutability should be revisited.

From 718492a0b7d9c38b32102095c84393fbe5a792d9 Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Mon, 6 Nov 2023 11:29:15 +0100
Subject: [PATCH 1368/2296] fixed DRY

---
 .../Online/TestSceneUserClickableAvatar.cs    | 83 +++++++------------
 1 file changed, 32 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
index a24581f7ed..72870a5647 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
@@ -27,59 +27,14 @@ namespace osu.Game.Tests.Visual.Online
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Spacing = new Vector2(10f),
-                Children = new Drawable[]
+                Children = new[]
                 {
-                    new ClickableAvatar(new APIUser
-                    {
-                        Username = @"flyte", Id = 3103765, CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
-                    })
-                    {
-                        Width = 50,
-                        Height = 50,
-                        CornerRadius = 10,
-                        Masking = true,
-                        EdgeEffect = new EdgeEffectParameters
-                        {
-                            Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
-                        },
-                    },
-                    new ClickableAvatar(new APIUser
-                    {
-                        Username = @"peppy", Id = 2, Colour = "99EB47", CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
-                    })
-                    {
-                        Width = 50,
-                        Height = 50,
-                        CornerRadius = 10,
-                        Masking = true,
-                        EdgeEffect = new EdgeEffectParameters
-                        {
-                            Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
-                        },
-                    },
-                    new ClickableAvatar(new APIUser
-                    {
-                        Username = @"flyte",
-                        Id = 3103765,
-                        CountryCode = CountryCode.JP,
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
-                        Status =
-                        {
-                            Value = new UserStatusOnline()
-                        }
-                    })
-                    {
-                        Width = 50,
-                        Height = 50,
-                        CornerRadius = 10,
-                        Masking = true,
-                        EdgeEffect = new EdgeEffectParameters
-                        {
-                            Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
-                        },
-                    },
-                    new ClickableAvatar(),
+                    generateUser(@"peppy", 2, CountryCode.AU, @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", "99EB47"),
+                    generateUser(@"flyte", 3103765, CountryCode.JP, @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"),
+                    generateUser(@"flyte", 3103765, CountryCode.JP, @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"),
                     new ClickableAvatar(),
+                    new UpdateableAvatar(),
+                    new UpdateableAvatar(),
                 },
             };
         });
@@ -147,5 +102,31 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
             AddWaitStep("wait for tooltip to hide", 3);
         }
+
+        private Drawable generateUser(string username, int id, CountryCode countryCode, string cover, string? color = null)
+        {
+            return new ClickableAvatar(new APIUser
+                {
+                    Username = username,
+                    Id = id,
+                    CountryCode = countryCode,
+                    CoverUrl = cover,
+                    Colour = color ?? "000000",
+                    Status =
+                    {
+                        Value = new UserStatusOnline()
+                    }
+                })
+                {
+                    Width = 50,
+                    Height = 50,
+                    CornerRadius = 10,
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
+                    },
+                };
+        }
     }
 }

From 51c891e2e4ff17432a01bf4f9ee75ad8c1498883 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 6 Nov 2023 19:34:34 +0900
Subject: [PATCH 1369/2296] Automatically refresh the verify screen's issue
 list on re-entering it

Addresses https://github.com/ppy/osu/discussions/25365.
---
 osu.Game/Screens/Edit/Verify/IssueList.cs    | 10 +++++-----
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 907949aee8..d07190fca0 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Edit.Verify
                         new RoundedButton
                         {
                             Text = "Refresh",
-                            Action = refresh,
+                            Action = Refresh,
                             Size = new Vector2(120, 40),
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight,
@@ -86,13 +86,13 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
-            verify.InterpretedDifficulty.BindValueChanged(_ => refresh());
-            verify.HiddenIssueTypes.BindCollectionChanged((_, _) => refresh());
+            verify.InterpretedDifficulty.BindValueChanged(_ => Refresh());
+            verify.HiddenIssueTypes.BindCollectionChanged((_, _) => Refresh());
 
-            refresh();
+            Refresh();
         }
 
-        private void refresh()
+        public void Refresh()
         {
             var issues = generalVerifier.Run(context);
 
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index b17cf3379e..b6e0450e23 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -56,5 +56,11 @@ namespace osu.Game.Screens.Edit.Verify
                 }
             };
         }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+            IssueList.Refresh();
+        }
     }
 }

From 6deac9a5a45319d1536a9dc223a4efb07324a63c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 11:24:56 +0100
Subject: [PATCH 1370/2296] Use better colours for system mods

---
 osu.Game/Graphics/OsuColour.cs         | 2 +-
 osu.Game/Rulesets/UI/ModIcon.cs        | 6 ++++--
 osu.Game/Rulesets/UI/ModSwitchSmall.cs | 8 ++++++--
 osu.Game/Rulesets/UI/ModSwitchTiny.cs  | 6 +++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 75d313d98c..2e19eac572 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Graphics
                     return Pink1;
 
                 case ModType.System:
-                    return Gray7;
+                    return Gray5;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(modType), modType, "Unknown mod type");
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 5fd1507039..d09db37f2a 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -138,7 +138,6 @@ namespace osu.Game.Rulesets.UI
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
-                            Colour = OsuColour.Gray(84),
                             Alpha = 0,
                             Font = OsuFont.Numeric.With(null, 22f),
                             UseFullGlyphHeight = false,
@@ -148,7 +147,6 @@ namespace osu.Game.Rulesets.UI
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
-                            Colour = OsuColour.Gray(84),
                             Size = new Vector2(45),
                             Icon = FontAwesome.Solid.Question
                         },
@@ -206,6 +204,10 @@ namespace osu.Game.Rulesets.UI
 
         private void updateColour()
         {
+            modAcronym.Colour = modIcon.Colour = mod.Type != ModType.System
+                ? OsuColour.Gray(84)
+                : colours.Yellow;
+
             extendedText.Colour = background.Colour = Selected.Value ? backgroundColour.Lighten(0.2f) : backgroundColour;
             extendedBackground.Colour = Selected.Value ? backgroundColour.Darken(2.4f) : backgroundColour.Darken(2.8f);
         }
diff --git a/osu.Game/Rulesets/UI/ModSwitchSmall.cs b/osu.Game/Rulesets/UI/ModSwitchSmall.cs
index 927379c684..452a5599ba 100644
--- a/osu.Game/Rulesets/UI/ModSwitchSmall.cs
+++ b/osu.Game/Rulesets/UI/ModSwitchSmall.cs
@@ -85,11 +85,15 @@ namespace osu.Game.Rulesets.UI
                 tinySwitch.Scale = new Vector2(0.3f);
             }
 
+            var modTypeColour = colours.ForModType(mod.Type);
+
             inactiveForegroundColour = colourProvider?.Background5 ?? colours.Gray3;
-            activeForegroundColour = colours.ForModType(mod.Type);
+            activeForegroundColour = mod.Type != ModType.System ? modTypeColour : colours.Yellow;
 
             inactiveBackgroundColour = colourProvider?.Background2 ?? colours.Gray5;
-            activeBackgroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, activeForegroundColour, 0, 1);
+            activeBackgroundColour = mod.Type != ModType.System
+                ? Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1)
+                : modTypeColour;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Rulesets/UI/ModSwitchTiny.cs b/osu.Game/Rulesets/UI/ModSwitchTiny.cs
index a3e325ace8..5bf501ead3 100644
--- a/osu.Game/Rulesets/UI/ModSwitchTiny.cs
+++ b/osu.Game/Rulesets/UI/ModSwitchTiny.cs
@@ -106,11 +106,15 @@ namespace osu.Game.Rulesets.UI
         [BackgroundDependencyLoader(true)]
         private void load(OsuColour colours, OverlayColourProvider? colourProvider)
         {
+            var modTypeColour = colours.ForModType(Mod.Type);
+
             inactiveBackgroundColour = colourProvider?.Background5 ?? colours.Gray3;
             activeBackgroundColour = colours.ForModType(Mod.Type);
 
             inactiveForegroundColour = colourProvider?.Background2 ?? colours.Gray5;
-            activeForegroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, activeForegroundColour, 0, 1);
+            activeForegroundColour = Mod.Type != ModType.System
+                ? Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, activeForegroundColour, 0, 1)
+                : colours.Yellow;
         }
 
         protected override void LoadComplete()

From 39ad91feea58e0a91e95b3a2be0889ff98be4ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 11:50:04 +0100
Subject: [PATCH 1371/2296] Make debug input toggle post notifications

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

diff --git a/osu.Game/Input/TouchInputInterceptor.cs b/osu.Game/Input/TouchInputInterceptor.cs
index b566113a2a..368d8469ae 100644
--- a/osu.Game/Input/TouchInputInterceptor.cs
+++ b/osu.Game/Input/TouchInputInterceptor.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Input
         [Conditional("TOUCH_INPUT_DEBUG")]
         private void debugToggleTouchInputActive()
         {
-            Logger.Log($@"Debug-toggling touch input to {(touchInputActive.Value ? @"inactive" : @"active")}", LoggingTarget.Input, LogLevel.Debug);
+            Logger.Log($@"Debug-toggling touch input to {(touchInputActive.Value ? @"inactive" : @"active")}", LoggingTarget.Information, LogLevel.Important);
             touchInputActive.Toggle();
         }
     }

From 034f53da4b1d79220d8af95055a203076ab88c87 Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Mon, 6 Nov 2023 11:54:57 +0100
Subject: [PATCH 1372/2296] added isEnabled to tooltip

---
 osu.Game/Users/Drawables/ClickableAvatar.cs  | 16 +++++++++++++++-
 osu.Game/Users/Drawables/UpdateableAvatar.cs |  5 ++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index d6c6afba0b..0520f62665 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -14,13 +14,15 @@ namespace osu.Game.Users.Drawables
 {
     public partial class ClickableAvatar : OsuClickableContainer, IHasCustomTooltip<UserGridPanel>
     {
-        public ITooltip<UserGridPanel> GetCustomTooltip() => new UserGridPanelTooltip();
+        public ITooltip<UserGridPanel> GetCustomTooltip() => new UserGridPanelTooltip(IsTooltipEnabled);
 
         public UserGridPanel TooltipContent => new UserGridPanel(user!)
         {
             Width = 300
         };
 
+        public bool IsTooltipEnabled;
+
         private readonly APIUser? user;
 
         [Resolved]
@@ -33,6 +35,7 @@ namespace osu.Game.Users.Drawables
         public ClickableAvatar(APIUser? user = null)
         {
             this.user = user;
+            IsTooltipEnabled = true;
 
             if (user?.Id != APIUser.SYSTEM_USER_ID)
                 Action = openProfile;
@@ -60,10 +63,21 @@ namespace osu.Game.Users.Drawables
 
         private partial class UserGridPanelTooltip : VisibilityContainer, ITooltip<UserGridPanel>
         {
+            private readonly bool isEnabled;
             private UserGridPanel? displayedUser;
 
+            public UserGridPanelTooltip(bool isEnabled = true)
+            {
+                this.isEnabled = isEnabled;
+            }
+
             protected override void PopIn()
             {
+                if (displayedUser is null || !isEnabled)
+                {
+                    return;
+                }
+
                 Child = displayedUser;
                 this.FadeIn(20, Easing.OutQuint);
             }
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index 3c72d7f7e0..a970997056 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -47,17 +47,20 @@ namespace osu.Game.Users.Drawables
 
         private readonly bool isInteractive;
         private readonly bool showGuestOnNull;
+        private readonly bool showUserPanel;
 
         /// <summary>
         /// Construct a new UpdateableAvatar.
         /// </summary>
         /// <param name="user">The initial user to display.</param>
         /// <param name="isInteractive">If set to true, hover/click sounds will play and clicking the avatar will open the user's profile.</param>
+        /// <param name="showUserPanel">If set to true, the user status panel will be displayed in the tooltip.</param>
         /// <param name="showGuestOnNull">Whether to show a default guest representation on null user (as opposed to nothing).</param>
-        public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showGuestOnNull = true)
+        public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showUserPanel = true, bool showGuestOnNull = true)
         {
             this.isInteractive = isInteractive;
             this.showGuestOnNull = showGuestOnNull;
+            this.showUserPanel = showUserPanel;
 
             User = user;
         }

From 4bc36a6c90dfd051cd6202be7e4fec48c1b05080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 12:18:02 +0100
Subject: [PATCH 1373/2296] Fix unused variable

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

diff --git a/osu.Game/Rulesets/UI/ModSwitchTiny.cs b/osu.Game/Rulesets/UI/ModSwitchTiny.cs
index 5bf501ead3..bb121c085c 100644
--- a/osu.Game/Rulesets/UI/ModSwitchTiny.cs
+++ b/osu.Game/Rulesets/UI/ModSwitchTiny.cs
@@ -109,11 +109,11 @@ namespace osu.Game.Rulesets.UI
             var modTypeColour = colours.ForModType(Mod.Type);
 
             inactiveBackgroundColour = colourProvider?.Background5 ?? colours.Gray3;
-            activeBackgroundColour = colours.ForModType(Mod.Type);
+            activeBackgroundColour = modTypeColour;
 
             inactiveForegroundColour = colourProvider?.Background2 ?? colours.Gray5;
             activeForegroundColour = Mod.Type != ModType.System
-                ? Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, activeForegroundColour, 0, 1)
+                ? Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1)
                 : colours.Yellow;
         }
 

From a01f6187f4738f85376cb820315d95d8c4545e4c Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Mon, 6 Nov 2023 14:52:06 +0100
Subject: [PATCH 1374/2296] testing the tooltip

---
 .../Online/TestSceneUserClickableAvatar.cs    | 134 +++++++++---------
 osu.Game/Users/Drawables/ClickableAvatar.cs   |  43 +++++-
 osu.Game/Users/Drawables/UpdateableAvatar.cs  |   1 +
 3 files changed, 102 insertions(+), 76 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
index 72870a5647..678767f15e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.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.
 
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
-using osu.Framework.Testing;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
@@ -29,12 +27,9 @@ namespace osu.Game.Tests.Visual.Online
                 Spacing = new Vector2(10f),
                 Children = new[]
                 {
-                    generateUser(@"peppy", 2, CountryCode.AU, @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", "99EB47"),
-                    generateUser(@"flyte", 3103765, CountryCode.JP, @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"),
-                    generateUser(@"flyte", 3103765, CountryCode.JP, @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"),
-                    new ClickableAvatar(),
-                    new UpdateableAvatar(),
-                    new UpdateableAvatar(),
+                    generateUser(@"peppy", 2, CountryCode.AU, @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", false, "99EB47"),
+                    generateUser(@"flyte", 3103765, CountryCode.JP, @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg", false),
+                    generateUser(@"joshika39", 17032217, CountryCode.RS, @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", true),
                 },
             };
         });
@@ -42,68 +37,68 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestClickableAvatarHover()
         {
-            AddStep($"click {1}. {nameof(ClickableAvatar)}", () =>
-            {
-                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-                if (targets.Count < 1)
-                    return;
-
-                InputManager.MoveMouseTo(targets[0]);
-            });
-            AddWaitStep("wait for tooltip to show", 5);
-            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            AddWaitStep("wait for tooltip to hide", 3);
-
-            AddStep($"click {2}. {nameof(ClickableAvatar)}", () =>
-            {
-                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-                if (targets.Count < 2)
-                    return;
-
-                InputManager.MoveMouseTo(targets[1]);
-            });
-            AddWaitStep("wait for tooltip to show", 5);
-            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            AddWaitStep("wait for tooltip to hide", 3);
-
-            AddStep($"click {3}. {nameof(ClickableAvatar)}", () =>
-            {
-                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-                if (targets.Count < 3)
-                    return;
-
-                InputManager.MoveMouseTo(targets[2]);
-            });
-            AddWaitStep("wait for tooltip to show", 5);
-            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            AddWaitStep("wait for tooltip to hide", 3);
-
-            AddStep($"click null user {4}. {nameof(ClickableAvatar)}", () =>
-            {
-                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-                if (targets.Count < 4)
-                    return;
-
-                InputManager.MoveMouseTo(targets[3]);
-            });
-            AddWaitStep("wait for tooltip to show", 5);
-            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            AddWaitStep("wait for tooltip to hide", 3);
-
-            AddStep($"click null user {5}. {nameof(ClickableAvatar)}", () =>
-            {
-                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-                if (targets.Count < 5)
-                    return;
-
-                InputManager.MoveMouseTo(targets[4]);
-            });
-            AddWaitStep("wait for tooltip to show", 5);
-            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            AddWaitStep("wait for tooltip to hide", 3);
+            // AddStep($"click {1}. {nameof(ClickableAvatar)}", () =>
+            // {
+            //     var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+            //     if (targets.Count < 1)
+            //         return;
+            //
+            //     InputManager.MoveMouseTo(targets[0]);
+            // });
+            // AddWaitStep("wait for tooltip to show", 5);
+            // AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            // AddWaitStep("wait for tooltip to hide", 3);
+            //
+            // AddStep($"click {2}. {nameof(ClickableAvatar)}", () =>
+            // {
+            //     var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+            //     if (targets.Count < 2)
+            //         return;
+            //
+            //     InputManager.MoveMouseTo(targets[1]);
+            // });
+            // AddWaitStep("wait for tooltip to show", 5);
+            // AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            // AddWaitStep("wait for tooltip to hide", 3);
+            //
+            // AddStep($"click {3}. {nameof(ClickableAvatar)}", () =>
+            // {
+            //     var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+            //     if (targets.Count < 3)
+            //         return;
+            //
+            //     InputManager.MoveMouseTo(targets[2]);
+            // });
+            // AddWaitStep("wait for tooltip to show", 5);
+            // AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            // AddWaitStep("wait for tooltip to hide", 3);
+            //
+            // AddStep($"click null user {4}. {nameof(ClickableAvatar)}", () =>
+            // {
+            //     var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+            //     if (targets.Count < 4)
+            //         return;
+            //
+            //     InputManager.MoveMouseTo(targets[3]);
+            // });
+            // AddWaitStep("wait for tooltip to show", 5);
+            // AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            // AddWaitStep("wait for tooltip to hide", 3);
+            //
+            // AddStep($"click null user {5}. {nameof(ClickableAvatar)}", () =>
+            // {
+            //     var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+            //     if (targets.Count < 5)
+            //         return;
+            //
+            //     InputManager.MoveMouseTo(targets[4]);
+            // });
+            // AddWaitStep("wait for tooltip to show", 5);
+            // AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            // AddWaitStep("wait for tooltip to hide", 3);
         }
 
-        private Drawable generateUser(string username, int id, CountryCode countryCode, string cover, string? color = null)
+        private Drawable generateUser(string username, int id, CountryCode countryCode, string cover, bool isTooltipEnabled, string? color = null)
         {
             return new ClickableAvatar(new APIUser
                 {
@@ -115,7 +110,7 @@ namespace osu.Game.Tests.Visual.Online
                     Status =
                     {
                         Value = new UserStatusOnline()
-                    }
+                    },
                 })
                 {
                     Width = 50,
@@ -126,6 +121,7 @@ namespace osu.Game.Tests.Visual.Online
                     {
                         Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
                     },
+                    IsTooltipEnabled = isTooltipEnabled,
                 };
         }
     }
diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index 0520f62665..c11ad7f720 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -1,12 +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;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
+using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
@@ -14,14 +17,32 @@ namespace osu.Game.Users.Drawables
 {
     public partial class ClickableAvatar : OsuClickableContainer, IHasCustomTooltip<UserGridPanel>
     {
-        public ITooltip<UserGridPanel> GetCustomTooltip() => new UserGridPanelTooltip(IsTooltipEnabled);
+        public ITooltip<UserGridPanel> GetCustomTooltip() => new UserGridPanelTooltip(this);
 
         public UserGridPanel TooltipContent => new UserGridPanel(user!)
         {
             Width = 300
         };
 
-        public bool IsTooltipEnabled;
+        public override LocalisableString TooltipText
+        {
+            get
+            {
+                if (!Enabled.Value)
+                    return string.Empty;
+
+                return !IsTooltipEnabled ? (user?.Username ?? string.Empty) : ContextMenuStrings.ViewProfile;
+            }
+            set => throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// By default, the tooltip will show "view profile" as avatars are usually displayed next to a username.
+        /// Setting this to <c>true</c> exposes the username via tooltip for special cases where this is not true.
+        /// </summary>
+        // public bool ShowUsernameTooltip { get; set; }
+
+        public bool IsTooltipEnabled { get; set; }
 
         private readonly APIUser? user;
 
@@ -35,12 +56,16 @@ namespace osu.Game.Users.Drawables
         public ClickableAvatar(APIUser? user = null)
         {
             this.user = user;
-            IsTooltipEnabled = true;
 
             if (user?.Id != APIUser.SYSTEM_USER_ID)
                 Action = openProfile;
         }
 
+        public void SetValue(out bool value)
+        {
+            value = IsTooltipEnabled;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -61,18 +86,22 @@ namespace osu.Game.Users.Drawables
             return base.OnClick(e);
         }
 
-        private partial class UserGridPanelTooltip : VisibilityContainer, ITooltip<UserGridPanel>
+        public partial class UserGridPanelTooltip : VisibilityContainer, ITooltip<UserGridPanel>
         {
-            private readonly bool isEnabled;
+            private readonly ClickableAvatar parent;
             private UserGridPanel? displayedUser;
+            private bool isEnabled;
 
-            public UserGridPanelTooltip(bool isEnabled = true)
+            public UserGridPanelTooltip(ClickableAvatar parent)
             {
-                this.isEnabled = isEnabled;
+                this.parent = parent ?? throw new ArgumentNullException(nameof(parent));
+                isEnabled = this.parent.IsTooltipEnabled;
             }
 
             protected override void PopIn()
             {
+                parent.SetValue(out isEnabled);
+
                 if (displayedUser is null || !isEnabled)
                 {
                     return;
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index a970997056..64d64c56ce 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -75,6 +75,7 @@ namespace osu.Game.Users.Drawables
                 return new ClickableAvatar(user)
                 {
                     RelativeSizeAxes = Axes.Both,
+                    IsTooltipEnabled = showUserPanel
                 };
             }
             else

From f897c21b3f5b57b5892f25cef3644aabf82d7c43 Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Mon, 6 Nov 2023 15:25:12 +0100
Subject: [PATCH 1375/2296] partial change

---
 osu.Game/Users/Drawables/ClickableAvatar.cs | 39 ++++++++-------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index c11ad7f720..376ce0b821 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -15,14 +15,14 @@ using osuTK;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class ClickableAvatar : OsuClickableContainer, IHasCustomTooltip<UserGridPanel>
+    public partial class ClickableAvatar : OsuClickableContainer, IHasCustomTooltip<APIUser>
     {
-        public ITooltip<UserGridPanel> GetCustomTooltip() => new UserGridPanelTooltip(this);
-
-        public UserGridPanel TooltipContent => new UserGridPanel(user!)
+        public ITooltip<APIUser> GetCustomTooltip()
         {
-            Width = 300
-        };
+            return new APIUserTooltip(user);
+        }
+
+        public APIUser? TooltipContent => user;
 
         public override LocalisableString TooltipText
         {
@@ -36,12 +36,6 @@ namespace osu.Game.Users.Drawables
             set => throw new NotSupportedException();
         }
 
-        /// <summary>
-        /// By default, the tooltip will show "view profile" as avatars are usually displayed next to a username.
-        /// Setting this to <c>true</c> exposes the username via tooltip for special cases where this is not true.
-        /// </summary>
-        // public bool ShowUsernameTooltip { get; set; }
-
         public bool IsTooltipEnabled { get; set; }
 
         private readonly APIUser? user;
@@ -86,28 +80,23 @@ namespace osu.Game.Users.Drawables
             return base.OnClick(e);
         }
 
-        public partial class UserGridPanelTooltip : VisibilityContainer, ITooltip<UserGridPanel>
+        public partial class APIUserTooltip : VisibilityContainer, ITooltip<APIUser>
         {
-            private readonly ClickableAvatar parent;
-            private UserGridPanel? displayedUser;
-            private bool isEnabled;
+            private APIUser? user;
 
-            public UserGridPanelTooltip(ClickableAvatar parent)
+            public APIUserTooltip(APIUser? user)
             {
-                this.parent = parent ?? throw new ArgumentNullException(nameof(parent));
-                isEnabled = this.parent.IsTooltipEnabled;
+                this.user = user;
             }
 
             protected override void PopIn()
             {
-                parent.SetValue(out isEnabled);
-
-                if (displayedUser is null || !isEnabled)
+                if (user is null)
                 {
                     return;
                 }
 
-                Child = displayedUser;
+                Child = new UserGridPanel(user);
                 this.FadeIn(20, Easing.OutQuint);
             }
 
@@ -115,9 +104,9 @@ namespace osu.Game.Users.Drawables
 
             public void Move(Vector2 pos) => Position = pos;
 
-            public void SetContent(UserGridPanel userGridPanel)
+            public void SetContent(APIUser user)
             {
-                displayedUser = userGridPanel;
+                this.user = user;
             }
         }
     }

From 915feeffb05389da36e9eb4e1c75f962202b3703 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 6 Nov 2023 17:37:25 +0300
Subject: [PATCH 1376/2296] Revert gameplay cursor scale changes

---
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index 12506c83b9..555610a3b6 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -5,6 +5,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -13,16 +14,18 @@ using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
     public partial class OsuResumeOverlay : ResumeOverlay
     {
-        private Container resumeCursorContainer;
+        private Container cursorScaleContainer;
         private OsuClickToResumeCursor clickToResumeCursor;
 
         private OsuCursorContainer localCursorContainer;
+        private IBindable<float> localCursorScale;
 
         public override CursorContainer LocalCursor => State.Value == Visibility.Visible ? localCursorContainer : null;
 
@@ -31,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Add(resumeCursorContainer = new Container
+            Add(cursorScaleContainer = new Container
             {
                 Child = clickToResumeCursor = new OsuClickToResumeCursor { ResumeRequested = Resume }
             });
@@ -42,11 +45,17 @@ namespace osu.Game.Rulesets.Osu.UI
             base.PopIn();
 
             GameplayCursor.ActiveCursor.Hide();
-            resumeCursorContainer.Position = ToLocalSpace(GameplayCursor.ActiveCursor.ScreenSpaceDrawQuad.Centre);
+            cursorScaleContainer.Position = ToLocalSpace(GameplayCursor.ActiveCursor.ScreenSpaceDrawQuad.Centre);
             clickToResumeCursor.Appear();
 
             if (localCursorContainer == null)
+            {
                 Add(localCursorContainer = new OsuCursorContainer());
+
+                localCursorScale = new BindableFloat();
+                localCursorScale.BindTo(localCursorContainer.CursorScale);
+                localCursorScale.BindValueChanged(scale => cursorScaleContainer.Scale = new Vector2(scale.NewValue), true);
+            }
         }
 
         protected override void PopOut()

From 75fbbb35ad2f88524670a19312dcb43569db8190 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 6 Nov 2023 18:28:51 +0300
Subject: [PATCH 1377/2296] Move cursor scale application within `OsuCursor`

Doing so takes down two birds with one stone.
 1. `ResumeOverlay` having to manually apply cursor scale to its "resume
cursor".
 2. Resume cursor input handling scaling up with the gameplay setting. Now, only the sprite itself gets scaled.
---
 osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs  | 67 ++++++++++++++++---
 .../UI/Cursor/OsuCursorContainer.cs           | 61 ++---------------
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs  | 12 +---
 3 files changed, 68 insertions(+), 72 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
index 66c86ee09d..ab1bb0cf5a 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
@@ -4,12 +4,16 @@
 #nullable disable
 
 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.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.Skinning;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -20,12 +24,29 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
     {
         private const float size = 28;
 
+        private const float pressed_scale = 1.2f;
+        private const float released_scale = 1f;
+
         private bool cursorExpand;
 
         private SkinnableDrawable cursorSprite;
+        private Container cursorScaleContainer = null!;
 
         private Drawable expandTarget => (cursorSprite.Drawable as OsuCursorSprite)?.ExpandTarget ?? cursorSprite;
 
+        public IBindable<float> CursorScale => cursorScale;
+
+        private readonly Bindable<float> cursorScale = new BindableFloat(1);
+
+        private Bindable<float> userCursorScale = null!;
+        private Bindable<bool> autoCursorScale = null!;
+
+        [Resolved(canBeNull: true)]
+        private GameplayState state { get; set; }
+
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
         public OsuCursor()
         {
             Origin = Anchor.Centre;
@@ -33,15 +54,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             Size = new Vector2(size);
         }
 
-        protected override void SkinChanged(ISkinSource skin)
-        {
-            cursorExpand = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorExpand)?.Value ?? true;
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = new Container
+            InternalChild = cursorScaleContainer = new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 Origin = Anchor.Centre,
@@ -52,10 +68,45 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                     Anchor = Anchor.Centre,
                 }
             };
+
+            userCursorScale = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
+            userCursorScale.ValueChanged += _ => calculateCursorScale();
+
+            autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
+            autoCursorScale.ValueChanged += _ => calculateCursorScale();
+
+            cursorScale.BindValueChanged(e => cursorScaleContainer.Scale = new Vector2(e.NewValue), true);
         }
 
-        private const float pressed_scale = 1.2f;
-        private const float released_scale = 1f;
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            calculateCursorScale();
+        }
+
+        /// <summary>
+        /// Get the scale applicable to the ActiveCursor based on a beatmap's circle size.
+        /// </summary>
+        public static float GetScaleForCircleSize(float circleSize) =>
+            1f - 0.7f * (1f + circleSize - BeatmapDifficulty.DEFAULT_DIFFICULTY) / BeatmapDifficulty.DEFAULT_DIFFICULTY;
+
+        private void calculateCursorScale()
+        {
+            float scale = userCursorScale.Value;
+
+            if (autoCursorScale.Value && state != null)
+            {
+                // if we have a beatmap available, let's get its circle size to figure out an automatic cursor scale modifier.
+                scale *= GetScaleForCircleSize(state.Beatmap.Difficulty.CircleSize);
+            }
+
+            cursorScale.Value = scale;
+        }
+
+        protected override void SkinChanged(ISkinSource skin)
+        {
+            cursorExpand = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorExpand)?.Value ?? true;
+        }
 
         public void Expand()
         {
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index bf1ff872dd..ba8a634ff7 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -11,11 +11,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -23,6 +20,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 {
     public partial class OsuCursorContainer : GameplayCursorContainer, IKeyBindingHandler<OsuAction>
     {
+        public new OsuCursor ActiveCursor => (OsuCursor)base.ActiveCursor;
+
         protected override Drawable CreateCursor() => new OsuCursor();
 
         protected override Container<Drawable> Content => fadeContainer;
@@ -33,13 +32,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         private readonly Drawable cursorTrail;
 
-        public IBindable<float> CursorScale => cursorScale;
-
-        private readonly Bindable<float> cursorScale = new BindableFloat(1);
-
-        private Bindable<float> userCursorScale;
-        private Bindable<bool> autoCursorScale;
-
         private readonly CursorRippleVisualiser rippleVisualiser;
 
         public OsuCursorContainer()
@@ -56,12 +48,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             };
         }
 
-        [Resolved(canBeNull: true)]
-        private GameplayState state { get; set; }
-
-        [Resolved]
-        private OsuConfigManager config { get; set; }
-
         [BackgroundDependencyLoader(true)]
         private void load(OsuRulesetConfigManager rulesetConfig)
         {
@@ -74,46 +60,13 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
             showTrail.BindValueChanged(v => cursorTrail.FadeTo(v.NewValue ? 1 : 0, 200), true);
 
-            userCursorScale = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
-            userCursorScale.ValueChanged += _ => calculateScale();
-
-            autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
-            autoCursorScale.ValueChanged += _ => calculateScale();
-
-            CursorScale.BindValueChanged(e =>
+            ActiveCursor.CursorScale.BindValueChanged(e =>
             {
                 var newScale = new Vector2(e.NewValue);
 
-                ActiveCursor.Scale = newScale;
                 rippleVisualiser.CursorScale = newScale;
                 cursorTrail.Scale = newScale;
             }, true);
-
-            calculateScale();
-        }
-
-        /// <summary>
-        /// Get the scale applicable to the ActiveCursor based on a beatmap's circle size.
-        /// </summary>
-        public static float GetScaleForCircleSize(float circleSize) =>
-            1f - 0.7f * (1f + circleSize - BeatmapDifficulty.DEFAULT_DIFFICULTY) / BeatmapDifficulty.DEFAULT_DIFFICULTY;
-
-        private void calculateScale()
-        {
-            float scale = userCursorScale.Value;
-
-            if (autoCursorScale.Value && state != null)
-            {
-                // if we have a beatmap available, let's get its circle size to figure out an automatic cursor scale modifier.
-                scale *= GetScaleForCircleSize(state.Beatmap.Difficulty.CircleSize);
-            }
-
-            cursorScale.Value = scale;
-
-            var newScale = new Vector2(scale);
-
-            ActiveCursor.ScaleTo(newScale, 400, Easing.OutQuint);
-            cursorTrail.Scale = newScale;
         }
 
         private int downCount;
@@ -121,9 +74,9 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         private void updateExpandedState()
         {
             if (downCount > 0)
-                (ActiveCursor as OsuCursor)?.Expand();
+                ActiveCursor.Expand();
             else
-                (ActiveCursor as OsuCursor)?.Contract();
+                ActiveCursor.Contract();
         }
 
         public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
@@ -160,13 +113,13 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         protected override void PopIn()
         {
             fadeContainer.FadeTo(1, 300, Easing.OutQuint);
-            ActiveCursor.ScaleTo(CursorScale.Value, 400, Easing.OutQuint);
+            ActiveCursor.ScaleTo(1f, 400, Easing.OutQuint);
         }
 
         protected override void PopOut()
         {
             fadeContainer.FadeTo(0.05f, 450, Easing.OutQuint);
-            ActiveCursor.ScaleTo(CursorScale.Value * 0.8f, 450, Easing.OutQuint);
+            ActiveCursor.ScaleTo(0.8f, 450, Easing.OutQuint);
         }
 
         private partial class DefaultCursorTrail : CursorTrail
diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index 555610a3b6..ea49836772 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -5,7 +5,6 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -14,7 +13,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.UI
@@ -25,7 +23,6 @@ namespace osu.Game.Rulesets.Osu.UI
         private OsuClickToResumeCursor clickToResumeCursor;
 
         private OsuCursorContainer localCursorContainer;
-        private IBindable<float> localCursorScale;
 
         public override CursorContainer LocalCursor => State.Value == Visibility.Visible ? localCursorContainer : null;
 
@@ -49,13 +46,7 @@ namespace osu.Game.Rulesets.Osu.UI
             clickToResumeCursor.Appear();
 
             if (localCursorContainer == null)
-            {
                 Add(localCursorContainer = new OsuCursorContainer());
-
-                localCursorScale = new BindableFloat();
-                localCursorScale.BindTo(localCursorContainer.CursorScale);
-                localCursorScale.BindValueChanged(scale => cursorScaleContainer.Scale = new Vector2(scale.NewValue), true);
-            }
         }
 
         protected override void PopOut()
@@ -98,7 +89,8 @@ namespace osu.Game.Rulesets.Osu.UI
                 {
                     case OsuAction.LeftButton:
                     case OsuAction.RightButton:
-                        if (!IsHovered) return false;
+                        if (!IsHovered)
+                            return false;
 
                         this.ScaleTo(2, TRANSITION_TIME, Easing.OutQuint);
 

From e12ee29a942279becf7ca4fd3816af1787b3fce8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 6 Nov 2023 18:35:30 +0300
Subject: [PATCH 1378/2296] Update existing test coverage

---
 osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index c84a6ab70f..e6696032ae 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -94,16 +94,16 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddStep("load content", loadContent);
 
-            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize) * userScale);
+            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.CursorScale.Value == OsuCursor.GetScaleForCircleSize(circleSize) * userScale);
 
             AddStep("set user scale to 1", () => config.SetValue(OsuSetting.GameplayCursorSize, 1f));
-            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize));
+            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.CursorScale.Value == OsuCursor.GetScaleForCircleSize(circleSize));
 
             AddStep("turn off autosizing", () => config.SetValue(OsuSetting.AutoCursorSize, false));
-            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == 1);
+            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.CursorScale.Value == 1);
 
             AddStep($"set user scale to {userScale}", () => config.SetValue(OsuSetting.GameplayCursorSize, userScale));
-            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == userScale);
+            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.CursorScale.Value == userScale);
         }
 
         [Test]

From 073249dafb3605a36bb8482f73f2dac1b7733b9f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 6 Nov 2023 18:35:46 +0300
Subject: [PATCH 1379/2296] Allow tinkering with cursor-related settings in
 resume overlay test scene

---
 .../TestSceneResumeOverlay.cs                 | 58 +++++++++++++------
 1 file changed, 41 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
index 81dc64cda9..49a8254f53 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
@@ -2,11 +2,14 @@
 // 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.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Screens.Play;
+using osu.Game.Tests.Gameplay;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -19,24 +22,37 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private bool resumeFired;
 
-        [SetUp]
-        public void SetUp() => Schedule(() =>
-        {
-            Child = osuInputManager = new ManualOsuInputManager(new OsuRuleset().RulesetInfo)
-            {
-                Children = new Drawable[]
-                {
-                    cursor = new CursorContainer(),
-                    resume = new OsuResumeOverlay
-                    {
-                        GameplayCursor = cursor
-                    },
-                }
-            };
+        private OsuConfigManager localConfig = null!;
 
-            resumeFired = false;
-            resume.ResumeAction = () => resumeFired = true;
-        });
+        [Cached]
+        private GameplayState gameplayState;
+
+        public TestSceneResumeOverlay()
+        {
+            gameplayState = TestGameplayState.Create(new OsuRuleset());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Dependencies.Cache(localConfig = new OsuConfigManager(LocalStorage));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            AddSliderStep("cursor size", 0.1f, 2f, 1f, v => localConfig.SetValue(OsuSetting.GameplayCursorSize, v));
+            AddSliderStep("circle size", 0f, 10f, 0f, val =>
+            {
+                gameplayState.Beatmap.Difficulty.CircleSize = val;
+                SetUp();
+            });
+
+            AddToggleStep("auto size", v => localConfig.SetValue(OsuSetting.AutoCursorSize, v));
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(loadContent);
 
         [Test]
         public void TestResume()
@@ -53,6 +69,14 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("dismissed", () => resumeFired && resume.State.Value == Visibility.Hidden);
         }
 
+        private void loadContent()
+        {
+            Child = osuInputManager = new ManualOsuInputManager(new OsuRuleset().RulesetInfo) { Children = new Drawable[] { cursor = new CursorContainer(), resume = new OsuResumeOverlay { GameplayCursor = cursor }, } };
+
+            resumeFired = false;
+            resume.ResumeAction = () => resumeFired = true;
+        }
+
         private partial class ManualOsuInputManager : OsuInputManager
         {
             public ManualOsuInputManager(RulesetInfo ruleset)

From a136f272cf78ec3572bc13bdcf0de47b74789a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 6 Nov 2023 16:40:57 +0100
Subject: [PATCH 1380/2296] Just use yellow for system mods

---
 osu.Game/Graphics/OsuColour.cs         | 2 +-
 osu.Game/Rulesets/UI/ModIcon.cs        | 4 +---
 osu.Game/Rulesets/UI/ModSwitchSmall.cs | 6 ++----
 osu.Game/Rulesets/UI/ModSwitchTiny.cs  | 4 +---
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 2e19eac572..a417164e27 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Graphics
                     return Pink1;
 
                 case ModType.System:
-                    return Gray5;
+                    return Yellow;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(modType), modType, "Unknown mod type");
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index d09db37f2a..d1776c5c0b 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -204,9 +204,7 @@ namespace osu.Game.Rulesets.UI
 
         private void updateColour()
         {
-            modAcronym.Colour = modIcon.Colour = mod.Type != ModType.System
-                ? OsuColour.Gray(84)
-                : colours.Yellow;
+            modAcronym.Colour = modIcon.Colour = OsuColour.Gray(84);
 
             extendedText.Colour = background.Colour = Selected.Value ? backgroundColour.Lighten(0.2f) : backgroundColour;
             extendedBackground.Colour = Selected.Value ? backgroundColour.Darken(2.4f) : backgroundColour.Darken(2.8f);
diff --git a/osu.Game/Rulesets/UI/ModSwitchSmall.cs b/osu.Game/Rulesets/UI/ModSwitchSmall.cs
index 452a5599ba..6e96cc8e6f 100644
--- a/osu.Game/Rulesets/UI/ModSwitchSmall.cs
+++ b/osu.Game/Rulesets/UI/ModSwitchSmall.cs
@@ -88,12 +88,10 @@ namespace osu.Game.Rulesets.UI
             var modTypeColour = colours.ForModType(mod.Type);
 
             inactiveForegroundColour = colourProvider?.Background5 ?? colours.Gray3;
-            activeForegroundColour = mod.Type != ModType.System ? modTypeColour : colours.Yellow;
+            activeForegroundColour = modTypeColour;
 
             inactiveBackgroundColour = colourProvider?.Background2 ?? colours.Gray5;
-            activeBackgroundColour = mod.Type != ModType.System
-                ? Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1)
-                : modTypeColour;
+            activeBackgroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Rulesets/UI/ModSwitchTiny.cs b/osu.Game/Rulesets/UI/ModSwitchTiny.cs
index bb121c085c..4d50e702af 100644
--- a/osu.Game/Rulesets/UI/ModSwitchTiny.cs
+++ b/osu.Game/Rulesets/UI/ModSwitchTiny.cs
@@ -112,9 +112,7 @@ namespace osu.Game.Rulesets.UI
             activeBackgroundColour = modTypeColour;
 
             inactiveForegroundColour = colourProvider?.Background2 ?? colours.Gray5;
-            activeForegroundColour = Mod.Type != ModType.System
-                ? Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1)
-                : colours.Yellow;
+            activeForegroundColour = Interpolation.ValueAt<Colour4>(0.1f, Colour4.Black, modTypeColour, 0, 1);
         }
 
         protected override void LoadComplete()

From 9d10d93085cd3cde44d63836911bc607d5618901 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 6 Nov 2023 20:45:52 +0300
Subject: [PATCH 1381/2296] Adjust test scene to see graph flickering

---
 .../Visual/Online/TestSceneGraph.cs           | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneGraph.cs
index 4f19003638..eee29e0aeb 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneGraph.cs
@@ -13,22 +13,20 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public partial class TestSceneGraph : OsuTestScene
     {
+        private readonly BarGraph graph;
+
         public TestSceneGraph()
         {
-            BarGraph graph;
-
-            Children = new[]
+            Child = graph = new BarGraph
             {
-                graph = new BarGraph
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(0.5f),
-                },
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(0.5f),
             };
 
             AddStep("values from 1-10", () => graph.Values = Enumerable.Range(1, 10).Select(i => (float)i));
+            AddStep("small values", () => graph.Values = Enumerable.Range(1, 10).Select(i => i * 0.01f).Concat(new[] { 100f }));
             AddStep("values from 1-100", () => graph.Values = Enumerable.Range(1, 100).Select(i => (float)i));
             AddStep("reversed values from 1-10", () => graph.Values = Enumerable.Range(1, 10).Reverse().Select(i => (float)i));
             AddStep("empty values", () => graph.Values = Array.Empty<float>());
@@ -37,5 +35,12 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Left to right", () => graph.Direction = BarDirection.LeftToRight);
             AddStep("Right to left", () => graph.Direction = BarDirection.RightToLeft);
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            graph.MoveToY(-10, 1000).Then().MoveToY(10, 1000).Loop();
+        }
     }
 }

From 944fee56f8d8e61895882a5c55c9d6ff0e6c637e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 6 Nov 2023 21:48:47 +0300
Subject: [PATCH 1382/2296] Add failing test case

---
 .../TestSceneBeatmapEditorNavigation.cs       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index d0fa5fc737..d9757d8584 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -6,11 +6,15 @@ using NUnit.Framework;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit;
@@ -232,6 +236,35 @@ namespace osu.Game.Tests.Visual.Navigation
                 () => Is.EqualTo(beatmapSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0).ID));
         }
 
+        [Test]
+        public void TestCreateNewDifficultyOnNonExistentBeatmap()
+        {
+            AddUntilStep("wait for dialog overlay", () => Game.ChildrenOfType<DialogOverlay>().SingleOrDefault() != null);
+
+            AddStep("open editor", () => Game.ChildrenOfType<ButtonSystem>().Single().OnEdit.Invoke());
+            AddUntilStep("wait for editor", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.IsLoaded);
+            AddStep("click on file", () =>
+            {
+                var item = getEditor().ChildrenOfType<Menu.DrawableMenuItem>().Single(i => i.Item.Text.Value.ToString() == "File");
+                item.TriggerClick();
+            });
+            AddStep("click on create new difficulty", () =>
+            {
+                var item = getEditor().ChildrenOfType<Menu.DrawableMenuItem>().Single(i => i.Item.Text.Value.ToString() == "Create new difficulty");
+                item.TriggerClick();
+            });
+            AddStep("click on catch", () =>
+            {
+                var item = getEditor().ChildrenOfType<Menu.DrawableMenuItem>().Single(i => i.Item.Text.Value.ToString() == "osu!catch");
+                item.TriggerClick();
+            });
+            AddAssert("save dialog displayed", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog is PromptForSaveDialog);
+
+            AddStep("press forget all changes", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog!.PerformAction<PopupDialogDangerousButton>());
+            AddWaitStep("wait", 5);
+            AddAssert("editor beatmap uses catch ruleset", () => getEditorBeatmap().BeatmapInfo.Ruleset.ShortName == "fruits");
+        }
+
         private EditorBeatmap getEditorBeatmap() => getEditor().ChildrenOfType<EditorBeatmap>().Single();
 
         private Editor getEditor() => (Editor)Game.ScreenStack.CurrentScreen;

From b2749943e27ae31fb392b1bbad918cbd9432412e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 6 Nov 2023 21:52:46 +0300
Subject: [PATCH 1383/2296] Display "required save" popup when creating another
 difficulty on a new beatmap

---
 osu.Game/Screens/Edit/Editor.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 91c3c98f01..3136faf855 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1095,6 +1095,19 @@ namespace osu.Game.Screens.Edit
 
         protected void CreateNewDifficulty(RulesetInfo rulesetInfo)
         {
+            if (isNewBeatmap)
+            {
+                dialogOverlay.Push(new SaveRequiredPopupDialog("This beatmap will be saved in order to create another difficulty.", () =>
+                {
+                    if (!Save())
+                        return;
+
+                    CreateNewDifficulty(rulesetInfo);
+                }));
+
+                return;
+            }
+
             if (!rulesetInfo.Equals(editorBeatmap.BeatmapInfo.Ruleset))
             {
                 switchToNewDifficulty(rulesetInfo, false);

From 38d16f620cdef1ab457ce2b82c5c9d1d91113761 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 6 Nov 2023 21:55:00 +0300
Subject: [PATCH 1384/2296] Alter test case to comply with new behaviour

---
 .../Visual/Navigation/TestSceneBeatmapEditorNavigation.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index d9757d8584..b79b61202b 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -12,9 +12,7 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Database;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Dialog;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit;
@@ -258,10 +256,10 @@ namespace osu.Game.Tests.Visual.Navigation
                 var item = getEditor().ChildrenOfType<Menu.DrawableMenuItem>().Single(i => i.Item.Text.Value.ToString() == "osu!catch");
                 item.TriggerClick();
             });
-            AddAssert("save dialog displayed", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog is PromptForSaveDialog);
+            AddAssert("save dialog displayed", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog is SaveRequiredPopupDialog);
 
-            AddStep("press forget all changes", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog!.PerformAction<PopupDialogDangerousButton>());
-            AddWaitStep("wait", 5);
+            AddStep("press save", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog!.PerformOkAction());
+            AddUntilStep("wait for editor", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.IsLoaded);
             AddAssert("editor beatmap uses catch ruleset", () => getEditorBeatmap().BeatmapInfo.Ruleset.ShortName == "fruits");
         }
 

From d6e7145e1c676ff45eb820f42375500cba43c3a1 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Mon, 6 Nov 2023 20:42:40 +0100
Subject: [PATCH 1385/2296] Add new setting for GameplayDisableTaps

---
 osu.Game/Configuration/OsuConfigManager.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index e3f950ce2c..21079fc092 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -108,6 +108,8 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.MouseDisableWheel, false);
             SetDefault(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay);
 
+            SetDefault(OsuSetting.GameplayDisableTaps, false);
+
             // Graphics
             SetDefault(OsuSetting.ShowFpsDisplay, false);
 
@@ -332,7 +334,7 @@ namespace osu.Game.Configuration
         FadePlayfieldWhenHealthLow,
 
         /// <summary>
-        /// Disables mouse buttons clicks and touchscreen taps during gameplay.
+        /// Disables mouse buttons clicks during gameplay.
         /// </summary>
         MouseDisableButtons,
         MouseDisableWheel,
@@ -412,6 +414,7 @@ namespace osu.Game.Configuration
         EditorLimitedDistanceSnap,
         ReplaySettingsOverlay,
         AutomaticallyDownloadMissingBeatmaps,
-        EditorShowSpeedChanges
+        EditorShowSpeedChanges,
+        GameplayDisableTaps,
     }
 }

From c1967a5cbb640cf296832efec00b392922c398c9 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Mon, 6 Nov 2023 20:43:24 +0100
Subject: [PATCH 1386/2296] Make tests fail

---
 osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
index 2e62689e2c..19340aac15 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
@@ -133,8 +133,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         [Test]
-        public void TestSimpleInput()
+        public void TestSimpleInput([Values] bool disableMouseButtons)
         {
+            // OsuSetting.MouseDisableButtons should not affect touch taps
+            AddStep($"{(disableMouseButtons ? "disable" : "enable")} mouse buttons", () => config.SetValue(OsuSetting.MouseDisableButtons, disableMouseButtons));
+
             beginTouch(TouchSource.Touch1);
 
             assertKeyCounter(1, 0);
@@ -468,7 +471,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestInputWhileMouseButtonsDisabled()
         {
-            AddStep("Disable mouse buttons", () => config.SetValue(OsuSetting.MouseDisableButtons, true));
+            AddStep("Disable gameplay taps", () => config.SetValue(OsuSetting.GameplayDisableTaps, true));
 
             beginTouch(TouchSource.Touch1);
 
@@ -620,6 +623,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("Release all touches", () =>
             {
                 config.SetValue(OsuSetting.MouseDisableButtons, false);
+                config.SetValue(OsuSetting.GameplayDisableTaps, false);
                 foreach (TouchSource source in InputManager.CurrentState.Touch.ActiveSources)
                     InputManager.EndTouch(new Touch(source, osuInputManager.ScreenSpaceDrawQuad.Centre));
             });

From ea357bafddd9970fb2c7f06686e1604b6caca76f Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Mon, 6 Nov 2023 20:53:22 +0100
Subject: [PATCH 1387/2296] Fix tests by using the correct setting for touch
 input

---
 osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs | 8 +++-----
 osu.Game/Rulesets/UI/RulesetInputManager.cs     | 6 ++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs b/osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs
index 5277a1f7d6..994ec024b1 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private readonly OsuInputManager osuInputManager;
 
-        private Bindable<bool> mouseDisabled = null!;
+        private Bindable<bool> tapsDisabled = null!;
 
         public OsuTouchInputMapper(OsuInputManager inputManager)
         {
@@ -43,9 +43,7 @@ namespace osu.Game.Rulesets.Osu.UI
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            // The mouse button disable setting affects touch. It's a bit weird.
-            // This is mostly just doing the same as what is done in RulesetInputManager to match behaviour.
-            mouseDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableButtons);
+            tapsDisabled = config.GetBindable<bool>(OsuSetting.GameplayDisableTaps);
         }
 
         // Required to handle touches outside of the playfield when screen scaling is enabled.
@@ -64,7 +62,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 : OsuAction.LeftButton;
 
             // Ignore any taps which trigger an action which is already handled. But track them for potential positional input in the future.
-            bool shouldResultInAction = osuInputManager.AllowGameplayInputs && !mouseDisabled.Value && trackedTouches.All(t => t.Action != action);
+            bool shouldResultInAction = osuInputManager.AllowGameplayInputs && !tapsDisabled.Value && trackedTouches.All(t => t.Action != action);
 
             // If we can actually accept as an action, check whether this tap was on a circle's receptor.
             // This case gets special handling to allow for empty-space stream tapping.
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 39b83ecca1..eb19368fc8 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -72,6 +72,7 @@ namespace osu.Game.Rulesets.UI
         private void load(OsuConfigManager config)
         {
             mouseDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableButtons);
+            tapsDisabled = config.GetBindable<bool>(OsuSetting.GameplayDisableTaps);
         }
 
         #region Action mapping (for replays)
@@ -124,6 +125,7 @@ namespace osu.Game.Rulesets.UI
         #region Setting application (disables etc.)
 
         private Bindable<bool> mouseDisabled;
+        private Bindable<bool> tapsDisabled;
 
         protected override bool Handle(UIEvent e)
         {
@@ -147,9 +149,9 @@ namespace osu.Game.Rulesets.UI
 
         protected override bool HandleMouseTouchStateChange(TouchStateChangeEvent e)
         {
-            if (mouseDisabled.Value)
+            if (tapsDisabled.Value)
             {
-                // Only propagate positional data when mouse buttons are disabled.
+                // Only propagate positional data when taps are disabled.
                 e = new TouchStateChangeEvent(e.State, e.Input, e.Touch, false, e.LastPosition);
             }
 

From f8b5ecc92a2e303a87a23c218a24c103881cb8c5 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Mon, 6 Nov 2023 21:07:15 +0100
Subject: [PATCH 1388/2296] Update UI to use the new setting

---
 osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs | 2 +-
 osu.Game/Screens/Play/PlayerSettings/InputSettings.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
index b1b1b59429..793b707bfc 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             Add(new SettingsCheckbox
             {
                 LabelText = TouchSettingsStrings.DisableTapsDuringGameplay,
-                Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
+                Current = osuConfig.GetBindable<bool>(OsuSetting.GameplayDisableTaps)
             });
         }
 
diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
index f6b0cddcf1..96b543d176 100644
--- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
@@ -27,6 +27,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config) => mouseButtonsCheckbox.Current = config.GetBindable<bool>(OsuSetting.MouseDisableButtons);
+        private void load(OsuConfigManager config) => mouseButtonsCheckbox.Current = config.GetBindable<bool>(RuntimeInfo.IsDesktop ? OsuSetting.MouseDisableButtons : OsuSetting.GameplayDisableTaps);
     }
 }

From a4ac50cf86f8cbd148eedf75b765c65ad34301b6 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Mon, 6 Nov 2023 21:10:04 +0100
Subject: [PATCH 1389/2296] Revert "Rename popup/binding string to `Toggle
 gameplay clicks/taps`"

This reverts commit 0d8bfedf5d3693809e76471b9feb47ebf140e40b.
---
 osu.Game/Configuration/OsuConfigManager.cs             | 2 +-
 osu.Game/Input/Bindings/GlobalActionContainer.cs       | 2 +-
 osu.Game/Localisation/GlobalActionKeyBindingStrings.cs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 21079fc092..c44a089c49 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Configuration
                 ),
                 new TrackedSetting<bool>(OsuSetting.MouseDisableButtons, disabledState => new SettingDescription(
                     rawValue: !disabledState,
-                    name: GlobalActionKeyBindingStrings.ToggleGameplayClicksTaps,
+                    name: GlobalActionKeyBindingStrings.ToggleGameplayMouseButtons,
                     value: disabledState ? CommonStrings.Disabled.ToLower() : CommonStrings.Enabled.ToLower(),
                     shortcut: LookupKeyBindings(GlobalAction.ToggleGameplayMouseButtons))
                 ),
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index b8163cc3b1..947cd5f54f 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Input.Bindings
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.TakeScreenshot))]
         TakeScreenshot,
 
-        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleGameplayClicksTaps))]
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleGameplayMouseButtons))]
         ToggleGameplayMouseButtons,
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.Back))]
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index 1bbbbdc3bc..8356c480dd 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -70,9 +70,9 @@ namespace osu.Game.Localisation
         public static LocalisableString TakeScreenshot => new TranslatableString(getKey(@"take_screenshot"), @"Take screenshot");
 
         /// <summary>
-        /// "Toggle gameplay clicks/taps"
+        /// "Toggle gameplay mouse buttons"
         /// </summary>
-        public static LocalisableString ToggleGameplayClicksTaps => new TranslatableString(getKey(@"toggle_gameplay_clicks_taps"), @"Toggle gameplay clicks/taps");
+        public static LocalisableString ToggleGameplayMouseButtons => new TranslatableString(getKey(@"toggle_gameplay_mouse_buttons"), @"Toggle gameplay mouse buttons");
 
         /// <summary>
         /// "Back"

From 01e59d134a9b8436404a1c6de4bc5cb07332dfe8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 7 Nov 2023 00:48:51 +0300
Subject: [PATCH 1390/2296] Adjust health bar settings on default components
 initialiser to match new layout

---
 osu.Game/Skinning/ArgonSkin.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 3262812d24..6c4074fd92 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -128,9 +128,11 @@ namespace osu.Game.Skinning
                                     // elements default to beneath the health bar
                                     const float components_x_offset = 50;
 
-                                    health.Anchor = Anchor.TopCentre;
-                                    health.Origin = Anchor.TopCentre;
-                                    health.Y = 15;
+                                    health.Anchor = Anchor.TopLeft;
+                                    health.Origin = Anchor.TopLeft;
+                                    health.BarLength.Value = 0.22f;
+                                    health.BarHeight.Value = 30f;
+                                    health.Position = new Vector2(components_x_offset, 20f);
 
                                     if (scoreWedge != null)
                                     {

From 754e05213c452f1f1ddc1c3485ae9e4270b23979 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 7 Nov 2023 00:53:20 +0300
Subject: [PATCH 1391/2296] Update argon score wedge design

---
 osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs | 43 --------------------
 osu.Game/Skinning/ArgonSkin.cs               |  2 +-
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs b/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs
index dc0130fb8e..fe495b421f 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs
@@ -5,22 +5,13 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Lines;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonScoreWedge : CompositeDrawable, ISerialisableDrawable
     {
-        private SliderPath barPath = null!;
-
-        private const float main_path_radius = 1f;
-
         public bool UsesFixedAnchor { get; set; }
 
         [BackgroundDependencyLoader]
@@ -28,30 +19,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             AutoSizeAxes = Axes.Both;
 
-            const float bar_length = 430 - main_path_radius * 2;
-            const float bar_top = 0;
-            const float bar_bottom = 80;
-            const float curve_start = bar_length - 105;
-            const float curve_end = bar_length - 35;
-
-            const float curve_smoothness = 10;
-
-            Vector2 diagonalDir = (new Vector2(curve_end, bar_top) - new Vector2(curve_start, bar_bottom)).Normalized();
-
-            barPath = new SliderPath(new[]
-            {
-                new PathControlPoint(new Vector2(0, bar_bottom), PathType.Linear),
-                new PathControlPoint(new Vector2(curve_start - curve_smoothness, bar_bottom), PathType.Bezier),
-                new PathControlPoint(new Vector2(curve_start, bar_bottom)),
-                new PathControlPoint(new Vector2(curve_start, bar_bottom) + diagonalDir * curve_smoothness, PathType.Linear),
-                new PathControlPoint(new Vector2(curve_end, bar_top) - diagonalDir * curve_smoothness, PathType.Bezier),
-                new PathControlPoint(new Vector2(curve_end, bar_top)),
-                new PathControlPoint(new Vector2(curve_end + curve_smoothness, bar_top), PathType.Linear),
-                new PathControlPoint(new Vector2(bar_length, bar_top)),
-            });
-
             var vertices = new List<Vector2>();
-            barPath.GetPathToProgress(vertices, 0, 1);
 
             InternalChildren = new Drawable[]
             {
@@ -66,17 +34,6 @@ namespace osu.Game.Screens.Play.HUD
                     WedgeHeight = { Value = 72 },
                     Position = new Vector2(4, 5)
                 },
-                new SmoothPath
-                {
-                    Colour = Color4.White,
-                    PathRadius = 1f,
-                    Vertices = vertices,
-                },
-                new Circle
-                {
-                    Y = bar_bottom - 1.5f + main_path_radius,
-                    Size = new Vector2(300f, 3f),
-                }
             };
         }
     }
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 6c4074fd92..42ab93d3c5 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Skinning
 
                                     if (scoreWedge != null)
                                     {
-                                        scoreWedge.Position = new Vector2(-50, 50);
+                                        scoreWedge.Position = new Vector2(-50, 15);
 
                                         if (score != null)
                                             score.Position = new Vector2(components_x_offset, scoreWedge.Y + 15);

From 4c7db4c2625483d557f1e4b6964579adcb7a0060 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 7 Nov 2023 00:49:22 +0300
Subject: [PATCH 1392/2296] Make score counter right-aligned

---
 osu.Game/Skinning/ArgonSkin.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 42ab93d3c5..e00973f710 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -139,7 +139,10 @@ namespace osu.Game.Skinning
                                         scoreWedge.Position = new Vector2(-50, 15);
 
                                         if (score != null)
-                                            score.Position = new Vector2(components_x_offset, scoreWedge.Y + 15);
+                                        {
+                                            score.Origin = Anchor.TopRight;
+                                            score.Position = new Vector2(components_x_offset + 200, scoreWedge.Y + 30);
+                                        }
 
                                         if (accuracy != null)
                                         {

From ce36884ef05dbe1664e93ef9285abb43b0849067 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 7 Nov 2023 00:54:34 +0300
Subject: [PATCH 1393/2296] Make score wireframes display up to required digits
 count

---
 .../Screens/Play/HUD/ArgonScoreCounter.cs     | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
index 03635f2914..5d40dd81a3 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
@@ -1,9 +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;
 using System.Threading.Tasks;
 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.Sprites;
@@ -19,7 +21,7 @@ namespace osu.Game.Screens.Play.HUD
     public partial class ArgonScoreCounter : GameplayScoreCounter, ISerialisableDrawable
     {
         [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
-        public BindableFloat WireframeOpactiy { get; } = new BindableFloat(0.4f)
+        public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.4f)
         {
             Precision = 0.01f,
             MinValue = 0,
@@ -28,9 +30,12 @@ namespace osu.Game.Screens.Play.HUD
 
         public bool UsesFixedAnchor { get; set; }
 
+        protected override LocalisableString FormatCount(long count) => count.ToLocalisableString();
+
         protected override IHasText CreateText() => new ArgonScoreTextComponent
         {
-            WireframeOpactiy = { BindTarget = WireframeOpactiy },
+            RequiredDisplayDigits = { BindTarget = RequiredDisplayDigits },
+            WireframeOpacity = { BindTarget = WireframeOpacity },
         };
 
         private partial class ArgonScoreTextComponent : CompositeDrawable, IHasText
@@ -38,14 +43,15 @@ namespace osu.Game.Screens.Play.HUD
             private readonly ArgonScoreSpriteText wireframesPart;
             private readonly ArgonScoreSpriteText textPart;
 
-            public IBindable<float> WireframeOpactiy { get; } = new BindableFloat();
+            public IBindable<int> RequiredDisplayDigits { get; } = new BindableInt();
+            public IBindable<float> WireframeOpacity { get; } = new BindableFloat();
 
             public LocalisableString Text
             {
                 get => textPart.Text;
                 set
                 {
-                    wireframesPart.Text = value;
+                    wireframesPart.Text = new string('#', Math.Max(value.ToString().Length, RequiredDisplayDigits.Value));
                     textPart.Text = value;
                 }
             }
@@ -56,15 +62,23 @@ namespace osu.Game.Screens.Play.HUD
 
                 InternalChildren = new[]
                 {
-                    wireframesPart = new ArgonScoreSpriteText(@"wireframes"),
-                    textPart = new ArgonScoreSpriteText(),
+                    wireframesPart = new ArgonScoreSpriteText(@"wireframes")
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                    },
+                    textPart = new ArgonScoreSpriteText
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                    },
                 };
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                WireframeOpactiy.BindValueChanged(v => wireframesPart.Alpha = v.NewValue, true);
+                WireframeOpacity.BindValueChanged(v => wireframesPart.Alpha = v.NewValue, true);
             }
 
             private partial class ArgonScoreSpriteText : OsuSpriteText

From 7c1c62ba8aef898bddaa6c07124a1053251bdf8a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 7 Nov 2023 01:58:26 +0300
Subject: [PATCH 1394/2296] Remove argon combo wedge and update combo counter
 position

---
 osu.Game/Screens/Play/HUD/ArgonComboWedge.cs | 27 --------------------
 osu.Game/Skinning/ArgonSkin.cs               | 21 +++++----------
 2 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/ArgonComboWedge.cs

diff --git a/osu.Game/Screens/Play/HUD/ArgonComboWedge.cs b/osu.Game/Screens/Play/HUD/ArgonComboWedge.cs
deleted file mode 100644
index 6da3727505..0000000000
--- a/osu.Game/Screens/Play/HUD/ArgonComboWedge.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 osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public partial class ArgonComboWedge : CompositeDrawable, ISerialisableDrawable
-    {
-        public bool UsesFixedAnchor { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AutoSizeAxes = Axes.Both;
-
-            InternalChild = new ArgonWedgePiece
-            {
-                WedgeWidth = { Value = 186 },
-                WedgeHeight = { Value = 33 },
-            };
-        }
-    }
-}
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index e00973f710..82c150ced7 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -118,7 +118,6 @@ namespace osu.Game.Skinning
                                 var scoreWedge = container.OfType<ArgonScoreWedge>().FirstOrDefault();
                                 var score = container.OfType<ArgonScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
-                                var comboWedge = container.OfType<ArgonComboWedge>().FirstOrDefault();
                                 var combo = container.OfType<ArgonComboCounter>().FirstOrDefault();
                                 var songProgress = container.OfType<ArgonSongProgress>().FirstOrDefault();
                                 var keyCounter = container.OfType<ArgonKeyCounterDisplay>().FirstOrDefault();
@@ -153,18 +152,6 @@ namespace osu.Game.Skinning
                                         }
                                     }
 
-                                    if (comboWedge != null)
-                                    {
-                                        comboWedge.Position = new Vector2(-12, 130);
-
-                                        if (combo != null)
-                                        {
-                                            combo.Anchor = Anchor.TopLeft;
-                                            combo.Origin = Anchor.TopLeft;
-                                            combo.Position = new Vector2(components_x_offset, comboWedge.Y - 2);
-                                        }
-                                    }
-
                                     var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
 
                                     if (hitError != null)
@@ -199,6 +186,13 @@ namespace osu.Game.Skinning
                                             keyCounter.Origin = Anchor.BottomRight;
                                             keyCounter.Position = new Vector2(-(hitError.Width + padding), -(padding * 2 + song_progress_offset_height));
                                         }
+
+                                        if (combo != null && hitError != null)
+                                        {
+                                            combo.Anchor = Anchor.BottomLeft;
+                                            combo.Origin = Anchor.BottomLeft;
+                                            combo.Position = new Vector2(hitError.Width + padding, -50);
+                                        }
                                     }
                                 }
                             })
@@ -209,7 +203,6 @@ namespace osu.Game.Skinning
                                     new ArgonScoreWedge(),
                                     new ArgonScoreCounter(),
                                     new ArgonAccuracyCounter(),
-                                    new ArgonComboWedge(),
                                     new ArgonComboCounter(),
                                     new BarHitErrorMeter(),
                                     new BarHitErrorMeter(),

From 0dbba13686388559a25558ebbd4a4fd17c858e1d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 7 Nov 2023 01:59:00 +0300
Subject: [PATCH 1395/2296] Split argon score sprite text and update combo
 counter design

---
 .../Screens/Play/HUD/ArgonComboCounter.cs     |  20 ++-
 .../Play/HUD/ArgonCounterTextComponent.cs     | 152 ++++++++++++++++++
 .../Screens/Play/HUD/ArgonScoreCounter.cs     | 106 +-----------
 3 files changed, 167 insertions(+), 111 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs

diff --git a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
index 28c97c53aa..6a7d5ff665 100644
--- a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
@@ -2,28 +2,36 @@
 // 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.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Graphics.Sprites;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonComboCounter : ComboCounter
     {
+        [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
+        public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.4f)
+        {
+            Precision = 0.01f,
+            MinValue = 0,
+            MaxValue = 1,
+        };
+
         [BackgroundDependencyLoader]
         private void load(ScoreProcessor scoreProcessor)
         {
             Current.BindTo(scoreProcessor.Combo);
         }
 
-        protected override OsuSpriteText CreateSpriteText()
-            => base.CreateSpriteText().With(s => s.Font = FontUsage.Default.With(size: 36f));
+        protected override LocalisableString FormatCount(int count) => $@"{count}x";
 
-        protected override LocalisableString FormatCount(int count)
+        protected override IHasText CreateText() => new ArgonCounterTextComponent(Anchor.TopLeft, "COMBO")
         {
-            return $@"{count}x";
-        }
+            WireframeOpacity = { BindTarget = WireframeOpacity },
+        };
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
new file mode 100644
index 0000000000..9545168a46
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
@@ -0,0 +1,152 @@
+// 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.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.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Framework.Text;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonCounterTextComponent : CompositeDrawable, IHasText
+    {
+        private readonly LocalisableString? label;
+
+        private readonly ArgonCounterSpriteText wireframesPart;
+        private readonly ArgonCounterSpriteText textPart;
+
+        public IBindable<int> RequiredDisplayDigits { get; } = new BindableInt();
+        public IBindable<float> WireframeOpacity { get; } = new BindableFloat();
+
+        public LocalisableString Text
+        {
+            get => textPart.Text;
+            set
+            {
+                wireframesPart.Text = new string('#', Math.Max(value.ToString().Count(char.IsDigit), RequiredDisplayDigits.Value));
+                textPart.Text = value;
+            }
+        }
+
+        public ArgonCounterTextComponent(Anchor anchor, LocalisableString? label = null)
+        {
+            Anchor = anchor;
+            Origin = anchor;
+
+            this.label = label;
+
+            wireframesPart = new ArgonCounterSpriteText(@"wireframes")
+            {
+                Anchor = anchor,
+                Origin = anchor,
+            };
+            textPart = new ArgonCounterSpriteText
+            {
+                Anchor = anchor,
+                Origin = anchor,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Alpha = label != null ? 1 : 0,
+                        Text = label.GetValueOrDefault(),
+                        Font = OsuFont.Torus.With(size: 12, weight: FontWeight.Bold),
+                        Colour = colours.Blue0,
+                        Margin = new MarginPadding { Left = 2.5f },
+                    },
+                    new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Children = new[]
+                        {
+                            wireframesPart,
+                            textPart,
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            WireframeOpacity.BindValueChanged(v => wireframesPart.Alpha = v.NewValue, true);
+        }
+
+        private partial class ArgonCounterSpriteText : OsuSpriteText
+        {
+            private readonly string? glyphLookupOverride;
+
+            private GlyphStore glyphStore = null!;
+
+            protected override char FixedWidthReferenceCharacter => '5';
+
+            public ArgonCounterSpriteText(string? glyphLookupOverride = null)
+            {
+                this.glyphLookupOverride = glyphLookupOverride;
+
+                Shadow = false;
+                UseFullGlyphHeight = false;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(ISkinSource skin)
+            {
+                // todo: rename font
+                Font = new FontUsage(@"argon-score", 1, fixedWidth: true);
+                Spacing = new Vector2(-2, 0);
+
+                glyphStore = new GlyphStore(skin, glyphLookupOverride);
+            }
+
+            protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);
+
+            private class GlyphStore : ITexturedGlyphLookupStore
+            {
+                private readonly ISkin skin;
+                private readonly string? glyphLookupOverride;
+
+                public GlyphStore(ISkin skin, string? glyphLookupOverride)
+                {
+                    this.skin = skin;
+                    this.glyphLookupOverride = glyphLookupOverride;
+                }
+
+                public ITexturedCharacterGlyph? Get(string fontName, char character)
+                {
+                    string lookup = glyphLookupOverride ?? character.ToString();
+                    var texture = skin.GetTexture($"{fontName}-{lookup}");
+
+                    if (texture == null)
+                        return null;
+
+                    return new TexturedCharacterGlyph(new CharacterGlyph(character, 0, 0, texture.Width, texture.Height, null), texture, 0.125f);
+                }
+
+                public Task<ITexturedCharacterGlyph?> GetAsync(string fontName, char character) => Task.Run(() => Get(fontName, character));
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
index 5d40dd81a3..636565f181 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
@@ -1,20 +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 System.Threading.Tasks;
-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.Sprites;
 using osu.Framework.Localisation;
-using osu.Framework.Text;
 using osu.Game.Configuration;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -32,107 +25,10 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override LocalisableString FormatCount(long count) => count.ToLocalisableString();
 
-        protected override IHasText CreateText() => new ArgonScoreTextComponent
+        protected override IHasText CreateText() => new ArgonCounterTextComponent(Anchor.TopRight)
         {
             RequiredDisplayDigits = { BindTarget = RequiredDisplayDigits },
             WireframeOpacity = { BindTarget = WireframeOpacity },
         };
-
-        private partial class ArgonScoreTextComponent : CompositeDrawable, IHasText
-        {
-            private readonly ArgonScoreSpriteText wireframesPart;
-            private readonly ArgonScoreSpriteText textPart;
-
-            public IBindable<int> RequiredDisplayDigits { get; } = new BindableInt();
-            public IBindable<float> WireframeOpacity { get; } = new BindableFloat();
-
-            public LocalisableString Text
-            {
-                get => textPart.Text;
-                set
-                {
-                    wireframesPart.Text = new string('#', Math.Max(value.ToString().Length, RequiredDisplayDigits.Value));
-                    textPart.Text = value;
-                }
-            }
-
-            public ArgonScoreTextComponent()
-            {
-                AutoSizeAxes = Axes.Both;
-
-                InternalChildren = new[]
-                {
-                    wireframesPart = new ArgonScoreSpriteText(@"wireframes")
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                    },
-                    textPart = new ArgonScoreSpriteText
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                    },
-                };
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                WireframeOpacity.BindValueChanged(v => wireframesPart.Alpha = v.NewValue, true);
-            }
-
-            private partial class ArgonScoreSpriteText : OsuSpriteText
-            {
-                private readonly string? glyphLookupOverride;
-
-                private GlyphStore glyphStore = null!;
-
-                protected override char FixedWidthReferenceCharacter => '5';
-
-                public ArgonScoreSpriteText(string? glyphLookupOverride = null)
-                {
-                    this.glyphLookupOverride = glyphLookupOverride;
-
-                    Shadow = false;
-                    UseFullGlyphHeight = false;
-                }
-
-                [BackgroundDependencyLoader]
-                private void load(ISkinSource skin)
-                {
-                    Font = new FontUsage(@"argon-score", 1, fixedWidth: true);
-                    Spacing = new Vector2(-2, 0);
-
-                    glyphStore = new GlyphStore(skin, glyphLookupOverride);
-                }
-
-                protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);
-
-                private class GlyphStore : ITexturedGlyphLookupStore
-                {
-                    private readonly ISkin skin;
-                    private readonly string? glyphLookupOverride;
-
-                    public GlyphStore(ISkin skin, string? glyphLookupOverride)
-                    {
-                        this.skin = skin;
-                        this.glyphLookupOverride = glyphLookupOverride;
-                    }
-
-                    public ITexturedCharacterGlyph? Get(string fontName, char character)
-                    {
-                        string lookup = glyphLookupOverride ?? character.ToString();
-                        var texture = skin.GetTexture($"{fontName}-{lookup}");
-
-                        if (texture == null)
-                            return null;
-
-                        return new TexturedCharacterGlyph(new CharacterGlyph(character, 0, 0, texture.Width, texture.Height, null), texture, 0.125f);
-                    }
-
-                    public Task<ITexturedCharacterGlyph?> GetAsync(string fontName, char character) => Task.Run(() => Get(fontName, character));
-                }
-            }
-        }
     }
 }

From 05d941871860fc94db9d92d722d44eb4f190766a Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Tue, 7 Nov 2023 00:13:46 +0100
Subject: [PATCH 1396/2296] Rename setting to `TouchDisableGameplayTaps` for
 better visibility when searching

---
 osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs      | 4 ++--
 osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs            | 2 +-
 osu.Game/Configuration/OsuConfigManager.cs                 | 4 ++--
 osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs | 2 +-
 osu.Game/Rulesets/UI/RulesetInputManager.cs                | 2 +-
 osu.Game/Screens/Play/PlayerSettings/InputSettings.cs      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
index 19340aac15..25fe8170b1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuTouchInput.cs
@@ -471,7 +471,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestInputWhileMouseButtonsDisabled()
         {
-            AddStep("Disable gameplay taps", () => config.SetValue(OsuSetting.GameplayDisableTaps, true));
+            AddStep("Disable gameplay taps", () => config.SetValue(OsuSetting.TouchDisableGameplayTaps, true));
 
             beginTouch(TouchSource.Touch1);
 
@@ -623,7 +623,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("Release all touches", () =>
             {
                 config.SetValue(OsuSetting.MouseDisableButtons, false);
-                config.SetValue(OsuSetting.GameplayDisableTaps, false);
+                config.SetValue(OsuSetting.TouchDisableGameplayTaps, false);
                 foreach (TouchSource source in InputManager.CurrentState.Touch.ActiveSources)
                     InputManager.EndTouch(new Touch(source, osuInputManager.ScreenSpaceDrawQuad.Centre));
             });
diff --git a/osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs b/osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs
index 994ec024b1..e815d7873e 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuTouchInputMapper.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.UI
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            tapsDisabled = config.GetBindable<bool>(OsuSetting.GameplayDisableTaps);
+            tapsDisabled = config.GetBindable<bool>(OsuSetting.TouchDisableGameplayTaps);
         }
 
         // Required to handle touches outside of the playfield when screen scaling is enabled.
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index c44a089c49..6ef55ab919 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.MouseDisableWheel, false);
             SetDefault(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay);
 
-            SetDefault(OsuSetting.GameplayDisableTaps, false);
+            SetDefault(OsuSetting.TouchDisableGameplayTaps, false);
 
             // Graphics
             SetDefault(OsuSetting.ShowFpsDisplay, false);
@@ -415,6 +415,6 @@ namespace osu.Game.Configuration
         ReplaySettingsOverlay,
         AutomaticallyDownloadMissingBeatmaps,
         EditorShowSpeedChanges,
-        GameplayDisableTaps,
+        TouchDisableGameplayTaps,
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
index 793b707bfc..0056de6674 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             Add(new SettingsCheckbox
             {
                 LabelText = TouchSettingsStrings.DisableTapsDuringGameplay,
-                Current = osuConfig.GetBindable<bool>(OsuSetting.GameplayDisableTaps)
+                Current = osuConfig.GetBindable<bool>(OsuSetting.TouchDisableGameplayTaps)
             });
         }
 
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index eb19368fc8..35d05b87c0 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.UI
         private void load(OsuConfigManager config)
         {
             mouseDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableButtons);
-            tapsDisabled = config.GetBindable<bool>(OsuSetting.GameplayDisableTaps);
+            tapsDisabled = config.GetBindable<bool>(OsuSetting.TouchDisableGameplayTaps);
         }
 
         #region Action mapping (for replays)
diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
index 96b543d176..8a6e2759e3 100644
--- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
@@ -27,6 +27,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config) => mouseButtonsCheckbox.Current = config.GetBindable<bool>(RuntimeInfo.IsDesktop ? OsuSetting.MouseDisableButtons : OsuSetting.GameplayDisableTaps);
+        private void load(OsuConfigManager config) => mouseButtonsCheckbox.Current = config.GetBindable<bool>(RuntimeInfo.IsDesktop ? OsuSetting.MouseDisableButtons : OsuSetting.DisableTapsDuringGameplay);
     }
 }

From 7385c3c97bb48b507127dd8709d658788adbaf78 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Tue, 7 Nov 2023 00:17:15 +0100
Subject: [PATCH 1397/2296] Move `InputSettings` children creation code to BDL

- Avoids now obsolete variable name
- Makes changing to touch detection easier (access to session statics in BDL)
---
 .../Play/PlayerSettings/InputSettings.cs      | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
index 8a6e2759e3..1387e01305 100644
--- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
@@ -11,22 +11,23 @@ namespace osu.Game.Screens.Play.PlayerSettings
 {
     public partial class InputSettings : PlayerSettingsGroup
     {
-        private readonly PlayerCheckbox mouseButtonsCheckbox;
-
         public InputSettings()
             : base("Input Settings")
         {
-            Children = new Drawable[]
-            {
-                mouseButtonsCheckbox = new PlayerCheckbox
-                {
-                    // TODO: change to touchscreen detection once https://github.com/ppy/osu/pull/25348 makes it in
-                    LabelText = RuntimeInfo.IsDesktop ? MouseSettingsStrings.DisableClicksDuringGameplay : TouchSettingsStrings.DisableTapsDuringGameplay
-                }
-            };
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config) => mouseButtonsCheckbox.Current = config.GetBindable<bool>(RuntimeInfo.IsDesktop ? OsuSetting.MouseDisableButtons : OsuSetting.DisableTapsDuringGameplay);
+        private void load(OsuConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new PlayerCheckbox
+                {
+                    // TODO: change to touchscreen detection once https://github.com/ppy/osu/pull/25348 makes it in
+                    LabelText = RuntimeInfo.IsDesktop ? MouseSettingsStrings.DisableClicksDuringGameplay : TouchSettingsStrings.DisableTapsDuringGameplay,
+                    Current = config.GetBindable<bool>(RuntimeInfo.IsDesktop ? OsuSetting.MouseDisableButtons : OsuSetting.TouchDisableGameplayTaps)
+                }
+            };
+        }
     }
 }

From 8e8a88cfaf4852d4e80611677cb5948806096704 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Tue, 7 Nov 2023 00:54:15 +0100
Subject: [PATCH 1398/2296] Removed nullable line from Test

---
 osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index f65aff922e..77dcbf069b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.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 NUnit.Framework;

From 0834b79cc7fcb78873e381754f709deba0be4693 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Tue, 7 Nov 2023 00:56:24 +0100
Subject: [PATCH 1399/2296] Renamed method and moved Notifications inside

---
 osu.Game/OsuGame.cs             | 15 ++++++---------
 osu.Game/Screens/Edit/Editor.cs | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a9d4927e33..be1776a330 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -562,18 +562,15 @@ namespace osu.Game
         {
             if (ScreenStack.CurrentScreen is not Editor editor)
             {
-                postNotification(EditorStrings.MustBeInEdit);
+                Schedule(() => Notifications.Post(new SimpleNotification
+            {
+                Icon = FontAwesome.Solid.ExclamationTriangle,
+                    Text = EditorStrings.MustBeInEdit
+            }));
                 return;
             }
 
-            editor.SeekAndSelectHitObjects(timestamp, onError: postNotification);
-            return;
-
-            void postNotification(LocalisableString message) => Schedule(() => Notifications.Post(new SimpleNotification
-            {
-                Icon = FontAwesome.Solid.ExclamationTriangle,
-                Text = message
-            }));
+            editor.HandleTimestamp(timestamp);
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 60d26d9ec0..9e0671e91d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.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.
 
 #nullable disable
@@ -1138,13 +1138,17 @@ namespace osu.Game.Screens.Edit
             loader?.CancelPendingDifficultySwitch();
         }
 
-        public void SeekAndSelectHitObjects(string timestamp, Action<LocalisableString> onError)
+        public void HandleTimestamp(string timestamp)
         {
             string[] groups = EditorTimestampParser.GetRegexGroups(timestamp);
 
             if (groups.Length != 2 || string.IsNullOrEmpty(groups[0]))
             {
-                onError.Invoke(EditorStrings.FailedToProcessTimestamp);
+                Schedule(() => notifications.Post(new SimpleNotification
+                {
+                    Icon = FontAwesome.Solid.ExclamationTriangle,
+                    Text = EditorStrings.FailedToProcessTimestamp
+                }));
                 return;
             }
 
@@ -1156,7 +1160,11 @@ namespace osu.Game.Screens.Edit
             // Limit timestamp link length at 30000 min (50 hr) to avoid parsing issues
             if (timeMinutes.Length > 5 || double.Parse(timeMinutes) > 30_000)
             {
-                onError.Invoke(EditorStrings.TooLongTimestamp);
+                Schedule(() => notifications.Post(new SimpleNotification
+                {
+                    Icon = FontAwesome.Solid.ExclamationTriangle,
+                    Text = EditorStrings.TooLongTimestamp
+                }));
                 return;
             }
 

From 44f127c8a86c9fa381118571c5af5e26f8cf141d Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Tue, 7 Nov 2023 01:02:45 +0100
Subject: [PATCH 1400/2296] Renamed method and made private

---
 .../Edit/Compose/Components/EditorBlueprintContainer.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 60959ca27a..b68a690097 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // This makes sure HitObjects will have active Blueprints ready to display
             // after clicking on an Editor Timestamp/Link
-            Beatmap.SelectedHitObjects.CollectionChanged += SetHitObjectsAlive;
+            Beatmap.SelectedHitObjects.CollectionChanged += keepHitObjectsAlive;
 
             if (Composer != null)
             {
@@ -149,7 +149,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             SelectedItems.AddRange(Beatmap.HitObjects.Except(SelectedItems).ToArray());
         }
 
-        protected void SetHitObjectsAlive(object sender, NotifyCollectionChangedEventArgs e)
+        private void keepHitObjectsAlive(object sender, NotifyCollectionChangedEventArgs e)
         {
             if (e == null || e.Action != NotifyCollectionChangedAction.Add || e.NewItems == null)
                 return;
@@ -180,7 +180,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 Beatmap.HitObjectAdded -= AddBlueprintFor;
                 Beatmap.HitObjectRemoved -= RemoveBlueprintFor;
-                Beatmap.SelectedHitObjects.CollectionChanged -= SetHitObjectsAlive;
+                Beatmap.SelectedHitObjects.CollectionChanged -= keepHitObjectsAlive;
             }
 
             usageEventBuffer?.Dispose();

From aa87e0a44d469bbdfb9abe9bca13ea0323eda774 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Tue, 7 Nov 2023 01:36:58 +0100
Subject: [PATCH 1401/2296] HitObject Selection logic and separation for
 gamemodes + moved time_regex into EditorTimestampParser

---
 .../Edit/ManiaHitObjectComposer.cs            | 19 ++++++-
 .../Edit/OsuHitObjectComposer.cs              | 13 ++++-
 .../Editing/TestSceneOpenEditorTimestamp.cs   | 30 ++++-------
 osu.Game/Online/Chat/MessageFormatter.cs      |  7 +--
 osu.Game/OsuGame.cs                           |  6 +--
 .../Edit/EditorTimestampParser.cs             | 54 +++++--------------
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 13 +++++
 osu.Game/Screens/Edit/Editor.cs               | 50 ++++++++---------
 8 files changed, 95 insertions(+), 97 deletions(-)
 rename osu.Game/{Screens => Rulesets}/Edit/EditorTimestampParser.cs (50%)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index b9db4168f4..d217f04651 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -11,6 +12,7 @@ using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -49,6 +51,21 @@ namespace osu.Game.Rulesets.Mania.Edit
         };
 
         public override string ConvertSelectionToString()
-            => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime).Select(h => $"{h.StartTime}|{h.Column}"));
+            => string.Join(ObjectSeparator, EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime).Select(h => $"{h.StartTime}|{h.Column}"));
+
+        public override bool HandleHitObjectSelection(HitObject hitObject, string objectInfo)
+        {
+            if (hitObject is not ManiaHitObject maniaHitObject)
+                return false;
+
+            double[] split = objectInfo.Split('|').Select(double.Parse).ToArray();
+            if (split.Length != 2)
+                return false;
+
+            double timeValue = split[0];
+            double columnValue = split[1];
+            return Math.Abs(maniaHitObject.StartTime - timeValue) < 0.5
+                   && Math.Abs(maniaHitObject.Column - columnValue) < 0.5;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 0f8c960b65..0c63cf71d8 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -104,7 +104,18 @@ namespace osu.Game.Rulesets.Osu.Edit
             => new OsuBlueprintContainer(this);
 
         public override string ConvertSelectionToString()
-            => string.Join(',', selectedHitObjects.Cast<OsuHitObject>().OrderBy(h => h.StartTime).Select(h => (h.IndexInCurrentCombo + 1).ToString()));
+            => string.Join(ObjectSeparator, selectedHitObjects.Cast<OsuHitObject>().OrderBy(h => h.StartTime).Select(h => (h.IndexInCurrentCombo + 1).ToString()));
+
+        public override bool HandleHitObjectSelection(HitObject hitObject, string objectInfo)
+        {
+            if (hitObject is not OsuHitObject osuHitObject)
+                return false;
+
+            if (!int.TryParse(objectInfo, out int comboValue) || comboValue < 1)
+                return false;
+
+            return osuHitObject.IndexInCurrentCombo + 1 == comboValue;
+        }
 
         private DistanceSnapGrid distanceSnapGrid;
         private Container distanceSnapGridContainer;
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index 77dcbf069b..f7b976702a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
@@ -29,11 +29,14 @@ namespace osu.Game.Tests.Visual.Editing
         protected EditorBeatmap EditorBeatmap => Editor.ChildrenOfType<EditorBeatmap>().Single();
         protected EditorClock EditorClock => Editor.ChildrenOfType<EditorClock>().Single();
 
-        protected void AddStepClickLink(string timestamp, string step = "")
+        protected void AddStepClickLink(string timestamp, string step = "", bool waitForSeek = true)
         {
             AddStep($"{step} {timestamp}", () =>
                 Game.HandleLink(new LinkDetails(LinkAction.OpenEditorTimestamp, timestamp))
             );
+
+            if (waitForSeek)
+                AddUntilStep("wait for seek", () => EditorClock.SeekingOrStopped.Value);
         }
 
         protected void AddStepScreenModeTo(EditorScreenMode screenMode)
@@ -76,7 +79,7 @@ namespace osu.Game.Tests.Visual.Editing
                               .Any();
         }
 
-        private bool checkSnapAndSelectColumn(double startTime, IReadOnlyCollection<(int, int)> columnPairs = null)
+        private bool checkSnapAndSelectColumn(double startTime, IReadOnlyCollection<(int, int)>? columnPairs = null)
         {
             bool checkColumns = columnPairs != null
                 ? EditorBeatmap.SelectedHitObjects.All(x => columnPairs.Any(col => isNoteAt(x, col.Item1, col.Item2)))
@@ -123,7 +126,7 @@ namespace osu.Game.Tests.Visual.Editing
         {
             RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
 
-            AddStepClickLink("00:00:000");
+            AddStepClickLink("00:00:000", waitForSeek: false);
             AddAssert("recieved 'must be in edit'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 1
             );
@@ -131,7 +134,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
             AddAssert("entered song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
 
-            AddStepClickLink("00:00:000 (1)");
+            AddStepClickLink("00:00:000 (1)", waitForSeek: false);
             AddAssert("recieved 'must be in edit'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 2
             );
@@ -139,27 +142,12 @@ namespace osu.Game.Tests.Visual.Editing
             SetUpEditor(rulesetInfo);
             AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
-            AddStepClickLink("00:000", "invalid link");
+            AddStepClickLink("00:000", "invalid link", waitForSeek: false);
             AddAssert("recieved 'failed to process'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 1
             );
 
-            AddStepClickLink("00:00:00:000", "invalid link");
-            AddAssert("recieved 'failed to process'", () =>
-                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 2
-            );
-
-            AddStepClickLink("00:00:000 ()", "invalid link");
-            AddAssert("recieved 'failed to process'", () =>
-                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 3
-            );
-
-            AddStepClickLink("00:00:000 (-1)", "invalid link");
-            AddAssert("recieved 'failed to process'", () =>
-                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 4
-            );
-
-            AddStepClickLink("50000:00:000", "too long link");
+            AddStepClickLink("50000:00:000", "too long link", waitForSeek: false);
             AddAssert("recieved 'too long'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.TooLongTimestamp) == 1
             );
diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 667175117f..9a194dba47 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets.Edit;
 
 namespace osu.Game.Online.Chat
 {
@@ -41,10 +42,6 @@ namespace osu.Game.Online.Chat
             @"(?:#(?:[a-z0-9$_\+!\*\',;:\(\)@&=\/~-]|%[0-9a-f]{2})*)?)?)",
             RegexOptions.IgnoreCase);
 
-        // 00:00:000 (1,2,3) - test
-        // regex from https://github.com/ppy/osu-web/blob/651a9bac2b60d031edd7e33b8073a469bf11edaa/resources/assets/coffee/_classes/beatmap-discussion-helper.coffee#L10
-        private static readonly Regex time_regex = new Regex(@"\b(((\d{2,}):([0-5]\d)[:.](\d{3}))(\s\((?:\d+[,|])*\d+\))?)");
-
         // #osu
         private static readonly Regex channel_regex = new Regex(@"(#[a-zA-Z]+[a-zA-Z0-9]+)");
 
@@ -274,7 +271,7 @@ namespace osu.Game.Online.Chat
             handleAdvanced(advanced_link_regex, result, startIndex);
 
             // handle editor times
-            handleMatches(time_regex, "{0}", $@"{OsuGameBase.OSU_PROTOCOL}edit/{{0}}", result, startIndex, LinkAction.OpenEditorTimestamp);
+            handleMatches(EditorTimestampParser.TIME_REGEX, "{0}", $@"{OsuGameBase.OSU_PROTOCOL}edit/{{0}}", result, startIndex, LinkAction.OpenEditorTimestamp);
 
             // handle channels
             handleMatches(channel_regex, "{0}", $@"{OsuGameBase.OSU_PROTOCOL}chan/{{0}}", result, startIndex, LinkAction.OpenChannel);
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index be1776a330..cde8ee1457 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -563,10 +563,10 @@ namespace osu.Game
             if (ScreenStack.CurrentScreen is not Editor editor)
             {
                 Schedule(() => Notifications.Post(new SimpleNotification
-            {
-                Icon = FontAwesome.Solid.ExclamationTriangle,
+                {
+                    Icon = FontAwesome.Solid.ExclamationTriangle,
                     Text = EditorStrings.MustBeInEdit
-            }));
+                }));
                 return;
             }
 
diff --git a/osu.Game/Screens/Edit/EditorTimestampParser.cs b/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
similarity index 50%
rename from osu.Game/Screens/Edit/EditorTimestampParser.cs
rename to osu.Game/Rulesets/Edit/EditorTimestampParser.cs
index 2d8f8a8f4c..4e5a696102 100644
--- a/osu.Game/Screens/Edit/EditorTimestampParser.cs
+++ b/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
@@ -7,41 +7,43 @@ using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Types;
 
-namespace osu.Game.Screens.Edit
+namespace osu.Game.Rulesets.Edit
 {
     public static class EditorTimestampParser
     {
-        private static readonly Regex timestamp_regex = new Regex(@"^(\d+:\d+:\d+)(?: \((\d+(?:[|,]\d+)*)\))?$", RegexOptions.Compiled);
+        // 00:00:000 (1,2,3) - test
+        // regex from https://github.com/ppy/osu-web/blob/651a9bac2b60d031edd7e33b8073a469bf11edaa/resources/assets/coffee/_classes/beatmap-discussion-helper.coffee#L10
+        public static readonly Regex TIME_REGEX = new Regex(@"\b(((\d{2,}):([0-5]\d)[:.](\d{3}))(\s\((?:\d+[,|])*\d+\))?)");
 
         public static string[] GetRegexGroups(string timestamp)
         {
-            Match match = timestamp_regex.Match(timestamp);
-            return match.Success
-                ? match.Groups.Values.Where(x => x is not Match).Select(x => x.Value).ToArray()
+            Match match = TIME_REGEX.Match(timestamp);
+            string[] result = match.Success
+                ? match.Groups.Values.Where(x => x is not Match && !x.Value.Contains(':')).Select(x => x.Value).ToArray()
                 : Array.Empty<string>();
+            return result;
         }
 
-        public static double GetTotalMilliseconds(string timeGroup)
+        public static double GetTotalMilliseconds(params string[] timesGroup)
         {
-            int[] times = timeGroup.Split(':').Select(int.Parse).ToArray();
+            int[] times = timesGroup.Select(int.Parse).ToArray();
 
             Debug.Assert(times.Length == 3);
 
             return (times[0] * 60 + times[1]) * 1_000 + times[2];
         }
 
-        public static List<HitObject> GetSelectedHitObjects(IReadOnlyList<HitObject> editorHitObjects, string objectsGroup, double position)
+        public static List<HitObject> GetSelectedHitObjects(HitObjectComposer composer, IReadOnlyList<HitObject> editorHitObjects, string objectsGroup, double position)
         {
             List<HitObject> hitObjects = editorHitObjects.Where(x => x.StartTime >= position).ToList();
             List<HitObject> selectedObjects = new List<HitObject>();
 
-            string[] objectsToSelect = objectsGroup.Split(',').ToArray();
+            string[] objectsToSelect = objectsGroup.Split(composer.ObjectSeparator).ToArray();
 
             foreach (string objectInfo in objectsToSelect)
             {
-                HitObject? current = hitObjects.FirstOrDefault(x => shouldHitObjectBeSelected(x, objectInfo));
+                HitObject? current = hitObjects.FirstOrDefault(x => composer.HandleHitObjectSelection(x, objectInfo));
 
                 if (current == null)
                     continue;
@@ -67,35 +69,5 @@ namespace osu.Game.Screens.Edit
 
             return selectedObjects;
         }
-
-        private static bool shouldHitObjectBeSelected(HitObject hitObject, string objectInfo)
-        {
-            switch (hitObject)
-            {
-                // (combo)
-                case IHasComboInformation comboInfo:
-                {
-                    if (!double.TryParse(objectInfo, out double comboValue) || comboValue < 1)
-                        return false;
-
-                    return comboInfo.IndexInCurrentCombo + 1 == comboValue;
-                }
-
-                // (time|column)
-                case IHasColumn column:
-                {
-                    double[] split = objectInfo.Split('|').Select(double.Parse).ToArray();
-                    if (split.Length != 2)
-                        return false;
-
-                    double timeValue = split[0];
-                    double columnValue = split[1];
-                    return hitObject.StartTime == timeValue && column.Column == columnValue;
-                }
-
-                default:
-                    return false;
-            }
-        }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 07e5869e28..f6cddcc0d2 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -528,6 +528,19 @@ namespace osu.Game.Rulesets.Edit
 
         public virtual string ConvertSelectionToString() => string.Empty;
 
+        /// <summary>
+        /// The custom logic that decides whether a HitObject should be selected when clicking an editor timestamp link
+        /// </summary>
+        /// <param name="hitObject">The hitObject being checked</param>
+        /// <param name="objectInfo">A single hitObject's information created with <see cref="ConvertSelectionToString"/></param>
+        /// <returns>Whether a HitObject should be selected or not</returns>
+        public virtual bool HandleHitObjectSelection(HitObject hitObject, string objectInfo) => false;
+
+        /// <summary>
+        /// A character that separates the selection in <see cref="ConvertSelectionToString"/>
+        /// </summary>
+        public virtual char ObjectSeparator => ',';
+
         #region IPositionSnapProvider
 
         public abstract SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition, SnapType snapType = SnapType.All);
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 9e0671e91d..592e6625cc 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.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.
 
 #nullable disable
@@ -14,6 +14,7 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -1142,7 +1143,7 @@ namespace osu.Game.Screens.Edit
         {
             string[] groups = EditorTimestampParser.GetRegexGroups(timestamp);
 
-            if (groups.Length != 2 || string.IsNullOrEmpty(groups[0]))
+            if (groups.Length != 4 || string.IsNullOrEmpty(groups[0]))
             {
                 Schedule(() => notifications.Post(new SimpleNotification
                 {
@@ -1152,13 +1153,14 @@ namespace osu.Game.Screens.Edit
                 return;
             }
 
-            string timeGroup = groups[0];
-            string objectsGroup = groups[1];
-            string timeMinutes = timeGroup.Split(':').FirstOrDefault() ?? string.Empty;
+            string timeMin = groups[0];
+            string timeSec = groups[1];
+            string timeMss = groups[2];
+            string objectsGroup = groups[3].Replace("(", "").Replace(")", "").Trim();
 
             // Currently, lazer chat highlights infinite-long editor links like `10000000000:00:000 (1)`
             // Limit timestamp link length at 30000 min (50 hr) to avoid parsing issues
-            if (timeMinutes.Length > 5 || double.Parse(timeMinutes) > 30_000)
+            if (string.IsNullOrEmpty(timeMin) || timeMin.Length > 5 || double.Parse(timeMin) > 30_000)
             {
                 Schedule(() => notifications.Post(new SimpleNotification
                 {
@@ -1168,38 +1170,36 @@ namespace osu.Game.Screens.Edit
                 return;
             }
 
-            double position = EditorTimestampParser.GetTotalMilliseconds(timeGroup);
-
             editorBeatmap.SelectedHitObjects.Clear();
 
-            // Only seeking is necessary
+            double position = EditorTimestampParser.GetTotalMilliseconds(timeMin, timeSec, timeMss);
+
             if (string.IsNullOrEmpty(objectsGroup))
             {
-                if (clock.IsRunning)
-                    clock.Stop();
-
-                clock.Seek(position);
+                clock.SeekSmoothlyTo(position);
                 return;
             }
 
+            // Seek to the next closest HitObject instead
+            HitObject nextObject = editorBeatmap.HitObjects.FirstOrDefault(x => x.StartTime >= position);
+
+            if (nextObject != null)
+                position = nextObject.StartTime;
+
+            clock.SeekSmoothlyTo(position);
+
             if (Mode.Value != EditorScreenMode.Compose)
                 Mode.Value = EditorScreenMode.Compose;
 
-            // Seek to the next closest HitObject
-            HitObject nextObject = editorBeatmap.HitObjects.FirstOrDefault(x => x.StartTime >= position);
-
-            if (nextObject != null && nextObject.StartTime > 0)
-                position = nextObject.StartTime;
-
-            List<HitObject> selected = EditorTimestampParser.GetSelectedHitObjects(editorBeatmap.HitObjects.ToList(), objectsGroup, position);
+            List<HitObject> selected = EditorTimestampParser.GetSelectedHitObjects(
+                currentScreen.Dependencies.Get<HitObjectComposer>(),
+                editorBeatmap.HitObjects.ToList(),
+                objectsGroup,
+                position
+            );
 
             if (selected.Any())
                 editorBeatmap.SelectedHitObjects.AddRange(selected);
-
-            if (clock.IsRunning)
-                clock.Stop();
-
-            clock.Seek(position);
         }
 
         public double SnapTime(double time, double? referenceTime) => editorBeatmap.SnapTime(time, referenceTime);

From bdbeb2bce4286122584e0c7f9dff61bdc5d57ca1 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Tue, 7 Nov 2023 11:11:32 +0100
Subject: [PATCH 1402/2296] Renamed CollectionChanged event handler

---
 .../Edit/Compose/Components/EditorBlueprintContainer.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index b68a690097..a311054ffc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // This makes sure HitObjects will have active Blueprints ready to display
             // after clicking on an Editor Timestamp/Link
-            Beatmap.SelectedHitObjects.CollectionChanged += keepHitObjectsAlive;
+            Beatmap.SelectedHitObjects.CollectionChanged += selectionChanged;
 
             if (Composer != null)
             {
@@ -149,7 +149,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             SelectedItems.AddRange(Beatmap.HitObjects.Except(SelectedItems).ToArray());
         }
 
-        private void keepHitObjectsAlive(object sender, NotifyCollectionChangedEventArgs e)
+        private void selectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             if (e == null || e.Action != NotifyCollectionChangedAction.Add || e.NewItems == null)
                 return;
@@ -180,7 +180,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 Beatmap.HitObjectAdded -= AddBlueprintFor;
                 Beatmap.HitObjectRemoved -= RemoveBlueprintFor;
-                Beatmap.SelectedHitObjects.CollectionChanged -= keepHitObjectsAlive;
+                Beatmap.SelectedHitObjects.CollectionChanged -= selectionChanged;
             }
 
             usageEventBuffer?.Dispose();

From 38c9a98e67e421a965d5979425ace752517e63e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Nov 2023 10:52:48 +0900
Subject: [PATCH 1403/2296] Add failing test coverage

---
 .../TestSceneResumeOverlay.cs                 | 34 +++++++++++++++++--
 osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs  |  8 ++---
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
index 49a8254f53..25d0b0a3d3 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneResumeOverlay.cs
@@ -1,16 +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 System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Gameplay;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -54,9 +58,13 @@ namespace osu.Game.Rulesets.Osu.Tests
         [SetUp]
         public void SetUp() => Schedule(loadContent);
 
-        [Test]
-        public void TestResume()
+        [TestCase(1)]
+        [TestCase(0.5f)]
+        [TestCase(2)]
+        public void TestResume(float cursorSize)
         {
+            AddStep($"set cursor size to {cursorSize}", () => localConfig.SetValue(OsuSetting.GameplayCursorSize, cursorSize));
+
             AddStep("move mouse to center", () => InputManager.MoveMouseTo(ScreenSpaceDrawQuad.Centre));
             AddStep("show", () => resume.Show());
 
@@ -64,7 +72,27 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("click", () => osuInputManager.GameClick());
             AddAssert("not dismissed", () => !resumeFired && resume.State.Value == Visibility.Visible);
 
-            AddStep("move mouse back", () => InputManager.MoveMouseTo(ScreenSpaceDrawQuad.Centre));
+            AddStep("move mouse just out of range", () =>
+            {
+                var resumeOverlay = this.ChildrenOfType<OsuResumeOverlay>().Single();
+                var resumeOverlayCursor = resumeOverlay.ChildrenOfType<OsuResumeOverlay.OsuClickToResumeCursor>().Single();
+
+                Vector2 offset = resumeOverlay.ToScreenSpace(new Vector2(OsuCursor.SIZE / 2)) - resumeOverlay.ToScreenSpace(Vector2.Zero);
+                InputManager.MoveMouseTo(resumeOverlayCursor.ScreenSpaceDrawQuad.Centre - offset - new Vector2(1));
+            });
+
+            AddStep("click", () => osuInputManager.GameClick());
+            AddAssert("not dismissed", () => !resumeFired && resume.State.Value == Visibility.Visible);
+
+            AddStep("move mouse just within range", () =>
+            {
+                var resumeOverlay = this.ChildrenOfType<OsuResumeOverlay>().Single();
+                var resumeOverlayCursor = resumeOverlay.ChildrenOfType<OsuResumeOverlay.OsuClickToResumeCursor>().Single();
+
+                Vector2 offset = resumeOverlay.ToScreenSpace(new Vector2(OsuCursor.SIZE / 2)) - resumeOverlay.ToScreenSpace(Vector2.Zero);
+                InputManager.MoveMouseTo(resumeOverlayCursor.ScreenSpaceDrawQuad.Centre - offset + new Vector2(1));
+            });
+
             AddStep("click", () => osuInputManager.GameClick());
             AddAssert("dismissed", () => resumeFired && resume.State.Value == Visibility.Hidden);
         }
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
index ab1bb0cf5a..8215201d43 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 {
     public partial class OsuCursor : SkinReloadableDrawable
     {
-        private const float size = 28;
+        public const float SIZE = 28;
 
         private const float pressed_scale = 1.2f;
         private const float released_scale = 1f;
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         {
             Origin = Anchor.Centre;
 
-            Size = new Vector2(size);
+            Size = new Vector2(SIZE);
         }
 
         [BackgroundDependencyLoader]
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                         Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,
                         Masking = true,
-                        BorderThickness = size / 6,
+                        BorderThickness = SIZE / 6,
                         BorderColour = Color4.White,
                         EdgeEffect = new EdgeEffectParameters
                         {
@@ -156,7 +156,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                                 Anchor = Anchor.Centre,
                                 RelativeSizeAxes = Axes.Both,
                                 Masking = true,
-                                BorderThickness = size / 3,
+                                BorderThickness = SIZE / 3,
                                 BorderColour = Color4.White.Opacity(0.5f),
                                 Children = new Drawable[]
                                 {

From 544d5d1d86416a179de9c6badd7833a8e53ca518 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Tue, 7 Nov 2023 12:23:22 +0100
Subject: [PATCH 1404/2296] Forgot a clock.Stop call

---
 osu.Game/Screens/Edit/Editor.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 592e6625cc..58c3ae809c 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1145,7 +1145,7 @@ namespace osu.Game.Screens.Edit
 
             if (groups.Length != 4 || string.IsNullOrEmpty(groups[0]))
             {
-                Schedule(() => notifications.Post(new SimpleNotification
+                Schedule(() => notifications?.Post(new SimpleNotification
                 {
                     Icon = FontAwesome.Solid.ExclamationTriangle,
                     Text = EditorStrings.FailedToProcessTimestamp
@@ -1162,7 +1162,7 @@ namespace osu.Game.Screens.Edit
             // Limit timestamp link length at 30000 min (50 hr) to avoid parsing issues
             if (string.IsNullOrEmpty(timeMin) || timeMin.Length > 5 || double.Parse(timeMin) > 30_000)
             {
-                Schedule(() => notifications.Post(new SimpleNotification
+                Schedule(() => notifications?.Post(new SimpleNotification
                 {
                     Icon = FontAwesome.Solid.ExclamationTriangle,
                     Text = EditorStrings.TooLongTimestamp
@@ -1172,6 +1172,9 @@ namespace osu.Game.Screens.Edit
 
             editorBeatmap.SelectedHitObjects.Clear();
 
+            if (clock.IsRunning)
+                clock.Stop();
+
             double position = EditorTimestampParser.GetTotalMilliseconds(timeMin, timeSec, timeMss);
 
             if (string.IsNullOrEmpty(objectsGroup))

From 81caa854e6a7ba3251658f1cd174bf6bad62b1ea Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Tue, 7 Nov 2023 13:02:46 +0100
Subject: [PATCH 1405/2296] Separate Test cases by relevant rulesets

---
 .../TestSceneOpenEditorTimestampInMania.cs    | 102 +++++++
 .../TestSceneOpenEditorTimestampInOsu.cs      | 110 ++++++++
 .../Editing/TestSceneOpenEditorTimestamp.cs   | 249 ++++--------------
 3 files changed, 259 insertions(+), 202 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs
new file mode 100644
index 0000000000..6ec5dcee4c
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.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 System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests.Editor
+{
+    public partial class TestSceneOpenEditorTimestampInMania : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new ManiaRuleset();
+
+        private void addStepClickLink(string timestamp, string step = "", bool displayTimestamp = true)
+        {
+            AddStep(displayTimestamp ? $"{step} {timestamp}" : step, () => Editor.HandleTimestamp(timestamp));
+            AddUntilStep("wait for seek", () => EditorClock.SeekingOrStopped.Value);
+        }
+
+        private void addReset()
+        {
+            addStepClickLink("00:00:000", "reset", false);
+        }
+
+        private bool checkSnapAndSelectColumn(double startTime, IReadOnlyCollection<(int, int)>? columnPairs = null)
+        {
+            bool checkColumns = columnPairs != null
+                ? EditorBeatmap.SelectedHitObjects.All(x => columnPairs.Any(col => isNoteAt(x, col.Item1, col.Item2)))
+                : !EditorBeatmap.SelectedHitObjects.Any();
+
+            return EditorClock.CurrentTime == startTime
+                   && EditorBeatmap.SelectedHitObjects.Count == (columnPairs?.Count ?? 0)
+                   && checkColumns;
+        }
+
+        private bool isNoteAt(HitObject hitObject, double time, int column)
+        {
+            return hitObject is ManiaHitObject maniaHitObject
+                   && maniaHitObject.StartTime == time
+                   && maniaHitObject.Column == column;
+        }
+
+        [Test]
+        public void TestNormalSelection()
+        {
+            addStepClickLink("00:05:920 (5920|3,6623|3,6857|2,7326|1)");
+            AddAssert("selected group", () => checkSnapAndSelectColumn(5_920, new List<(int, int)>
+                { (5_920, 3), (6_623, 3), (6_857, 2), (7_326, 1) }
+            ));
+
+            addReset();
+            addStepClickLink("00:42:716 (42716|3,43420|2,44123|0,44357|1,45295|1)");
+            AddAssert("selected ungrouped", () => checkSnapAndSelectColumn(42_716, new List<(int, int)>
+                { (42_716, 3), (43_420, 2), (44_123, 0), (44_357, 1), (45_295, 1) }
+            ));
+
+            addReset();
+            AddStep("add notes to row", () =>
+            {
+                if (EditorBeatmap.HitObjects.Any(x => x is ManiaHitObject m && m.StartTime == 11_545 && m.Column is 1 or 2 or 3))
+                    return;
+
+                ManiaHitObject first = (ManiaHitObject)EditorBeatmap.HitObjects.First(x => x is ManiaHitObject m && m.StartTime == 11_545 && m.Column == 0);
+                ManiaHitObject second = new Note { Column = 1, StartTime = first.StartTime };
+                ManiaHitObject third = new Note { Column = 2, StartTime = first.StartTime };
+                ManiaHitObject forth = new Note { Column = 3, StartTime = first.StartTime };
+                EditorBeatmap.AddRange(new[] { second, third, forth });
+            });
+            addStepClickLink("00:11:545 (11545|0,11545|1,11545|2,11545|3)");
+            AddAssert("selected in row", () => checkSnapAndSelectColumn(11_545, new List<(int, int)>
+                { (11_545, 0), (11_545, 1), (11_545, 2), (11_545, 3) }
+            ));
+
+            addReset();
+            addStepClickLink("01:36:623 (96623|1,97560|1,97677|1,97795|1,98966|1)");
+            AddAssert("selected in column", () => checkSnapAndSelectColumn(96_623, new List<(int, int)>
+                { (96_623, 1), (97_560, 1), (97_677, 1), (97_795, 1), (98_966, 1) }
+            ));
+        }
+
+        [Test]
+        public void TestUnusualSelection()
+        {
+            addStepClickLink("00:00:000 (0|1)", "invalid link");
+            AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(2_170));
+
+            addReset();
+            addStepClickLink("00:00:000 (0)", "std link");
+            AddAssert("snap and select 1", () => checkSnapAndSelectColumn(2_170, new List<(int, int)>
+                { (2_170, 2) })
+            );
+
+            addReset();
+            // TODO: discuss - this selects the first 2 objects on Stable, do we want that or is this fine?
+            addStepClickLink("00:00:000 (1,2)", "std link");
+            AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(2_170));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs
new file mode 100644
index 0000000000..d69f482d29
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.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 System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    public partial class TestSceneOpenEditorTimestampInOsu : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        private void addStepClickLink(string timestamp, string step = "", bool displayTimestamp = true)
+        {
+            AddStep(displayTimestamp ? $"{step} {timestamp}" : step, () => Editor.HandleTimestamp(timestamp));
+            AddUntilStep("wait for seek", () => EditorClock.SeekingOrStopped.Value);
+        }
+
+        private void addReset()
+        {
+            addStepClickLink("00:00:000", "reset", false);
+        }
+
+        private bool checkSnapAndSelectCombo(double startTime, params int[] comboNumbers)
+        {
+            bool checkCombos = comboNumbers.Any()
+                ? hasCombosInOrder(EditorBeatmap.SelectedHitObjects, comboNumbers)
+                : !EditorBeatmap.SelectedHitObjects.Any();
+
+            return EditorClock.CurrentTime == startTime
+                   && EditorBeatmap.SelectedHitObjects.Count == comboNumbers.Length
+                   && checkCombos;
+        }
+
+        private bool hasCombosInOrder(IEnumerable<HitObject> selected, params int[] comboNumbers)
+        {
+            List<HitObject> hitObjects = selected.ToList();
+            if (hitObjects.Count != comboNumbers.Length)
+                return false;
+
+            return !hitObjects.Select(x => (OsuHitObject)x)
+                              .Where((x, i) => x.IndexInCurrentCombo + 1 != comboNumbers[i])
+                              .Any();
+        }
+
+        [Test]
+        public void TestNormalSelection()
+        {
+            addStepClickLink("00:02:170 (1,2,3)");
+            AddAssert("snap and select 1-2-3", () => checkSnapAndSelectCombo(2_170, 1, 2, 3));
+
+            addReset();
+            addStepClickLink("00:04:748 (2,3,4,1,2)");
+            AddAssert("snap and select 2-3-4-1-2", () => checkSnapAndSelectCombo(4_748, 2, 3, 4, 1, 2));
+
+            addReset();
+            addStepClickLink("00:02:170 (1,1,1)");
+            AddAssert("snap and select 1-1-1", () => checkSnapAndSelectCombo(2_170, 1, 1, 1));
+
+            addReset();
+            addStepClickLink("00:02:873 (2,2,2,2)");
+            AddAssert("snap and select 2-2-2-2", () => checkSnapAndSelectCombo(2_873, 2, 2, 2, 2));
+        }
+
+        [Test]
+        public void TestUnusualSelection()
+        {
+            HitObject firstObject = null!;
+
+            addStepClickLink("00:00:000 (1,2,3)", "invalid offset");
+            AddAssert("snap to next, select 1-2-3", () =>
+            {
+                firstObject = EditorBeatmap.HitObjects.First();
+                return checkSnapAndSelectCombo(firstObject.StartTime, 1, 2, 3);
+            });
+
+            addReset();
+            addStepClickLink("00:00:956 (2,3,4)", "invalid offset");
+            AddAssert("snap to next, select 2-3-4", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3, 4));
+
+            addReset();
+            addStepClickLink("00:00:000 (0)", "invalid offset");
+            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
+
+            addReset();
+            addStepClickLink("00:00:000 (1)", "invalid offset");
+            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
+
+            addReset();
+            addStepClickLink("00:00:000 (2)", "invalid offset");
+            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
+
+            addReset();
+            addStepClickLink("00:00:000 (2,3)", "invalid offset");
+            AddAssert("snap to 1, select 2-3", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3));
+
+            addReset();
+            addStepClickLink("00:00:956 (956|1,956|2)", "mania link");
+            AddAssert("snap to next, select none", () => checkSnapAndSelectCombo(firstObject.StartTime));
+
+            addReset();
+            addStepClickLink("00:00:000 (0|1)", "mania link");
+            AddAssert("snap to 1, select none", () => checkSnapAndSelectCombo(firstObject.StartTime));
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index f7b976702a..bc31924e2c 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.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.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Extensions;
@@ -12,9 +11,6 @@ using osu.Game.Database;
 using osu.Game.Localisation;
 using osu.Game.Online.Chat;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mania;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Menu;
@@ -25,79 +21,39 @@ namespace osu.Game.Tests.Visual.Editing
 {
     public partial class TestSceneOpenEditorTimestamp : OsuGameTestScene
     {
-        protected Editor Editor => (Editor)Game.ScreenStack.CurrentScreen;
-        protected EditorBeatmap EditorBeatmap => Editor.ChildrenOfType<EditorBeatmap>().Single();
-        protected EditorClock EditorClock => Editor.ChildrenOfType<EditorClock>().Single();
+        private Editor editor => (Editor)Game.ScreenStack.CurrentScreen;
+        private EditorBeatmap editorBeatmap => editor.ChildrenOfType<EditorBeatmap>().Single();
+        private EditorClock editorClock => editor.ChildrenOfType<EditorClock>().Single();
 
-        protected void AddStepClickLink(string timestamp, string step = "", bool waitForSeek = true)
+        private void addStepClickLink(string timestamp, string step = "", bool waitForSeek = true)
         {
             AddStep($"{step} {timestamp}", () =>
                 Game.HandleLink(new LinkDetails(LinkAction.OpenEditorTimestamp, timestamp))
             );
 
             if (waitForSeek)
-                AddUntilStep("wait for seek", () => EditorClock.SeekingOrStopped.Value);
+                AddUntilStep("wait for seek", () => editorClock.SeekingOrStopped.Value);
         }
 
-        protected void AddStepScreenModeTo(EditorScreenMode screenMode)
+        private void addStepScreenModeTo(EditorScreenMode screenMode)
         {
-            AddStep("change screen to " + screenMode, () => Editor.Mode.Value = screenMode);
+            AddStep("change screen to " + screenMode, () => editor.Mode.Value = screenMode);
         }
 
-        protected void AssertOnScreenAt(EditorScreenMode screen, double time, string text = "stayed in")
+        private void assertOnScreenAt(EditorScreenMode screen, double time, string text = "stayed in")
         {
             AddAssert($"{text} {screen} at {time}", () =>
-                Editor.Mode.Value == screen
-                && EditorClock.CurrentTime == time
+                editor.Mode.Value == screen
+                && editorClock.CurrentTime == time
             );
         }
 
-        protected void AssertMovedScreenTo(EditorScreenMode screen, string text = "moved to")
+        private void assertMovedScreenTo(EditorScreenMode screen, string text = "moved to")
         {
-            AddAssert($"{text} {screen}", () => Editor.Mode.Value == screen);
+            AddAssert($"{text} {screen}", () => editor.Mode.Value == screen);
         }
 
-        private bool checkSnapAndSelectCombo(double startTime, params int[] comboNumbers)
-        {
-            bool checkCombos = comboNumbers.Any()
-                ? hasCombosInOrder(EditorBeatmap.SelectedHitObjects, comboNumbers)
-                : !EditorBeatmap.SelectedHitObjects.Any();
-
-            return EditorClock.CurrentTime == startTime
-                   && EditorBeatmap.SelectedHitObjects.Count == comboNumbers.Length
-                   && checkCombos;
-        }
-
-        private bool hasCombosInOrder(IEnumerable<HitObject> selected, params int[] comboNumbers)
-        {
-            List<HitObject> hitObjects = selected.ToList();
-            if (hitObjects.Count != comboNumbers.Length)
-                return false;
-
-            return !hitObjects.Select(x => (IHasComboInformation)x)
-                              .Where((combo, i) => combo.IndexInCurrentCombo + 1 != comboNumbers[i])
-                              .Any();
-        }
-
-        private bool checkSnapAndSelectColumn(double startTime, IReadOnlyCollection<(int, int)>? columnPairs = null)
-        {
-            bool checkColumns = columnPairs != null
-                ? EditorBeatmap.SelectedHitObjects.All(x => columnPairs.Any(col => isNoteAt(x, col.Item1, col.Item2)))
-                : !EditorBeatmap.SelectedHitObjects.Any();
-
-            return EditorClock.CurrentTime == startTime
-                   && EditorBeatmap.SelectedHitObjects.Count == (columnPairs?.Count ?? 0)
-                   && checkColumns;
-        }
-
-        private bool isNoteAt(HitObject hitObject, double time, int column)
-        {
-            return hitObject is IHasColumn columnInfo
-                   && hitObject.StartTime == time
-                   && columnInfo.Column == column;
-        }
-
-        protected void SetUpEditor(RulesetInfo ruleset)
+        private void setUpEditor(RulesetInfo ruleset)
         {
             BeatmapSetInfo beatmapSet = null!;
 
@@ -118,7 +74,7 @@ namespace osu.Game.Tests.Visual.Editing
                 ((PlaySongSelect)Game.ScreenStack.CurrentScreen)
                 .Edit(beatmapSet.Beatmaps.Last(beatmap => beatmap.Ruleset.Name == ruleset.Name))
             );
-            AddUntilStep("Wait for editor open", () => Editor.ReadyForUse);
+            AddUntilStep("Wait for editor open", () => editor.ReadyForUse);
         }
 
         [Test]
@@ -126,7 +82,7 @@ namespace osu.Game.Tests.Visual.Editing
         {
             RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
 
-            AddStepClickLink("00:00:000", waitForSeek: false);
+            addStepClickLink("00:00:000", waitForSeek: false);
             AddAssert("recieved 'must be in edit'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 1
             );
@@ -134,20 +90,20 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
             AddAssert("entered song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
 
-            AddStepClickLink("00:00:000 (1)", waitForSeek: false);
+            addStepClickLink("00:00:000 (1)", waitForSeek: false);
             AddAssert("recieved 'must be in edit'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 2
             );
 
-            SetUpEditor(rulesetInfo);
-            AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
+            setUpEditor(rulesetInfo);
+            AddAssert("is editor Osu", () => editorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
-            AddStepClickLink("00:000", "invalid link", waitForSeek: false);
+            addStepClickLink("00:000", "invalid link", waitForSeek: false);
             AddAssert("recieved 'failed to process'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 1
             );
 
-            AddStepClickLink("50000:00:000", "too long link", waitForSeek: false);
+            addStepClickLink("50000:00:000", "too long link", waitForSeek: false);
             AddAssert("recieved 'too long'", () =>
                 Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.TooLongTimestamp) == 1
             );
@@ -159,156 +115,45 @@ namespace osu.Game.Tests.Visual.Editing
             const long long_link_value = 1_000 * 60 * 1_000;
             RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
 
-            SetUpEditor(rulesetInfo);
-            AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
+            setUpEditor(rulesetInfo);
+            AddAssert("is editor Osu", () => editorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
-            AddStepClickLink("1000:00:000", "long link");
+            addStepClickLink("1000:00:000", "long link");
             AddAssert("moved to end of track", () =>
-                EditorClock.CurrentTime == long_link_value
-                || (EditorClock.TrackLength < long_link_value && EditorClock.CurrentTime == EditorClock.TrackLength)
+                editorClock.CurrentTime == long_link_value
+                || (editorClock.TrackLength < long_link_value && editorClock.CurrentTime == editorClock.TrackLength)
             );
 
-            AddStepScreenModeTo(EditorScreenMode.SongSetup);
-            AddStepClickLink("00:00:000");
-            AssertOnScreenAt(EditorScreenMode.SongSetup, 0);
+            addStepScreenModeTo(EditorScreenMode.SongSetup);
+            addStepClickLink("00:00:000");
+            assertOnScreenAt(EditorScreenMode.SongSetup, 0);
 
-            AddStepClickLink("00:05:000 (0|0)");
-            AssertMovedScreenTo(EditorScreenMode.Compose);
+            addStepClickLink("00:05:000 (0|0)");
+            assertMovedScreenTo(EditorScreenMode.Compose);
 
-            AddStepScreenModeTo(EditorScreenMode.Design);
-            AddStepClickLink("00:10:000");
-            AssertOnScreenAt(EditorScreenMode.Design, 10_000);
+            addStepScreenModeTo(EditorScreenMode.Design);
+            addStepClickLink("00:10:000");
+            assertOnScreenAt(EditorScreenMode.Design, 10_000);
 
-            AddStepClickLink("00:15:000 (1)");
-            AssertMovedScreenTo(EditorScreenMode.Compose);
+            addStepClickLink("00:15:000 (1)");
+            assertMovedScreenTo(EditorScreenMode.Compose);
 
-            AddStepScreenModeTo(EditorScreenMode.Timing);
-            AddStepClickLink("00:20:000");
-            AssertOnScreenAt(EditorScreenMode.Timing, 20_000);
+            addStepScreenModeTo(EditorScreenMode.Timing);
+            addStepClickLink("00:20:000");
+            assertOnScreenAt(EditorScreenMode.Timing, 20_000);
 
-            AddStepClickLink("00:25:000 (0,1)");
-            AssertMovedScreenTo(EditorScreenMode.Compose);
+            addStepClickLink("00:25:000 (0,1)");
+            assertMovedScreenTo(EditorScreenMode.Compose);
 
-            AddStepScreenModeTo(EditorScreenMode.Verify);
-            AddStepClickLink("00:30:000");
-            AssertOnScreenAt(EditorScreenMode.Verify, 30_000);
+            addStepScreenModeTo(EditorScreenMode.Verify);
+            addStepClickLink("00:30:000");
+            assertOnScreenAt(EditorScreenMode.Verify, 30_000);
 
-            AddStepClickLink("00:35:000 (0,1)");
-            AssertMovedScreenTo(EditorScreenMode.Compose);
+            addStepClickLink("00:35:000 (0,1)");
+            assertMovedScreenTo(EditorScreenMode.Compose);
 
-            AddStepClickLink("00:00:000");
-            AssertOnScreenAt(EditorScreenMode.Compose, 0);
-        }
-
-        [Test]
-        public void TestSelectionForOsu()
-        {
-            HitObject firstObject = null!;
-            RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
-
-            SetUpEditor(rulesetInfo);
-            AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
-
-            AddStepClickLink("00:00:956 (1,2,3)");
-            AddAssert("snap and select 1-2-3", () =>
-            {
-                firstObject = EditorBeatmap.HitObjects.First();
-                return checkSnapAndSelectCombo(firstObject.StartTime, 1, 2, 3);
-            });
-
-            AddStepClickLink("00:01:450 (2,3,4,1,2)");
-            AddAssert("snap and select 2-3-4-1-2", () => checkSnapAndSelectCombo(1_450, 2, 3, 4, 1, 2));
-
-            AddStepClickLink("00:00:956 (1,1,1)");
-            AddAssert("snap and select 1-1-1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1, 1, 1));
-        }
-
-        [Test]
-        public void TestUnusualSelectionForOsu()
-        {
-            HitObject firstObject = null!;
-            RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
-
-            SetUpEditor(rulesetInfo);
-            AddAssert("is editor Osu", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
-
-            AddStepClickLink("00:00:000 (1,2,3)", "invalid offset");
-            AddAssert("snap to next, select 1-2-3", () =>
-            {
-                firstObject = EditorBeatmap.HitObjects.First();
-                return checkSnapAndSelectCombo(firstObject.StartTime, 1, 2, 3);
-            });
-
-            AddStepClickLink("00:00:956 (2,3,4)", "invalid offset");
-            AddAssert("snap to next, select 2-3-4", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3, 4));
-
-            AddStepClickLink("00:00:000 (0)", "invalid offset");
-            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
-
-            AddStepClickLink("00:00:000 (1)", "invalid offset");
-            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
-
-            AddStepClickLink("00:00:000 (2)", "invalid offset");
-            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
-
-            AddStepClickLink("00:00:000 (2,3)", "invalid offset");
-            AddAssert("snap to 1, select 2-3", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3));
-
-            AddStepClickLink("00:00:956 (956|1,956|2)", "mania link");
-            AddAssert("snap to next, select none", () => checkSnapAndSelectCombo(firstObject.StartTime));
-
-            AddStepClickLink("00:00:000 (0|1)", "mania link");
-            AddAssert("snap to 1, select none", () => checkSnapAndSelectCombo(firstObject.StartTime));
-        }
-
-        [Test]
-        public void TestSelectionForMania()
-        {
-            RulesetInfo rulesetInfo = new ManiaRuleset().RulesetInfo;
-
-            SetUpEditor(rulesetInfo);
-            AddAssert("is editor Mania", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
-
-            AddStepClickLink("00:11:010 (11010|1,11175|5,11258|3,11340|5,11505|1)");
-            AddAssert("selected group", () => checkSnapAndSelectColumn(11010, new List<(int, int)>
-                { (11010, 1), (11175, 5), (11258, 3), (11340, 5), (11505, 1) }
-            ));
-
-            AddStepClickLink("00:00:956 (956|1,956|6,1285|3,1780|4)");
-            AddAssert("selected ungrouped", () => checkSnapAndSelectColumn(956, new List<(int, int)>
-                { (956, 1), (956, 6), (1285, 3), (1780, 4) }
-            ));
-
-            AddStepClickLink("02:36:560 (156560|1,156560|4,156560|6)");
-            AddAssert("selected in row", () => checkSnapAndSelectColumn(156560, new List<(int, int)>
-                { (156560, 1), (156560, 4), (156560, 6) }
-            ));
-
-            AddStepClickLink("00:35:736 (35736|3,36395|3,36725|3,37384|3)");
-            AddAssert("selected in column", () => checkSnapAndSelectColumn(35736, new List<(int, int)>
-                { (35736, 3), (36395, 3), (36725, 3), (37384, 3) }
-            ));
-        }
-
-        [Test]
-        public void TestUnusualSelectionForMania()
-        {
-            RulesetInfo rulesetInfo = new ManiaRuleset().RulesetInfo;
-
-            SetUpEditor(rulesetInfo);
-            AddAssert("is editor Mania", () => EditorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
-
-            AddStepClickLink("00:00:000 (0|1)", "invalid link");
-            AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(956));
-
-            AddStepClickLink("00:00:000 (0)", "std link");
-            AddAssert("snap and select 1", () => checkSnapAndSelectColumn(956, new List<(int, int)>
-                { (956, 1) })
-            );
-
-            // TODO: discuss - this selects the first 2 objects on Stable, do we want that or is this fine?
-            AddStepClickLink("00:00:000 (1,2)", "std link");
-            AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(956));
+            addStepClickLink("00:00:000");
+            assertOnScreenAt(EditorScreenMode.Compose, 0);
         }
     }
 }

From fcd73e62d2f98472e66524913c5f58fa2499d4f2 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Tue, 7 Nov 2023 13:06:14 +0100
Subject: [PATCH 1406/2296] Remove mobile specific changes

Will be added back in a separate PR
---
 osu.Android/OsuGameAndroid.cs                         |  3 ---
 .../Overlays/Settings/Sections/Input/TouchSettings.cs | 11 ++++-------
 osu.Game/Screens/Play/PlayerSettings/InputSettings.cs |  5 ++---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index e4b934a387..97a9848a12 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -98,9 +98,6 @@ namespace osu.Android
                 case AndroidJoystickHandler jh:
                     return new AndroidJoystickSettings(jh);
 
-                case AndroidTouchHandler:
-                    return new TouchSettings(handler);
-
                 default:
                     return base.CreateSettingsSubsectionFor(handler);
             }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
index 0056de6674..30a0b1b785 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
@@ -29,14 +29,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig)
         {
-            if (!RuntimeInfo.IsMobile) // don't allow disabling the only input method (touch) on mobile.
+            Add(new SettingsCheckbox
             {
-                Add(new SettingsCheckbox
-                {
-                    LabelText = CommonStrings.Enabled,
-                    Current = handler.Enabled
-                });
-            }
+                LabelText = CommonStrings.Enabled,
+                Current = handler.Enabled
+            });
 
             Add(new SettingsCheckbox
             {
diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
index 1387e01305..47af4e0b53 100644
--- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
@@ -23,9 +23,8 @@ namespace osu.Game.Screens.Play.PlayerSettings
             {
                 new PlayerCheckbox
                 {
-                    // TODO: change to touchscreen detection once https://github.com/ppy/osu/pull/25348 makes it in
-                    LabelText = RuntimeInfo.IsDesktop ? MouseSettingsStrings.DisableClicksDuringGameplay : TouchSettingsStrings.DisableTapsDuringGameplay,
-                    Current = config.GetBindable<bool>(RuntimeInfo.IsDesktop ? OsuSetting.MouseDisableButtons : OsuSetting.TouchDisableGameplayTaps)
+                    LabelText = MouseSettingsStrings.DisableClicksDuringGameplay,
+                    Current = config.GetBindable<bool>(OsuSetting.MouseDisableButtons)
                 }
             };
         }

From 7bedf7cf165e1a9a125eb74af636dca957e8fc0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Nov 2023 21:08:49 +0900
Subject: [PATCH 1407/2296] Move static method to end of file

---
 osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
index 8215201d43..ba9fda25e4 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
@@ -84,12 +84,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             calculateCursorScale();
         }
 
-        /// <summary>
-        /// Get the scale applicable to the ActiveCursor based on a beatmap's circle size.
-        /// </summary>
-        public static float GetScaleForCircleSize(float circleSize) =>
-            1f - 0.7f * (1f + circleSize - BeatmapDifficulty.DEFAULT_DIFFICULTY) / BeatmapDifficulty.DEFAULT_DIFFICULTY;
-
         private void calculateCursorScale()
         {
             float scale = userCursorScale.Value;
@@ -117,6 +111,12 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         public void Contract() => expandTarget.ScaleTo(released_scale, 400, Easing.OutQuad);
 
+        /// <summary>
+        /// Get the scale applicable to the ActiveCursor based on a beatmap's circle size.
+        /// </summary>
+        public static float GetScaleForCircleSize(float circleSize) =>
+            1f - 0.7f * (1f + circleSize - BeatmapDifficulty.DEFAULT_DIFFICULTY) / BeatmapDifficulty.DEFAULT_DIFFICULTY;
+
         private partial class DefaultCursor : OsuCursorSprite
         {
             public DefaultCursor()

From 00268d0ccce3691e682f7ae2ff08cb6a9a1f88f8 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Tue, 7 Nov 2023 13:09:30 +0100
Subject: [PATCH 1408/2296] Remove unused using

---
 osu.Android/OsuGameAndroid.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 97a9848a12..dea70e6b27 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -11,7 +11,6 @@ using osu.Framework.Input.Handlers;
 using osu.Framework.Platform;
 using osu.Game;
 using osu.Game.Overlays.Settings;
-using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Updater;
 using osu.Game.Utils;
 

From 02d9f005d09df3bd755a337a7d63c3ef4353d8b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Nov 2023 21:27:02 +0900
Subject: [PATCH 1409/2296] Update squirrel to latest release

Quite a few fixes since our last update. See https://github.com/clowd/Clowd.Squirrel/releases.

Of special note is [a fix for incomplete updates](https://github.com/clowd/Clowd.Squirrel/issues/182)
which I believe we've seen cause issues in the wild before.
---
 osu.Desktop/osu.Desktop.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 1d43e118a3..f37cfdc5f1 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -23,7 +23,7 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Clowd.Squirrel" Version="2.9.42" />
+    <PackageReference Include="Clowd.Squirrel" Version="2.10.2" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="7.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />

From 3e257f1e6c02795c6bbb6bf08f542707e8e6e827 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 7 Nov 2023 23:21:51 +0900
Subject: [PATCH 1410/2296] Remove unused using statements

---
 osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs | 1 -
 osu.Game/Screens/Play/PlayerSettings/InputSettings.cs      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
index 30a0b1b785..175fcc4709 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Input.Handlers;
 using osu.Framework.Localisation;
diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
index 47af4e0b53..852fbd8dcc 100644
--- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.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;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;

From b092b0093affc97453d4f14be7b7a68005d5ae31 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 6 Nov 2023 21:13:36 +0300
Subject: [PATCH 1411/2296] Make sure bar draw quad is thick enough

---
 osu.Game/Graphics/UserInterface/BarGraph.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/BarGraph.cs b/osu.Game/Graphics/UserInterface/BarGraph.cs
index 27a41eb7e3..d3eebd71f0 100644
--- a/osu.Game/Graphics/UserInterface/BarGraph.cs
+++ b/osu.Game/Graphics/UserInterface/BarGraph.cs
@@ -145,6 +145,13 @@ namespace osu.Game.Graphics.UserInterface
                     float barHeight = drawSize.Y * ((direction == BarDirection.TopToBottom || direction == BarDirection.BottomToTop) ? lengths[i] : barBreadth);
                     float barWidth = drawSize.X * ((direction == BarDirection.LeftToRight || direction == BarDirection.RightToLeft) ? lengths[i] : barBreadth);
 
+                    if (barHeight == 0 || barWidth == 0)
+                        continue;
+
+                    // Make sure draw quad is thick enough
+                    barHeight = Math.Max(barHeight, 1.5f);
+                    barWidth = Math.Max(barWidth, 1.5f);
+
                     Vector2 topLeft;
 
                     switch (direction)

From cbea2db4bef9322b8dcbe9619d95cb918dcc3b55 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 7 Nov 2023 02:03:16 +0300
Subject: [PATCH 1412/2296] Support absolute-sized health bar and use it for
 default layout

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 30 +++++++++++++------
 osu.Game/Skinning/ArgonSkin.cs                |  3 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 793d43f7ef..2ae6bdcb15 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -36,12 +36,10 @@ namespace osu.Game.Screens.Play.HUD
         };
 
         [SettingSource("Bar length")]
-        public BindableFloat BarLength { get; } = new BindableFloat(0.98f)
-        {
-            MinValue = 0.2f,
-            MaxValue = 1,
-            Precision = 0.01f,
-        };
+        public BindableFloat BarLength { get; } = new BindableFloat(0.98f);
+
+        [SettingSource("Use relative size")]
+        public BindableBool UseRelativeSize { get; } = new BindableBool(true);
 
         private BarPath mainBar = null!;
 
@@ -140,9 +138,23 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(_ => Scheduler.AddOnce(updateCurrent), true);
 
-            BarLength.BindValueChanged(l => Width = l.NewValue, true);
-            BarHeight.BindValueChanged(_ => updatePath());
-            updatePath();
+            // update relative axes first before reading width from bar length.
+            RelativeSizeAxes = UseRelativeSize.Value ? Axes.X : Axes.None;
+            Width = BarLength.Value;
+
+            UseRelativeSize.BindValueChanged(v =>
+            {
+                RelativeSizeAxes = v.NewValue ? Axes.X : Axes.None;
+                float newWidth = Width;
+
+                BarLength.MinValue = v.NewValue ? 0.2f : 200f;
+                BarLength.MaxValue = v.NewValue ? 1f : 1000f;
+                BarLength.Precision = v.NewValue ? 0.01f : 1f;
+                BarLength.Value = newWidth;
+            }, true);
+
+            BarLength.ValueChanged += l => Width = l.NewValue;
+            BarHeight.BindValueChanged(_ => updatePath(), true);
         }
 
         protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 82c150ced7..95e1820059 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -129,7 +129,8 @@ namespace osu.Game.Skinning
 
                                     health.Anchor = Anchor.TopLeft;
                                     health.Origin = Anchor.TopLeft;
-                                    health.BarLength.Value = 0.22f;
+                                    health.UseRelativeSize.Value = false;
+                                    health.BarLength.Value = 300;
                                     health.BarHeight.Value = 30f;
                                     health.Position = new Vector2(components_x_offset, 20f);
 

From e6d3085353886da1a196f6d0354eae86ba9469fa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 8 Nov 2023 01:48:21 +0300
Subject: [PATCH 1413/2296] Update accuracy counter design

---
 .../Screens/Play/HUD/ArgonAccuracyCounter.cs  | 20 +++++++++++++++----
 .../Play/HUD/ArgonCounterTextComponent.cs     |  8 ++++----
 osu.Game/Skinning/ArgonSkin.cs                | 14 ++++++-------
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
index 33223a526b..0414cbaea4 100644
--- a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
@@ -1,18 +1,30 @@
 // 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.Game.Graphics;
-using osu.Game.Graphics.Sprites;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonAccuracyCounter : GameplayAccuracyCounter, ISerialisableDrawable
     {
+        [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
+        public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.4f)
+        {
+            Precision = 0.01f,
+            MinValue = 0,
+            MaxValue = 1,
+        };
+
         public bool UsesFixedAnchor { get; set; }
 
-        protected override OsuSpriteText CreateSpriteText()
-            => base.CreateSpriteText().With(s => s.Font = OsuFont.Default.With(size: 19.2f));
+        protected override IHasText CreateText() => new ArgonCounterTextComponent(Anchor.TopLeft, "ACCURACY", new Vector2(-4, 0))
+        {
+            WireframeOpacity = { BindTarget = WireframeOpacity },
+        };
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
index 9545168a46..fcad0f12d8 100644
--- a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        public ArgonCounterTextComponent(Anchor anchor, LocalisableString? label = null)
+        public ArgonCounterTextComponent(Anchor anchor, LocalisableString? label = null, Vector2? spacing = null)
         {
             Anchor = anchor;
             Origin = anchor;
@@ -49,11 +49,13 @@ namespace osu.Game.Screens.Play.HUD
             {
                 Anchor = anchor,
                 Origin = anchor,
+                Spacing = spacing ?? new Vector2(-2, 0),
             };
             textPart = new ArgonCounterSpriteText
             {
                 Anchor = anchor,
                 Origin = anchor,
+                Spacing = spacing ?? new Vector2(-2, 0),
             };
         }
 
@@ -115,9 +117,7 @@ namespace osu.Game.Screens.Play.HUD
             private void load(ISkinSource skin)
             {
                 // todo: rename font
-                Font = new FontUsage(@"argon-score", 1, fixedWidth: true);
-                Spacing = new Vector2(-2, 0);
-
+                Font = new FontUsage(@"argon-score", 1);
                 glyphStore = new GlyphStore(skin, glyphLookupOverride);
             }
 
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 95e1820059..2af3a29804 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -143,14 +143,14 @@ namespace osu.Game.Skinning
                                             score.Origin = Anchor.TopRight;
                                             score.Position = new Vector2(components_x_offset + 200, scoreWedge.Y + 30);
                                         }
+                                    }
 
-                                        if (accuracy != null)
-                                        {
-                                            // +4 to vertically align the accuracy counter with the score counter.
-                                            accuracy.Position = new Vector2(components_x_offset + 4, scoreWedge.Y + 45);
-                                            accuracy.Anchor = Anchor.TopLeft;
-                                            accuracy.Origin = Anchor.TopLeft;
-                                        }
+                                    if (accuracy != null)
+                                    {
+                                        // +4 to vertically align the accuracy counter with the score counter.
+                                        accuracy.Position = new Vector2(-20, 20);
+                                        accuracy.Anchor = Anchor.TopRight;
+                                        accuracy.Origin = Anchor.TopRight;
                                     }
 
                                     var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();

From d30bac3f49af02f2473e9c1a71aacbdb8f42dd4e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 8 Nov 2023 01:49:13 +0300
Subject: [PATCH 1414/2296] Move "required display digits" feature to reside in
 argon score counter

---
 .../Screens/Play/HUD/ArgonCounterTextComponent.cs |  7 +++----
 osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs    | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
index fcad0f12d8..437a627cbc 100644
--- a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.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 System;
-using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -25,7 +23,6 @@ namespace osu.Game.Screens.Play.HUD
         private readonly ArgonCounterSpriteText wireframesPart;
         private readonly ArgonCounterSpriteText textPart;
 
-        public IBindable<int> RequiredDisplayDigits { get; } = new BindableInt();
         public IBindable<float> WireframeOpacity { get; } = new BindableFloat();
 
         public LocalisableString Text
@@ -33,7 +30,7 @@ namespace osu.Game.Screens.Play.HUD
             get => textPart.Text;
             set
             {
-                wireframesPart.Text = new string('#', Math.Max(value.ToString().Count(char.IsDigit), RequiredDisplayDigits.Value));
+                wireframesPart.Text = FormatWireframes(value);
                 textPart.Text = value;
             }
         }
@@ -91,6 +88,8 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
+        protected virtual LocalisableString FormatWireframes(LocalisableString text) => text;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
index 636565f181..fef4199d31 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.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 osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
@@ -25,10 +26,22 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override LocalisableString FormatCount(long count) => count.ToLocalisableString();
 
-        protected override IHasText CreateText() => new ArgonCounterTextComponent(Anchor.TopRight)
+        protected override IHasText CreateText() => new ArgonScoreTextComponent(Anchor.TopRight)
         {
             RequiredDisplayDigits = { BindTarget = RequiredDisplayDigits },
             WireframeOpacity = { BindTarget = WireframeOpacity },
         };
+
+        private partial class ArgonScoreTextComponent : ArgonCounterTextComponent
+        {
+            public IBindable<int> RequiredDisplayDigits { get; } = new BindableInt();
+
+            public ArgonScoreTextComponent(Anchor anchor, LocalisableString? label = null)
+                : base(anchor, label)
+            {
+            }
+
+            protected override LocalisableString FormatWireframes(LocalisableString text) => new string('#', Math.Max(text.ToString().Length, RequiredDisplayDigits.Value));
+        }
     }
 }

From fdc714a248d1a9283649d12a11a14e7763bfa1dc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 8 Nov 2023 02:05:19 +0300
Subject: [PATCH 1415/2296] Support percentages and ignore dot characters in
 wireframes part

---
 .../Play/HUD/ArgonCounterTextComponent.cs     | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
index 437a627cbc..3d8546e0e3 100644
--- a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.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.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -42,13 +43,28 @@ namespace osu.Game.Screens.Play.HUD
 
             this.label = label;
 
-            wireframesPart = new ArgonCounterSpriteText(@"wireframes")
+            wireframesPart = new ArgonCounterSpriteText(c =>
+            {
+                if (c == '.')
+                    return @"dot";
+
+                return @"wireframes";
+            })
             {
                 Anchor = anchor,
                 Origin = anchor,
                 Spacing = spacing ?? new Vector2(-2, 0),
             };
-            textPart = new ArgonCounterSpriteText
+            textPart = new ArgonCounterSpriteText(c =>
+            {
+                if (c == '.')
+                    return @"dot";
+
+                if (c == '%')
+                    return @"percentage";
+
+                return c.ToString();
+            })
             {
                 Anchor = anchor,
                 Origin = anchor,
@@ -98,15 +114,15 @@ namespace osu.Game.Screens.Play.HUD
 
         private partial class ArgonCounterSpriteText : OsuSpriteText
         {
-            private readonly string? glyphLookupOverride;
+            private readonly Func<char, string> getLookup;
 
             private GlyphStore glyphStore = null!;
 
             protected override char FixedWidthReferenceCharacter => '5';
 
-            public ArgonCounterSpriteText(string? glyphLookupOverride = null)
+            public ArgonCounterSpriteText(Func<char, string> getLookup)
             {
-                this.glyphLookupOverride = glyphLookupOverride;
+                this.getLookup = getLookup;
 
                 Shadow = false;
                 UseFullGlyphHeight = false;
@@ -117,7 +133,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 // todo: rename font
                 Font = new FontUsage(@"argon-score", 1);
-                glyphStore = new GlyphStore(skin, glyphLookupOverride);
+                glyphStore = new GlyphStore(skin, getLookup);
             }
 
             protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);
@@ -125,17 +141,17 @@ namespace osu.Game.Screens.Play.HUD
             private class GlyphStore : ITexturedGlyphLookupStore
             {
                 private readonly ISkin skin;
-                private readonly string? glyphLookupOverride;
+                private readonly Func<char, string> getLookup;
 
-                public GlyphStore(ISkin skin, string? glyphLookupOverride)
+                public GlyphStore(ISkin skin, Func<char, string> getLookup)
                 {
                     this.skin = skin;
-                    this.glyphLookupOverride = glyphLookupOverride;
+                    this.getLookup = getLookup;
                 }
 
                 public ITexturedCharacterGlyph? Get(string fontName, char character)
                 {
-                    string lookup = glyphLookupOverride ?? character.ToString();
+                    string lookup = getLookup(character);
                     var texture = skin.GetTexture($"{fontName}-{lookup}");
 
                     if (texture == null)

From 4de5454538b0dff1b8b4a020a7f12fcb294ccc06 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 8 Nov 2023 02:06:51 +0300
Subject: [PATCH 1416/2296] Bring back left-side line next to health display

Makes the score counter not look weird when it reaches 8 digits
---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    |  9 +++---
 .../Screens/Play/HUD/ArgonHealthRightLine.cs  | 30 +++++++++++++++++++
 osu.Game/Skinning/ArgonSkin.cs                |  4 +++
 3 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ArgonHealthRightLine.cs

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 2ae6bdcb15..b2b3181d08 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -90,12 +90,11 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private const float main_path_radius = 10f;
+        public const float MAIN_PATH_RADIUS = 10f;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
             InternalChild = new Container
@@ -105,7 +104,7 @@ namespace osu.Game.Screens.Play.HUD
                 {
                     background = new BackgroundPath
                     {
-                        PathRadius = main_path_radius,
+                        PathRadius = MAIN_PATH_RADIUS,
                     },
                     glowBar = new BarPath
                     {
@@ -125,7 +124,7 @@ namespace osu.Game.Screens.Play.HUD
                         Blending = BlendingParameters.Additive,
                         BarColour = main_bar_colour,
                         GlowColour = main_bar_glow_colour,
-                        PathRadius = main_path_radius,
+                        PathRadius = MAIN_PATH_RADIUS,
                         GlowPortion = 0.6f,
                     },
                 }
@@ -248,7 +247,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updatePath()
         {
-            float barLength = DrawWidth - main_path_radius * 2;
+            float barLength = DrawWidth - MAIN_PATH_RADIUS * 2;
             float curveStart = barLength - 70;
             float curveEnd = barLength - 40;
 
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthRightLine.cs b/osu.Game/Screens/Play/HUD/ArgonHealthRightLine.cs
new file mode 100644
index 0000000000..25918f679c
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthRightLine.cs
@@ -0,0 +1,30 @@
+// 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.Skinning;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public partial class ArgonHealthRightLine : CompositeDrawable, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Size = new Vector2(50f, ArgonHealthDisplay.MAIN_PATH_RADIUS * 2);
+            InternalChild = new Circle
+            {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Width = 45f,
+                Height = 3f,
+            };
+        }
+    }
+}
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 2af3a29804..e9953b57a7 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -115,6 +115,7 @@ namespace osu.Game.Skinning
                             var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container =>
                             {
                                 var health = container.OfType<ArgonHealthDisplay>().FirstOrDefault();
+                                var healthLine = container.OfType<ArgonHealthRightLine>().FirstOrDefault();
                                 var scoreWedge = container.OfType<ArgonScoreWedge>().FirstOrDefault();
                                 var score = container.OfType<ArgonScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
@@ -134,6 +135,9 @@ namespace osu.Game.Skinning
                                     health.BarHeight.Value = 30f;
                                     health.Position = new Vector2(components_x_offset, 20f);
 
+                                    if (healthLine != null)
+                                        healthLine.Y = health.Y;
+
                                     if (scoreWedge != null)
                                     {
                                         scoreWedge.Position = new Vector2(-50, 15);

From 07b7e13633862e85522f0c1778c8dc06ee62724d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 8 Nov 2023 02:07:24 +0300
Subject: [PATCH 1417/2296] Place health display in front of the score wedge

---
 osu.Game/Skinning/ArgonSkin.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index e9953b57a7..d598c04891 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -204,9 +204,10 @@ namespace osu.Game.Skinning
                             {
                                 Children = new Drawable[]
                                 {
-                                    new ArgonHealthDisplay(),
                                     new ArgonScoreWedge(),
                                     new ArgonScoreCounter(),
+                                    new ArgonHealthDisplay(),
+                                    new ArgonHealthRightLine(),
                                     new ArgonAccuracyCounter(),
                                     new ArgonComboCounter(),
                                     new BarHitErrorMeter(),

From d0fea381b18b5f19450f4d93951e0aed152a85c8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 8 Nov 2023 02:13:16 +0300
Subject: [PATCH 1418/2296] Update skin deserialisation archives

---
 .../Archives/modified-argon-20231108.osk         | Bin 0 -> 1494 bytes
 .../Archives/modified-argon-pro-20231105.osk     | Bin 1899 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/Archives/modified-argon-20231108.osk
 delete mode 100644 osu.Game.Tests/Resources/Archives/modified-argon-pro-20231105.osk

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-20231108.osk b/osu.Game.Tests/Resources/Archives/modified-argon-20231108.osk
new file mode 100644
index 0000000000000000000000000000000000000000..d07c5171007777784216e3ee8d4bc631a602bfb9
GIT binary patch
literal 1494
zcmWIWW@Zs#U|`^2Xcf!|uh^e_WIvFX&Il4=U?|Sc%+t%v%RJg|n0LrQ#O1f`(IcWB
z8+rX$ChiU?2~qTQ`Ixx>ZD`s5{%hHhb97nVPl+aV1Qjyunwa+G%d_XdW2RNSmguco
zzj(5k`_v<o41)NjCb4<F^SC$P;o7F74_V%}v)@pRd!|>D>C<l!U_VtWV@~?Q0~-1P
zrv)2@BfUaq^z(ANf2!U*SM002#^M{RQf7p9ubP!Cc4gPGjdLHJ{(NT--^$Ao$?EeL
zEuK-{w>NlYplEjTyH)@5XT{4unf(89(awmw8vmIBP&~Qzl#P2f&~x=b%nS8oW?ovp
zURH5_-s)#T0Rf-9&-jLJ3JN%N*8il>X&>K<zB*p#&tEn*GB7eTF);|f#Hd-M=jE$&
zQlDuh_u13uPV1j<?x=nyI$h=2)D*R8DbJo)K3n><Ipm4>^jABXeXnw#J9p;v=`-Hf
zi&-Q&AHCE#pfYtw79*;wbc&?>&M`4CREjY$01<<4VrHI4sEc!cZb5!tYF<e(*m-Xw
z?&se!5U6_}FZhus&?!h`@~;aQbLVc$Tw%YhebuHp1-^Tvr02?JM19<Uo^y)Y1YhmN
z3olE_1-#QMPp_YUKK=gt$gsx}FQ>4{*mY&!tVq5qJ#(U44BM31-%tO!8+D@iZlx95
z;!KaJH{@S%yxA<k*s_Uz&a!VOk8Z4OnJALJ(B%i;VUAhXnlmr|Vp}moq`hzM|5;)7
z53L+6L?&b`*^|jTsbTX6;U&*Mu^n0HVUcelznFhX(yfY!XS*icmvYRuFOHnD%<a{?
z+vkGJw0BrdouwBubzk<J)+x@R4BJor)!!rEX)rB=r;7Dqc#5E~_91T8SGK!bAAXvg
zeM(eBm}%|Ij*w}=hHmz0H60Ty_w2b9eKOJc#4jU3sSRcqZcSbAQ(w^J{B4P?Nld|Q
z1-)r$oidjvyfl&TzJ7Xs^Qk@Cc)oB3tb3fi?3i1O^rfi|+vkdNe0jEdvxNNukEDda
zHOBAO@Y!815}4Rm{C1U9po74UnN6GmN8deAEU5isaW?4x8JAktKlTbIj2D%Ov~gZC
zSi8Gv`z?LJ?LiyYZEu-AX(@NeiGsL1<I`5x3gY{iBF#nj^u3+&{6PF+?e}NPPO@*0
zJ=#9$i~QY7{xj;@H9m4nteE<DT9W6c%dhrkUzqE4VeZ<7f69jKvjsVPcidFz?2D{W
zc1SJz=e23!6C=k-Z+{9ei#YIOj<S@nhUBUUzmpz*J~mG34JJ)mn=iPyDkyiEH@Lhs
znQy#3<!~m$pTO^4hqhj{pWCwb>^7zUQ(M1oD5&e1swB0b=fasoewEjYwjZ}S{?2x8
z#oJS#uHWPPSTxDS<M_uW>GK`AeX9?qUOa!LwkY@Svh^=Z%I-Wb)B1hq+%XCJ$EVJ$
zXJ+R)^s8?Q`@FZ`YqsyU+ZcQMZIx{P^0%Jbxpq(bqF;3>XVb|kyq~4n>fg2{u8WTg
z*pbcVGvm_w&aOti$Nzpxo&Uf7S(v20+?36GZ~CL=0GX*tRcgSLuL;C_Kpc>hSecfY
znv;Uam_?diI{rSVJingtJ{`U(Xa!prqwD8x@5VVVA{5q7TP?;A;LXS+!hpL#0~!kf
zjUWnEyrJttFCn0M7#JF#LUqB*3v{jM*%+a<8d#=c&(!E<pa%rPj9M1-U<vSMWdq5x
O0O3a<eIBTSfdK$K>T7HO

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231105.osk b/osu.Game.Tests/Resources/Archives/modified-argon-pro-20231105.osk
deleted file mode 100644
index 16f89502eff0bc46df9922fec370ee1d804170f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1899
zcmWIWW@Zs#U|`^2U=>IWU(2a$c^JquWCDpWFcfEJ=ILeTWuEQdo5y4*&{A!Gw1sPl
z%y(f;r;?D8l}@c1Vtd%dzP&s7{PN3ry-NL4!aF>tXnFaYU#gL+{apE5!+TG>#M-L$
zizgfVX?3b5E|D`);hl1)bI*K-YnzT1HhnuR{6^sY4(_?fzVs-6-5KKe+J>9etx|rg
zjG)EDr7qr^?{6wlsW-@<8S$Uztj4_1v=@t#?uGbnK47z=bZzo(gV~C)ChIm%Uj0Jj
zn9UA@Z~Hg?IM(GODp|EM?)BA&2jBf!92Fiq*LK&-{&(U5C>}LoaOf%ndaxUad7&Q7
z%uCDH%PP*#Gwm_tI^-bW`g=~&Osm~FN$KihlhimKF^X;GbUrcPAW~59{krBG`~Lr{
z4m}q*f0|FVdpD0wkzCCs&j;b6_m7obKXPNo>^1(Y&e~=9xnAK5KQn>7ZqMN`A+F_z
zn)nvaP`qtBXW!3)nUV=U4-?*Q?rOaCw|vz-c~l36?qoWA5f}^S6c`x9fDZIc%*^u$
zb#czmEy&MH%_}JeyY%hM`}wyF1diYT9qwY|?9y<_sI$E<@3o1qbM|iAkkBVHvL9W&
z@#2lc;#L2D&vDQU@RyFAtT5|C!>7I7^|j~Ht#{fN%(<mGNs`l|M$CNEw{ttqX9YUz
zF&{enH?-`%&X+S~6MYUuWCb04r*6ddeU4H?z`F^PkJ#?EDfKs)@`#7y`bEuPVdd*{
z-QVx}%p72-`ODY*_tm+MXG(i6hzn$^?0LuYxWV`r>m=?<?nU}Z=d!;pXX9C#bZg3n
zoOe$9jh&(%tePfq*1BZ2_uIs!3*HA!c6H1?fAyT^!vyVnn??V(U-D<^RawU8uKmh9
zMNxS6tEEg|C*D1n@$&-jL$0vdEK$aStIme8vi#+UkjPBV%q_FuS|qTrZ<F1(zN(j3
zw{9yJFtl^>xLsCSyCL!Zy#JO{IqVZfoDx4sx10T08KL%XUT@v|qaQxInN8Sup`q1r
zv(f8mHmUJ5Z)W{9ZYyX`i>b9#4B4#m+RJ+OjJ=PQ(w=cHH58g9;<qc=@#5|HODTru
z{$=drSZ1r)^xmP5IkMo{*Qjj=^TSt`OQ%^+tlE36koE2Q3+HD1YtZ<pEs=1l*1y14
zvvhy-rzM|fnKfj;I$iu~{f#AC4LRNxs~xy5xOh8L$gAx;cLkhG?Wx<vI?w1R)3KR;
z)(Z^VOx;CK&a|Hv96aBDS%V78Y-!W2N<WgDwm0m%<Y|_6Zx+8g;|KNVb2tCxvLrrs
z4ZQI#Brw89<Xk^rP>b^v#aV$GrthTgy>^{vX^<~pp_~0Hd#~SvR7WADnJ(QoPE5=_
zcC{e#jaOIQ<jWc5cbDz#o2UG)>~!qITd~rQOiRVTX)KldmQ%dB_Rh`6=7me;zH9BN
zd~kQYbJfu|_A}p}Q}6wIc-yU}yZ@F2F1@wq=k)(wds_O#^O=kL&KSiwvu#P5_V|hq
z`_1_q1E<wmpFJx$<M#BEx2vBWI3g18TZ?Jan(z11OTN|He)oF(@Zyhx4<DpaGr`=>
zzyL``1_onbM&Ji#g5dnT^x)K-)Z`Ly>d&3%pMBVX=ji*tBFCO5gqdwKdXbn?FJZlA
z&0W1zcJ)x<;83n@hoijq{eCkcHIvhB#`nozzfABKR(!Jfs=bwS#ZukV)rDL-7nm$B
zOMKaNb<yM8+|o4)Au7A0_P(%P@${U4q*lnO-(8$1thY8b*E`){pV+Z~dgl+O*F2a1
zcx_b|%<SE_%|Ly{-m5b@T<0!4dH=zVN3s{@WVy`z!ymuF*v{fhpmiOGf)w9P!ws)*
z`rJK}SAB<PkKK*e=U%S~)hq5bFiW&DQrr;uo&A*ewvPwzHtdTIme{pqKHr_qmIs#Q
z-^wa6=wZ3nF1q`4h}|2@I=5D<_DO}zVHIMcO=Su;7Vn=#KG6-%nbDW#=iMyLZFv9J
z?!&&-?pJ+g#iNFz%+#bRHDKsz0x=&D2jnDHre&t)q<{l)^|PRWfFeyV9e<xwo?p*+
zpAO#?w1TaR(e-n;cjKHF5en<4trlYl@MdHZVZdEc0F8x!Mi2$7HqdpUm%30r3=EAg
zp}OE@FuGRs@(`i53z$H#myYOWpeHAU8T~96i3?pbdMF|^Uu8uP(*SQ)Hjq3k5b6P)
Irw--;0N9HQNB{r;


From 2ef17c56b115c3df3d7a539f7494ad568b3a3ddf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 8 Nov 2023 02:13:35 +0300
Subject: [PATCH 1419/2296] Remove unused local

---
 osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs b/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs
index fe495b421f..e8ade9e5c6 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreWedge.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.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -19,8 +18,6 @@ namespace osu.Game.Screens.Play.HUD
         {
             AutoSizeAxes = Axes.Both;
 
-            var vertices = new List<Vector2>();
-
             InternalChildren = new Drawable[]
             {
                 new ArgonWedgePiece

From 387de7ec244f1e5c7381693b6dad96a64630ce1f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 7 Nov 2023 15:53:41 -0800
Subject: [PATCH 1420/2296] Add ability to view kudosu rankings

---
 .../API/Requests/GetKudosuRankingsRequest.cs  | 28 ++++++
 .../API/Requests/GetKudosuRankingsResponse.cs | 15 +++
 osu.Game/Overlays/KudosuTable.cs              | 95 +++++++++++++++++++
 osu.Game/Overlays/Rankings/RankingsScope.cs   |  5 +-
 osu.Game/Overlays/RankingsOverlay.cs          |  9 ++
 5 files changed, 151 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Online/API/Requests/GetKudosuRankingsRequest.cs
 create mode 100644 osu.Game/Online/API/Requests/GetKudosuRankingsResponse.cs
 create mode 100644 osu.Game/Overlays/KudosuTable.cs

diff --git a/osu.Game/Online/API/Requests/GetKudosuRankingsRequest.cs b/osu.Game/Online/API/Requests/GetKudosuRankingsRequest.cs
new file mode 100644
index 0000000000..cd361bf7b8
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetKudosuRankingsRequest.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 osu.Framework.IO.Network;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetKudosuRankingsRequest : APIRequest<GetKudosuRankingsResponse>
+    {
+        private readonly int page;
+
+        public GetKudosuRankingsRequest(int page = 1)
+        {
+            this.page = page;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+
+            req.AddParameter(@"page", page.ToString());
+
+            return req;
+        }
+
+        protected override string Target => @"rankings/kudosu";
+    }
+}
diff --git a/osu.Game/Online/API/Requests/GetKudosuRankingsResponse.cs b/osu.Game/Online/API/Requests/GetKudosuRankingsResponse.cs
new file mode 100644
index 0000000000..4e3ade3795
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetKudosuRankingsResponse.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 System.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetKudosuRankingsResponse
+    {
+        [JsonProperty("ranking")]
+        public List<APIUser> Users = null!;
+    }
+}
diff --git a/osu.Game/Overlays/KudosuTable.cs b/osu.Game/Overlays/KudosuTable.cs
new file mode 100644
index 0000000000..93884435a4
--- /dev/null
+++ b/osu.Game/Overlays/KudosuTable.cs
@@ -0,0 +1,95 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays.Rankings.Tables;
+using osu.Game.Resources.Localisation.Web;
+using osu.Game.Users;
+
+namespace osu.Game.Overlays
+{
+    public partial class KudosuTable : RankingsTable<APIUser>
+    {
+        public KudosuTable(int page, List<APIUser> users)
+            : base(page, users)
+        {
+        }
+
+        protected override Drawable CreateRowBackground(APIUser item)
+        {
+            var background = base.CreateRowBackground(item);
+
+            // see: https://github.com/ppy/osu-web/blob/9de00a0b874c56893d98261d558d78d76259d81b/resources/views/multiplayer/rooms/_rankings_table.blade.php#L23
+            if (!item.Active)
+                background.Alpha = 0.5f;
+
+            return background;
+        }
+
+        protected override Drawable[] CreateRowContent(int index, APIUser item)
+        {
+            var content = base.CreateRowContent(index, item);
+
+            // see: https://github.com/ppy/osu-web/blob/9de00a0b874c56893d98261d558d78d76259d81b/resources/views/multiplayer/rooms/_rankings_table.blade.php#L23
+            if (!item.Active)
+            {
+                foreach (var d in content)
+                    d.Alpha = 0.5f;
+            }
+
+            return content;
+        }
+
+        protected override RankingsTableColumn[] CreateAdditionalHeaders()
+        {
+            const int min_width = 120;
+            return new[]
+            {
+                new RankingsTableColumn(RankingsStrings.KudosuTotal, Anchor.Centre, new Dimension(GridSizeMode.AutoSize, minSize: min_width), true),
+                new RankingsTableColumn(RankingsStrings.KudosuAvailable, Anchor.Centre, new Dimension(GridSizeMode.AutoSize, minSize: min_width)),
+                new RankingsTableColumn(RankingsStrings.KudosuUsed, Anchor.Centre, new Dimension(GridSizeMode.AutoSize, minSize: min_width)),
+            };
+        }
+
+        protected override Drawable[] CreateAdditionalContent(APIUser item)
+        {
+            int kudosuTotal = item.Kudosu.Total;
+            int kudosuAvailable = item.Kudosu.Available;
+            return new Drawable[]
+            {
+                new RowText
+                {
+                    Text = kudosuTotal.ToLocalisableString(@"N0")
+                },
+                new ColouredRowText
+                {
+                    Text = kudosuAvailable.ToLocalisableString(@"N0")
+                },
+                new ColouredRowText
+                {
+                    Text = (kudosuTotal - kudosuAvailable).ToLocalisableString(@"N0")
+                },
+            };
+        }
+
+        protected override CountryCode GetCountryCode(APIUser item) => item.CountryCode;
+
+        protected override Drawable CreateFlagContent(APIUser item)
+        {
+            var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: TEXT_SIZE, italics: true))
+            {
+                AutoSizeAxes = Axes.X,
+                RelativeSizeAxes = Axes.Y,
+                TextAnchor = Anchor.CentreLeft
+            };
+            username.AddUserLink(item);
+            return username;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Rankings/RankingsScope.cs b/osu.Game/Overlays/Rankings/RankingsScope.cs
index 3392db9360..356a861764 100644
--- a/osu.Game/Overlays/Rankings/RankingsScope.cs
+++ b/osu.Game/Overlays/Rankings/RankingsScope.cs
@@ -18,6 +18,9 @@ namespace osu.Game.Overlays.Rankings
         Score,
 
         [LocalisableDescription(typeof(RankingsStrings), nameof(RankingsStrings.TypeCountry))]
-        Country
+        Country,
+
+        [LocalisableDescription(typeof(RankingsStrings), nameof(RankingsStrings.TypeKudosu))]
+        Kudosu,
     }
 }
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index f25bf80b6a..6a32515cbc 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -135,6 +135,9 @@ namespace osu.Game.Overlays
 
                 case RankingsScope.Score:
                     return new GetUserRankingsRequest(ruleset.Value, UserRankingsType.Score);
+
+                case RankingsScope.Kudosu:
+                    return new GetKudosuRankingsRequest();
             }
 
             return null;
@@ -166,6 +169,12 @@ namespace osu.Game.Overlays
 
                     return new CountriesTable(1, countryRequest.Response.Countries);
                 }
+
+                case GetKudosuRankingsRequest kudosuRequest:
+                    if (kudosuRequest.Response == null)
+                        return null;
+
+                    return new KudosuTable(1, kudosuRequest.Response.Users);
             }
 
             return null;

From c8d276281ada839a37ab6eb484c36b9b7772a0d1 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 7 Nov 2023 15:49:11 -0800
Subject: [PATCH 1421/2296] Fix flags not showing on kudosu rankings

The `country` attribute is optional and not included in the kudosu rankings response so use `country_code` instead.
---
 osu.Game/Online/API/Requests/Responses/APIUser.cs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIUser.cs b/osu.Game/Online/API/Requests/Responses/APIUser.cs
index 7c4093006d..2ee66453cf 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUser.cs
@@ -34,20 +34,15 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"previous_usernames")]
         public string[] PreviousUsernames;
 
-        private CountryCode? countryCode;
+        [JsonProperty(@"country_code")]
+        private string countryCodeString;
 
         public CountryCode CountryCode
         {
-            get => countryCode ??= (Enum.TryParse(country?.Code, out CountryCode result) ? result : default);
-            set => countryCode = value;
+            get => Enum.TryParse(countryCodeString, out CountryCode result) ? result : CountryCode.Unknown;
+            set => countryCodeString = value.ToString();
         }
 
-#pragma warning disable 649
-        [CanBeNull]
-        [JsonProperty(@"country")]
-        private Country country;
-#pragma warning restore 649
-
         public readonly Bindable<UserStatus> Status = new Bindable<UserStatus>();
 
         public readonly Bindable<UserActivity> Activity = new Bindable<UserActivity>();

From 6c6baab1156f64388e5fcea3ad712cc7e24bb463 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Nov 2023 16:41:30 +0900
Subject: [PATCH 1422/2296] Reword comment to explain why

---
 osu.Game/Graphics/UserInterface/BarGraph.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/BarGraph.cs b/osu.Game/Graphics/UserInterface/BarGraph.cs
index d3eebd71f0..0ac987e85b 100644
--- a/osu.Game/Graphics/UserInterface/BarGraph.cs
+++ b/osu.Game/Graphics/UserInterface/BarGraph.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Graphics.UserInterface
                     if (barHeight == 0 || barWidth == 0)
                         continue;
 
-                    // Make sure draw quad is thick enough
+                    // Apply minimum sizing to hide the fact that we don't have fractional anti-aliasing.
                     barHeight = Math.Max(barHeight, 1.5f);
                     barWidth = Math.Max(barWidth, 1.5f);
 

From 38847c3ac5383c9fb69b7bf0b38aa8ea36b23b39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Nov 2023 17:23:01 +0900
Subject: [PATCH 1423/2296] Change test to move only on a toggle step

---
 osu.Game.Tests/Visual/Online/TestSceneGraph.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneGraph.cs
index eee29e0aeb..f4bde159e5 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneGraph.cs
@@ -13,10 +13,10 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public partial class TestSceneGraph : OsuTestScene
     {
-        private readonly BarGraph graph;
-
         public TestSceneGraph()
         {
+            BarGraph graph;
+
             Child = graph = new BarGraph
             {
                 RelativeSizeAxes = Axes.Both,
@@ -34,13 +34,14 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Top to bottom", () => graph.Direction = BarDirection.TopToBottom);
             AddStep("Left to right", () => graph.Direction = BarDirection.LeftToRight);
             AddStep("Right to left", () => graph.Direction = BarDirection.RightToLeft);
-        }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            graph.MoveToY(-10, 1000).Then().MoveToY(10, 1000).Loop();
+            AddToggleStep("Toggle movement", enabled =>
+            {
+                if (enabled)
+                    graph.MoveToY(-10, 1000).Then().MoveToY(10, 1000).Loop();
+                else
+                    graph.ClearTransforms();
+            });
         }
     }
 }

From fc1a0cf645b345c1b2b0727313a4f11b207a3268 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 19 Oct 2023 16:20:10 +0900
Subject: [PATCH 1424/2296] Update `ButtonSystem` to use new sample names

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index bf2eba43c0..d26709151c 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -127,14 +127,14 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
         {
-            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Solo, @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Multi, @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Playlists, @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
+            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Solo, @"button-default-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
+            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Multi, @"button-default-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
+            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Playlists, @"button-default-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B, Key.D));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-default-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-default-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B, Key.D));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));

From 17aa079cb1cd1ee7ae22942aa582507c37037c4d Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Wed, 8 Nov 2023 22:08:05 +0900
Subject: [PATCH 1425/2296] Use new tiered 'back' samples

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index d26709151c..8ebe4de8de 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.Menu
         private readonly List<MainMenuButton> buttonsTopLevel = new List<MainMenuButton>();
         private readonly List<MainMenuButton> buttonsPlay = new List<MainMenuButton>();
 
-        private Sample sampleBack;
+        private Sample sampleBackToLogo;
 
         private readonly LogoTrackingContainer logoTrackingContainer;
 
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Menu
             buttonArea.AddRange(new Drawable[]
             {
                 new MainMenuButton(ButtonSystemStrings.Settings, string.Empty, FontAwesome.Solid.Cog, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
-                backButton = new MainMenuButton(ButtonSystemStrings.Back, @"button-back-select", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel,
+                backButton = new MainMenuButton(ButtonSystemStrings.Back, @"back-to-top", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel,
                     -WEDGE_WIDTH)
                 {
                     VisibleState = ButtonSystemState.Play,
@@ -155,7 +155,7 @@ namespace osu.Game.Screens.Menu
 
             if (idleTracker != null) isIdle.BindTo(idleTracker.IsIdle);
 
-            sampleBack = audio.Samples.Get(@"Menu/button-back-select");
+            sampleBackToLogo = audio.Samples.Get(@"Menu/back-to-logo");
         }
 
         private void onMultiplayer()
@@ -260,7 +260,9 @@ namespace osu.Game.Screens.Menu
             {
                 case ButtonSystemState.TopLevel:
                     State = ButtonSystemState.Initial;
-                    sampleBack?.Play();
+
+                    // Samples are explicitly played here in response to user interaction and not when transitioning due to idle.
+                    sampleBackToLogo?.Play();
                     return true;
 
                 case ButtonSystemState.Play:

From f0a1df06aced3051a93684588a6f21a0bf0fafd0 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Wed, 8 Nov 2023 22:13:35 +0900
Subject: [PATCH 1426/2296] Add 'swoosh' samples to accentuate `MainMenu`
 animations

---
 osu.Game/Screens/Menu/ButtonSystem.cs |  4 ++++
 osu.Game/Screens/Menu/MainMenu.cs     | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 8ebe4de8de..20af7e4d4a 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -86,6 +86,7 @@ namespace osu.Game.Screens.Menu
         private readonly List<MainMenuButton> buttonsPlay = new List<MainMenuButton>();
 
         private Sample sampleBackToLogo;
+        private Sample sampleLogoSwoosh;
 
         private readonly LogoTrackingContainer logoTrackingContainer;
 
@@ -156,6 +157,7 @@ namespace osu.Game.Screens.Menu
             if (idleTracker != null) isIdle.BindTo(idleTracker.IsIdle);
 
             sampleBackToLogo = audio.Samples.Get(@"Menu/back-to-logo");
+            sampleLogoSwoosh = audio.Samples.Get(@"Menu/osu-logo-swoosh");
         }
 
         private void onMultiplayer()
@@ -263,6 +265,8 @@ namespace osu.Game.Screens.Menu
 
                     // Samples are explicitly played here in response to user interaction and not when transitioning due to idle.
                     sampleBackToLogo?.Play();
+                    sampleLogoSwoosh?.Play();
+
                     return true;
 
                 case ButtonSystemState.Play:
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 22040b4f0b..36e336e960 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -7,6 +7,8 @@ using System;
 using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -89,8 +91,10 @@ namespace osu.Game.Screens.Menu
         private SongTicker songTicker;
         private Container logoTarget;
 
+        private Sample reappearSampleSwoosh;
+
         [BackgroundDependencyLoader(true)]
-        private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings, OsuConfigManager config, SessionStatics statics)
+        private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings, OsuConfigManager config, SessionStatics statics, AudioManager audio)
         {
             holdDelay = config.GetBindable<double>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
@@ -162,6 +166,8 @@ namespace osu.Game.Screens.Menu
             Buttons.OnSettings = () => settings?.ToggleVisibility();
             Buttons.OnBeatmapListing = () => beatmapListing?.ToggleVisibility();
 
+            reappearSampleSwoosh = audio.Samples.Get(@"Menu/reappear-swoosh");
+
             preloadSongSelect();
         }
 
@@ -291,6 +297,8 @@ namespace osu.Game.Screens.Menu
         {
             base.OnResuming(e);
 
+            reappearSampleSwoosh?.Play();
+
             ApplyToBackground(b => (b as BackgroundScreenDefault)?.Next());
 
             // we may have consumed our preloaded instance, so let's make another.

From f69c2ea39b46fff223c8372e6dd1d2a6b2da5bce Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Wed, 8 Nov 2023 22:18:33 +0900
Subject: [PATCH 1427/2296] Implement sample choking/muting for `ButtonSystem`
 samples

---
 osu.Game/Screens/Menu/ButtonSystem.cs   | 10 ++++++++++
 osu.Game/Screens/Menu/MainMenu.cs       |  2 ++
 osu.Game/Screens/Menu/MainMenuButton.cs |  6 +++++-
 osu.Game/Screens/Menu/OsuLogo.cs        | 10 +++++++++-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 20af7e4d4a..13464d4927 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -199,6 +199,7 @@ namespace osu.Game.Screens.Menu
         {
             if (State == ButtonSystemState.Initial)
             {
+                StopSamplePlayback();
                 logo?.TriggerClick();
                 return true;
             }
@@ -264,12 +265,14 @@ namespace osu.Game.Screens.Menu
                     State = ButtonSystemState.Initial;
 
                     // Samples are explicitly played here in response to user interaction and not when transitioning due to idle.
+                    StopSamplePlayback();
                     sampleBackToLogo?.Play();
                     sampleLogoSwoosh?.Play();
 
                     return true;
 
                 case ButtonSystemState.Play:
+                    StopSamplePlayback();
                     backButton.TriggerClick();
                     return true;
 
@@ -278,6 +281,13 @@ namespace osu.Game.Screens.Menu
             }
         }
 
+        public void StopSamplePlayback()
+        {
+            buttonsPlay.ForEach(button => button.StopSamplePlayback());
+            buttonsTopLevel.ForEach(button => button.StopSamplePlayback());
+            logo?.StopSamplePlayback();
+        }
+
         private bool onOsuLogo()
         {
             switch (state)
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 36e336e960..0f73707544 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -297,6 +297,8 @@ namespace osu.Game.Screens.Menu
         {
             base.OnResuming(e);
 
+            // Ensures any playing `ButtonSystem` samples are stopped when returning to MainMenu (as to not overlap with the 'back' sample)
+            Buttons.StopSamplePlayback();
             reappearSampleSwoosh?.Play();
 
             ApplyToBackground(b => (b as BackgroundScreenDefault)?.Next());
diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index c3a96e36a1..63fc34b4fb 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Screens.Menu
         private readonly Action clickAction;
         private Sample sampleClick;
         private Sample sampleHover;
+        private SampleChannel sampleChannel;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
@@ -225,7 +226,8 @@ namespace osu.Game.Screens.Menu
 
         private void trigger()
         {
-            sampleClick?.Play();
+            sampleChannel = sampleClick?.GetChannel();
+            sampleChannel?.Play();
 
             clickAction?.Invoke();
 
@@ -237,6 +239,8 @@ namespace osu.Game.Screens.Menu
         public override bool HandleNonPositionalInput => state == ButtonState.Expanded;
         public override bool HandlePositionalInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
 
+        public void StopSamplePlayback() => sampleChannel?.Stop();
+
         protected override void Update()
         {
             iconText.Alpha = Math.Clamp((box.Scale.X - 0.5f) / 0.3f, 0, 1);
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 8867ecfb2a..75ef8be02e 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -52,6 +52,8 @@ namespace osu.Game.Screens.Menu
         private readonly IntroSequence intro;
 
         private Sample sampleClick;
+        private SampleChannel sampleClickChannel;
+
         private Sample sampleBeat;
         private Sample sampleDownbeat;
 
@@ -391,7 +393,11 @@ namespace osu.Game.Screens.Menu
             flashLayer.FadeOut(1500, Easing.OutExpo);
 
             if (Action?.Invoke() == true)
-                sampleClick.Play();
+            {
+                StopSamplePlayback();
+                sampleClickChannel = sampleClick.GetChannel();
+                sampleClickChannel.Play();
+            }
 
             return true;
         }
@@ -440,6 +446,8 @@ namespace osu.Game.Screens.Menu
         private Container currentProxyTarget;
         private Drawable proxy;
 
+        public void StopSamplePlayback() => sampleClickChannel?.Stop();
+
         public Drawable ProxyToContainer(Container c)
         {
             if (currentProxyTarget != null)

From 12a148d1084b1a6f11525ff16c223ecb6ddd6927 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Nov 2023 12:26:41 +0900
Subject: [PATCH 1428/2296] Use new initialisation structure for github sourced
 update manager

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 941ab335e8..dba157a6e9 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -10,8 +10,8 @@ using osu.Game;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Screens.Play;
-using Squirrel;
 using Squirrel.SimpleSplat;
+using Squirrel.Sources;
 using LogLevel = Squirrel.SimpleSplat.LogLevel;
 using UpdateManager = osu.Game.Updater.UpdateManager;
 
@@ -63,7 +63,7 @@ namespace osu.Desktop.Updater
                 if (localUserInfo?.IsPlaying.Value == true)
                     return false;
 
-                updateManager ??= new GithubUpdateManager(@"https://github.com/ppy/osu", false, github_token, @"osulazer");
+                updateManager ??= new Squirrel.UpdateManager(new GithubSource(@"https://github.com/ppy/osu", github_token, false), @"osulazer");
 
                 var info = await updateManager.CheckForUpdate(!useDeltaPatching).ConfigureAwait(false);
 

From 8a47f05b1615e126c9841b52dd63576a5b1b521a Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 9 Nov 2023 14:01:33 +0900
Subject: [PATCH 1429/2296] Always play 'swoosh' sample when transitioning back
 to logo

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

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 13464d4927..a0cf9f5322 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -267,7 +267,6 @@ namespace osu.Game.Screens.Menu
                     // Samples are explicitly played here in response to user interaction and not when transitioning due to idle.
                     StopSamplePlayback();
                     sampleBackToLogo?.Play();
-                    sampleLogoSwoosh?.Play();
 
                     return true;
 
@@ -362,6 +361,9 @@ namespace osu.Game.Screens.Menu
                         logo?.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
                         logo?.ScaleTo(1, 800, Easing.OutExpo);
                     }, buttonArea.Alpha * 150);
+
+                    if (lastState == ButtonSystemState.TopLevel)
+                        sampleLogoSwoosh?.Play();
                     break;
 
                 case ButtonSystemState.TopLevel:

From 5d5c803cf6fc97c044551a8bd7d3d11f0db8f41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 9 Nov 2023 17:48:43 +0900
Subject: [PATCH 1430/2296] Add failing test case for touch device application
 during gameplay with incompatible mods active

---
 .../Mods/TestSceneOsuModTouchDevice.cs        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
index e41cc8cfbc..abeb56209e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
@@ -9,6 +9,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Configuration;
 using osu.Game.Input;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
@@ -113,6 +114,25 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             AddAssert("touch device mod activated", () => Player.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
         }
 
+        [Test]
+        public void TestIncompatibleModActive()
+        {
+            // this is only a veneer of enabling autopilot as having it actually active from the start is annoying to make happen
+            // given the tests' structure.
+            AddStep("enable autopilot", () => Player.Score.ScoreInfo.Mods = new Mod[] { new OsuModAutopilot() });
+
+            AddUntilStep("wait until 0 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0).Within(500));
+            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
+            AddUntilStep("wait until 0", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
+            AddStep("touch playfield", () =>
+            {
+                var touch = new Touch(TouchSource.Touch1, Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                InputManager.BeginTouch(touch);
+                InputManager.EndTouch(touch);
+            });
+            AddAssert("touch device mod not activated", () => Player.Score.ScoreInfo.Mods, () => Has.None.InstanceOf<OsuModTouchDevice>());
+        }
+
         [Test]
         public void TestSecondObjectTouched()
         {

From 63a0ea54109c93984501b66435febf676663cab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 9 Nov 2023 17:50:57 +0900
Subject: [PATCH 1431/2296] Fix `PlayerTouchInputDetector` applying touch
 device mod when other inactive mods present

---
 osu.Game/Screens/Play/PlayerTouchInputDetector.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PlayerTouchInputDetector.cs b/osu.Game/Screens/Play/PlayerTouchInputDetector.cs
index a5055dfb00..69c3cd0ded 100644
--- a/osu.Game/Screens/Play/PlayerTouchInputDetector.cs
+++ b/osu.Game/Screens/Play/PlayerTouchInputDetector.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.Play
 {
@@ -45,10 +46,15 @@ namespace osu.Game.Screens.Play
             if (touchDeviceMod == null)
                 return;
 
+            var candidateMods = player.Score.ScoreInfo.Mods.Append(touchDeviceMod).ToArray();
+
+            if (!ModUtils.CheckCompatibleSet(candidateMods, out _))
+                return;
+
             // `Player` (probably rightly so) assumes immutability of mods,
             // so this will not be shown immediately on the mod display in the top right.
             // if this is to change, the mod immutability should be revisited.
-            player.Score.ScoreInfo.Mods = player.Score.ScoreInfo.Mods.Append(touchDeviceMod).ToArray();
+            player.Score.ScoreInfo.Mods = candidateMods;
         }
     }
 }

From e3e752b912ba0b14f9d2d2a96bc1695e65eb94cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Nov 2023 17:56:58 +0900
Subject: [PATCH 1432/2296] Update resources

---
 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 60c71a736d..73cd239854 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1030.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1023.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1109.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.33.0" />

From ccb9ff826a87dbafbbeb0a0a572a404bc88c7e88 Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Thu, 9 Nov 2023 13:09:59 +0100
Subject: [PATCH 1433/2296] fixed tests

---
 .../Online/TestSceneUserClickableAvatar.cs    | 130 +++++++++---------
 .../OnlinePlay/Components/ParticipantsList.cs |   2 +-
 .../DrawableRoomParticipantsList.cs           |   2 +-
 osu.Game/Users/Drawables/ClickableAvatar.cs   | 115 +++++++++++-----
 osu.Game/Users/Drawables/UpdateableAvatar.cs  |   9 +-
 5 files changed, 152 insertions(+), 106 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
index 678767f15e..9217104aa8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
@@ -1,11 +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.Linq;
 using NUnit.Framework;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Testing;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
@@ -28,8 +30,10 @@ namespace osu.Game.Tests.Visual.Online
                 Children = new[]
                 {
                     generateUser(@"peppy", 2, CountryCode.AU, @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", false, "99EB47"),
-                    generateUser(@"flyte", 3103765, CountryCode.JP, @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg", false),
-                    generateUser(@"joshika39", 17032217, CountryCode.RS, @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", true),
+                    generateUser(@"flyte", 3103765, CountryCode.JP, @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg", true),
+                    generateUser(@"joshika39", 17032217, CountryCode.RS, @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", false),
+                    new UpdateableAvatar(),
+                    new UpdateableAvatar()
                 },
             };
         });
@@ -37,68 +41,68 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestClickableAvatarHover()
         {
-            // AddStep($"click {1}. {nameof(ClickableAvatar)}", () =>
-            // {
-            //     var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-            //     if (targets.Count < 1)
-            //         return;
-            //
-            //     InputManager.MoveMouseTo(targets[0]);
-            // });
-            // AddWaitStep("wait for tooltip to show", 5);
-            // AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            // AddWaitStep("wait for tooltip to hide", 3);
-            //
-            // AddStep($"click {2}. {nameof(ClickableAvatar)}", () =>
-            // {
-            //     var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-            //     if (targets.Count < 2)
-            //         return;
-            //
-            //     InputManager.MoveMouseTo(targets[1]);
-            // });
-            // AddWaitStep("wait for tooltip to show", 5);
-            // AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            // AddWaitStep("wait for tooltip to hide", 3);
-            //
-            // AddStep($"click {3}. {nameof(ClickableAvatar)}", () =>
-            // {
-            //     var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-            //     if (targets.Count < 3)
-            //         return;
-            //
-            //     InputManager.MoveMouseTo(targets[2]);
-            // });
-            // AddWaitStep("wait for tooltip to show", 5);
-            // AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            // AddWaitStep("wait for tooltip to hide", 3);
-            //
-            // AddStep($"click null user {4}. {nameof(ClickableAvatar)}", () =>
-            // {
-            //     var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-            //     if (targets.Count < 4)
-            //         return;
-            //
-            //     InputManager.MoveMouseTo(targets[3]);
-            // });
-            // AddWaitStep("wait for tooltip to show", 5);
-            // AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            // AddWaitStep("wait for tooltip to hide", 3);
-            //
-            // AddStep($"click null user {5}. {nameof(ClickableAvatar)}", () =>
-            // {
-            //     var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-            //     if (targets.Count < 5)
-            //         return;
-            //
-            //     InputManager.MoveMouseTo(targets[4]);
-            // });
-            // AddWaitStep("wait for tooltip to show", 5);
-            // AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            // AddWaitStep("wait for tooltip to hide", 3);
+            AddStep($"click user {1} with UserGridPanel {nameof(ClickableAvatar)}", () =>
+            {
+                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+                if (targets.Count < 1)
+                    return;
+
+                InputManager.MoveMouseTo(targets[0]);
+            });
+            AddWaitStep("wait for tooltip to show", 5);
+            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddWaitStep("wait for tooltip to hide", 3);
+
+            AddStep($"click user {2} with username only. {nameof(ClickableAvatar)}", () =>
+            {
+                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+                if (targets.Count < 2)
+                    return;
+
+                InputManager.MoveMouseTo(targets[1]);
+            });
+            AddWaitStep("wait for tooltip to show", 5);
+            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddWaitStep("wait for tooltip to hide", 3);
+
+            AddStep($"click user {3} with UserGridPanel {nameof(ClickableAvatar)}", () =>
+            {
+                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+                if (targets.Count < 3)
+                    return;
+
+                InputManager.MoveMouseTo(targets[2]);
+            });
+            AddWaitStep("wait for tooltip to show", 5);
+            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddWaitStep("wait for tooltip to hide", 3);
+
+            AddStep($"click null user {4}. {nameof(ClickableAvatar)}", () =>
+            {
+                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+                if (targets.Count < 4)
+                    return;
+
+                InputManager.MoveMouseTo(targets[3]);
+            });
+            AddWaitStep("wait for tooltip to show", 5);
+            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddWaitStep("wait for tooltip to hide", 3);
+
+            AddStep($"click null user {5}. {nameof(ClickableAvatar)}", () =>
+            {
+                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
+                if (targets.Count < 5)
+                    return;
+
+                InputManager.MoveMouseTo(targets[4]);
+            });
+            AddWaitStep("wait for tooltip to show", 5);
+            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddWaitStep("wait for tooltip to hide", 3);
         }
 
-        private Drawable generateUser(string username, int id, CountryCode countryCode, string cover, bool isTooltipEnabled, string? color = null)
+        private Drawable generateUser(string username, int id, CountryCode countryCode, string cover, bool onlyUsername, string? color = null)
         {
             return new ClickableAvatar(new APIUser
                 {
@@ -121,7 +125,7 @@ namespace osu.Game.Tests.Visual.Online
                     {
                         Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
                     },
-                    IsTooltipEnabled = isTooltipEnabled,
+                    ShowUsernameOnly = onlyUsername,
                 };
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
index cb1a846d6c..8cde7859b2 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4Extensions.FromHex(@"27252d"),
                     },
-                    avatar = new UpdateableAvatar { RelativeSizeAxes = Axes.Both },
+                    avatar = new UpdateableAvatar(showUsernameOnly: true) { RelativeSizeAxes = Axes.Both },
                 };
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
index 1814f5359f..65f0555612 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
@@ -289,7 +289,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 set => avatar.User = value;
             }
 
-            private readonly UpdateableAvatar avatar = new UpdateableAvatar { RelativeSizeAxes = Axes.Both };
+            private readonly UpdateableAvatar avatar = new UpdateableAvatar(showUsernameOnly: true) { RelativeSizeAxes = Axes.Both };
 
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colours)
diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index 376ce0b821..e7934016bc 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -1,44 +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;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
-using osu.Game.Localisation;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class ClickableAvatar : OsuClickableContainer, IHasCustomTooltip<APIUser>
+    public partial class ClickableAvatar : OsuClickableContainer, IHasCustomTooltip<ClickableAvatar.APIUserTooltipContent>
     {
-        public ITooltip<APIUser> GetCustomTooltip()
-        {
-            return new APIUserTooltip(user);
-        }
+        // public ITooltip<APIUser> GetCustomTooltip() => new APIUserTooltip(user!) { ShowTooltip = TooltipEnabled };
+        public ITooltip<APIUserTooltipContent> GetCustomTooltip() => new APIUserTooltip(new APIUserTooltipContent(user!));
 
-        public APIUser? TooltipContent => user;
-
-        public override LocalisableString TooltipText
-        {
-            get
-            {
-                if (!Enabled.Value)
-                    return string.Empty;
-
-                return !IsTooltipEnabled ? (user?.Username ?? string.Empty) : ContextMenuStrings.ViewProfile;
-            }
-            set => throw new NotSupportedException();
-        }
-
-        public bool IsTooltipEnabled { get; set; }
+        public APIUserTooltipContent TooltipContent => content;
 
+        private readonly APIUserTooltipContent content;
         private readonly APIUser? user;
+        private bool tooltipEnabled;
+
+        public override LocalisableString TooltipText => user!.Username;
+
+        public bool ShowUsernameOnly
+        {
+            get => tooltipEnabled;
+            set
+            {
+                tooltipEnabled = value;
+                content.ShowUsernameOnly = ShowUsernameOnly;
+            }
+        }
 
         [Resolved]
         private OsuGame? game { get; set; }
@@ -53,11 +52,8 @@ namespace osu.Game.Users.Drawables
 
             if (user?.Id != APIUser.SYSTEM_USER_ID)
                 Action = openProfile;
-        }
 
-        public void SetValue(out bool value)
-        {
-            value = IsTooltipEnabled;
+            content = new APIUserTooltipContent(user!, ShowUsernameOnly);
         }
 
         [BackgroundDependencyLoader]
@@ -80,23 +76,57 @@ namespace osu.Game.Users.Drawables
             return base.OnClick(e);
         }
 
-        public partial class APIUserTooltip : VisibilityContainer, ITooltip<APIUser>
+        public partial class APIUserTooltip : VisibilityContainer, ITooltip<APIUserTooltipContent>
         {
-            private APIUser? user;
-
-            public APIUserTooltip(APIUser? user)
+            private OsuSpriteText text;
+            private APIUserTooltipContent content;
+            public APIUserTooltip(APIUserTooltipContent content)
             {
-                this.user = user;
+                this.content = content;
+                AutoSizeAxes = Axes.Both;
+                Masking = true;
+                CornerRadius = 5;
+
+                Child = new UserGridPanel(content.User)
+                {
+                    Width = 300
+                };
+                text = new OsuSpriteText()
+                {
+                    Text = this.content.User.Username
+                };
             }
 
             protected override void PopIn()
             {
-                if (user is null)
+                if (content.ShowUsernameOnly)
                 {
-                    return;
+                    Child = new UserGridPanel(content.User)
+                    {
+                        Width = 300
+                    };
+                }
+                else
+                {
+                    Alpha = 0;
+                    AutoSizeAxes = Axes.Both;
+
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.Gray,
+                        },
+                        text = new OsuSpriteText()
+                        {
+                            Font = FrameworkFont.Regular.With(size: 16),
+                            Padding = new MarginPadding(5),
+                            Text = content.User.Username
+                        }
+                    };
                 }
 
-                Child = new UserGridPanel(user);
                 this.FadeIn(20, Easing.OutQuint);
             }
 
@@ -104,9 +134,22 @@ namespace osu.Game.Users.Drawables
 
             public void Move(Vector2 pos) => Position = pos;
 
-            public void SetContent(APIUser user)
+            public void SetContent(APIUserTooltipContent content)
             {
-                this.user = user;
+                this.content = content;
+                text.Text = this.content.User.Username;
+            }
+        }
+
+        public class APIUserTooltipContent
+        {
+            public APIUser User { get; }
+            public bool ShowUsernameOnly { get; set; }
+
+            public APIUserTooltipContent(APIUser user, bool showUsernameOnly = false)
+            {
+                User = user;
+                ShowUsernameOnly = showUsernameOnly;
             }
         }
     }
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index 64d64c56ce..f6363f61e6 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -47,20 +47,20 @@ namespace osu.Game.Users.Drawables
 
         private readonly bool isInteractive;
         private readonly bool showGuestOnNull;
-        private readonly bool showUserPanel;
+        private readonly bool showUsernameOnly;
 
         /// <summary>
         /// Construct a new UpdateableAvatar.
         /// </summary>
         /// <param name="user">The initial user to display.</param>
         /// <param name="isInteractive">If set to true, hover/click sounds will play and clicking the avatar will open the user's profile.</param>
-        /// <param name="showUserPanel">If set to true, the user status panel will be displayed in the tooltip.</param>
+        /// <param name="showUsernameOnly">If set to true, the user status panel will be displayed in the tooltip.</param>
         /// <param name="showGuestOnNull">Whether to show a default guest representation on null user (as opposed to nothing).</param>
-        public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showUserPanel = true, bool showGuestOnNull = true)
+        public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showUsernameOnly = false, bool showGuestOnNull = true)
         {
             this.isInteractive = isInteractive;
             this.showGuestOnNull = showGuestOnNull;
-            this.showUserPanel = showUserPanel;
+            this.showUsernameOnly = showUsernameOnly;
 
             User = user;
         }
@@ -75,7 +75,6 @@ namespace osu.Game.Users.Drawables
                 return new ClickableAvatar(user)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    IsTooltipEnabled = showUserPanel
                 };
             }
             else

From 4900a91c60fda24f76aeba4d2d2bf42cc1929e2d Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Thu, 9 Nov 2023 13:27:09 +0100
Subject: [PATCH 1434/2296] fixed static analysis problems and finished the
 implementation

---
 .../Online/TestSceneUserClickableAvatar.cs    | 40 +++++++++----------
 osu.Game/Users/Drawables/ClickableAvatar.cs   | 12 +++---
 osu.Game/Users/Drawables/UpdateableAvatar.cs  | 11 +++--
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
index 9217104aa8..50e5653ad5 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
@@ -105,28 +105,28 @@ namespace osu.Game.Tests.Visual.Online
         private Drawable generateUser(string username, int id, CountryCode countryCode, string cover, bool onlyUsername, string? color = null)
         {
             return new ClickableAvatar(new APIUser
+            {
+                Username = username,
+                Id = id,
+                CountryCode = countryCode,
+                CoverUrl = cover,
+                Colour = color ?? "000000",
+                Status =
                 {
-                    Username = username,
-                    Id = id,
-                    CountryCode = countryCode,
-                    CoverUrl = cover,
-                    Colour = color ?? "000000",
-                    Status =
-                    {
-                        Value = new UserStatusOnline()
-                    },
-                })
+                    Value = new UserStatusOnline()
+                },
+            })
+            {
+                Width = 50,
+                Height = 50,
+                CornerRadius = 10,
+                Masking = true,
+                EdgeEffect = new EdgeEffectParameters
                 {
-                    Width = 50,
-                    Height = 50,
-                    CornerRadius = 10,
-                    Masking = true,
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
-                    },
-                    ShowUsernameOnly = onlyUsername,
-                };
+                    Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
+                },
+                ShowUsernameOnly = onlyUsername,
+            };
         }
     }
 }
diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index e7934016bc..de0bcad497 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -21,9 +21,8 @@ namespace osu.Game.Users.Drawables
         // public ITooltip<APIUser> GetCustomTooltip() => new APIUserTooltip(user!) { ShowTooltip = TooltipEnabled };
         public ITooltip<APIUserTooltipContent> GetCustomTooltip() => new APIUserTooltip(new APIUserTooltipContent(user!));
 
-        public APIUserTooltipContent TooltipContent => content;
+        public APIUserTooltipContent TooltipContent { get; }
 
-        private readonly APIUserTooltipContent content;
         private readonly APIUser? user;
         private bool tooltipEnabled;
 
@@ -35,7 +34,7 @@ namespace osu.Game.Users.Drawables
             set
             {
                 tooltipEnabled = value;
-                content.ShowUsernameOnly = ShowUsernameOnly;
+                TooltipContent.ShowUsernameOnly = ShowUsernameOnly;
             }
         }
 
@@ -53,7 +52,7 @@ namespace osu.Game.Users.Drawables
             if (user?.Id != APIUser.SYSTEM_USER_ID)
                 Action = openProfile;
 
-            content = new APIUserTooltipContent(user!, ShowUsernameOnly);
+            TooltipContent = new APIUserTooltipContent(user!, ShowUsernameOnly);
         }
 
         [BackgroundDependencyLoader]
@@ -80,6 +79,7 @@ namespace osu.Game.Users.Drawables
         {
             private OsuSpriteText text;
             private APIUserTooltipContent content;
+
             public APIUserTooltip(APIUserTooltipContent content)
             {
                 this.content = content;
@@ -91,7 +91,7 @@ namespace osu.Game.Users.Drawables
                 {
                     Width = 300
                 };
-                text = new OsuSpriteText()
+                text = new OsuSpriteText
                 {
                     Text = this.content.User.Username
                 };
@@ -118,7 +118,7 @@ namespace osu.Game.Users.Drawables
                             RelativeSizeAxes = Axes.Both,
                             Colour = Color4.Gray,
                         },
-                        text = new OsuSpriteText()
+                        text = new OsuSpriteText
                         {
                             Font = FrameworkFont.Regular.With(size: 16),
                             Padding = new MarginPadding(5),
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index f6363f61e6..f220ee5a25 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -75,15 +75,14 @@ namespace osu.Game.Users.Drawables
                 return new ClickableAvatar(user)
                 {
                     RelativeSizeAxes = Axes.Both,
+                    ShowUsernameOnly = showUsernameOnly
                 };
             }
-            else
+
+            return new DrawableAvatar(user)
             {
-                return new DrawableAvatar(user)
-                {
-                    RelativeSizeAxes = Axes.Both,
-                };
-            }
+                RelativeSizeAxes = Axes.Both,
+            };
         }
     }
 }

From 4fa158e0d832f44cddefac1b0dd7b94f879e3993 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Nov 2023 21:35:37 +0900
Subject: [PATCH 1435/2296] Split tournament player lists more equally

---
 .../Components/DrawableTeamWithPlayers.cs             | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
index 4f0c7d6b72..fd7a51140b 100644
--- a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
@@ -1,7 +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.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -17,6 +19,11 @@ namespace osu.Game.Tournament.Components
         {
             AutoSizeAxes = Axes.Both;
 
+            var players = team?.Players ?? new BindableList<TournamentUser>();
+
+            // split the players into two even columns, favouring the first column if odd.
+            int split = (int)Math.Ceiling(players.Count / 2f);
+
             InternalChildren = new Drawable[]
             {
                 new FillFlowContainer
@@ -39,13 +46,13 @@ namespace osu.Game.Tournament.Components
                                 {
                                     Direction = FillDirection.Vertical,
                                     AutoSizeAxes = Axes.Both,
-                                    ChildrenEnumerable = team?.Players.Select(createPlayerText).Take(5) ?? Enumerable.Empty<Drawable>()
+                                    ChildrenEnumerable = players.Take(split).Select(createPlayerText),
                                 },
                                 new FillFlowContainer
                                 {
                                     Direction = FillDirection.Vertical,
                                     AutoSizeAxes = Axes.Both,
-                                    ChildrenEnumerable = team?.Players.Select(createPlayerText).Skip(5) ?? Enumerable.Empty<Drawable>()
+                                    ChildrenEnumerable = players.Skip(split).Select(createPlayerText),
                                 },
                             }
                         },

From 1ae3265f925911c3a1f7f640805765b68dc5d335 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Nov 2023 21:24:30 +0900
Subject: [PATCH 1436/2296] Update tests in line with new behaviour

---
 .../OsuDifficultyCalculatorTest.cs            | 20 +++++------
 .../TestSceneSliderInput.cs                   | 36 ++++++++++++-------
 .../Rulesets/Scoring/HitResultTest.cs         |  2 +-
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index 7b7deb9c67..1d76c24620 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -15,22 +15,22 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
 
-        [TestCase(6.710442985146793d, 206, "diffcalc-test")]
-        [TestCase(1.4386882251130073d, 45, "zero-length-sliders")]
-        [TestCase(0.42506480230838789d, 2, "very-fast-slider")]
-        [TestCase(0.14102693012101306d, 1, "nan-slider")]
+        [TestCase(6.710442985146793d, 239, "diffcalc-test")]
+        [TestCase(1.4386882251130073d, 54, "zero-length-sliders")]
+        [TestCase(0.42506480230838789d, 4, "very-fast-slider")]
+        [TestCase(0.14102693012101306d, 2, "nan-slider")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)
             => base.Test(expectedStarRating, expectedMaxCombo, name);
 
-        [TestCase(8.9742952703071666d, 206, "diffcalc-test")]
-        [TestCase(0.55071082800473514d, 2, "very-fast-slider")]
-        [TestCase(1.743180218215227d, 45, "zero-length-sliders")]
+        [TestCase(8.9742952703071666d, 239, "diffcalc-test")]
+        [TestCase(0.55071082800473514d, 4, "very-fast-slider")]
+        [TestCase(1.743180218215227d, 54, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModDoubleTime());
 
-        [TestCase(6.710442985146793d, 239, "diffcalc-test")]
-        [TestCase(0.42506480230838789d, 4, "very-fast-slider")]
-        [TestCase(1.4386882251130073d, 54, "zero-length-sliders")]
+        [TestCase(6.710442985146793d, 272, "diffcalc-test")]
+        [TestCase(0.42506480230838789d, 6, "very-fast-slider")]
+        [TestCase(1.4386882251130073d, 63, "zero-length-sliders")]
         public void TestClassicMod(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModClassic());
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index f718a5069f..1e295aae70 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             if (hit)
                 assertAllMaxJudgements();
             else
-                AddAssert("Tracking dropped", assertMidSliderJudgementFail);
+                assertMidSliderJudgementFail();
 
             AddAssert("Head judgement is first", () => judgementResults.First().HitObject is SliderHeadCircle);
 
@@ -197,7 +197,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_during_slide_1 },
             });
 
-            AddAssert("Tracking lost", assertMidSliderJudgementFail);
+            assertMidSliderJudgementFail();
         }
 
         /// <summary>
@@ -278,7 +278,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_before_slider },
             });
 
-            AddAssert("Tracking retained, sliderhead miss", assertHeadMissTailTracked);
+            assertHeadMissTailTracked();
         }
 
         /// <summary>
@@ -302,7 +302,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_during_slide_4 },
             });
 
-            AddAssert("Tracking re-acquired", assertMidSliderJudgements);
+            assertMidSliderJudgements();
         }
 
         /// <summary>
@@ -328,7 +328,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_during_slide_4 },
             });
 
-            AddAssert("Tracking lost", assertMidSliderJudgementFail);
+            assertMidSliderJudgementFail();
         }
 
         /// <summary>
@@ -350,7 +350,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_during_slide_4 },
             });
 
-            AddAssert("Tracking acquired", assertMidSliderJudgements);
+            assertMidSliderJudgements();
         }
 
         /// <summary>
@@ -373,7 +373,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_during_slide_2 },
             });
 
-            AddAssert("Tracking acquired", assertMidSliderJudgements);
+            assertMidSliderJudgements();
         }
 
         [Test]
@@ -387,7 +387,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.RightButton }, Time = time_during_slide_2 },
             });
 
-            AddAssert("Tracking acquired", assertMidSliderJudgements);
+            assertMidSliderJudgements();
         }
 
         /// <summary>
@@ -412,7 +412,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_during_slide_4 },
             });
 
-            AddAssert("Tracking acquired", assertMidSliderJudgements);
+            assertMidSliderJudgements();
         }
 
         /// <summary>
@@ -454,7 +454,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.201f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
-            AddAssert("Tracking dropped", assertMidSliderJudgementFail);
+            assertMidSliderJudgementFail();
         }
 
         private void assertAllMaxJudgements()
@@ -465,11 +465,21 @@ namespace osu.Game.Rulesets.Osu.Tests
             }, () => Is.EqualTo(judgementResults.Select(j => (j.HitObject, j.Judgement.MaxResult))));
         }
 
-        private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.SmallTickHit && !judgementResults.First().IsHit;
+        private void assertHeadMissTailTracked()
+        {
+            AddAssert("Tracking retained", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.LargeTickHit));
+            AddAssert("Slider head misseed", () => judgementResults.First().IsHit, () => Is.False);
+        }
 
-        private bool assertMidSliderJudgements() => judgementResults[^2].Type == HitResult.SmallTickHit;
+        private void assertMidSliderJudgements()
+        {
+            AddAssert("Tracking acquired", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.LargeTickHit));
+        }
 
-        private bool assertMidSliderJudgementFail() => judgementResults[^2].Type == HitResult.SmallTickMiss;
+        private void assertMidSliderJudgementFail()
+        {
+            AddAssert("Tracking lost", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.IgnoreMiss));
+        }
 
         private void performTest(List<ReplayFrame> frames, Slider? slider = null, double? bpm = null, int? tickRate = null)
         {
diff --git a/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs b/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs
index 68d7335055..72acd18c5b 100644
--- a/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(new[] { HitResult.IgnoreHit }, new[] { HitResult.IgnoreMiss, HitResult.ComboBreak })]
         public void TestValidResultPairs(HitResult[] maxResults, HitResult[] minResults)
         {
-            HitResult[] unsupportedResults = HitResultExtensions.ALL_TYPES.Where(t => !minResults.Contains(t)).ToArray();
+            HitResult[] unsupportedResults = HitResultExtensions.ALL_TYPES.Where(t => t != HitResult.IgnoreMiss && !minResults.Contains(t)).ToArray();
 
             Assert.Multiple(() =>
             {

From edef31f426f8568afc3abf53b7611e525308c1d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Nov 2023 21:48:41 +0900
Subject: [PATCH 1437/2296] Correctly propagate classic behaviour flag to tail

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 7f2d9592af..cb6827b428 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -135,6 +135,8 @@ namespace osu.Game.Rulesets.Osu.Objects
                 classicSliderBehaviour = value;
                 if (HeadCircle != null)
                     HeadCircle.ClassicSliderBehaviour = value;
+                if (TailCircle != null)
+                    TailCircle.ClassicSliderBehaviour = value;
             }
         }
 
@@ -218,6 +220,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                             StartTime = e.Time,
                             Position = EndPosition,
                             StackHeight = StackHeight,
+                            ClassicSliderBehaviour = ClassicSliderBehaviour,
                         });
                         break;
 

From 615d8384abcc3c412a831a70a73ed0f6c6173467 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 9 Nov 2023 22:27:29 +0900
Subject: [PATCH 1438/2296] Refactor everythign back to sanity

---
 .../Cards/Statistics/BeatmapCardStatistic.cs  |  2 +-
 osu.Game/Users/Drawables/ClickableAvatar.cs   | 93 +++----------------
 2 files changed, 13 insertions(+), 82 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/Cards/Statistics/BeatmapCardStatistic.cs b/osu.Game/Beatmaps/Drawables/Cards/Statistics/BeatmapCardStatistic.cs
index 10de2b9128..6fd7142c05 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/Statistics/BeatmapCardStatistic.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/Statistics/BeatmapCardStatistic.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Statistics
 
         #region Tooltip implementation
 
-        public virtual ITooltip GetCustomTooltip() => null;
+        public virtual ITooltip GetCustomTooltip() => null!;
         public virtual object TooltipContent => null;
 
         #endregion
diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index de0bcad497..48a12acb5e 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -5,38 +5,25 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class ClickableAvatar : OsuClickableContainer, IHasCustomTooltip<ClickableAvatar.APIUserTooltipContent>
+    public partial class ClickableAvatar : OsuClickableContainer, IHasCustomTooltip<APIUser?>
     {
         // public ITooltip<APIUser> GetCustomTooltip() => new APIUserTooltip(user!) { ShowTooltip = TooltipEnabled };
-        public ITooltip<APIUserTooltipContent> GetCustomTooltip() => new APIUserTooltip(new APIUserTooltipContent(user!));
+        public ITooltip<APIUser?> GetCustomTooltip() => new UserCardTooltip();
 
-        public APIUserTooltipContent TooltipContent { get; }
+        public APIUser? TooltipContent { get; }
 
         private readonly APIUser? user;
-        private bool tooltipEnabled;
 
-        public override LocalisableString TooltipText => user!.Username;
-
-        public bool ShowUsernameOnly
-        {
-            get => tooltipEnabled;
-            set
-            {
-                tooltipEnabled = value;
-                TooltipContent.ShowUsernameOnly = ShowUsernameOnly;
-            }
-        }
+        // TODO: reimplement.
+        public bool ShowUsernameOnly { get; set; }
 
         [Resolved]
         private OsuGame? game { get; set; }
@@ -47,12 +34,10 @@ namespace osu.Game.Users.Drawables
         /// <param name="user">The user. A null value will get a placeholder avatar.</param>
         public ClickableAvatar(APIUser? user = null)
         {
-            this.user = user;
-
             if (user?.Id != APIUser.SYSTEM_USER_ID)
                 Action = openProfile;
 
-            TooltipContent = new APIUserTooltipContent(user!, ShowUsernameOnly);
+            TooltipContent = this.user = user;
         }
 
         [BackgroundDependencyLoader]
@@ -75,58 +60,17 @@ namespace osu.Game.Users.Drawables
             return base.OnClick(e);
         }
 
-        public partial class APIUserTooltip : VisibilityContainer, ITooltip<APIUserTooltipContent>
+        public partial class UserCardTooltip : VisibilityContainer, ITooltip<APIUser?>
         {
-            private OsuSpriteText text;
-            private APIUserTooltipContent content;
-
-            public APIUserTooltip(APIUserTooltipContent content)
+            public UserCardTooltip()
             {
-                this.content = content;
                 AutoSizeAxes = Axes.Both;
                 Masking = true;
                 CornerRadius = 5;
-
-                Child = new UserGridPanel(content.User)
-                {
-                    Width = 300
-                };
-                text = new OsuSpriteText
-                {
-                    Text = this.content.User.Username
-                };
             }
 
             protected override void PopIn()
             {
-                if (content.ShowUsernameOnly)
-                {
-                    Child = new UserGridPanel(content.User)
-                    {
-                        Width = 300
-                    };
-                }
-                else
-                {
-                    Alpha = 0;
-                    AutoSizeAxes = Axes.Both;
-
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.Gray,
-                        },
-                        text = new OsuSpriteText
-                        {
-                            Font = FrameworkFont.Regular.With(size: 16),
-                            Padding = new MarginPadding(5),
-                            Text = content.User.Username
-                        }
-                    };
-                }
-
                 this.FadeIn(20, Easing.OutQuint);
             }
 
@@ -134,23 +78,10 @@ namespace osu.Game.Users.Drawables
 
             public void Move(Vector2 pos) => Position = pos;
 
-            public void SetContent(APIUserTooltipContent content)
+            public void SetContent(APIUser? content) => LoadComponentAsync(new UserGridPanel(content ?? new GuestUser())
             {
-                this.content = content;
-                text.Text = this.content.User.Username;
-            }
-        }
-
-        public class APIUserTooltipContent
-        {
-            public APIUser User { get; }
-            public bool ShowUsernameOnly { get; set; }
-
-            public APIUserTooltipContent(APIUser user, bool showUsernameOnly = false)
-            {
-                User = user;
-                ShowUsernameOnly = showUsernameOnly;
-            }
+                Width = 300,
+            }, panel => Child = panel);
         }
     }
 }

From 51cf85a9ab3806fe9294d33b24c52165a08aed6b Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 9 Nov 2023 13:22:49 +0100
Subject: [PATCH 1439/2296] Add touch input settings to android

Also updates touch settings so the touch handler can't be disabled on mobile.
---
 osu.Android/OsuGameAndroid.cs                        |  4 ++++
 .../Settings/Sections/Input/TouchSettings.cs         | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index dea70e6b27..52cfb67f42 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -11,6 +11,7 @@ using osu.Framework.Input.Handlers;
 using osu.Framework.Platform;
 using osu.Game;
 using osu.Game.Overlays.Settings;
+using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Updater;
 using osu.Game.Utils;
 
@@ -97,6 +98,9 @@ namespace osu.Android
                 case AndroidJoystickHandler jh:
                     return new AndroidJoystickSettings(jh);
 
+                case AndroidTouchHandler th:
+                    return new TouchSettings(th);
+
                 default:
                     return base.CreateSettingsSubsectionFor(handler);
             }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
index 175fcc4709..0056de6674 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TouchSettings.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Input.Handlers;
 using osu.Framework.Localisation;
@@ -28,11 +29,14 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig)
         {
-            Add(new SettingsCheckbox
+            if (!RuntimeInfo.IsMobile) // don't allow disabling the only input method (touch) on mobile.
             {
-                LabelText = CommonStrings.Enabled,
-                Current = handler.Enabled
-            });
+                Add(new SettingsCheckbox
+                {
+                    LabelText = CommonStrings.Enabled,
+                    Current = handler.Enabled
+                });
+            }
 
             Add(new SettingsCheckbox
             {

From 0c4c9aa4b515840611b3b39017ff73d04a3ecf1b Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 9 Nov 2023 14:37:10 +0100
Subject: [PATCH 1440/2296] Show touch taps setting in player loader on mobile
 platforms

---
 osu.Game/Screens/Play/PlayerSettings/InputSettings.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs b/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
index 852fbd8dcc..1387e01305 100644
--- a/osu.Game/Screens/Play/PlayerSettings/InputSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/InputSettings.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 osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
@@ -22,8 +23,9 @@ namespace osu.Game.Screens.Play.PlayerSettings
             {
                 new PlayerCheckbox
                 {
-                    LabelText = MouseSettingsStrings.DisableClicksDuringGameplay,
-                    Current = config.GetBindable<bool>(OsuSetting.MouseDisableButtons)
+                    // TODO: change to touchscreen detection once https://github.com/ppy/osu/pull/25348 makes it in
+                    LabelText = RuntimeInfo.IsDesktop ? MouseSettingsStrings.DisableClicksDuringGameplay : TouchSettingsStrings.DisableTapsDuringGameplay,
+                    Current = config.GetBindable<bool>(RuntimeInfo.IsDesktop ? OsuSetting.MouseDisableButtons : OsuSetting.TouchDisableGameplayTaps)
                 }
             };
         }

From 1b08f317fbd1fac55276dc05c29b0339667f2871 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 9 Nov 2023 15:12:24 +0100
Subject: [PATCH 1441/2296] Show touch input settings on iOS

This does not cover android since `TouchHandler` is SDL-based.
---
 osu.Game/OsuGameBase.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 1f46eb0c0d..f44dac5f5a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -575,14 +575,14 @@ namespace osu.Game
 
                     case JoystickHandler jh:
                         return new JoystickSettings(jh);
-
-                    case TouchHandler th:
-                        return new TouchSettings(th);
                 }
             }
 
             switch (handler)
             {
+                case TouchHandler th:
+                    return new TouchSettings(th);
+
                 case MidiHandler:
                     return new InputSection.HandlerSection(handler);
 

From d4722a398892a18f14e868ff471e9132004da8fd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 9 Nov 2023 17:20:05 +0300
Subject: [PATCH 1442/2296] Add failing test case

---
 .../TestSceneBackgroundScreenDefault.cs       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs b/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
index 1523ae7027..e902303505 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
@@ -181,6 +181,30 @@ namespace osu.Game.Tests.Visual.Background
             AddStep("restore default beatmap", () => Beatmap.SetDefault());
         }
 
+        [Test]
+        public void TestBeatmapBackgroundWithStoryboardUnloadedOnSuspension()
+        {
+            BackgroundScreenBeatmap nestedScreen = null;
+
+            setSupporter(true);
+            setSourceMode(BackgroundSource.BeatmapWithStoryboard);
+
+            AddStep("change beatmap", () => Beatmap.Value = createTestWorkingBeatmapWithStoryboard());
+            AddAssert("background changed", () => screen.CheckLastLoadChange() == true);
+            AddUntilStep("wait for beatmap background to be loaded", () => getCurrentBackground()?.GetType() == typeof(BeatmapBackgroundWithStoryboard));
+
+            AddUntilStep("storyboard present", () => screen.ChildrenOfType<DrawableStoryboard>().SingleOrDefault()?.IsLoaded == true);
+
+            AddStep("push new background to stack", () => stack.Push(nestedScreen = new BackgroundScreenBeatmap(Beatmap.Value)));
+            AddUntilStep("wait for screen to load", () => nestedScreen.IsLoaded && nestedScreen.IsCurrentScreen());
+
+            AddUntilStep("storyboard unloaded", () => !screen.ChildrenOfType<DrawableStoryboard>().Any());
+
+            AddStep("go back", () => screen.MakeCurrent());
+
+            AddUntilStep("storyboard reloaded", () => screen.ChildrenOfType<DrawableStoryboard>().SingleOrDefault()?.IsLoaded == true);
+        }
+
         [Test]
         public void TestBackgroundTypeSwitch()
         {

From bd8409219f079bcdd922ae2169d676608e512364 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 8 Nov 2023 06:37:29 +0300
Subject: [PATCH 1443/2296] Unload beatmap storyboard background when no longer
 present

---
 .../BeatmapBackgroundWithStoryboard.cs        | 50 +++++++++++++++++--
 osu.Game/Screens/BackgroundScreen.cs          |  3 +-
 osu.Game/Screens/BackgroundScreenStack.cs     |  3 ++
 .../Backgrounds/BackgroundScreenDefault.cs    | 22 ++++++++
 4 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
index 9c0d109ce4..e78a93396e 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
@@ -1,15 +1,21 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
 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.Threading;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens;
 using osu.Game.Storyboards.Drawables;
 
 namespace osu.Game.Graphics.Backgrounds
@@ -18,6 +24,10 @@ namespace osu.Game.Graphics.Backgrounds
     {
         private readonly InterpolatingFramedClock storyboardClock;
 
+        private AudioContainer storyboardContainer = null!;
+        private DrawableStoryboard? drawableStoryboard;
+        private CancellationTokenSource? loadCancellationSource = new CancellationTokenSource();
+
         [Resolved(CanBeNull = true)]
         private MusicController? musicController { get; set; }
 
@@ -33,18 +43,48 @@ namespace osu.Game.Graphics.Backgrounds
         [BackgroundDependencyLoader]
         private void load()
         {
+            AddInternal(storyboardContainer = new AudioContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Volume = { Value = 0 },
+            });
+
+            LoadStoryboard();
+        }
+
+        public void LoadStoryboard()
+        {
+            Debug.Assert(drawableStoryboard == null);
+
             if (!Beatmap.Storyboard.HasDrawable)
                 return;
 
             if (Beatmap.Storyboard.ReplacesBackground)
                 Sprite.Alpha = 0;
 
-            LoadComponentAsync(new AudioContainer
+            LoadComponentAsync(drawableStoryboard = new DrawableStoryboard(Beatmap.Storyboard, mods.Value)
             {
-                RelativeSizeAxes = Axes.Both,
-                Volume = { Value = 0 },
-                Child = new DrawableStoryboard(Beatmap.Storyboard, mods.Value) { Clock = storyboardClock }
-            }, AddInternal);
+                Clock = storyboardClock
+            }, s =>
+            {
+                storyboardContainer.FadeInFromZero(BackgroundScreen.TRANSITION_LENGTH, Easing.OutQuint);
+                storyboardContainer.Add(s);
+            }, (loadCancellationSource = new CancellationTokenSource()).Token);
+        }
+
+        public void UnloadStoryboard(Action<DrawableStoryboard> scheduleStoryboardRemoval)
+        {
+            Debug.Assert(drawableStoryboard != null);
+
+            loadCancellationSource.AsNonNull().Cancel();
+            loadCancellationSource = null;
+
+            DrawableStoryboard s = drawableStoryboard;
+
+            storyboardContainer.FadeOut(BackgroundScreen.TRANSITION_LENGTH, Easing.OutQuint);
+            scheduleStoryboardRemoval(s);
+
+            drawableStoryboard = null;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index a7502f22d5..73af9b1bf2 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -13,7 +13,8 @@ namespace osu.Game.Screens
 {
     public abstract partial class BackgroundScreen : Screen, IEquatable<BackgroundScreen>
     {
-        protected const float TRANSITION_LENGTH = 500;
+        public const float TRANSITION_LENGTH = 500;
+
         private const float x_movement_amount = 50;
 
         private readonly bool animateOnEnter;
diff --git a/osu.Game/Screens/BackgroundScreenStack.cs b/osu.Game/Screens/BackgroundScreenStack.cs
index 99ca383b9f..3ec1835669 100644
--- a/osu.Game/Screens/BackgroundScreenStack.cs
+++ b/osu.Game/Screens/BackgroundScreenStack.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
+using osu.Game.Storyboards.Drawables;
 
 namespace osu.Game.Screens
 {
@@ -33,5 +34,7 @@ namespace osu.Game.Screens
             base.Push(screen);
             return true;
         }
+
+        public void ScheduleStoryboardDisposal(DrawableStoryboard storyboard) => Scheduler.AddDelayed(storyboard.RemoveAndDisposeImmediately, BackgroundScreen.TRANSITION_LENGTH);
     }
 }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index d9554c10e2..66835363b4 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -3,11 +3,14 @@
 
 #nullable disable
 
+using System.Diagnostics;
 using System.Threading;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
+using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -71,6 +74,25 @@ namespace osu.Game.Screens.Backgrounds
             void next() => Next();
         }
 
+        public override void OnSuspending(ScreenTransitionEvent e)
+        {
+            var backgroundScreenStack = Parent as BackgroundScreenStack;
+            Debug.Assert(backgroundScreenStack != null);
+
+            if (background is BeatmapBackgroundWithStoryboard storyboardBackground)
+                storyboardBackground.UnloadStoryboard(backgroundScreenStack.ScheduleStoryboardDisposal);
+
+            base.OnSuspending(e);
+        }
+
+        public override void OnResuming(ScreenTransitionEvent e)
+        {
+            if (background is BeatmapBackgroundWithStoryboard storyboardBackground)
+                storyboardBackground.LoadStoryboard();
+
+            base.OnResuming(e);
+        }
+
         private ScheduledDelegate nextTask;
         private CancellationTokenSource cancellationTokenSource;
 

From e451b2197c19503d357fc021984844d75d908c1f Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Thu, 9 Nov 2023 18:23:53 +0200
Subject: [PATCH 1444/2296] Delete util functions from rulesets

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 10 +++++-----
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 18 +++++++++---------
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 17 +++++++++--------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs |  7 +++----
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 816638ca87..421714e3b2 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -233,15 +233,15 @@ namespace osu.Game.Rulesets.Catch
             };
         }
 
-        public double PreemptFromAr(float AR) => AR < 5 ? (1200.0 + 600.0 * (5 - AR) / 5) : (1200.0 - 750.0 * (AR - 5) / 5);
-        public float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
-        public float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
-
         public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            adjustedDifficulty.ApproachRate = ChangeArFromRate(adjustedDifficulty.ApproachRate, rate);
+            double preempt = adjustedDifficulty.ApproachRate < 5 ?
+                (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) :
+                (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
+            preempt /= rate;
+            adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
 
             return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
         }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index cfdfcbadee..b8324b3f2f 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -428,18 +428,18 @@ namespace osu.Game.Rulesets.Mania
 
         public override DifficultySection CreateEditorDifficultySection() => new ManiaDifficultySection();
 
-        public double HitwindowFromOd(float OD) => 64.0 - 3 * OD;
-        public float OdFromHitwindow(double hitwindow300) => (float)(64.0 - hitwindow300) / 3;
-        public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
+        // Mania doesn't have rate-adjusted attributes anymore?
 
-        public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
-        {
-            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
+        //public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
+        //{
+        //    BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(adjustedDifficulty.OverallDifficulty, rate);
+        //    double hitwindow = 64.0 - 3 * adjustedDifficulty.OverallDifficulty;
+        //    hitwindow /= rate;
+        //    adjustedDifficulty.OverallDifficulty = (float)(64.0 - hitwindow) / 3;
 
-            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
-        }
+        //    return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+        //}
 
     }
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index bdbedf1409..26a51a0c48 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -329,18 +329,19 @@ namespace osu.Game.Rulesets.Osu
 
         public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
 
-        public double PreemptFromAr(float AR) => AR < 5 ? (1200.0 + 600.0 * (5 - AR) / 5) : (1200.0 - 750.0 * (AR - 5) / 5);
-        public float ArFromPreempt(double preempt) => (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
-        public double HitwindowFromOd(float OD) => 80.0 - 6 * OD;
-        public float OdFromHitwindow(double hitwindow300) => (float)(80.0 - hitwindow300) / 6;
-        public float ChangeArFromRate(float AR, double rate) => ArFromPreempt(PreemptFromAr(AR) / rate);
-        public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
         public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            adjustedDifficulty.ApproachRate = ChangeArFromRate(adjustedDifficulty.ApproachRate, rate);
-            adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(adjustedDifficulty.OverallDifficulty, rate);
+            double preempt = adjustedDifficulty.ApproachRate < 5 ?
+                (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) :
+                (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
+            preempt /= rate;
+            adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
+
+            double hitwindow = 80.0 - 6 * adjustedDifficulty.OverallDifficulty;
+            hitwindow /= rate;
+            adjustedDifficulty.OverallDifficulty = (float)(80.0 - hitwindow) / 6;
 
             return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
         }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 026ac4f42e..3f9f939245 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -263,15 +263,14 @@ namespace osu.Game.Rulesets.Taiko
                 }), true)
             };
         }
-        public double HitwindowFromOd(float OD) => 35.0 - 15.0 * (OD - 5) / 5;
-        public float OdFromHitwindow(double hitwindow300) => (float)(5 * (35 - hitwindow300) / 15 + 5);
-        public float ChangeOdFromRate(float OD, double rate) => OdFromHitwindow(HitwindowFromOd(OD) / rate);
 
         public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            adjustedDifficulty.OverallDifficulty = ChangeOdFromRate(adjustedDifficulty.OverallDifficulty, rate);
+            double hitwindow = 35.0 - 15.0 * (adjustedDifficulty.OverallDifficulty - 5) / 5;
+            hitwindow /= rate;
+            adjustedDifficulty.OverallDifficulty = (float)(5 * (35 - hitwindow) / 15 + 5);
 
             return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
         }

From 768a31b2f5ec05907f2e1cf18d4bb3f63ae83da1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 9 Nov 2023 22:56:48 +0300
Subject: [PATCH 1445/2296] Fix background crash on a beatmap with no
 storyboard

---
 .../Backgrounds/BeatmapBackgroundWithStoryboard.cs        | 8 +++-----
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs   | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
index e78a93396e..75cebb275f 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Threading;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
@@ -74,15 +73,14 @@ namespace osu.Game.Graphics.Backgrounds
 
         public void UnloadStoryboard(Action<DrawableStoryboard> scheduleStoryboardRemoval)
         {
-            Debug.Assert(drawableStoryboard != null);
+            if (drawableStoryboard == null)
+                return;
 
             loadCancellationSource.AsNonNull().Cancel();
             loadCancellationSource = null;
 
-            DrawableStoryboard s = drawableStoryboard;
-
             storyboardContainer.FadeOut(BackgroundScreen.TRANSITION_LENGTH, Easing.OutQuint);
-            scheduleStoryboardRemoval(s);
+            scheduleStoryboardRemoval(drawableStoryboard);
 
             drawableStoryboard = null;
         }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 66835363b4..e22f61d806 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -5,7 +5,6 @@
 
 using System.Diagnostics;
 using System.Threading;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;

From cc9aeb53079f6f00af307fb0544e0335d9eebcc8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 9 Nov 2023 22:57:12 +0300
Subject: [PATCH 1446/2296] Add test coverage

---
 .../TestSceneBackgroundScreenDefault.cs       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs b/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
index e902303505..37f2ee0b3f 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
@@ -205,6 +205,30 @@ namespace osu.Game.Tests.Visual.Background
             AddUntilStep("storyboard reloaded", () => screen.ChildrenOfType<DrawableStoryboard>().SingleOrDefault()?.IsLoaded == true);
         }
 
+        [Test]
+        public void TestBeatmapBackgroundWithStoryboardButBeatmapHasNone()
+        {
+            BackgroundScreenBeatmap nestedScreen = null;
+
+            setSupporter(true);
+            setSourceMode(BackgroundSource.BeatmapWithStoryboard);
+
+            AddStep("change beatmap", () => Beatmap.Value = createTestWorkingBeatmapWithUniqueBackground());
+            AddAssert("background changed", () => screen.CheckLastLoadChange() == true);
+            AddUntilStep("wait for beatmap background to be loaded", () => getCurrentBackground()?.GetType() == typeof(BeatmapBackgroundWithStoryboard));
+
+            AddUntilStep("no storyboard loaded", () => !screen.ChildrenOfType<DrawableStoryboard>().Any());
+
+            AddStep("push new background to stack", () => stack.Push(nestedScreen = new BackgroundScreenBeatmap(Beatmap.Value)));
+            AddUntilStep("wait for screen to load", () => nestedScreen.IsLoaded && nestedScreen.IsCurrentScreen());
+
+            AddUntilStep("still no storyboard", () => !screen.ChildrenOfType<DrawableStoryboard>().Any());
+
+            AddStep("go back", () => screen.MakeCurrent());
+
+            AddUntilStep("still no storyboard", () => !screen.ChildrenOfType<DrawableStoryboard>().Any());
+        }
+
         [Test]
         public void TestBackgroundTypeSwitch()
         {

From e9471589697083d8ea2214b299aca226085e7de9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 9 Nov 2023 23:03:01 +0300
Subject: [PATCH 1447/2296] Remove fade out transition

Unnecessary addition from this PR, makes the background fade to ugly black during transition between screens.
---
 osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
index 75cebb275f..9a3d64549b 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
@@ -79,7 +79,6 @@ namespace osu.Game.Graphics.Backgrounds
             loadCancellationSource.AsNonNull().Cancel();
             loadCancellationSource = null;
 
-            storyboardContainer.FadeOut(BackgroundScreen.TRANSITION_LENGTH, Easing.OutQuint);
             scheduleStoryboardRemoval(drawableStoryboard);
 
             drawableStoryboard = null;

From 59998b507acf084cc8d4ffbe85e16d1f3fab9229 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 9 Nov 2023 23:23:49 +0300
Subject: [PATCH 1448/2296] Hide background sprite when storyboard finishes
 loading

---
 .../BeatmapBackgroundWithStoryboard.cs           | 16 +++++++++++-----
 osu.Game/Screens/BackgroundScreenStack.cs        |  4 ++--
 .../Backgrounds/BackgroundScreenDefault.cs       |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
index 9a3d64549b..1e702967b6 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
@@ -58,20 +58,20 @@ namespace osu.Game.Graphics.Backgrounds
             if (!Beatmap.Storyboard.HasDrawable)
                 return;
 
-            if (Beatmap.Storyboard.ReplacesBackground)
-                Sprite.Alpha = 0;
-
             LoadComponentAsync(drawableStoryboard = new DrawableStoryboard(Beatmap.Storyboard, mods.Value)
             {
                 Clock = storyboardClock
             }, s =>
             {
+                if (Beatmap.Storyboard.ReplacesBackground)
+                    Sprite.FadeOut(BackgroundScreen.TRANSITION_LENGTH, Easing.InQuint);
+
                 storyboardContainer.FadeInFromZero(BackgroundScreen.TRANSITION_LENGTH, Easing.OutQuint);
                 storyboardContainer.Add(s);
             }, (loadCancellationSource = new CancellationTokenSource()).Token);
         }
 
-        public void UnloadStoryboard(Action<DrawableStoryboard> scheduleStoryboardRemoval)
+        public void UnloadStoryboard(Action<Action> scheduleStoryboardRemoval)
         {
             if (drawableStoryboard == null)
                 return;
@@ -79,7 +79,13 @@ namespace osu.Game.Graphics.Backgrounds
             loadCancellationSource.AsNonNull().Cancel();
             loadCancellationSource = null;
 
-            scheduleStoryboardRemoval(drawableStoryboard);
+            DrawableStoryboard s = drawableStoryboard;
+
+            scheduleStoryboardRemoval(() =>
+            {
+                s.RemoveAndDisposeImmediately();
+                Sprite.Alpha = 1f;
+            });
 
             drawableStoryboard = null;
         }
diff --git a/osu.Game/Screens/BackgroundScreenStack.cs b/osu.Game/Screens/BackgroundScreenStack.cs
index 3ec1835669..9af6601aa4 100644
--- a/osu.Game/Screens/BackgroundScreenStack.cs
+++ b/osu.Game/Screens/BackgroundScreenStack.cs
@@ -1,10 +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 osu.Framework.Graphics;
 using osu.Framework.Screens;
-using osu.Game.Storyboards.Drawables;
 
 namespace osu.Game.Screens
 {
@@ -35,6 +35,6 @@ namespace osu.Game.Screens
             return true;
         }
 
-        public void ScheduleStoryboardDisposal(DrawableStoryboard storyboard) => Scheduler.AddDelayed(storyboard.RemoveAndDisposeImmediately, BackgroundScreen.TRANSITION_LENGTH);
+        internal void ScheduleToTransitionEnd(Action action) => Scheduler.AddDelayed(action, BackgroundScreen.TRANSITION_LENGTH);
     }
 }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index e22f61d806..07b1cc6df4 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Screens.Backgrounds
             Debug.Assert(backgroundScreenStack != null);
 
             if (background is BeatmapBackgroundWithStoryboard storyboardBackground)
-                storyboardBackground.UnloadStoryboard(backgroundScreenStack.ScheduleStoryboardDisposal);
+                storyboardBackground.UnloadStoryboard(backgroundScreenStack.ScheduleToTransitionEnd);
 
             base.OnSuspending(e);
         }

From 6f5d905ce766da9b2e3753585a41298118e9c6b9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 10 Nov 2023 00:34:29 +0300
Subject: [PATCH 1449/2296] Update argon accuracy counter design

---
 .../Screens/Play/HUD/ArgonAccuracyCounter.cs  | 59 +++++++++++-
 .../Play/HUD/ArgonCounterTextComponent.cs     | 94 ++++++++++---------
 .../Screens/Play/HUD/ArgonScoreCounter.cs     |  5 -
 3 files changed, 107 insertions(+), 51 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
index 0414cbaea4..160841b40f 100644
--- a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
@@ -3,7 +3,9 @@
 
 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.Skinning;
 using osuTK;
@@ -22,9 +24,64 @@ namespace osu.Game.Screens.Play.HUD
 
         public bool UsesFixedAnchor { get; set; }
 
-        protected override IHasText CreateText() => new ArgonCounterTextComponent(Anchor.TopLeft, "ACCURACY", new Vector2(-4, 0))
+        protected override IHasText CreateText() => new ArgonAccuracyTextComponent
         {
             WireframeOpacity = { BindTarget = WireframeOpacity },
         };
+
+        private partial class ArgonAccuracyTextComponent : CompositeDrawable, IHasText
+        {
+            private readonly ArgonCounterTextComponent wholePart;
+            private readonly ArgonCounterTextComponent fractionPart;
+
+            public IBindable<float> WireframeOpacity { get; } = new BindableFloat();
+
+            public LocalisableString Text
+            {
+                get => wholePart.Text;
+                set
+                {
+                    string[] split = value.ToString().Replace("%", string.Empty).Split(".");
+
+                    wholePart.Text = split[0];
+                    fractionPart.Text = "." + split[1];
+                }
+            }
+
+            public ArgonAccuracyTextComponent()
+            {
+                AutoSizeAxes = Axes.Both;
+
+                InternalChild = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Child = wholePart = new ArgonCounterTextComponent(Anchor.TopRight, "ACCURACY")
+                            {
+                                RequiredDisplayDigits = { Value = 3 },
+                                WireframeOpacity = { BindTarget = WireframeOpacity }
+                            }
+                        },
+                        fractionPart = new ArgonCounterTextComponent(Anchor.TopLeft)
+                        {
+                            Margin = new MarginPadding { Top = 12f * 2f + 4f }, // +4 to account for the extra spaces above the digits.
+                            WireframeOpacity = { BindTarget = WireframeOpacity },
+                            Scale = new Vector2(0.5f),
+                        },
+                        new ArgonCounterTextComponent(Anchor.TopLeft)
+                        {
+                            Text = @"%",
+                            Margin = new MarginPadding { Top = 12f },
+                            WireframeOpacity = { BindTarget = WireframeOpacity }
+                        },
+                    }
+                };
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
index 3d8546e0e3..759a5dbfea 100644
--- a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -19,62 +20,30 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonCounterTextComponent : CompositeDrawable, IHasText
     {
-        private readonly LocalisableString? label;
-
         private readonly ArgonCounterSpriteText wireframesPart;
         private readonly ArgonCounterSpriteText textPart;
+        private readonly OsuSpriteText labelText;
 
         public IBindable<float> WireframeOpacity { get; } = new BindableFloat();
+        public Bindable<int> RequiredDisplayDigits { get; } = new BindableInt();
 
         public LocalisableString Text
         {
             get => textPart.Text;
             set
             {
-                wireframesPart.Text = FormatWireframes(value);
+                int remainingCount = RequiredDisplayDigits.Value - value.ToString().Count(char.IsDigit);
+                string remainingText = remainingCount > 0 ? new string('#', remainingCount) : string.Empty;
+
+                wireframesPart.Text = remainingText + value;
                 textPart.Text = value;
             }
         }
 
-        public ArgonCounterTextComponent(Anchor anchor, LocalisableString? label = null, Vector2? spacing = null)
+        public ArgonCounterTextComponent(Anchor anchor, LocalisableString? label = null)
         {
             Anchor = anchor;
             Origin = anchor;
-
-            this.label = label;
-
-            wireframesPart = new ArgonCounterSpriteText(c =>
-            {
-                if (c == '.')
-                    return @"dot";
-
-                return @"wireframes";
-            })
-            {
-                Anchor = anchor,
-                Origin = anchor,
-                Spacing = spacing ?? new Vector2(-2, 0),
-            };
-            textPart = new ArgonCounterSpriteText(c =>
-            {
-                if (c == '.')
-                    return @"dot";
-
-                if (c == '%')
-                    return @"percentage";
-
-                return c.ToString();
-            })
-            {
-                Anchor = anchor,
-                Origin = anchor,
-                Spacing = spacing ?? new Vector2(-2, 0),
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
             AutoSizeAxes = Axes.Both;
 
             InternalChild = new FillFlowContainer
@@ -83,12 +52,11 @@ namespace osu.Game.Screens.Play.HUD
                 Direction = FillDirection.Vertical,
                 Children = new Drawable[]
                 {
-                    new OsuSpriteText
+                    labelText = new OsuSpriteText
                     {
                         Alpha = label != null ? 1 : 0,
                         Text = label.GetValueOrDefault(),
                         Font = OsuFont.Torus.With(size: 12, weight: FontWeight.Bold),
-                        Colour = colours.Blue0,
                         Margin = new MarginPadding { Left = 2.5f },
                     },
                     new Container
@@ -96,14 +64,50 @@ namespace osu.Game.Screens.Play.HUD
                         AutoSizeAxes = Axes.Both,
                         Children = new[]
                         {
-                            wireframesPart,
-                            textPart,
+                            wireframesPart = new ArgonCounterSpriteText(wireframesLookup)
+                            {
+                                Anchor = anchor,
+                                Origin = anchor,
+                            },
+                            textPart = new ArgonCounterSpriteText(textLookup)
+                            {
+                                Anchor = anchor,
+                                Origin = anchor,
+                            },
                         }
                     }
                 }
             };
         }
 
+        private string textLookup(char c)
+        {
+            switch (c)
+            {
+                case '.':
+                    return @"dot";
+
+                case '%':
+                    return @"percentage";
+
+                default:
+                    return c.ToString();
+            }
+        }
+
+        private string wireframesLookup(char c)
+        {
+            if (c == '.') return @"dot";
+
+            return @"wireframes";
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            labelText.Colour = colours.Blue0;
+        }
+
         protected virtual LocalisableString FormatWireframes(LocalisableString text) => text;
 
         protected override void LoadComplete()
@@ -131,8 +135,8 @@ namespace osu.Game.Screens.Play.HUD
             [BackgroundDependencyLoader]
             private void load(ISkinSource skin)
             {
-                // todo: rename font
-                Font = new FontUsage(@"argon-score", 1);
+                Spacing = new Vector2(-2f, 0f);
+                Font = new FontUsage(@"argon-counter", 1);
                 glyphStore = new GlyphStore(skin, getLookup);
             }
 
diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
index fef4199d31..b15c21801f 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.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 osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
@@ -34,14 +33,10 @@ namespace osu.Game.Screens.Play.HUD
 
         private partial class ArgonScoreTextComponent : ArgonCounterTextComponent
         {
-            public IBindable<int> RequiredDisplayDigits { get; } = new BindableInt();
-
             public ArgonScoreTextComponent(Anchor anchor, LocalisableString? label = null)
                 : base(anchor, label)
             {
             }
-
-            protected override LocalisableString FormatWireframes(LocalisableString text) => new string('#', Math.Max(text.ToString().Length, RequiredDisplayDigits.Value));
         }
     }
 }

From 7fc2050f7227424b7e734260126146c48e99358e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 11:52:34 +0900
Subject: [PATCH 1450/2296] Rename variables and mak seconary tooltip type work
 again

---
 .../Online/TestSceneUserClickableAvatar.cs    |  9 ++-
 .../OnlinePlay/Components/ParticipantsList.cs |  2 +-
 .../DrawableRoomParticipantsList.cs           |  2 +-
 osu.Game/Users/Drawables/ClickableAvatar.cs   | 74 ++++++++++++++-----
 osu.Game/Users/Drawables/UpdateableAvatar.cs  | 11 ++-
 5 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
index 50e5653ad5..93e2583eb7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
@@ -102,9 +102,9 @@ namespace osu.Game.Tests.Visual.Online
             AddWaitStep("wait for tooltip to hide", 3);
         }
 
-        private Drawable generateUser(string username, int id, CountryCode countryCode, string cover, bool onlyUsername, string? color = null)
+        private Drawable generateUser(string username, int id, CountryCode countryCode, string cover, bool showPanel, string? color = null)
         {
-            return new ClickableAvatar(new APIUser
+            var user = new APIUser
             {
                 Username = username,
                 Id = id,
@@ -115,7 +115,9 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     Value = new UserStatusOnline()
                 },
-            })
+            };
+
+            return new ClickableAvatar(user, showPanel)
             {
                 Width = 50,
                 Height = 50,
@@ -125,7 +127,6 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
                 },
-                ShowUsernameOnly = onlyUsername,
             };
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
index 8cde7859b2..c4aefe4f99 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4Extensions.FromHex(@"27252d"),
                     },
-                    avatar = new UpdateableAvatar(showUsernameOnly: true) { RelativeSizeAxes = Axes.Both },
+                    avatar = new UpdateableAvatar(showUserPanelOnHover: true) { RelativeSizeAxes = Axes.Both },
                 };
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
index 65f0555612..60e05285d9 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoomParticipantsList.cs
@@ -289,7 +289,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 set => avatar.User = value;
             }
 
-            private readonly UpdateableAvatar avatar = new UpdateableAvatar(showUsernameOnly: true) { RelativeSizeAxes = Axes.Both };
+            private readonly UpdateableAvatar avatar = new UpdateableAvatar(showUserPanelOnHover: true) { RelativeSizeAxes = Axes.Both };
 
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colours)
diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index 48a12acb5e..6390acc608 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -1,12 +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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Cursor;
+using osu.Game.Localisation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
@@ -15,15 +18,13 @@ namespace osu.Game.Users.Drawables
 {
     public partial class ClickableAvatar : OsuClickableContainer, IHasCustomTooltip<APIUser?>
     {
-        // public ITooltip<APIUser> GetCustomTooltip() => new APIUserTooltip(user!) { ShowTooltip = TooltipEnabled };
-        public ITooltip<APIUser?> GetCustomTooltip() => new UserCardTooltip();
+        public ITooltip<APIUser?> GetCustomTooltip() => showCardOnHover ? new UserCardTooltip() : new NoCardTooltip();
 
         public APIUser? TooltipContent { get; }
 
         private readonly APIUser? user;
 
-        // TODO: reimplement.
-        public bool ShowUsernameOnly { get; set; }
+        private readonly bool showCardOnHover;
 
         [Resolved]
         private OsuGame? game { get; set; }
@@ -32,12 +33,15 @@ namespace osu.Game.Users.Drawables
         /// A clickable avatar for the specified user, with UI sounds included.
         /// </summary>
         /// <param name="user">The user. A null value will get a placeholder avatar.</param>
-        public ClickableAvatar(APIUser? user = null)
+        /// <param name="showCardOnHover"></param>
+        public ClickableAvatar(APIUser? user = null, bool showCardOnHover = false)
         {
             if (user?.Id != APIUser.SYSTEM_USER_ID)
                 Action = openProfile;
 
-            TooltipContent = this.user = user;
+            this.showCardOnHover = showCardOnHover;
+
+            TooltipContent = this.user = user ?? new GuestUser();
         }
 
         [BackgroundDependencyLoader]
@@ -65,23 +69,59 @@ namespace osu.Game.Users.Drawables
             public UserCardTooltip()
             {
                 AutoSizeAxes = Axes.Both;
-                Masking = true;
-                CornerRadius = 5;
             }
 
-            protected override void PopIn()
-            {
-                this.FadeIn(20, Easing.OutQuint);
-            }
-
-            protected override void PopOut() => this.FadeOut(80, Easing.OutQuint);
+            protected override void PopIn() => this.FadeIn(150, Easing.OutQuint);
+            protected override void PopOut() => this.Delay(150).FadeOut(500, Easing.OutQuint);
 
             public void Move(Vector2 pos) => Position = pos;
 
-            public void SetContent(APIUser? content) => LoadComponentAsync(new UserGridPanel(content ?? new GuestUser())
+            private APIUser? user;
+
+            public void SetContent(APIUser? content)
             {
-                Width = 300,
-            }, panel => Child = panel);
+                if (content == user && Children.Any())
+                    return;
+
+                user = content;
+
+                if (user != null)
+                {
+                    LoadComponentAsync(new UserGridPanel(user)
+                    {
+                        Width = 300,
+                    }, panel => Child = panel);
+                }
+                else
+                {
+                    var tooltip = new OsuTooltipContainer.OsuTooltip();
+                    tooltip.SetContent(ContextMenuStrings.ViewProfile);
+                    tooltip.Show();
+
+                    Child = tooltip;
+                }
+            }
+        }
+
+        public partial class NoCardTooltip : VisibilityContainer, ITooltip<APIUser?>
+        {
+            public NoCardTooltip()
+            {
+                var tooltip = new OsuTooltipContainer.OsuTooltip();
+                tooltip.SetContent(ContextMenuStrings.ViewProfile);
+                tooltip.Show();
+
+                Child = tooltip;
+            }
+
+            protected override void PopIn() => this.FadeIn(150, Easing.OutQuint);
+            protected override void PopOut() => this.Delay(150).FadeOut(500, Easing.OutQuint);
+
+            public void Move(Vector2 pos) => Position = pos;
+
+            public void SetContent(APIUser? content)
+            {
+            }
         }
     }
 }
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index f220ee5a25..b020e7fa63 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -47,20 +47,20 @@ namespace osu.Game.Users.Drawables
 
         private readonly bool isInteractive;
         private readonly bool showGuestOnNull;
-        private readonly bool showUsernameOnly;
+        private readonly bool showUserPanelOnHover;
 
         /// <summary>
         /// Construct a new UpdateableAvatar.
         /// </summary>
         /// <param name="user">The initial user to display.</param>
         /// <param name="isInteractive">If set to true, hover/click sounds will play and clicking the avatar will open the user's profile.</param>
-        /// <param name="showUsernameOnly">If set to true, the user status panel will be displayed in the tooltip.</param>
+        /// <param name="showUserPanelOnHover">If set to true, the user status panel will be displayed in the tooltip.</param>
         /// <param name="showGuestOnNull">Whether to show a default guest representation on null user (as opposed to nothing).</param>
-        public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showUsernameOnly = false, bool showGuestOnNull = true)
+        public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showUserPanelOnHover = false, bool showGuestOnNull = true)
         {
             this.isInteractive = isInteractive;
             this.showGuestOnNull = showGuestOnNull;
-            this.showUsernameOnly = showUsernameOnly;
+            this.showUserPanelOnHover = showUserPanelOnHover;
 
             User = user;
         }
@@ -72,10 +72,9 @@ namespace osu.Game.Users.Drawables
 
             if (isInteractive)
             {
-                return new ClickableAvatar(user)
+                return new ClickableAvatar(user, showUserPanelOnHover)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    ShowUsernameOnly = showUsernameOnly
                 };
             }
 

From e0a5ec5352d0edf5d73513e203cdeda51624a302 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 12:09:16 +0900
Subject: [PATCH 1451/2296] Revert incorrect classic mod test assertions

---
 .../OsuDifficultyCalculatorTest.cs                        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index 1d76c24620..fa7454b435 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -23,14 +23,14 @@ namespace osu.Game.Rulesets.Osu.Tests
             => base.Test(expectedStarRating, expectedMaxCombo, name);
 
         [TestCase(8.9742952703071666d, 239, "diffcalc-test")]
-        [TestCase(0.55071082800473514d, 4, "very-fast-slider")]
         [TestCase(1.743180218215227d, 54, "zero-length-sliders")]
+        [TestCase(0.55071082800473514d, 4, "very-fast-slider")]
         public void TestClockRateAdjusted(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModDoubleTime());
 
-        [TestCase(6.710442985146793d, 272, "diffcalc-test")]
-        [TestCase(0.42506480230838789d, 6, "very-fast-slider")]
-        [TestCase(1.4386882251130073d, 63, "zero-length-sliders")]
+        [TestCase(6.710442985146793d, 239, "diffcalc-test")]
+        [TestCase(1.4386882251130073d, 54, "zero-length-sliders")]
+        [TestCase(0.42506480230838789d, 4, "very-fast-slider")]
         public void TestClassicMod(double expectedStarRating, int expectedMaxCombo, string name)
             => Test(expectedStarRating, expectedMaxCombo, name, new OsuModClassic());
 

From fb02c317507b7c58770bdd52984eb6a0f91f9b53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 12:09:48 +0900
Subject: [PATCH 1452/2296] Fix typo in assert step
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 1e295aae70..c9d721d1c4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -468,7 +468,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void assertHeadMissTailTracked()
         {
             AddAssert("Tracking retained", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.LargeTickHit));
-            AddAssert("Slider head misseed", () => judgementResults.First().IsHit, () => Is.False);
+            AddAssert("Slider head missed", () => judgementResults.First().IsHit, () => Is.False);
         }
 
         private void assertMidSliderJudgements()

From f13648418b82f7158a733588e8caf4f094efc1ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 12:10:52 +0900
Subject: [PATCH 1453/2296] Update `HitResultTest` to be more conformant to
 original expectations

---
 osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs b/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs
index 72acd18c5b..e003c9c534 100644
--- a/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/HitResultTest.cs
@@ -11,14 +11,14 @@ namespace osu.Game.Tests.Rulesets.Scoring
     [TestFixture]
     public class HitResultTest
     {
-        [TestCase(new[] { HitResult.Perfect, HitResult.Great, HitResult.Good, HitResult.Ok, HitResult.Meh }, new[] { HitResult.Miss })]
-        [TestCase(new[] { HitResult.LargeTickHit }, new[] { HitResult.LargeTickMiss })]
-        [TestCase(new[] { HitResult.SmallTickHit }, new[] { HitResult.SmallTickMiss })]
+        [TestCase(new[] { HitResult.Perfect, HitResult.Great, HitResult.Good, HitResult.Ok, HitResult.Meh }, new[] { HitResult.Miss, HitResult.IgnoreMiss })]
+        [TestCase(new[] { HitResult.LargeTickHit }, new[] { HitResult.LargeTickMiss, HitResult.IgnoreMiss })]
+        [TestCase(new[] { HitResult.SmallTickHit }, new[] { HitResult.SmallTickMiss, HitResult.IgnoreMiss })]
         [TestCase(new[] { HitResult.LargeBonus, HitResult.SmallBonus }, new[] { HitResult.IgnoreMiss })]
         [TestCase(new[] { HitResult.IgnoreHit }, new[] { HitResult.IgnoreMiss, HitResult.ComboBreak })]
         public void TestValidResultPairs(HitResult[] maxResults, HitResult[] minResults)
         {
-            HitResult[] unsupportedResults = HitResultExtensions.ALL_TYPES.Where(t => t != HitResult.IgnoreMiss && !minResults.Contains(t)).ToArray();
+            HitResult[] unsupportedResults = HitResultExtensions.ALL_TYPES.Where(t => !minResults.Contains(t)).ToArray();
 
             Assert.Multiple(() =>
             {

From 44c0442f4fc7f29f94ea1acad609ab8a676788d0 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 10 Nov 2023 14:00:34 +0900
Subject: [PATCH 1454/2296] Adjust comment on Slider's judgement

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index cb6827b428..506145568e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -276,9 +276,9 @@ namespace osu.Game.Rulesets.Osu.Objects
         }
 
         public override Judgement CreateJudgement() => ClassicSliderBehaviour
-            // See logic in `DrawableSlider.CheckForResult()`
+            // Final combo is provided by the slider itself - see logic in `DrawableSlider.CheckForResult()`
             ? new OsuJudgement()
-            // Of note, this creates a combo discrepancy for non-classic-mod sliders (there is no combo increase for tail or slider judgement).
+            // Final combo is provided by the tail circle - see `SliderTailCircle`
             : new OsuIgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;

From b0c5b3cb1097861506b11862b996b91afe7a384a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 14:15:42 +0900
Subject: [PATCH 1455/2296] Add `Size` to serialised components of a
 `SerialisedDrawableInfo`

---
 osu.Game/Skinning/SerialisableDrawableExtensions.cs | 3 +++
 osu.Game/Skinning/SerialisedDrawableInfo.cs         | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Skinning/SerialisableDrawableExtensions.cs b/osu.Game/Skinning/SerialisableDrawableExtensions.cs
index 51b57a000d..0b44db9bdc 100644
--- a/osu.Game/Skinning/SerialisableDrawableExtensions.cs
+++ b/osu.Game/Skinning/SerialisableDrawableExtensions.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -18,6 +19,8 @@ namespace osu.Game.Skinning
             // todo: can probably make this better via deserialisation directly using a common interface.
             component.Position = drawableInfo.Position;
             component.Rotation = drawableInfo.Rotation;
+            if (drawableInfo.Size != Vector2.Zero && (component as CompositeDrawable)?.AutoSizeAxes == Axes.None)
+                component.Size = drawableInfo.Size;
             component.Scale = drawableInfo.Scale;
             component.Anchor = drawableInfo.Anchor;
             component.Origin = drawableInfo.Origin;
diff --git a/osu.Game/Skinning/SerialisedDrawableInfo.cs b/osu.Game/Skinning/SerialisedDrawableInfo.cs
index c515f228f7..0705e91d6d 100644
--- a/osu.Game/Skinning/SerialisedDrawableInfo.cs
+++ b/osu.Game/Skinning/SerialisedDrawableInfo.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Skinning
 
         public Vector2 Scale { get; set; }
 
+        public Vector2 Size { get; set; }
+
         public Anchor Anchor { get; set; }
 
         public Anchor Origin { get; set; }
@@ -62,6 +64,7 @@ namespace osu.Game.Skinning
             Position = component.Position;
             Rotation = component.Rotation;
             Scale = component.Scale;
+            Size = component.Size;
             Anchor = component.Anchor;
             Origin = component.Origin;
 

From ec3b6e47fb7c6b302e633132362bfe54873a58a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 14:17:11 +0900
Subject: [PATCH 1456/2296] Change selection handling to adjust `Size` instead
 of `Scale` for edge nodes

---
 .../Edit/OsuSelectionHandler.cs               |  1 +
 .../SkinEditor/SkinSelectionHandler.cs        | 40 +++++++++++++++++--
 .../Edit/Compose/Components/SelectionBox.cs   | 19 ++++++++-
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index e81941d254..4da640a971 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             SelectionBox.CanFlipX = SelectionBox.CanScaleX = quad.Width > 0;
             SelectionBox.CanFlipY = SelectionBox.CanScaleY = quad.Height > 0;
+            SelectionBox.CanScaleProportionally = SelectionBox.CanScaleX && SelectionBox.CanScaleY;
             SelectionBox.CanReverse = EditorBeatmap.SelectedHitObjects.Count > 1 || EditorBeatmap.SelectedHitObjects.Any(s => s is Slider);
         }
 
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index df73b15101..bf03906e56 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Utils;
@@ -31,8 +32,38 @@ namespace osu.Game.Overlays.SkinEditor
             UpdatePosition = updateDrawablePosition
         };
 
+        private bool allSelectedSupportManualSizing => SelectedItems.All(b => (b as CompositeDrawable)?.AutoSizeAxes == Axes.None);
+
         public override bool HandleScale(Vector2 scale, Anchor anchor)
         {
+            bool adjustSize;
+
+            switch (anchor)
+            {
+                // for corners, adjust scale.
+                case Anchor.TopLeft:
+                case Anchor.TopRight:
+                case Anchor.BottomLeft:
+                case Anchor.BottomRight:
+                    adjustSize = false;
+                    break;
+
+                // for edges, adjust size.
+                case Anchor.TopCentre:
+                case Anchor.CentreLeft:
+                case Anchor.CentreRight:
+                case Anchor.BottomCentre:
+                    // autosize elements can't be easily handled so just disable sizing for now.
+                    if (!allSelectedSupportManualSizing)
+                        return false;
+
+                    adjustSize = true;
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(anchor), anchor, null);
+            }
+
             // convert scale to screen space
             scale = ToScreenSpace(scale) - ToScreenSpace(Vector2.Zero);
 
@@ -120,7 +151,10 @@ namespace osu.Game.Overlays.SkinEditor
                 if (Precision.AlmostEquals(MathF.Abs(drawableItem.Rotation) % 180, 90))
                     currentScaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
 
-                drawableItem.Scale *= currentScaledDelta;
+                if (adjustSize)
+                    drawableItem.Size *= currentScaledDelta;
+                else
+                    drawableItem.Scale *= currentScaledDelta;
             }
 
             return true;
@@ -169,8 +203,8 @@ namespace osu.Game.Overlays.SkinEditor
         {
             base.OnSelectionChanged();
 
-            SelectionBox.CanScaleX = true;
-            SelectionBox.CanScaleY = true;
+            SelectionBox.CanScaleX = SelectionBox.CanScaleY = allSelectedSupportManualSizing;
+            SelectionBox.CanScaleProportionally = true;
             SelectionBox.CanFlipX = true;
             SelectionBox.CanFlipY = true;
             SelectionBox.CanReverse = false;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 72d96213ee..0917867a61 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -91,6 +91,23 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        private bool canScaleProportionally;
+
+        /// <summary>
+        /// Whether vertical scaling support should be enabled.
+        /// </summary>
+        public bool CanScaleProportionally
+        {
+            get => canScaleProportionally;
+            set
+            {
+                if (canScaleProportionally == value) return;
+
+                canScaleProportionally = value;
+                recreate();
+            }
+        }
+
         private bool canFlipX;
 
         /// <summary>
@@ -245,7 +262,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
 
             if (CanScaleX) addXScaleComponents();
-            if (CanScaleX && CanScaleY) addFullScaleComponents();
+            if (CanScaleProportionally) addFullScaleComponents();
             if (CanScaleY) addYScaleComponents();
             if (CanFlipX) addXFlipComponents();
             if (CanFlipY) addYFlipComponents();

From fb361a4e0a8152bb35fe16cdc98bf06993f64a67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 14:25:55 +0900
Subject: [PATCH 1457/2296] Reset size along with scale for relative items

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index bf03906e56..dab8c1c558 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -249,7 +249,12 @@ namespace osu.Game.Overlays.SkinEditor
             yield return new OsuMenuItem("Reset scale", MenuItemType.Standard, () =>
             {
                 foreach (var blueprint in SelectedBlueprints)
-                    ((Drawable)blueprint.Item).Scale = Vector2.One;
+                {
+                    var blueprintItem = ((Drawable)blueprint.Item);
+                    blueprintItem.Scale = Vector2.One;
+                    if (RelativeSizeAxes == Axes.Both)
+                        blueprintItem.Size = Vector2.One;
+                }
             });
 
             yield return new EditorMenuItemSpacer();

From 0add035c674d59bd36ef129d474a76550e3ced92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 14:31:02 +0900
Subject: [PATCH 1458/2296] Disable resizing of `LegacySongProgress`

Because it looks bad.
---
 osu.Game/Skinning/LegacySongProgress.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/LegacySongProgress.cs b/osu.Game/Skinning/LegacySongProgress.cs
index 22aea99291..26004ff111 100644
--- a/osu.Game/Skinning/LegacySongProgress.cs
+++ b/osu.Game/Skinning/LegacySongProgress.cs
@@ -19,11 +19,14 @@ namespace osu.Game.Skinning
         public override bool HandleNonPositionalInput => false;
         public override bool HandlePositionalInput => false;
 
+        public LegacySongProgress()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            Size = new Vector2(33);
-
             InternalChildren = new Drawable[]
             {
                 new Container
@@ -39,7 +42,7 @@ namespace osu.Game.Skinning
                 },
                 new CircularContainer
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    Size = new Vector2(33),
                     Masking = true,
                     BorderColour = Colour4.White,
                     BorderThickness = 2,

From 175dae49c623bfa8632608e204cac168d0b9723a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 14:43:51 +0900
Subject: [PATCH 1459/2296] Reset scale per axis

---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index dab8c1c558..77e522a925 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -252,8 +252,11 @@ namespace osu.Game.Overlays.SkinEditor
                 {
                     var blueprintItem = ((Drawable)blueprint.Item);
                     blueprintItem.Scale = Vector2.One;
-                    if (RelativeSizeAxes == Axes.Both)
-                        blueprintItem.Size = Vector2.One;
+
+                    if (blueprintItem.RelativeSizeAxes.HasFlagFast(Axes.X))
+                        blueprintItem.Width = 1;
+                    if (blueprintItem.RelativeSizeAxes.HasFlagFast(Axes.Y))
+                        blueprintItem.Height = 1;
                 }
             });
 

From 93ff82bc80c8bc06bc78149fd49584396ca982bd Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 10 Nov 2023 14:52:03 +0900
Subject: [PATCH 1460/2296] Attempt to support quotes in handling of GH comment
 body

---
 .github/workflows/diffcalc.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index e7c628e365..d4150208d3 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -185,9 +185,11 @@ jobs:
 
       - name: Add comment environment
         if: ${{ github.event_name == 'issue_comment' }}
+        env:
+          COMMENT_BODY: ${{ github.event.comment.body }}
         run: |
           # Add comment environment
-          echo '${{ github.event.comment.body }}' | sed -r 's/\r$//' | grep -E '^\w+=' | while read -r line; do
+          echo $COMMENT_BODY | sed -r 's/\r$//' | grep -E '^\w+=' | while read -r line; do
               opt=$(echo ${line} | cut -d '=' -f1)
               sed -i "s;^${opt}=.*$;${line};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
           done

From f31c1c9c7941db573a9516710e42e53946947e25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 12:58:07 +0900
Subject: [PATCH 1461/2296] Rename and move skinnable line component to a more
 commomn place

---
 osu.Game/Skinning/ArgonSkin.cs                           | 5 +++--
 .../Components/RoundedLine.cs}                           | 9 ++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game/{Screens/Play/HUD/ArgonHealthRightLine.cs => Skinning/Components/RoundedLine.cs} (73%)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index d598c04891..b3eff41495 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -16,6 +16,7 @@ using osu.Game.IO;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
+using osu.Game.Skinning.Components;
 using osuTK;
 using osuTK.Graphics;
 
@@ -115,7 +116,7 @@ namespace osu.Game.Skinning
                             var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container =>
                             {
                                 var health = container.OfType<ArgonHealthDisplay>().FirstOrDefault();
-                                var healthLine = container.OfType<ArgonHealthRightLine>().FirstOrDefault();
+                                var healthLine = container.OfType<RoundedLine>().FirstOrDefault();
                                 var scoreWedge = container.OfType<ArgonScoreWedge>().FirstOrDefault();
                                 var score = container.OfType<ArgonScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
@@ -207,7 +208,7 @@ namespace osu.Game.Skinning
                                     new ArgonScoreWedge(),
                                     new ArgonScoreCounter(),
                                     new ArgonHealthDisplay(),
-                                    new ArgonHealthRightLine(),
+                                    new RoundedLine(),
                                     new ArgonAccuracyCounter(),
                                     new ArgonComboCounter(),
                                     new BarHitErrorMeter(),
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthRightLine.cs b/osu.Game/Skinning/Components/RoundedLine.cs
similarity index 73%
rename from osu.Game/Screens/Play/HUD/ArgonHealthRightLine.cs
rename to osu.Game/Skinning/Components/RoundedLine.cs
index 25918f679c..d7b12c3f4c 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthRightLine.cs
+++ b/osu.Game/Skinning/Components/RoundedLine.cs
@@ -5,19 +5,18 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Skinning;
-using osuTK;
 
-namespace osu.Game.Screens.Play.HUD
+namespace osu.Game.Skinning.Components
 {
-    public partial class ArgonHealthRightLine : CompositeDrawable, ISerialisableDrawable
+    public partial class RoundedLine : CompositeDrawable, ISerialisableDrawable
     {
         public bool UsesFixedAnchor { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Size = new Vector2(50f, ArgonHealthDisplay.MAIN_PATH_RADIUS * 2);
+            AutoSizeAxes = Axes.Both;
+
             InternalChild = new Circle
             {
                 Anchor = Anchor.CentreLeft,

From 99d9db5b76ba5292398201039e75fcb0a9bcc1d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 14:03:24 +0900
Subject: [PATCH 1462/2296] Use a better default size for line

---
 osu.Game/Skinning/ArgonSkin.cs              |  7 ++++++-
 osu.Game/Skinning/Components/RoundedLine.cs | 19 ++++---------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index b3eff41495..03b089582d 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -137,7 +137,12 @@ namespace osu.Game.Skinning
                                     health.Position = new Vector2(components_x_offset, 20f);
 
                                     if (healthLine != null)
-                                        healthLine.Y = health.Y;
+                                    {
+                                        healthLine.Anchor = Anchor.TopLeft;
+                                        healthLine.Origin = Anchor.CentreLeft;
+                                        healthLine.Y = health.Y + ArgonHealthDisplay.MAIN_PATH_RADIUS;
+                                        healthLine.Size = new Vector2(45, 3);
+                                    }
 
                                     if (scoreWedge != null)
                                     {
diff --git a/osu.Game/Skinning/Components/RoundedLine.cs b/osu.Game/Skinning/Components/RoundedLine.cs
index d7b12c3f4c..491f87d31e 100644
--- a/osu.Game/Skinning/Components/RoundedLine.cs
+++ b/osu.Game/Skinning/Components/RoundedLine.cs
@@ -1,29 +1,18 @@
 // 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 osuTK;
 
 namespace osu.Game.Skinning.Components
 {
-    public partial class RoundedLine : CompositeDrawable, ISerialisableDrawable
+    public partial class RoundedLine : Circle, ISerialisableDrawable
     {
         public bool UsesFixedAnchor { get; set; }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        public RoundedLine()
         {
-            AutoSizeAxes = Axes.Both;
-
-            InternalChild = new Circle
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Width = 45f,
-                Height = 3f,
-            };
+            Size = new Vector2(200, 8);
         }
     }
 }

From 6c1d48dfaf0e4f06489b22c32b437a2d18d5250a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 14:51:14 +0900
Subject: [PATCH 1463/2296] Remove unused function

---
 osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
index 759a5dbfea..dbeafe5b59 100644
--- a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
@@ -108,8 +108,6 @@ namespace osu.Game.Screens.Play.HUD
             labelText.Colour = colours.Blue0;
         }
 
-        protected virtual LocalisableString FormatWireframes(LocalisableString text) => text;
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 7c3a626f4b2a1706cfc46295770b8673b374aee4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 15:06:07 +0900
Subject: [PATCH 1464/2296] Add basic animation for combo counter

---
 osu.Game/Screens/Play/HUD/ArgonComboCounter.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
index 6a7d5ff665..36194d787b 100644
--- a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
@@ -8,11 +8,15 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
+using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonComboCounter : ComboCounter
     {
+        protected override double RollingDuration => 500;
+        protected override Easing RollingEasing => Easing.OutQuint;
+
         [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
         public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.4f)
         {
@@ -25,6 +29,12 @@ namespace osu.Game.Screens.Play.HUD
         private void load(ScoreProcessor scoreProcessor)
         {
             Current.BindTo(scoreProcessor.Combo);
+            Current.BindValueChanged(combo =>
+            {
+                bool wasIncrease = combo.NewValue > combo.OldValue;
+                DrawableCount.ScaleTo(new Vector2(1, wasIncrease ? 1.2f : 0.8f))
+                             .ScaleTo(Vector2.One, 600, Easing.OutQuint);
+            });
         }
 
         protected override LocalisableString FormatCount(int count) => $@"{count}x";

From e861681cd4a081b3cc557df725cb0d2737096ebc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 15:06:19 +0900
Subject: [PATCH 1465/2296] Adjust argon rolling easings

---
 osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs | 3 +++
 osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
index 160841b40f..ee5e16180e 100644
--- a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
@@ -14,6 +14,9 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonAccuracyCounter : GameplayAccuracyCounter, ISerialisableDrawable
     {
+        protected override double RollingDuration => 500;
+        protected override Easing RollingEasing => Easing.OutQuint;
+
         [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
         public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.4f)
         {
diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
index b15c21801f..5ec359f5bb 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
@@ -13,6 +13,9 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonScoreCounter : GameplayScoreCounter, ISerialisableDrawable
     {
+        protected override double RollingDuration => 500;
+        protected override Easing RollingEasing => Easing.OutQuint;
+
         [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
         public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.4f)
         {

From 7e0b41219cd916931bd18d32f87705624b4e723b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 15:26:37 +0900
Subject: [PATCH 1466/2296] Change animation to only affect number portion, add
 miss animation

---
 .../Screens/Play/HUD/ArgonComboCounter.cs     | 20 ++++++++++++++++---
 .../Play/HUD/ArgonCounterTextComponent.cs     |  4 +++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
index 36194d787b..b75d4268fc 100644
--- a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonComboCounter.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -9,11 +10,14 @@ using osu.Framework.Localisation;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public partial class ArgonComboCounter : ComboCounter
     {
+        private ArgonCounterTextComponent text = null!;
+
         protected override double RollingDuration => 500;
         protected override Easing RollingEasing => Easing.OutQuint;
 
@@ -32,14 +36,24 @@ namespace osu.Game.Screens.Play.HUD
             Current.BindValueChanged(combo =>
             {
                 bool wasIncrease = combo.NewValue > combo.OldValue;
-                DrawableCount.ScaleTo(new Vector2(1, wasIncrease ? 1.2f : 0.8f))
-                             .ScaleTo(Vector2.One, 600, Easing.OutQuint);
+                bool wasMiss = combo.OldValue > 1 && combo.NewValue == 0;
+
+                float newScale = Math.Clamp(text.NumberContainer.Scale.X * (wasIncrease ? 1.1f : 0.8f), 0.6f, 1.4f);
+
+                float duration = wasMiss ? 2000 : 300;
+
+                text.NumberContainer
+                    .ScaleTo(new Vector2(newScale))
+                    .ScaleTo(Vector2.One, duration, Easing.OutQuint);
+
+                if (wasMiss)
+                    text.FlashColour(Color4.Red, duration, Easing.OutQuint);
             });
         }
 
         protected override LocalisableString FormatCount(int count) => $@"{count}x";
 
-        protected override IHasText CreateText() => new ArgonCounterTextComponent(Anchor.TopLeft, "COMBO")
+        protected override IHasText CreateText() => text = new ArgonCounterTextComponent(Anchor.TopLeft, "COMBO")
         {
             WireframeOpacity = { BindTarget = WireframeOpacity },
         };
diff --git a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
index dbeafe5b59..56f60deae1 100644
--- a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Play.HUD
         public IBindable<float> WireframeOpacity { get; } = new BindableFloat();
         public Bindable<int> RequiredDisplayDigits { get; } = new BindableInt();
 
+        public Container NumberContainer { get; private set; }
+
         public LocalisableString Text
         {
             get => textPart.Text;
@@ -59,7 +61,7 @@ namespace osu.Game.Screens.Play.HUD
                         Font = OsuFont.Torus.With(size: 12, weight: FontWeight.Bold),
                         Margin = new MarginPadding { Left = 2.5f },
                     },
-                    new Container
+                    NumberContainer = new Container
                     {
                         AutoSizeAxes = Axes.Both,
                         Children = new[]

From 4f90ac15fad7df54047abd01b6f88b6e28310277 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 15:39:17 +0900
Subject: [PATCH 1467/2296] Reduce the default wireframe opacity a bit

---
 osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs | 2 +-
 osu.Game/Screens/Play/HUD/ArgonComboCounter.cs    | 2 +-
 osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
index ee5e16180e..5f9441a5c4 100644
--- a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play.HUD
         protected override Easing RollingEasing => Easing.OutQuint;
 
         [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
-        public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.4f)
+        public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.25f)
         {
             Precision = 0.01f,
             MinValue = 0,
diff --git a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
index b75d4268fc..63a17529f5 100644
--- a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play.HUD
         protected override Easing RollingEasing => Easing.OutQuint;
 
         [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
-        public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.4f)
+        public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.25f)
         {
             Precision = 0.01f,
             MinValue = 0,
diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
index 5ec359f5bb..0192fa3c02 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.HUD
         protected override Easing RollingEasing => Easing.OutQuint;
 
         [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
-        public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.4f)
+        public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.25f)
         {
             Precision = 0.01f,
             MinValue = 0,

From 1818a84034c57f76335e06371b6a68296b0126f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 15:52:02 +0900
Subject: [PATCH 1468/2296] Rewrite tests to not rely on realtime clock

Definitely faster, hopefully more reliable too.
---
 .../Mods/TestSceneOsuModTouchDevice.cs        | 150 +++++++++++-------
 1 file changed, 94 insertions(+), 56 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
index abeb56209e..f528795125 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
@@ -5,6 +5,8 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Input;
+using osu.Framework.Screens;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Configuration;
@@ -14,39 +16,24 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
+using osu.Game.Storyboards;
 using osu.Game.Tests.Visual;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public partial class TestSceneOsuModTouchDevice : PlayerTestScene
+    public partial class TestSceneOsuModTouchDevice : RateAdjustedBeatmapTestScene
     {
         [Resolved]
         private SessionStatics statics { get; set; } = null!;
 
-        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+        private ScoreAccessibleSoloPlayer currentPlayer = null!;
+        private readonly ManualClock manualClock = new ManualClock { Rate = 0 };
 
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) =>
-            new OsuBeatmap
-            {
-                HitObjects =
-                {
-                    new HitCircle
-                    {
-                        Position = OsuPlayfield.BASE_SIZE / 2,
-                        StartTime = 0,
-                    },
-                    new HitCircle
-                    {
-                        Position = OsuPlayfield.BASE_SIZE / 2,
-                        StartTime = 5000,
-                    },
-                },
-                Breaks =
-                {
-                    new BreakPeriod(2000, 3000)
-                }
-            };
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard? storyboard = null)
+            => new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(manualClock), Audio);
 
         [BackgroundDependencyLoader]
         private void load()
@@ -63,103 +50,154 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         [Test]
         public void TestUserAlreadyHasTouchDeviceActive()
         {
+            loadPlayer();
             // it is presumed that a previous screen (i.e. song select) will set this up
             AddStep("set up touchscreen user", () =>
             {
-                Player.Score.ScoreInfo.Mods = Player.Score.ScoreInfo.Mods.Append(new OsuModTouchDevice()).ToArray();
+                currentPlayer.Score.ScoreInfo.Mods = currentPlayer.Score.ScoreInfo.Mods.Append(new OsuModTouchDevice()).ToArray();
                 statics.SetValue(Static.TouchInputActive, true);
             });
-            AddUntilStep("wait until 0 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0).Within(500));
-            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
-            AddUntilStep("wait until 0", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
+
+            AddStep("seek to 0", () => currentPlayer.GameplayClockContainer.Seek(0));
+            AddUntilStep("wait until 0", () => currentPlayer.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
             AddStep("touch circle", () =>
             {
-                var touch = new Touch(TouchSource.Touch1, Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                var touch = new Touch(TouchSource.Touch1, currentPlayer.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
                 InputManager.BeginTouch(touch);
                 InputManager.EndTouch(touch);
             });
-            AddAssert("touch device mod activated", () => Player.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
+            AddAssert("touch device mod activated", () => currentPlayer.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
         }
 
         [Test]
         public void TestTouchDuringBreak()
         {
-            AddUntilStep("wait until 2000 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(2000).Within(500));
-            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
-            AddUntilStep("wait until 2000", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(2000));
+            loadPlayer();
+            AddStep("seek to 2000", () => currentPlayer.GameplayClockContainer.Seek(2000));
+            AddUntilStep("wait until 2000", () => currentPlayer.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(2000));
             AddStep("touch playfield", () =>
             {
-                var touch = new Touch(TouchSource.Touch1, Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                var touch = new Touch(TouchSource.Touch1, currentPlayer.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
                 InputManager.BeginTouch(touch);
                 InputManager.EndTouch(touch);
             });
-            AddAssert("touch device mod not activated", () => Player.Score.ScoreInfo.Mods, () => Has.None.InstanceOf<OsuModTouchDevice>());
+            AddAssert("touch device mod not activated", () => currentPlayer.Score.ScoreInfo.Mods, () => Has.None.InstanceOf<OsuModTouchDevice>());
         }
 
         [Test]
         public void TestTouchMiss()
         {
+            loadPlayer();
             // ensure mouse is active (and that it's not suppressed due to touches in previous tests)
             AddStep("click mouse", () => InputManager.Click(MouseButton.Left));
 
-            AddUntilStep("wait until 200 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(200).Within(500));
-            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
-            AddUntilStep("wait until 200", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(200));
+            AddStep("seek to 200", () => currentPlayer.GameplayClockContainer.Seek(200));
+            AddUntilStep("wait until 200", () => currentPlayer.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(200));
             AddStep("touch playfield", () =>
             {
-                var touch = new Touch(TouchSource.Touch1, Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                var touch = new Touch(TouchSource.Touch1, currentPlayer.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
                 InputManager.BeginTouch(touch);
                 InputManager.EndTouch(touch);
             });
-            AddAssert("touch device mod activated", () => Player.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
+            AddAssert("touch device mod activated", () => currentPlayer.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
         }
 
         [Test]
         public void TestIncompatibleModActive()
         {
+            loadPlayer();
             // this is only a veneer of enabling autopilot as having it actually active from the start is annoying to make happen
             // given the tests' structure.
-            AddStep("enable autopilot", () => Player.Score.ScoreInfo.Mods = new Mod[] { new OsuModAutopilot() });
+            AddStep("enable autopilot", () => currentPlayer.Score.ScoreInfo.Mods = new Mod[] { new OsuModAutopilot() });
 
-            AddUntilStep("wait until 0 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0).Within(500));
-            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
-            AddUntilStep("wait until 0", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
+            AddStep("seek to 0", () => currentPlayer.GameplayClockContainer.Seek(0));
+            AddUntilStep("wait until 0", () => currentPlayer.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
             AddStep("touch playfield", () =>
             {
-                var touch = new Touch(TouchSource.Touch1, Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                var touch = new Touch(TouchSource.Touch1, currentPlayer.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
                 InputManager.BeginTouch(touch);
                 InputManager.EndTouch(touch);
             });
-            AddAssert("touch device mod not activated", () => Player.Score.ScoreInfo.Mods, () => Has.None.InstanceOf<OsuModTouchDevice>());
+            AddAssert("touch device mod not activated", () => currentPlayer.Score.ScoreInfo.Mods, () => Has.None.InstanceOf<OsuModTouchDevice>());
         }
 
         [Test]
         public void TestSecondObjectTouched()
         {
+            loadPlayer();
             // ensure mouse is active (and that it's not suppressed due to touches in previous tests)
             AddStep("click mouse", () => InputManager.Click(MouseButton.Left));
 
-            AddUntilStep("wait until 0 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0).Within(500));
-            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
-            AddUntilStep("wait until 0", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
+            AddStep("seek to 0", () => currentPlayer.GameplayClockContainer.Seek(0));
+            AddUntilStep("wait until 0", () => currentPlayer.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(0));
             AddStep("click circle", () =>
             {
-                InputManager.MoveMouseTo(Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                InputManager.MoveMouseTo(currentPlayer.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
                 InputManager.Click(MouseButton.Left);
             });
-            AddAssert("touch device mod not activated", () => Player.Score.ScoreInfo.Mods, () => Has.None.InstanceOf<OsuModTouchDevice>());
+            AddAssert("touch device mod not activated", () => currentPlayer.Score.ScoreInfo.Mods, () => Has.None.InstanceOf<OsuModTouchDevice>());
 
-            AddStep("speed back up", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 1);
-            AddUntilStep("wait until 5000 near", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(5000).Within(500));
-            AddStep("slow down", () => Player.GameplayClockContainer.AdjustmentsFromMods.Frequency.Value = 0.2);
-            AddUntilStep("wait until 5000", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(5000));
+            AddStep("seek to 5000", () => currentPlayer.GameplayClockContainer.Seek(5000));
+            AddUntilStep("wait until 5000", () => currentPlayer.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(5000));
             AddStep("touch playfield", () =>
             {
-                var touch = new Touch(TouchSource.Touch1, Player.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
+                var touch = new Touch(TouchSource.Touch1, currentPlayer.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);
                 InputManager.BeginTouch(touch);
                 InputManager.EndTouch(touch);
             });
-            AddAssert("touch device mod activated", () => Player.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
+            AddAssert("touch device mod activated", () => currentPlayer.Score.ScoreInfo.Mods, () => Has.One.InstanceOf<OsuModTouchDevice>());
+        }
+
+        private void loadPlayer()
+        {
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new OsuBeatmap
+                {
+                    HitObjects =
+                    {
+                        new HitCircle
+                        {
+                            Position = OsuPlayfield.BASE_SIZE / 2,
+                            StartTime = 0,
+                        },
+                        new HitCircle
+                        {
+                            Position = OsuPlayfield.BASE_SIZE / 2,
+                            StartTime = 5000,
+                        },
+                    },
+                    Breaks =
+                    {
+                        new BreakPeriod(2000, 3000)
+                    }
+                });
+
+                var p = new ScoreAccessibleSoloPlayer();
+
+                LoadScreen(currentPlayer = p);
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+        }
+
+        private partial class ScoreAccessibleSoloPlayer : SoloPlayer
+        {
+            public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
+
+            public new DrawableRuleset DrawableRuleset => base.DrawableRuleset;
+
+            protected override bool PauseOnFocusLost => false;
+
+            public ScoreAccessibleSoloPlayer()
+                : base(new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+            }
         }
     }
 }

From 8690b0876928570e5df1d25a1568db6ec703ee05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 16:08:45 +0900
Subject: [PATCH 1469/2296] Fix compose select box test failures

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 80c69aacf6..9e8d75efea 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Tests.Visual.Editing
 
                         CanScaleX = true,
                         CanScaleY = true,
+                        CanScaleProportionally = true,
                         CanFlipX = true,
                         CanFlipY = true,
 

From 60df2722ab7d72e040b176d0d756493c6c2daf4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 16:04:28 +0900
Subject: [PATCH 1470/2296] Rename `RoundedLine` to `BoxElement` and make more
 generically useful

---
 osu.Game/Skinning/ArgonSkin.cs              |  4 +-
 osu.Game/Skinning/Components/BoxElement.cs  | 50 +++++++++++++++++++++
 osu.Game/Skinning/Components/RoundedLine.cs | 18 --------
 3 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Skinning/Components/BoxElement.cs
 delete mode 100644 osu.Game/Skinning/Components/RoundedLine.cs

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 03b089582d..b78abdffd7 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Skinning
                             var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container =>
                             {
                                 var health = container.OfType<ArgonHealthDisplay>().FirstOrDefault();
-                                var healthLine = container.OfType<RoundedLine>().FirstOrDefault();
+                                var healthLine = container.OfType<BoxElement>().FirstOrDefault();
                                 var scoreWedge = container.OfType<ArgonScoreWedge>().FirstOrDefault();
                                 var score = container.OfType<ArgonScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
@@ -213,7 +213,7 @@ namespace osu.Game.Skinning
                                     new ArgonScoreWedge(),
                                     new ArgonScoreCounter(),
                                     new ArgonHealthDisplay(),
-                                    new RoundedLine(),
+                                    new BoxElement(),
                                     new ArgonAccuracyCounter(),
                                     new ArgonComboCounter(),
                                     new BarHitErrorMeter(),
diff --git a/osu.Game/Skinning/Components/BoxElement.cs b/osu.Game/Skinning/Components/BoxElement.cs
new file mode 100644
index 0000000000..235f97ceef
--- /dev/null
+++ b/osu.Game/Skinning/Components/BoxElement.cs
@@ -0,0 +1,50 @@
+// 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.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Configuration;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Skinning.Components
+{
+    public partial class BoxElement : CompositeDrawable, ISerialisableDrawable
+    {
+        public bool UsesFixedAnchor { get; set; }
+
+        [SettingSource("Corner rounding", "How round the corners of the box should be.")]
+        public BindableFloat CornerRounding { get; } = new BindableFloat(1)
+        {
+            Precision = 0.01f,
+            MinValue = 0,
+            MaxValue = 1,
+        };
+
+        public BoxElement()
+        {
+            Size = new Vector2(400, 80);
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = Color4.White,
+                    RelativeSizeAxes = Axes.Both,
+                },
+            };
+
+            Masking = true;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            CornerRadius = CornerRounding.Value * Math.Min(DrawWidth, DrawHeight) * 0.5f;
+        }
+    }
+}
diff --git a/osu.Game/Skinning/Components/RoundedLine.cs b/osu.Game/Skinning/Components/RoundedLine.cs
deleted file mode 100644
index 491f87d31e..0000000000
--- a/osu.Game/Skinning/Components/RoundedLine.cs
+++ /dev/null
@@ -1,18 +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.Graphics.Shapes;
-using osuTK;
-
-namespace osu.Game.Skinning.Components
-{
-    public partial class RoundedLine : Circle, ISerialisableDrawable
-    {
-        public bool UsesFixedAnchor { get; set; }
-
-        public RoundedLine()
-        {
-            Size = new Vector2(200, 8);
-        }
-    }
-}

From 7db14baed74277383e4ac567577bb08b3b2aeea5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 16:13:45 +0900
Subject: [PATCH 1471/2296] Update resources

---
 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 73cd239854..b47e2f1ca8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1030.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1109.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1110.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.33.0" />

From b7938e78a0dc05f6847323058ef58f235e67324f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 16:30:21 +0900
Subject: [PATCH 1472/2296] Make sure test is in a break

...because apparently it may take a while to update the flag.
---
 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
index f528795125..cd51ccd751 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModTouchDevice.cs
@@ -75,6 +75,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             loadPlayer();
             AddStep("seek to 2000", () => currentPlayer.GameplayClockContainer.Seek(2000));
             AddUntilStep("wait until 2000", () => currentPlayer.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(2000));
+            AddUntilStep("wait until break entered", () => currentPlayer.IsBreakTime.Value);
             AddStep("touch playfield", () =>
             {
                 var touch = new Touch(TouchSource.Touch1, currentPlayer.DrawableRuleset.Playfield.ScreenSpaceDrawQuad.Centre);

From fa5921862f99e6ed4a9757938ad77a8bd9d066ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 16:19:42 +0900
Subject: [PATCH 1473/2296] Update deserialising test

---
 .../Archives/modified-argon-20231108.osk      | Bin 1494 -> 1473 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/osu.Game.Tests/Resources/Archives/modified-argon-20231108.osk b/osu.Game.Tests/Resources/Archives/modified-argon-20231108.osk
index d07c5171007777784216e3ee8d4bc631a602bfb9..d56c4d4dcd8cfbfbdb536cd889dc72bdb5ff76f2 100644
GIT binary patch
delta 1141
zcmcb{eUQ68z?+#xgn@y9gJEV{R`|Z@<rj|vdAv*@5eA0h?94p9%)HFA=MD1?IS8;`
zsPq5$_>{*%Ge4FSv07GIlh~F@+%Q~oV{YfQ?8rI2O75pb4LXAg8<t4Ftgqesb63qY
zRWo<D)%RXMc+#-fE6G!01@l)=X4UQL@6Rh_-%KiRt1tV@oFkuKDsE@8%>B&@X=l+b
z=Qal<OxYfITCh<#(ko=f+pbpSpXHn7q|crYaQnDmlH&T+yXGnIXT`q0(f9mQWm4R)
zk}EeJg!(ONo?+fMH#jpuoICm7l>gdu>*@_;|N3u^G~KWK-~H()ze-kAzcx#5T%JAg
zhc(lNfXSwe0YV`EU%Y-baWl~GSz-(fVhodWSS9M;h6m=~G7zYHzrLfQjl;?D^%A?1
z3u`Z%@UDIPEg*DSa^I1|H(tECuq^cdZ@tE#1(D0c6ib31GJd-Iv*zRXyEpgU{k$hi
z{--FvXw5a{;Oh5xh1@ch_?!^6jem0f9@F{U^p_$hf{e{R+JEHyv7Cu<%UAZU<^N7r
z-nTz=;>CP}o`iY@M~Az+%hy)hGpsfFwc+LS`@61tPw^JuGgaZ+xvIKZB_yb(@ynSW
zNBLJSE2I7<erw!#DX=AV9rvGE4Q}e(JG+*(Y_qB>?!3FU<yW3ed`pycxV31E<3*OW
zi$2tM)Gcw%nIOX#b|7Cvd8PS*V(xE?_q07MI?<ucy_&PJILN)M-dKHQdPCn$i62D~
ziAH-PRw+7}eLnj1UfbXM56bpOZ}{Q(x%c*@owlNE3)6+(GH558Ypl6*E<0uWUA@+O
z+MNbYQIToOVmzildoNV7YQYbd9Yuxlw=@q<EsXK_SRZph(Os;$Cu#c1w9ikCS2M}(
zwAh|EOPHI-@uJX~hR90h=&X9i<dvqX@4uf($uh}E|I7dESH!`Vf8lDqN~v4o7aK*L
z4O-%;8^&z3M9*5~xA4m;F+bg%R8F`?mDcC8tl#+KdQ@d7Z=J61z6Z^`&(B(XUg^Xh
z@^0bED3-T<^$zpT?RNJuE!%r}d()vT{%xyTbcJh`?iwySxZXh}IQsdHwl`aL*1w<i
zE=}?7Q<LxUoUwhI-cHtB*|;;JYa`q2pKtS3w0n#=H@(p@m>kv?boS~)gGN(#>Dk(5
zhQ_n{3wMcs;OM%;a<=P$n#}Pndn2Yl%f1%%InajXYeKc~!^PX{_i;$;->&<1KO~};
z>$!OJ;>C=!I5I`cR_%6MZS&OhZ}W3*eT^K~dPmDcr(J~<=O5$F&6#+6PWYqL!bvNC
zx!taK<Z}7#yB|5Xb!~2!#h>{YfAe&`{_{A=`0vMd@7;YLC9zNLVhQ9!&ES(?vS`SI
zguwX#nAht;`5uVjpz-x&16CQZ8q|CNSHZy0*f=?xRTZp8W@=KE8c<3Ti20C|Ff?XN
NUeBt?wu=QM2ml}T`)L3G

delta 1146
zcmX@eeT}<5z?+#xgn@y9gP~P0BfMgN@{#>OUOFR4gn^+rJ2Ou&GcWUKzhT}X2N9Rw
zwnvYMdTiwNW0|-+q$EVq*X3j4{<ooJ|NF0HN6yh@bw4GV)Dcw3uxn!4moLwr|Bjhf
z@miv{YW?ELV(wFqOfm@Kmzu=p_0Hqoe1~hBjy`00Ti?!pLox1|UQMP?zeRxkRIQ9T
z=?f2N=m(q@Y!r_43YpQ*%kBQDdh=Yduksp;Z>&n05!$_KR<hWYUB@=geRTTsojrUj
zFGnP+&tJ57MtR@f;FW=**~#x#{m-8jFaKon|I0-?BkpSaXF~Pm+EX^}*+AdbGcZhM
zVKikj2%c=s7{Ch(0G%Q!zjI6s43(2-Fv`_O+|R#dAW-){UhpGNpi_{><X;yq=FZ)g
zxx#*1`>IWI3VioSNzawdi2AtyJm(a(3BKBk7haZ<3wWnjo?buyeER+OkztP|UQS_?
zvFpmdS&@8Kdges87`7?1zn}hdH|j+3-AXIA#hD&cZ^*ykc(Yl6v1JqcoMqom9^F{m
zGEpRbp-cS_zQY`|t~F;~{>8RphDdwg-2bz}>>pY=T8K=@Sh6RRcT&UV55h~He_}hb
z(8D6%M1C><lB8P|5zlr_xG&|HZC@NYWtrQncel?4nQ8B^nmS7_X6nA|IjvKiLm9T8
z`m4W3zSCe@22U01!|)VAVeLcQtgmc$w?6zdIs25Th%nRIne`nZ(}E4%?9*yGCRpy-
zb1V8}qVtJgMuJis%r4xTy5Oh2pvn2$5?hm)g4+su)6zO+E>C!ABHw-e^!(;id$#d>
z;S5;!IC<GIw;1V5QysR?73cW!Z1rXd`vo3J34v>j->u=ZyIdqNv9I{;Dyu*TfgLlO
zI0cTrd!SfQ`^VyJ(El?o^|h>j>=jNJFDesh<Gf_Bc6ZbETl#|AgEp?)-ZFjCQtprw
z1#x-Cr>(9P#P=~pnv3q~dpqO#f%wDP@6VQ<WZxcpw0+VS`Ma0=XVkT8eB_o`G4=1X
zB+pHkU+vAlFxTtC+_eq=lnvWw3v&4GxT(_F7g?d~kXrW7YtzCfMvjx-{uEwTA93Kv
z9AznC4arpzekVQrd~BT58%&zCHeYaYRZ#9SZ*X~OGT(T6%Hd3gKY`!94sE??KeuJ=
z*=<Vyr?!6GP*B%1RY__=&xJFG{3@>(Z9i^v{GILGinpgeUBAcov1pQu$MKI%(&syJ
z`&J)Jy?FjgZBg#uW$Ry-l-+q=ruF;IxnmOX_K#1US<lSQbLdy!6!v*<zt?QvZMQM@
z_S-7i{N-;ww{z{D^hLkwQqHE6Q+Pj1v(>+COI#Np7qBCn&1c4?^_^XfdXNA8lsf-^
z{j)GheYq){_ulkJ$q186SpxY`v;E{NEE@74A*4LQzzfVPaM1X4vNWrV0!n5PV_*Ox
k1Zb>goIICNVsbt!4>M5V<T_Sq#@flVSQXjMvw&0q022ZNH~;_u


From b4ec62473e0e79638b439a9ffd677871014841b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 16:37:07 +0900
Subject: [PATCH 1474/2296] Remove width/height bindables from
 `ArgonWedgePiece`

---
 osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs | 24 +++-----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs b/osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs
index 085e4c738f..3c2e3e05ea 100644
--- a/osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs
@@ -18,30 +18,14 @@ namespace osu.Game.Screens.Play.HUD
     {
         public bool UsesFixedAnchor { get; set; }
 
-        public float EndOpacity { get; init; } = 0.25f;
-
-        [SettingSource("Wedge width")]
-        public BindableFloat WedgeWidth { get; } = new BindableFloat(400f)
-        {
-            MinValue = 0f,
-            MaxValue = 500f,
-            Precision = 1f,
-        };
-
-        [SettingSource("Wedge height")]
-        public BindableFloat WedgeHeight { get; } = new BindableFloat(100f)
-        {
-            MinValue = 0f,
-            MaxValue = 500f,
-            Precision = 1f,
-        };
-
         [SettingSource("Inverted shear")]
         public BindableBool InvertShear { get; } = new BindableBool();
 
         public ArgonWedgePiece()
         {
             CornerRadius = 10f;
+
+            Size = new Vector2(400, 100);
         }
 
         [BackgroundDependencyLoader]
@@ -53,7 +37,7 @@ namespace osu.Game.Screens.Play.HUD
             InternalChild = new Box
             {
                 RelativeSizeAxes = Axes.Both,
-                Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#66CCFF").Opacity(0.0f), Color4Extensions.FromHex("#66CCFF").Opacity(EndOpacity)),
+                Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#66CCFF").Opacity(0.0f), Color4Extensions.FromHex("#66CCFF").Opacity(0.25f)),
             };
         }
 
@@ -61,8 +45,6 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            WedgeWidth.BindValueChanged(v => Width = v.NewValue, true);
-            WedgeHeight.BindValueChanged(v => Height = v.NewValue, true);
             InvertShear.BindValueChanged(v => Shear = new Vector2(0.8f, 0f) * (v.NewValue ? -1 : 1), true);
         }
     }

From 67312a2db922287fef12c53f00be99b2aa79df8d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 16:43:47 +0900
Subject: [PATCH 1475/2296] Remove `ArgonScoreWedge` and use `ArgonWedgePiece`
 directly

---
 osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs | 37 --------------------
 osu.Game/Skinning/ArgonSkin.cs               | 26 ++++++++------
 2 files changed, 16 insertions(+), 47 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs

diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs b/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs
deleted file mode 100644
index e8ade9e5c6..0000000000
--- a/osu.Game/Screens/Play/HUD/ArgonScoreWedge.cs
+++ /dev/null
@@ -1,37 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Skinning;
-using osuTK;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public partial class ArgonScoreWedge : CompositeDrawable, ISerialisableDrawable
-    {
-        public bool UsesFixedAnchor { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AutoSizeAxes = Axes.Both;
-
-            InternalChildren = new Drawable[]
-            {
-                new ArgonWedgePiece
-                {
-                    WedgeWidth = { Value = 380 },
-                    WedgeHeight = { Value = 72 },
-                },
-                new ArgonWedgePiece
-                {
-                    WedgeWidth = { Value = 380 },
-                    WedgeHeight = { Value = 72 },
-                    Position = new Vector2(4, 5)
-                },
-            };
-        }
-    }
-}
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index b78abdffd7..ddb375778c 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Skinning
                             {
                                 var health = container.OfType<ArgonHealthDisplay>().FirstOrDefault();
                                 var healthLine = container.OfType<BoxElement>().FirstOrDefault();
-                                var scoreWedge = container.OfType<ArgonScoreWedge>().FirstOrDefault();
+                                var wedgePieces = container.OfType<ArgonWedgePiece>().ToArray();
                                 var score = container.OfType<ArgonScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
                                 var combo = container.OfType<ArgonComboCounter>().FirstOrDefault();
@@ -144,15 +144,13 @@ namespace osu.Game.Skinning
                                         healthLine.Size = new Vector2(45, 3);
                                     }
 
-                                    if (scoreWedge != null)
-                                    {
-                                        scoreWedge.Position = new Vector2(-50, 15);
+                                    foreach (var wedgePiece in wedgePieces)
+                                        wedgePiece.Position += new Vector2(-50, 15);
 
-                                        if (score != null)
-                                        {
-                                            score.Origin = Anchor.TopRight;
-                                            score.Position = new Vector2(components_x_offset + 200, scoreWedge.Y + 30);
-                                        }
+                                    if (score != null)
+                                    {
+                                        score.Origin = Anchor.TopRight;
+                                        score.Position = new Vector2(components_x_offset + 200, wedgePieces.Last().Y + 30);
                                     }
 
                                     if (accuracy != null)
@@ -210,7 +208,15 @@ namespace osu.Game.Skinning
                             {
                                 Children = new Drawable[]
                                 {
-                                    new ArgonScoreWedge(),
+                                    new ArgonWedgePiece
+                                    {
+                                        Size = new Vector2(380, 72),
+                                    },
+                                    new ArgonWedgePiece
+                                    {
+                                        Size = new Vector2(380, 72),
+                                        Position = new Vector2(4, 5)
+                                    },
                                     new ArgonScoreCounter(),
                                     new ArgonHealthDisplay(),
                                     new BoxElement(),

From a02aeed50af48f580a1c5d7fbb8a792f2a652f1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 16:50:41 +0900
Subject: [PATCH 1476/2296] Adjust combo animation slightly

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

diff --git a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
index 63a17529f5..ac710294ef 100644
--- a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Screens.Play.HUD
 
                 float newScale = Math.Clamp(text.NumberContainer.Scale.X * (wasIncrease ? 1.1f : 0.8f), 0.6f, 1.4f);
 
-                float duration = wasMiss ? 2000 : 300;
+                float duration = wasMiss ? 2000 : 500;
 
                 text.NumberContainer
                     .ScaleTo(new Vector2(newScale))

From 46a219e01010e32827f3772aae77fece7de8bccf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 17:53:02 +0900
Subject: [PATCH 1477/2296] Add comment explaining `AutoSize` change in
 `LegacySongProgress`

---
 osu.Game/Skinning/LegacySongProgress.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Skinning/LegacySongProgress.cs b/osu.Game/Skinning/LegacySongProgress.cs
index 26004ff111..fa6ee38fee 100644
--- a/osu.Game/Skinning/LegacySongProgress.cs
+++ b/osu.Game/Skinning/LegacySongProgress.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Skinning
 
         public LegacySongProgress()
         {
+            // User shouldn't be able to adjust width/height of this as `CircularProgress` doesn't
+            // handle stretched cases ell.
             AutoSizeAxes = Axes.Both;
         }
 

From f25489cc7be71426891f50046b70aefdc24578de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 17:53:56 +0900
Subject: [PATCH 1478/2296] Check X/Y sizing available separately to fix weird
 edge cases

---
 .../SkinEditor/SkinSelectionHandler.cs        | 43 +++++++++++++------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 77e522a925..a4d530a4d9 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -32,11 +32,11 @@ namespace osu.Game.Overlays.SkinEditor
             UpdatePosition = updateDrawablePosition
         };
 
-        private bool allSelectedSupportManualSizing => SelectedItems.All(b => (b as CompositeDrawable)?.AutoSizeAxes == Axes.None);
+        private bool allSelectedSupportManualSizing(Axes axis) => SelectedItems.All(b => (b as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(axis) == false);
 
         public override bool HandleScale(Vector2 scale, Anchor anchor)
         {
-            bool adjustSize;
+            Axes adjustAxis;
 
             switch (anchor)
             {
@@ -45,19 +45,25 @@ namespace osu.Game.Overlays.SkinEditor
                 case Anchor.TopRight:
                 case Anchor.BottomLeft:
                 case Anchor.BottomRight:
-                    adjustSize = false;
+                    adjustAxis = Axes.Both;
                     break;
 
                 // for edges, adjust size.
+                // autosize elements can't be easily handled so just disable sizing for now.
                 case Anchor.TopCentre:
-                case Anchor.CentreLeft:
-                case Anchor.CentreRight:
                 case Anchor.BottomCentre:
-                    // autosize elements can't be easily handled so just disable sizing for now.
-                    if (!allSelectedSupportManualSizing)
+                    if (!allSelectedSupportManualSizing(Axes.Y))
                         return false;
 
-                    adjustSize = true;
+                    adjustAxis = Axes.Y;
+                    break;
+
+                case Anchor.CentreLeft:
+                case Anchor.CentreRight:
+                    if (!allSelectedSupportManualSizing(Axes.X))
+                        return false;
+
+                    adjustAxis = Axes.X;
                     break;
 
                 default:
@@ -151,10 +157,20 @@ namespace osu.Game.Overlays.SkinEditor
                 if (Precision.AlmostEquals(MathF.Abs(drawableItem.Rotation) % 180, 90))
                     currentScaledDelta = new Vector2(scaledDelta.Y, scaledDelta.X);
 
-                if (adjustSize)
-                    drawableItem.Size *= currentScaledDelta;
-                else
-                    drawableItem.Scale *= currentScaledDelta;
+                switch (adjustAxis)
+                {
+                    case Axes.X:
+                        drawableItem.Width *= currentScaledDelta.X;
+                        break;
+
+                    case Axes.Y:
+                        drawableItem.Height *= currentScaledDelta.Y;
+                        break;
+
+                    case Axes.Both:
+                        drawableItem.Scale *= currentScaledDelta;
+                        break;
+                }
             }
 
             return true;
@@ -203,7 +219,8 @@ namespace osu.Game.Overlays.SkinEditor
         {
             base.OnSelectionChanged();
 
-            SelectionBox.CanScaleX = SelectionBox.CanScaleY = allSelectedSupportManualSizing;
+            SelectionBox.CanScaleX = allSelectedSupportManualSizing(Axes.X);
+            SelectionBox.CanScaleY = allSelectedSupportManualSizing(Axes.Y);
             SelectionBox.CanScaleProportionally = true;
             SelectionBox.CanFlipX = true;
             SelectionBox.CanFlipY = true;

From d0f1326a63da2187c80c7429cf386bfb3856c8c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 17:54:48 +0900
Subject: [PATCH 1479/2296] Fix formatting

---
 osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
index 93e2583eb7..b38fb9153a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
@@ -125,7 +125,9 @@ namespace osu.Game.Tests.Visual.Online
                 Masking = true,
                 EdgeEffect = new EdgeEffectParameters
                 {
-                    Type = EdgeEffectType.Shadow, Radius = 1, Colour = Color4.Black.Opacity(0.2f),
+                    Type = EdgeEffectType.Shadow,
+                    Radius = 1,
+                    Colour = Color4.Black.Opacity(0.2f),
                 },
             };
         }

From 35e11c7c63b83122a45f5f9820aa6909ffb892bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 17:51:30 +0900
Subject: [PATCH 1480/2296] Rename diagonal scale variable and update xmldoc

---
 .../Edit/OsuSelectionHandler.cs               |  2 +-
 .../Editing/TestSceneComposeSelectBox.cs      |  2 +-
 .../SkinEditor/SkinSelectionHandler.cs        |  2 +-
 .../Edit/Compose/Components/SelectionBox.cs   | 22 +++++++++++--------
 osu.sln.DotSettings                           |  1 +
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 4da640a971..4765f615ce 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             SelectionBox.CanFlipX = SelectionBox.CanScaleX = quad.Width > 0;
             SelectionBox.CanFlipY = SelectionBox.CanScaleY = quad.Height > 0;
-            SelectionBox.CanScaleProportionally = SelectionBox.CanScaleX && SelectionBox.CanScaleY;
+            SelectionBox.CanScaleDiagonally = SelectionBox.CanScaleX && SelectionBox.CanScaleY;
             SelectionBox.CanReverse = EditorBeatmap.SelectedHitObjects.Count > 1 || EditorBeatmap.SelectedHitObjects.Any(s => s is Slider);
         }
 
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 9e8d75efea..f6637d0e80 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Visual.Editing
 
                         CanScaleX = true,
                         CanScaleY = true,
-                        CanScaleProportionally = true,
+                        CanScaleDiagonally = true,
                         CanFlipX = true,
                         CanFlipY = true,
 
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index a4d530a4d9..52c012a15a 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -221,7 +221,7 @@ namespace osu.Game.Overlays.SkinEditor
 
             SelectionBox.CanScaleX = allSelectedSupportManualSizing(Axes.X);
             SelectionBox.CanScaleY = allSelectedSupportManualSizing(Axes.Y);
-            SelectionBox.CanScaleProportionally = true;
+            SelectionBox.CanScaleDiagonally = true;
             SelectionBox.CanFlipX = true;
             SelectionBox.CanFlipY = true;
             SelectionBox.CanReverse = false;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 0917867a61..0b16941bc4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private bool canScaleX;
 
         /// <summary>
-        /// Whether horizontal scaling support should be enabled.
+        /// Whether horizontal scaling (from the left or right edge) support should be enabled.
         /// </summary>
         public bool CanScaleX
         {
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private bool canScaleY;
 
         /// <summary>
-        /// Whether vertical scaling support should be enabled.
+        /// Whether vertical scaling (from the top or bottom edge) support should be enabled.
         /// </summary>
         public bool CanScaleY
         {
@@ -91,19 +91,23 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private bool canScaleProportionally;
+        private bool canScaleDiagonally;
 
         /// <summary>
-        /// Whether vertical scaling support should be enabled.
+        /// Whether diagonal scaling (from a corner) support should be enabled.
         /// </summary>
-        public bool CanScaleProportionally
+        /// <remarks>
+        /// There are some cases where we only want to allow proportional resizing, and not allow
+        /// one or both explicit directions of scale.
+        /// </remarks>
+        public bool CanScaleDiagonally
         {
-            get => canScaleProportionally;
+            get => canScaleDiagonally;
             set
             {
-                if (canScaleProportionally == value) return;
+                if (canScaleDiagonally == value) return;
 
-                canScaleProportionally = value;
+                canScaleDiagonally = value;
                 recreate();
             }
         }
@@ -262,7 +266,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
 
             if (CanScaleX) addXScaleComponents();
-            if (CanScaleProportionally) addFullScaleComponents();
+            if (CanScaleDiagonally) addFullScaleComponents();
             if (CanScaleY) addYScaleComponents();
             if (CanFlipX) addXFlipComponents();
             if (CanFlipY) addYFlipComponents();
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index c2778ca5b1..342bc8aa79 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -823,6 +823,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=System_002ENumerics_002E_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=System_002ESecurity_002ECryptography_002ERSA/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=TagLib_002EMpeg4_002EBox/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>

From 36d0bae42dfe95481b3e20751d8f7032b925e9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 17:57:16 +0900
Subject: [PATCH 1481/2296] Restore mention of dependency on another ctor param

---
 osu.Game/Users/Drawables/UpdateableAvatar.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index b020e7fa63..21153ecfc3 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -54,7 +54,10 @@ namespace osu.Game.Users.Drawables
         /// </summary>
         /// <param name="user">The initial user to display.</param>
         /// <param name="isInteractive">If set to true, hover/click sounds will play and clicking the avatar will open the user's profile.</param>
-        /// <param name="showUserPanelOnHover">If set to true, the user status panel will be displayed in the tooltip.</param>
+        /// <param name="showUserPanelOnHover">
+        /// If set to true, the user status panel will be displayed in the tooltip.
+        /// Only has an effect if <see cref="isInteractive"/> is true.
+        /// </param>
         /// <param name="showGuestOnNull">Whether to show a default guest representation on null user (as opposed to nothing).</param>
         public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showUserPanelOnHover = false, bool showGuestOnNull = true)
         {

From 2c1f304f3b4faaa645edb3c138b915ad351c9fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 18:13:36 +0900
Subject: [PATCH 1482/2296] Fix test failures due to fluctuations in
 needlessly-serialised automatic sizings

---
 osu.Game/Skinning/SerialisableDrawableExtensions.cs | 7 +++++--
 osu.Game/Skinning/SerialisedDrawableInfo.cs         | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/SerialisableDrawableExtensions.cs b/osu.Game/Skinning/SerialisableDrawableExtensions.cs
index 0b44db9bdc..609dd9c8ab 100644
--- a/osu.Game/Skinning/SerialisableDrawableExtensions.cs
+++ b/osu.Game/Skinning/SerialisableDrawableExtensions.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
@@ -19,8 +20,10 @@ namespace osu.Game.Skinning
             // todo: can probably make this better via deserialisation directly using a common interface.
             component.Position = drawableInfo.Position;
             component.Rotation = drawableInfo.Rotation;
-            if (drawableInfo.Size != Vector2.Zero && (component as CompositeDrawable)?.AutoSizeAxes == Axes.None)
-                component.Size = drawableInfo.Size;
+            if (drawableInfo.Width is float width && width != 0 && (component as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(Axes.X) == false)
+                component.Width = width;
+            if (drawableInfo.Height is float height && height != 0 && (component as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(Axes.Y) == false)
+                component.Height = height;
             component.Scale = drawableInfo.Scale;
             component.Anchor = drawableInfo.Anchor;
             component.Origin = drawableInfo.Origin;
diff --git a/osu.Game/Skinning/SerialisedDrawableInfo.cs b/osu.Game/Skinning/SerialisedDrawableInfo.cs
index 0705e91d6d..b2237acc5a 100644
--- a/osu.Game/Skinning/SerialisedDrawableInfo.cs
+++ b/osu.Game/Skinning/SerialisedDrawableInfo.cs
@@ -35,7 +35,9 @@ namespace osu.Game.Skinning
 
         public Vector2 Scale { get; set; }
 
-        public Vector2 Size { get; set; }
+        public float? Width { get; set; }
+
+        public float? Height { get; set; }
 
         public Anchor Anchor { get; set; }
 
@@ -64,7 +66,8 @@ namespace osu.Game.Skinning
             Position = component.Position;
             Rotation = component.Rotation;
             Scale = component.Scale;
-            Size = component.Size;
+            Height = component.Height;
+            Width = component.Width;
             Anchor = component.Anchor;
             Origin = component.Origin;
 

From 374e13b496dc3780e03f2c9f76a850ab0a8050e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 18:18:45 +0900
Subject: [PATCH 1483/2296] Remove argon health display bar length setting

It is no longer needed.

Intentionally not doing backwards migration to simplify things; users
can fix their skins.
---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 793d43f7ef..b4002343d3 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -35,14 +35,6 @@ namespace osu.Game.Screens.Play.HUD
             Precision = 1
         };
 
-        [SettingSource("Bar length")]
-        public BindableFloat BarLength { get; } = new BindableFloat(0.98f)
-        {
-            MinValue = 0.2f,
-            MaxValue = 1,
-            Precision = 0.01f,
-        };
-
         private BarPath mainBar = null!;
 
         /// <summary>
@@ -140,7 +132,6 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(_ => Scheduler.AddOnce(updateCurrent), true);
 
-            BarLength.BindValueChanged(l => Width = l.NewValue, true);
             BarHeight.BindValueChanged(_ => updatePath());
             updatePath();
         }

From 43a4b34295471a2a4c0103aa9383ef75cbb8dc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 18:20:14 +0900
Subject: [PATCH 1484/2296] Fix typo

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

diff --git a/osu.Game/Skinning/LegacySongProgress.cs b/osu.Game/Skinning/LegacySongProgress.cs
index fa6ee38fee..4295060a3a 100644
--- a/osu.Game/Skinning/LegacySongProgress.cs
+++ b/osu.Game/Skinning/LegacySongProgress.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Skinning
         public LegacySongProgress()
         {
             // User shouldn't be able to adjust width/height of this as `CircularProgress` doesn't
-            // handle stretched cases ell.
+            // handle stretched cases well.
             AutoSizeAxes = Axes.Both;
         }
 

From 26eae0bdeeed6670fc3a47b81abdc75afceda434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 18:25:39 +0900
Subject: [PATCH 1485/2296] Remove unused using directive

---
 osu.Game/Skinning/SerialisableDrawableExtensions.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Skinning/SerialisableDrawableExtensions.cs b/osu.Game/Skinning/SerialisableDrawableExtensions.cs
index 609dd9c8ab..6938ed4091 100644
--- a/osu.Game/Skinning/SerialisableDrawableExtensions.cs
+++ b/osu.Game/Skinning/SerialisableDrawableExtensions.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
-using osuTK;
 
 namespace osu.Game.Skinning
 {

From ec2200d54fff1cf823355571c2a3c827c3a19ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 18:26:08 +0900
Subject: [PATCH 1486/2296] Remove another reference to bar length

---
 .../Visual/Gameplay/TestSceneArgonHealthDisplay.cs          | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index 7bad623d7f..f51577bc84 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -47,12 +47,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 };
             });
 
-            AddSliderStep("Width", 0, 1f, 1f, val =>
-            {
-                if (healthDisplay.IsNotNull())
-                    healthDisplay.BarLength.Value = val;
-            });
-
             AddSliderStep("Height", 0, 64, 0, val =>
             {
                 if (healthDisplay.IsNotNull())

From fbf94214a536a5b5aa7246d2ee34ee5ecacf8fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 18:36:09 +0900
Subject: [PATCH 1487/2296] Fully delegate tooltip show/hide logic

---
 osu.Game/Users/Drawables/ClickableAvatar.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index 6390acc608..ef451df95d 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -105,17 +105,17 @@ namespace osu.Game.Users.Drawables
 
         public partial class NoCardTooltip : VisibilityContainer, ITooltip<APIUser?>
         {
+            private readonly OsuTooltipContainer.OsuTooltip tooltip;
+
             public NoCardTooltip()
             {
-                var tooltip = new OsuTooltipContainer.OsuTooltip();
+                tooltip = new OsuTooltipContainer.OsuTooltip();
                 tooltip.SetContent(ContextMenuStrings.ViewProfile);
-                tooltip.Show();
-
                 Child = tooltip;
             }
 
-            protected override void PopIn() => this.FadeIn(150, Easing.OutQuint);
-            protected override void PopOut() => this.Delay(150).FadeOut(500, Easing.OutQuint);
+            protected override void PopIn() => tooltip.Show();
+            protected override void PopOut() => tooltip.Hide();
 
             public void Move(Vector2 pos) => Position = pos;
 

From fecc6f580bf309357682d1ee725f0a3796d9261a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 23 Oct 2023 16:37:26 +0900
Subject: [PATCH 1488/2296] Add legacy reference health processor

---
 .../Scoring/LegacyOsuHealthProcessor.cs       | 197 ++++++++++++++++++
 .../Scoring/DrainingHealthProcessor.cs        |   1 -
 .../Scoring/LegacyDrainingHealthProcessor.cs  |  90 ++++++++
 3 files changed, 287 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
 create mode 100644 osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs

diff --git a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
new file mode 100644
index 0000000000..103569ffc3
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
@@ -0,0 +1,197 @@
+// 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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Scoring
+{
+    // Reference implementation for osu!stable's HP drain.
+    public partial class LegacyOsuHealthProcessor : LegacyDrainingHealthProcessor
+    {
+        private const double hp_bar_maximum = 200;
+        private const double hp_combo_geki = 14;
+        private const double hp_hit_300 = 6;
+        private const double hp_slider_repeat = 4;
+        private const double hp_slider_tick = 3;
+
+        private double lowestHpEver;
+        private double lowestHpEnd;
+        private double lowestHpComboEnd;
+        private double hpRecoveryAvailable;
+        private double hpMultiplierNormal;
+        private double hpMultiplierComboEnd;
+
+        public LegacyOsuHealthProcessor(double drainStartTime)
+            : base(drainStartTime)
+        {
+        }
+
+        public override void ApplyBeatmap(IBeatmap beatmap)
+        {
+            lowestHpEver = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 195, 160, 60);
+            lowestHpComboEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 198, 170, 80);
+            lowestHpEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 198, 180, 80);
+            hpRecoveryAvailable = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 8, 4, 0);
+
+            base.ApplyBeatmap(beatmap);
+        }
+
+        protected override void Reset(bool storeResults)
+        {
+            hpMultiplierNormal = 1;
+            hpMultiplierComboEnd = 1;
+
+            base.Reset(storeResults);
+        }
+
+        protected override double ComputeDrainRate()
+        {
+            double testDrop = 0.05;
+            double currentHp;
+            double currentHpUncapped;
+
+            do
+            {
+                currentHp = hp_bar_maximum;
+                currentHpUncapped = hp_bar_maximum;
+
+                double lowestHp = currentHp;
+                double lastTime = DrainStartTime;
+                int currentBreak = 0;
+                bool fail = false;
+                int comboTooLowCount = 0;
+                string failReason = string.Empty;
+
+                for (int i = 0; i < Beatmap.HitObjects.Count; i++)
+                {
+                    HitObject h = Beatmap.HitObjects[i];
+
+                    // Find active break (between current and lastTime)
+                    double localLastTime = lastTime;
+                    double breakTime = 0;
+
+                    // Subtract any break time from the duration since the last object
+                    if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
+                    {
+                        BreakPeriod e = Beatmap.Breaks[currentBreak];
+
+                        if (e.StartTime >= localLastTime && e.EndTime <= h.StartTime)
+                        {
+                            // consider break start equal to object end time for version 8+ since drain stops during this time
+                            breakTime = (Beatmap.BeatmapInfo.BeatmapVersion < 8) ? (e.EndTime - e.StartTime) : e.EndTime - localLastTime;
+                            currentBreak++;
+                        }
+                    }
+
+                    reduceHp(testDrop * (h.StartTime - lastTime - breakTime));
+
+                    lastTime = h.GetEndTime();
+
+                    if (currentHp < lowestHp)
+                        lowestHp = currentHp;
+
+                    if (currentHp <= lowestHpEver)
+                    {
+                        fail = true;
+                        testDrop *= 0.96;
+                        failReason = $"hp too low ({currentHp / hp_bar_maximum} < {lowestHpEver / hp_bar_maximum})";
+                        break;
+                    }
+
+                    double hpReduction = testDrop * (h.GetEndTime() - h.StartTime);
+                    double hpOverkill = Math.Max(0, hpReduction - currentHp);
+                    reduceHp(hpReduction);
+
+                    if (h is Slider slider)
+                    {
+                        for (int j = 0; j < slider.RepeatCount + 2; j++)
+                            increaseHp(hpMultiplierNormal * hp_slider_repeat);
+                        foreach (var _ in slider.NestedHitObjects.OfType<SliderTick>())
+                            increaseHp(hpMultiplierNormal * hp_slider_tick);
+                    }
+                    else if (h is Spinner spinner)
+                    {
+                        foreach (var _ in spinner.NestedHitObjects.Where(t => t is not SpinnerBonusTick))
+                            increaseHp(hpMultiplierNormal * 1.7);
+                    }
+
+                    if (hpOverkill > 0 && currentHp - hpOverkill <= lowestHpEver)
+                    {
+                        fail = true;
+                        testDrop *= 0.96;
+                        failReason = $"overkill ({currentHp / hp_bar_maximum} - {hpOverkill / hp_bar_maximum} <= {lowestHpEver / hp_bar_maximum})";
+                        break;
+                    }
+
+                    if (i == Beatmap.HitObjects.Count - 1 || ((OsuHitObject)Beatmap.HitObjects[i + 1]).NewCombo)
+                    {
+                        increaseHp(hpMultiplierComboEnd * hp_combo_geki + hpMultiplierNormal * hp_hit_300);
+
+                        if (currentHp < lowestHpComboEnd)
+                        {
+                            if (++comboTooLowCount > 2)
+                            {
+                                hpMultiplierComboEnd *= 1.07;
+                                hpMultiplierNormal *= 1.03;
+                                fail = true;
+                                failReason = $"combo end hp too low ({currentHp / hp_bar_maximum} < {lowestHpComboEnd / hp_bar_maximum})";
+                                break;
+                            }
+                        }
+                    }
+                    else
+                        increaseHp(hpMultiplierNormal * hp_hit_300);
+                }
+
+                if (!fail && currentHp < lowestHpEnd)
+                {
+                    fail = true;
+                    testDrop *= 0.94;
+                    hpMultiplierComboEnd *= 1.01;
+                    hpMultiplierNormal *= 1.01;
+                    failReason = $"end hp too low ({currentHp / hp_bar_maximum} < {lowestHpEnd / hp_bar_maximum})";
+                }
+
+                double recovery = (currentHpUncapped - hp_bar_maximum) / Beatmap.HitObjects.Count;
+
+                if (!fail && recovery < hpRecoveryAvailable)
+                {
+                    fail = true;
+                    testDrop *= 0.96;
+                    hpMultiplierComboEnd *= 1.02;
+                    hpMultiplierNormal *= 1.01;
+                    failReason = $"recovery too low ({recovery / hp_bar_maximum} < {hpRecoveryAvailable / hp_bar_maximum})";
+                }
+
+                if (fail)
+                {
+                    if (Log)
+                        Console.WriteLine($"FAILED drop {testDrop / hp_bar_maximum}: {failReason}");
+                    continue;
+                }
+
+                if (Log)
+                    Console.WriteLine($"PASSED drop {testDrop / hp_bar_maximum}");
+                return testDrop / hp_bar_maximum;
+            } while (true);
+
+            void reduceHp(double amount)
+            {
+                currentHpUncapped = Math.Max(0, currentHpUncapped - amount);
+                currentHp = Math.Max(0, currentHp - amount);
+            }
+
+            void increaseHp(double amount)
+            {
+                currentHpUncapped += amount;
+                currentHp = Math.Max(0, Math.Min(hp_bar_maximum, currentHp + amount));
+            }
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index 592dcbfeb8..2f81aa735e 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -42,7 +42,6 @@ namespace osu.Game.Rulesets.Scoring
         private const double max_health_target = 0.4;
 
         private IBeatmap beatmap;
-
         private double gameplayEndTime;
 
         private readonly double drainStartTime;
diff --git a/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
new file mode 100644
index 0000000000..5d2426e4b7
--- /dev/null
+++ b/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.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.
+
+#nullable disable
+
+using System;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Utils;
+
+namespace osu.Game.Rulesets.Scoring
+{
+    /// <summary>
+    /// A <see cref="HealthProcessor"/> which continuously drains health.<br />
+    /// At HP=0, the minimum health reached for a perfect play is 95%.<br />
+    /// At HP=5, the minimum health reached for a perfect play is 70%.<br />
+    /// At HP=10, the minimum health reached for a perfect play is 30%.
+    /// </summary>
+    public abstract partial class LegacyDrainingHealthProcessor : HealthProcessor
+    {
+        protected double DrainStartTime { get; }
+        protected double GameplayEndTime { get; private set; }
+
+        protected IBeatmap Beatmap { get; private set; }
+        protected PeriodTracker NoDrainPeriodTracker { get; private set; }
+
+        public bool Log { get; set; }
+
+        public double DrainRate { get; private set; }
+
+        /// <summary>
+        /// Creates a new <see cref="DrainingHealthProcessor"/>.
+        /// </summary>
+        /// <param name="drainStartTime">The time after which draining should begin.</param>
+        protected LegacyDrainingHealthProcessor(double drainStartTime)
+        {
+            DrainStartTime = drainStartTime;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (NoDrainPeriodTracker?.IsInAny(Time.Current) == true)
+                return;
+
+            // When jumping in and out of gameplay time within a single frame, health should only be drained for the period within the gameplay time
+            double lastGameplayTime = Math.Clamp(Time.Current - Time.Elapsed, DrainStartTime, GameplayEndTime);
+            double currentGameplayTime = Math.Clamp(Time.Current, DrainStartTime, GameplayEndTime);
+
+            Health.Value -= DrainRate * (currentGameplayTime - lastGameplayTime);
+        }
+
+        public override void ApplyBeatmap(IBeatmap beatmap)
+        {
+            Beatmap = beatmap;
+
+            if (beatmap.HitObjects.Count > 0)
+                GameplayEndTime = beatmap.HitObjects[^1].GetEndTime();
+
+            NoDrainPeriodTracker = new PeriodTracker(beatmap.Breaks.Select(breakPeriod => new Period(
+                beatmap.HitObjects
+                       .Select(hitObject => hitObject.GetEndTime())
+                       .Where(endTime => endTime <= breakPeriod.StartTime)
+                       .DefaultIfEmpty(double.MinValue)
+                       .Last(),
+                beatmap.HitObjects
+                       .Select(hitObject => hitObject.StartTime)
+                       .Where(startTime => startTime >= breakPeriod.EndTime)
+                       .DefaultIfEmpty(double.MaxValue)
+                       .First()
+            )));
+
+            base.ApplyBeatmap(beatmap);
+        }
+
+        protected override void Reset(bool storeResults)
+        {
+            base.Reset(storeResults);
+
+            DrainRate = 1;
+
+            if (storeResults)
+                DrainRate = ComputeDrainRate();
+        }
+
+        protected abstract double ComputeDrainRate();
+    }
+}

From 12e5766d5073374b463ad6752a98fd8ed937292c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 10 Nov 2023 16:35:03 +0900
Subject: [PATCH 1489/2296] Implement OsuHealthProcessor following osu-stable

---
 .../Scoring/OsuHealthProcessor.cs             | 229 ++++++++++++++++++
 1 file changed, 229 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
new file mode 100644
index 0000000000..489b8408ea
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -0,0 +1,229 @@
+// 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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Scoring
+{
+    public partial class OsuHealthProcessor : LegacyDrainingHealthProcessor
+    {
+        private double lowestHpEver;
+        private double lowestHpEnd;
+        private double hpRecoveryAvailable;
+        private double hpMultiplierNormal;
+
+        public OsuHealthProcessor(double drainStartTime)
+            : base(drainStartTime)
+        {
+        }
+
+        public override void ApplyBeatmap(IBeatmap beatmap)
+        {
+            lowestHpEver = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.975, 0.8, 0.3);
+            lowestHpEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.99, 0.9, 0.4);
+            hpRecoveryAvailable = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.04, 0.02, 0);
+
+            base.ApplyBeatmap(beatmap);
+        }
+
+        protected override void Reset(bool storeResults)
+        {
+            hpMultiplierNormal = 1;
+            base.Reset(storeResults);
+        }
+
+        protected override double ComputeDrainRate()
+        {
+            double testDrop = 0.00025;
+            double currentHp;
+            double currentHpUncapped;
+
+            do
+            {
+                currentHp = 1;
+                currentHpUncapped = 1;
+
+                double lowestHp = currentHp;
+                double lastTime = DrainStartTime;
+                int currentBreak = 0;
+                bool fail = false;
+                string failReason = string.Empty;
+
+                for (int i = 0; i < Beatmap.HitObjects.Count; i++)
+                {
+                    HitObject h = Beatmap.HitObjects[i];
+
+                    // Find active break (between current and lastTime)
+                    double localLastTime = lastTime;
+                    double breakTime = 0;
+
+                    // Subtract any break time from the duration since the last object
+                    if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
+                    {
+                        BreakPeriod e = Beatmap.Breaks[currentBreak];
+
+                        if (e.StartTime >= localLastTime && e.EndTime <= h.StartTime)
+                        {
+                            // consider break start equal to object end time for version 8+ since drain stops during this time
+                            breakTime = (Beatmap.BeatmapInfo.BeatmapVersion < 8) ? (e.EndTime - e.StartTime) : e.EndTime - localLastTime;
+                            currentBreak++;
+                        }
+                    }
+
+                    reduceHp(testDrop * (h.StartTime - lastTime - breakTime));
+
+                    lastTime = h.GetEndTime();
+
+                    if (currentHp < lowestHp)
+                        lowestHp = currentHp;
+
+                    if (currentHp <= lowestHpEver)
+                    {
+                        fail = true;
+                        testDrop *= 0.96;
+                        failReason = $"hp too low ({currentHp} < {lowestHpEver})";
+                        break;
+                    }
+
+                    double hpReduction = testDrop * (h.GetEndTime() - h.StartTime);
+                    double hpOverkill = Math.Max(0, hpReduction - currentHp);
+                    reduceHp(hpReduction);
+
+                    if (h is Slider slider)
+                    {
+                        foreach (var nested in slider.NestedHitObjects)
+                            increaseHp(nested);
+                    }
+                    else if (h is Spinner spinner)
+                    {
+                        foreach (var nested in spinner.NestedHitObjects.Where(t => t is not SpinnerBonusTick))
+                            increaseHp(nested);
+                    }
+
+                    if (hpOverkill > 0 && currentHp - hpOverkill <= lowestHpEver)
+                    {
+                        fail = true;
+                        testDrop *= 0.96;
+                        failReason = $"overkill ({currentHp} - {hpOverkill} <= {lowestHpEver})";
+                        break;
+                    }
+
+                    increaseHp(h);
+                }
+
+                if (!fail && currentHp < lowestHpEnd)
+                {
+                    fail = true;
+                    testDrop *= 0.94;
+                    hpMultiplierNormal *= 1.01;
+                    failReason = $"end hp too low ({currentHp} < {lowestHpEnd})";
+                }
+
+                double recovery = (currentHpUncapped - 1) / Beatmap.HitObjects.Count;
+
+                if (!fail && recovery < hpRecoveryAvailable)
+                {
+                    fail = true;
+                    testDrop *= 0.96;
+                    hpMultiplierNormal *= 1.01;
+                    failReason = $"recovery too low ({recovery} < {hpRecoveryAvailable})";
+                }
+
+                if (fail)
+                {
+                    if (Log)
+                        Console.WriteLine($"FAILED drop {testDrop}: {failReason}");
+                    continue;
+                }
+
+                if (Log)
+                    Console.WriteLine($"PASSED drop {testDrop}");
+                return testDrop;
+            } while (true);
+
+            void reduceHp(double amount)
+            {
+                currentHpUncapped = Math.Max(0, currentHpUncapped - amount);
+                currentHp = Math.Max(0, currentHp - amount);
+            }
+
+            void increaseHp(HitObject hitObject)
+            {
+                double amount = healthIncreaseFor(hitObject, hitObject.CreateJudgement().MaxResult);
+                currentHpUncapped += amount;
+                currentHp = Math.Max(0, Math.Min(1, currentHp + amount));
+            }
+        }
+
+        protected override double GetHealthIncreaseFor(JudgementResult result) => healthIncreaseFor(result.HitObject, result.Type);
+
+        private double healthIncreaseFor(HitObject hitObject, HitResult result)
+        {
+            double increase;
+
+            switch (result)
+            {
+                case HitResult.SmallTickMiss:
+                    return IBeatmapDifficultyInfo.DifficultyRange(Beatmap.Difficulty.DrainRate, -0.02, -0.075, -0.14);
+
+                case HitResult.LargeTickMiss:
+                    return IBeatmapDifficultyInfo.DifficultyRange(Beatmap.Difficulty.DrainRate, -0.02, -0.075, -0.14);
+
+                case HitResult.Miss:
+                    return IBeatmapDifficultyInfo.DifficultyRange(Beatmap.Difficulty.DrainRate, -0.03, -0.125, -0.2);
+
+                case HitResult.SmallTickHit:
+                    // This result is always as a result of the slider tail.
+                    increase = 0.02;
+                    break;
+
+                case HitResult.LargeTickHit:
+                    // This result is either a result of a slider tick or a repeat.
+                    increase = hitObject is SliderTick ? 0.015 : 0.02;
+                    break;
+
+                case HitResult.Meh:
+                    increase = 0.002;
+                    break;
+
+                case HitResult.Ok:
+                    increase = 0.011;
+                    break;
+
+                case HitResult.Good:
+                    increase = 0.024;
+                    break;
+
+                case HitResult.Great:
+                    increase = 0.03;
+                    break;
+
+                case HitResult.Perfect:
+                    // 1.1 * Great. Unused.
+                    increase = 0.033;
+                    break;
+
+                case HitResult.SmallBonus:
+                    increase = 0.0085;
+                    break;
+
+                case HitResult.LargeBonus:
+                    increase = 0.01;
+                    break;
+
+                default:
+                    increase = 0;
+                    break;
+            }
+
+            return hpMultiplierNormal * increase;
+        }
+    }
+}

From b6dcd7d55f0d421d85e2e97d00ae5704d1fb5487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 18:48:45 +0900
Subject: [PATCH 1490/2296] Fix tests so that they actually assert something

---
 .../Online/TestSceneUserClickableAvatar.cs    | 67 +++----------------
 1 file changed, 9 insertions(+), 58 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
index b38fb9153a..9edaa841b2 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Testing;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
@@ -41,65 +42,15 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestClickableAvatarHover()
         {
-            AddStep($"click user {1} with UserGridPanel {nameof(ClickableAvatar)}", () =>
-            {
-                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-                if (targets.Count < 1)
-                    return;
+            AddStep("hover avatar with user panel", () => InputManager.MoveMouseTo(this.ChildrenOfType<ClickableAvatar>().ElementAt(1)));
+            AddUntilStep("wait for tooltip to show", () => this.ChildrenOfType<ClickableAvatar.UserCardTooltip>().FirstOrDefault()?.State.Value == Visibility.Visible);
+            AddStep("hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddUntilStep("wait for tooltip to hide", () => this.ChildrenOfType<ClickableAvatar.UserCardTooltip>().FirstOrDefault()?.State.Value == Visibility.Hidden);
 
-                InputManager.MoveMouseTo(targets[0]);
-            });
-            AddWaitStep("wait for tooltip to show", 5);
-            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            AddWaitStep("wait for tooltip to hide", 3);
-
-            AddStep($"click user {2} with username only. {nameof(ClickableAvatar)}", () =>
-            {
-                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-                if (targets.Count < 2)
-                    return;
-
-                InputManager.MoveMouseTo(targets[1]);
-            });
-            AddWaitStep("wait for tooltip to show", 5);
-            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            AddWaitStep("wait for tooltip to hide", 3);
-
-            AddStep($"click user {3} with UserGridPanel {nameof(ClickableAvatar)}", () =>
-            {
-                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-                if (targets.Count < 3)
-                    return;
-
-                InputManager.MoveMouseTo(targets[2]);
-            });
-            AddWaitStep("wait for tooltip to show", 5);
-            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            AddWaitStep("wait for tooltip to hide", 3);
-
-            AddStep($"click null user {4}. {nameof(ClickableAvatar)}", () =>
-            {
-                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-                if (targets.Count < 4)
-                    return;
-
-                InputManager.MoveMouseTo(targets[3]);
-            });
-            AddWaitStep("wait for tooltip to show", 5);
-            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            AddWaitStep("wait for tooltip to hide", 3);
-
-            AddStep($"click null user {5}. {nameof(ClickableAvatar)}", () =>
-            {
-                var targets = this.ChildrenOfType<ClickableAvatar>().ToList();
-                if (targets.Count < 5)
-                    return;
-
-                InputManager.MoveMouseTo(targets[4]);
-            });
-            AddWaitStep("wait for tooltip to show", 5);
-            AddStep("Hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
-            AddWaitStep("wait for tooltip to hide", 3);
+            AddStep("hover avatar without user panel", () => InputManager.MoveMouseTo(this.ChildrenOfType<ClickableAvatar>().ElementAt(0)));
+            AddUntilStep("wait for tooltip to show", () => this.ChildrenOfType<OsuTooltipContainer.OsuTooltip>().FirstOrDefault()?.State.Value == Visibility.Visible);
+            AddStep("hover out", () => InputManager.MoveMouseTo(new Vector2(0)));
+            AddUntilStep("wait for tooltip to hide", () => this.ChildrenOfType<OsuTooltipContainer.OsuTooltip>().FirstOrDefault()?.State.Value == Visibility.Hidden);
         }
 
         private Drawable generateUser(string username, int id, CountryCode countryCode, string cover, bool showPanel, string? color = null)

From 793d90e396bb3268af6117f1fff2a5b474e80e2d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 10 Nov 2023 19:09:09 +0900
Subject: [PATCH 1491/2296] Add some notes

---
 osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 489b8408ea..2266cf9d33 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -64,6 +64,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     double localLastTime = lastTime;
                     double breakTime = 0;
 
+                    // TODO: This doesn't handle overlapping/sequential breaks correctly (/b/614).
                     // Subtract any break time from the duration since the last object
                     if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
                     {
@@ -107,6 +108,8 @@ namespace osu.Game.Rulesets.Osu.Scoring
                             increaseHp(nested);
                     }
 
+                    // Note: Because HP is capped during the above increases, long sliders (with many ticks) or spinners
+                    // will appear to overkill at lower drain levels than they should. However, it is also not correct to simply use the uncapped version.
                     if (hpOverkill > 0 && currentHp - hpOverkill <= lowestHpEver)
                     {
                         fail = true;

From b7acbde719744a3aac166c676b792e9d87699612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 10 Nov 2023 19:12:26 +0900
Subject: [PATCH 1492/2296] Only store width/height of serialised drawable if
 it isn't automatically computed

---
 osu.Game/Skinning/SerialisedDrawableInfo.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/SerialisedDrawableInfo.cs b/osu.Game/Skinning/SerialisedDrawableInfo.cs
index b2237acc5a..2d6113ff70 100644
--- a/osu.Game/Skinning/SerialisedDrawableInfo.cs
+++ b/osu.Game/Skinning/SerialisedDrawableInfo.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
@@ -66,8 +67,13 @@ namespace osu.Game.Skinning
             Position = component.Position;
             Rotation = component.Rotation;
             Scale = component.Scale;
-            Height = component.Height;
-            Width = component.Width;
+
+            if ((component as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(Axes.X) != true)
+                Width = component.Width;
+
+            if ((component as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(Axes.Y) != true)
+                Height = component.Height;
+
             Anchor = component.Anchor;
             Origin = component.Origin;
 

From 57cd5194ce06b16e03dc0dea32a0e81da80b1029 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 20:00:20 +0900
Subject: [PATCH 1493/2296] Flip comparison to allow non-composite drawables to
 still get resized

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

diff --git a/osu.Game/Skinning/SerialisableDrawableExtensions.cs b/osu.Game/Skinning/SerialisableDrawableExtensions.cs
index 6938ed4091..97c4cc8f73 100644
--- a/osu.Game/Skinning/SerialisableDrawableExtensions.cs
+++ b/osu.Game/Skinning/SerialisableDrawableExtensions.cs
@@ -19,9 +19,9 @@ namespace osu.Game.Skinning
             // todo: can probably make this better via deserialisation directly using a common interface.
             component.Position = drawableInfo.Position;
             component.Rotation = drawableInfo.Rotation;
-            if (drawableInfo.Width is float width && width != 0 && (component as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(Axes.X) == false)
+            if (drawableInfo.Width is float width && width != 0 && (component as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(Axes.X) != true)
                 component.Width = width;
-            if (drawableInfo.Height is float height && height != 0 && (component as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(Axes.Y) == false)
+            if (drawableInfo.Height is float height && height != 0 && (component as CompositeDrawable)?.AutoSizeAxes.HasFlagFast(Axes.Y) != true)
                 component.Height = height;
             component.Scale = drawableInfo.Scale;
             component.Anchor = drawableInfo.Anchor;

From 2e48569982039c9c1e6cb722190a6669ea09aee7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Nov 2023 20:00:51 +0900
Subject: [PATCH 1494/2296] Improve test comparison logic

Doesn't really help that much with nunit output,
but at least you can breakpoint and see the json kinda.
---
 .../Visual/Gameplay/TestSceneSkinEditor.cs        | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 4e5db5d46e..bd56a95809 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -4,6 +4,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
+using System.Text.Unicode;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -214,7 +217,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("Press undo", () => InputManager.Keys(PlatformAction.Undo));
-            AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+
+            AddAssert("Nothing changed",
+                () => JsonConvert.DeserializeObject<IEnumerable<SerialisedDrawableInfo>>(Encoding.UTF8.GetString(defaultState)),
+                () => Is.EqualTo(JsonConvert.DeserializeObject<IEnumerable<SerialisedDrawableInfo>>(Encoding.UTF8.GetString(changeHandler.GetCurrentState())))
+            );
 
             AddStep("Add components", () =>
             {
@@ -243,7 +250,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             void revertAndCheckUnchanged()
             {
                 AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
-                AddAssert("Current state is same as default", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+
+                AddAssert("Current state is same as default",
+                    () => JsonConvert.DeserializeObject<IEnumerable<SerialisedDrawableInfo>>(Encoding.UTF8.GetString(defaultState)),
+                    () => Is.EqualTo(JsonConvert.DeserializeObject<IEnumerable<SerialisedDrawableInfo>>(Encoding.UTF8.GetString(changeHandler.GetCurrentState())))
+                );
             }
         }
 

From 9ef34fa51a97e41f47dc8be0fc40c1495442c5fe Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 10 Nov 2023 15:02:15 +0200
Subject: [PATCH 1495/2296] FIxed stated problems

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 13 -------------
 osu.Game/Rulesets/Ruleset.cs            |  8 ++++++++
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index b8324b3f2f..7fcf400409 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -428,19 +428,6 @@ namespace osu.Game.Rulesets.Mania
 
         public override DifficultySection CreateEditorDifficultySection() => new ManiaDifficultySection();
 
-        // Mania doesn't have rate-adjusted attributes anymore?
-
-        //public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
-        //{
-        //    BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
-
-        //    double hitwindow = 64.0 - 3 * adjustedDifficulty.OverallDifficulty;
-        //    hitwindow /= rate;
-        //    adjustedDifficulty.OverallDifficulty = (float)(64.0 - hitwindow) / 3;
-
-        //    return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
-        //}
-
     }
 
     public enum PlayfieldType
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index fbeec5ff4b..8896517a1a 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -389,6 +389,14 @@ namespace osu.Game.Rulesets
         /// Can be overridden to alter the difficulty section to the editor beatmap setup screen.
         /// </summary>
         public virtual DifficultySection? CreateEditorDifficultySection() => null;
+
+        /// <summary>
+        /// Changes difficulty after they're adjusted according to rate.
+        /// Doesn't change any attributes by default.
+        /// </summary>
+        /// <param name="baseDifficulty">Difficulty attributes that will be changed</param>
+        /// <param name="rate">Rate of the gameplay. For example 1.5 for DT.</param>
+        /// <returns>Copy of difficulty info with values changed according to rate and ruleset-specific behaviour.</returns>
         public virtual BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate) => new BeatmapDifficulty(baseDifficulty);
     }
 }

From d0d334a3715d98405c9bcd58cf5d21d25895fd98 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 10 Nov 2023 15:05:26 +0200
Subject: [PATCH 1496/2296] Update Ruleset.cs

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

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 8896517a1a..e0e0c1295b 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -391,10 +391,10 @@ namespace osu.Game.Rulesets
         public virtual DifficultySection? CreateEditorDifficultySection() => null;
 
         /// <summary>
-        /// Changes difficulty after they're adjusted according to rate.
+        /// Changes <see cref="BeatmapDifficulty"/> after they're adjusted according to rate.
         /// Doesn't change any attributes by default.
         /// </summary>
-        /// <param name="baseDifficulty">Difficulty attributes that will be changed</param>
+        /// <param name="baseDifficulty">>The <see cref="IBeatmapDifficultyInfo"/> that will be adjusted.</param>
         /// <param name="rate">Rate of the gameplay. For example 1.5 for DT.</param>
         /// <returns>Copy of difficulty info with values changed according to rate and ruleset-specific behaviour.</returns>
         public virtual BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate) => new BeatmapDifficulty(baseDifficulty);

From c5feefc2ad186371431c08f593d3ad8b032168a6 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 10 Nov 2023 15:06:32 +0200
Subject: [PATCH 1497/2296] Update ManiaRuleset.cs

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 7fcf400409..4507015169 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -427,7 +427,6 @@ namespace osu.Game.Rulesets.Mania
         public override RulesetSetupSection CreateEditorSetupSection() => new ManiaSetupSection();
 
         public override DifficultySection CreateEditorDifficultySection() => new ManiaDifficultySection();
-
     }
 
     public enum PlayfieldType

From 60c3e7250bbc406f7ea82c446b9c2b3e2511e384 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 10 Nov 2023 15:13:40 +0200
Subject: [PATCH 1498/2296] fixed naming incconvinence

---
 osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs | 12 ++++++------
 osu.Game/Screens/Select/Details/AdvancedStats.cs   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index c921e3e075..74bf5e5bd3 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -266,7 +266,7 @@ namespace osu.Game.Overlays.Mods
             Ruleset ruleset = gameRuleset.Value.CreateInstance();
             adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(adjustedDifficulty, rate);
 
-            haveRateChangedValues = !isDifferentArOd(originalDifficulty, adjustedDifficulty);
+            haveRateChangedValues = isDifferentArOd(originalDifficulty, adjustedDifficulty);
 
             approachRateDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
             overallDifficultyDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
@@ -279,13 +279,13 @@ namespace osu.Game.Overlays.Mods
 
         private bool isDifferentArOd(BeatmapDifficulty? a, BeatmapDifficulty? b)
         {
-            if (a == null && b == null) return true;
-            if (a == null || b == null) return false;
+            if (a == null && b == null) return false;
+            if (a == null || b == null) return true;
 
-            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return false;
-            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return false;
+            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return true;
+            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return true;
 
-            return true;
+            return false;
         }
 
         private void updateCollapsedState()
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 54b76c48a4..802c1901eb 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Screens.Select.Details
                     rate = mod.ApplyToRate(0, rate);
                 adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(adjustedDifficulty, rate);
 
-                haveRateChangedValues = !isDifferentArOd(originalDifficulty, adjustedDifficulty);
+                haveRateChangedValues = isDifferentArOd(originalDifficulty, adjustedDifficulty);
             }
 
             switch (BeatmapInfo?.Ruleset.OnlineID)
@@ -204,13 +204,13 @@ namespace osu.Game.Screens.Select.Details
 
         private bool isDifferentArOd(BeatmapDifficulty a, BeatmapDifficulty b)
         {
-            if (a == null && b == null) return true;
-            if (a == null || b == null) return false;
+            if (a == null && b == null) return false;
+            if (a == null || b == null) return true;
 
-            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return false;
-            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return false;
+            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return true;
+            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return true;
 
-            return true;
+            return false;
         }
 
         public LocalisableString TooltipText

From 080f13e34d0f5f60381d813edfd590aa2b466194 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 11 Nov 2023 02:56:16 +0300
Subject: [PATCH 1499/2296] Schedule outside of `UnloadStoryboard` and fix
 disposal happening on update thread

---
 .../Backgrounds/BeatmapBackgroundWithStoryboard.cs  | 13 +++++--------
 osu.Game/Screens/BackgroundScreenStack.cs           |  2 +-
 .../Screens/Backgrounds/BackgroundScreenDefault.cs  | 13 +++++++++++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
index 1e702967b6..2bde71a6a1 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Graphics.Backgrounds
             }, (loadCancellationSource = new CancellationTokenSource()).Token);
         }
 
-        public void UnloadStoryboard(Action<Action> scheduleStoryboardRemoval)
+        public void UnloadStoryboard()
         {
             if (drawableStoryboard == null)
                 return;
@@ -79,15 +79,12 @@ namespace osu.Game.Graphics.Backgrounds
             loadCancellationSource.AsNonNull().Cancel();
             loadCancellationSource = null;
 
-            DrawableStoryboard s = drawableStoryboard;
-
-            scheduleStoryboardRemoval(() =>
-            {
-                s.RemoveAndDisposeImmediately();
-                Sprite.Alpha = 1f;
-            });
+            // clear is intentionally used here for the storyboard to be disposed asynchronously.
+            storyboardContainer.Clear();
 
             drawableStoryboard = null;
+
+            Sprite.Alpha = 1f;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/BackgroundScreenStack.cs b/osu.Game/Screens/BackgroundScreenStack.cs
index 9af6601aa4..2c7b219791 100644
--- a/osu.Game/Screens/BackgroundScreenStack.cs
+++ b/osu.Game/Screens/BackgroundScreenStack.cs
@@ -35,6 +35,6 @@ namespace osu.Game.Screens
             return true;
         }
 
-        internal void ScheduleToTransitionEnd(Action action) => Scheduler.AddDelayed(action, BackgroundScreen.TRANSITION_LENGTH);
+        internal ScheduledDelegate ScheduleUntilTransitionEnd(Action action) => Scheduler.AddDelayed(action, BackgroundScreen.TRANSITION_LENGTH);
     }
 }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 07b1cc6df4..4583b3e4d6 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -73,13 +73,15 @@ namespace osu.Game.Screens.Backgrounds
             void next() => Next();
         }
 
+        private ScheduledDelegate storyboardUnloadDelegate;
+
         public override void OnSuspending(ScreenTransitionEvent e)
         {
             var backgroundScreenStack = Parent as BackgroundScreenStack;
             Debug.Assert(backgroundScreenStack != null);
 
             if (background is BeatmapBackgroundWithStoryboard storyboardBackground)
-                storyboardBackground.UnloadStoryboard(backgroundScreenStack.ScheduleToTransitionEnd);
+                storyboardUnloadDelegate = backgroundScreenStack.ScheduleUntilTransitionEnd(storyboardBackground.UnloadStoryboard);
 
             base.OnSuspending(e);
         }
@@ -87,7 +89,14 @@ namespace osu.Game.Screens.Backgrounds
         public override void OnResuming(ScreenTransitionEvent e)
         {
             if (background is BeatmapBackgroundWithStoryboard storyboardBackground)
-                storyboardBackground.LoadStoryboard();
+            {
+                if (storyboardUnloadDelegate?.Completed == false)
+                    storyboardUnloadDelegate.Cancel();
+                else
+                    storyboardBackground.LoadStoryboard();
+
+                storyboardUnloadDelegate = null;
+            }
 
             base.OnResuming(e);
         }

From bb912bc6161a8785f105e3da29f7e95f83261249 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 11 Nov 2023 02:57:17 +0300
Subject: [PATCH 1500/2296] Avoid spinning another load thread on initial
 storyboard load

---
 .../BeatmapBackgroundWithStoryboard.cs        | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
index 2bde71a6a1..784c8e4b44 100644
--- a/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.cs
+++ b/osu.Game/Graphics/Backgrounds/BeatmapBackgroundWithStoryboard.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.
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 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.Timing;
@@ -48,27 +46,37 @@ namespace osu.Game.Graphics.Backgrounds
                 Volume = { Value = 0 },
             });
 
-            LoadStoryboard();
+            LoadStoryboard(false);
         }
 
-        public void LoadStoryboard()
+        public void LoadStoryboard(bool async = true)
         {
             Debug.Assert(drawableStoryboard == null);
 
             if (!Beatmap.Storyboard.HasDrawable)
                 return;
 
-            LoadComponentAsync(drawableStoryboard = new DrawableStoryboard(Beatmap.Storyboard, mods.Value)
+            drawableStoryboard = new DrawableStoryboard(Beatmap.Storyboard, mods.Value)
             {
                 Clock = storyboardClock
-            }, s =>
+            };
+
+            if (async)
+                LoadComponentAsync(drawableStoryboard, finishLoad, (loadCancellationSource = new CancellationTokenSource()).Token);
+            else
+            {
+                LoadComponent(drawableStoryboard);
+                finishLoad(drawableStoryboard);
+            }
+
+            void finishLoad(DrawableStoryboard s)
             {
                 if (Beatmap.Storyboard.ReplacesBackground)
                     Sprite.FadeOut(BackgroundScreen.TRANSITION_LENGTH, Easing.InQuint);
 
                 storyboardContainer.FadeInFromZero(BackgroundScreen.TRANSITION_LENGTH, Easing.OutQuint);
                 storyboardContainer.Add(s);
-            }, (loadCancellationSource = new CancellationTokenSource()).Token);
+            }
         }
 
         public void UnloadStoryboard()
@@ -76,7 +84,7 @@ namespace osu.Game.Graphics.Backgrounds
             if (drawableStoryboard == null)
                 return;
 
-            loadCancellationSource.AsNonNull().Cancel();
+            loadCancellationSource?.Cancel();
             loadCancellationSource = null;
 
             // clear is intentionally used here for the storyboard to be disposed asynchronously.

From 96da7a07bbd79bc67cbc58196bb38cd6c835c83a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 11 Nov 2023 02:57:29 +0300
Subject: [PATCH 1501/2296] Add detailed explaination on existence of
 `ScheduleUntilTransitionEnd`

---
 osu.Game/Screens/BackgroundScreenStack.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game/Screens/BackgroundScreenStack.cs b/osu.Game/Screens/BackgroundScreenStack.cs
index 2c7b219791..562b212561 100644
--- a/osu.Game/Screens/BackgroundScreenStack.cs
+++ b/osu.Game/Screens/BackgroundScreenStack.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
+using osu.Framework.Threading;
+using osu.Game.Screens.Backgrounds;
 
 namespace osu.Game.Screens
 {
@@ -35,6 +37,19 @@ namespace osu.Game.Screens
             return true;
         }
 
+        /// <summary>
+        /// Schedules a delegate to run after 500ms, the time length of a background screen transition.
+        /// This is used in <see cref="BackgroundScreenDefault"/> to dispose of the storyboard once the background screen is completely off-screen.
+        /// </summary>
+        /// <remarks>
+        /// Late storyboard disposals cannot be achieved with any local scheduler from <see cref="BackgroundScreenDefault"/> or any component inside it,
+        /// due to the screen becoming dead at the moment the transition finishes. And, on the frame that it is dead on, it will not receive an <see cref="Drawable.UpdateSubTree"/>,
+        /// therefore not guaranteeing to dispose the storyboard at any period of time close to the end of the transition.
+        /// This might require reconsideration framework-side, possibly exposing a "death" event in <see cref="Screen"/> or all <see cref="Drawable"/>s in general.
+        /// </remarks>
+        /// <param name="action">The delegate </param>
+        /// <returns></returns>
+        /// <seealso cref="BackgroundScreen.TRANSITION_LENGTH"/>
         internal ScheduledDelegate ScheduleUntilTransitionEnd(Action action) => Scheduler.AddDelayed(action, BackgroundScreen.TRANSITION_LENGTH);
     }
 }

From 064857c40b7cd18343672fdf103083ba3cb0fdba Mon Sep 17 00:00:00 2001
From: Poyo <poyoarya@gmail.com>
Date: Fri, 10 Nov 2023 19:57:44 -0800
Subject: [PATCH 1502/2296] Calculate unstable rate using rate-adjusted offsets

---
 osu.Game/Rulesets/Judgements/JudgementResult.cs       |  5 +++++
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs   |  1 +
 osu.Game/Rulesets/Scoring/HitEvent.cs                 | 11 +++++++++--
 osu.Game/Rulesets/Scoring/HitEventExtensions.cs       |  3 ++-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs           |  2 +-
 osu.Game/Rulesets/UI/Playfield.cs                     |  2 +-
 osu.Game/Screens/Utility/CircleGameplay.cs            |  2 +-
 osu.Game/Screens/Utility/ScrollingGameplay.cs         |  2 +-
 8 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/JudgementResult.cs b/osu.Game/Rulesets/Judgements/JudgementResult.cs
index c67f8b9fd5..603d470954 100644
--- a/osu.Game/Rulesets/Judgements/JudgementResult.cs
+++ b/osu.Game/Rulesets/Judgements/JudgementResult.cs
@@ -54,6 +54,11 @@ namespace osu.Game.Rulesets.Judgements
         /// </remarks>
         public double TimeAbsolute => RawTime != null ? Math.Min(RawTime.Value, HitObject.GetEndTime() + HitObject.MaximumJudgementOffset) : HitObject.GetEndTime();
 
+        /// <summary>
+        /// The gameplay rate at the time this <see cref="JudgementResult"/> occurred.
+        /// </summary>
+        public double GameplayRate { get; internal set; }
+
         /// <summary>
         /// The combo prior to this <see cref="JudgementResult"/> occurring.
         /// </summary>
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ce6475d3ce..0843fd5bdc 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -704,6 +704,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             Result.RawTime = Time.Current;
+            Result.GameplayRate = Clock.Rate;
 
             if (Result.HasResult)
                 updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);
diff --git a/osu.Game/Rulesets/Scoring/HitEvent.cs b/osu.Game/Rulesets/Scoring/HitEvent.cs
index cabbf40a7d..afa654318b 100644
--- a/osu.Game/Rulesets/Scoring/HitEvent.cs
+++ b/osu.Game/Rulesets/Scoring/HitEvent.cs
@@ -19,6 +19,11 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public readonly double TimeOffset;
 
+        /// <summary>
+        /// The true gameplay rate at the time of the event.
+        /// </summary>
+        public readonly double GameplayRate;
+
         /// <summary>
         /// The hit result.
         /// </summary>
@@ -46,12 +51,14 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         /// <param name="timeOffset">The time offset from the end of <paramref name="hitObject"/> at which the event occurs.</param>
         /// <param name="result">The <see cref="HitResult"/>.</param>
+        /// <param name="gameplayRate">The true gameplay rate at the time of the event.</param>
         /// <param name="hitObject">The <see cref="HitObject"/> that triggered the event.</param>
         /// <param name="lastHitObject">The previous <see cref="HitObject"/>.</param>
         /// <param name="position">A position corresponding to the event.</param>
-        public HitEvent(double timeOffset, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, [CanBeNull] Vector2? position)
+        public HitEvent(double timeOffset, double gameplayRate, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, [CanBeNull] Vector2? position)
         {
             TimeOffset = timeOffset;
+            GameplayRate = gameplayRate;
             Result = result;
             HitObject = hitObject;
             LastHitObject = lastHitObject;
@@ -63,6 +70,6 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         /// <param name="positionOffset">The positional offset.</param>
         /// <returns>The new <see cref="HitEvent"/>.</returns>
-        public HitEvent With(Vector2? positionOffset) => new HitEvent(TimeOffset, Result, HitObject, LastHitObject, positionOffset);
+        public HitEvent With(Vector2? positionOffset) => new HitEvent(TimeOffset, GameplayRate, Result, HitObject, LastHitObject, positionOffset);
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/HitEventExtensions.cs b/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
index b4bdd8a1ea..a93385ef43 100644
--- a/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
+++ b/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
@@ -18,7 +18,8 @@ namespace osu.Game.Rulesets.Scoring
         /// </returns>
         public static double? CalculateUnstableRate(this IEnumerable<HitEvent> hitEvents)
         {
-            double[] timeOffsets = hitEvents.Where(affectsUnstableRate).Select(ev => ev.TimeOffset).ToArray();
+            // Division by gameplay rate is to account for TimeOffset scaling with gameplay rate.
+            double[] timeOffsets = hitEvents.Where(affectsUnstableRate).Select(ev => ev.TimeOffset / ev.GameplayRate).ToArray();
             return 10 * standardDeviation(timeOffsets);
         }
 
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 35a7dfe369..4e899479bd 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Scoring
         /// <param name="result">The <see cref="JudgementResult"/> to describe.</param>
         /// <returns>The <see cref="HitEvent"/>.</returns>
         protected virtual HitEvent CreateHitEvent(JudgementResult result)
-            => new HitEvent(result.TimeOffset, result.Type, result.HitObject, lastHitObject, null);
+            => new HitEvent(result.TimeOffset, result.GameplayRate, result.Type, result.HitObject, lastHitObject, null);
 
         protected sealed override void RevertResultInternal(JudgementResult result)
         {
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index e9c35555c8..17baf8838c 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -473,7 +473,7 @@ namespace osu.Game.Rulesets.UI
 
         private void onNewResult(DrawableHitObject drawable, JudgementResult result)
         {
-            Debug.Assert(result != null && drawable.Entry?.Result == result && result.RawTime != null);
+            Debug.Assert(result != null && drawable.Entry?.Result == result && result.RawTime != null && result.GameplayRate != 0.0);
             judgedEntries.Push(drawable.Entry.AsNonNull());
 
             NewResult?.Invoke(drawable, result);
diff --git a/osu.Game/Screens/Utility/CircleGameplay.cs b/osu.Game/Screens/Utility/CircleGameplay.cs
index d97812acb4..1f970c5121 100644
--- a/osu.Game/Screens/Utility/CircleGameplay.cs
+++ b/osu.Game/Screens/Utility/CircleGameplay.cs
@@ -224,7 +224,7 @@ namespace osu.Game.Screens.Utility
                     .FadeOut(duration)
                     .ScaleTo(1.5f, duration);
 
-                HitEvent = new HitEvent(Clock.CurrentTime - HitTime, HitResult.Good, new HitObject
+                HitEvent = new HitEvent(Clock.CurrentTime - HitTime, 1.0, HitResult.Good, new HitObject
                 {
                     HitWindows = new HitWindows(),
                 }, null, null);
diff --git a/osu.Game/Screens/Utility/ScrollingGameplay.cs b/osu.Game/Screens/Utility/ScrollingGameplay.cs
index f1331d8fb2..5038c53b4a 100644
--- a/osu.Game/Screens/Utility/ScrollingGameplay.cs
+++ b/osu.Game/Screens/Utility/ScrollingGameplay.cs
@@ -186,7 +186,7 @@ namespace osu.Game.Screens.Utility
                     .FadeOut(duration / 2)
                     .ScaleTo(1.5f, duration / 2);
 
-                HitEvent = new HitEvent(Clock.CurrentTime - HitTime, HitResult.Good, new HitObject
+                HitEvent = new HitEvent(Clock.CurrentTime - HitTime, 1.0, HitResult.Good, new HitObject
                 {
                     HitWindows = new HitWindows(),
                 }, null, null);

From 21e1d68b15960c448d9876baaec51776febde22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 11 Nov 2023 15:52:24 +0900
Subject: [PATCH 1503/2296] Remove unused using directive

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index bd56a95809..08019c90e1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Text.Unicode;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.Allocation;

From 2428a97d449b5e5f51ea2f9c8805c32521301a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 11 Nov 2023 17:02:21 +0900
Subject: [PATCH 1504/2296] Fix editor not clearing undo history on skin change

---
 osu.Game/Overlays/SkinEditor/SkinEditor.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index 5affaedf1d..78c1ea2f0b 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -406,7 +406,14 @@ namespace osu.Game.Overlays.SkinEditor
                 cp.Colour = colours.Yellow;
             });
 
+            changeHandler?.Dispose();
+
             skins.EnsureMutableSkin();
+
+            var targetContainer = getTarget(selectedTarget.Value);
+
+            if (targetContainer != null)
+                changeHandler = new SkinEditorChangeHandler(targetContainer);
             hasBegunMutating = true;
         }
 

From b247b94ecbdb5405de16ba489ef7a62b36cd7656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 11 Nov 2023 19:15:20 +0900
Subject: [PATCH 1505/2296] Revert test changes

They were broken because `SerialisedDrawableInfo` is a reference type
and as such equality checks will use reference equality rather than
member equality.
---
 .../Visual/Gameplay/TestSceneSkinEditor.cs         | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 08019c90e1..4e5db5d46e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -4,8 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -216,11 +214,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("Press undo", () => InputManager.Keys(PlatformAction.Undo));
-
-            AddAssert("Nothing changed",
-                () => JsonConvert.DeserializeObject<IEnumerable<SerialisedDrawableInfo>>(Encoding.UTF8.GetString(defaultState)),
-                () => Is.EqualTo(JsonConvert.DeserializeObject<IEnumerable<SerialisedDrawableInfo>>(Encoding.UTF8.GetString(changeHandler.GetCurrentState())))
-            );
+            AddAssert("Nothing changed", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
 
             AddStep("Add components", () =>
             {
@@ -249,11 +243,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             void revertAndCheckUnchanged()
             {
                 AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
-
-                AddAssert("Current state is same as default",
-                    () => JsonConvert.DeserializeObject<IEnumerable<SerialisedDrawableInfo>>(Encoding.UTF8.GetString(defaultState)),
-                    () => Is.EqualTo(JsonConvert.DeserializeObject<IEnumerable<SerialisedDrawableInfo>>(Encoding.UTF8.GetString(changeHandler.GetCurrentState())))
-                );
+                AddAssert("Current state is same as default", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
             }
         }
 

From 61d336521da4adc3c8dcc6bacc20a7f23a306d34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Nov 2023 19:48:56 +0900
Subject: [PATCH 1506/2296] Update framework

---
 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 2870696c03..15553510cb 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1030.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1111.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 73cd239854..2e0f68d610 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1030.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1111.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1109.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index f1159f58b9..ef54dd06b4 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1030.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1111.0" />
   </ItemGroup>
 </Project>

From b0aa4a4257a5f590a1b65613cbf988b7034d7a9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Nov 2023 20:34:35 +0900
Subject: [PATCH 1507/2296] Add "export" item to skin editor menu

---
 osu.Game/Overlays/SkinEditor/SkinEditor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index 78c1ea2f0b..38eed55241 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -8,6 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -153,6 +154,8 @@ namespace osu.Game.Overlays.SkinEditor
                                                 Items = new[]
                                                 {
                                                     new EditorMenuItem(Web.CommonStrings.ButtonsSave, MenuItemType.Standard, () => Save()),
+                                                    new EditorMenuItem(CommonStrings.Export, MenuItemType.Standard, () => skins.ExportCurrentSkin()) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
+                                                    new EditorMenuItemSpacer(),
                                                     new EditorMenuItem(CommonStrings.RevertToDefault, MenuItemType.Destructive, () => dialogOverlay?.Push(new RevertConfirmDialog(revert))),
                                                     new EditorMenuItemSpacer(),
                                                     new EditorMenuItem(CommonStrings.Exit, MenuItemType.Standard, () => skinEditorOverlay?.Hide()),

From 870e4ce27e751d2a7129d5fe396f2f96e74865bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 11 Nov 2023 20:42:45 +0900
Subject: [PATCH 1508/2296] Fix argon health display not handling invalidation
 correctly

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index b56920c99a..f4ce7d1633 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -89,6 +89,13 @@ namespace osu.Game.Screens.Play.HUD
 
         public const float MAIN_PATH_RADIUS = 10f;
 
+        private readonly LayoutValue drawSizeLayout = new LayoutValue(Invalidation.DrawSize);
+
+        public ArgonHealthDisplay()
+        {
+            AddLayout(drawSizeLayout);
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -134,22 +141,11 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(_ => Scheduler.AddOnce(updateCurrent), true);
 
-            UseRelativeSize.BindValueChanged(v =>
-            {
-                RelativeSizeAxes = v.NewValue ? Axes.X : Axes.None;
-            }, true);
+            UseRelativeSize.BindValueChanged(v => RelativeSizeAxes = v.NewValue ? Axes.X : Axes.None, true);
 
             BarHeight.BindValueChanged(_ => updatePath(), true);
         }
 
-        protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
-        {
-            if ((invalidation & Invalidation.DrawSize) > 0)
-                updatePath();
-
-            return base.OnInvalidate(invalidation, source);
-        }
-
         private void updateCurrent()
         {
             if (Current.Value >= GlowBarValue) finishMissDisplay();
@@ -165,6 +161,12 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Update();
 
+            if (!drawSizeLayout.IsValid)
+            {
+                updatePath();
+                drawSizeLayout.Validate();
+            }
+
             mainBar.Alpha = (float)Interpolation.DampContinuously(mainBar.Alpha, Current.Value > 0 ? 1 : 0, 40, Time.Elapsed);
             glowBar.Alpha = (float)Interpolation.DampContinuously(glowBar.Alpha, GlowBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
         }

From ee56b4d205f916ea9cf45543c72cce34f53b8a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 11 Nov 2023 20:55:47 +0900
Subject: [PATCH 1509/2296] Use barely better assertion fail message in test

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 4e5db5d46e..92f28288ca 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -243,7 +244,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             void revertAndCheckUnchanged()
             {
                 AddStep("Revert changes", () => changeHandler.RestoreState(int.MinValue));
-                AddAssert("Current state is same as default", () => defaultState.SequenceEqual(changeHandler.GetCurrentState()));
+                AddAssert("Current state is same as default",
+                    () => Encoding.UTF8.GetString(defaultState),
+                    () => Is.EqualTo(Encoding.UTF8.GetString(changeHandler.GetCurrentState())));
             }
         }
 

From 50789d2e18a43dd3b2a2e99ea9487851972f35f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 11 Nov 2023 21:28:04 +0900
Subject: [PATCH 1510/2296] Fix song progress bars not sizing vertically
 properly

---
 .../Screens/Play/HUD/ArgonSongProgress.cs     | 66 +++++++++++--------
 .../Screens/Play/HUD/DefaultSongProgress.cs   | 49 ++++++++------
 2 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs b/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
index be2ce3b272..cb38854bca 100644
--- a/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
@@ -19,6 +19,7 @@ namespace osu.Game.Screens.Play.HUD
         private readonly ArgonSongProgressGraph graph;
         private readonly ArgonSongProgressBar bar;
         private readonly Container graphContainer;
+        private readonly Container content;
 
         private const float bar_height = 10;
 
@@ -30,43 +31,50 @@ namespace osu.Game.Screens.Play.HUD
 
         public ArgonSongProgress()
         {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
             Anchor = Anchor.BottomCentre;
             Origin = Anchor.BottomCentre;
             Masking = true;
             CornerRadius = 5;
-            Children = new Drawable[]
+
+            Child = content = new Container
             {
-                info = new SongProgressInfo
+                RelativeSizeAxes = Axes.X,
+                Children = new Drawable[]
                 {
-                    Origin = Anchor.TopLeft,
-                    Name = "Info",
-                    Anchor = Anchor.TopLeft,
-                    RelativeSizeAxes = Axes.X,
-                    ShowProgress = false
-                },
-                bar = new ArgonSongProgressBar(bar_height)
-                {
-                    Name = "Seek bar",
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    OnSeek = time => player?.Seek(time),
-                },
-                graphContainer = new Container
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    Masking = true,
-                    CornerRadius = 5,
-                    Child = graph = new ArgonSongProgressGraph
+                    info = new SongProgressInfo
                     {
-                        Name = "Difficulty graph",
-                        RelativeSizeAxes = Axes.Both,
-                        Blending = BlendingParameters.Additive
+                        Origin = Anchor.TopLeft,
+                        Name = "Info",
+                        Anchor = Anchor.TopLeft,
+                        RelativeSizeAxes = Axes.X,
+                        ShowProgress = false
                     },
-                    RelativeSizeAxes = Axes.X,
-                },
+                    bar = new ArgonSongProgressBar(bar_height)
+                    {
+                        Name = "Seek bar",
+                        Origin = Anchor.BottomLeft,
+                        Anchor = Anchor.BottomLeft,
+                        OnSeek = time => player?.Seek(time),
+                    },
+                    graphContainer = new Container
+                    {
+                        Anchor = Anchor.BottomLeft,
+                        Origin = Anchor.BottomLeft,
+                        Masking = true,
+                        CornerRadius = 5,
+                        Child = graph = new ArgonSongProgressGraph
+                        {
+                            Name = "Difficulty graph",
+                            RelativeSizeAxes = Axes.Both,
+                            Blending = BlendingParameters.Additive
+                        },
+                        RelativeSizeAxes = Axes.X,
+                    },
+                }
             };
-            RelativeSizeAxes = Axes.X;
         }
 
         [BackgroundDependencyLoader]
@@ -100,7 +108,7 @@ namespace osu.Game.Screens.Play.HUD
         protected override void Update()
         {
             base.Update();
-            Height = bar.Height + bar_height + info.Height;
+            content.Height = bar.Height + bar_height + info.Height;
             graphContainer.Height = bar.Height;
         }
 
diff --git a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
index 202ead2d66..48809796f3 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.Containers;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -27,6 +28,7 @@ namespace osu.Game.Screens.Play.HUD
         private readonly DefaultSongProgressBar bar;
         private readonly DefaultSongProgressGraph graph;
         private readonly SongProgressInfo info;
+        private readonly Container content;
 
         [SettingSource(typeof(SongProgressStrings), nameof(SongProgressStrings.ShowGraph), nameof(SongProgressStrings.ShowGraphDescription))]
         public Bindable<bool> ShowGraph { get; } = new BindableBool(true);
@@ -37,31 +39,36 @@ namespace osu.Game.Screens.Play.HUD
         public DefaultSongProgress()
         {
             RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
             Anchor = Anchor.BottomRight;
             Origin = Anchor.BottomRight;
 
-            Children = new Drawable[]
+            Child = content = new Container
             {
-                info = new SongProgressInfo
+                RelativeSizeAxes = Axes.X,
+                Children = new Drawable[]
                 {
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    RelativeSizeAxes = Axes.X,
-                },
-                graph = new DefaultSongProgressGraph
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    Height = graph_height,
-                    Margin = new MarginPadding { Bottom = bottom_bar_height },
-                },
-                bar = new DefaultSongProgressBar(bottom_bar_height, graph_height, handle_size)
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    OnSeek = time => player?.Seek(time),
-                },
+                    info = new SongProgressInfo
+                    {
+                        Origin = Anchor.BottomLeft,
+                        Anchor = Anchor.BottomLeft,
+                        RelativeSizeAxes = Axes.X,
+                    },
+                    graph = new DefaultSongProgressGraph
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Origin = Anchor.BottomLeft,
+                        Anchor = Anchor.BottomLeft,
+                        Height = graph_height,
+                        Margin = new MarginPadding { Bottom = bottom_bar_height },
+                    },
+                    bar = new DefaultSongProgressBar(bottom_bar_height, graph_height, handle_size)
+                    {
+                        Anchor = Anchor.BottomLeft,
+                        Origin = Anchor.BottomLeft,
+                        OnSeek = time => player?.Seek(time),
+                    },
+                }
             };
         }
 
@@ -107,7 +114,7 @@ namespace osu.Game.Screens.Play.HUD
             float newHeight = bottom_bar_height + graph_height + handle_size.Y + info.Height - graph.Y;
 
             if (!Precision.AlmostEquals(Height, newHeight, 5f))
-                Height = newHeight;
+                content.Height = newHeight;
         }
 
         private void updateBarVisibility()

From 926636cc035a17543d987ba9a9ba9c47fa5e7f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Mu=CC=88ller-Ho=CC=88hne?= <thomas94@gmx.net>
Date: Wed, 8 Nov 2023 19:43:54 +0900
Subject: [PATCH 1511/2296] Generalize Bezier curves to BSplines of Nth degree

---
 .../TestSceneJuiceStreamSelectionBlueprint.cs |  8 +-
 .../JuiceStreamPathTest.cs                    |  4 +-
 .../Mods/TestSceneCatchModPerfect.cs          |  2 +-
 .../Mods/TestSceneCatchModRelax.cs            |  2 +-
 .../TestSceneAutoJuiceStream.cs               |  2 +-
 .../TestSceneCatchModHidden.cs                |  2 +-
 .../TestSceneDrawableHitObjects.cs            |  2 +-
 .../TestSceneJuiceStream.cs                   |  2 +-
 .../Blueprints/Components/EditablePath.cs     |  2 +-
 .../Objects/JuiceStreamPath.cs                |  2 +-
 .../Checks/CheckOffscreenObjectsTest.cs       | 12 +--
 .../Editor/TestSceneObjectMerging.cs          | 10 +--
 .../TestSceneOsuEditorSelectInvalidPath.cs    |  2 +-
 .../TestScenePathControlPointVisualiser.cs    | 36 ++++-----
 .../TestSceneSliderControlPointPiece.cs       | 28 +++----
 .../Editor/TestSceneSliderLengthValidity.cs   |  8 +-
 .../TestSceneSliderPlacementBlueprint.cs      | 42 +++++------
 .../Editor/TestSceneSliderReversal.cs         |  4 +-
 .../TestSceneSliderSelectionBlueprint.cs      |  2 +-
 .../Editor/TestSceneSliderSnapping.cs         | 10 +--
 .../Editor/TestSceneSliderSplitting.cs        | 28 +++----
 .../Editor/TestSliderScaling.cs               |  2 +-
 .../Mods/TestSceneOsuModHidden.cs             | 10 +--
 .../Mods/TestSceneOsuModPerfect.cs            |  2 +-
 .../OsuHitObjectGenerationUtilsTest.cs        |  6 +-
 .../TestSceneHitCircleLateFade.cs             |  2 +-
 .../TestSceneLegacyHitPolicy.cs               | 18 ++---
 .../TestSceneSlider.cs                        | 14 ++--
 .../TestSceneSliderApplication.cs             |  6 +-
 .../TestSceneSliderFollowCircleInput.cs       |  2 +-
 .../TestSceneSliderInput.cs                   |  8 +-
 .../TestSceneSliderSnaking.cs                 |  6 +-
 .../TestSceneStartTimeOrderedHitPolicy.cs     | 10 +--
 .../Components/PathControlPointPiece.cs       | 20 +++--
 .../Components/PathControlPointVisualiser.cs  | 26 +++----
 .../Sliders/SliderPlacementBlueprint.cs       | 14 ++--
 .../Edit/OsuSelectionHandler.cs               |  4 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   |  2 +-
 .../Formats/LegacyBeatmapDecoderTest.cs       | 36 ++++-----
 .../Formats/LegacyBeatmapEncoderTest.cs       |  6 +-
 .../Editing/LegacyEditorBeatmapPatcherTest.cs |  4 +-
 .../Editing/TestSceneEditorClipboard.cs       |  2 +-
 .../Editing/TestSceneHitObjectComposer.cs     |  2 +-
 .../Gameplay/TestSceneBezierConverter.cs      | 40 +++++-----
 .../TestSceneGameplaySampleTriggerSource.cs   |  2 +-
 .../Visual/Gameplay/TestSceneSliderPath.cs    | 73 +++++++++++--------
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 15 ++--
 osu.Game/Database/LegacyBeatmapExporter.cs    |  4 +-
 osu.Game/Rulesets/Objects/BezierConverter.cs  | 32 ++++----
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 20 ++---
 osu.Game/Rulesets/Objects/SliderPath.cs       | 13 ++--
 .../Rulesets/Objects/SliderPathExtensions.cs  |  6 +-
 osu.Game/Rulesets/Objects/Types/PathType.cs   | 50 ++++++++++++-
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 10 +--
 54 files changed, 372 insertions(+), 305 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
index 05d7a38a95..16b51d414a 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
 
             AddStep("update hit object path", () =>
             {
-                hitObject.Path = new SliderPath(PathType.PerfectCurve, new[]
+                hitObject.Path = new SliderPath(PathType.PERFECTCURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(100, 100),
@@ -190,16 +190,16 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
         [Test]
         public void TestVertexResampling()
         {
-            addBlueprintStep(100, 100, new SliderPath(PathType.PerfectCurve, new[]
+            addBlueprintStep(100, 100, new SliderPath(PathType.PERFECTCURVE, new[]
             {
                 Vector2.Zero,
                 new Vector2(100, 100),
                 new Vector2(50, 200),
             }), 0.5);
             AddAssert("1 vertex per 1 nested HO", () => getVertices().Count == hitObject.NestedHitObjects.Count);
-            AddAssert("slider path not yet changed", () => hitObject.Path.ControlPoints[0].Type == PathType.PerfectCurve);
+            AddAssert("slider path not yet changed", () => hitObject.Path.ControlPoints[0].Type == PathType.PERFECTCURVE);
             addAddVertexSteps(150, 150);
-            AddAssert("slider path change to linear", () => hitObject.Path.ControlPoints[0].Type == PathType.Linear);
+            AddAssert("slider path change to linear", () => hitObject.Path.ControlPoints[0].Type == PathType.LINEAR);
         }
 
         private void addBlueprintStep(double time, float x, SliderPath sliderPath, double velocity) => AddStep("add selection blueprint", () =>
diff --git a/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs b/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs
index 95b4fdc07e..82f24633b5 100644
--- a/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     } while (rng.Next(2) != 0);
 
                     int length = sliderPath.ControlPoints.Count - start + 1;
-                    sliderPath.ControlPoints[start].Type = length <= 2 ? PathType.Linear : length == 3 ? PathType.PerfectCurve : PathType.Bezier;
+                    sliderPath.ControlPoints[start].Type = length <= 2 ? PathType.LINEAR : length == 3 ? PathType.PERFECTCURVE : PathType.BEZIER;
                 } while (rng.Next(3) != 0);
 
                 if (rng.Next(5) == 0)
@@ -215,7 +215,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
                 foreach (var point in sliderPath.ControlPoints)
                 {
-                    Assert.That(point.Type, Is.EqualTo(PathType.Linear).Or.Null);
+                    Assert.That(point.Type, Is.EqualTo(PathType.LINEAR).Or.Null);
                     Assert.That(sliderStartY + point.Position.Y, Is.InRange(0, JuiceStreamPath.OSU_PLAYFIELD_HEIGHT));
                 }
 
diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
index 71df523951..45e7d7aa28 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
             var stream = new JuiceStream
             {
                 StartTime = 1000,
-                Path = new SliderPath(PathType.Linear, new[]
+                Path = new SliderPath(PathType.LINEAR, new[]
                 {
                     Vector2.Zero,
                     new Vector2(100, 0),
diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
index 5835ccaf78..a161615579 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                     {
                         X = CatchPlayfield.CENTER_X,
                         StartTime = 3000,
-                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 })
+                        Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, Vector2.UnitY * 200 })
                     }
                 }
             }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 3261fb656e..202f010680 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 beatmap.HitObjects.Add(new JuiceStream
                 {
                     X = CatchPlayfield.CENTER_X - width / 2,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(width, 0)
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index a44575a46e..419a846ec3 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                         new JuiceStream
                         {
                             StartTime = 1000,
-                            Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(0, -192) }),
+                            Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(0, -192) }),
                             X = CatchPlayfield.WIDTH / 2
                         }
                     }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index 11d6419507..9c5cd68201 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 X = xCoords,
                 StartTime = playfieldTime + 1000,
-                Path = new SliderPath(PathType.Linear, new[]
+                Path = new SliderPath(PathType.LINEAR, new[]
                 {
                     Vector2.Zero,
                     new Vector2(0, 200)
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
index c31a7ca99f..9a923adaab 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 new JuiceStream
                 {
                     X = CatchPlayfield.CENTER_X,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(0, 100)
diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
index df76bf0a8c..86f92d16ca 100644
--- a/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
+++ b/osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
             path.ConvertFromSliderPath(sliderPath, hitObject.Velocity);
 
             // If the original slider path has non-linear type segments, resample the vertices at nested hit object times to reduce the number of vertices.
-            if (sliderPath.ControlPoints.Any(p => p.Type != null && p.Type != PathType.Linear))
+            if (sliderPath.ControlPoints.Any(p => p.Type != null && p.Type != PathType.LINEAR))
             {
                 path.ResampleVertices(hitObject.NestedHitObjects
                                                .Skip(1).TakeWhile(h => !(h is Fruit)) // Only droplets in the first span are used.
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStreamPath.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStreamPath.cs
index 0633151ddd..57acf7cee2 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStreamPath.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStreamPath.cs
@@ -236,7 +236,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             for (int i = 1; i < vertices.Count; i++)
             {
-                sliderPath.ControlPoints[^1].Type = PathType.Linear;
+                sliderPath.ControlPoints[^1].Type = PathType.LINEAR;
 
                 float deltaX = vertices[i].X - lastPosition.X;
                 double length = (vertices[i].Time - currentTime) * velocity;
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index a72aaa966c..8612a8eb57 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = new Vector2(420, 240),
                         Path = new SliderPath(new[]
                         {
-                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(0, 0), PathType.LINEAR),
                             new PathControlPoint(new Vector2(-100, 0))
                         }),
                     }
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
-                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(0, 0), PathType.LINEAR),
                             new PathControlPoint(new Vector2(0, -playfield_centre.Y + 5))
                         }),
                     }
@@ -149,7 +149,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
-                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(0, 0), PathType.LINEAR),
                             new PathControlPoint(new Vector2(0, -playfield_centre.Y + 5))
                         }),
                         StackHeight = 5
@@ -171,7 +171,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = new Vector2(0, 0),
                         Path = new SliderPath(new[]
                         {
-                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(0, 0), PathType.LINEAR),
                             new PathControlPoint(playfield_centre)
                         }),
                     }
@@ -192,7 +192,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
-                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(0, 0), PathType.LINEAR),
                             new PathControlPoint(-playfield_centre)
                         }),
                     }
@@ -214,7 +214,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Path = new SliderPath(new[]
                         {
                             // Circular arc shoots over the top of the screen.
-                            new PathControlPoint(new Vector2(0, 0), PathType.PerfectCurve),
+                            new PathControlPoint(new Vector2(0, 0), PathType.PERFECTCURVE),
                             new PathControlPoint(new Vector2(-100, -200)),
                             new PathControlPoint(new Vector2(100, -200))
                         }),
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
index 8d8386cae1..3d35ab79f7 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectMerging.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             mergeSelection();
 
             AddAssert("slider created", () => circle1 is not null && circle2 is not null && sliderCreatedFor(
-                (pos: circle1.Position, pathType: PathType.Linear),
+                (pos: circle1.Position, pathType: PathType.LINEAR),
                 (pos: circle2.Position, pathType: null)));
 
             AddStep("undo", () => Editor.Undo());
@@ -73,11 +73,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
                 var controlPoints = slider.Path.ControlPoints;
                 (Vector2, PathType?)[] args = new (Vector2, PathType?)[controlPoints.Count + 2];
-                args[0] = (circle1.Position, PathType.Linear);
+                args[0] = (circle1.Position, PathType.LINEAR);
 
                 for (int i = 0; i < controlPoints.Count; i++)
                 {
-                    args[i + 1] = (controlPoints[i].Position + slider.Position, i == controlPoints.Count - 1 ? PathType.Linear : controlPoints[i].Type);
+                    args[i + 1] = (controlPoints[i].Position + slider.Position, i == controlPoints.Count - 1 ? PathType.LINEAR : controlPoints[i].Type);
                 }
 
                 args[^1] = (circle2.Position, null);
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             mergeSelection();
 
             AddAssert("slider created", () => circle1 is not null && circle2 is not null && sliderCreatedFor(
-                (pos: circle1.Position, pathType: PathType.Linear),
+                (pos: circle1.Position, pathType: PathType.LINEAR),
                 (pos: circle2.Position, pathType: null)));
 
             AddAssert("samples exist", sliderSampleExist);
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             mergeSelection();
 
             AddAssert("slider created", () => circle1 is not null && circle2 is not null && sliderCreatedFor(
-                (pos: circle1.Position, pathType: PathType.Linear),
+                (pos: circle1.Position, pathType: PathType.LINEAR),
                 (pos: circle2.Position, pathType: null)));
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
index 37a109de18..7ea4d40b90 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             PathControlPoint[] points =
             {
-                new PathControlPoint(new Vector2(0), PathType.PerfectCurve),
+                new PathControlPoint(new Vector2(0), PathType.PERFECTCURVE),
                 new PathControlPoint(new Vector2(-100, 0)),
                 new PathControlPoint(new Vector2(100, 20))
             };
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index c267cd1f63..16800997f4 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             createVisualiser(true);
 
-            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(200), PathType.BEZIER);
             addControlPointStep(new Vector2(300));
             addControlPointStep(new Vector2(500, 300));
             addControlPointStep(new Vector2(700, 200));
@@ -63,9 +63,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("select control point", () => visualiser.Pieces[1].IsSelected.Value = true);
             addContextMenuItemStep("Perfect curve");
 
-            assertControlPointPathType(0, PathType.Bezier);
-            assertControlPointPathType(1, PathType.PerfectCurve);
-            assertControlPointPathType(3, PathType.Bezier);
+            assertControlPointPathType(0, PathType.BEZIER);
+            assertControlPointPathType(1, PathType.PERFECTCURVE);
+            assertControlPointPathType(3, PathType.BEZIER);
         }
 
         [Test]
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             createVisualiser(true);
 
-            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(200), PathType.BEZIER);
             addControlPointStep(new Vector2(300));
             addControlPointStep(new Vector2(500, 300));
             addControlPointStep(new Vector2(700, 200));
@@ -83,8 +83,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("select control point", () => visualiser.Pieces[2].IsSelected.Value = true);
             addContextMenuItemStep("Perfect curve");
 
-            assertControlPointPathType(0, PathType.Bezier);
-            assertControlPointPathType(2, PathType.PerfectCurve);
+            assertControlPointPathType(0, PathType.BEZIER);
+            assertControlPointPathType(2, PathType.PERFECTCURVE);
             assertControlPointPathType(4, null);
         }
 
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             createVisualiser(true);
 
-            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(200), PathType.BEZIER);
             addControlPointStep(new Vector2(300));
             addControlPointStep(new Vector2(500, 300));
             addControlPointStep(new Vector2(700, 200));
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("select control point", () => visualiser.Pieces[3].IsSelected.Value = true);
             addContextMenuItemStep("Perfect curve");
 
-            assertControlPointPathType(0, PathType.Bezier);
+            assertControlPointPathType(0, PathType.BEZIER);
             AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
         }
 
@@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             createVisualiser(true);
 
-            addControlPointStep(new Vector2(200), PathType.Linear);
+            addControlPointStep(new Vector2(200), PathType.LINEAR);
             addControlPointStep(new Vector2(300));
             addControlPointStep(new Vector2(500, 300));
             addControlPointStep(new Vector2(700, 200));
@@ -123,9 +123,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("select control point", () => visualiser.Pieces[1].IsSelected.Value = true);
             addContextMenuItemStep("Perfect curve");
 
-            assertControlPointPathType(0, PathType.Linear);
-            assertControlPointPathType(1, PathType.PerfectCurve);
-            assertControlPointPathType(3, PathType.Linear);
+            assertControlPointPathType(0, PathType.LINEAR);
+            assertControlPointPathType(1, PathType.PERFECTCURVE);
+            assertControlPointPathType(3, PathType.LINEAR);
         }
 
         [Test]
@@ -133,18 +133,18 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             createVisualiser(true);
 
-            addControlPointStep(new Vector2(200), PathType.Bezier);
-            addControlPointStep(new Vector2(300), PathType.PerfectCurve);
+            addControlPointStep(new Vector2(200), PathType.BEZIER);
+            addControlPointStep(new Vector2(300), PathType.PERFECTCURVE);
             addControlPointStep(new Vector2(500, 300));
-            addControlPointStep(new Vector2(700, 200), PathType.Bezier);
+            addControlPointStep(new Vector2(700, 200), PathType.BEZIER);
             addControlPointStep(new Vector2(500, 100));
 
             moveMouseToControlPoint(3);
             AddStep("select control point", () => visualiser.Pieces[3].IsSelected.Value = true);
             addContextMenuItemStep("Inherit");
 
-            assertControlPointPathType(0, PathType.Bezier);
-            assertControlPointPathType(1, PathType.Bezier);
+            assertControlPointPathType(0, PathType.BEZIER);
+            assertControlPointPathType(1, PathType.BEZIER);
             assertControlPointPathType(3, null);
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index 408205d6b2..1d8d2cf01a 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -38,9 +38,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 Position = new Vector2(256, 192),
                 Path = new SliderPath(new[]
                 {
-                    new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
+                    new PathControlPoint(Vector2.Zero, PathType.PERFECTCURVE),
                     new PathControlPoint(new Vector2(150, 150)),
-                    new PathControlPoint(new Vector2(300, 0), PathType.PerfectCurve),
+                    new PathControlPoint(new Vector2(300, 0), PathType.PERFECTCURVE),
                     new PathControlPoint(new Vector2(400, 0)),
                     new PathControlPoint(new Vector2(400, 150))
                 })
@@ -182,7 +182,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
             assertControlPointPosition(1, new Vector2(150, 50));
-            assertControlPointType(0, PathType.PerfectCurve);
+            assertControlPointType(0, PathType.PERFECTCURVE);
         }
 
         [Test]
@@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("three control point pieces selected", () => this.ChildrenOfType<PathControlPointPiece<Slider>>().Count(piece => piece.IsSelected.Value) == 3);
 
             assertControlPointPosition(2, new Vector2(450, 50));
-            assertControlPointType(2, PathType.PerfectCurve);
+            assertControlPointType(2, PathType.PERFECTCURVE);
 
             assertControlPointPosition(3, new Vector2(550, 50));
 
@@ -249,7 +249,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("slider moved", () => Precision.AlmostEquals(slider.Position, new Vector2(256, 192) + new Vector2(150, 50)));
 
             assertControlPointPosition(0, Vector2.Zero);
-            assertControlPointType(0, PathType.PerfectCurve);
+            assertControlPointType(0, PathType.PERFECTCURVE);
 
             assertControlPointPosition(1, new Vector2(0, 100));
 
@@ -272,7 +272,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
             assertControlPointPosition(1, new Vector2(400, 0.01f));
-            assertControlPointType(0, PathType.Bezier);
+            assertControlPointType(0, PathType.BEZIER);
         }
 
         [Test]
@@ -282,13 +282,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
 
             addMovementStep(new Vector2(400, 0.01f));
-            assertControlPointType(0, PathType.Bezier);
+            assertControlPointType(0, PathType.BEZIER);
 
             addMovementStep(new Vector2(150, 50));
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
             assertControlPointPosition(1, new Vector2(150, 50));
-            assertControlPointType(0, PathType.PerfectCurve);
+            assertControlPointType(0, PathType.PERFECTCURVE);
         }
 
         [Test]
@@ -298,32 +298,32 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
 
             addMovementStep(new Vector2(350, 0.01f));
-            assertControlPointType(2, PathType.Bezier);
+            assertControlPointType(2, PathType.BEZIER);
 
             addMovementStep(new Vector2(150, 150));
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
             assertControlPointPosition(4, new Vector2(150, 150));
-            assertControlPointType(2, PathType.PerfectCurve);
+            assertControlPointType(2, PathType.PERFECTCURVE);
         }
 
         [Test]
         public void TestDragControlPointPathAfterChangingType()
         {
-            AddStep("change type to bezier", () => slider.Path.ControlPoints[2].Type = PathType.Bezier);
+            AddStep("change type to bezier", () => slider.Path.ControlPoints[2].Type = PathType.BEZIER);
             AddStep("add point", () => slider.Path.ControlPoints.Add(new PathControlPoint(new Vector2(500, 10))));
-            AddStep("change type to perfect", () => slider.Path.ControlPoints[3].Type = PathType.PerfectCurve);
+            AddStep("change type to perfect", () => slider.Path.ControlPoints[3].Type = PathType.PERFECTCURVE);
 
             moveMouseToControlPoint(4);
             AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
 
-            assertControlPointType(3, PathType.PerfectCurve);
+            assertControlPointType(3, PathType.PERFECTCURVE);
 
             addMovementStep(new Vector2(350, 0.01f));
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
             assertControlPointPosition(4, new Vector2(350, 0.01f));
-            assertControlPointType(3, PathType.Bezier);
+            assertControlPointType(3, PathType.BEZIER);
         }
 
         private void addMovementStep(Vector2 relativePosition)
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
index 77e828e80a..38ebeb7e8f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
                 PathControlPoint[] points =
                 {
-                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(0), PathType.LINEAR),
                     new PathControlPoint(new Vector2(100, 0)),
                 };
 
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
                 PathControlPoint[] points =
                 {
-                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(0), PathType.LINEAR),
                     new PathControlPoint(new Vector2(100, 0)),
                 };
 
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
                 PathControlPoint[] points =
                 {
-                    new PathControlPoint(new Vector2(0), PathType.PerfectCurve),
+                    new PathControlPoint(new Vector2(0), PathType.PERFECTCURVE),
                     new PathControlPoint(new Vector2(100, 0)),
                     new PathControlPoint(new Vector2(0, 10))
                 };
@@ -165,7 +165,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
                 PathControlPoint[] points =
                 {
-                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(0), PathType.LINEAR),
                     new PathControlPoint(new Vector2(0, 50)),
                     new PathControlPoint(new Vector2(0, 100))
                 };
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 7d29670daa..4b120c1a3f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertLength(200);
             assertControlPointCount(2);
-            assertControlPointType(0, PathType.Linear);
+            assertControlPointType(0, PathType.LINEAR);
         }
 
         [Test]
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(2);
-            assertControlPointType(0, PathType.Linear);
+            assertControlPointType(0, PathType.LINEAR);
         }
 
         [Test]
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertControlPointCount(3);
             assertControlPointPosition(1, new Vector2(100, 0));
-            assertControlPointType(0, PathType.PerfectCurve);
+            assertControlPointType(0, PathType.PERFECTCURVE);
         }
 
         [Test]
@@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointCount(4);
             assertControlPointPosition(1, new Vector2(100, 0));
             assertControlPointPosition(2, new Vector2(100, 100));
-            assertControlPointType(0, PathType.Bezier);
+            assertControlPointType(0, PathType.BEZIER);
         }
 
         [Test]
@@ -131,8 +131,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertControlPointCount(3);
             assertControlPointPosition(1, new Vector2(100, 0));
-            assertControlPointType(0, PathType.Linear);
-            assertControlPointType(1, PathType.Linear);
+            assertControlPointType(0, PathType.LINEAR);
+            assertControlPointType(1, PathType.LINEAR);
         }
 
         [Test]
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(2);
-            assertControlPointType(0, PathType.Linear);
+            assertControlPointType(0, PathType.LINEAR);
             assertLength(100);
         }
 
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
-            assertControlPointType(0, PathType.PerfectCurve);
+            assertControlPointType(0, PathType.PERFECTCURVE);
         }
 
         [Test]
@@ -196,7 +196,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(4);
-            assertControlPointType(0, PathType.Bezier);
+            assertControlPointType(0, PathType.BEZIER);
         }
 
         [Test]
@@ -216,8 +216,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointCount(3);
             assertControlPointPosition(1, new Vector2(100, 0));
             assertControlPointPosition(2, new Vector2(100));
-            assertControlPointType(0, PathType.Linear);
-            assertControlPointType(1, PathType.Linear);
+            assertControlPointType(0, PathType.LINEAR);
+            assertControlPointType(1, PathType.LINEAR);
         }
 
         [Test]
@@ -240,8 +240,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointCount(4);
             assertControlPointPosition(1, new Vector2(100, 0));
             assertControlPointPosition(2, new Vector2(100));
-            assertControlPointType(0, PathType.Linear);
-            assertControlPointType(1, PathType.PerfectCurve);
+            assertControlPointType(0, PathType.LINEAR);
+            assertControlPointType(1, PathType.PERFECTCURVE);
         }
 
         [Test]
@@ -269,8 +269,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointPosition(2, new Vector2(100));
             assertControlPointPosition(3, new Vector2(200, 100));
             assertControlPointPosition(4, new Vector2(200));
-            assertControlPointType(0, PathType.PerfectCurve);
-            assertControlPointType(2, PathType.PerfectCurve);
+            assertControlPointType(0, PathType.PERFECTCURVE);
+            assertControlPointType(2, PathType.PERFECTCURVE);
         }
 
         [Test]
@@ -287,7 +287,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertLength(200);
             assertControlPointCount(2);
-            assertControlPointType(0, PathType.Linear);
+            assertControlPointType(0, PathType.LINEAR);
         }
 
         [Test]
@@ -306,7 +306,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
-            assertControlPointType(0, PathType.Bezier);
+            assertControlPointType(0, PathType.BEZIER);
         }
 
         [Test]
@@ -326,7 +326,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
-            assertControlPointType(0, PathType.PerfectCurve);
+            assertControlPointType(0, PathType.PERFECTCURVE);
         }
 
         [Test]
@@ -347,7 +347,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
-            assertControlPointType(0, PathType.PerfectCurve);
+            assertControlPointType(0, PathType.PERFECTCURVE);
         }
 
         [Test]
@@ -368,7 +368,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
-            assertControlPointType(0, PathType.Bezier);
+            assertControlPointType(0, PathType.BEZIER);
         }
 
         [Test]
@@ -385,7 +385,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
-            assertControlPointType(0, PathType.PerfectCurve);
+            assertControlPointType(0, PathType.PERFECTCURVE);
         }
 
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
index 9c5eb83e3c..0ddfc40946 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
@@ -22,12 +22,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         private readonly PathControlPoint[][] paths =
         {
             createPathSegment(
-                PathType.PerfectCurve,
+                PathType.PERFECTCURVE,
                 new Vector2(200, -50),
                 new Vector2(250, 0)
             ),
             createPathSegment(
-                PathType.Linear,
+                PathType.LINEAR,
                 new Vector2(100, 0),
                 new Vector2(100, 100)
             )
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index 413a3c3dfd..d4d99e1019 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             slider = new Slider
             {
                 Position = new Vector2(256, 192),
-                Path = new SliderPath(PathType.Bezier, new[]
+                Path = new SliderPath(PathType.BEZIER, new[]
                 {
                     Vector2.Zero,
                     new Vector2(150, 150),
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
index 0ae14bdde8..c984d9168e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 {
                     ControlPoints =
                     {
-                        new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
+                        new PathControlPoint(Vector2.Zero, PathType.PERFECTCURVE),
                         new PathControlPoint(new Vector2(136, 205)),
                         new PathControlPoint(new Vector2(-4, 226))
                     }
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             OsuSelectionHandler selectionHandler;
 
-            AddAssert("first control point perfect", () => slider.Path.ControlPoints[0].Type == PathType.PerfectCurve);
+            AddAssert("first control point perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECTCURVE);
 
             AddStep("select slider", () => EditorBeatmap.SelectedHitObjects.Add(slider));
             AddStep("rotate 90 degrees ccw", () =>
@@ -190,7 +190,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 selectionHandler.HandleRotation(-90);
             });
 
-            AddAssert("first control point still perfect", () => slider.Path.ControlPoints[0].Type == PathType.PerfectCurve);
+            AddAssert("first control point still perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECTCURVE);
         }
 
         [Test]
@@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             OsuSelectionHandler selectionHandler;
 
-            AddAssert("first control point perfect", () => slider.Path.ControlPoints[0].Type == PathType.PerfectCurve);
+            AddAssert("first control point perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECTCURVE);
 
             AddStep("select slider", () => EditorBeatmap.SelectedHitObjects.Add(slider));
             AddStep("flip slider horizontally", () =>
@@ -232,7 +232,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 selectionHandler.OnPressed(new KeyBindingPressEvent<GlobalAction>(InputManager.CurrentState, GlobalAction.EditorFlipVertically));
             });
 
-            AddAssert("first control point still perfect", () => slider.Path.ControlPoints[0].Type == PathType.PerfectCurve);
+            AddAssert("first control point still perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECTCURVE);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index ad37258c9b..cded9165f4 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -45,9 +45,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                     Position = new Vector2(0, 50),
                     Path = new SliderPath(new[]
                     {
-                        new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
+                        new PathControlPoint(Vector2.Zero, PathType.PERFECTCURVE),
                         new PathControlPoint(new Vector2(150, 150)),
-                        new PathControlPoint(new Vector2(300, 0), PathType.PerfectCurve),
+                        new PathControlPoint(new Vector2(300, 0), PathType.PERFECTCURVE),
                         new PathControlPoint(new Vector2(400, 0)),
                         new PathControlPoint(new Vector2(400, 150))
                     })
@@ -73,20 +73,20 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddAssert("slider split", () => slider is not null && EditorBeatmap.HitObjects.Count == 2 &&
                                             sliderCreatedFor((Slider)EditorBeatmap.HitObjects[0], 0, EditorBeatmap.HitObjects[1].StartTime - split_gap,
-                                                (new Vector2(0, 50), PathType.PerfectCurve),
+                                                (new Vector2(0, 50), PathType.PERFECTCURVE),
                                                 (new Vector2(150, 200), null),
                                                 (new Vector2(300, 50), null)
                                             ) && sliderCreatedFor((Slider)EditorBeatmap.HitObjects[1], slider.StartTime, endTime + split_gap,
-                                                (new Vector2(300, 50), PathType.PerfectCurve),
+                                                (new Vector2(300, 50), PathType.PERFECTCURVE),
                                                 (new Vector2(400, 50), null),
                                                 (new Vector2(400, 200), null)
                                             ));
 
             AddStep("undo", () => Editor.Undo());
             AddAssert("original slider restored", () => EditorBeatmap.HitObjects.Count == 1 && sliderCreatedFor((Slider)EditorBeatmap.HitObjects[0], 0, endTime,
-                (new Vector2(0, 50), PathType.PerfectCurve),
+                (new Vector2(0, 50), PathType.PERFECTCURVE),
                 (new Vector2(150, 200), null),
-                (new Vector2(300, 50), PathType.PerfectCurve),
+                (new Vector2(300, 50), PathType.PERFECTCURVE),
                 (new Vector2(400, 50), null),
                 (new Vector2(400, 200), null)
             ));
@@ -104,11 +104,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                     Position = new Vector2(0, 50),
                     Path = new SliderPath(new[]
                     {
-                        new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
+                        new PathControlPoint(Vector2.Zero, PathType.PERFECTCURVE),
                         new PathControlPoint(new Vector2(150, 150)),
-                        new PathControlPoint(new Vector2(300, 0), PathType.Bezier),
+                        new PathControlPoint(new Vector2(300, 0), PathType.BEZIER),
                         new PathControlPoint(new Vector2(400, 0)),
-                        new PathControlPoint(new Vector2(400, 150), PathType.Catmull),
+                        new PathControlPoint(new Vector2(400, 150), PathType.CATMULL),
                         new PathControlPoint(new Vector2(300, 200)),
                         new PathControlPoint(new Vector2(400, 250))
                     })
@@ -139,15 +139,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddAssert("slider split", () => slider is not null && EditorBeatmap.HitObjects.Count == 3 &&
                                             sliderCreatedFor((Slider)EditorBeatmap.HitObjects[0], 0, EditorBeatmap.HitObjects[1].StartTime - split_gap,
-                                                (new Vector2(0, 50), PathType.PerfectCurve),
+                                                (new Vector2(0, 50), PathType.PERFECTCURVE),
                                                 (new Vector2(150, 200), null),
                                                 (new Vector2(300, 50), null)
                                             ) && sliderCreatedFor((Slider)EditorBeatmap.HitObjects[1], EditorBeatmap.HitObjects[0].GetEndTime() + split_gap, slider.StartTime - split_gap,
-                                                (new Vector2(300, 50), PathType.Bezier),
+                                                (new Vector2(300, 50), PathType.BEZIER),
                                                 (new Vector2(400, 50), null),
                                                 (new Vector2(400, 200), null)
                                             ) && sliderCreatedFor((Slider)EditorBeatmap.HitObjects[2], EditorBeatmap.HitObjects[1].GetEndTime() + split_gap, endTime + split_gap * 2,
-                                                (new Vector2(400, 200), PathType.Catmull),
+                                                (new Vector2(400, 200), PathType.CATMULL),
                                                 (new Vector2(300, 250), null),
                                                 (new Vector2(400, 300), null)
                                             ));
@@ -165,9 +165,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                     Position = new Vector2(0, 50),
                     Path = new SliderPath(new[]
                     {
-                        new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
+                        new PathControlPoint(Vector2.Zero, PathType.PERFECTCURVE),
                         new PathControlPoint(new Vector2(150, 150)),
-                        new PathControlPoint(new Vector2(300, 0), PathType.PerfectCurve),
+                        new PathControlPoint(new Vector2(300, 0), PathType.PERFECTCURVE),
                         new PathControlPoint(new Vector2(400, 0)),
                         new PathControlPoint(new Vector2(400, 150))
                     })
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.cs
index 64d23090d0..021fdba225 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
                 PathControlPoint[] points =
                 {
-                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(0), PathType.LINEAR),
                     new PathControlPoint(new Vector2(100, 0)),
                 };
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
index 3f84ac6935..58bdd805c1 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs
@@ -81,12 +81,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                     new Slider
                     {
                         StartTime = 3200,
-                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                        Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(100, 0), })
                     },
                     new Slider
                     {
                         StartTime = 5200,
-                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                        Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(100, 0), })
                     }
                 }
             },
@@ -105,12 +105,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                     new Slider
                     {
                         StartTime = 1000,
-                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                        Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(100, 0), })
                     },
                     new Slider
                     {
                         StartTime = 4000,
-                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                        Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(100, 0), })
                     },
                 }
             },
@@ -140,7 +140,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                     {
                         StartTime = 3000,
                         Position = new Vector2(156, 242),
-                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(200, 0), })
+                        Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(200, 0), })
                     },
                     new Spinner
                     {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
index f0496efc19..26c4133bc4 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             var slider = new Slider
             {
                 StartTime = 1000,
-                Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(100, 0), })
             };
 
             CreateHitObjectTest(new HitObjectTestData(slider), shouldMiss);
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuHitObjectGenerationUtilsTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuHitObjectGenerationUtilsTest.cs
index daa914cac2..d78c32aa6a 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuHitObjectGenerationUtilsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuHitObjectGenerationUtilsTest.cs
@@ -26,9 +26,9 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     ControlPoints =
                     {
-                        new PathControlPoint(new Vector2(), PathType.Linear),
-                        new PathControlPoint(new Vector2(-64, -128), PathType.Linear), // absolute position: (64, 0)
-                        new PathControlPoint(new Vector2(-128, 0), PathType.Linear) // absolute position: (0, 128)
+                        new PathControlPoint(new Vector2(), PathType.LINEAR),
+                        new PathControlPoint(new Vector2(-64, -128), PathType.LINEAR), // absolute position: (64, 0)
+                        new PathControlPoint(new Vector2(-128, 0), PathType.LINEAR) // absolute position: (0, 128)
                     }
                 },
                 RepeatCount = 1
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
index 483155e646..7824f26251 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLateFade.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + 500,
                 Position = new Vector2(250),
-                Path = new SliderPath(PathType.Linear, new[]
+                Path = new SliderPath(PathType.LINEAR, new[]
                 {
                     Vector2.Zero,
                     new Vector2(0, 100),
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
index fa6aa580a3..e460da9bd5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyHitPolicy.cs
@@ -264,7 +264,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(50, 0),
@@ -308,7 +308,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(50, 0),
@@ -391,7 +391,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
@@ -428,7 +428,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_first_slider,
                     Position = positionFirstSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
@@ -438,7 +438,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_second_slider,
                     Position = positionSecondSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
@@ -521,7 +521,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_first_slider,
                     Position = positionFirstSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
@@ -531,7 +531,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_second_slider,
                     Position = positionSecondSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
@@ -571,7 +571,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_first_slider,
                     Position = positionFirstSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
@@ -581,7 +581,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_second_slider,
                     Position = positionSecondSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index b805e7ed63..60003e7950 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(239, 176),
-                Path = new SliderPath(PathType.PerfectCurve, new[]
+                Path = new SliderPath(PathType.PERFECTCURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(154, 28),
@@ -255,7 +255,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 SliderVelocityMultiplier = speedMultiplier,
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(0, -(distance / 2)),
-                Path = new SliderPath(PathType.PerfectCurve, new[]
+                Path = new SliderPath(PathType.PERFECTCURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(0, distance),
@@ -273,7 +273,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(-max_length / 2, 0),
-                Path = new SliderPath(PathType.PerfectCurve, new[]
+                Path = new SliderPath(PathType.PERFECTCURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(max_length / 2, max_length / 2),
@@ -293,7 +293,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(-max_length / 2, 0),
-                Path = new SliderPath(PathType.Linear, new[]
+                Path = new SliderPath(PathType.LINEAR, new[]
                 {
                     Vector2.Zero,
                     new Vector2(max_length * 0.375f, max_length * 0.18f),
@@ -316,7 +316,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(-max_length / 2, 0),
-                Path = new SliderPath(PathType.Bezier, new[]
+                Path = new SliderPath(PathType.BEZIER, new[]
                 {
                     Vector2.Zero,
                     new Vector2(max_length * 0.375f, max_length * 0.18f),
@@ -338,7 +338,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(0, 0),
-                Path = new SliderPath(PathType.Linear, new[]
+                Path = new SliderPath(PathType.LINEAR, new[]
                 {
                     Vector2.Zero,
                     new Vector2(-max_length / 2, 0),
@@ -365,7 +365,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(-max_length / 4, 0),
-                Path = new SliderPath(PathType.Catmull, new[]
+                Path = new SliderPath(PathType.CATMULL, new[]
                 {
                     Vector2.Zero,
                     new Vector2(max_length * 0.125f, max_length * 0.125f),
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
index 88b70a8836..f41dd913ab 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Position = new Vector2(256, 192),
                 IndexInCurrentCombo = 0,
                 StartTime = Time.Current,
-                Path = new SliderPath(PathType.Linear, new[]
+                Path = new SliderPath(PathType.LINEAR, new[]
                 {
                     Vector2.Zero,
                     new Vector2(150, 100),
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Position = new Vector2(256, 192),
                 ComboIndex = 1,
                 StartTime = dho.HitObject.StartTime,
-                Path = new SliderPath(PathType.Bezier, new[]
+                Path = new SliderPath(PathType.BEZIER, new[]
                 {
                     Vector2.Zero,
                     new Vector2(150, 100),
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                         Position = new Vector2(256, 192),
                         IndexInCurrentCombo = 0,
                         StartTime = Time.Current,
-                        Path = new SliderPath(PathType.Linear, new[]
+                        Path = new SliderPath(PathType.LINEAR, new[]
                         {
                             Vector2.Zero,
                             new Vector2(150, 100),
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
index d4bb789a12..fc9bb16cb7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderFollowCircleInput.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                         StartTime = time_slider_start,
                         Position = new Vector2(0, 0),
                         SliderVelocityMultiplier = velocity,
-                        Path = new SliderPath(PathType.Linear, new[]
+                        Path = new SliderPath(PathType.LINEAR, new[]
                         {
                             Vector2.Zero,
                             new Vector2(followCircleRadius, 0),
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index f718a5069f..08836ef819 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Position = new Vector2(0, 0),
                 SliderVelocityMultiplier = 10f,
                 RepeatCount = repeatCount,
-                Path = new SliderPath(PathType.Linear, new[]
+                Path = new SliderPath(PathType.LINEAR, new[]
                 {
                     Vector2.Zero,
                     new Vector2(sliderLength, 0),
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Position = new Vector2(0, 0),
                 SliderVelocityMultiplier = 10f,
                 RepeatCount = repeatCount,
-                Path = new SliderPath(PathType.Linear, new[]
+                Path = new SliderPath(PathType.LINEAR, new[]
                 {
                     Vector2.Zero,
                     new Vector2(sliderLength, 0),
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 StartTime = time_slider_start,
                 Position = new Vector2(0, 0),
                 SliderVelocityMultiplier = 10f,
-                Path = new SliderPath(PathType.Linear, new[]
+                Path = new SliderPath(PathType.LINEAR, new[]
                 {
                     Vector2.Zero,
                     new Vector2(slider_path_length * 10, 0),
@@ -478,7 +478,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 StartTime = time_slider_start,
                 Position = new Vector2(0, 0),
                 SliderVelocityMultiplier = 0.1f,
-                Path = new SliderPath(PathType.PerfectCurve, new[]
+                Path = new SliderPath(PathType.PERFECTCURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(slider_path_length, 0),
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index 13166c2b6b..ebc5143aed 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -217,7 +217,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = 3000,
                 Position = new Vector2(100, 100),
-                Path = new SliderPath(PathType.PerfectCurve, new[]
+                Path = new SliderPath(PathType.PERFECTCURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(300, 200)
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = 13000,
                 Position = new Vector2(100, 100),
-                Path = new SliderPath(PathType.PerfectCurve, new[]
+                Path = new SliderPath(PathType.PERFECTCURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(300, 200)
@@ -238,7 +238,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = 23000,
                 Position = new Vector2(100, 100),
-                Path = new SliderPath(PathType.PerfectCurve, new[]
+                Path = new SliderPath(PathType.PERFECTCURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(300, 200)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index 3475680c71..895e9bbdee 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
@@ -238,7 +238,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
@@ -318,7 +318,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_slider,
                     Position = positionSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
@@ -352,7 +352,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_first_slider,
                     Position = positionFirstSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
@@ -362,7 +362,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     StartTime = time_second_slider,
                     Position = positionSecondSlider,
-                    Path = new SliderPath(PathType.Linear, new[]
+                    Path = new SliderPath(PathType.LINEAR, new[]
                     {
                         Vector2.Zero,
                         new Vector2(25, 0),
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 12e5ca0236..9658e5f6c3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -221,11 +221,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         /// </summary>
         private void updatePathType()
         {
-            if (ControlPoint.Type != PathType.PerfectCurve)
+            if (ControlPoint.Type != PathType.PERFECTCURVE)
                 return;
 
             if (PointsInSegment.Count > 3)
-                ControlPoint.Type = PathType.Bezier;
+                ControlPoint.Type = PathType.BEZIER;
 
             if (PointsInSegment.Count != 3)
                 return;
@@ -233,7 +233,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             ReadOnlySpan<Vector2> points = PointsInSegment.Select(p => p.Position).ToArray();
             RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
             if (boundingBox.Width >= 640 || boundingBox.Height >= 480)
-                ControlPoint.Type = PathType.Bezier;
+                ControlPoint.Type = PathType.BEZIER;
         }
 
         /// <summary>
@@ -256,18 +256,22 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         private Color4 getColourFromNodeType()
         {
-            if (!(ControlPoint.Type is PathType pathType))
+            if (ControlPoint.Type is not PathType pathType)
                 return colours.Yellow;
 
             switch (pathType)
             {
-                case PathType.Catmull:
+                case { SplineType: SplineType.Catmull }:
                     return colours.SeaFoam;
 
-                case PathType.Bezier:
-                    return colours.Pink;
+                case { SplineType: SplineType.BSpline, Degree: null }:
+                    return colours.PinkLighter;
 
-                case PathType.PerfectCurve:
+                case { SplineType: SplineType.BSpline, Degree: >= 1 }:
+                    int idx = Math.Clamp(pathType.Degree.Value, 0, 3);
+                    return new[] { colours.PinkDarker, colours.PinkDark, colours.Pink, colours.PinkLight }[idx];
+
+                case { SplineType: SplineType.PerfectCurve }:
                     return colours.PurpleDark;
 
                 default:
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 f891d23bbd..b5c9016538 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -242,18 +242,15 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             int indexInSegment = piece.PointsInSegment.IndexOf(piece.ControlPoint);
 
-            switch (type)
+            if (type.HasValue && type.Value.SplineType == SplineType.PerfectCurve)
             {
-                case PathType.PerfectCurve:
-                    // Can't always create a circular arc out of 4 or more points,
-                    // so we split the segment into one 3-point circular arc segment
-                    // and one segment of the previous type.
-                    int thirdPointIndex = indexInSegment + 2;
+                // Can't always create a circular arc out of 4 or more points,
+                // so we split the segment into one 3-point circular arc segment
+                // and one segment of the previous type.
+                int thirdPointIndex = indexInSegment + 2;
 
-                    if (piece.PointsInSegment.Count > thirdPointIndex + 1)
-                        piece.PointsInSegment[thirdPointIndex].Type = piece.PointsInSegment[0].Type;
-
-                    break;
+                if (piece.PointsInSegment.Count > thirdPointIndex + 1)
+                    piece.PointsInSegment[thirdPointIndex].Type = piece.PointsInSegment[0].Type;
             }
 
             hitObject.Path.ExpectedDistance.Value = null;
@@ -370,10 +367,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     curveTypeItems.Add(createMenuItemForPathType(null));
 
                 // todo: hide/disable items which aren't valid for selected points
-                curveTypeItems.Add(createMenuItemForPathType(PathType.Linear));
-                curveTypeItems.Add(createMenuItemForPathType(PathType.PerfectCurve));
-                curveTypeItems.Add(createMenuItemForPathType(PathType.Bezier));
-                curveTypeItems.Add(createMenuItemForPathType(PathType.Catmull));
+                curveTypeItems.Add(createMenuItemForPathType(PathType.LINEAR));
+                curveTypeItems.Add(createMenuItemForPathType(PathType.PERFECTCURVE));
+                curveTypeItems.Add(createMenuItemForPathType(PathType.BEZIER));
+                curveTypeItems.Add(createMenuItemForPathType(PathType.BSpline(3)));
+                curveTypeItems.Add(createMenuItemForPathType(PathType.CATMULL));
 
                 var menuItems = new List<MenuItem>
                 {
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 9b6adc04cf..8f0a2ee781 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             RelativeSizeAxes = Axes.Both;
 
-            HitObject.Path.ControlPoints.Add(segmentStart = new PathControlPoint(Vector2.Zero, PathType.Linear));
+            HitObject.Path.ControlPoints.Add(segmentStart = new PathControlPoint(Vector2.Zero, PathType.LINEAR));
             currentSegmentLength = 1;
         }
 
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                         Debug.Assert(lastPoint != null);
 
                         segmentStart = lastPoint;
-                        segmentStart.Type = PathType.Linear;
+                        segmentStart.Type = PathType.LINEAR;
 
                         currentSegmentLength = 1;
                     }
@@ -173,15 +173,15 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             {
                 case 1:
                 case 2:
-                    segmentStart.Type = PathType.Linear;
+                    segmentStart.Type = PathType.LINEAR;
                     break;
 
                 case 3:
-                    segmentStart.Type = PathType.PerfectCurve;
+                    segmentStart.Type = PathType.PERFECTCURVE;
                     break;
 
                 default:
-                    segmentStart.Type = PathType.Bezier;
+                    segmentStart.Type = PathType.BEZIER;
                     break;
             }
         }
@@ -195,7 +195,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 {
                     HitObject.Path.ControlPoints.Add(cursor = new PathControlPoint { Position = Vector2.Zero });
 
-                    // The path type should be adjusted in the progression of updatePathType() (Linear -> PC -> Bezier).
+                    // The path type should be adjusted in the progression of updatePathType() (LINEAR -> PC -> BEZIER).
                     currentSegmentLength++;
                     updatePathType();
                 }
@@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 HitObject.Path.ControlPoints.Remove(cursor);
                 cursor = null;
 
-                // The path type should be adjusted in the reverse progression of updatePathType() (Bezier -> PC -> Linear).
+                // The path type should be adjusted in the reverse progression of updatePathType() (BEZIER -> PC -> LINEAR).
                 currentSegmentLength--;
                 updatePathType();
             }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index e81941d254..b972f09136 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -320,7 +320,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             if (mergedHitObject.Path.ControlPoints.Count == 0)
             {
-                mergedHitObject.Path.ControlPoints.Add(new PathControlPoint(Vector2.Zero, PathType.Linear));
+                mergedHitObject.Path.ControlPoints.Add(new PathControlPoint(Vector2.Zero, PathType.LINEAR));
             }
 
             // Merge all the selected hit objects into one slider path.
@@ -350,7 +350,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                     // Turn the last control point into a linear type if this is the first merging circle in a sequence, so the subsequent control points can be inherited path type.
                     if (!lastCircle)
                     {
-                        mergedHitObject.Path.ControlPoints.Last().Type = PathType.Linear;
+                        mergedHitObject.Path.ControlPoints.Last().Type = PathType.LINEAR;
                     }
 
                     mergedHitObject.Path.ControlPoints.Add(new PathControlPoint(selectedMergeableObject.Position - mergedHitObject.Position));
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 5f47d486e6..2a76782a08 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
         double IHasDistance.Distance => Duration * Velocity;
 
         SliderPath IHasPath.Path
-            => new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(1) }, ((IHasDistance)this).Distance / LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER);
+            => new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(1) }, ((IHasDistance)this).Distance / LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER);
 
         #endregion
     }
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 66151a51e6..18c21046fb 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -663,7 +663,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 assertObjectHasBanks(hitObjects[9], HitSampleInfo.BANK_DRUM, HitSampleInfo.BANK_NORMAL);
             }
 
-            void assertObjectHasBanks(HitObject hitObject, string normalBank, string? additionsBank = null)
+            static void assertObjectHasBanks(HitObject hitObject, string normalBank, string? additionsBank = null)
             {
                 Assert.AreEqual(normalBank, hitObject.Samples[0].Bank);
 
@@ -808,14 +808,14 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var first = ((IHasPath)decoded.HitObjects[0]).Path;
 
                 Assert.That(first.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-                Assert.That(first.ControlPoints[0].Type, Is.EqualTo(PathType.PerfectCurve));
+                Assert.That(first.ControlPoints[0].Type, Is.EqualTo(PathType.PERFECTCURVE));
                 Assert.That(first.ControlPoints[1].Position, Is.EqualTo(new Vector2(161, -244)));
                 Assert.That(first.ControlPoints[1].Type, Is.EqualTo(null));
 
                 // ReSharper disable once HeuristicUnreachableCode
                 // weird one, see https://youtrack.jetbrains.com/issue/RIDER-70159.
                 Assert.That(first.ControlPoints[2].Position, Is.EqualTo(new Vector2(376, -3)));
-                Assert.That(first.ControlPoints[2].Type, Is.EqualTo(PathType.Bezier));
+                Assert.That(first.ControlPoints[2].Type, Is.EqualTo(PathType.BEZIER));
                 Assert.That(first.ControlPoints[3].Position, Is.EqualTo(new Vector2(68, 15)));
                 Assert.That(first.ControlPoints[3].Type, Is.EqualTo(null));
                 Assert.That(first.ControlPoints[4].Position, Is.EqualTo(new Vector2(259, -132)));
@@ -827,7 +827,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var second = ((IHasPath)decoded.HitObjects[1]).Path;
 
                 Assert.That(second.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-                Assert.That(second.ControlPoints[0].Type, Is.EqualTo(PathType.PerfectCurve));
+                Assert.That(second.ControlPoints[0].Type, Is.EqualTo(PathType.PERFECTCURVE));
                 Assert.That(second.ControlPoints[1].Position, Is.EqualTo(new Vector2(161, -244)));
                 Assert.That(second.ControlPoints[1].Type, Is.EqualTo(null));
                 Assert.That(second.ControlPoints[2].Position, Is.EqualTo(new Vector2(376, -3)));
@@ -837,14 +837,14 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var third = ((IHasPath)decoded.HitObjects[2]).Path;
 
                 Assert.That(third.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-                Assert.That(third.ControlPoints[0].Type, Is.EqualTo(PathType.Bezier));
+                Assert.That(third.ControlPoints[0].Type, Is.EqualTo(PathType.BEZIER));
                 Assert.That(third.ControlPoints[1].Position, Is.EqualTo(new Vector2(0, 192)));
                 Assert.That(third.ControlPoints[1].Type, Is.EqualTo(null));
                 Assert.That(third.ControlPoints[2].Position, Is.EqualTo(new Vector2(224, 192)));
                 Assert.That(third.ControlPoints[2].Type, Is.EqualTo(null));
 
                 Assert.That(third.ControlPoints[3].Position, Is.EqualTo(new Vector2(224, 0)));
-                Assert.That(third.ControlPoints[3].Type, Is.EqualTo(PathType.Bezier));
+                Assert.That(third.ControlPoints[3].Type, Is.EqualTo(PathType.BEZIER));
                 Assert.That(third.ControlPoints[4].Position, Is.EqualTo(new Vector2(224, -192)));
                 Assert.That(third.ControlPoints[4].Type, Is.EqualTo(null));
                 Assert.That(third.ControlPoints[5].Position, Is.EqualTo(new Vector2(480, -192)));
@@ -856,7 +856,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var fourth = ((IHasPath)decoded.HitObjects[3]).Path;
 
                 Assert.That(fourth.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-                Assert.That(fourth.ControlPoints[0].Type, Is.EqualTo(PathType.Bezier));
+                Assert.That(fourth.ControlPoints[0].Type, Is.EqualTo(PathType.BEZIER));
                 Assert.That(fourth.ControlPoints[1].Position, Is.EqualTo(new Vector2(1, 1)));
                 Assert.That(fourth.ControlPoints[1].Type, Is.EqualTo(null));
                 Assert.That(fourth.ControlPoints[2].Position, Is.EqualTo(new Vector2(2, 2)));
@@ -870,7 +870,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var fifth = ((IHasPath)decoded.HitObjects[4]).Path;
 
                 Assert.That(fifth.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-                Assert.That(fifth.ControlPoints[0].Type, Is.EqualTo(PathType.Bezier));
+                Assert.That(fifth.ControlPoints[0].Type, Is.EqualTo(PathType.BEZIER));
                 Assert.That(fifth.ControlPoints[1].Position, Is.EqualTo(new Vector2(1, 1)));
                 Assert.That(fifth.ControlPoints[1].Type, Is.EqualTo(null));
                 Assert.That(fifth.ControlPoints[2].Position, Is.EqualTo(new Vector2(2, 2)));
@@ -881,7 +881,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(fifth.ControlPoints[4].Type, Is.EqualTo(null));
 
                 Assert.That(fifth.ControlPoints[5].Position, Is.EqualTo(new Vector2(4, 4)));
-                Assert.That(fifth.ControlPoints[5].Type, Is.EqualTo(PathType.Bezier));
+                Assert.That(fifth.ControlPoints[5].Type, Is.EqualTo(PathType.BEZIER));
                 Assert.That(fifth.ControlPoints[6].Position, Is.EqualTo(new Vector2(5, 5)));
                 Assert.That(fifth.ControlPoints[6].Type, Is.EqualTo(null));
 
@@ -889,12 +889,12 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var sixth = ((IHasPath)decoded.HitObjects[5]).Path;
 
                 Assert.That(sixth.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-                Assert.That(sixth.ControlPoints[0].Type == PathType.Bezier);
+                Assert.That(sixth.ControlPoints[0].Type == PathType.BEZIER);
                 Assert.That(sixth.ControlPoints[1].Position, Is.EqualTo(new Vector2(75, 145)));
                 Assert.That(sixth.ControlPoints[1].Type == null);
                 Assert.That(sixth.ControlPoints[2].Position, Is.EqualTo(new Vector2(170, 75)));
 
-                Assert.That(sixth.ControlPoints[2].Type == PathType.Bezier);
+                Assert.That(sixth.ControlPoints[2].Type == PathType.BEZIER);
                 Assert.That(sixth.ControlPoints[3].Position, Is.EqualTo(new Vector2(300, 145)));
                 Assert.That(sixth.ControlPoints[3].Type == null);
                 Assert.That(sixth.ControlPoints[4].Position, Is.EqualTo(new Vector2(410, 20)));
@@ -904,12 +904,12 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var seventh = ((IHasPath)decoded.HitObjects[6]).Path;
 
                 Assert.That(seventh.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-                Assert.That(seventh.ControlPoints[0].Type == PathType.PerfectCurve);
+                Assert.That(seventh.ControlPoints[0].Type == PathType.PERFECTCURVE);
                 Assert.That(seventh.ControlPoints[1].Position, Is.EqualTo(new Vector2(75, 145)));
                 Assert.That(seventh.ControlPoints[1].Type == null);
                 Assert.That(seventh.ControlPoints[2].Position, Is.EqualTo(new Vector2(170, 75)));
 
-                Assert.That(seventh.ControlPoints[2].Type == PathType.PerfectCurve);
+                Assert.That(seventh.ControlPoints[2].Type == PathType.PERFECTCURVE);
                 Assert.That(seventh.ControlPoints[3].Position, Is.EqualTo(new Vector2(300, 145)));
                 Assert.That(seventh.ControlPoints[3].Type == null);
                 Assert.That(seventh.ControlPoints[4].Position, Is.EqualTo(new Vector2(410, 20)));
@@ -1016,7 +1016,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var controlPoints = ((IHasPath)decoded.HitObjects[0]).Path.ControlPoints;
 
                 Assert.That(controlPoints.Count, Is.EqualTo(6));
-                Assert.That(controlPoints.Single(c => c.Type != null).Type, Is.EqualTo(PathType.Catmull));
+                Assert.That(controlPoints.Single(c => c.Type != null).Type, Is.EqualTo(PathType.CATMULL));
             }
         }
 
@@ -1032,9 +1032,9 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var controlPoints = ((IHasPath)decoded.HitObjects[0]).Path.ControlPoints;
 
                 Assert.That(controlPoints.Count, Is.EqualTo(4));
-                Assert.That(controlPoints[0].Type, Is.EqualTo(PathType.Catmull));
-                Assert.That(controlPoints[1].Type, Is.EqualTo(PathType.Catmull));
-                Assert.That(controlPoints[2].Type, Is.EqualTo(PathType.Catmull));
+                Assert.That(controlPoints[0].Type, Is.EqualTo(PathType.CATMULL));
+                Assert.That(controlPoints[1].Type, Is.EqualTo(PathType.CATMULL));
+                Assert.That(controlPoints[2].Type, Is.EqualTo(PathType.CATMULL));
                 Assert.That(controlPoints[3].Type, Is.Null);
             }
         }
@@ -1051,7 +1051,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var controlPoints = ((IHasPath)decoded.HitObjects[0]).Path.ControlPoints;
 
                 Assert.That(controlPoints.Count, Is.EqualTo(4));
-                Assert.That(controlPoints[0].Type, Is.EqualTo(PathType.Catmull));
+                Assert.That(controlPoints[0].Type, Is.EqualTo(PathType.CATMULL));
                 Assert.That(controlPoints[0].Position, Is.EqualTo(Vector2.Zero));
                 Assert.That(controlPoints[1].Type, Is.Null);
                 Assert.That(controlPoints[1].Position, Is.Not.EqualTo(Vector2.Zero));
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 5d9049ead7..db50273f27 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
             compareBeatmaps(decoded, decodedAfterEncode);
 
-            ControlPointInfo removeLegacyControlPointTypes(ControlPointInfo controlPointInfo)
+            static ControlPointInfo removeLegacyControlPointTypes(ControlPointInfo controlPointInfo)
             {
                 // emulate non-legacy control points by cloning the non-legacy portion.
                 // the assertion is that the encoder can recreate this losslessly from hitobject data.
@@ -125,10 +125,10 @@ namespace osu.Game.Tests.Beatmaps.Formats
                         Position = new Vector2(0.6f),
                         Path = new SliderPath(new[]
                         {
-                            new PathControlPoint(Vector2.Zero, PathType.Bezier),
+                            new PathControlPoint(Vector2.Zero, PathType.BEZIER),
                             new PathControlPoint(new Vector2(0.5f)),
                             new PathControlPoint(new Vector2(0.51f)), // This is actually on the same position as the previous one in legacy beatmaps (truncated to int).
-                            new PathControlPoint(new Vector2(1f), PathType.Bezier),
+                            new PathControlPoint(new Vector2(1f), PathType.BEZIER),
                             new PathControlPoint(new Vector2(2f))
                         })
                     },
diff --git a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
index 5af0366e6e..21d8a165ff 100644
--- a/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Tests.Editing
                     {
                         new PathControlPoint(Vector2.Zero),
                         new PathControlPoint(Vector2.One),
-                        new PathControlPoint(new Vector2(2), PathType.Bezier),
+                        new PathControlPoint(new Vector2(2), PathType.BEZIER),
                         new PathControlPoint(new Vector2(3)),
                     }, 50)
                 },
@@ -179,7 +179,7 @@ namespace osu.Game.Tests.Editing
                         StartTime = 2000,
                         Path = new SliderPath(new[]
                         {
-                            new PathControlPoint(Vector2.Zero, PathType.Bezier),
+                            new PathControlPoint(Vector2.Zero, PathType.BEZIER),
                             new PathControlPoint(new Vector2(4)),
                             new PathControlPoint(new Vector2(5)),
                         }, 100)
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index c4c05278b5..a766b253aa 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Visual.Editing
                     ControlPoints =
                     {
                         new PathControlPoint(),
-                        new PathControlPoint(new Vector2(100, 0), PathType.Bezier)
+                        new PathControlPoint(new Vector2(100, 0), PathType.BEZIER)
                     }
                 }
             };
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
index ed3bffe5c2..f392841ac7 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Editing
                         new Slider
                         {
                             Position = new Vector2(128, 256),
-                            Path = new SliderPath(PathType.Linear, new[]
+                            Path = new SliderPath(PathType.LINEAR, new[]
                             {
                                 Vector2.Zero,
                                 new Vector2(216, 0),
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs
index a40eab5948..5eb82ccbdc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs
@@ -114,23 +114,25 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
         }
 
-        [TestCase(PathType.Linear)]
-        [TestCase(PathType.Bezier)]
-        [TestCase(PathType.Catmull)]
-        [TestCase(PathType.PerfectCurve)]
-        public void TestSingleSegment(PathType type)
-            => AddStep("create path", () => path.ControlPoints.AddRange(createSegment(type, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
+        [TestCase(SplineType.Linear, null)]
+        [TestCase(SplineType.BSpline, null)]
+        [TestCase(SplineType.BSpline, 3)]
+        [TestCase(SplineType.Catmull, null)]
+        [TestCase(SplineType.PerfectCurve, null)]
+        public void TestSingleSegment(SplineType splineType, int? degree)
+            => AddStep("create path", () => path.ControlPoints.AddRange(createSegment(new PathType { SplineType = splineType, Degree = degree }, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
 
-        [TestCase(PathType.Linear)]
-        [TestCase(PathType.Bezier)]
-        [TestCase(PathType.Catmull)]
-        [TestCase(PathType.PerfectCurve)]
-        public void TestMultipleSegment(PathType type)
+        [TestCase(SplineType.Linear, null)]
+        [TestCase(SplineType.BSpline, null)]
+        [TestCase(SplineType.BSpline, 3)]
+        [TestCase(SplineType.Catmull, null)]
+        [TestCase(SplineType.PerfectCurve, null)]
+        public void TestMultipleSegment(SplineType splineType, int? degree)
         {
             AddStep("create path", () =>
             {
-                path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero));
-                path.ControlPoints.AddRange(createSegment(type, new Vector2(0, 100), new Vector2(100), Vector2.Zero));
+                path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero));
+                path.ControlPoints.AddRange(createSegment(new PathType { SplineType = splineType, Degree = degree }, new Vector2(0, 100), new Vector2(100), Vector2.Zero));
             });
         }
 
@@ -139,9 +141,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create path", () =>
             {
-                path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(100, 0)));
-                path.ControlPoints.AddRange(createSegment(PathType.Bezier, new Vector2(100, 0), new Vector2(150, 30), new Vector2(100, 100)));
-                path.ControlPoints.AddRange(createSegment(PathType.PerfectCurve, new Vector2(100, 100), new Vector2(25, 50), Vector2.Zero));
+                path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(100, 0)));
+                path.ControlPoints.AddRange(createSegment(PathType.BEZIER, new Vector2(100, 0), new Vector2(150, 30), new Vector2(100, 100)));
+                path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, new Vector2(100, 100), new Vector2(25, 50), Vector2.Zero));
             });
         }
 
@@ -157,7 +159,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create path", () =>
             {
-                path.ControlPoints.AddRange(createSegment(PathType.PerfectCurve, Vector2.Zero, new Vector2(width / 2, height), new Vector2(width, 0)));
+                path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, Vector2.Zero, new Vector2(width / 2, height), new Vector2(width, 0)));
             });
         }
 
@@ -170,11 +172,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                 switch (points)
                 {
                     case 2:
-                        path.ControlPoints.AddRange(createSegment(PathType.PerfectCurve, Vector2.Zero, new Vector2(0, 100)));
+                        path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, Vector2.Zero, new Vector2(0, 100)));
                         break;
 
                     case 4:
-                        path.ControlPoints.AddRange(createSegment(PathType.PerfectCurve, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
+                        path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
                         break;
                 }
             });
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index 0f16d3f394..3cbd5eefac 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 {
                     HitWindows = new HitWindows(),
                     StartTime = t += spacing,
-                    Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 }),
+                    Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, Vector2.UnitY * 200 }),
                     Samples = new[] { new HitSampleInfo(HitSampleInfo.HIT_WHISTLE, HitSampleInfo.BANK_SOFT) },
                 },
             });
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
index 635d9f9604..e4d99f6741 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
@@ -52,59 +52,68 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
         }
 
-        [TestCase(PathType.Linear)]
-        [TestCase(PathType.Bezier)]
-        [TestCase(PathType.Catmull)]
-        [TestCase(PathType.PerfectCurve)]
-        public void TestSingleSegment(PathType type)
-            => AddStep("create path", () => path.ControlPoints.AddRange(createSegment(type, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
+        [TestCase(SplineType.Linear, null)]
+        [TestCase(SplineType.BSpline, null)]
+        [TestCase(SplineType.BSpline, 3)]
+        [TestCase(SplineType.Catmull, null)]
+        [TestCase(SplineType.PerfectCurve, null)]
+        public void TestSingleSegment(SplineType splineType, int? degree)
+            => AddStep("create path", () => path.ControlPoints.AddRange(createSegment(
+                new PathType { SplineType = splineType, Degree = degree },
+                Vector2.Zero,
+                new Vector2(0, 100),
+                new Vector2(100),
+                new Vector2(0, 200),
+                new Vector2(200)
+            )));
 
-        [TestCase(PathType.Linear)]
-        [TestCase(PathType.Bezier)]
-        [TestCase(PathType.Catmull)]
-        [TestCase(PathType.PerfectCurve)]
-        public void TestMultipleSegment(PathType type)
+        [TestCase(SplineType.Linear, null)]
+        [TestCase(SplineType.BSpline, null)]
+        [TestCase(SplineType.BSpline, 3)]
+        [TestCase(SplineType.Catmull, null)]
+        [TestCase(SplineType.PerfectCurve, null)]
+        public void TestMultipleSegment(SplineType splineType, int? degree)
         {
             AddStep("create path", () =>
             {
-                path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero));
-                path.ControlPoints.AddRange(createSegment(type, new Vector2(0, 100), new Vector2(100), Vector2.Zero));
+                path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero));
+                path.ControlPoints.AddRange(createSegment(new PathType { SplineType = splineType, Degree = degree }, new Vector2(0, 100), new Vector2(100), Vector2.Zero));
             });
         }
 
         [Test]
         public void TestAddControlPoint()
         {
-            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100))));
+            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100))));
             AddStep("add point", () => path.ControlPoints.Add(new PathControlPoint { Position = new Vector2(100) }));
         }
 
         [Test]
         public void TestInsertControlPoint()
         {
-            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(100))));
+            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(100))));
             AddStep("insert point", () => path.ControlPoints.Insert(1, new PathControlPoint { Position = new Vector2(0, 100) }));
         }
 
         [Test]
         public void TestRemoveControlPoint()
         {
-            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
+            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
             AddStep("remove second point", () => path.ControlPoints.RemoveAt(1));
         }
 
         [Test]
         public void TestChangePathType()
         {
-            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
-            AddStep("change type to bezier", () => path.ControlPoints[0].Type = PathType.Bezier);
+            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
+            AddStep("change type to bezier", () => path.ControlPoints[0].Type = PathType.BEZIER);
         }
 
         [Test]
         public void TestAddSegmentByChangingType()
         {
-            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0))));
-            AddStep("change second point type to bezier", () => path.ControlPoints[1].Type = PathType.Bezier);
+            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0))));
+            AddStep("change second point type to bezier", () => path.ControlPoints[1].Type = PathType.BEZIER);
         }
 
         [Test]
@@ -112,8 +121,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create path", () =>
             {
-                path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
-                path.ControlPoints[1].Type = PathType.Bezier;
+                path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
+                path.ControlPoints[1].Type = PathType.BEZIER;
             });
 
             AddStep("change second point type to null", () => path.ControlPoints[1].Type = null);
@@ -124,8 +133,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create path", () =>
             {
-                path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
-                path.ControlPoints[1].Type = PathType.Bezier;
+                path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
+                path.ControlPoints[1].Type = PathType.BEZIER;
             });
 
             AddStep("remove second point", () => path.ControlPoints.RemoveAt(1));
@@ -140,11 +149,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                 switch (points)
                 {
                     case 2:
-                        path.ControlPoints.AddRange(createSegment(PathType.PerfectCurve, Vector2.Zero, new Vector2(0, 100)));
+                        path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, Vector2.Zero, new Vector2(0, 100)));
                         break;
 
                     case 4:
-                        path.ControlPoints.AddRange(createSegment(PathType.PerfectCurve, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
+                        path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
                         break;
                 }
             });
@@ -153,35 +162,35 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLengthenLastSegment()
         {
-            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
+            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
             AddStep("lengthen last segment", () => path.ExpectedDistance.Value = 300);
         }
 
         [Test]
         public void TestShortenLastSegment()
         {
-            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
+            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
             AddStep("shorten last segment", () => path.ExpectedDistance.Value = 150);
         }
 
         [Test]
         public void TestShortenFirstSegment()
         {
-            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
+            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
             AddStep("shorten first segment", () => path.ExpectedDistance.Value = 50);
         }
 
         [Test]
         public void TestShortenToZeroLength()
         {
-            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
+            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
             AddStep("shorten to 0 length", () => path.ExpectedDistance.Value = 0);
         }
 
         [Test]
         public void TestShortenToNegativeLength()
         {
-            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.Linear, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
+            AddStep("create path", () => path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
             AddStep("shorten to -10 length", () => path.ExpectedDistance.Value = -10);
         }
 
@@ -197,7 +206,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             };
             double[] distances = { 100d, 200d, 300d };
 
-            AddStep("create path", () => path.ControlPoints.AddRange(positions.Select(p => new PathControlPoint(p, PathType.Linear))));
+            AddStep("create path", () => path.ControlPoints.AddRange(positions.Select(p => new PathControlPoint(p, PathType.LINEAR))));
             AddAssert("segment ends are correct", () => path.GetSegmentEnds(), () => Is.EqualTo(distances.Select(d => d / 300)));
             AddAssert("segment end positions recovered", () => path.GetSegmentEnds().Select(p => path.PositionAt(p)), () => Is.EqualTo(positions.Skip(1)));
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 4f8e935ee4..7029f61459 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -437,7 +438,7 @@ namespace osu.Game.Beatmaps.Formats
                     // Explicit segments have a new format in which the type is injected into the middle of the control point string.
                     // To preserve compatibility with osu-stable as much as possible, explicit segments with the same type are converted to use implicit segments by duplicating the control point.
                     // One exception are consecutive perfect curves, which aren't supported in osu!stable and can lead to decoding issues if encoded as implicit segments
-                    bool needsExplicitSegment = point.Type != lastType || point.Type == PathType.PerfectCurve;
+                    bool needsExplicitSegment = point.Type != lastType || point.Type == PathType.PERFECTCURVE;
 
                     // Another exception to this is when the last two control points of the last segment were duplicated. This is not a scenario supported by osu!stable.
                     // Lazer does not add implicit segments for the last two control points of _any_ explicit segment, so an explicit segment is forced in order to maintain consistency with the decoder.
@@ -455,19 +456,23 @@ namespace osu.Game.Beatmaps.Formats
                     {
                         switch (point.Type)
                         {
-                            case PathType.Bezier:
+                            case { SplineType: SplineType.BSpline, Degree: > 0 }:
+                                writer.Write($"B{point.Type.Value.Degree}|");
+                                break;
+
+                            case { SplineType: SplineType.BSpline, Degree: <= 0 }:
                                 writer.Write("B|");
                                 break;
 
-                            case PathType.Catmull:
+                            case { SplineType: SplineType.Catmull }:
                                 writer.Write("C|");
                                 break;
 
-                            case PathType.PerfectCurve:
+                            case { SplineType: SplineType.PerfectCurve }:
                                 writer.Write("P|");
                                 break;
 
-                            case PathType.Linear:
+                            case { SplineType: SplineType.Linear }:
                                 writer.Write("L|");
                                 break;
                         }
diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index ece705f685..9ca12a79dd 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -78,10 +78,10 @@ namespace osu.Game.Database
                 // wherein the last control point of an otherwise-single-segment slider path has a different type than previous,
                 // which would lead to sliders being mangled when exported back to stable.
                 // normally, that would be handled by the `BezierConverter.ConvertToModernBezier()` call below,
-                // which outputs a slider path containing only Bezier control points,
+                // which outputs a slider path containing only BEZIER control points,
                 // but a non-inherited last control point is (rightly) not considered to be starting a new segment,
                 // therefore it would fail to clear the `CountSegments() <= 1` check.
-                // by clearing explicitly we both fix the issue and avoid unnecessary conversions to Bezier.
+                // by clearing explicitly we both fix the issue and avoid unnecessary conversions to BEZIER.
                 if (hasPath.Path.ControlPoints.Count > 1)
                     hasPath.Path.ControlPoints[^1].Type = null;
 
diff --git a/osu.Game/Rulesets/Objects/BezierConverter.cs b/osu.Game/Rulesets/Objects/BezierConverter.cs
index 0c878fa1fd..74fbe7d8f9 100644
--- a/osu.Game/Rulesets/Objects/BezierConverter.cs
+++ b/osu.Game/Rulesets/Objects/BezierConverter.cs
@@ -68,26 +68,26 @@ namespace osu.Game.Rulesets.Objects
 
                 // The current vertex ends the segment
                 var segmentVertices = vertices.AsSpan().Slice(start, i - start + 1);
-                var segmentType = controlPoints[start].Type ?? PathType.Linear;
+                var segmentType = controlPoints[start].Type ?? PathType.LINEAR;
 
                 switch (segmentType)
                 {
-                    case PathType.Catmull:
+                    case { SplineType: SplineType.Catmull }:
                         result.AddRange(from segment in ConvertCatmullToBezierAnchors(segmentVertices) from v in segment select v + position);
-
                         break;
 
-                    case PathType.Linear:
+                    case { SplineType: SplineType.Linear }:
                         result.AddRange(from segment in ConvertLinearToBezierAnchors(segmentVertices) from v in segment select v + position);
-
                         break;
 
-                    case PathType.PerfectCurve:
+                    case { SplineType: SplineType.PerfectCurve }:
                         result.AddRange(ConvertCircleToBezierAnchors(segmentVertices).Select(v => v + position));
-
                         break;
 
                     default:
+                        if (segmentType.Degree != null)
+                            throw new NotImplementedException("BSpline conversion of arbitrary degree is not implemented.");
+
                         foreach (Vector2 v in segmentVertices)
                         {
                             result.Add(v + position);
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Objects
         }
 
         /// <summary>
-        /// Converts a path of control points to an identical path using only Bezier type control points.
+        /// Converts a path of control points to an identical path using only BEZIER type control points.
         /// </summary>
         /// <param name="controlPoints">The control points of the path.</param>
         /// <returns>The list of bezier control points.</returns>
@@ -124,38 +124,38 @@ namespace osu.Game.Rulesets.Objects
 
                 // The current vertex ends the segment
                 var segmentVertices = vertices.AsSpan().Slice(start, i - start + 1);
-                var segmentType = controlPoints[start].Type ?? PathType.Linear;
+                var segmentType = controlPoints[start].Type ?? PathType.LINEAR;
 
                 switch (segmentType)
                 {
-                    case PathType.Catmull:
+                    case { SplineType: SplineType.Catmull }:
                         foreach (var segment in ConvertCatmullToBezierAnchors(segmentVertices))
                         {
                             for (int j = 0; j < segment.Length - 1; j++)
                             {
-                                result.Add(new PathControlPoint(segment[j], j == 0 ? PathType.Bezier : null));
+                                result.Add(new PathControlPoint(segment[j], j == 0 ? PathType.BEZIER : null));
                             }
                         }
 
                         break;
 
-                    case PathType.Linear:
+                    case { SplineType: SplineType.Linear }:
                         foreach (var segment in ConvertLinearToBezierAnchors(segmentVertices))
                         {
                             for (int j = 0; j < segment.Length - 1; j++)
                             {
-                                result.Add(new PathControlPoint(segment[j], j == 0 ? PathType.Bezier : null));
+                                result.Add(new PathControlPoint(segment[j], j == 0 ? PathType.BEZIER : null));
                             }
                         }
 
                         break;
 
-                    case PathType.PerfectCurve:
+                    case { SplineType: SplineType.PerfectCurve }:
                         var circleResult = ConvertCircleToBezierAnchors(segmentVertices);
 
                         for (int j = 0; j < circleResult.Length - 1; j++)
                         {
-                            result.Add(new PathControlPoint(circleResult[j], j == 0 ? PathType.Bezier : null));
+                            result.Add(new PathControlPoint(circleResult[j], j == 0 ? PathType.BEZIER : null));
                         }
 
                         break;
@@ -163,7 +163,7 @@ namespace osu.Game.Rulesets.Objects
                     default:
                         for (int j = 0; j < segmentVertices.Length - 1; j++)
                         {
-                            result.Add(new PathControlPoint(segmentVertices[j], j == 0 ? PathType.Bezier : null));
+                            result.Add(new PathControlPoint(segmentVertices[j], j == 0 ? segmentType : null));
                         }
 
                         break;
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index d20f2d31bb..30f4c092d9 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -224,16 +224,18 @@ namespace osu.Game.Rulesets.Objects.Legacy
             {
                 default:
                 case 'C':
-                    return PathType.Catmull;
+                    return new PathType(SplineType.Catmull);
 
                 case 'B':
-                    return PathType.Bezier;
+                    if (input.Length > 1 && int.TryParse(input.Substring(1), out int degree) && degree > 0)
+                        return new PathType { SplineType = SplineType.BSpline, Degree = degree };
+                    return new PathType(SplineType.BSpline);
 
                 case 'L':
-                    return PathType.Linear;
+                    return new PathType(SplineType.Linear);
 
                 case 'P':
-                    return PathType.PerfectCurve;
+                    return new PathType(SplineType.PerfectCurve);
             }
         }
 
@@ -320,14 +322,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 readPoint(endPoint, offset, out vertices[^1]);
 
             // Edge-case rules (to match stable).
-            if (type == PathType.PerfectCurve)
+            if (type == PathType.PERFECTCURVE)
             {
                 if (vertices.Length != 3)
-                    type = PathType.Bezier;
+                    type = PathType.BEZIER;
                 else if (isLinear(vertices))
                 {
                     // osu-stable special-cased colinear perfect curves to a linear path
-                    type = PathType.Linear;
+                    type = PathType.LINEAR;
                 }
             }
 
@@ -349,10 +351,10 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 if (vertices[endIndex].Position != vertices[endIndex - 1].Position)
                     continue;
 
-                // Legacy Catmull sliders don't support multiple segments, so adjacent Catmull segments should be treated as a single one.
+                // Legacy CATMULL sliders don't support multiple segments, so adjacent CATMULL segments should be treated as a single one.
                 // Importantly, this is not applied to the first control point, which may duplicate the slider path's position
                 // resulting in a duplicate (0,0) control point in the resultant list.
-                if (type == PathType.Catmull && endIndex > 1 && FormatVersion < LegacyBeatmapEncoder.FIRST_LAZER_VERSION)
+                if (type == PathType.CATMULL && endIndex > 1 && FormatVersion < LegacyBeatmapEncoder.FIRST_LAZER_VERSION)
                     continue;
 
                 // The last control point of each segment is not allowed to start a new implicit segment.
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 0ac057578b..4c24c111be 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
+using Microsoft.Toolkit.HighPerformance;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
@@ -260,7 +261,7 @@ namespace osu.Game.Rulesets.Objects
 
                 // The current vertex ends the segment
                 var segmentVertices = vertices.AsSpan().Slice(start, i - start + 1);
-                var segmentType = ControlPoints[start].Type ?? PathType.Linear;
+                var segmentType = ControlPoints[start].Type ?? PathType.LINEAR;
 
                 // No need to calculate path when there is only 1 vertex
                 if (segmentVertices.Length == 1)
@@ -288,12 +289,12 @@ namespace osu.Game.Rulesets.Objects
 
         private List<Vector2> calculateSubPath(ReadOnlySpan<Vector2> subControlPoints, PathType type)
         {
-            switch (type)
+            switch (type.SplineType)
             {
-                case PathType.Linear:
+                case SplineType.Linear:
                     return PathApproximator.ApproximateLinear(subControlPoints);
 
-                case PathType.PerfectCurve:
+                case SplineType.PerfectCurve:
                     if (subControlPoints.Length != 3)
                         break;
 
@@ -305,11 +306,11 @@ namespace osu.Game.Rulesets.Objects
 
                     return subPath;
 
-                case PathType.Catmull:
+                case SplineType.Catmull:
                     return PathApproximator.ApproximateCatmull(subControlPoints);
             }
 
-            return PathApproximator.ApproximateBezier(subControlPoints);
+            return PathApproximator.ApproximateBSpline(subControlPoints, type.Degree ?? subControlPoints.Length);
         }
 
         private void calculateLength()
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index 6c88f01249..d7e5e4574d 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -29,11 +29,11 @@ namespace osu.Game.Rulesets.Objects
         {
             var controlPoints = sliderPath.ControlPoints;
 
-            var inheritedLinearPoints = controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.Linear && p.Type is null).ToList();
+            var inheritedLinearPoints = controlPoints.Where(p => sliderPath.PointsInSegment(p)[0].Type == PathType.LINEAR && p.Type is null).ToList();
 
             // Inherited points after a linear point, as well as the first control point if it inherited,
             // should be treated as linear points, so their types are temporarily changed to linear.
-            inheritedLinearPoints.ForEach(p => p.Type = PathType.Linear);
+            inheritedLinearPoints.ForEach(p => p.Type = PathType.LINEAR);
 
             double[] segmentEnds = sliderPath.GetSegmentEnds().ToArray();
 
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Objects
             inheritedLinearPoints.ForEach(p => p.Type = null);
 
             // Recalculate middle perfect curve control points at the end of the slider path.
-            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PerfectCurve && controlPoints[^2].Type is null && segmentEnds.Any())
+            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PERFECTCURVE && controlPoints[^2].Type is null && segmentEnds.Any())
             {
                 double lastSegmentStart = segmentEnds.Length > 1 ? segmentEnds[^2] : 0;
                 double lastSegmentEnd = segmentEnds[^1];
diff --git a/osu.Game/Rulesets/Objects/Types/PathType.cs b/osu.Game/Rulesets/Objects/Types/PathType.cs
index 923ce9eba4..41472fd8b5 100644
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@@ -1,13 +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;
+using System.Diagnostics;
+
 namespace osu.Game.Rulesets.Objects.Types
 {
-    public enum PathType
+    public enum SplineType
     {
         Catmull,
-        Bezier,
+        BSpline,
         Linear,
         PerfectCurve
     }
+
+    public struct PathType
+    {
+        public static readonly PathType CATMULL = new PathType(SplineType.Catmull);
+        public static readonly PathType BEZIER = new PathType(SplineType.BSpline);
+        public static readonly PathType LINEAR = new PathType(SplineType.Linear);
+        public static readonly PathType PERFECTCURVE = new PathType(SplineType.PerfectCurve);
+
+        /// <summary>
+        /// The type of the spline that should be used to interpret the control points of the path.
+        /// </summary>
+        public SplineType SplineType { get; init; }
+
+        /// <summary>
+        /// The degree of a BSpline. Unused if <see cref="SplineType"/> is not <see cref="SplineType.BSpline"/>.
+        /// Null means the degree is equal to the number of control points, 1 means linear, 2 means quadratic, etc.
+        /// </summary>
+        public int? Degree { get; init; }
+
+        public PathType(SplineType splineType)
+        {
+            SplineType = splineType;
+            Degree = null;
+        }
+
+        public override int GetHashCode()
+            => HashCode.Combine(SplineType, Degree);
+
+        public override bool Equals(object? obj)
+            => obj is PathType pathType && this == pathType;
+
+        public static bool operator ==(PathType a, PathType b)
+            => a.SplineType == b.SplineType && a.Degree == b.Degree;
+
+        public static bool operator !=(PathType a, PathType b)
+            => a.SplineType != b.SplineType || a.Degree != b.Degree;
+
+        public static PathType BSpline(int degree)
+        {
+            Debug.Assert(degree > 0);
+            return new PathType { SplineType = SplineType.BSpline, Degree = degree };
+        }
+    }
 }
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 793d43f7ef..a114529bf9 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -246,13 +246,13 @@ namespace osu.Game.Screens.Play.HUD
 
             barPath = new SliderPath(new[]
             {
-                new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                new PathControlPoint(new Vector2(curveStart - curve_smoothness, 0), PathType.Bezier),
+                new PathControlPoint(new Vector2(0, 0), PathType.LINEAR),
+                new PathControlPoint(new Vector2(curveStart - curve_smoothness, 0), PathType.BEZIER),
                 new PathControlPoint(new Vector2(curveStart, 0)),
-                new PathControlPoint(new Vector2(curveStart, 0) + diagonalDir * curve_smoothness, PathType.Linear),
-                new PathControlPoint(new Vector2(curveEnd, BarHeight.Value) - diagonalDir * curve_smoothness, PathType.Bezier),
+                new PathControlPoint(new Vector2(curveStart, 0) + diagonalDir * curve_smoothness, PathType.LINEAR),
+                new PathControlPoint(new Vector2(curveEnd, BarHeight.Value) - diagonalDir * curve_smoothness, PathType.BEZIER),
                 new PathControlPoint(new Vector2(curveEnd, BarHeight.Value)),
-                new PathControlPoint(new Vector2(curveEnd + curve_smoothness, BarHeight.Value), PathType.Linear),
+                new PathControlPoint(new Vector2(curveEnd + curve_smoothness, BarHeight.Value), PathType.LINEAR),
                 new PathControlPoint(new Vector2(barLength, BarHeight.Value)),
             });
 

From 3f85aa79c5b4402b714da14295b6b796ffa8d6e6 Mon Sep 17 00:00:00 2001
From: cs <cedric.schneider@pmbs.de>
Date: Sat, 11 Nov 2023 10:45:22 +0100
Subject: [PATCH 1512/2296] Add free-hand drawing of sliders to the editor

---
 .../Sliders/SliderPlacementBlueprint.cs       | 86 +++++++++++++++++--
 .../Edit/ISliderDrawingSettingsProvider.cs    | 12 +++
 .../Edit/OsuHitObjectComposer.cs              |  8 +-
 .../Edit/OsuSliderDrawingSettingsProvider.cs  | 68 +++++++++++++++
 osu.Game/Rulesets/Objects/SliderPath.cs       |  8 +-
 5 files changed, 171 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs
 create mode 100644 osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 8f0a2ee781..a5c6ae9465 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -44,6 +45,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [Resolved(CanBeNull = true)]
         private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private ISliderDrawingSettingsProvider drawingSettingsProvider { get; set; }
+
+        private readonly IncrementalBSplineBuilder bSplineBuilder = new IncrementalBSplineBuilder();
+
         protected override bool IsValidForPlacement => HitObject.Path.HasValidLength;
 
         public SliderPlacementBlueprint()
@@ -73,6 +79,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             base.LoadComplete();
             inputManager = GetContainingInputManager();
+
+            drawingSettingsProvider.Tolerance.BindValueChanged(e =>
+            {
+                if (bSplineBuilder.Tolerance != e.NewValue)
+                    bSplineBuilder.Tolerance = e.NewValue;
+                updateSliderPathFromBSplineBuilder();
+            }, true);
         }
 
         [Resolved]
@@ -98,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     ApplyDefaultsToHitObject();
                     break;
 
-                case SliderPlacementState.Body:
+                case SliderPlacementState.ControlPoints:
                     updateCursor();
                     break;
             }
@@ -115,7 +128,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     beginCurve();
                     break;
 
-                case SliderPlacementState.Body:
+                case SliderPlacementState.ControlPoints:
                     if (canPlaceNewControlPoint(out var lastPoint))
                     {
                         // Place a new point by detatching the current cursor.
@@ -139,9 +152,62 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             return true;
         }
 
+        protected override bool OnDragStart(DragStartEvent e)
+        {
+            if (e.Button == MouseButton.Left)
+            {
+                switch (state)
+                {
+                    case SliderPlacementState.Initial:
+                        return true;
+
+                    case SliderPlacementState.ControlPoints:
+                        if (HitObject.Path.ControlPoints.Count < 3)
+                        {
+                            var lastCp = HitObject.Path.ControlPoints.LastOrDefault();
+                            if (lastCp != cursor)
+                                return false;
+
+                            bSplineBuilder.Clear();
+                            bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMousePosition) - HitObject.Position);
+                            setState(SliderPlacementState.Drawing);
+                            return true;
+                        }
+                        return false;
+                }
+            }
+            return base.OnDragStart(e);
+        }
+
+        protected override void OnDrag(DragEvent e)
+        {
+            base.OnDrag(e);
+
+            bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMousePosition) - HitObject.Position);
+            updateSliderPathFromBSplineBuilder();
+        }
+
+        private void updateSliderPathFromBSplineBuilder()
+        {
+            Scheduler.AddOnce(static self =>
+            {
+                var cps = self.bSplineBuilder.GetControlPoints();
+                self.HitObject.Path.ControlPoints.RemoveRange(1, self.HitObject.Path.ControlPoints.Count - 1);
+                self.HitObject.Path.ControlPoints.AddRange(cps.Select(v => new PathControlPoint(v)));
+            }, this);
+        }
+
+        protected override void OnDragEnd(DragEndEvent e)
+        {
+            base.OnDragEnd(e);
+
+            if (state == SliderPlacementState.Drawing)
+                endCurve();
+        }
+
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            if (state == SliderPlacementState.Body && e.Button == MouseButton.Right)
+            if (state == SliderPlacementState.ControlPoints && e.Button == MouseButton.Right)
                 endCurve();
             base.OnMouseUp(e);
         }
@@ -149,7 +215,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void beginCurve()
         {
             BeginPlacement(commitStart: true);
-            setState(SliderPlacementState.Body);
+            setState(SliderPlacementState.ControlPoints);
         }
 
         private void endCurve()
@@ -169,6 +235,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void updatePathType()
         {
+            if (state == SliderPlacementState.Drawing)
+            {
+                segmentStart.Type = PathType.BSpline(3);
+                return;
+            }
+
             switch (currentSegmentLength)
             {
                 case 1:
@@ -201,7 +273,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 }
 
                 // Update the cursor position.
-                var result = positionSnapProvider?.FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position, state == SliderPlacementState.Body ? SnapType.GlobalGrids : SnapType.All);
+                var result = positionSnapProvider?.FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position, state == SliderPlacementState.ControlPoints ? SnapType.GlobalGrids : SnapType.All);
                 cursor.Position = ToLocalSpace(result?.ScreenSpacePosition ?? inputManager.CurrentState.Mouse.Position) - HitObject.Position;
             }
             else if (cursor != null)
@@ -248,7 +320,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private enum SliderPlacementState
         {
             Initial,
-            Body,
+            ControlPoints,
+            Drawing,
+            DrawingFinalization
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs
new file mode 100644
index 0000000000..1138588259
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs
@@ -0,0 +1,12 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public interface ISliderDrawingSettingsProvider
+    {
+        BindableFloat Tolerance { get; }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 0f8c960b65..d958b558cf 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -63,6 +63,9 @@ namespace osu.Game.Rulesets.Osu.Edit
         [Cached(typeof(IDistanceSnapProvider))]
         protected readonly OsuDistanceSnapProvider DistanceSnapProvider = new OsuDistanceSnapProvider();
 
+        [Cached(typeof(ISliderDrawingSettingsProvider))]
+        protected readonly OsuSliderDrawingSettingsProvider SliderDrawingSettingsProvider = new OsuSliderDrawingSettingsProvider();
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -96,8 +99,11 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             RightToolbox.Add(new TransformToolboxGroup
             {
-                RotationHandler = BlueprintContainer.SelectionHandler.RotationHandler
+                RotationHandler = BlueprintContainer.SelectionHandler.RotationHandler,
             });
+
+            AddInternal(SliderDrawingSettingsProvider);
+            SliderDrawingSettingsProvider.AttachToToolbox(RightToolbox);
         }
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
new file mode 100644
index 0000000000..ba2c39e1b5
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
@@ -0,0 +1,68 @@
+// 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.Framework.Graphics;
+using osu.Framework.Utils;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public partial class OsuSliderDrawingSettingsProvider : Drawable, ISliderDrawingSettingsProvider
+    {
+        public BindableFloat Tolerance { get; } = new BindableFloat(0.1f)
+        {
+            MinValue = 0.05f,
+            MaxValue = 1f,
+            Precision = 0.01f
+        };
+
+        private BindableInt sliderTolerance = new BindableInt(10)
+        {
+            MinValue = 5,
+            MaxValue = 100
+        };
+
+        private ExpandableSlider<int> toleranceSlider = null!;
+
+        private EditorToolboxGroup? toolboxGroup;
+
+        public OsuSliderDrawingSettingsProvider()
+        {
+            sliderTolerance.BindValueChanged(v =>
+            {
+                float newValue = v.NewValue / 100f;
+                if (!Precision.AlmostEquals(newValue, Tolerance.Value, 1e-7f))
+                    Tolerance.Value = newValue;
+            });
+            Tolerance.BindValueChanged(v =>
+            {
+                int newValue = (int)Math.Round(v.NewValue * 100f);
+                if (sliderTolerance.Value != newValue)
+                    sliderTolerance.Value = newValue;
+            });
+        }
+
+        public void AttachToToolbox(ExpandingToolboxContainer toolboxContainer)
+        {
+            toolboxContainer.Add(toolboxGroup = new EditorToolboxGroup("drawing")
+            {
+                Children = new Drawable[]
+                {
+                    toleranceSlider = new ExpandableSlider<int>
+                    {
+                        Current = sliderTolerance
+                    }
+                }
+            });
+
+            sliderTolerance.BindValueChanged(e =>
+            {
+                toleranceSlider.ContractedLabelText = $"Tolerance: {e.NewValue:N0}";
+                toleranceSlider.ExpandedLabelText = $"Tolerance: {e.NewValue:N0}";
+            }, true);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 4c24c111be..75f1ab868d 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -292,13 +292,13 @@ namespace osu.Game.Rulesets.Objects
             switch (type.SplineType)
             {
                 case SplineType.Linear:
-                    return PathApproximator.ApproximateLinear(subControlPoints);
+                    return PathApproximator.LinearToPiecewiseLinear(subControlPoints);
 
                 case SplineType.PerfectCurve:
                     if (subControlPoints.Length != 3)
                         break;
 
-                    List<Vector2> subPath = PathApproximator.ApproximateCircularArc(subControlPoints);
+                    List<Vector2> subPath = PathApproximator.CircularArcToPiecewiseLinear(subControlPoints);
 
                     // If for some reason a circular arc could not be fit to the 3 given points, fall back to a numerically stable bezier approximation.
                     if (subPath.Count == 0)
@@ -307,10 +307,10 @@ namespace osu.Game.Rulesets.Objects
                     return subPath;
 
                 case SplineType.Catmull:
-                    return PathApproximator.ApproximateCatmull(subControlPoints);
+                    return PathApproximator.CatmullToPiecewiseLinear(subControlPoints);
             }
 
-            return PathApproximator.ApproximateBSpline(subControlPoints, type.Degree ?? subControlPoints.Length);
+            return PathApproximator.BSplineToPiecewiseLinear(subControlPoints, type.Degree ?? subControlPoints.Length);
         }
 
         private void calculateLength()

From 4e1e19728cb8ff9e11f18ab9c0e8635c2cc2ba9a Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sat, 11 Nov 2023 14:02:42 +0100
Subject: [PATCH 1513/2296] Refactor HitObject selection in Composer

---
 .../Edit/ManiaHitObjectComposer.cs            | 43 ++++++++++++++-----
 .../Edit/OsuHitObjectComposer.cs              | 36 +++++++++++++---
 .../Rulesets/Edit/EditorTimestampParser.cs    | 40 +----------------
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 14 ++----
 osu.Game/Screens/Edit/Editor.cs               | 11 +----
 5 files changed, 68 insertions(+), 76 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index d217f04651..b04d3f895d 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -3,16 +3,15 @@
 
 #nullable disable
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -50,22 +49,44 @@ namespace osu.Game.Rulesets.Mania.Edit
             new HoldNoteCompositionTool()
         };
 
+        private static readonly Regex selection_regex = new Regex(@"^\d+\|\d+(,\d+\|\d+)*$");
+
         public override string ConvertSelectionToString()
-            => string.Join(ObjectSeparator, EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime).Select(h => $"{h.StartTime}|{h.Column}"));
+            => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime).Select(h => $"{h.StartTime}|{h.Column}"));
 
-        public override bool HandleHitObjectSelection(HitObject hitObject, string objectInfo)
+        public override void SelectHitObjects(double timestamp, string objectDescription)
         {
-            if (hitObject is not ManiaHitObject maniaHitObject)
-                return false;
+            if (!selection_regex.IsMatch(objectDescription))
+                return;
 
-            double[] split = objectInfo.Split('|').Select(double.Parse).ToArray();
+            List<ManiaHitObject> remainingHitObjects = EditorBeatmap.HitObjects.Cast<ManiaHitObject>().Where(h => h.StartTime >= timestamp).ToList();
+            string[] split = objectDescription.Split(',').ToArray();
+
+            for (int i = 0; i < split.Length; i++)
+            {
+                ManiaHitObject current = remainingHitObjects.FirstOrDefault(h => shouldBeSelected(h, split[i]));
+
+                if (current == null)
+                    continue;
+
+                EditorBeatmap.SelectedHitObjects.Add(current);
+
+                if (i < split.Length - 1)
+                    remainingHitObjects = remainingHitObjects.Where(h => h != current && h.StartTime >= current.StartTime).ToList();
+            }
+        }
+
+        private bool shouldBeSelected(ManiaHitObject hitObject, string objectInfo)
+        {
+            string[] split = objectInfo.Split('|').ToArray();
             if (split.Length != 2)
                 return false;
 
-            double timeValue = split[0];
-            double columnValue = split[1];
-            return Math.Abs(maniaHitObject.StartTime - timeValue) < 0.5
-                   && Math.Abs(maniaHitObject.Column - columnValue) < 0.5;
+            if (!double.TryParse(split[0], out double time) || !int.TryParse(split[1], out int column))
+                return false;
+
+            return hitObject.StartTime == time
+                   && hitObject.Column == column;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 0c63cf71d8..e9c222b0e7 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
@@ -103,18 +104,39 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new OsuBlueprintContainer(this);
 
+        private static readonly Regex selection_regex = new Regex(@"^\d+(,\d+)*$");
+
         public override string ConvertSelectionToString()
-            => string.Join(ObjectSeparator, selectedHitObjects.Cast<OsuHitObject>().OrderBy(h => h.StartTime).Select(h => (h.IndexInCurrentCombo + 1).ToString()));
+            => string.Join(',', selectedHitObjects.Cast<OsuHitObject>().OrderBy(h => h.StartTime).Select(h => (h.IndexInCurrentCombo + 1).ToString()));
 
-        public override bool HandleHitObjectSelection(HitObject hitObject, string objectInfo)
+        public override void SelectHitObjects(double timestamp, string objectDescription)
         {
-            if (hitObject is not OsuHitObject osuHitObject)
+            if (!selection_regex.IsMatch(objectDescription))
+                return;
+
+            List<OsuHitObject> remainingHitObjects = EditorBeatmap.HitObjects.Cast<OsuHitObject>().Where(h => h.StartTime >= timestamp).ToList();
+            string[] split = objectDescription.Split(',').ToArray();
+
+            for (int i = 0; i < split.Length; i++)
+            {
+                OsuHitObject current = remainingHitObjects.FirstOrDefault(h => shouldBeSelected(h, split[i]));
+
+                if (current == null)
+                    continue;
+
+                EditorBeatmap.SelectedHitObjects.Add(current);
+
+                if (i < split.Length - 1)
+                    remainingHitObjects = remainingHitObjects.Where(h => h != current && h.StartTime >= current.StartTime).ToList();
+            }
+        }
+
+        private bool shouldBeSelected(OsuHitObject hitObject, string objectInfo)
+        {
+            if (!int.TryParse(objectInfo, out int combo) || combo < 1)
                 return false;
 
-            if (!int.TryParse(objectInfo, out int comboValue) || comboValue < 1)
-                return false;
-
-            return osuHitObject.IndexInCurrentCombo + 1 == comboValue;
+            return hitObject.IndexInCurrentCombo + 1 == combo;
         }
 
         private DistanceSnapGrid distanceSnapGrid;
diff --git a/osu.Game/Rulesets/Edit/EditorTimestampParser.cs b/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
index 4e5a696102..7d4247b269 100644
--- a/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
+++ b/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
@@ -2,11 +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 System.Text.RegularExpressions;
-using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -31,43 +29,7 @@ namespace osu.Game.Rulesets.Edit
 
             Debug.Assert(times.Length == 3);
 
-            return (times[0] * 60 + times[1]) * 1_000 + times[2];
-        }
-
-        public static List<HitObject> GetSelectedHitObjects(HitObjectComposer composer, IReadOnlyList<HitObject> editorHitObjects, string objectsGroup, double position)
-        {
-            List<HitObject> hitObjects = editorHitObjects.Where(x => x.StartTime >= position).ToList();
-            List<HitObject> selectedObjects = new List<HitObject>();
-
-            string[] objectsToSelect = objectsGroup.Split(composer.ObjectSeparator).ToArray();
-
-            foreach (string objectInfo in objectsToSelect)
-            {
-                HitObject? current = hitObjects.FirstOrDefault(x => composer.HandleHitObjectSelection(x, objectInfo));
-
-                if (current == null)
-                    continue;
-
-                selectedObjects.Add(current);
-                hitObjects = hitObjects.Where(x => x != current && x.StartTime >= current.StartTime).ToList();
-            }
-
-            // Stable behavior
-            // - always selects the next closest object when `objectsGroup` only has one (combo) item
-            if (objectsToSelect.Length != 1 || objectsGroup.Contains('|'))
-                return selectedObjects;
-
-            HitObject? nextClosest = editorHitObjects.FirstOrDefault(x => x.StartTime >= position);
-            if (nextClosest == null)
-                return selectedObjects;
-
-            if (nextClosest.StartTime <= (selectedObjects.FirstOrDefault()?.StartTime ?? position))
-            {
-                selectedObjects.Clear();
-                selectedObjects.Add(nextClosest);
-            }
-
-            return selectedObjects;
+            return (times[0] * 60 + times[1]) * 1000 + times[2];
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index f6cddcc0d2..52a525e84f 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -529,17 +529,11 @@ namespace osu.Game.Rulesets.Edit
         public virtual string ConvertSelectionToString() => string.Empty;
 
         /// <summary>
-        /// The custom logic that decides whether a HitObject should be selected when clicking an editor timestamp link
+        /// Each ruleset has it's own selection method
         /// </summary>
-        /// <param name="hitObject">The hitObject being checked</param>
-        /// <param name="objectInfo">A single hitObject's information created with <see cref="ConvertSelectionToString"/></param>
-        /// <returns>Whether a HitObject should be selected or not</returns>
-        public virtual bool HandleHitObjectSelection(HitObject hitObject, string objectInfo) => false;
-
-        /// <summary>
-        /// A character that separates the selection in <see cref="ConvertSelectionToString"/>
-        /// </summary>
-        public virtual char ObjectSeparator => ',';
+        /// <param name="timestamp">The given timestamp</param>
+        /// <param name="objectDescription">The selected object information between the brackets</param>
+        public virtual void SelectHitObjects(double timestamp, string objectDescription) { }
 
         #region IPositionSnapProvider
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 58c3ae809c..03d3e3a1f8 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1194,15 +1194,8 @@ namespace osu.Game.Screens.Edit
             if (Mode.Value != EditorScreenMode.Compose)
                 Mode.Value = EditorScreenMode.Compose;
 
-            List<HitObject> selected = EditorTimestampParser.GetSelectedHitObjects(
-                currentScreen.Dependencies.Get<HitObjectComposer>(),
-                editorBeatmap.HitObjects.ToList(),
-                objectsGroup,
-                position
-            );
-
-            if (selected.Any())
-                editorBeatmap.SelectedHitObjects.AddRange(selected);
+            // Let the Ruleset handle selection
+            currentScreen.Dependencies.Get<HitObjectComposer>().SelectHitObjects(position, objectsGroup);
         }
 
         public double SnapTime(double time, double? referenceTime) => editorBeatmap.SnapTime(time, referenceTime);

From 6ddecfd8062d6b1b0d62a6064d7d0b0b2c8d4760 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sat, 11 Nov 2023 14:13:06 +0100
Subject: [PATCH 1514/2296] Update Test cases

---
 .../TestSceneOpenEditorTimestampInMania.cs    |  9 ++----
 .../TestSceneOpenEditorTimestampInOsu.cs      | 32 +++++--------------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs
index 6ec5dcee4c..3c6a9f3b42 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs
@@ -84,17 +84,14 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Test]
         public void TestUnusualSelection()
         {
-            addStepClickLink("00:00:000 (0|1)", "invalid link");
+            addStepClickLink("00:00:000 (0|1)", "wrong offset");
             AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(2_170));
 
             addReset();
-            addStepClickLink("00:00:000 (0)", "std link");
-            AddAssert("snap and select 1", () => checkSnapAndSelectColumn(2_170, new List<(int, int)>
-                { (2_170, 2) })
-            );
+            addStepClickLink("00:00:000 (2)", "std link");
+            AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(2_170));
 
             addReset();
-            // TODO: discuss - this selects the first 2 objects on Stable, do we want that or is this fine?
             addStepClickLink("00:00:000 (1,2)", "std link");
             AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(2_170));
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs
index d69f482d29..93573b5ad8 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs
@@ -71,40 +71,24 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             HitObject firstObject = null!;
 
-            addStepClickLink("00:00:000 (1,2,3)", "invalid offset");
-            AddAssert("snap to next, select 1-2-3", () =>
+            addStepClickLink("00:00:000 (0)", "invalid combo");
+            AddAssert("snap to next, select none", () =>
             {
                 firstObject = EditorBeatmap.HitObjects.First();
-                return checkSnapAndSelectCombo(firstObject.StartTime, 1, 2, 3);
+                return checkSnapAndSelectCombo(firstObject.StartTime);
             });
 
             addReset();
-            addStepClickLink("00:00:956 (2,3,4)", "invalid offset");
+            addStepClickLink("00:00:000 (1)", "wrong offset");
+            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
+
+            addReset();
+            addStepClickLink("00:00:956 (2,3,4)", "wrong offset");
             AddAssert("snap to next, select 2-3-4", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3, 4));
 
-            addReset();
-            addStepClickLink("00:00:000 (0)", "invalid offset");
-            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
-
-            addReset();
-            addStepClickLink("00:00:000 (1)", "invalid offset");
-            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
-
-            addReset();
-            addStepClickLink("00:00:000 (2)", "invalid offset");
-            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
-
-            addReset();
-            addStepClickLink("00:00:000 (2,3)", "invalid offset");
-            AddAssert("snap to 1, select 2-3", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3));
-
             addReset();
             addStepClickLink("00:00:956 (956|1,956|2)", "mania link");
             AddAssert("snap to next, select none", () => checkSnapAndSelectCombo(firstObject.StartTime));
-
-            addReset();
-            addStepClickLink("00:00:000 (0|1)", "mania link");
-            AddAssert("snap to 1, select none", () => checkSnapAndSelectCombo(firstObject.StartTime));
         }
     }
 }

From 54b8244a18ad3e74d40962be20cab996ba63e90d Mon Sep 17 00:00:00 2001
From: cs <cedric.schneider@pmbs.de>
Date: Sat, 11 Nov 2023 15:02:06 +0100
Subject: [PATCH 1515/2296] CI Fixup

---
 .../Sliders/Components/PathControlPointPiece.cs  |  8 ++++----
 .../Components/PathControlPointVisualiser.cs     |  2 +-
 .../Sliders/SliderPlacementBlueprint.cs          |  2 ++
 .../Edit/OsuSliderDrawingSettingsProvider.cs     | 10 ++++------
 .../Visual/Gameplay/TestSceneBezierConverter.cs  |  4 ++--
 .../Visual/Gameplay/TestSceneSliderPath.cs       |  4 ++--
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs     | 11 +++++------
 osu.Game/Rulesets/Objects/BezierConverter.cs     | 12 ++++++------
 .../Objects/Legacy/ConvertHitObjectParser.cs     |  3 ++-
 osu.Game/Rulesets/Objects/SliderPath.cs          |  3 +--
 osu.Game/Rulesets/Objects/Types/PathType.cs      | 16 ++++++++--------
 11 files changed, 37 insertions(+), 38 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 9658e5f6c3..53228cff82 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -261,17 +261,17 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             switch (pathType)
             {
-                case { SplineType: SplineType.Catmull }:
+                case { Type: SplineType.Catmull }:
                     return colours.SeaFoam;
 
-                case { SplineType: SplineType.BSpline, Degree: null }:
+                case { Type: SplineType.BSpline, Degree: null }:
                     return colours.PinkLighter;
 
-                case { SplineType: SplineType.BSpline, Degree: >= 1 }:
+                case { Type: SplineType.BSpline, Degree: >= 1 }:
                     int idx = Math.Clamp(pathType.Degree.Value, 0, 3);
                     return new[] { colours.PinkDarker, colours.PinkDark, colours.Pink, colours.PinkLight }[idx];
 
-                case { SplineType: SplineType.PerfectCurve }:
+                case { Type: SplineType.PerfectCurve }:
                     return colours.PurpleDark;
 
                 default:
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 b5c9016538..4e85835652 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             int indexInSegment = piece.PointsInSegment.IndexOf(piece.ControlPoint);
 
-            if (type.HasValue && type.Value.SplineType == SplineType.PerfectCurve)
+            if (type.HasValue && type.Value.Type == SplineType.PerfectCurve)
             {
                 // Can't always create a circular arc out of 4 or more points,
                 // so we split the segment into one 3-point circular arc segment
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index a5c6ae9465..20f11c3585 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -173,9 +173,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                             setState(SliderPlacementState.Drawing);
                             return true;
                         }
+
                         return false;
                 }
             }
+
             return base.OnDragStart(e);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
index ba2c39e1b5..ae772f53fc 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             Precision = 0.01f
         };
 
-        private BindableInt sliderTolerance = new BindableInt(10)
+        private readonly BindableInt sliderTolerance = new BindableInt(10)
         {
             MinValue = 5,
             MaxValue = 100
@@ -27,8 +27,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private ExpandableSlider<int> toleranceSlider = null!;
 
-        private EditorToolboxGroup? toolboxGroup;
-
         public OsuSliderDrawingSettingsProvider()
         {
             sliderTolerance.BindValueChanged(v =>
@@ -47,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         public void AttachToToolbox(ExpandingToolboxContainer toolboxContainer)
         {
-            toolboxContainer.Add(toolboxGroup = new EditorToolboxGroup("drawing")
+            toolboxContainer.Add(new EditorToolboxGroup("drawing")
             {
                 Children = new Drawable[]
                 {
@@ -60,8 +58,8 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             sliderTolerance.BindValueChanged(e =>
             {
-                toleranceSlider.ContractedLabelText = $"Tolerance: {e.NewValue:N0}";
-                toleranceSlider.ExpandedLabelText = $"Tolerance: {e.NewValue:N0}";
+                toleranceSlider.ContractedLabelText = $"C. P. S.: {e.NewValue:N0}";
+                toleranceSlider.ExpandedLabelText = $"Control Point Spacing: {e.NewValue:N0}";
             }, true);
         }
     }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs
index 5eb82ccbdc..e2333011c7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [TestCase(SplineType.Catmull, null)]
         [TestCase(SplineType.PerfectCurve, null)]
         public void TestSingleSegment(SplineType splineType, int? degree)
-            => AddStep("create path", () => path.ControlPoints.AddRange(createSegment(new PathType { SplineType = splineType, Degree = degree }, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
+            => AddStep("create path", () => path.ControlPoints.AddRange(createSegment(new PathType { Type = splineType, Degree = degree }, Vector2.Zero, new Vector2(0, 100), new Vector2(100))));
 
         [TestCase(SplineType.Linear, null)]
         [TestCase(SplineType.BSpline, null)]
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("create path", () =>
             {
                 path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero));
-                path.ControlPoints.AddRange(createSegment(new PathType { SplineType = splineType, Degree = degree }, new Vector2(0, 100), new Vector2(100), Vector2.Zero));
+                path.ControlPoints.AddRange(createSegment(new PathType { Type = splineType, Degree = degree }, new Vector2(0, 100), new Vector2(100), Vector2.Zero));
             });
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
index e4d99f6741..d44af45fe4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [TestCase(SplineType.PerfectCurve, null)]
         public void TestSingleSegment(SplineType splineType, int? degree)
             => AddStep("create path", () => path.ControlPoints.AddRange(createSegment(
-                new PathType { SplineType = splineType, Degree = degree },
+                new PathType { Type = splineType, Degree = degree },
                 Vector2.Zero,
                 new Vector2(0, 100),
                 new Vector2(100),
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("create path", () =>
             {
                 path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero));
-                path.ControlPoints.AddRange(createSegment(new PathType { SplineType = splineType, Degree = degree }, new Vector2(0, 100), new Vector2(100), Vector2.Zero));
+                path.ControlPoints.AddRange(createSegment(new PathType { Type = splineType, Degree = degree }, new Vector2(0, 100), new Vector2(100), Vector2.Zero));
             });
         }
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 7029f61459..ff446206ac 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -456,23 +455,23 @@ namespace osu.Game.Beatmaps.Formats
                     {
                         switch (point.Type)
                         {
-                            case { SplineType: SplineType.BSpline, Degree: > 0 }:
+                            case { Type: SplineType.BSpline, Degree: > 0 }:
                                 writer.Write($"B{point.Type.Value.Degree}|");
                                 break;
 
-                            case { SplineType: SplineType.BSpline, Degree: <= 0 }:
+                            case { Type: SplineType.BSpline, Degree: <= 0 }:
                                 writer.Write("B|");
                                 break;
 
-                            case { SplineType: SplineType.Catmull }:
+                            case { Type: SplineType.Catmull }:
                                 writer.Write("C|");
                                 break;
 
-                            case { SplineType: SplineType.PerfectCurve }:
+                            case { Type: SplineType.PerfectCurve }:
                                 writer.Write("P|");
                                 break;
 
-                            case { SplineType: SplineType.Linear }:
+                            case { Type: SplineType.Linear }:
                                 writer.Write("L|");
                                 break;
                         }
diff --git a/osu.Game/Rulesets/Objects/BezierConverter.cs b/osu.Game/Rulesets/Objects/BezierConverter.cs
index 74fbe7d8f9..ed86fc10e0 100644
--- a/osu.Game/Rulesets/Objects/BezierConverter.cs
+++ b/osu.Game/Rulesets/Objects/BezierConverter.cs
@@ -72,15 +72,15 @@ namespace osu.Game.Rulesets.Objects
 
                 switch (segmentType)
                 {
-                    case { SplineType: SplineType.Catmull }:
+                    case { Type: SplineType.Catmull }:
                         result.AddRange(from segment in ConvertCatmullToBezierAnchors(segmentVertices) from v in segment select v + position);
                         break;
 
-                    case { SplineType: SplineType.Linear }:
+                    case { Type: SplineType.Linear }:
                         result.AddRange(from segment in ConvertLinearToBezierAnchors(segmentVertices) from v in segment select v + position);
                         break;
 
-                    case { SplineType: SplineType.PerfectCurve }:
+                    case { Type: SplineType.PerfectCurve }:
                         result.AddRange(ConvertCircleToBezierAnchors(segmentVertices).Select(v => v + position));
                         break;
 
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Objects
 
                 switch (segmentType)
                 {
-                    case { SplineType: SplineType.Catmull }:
+                    case { Type: SplineType.Catmull }:
                         foreach (var segment in ConvertCatmullToBezierAnchors(segmentVertices))
                         {
                             for (int j = 0; j < segment.Length - 1; j++)
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Objects
 
                         break;
 
-                    case { SplineType: SplineType.Linear }:
+                    case { Type: SplineType.Linear }:
                         foreach (var segment in ConvertLinearToBezierAnchors(segmentVertices))
                         {
                             for (int j = 0; j < segment.Length - 1; j++)
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.Objects
 
                         break;
 
-                    case { SplineType: SplineType.PerfectCurve }:
+                    case { Type: SplineType.PerfectCurve }:
                         var circleResult = ConvertCircleToBezierAnchors(segmentVertices);
 
                         for (int j = 0; j < circleResult.Length - 1; j++)
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 30f4c092d9..6a13a897c4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -228,7 +228,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
                 case 'B':
                     if (input.Length > 1 && int.TryParse(input.Substring(1), out int degree) && degree > 0)
-                        return new PathType { SplineType = SplineType.BSpline, Degree = degree };
+                        return new PathType { Type = SplineType.BSpline, Degree = degree };
+
                     return new PathType(SplineType.BSpline);
 
                 case 'L':
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 75f1ab868d..e9a192669f 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.Toolkit.HighPerformance;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
@@ -289,7 +288,7 @@ namespace osu.Game.Rulesets.Objects
 
         private List<Vector2> calculateSubPath(ReadOnlySpan<Vector2> subControlPoints, PathType type)
         {
-            switch (type.SplineType)
+            switch (type.Type)
             {
                 case SplineType.Linear:
                     return PathApproximator.LinearToPiecewiseLinear(subControlPoints);
diff --git a/osu.Game/Rulesets/Objects/Types/PathType.cs b/osu.Game/Rulesets/Objects/Types/PathType.cs
index 41472fd8b5..a6e8e173d4 100644
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Objects.Types
         PerfectCurve
     }
 
-    public struct PathType
+    public readonly struct PathType
     {
         public static readonly PathType CATMULL = new PathType(SplineType.Catmull);
         public static readonly PathType BEZIER = new PathType(SplineType.BSpline);
@@ -24,36 +24,36 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// The type of the spline that should be used to interpret the control points of the path.
         /// </summary>
-        public SplineType SplineType { get; init; }
+        public SplineType Type { get; init; }
 
         /// <summary>
-        /// The degree of a BSpline. Unused if <see cref="SplineType"/> is not <see cref="SplineType.BSpline"/>.
+        /// The degree of a BSpline. Unused if <see cref="Type"/> is not <see cref="SplineType.BSpline"/>.
         /// Null means the degree is equal to the number of control points, 1 means linear, 2 means quadratic, etc.
         /// </summary>
         public int? Degree { get; init; }
 
         public PathType(SplineType splineType)
         {
-            SplineType = splineType;
+            Type = splineType;
             Degree = null;
         }
 
         public override int GetHashCode()
-            => HashCode.Combine(SplineType, Degree);
+            => HashCode.Combine(Type, Degree);
 
         public override bool Equals(object? obj)
             => obj is PathType pathType && this == pathType;
 
         public static bool operator ==(PathType a, PathType b)
-            => a.SplineType == b.SplineType && a.Degree == b.Degree;
+            => a.Type == b.Type && a.Degree == b.Degree;
 
         public static bool operator !=(PathType a, PathType b)
-            => a.SplineType != b.SplineType || a.Degree != b.Degree;
+            => a.Type != b.Type || a.Degree != b.Degree;
 
         public static PathType BSpline(int degree)
         {
             Debug.Assert(degree > 0);
-            return new PathType { SplineType = SplineType.BSpline, Degree = degree };
+            return new PathType { Type = SplineType.BSpline, Degree = degree };
         }
     }
 }

From c367697559dc8981ce601e44afa45a3ce46a6dc9 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sat, 11 Nov 2023 16:14:26 +0100
Subject: [PATCH 1516/2296] Changed TIME_REGEX to accept everything in the
 parentheses - changed osu-web link to the current value

---
 osu.Game/Rulesets/Edit/EditorTimestampParser.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/EditorTimestampParser.cs b/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
index 7d4247b269..b1488d298f 100644
--- a/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
+++ b/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
@@ -11,8 +11,8 @@ namespace osu.Game.Rulesets.Edit
     public static class EditorTimestampParser
     {
         // 00:00:000 (1,2,3) - test
-        // regex from https://github.com/ppy/osu-web/blob/651a9bac2b60d031edd7e33b8073a469bf11edaa/resources/assets/coffee/_classes/beatmap-discussion-helper.coffee#L10
-        public static readonly Regex TIME_REGEX = new Regex(@"\b(((\d{2,}):([0-5]\d)[:.](\d{3}))(\s\((?:\d+[,|])*\d+\))?)");
+        // osu-web regex: https://github.com/ppy/osu-web/blob/3b1698639244cfdaf0b41c68bfd651ea729ec2e3/resources/js/utils/beatmapset-discussion-helper.ts#L78
+        public static readonly Regex TIME_REGEX = new Regex(@"\b(((\d{2,}):([0-5]\d)[:.](\d{3}))(\s\([^)]+\))?)");
 
         public static string[] GetRegexGroups(string timestamp)
         {

From 3e8c89e282c74874a8c6885228910d70b64d2e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 12 Nov 2023 07:42:41 +0900
Subject: [PATCH 1517/2296] Fix one more reference to removed setting

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index e9092bba1b..15a7b48323 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
-        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay { Scale = new Vector2(0.6f), BarLength = { Value = 1f } };
+        protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay { Scale = new Vector2(0.6f), Width = 1f };
         protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay { Scale = new Vector2(0.6f) };
         protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay { Scale = new Vector2(0.6f) };
 

From 4df1eb1b378cc4d5641ef4160b299f226e93dddf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Nov 2023 16:15:33 +0900
Subject: [PATCH 1518/2296] Refactor logic and tooltip formatting

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  6 +-
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 60 +++++++++----------
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 7a9250a60e..382ac29b41 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -238,14 +238,12 @@ namespace osu.Game.Rulesets.Catch
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            double preempt = adjustedDifficulty.ApproachRate < 5 ?
-                (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) :
-                (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
+            double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
+
             preempt /= rate;
             adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
 
             return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
         }
-
     }
 }
diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 0a6f22d74a..5531ed5461 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -59,6 +59,8 @@ namespace osu.Game.Overlays.Mods
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
         private BeatmapDifficulty? originalDifficulty;
+        private BeatmapDifficulty? adjustedDifficulty;
+
         private bool haveRateChangedValues;
 
         private const float transition_duration = 250;
@@ -171,17 +173,15 @@ namespace osu.Game.Overlays.Mods
 
             bpmDisplay.Current.Value = BeatmapInfo.Value.BPM * rate;
 
-            var adjustedDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
+            originalDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
 
             foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
-                mod.ApplyToDifficulty(adjustedDifficulty);
-
-            originalDifficulty = adjustedDifficulty;
+                mod.ApplyToDifficulty(originalDifficulty);
 
             Ruleset ruleset = gameRuleset.Value.CreateInstance();
-            adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(adjustedDifficulty, rate);
+            adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(originalDifficulty, rate);
 
-            haveRateChangedValues = isDifferentArOd(originalDifficulty, adjustedDifficulty);
+            haveRateChangedValues = hasRateAdjustedProperties(originalDifficulty, adjustedDifficulty);
 
             approachRateDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
             overallDifficultyDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
@@ -192,22 +192,34 @@ namespace osu.Game.Overlays.Mods
             overallDifficultyDisplay.Current.Value = adjustedDifficulty.OverallDifficulty;
         });
 
-        private bool isDifferentArOd(BeatmapDifficulty? a, BeatmapDifficulty? b)
-        {
-            if (a == null && b == null) return false;
-            if (a == null || b == null) return true;
-
-            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return true;
-            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return true;
-
-            return false;
-        }
-
         private void updateCollapsedState()
         {
             RightContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
         }
 
+        public LocalisableString TooltipText
+        {
+            get
+            {
+                if (haveRateChangedValues)
+                {
+                    return $"One or more values are being adjusted by mods that change speed." +
+                           $" (AR {originalDifficulty?.ApproachRate ?? 0}→{adjustedDifficulty?.ApproachRate ?? 0}, " +
+                           $"OD {originalDifficulty?.OverallDifficulty ?? 0}→{adjustedDifficulty?.OverallDifficulty ?? 0})";
+                }
+
+                return string.Empty;
+            }
+        }
+
+        private static bool hasRateAdjustedProperties(BeatmapDifficulty a, BeatmapDifficulty b)
+        {
+            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate)) return true;
+            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty)) return true;
+
+            return false;
+        }
+
         private partial class BPMDisplay : RollingCounter<double>
         {
             protected override double RollingDuration => 500;
@@ -222,19 +234,5 @@ namespace osu.Game.Overlays.Mods
                 UseFullGlyphHeight = false,
             };
         }
-
-        public LocalisableString TooltipText
-        {
-            get
-            {
-                if (haveRateChangedValues)
-                {
-                    return LocalisableString.Format("Values are changed by mods that change speed.\n" +
-                                                    "Original values: AR = {0}, OD = {1}", originalDifficulty?.ApproachRate ?? 0, originalDifficulty?.OverallDifficulty ?? 0);
-                }
-
-                return "";
-            }
-        }
     }
 }

From a04f9aaef7870d8ee94b85598aaca1d25dc22840 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Nov 2023 16:20:13 +0900
Subject: [PATCH 1519/2296] Apply various inspections

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 4 ++--
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 6 ++----
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 382ac29b41..7327fb4513 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -238,12 +238,12 @@ namespace osu.Game.Rulesets.Catch
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
+            double preempt = adjustedDifficulty.ApproachRate < 6 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
 
             preempt /= rate;
             adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
 
-            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+            return adjustedDifficulty;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 2d12e9ebc5..f4cf9409e8 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -334,9 +334,7 @@ namespace osu.Game.Rulesets.Osu
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
 
-            double preempt = adjustedDifficulty.ApproachRate < 5 ?
-                (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) :
-                (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
+            double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
             preempt /= rate;
             adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
 
@@ -344,7 +342,7 @@ namespace osu.Game.Rulesets.Osu
             hitwindow /= rate;
             adjustedDifficulty.OverallDifficulty = (float)(80.0 - hitwindow) / 6;
 
-            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+            return adjustedDifficulty;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index aaf32d35f2..88d0087622 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -273,7 +273,7 @@ namespace osu.Game.Rulesets.Taiko
             hitwindow /= rate;
             adjustedDifficulty.OverallDifficulty = (float)(5 * (35 - hitwindow) / 15 + 5);
 
-            return adjustedDifficulty ?? (BeatmapDifficulty)baseDifficulty;
+            return adjustedDifficulty;
         }
     }
 }

From 798e677c092a4ad02e0fe0a81163c14b57ff90d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Nov 2023 15:12:04 +0900
Subject: [PATCH 1520/2296] Refactor `KeyCounterDisplay` to use autosize

A previous attempt at this was unsuccessful due to a partially
off-screen elements not getting the correct size early enough (see
https://github.com/ppy/osu/issues/14793). This can be accounted for by
setting `AlwaysPresent` when visibility is expected.

This fixes [test failures](https://github.com/ppy/osu/actions/runs/6838444698/job/18595535795)
due to the newly added `Width` / `Height` being persisted with
floating-point errors (by not persisting the values in the first place,
via `AutoSize.Both`).
---
 osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs | 12 ------------
 .../Play/HUD/DefaultKeyCounterDisplay.cs        | 14 --------------
 osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs  | 17 ++++++++++++++++-
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs b/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs
index 984c2a7287..44b90fcad0 100644
--- a/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs
@@ -10,8 +10,6 @@ namespace osu.Game.Screens.Play
 {
     public partial class ArgonKeyCounterDisplay : KeyCounterDisplay
     {
-        private const int duration = 100;
-
         protected override FillFlowContainer<KeyCounter> KeyFlow { get; }
 
         public ArgonKeyCounterDisplay()
@@ -25,16 +23,6 @@ namespace osu.Game.Screens.Play
             };
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            Size = KeyFlow.Size;
-        }
-
         protected override KeyCounter CreateCounter(InputTrigger trigger) => new ArgonKeyCounter(trigger);
-
-        protected override void UpdateVisibility()
-            => KeyFlow.FadeTo(AlwaysVisible.Value || ConfigVisibility.Value ? 1 : 0, duration);
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs
index e459574243..e0f96d32bc 100644
--- a/osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs
@@ -10,7 +10,6 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class DefaultKeyCounterDisplay : KeyCounterDisplay
     {
-        private const int duration = 100;
         private const double key_fade_time = 80;
 
         protected override FillFlowContainer<KeyCounter> KeyFlow { get; }
@@ -25,15 +24,6 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            // Don't use autosize as it will shrink to zero when KeyFlow is hidden.
-            // In turn this can cause the display to be masked off screen and never become visible again.
-            Size = KeyFlow.Size;
-        }
-
         protected override KeyCounter CreateCounter(InputTrigger trigger) => new DefaultKeyCounter(trigger)
         {
             FadeTime = key_fade_time,
@@ -41,10 +31,6 @@ namespace osu.Game.Screens.Play.HUD
             KeyUpTextColor = KeyUpTextColor,
         };
 
-        protected override void UpdateVisibility() =>
-            // Isolate changing visibility of the key counters from fading this component.
-            KeyFlow.FadeTo(AlwaysVisible.Value || ConfigVisibility.Value ? 1 : 0, duration);
-
         private Color4 keyDownTextColor = Color4.DarkGray;
 
         public Color4 KeyDownTextColor
diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
index e7e866932e..0a5d6b763e 100644
--- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -4,6 +4,7 @@
 using System.Collections.Specialized;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.UI;
@@ -31,13 +32,27 @@ namespace osu.Game.Screens.Play.HUD
         [Resolved]
         private InputCountController controller { get; set; } = null!;
 
-        protected abstract void UpdateVisibility();
+        private const int duration = 100;
+
+        protected void UpdateVisibility()
+        {
+            bool visible = AlwaysVisible.Value || ConfigVisibility.Value;
+
+            // Isolate changing visibility of the key counters from fading this component.
+            KeyFlow.FadeTo(visible ? 1 : 0, duration);
+
+            // Ensure a valid size is immediately obtained even if partially off-screen
+            // See https://github.com/ppy/osu/issues/14793.
+            KeyFlow.AlwaysPresent = visible;
+        }
 
         protected abstract KeyCounter CreateCounter(InputTrigger trigger);
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, DrawableRuleset? drawableRuleset)
         {
+            AutoSizeAxes = Axes.Both;
+
             config.BindWith(OsuSetting.KeyOverlay, ConfigVisibility);
 
             if (drawableRuleset != null)

From 31feeb5ddc616bb437c052b2b1680070c9d72563 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Nov 2023 17:21:17 +0900
Subject: [PATCH 1521/2296] Disable new rider EAP inspection in test class

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

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
index 93005271a9..d0a45856b2 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
@@ -203,6 +203,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
                 public IBeatmap Beatmap { get; }
 
+                // ReSharper disable once NotNullOrRequiredMemberIsNotInitialized
                 public TestBeatmapConverter(IBeatmap beatmap)
                 {
                     Beatmap = beatmap;

From 469b9e2546a0eea247f19bdc9e793170fe7c7b05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 12 Nov 2023 17:28:15 +0900
Subject: [PATCH 1522/2296] Increase size and adjust positioning of max combo
 display in argon skin

---
 osu.Game/Skinning/ArgonSkin.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 715d5e4600..637467c748 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -182,15 +182,14 @@ namespace osu.Game.Skinning
                                     if (songProgress != null)
                                     {
                                         const float padding = 10;
+                                        // Hard to find this at runtime, so taken from the most expanded state during replay.
+                                        const float song_progress_offset_height = 36 + padding;
 
                                         songProgress.Position = new Vector2(0, -padding);
                                         songProgress.Scale = new Vector2(0.9f, 1);
 
                                         if (keyCounter != null && hitError != null)
                                         {
-                                            // Hard to find this at runtime, so taken from the most expanded state during replay.
-                                            const float song_progress_offset_height = 36 + padding;
-
                                             keyCounter.Anchor = Anchor.BottomRight;
                                             keyCounter.Origin = Anchor.BottomRight;
                                             keyCounter.Position = new Vector2(-(hitError.Width + padding), -(padding * 2 + song_progress_offset_height));
@@ -200,7 +199,7 @@ namespace osu.Game.Skinning
                                         {
                                             combo.Anchor = Anchor.BottomLeft;
                                             combo.Origin = Anchor.BottomLeft;
-                                            combo.Position = new Vector2(hitError.Width + padding, -50);
+                                            combo.Position = new Vector2((hitError.Width + padding), -(padding * 2 + song_progress_offset_height));
                                         }
                                     }
                                 }
@@ -221,7 +220,10 @@ namespace osu.Game.Skinning
                                     new ArgonHealthDisplay(),
                                     new BoxElement(),
                                     new ArgonAccuracyCounter(),
-                                    new ArgonComboCounter(),
+                                    new ArgonComboCounter
+                                    {
+                                        Scale = new Vector2(1.3f)
+                                    },
                                     new BarHitErrorMeter(),
                                     new BarHitErrorMeter(),
                                     new ArgonSongProgress(),

From 4e7c40f1d7392376d68989ad5fa26e53430c55c6 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sun, 12 Nov 2023 14:58:46 +0100
Subject: [PATCH 1523/2296] Do Split and Parse before checking HitObjects

---
 .../Edit/ManiaHitObjectComposer.cs            | 28 ++++++++-----------
 .../Edit/OsuHitObjectComposer.cs              | 19 +++++--------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index b04d3f895d..d580f2d025 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -60,33 +60,27 @@ namespace osu.Game.Rulesets.Mania.Edit
                 return;
 
             List<ManiaHitObject> remainingHitObjects = EditorBeatmap.HitObjects.Cast<ManiaHitObject>().Where(h => h.StartTime >= timestamp).ToList();
-            string[] split = objectDescription.Split(',').ToArray();
+            string[] splitDescription = objectDescription.Split(',').ToArray();
 
-            for (int i = 0; i < split.Length; i++)
+            for (int i = 0; i < splitDescription.Length; i++)
             {
-                ManiaHitObject current = remainingHitObjects.FirstOrDefault(h => shouldBeSelected(h, split[i]));
+                string[] split = splitDescription[i].Split('|').ToArray();
+                if (split.Length != 2)
+                    continue;
+
+                if (!double.TryParse(split[0], out double time) || !int.TryParse(split[1], out int column))
+                    continue;
+
+                ManiaHitObject current = remainingHitObjects.FirstOrDefault(h => h.StartTime == time && h.Column == column);
 
                 if (current == null)
                     continue;
 
                 EditorBeatmap.SelectedHitObjects.Add(current);
 
-                if (i < split.Length - 1)
+                if (i < splitDescription.Length - 1)
                     remainingHitObjects = remainingHitObjects.Where(h => h != current && h.StartTime >= current.StartTime).ToList();
             }
         }
-
-        private bool shouldBeSelected(ManiaHitObject hitObject, string objectInfo)
-        {
-            string[] split = objectInfo.Split('|').ToArray();
-            if (split.Length != 2)
-                return false;
-
-            if (!double.TryParse(split[0], out double time) || !int.TryParse(split[1], out int column))
-                return false;
-
-            return hitObject.StartTime == time
-                   && hitObject.Column == column;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index e9c222b0e7..1dfa02fe83 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -115,30 +115,25 @@ namespace osu.Game.Rulesets.Osu.Edit
                 return;
 
             List<OsuHitObject> remainingHitObjects = EditorBeatmap.HitObjects.Cast<OsuHitObject>().Where(h => h.StartTime >= timestamp).ToList();
-            string[] split = objectDescription.Split(',').ToArray();
+            string[] splitDescription = objectDescription.Split(',').ToArray();
 
-            for (int i = 0; i < split.Length; i++)
+            for (int i = 0; i < splitDescription.Length; i++)
             {
-                OsuHitObject current = remainingHitObjects.FirstOrDefault(h => shouldBeSelected(h, split[i]));
+                if (!int.TryParse(splitDescription[i], out int combo) || combo < 1)
+                    continue;
+
+                OsuHitObject current = remainingHitObjects.FirstOrDefault(h => h.IndexInCurrentCombo + 1 == combo);
 
                 if (current == null)
                     continue;
 
                 EditorBeatmap.SelectedHitObjects.Add(current);
 
-                if (i < split.Length - 1)
+                if (i < splitDescription.Length - 1)
                     remainingHitObjects = remainingHitObjects.Where(h => h != current && h.StartTime >= current.StartTime).ToList();
             }
         }
 
-        private bool shouldBeSelected(OsuHitObject hitObject, string objectInfo)
-        {
-            if (!int.TryParse(objectInfo, out int combo) || combo < 1)
-                return false;
-
-            return hitObject.IndexInCurrentCombo + 1 == combo;
-        }
-
         private DistanceSnapGrid distanceSnapGrid;
         private Container distanceSnapGridContainer;
 

From fab6fc9adb633d82d88afe4c76b1313946032ab4 Mon Sep 17 00:00:00 2001
From: ratinfx <ratina0@gmail.com>
Date: Sun, 12 Nov 2023 15:09:15 +0100
Subject: [PATCH 1524/2296] Updated comments, renamed method

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 1 +
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs     | 1 +
 osu.Game/OsuGame.cs                                    | 4 ++--
 osu.Game/Rulesets/Edit/EditorTimestampParser.cs        | 6 ++++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index d580f2d025..92ecea812c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -49,6 +49,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             new HoldNoteCompositionTool()
         };
 
+        // 123|0,456|1,789|2 ...
         private static readonly Regex selection_regex = new Regex(@"^\d+\|\d+(,\d+\|\d+)*$");
 
         public override string ConvertSelectionToString()
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 1dfa02fe83..2afbd83ce5 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -104,6 +104,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new OsuBlueprintContainer(this);
 
+        // 1,2,3,4 ...
         private static readonly Regex selection_regex = new Regex(@"^\d+(,\d+)*$");
 
         public override string ConvertSelectionToString()
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index cde8ee1457..4e37481ba7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -434,7 +434,7 @@ namespace osu.Game
                     break;
 
                 case LinkAction.OpenEditorTimestamp:
-                    SeekToTimestamp(argString);
+                    HandleTimestamp(argString);
                     break;
 
                 case LinkAction.JoinMultiplayerMatch:
@@ -558,7 +558,7 @@ namespace osu.Game
         /// Seek to a given timestamp in the Editor and select relevant HitObjects if needed
         /// </summary>
         /// <param name="timestamp">The timestamp and the selected objects</param>
-        public void SeekToTimestamp(string timestamp)
+        public void HandleTimestamp(string timestamp)
         {
             if (ScreenStack.CurrentScreen is not Editor editor)
             {
diff --git a/osu.Game/Rulesets/Edit/EditorTimestampParser.cs b/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
index b1488d298f..e36822cc63 100644
--- a/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
+++ b/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
@@ -10,16 +10,18 @@ namespace osu.Game.Rulesets.Edit
 {
     public static class EditorTimestampParser
     {
-        // 00:00:000 (1,2,3) - test
-        // osu-web regex: https://github.com/ppy/osu-web/blob/3b1698639244cfdaf0b41c68bfd651ea729ec2e3/resources/js/utils/beatmapset-discussion-helper.ts#L78
+        // 00:00:000 (...) - test
+        // original osu-web regex: https://github.com/ppy/osu-web/blob/3b1698639244cfdaf0b41c68bfd651ea729ec2e3/resources/js/utils/beatmapset-discussion-helper.ts#L78
         public static readonly Regex TIME_REGEX = new Regex(@"\b(((\d{2,}):([0-5]\d)[:.](\d{3}))(\s\([^)]+\))?)");
 
         public static string[] GetRegexGroups(string timestamp)
         {
             Match match = TIME_REGEX.Match(timestamp);
+
             string[] result = match.Success
                 ? match.Groups.Values.Where(x => x is not Match && !x.Value.Contains(':')).Select(x => x.Value).ToArray()
                 : Array.Empty<string>();
+
             return result;
         }
 

From 26d493986c318e2a390ecf02af10785f5ee760f1 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 12 Nov 2023 18:05:18 +0200
Subject: [PATCH 1525/2296] Fixed precision and updated AdvancedStats

---
 .../Overlays/Mods/BeatmapAttributesDisplay.cs |  4 +-
 .../Screens/Select/Details/AdvancedStats.cs   | 48 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 5531ed5461..bf39666f83 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -204,8 +204,8 @@ namespace osu.Game.Overlays.Mods
                 if (haveRateChangedValues)
                 {
                     return $"One or more values are being adjusted by mods that change speed." +
-                           $" (AR {originalDifficulty?.ApproachRate ?? 0}→{adjustedDifficulty?.ApproachRate ?? 0}, " +
-                           $"OD {originalDifficulty?.OverallDifficulty ?? 0}→{adjustedDifficulty?.OverallDifficulty ?? 0})";
+                           $" (AR {originalDifficulty?.ApproachRate ?? 0}→{(adjustedDifficulty?.ApproachRate ?? 0):0.0#}, " +
+                           $"OD {originalDifficulty?.OverallDifficulty ?? 0}→{(adjustedDifficulty?.OverallDifficulty ?? 0):0.0#})";
                 }
 
                 return string.Empty;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index f84422ae65..25c18f7328 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Screens.Select.Details
         private readonly StatisticRow starDifficulty;
 
         private BeatmapDifficulty originalDifficulty;
+        private BeatmapDifficulty adjustedDifficulty;
         private bool haveRateChangedValues;
 
         private IBeatmapInfo beatmapInfo;
@@ -120,24 +121,25 @@ namespace osu.Game.Screens.Select.Details
         private void updateStatistics()
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
-            BeatmapDifficulty adjustedDifficulty = null;
 
             if (baseDifficulty != null)
             {
-                adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
+                originalDifficulty = new BeatmapDifficulty(baseDifficulty);
 
                 foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
-                    mod.ApplyToDifficulty(adjustedDifficulty);
+                    mod.ApplyToDifficulty(originalDifficulty);
 
-                originalDifficulty = adjustedDifficulty;
+                if (gameRuleset != null)
+                {
+                    Ruleset ruleset = gameRuleset.Value.CreateInstance();
 
-                Ruleset ruleset = gameRuleset.Value.CreateInstance();
-                double rate = 1;
-                foreach (var mod in mods.Value.OfType<IApplicableToRate>())
-                    rate = mod.ApplyToRate(0, rate);
-                adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(adjustedDifficulty, rate);
+                    double rate = 1;
+                    foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                        rate = mod.ApplyToRate(0, rate);
 
-                haveRateChangedValues = isDifferentArOd(originalDifficulty, adjustedDifficulty);
+                    adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(originalDifficulty, rate);
+                    haveRateChangedValues = hasRateAdjustedProperties(originalDifficulty, adjustedDifficulty);
+                }
             }
 
             switch (BeatmapInfo?.Ruleset.OnlineID)
@@ -202,31 +204,29 @@ namespace osu.Game.Screens.Select.Details
             starDifficultyCancellationSource?.Cancel();
         }
 
-        private bool isDifferentArOd(BeatmapDifficulty a, BeatmapDifficulty b)
-        {
-            if (a == null && b == null) return false;
-            if (a == null || b == null) return true;
-
-            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate, 0.01)) return true;
-            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty, 0.01)) return true;
-
-            return false;
-        }
-
         public LocalisableString TooltipText
         {
             get
             {
                 if (haveRateChangedValues)
                 {
-                    return LocalisableString.Format("Values are changed by mods that change speed.\n" +
-                                                    "Original values: AR = {0}, OD = {1}", originalDifficulty?.ApproachRate ?? 0, originalDifficulty?.OverallDifficulty ?? 0);
+                    return $"One or more values are being adjusted by mods that change speed." +
+                           $" (AR {originalDifficulty?.ApproachRate ?? 0}→{(adjustedDifficulty?.ApproachRate ?? 0):0.0#}, " +
+                           $"OD {originalDifficulty?.OverallDifficulty ?? 0}→{(adjustedDifficulty?.OverallDifficulty ?? 0):0.0#})";
                 }
 
-                return "";
+                return string.Empty;
             }
         }
 
+        private static bool hasRateAdjustedProperties(BeatmapDifficulty a, BeatmapDifficulty b)
+        {
+            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate)) return true;
+            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty)) return true;
+
+            return false;
+        }
+
         public partial class StatisticRow : Container, IHasAccentColour
         {
             private const float value_width = 25;

From d123ba5bcef07e6893cb8c2d633e5c35b987bccf Mon Sep 17 00:00:00 2001
From: Poyo <poyoarya@gmail.com>
Date: Sun, 12 Nov 2023 11:13:38 -0800
Subject: [PATCH 1526/2296] Fix broken tests

---
 .../NonVisual/Ranking/UnstableRateTest.cs     |  8 +++---
 .../Gameplay/TestSceneUnstableRateCounter.cs  |  4 ++-
 ...estSceneHitEventTimingDistributionGraph.cs | 28 +++++++++----------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs b/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
index 27c8270f0f..bde3c37af7 100644
--- a/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
+++ b/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.NonVisual.Ranking
         public void TestDistributedHits()
         {
             var events = Enumerable.Range(-5, 11)
-                                   .Select(t => new HitEvent(t - 5, HitResult.Great, new HitObject(), null, null));
+                                   .Select(t => new HitEvent(t - 5, 1.0, HitResult.Great, new HitObject(), null, null));
 
             var unstableRate = new UnstableRate(events);
 
@@ -33,9 +33,9 @@ namespace osu.Game.Tests.NonVisual.Ranking
         {
             var events = new[]
             {
-                new HitEvent(-100, HitResult.Miss, new HitObject(), null, null),
-                new HitEvent(0, HitResult.Great, new HitObject(), null, null),
-                new HitEvent(200, HitResult.Meh, new HitObject { HitWindows = HitWindows.Empty }, null, null),
+                new HitEvent(-100, 1.0, HitResult.Miss, new HitObject(), null, null),
+                new HitEvent(0, 1.0, HitResult.Great, new HitObject(), null, null),
+                new HitEvent(200, 1.0, HitResult.Meh, new HitObject { HitWindows = HitWindows.Empty }, null, null),
             };
 
             var unstableRate = new UnstableRate(events);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneUnstableRateCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneUnstableRateCounter.cs
index d0e516ed39..f6c819b329 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneUnstableRateCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneUnstableRateCounter.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 scoreProcessor.RevertResult(
                     new JudgementResult(new HitCircle { HitWindows = hitWindows }, new Judgement())
                     {
+                        GameplayRate = 1.0,
                         TimeOffset = 25,
                         Type = HitResult.Perfect,
                     });
@@ -92,7 +93,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
-        private void applyJudgement(double offsetMs, bool alt)
+        private void applyJudgement(double offsetMs, bool alt, double gameplayRate = 1.0)
         {
             double placement = offsetMs;
 
@@ -105,6 +106,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             scoreProcessor.ApplyResult(new JudgementResult(new HitCircle { HitWindows = hitWindows }, new Judgement())
             {
                 TimeOffset = placement,
+                GameplayRate = gameplayRate,
                 Type = HitResult.Perfect,
             });
         }
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index a40cb41e2c..325a535731 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestAroundCentre()
         {
-            createTest(Enumerable.Range(-150, 300).Select(i => new HitEvent(i / 50f, HitResult.Perfect, placeholder_object, placeholder_object, null)).ToList());
+            createTest(Enumerable.Range(-150, 300).Select(i => new HitEvent(i / 50f, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null)).ToList());
         }
 
         [Test]
@@ -57,12 +57,12 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             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),
+                new HitEvent(-7, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
+                new HitEvent(-6, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
+                new HitEvent(-5, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
+                new HitEvent(5, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
+                new HitEvent(6, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
+                new HitEvent(7, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
             });
         }
 
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Ranking
                     : offset > 16 ? HitResult.Good
                     : offset > 8 ? HitResult.Great
                     : HitResult.Perfect;
-                return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
+                return new HitEvent(h.TimeOffset, 1.0, result, placeholder_object, placeholder_object, null);
             }).ToList());
         }
 
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Ranking
                     : offset > 8 ? HitResult.Great
                     : HitResult.Perfect;
 
-                return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
+                return new HitEvent(h.TimeOffset, 1.0, result, placeholder_object, placeholder_object, null);
             });
             var narrow = CreateDistributedHitEvents(0, 50).Select(h =>
             {
@@ -106,7 +106,7 @@ namespace osu.Game.Tests.Visual.Ranking
                     : offset > 10 ? HitResult.Good
                     : offset > 5 ? HitResult.Great
                     : HitResult.Perfect;
-                return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
+                return new HitEvent(h.TimeOffset, 1.0, result, placeholder_object, placeholder_object, null);
             });
             createTest(wide.Concat(narrow).ToList());
         }
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestZeroTimeOffset()
         {
-            createTest(Enumerable.Range(0, 100).Select(_ => new HitEvent(0, HitResult.Perfect, placeholder_object, placeholder_object, null)).ToList());
+            createTest(Enumerable.Range(0, 100).Select(_ => new HitEvent(0, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null)).ToList());
         }
 
         [Test]
@@ -129,9 +129,9 @@ namespace osu.Game.Tests.Visual.Ranking
             createTest(Enumerable.Range(0, 100).Select(i =>
             {
                 if (i % 2 == 0)
-                    return new HitEvent(0, HitResult.Perfect, placeholder_object, placeholder_object, null);
+                    return new HitEvent(0, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null);
 
-                return new HitEvent(30, HitResult.Miss, placeholder_object, placeholder_object, null);
+                return new HitEvent(30, 1.0, HitResult.Miss, placeholder_object, placeholder_object, null);
             }).ToList());
         }
 
@@ -162,7 +162,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 int count = (int)(Math.Pow(range - Math.Abs(i - range), 2)) / 10;
 
                 for (int j = 0; j < count; j++)
-                    hitEvents.Add(new HitEvent(centre + i - range, HitResult.Perfect, placeholder_object, placeholder_object, null));
+                    hitEvents.Add(new HitEvent(centre + i - range, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null));
             }
 
             return hitEvents;

From 8c36604e58e84265d623f0ec19e3eec85370ef4d Mon Sep 17 00:00:00 2001
From: Poyo <poyoarya@gmail.com>
Date: Sun, 12 Nov 2023 11:16:06 -0800
Subject: [PATCH 1527/2296] Add rate-change UR tests

---
 .../NonVisual/Ranking/UnstableRateTest.cs     | 32 +++++++++++++++++++
 .../Gameplay/TestSceneUnstableRateCounter.cs  | 22 +++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs b/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
index bde3c37af7..5a416d05d7 100644
--- a/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
+++ b/osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
@@ -42,5 +42,37 @@ namespace osu.Game.Tests.NonVisual.Ranking
 
             Assert.AreEqual(0, unstableRate.Value);
         }
+
+        [Test]
+        public void TestStaticRateChange()
+        {
+            var events = new[]
+            {
+                new HitEvent(-150, 1.5, HitResult.Great, new HitObject(), null, null),
+                new HitEvent(-150, 1.5, HitResult.Great, new HitObject(), null, null),
+                new HitEvent(150, 1.5, HitResult.Great, new HitObject(), null, null),
+                new HitEvent(150, 1.5, HitResult.Great, new HitObject(), null, null),
+            };
+
+            var unstableRate = new UnstableRate(events);
+
+            Assert.AreEqual(10 * 100, unstableRate.Value);
+        }
+
+        [Test]
+        public void TestDynamicRateChange()
+        {
+            var events = new[]
+            {
+                new HitEvent(-50, 0.5, HitResult.Great, new HitObject(), null, null),
+                new HitEvent(75, 0.75, HitResult.Great, new HitObject(), null, null),
+                new HitEvent(-100, 1.0, HitResult.Great, new HitObject(), null, null),
+                new HitEvent(125, 1.25, HitResult.Great, new HitObject(), null, null),
+            };
+
+            var unstableRate = new UnstableRate(events);
+
+            Assert.AreEqual(10 * 100, unstableRate.Value);
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneUnstableRateCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneUnstableRateCounter.cs
index f6c819b329..73ec6ea335 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneUnstableRateCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneUnstableRateCounter.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -81,6 +82,27 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("UR = 250", () => counter.Current.Value == 250.0);
         }
 
+        [Test]
+        public void TestStaticRateChange()
+        {
+            AddStep("Create Display", recreateDisplay);
+
+            AddRepeatStep("Set UR to 250 at 1.5x", () => applyJudgement(25, true, 1.5), 4);
+
+            AddUntilStep("UR = 250/1.5", () => counter.Current.Value == Math.Round(250.0 / 1.5));
+        }
+
+        [Test]
+        public void TestDynamicRateChange()
+        {
+            AddStep("Create Display", recreateDisplay);
+
+            AddRepeatStep("Set UR to 100 at 1.0x", () => applyJudgement(10, true, 1.0), 4);
+            AddRepeatStep("Bring UR to 100 at 1.5x", () => applyJudgement(15, true, 1.5), 4);
+
+            AddUntilStep("UR = 100", () => counter.Current.Value == 100.0);
+        }
+
         private void recreateDisplay()
         {
             Clear();

From e67725f5d6c9b6334c3e01a5717b06cd507a1f63 Mon Sep 17 00:00:00 2001
From: Poyo <poyoarya@gmail.com>
Date: Sun, 12 Nov 2023 12:14:19 -0800
Subject: [PATCH 1528/2296] Use IGameplayClock for rate

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 0843fd5bdc..4ae59dccb1 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -154,6 +154,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
+        [Resolved]
+        private IGameplayClock gameplayClock { get; set; } = null!;
+
         /// <summary>
         /// Whether the initialization logic in <see cref="Playfield" /> has applied.
         /// </summary>
@@ -704,7 +707,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             Result.RawTime = Time.Current;
-            Result.GameplayRate = Clock.Rate;
+            Result.GameplayRate = gameplayClock.GetTrueGameplayRate();
 
             if (Result.HasResult)
                 updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);

From f794d4dc8384e0bba90d5063e5285a063adabcf8 Mon Sep 17 00:00:00 2001
From: Poyo <poyoarya@gmail.com>
Date: Sun, 12 Nov 2023 13:29:40 -0800
Subject: [PATCH 1529/2296] Allow gameplayClock to be null

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 4ae59dccb1..7cfb6aedf0 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -154,8 +154,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
-        [Resolved]
-        private IGameplayClock gameplayClock { get; set; } = null!;
+        [Resolved(CanBeNull = true)]
+        private IGameplayClock gameplayClock { get; set; }
 
         /// <summary>
         /// Whether the initialization logic in <see cref="Playfield" /> has applied.
@@ -707,7 +707,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             Result.RawTime = Time.Current;
-            Result.GameplayRate = gameplayClock.GetTrueGameplayRate();
+            Result.GameplayRate = gameplayClock?.GetTrueGameplayRate() ?? 1.0;
 
             if (Result.HasResult)
                 updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);

From c24b3543ab271536b2b98c3c4777a174bc0621c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Mu=CC=88ller-Ho=CC=88hne?= <thomas94@gmx.net>
Date: Mon, 13 Nov 2023 12:47:12 +0900
Subject: [PATCH 1530/2296] Fix OnDragStart on macOS

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 20f11c3585..fe01b1b6d2 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                         if (HitObject.Path.ControlPoints.Count < 3)
                         {
                             var lastCp = HitObject.Path.ControlPoints.LastOrDefault();
-                            if (lastCp != cursor)
+                            if (lastCp != cursor && HitObject.Path.ControlPoints.Count == 2)
                                 return false;
 
                             bSplineBuilder.Clear();

From e6b4dfba369ee790ee0cee427aa702a935ce341b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Mu=CC=88ller-Ho=CC=88hne?= <thomas94@gmx.net>
Date: Mon, 13 Nov 2023 12:49:59 +0900
Subject: [PATCH 1531/2296] Fix doubled control point at beginning of drawn
 slider

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index fe01b1b6d2..9ac28fe82a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -195,7 +195,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             {
                 var cps = self.bSplineBuilder.GetControlPoints();
                 self.HitObject.Path.ControlPoints.RemoveRange(1, self.HitObject.Path.ControlPoints.Count - 1);
-                self.HitObject.Path.ControlPoints.AddRange(cps.Select(v => new PathControlPoint(v)));
+                self.HitObject.Path.ControlPoints.AddRange(cps.Skip(1).Select(v => new PathControlPoint(v)));
             }, this);
         }
 

From 5fd55e55c08130773e72805ce7785b6da69031b6 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 13 Nov 2023 12:59:36 +0900
Subject: [PATCH 1532/2296] Add flag for combo end bonus to legacy processor

---
 osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
index 103569ffc3..e6db76e3b6 100644
--- a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Osu.Scoring
         private const double hp_slider_repeat = 4;
         private const double hp_slider_tick = 3;
 
+        public bool ComboEndBonus { get; set; }
+
         private double lowestHpEver;
         private double lowestHpEnd;
         private double lowestHpComboEnd;
@@ -129,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                         break;
                     }
 
-                    if (i == Beatmap.HitObjects.Count - 1 || ((OsuHitObject)Beatmap.HitObjects[i + 1]).NewCombo)
+                    if (ComboEndBonus && (i == Beatmap.HitObjects.Count - 1 || ((OsuHitObject)Beatmap.HitObjects[i + 1]).NewCombo))
                     {
                         increaseHp(hpMultiplierComboEnd * hp_combo_geki + hpMultiplierNormal * hp_hit_300);
 

From 929570656d7a25fdea59141b1385a5a207b1bfc4 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 13 Nov 2023 13:12:46 +0900
Subject: [PATCH 1533/2296] Disallow legacy health processor from being used
 for gameplay

---
 .../Scoring/LegacyOsuHealthProcessor.cs       | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
index e6db76e3b6..aa9312500b 100644
--- a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
@@ -5,13 +5,17 @@ using System;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
-    // Reference implementation for osu!stable's HP drain.
+    /// <summary>
+    /// Reference implementation for osu!stable's HP drain.
+    /// Cannot be used for gameplay.
+    /// </summary>
     public partial class LegacyOsuHealthProcessor : LegacyDrainingHealthProcessor
     {
         private const double hp_bar_maximum = 200;
@@ -20,8 +24,6 @@ namespace osu.Game.Rulesets.Osu.Scoring
         private const double hp_slider_repeat = 4;
         private const double hp_slider_tick = 3;
 
-        public bool ComboEndBonus { get; set; }
-
         private double lowestHpEver;
         private double lowestHpEnd;
         private double lowestHpComboEnd;
@@ -44,6 +46,18 @@ namespace osu.Game.Rulesets.Osu.Scoring
             base.ApplyBeatmap(beatmap);
         }
 
+        protected override void ApplyResultInternal(JudgementResult result)
+        {
+            if (!IsSimulating)
+                throw new NotSupportedException("The legacy osu! health processor is not supported for gameplay.");
+        }
+
+        protected override void RevertResultInternal(JudgementResult result)
+        {
+            if (!IsSimulating)
+                throw new NotSupportedException("The legacy osu! health processor is not supported for gameplay.");
+        }
+
         protected override void Reset(bool storeResults)
         {
             hpMultiplierNormal = 1;
@@ -131,7 +145,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                         break;
                     }
 
-                    if (ComboEndBonus && (i == Beatmap.HitObjects.Count - 1 || ((OsuHitObject)Beatmap.HitObjects[i + 1]).NewCombo))
+                    if (i == Beatmap.HitObjects.Count - 1 || ((OsuHitObject)Beatmap.HitObjects[i + 1]).NewCombo)
                     {
                         increaseHp(hpMultiplierComboEnd * hp_combo_geki + hpMultiplierNormal * hp_hit_300);
 

From 7713da499f6cb08b81cfcaf571ad79fb36f20752 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 13 Nov 2023 13:12:56 +0900
Subject: [PATCH 1534/2296] Make osu ruleset use the new health processor

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

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 607b83d379..aaf0ab41a0 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -48,6 +48,8 @@ namespace osu.Game.Rulesets.Osu
 
         public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
 
+        public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new OsuHealthProcessor(drainStartTime);
+
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new OsuBeatmapConverter(beatmap, this);
 
         public override IBeatmapProcessor CreateBeatmapProcessor(IBeatmap beatmap) => new OsuBeatmapProcessor(beatmap);

From 98e6b7744bf58db8db7e348a4935fe9c5fe06e78 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 13 Nov 2023 13:46:47 +0900
Subject: [PATCH 1535/2296] Cleanup

---
 .../Scoring/LegacyOsuHealthProcessor.cs       | 11 +--
 .../Scoring/OsuHealthProcessor.cs             | 12 +--
 .../Scoring/DrainingHealthProcessor.cs        | 54 ++++++-----
 .../Scoring/LegacyDrainingHealthProcessor.cs  | 90 -------------------
 4 files changed, 47 insertions(+), 120 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs

diff --git a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
index aa9312500b..f918868715 100644
--- a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
     /// Reference implementation for osu!stable's HP drain.
     /// Cannot be used for gameplay.
     /// </summary>
-    public partial class LegacyOsuHealthProcessor : LegacyDrainingHealthProcessor
+    public partial class LegacyOsuHealthProcessor : DrainingHealthProcessor
     {
         private const double hp_bar_maximum = 200;
         private const double hp_combo_geki = 14;
@@ -24,6 +24,9 @@ namespace osu.Game.Rulesets.Osu.Scoring
         private const double hp_slider_repeat = 4;
         private const double hp_slider_tick = 3;
 
+        public Action<string>? OnIterationFail;
+        public Action<string>? OnIterationSuccess;
+
         private double lowestHpEver;
         private double lowestHpEnd;
         private double lowestHpComboEnd;
@@ -187,13 +190,11 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
                 if (fail)
                 {
-                    if (Log)
-                        Console.WriteLine($"FAILED drop {testDrop / hp_bar_maximum}: {failReason}");
+                    OnIterationFail?.Invoke($"FAILED drop {testDrop / hp_bar_maximum}: {failReason}");
                     continue;
                 }
 
-                if (Log)
-                    Console.WriteLine($"PASSED drop {testDrop / hp_bar_maximum}");
+                OnIterationSuccess?.Invoke($"PASSED drop {testDrop / hp_bar_maximum}");
                 return testDrop / hp_bar_maximum;
             } while (true);
 
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 2266cf9d33..3a096fca88 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Judgements;
@@ -12,8 +13,11 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
-    public partial class OsuHealthProcessor : LegacyDrainingHealthProcessor
+    public partial class OsuHealthProcessor : DrainingHealthProcessor
     {
+        public Action<string>? OnIterationFail;
+        public Action<string>? OnIterationSuccess;
+
         private double lowestHpEver;
         private double lowestHpEnd;
         private double hpRecoveryAvailable;
@@ -141,13 +145,11 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
                 if (fail)
                 {
-                    if (Log)
-                        Console.WriteLine($"FAILED drop {testDrop}: {failReason}");
+                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: {failReason}");
                     continue;
                 }
 
-                if (Log)
-                    Console.WriteLine($"PASSED drop {testDrop}");
+                OnIterationSuccess?.Invoke($"PASSED drop {testDrop}");
                 return testDrop;
             } while (true);
 
diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index 2f81aa735e..a8808d08e5 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -41,15 +41,29 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         private const double max_health_target = 0.4;
 
-        private IBeatmap beatmap;
-        private double gameplayEndTime;
+        /// <summary>
+        /// The drain rate as a proportion of the total health drained per millisecond.
+        /// </summary>
+        public double DrainRate { get; private set; } = 1;
 
-        private readonly double drainStartTime;
-        private readonly double drainLenience;
+        /// <summary>
+        /// The beatmap.
+        /// </summary>
+        protected IBeatmap Beatmap { get; private set; }
+
+        /// <summary>
+        /// The time at which health starts draining.
+        /// </summary>
+        protected readonly double DrainStartTime;
+
+        /// <summary>
+        /// An amount of lenience to apply to the drain rate.
+        /// </summary>
+        protected readonly double DrainLenience;
 
         private readonly List<(double time, double health)> healthIncreases = new List<(double, double)>();
+        private double gameplayEndTime;
         private double targetMinimumHealth;
-        private double drainRate = 1;
 
         private PeriodTracker noDrainPeriodTracker;
 
@@ -63,8 +77,8 @@ namespace osu.Game.Rulesets.Scoring
         /// A value of 1 completely removes drain.</param>
         public DrainingHealthProcessor(double drainStartTime, double drainLenience = 0)
         {
-            this.drainStartTime = drainStartTime;
-            this.drainLenience = Math.Clamp(drainLenience, 0, 1);
+            DrainStartTime = drainStartTime;
+            DrainLenience = Math.Clamp(drainLenience, 0, 1);
         }
 
         protected override void Update()
@@ -75,16 +89,16 @@ namespace osu.Game.Rulesets.Scoring
                 return;
 
             // When jumping in and out of gameplay time within a single frame, health should only be drained for the period within the gameplay time
-            double lastGameplayTime = Math.Clamp(Time.Current - Time.Elapsed, drainStartTime, gameplayEndTime);
-            double currentGameplayTime = Math.Clamp(Time.Current, drainStartTime, gameplayEndTime);
+            double lastGameplayTime = Math.Clamp(Time.Current - Time.Elapsed, DrainStartTime, gameplayEndTime);
+            double currentGameplayTime = Math.Clamp(Time.Current, DrainStartTime, gameplayEndTime);
 
-            if (drainLenience < 1)
-                Health.Value -= drainRate * (currentGameplayTime - lastGameplayTime);
+            if (DrainLenience < 1)
+                Health.Value -= DrainRate * (currentGameplayTime - lastGameplayTime);
         }
 
         public override void ApplyBeatmap(IBeatmap beatmap)
         {
-            this.beatmap = beatmap;
+            Beatmap = beatmap;
 
             if (beatmap.HitObjects.Count > 0)
                 gameplayEndTime = beatmap.HitObjects[^1].GetEndTime();
@@ -105,7 +119,7 @@ namespace osu.Game.Rulesets.Scoring
             targetMinimumHealth = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, min_health_target, mid_health_target, max_health_target);
 
             // Add back a portion of the amount of HP to be drained, depending on the lenience requested.
-            targetMinimumHealth += drainLenience * (1 - targetMinimumHealth);
+            targetMinimumHealth += DrainLenience * (1 - targetMinimumHealth);
 
             // Ensure the target HP is within an acceptable range.
             targetMinimumHealth = Math.Clamp(targetMinimumHealth, 0, 1);
@@ -125,15 +139,15 @@ namespace osu.Game.Rulesets.Scoring
         {
             base.Reset(storeResults);
 
-            drainRate = 1;
+            DrainRate = 1;
 
             if (storeResults)
-                drainRate = computeDrainRate();
+                DrainRate = ComputeDrainRate();
 
             healthIncreases.Clear();
         }
 
-        private double computeDrainRate()
+        protected virtual double ComputeDrainRate()
         {
             if (healthIncreases.Count <= 1)
                 return 0;
@@ -152,17 +166,17 @@ namespace osu.Game.Rulesets.Scoring
                 for (int i = 0; i < healthIncreases.Count; i++)
                 {
                     double currentTime = healthIncreases[i].time;
-                    double lastTime = i > 0 ? healthIncreases[i - 1].time : drainStartTime;
+                    double lastTime = i > 0 ? healthIncreases[i - 1].time : DrainStartTime;
 
                     // Subtract any break time from the duration since the last object
-                    if (beatmap.Breaks.Count > 0)
+                    if (Beatmap.Breaks.Count > 0)
                     {
                         // Advance the last break occuring before the current time
-                        while (currentBreak + 1 < beatmap.Breaks.Count && beatmap.Breaks[currentBreak + 1].EndTime < currentTime)
+                        while (currentBreak + 1 < Beatmap.Breaks.Count && Beatmap.Breaks[currentBreak + 1].EndTime < currentTime)
                             currentBreak++;
 
                         if (currentBreak >= 0)
-                            lastTime = Math.Max(lastTime, beatmap.Breaks[currentBreak].EndTime);
+                            lastTime = Math.Max(lastTime, Beatmap.Breaks[currentBreak].EndTime);
                     }
 
                     // Apply health adjustments
diff --git a/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
deleted file mode 100644
index 5d2426e4b7..0000000000
--- a/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
+++ /dev/null
@@ -1,90 +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.Linq;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Utils;
-
-namespace osu.Game.Rulesets.Scoring
-{
-    /// <summary>
-    /// A <see cref="HealthProcessor"/> which continuously drains health.<br />
-    /// At HP=0, the minimum health reached for a perfect play is 95%.<br />
-    /// At HP=5, the minimum health reached for a perfect play is 70%.<br />
-    /// At HP=10, the minimum health reached for a perfect play is 30%.
-    /// </summary>
-    public abstract partial class LegacyDrainingHealthProcessor : HealthProcessor
-    {
-        protected double DrainStartTime { get; }
-        protected double GameplayEndTime { get; private set; }
-
-        protected IBeatmap Beatmap { get; private set; }
-        protected PeriodTracker NoDrainPeriodTracker { get; private set; }
-
-        public bool Log { get; set; }
-
-        public double DrainRate { get; private set; }
-
-        /// <summary>
-        /// Creates a new <see cref="DrainingHealthProcessor"/>.
-        /// </summary>
-        /// <param name="drainStartTime">The time after which draining should begin.</param>
-        protected LegacyDrainingHealthProcessor(double drainStartTime)
-        {
-            DrainStartTime = drainStartTime;
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (NoDrainPeriodTracker?.IsInAny(Time.Current) == true)
-                return;
-
-            // When jumping in and out of gameplay time within a single frame, health should only be drained for the period within the gameplay time
-            double lastGameplayTime = Math.Clamp(Time.Current - Time.Elapsed, DrainStartTime, GameplayEndTime);
-            double currentGameplayTime = Math.Clamp(Time.Current, DrainStartTime, GameplayEndTime);
-
-            Health.Value -= DrainRate * (currentGameplayTime - lastGameplayTime);
-        }
-
-        public override void ApplyBeatmap(IBeatmap beatmap)
-        {
-            Beatmap = beatmap;
-
-            if (beatmap.HitObjects.Count > 0)
-                GameplayEndTime = beatmap.HitObjects[^1].GetEndTime();
-
-            NoDrainPeriodTracker = new PeriodTracker(beatmap.Breaks.Select(breakPeriod => new Period(
-                beatmap.HitObjects
-                       .Select(hitObject => hitObject.GetEndTime())
-                       .Where(endTime => endTime <= breakPeriod.StartTime)
-                       .DefaultIfEmpty(double.MinValue)
-                       .Last(),
-                beatmap.HitObjects
-                       .Select(hitObject => hitObject.StartTime)
-                       .Where(startTime => startTime >= breakPeriod.EndTime)
-                       .DefaultIfEmpty(double.MaxValue)
-                       .First()
-            )));
-
-            base.ApplyBeatmap(beatmap);
-        }
-
-        protected override void Reset(bool storeResults)
-        {
-            base.Reset(storeResults);
-
-            DrainRate = 1;
-
-            if (storeResults)
-                DrainRate = ComputeDrainRate();
-        }
-
-        protected abstract double ComputeDrainRate();
-    }
-}

From 8ad8764947835e9ce4070338b6e1ea81016df2b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Nov 2023 14:06:18 +0900
Subject: [PATCH 1536/2296] Update framework

---
 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 2870696c03..1f6a65c450 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1030.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1113.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 60c71a736d..fc10f90e8f 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1030.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1113.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1023.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index f1159f58b9..70525a5c59 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1030.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1113.0" />
   </ItemGroup>
 </Project>

From 65b41138a347718297f71509e6a1dbc30d468543 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 13 Nov 2023 14:06:24 +0900
Subject: [PATCH 1537/2296] Add option to disable combo end

---
 osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
index f918868715..e92c3c9b97 100644
--- a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
         public Action<string>? OnIterationFail;
         public Action<string>? OnIterationSuccess;
+        public bool ApplyComboEndBonus { get; set; } = true;
 
         private double lowestHpEver;
         private double lowestHpEnd;
@@ -148,7 +149,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                         break;
                     }
 
-                    if (i == Beatmap.HitObjects.Count - 1 || ((OsuHitObject)Beatmap.HitObjects[i + 1]).NewCombo)
+                    if (ApplyComboEndBonus && (i == Beatmap.HitObjects.Count - 1 || ((OsuHitObject)Beatmap.HitObjects[i + 1]).NewCombo))
                     {
                         increaseHp(hpMultiplierComboEnd * hp_combo_geki + hpMultiplierNormal * hp_hit_300);
 

From 35d4c483d78399fa3322b7a1db79110da36a759f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 13 Nov 2023 14:06:34 +0900
Subject: [PATCH 1538/2296] Improve commenting around small tick/large tick
 health

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

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 3a096fca88..5802f8fc0d 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -185,12 +185,12 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     return IBeatmapDifficultyInfo.DifficultyRange(Beatmap.Difficulty.DrainRate, -0.03, -0.125, -0.2);
 
                 case HitResult.SmallTickHit:
-                    // This result is always as a result of the slider tail.
+                    // This result always comes from the slider tail, which is judged the same as a repeat.
                     increase = 0.02;
                     break;
 
                 case HitResult.LargeTickHit:
-                    // This result is either a result of a slider tick or a repeat.
+                    // This result comes from either a slider tick or repeat.
                     increase = hitObject is SliderTick ? 0.015 : 0.02;
                     break;
 

From fa976a5aa0eeb94dccbcd58b00d51a1c9d7e52df Mon Sep 17 00:00:00 2001
From: cs <cedric.schneider@pmbs.de>
Date: Mon, 13 Nov 2023 08:24:09 +0100
Subject: [PATCH 1539/2296] Fix code style/quality issues

---
 .../TestSceneJuiceStreamSelectionBlueprint.cs |  6 +++---
 .../JuiceStreamPathTest.cs                    |  2 +-
 .../Checks/CheckOffscreenObjectsTest.cs       |  2 +-
 .../TestSceneOsuEditorSelectInvalidPath.cs    |  2 +-
 .../TestScenePathControlPointVisualiser.cs    |  8 ++++----
 .../TestSceneSliderControlPointPiece.cs       | 18 ++++++++---------
 .../Editor/TestSceneSliderLengthValidity.cs   |  2 +-
 .../TestSceneSliderPlacementBlueprint.cs      | 16 +++++++--------
 .../Editor/TestSceneSliderReversal.cs         |  2 +-
 .../Editor/TestSceneSliderSnapping.cs         | 10 +++++-----
 .../Editor/TestSceneSliderSplitting.cs        | 20 +++++++++----------
 .../TestSceneSlider.cs                        |  6 +++---
 .../TestSceneSliderInput.cs                   |  2 +-
 .../TestSceneSliderSnaking.cs                 |  6 +++---
 .../Components/PathControlPointPiece.cs       | 14 ++++++-------
 .../Components/PathControlPointVisualiser.cs  |  2 +-
 .../Sliders/SliderPlacementBlueprint.cs       |  2 +-
 .../Edit/OsuSliderDrawingSettingsProvider.cs  |  8 +++++---
 .../Formats/LegacyBeatmapDecoderTest.cs       |  8 ++++----
 .../Gameplay/TestSceneBezierConverter.cs      |  8 ++++----
 .../Visual/Gameplay/TestSceneSliderPath.cs    |  4 ++--
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 18 +++++++----------
 .../Edit/ComposerDistanceSnapProvider.cs      |  2 +-
 osu.Game/Rulesets/Edit/IToolboxAttachment.cs  | 10 ++++++++++
 osu.Game/Rulesets/Objects/BezierConverter.cs  |  8 ++++----
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 10 +++++-----
 .../Rulesets/Objects/SliderPathExtensions.cs  |  2 +-
 osu.Game/Rulesets/Objects/Types/PathType.cs   | 12 +++++++----
 osu.Game/osu.Game.csproj                      |  2 +-
 29 files changed, 112 insertions(+), 100 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/IToolboxAttachment.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
index 16b51d414a..c96f32d87c 100644
--- a/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
 
             AddStep("update hit object path", () =>
             {
-                hitObject.Path = new SliderPath(PathType.PERFECTCURVE, new[]
+                hitObject.Path = new SliderPath(PathType.PERFECT_CURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(100, 100),
@@ -190,14 +190,14 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
         [Test]
         public void TestVertexResampling()
         {
-            addBlueprintStep(100, 100, new SliderPath(PathType.PERFECTCURVE, new[]
+            addBlueprintStep(100, 100, new SliderPath(PathType.PERFECT_CURVE, new[]
             {
                 Vector2.Zero,
                 new Vector2(100, 100),
                 new Vector2(50, 200),
             }), 0.5);
             AddAssert("1 vertex per 1 nested HO", () => getVertices().Count == hitObject.NestedHitObjects.Count);
-            AddAssert("slider path not yet changed", () => hitObject.Path.ControlPoints[0].Type == PathType.PERFECTCURVE);
+            AddAssert("slider path not yet changed", () => hitObject.Path.ControlPoints[0].Type == PathType.PERFECT_CURVE);
             addAddVertexSteps(150, 150);
             AddAssert("slider path change to linear", () => hitObject.Path.ControlPoints[0].Type == PathType.LINEAR);
         }
diff --git a/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs b/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs
index 82f24633b5..9fb55fc057 100644
--- a/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/JuiceStreamPathTest.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     } while (rng.Next(2) != 0);
 
                     int length = sliderPath.ControlPoints.Count - start + 1;
-                    sliderPath.ControlPoints[start].Type = length <= 2 ? PathType.LINEAR : length == 3 ? PathType.PERFECTCURVE : PathType.BEZIER;
+                    sliderPath.ControlPoints[start].Type = length <= 2 ? PathType.LINEAR : length == 3 ? PathType.PERFECT_CURVE : PathType.BEZIER;
                 } while (rng.Next(3) != 0);
 
                 if (rng.Next(5) == 0)
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 8612a8eb57..5db6dc6cdd 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -214,7 +214,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Path = new SliderPath(new[]
                         {
                             // Circular arc shoots over the top of the screen.
-                            new PathControlPoint(new Vector2(0, 0), PathType.PERFECTCURVE),
+                            new PathControlPoint(new Vector2(0, 0), PathType.PERFECT_CURVE),
                             new PathControlPoint(new Vector2(-100, -200)),
                             new PathControlPoint(new Vector2(100, -200))
                         }),
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
index 7ea4d40b90..43dae38004 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             PathControlPoint[] points =
             {
-                new PathControlPoint(new Vector2(0), PathType.PERFECTCURVE),
+                new PathControlPoint(new Vector2(0), PathType.PERFECT_CURVE),
                 new PathControlPoint(new Vector2(-100, 0)),
                 new PathControlPoint(new Vector2(100, 20))
             };
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 16800997f4..811ecf53e9 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addContextMenuItemStep("Perfect curve");
 
             assertControlPointPathType(0, PathType.BEZIER);
-            assertControlPointPathType(1, PathType.PERFECTCURVE);
+            assertControlPointPathType(1, PathType.PERFECT_CURVE);
             assertControlPointPathType(3, PathType.BEZIER);
         }
 
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addContextMenuItemStep("Perfect curve");
 
             assertControlPointPathType(0, PathType.BEZIER);
-            assertControlPointPathType(2, PathType.PERFECTCURVE);
+            assertControlPointPathType(2, PathType.PERFECT_CURVE);
             assertControlPointPathType(4, null);
         }
 
@@ -124,7 +124,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addContextMenuItemStep("Perfect curve");
 
             assertControlPointPathType(0, PathType.LINEAR);
-            assertControlPointPathType(1, PathType.PERFECTCURVE);
+            assertControlPointPathType(1, PathType.PERFECT_CURVE);
             assertControlPointPathType(3, PathType.LINEAR);
         }
 
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             createVisualiser(true);
 
             addControlPointStep(new Vector2(200), PathType.BEZIER);
-            addControlPointStep(new Vector2(300), PathType.PERFECTCURVE);
+            addControlPointStep(new Vector2(300), PathType.PERFECT_CURVE);
             addControlPointStep(new Vector2(500, 300));
             addControlPointStep(new Vector2(700, 200), PathType.BEZIER);
             addControlPointStep(new Vector2(500, 100));
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index 1d8d2cf01a..99ced30ffe 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -38,9 +38,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 Position = new Vector2(256, 192),
                 Path = new SliderPath(new[]
                 {
-                    new PathControlPoint(Vector2.Zero, PathType.PERFECTCURVE),
+                    new PathControlPoint(Vector2.Zero, PathType.PERFECT_CURVE),
                     new PathControlPoint(new Vector2(150, 150)),
-                    new PathControlPoint(new Vector2(300, 0), PathType.PERFECTCURVE),
+                    new PathControlPoint(new Vector2(300, 0), PathType.PERFECT_CURVE),
                     new PathControlPoint(new Vector2(400, 0)),
                     new PathControlPoint(new Vector2(400, 150))
                 })
@@ -182,7 +182,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
             assertControlPointPosition(1, new Vector2(150, 50));
-            assertControlPointType(0, PathType.PERFECTCURVE);
+            assertControlPointType(0, PathType.PERFECT_CURVE);
         }
 
         [Test]
@@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("three control point pieces selected", () => this.ChildrenOfType<PathControlPointPiece<Slider>>().Count(piece => piece.IsSelected.Value) == 3);
 
             assertControlPointPosition(2, new Vector2(450, 50));
-            assertControlPointType(2, PathType.PERFECTCURVE);
+            assertControlPointType(2, PathType.PERFECT_CURVE);
 
             assertControlPointPosition(3, new Vector2(550, 50));
 
@@ -249,7 +249,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("slider moved", () => Precision.AlmostEquals(slider.Position, new Vector2(256, 192) + new Vector2(150, 50)));
 
             assertControlPointPosition(0, Vector2.Zero);
-            assertControlPointType(0, PathType.PERFECTCURVE);
+            assertControlPointType(0, PathType.PERFECT_CURVE);
 
             assertControlPointPosition(1, new Vector2(0, 100));
 
@@ -288,7 +288,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
             assertControlPointPosition(1, new Vector2(150, 50));
-            assertControlPointType(0, PathType.PERFECTCURVE);
+            assertControlPointType(0, PathType.PERFECT_CURVE);
         }
 
         [Test]
@@ -304,7 +304,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
             assertControlPointPosition(4, new Vector2(150, 150));
-            assertControlPointType(2, PathType.PERFECTCURVE);
+            assertControlPointType(2, PathType.PERFECT_CURVE);
         }
 
         [Test]
@@ -312,12 +312,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             AddStep("change type to bezier", () => slider.Path.ControlPoints[2].Type = PathType.BEZIER);
             AddStep("add point", () => slider.Path.ControlPoints.Add(new PathControlPoint(new Vector2(500, 10))));
-            AddStep("change type to perfect", () => slider.Path.ControlPoints[3].Type = PathType.PERFECTCURVE);
+            AddStep("change type to perfect", () => slider.Path.ControlPoints[3].Type = PathType.PERFECT_CURVE);
 
             moveMouseToControlPoint(4);
             AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
 
-            assertControlPointType(3, PathType.PERFECTCURVE);
+            assertControlPointType(3, PathType.PERFECT_CURVE);
 
             addMovementStep(new Vector2(350, 0.01f));
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
index 38ebeb7e8f..931c8c9e63 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
                 PathControlPoint[] points =
                 {
-                    new PathControlPoint(new Vector2(0), PathType.PERFECTCURVE),
+                    new PathControlPoint(new Vector2(0), PathType.PERFECT_CURVE),
                     new PathControlPoint(new Vector2(100, 0)),
                     new PathControlPoint(new Vector2(0, 10))
                 };
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 4b120c1a3f..ecfc8105f1 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertControlPointCount(3);
             assertControlPointPosition(1, new Vector2(100, 0));
-            assertControlPointType(0, PathType.PERFECTCURVE);
+            assertControlPointType(0, PathType.PERFECT_CURVE);
         }
 
         [Test]
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
-            assertControlPointType(0, PathType.PERFECTCURVE);
+            assertControlPointType(0, PathType.PERFECT_CURVE);
         }
 
         [Test]
@@ -241,7 +241,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointPosition(1, new Vector2(100, 0));
             assertControlPointPosition(2, new Vector2(100));
             assertControlPointType(0, PathType.LINEAR);
-            assertControlPointType(1, PathType.PERFECTCURVE);
+            assertControlPointType(1, PathType.PERFECT_CURVE);
         }
 
         [Test]
@@ -269,8 +269,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointPosition(2, new Vector2(100));
             assertControlPointPosition(3, new Vector2(200, 100));
             assertControlPointPosition(4, new Vector2(200));
-            assertControlPointType(0, PathType.PERFECTCURVE);
-            assertControlPointType(2, PathType.PERFECTCURVE);
+            assertControlPointType(0, PathType.PERFECT_CURVE);
+            assertControlPointType(2, PathType.PERFECT_CURVE);
         }
 
         [Test]
@@ -326,7 +326,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
-            assertControlPointType(0, PathType.PERFECTCURVE);
+            assertControlPointType(0, PathType.PERFECT_CURVE);
         }
 
         [Test]
@@ -347,7 +347,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
-            assertControlPointType(0, PathType.PERFECTCURVE);
+            assertControlPointType(0, PathType.PERFECT_CURVE);
         }
 
         [Test]
@@ -385,7 +385,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
-            assertControlPointType(0, PathType.PERFECTCURVE);
+            assertControlPointType(0, PathType.PERFECT_CURVE);
         }
 
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
index 0ddfc40946..a44c16a2e0 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderReversal.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         private readonly PathControlPoint[][] paths =
         {
             createPathSegment(
-                PathType.PERFECTCURVE,
+                PathType.PERFECT_CURVE,
                 new Vector2(200, -50),
                 new Vector2(250, 0)
             ),
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
index c984d9168e..541fefb3a6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 {
                     ControlPoints =
                     {
-                        new PathControlPoint(Vector2.Zero, PathType.PERFECTCURVE),
+                        new PathControlPoint(Vector2.Zero, PathType.PERFECT_CURVE),
                         new PathControlPoint(new Vector2(136, 205)),
                         new PathControlPoint(new Vector2(-4, 226))
                     }
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             OsuSelectionHandler selectionHandler;
 
-            AddAssert("first control point perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECTCURVE);
+            AddAssert("first control point perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECT_CURVE);
 
             AddStep("select slider", () => EditorBeatmap.SelectedHitObjects.Add(slider));
             AddStep("rotate 90 degrees ccw", () =>
@@ -190,7 +190,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 selectionHandler.HandleRotation(-90);
             });
 
-            AddAssert("first control point still perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECTCURVE);
+            AddAssert("first control point still perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECT_CURVE);
         }
 
         [Test]
@@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             OsuSelectionHandler selectionHandler;
 
-            AddAssert("first control point perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECTCURVE);
+            AddAssert("first control point perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECT_CURVE);
 
             AddStep("select slider", () => EditorBeatmap.SelectedHitObjects.Add(slider));
             AddStep("flip slider horizontally", () =>
@@ -232,7 +232,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 selectionHandler.OnPressed(new KeyBindingPressEvent<GlobalAction>(InputManager.CurrentState, GlobalAction.EditorFlipVertically));
             });
 
-            AddAssert("first control point still perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECTCURVE);
+            AddAssert("first control point still perfect", () => slider.Path.ControlPoints[0].Type == PathType.PERFECT_CURVE);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
index cded9165f4..6c7733e68a 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSplitting.cs
@@ -45,9 +45,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                     Position = new Vector2(0, 50),
                     Path = new SliderPath(new[]
                     {
-                        new PathControlPoint(Vector2.Zero, PathType.PERFECTCURVE),
+                        new PathControlPoint(Vector2.Zero, PathType.PERFECT_CURVE),
                         new PathControlPoint(new Vector2(150, 150)),
-                        new PathControlPoint(new Vector2(300, 0), PathType.PERFECTCURVE),
+                        new PathControlPoint(new Vector2(300, 0), PathType.PERFECT_CURVE),
                         new PathControlPoint(new Vector2(400, 0)),
                         new PathControlPoint(new Vector2(400, 150))
                     })
@@ -73,20 +73,20 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddAssert("slider split", () => slider is not null && EditorBeatmap.HitObjects.Count == 2 &&
                                             sliderCreatedFor((Slider)EditorBeatmap.HitObjects[0], 0, EditorBeatmap.HitObjects[1].StartTime - split_gap,
-                                                (new Vector2(0, 50), PathType.PERFECTCURVE),
+                                                (new Vector2(0, 50), PathType.PERFECT_CURVE),
                                                 (new Vector2(150, 200), null),
                                                 (new Vector2(300, 50), null)
                                             ) && sliderCreatedFor((Slider)EditorBeatmap.HitObjects[1], slider.StartTime, endTime + split_gap,
-                                                (new Vector2(300, 50), PathType.PERFECTCURVE),
+                                                (new Vector2(300, 50), PathType.PERFECT_CURVE),
                                                 (new Vector2(400, 50), null),
                                                 (new Vector2(400, 200), null)
                                             ));
 
             AddStep("undo", () => Editor.Undo());
             AddAssert("original slider restored", () => EditorBeatmap.HitObjects.Count == 1 && sliderCreatedFor((Slider)EditorBeatmap.HitObjects[0], 0, endTime,
-                (new Vector2(0, 50), PathType.PERFECTCURVE),
+                (new Vector2(0, 50), PathType.PERFECT_CURVE),
                 (new Vector2(150, 200), null),
-                (new Vector2(300, 50), PathType.PERFECTCURVE),
+                (new Vector2(300, 50), PathType.PERFECT_CURVE),
                 (new Vector2(400, 50), null),
                 (new Vector2(400, 200), null)
             ));
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                     Position = new Vector2(0, 50),
                     Path = new SliderPath(new[]
                     {
-                        new PathControlPoint(Vector2.Zero, PathType.PERFECTCURVE),
+                        new PathControlPoint(Vector2.Zero, PathType.PERFECT_CURVE),
                         new PathControlPoint(new Vector2(150, 150)),
                         new PathControlPoint(new Vector2(300, 0), PathType.BEZIER),
                         new PathControlPoint(new Vector2(400, 0)),
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddAssert("slider split", () => slider is not null && EditorBeatmap.HitObjects.Count == 3 &&
                                             sliderCreatedFor((Slider)EditorBeatmap.HitObjects[0], 0, EditorBeatmap.HitObjects[1].StartTime - split_gap,
-                                                (new Vector2(0, 50), PathType.PERFECTCURVE),
+                                                (new Vector2(0, 50), PathType.PERFECT_CURVE),
                                                 (new Vector2(150, 200), null),
                                                 (new Vector2(300, 50), null)
                                             ) && sliderCreatedFor((Slider)EditorBeatmap.HitObjects[1], EditorBeatmap.HitObjects[0].GetEndTime() + split_gap, slider.StartTime - split_gap,
@@ -165,9 +165,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                     Position = new Vector2(0, 50),
                     Path = new SliderPath(new[]
                     {
-                        new PathControlPoint(Vector2.Zero, PathType.PERFECTCURVE),
+                        new PathControlPoint(Vector2.Zero, PathType.PERFECT_CURVE),
                         new PathControlPoint(new Vector2(150, 150)),
-                        new PathControlPoint(new Vector2(300, 0), PathType.PERFECTCURVE),
+                        new PathControlPoint(new Vector2(300, 0), PathType.PERFECT_CURVE),
                         new PathControlPoint(new Vector2(400, 0)),
                         new PathControlPoint(new Vector2(400, 150))
                     })
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index 60003e7950..4600db8174 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(239, 176),
-                Path = new SliderPath(PathType.PERFECTCURVE, new[]
+                Path = new SliderPath(PathType.PERFECT_CURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(154, 28),
@@ -255,7 +255,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 SliderVelocityMultiplier = speedMultiplier,
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(0, -(distance / 2)),
-                Path = new SliderPath(PathType.PERFECTCURVE, new[]
+                Path = new SliderPath(PathType.PERFECT_CURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(0, distance),
@@ -273,7 +273,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = Time.Current + time_offset,
                 Position = new Vector2(-max_length / 2, 0),
-                Path = new SliderPath(PathType.PERFECTCURVE, new[]
+                Path = new SliderPath(PathType.PERFECT_CURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(max_length / 2, max_length / 2),
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 08836ef819..0f7dd8b7bc 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -478,7 +478,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 StartTime = time_slider_start,
                 Position = new Vector2(0, 0),
                 SliderVelocityMultiplier = 0.1f,
-                Path = new SliderPath(PathType.PERFECTCURVE, new[]
+                Path = new SliderPath(PathType.PERFECT_CURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(slider_path_length, 0),
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
index ebc5143aed..912b2b0626 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderSnaking.cs
@@ -217,7 +217,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = 3000,
                 Position = new Vector2(100, 100),
-                Path = new SliderPath(PathType.PERFECTCURVE, new[]
+                Path = new SliderPath(PathType.PERFECT_CURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(300, 200)
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = 13000,
                 Position = new Vector2(100, 100),
-                Path = new SliderPath(PathType.PERFECTCURVE, new[]
+                Path = new SliderPath(PathType.PERFECT_CURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(300, 200)
@@ -238,7 +238,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 StartTime = 23000,
                 Position = new Vector2(100, 100),
-                Path = new SliderPath(PathType.PERFECTCURVE, new[]
+                Path = new SliderPath(PathType.PERFECT_CURVE, new[]
                 {
                     Vector2.Zero,
                     new Vector2(300, 200)
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 53228cff82..ac9048d5c7 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -221,7 +221,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         /// </summary>
         private void updatePathType()
         {
-            if (ControlPoint.Type != PathType.PERFECTCURVE)
+            if (ControlPoint.Type != PathType.PERFECT_CURVE)
                 return;
 
             if (PointsInSegment.Count > 3)
@@ -259,19 +259,19 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (ControlPoint.Type is not PathType pathType)
                 return colours.Yellow;
 
-            switch (pathType)
+            switch (pathType.Type)
             {
-                case { Type: SplineType.Catmull }:
+                case SplineType.Catmull:
                     return colours.SeaFoam;
 
-                case { Type: SplineType.BSpline, Degree: null }:
-                    return colours.PinkLighter;
+                case SplineType.BSpline:
+                    if (!pathType.Degree.HasValue)
+                        return colours.PinkLighter;
 
-                case { Type: SplineType.BSpline, Degree: >= 1 }:
                     int idx = Math.Clamp(pathType.Degree.Value, 0, 3);
                     return new[] { colours.PinkDarker, colours.PinkDark, colours.Pink, colours.PinkLight }[idx];
 
-                case { Type: SplineType.PerfectCurve }:
+                case SplineType.PerfectCurve:
                     return colours.PurpleDark;
 
                 default:
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 4e85835652..5ab050ed48 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -368,7 +368,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
                 // todo: hide/disable items which aren't valid for selected points
                 curveTypeItems.Add(createMenuItemForPathType(PathType.LINEAR));
-                curveTypeItems.Add(createMenuItemForPathType(PathType.PERFECTCURVE));
+                curveTypeItems.Add(createMenuItemForPathType(PathType.PERFECT_CURVE));
                 curveTypeItems.Add(createMenuItemForPathType(PathType.BEZIER));
                 curveTypeItems.Add(createMenuItemForPathType(PathType.BSpline(3)));
                 curveTypeItems.Add(createMenuItemForPathType(PathType.CATMULL));
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 9ac28fe82a..c722f0fdbc 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -251,7 +251,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     break;
 
                 case 3:
-                    segmentStart.Type = PathType.PERFECTCURVE;
+                    segmentStart.Type = PathType.PERFECT_CURVE;
                     break;
 
                 default:
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
index ae772f53fc..643732d90a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Edit;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public partial class OsuSliderDrawingSettingsProvider : Drawable, ISliderDrawingSettingsProvider
+    public partial class OsuSliderDrawingSettingsProvider : Drawable, ISliderDrawingSettingsProvider, IToolboxAttachment
     {
         public BindableFloat Tolerance { get; } = new BindableFloat(0.1f)
         {
@@ -27,12 +27,14 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private ExpandableSlider<int> toleranceSlider = null!;
 
-        public OsuSliderDrawingSettingsProvider()
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             sliderTolerance.BindValueChanged(v =>
             {
                 float newValue = v.NewValue / 100f;
-                if (!Precision.AlmostEquals(newValue, Tolerance.Value, 1e-7f))
+                if (!Precision.AlmostEquals(newValue, Tolerance.Value))
                     Tolerance.Value = newValue;
             });
             Tolerance.BindValueChanged(v =>
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 18c21046fb..34b96bbd3f 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -808,7 +808,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var first = ((IHasPath)decoded.HitObjects[0]).Path;
 
                 Assert.That(first.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-                Assert.That(first.ControlPoints[0].Type, Is.EqualTo(PathType.PERFECTCURVE));
+                Assert.That(first.ControlPoints[0].Type, Is.EqualTo(PathType.PERFECT_CURVE));
                 Assert.That(first.ControlPoints[1].Position, Is.EqualTo(new Vector2(161, -244)));
                 Assert.That(first.ControlPoints[1].Type, Is.EqualTo(null));
 
@@ -827,7 +827,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var second = ((IHasPath)decoded.HitObjects[1]).Path;
 
                 Assert.That(second.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-                Assert.That(second.ControlPoints[0].Type, Is.EqualTo(PathType.PERFECTCURVE));
+                Assert.That(second.ControlPoints[0].Type, Is.EqualTo(PathType.PERFECT_CURVE));
                 Assert.That(second.ControlPoints[1].Position, Is.EqualTo(new Vector2(161, -244)));
                 Assert.That(second.ControlPoints[1].Type, Is.EqualTo(null));
                 Assert.That(second.ControlPoints[2].Position, Is.EqualTo(new Vector2(376, -3)));
@@ -904,12 +904,12 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var seventh = ((IHasPath)decoded.HitObjects[6]).Path;
 
                 Assert.That(seventh.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero));
-                Assert.That(seventh.ControlPoints[0].Type == PathType.PERFECTCURVE);
+                Assert.That(seventh.ControlPoints[0].Type == PathType.PERFECT_CURVE);
                 Assert.That(seventh.ControlPoints[1].Position, Is.EqualTo(new Vector2(75, 145)));
                 Assert.That(seventh.ControlPoints[1].Type == null);
                 Assert.That(seventh.ControlPoints[2].Position, Is.EqualTo(new Vector2(170, 75)));
 
-                Assert.That(seventh.ControlPoints[2].Type == PathType.PERFECTCURVE);
+                Assert.That(seventh.ControlPoints[2].Type == PathType.PERFECT_CURVE);
                 Assert.That(seventh.ControlPoints[3].Position, Is.EqualTo(new Vector2(300, 145)));
                 Assert.That(seventh.ControlPoints[3].Type == null);
                 Assert.That(seventh.ControlPoints[4].Position, Is.EqualTo(new Vector2(410, 20)));
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs
index e2333011c7..27497f77be 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBezierConverter.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 path.ControlPoints.AddRange(createSegment(PathType.LINEAR, Vector2.Zero, new Vector2(100, 0)));
                 path.ControlPoints.AddRange(createSegment(PathType.BEZIER, new Vector2(100, 0), new Vector2(150, 30), new Vector2(100, 100)));
-                path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, new Vector2(100, 100), new Vector2(25, 50), Vector2.Zero));
+                path.ControlPoints.AddRange(createSegment(PathType.PERFECT_CURVE, new Vector2(100, 100), new Vector2(25, 50), Vector2.Zero));
             });
         }
 
@@ -159,7 +159,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create path", () =>
             {
-                path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, Vector2.Zero, new Vector2(width / 2, height), new Vector2(width, 0)));
+                path.ControlPoints.AddRange(createSegment(PathType.PERFECT_CURVE, Vector2.Zero, new Vector2(width / 2, height), new Vector2(width, 0)));
             });
         }
 
@@ -172,11 +172,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                 switch (points)
                 {
                     case 2:
-                        path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, Vector2.Zero, new Vector2(0, 100)));
+                        path.ControlPoints.AddRange(createSegment(PathType.PERFECT_CURVE, Vector2.Zero, new Vector2(0, 100)));
                         break;
 
                     case 4:
-                        path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
+                        path.ControlPoints.AddRange(createSegment(PathType.PERFECT_CURVE, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
                         break;
                 }
             });
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
index d44af45fe4..44a2e5fb9b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
@@ -149,11 +149,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                 switch (points)
                 {
                     case 2:
-                        path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, Vector2.Zero, new Vector2(0, 100)));
+                        path.ControlPoints.AddRange(createSegment(PathType.PERFECT_CURVE, Vector2.Zero, new Vector2(0, 100)));
                         break;
 
                     case 4:
-                        path.ControlPoints.AddRange(createSegment(PathType.PERFECTCURVE, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
+                        path.ControlPoints.AddRange(createSegment(PathType.PERFECT_CURVE, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
                         break;
                 }
             });
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index ff446206ac..b375a6f7ff 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -437,7 +437,7 @@ namespace osu.Game.Beatmaps.Formats
                     // Explicit segments have a new format in which the type is injected into the middle of the control point string.
                     // To preserve compatibility with osu-stable as much as possible, explicit segments with the same type are converted to use implicit segments by duplicating the control point.
                     // One exception are consecutive perfect curves, which aren't supported in osu!stable and can lead to decoding issues if encoded as implicit segments
-                    bool needsExplicitSegment = point.Type != lastType || point.Type == PathType.PERFECTCURVE;
+                    bool needsExplicitSegment = point.Type != lastType || point.Type == PathType.PERFECT_CURVE;
 
                     // Another exception to this is when the last two control points of the last segment were duplicated. This is not a scenario supported by osu!stable.
                     // Lazer does not add implicit segments for the last two control points of _any_ explicit segment, so an explicit segment is forced in order to maintain consistency with the decoder.
@@ -453,25 +453,21 @@ namespace osu.Game.Beatmaps.Formats
 
                     if (needsExplicitSegment)
                     {
-                        switch (point.Type)
+                        switch (point.Type?.Type)
                         {
-                            case { Type: SplineType.BSpline, Degree: > 0 }:
-                                writer.Write($"B{point.Type.Value.Degree}|");
+                            case SplineType.BSpline:
+                                writer.Write(point.Type.Value.Degree > 0 ? $"B{point.Type.Value.Degree}|" : "B|");
                                 break;
 
-                            case { Type: SplineType.BSpline, Degree: <= 0 }:
-                                writer.Write("B|");
-                                break;
-
-                            case { Type: SplineType.Catmull }:
+                            case SplineType.Catmull:
                                 writer.Write("C|");
                                 break;
 
-                            case { Type: SplineType.PerfectCurve }:
+                            case SplineType.PerfectCurve:
                                 writer.Write("P|");
                                 break;
 
-                            case { Type: SplineType.Linear }:
+                            case SplineType.Linear:
                                 writer.Write("L|");
                                 break;
                         }
diff --git a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
index ddf539771d..68411d2b01 100644
--- a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
@@ -29,7 +29,7 @@ using osu.Game.Screens.Edit.Components.TernaryButtons;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract partial class ComposerDistanceSnapProvider : Component, IDistanceSnapProvider, IScrollBindingHandler<GlobalAction>
+    public abstract partial class ComposerDistanceSnapProvider : Component, IDistanceSnapProvider, IScrollBindingHandler<GlobalAction>, IToolboxAttachment
     {
         private const float adjust_step = 0.1f;
 
diff --git a/osu.Game/Rulesets/Edit/IToolboxAttachment.cs b/osu.Game/Rulesets/Edit/IToolboxAttachment.cs
new file mode 100644
index 0000000000..7d7c5980b2
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/IToolboxAttachment.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.Rulesets.Edit
+{
+    public interface IToolboxAttachment
+    {
+        void AttachToToolbox(ExpandingToolboxContainer toolbox);
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/BezierConverter.cs b/osu.Game/Rulesets/Objects/BezierConverter.cs
index ed86fc10e0..5dc0839d37 100644
--- a/osu.Game/Rulesets/Objects/BezierConverter.cs
+++ b/osu.Game/Rulesets/Objects/BezierConverter.cs
@@ -126,9 +126,9 @@ namespace osu.Game.Rulesets.Objects
                 var segmentVertices = vertices.AsSpan().Slice(start, i - start + 1);
                 var segmentType = controlPoints[start].Type ?? PathType.LINEAR;
 
-                switch (segmentType)
+                switch (segmentType.Type)
                 {
-                    case { Type: SplineType.Catmull }:
+                    case SplineType.Catmull:
                         foreach (var segment in ConvertCatmullToBezierAnchors(segmentVertices))
                         {
                             for (int j = 0; j < segment.Length - 1; j++)
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Objects
 
                         break;
 
-                    case { Type: SplineType.Linear }:
+                    case SplineType.Linear:
                         foreach (var segment in ConvertLinearToBezierAnchors(segmentVertices))
                         {
                             for (int j = 0; j < segment.Length - 1; j++)
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.Objects
 
                         break;
 
-                    case { Type: SplineType.PerfectCurve }:
+                    case SplineType.PerfectCurve:
                         var circleResult = ConvertCircleToBezierAnchors(segmentVertices);
 
                         for (int j = 0; j < circleResult.Length - 1; j++)
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 6a13a897c4..92a92dca8f 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -224,19 +224,19 @@ namespace osu.Game.Rulesets.Objects.Legacy
             {
                 default:
                 case 'C':
-                    return new PathType(SplineType.Catmull);
+                    return PathType.CATMULL;
 
                 case 'B':
                     if (input.Length > 1 && int.TryParse(input.Substring(1), out int degree) && degree > 0)
-                        return new PathType { Type = SplineType.BSpline, Degree = degree };
+                        return PathType.BSpline(degree);
 
                     return new PathType(SplineType.BSpline);
 
                 case 'L':
-                    return new PathType(SplineType.Linear);
+                    return PathType.LINEAR;
 
                 case 'P':
-                    return new PathType(SplineType.PerfectCurve);
+                    return PathType.PERFECT_CURVE;
             }
         }
 
@@ -323,7 +323,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 readPoint(endPoint, offset, out vertices[^1]);
 
             // Edge-case rules (to match stable).
-            if (type == PathType.PERFECTCURVE)
+            if (type == PathType.PERFECT_CURVE)
             {
                 if (vertices.Length != 3)
                     type = PathType.BEZIER;
diff --git a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
index d7e5e4574d..29b34ae4f0 100644
--- a/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
+++ b/osu.Game/Rulesets/Objects/SliderPathExtensions.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Objects
             inheritedLinearPoints.ForEach(p => p.Type = null);
 
             // Recalculate middle perfect curve control points at the end of the slider path.
-            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PERFECTCURVE && controlPoints[^2].Type is null && segmentEnds.Any())
+            if (controlPoints.Count >= 3 && controlPoints[^3].Type == PathType.PERFECT_CURVE && controlPoints[^2].Type is null && segmentEnds.Any())
             {
                 double lastSegmentStart = segmentEnds.Length > 1 ? segmentEnds[^2] : 0;
                 double lastSegmentEnd = segmentEnds[^1];
diff --git a/osu.Game/Rulesets/Objects/Types/PathType.cs b/osu.Game/Rulesets/Objects/Types/PathType.cs
index a6e8e173d4..4fb48bb8b4 100644
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
@@ -14,12 +13,12 @@ namespace osu.Game.Rulesets.Objects.Types
         PerfectCurve
     }
 
-    public readonly struct PathType
+    public readonly struct PathType : IEquatable<PathType>
     {
         public static readonly PathType CATMULL = new PathType(SplineType.Catmull);
         public static readonly PathType BEZIER = new PathType(SplineType.BSpline);
         public static readonly PathType LINEAR = new PathType(SplineType.Linear);
-        public static readonly PathType PERFECTCURVE = new PathType(SplineType.PerfectCurve);
+        public static readonly PathType PERFECT_CURVE = new PathType(SplineType.PerfectCurve);
 
         /// <summary>
         /// The type of the spline that should be used to interpret the control points of the path.
@@ -52,8 +51,13 @@ namespace osu.Game.Rulesets.Objects.Types
 
         public static PathType BSpline(int degree)
         {
-            Debug.Assert(degree > 0);
+            if (degree <= 0)
+                throw new ArgumentOutOfRangeException(nameof(degree), "The degree of a B-Spline path must be greater than zero.");
+
             return new PathType { Type = SplineType.BSpline, Degree = degree };
         }
+
+        public bool Equals(PathType other)
+            => Type == other.Type && Degree == other.Degree;
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fc10f90e8f..8d42cd22e3 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1113.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1023.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1110.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.33.0" />

From e3137d575bbea46423c8124a9ade25fab18d03f2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 14 Nov 2023 01:11:17 +0900
Subject: [PATCH 1540/2296] Fix osu! and base HP processor break time
 implementation

---
 .../TestSceneOsuHealthProcessor.cs            | 94 +++++++++++++++++++
 .../Scoring/OsuHealthProcessor.cs             | 25 ++---
 .../TestSceneDrainingHealthProcessor.cs       | 81 +++++++++++++++-
 .../Scoring/DrainingHealthProcessor.cs        | 44 ++++-----
 4 files changed, 203 insertions(+), 41 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs
new file mode 100644
index 0000000000..f810bbf155
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs
@@ -0,0 +1,94 @@
+// 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.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuHealthProcessor
+    {
+        [Test]
+        public void TestNoBreak()
+        {
+            OsuHealthProcessor hp = new OsuHealthProcessor(-1000);
+            hp.ApplyBeatmap(new Beatmap<OsuHitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 2000 }
+                }
+            });
+
+            Assert.That(hp.DrainRate, Is.EqualTo(1.4E-5).Within(0.1E-5));
+        }
+
+        [Test]
+        public void TestSingleBreak()
+        {
+            OsuHealthProcessor hp = new OsuHealthProcessor(-1000);
+            hp.ApplyBeatmap(new Beatmap<OsuHitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 2000 }
+                },
+                Breaks =
+                {
+                    new BreakPeriod(500, 1500)
+                }
+            });
+
+            Assert.That(hp.DrainRate, Is.EqualTo(4.3E-5).Within(0.1E-5));
+        }
+
+        [Test]
+        public void TestOverlappingBreak()
+        {
+            OsuHealthProcessor hp = new OsuHealthProcessor(-1000);
+            hp.ApplyBeatmap(new Beatmap<OsuHitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 2000 }
+                },
+                Breaks =
+                {
+                    new BreakPeriod(500, 1400),
+                    new BreakPeriod(750, 1500),
+                }
+            });
+
+            Assert.That(hp.DrainRate, Is.EqualTo(4.3E-5).Within(0.1E-5));
+        }
+
+        [Test]
+        public void TestSequentialBreak()
+        {
+            OsuHealthProcessor hp = new OsuHealthProcessor(-1000);
+            hp.ApplyBeatmap(new Beatmap<OsuHitObject>
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = 0 },
+                    new HitCircle { StartTime = 2000 }
+                },
+                Breaks =
+                {
+                    new BreakPeriod(500, 1000),
+                    new BreakPeriod(1000, 1500),
+                }
+            });
+
+            Assert.That(hp.DrainRate, Is.EqualTo(4.3E-5).Within(0.1E-5));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 5802f8fc0d..3207c7fb51 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Logging;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
@@ -64,25 +62,16 @@ namespace osu.Game.Rulesets.Osu.Scoring
                 {
                     HitObject h = Beatmap.HitObjects[i];
 
-                    // Find active break (between current and lastTime)
-                    double localLastTime = lastTime;
-                    double breakTime = 0;
-
-                    // TODO: This doesn't handle overlapping/sequential breaks correctly (/b/614).
-                    // Subtract any break time from the duration since the last object
-                    if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
+                    while (currentBreak < Beatmap.Breaks.Count && Beatmap.Breaks[currentBreak].EndTime <= h.StartTime)
                     {
-                        BreakPeriod e = Beatmap.Breaks[currentBreak];
-
-                        if (e.StartTime >= localLastTime && e.EndTime <= h.StartTime)
-                        {
-                            // consider break start equal to object end time for version 8+ since drain stops during this time
-                            breakTime = (Beatmap.BeatmapInfo.BeatmapVersion < 8) ? (e.EndTime - e.StartTime) : e.EndTime - localLastTime;
-                            currentBreak++;
-                        }
+                        // If two hitobjects are separated by a break period, there is no drain for the full duration between the hitobjects.
+                        // This differs from legacy (version < 8) beatmaps which continue draining until the break section is entered,
+                        // but this shouldn't have a noticeable impact in practice.
+                        lastTime = h.StartTime;
+                        currentBreak++;
                     }
 
-                    reduceHp(testDrop * (h.StartTime - lastTime - breakTime));
+                    reduceHp(testDrop * (h.StartTime - lastTime));
 
                     lastTime = h.GetEndTime();
 
diff --git a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
index fd0bff101f..584a9e09c0 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
@@ -192,7 +192,8 @@ namespace osu.Game.Tests.Gameplay
             AddStep("apply perfect hit result", () => processor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], new Judgement()) { Type = HitResult.Perfect }));
             AddAssert("not failed", () => !processor.HasFailed);
 
-            AddStep($"apply {resultApplied.ToString().ToLowerInvariant()} hit result", () => processor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], new Judgement()) { Type = resultApplied }));
+            AddStep($"apply {resultApplied.ToString().ToLowerInvariant()} hit result",
+                () => processor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], new Judgement()) { Type = resultApplied }));
             AddAssert("failed", () => processor.HasFailed);
         }
 
@@ -232,6 +233,84 @@ namespace osu.Game.Tests.Gameplay
             assertHealthEqualTo(1);
         }
 
+        [Test]
+        public void TestNoBreakDrainRate()
+        {
+            DrainingHealthProcessor hp = new DrainingHealthProcessor(-1000);
+            hp.ApplyBeatmap(new Beatmap<JudgeableHitObject>
+            {
+                HitObjects =
+                {
+                    new JudgeableHitObject { StartTime = 0 },
+                    new JudgeableHitObject { StartTime = 2000 }
+                }
+            });
+
+            Assert.That(hp.DrainRate, Is.EqualTo(4.5E-5).Within(0.1E-5));
+        }
+
+        [Test]
+        public void TestSingleBreakDrainRate()
+        {
+            DrainingHealthProcessor hp = new DrainingHealthProcessor(-1000);
+            hp.ApplyBeatmap(new Beatmap<JudgeableHitObject>
+            {
+                HitObjects =
+                {
+                    new JudgeableHitObject { StartTime = 0 },
+                    new JudgeableHitObject { StartTime = 2000 }
+                },
+                Breaks =
+                {
+                    new BreakPeriod(500, 1500)
+                }
+            });
+
+            Assert.That(hp.DrainRate, Is.EqualTo(9.1E-5).Within(0.1E-5));
+        }
+
+        [Test]
+        public void TestOverlappingBreakDrainRate()
+        {
+            DrainingHealthProcessor hp = new DrainingHealthProcessor(-1000);
+            hp.ApplyBeatmap(new Beatmap<JudgeableHitObject>
+            {
+                HitObjects =
+                {
+                    new JudgeableHitObject { StartTime = 0 },
+                    new JudgeableHitObject { StartTime = 2000 }
+                },
+                Breaks =
+                {
+                    new BreakPeriod(500, 1400),
+                    new BreakPeriod(750, 1500),
+                }
+            });
+
+            Assert.That(hp.DrainRate, Is.EqualTo(9.1E-5).Within(0.1E-5));
+        }
+
+        [Test]
+        public void TestSequentialBreakDrainRate()
+        {
+            DrainingHealthProcessor hp = new DrainingHealthProcessor(-1000);
+            hp.ApplyBeatmap(new Beatmap<JudgeableHitObject>
+            {
+                HitObjects =
+                {
+                    new JudgeableHitObject { StartTime = 0 },
+                    new JudgeableHitObject { StartTime = 2000 }
+                },
+                Breaks =
+                {
+                    new BreakPeriod(500, 1000),
+                    new BreakPeriod(1000, 1500),
+                }
+            });
+
+            Assert.That(hp.DrainRate, Is.EqualTo(9.1E-5).Within(0.1E-5));
+        }
+
         private Beatmap createBeatmap(double startTime, double endTime, params BreakPeriod[] breaks)
         {
             var beatmap = new Beatmap
diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index a8808d08e5..3d4fb862fb 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -103,18 +103,20 @@ namespace osu.Game.Rulesets.Scoring
             if (beatmap.HitObjects.Count > 0)
                 gameplayEndTime = beatmap.HitObjects[^1].GetEndTime();
 
-            noDrainPeriodTracker = new PeriodTracker(beatmap.Breaks.Select(breakPeriod => new Period(
-                beatmap.HitObjects
-                       .Select(hitObject => hitObject.GetEndTime())
-                       .Where(endTime => endTime <= breakPeriod.StartTime)
-                       .DefaultIfEmpty(double.MinValue)
-                       .Last(),
-                beatmap.HitObjects
-                       .Select(hitObject => hitObject.StartTime)
-                       .Where(startTime => startTime >= breakPeriod.EndTime)
-                       .DefaultIfEmpty(double.MaxValue)
-                       .First()
-            )));
+            noDrainPeriodTracker = new PeriodTracker(
+                beatmap.Breaks.Select(breakPeriod =>
+                    new Period(
+                        beatmap.HitObjects
+                               .Select(hitObject => hitObject.GetEndTime())
+                               .Where(endTime => endTime <= breakPeriod.StartTime)
+                               .DefaultIfEmpty(double.MinValue)
+                               .Last(),
+                        beatmap.HitObjects
+                               .Select(hitObject => hitObject.StartTime)
+                               .Where(startTime => startTime >= breakPeriod.EndTime)
+                               .DefaultIfEmpty(double.MaxValue)
+                               .First()
+                    )));
 
             targetMinimumHealth = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, min_health_target, mid_health_target, max_health_target);
 
@@ -161,26 +163,24 @@ namespace osu.Game.Rulesets.Scoring
             {
                 double currentHealth = 1;
                 double lowestHealth = 1;
-                int currentBreak = -1;
+                int currentBreak = 0;
 
                 for (int i = 0; i < healthIncreases.Count; i++)
                 {
                     double currentTime = healthIncreases[i].time;
                     double lastTime = i > 0 ? healthIncreases[i - 1].time : DrainStartTime;
 
-                    // Subtract any break time from the duration since the last object
-                    if (Beatmap.Breaks.Count > 0)
+                    while (currentBreak < Beatmap.Breaks.Count && Beatmap.Breaks[currentBreak].EndTime <= currentTime)
                     {
-                        // Advance the last break occuring before the current time
-                        while (currentBreak + 1 < Beatmap.Breaks.Count && Beatmap.Breaks[currentBreak + 1].EndTime < currentTime)
-                            currentBreak++;
-
-                        if (currentBreak >= 0)
-                            lastTime = Math.Max(lastTime, Beatmap.Breaks[currentBreak].EndTime);
+                        // If two hitobjects are separated by a break period, there is no drain for the full duration between the hitobjects.
+                        // This differs from legacy (version < 8) beatmaps which continue draining until the break section is entered,
+                        // but this shouldn't have a noticeable impact in practice.
+                        lastTime = currentTime;
+                        currentBreak++;
                     }
 
                     // Apply health adjustments
-                    currentHealth -= (healthIncreases[i].time - lastTime) * result;
+                    currentHealth -= (currentTime - lastTime) * result;
                     lowestHealth = Math.Min(lowestHealth, currentHealth);
                     currentHealth = Math.Min(1, currentHealth + healthIncreases[i].health);
 

From 69c2c0e4278d4d419b3ee1ea11f4c8e491514247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 14 Nov 2023 16:30:08 +0900
Subject: [PATCH 1541/2296] Fix touch device mod declared valid for multiplayer

Mostly matters for web, so that it doesn't permit creation of playlist
items with touch device inside.
---
 osu.Game/Rulesets/Mods/ModTouchDevice.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModTouchDevice.cs b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
index b80b042f11..e91a398700 100644
--- a/osu.Game/Rulesets/Mods/ModTouchDevice.cs
+++ b/osu.Game/Rulesets/Mods/ModTouchDevice.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Rulesets.Mods
         public sealed override LocalisableString Description => "Automatically applied to plays on devices with a touchscreen.";
         public sealed override double ScoreMultiplier => 1;
         public sealed override ModType Type => ModType.System;
+        public sealed override bool ValidForMultiplayer => false;
+        public sealed override bool ValidForMultiplayerAsFreeMod => false;
         public sealed override bool AlwaysValidForSubmission => true;
         public override Type[] IncompatibleMods => new[] { typeof(ICreateReplayData) };
     }

From 70d2de56695800a2ca14a027d32cf2c36153e8f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 14 Nov 2023 16:35:16 +0900
Subject: [PATCH 1542/2296] Move song select touch detector to solo
 implementation

It should not run in multiplayer. Even if we wanted to allow touch-only
playlist items at some point, the current behaviour of multiplayer song
selects with respect to touch device mod is currently just broken.
---
 osu.Game/Screens/Select/PlaySongSelect.cs | 2 ++
 osu.Game/Screens/Select/SongSelect.cs     | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index fe13d6d5a8..86bebdc2ff 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -48,6 +48,8 @@ namespace osu.Game.Screens.Select
         private void load(OsuColour colours)
         {
             BeatmapOptions.AddButton(ButtonSystemStrings.Edit.ToSentence(), @"beatmap", FontAwesome.Solid.PencilAlt, colours.Yellow, () => Edit());
+
+            AddInternal(new SongSelectTouchInputDetector());
         }
 
         protected void PresentScore(ScoreInfo score) =>
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 03083672d5..dfea4e3794 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -279,7 +279,6 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
-                new SongSelectTouchInputDetector()
             });
 
             if (ShowFooter)

From 90ec6895d100dea67e282c75a57779ffa87d0f5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Mu=CC=88ller-Ho=CC=88hne?= <thomas94@gmx.net>
Date: Tue, 14 Nov 2023 16:52:45 +0900
Subject: [PATCH 1543/2296] Automatic red control point generation & corner
 threshold

---
 .../Sliders/SliderPlacementBlueprint.cs       | 28 +++++++++--
 .../Edit/ISliderDrawingSettingsProvider.cs    |  1 +
 .../Edit/OsuSliderDrawingSettingsProvider.cs  | 46 +++++++++++++++++--
 3 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index c722f0fdbc..69e2a40689 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -86,6 +86,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     bSplineBuilder.Tolerance = e.NewValue;
                 updateSliderPathFromBSplineBuilder();
             }, true);
+
+            drawingSettingsProvider.CornerThreshold.BindValueChanged(e =>
+            {
+                if (bSplineBuilder.CornerThreshold != e.NewValue)
+                    bSplineBuilder.CornerThreshold = e.NewValue;
+                updateSliderPathFromBSplineBuilder();
+            }, true);
         }
 
         [Resolved]
@@ -100,8 +107,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 case SliderPlacementState.Initial:
                     BeginPlacement();
 
-                    double? nearestSliderVelocity = (editorBeatmap.HitObjects
-                                                                  .LastOrDefault(h => h is Slider && h.GetEndTime() < HitObject.StartTime) as Slider)?.SliderVelocityMultiplier;
+                    double? nearestSliderVelocity = (editorBeatmap
+                        .HitObjects
+                        .LastOrDefault(h => h is Slider && h.GetEndTime() < HitObject.StartTime) as Slider)?.SliderVelocityMultiplier;
 
                     HitObject.SliderVelocityMultiplier = nearestSliderVelocity ?? 1;
                     HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
@@ -193,9 +201,19 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             Scheduler.AddOnce(static self =>
             {
-                var cps = self.bSplineBuilder.GetControlPoints();
-                self.HitObject.Path.ControlPoints.RemoveRange(1, self.HitObject.Path.ControlPoints.Count - 1);
-                self.HitObject.Path.ControlPoints.AddRange(cps.Skip(1).Select(v => new PathControlPoint(v)));
+                var cps = self.bSplineBuilder.ControlPoints;
+                var sliderCps = self.HitObject.Path.ControlPoints;
+                sliderCps.RemoveRange(1, sliderCps.Count - 1);
+
+                // Add the control points from the BSpline builder while converting control points that repeat
+                // three or more times to a single PathControlPoint with linear type.
+                for (int i = 1; i < cps.Count; i++)
+                {
+                    bool isSharp = i < cps.Count - 2 && cps[i] == cps[i + 1] && cps[i] == cps[i + 2];
+                    sliderCps.Add(new PathControlPoint(cps[i], isSharp ? PathType.BSpline(3) : null));
+                    if (isSharp)
+                        i += 2;
+                }
             }, this);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs
index 1138588259..31ed98e1dd 100644
--- a/osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs
@@ -8,5 +8,6 @@ namespace osu.Game.Rulesets.Osu.Edit
     public interface ISliderDrawingSettingsProvider
     {
         BindableFloat Tolerance { get; }
+        BindableFloat CornerThreshold { get; }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
index 643732d90a..1fe1326f38 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
@@ -12,20 +12,34 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public partial class OsuSliderDrawingSettingsProvider : Drawable, ISliderDrawingSettingsProvider, IToolboxAttachment
     {
-        public BindableFloat Tolerance { get; } = new BindableFloat(0.1f)
+        public BindableFloat Tolerance { get; } = new BindableFloat(1.5f)
+        {
+            MinValue = 0.05f,
+            MaxValue = 3f,
+            Precision = 0.01f
+        };
+
+        private readonly BindableInt sliderTolerance = new BindableInt(50)
+        {
+            MinValue = 5,
+            MaxValue = 100
+        };
+
+        public BindableFloat CornerThreshold { get; } = new BindableFloat(0.4f)
         {
             MinValue = 0.05f,
             MaxValue = 1f,
             Precision = 0.01f
         };
 
-        private readonly BindableInt sliderTolerance = new BindableInt(10)
+        private readonly BindableInt sliderCornerThreshold = new BindableInt(40)
         {
             MinValue = 5,
             MaxValue = 100
         };
 
         private ExpandableSlider<int> toleranceSlider = null!;
+        private ExpandableSlider<int> cornerThresholdSlider = null!;
 
         protected override void LoadComplete()
         {
@@ -33,16 +47,28 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             sliderTolerance.BindValueChanged(v =>
             {
-                float newValue = v.NewValue / 100f;
-                if (!Precision.AlmostEquals(newValue, Tolerance.Value))
+                float newValue = v.NewValue / 33f;
+                if (!Precision.AlmostEquals(newValue, Tolerance.Value, 1e-7f))
                     Tolerance.Value = newValue;
             });
             Tolerance.BindValueChanged(v =>
             {
-                int newValue = (int)Math.Round(v.NewValue * 100f);
+                int newValue = (int)Math.Round(v.NewValue * 33f);
                 if (sliderTolerance.Value != newValue)
                     sliderTolerance.Value = newValue;
             });
+            sliderCornerThreshold.BindValueChanged(v =>
+            {
+                float newValue = v.NewValue / 100f;
+                if (!Precision.AlmostEquals(newValue, CornerThreshold.Value, 1e-7f))
+                    CornerThreshold.Value = newValue;
+            });
+            CornerThreshold.BindValueChanged(v =>
+            {
+                int newValue = (int)Math.Round(v.NewValue * 100f);
+                if (sliderCornerThreshold.Value != newValue)
+                    sliderCornerThreshold.Value = newValue;
+            });
         }
 
         public void AttachToToolbox(ExpandingToolboxContainer toolboxContainer)
@@ -54,6 +80,10 @@ namespace osu.Game.Rulesets.Osu.Edit
                     toleranceSlider = new ExpandableSlider<int>
                     {
                         Current = sliderTolerance
+                    },
+                    cornerThresholdSlider = new ExpandableSlider<int>
+                    {
+                        Current = sliderCornerThreshold
                     }
                 }
             });
@@ -63,6 +93,12 @@ namespace osu.Game.Rulesets.Osu.Edit
                 toleranceSlider.ContractedLabelText = $"C. P. S.: {e.NewValue:N0}";
                 toleranceSlider.ExpandedLabelText = $"Control Point Spacing: {e.NewValue:N0}";
             }, true);
+
+            sliderCornerThreshold.BindValueChanged(e =>
+            {
+                cornerThresholdSlider.ContractedLabelText = $"C. T.: {e.NewValue:N0}";
+                cornerThresholdSlider.ExpandedLabelText = $"Corner Threshold: {e.NewValue:N0}";
+            }, true);
         }
     }
 }

From 83f8f03c7e3b173766e9c715bd7869929082600b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 14 Nov 2023 21:46:57 +0900
Subject: [PATCH 1544/2296] Fix argon health bar not relative sizing correctly

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index f4ce7d1633..4a5faafd8b 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -141,7 +141,13 @@ namespace osu.Game.Screens.Play.HUD
 
             Current.BindValueChanged(_ => Scheduler.AddOnce(updateCurrent), true);
 
+            // we're about to set `RelativeSizeAxes` depending on the value of `UseRelativeSize`.
+            // setting `RelativeSizeAxes` internally transforms absolute sizing to relative and back to keep the size the same,
+            // but that is not what we want in this case, since the width at this point is valid in the *target* sizing mode.
+            // to counteract this, store the numerical value here, and restore it after setting the correct initial relative sizing axes.
+            float previousWidth = Width;
             UseRelativeSize.BindValueChanged(v => RelativeSizeAxes = v.NewValue ? Axes.X : Axes.None, true);
+            Width = previousWidth;
 
             BarHeight.BindValueChanged(_ => updatePath(), true);
         }

From a745642f764cf28b37800936186399f459cdd47d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Nov 2023 22:01:56 +0900
Subject: [PATCH 1545/2296] Fix customised argon skins no longer loading due to
 incorrect resource store spec

---
 .../Screens/Play/HUD/ArgonCounterTextComponent.cs  | 14 +++++++-------
 osu.Game/Skinning/ArgonSkin.cs                     |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
index 56f60deae1..eabac9a3e6 100644
--- a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
@@ -9,11 +9,11 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
 using osu.Framework.Text;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -133,30 +133,30 @@ namespace osu.Game.Screens.Play.HUD
             }
 
             [BackgroundDependencyLoader]
-            private void load(ISkinSource skin)
+            private void load(TextureStore textures)
             {
                 Spacing = new Vector2(-2f, 0f);
                 Font = new FontUsage(@"argon-counter", 1);
-                glyphStore = new GlyphStore(skin, getLookup);
+                glyphStore = new GlyphStore(textures, getLookup);
             }
 
             protected override TextBuilder CreateTextBuilder(ITexturedGlyphLookupStore store) => base.CreateTextBuilder(glyphStore);
 
             private class GlyphStore : ITexturedGlyphLookupStore
             {
-                private readonly ISkin skin;
+                private readonly TextureStore textures;
                 private readonly Func<char, string> getLookup;
 
-                public GlyphStore(ISkin skin, Func<char, string> getLookup)
+                public GlyphStore(TextureStore textures, Func<char, string> getLookup)
                 {
-                    this.skin = skin;
+                    this.textures = textures;
                     this.getLookup = getLookup;
                 }
 
                 public ITexturedCharacterGlyph? Get(string fontName, char character)
                 {
                     string lookup = getLookup(character);
-                    var texture = skin.GetTexture($"{fontName}-{lookup}");
+                    var texture = textures.Get($"Gameplay/Fonts/{fontName}-{lookup}");
 
                     if (texture == null)
                         return null;
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 637467c748..226de4088c 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -8,7 +8,6 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Extensions;
@@ -44,8 +43,7 @@ namespace osu.Game.Skinning
         public ArgonSkin(SkinInfo skin, IStorageResourceProvider resources)
             : base(
                 skin,
-                resources,
-                new NamespacedResourceStore<byte[]>(resources.Resources, "Skins/Argon")
+                resources
             )
         {
             Resources = resources;

From 9a7d7dda2ae564fef11f3e544be339da42abb8d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Nov 2023 23:04:11 +0900
Subject: [PATCH 1546/2296] Update resources

---
 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 81600c1f72..9985afbd8b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1111.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1110.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1114.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.33.0" />

From f5e1734de9c37b1ea9fc8aac79bdf662e5503da0 Mon Sep 17 00:00:00 2001
From: Poyo <poyoarya@gmail.com>
Date: Tue, 14 Nov 2023 13:51:55 -0800
Subject: [PATCH 1547/2296] Use soft-cast to access IGameplayClock

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 7cfb6aedf0..5abca168ed 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -154,9 +154,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
-        [Resolved(CanBeNull = true)]
-        private IGameplayClock gameplayClock { get; set; }
-
         /// <summary>
         /// Whether the initialization logic in <see cref="Playfield" /> has applied.
         /// </summary>
@@ -707,7 +704,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             Result.RawTime = Time.Current;
-            Result.GameplayRate = gameplayClock?.GetTrueGameplayRate() ?? 1.0;
+            Result.GameplayRate = (Clock as IGameplayClock)?.GetTrueGameplayRate() ?? 1.0;
 
             if (Result.HasResult)
                 updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);

From 535282ba7d90303058c429c564c9d473afaf8e99 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 14 Nov 2023 14:13:20 -0800
Subject: [PATCH 1548/2296] Use existing localisation for corner radius in
 `BoxElement`

---
 osu.Game/Skinning/Components/BoxElement.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Components/BoxElement.cs b/osu.Game/Skinning/Components/BoxElement.cs
index 235f97ceef..f4f913d80a 100644
--- a/osu.Game/Skinning/Components/BoxElement.cs
+++ b/osu.Game/Skinning/Components/BoxElement.cs
@@ -7,6 +7,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Configuration;
+using osu.Game.Localisation.SkinComponents;
+using osu.Game.Overlays.Settings;
 using osuTK;
 using osuTK.Graphics;
 
@@ -16,7 +18,8 @@ namespace osu.Game.Skinning.Components
     {
         public bool UsesFixedAnchor { get; set; }
 
-        [SettingSource("Corner rounding", "How round the corners of the box should be.")]
+        [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.CornerRadius), nameof(SkinnableComponentStrings.CornerRadiusDescription),
+            SettingControlType = typeof(SettingsPercentageSlider<float>))]
         public BindableFloat CornerRounding { get; } = new BindableFloat(1)
         {
             Precision = 0.01f,

From 74fb1b5f81475121af75072367759a241aa4db38 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Nov 2023 10:40:59 +0900
Subject: [PATCH 1549/2296] Rename property to match expctations

---
 osu.Game/Skinning/Components/BoxElement.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Components/BoxElement.cs b/osu.Game/Skinning/Components/BoxElement.cs
index f4f913d80a..8b556418d2 100644
--- a/osu.Game/Skinning/Components/BoxElement.cs
+++ b/osu.Game/Skinning/Components/BoxElement.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Skinning.Components
 
         [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.CornerRadius), nameof(SkinnableComponentStrings.CornerRadiusDescription),
             SettingControlType = typeof(SettingsPercentageSlider<float>))]
-        public BindableFloat CornerRounding { get; } = new BindableFloat(1)
+        public new BindableFloat CornerRadius { get; } = new BindableFloat(1)
         {
             Precision = 0.01f,
             MinValue = 0,
@@ -47,7 +47,7 @@ namespace osu.Game.Skinning.Components
         {
             base.Update();
 
-            CornerRadius = CornerRounding.Value * Math.Min(DrawWidth, DrawHeight) * 0.5f;
+            base.CornerRadius = CornerRadius.Value * Math.Min(DrawWidth, DrawHeight) * 0.5f;
         }
     }
 }

From 2264e1e2493b69d0455f57639e60e3e2e10f7e96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Nov 2023 10:45:01 +0900
Subject: [PATCH 1550/2296] Change default value and range of `BoxElement`'s
 corner radius to match other usages

---
 osu.Game/Skinning/ArgonSkin.cs             | 5 ++++-
 osu.Game/Skinning/Components/BoxElement.cs | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 226de4088c..4588c62b0f 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -216,7 +216,10 @@ namespace osu.Game.Skinning
                                     },
                                     new ArgonScoreCounter(),
                                     new ArgonHealthDisplay(),
-                                    new BoxElement(),
+                                    new BoxElement
+                                    {
+                                        CornerRadius = { Value = 0.5f }
+                                    },
                                     new ArgonAccuracyCounter(),
                                     new ArgonComboCounter
                                     {
diff --git a/osu.Game/Skinning/Components/BoxElement.cs b/osu.Game/Skinning/Components/BoxElement.cs
index 8b556418d2..34d389728c 100644
--- a/osu.Game/Skinning/Components/BoxElement.cs
+++ b/osu.Game/Skinning/Components/BoxElement.cs
@@ -20,11 +20,11 @@ namespace osu.Game.Skinning.Components
 
         [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.CornerRadius), nameof(SkinnableComponentStrings.CornerRadiusDescription),
             SettingControlType = typeof(SettingsPercentageSlider<float>))]
-        public new BindableFloat CornerRadius { get; } = new BindableFloat(1)
+        public new BindableFloat CornerRadius { get; } = new BindableFloat(0.25f)
         {
-            Precision = 0.01f,
             MinValue = 0,
-            MaxValue = 1,
+            MaxValue = 0.5f,
+            Precision = 0.01f
         };
 
         public BoxElement()
@@ -47,7 +47,7 @@ namespace osu.Game.Skinning.Components
         {
             base.Update();
 
-            base.CornerRadius = CornerRadius.Value * Math.Min(DrawWidth, DrawHeight) * 0.5f;
+            base.CornerRadius = CornerRadius.Value * Math.Min(DrawWidth, DrawHeight);
         }
     }
 }

From 159cf41f824546013c22ec454fe1bb33a460f2d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 15 Nov 2023 12:24:47 +0900
Subject: [PATCH 1551/2296] Fix default argon health bar width being zero

Closes #25460.
---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 4a5faafd8b..82203d7891 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -94,6 +94,13 @@ namespace osu.Game.Screens.Play.HUD
         public ArgonHealthDisplay()
         {
             AddLayout(drawSizeLayout);
+
+            // sane default width specification.
+            // this only matters if the health display isn't part of the default skin
+            // (in which case width will be set to 300 via `ArgonSkin.GetDrawableComponent()`),
+            // and if the user hasn't applied their own modifications
+            // (which are applied via `SerialisedDrawableInfo.ApplySerialisedInfo()`).
+            Width = 0.98f;
         }
 
         [BackgroundDependencyLoader]

From 71714f8f6e6bd7d2caf9214ff267c05e550352e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 15 Nov 2023 13:33:03 +0900
Subject: [PATCH 1552/2296] Add back test step for testing out argon health bar
 width

---
 .../Visual/Gameplay/TestSceneArgonHealthDisplay.cs          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index f51577bc84..6c364e41c7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -52,6 +52,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                 if (healthDisplay.IsNotNull())
                     healthDisplay.BarHeight.Value = val;
             });
+
+            AddSliderStep("Width", 0, 1f, 0.98f, val =>
+            {
+                if (healthDisplay.IsNotNull())
+                    healthDisplay.Width = val;
+            });
         }
 
         [Test]

From 87ace7565dfffebbcfb34f48743406a0c68d1065 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 14 Nov 2023 20:44:33 -0800
Subject: [PATCH 1553/2296] Use existing localisation for argon counter
 component labels

---
 osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs | 2 +-
 osu.Game/Screens/Play/HUD/ArgonComboCounter.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
index 5f9441a5c4..55fdf24e8f 100644
--- a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Play.HUD
                         new Container
                         {
                             AutoSizeAxes = Axes.Both,
-                            Child = wholePart = new ArgonCounterTextComponent(Anchor.TopRight, "ACCURACY")
+                            Child = wholePart = new ArgonCounterTextComponent(Anchor.TopRight, BeatmapsetsStrings.ShowScoreboardHeadersAccuracy.ToUpper())
                             {
                                 RequiredDisplayDigits = { Value = 3 },
                                 WireframeOpacity = { BindTarget = WireframeOpacity }
diff --git a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
index ac710294ef..52af9b0247 100644
--- a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override LocalisableString FormatCount(int count) => $@"{count}x";
 
-        protected override IHasText CreateText() => text = new ArgonCounterTextComponent(Anchor.TopLeft, "COMBO")
+        protected override IHasText CreateText() => text = new ArgonCounterTextComponent(Anchor.TopLeft, MatchesStrings.MatchScoreStatsCombo.ToUpper())
         {
             WireframeOpacity = { BindTarget = WireframeOpacity },
         };

From 62352ce5f3b6ce56c310a83dccd11d9eb15f90fa Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 14 Nov 2023 20:45:23 -0800
Subject: [PATCH 1554/2296] Add ability to toggle labels on argon counter
 components

---
 .../SkinnableComponentStrings.cs              | 10 +++++++
 .../Screens/Play/HUD/ArgonAccuracyCounter.cs  | 28 ++++++++++++++++---
 .../Screens/Play/HUD/ArgonComboCounter.cs     |  7 +++++
 .../Play/HUD/ArgonCounterTextComponent.cs     |  4 ++-
 .../Screens/Play/HUD/ArgonScoreCounter.cs     |  8 +++++-
 5 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Localisation/SkinComponents/SkinnableComponentStrings.cs b/osu.Game/Localisation/SkinComponents/SkinnableComponentStrings.cs
index 7c11ea6ac6..639f5c9b16 100644
--- a/osu.Game/Localisation/SkinComponents/SkinnableComponentStrings.cs
+++ b/osu.Game/Localisation/SkinComponents/SkinnableComponentStrings.cs
@@ -49,6 +49,16 @@ namespace osu.Game.Localisation.SkinComponents
         /// </summary>
         public static LocalisableString CornerRadiusDescription => new TranslatableString(getKey(@"corner_radius_description"), "How rounded the corners should be.");
 
+        /// <summary>
+        /// "Show label"
+        /// </summary>
+        public static LocalisableString ShowLabel => new TranslatableString(getKey(@"show_label"), @"Show label");
+
+        /// <summary>
+        /// "Whether the label should be shown."
+        /// </summary>
+        public static LocalisableString ShowLabelDescription => new TranslatableString(getKey(@"show_label_description"), @"Whether the label should be shown.");
+
         private static string getKey(string key) => $"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
index 55fdf24e8f..521ad63426 100644
--- a/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 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.Localisation;
 using osu.Game.Configuration;
+using osu.Game.Localisation.SkinComponents;
+using osu.Game.Resources.Localisation.Web;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -25,20 +28,27 @@ namespace osu.Game.Screens.Play.HUD
             MaxValue = 1,
         };
 
+        [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel), nameof(SkinnableComponentStrings.ShowLabelDescription))]
+        public Bindable<bool> ShowLabel { get; } = new BindableBool(true);
+
         public bool UsesFixedAnchor { get; set; }
 
         protected override IHasText CreateText() => new ArgonAccuracyTextComponent
         {
             WireframeOpacity = { BindTarget = WireframeOpacity },
+            ShowLabel = { BindTarget = ShowLabel },
         };
 
         private partial class ArgonAccuracyTextComponent : CompositeDrawable, IHasText
         {
             private readonly ArgonCounterTextComponent wholePart;
             private readonly ArgonCounterTextComponent fractionPart;
+            private readonly ArgonCounterTextComponent percentText;
 
             public IBindable<float> WireframeOpacity { get; } = new BindableFloat();
 
+            public Bindable<bool> ShowLabel { get; } = new BindableBool();
+
             public LocalisableString Text
             {
                 get => wholePart.Text;
@@ -67,24 +77,34 @@ namespace osu.Game.Screens.Play.HUD
                             Child = wholePart = new ArgonCounterTextComponent(Anchor.TopRight, BeatmapsetsStrings.ShowScoreboardHeadersAccuracy.ToUpper())
                             {
                                 RequiredDisplayDigits = { Value = 3 },
-                                WireframeOpacity = { BindTarget = WireframeOpacity }
+                                WireframeOpacity = { BindTarget = WireframeOpacity },
+                                ShowLabel = { BindTarget = ShowLabel },
                             }
                         },
                         fractionPart = new ArgonCounterTextComponent(Anchor.TopLeft)
                         {
-                            Margin = new MarginPadding { Top = 12f * 2f + 4f }, // +4 to account for the extra spaces above the digits.
                             WireframeOpacity = { BindTarget = WireframeOpacity },
                             Scale = new Vector2(0.5f),
                         },
-                        new ArgonCounterTextComponent(Anchor.TopLeft)
+                        percentText = new ArgonCounterTextComponent(Anchor.TopLeft)
                         {
                             Text = @"%",
-                            Margin = new MarginPadding { Top = 12f },
                             WireframeOpacity = { BindTarget = WireframeOpacity }
                         },
                     }
                 };
             }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                ShowLabel.BindValueChanged(s =>
+                {
+                    fractionPart.Margin = new MarginPadding { Top = s.NewValue ? 12f * 2f + 4f : 4f }; // +4 to account for the extra spaces above the digits.
+                    percentText.Margin = new MarginPadding { Top = s.NewValue ? 12f : 0 };
+                }, true);
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
index 52af9b0247..5ea7fd0b82 100644
--- a/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
@@ -4,10 +4,13 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
+using osu.Game.Localisation.SkinComponents;
+using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
@@ -29,6 +32,9 @@ namespace osu.Game.Screens.Play.HUD
             MaxValue = 1,
         };
 
+        [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel), nameof(SkinnableComponentStrings.ShowLabelDescription))]
+        public Bindable<bool> ShowLabel { get; } = new BindableBool(true);
+
         [BackgroundDependencyLoader]
         private void load(ScoreProcessor scoreProcessor)
         {
@@ -56,6 +62,7 @@ namespace osu.Game.Screens.Play.HUD
         protected override IHasText CreateText() => text = new ArgonCounterTextComponent(Anchor.TopLeft, MatchesStrings.MatchScoreStatsCombo.ToUpper())
         {
             WireframeOpacity = { BindTarget = WireframeOpacity },
+            ShowLabel = { BindTarget = ShowLabel },
         };
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
index eabac9a3e6..d3fadb452b 100644
--- a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Screens.Play.HUD
 
         public IBindable<float> WireframeOpacity { get; } = new BindableFloat();
         public Bindable<int> RequiredDisplayDigits { get; } = new BindableInt();
+        public Bindable<bool> ShowLabel { get; } = new BindableBool();
 
         public Container NumberContainer { get; private set; }
 
@@ -56,7 +57,7 @@ namespace osu.Game.Screens.Play.HUD
                 {
                     labelText = new OsuSpriteText
                     {
-                        Alpha = label != null ? 1 : 0,
+                        Alpha = 0,
                         Text = label.GetValueOrDefault(),
                         Font = OsuFont.Torus.With(size: 12, weight: FontWeight.Bold),
                         Margin = new MarginPadding { Left = 2.5f },
@@ -114,6 +115,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
             WireframeOpacity.BindValueChanged(v => wireframesPart.Alpha = v.NewValue, true);
+            ShowLabel.BindValueChanged(s => labelText.Alpha = s.NewValue ? 1 : 0, true);
         }
 
         private partial class ArgonCounterSpriteText : OsuSpriteText
diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
index 0192fa3c02..d661cd67cc 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
@@ -7,6 +7,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
+using osu.Game.Localisation.SkinComponents;
+using osu.Game.Resources.Localisation.Web;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
@@ -24,14 +26,18 @@ namespace osu.Game.Screens.Play.HUD
             MaxValue = 1,
         };
 
+        [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel), nameof(SkinnableComponentStrings.ShowLabelDescription))]
+        public Bindable<bool> ShowLabel { get; } = new BindableBool();
+
         public bool UsesFixedAnchor { get; set; }
 
         protected override LocalisableString FormatCount(long count) => count.ToLocalisableString();
 
-        protected override IHasText CreateText() => new ArgonScoreTextComponent(Anchor.TopRight)
+        protected override IHasText CreateText() => new ArgonScoreTextComponent(Anchor.TopRight, BeatmapsetsStrings.ShowScoreboardHeadersScore.ToUpper())
         {
             RequiredDisplayDigits = { BindTarget = RequiredDisplayDigits },
             WireframeOpacity = { BindTarget = WireframeOpacity },
+            ShowLabel = { BindTarget = ShowLabel },
         };
 
         private partial class ArgonScoreTextComponent : ArgonCounterTextComponent

From a5e1dd8107a8770ab8698cc39a17df2e81847a8b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Nov 2023 14:07:51 +0900
Subject: [PATCH 1555/2296] Add test coverage of deserialising a modified Argon
 skin

---
 osu.Game.Tests/Skins/SkinDeserialisationTest.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index f68250e0fa..c45eadeff2 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -15,6 +15,7 @@ using osu.Game.IO.Archives;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osu.Game.Skinning;
+using osu.Game.Skinning.Components;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Skins
@@ -102,6 +103,20 @@ namespace osu.Game.Tests.Skins
             }
         }
 
+        [Test]
+        public void TestDeserialiseModifiedArgon()
+        {
+            using (var stream = TestResources.OpenResource("Archives/modified-argon-20231106.osk"))
+            using (var storage = new ZipArchiveReader(stream))
+            {
+                var skin = new TestSkin(new SkinInfo(), null, storage);
+
+                Assert.That(skin.LayoutInfos, Has.Count.EqualTo(2));
+                Assert.That(skin.LayoutInfos[SkinComponentsContainerLookup.TargetArea.MainHUDComponents].AllDrawables.ToArray(), Has.Length.EqualTo(10));
+                Assert.That(skin.LayoutInfos[SkinComponentsContainerLookup.TargetArea.MainHUDComponents].AllDrawables.Select(i => i.Type), Contains.Item(typeof(PlayerName)));
+            }
+        }
+
         [Test]
         public void TestDeserialiseModifiedClassic()
         {

From aac1854d832ff8ad48333ed0afd968ab50dcf712 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Nov 2023 14:08:05 +0900
Subject: [PATCH 1556/2296] Add test coverage of layout retrievable after
 importing modified skins

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index ab3e099c3a..98f7dc5444 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -9,10 +9,12 @@ using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
+using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.IO;
 using osu.Game.Skinning;
+using osu.Game.Tests.Resources;
 using SharpCompress.Archives.Zip;
 
 namespace osu.Game.Tests.Skins.IO
@@ -21,6 +23,25 @@ namespace osu.Game.Tests.Skins.IO
     {
         #region Testing filename metadata inclusion
 
+        [TestCase("Archives/modified-classic-20220723.osk")]
+        [TestCase("Archives/modified-default-20230117.osk")]
+        [TestCase("Archives/modified-argon-20231106.osk")]
+        public Task TestImportModifiedSkinHasResources(string archive) => runSkinTest(async osu =>
+        {
+            using (var stream = TestResources.OpenResource(archive))
+            {
+                var imported = await loadSkinIntoOsu(osu, new ImportTask(stream, "skin.osk"));
+
+                // When the import filename doesn't match, it should be appended (and update the skin.ini).
+
+                var skinManager = osu.Dependencies.Get<SkinManager>();
+
+                skinManager.CurrentSkinInfo.Value = imported;
+
+                Assert.That(skinManager.CurrentSkin.Value.LayoutInfos.Count, Is.EqualTo(2));
+            }
+        });
+
         [Test]
         public Task TestSingleImportDifferentFilename() => runSkinTest(async osu =>
         {

From ceeaf5b67c527c787b8d34eb3594207ed9ac14d7 Mon Sep 17 00:00:00 2001
From: cs <cedric.schneider@pmbs.de>
Date: Wed, 15 Nov 2023 07:09:33 +0100
Subject: [PATCH 1557/2296] CI fixes and small tweaks

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs     | 4 ++--
 .../Edit/OsuSliderDrawingSettingsProvider.cs                | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 69e2a40689..df7d2c716b 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -108,8 +108,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     BeginPlacement();
 
                     double? nearestSliderVelocity = (editorBeatmap
-                        .HitObjects
-                        .LastOrDefault(h => h is Slider && h.GetEndTime() < HitObject.StartTime) as Slider)?.SliderVelocityMultiplier;
+                                                     .HitObjects
+                                                     .LastOrDefault(h => h is Slider && h.GetEndTime() < HitObject.StartTime) as Slider)?.SliderVelocityMultiplier;
 
                     HitObject.SliderVelocityMultiplier = nearestSliderVelocity ?? 1;
                     HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
index 1fe1326f38..4326b2e943 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             sliderTolerance.BindValueChanged(v =>
             {
                 float newValue = v.NewValue / 33f;
-                if (!Precision.AlmostEquals(newValue, Tolerance.Value, 1e-7f))
+                if (!Precision.AlmostEquals(newValue, Tolerance.Value))
                     Tolerance.Value = newValue;
             });
             Tolerance.BindValueChanged(v =>
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             sliderCornerThreshold.BindValueChanged(v =>
             {
                 float newValue = v.NewValue / 100f;
-                if (!Precision.AlmostEquals(newValue, CornerThreshold.Value, 1e-7f))
+                if (!Precision.AlmostEquals(newValue, CornerThreshold.Value))
                     CornerThreshold.Value = newValue;
             });
             CornerThreshold.BindValueChanged(v =>
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         public void AttachToToolbox(ExpandingToolboxContainer toolboxContainer)
         {
-            toolboxContainer.Add(new EditorToolboxGroup("drawing")
+            toolboxContainer.Add(new EditorToolboxGroup("slider")
             {
                 Children = new Drawable[]
                 {

From 8cd1f08a923b1b38e7b096e59211c0714089d1e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 15 Nov 2023 13:33:12 +0900
Subject: [PATCH 1558/2296] Fix argon health bar folding in on itself

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 82203d7891..372d2bab85 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -89,6 +89,11 @@ namespace osu.Game.Screens.Play.HUD
 
         public const float MAIN_PATH_RADIUS = 10f;
 
+        private const float curve_start_offset = 70;
+        private const float curve_end_offset = 40;
+        private const float padding = MAIN_PATH_RADIUS * 2;
+        private const float curve_smoothness = 10;
+
         private readonly LayoutValue drawSizeLayout = new LayoutValue(Invalidation.DrawSize);
 
         public ArgonHealthDisplay()
@@ -248,11 +253,17 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updatePath()
         {
-            float barLength = DrawWidth - MAIN_PATH_RADIUS * 2;
-            float curveStart = barLength - 70;
-            float curveEnd = barLength - 40;
+            float usableWidth = DrawWidth - padding;
 
-            const float curve_smoothness = 10;
+            if (usableWidth < 0) enforceMinimumWidth();
+
+            // the display starts curving at `curve_start_offset` units from the right and ends curving at `curve_end_offset`.
+            // to ensure that the curve is symmetric when it starts being narrow enough, add a `curve_end_offset` to the left side too.
+            const float rescale_cutoff = curve_start_offset + curve_end_offset;
+
+            float barLength = Math.Max(DrawWidth - padding, rescale_cutoff);
+            float curveStart = barLength - curve_start_offset;
+            float curveEnd = barLength - curve_end_offset;
 
             Vector2 diagonalDir = (new Vector2(curveEnd, BarHeight.Value) - new Vector2(curveStart, 0)).Normalized();
 
@@ -268,6 +279,9 @@ namespace osu.Game.Screens.Play.HUD
                 new PathControlPoint(new Vector2(barLength, BarHeight.Value)),
             });
 
+            if (DrawWidth - padding < rescale_cutoff)
+                rescalePathProportionally();
+
             List<Vector2> vertices = new List<Vector2>();
             barPath.GetPathToProgress(vertices, 0.0, 1.0);
 
@@ -276,6 +290,20 @@ namespace osu.Game.Screens.Play.HUD
             glowBar.Vertices = vertices;
 
             updatePathVertices();
+
+            void enforceMinimumWidth()
+            {
+                var relativeAxes = RelativeSizeAxes;
+                RelativeSizeAxes = Axes.None;
+                Width = padding;
+                RelativeSizeAxes = relativeAxes;
+            }
+
+            void rescalePathProportionally()
+            {
+                foreach (var point in barPath.ControlPoints)
+                    point.Position = new Vector2(point.Position.X / barLength * (DrawWidth - padding), point.Position.Y);
+            }
         }
 
         private void updatePathVertices()

From 520642975bda8de23c51e2b350c637a93115b08c Mon Sep 17 00:00:00 2001
From: cs <cedric.schneider@pmbs.de>
Date: Wed, 15 Nov 2023 07:45:09 +0100
Subject: [PATCH 1559/2296] Fix control point hover text and context menu

---
 .../Sliders/Components/PathControlPointPiece.cs      |  2 +-
 .../Sliders/Components/PathControlPointVisualiser.cs |  2 +-
 osu.Game/Rulesets/Objects/Types/PathType.cs          | 12 +++++++++++-
 3 files changed, 13 insertions(+), 3 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 ac9048d5c7..03792d8520 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -279,6 +279,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
         }
 
-        public LocalisableString TooltipText => ControlPoint.Type.ToString() ?? string.Empty;
+        public LocalisableString TooltipText => ControlPoint.Type?.Description ?? string.Empty;
     }
 }
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 5ab050ed48..faae966d02 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -403,7 +403,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             int totalCount = Pieces.Count(p => p.IsSelected.Value);
             int countOfState = Pieces.Where(p => p.IsSelected.Value).Count(p => p.ControlPoint.Type == type);
 
-            var item = new TernaryStateRadioMenuItem(type == null ? "Inherit" : type.ToString().Humanize(), MenuItemType.Standard, _ =>
+            var item = new TernaryStateRadioMenuItem(type == null ? "Inherit" : type!.Value.Description, MenuItemType.Standard, _ =>
             {
                 foreach (var p in Pieces.Where(p => p.IsSelected.Value))
                     updatePathType(p, type);
diff --git a/osu.Game/Rulesets/Objects/Types/PathType.cs b/osu.Game/Rulesets/Objects/Types/PathType.cs
index 4fb48bb8b4..e4249154e5 100644
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Objects.Types
 {
@@ -13,7 +14,7 @@ namespace osu.Game.Rulesets.Objects.Types
         PerfectCurve
     }
 
-    public readonly struct PathType : IEquatable<PathType>
+    public readonly struct PathType : IEquatable<PathType>, IHasDescription
     {
         public static readonly PathType CATMULL = new PathType(SplineType.Catmull);
         public static readonly PathType BEZIER = new PathType(SplineType.BSpline);
@@ -31,6 +32,15 @@ namespace osu.Game.Rulesets.Objects.Types
         /// </summary>
         public int? Degree { get; init; }
 
+        public string Description => Type switch
+        {
+            SplineType.Catmull => "Catmull",
+            SplineType.BSpline => Degree == null ? "Bezier" : "B-Spline",
+            SplineType.Linear => "Linear",
+            SplineType.PerfectCurve => "Perfect Curve",
+            _ => Type.ToString()
+        };
+
         public PathType(SplineType splineType)
         {
             Type = splineType;

From 360864fd7b6dac30bda9a2cf4092a316b280427d Mon Sep 17 00:00:00 2001
From: cs <cedric.schneider@pmbs.de>
Date: Wed, 15 Nov 2023 07:45:28 +0100
Subject: [PATCH 1560/2296] Hide catmull curve type when possible

---
 .../Sliders/Components/PathControlPointVisualiser.cs        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 faae966d02..95c72a0a62 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -371,7 +371,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 curveTypeItems.Add(createMenuItemForPathType(PathType.PERFECT_CURVE));
                 curveTypeItems.Add(createMenuItemForPathType(PathType.BEZIER));
                 curveTypeItems.Add(createMenuItemForPathType(PathType.BSpline(3)));
-                curveTypeItems.Add(createMenuItemForPathType(PathType.CATMULL));
+
+                var hoveredPiece = Pieces.FirstOrDefault(p => p.IsHovered);
+
+                if (hoveredPiece?.ControlPoint.Type == PathType.CATMULL)
+                    curveTypeItems.Add(createMenuItemForPathType(PathType.CATMULL));
 
                 var menuItems = new List<MenuItem>
                 {

From aa9deecafe7ad9150d82bfa7015d7e21cf3888b5 Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Fri, 10 Nov 2023 11:37:23 +0100
Subject: [PATCH 1561/2296] added missing comment, fixed incorrect visibility

---
 osu.Game/Users/Drawables/ClickableAvatar.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index ef451df95d..1f1960714f 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Users.Drawables
         /// A clickable avatar for the specified user, with UI sounds included.
         /// </summary>
         /// <param name="user">The user. A null value will get a placeholder avatar.</param>
-        /// <param name="showCardOnHover"></param>
+        /// <param name="showCardOnHover">If set to true, the <see cref="UserGridPanel"/> will be shown for the tooltip</param>
         public ClickableAvatar(APIUser? user = null, bool showCardOnHover = false)
         {
             if (user?.Id != APIUser.SYSTEM_USER_ID)
@@ -72,7 +72,11 @@ namespace osu.Game.Users.Drawables
             }
 
             protected override void PopIn() => this.FadeIn(150, Easing.OutQuint);
-            protected override void PopOut() => this.Delay(150).FadeOut(500, Easing.OutQuint);
+            protected override void PopOut()
+            {
+                this.Delay(150).FadeOut(500, Easing.OutQuint);
+                Clear();
+            }
 
             public void Move(Vector2 pos) => Position = pos;
 

From deef8998f73850d0e40247fa5854f042967e4687 Mon Sep 17 00:00:00 2001
From: Joshua Hegedus <josh.hegedus@outlook.com>
Date: Fri, 10 Nov 2023 11:45:31 +0100
Subject: [PATCH 1562/2296] reverted the change

---
 osu.Game/Users/Drawables/ClickableAvatar.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index 1f1960714f..26622a1f30 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -72,11 +72,7 @@ namespace osu.Game.Users.Drawables
             }
 
             protected override void PopIn() => this.FadeIn(150, Easing.OutQuint);
-            protected override void PopOut()
-            {
-                this.Delay(150).FadeOut(500, Easing.OutQuint);
-                Clear();
-            }
+            protected override void PopOut() => this.Delay(150).FadeOut(500, Easing.OutQuint);
 
             public void Move(Vector2 pos) => Position = pos;
 

From 7b987266d50db8b3c5668a27625f7635a6eeefbc Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 14 Nov 2023 16:15:22 -0800
Subject: [PATCH 1563/2296] Change behavior of some clickable avatars in line
 with web

---
 osu.Game/Overlays/BeatmapSet/AuthorInfo.cs      | 2 +-
 osu.Game/Overlays/Comments/CommentsContainer.cs | 2 +-
 osu.Game/Overlays/Comments/DrawableComment.cs   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
index 1d01495188..99ad5a5c7d 100644
--- a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
+++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     AutoSizeAxes = Axes.Both,
                     CornerRadius = 4,
                     Masking = true,
-                    Child = avatar = new UpdateableAvatar(showGuestOnNull: false)
+                    Child = avatar = new UpdateableAvatar(showUserPanelOnHover: true, showGuestOnNull: false)
                     {
                         Size = new Vector2(height),
                     },
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index af5f4dd280..b4e9a80ff1 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Overlays.Comments
                             Padding = new MarginPadding { Horizontal = WaveOverlayContainer.HORIZONTAL_PADDING, Vertical = 20 },
                             Children = new Drawable[]
                             {
-                                avatar = new UpdateableAvatar(api.LocalUser.Value)
+                                avatar = new UpdateableAvatar(api.LocalUser.Value, isInteractive: false)
                                 {
                                     Size = new Vector2(50),
                                     CornerExponent = 2,
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index ba1c7ca8b2..ceae17aa5d 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Overlays.Comments
                                             Size = new Vector2(avatar_size),
                                             Children = new Drawable[]
                                             {
-                                                new UpdateableAvatar(Comment.User)
+                                                new UpdateableAvatar(Comment.User, showUserPanelOnHover: true)
                                                 {
                                                     Size = new Vector2(avatar_size),
                                                     Masking = true,

From b118999120ec13d4632f032429fbc3a26cc43db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 15 Nov 2023 18:27:08 +0900
Subject: [PATCH 1564/2296] Remove unused using directive

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 98f7dc5444..606a5afac2 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
-using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.IO;

From 2987c0e802ec597ab7480c9d3623b423592669bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Nov 2023 19:01:52 +0900
Subject: [PATCH 1565/2296] Add note about enfocing size methodology

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 372d2bab85..5e6130d3f8 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -293,9 +293,13 @@ namespace osu.Game.Screens.Play.HUD
 
             void enforceMinimumWidth()
             {
-                var relativeAxes = RelativeSizeAxes;
+                // Switch to absolute in order to be able to define a minimum width.
+                // Then switch back is required. Framework will handle the conversion for us.
+                Axes relativeAxes = RelativeSizeAxes;
                 RelativeSizeAxes = Axes.None;
+
                 Width = padding;
+
                 RelativeSizeAxes = relativeAxes;
             }
 

From a73c870712ff5e2bb6613db29dd8d45d71c1f516 Mon Sep 17 00:00:00 2001
From: Poyo <poyoarya@gmail.com>
Date: Wed, 15 Nov 2023 17:00:35 -0800
Subject: [PATCH 1566/2296] Allow GameplayRate to be nullable and assert before
 use

---
 osu.Game/Rulesets/Judgements/JudgementResult.cs          | 2 +-
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 +-
 osu.Game/Rulesets/Scoring/HitEvent.cs                    | 4 ++--
 osu.Game/Rulesets/Scoring/HitEventExtensions.cs          | 5 ++++-
 osu.Game/Rulesets/UI/Playfield.cs                        | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Judgements/JudgementResult.cs b/osu.Game/Rulesets/Judgements/JudgementResult.cs
index 603d470954..db621b4851 100644
--- a/osu.Game/Rulesets/Judgements/JudgementResult.cs
+++ b/osu.Game/Rulesets/Judgements/JudgementResult.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Judgements
         /// <summary>
         /// The gameplay rate at the time this <see cref="JudgementResult"/> occurred.
         /// </summary>
-        public double GameplayRate { get; internal set; }
+        public double? GameplayRate { get; internal set; }
 
         /// <summary>
         /// The combo prior to this <see cref="JudgementResult"/> occurring.
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 5abca168ed..baf13d8911 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -704,7 +704,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             Result.RawTime = Time.Current;
-            Result.GameplayRate = (Clock as IGameplayClock)?.GetTrueGameplayRate() ?? 1.0;
+            Result.GameplayRate = (Clock as IGameplayClock)?.GetTrueGameplayRate();
 
             if (Result.HasResult)
                 updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);
diff --git a/osu.Game/Rulesets/Scoring/HitEvent.cs b/osu.Game/Rulesets/Scoring/HitEvent.cs
index afa654318b..1763190899 100644
--- a/osu.Game/Rulesets/Scoring/HitEvent.cs
+++ b/osu.Game/Rulesets/Scoring/HitEvent.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// The true gameplay rate at the time of the event.
         /// </summary>
-        public readonly double GameplayRate;
+        public readonly double? GameplayRate;
 
         /// <summary>
         /// The hit result.
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Scoring
         /// <param name="hitObject">The <see cref="HitObject"/> that triggered the event.</param>
         /// <param name="lastHitObject">The previous <see cref="HitObject"/>.</param>
         /// <param name="position">A position corresponding to the event.</param>
-        public HitEvent(double timeOffset, double gameplayRate, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, [CanBeNull] Vector2? position)
+        public HitEvent(double timeOffset, double? gameplayRate, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, [CanBeNull] Vector2? position)
         {
             TimeOffset = timeOffset;
             GameplayRate = gameplayRate;
diff --git a/osu.Game/Rulesets/Scoring/HitEventExtensions.cs b/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
index a93385ef43..70a11ae760 100644
--- a/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
+++ b/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 
 namespace osu.Game.Rulesets.Scoring
@@ -18,8 +19,10 @@ namespace osu.Game.Rulesets.Scoring
         /// </returns>
         public static double? CalculateUnstableRate(this IEnumerable<HitEvent> hitEvents)
         {
+            Debug.Assert(!hitEvents.Any(ev => ev.GameplayRate == null));
+
             // Division by gameplay rate is to account for TimeOffset scaling with gameplay rate.
-            double[] timeOffsets = hitEvents.Where(affectsUnstableRate).Select(ev => ev.TimeOffset / ev.GameplayRate).ToArray();
+            double[] timeOffsets = hitEvents.Where(affectsUnstableRate).Select(ev => ev.TimeOffset / ev.GameplayRate!.Value).ToArray();
             return 10 * standardDeviation(timeOffsets);
         }
 
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 17baf8838c..eb29d8f30a 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -473,7 +473,7 @@ namespace osu.Game.Rulesets.UI
 
         private void onNewResult(DrawableHitObject drawable, JudgementResult result)
         {
-            Debug.Assert(result != null && drawable.Entry?.Result == result && result.RawTime != null && result.GameplayRate != 0.0);
+            Debug.Assert(result != null && drawable.Entry?.Result == result && result.RawTime != null && result.GameplayRate != null);
             judgedEntries.Push(drawable.Entry.AsNonNull());
 
             NewResult?.Invoke(drawable, result);

From 2b19cf6ce4b908880db4854a4f74d30edd7714ac Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 15 Nov 2023 19:43:25 -0800
Subject: [PATCH 1567/2296] Fix comment markdown style regression

---
 .../Visual/Online/TestSceneWikiMarkdownContainer.cs           | 3 +--
 .../Markdown/Footnotes/OsuMarkdownFootnoteTooltip.cs          | 3 +--
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs | 2 +-
 osu.Game/Overlays/Comments/CommentMarkdownContainer.cs        | 4 ++--
 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs      | 3 +--
 osu.Game/Overlays/Wiki/WikiPanelContainer.cs                  | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index 0aa0295f7d..d4b6bc2b91 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -10,7 +10,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
@@ -298,7 +297,7 @@ This is a line after the fenced code block!
         {
             public LinkInline Link;
 
-            public override MarkdownTextFlowContainer CreateTextFlow() => new TestMarkdownTextFlowContainer
+            public override OsuMarkdownTextFlowContainer CreateTextFlow() => new TestMarkdownTextFlowContainer
             {
                 UrlAdded = link => Link = link,
             };
diff --git a/osu.Game/Graphics/Containers/Markdown/Footnotes/OsuMarkdownFootnoteTooltip.cs b/osu.Game/Graphics/Containers/Markdown/Footnotes/OsuMarkdownFootnoteTooltip.cs
index af64913212..b9725de5f4 100644
--- a/osu.Game/Graphics/Containers/Markdown/Footnotes/OsuMarkdownFootnoteTooltip.cs
+++ b/osu.Game/Graphics/Containers/Markdown/Footnotes/OsuMarkdownFootnoteTooltip.cs
@@ -5,7 +5,6 @@ using Markdig.Extensions.Footnotes;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Overlays;
@@ -62,7 +61,7 @@ namespace osu.Game.Graphics.Containers.Markdown.Footnotes
                 lastFootnote = Text = footnote;
             }
 
-            public override MarkdownTextFlowContainer CreateTextFlow() => new FootnoteMarkdownTextFlowContainer();
+            public override OsuMarkdownTextFlowContainer CreateTextFlow() => new FootnoteMarkdownTextFlowContainer();
         }
 
         private partial class FootnoteMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 5da785603a..b4031752db 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             Font = OsuFont.GetFont(Typeface.Inter, size: 14, weight: FontWeight.Regular),
         };
 
-        public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
+        public override OsuMarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
 
         protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new OsuMarkdownHeading(headingBlock);
 
diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index e48a52c787..13446792aa 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Comments
 
         protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new CommentMarkdownHeading(headingBlock);
 
-        public override MarkdownTextFlowContainer CreateTextFlow() => new CommentMarkdownTextFlowContainer();
+        public override OsuMarkdownTextFlowContainer CreateTextFlow() => new CommentMarkdownTextFlowContainer();
 
         private partial class CommentMarkdownHeading : OsuMarkdownHeading
         {
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Comments
             }
         }
 
-        private partial class CommentMarkdownTextFlowContainer : MarkdownTextFlowContainer
+        private partial class CommentMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
         {
             protected override void AddImage(LinkInline linkInline) => AddDrawable(new CommentMarkdownImage(linkInline.Url));
 
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index 9107ad342b..e6bfb75026 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
@@ -7,7 +7,6 @@ using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
 using Markdig.Syntax.Inlines;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Containers.Markdown;
 using osu.Game.Graphics.Containers.Markdown;
 
 namespace osu.Game.Overlays.Wiki.Markdown
@@ -53,7 +52,7 @@ namespace osu.Game.Overlays.Wiki.Markdown
             base.AddMarkdownComponent(markdownObject, container, level);
         }
 
-        public override MarkdownTextFlowContainer CreateTextFlow() => new WikiMarkdownTextFlowContainer();
+        public override OsuMarkdownTextFlowContainer CreateTextFlow() => new WikiMarkdownTextFlowContainer();
 
         private partial class WikiMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
         {
diff --git a/osu.Game/Overlays/Wiki/WikiPanelContainer.cs b/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
index c5b71cfeb6..cbffe5732e 100644
--- a/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
+++ b/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Overlays.Wiki
 
             public override SpriteText CreateSpriteText() => base.CreateSpriteText().With(t => t.Font = t.Font.With(Typeface.Torus, weight: FontWeight.Bold));
 
-            public override MarkdownTextFlowContainer CreateTextFlow() => base.CreateTextFlow().With(f => f.TextAnchor = Anchor.TopCentre);
+            public override OsuMarkdownTextFlowContainer CreateTextFlow() => base.CreateTextFlow().With(f => f.TextAnchor = Anchor.TopCentre);
 
             protected override MarkdownParagraph CreateParagraph(ParagraphBlock paragraphBlock, int level)
                 => base.CreateParagraph(paragraphBlock, level).With(p => p.Margin = new MarginPadding { Bottom = 10 });

From dc2d5749651de89bd1e4d5bba615068bfce1ac30 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 15 Nov 2023 19:41:13 -0800
Subject: [PATCH 1568/2296] Fix comment markdown image not showing tooltips

---
 osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs | 2 +-
 osu.Game/Overlays/Comments/CommentMarkdownContainer.cs   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
index 97e1cae11c..5e83dd4fb3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Online
             new[] { "Plain", "This is plain comment" },
             new[] { "Pinned", "This is pinned comment" },
             new[] { "Link", "Please visit https://osu.ppy.sh" },
-            new[] { "Big Image", "![](Backgrounds/bg1)" },
+            new[] { "Big Image", "![](Backgrounds/bg1 \"Big Image\")" },
             new[] { "Small Image", "![](Cursor/cursortrail)" },
             new[]
             {
diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index 13446792aa..51e1b863c7 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -51,12 +51,12 @@ namespace osu.Game.Overlays.Comments
 
         private partial class CommentMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
         {
-            protected override void AddImage(LinkInline linkInline) => AddDrawable(new CommentMarkdownImage(linkInline.Url));
+            protected override void AddImage(LinkInline linkInline) => AddDrawable(new CommentMarkdownImage(linkInline));
 
-            private partial class CommentMarkdownImage : MarkdownImage
+            private partial class CommentMarkdownImage : OsuMarkdownImage
             {
-                public CommentMarkdownImage(string url)
-                    : base(url)
+                public CommentMarkdownImage(LinkInline linkInline)
+                    : base(linkInline)
                 {
                 }
 

From 39a3313929035bc50e308a5ecee8f568f85dbe76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Nov 2023 14:11:01 +0900
Subject: [PATCH 1569/2296] Update tooltip description slightly

---
 .../SkinnableComponentStrings.cs              | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Localisation/SkinComponents/SkinnableComponentStrings.cs b/osu.Game/Localisation/SkinComponents/SkinnableComponentStrings.cs
index 639f5c9b16..d5c8d5ccec 100644
--- a/osu.Game/Localisation/SkinComponents/SkinnableComponentStrings.cs
+++ b/osu.Game/Localisation/SkinComponents/SkinnableComponentStrings.cs
@@ -12,42 +12,42 @@ namespace osu.Game.Localisation.SkinComponents
         /// <summary>
         /// "Sprite name"
         /// </summary>
-        public static LocalisableString SpriteName => new TranslatableString(getKey(@"sprite_name"), "Sprite name");
+        public static LocalisableString SpriteName => new TranslatableString(getKey(@"sprite_name"), @"Sprite name");
 
         /// <summary>
         /// "The filename of the sprite"
         /// </summary>
-        public static LocalisableString SpriteNameDescription => new TranslatableString(getKey(@"sprite_name_description"), "The filename of the sprite");
+        public static LocalisableString SpriteNameDescription => new TranslatableString(getKey(@"sprite_name_description"), @"The filename of the sprite");
 
         /// <summary>
         /// "Font"
         /// </summary>
-        public static LocalisableString Font => new TranslatableString(getKey(@"font"), "Font");
+        public static LocalisableString Font => new TranslatableString(getKey(@"font"), @"Font");
 
         /// <summary>
         /// "The font to use."
         /// </summary>
-        public static LocalisableString FontDescription => new TranslatableString(getKey(@"font_description"), "The font to use.");
+        public static LocalisableString FontDescription => new TranslatableString(getKey(@"font_description"), @"The font to use.");
 
         /// <summary>
         /// "Text"
         /// </summary>
-        public static LocalisableString TextElementText => new TranslatableString(getKey(@"text_element_text"), "Text");
+        public static LocalisableString TextElementText => new TranslatableString(getKey(@"text_element_text"), @"Text");
 
         /// <summary>
         /// "The text to be displayed."
         /// </summary>
-        public static LocalisableString TextElementTextDescription => new TranslatableString(getKey(@"text_element_text_description"), "The text to be displayed.");
+        public static LocalisableString TextElementTextDescription => new TranslatableString(getKey(@"text_element_text_description"), @"The text to be displayed.");
 
         /// <summary>
         /// "Corner radius"
         /// </summary>
-        public static LocalisableString CornerRadius => new TranslatableString(getKey(@"corner_radius"), "Corner radius");
+        public static LocalisableString CornerRadius => new TranslatableString(getKey(@"corner_radius"), @"Corner radius");
 
         /// <summary>
         /// "How rounded the corners should be."
         /// </summary>
-        public static LocalisableString CornerRadiusDescription => new TranslatableString(getKey(@"corner_radius_description"), "How rounded the corners should be.");
+        public static LocalisableString CornerRadiusDescription => new TranslatableString(getKey(@"corner_radius_description"), @"How rounded the corners should be.");
 
         /// <summary>
         /// "Show label"
@@ -55,10 +55,10 @@ namespace osu.Game.Localisation.SkinComponents
         public static LocalisableString ShowLabel => new TranslatableString(getKey(@"show_label"), @"Show label");
 
         /// <summary>
-        /// "Whether the label should be shown."
+        /// "Whether the component&#39;s label should be shown."
         /// </summary>
-        public static LocalisableString ShowLabelDescription => new TranslatableString(getKey(@"show_label_description"), @"Whether the label should be shown.");
+        public static LocalisableString ShowLabelDescription => new TranslatableString(getKey(@"show_label_description"), @"Whether the component's label should be shown.");
 
-        private static string getKey(string key) => $"{prefix}:{key}";
+        private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }

From 73eda6c09c259e0f517ffa75a0affb8902ef1fd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Nov 2023 14:18:49 +0900
Subject: [PATCH 1570/2296] Move non-matching default value to argon skin
 default speficiation instead

---
 osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs | 2 +-
 osu.Game/Skinning/ArgonSkin.cs                 | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
index d661cd67cc..005f7e36a7 100644
--- a/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Play.HUD
         };
 
         [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel), nameof(SkinnableComponentStrings.ShowLabelDescription))]
-        public Bindable<bool> ShowLabel { get; } = new BindableBool();
+        public Bindable<bool> ShowLabel { get; } = new BindableBool(true);
 
         public bool UsesFixedAnchor { get; set; }
 
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 4588c62b0f..6fcab6a977 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -214,7 +214,10 @@ namespace osu.Game.Skinning
                                         Size = new Vector2(380, 72),
                                         Position = new Vector2(4, 5)
                                     },
-                                    new ArgonScoreCounter(),
+                                    new ArgonScoreCounter
+                                    {
+                                        ShowLabel = { Value = false },
+                                    },
                                     new ArgonHealthDisplay(),
                                     new BoxElement
                                     {

From 265ae6fd30697495ab6a3896cd37eac883cfdcaa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Nov 2023 15:14:32 +0900
Subject: [PATCH 1571/2296] Remove unused using refs

---
 osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 5802f8fc0d..9ed1820045 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Judgements;

From 3c513d0b620232e4db4b1849dc869e855c9898b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Nov 2023 15:29:32 +0900
Subject: [PATCH 1572/2296] Refactor fail reason output to not perform string
 interpolation unless hooked

---
 .../Scoring/OsuHealthProcessor.cs             | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 9ed1820045..7d6a05026c 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
             double currentHp;
             double currentHpUncapped;
 
-            do
+            while (true)
             {
                 currentHp = 1;
                 currentHpUncapped = 1;
@@ -57,7 +57,6 @@ namespace osu.Game.Rulesets.Osu.Scoring
                 double lastTime = DrainStartTime;
                 int currentBreak = 0;
                 bool fail = false;
-                string failReason = string.Empty;
 
                 for (int i = 0; i < Beatmap.HitObjects.Count; i++)
                 {
@@ -92,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     {
                         fail = true;
                         testDrop *= 0.96;
-                        failReason = $"hp too low ({currentHp} < {lowestHpEver})";
+                        OnIterationFail?.Invoke($"FAILED drop {testDrop}: hp too low ({currentHp} < {lowestHpEver})");
                         break;
                     }
 
@@ -117,7 +116,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     {
                         fail = true;
                         testDrop *= 0.96;
-                        failReason = $"overkill ({currentHp} - {hpOverkill} <= {lowestHpEver})";
+                        OnIterationFail?.Invoke($"FAILED drop {testDrop}: overkill ({currentHp} - {hpOverkill} <= {lowestHpEver})");
                         break;
                     }
 
@@ -129,7 +128,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     fail = true;
                     testDrop *= 0.94;
                     hpMultiplierNormal *= 1.01;
-                    failReason = $"end hp too low ({currentHp} < {lowestHpEnd})";
+                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: end hp too low ({currentHp} < {lowestHpEnd})");
                 }
 
                 double recovery = (currentHpUncapped - 1) / Beatmap.HitObjects.Count;
@@ -139,18 +138,15 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     fail = true;
                     testDrop *= 0.96;
                     hpMultiplierNormal *= 1.01;
-                    failReason = $"recovery too low ({recovery} < {hpRecoveryAvailable})";
+                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: recovery too low ({recovery} < {hpRecoveryAvailable})");
                 }
 
-                if (fail)
+                if (!fail)
                 {
-                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: {failReason}");
-                    continue;
+                    OnIterationSuccess?.Invoke($"PASSED drop {testDrop}");
+                    return testDrop;
                 }
-
-                OnIterationSuccess?.Invoke($"PASSED drop {testDrop}");
-                return testDrop;
-            } while (true);
+            }
 
             void reduceHp(double amount)
             {

From dbd4f26436c988a8d1e1afb6e893e82fedb25460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 16 Nov 2023 15:37:53 +0900
Subject: [PATCH 1573/2296] Use alternative method of scheduling storyboard
 unload

---
 osu.Game/Screens/BackgroundScreenStack.cs      | 18 ------------------
 .../Backgrounds/BackgroundScreenDefault.cs     |  6 +++++-
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/BackgroundScreenStack.cs b/osu.Game/Screens/BackgroundScreenStack.cs
index 562b212561..99ca383b9f 100644
--- a/osu.Game/Screens/BackgroundScreenStack.cs
+++ b/osu.Game/Screens/BackgroundScreenStack.cs
@@ -1,12 +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.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
-using osu.Framework.Threading;
-using osu.Game.Screens.Backgrounds;
 
 namespace osu.Game.Screens
 {
@@ -36,20 +33,5 @@ namespace osu.Game.Screens
             base.Push(screen);
             return true;
         }
-
-        /// <summary>
-        /// Schedules a delegate to run after 500ms, the time length of a background screen transition.
-        /// This is used in <see cref="BackgroundScreenDefault"/> to dispose of the storyboard once the background screen is completely off-screen.
-        /// </summary>
-        /// <remarks>
-        /// Late storyboard disposals cannot be achieved with any local scheduler from <see cref="BackgroundScreenDefault"/> or any component inside it,
-        /// due to the screen becoming dead at the moment the transition finishes. And, on the frame that it is dead on, it will not receive an <see cref="Drawable.UpdateSubTree"/>,
-        /// therefore not guaranteeing to dispose the storyboard at any period of time close to the end of the transition.
-        /// This might require reconsideration framework-side, possibly exposing a "death" event in <see cref="Screen"/> or all <see cref="Drawable"/>s in general.
-        /// </remarks>
-        /// <param name="action">The delegate </param>
-        /// <returns></returns>
-        /// <seealso cref="BackgroundScreen.TRANSITION_LENGTH"/>
-        internal ScheduledDelegate ScheduleUntilTransitionEnd(Action action) => Scheduler.AddDelayed(action, BackgroundScreen.TRANSITION_LENGTH);
     }
 }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 4583b3e4d6..e46b92795a 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
+using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
@@ -36,6 +37,9 @@ namespace osu.Game.Screens.Backgrounds
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
 
+        [Resolved]
+        private GameHost gameHost { get; set; }
+
         protected virtual bool AllowStoryboardBackground => true;
 
         public BackgroundScreenDefault(bool animateOnEnter = true)
@@ -81,7 +85,7 @@ namespace osu.Game.Screens.Backgrounds
             Debug.Assert(backgroundScreenStack != null);
 
             if (background is BeatmapBackgroundWithStoryboard storyboardBackground)
-                storyboardUnloadDelegate = backgroundScreenStack.ScheduleUntilTransitionEnd(storyboardBackground.UnloadStoryboard);
+                storyboardUnloadDelegate = gameHost.UpdateThread.Scheduler.AddDelayed(storyboardBackground.UnloadStoryboard, TRANSITION_LENGTH);
 
             base.OnSuspending(e);
         }

From b88e3cd26f8eb3f7b90e8bc6a96097ae23d3773e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Nov 2023 20:16:23 +0900
Subject: [PATCH 1574/2296] Change `ResourceStore` provided to `Skin` to be a
 fallback, not replacement

---
 .../CatchSkinColourDecodingTest.cs            |  4 ++--
 .../Formats/LegacyBeatmapEncoderTest.cs       |  4 ++--
 .../Skins/SkinDeserialisationTest.cs          |  4 ++--
 .../Skins/TestSceneSkinResources.cs           |  4 ++--
 osu.Game/Skinning/DefaultLegacySkin.cs        |  3 +--
 osu.Game/Skinning/LegacyBeatmapSkin.cs        |  2 +-
 osu.Game/Skinning/LegacySkin.cs               |  7 +++----
 osu.Game/Skinning/Skin.cs                     | 21 +++++++++++--------
 osu.Game/Tests/Visual/SkinnableTestScene.cs   |  4 ++--
 9 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
index 72011042bc..74b02bab9b 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs
@@ -28,9 +28,9 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private class TestLegacySkin : LegacySkin
         {
-            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage)
+            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> fallbackStore)
                 // Bypass LegacySkinResourceStore to avoid returning null for retrieving files due to bad skin info (SkinInfo.Files = null).
-                : base(skin, null, storage)
+                : base(skin, null, fallbackStore)
             {
             }
         }
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 5d9049ead7..9ff0fe874f 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -174,8 +174,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
         private class TestLegacySkin : LegacySkin
         {
-            public TestLegacySkin(IResourceStore<byte[]> storage, string fileName)
-                : base(new SkinInfo { Name = "Test Skin", Creator = "Craftplacer" }, null, storage, fileName)
+            public TestLegacySkin(IResourceStore<byte[]> fallbackStore, string fileName)
+                : base(new SkinInfo { Name = "Test Skin", Creator = "Craftplacer" }, null, fallbackStore, fileName)
             {
             }
         }
diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index c45eadeff2..6423e061c5 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -149,8 +149,8 @@ namespace osu.Game.Tests.Skins
 
         private class TestSkin : Skin
         {
-            public TestSkin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? storage = null, string configurationFilename = "skin.ini")
-                : base(skin, resources, storage, configurationFilename)
+            public TestSkin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? fallbackStore = null, string configurationFilename = "skin.ini")
+                : base(skin, resources, fallbackStore, configurationFilename)
             {
             }
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinResources.cs b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
index aaec319b57..e77affd817 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinResources.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
@@ -95,8 +95,8 @@ namespace osu.Game.Tests.Skins
         {
             public const string SAMPLE_NAME = "test-sample";
 
-            public TestSkin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? storage = null, string configurationFilename = "skin.ini")
-                : base(skin, resources, storage, configurationFilename)
+            public TestSkin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? fallbackStore = null, string configurationFilename = "skin.ini")
+                : base(skin, resources, fallbackStore, configurationFilename)
             {
             }
 
diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index fd9653e3e5..34ea0af122 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -31,8 +31,7 @@ namespace osu.Game.Skinning
             : base(
                 skin,
                 resources,
-                // In the case of the actual default legacy skin (ie. the fallback one, which a user hasn't applied any modifications to) we want to use the game provided resources.
-                skin.Protected ? new NamespacedResourceStore<byte[]>(resources.Resources, "Skins/Legacy") : null
+                new NamespacedResourceStore<byte[]>(resources.Resources, "Skins/Legacy")
             )
         {
             Configuration.CustomColours["SliderBall"] = new Color4(2, 170, 255, 255);
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index 90eb5fa013..d6ba6ea332 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Skinning
                     // needs to be removed else it will cause incorrect skin behaviours. This is due to the config lookup having no context of which skin
                     // it should be returning the version for.
 
-                    Skin.LogLookupDebug(this, lookup, Skin.LookupDebugType.Miss);
+                    LogLookupDebug(this, lookup, LookupDebugType.Miss);
                     return null;
             }
 
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index dc683f1dae..2e91770919 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -16,7 +16,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.Formats;
-using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.IO;
 using osu.Game.Rulesets.Objects.Types;
@@ -51,10 +50,10 @@ namespace osu.Game.Skinning
         /// </summary>
         /// <param name="skin">The model for this skin.</param>
         /// <param name="resources">Access to raw game resources.</param>
-        /// <param name="storage">An optional store which will be used for looking up skin resources. If null, one will be created from realm <see cref="IHasRealmFiles"/> pattern.</param>
+        /// <param name="fallbackStore">An optional fallback store which will be used for file lookups that are not serviced by realm user storage.</param>
         /// <param name="configurationFilename">The user-facing filename of the configuration file to be parsed. Can accept an .osu or skin.ini file.</param>
-        protected LegacySkin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? storage, string configurationFilename = @"skin.ini")
-            : base(skin, resources, storage, configurationFilename)
+        protected LegacySkin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? fallbackStore, string configurationFilename = @"skin.ini")
+            : base(skin, resources, fallbackStore, configurationFilename)
         {
         }
 
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 1e312142d7..9ee69d033d 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Skinning
             where TLookup : notnull
             where TValue : notnull;
 
-        private readonly RealmBackedResourceStore<SkinInfo>? realmBackedStorage;
+        private readonly ResourceStore<byte[]> store = new ResourceStore<byte[]>();
 
         public string Name { get; }
 
@@ -64,9 +64,9 @@ namespace osu.Game.Skinning
         /// </summary>
         /// <param name="skin">The skin's metadata. Usually a live realm object.</param>
         /// <param name="resources">Access to game-wide resources.</param>
-        /// <param name="storage">An optional store which will *replace* all file lookups that are usually sourced from <paramref name="skin"/>.</param>
+        /// <param name="fallbackStore">An optional fallback store which will be used for file lookups that are not serviced by realm user storage.</param>
         /// <param name="configurationFilename">An optional filename to read the skin configuration from. If not provided, the configuration will be retrieved from the storage using "skin.ini".</param>
-        protected Skin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? storage = null, string configurationFilename = @"skin.ini")
+        protected Skin(SkinInfo skin, IStorageResourceProvider? resources, IResourceStore<byte[]>? fallbackStore = null, string configurationFilename = @"skin.ini")
         {
             Name = skin.Name;
 
@@ -74,9 +74,9 @@ namespace osu.Game.Skinning
             {
                 SkinInfo = skin.ToLive(resources.RealmAccess);
 
-                storage ??= realmBackedStorage = new RealmBackedResourceStore<SkinInfo>(SkinInfo, resources.Files, resources.RealmAccess);
+                store.AddStore(new RealmBackedResourceStore<SkinInfo>(SkinInfo, resources.Files, resources.RealmAccess));
 
-                var samples = resources.AudioManager?.GetSampleStore(storage);
+                var samples = resources.AudioManager?.GetSampleStore(store);
 
                 if (samples != null)
                 {
@@ -88,7 +88,7 @@ namespace osu.Game.Skinning
                 }
 
                 Samples = samples;
-                Textures = new TextureStore(resources.Renderer, CreateTextureLoaderStore(resources, storage));
+                Textures = new TextureStore(resources.Renderer, CreateTextureLoaderStore(resources, store));
             }
             else
             {
@@ -96,7 +96,10 @@ namespace osu.Game.Skinning
                 SkinInfo = skin.ToLiveUnmanaged();
             }
 
-            var configurationStream = storage?.GetStream(configurationFilename);
+            if (fallbackStore != null)
+                store.AddStore(fallbackStore);
+
+            var configurationStream = store.GetStream(configurationFilename);
 
             if (configurationStream != null)
             {
@@ -119,7 +122,7 @@ namespace osu.Game.Skinning
             {
                 string filename = $"{skinnableTarget}.json";
 
-                byte[]? bytes = storage?.Get(filename);
+                byte[]? bytes = store?.Get(filename);
 
                 if (bytes == null)
                     continue;
@@ -252,7 +255,7 @@ namespace osu.Game.Skinning
             Textures?.Dispose();
             Samples?.Dispose();
 
-            realmBackedStorage?.Dispose();
+            store.Dispose();
         }
 
         #endregion
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index aab1b72990..f371cf721f 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -201,8 +201,8 @@ namespace osu.Game.Tests.Visual
         {
             private readonly bool extrapolateAnimations;
 
-            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources, bool extrapolateAnimations)
-                : base(skin, resources, storage)
+            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> fallbackStore, IStorageResourceProvider resources, bool extrapolateAnimations)
+                : base(skin, resources, fallbackStore)
             {
                 this.extrapolateAnimations = extrapolateAnimations;
             }

From a1673160f12e08612aa42a9db89f8b9f2e6324f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 16:44:11 +0900
Subject: [PATCH 1575/2296] Refactor `OsuAutoGenerator` to allow custom SPM
 specifications

---
 osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 5a3d882ef0..acce8c03e8 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -339,6 +339,10 @@ namespace osu.Game.Rulesets.Osu.Replays
 
             AddFrameToReplay(startFrame);
 
+            // ~477 as per stable.
+            const float spin_rpm = 60000f / 20 * (180 / MathF.PI) / 360;
+            float radsPerMillisecond = MathUtils.DegreesToRadians(spin_rpm * 360) / 60000;
+
             switch (h)
             {
                 // We add intermediate frames for spinning / following a slider here.
@@ -354,7 +358,7 @@ namespace osu.Game.Rulesets.Osu.Replays
                     for (double nextFrame = h.StartTime + GetFrameDelay(h.StartTime); nextFrame < spinner.EndTime; nextFrame += GetFrameDelay(nextFrame))
                     {
                         t = ApplyModsToTimeDelta(previousFrame, nextFrame) * spinnerDirection;
-                        angle += (float)t / 20;
+                        angle += (float)t * radsPerMillisecond;
 
                         Vector2 pos = SPINNER_CENTRE + CirclePosition(angle, SPIN_RADIUS);
                         AddFrameToReplay(new OsuReplayFrame((int)nextFrame, new Vector2(pos.X, pos.Y), action));
@@ -363,7 +367,7 @@ namespace osu.Game.Rulesets.Osu.Replays
                     }
 
                     t = ApplyModsToTimeDelta(previousFrame, spinner.EndTime) * spinnerDirection;
-                    angle += (float)t / 20;
+                    angle += (float)t * radsPerMillisecond;
 
                     Vector2 endPosition = SPINNER_CENTRE + CirclePosition(angle, SPIN_RADIUS);
 

From d1cea10f2197b243aff39ba16ee86b89f325fe44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 16:52:40 +0900
Subject: [PATCH 1576/2296] Add note about localisation

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 25c18f7328..85eb81eb9e 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -210,7 +210,8 @@ namespace osu.Game.Screens.Select.Details
             {
                 if (haveRateChangedValues)
                 {
-                    return $"One or more values are being adjusted by mods that change speed." +
+                    // Rather than localising this, it should be displayed in a better way (a custom tooltip which isn't a single super-long line).
+                    return "One or more values are being adjusted by mods that change speed." +
                            $" (AR {originalDifficulty?.ApproachRate ?? 0}→{(adjustedDifficulty?.ApproachRate ?? 0):0.0#}, " +
                            $"OD {originalDifficulty?.OverallDifficulty ?? 0}→{(adjustedDifficulty?.OverallDifficulty ?? 0):0.0#})";
                 }

From 9172632b0b7177a643c2c1c26ab69533998298d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 17:04:02 +0900
Subject: [PATCH 1577/2296] Rename method and adjust xmldoc to be very explicit
 about how wrong this is

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  4 ++--
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  4 ++--
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       |  4 ++--
 .../Overlays/Mods/BeatmapAttributesDisplay.cs |  2 +-
 osu.Game/Rulesets/Ruleset.cs                  | 19 ++++++++++---------
 .../Screens/Select/Details/AdvancedStats.cs   |  2 +-
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 7327fb4513..94c8c36c09 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -234,9 +234,9 @@ namespace osu.Game.Rulesets.Catch
             };
         }
 
-        public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
+        public override BeatmapDifficulty GetRateAdjustedDisplayDifficulty(IBeatmapDifficultyInfo difficulty, double rate)
         {
-            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
             double preempt = adjustedDifficulty.ApproachRate < 6 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index f4cf9409e8..a99f0df066 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -330,9 +330,9 @@ namespace osu.Game.Rulesets.Osu
 
         public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
 
-        public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
+        public override BeatmapDifficulty GetRateAdjustedDisplayDifficulty(IBeatmapDifficultyInfo difficulty, double rate)
         {
-            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
             double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
             preempt /= rate;
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 88d0087622..6e5cdbf2d1 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -265,9 +265,9 @@ namespace osu.Game.Rulesets.Taiko
             };
         }
 
-        public override BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate)
+        public override BeatmapDifficulty GetRateAdjustedDisplayDifficulty(IBeatmapDifficultyInfo difficulty, double rate)
         {
-            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(baseDifficulty);
+            BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
             double hitwindow = 35.0 - 15.0 * (adjustedDifficulty.OverallDifficulty - 5) / 5;
             hitwindow /= rate;
diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index bf39666f83..6270b2bb49 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Overlays.Mods
                 mod.ApplyToDifficulty(originalDifficulty);
 
             Ruleset ruleset = gameRuleset.Value.CreateInstance();
-            adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(originalDifficulty, rate);
+            adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
 
             haveRateChangedValues = hasRateAdjustedProperties(originalDifficulty, adjustedDifficulty);
 
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index edfe691b86..c7c81ecb55 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -377,6 +377,16 @@ namespace osu.Game.Rulesets
         /// <returns>The display name.</returns>
         public virtual LocalisableString GetDisplayNameForHitResult(HitResult result) => result.GetLocalisableDescription();
 
+        /// <summary>
+        /// Applies changes to difficulty attributes for presenting to a user a rough estimate of how rate adjust mods affect difficulty.
+        /// Importantly, this should NOT BE USED FOR ANY CALCULATIONS.
+        /// It is also not always correct, and arguably is never correct depending on your frame of mind.
+        /// </summary>
+        /// <param name="difficulty">>The <see cref="IBeatmapDifficultyInfo"/> that will be adjusted.</param>
+        /// <param name="rate">The rate adjustment multiplier from mods. For example 1.5 for DT.</param>
+        /// <returns>The adjusted difficulty attributes.</returns>
+        public virtual BeatmapDifficulty GetRateAdjustedDisplayDifficulty(IBeatmapDifficultyInfo difficulty, double rate) => new BeatmapDifficulty(difficulty);
+
         /// <summary>
         /// Creates ruleset-specific beatmap filter criteria to be used on the song select screen.
         /// </summary>
@@ -391,14 +401,5 @@ namespace osu.Game.Rulesets
         /// Can be overridden to alter the difficulty section to the editor beatmap setup screen.
         /// </summary>
         public virtual DifficultySection? CreateEditorDifficultySection() => null;
-
-        /// <summary>
-        /// Changes <see cref="BeatmapDifficulty"/> after they're adjusted according to rate.
-        /// Doesn't change any attributes by default.
-        /// </summary>
-        /// <param name="baseDifficulty">>The <see cref="IBeatmapDifficultyInfo"/> that will be adjusted.</param>
-        /// <param name="rate">Rate of the gameplay. For example 1.5 for DT.</param>
-        /// <returns>Copy of difficulty info with values changed according to rate and ruleset-specific behaviour.</returns>
-        public virtual BeatmapDifficulty GetRateAdjustedDifficulty(IBeatmapDifficultyInfo baseDifficulty, double rate) => new BeatmapDifficulty(baseDifficulty);
     }
 }
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 85eb81eb9e..f617cb1d8e 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Screens.Select.Details
                     foreach (var mod in mods.Value.OfType<IApplicableToRate>())
                         rate = mod.ApplyToRate(0, rate);
 
-                    adjustedDifficulty = ruleset.GetRateAdjustedDifficulty(originalDifficulty, rate);
+                    adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
                     haveRateChangedValues = hasRateAdjustedProperties(originalDifficulty, adjustedDifficulty);
                 }
             }

From bd932a5417dd7bc4fba8b237832d556c27ea0d9b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 17:07:21 +0900
Subject: [PATCH 1578/2296] Update localisation analyser

Pulls in https://github.com/ppy/osu-localisation-analyser/pull/60.
---
 .config/dotnet-tools.json | 4 ++--
 osu.Game/osu.Game.csproj  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 3cecb0d07c..b8dc201559 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -21,10 +21,10 @@
       ]
     },
     "ppy.localisationanalyser.tools": {
-      "version": "2023.712.0",
+      "version": "2023.1117.0",
       "commands": [
         "localisation"
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9985afbd8b..10ca49c768 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="ppy.LocalisationAnalyser" Version="2023.712.0">
+    <PackageReference Include="ppy.LocalisationAnalyser" Version="2023.1117.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From c9c8ed7c77332502de4f946affbd8dc107b99dba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 18:41:09 +0900
Subject: [PATCH 1579/2296] Remove unused values

---
 osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 7d6a05026c..d1c9227c13 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -197,19 +197,10 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     increase = 0.011;
                     break;
 
-                case HitResult.Good:
-                    increase = 0.024;
-                    break;
-
                 case HitResult.Great:
                     increase = 0.03;
                     break;
 
-                case HitResult.Perfect:
-                    // 1.1 * Great. Unused.
-                    increase = 0.033;
-                    break;
-
                 case HitResult.SmallBonus:
                     increase = 0.0085;
                     break;

From a556caae437b506b4d26258e0ab69008ccae2ec8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 18:41:54 +0900
Subject: [PATCH 1580/2296] Move default value out of switch statement

---
 osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index d1c9227c13..8265ca1c33 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
         private double healthIncreaseFor(HitObject hitObject, HitResult result)
         {
-            double increase;
+            double increase = 0;
 
             switch (result)
             {
@@ -208,10 +208,6 @@ namespace osu.Game.Rulesets.Osu.Scoring
                 case HitResult.LargeBonus:
                     increase = 0.01;
                     break;
-
-                default:
-                    increase = 0;
-                    break;
             }
 
             return hpMultiplierNormal * increase;

From 2ab84fdaa3f6a73715797d7c9d40d5835153eb68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 18:45:16 +0900
Subject: [PATCH 1581/2296] Use switch statement for type matching

---
 .../Scoring/OsuHealthProcessor.cs             | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 8265ca1c33..0e0bc1916c 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -99,15 +99,21 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     double hpOverkill = Math.Max(0, hpReduction - currentHp);
                     reduceHp(hpReduction);
 
-                    if (h is Slider slider)
+                    switch (h)
                     {
-                        foreach (var nested in slider.NestedHitObjects)
-                            increaseHp(nested);
-                    }
-                    else if (h is Spinner spinner)
-                    {
-                        foreach (var nested in spinner.NestedHitObjects.Where(t => t is not SpinnerBonusTick))
-                            increaseHp(nested);
+                        case Slider slider:
+                        {
+                            foreach (var nested in slider.NestedHitObjects)
+                                increaseHp(nested);
+                            break;
+                        }
+
+                        case Spinner spinner:
+                        {
+                            foreach (var nested in spinner.NestedHitObjects.Where(t => t is not SpinnerBonusTick))
+                                increaseHp(nested);
+                            break;
+                        }
                     }
 
                     // Note: Because HP is capped during the above increases, long sliders (with many ticks) or spinners

From fd3508254b835c2a9dcc07bdfe72c16cf8cec2f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 18:49:19 +0900
Subject: [PATCH 1582/2296] Add note about break calculation method

---
 osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 0e0bc1916c..5a24f29330 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
 
                     // TODO: This doesn't handle overlapping/sequential breaks correctly (/b/614).
                     // Subtract any break time from the duration since the last object
+                    // Note that this method is a bit convoluted, but matches stable code for compatibility.
                     if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
                     {
                         BreakPeriod e = Beatmap.Breaks[currentBreak];

From 66f7b9fae1e0aaf86609bdbf3315870198e0f8b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 19:09:24 +0900
Subject: [PATCH 1583/2296] Adjust slider follow circle animation to not
 abruptly scale on early ticks

---
 .../Skinning/Argon/ArgonFollowCircle.cs                  | 9 ++++++---
 .../Skinning/Default/DefaultFollowCircle.cs              | 9 ++++++---
 .../Skinning/Legacy/LegacyFollowCircle.cs                | 7 +++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowCircle.cs
index fca3e70236..ea21d71d5f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowCircle.cs
@@ -88,9 +88,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
         protected override void OnSliderTick()
         {
-            this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 1.08f, 40, Easing.OutQuint)
-                .Then()
-                .ScaleTo(DrawableSliderBall.FOLLOW_AREA, 200f, Easing.OutQuint);
+            if (Scale.X >= DrawableSliderBall.FOLLOW_AREA * 0.98f)
+            {
+                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/Default/DefaultFollowCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultFollowCircle.cs
index 3c41d473f4..4adbfc3928 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultFollowCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultFollowCircle.cs
@@ -59,9 +59,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         protected override void OnSliderTick()
         {
-            this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 1.08f, 40, Easing.OutQuint)
-                .Then()
-                .ScaleTo(DrawableSliderBall.FOLLOW_AREA, 200f, Easing.OutQuint);
+            if (Scale.X >= DrawableSliderBall.FOLLOW_AREA * 0.98f)
+            {
+                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/Legacy/LegacyFollowCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyFollowCircle.cs
index f8dcb9e8a2..fa2bb9b2ad 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyFollowCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyFollowCircle.cs
@@ -44,8 +44,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         protected override void OnSliderTick()
         {
-            this.ScaleTo(2.2f)
-                .ScaleTo(2f, 200);
+            if (Scale.X >= 2f)
+            {
+                this.ScaleTo(2.2f)
+                    .ScaleTo(2f, 200);
+            }
         }
 
         protected override void OnSliderBreak()

From 307ec172cbcc49f0edf26aed318d5390666faafa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 23:48:48 +0900
Subject: [PATCH 1584/2296] Use simplified formula

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

diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index acce8c03e8..9d63949dcc 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -340,7 +340,7 @@ namespace osu.Game.Rulesets.Osu.Replays
             AddFrameToReplay(startFrame);
 
             // ~477 as per stable.
-            const float spin_rpm = 60000f / 20 * (180 / MathF.PI) / 360;
+            const float spin_rpm = 0.05f / (2 * MathF.PI) * 60000;
             float radsPerMillisecond = MathUtils.DegreesToRadians(spin_rpm * 360) / 60000;
 
             switch (h)

From d9cd546377e7e7b3072fe905b966cebe7eeff746 Mon Sep 17 00:00:00 2001
From: Poyo <poyoarya@gmail.com>
Date: Sat, 18 Nov 2023 12:09:37 -0800
Subject: [PATCH 1585/2296] Use rate fallback in DrawableHitObject

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 +-
 osu.Game/Rulesets/UI/Playfield.cs                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index baf13d8911..5abca168ed 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -704,7 +704,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             Result.RawTime = Time.Current;
-            Result.GameplayRate = (Clock as IGameplayClock)?.GetTrueGameplayRate();
+            Result.GameplayRate = (Clock as IGameplayClock)?.GetTrueGameplayRate() ?? 1.0;
 
             if (Result.HasResult)
                 updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index eb29d8f30a..e9c35555c8 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -473,7 +473,7 @@ namespace osu.Game.Rulesets.UI
 
         private void onNewResult(DrawableHitObject drawable, JudgementResult result)
         {
-            Debug.Assert(result != null && drawable.Entry?.Result == result && result.RawTime != null && result.GameplayRate != null);
+            Debug.Assert(result != null && drawable.Entry?.Result == result && result.RawTime != null);
             judgedEntries.Push(drawable.Entry.AsNonNull());
 
             NewResult?.Invoke(drawable, result);

From 2cf16e29acf5e5f397ea6ab98bbd8a8a6c5528f5 Mon Sep 17 00:00:00 2001
From: Zyf <zyfarok@gmail.com>
Date: Sun, 19 Nov 2023 21:02:56 +0100
Subject: [PATCH 1586/2296] Revert "Scoring : Adds fields to Catch/Mania/Taiko
 Simulators too"

This reverts commit a97915180f37a87ac5716acdb0bfcafffe9e6452.
---
 .../Difficulty/CatchLegacyScoreSimulator.cs            | 10 +++-------
 .../Difficulty/ManiaLegacyScoreSimulator.cs            |  3 ---
 .../Difficulty/TaikoLegacyScoreSimulator.cs            | 10 +++-------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index 284fd23aea..c79fd36d96 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -20,12 +20,9 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
         public int ComboScore { get; private set; }
 
-        public int LegacyBonusScore { get; private set; }
-
-        public int MaxCombo { get; private set; }
-
-        public double BonusScoreRatio => LegacyBonusScore == 0 ? 0 : (double)modernBonusScore / LegacyBonusScore;
+        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
 
+        private int legacyBonusScore;
         private int modernBonusScore;
         private int combo;
 
@@ -77,7 +74,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             foreach (var obj in playableBeatmap.HitObjects)
                 simulateHit(obj);
-            MaxCombo = combo;
         }
 
         private void simulateHit(HitObject hitObject)
@@ -133,7 +129,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             if (isBonus)
             {
-                LegacyBonusScore += scoreIncrease;
+                legacyBonusScore += scoreIncrease;
                 modernBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
index f09c911b98..e544428979 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
@@ -14,8 +14,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
     {
         public int AccuracyScore => 0;
         public int ComboScore { get; private set; }
-        public int LegacyBonusScore => 0;
-        public int MaxCombo { get; private set; }
         public double BonusScoreRatio => 0;
 
         public void Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap, IReadOnlyList<Mod> mods)
@@ -25,7 +23,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
                                     .Aggregate(1.0, (c, n) => c * n);
 
             ComboScore = (int)(1000000 * multiplier);
-            MaxCombo = playableBeatmap.GetMaxCombo();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index 239ec5765c..e77327d622 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -20,12 +20,9 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
         public int ComboScore { get; private set; }
 
-        public int LegacyBonusScore { get; private set; }
-
-        public int MaxCombo { get; private set; }
-
-        public double BonusScoreRatio => LegacyBonusScore == 0 ? 0 : (double)modernBonusScore / LegacyBonusScore;
+        public double BonusScoreRatio => legacyBonusScore == 0 ? 0 : (double)modernBonusScore / legacyBonusScore;
 
+        private int legacyBonusScore;
         private int modernBonusScore;
         private int combo;
 
@@ -83,7 +80,6 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             foreach (var obj in playableBeatmap.HitObjects)
                 simulateHit(obj);
-            MaxCombo = combo;
         }
 
         private void simulateHit(HitObject hitObject)
@@ -193,7 +189,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             if (isBonus)
             {
-                LegacyBonusScore += scoreIncrease;
+                legacyBonusScore += scoreIncrease;
                 modernBonusScore += Judgement.ToNumericResult(bonusResult);
             }
             else

From 432b88674b3d2e0eff6bbf80b26016eea6da0b2d Mon Sep 17 00:00:00 2001
From: Zyf <zyfarok@gmail.com>
Date: Mon, 20 Nov 2023 00:02:58 +0100
Subject: [PATCH 1587/2296] Scoring : change formula parameters to match survey
 results

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 6 +++---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index c38dd0e9cf..dfc2f8fb62 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -316,11 +316,11 @@ namespace osu.Game.Database
                         1.2 * (newLowerStrippedV3 + newUpperStrippedV3) / 2
                     );
 
-                    double newComboScoreProportion = (strippedV3 / maxStrippedV3) * score.Accuracy;
+                    double newComboScoreProportion = (strippedV3 / maxStrippedV3);
 
                     return (long)Math.Round((
-                        700000 * newComboScoreProportion * score.Accuracy
-                        + 300000 * Math.Pow(score.Accuracy, 8)
+                        500000 * newComboScoreProportion * score.Accuracy
+                        + 500000 * Math.Pow(score.Accuracy, 5)
                         + bonusProportion) * modMultiplier);
 
                 case 1:
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 514630b351..adf8e318d3 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Rulesets.Scoring
 
         protected virtual double GetBonusScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type);
 
-        protected virtual double GetComboScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT);
+        protected virtual double GetComboScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Judgement.MaxResult) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT);
 
         protected virtual void ApplyScoreChange(JudgementResult result)
         {
@@ -325,8 +325,8 @@ namespace osu.Game.Rulesets.Scoring
 
         protected virtual double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
-            return 700000 * Accuracy.Value * comboProgress +
-                   300000 * Math.Pow(Accuracy.Value, 8) * accuracyProgress +
+            return 500000 * Accuracy.Value * comboProgress +
+                   500000 * Math.Pow(Accuracy.Value, 5) * accuracyProgress +
                    bonusPortion;
         }
 

From bfcca382007be5c91adfecfc08dc0a2fbad4cb36 Mon Sep 17 00:00:00 2001
From: Stedoss <29103029+Stedoss@users.noreply.github.com>
Date: Mon, 20 Nov 2023 01:15:26 +0000
Subject: [PATCH 1588/2296] Handle login API state changes in
 `UserProfileOverlay`

---
 osu.Game/Overlays/UserProfileOverlay.cs | 46 ++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 0ab842c907..d45a010e4a 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -42,6 +43,11 @@ namespace osu.Game.Overlays
         private ProfileSectionsContainer? sectionsContainer;
         private ProfileSectionTabControl? tabs;
 
+        private IUser? user;
+        private IRulesetInfo? ruleset;
+
+        private IBindable<APIUser> apiUser = null!;
+
         [Resolved]
         private RulesetStore rulesets { get; set; } = null!;
 
@@ -58,17 +64,38 @@ namespace osu.Game.Overlays
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            apiUser = API.LocalUser.GetBoundCopy();
+            apiUser.BindValueChanged(_ => Schedule(() =>
+            {
+                if (API.IsLoggedIn)
+                    fetchAndSetContent();
+            }));
+        }
+
         protected override ProfileHeader CreateHeader() => new ProfileHeader();
 
         protected override Color4 BackgroundColour => ColourProvider.Background5;
 
-        public void ShowUser(IUser user, IRulesetInfo? ruleset = null)
+        public void ShowUser(IUser userToShow, IRulesetInfo? userRuleset = null)
         {
-            if (user.OnlineID == APIUser.SYSTEM_USER_ID)
+            if (userToShow.OnlineID == APIUser.SYSTEM_USER_ID)
                 return;
 
+            user = userToShow;
+            ruleset = userRuleset;
+
             Show();
 
+            fetchAndSetContent();
+        }
+
+        private void fetchAndSetContent()
+        {
+            Debug.Assert(user != null);
+
             if (user.OnlineID == Header.User.Value?.User.Id && ruleset?.MatchesOnlineID(Header.User.Value?.Ruleset) == true)
                 return;
 
@@ -143,24 +170,27 @@ namespace osu.Game.Overlays
 
             sectionsContainer.ScrollToTop();
 
+            if (!API.IsLoggedIn)
+                return;
+
             userReq = user.OnlineID > 1 ? new GetUserRequest(user.OnlineID, ruleset) : new GetUserRequest(user.Username, ruleset);
-            userReq.Success += u => userLoadComplete(u, ruleset);
+            userReq.Success += userLoadComplete;
             API.Queue(userReq);
             loadingLayer.Show();
         }
 
-        private void userLoadComplete(APIUser user, IRulesetInfo? ruleset)
+        private void userLoadComplete(APIUser loadedUser)
         {
             Debug.Assert(sections != null && sectionsContainer != null && tabs != null);
 
-            var actualRuleset = rulesets.GetRuleset(ruleset?.ShortName ?? user.PlayMode).AsNonNull();
+            var actualRuleset = rulesets.GetRuleset(ruleset?.ShortName ?? loadedUser.PlayMode).AsNonNull();
 
-            var userProfile = new UserProfileData(user, actualRuleset);
+            var userProfile = new UserProfileData(loadedUser, actualRuleset);
             Header.User.Value = userProfile;
 
-            if (user.ProfileOrder != null)
+            if (loadedUser.ProfileOrder != null)
             {
-                foreach (string id in user.ProfileOrder)
+                foreach (string id in loadedUser.ProfileOrder)
                 {
                     var sec = sections.FirstOrDefault(s => s.Identifier == id);
 

From 1f88658bade025040f3c97a08020de9e21dba41e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Burgelin=20=28Zyfarok=29?=
 <clementburgelin@gmail.com>
Date: Mon, 20 Nov 2023 03:05:46 +0100
Subject: [PATCH 1589/2296] Fix syntax

---
 osu.Game/Database/StandardisedScoreMigrationTools.cs      | 2 ++
 osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index dfc2f8fb62..685f852eb4 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -267,10 +267,12 @@ namespace osu.Game.Database
             {
                 case 0:
                     if (score.MaxCombo == 0 || score.Accuracy == 0)
+                    {
                         return (long)Math.Round((
                             0
                             + 300000 * Math.Pow(score.Accuracy, 8)
                             + bonusProportion) * modMultiplier);
+                    }
 
                     // Assumption :
                     // - sliders and slider-ticks are uniformly spread arround the beatmap
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs
index c2f87be194..6f6740c641 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyScoreAttributes.cs
@@ -29,6 +29,5 @@ namespace osu.Game.Rulesets.Scoring.Legacy
         /// The max combo of the legacy (ScoreV1) total score.
         /// </summary>
         public int MaxCombo;
-
     }
 }

From e182acf3e8c012fe36f8317d70ca7d6abe1803e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 11:50:28 +0900
Subject: [PATCH 1590/2296] Expand comment for clarification

---
 osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 9d63949dcc..1cf6bc91f0 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -339,7 +339,8 @@ namespace osu.Game.Rulesets.Osu.Replays
 
             AddFrameToReplay(startFrame);
 
-            // ~477 as per stable.
+            // 0.05 rad/ms, or ~477 RPM, as per stable.
+            // the redundant conversion from RPM to rad/ms is here for ease of testing custom SPM specs.
             const float spin_rpm = 0.05f / (2 * MathF.PI) * 60000;
             float radsPerMillisecond = MathUtils.DegreesToRadians(spin_rpm * 360) / 60000;
 

From 33b592f1c723fb4824f2084337de9dbb940d2b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 12:04:30 +0900
Subject: [PATCH 1591/2296] Update framework (again)

---
 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 1f6a65c450..dd5a8996fb 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1113.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1120.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 2d2543229b..e5ba01e447 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1113.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1120.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1114.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index 70525a5c59..9a0832b4e7 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1113.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1120.0" />
   </ItemGroup>
 </Project>

From 577cb9994ce54202bf2c07548389f0e6b701fa8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 12:24:32 +0900
Subject: [PATCH 1592/2296] Move static instances / construction methods closer
 together

---
 osu.Game/Rulesets/Objects/Types/PathType.cs | 38 ++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Types/PathType.cs b/osu.Game/Rulesets/Objects/Types/PathType.cs
index e4249154e5..0e3adb4473 100644
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@@ -16,11 +16,6 @@ namespace osu.Game.Rulesets.Objects.Types
 
     public readonly struct PathType : IEquatable<PathType>, IHasDescription
     {
-        public static readonly PathType CATMULL = new PathType(SplineType.Catmull);
-        public static readonly PathType BEZIER = new PathType(SplineType.BSpline);
-        public static readonly PathType LINEAR = new PathType(SplineType.Linear);
-        public static readonly PathType PERFECT_CURVE = new PathType(SplineType.PerfectCurve);
-
         /// <summary>
         /// The type of the spline that should be used to interpret the control points of the path.
         /// </summary>
@@ -32,6 +27,25 @@ namespace osu.Game.Rulesets.Objects.Types
         /// </summary>
         public int? Degree { get; init; }
 
+        public PathType(SplineType splineType)
+        {
+            Type = splineType;
+            Degree = null;
+        }
+
+        public static readonly PathType CATMULL = new PathType(SplineType.Catmull);
+        public static readonly PathType BEZIER = new PathType(SplineType.BSpline);
+        public static readonly PathType LINEAR = new PathType(SplineType.Linear);
+        public static readonly PathType PERFECT_CURVE = new PathType(SplineType.PerfectCurve);
+
+        public static PathType BSpline(int degree)
+        {
+            if (degree <= 0)
+                throw new ArgumentOutOfRangeException(nameof(degree), "The degree of a B-Spline path must be greater than zero.");
+
+            return new PathType { Type = SplineType.BSpline, Degree = degree };
+        }
+
         public string Description => Type switch
         {
             SplineType.Catmull => "Catmull",
@@ -41,12 +55,6 @@ namespace osu.Game.Rulesets.Objects.Types
             _ => Type.ToString()
         };
 
-        public PathType(SplineType splineType)
-        {
-            Type = splineType;
-            Degree = null;
-        }
-
         public override int GetHashCode()
             => HashCode.Combine(Type, Degree);
 
@@ -59,14 +67,6 @@ namespace osu.Game.Rulesets.Objects.Types
         public static bool operator !=(PathType a, PathType b)
             => a.Type != b.Type || a.Degree != b.Degree;
 
-        public static PathType BSpline(int degree)
-        {
-            if (degree <= 0)
-                throw new ArgumentOutOfRangeException(nameof(degree), "The degree of a B-Spline path must be greater than zero.");
-
-            return new PathType { Type = SplineType.BSpline, Degree = degree };
-        }
-
         public bool Equals(PathType other)
             => Type == other.Type && Degree == other.Degree;
     }

From 25c1a900473de216ba5c07b306b4e49316ec7828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 12:25:44 +0900
Subject: [PATCH 1593/2296] Change switchexpr to standard switch statement

---
 osu.Game/Rulesets/Objects/Types/PathType.cs | 29 ++++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Types/PathType.cs b/osu.Game/Rulesets/Objects/Types/PathType.cs
index 0e3adb4473..95ddcb8b05 100644
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@@ -46,14 +46,29 @@ namespace osu.Game.Rulesets.Objects.Types
             return new PathType { Type = SplineType.BSpline, Degree = degree };
         }
 
-        public string Description => Type switch
+        public string Description
         {
-            SplineType.Catmull => "Catmull",
-            SplineType.BSpline => Degree == null ? "Bezier" : "B-Spline",
-            SplineType.Linear => "Linear",
-            SplineType.PerfectCurve => "Perfect Curve",
-            _ => Type.ToString()
-        };
+            get
+            {
+                switch (Type)
+                {
+                    case SplineType.Catmull:
+                        return "Catmull";
+
+                    case SplineType.BSpline:
+                        return Degree == null ? "Bezier" : "B-Spline";
+
+                    case SplineType.Linear:
+                        return "Linear";
+
+                    case SplineType.PerfectCurve:
+                        return "Perfect Curve";
+
+                    default:
+                        return Type.ToString();
+                }
+            }
+        }
 
         public override int GetHashCode()
             => HashCode.Combine(Type, Degree);

From 7820c8ce4d558381f80444fcf3fb38035382a852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 12:28:20 +0900
Subject: [PATCH 1594/2296] Decrease redundancy of equality implementations

---
 osu.Game/Rulesets/Objects/Types/PathType.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Types/PathType.cs b/osu.Game/Rulesets/Objects/Types/PathType.cs
index 95ddcb8b05..37c1d0ab50 100644
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@@ -74,15 +74,12 @@ namespace osu.Game.Rulesets.Objects.Types
             => HashCode.Combine(Type, Degree);
 
         public override bool Equals(object? obj)
-            => obj is PathType pathType && this == pathType;
-
-        public static bool operator ==(PathType a, PathType b)
-            => a.Type == b.Type && a.Degree == b.Degree;
-
-        public static bool operator !=(PathType a, PathType b)
-            => a.Type != b.Type || a.Degree != b.Degree;
+            => obj is PathType pathType && Equals(pathType);
 
         public bool Equals(PathType other)
             => Type == other.Type && Degree == other.Degree;
+
+        public static bool operator ==(PathType a, PathType b) => a.Equals(b);
+        public static bool operator !=(PathType a, PathType b) => !a.Equals(b);
     }
 }

From 518dcc567b14cdf8ade2d449b20cdcbcfcf45e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 12:41:22 +0900
Subject: [PATCH 1595/2296] Null-check `drawingSettingsProvider`

As it's annotated as an optional dependency.
---
 .../Sliders/SliderPlacementBlueprint.cs       | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index df7d2c716b..9b24415604 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -80,19 +80,22 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             base.LoadComplete();
             inputManager = GetContainingInputManager();
 
-            drawingSettingsProvider.Tolerance.BindValueChanged(e =>
+            if (drawingSettingsProvider != null)
             {
-                if (bSplineBuilder.Tolerance != e.NewValue)
-                    bSplineBuilder.Tolerance = e.NewValue;
-                updateSliderPathFromBSplineBuilder();
-            }, true);
+                drawingSettingsProvider.Tolerance.BindValueChanged(e =>
+                {
+                    if (bSplineBuilder.Tolerance != e.NewValue)
+                        bSplineBuilder.Tolerance = e.NewValue;
+                    updateSliderPathFromBSplineBuilder();
+                }, true);
 
-            drawingSettingsProvider.CornerThreshold.BindValueChanged(e =>
-            {
-                if (bSplineBuilder.CornerThreshold != e.NewValue)
-                    bSplineBuilder.CornerThreshold = e.NewValue;
-                updateSliderPathFromBSplineBuilder();
-            }, true);
+                drawingSettingsProvider.CornerThreshold.BindValueChanged(e =>
+                {
+                    if (bSplineBuilder.CornerThreshold != e.NewValue)
+                        bSplineBuilder.CornerThreshold = e.NewValue;
+                    updateSliderPathFromBSplineBuilder();
+                }, true);
+            }
         }
 
         [Resolved]

From f46945a29439716ef10e5e82277cf5e338044094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 12:42:16 +0900
Subject: [PATCH 1596/2296] Avoid one unnecessary path update from B-spline
 builder

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 9b24415604..50b4377ccd 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     if (bSplineBuilder.Tolerance != e.NewValue)
                         bSplineBuilder.Tolerance = e.NewValue;
                     updateSliderPathFromBSplineBuilder();
-                }, true);
+                });
 
                 drawingSettingsProvider.CornerThreshold.BindValueChanged(e =>
                 {

From 831884a64b74113f76bc59eed0466f232b71f7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 13:00:12 +0900
Subject: [PATCH 1597/2296] Remove unused enum member

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 50b4377ccd..50abcf1233 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -344,8 +344,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             Initial,
             ControlPoints,
-            Drawing,
-            DrawingFinalization
+            Drawing
         }
     }
 }

From affef85f2521246412949531e291fdbed4cf1272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 13:02:51 +0900
Subject: [PATCH 1598/2296] Remove `ISliderDrawingSettingsProvider`

Seems like excessive abstraction.
---
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs  |  2 +-
 .../Edit/ISliderDrawingSettingsProvider.cs          | 13 -------------
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs  |  2 +-
 .../Edit/OsuSliderDrawingSettingsProvider.cs        |  2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 50abcf1233..fb2c1d5149 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private ISliderDrawingSettingsProvider drawingSettingsProvider { get; set; }
+        private OsuSliderDrawingSettingsProvider drawingSettingsProvider { get; set; }
 
         private readonly IncrementalBSplineBuilder bSplineBuilder = new IncrementalBSplineBuilder();
 
diff --git a/osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs
deleted file mode 100644
index 31ed98e1dd..0000000000
--- a/osu.Game.Rulesets.Osu/Edit/ISliderDrawingSettingsProvider.cs
+++ /dev/null
@@ -1,13 +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.Bindables;
-
-namespace osu.Game.Rulesets.Osu.Edit
-{
-    public interface ISliderDrawingSettingsProvider
-    {
-        BindableFloat Tolerance { get; }
-        BindableFloat CornerThreshold { get; }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index d958b558cf..0dc0d6fd31 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         [Cached(typeof(IDistanceSnapProvider))]
         protected readonly OsuDistanceSnapProvider DistanceSnapProvider = new OsuDistanceSnapProvider();
 
-        [Cached(typeof(ISliderDrawingSettingsProvider))]
+        [Cached]
         protected readonly OsuSliderDrawingSettingsProvider SliderDrawingSettingsProvider = new OsuSliderDrawingSettingsProvider();
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
index 4326b2e943..0126b366d5 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Edit;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public partial class OsuSliderDrawingSettingsProvider : Drawable, ISliderDrawingSettingsProvider, IToolboxAttachment
+    public partial class OsuSliderDrawingSettingsProvider : Drawable, IToolboxAttachment
     {
         public BindableFloat Tolerance { get; } = new BindableFloat(1.5f)
         {

From 5d1bac6d7a55a980e608fbf6bfa8744ceb30b18f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 13:17:43 +0900
Subject: [PATCH 1599/2296] Remove `IToolboxAttachment` for now

The interface doesn't really do anything useful right now because
it enforces a common contract, but all usages of the contract
go through the concrete implementation, and it inflates
the already-huge diff.
---
 .../Edit/OsuSliderDrawingSettingsProvider.cs           |  2 +-
 osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs |  2 +-
 osu.Game/Rulesets/Edit/IToolboxAttachment.cs           | 10 ----------
 3 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Edit/IToolboxAttachment.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
index 0126b366d5..e44f0265c8 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Edit;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public partial class OsuSliderDrawingSettingsProvider : Drawable, IToolboxAttachment
+    public partial class OsuSliderDrawingSettingsProvider : Drawable
     {
         public BindableFloat Tolerance { get; } = new BindableFloat(1.5f)
         {
diff --git a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
index 68411d2b01..ddf539771d 100644
--- a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
@@ -29,7 +29,7 @@ using osu.Game.Screens.Edit.Components.TernaryButtons;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract partial class ComposerDistanceSnapProvider : Component, IDistanceSnapProvider, IScrollBindingHandler<GlobalAction>, IToolboxAttachment
+    public abstract partial class ComposerDistanceSnapProvider : Component, IDistanceSnapProvider, IScrollBindingHandler<GlobalAction>
     {
         private const float adjust_step = 0.1f;
 
diff --git a/osu.Game/Rulesets/Edit/IToolboxAttachment.cs b/osu.Game/Rulesets/Edit/IToolboxAttachment.cs
deleted file mode 100644
index 7d7c5980b2..0000000000
--- a/osu.Game/Rulesets/Edit/IToolboxAttachment.cs
+++ /dev/null
@@ -1,10 +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.Edit
-{
-    public interface IToolboxAttachment
-    {
-        void AttachToToolbox(ExpandingToolboxContainer toolbox);
-    }
-}

From 487326a4c786aa89b597ea191ec83c701386736d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 13:22:36 +0900
Subject: [PATCH 1600/2296] Remove pattern matching syntax usage in switch

Also throw on unknown types.
---
 osu.Game/Rulesets/Objects/BezierConverter.cs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/BezierConverter.cs b/osu.Game/Rulesets/Objects/BezierConverter.cs
index 5dc0839d37..4a68161899 100644
--- a/osu.Game/Rulesets/Objects/BezierConverter.cs
+++ b/osu.Game/Rulesets/Objects/BezierConverter.cs
@@ -70,21 +70,21 @@ namespace osu.Game.Rulesets.Objects
                 var segmentVertices = vertices.AsSpan().Slice(start, i - start + 1);
                 var segmentType = controlPoints[start].Type ?? PathType.LINEAR;
 
-                switch (segmentType)
+                switch (segmentType.Type)
                 {
-                    case { Type: SplineType.Catmull }:
+                    case SplineType.Catmull:
                         result.AddRange(from segment in ConvertCatmullToBezierAnchors(segmentVertices) from v in segment select v + position);
                         break;
 
-                    case { Type: SplineType.Linear }:
+                    case SplineType.Linear:
                         result.AddRange(from segment in ConvertLinearToBezierAnchors(segmentVertices) from v in segment select v + position);
                         break;
 
-                    case { Type: SplineType.PerfectCurve }:
+                    case SplineType.PerfectCurve:
                         result.AddRange(ConvertCircleToBezierAnchors(segmentVertices).Select(v => v + position));
                         break;
 
-                    default:
+                    case SplineType.BSpline:
                         if (segmentType.Degree != null)
                             throw new NotImplementedException("BSpline conversion of arbitrary degree is not implemented.");
 
@@ -94,6 +94,9 @@ namespace osu.Game.Rulesets.Objects
                         }
 
                         break;
+
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(segmentType.Type), segmentType.Type, "Unsupported segment type found when converting to legacy Bezier");
                 }
 
                 // Start the new segment at the current vertex
@@ -160,13 +163,16 @@ namespace osu.Game.Rulesets.Objects
 
                         break;
 
-                    default:
+                    case SplineType.BSpline:
                         for (int j = 0; j < segmentVertices.Length - 1; j++)
                         {
                             result.Add(new PathControlPoint(segmentVertices[j], j == 0 ? segmentType : null));
                         }
 
                         break;
+
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(segmentType.Type), segmentType.Type, "Unsupported segment type found when converting to legacy Bezier");
                 }
 
                 // Start the new segment at the current vertex

From 80a3225bb28f315aeceda4dc5e10c2222faa0e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 13:35:07 +0900
Subject: [PATCH 1601/2296] Use static `BEZIER` instead of allocating new every
 time

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

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 92a92dca8f..411a9b0d63 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -230,7 +230,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                     if (input.Length > 1 && int.TryParse(input.Substring(1), out int degree) && degree > 0)
                         return PathType.BSpline(degree);
 
-                    return new PathType(SplineType.BSpline);
+                    return PathType.BEZIER;
 
                 case 'L':
                     return PathType.LINEAR;

From 6d7d826b8b76f775bf59d600d493912a92950540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 15:08:58 +0900
Subject: [PATCH 1602/2296] Fix incorrect legacy conversion when B-splines are
 used

---
 osu.Game/Database/LegacyBeatmapExporter.cs   | 3 ++-
 osu.Game/Rulesets/Objects/BezierConverter.cs | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/LegacyBeatmapExporter.cs b/osu.Game/Database/LegacyBeatmapExporter.cs
index 9ca12a79dd..69120ea885 100644
--- a/osu.Game/Database/LegacyBeatmapExporter.cs
+++ b/osu.Game/Database/LegacyBeatmapExporter.cs
@@ -85,7 +85,8 @@ namespace osu.Game.Database
                 if (hasPath.Path.ControlPoints.Count > 1)
                     hasPath.Path.ControlPoints[^1].Type = null;
 
-                if (BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1) continue;
+                if (BezierConverter.CountSegments(hasPath.Path.ControlPoints) <= 1
+                    && hasPath.Path.ControlPoints[0].Type!.Value.Degree == null) continue;
 
                 var newControlPoints = BezierConverter.ConvertToModernBezier(hasPath.Path.ControlPoints);
 
diff --git a/osu.Game/Rulesets/Objects/BezierConverter.cs b/osu.Game/Rulesets/Objects/BezierConverter.cs
index 4a68161899..638975630e 100644
--- a/osu.Game/Rulesets/Objects/BezierConverter.cs
+++ b/osu.Game/Rulesets/Objects/BezierConverter.cs
@@ -164,9 +164,13 @@ namespace osu.Game.Rulesets.Objects
                         break;
 
                     case SplineType.BSpline:
-                        for (int j = 0; j < segmentVertices.Length - 1; j++)
+                        var bSplineResult = segmentType.Degree == null
+                            ? segmentVertices
+                            : PathApproximator.BSplineToBezier(segmentVertices, segmentType.Degree.Value);
+
+                        for (int j = 0; j < bSplineResult.Length - 1; j++)
                         {
-                            result.Add(new PathControlPoint(segmentVertices[j], j == 0 ? segmentType : null));
+                            result.Add(new PathControlPoint(bSplineResult[j], j == 0 ? PathType.BEZIER : null));
                         }
 
                         break;

From 46d4587c97fc8a6d7b3a2ea0e98366fe149f2ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 15:34:01 +0900
Subject: [PATCH 1603/2296] Add test for slider drawing

---
 .../TestSceneSliderPlacementBlueprint.cs      | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index ecfc8105f1..d1c94c9c9c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -290,6 +290,27 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.LINEAR);
         }
 
+        [Test]
+        public void TestSliderDrawing()
+        {
+            addMovementStep(new Vector2(200));
+            AddStep("press left button", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(300, 200));
+            addMovementStep(new Vector2(400, 200));
+            addMovementStep(new Vector2(400, 300));
+            addMovementStep(new Vector2(400));
+            addMovementStep(new Vector2(300, 400));
+            addMovementStep(new Vector2(200, 400));
+
+            AddStep("release left button", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertPlaced(true);
+            assertLength(600, tolerance: 10);
+            assertControlPointCount(4);
+            assertControlPointType(0, PathType.BSpline(3));
+        }
+
         [Test]
         public void TestPlacePerfectCurveSegmentAlmostLinearlyExterior()
         {
@@ -397,7 +418,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         private void assertPlaced(bool expected) => AddAssert($"slider {(expected ? "placed" : "not placed")}", () => (getSlider() != null) == expected);
 
-        private void assertLength(double expected) => AddAssert($"slider length is {expected}", () => Precision.AlmostEquals(expected, getSlider().Distance, 1));
+        private void assertLength(double expected, double tolerance = 1) => AddAssert($"slider length is {expected}±{tolerance}", () => Precision.AlmostEquals(expected, getSlider().Distance, tolerance));
 
         private void assertControlPointCount(int expected) => AddAssert($"has {expected} control points", () => getSlider().Path.ControlPoints.Count == expected);
 

From 5f302662be30eff9eb12318c40651f1f776fb09c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 15:34:23 +0900
Subject: [PATCH 1604/2296] Remove test terminally broken by introduction of
 slider drawing

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index d1c94c9c9c..c7a21ba689 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -273,23 +273,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(2, PathType.PERFECT_CURVE);
         }
 
-        [Test]
-        public void TestBeginPlacementWithoutReleasingMouse()
-        {
-            addMovementStep(new Vector2(200));
-            AddStep("press left button", () => InputManager.PressButton(MouseButton.Left));
-
-            addMovementStep(new Vector2(400, 200));
-            AddStep("release left button", () => InputManager.ReleaseButton(MouseButton.Left));
-
-            addClickStep(MouseButton.Right);
-
-            assertPlaced(true);
-            assertLength(200);
-            assertControlPointCount(2);
-            assertControlPointType(0, PathType.LINEAR);
-        }
-
         [Test]
         public void TestSliderDrawing()
         {

From 8e39dbbff1898830ab70c5b418ec31b661fede42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 15:41:26 +0900
Subject: [PATCH 1605/2296] Adjust casing of curve type menu items

The "Perfect curve" one in particular... fixes test failures, as some
tests were relying on this particular casing. But the new version feels
more correct anyway, so it's whatever.
---
 osu.Game/Rulesets/Objects/Types/PathType.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Types/PathType.cs b/osu.Game/Rulesets/Objects/Types/PathType.cs
index 37c1d0ab50..f84d43e3e7 100644
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@@ -56,13 +56,13 @@ namespace osu.Game.Rulesets.Objects.Types
                         return "Catmull";
 
                     case SplineType.BSpline:
-                        return Degree == null ? "Bezier" : "B-Spline";
+                        return Degree == null ? "Bezier" : "B-spline";
 
                     case SplineType.Linear:
                         return "Linear";
 
                     case SplineType.PerfectCurve:
-                        return "Perfect Curve";
+                        return "Perfect curve";
 
                     default:
                         return Type.ToString();

From 43dbd65708de80e4e671e042e76496ffb7526d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 15:53:25 +0900
Subject: [PATCH 1606/2296] Show Catmull as a control point type option if
 selection already contains it

---
 .../TestScenePathControlPointVisualiser.cs    | 26 ++++++++++++++++++-
 .../Components/PathControlPointVisualiser.cs  |  4 +--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 811ecf53e9..8234381283 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -148,6 +148,30 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointPathType(3, null);
         }
 
+        [Test]
+        public void TestCatmullAvailableIffSelectionContainsCatmull()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.CATMULL);
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200));
+            addControlPointStep(new Vector2(500, 100));
+
+            moveMouseToControlPoint(2);
+            AddStep("select first and third control point", () =>
+            {
+                visualiser.Pieces[0].IsSelected.Value = true;
+                visualiser.Pieces[2].IsSelected.Value = true;
+            });
+            addContextMenuItemStep("Catmull");
+
+            assertControlPointPathType(0, PathType.CATMULL);
+            assertControlPointPathType(2, PathType.CATMULL);
+            assertControlPointPathType(4, null);
+        }
+
         private void createVisualiser(bool allowSelection) => AddStep("create visualiser", () => Child = visualiser = new PathControlPointVisualiser<Slider>(slider, allowSelection)
         {
             Anchor = Anchor.Centre,
@@ -158,7 +182,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         private void addControlPointStep(Vector2 position, PathType? type)
         {
-            AddStep($"add {type} control point at {position}", () =>
+            AddStep($"add {type?.Type} control point at {position}", () =>
             {
                 slider.Path.ControlPoints.Add(new PathControlPoint(position, type));
             });
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 95c72a0a62..751ca7e753 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -372,9 +372,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 curveTypeItems.Add(createMenuItemForPathType(PathType.BEZIER));
                 curveTypeItems.Add(createMenuItemForPathType(PathType.BSpline(3)));
 
-                var hoveredPiece = Pieces.FirstOrDefault(p => p.IsHovered);
-
-                if (hoveredPiece?.ControlPoint.Type == PathType.CATMULL)
+                if (selectedPieces.Any(piece => piece.ControlPoint.Type?.Type == SplineType.Catmull))
                     curveTypeItems.Add(createMenuItemForPathType(PathType.CATMULL));
 
                 var menuItems = new List<MenuItem>

From 4061417ac8cff9242cf5582fdb8b173f7095059e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 15:54:43 +0900
Subject: [PATCH 1607/2296] Decrease default value for slider tolerance

Highly subjective change, but at 50 the drawing just did not feel
responsive enough to input.
---
 osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
index e44f0265c8..7e72eee510 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             Precision = 0.01f
         };
 
-        private readonly BindableInt sliderTolerance = new BindableInt(50)
+        private readonly BindableInt sliderTolerance = new BindableInt(40)
         {
             MinValue = 5,
             MaxValue = 100

From ded9981d07b8bc54fd43a53a76f6335aab5d636f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Nov 2023 17:55:01 +0900
Subject: [PATCH 1608/2296] Update framework

---
 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 dd5a8996fb..8175869405 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1120.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1120.1" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e5ba01e447..733f5d5d87 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1120.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1120.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1114.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index 9a0832b4e7..a5425ba4c7 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1120.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1120.1" />
   </ItemGroup>
 </Project>

From 492fd06c624b2d8d8ff65464798bcde72c4fd51c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 20 Nov 2023 19:21:23 +0900
Subject: [PATCH 1609/2296] Remove unnecessary null override

---
 .../Blueprints/Sliders/Components/PathControlPointVisualiser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 751ca7e753..3128f46357 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -405,7 +405,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             int totalCount = Pieces.Count(p => p.IsSelected.Value);
             int countOfState = Pieces.Where(p => p.IsSelected.Value).Count(p => p.ControlPoint.Type == type);
 
-            var item = new TernaryStateRadioMenuItem(type == null ? "Inherit" : type!.Value.Description, MenuItemType.Standard, _ =>
+            var item = new TernaryStateRadioMenuItem(type == null ? "Inherit" : type.Value.Description, MenuItemType.Standard, _ =>
             {
                 foreach (var p in Pieces.Where(p => p.IsSelected.Value))
                     updatePathType(p, type);

From c9e8d66e1970fa8498761b4fb5fe868bf879d1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 21:02:12 +0900
Subject: [PATCH 1610/2296] Improve xmldoc

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 4e37481ba7..3fda18b7cb 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -555,9 +555,9 @@ namespace osu.Game
         public void ShowChangelogBuild(string updateStream, string version) => waitForReady(() => changelogOverlay, _ => changelogOverlay.ShowBuild(updateStream, version));
 
         /// <summary>
-        /// Seek to a given timestamp in the Editor and select relevant HitObjects if needed
+        /// Seeks to the provided <paramref name="timestamp"/> if the editor is currently open.
+        /// Can also select objects as indicated by the <paramref name="timestamp"/> (depends on ruleset implementation).
         /// </summary>
-        /// <param name="timestamp">The timestamp and the selected objects</param>
         public void HandleTimestamp(string timestamp)
         {
             if (ScreenStack.CurrentScreen is not Editor editor)

From 0e0ab66148ec99a0458b5102541e1a58206a2887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 21:27:24 +0900
Subject: [PATCH 1611/2296] Simplify parsing code

Less methods, less smeared around logic, saner data types.
---
 osu.Game/Localisation/EditorStrings.cs        |  5 ---
 .../Rulesets/Edit/EditorTimestampParser.cs    | 41 ++++++++++++-------
 osu.Game/Screens/Edit/Editor.cs               | 29 +++----------
 3 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index 227dbc5e0c..e762455e8b 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -129,11 +129,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString FailedToProcessTimestamp => new TranslatableString(getKey(@"failed_to_process_timestamp"), @"Failed to process timestamp");
 
-        /// <summary>
-        /// "The timestamp was too long to process"
-        /// </summary>
-        public static LocalisableString TooLongTimestamp => new TranslatableString(getKey(@"too_long_timestamp"), @"The timestamp was too long to process");
-
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Rulesets/Edit/EditorTimestampParser.cs b/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
index e36822cc63..bdfdce432e 100644
--- a/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
+++ b/osu.Game/Rulesets/Edit/EditorTimestampParser.cs
@@ -2,8 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
 
 namespace osu.Game.Rulesets.Edit
@@ -12,26 +11,40 @@ namespace osu.Game.Rulesets.Edit
     {
         // 00:00:000 (...) - test
         // original osu-web regex: https://github.com/ppy/osu-web/blob/3b1698639244cfdaf0b41c68bfd651ea729ec2e3/resources/js/utils/beatmapset-discussion-helper.ts#L78
-        public static readonly Regex TIME_REGEX = new Regex(@"\b(((\d{2,}):([0-5]\d)[:.](\d{3}))(\s\([^)]+\))?)");
+        public static readonly Regex TIME_REGEX = new Regex(@"\b(((?<minutes>\d{2,}):(?<seconds>[0-5]\d)[:.](?<milliseconds>\d{3}))(?<selection>\s\([^)]+\))?)", RegexOptions.Compiled);
 
-        public static string[] GetRegexGroups(string timestamp)
+        public static bool TryParse(string timestamp, [NotNullWhen(true)] out TimeSpan? parsedTime, out string? parsedSelection)
         {
             Match match = TIME_REGEX.Match(timestamp);
 
-            string[] result = match.Success
-                ? match.Groups.Values.Where(x => x is not Match && !x.Value.Contains(':')).Select(x => x.Value).ToArray()
-                : Array.Empty<string>();
+            if (!match.Success)
+            {
+                parsedTime = null;
+                parsedSelection = null;
+                return false;
+            }
 
-            return result;
-        }
+            bool result = true;
 
-        public static double GetTotalMilliseconds(params string[] timesGroup)
-        {
-            int[] times = timesGroup.Select(int.Parse).ToArray();
+            result &= int.TryParse(match.Groups[@"minutes"].Value, out int timeMin);
+            result &= int.TryParse(match.Groups[@"seconds"].Value, out int timeSec);
+            result &= int.TryParse(match.Groups[@"milliseconds"].Value, out int timeMsec);
 
-            Debug.Assert(times.Length == 3);
+            // somewhat sane limit for timestamp duration (10 hours).
+            result &= timeMin < 600;
 
-            return (times[0] * 60 + times[1]) * 1000 + times[2];
+            if (!result)
+            {
+                parsedTime = null;
+                parsedSelection = null;
+                return false;
+            }
+
+            parsedTime = TimeSpan.FromMinutes(timeMin) + TimeSpan.FromSeconds(timeSec) + TimeSpan.FromMilliseconds(timeMsec);
+            parsedSelection = match.Groups[@"selection"].Value.Trim();
+            if (!string.IsNullOrEmpty(parsedSelection))
+                parsedSelection = parsedSelection[1..^1];
+            return true;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 03d3e3a1f8..c38e88cd02 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1141,9 +1141,7 @@ namespace osu.Game.Screens.Edit
 
         public void HandleTimestamp(string timestamp)
         {
-            string[] groups = EditorTimestampParser.GetRegexGroups(timestamp);
-
-            if (groups.Length != 4 || string.IsNullOrEmpty(groups[0]))
+            if (!EditorTimestampParser.TryParse(timestamp, out var timeSpan, out string selection))
             {
                 Schedule(() => notifications?.Post(new SimpleNotification
                 {
@@ -1153,31 +1151,14 @@ namespace osu.Game.Screens.Edit
                 return;
             }
 
-            string timeMin = groups[0];
-            string timeSec = groups[1];
-            string timeMss = groups[2];
-            string objectsGroup = groups[3].Replace("(", "").Replace(")", "").Trim();
-
-            // Currently, lazer chat highlights infinite-long editor links like `10000000000:00:000 (1)`
-            // Limit timestamp link length at 30000 min (50 hr) to avoid parsing issues
-            if (string.IsNullOrEmpty(timeMin) || timeMin.Length > 5 || double.Parse(timeMin) > 30_000)
-            {
-                Schedule(() => notifications?.Post(new SimpleNotification
-                {
-                    Icon = FontAwesome.Solid.ExclamationTriangle,
-                    Text = EditorStrings.TooLongTimestamp
-                }));
-                return;
-            }
-
             editorBeatmap.SelectedHitObjects.Clear();
 
             if (clock.IsRunning)
                 clock.Stop();
 
-            double position = EditorTimestampParser.GetTotalMilliseconds(timeMin, timeSec, timeMss);
+            double position = timeSpan.Value.TotalMilliseconds;
 
-            if (string.IsNullOrEmpty(objectsGroup))
+            if (string.IsNullOrEmpty(selection))
             {
                 clock.SeekSmoothlyTo(position);
                 return;
@@ -1194,8 +1175,8 @@ namespace osu.Game.Screens.Edit
             if (Mode.Value != EditorScreenMode.Compose)
                 Mode.Value = EditorScreenMode.Compose;
 
-            // Let the Ruleset handle selection
-            currentScreen.Dependencies.Get<HitObjectComposer>().SelectHitObjects(position, objectsGroup);
+            // Delegate handling the selection to the ruleset.
+            currentScreen.Dependencies.Get<HitObjectComposer>().SelectHitObjects(position, selection);
         }
 
         public double SnapTime(double time, double? referenceTime) => editorBeatmap.SnapTime(time, referenceTime);

From 246aacb216d692b7bc54ae7fccebfd5869561d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 21:29:19 +0900
Subject: [PATCH 1612/2296] Remove unnecessary guard

Setting a bindable's value to something if that value is already there
is a no-op (doesn't trigger bindings / callbacks).
---
 osu.Game/Screens/Edit/Editor.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index c38e88cd02..888f535cc6 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1172,8 +1172,7 @@ namespace osu.Game.Screens.Edit
 
             clock.SeekSmoothlyTo(position);
 
-            if (Mode.Value != EditorScreenMode.Compose)
-                Mode.Value = EditorScreenMode.Compose;
+            Mode.Value = EditorScreenMode.Compose;
 
             // Delegate handling the selection to the ruleset.
             currentScreen.Dependencies.Get<HitObjectComposer>().SelectHitObjects(position, selection);

From 234ef6f92379b3cbf0c9a07f2334f2a068f9fe95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 21:34:36 +0900
Subject: [PATCH 1613/2296] Rectify selection keep-alive logic

---
 .../Components/EditorBlueprintContainer.cs    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index a311054ffc..378d378be3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -51,10 +51,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             Beatmap.HitObjectAdded += AddBlueprintFor;
             Beatmap.HitObjectRemoved += RemoveBlueprintFor;
-
-            // This makes sure HitObjects will have active Blueprints ready to display
-            // after clicking on an Editor Timestamp/Link
-            Beatmap.SelectedHitObjects.CollectionChanged += selectionChanged;
+            Beatmap.SelectedHitObjects.CollectionChanged += updateSelectionLifetime;
 
             if (Composer != null)
             {
@@ -149,13 +146,23 @@ namespace osu.Game.Screens.Edit.Compose.Components
             SelectedItems.AddRange(Beatmap.HitObjects.Except(SelectedItems).ToArray());
         }
 
-        private void selectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        /// <summary>
+        /// Ensures that newly-selected hitobjects are kept alive
+        /// and drops that keep-alive from newly-deselected objects.
+        /// </summary>
+        private void updateSelectionLifetime(object sender, NotifyCollectionChangedEventArgs e)
         {
-            if (e == null || e.Action != NotifyCollectionChangedAction.Add || e.NewItems == null)
-                return;
+            if (e.NewItems != null)
+            {
+                foreach (HitObject newSelection in e.NewItems)
+                    Composer.Playfield.SetKeepAlive(newSelection, true);
+            }
 
-            foreach (HitObject item in e.NewItems)
-                Composer.Playfield.SetKeepAlive(item, true);
+            if (e.OldItems != null)
+            {
+                foreach (HitObject oldSelection in e.OldItems)
+                    Composer.Playfield.SetKeepAlive(oldSelection, false);
+            }
         }
 
         protected override void OnBlueprintSelected(SelectionBlueprint<HitObject> blueprint)
@@ -180,7 +187,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 Beatmap.HitObjectAdded -= AddBlueprintFor;
                 Beatmap.HitObjectRemoved -= RemoveBlueprintFor;
-                Beatmap.SelectedHitObjects.CollectionChanged -= selectionChanged;
+                Beatmap.SelectedHitObjects.CollectionChanged -= updateSelectionLifetime;
             }
 
             usageEventBuffer?.Dispose();

From b6215b2809aac10f2bbf82403b76c6ca37f8d285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 21:37:29 +0900
Subject: [PATCH 1614/2296] Rename and document `SelectFromTimestamp`

---
 .../Edit/ManiaHitObjectComposer.cs                  |  2 +-
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs  |  2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs         | 13 +++++++++----
 osu.Game/Screens/Edit/Editor.cs                     |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 92ecea812c..df6c62da51 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         public override string ConvertSelectionToString()
             => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime).Select(h => $"{h.StartTime}|{h.Column}"));
 
-        public override void SelectHitObjects(double timestamp, string objectDescription)
+        public override void SelectFromTimestamp(double timestamp, string objectDescription)
         {
             if (!selection_regex.IsMatch(objectDescription))
                 return;
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 2afbd83ce5..585d692978 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         public override string ConvertSelectionToString()
             => string.Join(',', selectedHitObjects.Cast<OsuHitObject>().OrderBy(h => h.StartTime).Select(h => (h.IndexInCurrentCombo + 1).ToString()));
 
-        public override void SelectHitObjects(double timestamp, string objectDescription)
+        public override void SelectFromTimestamp(double timestamp, string objectDescription)
         {
             if (!selection_regex.IsMatch(objectDescription))
                 return;
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 52a525e84f..50e6393895 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -526,14 +526,19 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public abstract bool CursorInPlacementArea { get; }
 
+        /// <summary>
+        /// Returns a string representing the current selection.
+        /// The inverse method to <see cref="SelectFromTimestamp"/>.
+        /// </summary>
         public virtual string ConvertSelectionToString() => string.Empty;
 
         /// <summary>
-        /// Each ruleset has it's own selection method
+        /// Selects objects based on the supplied <paramref name="timestamp"/> and <paramref name="objectDescription"/>.
+        /// The inverse method to <see cref="ConvertSelectionToString"/>.
         /// </summary>
-        /// <param name="timestamp">The given timestamp</param>
-        /// <param name="objectDescription">The selected object information between the brackets</param>
-        public virtual void SelectHitObjects(double timestamp, string objectDescription) { }
+        /// <param name="timestamp">The time instant to seek to, in milliseconds.</param>
+        /// <param name="objectDescription">The ruleset-specific description of objects to select at the given timestamp.</param>
+        public virtual void SelectFromTimestamp(double timestamp, string objectDescription) { }
 
         #region IPositionSnapProvider
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 888f535cc6..fb34767315 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1175,7 +1175,7 @@ namespace osu.Game.Screens.Edit
             Mode.Value = EditorScreenMode.Compose;
 
             // Delegate handling the selection to the ruleset.
-            currentScreen.Dependencies.Get<HitObjectComposer>().SelectHitObjects(position, selection);
+            currentScreen.Dependencies.Get<HitObjectComposer>().SelectFromTimestamp(position, selection);
         }
 
         public double SnapTime(double time, double? referenceTime) => editorBeatmap.SnapTime(time, referenceTime);

From c16afeb34700b22a09932ad792ae801c0c5bffb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 21:57:07 +0900
Subject: [PATCH 1615/2296] Fix tests

---
 .../Editing/TestSceneOpenEditorTimestamp.cs   | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index bc31924e2c..86ceb73f7a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
@@ -83,46 +83,42 @@ namespace osu.Game.Tests.Visual.Editing
             RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
 
             addStepClickLink("00:00:000", waitForSeek: false);
-            AddAssert("recieved 'must be in edit'", () =>
-                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 1
-            );
+            AddAssert("received 'must be in edit'",
+                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit),
+                () => Is.EqualTo(1));
 
             AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
-            AddAssert("entered song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+            AddUntilStep("entered song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
 
             addStepClickLink("00:00:000 (1)", waitForSeek: false);
-            AddAssert("recieved 'must be in edit'", () =>
-                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit) == 2
-            );
+            AddAssert("received 'must be in edit'",
+                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit),
+                () => Is.EqualTo(2));
 
             setUpEditor(rulesetInfo);
-            AddAssert("is editor Osu", () => editorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
+            AddAssert("ruleset is osu!", () => editorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
             addStepClickLink("00:000", "invalid link", waitForSeek: false);
-            AddAssert("recieved 'failed to process'", () =>
-                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp) == 1
-            );
+            AddAssert("received 'failed to process'",
+                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp),
+                () => Is.EqualTo(1));
 
             addStepClickLink("50000:00:000", "too long link", waitForSeek: false);
-            AddAssert("recieved 'too long'", () =>
-                Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.TooLongTimestamp) == 1
-            );
+            AddAssert("received 'failed to process'",
+                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp),
+                () => Is.EqualTo(2));
         }
 
         [Test]
         public void TestHandleCurrentScreenChanges()
         {
-            const long long_link_value = 1_000 * 60 * 1_000;
             RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
 
             setUpEditor(rulesetInfo);
-            AddAssert("is editor Osu", () => editorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
+            AddAssert("is osu! ruleset", () => editorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
-            addStepClickLink("1000:00:000", "long link");
-            AddAssert("moved to end of track", () =>
-                editorClock.CurrentTime == long_link_value
-                || (editorClock.TrackLength < long_link_value && editorClock.CurrentTime == editorClock.TrackLength)
-            );
+            addStepClickLink("100:00:000", "long link");
+            AddUntilStep("moved to end of track", () => editorClock.CurrentTime, () => Is.EqualTo(editorClock.TrackLength));
 
             addStepScreenModeTo(EditorScreenMode.SongSetup);
             addStepClickLink("00:00:000");

From 364a3f75e15001b785f185c41ba69e28edecf926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 22:03:25 +0900
Subject: [PATCH 1616/2296] Compile regexes

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 6 +++---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index df6c62da51..e876ff1c81 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -49,12 +49,12 @@ namespace osu.Game.Rulesets.Mania.Edit
             new HoldNoteCompositionTool()
         };
 
-        // 123|0,456|1,789|2 ...
-        private static readonly Regex selection_regex = new Regex(@"^\d+\|\d+(,\d+\|\d+)*$");
-
         public override string ConvertSelectionToString()
             => string.Join(',', EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().OrderBy(h => h.StartTime).Select(h => $"{h.StartTime}|{h.Column}"));
 
+        // 123|0,456|1,789|2 ...
+        private static readonly Regex selection_regex = new Regex(@"^\d+\|\d+(,\d+\|\d+)*$", RegexOptions.Compiled);
+
         public override void SelectFromTimestamp(double timestamp, string objectDescription)
         {
             if (!selection_regex.IsMatch(objectDescription))
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 585d692978..c3fd36b933 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -104,12 +104,12 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new OsuBlueprintContainer(this);
 
-        // 1,2,3,4 ...
-        private static readonly Regex selection_regex = new Regex(@"^\d+(,\d+)*$");
-
         public override string ConvertSelectionToString()
             => string.Join(',', selectedHitObjects.Cast<OsuHitObject>().OrderBy(h => h.StartTime).Select(h => (h.IndexInCurrentCombo + 1).ToString()));
 
+        // 1,2,3,4 ...
+        private static readonly Regex selection_regex = new Regex(@"^\d+(,\d+)*$", RegexOptions.Compiled);
+
         public override void SelectFromTimestamp(double timestamp, string objectDescription)
         {
             if (!selection_regex.IsMatch(objectDescription))

From a8fc73695f30b3d22c260c8ea030f3034d1c21d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 22:04:08 +0900
Subject: [PATCH 1617/2296] Rename variable

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index e876ff1c81..967cdb0e54 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -61,11 +61,11 @@ namespace osu.Game.Rulesets.Mania.Edit
                 return;
 
             List<ManiaHitObject> remainingHitObjects = EditorBeatmap.HitObjects.Cast<ManiaHitObject>().Where(h => h.StartTime >= timestamp).ToList();
-            string[] splitDescription = objectDescription.Split(',').ToArray();
+            string[] objectDescriptions = objectDescription.Split(',').ToArray();
 
-            for (int i = 0; i < splitDescription.Length; i++)
+            for (int i = 0; i < objectDescriptions.Length; i++)
             {
-                string[] split = splitDescription[i].Split('|').ToArray();
+                string[] split = objectDescriptions[i].Split('|').ToArray();
                 if (split.Length != 2)
                     continue;
 
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
                 EditorBeatmap.SelectedHitObjects.Add(current);
 
-                if (i < splitDescription.Length - 1)
+                if (i < objectDescriptions.Length - 1)
                     remainingHitObjects = remainingHitObjects.Where(h => h != current && h.StartTime >= current.StartTime).ToList();
             }
         }

From 745a04a243b90a1b83da308ea3e8e6467c9faacc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 20 Nov 2023 22:12:15 +0900
Subject: [PATCH 1618/2296] More test cleanup

---
 .../TestSceneOpenEditorTimestampInOsu.cs      | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs
index 93573b5ad8..753400e10e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.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;
@@ -25,16 +26,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addStepClickLink("00:00:000", "reset", false);
         }
 
-        private bool checkSnapAndSelectCombo(double startTime, params int[] comboNumbers)
-        {
-            bool checkCombos = comboNumbers.Any()
-                ? hasCombosInOrder(EditorBeatmap.SelectedHitObjects, comboNumbers)
-                : !EditorBeatmap.SelectedHitObjects.Any();
+        private void checkSelection(Func<double> startTime, params int[] comboNumbers)
+            => AddUntilStep($"seeked & selected {(comboNumbers.Any() ? string.Join(",", comboNumbers) : "nothing")}", () =>
+            {
+                bool checkCombos = comboNumbers.Any()
+                    ? hasCombosInOrder(EditorBeatmap.SelectedHitObjects, comboNumbers)
+                    : !EditorBeatmap.SelectedHitObjects.Any();
 
-            return EditorClock.CurrentTime == startTime
-                   && EditorBeatmap.SelectedHitObjects.Count == comboNumbers.Length
-                   && checkCombos;
-        }
+                return EditorClock.CurrentTime == startTime()
+                       && EditorBeatmap.SelectedHitObjects.Count == comboNumbers.Length
+                       && checkCombos;
+            });
 
         private bool hasCombosInOrder(IEnumerable<HitObject> selected, params int[] comboNumbers)
         {
@@ -51,19 +53,19 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         public void TestNormalSelection()
         {
             addStepClickLink("00:02:170 (1,2,3)");
-            AddAssert("snap and select 1-2-3", () => checkSnapAndSelectCombo(2_170, 1, 2, 3));
+            checkSelection(() => 2_170, 1, 2, 3);
 
             addReset();
             addStepClickLink("00:04:748 (2,3,4,1,2)");
-            AddAssert("snap and select 2-3-4-1-2", () => checkSnapAndSelectCombo(4_748, 2, 3, 4, 1, 2));
+            checkSelection(() => 4_748, 2, 3, 4, 1, 2);
 
             addReset();
             addStepClickLink("00:02:170 (1,1,1)");
-            AddAssert("snap and select 1-1-1", () => checkSnapAndSelectCombo(2_170, 1, 1, 1));
+            checkSelection(() => 2_170, 1, 1, 1);
 
             addReset();
             addStepClickLink("00:02:873 (2,2,2,2)");
-            AddAssert("snap and select 2-2-2-2", () => checkSnapAndSelectCombo(2_873, 2, 2, 2, 2));
+            checkSelection(() => 2_873, 2, 2, 2, 2);
         }
 
         [Test]
@@ -71,24 +73,22 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             HitObject firstObject = null!;
 
+            AddStep("retrieve first object", () => firstObject = EditorBeatmap.HitObjects.First());
+
             addStepClickLink("00:00:000 (0)", "invalid combo");
-            AddAssert("snap to next, select none", () =>
-            {
-                firstObject = EditorBeatmap.HitObjects.First();
-                return checkSnapAndSelectCombo(firstObject.StartTime);
-            });
+            checkSelection(() => firstObject.StartTime);
 
             addReset();
             addStepClickLink("00:00:000 (1)", "wrong offset");
-            AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1));
+            checkSelection(() => firstObject.StartTime, 1);
 
             addReset();
             addStepClickLink("00:00:956 (2,3,4)", "wrong offset");
-            AddAssert("snap to next, select 2-3-4", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3, 4));
+            checkSelection(() => firstObject.StartTime, 2, 3, 4);
 
             addReset();
             addStepClickLink("00:00:956 (956|1,956|2)", "mania link");
-            AddAssert("snap to next, select none", () => checkSnapAndSelectCombo(firstObject.StartTime));
+            checkSelection(() => firstObject.StartTime);
         }
     }
 }

From 750bbc8a19cfdb0f1c3133e9bd86e02bacb51f0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 00:17:25 +0900
Subject: [PATCH 1619/2296] Simplify null checks

---
 .../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 3128f46357..ef8a033014 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             int indexInSegment = piece.PointsInSegment.IndexOf(piece.ControlPoint);
 
-            if (type.HasValue && type.Value.Type == SplineType.PerfectCurve)
+            if (type?.Type == SplineType.PerfectCurve)
             {
                 // Can't always create a circular arc out of 4 or more points,
                 // so we split the segment into one 3-point circular arc segment
@@ -405,7 +405,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             int totalCount = Pieces.Count(p => p.IsSelected.Value);
             int countOfState = Pieces.Where(p => p.IsSelected.Value).Count(p => p.ControlPoint.Type == type);
 
-            var item = new TernaryStateRadioMenuItem(type == null ? "Inherit" : type.Value.Description, MenuItemType.Standard, _ =>
+            var item = new TernaryStateRadioMenuItem(type?.Description ?? "Inherit", MenuItemType.Standard, _ =>
             {
                 foreach (var p in Pieces.Where(p => p.IsSelected.Value))
                     updatePathType(p, type);

From 6f5c468a83cd0341616d01d10ef5345568a7d943 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 00:21:44 +0900
Subject: [PATCH 1620/2296] Rename settings class

---
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs |  8 ++++----
 ...ovider.cs => FreehandSliderSettingsProvider.cs} | 14 +++++++-------
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename osu.Game.Rulesets.Osu/Edit/{OsuSliderDrawingSettingsProvider.cs => FreehandSliderSettingsProvider.cs} (98%)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index fb2c1d5149..df8417d8ff 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private OsuSliderDrawingSettingsProvider drawingSettingsProvider { get; set; }
+        private FreehandSliderSettingsProvider freehandSettingsProvider { get; set; }
 
         private readonly IncrementalBSplineBuilder bSplineBuilder = new IncrementalBSplineBuilder();
 
@@ -80,16 +80,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             base.LoadComplete();
             inputManager = GetContainingInputManager();
 
-            if (drawingSettingsProvider != null)
+            if (freehandSettingsProvider != null)
             {
-                drawingSettingsProvider.Tolerance.BindValueChanged(e =>
+                freehandSettingsProvider.Tolerance.BindValueChanged(e =>
                 {
                     if (bSplineBuilder.Tolerance != e.NewValue)
                         bSplineBuilder.Tolerance = e.NewValue;
                     updateSliderPathFromBSplineBuilder();
                 });
 
-                drawingSettingsProvider.CornerThreshold.BindValueChanged(e =>
+                freehandSettingsProvider.CornerThreshold.BindValueChanged(e =>
                 {
                     if (bSplineBuilder.CornerThreshold != e.NewValue)
                         bSplineBuilder.CornerThreshold = e.NewValue;
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
similarity index 98%
rename from osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
rename to osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
index 7e72eee510..9ad2b5d0f5 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSliderDrawingSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Edit;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public partial class OsuSliderDrawingSettingsProvider : Drawable
+    public partial class FreehandSliderSettingsProvider : Drawable
     {
         public BindableFloat Tolerance { get; } = new BindableFloat(1.5f)
         {
@@ -19,12 +19,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             Precision = 0.01f
         };
 
-        private readonly BindableInt sliderTolerance = new BindableInt(40)
-        {
-            MinValue = 5,
-            MaxValue = 100
-        };
-
         public BindableFloat CornerThreshold { get; } = new BindableFloat(0.4f)
         {
             MinValue = 0.05f,
@@ -32,6 +26,12 @@ namespace osu.Game.Rulesets.Osu.Edit
             Precision = 0.01f
         };
 
+        private readonly BindableInt sliderTolerance = new BindableInt(40)
+        {
+            MinValue = 5,
+            MaxValue = 100
+        };
+
         private readonly BindableInt sliderCornerThreshold = new BindableInt(40)
         {
             MinValue = 5,
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 0dc0d6fd31..7bf1a12149 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected readonly OsuDistanceSnapProvider DistanceSnapProvider = new OsuDistanceSnapProvider();
 
         [Cached]
-        protected readonly OsuSliderDrawingSettingsProvider SliderDrawingSettingsProvider = new OsuSliderDrawingSettingsProvider();
+        protected readonly FreehandSliderSettingsProvider FreehandSliderSettingsProvider = new FreehandSliderSettingsProvider();
 
         [BackgroundDependencyLoader]
         private void load()
@@ -102,8 +102,8 @@ namespace osu.Game.Rulesets.Osu.Edit
                 RotationHandler = BlueprintContainer.SelectionHandler.RotationHandler,
             });
 
-            AddInternal(SliderDrawingSettingsProvider);
-            SliderDrawingSettingsProvider.AttachToToolbox(RightToolbox);
+            AddInternal(FreehandSliderSettingsProvider);
+            FreehandSliderSettingsProvider.AttachToToolbox(RightToolbox);
         }
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer()

From 638c8f1adc2e135aff574e135c515adfbf384423 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 00:25:23 +0900
Subject: [PATCH 1621/2296] Get rid of weird cruft and non-standard flow

---
 .../Edit/FreehandSliderSettingsProvider.cs    | 66 ++++++++++---------
 .../Edit/OsuHitObjectComposer.cs              |  5 +-
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
index 9ad2b5d0f5..f4ee130938 100644
--- a/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
@@ -2,6 +2,7 @@
 // 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.Utils;
@@ -10,8 +11,13 @@ using osu.Game.Rulesets.Edit;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public partial class FreehandSliderSettingsProvider : Drawable
+    public partial class FreehandSliderSettingsProvider : EditorToolboxGroup
     {
+        public FreehandSliderSettingsProvider()
+            : base("slider")
+        {
+        }
+
         public BindableFloat Tolerance { get; } = new BindableFloat(1.5f)
         {
             MinValue = 0.05f,
@@ -41,6 +47,34 @@ namespace osu.Game.Rulesets.Osu.Edit
         private ExpandableSlider<int> toleranceSlider = null!;
         private ExpandableSlider<int> cornerThresholdSlider = null!;
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new Drawable[]
+            {
+                toleranceSlider = new ExpandableSlider<int>
+                {
+                    Current = sliderTolerance
+                },
+                cornerThresholdSlider = new ExpandableSlider<int>
+                {
+                    Current = sliderCornerThreshold
+                }
+            };
+
+            sliderTolerance.BindValueChanged(e =>
+            {
+                toleranceSlider.ContractedLabelText = $"C. P. S.: {e.NewValue:N0}";
+                toleranceSlider.ExpandedLabelText = $"Control Point Spacing: {e.NewValue:N0}";
+            }, true);
+
+            sliderCornerThreshold.BindValueChanged(e =>
+            {
+                cornerThresholdSlider.ContractedLabelText = $"C. T.: {e.NewValue:N0}";
+                cornerThresholdSlider.ExpandedLabelText = $"Corner Threshold: {e.NewValue:N0}";
+            }, true);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -70,35 +104,5 @@ namespace osu.Game.Rulesets.Osu.Edit
                     sliderCornerThreshold.Value = newValue;
             });
         }
-
-        public void AttachToToolbox(ExpandingToolboxContainer toolboxContainer)
-        {
-            toolboxContainer.Add(new EditorToolboxGroup("slider")
-            {
-                Children = new Drawable[]
-                {
-                    toleranceSlider = new ExpandableSlider<int>
-                    {
-                        Current = sliderTolerance
-                    },
-                    cornerThresholdSlider = new ExpandableSlider<int>
-                    {
-                        Current = sliderCornerThreshold
-                    }
-                }
-            });
-
-            sliderTolerance.BindValueChanged(e =>
-            {
-                toleranceSlider.ContractedLabelText = $"C. P. S.: {e.NewValue:N0}";
-                toleranceSlider.ExpandedLabelText = $"Control Point Spacing: {e.NewValue:N0}";
-            }, true);
-
-            sliderCornerThreshold.BindValueChanged(e =>
-            {
-                cornerThresholdSlider.ContractedLabelText = $"C. T.: {e.NewValue:N0}";
-                cornerThresholdSlider.ExpandedLabelText = $"Corner Threshold: {e.NewValue:N0}";
-            }, true);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 7bf1a12149..06584ef17a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected readonly OsuDistanceSnapProvider DistanceSnapProvider = new OsuDistanceSnapProvider();
 
         [Cached]
-        protected readonly FreehandSliderSettingsProvider FreehandSliderSettingsProvider = new FreehandSliderSettingsProvider();
+        protected readonly FreehandSliderSettingsProvider FreehandlSliderToolboxGroup = new FreehandSliderSettingsProvider();
 
         [BackgroundDependencyLoader]
         private void load()
@@ -102,8 +102,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 RotationHandler = BlueprintContainer.SelectionHandler.RotationHandler,
             });
 
-            AddInternal(FreehandSliderSettingsProvider);
-            FreehandSliderSettingsProvider.AttachToToolbox(RightToolbox);
+            RightToolbox.Add(FreehandlSliderToolboxGroup);
         }
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer()

From e9f371a5811b72763a50fc1e5fffba5ef95e081f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 09:59:49 +0900
Subject: [PATCH 1622/2296] Refactor slider settings class

---
 .../Sliders/SliderPlacementBlueprint.cs       |  8 +-
 ...vider.cs => FreehandSliderToolboxGroup.cs} | 74 +++++++++----------
 .../Edit/OsuHitObjectComposer.cs              |  2 +-
 3 files changed, 38 insertions(+), 46 deletions(-)
 rename osu.Game.Rulesets.Osu/Edit/{FreehandSliderSettingsProvider.cs => FreehandSliderToolboxGroup.cs} (53%)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index df8417d8ff..f8b7642643 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private FreehandSliderSettingsProvider freehandSettingsProvider { get; set; }
+        private FreehandSliderToolboxGroup freehandToolboxGroup { get; set; }
 
         private readonly IncrementalBSplineBuilder bSplineBuilder = new IncrementalBSplineBuilder();
 
@@ -80,16 +80,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             base.LoadComplete();
             inputManager = GetContainingInputManager();
 
-            if (freehandSettingsProvider != null)
+            if (freehandToolboxGroup != null)
             {
-                freehandSettingsProvider.Tolerance.BindValueChanged(e =>
+                freehandToolboxGroup.Tolerance.BindValueChanged(e =>
                 {
                     if (bSplineBuilder.Tolerance != e.NewValue)
                         bSplineBuilder.Tolerance = e.NewValue;
                     updateSliderPathFromBSplineBuilder();
                 });
 
-                freehandSettingsProvider.CornerThreshold.BindValueChanged(e =>
+                freehandToolboxGroup.CornerThreshold.BindValueChanged(e =>
                 {
                     if (bSplineBuilder.CornerThreshold != e.NewValue)
                         bSplineBuilder.CornerThreshold = e.NewValue;
diff --git a/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs b/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
similarity index 53%
rename from osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
rename to osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
index f4ee130938..1974415d30 100644
--- a/osu.Game.Rulesets.Osu/Edit/FreehandSliderSettingsProvider.cs
+++ b/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
@@ -5,15 +5,14 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public partial class FreehandSliderSettingsProvider : EditorToolboxGroup
+    public partial class FreehandSliderToolboxGroup : EditorToolboxGroup
     {
-        public FreehandSliderSettingsProvider()
+        public FreehandSliderToolboxGroup()
             : base("slider")
         {
         }
@@ -32,13 +31,14 @@ namespace osu.Game.Rulesets.Osu.Edit
             Precision = 0.01f
         };
 
-        private readonly BindableInt sliderTolerance = new BindableInt(40)
+        // We map internal ranges to a more standard range of values for display to the user.
+        private readonly BindableInt displayTolerance = new BindableInt(40)
         {
             MinValue = 5,
             MaxValue = 100
         };
 
-        private readonly BindableInt sliderCornerThreshold = new BindableInt(40)
+        private readonly BindableInt displayCornerThreshold = new BindableInt(40)
         {
             MinValue = 5,
             MaxValue = 100
@@ -54,55 +54,47 @@ namespace osu.Game.Rulesets.Osu.Edit
             {
                 toleranceSlider = new ExpandableSlider<int>
                 {
-                    Current = sliderTolerance
+                    Current = displayTolerance
                 },
                 cornerThresholdSlider = new ExpandableSlider<int>
                 {
-                    Current = sliderCornerThreshold
+                    Current = displayCornerThreshold
                 }
             };
-
-            sliderTolerance.BindValueChanged(e =>
-            {
-                toleranceSlider.ContractedLabelText = $"C. P. S.: {e.NewValue:N0}";
-                toleranceSlider.ExpandedLabelText = $"Control Point Spacing: {e.NewValue:N0}";
-            }, true);
-
-            sliderCornerThreshold.BindValueChanged(e =>
-            {
-                cornerThresholdSlider.ContractedLabelText = $"C. T.: {e.NewValue:N0}";
-                cornerThresholdSlider.ExpandedLabelText = $"Corner Threshold: {e.NewValue:N0}";
-            }, true);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            sliderTolerance.BindValueChanged(v =>
+            displayTolerance.BindValueChanged(tolerance =>
             {
-                float newValue = v.NewValue / 33f;
-                if (!Precision.AlmostEquals(newValue, Tolerance.Value))
-                    Tolerance.Value = newValue;
-            });
-            Tolerance.BindValueChanged(v =>
+                toleranceSlider.ContractedLabelText = $"C. P. S.: {tolerance.NewValue:N0}";
+                toleranceSlider.ExpandedLabelText = $"Control Point Spacing: {tolerance.NewValue:N0}";
+
+                Tolerance.Value = displayToInternalTolerance(tolerance.NewValue);
+            }, true);
+
+            displayCornerThreshold.BindValueChanged(threshold =>
             {
-                int newValue = (int)Math.Round(v.NewValue * 33f);
-                if (sliderTolerance.Value != newValue)
-                    sliderTolerance.Value = newValue;
-            });
-            sliderCornerThreshold.BindValueChanged(v =>
-            {
-                float newValue = v.NewValue / 100f;
-                if (!Precision.AlmostEquals(newValue, CornerThreshold.Value))
-                    CornerThreshold.Value = newValue;
-            });
-            CornerThreshold.BindValueChanged(v =>
-            {
-                int newValue = (int)Math.Round(v.NewValue * 100f);
-                if (sliderCornerThreshold.Value != newValue)
-                    sliderCornerThreshold.Value = newValue;
-            });
+                cornerThresholdSlider.ContractedLabelText = $"C. T.: {threshold.NewValue:N0}";
+                cornerThresholdSlider.ExpandedLabelText = $"Corner Threshold: {threshold.NewValue:N0}";
+
+                CornerThreshold.Value = displayToInternalCornerThreshold(threshold.NewValue);
+            }, true);
+
+            Tolerance.BindValueChanged(tolerance =>
+                displayTolerance.Value = internalToDisplayTolerance(tolerance.NewValue)
+            );
+            CornerThreshold.BindValueChanged(threshold =>
+                displayCornerThreshold.Value = internalToDisplayCornerThreshold(threshold.NewValue)
+            );
+
+            float displayToInternalTolerance(float v) => v / 33f;
+            int internalToDisplayTolerance(float v) => (int)Math.Round(v * 33f);
+
+            float displayToInternalCornerThreshold(float v) => v / 100f;
+            int internalToDisplayCornerThreshold(float v) => (int)Math.Round(v * 100f);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 06584ef17a..061f72d72f 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected readonly OsuDistanceSnapProvider DistanceSnapProvider = new OsuDistanceSnapProvider();
 
         [Cached]
-        protected readonly FreehandSliderSettingsProvider FreehandlSliderToolboxGroup = new FreehandSliderSettingsProvider();
+        protected readonly FreehandSliderToolboxGroup FreehandlSliderToolboxGroup = new FreehandSliderToolboxGroup();
 
         [BackgroundDependencyLoader]
         private void load()

From 5514a53df171d035d7d3afdee56b38903f29dc07 Mon Sep 17 00:00:00 2001
From: Stedoss <29103029+Stedoss@users.noreply.github.com>
Date: Tue, 21 Nov 2023 01:04:46 +0000
Subject: [PATCH 1623/2296] Pass ruleset to callback to prevent ruleset desync

---
 osu.Game/Overlays/UserProfileOverlay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index d45a010e4a..fd494f63e1 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -174,16 +174,16 @@ namespace osu.Game.Overlays
                 return;
 
             userReq = user.OnlineID > 1 ? new GetUserRequest(user.OnlineID, ruleset) : new GetUserRequest(user.Username, ruleset);
-            userReq.Success += userLoadComplete;
+            userReq.Success += u => userLoadComplete(u, ruleset);
             API.Queue(userReq);
             loadingLayer.Show();
         }
 
-        private void userLoadComplete(APIUser loadedUser)
+        private void userLoadComplete(APIUser loadedUser, IRulesetInfo? userRuleset)
         {
             Debug.Assert(sections != null && sectionsContainer != null && tabs != null);
 
-            var actualRuleset = rulesets.GetRuleset(ruleset?.ShortName ?? loadedUser.PlayMode).AsNonNull();
+            var actualRuleset = rulesets.GetRuleset(userRuleset?.ShortName ?? loadedUser.PlayMode).AsNonNull();
 
             var userProfile = new UserProfileData(loadedUser, actualRuleset);
             Header.User.Value = userProfile;

From ec7b82f5e874e7728a10ba5fe5c5872218dac056 Mon Sep 17 00:00:00 2001
From: Stedoss <29103029+Stedoss@users.noreply.github.com>
Date: Tue, 21 Nov 2023 01:55:08 +0000
Subject: [PATCH 1624/2296] Change early return to check for online `State`
 instead of `IsLoggedIn`

---
 osu.Game/Overlays/UserProfileOverlay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index fd494f63e1..193651fa72 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Profile;
@@ -170,7 +171,7 @@ namespace osu.Game.Overlays
 
             sectionsContainer.ScrollToTop();
 
-            if (!API.IsLoggedIn)
+            if (API.State.Value != APIState.Online)
                 return;
 
             userReq = user.OnlineID > 1 ? new GetUserRequest(user.OnlineID, ruleset) : new GetUserRequest(user.Username, ruleset);

From 826c82de474f1cf322500dcc10e2d2d38719e297 Mon Sep 17 00:00:00 2001
From: Stedoss <29103029+Stedoss@users.noreply.github.com>
Date: Tue, 21 Nov 2023 01:56:37 +0000
Subject: [PATCH 1625/2296] Add unit test for handling login state in
 `UserProfileOverlay`

---
 .../Online/TestSceneUserProfileOverlay.cs     | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index a321a194a9..1375689075 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -78,6 +78,31 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("complete request", () => pendingRequest.TriggerSuccess(TEST_USER));
         }
 
+        [Test]
+        public void TestLogin()
+        {
+            GetUserRequest pendingRequest = null!;
+
+            AddStep("set up request handling", () =>
+            {
+                dummyAPI.HandleRequest = req =>
+                {
+                    if (dummyAPI.State.Value == APIState.Online && req is GetUserRequest getUserRequest)
+                    {
+                        pendingRequest = getUserRequest;
+                        return true;
+                    }
+
+                    return false;
+                };
+            });
+            AddStep("logout", () => dummyAPI.Logout());
+            AddStep("show user", () => profile.ShowUser(new APIUser { Id = 1 }));
+            AddStep("login", () => dummyAPI.Login("username", "password"));
+            AddWaitStep("wait some", 3);
+            AddStep("complete request", () => pendingRequest.TriggerSuccess(TEST_USER));
+        }
+
         public static readonly APIUser TEST_USER = new APIUser
         {
             Username = @"Somebody",

From 3680024e3102d5dcca617371105d4c3bf3787945 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 11:15:00 +0900
Subject: [PATCH 1626/2296] Fix tolerance not being transferred to blueprint in
 all cases

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index f8b7642643..5f072eb171 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     if (bSplineBuilder.Tolerance != e.NewValue)
                         bSplineBuilder.Tolerance = e.NewValue;
                     updateSliderPathFromBSplineBuilder();
-                });
+                }, true);
 
                 freehandToolboxGroup.CornerThreshold.BindValueChanged(e =>
                 {

From 405ab499e9dfd7c75477513aa38b344ffb901781 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 14:24:10 +0900
Subject: [PATCH 1627/2296] Allow context menus to have visible spacers

---
 .../Visual/Editing/TestSceneEditorMenuBar.cs  | 22 +++++++-------
 osu.Game/Graphics/UserInterface/OsuMenu.cs    | 30 ++++++++++++++++++-
 .../UserInterface/OsuMenuItemSpacer.cs        | 13 ++++++++
 osu.Game/Overlays/SkinEditor/SkinEditor.cs    | 10 +++----
 .../SkinEditor/SkinSelectionHandler.cs        |  7 ++---
 .../Edit/Components/Menus/EditorMenuBar.cs    | 27 +----------------
 .../Components/Menus/EditorMenuItemSpacer.cs  | 13 --------
 osu.Game/Screens/Edit/Editor.cs               | 10 +++----
 8 files changed, 67 insertions(+), 65 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/OsuMenuItemSpacer.cs
 delete mode 100644 osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
index dbcf66f005..fe47f5885d 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
@@ -34,51 +34,51 @@ namespace osu.Game.Tests.Visual.Editing
                     {
                         new MenuItem("File")
                         {
-                            Items = new[]
+                            Items = new OsuMenuItem[]
                             {
                                 new EditorMenuItem("Clear All Notes"),
                                 new EditorMenuItem("Open Difficulty..."),
                                 new EditorMenuItem("Save"),
                                 new EditorMenuItem("Create a new Difficulty..."),
-                                new EditorMenuItemSpacer(),
+                                new OsuMenuItemSpacer(),
                                 new EditorMenuItem("Revert to Saved"),
                                 new EditorMenuItem("Revert to Saved (Full)"),
-                                new EditorMenuItemSpacer(),
+                                new OsuMenuItemSpacer(),
                                 new EditorMenuItem("Test Beatmap"),
                                 new EditorMenuItem("Open AiMod"),
-                                new EditorMenuItemSpacer(),
+                                new OsuMenuItemSpacer(),
                                 new EditorMenuItem("Upload Beatmap..."),
                                 new EditorMenuItem("Export Package"),
                                 new EditorMenuItem("Export Map Package"),
                                 new EditorMenuItem("Import from..."),
-                                new EditorMenuItemSpacer(),
+                                new OsuMenuItemSpacer(),
                                 new EditorMenuItem("Open Song Folder"),
                                 new EditorMenuItem("Open .osu in Notepad"),
                                 new EditorMenuItem("Open .osb in Notepad"),
-                                new EditorMenuItemSpacer(),
+                                new OsuMenuItemSpacer(),
                                 new EditorMenuItem("Exit"),
                             }
                         },
                         new MenuItem("Timing")
                         {
-                            Items = new[]
+                            Items = new OsuMenuItem[]
                             {
                                 new EditorMenuItem("Time Signature"),
                                 new EditorMenuItem("Metronome Clicks"),
-                                new EditorMenuItemSpacer(),
+                                new OsuMenuItemSpacer(),
                                 new EditorMenuItem("Add Timing Section"),
                                 new EditorMenuItem("Add Inheriting Section"),
                                 new EditorMenuItem("Reset Current Section"),
                                 new EditorMenuItem("Delete Timing Section"),
                                 new EditorMenuItem("Resnap Current Section"),
-                                new EditorMenuItemSpacer(),
+                                new OsuMenuItemSpacer(),
                                 new EditorMenuItem("Timing Setup"),
-                                new EditorMenuItemSpacer(),
+                                new OsuMenuItemSpacer(),
                                 new EditorMenuItem("Resnap All Notes", MenuItemType.Destructive),
                                 new EditorMenuItem("Move all notes in time...", MenuItemType.Destructive),
                                 new EditorMenuItem("Recalculate Slider Lengths", MenuItemType.Destructive),
                                 new EditorMenuItem("Delete All Timing Sections", MenuItemType.Destructive),
-                                new EditorMenuItemSpacer(),
+                                new OsuMenuItemSpacer(),
                                 new EditorMenuItem("Set Current Position as Preview Point"),
                             }
                         },
diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs
index 73d57af793..e2aac297e3 100644
--- a/osu.Game/Graphics/UserInterface/OsuMenu.cs
+++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs
@@ -6,13 +6,15 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -78,6 +80,9 @@ namespace osu.Game.Graphics.UserInterface
             {
                 case StatefulMenuItem stateful:
                     return new DrawableStatefulMenuItem(stateful);
+
+                case OsuMenuItemSpacer spacer:
+                    return new DrawableSpacer(spacer);
             }
 
             return new DrawableOsuMenuItem(item);
@@ -89,5 +94,28 @@ namespace osu.Game.Graphics.UserInterface
         {
             Anchor = Direction == Direction.Horizontal ? Anchor.BottomLeft : Anchor.TopRight
         };
+
+        protected partial class DrawableSpacer : DrawableOsuMenuItem
+        {
+            public DrawableSpacer(MenuItem item)
+                : base(item)
+            {
+                Scale = new Vector2(1, 0.6f);
+
+                AddInternal(new Box
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Colour = BackgroundColourHover,
+                    RelativeSizeAxes = Axes.X,
+                    Height = 2f,
+                    Width = 0.8f,
+                });
+            }
+
+            protected override bool OnHover(HoverEvent e) => true;
+
+            protected override bool OnClick(ClickEvent e) => true;
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/OsuMenuItemSpacer.cs b/osu.Game/Graphics/UserInterface/OsuMenuItemSpacer.cs
new file mode 100644
index 0000000000..8a3a928c60
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/OsuMenuItemSpacer.cs
@@ -0,0 +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.
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuMenuItemSpacer : OsuMenuItem
+    {
+        public OsuMenuItemSpacer()
+            : base(" ")
+        {
+        }
+    }
+}
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index 38eed55241..a816031668 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -151,23 +151,23 @@ namespace osu.Game.Overlays.SkinEditor
                                         {
                                             new MenuItem(CommonStrings.MenuBarFile)
                                             {
-                                                Items = new[]
+                                                Items = new OsuMenuItem[]
                                                 {
                                                     new EditorMenuItem(Web.CommonStrings.ButtonsSave, MenuItemType.Standard, () => Save()),
                                                     new EditorMenuItem(CommonStrings.Export, MenuItemType.Standard, () => skins.ExportCurrentSkin()) { Action = { Disabled = !RuntimeInfo.IsDesktop } },
-                                                    new EditorMenuItemSpacer(),
+                                                    new OsuMenuItemSpacer(),
                                                     new EditorMenuItem(CommonStrings.RevertToDefault, MenuItemType.Destructive, () => dialogOverlay?.Push(new RevertConfirmDialog(revert))),
-                                                    new EditorMenuItemSpacer(),
+                                                    new OsuMenuItemSpacer(),
                                                     new EditorMenuItem(CommonStrings.Exit, MenuItemType.Standard, () => skinEditorOverlay?.Hide()),
                                                 },
                                             },
                                             new MenuItem(CommonStrings.MenuBarEdit)
                                             {
-                                                Items = new[]
+                                                Items = new OsuMenuItem[]
                                                 {
                                                     undoMenuItem = new EditorMenuItem(CommonStrings.Undo, MenuItemType.Standard, Undo),
                                                     redoMenuItem = new EditorMenuItem(CommonStrings.Redo, MenuItemType.Standard, Redo),
-                                                    new EditorMenuItemSpacer(),
+                                                    new OsuMenuItemSpacer(),
                                                     cutMenuItem = new EditorMenuItem(CommonStrings.Cut, MenuItemType.Standard, Cut),
                                                     copyMenuItem = new EditorMenuItem(CommonStrings.Copy, MenuItemType.Standard, Copy),
                                                     pasteMenuItem = new EditorMenuItem(CommonStrings.Paste, MenuItemType.Standard, Paste),
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index 52c012a15a..cf6fb60636 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -14,7 +14,6 @@ using osu.Framework.Utils;
 using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Screens.Edit.Components.Menus;
 using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Skinning;
 using osu.Game.Utils;
@@ -249,7 +248,7 @@ namespace osu.Game.Overlays.SkinEditor
                 Items = createAnchorItems((d, o) => ((Drawable)d).Origin == o, applyOrigins).ToArray()
             };
 
-            yield return new EditorMenuItemSpacer();
+            yield return new OsuMenuItemSpacer();
 
             yield return new OsuMenuItem("Reset position", MenuItemType.Standard, () =>
             {
@@ -277,13 +276,13 @@ namespace osu.Game.Overlays.SkinEditor
                 }
             });
 
-            yield return new EditorMenuItemSpacer();
+            yield return new OsuMenuItemSpacer();
 
             yield return new OsuMenuItem("Bring to front", MenuItemType.Standard, () => skinEditor.BringSelectionToFront());
 
             yield return new OsuMenuItem("Send to back", MenuItemType.Standard, () => skinEditor.SendSelectionToBack());
 
-            yield return new EditorMenuItemSpacer();
+            yield return new OsuMenuItemSpacer();
 
             foreach (var item in base.GetContextMenuItemsForSelection(selection))
                 yield return item;
diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
index fb0ae2df73..a67375b0a4 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
@@ -4,11 +4,9 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
@@ -151,7 +149,7 @@ namespace osu.Game.Screens.Edit.Components.Menus
             {
                 switch (item)
                 {
-                    case EditorMenuItemSpacer spacer:
+                    case OsuMenuItemSpacer spacer:
                         return new DrawableSpacer(spacer);
 
                     case StatefulMenuItem stateful:
@@ -195,29 +193,6 @@ namespace osu.Game.Screens.Edit.Components.Menus
                     Foreground.Padding = new MarginPadding { Vertical = 2 };
                 }
             }
-
-            private partial class DrawableSpacer : DrawableOsuMenuItem
-            {
-                public DrawableSpacer(MenuItem item)
-                    : base(item)
-                {
-                    Scale = new Vector2(1, 0.6f);
-
-                    AddInternal(new Box
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Colour = BackgroundColourHover,
-                        RelativeSizeAxes = Axes.X,
-                        Height = 2f,
-                        Width = 0.8f,
-                    });
-                }
-
-                protected override bool OnHover(HoverEvent e) => true;
-
-                protected override bool OnClick(ClickEvent e) => true;
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs
deleted file mode 100644
index 4e75a92e19..0000000000
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs
+++ /dev/null
@@ -1,13 +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.Screens.Edit.Components.Menus
-{
-    public class EditorMenuItemSpacer : EditorMenuItem
-    {
-        public EditorMenuItemSpacer()
-            : base(" ")
-        {
-        }
-    }
-}
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3136faf855..5d0cc64cc3 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -321,7 +321,7 @@ namespace osu.Game.Screens.Edit
                                         {
                                             undoMenuItem = new EditorMenuItem(CommonStrings.Undo, MenuItemType.Standard, Undo),
                                             redoMenuItem = new EditorMenuItem(CommonStrings.Redo, MenuItemType.Standard, Redo),
-                                            new EditorMenuItemSpacer(),
+                                            new OsuMenuItemSpacer(),
                                             cutMenuItem = new EditorMenuItem(CommonStrings.Cut, MenuItemType.Standard, Cut),
                                             copyMenuItem = new EditorMenuItem(CommonStrings.Copy, MenuItemType.Standard, Copy),
                                             pasteMenuItem = new EditorMenuItem(CommonStrings.Paste, MenuItemType.Standard, Paste),
@@ -1005,12 +1005,12 @@ namespace osu.Game.Screens.Edit
         {
             createDifficultyCreationMenu(),
             createDifficultySwitchMenu(),
-            new EditorMenuItemSpacer(),
+            new OsuMenuItemSpacer(),
             new EditorMenuItem(EditorStrings.DeleteDifficulty, MenuItemType.Standard, deleteDifficulty) { Action = { Disabled = Beatmap.Value.BeatmapSetInfo.Beatmaps.Count < 2 } },
-            new EditorMenuItemSpacer(),
+            new OsuMenuItemSpacer(),
             new EditorMenuItem(WebCommonStrings.ButtonsSave, MenuItemType.Standard, () => Save()),
             createExportMenu(),
-            new EditorMenuItemSpacer(),
+            new OsuMenuItemSpacer(),
             new EditorMenuItem(CommonStrings.Exit, MenuItemType.Standard, this.Exit)
         };
 
@@ -1130,7 +1130,7 @@ namespace osu.Game.Screens.Edit
             foreach (var rulesetBeatmaps in groupedOrderedBeatmaps)
             {
                 if (difficultyItems.Count > 0)
-                    difficultyItems.Add(new EditorMenuItemSpacer());
+                    difficultyItems.Add(new OsuMenuItemSpacer());
 
                 foreach (var beatmap in rulesetBeatmaps)
                 {

From 9718a802490519780c3d88f55a90037a20b26421 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 14:24:19 +0900
Subject: [PATCH 1628/2296] Add visible spacer between "inherit" and other
 curve types

---
 .../Blueprints/Sliders/Components/PathControlPointVisualiser.cs | 2 ++
 1 file changed, 2 insertions(+)

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 f891d23bbd..87e837cc71 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -369,6 +369,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 if (!selectedPieces.Contains(Pieces[0]))
                     curveTypeItems.Add(createMenuItemForPathType(null));
 
+                curveTypeItems.Add(new OsuMenuItemSpacer());
+
                 // todo: hide/disable items which aren't valid for selected points
                 curveTypeItems.Add(createMenuItemForPathType(PathType.Linear));
                 curveTypeItems.Add(createMenuItemForPathType(PathType.PerfectCurve));

From c9ee29028fbcf3056c82d5b5c182f862f68974fa Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Tue, 21 Nov 2023 16:54:20 +1100
Subject: [PATCH 1629/2296] Fix implicitly used method being named incorrectly

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
index 24d5635104..83538a2f42 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             yield return (ATTRIB_ID_APPROACH_RATE, ApproachRate);
             yield return (ATTRIB_ID_DIFFICULTY, StarRating);
 
-            if (ShouldSerializeFlashlightRating())
+            if (ShouldSerializeFlashlightDifficulty())
                 yield return (ATTRIB_ID_FLASHLIGHT, FlashlightDifficulty);
 
             yield return (ATTRIB_ID_SLIDER_FACTOR, SliderFactor);
@@ -128,7 +128,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
         // unless the fields are also renamed.
 
         [UsedImplicitly]
-        public bool ShouldSerializeFlashlightRating() => Mods.Any(m => m is ModFlashlight);
+        public bool ShouldSerializeFlashlightDifficulty() => Mods.Any(m => m is ModFlashlight);
 
         #endregion
     }

From 3afaafb1d9a19692cbd6750eda24cbd7d920c7d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 15:05:51 +0900
Subject: [PATCH 1630/2296] Reorder and simplify private helper methods

---
 .../TestSceneOpenEditorTimestampInMania.cs    |  53 +++++-----
 .../TestSceneOpenEditorTimestampInOsu.cs      |  65 ++++++------
 .../Editing/TestSceneOpenEditorTimestamp.cs   | 100 +++++++++---------
 3 files changed, 103 insertions(+), 115 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs
index 3c6a9f3b42..05c881d284 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs
@@ -14,35 +14,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
     {
         protected override Ruleset CreateEditorRuleset() => new ManiaRuleset();
 
-        private void addStepClickLink(string timestamp, string step = "", bool displayTimestamp = true)
-        {
-            AddStep(displayTimestamp ? $"{step} {timestamp}" : step, () => Editor.HandleTimestamp(timestamp));
-            AddUntilStep("wait for seek", () => EditorClock.SeekingOrStopped.Value);
-        }
-
-        private void addReset()
-        {
-            addStepClickLink("00:00:000", "reset", false);
-        }
-
-        private bool checkSnapAndSelectColumn(double startTime, IReadOnlyCollection<(int, int)>? columnPairs = null)
-        {
-            bool checkColumns = columnPairs != null
-                ? EditorBeatmap.SelectedHitObjects.All(x => columnPairs.Any(col => isNoteAt(x, col.Item1, col.Item2)))
-                : !EditorBeatmap.SelectedHitObjects.Any();
-
-            return EditorClock.CurrentTime == startTime
-                   && EditorBeatmap.SelectedHitObjects.Count == (columnPairs?.Count ?? 0)
-                   && checkColumns;
-        }
-
-        private bool isNoteAt(HitObject hitObject, double time, int column)
-        {
-            return hitObject is ManiaHitObject maniaHitObject
-                   && maniaHitObject.StartTime == time
-                   && maniaHitObject.Column == column;
-        }
-
         [Test]
         public void TestNormalSelection()
         {
@@ -95,5 +66,29 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             addStepClickLink("00:00:000 (1,2)", "std link");
             AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(2_170));
         }
+
+        private void addStepClickLink(string timestamp, string step = "", bool displayTimestamp = true)
+        {
+            AddStep(displayTimestamp ? $"{step} {timestamp}" : step, () => Editor.HandleTimestamp(timestamp));
+            AddUntilStep("wait for seek", () => EditorClock.SeekingOrStopped.Value);
+        }
+
+        private void addReset() => addStepClickLink("00:00:000", "reset", false);
+
+        private bool checkSnapAndSelectColumn(double startTime, IReadOnlyCollection<(int, int)>? columnPairs = null)
+        {
+            bool checkColumns = columnPairs != null
+                ? EditorBeatmap.SelectedHitObjects.All(x => columnPairs.Any(col => isNoteAt(x, col.Item1, col.Item2)))
+                : !EditorBeatmap.SelectedHitObjects.Any();
+
+            return EditorClock.CurrentTime == startTime
+                   && EditorBeatmap.SelectedHitObjects.Count == (columnPairs?.Count ?? 0)
+                   && checkColumns;
+        }
+
+        private bool isNoteAt(HitObject hitObject, double time, int column) =>
+            hitObject is ManiaHitObject maniaHitObject
+            && maniaHitObject.StartTime == time
+            && maniaHitObject.Column == column;
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs
index 753400e10e..943858652c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs
@@ -15,40 +15,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
     {
         protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
 
-        private void addStepClickLink(string timestamp, string step = "", bool displayTimestamp = true)
-        {
-            AddStep(displayTimestamp ? $"{step} {timestamp}" : step, () => Editor.HandleTimestamp(timestamp));
-            AddUntilStep("wait for seek", () => EditorClock.SeekingOrStopped.Value);
-        }
-
-        private void addReset()
-        {
-            addStepClickLink("00:00:000", "reset", false);
-        }
-
-        private void checkSelection(Func<double> startTime, params int[] comboNumbers)
-            => AddUntilStep($"seeked & selected {(comboNumbers.Any() ? string.Join(",", comboNumbers) : "nothing")}", () =>
-            {
-                bool checkCombos = comboNumbers.Any()
-                    ? hasCombosInOrder(EditorBeatmap.SelectedHitObjects, comboNumbers)
-                    : !EditorBeatmap.SelectedHitObjects.Any();
-
-                return EditorClock.CurrentTime == startTime()
-                       && EditorBeatmap.SelectedHitObjects.Count == comboNumbers.Length
-                       && checkCombos;
-            });
-
-        private bool hasCombosInOrder(IEnumerable<HitObject> selected, params int[] comboNumbers)
-        {
-            List<HitObject> hitObjects = selected.ToList();
-            if (hitObjects.Count != comboNumbers.Length)
-                return false;
-
-            return !hitObjects.Select(x => (OsuHitObject)x)
-                              .Where((x, i) => x.IndexInCurrentCombo + 1 != comboNumbers[i])
-                              .Any();
-        }
-
         [Test]
         public void TestNormalSelection()
         {
@@ -90,5 +56,36 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addStepClickLink("00:00:956 (956|1,956|2)", "mania link");
             checkSelection(() => firstObject.StartTime);
         }
+
+        private void addReset() => addStepClickLink("00:00:000", "reset", false);
+
+        private void addStepClickLink(string timestamp, string step = "", bool displayTimestamp = true)
+        {
+            AddStep(displayTimestamp ? $"{step} {timestamp}" : step, () => Editor.HandleTimestamp(timestamp));
+            AddUntilStep("wait for seek", () => EditorClock.SeekingOrStopped.Value);
+        }
+
+        private void checkSelection(Func<double> startTime, params int[] comboNumbers)
+            => AddUntilStep($"seeked & selected {(comboNumbers.Any() ? string.Join(",", comboNumbers) : "nothing")}", () =>
+            {
+                bool checkCombos = comboNumbers.Any()
+                    ? hasCombosInOrder(EditorBeatmap.SelectedHitObjects, comboNumbers)
+                    : !EditorBeatmap.SelectedHitObjects.Any();
+
+                return EditorClock.CurrentTime == startTime()
+                       && EditorBeatmap.SelectedHitObjects.Count == comboNumbers.Length
+                       && checkCombos;
+            });
+
+        private bool hasCombosInOrder(IEnumerable<HitObject> selected, params int[] comboNumbers)
+        {
+            List<HitObject> hitObjects = selected.ToList();
+            if (hitObjects.Count != comboNumbers.Length)
+                return false;
+
+            return !hitObjects.Select(x => (OsuHitObject)x)
+                              .Where((x, i) => x.IndexInCurrentCombo + 1 != comboNumbers[i])
+                              .Any();
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index 86ceb73f7a..dacc5887d0 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
@@ -25,58 +25,6 @@ namespace osu.Game.Tests.Visual.Editing
         private EditorBeatmap editorBeatmap => editor.ChildrenOfType<EditorBeatmap>().Single();
         private EditorClock editorClock => editor.ChildrenOfType<EditorClock>().Single();
 
-        private void addStepClickLink(string timestamp, string step = "", bool waitForSeek = true)
-        {
-            AddStep($"{step} {timestamp}", () =>
-                Game.HandleLink(new LinkDetails(LinkAction.OpenEditorTimestamp, timestamp))
-            );
-
-            if (waitForSeek)
-                AddUntilStep("wait for seek", () => editorClock.SeekingOrStopped.Value);
-        }
-
-        private void addStepScreenModeTo(EditorScreenMode screenMode)
-        {
-            AddStep("change screen to " + screenMode, () => editor.Mode.Value = screenMode);
-        }
-
-        private void assertOnScreenAt(EditorScreenMode screen, double time, string text = "stayed in")
-        {
-            AddAssert($"{text} {screen} at {time}", () =>
-                editor.Mode.Value == screen
-                && editorClock.CurrentTime == time
-            );
-        }
-
-        private void assertMovedScreenTo(EditorScreenMode screen, string text = "moved to")
-        {
-            AddAssert($"{text} {screen}", () => editor.Mode.Value == screen);
-        }
-
-        private void setUpEditor(RulesetInfo ruleset)
-        {
-            BeatmapSetInfo beatmapSet = null!;
-
-            AddStep("Import test beatmap", () =>
-                Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely()
-            );
-            AddStep("Retrieve beatmap", () =>
-                beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach()
-            );
-            AddStep("Present beatmap", () => Game.PresentBeatmap(beatmapSet));
-            AddUntilStep("Wait for song select", () =>
-                Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
-                && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
-                && songSelect.IsLoaded
-            );
-            AddStep("Switch ruleset", () => Game.Ruleset.Value = ruleset);
-            AddStep("Open editor for ruleset", () =>
-                ((PlaySongSelect)Game.ScreenStack.CurrentScreen)
-                .Edit(beatmapSet.Beatmaps.Last(beatmap => beatmap.Ruleset.Name == ruleset.Name))
-            );
-            AddUntilStep("Wait for editor open", () => editor.ReadyForUse);
-        }
-
         [Test]
         public void TestErrorNotifications()
         {
@@ -151,5 +99,53 @@ namespace osu.Game.Tests.Visual.Editing
             addStepClickLink("00:00:000");
             assertOnScreenAt(EditorScreenMode.Compose, 0);
         }
+
+        private void addStepClickLink(string timestamp, string step = "", bool waitForSeek = true)
+        {
+            AddStep($"{step} {timestamp}", () =>
+                Game.HandleLink(new LinkDetails(LinkAction.OpenEditorTimestamp, timestamp))
+            );
+
+            if (waitForSeek)
+                AddUntilStep("wait for seek", () => editorClock.SeekingOrStopped.Value);
+        }
+
+        private void addStepScreenModeTo(EditorScreenMode screenMode) =>
+            AddStep("change screen to " + screenMode, () => editor.Mode.Value = screenMode);
+
+        private void assertOnScreenAt(EditorScreenMode screen, double time)
+        {
+            AddAssert($"stayed on {screen} at {time}", () =>
+                editor.Mode.Value == screen
+                && editorClock.CurrentTime == time
+            );
+        }
+
+        private void assertMovedScreenTo(EditorScreenMode screen, string text = "moved to") =>
+            AddAssert($"{text} {screen}", () => editor.Mode.Value == screen);
+
+        private void setUpEditor(RulesetInfo ruleset)
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("Import test beatmap", () =>
+                Game.BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).WaitSafely()
+            );
+            AddStep("Retrieve beatmap", () =>
+                beatmapSet = Game.BeatmapManager.QueryBeatmapSet(set => !set.Protected).AsNonNull().Value.Detach()
+            );
+            AddStep("Present beatmap", () => Game.PresentBeatmap(beatmapSet));
+            AddUntilStep("Wait for song select", () =>
+                Game.Beatmap.Value.BeatmapSetInfo.Equals(beatmapSet)
+                && Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect
+                && songSelect.IsLoaded
+            );
+            AddStep("Switch ruleset", () => Game.Ruleset.Value = ruleset);
+            AddStep("Open editor for ruleset", () =>
+                ((PlaySongSelect)Game.ScreenStack.CurrentScreen)
+                .Edit(beatmapSet.Beatmaps.Last(beatmap => beatmap.Ruleset.Name == ruleset.Name))
+            );
+            AddUntilStep("Wait for editor open", () => editor.ReadyForUse);
+        }
     }
 }

From 917a68eac3273f969a7b760cd7a258e475fcc23e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 15:08:15 +0900
Subject: [PATCH 1631/2296] Adjust localisablel strings and keys

---
 .../Visual/Editing/TestSceneOpenEditorTimestamp.cs        | 8 ++++----
 osu.Game/Localisation/EditorStrings.cs                    | 6 +++---
 osu.Game/OsuGame.cs                                       | 2 +-
 osu.Game/Screens/Edit/Editor.cs                           | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index dacc5887d0..b6f89ee4e7 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             addStepClickLink("00:00:000", waitForSeek: false);
             AddAssert("received 'must be in edit'",
-                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit),
+                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEditorToHandleLinks),
                 () => Is.EqualTo(1));
 
             AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
@@ -40,7 +40,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             addStepClickLink("00:00:000 (1)", waitForSeek: false);
             AddAssert("received 'must be in edit'",
-                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEdit),
+                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEditorToHandleLinks),
                 () => Is.EqualTo(2));
 
             setUpEditor(rulesetInfo);
@@ -48,12 +48,12 @@ namespace osu.Game.Tests.Visual.Editing
 
             addStepClickLink("00:000", "invalid link", waitForSeek: false);
             AddAssert("received 'failed to process'",
-                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp),
+                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToParseEditorLink),
                 () => Is.EqualTo(1));
 
             addStepClickLink("50000:00:000", "too long link", waitForSeek: false);
             AddAssert("received 'failed to process'",
-                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToProcessTimestamp),
+                () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToParseEditorLink),
                 () => Is.EqualTo(2));
         }
 
diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index e762455e8b..b20b5bc65a 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -122,12 +122,12 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "Must be in edit mode to handle editor links"
         /// </summary>
-        public static LocalisableString MustBeInEdit => new TranslatableString(getKey(@"must_be_in_edit"), @"Must be in edit mode to handle editor links");
+        public static LocalisableString MustBeInEditorToHandleLinks => new TranslatableString(getKey(@"must_be_in_editor_to_handle_links"), @"Must be in edit mode to handle editor links");
 
         /// <summary>
-        /// "Failed to process timestamp"
+        /// "Failed to parse editor link"
         /// </summary>
-        public static LocalisableString FailedToProcessTimestamp => new TranslatableString(getKey(@"failed_to_process_timestamp"), @"Failed to process timestamp");
+        public static LocalisableString FailedToParseEditorLink => new TranslatableString(getKey(@"failed_to_parse_edtior_link"), @"Failed to parse editor link");
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3fda18b7cb..80a9853965 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -565,7 +565,7 @@ namespace osu.Game
                 Schedule(() => Notifications.Post(new SimpleNotification
                 {
                     Icon = FontAwesome.Solid.ExclamationTriangle,
-                    Text = EditorStrings.MustBeInEdit
+                    Text = EditorStrings.MustBeInEditorToHandleLinks
                 }));
                 return;
             }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index fb34767315..7dd2666a7e 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1146,7 +1146,7 @@ namespace osu.Game.Screens.Edit
                 Schedule(() => notifications?.Post(new SimpleNotification
                 {
                     Icon = FontAwesome.Solid.ExclamationTriangle,
-                    Text = EditorStrings.FailedToProcessTimestamp
+                    Text = EditorStrings.FailedToParseEditorLink
                 }));
                 return;
             }

From 7c5345bf7e88ba364cd3606e424f4ae45b6760f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 15:09:33 +0900
Subject: [PATCH 1632/2296] Use `SimpleErrorNotification` for error display

---
 osu.Game/OsuGame.cs             | 2 +-
 osu.Game/Screens/Edit/Editor.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 80a9853965..c4f93636e9 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -562,7 +562,7 @@ namespace osu.Game
         {
             if (ScreenStack.CurrentScreen is not Editor editor)
             {
-                Schedule(() => Notifications.Post(new SimpleNotification
+                Schedule(() => Notifications.Post(new SimpleErrorNotification
                 {
                     Icon = FontAwesome.Solid.ExclamationTriangle,
                     Text = EditorStrings.MustBeInEditorToHandleLinks
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 7dd2666a7e..b3cebb41de 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1143,7 +1143,7 @@ namespace osu.Game.Screens.Edit
         {
             if (!EditorTimestampParser.TryParse(timestamp, out var timeSpan, out string selection))
             {
-                Schedule(() => notifications?.Post(new SimpleNotification
+                Schedule(() => notifications?.Post(new SimpleErrorNotification
                 {
                     Icon = FontAwesome.Solid.ExclamationTriangle,
                     Text = EditorStrings.FailedToParseEditorLink

From 1c612e2e0c49e3d7ca01f562b091f791ea34f7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 13 Nov 2023 14:35:07 +0900
Subject: [PATCH 1633/2296] Implement client-side disconnection flow

---
 osu.Game/Online/HubClientConnector.cs          |  2 ++
 osu.Game/Online/IHubClientConnector.cs         |  5 +++++
 osu.Game/Online/IStatefulUserHubClient.cs      | 18 ++++++++++++++++++
 .../Online/Multiplayer/IMultiplayerClient.cs   |  2 +-
 .../Online/Multiplayer/MultiplayerClient.cs    |  8 ++++++++
 .../Multiplayer/OnlineMultiplayerClient.cs     |  9 +++++++++
 .../PersistentEndpointClientConnector.cs       |  2 ++
 osu.Game/Online/Spectator/ISpectatorClient.cs  |  2 +-
 .../Online/Spectator/OnlineSpectatorClient.cs  |  9 +++++++++
 osu.Game/Online/Spectator/SpectatorClient.cs   |  8 ++++++++
 .../Multiplayer/TestMultiplayerClient.cs       |  6 ++++++
 .../Visual/Spectator/TestSpectatorClient.cs    |  9 ++++++++-
 12 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Online/IStatefulUserHubClient.cs

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 8fd79bd703..f5a8678613 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -102,6 +102,8 @@ namespace osu.Game.Online
             return Task.FromResult((PersistentEndpointClient)new HubClient(newConnection));
         }
 
+        Task IHubClientConnector.Disconnect() => base.Disconnect();
+
         protected override string ClientName { get; }
     }
 }
diff --git a/osu.Game/Online/IHubClientConnector.cs b/osu.Game/Online/IHubClientConnector.cs
index 53c4897e73..052972e6b4 100644
--- a/osu.Game/Online/IHubClientConnector.cs
+++ b/osu.Game/Online/IHubClientConnector.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Online
         /// </summary>
         public Action<HubConnection>? ConfigureConnection { get; set; }
 
+        /// <summary>
+        /// Forcefully disconnects the client from the server.
+        /// </summary>
+        Task Disconnect();
+
         /// <summary>
         /// Reconnect if already connected.
         /// </summary>
diff --git a/osu.Game/Online/IStatefulUserHubClient.cs b/osu.Game/Online/IStatefulUserHubClient.cs
new file mode 100644
index 0000000000..86105dd629
--- /dev/null
+++ b/osu.Game/Online/IStatefulUserHubClient.cs
@@ -0,0 +1,18 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Threading.Tasks;
+
+namespace osu.Game.Online
+{
+    /// <summary>
+    /// Common interface for clients of "stateful user hubs", i.e. server-side hubs
+    /// that preserve user state.
+    /// In the case of such hubs, concurrency constraints are enforced (only one client
+    /// can be connected at a time).
+    /// </summary>
+    public interface IStatefulUserHubClient
+    {
+        Task DisconnectRequested();
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 327fb0d76a..a5fa49a94b 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Online.Multiplayer
     /// <summary>
     /// An interface defining a multiplayer client instance.
     /// </summary>
-    public interface IMultiplayerClient
+    public interface IMultiplayerClient : IStatefulUserHubClient
     {
         /// <summary>
         /// Signals that the room has changed state.
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 515a0dda08..4b351663d8 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -357,6 +357,8 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
+        public abstract Task DisconnectInternal();
+
         /// <summary>
         /// Change the local user's mods in the currently joined room.
         /// </summary>
@@ -876,5 +878,11 @@ namespace osu.Game.Online.Multiplayer
 
             return tcs.Task;
         }
+
+        Task IStatefulUserHubClient.DisconnectRequested()
+        {
+            Schedule(() => DisconnectInternal());
+            return Task.CompletedTask;
+        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 20ec030eac..e400132693 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Online.Multiplayer
                     connection.On<MultiplayerPlaylistItem>(nameof(IMultiplayerClient.PlaylistItemAdded), ((IMultiplayerClient)this).PlaylistItemAdded);
                     connection.On<long>(nameof(IMultiplayerClient.PlaylistItemRemoved), ((IMultiplayerClient)this).PlaylistItemRemoved);
                     connection.On<MultiplayerPlaylistItem>(nameof(IMultiplayerClient.PlaylistItemChanged), ((IMultiplayerClient)this).PlaylistItemChanged);
+                    connection.On(nameof(IStatefulUserHubClient.DisconnectRequested), ((IMultiplayerClient)this).DisconnectRequested);
                 };
 
                 IsConnected.BindTo(connector.IsConnected);
@@ -255,6 +256,14 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.RemovePlaylistItem), playlistItemId);
         }
 
+        public override Task DisconnectInternal()
+        {
+            if (connector == null)
+                return Task.CompletedTask;
+
+            return connector.Disconnect();
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Online/PersistentEndpointClientConnector.cs b/osu.Game/Online/PersistentEndpointClientConnector.cs
index e33924047d..8c1b58a750 100644
--- a/osu.Game/Online/PersistentEndpointClientConnector.cs
+++ b/osu.Game/Online/PersistentEndpointClientConnector.cs
@@ -159,6 +159,8 @@ namespace osu.Game.Online
                 await Task.Run(connect, default).ConfigureAwait(false);
         }
 
+        protected Task Disconnect() => disconnect(true);
+
         private async Task disconnect(bool takeLock)
         {
             cancelExistingConnect();
diff --git a/osu.Game/Online/Spectator/ISpectatorClient.cs b/osu.Game/Online/Spectator/ISpectatorClient.cs
index 9605604966..2dc2283c23 100644
--- a/osu.Game/Online/Spectator/ISpectatorClient.cs
+++ b/osu.Game/Online/Spectator/ISpectatorClient.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Online.Spectator
     /// <summary>
     /// An interface defining a spectator client instance.
     /// </summary>
-    public interface ISpectatorClient
+    public interface ISpectatorClient : IStatefulUserHubClient
     {
         /// <summary>
         /// Signals that a user has begun a new play session.
diff --git a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
index 3118e05053..cd68abdea6 100644
--- a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
+++ b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Online.Spectator
                     connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
                     connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
                     connection.On<int, long>(nameof(ISpectatorClient.UserScoreProcessed), ((ISpectatorClient)this).UserScoreProcessed);
+                    connection.On(nameof(IStatefulUserHubClient.DisconnectRequested), ((IStatefulUserHubClient)this).DisconnectRequested);
                 };
 
                 IsConnected.BindTo(connector.IsConnected);
@@ -113,5 +114,13 @@ namespace osu.Game.Online.Spectator
 
             return connection.InvokeAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
         }
+
+        protected override Task DisconnectInternal()
+        {
+            if (connector == null)
+                return Task.CompletedTask;
+
+            return connector.Disconnect();
+        }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 14e137caf1..9c78f27e15 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -174,6 +174,12 @@ namespace osu.Game.Online.Spectator
             return Task.CompletedTask;
         }
 
+        Task IStatefulUserHubClient.DisconnectRequested()
+        {
+            Schedule(() => DisconnectInternal());
+            return Task.CompletedTask;
+        }
+
         public void BeginPlaying(long? scoreToken, GameplayState state, Score score)
         {
             // This schedule is only here to match the one below in `EndPlaying`.
@@ -291,6 +297,8 @@ namespace osu.Game.Online.Spectator
 
         protected abstract Task StopWatchingUserInternal(int userId);
 
+        protected abstract Task DisconnectInternal();
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 6007c7c076..577104db45 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -658,5 +658,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             PlayedAt = item.PlayedAt,
             StarRating = item.Beatmap.StarRating,
         };
+
+        public override Task DisconnectInternal()
+        {
+            isConnected.Value = false;
+            return Task.CompletedTask;
+        }
     }
 }
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index 5db08810ca..ce2eee8aa4 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -33,7 +33,8 @@ namespace osu.Game.Tests.Visual.Spectator
 
         public int FrameSendAttempts { get; private set; }
 
-        public override IBindable<bool> IsConnected { get; } = new Bindable<bool>(true);
+        public override IBindable<bool> IsConnected => isConnected;
+        private readonly BindableBool isConnected = new BindableBool(true);
 
         public IReadOnlyDictionary<int, ReplayFrame> LastReceivedUserFrames => lastReceivedUserFrames;
 
@@ -179,5 +180,11 @@ namespace osu.Game.Tests.Visual.Spectator
                 State = SpectatedUserState.Playing
             });
         }
+
+        protected override Task DisconnectInternal()
+        {
+            isConnected.Value = false;
+            return Task.CompletedTask;
+        }
     }
 }

From 2391035e4969ac3d1a6a505cd5b73ef0e71fc7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 21 Nov 2023 14:33:18 +0900
Subject: [PATCH 1634/2296] Remove redundant `api` field from
 `HubClientConnector`

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

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index f5a8678613..e7494e50cc 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -27,7 +27,6 @@ namespace osu.Game.Online
         private readonly string endpoint;
         private readonly string versionHash;
         private readonly bool preferMessagePack;
-        private readonly IAPIProvider api;
 
         /// <summary>
         /// The current connection opened by this connector.
@@ -47,7 +46,6 @@ namespace osu.Game.Online
         {
             ClientName = clientName;
             this.endpoint = endpoint;
-            this.api = api;
             this.versionHash = versionHash;
             this.preferMessagePack = preferMessagePack;
 
@@ -70,7 +68,7 @@ namespace osu.Game.Online
                             options.Proxy.Credentials = CredentialCache.DefaultCredentials;
                     }
 
-                    options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
+                    options.Headers.Add("Authorization", $"Bearer {API.AccessToken}");
                     options.Headers.Add("OsuVersionHash", versionHash);
                 });
 

From 42fada578e35418b23d17d5607e54d9e79ca0b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 21 Nov 2023 14:39:33 +0900
Subject: [PATCH 1635/2296] Centralise and improve messaging around online
 state

When the server requests a disconnect due to a user connecting
via a second device, the client will now log the user out on the first
device and show a notification informing them of the cause of
disconnection.
---
 osu.Game/Online/HubClientConnector.cs         |   6 +-
 .../Online/Multiplayer/MultiplayerClient.cs   |  15 ++-
 osu.Game/Online/OnlineStatusNotifier.cs       | 120 ++++++++++++++++++
 .../Online/Spectator/OnlineSpectatorClient.cs |  10 +-
 osu.Game/Online/Spectator/SpectatorClient.cs  |  11 +-
 osu.Game/OsuGame.cs                           |   1 +
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    |   5 +-
 .../Visual/Spectator/TestSpectatorClient.cs   |   4 +-
 8 files changed, 155 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Online/OnlineStatusNotifier.cs

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index e7494e50cc..9d414deade 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -100,7 +100,11 @@ namespace osu.Game.Online
             return Task.FromResult((PersistentEndpointClient)new HubClient(newConnection));
         }
 
-        Task IHubClientConnector.Disconnect() => base.Disconnect();
+        async Task IHubClientConnector.Disconnect()
+        {
+            await Disconnect().ConfigureAwait(false);
+            API.Logout();
+        }
 
         protected override string ClientName { get; }
     }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 4b351663d8..79f46c2095 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -12,7 +12,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Development;
 using osu.Framework.Graphics;
-using osu.Framework.Logging;
 using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
@@ -88,6 +87,11 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public event Action? ResultsReady;
 
+        /// <summary>
+        /// Invoked just prior to disconnection requested by the server via <see cref="IStatefulUserHubClient.DisconnectRequested"/>.
+        /// </summary>
+        public event Action? Disconnecting;
+
         /// <summary>
         /// Whether the <see cref="MultiplayerClient"/> is currently connected.
         /// This is NOT thread safe and usage should be scheduled.
@@ -155,10 +159,7 @@ namespace osu.Game.Online.Multiplayer
             {
                 // clean up local room state on server disconnect.
                 if (!connected.NewValue && Room != null)
-                {
-                    Logger.Log("Clearing room due to multiplayer server connection loss.", LoggingTarget.Runtime, LogLevel.Important);
                     LeaveRoom();
-                }
             }));
         }
 
@@ -881,7 +882,11 @@ namespace osu.Game.Online.Multiplayer
 
         Task IStatefulUserHubClient.DisconnectRequested()
         {
-            Schedule(() => DisconnectInternal());
+            Schedule(() =>
+            {
+                Disconnecting?.Invoke();
+                DisconnectInternal();
+            });
             return Task.CompletedTask;
         }
     }
diff --git a/osu.Game/Online/OnlineStatusNotifier.cs b/osu.Game/Online/OnlineStatusNotifier.cs
new file mode 100644
index 0000000000..0cf672ac3c
--- /dev/null
+++ b/osu.Game/Online/OnlineStatusNotifier.cs
@@ -0,0 +1,120 @@
+// 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.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Screens;
+using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Spectator;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
+using osu.Game.Screens.OnlinePlay;
+
+namespace osu.Game.Online
+{
+    public partial class OnlineStatusNotifier : Component
+    {
+        private readonly Func<IScreen> getCurrentScreen;
+
+        [Resolved]
+        private MultiplayerClient multiplayerClient { get; set; } = null!;
+
+        [Resolved]
+        private SpectatorClient spectatorClient { get; set; } = null!;
+
+        [Resolved]
+        private INotificationOverlay? notificationOverlay { get; set; }
+
+        private IBindable<APIState> apiState = null!;
+        private IBindable<bool> multiplayerState = null!;
+        private IBindable<bool> spectatorState = null!;
+        private bool forcedDisconnection;
+
+        public OnlineStatusNotifier(Func<IScreen> getCurrentScreen)
+        {
+            this.getCurrentScreen = getCurrentScreen;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            apiState = api.State.GetBoundCopy();
+            multiplayerState = multiplayerClient.IsConnected.GetBoundCopy();
+            spectatorState = spectatorClient.IsConnected.GetBoundCopy();
+
+            multiplayerClient.Disconnecting += notifyAboutForcedDisconnection;
+            spectatorClient.Disconnecting += notifyAboutForcedDisconnection;
+        }
+
+        private void notifyAboutForcedDisconnection()
+        {
+            if (forcedDisconnection)
+                return;
+
+            forcedDisconnection = true;
+            notificationOverlay?.Post(new SimpleErrorNotification
+            {
+                Icon = FontAwesome.Solid.ExclamationCircle,
+                Text = "You have been logged out on this device due to a login to your account on another device."
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            apiState.BindValueChanged(_ =>
+            {
+                if (apiState.Value == APIState.Online)
+                    forcedDisconnection = false;
+
+                Scheduler.AddOnce(updateState);
+            });
+            multiplayerState.BindValueChanged(_ => Scheduler.AddOnce(updateState));
+            spectatorState.BindValueChanged(_ => Scheduler.AddOnce(updateState));
+        }
+
+        private void updateState()
+        {
+            if (forcedDisconnection)
+                return;
+
+            if (apiState.Value == APIState.Offline && getCurrentScreen() is OnlinePlayScreen)
+            {
+                notificationOverlay?.Post(new SimpleErrorNotification
+                {
+                    Icon = FontAwesome.Solid.ExclamationCircle,
+                    Text = "API connection was lost. Can't continue with online play."
+                });
+                return;
+            }
+
+            if (!multiplayerClient.IsConnected.Value && multiplayerClient.Room != null)
+            {
+                notificationOverlay?.Post(new SimpleErrorNotification
+                {
+                    Icon = FontAwesome.Solid.ExclamationCircle,
+                    Text = "Connection to the multiplayer server was lost. Exiting multiplayer."
+                });
+            }
+
+            // TODO: handle spectator server failure somehow?
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (spectatorClient.IsNotNull())
+                spectatorClient.Disconnecting -= notifyAboutForcedDisconnection;
+
+            if (multiplayerClient.IsNotNull())
+                multiplayerClient.Disconnecting -= notifyAboutForcedDisconnection;
+        }
+    }
+}
diff --git a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
index cd68abdea6..036cfa1d76 100644
--- a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
+++ b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
@@ -115,12 +115,14 @@ namespace osu.Game.Online.Spectator
             return connection.InvokeAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
         }
 
-        protected override Task DisconnectInternal()
+        protected override async Task DisconnectInternal()
         {
-            if (connector == null)
-                return Task.CompletedTask;
+            await base.DisconnectInternal().ConfigureAwait(false);
 
-            return connector.Disconnect();
+            if (connector == null)
+                return;
+
+            await connector.Disconnect().ConfigureAwait(false);
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 9c78f27e15..ca4ec52f4a 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -70,6 +70,11 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public virtual event Action<int, long>? OnUserScoreProcessed;
 
+        /// <summary>
+        /// Invoked just prior to disconnection requested by the server via <see cref="IStatefulUserHubClient.DisconnectRequested"/>.
+        /// </summary>
+        public event Action? Disconnecting;
+
         /// <summary>
         /// A dictionary containing all users currently being watched, with the number of watching components for each user.
         /// </summary>
@@ -297,7 +302,11 @@ namespace osu.Game.Online.Spectator
 
         protected abstract Task StopWatchingUserInternal(int userId);
 
-        protected abstract Task DisconnectInternal();
+        protected virtual Task DisconnectInternal()
+        {
+            Disconnecting?.Invoke();
+            return Task.CompletedTask;
+        }
 
         protected override void Update()
         {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 2f11964f6a..ed4bd21e93 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1054,6 +1054,7 @@ namespace osu.Game
             Add(difficultyRecommender);
             Add(externalLinkOpener = new ExternalLinkOpener());
             Add(new MusicKeyBindingHandler());
+            Add(new OnlineStatusNotifier(() => ScreenStack.CurrentScreen));
 
             // side overlays which cancel each other.
             var singleDisplaySideOverlays = new OverlayContainer[] { Settings, Notifications, FirstRunOverlay };
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index f652e88f5a..9de458b5c6 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.OnlinePlay
                     screenStack = new OnlinePlaySubScreenStack { RelativeSizeAxes = Axes.Both },
                     new Header(ScreenTitle, screenStack),
                     RoomManager,
-                    ongoingOperationTracker
+                    ongoingOperationTracker,
                 }
             };
         }
@@ -79,10 +79,7 @@ namespace osu.Game.Screens.OnlinePlay
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
             if (state.NewValue != APIState.Online)
-            {
-                Logger.Log("API connection was lost, can't continue with online play", LoggingTarget.Network, LogLevel.Important);
                 Schedule(forcefullyExit);
-            }
         });
 
         protected override void LoadComplete()
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index ce2eee8aa4..5aef85fa13 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -181,10 +181,10 @@ namespace osu.Game.Tests.Visual.Spectator
             });
         }
 
-        protected override Task DisconnectInternal()
+        protected override async Task DisconnectInternal()
         {
+            await base.DisconnectInternal().ConfigureAwait(false);
             isConnected.Value = false;
-            return Task.CompletedTask;
         }
     }
 }

From aa3ff151c095ec76a15d4fc8d5b6d021d2ff52e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 21 Nov 2023 14:41:03 +0900
Subject: [PATCH 1636/2296] Fix `RoomManager` attempting to part room when not
 online

---
 osu.Game/Screens/OnlinePlay/Components/RoomManager.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
index 539d5b74b3..e892f9280f 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
@@ -98,7 +98,9 @@ namespace osu.Game.Screens.OnlinePlay.Components
             if (JoinedRoom.Value == null)
                 return;
 
-            api.Queue(new PartRoomRequest(joinedRoom.Value));
+            if (api.State.Value == APIState.Online)
+                api.Queue(new PartRoomRequest(joinedRoom.Value));
+
             joinedRoom.Value = null;
         }
 

From 314a7bf6f1058195ecf5995fc18a5e5bc1eb94fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 11:33:05 +0900
Subject: [PATCH 1637/2296] Simplify `AddOnce` call to avoid `self` argument

---
 .../Sliders/SliderPlacementBlueprint.cs       | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 5f072eb171..32fb7ad351 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -3,10 +3,12 @@
 
 #nullable disable
 
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
@@ -84,16 +86,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             {
                 freehandToolboxGroup.Tolerance.BindValueChanged(e =>
                 {
-                    if (bSplineBuilder.Tolerance != e.NewValue)
-                        bSplineBuilder.Tolerance = e.NewValue;
-                    updateSliderPathFromBSplineBuilder();
+                    bSplineBuilder.Tolerance = e.NewValue;
+                    Scheduler.AddOnce(updateSliderPathFromBSplineBuilder);
                 }, true);
 
                 freehandToolboxGroup.CornerThreshold.BindValueChanged(e =>
                 {
-                    if (bSplineBuilder.CornerThreshold != e.NewValue)
-                        bSplineBuilder.CornerThreshold = e.NewValue;
-                    updateSliderPathFromBSplineBuilder();
+                    bSplineBuilder.CornerThreshold = e.NewValue;
+                    Scheduler.AddOnce(updateSliderPathFromBSplineBuilder);
                 }, true);
             }
         }
@@ -197,27 +197,24 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             base.OnDrag(e);
 
             bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMousePosition) - HitObject.Position);
-            updateSliderPathFromBSplineBuilder();
+            Scheduler.AddOnce(updateSliderPathFromBSplineBuilder);
         }
 
         private void updateSliderPathFromBSplineBuilder()
         {
-            Scheduler.AddOnce(static self =>
-            {
-                var cps = self.bSplineBuilder.ControlPoints;
-                var sliderCps = self.HitObject.Path.ControlPoints;
-                sliderCps.RemoveRange(1, sliderCps.Count - 1);
+            IReadOnlyList<Vector2> builderPoints = bSplineBuilder.ControlPoints;
+            BindableList<PathControlPoint> sliderPoints = HitObject.Path.ControlPoints;
 
-                // Add the control points from the BSpline builder while converting control points that repeat
-                // three or more times to a single PathControlPoint with linear type.
-                for (int i = 1; i < cps.Count; i++)
-                {
-                    bool isSharp = i < cps.Count - 2 && cps[i] == cps[i + 1] && cps[i] == cps[i + 2];
-                    sliderCps.Add(new PathControlPoint(cps[i], isSharp ? PathType.BSpline(3) : null));
-                    if (isSharp)
-                        i += 2;
-                }
-            }, this);
+            sliderPoints.RemoveRange(1, sliderPoints.Count - 1);
+
+            // Add the control points from the BSpline builder while converting control points that repeat
+            // three or more times to a single PathControlPoint with linear type.
+            for (int i = 1; i < builderPoints.Count; i++)
+            {
+                bool isSharp = i < builderPoints.Count - 2 && builderPoints[i] == builderPoints[i + 1] && builderPoints[i] == builderPoints[i + 2];
+                sliderPoints.Add(new PathControlPoint(builderPoints[i], isSharp ? PathType.BSpline(3) : null));
+                if (isSharp) i += 2;
+            }
         }
 
         protected override void OnDragEnd(DragEndEvent e)

From 0a5444d091de73c2cc9fe8360146248d1b06b39e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 13:05:31 +0900
Subject: [PATCH 1638/2296] Fix using the incorrect position for the first
 point

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 32fb7ad351..68f5b2d70f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                                 return false;
 
                             bSplineBuilder.Clear();
-                            bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMousePosition) - HitObject.Position);
+                            bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMouseDownPosition) - HitObject.Position);
                             setState(SliderPlacementState.Drawing);
                             return true;
                         }

From e69e78ad4123a4d89915aa44286a8e637e49429d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 13:10:44 +0900
Subject: [PATCH 1639/2296] Refactor b-spline path conversion code to better
 handle linear segments

---
 .../Sliders/SliderPlacementBlueprint.cs       | 44 +++++++++++++++----
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 68f5b2d70f..6e9cc26af4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -8,7 +8,6 @@ using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
@@ -203,17 +202,44 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void updateSliderPathFromBSplineBuilder()
         {
             IReadOnlyList<Vector2> builderPoints = bSplineBuilder.ControlPoints;
-            BindableList<PathControlPoint> sliderPoints = HitObject.Path.ControlPoints;
 
-            sliderPoints.RemoveRange(1, sliderPoints.Count - 1);
+            if (builderPoints.Count == 0)
+                return;
 
-            // Add the control points from the BSpline builder while converting control points that repeat
-            // three or more times to a single PathControlPoint with linear type.
-            for (int i = 1; i < builderPoints.Count; i++)
+            int lastSegmentStart = 0;
+            PathType? lastPathType = null;
+
+            HitObject.Path.ControlPoints.Clear();
+
+            // Iterate through generated points, finding each segment and adding non-inheriting path types where appropriate.
+            // Importantly, the B-Spline builder returns three Vector2s at the same location when a new segment is to be started.
+            for (int i = 0; i < builderPoints.Count; i++)
             {
-                bool isSharp = i < builderPoints.Count - 2 && builderPoints[i] == builderPoints[i + 1] && builderPoints[i] == builderPoints[i + 2];
-                sliderPoints.Add(new PathControlPoint(builderPoints[i], isSharp ? PathType.BSpline(3) : null));
-                if (isSharp) i += 2;
+                bool isLastPoint = i == builderPoints.Count - 1;
+                bool isNewSegment = i < builderPoints.Count - 2 && builderPoints[i] == builderPoints[i + 1] && builderPoints[i] == builderPoints[i + 2];
+
+                if (isNewSegment || isLastPoint)
+                {
+                    int pointsInSegment = i - lastSegmentStart;
+
+                    // Where possible, we can use the simpler LINEAR path type.
+                    PathType? pathType = pointsInSegment == 1 ? PathType.LINEAR : PathType.BSpline(3);
+
+                    // Linear segments can be combined, as two adjacent linear sections are computationally the same as one with the points combined.
+                    if (lastPathType == pathType && lastPathType == PathType.LINEAR)
+                        pathType = null;
+
+                    HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[lastSegmentStart], pathType));
+                    for (int j = lastSegmentStart + 1; j < i; j++)
+                        HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[j]));
+
+                    if (isLastPoint)
+                        HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[i]));
+
+                    // Skip the redundant duplicated points (see isNewSegment above) which have been coalesced into a path type.
+                    lastSegmentStart = (i += 2);
+                    if (pathType != null) lastPathType = pathType;
+                }
             }
         }
 

From 5175464c18dafc3931b723ae06dbb4375c7c0a77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 13:35:04 +0900
Subject: [PATCH 1640/2296] Update test coverage (and add test coverage of
 curve drawing)

---
 .../TestSceneSliderPlacementBlueprint.cs      | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index c7a21ba689..8498263138 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
@@ -274,7 +275,30 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         }
 
         [Test]
-        public void TestSliderDrawing()
+        public void TestSliderDrawingCurve()
+        {
+            Vector2 startPoint = new Vector2(200);
+
+            addMovementStep(startPoint);
+            AddStep("press left button", () => InputManager.PressButton(MouseButton.Left));
+
+            for (int i = 0; i < 20; i++)
+                addMovementStep(startPoint + new Vector2(i * 40, MathF.Sin(i * MathF.PI / 5) * 50));
+
+            AddStep("release left button", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertPlaced(true);
+            assertLength(760, tolerance: 10);
+            assertControlPointCount(5);
+            assertControlPointType(0, PathType.BSpline(3));
+            assertControlPointType(1, null);
+            assertControlPointType(2, null);
+            assertControlPointType(3, null);
+            assertControlPointType(4, null);
+        }
+
+        [Test]
+        public void TestSliderDrawingLinear()
         {
             addMovementStep(new Vector2(200));
             AddStep("press left button", () => InputManager.PressButton(MouseButton.Left));
@@ -291,7 +315,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertLength(600, tolerance: 10);
             assertControlPointCount(4);
-            assertControlPointType(0, PathType.BSpline(3));
+            assertControlPointType(0, PathType.LINEAR);
+            assertControlPointType(1, null);
+            assertControlPointType(2, null);
+            assertControlPointType(3, null);
         }
 
         [Test]
@@ -401,11 +428,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         private void assertPlaced(bool expected) => AddAssert($"slider {(expected ? "placed" : "not placed")}", () => (getSlider() != null) == expected);
 
-        private void assertLength(double expected, double tolerance = 1) => AddAssert($"slider length is {expected}±{tolerance}", () => Precision.AlmostEquals(expected, getSlider().Distance, tolerance));
+        private void assertLength(double expected, double tolerance = 1) => AddAssert($"slider length is {expected}±{tolerance}", () => getSlider().Distance, () => Is.EqualTo(expected).Within(tolerance));
 
-        private void assertControlPointCount(int expected) => AddAssert($"has {expected} control points", () => getSlider().Path.ControlPoints.Count == expected);
+        private void assertControlPointCount(int expected) => AddAssert($"has {expected} control points", () => getSlider().Path.ControlPoints.Count, () => Is.EqualTo(expected));
 
-        private void assertControlPointType(int index, PathType type) => AddAssert($"control point {index} is {type}", () => getSlider().Path.ControlPoints[index].Type == type);
+        private void assertControlPointType(int index, PathType? type) => AddAssert($"control point {index} is {type?.ToString() ?? "inherit"}", () => getSlider().Path.ControlPoints[index].Type, () => Is.EqualTo(type));
 
         private void assertControlPointPosition(int index, Vector2 position) =>
             AddAssert($"control point {index} at {position}", () => Precision.AlmostEquals(position, getSlider().Path.ControlPoints[index].Position, 1));

From 7bedbe42642384a20b681220b507fcc737325c1e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 13:36:06 +0900
Subject: [PATCH 1641/2296] Apply NRT to `SliderPlacementBlueprint` tests

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 8498263138..75778b3a7e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.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 NUnit.Framework;
 using osu.Framework.Utils;
@@ -428,16 +426,16 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         private void assertPlaced(bool expected) => AddAssert($"slider {(expected ? "placed" : "not placed")}", () => (getSlider() != null) == expected);
 
-        private void assertLength(double expected, double tolerance = 1) => AddAssert($"slider length is {expected}±{tolerance}", () => getSlider().Distance, () => Is.EqualTo(expected).Within(tolerance));
+        private void assertLength(double expected, double tolerance = 1) => AddAssert($"slider length is {expected}±{tolerance}", () => getSlider()!.Distance, () => Is.EqualTo(expected).Within(tolerance));
 
-        private void assertControlPointCount(int expected) => AddAssert($"has {expected} control points", () => getSlider().Path.ControlPoints.Count, () => Is.EqualTo(expected));
+        private void assertControlPointCount(int expected) => AddAssert($"has {expected} control points", () => getSlider()!.Path.ControlPoints.Count, () => Is.EqualTo(expected));
 
-        private void assertControlPointType(int index, PathType? type) => AddAssert($"control point {index} is {type?.ToString() ?? "inherit"}", () => getSlider().Path.ControlPoints[index].Type, () => Is.EqualTo(type));
+        private void assertControlPointType(int index, PathType? type) => AddAssert($"control point {index} is {type?.ToString() ?? "inherit"}", () => getSlider()!.Path.ControlPoints[index].Type, () => Is.EqualTo(type));
 
         private void assertControlPointPosition(int index, Vector2 position) =>
-            AddAssert($"control point {index} at {position}", () => Precision.AlmostEquals(position, getSlider().Path.ControlPoints[index].Position, 1));
+            AddAssert($"control point {index} at {position}", () => Precision.AlmostEquals(position, getSlider()!.Path.ControlPoints[index].Position, 1));
 
-        private Slider getSlider() => HitObjectContainer.Count > 0 ? ((DrawableSlider)HitObjectContainer[0]).HitObject : null;
+        private Slider? getSlider() => HitObjectContainer.Count > 0 ? ((DrawableSlider)HitObjectContainer[0]).HitObject : null;
 
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSlider((Slider)hitObject);
         protected override PlacementBlueprint CreateBlueprint() => new SliderPlacementBlueprint();

From 9c3f9db31838295cccc0ea4f771933dbb4fa2dc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 14:02:08 +0900
Subject: [PATCH 1642/2296] Add failing test coverage of BSpline encoding parse
 failure

---
 .../Formats/LegacyBeatmapEncoderTest.cs       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 0dd277dc89..e847b61fbe 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -113,6 +113,33 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.IsTrue(areComboColoursEqual(expected.skin.Configuration, actual.skin.Configuration));
         }
 
+        [Test]
+        public void TestEncodeBSplineCurveType()
+        {
+            var beatmap = new Beatmap
+            {
+                HitObjects =
+                {
+                    new Slider
+                    {
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(Vector2.Zero, PathType.BSpline(3)),
+                            new PathControlPoint(new Vector2(50)),
+                            new PathControlPoint(new Vector2(100), PathType.BSpline(3)),
+                            new PathControlPoint(new Vector2(150))
+                        })
+                    },
+                }
+            };
+
+            var decodedAfterEncode = decodeFromLegacy(encodeToLegacy((beatmap, new TestLegacySkin(beatmaps_resource_store, string.Empty))), string.Empty);
+            var decodedSlider = (Slider)decodedAfterEncode.beatmap.HitObjects[0];
+            Assert.That(decodedSlider.Path.ControlPoints.Count, Is.EqualTo(4));
+            Assert.That(decodedSlider.Path.ControlPoints[0].Type, Is.EqualTo(PathType.BSpline(3)));
+            Assert.That(decodedSlider.Path.ControlPoints[2].Type, Is.EqualTo(PathType.BSpline(3)));
+        }
+
         [Test]
         public void TestEncodeMultiSegmentSliderWithFloatingPointError()
         {

From 3d094f84add9f669b2bf0e1bd41bd83da4fd01fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 14:02:15 +0900
Subject: [PATCH 1643/2296] Fix incorrect parsing of BSpline curve types

---
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 411a9b0d63..f9e32fe26f 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -273,8 +273,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             while (++endIndex < pointSplit.Length)
             {
-                // Keep incrementing endIndex while it's not the start of a new segment (indicated by having a type descriptor of length 1).
-                if (pointSplit[endIndex].Length > 1)
+                // Keep incrementing endIndex while it's not the start of a new segment (indicated by having an alpha character at position 0).
+                if (!char.IsLetter(pointSplit[endIndex][0]))
                     continue;
 
                 // Multi-segmented sliders DON'T contain the end point as part of the current segment as it's assumed to be the start of the next segment.

From ba6fbbe43c122413c4b4b81eb9450e77f3361f8b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 14:03:45 +0900
Subject: [PATCH 1644/2296] Update framework

---
 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 8175869405..aa993485f3 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1120.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1121.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 733f5d5d87..a39c5f968a 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1120.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1121.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1114.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index a5425ba4c7..b43cb1b3f1 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1120.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1121.0" />
   </ItemGroup>
 </Project>

From 92728ea56460dfe0c2135d9165ee8d35e49fe8ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 14:10:48 +0900
Subject: [PATCH 1645/2296] Simplify toolbox initialisation

---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 061f72d72f..65acdb61ae 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -97,12 +97,12 @@ namespace osu.Game.Rulesets.Osu.Edit
             // we may be entering the screen with a selection already active
             updateDistanceSnapGrid();
 
-            RightToolbox.Add(new TransformToolboxGroup
-            {
-                RotationHandler = BlueprintContainer.SelectionHandler.RotationHandler,
-            });
-
-            RightToolbox.Add(FreehandlSliderToolboxGroup);
+            RightToolbox.AddRange(new EditorToolboxGroup[]
+                {
+                    new TransformToolboxGroup { RotationHandler = BlueprintContainer.SelectionHandler.RotationHandler, },
+                    FreehandlSliderToolboxGroup
+                }
+            );
         }
 
         protected override ComposeBlueprintContainer CreateBlueprintContainer()

From cf6f66b84f729a71e04a34b7d9acf9091dfbd7cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 14:37:06 +0900
Subject: [PATCH 1646/2296] Remove redundant `Clear()` call

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 6e9cc26af4..32397330c6 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -178,7 +178,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                             if (lastCp != cursor && HitObject.Path.ControlPoints.Count == 2)
                                 return false;
 
-                            bSplineBuilder.Clear();
                             bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMouseDownPosition) - HitObject.Position);
                             setState(SliderPlacementState.Drawing);
                             return true;

From 016de7be6a9c0a5709e966b6f2bb45349d8f38e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 14:51:09 +0900
Subject: [PATCH 1647/2296] Simplify drag handling code in
 `SliderPlacementBlueprint`

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

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 32397330c6..bb4558171f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 controlPointVisualiser = new PathControlPointVisualiser<Slider>(HitObject, false)
             };
 
-            setState(SliderPlacementState.Initial);
+            state = SliderPlacementState.Initial;
         }
 
         protected override void LoadComplete()
@@ -164,38 +164,30 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         protected override bool OnDragStart(DragStartEvent e)
         {
-            if (e.Button == MouseButton.Left)
-            {
-                switch (state)
-                {
-                    case SliderPlacementState.Initial:
-                        return true;
+            if (e.Button != MouseButton.Left)
+                return base.OnDragStart(e);
 
-                    case SliderPlacementState.ControlPoints:
-                        if (HitObject.Path.ControlPoints.Count < 3)
-                        {
-                            var lastCp = HitObject.Path.ControlPoints.LastOrDefault();
-                            if (lastCp != cursor && HitObject.Path.ControlPoints.Count == 2)
-                                return false;
+            if (state != SliderPlacementState.ControlPoints)
+                return base.OnDragStart(e);
 
-                            bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMouseDownPosition) - HitObject.Position);
-                            setState(SliderPlacementState.Drawing);
-                            return true;
-                        }
+            // Only enter drawing mode if no additional control points have been placed.
+            if (HitObject.Path.ControlPoints.Count > 2)
+                return base.OnDragStart(e);
 
-                        return false;
-                }
-            }
-
-            return base.OnDragStart(e);
+            bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMouseDownPosition) - HitObject.Position);
+            state = SliderPlacementState.Drawing;
+            return true;
         }
 
         protected override void OnDrag(DragEvent e)
         {
             base.OnDrag(e);
 
-            bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMousePosition) - HitObject.Position);
-            Scheduler.AddOnce(updateSliderPathFromBSplineBuilder);
+            if (state == SliderPlacementState.Drawing)
+            {
+                bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMousePosition) - HitObject.Position);
+                Scheduler.AddOnce(updateSliderPathFromBSplineBuilder);
+            }
         }
 
         private void updateSliderPathFromBSplineBuilder()
@@ -260,7 +252,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void beginCurve()
         {
             BeginPlacement(commitStart: true);
-            setState(SliderPlacementState.ControlPoints);
+            state = SliderPlacementState.ControlPoints;
         }
 
         private void endCurve()
@@ -357,11 +349,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             tailCirclePiece.UpdateFrom(HitObject.TailCircle);
         }
 
-        private void setState(SliderPlacementState newState)
-        {
-            state = newState;
-        }
-
         private enum SliderPlacementState
         {
             Initial,

From a210469956ca340bb302f76679c49142e2e0ae69 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 14:52:21 +0900
Subject: [PATCH 1648/2296] Reorder methods

---
 .../Sliders/SliderPlacementBlueprint.cs       | 106 +++++++++---------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index bb4558171f..397d6ffb91 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -190,50 +190,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
         }
 
-        private void updateSliderPathFromBSplineBuilder()
-        {
-            IReadOnlyList<Vector2> builderPoints = bSplineBuilder.ControlPoints;
-
-            if (builderPoints.Count == 0)
-                return;
-
-            int lastSegmentStart = 0;
-            PathType? lastPathType = null;
-
-            HitObject.Path.ControlPoints.Clear();
-
-            // Iterate through generated points, finding each segment and adding non-inheriting path types where appropriate.
-            // Importantly, the B-Spline builder returns three Vector2s at the same location when a new segment is to be started.
-            for (int i = 0; i < builderPoints.Count; i++)
-            {
-                bool isLastPoint = i == builderPoints.Count - 1;
-                bool isNewSegment = i < builderPoints.Count - 2 && builderPoints[i] == builderPoints[i + 1] && builderPoints[i] == builderPoints[i + 2];
-
-                if (isNewSegment || isLastPoint)
-                {
-                    int pointsInSegment = i - lastSegmentStart;
-
-                    // Where possible, we can use the simpler LINEAR path type.
-                    PathType? pathType = pointsInSegment == 1 ? PathType.LINEAR : PathType.BSpline(3);
-
-                    // Linear segments can be combined, as two adjacent linear sections are computationally the same as one with the points combined.
-                    if (lastPathType == pathType && lastPathType == PathType.LINEAR)
-                        pathType = null;
-
-                    HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[lastSegmentStart], pathType));
-                    for (int j = lastSegmentStart + 1; j < i; j++)
-                        HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[j]));
-
-                    if (isLastPoint)
-                        HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[i]));
-
-                    // Skip the redundant duplicated points (see isNewSegment above) which have been coalesced into a path type.
-                    lastSegmentStart = (i += 2);
-                    if (pathType != null) lastPathType = pathType;
-                }
-            }
-        }
-
         protected override void OnDragEnd(DragEndEvent e)
         {
             base.OnDragEnd(e);
@@ -249,6 +205,15 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             base.OnMouseUp(e);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            updateSlider();
+
+            // Maintain the path type in case it got defaulted to bezier at some point during the drag.
+            updatePathType();
+        }
+
         private void beginCurve()
         {
             BeginPlacement(commitStart: true);
@@ -261,15 +226,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             EndPlacement(true);
         }
 
-        protected override void Update()
-        {
-            base.Update();
-            updateSlider();
-
-            // Maintain the path type in case it got defaulted to bezier at some point during the drag.
-            updatePathType();
-        }
-
         private void updatePathType()
         {
             if (state == SliderPlacementState.Drawing)
@@ -349,6 +305,50 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             tailCirclePiece.UpdateFrom(HitObject.TailCircle);
         }
 
+        private void updateSliderPathFromBSplineBuilder()
+        {
+            IReadOnlyList<Vector2> builderPoints = bSplineBuilder.ControlPoints;
+
+            if (builderPoints.Count == 0)
+                return;
+
+            int lastSegmentStart = 0;
+            PathType? lastPathType = null;
+
+            HitObject.Path.ControlPoints.Clear();
+
+            // Iterate through generated points, finding each segment and adding non-inheriting path types where appropriate.
+            // Importantly, the B-Spline builder returns three Vector2s at the same location when a new segment is to be started.
+            for (int i = 0; i < builderPoints.Count; i++)
+            {
+                bool isLastPoint = i == builderPoints.Count - 1;
+                bool isNewSegment = i < builderPoints.Count - 2 && builderPoints[i] == builderPoints[i + 1] && builderPoints[i] == builderPoints[i + 2];
+
+                if (isNewSegment || isLastPoint)
+                {
+                    int pointsInSegment = i - lastSegmentStart;
+
+                    // Where possible, we can use the simpler LINEAR path type.
+                    PathType? pathType = pointsInSegment == 1 ? PathType.LINEAR : PathType.BSpline(3);
+
+                    // Linear segments can be combined, as two adjacent linear sections are computationally the same as one with the points combined.
+                    if (lastPathType == pathType && lastPathType == PathType.LINEAR)
+                        pathType = null;
+
+                    HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[lastSegmentStart], pathType));
+                    for (int j = lastSegmentStart + 1; j < i; j++)
+                        HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[j]));
+
+                    if (isLastPoint)
+                        HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[i]));
+
+                    // Skip the redundant duplicated points (see isNewSegment above) which have been coalesced into a path type.
+                    lastSegmentStart = (i += 2);
+                    if (pathType != null) lastPathType = pathType;
+                }
+            }
+        }
+
         private enum SliderPlacementState
         {
             Initial,

From 1660eb3c15b1075e93a64a2938e8e86451f5df84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 15:31:24 +0900
Subject: [PATCH 1649/2296] Add failing test coverage of drag after point
 placement

---
 .../TestSceneSliderPlacementBlueprint.cs      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 75778b3a7e..7ac34bc6c8 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -272,6 +272,30 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(2, PathType.PERFECT_CURVE);
         }
 
+        [Test]
+        public void TestSliderDrawingDoesntActivateAfterNormalPlacement()
+        {
+            Vector2 startPoint = new Vector2(200);
+
+            addMovementStep(startPoint);
+            addClickStep(MouseButton.Left);
+
+            for (int i = 0; i < 20; i++)
+            {
+                if (i == 5)
+                    AddStep("press left button", () => InputManager.PressButton(MouseButton.Left));
+                addMovementStep(startPoint + new Vector2(i * 40, MathF.Sin(i * MathF.PI / 5) * 50));
+            }
+
+            AddStep("release left button", () => InputManager.ReleaseButton(MouseButton.Left));
+            assertPlaced(false);
+
+            addClickStep(MouseButton.Right);
+            assertPlaced(true);
+
+            assertControlPointType(0, PathType.BEZIER);
+        }
+
         [Test]
         public void TestSliderDrawingCurve()
         {

From cc33e121258adb0d607fba5c6bf9897e1979eac5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 15:16:40 +0900
Subject: [PATCH 1650/2296] Fix dragging after one point already placed
 incorrectly entering drawing mode

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 397d6ffb91..63370350ed 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -171,7 +171,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 return base.OnDragStart(e);
 
             // Only enter drawing mode if no additional control points have been placed.
-            if (HitObject.Path.ControlPoints.Count > 2)
+            int controlPointCount = HitObject.Path.ControlPoints.Count;
+            if (controlPointCount > 2 || (controlPointCount == 2 && HitObject.Path.ControlPoints.Last() != cursor))
                 return base.OnDragStart(e);
 
             bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMouseDownPosition) - HitObject.Position);

From 4b2d8aa6a647b28c13f63dc3047cca04b8b8c398 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 15:31:39 +0900
Subject: [PATCH 1651/2296] Add `ToString` on `PathType` for better test output

---
 osu.Game/Rulesets/Objects/Types/PathType.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Types/PathType.cs b/osu.Game/Rulesets/Objects/Types/PathType.cs
index f84d43e3e7..23f1ccf0bc 100644
--- a/osu.Game/Rulesets/Objects/Types/PathType.cs
+++ b/osu.Game/Rulesets/Objects/Types/PathType.cs
@@ -81,5 +81,7 @@ namespace osu.Game.Rulesets.Objects.Types
 
         public static bool operator ==(PathType a, PathType b) => a.Equals(b);
         public static bool operator !=(PathType a, PathType b) => !a.Equals(b);
+
+        public override string ToString() => Description;
     }
 }

From ed3874682365596f96fac6c8622821786b3645a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 21 Nov 2023 16:14:30 +0900
Subject: [PATCH 1652/2296] Fix spacer appearing on top of menu

---
 .../Sliders/Components/PathControlPointVisualiser.cs         | 5 +++--
 1 file changed, 3 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 87e837cc71..3a80d04ab8 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -367,9 +367,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 List<MenuItem> curveTypeItems = new List<MenuItem>();
 
                 if (!selectedPieces.Contains(Pieces[0]))
+                {
                     curveTypeItems.Add(createMenuItemForPathType(null));
-
-                curveTypeItems.Add(new OsuMenuItemSpacer());
+                    curveTypeItems.Add(new OsuMenuItemSpacer());
+                }
 
                 // todo: hide/disable items which aren't valid for selected points
                 curveTypeItems.Add(createMenuItemForPathType(PathType.Linear));

From 85bddab52bb0cdc0419ebe3aea776bc4650d0c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 21 Nov 2023 16:52:52 +0900
Subject: [PATCH 1653/2296] Refactor `OnlineStatusNotifier` to be more local

---
 osu.Game/Online/OnlineStatusNotifier.cs | 108 ++++++++++++++----------
 1 file changed, 62 insertions(+), 46 deletions(-)

diff --git a/osu.Game/Online/OnlineStatusNotifier.cs b/osu.Game/Online/OnlineStatusNotifier.cs
index 0cf672ac3c..0d846f7d27 100644
--- a/osu.Game/Online/OnlineStatusNotifier.cs
+++ b/osu.Game/Online/OnlineStatusNotifier.cs
@@ -17,6 +17,9 @@ using osu.Game.Screens.OnlinePlay;
 
 namespace osu.Game.Online
 {
+    /// <summary>
+    /// Handles various scenarios where connection is lost and we need to let the user know what and why.
+    /// </summary>
     public partial class OnlineStatusNotifier : Component
     {
         private readonly Func<IScreen> getCurrentScreen;
@@ -33,7 +36,11 @@ namespace osu.Game.Online
         private IBindable<APIState> apiState = null!;
         private IBindable<bool> multiplayerState = null!;
         private IBindable<bool> spectatorState = null!;
-        private bool forcedDisconnection;
+
+        /// <summary>
+        /// This flag will be set to <c>true</c> when the user has been notified so we don't show more than one notification.
+        /// </summary>
+        private bool userNotified;
 
         public OnlineStatusNotifier(Func<IScreen> getCurrentScreen)
         {
@@ -51,12 +58,63 @@ namespace osu.Game.Online
             spectatorClient.Disconnecting += notifyAboutForcedDisconnection;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            apiState.BindValueChanged(state =>
+            {
+                if (state.NewValue == APIState.Online)
+                {
+                    userNotified = false;
+                    return;
+                }
+
+                if (userNotified) return;
+
+                if (state.NewValue == APIState.Offline && getCurrentScreen() is OnlinePlayScreen)
+                {
+                    userNotified = true;
+                    notificationOverlay?.Post(new SimpleErrorNotification
+                    {
+                        Icon = FontAwesome.Solid.ExclamationCircle,
+                        Text = "Connection to API was lost. Can't continue with online play."
+                    });
+                }
+            });
+
+            multiplayerState.BindValueChanged(connected => Schedule(() =>
+            {
+                if (connected.NewValue)
+                {
+                    userNotified = false;
+                    return;
+                }
+
+                if (userNotified) return;
+
+                if (multiplayerClient.Room != null)
+                {
+                    userNotified = true;
+                    notificationOverlay?.Post(new SimpleErrorNotification
+                    {
+                        Icon = FontAwesome.Solid.ExclamationCircle,
+                        Text = "Connection to the multiplayer server was lost. Exiting multiplayer."
+                    });
+                }
+            }));
+
+            spectatorState.BindValueChanged(_ =>
+            {
+                // TODO: handle spectator server failure somehow?
+            });
+        }
+
         private void notifyAboutForcedDisconnection()
         {
-            if (forcedDisconnection)
-                return;
+            if (userNotified) return;
 
-            forcedDisconnection = true;
+            userNotified = true;
             notificationOverlay?.Post(new SimpleErrorNotification
             {
                 Icon = FontAwesome.Solid.ExclamationCircle,
@@ -64,48 +122,6 @@ namespace osu.Game.Online
             });
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            apiState.BindValueChanged(_ =>
-            {
-                if (apiState.Value == APIState.Online)
-                    forcedDisconnection = false;
-
-                Scheduler.AddOnce(updateState);
-            });
-            multiplayerState.BindValueChanged(_ => Scheduler.AddOnce(updateState));
-            spectatorState.BindValueChanged(_ => Scheduler.AddOnce(updateState));
-        }
-
-        private void updateState()
-        {
-            if (forcedDisconnection)
-                return;
-
-            if (apiState.Value == APIState.Offline && getCurrentScreen() is OnlinePlayScreen)
-            {
-                notificationOverlay?.Post(new SimpleErrorNotification
-                {
-                    Icon = FontAwesome.Solid.ExclamationCircle,
-                    Text = "API connection was lost. Can't continue with online play."
-                });
-                return;
-            }
-
-            if (!multiplayerClient.IsConnected.Value && multiplayerClient.Room != null)
-            {
-                notificationOverlay?.Post(new SimpleErrorNotification
-                {
-                    Icon = FontAwesome.Solid.ExclamationCircle,
-                    Text = "Connection to the multiplayer server was lost. Exiting multiplayer."
-                });
-            }
-
-            // TODO: handle spectator server failure somehow?
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From aa749aeb731dba4743338f88e541c326b8e5c12e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Nov 2023 17:49:56 +0900
Subject: [PATCH 1654/2296] Save any unsaved changes in the skin editor when
 game changes screens

Closes https://github.com/ppy/osu/issues/25494.
---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 68d6b7ced5..cbe122395c 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -188,7 +188,10 @@ namespace osu.Game.Overlays.SkinEditor
             }
 
             if (skinEditor.State.Value == Visibility.Visible)
+            {
+                skinEditor.Save(false);
                 skinEditor.UpdateTargetScreen(target);
+            }
             else
             {
                 skinEditor.Hide();

From 8302ebcf1ae54b2f0bc3ba7f8ba01b185ffeda39 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 21 Nov 2023 19:18:02 +0900
Subject: [PATCH 1655/2296] Remove default DrainRate value

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

diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index a8808d08e5..4a651e2650 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// The drain rate as a proportion of the total health drained per millisecond.
         /// </summary>
-        public double DrainRate { get; private set; } = 1;
+        public double DrainRate { get; private set; }
 
         /// <summary>
         /// The beatmap.
@@ -139,8 +139,6 @@ namespace osu.Game.Rulesets.Scoring
         {
             base.Reset(storeResults);
 
-            DrainRate = 1;
-
             if (storeResults)
                 DrainRate = ComputeDrainRate();
 

From 16acec335f825eb93c791e64010f35e030f4ff69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Burgelin=20=28Zyf=29?=
 <Zyfarok@users.noreply.github.com>
Date: Tue, 21 Nov 2023 11:27:03 +0100
Subject: [PATCH 1656/2296] Fix: update score migration of special case to
 match the new score
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 685f852eb4..a9569ac9ba 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Database
                     {
                         return (long)Math.Round((
                             0
-                            + 300000 * Math.Pow(score.Accuracy, 8)
+                            + 500000 * Math.Pow(score.Accuracy, 5)
                             + bonusProportion) * modMultiplier);
                     }
 

From 901e45b6a4f134143d512c6cec378149c6bc4aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Burgelin=20=28Zyfarok=29?=
 <clementburgelin@gmail.com>
Date: Tue, 21 Nov 2023 11:54:07 +0100
Subject: [PATCH 1657/2296] Scoring conversion: remove mention of v3 + improve
 comments

---
 .../StandardisedScoreMigrationTools.cs        | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index a9569ac9ba..fe51c6f130 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -275,50 +275,52 @@ namespace osu.Game.Database
                     }
 
                     // Assumption :
-                    // - sliders and slider-ticks are uniformly spread arround the beatmap
-                    //      thus we can ignore them without losing much precision (consider a map of hit-circles only !)
-                    // - the Ok/Meh hit results are uniformly spread in the score
-                    //      thus we can simplify and consider each hit result to be score.Accuracy without losing much precision
-                    // What is strippedV1/strippedV3 :
-                    // This is the ComboScore of v1/v3 were we remove all (map-)constant multipliers and accuracy multipliers (including hit results),
-                    // based on the previous assumptions. For Scorev1, this is basically the sum of squared combos (because without sliders: object_count == combo).
+                    // - sliders and slider-ticks are uniformly spread arround the beatmap, and thus can be ignored without losing much precision.
+                    //      We thus consider a map of hit-circles only, which gives objectCount == maximumCombo !
+                    // - the Ok/Meh hit results are uniformly spread in the score, and thus can be ignored without losing much precision.
+                    //      We simplify and consider each hit result to be equal to `300*score.Accuracy`, which allows us to isolate the accuracy multiplier.
+                    // What is strippedV1/strippedNew :
+                    // This is the ComboScore (of v1 / new score) were we remove all (map-)constant multipliers and accuracy multipliers (including hit results),
+                    // based on the previous assumptions.
+                    // We use integrals to approximate the sum of each object's combo contribution (thus the original combo exponent is increased by 1)
+                    // For the maximum score, we thus integrate `f(combo) = 300*combo^exponent`, and ignoring the constant multipliers we get:
                     double maxStrippedV1 = Math.Pow(maximumLegacyCombo, 2);
-                    double maxStrippedV3 = Math.Pow(maximumLegacyCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
+                    double maxStrippedNew = Math.Pow(maximumLegacyCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
                     double strippedV1 = maxStrippedV1 * comboProportion / score.Accuracy;
 
                     double strippedV1FromMaxCombo = Math.Pow(score.MaxCombo, 2);
-                    double strippedV3FromMaxCombo = Math.Pow(score.MaxCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
+                    double strippedNewFromMaxCombo = Math.Pow(score.MaxCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
-                    // Compute approximate lower estimate scorev3 for that play
+                    // Compute approximate lower estimate new score for that play
                     // That is, a play were we made biggest amount of big combos (Repeat MaxCombo + 1 remaining big combo)
                     // And didn't combo anything in the reminder of the map
                     double possibleMaxComboRepeat = Math.Floor(strippedV1 / strippedV1FromMaxCombo);
                     double strippedV1FromMaxComboRepeat = possibleMaxComboRepeat * strippedV1FromMaxCombo;
                     double remainingStrippedV1 = strippedV1 - strippedV1FromMaxComboRepeat;
                     double remainingCombo = Math.Sqrt(remainingStrippedV1);
-                    double remainingStrippedV3 = Math.Pow(remainingCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
+                    double remainingStrippedNew = Math.Pow(remainingCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
-                    double newLowerStrippedV3 = (possibleMaxComboRepeat * strippedV3FromMaxCombo) + remainingStrippedV3;
+                    double lowerStrippedNew = (possibleMaxComboRepeat * strippedNewFromMaxCombo) + remainingStrippedNew;
 
-                    // Compute approximate upper estimate scorev3 for that play
+                    // Compute approximate upper estimate new score for that play
                     // That is, a play were all combos were equal (except MaxCombo)
                     remainingStrippedV1 = strippedV1 - strippedV1FromMaxCombo;
                     double remainingComboObjects = maximumLegacyCombo - score.MaxCombo - score.Statistics[HitResult.Miss];
                     double remainingAverageCombo = remainingComboObjects > 0 ? remainingStrippedV1 / remainingComboObjects : 0;
-                    remainingStrippedV3 = remainingComboObjects * Math.Pow(remainingAverageCombo, ScoreProcessor.COMBO_EXPONENT);
+                    remainingStrippedNew = remainingComboObjects * Math.Pow(remainingAverageCombo, ScoreProcessor.COMBO_EXPONENT);
 
-                    double newUpperStrippedV3 = strippedV3FromMaxCombo + remainingStrippedV3;
+                    double upperStrippedNew = strippedNewFromMaxCombo + remainingStrippedNew;
 
                     // Approximate by combining lower and upper estimates
                     // As the lower-estimate is very pessimistic, we use a 30/70 ratio
                     // And cap it with 1.2 times the middle-point to avoid overstimates
-                    double strippedV3 = Math.Min(
-                        0.3 * newLowerStrippedV3 + 0.7 * newUpperStrippedV3,
-                        1.2 * (newLowerStrippedV3 + newUpperStrippedV3) / 2
+                    double strippedNew = Math.Min(
+                        0.3 * lowerStrippedNew + 0.7 * upperStrippedNew,
+                        1.2 * (lowerStrippedNew + upperStrippedNew) / 2
                     );
 
-                    double newComboScoreProportion = (strippedV3 / maxStrippedV3);
+                    double newComboScoreProportion = (strippedNew / maxStrippedNew);
 
                     return (long)Math.Round((
                         500000 * newComboScoreProportion * score.Accuracy

From 671177e87120e4cacba35f824950d0847cbeacf6 Mon Sep 17 00:00:00 2001
From: yesseruser <yesseruseryt@gmail.com>
Date: Tue, 21 Nov 2023 19:02:23 +0100
Subject: [PATCH 1658/2296] Renamed UpdateableFlag to ClickableUpdateableFlag.

---
 osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs          | 2 +-
 osu.Game/Online/Leaderboards/LeaderboardScore.cs              | 2 +-
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs             | 2 +-
 osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs    | 4 ++--
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs        | 4 ++--
 osu.Game/Overlays/Rankings/CountryPill.cs                     | 4 ++--
 osu.Game/Overlays/Rankings/Tables/RankingsTable.cs            | 2 +-
 .../OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs   | 2 +-
 osu.Game/Screens/Play/HUD/PlayerFlag.cs                       | 4 ++--
 .../{UpdateableFlag.cs => ClickableUpdateableFlag.cs}         | 4 ++--
 osu.Game/Users/ExtendedUserPanel.cs                           | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)
 rename osu.Game/Users/Drawables/{UpdateableFlag.cs => ClickableUpdateableFlag.cs} (91%)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
index 0bc71924ce..7a7679c376 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Menus
 
             AddStep("click on flag", () =>
             {
-                InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<UpdateableFlag>().First());
+                InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<ClickableUpdateableFlag>().First());
                 InputManager.Click(MouseButton.Left);
             });
             AddAssert("login overlay is hidden", () => loginOverlay.State.Value == Visibility.Hidden);
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 136c9cc8e7..114ef5db22 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Online.Leaderboards
                                                     Masking = true,
                                                     Children = new Drawable[]
                                                     {
-                                                        new UpdateableFlag(user.CountryCode)
+                                                        new ClickableUpdateableFlag(user.CountryCode)
                                                         {
                                                             Anchor = Anchor.CentreLeft,
                                                             Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 1fc997fdad..e144a55a96 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     Margin = new MarginPadding { Right = horizontal_inset },
                     Text = score.DisplayAccuracy,
                 },
-                new UpdateableFlag(score.User.CountryCode)
+                new ClickableUpdateableFlag(score.User.CountryCode)
                 {
                     Size = new Vector2(19, 14),
                     ShowPlaceholderOnUnknown = false,
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 9dc2ce204f..e38e6efd06 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly UpdateableAvatar avatar;
         private readonly LinkFlowContainer usernameText;
         private readonly DrawableDate achievedOn;
-        private readonly UpdateableFlag flag;
+        private readonly ClickableUpdateableFlag flag;
 
         public TopScoreUserSection()
         {
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                     },
                                 }
                             },
-                            flag = new UpdateableFlag
+                            flag = new ClickableUpdateableFlag
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 36bd8a5af5..15aaf333f4 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Profile.Header
         private OsuSpriteText usernameText = null!;
         private ExternalLinkButton openUserExternally = null!;
         private OsuSpriteText titleText = null!;
-        private UpdateableFlag userFlag = null!;
+        private ClickableUpdateableFlag userFlag = null!;
         private OsuHoverContainer userCountryContainer = null!;
         private OsuSpriteText userCountryText = null!;
         private GroupBadgeFlow groupBadgeFlow = null!;
@@ -162,7 +162,7 @@ namespace osu.Game.Overlays.Profile.Header
                                                     Direction = FillDirection.Horizontal,
                                                     Children = new Drawable[]
                                                     {
-                                                        userFlag = new UpdateableFlag
+                                                        userFlag = new ClickableUpdateableFlag
                                                         {
                                                             Size = new Vector2(28, 20),
                                                             ShowPlaceholderOnUnknown = false,
diff --git a/osu.Game/Overlays/Rankings/CountryPill.cs b/osu.Game/Overlays/Rankings/CountryPill.cs
index 294b6df34d..bfa7363de8 100644
--- a/osu.Game/Overlays/Rankings/CountryPill.cs
+++ b/osu.Game/Overlays/Rankings/CountryPill.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Rankings
 
         private readonly Container content;
         private readonly Box background;
-        private readonly UpdateableFlag flag;
+        private readonly ClickableUpdateableFlag flag;
         private readonly OsuSpriteText countryName;
 
         public CountryPill()
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.Rankings
                                 Spacing = new Vector2(5, 0),
                                 Children = new Drawable[]
                                 {
-                                    flag = new UpdateableFlag
+                                    flag = new ClickableUpdateableFlag
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
index 27d894cdc2..b68ecd709a 100644
--- a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Overlays.Rankings.Tables
             Margin = new MarginPadding { Bottom = row_spacing },
             Children = new[]
             {
-                new UpdateableFlag(GetCountryCode(item))
+                new ClickableUpdateableFlag(GetCountryCode(item))
                 {
                     Size = new Vector2(28, 20),
                     ShowPlaceholderOnUnknown = false,
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index c79c210e30..1f922073ec 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                             FillMode = FillMode.Fit,
                                             User = user
                                         },
-                                        new UpdateableFlag
+                                        new ClickableUpdateableFlag
                                         {
                                             Anchor = Anchor.CentreLeft,
                                             Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Screens/Play/HUD/PlayerFlag.cs b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
index 85799c03d3..7234db71b5 100644
--- a/osu.Game/Screens/Play/HUD/PlayerFlag.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class PlayerFlag : CompositeDrawable, ISerialisableDrawable
     {
-        private readonly UpdateableFlag flag;
+        private readonly ClickableUpdateableFlag flag;
 
         private const float default_size = 40f;
 
         public PlayerFlag()
         {
             Size = new Vector2(default_size, default_size / 1.4f);
-            InternalChild = flag = new UpdateableFlag
+            InternalChild = flag = new ClickableUpdateableFlag
             {
                 RelativeSizeAxes = Axes.Both,
             };
diff --git a/osu.Game/Users/Drawables/UpdateableFlag.cs b/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
similarity index 91%
rename from osu.Game/Users/Drawables/UpdateableFlag.cs
rename to osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
index 8f8d7052e5..d19234fc17 100644
--- a/osu.Game/Users/Drawables/UpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
@@ -11,7 +11,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class UpdateableFlag : ModelBackedDrawable<CountryCode>
+    public partial class ClickableUpdateableFlag : ModelBackedDrawable<CountryCode>
     {
         public CountryCode CountryCode
         {
@@ -30,7 +30,7 @@ namespace osu.Game.Users.Drawables
         /// </summary>
         public Action? Action;
 
-        public UpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
+        public ClickableUpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
         {
             CountryCode = countryCode;
         }
diff --git a/osu.Game/Users/ExtendedUserPanel.cs b/osu.Game/Users/ExtendedUserPanel.cs
index 3c1b68f9ef..e798c8cc11 100644
--- a/osu.Game/Users/ExtendedUserPanel.cs
+++ b/osu.Game/Users/ExtendedUserPanel.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Users
 
         protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar(User, false);
 
-        protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.CountryCode)
+        protected ClickableUpdateableFlag CreateFlag() => new ClickableUpdateableFlag(User.CountryCode)
         {
             Size = new Vector2(36, 26),
             Action = Action,

From cd7e0bf620c0fd1617f1d99038dbbb85e52acd39 Mon Sep 17 00:00:00 2001
From: yesseruser <yesseruseryt@gmail.com>
Date: Tue, 21 Nov 2023 19:27:33 +0100
Subject: [PATCH 1659/2296] Created and implemened a BaseUpdateableFlag. The
 tooltip still shows.

---
 osu.Game/Screens/Play/HUD/PlayerFlag.cs       |  4 +-
 .../Users/Drawables/BaseUpdateableFlag.cs     | 45 +++++++++++++++++++
 .../Drawables/ClickableUpdateableFlag.cs      | 13 +-----
 3 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game/Users/Drawables/BaseUpdateableFlag.cs

diff --git a/osu.Game/Screens/Play/HUD/PlayerFlag.cs b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
index 7234db71b5..f0fe8ad668 100644
--- a/osu.Game/Screens/Play/HUD/PlayerFlag.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class PlayerFlag : CompositeDrawable, ISerialisableDrawable
     {
-        private readonly ClickableUpdateableFlag flag;
+        private readonly BaseUpdateableFlag flag;
 
         private const float default_size = 40f;
 
         public PlayerFlag()
         {
             Size = new Vector2(default_size, default_size / 1.4f);
-            InternalChild = flag = new ClickableUpdateableFlag
+            InternalChild = flag = new BaseUpdateableFlag
             {
                 RelativeSizeAxes = Axes.Both,
             };
diff --git a/osu.Game/Users/Drawables/BaseUpdateableFlag.cs b/osu.Game/Users/Drawables/BaseUpdateableFlag.cs
new file mode 100644
index 0000000000..16a368c60c
--- /dev/null
+++ b/osu.Game/Users/Drawables/BaseUpdateableFlag.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.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Users.Drawables
+{
+    public partial class BaseUpdateableFlag : ModelBackedDrawable<CountryCode>
+    {
+        public CountryCode CountryCode
+        {
+            get => Model;
+            set => Model = value;
+        }
+
+        /// <summary>
+        /// Whether to show a place holder on unknown country.
+        /// </summary>
+        public bool ShowPlaceholderOnUnknown = true;
+
+        public BaseUpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
+        {
+            CountryCode = countryCode;
+        }
+
+        protected override Drawable? CreateDrawable(CountryCode countryCode)
+        {
+            if (countryCode == CountryCode.Unknown && !ShowPlaceholderOnUnknown)
+                return null;
+
+            return new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new DrawableFlag(countryCode)
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs b/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
index d19234fc17..e00fe3c009 100644
--- a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
@@ -11,19 +11,8 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class ClickableUpdateableFlag : ModelBackedDrawable<CountryCode>
+    public partial class ClickableUpdateableFlag : BaseUpdateableFlag
     {
-        public CountryCode CountryCode
-        {
-            get => Model;
-            set => Model = value;
-        }
-
-        /// <summary>
-        /// Whether to show a place holder on unknown country.
-        /// </summary>
-        public bool ShowPlaceholderOnUnknown = true;
-
         /// <summary>
         /// Perform an action in addition to showing the country ranking.
         /// This should be used to perform auxiliary tasks and not as a primary action for clicking a flag (to maintain a consistent UX).

From b2f74325efb4f477b42320cca8cbd380895b12da Mon Sep 17 00:00:00 2001
From: yesseruser <yesseruseryt@gmail.com>
Date: Tue, 21 Nov 2023 19:51:35 +0100
Subject: [PATCH 1660/2296] Added a BaseDrawableFlag without a tooltip, and
 used it. The BaseDrawableFlag is used in a BaseUpdateableFlag so the tooltip
 is not shown, the ClickableUpdateableFlag still shows the tooltip.

---
 osu.Game/Users/Drawables/BaseDrawableFlag.cs  | 29 +++++++++++++++++++
 .../Users/Drawables/BaseUpdateableFlag.cs     |  3 +-
 .../Drawables/ClickableUpdateableFlag.cs      |  1 +
 osu.Game/Users/Drawables/DrawableFlag.cs      | 14 +++------
 4 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game/Users/Drawables/BaseDrawableFlag.cs

diff --git a/osu.Game/Users/Drawables/BaseDrawableFlag.cs b/osu.Game/Users/Drawables/BaseDrawableFlag.cs
new file mode 100644
index 0000000000..90f8cd7b70
--- /dev/null
+++ b/osu.Game/Users/Drawables/BaseDrawableFlag.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 System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Users.Drawables
+{
+    public partial class BaseDrawableFlag : Sprite
+    {
+        protected readonly CountryCode CountryCode;
+
+        public BaseDrawableFlag(CountryCode countryCode)
+        {
+            CountryCode = countryCode;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore ts)
+        {
+            ArgumentNullException.ThrowIfNull(ts);
+
+            string textureName = CountryCode == CountryCode.Unknown ? "__" : CountryCode.ToString();
+            Texture = ts.Get($@"Flags/{textureName}") ?? ts.Get(@"Flags/__");
+        }
+    }
+}
diff --git a/osu.Game/Users/Drawables/BaseUpdateableFlag.cs b/osu.Game/Users/Drawables/BaseUpdateableFlag.cs
index 16a368c60c..3a27238b19 100644
--- a/osu.Game/Users/Drawables/BaseUpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/BaseUpdateableFlag.cs
@@ -34,7 +34,8 @@ namespace osu.Game.Users.Drawables
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    new DrawableFlag(countryCode)
+                    // This is a BaseDrawableFlag which does not show a tooltip.
+                    new BaseDrawableFlag(countryCode)
                     {
                         RelativeSizeAxes = Axes.Both
                     },
diff --git a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs b/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
index e00fe3c009..2eaa3661d1 100644
--- a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Users.Drawables
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
+                    // This is a DrawableFlag which implements IHasTooltip, so a tooltip is shown.
                     new DrawableFlag(countryCode)
                     {
                         RelativeSizeAxes = Axes.Both
diff --git a/osu.Game/Users/Drawables/DrawableFlag.cs b/osu.Game/Users/Drawables/DrawableFlag.cs
index 289f68ee7f..aef34c093f 100644
--- a/osu.Game/Users/Drawables/DrawableFlag.cs
+++ b/osu.Game/Users/Drawables/DrawableFlag.cs
@@ -5,29 +5,23 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class DrawableFlag : Sprite, IHasTooltip
+    public partial class DrawableFlag : BaseDrawableFlag, IHasTooltip
     {
-        private readonly CountryCode countryCode;
+        public LocalisableString TooltipText => CountryCode == CountryCode.Unknown ? string.Empty : CountryCode.GetDescription();
 
-        public LocalisableString TooltipText => countryCode == CountryCode.Unknown ? string.Empty : countryCode.GetDescription();
-
-        public DrawableFlag(CountryCode countryCode)
-        {
-            this.countryCode = countryCode;
-        }
+        public DrawableFlag(CountryCode countryCode) : base(countryCode) { }
 
         [BackgroundDependencyLoader]
         private void load(TextureStore ts)
         {
             ArgumentNullException.ThrowIfNull(ts);
 
-            string textureName = countryCode == CountryCode.Unknown ? "__" : countryCode.ToString();
+            string textureName = CountryCode == CountryCode.Unknown ? "__" : CountryCode.ToString();
             Texture = ts.Get($@"Flags/{textureName}") ?? ts.Get(@"Flags/__");
         }
     }

From c98be5823db0818bf5eaf8bcab853fa8622d5257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 22 Nov 2023 07:52:28 +0900
Subject: [PATCH 1661/2296] Update framework

---
 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 aa993485f3..ea08992710 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1121.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1121.1" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index a39c5f968a..1468af4d58 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1121.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1121.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1114.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index b43cb1b3f1..53d5d6b010 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1121.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1121.1" />
   </ItemGroup>
 </Project>

From aa724070653dc41df9e67c8476427752586b219f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 22 Nov 2023 07:55:39 +0900
Subject: [PATCH 1662/2296] Fix android compile failures due to invalid java
 version

See https://github.com/ppy/osu-framework/pull/6057.
---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a8167ec4db..11c956bb71 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -108,6 +108,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Setup JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: microsoft
+          java-version: 11
+
       - name: Install .NET 6.0.x
         uses: actions/setup-dotnet@v3
         with:

From 0cf925dadf4e09fc6e8e8c14f2511f4ef8591a18 Mon Sep 17 00:00:00 2001
From: Poyo <poyoarya@gmail.com>
Date: Tue, 21 Nov 2023 15:18:04 -0800
Subject: [PATCH 1663/2296] Use better fallback

Seems better to use the rate from a non-gameplay clock than to arbitrarily apply 1.
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 5abca168ed..1daaa24d57 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -704,7 +704,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             Result.RawTime = Time.Current;
-            Result.GameplayRate = (Clock as IGameplayClock)?.GetTrueGameplayRate() ?? 1.0;
+            Result.GameplayRate = (Clock as IGameplayClock)?.GetTrueGameplayRate() ?? Clock.Rate;
 
             if (Result.HasResult)
                 updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);

From 3a0586a8f59ce286f986df00327cf7953fd62dd7 Mon Sep 17 00:00:00 2001
From: Poyo <poyoarya@gmail.com>
Date: Tue, 21 Nov 2023 15:19:04 -0800
Subject: [PATCH 1664/2296] Rewrite backwards assertion

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

diff --git a/osu.Game/Rulesets/Scoring/HitEventExtensions.cs b/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
index 70a11ae760..9fb61c6cd9 100644
--- a/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
+++ b/osu.Game/Rulesets/Scoring/HitEventExtensions.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Scoring
         /// </returns>
         public static double? CalculateUnstableRate(this IEnumerable<HitEvent> hitEvents)
         {
-            Debug.Assert(!hitEvents.Any(ev => ev.GameplayRate == null));
+            Debug.Assert(hitEvents.All(ev => ev.GameplayRate != null));
 
             // Division by gameplay rate is to account for TimeOffset scaling with gameplay rate.
             double[] timeOffsets = hitEvents.Where(affectsUnstableRate).Select(ev => ev.TimeOffset / ev.GameplayRate!.Value).ToArray();

From 04640b6fb0129aa880281d1883bf0b318a128fe0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 10:44:29 +0900
Subject: [PATCH 1665/2296] Improve commenting around `IHasCombo` interfaces

Following discusion with smoogi IRL.
---
 osu.Game/Rulesets/Objects/Types/IHasCombo.cs       |  6 ++++++
 .../Rulesets/Objects/Types/IHasComboInformation.cs | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Types/IHasCombo.cs b/osu.Game/Rulesets/Objects/Types/IHasCombo.cs
index d1a4683a1d..5de5424bdc 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasCombo.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasCombo.cs
@@ -16,6 +16,12 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// When starting a new combo, the offset of the new combo relative to the current one.
         /// </summary>
+        /// <remarks>
+        /// This is generally a setting provided by a beatmap creator to choreograph interesting colour patterns
+        /// which can only be achieved by skipping combo colours with per-hitobject level.
+        ///
+        /// It is exposed via <see cref="IHasComboInformation.ComboIndexWithOffsets"/>.
+        /// </remarks>
         int ComboOffset { get; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs b/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
index d34e71021f..3aa68197ec 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasComboInformation.cs
@@ -12,6 +12,9 @@ namespace osu.Game.Rulesets.Objects.Types
     /// </summary>
     public interface IHasComboInformation : IHasCombo
     {
+        /// <summary>
+        /// Bindable exposure of <see cref="IndexInCurrentCombo"/>.
+        /// </summary>
         Bindable<int> IndexInCurrentComboBindable { get; }
 
         /// <summary>
@@ -19,13 +22,21 @@ namespace osu.Game.Rulesets.Objects.Types
         /// </summary>
         int IndexInCurrentCombo { get; set; }
 
+        /// <summary>
+        /// Bindable exposure of <see cref="ComboIndex"/>.
+        /// </summary>
         Bindable<int> ComboIndexBindable { get; }
 
         /// <summary>
         /// The index of this combo in relation to the beatmap.
+        ///
+        /// In other words, this is incremented by 1 each time a <see cref="NewCombo"/> is reached.
         /// </summary>
         int ComboIndex { get; set; }
 
+        /// <summary>
+        /// Bindable exposure of <see cref="ComboIndexWithOffsets"/>.
+        /// </summary>
         Bindable<int> ComboIndexWithOffsetsBindable { get; }
 
         /// <summary>
@@ -39,6 +50,9 @@ namespace osu.Game.Rulesets.Objects.Types
         /// </summary>
         new bool NewCombo { get; set; }
 
+        /// <summary>
+        /// Bindable exposure of <see cref="LastInCombo"/>.
+        /// </summary>
         Bindable<bool> LastInComboBindable { get; }
 
         /// <summary>

From fe15b26bd2f780ba6e45e81e64944841ec23a54d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 12:02:37 +0900
Subject: [PATCH 1666/2296] Refactor to use API state instead of logged in user
 state

---
 osu.Game/Overlays/UserProfileOverlay.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 193651fa72..d978fe905f 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays
         private IUser? user;
         private IRulesetInfo? ruleset;
 
-        private IBindable<APIUser> apiUser = null!;
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
         [Resolved]
         private RulesetStore rulesets { get; set; } = null!;
@@ -68,10 +68,10 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load()
         {
-            apiUser = API.LocalUser.GetBoundCopy();
-            apiUser.BindValueChanged(_ => Schedule(() =>
+            apiState.BindTo(API.State);
+            apiState.BindValueChanged(state => Schedule(() =>
             {
-                if (API.IsLoggedIn)
+                if (state.NewValue == APIState.Online && user != null)
                     fetchAndSetContent();
             }));
         }
@@ -89,7 +89,6 @@ namespace osu.Game.Overlays
             ruleset = userRuleset;
 
             Show();
-
             fetchAndSetContent();
         }
 
@@ -171,13 +170,14 @@ namespace osu.Game.Overlays
 
             sectionsContainer.ScrollToTop();
 
-            if (API.State.Value != APIState.Online)
-                return;
+            if (API.State.Value != APIState.Offline)
+            {
+                userReq = user.OnlineID > 1 ? new GetUserRequest(user.OnlineID, ruleset) : new GetUserRequest(user.Username, ruleset);
+                userReq.Success += u => userLoadComplete(u, ruleset);
 
-            userReq = user.OnlineID > 1 ? new GetUserRequest(user.OnlineID, ruleset) : new GetUserRequest(user.Username, ruleset);
-            userReq.Success += u => userLoadComplete(u, ruleset);
-            API.Queue(userReq);
-            loadingLayer.Show();
+                API.Queue(userReq);
+                loadingLayer.Show();
+            }
         }
 
         private void userLoadComplete(APIUser loadedUser, IRulesetInfo? userRuleset)

From ad6af1d9b74302b1d0396baba0fad68f31f88441 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 12:03:42 +0900
Subject: [PATCH 1667/2296] Ensure only run once

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

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index d978fe905f..9840551d9f 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Overlays
             apiState.BindValueChanged(state => Schedule(() =>
             {
                 if (state.NewValue == APIState.Online && user != null)
-                    fetchAndSetContent();
+                    Scheduler.AddOnce(fetchAndSetContent);
             }));
         }
 
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays
             ruleset = userRuleset;
 
             Show();
-            fetchAndSetContent();
+            Scheduler.AddOnce(fetchAndSetContent);
         }
 
         private void fetchAndSetContent()

From cb4568c4a1e7d12fea7dda4a643878e9c2bae675 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 16 Nov 2023 20:21:11 +0900
Subject: [PATCH 1668/2296] Fix first object after break not starting a new
 combo

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 15 ++++++++++++
 .../TestSceneHitObjectAccentColour.cs         |  3 ---
 .../Resources/break-between-objects.osu       | 15 ++++++++++++
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 23 +++++++++++++++++++
 .../Objects/Legacy/Catch/ConvertHit.cs        |  6 +----
 .../Objects/Legacy/Catch/ConvertSlider.cs     |  6 +----
 .../Objects/Legacy/Catch/ConvertSpinner.cs    |  6 +----
 .../Objects/Legacy/ConvertHitObject.cs        |  7 +++++-
 .../Rulesets/Objects/Legacy/Osu/ConvertHit.cs |  6 +----
 .../Objects/Legacy/Osu/ConvertSlider.cs       |  6 +----
 .../Objects/Legacy/Osu/ConvertSpinner.cs      |  6 +----
 11 files changed, 65 insertions(+), 34 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/break-between-objects.osu

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 66151a51e6..be1993957f 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -1093,5 +1093,20 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(hitObject.Samples.Select(s => s.Volume), Has.All.EqualTo(70));
             }
         }
+
+        [Test]
+        public void TestNewComboAfterBreak()
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("break-between-objects.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var beatmap = decoder.Decode(stream);
+                Assert.That(((IHasCombo)beatmap.HitObjects[0]).NewCombo, Is.True);
+                Assert.That(((IHasCombo)beatmap.HitObjects[1]).NewCombo, Is.True);
+                Assert.That(((IHasCombo)beatmap.HitObjects[2]).NewCombo, Is.False);
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index f38c2c9416..acb14f86fc 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -94,9 +94,6 @@ namespace osu.Game.Tests.Gameplay
 
         private class TestHitObjectWithCombo : ConvertHitObject, IHasComboInformation
         {
-            public bool NewCombo { get; set; }
-            public int ComboOffset => 0;
-
             public Bindable<int> IndexInCurrentComboBindable { get; } = new Bindable<int>();
 
             public int IndexInCurrentCombo
diff --git a/osu.Game.Tests/Resources/break-between-objects.osu b/osu.Game.Tests/Resources/break-between-objects.osu
new file mode 100644
index 0000000000..91821e2c58
--- /dev/null
+++ b/osu.Game.Tests/Resources/break-between-objects.osu
@@ -0,0 +1,15 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[Events]
+2,200,1200
+
+[TimingPoints]
+0,307.692307692308,4,2,1,60,1,0
+
+[HitObjects]
+142,99,0,1,0,0:0:0:0:
+323,88,3000,1,0,0:0:0:0:
+323,88,4000,1,0,0:0:0:0:
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 8c5e4971d5..1ee4670ae2 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -93,6 +93,8 @@ namespace osu.Game.Beatmaps.Formats
             // The parsing order of hitobjects matters in mania difficulty calculation
             this.beatmap.HitObjects = this.beatmap.HitObjects.OrderBy(h => h.StartTime).ToList();
 
+            postProcessBreaks(this.beatmap);
+
             foreach (var hitObject in this.beatmap.HitObjects)
             {
                 applyDefaults(hitObject);
@@ -100,6 +102,27 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
+        /// <summary>
+        /// Processes the beatmap such that a new combo is started the first hitobject following each break.
+        /// </summary>
+        private void postProcessBreaks(Beatmap beatmap)
+        {
+            int currentBreak = 0;
+            bool forceNewCombo = false;
+
+            foreach (var h in beatmap.HitObjects.OfType<ConvertHitObject>())
+            {
+                while (currentBreak < beatmap.Breaks.Count && beatmap.Breaks[currentBreak].EndTime < h.StartTime)
+                {
+                    forceNewCombo = true;
+                    currentBreak++;
+                }
+
+                h.NewCombo |= forceNewCombo;
+                forceNewCombo = false;
+            }
+        }
+
         private void applyDefaults(HitObject hitObject)
         {
             DifficultyControlPoint difficultyControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.DifficultyPointAt(hitObject.StartTime) ?? DifficultyControlPoint.DEFAULT;
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs
index 12b4812824..96c779e79b 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs
@@ -9,16 +9,12 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
     /// <summary>
     /// Legacy osu!catch Hit-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertHit : ConvertHitObject, IHasPosition, IHasCombo
+    internal sealed class ConvertHit : ConvertHitObject, IHasPosition
     {
         public float X => Position.X;
 
         public float Y => Position.Y;
 
         public Vector2 Position { get; set; }
-
-        public bool NewCombo { get; set; }
-
-        public int ComboOffset { get; set; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs
index fb1afed3b4..bcf1c7fae2 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSlider.cs
@@ -9,16 +9,12 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
     /// <summary>
     /// Legacy osu!catch Slider-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasCombo
+    internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition
     {
         public float X => Position.X;
 
         public float Y => Position.Y;
 
         public Vector2 Position { get; set; }
-
-        public bool NewCombo { get; set; }
-
-        public int ComboOffset { get; set; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
index 014494ec54..5ef3d51cb3 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
@@ -8,16 +8,12 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
     /// <summary>
     /// Legacy osu!catch Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration, IHasXPosition, IHasCombo
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration, IHasXPosition
     {
         public double EndTime => StartTime + Duration;
 
         public double Duration { get; set; }
 
         public float X => 256; // Required for CatchBeatmapConverter
-
-        public bool NewCombo { get; set; }
-
-        public int ComboOffset { get; set; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs
index 54dbd28c76..bb36aab0b3 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Objects.Legacy
@@ -9,8 +10,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
     /// <summary>
     /// A hit object only used for conversion, not actual gameplay.
     /// </summary>
-    internal abstract class ConvertHitObject : HitObject
+    internal abstract class ConvertHitObject : HitObject, IHasCombo
     {
+        public bool NewCombo { get; set; }
+
+        public int ComboOffset { get; set; }
+
         public override Judgement CreateJudgement() => new IgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
index 069366bad3..b7cd4b0dcc 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
@@ -9,16 +9,12 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Hit-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertHit : ConvertHitObject, IHasPosition, IHasCombo
+    internal sealed class ConvertHit : ConvertHitObject, IHasPosition
     {
         public Vector2 Position { get; set; }
 
         public float X => Position.X;
 
         public float Y => Position.Y;
-
-        public bool NewCombo { get; set; }
-
-        public int ComboOffset { get; set; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
index 790af6cfc1..8c37154f95 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Slider-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasCombo, IHasGenerateTicks
+    internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasPosition, IHasGenerateTicks
     {
         public Vector2 Position { get; set; }
 
@@ -17,10 +17,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
 
         public float Y => Position.Y;
 
-        public bool NewCombo { get; set; }
-
-        public int ComboOffset { get; set; }
-
         public bool GenerateTicks { get; set; } = true;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
index e9e5ca8c94..d6e24b6bbf 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration, IHasPosition, IHasCombo
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasDuration, IHasPosition
     {
         public double Duration { get; set; }
 
@@ -20,9 +20,5 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
         public float X => Position.X;
 
         public float Y => Position.Y;
-
-        public bool NewCombo { get; set; }
-
-        public int ComboOffset { get; set; }
     }
 }

From f7fce1d714dc4d849aef066abe62d1feb4a3145f Mon Sep 17 00:00:00 2001
From: cs <cedric.schneider@pmbs.de>
Date: Wed, 22 Nov 2023 09:55:32 +0100
Subject: [PATCH 1669/2296] Fix freehand-drawn sliders with distance snap

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 63370350ed..c35c6fdf95 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -175,6 +175,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             if (controlPointCount > 2 || (controlPointCount == 2 && HitObject.Path.ControlPoints.Last() != cursor))
                 return base.OnDragStart(e);
 
+            HitObject.Position = ToLocalSpace(e.ScreenSpaceMouseDownPosition);
             bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMouseDownPosition) - HitObject.Position);
             state = SliderPlacementState.Drawing;
             return true;

From 95b12082aed0bb40e998f8b0402be77cfb4639e1 Mon Sep 17 00:00:00 2001
From: cs <cedric.schneider@pmbs.de>
Date: Wed, 22 Nov 2023 10:14:44 +0100
Subject: [PATCH 1670/2296] Update to respect distance snap

This will cause freehand drawing to respect distance snap, instead
changing the drawn path to start from the sliders start position
and "snap" in a linear fashion to the cursor position from the
position indicated by distance snap
---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index c35c6fdf95..ac7b5e63e1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             if (controlPointCount > 2 || (controlPointCount == 2 && HitObject.Path.ControlPoints.Last() != cursor))
                 return base.OnDragStart(e);
 
-            HitObject.Position = ToLocalSpace(e.ScreenSpaceMouseDownPosition);
+            bSplineBuilder.AddLinearPoint(Vector2.Zero);
             bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMouseDownPosition) - HitObject.Position);
             state = SliderPlacementState.Drawing;
             return true;

From aa8dc6bd8061a1eafa591b00fbefa706559e283a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 21:46:35 +0900
Subject: [PATCH 1671/2296] Attempt to fix intermittent failures on new tests

See https://github.com/ppy/osu/pull/25418/checks?check_run_id=18886372597.
---
 .../Visual/Editing/TestSceneOpenEditorTimestamp.cs        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index b6f89ee4e7..2c8655a5f5 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Editing
             RulesetInfo rulesetInfo = new OsuRuleset().RulesetInfo;
 
             addStepClickLink("00:00:000", waitForSeek: false);
-            AddAssert("received 'must be in edit'",
+            AddUntilStep("received 'must be in edit'",
                 () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEditorToHandleLinks),
                 () => Is.EqualTo(1));
 
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddUntilStep("entered song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
 
             addStepClickLink("00:00:000 (1)", waitForSeek: false);
-            AddAssert("received 'must be in edit'",
+            AddUntilStep("received 'must be in edit'",
                 () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEditorToHandleLinks),
                 () => Is.EqualTo(2));
 
@@ -47,12 +47,12 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("ruleset is osu!", () => editorBeatmap.BeatmapInfo.Ruleset.Equals(rulesetInfo));
 
             addStepClickLink("00:000", "invalid link", waitForSeek: false);
-            AddAssert("received 'failed to process'",
+            AddUntilStep("received 'failed to process'",
                 () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToParseEditorLink),
                 () => Is.EqualTo(1));
 
             addStepClickLink("50000:00:000", "too long link", waitForSeek: false);
-            AddAssert("received 'failed to process'",
+            AddUntilStep("received 'failed to process'",
                 () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.FailedToParseEditorLink),
                 () => Is.EqualTo(2));
         }

From 7bc304f20ee27d7314fc06620cf1250acebba89f Mon Sep 17 00:00:00 2001
From: yesseruser <yesseruseryt@gmail.com>
Date: Wed, 22 Nov 2023 15:25:17 +0100
Subject: [PATCH 1672/2296] Revert "Added a BaseDrawableFlag without a tooltip,
 and used it."

This reverts commit b2f74325efb4f477b42320cca8cbd380895b12da.
---
 osu.Game/Users/Drawables/BaseDrawableFlag.cs  | 29 -------------------
 .../Users/Drawables/BaseUpdateableFlag.cs     |  3 +-
 .../Drawables/ClickableUpdateableFlag.cs      |  1 -
 osu.Game/Users/Drawables/DrawableFlag.cs      | 14 ++++++---
 4 files changed, 11 insertions(+), 36 deletions(-)
 delete mode 100644 osu.Game/Users/Drawables/BaseDrawableFlag.cs

diff --git a/osu.Game/Users/Drawables/BaseDrawableFlag.cs b/osu.Game/Users/Drawables/BaseDrawableFlag.cs
deleted file mode 100644
index 90f8cd7b70..0000000000
--- a/osu.Game/Users/Drawables/BaseDrawableFlag.cs
+++ /dev/null
@@ -1,29 +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.Allocation;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
-
-namespace osu.Game.Users.Drawables
-{
-    public partial class BaseDrawableFlag : Sprite
-    {
-        protected readonly CountryCode CountryCode;
-
-        public BaseDrawableFlag(CountryCode countryCode)
-        {
-            CountryCode = countryCode;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore ts)
-        {
-            ArgumentNullException.ThrowIfNull(ts);
-
-            string textureName = CountryCode == CountryCode.Unknown ? "__" : CountryCode.ToString();
-            Texture = ts.Get($@"Flags/{textureName}") ?? ts.Get(@"Flags/__");
-        }
-    }
-}
diff --git a/osu.Game/Users/Drawables/BaseUpdateableFlag.cs b/osu.Game/Users/Drawables/BaseUpdateableFlag.cs
index 3a27238b19..16a368c60c 100644
--- a/osu.Game/Users/Drawables/BaseUpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/BaseUpdateableFlag.cs
@@ -34,8 +34,7 @@ namespace osu.Game.Users.Drawables
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    // This is a BaseDrawableFlag which does not show a tooltip.
-                    new BaseDrawableFlag(countryCode)
+                    new DrawableFlag(countryCode)
                     {
                         RelativeSizeAxes = Axes.Both
                     },
diff --git a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs b/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
index 2eaa3661d1..e00fe3c009 100644
--- a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
@@ -34,7 +34,6 @@ namespace osu.Game.Users.Drawables
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    // This is a DrawableFlag which implements IHasTooltip, so a tooltip is shown.
                     new DrawableFlag(countryCode)
                     {
                         RelativeSizeAxes = Axes.Both
diff --git a/osu.Game/Users/Drawables/DrawableFlag.cs b/osu.Game/Users/Drawables/DrawableFlag.cs
index aef34c093f..289f68ee7f 100644
--- a/osu.Game/Users/Drawables/DrawableFlag.cs
+++ b/osu.Game/Users/Drawables/DrawableFlag.cs
@@ -5,23 +5,29 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class DrawableFlag : BaseDrawableFlag, IHasTooltip
+    public partial class DrawableFlag : Sprite, IHasTooltip
     {
-        public LocalisableString TooltipText => CountryCode == CountryCode.Unknown ? string.Empty : CountryCode.GetDescription();
+        private readonly CountryCode countryCode;
 
-        public DrawableFlag(CountryCode countryCode) : base(countryCode) { }
+        public LocalisableString TooltipText => countryCode == CountryCode.Unknown ? string.Empty : countryCode.GetDescription();
+
+        public DrawableFlag(CountryCode countryCode)
+        {
+            this.countryCode = countryCode;
+        }
 
         [BackgroundDependencyLoader]
         private void load(TextureStore ts)
         {
             ArgumentNullException.ThrowIfNull(ts);
 
-            string textureName = CountryCode == CountryCode.Unknown ? "__" : CountryCode.ToString();
+            string textureName = countryCode == CountryCode.Unknown ? "__" : countryCode.ToString();
             Texture = ts.Get($@"Flags/{textureName}") ?? ts.Get(@"Flags/__");
         }
     }

From be8b59e59d28ac99620e0252215ad7a4acf82604 Mon Sep 17 00:00:00 2001
From: yesseruser <yesseruseryt@gmail.com>
Date: Wed, 22 Nov 2023 15:25:35 +0100
Subject: [PATCH 1673/2296] Revert "Created and implemened a
 BaseUpdateableFlag."

This reverts commit cd7e0bf620c0fd1617f1d99038dbbb85e52acd39.
---
 osu.Game/Screens/Play/HUD/PlayerFlag.cs       |  4 +-
 .../Users/Drawables/BaseUpdateableFlag.cs     | 45 -------------------
 .../Drawables/ClickableUpdateableFlag.cs      | 13 +++++-
 3 files changed, 14 insertions(+), 48 deletions(-)
 delete mode 100644 osu.Game/Users/Drawables/BaseUpdateableFlag.cs

diff --git a/osu.Game/Screens/Play/HUD/PlayerFlag.cs b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
index f0fe8ad668..7234db71b5 100644
--- a/osu.Game/Screens/Play/HUD/PlayerFlag.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class PlayerFlag : CompositeDrawable, ISerialisableDrawable
     {
-        private readonly BaseUpdateableFlag flag;
+        private readonly ClickableUpdateableFlag flag;
 
         private const float default_size = 40f;
 
         public PlayerFlag()
         {
             Size = new Vector2(default_size, default_size / 1.4f);
-            InternalChild = flag = new BaseUpdateableFlag
+            InternalChild = flag = new ClickableUpdateableFlag
             {
                 RelativeSizeAxes = Axes.Both,
             };
diff --git a/osu.Game/Users/Drawables/BaseUpdateableFlag.cs b/osu.Game/Users/Drawables/BaseUpdateableFlag.cs
deleted file mode 100644
index 16a368c60c..0000000000
--- a/osu.Game/Users/Drawables/BaseUpdateableFlag.cs
+++ /dev/null
@@ -1,45 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-
-namespace osu.Game.Users.Drawables
-{
-    public partial class BaseUpdateableFlag : ModelBackedDrawable<CountryCode>
-    {
-        public CountryCode CountryCode
-        {
-            get => Model;
-            set => Model = value;
-        }
-
-        /// <summary>
-        /// Whether to show a place holder on unknown country.
-        /// </summary>
-        public bool ShowPlaceholderOnUnknown = true;
-
-        public BaseUpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
-        {
-            CountryCode = countryCode;
-        }
-
-        protected override Drawable? CreateDrawable(CountryCode countryCode)
-        {
-            if (countryCode == CountryCode.Unknown && !ShowPlaceholderOnUnknown)
-                return null;
-
-            return new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new DrawableFlag(countryCode)
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                }
-            };
-        }
-    }
-}
diff --git a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs b/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
index e00fe3c009..d19234fc17 100644
--- a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
@@ -11,8 +11,19 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class ClickableUpdateableFlag : BaseUpdateableFlag
+    public partial class ClickableUpdateableFlag : ModelBackedDrawable<CountryCode>
     {
+        public CountryCode CountryCode
+        {
+            get => Model;
+            set => Model = value;
+        }
+
+        /// <summary>
+        /// Whether to show a place holder on unknown country.
+        /// </summary>
+        public bool ShowPlaceholderOnUnknown = true;
+
         /// <summary>
         /// Perform an action in addition to showing the country ranking.
         /// This should be used to perform auxiliary tasks and not as a primary action for clicking a flag (to maintain a consistent UX).

From 08e0279d72d1f76f099c3cda6f6dd0c086123501 Mon Sep 17 00:00:00 2001
From: yesseruser <yesseruseryt@gmail.com>
Date: Wed, 22 Nov 2023 15:25:43 +0100
Subject: [PATCH 1674/2296] Revert "Renamed UpdateableFlag to
 ClickableUpdateableFlag."

This reverts commit 671177e87120e4cacba35f824950d0847cbeacf6.
---
 osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs          | 2 +-
 osu.Game/Online/Leaderboards/LeaderboardScore.cs              | 2 +-
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs             | 2 +-
 osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs    | 4 ++--
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs        | 4 ++--
 osu.Game/Overlays/Rankings/CountryPill.cs                     | 4 ++--
 osu.Game/Overlays/Rankings/Tables/RankingsTable.cs            | 2 +-
 .../OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs   | 2 +-
 osu.Game/Screens/Play/HUD/PlayerFlag.cs                       | 4 ++--
 .../{ClickableUpdateableFlag.cs => UpdateableFlag.cs}         | 4 ++--
 osu.Game/Users/ExtendedUserPanel.cs                           | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)
 rename osu.Game/Users/Drawables/{ClickableUpdateableFlag.cs => UpdateableFlag.cs} (91%)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
index 7a7679c376..0bc71924ce 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoginOverlay.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Menus
 
             AddStep("click on flag", () =>
             {
-                InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<ClickableUpdateableFlag>().First());
+                InputManager.MoveMouseTo(loginOverlay.ChildrenOfType<UpdateableFlag>().First());
                 InputManager.Click(MouseButton.Left);
             });
             AddAssert("login overlay is hidden", () => loginOverlay.State.Value == Visibility.Hidden);
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 114ef5db22..136c9cc8e7 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Online.Leaderboards
                                                     Masking = true,
                                                     Children = new Drawable[]
                                                     {
-                                                        new ClickableUpdateableFlag(user.CountryCode)
+                                                        new UpdateableFlag(user.CountryCode)
                                                         {
                                                             Anchor = Anchor.CentreLeft,
                                                             Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index e144a55a96..1fc997fdad 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     Margin = new MarginPadding { Right = horizontal_inset },
                     Text = score.DisplayAccuracy,
                 },
-                new ClickableUpdateableFlag(score.User.CountryCode)
+                new UpdateableFlag(score.User.CountryCode)
                 {
                     Size = new Vector2(19, 14),
                     ShowPlaceholderOnUnknown = false,
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index e38e6efd06..9dc2ce204f 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly UpdateableAvatar avatar;
         private readonly LinkFlowContainer usernameText;
         private readonly DrawableDate achievedOn;
-        private readonly ClickableUpdateableFlag flag;
+        private readonly UpdateableFlag flag;
 
         public TopScoreUserSection()
         {
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                     },
                                 }
                             },
-                            flag = new ClickableUpdateableFlag
+                            flag = new UpdateableFlag
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 15aaf333f4..36bd8a5af5 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Profile.Header
         private OsuSpriteText usernameText = null!;
         private ExternalLinkButton openUserExternally = null!;
         private OsuSpriteText titleText = null!;
-        private ClickableUpdateableFlag userFlag = null!;
+        private UpdateableFlag userFlag = null!;
         private OsuHoverContainer userCountryContainer = null!;
         private OsuSpriteText userCountryText = null!;
         private GroupBadgeFlow groupBadgeFlow = null!;
@@ -162,7 +162,7 @@ namespace osu.Game.Overlays.Profile.Header
                                                     Direction = FillDirection.Horizontal,
                                                     Children = new Drawable[]
                                                     {
-                                                        userFlag = new ClickableUpdateableFlag
+                                                        userFlag = new UpdateableFlag
                                                         {
                                                             Size = new Vector2(28, 20),
                                                             ShowPlaceholderOnUnknown = false,
diff --git a/osu.Game/Overlays/Rankings/CountryPill.cs b/osu.Game/Overlays/Rankings/CountryPill.cs
index bfa7363de8..294b6df34d 100644
--- a/osu.Game/Overlays/Rankings/CountryPill.cs
+++ b/osu.Game/Overlays/Rankings/CountryPill.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Rankings
 
         private readonly Container content;
         private readonly Box background;
-        private readonly ClickableUpdateableFlag flag;
+        private readonly UpdateableFlag flag;
         private readonly OsuSpriteText countryName;
 
         public CountryPill()
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.Rankings
                                 Spacing = new Vector2(5, 0),
                                 Children = new Drawable[]
                                 {
-                                    flag = new ClickableUpdateableFlag
+                                    flag = new UpdateableFlag
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
index b68ecd709a..27d894cdc2 100644
--- a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Overlays.Rankings.Tables
             Margin = new MarginPadding { Bottom = row_spacing },
             Children = new[]
             {
-                new ClickableUpdateableFlag(GetCountryCode(item))
+                new UpdateableFlag(GetCountryCode(item))
                 {
                     Size = new Vector2(28, 20),
                     ShowPlaceholderOnUnknown = false,
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 1f922073ec..c79c210e30 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                             FillMode = FillMode.Fit,
                                             User = user
                                         },
-                                        new ClickableUpdateableFlag
+                                        new UpdateableFlag
                                         {
                                             Anchor = Anchor.CentreLeft,
                                             Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Screens/Play/HUD/PlayerFlag.cs b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
index 7234db71b5..85799c03d3 100644
--- a/osu.Game/Screens/Play/HUD/PlayerFlag.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class PlayerFlag : CompositeDrawable, ISerialisableDrawable
     {
-        private readonly ClickableUpdateableFlag flag;
+        private readonly UpdateableFlag flag;
 
         private const float default_size = 40f;
 
         public PlayerFlag()
         {
             Size = new Vector2(default_size, default_size / 1.4f);
-            InternalChild = flag = new ClickableUpdateableFlag
+            InternalChild = flag = new UpdateableFlag
             {
                 RelativeSizeAxes = Axes.Both,
             };
diff --git a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs b/osu.Game/Users/Drawables/UpdateableFlag.cs
similarity index 91%
rename from osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
rename to osu.Game/Users/Drawables/UpdateableFlag.cs
index d19234fc17..8f8d7052e5 100644
--- a/osu.Game/Users/Drawables/ClickableUpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/UpdateableFlag.cs
@@ -11,7 +11,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Users.Drawables
 {
-    public partial class ClickableUpdateableFlag : ModelBackedDrawable<CountryCode>
+    public partial class UpdateableFlag : ModelBackedDrawable<CountryCode>
     {
         public CountryCode CountryCode
         {
@@ -30,7 +30,7 @@ namespace osu.Game.Users.Drawables
         /// </summary>
         public Action? Action;
 
-        public ClickableUpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
+        public UpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
         {
             CountryCode = countryCode;
         }
diff --git a/osu.Game/Users/ExtendedUserPanel.cs b/osu.Game/Users/ExtendedUserPanel.cs
index e798c8cc11..3c1b68f9ef 100644
--- a/osu.Game/Users/ExtendedUserPanel.cs
+++ b/osu.Game/Users/ExtendedUserPanel.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Users
 
         protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar(User, false);
 
-        protected ClickableUpdateableFlag CreateFlag() => new ClickableUpdateableFlag(User.CountryCode)
+        protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.CountryCode)
         {
             Size = new Vector2(36, 26),
             Action = Action,

From 82fec4194d9cb676baa2ad8e35a863d21010394a Mon Sep 17 00:00:00 2001
From: yesseruser <yesseruseryt@gmail.com>
Date: Wed, 22 Nov 2023 15:45:32 +0100
Subject: [PATCH 1675/2296] Disabled RecievePositionalInputAtSubTree in
 PlayerFlag.

---
 osu.Game/Screens/Play/HUD/PlayerFlag.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/PlayerFlag.cs b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
index 85799c03d3..70ad078e34 100644
--- a/osu.Game/Screens/Play/HUD/PlayerFlag.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Screens.Play.HUD
 {
     public partial class PlayerFlag : CompositeDrawable, ISerialisableDrawable
     {
+        protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => false;
+
         private readonly UpdateableFlag flag;
 
         private const float default_size = 40f;

From 9fd0641238fe8f21ade0528476245d2e23205f56 Mon Sep 17 00:00:00 2001
From: Rowe Wilson Frederisk Holme <frederisk@outlook.com>
Date: Thu, 23 Nov 2023 01:18:55 +0800
Subject: [PATCH 1676/2296] Remove manual changes to Xcode versions in CI

---
 .github/workflows/ci.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 11c956bb71..103e4dbc30 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -127,24 +127,14 @@ jobs:
 
   build-only-ios:
     name: Build only (iOS)
-    # `macos-13` is required, because Xcode 14.3 is required (see below).
-    # TODO: can be changed to `macos-latest` once `macos-13` becomes latest (currently in beta)
+    # `macos-13` is required, because the newest Microsoft.iOS.Sdk versions require Xcode 14.3.
+    # TODO: can be changed to `macos-latest` once `macos-13` becomes latest (currently in beta: https://github.com/actions/runner-images/tree/main#available-images)
     runs-on: macos-13
     timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      # newest Microsoft.iOS.Sdk versions require Xcode 14.3.
-      # 14.3 is currently not the default Xcode version (https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode),
-      # so set it manually.
-      # TODO: remove when 14.3 becomes the default Xcode version.
-      - name: Set Xcode version
-        shell: bash
-        run: |
-          sudo xcode-select -s "/Applications/Xcode_14.3.app"
-          echo "MD_APPLE_SDK_ROOT=/Applications/Xcode_14.3.app" >> $GITHUB_ENV
-
       - name: Install .NET 6.0.x
         uses: actions/setup-dotnet@v3
         with:

From 3441a9a5b50bc5093dd06c232a96c4a4cbb5ccc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 23 Nov 2023 08:12:34 +0900
Subject: [PATCH 1677/2296] Add test coverage for classic scoring overflowing
 in osu! ruleset

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index cba90b2ebe..c957ddd7d3 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -10,14 +10,17 @@ using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Difficulty;
 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.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Tests.Beatmaps;
@@ -117,6 +120,35 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.That(scoreProcessor.GetDisplayScore(scoringMode), Is.EqualTo(expectedScore).Within(0.5d));
         }
 
+        [TestCase(typeof(OsuRuleset))]
+        [TestCase(typeof(TaikoRuleset))]
+        [TestCase(typeof(CatchRuleset))]
+        [TestCase(typeof(ManiaRuleset))]
+        public void TestBeatmapWithALotOfObjectsDoesNotOverflowClassicScore(Type rulesetType)
+        {
+            const int object_count = 999999;
+
+            var ruleset = (Ruleset)Activator.CreateInstance(rulesetType)!;
+            scoreProcessor = new ScoreProcessor(ruleset);
+
+            var largeBeatmap = new TestBeatmap(ruleset.RulesetInfo)
+            {
+                HitObjects = new List<HitObject>(Enumerable.Repeat(new TestHitObject(HitResult.Great), object_count))
+            };
+            scoreProcessor.ApplyBeatmap(largeBeatmap);
+
+            for (int i = 0; i < object_count; ++i)
+            {
+                var judgementResult = new JudgementResult(largeBeatmap.HitObjects[i], largeBeatmap.HitObjects[i].CreateJudgement())
+                {
+                    Type = HitResult.Great
+                };
+                scoreProcessor.ApplyResult(judgementResult);
+            }
+
+            Assert.That(scoreProcessor.GetDisplayScore(ScoringMode.Classic), Is.GreaterThan(0));
+        }
+
         [Test]
         public void TestEmptyBeatmap(
             [Values(ScoringMode.Standardised, ScoringMode.Classic)]

From e28e0ef1cc5847ef4c596ea380c77270089bbcef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 23 Nov 2023 08:15:46 +0900
Subject: [PATCH 1678/2296] Fix classic scoring overflowing in osu! ruleset due
 to integer multiplication overflow

Closes https://github.com/ppy/osu/issues/25545.
---
 osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
index f6ea5aa455..07c35a334f 100644
--- a/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
+++ b/osu.Game/Scoring/Legacy/ScoreInfoExtensions.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Scoring.Legacy
             switch (rulesetId)
             {
                 case 0:
-                    return (long)Math.Round((objectCount * objectCount * 32.57 + 100000) * standardisedTotalScore / ScoreProcessor.MAX_SCORE);
+                    return (long)Math.Round((Math.Pow(objectCount, 2) * 32.57 + 100000) * standardisedTotalScore / ScoreProcessor.MAX_SCORE);
 
                 case 1:
                     return (long)Math.Round((objectCount * 1109 + 100000) * standardisedTotalScore / ScoreProcessor.MAX_SCORE);

From 4edaaa30839a203eded9bfc16e1dee88b3fb6456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 23 Nov 2023 09:45:38 +0900
Subject: [PATCH 1679/2296] Add test coverage of skin editor copy-paste

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 9cd87932c8..3c97700fb0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -335,6 +335,40 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("value is less than default", () => hitErrorMeter.JudgementLineThickness.Value < hitErrorMeter.JudgementLineThickness.Default);
         }
 
+        [Test]
+        public void TestCopyPaste()
+        {
+            AddStep("paste", () =>
+            {
+                InputManager.PressKey(Key.LControl);
+                InputManager.Key(Key.V);
+                InputManager.ReleaseKey(Key.LControl);
+            });
+            // no assertions. just make sure nothing crashes.
+
+            AddStep("select bar hit error blueprint", () =>
+            {
+                var blueprint = skinEditor.ChildrenOfType<SkinBlueprint>().First(b => b.Item is BarHitErrorMeter);
+                skinEditor.SelectedComponents.Clear();
+                skinEditor.SelectedComponents.Add(blueprint.Item);
+            });
+            AddStep("copy", () =>
+            {
+                InputManager.PressKey(Key.LControl);
+                InputManager.Key(Key.C);
+                InputManager.ReleaseKey(Key.LControl);
+            });
+            AddStep("paste", () =>
+            {
+                InputManager.PressKey(Key.LControl);
+                InputManager.Key(Key.V);
+                InputManager.ReleaseKey(Key.LControl);
+            });
+            AddAssert("three hit error meters present",
+                () => skinEditor.ChildrenOfType<SkinBlueprint>().Count(b => b.Item is BarHitErrorMeter),
+                () => Is.EqualTo(3));
+        }
+
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
 
         private partial class TestSkinEditorChangeHandler : SkinEditorChangeHandler

From abbcdaa7f7ad076053daa246668e5020fd8e3462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 23 Nov 2023 09:55:27 +0900
Subject: [PATCH 1680/2296] Fix skin editor crashing when pasting with nothing
 in clipboard

---
 osu.Game/Overlays/SkinEditor/SkinEditor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index a816031668..f972186333 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -510,6 +510,9 @@ namespace osu.Game.Overlays.SkinEditor
 
         protected void Paste()
         {
+            if (!canPaste.Value)
+                return;
+
             changeHandler?.BeginChange();
 
             var drawableInfo = JsonConvert.DeserializeObject<SerialisedDrawableInfo[]>(clipboard.Content.Value);

From e8d3d26d1607d381718ae0bf3650aa6ad6239c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 23 Nov 2023 09:26:31 +0900
Subject: [PATCH 1681/2296] Fix slider length not updating when adding new
 anchor via ctrl-click

---
 .../Components/PathControlPointVisualiser.cs  | 12 ++++-----
 .../Sliders/SliderSelectionBlueprint.cs       | 27 +++++++++++++------
 2 files changed, 25 insertions(+), 14 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 1a94d6253d..3add95b2b2 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -159,9 +159,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                             if (allowSelection)
                                 d.RequestSelection = selectionRequested;
 
-                            d.DragStarted = dragStarted;
-                            d.DragInProgress = dragInProgress;
-                            d.DragEnded = dragEnded;
+                            d.DragStarted = DragStarted;
+                            d.DragInProgress = DragInProgress;
+                            d.DragEnded = DragEnded;
                         }));
 
                         Connections.Add(new PathControlPointConnectionPiece<T>(hitObject, e.NewStartingIndex + i));
@@ -267,7 +267,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         private int draggedControlPointIndex;
         private HashSet<PathControlPoint> selectedControlPoints;
 
-        private void dragStarted(PathControlPoint controlPoint)
+        public void DragStarted(PathControlPoint controlPoint)
         {
             dragStartPositions = hitObject.Path.ControlPoints.Select(point => point.Position).ToArray();
             dragPathTypes = hitObject.Path.ControlPoints.Select(point => point.Type).ToArray();
@@ -279,7 +279,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             changeHandler?.BeginChange();
         }
 
-        private void dragInProgress(DragEvent e)
+        public void DragInProgress(DragEvent e)
         {
             Vector2[] oldControlPoints = hitObject.Path.ControlPoints.Select(cp => cp.Position).ToArray();
             var oldPosition = hitObject.Position;
@@ -341,7 +341,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 hitObject.Path.ControlPoints[i].Type = dragPathTypes[i];
         }
 
-        private void dragEnded() => changeHandler?.EndChange();
+        public void DragEnded() => changeHandler?.EndChange();
 
         #endregion
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 80c4cee7f2..a4b8064f05 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -39,9 +39,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [CanBeNull]
         protected PathControlPointVisualiser<Slider> ControlPointVisualiser { get; private set; }
 
-        [Resolved(CanBeNull = true)]
-        private IPositionSnapProvider positionSnapProvider { get; set; }
-
         [Resolved(CanBeNull = true)]
         private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
@@ -191,15 +188,29 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [CanBeNull]
         private PathControlPoint placementControlPoint;
 
-        protected override bool OnDragStart(DragStartEvent e) => placementControlPoint != null;
+        protected override bool OnDragStart(DragStartEvent e)
+        {
+            if (placementControlPoint == null)
+                return base.OnDragStart(e);
+
+            ControlPointVisualiser?.DragStarted(placementControlPoint);
+            return true;
+        }
 
         protected override void OnDrag(DragEvent e)
         {
+            base.OnDrag(e);
+
             if (placementControlPoint != null)
-            {
-                var result = positionSnapProvider?.FindSnappedPositionAndTime(ToScreenSpace(e.MousePosition));
-                placementControlPoint.Position = ToLocalSpace(result?.ScreenSpacePosition ?? ToScreenSpace(e.MousePosition)) - HitObject.Position;
-            }
+                ControlPointVisualiser?.DragInProgress(e);
+        }
+
+        protected override void OnDragEnd(DragEndEvent e)
+        {
+            base.OnDragEnd(e);
+
+            if (placementControlPoint != null)
+                ControlPointVisualiser?.DragEnded();
         }
 
         protected override void OnMouseUp(MouseUpEvent e)

From 74966cae6ad9a98454731f19123a7044ff2d7e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 23 Nov 2023 10:31:58 +0900
Subject: [PATCH 1682/2296] Remove unused using directive

---
 osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs
index f810bbf155..16f28c0212 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.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 NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;

From 7998204cfe1e529bc684b54f64356882ec2c81a2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 23 Nov 2023 13:41:01 +0900
Subject: [PATCH 1683/2296] Fix combo/combo colouring issues around spinners

---
 .../Beatmaps/CatchBeatmapProcessor.cs         | 16 ++++++
 .../Objects/CatchHitObject.cs                 | 25 +++++++++
 .../Beatmaps/OsuBeatmapProcessor.cs           | 54 ++++++++++++-------
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs | 25 +++++++++
 .../Formats/LegacyBeatmapDecoderTest.cs       | 48 +++++++++++++++++
 .../Resources/spinner-between-objects.osu     | 38 +++++++++++++
 osu.Game/Beatmaps/BeatmapProcessor.cs         |  6 ---
 .../Legacy/Catch/ConvertHitObjectParser.cs    | 38 ++++---------
 .../Legacy/Osu/ConvertHitObjectParser.cs      | 38 ++++---------
 9 files changed, 210 insertions(+), 78 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/spinner-between-objects.osu

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index ab61b14ac4..7c81ca03d1 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -23,6 +23,22 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
         {
         }
 
+        public override void PreProcess()
+        {
+            IHasComboInformation? lastObj = null;
+
+            // For sanity, ensures that both the first hitobject and the first hitobject after a banana shower start a new combo.
+            // This is normally enforced by the legacy decoder, but is not enforced by the editor.
+            foreach (var obj in Beatmap.HitObjects.OfType<IHasComboInformation>())
+            {
+                if (obj is not BananaShower && (lastObj == null || lastObj is BananaShower))
+                    obj.NewCombo = true;
+                lastObj = obj;
+            }
+
+            base.PreProcess();
+        }
+
         public override void PostProcess()
         {
             base.PostProcess();
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index b9fef6bf8c..d122758a4e 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -155,6 +155,31 @@ namespace osu.Game.Rulesets.Catch.Objects
             Scale = LegacyRulesetExtensions.CalculateScaleFromCircleSize(difficulty.CircleSize);
         }
 
+        public void UpdateComboInformation(IHasComboInformation? lastObj)
+        {
+            ComboIndex = lastObj?.ComboIndex ?? 0;
+            ComboIndexWithOffsets = lastObj?.ComboIndexWithOffsets ?? 0;
+            IndexInCurrentCombo = (lastObj?.IndexInCurrentCombo + 1) ?? 0;
+
+            if (this is BananaShower)
+            {
+                // For the purpose of combo colours, spinners never start a new combo even if they are flagged as doing so.
+                return;
+            }
+
+            // At decode time, the first hitobject in the beatmap and the first hitobject after a banana shower are both enforced to be a new combo,
+            // but this isn't directly enforced by the editor so the extra checks against the last hitobject are duplicated here.
+            if (NewCombo || lastObj == null || lastObj is BananaShower)
+            {
+                IndexInCurrentCombo = 0;
+                ComboIndex++;
+                ComboIndexWithOffsets += ComboOffset + 1;
+
+                if (lastObj != null)
+                    lastObj.LastInCombo = true;
+            }
+        }
+
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
         #region Hit object conversion
diff --git a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
index c081df3ac6..835c67ff19 100644
--- a/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapProcessor.cs
@@ -2,9 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 
@@ -19,6 +21,22 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
         {
         }
 
+        public override void PreProcess()
+        {
+            IHasComboInformation? lastObj = null;
+
+            // For sanity, ensures that both the first hitobject and the first hitobject after a spinner start a new combo.
+            // This is normally enforced by the legacy decoder, but is not enforced by the editor.
+            foreach (var obj in Beatmap.HitObjects.OfType<IHasComboInformation>())
+            {
+                if (obj is not Spinner && (lastObj == null || lastObj is Spinner))
+                    obj.NewCombo = true;
+                lastObj = obj;
+            }
+
+            base.PreProcess();
+        }
+
         public override void PostProcess()
         {
             base.PostProcess();
@@ -95,15 +113,15 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
             {
                 int n = i;
                 /* We should check every note which has not yet got a stack.
-                    * Consider the case we have two interwound stacks and this will make sense.
-                    *
-                    * o <-1      o <-2
-                    *  o <-3      o <-4
-                    *
-                    * We first process starting from 4 and handle 2,
-                    * then we come backwards on the i loop iteration until we reach 3 and handle 1.
-                    * 2 and 1 will be ignored in the i loop because they already have a stack value.
-                    */
+                 * Consider the case we have two interwound stacks and this will make sense.
+                 *
+                 * o <-1      o <-2
+                 *  o <-3      o <-4
+                 *
+                 * We first process starting from 4 and handle 2,
+                 * then we come backwards on the i loop iteration until we reach 3 and handle 1.
+                 * 2 and 1 will be ignored in the i loop because they already have a stack value.
+                 */
 
                 OsuHitObject objectI = beatmap.HitObjects[i];
                 if (objectI.StackHeight != 0 || objectI is Spinner) continue;
@@ -111,9 +129,9 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                 double stackThreshold = objectI.TimePreempt * beatmap.BeatmapInfo.StackLeniency;
 
                 /* If this object is a hitcircle, then we enter this "special" case.
-                    * It either ends with a stack of hitcircles only, or a stack of hitcircles that are underneath a slider.
-                    * Any other case is handled by the "is Slider" code below this.
-                    */
+                 * It either ends with a stack of hitcircles only, or a stack of hitcircles that are underneath a slider.
+                 * Any other case is handled by the "is Slider" code below this.
+                 */
                 if (objectI is HitCircle)
                 {
                     while (--n >= 0)
@@ -135,10 +153,10 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                         }
 
                         /* This is a special case where hticircles are moved DOWN and RIGHT (negative stacking) if they are under the *last* slider in a stacked pattern.
-                            *    o==o <- slider is at original location
-                            *        o <- hitCircle has stack of -1
-                            *         o <- hitCircle has stack of -2
-                            */
+                         *    o==o <- slider is at original location
+                         *        o <- hitCircle has stack of -1
+                         *         o <- hitCircle has stack of -2
+                         */
                         if (objectN is Slider && Vector2Extensions.Distance(objectN.EndPosition, objectI.Position) < stack_distance)
                         {
                             int offset = objectI.StackHeight - objectN.StackHeight + 1;
@@ -169,8 +187,8 @@ namespace osu.Game.Rulesets.Osu.Beatmaps
                 else if (objectI is Slider)
                 {
                     /* We have hit the first slider in a possible stack.
-                        * From this point on, we ALWAYS stack positive regardless.
-                        */
+                     * From this point on, we ALWAYS stack positive regardless.
+                     */
                     while (--n >= startIndex)
                     {
                         OsuHitObject objectN = beatmap.HitObjects[n];
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index d74d28c748..716c34d024 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -159,6 +159,31 @@ namespace osu.Game.Rulesets.Osu.Objects
             Scale = LegacyRulesetExtensions.CalculateScaleFromCircleSize(difficulty.CircleSize, true);
         }
 
+        public void UpdateComboInformation(IHasComboInformation? lastObj)
+        {
+            ComboIndex = lastObj?.ComboIndex ?? 0;
+            ComboIndexWithOffsets = lastObj?.ComboIndexWithOffsets ?? 0;
+            IndexInCurrentCombo = (lastObj?.IndexInCurrentCombo + 1) ?? 0;
+
+            if (this is Spinner)
+            {
+                // For the purpose of combo colours, spinners never start a new combo even if they are flagged as doing so.
+                return;
+            }
+
+            // At decode time, the first hitobject in the beatmap and the first hitobject after a spinner are both enforced to be a new combo,
+            // but this isn't directly enforced by the editor so the extra checks against the last hitobject are duplicated here.
+            if (NewCombo || lastObj == null || lastObj is Spinner)
+            {
+                IndexInCurrentCombo = 0;
+                ComboIndex++;
+                ComboIndexWithOffsets += ComboOffset + 1;
+
+                if (lastObj != null)
+                    lastObj.LastInCombo = true;
+            }
+        }
+
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();
     }
 }
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index be1993957f..20f59384ab 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -12,6 +12,7 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.IO;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -1108,5 +1109,52 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(((IHasCombo)beatmap.HitObjects[2]).NewCombo, Is.False);
             }
         }
+
+        /// <summary>
+        /// Test cases that involve a spinner between two hitobjects.
+        /// </summary>
+        [Test]
+        public void TestSpinnerNewComboBetweenObjects([Values("osu", "catch")] string rulesetName)
+        {
+            var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
+
+            using (var resStream = TestResources.OpenResource("spinner-between-objects.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                Ruleset ruleset;
+
+                switch (rulesetName)
+                {
+                    case "osu":
+                        ruleset = new OsuRuleset();
+                        break;
+
+                    case "catch":
+                        ruleset = new CatchRuleset();
+                        break;
+
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(rulesetName), rulesetName, null);
+                }
+
+                var working = new TestWorkingBeatmap(decoder.Decode(stream));
+                var playable = working.GetPlayableBeatmap(ruleset.RulesetInfo, Array.Empty<Mod>());
+
+                // There's no good way to figure out these values other than to compare (in code) with osu!stable...
+
+                Assert.That(((IHasComboInformation)playable.HitObjects[0]).ComboIndexWithOffsets, Is.EqualTo(1));
+                Assert.That(((IHasComboInformation)playable.HitObjects[2]).ComboIndexWithOffsets, Is.EqualTo(2));
+                Assert.That(((IHasComboInformation)playable.HitObjects[3]).ComboIndexWithOffsets, Is.EqualTo(2));
+                Assert.That(((IHasComboInformation)playable.HitObjects[5]).ComboIndexWithOffsets, Is.EqualTo(3));
+                Assert.That(((IHasComboInformation)playable.HitObjects[6]).ComboIndexWithOffsets, Is.EqualTo(3));
+                Assert.That(((IHasComboInformation)playable.HitObjects[8]).ComboIndexWithOffsets, Is.EqualTo(4));
+                Assert.That(((IHasComboInformation)playable.HitObjects[9]).ComboIndexWithOffsets, Is.EqualTo(4));
+                Assert.That(((IHasComboInformation)playable.HitObjects[11]).ComboIndexWithOffsets, Is.EqualTo(5));
+                Assert.That(((IHasComboInformation)playable.HitObjects[12]).ComboIndexWithOffsets, Is.EqualTo(6));
+                Assert.That(((IHasComboInformation)playable.HitObjects[14]).ComboIndexWithOffsets, Is.EqualTo(7));
+                Assert.That(((IHasComboInformation)playable.HitObjects[15]).ComboIndexWithOffsets, Is.EqualTo(8));
+                Assert.That(((IHasComboInformation)playable.HitObjects[17]).ComboIndexWithOffsets, Is.EqualTo(9));
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Resources/spinner-between-objects.osu b/osu.Game.Tests/Resources/spinner-between-objects.osu
new file mode 100644
index 0000000000..03e61d965c
--- /dev/null
+++ b/osu.Game.Tests/Resources/spinner-between-objects.osu
@@ -0,0 +1,38 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[TimingPoints]
+0,571.428571428571,4,2,1,5,1,0
+
+[HitObjects]
+// +C -> +C -> +C
+104,95,0,5,0,0:0:0:0:
+256,192,1000,12,0,2000,0:0:0:0:
+178,171,3000,5,0,0:0:0:0:
+
+// -C -> +C -> +C
+178,171,4000,1,0,0:0:0:0:
+256,192,5000,12,0,6000,0:0:0:0:
+178,171,7000,5,0,0:0:0:0:
+
+// -C -> -C -> +C
+178,171,8000,1,0,0:0:0:0:
+256,192,9000,8,0,10000,0:0:0:0:
+178,171,11000,5,0,0:0:0:0:
+
+// -C -> -C -> -C
+178,171,12000,1,0,0:0:0:0:
+256,192,13000,8,0,14000,0:0:0:0:
+178,171,15000,1,0,0:0:0:0:
+
+// +C -> -C -> -C
+178,171,16000,5,0,0:0:0:0:
+256,192,17000,8,0,18000,0:0:0:0:
+178,171,19000,1,0,0:0:0:0:
+
+// +C -> +C -> -C
+178,171,20000,5,0,0:0:0:0:
+256,192,21000,12,0,22000,0:0:0:0:
+178,171,23000,1,0,0:0:0:0:
\ No newline at end of file
diff --git a/osu.Game/Beatmaps/BeatmapProcessor.cs b/osu.Game/Beatmaps/BeatmapProcessor.cs
index fb5313469f..89d6e9d3f8 100644
--- a/osu.Game/Beatmaps/BeatmapProcessor.cs
+++ b/osu.Game/Beatmaps/BeatmapProcessor.cs
@@ -24,12 +24,6 @@ namespace osu.Game.Beatmaps
 
             foreach (var obj in Beatmap.HitObjects.OfType<IHasComboInformation>())
             {
-                if (lastObj == null)
-                {
-                    // first hitobject should always be marked as a new combo for sanity.
-                    obj.NewCombo = true;
-                }
-
                 obj.UpdateComboInformation(lastObj);
                 lastObj = obj;
             }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
index 4861e8b3f7..0ed5aef0cf 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
@@ -14,26 +14,19 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
     /// </summary>
     public class ConvertHitObjectParser : Legacy.ConvertHitObjectParser
     {
+        private ConvertHitObject lastObject;
+
         public ConvertHitObjectParser(double offset, int formatVersion)
             : base(offset, formatVersion)
         {
         }
 
-        private bool forceNewCombo;
-        private int extraComboOffset;
-
         protected override HitObject CreateHit(Vector2 position, bool newCombo, int comboOffset)
         {
-            newCombo |= forceNewCombo;
-            comboOffset += extraComboOffset;
-
-            forceNewCombo = false;
-            extraComboOffset = 0;
-
-            return new ConvertHit
+            return lastObject = new ConvertHit
             {
                 Position = position,
-                NewCombo = newCombo,
+                NewCombo = FirstObject || lastObject is ConvertSpinner || newCombo,
                 ComboOffset = comboOffset
             };
         }
@@ -41,16 +34,10 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
         protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, PathControlPoint[] controlPoints, double? length, int repeatCount,
                                                   IList<IList<HitSampleInfo>> nodeSamples)
         {
-            newCombo |= forceNewCombo;
-            comboOffset += extraComboOffset;
-
-            forceNewCombo = false;
-            extraComboOffset = 0;
-
-            return new ConvertSlider
+            return lastObject = new ConvertSlider
             {
                 Position = position,
-                NewCombo = FirstObject || newCombo,
+                NewCombo = FirstObject || lastObject is ConvertSpinner || newCombo,
                 ComboOffset = comboOffset,
                 Path = new SliderPath(controlPoints, length),
                 NodeSamples = nodeSamples,
@@ -60,20 +47,17 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
 
         protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
-            // Convert spinners don't create the new combo themselves, but force the next non-spinner hitobject to create a new combo
-            // Their combo offset is still added to that next hitobject's combo index
-            forceNewCombo |= FormatVersion <= 8 || newCombo;
-            extraComboOffset += comboOffset;
-
-            return new ConvertSpinner
+            return lastObject = new ConvertSpinner
             {
-                Duration = duration
+                Duration = duration,
+                NewCombo = newCombo
+                // Spinners cannot have combo offset.
             };
         }
 
         protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
-            return null;
+            return lastObject = null;
         }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
index 7a88a31bd5..8bb9600a7d 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
@@ -14,26 +14,19 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// </summary>
     public class ConvertHitObjectParser : Legacy.ConvertHitObjectParser
     {
+        private ConvertHitObject lastObject;
+
         public ConvertHitObjectParser(double offset, int formatVersion)
             : base(offset, formatVersion)
         {
         }
 
-        private bool forceNewCombo;
-        private int extraComboOffset;
-
         protected override HitObject CreateHit(Vector2 position, bool newCombo, int comboOffset)
         {
-            newCombo |= forceNewCombo;
-            comboOffset += extraComboOffset;
-
-            forceNewCombo = false;
-            extraComboOffset = 0;
-
-            return new ConvertHit
+            return lastObject = new ConvertHit
             {
                 Position = position,
-                NewCombo = FirstObject || newCombo,
+                NewCombo = FirstObject || lastObject is ConvertSpinner || newCombo,
                 ComboOffset = comboOffset
             };
         }
@@ -41,16 +34,10 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
         protected override HitObject CreateSlider(Vector2 position, bool newCombo, int comboOffset, PathControlPoint[] controlPoints, double? length, int repeatCount,
                                                   IList<IList<HitSampleInfo>> nodeSamples)
         {
-            newCombo |= forceNewCombo;
-            comboOffset += extraComboOffset;
-
-            forceNewCombo = false;
-            extraComboOffset = 0;
-
-            return new ConvertSlider
+            return lastObject = new ConvertSlider
             {
                 Position = position,
-                NewCombo = FirstObject || newCombo,
+                NewCombo = FirstObject || lastObject is ConvertSpinner || newCombo,
                 ComboOffset = comboOffset,
                 Path = new SliderPath(controlPoints, length),
                 NodeSamples = nodeSamples,
@@ -60,21 +47,18 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
 
         protected override HitObject CreateSpinner(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
-            // Convert spinners don't create the new combo themselves, but force the next non-spinner hitobject to create a new combo
-            // Their combo offset is still added to that next hitobject's combo index
-            forceNewCombo |= FormatVersion <= 8 || newCombo;
-            extraComboOffset += comboOffset;
-
-            return new ConvertSpinner
+            return lastObject = new ConvertSpinner
             {
                 Position = position,
-                Duration = duration
+                Duration = duration,
+                NewCombo = newCombo
+                // Spinners cannot have combo offset.
             };
         }
 
         protected override HitObject CreateHold(Vector2 position, bool newCombo, int comboOffset, double duration)
         {
-            return null;
+            return lastObject = null;
         }
     }
 }

From 3da8a0cbed624319841b479e2cced91fa8608cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 23 Nov 2023 14:00:42 +0900
Subject: [PATCH 1684/2296] Fix undo being broken when ctrl-click and dragging
 new point

---
 .../Blueprints/Sliders/SliderSelectionBlueprint.cs    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index a4b8064f05..b3efe1c495 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -205,18 +205,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 ControlPointVisualiser?.DragInProgress(e);
         }
 
-        protected override void OnDragEnd(DragEndEvent e)
-        {
-            base.OnDragEnd(e);
-
-            if (placementControlPoint != null)
-                ControlPointVisualiser?.DragEnded();
-        }
-
         protected override void OnMouseUp(MouseUpEvent e)
         {
             if (placementControlPoint != null)
             {
+                if (IsDragged)
+                    ControlPointVisualiser?.DragEnded();
+
                 placementControlPoint = null;
                 changeHandler?.EndChange();
             }

From 191e8c5487ccd4ea1b85aa7f47e6454f5a180c1d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Nov 2023 16:39:05 +0900
Subject: [PATCH 1685/2296] Add note about skin editor reload jank

---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index cbe122395c..d1e7b97efc 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -210,6 +210,9 @@ namespace osu.Game.Overlays.SkinEditor
 
             // The skin editor doesn't work well if beatmap skins are being applied to the player screen.
             // To keep things simple, disable the setting game-wide while using the skin editor.
+            //
+            // This causes a full reload of the skin, which is pretty ugly.
+            // TODO: Investigate if we can avoid this when a beatmap skin is not being applied by the current beatmap.
             leasedBeatmapSkins = beatmapSkins.BeginLease(true);
             leasedBeatmapSkins.Value = false;
         }

From a80a5be4ec01c179069b57ee384a7196670a0f85 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Nov 2023 17:11:40 +0900
Subject: [PATCH 1686/2296] Fix a couple of new r# inspections

---
 osu.Game/Beatmaps/Beatmap.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 4f81b26c3e..0cafd4e08a 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -119,12 +119,11 @@ namespace osu.Game.Beatmaps
         IBeatmap IBeatmap.Clone() => Clone();
 
         public Beatmap<T> Clone() => (Beatmap<T>)MemberwiseClone();
+
+        public override string ToString() => BeatmapInfo.ToString();
     }
 
     public class Beatmap : Beatmap<HitObject>
     {
-        public new Beatmap Clone() => (Beatmap)base.Clone();
-
-        public override string ToString() => BeatmapInfo?.ToString() ?? base.ToString();
     }
 }

From 5239fee947435bf4fe99b43d28a7fe0118ca64b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Nov 2023 17:15:03 +0900
Subject: [PATCH 1687/2296] Allow use of skin username/flag/avatar components
 outside of gameplay

---
 osu.Game/Screens/Play/HUD/PlayerAvatar.cs  | 20 ++++++++++++++++++--
 osu.Game/Screens/Play/HUD/PlayerFlag.cs    | 22 ++++++++++++++++++++--
 osu.Game/Skinning/Components/PlayerName.cs | 21 +++++++++++++++++++--
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/PlayerAvatar.cs b/osu.Game/Screens/Play/HUD/PlayerAvatar.cs
index 1341a10d60..06d0f7bc9a 100644
--- a/osu.Game/Screens/Play/HUD/PlayerAvatar.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerAvatar.cs
@@ -7,6 +7,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Localisation.SkinComponents;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Settings;
 using osu.Game.Skinning;
 using osu.Game.Users.Drawables;
@@ -29,6 +31,14 @@ namespace osu.Game.Screens.Play.HUD
 
         private const float default_size = 80f;
 
+        [Resolved]
+        private GameplayState? gameplayState { get; set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        private IBindable<APIUser>? apiUser;
+
         public PlayerAvatar()
         {
             Size = new Vector2(default_size);
@@ -41,9 +51,15 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load(GameplayState gameplayState)
+        private void load()
         {
-            avatar.User = gameplayState.Score.ScoreInfo.User;
+            if (gameplayState != null)
+                avatar.User = gameplayState.Score.ScoreInfo.User;
+            else
+            {
+                apiUser = api.LocalUser.GetBoundCopy();
+                apiUser.BindValueChanged(u => avatar.User = u.NewValue, true);
+            }
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Play/HUD/PlayerFlag.cs b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
index 70ad078e34..c7e247d26a 100644
--- a/osu.Game/Screens/Play/HUD/PlayerFlag.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerFlag.cs
@@ -2,8 +2,11 @@
 // 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.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Skinning;
 using osu.Game.Users.Drawables;
 using osuTK;
@@ -18,9 +21,18 @@ namespace osu.Game.Screens.Play.HUD
 
         private const float default_size = 40f;
 
+        [Resolved]
+        private GameplayState? gameplayState { get; set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        private IBindable<APIUser>? apiUser;
+
         public PlayerFlag()
         {
             Size = new Vector2(default_size, default_size / 1.4f);
+
             InternalChild = flag = new UpdateableFlag
             {
                 RelativeSizeAxes = Axes.Both,
@@ -28,9 +40,15 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load(GameplayState gameplayState)
+        private void load()
         {
-            flag.CountryCode = gameplayState.Score.ScoreInfo.User.CountryCode;
+            if (gameplayState != null)
+                flag.CountryCode = gameplayState.Score.ScoreInfo.User.CountryCode;
+            else
+            {
+                apiUser = api.LocalUser.GetBoundCopy();
+                apiUser.BindValueChanged(u => flag.CountryCode = u.NewValue.CountryCode, true);
+            }
         }
 
         public bool UsesFixedAnchor { get; set; }
diff --git a/osu.Game/Skinning/Components/PlayerName.cs b/osu.Game/Skinning/Components/PlayerName.cs
index 34ace53d47..21bf615bc6 100644
--- a/osu.Game/Skinning/Components/PlayerName.cs
+++ b/osu.Game/Skinning/Components/PlayerName.cs
@@ -3,9 +3,12 @@
 
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Skinning.Components
@@ -15,6 +18,14 @@ namespace osu.Game.Skinning.Components
     {
         private readonly OsuSpriteText text;
 
+        [Resolved]
+        private GameplayState? gameplayState { get; set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        private IBindable<APIUser>? apiUser;
+
         public PlayerName()
         {
             AutoSizeAxes = Axes.Both;
@@ -30,9 +41,15 @@ namespace osu.Game.Skinning.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(GameplayState gameplayState)
+        private void load()
         {
-            text.Text = gameplayState.Score.ScoreInfo.User.Username;
+            if (gameplayState != null)
+                text.Text = gameplayState.Score.ScoreInfo.User.Username;
+            else
+            {
+                apiUser = api.LocalUser.GetBoundCopy();
+                apiUser.BindValueChanged(u => text.Text = u.NewValue.Username, true);
+            }
         }
 
         protected override void SetFont(FontUsage font) => text.Font = font.With(size: 40);

From 268b965ee890a3ea10ea152465eae6faede94e6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Nov 2023 17:28:16 +0900
Subject: [PATCH 1688/2296] Enable NRT on `Beatmap`

---
 osu.Game/Beatmaps/Beatmap.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 0cafd4e08a..6db9febf36 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.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.Timing;
 using osu.Game.Rulesets.Objects;
@@ -26,8 +24,7 @@ namespace osu.Game.Beatmaps
             {
                 difficulty = value;
 
-                if (beatmapInfo != null)
-                    beatmapInfo.Difficulty = difficulty.Clone();
+                beatmapInfo.Difficulty = difficulty.Clone();
             }
         }
 
@@ -40,8 +37,7 @@ namespace osu.Game.Beatmaps
             {
                 beatmapInfo = value;
 
-                if (beatmapInfo?.Difficulty != null)
-                    Difficulty = beatmapInfo.Difficulty.Clone();
+                Difficulty = beatmapInfo.Difficulty.Clone();
             }
         }
 

From c2a44cf1185dd28897f5488829124d7533cfb337 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Thu, 23 Nov 2023 23:30:18 +0200
Subject: [PATCH 1689/2296] Made custom tooltip

---
 .../Mods/AdjustedAttributesTooltip.cs         | 158 ++++++++++++++++++
 .../Overlays/Mods/BeatmapAttributesDisplay.cs |  46 ++---
 .../Screens/Select/Details/AdvancedStats.cs   |  38 ++---
 3 files changed, 188 insertions(+), 54 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs

diff --git a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
new file mode 100644
index 0000000000..e6a554d1fb
--- /dev/null
+++ b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
@@ -0,0 +1,158 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Framework.Utils;
+using osuTK;
+
+namespace osu.Game.Overlays.Mods
+{
+    public partial class AdjustedAttributesTooltip : CompositeDrawable, ITooltip
+    {
+        private Dictionary<string, Bindable<OldNewPair>> attributes = new Dictionary<string, Bindable<OldNewPair>>();
+
+        private Container content;
+
+        private FillFlowContainer attributesFillFlow;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+
+        public AdjustedAttributesTooltip()
+        {
+            // Need to be initialized in constructor to ensure accessability in AddAttribute function
+            InternalChild = content = new Container
+            {
+                AutoSizeAxes = Axes.Both
+            };
+            attributesFillFlow = new FillFlowContainer
+            {
+                Direction = FillDirection.Vertical,
+                AutoSizeAxes = Axes.Both
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            Masking = true;
+            CornerRadius = 15;
+
+            content.AddRange(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colours.Gray1,
+                    Alpha = 0.8f
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Padding = new MarginPadding {Vertical = 10, Horizontal = 15},
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = "One or more values are being adjusted by mods that change speed.",
+                        },
+                        attributesFillFlow
+                    }
+                }
+            });
+        }
+
+        private void checkAttributes()
+        {
+            foreach (var attribute in attributes)
+            {
+                if (!Precision.AlmostEquals(attribute.Value.Value.Old, attribute.Value.Value.New))
+                {
+                    content.Show();
+                    return;
+                }
+            }
+            content.Hide();
+        }
+
+        public void AddAttribute(string name)
+        {
+            Bindable<OldNewPair> newBindable = new Bindable<OldNewPair>();
+            newBindable.BindValueChanged(_ => checkAttributes());
+            attributes.Add(name, newBindable);
+            attributesFillFlow.Add(new AttributeDisplay(name, newBindable.GetBoundCopy()));
+        }
+        public void UpdateAttribute(string name, double oldValue, double newValue)
+        {
+            Bindable<OldNewPair> attribute = attributes[name];
+
+            OldNewPair attributeValue = attribute.Value;
+            attributeValue.Old = oldValue;
+            attributeValue.New = newValue;
+
+            attribute.Value = attributeValue;
+        }
+
+        protected override void Update()
+        {
+        }
+        public void SetContent(object content)
+        {
+        }
+
+        public void Move(Vector2 pos)
+        {
+            Position = pos;
+        }
+
+        private struct OldNewPair
+        {
+            public double Old, New;
+        }
+
+        private partial class AttributeDisplay : CompositeDrawable
+        {
+            public Bindable<OldNewPair> AttributeValues = new Bindable<OldNewPair>();
+            public string AttributeName;
+
+            private OsuSpriteText text = new OsuSpriteText
+            {
+                Font = OsuFont.Default.With(weight: FontWeight.Bold)
+            };
+            public AttributeDisplay(string name, Bindable<OldNewPair> boundCopy)
+            {
+                AutoSizeAxes = Axes.Both;
+
+                AttributeName = name;
+                AttributeValues = boundCopy;
+                InternalChild = text;
+                AttributeValues.BindValueChanged(_ => update(), true);
+            }
+
+            private void update()
+            {
+                if (Precision.AlmostEquals(AttributeValues.Value.Old, AttributeValues.Value.New))
+                {
+                    Hide();
+                }
+                else
+                {
+                    Show();
+                    text.Text = $"{AttributeName}: {(AttributeValues.Value.Old):0.0#} → {(AttributeValues.Value.New):0.0#}";
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 6270b2bb49..fa8f9cb7a4 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Configuration;
@@ -28,7 +27,7 @@ namespace osu.Game.Overlays.Mods
     /// On the mod select overlay, this provides a local updating view of BPM, star rating and other
     /// difficulty attributes so the user can have a better insight into what mods are changing.
     /// </summary>
-    public partial class BeatmapAttributesDisplay : ModFooterInformationDisplay, IHasTooltip
+    public partial class BeatmapAttributesDisplay : ModFooterInformationDisplay, IHasCustomTooltip
     {
         private StarRatingDisplay starRatingDisplay = null!;
         private BPMDisplay bpmDisplay = null!;
@@ -58,10 +57,11 @@ namespace osu.Game.Overlays.Mods
         private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
-        private BeatmapDifficulty? originalDifficulty;
-        private BeatmapDifficulty? adjustedDifficulty;
+        private AdjustedAttributesTooltip rateAdjustTooltip = null!;
+
+        public ITooltip GetCustomTooltip() => rateAdjustTooltip;
+        public object TooltipContent => this;
 
-        private bool haveRateChangedValues;
 
         private const float transition_duration = 250;
 
@@ -70,6 +70,8 @@ namespace osu.Game.Overlays.Mods
         {
             const float shear = ShearedOverlayContainer.SHEAR;
 
+            rateAdjustTooltip = new AdjustedAttributesTooltip();
+
             LeftContent.AddRange(new Drawable[]
             {
                 starRatingDisplay = new StarRatingDisplay(default, animated: true)
@@ -105,7 +107,6 @@ namespace osu.Game.Overlays.Mods
             mods.BindValueChanged(_ =>
             {
                 modSettingChangeTracker?.Dispose();
-
                 modSettingChangeTracker = new ModSettingChangeTracker(mods.Value);
                 modSettingChangeTracker.SettingChanged += _ => updateValues();
                 updateValues();
@@ -125,6 +126,9 @@ namespace osu.Game.Overlays.Mods
 
             BeatmapInfo.BindValueChanged(_ => updateValues(), true);
 
+            rateAdjustTooltip.AddAttribute("AR");
+            rateAdjustTooltip.AddAttribute("OD");
+
             updateCollapsedState();
         }
 
@@ -173,15 +177,16 @@ namespace osu.Game.Overlays.Mods
 
             bpmDisplay.Current.Value = BeatmapInfo.Value.BPM * rate;
 
-            originalDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
+            BeatmapDifficulty originalDifficulty = new BeatmapDifficulty(BeatmapInfo.Value.Difficulty);
 
             foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
                 mod.ApplyToDifficulty(originalDifficulty);
 
             Ruleset ruleset = gameRuleset.Value.CreateInstance();
-            adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
+            BeatmapDifficulty adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
 
-            haveRateChangedValues = hasRateAdjustedProperties(originalDifficulty, adjustedDifficulty);
+            rateAdjustTooltip.UpdateAttribute("AR", originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
+            rateAdjustTooltip.UpdateAttribute("OD", originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
 
             approachRateDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
             overallDifficultyDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
@@ -197,29 +202,6 @@ namespace osu.Game.Overlays.Mods
             RightContent.FadeTo(Collapsed.Value && !IsHovered ? 0 : 1, transition_duration, Easing.OutQuint);
         }
 
-        public LocalisableString TooltipText
-        {
-            get
-            {
-                if (haveRateChangedValues)
-                {
-                    return $"One or more values are being adjusted by mods that change speed." +
-                           $" (AR {originalDifficulty?.ApproachRate ?? 0}→{(adjustedDifficulty?.ApproachRate ?? 0):0.0#}, " +
-                           $"OD {originalDifficulty?.OverallDifficulty ?? 0}→{(adjustedDifficulty?.OverallDifficulty ?? 0):0.0#})";
-                }
-
-                return string.Empty;
-            }
-        }
-
-        private static bool hasRateAdjustedProperties(BeatmapDifficulty a, BeatmapDifficulty b)
-        {
-            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate)) return true;
-            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty)) return true;
-
-            return false;
-        }
-
         private partial class BPMDisplay : RollingCounter<double>
         {
             protected override double RollingDuration => 500;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index f617cb1d8e..d3a6a88c68 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -26,10 +26,11 @@ using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
+using osu.Game.Overlays.Mods;
 
 namespace osu.Game.Screens.Select.Details
 {
-    public partial class AdvancedStats : Container, IHasTooltip
+    public partial class AdvancedStats : Container, IHasCustomTooltip
     {
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
@@ -45,9 +46,9 @@ namespace osu.Game.Screens.Select.Details
         protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate;
         private readonly StatisticRow starDifficulty;
 
-        private BeatmapDifficulty originalDifficulty;
-        private BeatmapDifficulty adjustedDifficulty;
-        private bool haveRateChangedValues;
+        private AdjustedAttributesTooltip rateAdjustTooltip;
+        public ITooltip GetCustomTooltip() => rateAdjustTooltip;
+        public object TooltipContent => this;
 
         private IBeatmapInfo beatmapInfo;
 
@@ -85,6 +86,7 @@ namespace osu.Game.Screens.Select.Details
         private void load(OsuColour colours)
         {
             starDifficulty.AccentColour = colours.Yellow;
+            rateAdjustTooltip = new AdjustedAttributesTooltip();
         }
 
         protected override void LoadComplete()
@@ -99,6 +101,9 @@ namespace osu.Game.Screens.Select.Details
             gameRuleset.BindValueChanged(_ => updateStatistics());
 
             mods.BindValueChanged(modsChanged, true);
+
+            rateAdjustTooltip.AddAttribute("AR");
+            rateAdjustTooltip.AddAttribute("OD");
         }
 
         private ModSettingChangeTracker modSettingChangeTracker;
@@ -121,14 +126,17 @@ namespace osu.Game.Screens.Select.Details
         private void updateStatistics()
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
+            BeatmapDifficulty adjustedDifficulty = null;
 
             if (baseDifficulty != null)
             {
-                originalDifficulty = new BeatmapDifficulty(baseDifficulty);
+                BeatmapDifficulty originalDifficulty = new BeatmapDifficulty(baseDifficulty);
 
                 foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
                     mod.ApplyToDifficulty(originalDifficulty);
 
+                adjustedDifficulty = originalDifficulty;
+
                 if (gameRuleset != null)
                 {
                     Ruleset ruleset = gameRuleset.Value.CreateInstance();
@@ -138,7 +146,9 @@ namespace osu.Game.Screens.Select.Details
                         rate = mod.ApplyToRate(0, rate);
 
                     adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
-                    haveRateChangedValues = hasRateAdjustedProperties(originalDifficulty, adjustedDifficulty);
+
+                    rateAdjustTooltip.UpdateAttribute("AR", originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
+                    rateAdjustTooltip.UpdateAttribute("OD", originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
                 }
             }
 
@@ -204,22 +214,6 @@ namespace osu.Game.Screens.Select.Details
             starDifficultyCancellationSource?.Cancel();
         }
 
-        public LocalisableString TooltipText
-        {
-            get
-            {
-                if (haveRateChangedValues)
-                {
-                    // Rather than localising this, it should be displayed in a better way (a custom tooltip which isn't a single super-long line).
-                    return "One or more values are being adjusted by mods that change speed." +
-                           $" (AR {originalDifficulty?.ApproachRate ?? 0}→{(adjustedDifficulty?.ApproachRate ?? 0):0.0#}, " +
-                           $"OD {originalDifficulty?.OverallDifficulty ?? 0}→{(adjustedDifficulty?.OverallDifficulty ?? 0):0.0#})";
-                }
-
-                return string.Empty;
-            }
-        }
-
         private static bool hasRateAdjustedProperties(BeatmapDifficulty a, BeatmapDifficulty b)
         {
             if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate)) return true;

From 93e3156868d674dd3f9a79729c5561859d96f063 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Fri, 24 Nov 2023 01:07:37 +0200
Subject: [PATCH 1690/2296] slight format changes

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

diff --git a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
index e6a554d1fb..3e800bfaf1 100644
--- a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
+++ b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
@@ -26,7 +26,6 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
-
         public AdjustedAttributesTooltip()
         {
             // Need to be initialized in constructor to ensure accessability in AddAttribute function
@@ -60,7 +59,7 @@ namespace osu.Game.Overlays.Mods
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    Padding = new MarginPadding {Vertical = 10, Horizontal = 15},
+                    Padding = new MarginPadding { Vertical = 10, Horizontal = 15 },
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
@@ -85,6 +84,7 @@ namespace osu.Game.Overlays.Mods
                 }
             }
             content.Hide();
+
         }
 
         public void AddAttribute(string name)
@@ -94,6 +94,7 @@ namespace osu.Game.Overlays.Mods
             attributes.Add(name, newBindable);
             attributesFillFlow.Add(new AttributeDisplay(name, newBindable.GetBoundCopy()));
         }
+
         public void UpdateAttribute(string name, double oldValue, double newValue)
         {
             Bindable<OldNewPair> attribute = attributes[name];
@@ -124,7 +125,7 @@ namespace osu.Game.Overlays.Mods
 
         private partial class AttributeDisplay : CompositeDrawable
         {
-            public Bindable<OldNewPair> AttributeValues = new Bindable<OldNewPair>();
+            public readonly Bindable<OldNewPair> AttributeValues;
             public string AttributeName;
 
             private OsuSpriteText text = new OsuSpriteText

From 10e16e4b04c58774573c1b8fff66ee46b717bcdc Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 24 Nov 2023 09:46:06 +0900
Subject: [PATCH 1691/2296] Fix handling of combo offset without new combo, and
 incorrect lazer tests

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 24 +++++++++----------
 .../Resources/hitobject-combo-offset.osu      | 12 +++++-----
 .../Legacy/Catch/ConvertHitObjectParser.cs    |  4 ++--
 .../Legacy/Osu/ConvertHitObjectParser.cs      |  4 ++--
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index cccceaf58e..dcfe8ecb41 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -434,12 +434,12 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 new OsuBeatmapProcessor(converted).PreProcess();
                 new OsuBeatmapProcessor(converted).PostProcess();
 
-                Assert.AreEqual(4, ((IHasComboInformation)converted.HitObjects.ElementAt(0)).ComboIndexWithOffsets);
-                Assert.AreEqual(5, ((IHasComboInformation)converted.HitObjects.ElementAt(2)).ComboIndexWithOffsets);
-                Assert.AreEqual(5, ((IHasComboInformation)converted.HitObjects.ElementAt(4)).ComboIndexWithOffsets);
-                Assert.AreEqual(6, ((IHasComboInformation)converted.HitObjects.ElementAt(6)).ComboIndexWithOffsets);
-                Assert.AreEqual(11, ((IHasComboInformation)converted.HitObjects.ElementAt(8)).ComboIndexWithOffsets);
-                Assert.AreEqual(14, ((IHasComboInformation)converted.HitObjects.ElementAt(11)).ComboIndexWithOffsets);
+                Assert.AreEqual(1, ((IHasComboInformation)converted.HitObjects.ElementAt(0)).ComboIndexWithOffsets);
+                Assert.AreEqual(2, ((IHasComboInformation)converted.HitObjects.ElementAt(2)).ComboIndexWithOffsets);
+                Assert.AreEqual(3, ((IHasComboInformation)converted.HitObjects.ElementAt(4)).ComboIndexWithOffsets);
+                Assert.AreEqual(4, ((IHasComboInformation)converted.HitObjects.ElementAt(6)).ComboIndexWithOffsets);
+                Assert.AreEqual(8, ((IHasComboInformation)converted.HitObjects.ElementAt(8)).ComboIndexWithOffsets);
+                Assert.AreEqual(9, ((IHasComboInformation)converted.HitObjects.ElementAt(11)).ComboIndexWithOffsets);
             }
         }
 
@@ -457,12 +457,12 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 new CatchBeatmapProcessor(converted).PreProcess();
                 new CatchBeatmapProcessor(converted).PostProcess();
 
-                Assert.AreEqual(4, ((IHasComboInformation)converted.HitObjects.ElementAt(0)).ComboIndexWithOffsets);
-                Assert.AreEqual(5, ((IHasComboInformation)converted.HitObjects.ElementAt(2)).ComboIndexWithOffsets);
-                Assert.AreEqual(5, ((IHasComboInformation)converted.HitObjects.ElementAt(4)).ComboIndexWithOffsets);
-                Assert.AreEqual(6, ((IHasComboInformation)converted.HitObjects.ElementAt(6)).ComboIndexWithOffsets);
-                Assert.AreEqual(11, ((IHasComboInformation)converted.HitObjects.ElementAt(8)).ComboIndexWithOffsets);
-                Assert.AreEqual(14, ((IHasComboInformation)converted.HitObjects.ElementAt(11)).ComboIndexWithOffsets);
+                Assert.AreEqual(1, ((IHasComboInformation)converted.HitObjects.ElementAt(0)).ComboIndexWithOffsets);
+                Assert.AreEqual(2, ((IHasComboInformation)converted.HitObjects.ElementAt(2)).ComboIndexWithOffsets);
+                Assert.AreEqual(3, ((IHasComboInformation)converted.HitObjects.ElementAt(4)).ComboIndexWithOffsets);
+                Assert.AreEqual(4, ((IHasComboInformation)converted.HitObjects.ElementAt(6)).ComboIndexWithOffsets);
+                Assert.AreEqual(8, ((IHasComboInformation)converted.HitObjects.ElementAt(8)).ComboIndexWithOffsets);
+                Assert.AreEqual(9, ((IHasComboInformation)converted.HitObjects.ElementAt(11)).ComboIndexWithOffsets);
             }
         }
 
diff --git a/osu.Game.Tests/Resources/hitobject-combo-offset.osu b/osu.Game.Tests/Resources/hitobject-combo-offset.osu
index d39a3e8548..9f39229d87 100644
--- a/osu.Game.Tests/Resources/hitobject-combo-offset.osu
+++ b/osu.Game.Tests/Resources/hitobject-combo-offset.osu
@@ -3,30 +3,30 @@ osu file format v14
 [HitObjects]
 // Circle with combo offset (3)
 255,193,1000,49,0,0:0:0:0:
-// Combo index = 4
+// Combo index = 1
 
 // Spinner with new combo followed by circle with no new combo
 256,192,2000,12,0,2000,0:0:0:0:
 255,193,3000,1,0,0:0:0:0:
-// Combo index = 5
+// Combo index = 2
 
 // Spinner without new combo followed by circle with no new combo
 256,192,4000,8,0,5000,0:0:0:0:
 255,193,6000,1,0,0:0:0:0:
-// Combo index = 5
+// Combo index = 3
 
 // Spinner without new combo followed by circle with new combo
 256,192,7000,8,0,8000,0:0:0:0:
 255,193,9000,5,0,0:0:0:0:
-// Combo index = 6
+// Combo index = 4
 
 // Spinner with new combo and offset (1) followed by circle with new combo and offset (3)
 256,192,10000,28,0,11000,0:0:0:0:
 255,193,12000,53,0,0:0:0:0:
-// Combo index = 11
+// Combo index = 8
 
 // Spinner with new combo and offset (2) followed by slider with no new combo followed by circle with no new combo
 256,192,13000,44,0,14000,0:0:0:0:
 256,192,15000,8,0,16000,0:0:0:0:
 255,193,17000,1,0,0:0:0:0:
-// Combo index = 14
\ No newline at end of file
+// Combo index = 9
\ No newline at end of file
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
index 0ed5aef0cf..a5c1a73fa7 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
             {
                 Position = position,
                 NewCombo = FirstObject || lastObject is ConvertSpinner || newCombo,
-                ComboOffset = comboOffset
+                ComboOffset = newCombo ? comboOffset : 0
             };
         }
 
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
             {
                 Position = position,
                 NewCombo = FirstObject || lastObject is ConvertSpinner || newCombo,
-                ComboOffset = comboOffset,
+                ComboOffset = newCombo ? comboOffset : 0,
                 Path = new SliderPath(controlPoints, length),
                 NodeSamples = nodeSamples,
                 RepeatCount = repeatCount
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
index 8bb9600a7d..43c346b621 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
             {
                 Position = position,
                 NewCombo = FirstObject || lastObject is ConvertSpinner || newCombo,
-                ComboOffset = comboOffset
+                ComboOffset = newCombo ? comboOffset : 0
             };
         }
 
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
             {
                 Position = position,
                 NewCombo = FirstObject || lastObject is ConvertSpinner || newCombo,
-                ComboOffset = comboOffset,
+                ComboOffset = newCombo ? comboOffset : 0,
                 Path = new SliderPath(controlPoints, length),
                 NodeSamples = nodeSamples,
                 RepeatCount = repeatCount

From 039f8e62421d13d23f532e146cadd97ec89e78d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 10:25:23 +0900
Subject: [PATCH 1692/2296] Add note about shared code

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 2 ++
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index d122758a4e..17ff8afb87 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -157,6 +157,8 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public void UpdateComboInformation(IHasComboInformation? lastObj)
         {
+            // Note that this implementation is shared with the osu! ruleset's implementation.
+            // If a change is made here, OsuHitObject.cs should also be updated.
             ComboIndex = lastObj?.ComboIndex ?? 0;
             ComboIndexWithOffsets = lastObj?.ComboIndexWithOffsets ?? 0;
             IndexInCurrentCombo = (lastObj?.IndexInCurrentCombo + 1) ?? 0;
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 716c34d024..21f7b4b22d 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -161,6 +161,8 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public void UpdateComboInformation(IHasComboInformation? lastObj)
         {
+            // Note that this implementation is shared with the osu!catch ruleset's implementation.
+            // If a change is made here, CatchHitObject.cs should also be updated.
             ComboIndex = lastObj?.ComboIndex ?? 0;
             ComboIndexWithOffsets = lastObj?.ComboIndexWithOffsets ?? 0;
             IndexInCurrentCombo = (lastObj?.IndexInCurrentCombo + 1) ?? 0;

From 7590bae445b331aa9d5d2bb4c1dd3730a9cb97c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 22 Nov 2023 12:50:08 +0900
Subject: [PATCH 1693/2296] Rename and comment everything in score migration
 code

Hopefully, _hopefully_, makes all this a little bit less inscrutable.
---
 .../StandardisedScoreMigrationTools.cs        | 98 ++++++++++++-------
 1 file changed, 62 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index fe51c6f130..77421908de 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -274,53 +274,79 @@ namespace osu.Game.Database
                             + bonusProportion) * modMultiplier);
                     }
 
-                    // Assumption :
-                    // - sliders and slider-ticks are uniformly spread arround the beatmap, and thus can be ignored without losing much precision.
-                    //      We thus consider a map of hit-circles only, which gives objectCount == maximumCombo !
+                    // Assumptions:
+                    // - sliders and slider ticks are uniformly distributed in the beatmap, and thus can be ignored without losing much precision.
+                    //   We thus consider a map of hit-circles only, which gives objectCount == maximumCombo.
                     // - the Ok/Meh hit results are uniformly spread in the score, and thus can be ignored without losing much precision.
-                    //      We simplify and consider each hit result to be equal to `300*score.Accuracy`, which allows us to isolate the accuracy multiplier.
-                    // What is strippedV1/strippedNew :
-                    // This is the ComboScore (of v1 / new score) were we remove all (map-)constant multipliers and accuracy multipliers (including hit results),
-                    // based on the previous assumptions.
-                    // We use integrals to approximate the sum of each object's combo contribution (thus the original combo exponent is increased by 1)
-                    // For the maximum score, we thus integrate `f(combo) = 300*combo^exponent`, and ignoring the constant multipliers we get:
-                    double maxStrippedV1 = Math.Pow(maximumLegacyCombo, 2);
-                    double maxStrippedNew = Math.Pow(maximumLegacyCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
+                    //   We simplify and consider each hit result to have the same hit value of `300 * score.Accuracy`
+                    //   (which represents the average hit value over the entire play),
+                    //   which allows us to isolate the accuracy multiplier.
 
-                    double strippedV1 = maxStrippedV1 * comboProportion / score.Accuracy;
+                    // This is a very ballpark estimate of the maximum magnitude of the combo portion in score V1.
+                    // It is derived by assuming a full combo play and summing up the contribution to combo portion from each individual object.
+                    // Because each object's combo contribution is proportional to the current combo at the time of judgement,
+                    // this can be roughly represented by summing / integrating f(combo) = combo.
+                    // All mod- and beatmap-dependent multipliers and constants are not included here,
+                    // as we will only be using the magnitude of this to compute ratios.
+                    double maximumAchievableComboPortionInScoreV1 = Math.Pow(maximumLegacyCombo, 2);
+                    // Similarly, estimate the maximum magnitude of the combo portion in standardised score.
+                    // Roughly corresponds to integrating f(combo) = combo ^ COMBO_EXPONENT (omitting constants)
+                    double maximumAchievableComboPortionInStandardisedScore = Math.Pow(maximumLegacyCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
-                    double strippedV1FromMaxCombo = Math.Pow(score.MaxCombo, 2);
-                    double strippedNewFromMaxCombo = Math.Pow(score.MaxCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
+                    double comboPortionInScoreV1 = maximumAchievableComboPortionInScoreV1 * comboProportion / score.Accuracy;
 
-                    // Compute approximate lower estimate new score for that play
-                    // That is, a play were we made biggest amount of big combos (Repeat MaxCombo + 1 remaining big combo)
-                    // And didn't combo anything in the reminder of the map
-                    double possibleMaxComboRepeat = Math.Floor(strippedV1 / strippedV1FromMaxCombo);
-                    double strippedV1FromMaxComboRepeat = possibleMaxComboRepeat * strippedV1FromMaxCombo;
-                    double remainingStrippedV1 = strippedV1 - strippedV1FromMaxComboRepeat;
-                    double remainingCombo = Math.Sqrt(remainingStrippedV1);
-                    double remainingStrippedNew = Math.Pow(remainingCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
+                    // This is - roughly - how much score, in the combo portion, the longest combo on this particular play would gain in score V1.
+                    double comboPortionFromLongestComboInScoreV1 = Math.Pow(score.MaxCombo, 2);
+                    // Same for standardised score.
+                    double comboPortionFromLongestComboInStandardisedScore = Math.Pow(score.MaxCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
-                    double lowerStrippedNew = (possibleMaxComboRepeat * strippedNewFromMaxCombo) + remainingStrippedNew;
+                    // Calculate how many times the longest combo the user has achieved in the play can repeat
+                    // without exceeding the combo portion in score V1 as achieved by the player.
+                    // This is a pessimistic estimate; it intentionally does not operate on object count and uses only score instead.
+                    double maximumOccurrencesOfLongestCombo = Math.Floor(comboPortionInScoreV1 / comboPortionFromLongestComboInScoreV1);
+                    double comboPortionFromRepeatedLongestCombosInScoreV1 = maximumOccurrencesOfLongestCombo * comboPortionFromLongestComboInScoreV1;
 
-                    // Compute approximate upper estimate new score for that play
-                    // That is, a play were all combos were equal (except MaxCombo)
-                    remainingStrippedV1 = strippedV1 - strippedV1FromMaxCombo;
-                    double remainingComboObjects = maximumLegacyCombo - score.MaxCombo - score.Statistics[HitResult.Miss];
-                    double remainingAverageCombo = remainingComboObjects > 0 ? remainingStrippedV1 / remainingComboObjects : 0;
-                    remainingStrippedNew = remainingComboObjects * Math.Pow(remainingAverageCombo, ScoreProcessor.COMBO_EXPONENT);
+                    double remainingComboPortionInScoreV1 = comboPortionInScoreV1 - comboPortionFromRepeatedLongestCombosInScoreV1;
+                    // `remainingComboPortionInScoreV1` is in the "score ballpark" realm, which means it's proportional to combo squared.
+                    // To convert that back to a raw combo length, we need to take the square root...
+                    double remainingCombo = Math.Sqrt(remainingComboPortionInScoreV1);
+                    // ...and then based on that raw combo length, we calculate how much this last combo is worth in standardised score.
+                    double remainingComboPortionInStandardisedScore = Math.Pow(remainingCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
-                    double upperStrippedNew = strippedNewFromMaxCombo + remainingStrippedNew;
+                    double lowerEstimateOfComboPortionInStandardisedScore
+                        = maximumOccurrencesOfLongestCombo * comboPortionFromLongestComboInStandardisedScore
+                          + remainingComboPortionInStandardisedScore;
 
-                    // Approximate by combining lower and upper estimates
+                    // Compute approximate upper estimate new score for that play.
+                    // This time, divide the remaining combo among remaining objects equally to achieve longest possible combo lengths.
+                    // There is no rigorous proof that doing this will yield a correct upper bound, but it seems to work out in practice.
+                    remainingComboPortionInScoreV1 = comboPortionInScoreV1 - comboPortionFromLongestComboInScoreV1;
+                    double remainingCountOfObjectsGivingCombo = maximumLegacyCombo - score.MaxCombo - score.Statistics[HitResult.Miss];
+                    // Because we assumed all combos were equal, `remainingComboPortionInScoreV1`
+                    // can be approximated by n * x^2, wherein n is the assumed number of equal combos,
+                    // and x is the assumed length of every one of those combos.
+                    // The remaining count of objects giving combo is, using those terms, equal to n * x.
+                    // Therefore, dividing the two will result in x, i.e. the assumed length of the remaining combos.
+                    double lengthOfRemainingCombos = remainingCountOfObjectsGivingCombo > 0
+                        ? remainingComboPortionInScoreV1 / remainingCountOfObjectsGivingCombo
+                        : 0;
+                    // In standardised scoring, each combo yields a score proportional to combo length to the power 1 + COMBO_EXPONENT.
+                    // Using the symbols introduced above, that would be x ^ 1.5 per combo, n times (because there are n assumed equal-length combos).
+                    // However, because `remainingCountOfObjectsGivingCombo` - using the symbols introduced above - is assumed to be equal to n * x,
+                    // we can skip adding the 1 and just multiply by x ^ 0.5.
+                    remainingComboPortionInStandardisedScore = remainingCountOfObjectsGivingCombo * Math.Pow(lengthOfRemainingCombos, ScoreProcessor.COMBO_EXPONENT);
+
+                    double upperEstimateOfComboPortionInStandardisedScore = comboPortionFromLongestComboInStandardisedScore + remainingComboPortionInStandardisedScore;
+
+                    // Approximate by combining lower and upper estimates.
                     // As the lower-estimate is very pessimistic, we use a 30/70 ratio
-                    // And cap it with 1.2 times the middle-point to avoid overstimates
-                    double strippedNew = Math.Min(
-                        0.3 * lowerStrippedNew + 0.7 * upperStrippedNew,
-                        1.2 * (lowerStrippedNew + upperStrippedNew) / 2
+                    // and cap it with 1.2 times the middle-point to avoid overestimates.
+                    double estimatedComboPortionInStandardisedScore = Math.Min(
+                        0.3 * lowerEstimateOfComboPortionInStandardisedScore + 0.7 * upperEstimateOfComboPortionInStandardisedScore,
+                        1.2 * (lowerEstimateOfComboPortionInStandardisedScore + upperEstimateOfComboPortionInStandardisedScore) / 2
                     );
 
-                    double newComboScoreProportion = (strippedNew / maxStrippedNew);
+                    double newComboScoreProportion = estimatedComboPortionInStandardisedScore / maximumAchievableComboPortionInStandardisedScore;
 
                     return (long)Math.Round((
                         500000 * newComboScoreProportion * score.Accuracy

From 2a6885164ced88450bd17bc24aea91d55a08343d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 24 Nov 2023 10:46:21 +0900
Subject: [PATCH 1694/2296] Update tests to match new scoring expectations

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index c957ddd7d3..fd041d3dd0 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -45,11 +45,11 @@ namespace osu.Game.Tests.Rulesets.Scoring
             };
         }
 
-        [TestCase(ScoringMode.Standardised, HitResult.Meh, 116_667)]
-        [TestCase(ScoringMode.Standardised, HitResult.Ok, 233_338)]
+        [TestCase(ScoringMode.Standardised, HitResult.Meh, 83_398)]
+        [TestCase(ScoringMode.Standardised, HitResult.Ok, 168_724)]
         [TestCase(ScoringMode.Standardised, HitResult.Great, 1_000_000)]
-        [TestCase(ScoringMode.Classic, HitResult.Meh, 11_670)]
-        [TestCase(ScoringMode.Classic, HitResult.Ok, 23_341)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, 8_343)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, 16_878)]
         [TestCase(ScoringMode.Classic, HitResult.Great, 100_033)]
         public void TestSingleOsuHit(ScoringMode scoringMode, HitResult hitResult, int expectedScore)
         {
@@ -75,27 +75,27 @@ namespace osu.Game.Tests.Rulesets.Scoring
         /// This test intentionally misses the 3rd hitobject to achieve lower than 75% accuracy and 50% max combo.
         /// </remarks>
         [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)]
-        [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 79_333)]
-        [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 158_667)]
-        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 317_626)]
-        [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 492_894)]
-        [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 492_894)]
+        [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 34_734)]
+        [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 69_925)]
+        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 154_499)]
+        [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 326_963)]
+        [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 326_963)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
-        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 541_894)]
+        [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 493_652)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
-        [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 492_894)]
+        [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 326_963)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)]
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 7_975)]
-        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 15_949)]
-        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 31_928)]
-        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 49_546)]
-        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 49_546)]
+        [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 3_492)]
+        [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 7_029)]
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 15_530)]
+        [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 32_867)]
+        [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 32_867)]
         [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 54_189)]
+        [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 49_365)]
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
-        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 49_289)]
+        [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 32_696)]
         [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 100_003)]
         [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 100_015)]
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)

From 61d5a890f724a9bca05fd8e0842e47eeae7626a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 24 Nov 2023 12:37:02 +0900
Subject: [PATCH 1695/2296] Update links to figma library

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9f7d88f5c7..4106641adb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,7 +59,7 @@ The [issue tracker](https://github.com/ppy/osu/issues) should provide plenty of
 
 In the case of simple issues, a direct PR is okay. However, if you decide to work on an existing issue which doesn't seem trivial, **please ask us first**. This way we can try to estimate if it is a good fit for you and provide the correct direction on how to address it. In addition, note that while we do not rule out external contributors from working on roadmapped issues, we will generally prefer to handle them ourselves unless they're not very time sensitive.
 
-If you'd like to propose a subjective change to one of the visual aspects of the game, or there is a bigger task you'd like to work on, but there is no corresponding issue or discussion thread yet for it, **please open a discussion or issue first** to avoid wasted effort. This in particular applies if you want to work on [one of the available designs from the osu! public Figma library](https://www.figma.com/file/6m10GiGEncVFWmgOoSyakH/osu!-Figma-Library).
+If you'd like to propose a subjective change to one of the visual aspects of the game, or there is a bigger task you'd like to work on, but there is no corresponding issue or discussion thread yet for it, **please open a discussion or issue first** to avoid wasted effort. This in particular applies if you want to work on [one of the available designs from the osu! Figma master library](https://www.figma.com/file/VIkXMYNPMtQem2RJg9k2iQ/Master-Library).
 
 Aside from the above, below is a brief checklist of things to watch out when you're preparing your code changes:
 
@@ -85,4 +85,4 @@ If you're uncertain about some part of the codebase or some inner workings of th
 - [Development roadmap](https://github.com/orgs/ppy/projects/7/views/6): What the core team is currently working on
 - [`ppy/osu-framework` wiki](https://github.com/ppy/osu-framework/wiki): Contains introductory information about osu!framework, the bespoke 2D game framework we use for the game
 - [`ppy/osu` wiki](https://github.com/ppy/osu/wiki): Contains articles about various technical aspects of the game
-- [Public Figma library](https://www.figma.com/file/6m10GiGEncVFWmgOoSyakH/osu!-Figma-Library): Contains finished and draft designs for osu!
+- [Figma master library](https://www.figma.com/file/VIkXMYNPMtQem2RJg9k2iQ/Master-Library): Contains finished and draft designs for osu!

From 537b0ae870d3fb4e1023c8418ce7badb71cb8cb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 12:47:40 +0900
Subject: [PATCH 1696/2296] Add silly annotation for now (more new r# rules)

---
 osu.Game/Screens/Ranking/ScorePanel.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index 1d332d6b27..1f7ba3692a 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -82,6 +83,7 @@ namespace osu.Game.Screens.Ranking
         private static readonly Color4 contracted_top_layer_colour = Color4Extensions.FromHex("#353535");
         private static readonly Color4 contracted_middle_layer_colour = Color4Extensions.FromHex("#353535");
 
+        [CanBeNull]
         public event Action<PanelState> StateChanged;
 
         /// <summary>

From 95c00f966627c00648ed4c72848962676aad8eff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 12:45:55 +0900
Subject: [PATCH 1697/2296] Add `HexaconIcons` lookup to allow usage with
 `SpriteIcon`

---
 osu.Game/Graphics/HexaconsIcons.cs            | 112 ++++++++++++++++++
 osu.Game/OsuGameBase.cs                       |   2 +
 .../Play/HUD/ArgonCounterTextComponent.cs     |   2 +-
 osu.Game/Skinning/LegacySpriteText.cs         |   2 +-
 4 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Graphics/HexaconsIcons.cs

diff --git a/osu.Game/Graphics/HexaconsIcons.cs b/osu.Game/Graphics/HexaconsIcons.cs
new file mode 100644
index 0000000000..9b0fb30963
--- /dev/null
+++ b/osu.Game/Graphics/HexaconsIcons.cs
@@ -0,0 +1,112 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Text;
+
+namespace osu.Game.Graphics
+{
+    public static class HexaconsIcons
+    {
+        public const string FONT_NAME = "Icons/Hexacons";
+
+        public static IconUsage Editor => get(HexaconsMapping.editor);
+
+        private static IconUsage get(HexaconsMapping icon)
+        {
+            return new IconUsage((char)icon, FONT_NAME);
+        }
+
+        // Basically just converting to something we can use in a `char` lookup for FontStore/GlyphStore compatibility.
+        // Names should match filenames in resources.
+        private enum HexaconsMapping
+        {
+            beatmap_packs,
+            beatmap,
+            calendar,
+            chart,
+            community,
+            contests,
+            devtools,
+            download,
+            editor,
+            featured_artist,
+            home,
+            messaging,
+            music,
+            news,
+            notification,
+            profile,
+            rankings,
+            search,
+            settings,
+            social,
+            store,
+            tournament,
+            wiki,
+        }
+
+        public class HexaconsStore : ITextureStore, ITexturedGlyphLookupStore
+        {
+            private readonly TextureStore textures;
+
+            public HexaconsStore(TextureStore textures)
+            {
+                this.textures = textures;
+            }
+
+            public void Dispose()
+            {
+                textures.Dispose();
+            }
+
+            public ITexturedCharacterGlyph? Get(string? fontName, char character)
+            {
+                if (fontName == FONT_NAME)
+                    return new Glyph(textures.Get($"{fontName}/{((HexaconsMapping)character).ToString().Replace("_", "-")}"));
+
+                return null;
+            }
+
+            public Task<ITexturedCharacterGlyph?> GetAsync(string fontName, char character) => Task.Run(() => Get(fontName, character));
+
+            public Texture? Get(string name, WrapMode wrapModeS, WrapMode wrapModeT) => null;
+
+            public Texture Get(string name) => throw new NotImplementedException();
+
+            public Task<Texture> GetAsync(string name, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+
+            public Stream GetStream(string name) => throw new NotImplementedException();
+
+            public IEnumerable<string> GetAvailableResources() => throw new NotImplementedException();
+
+            public Task<Texture?> GetAsync(string name, WrapMode wrapModeS, WrapMode wrapModeT, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+
+            public class Glyph : ITexturedCharacterGlyph
+            {
+                public float XOffset => default;
+                public float YOffset => default;
+                public float XAdvance => default;
+                public float Baseline => default;
+                public char Character => default;
+
+                public float GetKerning<T>(T lastGlyph) where T : ICharacterGlyph => throw new NotImplementedException();
+
+                public Texture Texture { get; }
+                public float Width => Texture.Width;
+                public float Height => Texture.Height;
+
+                public Glyph(Texture texture)
+                {
+                    Texture = texture;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 228edc8952..2d8024a45a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -477,6 +477,8 @@ namespace osu.Game
             AddFont(Resources, @"Fonts/Venera/Venera-Light");
             AddFont(Resources, @"Fonts/Venera/Venera-Bold");
             AddFont(Resources, @"Fonts/Venera/Venera-Black");
+
+            Fonts.AddStore(new HexaconsIcons.HexaconsStore(Textures));
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
diff --git a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
index d3fadb452b..2a3f4365cb 100644
--- a/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonCounterTextComponent.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Screens.Play.HUD
                     this.getLookup = getLookup;
                 }
 
-                public ITexturedCharacterGlyph? Get(string fontName, char character)
+                public ITexturedCharacterGlyph? Get(string? fontName, char character)
                 {
                     string lookup = getLookup(character);
                     var texture = textures.Get($"Gameplay/Fonts/{fontName}-{lookup}");
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index 041a32e8de..8aefa50252 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Skinning
                 this.maxSize = maxSize;
             }
 
-            public ITexturedCharacterGlyph? Get(string fontName, char character)
+            public ITexturedCharacterGlyph? Get(string? fontName, char character)
             {
                 string lookup = getLookupName(character);
 

From 340227a06d65c6b8bb1edf2e4834ab04d7f809ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 13:16:04 +0900
Subject: [PATCH 1698/2296] Replace all hexacon lookups with strongly typed
 properties

---
 .../UserInterface/TestSceneOverlayHeader.cs   |  3 +-
 osu.Game/Graphics/HexaconsIcons.cs            | 27 +++++++++--
 .../BeatmapListing/BeatmapListingHeader.cs    |  3 +-
 .../Overlays/BeatmapSet/BeatmapSetHeader.cs   |  3 +-
 .../Overlays/Changelog/ChangelogHeader.cs     |  3 +-
 osu.Game/Overlays/Chat/ChatOverlayTopBar.cs   |  4 +-
 osu.Game/Overlays/ChatOverlay.cs              |  4 +-
 .../Dashboard/DashboardOverlayHeader.cs       |  3 +-
 osu.Game/Overlays/FullscreenOverlay.cs        |  3 +-
 osu.Game/Overlays/INamedOverlayComponent.cs   |  3 +-
 osu.Game/Overlays/News/NewsHeader.cs          |  3 +-
 osu.Game/Overlays/NotificationOverlay.cs      |  4 +-
 osu.Game/Overlays/NowPlayingOverlay.cs        |  2 +-
 osu.Game/Overlays/OverlayTitle.cs             | 45 ++++++-------------
 osu.Game/Overlays/Profile/ProfileHeader.cs    |  3 +-
 .../Rankings/RankingsOverlayHeader.cs         |  3 +-
 osu.Game/Overlays/SettingsOverlay.cs          |  4 +-
 osu.Game/Overlays/Toolbar/ToolbarButton.cs    | 12 ++---
 .../Overlays/Toolbar/ToolbarHomeButton.cs     |  3 +-
 .../Toolbar/ToolbarOverlayToggleButton.cs     |  2 +-
 osu.Game/Overlays/Wiki/WikiHeader.cs          |  3 +-
 .../Edit/Components/Menus/EditorMenuBar.cs    |  4 +-
 .../Screens/Edit/Setup/SetupScreenHeader.cs   |  3 +-
 23 files changed, 82 insertions(+), 65 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index a927b0931b..55a04b129c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
 using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -153,7 +154,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             public TestTitle()
             {
                 Title = "title";
-                IconTexture = "Icons/changelog";
+                Icon = HexaconsIcons.Devtools;
             }
         }
     }
diff --git a/osu.Game/Graphics/HexaconsIcons.cs b/osu.Game/Graphics/HexaconsIcons.cs
index 9b0fb30963..3eee5d7197 100644
--- a/osu.Game/Graphics/HexaconsIcons.cs
+++ b/osu.Game/Graphics/HexaconsIcons.cs
@@ -16,12 +16,31 @@ namespace osu.Game.Graphics
     {
         public const string FONT_NAME = "Icons/Hexacons";
 
+        public static IconUsage BeatmapPacks => get(HexaconsMapping.beatmap_packs);
+        public static IconUsage Beatmap => get(HexaconsMapping.beatmap);
+        public static IconUsage Calendar => get(HexaconsMapping.calendar);
+        public static IconUsage Chart => get(HexaconsMapping.chart);
+        public static IconUsage Community => get(HexaconsMapping.community);
+        public static IconUsage Contests => get(HexaconsMapping.contests);
+        public static IconUsage Devtools => get(HexaconsMapping.devtools);
+        public static IconUsage Download => get(HexaconsMapping.download);
         public static IconUsage Editor => get(HexaconsMapping.editor);
+        public static IconUsage FeaturedArtist => get(HexaconsMapping.featured_artist);
+        public static IconUsage Home => get(HexaconsMapping.home);
+        public static IconUsage Messaging => get(HexaconsMapping.messaging);
+        public static IconUsage Music => get(HexaconsMapping.music);
+        public static IconUsage News => get(HexaconsMapping.news);
+        public static IconUsage Notification => get(HexaconsMapping.notification);
+        public static IconUsage Profile => get(HexaconsMapping.profile);
+        public static IconUsage Rankings => get(HexaconsMapping.rankings);
+        public static IconUsage Search => get(HexaconsMapping.search);
+        public static IconUsage Settings => get(HexaconsMapping.settings);
+        public static IconUsage Social => get(HexaconsMapping.social);
+        public static IconUsage Store => get(HexaconsMapping.store);
+        public static IconUsage Tournament => get(HexaconsMapping.tournament);
+        public static IconUsage Wiki => get(HexaconsMapping.wiki);
 
-        private static IconUsage get(HexaconsMapping icon)
-        {
-            return new IconUsage((char)icon, FONT_NAME);
-        }
+        private static IconUsage get(HexaconsMapping icon) => new IconUsage((char)icon, FONT_NAME);
 
         // Basically just converting to something we can use in a `char` lookup for FontStore/GlyphStore compatibility.
         // Names should match filenames in resources.
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
index 3336c383ff..27fab82bf3 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using osu.Framework.Graphics;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
@@ -23,7 +24,7 @@ namespace osu.Game.Overlays.BeatmapListing
             {
                 Title = PageTitleStrings.MainBeatmapsetsControllerIndex;
                 Description = NamedOverlayComponentStrings.BeatmapListingDescription;
-                IconTexture = "Icons/Hexacons/beatmap";
+                Icon = HexaconsIcons.Beatmap;
             }
         }
     }
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
index 858742648c..eced27f35e 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -9,6 +9,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
@@ -59,7 +60,7 @@ namespace osu.Game.Overlays.BeatmapSet
             public BeatmapHeaderTitle()
             {
                 Title = PageTitleStrings.MainBeatmapsetsControllerShow;
-                IconTexture = "Icons/Hexacons/beatmap";
+                Icon = HexaconsIcons.Beatmap;
             }
         }
     }
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index e9be67e977..61ea9dc4db 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -12,6 +12,7 @@ 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.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Resources.Localisation.Web;
@@ -123,7 +124,7 @@ namespace osu.Game.Overlays.Changelog
             {
                 Title = PageTitleStrings.MainChangelogControllerDefault;
                 Description = NamedOverlayComponentStrings.ChangelogDescription;
-                IconTexture = "Icons/Hexacons/devtools";
+                Icon = HexaconsIcons.Devtools;
             }
         }
     }
diff --git a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
index 0410174dc1..c6f63a72b9 100644
--- a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
+++ b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
@@ -45,11 +45,11 @@ namespace osu.Game.Overlays.Chat
                     {
                         new Drawable[]
                         {
-                            new Sprite
+                            new SpriteIcon
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Texture = textures.Get("Icons/Hexacons/messaging"),
+                                Icon = HexaconsIcons.Social,
                                 Size = new Vector2(18),
                             },
                             // Placeholder text
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 724f77ad71..5cf2ac6c86 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -11,11 +11,13 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
@@ -29,7 +31,7 @@ namespace osu.Game.Overlays
 {
     public partial class ChatOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent, IKeyBindingHandler<PlatformAction>
     {
-        public string IconTexture => "Icons/Hexacons/messaging";
+        public IconUsage Icon => HexaconsIcons.Messaging;
         public LocalisableString Title => ChatStrings.HeaderTitle;
         public LocalisableString Description => ChatStrings.HeaderDescription;
 
diff --git a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
index 0f4697e33c..b9d869c2ec 100644
--- a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
+++ b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
@@ -3,6 +3,7 @@
 
 using System.ComponentModel;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
@@ -18,7 +19,7 @@ namespace osu.Game.Overlays.Dashboard
             {
                 Title = PageTitleStrings.MainHomeControllerIndex;
                 Description = NamedOverlayComponentStrings.DashboardDescription;
-                IconTexture = "Icons/Hexacons/social";
+                Icon = HexaconsIcons.Social;
             }
         }
     }
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 6ee045c492..6ddf1eecf0 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
@@ -17,7 +18,7 @@ namespace osu.Game.Overlays
     public abstract partial class FullscreenOverlay<T> : WaveOverlayContainer, INamedOverlayComponent
         where T : OverlayHeader
     {
-        public virtual string IconTexture => Header.Title.IconTexture;
+        public virtual IconUsage Icon => Header.Title.Icon;
         public virtual LocalisableString Title => Header.Title.Title;
         public virtual LocalisableString Description => Header.Title.Description;
 
diff --git a/osu.Game/Overlays/INamedOverlayComponent.cs b/osu.Game/Overlays/INamedOverlayComponent.cs
index 65664b12e7..ef3c029aac 100644
--- a/osu.Game/Overlays/INamedOverlayComponent.cs
+++ b/osu.Game/Overlays/INamedOverlayComponent.cs
@@ -1,13 +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.Graphics.Sprites;
 using osu.Framework.Localisation;
 
 namespace osu.Game.Overlays
 {
     public interface INamedOverlayComponent
     {
-        string IconTexture { get; }
+        IconUsage Icon { get; }
 
         LocalisableString Title { get; }
 
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index 44e2f6a8cb..f237ed66f2 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -7,6 +7,7 @@ using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
@@ -68,7 +69,7 @@ namespace osu.Game.Overlays.News
             {
                 Title = PageTitleStrings.MainNewsControllerDefault;
                 Description = NamedOverlayComponentStrings.NewsDescription;
-                IconTexture = "Icons/Hexacons/news";
+                Icon = HexaconsIcons.News;
             }
         }
     }
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 81233b4343..c3ddb228ea 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -13,9 +13,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Threading;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Resources.Localisation.Web;
@@ -27,7 +29,7 @@ namespace osu.Game.Overlays
 {
     public partial class NotificationOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent, INotificationOverlay
     {
-        public string IconTexture => "Icons/Hexacons/notification";
+        public IconUsage Icon => HexaconsIcons.Notification;
         public LocalisableString Title => NotificationsStrings.HeaderTitle;
         public LocalisableString Description => NotificationsStrings.HeaderDescription;
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 5bbf18a959..425ff0935d 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays
 {
     public partial class NowPlayingOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
-        public string IconTexture => "Icons/Hexacons/music";
+        public IconUsage Icon => HexaconsIcons.Music;
         public LocalisableString Title => NowPlayingStrings.HeaderTitle;
         public LocalisableString Description => NowPlayingStrings.HeaderDescription;
 
diff --git a/osu.Game/Overlays/OverlayTitle.cs b/osu.Game/Overlays/OverlayTitle.cs
index 1d207e5f7d..a2ff7032b5 100644
--- a/osu.Game/Overlays/OverlayTitle.cs
+++ b/osu.Game/Overlays/OverlayTitle.cs
@@ -1,13 +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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -20,7 +16,7 @@ namespace osu.Game.Overlays
         public const float ICON_SIZE = 30;
 
         private readonly OsuSpriteText titleText;
-        private readonly Container icon;
+        private readonly Container iconContainer;
 
         private LocalisableString title;
 
@@ -32,12 +28,20 @@ namespace osu.Game.Overlays
 
         public LocalisableString Description { get; protected set; }
 
-        private string iconTexture;
+        private IconUsage icon;
 
-        public string IconTexture
+        public IconUsage Icon
         {
-            get => iconTexture;
-            protected set => icon.Child = new OverlayTitleIcon(iconTexture = value);
+            get => icon;
+            protected set => iconContainer.Child = new SpriteIcon
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                FillMode = FillMode.Fit,
+
+                Icon = icon = value,
+            };
         }
 
         protected OverlayTitle()
@@ -51,7 +55,7 @@ namespace osu.Game.Overlays
                 Direction = FillDirection.Horizontal,
                 Children = new Drawable[]
                 {
-                    icon = new Container
+                    iconContainer = new Container
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -68,26 +72,5 @@ namespace osu.Game.Overlays
                 }
             };
         }
-
-        private partial class OverlayTitleIcon : Sprite
-        {
-            private readonly string textureName;
-
-            public OverlayTitleIcon(string textureName)
-            {
-                this.textureName = textureName;
-
-                RelativeSizeAxes = Axes.Both;
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-                FillMode = FillMode.Fit;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                Texture = textures.Get(textureName);
-            }
-        }
     }
 }
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 80d48ae09e..78343d08f1 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Overlays.Profile.Header;
 using osu.Game.Overlays.Profile.Header.Components;
 using osu.Game.Resources.Localisation.Web;
@@ -86,7 +87,7 @@ namespace osu.Game.Overlays.Profile
             public ProfileHeaderTitle()
             {
                 Title = PageTitleStrings.MainUsersControllerDefault;
-                IconTexture = "Icons/Hexacons/profile";
+                Icon = HexaconsIcons.Profile;
             }
         }
     }
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 44f278a237..63128fb73d 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Game.Localisation;
 using osu.Game.Resources.Localisation.Web;
 using osu.Framework.Graphics;
+using osu.Game.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Users;
 
@@ -35,7 +36,7 @@ namespace osu.Game.Overlays.Rankings
             {
                 Title = PageTitleStrings.MainRankingControllerDefault;
                 Description = NamedOverlayComponentStrings.RankingsDescription;
-                IconTexture = "Icons/Hexacons/rankings";
+                Icon = HexaconsIcons.Rankings;
             }
         }
     }
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 291281124c..746d451343 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -12,14 +12,16 @@ using osu.Game.Overlays.Settings.Sections.Input;
 using osuTK.Graphics;
 using System.Collections.Generic;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 
 namespace osu.Game.Overlays
 {
     public partial class SettingsOverlay : SettingsPanel, INamedOverlayComponent
     {
-        public string IconTexture => "Icons/Hexacons/settings";
+        public IconUsage Icon => HexaconsIcons.Settings;
         public LocalisableString Title => SettingsStrings.HeaderTitle;
         public LocalisableString Description => SettingsStrings.HeaderDescription;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index e181322dda..08bcb6bd8a 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -10,12 +10,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Game.Database;
 using osu.Framework.Localisation;
+using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
@@ -36,16 +35,13 @@ namespace osu.Game.Overlays.Toolbar
             IconContainer.Show();
         }
 
-        [Resolved]
-        private TextureStore textures { get; set; } = null!;
-
         [Resolved]
         private ReadableKeyCombinationProvider keyCombinationProvider { get; set; } = null!;
 
-        public void SetIcon(string texture) =>
-            SetIcon(new Sprite
+        public void SetIcon(IconUsage icon) =>
+            SetIcon(new SpriteIcon
             {
-                Texture = textures.Get(texture),
+                Icon = icon,
             });
 
         public LocalisableString Text
diff --git a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
index ba2c8282c5..ded0229d67 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Graphics;
 using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 
@@ -20,7 +21,7 @@ namespace osu.Game.Overlays.Toolbar
         {
             TooltipMain = ToolbarStrings.HomeHeaderTitle;
             TooltipSub = ToolbarStrings.HomeHeaderDescription;
-            SetIcon("Icons/Hexacons/home");
+            SetIcon(HexaconsIcons.Home);
         }
     }
 }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
index 7bd48174db..78c976111b 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Toolbar
                 {
                     TooltipMain = named.Title;
                     TooltipSub = named.Description;
-                    SetIcon(named.IconTexture);
+                    SetIcon(named.Icon);
                 }
             }
         }
diff --git a/osu.Game/Overlays/Wiki/WikiHeader.cs b/osu.Game/Overlays/Wiki/WikiHeader.cs
index 9317813fc4..9e9e565684 100644
--- a/osu.Game/Overlays/Wiki/WikiHeader.cs
+++ b/osu.Game/Overlays/Wiki/WikiHeader.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Resources.Localisation.Web;
@@ -81,7 +82,7 @@ namespace osu.Game.Overlays.Wiki
             {
                 Title = PageTitleStrings.MainWikiControllerDefault;
                 Description = NamedOverlayComponentStrings.WikiDescription;
-                IconTexture = "Icons/Hexacons/wiki";
+                Icon = HexaconsIcons.Wiki;
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
index a67375b0a4..5c77672d90 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
@@ -46,12 +46,12 @@ namespace osu.Game.Screens.Edit.Components.Menus
                     Padding = new MarginPadding(8),
                     Children = new Drawable[]
                     {
-                        new Sprite
+                        new SpriteIcon
                         {
                             Size = new Vector2(26),
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Texture = textures.Get("Icons/Hexacons/editor"),
+                            Icon = HexaconsIcons.Editor,
                         },
                         text = new TextFlowContainer
                         {
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index 788beba9d9..93448c4394 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;
 using osuTK.Graphics;
@@ -79,7 +80,7 @@ namespace osu.Game.Screens.Edit.Setup
             {
                 Title = EditorSetupStrings.BeatmapSetup.ToLower();
                 Description = EditorSetupStrings.BeatmapSetupDescription;
-                IconTexture = "Icons/Hexacons/social";
+                Icon = HexaconsIcons.Social;
             }
         }
 

From 5905ca64925f4cf4b3ce7d07974e39a353df18e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 10:56:59 +0900
Subject: [PATCH 1699/2296] Add second level menu for skin editors

---
 .../TestSceneBeatmapEditorNavigation.cs       |  2 +-
 .../UserInterface/TestSceneButtonSystem.cs    |  2 +-
 osu.Game/Screens/Menu/ButtonSystem.cs         | 19 +++++++++++++++++--
 osu.Game/Screens/Menu/MainMenu.cs             | 10 +++++++++-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index b79b61202b..ce266a2d77 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             AddUntilStep("wait for dialog overlay", () => Game.ChildrenOfType<DialogOverlay>().SingleOrDefault() != null);
 
-            AddStep("open editor", () => Game.ChildrenOfType<ButtonSystem>().Single().OnEdit.Invoke());
+            AddStep("open editor", () => Game.ChildrenOfType<ButtonSystem>().Single().OnEditBeatmap.Invoke());
             AddUntilStep("wait for editor", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.IsLoaded);
             AddStep("click on file", () =>
             {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs
index ac811aeb65..1de47aee69 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                         break;
 
                     case Key.E:
-                        buttons.OnEdit = action;
+                        buttons.OnEditBeatmap = action;
                         break;
 
                     case Key.D:
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index a0cf9f5322..79739e4f0c 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -13,6 +13,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -40,7 +41,8 @@ namespace osu.Game.Screens.Menu
 
         private readonly IBindable<bool> isIdle = new BindableBool();
 
-        public Action OnEdit;
+        public Action OnEditBeatmap;
+        public Action OnEditSkin;
         public Action OnExit;
         public Action OnBeatmapListing;
         public Action OnSolo;
@@ -84,6 +86,7 @@ namespace osu.Game.Screens.Menu
 
         private readonly List<MainMenuButton> buttonsTopLevel = new List<MainMenuButton>();
         private readonly List<MainMenuButton> buttonsPlay = new List<MainMenuButton>();
+        private readonly List<MainMenuButton> buttonsEdit = new List<MainMenuButton>();
 
         private Sample sampleBackToLogo;
         private Sample sampleLogoSwoosh;
@@ -105,6 +108,11 @@ namespace osu.Game.Screens.Menu
             buttonArea.AddRange(new Drawable[]
             {
                 new MainMenuButton(ButtonSystemStrings.Settings, string.Empty, FontAwesome.Solid.Cog, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
+                backButton = new MainMenuButton(ButtonSystemStrings.Back, @"back-to-top", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel,
+                    -WEDGE_WIDTH)
+                {
+                    VisibleState = ButtonSystemState.Edit,
+                },
                 backButton = new MainMenuButton(ButtonSystemStrings.Back, @"back-to-top", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel,
                     -WEDGE_WIDTH)
                 {
@@ -133,14 +141,19 @@ namespace osu.Game.Screens.Menu
             buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Playlists, @"button-default-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
+            buttonsEdit.Add(new MainMenuButton(CommonStrings.Beatmaps.ToLower(), @"button-default-select", FontAwesome.Solid.User, new Color4(238, 170, 0, 255), () => OnEditBeatmap?.Invoke(), WEDGE_WIDTH, Key.B));
+            buttonsEdit.Add(new MainMenuButton(CommonStrings.Skins.ToLower(), @"button-default-select", FontAwesome.Solid.Users, new Color4(220, 160, 0, 255), () => OnEditSkin?.Invoke(), 0, Key.S));
+            buttonsEdit.ForEach(b => b.VisibleState = ButtonSystemState.Edit);
+
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-default-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-default-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => State = ButtonSystemState.Edit, 0, Key.E));
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-default-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B, Key.D));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
 
             buttonArea.AddRange(buttonsPlay);
+            buttonArea.AddRange(buttonsEdit);
             buttonArea.AddRange(buttonsTopLevel);
 
             buttonArea.ForEach(b =>
@@ -270,6 +283,7 @@ namespace osu.Game.Screens.Menu
 
                     return true;
 
+                case ButtonSystemState.Edit:
                 case ButtonSystemState.Play:
                     StopSamplePlayback();
                     backButton.TriggerClick();
@@ -414,6 +428,7 @@ namespace osu.Game.Screens.Menu
         Initial,
         TopLevel,
         Play,
+        Edit,
         EnteringMode,
     }
 }
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 0f73707544..c25e62d69e 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -25,6 +25,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
+using osu.Game.Overlays.SkinEditor;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
@@ -93,6 +94,9 @@ namespace osu.Game.Screens.Menu
 
         private Sample reappearSampleSwoosh;
 
+        [Resolved(canBeNull: true)]
+        private SkinEditorOverlay skinEditor { get; set; }
+
         [BackgroundDependencyLoader(true)]
         private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings, OsuConfigManager config, SessionStatics statics, AudioManager audio)
         {
@@ -120,11 +124,15 @@ namespace osu.Game.Screens.Menu
                     {
                         Buttons = new ButtonSystem
                         {
-                            OnEdit = delegate
+                            OnEditBeatmap = () =>
                             {
                                 Beatmap.SetDefault();
                                 this.Push(new EditorLoader());
                             },
+                            OnEditSkin = () =>
+                            {
+                                skinEditor?.Show();
+                            },
                             OnSolo = loadSoloSongSelect,
                             OnMultiplayer = () => this.Push(new Multiplayer()),
                             OnPlaylists = () => this.Push(new Playlists()),

From 7e59a1d0be3eb3aae50f17e1a361b6a357286194 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 11:00:22 +0900
Subject: [PATCH 1700/2296] Apply NRT to `ButtonSystem`

---
 .../Editing/TestSceneOpenEditorTimestamp.cs   |  2 +-
 .../TestSceneBeatmapEditorNavigation.cs       |  2 +-
 osu.Game/Screens/Menu/ButtonSystem.cs         | 52 +++++++++----------
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index 2c8655a5f5..1a754d5145 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Editing
                 () => Game.Notifications.AllNotifications.Count(x => x.Text == EditorStrings.MustBeInEditorToHandleLinks),
                 () => Is.EqualTo(1));
 
-            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
+            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo?.Invoke());
             AddUntilStep("entered song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
 
             addStepClickLink("00:00:000 (1)", waitForSeek: false);
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
index ce266a2d77..9930349b1b 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             AddUntilStep("wait for dialog overlay", () => Game.ChildrenOfType<DialogOverlay>().SingleOrDefault() != null);
 
-            AddStep("open editor", () => Game.ChildrenOfType<ButtonSystem>().Single().OnEditBeatmap.Invoke());
+            AddStep("open editor", () => Game.ChildrenOfType<ButtonSystem>().Single().OnEditBeatmap?.Invoke());
             AddUntilStep("wait for editor", () => Game.ScreenStack.CurrentScreen is Editor editor && editor.IsLoaded);
             AddStep("click on file", () =>
             {
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 79739e4f0c..c4c7599fd7 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -1,12 +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.Linq;
-using JetBrains.Annotations;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -37,24 +34,23 @@ namespace osu.Game.Screens.Menu
 {
     public partial class ButtonSystem : Container, IStateful<ButtonSystemState>, IKeyBindingHandler<GlobalAction>
     {
-        public event Action<ButtonSystemState> StateChanged;
-
-        private readonly IBindable<bool> isIdle = new BindableBool();
-
-        public Action OnEditBeatmap;
-        public Action OnEditSkin;
-        public Action OnExit;
-        public Action OnBeatmapListing;
-        public Action OnSolo;
-        public Action OnSettings;
-        public Action OnMultiplayer;
-        public Action OnPlaylists;
-
         public const float BUTTON_WIDTH = 140f;
         public const float WEDGE_WIDTH = 20;
 
-        [CanBeNull]
-        private OsuLogo logo;
+        public event Action<ButtonSystemState>? StateChanged;
+
+        public Action? OnEditBeatmap;
+        public Action? OnEditSkin;
+        public Action? OnExit;
+        public Action? OnBeatmapListing;
+        public Action? OnSolo;
+        public Action? OnSettings;
+        public Action? OnMultiplayer;
+        public Action? OnPlaylists;
+
+        private readonly IBindable<bool> isIdle = new BindableBool();
+
+        private OsuLogo? logo;
 
         /// <summary>
         /// Assign the <see cref="OsuLogo"/> that this ButtonSystem should manage the position of.
@@ -88,8 +84,8 @@ namespace osu.Game.Screens.Menu
         private readonly List<MainMenuButton> buttonsPlay = new List<MainMenuButton>();
         private readonly List<MainMenuButton> buttonsEdit = new List<MainMenuButton>();
 
-        private Sample sampleBackToLogo;
-        private Sample sampleLogoSwoosh;
+        private Sample? sampleBackToLogo;
+        private Sample? sampleLogoSwoosh;
 
         private readonly LogoTrackingContainer logoTrackingContainer;
 
@@ -124,17 +120,17 @@ namespace osu.Game.Screens.Menu
             buttonArea.Flow.CentreTarget = logoTrackingContainer.LogoFacade;
         }
 
-        [Resolved(CanBeNull = true)]
-        private OsuGame game { get; set; }
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private OsuGame? game { get; set; }
 
-        [Resolved(CanBeNull = true)]
-        private LoginOverlay loginOverlay { get; set; }
+        [Resolved]
+        private LoginOverlay? loginOverlay { get; set; }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, IdleTracker? idleTracker, GameHost host)
         {
             buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Solo, @"button-default-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
             buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Multi, @"button-default-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
@@ -354,7 +350,7 @@ namespace osu.Game.Screens.Menu
             }
         }
 
-        private ScheduledDelegate logoDelayedAction;
+        private ScheduledDelegate? logoDelayedAction;
 
         private void updateLogoState(ButtonSystemState lastState = ButtonSystemState.Initial)
         {

From 8ad414488a630787453fe953bb1c70d327daa992 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 11:02:30 +0900
Subject: [PATCH 1701/2296] Play out previous transforms immediately to avoid
 flow issues with multiple sub menus

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index c4c7599fd7..a954fb50b7 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -338,6 +338,8 @@ namespace osu.Game.Screens.Menu
 
                 Logger.Log($"{nameof(ButtonSystem)}'s state changed from {lastState} to {state}");
 
+                buttonArea.FinishTransforms(true);
+
                 using (buttonArea.BeginDelayedSequence(lastState == ButtonSystemState.Initial ? 150 : 0))
                 {
                     buttonArea.ButtonSystemState = state;

From 1d1b3ca9826127ad986bfd3afc35810622602406 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 11:05:57 +0900
Subject: [PATCH 1702/2296] Apply NRT to `MainMenuButton`

---
 osu.Game/Screens/Menu/MainMenuButton.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index 63fc34b4fb..daf8451899 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.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 osu.Framework;
@@ -33,7 +31,7 @@ namespace osu.Game.Screens.Menu
     /// </summary>
     public partial class MainMenuButton : BeatSyncedContainer, IStateful<ButtonState>
     {
-        public event Action<ButtonState> StateChanged;
+        public event Action<ButtonState>? StateChanged;
 
         public readonly Key[] TriggerKeys;
 
@@ -48,14 +46,14 @@ namespace osu.Game.Screens.Menu
         /// </summary>
         public ButtonSystemState VisibleState = ButtonSystemState.TopLevel;
 
-        private readonly Action clickAction;
-        private Sample sampleClick;
-        private Sample sampleHover;
-        private SampleChannel sampleChannel;
+        private readonly Action? clickAction;
+        private Sample? sampleClick;
+        private Sample? sampleHover;
+        private SampleChannel? sampleChannel;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
-        public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, params Key[] triggerKeys)
+        public MainMenuButton(LocalisableString text, string sampleName, IconUsage symbol, Color4 colour, Action? clickAction = null, float extraWidth = 0, params Key[] triggerKeys)
         {
             this.sampleName = sampleName;
             this.clickAction = clickAction;

From a069a673fa1866e06451ba620daa2191df0e8403 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 11:15:18 +0900
Subject: [PATCH 1703/2296] Allow buttons to be displayed on more than one
 state (and share the back button)

---
 osu.Game/Screens/Menu/ButtonSystem.cs   |  8 ++------
 osu.Game/Screens/Menu/MainMenuButton.cs | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index a954fb50b7..995cdaf450 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -107,12 +107,8 @@ namespace osu.Game.Screens.Menu
                 backButton = new MainMenuButton(ButtonSystemStrings.Back, @"back-to-top", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel,
                     -WEDGE_WIDTH)
                 {
-                    VisibleState = ButtonSystemState.Edit,
-                },
-                backButton = new MainMenuButton(ButtonSystemStrings.Back, @"back-to-top", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel,
-                    -WEDGE_WIDTH)
-                {
-                    VisibleState = ButtonSystemState.Play,
+                    VisibleStateMin = ButtonSystemState.Play,
+                    VisibleStateMax = ButtonSystemState.Edit,
                 },
                 logoTrackingContainer.LogoFacade.With(d => d.Scale = new Vector2(0.74f))
             });
diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index daf8451899..bc638b44ac 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.cs
@@ -42,9 +42,19 @@ namespace osu.Game.Screens.Menu
         private readonly string sampleName;
 
         /// <summary>
-        /// The menu state for which we are visible for.
+        /// The menu state for which we are visible for (assuming only one).
         /// </summary>
-        public ButtonSystemState VisibleState = ButtonSystemState.TopLevel;
+        public ButtonSystemState VisibleState
+        {
+            set
+            {
+                VisibleStateMin = value;
+                VisibleStateMax = value;
+            }
+        }
+
+        public ButtonSystemState VisibleStateMin = ButtonSystemState.TopLevel;
+        public ButtonSystemState VisibleStateMax = ButtonSystemState.TopLevel;
 
         private readonly Action? clickAction;
         private Sample? sampleClick;
@@ -313,9 +323,9 @@ namespace osu.Game.Screens.Menu
                         break;
 
                     default:
-                        if (value == VisibleState)
+                        if (value <= VisibleStateMax && value >= VisibleStateMin)
                             State = ButtonState.Expanded;
-                        else if (value < VisibleState)
+                        else if (value < VisibleStateMin)
                             State = ButtonState.Contracted;
                         else
                             State = ButtonState.Exploded;

From a02b6a5bcb23af26a6fee502a9423b517f75b112 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 11:28:06 +0900
Subject: [PATCH 1704/2296] Update menu key shortcut test coverage

---
 .../UserInterface/TestSceneButtonSystem.cs    | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs
index 1de47aee69..8f72be37df 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs
@@ -67,14 +67,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Enter mode", performEnterMode);
         }
 
-        [TestCase(Key.P, true)]
-        [TestCase(Key.M, true)]
-        [TestCase(Key.L, true)]
-        [TestCase(Key.E, false)]
-        [TestCase(Key.D, false)]
-        [TestCase(Key.Q, false)]
-        [TestCase(Key.O, false)]
-        public void TestShortcutKeys(Key key, bool entersPlay)
+        [TestCase(Key.P, Key.P)]
+        [TestCase(Key.M, Key.P)]
+        [TestCase(Key.L, Key.P)]
+        [TestCase(Key.B, Key.E)]
+        [TestCase(Key.S, Key.E)]
+        [TestCase(Key.D, null)]
+        [TestCase(Key.Q, null)]
+        [TestCase(Key.O, null)]
+        public void TestShortcutKeys(Key key, Key? subMenuEnterKey)
         {
             int activationCount = -1;
             AddStep("set up action", () =>
@@ -96,10 +97,14 @@ namespace osu.Game.Tests.Visual.UserInterface
                         buttons.OnPlaylists = action;
                         break;
 
-                    case Key.E:
+                    case Key.B:
                         buttons.OnEditBeatmap = action;
                         break;
 
+                    case Key.S:
+                        buttons.OnEditSkin = action;
+                        break;
+
                     case Key.D:
                         buttons.OnBeatmapListing = action;
                         break;
@@ -117,10 +122,10 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep($"press {key}", () => InputManager.Key(key));
             AddAssert("state is top level", () => buttons.State == ButtonSystemState.TopLevel);
 
-            if (entersPlay)
+            if (subMenuEnterKey != null)
             {
-                AddStep("press P", () => InputManager.Key(Key.P));
-                AddAssert("state is play", () => buttons.State == ButtonSystemState.Play);
+                AddStep($"press {subMenuEnterKey}", () => InputManager.Key(subMenuEnterKey.Value));
+                AddAssert("state is not top menu", () => buttons.State != ButtonSystemState.TopLevel);
             }
 
             AddStep($"press {key}", () => InputManager.Key(key));

From c7f1fd23e76170ee9c52973022ff0d630b69917f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 24 Nov 2023 06:09:41 +0300
Subject: [PATCH 1705/2296] Implement spinner glow

---
 .../Skinning/Argon/ArgonSpinnerProgressArc.cs | 122 +++++++++++++++++-
 1 file changed, 120 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
index 31cdc0dc0f..b719138d33 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
@@ -2,10 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Runtime.InteropServices;
 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.Primitives;
+using osu.Framework.Graphics.Rendering;
+using osu.Framework.Graphics.Shaders;
+using osu.Framework.Graphics.Shaders.Types;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -19,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         private const float arc_fill = 0.15f;
         private const float arc_radius = 0.12f;
 
-        private CircularProgress fill = null!;
+        private ProgressFill fill = null!;
 
         private DrawableSpinner spinner = null!;
 
@@ -45,13 +52,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     InnerRadius = arc_radius,
                     RoundedCaps = true,
                 },
-                fill = new CircularProgress
+                fill = new ProgressFill
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
                     InnerRadius = arc_radius,
                     RoundedCaps = true,
+                    GlowColour = new Color4(171, 255, 255, 255)
                 }
             };
         }
@@ -67,5 +75,115 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             fill.Rotation = (float)(90 - fill.Current.Value * 180);
         }
+
+        private partial class ProgressFill : CircularProgress
+        {
+            private Color4 glowColour = Color4.White;
+
+            public Color4 GlowColour
+            {
+                get => glowColour;
+                set
+                {
+                    glowColour = value;
+                    Invalidate(Invalidation.DrawNode);
+                }
+            }
+
+            private Texture glowTexture = null!;
+            private IShader glowShader = null!;
+            private float glowSize;
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures, ShaderManager shaders)
+            {
+                glowTexture = textures.Get("Gameplay/osu/spinner-glow");
+                glowShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, "SpinnerGlow");
+                glowSize = Blur.KernelSize(50); // Half of the maximum blur sigma in the design (which is 100)
+            }
+
+            protected override DrawNode CreateDrawNode() => new ProgressFillDrawNode(this);
+
+            private class ProgressFillDrawNode : CircularProgressDrawNode
+            {
+                protected new ProgressFill Source => (ProgressFill)base.Source;
+
+                public ProgressFillDrawNode(CircularProgress source)
+                    : base(source)
+                {
+                }
+
+                private Texture glowTexture = null!;
+                private IShader glowShader = null!;
+                private Quad glowQuad;
+                private float relativeGlowSize;
+                private Color4 glowColour;
+
+                public override void ApplyState()
+                {
+                    base.ApplyState();
+
+                    glowTexture = Source.glowTexture;
+                    glowShader = Source.glowShader;
+                    glowColour = Source.glowColour;
+
+                    // Inflated draw quad by the size of the blur.
+                    glowQuad = Source.ToScreenSpace(DrawRectangle.Inflate(Source.glowSize));
+                    relativeGlowSize = Source.glowSize / Source.DrawSize.X;
+                }
+
+                public override void Draw(IRenderer renderer)
+                {
+                    base.Draw(renderer);
+                    drawGlow(renderer);
+                }
+
+                private void drawGlow(IRenderer renderer)
+                {
+                    renderer.SetBlend(BlendingParameters.Additive);
+
+                    glowShader.Bind();
+                    bindGlowUniformResources(glowShader, renderer);
+
+                    ColourInfo col = DrawColourInfo.Colour;
+                    col.ApplyChild(glowColour);
+
+                    renderer.DrawQuad(glowTexture, glowQuad, col);
+
+                    glowShader.Unbind();
+                }
+
+                private IUniformBuffer<ProgressGlowParameters>? progressGlowParametersBuffer;
+
+                private void bindGlowUniformResources(IShader shader, IRenderer renderer)
+                {
+                    progressGlowParametersBuffer ??= renderer.CreateUniformBuffer<ProgressGlowParameters>();
+                    progressGlowParametersBuffer.Data = new ProgressGlowParameters
+                    {
+                        InnerRadius = InnerRadius,
+                        Progress = Progress,
+                        TexelSize = TexelSize,
+                        GlowSize = relativeGlowSize
+                    };
+
+                    shader.BindUniformBlock("m_ProgressGlowParameters", progressGlowParametersBuffer);
+                }
+
+                protected override void Dispose(bool isDisposing)
+                {
+                    base.Dispose(isDisposing);
+                    progressGlowParametersBuffer?.Dispose();
+                }
+
+                [StructLayout(LayoutKind.Sequential, Pack = 1)]
+                private record struct ProgressGlowParameters
+                {
+                    public UniformFloat InnerRadius;
+                    public UniformFloat Progress;
+                    public UniformFloat TexelSize;
+                    public UniformFloat GlowSize;
+                }
+            }
+        }
     }
 }

From b8179aa875dcb27746bf1e9f236117c3f9bdb30c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 13:23:35 +0900
Subject: [PATCH 1706/2296] Use better(?) icons and full strings

---
 osu.Game/Localisation/EditorStrings.cs | 5 +++++
 osu.Game/Screens/Menu/ButtonSystem.cs  | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index b20b5bc65a..6ad12f54df 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -9,6 +9,11 @@ namespace osu.Game.Localisation
     {
         private const string prefix = @"osu.Game.Resources.Localisation.Editor";
 
+        /// <summary>
+        /// "Beatmap editor"
+        /// </summary>
+        public static LocalisableString BeatmapEditor => new TranslatableString(getKey(@"beatmap_editor"), @"Beatmap editor");
+
         /// <summary>
         /// "Waveform opacity"
         /// </summary>
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 995cdaf450..8173375c29 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -133,8 +133,8 @@ namespace osu.Game.Screens.Menu
             buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Playlists, @"button-default-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
-            buttonsEdit.Add(new MainMenuButton(CommonStrings.Beatmaps.ToLower(), @"button-default-select", FontAwesome.Solid.User, new Color4(238, 170, 0, 255), () => OnEditBeatmap?.Invoke(), WEDGE_WIDTH, Key.B));
-            buttonsEdit.Add(new MainMenuButton(CommonStrings.Skins.ToLower(), @"button-default-select", FontAwesome.Solid.Users, new Color4(220, 160, 0, 255), () => OnEditSkin?.Invoke(), 0, Key.S));
+            buttonsEdit.Add(new MainMenuButton(EditorStrings.BeatmapEditor.ToLower(), @"button-default-select", HexaconsIcons.Beatmap, new Color4(238, 170, 0, 255), () => OnEditBeatmap?.Invoke(), WEDGE_WIDTH, Key.B));
+            buttonsEdit.Add(new MainMenuButton(SkinEditorStrings.SkinEditor.ToLower(), @"button-default-select", HexaconsIcons.Editor, new Color4(220, 160, 0, 255), () => OnEditSkin?.Invoke(), 0, Key.S));
             buttonsEdit.ForEach(b => b.VisibleState = ButtonSystemState.Edit);
 
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));

From 62a04a93c837db0aef81557585120877f513660c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 23 Nov 2023 16:22:34 +0900
Subject: [PATCH 1707/2296] Implement legacy catch health processor

---
 .../Scoring/CatchHealthProcessor.cs           |  15 ++
 .../Scoring/LegacyCatchHealthProcessor.cs     | 237 ++++++++++++++++++
 2 files changed, 252 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
 create mode 100644 osu.Game.Rulesets.Catch/Scoring/LegacyCatchHealthProcessor.cs

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
new file mode 100644
index 0000000000..7e8162bdfa
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.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.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Catch.Scoring
+{
+    public partial class CatchHealthProcessor : DrainingHealthProcessor
+    {
+        public CatchHealthProcessor(double drainStartTime)
+            : base(drainStartTime)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Scoring/LegacyCatchHealthProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/LegacyCatchHealthProcessor.cs
new file mode 100644
index 0000000000..ef13ba222c
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Scoring/LegacyCatchHealthProcessor.cs
@@ -0,0 +1,237 @@
+// 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.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Catch.Scoring
+{
+    /// <summary>
+    /// Reference implementation for osu!stable's HP drain.
+    /// Cannot be used for gameplay.
+    /// </summary>
+    public partial class LegacyCatchHealthProcessor : DrainingHealthProcessor
+    {
+        private const double hp_bar_maximum = 200;
+        private const double hp_combo_geki = 14;
+        private const double hp_hit_300 = 6;
+        private const double hp_slider_tick = 3;
+
+        public Action<string>? OnIterationFail;
+        public Action<string>? OnIterationSuccess;
+        public bool ApplyComboEndBonus { get; set; } = true;
+
+        private double lowestHpEver;
+        private double lowestHpEnd;
+        private double lowestHpComboEnd;
+        private double hpRecoveryAvailable;
+        private double hpMultiplierNormal;
+        private double hpMultiplierComboEnd;
+
+        public LegacyCatchHealthProcessor(double drainStartTime)
+            : base(drainStartTime)
+        {
+        }
+
+        public override void ApplyBeatmap(IBeatmap beatmap)
+        {
+            lowestHpEver = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 195, 160, 60);
+            lowestHpComboEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 198, 170, 80);
+            lowestHpEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 198, 180, 80);
+            hpRecoveryAvailable = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 8, 4, 0);
+
+            base.ApplyBeatmap(beatmap);
+        }
+
+        protected override void ApplyResultInternal(JudgementResult result)
+        {
+            if (!IsSimulating)
+                throw new NotSupportedException("The legacy catch health processor is not supported for gameplay.");
+        }
+
+        protected override void RevertResultInternal(JudgementResult result)
+        {
+            if (!IsSimulating)
+                throw new NotSupportedException("The legacy catch health processor is not supported for gameplay.");
+        }
+
+        protected override void Reset(bool storeResults)
+        {
+            hpMultiplierNormal = 1;
+            hpMultiplierComboEnd = 1;
+
+            base.Reset(storeResults);
+        }
+
+        protected override double ComputeDrainRate()
+        {
+            double testDrop = 0.05;
+            double currentHp;
+            double currentHpUncapped;
+
+            List<(HitObject hitObject, bool newCombo)> allObjects = enumerateHitObjects(Beatmap).Where(h => h.hitObject is Fruit || h.hitObject is Droplet || h.hitObject is Banana).ToList();
+
+            do
+            {
+                currentHp = hp_bar_maximum;
+                currentHpUncapped = hp_bar_maximum;
+
+                double lowestHp = currentHp;
+                double lastTime = DrainStartTime;
+                int currentBreak = 0;
+                bool fail = false;
+                int comboTooLowCount = 0;
+                string failReason = string.Empty;
+
+                for (int i = 0; i < allObjects.Count; i++)
+                {
+                    HitObject h = allObjects[i].hitObject;
+
+                    // Find active break (between current and lastTime)
+                    double localLastTime = lastTime;
+                    double breakTime = 0;
+
+                    // Subtract any break time from the duration since the last object
+                    if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
+                    {
+                        BreakPeriod e = Beatmap.Breaks[currentBreak];
+
+                        if (e.StartTime >= localLastTime && e.EndTime <= h.StartTime)
+                        {
+                            // consider break start equal to object end time for version 8+ since drain stops during this time
+                            breakTime = (Beatmap.BeatmapInfo.BeatmapVersion < 8) ? (e.EndTime - e.StartTime) : e.EndTime - localLastTime;
+                            currentBreak++;
+                        }
+                    }
+
+                    reduceHp(testDrop * (h.StartTime - lastTime - breakTime));
+
+                    lastTime = h.GetEndTime();
+
+                    if (currentHp < lowestHp)
+                        lowestHp = currentHp;
+
+                    if (currentHp <= lowestHpEver)
+                    {
+                        fail = true;
+                        testDrop *= 0.96;
+                        failReason = $"hp too low ({currentHp / hp_bar_maximum} < {lowestHpEver / hp_bar_maximum})";
+                        break;
+                    }
+
+                    switch (h)
+                    {
+                        case Fruit:
+                            if (ApplyComboEndBonus && (i == allObjects.Count - 1 || allObjects[i + 1].newCombo))
+                            {
+                                increaseHp(hpMultiplierComboEnd * hp_combo_geki + hpMultiplierNormal * hp_hit_300);
+
+                                if (currentHp < lowestHpComboEnd)
+                                {
+                                    if (++comboTooLowCount > 2)
+                                    {
+                                        hpMultiplierComboEnd *= 1.07;
+                                        hpMultiplierNormal *= 1.03;
+                                        fail = true;
+                                        failReason = $"combo end hp too low ({currentHp / hp_bar_maximum} < {lowestHpComboEnd / hp_bar_maximum})";
+                                    }
+                                }
+                            }
+                            else
+                                increaseHp(hpMultiplierNormal * hp_hit_300);
+
+                            break;
+
+                        case Banana:
+                            increaseHp(hpMultiplierNormal / 2);
+                            break;
+
+                        case TinyDroplet:
+                            increaseHp(hpMultiplierNormal * hp_slider_tick * 0.1);
+                            break;
+
+                        case Droplet:
+                            increaseHp(hpMultiplierNormal * hp_slider_tick);
+                            break;
+                    }
+
+                    if (fail)
+                        break;
+                }
+
+                if (!fail && currentHp < lowestHpEnd)
+                {
+                    fail = true;
+                    testDrop *= 0.94;
+                    hpMultiplierComboEnd *= 1.01;
+                    hpMultiplierNormal *= 1.01;
+                    failReason = $"end hp too low ({currentHp / hp_bar_maximum} < {lowestHpEnd / hp_bar_maximum})";
+                }
+
+                double recovery = (currentHpUncapped - hp_bar_maximum) / allObjects.Count;
+
+                if (!fail && recovery < hpRecoveryAvailable)
+                {
+                    fail = true;
+                    testDrop *= 0.96;
+                    hpMultiplierComboEnd *= 1.02;
+                    hpMultiplierNormal *= 1.01;
+                    failReason = $"recovery too low ({recovery / hp_bar_maximum} < {hpRecoveryAvailable / hp_bar_maximum})";
+                }
+
+                if (fail)
+                {
+                    OnIterationFail?.Invoke($"FAILED drop {testDrop / hp_bar_maximum}: {failReason}");
+                    continue;
+                }
+
+                OnIterationSuccess?.Invoke($"PASSED drop {testDrop / hp_bar_maximum}");
+                return testDrop / hp_bar_maximum;
+            } while (true);
+
+            void reduceHp(double amount)
+            {
+                currentHpUncapped = Math.Max(0, currentHpUncapped - amount);
+                currentHp = Math.Max(0, currentHp - amount);
+            }
+
+            void increaseHp(double amount)
+            {
+                currentHpUncapped += amount;
+                currentHp = Math.Max(0, Math.Min(hp_bar_maximum, currentHp + amount));
+            }
+        }
+
+        private IEnumerable<(HitObject hitObject, bool newCombo)> enumerateHitObjects(IBeatmap beatmap)
+        {
+            return enumerateRecursively(beatmap.HitObjects);
+
+            static IEnumerable<(HitObject hitObject, bool newCombo)> enumerateRecursively(IEnumerable<HitObject> hitObjects)
+            {
+                foreach (var hitObject in hitObjects)
+                {
+                    // The combo end will either be attached to the hitobject itself if it has no children, or the very first child if it has children.
+                    bool newCombo = (hitObject as IHasComboInformation)?.NewCombo ?? false;
+
+                    foreach ((HitObject nested, bool _) in enumerateRecursively(hitObject.NestedHitObjects))
+                    {
+                        yield return (nested, newCombo);
+
+                        // Since the combo was attached to the first child, don't attach it to any other child or the parenting hitobject itself.
+                        newCombo = false;
+                    }
+
+                    yield return (hitObject, newCombo);
+                }
+            }
+        }
+    }
+}

From acf3de5e25f343f492bbf33135bb2160126a94e6 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 24 Nov 2023 13:22:46 +0900
Subject: [PATCH 1708/2296] Add CatchHealthProcessor, following legacy
 calculations

---
 .../Scoring/CatchHealthProcessor.cs           | 160 ++++++++++++++++++
 1 file changed, 160 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
index 7e8162bdfa..1f6a696f98 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
@@ -1,15 +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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Scoring
 {
     public partial class CatchHealthProcessor : DrainingHealthProcessor
     {
+        public Action<string>? OnIterationFail;
+        public Action<string>? OnIterationSuccess;
+
+        private double lowestHpEver;
+        private double lowestHpEnd;
+        private double hpRecoveryAvailable;
+        private double hpMultiplierNormal;
+
         public CatchHealthProcessor(double drainStartTime)
             : base(drainStartTime)
         {
         }
+
+        public override void ApplyBeatmap(IBeatmap beatmap)
+        {
+            lowestHpEver = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.975, 0.8, 0.3);
+            lowestHpEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.99, 0.9, 0.4);
+            hpRecoveryAvailable = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.04, 0.02, 0);
+
+            base.ApplyBeatmap(beatmap);
+        }
+
+        protected override void Reset(bool storeResults)
+        {
+            hpMultiplierNormal = 1;
+            base.Reset(storeResults);
+        }
+
+        protected override double ComputeDrainRate()
+        {
+            double testDrop = 0.00025;
+            double currentHp;
+            double currentHpUncapped;
+
+            while (true)
+            {
+                currentHp = 1;
+                currentHpUncapped = 1;
+
+                double lowestHp = currentHp;
+                double lastTime = DrainStartTime;
+                int currentBreak = 0;
+                bool fail = false;
+
+                List<HitObject> allObjects = EnumerateHitObjects(Beatmap).Where(h => h is Fruit || h is Droplet || h is Banana).ToList();
+
+                for (int i = 0; i < allObjects.Count; i++)
+                {
+                    HitObject h = allObjects[i];
+
+                    double localLastTime = lastTime;
+                    double breakTime = 0;
+
+                    if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
+                    {
+                        BreakPeriod e = Beatmap.Breaks[currentBreak];
+
+                        if (e.StartTime >= localLastTime && e.EndTime <= h.StartTime)
+                        {
+                            // consider break start equal to object end time for version 8+ since drain stops during this time
+                            breakTime = (Beatmap.BeatmapInfo.BeatmapVersion < 8) ? (e.EndTime - e.StartTime) : e.EndTime - localLastTime;
+                            currentBreak++;
+                        }
+                    }
+
+                    reduceHp(testDrop * (h.StartTime - lastTime - breakTime));
+
+                    lastTime = h.GetEndTime();
+
+                    if (currentHp < lowestHp)
+                        lowestHp = currentHp;
+
+                    if (currentHp <= lowestHpEver)
+                    {
+                        fail = true;
+                        testDrop *= 0.96;
+                        OnIterationFail?.Invoke($"FAILED drop {testDrop}: hp too low ({currentHp} < {lowestHpEver})");
+                        break;
+                    }
+
+                    increaseHp(h);
+                }
+
+                if (!fail && currentHp < lowestHpEnd)
+                {
+                    fail = true;
+                    testDrop *= 0.94;
+                    hpMultiplierNormal *= 1.01;
+                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: end hp too low ({currentHp} < {lowestHpEnd})");
+                }
+
+                double recovery = (currentHpUncapped - 1) / allObjects.Count;
+
+                if (!fail && recovery < hpRecoveryAvailable)
+                {
+                    fail = true;
+                    testDrop *= 0.96;
+                    hpMultiplierNormal *= 1.01;
+                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: recovery too low ({recovery} < {hpRecoveryAvailable})");
+                }
+
+                if (!fail)
+                {
+                    OnIterationSuccess?.Invoke($"PASSED drop {testDrop}");
+                    return testDrop;
+                }
+            }
+
+            void reduceHp(double amount)
+            {
+                currentHpUncapped = Math.Max(0, currentHpUncapped - amount);
+                currentHp = Math.Max(0, currentHp - amount);
+            }
+
+            void increaseHp(HitObject hitObject)
+            {
+                double amount = healthIncreaseFor(hitObject.CreateJudgement().MaxResult);
+                currentHpUncapped += amount;
+                currentHp = Math.Max(0, Math.Min(1, currentHp + amount));
+            }
+        }
+
+        protected override double GetHealthIncreaseFor(JudgementResult result) => healthIncreaseFor(result.Type);
+
+        private double healthIncreaseFor(HitResult result)
+        {
+            double increase = 0;
+
+            switch (result)
+            {
+                case HitResult.SmallTickMiss:
+                    return 0;
+
+                case HitResult.LargeTickMiss:
+                case HitResult.Miss:
+                    return IBeatmapDifficultyInfo.DifficultyRange(Beatmap.Difficulty.DrainRate, -0.03, -0.125, -0.2);
+
+                case HitResult.SmallTickHit:
+                    increase = 0.0015;
+                    break;
+
+                case HitResult.LargeTickHit:
+                    increase = 0.015;
+                    break;
+
+                case HitResult.Great:
+                    increase = 0.03;
+                    break;
+
+                case HitResult.LargeBonus:
+                    increase = 0.0025;
+                    break;
+            }
+
+            return hpMultiplierNormal * increase;
+        }
     }
 }

From 4ba6450c7703bbd44e97a5b3180a5afc4a5115ab Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 24 Nov 2023 13:32:14 +0900
Subject: [PATCH 1709/2296] Use better break calculation

---
 .../Scoring/CatchHealthProcessor.cs           | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
index 1f6a696f98..6d831ad223 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
@@ -65,22 +64,16 @@ namespace osu.Game.Rulesets.Catch.Scoring
                 {
                     HitObject h = allObjects[i];
 
-                    double localLastTime = lastTime;
-                    double breakTime = 0;
-
-                    if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
+                    while (currentBreak < Beatmap.Breaks.Count && Beatmap.Breaks[currentBreak].EndTime <= h.StartTime)
                     {
-                        BreakPeriod e = Beatmap.Breaks[currentBreak];
-
-                        if (e.StartTime >= localLastTime && e.EndTime <= h.StartTime)
-                        {
-                            // consider break start equal to object end time for version 8+ since drain stops during this time
-                            breakTime = (Beatmap.BeatmapInfo.BeatmapVersion < 8) ? (e.EndTime - e.StartTime) : e.EndTime - localLastTime;
-                            currentBreak++;
-                        }
+                        // If two hitobjects are separated by a break period, there is no drain for the full duration between the hitobjects.
+                        // This differs from legacy (version < 8) beatmaps which continue draining until the break section is entered,
+                        // but this shouldn't have a noticeable impact in practice.
+                        lastTime = h.StartTime;
+                        currentBreak++;
                     }
 
-                    reduceHp(testDrop * (h.StartTime - lastTime - breakTime));
+                    reduceHp(testDrop * (h.StartTime - lastTime));
 
                     lastTime = h.GetEndTime();
 

From bb662676347c79343da3ba480693ff5c272b6878 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 24 Nov 2023 13:46:41 +0900
Subject: [PATCH 1710/2296] Actually use CatchHealthProcessor for the ruleset

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 9ceb78893e..013a709663 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Rulesets.Catch
 
         public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor();
 
+        public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new CatchHealthProcessor(drainStartTime);
+
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new CatchBeatmapConverter(beatmap, this);
 
         public override IBeatmapProcessor CreateBeatmapProcessor(IBeatmap beatmap) => new CatchBeatmapProcessor(beatmap);

From 4c7d2bb0fbae426e533572ad905531677f3f27fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 15:14:25 +0900
Subject: [PATCH 1711/2296] Apply NRT to `SpectatorScreen`

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 31 +++++++++-----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 48b5c210b8..f9d5355663 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -1,13 +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.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -33,22 +30,27 @@ namespace osu.Game.Screens.Spectate
         private readonly List<int> users = new List<int>();
 
         [Resolved]
-        private BeatmapManager beatmaps { get; set; }
+        private BeatmapManager beatmaps { get; set; } = null!;
 
         [Resolved]
-        private RulesetStore rulesets { get; set; }
+        private RulesetStore rulesets { get; set; } = null!;
 
         [Resolved]
-        private SpectatorClient spectatorClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; } = null!;
 
         [Resolved]
-        private UserLookupCache userLookupCache { get; set; }
+        private UserLookupCache userLookupCache { get; set; } = null!;
+
+        [Resolved]
+        private RealmAccess realm { get; set; } = null!;
 
         private readonly IBindableDictionary<int, SpectatorState> userStates = new BindableDictionary<int, SpectatorState>();
 
         private readonly Dictionary<int, APIUser> userMap = new Dictionary<int, APIUser>();
         private readonly Dictionary<int, SpectatorGameplayState> gameplayStates = new Dictionary<int, SpectatorGameplayState>();
 
+        private IDisposable? realmSubscription;
+
         /// <summary>
         /// Creates a new <see cref="SpectatorScreen"/>.
         /// </summary>
@@ -58,11 +60,6 @@ namespace osu.Game.Screens.Spectate
             this.users.AddRange(users);
         }
 
-        [Resolved]
-        private RealmAccess realm { get; set; }
-
-        private IDisposable realmSubscription;
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -90,7 +87,7 @@ namespace osu.Game.Screens.Spectate
             }));
         }
 
-        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> items, ChangeSet changes)
+        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> items, ChangeSet? changes)
         {
             if (changes?.InsertedIndices == null) return;
 
@@ -109,7 +106,7 @@ namespace osu.Game.Screens.Spectate
             }
         }
 
-        private void onUserStatesChanged(object sender, NotifyDictionaryChangedEventArgs<int, SpectatorState> e)
+        private void onUserStatesChanged(object? sender, NotifyDictionaryChangedEventArgs<int, SpectatorState> e)
         {
             switch (e.Action)
             {
@@ -207,14 +204,14 @@ namespace osu.Game.Screens.Spectate
         /// </summary>
         /// <param name="userId">The user whose state has changed.</param>
         /// <param name="spectatorState">The new state.</param>
-        protected abstract void OnNewPlayingUserState(int userId, [NotNull] SpectatorState spectatorState);
+        protected abstract void OnNewPlayingUserState(int userId, SpectatorState spectatorState);
 
         /// <summary>
         /// Starts gameplay for a user.
         /// </summary>
         /// <param name="userId">The user to start gameplay for.</param>
         /// <param name="spectatorGameplayState">The gameplay state.</param>
-        protected abstract void StartGameplay(int userId, [NotNull] SpectatorGameplayState spectatorGameplayState);
+        protected abstract void StartGameplay(int userId, SpectatorGameplayState spectatorGameplayState);
 
         /// <summary>
         /// Quits gameplay for a user.
@@ -243,7 +240,7 @@ namespace osu.Game.Screens.Spectate
         {
             base.Dispose(isDisposing);
 
-            if (spectatorClient != null)
+            if (spectatorClient.IsNotNull())
             {
                 foreach ((int userId, var _) in userMap)
                     spectatorClient.StopWatchingUser(userId);

From dabbdf674bc7cab4bbb414ef451c2af158ff8be4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 15:19:04 +0900
Subject: [PATCH 1712/2296] Rename `SoloSpectator` to `SoloSpectatorScreen`

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs      | 8 ++++----
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs    | 2 +-
 .../Play/{SoloSpectator.cs => SoloSpectatorScreen.cs}     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game/Screens/Play/{SoloSpectator.cs => SoloSpectatorScreen.cs} (98%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index ffd034e4d2..db74f7d673 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private TestSpectatorClient spectatorClient => dependenciesScreen.SpectatorClient;
         private DependenciesScreen dependenciesScreen;
-        private SoloSpectator spectatorScreen;
+        private SoloSpectatorScreen spectatorScreen;
 
         private BeatmapSetInfo importedBeatmap;
         private int importedBeatmapId;
@@ -127,7 +127,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
 
-            AddAssert("screen hasn't changed", () => Stack.CurrentScreen is SoloSpectator);
+            AddAssert("screen hasn't changed", () => Stack.CurrentScreen is SoloSpectatorScreen);
 
             start();
             waitForPlayer();
@@ -255,7 +255,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             start(-1234);
             sendFrames();
 
-            AddAssert("screen didn't change", () => Stack.CurrentScreen is SoloSpectator);
+            AddAssert("screen didn't change", () => Stack.CurrentScreen is SoloSpectatorScreen);
         }
 
         [Test]
@@ -381,7 +381,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void loadSpectatingScreen()
         {
-            AddStep("load spectator", () => LoadScreen(spectatorScreen = new SoloSpectator(streamingUser)));
+            AddStep("load spectator", () => LoadScreen(spectatorScreen = new SoloSpectatorScreen(streamingUser)));
             AddUntilStep("wait for screen load", () => spectatorScreen.LoadState == LoadState.Loaded);
         }
 
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 02f0a6e80d..6967a61204 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Overlays.Dashboard
                                 Text = "Spectate",
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Action = () => performer?.PerformFromScreen(s => s.Push(new SoloSpectator(User))),
+                                Action = () => performer?.PerformFromScreen(s => s.Push(new SoloSpectatorScreen(User))),
                                 Enabled = { Value = User.Id != api.LocalUser.Value.Id }
                             }
                         }
diff --git a/osu.Game/Screens/Play/SoloSpectator.cs b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
similarity index 98%
rename from osu.Game/Screens/Play/SoloSpectator.cs
rename to osu.Game/Screens/Play/SoloSpectatorScreen.cs
index f5af2684d3..59b7d87129 100644
--- a/osu.Game/Screens/Play/SoloSpectator.cs
+++ b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
@@ -33,7 +33,7 @@ using osuTK;
 namespace osu.Game.Screens.Play
 {
     [Cached(typeof(IPreviewTrackOwner))]
-    public partial class SoloSpectator : SpectatorScreen, IPreviewTrackOwner
+    public partial class SoloSpectatorScreen : SpectatorScreen, IPreviewTrackOwner
     {
         [NotNull]
         private readonly APIUser targetUser;
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Play
 
         private APIBeatmapSet beatmapSet;
 
-        public SoloSpectator([NotNull] APIUser targetUser)
+        public SoloSpectatorScreen([NotNull] APIUser targetUser)
             : base(targetUser.Id)
         {
             this.targetUser = targetUser;

From 335e8efff769c4ccd5cb4b9c66687a1cc16f941d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 15:56:49 +0900
Subject: [PATCH 1713/2296] Apply NRT to `SoloSpecatorScreen`

---
 osu.Game/Screens/Play/SoloSpectatorScreen.cs | 38 ++++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Play/SoloSpectatorScreen.cs b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
index 59b7d87129..7acdc51fb3 100644
--- a/osu.Game/Screens/Play/SoloSpectatorScreen.cs
+++ b/osu.Game/Screens/Play/SoloSpectatorScreen.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.Diagnostics;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -35,39 +32,38 @@ namespace osu.Game.Screens.Play
     [Cached(typeof(IPreviewTrackOwner))]
     public partial class SoloSpectatorScreen : SpectatorScreen, IPreviewTrackOwner
     {
-        [NotNull]
-        private readonly APIUser targetUser;
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private PreviewTrackManager previewTrackManager { get; set; } = null!;
 
         [Resolved]
-        private PreviewTrackManager previewTrackManager { get; set; }
+        private BeatmapManager beatmaps { get; set; } = null!;
 
         [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        [Resolved]
-        private BeatmapModelDownloader beatmapDownloader { get; set; }
+        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
 
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private Container beatmapPanelContainer;
-        private RoundedButton watchButton;
-        private SettingsCheckbox automaticDownload;
+        private Container beatmapPanelContainer = null!;
+        private RoundedButton watchButton = null!;
+        private SettingsCheckbox automaticDownload = null!;
+
+        private readonly APIUser targetUser;
 
         /// <summary>
         /// The player's immediate online gameplay state.
         /// This doesn't always reflect the gameplay state being watched.
         /// </summary>
-        private SpectatorGameplayState immediateSpectatorGameplayState;
+        private SpectatorGameplayState? immediateSpectatorGameplayState;
 
-        private GetBeatmapSetRequest onlineBeatmapRequest;
+        private GetBeatmapSetRequest? onlineBeatmapRequest;
 
-        private APIBeatmapSet beatmapSet;
+        private APIBeatmapSet? beatmapSet;
 
-        public SoloSpectatorScreen([NotNull] APIUser targetUser)
+        public SoloSpectatorScreen(APIUser targetUser)
             : base(targetUser.Id)
         {
             this.targetUser = targetUser;
@@ -199,10 +195,12 @@ namespace osu.Game.Screens.Play
             previewTrackManager.StopAnyPlaying(this);
         }
 
-        private ScheduledDelegate scheduledStart;
+        private ScheduledDelegate? scheduledStart;
 
-        private void scheduleStart(SpectatorGameplayState spectatorGameplayState)
+        private void scheduleStart(SpectatorGameplayState? spectatorGameplayState)
         {
+            Debug.Assert(spectatorGameplayState != null);
+
             // This function may be called multiple times in quick succession once the screen becomes current again.
             scheduledStart?.Cancel();
             scheduledStart = Schedule(() =>

From e06d79281dc682fadf83cac72bd0bfc2561e3e65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 16:40:22 +0900
Subject: [PATCH 1714/2296] Update tests to work with nested screen

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index db74f7d673..9a1fd660d5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -100,19 +100,18 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
 
-            AddUntilStep("wait for player loader", () => (Stack.CurrentScreen as PlayerLoader)?.IsLoaded == true);
+            AddUntilStep("wait for player loader", () => this.ChildrenOfType<PlayerLoader>().SingleOrDefault()?.IsLoaded == true);
 
             AddUntilStep("queue send frames on player load", () =>
             {
-                var loadingPlayer = (Stack.CurrentScreen as PlayerLoader)?.CurrentPlayer;
+                var loadingPlayer = this.ChildrenOfType<PlayerLoader>().SingleOrDefault()?.CurrentPlayer;
 
                 if (loadingPlayer == null)
                     return false;
 
                 loadingPlayer.OnLoadComplete += _ =>
-                {
                     spectatorClient.SendFramesFromUser(streamingUser.Id, 10, gameplay_start);
-                };
+
                 return true;
             });
 
@@ -360,12 +359,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         private OsuFramedReplayInputHandler replayHandler =>
             (OsuFramedReplayInputHandler)Stack.ChildrenOfType<OsuInputManager>().First().ReplayInputHandler;
 
-        private Player player => Stack.CurrentScreen as Player;
+        private Player player => this.ChildrenOfType<Player>().Single();
 
         private double currentFrameStableTime
             => player.ChildrenOfType<FrameStabilityContainer>().First().CurrentTime;
 
-        private void waitForPlayer() => AddUntilStep("wait for player", () => (Stack.CurrentScreen as Player)?.IsLoaded == true);
+        private void waitForPlayer() => AddUntilStep("wait for player", () => this.ChildrenOfType<Player>().SingleOrDefault()?.IsLoaded == true);
 
         private void start(int? beatmapId = null) => AddStep("start play", () => spectatorClient.SendStartPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 

From ed5375536f1cf96446617b68251354a7f458c2c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 17:14:07 +0900
Subject: [PATCH 1715/2296] Reduce access to various fields and events in
 `SpectatorClient`

Restore some `virtual` specs to appease Moq
---
 osu.Game/Online/Spectator/SpectatorClient.cs | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 14e137caf1..e7435adf29 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -46,9 +46,9 @@ namespace osu.Game.Online.Spectator
         public IBindableList<int> PlayingUsers => playingUsers;
 
         /// <summary>
-        /// Whether the local user is playing.
+        /// Whether the spectated user is playing.
         /// </summary>
-        protected internal bool IsPlaying { get; private set; }
+        private bool isPlaying { get; set; }
 
         /// <summary>
         /// Called whenever new frames arrive from the server.
@@ -58,17 +58,17 @@ namespace osu.Game.Online.Spectator
         /// <summary>
         /// Called whenever a user starts a play session, or immediately if the user is being watched and currently in a play session.
         /// </summary>
-        public virtual event Action<int, SpectatorState>? OnUserBeganPlaying;
+        public event Action<int, SpectatorState>? OnUserBeganPlaying;
 
         /// <summary>
         /// Called whenever a user finishes a play session.
         /// </summary>
-        public virtual event Action<int, SpectatorState>? OnUserFinishedPlaying;
+        public event Action<int, SpectatorState>? OnUserFinishedPlaying;
 
         /// <summary>
         /// Called whenever a user-submitted score has been fully processed.
         /// </summary>
-        public virtual event Action<int, long>? OnUserScoreProcessed;
+        public event Action<int, long>? OnUserScoreProcessed;
 
         /// <summary>
         /// A dictionary containing all users currently being watched, with the number of watching components for each user.
@@ -114,7 +114,7 @@ namespace osu.Game.Online.Spectator
                     }
 
                     // re-send state in case it wasn't received
-                    if (IsPlaying)
+                    if (isPlaying)
                         // TODO: this is likely sent out of order after a reconnect scenario. needs further consideration.
                         BeginPlayingInternal(currentScoreToken, currentState);
                 }
@@ -179,10 +179,10 @@ namespace osu.Game.Online.Spectator
             // This schedule is only here to match the one below in `EndPlaying`.
             Schedule(() =>
             {
-                if (IsPlaying)
+                if (isPlaying)
                     throw new InvalidOperationException($"Cannot invoke {nameof(BeginPlaying)} when already playing");
 
-                IsPlaying = true;
+                isPlaying = true;
 
                 // transfer state at point of beginning play
                 currentState.BeatmapID = score.ScoreInfo.BeatmapInfo!.OnlineID;
@@ -202,7 +202,7 @@ namespace osu.Game.Online.Spectator
 
         public void HandleFrame(ReplayFrame frame) => Schedule(() =>
         {
-            if (!IsPlaying)
+            if (!isPlaying)
             {
                 Logger.Log($"Frames arrived at {nameof(SpectatorClient)} outside of gameplay scope and will be ignored.");
                 return;
@@ -224,7 +224,7 @@ namespace osu.Game.Online.Spectator
             // We probably need to find a better way to handle this...
             Schedule(() =>
             {
-                if (!IsPlaying)
+                if (!isPlaying)
                     return;
 
                 // Disposal can take some time, leading to EndPlaying potentially being called after a future play session.
@@ -235,7 +235,7 @@ namespace osu.Game.Online.Spectator
                 if (pendingFrames.Count > 0)
                     purgePendingFrames();
 
-                IsPlaying = false;
+                isPlaying = false;
                 currentBeatmap = null;
 
                 if (state.HasPassed)

From 73ad92189b0b8026ec966a8051d72d04637f8ead Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Nov 2023 12:07:01 +0900
Subject: [PATCH 1716/2296] Add test coverage of remote player quitting
 immediately quitting locally

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 9a1fd660d5..e3a10c655a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -332,6 +332,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("send quit", () => spectatorClient.SendEndPlay(streamingUser.Id));
             AddUntilStep("state is quit", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Quit);
 
+            AddAssert("wait for player exit", () => Stack.CurrentScreen is SoloSpectatorScreen);
+
             start();
             sendFrames();
             waitForPlayer();

From b024065857bbfbf2953153d3ccc2ee90171f8e52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 14:21:52 +0900
Subject: [PATCH 1717/2296] Remove implicit schedule of `abstract` methods in
 `SpectatorScreen`

This allows each implementation to have control over scheduling. Without
this, the solo implementation would not be able to handle quit events
while watching a player, as it would push a child (gameplay) screen to
the stack where the `SpectatorScreen` would usually be.
---
 .../Spectate/MultiSpectatorScreen.cs          |  8 +++----
 osu.Game/Screens/Play/SoloSpectatorScreen.cs  | 22 ++++++++++++-------
 osu.Game/Screens/Spectate/SpectatorScreen.cs  |  9 +++++---
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index c1b1127542..eb2980fe1e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
         }
 
-        protected override void StartGameplay(int userId, SpectatorGameplayState spectatorGameplayState)
+        protected override void StartGameplay(int userId, SpectatorGameplayState spectatorGameplayState) => Schedule(() =>
         {
             var playerArea = instances.Single(i => i.UserId == userId);
 
@@ -242,9 +242,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
 
             playerArea.LoadScore(spectatorGameplayState.Score);
-        }
+        });
 
-        protected override void QuitGameplay(int userId)
+        protected override void QuitGameplay(int userId) => Schedule(() =>
         {
             RemoveUser(userId);
 
@@ -252,7 +252,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             instance.FadeColour(colours.Gray4, 400, Easing.OutQuint);
             syncManager.RemoveManagedClock(instance.SpectatorPlayerClock);
-        }
+        });
 
         public override bool OnBackButton()
         {
diff --git a/osu.Game/Screens/Play/SoloSpectatorScreen.cs b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
index 7acdc51fb3..770018a0c8 100644
--- a/osu.Game/Screens/Play/SoloSpectatorScreen.cs
+++ b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
@@ -164,27 +164,33 @@ namespace osu.Game.Screens.Play
             automaticDownload.Current.BindValueChanged(_ => checkForAutomaticDownload());
         }
 
-        protected override void OnNewPlayingUserState(int userId, SpectatorState spectatorState)
+        protected override void OnNewPlayingUserState(int userId, SpectatorState spectatorState) => Schedule(() =>
         {
             clearDisplay();
             showBeatmapPanel(spectatorState);
-        }
+        });
 
-        protected override void StartGameplay(int userId, SpectatorGameplayState spectatorGameplayState)
+        protected override void StartGameplay(int userId, SpectatorGameplayState spectatorGameplayState) => Schedule(() =>
         {
             immediateSpectatorGameplayState = spectatorGameplayState;
             watchButton.Enabled.Value = true;
 
             scheduleStart(spectatorGameplayState);
-        }
+        });
 
         protected override void QuitGameplay(int userId)
         {
-            scheduledStart?.Cancel();
-            immediateSpectatorGameplayState = null;
-            watchButton.Enabled.Value = false;
+            // Importantly, don't schedule this call, as a child screen may be present (and will cause the schedule to not be run as expected).
+            this.MakeCurrent();
 
-            clearDisplay();
+            Schedule(() =>
+            {
+                scheduledStart?.Cancel();
+                immediateSpectatorGameplayState = null;
+                watchButton.Enabled.Value = false;
+
+                clearDisplay();
+            });
         }
 
         private void clearDisplay()
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index f9d5355663..21f96c83f5 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Screens.Spectate
             switch (newState.State)
             {
                 case SpectatedUserState.Playing:
-                    Schedule(() => OnNewPlayingUserState(userId, newState));
+                    OnNewPlayingUserState(userId, newState);
                     startGameplay(userId);
                     break;
 
@@ -173,7 +173,7 @@ namespace osu.Game.Screens.Spectate
             var gameplayState = new SpectatorGameplayState(score, resolvedRuleset, beatmaps.GetWorkingBeatmap(resolvedBeatmap));
 
             gameplayStates[userId] = gameplayState;
-            Schedule(() => StartGameplay(userId, gameplayState));
+            StartGameplay(userId, gameplayState);
         }
 
         /// <summary>
@@ -196,11 +196,12 @@ namespace osu.Game.Screens.Spectate
             markReceivedAllFrames(userId);
 
             gameplayStates.Remove(userId);
-            Schedule(() => QuitGameplay(userId));
+            QuitGameplay(userId);
         }
 
         /// <summary>
         /// Invoked when a spectated user's state has changed to a new state indicating the player is currently playing.
+        /// Thread safety is not guaranteed – should be scheduled as required.
         /// </summary>
         /// <param name="userId">The user whose state has changed.</param>
         /// <param name="spectatorState">The new state.</param>
@@ -208,6 +209,7 @@ namespace osu.Game.Screens.Spectate
 
         /// <summary>
         /// Starts gameplay for a user.
+        /// Thread safety is not guaranteed – should be scheduled as required.
         /// </summary>
         /// <param name="userId">The user to start gameplay for.</param>
         /// <param name="spectatorGameplayState">The gameplay state.</param>
@@ -215,6 +217,7 @@ namespace osu.Game.Screens.Spectate
 
         /// <summary>
         /// Quits gameplay for a user.
+        /// Thread safety is not guaranteed – should be scheduled as required.
         /// </summary>
         /// <param name="userId">The user to quit gameplay for.</param>
         protected abstract void QuitGameplay(int userId);

From 51e2ce500d67c4f634d75af59b04ba69302ef44f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Nov 2023 12:45:03 +0900
Subject: [PATCH 1718/2296] Add test coverage of remote user failing
 immediately failing locally

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index e3a10c655a..f5e4c5da51 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -352,6 +352,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("send failed", () => spectatorClient.SendEndPlay(streamingUser.Id, SpectatedUserState.Failed));
             AddUntilStep("state is failed", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Failed);
 
+            AddUntilStep("wait for player to fail", () => player.GameplayState.HasFailed);
+
             start();
             sendFrames();
             waitForPlayer();

From ca93fdc94b07bd1bd539d72265ea65edfe8fa6a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 17:53:35 +0900
Subject: [PATCH 1719/2296] Add visualisation of when a spectated player fails

Create a new stack each time for isolation and safety
---
 .../Spectate/MultiSpectatorScreen.cs          |  5 ++++
 osu.Game/Screens/Play/SoloSpectatorPlayer.cs  |  4 +--
 osu.Game/Screens/Play/SoloSpectatorScreen.cs  | 14 ++++++++++-
 osu.Game/Screens/Play/SpectatorPlayer.cs      | 12 ++++++++-
 osu.Game/Screens/Spectate/SpectatorScreen.cs  | 25 +++++++++++++++++++
 5 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index eb2980fe1e..e2159f0e3b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -244,6 +244,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             playerArea.LoadScore(spectatorGameplayState.Score);
         });
 
+        protected override void FailGameplay(int userId)
+        {
+            // We probably want to visualise this in the future.
+        }
+
         protected override void QuitGameplay(int userId) => Schedule(() =>
         {
             RemoveUser(userId);
diff --git a/osu.Game/Screens/Play/SoloSpectatorPlayer.cs b/osu.Game/Screens/Play/SoloSpectatorPlayer.cs
index c9d1f4acaa..8d25a0148d 100644
--- a/osu.Game/Screens/Play/SoloSpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SoloSpectatorPlayer.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Screens.Play
 
         protected override UserActivity InitialActivity => new UserActivity.SpectatingUser(Score.ScoreInfo);
 
-        public SoloSpectatorPlayer(Score score, PlayerConfiguration configuration = null)
-            : base(score, configuration)
+        public SoloSpectatorPlayer(Score score)
+            : base(score, new PlayerConfiguration { AllowUserInteraction = false })
         {
             this.score = score;
         }
diff --git a/osu.Game/Screens/Play/SoloSpectatorScreen.cs b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
index 770018a0c8..d4a9fc4b30 100644
--- a/osu.Game/Screens/Play/SoloSpectatorScreen.cs
+++ b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
@@ -178,6 +178,19 @@ namespace osu.Game.Screens.Play
             scheduleStart(spectatorGameplayState);
         });
 
+        protected override void FailGameplay(int userId)
+        {
+            if (this.GetChildScreen() is SpectatorPlayer player)
+                player.AllowFail();
+
+            Schedule(() =>
+            {
+                scheduledStart?.Cancel();
+                immediateSpectatorGameplayState = null;
+                clearDisplay();
+            });
+        }
+
         protected override void QuitGameplay(int userId)
         {
             // Importantly, don't schedule this call, as a child screen may be present (and will cause the schedule to not be run as expected).
@@ -187,7 +200,6 @@ namespace osu.Game.Screens.Play
             {
                 scheduledStart?.Cancel();
                 immediateSpectatorGameplayState = null;
-                watchButton.Enabled.Value = false;
 
                 clearDisplay();
             });
diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index 30a5ac3741..bc95fa190c 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -25,7 +25,15 @@ namespace osu.Game.Screens.Play
 
         private readonly Score score;
 
-        protected override bool CheckModsAllowFailure() => false; // todo: better support starting mid-way through beatmap
+        protected override bool CheckModsAllowFailure()
+        {
+            if (!allowFail)
+                return false;
+
+            return base.CheckModsAllowFailure();
+        }
+
+        private bool allowFail;
 
         protected SpectatorPlayer(Score score, PlayerConfiguration configuration = null)
             : base(configuration)
@@ -123,5 +131,7 @@ namespace osu.Game.Screens.Play
             if (SpectatorClient != null)
                 SpectatorClient.OnNewFrames -= userSentFrames;
         }
+
+        public void AllowFail() => allowFail = true;
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 21f96c83f5..c4aef3c878 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -137,6 +137,10 @@ namespace osu.Game.Screens.Spectate
                     markReceivedAllFrames(userId);
                     break;
 
+                case SpectatedUserState.Failed:
+                    failGameplay(userId);
+                    break;
+
                 case SpectatedUserState.Quit:
                     quitGameplay(userId);
                     break;
@@ -185,6 +189,20 @@ namespace osu.Game.Screens.Spectate
                 gameplayState.Score.Replay.HasReceivedAllFrames = true;
         }
 
+        private void failGameplay(int userId)
+        {
+            if (!userMap.ContainsKey(userId))
+                return;
+
+            if (!gameplayStates.ContainsKey(userId))
+                return;
+
+            markReceivedAllFrames(userId);
+
+            gameplayStates.Remove(userId);
+            FailGameplay(userId);
+        }
+
         private void quitGameplay(int userId)
         {
             if (!userMap.ContainsKey(userId))
@@ -222,6 +240,13 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userId">The user to quit gameplay for.</param>
         protected abstract void QuitGameplay(int userId);
 
+        /// <summary>
+        /// Fails gameplay for a user.
+        /// Thread safety is not guaranteed – should be scheduled as required.
+        /// </summary>
+        /// <param name="userId">The user to fail gameplay for.</param>
+        protected abstract void FailGameplay(int userId);
+
         /// <summary>
         /// Stops spectating a user.
         /// </summary>

From 8375dd72d6e691ef393aecf1e2c3c418f46cd128 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Nov 2023 10:01:59 +0900
Subject: [PATCH 1720/2296] Add xmldoc to new `AllowFail` method

---
 osu.Game/Screens/Play/Player.cs          | 7 +++++++
 osu.Game/Screens/Play/SpectatorPlayer.cs | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8c7fc551ba..ad725e1a90 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -894,6 +894,13 @@ namespace osu.Game.Screens.Play
 
         #region Fail Logic
 
+        /// <summary>
+        /// Invoked when gameplay has permanently failed.
+        /// </summary>
+        protected virtual void OnFail()
+        {
+        }
+
         protected FailOverlay FailOverlay { get; private set; }
 
         private FailAnimationContainer failAnimationContainer;
diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index bc95fa190c..d1404ac184 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -68,6 +68,12 @@ namespace osu.Game.Screens.Play
             }, true);
         }
 
+        /// <summary>
+        /// Should be called when it is apparent that the player being spectated has failed.
+        /// This will subsequently stop blocking the fail screen from displaying (usually done out of safety).
+        /// </summary>
+        public void AllowFail() => allowFail = true;
+
         protected override void StartGameplay()
         {
             base.StartGameplay();
@@ -131,7 +137,5 @@ namespace osu.Game.Screens.Play
             if (SpectatorClient != null)
                 SpectatorClient.OnNewFrames -= userSentFrames;
         }
-
-        public void AllowFail() => allowFail = true;
     }
 }

From 4ad3cb3b4952aeb09847fe4e20fd581eaf8a52a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 18:20:22 +0900
Subject: [PATCH 1721/2296] Submit and send failed spectator state more
 aggressively

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 30fecbe149..14aaa8f638 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -54,6 +54,8 @@ namespace osu.Game.Screens.Play
             }
 
             AddInternal(new PlayerTouchInputDetector());
+
+            HealthProcessor.Failed += onFail;
         }
 
         protected override void LoadAsyncComplete()
@@ -165,10 +167,21 @@ namespace osu.Game.Screens.Play
             spectatorClient.BeginPlaying(token, GameplayState, Score);
         }
 
+        private bool onFail()
+        {
+            submitFromFailOrQuit();
+            return true;
+        }
+
         public override bool OnExiting(ScreenExitEvent e)
         {
             bool exiting = base.OnExiting(e);
+            submitFromFailOrQuit();
+            return exiting;
+        }
 
+        private void submitFromFailOrQuit()
+        {
             if (LoadedBeatmapSuccessfully)
             {
                 Task.Run(async () =>
@@ -177,8 +190,6 @@ namespace osu.Game.Screens.Play
                     spectatorClient.EndPlaying(GameplayState);
                 }).FireAndForget();
             }
-
-            return exiting;
         }
 
         /// <summary>

From ef5dd245894e3ea4b8658929054b92276b91c4e4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Nov 2023 10:28:15 +0900
Subject: [PATCH 1722/2296] Update failing test coverage and fix `onFail` being
 called too often

---
 .../Visual/Gameplay/TestScenePlayerScoreSubmission.cs      | 1 -
 osu.Game/Screens/Play/Player.cs                            | 1 +
 osu.Game/Screens/Play/SubmittingPlayer.cs                  | 7 +++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
index 1a7ea20cc0..f75a2656ef 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
@@ -179,7 +179,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             addFakeHit();
 
             AddUntilStep("wait for fail", () => Player.GameplayState.HasFailed);
-            AddStep("exit", () => Player.Exit());
 
             AddUntilStep("wait for submission", () => Player.SubmittedScore != null);
             AddAssert("ensure failing submission", () => Player.SubmittedScore.ScoreInfo.Passed == false);
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ad725e1a90..b469ab443c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -933,6 +933,7 @@ namespace osu.Game.Screens.Play
             if (GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
                 Restart(true);
 
+            OnFail();
             return true;
         }
 
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 14aaa8f638..785164178a 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -54,8 +54,6 @@ namespace osu.Game.Screens.Play
             }
 
             AddInternal(new PlayerTouchInputDetector());
-
-            HealthProcessor.Failed += onFail;
         }
 
         protected override void LoadAsyncComplete()
@@ -167,10 +165,11 @@ namespace osu.Game.Screens.Play
             spectatorClient.BeginPlaying(token, GameplayState, Score);
         }
 
-        private bool onFail()
+        protected override void OnFail()
         {
+            base.OnFail();
+
             submitFromFailOrQuit();
-            return true;
         }
 
         public override bool OnExiting(ScreenExitEvent e)

From d3a55d83c000dd1bf0174a9811585e214d605346 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Nov 2023 11:05:52 +0900
Subject: [PATCH 1723/2296] Schedule `FailScore` inside `onFail` instead of
 `onFailComplete`

---
 osu.Game/Screens/Play/Player.cs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b469ab443c..ff00b52f71 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -930,10 +930,22 @@ namespace osu.Game.Screens.Play
 
             failAnimationContainer.Start();
 
-            if (GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
-                Restart(true);
+            // Failures can be triggered either by a judgement, or by a mod.
+            //
+            // For the case of a judgement, due to ordering considerations, ScoreProcessor will not have received
+            // the final judgement which triggered the failure yet (see DrawableRuleset.NewResult handling above).
+            //
+            // A schedule here ensures that any lingering judgements from the current frame are applied before we
+            // finalise the score as "failed".
+            Schedule(() =>
+            {
+                ScoreProcessor.FailScore(Score.ScoreInfo);
+                OnFail();
+
+                if (GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
+                    Restart(true);
+            });
 
-            OnFail();
             return true;
         }
 
@@ -942,11 +954,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private void onFailComplete()
         {
-            // fail completion is a good point to mark a score as failed,
-            // since the last judgement that caused the fail only applies to score processor after onFail.
-            // todo: this should probably be handled better.
-            ScoreProcessor.FailScore(Score.ScoreInfo);
-
             GameplayClockContainer.Stop();
 
             FailOverlay.Retries = RestartCount;

From 7ceb49fbc095ae9b8bd91a6bf4c6c2d8763186f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 14:58:57 +0900
Subject: [PATCH 1724/2296] Add extra test coverage and handle case where still
 at loading screen

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 64 +++++++++++++------
 osu.Game/Screens/Play/SoloSpectatorScreen.cs  | 33 +++++-----
 2 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index f5e4c5da51..1c7ede2b19 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
 
-            waitForPlayer();
+            waitForPlayerCurrent();
 
             sendFrames(startTime: gameplay_start);
 
@@ -115,7 +115,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 return true;
             });
 
-            waitForPlayer();
+            waitForPlayerCurrent();
 
             AddUntilStep("state is playing", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Playing);
             AddAssert("time is greater than seek target", () => currentFrameStableTime, () => Is.GreaterThan(gameplay_start));
@@ -129,7 +129,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("screen hasn't changed", () => Stack.CurrentScreen is SoloSpectatorScreen);
 
             start();
-            waitForPlayer();
+            waitForPlayerCurrent();
 
             sendFrames();
             AddAssert("ensure frames arrived", () => replayHandler.HasFrames);
@@ -155,7 +155,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             loadSpectatingScreen();
 
             start();
-            waitForPlayer();
+            waitForPlayerCurrent();
             checkPaused(true);
 
             // send enough frames to ensure play won't be paused
@@ -171,7 +171,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             sendFrames(300);
 
             loadSpectatingScreen();
-            waitForPlayer();
+            waitForPlayerCurrent();
 
             sendFrames(300);
 
@@ -186,7 +186,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             start();
             sendFrames();
 
-            waitForPlayer();
+            waitForPlayerCurrent();
 
             Player lastPlayer = null;
             AddStep("store first player", () => lastPlayer = player);
@@ -194,7 +194,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             start();
             sendFrames();
 
-            waitForPlayer();
+            waitForPlayerCurrent();
             AddAssert("player is different", () => lastPlayer != player);
         }
 
@@ -205,7 +205,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
 
-            waitForPlayer();
+            waitForPlayerCurrent();
             checkPaused(true);
             sendFrames();
 
@@ -223,7 +223,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
             sendFrames();
-            waitForPlayer();
+            waitForPlayerCurrent();
 
             AddStep("stop spectating", () => (Stack.CurrentScreen as Player)?.Exit());
             AddUntilStep("spectating stopped", () => spectatorScreen.GetChildScreen() == null);
@@ -236,14 +236,14 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
             sendFrames();
-            waitForPlayer();
+            waitForPlayerCurrent();
 
             AddStep("stop spectating", () => (Stack.CurrentScreen as Player)?.Exit());
             AddUntilStep("spectating stopped", () => spectatorScreen.GetChildScreen() == null);
 
             // host starts playing a new session
             start();
-            waitForPlayer();
+            waitForPlayerCurrent();
         }
 
         [Test]
@@ -298,7 +298,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
             sendFrames();
-            waitForPlayer();
+            waitForPlayerCurrent();
             AddUntilStep("state is playing", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Playing);
         }
 
@@ -309,14 +309,14 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
             sendFrames();
-            waitForPlayer();
+            waitForPlayerCurrent();
 
             AddStep("send passed", () => spectatorClient.SendEndPlay(streamingUser.Id, SpectatedUserState.Passed));
             AddUntilStep("state is passed", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Passed);
 
             start();
             sendFrames();
-            waitForPlayer();
+            waitForPlayerCurrent();
             AddUntilStep("state is playing", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Playing);
         }
 
@@ -327,7 +327,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
             sendFrames();
-            waitForPlayer();
+            waitForPlayerCurrent();
 
             AddStep("send quit", () => spectatorClient.SendEndPlay(streamingUser.Id));
             AddUntilStep("state is quit", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Quit);
@@ -336,18 +336,19 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
             sendFrames();
-            waitForPlayer();
+            waitForPlayerCurrent();
             AddUntilStep("state is playing", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Playing);
         }
 
         [Test]
-        public void TestFailedState()
+        public void TestFailedStateDuringPlay()
         {
             loadSpectatingScreen();
 
             start();
             sendFrames();
-            waitForPlayer();
+
+            waitForPlayerCurrent();
 
             AddStep("send failed", () => spectatorClient.SendEndPlay(streamingUser.Id, SpectatedUserState.Failed));
             AddUntilStep("state is failed", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Failed);
@@ -356,7 +357,28 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             start();
             sendFrames();
-            waitForPlayer();
+            waitForPlayerCurrent();
+            AddUntilStep("state is playing", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Playing);
+        }
+
+        [Test]
+        public void TestFailedStateDuringLoading()
+        {
+            loadSpectatingScreen();
+
+            start();
+            sendFrames();
+
+            waitForPlayerLoader();
+
+            AddStep("send failed", () => spectatorClient.SendEndPlay(streamingUser.Id, SpectatedUserState.Failed));
+            AddUntilStep("state is failed", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Failed);
+
+            AddAssert("wait for player exit", () => Stack.CurrentScreen is SoloSpectatorScreen);
+
+            start();
+            sendFrames();
+            waitForPlayerCurrent();
             AddUntilStep("state is playing", () => spectatorClient.WatchedUserStates[streamingUser.Id].State == SpectatedUserState.Playing);
         }
 
@@ -368,7 +390,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         private double currentFrameStableTime
             => player.ChildrenOfType<FrameStabilityContainer>().First().CurrentTime;
 
-        private void waitForPlayer() => AddUntilStep("wait for player", () => this.ChildrenOfType<Player>().SingleOrDefault()?.IsLoaded == true);
+        private void waitForPlayerLoader() => AddUntilStep("wait for loading", () => this.ChildrenOfType<SpectatorPlayerLoader>().SingleOrDefault()?.IsLoaded == true);
+
+        private void waitForPlayerCurrent() => AddUntilStep("wait for player current", () => this.ChildrenOfType<Player>().SingleOrDefault()?.IsCurrentScreen() == true);
 
         private void start(int? beatmapId = null) => AddStep("start play", () => spectatorClient.SendStartPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
diff --git a/osu.Game/Screens/Play/SoloSpectatorScreen.cs b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
index d4a9fc4b30..2db751402c 100644
--- a/osu.Game/Screens/Play/SoloSpectatorScreen.cs
+++ b/osu.Game/Screens/Play/SoloSpectatorScreen.cs
@@ -180,31 +180,32 @@ namespace osu.Game.Screens.Play
 
         protected override void FailGameplay(int userId)
         {
-            if (this.GetChildScreen() is SpectatorPlayer player)
-                player.AllowFail();
-
-            Schedule(() =>
+            if (this.GetChildScreen() is SpectatorPlayerLoader loader)
             {
-                scheduledStart?.Cancel();
-                immediateSpectatorGameplayState = null;
-                clearDisplay();
-            });
+                if (loader.GetChildScreen() is SpectatorPlayer player)
+                {
+                    player.AllowFail();
+                    resetStartState();
+                }
+                else
+                    QuitGameplay(userId);
+            }
         }
 
         protected override void QuitGameplay(int userId)
         {
             // Importantly, don't schedule this call, as a child screen may be present (and will cause the schedule to not be run as expected).
             this.MakeCurrent();
-
-            Schedule(() =>
-            {
-                scheduledStart?.Cancel();
-                immediateSpectatorGameplayState = null;
-
-                clearDisplay();
-            });
+            resetStartState();
         }
 
+        private void resetStartState() => Schedule(() =>
+        {
+            scheduledStart?.Cancel();
+            immediateSpectatorGameplayState = null;
+            clearDisplay();
+        });
+
         private void clearDisplay()
         {
             watchButton.Enabled.Value = false;

From 289cda71b236d98f622f5c8920ba91dd14bb40b8 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 24 Nov 2023 15:06:51 +0900
Subject: [PATCH 1725/2296] Fix inspections

---
 osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs | 8 ++++----
 osu.Game/Screens/Menu/ButtonSystem.cs                     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
index 4bcd6b100a..459a8b0df5 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestFromSongSelectWithFilter([Values] ScorePresentType type)
         {
-            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
+            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");
@@ -110,7 +110,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestFromSongSelectWithConvertRulesetChange([Values] ScorePresentType type)
         {
-            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
+            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));
@@ -122,7 +122,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestFromSongSelect([Values] ScorePresentType type)
         {
-            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
+            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo?.Invoke());
             AddUntilStep("song select is current", () => Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect && songSelect.BeatmapSetsLoaded);
 
             var firstImport = importScore(1);
@@ -135,7 +135,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestFromSongSelectDifferentRuleset([Values] ScorePresentType type)
         {
-            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
+            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo?.Invoke());
             AddUntilStep("song select is current", () => Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect && songSelect.BeatmapSetsLoaded);
 
             var firstImport = importScore(1);
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 8173375c29..78eb410a48 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Menu
         /// Assign the <see cref="OsuLogo"/> that this ButtonSystem should manage the position of.
         /// </summary>
         /// <param name="logo">The instance of the logo to be assigned. If null, we are suspending from the screen that uses this ButtonSystem.</param>
-        public void SetOsuLogo(OsuLogo logo)
+        public void SetOsuLogo(OsuLogo? logo)
         {
             this.logo = logo;
 

From c126c46e2d25bcf2b1853ef80b869a230a9bb8ff Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 24 Nov 2023 15:43:57 +0900
Subject: [PATCH 1726/2296] Remove legacy implementations (moved to osu-tools)

---
 .../Scoring/LegacyCatchHealthProcessor.cs     | 237 ------------------
 .../Scoring/LegacyOsuHealthProcessor.cs       | 215 ----------------
 2 files changed, 452 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Catch/Scoring/LegacyCatchHealthProcessor.cs
 delete mode 100644 osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs

diff --git a/osu.Game.Rulesets.Catch/Scoring/LegacyCatchHealthProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/LegacyCatchHealthProcessor.cs
deleted file mode 100644
index ef13ba222c..0000000000
--- a/osu.Game.Rulesets.Catch/Scoring/LegacyCatchHealthProcessor.cs
+++ /dev/null
@@ -1,237 +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.Linq;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Timing;
-using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Catch.Scoring
-{
-    /// <summary>
-    /// Reference implementation for osu!stable's HP drain.
-    /// Cannot be used for gameplay.
-    /// </summary>
-    public partial class LegacyCatchHealthProcessor : DrainingHealthProcessor
-    {
-        private const double hp_bar_maximum = 200;
-        private const double hp_combo_geki = 14;
-        private const double hp_hit_300 = 6;
-        private const double hp_slider_tick = 3;
-
-        public Action<string>? OnIterationFail;
-        public Action<string>? OnIterationSuccess;
-        public bool ApplyComboEndBonus { get; set; } = true;
-
-        private double lowestHpEver;
-        private double lowestHpEnd;
-        private double lowestHpComboEnd;
-        private double hpRecoveryAvailable;
-        private double hpMultiplierNormal;
-        private double hpMultiplierComboEnd;
-
-        public LegacyCatchHealthProcessor(double drainStartTime)
-            : base(drainStartTime)
-        {
-        }
-
-        public override void ApplyBeatmap(IBeatmap beatmap)
-        {
-            lowestHpEver = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 195, 160, 60);
-            lowestHpComboEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 198, 170, 80);
-            lowestHpEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 198, 180, 80);
-            hpRecoveryAvailable = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 8, 4, 0);
-
-            base.ApplyBeatmap(beatmap);
-        }
-
-        protected override void ApplyResultInternal(JudgementResult result)
-        {
-            if (!IsSimulating)
-                throw new NotSupportedException("The legacy catch health processor is not supported for gameplay.");
-        }
-
-        protected override void RevertResultInternal(JudgementResult result)
-        {
-            if (!IsSimulating)
-                throw new NotSupportedException("The legacy catch health processor is not supported for gameplay.");
-        }
-
-        protected override void Reset(bool storeResults)
-        {
-            hpMultiplierNormal = 1;
-            hpMultiplierComboEnd = 1;
-
-            base.Reset(storeResults);
-        }
-
-        protected override double ComputeDrainRate()
-        {
-            double testDrop = 0.05;
-            double currentHp;
-            double currentHpUncapped;
-
-            List<(HitObject hitObject, bool newCombo)> allObjects = enumerateHitObjects(Beatmap).Where(h => h.hitObject is Fruit || h.hitObject is Droplet || h.hitObject is Banana).ToList();
-
-            do
-            {
-                currentHp = hp_bar_maximum;
-                currentHpUncapped = hp_bar_maximum;
-
-                double lowestHp = currentHp;
-                double lastTime = DrainStartTime;
-                int currentBreak = 0;
-                bool fail = false;
-                int comboTooLowCount = 0;
-                string failReason = string.Empty;
-
-                for (int i = 0; i < allObjects.Count; i++)
-                {
-                    HitObject h = allObjects[i].hitObject;
-
-                    // Find active break (between current and lastTime)
-                    double localLastTime = lastTime;
-                    double breakTime = 0;
-
-                    // Subtract any break time from the duration since the last object
-                    if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
-                    {
-                        BreakPeriod e = Beatmap.Breaks[currentBreak];
-
-                        if (e.StartTime >= localLastTime && e.EndTime <= h.StartTime)
-                        {
-                            // consider break start equal to object end time for version 8+ since drain stops during this time
-                            breakTime = (Beatmap.BeatmapInfo.BeatmapVersion < 8) ? (e.EndTime - e.StartTime) : e.EndTime - localLastTime;
-                            currentBreak++;
-                        }
-                    }
-
-                    reduceHp(testDrop * (h.StartTime - lastTime - breakTime));
-
-                    lastTime = h.GetEndTime();
-
-                    if (currentHp < lowestHp)
-                        lowestHp = currentHp;
-
-                    if (currentHp <= lowestHpEver)
-                    {
-                        fail = true;
-                        testDrop *= 0.96;
-                        failReason = $"hp too low ({currentHp / hp_bar_maximum} < {lowestHpEver / hp_bar_maximum})";
-                        break;
-                    }
-
-                    switch (h)
-                    {
-                        case Fruit:
-                            if (ApplyComboEndBonus && (i == allObjects.Count - 1 || allObjects[i + 1].newCombo))
-                            {
-                                increaseHp(hpMultiplierComboEnd * hp_combo_geki + hpMultiplierNormal * hp_hit_300);
-
-                                if (currentHp < lowestHpComboEnd)
-                                {
-                                    if (++comboTooLowCount > 2)
-                                    {
-                                        hpMultiplierComboEnd *= 1.07;
-                                        hpMultiplierNormal *= 1.03;
-                                        fail = true;
-                                        failReason = $"combo end hp too low ({currentHp / hp_bar_maximum} < {lowestHpComboEnd / hp_bar_maximum})";
-                                    }
-                                }
-                            }
-                            else
-                                increaseHp(hpMultiplierNormal * hp_hit_300);
-
-                            break;
-
-                        case Banana:
-                            increaseHp(hpMultiplierNormal / 2);
-                            break;
-
-                        case TinyDroplet:
-                            increaseHp(hpMultiplierNormal * hp_slider_tick * 0.1);
-                            break;
-
-                        case Droplet:
-                            increaseHp(hpMultiplierNormal * hp_slider_tick);
-                            break;
-                    }
-
-                    if (fail)
-                        break;
-                }
-
-                if (!fail && currentHp < lowestHpEnd)
-                {
-                    fail = true;
-                    testDrop *= 0.94;
-                    hpMultiplierComboEnd *= 1.01;
-                    hpMultiplierNormal *= 1.01;
-                    failReason = $"end hp too low ({currentHp / hp_bar_maximum} < {lowestHpEnd / hp_bar_maximum})";
-                }
-
-                double recovery = (currentHpUncapped - hp_bar_maximum) / allObjects.Count;
-
-                if (!fail && recovery < hpRecoveryAvailable)
-                {
-                    fail = true;
-                    testDrop *= 0.96;
-                    hpMultiplierComboEnd *= 1.02;
-                    hpMultiplierNormal *= 1.01;
-                    failReason = $"recovery too low ({recovery / hp_bar_maximum} < {hpRecoveryAvailable / hp_bar_maximum})";
-                }
-
-                if (fail)
-                {
-                    OnIterationFail?.Invoke($"FAILED drop {testDrop / hp_bar_maximum}: {failReason}");
-                    continue;
-                }
-
-                OnIterationSuccess?.Invoke($"PASSED drop {testDrop / hp_bar_maximum}");
-                return testDrop / hp_bar_maximum;
-            } while (true);
-
-            void reduceHp(double amount)
-            {
-                currentHpUncapped = Math.Max(0, currentHpUncapped - amount);
-                currentHp = Math.Max(0, currentHp - amount);
-            }
-
-            void increaseHp(double amount)
-            {
-                currentHpUncapped += amount;
-                currentHp = Math.Max(0, Math.Min(hp_bar_maximum, currentHp + amount));
-            }
-        }
-
-        private IEnumerable<(HitObject hitObject, bool newCombo)> enumerateHitObjects(IBeatmap beatmap)
-        {
-            return enumerateRecursively(beatmap.HitObjects);
-
-            static IEnumerable<(HitObject hitObject, bool newCombo)> enumerateRecursively(IEnumerable<HitObject> hitObjects)
-            {
-                foreach (var hitObject in hitObjects)
-                {
-                    // The combo end will either be attached to the hitobject itself if it has no children, or the very first child if it has children.
-                    bool newCombo = (hitObject as IHasComboInformation)?.NewCombo ?? false;
-
-                    foreach ((HitObject nested, bool _) in enumerateRecursively(hitObject.NestedHitObjects))
-                    {
-                        yield return (nested, newCombo);
-
-                        // Since the combo was attached to the first child, don't attach it to any other child or the parenting hitobject itself.
-                        newCombo = false;
-                    }
-
-                    yield return (hitObject, newCombo);
-                }
-            }
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
deleted file mode 100644
index e92c3c9b97..0000000000
--- a/osu.Game.Rulesets.Osu/Scoring/LegacyOsuHealthProcessor.cs
+++ /dev/null
@@ -1,215 +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.Linq;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Timing;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Osu.Scoring
-{
-    /// <summary>
-    /// Reference implementation for osu!stable's HP drain.
-    /// Cannot be used for gameplay.
-    /// </summary>
-    public partial class LegacyOsuHealthProcessor : DrainingHealthProcessor
-    {
-        private const double hp_bar_maximum = 200;
-        private const double hp_combo_geki = 14;
-        private const double hp_hit_300 = 6;
-        private const double hp_slider_repeat = 4;
-        private const double hp_slider_tick = 3;
-
-        public Action<string>? OnIterationFail;
-        public Action<string>? OnIterationSuccess;
-        public bool ApplyComboEndBonus { get; set; } = true;
-
-        private double lowestHpEver;
-        private double lowestHpEnd;
-        private double lowestHpComboEnd;
-        private double hpRecoveryAvailable;
-        private double hpMultiplierNormal;
-        private double hpMultiplierComboEnd;
-
-        public LegacyOsuHealthProcessor(double drainStartTime)
-            : base(drainStartTime)
-        {
-        }
-
-        public override void ApplyBeatmap(IBeatmap beatmap)
-        {
-            lowestHpEver = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 195, 160, 60);
-            lowestHpComboEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 198, 170, 80);
-            lowestHpEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 198, 180, 80);
-            hpRecoveryAvailable = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 8, 4, 0);
-
-            base.ApplyBeatmap(beatmap);
-        }
-
-        protected override void ApplyResultInternal(JudgementResult result)
-        {
-            if (!IsSimulating)
-                throw new NotSupportedException("The legacy osu! health processor is not supported for gameplay.");
-        }
-
-        protected override void RevertResultInternal(JudgementResult result)
-        {
-            if (!IsSimulating)
-                throw new NotSupportedException("The legacy osu! health processor is not supported for gameplay.");
-        }
-
-        protected override void Reset(bool storeResults)
-        {
-            hpMultiplierNormal = 1;
-            hpMultiplierComboEnd = 1;
-
-            base.Reset(storeResults);
-        }
-
-        protected override double ComputeDrainRate()
-        {
-            double testDrop = 0.05;
-            double currentHp;
-            double currentHpUncapped;
-
-            do
-            {
-                currentHp = hp_bar_maximum;
-                currentHpUncapped = hp_bar_maximum;
-
-                double lowestHp = currentHp;
-                double lastTime = DrainStartTime;
-                int currentBreak = 0;
-                bool fail = false;
-                int comboTooLowCount = 0;
-                string failReason = string.Empty;
-
-                for (int i = 0; i < Beatmap.HitObjects.Count; i++)
-                {
-                    HitObject h = Beatmap.HitObjects[i];
-
-                    // Find active break (between current and lastTime)
-                    double localLastTime = lastTime;
-                    double breakTime = 0;
-
-                    // Subtract any break time from the duration since the last object
-                    if (Beatmap.Breaks.Count > 0 && currentBreak < Beatmap.Breaks.Count)
-                    {
-                        BreakPeriod e = Beatmap.Breaks[currentBreak];
-
-                        if (e.StartTime >= localLastTime && e.EndTime <= h.StartTime)
-                        {
-                            // consider break start equal to object end time for version 8+ since drain stops during this time
-                            breakTime = (Beatmap.BeatmapInfo.BeatmapVersion < 8) ? (e.EndTime - e.StartTime) : e.EndTime - localLastTime;
-                            currentBreak++;
-                        }
-                    }
-
-                    reduceHp(testDrop * (h.StartTime - lastTime - breakTime));
-
-                    lastTime = h.GetEndTime();
-
-                    if (currentHp < lowestHp)
-                        lowestHp = currentHp;
-
-                    if (currentHp <= lowestHpEver)
-                    {
-                        fail = true;
-                        testDrop *= 0.96;
-                        failReason = $"hp too low ({currentHp / hp_bar_maximum} < {lowestHpEver / hp_bar_maximum})";
-                        break;
-                    }
-
-                    double hpReduction = testDrop * (h.GetEndTime() - h.StartTime);
-                    double hpOverkill = Math.Max(0, hpReduction - currentHp);
-                    reduceHp(hpReduction);
-
-                    if (h is Slider slider)
-                    {
-                        for (int j = 0; j < slider.RepeatCount + 2; j++)
-                            increaseHp(hpMultiplierNormal * hp_slider_repeat);
-                        foreach (var _ in slider.NestedHitObjects.OfType<SliderTick>())
-                            increaseHp(hpMultiplierNormal * hp_slider_tick);
-                    }
-                    else if (h is Spinner spinner)
-                    {
-                        foreach (var _ in spinner.NestedHitObjects.Where(t => t is not SpinnerBonusTick))
-                            increaseHp(hpMultiplierNormal * 1.7);
-                    }
-
-                    if (hpOverkill > 0 && currentHp - hpOverkill <= lowestHpEver)
-                    {
-                        fail = true;
-                        testDrop *= 0.96;
-                        failReason = $"overkill ({currentHp / hp_bar_maximum} - {hpOverkill / hp_bar_maximum} <= {lowestHpEver / hp_bar_maximum})";
-                        break;
-                    }
-
-                    if (ApplyComboEndBonus && (i == Beatmap.HitObjects.Count - 1 || ((OsuHitObject)Beatmap.HitObjects[i + 1]).NewCombo))
-                    {
-                        increaseHp(hpMultiplierComboEnd * hp_combo_geki + hpMultiplierNormal * hp_hit_300);
-
-                        if (currentHp < lowestHpComboEnd)
-                        {
-                            if (++comboTooLowCount > 2)
-                            {
-                                hpMultiplierComboEnd *= 1.07;
-                                hpMultiplierNormal *= 1.03;
-                                fail = true;
-                                failReason = $"combo end hp too low ({currentHp / hp_bar_maximum} < {lowestHpComboEnd / hp_bar_maximum})";
-                                break;
-                            }
-                        }
-                    }
-                    else
-                        increaseHp(hpMultiplierNormal * hp_hit_300);
-                }
-
-                if (!fail && currentHp < lowestHpEnd)
-                {
-                    fail = true;
-                    testDrop *= 0.94;
-                    hpMultiplierComboEnd *= 1.01;
-                    hpMultiplierNormal *= 1.01;
-                    failReason = $"end hp too low ({currentHp / hp_bar_maximum} < {lowestHpEnd / hp_bar_maximum})";
-                }
-
-                double recovery = (currentHpUncapped - hp_bar_maximum) / Beatmap.HitObjects.Count;
-
-                if (!fail && recovery < hpRecoveryAvailable)
-                {
-                    fail = true;
-                    testDrop *= 0.96;
-                    hpMultiplierComboEnd *= 1.02;
-                    hpMultiplierNormal *= 1.01;
-                    failReason = $"recovery too low ({recovery / hp_bar_maximum} < {hpRecoveryAvailable / hp_bar_maximum})";
-                }
-
-                if (fail)
-                {
-                    OnIterationFail?.Invoke($"FAILED drop {testDrop / hp_bar_maximum}: {failReason}");
-                    continue;
-                }
-
-                OnIterationSuccess?.Invoke($"PASSED drop {testDrop / hp_bar_maximum}");
-                return testDrop / hp_bar_maximum;
-            } while (true);
-
-            void reduceHp(double amount)
-            {
-                currentHpUncapped = Math.Max(0, currentHpUncapped - amount);
-                currentHp = Math.Max(0, currentHp - amount);
-            }
-
-            void increaseHp(double amount)
-            {
-                currentHpUncapped += amount;
-                currentHp = Math.Max(0, Math.Min(hp_bar_maximum, currentHp + amount));
-            }
-        }
-    }
-}

From 36b45d34f7415327f80ed1a243a30af73390805f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 16:39:29 +0900
Subject: [PATCH 1727/2296] Check drag location on mouse down instead of drag
 start to avoid lenience issues

---
 osu.Game/Overlays/ChatOverlay.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 724f77ad71..54d5952bc3 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -251,10 +251,14 @@ namespace osu.Game.Overlays
         {
         }
 
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            isDraggingTopBar = topBar.DragBar.IsHovered;
+            return base.OnMouseDown(e);
+        }
+
         protected override bool OnDragStart(DragStartEvent e)
         {
-            isDraggingTopBar = topBar.IsHovered;
-
             if (!isDraggingTopBar)
                 return base.OnDragStart(e);
 

From 7600595e5dba09c0cd6b3a034be86b427dfc6a03 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 16:39:54 +0900
Subject: [PATCH 1728/2296] Add drag bar on chat overlay to better signal
 resizability

---
 osu.Game/Overlays/Chat/ChatOverlayTopBar.cs | 80 +++++++++++++++++++--
 1 file changed, 76 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
index 0410174dc1..44cb07ca91 100644
--- a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
+++ b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -23,6 +22,8 @@ namespace osu.Game.Overlays.Chat
 
         private Color4 backgroundColour;
 
+        public Drawable DragBar = null!;
+
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, TextureStore textures)
         {
@@ -50,7 +51,7 @@ namespace osu.Game.Overlays.Chat
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
                                 Texture = textures.Get("Icons/Hexacons/messaging"),
-                                Size = new Vector2(18),
+                                Size = new Vector2(24),
                             },
                             // Placeholder text
                             new OsuSpriteText
@@ -64,19 +65,90 @@ namespace osu.Game.Overlays.Chat
                         },
                     },
                 },
+                DragBar = new DragArea
+                {
+                    Alpha = 0,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Colour = colourProvider.Background4,
+                }
             };
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            background.FadeColour(backgroundColour.Lighten(0.1f), 300, Easing.OutQuint);
+            DragBar.FadeIn(100);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            background.FadeColour(backgroundColour, 300, Easing.OutQuint);
+            DragBar.FadeOut(100);
             base.OnHoverLost(e);
         }
+
+        private partial class DragArea : CompositeDrawable
+        {
+            private readonly Circle circle;
+
+            public DragArea()
+            {
+                AutoSizeAxes = Axes.Both;
+
+                InternalChildren = new Drawable[]
+                {
+                    circle = new Circle
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(150, 7),
+                        Margin = new MarginPadding(12),
+                    }
+                };
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateScale();
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateScale();
+                base.OnHoverLost(e);
+            }
+
+            private bool dragging;
+
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                dragging = true;
+                updateScale();
+                return base.OnMouseDown(e);
+            }
+
+            protected override void OnMouseUp(MouseUpEvent e)
+            {
+                dragging = false;
+                updateScale();
+                base.OnMouseUp(e);
+            }
+
+            private void updateScale()
+            {
+                if (dragging || IsHovered)
+                    circle.FadeIn(100);
+                else
+                    circle.FadeTo(0.6f, 100);
+
+                if (dragging)
+                    circle.ScaleTo(1f, 400, Easing.OutQuint);
+                else if (IsHovered)
+                    circle.ScaleTo(1.05f, 400, Easing.OutElasticHalf);
+                else
+                    circle.ScaleTo(1f, 500, Easing.OutQuint);
+            }
+        }
     }
 }

From 59800821da1afe62e520af591b172eb34c80bee2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 16:44:18 +0900
Subject: [PATCH 1729/2296] Update framework

---
 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 ea08992710..ddaa371014 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1121.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1124.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1468af4d58..76d5e2d433 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1121.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1124.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1114.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index 53d5d6b010..c11dfd06f3 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1121.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1124.0" />
   </ItemGroup>
 </Project>

From 3b41480beffb8eda3ea8428f1d1a02dc81cfd4c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 17:46:02 +0900
Subject: [PATCH 1730/2296] Always show drag bar on mobile

---
 osu.Game/Overlays/Chat/ChatOverlayTopBar.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
index 44cb07ca91..807bb26502 100644
--- a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
+++ b/osu.Game/Overlays/Chat/ChatOverlayTopBar.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 osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -67,7 +68,7 @@ namespace osu.Game.Overlays.Chat
                 },
                 DragBar = new DragArea
                 {
-                    Alpha = 0,
+                    Alpha = RuntimeInfo.IsMobile ? 1 : 0,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Colour = colourProvider.Background4,
@@ -77,13 +78,15 @@ namespace osu.Game.Overlays.Chat
 
         protected override bool OnHover(HoverEvent e)
         {
-            DragBar.FadeIn(100);
+            if (!RuntimeInfo.IsMobile)
+                DragBar.FadeIn(100);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            DragBar.FadeOut(100);
+            if (!RuntimeInfo.IsMobile)
+                DragBar.FadeOut(100);
             base.OnHoverLost(e);
         }
 

From 290c3d63492315e700ff57d468585c0a8d3bc52a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 17:46:23 +0900
Subject: [PATCH 1731/2296] Clean up left-overs

---
 osu.Game/Overlays/Chat/ChatOverlayTopBar.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
index 807bb26502..330c991ce8 100644
--- a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
+++ b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
@@ -13,27 +13,22 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Chat
 {
     public partial class ChatOverlayTopBar : Container
     {
-        private Box background = null!;
-
-        private Color4 backgroundColour;
-
         public Drawable DragBar = null!;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, TextureStore textures)
         {
-            Children = new Drawable[]
+            Children = new[]
             {
-                background = new Box
+                new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = backgroundColour = colourProvider.Background3,
+                    Colour = colourProvider.Background3,
                 },
                 new GridContainer
                 {

From 95229cb33607ba8ddc43af8da387830f36f63d48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 17:19:03 +0900
Subject: [PATCH 1732/2296] Show gameplay when loading the skin editor from the
 main menu

---
 .../Overlays/SkinEditor/SkinEditorOverlay.cs  | 65 +++++++++++++++++++
 .../SkinEditor/SkinEditorSceneLibrary.cs      | 32 +--------
 2 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index d1e7b97efc..16fc6b6ec6 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -1,7 +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.Diagnostics;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -9,12 +12,21 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components;
+using osu.Game.Screens.Menu;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Select;
+using osu.Game.Utils;
 using osuTK;
 
 namespace osu.Game.Overlays.SkinEditor
@@ -31,12 +43,21 @@ namespace osu.Game.Overlays.SkinEditor
 
         private SkinEditor? skinEditor;
 
+        [Resolved]
+        private IPerformFromScreenRunner? performer { get; set; }
+
         [Cached]
         public readonly EditorClipboard Clipboard = new EditorClipboard();
 
         [Resolved]
         private OsuGame game { get; set; } = null!;
 
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
+
+        [Resolved]
+        private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
+
         private OsuScreen? lastTargetScreen;
 
         private Vector2 lastDrawSize;
@@ -72,6 +93,9 @@ namespace osu.Game.Overlays.SkinEditor
         {
             globallyDisableBeatmapSkinSetting();
 
+            if (lastTargetScreen is MainMenu)
+                PresentGameplay();
+
             if (skinEditor != null)
             {
                 skinEditor.Show();
@@ -105,6 +129,28 @@ namespace osu.Game.Overlays.SkinEditor
             globallyReenableBeatmapSkinSetting();
         }
 
+        public void PresentGameplay()
+        {
+            performer?.PerformFromScreen(screen =>
+            {
+                if (screen is Player)
+                    return;
+
+                var replayGeneratingMod = ruleset.Value.CreateInstance().GetAutoplayMod();
+
+                IReadOnlyList<Mod> usableMods = mods.Value;
+
+                if (replayGeneratingMod != null)
+                    usableMods = usableMods.Append(replayGeneratingMod).ToArray();
+
+                if (!ModUtils.CheckCompatibleSet(usableMods, out var invalid))
+                    mods.Value = mods.Value.Except(invalid).ToArray();
+
+                if (replayGeneratingMod != null)
+                    screen.Push(new EndlessPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods)));
+            }, new[] { typeof(Player), typeof(PlaySongSelect) });
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -222,5 +268,24 @@ namespace osu.Game.Overlays.SkinEditor
             leasedBeatmapSkins?.Return();
             leasedBeatmapSkins = null;
         }
+
+        private partial class EndlessPlayer : ReplayPlayer
+        {
+            public EndlessPlayer(Func<IBeatmap, IReadOnlyList<Mod>, Score> createScore)
+                : base(createScore, new PlayerConfiguration
+                {
+                    ShowResults = false,
+                })
+            {
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                if (GameplayState.HasPassed)
+                    GameplayClockContainer.Seek(0);
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs b/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
index 9b021632cf..7fa33ddcf5 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.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.
 
-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;
@@ -14,12 +11,8 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
-using osu.Game.Utils;
 using osuTK;
 
 namespace osu.Game.Overlays.SkinEditor
@@ -36,10 +29,7 @@ namespace osu.Game.Overlays.SkinEditor
         private IPerformFromScreenRunner? performer { get; set; }
 
         [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
-
-        [Resolved]
-        private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
+        private SkinEditorOverlay skinEditorOverlay { get; set; } = null!;
 
         public SkinEditorSceneLibrary()
         {
@@ -96,24 +86,7 @@ namespace osu.Game.Overlays.SkinEditor
                                     Text = SkinEditorStrings.Gameplay,
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
-                                    Action = () => performer?.PerformFromScreen(screen =>
-                                    {
-                                        if (screen is Player)
-                                            return;
-
-                                        var replayGeneratingMod = ruleset.Value.CreateInstance().GetAutoplayMod();
-
-                                        IReadOnlyList<Mod> usableMods = mods.Value;
-
-                                        if (replayGeneratingMod != null)
-                                            usableMods = usableMods.Append(replayGeneratingMod).ToArray();
-
-                                        if (!ModUtils.CheckCompatibleSet(usableMods, out var invalid))
-                                            mods.Value = mods.Value.Except(invalid).ToArray();
-
-                                        if (replayGeneratingMod != null)
-                                            screen.Push(new PlayerLoader(() => new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods))));
-                                    }, new[] { typeof(Player), typeof(PlaySongSelect) })
+                                    Action = () => skinEditorOverlay.PresentGameplay(),
                                 },
                             }
                         },
@@ -137,5 +110,6 @@ namespace osu.Game.Overlays.SkinEditor
                 Content.CornerRadius = 5;
             }
         }
+
     }
 }

From 7153c823e8405713579f1a9d6c72f5ac5c2572b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 17:34:08 +0900
Subject: [PATCH 1733/2296] Choose a better beatmap if the intro is still
 playing

Also skip intro time.
---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 16fc6b6ec6..18d1c4c62b 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -52,12 +52,18 @@ namespace osu.Game.Overlays.SkinEditor
         [Resolved]
         private OsuGame game { get; set; } = null!;
 
+        [Resolved]
+        private MusicController music { get; set; } = null!;
+
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
+
         private OsuScreen? lastTargetScreen;
 
         private Vector2 lastDrawSize;
@@ -133,6 +139,14 @@ namespace osu.Game.Overlays.SkinEditor
         {
             performer?.PerformFromScreen(screen =>
             {
+                // If we're playing the intro, switch away to another beatmap.
+                if (beatmap.Value.BeatmapSetInfo.Protected)
+                {
+                    music.NextTrack();
+                    Schedule(PresentGameplay);
+                    return;
+                }
+
                 if (screen is Player)
                     return;
 
@@ -275,6 +289,7 @@ namespace osu.Game.Overlays.SkinEditor
                 : base(createScore, new PlayerConfiguration
                 {
                     ShowResults = false,
+                    AutomaticallySkipIntro = true,
                 })
             {
             }

From 8314f656a3107b27fc82ddbad448de4c70bdf41d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 24 Nov 2023 17:32:18 +0900
Subject: [PATCH 1734/2296] Encapsulate common HP logic from osu and catch HP
 calculations

---
 .../Scoring/CatchHealthProcessor.cs           | 121 +-------------
 .../Scoring/OsuHealthProcessor.cs             | 155 ++---------------
 .../Scoring/LegacyDrainingHealthProcessor.cs  | 158 ++++++++++++++++++
 3 files changed, 179 insertions(+), 255 deletions(-)
 create mode 100644 osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
index 6d831ad223..c3cc488941 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchHealthProcessor.cs
@@ -1,138 +1,27 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Scoring
 {
-    public partial class CatchHealthProcessor : DrainingHealthProcessor
+    public partial class CatchHealthProcessor : LegacyDrainingHealthProcessor
     {
-        public Action<string>? OnIterationFail;
-        public Action<string>? OnIterationSuccess;
-
-        private double lowestHpEver;
-        private double lowestHpEnd;
-        private double hpRecoveryAvailable;
-        private double hpMultiplierNormal;
-
         public CatchHealthProcessor(double drainStartTime)
             : base(drainStartTime)
         {
         }
 
-        public override void ApplyBeatmap(IBeatmap beatmap)
-        {
-            lowestHpEver = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.975, 0.8, 0.3);
-            lowestHpEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.99, 0.9, 0.4);
-            hpRecoveryAvailable = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.04, 0.02, 0);
+        protected override IEnumerable<HitObject> EnumerateTopLevelHitObjects() => EnumerateHitObjects(Beatmap).Where(h => h is Fruit || h is Droplet || h is Banana);
 
-            base.ApplyBeatmap(beatmap);
-        }
+        protected override IEnumerable<HitObject> EnumerateNestedHitObjects(HitObject hitObject) => Enumerable.Empty<HitObject>();
 
-        protected override void Reset(bool storeResults)
-        {
-            hpMultiplierNormal = 1;
-            base.Reset(storeResults);
-        }
-
-        protected override double ComputeDrainRate()
-        {
-            double testDrop = 0.00025;
-            double currentHp;
-            double currentHpUncapped;
-
-            while (true)
-            {
-                currentHp = 1;
-                currentHpUncapped = 1;
-
-                double lowestHp = currentHp;
-                double lastTime = DrainStartTime;
-                int currentBreak = 0;
-                bool fail = false;
-
-                List<HitObject> allObjects = EnumerateHitObjects(Beatmap).Where(h => h is Fruit || h is Droplet || h is Banana).ToList();
-
-                for (int i = 0; i < allObjects.Count; i++)
-                {
-                    HitObject h = allObjects[i];
-
-                    while (currentBreak < Beatmap.Breaks.Count && Beatmap.Breaks[currentBreak].EndTime <= h.StartTime)
-                    {
-                        // If two hitobjects are separated by a break period, there is no drain for the full duration between the hitobjects.
-                        // This differs from legacy (version < 8) beatmaps which continue draining until the break section is entered,
-                        // but this shouldn't have a noticeable impact in practice.
-                        lastTime = h.StartTime;
-                        currentBreak++;
-                    }
-
-                    reduceHp(testDrop * (h.StartTime - lastTime));
-
-                    lastTime = h.GetEndTime();
-
-                    if (currentHp < lowestHp)
-                        lowestHp = currentHp;
-
-                    if (currentHp <= lowestHpEver)
-                    {
-                        fail = true;
-                        testDrop *= 0.96;
-                        OnIterationFail?.Invoke($"FAILED drop {testDrop}: hp too low ({currentHp} < {lowestHpEver})");
-                        break;
-                    }
-
-                    increaseHp(h);
-                }
-
-                if (!fail && currentHp < lowestHpEnd)
-                {
-                    fail = true;
-                    testDrop *= 0.94;
-                    hpMultiplierNormal *= 1.01;
-                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: end hp too low ({currentHp} < {lowestHpEnd})");
-                }
-
-                double recovery = (currentHpUncapped - 1) / allObjects.Count;
-
-                if (!fail && recovery < hpRecoveryAvailable)
-                {
-                    fail = true;
-                    testDrop *= 0.96;
-                    hpMultiplierNormal *= 1.01;
-                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: recovery too low ({recovery} < {hpRecoveryAvailable})");
-                }
-
-                if (!fail)
-                {
-                    OnIterationSuccess?.Invoke($"PASSED drop {testDrop}");
-                    return testDrop;
-                }
-            }
-
-            void reduceHp(double amount)
-            {
-                currentHpUncapped = Math.Max(0, currentHpUncapped - amount);
-                currentHp = Math.Max(0, currentHp - amount);
-            }
-
-            void increaseHp(HitObject hitObject)
-            {
-                double amount = healthIncreaseFor(hitObject.CreateJudgement().MaxResult);
-                currentHpUncapped += amount;
-                currentHp = Math.Max(0, Math.Min(1, currentHp + amount));
-            }
-        }
-
-        protected override double GetHealthIncreaseFor(JudgementResult result) => healthIncreaseFor(result.Type);
-
-        private double healthIncreaseFor(HitResult result)
+        protected override double GetHealthIncreaseFor(HitObject hitObject, HitResult result)
         {
             double increase = 0;
 
@@ -162,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Scoring
                     break;
             }
 
-            return hpMultiplierNormal * increase;
+            return HpMultiplierNormal * increase;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 3c124b3162..7025a7be65 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -1,166 +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;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
-    public partial class OsuHealthProcessor : DrainingHealthProcessor
+    public partial class OsuHealthProcessor : LegacyDrainingHealthProcessor
     {
-        public Action<string>? OnIterationFail;
-        public Action<string>? OnIterationSuccess;
-
-        private double lowestHpEver;
-        private double lowestHpEnd;
-        private double hpRecoveryAvailable;
-        private double hpMultiplierNormal;
-
         public OsuHealthProcessor(double drainStartTime)
             : base(drainStartTime)
         {
         }
 
-        public override void ApplyBeatmap(IBeatmap beatmap)
+        protected override IEnumerable<HitObject> EnumerateTopLevelHitObjects() => Beatmap.HitObjects;
+
+        protected override IEnumerable<HitObject> EnumerateNestedHitObjects(HitObject hitObject)
         {
-            lowestHpEver = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.975, 0.8, 0.3);
-            lowestHpEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.99, 0.9, 0.4);
-            hpRecoveryAvailable = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.04, 0.02, 0);
-
-            base.ApplyBeatmap(beatmap);
-        }
-
-        protected override void Reset(bool storeResults)
-        {
-            hpMultiplierNormal = 1;
-            base.Reset(storeResults);
-        }
-
-        protected override double ComputeDrainRate()
-        {
-            double testDrop = 0.00025;
-            double currentHp;
-            double currentHpUncapped;
-
-            while (true)
+            switch (hitObject)
             {
-                currentHp = 1;
-                currentHpUncapped = 1;
+                case Slider slider:
+                    foreach (var nested in slider.NestedHitObjects)
+                        yield return nested;
 
-                double lowestHp = currentHp;
-                double lastTime = DrainStartTime;
-                int currentBreak = 0;
-                bool fail = false;
+                    break;
 
-                for (int i = 0; i < Beatmap.HitObjects.Count; i++)
-                {
-                    HitObject h = Beatmap.HitObjects[i];
+                case Spinner spinner:
+                    foreach (var nested in spinner.NestedHitObjects.Where(t => t is not SpinnerBonusTick))
+                        yield return nested;
 
-                    while (currentBreak < Beatmap.Breaks.Count && Beatmap.Breaks[currentBreak].EndTime <= h.StartTime)
-                    {
-                        // If two hitobjects are separated by a break period, there is no drain for the full duration between the hitobjects.
-                        // This differs from legacy (version < 8) beatmaps which continue draining until the break section is entered,
-                        // but this shouldn't have a noticeable impact in practice.
-                        lastTime = h.StartTime;
-                        currentBreak++;
-                    }
-
-                    reduceHp(testDrop * (h.StartTime - lastTime));
-
-                    lastTime = h.GetEndTime();
-
-                    if (currentHp < lowestHp)
-                        lowestHp = currentHp;
-
-                    if (currentHp <= lowestHpEver)
-                    {
-                        fail = true;
-                        testDrop *= 0.96;
-                        OnIterationFail?.Invoke($"FAILED drop {testDrop}: hp too low ({currentHp} < {lowestHpEver})");
-                        break;
-                    }
-
-                    double hpReduction = testDrop * (h.GetEndTime() - h.StartTime);
-                    double hpOverkill = Math.Max(0, hpReduction - currentHp);
-                    reduceHp(hpReduction);
-
-                    switch (h)
-                    {
-                        case Slider slider:
-                        {
-                            foreach (var nested in slider.NestedHitObjects)
-                                increaseHp(nested);
-                            break;
-                        }
-
-                        case Spinner spinner:
-                        {
-                            foreach (var nested in spinner.NestedHitObjects.Where(t => t is not SpinnerBonusTick))
-                                increaseHp(nested);
-                            break;
-                        }
-                    }
-
-                    // Note: Because HP is capped during the above increases, long sliders (with many ticks) or spinners
-                    // will appear to overkill at lower drain levels than they should. However, it is also not correct to simply use the uncapped version.
-                    if (hpOverkill > 0 && currentHp - hpOverkill <= lowestHpEver)
-                    {
-                        fail = true;
-                        testDrop *= 0.96;
-                        OnIterationFail?.Invoke($"FAILED drop {testDrop}: overkill ({currentHp} - {hpOverkill} <= {lowestHpEver})");
-                        break;
-                    }
-
-                    increaseHp(h);
-                }
-
-                if (!fail && currentHp < lowestHpEnd)
-                {
-                    fail = true;
-                    testDrop *= 0.94;
-                    hpMultiplierNormal *= 1.01;
-                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: end hp too low ({currentHp} < {lowestHpEnd})");
-                }
-
-                double recovery = (currentHpUncapped - 1) / Beatmap.HitObjects.Count;
-
-                if (!fail && recovery < hpRecoveryAvailable)
-                {
-                    fail = true;
-                    testDrop *= 0.96;
-                    hpMultiplierNormal *= 1.01;
-                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: recovery too low ({recovery} < {hpRecoveryAvailable})");
-                }
-
-                if (!fail)
-                {
-                    OnIterationSuccess?.Invoke($"PASSED drop {testDrop}");
-                    return testDrop;
-                }
-            }
-
-            void reduceHp(double amount)
-            {
-                currentHpUncapped = Math.Max(0, currentHpUncapped - amount);
-                currentHp = Math.Max(0, currentHp - amount);
-            }
-
-            void increaseHp(HitObject hitObject)
-            {
-                double amount = healthIncreaseFor(hitObject, hitObject.CreateJudgement().MaxResult);
-                currentHpUncapped += amount;
-                currentHp = Math.Max(0, Math.Min(1, currentHp + amount));
+                    break;
             }
         }
 
-        protected override double GetHealthIncreaseFor(JudgementResult result) => healthIncreaseFor(result.HitObject, result.Type);
-
-        private double healthIncreaseFor(HitObject hitObject, HitResult result)
+        protected override double GetHealthIncreaseFor(HitObject hitObject, HitResult result)
         {
             double increase = 0;
 
@@ -206,7 +83,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     break;
             }
 
-            return hpMultiplierNormal * increase;
+            return HpMultiplierNormal * increase;
         }
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
new file mode 100644
index 0000000000..ce2f7d5624
--- /dev/null
+++ b/osu.Game/Rulesets/Scoring/LegacyDrainingHealthProcessor.cs
@@ -0,0 +1,158 @@
+// 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.Game.Beatmaps;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Scoring
+{
+    /// <summary>
+    /// A <see cref="DrainingHealthProcessor"/> that matches legacy drain rate calculations as best as possible.
+    /// </summary>
+    public abstract partial class LegacyDrainingHealthProcessor : DrainingHealthProcessor
+    {
+        public Action<string>? OnIterationFail;
+        public Action<string>? OnIterationSuccess;
+
+        protected double HpMultiplierNormal { get; private set; }
+
+        private double lowestHpEver;
+        private double lowestHpEnd;
+        private double hpRecoveryAvailable;
+
+        protected LegacyDrainingHealthProcessor(double drainStartTime)
+            : base(drainStartTime)
+        {
+        }
+
+        public override void ApplyBeatmap(IBeatmap beatmap)
+        {
+            lowestHpEver = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.975, 0.8, 0.3);
+            lowestHpEnd = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.99, 0.9, 0.4);
+            hpRecoveryAvailable = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.DrainRate, 0.04, 0.02, 0);
+
+            base.ApplyBeatmap(beatmap);
+        }
+
+        protected override void Reset(bool storeResults)
+        {
+            HpMultiplierNormal = 1;
+            base.Reset(storeResults);
+        }
+
+        protected override double ComputeDrainRate()
+        {
+            double testDrop = 0.00025;
+            double currentHp;
+            double currentHpUncapped;
+
+            while (true)
+            {
+                currentHp = 1;
+                currentHpUncapped = 1;
+
+                double lowestHp = currentHp;
+                double lastTime = DrainStartTime;
+                int currentBreak = 0;
+                bool fail = false;
+                int topLevelObjectCount = 0;
+
+                foreach (var h in EnumerateTopLevelHitObjects())
+                {
+                    topLevelObjectCount++;
+
+                    while (currentBreak < Beatmap.Breaks.Count && Beatmap.Breaks[currentBreak].EndTime <= h.StartTime)
+                    {
+                        // If two hitobjects are separated by a break period, there is no drain for the full duration between the hitobjects.
+                        // This differs from legacy (version < 8) beatmaps which continue draining until the break section is entered,
+                        // but this shouldn't have a noticeable impact in practice.
+                        lastTime = h.StartTime;
+                        currentBreak++;
+                    }
+
+                    reduceHp(testDrop * (h.StartTime - lastTime));
+
+                    lastTime = h.GetEndTime();
+
+                    if (currentHp < lowestHp)
+                        lowestHp = currentHp;
+
+                    if (currentHp <= lowestHpEver)
+                    {
+                        fail = true;
+                        testDrop *= 0.96;
+                        OnIterationFail?.Invoke($"FAILED drop {testDrop}: hp too low ({currentHp} < {lowestHpEver})");
+                        break;
+                    }
+
+                    double hpReduction = testDrop * (h.GetEndTime() - h.StartTime);
+                    double hpOverkill = Math.Max(0, hpReduction - currentHp);
+                    reduceHp(hpReduction);
+
+                    foreach (var nested in EnumerateNestedHitObjects(h))
+                        increaseHp(nested);
+
+                    // Note: Because HP is capped during the above increases, long sliders (with many ticks) or spinners
+                    // will appear to overkill at lower drain levels than they should. However, it is also not correct to simply use the uncapped version.
+                    if (hpOverkill > 0 && currentHp - hpOverkill <= lowestHpEver)
+                    {
+                        fail = true;
+                        testDrop *= 0.96;
+                        OnIterationFail?.Invoke($"FAILED drop {testDrop}: overkill ({currentHp} - {hpOverkill} <= {lowestHpEver})");
+                        break;
+                    }
+
+                    increaseHp(h);
+                }
+
+                if (!fail && currentHp < lowestHpEnd)
+                {
+                    fail = true;
+                    testDrop *= 0.94;
+                    HpMultiplierNormal *= 1.01;
+                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: end hp too low ({currentHp} < {lowestHpEnd})");
+                }
+
+                double recovery = (currentHpUncapped - 1) / Math.Max(1, topLevelObjectCount);
+
+                if (!fail && recovery < hpRecoveryAvailable)
+                {
+                    fail = true;
+                    testDrop *= 0.96;
+                    HpMultiplierNormal *= 1.01;
+                    OnIterationFail?.Invoke($"FAILED drop {testDrop}: recovery too low ({recovery} < {hpRecoveryAvailable})");
+                }
+
+                if (!fail)
+                {
+                    OnIterationSuccess?.Invoke($"PASSED drop {testDrop}");
+                    return testDrop;
+                }
+            }
+
+            void reduceHp(double amount)
+            {
+                currentHpUncapped = Math.Max(0, currentHpUncapped - amount);
+                currentHp = Math.Max(0, currentHp - amount);
+            }
+
+            void increaseHp(HitObject hitObject)
+            {
+                double amount = GetHealthIncreaseFor(hitObject, hitObject.CreateJudgement().MaxResult);
+                currentHpUncapped += amount;
+                currentHp = Math.Max(0, Math.Min(1, currentHp + amount));
+            }
+        }
+
+        protected sealed override double GetHealthIncreaseFor(JudgementResult result) => GetHealthIncreaseFor(result.HitObject, result.Type);
+
+        protected abstract IEnumerable<HitObject> EnumerateTopLevelHitObjects();
+
+        protected abstract IEnumerable<HitObject> EnumerateNestedHitObjects(HitObject hitObject);
+
+        protected abstract double GetHealthIncreaseFor(HitObject hitObject, HitResult result);
+    }
+}

From a44edfdeddadaac693c63312fb6d3cc14593ee0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 19:37:57 +0900
Subject: [PATCH 1735/2296] Fix incorrect sample for top level edit button

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

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 78eb410a48..259efad8b3 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Menu
             buttonsEdit.ForEach(b => b.VisibleState = ButtonSystemState.Edit);
 
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-default-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => State = ButtonSystemState.Edit, 0, Key.E));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-play-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => State = ButtonSystemState.Edit, 0, Key.E));
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-default-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B, Key.D));
 
             if (host.CanExit)

From 901561533600690974d0c89756cc850dca5ec7d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2023 19:42:30 +0900
Subject: [PATCH 1736/2296] Update test to work with new drag bar location

---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 55e6b54af7..8a2a66f60f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -180,11 +180,8 @@ namespace osu.Game.Tests.Visual.Online
             });
             AddStep("Show overlay", () => chatOverlay.Show());
             AddAssert("Overlay uses config height", () => chatOverlay.Height == configChatHeight.Default);
-            AddStep("Click top bar", () =>
-            {
-                InputManager.MoveMouseTo(chatOverlayTopBar);
-                InputManager.PressButton(MouseButton.Left);
-            });
+            AddStep("Move mouse to drag bar", () => InputManager.MoveMouseTo(chatOverlayTopBar.DragBar));
+            AddStep("Click drag bar", () => InputManager.PressButton(MouseButton.Left));
             AddStep("Drag overlay to new height", () => InputManager.MoveMouseTo(chatOverlayTopBar, new Vector2(0, -300)));
             AddStep("Stop dragging", () => InputManager.ReleaseButton(MouseButton.Left));
             AddStep("Store new height", () => newHeight = chatOverlay.Height);

From a6cf1e5d2eabb3cd5f32da0b213e20c1ab601a91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 25 Nov 2023 00:53:25 +0900
Subject: [PATCH 1737/2296] Make osu! logo do something when in edit submenu

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 259efad8b3..ca5bef985e 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -311,6 +311,10 @@ namespace osu.Game.Screens.Menu
                 case ButtonSystemState.Play:
                     buttonsPlay.First().TriggerClick();
                     return false;
+
+                case ButtonSystemState.Edit:
+                    buttonsEdit.First().TriggerClick();
+                    return false;
             }
         }
 

From 27f9dfccc46429f2956d6ce4c3759620178fabf1 Mon Sep 17 00:00:00 2001
From: Zyf <zyfarok@gmail.com>
Date: Fri, 24 Nov 2023 22:05:24 +0100
Subject: [PATCH 1738/2296] Fix scoring-conversion when miss-count is 0

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

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 77421908de..457262a1de 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -321,7 +321,7 @@ namespace osu.Game.Database
                     // This time, divide the remaining combo among remaining objects equally to achieve longest possible combo lengths.
                     // There is no rigorous proof that doing this will yield a correct upper bound, but it seems to work out in practice.
                     remainingComboPortionInScoreV1 = comboPortionInScoreV1 - comboPortionFromLongestComboInScoreV1;
-                    double remainingCountOfObjectsGivingCombo = maximumLegacyCombo - score.MaxCombo - score.Statistics[HitResult.Miss];
+                    double remainingCountOfObjectsGivingCombo = maximumLegacyCombo - score.MaxCombo - score.Statistics.GetValueOrDefault(HitResult.Miss);
                     // Because we assumed all combos were equal, `remainingComboPortionInScoreV1`
                     // can be approximated by n * x^2, wherein n is the assumed number of equal combos,
                     // and x is the assumed length of every one of those combos.

From 71e5654b645c07da60b7acbfbe60fe71021f9c45 Mon Sep 17 00:00:00 2001
From: Zyf <zyfarok@gmail.com>
Date: Fri, 24 Nov 2023 23:07:27 +0100
Subject: [PATCH 1739/2296] Account for legacyAccScore in score conversion

---
 .../Difficulty/CatchLegacyScoreSimulator.cs        |  1 +
 .../Difficulty/TaikoLegacyScoreSimulator.cs        |  1 +
 .../Database/StandardisedScoreMigrationTools.cs    | 14 +++++++-------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index 746f5713e4..ed27e11208 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -74,6 +74,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                 simulateHit(obj, ref attributes);
 
             attributes.BonusScoreRatio = legacyBonusScore == 0 ? 0 : (double)standardisedBonusScore / legacyBonusScore;
+            attributes.BonusScore = legacyBonusScore;
 
             return attributes;
         }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index 6a3eb68a22..1db44592b8 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -75,6 +75,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
                 simulateHit(obj, ref attributes);
 
             attributes.BonusScoreRatio = legacyBonusScore == 0 ? 0 : (double)standardisedBonusScore / legacyBonusScore;
+            attributes.BonusScore = legacyBonusScore;
 
             return attributes;
         }
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 457262a1de..6484500bcc 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -250,15 +250,14 @@ namespace osu.Game.Database
             long maximumLegacyComboScore = (long)Math.Round(attributes.ComboScore * legacyModMultiplier);
             double maximumLegacyBonusRatio = attributes.BonusScoreRatio;
             long maximumLegacyBonusScore = attributes.BonusScore;
-            int maximumLegacyCombo = attributes.MaxCombo;
 
+            double legacyAccScore = maximumLegacyAccuracyScore * score.Accuracy;
+            // We can not separate the ComboScore from the BonusScore, so we keep the bonus in the ratio.
+            double comboProportion =
+                ((double)score.LegacyTotalScore - legacyAccScore) / (maximumLegacyComboScore + maximumLegacyBonusScore);
+
+            // We assume the bonus proportion only makes up the rest of the score that exceeds maximumLegacyBaseScore.
             long maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
-            long maximumLegacyTotalScore = maximumLegacyBaseScore + maximumLegacyBonusScore;
-
-            // The combo proportion is calculated as a proportion of maximumLegacyTotalScore.
-            double comboProportion = (double)score.LegacyTotalScore / maximumLegacyTotalScore;
-
-            // The bonus proportion makes up the rest of the score that exceeds maximumLegacyBaseScore.
             double bonusProportion = Math.Max(0, ((long)score.LegacyTotalScore - maximumLegacyBaseScore) * maximumLegacyBonusRatio);
 
             double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
@@ -288,6 +287,7 @@ namespace osu.Game.Database
                     // this can be roughly represented by summing / integrating f(combo) = combo.
                     // All mod- and beatmap-dependent multipliers and constants are not included here,
                     // as we will only be using the magnitude of this to compute ratios.
+                    int maximumLegacyCombo = attributes.MaxCombo;
                     double maximumAchievableComboPortionInScoreV1 = Math.Pow(maximumLegacyCombo, 2);
                     // Similarly, estimate the maximum magnitude of the combo portion in standardised score.
                     // Roughly corresponds to integrating f(combo) = combo ^ COMBO_EXPONENT (omitting constants)

From 68fca007577f29c9b57e7df2e33b6dd09ee6d7b2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 25 Nov 2023 02:40:30 +0300
Subject: [PATCH 1740/2296] Improve handling of beatmap collection changes in
 `CollectionDropdown`

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Collections/CollectionDropdown.cs | 72 +++++++++++++---------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Collections/CollectionDropdown.cs b/osu.Game/Collections/CollectionDropdown.cs
index e435992381..299594b0a0 100644
--- a/osu.Game/Collections/CollectionDropdown.cs
+++ b/osu.Game/Collections/CollectionDropdown.cs
@@ -43,11 +43,13 @@ namespace osu.Game.Collections
 
         private IDisposable? realmSubscription;
 
+        private readonly CollectionFilterMenuItem allBeatmapsItem = new AllBeatmapsCollectionFilterMenuItem();
+
         public CollectionDropdown()
         {
             ItemSource = filters;
 
-            Current.Value = new AllBeatmapsCollectionFilterMenuItem();
+            Current.Value = allBeatmapsItem;
         }
 
         protected override void LoadComplete()
@@ -61,37 +63,51 @@ namespace osu.Game.Collections
 
         private void collectionsChanged(IRealmCollection<BeatmapCollection> collections, ChangeSet? changes)
         {
-            var selectedItem = SelectedItem?.Value?.Collection;
-
-            var allBeatmaps = new AllBeatmapsCollectionFilterMenuItem();
-
-            filters.Clear();
-            filters.Add(allBeatmaps);
-            filters.AddRange(collections.Select(c => new CollectionFilterMenuItem(c.ToLive(realm))));
-
-            if (ShowManageCollectionsItem)
-                filters.Add(new ManageCollectionsFilterMenuItem());
-
-            // This current update and schedule is required to work around dropdown headers not updating text even when the selected item
-            // changes. It's not great but honestly the whole dropdown menu structure isn't great. This needs to be fixed, but I'll issue
-            // a warning that it's going to be a frustrating journey.
-            Current.Value = allBeatmaps;
-            Schedule(() =>
+            if (changes == null)
             {
-                // current may have changed before the scheduled call is run.
-                if (Current.Value != allBeatmaps)
-                    return;
-
-                Current.Value = filters.SingleOrDefault(f => f.Collection != null && f.Collection.ID == selectedItem?.ID) ?? filters[0];
-            });
-
-            // Trigger a re-filter if the current item was in the change set.
-            if (selectedItem != null && changes != null)
+                filters.Add(allBeatmapsItem);
+                filters.AddRange(collections.Select(c => new CollectionFilterMenuItem(c.ToLive(realm))));
+                if (ShowManageCollectionsItem)
+                    filters.Add(new ManageCollectionsFilterMenuItem());
+            }
+            else
             {
-                foreach (int index in changes.ModifiedIndices)
+                foreach (int i in changes.DeletedIndices)
+                    filters.RemoveAt(i + 1);
+
+                foreach (int i in changes.InsertedIndices)
+                    filters.Insert(i + 1, new CollectionFilterMenuItem(collections[i].ToLive(realm)));
+
+                var selectedItem = SelectedItem?.Value;
+
+                foreach (int i in changes.NewModifiedIndices)
                 {
-                    if (collections[index].ID == selectedItem.ID)
+                    var updatedItem = collections[i];
+
+                    // This is responsible for updating the state of the +/- button and the collection's name.
+                    // TODO: we can probably make the menu items update with changes to avoid this.
+                    filters.RemoveAt(i + 1);
+                    filters.Insert(i + 1, new CollectionFilterMenuItem(updatedItem.ToLive(realm)));
+
+                    if (updatedItem.ID == selectedItem?.Collection?.ID)
+                    {
+                        // This current update and schedule is required to work around dropdown headers not updating text even when the selected item
+                        // changes. It's not great but honestly the whole dropdown menu structure isn't great. This needs to be fixed, but I'll issue
+                        // a warning that it's going to be a frustrating journey.
+                        Current.Value = allBeatmapsItem;
+                        Schedule(() =>
+                        {
+                            // current may have changed before the scheduled call is run.
+                            if (Current.Value != allBeatmapsItem)
+                                return;
+
+                            Current.Value = filters.SingleOrDefault(f => f.Collection?.ID == selectedItem.Collection?.ID) ?? filters[0];
+                        });
+
+                        // Trigger an external re-filter if the current item was in the change set.
                         RequestFilter?.Invoke();
+                        break;
+                    }
                 }
             }
         }

From 6f66819e5152de82d807522089465b79a82b3850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 27 Nov 2023 10:44:50 +0900
Subject: [PATCH 1741/2296] Privatise setter

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

diff --git a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
index 1cea198300..84fd342493 100644
--- a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
+++ b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Chat
 {
     public partial class ChatOverlayTopBar : Container
     {
-        public Drawable DragBar = null!;
+        public Drawable DragBar { get; private set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, TextureStore textures)

From 7f788058cdadf4f8196b4095afdf2c265b81edab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 27 Nov 2023 11:35:10 +0900
Subject: [PATCH 1742/2296] Revert incorrect xmldoc change

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index e7435adf29..47e2dd807a 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Online.Spectator
         public IBindableList<int> PlayingUsers => playingUsers;
 
         /// <summary>
-        /// Whether the spectated user is playing.
+        /// Whether the local user is playing.
         /// </summary>
         private bool isPlaying { get; set; }
 

From 3f48f4acdff18744317665661eb0119154eceff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 27 Nov 2023 12:06:08 +0900
Subject: [PATCH 1743/2296] Remove blank line

---
 osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs b/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
index 7fa33ddcf5..a682285549 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
@@ -110,6 +110,5 @@ namespace osu.Game.Overlays.SkinEditor
                 Content.CornerRadius = 5;
             }
         }
-
     }
 }

From 7e3bb5f8dba1a3357a6a6729a557d1e0b13714c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 27 Nov 2023 12:09:13 +0900
Subject: [PATCH 1744/2296] Make skin editor overlay dependency nullable to fix
 tests

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

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs b/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
index a682285549..5a283c0e8d 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.SkinEditor
         private IPerformFromScreenRunner? performer { get; set; }
 
         [Resolved]
-        private SkinEditorOverlay skinEditorOverlay { get; set; } = null!;
+        private SkinEditorOverlay? skinEditorOverlay { get; set; }
 
         public SkinEditorSceneLibrary()
         {
@@ -86,7 +86,7 @@ namespace osu.Game.Overlays.SkinEditor
                                     Text = SkinEditorStrings.Gameplay,
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
-                                    Action = () => skinEditorOverlay.PresentGameplay(),
+                                    Action = () => skinEditorOverlay?.PresentGameplay(),
                                 },
                             }
                         },

From a4be28a2aebf4bf14c72a1aee35d60fad654c88e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Nov 2023 17:53:06 +0900
Subject: [PATCH 1745/2296] Don't show buttons on fail overlay when player
 interaction is disabled

---
 osu.Game/Screens/Play/FailOverlay.cs | 15 +++++++++++++--
 osu.Game/Screens/Play/Player.cs      |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/FailOverlay.cs b/osu.Game/Screens/Play/FailOverlay.cs
index abfc401998..210ae5ceb6 100644
--- a/osu.Game/Screens/Play/FailOverlay.cs
+++ b/osu.Game/Screens/Play/FailOverlay.cs
@@ -26,11 +26,22 @@ namespace osu.Game.Screens.Play
 
         public override LocalisableString Header => GameplayMenuOverlayStrings.FailedHeader;
 
+        private readonly bool showButtons;
+
+        public FailOverlay(bool showButtons = true)
+        {
+            this.showButtons = showButtons;
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            AddButton(GameplayMenuOverlayStrings.Retry, colours.YellowDark, () => OnRetry?.Invoke());
-            AddButton(GameplayMenuOverlayStrings.Quit, new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
+            if (showButtons)
+            {
+                AddButton(GameplayMenuOverlayStrings.Retry, colours.YellowDark, () => OnRetry?.Invoke());
+                AddButton(GameplayMenuOverlayStrings.Quit, new Color4(170, 27, 39, 255), () => OnQuit?.Invoke());
+            }
+
             // from #10339 maybe this is a better visual effect
             Add(new Container
             {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ff00b52f71..1c97efcff7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -267,7 +267,7 @@ namespace osu.Game.Screens.Play
                         createGameplayComponents(Beatmap.Value)
                     }
                 },
-                FailOverlay = new FailOverlay
+                FailOverlay = new FailOverlay(Configuration.AllowUserInteraction)
                 {
                     SaveReplay = async () => await prepareAndImportScoreAsync(true).ConfigureAwait(false),
                     OnRetry = () => Restart(),

From d9242278105febc065dcc57b4bd318a89dcb190a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 24 Nov 2023 18:04:57 +0900
Subject: [PATCH 1746/2296] Add `ManiaHealthProcessor` that uses the legacy
 drain rate algorithm

---
 .../Scoring/ManiaHealthProcessor.cs           | 52 ++++++++++++++++---
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
index e63a037ca9..183550eb7b 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
@@ -1,23 +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 osu.Game.Rulesets.Judgements;
+using System.Collections.Generic;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Scoring
 {
-    public partial class ManiaHealthProcessor : DrainingHealthProcessor
+    public partial class ManiaHealthProcessor : LegacyDrainingHealthProcessor
     {
-        /// <inheritdoc/>
         public ManiaHealthProcessor(double drainStartTime)
-            : base(drainStartTime, 1.0)
+            : base(drainStartTime)
         {
         }
 
-        protected override HitResult GetSimulatedHitResult(Judgement judgement)
+        protected override IEnumerable<HitObject> EnumerateTopLevelHitObjects() => Beatmap.HitObjects;
+
+        protected override IEnumerable<HitObject> EnumerateNestedHitObjects(HitObject hitObject) => hitObject.NestedHitObjects;
+
+        protected override double GetHealthIncreaseFor(HitObject hitObject, HitResult result)
         {
-            // Users are not expected to attain perfect judgements for all notes due to the tighter hit window.
-            return judgement.MaxResult == HitResult.Perfect ? HitResult.Great : judgement.MaxResult;
+            double increase = 0;
+
+            switch (result)
+            {
+                case HitResult.Miss:
+                    switch (hitObject)
+                    {
+                        case HeadNote:
+                        case TailNote:
+                            return -(Beatmap.Difficulty.DrainRate + 1) * 0.00375;
+
+                        default:
+                            return -(Beatmap.Difficulty.DrainRate + 1) * 0.0075;
+                    }
+
+                case HitResult.Meh:
+                    return -(Beatmap.Difficulty.DrainRate + 1) * 0.0016;
+
+                case HitResult.Ok:
+                    return 0;
+
+                case HitResult.Good:
+                    increase = 0.004 - Beatmap.Difficulty.DrainRate * 0.0004;
+                    break;
+
+                case HitResult.Great:
+                    increase = 0.005 - Beatmap.Difficulty.DrainRate * 0.0005;
+                    break;
+
+                case HitResult.Perfect:
+                    increase = 0.0055 - Beatmap.Difficulty.DrainRate * 0.0005;
+                    break;
+            }
+
+            return HpMultiplierNormal * increase;
         }
     }
 }

From 3f73610ee765b5543e851627efdd64ecba93eccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 27 Nov 2023 15:06:11 +0900
Subject: [PATCH 1747/2296] Update framework ^& resources

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

diff --git a/osu.Android.props b/osu.Android.props
index ea08992710..3b90b1675c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1121.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1127.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1468af4d58..4d1fdaa89a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,8 +36,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1121.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1114.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1127.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1127.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.33.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 53d5d6b010..7e5c5be4ea 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1121.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1127.0" />
   </ItemGroup>
 </Project>

From ff18f80559acc1a1d6fd6dd709d2cbb0ff98c710 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Nov 2023 16:56:11 +0900
Subject: [PATCH 1748/2296] Apply NRT to `UpdateSettings`

---
 .../Sections/General/UpdateSettings.cs         | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 2f68b3a82f..6dc3cc5f18 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.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.Tasks;
 using osu.Framework;
 using osu.Framework.Allocation;
@@ -21,17 +19,17 @@ namespace osu.Game.Overlays.Settings.Sections.General
 {
     public partial class UpdateSettings : SettingsSubsection
     {
-        [Resolved(CanBeNull = true)]
-        private UpdateManager updateManager { get; set; }
-
         protected override LocalisableString Header => GeneralSettingsStrings.UpdateHeader;
 
-        private SettingsButton checkForUpdatesButton;
+        private SettingsButton checkForUpdatesButton = null!;
 
-        [Resolved(CanBeNull = true)]
-        private INotificationOverlay notifications { get; set; }
+        [Resolved]
+        private UpdateManager? updateManager { get; set; }
 
-        [BackgroundDependencyLoader(true)]
+        [Resolved]
+        private INotificationOverlay? notifications { get; set; }
+
+        [BackgroundDependencyLoader]
         private void load(Storage storage, OsuConfigManager config, OsuGame game)
         {
             Add(new SettingsEnumDropdown<ReleaseStream>
@@ -77,7 +75,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Add(new SettingsButton
                 {
                     Text = GeneralSettingsStrings.ChangeFolderLocation,
-                    Action = () => game?.PerformFromScreen(menu => menu.Push(new MigrationSelectScreen()))
+                    Action = () => game.PerformFromScreen(menu => menu.Push(new MigrationSelectScreen()))
                 });
             }
         }

From 11f1f4423704a205fa231c55e1f52b9574ee57c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 27 Nov 2023 17:13:11 +0900
Subject: [PATCH 1749/2296] Add button to compress log files for bug submission

---
 .../Sections/General/UpdateSettings.cs        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 6dc3cc5f18..5f74b5ecb9 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -14,6 +14,7 @@ using osu.Game.Localisation;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Overlays.Settings.Sections.Maintenance;
 using osu.Game.Updater;
+using SharpCompress.Archives.Zip;
 
 namespace osu.Game.Overlays.Settings.Sections.General
 {
@@ -72,6 +73,29 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     Action = () => storage.PresentExternally(),
                 });
 
+                Add(new SettingsButton
+                {
+                    Text = "Compress log files",
+                    Keywords = new[] { @"bug", "report", "logs" },
+                    Action = () =>
+                    {
+                        var logStorage = storage.GetStorageForDirectory(@"logs");
+
+                        const string archive_filename = "exports/compressed-logs.zip";
+
+                        using (var outStream = storage.CreateFileSafely(archive_filename))
+                        using (var zip = ZipArchive.Create())
+                        {
+                            foreach (string? f in logStorage.GetFiles(string.Empty, "*.log"))
+                                zip.AddEntry(f, logStorage.GetStream(f), true);
+
+                            zip.SaveTo(outStream);
+                        }
+
+                        storage.PresentFileExternally(archive_filename);
+                    },
+                });
+
                 Add(new SettingsButton
                 {
                     Text = GeneralSettingsStrings.ChangeFolderLocation,

From 4c2819dbc2d5bd88af61a00ebe58d0ce6a1247ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Nov 2023 17:59:05 +0900
Subject: [PATCH 1750/2296] Update button text and make localisable

---
 osu.Game/Localisation/GeneralSettingsStrings.cs              | 5 +++++
 .../Overlays/Settings/Sections/General/UpdateSettings.cs     | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Localisation/GeneralSettingsStrings.cs b/osu.Game/Localisation/GeneralSettingsStrings.cs
index ebf57d8109..42623f4632 100644
--- a/osu.Game/Localisation/GeneralSettingsStrings.cs
+++ b/osu.Game/Localisation/GeneralSettingsStrings.cs
@@ -49,6 +49,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString OpenOsuFolder => new TranslatableString(getKey(@"open_osu_folder"), @"Open osu! folder");
 
+        /// <summary>
+        /// "Export logs"
+        /// </summary>
+        public static LocalisableString ExportLogs => new TranslatableString(getKey(@"export_logs"), @"Export logs");
+
         /// <summary>
         /// "Change folder location..."
         /// </summary>
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 5f74b5ecb9..e2c9de1807 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -75,8 +75,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
 
                 Add(new SettingsButton
                 {
-                    Text = "Compress log files",
-                    Keywords = new[] { @"bug", "report", "logs" },
+                    Text = GeneralSettingsStrings.ExportLogs,
+                    Keywords = new[] { @"bug", "report", "logs", "files" },
                     Action = () =>
                     {
                         var logStorage = storage.GetStorageForDirectory(@"logs");

From 51de98f34186b799c0e51e6434a1783302df6f57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Nov 2023 17:59:21 +0900
Subject: [PATCH 1751/2296] Use `Logger.Storage` rather than locally querying

---
 osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index e2c9de1807..398e4b39af 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Configuration;
@@ -79,7 +80,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     Keywords = new[] { @"bug", "report", "logs", "files" },
                     Action = () =>
                     {
-                        var logStorage = storage.GetStorageForDirectory(@"logs");
+                        var logStorage = Logger.Storage;
 
                         const string archive_filename = "exports/compressed-logs.zip";
 

From 26855a2c04f623e87c1a357e3dab3cda241dd075 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 28 Nov 2023 21:14:34 +0900
Subject: [PATCH 1752/2296] Add failing test

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 32 +++++++++++++++++++
 .../Resources/custom-slider-length.osu        | 19 +++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/custom-slider-length.osu

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index dcfe8ecb41..02432a1935 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -15,12 +15,14 @@ using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Catch.Beatmaps;
+using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Rulesets.Taiko;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
 using osuTK;
@@ -1156,5 +1158,35 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(((IHasComboInformation)playable.HitObjects[17]).ComboIndexWithOffsets, Is.EqualTo(9));
             }
         }
+
+        [Test]
+        public void TestSliderConversionWithCustomDistance([Values("taiko", "mania")] string rulesetName)
+        {
+            using (var resStream = TestResources.OpenResource("custom-slider-length.osu"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                Ruleset ruleset;
+
+                switch (rulesetName)
+                {
+                    case "taiko":
+                        ruleset = new TaikoRuleset();
+                        break;
+
+                    case "mania":
+                        ruleset = new ManiaRuleset();
+                        break;
+
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(rulesetName), rulesetName, null);
+                }
+
+                var decoder = Decoder.GetDecoder<Beatmap>(stream);
+                var working = new TestWorkingBeatmap(decoder.Decode(stream));
+                IBeatmap beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo, Array.Empty<Mod>());
+
+                Assert.That(beatmap.HitObjects[0].GetEndTime(), Is.EqualTo(3153));
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Resources/custom-slider-length.osu b/osu.Game.Tests/Resources/custom-slider-length.osu
new file mode 100644
index 0000000000..f7529918a9
--- /dev/null
+++ b/osu.Game.Tests/Resources/custom-slider-length.osu
@@ -0,0 +1,19 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:7
+OverallDifficulty:7
+ApproachRate:10
+SliderMultiplier:1.7
+SliderTickRate:1
+
+[TimingPoints]
+29,333.333333333333,4,1,0,100,1,0
+29,-10000,4,1,0,100,0,0
+
+[HitObjects]
+256,192,29,6,0,P|384:192|384:192,1,159.375
\ No newline at end of file

From 16577829e27696d27f3ae99129a1c9f3a16639d3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 28 Nov 2023 21:14:56 +0900
Subject: [PATCH 1753/2296] Fix mania and taiko slider conversion distance

---
 .../Patterns/Legacy/DistanceObjectPatternGenerator.cs  |  9 ++++++++-
 .../Beatmaps/TaikoBeatmapConverter.cs                  | 10 +++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index cce0944564..8aa128be33 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -60,8 +60,15 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             SpanCount = repeatsData?.SpanCount() ?? 1;
             StartTime = (int)Math.Round(hitObject.StartTime);
 
+            double distance;
+
+            if (hitObject is IHasPath pathData)
+                distance = pathData.Path.ExpectedDistance.Value ?? 0;
+            else
+                distance = distanceData.Distance;
+
             // This matches stable's calculation.
-            EndTime = (int)Math.Floor(StartTime + distanceData.Distance * beatLength * SpanCount * 0.01 / beatmap.Difficulty.SliderMultiplier);
+            EndTime = (int)Math.Floor(StartTime + distance * beatLength * SpanCount * 0.01 / beatmap.Difficulty.SliderMultiplier);
 
             SegmentDuration = (EndTime - StartTime) / SpanCount;
         }
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index e46e2ec09c..4827ec76aa 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -182,7 +182,15 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
             // The true distance, accounting for any repeats. This ends up being the drum roll distance later
             int spans = (obj as IHasRepeats)?.SpanCount() ?? 1;
-            double distance = distanceData.Distance * spans * LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
+
+            double distance;
+
+            if (obj is IHasPath pathData)
+                distance = pathData.Path.ExpectedDistance.Value ?? 0;
+            else
+                distance = distanceData.Distance;
+
+            distance *= spans * LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
 
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime);
 

From 979bbf0d810fb080e883c04c51c53677dd9f01cd Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 28 Nov 2023 22:12:23 +0900
Subject: [PATCH 1754/2296] Wrap echo in double quotes

---
 .github/workflows/diffcalc.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/diffcalc.yml b/.github/workflows/diffcalc.yml
index d4150208d3..5f16e09040 100644
--- a/.github/workflows/diffcalc.yml
+++ b/.github/workflows/diffcalc.yml
@@ -189,8 +189,8 @@ jobs:
           COMMENT_BODY: ${{ github.event.comment.body }}
         run: |
           # Add comment environment
-          echo $COMMENT_BODY | sed -r 's/\r$//' | grep -E '^\w+=' | while read -r line; do
-              opt=$(echo ${line} | cut -d '=' -f1)
+          echo "$COMMENT_BODY" | sed -r 's/\r$//' | grep -E '^\w+=' | while read -r line; do
+              opt=$(echo "${line}" | cut -d '=' -f1)
               sed -i "s;^${opt}=.*$;${line};" "${{ needs.directory.outputs.GENERATOR_ENV }}"
           done
 

From c3ddf773b75c2d2bd64bf918a4c275ea8ae971f5 Mon Sep 17 00:00:00 2001
From: Rodrigo Pina <rodrigo.pina@bizaygroup.com>
Date: Tue, 28 Nov 2023 14:56:07 +0000
Subject: [PATCH 1755/2296] # osu.Game.Tournament.Models + Add: New property
 BanCount in TournamentRound to save the number of bans

# osu.Game.Tournament/Screens
+ Add: New slider setting in RoundEditorScreen to select the number of bans per round
* Change: Modified setNextMode behavior to get the round ban count, and select bans accordingly
---
 osu.Game.Tournament/Models/TournamentRound.cs         |  1 +
 .../Screens/Editors/RoundEditorScreen.cs              |  6 ++++++
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs  | 11 +++++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Models/TournamentRound.cs b/osu.Game.Tournament/Models/TournamentRound.cs
index a92bab690e..7aa8bbb44f 100644
--- a/osu.Game.Tournament/Models/TournamentRound.cs
+++ b/osu.Game.Tournament/Models/TournamentRound.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Tournament.Models
         public readonly Bindable<string> Description = new Bindable<string>(string.Empty);
 
         public readonly BindableInt BestOf = new BindableInt(9) { Default = 9, MinValue = 3, MaxValue = 23 };
+        public readonly BindableInt BanCount = new BindableInt(1) { Default = 1, MinValue = 0, MaxValue = 5 };
 
         [JsonProperty]
         public readonly BindableList<RoundBeatmap> Beatmaps = new BindableList<RoundBeatmap>();
diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index f887c41749..253cca8c98 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -82,6 +82,12 @@ namespace osu.Game.Tournament.Screens.Editors
                                 Current = Model.StartDate
                             },
                             new SettingsSlider<int>
+                            {
+                                LabelText = "# of Bans",
+                                Width = 0.33f,
+                                Current = Model.BanCount
+                            },
+                            new SettingsSlider<int>
                             {
                                 LabelText = "Best of",
                                 Width = 0.33f,
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index f80f43bb77..5f5fb873f4 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -146,17 +146,24 @@ namespace osu.Game.Tournament.Screens.MapPool
 
         private void setNextMode()
         {
+            int banCount = 2;
+
             if (CurrentMatch.Value == null)
                 return;
 
+            if (CurrentMatch.Value.Round.Value != null)
+            {
+                banCount = CurrentMatch.Value.Round.Value.BanCount.Value * 2;
+            }
+
             const TeamColour roll_winner = TeamColour.Red; //todo: draw from match
 
             var nextColour = (CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
 
-            if (pickType == ChoiceType.Ban && CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= 2)
+            if (pickType == ChoiceType.Ban && CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= banCount)
                 setMode(pickColour, ChoiceType.Pick);
             else
-                setMode(nextColour, CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= 2 ? ChoiceType.Pick : ChoiceType.Ban);
+                setMode(nextColour, CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= banCount ? ChoiceType.Pick : ChoiceType.Ban);
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)

From 2dd12a67257c8f201d307b240f5753e43fc75c86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Nov 2023 15:49:28 +0900
Subject: [PATCH 1756/2296] Improve logic around map pool mode changes

---
 .../Screens/MapPool/MapPoolScreen.cs          | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 5f5fb873f4..5148c0eaf4 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -136,34 +136,34 @@ namespace osu.Game.Tournament.Screens.MapPool
             pickColour = colour;
             pickType = choiceType;
 
-            static Color4 setColour(bool active) => active ? Color4.White : Color4.Gray;
-
             buttonRedBan.Colour = setColour(pickColour == TeamColour.Red && pickType == ChoiceType.Ban);
             buttonBlueBan.Colour = setColour(pickColour == TeamColour.Blue && pickType == ChoiceType.Ban);
             buttonRedPick.Colour = setColour(pickColour == TeamColour.Red && pickType == ChoiceType.Pick);
             buttonBluePick.Colour = setColour(pickColour == TeamColour.Blue && pickType == ChoiceType.Pick);
+
+            static Color4 setColour(bool active) => active ? Color4.White : Color4.Gray;
         }
 
         private void setNextMode()
         {
-            int banCount = 2;
-
-            if (CurrentMatch.Value == null)
+            if (CurrentMatch.Value?.Round.Value == null)
                 return;
 
-            if (CurrentMatch.Value.Round.Value != null)
-            {
-                banCount = CurrentMatch.Value.Round.Value.BanCount.Value * 2;
-            }
+            int totalBansRequired = CurrentMatch.Value.Round.Value.BanCount.Value * 2;
 
             const TeamColour roll_winner = TeamColour.Red; //todo: draw from match
 
             var nextColour = (CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
 
-            if (pickType == ChoiceType.Ban && CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= banCount)
-                setMode(pickColour, ChoiceType.Pick);
-            else
-                setMode(nextColour, CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= banCount ? ChoiceType.Pick : ChoiceType.Ban);
+            bool hasAllBans = CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= totalBansRequired;
+
+            if (hasAllBans && pickType == ChoiceType.Ban)
+            {
+                // When switching from bans to picks, we don't rotate the team colour.
+                nextColour = pickColour;
+            }
+
+            setMode(nextColour, hasAllBans ? ChoiceType.Pick : ChoiceType.Ban);
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)

From 301d503b0b52b4ba7ba16be201efeff7a5040e64 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 29 Nov 2023 16:41:19 +0900
Subject: [PATCH 1757/2296] Add another source of FP inaccuracy to match
 osu!stable

---
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 4827ec76aa..2393a248eb 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -190,7 +190,9 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             else
                 distance = distanceData.Distance;
 
-            distance *= spans * LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
+            // Do not combine the following two lines!
+            distance *= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
+            distance *= spans;
 
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime);
 

From 1c3bcbd54812f30c1170f2f5a0ab150220505d67 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 29 Nov 2023 17:30:21 +0900
Subject: [PATCH 1758/2296] Use IHasPath instead of IHasDistance for
 mania/taiko

---
 .../Beatmaps/ManiaBeatmapConverter.cs         |  4 ++--
 ...rator.cs => PathObjectPatternGenerator.cs} | 20 +++++--------------
 .../Beatmaps/TaikoBeatmapConverter.cs         | 14 ++++---------
 3 files changed, 11 insertions(+), 27 deletions(-)
 rename osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/{DistanceObjectPatternGenerator.cs => PathObjectPatternGenerator.cs} (96%)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index aaef69f119..ccfe1501bd 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -174,9 +174,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
             switch (original)
             {
-                case IHasDistance:
+                case IHasPath:
                 {
-                    var generator = new DistanceObjectPatternGenerator(Random, original, beatmap, lastPattern, originalBeatmap);
+                    var generator = new PathObjectPatternGenerator(Random, original, beatmap, lastPattern, originalBeatmap);
                     conversion = generator;
 
                     var positionData = original as IHasPosition;
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PathObjectPatternGenerator.cs
similarity index 96%
rename from osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
rename to osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PathObjectPatternGenerator.cs
index 8aa128be33..4922915c7d 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PathObjectPatternGenerator.cs
@@ -22,13 +22,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
     /// <summary>
     /// A pattern generator for IHasDistance hit objects.
     /// </summary>
-    internal class DistanceObjectPatternGenerator : PatternGenerator
+    internal class PathObjectPatternGenerator : PatternGenerator
     {
-        /// <summary>
-        /// Base osu! slider scoring distance.
-        /// </summary>
-        private const float osu_base_scoring_distance = 100;
-
         public readonly int StartTime;
         public readonly int EndTime;
         public readonly int SegmentDuration;
@@ -36,17 +31,17 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
         private PatternType convertType;
 
-        public DistanceObjectPatternGenerator(LegacyRandom random, HitObject hitObject, ManiaBeatmap beatmap, Pattern previousPattern, IBeatmap originalBeatmap)
+        public PathObjectPatternGenerator(LegacyRandom random, HitObject hitObject, ManiaBeatmap beatmap, Pattern previousPattern, IBeatmap originalBeatmap)
             : base(random, hitObject, beatmap, previousPattern, originalBeatmap)
         {
             convertType = PatternType.None;
             if (!Beatmap.ControlPointInfo.EffectPointAt(hitObject.StartTime).KiaiMode)
                 convertType = PatternType.LowProbability;
 
-            var distanceData = hitObject as IHasDistance;
+            var pathData = hitObject as IHasPath;
             var repeatsData = hitObject as IHasRepeats;
 
-            Debug.Assert(distanceData != null);
+            Debug.Assert(pathData != null);
 
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
 
@@ -60,12 +55,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             SpanCount = repeatsData?.SpanCount() ?? 1;
             StartTime = (int)Math.Round(hitObject.StartTime);
 
-            double distance;
-
-            if (hitObject is IHasPath pathData)
-                distance = pathData.Path.ExpectedDistance.Value ?? 0;
-            else
-                distance = distanceData.Distance;
+            double distance = pathData.Path.ExpectedDistance.Value ?? 0;
 
             // This matches stable's calculation.
             EndTime = (int)Math.Floor(StartTime + distance * beatLength * SpanCount * 0.01 / beatmap.Difficulty.SliderMultiplier);
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 2393a248eb..2551321ff2 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -109,9 +109,9 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
             switch (obj)
             {
-                case IHasDistance distanceData:
+                case IHasPath pathData:
                 {
-                    if (shouldConvertSliderToHits(obj, beatmap, distanceData, out int taikoDuration, out double tickSpacing))
+                    if (shouldConvertSliderToHits(obj, beatmap, pathData, out int taikoDuration, out double tickSpacing))
                     {
                         IList<IList<HitSampleInfo>> allSamples = obj is IHasPathWithRepeats curveData ? curveData.NodeSamples : new List<IList<HitSampleInfo>>(new[] { samples });
 
@@ -174,7 +174,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             }
         }
 
-        private bool shouldConvertSliderToHits(HitObject obj, IBeatmap beatmap, IHasDistance distanceData, out int taikoDuration, out double tickSpacing)
+        private bool shouldConvertSliderToHits(HitObject obj, IBeatmap beatmap, IHasPath pathData, out int taikoDuration, out double tickSpacing)
         {
             // DO NOT CHANGE OR REFACTOR ANYTHING IN HERE WITHOUT TESTING AGAINST _ALL_ BEATMAPS.
             // Some of these calculations look redundant, but they are not - extremely small floating point errors are introduced to maintain 1:1 compatibility with stable.
@@ -182,13 +182,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
             // The true distance, accounting for any repeats. This ends up being the drum roll distance later
             int spans = (obj as IHasRepeats)?.SpanCount() ?? 1;
-
-            double distance;
-
-            if (obj is IHasPath pathData)
-                distance = pathData.Path.ExpectedDistance.Value ?? 0;
-            else
-                distance = distanceData.Distance;
+            double distance = pathData.Path.ExpectedDistance.Value ?? 0;
 
             // Do not combine the following two lines!
             distance *= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;

From 295a1b01d6257980a688551e7aaa0fdd99b49257 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 29 Nov 2023 19:05:24 +0900
Subject: [PATCH 1759/2296] Adjust catch score grade cutoffs

---
 .../Scoring/CatchScoreProcessor.cs            |  53 +++++++++
 .../Visual/Ranking/TestSceneAccuracyCircle.cs | 110 +++++++++++-------
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   |   4 +-
 .../Expanded/Accuracy/AccuracyCircle.cs       |  69 ++++++-----
 4 files changed, 160 insertions(+), 76 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index 9323296b7f..66c76f9b17 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -4,11 +4,19 @@
 using System;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Scoring
 {
     public partial class CatchScoreProcessor : ScoreProcessor
     {
+        private const double accuracy_cutoff_x = 1;
+        private const double accuracy_cutoff_s = 0.98;
+        private const double accuracy_cutoff_a = 0.94;
+        private const double accuracy_cutoff_b = 0.9;
+        private const double accuracy_cutoff_c = 0.85;
+        private const double accuracy_cutoff_d = 0;
+
         private const int combo_cap = 200;
         private const double combo_base = 4;
 
@@ -26,5 +34,50 @@ namespace osu.Game.Rulesets.Catch.Scoring
 
         protected override double GetComboScoreChange(JudgementResult result)
             => Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
+
+        public override ScoreRank RankFromAccuracy(double accuracy)
+        {
+            if (accuracy == accuracy_cutoff_x)
+                return ScoreRank.X;
+            if (accuracy >= accuracy_cutoff_s)
+                return ScoreRank.S;
+            if (accuracy >= accuracy_cutoff_a)
+                return ScoreRank.A;
+            if (accuracy >= accuracy_cutoff_b)
+                return ScoreRank.B;
+            if (accuracy >= accuracy_cutoff_c)
+                return ScoreRank.C;
+
+            return ScoreRank.D;
+        }
+
+        public override double AccuracyCutoffFromRank(ScoreRank rank)
+        {
+            switch (rank)
+            {
+                case ScoreRank.X:
+                case ScoreRank.XH:
+                    return accuracy_cutoff_x;
+
+                case ScoreRank.S:
+                case ScoreRank.SH:
+                    return accuracy_cutoff_s;
+
+                case ScoreRank.A:
+                    return accuracy_cutoff_a;
+
+                case ScoreRank.B:
+                    return accuracy_cutoff_b;
+
+                case ScoreRank.C:
+                    return accuracy_cutoff_c;
+
+                case ScoreRank.D:
+                    return accuracy_cutoff_d;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(rank), rank, null);
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index 03b168c72c..435dd77120 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -9,6 +9,8 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Online.API.Requests.Responses;
+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;
@@ -22,31 +24,48 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public partial class TestSceneAccuracyCircle : OsuTestScene
     {
-        [TestCase(0)]
-        [TestCase(0.2)]
-        [TestCase(0.5)]
-        [TestCase(0.6999)]
-        [TestCase(0.7)]
-        [TestCase(0.75)]
-        [TestCase(0.7999)]
-        [TestCase(0.8)]
-        [TestCase(0.85)]
-        [TestCase(0.8999)]
-        [TestCase(0.9)]
-        [TestCase(0.925)]
-        [TestCase(0.9499)]
-        [TestCase(0.95)]
-        [TestCase(0.975)]
-        [TestCase(0.9999)]
-        [TestCase(1)]
-        public void TestRank(double accuracy)
+        [Test]
+        public void TestOsuRank()
         {
-            var score = createScore(accuracy, ScoreProcessor.RankFromAccuracy(accuracy));
-
-            addCircleStep(score);
+            addCircleStep(createScore(0, new OsuRuleset()));
+            addCircleStep(createScore(0.5, new OsuRuleset()));
+            addCircleStep(createScore(0.699, new OsuRuleset()));
+            addCircleStep(createScore(0.7, new OsuRuleset()));
+            addCircleStep(createScore(0.75, new OsuRuleset()));
+            addCircleStep(createScore(0.799, new OsuRuleset()));
+            addCircleStep(createScore(0.8, new OsuRuleset()));
+            addCircleStep(createScore(0.85, new OsuRuleset()));
+            addCircleStep(createScore(0.899, new OsuRuleset()));
+            addCircleStep(createScore(0.9, new OsuRuleset()));
+            addCircleStep(createScore(0.925, new OsuRuleset()));
+            addCircleStep(createScore(0.9499, new OsuRuleset()));
+            addCircleStep(createScore(0.95, new OsuRuleset()));
+            addCircleStep(createScore(0.975, new OsuRuleset()));
+            addCircleStep(createScore(0.99, new OsuRuleset()));
+            addCircleStep(createScore(1, new OsuRuleset()));
         }
 
-        private void addCircleStep(ScoreInfo score) => AddStep("add panel", () =>
+        [Test]
+        public void TestCatchRank()
+        {
+            addCircleStep(createScore(0, new CatchRuleset()));
+            addCircleStep(createScore(0.5, new CatchRuleset()));
+            addCircleStep(createScore(0.8499, new CatchRuleset()));
+            addCircleStep(createScore(0.85, new CatchRuleset()));
+            addCircleStep(createScore(0.875, new CatchRuleset()));
+            addCircleStep(createScore(0.899, new CatchRuleset()));
+            addCircleStep(createScore(0.9, new CatchRuleset()));
+            addCircleStep(createScore(0.925, new CatchRuleset()));
+            addCircleStep(createScore(0.9399, new CatchRuleset()));
+            addCircleStep(createScore(0.94, new CatchRuleset()));
+            addCircleStep(createScore(0.9675, new CatchRuleset()));
+            addCircleStep(createScore(0.9799, new CatchRuleset()));
+            addCircleStep(createScore(0.98, new CatchRuleset()));
+            addCircleStep(createScore(0.99, new CatchRuleset()));
+            addCircleStep(createScore(1, new CatchRuleset()));
+        }
+
+        private void addCircleStep(ScoreInfo score) => AddStep($"add panel ({score.DisplayAccuracy})", () =>
         {
             Children = new Drawable[]
             {
@@ -73,28 +92,33 @@ namespace osu.Game.Tests.Visual.Ranking
             };
         });
 
-        private ScoreInfo createScore(double accuracy, ScoreRank rank) => new ScoreInfo
+        private ScoreInfo createScore(double accuracy, Ruleset ruleset)
         {
-            User = new APIUser
+            var scoreProcessor = ruleset.CreateScoreProcessor();
+
+            return new ScoreInfo
             {
-                Id = 2,
-                Username = "peppy",
-            },
-            BeatmapInfo = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
-            Ruleset = new OsuRuleset().RulesetInfo,
-            Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
-            TotalScore = 2845370,
-            Accuracy = accuracy,
-            MaxCombo = 999,
-            Rank = rank,
-            Date = DateTimeOffset.Now,
-            Statistics =
-            {
-                { HitResult.Miss, 1 },
-                { HitResult.Meh, 50 },
-                { HitResult.Good, 100 },
-                { HitResult.Great, 300 },
-            }
-        };
+                User = new APIUser
+                {
+                    Id = 2,
+                    Username = "peppy",
+                },
+                BeatmapInfo = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
+                Ruleset = ruleset.RulesetInfo,
+                Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
+                TotalScore = 2845370,
+                Accuracy = accuracy,
+                MaxCombo = 999,
+                Rank = scoreProcessor.RankFromAccuracy(accuracy),
+                Date = DateTimeOffset.Now,
+                Statistics =
+                {
+                    { HitResult.Miss, 1 },
+                    { HitResult.Meh, 50 },
+                    { HitResult.Good, 100 },
+                    { HitResult.Great, 300 },
+                }
+            };
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 4e899479bd..92336b2c21 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -446,7 +446,7 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// Given an accuracy (0..1), return the correct <see cref="ScoreRank"/>.
         /// </summary>
-        public static ScoreRank RankFromAccuracy(double accuracy)
+        public virtual ScoreRank RankFromAccuracy(double accuracy)
         {
             if (accuracy == accuracy_cutoff_x)
                 return ScoreRank.X;
@@ -466,7 +466,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Given a <see cref="ScoreRank"/>, return the cutoff accuracy (0..1).
         /// Accuracy must be greater than or equal to the cutoff to qualify for the provided rank.
         /// </summary>
-        public static double AccuracyCutoffFromRank(ScoreRank rank)
+        public virtual double AccuracyCutoffFromRank(ScoreRank rank)
         {
             switch (rank)
             {
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 2ec4270c3c..80ff872312 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -29,13 +29,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
     /// </summary>
     public partial class AccuracyCircle : CompositeDrawable
     {
-        private static readonly double accuracy_x = ScoreProcessor.AccuracyCutoffFromRank(ScoreRank.X);
-        private static readonly double accuracy_s = ScoreProcessor.AccuracyCutoffFromRank(ScoreRank.S);
-        private static readonly double accuracy_a = ScoreProcessor.AccuracyCutoffFromRank(ScoreRank.A);
-        private static readonly double accuracy_b = ScoreProcessor.AccuracyCutoffFromRank(ScoreRank.B);
-        private static readonly double accuracy_c = ScoreProcessor.AccuracyCutoffFromRank(ScoreRank.C);
-        private static readonly double accuracy_d = ScoreProcessor.AccuracyCutoffFromRank(ScoreRank.D);
-
         /// <summary>
         /// Duration for the transforms causing this component to appear.
         /// </summary>
@@ -110,12 +103,26 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         private double lastTickPlaybackTime;
         private bool isTicking;
 
+        private readonly double accuracyX;
+        private readonly double accuracyS;
+        private readonly double accuracyA;
+        private readonly double accuracyB;
+        private readonly double accuracyC;
+        private readonly double accuracyD;
         private readonly bool withFlair;
 
         public AccuracyCircle(ScoreInfo score, bool withFlair = false)
         {
             this.score = score;
             this.withFlair = withFlair;
+
+            ScoreProcessor scoreProcessor = score.Ruleset.CreateInstance().CreateScoreProcessor();
+            accuracyX = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.X);
+            accuracyS = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.S);
+            accuracyA = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.A);
+            accuracyB = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.B);
+            accuracyC = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.C);
+            accuracyD = scoreProcessor.AccuracyCutoffFromRank(ScoreRank.D);
         }
 
         [BackgroundDependencyLoader]
@@ -158,49 +165,49 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                             RelativeSizeAxes = Axes.Both,
                             Colour = OsuColour.ForRank(ScoreRank.X),
                             InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracy_x }
+                            Current = { Value = accuracyX }
                         },
                         new CircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
                             Colour = OsuColour.ForRank(ScoreRank.S),
                             InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracy_x - virtual_ss_percentage }
+                            Current = { Value = accuracyX - virtual_ss_percentage }
                         },
                         new CircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
                             Colour = OsuColour.ForRank(ScoreRank.A),
                             InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracy_s }
+                            Current = { Value = accuracyS }
                         },
                         new CircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
                             Colour = OsuColour.ForRank(ScoreRank.B),
                             InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracy_a }
+                            Current = { Value = accuracyA }
                         },
                         new CircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
                             Colour = OsuColour.ForRank(ScoreRank.C),
                             InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracy_b }
+                            Current = { Value = accuracyB }
                         },
                         new CircularProgress
                         {
                             RelativeSizeAxes = Axes.Both,
                             Colour = OsuColour.ForRank(ScoreRank.D),
                             InnerRadius = RANK_CIRCLE_RADIUS,
-                            Current = { Value = accuracy_c }
+                            Current = { Value = accuracyC }
                         },
-                        new RankNotch((float)accuracy_x),
-                        new RankNotch((float)(accuracy_x - virtual_ss_percentage)),
-                        new RankNotch((float)accuracy_s),
-                        new RankNotch((float)accuracy_a),
-                        new RankNotch((float)accuracy_b),
-                        new RankNotch((float)accuracy_c),
+                        new RankNotch((float)accuracyX),
+                        new RankNotch((float)(accuracyX - virtual_ss_percentage)),
+                        new RankNotch((float)accuracyS),
+                        new RankNotch((float)accuracyA),
+                        new RankNotch((float)accuracyB),
+                        new RankNotch((float)accuracyC),
                         new BufferedContainer
                         {
                             Name = "Graded circle mask",
@@ -229,12 +236,12 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                     Children = new[]
                     {
                         // The S and A badges are moved down slightly to prevent collision with the SS badge.
-                        new RankBadge(accuracy_x, accuracy_x, getRank(ScoreRank.X)),
-                        new RankBadge(accuracy_s, Interpolation.Lerp(accuracy_s, (accuracy_x - virtual_ss_percentage), 0.25), getRank(ScoreRank.S)),
-                        new RankBadge(accuracy_a, Interpolation.Lerp(accuracy_a, accuracy_s, 0.25), getRank(ScoreRank.A)),
-                        new RankBadge(accuracy_b, Interpolation.Lerp(accuracy_b, accuracy_a, 0.5), getRank(ScoreRank.B)),
-                        new RankBadge(accuracy_c, Interpolation.Lerp(accuracy_c, accuracy_b, 0.5), getRank(ScoreRank.C)),
-                        new RankBadge(accuracy_d, Interpolation.Lerp(accuracy_d, accuracy_c, 0.5), getRank(ScoreRank.D)),
+                        new RankBadge(accuracyX, accuracyX, getRank(ScoreRank.X)),
+                        new RankBadge(accuracyS, Interpolation.Lerp(accuracyS, (accuracyX - virtual_ss_percentage), 0.25), getRank(ScoreRank.S)),
+                        new RankBadge(accuracyA, Interpolation.Lerp(accuracyA, accuracyS, 0.25), getRank(ScoreRank.A)),
+                        new RankBadge(accuracyB, Interpolation.Lerp(accuracyB, accuracyA, 0.5), getRank(ScoreRank.B)),
+                        new RankBadge(accuracyC, Interpolation.Lerp(accuracyC, accuracyB, 0.5), getRank(ScoreRank.C)),
+                        new RankBadge(accuracyD, Interpolation.Lerp(accuracyD, accuracyC, 0.5), getRank(ScoreRank.D)),
                     }
                 },
                 rankText = new RankText(score.Rank)
@@ -280,10 +287,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                 double targetAccuracy = score.Accuracy;
                 double[] notchPercentages =
                 {
-                    accuracy_s,
-                    accuracy_a,
-                    accuracy_b,
-                    accuracy_c,
+                    accuracyS,
+                    accuracyA,
+                    accuracyB,
+                    accuracyC,
                 };
 
                 // Ensure the gauge overshoots or undershoots a bit so it doesn't land in the gaps of the inner graded circle (caused by `RankNotch`es),
@@ -302,7 +309,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                 if (score.Rank == ScoreRank.X || score.Rank == ScoreRank.XH)
                     targetAccuracy = 1;
                 else
-                    targetAccuracy = Math.Min(accuracy_x - virtual_ss_percentage - NOTCH_WIDTH_PERCENTAGE / 2, targetAccuracy);
+                    targetAccuracy = Math.Min(accuracyX - virtual_ss_percentage - NOTCH_WIDTH_PERCENTAGE / 2, targetAccuracy);
 
                 // The accuracy circle gauge visually fills up a bit too much.
                 // This wouldn't normally matter but we want it to align properly with the inner graded circle in the above cases.
@@ -339,7 +346,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                     if (badge.Accuracy > score.Accuracy)
                         continue;
 
-                    using (BeginDelayedSequence(inverseEasing(ACCURACY_TRANSFORM_EASING, Math.Min(accuracy_x - virtual_ss_percentage, badge.Accuracy) / targetAccuracy) * ACCURACY_TRANSFORM_DURATION))
+                    using (BeginDelayedSequence(inverseEasing(ACCURACY_TRANSFORM_EASING, Math.Min(accuracyX - virtual_ss_percentage, badge.Accuracy) / targetAccuracy) * ACCURACY_TRANSFORM_DURATION))
                     {
                         badge.Appear();
 

From 60d6c0fe53ebd1b5d9761cc1151f3a44473948e4 Mon Sep 17 00:00:00 2001
From: Rodrigo Pina <rodrigo.pina@bizaygroup.com>
Date: Wed, 29 Nov 2023 11:22:07 +0000
Subject: [PATCH 1760/2296] Changed ban order to match typical tournament ban
 structure

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 5148c0eaf4..60abddfe67 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -153,7 +153,9 @@ namespace osu.Game.Tournament.Screens.MapPool
 
             const TeamColour roll_winner = TeamColour.Red; //todo: draw from match
 
-            var nextColour = (CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
+            var previousBan = CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner;
+
+            var nextColour = (CurrentMatch.Value.PicksBans.Count() >= 2 ? CurrentMatch.Value.PicksBans[^2]?.Team : previousBan) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
 
             bool hasAllBans = CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= totalBansRequired;
 

From 1cfcaee121c7f5b62610a751d1251b752c7dc794 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Nov 2023 20:29:50 +0900
Subject: [PATCH 1761/2296] Reorder badges so that SS shows above others

This isn't perfect and probably needs much more consideration, but let's
at least give the "better" ranks more visibility by bringing them to the
front.

Of note, this is only important due to the changes to osu!catch
accuracy-grade cutoffs, which brings things closer in proximity than
ever before.
---
 .../Ranking/Expanded/Accuracy/AccuracyCircle.cs      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 80ff872312..8cbca74466 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -235,13 +235,13 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                     Padding = new MarginPadding { Vertical = -15, Horizontal = -20 },
                     Children = new[]
                     {
-                        // The S and A badges are moved down slightly to prevent collision with the SS badge.
-                        new RankBadge(accuracyX, accuracyX, getRank(ScoreRank.X)),
-                        new RankBadge(accuracyS, Interpolation.Lerp(accuracyS, (accuracyX - virtual_ss_percentage), 0.25), getRank(ScoreRank.S)),
-                        new RankBadge(accuracyA, Interpolation.Lerp(accuracyA, accuracyS, 0.25), getRank(ScoreRank.A)),
-                        new RankBadge(accuracyB, Interpolation.Lerp(accuracyB, accuracyA, 0.5), getRank(ScoreRank.B)),
-                        new RankBadge(accuracyC, Interpolation.Lerp(accuracyC, accuracyB, 0.5), getRank(ScoreRank.C)),
                         new RankBadge(accuracyD, Interpolation.Lerp(accuracyD, accuracyC, 0.5), getRank(ScoreRank.D)),
+                        new RankBadge(accuracyC, Interpolation.Lerp(accuracyC, accuracyB, 0.5), getRank(ScoreRank.C)),
+                        new RankBadge(accuracyB, Interpolation.Lerp(accuracyB, accuracyA, 0.5), getRank(ScoreRank.B)),
+                        // The S and A badges are moved down slightly to prevent collision with the SS badge.
+                        new RankBadge(accuracyA, Interpolation.Lerp(accuracyA, accuracyS, 0.25), getRank(ScoreRank.A)),
+                        new RankBadge(accuracyS, Interpolation.Lerp(accuracyS, (accuracyX - virtual_ss_percentage), 0.25), getRank(ScoreRank.S)),
+                        new RankBadge(accuracyX, accuracyX, getRank(ScoreRank.X)),
                     }
                 },
                 rankText = new RankText(score.Rank)

From a33a4c4d1d7094c6fe2b200ab14f8fd8a4439413 Mon Sep 17 00:00:00 2001
From: Rodrigo Pina <rodrigo.pina@bizaygroup.com>
Date: Wed, 29 Nov 2023 11:31:15 +0000
Subject: [PATCH 1762/2296] Fixed issue where pick order was following ban
 order structure

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 60abddfe67..9da55cc607 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -155,10 +155,14 @@ namespace osu.Game.Tournament.Screens.MapPool
 
             var previousBan = CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner;
 
-            var nextColour = (CurrentMatch.Value.PicksBans.Count() >= 2 ? CurrentMatch.Value.PicksBans[^2]?.Team : previousBan) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
+            var nextColour = previousBan == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
 
             bool hasAllBans = CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= totalBansRequired;
 
+            if (!hasAllBans)
+                // If it's the third ban or later, we need to check if it's the team's first or second ban in a row
+                nextColour = (CurrentMatch.Value.PicksBans.Count() >= 2 ? CurrentMatch.Value.PicksBans[^2]?.Team : previousBan) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
+
             if (hasAllBans && pickType == ChoiceType.Ban)
             {
                 // When switching from bans to picks, we don't rotate the team colour.

From 3553717cc6238251cd7a0dd95d4749584c23504c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Nov 2023 21:28:25 +0900
Subject: [PATCH 1763/2296] Fix results screen not including slider end misses
 in tick count

---
 osu.Game/Scoring/ScoreInfo.cs | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index d712702331..5545ba552e 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -342,23 +342,7 @@ namespace osu.Game.Scoring
                 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.LargeBonus:
                     case HitResult.SmallBonus:
                         if (MaximumStatistics.TryGetValue(r.result, out int count) && count > 0)

From ecbf07c52acbc247a7825c102b8a10cb88ea333e Mon Sep 17 00:00:00 2001
From: Rodrigo Pina <rodrigo.pina@bizaygroup.com>
Date: Thu, 30 Nov 2023 02:56:23 +0000
Subject: [PATCH 1764/2296] Replace Count() from CurrentMatch.Value.PicksBans
 with property alternative

---
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 9da55cc607..1223fd8464 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -161,7 +161,7 @@ namespace osu.Game.Tournament.Screens.MapPool
 
             if (!hasAllBans)
                 // If it's the third ban or later, we need to check if it's the team's first or second ban in a row
-                nextColour = (CurrentMatch.Value.PicksBans.Count() >= 2 ? CurrentMatch.Value.PicksBans[^2]?.Team : previousBan) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
+                nextColour = (CurrentMatch.Value.PicksBans.Count >= 2 ? CurrentMatch.Value.PicksBans[^2]?.Team : previousBan) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
 
             if (hasAllBans && pickType == ChoiceType.Ban)
             {

From 831fe5b9f2a833dc8d1dbd4c4340376c10c854cc Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 30 Nov 2023 14:36:23 +0100
Subject: [PATCH 1765/2296] Use collection assert to ease debugging

---
 .../Visual/Online/TestSceneChatLink.cs        | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 7616b9b83c..70eca64084 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -107,27 +107,11 @@ namespace osu.Game.Tests.Visual.Online
                     textContainer.Add(newLine);
                 });
 
-                AddAssert($"msg #{index} has {linkAmount} link(s)", () => newLine.Message.Links.Count == linkAmount);
-                AddAssert($"msg #{index} has the right action", hasExpectedActions);
+                AddAssert($"msg #{index} has {linkAmount} link(s)", () => newLine.Message.Links, () => Has.Count.EqualTo(linkAmount));
+                AddAssert($"msg #{index} has the right action", () => newLine.Message.Links.Select(l => l.Action), () => Is.EqualTo(expectedActions));
                 //AddAssert($"msg #{index} is " + (isAction ? "italic" : "not italic"), () => newLine.ContentFlow.Any() && isAction == isItalic());
                 AddAssert($"msg #{index} shows {linkAmount} link(s)", isShowingLinks);
 
-                bool hasExpectedActions()
-                {
-                    var expectedActionsList = expectedActions.ToList();
-
-                    if (expectedActionsList.Count != newLine.Message.Links.Count)
-                        return false;
-
-                    for (int i = 0; i < newLine.Message.Links.Count; i++)
-                    {
-                        var action = newLine.Message.Links[i].Action;
-                        if (action != expectedActions[i]) return false;
-                    }
-
-                    return true;
-                }
-
                 //bool isItalic() => newLine.ContentFlow.Where(d => d is OsuSpriteText).Cast<OsuSpriteText>().All(sprite => sprite.Font.Italics);
 
                 bool isShowingLinks()

From 9a32c0368e6d03153ac21070cf5a979e200df674 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 30 Nov 2023 14:38:58 +0100
Subject: [PATCH 1766/2296] Remove redundant `linkAmount` parameter

---
 .../Visual/Online/TestSceneChatLink.cs        | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 70eca64084..1ab7e3257f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -63,40 +63,40 @@ namespace osu.Game.Tests.Visual.Online
 
             addMessageWithChecks("test!");
             addMessageWithChecks("dev.ppy.sh!");
-            addMessageWithChecks("https://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("http://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("forgothttps://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("forgothttp://dev.ppy.sh!", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("00:12:345 (1,2) - Test?", 1, expectedActions: LinkAction.OpenEditorTimestamp);
-            addMessageWithChecks("Wiki link for tasty [[Performance Points]]", 1, expectedActions: LinkAction.OpenWiki);
-            addMessageWithChecks("(osu forums)[https://dev.ppy.sh/forum] (old link format)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[https://dev.ppy.sh/home New site] (new link format)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[osu forums](https://dev.ppy.sh/forum) (new link format 2)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[https://dev.ppy.sh/home This is only a link to the new osu webpage but this is supposed to test word wrap.]", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("is now listening to [https://dev.ppy.sh/s/93523 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmapSet);
-            addMessageWithChecks("is now playing [https://dev.ppy.sh/b/252238 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmap);
-            addMessageWithChecks("Let's (try)[https://dev.ppy.sh/home] [https://dev.ppy.sh/b/252238 multiple links] https://dev.ppy.sh/home", 3,
+            addMessageWithChecks("https://dev.ppy.sh!", expectedActions: LinkAction.External);
+            addMessageWithChecks("http://dev.ppy.sh!", expectedActions: LinkAction.External);
+            addMessageWithChecks("forgothttps://dev.ppy.sh!", expectedActions: LinkAction.External);
+            addMessageWithChecks("forgothttp://dev.ppy.sh!", expectedActions: LinkAction.External);
+            addMessageWithChecks("00:12:345 (1,2) - Test?", expectedActions: LinkAction.OpenEditorTimestamp);
+            addMessageWithChecks("Wiki link for tasty [[Performance Points]]", expectedActions: LinkAction.OpenWiki);
+            addMessageWithChecks("(osu forums)[https://dev.ppy.sh/forum] (old link format)", expectedActions: LinkAction.External);
+            addMessageWithChecks("[https://dev.ppy.sh/home New site] (new link format)", expectedActions: LinkAction.External);
+            addMessageWithChecks("[osu forums](https://dev.ppy.sh/forum) (new link format 2)", expectedActions: LinkAction.External);
+            addMessageWithChecks("[https://dev.ppy.sh/home This is only a link to the new osu webpage but this is supposed to test word wrap.]", expectedActions: LinkAction.External);
+            addMessageWithChecks("is now listening to [https://dev.ppy.sh/s/93523 IMAGE -MATERIAL- <Version 0>]", isAction: true, expectedActions: LinkAction.OpenBeatmapSet);
+            addMessageWithChecks("is now playing [https://dev.ppy.sh/b/252238 IMAGE -MATERIAL- <Version 0>]", isAction: true, expectedActions: LinkAction.OpenBeatmap);
+            addMessageWithChecks("Let's (try)[https://dev.ppy.sh/home] [https://dev.ppy.sh/b/252238 multiple links] https://dev.ppy.sh/home",
                 expectedActions: new[] { LinkAction.External, LinkAction.OpenBeatmap, LinkAction.External });
-            addMessageWithChecks("[https://dev.ppy.sh/home New link format with escaped [and \\[ paired] braces]", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[Markdown link format with escaped [and \\[ paired] braces](https://dev.ppy.sh/home)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("(Old link format with escaped (and \\( paired) parentheses)[https://dev.ppy.sh/home] and [[also a rogue wiki link]]", 2,
+            addMessageWithChecks("[https://dev.ppy.sh/home New link format with escaped [and \\[ paired] braces]", expectedActions: LinkAction.External);
+            addMessageWithChecks("[Markdown link format with escaped [and \\[ paired] braces](https://dev.ppy.sh/home)", expectedActions: LinkAction.External);
+            addMessageWithChecks("(Old link format with escaped (and \\( paired) parentheses)[https://dev.ppy.sh/home] and [[also a rogue wiki link]]",
                 expectedActions: new[] { LinkAction.External, LinkAction.OpenWiki });
             // note that there's 0 links here (they get removed if a channel is not found)
             addMessageWithChecks("#lobby or #osu would be blue (and work) in the ChatDisplay test (when a proper ChatOverlay is present).");
-            addMessageWithChecks("I am important!", 0, false, true);
-            addMessageWithChecks("feels important", 0, true, true);
-            addMessageWithChecks("likes to post this [https://dev.ppy.sh/home link].", 1, true, true, expectedActions: LinkAction.External);
-            addMessageWithChecks("Join my multiplayer game osump://12346.", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
-            addMessageWithChecks("Join my multiplayer gameosump://12346.", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
-            addMessageWithChecks("Join my [multiplayer game](osump://12346).", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
-            addMessageWithChecks($"Join my [#english]({OsuGameBase.OSU_PROTOCOL}chan/#english).", 1, expectedActions: LinkAction.OpenChannel);
-            addMessageWithChecks($"Join my {OsuGameBase.OSU_PROTOCOL}chan/#english.", 1, expectedActions: LinkAction.OpenChannel);
-            addMessageWithChecks($"Join my{OsuGameBase.OSU_PROTOCOL}chan/#english.", 1, expectedActions: LinkAction.OpenChannel);
-            addMessageWithChecks("Join my #english or #japanese channels.", 2, expectedActions: new[] { LinkAction.OpenChannel, LinkAction.OpenChannel });
-            addMessageWithChecks("Join my #english or #nonexistent #hashtag channels.", 1, expectedActions: LinkAction.OpenChannel);
+            addMessageWithChecks("I am important!", isAction: false, isImportant: true);
+            addMessageWithChecks("feels important", isAction: true, isImportant: true);
+            addMessageWithChecks("likes to post this [https://dev.ppy.sh/home link].", isAction: true, isImportant: true, expectedActions: LinkAction.External);
+            addMessageWithChecks("Join my multiplayer game osump://12346.", expectedActions: LinkAction.JoinMultiplayerMatch);
+            addMessageWithChecks("Join my multiplayer gameosump://12346.", expectedActions: LinkAction.JoinMultiplayerMatch);
+            addMessageWithChecks("Join my [multiplayer game](osump://12346).", expectedActions: LinkAction.JoinMultiplayerMatch);
+            addMessageWithChecks($"Join my [#english]({OsuGameBase.OSU_PROTOCOL}chan/#english).", expectedActions: LinkAction.OpenChannel);
+            addMessageWithChecks($"Join my {OsuGameBase.OSU_PROTOCOL}chan/#english.", expectedActions: LinkAction.OpenChannel);
+            addMessageWithChecks($"Join my{OsuGameBase.OSU_PROTOCOL}chan/#english.", expectedActions: LinkAction.OpenChannel);
+            addMessageWithChecks("Join my #english or #japanese channels.", expectedActions: new[] { LinkAction.OpenChannel, LinkAction.OpenChannel });
+            addMessageWithChecks("Join my #english or #nonexistent #hashtag channels.", expectedActions: LinkAction.OpenChannel);
             addMessageWithChecks("Hello world\uD83D\uDE12(<--This is an emoji). There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20");
 
-            void addMessageWithChecks(string text, int linkAmount = 0, bool isAction = false, bool isImportant = false, params LinkAction[] expectedActions)
+            void addMessageWithChecks(string text, bool isAction = false, bool isImportant = false, params LinkAction[] expectedActions)
             {
                 ChatLine newLine = null;
                 int index = messageIndex++;
@@ -107,10 +107,9 @@ namespace osu.Game.Tests.Visual.Online
                     textContainer.Add(newLine);
                 });
 
-                AddAssert($"msg #{index} has {linkAmount} link(s)", () => newLine.Message.Links, () => Has.Count.EqualTo(linkAmount));
                 AddAssert($"msg #{index} has the right action", () => newLine.Message.Links.Select(l => l.Action), () => Is.EqualTo(expectedActions));
                 //AddAssert($"msg #{index} is " + (isAction ? "italic" : "not italic"), () => newLine.ContentFlow.Any() && isAction == isItalic());
-                AddAssert($"msg #{index} shows {linkAmount} link(s)", isShowingLinks);
+                AddAssert($"msg #{index} shows {expectedActions.Length} link(s)", isShowingLinks);
 
                 //bool isItalic() => newLine.ContentFlow.Where(d => d is OsuSpriteText).Cast<OsuSpriteText>().All(sprite => sprite.Font.Italics);
 

From d2324cd8f9ca27da010d26d542ccd80d7a3a29d8 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 30 Nov 2023 10:20:01 -0800
Subject: [PATCH 1767/2296] Fix chat overlay top bar icon being incorrect

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

diff --git a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
index 84fd342493..4fc9fbb6d5 100644
--- a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
+++ b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Chat
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Icon = HexaconsIcons.Social,
+                                Icon = HexaconsIcons.Messaging,
                                 Size = new Vector2(24),
                             },
                             // Placeholder text

From 3ca3f254925603f953163ad9f7d694b18865cd13 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 30 Nov 2023 23:25:28 +0100
Subject: [PATCH 1768/2296] Extract local method

---
 .../Visual/Online/TestSceneChatLink.cs        | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 1ab7e3257f..a0fcdf4337 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -59,8 +59,6 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestLinksGeneral()
         {
-            int messageIndex = 0;
-
             addMessageWithChecks("test!");
             addMessageWithChecks("dev.ppy.sh!");
             addMessageWithChecks("https://dev.ppy.sh!", expectedActions: LinkAction.External);
@@ -95,36 +93,35 @@ namespace osu.Game.Tests.Visual.Online
             addMessageWithChecks("Join my #english or #japanese channels.", expectedActions: new[] { LinkAction.OpenChannel, LinkAction.OpenChannel });
             addMessageWithChecks("Join my #english or #nonexistent #hashtag channels.", expectedActions: LinkAction.OpenChannel);
             addMessageWithChecks("Hello world\uD83D\uDE12(<--This is an emoji). There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20");
+        }
 
-            void addMessageWithChecks(string text, bool isAction = false, bool isImportant = false, params LinkAction[] expectedActions)
+        private void addMessageWithChecks(string text, bool isAction = false, bool isImportant = false, params LinkAction[] expectedActions)
+        {
+            ChatLine newLine = null;
+
+            AddStep("add message", () =>
             {
-                ChatLine newLine = null;
-                int index = messageIndex++;
+                newLine = new ChatLine(new DummyMessage(text, isAction, isImportant));
+                textContainer.Add(newLine);
+            });
 
-                AddStep("add message", () =>
-                {
-                    newLine = new ChatLine(new DummyMessage(text, isAction, isImportant, index));
-                    textContainer.Add(newLine);
-                });
+            AddAssert($"msg has the right action", () => newLine.Message.Links.Select(l => l.Action), () => Is.EqualTo(expectedActions));
+            //AddAssert($"msg is " + (isAction ? "italic" : "not italic"), () => newLine.ContentFlow.Any() && isAction == isItalic());
+            AddAssert($"msg shows {expectedActions.Length} link(s)", isShowingLinks);
 
-                AddAssert($"msg #{index} has the right action", () => newLine.Message.Links.Select(l => l.Action), () => Is.EqualTo(expectedActions));
-                //AddAssert($"msg #{index} is " + (isAction ? "italic" : "not italic"), () => newLine.ContentFlow.Any() && isAction == isItalic());
-                AddAssert($"msg #{index} shows {expectedActions.Length} link(s)", isShowingLinks);
+            //bool isItalic() => newLine.ContentFlow.Where(d => d is OsuSpriteText).Cast<OsuSpriteText>().All(sprite => sprite.Font.Italics);
 
-                //bool isItalic() => newLine.ContentFlow.Where(d => d is OsuSpriteText).Cast<OsuSpriteText>().All(sprite => sprite.Font.Italics);
+            bool isShowingLinks()
+            {
+                bool hasBackground = !string.IsNullOrEmpty(newLine.Message.Sender.Colour);
 
-                bool isShowingLinks()
-                {
-                    bool hasBackground = !string.IsNullOrEmpty(newLine.Message.Sender.Colour);
+                Color4 textColour = isAction && hasBackground ? Color4Extensions.FromHex(newLine.Message.Sender.Colour) : Color4.White;
 
-                    Color4 textColour = isAction && hasBackground ? Color4Extensions.FromHex(newLine.Message.Sender.Colour) : Color4.White;
+                var linkCompilers = newLine.DrawableContentFlow.Where(d => d is DrawableLinkCompiler).ToList();
+                var linkSprites = linkCompilers.SelectMany(comp => ((DrawableLinkCompiler)comp).Parts);
 
-                    var linkCompilers = newLine.DrawableContentFlow.Where(d => d is DrawableLinkCompiler).ToList();
-                    var linkSprites = linkCompilers.SelectMany(comp => ((DrawableLinkCompiler)comp).Parts);
-
-                    return linkSprites.All(d => d.Colour == linkColour)
-                           && newLine.DrawableContentFlow.Except(linkSprites.Concat(linkCompilers)).All(d => d.Colour == textColour);
-                }
+                return linkSprites.All(d => d.Colour == linkColour)
+                       && newLine.DrawableContentFlow.Except(linkSprites.Concat(linkCompilers)).All(d => d.Colour == textColour);
             }
         }
 

From 52ffbcc6db7e21eca7f49ac6d124b8b01c12ed4d Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 30 Nov 2023 23:29:22 +0100
Subject: [PATCH 1769/2296] Move special cases to `TestCase`'d test

---
 osu.Game.Tests/Visual/Online/TestSceneChatLink.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index a0fcdf4337..52eebeb9ce 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -71,8 +71,6 @@ namespace osu.Game.Tests.Visual.Online
             addMessageWithChecks("[https://dev.ppy.sh/home New site] (new link format)", expectedActions: LinkAction.External);
             addMessageWithChecks("[osu forums](https://dev.ppy.sh/forum) (new link format 2)", expectedActions: LinkAction.External);
             addMessageWithChecks("[https://dev.ppy.sh/home This is only a link to the new osu webpage but this is supposed to test word wrap.]", expectedActions: LinkAction.External);
-            addMessageWithChecks("is now listening to [https://dev.ppy.sh/s/93523 IMAGE -MATERIAL- <Version 0>]", isAction: true, expectedActions: LinkAction.OpenBeatmapSet);
-            addMessageWithChecks("is now playing [https://dev.ppy.sh/b/252238 IMAGE -MATERIAL- <Version 0>]", isAction: true, expectedActions: LinkAction.OpenBeatmap);
             addMessageWithChecks("Let's (try)[https://dev.ppy.sh/home] [https://dev.ppy.sh/b/252238 multiple links] https://dev.ppy.sh/home",
                 expectedActions: new[] { LinkAction.External, LinkAction.OpenBeatmap, LinkAction.External });
             addMessageWithChecks("[https://dev.ppy.sh/home New link format with escaped [and \\[ paired] braces]", expectedActions: LinkAction.External);
@@ -81,9 +79,6 @@ namespace osu.Game.Tests.Visual.Online
                 expectedActions: new[] { LinkAction.External, LinkAction.OpenWiki });
             // note that there's 0 links here (they get removed if a channel is not found)
             addMessageWithChecks("#lobby or #osu would be blue (and work) in the ChatDisplay test (when a proper ChatOverlay is present).");
-            addMessageWithChecks("I am important!", isAction: false, isImportant: true);
-            addMessageWithChecks("feels important", isAction: true, isImportant: true);
-            addMessageWithChecks("likes to post this [https://dev.ppy.sh/home link].", isAction: true, isImportant: true, expectedActions: LinkAction.External);
             addMessageWithChecks("Join my multiplayer game osump://12346.", expectedActions: LinkAction.JoinMultiplayerMatch);
             addMessageWithChecks("Join my multiplayer gameosump://12346.", expectedActions: LinkAction.JoinMultiplayerMatch);
             addMessageWithChecks("Join my [multiplayer game](osump://12346).", expectedActions: LinkAction.JoinMultiplayerMatch);
@@ -95,6 +90,16 @@ namespace osu.Game.Tests.Visual.Online
             addMessageWithChecks("Hello world\uD83D\uDE12(<--This is an emoji). There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20");
         }
 
+        [TestCase("is now listening to [https://dev.ppy.sh/s/93523 IMAGE -MATERIAL- <Version 0>]", true, false, LinkAction.OpenBeatmapSet)]
+        [TestCase("is now playing [https://dev.ppy.sh/b/252238 IMAGE -MATERIAL- <Version 0>]", true, false, LinkAction.OpenBeatmap)]
+        [TestCase("I am important!", false, true)]
+        [TestCase("feels important", true, true)]
+        [TestCase("likes to post this [https://dev.ppy.sh/home link].", true, true, LinkAction.External)]
+        public void TestActionAndImportantLinks(string text, bool isAction, bool isImportant, params LinkAction[] expectedActions)
+        {
+            addMessageWithChecks(text, isAction, isImportant, expectedActions);
+        }
+
         private void addMessageWithChecks(string text, bool isAction = false, bool isImportant = false, params LinkAction[] expectedActions)
         {
             ChatLine newLine = null;

From 0520ac265fa57bbbe7f07dd9e63a966f332414d8 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 30 Nov 2023 23:34:43 +0100
Subject: [PATCH 1770/2296] Move to `TestCase`-based test

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 52eebeb9ce..ae94d1887e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -56,38 +56,35 @@ namespace osu.Game.Tests.Visual.Online
             textContainer.Clear();
         });
 
-        [Test]
-        public void TestLinksGeneral()
+        [TestCase("test!")]
+        [TestCase("dev.ppy.sh!")]
+        [TestCase("https://dev.ppy.sh!", LinkAction.External)]
+        [TestCase("http://dev.ppy.sh!", LinkAction.External)]
+        [TestCase("forgothttps://dev.ppy.sh!", LinkAction.External)]
+        [TestCase("forgothttp://dev.ppy.sh!", LinkAction.External)]
+        [TestCase("00:12:345 (1,2) - Test?", LinkAction.OpenEditorTimestamp)]
+        [TestCase("Wiki link for tasty [[Performance Points]]", LinkAction.OpenWiki)]
+        [TestCase("(osu forums)[https://dev.ppy.sh/forum] (old link format)", LinkAction.External)]
+        [TestCase("[https://dev.ppy.sh/home New site] (new link format)", LinkAction.External)]
+        [TestCase("[osu forums](https://dev.ppy.sh/forum) (new link format 2)", LinkAction.External)]
+        [TestCase("[https://dev.ppy.sh/home This is only a link to the new osu webpage but this is supposed to test word wrap.]", LinkAction.External)]
+        [TestCase("Let's (try)[https://dev.ppy.sh/home] [https://dev.ppy.sh/b/252238 multiple links] https://dev.ppy.sh/home", LinkAction.External, LinkAction.OpenBeatmap, LinkAction.External)]
+        [TestCase("[https://dev.ppy.sh/home New link format with escaped [and \\[ paired] braces]", LinkAction.External)]
+        [TestCase("[Markdown link format with escaped [and \\[ paired] braces](https://dev.ppy.sh/home)", LinkAction.External)]
+        [TestCase("(Old link format with escaped (and \\( paired) parentheses)[https://dev.ppy.sh/home] and [[also a rogue wiki link]]", LinkAction.External, LinkAction.OpenWiki)]
+        [TestCase("#lobby or #osu would be blue (and work) in the ChatDisplay test (when a proper ChatOverlay is present).")] // note that there's 0 links here (they get removed if a channel is not found)
+        [TestCase("Join my multiplayer game osump://12346.", LinkAction.JoinMultiplayerMatch)]
+        [TestCase("Join my multiplayer gameosump://12346.", LinkAction.JoinMultiplayerMatch)]
+        [TestCase("Join my [multiplayer game](osump://12346).", LinkAction.JoinMultiplayerMatch)]
+        [TestCase($"Join my [#english]({OsuGameBase.OSU_PROTOCOL}chan/#english).", LinkAction.OpenChannel)]
+        [TestCase($"Join my {OsuGameBase.OSU_PROTOCOL}chan/#english.", LinkAction.OpenChannel)]
+        [TestCase($"Join my{OsuGameBase.OSU_PROTOCOL}chan/#english.", LinkAction.OpenChannel)]
+        [TestCase("Join my #english or #japanese channels.", LinkAction.OpenChannel, LinkAction.OpenChannel)]
+        [TestCase("Join my #english or #nonexistent #hashtag channels.", LinkAction.OpenChannel)]
+        [TestCase("Hello world\uD83D\uDE12(<--This is an emoji). There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20")]
+        public void TestLinksGeneral(string text, params LinkAction[] actions)
         {
-            addMessageWithChecks("test!");
-            addMessageWithChecks("dev.ppy.sh!");
-            addMessageWithChecks("https://dev.ppy.sh!", expectedActions: LinkAction.External);
-            addMessageWithChecks("http://dev.ppy.sh!", expectedActions: LinkAction.External);
-            addMessageWithChecks("forgothttps://dev.ppy.sh!", expectedActions: LinkAction.External);
-            addMessageWithChecks("forgothttp://dev.ppy.sh!", expectedActions: LinkAction.External);
-            addMessageWithChecks("00:12:345 (1,2) - Test?", expectedActions: LinkAction.OpenEditorTimestamp);
-            addMessageWithChecks("Wiki link for tasty [[Performance Points]]", expectedActions: LinkAction.OpenWiki);
-            addMessageWithChecks("(osu forums)[https://dev.ppy.sh/forum] (old link format)", expectedActions: LinkAction.External);
-            addMessageWithChecks("[https://dev.ppy.sh/home New site] (new link format)", expectedActions: LinkAction.External);
-            addMessageWithChecks("[osu forums](https://dev.ppy.sh/forum) (new link format 2)", expectedActions: LinkAction.External);
-            addMessageWithChecks("[https://dev.ppy.sh/home This is only a link to the new osu webpage but this is supposed to test word wrap.]", expectedActions: LinkAction.External);
-            addMessageWithChecks("Let's (try)[https://dev.ppy.sh/home] [https://dev.ppy.sh/b/252238 multiple links] https://dev.ppy.sh/home",
-                expectedActions: new[] { LinkAction.External, LinkAction.OpenBeatmap, LinkAction.External });
-            addMessageWithChecks("[https://dev.ppy.sh/home New link format with escaped [and \\[ paired] braces]", expectedActions: LinkAction.External);
-            addMessageWithChecks("[Markdown link format with escaped [and \\[ paired] braces](https://dev.ppy.sh/home)", expectedActions: LinkAction.External);
-            addMessageWithChecks("(Old link format with escaped (and \\( paired) parentheses)[https://dev.ppy.sh/home] and [[also a rogue wiki link]]",
-                expectedActions: new[] { LinkAction.External, LinkAction.OpenWiki });
-            // note that there's 0 links here (they get removed if a channel is not found)
-            addMessageWithChecks("#lobby or #osu would be blue (and work) in the ChatDisplay test (when a proper ChatOverlay is present).");
-            addMessageWithChecks("Join my multiplayer game osump://12346.", expectedActions: LinkAction.JoinMultiplayerMatch);
-            addMessageWithChecks("Join my multiplayer gameosump://12346.", expectedActions: LinkAction.JoinMultiplayerMatch);
-            addMessageWithChecks("Join my [multiplayer game](osump://12346).", expectedActions: LinkAction.JoinMultiplayerMatch);
-            addMessageWithChecks($"Join my [#english]({OsuGameBase.OSU_PROTOCOL}chan/#english).", expectedActions: LinkAction.OpenChannel);
-            addMessageWithChecks($"Join my {OsuGameBase.OSU_PROTOCOL}chan/#english.", expectedActions: LinkAction.OpenChannel);
-            addMessageWithChecks($"Join my{OsuGameBase.OSU_PROTOCOL}chan/#english.", expectedActions: LinkAction.OpenChannel);
-            addMessageWithChecks("Join my #english or #japanese channels.", expectedActions: new[] { LinkAction.OpenChannel, LinkAction.OpenChannel });
-            addMessageWithChecks("Join my #english or #nonexistent #hashtag channels.", expectedActions: LinkAction.OpenChannel);
-            addMessageWithChecks("Hello world\uD83D\uDE12(<--This is an emoji). There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20");
+            addMessageWithChecks(text, expectedActions: actions);
         }
 
         [TestCase("is now listening to [https://dev.ppy.sh/s/93523 IMAGE -MATERIAL- <Version 0>]", true, false, LinkAction.OpenBeatmapSet)]

From 7b1ccb38cb8070cdcf576b4e14c9437589f74867 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 30 Nov 2023 23:35:10 +0100
Subject: [PATCH 1771/2296] Remove redundant string interpolation

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index ae94d1887e..f4dd4289c3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -107,8 +107,8 @@ namespace osu.Game.Tests.Visual.Online
                 textContainer.Add(newLine);
             });
 
-            AddAssert($"msg has the right action", () => newLine.Message.Links.Select(l => l.Action), () => Is.EqualTo(expectedActions));
-            //AddAssert($"msg is " + (isAction ? "italic" : "not italic"), () => newLine.ContentFlow.Any() && isAction == isItalic());
+            AddAssert("msg has the right action", () => newLine.Message.Links.Select(l => l.Action), () => Is.EqualTo(expectedActions));
+            //AddAssert("msg is " + (isAction ? "italic" : "not italic"), () => newLine.ContentFlow.Any() && isAction == isItalic());
             AddAssert($"msg shows {expectedActions.Length} link(s)", isShowingLinks);
 
             //bool isItalic() => newLine.ContentFlow.Where(d => d is OsuSpriteText).Cast<OsuSpriteText>().All(sprite => sprite.Font.Italics);

From 21fedff54fbc675947022b61138ca49b90e49f21 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 1 Dec 2023 00:29:37 +0100
Subject: [PATCH 1772/2296] Check number of links shown

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index f4dd4289c3..5947c01b96 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -123,7 +123,8 @@ namespace osu.Game.Tests.Visual.Online
                 var linkSprites = linkCompilers.SelectMany(comp => ((DrawableLinkCompiler)comp).Parts);
 
                 return linkSprites.All(d => d.Colour == linkColour)
-                       && newLine.DrawableContentFlow.Except(linkSprites.Concat(linkCompilers)).All(d => d.Colour == textColour);
+                       && newLine.DrawableContentFlow.Except(linkSprites.Concat(linkCompilers)).All(d => d.Colour == textColour)
+                       && linkCompilers.Count == expectedActions.Length;
             }
         }
 

From fba6349c6528793328d3125222b0328f253764fa Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 1 Dec 2023 00:36:40 +0100
Subject: [PATCH 1773/2296] Remove unused properties

---
 osu.Game.Tests/Visual/Online/TestSceneChatLink.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 5947c01b96..b9a65f734f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -167,21 +167,12 @@ namespace osu.Game.Tests.Visual.Online
         {
             private static long messageCounter;
 
-            internal static readonly APIUser TEST_SENDER_BACKGROUND = new APIUser
-            {
-                Username = @"i-am-important",
-                Id = 42,
-                Colour = "#250cc9",
-            };
-
             internal static readonly APIUser TEST_SENDER = new APIUser
             {
                 Username = @"Somebody",
                 Id = 1,
             };
 
-            public new DateTimeOffset Timestamp = DateTimeOffset.Now;
-
             public DummyMessage(string text, bool isAction = false, bool isImportant = false, int number = 0)
                 : base(messageCounter++)
             {

From 1a33bfbb3a8d0b298651844c4b9ea4bbff141629 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 1 Dec 2023 00:37:16 +0100
Subject: [PATCH 1774/2296] Enable NRT

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index b9a65f734f..8d4ff82303 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.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 NUnit.Framework;
@@ -99,7 +97,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private void addMessageWithChecks(string text, bool isAction = false, bool isImportant = false, params LinkAction[] expectedActions)
         {
-            ChatLine newLine = null;
+            ChatLine newLine = null!;
 
             AddStep("add message", () =>
             {
@@ -138,7 +136,7 @@ namespace osu.Game.Tests.Visual.Online
             addEchoWithWait("[https://dev.ppy.sh/forum let's try multiple words too!]");
             addEchoWithWait("(long loading times! clickable while loading?)[https://dev.ppy.sh/home]", null, 5000);
 
-            void addEchoWithWait(string text, string completeText = null, double delay = 250)
+            void addEchoWithWait(string text, string? completeText = null, double delay = 250)
             {
                 int index = messageIndex++;
 

From 7f9ae55f5eab245e2051d0a85744031289424ad4 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 1 Dec 2023 00:45:35 +0100
Subject: [PATCH 1775/2296] Add passing tests

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 8d4ff82303..2dde1447e4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -60,7 +60,9 @@ namespace osu.Game.Tests.Visual.Online
         [TestCase("http://dev.ppy.sh!", LinkAction.External)]
         [TestCase("forgothttps://dev.ppy.sh!", LinkAction.External)]
         [TestCase("forgothttp://dev.ppy.sh!", LinkAction.External)]
+        [TestCase("00:12:345 - Test?", LinkAction.OpenEditorTimestamp)]
         [TestCase("00:12:345 (1,2) - Test?", LinkAction.OpenEditorTimestamp)]
+        [TestCase($"{OsuGameBase.OSU_PROTOCOL}edit/00:12:345 - Test?", LinkAction.OpenEditorTimestamp)]
         [TestCase("Wiki link for tasty [[Performance Points]]", LinkAction.OpenWiki)]
         [TestCase("(osu forums)[https://dev.ppy.sh/forum] (old link format)", LinkAction.External)]
         [TestCase("[https://dev.ppy.sh/home New site] (new link format)", LinkAction.External)]

From c395ae2460fbbc7e8329060732fa132f1df7ca01 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 1 Dec 2023 00:49:21 +0100
Subject: [PATCH 1776/2296] Add failing tests

They throws `ArgumentOutOfRangeException` on the first drawable Update()
---
 osu.Game.Tests/Visual/Online/TestSceneChatLink.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 2dde1447e4..e77ff5c1cd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -63,6 +63,8 @@ namespace osu.Game.Tests.Visual.Online
         [TestCase("00:12:345 - Test?", LinkAction.OpenEditorTimestamp)]
         [TestCase("00:12:345 (1,2) - Test?", LinkAction.OpenEditorTimestamp)]
         [TestCase($"{OsuGameBase.OSU_PROTOCOL}edit/00:12:345 - Test?", LinkAction.OpenEditorTimestamp)]
+        [TestCase($"{OsuGameBase.OSU_PROTOCOL}edit/00:12:345 (1,2) - Test?", LinkAction.OpenEditorTimestamp)]
+        [TestCase($"{OsuGameBase.OSU_PROTOCOL}00:12:345 - not an editor timestamp", LinkAction.External)]
         [TestCase("Wiki link for tasty [[Performance Points]]", LinkAction.OpenWiki)]
         [TestCase("(osu forums)[https://dev.ppy.sh/forum] (old link format)", LinkAction.External)]
         [TestCase("[https://dev.ppy.sh/home New site] (new link format)", LinkAction.External)]

From 152c7e513ea98e0e25f3e3461c81307b6bd61376 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 30 Nov 2023 22:59:02 +0100
Subject: [PATCH 1777/2296] Ignore overlapping links instead of crashing

---
 osu.Game/Graphics/Containers/LinkFlowContainer.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 40e883f8ac..aa72996fff 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Online;
 using osu.Game.Users;
@@ -47,9 +48,16 @@ namespace osu.Game.Graphics.Containers
 
             foreach (var link in links)
             {
+                string displayText = text.Substring(link.Index, link.Length);
+
+                if (previousLinkEnd > link.Index)
+                {
+                    Logger.Log($@"Link ""{link.Url}"" with text ""{displayText}"" overlaps previous link, ignoring.");
+                    continue;
+                }
+
                 AddText(text[previousLinkEnd..link.Index]);
 
-                string displayText = text.Substring(link.Index, link.Length);
                 object linkArgument = link.Argument;
                 string tooltip = displayText == link.Url ? null : link.Url;
 

From 30bdd2d4c0eaa6922ced5f44c589df93d50c9518 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 1 Dec 2023 01:07:23 +0100
Subject: [PATCH 1778/2296] Extract `Overlaps()` logic to accept generic index
 and length

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

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 9a194dba47..078af667d1 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -364,7 +364,9 @@ namespace osu.Game.Online.Chat
             Argument = argument;
         }
 
-        public bool Overlaps(Link otherLink) => Index < otherLink.Index + otherLink.Length && otherLink.Index < Index + Length;
+        public bool Overlaps(Link otherLink) => Overlaps(otherLink.Index, otherLink.Length);
+
+        public bool Overlaps(int index, int length) => Index < index + length && index < Index + Length;
 
         public int CompareTo(Link? otherLink) => Index > otherLink?.Index ? 1 : -1;
     }

From d3517998cff60db3d80d38a9fc71460ce1707258 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 1 Dec 2023 01:08:22 +0100
Subject: [PATCH 1779/2296] Use common `Overlaps()` logic

This actually fixes the problem and makes the tests pass
---
 osu.Game/Online/Chat/MessageFormatter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 078af667d1..c5256c3c74 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -85,8 +85,8 @@ namespace osu.Game.Online.Chat
                 if (escapeChars != null)
                     displayText = escapeChars.Aggregate(displayText, (current, c) => current.Replace($"\\{c}", c.ToString()));
 
-                // Check for encapsulated links
-                if (result.Links.Find(l => (l.Index <= index && l.Index + l.Length >= index + m.Length) || (index <= l.Index && index + m.Length >= l.Index + l.Length)) == null)
+                // Check for overlapping links
+                if (!result.Links.Exists(l => l.Overlaps(index, m.Length)))
                 {
                     result.Text = result.Text.Remove(index, m.Length).Insert(index, displayText);
 

From 894c31753b1c1737ef2dd7ecdf7440d9ef739cee Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 1 Dec 2023 15:31:06 +0900
Subject: [PATCH 1780/2296] Add initial support for aborting multiplayer games

---
 .../Multiplayer/IMultiplayerRoomServer.cs     |  5 +++
 .../Online/Multiplayer/MultiplayerClient.cs   |  2 ++
 .../Multiplayer/OnlineMultiplayerClient.cs    | 10 ++++++
 .../Multiplayer/Match/ConfirmAbortDialog.cs   | 33 +++++++++++++++++++
 .../Multiplayer/Match/MatchStartControl.cs    | 27 +++++++++++++--
 .../Match/MultiplayerReadyButton.cs           | 31 ++++++++++++-----
 .../Multiplayer/TestMultiplayerClient.cs      |  6 ++++
 7 files changed, 104 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index b7a608581c..15a8b42457 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -82,6 +82,11 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         Task AbortGameplay();
 
+        /// <summary>
+        /// Real.
+        /// </summary>
+        Task AbortGameplayReal();
+
         /// <summary>
         /// Adds an item to the playlist.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 79f46c2095..140380d679 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -374,6 +374,8 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task AbortGameplay();
 
+        public abstract Task AbortGameplayReal();
+
         public abstract Task AddPlaylistItem(MultiplayerPlaylistItem item);
 
         public abstract Task EditPlaylistItem(MultiplayerPlaylistItem item);
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index e400132693..47f4205dfd 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -226,6 +226,16 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.AbortGameplay));
         }
 
+        public override Task AbortGameplayReal()
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            Debug.Assert(connection != null);
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.AbortGameplayReal));
+        }
+
         public override Task AddPlaylistItem(MultiplayerPlaylistItem item)
         {
             if (!IsConnected.Value)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs
new file mode 100644
index 0000000000..8aca96a918
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.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 System;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
+{
+    public partial class ConfirmAbortDialog : PopupDialog
+    {
+        public ConfirmAbortDialog(Action onConfirm, Action onCancel)
+        {
+            HeaderText = "Are you sure you want to go abort the match?";
+
+            Icon = FontAwesome.Solid.ExclamationTriangle;
+
+            Buttons = new PopupDialogButton[]
+            {
+                new PopupDialogDangerousButton
+                {
+                    Text = @"Yes",
+                    Action = onConfirm
+                },
+                new PopupDialogCancelButton
+                {
+                    Text = @"No I didn't mean to",
+                    Action = onCancel
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
index 44e18dd2bb..d44878f7c3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
@@ -16,6 +16,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.Countdown;
+using osu.Game.Overlays;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
@@ -28,6 +29,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         [CanBeNull]
         private IDisposable clickOperation;
 
+        [Resolved(canBeNull: true)]
+        private IDialogOverlay dialogOverlay { get; set; }
+
         private Sample sampleReady;
         private Sample sampleReadyAll;
         private Sample sampleUnready;
@@ -109,8 +113,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             Debug.Assert(clickOperation == null);
             clickOperation = ongoingOperationTracker.BeginOperation();
 
-            if (isReady() && Client.IsHost && !Room.ActiveCountdowns.Any(c => c is MatchStartCountdown))
-                startMatch();
+            if (Client.IsHost)
+            {
+                if (Room.State == MultiplayerRoomState.Open)
+                {
+                    if (isReady() && !Room.ActiveCountdowns.Any(c => c is MatchStartCountdown))
+                        startMatch();
+                    else
+                        toggleReady();
+                }
+                else
+                {
+                    if (dialogOverlay == null)
+                        abortMatch();
+                    else
+                        dialogOverlay.Push(new ConfirmAbortDialog(abortMatch, endOperation));
+                }
+            }
             else
                 toggleReady();
 
@@ -128,6 +147,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 // gameplay was not started due to an exception; unblock button.
                 endOperation();
             });
+
+            void abortMatch() => Client.AbortGameplayReal().FireAndForget(endOperation, _ => endOperation());
         }
 
         private void startCountdown(TimeSpan duration)
@@ -198,6 +219,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             if (localUser?.State == MultiplayerUserState.Spectating)
                 readyButton.Enabled.Value &= Client.IsHost && newCountReady > 0 && !Room.ActiveCountdowns.Any(c => c is MatchStartCountdown);
 
+            readyButton.Enabled.Value = true;
+
             if (newCountReady == countReady)
                 return;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 1be573bdb8..8a9d027469 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -158,7 +158,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                         Text = room.Host?.Equals(localUser) == true
                             ? $"Start match {countText}"
                             : $"Waiting for host... {countText}";
+                        break;
 
+                    case MultiplayerUserState.Idle:
+                        if (room.State == MultiplayerRoomState.Open || room.Host?.Equals(localUser) != true)
+                        {
+                            Text = "Ready";
+                            break;
+                        }
+
+                        Text = "Abort!";
                         break;
                 }
             }
@@ -204,17 +213,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                         setYellow();
 
                     break;
+
+                case MultiplayerUserState.Idle:
+                    if (room.State == MultiplayerRoomState.Open || room.Host?.Equals(localUser) != true)
+                    {
+                        setGreen();
+                        break;
+                    }
+
+                    setRed();
+                    break;
             }
 
-            void setYellow()
-            {
-                BackgroundColour = colours.YellowDark;
-            }
+            void setYellow() => BackgroundColour = colours.YellowDark;
 
-            void setGreen()
-            {
-                BackgroundColour = colours.Green;
-            }
+            void setGreen() => BackgroundColour = colours.Green;
+
+            void setRed() => BackgroundColour = colours.Red;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 577104db45..a73c3a72a2 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -396,6 +396,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
+        public override Task AbortGameplayReal()
+        {
+            // Todo:
+            return Task.CompletedTask;
+        }
+
         public async Task AddUserPlaylistItem(int userId, MultiplayerPlaylistItem item)
         {
             Debug.Assert(ServerRoom != null);

From a94180c8c6cde22814da67de2ff0e78be9285609 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 1 Dec 2023 18:26:59 +0900
Subject: [PATCH 1781/2296] Rename LoadAborted -> GameplayAborted,
 AbortGameplayReal -> AbortMatch

---
 .../Online/Multiplayer/GameplayAbortReason.cs    | 11 +++++++++++
 .../Online/Multiplayer/IMultiplayerClient.cs     | 11 ++++++-----
 .../Online/Multiplayer/IMultiplayerRoomServer.cs | 10 +++++-----
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 10 +++++-----
 .../Multiplayer/OnlineMultiplayerClient.cs       |  6 +++---
 .../Multiplayer/Match/MatchStartControl.cs       |  2 +-
 .../OnlinePlay/Multiplayer/Multiplayer.cs        | 16 +++++++++++++---
 .../Visual/Multiplayer/TestMultiplayerClient.cs  |  2 +-
 8 files changed, 45 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/GameplayAbortReason.cs

diff --git a/osu.Game/Online/Multiplayer/GameplayAbortReason.cs b/osu.Game/Online/Multiplayer/GameplayAbortReason.cs
new file mode 100644
index 0000000000..15151ea68b
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/GameplayAbortReason.cs
@@ -0,0 +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.
+
+namespace osu.Game.Online.Multiplayer
+{
+    public enum GameplayAbortReason
+    {
+        LoadTookTooLong,
+        HostAbortedTheMatch
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index a5fa49a94b..0452d8b79c 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -107,17 +107,18 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         Task LoadRequested();
 
-        /// <summary>
-        /// Signals that loading of gameplay is to be aborted.
-        /// </summary>
-        Task LoadAborted();
-
         /// <summary>
         /// Signals that gameplay has started.
         /// All users in the <see cref="MultiplayerUserState.Loaded"/> or <see cref="MultiplayerUserState.ReadyForGameplay"/> states should begin gameplay as soon as possible.
         /// </summary>
         Task GameplayStarted();
 
+        /// <summary>
+        /// Signals that gameplay has been aborted.
+        /// </summary>
+        /// <param name="reason">The reason why gameplay was aborted.</param>
+        Task GameplayAborted(GameplayAbortReason reason);
+
         /// <summary>
         /// Signals that the match has ended, all players have finished and results are ready to be displayed.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 15a8b42457..55f00b447f 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -77,16 +77,16 @@ namespace osu.Game.Online.Multiplayer
         /// <exception cref="InvalidStateException">If an attempt to start the game occurs when the game's (or users') state disallows it.</exception>
         Task StartMatch();
 
+        /// <summary>
+        /// As the host of a room, aborts an on-going match.
+        /// </summary>
+        Task AbortMatch();
+
         /// <summary>
         /// Aborts an ongoing gameplay load.
         /// </summary>
         Task AbortGameplay();
 
-        /// <summary>
-        /// Real.
-        /// </summary>
-        Task AbortGameplayReal();
-
         /// <summary>
         /// Adds an item to the playlist.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 140380d679..bbf0e3697a 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -73,9 +73,9 @@ namespace osu.Game.Online.Multiplayer
         public virtual event Action? LoadRequested;
 
         /// <summary>
-        /// Invoked when the multiplayer server requests loading of play to be aborted.
+        /// Invoked when the multiplayer server requests gameplay to be aborted.
         /// </summary>
-        public event Action? LoadAborted;
+        public event Action<GameplayAbortReason>? GameplayAborted;
 
         /// <summary>
         /// Invoked when the multiplayer server requests gameplay to be started.
@@ -374,7 +374,7 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task AbortGameplay();
 
-        public abstract Task AbortGameplayReal();
+        public abstract Task AbortMatch();
 
         public abstract Task AddPlaylistItem(MultiplayerPlaylistItem item);
 
@@ -684,14 +684,14 @@ namespace osu.Game.Online.Multiplayer
             return Task.CompletedTask;
         }
 
-        Task IMultiplayerClient.LoadAborted()
+        Task IMultiplayerClient.GameplayAborted(GameplayAbortReason reason)
         {
             Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
 
-                LoadAborted?.Invoke();
+                GameplayAborted?.Invoke(reason);
             }, false);
 
             return Task.CompletedTask;
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 47f4205dfd..40436d730e 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Online.Multiplayer
                     connection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
                     connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
                     connection.On(nameof(IMultiplayerClient.GameplayStarted), ((IMultiplayerClient)this).GameplayStarted);
-                    connection.On(nameof(IMultiplayerClient.LoadAborted), ((IMultiplayerClient)this).LoadAborted);
+                    connection.On<GameplayAbortReason>(nameof(IMultiplayerClient.GameplayAborted), ((IMultiplayerClient)this).GameplayAborted);
                     connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
                     connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
                     connection.On<int, BeatmapAvailability>(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
@@ -226,14 +226,14 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.AbortGameplay));
         }
 
-        public override Task AbortGameplayReal()
+        public override Task AbortMatch()
         {
             if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             Debug.Assert(connection != null);
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.AbortGameplayReal));
+            return connection.InvokeAsync(nameof(IMultiplayerServer.AbortMatch));
         }
 
         public override Task AddPlaylistItem(MultiplayerPlaylistItem item)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
index d44878f7c3..8ca5d61ab4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 endOperation();
             });
 
-            void abortMatch() => Client.AbortGameplayReal().FireAndForget(endOperation, _ => endOperation());
+            void abortMatch() => Client.AbortMatch().FireAndForget(endOperation, _ => endOperation());
         }
 
         private void startCountdown(TimeSpan duration)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index edf5ce276a..7d27725775 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             client.RoomUpdated += onRoomUpdated;
-            client.LoadAborted += onLoadAborted;
+            client.GameplayAborted += onGameplayAborted;
             onRoomUpdated();
         }
 
@@ -39,12 +39,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 transitionFromResults();
         }
 
-        private void onLoadAborted()
+        private void onGameplayAborted(GameplayAbortReason reason)
         {
             // If the server aborts gameplay for this user (due to loading too slow), exit gameplay screens.
             if (!this.IsCurrentScreen())
             {
-                Logger.Log("Gameplay aborted because loading the beatmap took too long.", LoggingTarget.Runtime, LogLevel.Important);
+                switch (reason)
+                {
+                    case GameplayAbortReason.LoadTookTooLong:
+                        Logger.Log("Gameplay aborted because loading the beatmap took too long.", LoggingTarget.Runtime, LogLevel.Important);
+                        break;
+
+                    case GameplayAbortReason.HostAbortedTheMatch:
+                        Logger.Log("The host aborted the match.", LoggingTarget.Runtime, LogLevel.Important);
+                        break;
+                }
+
                 this.MakeCurrent();
             }
         }
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index a73c3a72a2..3af8f9c5db 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -396,7 +396,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
-        public override Task AbortGameplayReal()
+        public override Task AbortMatch()
         {
             // Todo:
             return Task.CompletedTask;

From 15c9416244a47e9d5fb713a99ddd9ce77b5403bd Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 1 Dec 2023 18:47:40 +0900
Subject: [PATCH 1782/2296] Rename method

---
 .../Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
index 8ca5d61ab4..a21c85e316 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                         {
                             RelativeSizeAxes = Axes.Both,
                             Size = Vector2.One,
-                            Action = onReadyClick,
+                            Action = onReadyButtonClick,
                         },
                         countdownButton = new MultiplayerCountdownButton
                         {
@@ -105,7 +105,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             endOperation();
         }
 
-        private void onReadyClick()
+        private void onReadyButtonClick()
         {
             if (Room == null)
                 return;

From 1b0fc8ca9d8740d9c61aa20dcbace2f72357cd96 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 1 Dec 2023 19:02:27 +0900
Subject: [PATCH 1783/2296] Refactor

---
 .../Multiplayer/Match/ConfirmAbortDialog.cs   |  2 +-
 .../Match/MultiplayerReadyButton.cs           | 24 ++++++-------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs
index 8aca96a918..06f2b2c8f6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
     {
         public ConfirmAbortDialog(Action onConfirm, Action onCancel)
         {
-            HeaderText = "Are you sure you want to go abort the match?";
+            HeaderText = "Are you sure you want to abort the match?";
 
             Icon = FontAwesome.Solid.ExclamationTriangle;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 8a9d027469..368e5210de 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -155,19 +155,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                     case MultiplayerUserState.Spectating:
                     case MultiplayerUserState.Ready:
-                        Text = room.Host?.Equals(localUser) == true
+                        Text = multiplayerClient.IsHost
                             ? $"Start match {countText}"
                             : $"Waiting for host... {countText}";
                         break;
 
-                    case MultiplayerUserState.Idle:
-                        if (room.State == MultiplayerRoomState.Open || room.Host?.Equals(localUser) != true)
-                        {
-                            Text = "Ready";
-                            break;
-                        }
-
-                        Text = "Abort!";
+                    // Show the abort button for the host as long as gameplay is in progress.
+                    case MultiplayerUserState when multiplayerClient.IsHost && room.State != MultiplayerRoomState.Open:
+                        Text = "Abort the match";
                         break;
                 }
             }
@@ -207,20 +202,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                 case MultiplayerUserState.Spectating:
                 case MultiplayerUserState.Ready:
-                    if (room?.Host?.Equals(localUser) == true && !room.ActiveCountdowns.Any(c => c is MatchStartCountdown))
+                    if (multiplayerClient.IsHost && !room.ActiveCountdowns.Any(c => c is MatchStartCountdown))
                         setGreen();
                     else
                         setYellow();
 
                     break;
 
-                case MultiplayerUserState.Idle:
-                    if (room.State == MultiplayerRoomState.Open || room.Host?.Equals(localUser) != true)
-                    {
-                        setGreen();
-                        break;
-                    }
-
+                // Show the abort button for the host as long as gameplay is in progress.
+                case MultiplayerUserState when multiplayerClient.IsHost && room.State != MultiplayerRoomState.Open:
                     setRed();
                     break;
             }

From e0eea07a3fa201cb227856213f7831524d635cef Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 1 Dec 2023 13:00:34 +0100
Subject: [PATCH 1784/2296] Request `READ_EXTERNAL_STORAGE` on older android
 versions

---
 osu.Android/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Android/AndroidManifest.xml b/osu.Android/AndroidManifest.xml
index af102a1e4e..2fb4d1f850 100644
--- a/osu.Android/AndroidManifest.xml
+++ b/osu.Android/AndroidManifest.xml
@@ -5,4 +5,5 @@
 	<!-- for editor usage -->
 	<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 	<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
 </manifest>
\ No newline at end of file

From cdaff30aa6e69582d18d7034728c2c615cbb44fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 Dec 2023 13:24:51 +0100
Subject: [PATCH 1785/2296] Update framework

---
 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 3b90b1675c..6609db3027 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1127.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1201.1" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4d1fdaa89a..cc100605b4 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1127.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1201.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1127.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index 7e5c5be4ea..a6b3527466 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1127.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1201.1" />
   </ItemGroup>
 </Project>

From d97ae8df6a916c75c1fca2c9ab80919039c9b3d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 Dec 2023 13:31:09 +0100
Subject: [PATCH 1786/2296] Remove commented out italic code

It's a holdover from the Exo days (anyone remember those?) and hasn't
been relevant for years, so why keep it.
---
 osu.Game.Tests/Visual/Online/TestSceneChatLink.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 8d4ff82303..af7cc003a5 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -106,11 +106,8 @@ namespace osu.Game.Tests.Visual.Online
             });
 
             AddAssert("msg has the right action", () => newLine.Message.Links.Select(l => l.Action), () => Is.EqualTo(expectedActions));
-            //AddAssert("msg is " + (isAction ? "italic" : "not italic"), () => newLine.ContentFlow.Any() && isAction == isItalic());
             AddAssert($"msg shows {expectedActions.Length} link(s)", isShowingLinks);
 
-            //bool isItalic() => newLine.ContentFlow.Where(d => d is OsuSpriteText).Cast<OsuSpriteText>().All(sprite => sprite.Font.Italics);
-
             bool isShowingLinks()
             {
                 bool hasBackground = !string.IsNullOrEmpty(newLine.Message.Sender.Colour);

From f3530a79b18817e3ca1fd005933add63ac75f82e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 1 Dec 2023 21:34:20 +0900
Subject: [PATCH 1787/2296] Add test

---
 .../Multiplayer/TestSceneMatchStartControl.cs | 25 +++++++++++++++++++
 .../Multiplayer/TestMultiplayerClient.cs      |  6 ++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
index 6d309078e6..f8719ba80c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
@@ -378,6 +378,31 @@ namespace osu.Game.Tests.Visual.Multiplayer
             }, users);
         }
 
+        [Test]
+        public void TestAbortMatch()
+        {
+            multiplayerClient.Setup(m => m.StartMatch())
+                             .Callback(() =>
+                             {
+                                 multiplayerClient.Raise(m => m.LoadRequested -= null);
+                                 multiplayerClient.Object.Room!.State = MultiplayerRoomState.WaitingForLoad;
+
+                                 // The local user state doesn't really matter, so let's do the same as the base implementation for these tests.
+                                 changeUserState(localUser.UserID, MultiplayerUserState.Idle);
+                             });
+
+            multiplayerClient.Setup(m => m.AbortMatch())
+                             .Callback(() =>
+                             {
+                                 multiplayerClient.Object.Room!.State = MultiplayerRoomState.Open;
+                                 raiseRoomUpdated();
+                             });
+
+            ClickButtonWhenEnabled<MultiplayerReadyButton>();
+            ClickButtonWhenEnabled<MultiplayerReadyButton>();
+            ClickButtonWhenEnabled<MultiplayerReadyButton>();
+        }
+
         private void verifyGameplayStartFlow()
         {
             checkLocalUserState(MultiplayerUserState.Ready);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 3af8f9c5db..4c3deac1d7 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -396,10 +396,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
-        public override Task AbortMatch()
+        public override async Task AbortMatch()
         {
-            // Todo:
-            return Task.CompletedTask;
+            ChangeUserState(api.LocalUser.Value.Id, MultiplayerUserState.Idle);
+            await ((IMultiplayerClient)this).GameplayAborted(GameplayAbortReason.HostAbortedTheMatch).ConfigureAwait(false);
         }
 
         public async Task AddUserPlaylistItem(int userId, MultiplayerPlaylistItem item)

From abb4c943a7f36a5e8fb4ada240cfb66ed433a9e0 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Fri, 1 Dec 2023 18:35:57 +0100
Subject: [PATCH 1788/2296] Rename to more readable names

---
 osu.Game/Online/Chat/MessageFormatter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index c5256c3c74..f055633d64 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -366,7 +366,7 @@ namespace osu.Game.Online.Chat
 
         public bool Overlaps(Link otherLink) => Overlaps(otherLink.Index, otherLink.Length);
 
-        public bool Overlaps(int index, int length) => Index < index + length && index < Index + Length;
+        public bool Overlaps(int otherIndex, int otherLength) => Index < otherIndex + otherLength && otherIndex < Index + Length;
 
         public int CompareTo(Link? otherLink) => Index > otherLink?.Index ? 1 : -1;
     }

From 230278f2c94230803f11310b592dcbc15043274c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 3 Dec 2023 01:45:15 +0900
Subject: [PATCH 1789/2296] Once again remove Mania passive HP drain

---
 .../ManiaHealthProcessorTest.cs               | 31 +++++++++++++++++++
 .../Scoring/ManiaHealthProcessor.cs           |  8 +++++
 2 files changed, 39 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/ManiaHealthProcessorTest.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaHealthProcessorTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaHealthProcessorTest.cs
new file mode 100644
index 0000000000..315849f7de
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaHealthProcessorTest.cs
@@ -0,0 +1,31 @@
+// 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.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Scoring;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class ManiaHealthProcessorTest
+    {
+        [Test]
+        public void TestNoDrain()
+        {
+            var processor = new ManiaHealthProcessor(0);
+            processor.ApplyBeatmap(new ManiaBeatmap(new StageDefinition(4))
+            {
+                HitObjects =
+                {
+                    new Note { StartTime = 0 },
+                    new Note { StartTime = 1000 },
+                }
+            });
+
+            // No matter what, mania doesn't have passive HP drain.
+            Assert.That(processor.DrainRate, Is.Zero);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
index 183550eb7b..34b1787a71 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
@@ -15,6 +15,14 @@ namespace osu.Game.Rulesets.Mania.Scoring
         {
         }
 
+        protected override double ComputeDrainRate()
+        {
+            // Base call is run only to compute HP recovery.
+            base.ComputeDrainRate();
+
+            return 0;
+        }
+
         protected override IEnumerable<HitObject> EnumerateTopLevelHitObjects() => Beatmap.HitObjects;
 
         protected override IEnumerable<HitObject> EnumerateNestedHitObjects(HitObject hitObject) => hitObject.NestedHitObjects;

From dc588e6d56a8e88eb408d75f7b7d2cb1780e5ef9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 3 Dec 2023 04:58:17 +0300
Subject: [PATCH 1790/2296] Implement OsuModDepth

---
 osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs | 163 ++++++++++++++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs       |   3 +-
 2 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
new file mode 100644
index 0000000000..9c0e34d0c8
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModDepth : ModWithVisibilityAdjustment, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
+    {
+        public override string Name => "Depth";
+        public override string Acronym => "DH";
+        public override IconUsage? Icon => FontAwesome.Solid.Cube;
+        public override ModType Type => ModType.Fun;
+        public override LocalisableString Description => "3D. Almost.";
+        public override double ScoreMultiplier => 1;
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModMagnetised), typeof(OsuModRepel), typeof(OsuModFreezeFrame), typeof(ModWithVisibilityAdjustment) }).ToArray();
+
+        private static readonly Vector3 camera_position = new Vector3(OsuPlayfield.BASE_SIZE.X * 0.5f, OsuPlayfield.BASE_SIZE.Y * 0.5f, -100);
+
+        [SettingSource("Maximum Depth", "How far away object appear.", 0)]
+        public BindableFloat MaxDepth { get; } = new BindableFloat(100)
+        {
+            Precision = 10,
+            MinValue = 50,
+            MaxValue = 200
+        };
+
+        [SettingSource("Show Approach Circles", "Whether approach circles should be visible.", 1)]
+        public BindableBool ShowApproachCircles { get; } = new BindableBool(true);
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyTransform(hitObject, state);
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyTransform(hitObject, state);
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
+        {
+            // Hide judgment displays and follow points as they won't make any sense.
+            // Judgements can potentially be turned on in a future where they display at a position relative to their drawable counterpart.
+            drawableRuleset.Playfield.DisplayJudgements.Value = false;
+            (drawableRuleset.Playfield as OsuPlayfield)?.FollowPoints.Hide();
+        }
+
+        public override void ApplyToDrawableHitObject(DrawableHitObject dho)
+        {
+            base.ApplyToDrawableHitObject(dho);
+
+            switch (dho)
+            {
+                case DrawableSliderHead:
+                case DrawableSliderTail:
+                case DrawableSliderTick:
+                case DrawableSliderRepeat:
+                    return;
+
+                case DrawableHitCircle:
+                case DrawableSlider:
+                    dho.Anchor = Anchor.Centre;
+                    break;
+            }
+        }
+
+        private void applyTransform(DrawableHitObject drawable, ArmedState state)
+        {
+            switch (drawable)
+            {
+                case DrawableSliderHead head:
+                    if (!ShowApproachCircles.Value)
+                    {
+                        var hitObject = (OsuHitObject)drawable.HitObject;
+                        double appearTime = hitObject.StartTime - hitObject.TimePreempt;
+
+                        using (head.BeginAbsoluteSequence(appearTime))
+                            head.ApproachCircle.Hide();
+                    }
+
+                    break;
+
+                case DrawableSliderTail:
+                case DrawableSliderTick:
+                case DrawableSliderRepeat:
+                    return;
+
+                case DrawableHitCircle circle:
+
+                    if (!ShowApproachCircles.Value)
+                    {
+                        var hitObject = (OsuHitObject)drawable.HitObject;
+                        double appearTime = hitObject.StartTime - hitObject.TimePreempt;
+
+                        using (circle.BeginAbsoluteSequence(appearTime))
+                            circle.ApproachCircle.Hide();
+                    }
+
+                    setStartPosition(drawable);
+                    break;
+
+                case DrawableSlider:
+                    setStartPosition(drawable);
+                    break;
+            }
+        }
+
+        private void setStartPosition(DrawableHitObject drawable)
+        {
+            var hitObject = (OsuHitObject)drawable.HitObject;
+
+            float d = mappedDepth(MaxDepth.Value);
+
+            using (drawable.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimePreempt))
+            {
+                drawable.MoveTo(positionAtDepth(d, hitObject.Position));
+                drawable.ScaleTo(new Vector2(d));
+            }
+        }
+
+        public void Update(Playfield playfield)
+        {
+            double time = playfield.Time.Current;
+
+            foreach (var drawable in playfield.HitObjectContainer.AliveObjects)
+            {
+                switch (drawable)
+                {
+                    case DrawableSliderHead:
+                    case DrawableSliderTail:
+                    case DrawableSliderTick:
+                    case DrawableSliderRepeat:
+                        continue;
+
+                    case DrawableHitCircle:
+                    case DrawableSlider:
+                        var hitObject = (OsuHitObject)drawable.HitObject;
+
+                        double appearTime = hitObject.StartTime - hitObject.TimePreempt;
+                        double moveDuration = hitObject.TimePreempt;
+                        float z = time > appearTime + moveDuration ? 0 : (MaxDepth.Value - (float)((time - appearTime) / moveDuration * MaxDepth.Value));
+
+                        float d = mappedDepth(z);
+                        drawable.Position = positionAtDepth(d, hitObject.Position);
+                        drawable.Scale = new Vector2(d);
+                        break;
+                }
+            }
+        }
+
+        private static float mappedDepth(float depth) => 100 / (depth - camera_position.Z);
+
+        private static Vector2 positionAtDepth(float mappedDepth, Vector2 positionAtZeroDepth)
+        {
+            return (positionAtZeroDepth - camera_position.Xy) * mappedDepth;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index aaf0ab41a0..50e6a5b572 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -211,7 +211,8 @@ namespace osu.Game.Rulesets.Osu
                         new ModAdaptiveSpeed(),
                         new OsuModFreezeFrame(),
                         new OsuModBubbles(),
-                        new OsuModSynesthesia()
+                        new OsuModSynesthesia(),
+                        new OsuModDepth()
                     };
 
                 case ModType.System:

From cf6e50f73c5f0fabd35141602187981c86842a44 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 3 Dec 2023 05:07:40 +0300
Subject: [PATCH 1791/2296] Add header and fix typo

---
 osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
index 9c0e34d0c8..b2d52aef42 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
@@ -1,3 +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.Linq;
 using osu.Framework.Bindables;
@@ -27,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private static readonly Vector3 camera_position = new Vector3(OsuPlayfield.BASE_SIZE.X * 0.5f, OsuPlayfield.BASE_SIZE.Y * 0.5f, -100);
 
-        [SettingSource("Maximum Depth", "How far away object appear.", 0)]
+        [SettingSource("Maximum depth", "How far away objects appear.", 0)]
         public BindableFloat MaxDepth { get; } = new BindableFloat(100)
         {
             Precision = 10,

From 937689ee6bb4eeee18b007ea153b36e5c8e6a961 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 3 Dec 2023 05:39:44 +0300
Subject: [PATCH 1792/2296] Add OsuModDepth as incompatable to other mods

---
 osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs      | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs           | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs       | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs            | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs           | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModTargetPractice.cs   | 3 ++-
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs        | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs        | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs           | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
index f1197ce0cd..06cb9c3419 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => "Burn the notes into your memory.";
 
         //Alters the transforms of the approach circles, breaking the effects of these mods.
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModApproachDifferent), typeof(OsuModTransform) }).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModApproachDifferent), typeof(OsuModTransform), typeof(OsuModDepth) }).ToArray();
 
         public override ModType Type => ModType.Fun;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index dd2befef4e..6dc0d5d522 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => @"Play with no approach circles and fading circles/sliders.";
         public override double ScoreMultiplier => UsesDefaultConfiguration ? 1.06 : 1;
 
-        public override Type[] IncompatibleMods => new[] { typeof(IRequiresApproachCircles), typeof(OsuModSpinIn) };
+        public override Type[] IncompatibleMods => new[] { typeof(IRequiresApproachCircles), typeof(OsuModSpinIn), typeof(OsuModDepth) };
 
         public const double FADE_IN_DURATION_MULTIPLIER = 0.4;
         public const double FADE_OUT_DURATION_MULTIPLIER = 0.3;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs b/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs
index c8c4cd6a14..befee4af5a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Fun;
         public override LocalisableString Description => "No need to chase the circles – your cursor is a magnet!";
         public override double ScoreMultiplier => 0.5;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay), typeof(OsuModRelax), typeof(OsuModRepel), typeof(OsuModBubbles) };
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay), typeof(OsuModRelax), typeof(OsuModRepel), typeof(OsuModBubbles), typeof(OsuModDepth) };
 
         [SettingSource("Attraction strength", "How strong the pull is.", 0)]
         public BindableFloat AttractionStrength { get; } = new BindableFloat(0.5f)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs b/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
index 6f1206382a..1df344648a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         protected virtual float EndScale => 1;
 
-        public override Type[] IncompatibleMods => new[] { typeof(IRequiresApproachCircles), typeof(OsuModSpinIn), typeof(OsuModObjectScaleTween) };
+        public override Type[] IncompatibleMods => new[] { typeof(IRequiresApproachCircles), typeof(OsuModSpinIn), typeof(OsuModObjectScaleTween), typeof(OsuModDepth) };
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs
index 28d459cedb..91feb33931 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Fun;
         public override LocalisableString Description => "Hit objects run away!";
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay), typeof(OsuModMagnetised), typeof(OsuModBubbles) };
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay), typeof(OsuModMagnetised), typeof(OsuModBubbles), typeof(OsuModDepth) };
 
         [SettingSource("Repulsion strength", "How strong the repulsion is.", 0)]
         public BindableFloat RepulsionStrength { get; } = new BindableFloat(0.5f)
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
index b0533d0cfa..59a1342480 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         // todo: this mod needs to be incompatible with "hidden" due to forcing the circle to remain opaque,
         // further implementation will be required for supporting that.
-        public override Type[] IncompatibleMods => new[] { typeof(IRequiresApproachCircles), typeof(OsuModObjectScaleTween), typeof(OsuModHidden) };
+        public override Type[] IncompatibleMods => new[] { typeof(IRequiresApproachCircles), typeof(OsuModObjectScaleTween), typeof(OsuModHidden), typeof(OsuModDepth) };
 
         private const int rotate_offset = 360;
         private const float rotate_starting_width = 2;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTargetPractice.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTargetPractice.cs
index 77cf340b95..a5846efdfe 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTargetPractice.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTargetPractice.cs
@@ -47,7 +47,8 @@ namespace osu.Game.Rulesets.Osu.Mods
             typeof(OsuModRandom),
             typeof(OsuModSpunOut),
             typeof(OsuModStrictTracking),
-            typeof(OsuModSuddenDeath)
+            typeof(OsuModSuddenDeath),
+            typeof(OsuModDepth)
         }).ToArray();
 
         [SettingSource("Seed", "Use a custom seed instead of a random one", SettingControlType = typeof(SettingsNumberBox))]
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index 25d05a88a8..9671f53bea 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => "Put your faith in the approach circles...";
         public override double ScoreMultiplier => 1;
 
-        public override Type[] IncompatibleMods => new[] { typeof(IHidesApproachCircles) };
+        public override Type[] IncompatibleMods => new[] { typeof(IHidesApproachCircles), typeof(OsuModDepth) };
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
index 92a499e735..b6907af119 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Fun;
         public override LocalisableString Description => "Everything rotates. EVERYTHING.";
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModWiggle), typeof(OsuModMagnetised), typeof(OsuModRepel), typeof(OsuModFreezeFrame) }).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModWiggle), typeof(OsuModMagnetised), typeof(OsuModRepel), typeof(OsuModFreezeFrame), typeof(OsuModDepth) }).ToArray();
 
         private float theta;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index a45338d91f..d14a821541 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Fun;
         public override LocalisableString Description => "They just won't stay still...";
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModTransform), typeof(OsuModMagnetised), typeof(OsuModRepel) };
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModTransform), typeof(OsuModMagnetised), typeof(OsuModRepel), typeof(OsuModDepth) };
 
         private const int wiggle_duration = 100; // (ms) Higher = fewer wiggles
 

From ebcde63caa4aef0696c977c04bbd5d3e2f2ed5da Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 3 Dec 2023 17:13:47 +0300
Subject: [PATCH 1793/2296] Don't override hitobjects anchor

---
 osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
index b2d52aef42..5ae9fc4fac 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
@@ -53,25 +53,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             (drawableRuleset.Playfield as OsuPlayfield)?.FollowPoints.Hide();
         }
 
-        public override void ApplyToDrawableHitObject(DrawableHitObject dho)
-        {
-            base.ApplyToDrawableHitObject(dho);
-
-            switch (dho)
-            {
-                case DrawableSliderHead:
-                case DrawableSliderTail:
-                case DrawableSliderTick:
-                case DrawableSliderRepeat:
-                    return;
-
-                case DrawableHitCircle:
-                case DrawableSlider:
-                    dho.Anchor = Anchor.Centre;
-                    break;
-            }
-        }
-
         private void applyTransform(DrawableHitObject drawable, ArmedState state)
         {
             switch (drawable)
@@ -160,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private static Vector2 positionAtDepth(float mappedDepth, Vector2 positionAtZeroDepth)
         {
-            return (positionAtZeroDepth - camera_position.Xy) * mappedDepth;
+            return (positionAtZeroDepth - camera_position.Xy) * mappedDepth + camera_position.Xy;
         }
     }
 }

From b90000f7b70f2840d6ef683aacb6043f78add0e3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 3 Dec 2023 17:15:52 +0300
Subject: [PATCH 1794/2296] Simplify objects depth calculation

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
index 5ae9fc4fac..f2ea8b9698 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -126,8 +127,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                         var hitObject = (OsuHitObject)drawable.HitObject;
 
                         double appearTime = hitObject.StartTime - hitObject.TimePreempt;
-                        double moveDuration = hitObject.TimePreempt;
-                        float z = time > appearTime + moveDuration ? 0 : (MaxDepth.Value - (float)((time - appearTime) / moveDuration * MaxDepth.Value));
+                        float z = Interpolation.ValueAt(Math.Clamp(time, appearTime, hitObject.StartTime), MaxDepth.Value, 0f, appearTime, hitObject.StartTime);
 
                         float d = mappedDepth(z);
                         drawable.Position = positionAtDepth(d, hitObject.Position);

From 595bc9398a37596ad98760f0e32448b33741b9bd Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 3 Dec 2023 20:14:00 +0100
Subject: [PATCH 1795/2296] update to new builder control point signature

---
 .../Sliders/SliderPlacementBlueprint.cs       | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index ac7b5e63e1..584c8fabbf 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -309,12 +309,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void updateSliderPathFromBSplineBuilder()
         {
-            IReadOnlyList<Vector2> builderPoints = bSplineBuilder.ControlPoints;
+            IReadOnlyList<List<Vector2>> builderPoints = bSplineBuilder.ControlPoints;
 
             if (builderPoints.Count == 0)
                 return;
 
-            int lastSegmentStart = 0;
             PathType? lastPathType = null;
 
             HitObject.Path.ControlPoints.Clear();
@@ -323,31 +322,25 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             // Importantly, the B-Spline builder returns three Vector2s at the same location when a new segment is to be started.
             for (int i = 0; i < builderPoints.Count; i++)
             {
-                bool isLastPoint = i == builderPoints.Count - 1;
-                bool isNewSegment = i < builderPoints.Count - 2 && builderPoints[i] == builderPoints[i + 1] && builderPoints[i] == builderPoints[i + 2];
+                bool isLastSegment = i == builderPoints.Count - 1;
+                var segment = builderPoints[i];
+                int pointsInSegment = segment.Count;
 
-                if (isNewSegment || isLastPoint)
-                {
-                    int pointsInSegment = i - lastSegmentStart;
+                // Where possible, we can use the simpler LINEAR path type.
+                PathType? pathType = pointsInSegment == 1 ? PathType.LINEAR : PathType.BSpline(3);
 
-                    // Where possible, we can use the simpler LINEAR path type.
-                    PathType? pathType = pointsInSegment == 1 ? PathType.LINEAR : PathType.BSpline(3);
+                // Linear segments can be combined, as two adjacent linear sections are computationally the same as one with the points combined.
+                if (lastPathType == pathType && lastPathType == PathType.LINEAR)
+                    pathType = null;
 
-                    // Linear segments can be combined, as two adjacent linear sections are computationally the same as one with the points combined.
-                    if (lastPathType == pathType && lastPathType == PathType.LINEAR)
-                        pathType = null;
+                HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[0], pathType));
+                for (int j = 1; j < pointsInSegment - 1; j++)
+                    HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[j]));
 
-                    HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[lastSegmentStart], pathType));
-                    for (int j = lastSegmentStart + 1; j < i; j++)
-                        HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[j]));
+                if (isLastSegment)
+                    HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[pointsInSegment - 1]));
 
-                    if (isLastPoint)
-                        HitObject.Path.ControlPoints.Add(new PathControlPoint(builderPoints[i]));
-
-                    // Skip the redundant duplicated points (see isNewSegment above) which have been coalesced into a path type.
-                    lastSegmentStart = (i += 2);
-                    if (pathType != null) lastPathType = pathType;
-                }
+                if (pathType != null) lastPathType = pathType;
             }
         }
 

From 4cd6efc8f750e8dddc65f23f22e94d1be38fa3bc Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 3 Dec 2023 20:53:05 +0100
Subject: [PATCH 1796/2296] update default parameters

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

diff --git a/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
index 1974415d30..87dd8636c9 100644
--- a/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
+++ b/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        public BindableFloat Tolerance { get; } = new BindableFloat(1.5f)
+        public BindableFloat Tolerance { get; } = new BindableFloat(2f)
         {
             MinValue = 0.05f,
             MaxValue = 3f,
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         };
 
         // We map internal ranges to a more standard range of values for display to the user.
-        private readonly BindableInt displayTolerance = new BindableInt(40)
+        private readonly BindableInt displayTolerance = new BindableInt(66)
         {
             MinValue = 5,
             MaxValue = 100

From 8873824107a2e29eb914536aec11addddb421857 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 3 Dec 2023 20:53:25 +0100
Subject: [PATCH 1797/2296] fix control points being cleared

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 584c8fabbf..bc32acda96 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -311,7 +311,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             IReadOnlyList<List<Vector2>> builderPoints = bSplineBuilder.ControlPoints;
 
-            if (builderPoints.Count == 0)
+            if (builderPoints.Count == 0 || builderPoints[0].Count == 0)
                 return;
 
             PathType? lastPathType = null;
@@ -326,6 +326,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 var segment = builderPoints[i];
                 int pointsInSegment = segment.Count;
 
+                if (segment.Count == 0)
+                    continue;
+
                 // Where possible, we can use the simpler LINEAR path type.
                 PathType? pathType = pointsInSegment == 1 ? PathType.LINEAR : PathType.BSpline(3);
 

From ba2cc0243c03e014bb360aca82ad61f17df828f6 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 3 Dec 2023 21:10:01 +0100
Subject: [PATCH 1798/2296] update comment

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index bc32acda96..14de35965e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -318,8 +318,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             HitObject.Path.ControlPoints.Clear();
 
-            // Iterate through generated points, finding each segment and adding non-inheriting path types where appropriate.
-            // Importantly, the B-Spline builder returns three Vector2s at the same location when a new segment is to be started.
+            // Iterate through generated segments and adding non-inheriting path types where appropriate.
             for (int i = 0; i < builderPoints.Count; i++)
             {
                 bool isLastSegment = i == builderPoints.Count - 1;

From 34b5264616aa784439153110eb2b93d542c1968f Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 3 Dec 2023 21:13:27 +0100
Subject: [PATCH 1799/2296] fix the linear segment

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 14de35965e..f98eadb817 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -329,7 +329,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     continue;
 
                 // Where possible, we can use the simpler LINEAR path type.
-                PathType? pathType = pointsInSegment == 1 ? PathType.LINEAR : PathType.BSpline(3);
+                PathType? pathType = pointsInSegment == 2 ? PathType.LINEAR : PathType.BSpline(3);
 
                 // Linear segments can be combined, as two adjacent linear sections are computationally the same as one with the points combined.
                 if (lastPathType == pathType && lastPathType == PathType.LINEAR)

From bcf2effae9b9f4ee80e652940834533d96d0c044 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 3 Dec 2023 21:22:04 +0100
Subject: [PATCH 1800/2296] Remove the Linear segment simplification because it
 just makes things harder to edit afterwards if it made some segment linear 
 type when you actually intended there to be some curve

---
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs  | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index f98eadb817..5f1066d92d 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -314,8 +314,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             if (builderPoints.Count == 0 || builderPoints[0].Count == 0)
                 return;
 
-            PathType? lastPathType = null;
-
             HitObject.Path.ControlPoints.Clear();
 
             // Iterate through generated segments and adding non-inheriting path types where appropriate.
@@ -328,21 +326,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 if (segment.Count == 0)
                     continue;
 
-                // Where possible, we can use the simpler LINEAR path type.
-                PathType? pathType = pointsInSegment == 2 ? PathType.LINEAR : PathType.BSpline(3);
-
-                // Linear segments can be combined, as two adjacent linear sections are computationally the same as one with the points combined.
-                if (lastPathType == pathType && lastPathType == PathType.LINEAR)
-                    pathType = null;
-
-                HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[0], pathType));
+                HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[0], PathType.BSpline(3)));
                 for (int j = 1; j < pointsInSegment - 1; j++)
                     HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[j]));
 
                 if (isLastSegment)
                     HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[pointsInSegment - 1]));
-
-                if (pathType != null) lastPathType = pathType;
             }
         }
 

From ca55a7b2bfb913f0de9d733a4213650484ad3296 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 3 Dec 2023 21:43:37 +0100
Subject: [PATCH 1801/2296] call builder finish before ending curve

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 5f1066d92d..4413fc4bf4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -197,7 +197,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             base.OnDragEnd(e);
 
             if (state == SliderPlacementState.Drawing)
+            {
+                bSplineBuilder.Finish();
+                updateSliderPathFromBSplineBuilder();
                 endCurve();
+            }
         }
 
         protected override void OnMouseUp(MouseUpEvent e)

From b3d1a9ee2e0665e4a9adc5088db33823615e9f23 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 3 Dec 2023 22:03:51 +0100
Subject: [PATCH 1802/2296] Dont snap expected distance while drawing

This makes it 10 billion times smoother to draw, very nice
---
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 4413fc4bf4..c40f90bfa3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -200,6 +200,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             {
                 bSplineBuilder.Finish();
                 updateSliderPathFromBSplineBuilder();
+
+                // Change the state so it will snap the expected distance in endCurve.
+                state = SliderPlacementState.Finishing;
                 endCurve();
             }
         }
@@ -304,7 +307,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void updateSlider()
         {
-            HitObject.Path.ExpectedDistance.Value = distanceSnapProvider?.FindSnappedDistance(HitObject, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
+            if (state == SliderPlacementState.Drawing)
+                HitObject.Path.ExpectedDistance.Value = (float)HitObject.Path.CalculatedDistance;
+            else
+                HitObject.Path.ExpectedDistance.Value = distanceSnapProvider?.FindSnappedDistance(HitObject, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
 
             bodyPiece.UpdateFrom(HitObject);
             headCirclePiece.UpdateFrom(HitObject.HeadCircle);
@@ -343,7 +349,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             Initial,
             ControlPoints,
-            Drawing
+            Drawing,
+            Finishing
         }
     }
 }

From 060141866c4d9e60f8a0d1172318d89fdb821206 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 3 Dec 2023 22:06:07 +0100
Subject: [PATCH 1803/2296] Update SliderPlacementBlueprint.cs

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index c40f90bfa3..e13a46d0cd 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -331,17 +331,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             {
                 bool isLastSegment = i == builderPoints.Count - 1;
                 var segment = builderPoints[i];
-                int pointsInSegment = segment.Count;
 
                 if (segment.Count == 0)
                     continue;
 
                 HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[0], PathType.BSpline(3)));
-                for (int j = 1; j < pointsInSegment - 1; j++)
+                for (int j = 1; j < segment.Count - 1; j++)
                     HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[j]));
 
                 if (isLastSegment)
-                    HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[pointsInSegment - 1]));
+                    HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[^1]));
             }
         }
 

From d0acb7f4f9e601f10b7650a217329cfb0b041158 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Dec 2023 06:08:31 +0900
Subject: [PATCH 1804/2296] Improve commenting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
index 34b1787a71..a33eac83c2 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaHealthProcessor.cs
@@ -17,7 +17,8 @@ namespace osu.Game.Rulesets.Mania.Scoring
 
         protected override double ComputeDrainRate()
         {
-            // Base call is run only to compute HP recovery.
+            // Base call is run only to compute HP recovery (namely, `HpMultiplierNormal`).
+            // This closely mirrors (broken) behaviour of stable and as such is preserved unchanged.
             base.ComputeDrainRate();
 
             return 0;

From 13b7f2fa42e68fe72ec0835260b6b84411d3dbbc Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 3 Dec 2023 22:42:48 +0100
Subject: [PATCH 1805/2296] Fix test cases

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 7ac34bc6c8..f889999fe3 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -310,7 +310,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddStep("release left button", () => InputManager.ReleaseButton(MouseButton.Left));
 
             assertPlaced(true);
-            assertLength(760, tolerance: 10);
+            assertLength(808, tolerance: 10);
             assertControlPointCount(5);
             assertControlPointType(0, PathType.BSpline(3));
             assertControlPointType(1, null);
@@ -337,9 +337,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertLength(600, tolerance: 10);
             assertControlPointCount(4);
-            assertControlPointType(0, PathType.LINEAR);
-            assertControlPointType(1, null);
-            assertControlPointType(2, null);
+            assertControlPointType(0, PathType.BSpline(3));
+            assertControlPointType(1, PathType.BSpline(3));
+            assertControlPointType(2, PathType.BSpline(3));
             assertControlPointType(3, null);
         }
 

From b56a78c6ecaa9f47e0a8de9b8c4d567975b3c500 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Dec 2023 08:51:21 +0900
Subject: [PATCH 1806/2296] Adjust with framework changes

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs | 2 +-
 osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs                  | 2 +-
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs                  | 2 +-
 osu.Game/Graphics/Backgrounds/Triangles.cs                      | 2 +-
 osu.Game/Graphics/Backgrounds/TrianglesV2.cs                    | 2 +-
 osu.Game/Graphics/UserInterface/BarGraph.cs                     | 2 +-
 osu.Game/Graphics/UserInterface/SegmentedGraph.cs               | 2 +-
 osu.Game/Rulesets/Mods/ModFlashlight.cs                         | 2 +-
 osu.Game/Screens/Menu/LogoVisualisation.cs                      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
index b719138d33..88769442a1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     relativeGlowSize = Source.glowSize / Source.DrawSize.X;
                 }
 
-                public override void Draw(IRenderer renderer)
+                protected override void Draw(IRenderer renderer)
                 {
                     base.Draw(renderer);
                     drawGlow(renderer);
diff --git a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
index d818c8baee..9838cb2c37 100644
--- a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 points.AddRange(Source.SmokePoints.Skip(firstVisiblePointIndex).Take(futurePointIndex - firstVisiblePointIndex));
             }
 
-            public sealed override void Draw(IRenderer renderer)
+            protected sealed override void Draw(IRenderer renderer)
             {
                 base.Draw(renderer);
 
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index a29faac5a0..95a052dadb 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -258,7 +258,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
             private IUniformBuffer<CursorTrailParameters> cursorTrailParameters;
 
-            public override void Draw(IRenderer renderer)
+            protected override void Draw(IRenderer renderer)
             {
                 base.Draw(renderer);
 
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index 0ee42c69d5..1a78c1ec5e 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -286,7 +286,7 @@ namespace osu.Game.Graphics.Backgrounds
 
             private IUniformBuffer<TriangleBorderData> borderDataBuffer;
 
-            public override void Draw(IRenderer renderer)
+            protected override void Draw(IRenderer renderer)
             {
                 base.Draw(renderer);
 
diff --git a/osu.Game/Graphics/Backgrounds/TrianglesV2.cs b/osu.Game/Graphics/Backgrounds/TrianglesV2.cs
index 750e96440d..a20fd78569 100644
--- a/osu.Game/Graphics/Backgrounds/TrianglesV2.cs
+++ b/osu.Game/Graphics/Backgrounds/TrianglesV2.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Graphics.Backgrounds
 
             private IUniformBuffer<TriangleBorderData>? borderDataBuffer;
 
-            public override void Draw(IRenderer renderer)
+            protected override void Draw(IRenderer renderer)
             {
                 base.Draw(renderer);
 
diff --git a/osu.Game/Graphics/UserInterface/BarGraph.cs b/osu.Game/Graphics/UserInterface/BarGraph.cs
index 0ac987e85b..e7592128b0 100644
--- a/osu.Game/Graphics/UserInterface/BarGraph.cs
+++ b/osu.Game/Graphics/UserInterface/BarGraph.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Graphics.UserInterface
                 lengths.AddRange(Source.bars.InstantaneousLengths);
             }
 
-            public override void Draw(IRenderer renderer)
+            protected override void Draw(IRenderer renderer)
             {
                 base.Draw(renderer);
 
diff --git a/osu.Game/Graphics/UserInterface/SegmentedGraph.cs b/osu.Game/Graphics/UserInterface/SegmentedGraph.cs
index 91971e5af9..9f467687a4 100644
--- a/osu.Game/Graphics/UserInterface/SegmentedGraph.cs
+++ b/osu.Game/Graphics/UserInterface/SegmentedGraph.cs
@@ -221,7 +221,7 @@ namespace osu.Game.Graphics.UserInterface
                 tierColours.AddRange(Source.tierColours);
             }
 
-            public override void Draw(IRenderer renderer)
+            protected override void Draw(IRenderer renderer)
             {
                 base.Draw(renderer);
 
diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 215fc877dc..95406cc9e6 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Mods
 
                 private IUniformBuffer<FlashlightParameters>? flashlightParametersBuffer;
 
-                public override void Draw(IRenderer renderer)
+                protected override void Draw(IRenderer renderer)
                 {
                     base.Draw(renderer);
 
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index fa26cfab46..b722b83280 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Screens.Menu
                 Source.frequencyAmplitudes.AsSpan().CopyTo(audioData);
             }
 
-            public override void Draw(IRenderer renderer)
+            protected override void Draw(IRenderer renderer)
             {
                 base.Draw(renderer);
 

From c2644a5d5e208214f383714b606c5e442bc04a28 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Dec 2023 10:18:37 +0900
Subject: [PATCH 1807/2296] Correctly implement button enabled state

---
 .../Visual/Multiplayer/TestSceneMatchStartControl.cs      | 1 +
 .../OnlinePlay/Multiplayer/Match/MatchStartControl.cs     | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
index f8719ba80c..c64dea3f59 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
@@ -401,6 +401,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
+            AddStep("check abort request received", () => multiplayerClient.Verify(m => m.AbortMatch(), Times.Once));
         }
 
         private void verifyGameplayStartFlow()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
index a21c85e316..e61735fe61 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                         dialogOverlay.Push(new ConfirmAbortDialog(abortMatch, endOperation));
                 }
             }
-            else
+            else if (Room.State != MultiplayerRoomState.Closed)
                 toggleReady();
 
             bool isReady() => Client.LocalUser?.State == MultiplayerUserState.Ready || Client.LocalUser?.State == MultiplayerUserState.Spectating;
@@ -210,7 +210,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             }
 
             readyButton.Enabled.Value = countdownButton.Enabled.Value =
-                Room.State == MultiplayerRoomState.Open
+                Room.State != MultiplayerRoomState.Closed
                 && CurrentPlaylistItem.Value?.ID == Room.Settings.PlaylistItemId
                 && !Room.Playlist.Single(i => i.ID == Room.Settings.PlaylistItemId).Expired
                 && !operationInProgress.Value;
@@ -219,7 +219,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             if (localUser?.State == MultiplayerUserState.Spectating)
                 readyButton.Enabled.Value &= Client.IsHost && newCountReady > 0 && !Room.ActiveCountdowns.Any(c => c is MatchStartCountdown);
 
-            readyButton.Enabled.Value = true;
+            // When the local user is not the host, the button should only be enabled when no match is in progress.
+            if (!Client.IsHost)
+                readyButton.Enabled.Value &= Room.State == MultiplayerRoomState.Open;
 
             if (newCountReady == countReady)
                 return;

From 9ccd33a1ecc61e684ca92b30781fb55b669a9016 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Dec 2023 10:20:53 +0900
Subject: [PATCH 1808/2296] Add comments to test

---
 .../Visual/Multiplayer/TestSceneMatchStartControl.cs         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
index c64dea3f59..750968fc75 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
@@ -398,8 +398,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
                                  raiseRoomUpdated();
                              });
 
+            // Ready
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
+
+            // Start match
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
+
+            // Abort
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
             AddStep("check abort request received", () => multiplayerClient.Verify(m => m.AbortMatch(), Times.Once));
         }

From 8587652869ea92665de36af0f1bc4a9079ab3c8a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Dec 2023 11:00:11 +0900
Subject: [PATCH 1809/2296] Fix countdown button being enabled

---
 .../Multiplayer/TestSceneMatchStartControl.cs | 32 +++++++++++--------
 .../Multiplayer/Match/MatchStartControl.cs    |  3 ++
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
index 750968fc75..2d61c26a6b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
@@ -381,28 +381,32 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestAbortMatch()
         {
-            multiplayerClient.Setup(m => m.StartMatch())
-                             .Callback(() =>
-                             {
-                                 multiplayerClient.Raise(m => m.LoadRequested -= null);
-                                 multiplayerClient.Object.Room!.State = MultiplayerRoomState.WaitingForLoad;
+            AddStep("setup client", () =>
+            {
+                multiplayerClient.Setup(m => m.StartMatch())
+                                 .Callback(() =>
+                                 {
+                                     multiplayerClient.Raise(m => m.LoadRequested -= null);
+                                     multiplayerClient.Object.Room!.State = MultiplayerRoomState.WaitingForLoad;
 
-                                 // The local user state doesn't really matter, so let's do the same as the base implementation for these tests.
-                                 changeUserState(localUser.UserID, MultiplayerUserState.Idle);
-                             });
+                                     // The local user state doesn't really matter, so let's do the same as the base implementation for these tests.
+                                     changeUserState(localUser.UserID, MultiplayerUserState.Idle);
+                                 });
 
-            multiplayerClient.Setup(m => m.AbortMatch())
-                             .Callback(() =>
-                             {
-                                 multiplayerClient.Object.Room!.State = MultiplayerRoomState.Open;
-                                 raiseRoomUpdated();
-                             });
+                multiplayerClient.Setup(m => m.AbortMatch())
+                                 .Callback(() =>
+                                 {
+                                     multiplayerClient.Object.Room!.State = MultiplayerRoomState.Open;
+                                     raiseRoomUpdated();
+                                 });
+            });
 
             // Ready
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
 
             // Start match
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
+            AddUntilStep("countdown button disabled", () => !this.ChildrenOfType<MultiplayerCountdownButton>().Single().Enabled.Value);
 
             // Abort
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
index e61735fe61..99934acaae 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
@@ -223,6 +223,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             if (!Client.IsHost)
                 readyButton.Enabled.Value &= Room.State == MultiplayerRoomState.Open;
 
+            // At all times, the countdown button should only be enabled when no match is in progress.
+            countdownButton.Enabled.Value &= Room.State == MultiplayerRoomState.Open;
+
             if (newCountReady == countReady)
                 return;
 

From c2a4a6d8cb0cbc8a00b98489b6496f1e843c9afc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Dec 2023 12:10:31 +0900
Subject: [PATCH 1810/2296] Add inline comment matching framework

---
 osu.Android/AndroidManifest.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Android/AndroidManifest.xml b/osu.Android/AndroidManifest.xml
index 2fb4d1f850..492d48542e 100644
--- a/osu.Android/AndroidManifest.xml
+++ b/osu.Android/AndroidManifest.xml
@@ -5,5 +5,12 @@
 	<!-- for editor usage -->
 	<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 	<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+	<!--
+		READ_MEDIA_* permissions are available only on API 33 or greater. Devices with older android versions
+		don't understand the new permissions, so request the old READ_EXTERNAL_STORAGE permission to get storage access.
+		Since the old permission has no effect on >= API 33, don't request it.
+
+		Care needs to be taken to ensure runtime permission checks target the correct permission for the API level.
+	-->
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
-</manifest>
\ No newline at end of file
+</manifest>

From c755bcbec4167c9924d6d6ee5c980c491cc4f2dd Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Dec 2023 14:30:08 +0900
Subject: [PATCH 1811/2296] Add failing test

---
 .../CatchBeatmapConversionTest.cs             |  1 +
 .../pixel-jump-expected-conversion.json       | 34 +++++++++++++++++++
 .../Resources/Testing/Beatmaps/pixel-jump.osu | 23 +++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump.osu

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index baca8166d1..a11aaa5e29 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase("hardrock-spinner", new[] { typeof(CatchModHardRock) })]
         [TestCase("right-bound-hr-offset", new[] { typeof(CatchModHardRock) })]
         [TestCase("basic-hyperdash")]
+        [TestCase("pixel-jump")]
         public new void Test(string name, params Type[] mods) => base.Test(name, mods);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump-expected-conversion.json b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump-expected-conversion.json
new file mode 100644
index 0000000000..c9fbaf92a3
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump-expected-conversion.json
@@ -0,0 +1,34 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 23143.0,
+      "Objects": [
+        {
+          "StartTime": 23143.0,
+          "Position": 307.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 23226.0,
+          "Position": 354.644958,
+          "HyperDash": false
+        }
+      ]
+    },
+    {
+      "StartTime": 23310.0,
+      "Objects": [
+        {
+          "StartTime": 23310.0,
+          "Position": 214.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 23393.0,
+          "Position": 154.841156,
+          "HyperDash": false
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump.osu b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump.osu
new file mode 100644
index 0000000000..6f470e77e5
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump.osu
@@ -0,0 +1,23 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.2
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5.5
+CircleSize:4
+OverallDifficulty:8.6
+ApproachRate:9.4
+SliderMultiplier:2
+SliderTickRate:1
+
+[TimingPoints]
+310,333.333333333333,4,2,1,45,1,0
+23142,-83.3333333333333,4,2,1,70,0,0
+23225,-83.3333333333333,4,2,1,5,0,0
+23309,-83.3333333333333,4,2,1,75,0,0
+
+[HitObjects]
+307,184,23143,2,0,P|330:160|366:150,1,59.9999981689454,2|0,0:1|0:0,0:0:0:0:
+214,335,23310,2,0,L|149:324,1,59.9999981689454,10|0,0:0|0:0,0:0:0:0:
\ No newline at end of file

From 6f73d78bc90a2ec78f1eb3137363db40ece6af2a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 4 Dec 2023 14:32:14 +0900
Subject: [PATCH 1812/2296] Replicate integer calculations for catch hyperdash
 generation

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

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 7c81ca03d1..50e6fd9673 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 currentObject.DistanceToHyperDash = 0;
 
                 int thisDirection = nextObject.EffectiveX > currentObject.EffectiveX ? 1 : -1;
-                double timeToNext = nextObject.StartTime - currentObject.StartTime - 1000f / 60f / 4; // 1/4th of a frame of grace time, taken from osu-stable
+                double timeToNext = (int)nextObject.StartTime - (int)currentObject.StartTime - 1000f / 60f / 4; // 1/4th of a frame of grace time, taken from osu-stable
                 double distanceToNext = Math.Abs(nextObject.EffectiveX - currentObject.EffectiveX) - (lastDirection == thisDirection ? lastExcess : halfCatcherWidth);
                 float distanceToHyper = (float)(timeToNext * Catcher.BASE_DASH_SPEED - distanceToNext);
 

From ec5c7d7830dfac2f37a8e3d6cbc14967c8473f21 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 4 Dec 2023 09:43:09 +0300
Subject: [PATCH 1813/2296] Add deceleration and rework depth handling

---
 osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs | 105 ++++++++++------------
 1 file changed, 49 insertions(+), 56 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
index f2ea8b9698..5054c75e97 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
@@ -30,6 +29,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModMagnetised), typeof(OsuModRepel), typeof(OsuModFreezeFrame), typeof(ModWithVisibilityAdjustment) }).ToArray();
 
         private static readonly Vector3 camera_position = new Vector3(OsuPlayfield.BASE_SIZE.X * 0.5f, OsuPlayfield.BASE_SIZE.Y * 0.5f, -100);
+        private readonly float minDepth = depthForScale(1.5f);
 
         [SettingSource("Maximum depth", "How far away objects appear.", 0)]
         public BindableFloat MaxDepth { get; } = new BindableFloat(100)
@@ -58,25 +58,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             switch (drawable)
             {
-                case DrawableSliderHead head:
-                    if (!ShowApproachCircles.Value)
-                    {
-                        var hitObject = (OsuHitObject)drawable.HitObject;
-                        double appearTime = hitObject.StartTime - hitObject.TimePreempt;
-
-                        using (head.BeginAbsoluteSequence(appearTime))
-                            head.ApproachCircle.Hide();
-                    }
-
-                    break;
-
-                case DrawableSliderTail:
-                case DrawableSliderTick:
-                case DrawableSliderRepeat:
-                    return;
-
                 case DrawableHitCircle circle:
-
                     if (!ShowApproachCircles.Value)
                     {
                         var hitObject = (OsuHitObject)drawable.HitObject;
@@ -86,25 +68,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                             circle.ApproachCircle.Hide();
                     }
 
-                    setStartPosition(drawable);
                     break;
-
-                case DrawableSlider:
-                    setStartPosition(drawable);
-                    break;
-            }
-        }
-
-        private void setStartPosition(DrawableHitObject drawable)
-        {
-            var hitObject = (OsuHitObject)drawable.HitObject;
-
-            float d = mappedDepth(MaxDepth.Value);
-
-            using (drawable.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimePreempt))
-            {
-                drawable.MoveTo(positionAtDepth(d, hitObject.Position));
-                drawable.ScaleTo(new Vector2(d));
             }
         }
 
@@ -114,34 +78,63 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             foreach (var drawable in playfield.HitObjectContainer.AliveObjects)
             {
-                switch (drawable)
-                {
-                    case DrawableSliderHead:
-                    case DrawableSliderTail:
-                    case DrawableSliderTick:
-                    case DrawableSliderRepeat:
-                        continue;
+                if (drawable is not DrawableOsuHitObject d)
+                    continue;
 
+                switch (d)
+                {
                     case DrawableHitCircle:
                     case DrawableSlider:
-                        var hitObject = (OsuHitObject)drawable.HitObject;
-
-                        double appearTime = hitObject.StartTime - hitObject.TimePreempt;
-                        float z = Interpolation.ValueAt(Math.Clamp(time, appearTime, hitObject.StartTime), MaxDepth.Value, 0f, appearTime, hitObject.StartTime);
-
-                        float d = mappedDepth(z);
-                        drawable.Position = positionAtDepth(d, hitObject.Position);
-                        drawable.Scale = new Vector2(d);
+                        processObject(time, d);
                         break;
                 }
             }
         }
 
-        private static float mappedDepth(float depth) => 100 / (depth - camera_position.Z);
-
-        private static Vector2 positionAtDepth(float mappedDepth, Vector2 positionAtZeroDepth)
+        private void processObject(double time, DrawableOsuHitObject drawable)
         {
-            return (positionAtZeroDepth - camera_position.Xy) * mappedDepth + camera_position.Xy;
+            var hitObject = drawable.HitObject;
+
+            double baseSpeed = MaxDepth.Value / hitObject.TimePreempt;
+            double hitObjectDuration = hitObject is Slider s ? s.Duration : 0.0;
+            double offsetAfterStartTime = hitObjectDuration + hitObject.MaximumJudgementOffset + 500;
+            double slowSpeed = -minDepth / offsetAfterStartTime;
+
+            float decelerationDistance = MaxDepth.Value * 0.2f;
+            double decelerationTime = (slowSpeed - baseSpeed) * 2 * decelerationDistance / (slowSpeed * slowSpeed - baseSpeed * baseSpeed);
+
+            float z;
+
+            if (time < hitObject.StartTime - decelerationTime)
+            {
+                double appearTime = hitObject.StartTime - hitObject.TimePreempt;
+                float fullDistance = decelerationDistance + (float)(baseSpeed * (hitObject.TimePreempt - decelerationTime));
+                z = Interpolation.ValueAt(Math.Max(time, appearTime), fullDistance, decelerationDistance, appearTime, hitObject.StartTime - decelerationTime);
+            }
+            else if (time < hitObject.StartTime)
+            {
+                double timeOffset = time - (hitObject.StartTime - decelerationTime);
+                double deceleration = (slowSpeed - baseSpeed) / decelerationTime;
+                z = decelerationDistance - (float)(baseSpeed * timeOffset + deceleration * timeOffset * timeOffset * 0.5);
+            }
+            else
+            {
+                double endTime = hitObject.StartTime + offsetAfterStartTime;
+                z = Interpolation.ValueAt(Math.Min(time, endTime), 0f, minDepth, hitObject.StartTime, endTime);
+            }
+
+            float scale = scaleForDepth(z);
+            drawable.Position = positionAtDepth(scale, hitObject.Position);
+            drawable.Scale = new Vector2(scale);
+        }
+
+        private static float scaleForDepth(float depth) => 100 / (depth - camera_position.Z);
+
+        private static float depthForScale(float scale) => 100 / scale + camera_position.Z;
+
+        private static Vector2 positionAtDepth(float scale, Vector2 positionAtZeroDepth)
+        {
+            return (positionAtZeroDepth - camera_position.Xy) * scale + camera_position.Xy;
         }
     }
 }

From bb198e0c5a96120ac3ac3139879ccc47265eac72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 09:26:23 +0100
Subject: [PATCH 1814/2296] Add test coverage for missing hyperdashes on
 simultaneous notes

---
 .../TestSceneHyperDash.cs                     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 3c222662f5..445fa42b36 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
 
-            for (int i = 0; i < 9; i++)
+            for (int i = 0; i < 11; i++)
             {
                 int count = i + 1;
                 AddUntilStep($"wait for hyperdash #{count}", () => hyperDashCount >= count);
@@ -100,12 +100,22 @@ namespace osu.Game.Rulesets.Catch.Tests
                 })
             }, 1);
 
+            createObjects(() => new Fruit { X = right_x }, count: 2, spacing: 0, spacingAfterGroup: 400);
+            createObjects(() => new TestJuiceStream(left_x)
+            {
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(Vector2.Zero),
+                    new PathControlPoint(new Vector2(0, 300))
+                })
+            }, count: 1, spacingAfterGroup: 150);
+            createObjects(() => new Fruit { X = left_x }, count: 1, spacing: 0, spacingAfterGroup: 400);
+            createObjects(() => new Fruit { X = right_x }, count: 2, spacing: 0);
+
             return beatmap;
 
-            void createObjects(Func<CatchHitObject> createObject, int count = 3)
+            void createObjects(Func<CatchHitObject> createObject, int count = 3, float spacing = 140, float spacingAfterGroup = 700)
             {
-                const float spacing = 140;
-
                 for (int i = 0; i < count; i++)
                 {
                     var hitObject = createObject();
@@ -113,7 +123,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     beatmap.HitObjects.Add(hitObject);
                 }
 
-                startTime += 700;
+                startTime += spacingAfterGroup;
             }
         }
 

From fcb6f40666bc351c8bd8122314978ce33ac2993e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 09:30:18 +0100
Subject: [PATCH 1815/2296] Prioritise hyperfruit over non-hyperfruit if
 simultaneous

In case of simultaneous hyperfruit and non-hyperfruit - which happen to
occur on some aspire maps - the desired behaviour is to hyperdash. This
did not previously occur, due to annoying details in how
`HitObjectContainer` is structured.

`HitObjectContainer`'s drawable comparer determines the order of
updating the objects. One could say that forcing the hyperfruit to be
updated last, after normal fruit, could help; unfortunately this is
complicated by the existence of juice streams and the fact that while a
juice stream can be terminated by a normal fruit that is coincidental
with a hyperfruit, the two are not comparable directly using the
comparer in any feasible way.

Therefore, apply a `Catcher`-level workaround that intends to handle
this locally; in short, if a hyperdash was toggled in a given frame, it
cannot be toggled off again in the same frame. This yields the desired
behaviour.
---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 0c2c157d10..147850a9b7 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -126,6 +126,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private Color4 hyperDashColour = DEFAULT_HYPER_DASH_COLOUR;
 
+        private double? lastHyperDashStartTime;
         private double hyperDashModifier = 1;
         private int hyperDashDirection;
         private float hyperDashTargetPosition;
@@ -233,16 +234,23 @@ namespace osu.Game.Rulesets.Catch.UI
             // droplet doesn't affect the catcher state
             if (hitObject is TinyDroplet) return;
 
-            if (result.IsHit && hitObject.HyperDashTarget is CatchHitObject target)
+            // if a hyper fruit was already handled this frame, just go where it says to go.
+            // this special-cases some aspire maps that have doubled-up objects (one hyper, one not) at the same time instant.
+            // handling this "properly" elsewhere is impossible as there is no feasible way to ensure
+            // that the hyperfruit gets judged second (especially if it coincides with a last fruit in a juice stream).
+            if (lastHyperDashStartTime != Time.Current)
             {
-                double timeDifference = target.StartTime - hitObject.StartTime;
-                double positionDifference = target.EffectiveX - X;
-                double velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
+                if (result.IsHit && hitObject.HyperDashTarget is CatchHitObject target)
+                {
+                    double timeDifference = target.StartTime - hitObject.StartTime;
+                    double positionDifference = target.EffectiveX - X;
+                    double velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
 
-                SetHyperDashState(Math.Abs(velocity) / BASE_DASH_SPEED, target.EffectiveX);
+                    SetHyperDashState(Math.Abs(velocity) / BASE_DASH_SPEED, target.EffectiveX);
+                }
+                else
+                    SetHyperDashState();
             }
-            else
-                SetHyperDashState();
 
             if (result.IsHit)
                 CurrentState = hitObject.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle;
@@ -292,6 +300,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 if (wasHyperDashing)
                     runHyperDashStateTransition(false);
+
+                lastHyperDashStartTime = null;
             }
             else
             {
@@ -301,6 +311,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 if (!wasHyperDashing)
                     runHyperDashStateTransition(true);
+
+                lastHyperDashStartTime = Time.Current;
             }
         }
 

From 7deff70b4ae1710c0d66495d52aafbb6a8b3cd37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 13:34:36 +0100
Subject: [PATCH 1816/2296] Extract beatmap import steps from gameplay scene
 switch helper

---
 .../TestSceneSkinEditorNavigation.cs          | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index c17a9ddf5f..28855830e1 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -38,6 +38,9 @@ namespace osu.Game.Tests.Visual.Navigation
             advanceToSongSelect();
             openSkinEditor();
 
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
             switchToGameplayScene();
 
             BarHitErrorMeter hitErrorMeter = null;
@@ -98,6 +101,10 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             advanceToSongSelect();
             openSkinEditor();
+
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
             switchToGameplayScene();
 
             AddUntilStep("wait for components", () => skinEditor.ChildrenOfType<SkinBlueprint>().Any());
@@ -162,6 +169,9 @@ namespace osu.Game.Tests.Visual.Navigation
             openSkinEditor();
             AddStep("select DT", () => Game.SelectedMods.Value = new Mod[] { new OsuModDoubleTime() });
 
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
             switchToGameplayScene();
 
             AddAssert("DT still selected", () => ((Player)Game.ScreenStack.CurrentScreen).Mods.Value.Single() is OsuModDoubleTime);
@@ -174,6 +184,9 @@ namespace osu.Game.Tests.Visual.Navigation
             openSkinEditor();
             AddStep("select relax and spun out", () => Game.SelectedMods.Value = new Mod[] { new OsuModRelax(), new OsuModSpunOut() });
 
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
             switchToGameplayScene();
 
             AddAssert("no mod selected", () => !((Player)Game.ScreenStack.CurrentScreen).Mods.Value.Any());
@@ -186,6 +199,9 @@ namespace osu.Game.Tests.Visual.Navigation
             openSkinEditor();
             AddStep("select autoplay", () => Game.SelectedMods.Value = new Mod[] { new OsuModAutoplay() });
 
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
             switchToGameplayScene();
 
             AddAssert("no mod selected", () => !((Player)Game.ScreenStack.CurrentScreen).Mods.Value.Any());
@@ -198,6 +214,9 @@ namespace osu.Game.Tests.Visual.Navigation
             openSkinEditor();
             AddStep("select cinema", () => Game.SelectedMods.Value = new Mod[] { new OsuModCinema() });
 
+            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
             switchToGameplayScene();
 
             AddAssert("no mod selected", () => !((Player)Game.ScreenStack.CurrentScreen).Mods.Value.Any());
@@ -266,9 +285,6 @@ namespace osu.Game.Tests.Visual.Navigation
 
         private void switchToGameplayScene()
         {
-            AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).WaitSafely());
-            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
-
             AddStep("Click gameplay scene button", () =>
             {
                 InputManager.MoveMouseTo(skinEditor.ChildrenOfType<SkinEditorSceneLibrary.SceneButton>().First(b => b.Text.ToString() == "Gameplay"));

From d3e94cd5bfaa328032c12c44cb32d08b9b8f8728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 13:50:52 +0100
Subject: [PATCH 1817/2296] Add test coverage for crashing on empty beatmap

---
 .../Navigation/TestSceneSkinEditorNavigation.cs   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index 28855830e1..62b53f9bac 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -12,9 +12,11 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
+using osu.Game.Online.API;
 using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.SkinEditor;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Play;
@@ -259,6 +261,19 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("editor sidebars not empty", () => skinEditor.ChildrenOfType<EditorSidebar>().SelectMany(sidebar => sidebar.Children).Count(), () => Is.GreaterThan(0));
         }
 
+        [Test]
+        public void TestOpenSkinEditorGameplaySceneOnBeatmapWithNoObjects()
+        {
+            AddStep("set dummy beatmap", () => Game.Beatmap.SetDefault());
+            advanceToSongSelect();
+
+            AddStep("create empty beatmap", () => Game.BeatmapManager.CreateNew(new OsuRuleset().RulesetInfo, new GuestUser()));
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            openSkinEditor();
+            switchToGameplayScene();
+        }
+
         private void advanceToSongSelect()
         {
             PushAndConfirm(() => songSelect = new TestPlaySongSelect());

From 7c041df0f1875a8274597b626cb465f05143304a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 13:52:41 +0100
Subject: [PATCH 1818/2296] Add test coverage for crashing on dummy beatmap

---
 .../Visual/Navigation/TestSceneSkinEditorNavigation.cs   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index 62b53f9bac..4424b8cef6 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -274,6 +274,15 @@ namespace osu.Game.Tests.Visual.Navigation
             switchToGameplayScene();
         }
 
+        [Test]
+        public void TestOpenSkinEditorGameplaySceneWhenDummyBeatmapActive()
+        {
+            AddStep("set dummy beatmap", () => Game.Beatmap.SetDefault());
+
+            openSkinEditor();
+            switchToGameplayScene();
+        }
+
         private void advanceToSongSelect()
         {
             PushAndConfirm(() => songSelect = new TestPlaySongSelect());

From 43312619e36c6d57a0c904adfd7a4d12890cf867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 13:58:07 +0100
Subject: [PATCH 1819/2296] Add test coverage for crashing on wrong ruleset

---
 .../Navigation/TestSceneSkinEditorNavigation.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index 4424b8cef6..74e6ba1566 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -13,6 +13,7 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
 using osu.Game.Online.API;
+using osu.Game.Beatmaps;
 using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.SkinEditor;
 using osu.Game.Rulesets.Mods;
@@ -283,6 +284,22 @@ namespace osu.Game.Tests.Visual.Navigation
             switchToGameplayScene();
         }
 
+        [Test]
+        public void TestOpenSkinEditorGameplaySceneWhenDifferentRulesetActive()
+        {
+            BeatmapSetInfo beatmapSet = null!;
+
+            AddStep("import beatmap", () => beatmapSet = BeatmapImportHelper.LoadQuickOszIntoOsu(Game).GetResultSafely());
+            AddStep("select mania difficulty", () =>
+            {
+                var beatmap = beatmapSet.Beatmaps.First(b => b.Ruleset.OnlineID == 3);
+                Game.Beatmap.Value = Game.BeatmapManager.GetWorkingBeatmap(beatmap);
+            });
+
+            openSkinEditor();
+            switchToGameplayScene();
+        }
+
         private void advanceToSongSelect()
         {
             PushAndConfirm(() => songSelect = new TestPlaySongSelect());

From 055fb5bd8f482d4fc23658f259a9f9108cf4bc29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 14:14:07 +0100
Subject: [PATCH 1820/2296] Do not set initial activity in skin editor endless
 player

Seems like an overreach to say that the user is "watching a replay"
there.
---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 18d1c4c62b..6e64f5b786 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -26,6 +26,7 @@ using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
+using osu.Game.Users;
 using osu.Game.Utils;
 using osuTK;
 
@@ -285,6 +286,8 @@ namespace osu.Game.Overlays.SkinEditor
 
         private partial class EndlessPlayer : ReplayPlayer
         {
+            protected override UserActivity? InitialActivity => null;
+
             public EndlessPlayer(Func<IBeatmap, IReadOnlyList<Mod>, Score> createScore)
                 : base(createScore, new PlayerConfiguration
                 {

From 9d39b70e38d6beef46e0ad3a7fad03acf0673dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 14:14:26 +0100
Subject: [PATCH 1821/2296] Fix endless player not handling load failure

---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 6e64f5b786..46658bb993 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -297,10 +297,21 @@ namespace osu.Game.Overlays.SkinEditor
             {
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                if (!LoadedBeatmapSuccessfully)
+                    Scheduler.AddDelayed(this.Exit, 3000);
+            }
+
             protected override void Update()
             {
                 base.Update();
 
+                if (!LoadedBeatmapSuccessfully)
+                    return;
+
                 if (GameplayState.HasPassed)
                     GameplayClockContainer.Seek(0);
             }

From 063694f5444a3d2b22409e45c121a67470800446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 14:20:03 +0100
Subject: [PATCH 1822/2296] Do not attempt to load gameplay scene if current
 beatmap is dummy

---
 .../Visual/Navigation/TestSceneSkinEditorNavigation.cs      | 1 -
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs           | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index 74e6ba1566..fa85c8c9f8 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -281,7 +281,6 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("set dummy beatmap", () => Game.Beatmap.SetDefault());
 
             openSkinEditor();
-            switchToGameplayScene();
         }
 
         [Test]
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 46658bb993..ae118836c8 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -140,6 +140,12 @@ namespace osu.Game.Overlays.SkinEditor
         {
             performer?.PerformFromScreen(screen =>
             {
+                if (beatmap.Value is DummyWorkingBeatmap)
+                {
+                    // presume we don't have anything good to play and just bail.
+                    return;
+                }
+
                 // If we're playing the intro, switch away to another beatmap.
                 if (beatmap.Value.BeatmapSetInfo.Protected)
                 {

From 8754fa40f4251bd5c94752eb3fadccaf2e95a490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 14:23:38 +0100
Subject: [PATCH 1823/2296] Source autoplay mod from beatmap about to be
 presented rather than ambient global

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

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index ae118836c8..d5c0cd89cf 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Overlays.SkinEditor
                 if (screen is Player)
                     return;
 
-                var replayGeneratingMod = ruleset.Value.CreateInstance().GetAutoplayMod();
+                var replayGeneratingMod = beatmap.Value.BeatmapInfo.Ruleset.CreateInstance().GetAutoplayMod();
 
                 IReadOnlyList<Mod> usableMods = mods.Value;
 

From 5512298d60e84950f15ab9d3cc2453e2a0a7a74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Dec 2023 15:01:23 +0100
Subject: [PATCH 1824/2296] Trim unused resolved bindable

---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index d5c0cd89cf..0821e603d1 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -56,9 +56,6 @@ namespace osu.Game.Overlays.SkinEditor
         [Resolved]
         private MusicController music { get; set; } = null!;
 
-        [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
-
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 

From c5a08a07118204227dc26a4c1177908ab77f531f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Dec 2023 23:06:08 +0900
Subject: [PATCH 1825/2296] Remove unused using statement

---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 0821e603d1..be7ddd115b 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -17,7 +17,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;

From 0e474928580f369645381dae6a9a1388a3cd0391 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Mon, 4 Dec 2023 20:17:22 +0100
Subject: [PATCH 1826/2296] Uncomment net6.0 code and remove old code

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index f8784504b8..a645683c5f 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -183,9 +183,7 @@ namespace osu.Game.Overlays
                 // 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
-                // todo: replace custom equality compraer with ExceptBy in net6.0
-                // newCards = newCards.ExceptBy(foundContent.Select(c => c.BeatmapSet.OnlineID), c => c.BeatmapSet.OnlineID);
-                newCards = newCards.Except(foundContent, BeatmapCardEqualityComparer.Default);
+                newCards = newCards.ExceptBy(foundContent.Select(c => c.BeatmapSet.OnlineID), c => c.BeatmapSet.OnlineID);
 
                 panelLoadTask = LoadComponentsAsync(newCards, loaded =>
                 {
@@ -378,21 +376,5 @@ namespace osu.Game.Overlays
             if (shouldShowMore)
                 filterControl.FetchNextPage();
         }
-
-        private class BeatmapCardEqualityComparer : IEqualityComparer<BeatmapCard>
-        {
-            public static BeatmapCardEqualityComparer Default { get; } = new BeatmapCardEqualityComparer();
-
-            public bool Equals(BeatmapCard x, BeatmapCard y)
-            {
-                if (ReferenceEquals(x, y)) return true;
-                if (ReferenceEquals(x, null)) return false;
-                if (ReferenceEquals(y, null)) return false;
-
-                return x.BeatmapSet.Equals(y.BeatmapSet);
-            }
-
-            public int GetHashCode(BeatmapCard obj) => obj.BeatmapSet.GetHashCode();
-        }
     }
 }

From 17577a660654cd2e7b5f8a61405064ebed5aacc4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 28 Nov 2023 04:40:28 +0300
Subject: [PATCH 1827/2296] Add visual test case for late miss in argon health
 display

---
 .../Gameplay/TestSceneArgonHealthDisplay.cs   | 73 +++++++++++++++----
 1 file changed, 57 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index 6c364e41c7..3197de42d0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -24,6 +24,23 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private ArgonHealthDisplay healthDisplay = null!;
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AddSliderStep("Height", 0, 64, 0, val =>
+            {
+                if (healthDisplay.IsNotNull())
+                    healthDisplay.BarHeight.Value = val;
+            });
+
+            AddSliderStep("Width", 0, 1f, 0.98f, val =>
+            {
+                if (healthDisplay.IsNotNull())
+                    healthDisplay.Width = val;
+            });
+        }
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -46,27 +63,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                     },
                 };
             });
-
-            AddSliderStep("Height", 0, 64, 0, val =>
-            {
-                if (healthDisplay.IsNotNull())
-                    healthDisplay.BarHeight.Value = val;
-            });
-
-            AddSliderStep("Width", 0, 1f, 0.98f, val =>
-            {
-                if (healthDisplay.IsNotNull())
-                    healthDisplay.Width = val;
-            });
         }
 
         [Test]
         public void TestHealthDisplayIncrementing()
         {
-            AddRepeatStep("apply miss judgement", delegate
-            {
-                healthProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Miss });
-            }, 5);
+            AddRepeatStep("apply miss judgement", applyMiss, 5);
 
             AddRepeatStep(@"decrease hp slightly", delegate
             {
@@ -87,5 +89,44 @@ namespace osu.Game.Tests.Visual.Gameplay
                 });
             }, 3);
         }
+
+        [Test]
+        public void TestLateMissAfterConsequentMisses()
+        {
+            AddUntilStep("wait for health", () => healthDisplay.Current.Value == 1);
+            AddStep("apply sequence", () =>
+            {
+                for (int i = 0; i < 10; i++)
+                    applyMiss();
+
+                Scheduler.AddDelayed(applyMiss, 500 + 30);
+            });
+        }
+
+        [Test]
+        public void TestMissAlmostExactlyAfterLastMissAnimation()
+        {
+            AddUntilStep("wait for health", () => healthDisplay.Current.Value == 1);
+            AddStep("apply sequence", () =>
+            {
+                const double interval = 500 + 15;
+
+                for (int i = 0; i < 5; i++)
+                {
+                    if (i % 2 == 0)
+                        Scheduler.AddDelayed(applyMiss, i * interval);
+                    else
+                    {
+                        Scheduler.AddDelayed(applyMiss, i * interval);
+                        Scheduler.AddDelayed(applyMiss, i * interval);
+                    }
+                }
+            });
+        }
+
+        private void applyMiss()
+        {
+            healthProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Miss });
+        }
     }
 }

From 5723715ea01b8790699ff2562303caa0d7e6b6ee Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Dec 2023 23:23:48 +0300
Subject: [PATCH 1828/2296] Fix `ArgonHealthDisplay` sometimes behaving weirdly
 on miss judgements

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 3f6791d226..2bef6c312f 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -15,6 +15,7 @@ using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
@@ -54,6 +55,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private ScheduledDelegate? resetMissBarDelegate;
 
+        private bool displayingMiss => resetMissBarDelegate != null;
+
         private readonly List<Vector2> missBarVertices = new List<Vector2>();
         private readonly List<Vector2> healthBarVertices = new List<Vector2>();
 
@@ -147,10 +150,13 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
+        private JudgementResult? pendingJudgementResult;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            HealthProcessor.NewJudgement += result => pendingJudgementResult = result;
             Current.BindValueChanged(_ => Scheduler.AddOnce(updateCurrent), true);
 
             // we're about to set `RelativeSizeAxes` depending on the value of `UseRelativeSize`.
@@ -166,13 +172,22 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updateCurrent()
         {
-            if (Current.Value >= GlowBarValue) finishMissDisplay();
+            var result = pendingJudgementResult;
+
+            if (Current.Value >= GlowBarValue)
+                finishMissDisplay();
 
             double time = Current.Value > GlowBarValue ? 500 : 250;
 
             // TODO: this should probably use interpolation in update.
             this.TransformTo(nameof(HealthBarValue), Current.Value, time, Easing.OutQuint);
-            if (resetMissBarDelegate == null) this.TransformTo(nameof(GlowBarValue), Current.Value, time, Easing.OutQuint);
+
+            if (result != null && !result.IsHit)
+                triggerMissDisplay();
+            else if (!displayingMiss)
+                this.TransformTo(nameof(GlowBarValue), Current.Value, time, Easing.OutQuint);
+
+            pendingJudgementResult = null;
         }
 
         protected override void Update()
@@ -196,7 +211,7 @@ namespace osu.Game.Screens.Play.HUD
             mainBar.TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour.Opacity(0.8f))
                    .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint);
 
-            if (resetMissBarDelegate == null)
+            if (!displayingMiss)
             {
                 glowBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 30, Easing.OutQuint)
                        .Then()
@@ -208,20 +223,10 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        protected override void Miss()
+        private void triggerMissDisplay()
         {
-            base.Miss();
-
-            if (resetMissBarDelegate != null)
-            {
-                resetMissBarDelegate.Cancel();
-                resetMissBarDelegate = null;
-            }
-            else
-            {
-                // Reset any ongoing animation immediately, else things get weird.
-                this.TransformTo(nameof(GlowBarValue), HealthBarValue);
-            }
+            resetMissBarDelegate?.Cancel();
+            resetMissBarDelegate = null;
 
             this.Delay(500).Schedule(() =>
             {
@@ -238,7 +243,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private void finishMissDisplay()
         {
-            if (resetMissBarDelegate == null)
+            if (!displayingMiss)
                 return;
 
             if (Current.Value > 0)

From 4d82a555942d1b6e2e30a0c219a160feec598f81 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Dec 2023 23:23:58 +0300
Subject: [PATCH 1829/2296] Remove method for being unused

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index fdbce15b40..13dc05229e 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -45,14 +45,6 @@ namespace osu.Game.Screens.Play.HUD
         {
         }
 
-        /// <summary>
-        /// Triggered when a <see cref="Judgement"/> resulted in the player losing health.
-        /// Calls to this method are debounced.
-        /// </summary>
-        protected virtual void Miss()
-        {
-        }
-
         [Resolved]
         private HUDOverlay? hudOverlay { get; set; }
 
@@ -122,8 +114,6 @@ namespace osu.Game.Screens.Play.HUD
         {
             if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
                 Scheduler.AddOnce(Flash);
-            else if (judgement.Judgement.HealthIncreaseFor(judgement) < 0)
-                Scheduler.AddOnce(Miss);
         }
 
         protected override void Dispose(bool isDisposing)

From 629e64d50aa712d226480fe6c91c3ad933bb6a04 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Dec 2023 23:55:31 +0300
Subject: [PATCH 1830/2296] Fix `ArgonHealthDisplay` not displaying miss
 correctly during initial transition

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs |  7 +++++++
 osu.Game/Screens/Play/HUD/HealthDisplay.cs      | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 2bef6c312f..de591cdb31 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -204,6 +204,13 @@ namespace osu.Game.Screens.Play.HUD
             glowBar.Alpha = (float)Interpolation.DampContinuously(glowBar.Alpha, GlowBarValue > 0 ? 1 : 0, 40, Time.Elapsed);
         }
 
+        protected override void FinishInitialAnimation(double value)
+        {
+            base.FinishInitialAnimation(value);
+            this.TransformTo(nameof(HealthBarValue), value, 500, Easing.OutQuint);
+            this.TransformTo(nameof(GlowBarValue), value, 250, Easing.OutQuint);
+        }
+
         protected override void Flash()
         {
             base.Flash();
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 13dc05229e..7747036826 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -58,7 +58,9 @@ namespace osu.Game.Screens.Play.HUD
             health = HealthProcessor.Health.GetBoundCopy();
             health.BindValueChanged(h =>
             {
-                finishInitialAnimation();
+                if (initialIncrease != null)
+                    FinishInitialAnimation(h.OldValue);
+
                 Current.Value = h.NewValue;
             });
 
@@ -90,16 +92,16 @@ namespace osu.Game.Screens.Play.HUD
                 Scheduler.AddOnce(Flash);
 
                 if (newValue >= health.Value)
-                    finishInitialAnimation();
+                    FinishInitialAnimation(health.Value);
             }, increase_delay, true);
         }
 
-        private void finishInitialAnimation()
+        protected virtual void FinishInitialAnimation(double value)
         {
             if (initialIncrease == null)
                 return;
 
-            initialIncrease?.Cancel();
+            initialIncrease.Cancel();
             initialIncrease = null;
 
             // aside from the repeating `initialIncrease` scheduled task,

From 8756dd25c6d7cff903b0ec9e2fce1a2af48e197c Mon Sep 17 00:00:00 2001
From: Guido <75315940+vegguid@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:51:56 +0100
Subject: [PATCH 1831/2296] Changed file chooser in resource selection to show
 file name when file is selected

---
 osu.Game/Localisation/EditorSetupStrings.cs     | 10 ----------
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs |  9 ++-------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Localisation/EditorSetupStrings.cs b/osu.Game/Localisation/EditorSetupStrings.cs
index 401411365b..eff6f9e6b8 100644
--- a/osu.Game/Localisation/EditorSetupStrings.cs
+++ b/osu.Game/Localisation/EditorSetupStrings.cs
@@ -179,21 +179,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ClickToSelectTrack => new TranslatableString(getKey(@"click_to_select_track"), @"Click to select a track");
 
-        /// <summary>
-        /// "Click to replace the track"
-        /// </summary>
-        public static LocalisableString ClickToReplaceTrack => new TranslatableString(getKey(@"click_to_replace_track"), @"Click to replace the track");
-
         /// <summary>
         /// "Click to select a background image"
         /// </summary>
         public static LocalisableString ClickToSelectBackground => new TranslatableString(getKey(@"click_to_select_background"), @"Click to select a background image");
 
-        /// <summary>
-        /// "Click to replace the background image"
-        /// </summary>
-        public static LocalisableString ClickToReplaceBackground => new TranslatableString(getKey(@"click_to_replace_background"), @"Click to replace the background image");
-
         /// <summary>
         /// "Ruleset ({0})"
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 8c84ad90ba..f6d20319cb 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -146,13 +146,8 @@ namespace osu.Game.Screens.Edit.Setup
 
         private void updatePlaceholderText()
         {
-            audioTrackChooser.Text = audioTrackChooser.Current.Value == null
-                ? EditorSetupStrings.ClickToSelectTrack
-                : EditorSetupStrings.ClickToReplaceTrack;
-
-            backgroundChooser.Text = backgroundChooser.Current.Value == null
-                ? EditorSetupStrings.ClickToSelectBackground
-                : EditorSetupStrings.ClickToReplaceBackground;
+            audioTrackChooser.Text = audioTrackChooser.Current.Value?.Name ?? EditorSetupStrings.ClickToSelectTrack;
+            backgroundChooser.Text = backgroundChooser.Current.Value?.Name ?? EditorSetupStrings.ClickToSelectBackground;
         }
     }
 }

From 68907fe1ba93fec9b513c1c6e6072567e7913bb5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 5 Dec 2023 02:48:11 +0300
Subject: [PATCH 1832/2296] Cleanup pass

---
 osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs | 34 +++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
index 5054c75e97..18d4fef5e8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -78,30 +77,29 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             foreach (var drawable in playfield.HitObjectContainer.AliveObjects)
             {
-                if (drawable is not DrawableOsuHitObject d)
-                    continue;
-
-                switch (d)
+                switch (drawable)
                 {
-                    case DrawableHitCircle:
-                    case DrawableSlider:
-                        processObject(time, d);
+                    case DrawableHitCircle circle:
+                        processObject(time, circle, 0);
+                        break;
+
+                    case DrawableSlider slider:
+                        processObject(time, slider, slider.HitObject.Duration);
                         break;
                 }
             }
         }
 
-        private void processObject(double time, DrawableOsuHitObject drawable)
+        private void processObject(double time, DrawableOsuHitObject drawable, double duration)
         {
             var hitObject = drawable.HitObject;
 
             double baseSpeed = MaxDepth.Value / hitObject.TimePreempt;
-            double hitObjectDuration = hitObject is Slider s ? s.Duration : 0.0;
-            double offsetAfterStartTime = hitObjectDuration + hitObject.MaximumJudgementOffset + 500;
-            double slowSpeed = -minDepth / offsetAfterStartTime;
+            double offsetAfterStartTime = duration + hitObject.MaximumJudgementOffset + 500;
+            double slowSpeed = Math.Min(-minDepth / offsetAfterStartTime, baseSpeed);
 
-            float decelerationDistance = MaxDepth.Value * 0.2f;
-            double decelerationTime = (slowSpeed - baseSpeed) * 2 * decelerationDistance / (slowSpeed * slowSpeed - baseSpeed * baseSpeed);
+            double decelerationTime = hitObject.TimePreempt * 0.2;
+            float decelerationDistance = (float)(decelerationTime * (baseSpeed + slowSpeed) * 0.5);
 
             float z;
 
@@ -109,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 double appearTime = hitObject.StartTime - hitObject.TimePreempt;
                 float fullDistance = decelerationDistance + (float)(baseSpeed * (hitObject.TimePreempt - decelerationTime));
-                z = Interpolation.ValueAt(Math.Max(time, appearTime), fullDistance, decelerationDistance, appearTime, hitObject.StartTime - decelerationTime);
+                z = fullDistance - (float)((Math.Max(time, appearTime) - appearTime) * baseSpeed);
             }
             else if (time < hitObject.StartTime)
             {
@@ -120,11 +118,11 @@ namespace osu.Game.Rulesets.Osu.Mods
             else
             {
                 double endTime = hitObject.StartTime + offsetAfterStartTime;
-                z = Interpolation.ValueAt(Math.Min(time, endTime), 0f, minDepth, hitObject.StartTime, endTime);
+                z = -(float)((Math.Min(time, endTime) - hitObject.StartTime) * slowSpeed);
             }
 
             float scale = scaleForDepth(z);
-            drawable.Position = positionAtDepth(scale, hitObject.Position);
+            drawable.Position = toPlayfieldPosition(scale, hitObject.Position);
             drawable.Scale = new Vector2(scale);
         }
 
@@ -132,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private static float depthForScale(float scale) => 100 / scale + camera_position.Z;
 
-        private static Vector2 positionAtDepth(float scale, Vector2 positionAtZeroDepth)
+        private static Vector2 toPlayfieldPosition(float scale, Vector2 positionAtZeroDepth)
         {
             return (positionAtZeroDepth - camera_position.Xy) * scale + camera_position.Xy;
         }

From b90de83f33d330baaf37d71759ac081dd37c04ea Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 5 Dec 2023 11:57:51 +0900
Subject: [PATCH 1833/2296] Replicate integer calculations for tiny tick
 conversion

---
 .../CatchBeatmapConversionTest.cs             |  1 +
 .../Objects/JuiceStream.cs                    |  2 +-
 .../tiny-ticks-expected-conversion.json       | 44 +++++++++++++++++++
 .../Resources/Testing/Beatmaps/tiny-ticks.osu | 21 +++++++++
 4 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks.osu

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index a11aaa5e29..d70b171ff2 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase("right-bound-hr-offset", new[] { typeof(CatchModHardRock) })]
         [TestCase("basic-hyperdash")]
         [TestCase("pixel-jump")]
+        [TestCase("tiny-ticks")]
         public new void Test(string name, params Type[] mods) => base.Test(name, mods);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index fb1a86d8c0..019a67a70a 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                 // generate tiny droplets since the last point
                 if (lastEvent != null)
                 {
-                    double sinceLastTick = e.Time - lastEvent.Value.Time;
+                    double sinceLastTick = (int)e.Time - (int)lastEvent.Value.Time;
 
                     if (sinceLastTick > 80)
                     {
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks-expected-conversion.json b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks-expected-conversion.json
new file mode 100644
index 0000000000..7a9e848a7b
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks-expected-conversion.json
@@ -0,0 +1,44 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 27002.0,
+      "Objects": [
+        {
+          "StartTime": 27002.0,
+          "Position": 326.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 27102.0,
+          "Position": 267.416656,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 27238.0,
+          "Position": 217.484329,
+          "HyperDash": false
+        }
+      ]
+    },
+    {
+      "StartTime": 27318.0,
+      "Objects": [
+        {
+          "StartTime": 27318.0,
+          "Position": 215.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 27418.0,
+          "Position": 251.682343,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 27554.0,
+          "Position": 323.347046,
+          "HyperDash": false
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks.osu b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks.osu
new file mode 100644
index 0000000000..7808bd0764
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks.osu
@@ -0,0 +1,21 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:4.7
+CircleSize:3.7
+OverallDifficulty:8.4
+ApproachRate:9
+SliderMultiplier:1.57
+SliderTickRate:1
+
+[TimingPoints]
+476,315.789473684211,4,2,1,50,1,0
+18160,-103.092783505155,4,2,1,70,0,0
+
+[HitObjects]
+326,119,27002,6,0,P|266:96|196:111,1,114.217502701372,14|0,0:2|0:0,0:0:0:0:
+215,85,27318,2,0,P|271:80|323:102,1,114.217502701372,8|0,0:2|0:0,0:0:0:0:
\ No newline at end of file

From 7fda38d0b02496f4e255e496a73def950deca6a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Dec 2023 14:12:25 +0900
Subject: [PATCH 1834/2296] Use ordinal comparison when searching at song
 select

Bypasses various overheads. In theory should be fine? (until it's not on some language)
---
 osu.Game/Screens/Select/FilterCriteria.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 812a16c484..811f623ee5 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -176,13 +176,15 @@ namespace osu.Game.Screens.Select
                 {
                     default:
                     case MatchMode.Substring:
-                        return value.Contains(SearchTerm, StringComparison.InvariantCultureIgnoreCase);
+                        // Note that we are using ordinal here to avoid performance issues caused by globalisation concerns.
+                        // See https://github.com/ppy/osu/issues/11571 / https://github.com/dotnet/docs/issues/18423.
+                        return value.Contains(SearchTerm, StringComparison.OrdinalIgnoreCase);
 
                     case MatchMode.IsolatedPhrase:
                         return Regex.IsMatch(value, $@"(^|\s){Regex.Escape(searchTerm)}($|\s)", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 
                     case MatchMode.FullPhrase:
-                        return CultureInfo.InvariantCulture.CompareInfo.Compare(value, searchTerm, CompareOptions.IgnoreCase) == 0;
+                        return CultureInfo.InvariantCulture.CompareInfo.Compare(value, searchTerm, CompareOptions.OrdinalIgnoreCase) == 0;
                 }
             }
 

From 27e778ae09364981ce5e2768110efde51b4a3f7b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Dec 2023 14:15:05 +0900
Subject: [PATCH 1835/2296] Avoid sorting items when already in the correct
 sort order

---
 .../Screens/Select/Carousel/CarouselGroup.cs   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
index 9302578038..c353ee98ae 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
@@ -86,16 +86,20 @@ namespace osu.Game.Screens.Select.Carousel
 
             items.ForEach(c => c.Filter(criteria));
 
-            criteriaComparer = Comparer<CarouselItem>.Create((x, y) =>
+            // Sorting is expensive, so only perform if it's actually changed.
+            if (lastCriteria?.Sort != criteria.Sort)
             {
-                int comparison = x.CompareTo(criteria, y);
-                if (comparison != 0)
-                    return comparison;
+                criteriaComparer = Comparer<CarouselItem>.Create((x, y) =>
+                {
+                    int comparison = x.CompareTo(criteria, y);
+                    if (comparison != 0)
+                        return comparison;
 
-                return x.ItemID.CompareTo(y.ItemID);
-            });
+                    return x.ItemID.CompareTo(y.ItemID);
+                });
 
-            items.Sort(criteriaComparer);
+                items.Sort(criteriaComparer);
+            }
 
             lastCriteria = criteria;
         }

From 7d602c792da2446375e73d1ed211f3d7f62f432f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 5 Dec 2023 15:09:55 +0900
Subject: [PATCH 1836/2296] Fix legacy tick distance in JuiceStream generation

---
 .../CatchBeatmapConversionTest.cs             |  1 +
 .../Beatmaps/CatchBeatmapConverter.cs         |  4 ++
 .../Objects/JuiceStream.cs                    |  8 ++-
 .../v8-tick-distance-expected-conversion.json | 54 +++++++++++++++++++
 .../Testing/Beatmaps/v8-tick-distance.osu     | 19 +++++++
 5 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance.osu

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index d70b171ff2..d1fe213a32 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -29,6 +29,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase("basic-hyperdash")]
         [TestCase("pixel-jump")]
         [TestCase("tiny-ticks")]
+        [TestCase("v8-tick-distance")]
         public new void Test(string name, params Type[] mods) => base.Test(name, mods);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 6a24c26844..8c460586b0 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -9,6 +9,7 @@ using System.Threading;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Objects;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Beatmaps.Legacy;
 
 namespace osu.Game.Rulesets.Catch.Beatmaps
 {
@@ -42,6 +43,9 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
                         LegacyConvertedY = yPositionData?.Y ?? CatchHitObject.DEFAULT_LEGACY_CONVERT_Y,
+                        // prior to v8, speed multipliers don't adjust for how many ticks are generated over the same distance.
+                        // this results in more (or less) ticks being generated in <v8 maps for the same time duration.
+                        TickDistanceMultiplier = beatmap.BeatmapInfo.BeatmapVersion < 8 ? 1 : ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(obj.StartTime).SliderVelocity,
                         SliderVelocityMultiplier = sliderVelocityData?.SliderVelocityMultiplier ?? 1
                     }.Yield();
 
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 019a67a70a..d691ceceb1 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -41,6 +41,12 @@ namespace osu.Game.Rulesets.Catch.Objects
             set => SliderVelocityMultiplierBindable.Value = value;
         }
 
+        /// <summary>
+        /// An extra multiplier that affects the number of <see cref="Droplet"/>s generated by this <see cref="JuiceStream"/>.
+        /// An increase in this value increases <see cref="TickDistance"/>, which reduces the number of ticks generated.
+        /// </summary>
+        public double TickDistanceMultiplier = 1;
+
         [JsonIgnore]
         private double velocityFactor;
 
@@ -51,7 +57,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         public double Velocity => velocityFactor * SliderVelocityMultiplier;
 
         [JsonIgnore]
-        public double TickDistance => tickDistanceFactor * SliderVelocityMultiplier;
+        public double TickDistance => tickDistanceFactor * TickDistanceMultiplier;
 
         /// <summary>
         /// The length of one span of this <see cref="JuiceStream"/>.
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance-expected-conversion.json b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance-expected-conversion.json
new file mode 100644
index 0000000000..82167f37dd
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance-expected-conversion.json
@@ -0,0 +1,54 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 81593.0,
+      "Objects": [
+        {
+          "StartTime": 81593.0,
+          "Position": 384.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 81652.0,
+          "Position": 377.608948,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 81712.0,
+          "Position": 390.3638,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 81772.0,
+          "Position": 407.118683,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 81832.0,
+          "Position": 433.873535,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 81891.0,
+          "Position": 444.482483,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 81951.0,
+          "Position": 437.237366,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 82011.0,
+          "Position": 443.992218,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 82107.0,
+          "Position": 459.0,
+          "HyperDash": false
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance.osu b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance.osu
new file mode 100644
index 0000000000..9fdba9dc0b
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance.osu
@@ -0,0 +1,19 @@
+osu file format v7
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:4
+OverallDifficulty:8
+SliderMultiplier:1
+SliderTickRate:1
+
+[TimingPoints]
+336,342.857142857143,4,1,0,100,1,0
+81588,-200,4,2,0,100,0,0
+
+[HitObjects]
+384,72,81593,2,12,B|464:72,1,75,4|4
\ No newline at end of file

From 42010574b5d27d8ca6925a8b21ba7a61e4391926 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Dec 2023 14:53:47 +0900
Subject: [PATCH 1837/2296] Avoid list construction when doing filtering

---
 osu.Game/Beatmaps/BeatmapInfoExtensions.cs    | 22 +++++++++----------
 .../Beatmaps/BeatmapMetadataInfoExtensions.cs | 19 +++++++++++++++-
 .../Select/Carousel/CarouselBeatmap.cs        | 21 +-----------------
 3 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfoExtensions.cs b/osu.Game/Beatmaps/BeatmapInfoExtensions.cs
index 3aab9a24e1..a3bc03acc8 100644
--- a/osu.Game/Beatmaps/BeatmapInfoExtensions.cs
+++ b/osu.Game/Beatmaps/BeatmapInfoExtensions.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.Collections.Generic;
 using osu.Framework.Localisation;
+using osu.Game.Screens.Select;
 
 namespace osu.Game.Beatmaps
 {
@@ -29,20 +29,18 @@ namespace osu.Game.Beatmaps
             return new RomanisableString($"{metadata.GetPreferred(true)}".Trim(), $"{metadata.GetPreferred(false)}".Trim());
         }
 
-        public static List<string> GetSearchableTerms(this IBeatmapInfo beatmapInfo)
+        public static bool Match(this IBeatmapInfo beatmapInfo, params FilterCriteria.OptionalTextFilter[] filters)
         {
-            var termsList = new List<string>(BeatmapMetadataInfoExtensions.MAX_SEARCHABLE_TERM_COUNT + 1);
-
-            addIfNotNull(beatmapInfo.DifficultyName);
-
-            BeatmapMetadataInfoExtensions.CollectSearchableTerms(beatmapInfo.Metadata, termsList);
-            return termsList;
-
-            void addIfNotNull(string? s)
+            foreach (var filter in filters)
             {
-                if (!string.IsNullOrEmpty(s))
-                    termsList.Add(s);
+                if (filter.Matches(beatmapInfo.DifficultyName))
+                    return true;
+
+                if (BeatmapMetadataInfoExtensions.Match(beatmapInfo.Metadata, filters))
+                    return true;
             }
+
+            return false;
         }
 
         private static string getVersionString(IBeatmapInfo beatmapInfo) => string.IsNullOrEmpty(beatmapInfo.DifficultyName) ? string.Empty : $"[{beatmapInfo.DifficultyName}]";
diff --git a/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs b/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs
index be96a66614..ee3afdaef5 100644
--- a/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs
@@ -3,11 +3,14 @@
 
 using System.Collections.Generic;
 using osu.Framework.Localisation;
+using osu.Game.Screens.Select;
 
 namespace osu.Game.Beatmaps
 {
     public static class BeatmapMetadataInfoExtensions
     {
+        internal const int MAX_SEARCHABLE_TERM_COUNT = 7;
+
         /// <summary>
         /// An array of all searchable terms provided in contained metadata.
         /// </summary>
@@ -18,7 +21,21 @@ namespace osu.Game.Beatmaps
             return termsList.ToArray();
         }
 
-        internal const int MAX_SEARCHABLE_TERM_COUNT = 7;
+        public static bool Match(IBeatmapMetadataInfo metadataInfo, FilterCriteria.OptionalTextFilter[] filters)
+        {
+            foreach (var filter in filters)
+            {
+                if (filter.Matches(metadataInfo.Author.Username)) return true;
+                if (filter.Matches(metadataInfo.Artist)) return true;
+                if (filter.Matches(metadataInfo.ArtistUnicode)) return true;
+                if (filter.Matches(metadataInfo.Title)) return true;
+                if (filter.Matches(metadataInfo.TitleUnicode)) return true;
+                if (filter.Matches(metadataInfo.Source)) return true;
+                if (filter.Matches(metadataInfo.Tags)) return true;
+            }
+
+            return false;
+        }
 
         internal static void CollectSearchableTerms(IBeatmapMetadataInfo metadataInfo, IList<string> termsList)
         {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 1d40862df7..8b891a035c 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -66,26 +66,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             if (criteria.SearchTerms.Length > 0)
             {
-                var searchableTerms = BeatmapInfo.GetSearchableTerms();
-
-                foreach (FilterCriteria.OptionalTextFilter criteriaTerm in criteria.SearchTerms)
-                {
-                    bool any = false;
-
-                    // ReSharper disable once ForeachCanBeConvertedToQueryUsingAnotherGetEnumerator
-                    foreach (string searchTerm in searchableTerms)
-                    {
-                        if (!criteriaTerm.Matches(searchTerm)) continue;
-
-                        any = true;
-                        break;
-                    }
-
-                    if (any) continue;
-
-                    match = false;
-                    break;
-                }
+                match = BeatmapInfo.Match(criteria.SearchTerms);
 
                 // if a match wasn't found via text matching of terms, do a second catch-all check matching against online IDs.
                 // this should be done after text matching so we can prioritise matching numbers in metadata.

From 45e499778f8696087defd6c116970f918428539f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Dec 2023 15:28:56 +0900
Subject: [PATCH 1838/2296] Search terms before performing other criteria
 checks

Very minor, but putting the more common case towards the
start of the method allows early return.
---
 .../Select/Carousel/CarouselBeatmap.cs        | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 8b891a035c..45594bd0e8 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -41,6 +41,21 @@ namespace osu.Game.Screens.Select.Carousel
                 return match;
             }
 
+            if (criteria.SearchTerms.Length > 0)
+            {
+                match = BeatmapInfo.Match(criteria.SearchTerms);
+
+                // if a match wasn't found via text matching of terms, do a second catch-all check matching against online IDs.
+                // this should be done after text matching so we can prioritise matching numbers in metadata.
+                if (!match && criteria.SearchNumber.HasValue)
+                {
+                    match = (BeatmapInfo.OnlineID == criteria.SearchNumber.Value) ||
+                            (BeatmapInfo.BeatmapSet?.OnlineID == criteria.SearchNumber.Value);
+                }
+            }
+
+            if (!match) return false;
+
             match &= !criteria.StarDifficulty.HasFilter || criteria.StarDifficulty.IsInRange(BeatmapInfo.StarRating);
             match &= !criteria.ApproachRate.HasFilter || criteria.ApproachRate.IsInRange(BeatmapInfo.Difficulty.ApproachRate);
             match &= !criteria.DrainRate.HasFilter || criteria.DrainRate.IsInRange(BeatmapInfo.Difficulty.DrainRate);
@@ -64,21 +79,6 @@ namespace osu.Game.Screens.Select.Carousel
 
             if (!match) return false;
 
-            if (criteria.SearchTerms.Length > 0)
-            {
-                match = BeatmapInfo.Match(criteria.SearchTerms);
-
-                // if a match wasn't found via text matching of terms, do a second catch-all check matching against online IDs.
-                // this should be done after text matching so we can prioritise matching numbers in metadata.
-                if (!match && criteria.SearchNumber.HasValue)
-                {
-                    match = (BeatmapInfo.OnlineID == criteria.SearchNumber.Value) ||
-                            (BeatmapInfo.BeatmapSet?.OnlineID == criteria.SearchNumber.Value);
-                }
-            }
-
-            if (!match) return false;
-
             match &= criteria.CollectionBeatmapMD5Hashes?.Contains(BeatmapInfo.MD5Hash) ?? true;
             if (match && criteria.RulesetCriteria != null)
                 match &= criteria.RulesetCriteria.Matches(BeatmapInfo);

From 3aaba3183b91d7a2608002929ab236604c99b2bc Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 5 Dec 2023 15:39:23 +0900
Subject: [PATCH 1839/2296] Match stable precision when generating catch
 bananas

---
 .../CatchBeatmapConversionTest.cs             |   1 +
 .../Objects/BananaShower.cs                   |  14 +-
 ...spinner-precision-expected-conversion.json | 649 ++++++++++++++++++
 .../Testing/Beatmaps/spinner-precision.osu    |  20 +
 4 files changed, 677 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision.osu

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index d1fe213a32..5528ce0bfa 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase("pixel-jump")]
         [TestCase("tiny-ticks")]
         [TestCase("v8-tick-distance")]
+        [TestCase("spinner-precision")]
         public new void Test(string name, params Type[] mods) => base.Test(name, mods);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index b05c8e5f77..abeb7fe61d 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -23,29 +23,29 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         private void createBananas(CancellationToken cancellationToken)
         {
-            double spacing = Duration;
+            int startTime = (int)StartTime;
+            int endTime = (int)EndTime;
+            float spacing = (float)(EndTime - StartTime);
             while (spacing > 100)
                 spacing /= 2;
 
             if (spacing <= 0)
                 return;
 
-            double time = StartTime;
-            int i = 0;
+            int count = 0;
 
-            while (time <= EndTime)
+            for (float time = startTime; time <= endTime; time += spacing)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
                 AddNested(new Banana
                 {
                     StartTime = time,
-                    BananaIndex = i,
+                    BananaIndex = count,
                     Samples = new List<HitSampleInfo> { new Banana.BananaHitSampleInfo(CreateHitSampleInfo().Volume) }
                 });
 
-                time += spacing;
-                i++;
+                count++;
             }
         }
 
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision-expected-conversion.json b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision-expected-conversion.json
new file mode 100644
index 0000000000..95a0c8b34e
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision-expected-conversion.json
@@ -0,0 +1,649 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 276419.0,
+      "Objects": [
+        {
+          "StartTime": 276419.0,
+          "Position": 65.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 276494.0,
+          "Position": 482.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 276569.0,
+          "Position": 164.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 276645.0,
+          "Position": 315.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 276720.0,
+          "Position": 145.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 276795.0,
+          "Position": 159.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 276871.0,
+          "Position": 310.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 276946.0,
+          "Position": 441.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277021.0,
+          "Position": 428.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277097.0,
+          "Position": 243.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277172.0,
+          "Position": 422.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277247.0,
+          "Position": 481.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277323.0,
+          "Position": 104.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277398.0,
+          "Position": 473.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277473.0,
+          "Position": 135.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277549.0,
+          "Position": 360.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277624.0,
+          "Position": 123.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277699.0,
+          "Position": 42.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277775.0,
+          "Position": 393.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277850.0,
+          "Position": 75.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 277925.0,
+          "Position": 377.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278001.0,
+          "Position": 354.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278076.0,
+          "Position": 287.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278151.0,
+          "Position": 361.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278227.0,
+          "Position": 479.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278302.0,
+          "Position": 346.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278377.0,
+          "Position": 266.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278453.0,
+          "Position": 400.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278528.0,
+          "Position": 202.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278603.0,
+          "Position": 500.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278679.0,
+          "Position": 80.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278754.0,
+          "Position": 399.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278830.0,
+          "Position": 455.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278905.0,
+          "Position": 105.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 278980.0,
+          "Position": 100.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279056.0,
+          "Position": 195.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279131.0,
+          "Position": 106.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279206.0,
+          "Position": 305.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279282.0,
+          "Position": 225.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279357.0,
+          "Position": 79.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279432.0,
+          "Position": 38.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279508.0,
+          "Position": 99.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279583.0,
+          "Position": 79.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279658.0,
+          "Position": 169.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279734.0,
+          "Position": 238.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279809.0,
+          "Position": 511.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279884.0,
+          "Position": 58.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 279960.0,
+          "Position": 368.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280035.0,
+          "Position": 52.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280110.0,
+          "Position": 327.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280186.0,
+          "Position": 226.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280261.0,
+          "Position": 110.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280336.0,
+          "Position": 3.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280412.0,
+          "Position": 26.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280487.0,
+          "Position": 173.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280562.0,
+          "Position": 18.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280638.0,
+          "Position": 310.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280713.0,
+          "Position": 394.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280788.0,
+          "Position": 406.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280864.0,
+          "Position": 262.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 280939.0,
+          "Position": 278.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281014.0,
+          "Position": 171.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281090.0,
+          "Position": 22.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281165.0,
+          "Position": 187.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281241.0,
+          "Position": 124.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281316.0,
+          "Position": 454.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281391.0,
+          "Position": 16.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281467.0,
+          "Position": 61.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281542.0,
+          "Position": 161.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281617.0,
+          "Position": 243.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281693.0,
+          "Position": 375.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281768.0,
+          "Position": 247.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281843.0,
+          "Position": 162.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281919.0,
+          "Position": 383.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 281994.0,
+          "Position": 127.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282069.0,
+          "Position": 161.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282145.0,
+          "Position": 332.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282220.0,
+          "Position": 356.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282295.0,
+          "Position": 362.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282371.0,
+          "Position": 347.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282446.0,
+          "Position": 252.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282521.0,
+          "Position": 477.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282597.0,
+          "Position": 358.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282672.0,
+          "Position": 17.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282747.0,
+          "Position": 399.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282823.0,
+          "Position": 280.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282898.0,
+          "Position": 304.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 282973.0,
+          "Position": 221.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283049.0,
+          "Position": 407.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283124.0,
+          "Position": 287.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283199.0,
+          "Position": 135.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283275.0,
+          "Position": 437.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283350.0,
+          "Position": 289.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283425.0,
+          "Position": 464.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283501.0,
+          "Position": 36.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283576.0,
+          "Position": 378.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283652.0,
+          "Position": 297.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283727.0,
+          "Position": 418.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283802.0,
+          "Position": 329.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283878.0,
+          "Position": 338.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 283953.0,
+          "Position": 394.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284028.0,
+          "Position": 40.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284104.0,
+          "Position": 13.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284179.0,
+          "Position": 80.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284254.0,
+          "Position": 138.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284330.0,
+          "Position": 311.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284405.0,
+          "Position": 216.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284480.0,
+          "Position": 310.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284556.0,
+          "Position": 397.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284631.0,
+          "Position": 214.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284706.0,
+          "Position": 505.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284782.0,
+          "Position": 173.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284857.0,
+          "Position": 295.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 284932.0,
+          "Position": 199.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285008.0,
+          "Position": 494.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285083.0,
+          "Position": 293.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285158.0,
+          "Position": 115.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285234.0,
+          "Position": 412.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285309.0,
+          "Position": 506.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285384.0,
+          "Position": 293.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285460.0,
+          "Position": 346.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285535.0,
+          "Position": 117.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285610.0,
+          "Position": 285.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285686.0,
+          "Position": 17.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285761.0,
+          "Position": 238.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285836.0,
+          "Position": 222.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285912.0,
+          "Position": 450.0,
+          "HyperDash": false
+        },
+        {
+          "StartTime": 285987.0,
+          "Position": 67.0,
+          "HyperDash": false
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision.osu b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision.osu
new file mode 100644
index 0000000000..2ba1fea357
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision.osu
@@ -0,0 +1,20 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.8
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:3
+OverallDifficulty:8
+ApproachRate:9.2
+SliderMultiplier:1.7
+SliderTickRate:1
+
+[TimingPoints]
+276254,995.850622406639,4,2,1,70,1,0
+276254,-100,4,2,1,70,0,0
+
+[HitObjects]
+256,192,276419,12,4,286062,2:3:0:0:

From f317e06da14040d2fb5fbbc7375bbf12c729c1e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Dec 2023 16:54:44 +0900
Subject: [PATCH 1840/2296] Use `DangerousActionDialog`

---
 .../Overlays/Dialog/DangerousActionDialog.cs  |  8 ++++++-
 .../Multiplayer/Match/ConfirmAbortDialog.cs   | 22 ++-----------------
 .../Multiplayer/Match/MatchStartControl.cs    | 12 ++++++++++
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Dialog/DangerousActionDialog.cs b/osu.Game/Overlays/Dialog/DangerousActionDialog.cs
index c86570386f..42a3ff827c 100644
--- a/osu.Game/Overlays/Dialog/DangerousActionDialog.cs
+++ b/osu.Game/Overlays/Dialog/DangerousActionDialog.cs
@@ -23,6 +23,11 @@ namespace osu.Game.Overlays.Dialog
         /// </summary>
         protected Action? DangerousAction { get; set; }
 
+        /// <summary>
+        /// The action to perform if cancelled.
+        /// </summary>
+        protected Action? CancelAction { get; set; }
+
         protected DangerousActionDialog()
         {
             HeaderText = DeleteConfirmationDialogStrings.HeaderText;
@@ -38,7 +43,8 @@ namespace osu.Game.Overlays.Dialog
                 },
                 new PopupDialogCancelButton
                 {
-                    Text = DeleteConfirmationDialogStrings.Cancel
+                    Text = DeleteConfirmationDialogStrings.Cancel,
+                    Action = () => CancelAction?.Invoke()
                 }
             };
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs
index 06f2b2c8f6..0793981f41 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs
@@ -1,33 +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;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
-    public partial class ConfirmAbortDialog : PopupDialog
+    public partial class ConfirmAbortDialog : DangerousActionDialog
     {
-        public ConfirmAbortDialog(Action onConfirm, Action onCancel)
+        public ConfirmAbortDialog()
         {
             HeaderText = "Are you sure you want to abort the match?";
-
-            Icon = FontAwesome.Solid.ExclamationTriangle;
-
-            Buttons = new PopupDialogButton[]
-            {
-                new PopupDialogDangerousButton
-                {
-                    Text = @"Yes",
-                    Action = onConfirm
-                },
-                new PopupDialogCancelButton
-                {
-                    Text = @"No I didn't mean to",
-                    Action = onCancel
-                },
-            };
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
index 99934acaae..ba3508b24f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
@@ -17,6 +17,7 @@ using osu.Framework.Threading;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.Countdown;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
@@ -247,5 +248,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 countReady = newCountReady;
             });
         }
+
+        public partial class ConfirmAbortDialog : DangerousActionDialog
+        {
+            public ConfirmAbortDialog(Action abortMatch, Action cancel)
+            {
+                HeaderText = "Are you sure you want to abort the match?";
+
+                DangerousAction = abortMatch;
+                CancelAction = cancel;
+            }
+        }
     }
 }

From 02178d8e611dfc3c8a8335f41c68d6fab5dfbe0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Dec 2023 16:58:16 +0900
Subject: [PATCH 1841/2296] Remove usage of `case-when`

---
 .../Match/MultiplayerReadyButton.cs           | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 368e5210de..7ce3dde7c2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -149,10 +149,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             {
                 switch (localUser?.State)
                 {
-                    default:
-                        Text = "Ready";
-                        break;
-
                     case MultiplayerUserState.Spectating:
                     case MultiplayerUserState.Ready:
                         Text = multiplayerClient.IsHost
@@ -160,9 +156,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                             : $"Waiting for host... {countText}";
                         break;
 
-                    // Show the abort button for the host as long as gameplay is in progress.
-                    case MultiplayerUserState when multiplayerClient.IsHost && room.State != MultiplayerRoomState.Open:
-                        Text = "Abort the match";
+                    default:
+                        // Show the abort button for the host as long as gameplay is in progress.
+                        if (multiplayerClient.IsHost && room.State != MultiplayerRoomState.Open)
+                            Text = "Abort the match";
+                        else
+                            Text = "Ready";
                         break;
                 }
             }
@@ -197,7 +196,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             switch (localUser?.State)
             {
                 default:
-                    setGreen();
+                    // Show the abort button for the host as long as gameplay is in progress.
+                    if (multiplayerClient.IsHost && room.State != MultiplayerRoomState.Open)
+                        setRed();
+                    else
+                        setGreen();
                     break;
 
                 case MultiplayerUserState.Spectating:
@@ -208,11 +211,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                         setYellow();
 
                     break;
-
-                // Show the abort button for the host as long as gameplay is in progress.
-                case MultiplayerUserState when multiplayerClient.IsHost && room.State != MultiplayerRoomState.Open:
-                    setRed();
-                    break;
             }
 
             void setYellow() => BackgroundColour = colours.YellowDark;

From 8704dc3505a934f42f2259ec734bb072aa940282 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Dec 2023 18:20:27 +0900
Subject: [PATCH 1842/2296] Fix change in filter behaviour

---
 osu.Game/Beatmaps/BeatmapInfoExtensions.cs    | 12 ++++++++----
 .../Beatmaps/BeatmapMetadataInfoExtensions.cs | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfoExtensions.cs b/osu.Game/Beatmaps/BeatmapInfoExtensions.cs
index a3bc03acc8..b00d0ba316 100644
--- a/osu.Game/Beatmaps/BeatmapInfoExtensions.cs
+++ b/osu.Game/Beatmaps/BeatmapInfoExtensions.cs
@@ -34,13 +34,17 @@ namespace osu.Game.Beatmaps
             foreach (var filter in filters)
             {
                 if (filter.Matches(beatmapInfo.DifficultyName))
-                    return true;
+                    continue;
 
-                if (BeatmapMetadataInfoExtensions.Match(beatmapInfo.Metadata, filters))
-                    return true;
+                if (BeatmapMetadataInfoExtensions.Match(beatmapInfo.Metadata, filter))
+                    continue;
+
+                // failed to match a single filter at all - fail the whole match.
+                return false;
             }
 
-            return false;
+            // got through all filters without failing any - pass the whole match.
+            return true;
         }
 
         private static string getVersionString(IBeatmapInfo beatmapInfo) => string.IsNullOrEmpty(beatmapInfo.DifficultyName) ? string.Empty : $"[{beatmapInfo.DifficultyName}]";
diff --git a/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs b/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs
index ee3afdaef5..198469dba6 100644
--- a/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadataInfoExtensions.cs
@@ -21,18 +21,15 @@ namespace osu.Game.Beatmaps
             return termsList.ToArray();
         }
 
-        public static bool Match(IBeatmapMetadataInfo metadataInfo, FilterCriteria.OptionalTextFilter[] filters)
+        public static bool Match(IBeatmapMetadataInfo metadataInfo, FilterCriteria.OptionalTextFilter filter)
         {
-            foreach (var filter in filters)
-            {
-                if (filter.Matches(metadataInfo.Author.Username)) return true;
-                if (filter.Matches(metadataInfo.Artist)) return true;
-                if (filter.Matches(metadataInfo.ArtistUnicode)) return true;
-                if (filter.Matches(metadataInfo.Title)) return true;
-                if (filter.Matches(metadataInfo.TitleUnicode)) return true;
-                if (filter.Matches(metadataInfo.Source)) return true;
-                if (filter.Matches(metadataInfo.Tags)) return true;
-            }
+            if (filter.Matches(metadataInfo.Author.Username)) return true;
+            if (filter.Matches(metadataInfo.Artist)) return true;
+            if (filter.Matches(metadataInfo.ArtistUnicode)) return true;
+            if (filter.Matches(metadataInfo.Title)) return true;
+            if (filter.Matches(metadataInfo.TitleUnicode)) return true;
+            if (filter.Matches(metadataInfo.Source)) return true;
+            if (filter.Matches(metadataInfo.Tags)) return true;
 
             return false;
         }

From 4644c4e7a2c8676df418def1b6630e63253ebd81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Dec 2023 12:43:32 +0100
Subject: [PATCH 1843/2296] Remove unused class

---
 .../Multiplayer/Match/ConfirmAbortDialog.cs       | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.cs
deleted file mode 100644
index 0793981f41..0000000000
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/ConfirmAbortDialog.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.Game.Overlays.Dialog;
-
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
-{
-    public partial class ConfirmAbortDialog : DangerousActionDialog
-    {
-        public ConfirmAbortDialog()
-        {
-            HeaderText = "Are you sure you want to abort the match?";
-        }
-    }
-}

From cda55065e7f1e574bca8f9e8e21687ef2f4d686e Mon Sep 17 00:00:00 2001
From: Rodrigo Pina <rodrigo.pina@bizaygroup.com>
Date: Tue, 5 Dec 2023 12:56:24 +0000
Subject: [PATCH 1844/2296] Simplified ban order logic Implemented tests to
 make sure logic works as intended

---
 .../Screens/TestSceneMapPoolScreen.cs         | 107 ++++++++++++++++++
 .../Screens/MapPool/MapPoolScreen.cs          |  26 +++--
 2 files changed, 126 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 7b2c1ba336..24dfb95317 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
 using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
@@ -151,6 +152,105 @@ namespace osu.Game.Tournament.Tests.Screens
             });
         }
 
+        [Test]
+        public void TestSingleTeamBan()
+        {
+            AddStep("set ban count", () => Ladder.CurrentMatch.Value!.Round.Value!.BanCount.Value = 1);
+
+            AddStep("load some maps", () =>
+            {
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
+
+                for (int i = 0; i < 4; i++)
+                    addBeatmap();
+            });
+
+            AddStep("update displayed maps", () => Ladder.SplitMapPoolByMods.Value = false);
+
+            AddStep("perform bans", () =>
+            {
+                var tournamentMaps = screen.ChildrenOfType<TournamentBeatmapPanel>().ToList();
+
+                screen.ChildrenOfType<TourneyButton>().Where(btn => btn.Text == "Red Ban").First().TriggerClick();
+
+                PerformMapAction(tournamentMaps[0]);
+                PerformMapAction(tournamentMaps[1]);
+            });
+
+            AddAssert("ensure 1 ban per team", () => Ladder.CurrentMatch.Value!.PicksBans.Count() == 2 && Ladder.CurrentMatch.Value!.PicksBans.Last().Team == TeamColour.Blue);
+
+            AddStep("reset match", () =>
+            {
+                InputManager.UseParentInput = true;
+                Ladder.CurrentMatch.Value = new TournamentMatch();
+                Ladder.CurrentMatch.Value = Ladder.Matches.First();
+                Ladder.CurrentMatch.Value.PicksBans.Clear();
+            });
+        }
+
+        [Test]
+        public void TestMultipleTeamBans()
+        {
+            AddStep("set ban count", () => Ladder.CurrentMatch.Value!.Round.Value!.BanCount.Value = 3);
+
+            AddStep("load some maps", () =>
+            {
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
+
+                for (int i = 0; i < 12; i++)
+                    addBeatmap();
+            });
+
+            AddStep("update displayed maps", () => Ladder.SplitMapPoolByMods.Value = false);
+
+            AddStep("red team ban", () =>
+            {
+                var tournamentMaps = screen.ChildrenOfType<TournamentBeatmapPanel>().ToList();
+
+                screen.ChildrenOfType<TourneyButton>().Where(btn => btn.Text == "Red Ban").First().TriggerClick();
+
+                PerformMapAction(tournamentMaps[0]);
+            });
+
+            AddAssert("ensure red team ban", () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team == TeamColour.Red);
+
+            AddStep("blue team bans", () =>
+            {
+                var tournamentMaps = screen.ChildrenOfType<TournamentBeatmapPanel>().ToList();
+
+                PerformMapAction(tournamentMaps[1]);
+                PerformMapAction(tournamentMaps[2]);
+            });
+
+            AddAssert("ensure blue team double ban", () => Ladder.CurrentMatch.Value!.PicksBans.Count(ban => ban.Team == TeamColour.Blue) == 2);
+
+            AddStep("red team bans", () =>
+            {
+                var tournamentMaps = screen.ChildrenOfType<TournamentBeatmapPanel>().ToList();
+
+                PerformMapAction(tournamentMaps[3]);
+                PerformMapAction(tournamentMaps[4]);
+            });
+
+            AddAssert("ensure red team double ban", () => Ladder.CurrentMatch.Value!.PicksBans.Count(ban => ban.Team == TeamColour.Red) == 3);
+
+            AddStep("blue team bans", () =>
+            {
+                var tournamentMaps = screen.ChildrenOfType<TournamentBeatmapPanel>().ToList();
+
+                PerformMapAction(tournamentMaps[5]);
+            });
+
+            AddAssert("ensure blue team ban", () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team == TeamColour.Blue);
+
+            AddStep("reset match", () =>
+            {
+                InputManager.UseParentInput = true;
+                Ladder.CurrentMatch.Value = new TournamentMatch();
+                Ladder.CurrentMatch.Value = Ladder.Matches.First();
+                Ladder.CurrentMatch.Value.PicksBans.Clear();
+            });
+        }
         private void addBeatmap(string mods = "NM")
         {
             Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Add(new RoundBeatmap
@@ -159,5 +259,12 @@ namespace osu.Game.Tournament.Tests.Screens
                 Mods = mods
             });
         }
+
+        private void PerformMapAction(TournamentBeatmapPanel map)
+        {
+            InputManager.MoveMouseTo(map);
+
+            InputManager.Click(osuTK.Input.MouseButton.Left);
+        }
     }
 }
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 1223fd8464..72134ccb51 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -153,23 +153,35 @@ namespace osu.Game.Tournament.Screens.MapPool
 
             const TeamColour roll_winner = TeamColour.Red; //todo: draw from match
 
-            var previousBan = CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner;
+            var previousColour = CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner;
 
-            var nextColour = previousBan == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
+            TeamColour nextColour;
 
             bool hasAllBans = CurrentMatch.Value.PicksBans.Count(p => p.Type == ChoiceType.Ban) >= totalBansRequired;
 
             if (!hasAllBans)
-                // If it's the third ban or later, we need to check if it's the team's first or second ban in a row
-                nextColour = (CurrentMatch.Value.PicksBans.Count >= 2 ? CurrentMatch.Value.PicksBans[^2]?.Team : previousBan) == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
-
-            if (hasAllBans && pickType == ChoiceType.Ban)
             {
-                // When switching from bans to picks, we don't rotate the team colour.
+                // Ban phase.
+                // Switch teams every second ban.
+                nextColour = CurrentMatch.Value.PicksBans.Count % 2 == 1
+                    ? getOppositeTeamColour(previousColour)
+                    : previousColour;
+            }
+            else if (pickType == ChoiceType.Ban)
+            {
+                // Switching from bans to picks - stay with the last team that was banning.
                 nextColour = pickColour;
             }
+            else
+            {
+                // Pick phase.
+                // Switch teams every pick.
+                nextColour = getOppositeTeamColour(previousColour);
+            }
 
             setMode(nextColour, hasAllBans ? ChoiceType.Pick : ChoiceType.Ban);
+
+            TeamColour getOppositeTeamColour(TeamColour colour) => colour == TeamColour.Red ? TeamColour.Blue : TeamColour.Red;
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)

From 594ea4da5f5324bb4cce86b071acff13a9a1cb1d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 5 Dec 2023 16:00:20 +0300
Subject: [PATCH 1845/2296] Apply suggested behaviour

---
 osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
index 18d4fef5e8..16517a2f36 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
@@ -103,13 +103,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             float z;
 
-            if (time < hitObject.StartTime - decelerationTime)
-            {
-                double appearTime = hitObject.StartTime - hitObject.TimePreempt;
-                float fullDistance = decelerationDistance + (float)(baseSpeed * (hitObject.TimePreempt - decelerationTime));
-                z = fullDistance - (float)((Math.Max(time, appearTime) - appearTime) * baseSpeed);
-            }
-            else if (time < hitObject.StartTime)
+            if (time < hitObject.StartTime)
             {
                 double timeOffset = time - (hitObject.StartTime - decelerationTime);
                 double deceleration = (slowSpeed - baseSpeed) / decelerationTime;

From 927cfe42570db2edb8e51cbcfd0a729e6b1cb6e5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 19:44:01 +0300
Subject: [PATCH 1846/2296] Fix health processor event leaks

---
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 2bef6c312f..e044db7bb2 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -7,6 +7,7 @@ using System.Linq;
 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;
@@ -156,8 +157,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            HealthProcessor.NewJudgement += result => pendingJudgementResult = result;
-            Current.BindValueChanged(_ => Scheduler.AddOnce(updateCurrent), true);
+            HealthProcessor.NewJudgement += onNewJudgement;
+            Current.BindValueChanged(onCurrentChanged, true);
 
             // we're about to set `RelativeSizeAxes` depending on the value of `UseRelativeSize`.
             // setting `RelativeSizeAxes` internally transforms absolute sizing to relative and back to keep the size the same,
@@ -170,7 +171,12 @@ namespace osu.Game.Screens.Play.HUD
             BarHeight.BindValueChanged(_ => updatePath(), true);
         }
 
-        private void updateCurrent()
+        private void onNewJudgement(JudgementResult result) => pendingJudgementResult = result;
+
+        private void onCurrentChanged(ValueChangedEvent<double> valueChangedEvent)
+            => Scheduler.AddOnce(updateDisplay);
+
+        private void updateDisplay()
         {
             var result = pendingJudgementResult;
 
@@ -333,6 +339,14 @@ namespace osu.Game.Screens.Play.HUD
             mainBar.Position = healthBarVertices[0];
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (HealthProcessor.IsNotNull())
+                HealthProcessor.NewJudgement -= onNewJudgement;
+        }
+
         private partial class BackgroundPath : SmoothPath
         {
             protected override Color4 ColourAt(float position)

From 9496cdf42bf9d024ca40a0622677e60a233693ed Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 19:44:14 +0300
Subject: [PATCH 1847/2296] Add explanatory note for scheduling

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index e044db7bb2..9993ca1ef6 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -174,6 +174,7 @@ namespace osu.Game.Screens.Play.HUD
         private void onNewJudgement(JudgementResult result) => pendingJudgementResult = result;
 
         private void onCurrentChanged(ValueChangedEvent<double> valueChangedEvent)
+            // schedule display updates one frame later to ensure we know the judgement result causing this change (if there is one).
             => Scheduler.AddOnce(updateDisplay);
 
         private void updateDisplay()

From 986f4fa407caf9e5906444b2fa4ec0cca5a4b68b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 21:55:25 +0300
Subject: [PATCH 1848/2296] Add test scenarios for same-frame judgements

---
 .../Gameplay/TestSceneArgonHealthDisplay.cs   | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index 3197de42d0..d863755a85 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -83,13 +83,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddRepeatStep(@"increase hp with flash", delegate
             {
                 healthProcessor.Health.Value += 0.1f;
-                healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement())
-                {
-                    Type = HitResult.Perfect
-                });
+                applyPerfectHit();
             }, 3);
         }
 
+        private void applyPerfectHit()
+        {
+            healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement())
+            {
+                Type = HitResult.Perfect
+            });
+        }
+
         [Test]
         public void TestLateMissAfterConsequentMisses()
         {
@@ -124,6 +129,29 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
+        [Test]
+        public void TestMissThenHitAtSameUpdateFrame()
+        {
+            AddUntilStep("wait for health", () => healthDisplay.Current.Value == 1);
+            AddStep("set half health", () => healthProcessor.Health.Value = 0.5f);
+            AddStep("apply miss and hit", () =>
+            {
+                applyMiss();
+                applyMiss();
+                applyPerfectHit();
+                applyPerfectHit();
+            });
+            AddWaitStep("wait", 3);
+            AddStep("apply miss and cancel with hit", () =>
+            {
+                applyMiss();
+                applyPerfectHit();
+                applyPerfectHit();
+                applyPerfectHit();
+                applyPerfectHit();
+            });
+        }
+
         private void applyMiss()
         {
             healthProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Miss });

From 20fd458fac9f85140328d22948fb33a53d2c2c78 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 21:57:53 +0300
Subject: [PATCH 1849/2296] Perserve miss animation when followed by a hit at
 same frame

---
 .../Gameplay/TestSceneArgonHealthDisplay.cs   |  3 +++
 .../Screens/Play/HUD/ArgonHealthDisplay.cs    | 21 ++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index d863755a85..59819d781f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -134,6 +134,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddUntilStep("wait for health", () => healthDisplay.Current.Value == 1);
             AddStep("set half health", () => healthProcessor.Health.Value = 0.5f);
+
             AddStep("apply miss and hit", () =>
             {
                 applyMiss();
@@ -141,7 +142,9 @@ namespace osu.Game.Tests.Visual.Gameplay
                 applyPerfectHit();
                 applyPerfectHit();
             });
+
             AddWaitStep("wait", 3);
+
             AddStep("apply miss and cancel with hit", () =>
             {
                 applyMiss();
diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 9993ca1ef6..eaaf1c3c14 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
-        private JudgementResult? pendingJudgementResult;
+        private bool pendingMissAnimation;
 
         protected override void LoadComplete()
         {
@@ -171,7 +171,7 @@ namespace osu.Game.Screens.Play.HUD
             BarHeight.BindValueChanged(_ => updatePath(), true);
         }
 
-        private void onNewJudgement(JudgementResult result) => pendingJudgementResult = result;
+        private void onNewJudgement(JudgementResult result) => pendingMissAnimation |= !result.IsHit;
 
         private void onCurrentChanged(ValueChangedEvent<double> valueChangedEvent)
             // schedule display updates one frame later to ensure we know the judgement result causing this change (if there is one).
@@ -179,22 +179,23 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updateDisplay()
         {
-            var result = pendingJudgementResult;
+            double newHealth = Current.Value;
 
-            if (Current.Value >= GlowBarValue)
+            if (newHealth >= GlowBarValue)
                 finishMissDisplay();
 
-            double time = Current.Value > GlowBarValue ? 500 : 250;
+            double time = newHealth > GlowBarValue ? 500 : 250;
 
             // TODO: this should probably use interpolation in update.
-            this.TransformTo(nameof(HealthBarValue), Current.Value, time, Easing.OutQuint);
+            this.TransformTo(nameof(HealthBarValue), newHealth, time, Easing.OutQuint);
 
-            if (result != null && !result.IsHit)
+            if (pendingMissAnimation && newHealth < GlowBarValue)
                 triggerMissDisplay();
-            else if (!displayingMiss)
-                this.TransformTo(nameof(GlowBarValue), Current.Value, time, Easing.OutQuint);
 
-            pendingJudgementResult = null;
+            pendingMissAnimation = false;
+
+            if (!displayingMiss)
+                this.TransformTo(nameof(GlowBarValue), newHealth, time, Easing.OutQuint);
         }
 
         protected override void Update()

From c55bfc03ee6f02f8234a80b8b0bf11022e763c34 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 22:06:53 +0300
Subject: [PATCH 1850/2296] Move private method

---
 .../Gameplay/TestSceneArgonHealthDisplay.cs      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
index 59819d781f..30fb4412f4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
@@ -87,14 +87,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             }, 3);
         }
 
-        private void applyPerfectHit()
-        {
-            healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement())
-            {
-                Type = HitResult.Perfect
-            });
-        }
-
         [Test]
         public void TestLateMissAfterConsequentMisses()
         {
@@ -159,5 +151,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             healthProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Miss });
         }
+
+        private void applyPerfectHit()
+        {
+            healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement())
+            {
+                Type = HitResult.Perfect
+            });
+        }
     }
 }

From a0813d18cab2cb5485d5a0f792819d8018ef1189 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 22:47:08 +0300
Subject: [PATCH 1851/2296] `CalculatedTextSize` -> `FontSize`

---
 osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs   | 2 +-
 osu.Game/Graphics/UserInterface/OsuTextBox.cs           | 2 +-
 osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index 123854a2dd..0be7b4dc48 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Graphics.UserInterface
         protected override Drawable GetDrawableCharacter(char c) => new FallingDownContainer
         {
             AutoSizeAxes = Axes.Both,
-            Child = new PasswordMaskChar(CalculatedTextSize),
+            Child = new PasswordMaskChar(FontSize),
         };
 
         protected override bool AllowUniqueCharacterSamples => false;
diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 04ecfa7e9a..4742da6d0b 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -268,7 +268,7 @@ namespace osu.Game.Graphics.UserInterface
         protected override Drawable GetDrawableCharacter(char c) => new FallingDownContainer
         {
             AutoSizeAxes = Axes.Both,
-            Child = new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: CalculatedTextSize) },
+            Child = new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: FontSize) },
         };
 
         protected override Caret CreateCaret() => caret = new OsuCaret
diff --git a/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs b/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
index 3940bf8bca..131041e706 100644
--- a/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Graphics.UserInterface
                 BackgroundFocused = colourProvider.Background4;
                 BackgroundUnfocused = colourProvider.Background4;
 
-                Placeholder.Font = OsuFont.GetFont(size: CalculatedTextSize, weight: FontWeight.SemiBold);
+                Placeholder.Font = OsuFont.GetFont(size: FontSize, weight: FontWeight.SemiBold);
                 PlaceholderText = CommonStrings.InputSearch;
 
                 CornerRadius = corner_radius;

From b8b82f890172cd2a6dd70e57ad6ecf591dca073c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 22:45:46 +0300
Subject: [PATCH 1852/2296] Handle back action in `OsuDropdown` rather than
 menu

---
 .../Graphics/UserInterface/OsuDropdown.cs     | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index b530172f3e..7a052c2298 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -22,7 +22,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public partial class OsuDropdown<T> : Dropdown<T>
+    public partial class OsuDropdown<T> : Dropdown<T>, IKeyBindingHandler<GlobalAction>
     {
         private const float corner_radius = 5;
 
@@ -30,9 +30,23 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override DropdownMenu CreateMenu() => new OsuDropdownMenu();
 
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            if (e.Repeat) return false;
+
+            if (e.Action == GlobalAction.Back)
+                return Back();
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
+
         #region OsuDropdownMenu
 
-        protected partial class OsuDropdownMenu : DropdownMenu, IKeyBindingHandler<GlobalAction>
+        protected partial class OsuDropdownMenu : DropdownMenu
         {
             public override bool HandleNonPositionalInput => State == MenuState.Open;
 
@@ -276,23 +290,6 @@ namespace osu.Game.Graphics.UserInterface
             }
 
             #endregion
-
-            public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
-            {
-                if (e.Repeat) return false;
-
-                if (e.Action == GlobalAction.Back)
-                {
-                    State = MenuState.Closed;
-                    return true;
-                }
-
-                return false;
-            }
-
-            public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
-            {
-            }
         }
 
         #endregion

From a67df766543cb2e967695675434885edd0431d7c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 22:50:05 +0300
Subject: [PATCH 1853/2296] Add test coverage

---
 .../UserInterface/TestSceneOsuDropdown.cs     | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs
index b0548d7e9f..1678890b73 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuDropdown.cs
@@ -1,9 +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.Linq;
+using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Framework.Input.States;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -13,8 +21,29 @@ namespace osu.Game.Tests.Visual.UserInterface
             new OsuEnumDropdown<BeatmapOnlineStatus>
             {
                 Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
+                Origin = Anchor.TopCentre,
                 Width = 150
             };
+
+        [Test]
+        // todo: this can be written much better if ThemeComparisonTestScene has a manual input manager
+        public void TestBackAction()
+        {
+            AddStep("open", () => dropdown().ChildrenOfType<Menu>().Single().Open());
+            AddStep("press back", () => dropdown().OnPressed(new KeyBindingPressEvent<GlobalAction>(new InputState(), GlobalAction.Back)));
+            AddAssert("closed", () => dropdown().ChildrenOfType<Menu>().Single().State == MenuState.Closed);
+
+            AddStep("open", () => dropdown().ChildrenOfType<Menu>().Single().Open());
+            AddStep("type something", () => dropdown().ChildrenOfType<DropdownSearchBar>().Single().SearchTerm.Value = "something");
+            AddAssert("search bar visible", () => dropdown().ChildrenOfType<DropdownSearchBar>().Single().State.Value == Visibility.Visible);
+            AddStep("press back", () => dropdown().OnPressed(new KeyBindingPressEvent<GlobalAction>(new InputState(), GlobalAction.Back)));
+            AddAssert("text clear", () => dropdown().ChildrenOfType<DropdownSearchBar>().Single().SearchTerm.Value == string.Empty);
+            AddAssert("search bar hidden", () => dropdown().ChildrenOfType<DropdownSearchBar>().Single().State.Value == Visibility.Hidden);
+            AddAssert("still open", () => dropdown().ChildrenOfType<Menu>().Single().State == MenuState.Open);
+            AddStep("press back", () => dropdown().OnPressed(new KeyBindingPressEvent<GlobalAction>(new InputState(), GlobalAction.Back)));
+            AddAssert("closed", () => dropdown().ChildrenOfType<Menu>().Single().State == MenuState.Closed);
+
+            OsuEnumDropdown<BeatmapOnlineStatus> dropdown() => this.ChildrenOfType<OsuEnumDropdown<BeatmapOnlineStatus>>().First();
+        }
     }
 }

From d92db8059e1b8804af4a88d9450cd837a0e97d6d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 22:49:43 +0300
Subject: [PATCH 1854/2296] Add new dropdown properties to `SettingsDropdown`

---
 osu.Game/Overlays/Settings/SettingsDropdown.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Overlays/Settings/SettingsDropdown.cs b/osu.Game/Overlays/Settings/SettingsDropdown.cs
index 5798d02e03..ec69224bb6 100644
--- a/osu.Game/Overlays/Settings/SettingsDropdown.cs
+++ b/osu.Game/Overlays/Settings/SettingsDropdown.cs
@@ -16,6 +16,18 @@ namespace osu.Game.Overlays.Settings
     {
         protected new OsuDropdown<T> Control => (OsuDropdown<T>)base.Control;
 
+        public bool AlwaysShowSearchBar
+        {
+            get => Control.AlwaysShowSearchBar;
+            set => Control.AlwaysShowSearchBar = value;
+        }
+
+        public bool AllowNonContiguousMatching
+        {
+            get => Control.AllowNonContiguousMatching;
+            set => Control.AllowNonContiguousMatching = value;
+        }
+
         public IEnumerable<T> Items
         {
             get => Control.Items;

From ee2e176082834d34350d2c9183d825b5468d7333 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 22:52:48 +0300
Subject: [PATCH 1855/2296] Add osu! dropdown search bar implementation

---
 .../Graphics/UserInterface/OsuDropdown.cs     | 79 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 7a052c2298..96604275ea 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -352,11 +352,82 @@ namespace osu.Game.Graphics.UserInterface
                 AddInternal(new HoverClickSounds());
             }
 
-            [BackgroundDependencyLoader(true)]
-            private void load(OverlayColourProvider? colourProvider, OsuColour colours)
+            [Resolved]
+            private OverlayColourProvider? colourProvider { get; set; }
+
+            [Resolved]
+            private OsuColour colours { get; set; } = null!;
+
+            protected override void LoadComplete()
             {
-                BackgroundColour = colourProvider?.Background5 ?? Color4.Black.Opacity(0.5f);
-                BackgroundColourHover = colourProvider?.Light4 ?? colours.PinkDarker;
+                base.LoadComplete();
+
+                SearchBar.State.ValueChanged += _ => updateColour();
+                updateColour();
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateColour();
+                return false;
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateColour();
+            }
+
+            private void updateColour()
+            {
+                bool hovered = Enabled.Value && IsHovered;
+                var hoveredColour = colourProvider?.Light4 ?? colours.PinkDarker;
+                var unhoveredColour = colourProvider?.Background5 ?? Color4.Black.Opacity(0.5f);
+
+                if (SearchBar.State.Value == Visibility.Visible)
+                {
+                    Icon.Colour = hovered ? hoveredColour.Lighten(0.5f) : Colour4.White;
+                    Background.Colour = unhoveredColour;
+                }
+                else
+                {
+                    Icon.Colour = Color4.White;
+                    Background.Colour = hovered ? hoveredColour : unhoveredColour;
+                }
+            }
+
+            protected override DropdownSearchBar CreateSearchBar() => new OsuDropdownSearchBar
+            {
+                Padding = new MarginPadding { Right = 36 },
+            };
+
+            private partial class OsuDropdownSearchBar : DropdownSearchBar
+            {
+                protected override void PopIn() => this.FadeIn();
+
+                protected override void PopOut() => this.FadeOut();
+
+                protected override TextBox CreateTextBox() => new DropdownSearchTextBox
+                {
+                    FontSize = OsuFont.Default.Size,
+                };
+
+                private partial class DropdownSearchTextBox : SearchTextBox
+                {
+                    public DropdownSearchTextBox()
+                    {
+                        TextContainer.Margin = new MarginPadding { Top = 4f };
+                    }
+
+                    public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+                    {
+                        if (e.Action == GlobalAction.Back)
+                            // this method is blocking Dropdown from receiving the back action, despite this text box residing in a separate input manager.
+                            // to fix this properly, a local global action container needs to be added as well, but for simplicity, just don't handle the back action here.
+                            return false;
+
+                        return base.OnPressed(e);
+                    }
+                }
             }
         }
     }

From d4aedaf22d730cf03eaf199c06df66939b86f9a8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 22:53:24 +0300
Subject: [PATCH 1856/2296] Always show search bar in skin dropdown for
 visibility

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index e997e70157..40c54b26a0 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -57,9 +57,10 @@ namespace osu.Game.Overlays.Settings.Sections
             {
                 skinDropdown = new SkinSettingsDropdown
                 {
+                    AlwaysShowSearchBar = true,
                     LabelText = SkinSettingsStrings.CurrentSkin,
                     Current = skins.CurrentSkinInfo,
-                    Keywords = new[] { @"skins" }
+                    Keywords = new[] { @"skins" },
                 },
                 new SettingsButton
                 {

From f45336a4f65126fbf258df1627074a089ce51852 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Dec 2023 22:53:35 +0300
Subject: [PATCH 1857/2296] Make skin dropdown searching non-contiguous

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 40c54b26a0..1d057f42c0 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -58,6 +58,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 skinDropdown = new SkinSettingsDropdown
                 {
                     AlwaysShowSearchBar = true,
+                    AllowNonContiguousMatching = true,
                     LabelText = SkinSettingsStrings.CurrentSkin,
                     Current = skins.CurrentSkinInfo,
                     Keywords = new[] { @"skins" },

From 2c7db61a5c0263ce58e8cd5134acfd2df727e9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Dec 2023 21:19:35 +0100
Subject: [PATCH 1858/2296] Improve test

---
 .../Screens/TestSceneMapPoolScreen.cs         | 137 ++++++++++++------
 1 file changed, 96 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 24dfb95317..b99735bda4 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
@@ -161,23 +160,51 @@ namespace osu.Game.Tournament.Tests.Screens
             {
                 Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
 
-                for (int i = 0; i < 4; i++)
+                for (int i = 0; i < 5; i++)
                     addBeatmap();
             });
 
             AddStep("update displayed maps", () => Ladder.SplitMapPoolByMods.Value = false);
 
-            AddStep("perform bans", () =>
-            {
-                var tournamentMaps = screen.ChildrenOfType<TournamentBeatmapPanel>().ToList();
+            AddStep("start bans from blue team", () => screen.ChildrenOfType<TourneyButton>().First(btn => btn.Text == "Blue Ban").TriggerClick());
+            AddStep("ban map", () => clickBeatmapPanel(0));
+            AddAssert("one ban registered", () => Ladder.CurrentMatch.Value!.PicksBans, () => Has.Count.EqualTo(1));
+            AddAssert("ban was blue's",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Blue),
+                () => Is.EqualTo(1));
 
-                screen.ChildrenOfType<TourneyButton>().Where(btn => btn.Text == "Red Ban").First().TriggerClick();
+            AddStep("ban map", () => clickBeatmapPanel(1));
+            AddAssert("two bans registered", () => Ladder.CurrentMatch.Value!.PicksBans, () => Has.Count.EqualTo(2));
+            AddAssert("one ban for red team",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Red),
+                () => Is.EqualTo(1));
+            AddAssert("one ban for blue team",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Blue),
+                () => Is.EqualTo(1));
 
-                PerformMapAction(tournamentMaps[0]);
-                PerformMapAction(tournamentMaps[1]);
-            });
+            AddStep("pick map", () => clickBeatmapPanel(2));
+            AddAssert("one pick registered",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Pick),
+                () => Is.EqualTo(1));
+            AddAssert("pick was red's",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team,
+                () => Is.EqualTo(TeamColour.Red));
 
-            AddAssert("ensure 1 ban per team", () => Ladder.CurrentMatch.Value!.PicksBans.Count() == 2 && Ladder.CurrentMatch.Value!.PicksBans.Last().Team == TeamColour.Blue);
+            AddStep("pick map", () => clickBeatmapPanel(3));
+            AddAssert("two picks registered",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Pick),
+                () => Is.EqualTo(2));
+            AddAssert("pick was blue's",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team,
+                () => Is.EqualTo(TeamColour.Blue));
+
+            AddStep("pick map", () => clickBeatmapPanel(4));
+            AddAssert("three picks registered",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Pick),
+                () => Is.EqualTo(3));
+            AddAssert("pick was red's",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team,
+                () => Is.EqualTo(TeamColour.Red));
 
             AddStep("reset match", () =>
             {
@@ -203,45 +230,73 @@ namespace osu.Game.Tournament.Tests.Screens
 
             AddStep("update displayed maps", () => Ladder.SplitMapPoolByMods.Value = false);
 
-            AddStep("red team ban", () =>
+            AddStep("start bans with red team", () => screen.ChildrenOfType<TourneyButton>().First(btn => btn.Text == "Red Ban").TriggerClick());
+
+            AddStep("first ban", () => clickBeatmapPanel(0));
+            AddAssert("red ban registered",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Red),
+                () => Is.EqualTo(1));
+
+            AddStep("ban two more maps", () =>
             {
-                var tournamentMaps = screen.ChildrenOfType<TournamentBeatmapPanel>().ToList();
-
-                screen.ChildrenOfType<TourneyButton>().Where(btn => btn.Text == "Red Ban").First().TriggerClick();
-
-                PerformMapAction(tournamentMaps[0]);
+                clickBeatmapPanel(1);
+                clickBeatmapPanel(2);
             });
 
-            AddAssert("ensure red team ban", () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team == TeamColour.Red);
+            AddAssert("three bans registered",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban),
+                () => Is.EqualTo(3));
+            AddAssert("both new bans for blue team",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Blue),
+                () => Is.EqualTo(2));
 
-            AddStep("blue team bans", () =>
+            AddStep("ban two more maps", () =>
             {
-                var tournamentMaps = screen.ChildrenOfType<TournamentBeatmapPanel>().ToList();
-
-                PerformMapAction(tournamentMaps[1]);
-                PerformMapAction(tournamentMaps[2]);
+                clickBeatmapPanel(3);
+                clickBeatmapPanel(4);
             });
 
-            AddAssert("ensure blue team double ban", () => Ladder.CurrentMatch.Value!.PicksBans.Count(ban => ban.Team == TeamColour.Blue) == 2);
+            AddAssert("five bans registered",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban),
+                () => Is.EqualTo(5));
+            AddAssert("both new bans for red team",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Red),
+                () => Is.EqualTo(3));
 
-            AddStep("red team bans", () =>
-            {
-                var tournamentMaps = screen.ChildrenOfType<TournamentBeatmapPanel>().ToList();
+            AddStep("ban last map", () => clickBeatmapPanel(5));
+            AddAssert("six bans registered",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban),
+                () => Is.EqualTo(6));
+            AddAssert("red banned three",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Red),
+                () => Is.EqualTo(3));
+            AddAssert("blue banned three",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Blue),
+                () => Is.EqualTo(3));
 
-                PerformMapAction(tournamentMaps[3]);
-                PerformMapAction(tournamentMaps[4]);
-            });
+            AddStep("pick map", () => clickBeatmapPanel(6));
+            AddAssert("one pick registered",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Pick),
+                () => Is.EqualTo(1));
+            AddAssert("pick was blue's",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team,
+                () => Is.EqualTo(TeamColour.Blue));
 
-            AddAssert("ensure red team double ban", () => Ladder.CurrentMatch.Value!.PicksBans.Count(ban => ban.Team == TeamColour.Red) == 3);
+            AddStep("pick map", () => clickBeatmapPanel(7));
+            AddAssert("two picks registered",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Pick),
+                () => Is.EqualTo(2));
+            AddAssert("pick was red's",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team,
+                () => Is.EqualTo(TeamColour.Red));
 
-            AddStep("blue team bans", () =>
-            {
-                var tournamentMaps = screen.ChildrenOfType<TournamentBeatmapPanel>().ToList();
-
-                PerformMapAction(tournamentMaps[5]);
-            });
-
-            AddAssert("ensure blue team ban", () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team == TeamColour.Blue);
+            AddStep("pick map", () => clickBeatmapPanel(8));
+            AddAssert("three picks registered",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Pick),
+                () => Is.EqualTo(3));
+            AddAssert("pick was blue's",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team,
+                () => Is.EqualTo(TeamColour.Blue));
 
             AddStep("reset match", () =>
             {
@@ -251,6 +306,7 @@ namespace osu.Game.Tournament.Tests.Screens
                 Ladder.CurrentMatch.Value.PicksBans.Clear();
             });
         }
+
         private void addBeatmap(string mods = "NM")
         {
             Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Add(new RoundBeatmap
@@ -260,10 +316,9 @@ namespace osu.Game.Tournament.Tests.Screens
             });
         }
 
-        private void PerformMapAction(TournamentBeatmapPanel map)
+        private void clickBeatmapPanel(int index)
         {
-            InputManager.MoveMouseTo(map);
-
+            InputManager.MoveMouseTo(screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(index));
             InputManager.Click(osuTK.Input.MouseButton.Left);
         }
     }

From 7392cc2fda72dd22d1daa767dab4d507c0073688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Dec 2023 21:49:04 +0100
Subject: [PATCH 1859/2296] Fix headless test failures due to input handling
 idiosyncrasies

---
 .../Screens/TestSceneMapPoolScreen.cs            | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index b99735bda4..c459de1e43 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -9,6 +9,7 @@ using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.MapPool;
+using osuTK;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
@@ -19,7 +20,7 @@ namespace osu.Game.Tournament.Tests.Screens
         [BackgroundDependencyLoader]
         private void load()
         {
-            Add(screen = new MapPoolScreen { Width = 0.7f });
+            Add(screen = new TestMapPoolScreen { Width = 0.7f });
         }
 
         [SetUp]
@@ -208,7 +209,6 @@ namespace osu.Game.Tournament.Tests.Screens
 
             AddStep("reset match", () =>
             {
-                InputManager.UseParentInput = true;
                 Ladder.CurrentMatch.Value = new TournamentMatch();
                 Ladder.CurrentMatch.Value = Ladder.Matches.First();
                 Ladder.CurrentMatch.Value.PicksBans.Clear();
@@ -300,7 +300,6 @@ namespace osu.Game.Tournament.Tests.Screens
 
             AddStep("reset match", () =>
             {
-                InputManager.UseParentInput = true;
                 Ladder.CurrentMatch.Value = new TournamentMatch();
                 Ladder.CurrentMatch.Value = Ladder.Matches.First();
                 Ladder.CurrentMatch.Value.PicksBans.Clear();
@@ -321,5 +320,16 @@ namespace osu.Game.Tournament.Tests.Screens
             InputManager.MoveMouseTo(screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(index));
             InputManager.Click(osuTK.Input.MouseButton.Left);
         }
+
+        private partial class TestMapPoolScreen : MapPoolScreen
+        {
+            // this is a bit of a test-specific workaround.
+            // the way pick/ban is implemented is a bit funky; the screen itself is what handles the mouse there,
+            // rather than the beatmap panels themselves.
+            // in some extreme situations headless it may turn out that the panels overflow the screen,
+            // and as such picking stops working anymore outside of the bounds of the screen drawable.
+            // this override makes it so the screen sees all of the input at all times, making that impossible to happen.
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+        }
     }
 }

From 43701c5d47154e73012f06c26b08938c9517d1a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Dec 2023 21:49:32 +0100
Subject: [PATCH 1860/2296] Prefer using statement to fully qualified name

---
 osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index c459de1e43..2ef290ff49 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -10,6 +10,7 @@ using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.MapPool;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
@@ -318,7 +319,7 @@ namespace osu.Game.Tournament.Tests.Screens
         private void clickBeatmapPanel(int index)
         {
             InputManager.MoveMouseTo(screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(index));
-            InputManager.Click(osuTK.Input.MouseButton.Left);
+            InputManager.Click(MouseButton.Left);
         }
 
         private partial class TestMapPoolScreen : MapPoolScreen

From 07f9f5c6d842d3c7c564f96576682b6fb54c50b4 Mon Sep 17 00:00:00 2001
From: POeticPotatoes <poeticpotatoes@gmail.com>
Date: Wed, 6 Dec 2023 06:33:25 +0800
Subject: [PATCH 1861/2296] Remove hover checks for mod-copying menu item

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 136c9cc8e7..a76f4ae955 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -421,7 +421,7 @@ namespace osu.Game.Online.Leaderboards
             {
                 List<MenuItem> items = new List<MenuItem>();
 
-                if (Score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered) && songSelect != null)
+                if (Score.Mods.Length > 0 && songSelect != null)
                     items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, () => songSelect.Mods.Value = Score.Mods));
 
                 if (Score.Files.Count > 0)

From 8286d3896f4240ad920f94bf7e5735230d90d588 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 11:17:32 +0900
Subject: [PATCH 1862/2296] Fix searching at song select matching incorrect
 ruleset

Regressed with https://github.com/ppy/osu/pull/25679.
---
 .../SongSelect/TestScenePlaySongSelect.cs      | 18 ++++++++++++++++++
 .../Screens/Select/Carousel/CarouselBeatmap.cs |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 7313bde8fe..84750d4c16 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -580,6 +580,24 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("start not requested", () => !startRequested);
         }
 
+        [Test]
+        public void TestSearchTextWithRulesetCriteria()
+        {
+            createSongSelect();
+
+            addRulesetImportStep(0);
+
+            AddStep("disallow convert display", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, false));
+
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
+
+            AddStep("set filter to match all", () => songSelect!.FilterControl.CurrentTextSearch.Value = "Some");
+
+            changeRuleset(1);
+
+            AddUntilStep("has no selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
+        }
+
         [TestCase(false)]
         [TestCase(true)]
         public void TestExternalBeatmapChangeWhileFiltered(bool differentRuleset)
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 45594bd0e8..1ca4b371c3 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -41,6 +41,8 @@ namespace osu.Game.Screens.Select.Carousel
                 return match;
             }
 
+            if (!match) return false;
+
             if (criteria.SearchTerms.Length > 0)
             {
                 match = BeatmapInfo.Match(criteria.SearchTerms);

From ac67320b61d1459ab367e46c9100ab33379203a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 11:50:43 +0900
Subject: [PATCH 1863/2296] Refactor for readability

---
 .../Screens/TestSceneMapPoolScreen.cs         |  2 +-
 .../Screens/MapPool/MapPoolScreen.cs          | 23 +++++++------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 2ef290ff49..2911ba6acb 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Tournament.Tests.Screens
         }
 
         [Test]
-        public void TestSingleTeamBan()
+        public void TestPickBanOrder()
         {
             AddStep("set ban count", () => Ladder.CurrentMatch.Value!.Round.Value!.BanCount.Value = 1);
 
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 72134ccb51..665d3c131a 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -151,9 +151,7 @@ namespace osu.Game.Tournament.Screens.MapPool
 
             int totalBansRequired = CurrentMatch.Value.Round.Value.BanCount.Value * 2;
 
-            const TeamColour roll_winner = TeamColour.Red; //todo: draw from match
-
-            var previousColour = CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? roll_winner;
+            TeamColour lastPickColour = CurrentMatch.Value.PicksBans.LastOrDefault()?.Team ?? TeamColour.Red;
 
             TeamColour nextColour;
 
@@ -161,22 +159,17 @@ namespace osu.Game.Tournament.Screens.MapPool
 
             if (!hasAllBans)
             {
-                // Ban phase.
-                // Switch teams every second ban.
+                // Ban phase: switch teams every second ban.
                 nextColour = CurrentMatch.Value.PicksBans.Count % 2 == 1
-                    ? getOppositeTeamColour(previousColour)
-                    : previousColour;
-            }
-            else if (pickType == ChoiceType.Ban)
-            {
-                // Switching from bans to picks - stay with the last team that was banning.
-                nextColour = pickColour;
+                    ? getOppositeTeamColour(lastPickColour)
+                    : lastPickColour;
             }
             else
             {
-                // Pick phase.
-                // Switch teams every pick.
-                nextColour = getOppositeTeamColour(previousColour);
+                // Pick phase : switch teams every pick, except for the first pick which generally goes to the team that placed the last ban.
+                nextColour = pickType == ChoiceType.Pick
+                    ? getOppositeTeamColour(lastPickColour)
+                    : lastPickColour;
             }
 
             setMode(nextColour, hasAllBans ? ChoiceType.Pick : ChoiceType.Ban);

From 1d1b85551000586cda3aef40ea26d447242bd754 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 11:57:04 +0900
Subject: [PATCH 1864/2296] Refactor test for readability

---
 .../Screens/TestSceneMapPoolScreen.cs         | 47 +++++++------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 2911ba6acb..dcf9dc47b9 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -169,44 +169,26 @@ namespace osu.Game.Tournament.Tests.Screens
             AddStep("update displayed maps", () => Ladder.SplitMapPoolByMods.Value = false);
 
             AddStep("start bans from blue team", () => screen.ChildrenOfType<TourneyButton>().First(btn => btn.Text == "Blue Ban").TriggerClick());
+
             AddStep("ban map", () => clickBeatmapPanel(0));
-            AddAssert("one ban registered", () => Ladder.CurrentMatch.Value!.PicksBans, () => Has.Count.EqualTo(1));
-            AddAssert("ban was blue's",
-                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Blue),
-                () => Is.EqualTo(1));
+            checkTotalPickBans(1);
+            checkLastPick(ChoiceType.Ban, TeamColour.Blue);
 
             AddStep("ban map", () => clickBeatmapPanel(1));
-            AddAssert("two bans registered", () => Ladder.CurrentMatch.Value!.PicksBans, () => Has.Count.EqualTo(2));
-            AddAssert("one ban for red team",
-                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Red),
-                () => Is.EqualTo(1));
-            AddAssert("one ban for blue team",
-                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Ban && pb.Team == TeamColour.Blue),
-                () => Is.EqualTo(1));
+            checkTotalPickBans(2);
+            checkLastPick(ChoiceType.Ban, TeamColour.Red);
 
             AddStep("pick map", () => clickBeatmapPanel(2));
-            AddAssert("one pick registered",
-                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Pick),
-                () => Is.EqualTo(1));
-            AddAssert("pick was red's",
-                () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team,
-                () => Is.EqualTo(TeamColour.Red));
+            checkTotalPickBans(3);
+            checkLastPick(ChoiceType.Pick, TeamColour.Red);
 
             AddStep("pick map", () => clickBeatmapPanel(3));
-            AddAssert("two picks registered",
-                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Pick),
-                () => Is.EqualTo(2));
-            AddAssert("pick was blue's",
-                () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team,
-                () => Is.EqualTo(TeamColour.Blue));
+            checkTotalPickBans(4);
+            checkLastPick(ChoiceType.Pick, TeamColour.Blue);
 
             AddStep("pick map", () => clickBeatmapPanel(4));
-            AddAssert("three picks registered",
-                () => Ladder.CurrentMatch.Value!.PicksBans.Count(pb => pb.Type == ChoiceType.Pick),
-                () => Is.EqualTo(3));
-            AddAssert("pick was red's",
-                () => Ladder.CurrentMatch.Value!.PicksBans.Last().Team,
-                () => Is.EqualTo(TeamColour.Red));
+            checkTotalPickBans(5);
+            checkLastPick(ChoiceType.Pick, TeamColour.Red);
 
             AddStep("reset match", () =>
             {
@@ -214,6 +196,13 @@ namespace osu.Game.Tournament.Tests.Screens
                 Ladder.CurrentMatch.Value = Ladder.Matches.First();
                 Ladder.CurrentMatch.Value.PicksBans.Clear();
             });
+
+            void checkTotalPickBans(int expected) => AddAssert($"total pickbans is {expected}", () => Ladder.CurrentMatch.Value!.PicksBans, () => Has.Count.EqualTo(expected));
+
+            void checkLastPick(ChoiceType expectedChoice, TeamColour expectedColour) =>
+                AddAssert($"last choice was {expectedChoice} by {expectedColour}",
+                    () => Ladder.CurrentMatch.Value!.PicksBans.Select(pb => (pb.Type, pb.Team)).Last(),
+                    () => Is.EqualTo((expectedChoice, expectedColour)));
         }
 
         [Test]

From 73aaa0406a35786e07ac8c11b07e018522303d85 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 12:00:32 +0900
Subject: [PATCH 1865/2296] Add test coverage of multiple bans order

---
 .../Screens/TestSceneMapPoolScreen.cs         | 61 ++++++++++++++++---
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index dcf9dc47b9..5e535e2749 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -25,7 +25,14 @@ namespace osu.Game.Tournament.Tests.Screens
         }
 
         [SetUp]
-        public void SetUp() => Schedule(() => Ladder.SplitMapPoolByMods.Value = true);
+        public void SetUp() => Schedule(() =>
+        {
+            Ladder.SplitMapPoolByMods.Value = true;
+
+            Ladder.CurrentMatch.Value = new TournamentMatch();
+            Ladder.CurrentMatch.Value = Ladder.Matches.First();
+            Ladder.CurrentMatch.Value.PicksBans.Clear();
+        });
 
         [Test]
         public void TestFewMaps()
@@ -153,6 +160,44 @@ namespace osu.Game.Tournament.Tests.Screens
             });
         }
 
+        [Test]
+        public void TestBanOrderMultipleBans()
+        {
+            AddStep("set ban count", () => Ladder.CurrentMatch.Value!.Round.Value!.BanCount.Value = 2);
+
+            AddStep("load some maps", () =>
+            {
+                Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Clear();
+
+                for (int i = 0; i < 5; i++)
+                    addBeatmap();
+            });
+
+            AddStep("update displayed maps", () => Ladder.SplitMapPoolByMods.Value = false);
+
+            AddStep("start bans from blue team", () => screen.ChildrenOfType<TourneyButton>().First(btn => btn.Text == "Blue Ban").TriggerClick());
+
+            AddStep("ban map", () => clickBeatmapPanel(0));
+            checkTotalPickBans(1);
+            checkLastPick(ChoiceType.Ban, TeamColour.Blue);
+
+            AddStep("ban map", () => clickBeatmapPanel(1));
+            checkTotalPickBans(2);
+            checkLastPick(ChoiceType.Ban, TeamColour.Red);
+
+            AddStep("ban map", () => clickBeatmapPanel(2));
+            checkTotalPickBans(3);
+            checkLastPick(ChoiceType.Ban, TeamColour.Red);
+
+            AddStep("pick map", () => clickBeatmapPanel(3));
+            checkTotalPickBans(4);
+            checkLastPick(ChoiceType.Ban, TeamColour.Blue);
+
+            AddStep("pick map", () => clickBeatmapPanel(4));
+            checkTotalPickBans(5);
+            checkLastPick(ChoiceType.Pick, TeamColour.Blue);
+        }
+
         [Test]
         public void TestPickBanOrder()
         {
@@ -196,13 +241,6 @@ namespace osu.Game.Tournament.Tests.Screens
                 Ladder.CurrentMatch.Value = Ladder.Matches.First();
                 Ladder.CurrentMatch.Value.PicksBans.Clear();
             });
-
-            void checkTotalPickBans(int expected) => AddAssert($"total pickbans is {expected}", () => Ladder.CurrentMatch.Value!.PicksBans, () => Has.Count.EqualTo(expected));
-
-            void checkLastPick(ChoiceType expectedChoice, TeamColour expectedColour) =>
-                AddAssert($"last choice was {expectedChoice} by {expectedColour}",
-                    () => Ladder.CurrentMatch.Value!.PicksBans.Select(pb => (pb.Type, pb.Team)).Last(),
-                    () => Is.EqualTo((expectedChoice, expectedColour)));
         }
 
         [Test]
@@ -296,6 +334,13 @@ namespace osu.Game.Tournament.Tests.Screens
             });
         }
 
+        private void checkTotalPickBans(int expected) => AddAssert($"total pickbans is {expected}", () => Ladder.CurrentMatch.Value!.PicksBans, () => Has.Count.EqualTo(expected));
+
+        private void checkLastPick(ChoiceType expectedChoice, TeamColour expectedColour) =>
+            AddAssert($"last choice was {expectedChoice} by {expectedColour}",
+                () => Ladder.CurrentMatch.Value!.PicksBans.Select(pb => (pb.Type, pb.Team)).Last(),
+                () => Is.EqualTo((expectedChoice, expectedColour)));
+
         private void addBeatmap(string mods = "NM")
         {
             Ladder.CurrentMatch.Value!.Round.Value!.Beatmaps.Add(new RoundBeatmap

From 49ca1ccb22792b973f49d409eec464de1ab75d74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 12:03:54 +0900
Subject: [PATCH 1866/2296] Simplify state reset in test scene

---
 .../Screens/TestSceneMapPoolScreen.cs         | 45 +++++++------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 5e535e2749..7e008a6897 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -24,14 +24,24 @@ namespace osu.Game.Tournament.Tests.Screens
             Add(screen = new TestMapPoolScreen { Width = 0.7f });
         }
 
-        [SetUp]
-        public void SetUp() => Schedule(() =>
+        [SetUpSteps]
+        public override void SetUpSteps()
+        {
+            AddStep("reset state", resetState);
+        }
+
+        private void resetState()
         {
             Ladder.SplitMapPoolByMods.Value = true;
 
             Ladder.CurrentMatch.Value = new TournamentMatch();
             Ladder.CurrentMatch.Value = Ladder.Matches.First();
             Ladder.CurrentMatch.Value.PicksBans.Clear();
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
         });
 
         [Test]
@@ -48,7 +58,6 @@ namespace osu.Game.Tournament.Tests.Screens
             AddStep("reset match", () =>
             {
                 Ladder.CurrentMatch.Value = new TournamentMatch();
-                Ladder.CurrentMatch.Value = Ladder.Matches.First();
             });
 
             assertTwoWide();
@@ -65,11 +74,7 @@ namespace osu.Game.Tournament.Tests.Screens
                     addBeatmap();
             });
 
-            AddStep("reset match", () =>
-            {
-                Ladder.CurrentMatch.Value = new TournamentMatch();
-                Ladder.CurrentMatch.Value = Ladder.Matches.First();
-            });
+            AddStep("reset state", resetState);
 
             assertTwoWide();
         }
@@ -85,11 +90,7 @@ namespace osu.Game.Tournament.Tests.Screens
                     addBeatmap();
             });
 
-            AddStep("reset match", () =>
-            {
-                Ladder.CurrentMatch.Value = new TournamentMatch();
-                Ladder.CurrentMatch.Value = Ladder.Matches.First();
-            });
+            AddStep("reset state", resetState);
 
             assertThreeWide();
         }
@@ -105,11 +106,7 @@ namespace osu.Game.Tournament.Tests.Screens
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
             });
 
-            AddStep("reset match", () =>
-            {
-                Ladder.CurrentMatch.Value = new TournamentMatch();
-                Ladder.CurrentMatch.Value = Ladder.Matches.First();
-            });
+            AddStep("reset state", resetState);
 
             assertTwoWide();
         }
@@ -131,11 +128,7 @@ namespace osu.Game.Tournament.Tests.Screens
                     addBeatmap(i > 4 ? Ruleset.Value.CreateInstance().AllMods.ElementAt(i).Acronym : "NM");
             });
 
-            AddStep("reset match", () =>
-            {
-                Ladder.CurrentMatch.Value = new TournamentMatch();
-                Ladder.CurrentMatch.Value = Ladder.Matches.First();
-            });
+            AddStep("reset state", resetState);
 
             assertThreeWide();
         }
@@ -153,11 +146,7 @@ namespace osu.Game.Tournament.Tests.Screens
 
             AddStep("disable splitting map pool by mods", () => Ladder.SplitMapPoolByMods.Value = false);
 
-            AddStep("reset match", () =>
-            {
-                Ladder.CurrentMatch.Value = new TournamentMatch();
-                Ladder.CurrentMatch.Value = Ladder.Matches.First();
-            });
+            AddStep("reset state", resetState);
         }
 
         [Test]

From 639fac2d49e8d34292bd1487224b31edbaa1fee9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 12:09:33 +0900
Subject: [PATCH 1867/2296] Fix being able to change ruleset / beatmap when
 opening skin editor from main menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No tests because it would be silly to test this – it's already a well
established behaviour and was just initialised incorrectly.
---
 osu.Game/Screens/Play/Player.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1c97efcff7..48411e9c87 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -59,6 +59,10 @@ namespace osu.Game.Screens.Play
 
         protected override bool PlayExitSound => !isRestarting;
 
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        public override bool? AllowGlobalTrackControl => false;
+
         protected override UserActivity InitialActivity => new UserActivity.InSoloGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
 
         public override float BackgroundParallaxAmount => 0.1f;

From 2c44ca191592286b60f311fb10ab6d14fdfec4ee Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 5 Dec 2023 15:51:59 +0900
Subject: [PATCH 1868/2296] Add more test beatmaps

Move test files to Catch.Tests project
---
 .../CatchBeatmapConversionTest.cs             |   25 +-
 .../Beatmaps/103019-expected-conversion.json  |    1 +
 .../Resources/Testing/Beatmaps/103019.osu     |  329 ++++
 .../Beatmaps/104973-expected-conversion.json  |    1 +
 .../Resources/Testing/Beatmaps/104973.osu     |  491 ++++++
 .../Beatmaps/1284935-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/1284935.osu    |  210 +++
 .../Beatmaps/1431386-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/1431386.osu    |  560 +++++++
 .../Beatmaps/1597806-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/1597806.osu    |  152 ++
 .../Beatmaps/2190499-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/2190499.osu    |  977 +++++++++++
 .../Beatmaps/2571731-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/2571731.osu    |  277 ++++
 .../Beatmaps/2768615-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/2768615.osu    |  200 +++
 .../Beatmaps/2781126-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/2781126.osu    |  908 +++++++++++
 .../Beatmaps/3152510-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/3152510.osu    |  468 ++++++
 .../Beatmaps/3227428-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/3227428.osu    |  142 ++
 .../Beatmaps/3524302-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/3524302.osu    |  889 ++++++++++
 .../Beatmaps/3644427-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/3644427.osu    | 1450 +++++++++++++++++
 .../Beatmaps/3689906-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/3689906.osu    |  942 +++++++++++
 .../Beatmaps/37902-expected-conversion.json   |    1 +
 .../Resources/Testing/Beatmaps/37902.osu      |  230 +++
 .../Beatmaps/39206-expected-conversion.json   |    1 +
 .../Resources/Testing/Beatmaps/39206.osu      |  524 ++++++
 .../Beatmaps/3949367-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/3949367.osu    |  832 ++++++++++
 .../Beatmaps/42587-expected-conversion.json   |    1 +
 .../Resources/Testing/Beatmaps/42587.osu      |  528 ++++++
 .../Beatmaps/50859-expected-conversion.json   |    1 +
 .../Resources/Testing/Beatmaps/50859.osu      |  290 ++++
 .../Beatmaps/75858-expected-conversion.json   |    1 +
 .../Resources/Testing/Beatmaps/75858.osu      |  417 +++++
 .../Beatmaps/871815-expected-conversion.json  |    1 +
 .../Resources/Testing/Beatmaps/871815.osu     |  165 ++
 .../Beatmaps/basic-expected-conversion.json   |    0
 .../basic-hyperdash-expected-conversion.json  |    0
 .../Testing/Beatmaps/basic-hyperdash.osu      |    0
 .../Resources/Testing/Beatmaps/basic.osu      |   54 +-
 .../Testing/Beatmaps/diffcalc-test.osu        |    0
 ...ock-repeat-slider-expected-conversion.json |    0
 .../Beatmaps/hardrock-repeat-slider.osu       |    0
 .../hardrock-spinner-expected-conversion.json |    0
 .../Testing/Beatmaps/hardrock-spinner.osu     |    0
 .../hardrock-stream-expected-conversion.json  |    0
 .../Testing/Beatmaps/hardrock-stream.osu      |    0
 .../pixel-jump-expected-conversion.json       |    0
 .../Resources/Testing/Beatmaps/pixel-jump.osu |    0
 ...t-bound-hr-offset-expected-conversion.json |    0
 .../Beatmaps/right-bound-hr-offset.osu        |    0
 .../Beatmaps/slider-expected-conversion.json  |    0
 .../Resources/Testing/Beatmaps/slider.osu     |    0
 ...inner-and-circles-expected-conversion.json |    0
 .../Testing/Beatmaps/spinner-and-circles.osu  |    0
 .../Beatmaps/spinner-expected-conversion.json |    0
 ...spinner-precision-expected-conversion.json |    0
 .../Testing/Beatmaps/spinner-precision.osu    |    0
 .../Resources/Testing/Beatmaps/spinner.osu    |    0
 .../tiny-ticks-expected-conversion.json       |    0
 .../Resources/Testing/Beatmaps/tiny-ticks.osu |    0
 .../v8-tick-distance-expected-conversion.json |    0
 .../Testing/Beatmaps/v8-tick-distance.osu     |    0
 70 files changed, 11052 insertions(+), 29 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/103019-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/103019.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/104973-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/104973.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1284935-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1284935.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1431386-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1431386.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1597806-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1597806.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2190499-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2190499.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2571731-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2571731.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2768615-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2768615.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2781126-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2781126.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3152510-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3152510.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3227428-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3227428.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3524302-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3524302.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3644427-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3644427.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3689906-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3689906.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/37902-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/37902.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/39206-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/39206.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3949367-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3949367.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/42587-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/42587.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/50859-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/50859.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/75858-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/75858.osu
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/871815-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/871815.osu
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/basic-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/basic-hyperdash-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/basic-hyperdash.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/basic.osu (96%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/diffcalc-test.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/hardrock-repeat-slider-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/hardrock-repeat-slider.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/hardrock-spinner-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/hardrock-spinner.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/hardrock-stream-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/hardrock-stream.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/pixel-jump-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/pixel-jump.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/right-bound-hr-offset-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/right-bound-hr-offset.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/slider-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/slider.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/spinner-and-circles-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/spinner-and-circles.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/spinner-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/spinner-precision-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/spinner-precision.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/spinner.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/tiny-ticks-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/tiny-ticks.osu (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/v8-tick-distance-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Catch => osu.Game.Rulesets.Catch.Tests}/Resources/Testing/Beatmaps/v8-tick-distance.osu (100%)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index 5528ce0bfa..7572c6670f 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class CatchBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
     {
-        protected override string ResourceAssembly => "osu.Game.Rulesets.Catch";
+        protected override string ResourceAssembly => "osu.Game.Rulesets.Catch.Tests";
 
         [TestCase("basic")]
         [TestCase("spinner")]
@@ -31,6 +31,27 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase("tiny-ticks")]
         [TestCase("v8-tick-distance")]
         [TestCase("spinner-precision")]
+        [TestCase("37902", new[] { typeof(CatchModDoubleTime), typeof(CatchModHardRock), typeof(CatchModHidden) })]
+        [TestCase("39206", new[] { typeof(CatchModDoubleTime), typeof(CatchModHidden) })]
+        [TestCase("42587")]
+        [TestCase("50859", new[] { typeof(CatchModDoubleTime), typeof(CatchModHidden) })]
+        [TestCase("75858", new[] { typeof(CatchModHardRock), typeof(CatchModHidden) })]
+        [TestCase("103019", new[] { typeof(CatchModHidden) })]
+        [TestCase("104973", new[] { typeof(CatchModHardRock), typeof(CatchModHidden) })]
+        [TestCase("871815", new[] { typeof(CatchModDoubleTime), typeof(CatchModHidden) })]
+        [TestCase("1284935", new[] { typeof(CatchModDoubleTime), typeof(CatchModHardRock) })]
+        [TestCase("1431386", new[] { typeof(CatchModDoubleTime), typeof(CatchModHardRock), typeof(CatchModHidden) })]
+        [TestCase("1597806", new[] { typeof(CatchModDoubleTime), typeof(CatchModHidden) })]
+        [TestCase("2190499", new[] { typeof(CatchModDoubleTime), typeof(CatchModHidden) })]
+        [TestCase("2571731", new[] { typeof(CatchModHardRock), typeof(CatchModHidden) })]
+        [TestCase("2768615", new[] { typeof(CatchModDoubleTime), typeof(CatchModHardRock) })]
+        [TestCase("2781126", new[] { typeof(CatchModHidden) })]
+        [TestCase("3152510", new[] { typeof(CatchModDoubleTime) })]
+        [TestCase("3227428", new[] { typeof(CatchModHardRock), typeof(CatchModHidden) })]
+        [TestCase("3524302", new[] { typeof(CatchModDoubleTime), typeof(CatchModEasy) })]
+        [TestCase("3644427", new[] { typeof(CatchModEasy), typeof(CatchModFlashlight) })]
+        [TestCase("3689906", new[] { typeof(CatchModDoubleTime), typeof(CatchModEasy) })]
+        [TestCase("3949367", new[] { typeof(CatchModDoubleTime), typeof(CatchModEasy) })]
         public new void Test(string name, params Type[] mods) => base.Test(name, mods);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
@@ -64,7 +85,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         /// <summary>
         /// A sane value to account for osu!stable using ints everwhere.
         /// </summary>
-        private const float conversion_lenience = 2;
+        private const float conversion_lenience = 3;
 
         [JsonIgnore]
         public readonly CatchHitObject HitObject;
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/103019-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/103019-expected-conversion.json
new file mode 100644
index 0000000000..f518db17a0
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/103019-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":571.0,"Objects":[{"StartTime":571.0,"Position":184.0,"HyperDash":false},{"StartTime":656.0,"Position":168.664017,"HyperDash":false},{"StartTime":742.0,"Position":196.577621,"HyperDash":false},{"StartTime":827.0,"Position":218.922379,"HyperDash":false},{"StartTime":913.0,"Position":255.565826,"HyperDash":false},{"StartTime":999.0,"Position":306.3156,"HyperDash":false},{"StartTime":1085.0,"Position":315.164,"HyperDash":false},{"StartTime":1152.0,"Position":325.552582,"HyperDash":false},{"StartTime":1256.0,"Position":328.091736,"HyperDash":false}]},{"StartTime":1599.0,"Objects":[{"StartTime":1599.0,"Position":256.0,"HyperDash":false},{"StartTime":1684.0,"Position":241.0,"HyperDash":false},{"StartTime":1770.0,"Position":256.0,"HyperDash":false},{"StartTime":1855.0,"Position":244.0,"HyperDash":false},{"StartTime":1941.0,"Position":256.0,"HyperDash":false},{"StartTime":2027.0,"Position":252.0,"HyperDash":false},{"StartTime":2113.0,"Position":256.0,"HyperDash":false},{"StartTime":2198.0,"Position":260.0,"HyperDash":false},{"StartTime":2284.0,"Position":256.0,"HyperDash":false},{"StartTime":2370.0,"Position":247.0,"HyperDash":false},{"StartTime":2456.0,"Position":256.0,"HyperDash":false},{"StartTime":2523.0,"Position":237.0,"HyperDash":false},{"StartTime":2627.0,"Position":256.0,"HyperDash":false}]},{"StartTime":2971.0,"Objects":[{"StartTime":2971.0,"Position":256.0,"HyperDash":false}]},{"StartTime":3313.0,"Objects":[{"StartTime":3313.0,"Position":128.0,"HyperDash":false}]},{"StartTime":3656.0,"Objects":[{"StartTime":3656.0,"Position":128.0,"HyperDash":false},{"StartTime":3741.0,"Position":119.0,"HyperDash":false},{"StartTime":3827.0,"Position":128.0,"HyperDash":false},{"StartTime":3894.0,"Position":146.0,"HyperDash":false},{"StartTime":3998.0,"Position":128.0,"HyperDash":false}]},{"StartTime":4342.0,"Objects":[{"StartTime":4342.0,"Position":384.0,"HyperDash":false},{"StartTime":4427.0,"Position":401.0,"HyperDash":false},{"StartTime":4513.0,"Position":384.0,"HyperDash":false},{"StartTime":4580.0,"Position":397.0,"HyperDash":false},{"StartTime":4684.0,"Position":384.0,"HyperDash":false}]},{"StartTime":4856.0,"Objects":[{"StartTime":4856.0,"Position":384.0,"HyperDash":false}]},{"StartTime":5028.0,"Objects":[{"StartTime":5028.0,"Position":384.0,"HyperDash":false}]},{"StartTime":5371.0,"Objects":[{"StartTime":5371.0,"Position":256.0,"HyperDash":false}]},{"StartTime":5713.0,"Objects":[{"StartTime":5713.0,"Position":256.0,"HyperDash":false}]},{"StartTime":6056.0,"Objects":[{"StartTime":6056.0,"Position":128.0,"HyperDash":false},{"StartTime":6141.0,"Position":88.01805,"HyperDash":false},{"StartTime":6227.0,"Position":72.0,"HyperDash":false},{"StartTime":6294.0,"Position":85.0,"HyperDash":false},{"StartTime":6398.0,"Position":72.0,"HyperDash":false}]},{"StartTime":6742.0,"Objects":[{"StartTime":6742.0,"Position":384.0,"HyperDash":false},{"StartTime":6827.0,"Position":410.981934,"HyperDash":false},{"StartTime":6913.0,"Position":440.0,"HyperDash":false},{"StartTime":6980.0,"Position":425.0,"HyperDash":false},{"StartTime":7084.0,"Position":440.0,"HyperDash":false}]},{"StartTime":7428.0,"Objects":[{"StartTime":7428.0,"Position":256.0,"HyperDash":false},{"StartTime":7513.0,"Position":243.6103,"HyperDash":false},{"StartTime":7599.0,"Position":259.546265,"HyperDash":false},{"StartTime":7684.0,"Position":282.3688,"HyperDash":false},{"StartTime":7770.0,"Position":257.824768,"HyperDash":false},{"StartTime":7856.0,"Position":253.344818,"HyperDash":false},{"StartTime":7942.0,"Position":259.546265,"HyperDash":false},{"StartTime":8009.0,"Position":232.678436,"HyperDash":false},{"StartTime":8113.0,"Position":256.0,"HyperDash":false}]},{"StartTime":8456.0,"Objects":[{"StartTime":8456.0,"Position":256.0,"HyperDash":false}]},{"StartTime":8799.0,"Objects":[{"StartTime":8799.0,"Position":428.0,"HyperDash":false},{"StartTime":8874.0,"Position":243.0,"HyperDash":false},{"StartTime":8949.0,"Position":422.0,"HyperDash":false},{"StartTime":9024.0,"Position":481.0,"HyperDash":false},{"StartTime":9099.0,"Position":104.0,"HyperDash":false},{"StartTime":9174.0,"Position":473.0,"HyperDash":false},{"StartTime":9249.0,"Position":135.0,"HyperDash":false},{"StartTime":9324.0,"Position":360.0,"HyperDash":false},{"StartTime":9399.0,"Position":123.0,"HyperDash":false},{"StartTime":9474.0,"Position":42.0,"HyperDash":false},{"StartTime":9549.0,"Position":393.0,"HyperDash":false},{"StartTime":9624.0,"Position":75.0,"HyperDash":false},{"StartTime":9699.0,"Position":377.0,"HyperDash":false},{"StartTime":9774.0,"Position":354.0,"HyperDash":false},{"StartTime":9849.0,"Position":287.0,"HyperDash":false},{"StartTime":9924.0,"Position":361.0,"HyperDash":false},{"StartTime":9999.0,"Position":479.0,"HyperDash":false},{"StartTime":10074.0,"Position":346.0,"HyperDash":false},{"StartTime":10149.0,"Position":266.0,"HyperDash":false},{"StartTime":10224.0,"Position":400.0,"HyperDash":false},{"StartTime":10299.0,"Position":202.0,"HyperDash":false},{"StartTime":10374.0,"Position":500.0,"HyperDash":false},{"StartTime":10449.0,"Position":80.0,"HyperDash":false},{"StartTime":10524.0,"Position":399.0,"HyperDash":false},{"StartTime":10599.0,"Position":455.0,"HyperDash":false},{"StartTime":10674.0,"Position":105.0,"HyperDash":false},{"StartTime":10749.0,"Position":100.0,"HyperDash":false},{"StartTime":10824.0,"Position":195.0,"HyperDash":false},{"StartTime":10899.0,"Position":106.0,"HyperDash":false},{"StartTime":10974.0,"Position":305.0,"HyperDash":false},{"StartTime":11049.0,"Position":225.0,"HyperDash":false},{"StartTime":11124.0,"Position":79.0,"HyperDash":false},{"StartTime":11199.0,"Position":38.0,"HyperDash":false}]},{"StartTime":11542.0,"Objects":[{"StartTime":11542.0,"Position":256.0,"HyperDash":false}]},{"StartTime":11885.0,"Objects":[{"StartTime":11885.0,"Position":60.0,"HyperDash":false},{"StartTime":11970.0,"Position":34.9856834,"HyperDash":false},{"StartTime":12056.0,"Position":54.15636,"HyperDash":false},{"StartTime":12141.0,"Position":60.52591,"HyperDash":false},{"StartTime":12227.0,"Position":114.312965,"HyperDash":false},{"StartTime":12313.0,"Position":82.90555,"HyperDash":false},{"StartTime":12399.0,"Position":54.15636,"HyperDash":false},{"StartTime":12466.0,"Position":53.6008873,"HyperDash":false},{"StartTime":12570.0,"Position":60.0,"HyperDash":false}]},{"StartTime":12913.0,"Objects":[{"StartTime":12913.0,"Position":256.0,"HyperDash":false}]},{"StartTime":13256.0,"Objects":[{"StartTime":13256.0,"Position":452.0,"HyperDash":false},{"StartTime":13341.0,"Position":477.0143,"HyperDash":false},{"StartTime":13427.0,"Position":457.843628,"HyperDash":false},{"StartTime":13512.0,"Position":425.4741,"HyperDash":false},{"StartTime":13598.0,"Position":397.687042,"HyperDash":false},{"StartTime":13684.0,"Position":442.094452,"HyperDash":false},{"StartTime":13770.0,"Position":457.843628,"HyperDash":false},{"StartTime":13837.0,"Position":471.3991,"HyperDash":false},{"StartTime":13941.0,"Position":452.0,"HyperDash":false}]},{"StartTime":14285.0,"Objects":[{"StartTime":14285.0,"Position":256.0,"HyperDash":false}]},{"StartTime":14799.0,"Objects":[{"StartTime":14799.0,"Position":88.0,"HyperDash":false},{"StartTime":14884.0,"Position":60.0,"HyperDash":false},{"StartTime":14970.0,"Position":88.0,"HyperDash":false},{"StartTime":15056.0,"Position":60.0,"HyperDash":false},{"StartTime":15141.0,"Position":88.0,"HyperDash":false},{"StartTime":15227.0,"Position":60.0,"HyperDash":false},{"StartTime":15313.0,"Position":88.0,"HyperDash":false},{"StartTime":15399.0,"Position":60.0,"HyperDash":false},{"StartTime":15484.0,"Position":88.0,"HyperDash":false},{"StartTime":15570.0,"Position":60.0,"HyperDash":false},{"StartTime":15656.0,"Position":88.0,"HyperDash":false}]},{"StartTime":15999.0,"Objects":[{"StartTime":15999.0,"Position":32.0,"HyperDash":false}]},{"StartTime":16171.0,"Objects":[{"StartTime":16171.0,"Position":96.0,"HyperDash":false}]},{"StartTime":16342.0,"Objects":[{"StartTime":16342.0,"Position":160.0,"HyperDash":false}]},{"StartTime":16685.0,"Objects":[{"StartTime":16685.0,"Position":224.0,"HyperDash":false}]},{"StartTime":17028.0,"Objects":[{"StartTime":17028.0,"Position":328.0,"HyperDash":false},{"StartTime":17095.0,"Position":334.2591,"HyperDash":false},{"StartTime":17199.0,"Position":349.0792,"HyperDash":false}]},{"StartTime":17371.0,"Objects":[{"StartTime":17371.0,"Position":412.0,"HyperDash":false},{"StartTime":17438.0,"Position":425.881073,"HyperDash":false},{"StartTime":17542.0,"Position":432.114349,"HyperDash":false}]},{"StartTime":17713.0,"Objects":[{"StartTime":17713.0,"Position":448.0,"HyperDash":false},{"StartTime":17780.0,"Position":467.063019,"HyperDash":false},{"StartTime":17884.0,"Position":511.9668,"HyperDash":false}]},{"StartTime":18056.0,"Objects":[{"StartTime":18056.0,"Position":472.0,"HyperDash":false},{"StartTime":18123.0,"Position":439.87265,"HyperDash":false},{"StartTime":18227.0,"Position":407.869,"HyperDash":false}]},{"StartTime":18399.0,"Objects":[{"StartTime":18399.0,"Position":388.0,"HyperDash":false},{"StartTime":18466.0,"Position":396.55722,"HyperDash":false},{"StartTime":18570.0,"Position":361.3475,"HyperDash":false}]},{"StartTime":18742.0,"Objects":[{"StartTime":18742.0,"Position":300.0,"HyperDash":false},{"StartTime":18809.0,"Position":305.44278,"HyperDash":false},{"StartTime":18913.0,"Position":326.6525,"HyperDash":false}]},{"StartTime":19085.0,"Objects":[{"StartTime":19085.0,"Position":344.0,"HyperDash":false}]},{"StartTime":19428.0,"Objects":[{"StartTime":19428.0,"Position":156.0,"HyperDash":false}]},{"StartTime":19771.0,"Objects":[{"StartTime":19771.0,"Position":256.0,"HyperDash":false}]},{"StartTime":20456.0,"Objects":[{"StartTime":20456.0,"Position":256.0,"HyperDash":false}]},{"StartTime":21142.0,"Objects":[{"StartTime":21142.0,"Position":124.0,"HyperDash":false}]},{"StartTime":21485.0,"Objects":[{"StartTime":21485.0,"Position":256.0,"HyperDash":false}]},{"StartTime":21828.0,"Objects":[{"StartTime":21828.0,"Position":388.0,"HyperDash":false}]},{"StartTime":22513.0,"Objects":[{"StartTime":22513.0,"Position":504.0,"HyperDash":false},{"StartTime":22580.0,"Position":476.5731,"HyperDash":false},{"StartTime":22684.0,"Position":434.0,"HyperDash":false}]},{"StartTime":22856.0,"Objects":[{"StartTime":22856.0,"Position":448.0,"HyperDash":false}]},{"StartTime":23028.0,"Objects":[{"StartTime":23028.0,"Position":376.0,"HyperDash":false}]},{"StartTime":23199.0,"Objects":[{"StartTime":23199.0,"Position":360.0,"HyperDash":false},{"StartTime":23266.0,"Position":347.5731,"HyperDash":false},{"StartTime":23370.0,"Position":290.0,"HyperDash":false}]},{"StartTime":23542.0,"Objects":[{"StartTime":23542.0,"Position":304.0,"HyperDash":false}]},{"StartTime":23713.0,"Objects":[{"StartTime":23713.0,"Position":232.0,"HyperDash":false}]},{"StartTime":23885.0,"Objects":[{"StartTime":23885.0,"Position":216.0,"HyperDash":false},{"StartTime":23952.0,"Position":172.5731,"HyperDash":false},{"StartTime":24056.0,"Position":146.0,"HyperDash":false}]},{"StartTime":24228.0,"Objects":[{"StartTime":24228.0,"Position":160.0,"HyperDash":false}]},{"StartTime":24399.0,"Objects":[{"StartTime":24399.0,"Position":88.0,"HyperDash":false}]},{"StartTime":24571.0,"Objects":[{"StartTime":24571.0,"Position":72.0,"HyperDash":false},{"StartTime":24656.0,"Position":54.2046776,"HyperDash":false},{"StartTime":24742.0,"Position":2.0,"HyperDash":false},{"StartTime":24809.0,"Position":32.4269028,"HyperDash":false},{"StartTime":24913.0,"Position":72.0,"HyperDash":false}]},{"StartTime":25256.0,"Objects":[{"StartTime":25256.0,"Position":8.0,"HyperDash":false},{"StartTime":25323.0,"Position":31.4269028,"HyperDash":false},{"StartTime":25427.0,"Position":78.0,"HyperDash":false}]},{"StartTime":25599.0,"Objects":[{"StartTime":25599.0,"Position":64.0,"HyperDash":false}]},{"StartTime":25771.0,"Objects":[{"StartTime":25771.0,"Position":136.0,"HyperDash":false}]},{"StartTime":25942.0,"Objects":[{"StartTime":25942.0,"Position":152.0,"HyperDash":false},{"StartTime":26009.0,"Position":187.4269,"HyperDash":false},{"StartTime":26113.0,"Position":222.0,"HyperDash":false}]},{"StartTime":26285.0,"Objects":[{"StartTime":26285.0,"Position":208.0,"HyperDash":false}]},{"StartTime":26456.0,"Objects":[{"StartTime":26456.0,"Position":280.0,"HyperDash":false}]},{"StartTime":26628.0,"Objects":[{"StartTime":26628.0,"Position":296.0,"HyperDash":false},{"StartTime":26695.0,"Position":322.4269,"HyperDash":false},{"StartTime":26799.0,"Position":366.0,"HyperDash":false}]},{"StartTime":26971.0,"Objects":[{"StartTime":26971.0,"Position":352.0,"HyperDash":false}]},{"StartTime":27142.0,"Objects":[{"StartTime":27142.0,"Position":424.0,"HyperDash":false}]},{"StartTime":27313.0,"Objects":[{"StartTime":27313.0,"Position":440.0,"HyperDash":false},{"StartTime":27398.0,"Position":489.795319,"HyperDash":false},{"StartTime":27484.0,"Position":510.0,"HyperDash":false},{"StartTime":27551.0,"Position":470.5731,"HyperDash":false},{"StartTime":27655.0,"Position":440.0,"HyperDash":false}]},{"StartTime":27999.0,"Objects":[{"StartTime":27999.0,"Position":40.0,"HyperDash":false},{"StartTime":28066.0,"Position":24.0,"HyperDash":false},{"StartTime":28170.0,"Position":40.0,"HyperDash":false}]},{"StartTime":28342.0,"Objects":[{"StartTime":28342.0,"Position":112.0,"HyperDash":false},{"StartTime":28427.0,"Position":112.0,"HyperDash":false},{"StartTime":28513.0,"Position":112.0,"HyperDash":false}]},{"StartTime":28685.0,"Objects":[{"StartTime":28685.0,"Position":184.0,"HyperDash":false},{"StartTime":28752.0,"Position":177.0,"HyperDash":false},{"StartTime":28856.0,"Position":184.0,"HyperDash":false}]},{"StartTime":29028.0,"Objects":[{"StartTime":29028.0,"Position":260.0,"HyperDash":false},{"StartTime":29113.0,"Position":260.0,"HyperDash":false},{"StartTime":29199.0,"Position":260.0,"HyperDash":false}]},{"StartTime":29371.0,"Objects":[{"StartTime":29371.0,"Position":336.0,"HyperDash":false},{"StartTime":29438.0,"Position":333.2137,"HyperDash":false},{"StartTime":29542.0,"Position":374.829,"HyperDash":false}]},{"StartTime":29713.0,"Objects":[{"StartTime":29713.0,"Position":440.0,"HyperDash":false},{"StartTime":29780.0,"Position":420.18338,"HyperDash":false},{"StartTime":29884.0,"Position":399.632172,"HyperDash":false}]},{"StartTime":30056.0,"Objects":[{"StartTime":30056.0,"Position":460.0,"HyperDash":false},{"StartTime":30141.0,"Position":479.41452,"HyperDash":false},{"StartTime":30227.0,"Position":460.0,"HyperDash":false},{"StartTime":30313.0,"Position":479.41452,"HyperDash":false},{"StartTime":30398.0,"Position":460.0,"HyperDash":false}]},{"StartTime":30742.0,"Objects":[{"StartTime":30742.0,"Position":328.0,"HyperDash":false},{"StartTime":30827.0,"Position":293.0,"HyperDash":false},{"StartTime":30913.0,"Position":328.0,"HyperDash":false},{"StartTime":30999.0,"Position":293.0,"HyperDash":false}]},{"StartTime":31085.0,"Objects":[{"StartTime":31085.0,"Position":256.0,"HyperDash":false},{"StartTime":31170.0,"Position":221.0,"HyperDash":false},{"StartTime":31256.0,"Position":256.0,"HyperDash":false},{"StartTime":31342.0,"Position":221.0,"HyperDash":false}]},{"StartTime":31428.0,"Objects":[{"StartTime":31428.0,"Position":184.0,"HyperDash":false},{"StartTime":31513.0,"Position":149.0,"HyperDash":false},{"StartTime":31599.0,"Position":184.0,"HyperDash":false},{"StartTime":31685.0,"Position":149.0,"HyperDash":false}]},{"StartTime":31771.0,"Objects":[{"StartTime":31771.0,"Position":112.0,"HyperDash":false},{"StartTime":31856.0,"Position":77.0,"HyperDash":false},{"StartTime":31942.0,"Position":112.0,"HyperDash":false},{"StartTime":32028.0,"Position":77.0,"HyperDash":false}]},{"StartTime":32113.0,"Objects":[{"StartTime":32113.0,"Position":40.0,"HyperDash":false}]},{"StartTime":32456.0,"Objects":[{"StartTime":32456.0,"Position":40.0,"HyperDash":false}]},{"StartTime":32799.0,"Objects":[{"StartTime":32799.0,"Position":184.0,"HyperDash":false}]},{"StartTime":33142.0,"Objects":[{"StartTime":33142.0,"Position":184.0,"HyperDash":false}]},{"StartTime":33485.0,"Objects":[{"StartTime":33485.0,"Position":304.0,"HyperDash":false},{"StartTime":33570.0,"Position":332.600983,"HyperDash":false},{"StartTime":33656.0,"Position":351.4796,"HyperDash":false},{"StartTime":33723.0,"Position":368.082733,"HyperDash":false},{"StartTime":33827.0,"Position":398.9592,"HyperDash":false}]},{"StartTime":34342.0,"Objects":[{"StartTime":34342.0,"Position":256.0,"HyperDash":false}]},{"StartTime":34513.0,"Objects":[{"StartTime":34513.0,"Position":256.0,"HyperDash":false}]},{"StartTime":34856.0,"Objects":[{"StartTime":34856.0,"Position":136.0,"HyperDash":false},{"StartTime":34941.0,"Position":152.0,"HyperDash":false},{"StartTime":35027.0,"Position":136.0,"HyperDash":false},{"StartTime":35094.0,"Position":150.0,"HyperDash":false},{"StartTime":35198.0,"Position":136.0,"HyperDash":false}]},{"StartTime":35371.0,"Objects":[{"StartTime":35371.0,"Position":104.0,"HyperDash":false},{"StartTime":35456.0,"Position":124.558014,"HyperDash":false},{"StartTime":35542.0,"Position":170.988922,"HyperDash":false},{"StartTime":35609.0,"Position":180.576416,"HyperDash":false},{"StartTime":35713.0,"Position":209.857956,"HyperDash":false}]},{"StartTime":35885.0,"Objects":[{"StartTime":35885.0,"Position":212.0,"HyperDash":false}]},{"StartTime":36228.0,"Objects":[{"StartTime":36228.0,"Position":408.0,"HyperDash":false},{"StartTime":36313.0,"Position":441.692383,"HyperDash":false},{"StartTime":36399.0,"Position":463.7653,"HyperDash":false},{"StartTime":36466.0,"Position":471.929932,"HyperDash":false},{"StartTime":36570.0,"Position":480.400452,"HyperDash":false}]},{"StartTime":37085.0,"Objects":[{"StartTime":37085.0,"Position":360.0,"HyperDash":false}]},{"StartTime":37256.0,"Objects":[{"StartTime":37256.0,"Position":360.0,"HyperDash":false}]},{"StartTime":37599.0,"Objects":[{"StartTime":37599.0,"Position":232.0,"HyperDash":false},{"StartTime":37684.0,"Position":186.367691,"HyperDash":false},{"StartTime":37770.0,"Position":175.2116,"HyperDash":false},{"StartTime":37837.0,"Position":153.710571,"HyperDash":false},{"StartTime":37941.0,"Position":106.279663,"HyperDash":false}]},{"StartTime":38113.0,"Objects":[{"StartTime":38113.0,"Position":56.0,"HyperDash":false},{"StartTime":38198.0,"Position":39.6659164,"HyperDash":false},{"StartTime":38284.0,"Position":38.9134,"HyperDash":false},{"StartTime":38351.0,"Position":31.39479,"HyperDash":false},{"StartTime":38455.0,"Position":85.0976944,"HyperDash":false}]},{"StartTime":38628.0,"Objects":[{"StartTime":38628.0,"Position":156.0,"HyperDash":false}]},{"StartTime":38971.0,"Objects":[{"StartTime":38971.0,"Position":256.0,"HyperDash":false},{"StartTime":39056.0,"Position":221.399033,"HyperDash":false},{"StartTime":39142.0,"Position":208.5204,"HyperDash":false},{"StartTime":39209.0,"Position":182.917267,"HyperDash":false},{"StartTime":39313.0,"Position":161.0408,"HyperDash":false}]},{"StartTime":39828.0,"Objects":[{"StartTime":39828.0,"Position":256.0,"HyperDash":false}]},{"StartTime":39999.0,"Objects":[{"StartTime":39999.0,"Position":256.0,"HyperDash":false}]},{"StartTime":40342.0,"Objects":[{"StartTime":40342.0,"Position":376.0,"HyperDash":false},{"StartTime":40427.0,"Position":392.0,"HyperDash":false},{"StartTime":40513.0,"Position":376.0,"HyperDash":false},{"StartTime":40580.0,"Position":369.0,"HyperDash":false},{"StartTime":40684.0,"Position":376.0,"HyperDash":false}]},{"StartTime":40856.0,"Objects":[{"StartTime":40856.0,"Position":408.0,"HyperDash":false},{"StartTime":40941.0,"Position":355.442,"HyperDash":false},{"StartTime":41027.0,"Position":341.011078,"HyperDash":false},{"StartTime":41094.0,"Position":333.423584,"HyperDash":false},{"StartTime":41198.0,"Position":302.142059,"HyperDash":false}]},{"StartTime":41371.0,"Objects":[{"StartTime":41371.0,"Position":300.0,"HyperDash":false}]},{"StartTime":41713.0,"Objects":[{"StartTime":41713.0,"Position":104.0,"HyperDash":false},{"StartTime":41798.0,"Position":74.30763,"HyperDash":false},{"StartTime":41884.0,"Position":48.23472,"HyperDash":false},{"StartTime":41951.0,"Position":33.07008,"HyperDash":false},{"StartTime":42055.0,"Position":31.59955,"HyperDash":false}]},{"StartTime":42571.0,"Objects":[{"StartTime":42571.0,"Position":152.0,"HyperDash":false}]},{"StartTime":42742.0,"Objects":[{"StartTime":42742.0,"Position":152.0,"HyperDash":false}]},{"StartTime":43085.0,"Objects":[{"StartTime":43085.0,"Position":256.0,"HyperDash":false},{"StartTime":43170.0,"Position":256.0,"HyperDash":false},{"StartTime":43256.0,"Position":256.0,"HyperDash":false},{"StartTime":43342.0,"Position":256.0,"HyperDash":false},{"StartTime":43427.0,"Position":256.0,"HyperDash":false},{"StartTime":43513.0,"Position":256.0,"HyperDash":false},{"StartTime":43599.0,"Position":256.0,"HyperDash":false},{"StartTime":43685.0,"Position":256.0,"HyperDash":false},{"StartTime":43770.0,"Position":256.0,"HyperDash":false}]},{"StartTime":44113.0,"Objects":[{"StartTime":44113.0,"Position":256.0,"HyperDash":false}]},{"StartTime":44456.0,"Objects":[{"StartTime":44456.0,"Position":124.0,"HyperDash":false}]},{"StartTime":44628.0,"Objects":[{"StartTime":44628.0,"Position":72.0,"HyperDash":false},{"StartTime":44713.0,"Position":40.92307,"HyperDash":false},{"StartTime":44799.0,"Position":52.98573,"HyperDash":false},{"StartTime":44884.0,"Position":77.93154,"HyperDash":false},{"StartTime":44970.0,"Position":95.82509,"HyperDash":false},{"StartTime":45038.0,"Position":118.951027,"HyperDash":false},{"StartTime":45142.0,"Position":163.988525,"HyperDash":false}]},{"StartTime":45485.0,"Objects":[{"StartTime":45485.0,"Position":256.0,"HyperDash":false}]},{"StartTime":45828.0,"Objects":[{"StartTime":45828.0,"Position":388.0,"HyperDash":false}]},{"StartTime":45999.0,"Objects":[{"StartTime":45999.0,"Position":440.0,"HyperDash":false},{"StartTime":46084.0,"Position":441.0769,"HyperDash":false},{"StartTime":46170.0,"Position":459.014282,"HyperDash":false},{"StartTime":46255.0,"Position":425.068451,"HyperDash":false},{"StartTime":46341.0,"Position":416.174927,"HyperDash":false},{"StartTime":46409.0,"Position":398.048981,"HyperDash":false},{"StartTime":46513.0,"Position":348.011475,"HyperDash":false}]},{"StartTime":46856.0,"Objects":[{"StartTime":46856.0,"Position":256.0,"HyperDash":false}]},{"StartTime":47199.0,"Objects":[{"StartTime":47199.0,"Position":256.0,"HyperDash":false},{"StartTime":47284.0,"Position":244.431641,"HyperDash":false},{"StartTime":47370.0,"Position":255.566513,"HyperDash":false},{"StartTime":47455.0,"Position":277.621033,"HyperDash":false},{"StartTime":47541.0,"Position":254.8021,"HyperDash":false},{"StartTime":47627.0,"Position":267.5996,"HyperDash":false},{"StartTime":47713.0,"Position":255.632889,"HyperDash":false},{"StartTime":47798.0,"Position":231.420425,"HyperDash":false},{"StartTime":47884.0,"Position":256.0,"HyperDash":false},{"StartTime":47970.0,"Position":247.424866,"HyperDash":false},{"StartTime":48056.0,"Position":255.699265,"HyperDash":false},{"StartTime":48123.0,"Position":258.327057,"HyperDash":false},{"StartTime":48227.0,"Position":254.8021,"HyperDash":false}]},{"StartTime":48571.0,"Objects":[{"StartTime":48571.0,"Position":392.0,"HyperDash":false},{"StartTime":48656.0,"Position":373.0,"HyperDash":false},{"StartTime":48742.0,"Position":392.0,"HyperDash":false},{"StartTime":48809.0,"Position":387.0,"HyperDash":false},{"StartTime":48913.0,"Position":392.0,"HyperDash":false}]},{"StartTime":49085.0,"Objects":[{"StartTime":49085.0,"Position":464.0,"HyperDash":false},{"StartTime":49170.0,"Position":434.350128,"HyperDash":false},{"StartTime":49256.0,"Position":431.4105,"HyperDash":false},{"StartTime":49341.0,"Position":405.503876,"HyperDash":false},{"StartTime":49427.0,"Position":365.203827,"HyperDash":false},{"StartTime":49495.0,"Position":336.536133,"HyperDash":false},{"StartTime":49599.0,"Position":324.364319,"HyperDash":false}]},{"StartTime":49942.0,"Objects":[{"StartTime":49942.0,"Position":187.0,"HyperDash":false},{"StartTime":50027.0,"Position":163.228943,"HyperDash":false},{"StartTime":50113.0,"Position":148.783264,"HyperDash":false},{"StartTime":50198.0,"Position":108.904266,"HyperDash":false},{"StartTime":50284.0,"Position":81.87666,"HyperDash":false},{"StartTime":50352.0,"Position":62.3181648,"HyperDash":false},{"StartTime":50456.0,"Position":47.9551849,"HyperDash":false}]},{"StartTime":50628.0,"Objects":[{"StartTime":50628.0,"Position":120.0,"HyperDash":false},{"StartTime":50713.0,"Position":106.0,"HyperDash":false},{"StartTime":50799.0,"Position":120.0,"HyperDash":false},{"StartTime":50866.0,"Position":135.0,"HyperDash":false},{"StartTime":50970.0,"Position":120.0,"HyperDash":false}]},{"StartTime":51313.0,"Objects":[{"StartTime":51313.0,"Position":257.0,"HyperDash":false},{"StartTime":51398.0,"Position":234.050232,"HyperDash":false},{"StartTime":51484.0,"Position":255.277374,"HyperDash":false},{"StartTime":51569.0,"Position":284.5524,"HyperDash":false},{"StartTime":51655.0,"Position":256.423248,"HyperDash":false},{"StartTime":51741.0,"Position":248.555389,"HyperDash":false},{"StartTime":51827.0,"Position":255.347473,"HyperDash":false},{"StartTime":51912.0,"Position":263.0151,"HyperDash":false},{"StartTime":51998.0,"Position":257.0,"HyperDash":false},{"StartTime":52084.0,"Position":228.030624,"HyperDash":false},{"StartTime":52170.0,"Position":255.417587,"HyperDash":false},{"StartTime":52237.0,"Position":278.820038,"HyperDash":false},{"StartTime":52341.0,"Position":256.423248,"HyperDash":false}]},{"StartTime":52685.0,"Objects":[{"StartTime":52685.0,"Position":256.0,"HyperDash":false}]},{"StartTime":53028.0,"Objects":[{"StartTime":53028.0,"Position":169.0,"HyperDash":false},{"StartTime":53113.0,"Position":148.767334,"HyperDash":false},{"StartTime":53199.0,"Position":102.039978,"HyperDash":false},{"StartTime":53284.0,"Position":65.15436,"HyperDash":false},{"StartTime":53370.0,"Position":56.49534,"HyperDash":false},{"StartTime":53438.0,"Position":50.6727638,"HyperDash":false},{"StartTime":53542.0,"Position":72.11841,"HyperDash":false}]},{"StartTime":53713.0,"Objects":[{"StartTime":53713.0,"Position":124.0,"HyperDash":false}]},{"StartTime":54056.0,"Objects":[{"StartTime":54056.0,"Position":68.0,"HyperDash":false},{"StartTime":54141.0,"Position":56.93203,"HyperDash":false},{"StartTime":54227.0,"Position":68.0,"HyperDash":false}]},{"StartTime":54399.0,"Objects":[{"StartTime":54399.0,"Position":156.0,"HyperDash":false}]},{"StartTime":54742.0,"Objects":[{"StartTime":54742.0,"Position":444.0,"HyperDash":false},{"StartTime":54827.0,"Position":455.067963,"HyperDash":false},{"StartTime":54913.0,"Position":444.0,"HyperDash":false}]},{"StartTime":55085.0,"Objects":[{"StartTime":55085.0,"Position":356.0,"HyperDash":false}]},{"StartTime":55428.0,"Objects":[{"StartTime":55428.0,"Position":356.0,"HyperDash":false},{"StartTime":55513.0,"Position":335.3816,"HyperDash":false},{"StartTime":55599.0,"Position":294.1601,"HyperDash":false},{"StartTime":55684.0,"Position":272.865723,"HyperDash":false},{"StartTime":55770.0,"Position":255.69072,"HyperDash":false},{"StartTime":55856.0,"Position":254.907425,"HyperDash":false},{"StartTime":55942.0,"Position":216.981689,"HyperDash":false},{"StartTime":56009.0,"Position":188.30954,"HyperDash":false},{"StartTime":56113.0,"Position":154.812271,"HyperDash":false}]},{"StartTime":56285.0,"Objects":[{"StartTime":56285.0,"Position":160.0,"HyperDash":false}]},{"StartTime":56456.0,"Objects":[{"StartTime":56456.0,"Position":92.0,"HyperDash":false}]},{"StartTime":56628.0,"Objects":[{"StartTime":56628.0,"Position":84.0,"HyperDash":false}]},{"StartTime":56799.0,"Objects":[{"StartTime":56799.0,"Position":156.0,"HyperDash":false},{"StartTime":56884.0,"Position":179.6867,"HyperDash":false},{"StartTime":56970.0,"Position":184.530014,"HyperDash":false},{"StartTime":57055.0,"Position":210.992,"HyperDash":false},{"StartTime":57141.0,"Position":239.917923,"HyperDash":false},{"StartTime":57227.0,"Position":197.399063,"HyperDash":false},{"StartTime":57313.0,"Position":182.462265,"HyperDash":false},{"StartTime":57380.0,"Position":158.21933,"HyperDash":false},{"StartTime":57484.0,"Position":155.038208,"HyperDash":false}]},{"StartTime":57656.0,"Objects":[{"StartTime":57656.0,"Position":92.0,"HyperDash":false}]},{"StartTime":57828.0,"Objects":[{"StartTime":57828.0,"Position":88.0,"HyperDash":false}]},{"StartTime":57999.0,"Objects":[{"StartTime":57999.0,"Position":148.0,"HyperDash":false}]},{"StartTime":58171.0,"Objects":[{"StartTime":58171.0,"Position":155.0,"HyperDash":false},{"StartTime":58256.0,"Position":190.6184,"HyperDash":false},{"StartTime":58342.0,"Position":216.83992,"HyperDash":false},{"StartTime":58427.0,"Position":255.134277,"HyperDash":false},{"StartTime":58513.0,"Position":255.3093,"HyperDash":false},{"StartTime":58599.0,"Position":262.09256,"HyperDash":false},{"StartTime":58685.0,"Position":294.0183,"HyperDash":false},{"StartTime":58752.0,"Position":306.69046,"HyperDash":false},{"StartTime":58856.0,"Position":356.187744,"HyperDash":false}]},{"StartTime":59028.0,"Objects":[{"StartTime":59028.0,"Position":356.0,"HyperDash":false}]},{"StartTime":59199.0,"Objects":[{"StartTime":59199.0,"Position":424.0,"HyperDash":false}]},{"StartTime":59371.0,"Objects":[{"StartTime":59371.0,"Position":428.0,"HyperDash":false}]},{"StartTime":59542.0,"Objects":[{"StartTime":59542.0,"Position":356.0,"HyperDash":false},{"StartTime":59627.0,"Position":337.313324,"HyperDash":false},{"StartTime":59713.0,"Position":327.469971,"HyperDash":false},{"StartTime":59798.0,"Position":290.008,"HyperDash":false},{"StartTime":59884.0,"Position":272.0821,"HyperDash":false},{"StartTime":59970.0,"Position":294.600952,"HyperDash":false},{"StartTime":60056.0,"Position":329.53775,"HyperDash":false},{"StartTime":60123.0,"Position":351.78067,"HyperDash":false},{"StartTime":60227.0,"Position":356.9618,"HyperDash":false}]},{"StartTime":60399.0,"Objects":[{"StartTime":60399.0,"Position":424.0,"HyperDash":false}]},{"StartTime":60571.0,"Objects":[{"StartTime":60571.0,"Position":428.0,"HyperDash":false}]},{"StartTime":60742.0,"Objects":[{"StartTime":60742.0,"Position":360.0,"HyperDash":false}]},{"StartTime":60913.0,"Objects":[{"StartTime":60913.0,"Position":284.0,"HyperDash":false},{"StartTime":60980.0,"Position":271.5731,"HyperDash":false},{"StartTime":61084.0,"Position":214.0,"HyperDash":false}]},{"StartTime":61256.0,"Objects":[{"StartTime":61256.0,"Position":136.0,"HyperDash":false}]},{"StartTime":61428.0,"Objects":[{"StartTime":61428.0,"Position":60.0,"HyperDash":false}]},{"StartTime":61513.0,"Objects":[{"StartTime":61513.0,"Position":60.0,"HyperDash":false}]},{"StartTime":61599.0,"Objects":[{"StartTime":61599.0,"Position":60.0,"HyperDash":false},{"StartTime":61666.0,"Position":65.0,"HyperDash":false},{"StartTime":61770.0,"Position":60.0,"HyperDash":false}]},{"StartTime":61942.0,"Objects":[{"StartTime":61942.0,"Position":60.0,"HyperDash":false}]},{"StartTime":62113.0,"Objects":[{"StartTime":62113.0,"Position":136.0,"HyperDash":false}]},{"StartTime":62199.0,"Objects":[{"StartTime":62199.0,"Position":136.0,"HyperDash":false}]},{"StartTime":62285.0,"Objects":[{"StartTime":62285.0,"Position":136.0,"HyperDash":false},{"StartTime":62352.0,"Position":120.0,"HyperDash":false},{"StartTime":62456.0,"Position":136.0,"HyperDash":false}]},{"StartTime":62628.0,"Objects":[{"StartTime":62628.0,"Position":212.0,"HyperDash":false}]},{"StartTime":62799.0,"Objects":[{"StartTime":62799.0,"Position":212.0,"HyperDash":false}]},{"StartTime":62885.0,"Objects":[{"StartTime":62885.0,"Position":212.0,"HyperDash":false}]},{"StartTime":62971.0,"Objects":[{"StartTime":62971.0,"Position":212.0,"HyperDash":false},{"StartTime":63038.0,"Position":195.0,"HyperDash":false},{"StartTime":63142.0,"Position":212.0,"HyperDash":false}]},{"StartTime":63313.0,"Objects":[{"StartTime":63313.0,"Position":136.0,"HyperDash":false},{"StartTime":63380.0,"Position":120.5731,"HyperDash":false},{"StartTime":63484.0,"Position":66.0,"HyperDash":false}]},{"StartTime":63656.0,"Objects":[{"StartTime":63656.0,"Position":356.0,"HyperDash":false},{"StartTime":63741.0,"Position":362.0,"HyperDash":false},{"StartTime":63827.0,"Position":347.0,"HyperDash":false},{"StartTime":63913.0,"Position":252.0,"HyperDash":false},{"StartTime":63999.0,"Position":477.0,"HyperDash":false},{"StartTime":64084.0,"Position":358.0,"HyperDash":false},{"StartTime":64170.0,"Position":17.0,"HyperDash":false},{"StartTime":64256.0,"Position":399.0,"HyperDash":false},{"StartTime":64342.0,"Position":280.0,"HyperDash":false},{"StartTime":64427.0,"Position":304.0,"HyperDash":false},{"StartTime":64513.0,"Position":221.0,"HyperDash":false},{"StartTime":64599.0,"Position":407.0,"HyperDash":false},{"StartTime":64685.0,"Position":287.0,"HyperDash":false},{"StartTime":64770.0,"Position":135.0,"HyperDash":false},{"StartTime":64856.0,"Position":437.0,"HyperDash":false},{"StartTime":64942.0,"Position":289.0,"HyperDash":false},{"StartTime":65028.0,"Position":464.0,"HyperDash":false}]},{"StartTime":65713.0,"Objects":[{"StartTime":65713.0,"Position":256.0,"HyperDash":false},{"StartTime":65798.0,"Position":256.0,"HyperDash":false},{"StartTime":65884.0,"Position":256.0,"HyperDash":false}]},{"StartTime":66056.0,"Objects":[{"StartTime":66056.0,"Position":288.0,"HyperDash":false}]},{"StartTime":66228.0,"Objects":[{"StartTime":66228.0,"Position":328.0,"HyperDash":false}]},{"StartTime":66399.0,"Objects":[{"StartTime":66399.0,"Position":400.0,"HyperDash":false},{"StartTime":66466.0,"Position":404.432526,"HyperDash":false},{"StartTime":66570.0,"Position":443.844757,"HyperDash":false}]},{"StartTime":66742.0,"Objects":[{"StartTime":66742.0,"Position":380.0,"HyperDash":false}]},{"StartTime":66913.0,"Objects":[{"StartTime":66913.0,"Position":444.0,"HyperDash":false},{"StartTime":66980.0,"Position":415.4034,"HyperDash":false},{"StartTime":67084.0,"Position":392.189362,"HyperDash":false}]},{"StartTime":67256.0,"Objects":[{"StartTime":67256.0,"Position":316.0,"HyperDash":false},{"StartTime":67323.0,"Position":306.150818,"HyperDash":false},{"StartTime":67427.0,"Position":300.033234,"HyperDash":false}]},{"StartTime":67599.0,"Objects":[{"StartTime":67599.0,"Position":224.0,"HyperDash":false},{"StartTime":67666.0,"Position":211.175949,"HyperDash":false},{"StartTime":67770.0,"Position":163.867111,"HyperDash":false}]},{"StartTime":67942.0,"Objects":[{"StartTime":67942.0,"Position":104.0,"HyperDash":false},{"StartTime":68009.0,"Position":130.849182,"HyperDash":false},{"StartTime":68113.0,"Position":119.966782,"HyperDash":false}]},{"StartTime":68285.0,"Objects":[{"StartTime":68285.0,"Position":80.0,"HyperDash":false},{"StartTime":68352.0,"Position":100.824059,"HyperDash":false},{"StartTime":68456.0,"Position":140.132889,"HyperDash":false}]},{"StartTime":68628.0,"Objects":[{"StartTime":68628.0,"Position":200.0,"HyperDash":false},{"StartTime":68713.0,"Position":188.823929,"HyperDash":false},{"StartTime":68799.0,"Position":213.728134,"HyperDash":false},{"StartTime":68866.0,"Position":223.349274,"HyperDash":false},{"StartTime":68970.0,"Position":200.0,"HyperDash":false}]},{"StartTime":69142.0,"Objects":[{"StartTime":69142.0,"Position":212.0,"HyperDash":false}]},{"StartTime":69313.0,"Objects":[{"StartTime":69313.0,"Position":256.0,"HyperDash":false}]},{"StartTime":69485.0,"Objects":[{"StartTime":69485.0,"Position":256.0,"HyperDash":false}]},{"StartTime":69656.0,"Objects":[{"StartTime":69656.0,"Position":292.0,"HyperDash":false}]},{"StartTime":69828.0,"Objects":[{"StartTime":69828.0,"Position":292.0,"HyperDash":false}]},{"StartTime":69999.0,"Objects":[{"StartTime":69999.0,"Position":368.0,"HyperDash":false}]},{"StartTime":70085.0,"Objects":[{"StartTime":70085.0,"Position":376.0,"HyperDash":false}]},{"StartTime":70171.0,"Objects":[{"StartTime":70171.0,"Position":384.0,"HyperDash":false}]},{"StartTime":70256.0,"Objects":[{"StartTime":70256.0,"Position":392.0,"HyperDash":false}]},{"StartTime":70342.0,"Objects":[{"StartTime":70342.0,"Position":400.0,"HyperDash":false}]},{"StartTime":70428.0,"Objects":[{"StartTime":70428.0,"Position":408.0,"HyperDash":false}]},{"StartTime":70513.0,"Objects":[{"StartTime":70513.0,"Position":416.0,"HyperDash":false},{"StartTime":70598.0,"Position":442.363953,"HyperDash":false},{"StartTime":70684.0,"Position":451.799652,"HyperDash":false},{"StartTime":70769.0,"Position":450.290955,"HyperDash":false},{"StartTime":70855.0,"Position":444.293518,"HyperDash":false},{"StartTime":70941.0,"Position":469.222717,"HyperDash":false},{"StartTime":71027.0,"Position":451.823273,"HyperDash":false},{"StartTime":71112.0,"Position":447.6526,"HyperDash":false},{"StartTime":71198.0,"Position":416.0,"HyperDash":false},{"StartTime":71284.0,"Position":452.508881,"HyperDash":false},{"StartTime":71370.0,"Position":451.846527,"HyperDash":false},{"StartTime":71437.0,"Position":457.989929,"HyperDash":false},{"StartTime":71541.0,"Position":444.293518,"HyperDash":false}]},{"StartTime":71885.0,"Objects":[{"StartTime":71885.0,"Position":312.0,"HyperDash":false}]},{"StartTime":72056.0,"Objects":[{"StartTime":72056.0,"Position":312.0,"HyperDash":false}]},{"StartTime":72228.0,"Objects":[{"StartTime":72228.0,"Position":224.0,"HyperDash":false}]},{"StartTime":72313.0,"Objects":[{"StartTime":72313.0,"Position":216.0,"HyperDash":false}]},{"StartTime":72399.0,"Objects":[{"StartTime":72399.0,"Position":208.0,"HyperDash":false}]},{"StartTime":72485.0,"Objects":[{"StartTime":72485.0,"Position":200.0,"HyperDash":false}]},{"StartTime":72571.0,"Objects":[{"StartTime":72571.0,"Position":192.0,"HyperDash":false}]},{"StartTime":72742.0,"Objects":[{"StartTime":72742.0,"Position":124.0,"HyperDash":false}]},{"StartTime":72913.0,"Objects":[{"StartTime":72913.0,"Position":48.0,"HyperDash":false},{"StartTime":72980.0,"Position":68.42183,"HyperDash":false},{"StartTime":73084.0,"Position":84.285,"HyperDash":false}]},{"StartTime":73256.0,"Objects":[{"StartTime":73256.0,"Position":44.0,"HyperDash":false},{"StartTime":73323.0,"Position":27.0,"HyperDash":false},{"StartTime":73427.0,"Position":44.0,"HyperDash":false}]},{"StartTime":73599.0,"Objects":[{"StartTime":73599.0,"Position":116.0,"HyperDash":false},{"StartTime":73666.0,"Position":134.0,"HyperDash":false},{"StartTime":73770.0,"Position":116.0,"HyperDash":false}]},{"StartTime":73942.0,"Objects":[{"StartTime":73942.0,"Position":188.0,"HyperDash":false},{"StartTime":74027.0,"Position":194.0,"HyperDash":false},{"StartTime":74113.0,"Position":188.0,"HyperDash":false},{"StartTime":74180.0,"Position":177.0,"HyperDash":false},{"StartTime":74284.0,"Position":188.0,"HyperDash":false}]},{"StartTime":74456.0,"Objects":[{"StartTime":74456.0,"Position":188.0,"HyperDash":false}]},{"StartTime":74628.0,"Objects":[{"StartTime":74628.0,"Position":260.0,"HyperDash":false},{"StartTime":74695.0,"Position":292.008942,"HyperDash":false},{"StartTime":74799.0,"Position":311.0676,"HyperDash":false}]},{"StartTime":74971.0,"Objects":[{"StartTime":74971.0,"Position":361.0,"HyperDash":false},{"StartTime":75038.0,"Position":333.214569,"HyperDash":false},{"StartTime":75142.0,"Position":310.502869,"HyperDash":false}]},{"StartTime":75313.0,"Objects":[{"StartTime":75313.0,"Position":260.0,"HyperDash":false},{"StartTime":75380.0,"Position":290.008942,"HyperDash":false},{"StartTime":75484.0,"Position":311.0676,"HyperDash":false}]},{"StartTime":75656.0,"Objects":[{"StartTime":75656.0,"Position":360.0,"HyperDash":false},{"StartTime":75723.0,"Position":337.803131,"HyperDash":false},{"StartTime":75827.0,"Position":311.005,"HyperDash":false}]},{"StartTime":75999.0,"Objects":[{"StartTime":75999.0,"Position":49.0,"HyperDash":false},{"StartTime":76063.0,"Position":21.0,"HyperDash":false},{"StartTime":76127.0,"Position":193.0,"HyperDash":false},{"StartTime":76191.0,"Position":52.0,"HyperDash":false},{"StartTime":76256.0,"Position":466.0,"HyperDash":false},{"StartTime":76320.0,"Position":135.0,"HyperDash":false},{"StartTime":76384.0,"Position":121.0,"HyperDash":false},{"StartTime":76449.0,"Position":427.0,"HyperDash":false},{"StartTime":76513.0,"Position":176.0,"HyperDash":false},{"StartTime":76577.0,"Position":96.0,"HyperDash":false},{"StartTime":76642.0,"Position":345.0,"HyperDash":false},{"StartTime":76706.0,"Position":11.0,"HyperDash":false},{"StartTime":76770.0,"Position":393.0,"HyperDash":false},{"StartTime":76835.0,"Position":440.0,"HyperDash":false},{"StartTime":76899.0,"Position":179.0,"HyperDash":false},{"StartTime":76963.0,"Position":470.0,"HyperDash":false},{"StartTime":77028.0,"Position":89.0,"HyperDash":false}]},{"StartTime":77371.0,"Objects":[{"StartTime":77371.0,"Position":48.0,"HyperDash":false},{"StartTime":77456.0,"Position":59.0,"HyperDash":false},{"StartTime":77542.0,"Position":48.0,"HyperDash":false},{"StartTime":77609.0,"Position":67.0,"HyperDash":false},{"StartTime":77713.0,"Position":48.0,"HyperDash":false}]},{"StartTime":78056.0,"Objects":[{"StartTime":78056.0,"Position":152.0,"HyperDash":false},{"StartTime":78141.0,"Position":162.0,"HyperDash":false},{"StartTime":78227.0,"Position":152.0,"HyperDash":false},{"StartTime":78294.0,"Position":135.0,"HyperDash":false},{"StartTime":78398.0,"Position":152.0,"HyperDash":false}]},{"StartTime":78742.0,"Objects":[{"StartTime":78742.0,"Position":152.0,"HyperDash":false},{"StartTime":78827.0,"Position":154.0,"HyperDash":false},{"StartTime":78913.0,"Position":152.0,"HyperDash":false},{"StartTime":78980.0,"Position":138.0,"HyperDash":false},{"StartTime":79084.0,"Position":152.0,"HyperDash":false}]},{"StartTime":79427.0,"Objects":[{"StartTime":79427.0,"Position":256.0,"HyperDash":false},{"StartTime":79512.0,"Position":248.0,"HyperDash":false},{"StartTime":79598.0,"Position":256.0,"HyperDash":false},{"StartTime":79665.0,"Position":270.0,"HyperDash":false},{"StartTime":79769.0,"Position":256.0,"HyperDash":false}]},{"StartTime":80113.0,"Objects":[{"StartTime":80113.0,"Position":256.0,"HyperDash":false},{"StartTime":80198.0,"Position":249.0,"HyperDash":false},{"StartTime":80284.0,"Position":256.0,"HyperDash":false},{"StartTime":80369.0,"Position":245.0,"HyperDash":false},{"StartTime":80455.0,"Position":256.0,"HyperDash":false},{"StartTime":80541.0,"Position":244.0,"HyperDash":false},{"StartTime":80627.0,"Position":256.0,"HyperDash":false},{"StartTime":80694.0,"Position":265.0,"HyperDash":false},{"StartTime":80798.0,"Position":256.0,"HyperDash":false}]},{"StartTime":81142.0,"Objects":[{"StartTime":81142.0,"Position":256.0,"HyperDash":false},{"StartTime":81227.0,"Position":292.744537,"HyperDash":false},{"StartTime":81313.0,"Position":325.897827,"HyperDash":false},{"StartTime":81398.0,"Position":358.642334,"HyperDash":false},{"StartTime":81484.0,"Position":396.0,"HyperDash":false},{"StartTime":81570.0,"Position":346.0511,"HyperDash":false},{"StartTime":81656.0,"Position":325.897827,"HyperDash":false},{"StartTime":81723.0,"Position":285.510956,"HyperDash":false},{"StartTime":81827.0,"Position":256.0,"HyperDash":false}]},{"StartTime":82171.0,"Objects":[{"StartTime":82171.0,"Position":468.0,"HyperDash":false}]},{"StartTime":82513.0,"Objects":[{"StartTime":82513.0,"Position":468.0,"HyperDash":false}]},{"StartTime":82856.0,"Objects":[{"StartTime":82856.0,"Position":352.0,"HyperDash":false},{"StartTime":82941.0,"Position":368.54422,"HyperDash":false},{"StartTime":83027.0,"Position":407.5205,"HyperDash":false},{"StartTime":83112.0,"Position":374.08432,"HyperDash":false},{"StartTime":83198.0,"Position":352.0,"HyperDash":false},{"StartTime":83266.0,"Position":371.819336,"HyperDash":false},{"StartTime":83370.0,"Position":407.5205,"HyperDash":false}]},{"StartTime":83542.0,"Objects":[{"StartTime":83542.0,"Position":448.0,"HyperDash":false}]},{"StartTime":83885.0,"Objects":[{"StartTime":83885.0,"Position":324.0,"HyperDash":false}]},{"StartTime":84228.0,"Objects":[{"StartTime":84228.0,"Position":160.0,"HyperDash":false},{"StartTime":84313.0,"Position":124.276367,"HyperDash":false},{"StartTime":84399.0,"Position":104.117874,"HyperDash":false},{"StartTime":84484.0,"Position":150.732773,"HyperDash":false},{"StartTime":84570.0,"Position":160.0,"HyperDash":false},{"StartTime":84638.0,"Position":132.038544,"HyperDash":false},{"StartTime":84742.0,"Position":104.117874,"HyperDash":false}]},{"StartTime":84913.0,"Objects":[{"StartTime":84913.0,"Position":64.0,"HyperDash":false}]},{"StartTime":85256.0,"Objects":[{"StartTime":85256.0,"Position":188.0,"HyperDash":false}]},{"StartTime":85599.0,"Objects":[{"StartTime":85599.0,"Position":352.0,"HyperDash":false},{"StartTime":85684.0,"Position":376.7821,"HyperDash":false},{"StartTime":85770.0,"Position":408.0,"HyperDash":false},{"StartTime":85855.0,"Position":395.326843,"HyperDash":false},{"StartTime":85941.0,"Position":352.0,"HyperDash":false},{"StartTime":86009.0,"Position":380.007782,"HyperDash":false},{"StartTime":86113.0,"Position":408.0,"HyperDash":false}]},{"StartTime":86285.0,"Objects":[{"StartTime":86285.0,"Position":356.0,"HyperDash":false}]},{"StartTime":86456.0,"Objects":[{"StartTime":86456.0,"Position":356.0,"HyperDash":false}]},{"StartTime":86628.0,"Objects":[{"StartTime":86628.0,"Position":356.0,"HyperDash":false}]},{"StartTime":86971.0,"Objects":[{"StartTime":86971.0,"Position":160.0,"HyperDash":false},{"StartTime":87056.0,"Position":162.926041,"HyperDash":false},{"StartTime":87142.0,"Position":133.659821,"HyperDash":false},{"StartTime":87227.0,"Position":161.695328,"HyperDash":false},{"StartTime":87313.0,"Position":160.0,"HyperDash":false},{"StartTime":87399.0,"Position":140.849136,"HyperDash":false},{"StartTime":87485.0,"Position":133.659821,"HyperDash":false},{"StartTime":87552.0,"Position":142.003632,"HyperDash":false},{"StartTime":87656.0,"Position":160.0,"HyperDash":false}]},{"StartTime":87999.0,"Objects":[{"StartTime":87999.0,"Position":256.0,"HyperDash":false}]},{"StartTime":88342.0,"Objects":[{"StartTime":88342.0,"Position":104.0,"HyperDash":false},{"StartTime":88427.0,"Position":100.104553,"HyperDash":false},{"StartTime":88513.0,"Position":76.88288,"HyperDash":false},{"StartTime":88598.0,"Position":61.4504166,"HyperDash":false},{"StartTime":88684.0,"Position":80.21796,"HyperDash":false},{"StartTime":88770.0,"Position":95.16115,"HyperDash":false},{"StartTime":88856.0,"Position":115.62986,"HyperDash":false},{"StartTime":88941.0,"Position":138.0912,"HyperDash":false},{"StartTime":89027.0,"Position":175.517044,"HyperDash":false},{"StartTime":89113.0,"Position":220.3342,"HyperDash":false},{"StartTime":89199.0,"Position":244.674866,"HyperDash":false},{"StartTime":89284.0,"Position":264.2282,"HyperDash":false},{"StartTime":89370.0,"Position":300.583649,"HyperDash":false},{"StartTime":89456.0,"Position":336.589539,"HyperDash":false},{"StartTime":89542.0,"Position":332.588257,"HyperDash":false},{"StartTime":89609.0,"Position":357.060455,"HyperDash":false},{"StartTime":89713.0,"Position":343.816345,"HyperDash":false}]},{"StartTime":89885.0,"Objects":[{"StartTime":89885.0,"Position":408.0,"HyperDash":false}]},{"StartTime":90056.0,"Objects":[{"StartTime":90056.0,"Position":416.0,"HyperDash":false}]},{"StartTime":90228.0,"Objects":[{"StartTime":90228.0,"Position":400.0,"HyperDash":false}]},{"StartTime":90399.0,"Objects":[{"StartTime":90399.0,"Position":360.0,"HyperDash":false},{"StartTime":90484.0,"Position":325.326477,"HyperDash":false},{"StartTime":90570.0,"Position":314.08017,"HyperDash":false},{"StartTime":90655.0,"Position":295.765259,"HyperDash":false},{"StartTime":90741.0,"Position":250.349167,"HyperDash":false},{"StartTime":90827.0,"Position":234.540588,"HyperDash":false},{"StartTime":90913.0,"Position":180.487732,"HyperDash":false},{"StartTime":90998.0,"Position":158.6242,"HyperDash":false},{"StartTime":91084.0,"Position":114.161362,"HyperDash":false},{"StartTime":91170.0,"Position":64.53248,"HyperDash":false},{"StartTime":91256.0,"Position":58.7642,"HyperDash":false},{"StartTime":91323.0,"Position":33.0224953,"HyperDash":false},{"StartTime":91427.0,"Position":23.1158314,"HyperDash":false}]},{"StartTime":91599.0,"Objects":[{"StartTime":91599.0,"Position":60.0,"HyperDash":false}]},{"StartTime":91771.0,"Objects":[{"StartTime":91771.0,"Position":24.0,"HyperDash":false},{"StartTime":91856.0,"Position":42.1049347,"HyperDash":false},{"StartTime":91942.0,"Position":82.55228,"HyperDash":false},{"StartTime":92009.0,"Position":124.493813,"HyperDash":false},{"StartTime":92113.0,"Position":141.104553,"HyperDash":false}]},{"StartTime":92285.0,"Objects":[{"StartTime":92285.0,"Position":339.0,"HyperDash":false},{"StartTime":92381.0,"Position":342.0,"HyperDash":false},{"StartTime":92477.0,"Position":249.0,"HyperDash":false},{"StartTime":92574.0,"Position":235.0,"HyperDash":false},{"StartTime":92670.0,"Position":323.0,"HyperDash":false},{"StartTime":92767.0,"Position":365.0,"HyperDash":false},{"StartTime":92863.0,"Position":74.0,"HyperDash":false},{"StartTime":92960.0,"Position":281.0,"HyperDash":false},{"StartTime":93056.0,"Position":398.0,"HyperDash":false},{"StartTime":93152.0,"Position":335.0,"HyperDash":false},{"StartTime":93249.0,"Position":388.0,"HyperDash":false},{"StartTime":93345.0,"Position":228.0,"HyperDash":false},{"StartTime":93442.0,"Position":323.0,"HyperDash":false},{"StartTime":93538.0,"Position":441.0,"HyperDash":false},{"StartTime":93635.0,"Position":442.0,"HyperDash":false},{"StartTime":93731.0,"Position":278.0,"HyperDash":false},{"StartTime":93828.0,"Position":90.0,"HyperDash":false}]},{"StartTime":94513.0,"Objects":[{"StartTime":94513.0,"Position":64.0,"HyperDash":false},{"StartTime":94598.0,"Position":68.14916,"HyperDash":false},{"StartTime":94684.0,"Position":62.2626343,"HyperDash":false},{"StartTime":94769.0,"Position":86.91272,"HyperDash":false},{"StartTime":94855.0,"Position":102.010681,"HyperDash":false},{"StartTime":94941.0,"Position":141.25354,"HyperDash":false},{"StartTime":95027.0,"Position":166.435471,"HyperDash":false},{"StartTime":95094.0,"Position":206.542572,"HyperDash":false},{"StartTime":95198.0,"Position":230.41568,"HyperDash":false}]},{"StartTime":95371.0,"Objects":[{"StartTime":95371.0,"Position":300.0,"HyperDash":false}]},{"StartTime":95542.0,"Objects":[{"StartTime":95542.0,"Position":340.0,"HyperDash":false}]},{"StartTime":95713.0,"Objects":[{"StartTime":95713.0,"Position":404.0,"HyperDash":false}]},{"StartTime":95885.0,"Objects":[{"StartTime":95885.0,"Position":448.0,"HyperDash":false},{"StartTime":95970.0,"Position":440.850861,"HyperDash":false},{"StartTime":96056.0,"Position":449.737366,"HyperDash":false},{"StartTime":96141.0,"Position":429.08728,"HyperDash":false},{"StartTime":96227.0,"Position":409.989319,"HyperDash":false},{"StartTime":96313.0,"Position":361.74646,"HyperDash":false},{"StartTime":96399.0,"Position":345.564545,"HyperDash":false},{"StartTime":96466.0,"Position":303.457428,"HyperDash":false},{"StartTime":96570.0,"Position":281.58432,"HyperDash":false}]},{"StartTime":96913.0,"Objects":[{"StartTime":96913.0,"Position":256.0,"HyperDash":false}]},{"StartTime":97256.0,"Objects":[{"StartTime":97256.0,"Position":464.0,"HyperDash":false},{"StartTime":97341.0,"Position":440.493042,"HyperDash":false},{"StartTime":97427.0,"Position":396.852631,"HyperDash":false},{"StartTime":97494.0,"Position":353.930542,"HyperDash":false},{"StartTime":97598.0,"Position":329.726563,"HyperDash":false}]},{"StartTime":97771.0,"Objects":[{"StartTime":97771.0,"Position":252.0,"HyperDash":false}]},{"StartTime":97942.0,"Objects":[{"StartTime":97942.0,"Position":176.0,"HyperDash":false},{"StartTime":98027.0,"Position":129.262726,"HyperDash":false},{"StartTime":98113.0,"Position":106.0,"HyperDash":false},{"StartTime":98198.0,"Position":154.620514,"HyperDash":false},{"StartTime":98284.0,"Position":176.0,"HyperDash":false},{"StartTime":98370.0,"Position":142.08757,"HyperDash":false},{"StartTime":98456.0,"Position":106.0,"HyperDash":false},{"StartTime":98541.0,"Position":132.795654,"HyperDash":false},{"StartTime":98627.0,"Position":176.0,"HyperDash":false},{"StartTime":98713.0,"Position":145.912415,"HyperDash":false},{"StartTime":98799.0,"Position":106.0,"HyperDash":false},{"StartTime":98884.0,"Position":134.9708,"HyperDash":false},{"StartTime":98970.0,"Position":176.0,"HyperDash":false},{"StartTime":99038.0,"Position":137.093414,"HyperDash":false},{"StartTime":99141.0,"Position":106.0,"HyperDash":false}]},{"StartTime":99313.0,"Objects":[{"StartTime":99313.0,"Position":28.0,"HyperDash":false},{"StartTime":99398.0,"Position":26.2349854,"HyperDash":false},{"StartTime":99484.0,"Position":17.7651138,"HyperDash":false},{"StartTime":99569.0,"Position":33.3757133,"HyperDash":false},{"StartTime":99655.0,"Position":31.6727753,"HyperDash":false},{"StartTime":99741.0,"Position":33.7641869,"HyperDash":false},{"StartTime":99827.0,"Position":72.2299042,"HyperDash":false},{"StartTime":99912.0,"Position":92.74443,"HyperDash":false},{"StartTime":99998.0,"Position":133.558716,"HyperDash":false},{"StartTime":100084.0,"Position":158.430649,"HyperDash":false},{"StartTime":100170.0,"Position":202.717,"HyperDash":false},{"StartTime":100237.0,"Position":217.776627,"HyperDash":false},{"StartTime":100341.0,"Position":255.047836,"HyperDash":false}]},{"StartTime":100685.0,"Objects":[{"StartTime":100685.0,"Position":484.0,"HyperDash":false},{"StartTime":100770.0,"Position":489.764954,"HyperDash":false},{"StartTime":100856.0,"Position":494.2329,"HyperDash":false},{"StartTime":100941.0,"Position":504.6108,"HyperDash":false},{"StartTime":101027.0,"Position":480.2734,"HyperDash":false},{"StartTime":101113.0,"Position":448.084351,"HyperDash":false},{"StartTime":101199.0,"Position":439.444244,"HyperDash":false},{"StartTime":101284.0,"Position":426.701172,"HyperDash":false},{"StartTime":101370.0,"Position":377.68396,"HyperDash":false},{"StartTime":101456.0,"Position":326.754578,"HyperDash":false},{"StartTime":101542.0,"Position":308.535339,"HyperDash":false},{"StartTime":101609.0,"Position":299.317078,"HyperDash":false},{"StartTime":101713.0,"Position":254.267319,"HyperDash":false}]},{"StartTime":102056.0,"Objects":[{"StartTime":102056.0,"Position":160.0,"HyperDash":false},{"StartTime":102141.0,"Position":171.288788,"HyperDash":false},{"StartTime":102227.0,"Position":190.8506,"HyperDash":false},{"StartTime":102312.0,"Position":206.4524,"HyperDash":false},{"StartTime":102398.0,"Position":256.016479,"HyperDash":false},{"StartTime":102484.0,"Position":285.578949,"HyperDash":false},{"StartTime":102570.0,"Position":321.497925,"HyperDash":false},{"StartTime":102655.0,"Position":361.7266,"HyperDash":false},{"StartTime":102741.0,"Position":352.033936,"HyperDash":false},{"StartTime":102827.0,"Position":339.916229,"HyperDash":false},{"StartTime":102913.0,"Position":321.497925,"HyperDash":false},{"StartTime":102998.0,"Position":307.967651,"HyperDash":false},{"StartTime":103084.0,"Position":256.424927,"HyperDash":false},{"StartTime":103170.0,"Position":225.84108,"HyperDash":false},{"StartTime":103256.0,"Position":190.8506,"HyperDash":false},{"StartTime":103323.0,"Position":189.241409,"HyperDash":false},{"StartTime":103427.0,"Position":160.0,"HyperDash":false}]},{"StartTime":103771.0,"Objects":[{"StartTime":103771.0,"Position":48.0,"HyperDash":false}]},{"StartTime":104113.0,"Objects":[{"StartTime":104113.0,"Position":256.0,"HyperDash":false}]},{"StartTime":104456.0,"Objects":[{"StartTime":104456.0,"Position":464.0,"HyperDash":false}]},{"StartTime":104799.0,"Objects":[{"StartTime":104799.0,"Position":352.0,"HyperDash":false}]},{"StartTime":104971.0,"Objects":[{"StartTime":104971.0,"Position":272.0,"HyperDash":false},{"StartTime":105056.0,"Position":237.0,"HyperDash":false},{"StartTime":105142.0,"Position":272.0,"HyperDash":false}]},{"StartTime":105313.0,"Objects":[{"StartTime":105313.0,"Position":240.0,"HyperDash":false},{"StartTime":105398.0,"Position":275.0,"HyperDash":false},{"StartTime":105484.0,"Position":240.0,"HyperDash":false}]},{"StartTime":105656.0,"Objects":[{"StartTime":105656.0,"Position":272.0,"HyperDash":false},{"StartTime":105741.0,"Position":237.0,"HyperDash":false},{"StartTime":105827.0,"Position":272.0,"HyperDash":false}]},{"StartTime":105999.0,"Objects":[{"StartTime":105999.0,"Position":240.0,"HyperDash":false},{"StartTime":106084.0,"Position":275.0,"HyperDash":false},{"StartTime":106170.0,"Position":240.0,"HyperDash":false}]},{"StartTime":106342.0,"Objects":[{"StartTime":106342.0,"Position":168.0,"HyperDash":false},{"StartTime":106409.0,"Position":144.031464,"HyperDash":false},{"StartTime":106513.0,"Position":104.274345,"HyperDash":false}]},{"StartTime":106685.0,"Objects":[{"StartTime":106685.0,"Position":56.0,"HyperDash":false},{"StartTime":106752.0,"Position":96.4269,"HyperDash":false},{"StartTime":106856.0,"Position":126.0,"HyperDash":false}]},{"StartTime":107028.0,"Objects":[{"StartTime":107028.0,"Position":104.0,"HyperDash":false},{"StartTime":107095.0,"Position":137.981888,"HyperDash":false},{"StartTime":107199.0,"Position":167.759735,"HyperDash":false}]},{"StartTime":107371.0,"Objects":[{"StartTime":107371.0,"Position":256.0,"HyperDash":false}]},{"StartTime":107542.0,"Objects":[{"StartTime":107542.0,"Position":344.0,"HyperDash":false},{"StartTime":107609.0,"Position":367.968536,"HyperDash":false},{"StartTime":107713.0,"Position":407.725647,"HyperDash":false}]},{"StartTime":107885.0,"Objects":[{"StartTime":107885.0,"Position":456.0,"HyperDash":false},{"StartTime":107952.0,"Position":441.5731,"HyperDash":false},{"StartTime":108056.0,"Position":386.0,"HyperDash":false}]},{"StartTime":108228.0,"Objects":[{"StartTime":108228.0,"Position":408.0,"HyperDash":false},{"StartTime":108295.0,"Position":368.018127,"HyperDash":false},{"StartTime":108399.0,"Position":344.240265,"HyperDash":false}]},{"StartTime":108571.0,"Objects":[{"StartTime":108571.0,"Position":256.0,"HyperDash":false},{"StartTime":108628.0,"Position":256.0,"HyperDash":false},{"StartTime":108685.0,"Position":256.0,"HyperDash":false},{"StartTime":108742.0,"Position":256.0,"HyperDash":false},{"StartTime":108799.0,"Position":256.0,"HyperDash":false},{"StartTime":108856.0,"Position":256.0,"HyperDash":false},{"StartTime":108913.0,"Position":256.0,"HyperDash":false}]},{"StartTime":108999.0,"Objects":[{"StartTime":108999.0,"Position":152.0,"HyperDash":false},{"StartTime":109057.0,"Position":321.0,"HyperDash":false},{"StartTime":109116.0,"Position":303.0,"HyperDash":false},{"StartTime":109175.0,"Position":259.0,"HyperDash":false},{"StartTime":109234.0,"Position":186.0,"HyperDash":false},{"StartTime":109293.0,"Position":140.0,"HyperDash":false},{"StartTime":109352.0,"Position":207.0,"HyperDash":false},{"StartTime":109411.0,"Position":278.0,"HyperDash":false},{"StartTime":109470.0,"Position":223.0,"HyperDash":false},{"StartTime":109529.0,"Position":389.0,"HyperDash":false},{"StartTime":109588.0,"Position":245.0,"HyperDash":false},{"StartTime":109647.0,"Position":400.0,"HyperDash":false},{"StartTime":109706.0,"Position":445.0,"HyperDash":false},{"StartTime":109765.0,"Position":443.0,"HyperDash":false},{"StartTime":109824.0,"Position":245.0,"HyperDash":false},{"StartTime":109883.0,"Position":259.0,"HyperDash":false},{"StartTime":109942.0,"Position":422.0,"HyperDash":false}]},{"StartTime":110285.0,"Objects":[{"StartTime":110285.0,"Position":168.0,"HyperDash":false},{"StartTime":110352.0,"Position":172.393753,"HyperDash":false},{"StartTime":110456.0,"Position":217.497467,"HyperDash":false}]},{"StartTime":110628.0,"Objects":[{"StartTime":110628.0,"Position":344.0,"HyperDash":false},{"StartTime":110695.0,"Position":329.606262,"HyperDash":false},{"StartTime":110799.0,"Position":294.502533,"HyperDash":false}]},{"StartTime":110971.0,"Objects":[{"StartTime":110971.0,"Position":207.0,"HyperDash":false},{"StartTime":111038.0,"Position":237.393753,"HyperDash":false},{"StartTime":111142.0,"Position":256.497467,"HyperDash":false}]},{"StartTime":111313.0,"Objects":[{"StartTime":111313.0,"Position":305.0,"HyperDash":false},{"StartTime":111380.0,"Position":285.606262,"HyperDash":false},{"StartTime":111484.0,"Position":255.502533,"HyperDash":false}]},{"StartTime":111656.0,"Objects":[{"StartTime":111656.0,"Position":216.0,"HyperDash":false},{"StartTime":111741.0,"Position":222.948441,"HyperDash":false},{"StartTime":111827.0,"Position":256.131561,"HyperDash":false},{"StartTime":111912.0,"Position":267.080017,"HyperDash":false},{"StartTime":111998.0,"Position":296.419617,"HyperDash":false},{"StartTime":112084.0,"Position":260.392944,"HyperDash":false},{"StartTime":112170.0,"Position":256.2098,"HyperDash":false},{"StartTime":112255.0,"Position":223.261353,"HyperDash":false},{"StartTime":112341.0,"Position":216.0,"HyperDash":false},{"StartTime":112427.0,"Position":243.1049,"HyperDash":false},{"StartTime":112513.0,"Position":256.288025,"HyperDash":false},{"StartTime":112580.0,"Position":290.012115,"HyperDash":false},{"StartTime":112684.0,"Position":296.419617,"HyperDash":false}]},{"StartTime":113028.0,"Objects":[{"StartTime":113028.0,"Position":352.0,"HyperDash":false}]},{"StartTime":113199.0,"Objects":[{"StartTime":113199.0,"Position":360.0,"HyperDash":false},{"StartTime":113284.0,"Position":364.341217,"HyperDash":false},{"StartTime":113370.0,"Position":360.0,"HyperDash":false}]},{"StartTime":113542.0,"Objects":[{"StartTime":113542.0,"Position":424.0,"HyperDash":false}]},{"StartTime":113713.0,"Objects":[{"StartTime":113713.0,"Position":352.0,"HyperDash":false}]},{"StartTime":113885.0,"Objects":[{"StartTime":113885.0,"Position":408.0,"HyperDash":false},{"StartTime":113970.0,"Position":441.203918,"HyperDash":false},{"StartTime":114056.0,"Position":408.0,"HyperDash":false}]},{"StartTime":114228.0,"Objects":[{"StartTime":114228.0,"Position":336.0,"HyperDash":false}]},{"StartTime":114399.0,"Objects":[{"StartTime":114399.0,"Position":352.0,"HyperDash":false}]},{"StartTime":114571.0,"Objects":[{"StartTime":114571.0,"Position":280.0,"HyperDash":false},{"StartTime":114656.0,"Position":248.695053,"HyperDash":false},{"StartTime":114742.0,"Position":280.0,"HyperDash":false}]},{"StartTime":114913.0,"Objects":[{"StartTime":114913.0,"Position":352.0,"HyperDash":false}]},{"StartTime":115085.0,"Objects":[{"StartTime":115085.0,"Position":296.0,"HyperDash":false}]},{"StartTime":115256.0,"Objects":[{"StartTime":115256.0,"Position":368.0,"HyperDash":false}]},{"StartTime":115428.0,"Objects":[{"StartTime":115428.0,"Position":424.0,"HyperDash":false}]},{"StartTime":115771.0,"Objects":[{"StartTime":115771.0,"Position":128.0,"HyperDash":false},{"StartTime":115838.0,"Position":111.239639,"HyperDash":false},{"StartTime":115942.0,"Position":60.5060654,"HyperDash":false}]},{"StartTime":116113.0,"Objects":[{"StartTime":116113.0,"Position":64.0,"HyperDash":false},{"StartTime":116180.0,"Position":98.76035,"HyperDash":false},{"StartTime":116284.0,"Position":131.493927,"HyperDash":false}]},{"StartTime":116456.0,"Objects":[{"StartTime":116456.0,"Position":136.0,"HyperDash":false},{"StartTime":116523.0,"Position":92.23965,"HyperDash":false},{"StartTime":116627.0,"Position":68.5060654,"HyperDash":false}]},{"StartTime":116798.0,"Objects":[{"StartTime":116798.0,"Position":72.0,"HyperDash":false},{"StartTime":116865.0,"Position":112.760361,"HyperDash":false},{"StartTime":116969.0,"Position":139.493927,"HyperDash":false}]},{"StartTime":117142.0,"Objects":[{"StartTime":117142.0,"Position":216.0,"HyperDash":false}]},{"StartTime":117313.0,"Objects":[{"StartTime":117313.0,"Position":216.0,"HyperDash":false}]},{"StartTime":117485.0,"Objects":[{"StartTime":117485.0,"Position":216.0,"HyperDash":false}]},{"StartTime":117828.0,"Objects":[{"StartTime":117828.0,"Position":296.0,"HyperDash":false}]},{"StartTime":117999.0,"Objects":[{"StartTime":117999.0,"Position":296.0,"HyperDash":false}]},{"StartTime":118171.0,"Objects":[{"StartTime":118171.0,"Position":296.0,"HyperDash":false}]},{"StartTime":118513.0,"Objects":[{"StartTime":118513.0,"Position":448.0,"HyperDash":false},{"StartTime":118580.0,"Position":418.681824,"HyperDash":false},{"StartTime":118684.0,"Position":391.038666,"HyperDash":false}]},{"StartTime":118856.0,"Objects":[{"StartTime":118856.0,"Position":392.0,"HyperDash":false}]},{"StartTime":118942.0,"Objects":[{"StartTime":118942.0,"Position":392.0,"HyperDash":false}]},{"StartTime":119028.0,"Objects":[{"StartTime":119028.0,"Position":392.0,"HyperDash":false}]},{"StartTime":119199.0,"Objects":[{"StartTime":119199.0,"Position":392.0,"HyperDash":false},{"StartTime":119284.0,"Position":392.0,"HyperDash":false},{"StartTime":119370.0,"Position":392.0,"HyperDash":false}]},{"StartTime":119542.0,"Objects":[{"StartTime":119542.0,"Position":464.0,"HyperDash":false}]},{"StartTime":119628.0,"Objects":[{"StartTime":119628.0,"Position":464.0,"HyperDash":false}]},{"StartTime":119713.0,"Objects":[{"StartTime":119713.0,"Position":464.0,"HyperDash":false}]},{"StartTime":119885.0,"Objects":[{"StartTime":119885.0,"Position":464.0,"HyperDash":false},{"StartTime":119970.0,"Position":443.501282,"HyperDash":false},{"StartTime":120056.0,"Position":394.59668,"HyperDash":false},{"StartTime":120141.0,"Position":351.097931,"HyperDash":false},{"StartTime":120227.0,"Position":325.193329,"HyperDash":false},{"StartTime":120313.0,"Position":287.288727,"HyperDash":false},{"StartTime":120399.0,"Position":255.384125,"HyperDash":false},{"StartTime":120484.0,"Position":213.8854,"HyperDash":false},{"StartTime":120570.0,"Position":185.980774,"HyperDash":false},{"StartTime":120656.0,"Position":160.0762,"HyperDash":false},{"StartTime":120742.0,"Position":116.1716,"HyperDash":false},{"StartTime":120809.0,"Position":79.9784546,"HyperDash":false},{"StartTime":120913.0,"Position":46.7682343,"HyperDash":false}]},{"StartTime":121256.0,"Objects":[{"StartTime":121256.0,"Position":441.0,"HyperDash":false},{"StartTime":121341.0,"Position":45.0,"HyperDash":false},{"StartTime":121427.0,"Position":92.0,"HyperDash":false},{"StartTime":121513.0,"Position":399.0,"HyperDash":false},{"StartTime":121598.0,"Position":494.0,"HyperDash":false},{"StartTime":121684.0,"Position":324.0,"HyperDash":false},{"StartTime":121770.0,"Position":31.0,"HyperDash":false},{"StartTime":121856.0,"Position":79.0,"HyperDash":false},{"StartTime":121941.0,"Position":163.0,"HyperDash":false},{"StartTime":122027.0,"Position":303.0,"HyperDash":false},{"StartTime":122113.0,"Position":462.0,"HyperDash":false},{"StartTime":122198.0,"Position":74.0,"HyperDash":false},{"StartTime":122284.0,"Position":4.0,"HyperDash":false},{"StartTime":122370.0,"Position":253.0,"HyperDash":false},{"StartTime":122456.0,"Position":159.0,"HyperDash":false},{"StartTime":122541.0,"Position":74.0,"HyperDash":false},{"StartTime":122627.0,"Position":242.0,"HyperDash":false},{"StartTime":122713.0,"Position":251.0,"HyperDash":false},{"StartTime":122798.0,"Position":146.0,"HyperDash":false},{"StartTime":122884.0,"Position":487.0,"HyperDash":false},{"StartTime":122970.0,"Position":294.0,"HyperDash":false},{"StartTime":123056.0,"Position":322.0,"HyperDash":false},{"StartTime":123141.0,"Position":208.0,"HyperDash":false},{"StartTime":123227.0,"Position":154.0,"HyperDash":false},{"StartTime":123313.0,"Position":476.0,"HyperDash":false},{"StartTime":123398.0,"Position":27.0,"HyperDash":false},{"StartTime":123484.0,"Position":377.0,"HyperDash":false},{"StartTime":123570.0,"Position":234.0,"HyperDash":false},{"StartTime":123656.0,"Position":459.0,"HyperDash":false},{"StartTime":123741.0,"Position":106.0,"HyperDash":false},{"StartTime":123827.0,"Position":321.0,"HyperDash":false},{"StartTime":123913.0,"Position":368.0,"HyperDash":false},{"StartTime":123999.0,"Position":488.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/103019.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/103019.osu
new file mode 100644
index 0000000000..2f3814c57b
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/103019.osu
@@ -0,0 +1,329 @@
+osu file format v9
+
+[General]
+StackLeniency: 0.3
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:4
+OverallDifficulty:5
+ApproachRate:7
+SliderMultiplier:1.4
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+//Background Colour Transformations
+3,100,163,162,255
+
+[TimingPoints]
+571.114342485549,342.857142857143,4,1,0,60,1,0
+11542,-100,4,1,0,90,0,0
+59542,-100,4,2,0,90,0,0
+60913,-100,4,1,0,90,0,0
+65028,-100,4,1,0,90,0,0
+66399,-100,4,1,0,90,0,1
+77371,-100,4,1,0,90,0,0
+86971,-200,4,1,0,90,0,0
+87999,-50,4,1,0,90,0,0
+88342,-100,4,1,0,90,0,0
+110285,-100,4,1,0,90,0,1
+119885,-100,4,1,0,100,0,0
+121574,-50,4,2,0,90,0,0
+121917,-50,4,2,0,80,0,0
+122260,-50,4,2,0,70,0,0
+122603,-50,4,2,0,60,0,0
+122946,-50,4,2,0,50,0,0
+123288,-50,4,2,0,40,0,0
+123631,-50,4,2,0,30,0,0
+123974,-50,4,2,0,5,0,0
+
+[HitObjects]
+184,192,571,6,0,B|168:104|256:45|344:104|328:192,1,280
+256,312,1599,2,0,B|256:160,3,140
+256,32,2971,5,0
+128,88,3313,1,0
+128,232,3656,2,0,B|128:328,2,70
+384,232,4342,2,0,B|384:328,2,70
+384,160,4856,1,0
+384,88,5028,1,0
+256,32,5371,37,2
+256,352,5713,1,2
+128,296,6056,22,0,B|72:272|72:272|72:192,1,140
+384,296,6742,2,0,B|440:272|440:272|440:192,1,140
+256,72,7428,2,0,B|224:136|296:136|256:208,2,140
+256,296,8456,1,2
+256,192,8799,12,0,11199
+256,192,11542,5,4
+60,192,11885,2,0,B|28:240|60:304|132:280,2,140,8|0|8
+256,192,12913,5,0
+452,192,13256,2,0,B|484:144|452:80|380:104,2,140,8|0|8
+256,192,14285,1,0
+88,64,14799,6,0,B|56:40,10,35
+32,192,15999,1,8
+96,220,16171,1,0
+160,248,16342,1,0
+224,120,16685,1,8
+328,24,17028,6,0,B|352:100,1,70
+412,56,17371,2,0,B|436:136,1,70,8|0
+448,192,17713,2,0,B|520:224,1,70
+472,280,18056,2,0,B|408:252,1,70,8|0
+388,320,18399,2,0,B|360:388,1,70
+300,348,18742,2,0,B|328:280,1,70,8|0
+344,216,19085,1,0
+156,192,19428,1,0
+256,76,19771,5,4
+256,76,20456,1,4
+124,324,21142,1,2
+256,372,21485,1,2
+388,324,21828,1,2
+504,32,22513,6,0,B|424:32,1,70,4|0
+448,104,22856,1,8
+376,104,23028,1,0
+360,32,23199,2,0,B|280:32,1,70
+304,104,23542,1,8
+232,104,23713,1,0
+216,32,23885,2,0,B|144:32,1,70
+160,104,24228,1,8
+88,104,24399,1,0
+72,32,24571,2,8,B|0:32,2,70,2|8|10
+8,352,25256,6,0,B|88:352,1,70
+64,280,25599,1,8
+136,280,25771,1,0
+152,352,25942,2,0,B|232:352,1,70
+208,280,26285,1,8
+280,280,26456,1,0
+296,352,26628,2,0,B|368:352,1,70
+352,280,26971,1,8
+424,280,27142,1,0
+440,352,27313,2,0,B|512:352,2,70,2|0|10
+40,228,27999,6,0,B|40:148,1,70,6|0
+112,196,28342,2,0,B|112:232,2,35,8|0|0
+184,156,28685,2,0,B|184:236,1,70,2|0
+260,188,29028,2,0,B|260:152,2,35,8|0|0
+336,188,29371,2,0,B|376:248,1,70,2|0
+440,216,29713,2,0,B|392:148,1,70,8|0
+460,124,30056,2,0,B|484:160,4,35,10|0|8|0|10
+328,72,30742,6,0,B|288:72,3,35
+256,72,31085,2,0,B|208:72,3,35,8|0|0|0
+184,72,31428,2,0,B|128:72,3,35,0|0|0|0
+112,72,31771,2,0,B|72:72,3,35,8|0|0|0
+40,72,32113,5,8
+40,216,32456,1,0
+184,216,32799,1,8
+184,360,33142,1,0
+304,288,33485,6,0,B|400:184,1,140,0|8
+256,32,34342,1,0
+256,32,34513,1,8
+136,112,34856,2,0,B|136:256,1,140,0|10
+104,320,35371,2,0,B|144:344|224:304|208:240,1,140,0|2
+212,192,35885,1,8
+408,336,36228,6,0,B|488:304|480:224,1,140,0|8
+360,56,37085,1,0
+360,56,37256,1,8
+232,120,37599,2,0,B|184:64|96:72,1,140,0|10
+56,120,38113,2,0,B|16:72|40:16|80:0|104:8,1,140,0|2
+156,4,38628,1,8
+256,100,38971,6,0,B|160:204,1,140,0|8
+256,352,39828,1,0
+256,352,39999,1,8
+376,272,40342,2,0,B|376:128,1,140,0|10
+408,64,40856,2,0,B|368:40|288:80|304:144,1,140,0|2
+300,192,41371,1,8
+104,48,41713,6,0,B|24:80|32:160,1,140,0|8
+152,328,42571,1,0
+152,328,42742,1,8
+256,232,43085,6,0,B|256:184,8,35,0|0|0|0|8|0|0|0|8
+256,92,44113,1,2
+124,140,44456,5,4
+72,92,44628,2,0,B|16:144|80:260|184:192,1,210
+256,92,45485,1,8
+388,140,45828,5,0
+440,92,45999,2,0,B|496:144|432:260|328:192,1,210
+256,92,46856,1,8
+256,232,47199,2,0,B|216:296|296:296|252:368,3,140,0|8|0|8
+392,320,48571,6,0,B|392:176,1,140,0|8
+464,184,49085,2,0,B|448:96|376:88|320:128|324:184,1,210,0|8
+187,170,49942,6,0,B|188:128|140:88|60:96|48:180,1,210,4|8
+120,180,50628,2,0,B|120:320,1,140,0|8
+257,363,51313,2,0,B|216:296|296:296|256:232,3,140,0|8|0|8
+256,92,52685,5,0
+169,196,53028,2,0,B|80:248|16:140|80:84,1,210,8|0
+124,140,53713,1,8
+68,268,54056,6,0,B|56:304,2,35
+156,296,54399,1,8
+444,268,54742,6,0,B|456:304,2,35
+356,296,55085,1,8
+356,96,55428,6,0,B|296:96|256:9|256:9|216:96|152:96,1,280
+160,20,56285,1,0
+92,56,56456,1,8
+84,132,56628,1,0
+156,96,56799,6,0,B|156:155|242:195|242:195|156:236|155:300,1,280
+92,252,57656,1,0
+88,328,57828,1,8
+148,376,57999,1,0
+155,299,58171,6,0,B|215:299|255:386|255:386|295:299|359:299,1,280
+356,376,59028,1,0
+424,336,59199,1,8
+428,260,59371,1,0
+356,298,59542,6,0,B|356:239|270:199|270:199|356:158|357:94,1,280
+424,140,60399,1,0
+428,64,60571,1,8
+360,24,60742,1,0
+284,24,60913,6,0,B|212:24,1,70
+136,24,61256,1,8
+60,24,61428,1,0
+60,36,61513,1,0
+60,48,61599,2,0,B|60:124,1,70
+60,196,61942,1,8
+136,196,62113,1,0
+136,184,62199,1,0
+136,172,62285,6,0,B|136:96,1,70
+212,104,62628,1,8
+212,180,62799,1,0
+212,192,62885,1,0
+212,204,62971,2,0,B|212:292,1,70,8|0
+136,272,63313,2,0,B|60:272,1,70,8|0
+256,192,63656,12,0,65028
+256,324,65713,6,0,B|256:360,2,35,0|0|0
+288,256,66056,1,0
+328,316,66228,1,8
+400,288,66399,6,0,B|448:264|448:204,1,70,6|0
+380,192,66742,1,8
+444,148,66913,2,0,B|420:100|360:100,1,70,2|0
+316,124,67256,2,0,B|292:96|292:96|300:64,1,70,0|10
+224,48,67599,2,0,B|196:72|196:72|164:64,1,70,0|2
+104,112,67942,2,0,B|128:140|128:140|120:172,1,70,0|10
+80,240,68285,2,0,B|108:264|108:264|140:256,1,70,0|2
+200,208,68628,2,0,B|216:128,2,70,0|10|0
+212,284,69142,5,2
+256,356,69313,1,0
+256,356,69485,1,0
+292,280,69656,1,2
+292,280,69828,1,0
+368,308,69999,1,0
+376,304,70085,1,0
+384,300,70171,1,10
+392,296,70256,1,0
+400,292,70342,1,0
+408,288,70428,1,0
+416,284,70513,2,8,B|472:240|444:156,3,140,10|10|10|10
+312,44,71885,5,2
+312,44,72056,1,0
+224,32,72228,1,8
+216,40,72313,1,0
+208,48,72399,1,2
+200,56,72485,1,0
+192,64,72571,1,0
+124,28,72742,1,0
+48,36,72913,2,0,B|60:84|100:104,1,70,10|0
+44,160,73256,6,0,B|44:228,1,70,2|0
+116,200,73599,2,0,B|116:272,1,70,10|0
+188,240,73942,2,0,B|188:312,2,70,2|0|10
+188,164,74456,1,0
+260,196,74628,6,0,B|324:256,1,70,2|0
+361,195,74971,2,0,B|311:243,1,70,8|2
+260,292,75313,2,0,B|324:232,1,70
+360,294,75656,2,0,B|311:244,1,70,10|0
+256,192,75999,12,0,77028
+48,192,77371,6,0,B|48:48,1,140
+152,192,78056,2,0,B|152:336,1,140
+152,192,78742,2,0,B|152:48,1,140
+256,192,79427,2,0,B|256:336,1,140
+256,192,80113,6,0,B|256:32,2,140
+256,304,81142,2,0,B|416:304,2,140
+468,304,82171,1,0
+468,304,82513,1,0
+352,112,82856,6,0,B|408:69,3,70
+448,128,83542,1,0
+324,192,83885,1,0
+160,112,84228,6,0,B|103:69,3,70
+64,128,84913,1,0
+188,192,85256,1,0
+352,272,85599,6,0,B|408:314,3,70
+356,364,86285,1,0
+356,364,86456,1,0
+356,364,86628,1,0
+160,272,86971,6,0,B|128:300,4,35
+256,64,87999,1,12
+104,80,88342,6,0,B|20:200|96:376|336:380|344:128,1,560,4|0
+408,100,89885,1,0
+416,168,90056,1,0
+400,236,90228,1,0
+360,296,90399,6,0,B|300:412|104:424|24:300|16:224,1,420
+60,196,91599,1,0
+24,136,91771,2,0,B|140:60,1,140
+256,192,92285,12,0,93828
+64,168,94513,6,0,B|24:272|168:376|244:280,1,280
+300,300,95371,1,0
+340,244,95542,1,0
+404,272,95713,1,0
+448,216,95885,6,0,B|488:112|344:8|268:104,1,280
+256,228,96913,1,0
+464,336,97256,6,0,B|388:296|388:364|320:324,1,140
+252,328,97771,1,0
+176,328,97942,2,0,B|104:328,7,70,0|0|0|0|0|0|8|0
+28,328,99313,6,0,B|-16:184|72:68|216:64|260:160,1,420,4|8
+484,328,100685,2,0,B|528:184|440:68|296:64|244:168,1,420,0|8
+160,264,102056,6,0,B|160:336|256:385|352:336|352:264,2,280,0|8|0
+48,152,103771,1,8
+256,72,104113,1,0
+464,152,104456,1,8
+352,264,104799,5,0
+272,264,104971,2,0,B|208:264,2,35,0|0|8
+240,184,105313,2,0,B|304:184,2,35
+272,104,105656,2,0,B|208:104,2,35,0|0|8
+240,28,105999,2,0,B|304:28,2,35
+168,64,106342,6,0,B|80:104,1,70,0|8
+56,192,106685,2,0,B|128:192,1,70
+104,291,107028,2,0,B|168:320,1,70,0|8
+256,192,107371,1,0
+344,64,107542,6,0,B|432:104,1,70,8|0
+456,192,107885,2,0,B|384:192,1,70,8|0
+408,291,108228,2,0,B|344:320,1,70,8|0
+256,192,108571,2,0,B|256:160,6,23.3333333333333,0|0|0|0|0|0|4
+256,192,108999,12,8,109942
+168,120,110285,6,0,B|232:56,1,70
+344,120,110628,2,0,B|280:56,1,70,8|0
+207,192,110971,2,0,B|271:128,1,70
+305,192,111313,2,0,B|241:128,1,70,8|0
+216,304,111656,2,0,B|256:247|256:247|296:304,3,140,0|8|0|8
+352,112,113028,5,0
+360,192,113199,2,0,B|368:256,2,35,0|0|8
+424,144,113542,1,0
+352,112,113713,1,0
+408,64,113885,2,0,B|456:48,2,35,0|0|8
+336,40,114228,1,0
+352,112,114399,1,0
+280,88,114571,2,0,B|248:72,2,35,0|0|8
+352,112,114913,1,0
+296,160,115085,1,8
+368,184,115256,1,8
+424,136,115428,1,8
+128,72,115771,6,0,B|88:56|88:88|56:72,1,70
+64,152,116113,2,0,B|104:168|104:136|136:152,1,70,8|0
+136,232,116456,2,0,B|96:216|96:248|64:232,1,70
+72,312,116798,2,0,B|112:328|112:296|144:312,1,70,8|0
+216,312,117142,5,0
+216,192,117313,1,0
+216,72,117485,1,8
+296,296,117828,5,0
+296,176,117999,1,0
+296,56,118171,1,8
+448,64,118513,6,0,B|392:104,1,70
+392,184,118856,1,8
+392,192,118942,1,0
+392,200,119028,1,0
+392,288,119199,2,0,B|392:328,2,35
+464,240,119542,1,8
+464,248,119628,1,0
+464,256,119713,1,0
+464,336,119885,6,2,B|256:360|256:360|48:336,1,420
+256,192,121256,12,0,123999
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/104973-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/104973-expected-conversion.json
new file mode 100644
index 0000000000..8a5fa1ab79
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/104973-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":11980.0,"Objects":[{"StartTime":11980.0,"Position":152.0,"HyperDash":false}]},{"StartTime":12313.0,"Objects":[{"StartTime":12313.0,"Position":344.0,"HyperDash":false}]},{"StartTime":12647.0,"Objects":[{"StartTime":12647.0,"Position":132.0,"HyperDash":false},{"StartTime":12730.0,"Position":96.8423157,"HyperDash":false},{"StartTime":12813.0,"Position":80.68463,"HyperDash":false},{"StartTime":12896.0,"Position":68.52695,"HyperDash":false},{"StartTime":12980.0,"Position":51.1263962,"HyperDash":false},{"StartTime":13054.0,"Position":84.0983,"HyperDash":false},{"StartTime":13128.0,"Position":104.070213,"HyperDash":false},{"StartTime":13202.0,"Position":106.04213,"HyperDash":false},{"StartTime":13313.0,"Position":132.0,"HyperDash":false}]},{"StartTime":13646.0,"Objects":[{"StartTime":13646.0,"Position":220.0,"HyperDash":false}]},{"StartTime":13980.0,"Objects":[{"StartTime":13980.0,"Position":240.0,"HyperDash":false},{"StartTime":14063.0,"Position":219.934647,"HyperDash":false},{"StartTime":14146.0,"Position":186.8693,"HyperDash":false},{"StartTime":14229.0,"Position":174.80394,"HyperDash":false},{"StartTime":14313.0,"Position":163.508881,"HyperDash":false},{"StartTime":14387.0,"Position":168.5069,"HyperDash":false},{"StartTime":14461.0,"Position":193.504929,"HyperDash":false},{"StartTime":14535.0,"Position":228.50296,"HyperDash":false},{"StartTime":14646.0,"Position":240.0,"HyperDash":false}]},{"StartTime":14980.0,"Objects":[{"StartTime":14980.0,"Position":316.0,"HyperDash":false}]},{"StartTime":15313.0,"Objects":[{"StartTime":15313.0,"Position":304.0,"HyperDash":false},{"StartTime":15387.0,"Position":327.87616,"HyperDash":false},{"StartTime":15461.0,"Position":334.752319,"HyperDash":false},{"StartTime":15535.0,"Position":368.628479,"HyperDash":false},{"StartTime":15646.0,"Position":393.442719,"HyperDash":false}]},{"StartTime":15980.0,"Objects":[{"StartTime":15980.0,"Position":496.0,"HyperDash":false},{"StartTime":16054.0,"Position":463.669525,"HyperDash":false},{"StartTime":16128.0,"Position":457.4449,"HyperDash":false},{"StartTime":16202.0,"Position":466.1673,"HyperDash":false},{"StartTime":16313.0,"Position":418.33728,"HyperDash":false}]},{"StartTime":16647.0,"Objects":[{"StartTime":16647.0,"Position":296.0,"HyperDash":false},{"StartTime":16730.0,"Position":288.3361,"HyperDash":false},{"StartTime":16813.0,"Position":260.278259,"HyperDash":false},{"StartTime":16896.0,"Position":216.255356,"HyperDash":false},{"StartTime":16980.0,"Position":202.409332,"HyperDash":false},{"StartTime":17063.0,"Position":195.537857,"HyperDash":false},{"StartTime":17146.0,"Position":159.494614,"HyperDash":false},{"StartTime":17229.0,"Position":152.264984,"HyperDash":false},{"StartTime":17313.0,"Position":133.499115,"HyperDash":false},{"StartTime":17396.0,"Position":132.895508,"HyperDash":false},{"StartTime":17480.0,"Position":160.2883,"HyperDash":false},{"StartTime":17563.0,"Position":181.309479,"HyperDash":false},{"StartTime":17647.0,"Position":202.409348,"HyperDash":false},{"StartTime":17721.0,"Position":206.570633,"HyperDash":false},{"StartTime":17795.0,"Position":222.901245,"HyperDash":false},{"StartTime":17869.0,"Position":247.13147,"HyperDash":false},{"StartTime":17980.0,"Position":296.0,"HyperDash":false}]},{"StartTime":18312.0,"Objects":[{"StartTime":18312.0,"Position":296.0,"HyperDash":false}]},{"StartTime":18646.0,"Objects":[{"StartTime":18646.0,"Position":276.0,"HyperDash":false}]},{"StartTime":18980.0,"Objects":[{"StartTime":18980.0,"Position":416.0,"HyperDash":false},{"StartTime":19054.0,"Position":407.972717,"HyperDash":false},{"StartTime":19128.0,"Position":394.945435,"HyperDash":false},{"StartTime":19202.0,"Position":393.918152,"HyperDash":false},{"StartTime":19313.0,"Position":384.377228,"HyperDash":false}]},{"StartTime":19646.0,"Objects":[{"StartTime":19646.0,"Position":160.0,"HyperDash":false}]},{"StartTime":19980.0,"Objects":[{"StartTime":19980.0,"Position":376.0,"HyperDash":false}]},{"StartTime":20313.0,"Objects":[{"StartTime":20313.0,"Position":168.0,"HyperDash":false},{"StartTime":20396.0,"Position":166.842316,"HyperDash":false},{"StartTime":20479.0,"Position":121.684631,"HyperDash":false},{"StartTime":20562.0,"Position":112.526947,"HyperDash":false},{"StartTime":20646.0,"Position":87.1263962,"HyperDash":false},{"StartTime":20720.0,"Position":118.0983,"HyperDash":false},{"StartTime":20794.0,"Position":140.070221,"HyperDash":false},{"StartTime":20868.0,"Position":158.04213,"HyperDash":false},{"StartTime":20979.0,"Position":168.0,"HyperDash":false}]},{"StartTime":21313.0,"Objects":[{"StartTime":21313.0,"Position":232.0,"HyperDash":false},{"StartTime":21396.0,"Position":222.713379,"HyperDash":false},{"StartTime":21479.0,"Position":200.426743,"HyperDash":false},{"StartTime":21562.0,"Position":168.140121,"HyperDash":false},{"StartTime":21646.0,"Position":134.560883,"HyperDash":false},{"StartTime":21720.0,"Position":139.21402,"HyperDash":false},{"StartTime":21794.0,"Position":182.867157,"HyperDash":false},{"StartTime":21868.0,"Position":187.5203,"HyperDash":false},{"StartTime":21979.0,"Position":232.0,"HyperDash":false}]},{"StartTime":22647.0,"Objects":[{"StartTime":22647.0,"Position":453.0,"HyperDash":false}]},{"StartTime":22980.0,"Objects":[{"StartTime":22980.0,"Position":363.0,"HyperDash":false}]},{"StartTime":23313.0,"Objects":[{"StartTime":23313.0,"Position":309.0,"HyperDash":false}]},{"StartTime":23647.0,"Objects":[{"StartTime":23647.0,"Position":448.0,"HyperDash":false}]},{"StartTime":23980.0,"Objects":[{"StartTime":23980.0,"Position":336.0,"HyperDash":false},{"StartTime":24063.0,"Position":321.0,"HyperDash":false},{"StartTime":24146.0,"Position":354.0,"HyperDash":false},{"StartTime":24229.0,"Position":328.0,"HyperDash":false},{"StartTime":24313.0,"Position":336.0,"HyperDash":false},{"StartTime":24387.0,"Position":352.0,"HyperDash":false},{"StartTime":24461.0,"Position":339.0,"HyperDash":false},{"StartTime":24535.0,"Position":326.0,"HyperDash":false},{"StartTime":24646.0,"Position":336.0,"HyperDash":false}]},{"StartTime":24980.0,"Objects":[{"StartTime":24980.0,"Position":176.0,"HyperDash":false}]},{"StartTime":25313.0,"Objects":[{"StartTime":25313.0,"Position":48.0,"HyperDash":false}]},{"StartTime":25647.0,"Objects":[{"StartTime":25647.0,"Position":228.0,"HyperDash":false}]},{"StartTime":25979.0,"Objects":[{"StartTime":25979.0,"Position":36.0,"HyperDash":false}]},{"StartTime":26313.0,"Objects":[{"StartTime":26313.0,"Position":176.0,"HyperDash":false}]},{"StartTime":26646.0,"Objects":[{"StartTime":26646.0,"Position":132.0,"HyperDash":false},{"StartTime":26729.0,"Position":157.86972,"HyperDash":false},{"StartTime":26812.0,"Position":171.739441,"HyperDash":false},{"StartTime":26895.0,"Position":206.609161,"HyperDash":false},{"StartTime":26979.0,"Position":231.7785,"HyperDash":false},{"StartTime":27053.0,"Position":191.605515,"HyperDash":false},{"StartTime":27127.0,"Position":171.43251,"HyperDash":false},{"StartTime":27201.0,"Position":173.2595,"HyperDash":false},{"StartTime":27312.0,"Position":132.0,"HyperDash":false}]},{"StartTime":27647.0,"Objects":[{"StartTime":27647.0,"Position":256.0,"HyperDash":false}]},{"StartTime":27980.0,"Objects":[{"StartTime":27980.0,"Position":404.0,"HyperDash":false},{"StartTime":28054.0,"Position":410.368652,"HyperDash":false},{"StartTime":28128.0,"Position":420.008545,"HyperDash":false},{"StartTime":28202.0,"Position":448.395325,"HyperDash":false},{"StartTime":28313.0,"Position":467.645935,"HyperDash":false}]},{"StartTime":28646.0,"Objects":[{"StartTime":28646.0,"Position":220.0,"HyperDash":false}]},{"StartTime":28980.0,"Objects":[{"StartTime":28980.0,"Position":348.0,"HyperDash":false}]},{"StartTime":29313.0,"Objects":[{"StartTime":29313.0,"Position":336.0,"HyperDash":false},{"StartTime":29387.0,"Position":303.6809,"HyperDash":false},{"StartTime":29461.0,"Position":303.67157,"HyperDash":false},{"StartTime":29535.0,"Position":277.6959,"HyperDash":false},{"StartTime":29646.0,"Position":260.962,"HyperDash":false}]},{"StartTime":29979.0,"Objects":[{"StartTime":29979.0,"Position":360.0,"HyperDash":false}]},{"StartTime":30313.0,"Objects":[{"StartTime":30313.0,"Position":248.0,"HyperDash":false}]},{"StartTime":30646.0,"Objects":[{"StartTime":30646.0,"Position":360.0,"HyperDash":false}]},{"StartTime":31313.0,"Objects":[{"StartTime":31313.0,"Position":24.0,"HyperDash":false}]},{"StartTime":31646.0,"Objects":[{"StartTime":31646.0,"Position":96.0,"HyperDash":false}]},{"StartTime":31979.0,"Objects":[{"StartTime":31979.0,"Position":116.0,"HyperDash":false}]},{"StartTime":32313.0,"Objects":[{"StartTime":32313.0,"Position":168.0,"HyperDash":false}]},{"StartTime":32647.0,"Objects":[{"StartTime":32647.0,"Position":360.0,"HyperDash":false}]},{"StartTime":33313.0,"Objects":[{"StartTime":33313.0,"Position":488.0,"HyperDash":false}]},{"StartTime":33647.0,"Objects":[{"StartTime":33647.0,"Position":488.0,"HyperDash":false},{"StartTime":33721.0,"Position":462.092926,"HyperDash":false},{"StartTime":33795.0,"Position":475.185822,"HyperDash":false},{"StartTime":33869.0,"Position":480.278748,"HyperDash":false},{"StartTime":33980.0,"Position":447.918121,"HyperDash":false}]},{"StartTime":34313.0,"Objects":[{"StartTime":34313.0,"Position":380.0,"HyperDash":false},{"StartTime":34396.0,"Position":378.853241,"HyperDash":false},{"StartTime":34479.0,"Position":357.6393,"HyperDash":false},{"StartTime":34544.0,"Position":376.301575,"HyperDash":false},{"StartTime":34646.0,"Position":380.0,"HyperDash":false}]},{"StartTime":34980.0,"Objects":[{"StartTime":34980.0,"Position":312.0,"HyperDash":false},{"StartTime":35054.0,"Position":293.8341,"HyperDash":false},{"StartTime":35128.0,"Position":274.729065,"HyperDash":false},{"StartTime":35202.0,"Position":262.3615,"HyperDash":false},{"StartTime":35313.0,"Position":217.647247,"HyperDash":false}]},{"StartTime":35646.0,"Objects":[{"StartTime":35646.0,"Position":116.0,"HyperDash":false},{"StartTime":35729.0,"Position":76.07507,"HyperDash":false},{"StartTime":35812.0,"Position":66.0,"HyperDash":false},{"StartTime":35877.0,"Position":82.36937,"HyperDash":false},{"StartTime":35979.0,"Position":116.0,"HyperDash":false}]},{"StartTime":36313.0,"Objects":[{"StartTime":36313.0,"Position":232.0,"HyperDash":false},{"StartTime":36387.0,"Position":244.2069,"HyperDash":false},{"StartTime":36461.0,"Position":281.2214,"HyperDash":false},{"StartTime":36535.0,"Position":306.592651,"HyperDash":false},{"StartTime":36646.0,"Position":327.491272,"HyperDash":false}]},{"StartTime":36813.0,"Objects":[{"StartTime":36813.0,"Position":356.0,"HyperDash":false},{"StartTime":36896.0,"Position":384.924927,"HyperDash":false},{"StartTime":36979.0,"Position":406.0,"HyperDash":false},{"StartTime":37044.0,"Position":376.6306,"HyperDash":false},{"StartTime":37146.0,"Position":356.0,"HyperDash":false}]},{"StartTime":37313.0,"Objects":[{"StartTime":37313.0,"Position":172.0,"HyperDash":false}]},{"StartTime":37646.0,"Objects":[{"StartTime":37646.0,"Position":176.0,"HyperDash":false},{"StartTime":37729.0,"Position":141.075073,"HyperDash":false},{"StartTime":37812.0,"Position":126.0,"HyperDash":false},{"StartTime":37877.0,"Position":152.36937,"HyperDash":false},{"StartTime":37979.0,"Position":176.0,"HyperDash":false}]},{"StartTime":38313.0,"Objects":[{"StartTime":38313.0,"Position":232.0,"HyperDash":false}]},{"StartTime":38647.0,"Objects":[{"StartTime":38647.0,"Position":60.0,"HyperDash":false}]},{"StartTime":38980.0,"Objects":[{"StartTime":38980.0,"Position":276.0,"HyperDash":false}]},{"StartTime":39313.0,"Objects":[{"StartTime":39313.0,"Position":60.0,"HyperDash":false},{"StartTime":39396.0,"Position":79.53542,"HyperDash":false},{"StartTime":39479.0,"Position":80.3983,"HyperDash":false},{"StartTime":39562.0,"Position":95.7953949,"HyperDash":false},{"StartTime":39646.0,"Position":96.9988861,"HyperDash":false},{"StartTime":39711.0,"Position":90.0326843,"HyperDash":false},{"StartTime":39813.0,"Position":130.8265,"HyperDash":false}]},{"StartTime":39980.0,"Objects":[{"StartTime":39980.0,"Position":148.0,"HyperDash":false},{"StartTime":40063.0,"Position":155.921555,"HyperDash":false},{"StartTime":40146.0,"Position":200.495987,"HyperDash":false},{"StartTime":40229.0,"Position":229.243881,"HyperDash":false},{"StartTime":40313.0,"Position":244.105148,"HyperDash":false},{"StartTime":40378.0,"Position":263.884155,"HyperDash":false},{"StartTime":40479.0,"Position":285.356873,"HyperDash":false}]},{"StartTime":40647.0,"Objects":[{"StartTime":40647.0,"Position":274.0,"HyperDash":false}]},{"StartTime":40980.0,"Objects":[{"StartTime":40980.0,"Position":392.0,"HyperDash":false},{"StartTime":41063.0,"Position":414.371643,"HyperDash":false},{"StartTime":41146.0,"Position":440.8901,"HyperDash":false},{"StartTime":41211.0,"Position":438.9507,"HyperDash":false},{"StartTime":41313.0,"Position":392.0,"HyperDash":false}]},{"StartTime":41647.0,"Objects":[{"StartTime":41647.0,"Position":292.0,"HyperDash":false},{"StartTime":41721.0,"Position":255.813812,"HyperDash":false},{"StartTime":41795.0,"Position":263.524658,"HyperDash":false},{"StartTime":41869.0,"Position":212.4873,"HyperDash":false},{"StartTime":41980.0,"Position":199.067825,"HyperDash":false}]},{"StartTime":42147.0,"Objects":[{"StartTime":42147.0,"Position":176.0,"HyperDash":false},{"StartTime":42212.0,"Position":183.0,"HyperDash":false},{"StartTime":42313.0,"Position":176.0,"HyperDash":false}]},{"StartTime":42480.0,"Objects":[{"StartTime":42480.0,"Position":140.0,"HyperDash":false},{"StartTime":42545.0,"Position":131.421692,"HyperDash":false},{"StartTime":42646.0,"Position":90.0,"HyperDash":false}]},{"StartTime":42980.0,"Objects":[{"StartTime":42980.0,"Position":210.0,"HyperDash":false},{"StartTime":43063.0,"Position":225.924927,"HyperDash":false},{"StartTime":43146.0,"Position":260.0,"HyperDash":false},{"StartTime":43211.0,"Position":233.63063,"HyperDash":false},{"StartTime":43313.0,"Position":210.0,"HyperDash":false}]},{"StartTime":43647.0,"Objects":[{"StartTime":43647.0,"Position":248.0,"HyperDash":false}]},{"StartTime":43980.0,"Objects":[{"StartTime":43980.0,"Position":264.0,"HyperDash":false}]},{"StartTime":44313.0,"Objects":[{"StartTime":44313.0,"Position":248.0,"HyperDash":false}]},{"StartTime":44647.0,"Objects":[{"StartTime":44647.0,"Position":344.0,"HyperDash":false},{"StartTime":44721.0,"Position":364.6328,"HyperDash":false},{"StartTime":44795.0,"Position":391.265625,"HyperDash":false},{"StartTime":44869.0,"Position":390.898438,"HyperDash":false},{"StartTime":44980.0,"Position":436.847656,"HyperDash":false}]},{"StartTime":45313.0,"Objects":[{"StartTime":45313.0,"Position":340.0,"HyperDash":false},{"StartTime":45387.0,"Position":332.927124,"HyperDash":false},{"StartTime":45461.0,"Position":320.854218,"HyperDash":false},{"StartTime":45535.0,"Position":286.7813,"HyperDash":false},{"StartTime":45646.0,"Position":272.172,"HyperDash":false}]},{"StartTime":45980.0,"Objects":[{"StartTime":45980.0,"Position":236.0,"HyperDash":false},{"StartTime":46054.0,"Position":231.452988,"HyperDash":false},{"StartTime":46128.0,"Position":230.905975,"HyperDash":false},{"StartTime":46202.0,"Position":205.358963,"HyperDash":false},{"StartTime":46313.0,"Position":197.538452,"HyperDash":false}]},{"StartTime":46647.0,"Objects":[{"StartTime":46647.0,"Position":92.0,"HyperDash":false},{"StartTime":46721.0,"Position":83.9194641,"HyperDash":false},{"StartTime":46795.0,"Position":66.01362,"HyperDash":false},{"StartTime":46869.0,"Position":83.9567261,"HyperDash":false},{"StartTime":46980.0,"Position":93.07765,"HyperDash":false}]},{"StartTime":47313.0,"Objects":[{"StartTime":47313.0,"Position":312.0,"HyperDash":false}]},{"StartTime":47647.0,"Objects":[{"StartTime":47647.0,"Position":324.0,"HyperDash":false},{"StartTime":47730.0,"Position":367.924927,"HyperDash":false},{"StartTime":47813.0,"Position":374.0,"HyperDash":false},{"StartTime":47878.0,"Position":351.6306,"HyperDash":false},{"StartTime":47980.0,"Position":324.0,"HyperDash":false}]},{"StartTime":48313.0,"Objects":[{"StartTime":48313.0,"Position":212.0,"HyperDash":false},{"StartTime":48387.0,"Position":201.990753,"HyperDash":false},{"StartTime":48461.0,"Position":179.8291,"HyperDash":false},{"StartTime":48535.0,"Position":186.227524,"HyperDash":false},{"StartTime":48646.0,"Position":213.404251,"HyperDash":false}]},{"StartTime":48980.0,"Objects":[{"StartTime":48980.0,"Position":428.0,"HyperDash":false}]},{"StartTime":49313.0,"Objects":[{"StartTime":49313.0,"Position":220.0,"HyperDash":false}]},{"StartTime":49647.0,"Objects":[{"StartTime":49647.0,"Position":256.0,"HyperDash":false},{"StartTime":49730.0,"Position":255.0,"HyperDash":false},{"StartTime":49813.0,"Position":256.0,"HyperDash":false},{"StartTime":49878.0,"Position":273.0,"HyperDash":false},{"StartTime":49980.0,"Position":256.0,"HyperDash":false}]},{"StartTime":50313.0,"Objects":[{"StartTime":50313.0,"Position":392.0,"HyperDash":false}]},{"StartTime":50647.0,"Objects":[{"StartTime":50647.0,"Position":256.0,"HyperDash":false}]},{"StartTime":50980.0,"Objects":[{"StartTime":50980.0,"Position":256.0,"HyperDash":false},{"StartTime":51063.0,"Position":268.0,"HyperDash":false},{"StartTime":51146.0,"Position":256.0,"HyperDash":false},{"StartTime":51211.0,"Position":267.0,"HyperDash":false},{"StartTime":51313.0,"Position":256.0,"HyperDash":false}]},{"StartTime":51647.0,"Objects":[{"StartTime":51647.0,"Position":200.0,"HyperDash":false},{"StartTime":51721.0,"Position":220.222229,"HyperDash":false},{"StartTime":51795.0,"Position":261.444458,"HyperDash":false},{"StartTime":51869.0,"Position":257.6667,"HyperDash":false},{"StartTime":51980.0,"Position":300.0,"HyperDash":false}]},{"StartTime":52647.0,"Objects":[{"StartTime":52647.0,"Position":136.0,"HyperDash":false}]},{"StartTime":52980.0,"Objects":[{"StartTime":52980.0,"Position":256.0,"HyperDash":false},{"StartTime":53063.0,"Position":291.9663,"HyperDash":false},{"StartTime":53146.0,"Position":284.932617,"HyperDash":false},{"StartTime":53229.0,"Position":307.898926,"HyperDash":false},{"StartTime":53313.0,"Position":340.117859,"HyperDash":false},{"StartTime":53387.0,"Position":325.425,"HyperDash":false},{"StartTime":53461.0,"Position":290.732147,"HyperDash":false},{"StartTime":53535.0,"Position":300.039276,"HyperDash":false},{"StartTime":53646.0,"Position":256.0,"HyperDash":false}]},{"StartTime":53980.0,"Objects":[{"StartTime":53980.0,"Position":384.0,"HyperDash":false}]},{"StartTime":54313.0,"Objects":[{"StartTime":54313.0,"Position":256.0,"HyperDash":false},{"StartTime":54396.0,"Position":223.033691,"HyperDash":false},{"StartTime":54479.0,"Position":213.067383,"HyperDash":false},{"StartTime":54562.0,"Position":180.101074,"HyperDash":false},{"StartTime":54646.0,"Position":171.882141,"HyperDash":false},{"StartTime":54720.0,"Position":184.575012,"HyperDash":false},{"StartTime":54794.0,"Position":201.267853,"HyperDash":false},{"StartTime":54868.0,"Position":218.960709,"HyperDash":false},{"StartTime":54979.0,"Position":256.0,"HyperDash":false}]},{"StartTime":55313.0,"Objects":[{"StartTime":55313.0,"Position":368.0,"HyperDash":false}]},{"StartTime":55647.0,"Objects":[{"StartTime":55647.0,"Position":256.0,"HyperDash":false},{"StartTime":55730.0,"Position":251.0,"HyperDash":false},{"StartTime":55813.0,"Position":251.0,"HyperDash":false},{"StartTime":55896.0,"Position":270.0,"HyperDash":false},{"StartTime":55980.0,"Position":256.0,"HyperDash":false},{"StartTime":56054.0,"Position":259.0,"HyperDash":false},{"StartTime":56128.0,"Position":244.0,"HyperDash":false},{"StartTime":56202.0,"Position":244.0,"HyperDash":false},{"StartTime":56313.0,"Position":256.0,"HyperDash":false}]},{"StartTime":56647.0,"Objects":[{"StartTime":56647.0,"Position":276.0,"HyperDash":false}]},{"StartTime":57313.0,"Objects":[{"StartTime":57313.0,"Position":488.0,"HyperDash":false}]},{"StartTime":57647.0,"Objects":[{"StartTime":57647.0,"Position":488.0,"HyperDash":false},{"StartTime":57721.0,"Position":481.4433,"HyperDash":false},{"StartTime":57795.0,"Position":483.349152,"HyperDash":false},{"StartTime":57869.0,"Position":454.0119,"HyperDash":false},{"StartTime":57980.0,"Position":458.509216,"HyperDash":false}]},{"StartTime":58313.0,"Objects":[{"StartTime":58313.0,"Position":360.0,"HyperDash":false},{"StartTime":58387.0,"Position":344.2625,"HyperDash":false},{"StartTime":58461.0,"Position":344.958252,"HyperDash":false},{"StartTime":58535.0,"Position":319.941345,"HyperDash":false},{"StartTime":58646.0,"Position":314.506317,"HyperDash":false}]},{"StartTime":58980.0,"Objects":[{"StartTime":58980.0,"Position":428.0,"HyperDash":false}]},{"StartTime":59313.0,"Objects":[{"StartTime":59313.0,"Position":260.0,"HyperDash":false}]},{"StartTime":59647.0,"Objects":[{"StartTime":59647.0,"Position":224.0,"HyperDash":false},{"StartTime":59730.0,"Position":233.954819,"HyperDash":false},{"StartTime":59813.0,"Position":211.873215,"HyperDash":false},{"StartTime":59878.0,"Position":207.570984,"HyperDash":false},{"StartTime":59980.0,"Position":224.0,"HyperDash":false}]},{"StartTime":60313.0,"Objects":[{"StartTime":60313.0,"Position":304.0,"HyperDash":false}]},{"StartTime":60647.0,"Objects":[{"StartTime":60647.0,"Position":208.0,"HyperDash":false}]},{"StartTime":60980.0,"Objects":[{"StartTime":60980.0,"Position":136.0,"HyperDash":false},{"StartTime":61063.0,"Position":100.414207,"HyperDash":false},{"StartTime":61146.0,"Position":86.6803,"HyperDash":false},{"StartTime":61211.0,"Position":91.78613,"HyperDash":false},{"StartTime":61313.0,"Position":136.0,"HyperDash":false}]},{"StartTime":61647.0,"Objects":[{"StartTime":61647.0,"Position":448.0,"HyperDash":false}]},{"StartTime":61980.0,"Objects":[{"StartTime":61980.0,"Position":256.0,"HyperDash":false}]},{"StartTime":62313.0,"Objects":[{"StartTime":62313.0,"Position":420.0,"HyperDash":false}]},{"StartTime":62647.0,"Objects":[{"StartTime":62647.0,"Position":228.0,"HyperDash":false}]},{"StartTime":62980.0,"Objects":[{"StartTime":62980.0,"Position":204.0,"HyperDash":false},{"StartTime":63063.0,"Position":197.227524,"HyperDash":false},{"StartTime":63146.0,"Position":154.305817,"HyperDash":false},{"StartTime":63211.0,"Position":183.556717,"HyperDash":false},{"StartTime":63313.0,"Position":204.0,"HyperDash":false}]},{"StartTime":63647.0,"Objects":[{"StartTime":63647.0,"Position":324.0,"HyperDash":false},{"StartTime":63721.0,"Position":356.66507,"HyperDash":false},{"StartTime":63795.0,"Position":328.949554,"HyperDash":false},{"StartTime":63869.0,"Position":341.904877,"HyperDash":false},{"StartTime":63980.0,"Position":341.121216,"HyperDash":false}]},{"StartTime":64313.0,"Objects":[{"StartTime":64313.0,"Position":180.0,"HyperDash":false}]},{"StartTime":64647.0,"Objects":[{"StartTime":64647.0,"Position":116.0,"HyperDash":false}]},{"StartTime":64980.0,"Objects":[{"StartTime":64980.0,"Position":36.0,"HyperDash":false},{"StartTime":65063.0,"Position":48.422226,"HyperDash":false},{"StartTime":65146.0,"Position":60.8444481,"HyperDash":false},{"StartTime":65229.0,"Position":42.26667,"HyperDash":false},{"StartTime":65313.0,"Position":61.7662659,"HyperDash":false},{"StartTime":65387.0,"Position":42.0404358,"HyperDash":false},{"StartTime":65461.0,"Position":31.3145981,"HyperDash":false},{"StartTime":65535.0,"Position":47.5887566,"HyperDash":false},{"StartTime":65646.0,"Position":36.0,"HyperDash":false}]},{"StartTime":65980.0,"Objects":[{"StartTime":65980.0,"Position":24.0,"HyperDash":false},{"StartTime":66063.0,"Position":33.5504036,"HyperDash":false},{"StartTime":66146.0,"Position":78.42056,"HyperDash":false},{"StartTime":66229.0,"Position":110.084938,"HyperDash":false},{"StartTime":66313.0,"Position":121.840134,"HyperDash":false},{"StartTime":66387.0,"Position":136.73616,"HyperDash":false},{"StartTime":66461.0,"Position":175.859619,"HyperDash":false},{"StartTime":66535.0,"Position":197.00679,"HyperDash":false},{"StartTime":66646.0,"Position":219.1586,"HyperDash":false}]},{"StartTime":66980.0,"Objects":[{"StartTime":66980.0,"Position":340.0,"HyperDash":false},{"StartTime":67054.0,"Position":368.672729,"HyperDash":false},{"StartTime":67128.0,"Position":380.049255,"HyperDash":false},{"StartTime":67202.0,"Position":406.45874,"HyperDash":false},{"StartTime":67313.0,"Position":423.819183,"HyperDash":false}]},{"StartTime":67647.0,"Objects":[{"StartTime":67647.0,"Position":436.0,"HyperDash":false},{"StartTime":67730.0,"Position":414.429535,"HyperDash":false},{"StartTime":67813.0,"Position":404.765259,"HyperDash":false},{"StartTime":67878.0,"Position":409.865173,"HyperDash":false},{"StartTime":67980.0,"Position":436.0,"HyperDash":false}]},{"StartTime":68313.0,"Objects":[{"StartTime":68313.0,"Position":468.0,"HyperDash":false}]},{"StartTime":68646.0,"Objects":[{"StartTime":68646.0,"Position":332.0,"HyperDash":false},{"StartTime":68720.0,"Position":334.127625,"HyperDash":false},{"StartTime":68794.0,"Position":293.255249,"HyperDash":false},{"StartTime":68868.0,"Position":281.382874,"HyperDash":false},{"StartTime":68979.0,"Position":256.074341,"HyperDash":false}]},{"StartTime":69313.0,"Objects":[{"StartTime":69313.0,"Position":272.0,"HyperDash":false},{"StartTime":69387.0,"Position":268.51,"HyperDash":false},{"StartTime":69461.0,"Position":219.019989,"HyperDash":false},{"StartTime":69535.0,"Position":233.529968,"HyperDash":false},{"StartTime":69646.0,"Position":188.794968,"HyperDash":false}]},{"StartTime":69980.0,"Objects":[{"StartTime":69980.0,"Position":208.0,"HyperDash":false},{"StartTime":70054.0,"Position":193.222229,"HyperDash":false},{"StartTime":70128.0,"Position":168.444443,"HyperDash":false},{"StartTime":70202.0,"Position":162.666656,"HyperDash":false},{"StartTime":70313.0,"Position":127.999992,"HyperDash":false}]},{"StartTime":70647.0,"Objects":[{"StartTime":70647.0,"Position":128.0,"HyperDash":false},{"StartTime":70721.0,"Position":108.251968,"HyperDash":false},{"StartTime":70795.0,"Position":105.503937,"HyperDash":false},{"StartTime":70869.0,"Position":59.7558975,"HyperDash":false},{"StartTime":70980.0,"Position":43.63385,"HyperDash":false}]},{"StartTime":71313.0,"Objects":[{"StartTime":71313.0,"Position":20.0,"HyperDash":false}]},{"StartTime":71647.0,"Objects":[{"StartTime":71647.0,"Position":72.0,"HyperDash":false},{"StartTime":71730.0,"Position":42.17414,"HyperDash":false},{"StartTime":71813.0,"Position":44.26499,"HyperDash":false},{"StartTime":71878.0,"Position":48.0091858,"HyperDash":false},{"StartTime":71980.0,"Position":72.0,"HyperDash":false}]},{"StartTime":72313.0,"Objects":[{"StartTime":72313.0,"Position":344.0,"HyperDash":false}]},{"StartTime":72647.0,"Objects":[{"StartTime":72647.0,"Position":256.0,"HyperDash":false}]},{"StartTime":72980.0,"Objects":[{"StartTime":72980.0,"Position":344.0,"HyperDash":false}]},{"StartTime":73313.0,"Objects":[{"StartTime":73313.0,"Position":192.0,"HyperDash":false}]},{"StartTime":73647.0,"Objects":[{"StartTime":73647.0,"Position":72.0,"HyperDash":false},{"StartTime":73730.0,"Position":35.075592,"HyperDash":false},{"StartTime":73813.0,"Position":34.03717,"HyperDash":false},{"StartTime":73878.0,"Position":44.7434921,"HyperDash":false},{"StartTime":73980.0,"Position":72.0,"HyperDash":false}]},{"StartTime":74313.0,"Objects":[{"StartTime":74313.0,"Position":208.0,"HyperDash":false}]},{"StartTime":74647.0,"Objects":[{"StartTime":74647.0,"Position":112.0,"HyperDash":false},{"StartTime":74730.0,"Position":135.84227,"HyperDash":false},{"StartTime":74813.0,"Position":152.1162,"HyperDash":false},{"StartTime":74896.0,"Position":171.061676,"HyperDash":false},{"StartTime":74980.0,"Position":196.921387,"HyperDash":false},{"StartTime":75063.0,"Position":218.520676,"HyperDash":false},{"StartTime":75146.0,"Position":260.403442,"HyperDash":false},{"StartTime":75229.0,"Position":258.21,"HyperDash":false},{"StartTime":75313.0,"Position":295.594574,"HyperDash":false},{"StartTime":75387.0,"Position":303.6625,"HyperDash":false},{"StartTime":75462.0,"Position":337.3289,"HyperDash":false},{"StartTime":75536.0,"Position":361.249237,"HyperDash":false},{"StartTime":75646.0,"Position":374.243744,"HyperDash":false}]},{"StartTime":75980.0,"Objects":[{"StartTime":75980.0,"Position":492.0,"HyperDash":false},{"StartTime":76063.0,"Position":469.9186,"HyperDash":false},{"StartTime":76146.0,"Position":442.890717,"HyperDash":false},{"StartTime":76229.0,"Position":461.403656,"HyperDash":false},{"StartTime":76313.0,"Position":454.9664,"HyperDash":false},{"StartTime":76387.0,"Position":453.878967,"HyperDash":false},{"StartTime":76461.0,"Position":434.64566,"HyperDash":false},{"StartTime":76535.0,"Position":431.048553,"HyperDash":false},{"StartTime":76646.0,"Position":439.4531,"HyperDash":false}]},{"StartTime":76980.0,"Objects":[{"StartTime":76980.0,"Position":320.0,"HyperDash":false},{"StartTime":77054.0,"Position":316.474152,"HyperDash":false},{"StartTime":77128.0,"Position":343.948273,"HyperDash":false},{"StartTime":77202.0,"Position":335.422424,"HyperDash":false},{"StartTime":77313.0,"Position":353.633636,"HyperDash":false}]},{"StartTime":77646.0,"Objects":[{"StartTime":77646.0,"Position":256.0,"HyperDash":false},{"StartTime":77720.0,"Position":272.0,"HyperDash":false},{"StartTime":77794.0,"Position":270.0,"HyperDash":false},{"StartTime":77868.0,"Position":249.0,"HyperDash":false},{"StartTime":77979.0,"Position":256.0,"HyperDash":false}]},{"StartTime":78313.0,"Objects":[{"StartTime":78313.0,"Position":192.0,"HyperDash":false},{"StartTime":78387.0,"Position":165.525864,"HyperDash":false},{"StartTime":78461.0,"Position":159.051712,"HyperDash":false},{"StartTime":78535.0,"Position":183.577576,"HyperDash":false},{"StartTime":78646.0,"Position":158.366364,"HyperDash":false}]},{"StartTime":78980.0,"Objects":[{"StartTime":78980.0,"Position":280.0,"HyperDash":false}]},{"StartTime":79313.0,"Objects":[{"StartTime":79313.0,"Position":320.0,"HyperDash":false},{"StartTime":79396.0,"Position":342.939819,"HyperDash":false},{"StartTime":79479.0,"Position":365.9111,"HyperDash":false},{"StartTime":79562.0,"Position":376.53537,"HyperDash":false},{"StartTime":79646.0,"Position":394.836121,"HyperDash":false},{"StartTime":79711.0,"Position":403.9664,"HyperDash":false},{"StartTime":79813.0,"Position":418.107727,"HyperDash":false}]},{"StartTime":79980.0,"Objects":[{"StartTime":79980.0,"Position":408.0,"HyperDash":false},{"StartTime":80063.0,"Position":393.190674,"HyperDash":false},{"StartTime":80146.0,"Position":340.936066,"HyperDash":false},{"StartTime":80229.0,"Position":331.749939,"HyperDash":false},{"StartTime":80313.0,"Position":313.736053,"HyperDash":false},{"StartTime":80378.0,"Position":308.810822,"HyperDash":false},{"StartTime":80480.0,"Position":274.773529,"HyperDash":false}]},{"StartTime":80647.0,"Objects":[{"StartTime":80647.0,"Position":236.0,"HyperDash":false},{"StartTime":80730.0,"Position":199.526276,"HyperDash":false},{"StartTime":80813.0,"Position":215.925659,"HyperDash":false},{"StartTime":80896.0,"Position":186.386475,"HyperDash":false},{"StartTime":80980.0,"Position":154.006546,"HyperDash":false},{"StartTime":81045.0,"Position":134.148682,"HyperDash":false},{"StartTime":81147.0,"Position":104.824638,"HyperDash":false}]},{"StartTime":81313.0,"Objects":[{"StartTime":81313.0,"Position":88.0,"HyperDash":false},{"StartTime":81396.0,"Position":110.135536,"HyperDash":false},{"StartTime":81479.0,"Position":112.874176,"HyperDash":false},{"StartTime":81562.0,"Position":127.188362,"HyperDash":false},{"StartTime":81646.0,"Position":144.1023,"HyperDash":false},{"StartTime":81711.0,"Position":162.4082,"HyperDash":false},{"StartTime":81813.0,"Position":185.452866,"HyperDash":false}]},{"StartTime":81980.0,"Objects":[{"StartTime":81980.0,"Position":240.0,"HyperDash":false}]},{"StartTime":82313.0,"Objects":[{"StartTime":82313.0,"Position":344.0,"HyperDash":false},{"StartTime":82396.0,"Position":356.924927,"HyperDash":false},{"StartTime":82479.0,"Position":394.0,"HyperDash":false},{"StartTime":82544.0,"Position":367.6306,"HyperDash":false},{"StartTime":82646.0,"Position":344.0,"HyperDash":false}]},{"StartTime":82980.0,"Objects":[{"StartTime":82980.0,"Position":96.0,"HyperDash":false}]},{"StartTime":83313.0,"Objects":[{"StartTime":83313.0,"Position":344.0,"HyperDash":false}]},{"StartTime":83647.0,"Objects":[{"StartTime":83647.0,"Position":436.0,"HyperDash":false}]},{"StartTime":83980.0,"Objects":[{"StartTime":83980.0,"Position":252.0,"HyperDash":false}]},{"StartTime":84313.0,"Objects":[{"StartTime":84313.0,"Position":228.0,"HyperDash":false},{"StartTime":84396.0,"Position":209.0,"HyperDash":false},{"StartTime":84479.0,"Position":228.0,"HyperDash":false},{"StartTime":84544.0,"Position":230.0,"HyperDash":false},{"StartTime":84646.0,"Position":228.0,"HyperDash":false}]},{"StartTime":84980.0,"Objects":[{"StartTime":84980.0,"Position":12.0,"HyperDash":false}]},{"StartTime":85313.0,"Objects":[{"StartTime":85313.0,"Position":228.0,"HyperDash":false}]},{"StartTime":85647.0,"Objects":[{"StartTime":85647.0,"Position":12.0,"HyperDash":false}]},{"StartTime":85980.0,"Objects":[{"StartTime":85980.0,"Position":228.0,"HyperDash":false}]},{"StartTime":86313.0,"Objects":[{"StartTime":86313.0,"Position":220.0,"HyperDash":false}]},{"StartTime":86647.0,"Objects":[{"StartTime":86647.0,"Position":104.0,"HyperDash":false}]},{"StartTime":86980.0,"Objects":[{"StartTime":86980.0,"Position":124.0,"HyperDash":false}]},{"StartTime":87313.0,"Objects":[{"StartTime":87313.0,"Position":104.0,"HyperDash":false},{"StartTime":87396.0,"Position":109.906219,"HyperDash":false},{"StartTime":87479.0,"Position":138.812454,"HyperDash":false},{"StartTime":87562.0,"Position":184.718689,"HyperDash":false},{"StartTime":87646.0,"Position":203.924988,"HyperDash":false},{"StartTime":87729.0,"Position":222.8312,"HyperDash":false},{"StartTime":87812.0,"Position":240.737427,"HyperDash":false},{"StartTime":87895.0,"Position":269.643677,"HyperDash":false},{"StartTime":87979.0,"Position":304.0,"HyperDash":false},{"StartTime":88062.0,"Position":273.2438,"HyperDash":false},{"StartTime":88146.0,"Position":243.0375,"HyperDash":false},{"StartTime":88229.0,"Position":229.131271,"HyperDash":false},{"StartTime":88313.0,"Position":203.924973,"HyperDash":false},{"StartTime":88387.0,"Position":182.719421,"HyperDash":false},{"StartTime":88461.0,"Position":174.513885,"HyperDash":false},{"StartTime":88535.0,"Position":126.308319,"HyperDash":false},{"StartTime":88646.0,"Position":104.0,"HyperDash":false}]},{"StartTime":88980.0,"Objects":[{"StartTime":88980.0,"Position":12.0,"HyperDash":false}]},{"StartTime":89313.0,"Objects":[{"StartTime":89313.0,"Position":196.0,"HyperDash":false}]},{"StartTime":89647.0,"Objects":[{"StartTime":89647.0,"Position":52.0,"HyperDash":false}]},{"StartTime":89980.0,"Objects":[{"StartTime":89980.0,"Position":244.0,"HyperDash":false},{"StartTime":90063.0,"Position":262.898438,"HyperDash":false},{"StartTime":90146.0,"Position":310.591949,"HyperDash":false},{"StartTime":90229.0,"Position":298.8366,"HyperDash":false},{"StartTime":90313.0,"Position":341.672577,"HyperDash":false},{"StartTime":90387.0,"Position":379.917847,"HyperDash":false},{"StartTime":90461.0,"Position":364.344666,"HyperDash":false},{"StartTime":90535.0,"Position":383.885345,"HyperDash":false},{"StartTime":90646.0,"Position":425.976227,"HyperDash":false}]},{"StartTime":90980.0,"Objects":[{"StartTime":90980.0,"Position":388.0,"HyperDash":false}]},{"StartTime":91313.0,"Objects":[{"StartTime":91313.0,"Position":312.0,"HyperDash":false},{"StartTime":91396.0,"Position":299.122223,"HyperDash":false},{"StartTime":91479.0,"Position":274.510773,"HyperDash":false},{"StartTime":91562.0,"Position":253.377548,"HyperDash":false},{"StartTime":91646.0,"Position":214.587158,"HyperDash":false},{"StartTime":91720.0,"Position":180.224533,"HyperDash":false},{"StartTime":91794.0,"Position":170.445953,"HyperDash":false},{"StartTime":91868.0,"Position":168.25264,"HyperDash":false},{"StartTime":91979.0,"Position":127.528435,"HyperDash":false}]},{"StartTime":92313.0,"Objects":[{"StartTime":92313.0,"Position":88.0,"HyperDash":false},{"StartTime":92387.0,"Position":105.606987,"HyperDash":false},{"StartTime":92461.0,"Position":128.524353,"HyperDash":false},{"StartTime":92535.0,"Position":143.583023,"HyperDash":false},{"StartTime":92646.0,"Position":182.5748,"HyperDash":false}]},{"StartTime":92980.0,"Objects":[{"StartTime":92980.0,"Position":292.0,"HyperDash":false},{"StartTime":93063.0,"Position":310.7525,"HyperDash":false},{"StartTime":93146.0,"Position":297.521576,"HyperDash":false},{"StartTime":93211.0,"Position":304.3826,"HyperDash":false},{"StartTime":93313.0,"Position":292.0,"HyperDash":false}]},{"StartTime":93647.0,"Objects":[{"StartTime":93647.0,"Position":260.0,"HyperDash":false}]},{"StartTime":93980.0,"Objects":[{"StartTime":93980.0,"Position":392.0,"HyperDash":false}]},{"StartTime":94313.0,"Objects":[{"StartTime":94313.0,"Position":424.0,"HyperDash":false}]},{"StartTime":94647.0,"Objects":[{"StartTime":94647.0,"Position":216.0,"HyperDash":false}]},{"StartTime":94980.0,"Objects":[{"StartTime":94980.0,"Position":200.0,"HyperDash":false},{"StartTime":95063.0,"Position":195.7525,"HyperDash":false},{"StartTime":95146.0,"Position":205.521576,"HyperDash":false},{"StartTime":95211.0,"Position":219.382584,"HyperDash":false},{"StartTime":95313.0,"Position":200.0,"HyperDash":false}]},{"StartTime":95647.0,"Objects":[{"StartTime":95647.0,"Position":80.0,"HyperDash":false}]},{"StartTime":95980.0,"Objects":[{"StartTime":95980.0,"Position":20.0,"HyperDash":false},{"StartTime":96063.0,"Position":23.3388672,"HyperDash":false},{"StartTime":96146.0,"Position":59.53566,"HyperDash":false},{"StartTime":96229.0,"Position":66.5166855,"HyperDash":false},{"StartTime":96313.0,"Position":108.143875,"HyperDash":false},{"StartTime":96387.0,"Position":118.3307,"HyperDash":false},{"StartTime":96461.0,"Position":144.318436,"HyperDash":false},{"StartTime":96535.0,"Position":175.625229,"HyperDash":false},{"StartTime":96646.0,"Position":203.7997,"HyperDash":false}]},{"StartTime":96980.0,"Objects":[{"StartTime":96980.0,"Position":396.0,"HyperDash":false}]},{"StartTime":97313.0,"Objects":[{"StartTime":97313.0,"Position":416.0,"HyperDash":false},{"StartTime":97396.0,"Position":391.7448,"HyperDash":false},{"StartTime":97479.0,"Position":402.383942,"HyperDash":false},{"StartTime":97562.0,"Position":373.653778,"HyperDash":false},{"StartTime":97646.0,"Position":341.410828,"HyperDash":false},{"StartTime":97720.0,"Position":351.982941,"HyperDash":false},{"StartTime":97794.0,"Position":395.896729,"HyperDash":false},{"StartTime":97868.0,"Position":388.3252,"HyperDash":false},{"StartTime":97979.0,"Position":416.0,"HyperDash":false}]},{"StartTime":98146.0,"Objects":[{"StartTime":98146.0,"Position":127.0,"HyperDash":false},{"StartTime":98224.0,"Position":161.0,"HyperDash":false},{"StartTime":98302.0,"Position":332.0,"HyperDash":false},{"StartTime":98380.0,"Position":356.0,"HyperDash":false},{"StartTime":98458.0,"Position":362.0,"HyperDash":false},{"StartTime":98536.0,"Position":347.0,"HyperDash":false},{"StartTime":98614.0,"Position":252.0,"HyperDash":false},{"StartTime":98692.0,"Position":477.0,"HyperDash":false},{"StartTime":98771.0,"Position":358.0,"HyperDash":false},{"StartTime":98849.0,"Position":17.0,"HyperDash":false},{"StartTime":98927.0,"Position":399.0,"HyperDash":false},{"StartTime":99005.0,"Position":280.0,"HyperDash":false},{"StartTime":99083.0,"Position":304.0,"HyperDash":false},{"StartTime":99161.0,"Position":221.0,"HyperDash":false},{"StartTime":99239.0,"Position":407.0,"HyperDash":false},{"StartTime":99317.0,"Position":287.0,"HyperDash":false},{"StartTime":99396.0,"Position":135.0,"HyperDash":false},{"StartTime":99474.0,"Position":437.0,"HyperDash":false},{"StartTime":99552.0,"Position":289.0,"HyperDash":false},{"StartTime":99630.0,"Position":464.0,"HyperDash":false},{"StartTime":99708.0,"Position":36.0,"HyperDash":false},{"StartTime":99786.0,"Position":378.0,"HyperDash":false},{"StartTime":99864.0,"Position":297.0,"HyperDash":false},{"StartTime":99942.0,"Position":418.0,"HyperDash":false},{"StartTime":100021.0,"Position":329.0,"HyperDash":false},{"StartTime":100099.0,"Position":338.0,"HyperDash":false},{"StartTime":100177.0,"Position":394.0,"HyperDash":false},{"StartTime":100255.0,"Position":40.0,"HyperDash":false},{"StartTime":100333.0,"Position":13.0,"HyperDash":false},{"StartTime":100411.0,"Position":80.0,"HyperDash":false},{"StartTime":100489.0,"Position":138.0,"HyperDash":false},{"StartTime":100567.0,"Position":311.0,"HyperDash":false},{"StartTime":100646.0,"Position":216.0,"HyperDash":false}]},{"StartTime":121313.0,"Objects":[{"StartTime":121313.0,"Position":104.0,"HyperDash":false},{"StartTime":121387.0,"Position":130.222229,"HyperDash":false},{"StartTime":121461.0,"Position":155.444443,"HyperDash":false},{"StartTime":121535.0,"Position":183.666672,"HyperDash":false},{"StartTime":121646.0,"Position":204.0,"HyperDash":false}]},{"StartTime":121980.0,"Objects":[{"StartTime":121980.0,"Position":176.0,"HyperDash":false},{"StartTime":122063.0,"Position":189.658371,"HyperDash":false},{"StartTime":122146.0,"Position":232.316742,"HyperDash":false},{"StartTime":122229.0,"Position":235.975128,"HyperDash":false},{"StartTime":122313.0,"Position":266.9065,"HyperDash":false},{"StartTime":122387.0,"Position":295.1079,"HyperDash":false},{"StartTime":122461.0,"Position":303.3094,"HyperDash":false},{"StartTime":122535.0,"Position":343.5108,"HyperDash":false},{"StartTime":122646.0,"Position":357.813,"HyperDash":false}]},{"StartTime":122980.0,"Objects":[{"StartTime":122980.0,"Position":240.0,"HyperDash":false},{"StartTime":123063.0,"Position":249.293518,"HyperDash":false},{"StartTime":123146.0,"Position":284.721375,"HyperDash":false},{"StartTime":123211.0,"Position":269.396881,"HyperDash":false},{"StartTime":123313.0,"Position":240.0,"HyperDash":false}]},{"StartTime":123647.0,"Objects":[{"StartTime":123647.0,"Position":136.0,"HyperDash":false},{"StartTime":123721.0,"Position":175.807312,"HyperDash":false},{"StartTime":123795.0,"Position":177.614624,"HyperDash":false},{"StartTime":123869.0,"Position":204.421951,"HyperDash":false},{"StartTime":123980.0,"Position":229.632919,"HyperDash":false}]},{"StartTime":124313.0,"Objects":[{"StartTime":124313.0,"Position":348.0,"HyperDash":false},{"StartTime":124387.0,"Position":311.12384,"HyperDash":false},{"StartTime":124461.0,"Position":301.247681,"HyperDash":false},{"StartTime":124535.0,"Position":296.371521,"HyperDash":false},{"StartTime":124646.0,"Position":258.557281,"HyperDash":false}]},{"StartTime":124980.0,"Objects":[{"StartTime":124980.0,"Position":132.0,"HyperDash":false}]},{"StartTime":125313.0,"Objects":[{"StartTime":125313.0,"Position":308.0,"HyperDash":false}]},{"StartTime":125647.0,"Objects":[{"StartTime":125647.0,"Position":192.0,"HyperDash":false}]},{"StartTime":125980.0,"Objects":[{"StartTime":125980.0,"Position":256.0,"HyperDash":false},{"StartTime":126063.0,"Position":236.0,"HyperDash":false},{"StartTime":126146.0,"Position":241.0,"HyperDash":false},{"StartTime":126229.0,"Position":259.0,"HyperDash":false},{"StartTime":126313.0,"Position":256.0,"HyperDash":false},{"StartTime":126387.0,"Position":266.0,"HyperDash":false},{"StartTime":126461.0,"Position":262.0,"HyperDash":false},{"StartTime":126535.0,"Position":251.0,"HyperDash":false},{"StartTime":126646.0,"Position":256.0,"HyperDash":false}]},{"StartTime":126980.0,"Objects":[{"StartTime":126980.0,"Position":456.0,"HyperDash":false}]},{"StartTime":127313.0,"Objects":[{"StartTime":127313.0,"Position":240.0,"HyperDash":false},{"StartTime":127396.0,"Position":206.706223,"HyperDash":false},{"StartTime":127479.0,"Position":204.91954,"HyperDash":false},{"StartTime":127562.0,"Position":169.054108,"HyperDash":false},{"StartTime":127646.0,"Position":141.47023,"HyperDash":false},{"StartTime":127720.0,"Position":125.911591,"HyperDash":false},{"StartTime":127794.0,"Position":94.83778,"HyperDash":false},{"StartTime":127868.0,"Position":101.478622,"HyperDash":false},{"StartTime":127979.0,"Position":61.6785927,"HyperDash":false}]},{"StartTime":128313.0,"Objects":[{"StartTime":128313.0,"Position":24.0,"HyperDash":false},{"StartTime":128387.0,"Position":48.1436577,"HyperDash":false},{"StartTime":128461.0,"Position":55.9805756,"HyperDash":false},{"StartTime":128535.0,"Position":105.202553,"HyperDash":false},{"StartTime":128646.0,"Position":122.252655,"HyperDash":false}]},{"StartTime":128980.0,"Objects":[{"StartTime":128980.0,"Position":240.0,"HyperDash":false},{"StartTime":129063.0,"Position":255.475082,"HyperDash":false},{"StartTime":129146.0,"Position":232.928925,"HyperDash":false},{"StartTime":129211.0,"Position":224.668167,"HyperDash":false},{"StartTime":129313.0,"Position":240.0,"HyperDash":false}]},{"StartTime":129647.0,"Objects":[{"StartTime":129647.0,"Position":208.0,"HyperDash":false},{"StartTime":129721.0,"Position":242.2032,"HyperDash":false},{"StartTime":129795.0,"Position":238.131622,"HyperDash":false},{"StartTime":129869.0,"Position":289.174744,"HyperDash":false},{"StartTime":129980.0,"Position":301.803345,"HyperDash":false}]},{"StartTime":130313.0,"Objects":[{"StartTime":130313.0,"Position":464.0,"HyperDash":false}]},{"StartTime":130647.0,"Objects":[{"StartTime":130647.0,"Position":312.0,"HyperDash":false}]},{"StartTime":130980.0,"Objects":[{"StartTime":130980.0,"Position":360.0,"HyperDash":false}]},{"StartTime":131313.0,"Objects":[{"StartTime":131313.0,"Position":312.0,"HyperDash":false}]},{"StartTime":131980.0,"Objects":[{"StartTime":131980.0,"Position":128.0,"HyperDash":false}]},{"StartTime":132313.0,"Objects":[{"StartTime":132313.0,"Position":108.0,"HyperDash":false}]},{"StartTime":132647.0,"Objects":[{"StartTime":132647.0,"Position":128.0,"HyperDash":false},{"StartTime":132721.0,"Position":135.994476,"HyperDash":false},{"StartTime":132795.0,"Position":180.585373,"HyperDash":false},{"StartTime":132869.0,"Position":207.755859,"HyperDash":false},{"StartTime":132980.0,"Position":224.793228,"HyperDash":false}]},{"StartTime":133147.0,"Objects":[{"StartTime":133147.0,"Position":288.0,"HyperDash":false}]},{"StartTime":133313.0,"Objects":[{"StartTime":133313.0,"Position":272.0,"HyperDash":false},{"StartTime":133387.0,"Position":276.649445,"HyperDash":false},{"StartTime":133461.0,"Position":249.773849,"HyperDash":false},{"StartTime":133535.0,"Position":218.139557,"HyperDash":false},{"StartTime":133646.0,"Position":186.0562,"HyperDash":false}]},{"StartTime":133980.0,"Objects":[{"StartTime":133980.0,"Position":68.0,"HyperDash":false}]},{"StartTime":134313.0,"Objects":[{"StartTime":134313.0,"Position":61.0,"HyperDash":false}]},{"StartTime":134647.0,"Objects":[{"StartTime":134647.0,"Position":88.0,"HyperDash":false},{"StartTime":134721.0,"Position":102.674133,"HyperDash":false},{"StartTime":134795.0,"Position":111.358536,"HyperDash":false},{"StartTime":134869.0,"Position":120.496475,"HyperDash":false},{"StartTime":134980.0,"Position":164.774765,"HyperDash":false}]},{"StartTime":135147.0,"Objects":[{"StartTime":135147.0,"Position":232.0,"HyperDash":false}]},{"StartTime":135313.0,"Objects":[{"StartTime":135313.0,"Position":244.0,"HyperDash":false},{"StartTime":135387.0,"Position":257.8205,"HyperDash":false},{"StartTime":135461.0,"Position":293.698364,"HyperDash":false},{"StartTime":135535.0,"Position":319.993317,"HyperDash":false},{"StartTime":135646.0,"Position":330.966125,"HyperDash":false}]},{"StartTime":135980.0,"Objects":[{"StartTime":135980.0,"Position":400.0,"HyperDash":false},{"StartTime":136054.0,"Position":393.3103,"HyperDash":false},{"StartTime":136128.0,"Position":410.291168,"HyperDash":false},{"StartTime":136202.0,"Position":374.1771,"HyperDash":false},{"StartTime":136313.0,"Position":363.078583,"HyperDash":false}]},{"StartTime":136647.0,"Objects":[{"StartTime":136647.0,"Position":168.0,"HyperDash":false}]},{"StartTime":136980.0,"Objects":[{"StartTime":136980.0,"Position":336.0,"HyperDash":false}]},{"StartTime":137313.0,"Objects":[{"StartTime":137313.0,"Position":240.0,"HyperDash":false},{"StartTime":137387.0,"Position":248.065033,"HyperDash":false},{"StartTime":137461.0,"Position":292.435242,"HyperDash":false},{"StartTime":137535.0,"Position":300.6758,"HyperDash":false},{"StartTime":137646.0,"Position":307.714966,"HyperDash":false}]},{"StartTime":137813.0,"Objects":[{"StartTime":137813.0,"Position":288.0,"HyperDash":false}]},{"StartTime":137980.0,"Objects":[{"StartTime":137980.0,"Position":276.0,"HyperDash":false},{"StartTime":138054.0,"Position":257.487183,"HyperDash":false},{"StartTime":138128.0,"Position":243.974365,"HyperDash":false},{"StartTime":138202.0,"Position":212.461533,"HyperDash":false},{"StartTime":138313.0,"Position":183.692291,"HyperDash":false}]},{"StartTime":138647.0,"Objects":[{"StartTime":138647.0,"Position":144.0,"HyperDash":false},{"StartTime":138721.0,"Position":108.367188,"HyperDash":false},{"StartTime":138795.0,"Position":83.73437,"HyperDash":false},{"StartTime":138869.0,"Position":69.10155,"HyperDash":false},{"StartTime":138980.0,"Position":51.1523361,"HyperDash":false}]},{"StartTime":139313.0,"Objects":[{"StartTime":139313.0,"Position":176.0,"HyperDash":false},{"StartTime":139387.0,"Position":150.773682,"HyperDash":false},{"StartTime":139461.0,"Position":141.547363,"HyperDash":false},{"StartTime":139535.0,"Position":131.321045,"HyperDash":false},{"StartTime":139646.0,"Position":111.981567,"HyperDash":false}]},{"StartTime":139980.0,"Objects":[{"StartTime":139980.0,"Position":252.0,"HyperDash":false},{"StartTime":140054.0,"Position":258.226318,"HyperDash":false},{"StartTime":140128.0,"Position":299.452637,"HyperDash":false},{"StartTime":140202.0,"Position":288.678955,"HyperDash":false},{"StartTime":140313.0,"Position":316.018433,"HyperDash":false}]},{"StartTime":140647.0,"Objects":[{"StartTime":140647.0,"Position":436.0,"HyperDash":false},{"StartTime":140730.0,"Position":419.370178,"HyperDash":false},{"StartTime":140813.0,"Position":421.2818,"HyperDash":false},{"StartTime":140896.0,"Position":393.820648,"HyperDash":false},{"StartTime":140980.0,"Position":367.0077,"HyperDash":false},{"StartTime":141054.0,"Position":362.243469,"HyperDash":false},{"StartTime":141128.0,"Position":320.487732,"HyperDash":false},{"StartTime":141202.0,"Position":303.0496,"HyperDash":false},{"StartTime":141313.0,"Position":272.1492,"HyperDash":false}]},{"StartTime":141647.0,"Objects":[{"StartTime":141647.0,"Position":152.0,"HyperDash":false},{"StartTime":141730.0,"Position":140.075073,"HyperDash":false},{"StartTime":141813.0,"Position":102.0,"HyperDash":false},{"StartTime":141878.0,"Position":106.36937,"HyperDash":false},{"StartTime":141980.0,"Position":152.0,"HyperDash":false}]},{"StartTime":142647.0,"Objects":[{"StartTime":142647.0,"Position":388.0,"HyperDash":false},{"StartTime":142730.0,"Position":394.674561,"HyperDash":false},{"StartTime":142813.0,"Position":424.3491,"HyperDash":false},{"StartTime":142896.0,"Position":448.023621,"HyperDash":false},{"StartTime":142980.0,"Position":466.935242,"HyperDash":false},{"StartTime":143054.0,"Position":446.394073,"HyperDash":false},{"StartTime":143128.0,"Position":426.8529,"HyperDash":false},{"StartTime":143202.0,"Position":417.311737,"HyperDash":false},{"StartTime":143313.0,"Position":388.0,"HyperDash":false}]},{"StartTime":143647.0,"Objects":[{"StartTime":143647.0,"Position":272.0,"HyperDash":false},{"StartTime":143721.0,"Position":277.467682,"HyperDash":false},{"StartTime":143795.0,"Position":265.935364,"HyperDash":false},{"StartTime":143869.0,"Position":247.403046,"HyperDash":false},{"StartTime":143980.0,"Position":251.604568,"HyperDash":false}]},{"StartTime":144313.0,"Objects":[{"StartTime":144313.0,"Position":250.0,"HyperDash":false}]},{"StartTime":144647.0,"Objects":[{"StartTime":144647.0,"Position":130.0,"HyperDash":false},{"StartTime":144730.0,"Position":126.174141,"HyperDash":false},{"StartTime":144813.0,"Position":102.264992,"HyperDash":false},{"StartTime":144878.0,"Position":130.009186,"HyperDash":false},{"StartTime":144980.0,"Position":130.0,"HyperDash":false}]},{"StartTime":145313.0,"Objects":[{"StartTime":145313.0,"Position":302.0,"HyperDash":false}]},{"StartTime":145647.0,"Objects":[{"StartTime":145647.0,"Position":98.0,"HyperDash":false}]},{"StartTime":145980.0,"Objects":[{"StartTime":145980.0,"Position":304.0,"HyperDash":false},{"StartTime":146045.0,"Position":329.9953,"HyperDash":false},{"StartTime":146146.0,"Position":349.957245,"HyperDash":false}]},{"StartTime":146480.0,"Objects":[{"StartTime":146480.0,"Position":400.0,"HyperDash":false},{"StartTime":146545.0,"Position":412.621429,"HyperDash":false},{"StartTime":146646.0,"Position":386.263947,"HyperDash":false}]},{"StartTime":146980.0,"Objects":[{"StartTime":146980.0,"Position":160.0,"HyperDash":false}]},{"StartTime":147313.0,"Objects":[{"StartTime":147313.0,"Position":152.0,"HyperDash":false},{"StartTime":147396.0,"Position":112.075073,"HyperDash":false},{"StartTime":147479.0,"Position":102.0,"HyperDash":false},{"StartTime":147562.0,"Position":121.774773,"HyperDash":false},{"StartTime":147646.0,"Position":152.0,"HyperDash":false},{"StartTime":147729.0,"Position":139.075073,"HyperDash":false},{"StartTime":147813.0,"Position":102.0,"HyperDash":false},{"StartTime":147878.0,"Position":112.669662,"HyperDash":false},{"StartTime":147979.0,"Position":152.0,"HyperDash":false}]},{"StartTime":148313.0,"Objects":[{"StartTime":148313.0,"Position":384.0,"HyperDash":false}]},{"StartTime":148647.0,"Objects":[{"StartTime":148647.0,"Position":360.0,"HyperDash":false},{"StartTime":148730.0,"Position":399.623871,"HyperDash":false},{"StartTime":148813.0,"Position":408.1816,"HyperDash":false},{"StartTime":148896.0,"Position":430.2179,"HyperDash":false},{"StartTime":148980.0,"Position":434.200317,"HyperDash":false},{"StartTime":149045.0,"Position":424.324982,"HyperDash":false},{"StartTime":149146.0,"Position":454.563965,"HyperDash":false}]},{"StartTime":149313.0,"Objects":[{"StartTime":149313.0,"Position":396.0,"HyperDash":false},{"StartTime":149396.0,"Position":387.613281,"HyperDash":false},{"StartTime":149479.0,"Position":406.6472,"HyperDash":false},{"StartTime":149562.0,"Position":410.1058,"HyperDash":false},{"StartTime":149646.0,"Position":424.7098,"HyperDash":false},{"StartTime":149711.0,"Position":445.476379,"HyperDash":false},{"StartTime":149813.0,"Position":427.845062,"HyperDash":false}]},{"StartTime":149980.0,"Objects":[{"StartTime":149980.0,"Position":426.0,"HyperDash":false}]},{"StartTime":150313.0,"Objects":[{"StartTime":150313.0,"Position":316.0,"HyperDash":false},{"StartTime":150396.0,"Position":342.7388,"HyperDash":false},{"StartTime":150479.0,"Position":357.6025,"HyperDash":false},{"StartTime":150544.0,"Position":351.486237,"HyperDash":false},{"StartTime":150646.0,"Position":316.0,"HyperDash":false}]},{"StartTime":150980.0,"Objects":[{"StartTime":150980.0,"Position":436.0,"HyperDash":false},{"StartTime":151054.0,"Position":413.307129,"HyperDash":false},{"StartTime":151128.0,"Position":416.6143,"HyperDash":false},{"StartTime":151202.0,"Position":385.921417,"HyperDash":false},{"StartTime":151313.0,"Position":351.882141,"HyperDash":false}]},{"StartTime":151480.0,"Objects":[{"StartTime":151480.0,"Position":296.0,"HyperDash":false},{"StartTime":151545.0,"Position":293.135956,"HyperDash":false},{"StartTime":151646.0,"Position":247.8241,"HyperDash":false}]},{"StartTime":151813.0,"Objects":[{"StartTime":151813.0,"Position":292.0,"HyperDash":false},{"StartTime":151878.0,"Position":304.3741,"HyperDash":false},{"StartTime":151979.0,"Position":287.847717,"HyperDash":false}]},{"StartTime":152147.0,"Objects":[{"StartTime":152147.0,"Position":248.0,"HyperDash":false},{"StartTime":152212.0,"Position":247.426376,"HyperDash":false},{"StartTime":152313.0,"Position":200.565826,"HyperDash":false}]},{"StartTime":152480.0,"Objects":[{"StartTime":152480.0,"Position":244.0,"HyperDash":false},{"StartTime":152545.0,"Position":240.712448,"HyperDash":false},{"StartTime":152646.0,"Position":238.157944,"HyperDash":false}]},{"StartTime":153313.0,"Objects":[{"StartTime":153313.0,"Position":276.0,"HyperDash":false}]},{"StartTime":153647.0,"Objects":[{"StartTime":153647.0,"Position":236.0,"HyperDash":false}]},{"StartTime":153980.0,"Objects":[{"StartTime":153980.0,"Position":256.0,"HyperDash":false},{"StartTime":154063.0,"Position":218.410385,"HyperDash":false},{"StartTime":154146.0,"Position":217.82077,"HyperDash":false},{"StartTime":154229.0,"Position":187.231171,"HyperDash":false},{"StartTime":154313.0,"Position":169.381439,"HyperDash":false},{"StartTime":154387.0,"Position":156.132874,"HyperDash":false},{"StartTime":154461.0,"Position":124.884308,"HyperDash":false},{"StartTime":154535.0,"Position":111.635742,"HyperDash":false},{"StartTime":154646.0,"Position":82.76289,"HyperDash":false}]},{"StartTime":154980.0,"Objects":[{"StartTime":154980.0,"Position":464.0,"HyperDash":false}]},{"StartTime":155313.0,"Objects":[{"StartTime":155313.0,"Position":140.0,"HyperDash":false},{"StartTime":155396.0,"Position":157.959641,"HyperDash":false},{"StartTime":155479.0,"Position":183.919281,"HyperDash":false},{"StartTime":155562.0,"Position":179.8789,"HyperDash":false},{"StartTime":155646.0,"Position":191.99469,"HyperDash":false},{"StartTime":155720.0,"Position":211.549072,"HyperDash":false},{"StartTime":155794.0,"Position":199.103455,"HyperDash":false},{"StartTime":155868.0,"Position":218.6578,"HyperDash":false},{"StartTime":155979.0,"Position":243.9894,"HyperDash":false}]},{"StartTime":156313.0,"Objects":[{"StartTime":156313.0,"Position":28.0,"HyperDash":false}]},{"StartTime":156647.0,"Objects":[{"StartTime":156647.0,"Position":84.0,"HyperDash":false},{"StartTime":156721.0,"Position":99.0253143,"HyperDash":false},{"StartTime":156795.0,"Position":91.05062,"HyperDash":false},{"StartTime":156869.0,"Position":100.075928,"HyperDash":false},{"StartTime":156980.0,"Position":133.613892,"HyperDash":false}]},{"StartTime":157147.0,"Objects":[{"StartTime":157147.0,"Position":180.0,"HyperDash":false}]},{"StartTime":157313.0,"Objects":[{"StartTime":157313.0,"Position":228.0,"HyperDash":false}]},{"StartTime":157647.0,"Objects":[{"StartTime":157647.0,"Position":324.0,"HyperDash":false},{"StartTime":157721.0,"Position":364.239532,"HyperDash":false},{"StartTime":157795.0,"Position":364.479065,"HyperDash":false},{"StartTime":157869.0,"Position":389.7186,"HyperDash":false},{"StartTime":157980.0,"Position":419.577881,"HyperDash":false}]},{"StartTime":158313.0,"Objects":[{"StartTime":158313.0,"Position":336.0,"HyperDash":false},{"StartTime":158387.0,"Position":312.2865,"HyperDash":false},{"StartTime":158461.0,"Position":300.573029,"HyperDash":false},{"StartTime":158535.0,"Position":297.859528,"HyperDash":false},{"StartTime":158646.0,"Position":265.2893,"HyperDash":false}]},{"StartTime":158980.0,"Objects":[{"StartTime":158980.0,"Position":80.0,"HyperDash":false}]},{"StartTime":159313.0,"Objects":[{"StartTime":159313.0,"Position":248.0,"HyperDash":false}]},{"StartTime":159646.0,"Objects":[{"StartTime":159646.0,"Position":48.0,"HyperDash":false},{"StartTime":159729.0,"Position":51.11805,"HyperDash":false},{"StartTime":159812.0,"Position":32.1886139,"HyperDash":false},{"StartTime":159877.0,"Position":24.3137436,"HyperDash":false},{"StartTime":159979.0,"Position":48.0,"HyperDash":false}]},{"StartTime":160313.0,"Objects":[{"StartTime":160313.0,"Position":200.0,"HyperDash":false}]},{"StartTime":160647.0,"Objects":[{"StartTime":160647.0,"Position":248.0,"HyperDash":false}]},{"StartTime":160980.0,"Objects":[{"StartTime":160980.0,"Position":440.0,"HyperDash":false}]},{"StartTime":161313.0,"Objects":[{"StartTime":161313.0,"Position":392.0,"HyperDash":false}]},{"StartTime":161980.0,"Objects":[{"StartTime":161980.0,"Position":120.0,"HyperDash":false}]},{"StartTime":162313.0,"Objects":[{"StartTime":162313.0,"Position":360.0,"HyperDash":false},{"StartTime":162396.0,"Position":370.924927,"HyperDash":false},{"StartTime":162479.0,"Position":394.849854,"HyperDash":false},{"StartTime":162562.0,"Position":440.77478,"HyperDash":false},{"StartTime":162646.0,"Position":460.0,"HyperDash":false},{"StartTime":162720.0,"Position":455.777771,"HyperDash":false},{"StartTime":162794.0,"Position":421.555542,"HyperDash":false},{"StartTime":162868.0,"Position":408.333344,"HyperDash":false},{"StartTime":162979.0,"Position":360.0,"HyperDash":false}]},{"StartTime":163313.0,"Objects":[{"StartTime":163313.0,"Position":48.0,"HyperDash":false}]},{"StartTime":163646.0,"Objects":[{"StartTime":163646.0,"Position":152.0,"HyperDash":false},{"StartTime":163729.0,"Position":137.075073,"HyperDash":false},{"StartTime":163812.0,"Position":112.150146,"HyperDash":false},{"StartTime":163895.0,"Position":86.22523,"HyperDash":false},{"StartTime":163979.0,"Position":52.0,"HyperDash":false},{"StartTime":164053.0,"Position":75.22222,"HyperDash":false},{"StartTime":164127.0,"Position":93.44444,"HyperDash":false},{"StartTime":164201.0,"Position":131.666656,"HyperDash":false},{"StartTime":164312.0,"Position":152.0,"HyperDash":false}]},{"StartTime":164647.0,"Objects":[{"StartTime":164647.0,"Position":256.0,"HyperDash":false}]},{"StartTime":164980.0,"Objects":[{"StartTime":164980.0,"Position":360.0,"HyperDash":false},{"StartTime":165063.0,"Position":391.924927,"HyperDash":false},{"StartTime":165146.0,"Position":415.849854,"HyperDash":false},{"StartTime":165229.0,"Position":439.77478,"HyperDash":false},{"StartTime":165313.0,"Position":460.0,"HyperDash":false},{"StartTime":165387.0,"Position":421.777771,"HyperDash":false},{"StartTime":165461.0,"Position":412.555542,"HyperDash":false},{"StartTime":165535.0,"Position":400.333344,"HyperDash":false},{"StartTime":165646.0,"Position":360.0,"HyperDash":false}]},{"StartTime":165980.0,"Objects":[{"StartTime":165980.0,"Position":48.0,"HyperDash":false}]},{"StartTime":166646.0,"Objects":[{"StartTime":166646.0,"Position":16.0,"HyperDash":false},{"StartTime":166720.0,"Position":33.9701347,"HyperDash":false},{"StartTime":166794.0,"Position":24.45197,"HyperDash":false},{"StartTime":166868.0,"Position":40.2451935,"HyperDash":false},{"StartTime":166979.0,"Position":44.51446,"HyperDash":false}]},{"StartTime":167313.0,"Objects":[{"StartTime":167313.0,"Position":116.0,"HyperDash":false},{"StartTime":167387.0,"Position":129.7839,"HyperDash":false},{"StartTime":167461.0,"Position":169.077835,"HyperDash":false},{"StartTime":167535.0,"Position":179.400436,"HyperDash":false},{"StartTime":167646.0,"Position":209.385559,"HyperDash":false}]},{"StartTime":167814.0,"Objects":[{"StartTime":167814.0,"Position":276.0,"HyperDash":false}]},{"StartTime":167980.0,"Objects":[{"StartTime":167980.0,"Position":288.0,"HyperDash":false},{"StartTime":168054.0,"Position":297.026276,"HyperDash":false},{"StartTime":168128.0,"Position":311.4158,"HyperDash":false},{"StartTime":168202.0,"Position":352.7142,"HyperDash":false},{"StartTime":168313.0,"Position":379.425873,"HyperDash":false}]},{"StartTime":168480.0,"Objects":[{"StartTime":168480.0,"Position":440.0,"HyperDash":false}]},{"StartTime":168647.0,"Objects":[{"StartTime":168647.0,"Position":428.0,"HyperDash":false},{"StartTime":168721.0,"Position":416.346558,"HyperDash":false},{"StartTime":168795.0,"Position":376.215485,"HyperDash":false},{"StartTime":168869.0,"Position":354.074921,"HyperDash":false},{"StartTime":168980.0,"Position":333.4033,"HyperDash":false}]},{"StartTime":169147.0,"Objects":[{"StartTime":169147.0,"Position":292.0,"HyperDash":false}]},{"StartTime":169313.0,"Objects":[{"StartTime":169313.0,"Position":260.0,"HyperDash":false},{"StartTime":169387.0,"Position":226.354462,"HyperDash":false},{"StartTime":169461.0,"Position":218.650589,"HyperDash":false},{"StartTime":169535.0,"Position":188.49968,"HyperDash":false},{"StartTime":169646.0,"Position":162.278046,"HyperDash":false}]},{"StartTime":169814.0,"Objects":[{"StartTime":169814.0,"Position":108.0,"HyperDash":false}]},{"StartTime":169980.0,"Objects":[{"StartTime":169980.0,"Position":88.0,"HyperDash":false},{"StartTime":170054.0,"Position":102.962883,"HyperDash":false},{"StartTime":170128.0,"Position":119.505386,"HyperDash":false},{"StartTime":170202.0,"Position":134.055634,"HyperDash":false},{"StartTime":170313.0,"Position":155.916748,"HyperDash":false}]},{"StartTime":170480.0,"Objects":[{"StartTime":170480.0,"Position":184.0,"HyperDash":false}]},{"StartTime":170647.0,"Objects":[{"StartTime":170647.0,"Position":232.0,"HyperDash":false},{"StartTime":170721.0,"Position":263.15802,"HyperDash":false},{"StartTime":170795.0,"Position":293.183655,"HyperDash":false},{"StartTime":170869.0,"Position":306.346649,"HyperDash":false},{"StartTime":170980.0,"Position":326.30188,"HyperDash":false}]},{"StartTime":171314.0,"Objects":[{"StartTime":171314.0,"Position":424.0,"HyperDash":false}]},{"StartTime":171647.0,"Objects":[{"StartTime":171647.0,"Position":404.0,"HyperDash":false}]},{"StartTime":171980.0,"Objects":[{"StartTime":171980.0,"Position":424.0,"HyperDash":false},{"StartTime":172054.0,"Position":432.217773,"HyperDash":false},{"StartTime":172128.0,"Position":396.404236,"HyperDash":false},{"StartTime":172202.0,"Position":412.493378,"HyperDash":false},{"StartTime":172313.0,"Position":371.9598,"HyperDash":false}]},{"StartTime":172480.0,"Objects":[{"StartTime":172480.0,"Position":312.0,"HyperDash":false}]},{"StartTime":172646.0,"Objects":[{"StartTime":172646.0,"Position":296.0,"HyperDash":false},{"StartTime":172729.0,"Position":266.640961,"HyperDash":false},{"StartTime":172812.0,"Position":246.785126,"HyperDash":false},{"StartTime":172895.0,"Position":204.6299,"HyperDash":false},{"StartTime":172979.0,"Position":199.5078,"HyperDash":false},{"StartTime":173053.0,"Position":230.801788,"HyperDash":false},{"StartTime":173127.0,"Position":226.161774,"HyperDash":false},{"StartTime":173201.0,"Position":272.241882,"HyperDash":false},{"StartTime":173312.0,"Position":296.0,"HyperDash":false}]},{"StartTime":173647.0,"Objects":[{"StartTime":173647.0,"Position":256.0,"HyperDash":false}]},{"StartTime":173980.0,"Objects":[{"StartTime":173980.0,"Position":164.0,"HyperDash":false},{"StartTime":174063.0,"Position":132.238632,"HyperDash":false},{"StartTime":174146.0,"Position":97.919014,"HyperDash":false},{"StartTime":174229.0,"Position":81.1318741,"HyperDash":false},{"StartTime":174313.0,"Position":74.66674,"HyperDash":false},{"StartTime":174387.0,"Position":104.74202,"HyperDash":false},{"StartTime":174461.0,"Position":110.645523,"HyperDash":false},{"StartTime":174535.0,"Position":122.876343,"HyperDash":false},{"StartTime":174646.0,"Position":164.0,"HyperDash":false}]},{"StartTime":174980.0,"Objects":[{"StartTime":174980.0,"Position":132.0,"HyperDash":false},{"StartTime":175054.0,"Position":123.056931,"HyperDash":false},{"StartTime":175128.0,"Position":102.477112,"HyperDash":false},{"StartTime":175202.0,"Position":92.91614,"HyperDash":false},{"StartTime":175313.0,"Position":105.479126,"HyperDash":false}]},{"StartTime":175646.0,"Objects":[{"StartTime":175646.0,"Position":212.0,"HyperDash":false},{"StartTime":175729.0,"Position":240.889877,"HyperDash":false},{"StartTime":175812.0,"Position":250.558151,"HyperDash":false},{"StartTime":175895.0,"Position":278.151367,"HyperDash":false},{"StartTime":175979.0,"Position":273.195679,"HyperDash":false},{"StartTime":176053.0,"Position":272.262177,"HyperDash":false},{"StartTime":176127.0,"Position":241.994537,"HyperDash":false},{"StartTime":176201.0,"Position":248.795273,"HyperDash":false},{"StartTime":176312.0,"Position":212.0,"HyperDash":false}]},{"StartTime":176647.0,"Objects":[{"StartTime":176647.0,"Position":212.0,"HyperDash":false}]},{"StartTime":177313.0,"Objects":[{"StartTime":177313.0,"Position":8.0,"HyperDash":false},{"StartTime":177387.0,"Position":10.2332268,"HyperDash":false},{"StartTime":177461.0,"Position":20.5555458,"HyperDash":false},{"StartTime":177535.0,"Position":40.06486,"HyperDash":false},{"StartTime":177646.0,"Position":79.97232,"HyperDash":false}]},{"StartTime":177980.0,"Objects":[{"StartTime":177980.0,"Position":200.0,"HyperDash":false},{"StartTime":178063.0,"Position":241.128418,"HyperDash":false},{"StartTime":178146.0,"Position":239.256821,"HyperDash":false},{"StartTime":178229.0,"Position":270.385223,"HyperDash":false},{"StartTime":178313.0,"Position":296.804352,"HyperDash":false},{"StartTime":178378.0,"Position":329.7001,"HyperDash":false},{"StartTime":178479.0,"Position":345.061157,"HyperDash":false}]},{"StartTime":178647.0,"Objects":[{"StartTime":178647.0,"Position":344.0,"HyperDash":false},{"StartTime":178730.0,"Position":319.3755,"HyperDash":false},{"StartTime":178813.0,"Position":279.750977,"HyperDash":false},{"StartTime":178896.0,"Position":284.126465,"HyperDash":false},{"StartTime":178980.0,"Position":245.205261,"HyperDash":false},{"StartTime":179045.0,"Position":217.92099,"HyperDash":false},{"StartTime":179147.0,"Position":195.659546,"HyperDash":false}]},{"StartTime":179313.0,"Objects":[{"StartTime":179313.0,"Position":196.0,"HyperDash":false},{"StartTime":179396.0,"Position":204.644592,"HyperDash":false},{"StartTime":179479.0,"Position":247.289169,"HyperDash":false},{"StartTime":179562.0,"Position":284.933777,"HyperDash":false},{"StartTime":179646.0,"Position":294.875275,"HyperDash":false},{"StartTime":179711.0,"Position":321.175262,"HyperDash":false},{"StartTime":179812.0,"Position":344.164429,"HyperDash":false}]},{"StartTime":179980.0,"Objects":[{"StartTime":179980.0,"Position":344.0,"HyperDash":false},{"StartTime":180063.0,"Position":304.223572,"HyperDash":false},{"StartTime":180146.0,"Position":297.447144,"HyperDash":false},{"StartTime":180229.0,"Position":264.670715,"HyperDash":false},{"StartTime":180313.0,"Position":244.595779,"HyperDash":false},{"StartTime":180378.0,"Position":243.192551,"HyperDash":false},{"StartTime":180480.0,"Position":194.744415,"HyperDash":false}]},{"StartTime":180647.0,"Objects":[{"StartTime":180647.0,"Position":136.0,"HyperDash":false},{"StartTime":180730.0,"Position":111.127846,"HyperDash":false},{"StartTime":180813.0,"Position":94.761,"HyperDash":false},{"StartTime":180896.0,"Position":98.9445953,"HyperDash":false},{"StartTime":180980.0,"Position":71.38005,"HyperDash":false},{"StartTime":181063.0,"Position":69.46596,"HyperDash":false},{"StartTime":181147.0,"Position":63.5731277,"HyperDash":false},{"StartTime":181230.0,"Position":82.42001,"HyperDash":false},{"StartTime":181313.0,"Position":71.28203,"HyperDash":false},{"StartTime":181387.0,"Position":81.29693,"HyperDash":false},{"StartTime":181462.0,"Position":106.020226,"HyperDash":false},{"StartTime":181536.0,"Position":117.600555,"HyperDash":false},{"StartTime":181647.0,"Position":136.0,"HyperDash":false}]},{"StartTime":181980.0,"Objects":[{"StartTime":181980.0,"Position":188.0,"HyperDash":false}]},{"StartTime":182647.0,"Objects":[{"StartTime":182647.0,"Position":168.0,"HyperDash":false}]},{"StartTime":182980.0,"Objects":[{"StartTime":182980.0,"Position":76.0,"HyperDash":false},{"StartTime":183063.0,"Position":66.09038,"HyperDash":false},{"StartTime":183146.0,"Position":30.0427513,"HyperDash":false},{"StartTime":183211.0,"Position":32.84601,"HyperDash":false},{"StartTime":183313.0,"Position":76.0,"HyperDash":false}]},{"StartTime":183647.0,"Objects":[{"StartTime":183647.0,"Position":356.0,"HyperDash":false}]},{"StartTime":183980.0,"Objects":[{"StartTime":183980.0,"Position":300.0,"HyperDash":false},{"StartTime":184063.0,"Position":315.398315,"HyperDash":false},{"StartTime":184146.0,"Position":337.263855,"HyperDash":false},{"StartTime":184229.0,"Position":376.114166,"HyperDash":false},{"StartTime":184313.0,"Position":398.933929,"HyperDash":false},{"StartTime":184387.0,"Position":361.090729,"HyperDash":false},{"StartTime":184461.0,"Position":359.967743,"HyperDash":false},{"StartTime":184535.0,"Position":348.762024,"HyperDash":false},{"StartTime":184646.0,"Position":300.0,"HyperDash":false}]},{"StartTime":184980.0,"Objects":[{"StartTime":184980.0,"Position":256.0,"HyperDash":false},{"StartTime":185063.0,"Position":211.878,"HyperDash":false},{"StartTime":185146.0,"Position":210.733841,"HyperDash":false},{"StartTime":185229.0,"Position":193.655289,"HyperDash":false},{"StartTime":185313.0,"Position":174.843628,"HyperDash":false},{"StartTime":185387.0,"Position":205.589539,"HyperDash":false},{"StartTime":185461.0,"Position":212.06926,"HyperDash":false},{"StartTime":185535.0,"Position":226.121918,"HyperDash":false},{"StartTime":185646.0,"Position":256.0,"HyperDash":false}]},{"StartTime":185980.0,"Objects":[{"StartTime":185980.0,"Position":344.0,"HyperDash":false}]},{"StartTime":186647.0,"Objects":[{"StartTime":186647.0,"Position":168.0,"HyperDash":false}]},{"StartTime":186980.0,"Objects":[{"StartTime":186980.0,"Position":316.0,"HyperDash":false}]},{"StartTime":187313.0,"Objects":[{"StartTime":187313.0,"Position":196.0,"HyperDash":false}]},{"StartTime":187980.0,"Objects":[{"StartTime":187980.0,"Position":408.0,"HyperDash":false}]},{"StartTime":188313.0,"Objects":[{"StartTime":188313.0,"Position":456.0,"HyperDash":false}]},{"StartTime":188647.0,"Objects":[{"StartTime":188647.0,"Position":320.0,"HyperDash":false}]},{"StartTime":188980.0,"Objects":[{"StartTime":188980.0,"Position":224.0,"HyperDash":false},{"StartTime":189063.0,"Position":203.261215,"HyperDash":false},{"StartTime":189146.0,"Position":182.397491,"HyperDash":false},{"StartTime":189211.0,"Position":196.513779,"HyperDash":false},{"StartTime":189313.0,"Position":224.0,"HyperDash":false}]},{"StartTime":189647.0,"Objects":[{"StartTime":189647.0,"Position":120.0,"HyperDash":false},{"StartTime":189730.0,"Position":102.325584,"HyperDash":false},{"StartTime":189813.0,"Position":70.5025253,"HyperDash":false},{"StartTime":189878.0,"Position":77.67722,"HyperDash":false},{"StartTime":189980.0,"Position":120.0,"HyperDash":false}]},{"StartTime":190313.0,"Objects":[{"StartTime":190313.0,"Position":96.0,"HyperDash":false},{"StartTime":190396.0,"Position":67.70647,"HyperDash":false},{"StartTime":190479.0,"Position":51.27864,"HyperDash":false},{"StartTime":190544.0,"Position":85.6031342,"HyperDash":false},{"StartTime":190646.0,"Position":96.0,"HyperDash":false}]},{"StartTime":190980.0,"Objects":[{"StartTime":190980.0,"Position":188.0,"HyperDash":false},{"StartTime":191054.0,"Position":204.489685,"HyperDash":false},{"StartTime":191128.0,"Position":220.740356,"HyperDash":false},{"StartTime":191202.0,"Position":229.801239,"HyperDash":false},{"StartTime":191313.0,"Position":258.899475,"HyperDash":false}]},{"StartTime":191646.0,"Objects":[{"StartTime":191646.0,"Position":320.0,"HyperDash":false},{"StartTime":191729.0,"Position":322.9096,"HyperDash":false},{"StartTime":191812.0,"Position":365.957245,"HyperDash":false},{"StartTime":191877.0,"Position":363.154,"HyperDash":false},{"StartTime":191979.0,"Position":320.0,"HyperDash":false}]},{"StartTime":192313.0,"Objects":[{"StartTime":192313.0,"Position":256.0,"HyperDash":false}]},{"StartTime":192646.0,"Objects":[{"StartTime":192646.0,"Position":376.0,"HyperDash":false}]},{"StartTime":192980.0,"Objects":[{"StartTime":192980.0,"Position":264.0,"HyperDash":false}]},{"StartTime":193313.0,"Objects":[{"StartTime":193313.0,"Position":376.0,"HyperDash":false}]},{"StartTime":193647.0,"Objects":[{"StartTime":193647.0,"Position":404.0,"HyperDash":false},{"StartTime":193730.0,"Position":427.956543,"HyperDash":false},{"StartTime":193813.0,"Position":436.009216,"HyperDash":false},{"StartTime":193878.0,"Position":419.609253,"HyperDash":false},{"StartTime":193980.0,"Position":404.0,"HyperDash":false}]},{"StartTime":194313.0,"Objects":[{"StartTime":194313.0,"Position":404.0,"HyperDash":false},{"StartTime":194387.0,"Position":411.0,"HyperDash":false},{"StartTime":194461.0,"Position":401.0,"HyperDash":false},{"StartTime":194535.0,"Position":423.0,"HyperDash":false},{"StartTime":194646.0,"Position":404.0,"HyperDash":false}]},{"StartTime":194980.0,"Objects":[{"StartTime":194980.0,"Position":344.0,"HyperDash":false},{"StartTime":195054.0,"Position":333.802856,"HyperDash":false},{"StartTime":195128.0,"Position":315.605743,"HyperDash":false},{"StartTime":195202.0,"Position":294.4086,"HyperDash":false},{"StartTime":195313.0,"Position":293.612885,"HyperDash":false}]},{"StartTime":195647.0,"Objects":[{"StartTime":195647.0,"Position":300.0,"HyperDash":false},{"StartTime":195721.0,"Position":295.574554,"HyperDash":false},{"StartTime":195795.0,"Position":256.1491,"HyperDash":false},{"StartTime":195869.0,"Position":239.723663,"HyperDash":false},{"StartTime":195980.0,"Position":208.08551,"HyperDash":false}]},{"StartTime":196313.0,"Objects":[{"StartTime":196313.0,"Position":300.0,"HyperDash":false},{"StartTime":196396.0,"Position":270.293732,"HyperDash":false},{"StartTime":196479.0,"Position":253.587433,"HyperDash":false},{"StartTime":196562.0,"Position":235.881165,"HyperDash":false},{"StartTime":196646.0,"Position":200.877213,"HyperDash":false},{"StartTime":196720.0,"Position":215.90448,"HyperDash":false},{"StartTime":196794.0,"Position":240.931778,"HyperDash":false},{"StartTime":196868.0,"Position":248.959076,"HyperDash":false},{"StartTime":196979.0,"Position":300.0,"HyperDash":false}]},{"StartTime":197313.0,"Objects":[{"StartTime":197313.0,"Position":420.0,"HyperDash":false}]},{"StartTime":197647.0,"Objects":[{"StartTime":197647.0,"Position":400.0,"HyperDash":false}]},{"StartTime":197980.0,"Objects":[{"StartTime":197980.0,"Position":300.0,"HyperDash":false},{"StartTime":198054.0,"Position":293.0362,"HyperDash":false},{"StartTime":198128.0,"Position":249.072357,"HyperDash":false},{"StartTime":198202.0,"Position":251.108551,"HyperDash":false},{"StartTime":198313.0,"Position":201.162827,"HyperDash":false}]},{"StartTime":198647.0,"Objects":[{"StartTime":198647.0,"Position":80.0,"HyperDash":false}]},{"StartTime":198980.0,"Objects":[{"StartTime":198980.0,"Position":60.0,"HyperDash":false}]},{"StartTime":199313.0,"Objects":[{"StartTime":199313.0,"Position":200.0,"HyperDash":false},{"StartTime":199387.0,"Position":224.2925,"HyperDash":false},{"StartTime":199461.0,"Position":246.710052,"HyperDash":false},{"StartTime":199535.0,"Position":263.1878,"HyperDash":false},{"StartTime":199646.0,"Position":270.120148,"HyperDash":false}]},{"StartTime":199813.0,"Objects":[{"StartTime":199813.0,"Position":296.0,"HyperDash":false}]},{"StartTime":199980.0,"Objects":[{"StartTime":199980.0,"Position":272.0,"HyperDash":false}]},{"StartTime":200313.0,"Objects":[{"StartTime":200313.0,"Position":56.0,"HyperDash":false}]},{"StartTime":200647.0,"Objects":[{"StartTime":200647.0,"Position":284.0,"HyperDash":false},{"StartTime":200721.0,"Position":297.376343,"HyperDash":false},{"StartTime":200795.0,"Position":265.3053,"HyperDash":false},{"StartTime":200869.0,"Position":263.664337,"HyperDash":false},{"StartTime":200980.0,"Position":247.205276,"HyperDash":false}]},{"StartTime":201147.0,"Objects":[{"StartTime":201147.0,"Position":196.0,"HyperDash":false}]},{"StartTime":201314.0,"Objects":[{"StartTime":201314.0,"Position":156.0,"HyperDash":false}]},{"StartTime":201647.0,"Objects":[{"StartTime":201647.0,"Position":172.0,"HyperDash":false}]},{"StartTime":201980.0,"Objects":[{"StartTime":201980.0,"Position":176.0,"HyperDash":false},{"StartTime":202054.0,"Position":140.8467,"HyperDash":false},{"StartTime":202128.0,"Position":146.271057,"HyperDash":false},{"StartTime":202202.0,"Position":100.283012,"HyperDash":false},{"StartTime":202313.0,"Position":85.75247,"HyperDash":false}]},{"StartTime":202480.0,"Objects":[{"StartTime":202480.0,"Position":48.0,"HyperDash":false}]},{"StartTime":202647.0,"Objects":[{"StartTime":202647.0,"Position":40.0,"HyperDash":false}]},{"StartTime":202980.0,"Objects":[{"StartTime":202980.0,"Position":164.0,"HyperDash":false}]},{"StartTime":203313.0,"Objects":[{"StartTime":203313.0,"Position":44.0,"HyperDash":false},{"StartTime":203396.0,"Position":54.64748,"HyperDash":false},{"StartTime":203479.0,"Position":34.0083046,"HyperDash":false},{"StartTime":203562.0,"Position":34.9480324,"HyperDash":false},{"StartTime":203646.0,"Position":41.9094124,"HyperDash":false},{"StartTime":203720.0,"Position":47.4630432,"HyperDash":false},{"StartTime":203794.0,"Position":38.06579,"HyperDash":false},{"StartTime":203868.0,"Position":41.2230949,"HyperDash":false},{"StartTime":203979.0,"Position":44.0,"HyperDash":false}]},{"StartTime":204313.0,"Objects":[{"StartTime":204313.0,"Position":152.0,"HyperDash":false},{"StartTime":204396.0,"Position":127.075073,"HyperDash":false},{"StartTime":204479.0,"Position":102.0,"HyperDash":false},{"StartTime":204544.0,"Position":132.36937,"HyperDash":false},{"StartTime":204646.0,"Position":152.0,"HyperDash":false}]},{"StartTime":204980.0,"Objects":[{"StartTime":204980.0,"Position":464.0,"HyperDash":false}]},{"StartTime":205313.0,"Objects":[{"StartTime":205313.0,"Position":272.0,"HyperDash":false},{"StartTime":205396.0,"Position":258.4456,"HyperDash":false},{"StartTime":205479.0,"Position":269.674164,"HyperDash":false},{"StartTime":205562.0,"Position":250.012192,"HyperDash":false},{"StartTime":205646.0,"Position":212.531021,"HyperDash":false},{"StartTime":205720.0,"Position":201.934311,"HyperDash":false},{"StartTime":205794.0,"Position":166.713287,"HyperDash":false},{"StartTime":205868.0,"Position":145.157013,"HyperDash":false},{"StartTime":205979.0,"Position":152.274872,"HyperDash":false}]},{"StartTime":206313.0,"Objects":[{"StartTime":206313.0,"Position":152.0,"HyperDash":false},{"StartTime":206396.0,"Position":157.0,"HyperDash":false},{"StartTime":206479.0,"Position":152.0,"HyperDash":false},{"StartTime":206544.0,"Position":163.0,"HyperDash":false},{"StartTime":206646.0,"Position":152.0,"HyperDash":false}]},{"StartTime":206980.0,"Objects":[{"StartTime":206980.0,"Position":172.0,"HyperDash":false}]},{"StartTime":207313.0,"Objects":[{"StartTime":207313.0,"Position":172.0,"HyperDash":false}]},{"StartTime":207646.0,"Objects":[{"StartTime":207646.0,"Position":152.0,"HyperDash":false},{"StartTime":207729.0,"Position":138.0,"HyperDash":false},{"StartTime":207812.0,"Position":152.0,"HyperDash":false},{"StartTime":207877.0,"Position":143.0,"HyperDash":false},{"StartTime":207979.0,"Position":152.0,"HyperDash":false}]},{"StartTime":208313.0,"Objects":[{"StartTime":208313.0,"Position":248.0,"HyperDash":false},{"StartTime":208387.0,"Position":239.45256,"HyperDash":false},{"StartTime":208461.0,"Position":243.221558,"HyperDash":false},{"StartTime":208535.0,"Position":244.170654,"HyperDash":false},{"StartTime":208646.0,"Position":250.445511,"HyperDash":false}]},{"StartTime":208980.0,"Objects":[{"StartTime":208980.0,"Position":353.0,"HyperDash":false},{"StartTime":209042.0,"Position":358.0,"HyperDash":false},{"StartTime":209105.0,"Position":447.0,"HyperDash":false},{"StartTime":209167.0,"Position":222.0,"HyperDash":false},{"StartTime":209230.0,"Position":382.0,"HyperDash":false},{"StartTime":209292.0,"Position":433.0,"HyperDash":false},{"StartTime":209355.0,"Position":450.0,"HyperDash":false},{"StartTime":209417.0,"Position":326.0,"HyperDash":false},{"StartTime":209480.0,"Position":414.0,"HyperDash":false},{"StartTime":209542.0,"Position":285.0,"HyperDash":false},{"StartTime":209605.0,"Position":336.0,"HyperDash":false},{"StartTime":209667.0,"Position":509.0,"HyperDash":false},{"StartTime":209730.0,"Position":334.0,"HyperDash":false},{"StartTime":209792.0,"Position":72.0,"HyperDash":false},{"StartTime":209855.0,"Position":425.0,"HyperDash":false},{"StartTime":209917.0,"Position":451.0,"HyperDash":false},{"StartTime":209980.0,"Position":220.0,"HyperDash":false}]},{"StartTime":210313.0,"Objects":[{"StartTime":210313.0,"Position":25.0,"HyperDash":false},{"StartTime":210375.0,"Position":77.0,"HyperDash":false},{"StartTime":210438.0,"Position":509.0,"HyperDash":false},{"StartTime":210500.0,"Position":90.0,"HyperDash":false},{"StartTime":210563.0,"Position":118.0,"HyperDash":false},{"StartTime":210625.0,"Position":58.0,"HyperDash":false},{"StartTime":210688.0,"Position":12.0,"HyperDash":false},{"StartTime":210750.0,"Position":215.0,"HyperDash":false},{"StartTime":210813.0,"Position":487.0,"HyperDash":false},{"StartTime":210875.0,"Position":446.0,"HyperDash":false},{"StartTime":210938.0,"Position":491.0,"HyperDash":false},{"StartTime":211000.0,"Position":459.0,"HyperDash":false},{"StartTime":211063.0,"Position":37.0,"HyperDash":false},{"StartTime":211125.0,"Position":291.0,"HyperDash":false},{"StartTime":211188.0,"Position":315.0,"HyperDash":false},{"StartTime":211250.0,"Position":35.0,"HyperDash":false},{"StartTime":211313.0,"Position":208.0,"HyperDash":false}]},{"StartTime":211980.0,"Objects":[{"StartTime":211980.0,"Position":440.0,"HyperDash":false},{"StartTime":212054.0,"Position":437.20932,"HyperDash":false},{"StartTime":212128.0,"Position":384.41864,"HyperDash":false},{"StartTime":212202.0,"Position":361.62793,"HyperDash":false},{"StartTime":212313.0,"Position":341.941925,"HyperDash":false}]},{"StartTime":212647.0,"Objects":[{"StartTime":212647.0,"Position":324.0,"HyperDash":false},{"StartTime":212730.0,"Position":307.11853,"HyperDash":false},{"StartTime":212813.0,"Position":283.23703,"HyperDash":false},{"StartTime":212896.0,"Position":247.35556,"HyperDash":false},{"StartTime":212980.0,"Position":236.210449,"HyperDash":false},{"StartTime":213054.0,"Position":224.70166,"HyperDash":false},{"StartTime":213128.0,"Position":185.192871,"HyperDash":false},{"StartTime":213202.0,"Position":194.684082,"HyperDash":false},{"StartTime":213313.0,"Position":148.420883,"HyperDash":false}]},{"StartTime":213647.0,"Objects":[{"StartTime":213647.0,"Position":12.0,"HyperDash":false}]},{"StartTime":213980.0,"Objects":[{"StartTime":213980.0,"Position":192.0,"HyperDash":false}]},{"StartTime":214313.0,"Objects":[{"StartTime":214313.0,"Position":312.0,"HyperDash":false}]},{"StartTime":214647.0,"Objects":[{"StartTime":214647.0,"Position":424.0,"HyperDash":false}]},{"StartTime":214980.0,"Objects":[{"StartTime":214980.0,"Position":472.0,"HyperDash":false},{"StartTime":215063.0,"Position":469.524933,"HyperDash":false},{"StartTime":215146.0,"Position":479.071075,"HyperDash":false},{"StartTime":215211.0,"Position":494.331818,"HyperDash":false},{"StartTime":215313.0,"Position":472.0,"HyperDash":false}]},{"StartTime":215647.0,"Objects":[{"StartTime":215647.0,"Position":352.0,"HyperDash":false},{"StartTime":215730.0,"Position":363.954834,"HyperDash":false},{"StartTime":215813.0,"Position":339.87323,"HyperDash":false},{"StartTime":215878.0,"Position":351.570984,"HyperDash":false},{"StartTime":215980.0,"Position":352.0,"HyperDash":false}]},{"StartTime":216313.0,"Objects":[{"StartTime":216313.0,"Position":256.0,"HyperDash":false}]},{"StartTime":216647.0,"Objects":[{"StartTime":216647.0,"Position":96.0,"HyperDash":false}]},{"StartTime":216980.0,"Objects":[{"StartTime":216980.0,"Position":208.0,"HyperDash":false}]},{"StartTime":217313.0,"Objects":[{"StartTime":217313.0,"Position":336.0,"HyperDash":false}]},{"StartTime":217647.0,"Objects":[{"StartTime":217647.0,"Position":360.0,"HyperDash":false},{"StartTime":217730.0,"Position":379.256866,"HyperDash":false},{"StartTime":217813.0,"Position":378.569519,"HyperDash":false},{"StartTime":217878.0,"Position":356.375916,"HyperDash":false},{"StartTime":217980.0,"Position":360.0,"HyperDash":false}]},{"StartTime":218313.0,"Objects":[{"StartTime":218313.0,"Position":248.0,"HyperDash":false},{"StartTime":218387.0,"Position":227.656219,"HyperDash":false},{"StartTime":218461.0,"Position":211.892563,"HyperDash":false},{"StartTime":218535.0,"Position":191.882538,"HyperDash":false},{"StartTime":218646.0,"Position":190.6999,"HyperDash":false}]},{"StartTime":218980.0,"Objects":[{"StartTime":218980.0,"Position":232.0,"HyperDash":false}]},{"StartTime":219313.0,"Objects":[{"StartTime":219313.0,"Position":152.0,"HyperDash":false}]},{"StartTime":219647.0,"Objects":[{"StartTime":219647.0,"Position":192.0,"HyperDash":false},{"StartTime":219721.0,"Position":214.85907,"HyperDash":false},{"StartTime":219795.0,"Position":222.038834,"HyperDash":false},{"StartTime":219869.0,"Position":223.900543,"HyperDash":false},{"StartTime":219980.0,"Position":247.507462,"HyperDash":false}]},{"StartTime":220313.0,"Objects":[{"StartTime":220313.0,"Position":344.0,"HyperDash":false},{"StartTime":220396.0,"Position":373.282257,"HyperDash":false},{"StartTime":220479.0,"Position":384.686676,"HyperDash":false},{"StartTime":220544.0,"Position":349.925171,"HyperDash":false},{"StartTime":220646.0,"Position":344.0,"HyperDash":false}]},{"StartTime":220980.0,"Objects":[{"StartTime":220980.0,"Position":320.0,"HyperDash":false},{"StartTime":221054.0,"Position":307.766663,"HyperDash":false},{"StartTime":221128.0,"Position":306.876526,"HyperDash":false},{"StartTime":221202.0,"Position":287.838531,"HyperDash":false},{"StartTime":221313.0,"Position":256.301666,"HyperDash":false}]},{"StartTime":221647.0,"Objects":[{"StartTime":221647.0,"Position":140.0,"HyperDash":false},{"StartTime":221730.0,"Position":123.227524,"HyperDash":false},{"StartTime":221813.0,"Position":90.30582,"HyperDash":false},{"StartTime":221878.0,"Position":121.556717,"HyperDash":false},{"StartTime":221980.0,"Position":140.0,"HyperDash":false}]},{"StartTime":222313.0,"Objects":[{"StartTime":222313.0,"Position":436.0,"HyperDash":false}]},{"StartTime":222647.0,"Objects":[{"StartTime":222647.0,"Position":316.0,"HyperDash":false}]},{"StartTime":222980.0,"Objects":[{"StartTime":222980.0,"Position":428.0,"HyperDash":false}]},{"StartTime":223313.0,"Objects":[{"StartTime":223313.0,"Position":252.0,"HyperDash":false}]},{"StartTime":223646.0,"Objects":[{"StartTime":223646.0,"Position":272.0,"HyperDash":false}]},{"StartTime":223980.0,"Objects":[{"StartTime":223980.0,"Position":380.0,"HyperDash":false}]},{"StartTime":224313.0,"Objects":[{"StartTime":224313.0,"Position":212.0,"HyperDash":false}]},{"StartTime":224647.0,"Objects":[{"StartTime":224647.0,"Position":192.0,"HyperDash":false}]},{"StartTime":224980.0,"Objects":[{"StartTime":224980.0,"Position":232.0,"HyperDash":false}]},{"StartTime":225313.0,"Objects":[{"StartTime":225313.0,"Position":232.0,"HyperDash":false}]},{"StartTime":225647.0,"Objects":[{"StartTime":225647.0,"Position":212.0,"HyperDash":false}]},{"StartTime":225980.0,"Objects":[{"StartTime":225980.0,"Position":212.0,"HyperDash":false},{"StartTime":226054.0,"Position":247.605728,"HyperDash":false},{"StartTime":226128.0,"Position":273.6619,"HyperDash":false},{"StartTime":226202.0,"Position":283.86673,"HyperDash":false},{"StartTime":226313.0,"Position":310.620728,"HyperDash":false}]},{"StartTime":226480.0,"Objects":[{"StartTime":226480.0,"Position":380.0,"HyperDash":false}]},{"StartTime":226647.0,"Objects":[{"StartTime":226647.0,"Position":400.0,"HyperDash":false}]},{"StartTime":226980.0,"Objects":[{"StartTime":226980.0,"Position":180.0,"HyperDash":false}]},{"StartTime":227313.0,"Objects":[{"StartTime":227313.0,"Position":372.0,"HyperDash":false},{"StartTime":227387.0,"Position":339.487122,"HyperDash":false},{"StartTime":227461.0,"Position":345.4503,"HyperDash":false},{"StartTime":227535.0,"Position":299.24823,"HyperDash":false},{"StartTime":227646.0,"Position":273.555176,"HyperDash":false}]},{"StartTime":227813.0,"Objects":[{"StartTime":227813.0,"Position":204.0,"HyperDash":false}]},{"StartTime":227980.0,"Objects":[{"StartTime":227980.0,"Position":212.0,"HyperDash":false}]},{"StartTime":228313.0,"Objects":[{"StartTime":228313.0,"Position":300.0,"HyperDash":false}]},{"StartTime":228647.0,"Objects":[{"StartTime":228647.0,"Position":212.0,"HyperDash":false}]},{"StartTime":228980.0,"Objects":[{"StartTime":228980.0,"Position":60.0,"HyperDash":false}]},{"StartTime":229147.0,"Objects":[{"StartTime":229147.0,"Position":136.0,"HyperDash":false}]},{"StartTime":229313.0,"Objects":[{"StartTime":229313.0,"Position":136.0,"HyperDash":false},{"StartTime":229396.0,"Position":126.907516,"HyperDash":false},{"StartTime":229479.0,"Position":112.738968,"HyperDash":false},{"StartTime":229562.0,"Position":135.404449,"HyperDash":false},{"StartTime":229646.0,"Position":130.813385,"HyperDash":false},{"StartTime":229720.0,"Position":122.399216,"HyperDash":false},{"StartTime":229794.0,"Position":152.142029,"HyperDash":false},{"StartTime":229868.0,"Position":137.941391,"HyperDash":false},{"StartTime":229979.0,"Position":150.917847,"HyperDash":false}]},{"StartTime":230313.0,"Objects":[{"StartTime":230313.0,"Position":352.0,"HyperDash":false}]},{"StartTime":230647.0,"Objects":[{"StartTime":230647.0,"Position":352.0,"HyperDash":false},{"StartTime":230730.0,"Position":366.5288,"HyperDash":false},{"StartTime":230813.0,"Position":373.811279,"HyperDash":false},{"StartTime":230896.0,"Position":365.95578,"HyperDash":false},{"StartTime":230980.0,"Position":365.109131,"HyperDash":false},{"StartTime":231054.0,"Position":343.7144,"HyperDash":false},{"StartTime":231128.0,"Position":374.024841,"HyperDash":false},{"StartTime":231202.0,"Position":338.171265,"HyperDash":false},{"StartTime":231313.0,"Position":349.468353,"HyperDash":false}]},{"StartTime":231647.0,"Objects":[{"StartTime":231647.0,"Position":236.0,"HyperDash":false},{"StartTime":231730.0,"Position":222.198776,"HyperDash":false},{"StartTime":231813.0,"Position":186.248138,"HyperDash":false},{"StartTime":231878.0,"Position":214.5214,"HyperDash":false},{"StartTime":231980.0,"Position":236.0,"HyperDash":false}]},{"StartTime":232313.0,"Objects":[{"StartTime":232313.0,"Position":316.0,"HyperDash":false}]},{"StartTime":232647.0,"Objects":[{"StartTime":232647.0,"Position":156.0,"HyperDash":false}]},{"StartTime":233313.0,"Objects":[{"StartTime":233313.0,"Position":256.0,"HyperDash":false},{"StartTime":233387.0,"Position":231.421722,"HyperDash":false},{"StartTime":233461.0,"Position":222.304459,"HyperDash":false},{"StartTime":233535.0,"Position":195.48584,"HyperDash":false},{"StartTime":233646.0,"Position":174.843628,"HyperDash":false}]},{"StartTime":233980.0,"Objects":[{"StartTime":233980.0,"Position":192.0,"HyperDash":false},{"StartTime":234063.0,"Position":220.6892,"HyperDash":false},{"StartTime":234146.0,"Position":257.786133,"HyperDash":false},{"StartTime":234229.0,"Position":260.765076,"HyperDash":false},{"StartTime":234313.0,"Position":285.29007,"HyperDash":false},{"StartTime":234396.0,"Position":317.35672,"HyperDash":false},{"StartTime":234479.0,"Position":321.969574,"HyperDash":false},{"StartTime":234562.0,"Position":349.117,"HyperDash":false},{"StartTime":234646.0,"Position":347.1605,"HyperDash":false},{"StartTime":234729.0,"Position":345.428131,"HyperDash":false},{"StartTime":234813.0,"Position":305.1539,"HyperDash":false},{"StartTime":234896.0,"Position":317.5711,"HyperDash":false},{"StartTime":234980.0,"Position":285.290039,"HyperDash":false},{"StartTime":235054.0,"Position":254.43042,"HyperDash":false},{"StartTime":235128.0,"Position":258.165863,"HyperDash":false},{"StartTime":235202.0,"Position":239.908249,"HyperDash":false},{"StartTime":235313.0,"Position":192.0,"HyperDash":false}]},{"StartTime":235647.0,"Objects":[{"StartTime":235647.0,"Position":164.0,"HyperDash":false}]},{"StartTime":235980.0,"Objects":[{"StartTime":235980.0,"Position":348.0,"HyperDash":false}]},{"StartTime":236313.0,"Objects":[{"StartTime":236313.0,"Position":256.0,"HyperDash":false},{"StartTime":236396.0,"Position":252.0,"HyperDash":false},{"StartTime":236479.0,"Position":256.0,"HyperDash":false},{"StartTime":236544.0,"Position":263.0,"HyperDash":false},{"StartTime":236646.0,"Position":256.0,"HyperDash":false}]},{"StartTime":236980.0,"Objects":[{"StartTime":236980.0,"Position":256.0,"HyperDash":false},{"StartTime":237063.0,"Position":268.0,"HyperDash":false},{"StartTime":237146.0,"Position":256.0,"HyperDash":false},{"StartTime":237211.0,"Position":262.0,"HyperDash":false},{"StartTime":237313.0,"Position":256.0,"HyperDash":false}]},{"StartTime":237647.0,"Objects":[{"StartTime":237647.0,"Position":276.0,"HyperDash":false}]},{"StartTime":237980.0,"Objects":[{"StartTime":237980.0,"Position":276.0,"HyperDash":false}]},{"StartTime":238313.0,"Objects":[{"StartTime":238313.0,"Position":344.0,"HyperDash":false},{"StartTime":238387.0,"Position":349.4431,"HyperDash":false},{"StartTime":238461.0,"Position":367.88623,"HyperDash":false},{"StartTime":238535.0,"Position":402.329346,"HyperDash":false},{"StartTime":238646.0,"Position":417.994019,"HyperDash":false}]},{"StartTime":238980.0,"Objects":[{"StartTime":238980.0,"Position":224.0,"HyperDash":false}]},{"StartTime":239147.0,"Objects":[{"StartTime":239147.0,"Position":328.0,"HyperDash":false}]},{"StartTime":239313.0,"Objects":[{"StartTime":239313.0,"Position":328.0,"HyperDash":false},{"StartTime":239387.0,"Position":303.777771,"HyperDash":false},{"StartTime":239461.0,"Position":283.555542,"HyperDash":false},{"StartTime":239535.0,"Position":243.333313,"HyperDash":false},{"StartTime":239646.0,"Position":228.0,"HyperDash":false}]},{"StartTime":239980.0,"Objects":[{"StartTime":239980.0,"Position":288.0,"HyperDash":false},{"StartTime":240054.0,"Position":273.789337,"HyperDash":false},{"StartTime":240128.0,"Position":255.578659,"HyperDash":false},{"StartTime":240202.0,"Position":211.368,"HyperDash":false},{"StartTime":240313.0,"Position":192.552,"HyperDash":false}]},{"StartTime":240647.0,"Objects":[{"StartTime":240647.0,"Position":72.0,"HyperDash":false}]},{"StartTime":240980.0,"Objects":[{"StartTime":240980.0,"Position":92.0,"HyperDash":false}]},{"StartTime":241313.0,"Objects":[{"StartTime":241313.0,"Position":92.0,"HyperDash":false}]},{"StartTime":241647.0,"Objects":[{"StartTime":241647.0,"Position":52.0,"HyperDash":false}]},{"StartTime":241980.0,"Objects":[{"StartTime":241980.0,"Position":152.0,"HyperDash":false},{"StartTime":242063.0,"Position":152.083969,"HyperDash":false},{"StartTime":242146.0,"Position":194.167923,"HyperDash":false},{"StartTime":242229.0,"Position":202.251892,"HyperDash":false},{"StartTime":242313.0,"Position":216.594238,"HyperDash":false},{"StartTime":242396.0,"Position":191.57486,"HyperDash":false},{"StartTime":242479.0,"Position":179.4909,"HyperDash":false},{"StartTime":242562.0,"Position":169.406937,"HyperDash":false},{"StartTime":242646.0,"Position":152.0,"HyperDash":false},{"StartTime":242720.0,"Position":158.210739,"HyperDash":false},{"StartTime":242795.0,"Position":179.744431,"HyperDash":false},{"StartTime":242869.0,"Position":185.084351,"HyperDash":false},{"StartTime":242980.0,"Position":216.594238,"HyperDash":false}]},{"StartTime":243313.0,"Objects":[{"StartTime":243313.0,"Position":216.0,"HyperDash":false}]},{"StartTime":243980.0,"Objects":[{"StartTime":243980.0,"Position":444.0,"HyperDash":false}]},{"StartTime":244313.0,"Objects":[{"StartTime":244313.0,"Position":292.0,"HyperDash":false}]},{"StartTime":244647.0,"Objects":[{"StartTime":244647.0,"Position":204.0,"HyperDash":false}]},{"StartTime":244980.0,"Objects":[{"StartTime":244980.0,"Position":52.0,"HyperDash":false}]},{"StartTime":245147.0,"Objects":[{"StartTime":245147.0,"Position":128.0,"HyperDash":false}]},{"StartTime":245313.0,"Objects":[{"StartTime":245313.0,"Position":128.0,"HyperDash":false},{"StartTime":245387.0,"Position":95.02887,"HyperDash":false},{"StartTime":245461.0,"Position":102.54911,"HyperDash":false},{"StartTime":245535.0,"Position":83.8343353,"HyperDash":false},{"StartTime":245646.0,"Position":76.92937,"HyperDash":false}]},{"StartTime":245980.0,"Objects":[{"StartTime":245980.0,"Position":52.0,"HyperDash":false}]},{"StartTime":246313.0,"Objects":[{"StartTime":246313.0,"Position":312.0,"HyperDash":false}]},{"StartTime":246480.0,"Objects":[{"StartTime":246480.0,"Position":192.0,"HyperDash":false}]},{"StartTime":246647.0,"Objects":[{"StartTime":246647.0,"Position":192.0,"HyperDash":false},{"StartTime":246730.0,"Position":188.38472,"HyperDash":false},{"StartTime":246813.0,"Position":225.710083,"HyperDash":false},{"StartTime":246896.0,"Position":227.818253,"HyperDash":false},{"StartTime":246980.0,"Position":260.7363,"HyperDash":false},{"StartTime":247054.0,"Position":259.404358,"HyperDash":false},{"StartTime":247128.0,"Position":316.934875,"HyperDash":false},{"StartTime":247202.0,"Position":301.161316,"HyperDash":false},{"StartTime":247313.0,"Position":350.4887,"HyperDash":false}]},{"StartTime":247646.0,"Objects":[{"StartTime":247646.0,"Position":436.0,"HyperDash":false}]},{"StartTime":247813.0,"Objects":[{"StartTime":247813.0,"Position":368.0,"HyperDash":false}]},{"StartTime":247980.0,"Objects":[{"StartTime":247980.0,"Position":402.0,"HyperDash":false},{"StartTime":248054.0,"Position":427.9642,"HyperDash":false},{"StartTime":248128.0,"Position":455.292267,"HyperDash":false},{"StartTime":248202.0,"Position":467.624146,"HyperDash":false},{"StartTime":248313.0,"Position":467.800751,"HyperDash":false}]},{"StartTime":248647.0,"Objects":[{"StartTime":248647.0,"Position":230.0,"HyperDash":false}]},{"StartTime":248980.0,"Objects":[{"StartTime":248980.0,"Position":467.0,"HyperDash":false},{"StartTime":249054.0,"Position":448.114563,"HyperDash":false},{"StartTime":249128.0,"Position":449.648,"HyperDash":false},{"StartTime":249202.0,"Position":452.133575,"HyperDash":false},{"StartTime":249313.0,"Position":426.641052,"HyperDash":false}]},{"StartTime":249647.0,"Objects":[{"StartTime":249647.0,"Position":205.0,"HyperDash":false}]},{"StartTime":249813.0,"Objects":[{"StartTime":249813.0,"Position":307.0,"HyperDash":false}]},{"StartTime":249980.0,"Objects":[{"StartTime":249980.0,"Position":200.0,"HyperDash":false}]},{"StartTime":250313.0,"Objects":[{"StartTime":250313.0,"Position":360.0,"HyperDash":false}]},{"StartTime":250647.0,"Objects":[{"StartTime":250647.0,"Position":200.0,"HyperDash":false}]},{"StartTime":250980.0,"Objects":[{"StartTime":250980.0,"Position":320.0,"HyperDash":false}]},{"StartTime":251313.0,"Objects":[{"StartTime":251313.0,"Position":240.0,"HyperDash":false}]},{"StartTime":251647.0,"Objects":[{"StartTime":251647.0,"Position":152.0,"HyperDash":false}]},{"StartTime":251980.0,"Objects":[{"StartTime":251980.0,"Position":280.0,"HyperDash":false}]},{"StartTime":252647.0,"Objects":[{"StartTime":252647.0,"Position":232.0,"HyperDash":false}]},{"StartTime":253313.0,"Objects":[{"StartTime":253313.0,"Position":280.0,"HyperDash":false}]},{"StartTime":253980.0,"Objects":[{"StartTime":253980.0,"Position":120.0,"HyperDash":false}]},{"StartTime":254646.0,"Objects":[{"StartTime":254646.0,"Position":392.0,"HyperDash":false}]},{"StartTime":255313.0,"Objects":[{"StartTime":255313.0,"Position":120.0,"HyperDash":false}]},{"StartTime":255647.0,"Objects":[{"StartTime":255647.0,"Position":256.0,"HyperDash":false}]},{"StartTime":255813.0,"Objects":[{"StartTime":255813.0,"Position":236.0,"HyperDash":false}]},{"StartTime":255980.0,"Objects":[{"StartTime":255980.0,"Position":276.0,"HyperDash":false}]},{"StartTime":256146.0,"Objects":[{"StartTime":256146.0,"Position":496.0,"HyperDash":false},{"StartTime":256216.0,"Position":27.0,"HyperDash":false},{"StartTime":256286.0,"Position":477.0,"HyperDash":false},{"StartTime":256356.0,"Position":163.0,"HyperDash":false},{"StartTime":256427.0,"Position":260.0,"HyperDash":false},{"StartTime":256497.0,"Position":253.0,"HyperDash":false},{"StartTime":256567.0,"Position":423.0,"HyperDash":false},{"StartTime":256638.0,"Position":367.0,"HyperDash":false},{"StartTime":256708.0,"Position":146.0,"HyperDash":false},{"StartTime":256778.0,"Position":322.0,"HyperDash":false},{"StartTime":256849.0,"Position":169.0,"HyperDash":false},{"StartTime":256919.0,"Position":159.0,"HyperDash":false},{"StartTime":256989.0,"Position":388.0,"HyperDash":false},{"StartTime":257060.0,"Position":67.0,"HyperDash":false},{"StartTime":257130.0,"Position":176.0,"HyperDash":false},{"StartTime":257200.0,"Position":371.0,"HyperDash":false},{"StartTime":257271.0,"Position":365.0,"HyperDash":false},{"StartTime":257341.0,"Position":104.0,"HyperDash":false},{"StartTime":257411.0,"Position":363.0,"HyperDash":false},{"StartTime":257481.0,"Position":75.0,"HyperDash":false},{"StartTime":257552.0,"Position":158.0,"HyperDash":false},{"StartTime":257622.0,"Position":98.0,"HyperDash":false},{"StartTime":257692.0,"Position":30.0,"HyperDash":false},{"StartTime":257763.0,"Position":164.0,"HyperDash":false},{"StartTime":257833.0,"Position":341.0,"HyperDash":false},{"StartTime":257903.0,"Position":18.0,"HyperDash":false},{"StartTime":257974.0,"Position":210.0,"HyperDash":false},{"StartTime":258044.0,"Position":420.0,"HyperDash":false},{"StartTime":258114.0,"Position":447.0,"HyperDash":false},{"StartTime":258185.0,"Position":78.0,"HyperDash":false},{"StartTime":258255.0,"Position":177.0,"HyperDash":false},{"StartTime":258325.0,"Position":305.0,"HyperDash":false},{"StartTime":258396.0,"Position":400.0,"HyperDash":false},{"StartTime":258466.0,"Position":462.0,"HyperDash":false},{"StartTime":258536.0,"Position":64.0,"HyperDash":false},{"StartTime":258606.0,"Position":458.0,"HyperDash":false},{"StartTime":258677.0,"Position":380.0,"HyperDash":false},{"StartTime":258747.0,"Position":65.0,"HyperDash":false},{"StartTime":258817.0,"Position":23.0,"HyperDash":false},{"StartTime":258888.0,"Position":379.0,"HyperDash":false},{"StartTime":258958.0,"Position":44.0,"HyperDash":false},{"StartTime":259028.0,"Position":485.0,"HyperDash":false},{"StartTime":259099.0,"Position":269.0,"HyperDash":false},{"StartTime":259169.0,"Position":155.0,"HyperDash":false},{"StartTime":259239.0,"Position":324.0,"HyperDash":false},{"StartTime":259310.0,"Position":149.0,"HyperDash":false},{"StartTime":259380.0,"Position":351.0,"HyperDash":false},{"StartTime":259450.0,"Position":385.0,"HyperDash":false},{"StartTime":259521.0,"Position":338.0,"HyperDash":false},{"StartTime":259591.0,"Position":322.0,"HyperDash":false},{"StartTime":259661.0,"Position":84.0,"HyperDash":false},{"StartTime":259731.0,"Position":342.0,"HyperDash":false},{"StartTime":259802.0,"Position":395.0,"HyperDash":false},{"StartTime":259872.0,"Position":72.0,"HyperDash":false},{"StartTime":259942.0,"Position":324.0,"HyperDash":false},{"StartTime":260013.0,"Position":67.0,"HyperDash":false},{"StartTime":260083.0,"Position":371.0,"HyperDash":false},{"StartTime":260153.0,"Position":446.0,"HyperDash":false},{"StartTime":260224.0,"Position":29.0,"HyperDash":false},{"StartTime":260294.0,"Position":22.0,"HyperDash":false},{"StartTime":260364.0,"Position":432.0,"HyperDash":false},{"StartTime":260435.0,"Position":12.0,"HyperDash":false},{"StartTime":260505.0,"Position":330.0,"HyperDash":false},{"StartTime":260575.0,"Position":419.0,"HyperDash":false},{"StartTime":260646.0,"Position":278.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/104973.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/104973.osu
new file mode 100644
index 0000000000..6edd8229a2
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/104973.osu
@@ -0,0 +1,491 @@
+osu file format v9
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4
+OverallDifficulty:6
+ApproachRate:6
+SliderMultiplier:2
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+2,100846,120263
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+//Background Colour Transformations
+3,100,163,162,255
+
+[TimingPoints]
+1980,666.666666666667,4,2,2,20,1,0
+12647,-100,4,2,2,42,0,0
+39646,-100,4,2,1,22,0,0
+39813,-100,4,2,2,42,0,0
+40313,-100,4,2,1,22,0,0
+40480,-100,4,2,2,42,0,0
+57980,-100,4,2,2,47,0,1
+75313,-100,4,2,1,22,0,1
+75646,-100,4,2,2,47,0,1
+79646,-100,4,2,1,22,0,1
+79813,-100,4,2,2,47,0,1
+80313,-100,4,2,1,22,0,1
+80480,-100,4,2,2,47,0,1
+80980,-100,4,2,1,22,0,1
+81146,-100,4,2,2,47,0,1
+81646,-100,4,2,1,22,0,1
+81813,-100,4,2,2,47,0,1
+100646,-100,4,2,2,42,0,0
+148980,-100,4,2,1,22,0,0
+149146,-100,4,2,2,42,0,0
+149646,-100,4,2,1,22,0,0
+149813,-100,4,2,2,42,0,0
+167313,-100,4,2,2,47,0,1
+178313,-100,4,2,1,22,0,1
+178480,-100,4,2,2,47,0,1
+178980,-100,4,2,1,22,0,1
+179146,-100,4,2,2,47,0,1
+179646,-100,4,2,1,22,0,1
+179813,-100,4,2,2,47,0,1
+180313,-100,4,2,1,22,0,1
+180480,-100,4,2,2,47,0,1
+187980,-100,4,2,2,42,0,0
+212646,-100,4,2,2,47,0,1
+260646,-100,4,2,2,42,0,0
+
+[HitObjects]
+152,72,11980,1,0
+248,144,12313,1,0
+132,176,12647,2,0,B|44:112,2,100,0|0|8
+132,176,13646,1,0
+240,232,13980,2,0,B|164:296,2,100,0|0|12
+240,232,14980,1,0
+304,128,15313,6,0,B|416:184,1,100,0|0
+496,240,15980,2,0,B|466:289|384:312,1,100,8|0
+296,304,16647,2,0,B|192:296|128:192,2,200,2|12|0
+296,184,18312,5,0
+296,184,18646,1,8
+416,184,18980,2,0,B|376:64,1,100,0|0
+268,116,19646,1,0
+268,116,19980,1,12
+168,184,20313,2,0,B|80:248,2,100,0|0|2
+232,80,21313,2,0,B|128:56,2,100,8|0|2
+453,174,22647,5,12
+408,284,22980,1,0
+336,188,23313,1,2
+448,236,23647,1,0
+336,188,23980,2,0,B|336:300,2,100,8|0|2
+256,60,24980,1,0
+112,104,25313,5,12
+228,136,25647,1,0
+132,208,25979,1,2
+176,96,26313,1,0
+132,208,26646,2,0,B|252:200,2,100,8|0|2
+256,292,27647,1,0
+404,280,27980,6,0,B|460:256|476:176,1,100,12|0
+348,184,28646,1,2
+348,184,28980,1,0
+336,64,29313,2,0,B|280:72|248:152,1,100,8|0
+304,236,29979,1,2
+304,236,30313,1,0
+304,236,30646,1,12
+24,120,31313,5,2
+60,264,31646,1,0
+96,120,31979,1,8
+132,264,32313,1,0
+264,192,32647,1,2
+488,108,33313,5,12
+488,108,33647,2,0,B|432:236,1,100,0|0
+380,300,34313,2,0,B|356:348,2,50,0|0|8
+312,200,34980,2,0,B|248:208|208:168,1,100,0|2
+116,112,35646,2,0,B|60:112,2,50,0|0|12
+232,80,36313,2,0,B|292:76|340:112,1,100,0|0
+356,156,36813,2,0,B|420:156,2,50,2|0|0
+296,156,37313,1,8
+176,156,37646,2,0,B|120:156,2,50,0|2|0
+176,156,38313,1,2
+60,128,38647,5,12
+168,88,38980,1,0
+60,128,39313,2,0,B|76:216|140:264,1,150,2|0
+148,312,39980,2,0,B|224:316|296:252,1,150,8|0
+285,261,40647,1,2
+392,204,40980,2,0,B|448:192,2,50,2|2|12
+292,140,41647,2,0,B|244:108|164:100,1,100
+176,160,42147,2,0,B|176:256,1,50,2|0
+140,258,42480,2,0,B|76:258,1,50,0|8
+210,258,42980,2,0,B|266:258,2,50,0|2|0
+257,147,43647,1,2
+256,28,43980,5,4
+256,28,44313,1,0
+344,108,44647,2,0,B|464:156,1,100,2|0
+340,216,45313,2,0,B|244:320,1,100,8|0
+236,176,45980,2,0,B|196:80,1,100,2|0
+92,144,46647,2,0,B|64:192|96:244,1,100,12|0
+204,192,47313,1,2
+324,192,47647,2,0,B|380:192,2,50,0|0|8
+212,144,48313,2,0,B|180:192|220:248,1,100,0|2
+324,192,48980,1,0
+324,192,49313,1,12
+256,292,49647,6,0,B|256:340,2,50,0|0|2
+324,192,50313,1,0
+324,192,50647,1,8
+256,92,50980,2,0,B|256:28,2,50,0|0|2
+200,200,51647,2,0,B|304:200,1,100,0|12
+136,24,52647,5,6
+256,112,52980,2,0,B|368:184,2,100,0|2|0
+376,24,53980,1,6
+256,112,54313,2,0,B|144:184,2,100,0|2|0
+256,264,55313,1,6
+256,112,55647,2,0,B|256:0,2,100,0|2|0
+256,112,56647,1,6
+488,48,57313,5,12
+488,48,57647,2,0,B|485:103|448:160,1,100,0|2
+360,72,58313,2,0,B|320:104|312:176,1,100,8|8
+428,200,58980,1,0
+344,288,59313,1,2
+224,288,59647,2,0,B|208:352,2,50,2|2|12
+256,172,60313,1,0
+256,172,60647,1,2
+136,192,60980,2,0,B|64:204,2,50,2|2|8
+256,172,61647,5,0
+352,244,61980,1,2
+420,144,62313,1,8
+324,72,62647,1,12
+204,72,62980,2,0,B|132:80,2,50,2|2|0
+324,72,63647,2,0,B|372:120|324:200,1,100,0|8
+252,244,64313,1,0
+148,184,64647,1,2
+36,224,64980,2,0,B|68:344,2,100,0|12|8
+24,104,65980,6,0,B|81:72|168:144|232:88,1,200,2|8
+340,84,66980,2,0,B|404:92|444:164,1,100,0|2
+436,252,67647,2,0,B|404:292|404:292,2,50,0|0|12
+436,252,68313,1,0
+332,192,68646,6,0,B|248:120,1,100,0|8
+272,248,69313,2,0,B|176:312,1,100,8|0
+208,184,69980,2,0,B|112:112,1,100,0|8
+128,244,70647,2,0,B|40:300,1,100,12|0
+20,180,71313,5,0
+72,72,71647,2,0,B|40:24,2,50,2|2|8
+192,80,72313,1,0
+300,132,72647,1,2
+300,252,72980,1,8
+192,304,73313,1,12
+72,320,73647,2,0,B|16:368,2,50,2|2|0
+112,208,74313,5,2
+112,208,74647,2,0,B|232:96|264:216|384:72,1,300,8|2
+492,104,75980,2,0,B|428:144|477:263|428:304,1,200,12|0
+320,268,76980,2,0,B|360:156,1,100,0|8
+256,76,77646,2,0,B|256:180,1,100,0|2
+192,268,78313,2,0,B|152:156,1,100,8|12
+216,68,78980,5,0
+320,128,79313,2,0,B|392:160|424:252,1,150,2|0
+408,276,79980,2,0,B|325:276|256:356,1,150,8|0
+236,336,80647,2,0,B|180:272|92:272,1,150,2|0
+88,236,81313,2,0,B|120:152|208:116,1,150,8|0
+224,112,81980,1,2
+344,116,82313,6,0,B|408:116,2,50,2|2|8
+252,192,82980,1,8
+344,268,83313,1,2
+436,192,83647,1,2
+344,116,83980,1,12
+228,80,84313,6,0,B|228:24,2,50,2|2|0
+120,132,84980,1,8
+120,252,85313,1,8
+120,132,85647,1,0
+120,252,85980,1,2
+224,192,86313,1,0
+104,192,86647,1,12
+104,192,86980,1,0
+104,192,87313,6,0,B|312:192,2,200,2|8|2
+12,112,88980,1,0
+104,192,89313,1,12
+124,72,89647,1,2
+244,56,89980,6,0,B|355:55|444:144,1,200,2|8
+416,248,90980,1,2
+312,308,91313,2,0,B|216:308|112:228,1,200,2|12
+88,124,92313,2,0,B|102:102|160:116|192:92,1,100,2|2
+292,144,92980,2,0,B|300:216,2,50,0|0|8
+280,24,93647,1,0
+392,68,93980,1,2
+408,188,94313,1,8
+320,272,94647,1,12
+200,284,94980,6,0,B|208:212,2,50,2|2|0
+80,260,95647,1,2
+20,156,95980,2,0,B|108:76|212:140,1,200,8|0
+304,204,96980,1,8
+416,252,97313,2,0,B|392:300|336:316,2,100,12|0|6
+256,192,98146,12,4,100646
+104,104,121313,6,0,B|216:104,1,100,12|0
+176,220,121980,2,0,B|368:132,1,200,2|8
+240,120,122980,2,0,B|320:80,2,50,2|2|0
+136,180,123647,2,0,B|264:228,1,100,0|12
+348,240,124313,2,0,B|252:288,1,100,0|2
+192,184,124980,1,2
+308,160,125313,1,8
+192,132,125647,1,0
+256,32,125980,6,0,B|256:240,1,200,2|12
+356,296,126980,1,0
+240,328,127313,2,0,B|128:360|56:264,1,200,2|8
+24,156,128313,2,0,B|76:148|80:176|128:164,1,100,2|0
+240,192,128980,2,0,B|232:248,2,50,2|2|12
+208,76,129647,2,0,B|268:72|312:112,1,100,2|0
+388,188,130313,1,0
+388,188,130647,1,8
+336,296,130980,1,0
+336,296,131313,1,2
+128,176,131980,5,12
+128,176,132313,1,2
+128,176,132647,2,0,B|171:149|240:168,1,100,2|0
+264,176,133147,1,0
+272,216,133313,2,0,B|239:264|176:256,1,100,8|0
+68,232,133980,1,2
+68,232,134313,1,0
+88,112,134647,6,0,B|115:65|176:48,1,100,12|2
+204,40,135147,1,0
+244,40,135313,2,0,B|316:48|356:120,1,100,2|0
+400,184,135980,2,0,B|408:248|336:292,1,100,8|0
+252,316,136647,1,2
+252,316,136980,1,0
+240,196,137313,6,0,B|288:180|312:116,1,100,12|2
+300,88,137813,1,0
+276,56,137980,2,0,B|180:16,1,100,2|0
+144,152,138647,2,0,B|24:200,1,100,8|0
+176,252,139313,2,0,B|96:348,1,100,2|0
+252,336,139980,2,0,B|332:240,1,100,12|0
+436,252,140647,2,0,B|382:158|258:151,1,200,2|8
+152,152,141647,2,0,B|104:152,2,50,2|2|0
+388,116,142647,6,0,B|496:32,2,100,12|0|2
+272,152,143647,2,0,B|252:248,1,100,2|8
+251,249,144313,1,2
+130,250,144647,2,0,B|98:298,2,50,2|2|0
+200,152,145313,1,12
+200,152,145647,1,2
+304,92,145980,6,0,B|360:68,1,50,0|2
+400,180,146480,2,0,B|384:236,1,50,0|8
+272,192,146980,1,0
+152,192,147313,2,0,B|96:192,4,50,2|0|2|0|12
+240,272,148313,5,0
+360,296,148647,2,0,B|448:240|456:176,1,150,2|0
+396,168,149313,2,0,B|428:120|428:8,1,150,8|0
+427,23,149980,1,2
+316,68,150313,2,0,B|364:36,2,50,2|2|12
+436,76,150980,2,0,B|324:148,1,100
+296,152,151480,6,0,B|224:172,1,50,2|2
+292,208,151813,2,0,B|288:256,1,50,0|8
+248,212,152147,2,0,B|176:236,1,50,2|2
+244,268,152480,2,0,B|236:336,1,50,0|0
+256,76,153313,5,12
+256,76,153647,1,0
+256,76,153980,2,0,B|48:196,1,200,2|8
+256,76,154980,1,0
+140,44,155313,2,0,B|252:228,1,200,2|12
+140,44,156313,1,0
+84,152,156647,6,0,B|148:264,1,100,2|2
+164,264,157147,1,0
+204,272,157313,1,8
+324,268,157647,2,0,B|428:236,1,100,2|2
+336,152,158313,2,0,B|248:64,1,100,0|12
+164,148,158980,5,0
+164,148,159313,1,2
+48,120,159646,2,0,B|24:48,2,50,2|0|8
+112,224,160313,1,0
+224,272,160647,1,2
+344,248,160980,1,0
+416,152,161313,1,12
+256,336,161980,5,6
+360,272,162313,2,0,B|464:272,2,100,0|8|0
+256,216,163313,1,6
+152,152,163646,2,0,B|48:152,2,100,0|8|0
+256,96,164647,1,6
+360,40,164980,2,0,B|464:40,2,100,0|8|0
+256,96,165980,1,6
+16,80,166646,6,0,B|24:136|56:200,1,100,12|0
+116,80,167313,2,0,B|158:111|220:112,1,100,2|2
+248,112,167814,1,0
+288,112,167980,2,0,B|341:115|384:152,1,100,12|8
+412,172,168480,1,0
+428,208,168647,2,0,B|380:248|300:208,1,100,2|2
+296,208,169147,1,0
+260,192,169313,6,0,B|212:168|140:184,1,100,12|2
+124,188,169814,1,0
+88,204,169980,2,0,B|96:260|200:284,1,100,2|2
+192,284,170480,1,0
+232,288,170647,2,0,B|288:296|336:256,1,100,8|8
+424,196,171314,1,2
+424,196,171647,1,2
+424,196,171980,6,0,B|416:136|360:108,1,100,12|0
+336,100,172480,1,2
+296,88,172646,2,0,B|248:72|192:104,2,100,2|0|8
+256,204,173647,1,8
+164,124,173980,2,0,B|108:112|68:164,2,100,0|0|12
+132,240,174980,2,0,B|92:280|108:344,1,100,2|0
+212,280,175646,2,0,B|272:264|276:184,2,100,2|8|2
+212,280,176647,1,2
+8,136,177313,6,0,B|29:82|104:64,1,100,12|0
+200,64,177980,2,0,B|352:104,1,150,2|0
+344,144,178647,2,0,B|184:168,1,150,8|0
+196,208,179313,2,0,B|348:232,1,150,2|0
+344,272,179980,2,0,B|184:288,1,150,12|0
+136,276,180647,2,0,B|58:233|64:140,2,150,2|2|2
+188,168,181980,1,2
+188,168,182647,5,12
+76,124,182980,2,0,B|20:100,2,50,2|2|0
+188,168,183647,1,8
+300,212,183980,2,0,B|356:228|428:204,2,100,8|0|2
+256,324,184980,2,0,B|200:316|168:260,2,100,0|12|0
+256,324,185980,1,2
+256,84,186647,5,8
+316,188,186980,1,0
+196,188,187313,1,2
+408,300,187980,5,12
+432,184,188313,1,0
+320,228,188647,1,2
+224,300,188980,2,0,B|176:332,2,50,0|0|8
+120,240,189647,2,0,B|64:248,2,50,0|0|2
+96,120,190313,2,0,B|48:96,2,50,0|0|12
+188,40,190980,2,0,B|236:60|272:132,1,100
+320,212,191646,2,0,B|376:236,2,50,0|0|8
+316,92,192313,1,0
+316,92,192646,1,2
+320,212,192980,1,2
+320,212,193313,1,12
+404,124,193647,6,0,B|444:76,2,50,0|0|2
+404,244,194313,2,0,B|404:356,1,100,0|8
+344,216,194980,2,0,B|288:312,1,100,0|2
+300,164,195647,2,0,B|188:212,1,100,0|12
+300,96,196313,2,0,B|180:80,2,100,0|2|0
+420,116,197313,1,8
+420,116,197647,1,0
+300,96,197980,2,0,B|196:80,1,100
+80,72,198647,1,12
+80,72,198980,1,0
+200,68,199313,6,0,B|256:88|272:140,1,100,2|0
+284,172,199813,1,0
+284,212,199980,1,8
+164,224,200313,1,8
+284,212,200647,6,0,B|288:276|228:316,1,100,2|0
+212,324,201147,1,0
+176,344,201314,1,12
+164,224,201647,1,8
+176,344,201980,6,0,B|124:352|72:296,1,100,2|0
+60,280,202480,1,0
+44,244,202647,1,8
+164,224,202980,1,8
+44,244,203313,6,0,B|24:196|44:140,2,100,2|0|12
+152,192,204313,2,0,B|80:192,2,50,2|2|0
+272,192,204980,1,2
+272,192,205313,2,0,B|272:104|153:100|152:200,1,200,8|0
+152,312,206313,6,0,B|152:360,2,50,2|2|12
+152,192,206980,1,0
+152,192,207313,1,14
+152,72,207646,2,0,B|152:16,2,50,0|0|2
+248,144,208313,2,0,B|272:192|240:272,1,100,0|12
+256,192,208980,12,12,209980
+256,192,210313,12,12,211313
+440,208,211980,6,0,B|320:184,1,100,12|0
+324,68,212647,2,0,B|148:164,1,200,2|8
+80,264,213647,1,8
+192,312,213980,1,2
+312,296,214313,1,2
+424,256,214647,1,12
+472,144,214980,6,0,B|480:88,2,50,2|2|0
+352,120,215647,2,0,B|336:56,2,50,2|2|8
+296,224,216313,1,0
+176,208,216647,1,0
+152,88,216980,1,8
+272,104,217313,1,12
+360,184,217647,6,0,B|392:264,2,50,2|2|0
+248,144,218313,2,0,B|200:176|184:248,1,100,0|8
+208,344,218980,1,8
+192,224,219313,1,2
+192,224,219647,2,0,B|200:176|248:144,1,100,0|12
+344,72,220313,2,0,B|400:32,2,50,2|0|2
+320,192,220980,2,0,B|296:248|224:288,1,100,0|8
+140,296,221647,2,0,B|68:304,2,50,2|0|2
+252,248,222313,5,0
+316,144,222647,1,12
+372,248,222980,1,0
+252,248,223313,1,2
+252,248,223646,5,8
+316,144,223980,1,2
+212,80,224313,1,0
+212,80,224647,5,2
+212,176,224980,1,8
+212,176,225313,1,12
+212,176,225647,1,0
+212,296,225980,6,0,B|266:312|316:296,1,100,2|0
+348,284,226480,1,2
+380,260,226647,1,8
+280,192,226980,1,8
+372,116,227313,2,0,B|319:99|268:116,1,100,2|0
+236,128,227813,1,2
+208,156,227980,1,12
+256,268,228313,1,0
+256,268,228647,1,2
+136,284,228980,5,2
+136,284,229147,1,0
+136,284,229313,2,0,B|115:183|160:60,1,200,8|0
+256,20,230313,1,0
+352,92,230647,2,0,B|385:194|336:332,1,200,12|0
+236,336,231647,2,0,B|156:344,2,50,0|0|8
+236,336,232313,1,2
+236,336,232647,1,2
+256,96,233313,6,0,B|200:104|168:160,1,100,12|0
+192,268,233980,2,0,B|304:260|352:148,2,200,2|8|2
+164,152,235647,1,0
+256,76,235980,1,12
+256,196,236313,2,0,B|256:260,2,50,2|2|0
+256,76,236980,2,0,B|256:20,2,50,2|2|8
+256,76,237647,1,8
+256,76,237980,1,2
+344,156,238313,2,0,B|432:236,1,100,0|12
+328,304,238980,5,2
+328,304,239147,1,0
+328,304,239313,2,0,B|192:304,1,100,2|0
+288,200,239980,2,0,B|160:160,1,100,8|8
+72,152,240647,1,2
+72,272,240980,1,0
+72,152,241313,1,12
+72,272,241647,1,0
+152,184,241980,2,0,B|240:80,3,100,2|0|8|0
+216,107,243313,1,2
+444,176,243980,5,12
+368,268,244313,1,0
+248,280,244647,1,2
+128,256,244980,1,2
+128,256,245147,1,0
+128,256,245313,2,0,B|80:216|72:144,1,100,8|8
+72,52,245980,5,2
+192,72,246313,1,2
+192,72,246480,1,0
+192,72,246647,2,0,B|248:160|368:192,1,200,12|8
+402,78,247646,5,2
+402,78,247813,1,0
+402,78,247980,2,0,B|453:111|474:166,1,100,8|8
+352,187,248647,1,2
+467,153,248980,2,0,B|459:217|419:249,1,100,0|12
+312,280,249647,5,2
+256,300,249813,1,0
+200,280,249980,1,2
+280,192,250313,1,0
+280,192,250647,1,8
+320,80,250980,1,0
+280,192,251313,1,2
+196,108,251647,1,0
+280,192,251980,1,12
+256,56,252647,5,2
+256,328,253313,1,2
+120,192,253980,1,2
+392,192,254646,1,2
+256,192,255313,1,2
+256,192,255647,1,2
+256,192,255813,1,0
+256,192,255980,1,12
+256,192,256146,12,4,260646
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1284935-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1284935-expected-conversion.json
new file mode 100644
index 0000000000..8976f6b066
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1284935-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":707.0,"Objects":[{"StartTime":707.0,"Position":65.0,"HyperDash":false},{"StartTime":759.0,"Position":482.0,"HyperDash":false},{"StartTime":811.0,"Position":164.0,"HyperDash":false},{"StartTime":863.0,"Position":315.0,"HyperDash":false},{"StartTime":915.0,"Position":145.0,"HyperDash":false},{"StartTime":967.0,"Position":159.0,"HyperDash":false},{"StartTime":1019.0,"Position":310.0,"HyperDash":false},{"StartTime":1071.0,"Position":441.0,"HyperDash":false},{"StartTime":1123.0,"Position":428.0,"HyperDash":false},{"StartTime":1175.0,"Position":243.0,"HyperDash":false},{"StartTime":1227.0,"Position":422.0,"HyperDash":false},{"StartTime":1280.0,"Position":481.0,"HyperDash":false},{"StartTime":1332.0,"Position":104.0,"HyperDash":false},{"StartTime":1384.0,"Position":473.0,"HyperDash":false},{"StartTime":1436.0,"Position":135.0,"HyperDash":false},{"StartTime":1488.0,"Position":360.0,"HyperDash":false},{"StartTime":1540.0,"Position":123.0,"HyperDash":false},{"StartTime":1592.0,"Position":42.0,"HyperDash":false},{"StartTime":1644.0,"Position":393.0,"HyperDash":false},{"StartTime":1696.0,"Position":75.0,"HyperDash":false},{"StartTime":1748.0,"Position":377.0,"HyperDash":false},{"StartTime":1800.0,"Position":354.0,"HyperDash":false},{"StartTime":1853.0,"Position":287.0,"HyperDash":false},{"StartTime":1905.0,"Position":361.0,"HyperDash":false},{"StartTime":1957.0,"Position":479.0,"HyperDash":false},{"StartTime":2009.0,"Position":346.0,"HyperDash":false},{"StartTime":2061.0,"Position":266.0,"HyperDash":false},{"StartTime":2113.0,"Position":400.0,"HyperDash":false},{"StartTime":2165.0,"Position":202.0,"HyperDash":false},{"StartTime":2217.0,"Position":500.0,"HyperDash":false},{"StartTime":2269.0,"Position":80.0,"HyperDash":false},{"StartTime":2321.0,"Position":399.0,"HyperDash":false},{"StartTime":2374.0,"Position":455.0,"HyperDash":false}]},{"StartTime":2707.0,"Objects":[{"StartTime":2707.0,"Position":368.0,"HyperDash":false},{"StartTime":2781.0,"Position":333.777771,"HyperDash":false},{"StartTime":2855.0,"Position":339.555542,"HyperDash":false},{"StartTime":2929.0,"Position":289.3333,"HyperDash":false},{"StartTime":3040.0,"Position":268.0,"HyperDash":false}]},{"StartTime":3207.0,"Objects":[{"StartTime":3207.0,"Position":288.0,"HyperDash":false},{"StartTime":3272.0,"Position":291.748444,"HyperDash":false},{"StartTime":3373.0,"Position":300.12677,"HyperDash":false}]},{"StartTime":3707.0,"Objects":[{"StartTime":3707.0,"Position":192.0,"HyperDash":false},{"StartTime":3790.0,"Position":154.075073,"HyperDash":false},{"StartTime":3873.0,"Position":136.150146,"HyperDash":false},{"StartTime":3956.0,"Position":109.225227,"HyperDash":false},{"StartTime":4040.0,"Position":92.0,"HyperDash":false},{"StartTime":4114.0,"Position":105.222221,"HyperDash":false},{"StartTime":4188.0,"Position":131.444443,"HyperDash":false},{"StartTime":4262.0,"Position":153.666656,"HyperDash":false},{"StartTime":4373.0,"Position":192.0,"HyperDash":false}]},{"StartTime":4707.0,"Objects":[{"StartTime":4707.0,"Position":288.0,"HyperDash":false}]},{"StartTime":5041.0,"Objects":[{"StartTime":5041.0,"Position":144.0,"HyperDash":false}]},{"StartTime":5374.0,"Objects":[{"StartTime":5374.0,"Position":304.0,"HyperDash":false},{"StartTime":5457.0,"Position":335.611359,"HyperDash":false},{"StartTime":5540.0,"Position":342.222717,"HyperDash":false},{"StartTime":5623.0,"Position":344.834076,"HyperDash":false},{"StartTime":5707.0,"Position":374.657623,"HyperDash":false},{"StartTime":5790.0,"Position":377.268982,"HyperDash":false},{"StartTime":5873.0,"Position":405.880341,"HyperDash":false},{"StartTime":5956.0,"Position":430.4917,"HyperDash":false},{"StartTime":6040.0,"Position":445.421326,"HyperDash":false},{"StartTime":6123.0,"Position":408.916077,"HyperDash":false},{"StartTime":6206.0,"Position":410.3047,"HyperDash":false},{"StartTime":6289.0,"Position":405.693359,"HyperDash":false},{"StartTime":6373.0,"Position":374.8698,"HyperDash":false},{"StartTime":6447.0,"Position":375.168121,"HyperDash":false},{"StartTime":6522.0,"Position":334.254242,"HyperDash":false},{"StartTime":6596.0,"Position":316.552521,"HyperDash":false},{"StartTime":6707.0,"Position":304.0,"HyperDash":false}]},{"StartTime":7041.0,"Objects":[{"StartTime":7041.0,"Position":208.0,"HyperDash":false}]},{"StartTime":7374.0,"Objects":[{"StartTime":7374.0,"Position":304.0,"HyperDash":false},{"StartTime":7448.0,"Position":293.1427,"HyperDash":false},{"StartTime":7522.0,"Position":328.2854,"HyperDash":false},{"StartTime":7596.0,"Position":323.4281,"HyperDash":false},{"StartTime":7707.0,"Position":318.142151,"HyperDash":false}]},{"StartTime":8041.0,"Objects":[{"StartTime":8041.0,"Position":160.0,"HyperDash":false},{"StartTime":8115.0,"Position":156.777771,"HyperDash":false},{"StartTime":8189.0,"Position":98.55556,"HyperDash":false},{"StartTime":8263.0,"Position":87.33333,"HyperDash":false},{"StartTime":8374.0,"Position":60.0,"HyperDash":false}]},{"StartTime":8541.0,"Objects":[{"StartTime":8541.0,"Position":176.0,"HyperDash":false}]},{"StartTime":8707.0,"Objects":[{"StartTime":8707.0,"Position":160.0,"HyperDash":false},{"StartTime":8790.0,"Position":189.827057,"HyperDash":false},{"StartTime":8873.0,"Position":214.480759,"HyperDash":false},{"StartTime":8956.0,"Position":199.348236,"HyperDash":false},{"StartTime":9040.0,"Position":211.43425,"HyperDash":false},{"StartTime":9114.0,"Position":182.741974,"HyperDash":false},{"StartTime":9188.0,"Position":188.031326,"HyperDash":false},{"StartTime":9262.0,"Position":150.1092,"HyperDash":false},{"StartTime":9373.0,"Position":131.819717,"HyperDash":false}]},{"StartTime":9707.0,"Objects":[{"StartTime":9707.0,"Position":320.0,"HyperDash":false}]},{"StartTime":10041.0,"Objects":[{"StartTime":10041.0,"Position":352.0,"HyperDash":false},{"StartTime":10115.0,"Position":335.777771,"HyperDash":false},{"StartTime":10189.0,"Position":320.555542,"HyperDash":false},{"StartTime":10263.0,"Position":275.3333,"HyperDash":false},{"StartTime":10374.0,"Position":252.0,"HyperDash":false}]},{"StartTime":10707.0,"Objects":[{"StartTime":10707.0,"Position":416.0,"HyperDash":false},{"StartTime":10790.0,"Position":433.640656,"HyperDash":false},{"StartTime":10873.0,"Position":472.2328,"HyperDash":false},{"StartTime":10956.0,"Position":486.15274,"HyperDash":false},{"StartTime":11040.0,"Position":482.899384,"HyperDash":false},{"StartTime":11114.0,"Position":477.456268,"HyperDash":false},{"StartTime":11188.0,"Position":474.261353,"HyperDash":false},{"StartTime":11262.0,"Position":444.9807,"HyperDash":false},{"StartTime":11373.0,"Position":418.860382,"HyperDash":false}]},{"StartTime":11874.0,"Objects":[{"StartTime":11874.0,"Position":224.0,"HyperDash":false}]},{"StartTime":12041.0,"Objects":[{"StartTime":12041.0,"Position":160.0,"HyperDash":false},{"StartTime":12124.0,"Position":129.476608,"HyperDash":false},{"StartTime":12207.0,"Position":139.62587,"HyperDash":false},{"StartTime":12290.0,"Position":110.133484,"HyperDash":false},{"StartTime":12374.0,"Position":120.566429,"HyperDash":false},{"StartTime":12439.0,"Position":147.187912,"HyperDash":false},{"StartTime":12540.0,"Position":159.8762,"HyperDash":false}]},{"StartTime":12707.0,"Objects":[{"StartTime":12707.0,"Position":288.0,"HyperDash":false}]},{"StartTime":13374.0,"Objects":[{"StartTime":13374.0,"Position":464.0,"HyperDash":false},{"StartTime":13457.0,"Position":423.1,"HyperDash":false},{"StartTime":13540.0,"Position":431.2,"HyperDash":false},{"StartTime":13623.0,"Position":392.3,"HyperDash":false},{"StartTime":13707.0,"Position":364.1,"HyperDash":false},{"StartTime":13772.0,"Position":352.6,"HyperDash":false},{"StartTime":13874.0,"Position":314.0,"HyperDash":false}]},{"StartTime":14041.0,"Objects":[{"StartTime":14041.0,"Position":240.0,"HyperDash":false},{"StartTime":14124.0,"Position":215.182037,"HyperDash":false},{"StartTime":14207.0,"Position":213.6612,"HyperDash":false},{"StartTime":14290.0,"Position":180.052521,"HyperDash":false},{"StartTime":14374.0,"Position":198.218033,"HyperDash":false},{"StartTime":14439.0,"Position":203.99968,"HyperDash":false},{"StartTime":14541.0,"Position":239.397186,"HyperDash":false}]},{"StartTime":14707.0,"Objects":[{"StartTime":14707.0,"Position":320.0,"HyperDash":false},{"StartTime":14781.0,"Position":279.777771,"HyperDash":false},{"StartTime":14855.0,"Position":271.555542,"HyperDash":false},{"StartTime":14929.0,"Position":258.3333,"HyperDash":false},{"StartTime":15040.0,"Position":220.0,"HyperDash":false}]},{"StartTime":15374.0,"Objects":[{"StartTime":15374.0,"Position":320.0,"HyperDash":false},{"StartTime":15448.0,"Position":329.8606,"HyperDash":false},{"StartTime":15522.0,"Position":335.721161,"HyperDash":false},{"StartTime":15596.0,"Position":362.581757,"HyperDash":false},{"StartTime":15707.0,"Position":359.87262,"HyperDash":false}]},{"StartTime":16041.0,"Objects":[{"StartTime":16041.0,"Position":192.0,"HyperDash":false},{"StartTime":16115.0,"Position":166.777771,"HyperDash":false},{"StartTime":16189.0,"Position":161.555557,"HyperDash":false},{"StartTime":16263.0,"Position":112.333328,"HyperDash":false},{"StartTime":16374.0,"Position":92.0,"HyperDash":false}]},{"StartTime":16541.0,"Objects":[{"StartTime":16541.0,"Position":208.0,"HyperDash":false}]},{"StartTime":16707.0,"Objects":[{"StartTime":16707.0,"Position":176.0,"HyperDash":false}]},{"StartTime":17041.0,"Objects":[{"StartTime":17041.0,"Position":336.0,"HyperDash":false}]},{"StartTime":17207.0,"Objects":[{"StartTime":17207.0,"Position":288.0,"HyperDash":false},{"StartTime":17290.0,"Position":262.868042,"HyperDash":false},{"StartTime":17373.0,"Position":233.396667,"HyperDash":false},{"StartTime":17456.0,"Position":240.435333,"HyperDash":false},{"StartTime":17540.0,"Position":242.216,"HyperDash":false},{"StartTime":17605.0,"Position":250.097885,"HyperDash":false},{"StartTime":17707.0,"Position":281.828644,"HyperDash":false}]},{"StartTime":18041.0,"Objects":[{"StartTime":18041.0,"Position":480.0,"HyperDash":false}]},{"StartTime":18374.0,"Objects":[{"StartTime":18374.0,"Position":256.0,"HyperDash":false}]},{"StartTime":18707.0,"Objects":[{"StartTime":18707.0,"Position":416.0,"HyperDash":false},{"StartTime":18790.0,"Position":398.254333,"HyperDash":false},{"StartTime":18873.0,"Position":424.508667,"HyperDash":false},{"StartTime":18956.0,"Position":427.763,"HyperDash":false},{"StartTime":19040.0,"Position":425.044525,"HyperDash":false},{"StartTime":19105.0,"Position":408.809967,"HyperDash":false},{"StartTime":19207.0,"Position":429.580353,"HyperDash":false}]},{"StartTime":19374.0,"Objects":[{"StartTime":19374.0,"Position":336.0,"HyperDash":false},{"StartTime":19448.0,"Position":294.777771,"HyperDash":false},{"StartTime":19522.0,"Position":280.555542,"HyperDash":false},{"StartTime":19596.0,"Position":278.3333,"HyperDash":false},{"StartTime":19707.0,"Position":236.0,"HyperDash":false}]},{"StartTime":20041.0,"Objects":[{"StartTime":20041.0,"Position":256.0,"HyperDash":false},{"StartTime":20124.0,"Position":272.817963,"HyperDash":false},{"StartTime":20207.0,"Position":313.3388,"HyperDash":false},{"StartTime":20290.0,"Position":317.947479,"HyperDash":false},{"StartTime":20374.0,"Position":297.781982,"HyperDash":false},{"StartTime":20439.0,"Position":266.000336,"HyperDash":false},{"StartTime":20541.0,"Position":256.6028,"HyperDash":false}]},{"StartTime":20707.0,"Objects":[{"StartTime":20707.0,"Position":196.0,"HyperDash":false},{"StartTime":20781.0,"Position":169.13942,"HyperDash":false},{"StartTime":20855.0,"Position":192.278839,"HyperDash":false},{"StartTime":20929.0,"Position":170.418243,"HyperDash":false},{"StartTime":21040.0,"Position":156.12738,"HyperDash":false}]},{"StartTime":21374.0,"Objects":[{"StartTime":21374.0,"Position":320.0,"HyperDash":false},{"StartTime":21457.0,"Position":344.0784,"HyperDash":false},{"StartTime":21540.0,"Position":350.913055,"HyperDash":false},{"StartTime":21623.0,"Position":346.822418,"HyperDash":false},{"StartTime":21707.0,"Position":357.019379,"HyperDash":false},{"StartTime":21772.0,"Position":358.883179,"HyperDash":false},{"StartTime":21873.0,"Position":327.8019,"HyperDash":false}]},{"StartTime":22041.0,"Objects":[{"StartTime":22041.0,"Position":224.0,"HyperDash":false},{"StartTime":22115.0,"Position":183.777771,"HyperDash":false},{"StartTime":22189.0,"Position":175.555557,"HyperDash":false},{"StartTime":22263.0,"Position":140.333328,"HyperDash":false},{"StartTime":22374.0,"Position":124.0,"HyperDash":false}]},{"StartTime":22541.0,"Objects":[{"StartTime":22541.0,"Position":272.0,"HyperDash":false}]},{"StartTime":22707.0,"Objects":[{"StartTime":22707.0,"Position":204.0,"HyperDash":false}]},{"StartTime":23041.0,"Objects":[{"StartTime":23041.0,"Position":96.0,"HyperDash":false}]},{"StartTime":23374.0,"Objects":[{"StartTime":23374.0,"Position":208.0,"HyperDash":false},{"StartTime":23448.0,"Position":222.1427,"HyperDash":false},{"StartTime":23522.0,"Position":195.2854,"HyperDash":false},{"StartTime":23596.0,"Position":234.428085,"HyperDash":false},{"StartTime":23707.0,"Position":222.142136,"HyperDash":false}]},{"StartTime":24041.0,"Objects":[{"StartTime":24041.0,"Position":80.0,"HyperDash":false},{"StartTime":24124.0,"Position":113.9,"HyperDash":false},{"StartTime":24207.0,"Position":129.8,"HyperDash":false},{"StartTime":24290.0,"Position":153.7,"HyperDash":false},{"StartTime":24374.0,"Position":179.9,"HyperDash":false},{"StartTime":24439.0,"Position":201.4,"HyperDash":false},{"StartTime":24541.0,"Position":230.0,"HyperDash":false}]},{"StartTime":24707.0,"Objects":[{"StartTime":24707.0,"Position":112.0,"HyperDash":false}]},{"StartTime":25041.0,"Objects":[{"StartTime":25041.0,"Position":256.0,"HyperDash":false},{"StartTime":25106.0,"Position":250.808792,"HyperDash":false},{"StartTime":25207.0,"Position":240.188614,"HyperDash":false}]},{"StartTime":25541.0,"Objects":[{"StartTime":25541.0,"Position":352.0,"HyperDash":false},{"StartTime":25606.0,"Position":340.5016,"HyperDash":false},{"StartTime":25707.0,"Position":355.834839,"HyperDash":false}]},{"StartTime":26041.0,"Objects":[{"StartTime":26041.0,"Position":192.0,"HyperDash":false},{"StartTime":26115.0,"Position":191.8573,"HyperDash":false},{"StartTime":26189.0,"Position":173.7146,"HyperDash":false},{"StartTime":26263.0,"Position":175.571915,"HyperDash":false},{"StartTime":26374.0,"Position":177.857864,"HyperDash":false}]},{"StartTime":26707.0,"Objects":[{"StartTime":26707.0,"Position":272.0,"HyperDash":false},{"StartTime":26781.0,"Position":275.222229,"HyperDash":false},{"StartTime":26855.0,"Position":318.444458,"HyperDash":false},{"StartTime":26929.0,"Position":333.6667,"HyperDash":false},{"StartTime":27040.0,"Position":372.0,"HyperDash":false}]},{"StartTime":27207.0,"Objects":[{"StartTime":27207.0,"Position":256.0,"HyperDash":false}]},{"StartTime":27374.0,"Objects":[{"StartTime":27374.0,"Position":288.0,"HyperDash":false}]},{"StartTime":27707.0,"Objects":[{"StartTime":27707.0,"Position":416.0,"HyperDash":false},{"StartTime":27772.0,"Position":401.748444,"HyperDash":false},{"StartTime":27873.0,"Position":428.12677,"HyperDash":false}]},{"StartTime":28207.0,"Objects":[{"StartTime":28207.0,"Position":288.0,"HyperDash":false},{"StartTime":28281.0,"Position":250.777771,"HyperDash":false},{"StartTime":28355.0,"Position":249.555557,"HyperDash":false},{"StartTime":28429.0,"Position":219.333328,"HyperDash":false},{"StartTime":28540.0,"Position":188.0,"HyperDash":false}]},{"StartTime":28707.0,"Objects":[{"StartTime":28707.0,"Position":256.0,"HyperDash":false},{"StartTime":28781.0,"Position":253.111572,"HyperDash":false},{"StartTime":28855.0,"Position":249.223145,"HyperDash":false},{"StartTime":28929.0,"Position":256.334747,"HyperDash":false},{"StartTime":29040.0,"Position":270.0021,"HyperDash":false}]},{"StartTime":29374.0,"Objects":[{"StartTime":29374.0,"Position":128.0,"HyperDash":false},{"StartTime":29457.0,"Position":97.70407,"HyperDash":false},{"StartTime":29540.0,"Position":72.07541,"HyperDash":false},{"StartTime":29623.0,"Position":69.19281,"HyperDash":false},{"StartTime":29707.0,"Position":64.12629,"HyperDash":false},{"StartTime":29781.0,"Position":68.7450943,"HyperDash":false},{"StartTime":29855.0,"Position":93.5549545,"HyperDash":false},{"StartTime":29929.0,"Position":84.38264,"HyperDash":false},{"StartTime":30040.0,"Position":127.072174,"HyperDash":false}]},{"StartTime":30374.0,"Objects":[{"StartTime":30374.0,"Position":320.0,"HyperDash":false}]},{"StartTime":30707.0,"Objects":[{"StartTime":30707.0,"Position":416.0,"HyperDash":false}]},{"StartTime":30874.0,"Objects":[{"StartTime":30874.0,"Position":432.0,"HyperDash":false},{"StartTime":30948.0,"Position":429.1427,"HyperDash":false},{"StartTime":31022.0,"Position":455.2854,"HyperDash":false},{"StartTime":31096.0,"Position":422.4281,"HyperDash":false},{"StartTime":31207.0,"Position":446.142151,"HyperDash":false}]},{"StartTime":31374.0,"Objects":[{"StartTime":31374.0,"Position":320.0,"HyperDash":false}]},{"StartTime":31707.0,"Objects":[{"StartTime":31707.0,"Position":240.0,"HyperDash":false},{"StartTime":31772.0,"Position":250.251556,"HyperDash":false},{"StartTime":31873.0,"Position":227.873215,"HyperDash":false}]},{"StartTime":32041.0,"Objects":[{"StartTime":32041.0,"Position":304.0,"HyperDash":false},{"StartTime":32124.0,"Position":346.659271,"HyperDash":false},{"StartTime":32207.0,"Position":333.21402,"HyperDash":false},{"StartTime":32290.0,"Position":348.822571,"HyperDash":false},{"StartTime":32374.0,"Position":369.8608,"HyperDash":false},{"StartTime":32448.0,"Position":377.38208,"HyperDash":false},{"StartTime":32522.0,"Position":368.24884,"HyperDash":false},{"StartTime":32596.0,"Position":327.2163,"HyperDash":false},{"StartTime":32707.0,"Position":302.6493,"HyperDash":false}]},{"StartTime":33041.0,"Objects":[{"StartTime":33041.0,"Position":32.0,"HyperDash":false}]},{"StartTime":33374.0,"Objects":[{"StartTime":33374.0,"Position":304.0,"HyperDash":false}]},{"StartTime":33541.0,"Objects":[{"StartTime":33541.0,"Position":368.0,"HyperDash":false},{"StartTime":33615.0,"Position":362.176758,"HyperDash":false},{"StartTime":33689.0,"Position":375.77478,"HyperDash":false},{"StartTime":33763.0,"Position":391.632355,"HyperDash":false},{"StartTime":33874.0,"Position":367.9668,"HyperDash":false}]},{"StartTime":34207.0,"Objects":[{"StartTime":34207.0,"Position":80.0,"HyperDash":false}]},{"StartTime":34374.0,"Objects":[{"StartTime":34374.0,"Position":176.0,"HyperDash":false}]},{"StartTime":34541.0,"Objects":[{"StartTime":34541.0,"Position":80.0,"HyperDash":false}]},{"StartTime":34707.0,"Objects":[{"StartTime":34707.0,"Position":200.0,"HyperDash":false}]},{"StartTime":35041.0,"Objects":[{"StartTime":35041.0,"Position":336.0,"HyperDash":false},{"StartTime":35115.0,"Position":338.1427,"HyperDash":false},{"StartTime":35189.0,"Position":342.2854,"HyperDash":false},{"StartTime":35263.0,"Position":338.4281,"HyperDash":false},{"StartTime":35374.0,"Position":350.142151,"HyperDash":false}]},{"StartTime":35707.0,"Objects":[{"StartTime":35707.0,"Position":208.0,"HyperDash":false},{"StartTime":35772.0,"Position":217.808792,"HyperDash":false},{"StartTime":35873.0,"Position":192.188614,"HyperDash":false}]},{"StartTime":36207.0,"Objects":[{"StartTime":36207.0,"Position":336.0,"HyperDash":false},{"StartTime":36272.0,"Position":351.191223,"HyperDash":false},{"StartTime":36373.0,"Position":351.8114,"HyperDash":false}]},{"StartTime":36707.0,"Objects":[{"StartTime":36707.0,"Position":208.0,"HyperDash":false},{"StartTime":36781.0,"Position":178.777771,"HyperDash":false},{"StartTime":36855.0,"Position":179.555557,"HyperDash":false},{"StartTime":36929.0,"Position":125.333328,"HyperDash":false},{"StartTime":37040.0,"Position":108.0,"HyperDash":false}]},{"StartTime":37374.0,"Objects":[{"StartTime":37374.0,"Position":416.0,"HyperDash":false}]},{"StartTime":37541.0,"Objects":[{"StartTime":37541.0,"Position":320.0,"HyperDash":false},{"StartTime":37615.0,"Position":322.379059,"HyperDash":false},{"StartTime":37689.0,"Position":309.7581,"HyperDash":false},{"StartTime":37763.0,"Position":318.137146,"HyperDash":false},{"StartTime":37874.0,"Position":335.205719,"HyperDash":false}]},{"StartTime":38041.0,"Objects":[{"StartTime":38041.0,"Position":208.0,"HyperDash":false}]},{"StartTime":38374.0,"Objects":[{"StartTime":38374.0,"Position":416.0,"HyperDash":false},{"StartTime":38439.0,"Position":410.191223,"HyperDash":false},{"StartTime":38540.0,"Position":431.8114,"HyperDash":false}]},{"StartTime":38874.0,"Objects":[{"StartTime":38874.0,"Position":288.0,"HyperDash":false},{"StartTime":38939.0,"Position":273.808777,"HyperDash":false},{"StartTime":39040.0,"Position":272.1886,"HyperDash":false}]},{"StartTime":39207.0,"Objects":[{"StartTime":39207.0,"Position":336.0,"HyperDash":false},{"StartTime":39281.0,"Position":360.222229,"HyperDash":false},{"StartTime":39355.0,"Position":369.444458,"HyperDash":false},{"StartTime":39429.0,"Position":419.6667,"HyperDash":false},{"StartTime":39540.0,"Position":436.0,"HyperDash":false}]},{"StartTime":39707.0,"Objects":[{"StartTime":39707.0,"Position":320.0,"HyperDash":false}]},{"StartTime":40041.0,"Objects":[{"StartTime":40041.0,"Position":160.0,"HyperDash":false}]},{"StartTime":40374.0,"Objects":[{"StartTime":40374.0,"Position":384.0,"HyperDash":false},{"StartTime":40448.0,"Position":396.1427,"HyperDash":false},{"StartTime":40522.0,"Position":380.2854,"HyperDash":false},{"StartTime":40596.0,"Position":408.4281,"HyperDash":false},{"StartTime":40707.0,"Position":398.142151,"HyperDash":false}]},{"StartTime":41041.0,"Objects":[{"StartTime":41041.0,"Position":112.0,"HyperDash":false}]},{"StartTime":41374.0,"Objects":[{"StartTime":41374.0,"Position":132.0,"HyperDash":false}]},{"StartTime":41541.0,"Objects":[{"StartTime":41541.0,"Position":48.0,"HyperDash":false},{"StartTime":41615.0,"Position":31.8573036,"HyperDash":false},{"StartTime":41689.0,"Position":31.7146072,"HyperDash":false},{"StartTime":41763.0,"Position":40.571907,"HyperDash":false},{"StartTime":41874.0,"Position":33.8578644,"HyperDash":false}]},{"StartTime":42041.0,"Objects":[{"StartTime":42041.0,"Position":160.0,"HyperDash":false}]},{"StartTime":42374.0,"Objects":[{"StartTime":42374.0,"Position":320.0,"HyperDash":false}]},{"StartTime":42707.0,"Objects":[{"StartTime":42707.0,"Position":96.0,"HyperDash":false},{"StartTime":42790.0,"Position":64.13681,"HyperDash":false},{"StartTime":42873.0,"Position":72.60394,"HyperDash":false},{"StartTime":42956.0,"Position":54.03947,"HyperDash":false},{"StartTime":43040.0,"Position":54.30264,"HyperDash":false},{"StartTime":43105.0,"Position":72.19569,"HyperDash":false},{"StartTime":43206.0,"Position":95.39718,"HyperDash":false}]},{"StartTime":43374.0,"Objects":[{"StartTime":43374.0,"Position":224.0,"HyperDash":false}]},{"StartTime":43707.0,"Objects":[{"StartTime":43707.0,"Position":352.0,"HyperDash":false}]},{"StartTime":44040.0,"Objects":[{"StartTime":44040.0,"Position":160.0,"HyperDash":false}]},{"StartTime":44374.0,"Objects":[{"StartTime":44374.0,"Position":304.0,"HyperDash":false},{"StartTime":44457.0,"Position":309.591553,"HyperDash":false},{"StartTime":44540.0,"Position":325.605743,"HyperDash":false},{"StartTime":44623.0,"Position":365.538,"HyperDash":false},{"StartTime":44707.0,"Position":357.421478,"HyperDash":false},{"StartTime":44781.0,"Position":336.6104,"HyperDash":false},{"StartTime":44855.0,"Position":350.104462,"HyperDash":false},{"StartTime":44929.0,"Position":333.432159,"HyperDash":false},{"StartTime":45040.0,"Position":304.669952,"HyperDash":false}]},{"StartTime":45374.0,"Objects":[{"StartTime":45374.0,"Position":136.0,"HyperDash":false},{"StartTime":45457.0,"Position":127.769325,"HyperDash":false},{"StartTime":45540.0,"Position":88.53865,"HyperDash":false},{"StartTime":45623.0,"Position":83.30798,"HyperDash":false},{"StartTime":45707.0,"Position":70.88176,"HyperDash":false},{"StartTime":45790.0,"Position":61.6510925,"HyperDash":false},{"StartTime":45873.0,"Position":38.3226547,"HyperDash":false},{"StartTime":45956.0,"Position":42.4555435,"HyperDash":false},{"StartTime":46040.0,"Position":70.88177,"HyperDash":false},{"StartTime":46114.0,"Position":83.35248,"HyperDash":false},{"StartTime":46188.0,"Position":98.8232,"HyperDash":false},{"StartTime":46262.0,"Position":107.293922,"HyperDash":false},{"StartTime":46373.0,"Position":136.0,"HyperDash":false}]},{"StartTime":46874.0,"Objects":[{"StartTime":46874.0,"Position":368.0,"HyperDash":false},{"StartTime":46957.0,"Position":368.641052,"HyperDash":false},{"StartTime":47040.0,"Position":388.2821,"HyperDash":false},{"StartTime":47123.0,"Position":392.923126,"HyperDash":false},{"StartTime":47207.0,"Position":378.596,"HyperDash":false},{"StartTime":47272.0,"Position":362.664276,"HyperDash":false},{"StartTime":47374.0,"Position":383.9099,"HyperDash":false}]},{"StartTime":47707.0,"Objects":[{"StartTime":47707.0,"Position":160.0,"HyperDash":false}]},{"StartTime":48041.0,"Objects":[{"StartTime":48041.0,"Position":144.0,"HyperDash":false},{"StartTime":48124.0,"Position":140.536209,"HyperDash":false},{"StartTime":48207.0,"Position":120.072418,"HyperDash":false},{"StartTime":48290.0,"Position":77.60862,"HyperDash":false},{"StartTime":48374.0,"Position":81.95851,"HyperDash":false},{"StartTime":48457.0,"Position":51.4947128,"HyperDash":false},{"StartTime":48541.0,"Position":50.8446045,"HyperDash":false},{"StartTime":48624.0,"Position":47.308403,"HyperDash":false},{"StartTime":48707.0,"Position":81.7722,"HyperDash":false},{"StartTime":48781.0,"Position":97.5592041,"HyperDash":false},{"StartTime":48856.0,"Position":126.5325,"HyperDash":false},{"StartTime":48930.0,"Position":134.3195,"HyperDash":false},{"StartTime":49041.0,"Position":144.0,"HyperDash":false}]},{"StartTime":49374.0,"Objects":[{"StartTime":49374.0,"Position":256.0,"HyperDash":false},{"StartTime":49457.0,"Position":275.705048,"HyperDash":false},{"StartTime":49540.0,"Position":297.414978,"HyperDash":false},{"StartTime":49623.0,"Position":295.170868,"HyperDash":false},{"StartTime":49707.0,"Position":311.122,"HyperDash":false},{"StartTime":49790.0,"Position":299.525726,"HyperDash":false},{"StartTime":49873.0,"Position":296.3256,"HyperDash":false},{"StartTime":49956.0,"Position":290.4679,"HyperDash":false},{"StartTime":50040.0,"Position":301.014038,"HyperDash":false},{"StartTime":50114.0,"Position":289.537323,"HyperDash":false},{"StartTime":50189.0,"Position":285.4608,"HyperDash":false},{"StartTime":50263.0,"Position":241.873749,"HyperDash":false},{"StartTime":50373.0,"Position":235.304214,"HyperDash":false}]},{"StartTime":50707.0,"Objects":[{"StartTime":50707.0,"Position":384.0,"HyperDash":false},{"StartTime":50790.0,"Position":399.712433,"HyperDash":false},{"StartTime":50873.0,"Position":415.424866,"HyperDash":false},{"StartTime":50956.0,"Position":442.137268,"HyperDash":false},{"StartTime":51040.0,"Position":459.075165,"HyperDash":false},{"StartTime":51105.0,"Position":484.729462,"HyperDash":false},{"StartTime":51206.0,"Position":496.5,"HyperDash":false}]},{"StartTime":51374.0,"Objects":[{"StartTime":51374.0,"Position":400.0,"HyperDash":false}]},{"StartTime":51874.0,"Objects":[{"StartTime":51874.0,"Position":244.0,"HyperDash":false},{"StartTime":51957.0,"Position":220.5127,"HyperDash":false},{"StartTime":52040.0,"Position":194.025391,"HyperDash":false},{"StartTime":52123.0,"Position":197.538086,"HyperDash":false},{"StartTime":52207.0,"Position":169.828033,"HyperDash":false},{"StartTime":52272.0,"Position":151.350021,"HyperDash":false},{"StartTime":52374.0,"Position":132.630676,"HyperDash":false}]},{"StartTime":52707.0,"Objects":[{"StartTime":52707.0,"Position":208.0,"HyperDash":false},{"StartTime":52781.0,"Position":217.666672,"HyperDash":false},{"StartTime":52855.0,"Position":252.333344,"HyperDash":false},{"StartTime":52929.0,"Position":248.0,"HyperDash":false},{"StartTime":53040.0,"Position":283.0,"HyperDash":false}]},{"StartTime":53373.0,"Objects":[{"StartTime":53373.0,"Position":368.0,"HyperDash":false},{"StartTime":53447.0,"Position":389.547058,"HyperDash":false},{"StartTime":53521.0,"Position":360.0941,"HyperDash":false},{"StartTime":53595.0,"Position":373.641144,"HyperDash":false},{"StartTime":53706.0,"Position":379.4617,"HyperDash":false}]},{"StartTime":54040.0,"Objects":[{"StartTime":54040.0,"Position":255.0,"HyperDash":false},{"StartTime":54114.0,"Position":252.333328,"HyperDash":false},{"StartTime":54188.0,"Position":226.666656,"HyperDash":false},{"StartTime":54262.0,"Position":195.0,"HyperDash":false},{"StartTime":54373.0,"Position":180.0,"HyperDash":false}]},{"StartTime":54707.0,"Objects":[{"StartTime":54707.0,"Position":368.0,"HyperDash":false}]},{"StartTime":55374.0,"Objects":[{"StartTime":55374.0,"Position":160.0,"HyperDash":false},{"StartTime":55448.0,"Position":163.26001,"HyperDash":false},{"StartTime":55522.0,"Position":156.520035,"HyperDash":false},{"StartTime":55596.0,"Position":132.780045,"HyperDash":false},{"StartTime":55707.0,"Position":147.670074,"HyperDash":false}]},{"StartTime":56041.0,"Objects":[{"StartTime":56041.0,"Position":320.0,"HyperDash":false},{"StartTime":56115.0,"Position":345.222229,"HyperDash":false},{"StartTime":56189.0,"Position":369.444458,"HyperDash":false},{"StartTime":56263.0,"Position":402.6667,"HyperDash":false},{"StartTime":56374.0,"Position":420.0,"HyperDash":false}]},{"StartTime":56707.0,"Objects":[{"StartTime":56707.0,"Position":256.0,"HyperDash":false},{"StartTime":56781.0,"Position":245.8573,"HyperDash":false},{"StartTime":56855.0,"Position":239.7146,"HyperDash":false},{"StartTime":56929.0,"Position":253.571915,"HyperDash":false},{"StartTime":57040.0,"Position":241.857864,"HyperDash":false}]},{"StartTime":57207.0,"Objects":[{"StartTime":57207.0,"Position":328.0,"HyperDash":false},{"StartTime":57290.0,"Position":334.131958,"HyperDash":false},{"StartTime":57373.0,"Position":357.603333,"HyperDash":false},{"StartTime":57456.0,"Position":386.564667,"HyperDash":false},{"StartTime":57540.0,"Position":373.784027,"HyperDash":false},{"StartTime":57605.0,"Position":370.9021,"HyperDash":false},{"StartTime":57707.0,"Position":334.171356,"HyperDash":false}]},{"StartTime":58041.0,"Objects":[{"StartTime":58041.0,"Position":176.0,"HyperDash":false},{"StartTime":58115.0,"Position":153.777771,"HyperDash":false},{"StartTime":58189.0,"Position":113.555557,"HyperDash":false},{"StartTime":58263.0,"Position":124.333328,"HyperDash":false},{"StartTime":58374.0,"Position":76.0,"HyperDash":false}]},{"StartTime":58707.0,"Objects":[{"StartTime":58707.0,"Position":208.0,"HyperDash":false},{"StartTime":58790.0,"Position":235.924927,"HyperDash":false},{"StartTime":58873.0,"Position":258.849854,"HyperDash":false},{"StartTime":58956.0,"Position":280.77478,"HyperDash":false},{"StartTime":59040.0,"Position":308.0,"HyperDash":false},{"StartTime":59114.0,"Position":302.777771,"HyperDash":false},{"StartTime":59188.0,"Position":275.555542,"HyperDash":false},{"StartTime":59262.0,"Position":249.333344,"HyperDash":false},{"StartTime":59373.0,"Position":208.0,"HyperDash":false}]},{"StartTime":59707.0,"Objects":[{"StartTime":59707.0,"Position":64.0,"HyperDash":false}]},{"StartTime":59874.0,"Objects":[{"StartTime":59874.0,"Position":128.0,"HyperDash":false},{"StartTime":59948.0,"Position":144.1427,"HyperDash":false},{"StartTime":60022.0,"Position":119.2854,"HyperDash":false},{"StartTime":60096.0,"Position":142.428085,"HyperDash":false},{"StartTime":60207.0,"Position":142.142136,"HyperDash":false}]},{"StartTime":60374.0,"Objects":[{"StartTime":60374.0,"Position":80.0,"HyperDash":false},{"StartTime":60457.0,"Position":73.37541,"HyperDash":false},{"StartTime":60540.0,"Position":27.7508316,"HyperDash":false},{"StartTime":60623.0,"Position":45.1262474,"HyperDash":false},{"StartTime":60707.0,"Position":9.28933,"HyperDash":false},{"StartTime":60781.0,"Position":31.0028038,"HyperDash":false},{"StartTime":60855.0,"Position":29.71629,"HyperDash":false},{"StartTime":60929.0,"Position":68.42977,"HyperDash":false},{"StartTime":61040.0,"Position":80.0,"HyperDash":false}]},{"StartTime":61374.0,"Objects":[{"StartTime":61374.0,"Position":224.0,"HyperDash":false},{"StartTime":61457.0,"Position":240.728989,"HyperDash":false},{"StartTime":61540.0,"Position":281.499359,"HyperDash":false},{"StartTime":61623.0,"Position":285.145782,"HyperDash":false},{"StartTime":61707.0,"Position":295.647522,"HyperDash":false},{"StartTime":61781.0,"Position":273.401184,"HyperDash":false},{"StartTime":61855.0,"Position":266.0076,"HyperDash":false},{"StartTime":61929.0,"Position":282.02597,"HyperDash":false},{"StartTime":62040.0,"Position":233.9523,"HyperDash":false}]},{"StartTime":62374.0,"Objects":[{"StartTime":62374.0,"Position":96.0,"HyperDash":false}]},{"StartTime":62541.0,"Objects":[{"StartTime":62541.0,"Position":32.0,"HyperDash":false},{"StartTime":62615.0,"Position":2.15351486,"HyperDash":false},{"StartTime":62689.0,"Position":34.9851379,"HyperDash":false},{"StartTime":62763.0,"Position":0.0,"HyperDash":false},{"StartTime":62874.0,"Position":30.1482067,"HyperDash":false}]},{"StartTime":63041.0,"Objects":[{"StartTime":63041.0,"Position":92.0,"HyperDash":false},{"StartTime":63115.0,"Position":114.222221,"HyperDash":false},{"StartTime":63189.0,"Position":131.444443,"HyperDash":false},{"StartTime":63263.0,"Position":144.666672,"HyperDash":false},{"StartTime":63374.0,"Position":192.0,"HyperDash":false}]},{"StartTime":63707.0,"Objects":[{"StartTime":63707.0,"Position":468.0,"HyperDash":false}]},{"StartTime":64041.0,"Objects":[{"StartTime":64041.0,"Position":192.0,"HyperDash":false},{"StartTime":64124.0,"Position":153.075073,"HyperDash":false},{"StartTime":64207.0,"Position":159.150146,"HyperDash":false},{"StartTime":64290.0,"Position":101.225227,"HyperDash":false},{"StartTime":64374.0,"Position":92.0,"HyperDash":false},{"StartTime":64448.0,"Position":132.222229,"HyperDash":false},{"StartTime":64522.0,"Position":126.444443,"HyperDash":false},{"StartTime":64596.0,"Position":160.666656,"HyperDash":false},{"StartTime":64707.0,"Position":192.0,"HyperDash":false}]},{"StartTime":65041.0,"Objects":[{"StartTime":65041.0,"Position":336.0,"HyperDash":false},{"StartTime":65124.0,"Position":375.268738,"HyperDash":false},{"StartTime":65207.0,"Position":395.320221,"HyperDash":false},{"StartTime":65290.0,"Position":394.972534,"HyperDash":false},{"StartTime":65374.0,"Position":395.778046,"HyperDash":false},{"StartTime":65448.0,"Position":382.9742,"HyperDash":false},{"StartTime":65522.0,"Position":392.609863,"HyperDash":false},{"StartTime":65596.0,"Position":364.706543,"HyperDash":false},{"StartTime":65707.0,"Position":339.031464,"HyperDash":false}]},{"StartTime":66041.0,"Objects":[{"StartTime":66041.0,"Position":208.0,"HyperDash":false},{"StartTime":66115.0,"Position":218.222229,"HyperDash":false},{"StartTime":66189.0,"Position":241.444443,"HyperDash":false},{"StartTime":66263.0,"Position":289.6667,"HyperDash":false},{"StartTime":66374.0,"Position":308.0,"HyperDash":false}]},{"StartTime":66707.0,"Objects":[{"StartTime":66707.0,"Position":144.0,"HyperDash":false},{"StartTime":66781.0,"Position":125.777779,"HyperDash":false},{"StartTime":66855.0,"Position":106.555557,"HyperDash":false},{"StartTime":66929.0,"Position":90.33333,"HyperDash":false},{"StartTime":67040.0,"Position":44.0,"HyperDash":false}]},{"StartTime":67373.0,"Objects":[{"StartTime":67373.0,"Position":192.0,"HyperDash":false},{"StartTime":67447.0,"Position":186.1427,"HyperDash":false},{"StartTime":67521.0,"Position":209.2854,"HyperDash":false},{"StartTime":67595.0,"Position":193.428085,"HyperDash":false},{"StartTime":67706.0,"Position":206.142136,"HyperDash":false}]},{"StartTime":67874.0,"Objects":[{"StartTime":67874.0,"Position":120.0,"HyperDash":false},{"StartTime":67957.0,"Position":88.82533,"HyperDash":false},{"StartTime":68040.0,"Position":85.3476257,"HyperDash":false},{"StartTime":68123.0,"Position":65.43532,"HyperDash":false},{"StartTime":68207.0,"Position":74.31434,"HyperDash":false},{"StartTime":68272.0,"Position":73.27857,"HyperDash":false},{"StartTime":68373.0,"Position":113.828613,"HyperDash":false}]},{"StartTime":68707.0,"Objects":[{"StartTime":68707.0,"Position":272.0,"HyperDash":false},{"StartTime":68781.0,"Position":296.222229,"HyperDash":false},{"StartTime":68855.0,"Position":335.444458,"HyperDash":false},{"StartTime":68929.0,"Position":338.6667,"HyperDash":false},{"StartTime":69040.0,"Position":372.0,"HyperDash":false}]},{"StartTime":69374.0,"Objects":[{"StartTime":69374.0,"Position":237.0,"HyperDash":false},{"StartTime":69457.0,"Position":218.076126,"HyperDash":false},{"StartTime":69540.0,"Position":170.152252,"HyperDash":false},{"StartTime":69623.0,"Position":155.228363,"HyperDash":false},{"StartTime":69707.0,"Position":137.004211,"HyperDash":false},{"StartTime":69781.0,"Position":167.2255,"HyperDash":false},{"StartTime":69855.0,"Position":161.446777,"HyperDash":false},{"StartTime":69929.0,"Position":188.66806,"HyperDash":false},{"StartTime":70040.0,"Position":237.0,"HyperDash":false}]},{"StartTime":70373.0,"Objects":[{"StartTime":70373.0,"Position":384.0,"HyperDash":false}]},{"StartTime":70540.0,"Objects":[{"StartTime":70540.0,"Position":448.0,"HyperDash":false},{"StartTime":70614.0,"Position":454.1427,"HyperDash":false},{"StartTime":70688.0,"Position":466.2854,"HyperDash":false},{"StartTime":70762.0,"Position":467.4281,"HyperDash":false},{"StartTime":70873.0,"Position":462.142151,"HyperDash":false}]},{"StartTime":71040.0,"Objects":[{"StartTime":71040.0,"Position":400.0,"HyperDash":false},{"StartTime":71123.0,"Position":381.075073,"HyperDash":false},{"StartTime":71206.0,"Position":345.150146,"HyperDash":false},{"StartTime":71289.0,"Position":316.22522,"HyperDash":false},{"StartTime":71373.0,"Position":300.0,"HyperDash":false},{"StartTime":71447.0,"Position":336.222229,"HyperDash":false},{"StartTime":71521.0,"Position":347.444458,"HyperDash":false},{"StartTime":71595.0,"Position":384.666656,"HyperDash":false},{"StartTime":71706.0,"Position":400.0,"HyperDash":false}]},{"StartTime":72040.0,"Objects":[{"StartTime":72040.0,"Position":256.0,"HyperDash":false},{"StartTime":72123.0,"Position":241.4447,"HyperDash":false},{"StartTime":72206.0,"Position":212.00444,"HyperDash":false},{"StartTime":72289.0,"Position":222.925644,"HyperDash":false},{"StartTime":72373.0,"Position":198.3011,"HyperDash":false},{"StartTime":72447.0,"Position":185.363647,"HyperDash":false},{"StartTime":72521.0,"Position":217.711319,"HyperDash":false},{"StartTime":72595.0,"Position":229.9505,"HyperDash":false},{"StartTime":72706.0,"Position":232.077591,"HyperDash":false}]},{"StartTime":73040.0,"Objects":[{"StartTime":73040.0,"Position":400.0,"HyperDash":false}]},{"StartTime":73207.0,"Objects":[{"StartTime":73207.0,"Position":472.0,"HyperDash":false},{"StartTime":73281.0,"Position":462.583252,"HyperDash":false},{"StartTime":73355.0,"Position":487.166534,"HyperDash":false},{"StartTime":73429.0,"Position":462.7498,"HyperDash":false},{"StartTime":73540.0,"Position":479.1247,"HyperDash":false}]},{"StartTime":73707.0,"Objects":[{"StartTime":73707.0,"Position":416.0,"HyperDash":false},{"StartTime":73781.0,"Position":409.777771,"HyperDash":false},{"StartTime":73855.0,"Position":383.555542,"HyperDash":false},{"StartTime":73929.0,"Position":337.3333,"HyperDash":false},{"StartTime":74040.0,"Position":316.0,"HyperDash":false}]},{"StartTime":74373.0,"Objects":[{"StartTime":74373.0,"Position":36.0,"HyperDash":false}]},{"StartTime":74707.0,"Objects":[{"StartTime":74707.0,"Position":304.0,"HyperDash":false},{"StartTime":74790.0,"Position":334.939941,"HyperDash":false},{"StartTime":74873.0,"Position":359.879883,"HyperDash":false},{"StartTime":74956.0,"Position":382.819824,"HyperDash":false},{"StartTime":75040.0,"Position":384.0,"HyperDash":false},{"StartTime":75114.0,"Position":376.222229,"HyperDash":false},{"StartTime":75188.0,"Position":347.444458,"HyperDash":false},{"StartTime":75262.0,"Position":313.666656,"HyperDash":false},{"StartTime":75373.0,"Position":304.0,"HyperDash":false}]},{"StartTime":75707.0,"Objects":[{"StartTime":75707.0,"Position":160.0,"HyperDash":false},{"StartTime":75790.0,"Position":138.731277,"HyperDash":false},{"StartTime":75873.0,"Position":112.679764,"HyperDash":false},{"StartTime":75956.0,"Position":91.02745,"HyperDash":false},{"StartTime":76040.0,"Position":100.221947,"HyperDash":false},{"StartTime":76114.0,"Position":110.025749,"HyperDash":false},{"StartTime":76188.0,"Position":126.390106,"HyperDash":false},{"StartTime":76262.0,"Position":120.293419,"HyperDash":false},{"StartTime":76373.0,"Position":156.968521,"HyperDash":false}]},{"StartTime":76707.0,"Objects":[{"StartTime":76707.0,"Position":304.0,"HyperDash":false},{"StartTime":76781.0,"Position":341.222229,"HyperDash":false},{"StartTime":76855.0,"Position":337.444458,"HyperDash":false},{"StartTime":76929.0,"Position":358.6667,"HyperDash":false},{"StartTime":77040.0,"Position":404.0,"HyperDash":false}]},{"StartTime":77374.0,"Objects":[{"StartTime":77374.0,"Position":8.0,"HyperDash":false}]},{"StartTime":77707.0,"Objects":[{"StartTime":77707.0,"Position":450.0,"HyperDash":false},{"StartTime":77779.0,"Position":231.0,"HyperDash":false},{"StartTime":77852.0,"Position":118.0,"HyperDash":false},{"StartTime":77925.0,"Position":511.0,"HyperDash":false},{"StartTime":77998.0,"Position":333.0,"HyperDash":false},{"StartTime":78071.0,"Position":234.0,"HyperDash":false},{"StartTime":78144.0,"Position":228.0,"HyperDash":false},{"StartTime":78217.0,"Position":302.0,"HyperDash":false},{"StartTime":78290.0,"Position":390.0,"HyperDash":false},{"StartTime":78363.0,"Position":75.0,"HyperDash":false},{"StartTime":78436.0,"Position":506.0,"HyperDash":false},{"StartTime":78509.0,"Position":3.0,"HyperDash":false},{"StartTime":78582.0,"Position":289.0,"HyperDash":false},{"StartTime":78655.0,"Position":217.0,"HyperDash":false},{"StartTime":78728.0,"Position":447.0,"HyperDash":false},{"StartTime":78801.0,"Position":324.0,"HyperDash":false},{"StartTime":78874.0,"Position":183.0,"HyperDash":false},{"StartTime":78946.0,"Position":279.0,"HyperDash":false},{"StartTime":79019.0,"Position":157.0,"HyperDash":false},{"StartTime":79092.0,"Position":501.0,"HyperDash":false},{"StartTime":79165.0,"Position":215.0,"HyperDash":false},{"StartTime":79238.0,"Position":79.0,"HyperDash":false},{"StartTime":79311.0,"Position":337.0,"HyperDash":false},{"StartTime":79384.0,"Position":380.0,"HyperDash":false},{"StartTime":79457.0,"Position":348.0,"HyperDash":false},{"StartTime":79530.0,"Position":225.0,"HyperDash":false},{"StartTime":79603.0,"Position":363.0,"HyperDash":false},{"StartTime":79676.0,"Position":96.0,"HyperDash":false},{"StartTime":79749.0,"Position":104.0,"HyperDash":false},{"StartTime":79822.0,"Position":173.0,"HyperDash":false},{"StartTime":79895.0,"Position":373.0,"HyperDash":false},{"StartTime":79968.0,"Position":424.0,"HyperDash":false},{"StartTime":80041.0,"Position":268.0,"HyperDash":false}]},{"StartTime":82374.0,"Objects":[{"StartTime":82374.0,"Position":368.0,"HyperDash":false}]},{"StartTime":82707.0,"Objects":[{"StartTime":82707.0,"Position":224.0,"HyperDash":false},{"StartTime":82790.0,"Position":220.606583,"HyperDash":false},{"StartTime":82873.0,"Position":192.709763,"HyperDash":false},{"StartTime":82956.0,"Position":172.4607,"HyperDash":false},{"StartTime":83040.0,"Position":181.183929,"HyperDash":false},{"StartTime":83123.0,"Position":190.276581,"HyperDash":false},{"StartTime":83206.0,"Position":175.345276,"HyperDash":false},{"StartTime":83289.0,"Position":168.272736,"HyperDash":false},{"StartTime":83373.0,"Position":181.259979,"HyperDash":false},{"StartTime":83447.0,"Position":182.439926,"HyperDash":false},{"StartTime":83522.0,"Position":186.502777,"HyperDash":false},{"StartTime":83596.0,"Position":213.74353,"HyperDash":false},{"StartTime":83707.0,"Position":224.286057,"HyperDash":false}]},{"StartTime":84041.0,"Objects":[{"StartTime":84041.0,"Position":368.0,"HyperDash":false},{"StartTime":84124.0,"Position":366.238831,"HyperDash":false},{"StartTime":84207.0,"Position":382.477631,"HyperDash":false},{"StartTime":84290.0,"Position":376.716461,"HyperDash":false},{"StartTime":84374.0,"Position":372.9702,"HyperDash":false},{"StartTime":84457.0,"Position":381.209045,"HyperDash":false},{"StartTime":84540.0,"Position":367.447845,"HyperDash":false},{"StartTime":84623.0,"Position":364.686676,"HyperDash":false},{"StartTime":84707.0,"Position":377.94043,"HyperDash":false},{"StartTime":84781.0,"Position":396.044922,"HyperDash":false},{"StartTime":84856.0,"Position":371.164337,"HyperDash":false},{"StartTime":84930.0,"Position":379.268829,"HyperDash":false},{"StartTime":85041.0,"Position":382.925568,"HyperDash":false}]},{"StartTime":85374.0,"Objects":[{"StartTime":85374.0,"Position":240.0,"HyperDash":false},{"StartTime":85457.0,"Position":214.595383,"HyperDash":false},{"StartTime":85540.0,"Position":206.182877,"HyperDash":false},{"StartTime":85623.0,"Position":175.034424,"HyperDash":false},{"StartTime":85707.0,"Position":168.007141,"HyperDash":false},{"StartTime":85781.0,"Position":185.660355,"HyperDash":false},{"StartTime":85855.0,"Position":200.138123,"HyperDash":false},{"StartTime":85929.0,"Position":194.945816,"HyperDash":false},{"StartTime":86040.0,"Position":235.646591,"HyperDash":false}]},{"StartTime":86374.0,"Objects":[{"StartTime":86374.0,"Position":496.0,"HyperDash":false}]},{"StartTime":86707.0,"Objects":[{"StartTime":86707.0,"Position":224.0,"HyperDash":false},{"StartTime":86781.0,"Position":185.777771,"HyperDash":false},{"StartTime":86855.0,"Position":181.555557,"HyperDash":false},{"StartTime":86929.0,"Position":172.333328,"HyperDash":false},{"StartTime":87040.0,"Position":124.0,"HyperDash":false}]},{"StartTime":87374.0,"Objects":[{"StartTime":87374.0,"Position":256.0,"HyperDash":false},{"StartTime":87448.0,"Position":281.222229,"HyperDash":false},{"StartTime":87522.0,"Position":307.444458,"HyperDash":false},{"StartTime":87596.0,"Position":307.6667,"HyperDash":false},{"StartTime":87707.0,"Position":356.0,"HyperDash":false}]},{"StartTime":88041.0,"Objects":[{"StartTime":88041.0,"Position":184.0,"HyperDash":false}]},{"StartTime":88374.0,"Objects":[{"StartTime":88374.0,"Position":352.0,"HyperDash":false},{"StartTime":88448.0,"Position":358.1427,"HyperDash":false},{"StartTime":88522.0,"Position":353.2854,"HyperDash":false},{"StartTime":88596.0,"Position":361.4281,"HyperDash":false},{"StartTime":88707.0,"Position":366.142151,"HyperDash":false}]},{"StartTime":89041.0,"Objects":[{"StartTime":89041.0,"Position":80.0,"HyperDash":false}]},{"StartTime":89374.0,"Objects":[{"StartTime":89374.0,"Position":366.0,"HyperDash":false},{"StartTime":89457.0,"Position":408.9072,"HyperDash":false},{"StartTime":89540.0,"Position":411.8144,"HyperDash":false},{"StartTime":89623.0,"Position":438.7216,"HyperDash":false},{"StartTime":89707.0,"Position":465.928864,"HyperDash":false},{"StartTime":89781.0,"Position":460.722473,"HyperDash":false},{"StartTime":89855.0,"Position":437.516052,"HyperDash":false},{"StartTime":89929.0,"Position":403.309631,"HyperDash":false},{"StartTime":90040.0,"Position":366.0,"HyperDash":false}]},{"StartTime":90374.0,"Objects":[{"StartTime":90374.0,"Position":24.0,"HyperDash":false}]},{"StartTime":90707.0,"Objects":[{"StartTime":90707.0,"Position":368.0,"HyperDash":false},{"StartTime":90781.0,"Position":386.704376,"HyperDash":false},{"StartTime":90855.0,"Position":388.408722,"HyperDash":false},{"StartTime":90929.0,"Position":374.1131,"HyperDash":false},{"StartTime":91040.0,"Position":375.669647,"HyperDash":false}]},{"StartTime":91374.0,"Objects":[{"StartTime":91374.0,"Position":256.0,"HyperDash":false},{"StartTime":91448.0,"Position":246.777771,"HyperDash":false},{"StartTime":91522.0,"Position":220.555557,"HyperDash":false},{"StartTime":91596.0,"Position":188.333328,"HyperDash":false},{"StartTime":91707.0,"Position":156.0,"HyperDash":false}]},{"StartTime":92041.0,"Objects":[{"StartTime":92041.0,"Position":256.0,"HyperDash":false},{"StartTime":92115.0,"Position":291.222229,"HyperDash":false},{"StartTime":92189.0,"Position":285.444458,"HyperDash":false},{"StartTime":92263.0,"Position":313.6667,"HyperDash":false},{"StartTime":92374.0,"Position":356.0,"HyperDash":false}]},{"StartTime":92707.0,"Objects":[{"StartTime":92707.0,"Position":224.0,"HyperDash":false},{"StartTime":92781.0,"Position":189.777771,"HyperDash":false},{"StartTime":92855.0,"Position":181.555557,"HyperDash":false},{"StartTime":92929.0,"Position":141.333328,"HyperDash":false},{"StartTime":93040.0,"Position":124.0,"HyperDash":false}]},{"StartTime":93374.0,"Objects":[{"StartTime":93374.0,"Position":392.0,"HyperDash":false}]},{"StartTime":93707.0,"Objects":[{"StartTime":93707.0,"Position":128.0,"HyperDash":false},{"StartTime":93790.0,"Position":108.075073,"HyperDash":false},{"StartTime":93873.0,"Position":94.15015,"HyperDash":false},{"StartTime":93956.0,"Position":33.2252274,"HyperDash":false},{"StartTime":94040.0,"Position":28.0,"HyperDash":false},{"StartTime":94114.0,"Position":51.22222,"HyperDash":false},{"StartTime":94188.0,"Position":75.44444,"HyperDash":false},{"StartTime":94262.0,"Position":111.666664,"HyperDash":false},{"StartTime":94373.0,"Position":128.0,"HyperDash":false}]},{"StartTime":94707.0,"Objects":[{"StartTime":94707.0,"Position":256.0,"HyperDash":false},{"StartTime":94781.0,"Position":264.704376,"HyperDash":false},{"StartTime":94855.0,"Position":261.408722,"HyperDash":false},{"StartTime":94929.0,"Position":261.1131,"HyperDash":false},{"StartTime":95040.0,"Position":263.669647,"HyperDash":false}]},{"StartTime":95374.0,"Objects":[{"StartTime":95374.0,"Position":24.0,"HyperDash":false}]},{"StartTime":95540.0,"Objects":[{"StartTime":95540.0,"Position":96.0,"HyperDash":false}]},{"StartTime":95707.0,"Objects":[{"StartTime":95707.0,"Position":48.0,"HyperDash":false}]},{"StartTime":96041.0,"Objects":[{"StartTime":96041.0,"Position":168.0,"HyperDash":false},{"StartTime":96115.0,"Position":188.222229,"HyperDash":false},{"StartTime":96189.0,"Position":219.444443,"HyperDash":false},{"StartTime":96263.0,"Position":222.666672,"HyperDash":false},{"StartTime":96374.0,"Position":268.0,"HyperDash":false}]},{"StartTime":96707.0,"Objects":[{"StartTime":96707.0,"Position":152.0,"HyperDash":false},{"StartTime":96781.0,"Position":144.295639,"HyperDash":false},{"StartTime":96855.0,"Position":165.591263,"HyperDash":false},{"StartTime":96929.0,"Position":143.8869,"HyperDash":false},{"StartTime":97040.0,"Position":144.330353,"HyperDash":false}]},{"StartTime":97374.0,"Objects":[{"StartTime":97374.0,"Position":280.0,"HyperDash":false},{"StartTime":97457.0,"Position":300.248535,"HyperDash":false},{"StartTime":97540.0,"Position":317.463043,"HyperDash":false},{"StartTime":97623.0,"Position":329.187042,"HyperDash":false},{"StartTime":97707.0,"Position":369.215424,"HyperDash":false},{"StartTime":97781.0,"Position":392.887115,"HyperDash":false},{"StartTime":97855.0,"Position":394.493958,"HyperDash":false},{"StartTime":97929.0,"Position":416.841644,"HyperDash":false},{"StartTime":98040.0,"Position":422.157837,"HyperDash":false}]},{"StartTime":98707.0,"Objects":[{"StartTime":98707.0,"Position":144.0,"HyperDash":false}]},{"StartTime":99040.0,"Objects":[{"StartTime":99040.0,"Position":229.0,"HyperDash":false},{"StartTime":99138.0,"Position":51.0,"HyperDash":false},{"StartTime":99237.0,"Position":199.0,"HyperDash":false},{"StartTime":99336.0,"Position":208.0,"HyperDash":false},{"StartTime":99435.0,"Position":173.0,"HyperDash":false},{"StartTime":99534.0,"Position":367.0,"HyperDash":false},{"StartTime":99633.0,"Position":193.0,"HyperDash":false},{"StartTime":99732.0,"Position":488.0,"HyperDash":false},{"StartTime":99831.0,"Position":314.0,"HyperDash":false},{"StartTime":99930.0,"Position":135.0,"HyperDash":false},{"StartTime":100029.0,"Position":399.0,"HyperDash":false},{"StartTime":100128.0,"Position":404.0,"HyperDash":false},{"StartTime":100227.0,"Position":152.0,"HyperDash":false},{"StartTime":100326.0,"Position":353.0,"HyperDash":false},{"StartTime":100425.0,"Position":358.0,"HyperDash":false},{"StartTime":100524.0,"Position":447.0,"HyperDash":false},{"StartTime":100623.0,"Position":222.0,"HyperDash":false},{"StartTime":100722.0,"Position":382.0,"HyperDash":false},{"StartTime":100821.0,"Position":433.0,"HyperDash":false},{"StartTime":100920.0,"Position":450.0,"HyperDash":false},{"StartTime":101019.0,"Position":326.0,"HyperDash":false},{"StartTime":101118.0,"Position":414.0,"HyperDash":false},{"StartTime":101216.0,"Position":285.0,"HyperDash":false},{"StartTime":101315.0,"Position":336.0,"HyperDash":false},{"StartTime":101414.0,"Position":509.0,"HyperDash":false},{"StartTime":101513.0,"Position":334.0,"HyperDash":false},{"StartTime":101612.0,"Position":72.0,"HyperDash":false},{"StartTime":101711.0,"Position":425.0,"HyperDash":false},{"StartTime":101810.0,"Position":451.0,"HyperDash":false},{"StartTime":101909.0,"Position":220.0,"HyperDash":false},{"StartTime":102008.0,"Position":25.0,"HyperDash":false},{"StartTime":102107.0,"Position":77.0,"HyperDash":false},{"StartTime":102206.0,"Position":509.0,"HyperDash":false},{"StartTime":102305.0,"Position":90.0,"HyperDash":false},{"StartTime":102404.0,"Position":118.0,"HyperDash":false},{"StartTime":102503.0,"Position":58.0,"HyperDash":false},{"StartTime":102602.0,"Position":12.0,"HyperDash":false},{"StartTime":102701.0,"Position":215.0,"HyperDash":false},{"StartTime":102800.0,"Position":487.0,"HyperDash":false},{"StartTime":102899.0,"Position":446.0,"HyperDash":false},{"StartTime":102998.0,"Position":491.0,"HyperDash":false},{"StartTime":103097.0,"Position":459.0,"HyperDash":false},{"StartTime":103196.0,"Position":37.0,"HyperDash":false},{"StartTime":103294.0,"Position":291.0,"HyperDash":false},{"StartTime":103393.0,"Position":315.0,"HyperDash":false},{"StartTime":103492.0,"Position":35.0,"HyperDash":false},{"StartTime":103591.0,"Position":208.0,"HyperDash":false},{"StartTime":103690.0,"Position":504.0,"HyperDash":false},{"StartTime":103789.0,"Position":296.0,"HyperDash":false},{"StartTime":103888.0,"Position":105.0,"HyperDash":false},{"StartTime":103987.0,"Position":488.0,"HyperDash":false},{"StartTime":104086.0,"Position":230.0,"HyperDash":false},{"StartTime":104185.0,"Position":446.0,"HyperDash":false},{"StartTime":104284.0,"Position":241.0,"HyperDash":false},{"StartTime":104383.0,"Position":413.0,"HyperDash":false},{"StartTime":104482.0,"Position":357.0,"HyperDash":false},{"StartTime":104581.0,"Position":256.0,"HyperDash":false},{"StartTime":104680.0,"Position":192.0,"HyperDash":false},{"StartTime":104779.0,"Position":116.0,"HyperDash":false},{"StartTime":104878.0,"Position":397.0,"HyperDash":false},{"StartTime":104977.0,"Position":422.0,"HyperDash":false},{"StartTime":105076.0,"Position":230.0,"HyperDash":false},{"StartTime":105175.0,"Position":479.0,"HyperDash":false},{"StartTime":105274.0,"Position":276.0,"HyperDash":false},{"StartTime":105373.0,"Position":423.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1284935.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1284935.osu
new file mode 100644
index 0000000000..a0ed6b190e
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1284935.osu
@@ -0,0 +1,210 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:2.5
+OverallDifficulty:6
+ApproachRate:6
+SliderMultiplier:1
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+//Break Periods
+2,80241,81249
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+
+[TimingPoints]
+41,333.333333333333,4,2,1,50,1,0
+707,-100,4,2,1,50,0,0
+2707,-100,4,2,1,85,0,0
+12040,-86.9565217391304,4,2,1,85,0,0
+12707,-100,4,2,1,85,0,0
+13374,-100,4,2,1,85,0,0
+34207,-100,4,2,1,75,0,0
+34374,-100,4,2,1,65,0,0
+34540,-100,4,2,1,55,0,0
+34707,-100,4,2,1,85,0,0
+45374,-133.333333333333,4,2,1,85,0,0
+54707,-133.333333333333,4,2,1,30,0,0
+56040,-100,4,2,1,85,0,1
+72040,-125,4,2,1,85,0,0
+72707,-100,4,2,1,85,0,0
+74707,-125,4,2,1,85,0,0
+75207,-100,4,2,1,85,0,0
+82374,-200,4,2,1,85,0,0
+85374,-100,4,2,1,85,0,0
+88040,-100,4,2,1,85,0,1
+98707,-100,4,2,1,85,0,0
+99040,-100,4,2,1,20,0,0
+
+[HitObjects]
+256,192,707,12,0,2374,0:0:0:0:
+368,64,2707,6,2,L|256:64,1,100,2|2,0:0|0:0,0:0:0:0:
+288,128,3207,2,2,L|304:192,1,50,2|8,0:0|0:0,0:0:0:0:
+192,192,3707,6,2,L|64:192,2,100,2|2|2,0:0|0:0|0:0,0:0:0:0:
+288,192,4707,1,8,0:0:0:0:
+144,128,5041,1,10,0:0:0:0:
+304,288,5374,6,6,L|448:144,2,200,6|8|0,0:0|0:0|0:0,0:0:0:0:
+208,288,7041,1,0,0:0:0:0:
+304,160,7374,2,10,L|320:48,1,100,10|8,0:0|0:0,0:0:0:0:
+160,32,8041,6,6,L|48:32,1,100,6|2,0:0|0:0,0:0:0:0:
+112,80,8541,1,0,0:0:0:0:
+160,128,8707,2,8,P|208:160|128:232,1,200,8|6,0:0|0:0,0:0:0:0:
+224,256,9707,5,2,0:0:0:0:
+352,224,10041,2,8,L|240:224,1,100,8|2,0:0|0:0,0:0:0:0:
+416,336,10707,6,6,P|464:320|416:216,1,200,6|12,0:0|0:0,0:0:0:0:
+224,96,11874,1,2,0:0:0:0:
+160,96,12041,2,2,P|116:152|160:232,1,172.500003290176,2|2,0:0|0:0,0:0:0:0:
+224,232,12707,1,2,0:0:0:0:
+464,64,13374,6,6,L|304:64,1,150,6|2,0:0|0:0,0:0:0:0:
+240,64,14041,2,8,P|192:112|240:160,1,150,8|2,0:0|0:0,0:0:0:0:
+320,160,14707,6,2,L|208:160,1,100,2|0,0:0|0:0,0:0:0:0:
+320,256,15374,2,8,L|360:164,1,100,8|8,0:0|0:0,0:0:0:0:
+192,64,16041,6,4,L|80:64,1,100,4|2,0:0|0:0,0:0:0:0:
+144,80,16541,1,2,0:0:0:0:
+192,96,16707,1,8,0:0:0:0:
+336,96,17041,1,2,0:0:0:0:
+288,96,17207,6,2,P|240:128|288:192,1,150,2|0,0:0|0:0,0:0:0:0:
+384,192,18041,1,8,0:0:0:0:
+256,192,18374,1,2,0:0:0:0:
+416,192,18707,6,6,L|432:16,1,150,6|2,0:0|0:0,0:0:0:0:
+336,32,19374,2,8,L|224:32,1,100,8|0,0:0|0:0,0:0:0:0:
+256,32,20041,6,2,P|304:80|256:128,1,150,2|2,0:0|0:0,0:0:0:0:
+196,128,20707,2,8,L|156:220,1,100,8|8,0:0|0:0,0:0:0:0:
+320,224,21374,6,6,P|360:288|320:352,1,150,6|2,0:0|0:0,0:0:0:0:
+224,352,22041,2,8,L|112:352,1,100,8|2,0:0|0:0,0:0:0:0:
+192,224,22541,1,2,0:0:0:0:
+204,272,22707,5,2,0:0:0:0:
+96,288,23041,1,0,0:0:0:0:
+208,288,23374,2,8,L|224:176,1,100,8|0,0:0|0:0,0:0:0:0:
+80,96,24041,6,6,L|240:96,1,150,6|0,0:0|0:0,0:0:0:0:
+176,96,24707,1,8,0:0:0:0:
+256,128,25041,6,2,L|240:80,1,50,2|0,0:0|0:0,0:0:0:0:
+352,96,25541,2,2,L|356:44,1,50,2|2,0:0|0:0,0:0:0:0:
+192,176,26041,2,8,L|176:288,1,100,8|8,0:0|0:0,0:0:0:0:
+272,336,26707,6,0,L|384:336,1,100,0|2,0:0|0:0,0:0:0:0:
+320,288,27207,1,0,0:0:0:0:
+272,240,27374,1,8,0:0:0:0:
+416,240,27707,2,2,L|432:176,1,50,2|0,0:0|0:0,0:0:0:0:
+288,176,28207,6,2,L|176:176,1,100,2|0,0:0|0:0,0:0:0:0:
+256,368,28707,2,8,L|270:269,1,100,8|8,0:0|0:0,0:0:0:0:
+128,256,29374,6,6,P|64:192|128:128,1,200,6|8,0:0|0:0,0:0:0:0:
+224,128,30374,1,2,0:0:0:0:
+368,128,30707,5,6,0:0:0:0:
+432,128,30874,2,2,L|448:240,1,100,2|0,0:0|0:0,0:0:0:0:
+384,256,31374,1,8,0:0:0:0:
+240,256,31707,2,8,L|224:192,1,50,8|0,0:0|0:0,0:0:0:0:
+304,192,32041,6,14,P|352:176|288:80,1,200,14|12,0:0|0:0,0:0:0:0:
+160,80,33041,1,0,0:0:0:0:
+304,80,33374,5,12,0:0:0:0:
+368,80,33541,2,2,P|380:128|368:176,1,100,2|2,0:0|0:0,0:0:0:0:
+224,176,34207,1,8,3:0:0:0:
+176,176,34374,1,8,3:0:0:0:
+128,176,34541,1,8,3:0:0:0:
+200,144,34707,5,6,0:0:0:0:
+336,272,35041,2,8,L|352:160,1,100,8|2,0:0|0:0,0:0:0:0:
+208,144,35707,2,8,L|192:192,1,50,8|0,0:0|0:0,0:0:0:0:
+336,208,36207,2,2,L|352:160,1,50,2|8,0:0|0:0,0:0:0:0:
+208,160,36707,2,2,L|96:160,1,100,2|8,0:0|0:0,0:0:0:0:
+256,160,37374,5,2,0:0:0:0:
+320,160,37541,2,0,L|336:264,1,100,0|2,0:0|0:0,0:0:0:0:
+272,272,38041,1,0,0:0:0:0:
+416,272,38374,2,8,L|432:224,1,50,8|0,0:0|0:0,0:0:0:0:
+288,224,38874,6,2,L|272:176,1,50,2|8,0:0|0:0,0:0:0:0:
+336,160,39207,2,2,L|448:160,1,100,2|2,0:0|0:0,0:0:0:0:
+384,160,39707,1,8,0:0:0:0:
+240,160,40041,5,4,0:0:0:0:
+384,64,40374,2,8,L|400:176,1,100,8|2,0:0|0:0,0:0:0:0:
+256,176,41041,1,8,0:0:0:0:
+112,176,41374,5,2,0:0:0:0:
+48,224,41541,2,0,L|32:112,1,100,0|0,0:0|0:0,0:0:0:0:
+96,112,42041,1,2,0:0:0:0:
+240,112,42374,1,8,0:0:0:0:
+96,112,42707,6,4,P|48:160|96:208,1,150,4|2,0:0|0:0,0:0:0:0:
+160,208,43374,1,2,0:0:0:0:
+288,208,43707,1,8,0:0:0:0:
+160,208,44040,5,6,0:0:0:0:
+304,288,44374,2,8,P|352:240|288:128,1,200,8|8,0:0|0:0,0:0:0:0:
+136,128,45374,6,6,L|24:192,2,112.500004291535,6|0|0,0:0|0:0|0:0,0:0:0:0:
+368,128,46874,2,0,L|384:240,1,112.500004291535,0|2,0:0|0:0,0:0:0:0:
+272,256,47707,1,0,0:0:0:0:
+144,256,48041,6,6,L|48:191,2,112.500004291535,6|0|0,0:0|0:0|0:0,0:0:0:0:
+256,256,49374,2,2,P|304:224|224:112,1,225.000008583069,2|8,0:0|0:0,0:0:0:0:
+384,96,50707,6,6,L|496:96,1,112.500004291535,6|0,0:0|0:0,0:0:0:0:
+448,96,51374,1,8,0:0:0:0:
+244,92,51874,2,2,L|132:108,1,112.500004291535,0|2,0:0|0:0,0:0:0:0:
+208,288,52707,2,8,L|288:288,1,75.0000028610231,8|0,0:0|0:0,0:0:0:0:
+368,288,53373,6,6,L|383:191,1,75.0000028610231,6|2,0:0|0:0,0:0:0:0:
+255,192,54040,2,8,L|176:192,1,75.0000028610231,8|2,0:0|0:0,0:0:0:0:
+272,80,54707,1,0,0:0:0:0:
+160,272,55374,6,2,L|144:176,1,75.0000028610231,2|2,0:0|0:0,0:0:0:0:
+320,144,56041,6,6,L|432:144,1,100,6|8,0:0|0:0,0:0:0:0:
+256,240,56707,2,2,L|240:128,1,100,2|8,0:0|0:0,0:0:0:0:
+328,112,57207,2,0,P|376:144|328:208,1,150,2|8,0:0|0:0,0:0:0:0:
+176,208,58041,2,2,L|64:208,1,100,2|8,0:0|0:0,0:0:0:0:
+208,208,58707,6,2,L|320:208,2,100,2|8|2,0:0|0:0|0:0,0:0:0:0:
+64,208,59707,1,8,0:0:0:0:
+128,208,59874,2,0,L|144:96,1,100,0|0,0:0|0:0,0:0:0:0:
+80,96,60374,2,8,L|8:168,2,100,8|2|8,0:0|0:0|0:0,0:0:0:0:
+224,96,61374,6,6,P|296:152|224:208,1,200,6|2,0:0|0:0,0:0:0:0:
+96,224,62374,1,8,0:0:0:0:
+32,224,62541,6,0,P|16:168|32:128,1,100,0|2,0:0|0:0,0:0:0:0:
+92,112,63041,2,8,L|204:112,1,100,8|2,0:0|0:0,0:0:0:0:
+336,112,63707,1,8,0:0:0:0:
+192,112,64041,6,2,L|64:112,2,100,2|8|2,0:0|0:0|0:0,0:0:0:0:
+336,112,65041,2,8,P|384:144|336:256,1,200,8|8,0:0|0:0,0:0:0:0:
+208,256,66041,2,8,L|320:256,1,100,8|8,0:0|0:0,0:0:0:0:
+144,160,66707,6,4,L|32:160,1,100,4|8,0:0|0:0,0:0:0:0:
+192,256,67373,2,2,L|208:144,1,100,2|8,0:0|0:0,0:0:0:0:
+120,128,67874,2,0,P|72:160|120:224,1,150,0|8,0:0|0:0,0:0:0:0:
+272,224,68707,2,2,L|384:224,1,100,2|8,0:0|0:0,0:0:0:0:
+237,223,69374,6,2,L|128:224,2,100,2|8|2,0:0|0:0|0:0,0:0:0:0:
+384,208,70373,1,0,0:0:0:0:
+448,208,70540,2,2,L|464:96,1,100,2|2,0:0|0:0,0:0:0:0:
+400,96,71040,2,2,L|288:96,2,100,10|8|10,0:0|0:0|0:0,0:0:0:0:
+256,96,72040,6,6,P|200:136|232:208,1,160,6|2,0:0|0:0,0:0:0:0:
+400,208,73040,1,2,0:0:0:0:
+472,208,73207,6,2,L|480:96,1,100,2|0,0:0|0:0,0:0:0:0:
+416,80,73707,2,0,L|316:80,1,100,0|8,0:0|0:0,0:0:0:0:
+176,80,74373,1,0,0:0:0:0:
+304,80,74707,6,6,L|400:80,2,80,6|0|12,0:0|0:0|0:0,0:0:0:0:
+160,80,75707,2,0,P|112:112|160:224,1,200,0|2,0:0|0:0,0:0:0:0:
+304,224,76707,6,8,L|416:224,1,100,10|8,0:0|0:0,0:0:0:0:
+212,224,77374,1,12,0:0:0:0:
+256,192,77707,12,2,80041,0:0:0:0:
+368,192,82374,5,0,0:0:0:0:
+224,192,82707,2,6,P|176:160|224:104,1,150,6|0,0:0|0:0,0:0:0:0:
+368,80,84041,2,6,L|384:240,1,150,6|0,0:0|0:0,0:0:0:0:
+240,256,85374,6,6,P|168:212|240:160,1,200,6|10,0:0|0:0,0:0:0:0:
+368,160,86374,1,0,0:0:0:0:
+224,160,86707,6,8,L|112:160,1,100,8|0,0:0|0:0,0:0:0:0:
+256,128,87374,2,8,L|368:128,1,100,8|2,0:0|0:0,0:0:0:0:
+184,128,88041,5,6,0:0:0:0:
+352,128,88374,2,8,L|368:240,1,100,8|8,0:0|0:0,0:0:0:0:
+224,240,89041,1,8,0:0:0:0:
+366,228,89374,6,0,L|472:224,2,100,2|8|8,0:0|0:0|0:0,0:0:0:0:
+248,240,90374,1,8,0:0:0:0:
+368,232,90707,6,0,L|376:128,1,100,2|8,0:0|0:0,0:0:0:0:
+256,104,91374,2,0,L|152:104,1,100,8|8,0:0|0:0,0:0:0:0:
+256,240,92041,6,2,L|368:240,1,100,2|8,0:0|0:0,0:0:0:0:
+224,240,92707,2,8,L|120:240,1,100,8|2,0:0|0:0,0:0:0:0:
+256,144,93374,5,6,0:0:0:0:
+128,144,93707,2,8,L|16:144,2,100,8|8|8,0:0|0:0|0:0,0:0:0:0:
+256,144,94707,6,2,L|264:248,1,100,2|8,0:0|0:0,0:0:0:0:
+144,312,95374,1,8,0:0:0:0:
+96,312,95540,1,8,0:0:0:0:
+48,312,95707,1,8,0:0:0:0:
+168,208,96041,6,6,L|272:208,1,100,6|0,0:0|0:0,0:0:0:0:
+152,104,96707,2,8,L|144:208,1,100
+280,296,97374,6,8,P|369:254|422:171,1,200,10|8,0:0|0:0,0:0:0:0:
+144,144,98707,1,14,0:0:0:0:
+256,192,99040,12,0,105373,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1431386-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1431386-expected-conversion.json
new file mode 100644
index 0000000000..de879d0d1c
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1431386-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":534.0,"Objects":[{"StartTime":534.0,"Position":333.0,"HyperDash":false},{"StartTime":589.0,"Position":336.445465,"HyperDash":false},{"StartTime":645.0,"Position":359.226318,"HyperDash":false},{"StartTime":701.0,"Position":386.604523,"HyperDash":false},{"StartTime":757.0,"Position":424.50647,"HyperDash":false},{"StartTime":813.0,"Position":446.4084,"HyperDash":false},{"StartTime":869.0,"Position":450.310333,"HyperDash":false},{"StartTime":925.0,"Position":468.21228,"HyperDash":false},{"StartTime":981.0,"Position":489.2919,"HyperDash":false},{"StartTime":1032.0,"Position":456.3446,"HyperDash":false},{"StartTime":1084.0,"Position":444.864258,"HyperDash":false},{"StartTime":1135.0,"Position":422.7393,"HyperDash":false},{"StartTime":1187.0,"Position":412.2589,"HyperDash":false},{"StartTime":1238.0,"Position":412.133942,"HyperDash":false},{"StartTime":1290.0,"Position":383.653564,"HyperDash":false},{"StartTime":1341.0,"Position":353.512756,"HyperDash":false},{"StartTime":1429.0,"Position":333.0,"HyperDash":false}]},{"StartTime":1877.0,"Objects":[{"StartTime":1877.0,"Position":182.0,"HyperDash":false}]},{"StartTime":2325.0,"Objects":[{"StartTime":2325.0,"Position":333.0,"HyperDash":false},{"StartTime":2380.0,"Position":357.239044,"HyperDash":false},{"StartTime":2436.0,"Position":352.8279,"HyperDash":false},{"StartTime":2492.0,"Position":382.475677,"HyperDash":false},{"StartTime":2548.0,"Position":429.244324,"HyperDash":false},{"StartTime":2604.0,"Position":448.013,"HyperDash":false},{"StartTime":2660.0,"Position":463.721436,"HyperDash":false},{"StartTime":2716.0,"Position":462.368317,"HyperDash":false},{"StartTime":2772.0,"Position":490.190643,"HyperDash":false},{"StartTime":2823.0,"Position":455.473358,"HyperDash":false},{"StartTime":2875.0,"Position":467.2298,"HyperDash":false},{"StartTime":2926.0,"Position":431.3082,"HyperDash":false},{"StartTime":2978.0,"Position":421.951569,"HyperDash":false},{"StartTime":3029.0,"Position":384.947937,"HyperDash":false},{"StartTime":3081.0,"Position":377.6223,"HyperDash":false},{"StartTime":3132.0,"Position":362.782471,"HyperDash":false},{"StartTime":3220.0,"Position":333.0,"HyperDash":false}]},{"StartTime":3668.0,"Objects":[{"StartTime":3668.0,"Position":182.0,"HyperDash":false}]},{"StartTime":4116.0,"Objects":[{"StartTime":4116.0,"Position":26.0,"HyperDash":false},{"StartTime":4171.0,"Position":40.9041862,"HyperDash":false},{"StartTime":4227.0,"Position":12.82481,"HyperDash":false},{"StartTime":4283.0,"Position":9.745436,"HyperDash":false},{"StartTime":4339.0,"Position":29.67428,"HyperDash":false},{"StartTime":4433.0,"Position":12.1371651,"HyperDash":false},{"StartTime":4563.0,"Position":26.0,"HyperDash":false}]},{"StartTime":5011.0,"Objects":[{"StartTime":5011.0,"Position":20.0,"HyperDash":false},{"StartTime":5104.0,"Position":66.26816,"HyperDash":false},{"StartTime":5234.0,"Position":97.6557159,"HyperDash":false}]},{"StartTime":5459.0,"Objects":[{"StartTime":5459.0,"Position":178.0,"HyperDash":false},{"StartTime":5552.0,"Position":226.229477,"HyperDash":false},{"StartTime":5682.0,"Position":255.569565,"HyperDash":false}]},{"StartTime":5907.0,"Objects":[{"StartTime":5907.0,"Position":308.0,"HyperDash":false},{"StartTime":5990.0,"Position":336.486633,"HyperDash":false},{"StartTime":6074.0,"Position":360.3285,"HyperDash":false},{"StartTime":6158.0,"Position":396.17038,"HyperDash":false},{"StartTime":6242.0,"Position":427.1899,"HyperDash":false},{"StartTime":6317.0,"Position":419.723,"HyperDash":false},{"StartTime":6392.0,"Position":368.078461,"HyperDash":false},{"StartTime":6467.0,"Position":352.433929,"HyperDash":false},{"StartTime":6578.0,"Position":308.0,"HyperDash":false}]},{"StartTime":6802.0,"Objects":[{"StartTime":6802.0,"Position":224.0,"HyperDash":false},{"StartTime":6853.0,"Position":226.916428,"HyperDash":false},{"StartTime":6904.0,"Position":222.886032,"HyperDash":false},{"StartTime":6956.0,"Position":216.946533,"HyperDash":false},{"StartTime":7007.0,"Position":211.428284,"HyperDash":false},{"StartTime":7058.0,"Position":212.341827,"HyperDash":false},{"StartTime":7110.0,"Position":205.693756,"HyperDash":false},{"StartTime":7161.0,"Position":183.379547,"HyperDash":false},{"StartTime":7249.0,"Position":212.117065,"HyperDash":false}]},{"StartTime":7698.0,"Objects":[{"StartTime":7698.0,"Position":372.0,"HyperDash":false},{"StartTime":7791.0,"Position":392.5109,"HyperDash":false},{"StartTime":7921.0,"Position":392.363617,"HyperDash":false}]},{"StartTime":8145.0,"Objects":[{"StartTime":8145.0,"Position":390.0,"HyperDash":false},{"StartTime":8228.0,"Position":407.6116,"HyperDash":false},{"StartTime":8312.0,"Position":434.579956,"HyperDash":false},{"StartTime":8396.0,"Position":497.5483,"HyperDash":false},{"StartTime":8480.0,"Position":509.695038,"HyperDash":false},{"StartTime":8555.0,"Position":475.115967,"HyperDash":false},{"StartTime":8630.0,"Position":472.3585,"HyperDash":false},{"StartTime":8705.0,"Position":432.601044,"HyperDash":false},{"StartTime":8816.0,"Position":390.0,"HyperDash":false}]},{"StartTime":9041.0,"Objects":[{"StartTime":9041.0,"Position":330.0,"HyperDash":false},{"StartTime":9134.0,"Position":286.7251,"HyperDash":false},{"StartTime":9264.0,"Position":250.211823,"HyperDash":false}]},{"StartTime":9489.0,"Objects":[{"StartTime":9489.0,"Position":171.0,"HyperDash":false},{"StartTime":9582.0,"Position":139.4586,"HyperDash":false},{"StartTime":9712.0,"Position":92.77017,"HyperDash":false}]},{"StartTime":9936.0,"Objects":[{"StartTime":9936.0,"Position":9.0,"HyperDash":false},{"StartTime":10019.0,"Position":0.0,"HyperDash":false},{"StartTime":10103.0,"Position":4.53266668,"HyperDash":false},{"StartTime":10187.0,"Position":0.0,"HyperDash":false},{"StartTime":10271.0,"Position":0.02520752,"HyperDash":false},{"StartTime":10346.0,"Position":0.0,"HyperDash":false},{"StartTime":10421.0,"Position":12.0244074,"HyperDash":false},{"StartTime":10496.0,"Position":0.0,"HyperDash":false},{"StartTime":10607.0,"Position":9.0,"HyperDash":false}]},{"StartTime":10832.0,"Objects":[{"StartTime":10832.0,"Position":28.0,"HyperDash":false},{"StartTime":10925.0,"Position":40.7889824,"HyperDash":false},{"StartTime":11055.0,"Position":105.537766,"HyperDash":false}]},{"StartTime":11280.0,"Objects":[{"StartTime":11280.0,"Position":263.0,"HyperDash":false}]},{"StartTime":11728.0,"Objects":[{"StartTime":11728.0,"Position":343.0,"HyperDash":false},{"StartTime":11811.0,"Position":365.302277,"HyperDash":false},{"StartTime":11895.0,"Position":388.675323,"HyperDash":false},{"StartTime":11979.0,"Position":437.668274,"HyperDash":false},{"StartTime":12063.0,"Position":459.2406,"HyperDash":false},{"StartTime":12138.0,"Position":431.2186,"HyperDash":false},{"StartTime":12213.0,"Position":423.446381,"HyperDash":false},{"StartTime":12288.0,"Position":362.9473,"HyperDash":false},{"StartTime":12399.0,"Position":343.0,"HyperDash":false}]},{"StartTime":12623.0,"Objects":[{"StartTime":12623.0,"Position":290.0,"HyperDash":false},{"StartTime":12716.0,"Position":297.645538,"HyperDash":false},{"StartTime":12846.0,"Position":296.3436,"HyperDash":false}]},{"StartTime":13071.0,"Objects":[{"StartTime":13071.0,"Position":265.0,"HyperDash":false},{"StartTime":13164.0,"Position":251.816544,"HyperDash":false},{"StartTime":13294.0,"Position":186.7354,"HyperDash":false}]},{"StartTime":13519.0,"Objects":[{"StartTime":13519.0,"Position":123.0,"HyperDash":false},{"StartTime":13602.0,"Position":103.378716,"HyperDash":false},{"StartTime":13686.0,"Position":73.40055,"HyperDash":false},{"StartTime":13770.0,"Position":37.4223862,"HyperDash":false},{"StartTime":13854.0,"Position":3.26579285,"HyperDash":false},{"StartTime":13929.0,"Position":36.85356,"HyperDash":false},{"StartTime":14004.0,"Position":72.61978,"HyperDash":false},{"StartTime":14079.0,"Position":68.38599,"HyperDash":false},{"StartTime":14190.0,"Position":123.0,"HyperDash":false}]},{"StartTime":14414.0,"Objects":[{"StartTime":14414.0,"Position":371.0,"HyperDash":false}]},{"StartTime":14862.0,"Objects":[{"StartTime":14862.0,"Position":184.0,"HyperDash":false},{"StartTime":14955.0,"Position":212.186356,"HyperDash":false},{"StartTime":15085.0,"Position":261.4036,"HyperDash":false}]},{"StartTime":15310.0,"Objects":[{"StartTime":15310.0,"Position":343.0,"HyperDash":false},{"StartTime":15393.0,"Position":362.374176,"HyperDash":false},{"StartTime":15477.0,"Position":407.102234,"HyperDash":false},{"StartTime":15561.0,"Position":440.8303,"HyperDash":false},{"StartTime":15645.0,"Position":461.735352,"HyperDash":false},{"StartTime":15720.0,"Position":439.369354,"HyperDash":false},{"StartTime":15795.0,"Position":398.826447,"HyperDash":false},{"StartTime":15870.0,"Position":372.283539,"HyperDash":false},{"StartTime":15981.0,"Position":343.0,"HyperDash":false}]},{"StartTime":16205.0,"Objects":[{"StartTime":16205.0,"Position":128.0,"HyperDash":false}]},{"StartTime":16653.0,"Objects":[{"StartTime":16653.0,"Position":219.0,"HyperDash":false},{"StartTime":16746.0,"Position":193.135818,"HyperDash":false},{"StartTime":16876.0,"Position":141.577332,"HyperDash":false}]},{"StartTime":17101.0,"Objects":[{"StartTime":17101.0,"Position":65.0,"HyperDash":false},{"StartTime":17184.0,"Position":56.4695549,"HyperDash":false},{"StartTime":17268.0,"Position":32.94629,"HyperDash":false},{"StartTime":17352.0,"Position":29.3506489,"HyperDash":false},{"StartTime":17436.0,"Position":17.0841427,"HyperDash":false},{"StartTime":17511.0,"Position":18.8012981,"HyperDash":false},{"StartTime":17586.0,"Position":4.30590057,"HyperDash":false},{"StartTime":17661.0,"Position":19.18378,"HyperDash":false},{"StartTime":17772.0,"Position":65.0,"HyperDash":false}]},{"StartTime":17996.0,"Objects":[{"StartTime":17996.0,"Position":144.0,"HyperDash":false},{"StartTime":18089.0,"Position":144.091827,"HyperDash":false},{"StartTime":18219.0,"Position":137.026642,"HyperDash":false}]},{"StartTime":18444.0,"Objects":[{"StartTime":18444.0,"Position":156.0,"HyperDash":false},{"StartTime":18537.0,"Position":195.74173,"HyperDash":false},{"StartTime":18667.0,"Position":233.945068,"HyperDash":false}]},{"StartTime":18892.0,"Objects":[{"StartTime":18892.0,"Position":309.0,"HyperDash":false},{"StartTime":18975.0,"Position":331.4903,"HyperDash":false},{"StartTime":19059.0,"Position":371.3359,"HyperDash":false},{"StartTime":19143.0,"Position":396.1815,"HyperDash":false},{"StartTime":19227.0,"Position":428.204742,"HyperDash":false},{"StartTime":19302.0,"Position":418.734558,"HyperDash":false},{"StartTime":19377.0,"Position":358.08667,"HyperDash":false},{"StartTime":19452.0,"Position":359.438843,"HyperDash":false},{"StartTime":19563.0,"Position":309.0,"HyperDash":false}]},{"StartTime":19787.0,"Objects":[{"StartTime":19787.0,"Position":237.0,"HyperDash":false},{"StartTime":19880.0,"Position":210.372055,"HyperDash":false},{"StartTime":20010.0,"Position":234.5058,"HyperDash":false}]},{"StartTime":20235.0,"Objects":[{"StartTime":20235.0,"Position":296.0,"HyperDash":false},{"StartTime":20328.0,"Position":335.3686,"HyperDash":false},{"StartTime":20458.0,"Position":374.402649,"HyperDash":false}]},{"StartTime":20683.0,"Objects":[{"StartTime":20683.0,"Position":441.0,"HyperDash":false},{"StartTime":20766.0,"Position":438.742676,"HyperDash":false},{"StartTime":20850.0,"Position":413.918945,"HyperDash":false},{"StartTime":20934.0,"Position":420.274963,"HyperDash":false},{"StartTime":21018.0,"Position":440.574921,"HyperDash":false},{"StartTime":21093.0,"Position":428.433563,"HyperDash":false},{"StartTime":21168.0,"Position":429.064026,"HyperDash":false},{"StartTime":21243.0,"Position":410.101563,"HyperDash":false},{"StartTime":21354.0,"Position":441.0,"HyperDash":false}]},{"StartTime":21578.0,"Objects":[{"StartTime":21578.0,"Position":501.0,"HyperDash":false}]},{"StartTime":22026.0,"Objects":[{"StartTime":22026.0,"Position":386.0,"HyperDash":false},{"StartTime":22081.0,"Position":374.485016,"HyperDash":false},{"StartTime":22137.0,"Position":357.487,"HyperDash":false},{"StartTime":22193.0,"Position":318.665863,"HyperDash":false},{"StartTime":22249.0,"Position":311.3857,"HyperDash":false},{"StartTime":22305.0,"Position":300.98407,"HyperDash":false},{"StartTime":22361.0,"Position":266.708557,"HyperDash":false},{"StartTime":22417.0,"Position":256.6825,"HyperDash":false},{"StartTime":22473.0,"Position":240.899826,"HyperDash":false},{"StartTime":22529.0,"Position":227.386124,"HyperDash":false},{"StartTime":22585.0,"Position":225.861679,"HyperDash":false},{"StartTime":22641.0,"Position":185.350357,"HyperDash":false},{"StartTime":22697.0,"Position":169.039291,"HyperDash":false},{"StartTime":22753.0,"Position":131.207657,"HyperDash":false},{"StartTime":22809.0,"Position":115.215012,"HyperDash":false},{"StartTime":22865.0,"Position":108.42057,"HyperDash":false},{"StartTime":22921.0,"Position":89.93976,"HyperDash":false},{"StartTime":22977.0,"Position":126.071373,"HyperDash":false},{"StartTime":23033.0,"Position":140.858871,"HyperDash":false},{"StartTime":23089.0,"Position":159.8509,"HyperDash":false},{"StartTime":23145.0,"Position":166.689056,"HyperDash":false},{"StartTime":23201.0,"Position":205.013,"HyperDash":false},{"StartTime":23257.0,"Position":197.5373,"HyperDash":false},{"StartTime":23313.0,"Position":239.081787,"HyperDash":false},{"StartTime":23369.0,"Position":240.611664,"HyperDash":false},{"StartTime":23420.0,"Position":243.039688,"HyperDash":false},{"StartTime":23472.0,"Position":272.749237,"HyperDash":false},{"StartTime":23523.0,"Position":272.238831,"HyperDash":false},{"StartTime":23575.0,"Position":317.028137,"HyperDash":false},{"StartTime":23626.0,"Position":306.314117,"HyperDash":false},{"StartTime":23678.0,"Position":335.531525,"HyperDash":false},{"StartTime":23729.0,"Position":341.698853,"HyperDash":false},{"StartTime":23817.0,"Position":386.0,"HyperDash":false}]},{"StartTime":24041.0,"Objects":[{"StartTime":24041.0,"Position":465.0,"HyperDash":false}]},{"StartTime":24265.0,"Objects":[{"StartTime":24265.0,"Position":497.0,"HyperDash":false},{"StartTime":24348.0,"Position":488.55304,"HyperDash":false},{"StartTime":24432.0,"Position":484.0766,"HyperDash":false},{"StartTime":24516.0,"Position":480.600128,"HyperDash":false},{"StartTime":24600.0,"Position":487.108948,"HyperDash":false},{"StartTime":24675.0,"Position":484.305328,"HyperDash":false},{"StartTime":24750.0,"Position":486.516449,"HyperDash":false},{"StartTime":24825.0,"Position":507.727539,"HyperDash":false},{"StartTime":24936.0,"Position":497.0,"HyperDash":false}]},{"StartTime":25160.0,"Objects":[{"StartTime":25160.0,"Position":410.0,"HyperDash":false},{"StartTime":25253.0,"Position":380.109436,"HyperDash":false},{"StartTime":25383.0,"Position":332.0014,"HyperDash":false}]},{"StartTime":25608.0,"Objects":[{"StartTime":25608.0,"Position":262.0,"HyperDash":false},{"StartTime":25701.0,"Position":218.3702,"HyperDash":false},{"StartTime":25831.0,"Position":184.296768,"HyperDash":false}]},{"StartTime":26056.0,"Objects":[{"StartTime":26056.0,"Position":136.0,"HyperDash":false},{"StartTime":26139.0,"Position":126.098541,"HyperDash":false},{"StartTime":26223.0,"Position":125.222366,"HyperDash":false},{"StartTime":26307.0,"Position":138.346191,"HyperDash":false},{"StartTime":26391.0,"Position":144.482666,"HyperDash":false},{"StartTime":26466.0,"Position":145.59903,"HyperDash":false},{"StartTime":26541.0,"Position":121.702759,"HyperDash":false},{"StartTime":26616.0,"Position":138.806488,"HyperDash":false},{"StartTime":26727.0,"Position":136.0,"HyperDash":false}]},{"StartTime":26951.0,"Objects":[{"StartTime":26951.0,"Position":67.0,"HyperDash":false}]},{"StartTime":27399.0,"Objects":[{"StartTime":27399.0,"Position":118.0,"HyperDash":false},{"StartTime":27454.0,"Position":149.263077,"HyperDash":false},{"StartTime":27510.0,"Position":152.985062,"HyperDash":false},{"StartTime":27566.0,"Position":191.9209,"HyperDash":false},{"StartTime":27622.0,"Position":186.1002,"HyperDash":false},{"StartTime":27678.0,"Position":201.49527,"HyperDash":false},{"StartTime":27734.0,"Position":213.367828,"HyperDash":false},{"StartTime":27790.0,"Position":256.814331,"HyperDash":false},{"StartTime":27846.0,"Position":246.461456,"HyperDash":false},{"StartTime":27940.0,"Position":268.489075,"HyperDash":false},{"StartTime":28070.0,"Position":233.472458,"HyperDash":false}]},{"StartTime":28295.0,"Objects":[{"StartTime":28295.0,"Position":162.0,"HyperDash":false},{"StartTime":28350.0,"Position":164.220917,"HyperDash":false},{"StartTime":28406.0,"Position":194.79129,"HyperDash":false},{"StartTime":28462.0,"Position":226.3617,"HyperDash":false},{"StartTime":28518.0,"Position":251.932068,"HyperDash":false},{"StartTime":28574.0,"Position":246.033783,"HyperDash":false},{"StartTime":28630.0,"Position":264.13385,"HyperDash":false},{"StartTime":28686.0,"Position":278.233948,"HyperDash":false},{"StartTime":28742.0,"Position":316.344543,"HyperDash":false},{"StartTime":28836.0,"Position":335.418,"HyperDash":false},{"StartTime":28966.0,"Position":395.157867,"HyperDash":false}]},{"StartTime":29190.0,"Objects":[{"StartTime":29190.0,"Position":481.0,"HyperDash":false}]},{"StartTime":29414.0,"Objects":[{"StartTime":29414.0,"Position":499.0,"HyperDash":false}]},{"StartTime":29638.0,"Objects":[{"StartTime":29638.0,"Position":454.0,"HyperDash":false},{"StartTime":29721.0,"Position":464.071655,"HyperDash":false},{"StartTime":29805.0,"Position":475.192383,"HyperDash":false},{"StartTime":29889.0,"Position":456.3131,"HyperDash":false},{"StartTime":29973.0,"Position":470.458374,"HyperDash":false},{"StartTime":30048.0,"Position":459.80368,"HyperDash":false},{"StartTime":30123.0,"Position":473.124451,"HyperDash":false},{"StartTime":30198.0,"Position":468.445251,"HyperDash":false},{"StartTime":30309.0,"Position":454.0,"HyperDash":false}]},{"StartTime":30533.0,"Objects":[{"StartTime":30533.0,"Position":375.0,"HyperDash":false},{"StartTime":30626.0,"Position":348.741882,"HyperDash":false},{"StartTime":30756.0,"Position":297.814758,"HyperDash":false}]},{"StartTime":30981.0,"Objects":[{"StartTime":30981.0,"Position":220.0,"HyperDash":false},{"StartTime":31036.0,"Position":200.494568,"HyperDash":false},{"StartTime":31092.0,"Position":189.8578,"HyperDash":false},{"StartTime":31148.0,"Position":158.568909,"HyperDash":false},{"StartTime":31204.0,"Position":137.831863,"HyperDash":false},{"StartTime":31260.0,"Position":143.862488,"HyperDash":false},{"StartTime":31316.0,"Position":99.86672,"HyperDash":false},{"StartTime":31372.0,"Position":85.05304,"HyperDash":false},{"StartTime":31428.0,"Position":65.47009,"HyperDash":false},{"StartTime":31479.0,"Position":97.9493561,"HyperDash":false},{"StartTime":31531.0,"Position":85.30683,"HyperDash":false},{"StartTime":31582.0,"Position":136.499527,"HyperDash":false},{"StartTime":31634.0,"Position":141.072418,"HyperDash":false},{"StartTime":31685.0,"Position":152.152847,"HyperDash":false},{"StartTime":31737.0,"Position":182.289108,"HyperDash":false},{"StartTime":31788.0,"Position":190.604156,"HyperDash":false},{"StartTime":31876.0,"Position":220.0,"HyperDash":false}]},{"StartTime":32325.0,"Objects":[{"StartTime":32325.0,"Position":365.0,"HyperDash":false}]},{"StartTime":32772.0,"Objects":[{"StartTime":32772.0,"Position":480.0,"HyperDash":false},{"StartTime":32823.0,"Position":493.32843,"HyperDash":false},{"StartTime":32874.0,"Position":464.65686,"HyperDash":false},{"StartTime":32926.0,"Position":458.9525,"HyperDash":false},{"StartTime":32977.0,"Position":466.280945,"HyperDash":false},{"StartTime":33028.0,"Position":453.609375,"HyperDash":false},{"StartTime":33080.0,"Position":465.905029,"HyperDash":false},{"StartTime":33131.0,"Position":473.233459,"HyperDash":false},{"StartTime":33219.0,"Position":465.349182,"HyperDash":false}]},{"StartTime":33444.0,"Objects":[{"StartTime":33444.0,"Position":322.0,"HyperDash":false}]},{"StartTime":33668.0,"Objects":[{"StartTime":33668.0,"Position":323.0,"HyperDash":false},{"StartTime":33761.0,"Position":290.802338,"HyperDash":false},{"StartTime":33891.0,"Position":243.397018,"HyperDash":false}]},{"StartTime":34116.0,"Objects":[{"StartTime":34116.0,"Position":162.0,"HyperDash":false},{"StartTime":34209.0,"Position":126.802353,"HyperDash":false},{"StartTime":34339.0,"Position":82.39702,"HyperDash":false}]},{"StartTime":34563.0,"Objects":[{"StartTime":34563.0,"Position":31.0,"HyperDash":false},{"StartTime":34618.0,"Position":38.3338165,"HyperDash":false},{"StartTime":34674.0,"Position":12.5252123,"HyperDash":false},{"StartTime":34730.0,"Position":24.94529,"HyperDash":false},{"StartTime":34786.0,"Position":0.0,"HyperDash":false},{"StartTime":34842.0,"Position":7.506119,"HyperDash":false},{"StartTime":34898.0,"Position":0.0,"HyperDash":false},{"StartTime":34954.0,"Position":18.1432285,"HyperDash":false},{"StartTime":35010.0,"Position":21.8685,"HyperDash":false},{"StartTime":35061.0,"Position":25.771328,"HyperDash":false},{"StartTime":35113.0,"Position":7.32367039,"HyperDash":false},{"StartTime":35164.0,"Position":0.0,"HyperDash":false},{"StartTime":35216.0,"Position":12.3119221,"HyperDash":false},{"StartTime":35267.0,"Position":14.6618919,"HyperDash":false},{"StartTime":35319.0,"Position":12.9432926,"HyperDash":false},{"StartTime":35370.0,"Position":0.05334282,"HyperDash":false},{"StartTime":35458.0,"Position":31.0,"HyperDash":false}]},{"StartTime":35907.0,"Objects":[{"StartTime":35907.0,"Position":183.0,"HyperDash":false}]},{"StartTime":36354.0,"Objects":[{"StartTime":36354.0,"Position":336.0,"HyperDash":false},{"StartTime":36409.0,"Position":332.550262,"HyperDash":false},{"StartTime":36465.0,"Position":357.661743,"HyperDash":false},{"StartTime":36521.0,"Position":395.893524,"HyperDash":false},{"StartTime":36577.0,"Position":398.9578,"HyperDash":false},{"StartTime":36633.0,"Position":441.6068,"HyperDash":false},{"StartTime":36689.0,"Position":459.563568,"HyperDash":false},{"StartTime":36745.0,"Position":458.55127,"HyperDash":false},{"StartTime":36801.0,"Position":485.465271,"HyperDash":false},{"StartTime":36852.0,"Position":448.681152,"HyperDash":false},{"StartTime":36904.0,"Position":431.13797,"HyperDash":false},{"StartTime":36955.0,"Position":444.931641,"HyperDash":false},{"StartTime":37007.0,"Position":413.575562,"HyperDash":false},{"StartTime":37058.0,"Position":398.977661,"HyperDash":false},{"StartTime":37110.0,"Position":374.650665,"HyperDash":false},{"StartTime":37161.0,"Position":348.4818,"HyperDash":false},{"StartTime":37249.0,"Position":336.0,"HyperDash":false}]},{"StartTime":37474.0,"Objects":[{"StartTime":37474.0,"Position":278.0,"HyperDash":false}]},{"StartTime":37698.0,"Objects":[{"StartTime":37698.0,"Position":218.0,"HyperDash":false},{"StartTime":37791.0,"Position":186.661133,"HyperDash":false},{"StartTime":37921.0,"Position":141.792221,"HyperDash":false}]},{"StartTime":38145.0,"Objects":[{"StartTime":38145.0,"Position":55.0,"HyperDash":false},{"StartTime":38196.0,"Position":55.39138,"HyperDash":false},{"StartTime":38247.0,"Position":17.7827568,"HyperDash":false},{"StartTime":38299.0,"Position":25.8781147,"HyperDash":false},{"StartTime":38350.0,"Position":15.6772919,"HyperDash":false},{"StartTime":38401.0,"Position":46.47647,"HyperDash":false},{"StartTime":38453.0,"Position":19.3305359,"HyperDash":false},{"StartTime":38504.0,"Position":58.12971,"HyperDash":false},{"StartTime":38592.0,"Position":45.9596672,"HyperDash":false}]},{"StartTime":39041.0,"Objects":[{"StartTime":39041.0,"Position":188.0,"HyperDash":false},{"StartTime":39092.0,"Position":206.608627,"HyperDash":false},{"StartTime":39143.0,"Position":207.217239,"HyperDash":false},{"StartTime":39195.0,"Position":212.121887,"HyperDash":false},{"StartTime":39246.0,"Position":222.322708,"HyperDash":false},{"StartTime":39297.0,"Position":209.523529,"HyperDash":false},{"StartTime":39349.0,"Position":205.669464,"HyperDash":false},{"StartTime":39400.0,"Position":188.870285,"HyperDash":false},{"StartTime":39488.0,"Position":197.040329,"HyperDash":false}]},{"StartTime":39936.0,"Objects":[{"StartTime":39936.0,"Position":305.0,"HyperDash":false},{"StartTime":39987.0,"Position":326.221222,"HyperDash":false},{"StartTime":40038.0,"Position":329.12558,"HyperDash":false},{"StartTime":40090.0,"Position":351.555145,"HyperDash":false},{"StartTime":40141.0,"Position":355.340942,"HyperDash":false},{"StartTime":40192.0,"Position":390.523621,"HyperDash":false},{"StartTime":40244.0,"Position":399.5398,"HyperDash":false},{"StartTime":40295.0,"Position":402.617462,"HyperDash":false},{"StartTime":40383.0,"Position":452.46936,"HyperDash":false}]},{"StartTime":40832.0,"Objects":[{"StartTime":40832.0,"Position":486.0,"HyperDash":false},{"StartTime":40915.0,"Position":469.7972,"HyperDash":false},{"StartTime":40999.0,"Position":481.8138,"HyperDash":false},{"StartTime":41083.0,"Position":457.634216,"HyperDash":false},{"StartTime":41167.0,"Position":437.2155,"HyperDash":false},{"StartTime":41242.0,"Position":451.25293,"HyperDash":false},{"StartTime":41317.0,"Position":459.7593,"HyperDash":false},{"StartTime":41392.0,"Position":473.703156,"HyperDash":false},{"StartTime":41503.0,"Position":486.0,"HyperDash":false}]},{"StartTime":41728.0,"Objects":[{"StartTime":41728.0,"Position":415.0,"HyperDash":false},{"StartTime":41783.0,"Position":390.7221,"HyperDash":false},{"StartTime":41839.0,"Position":366.340027,"HyperDash":false},{"StartTime":41895.0,"Position":357.472321,"HyperDash":false},{"StartTime":41951.0,"Position":323.4682,"HyperDash":false},{"StartTime":42007.0,"Position":318.667938,"HyperDash":false},{"StartTime":42063.0,"Position":313.410736,"HyperDash":false},{"StartTime":42119.0,"Position":269.011841,"HyperDash":false},{"StartTime":42175.0,"Position":262.671448,"HyperDash":false},{"StartTime":42226.0,"Position":272.1187,"HyperDash":false},{"StartTime":42278.0,"Position":312.04538,"HyperDash":false},{"StartTime":42329.0,"Position":293.437958,"HyperDash":false},{"StartTime":42381.0,"Position":345.712128,"HyperDash":false},{"StartTime":42432.0,"Position":366.896667,"HyperDash":false},{"StartTime":42484.0,"Position":350.446564,"HyperDash":false},{"StartTime":42535.0,"Position":369.3803,"HyperDash":false},{"StartTime":42623.0,"Position":415.0,"HyperDash":false}]},{"StartTime":43071.0,"Objects":[{"StartTime":43071.0,"Position":353.0,"HyperDash":false}]},{"StartTime":43519.0,"Objects":[{"StartTime":43519.0,"Position":181.0,"HyperDash":false},{"StartTime":43570.0,"Position":174.8302,"HyperDash":false},{"StartTime":43621.0,"Position":156.660385,"HyperDash":false},{"StartTime":43673.0,"Position":141.134308,"HyperDash":false},{"StartTime":43724.0,"Position":99.9645,"HyperDash":false},{"StartTime":43775.0,"Position":75.79469,"HyperDash":false},{"StartTime":43827.0,"Position":67.26861,"HyperDash":false},{"StartTime":43878.0,"Position":66.0988159,"HyperDash":false},{"StartTime":43966.0,"Position":21.7469788,"HyperDash":false}]},{"StartTime":44414.0,"Objects":[{"StartTime":44414.0,"Position":21.0,"HyperDash":false},{"StartTime":44465.0,"Position":38.1698074,"HyperDash":false},{"StartTime":44516.0,"Position":57.3396149,"HyperDash":false},{"StartTime":44568.0,"Position":68.86569,"HyperDash":false},{"StartTime":44619.0,"Position":110.0355,"HyperDash":false},{"StartTime":44670.0,"Position":121.205307,"HyperDash":false},{"StartTime":44722.0,"Position":123.731384,"HyperDash":false},{"StartTime":44773.0,"Position":164.901184,"HyperDash":false},{"StartTime":44861.0,"Position":180.253021,"HyperDash":false}]},{"StartTime":45086.0,"Objects":[{"StartTime":45086.0,"Position":328.0,"HyperDash":false}]},{"StartTime":45310.0,"Objects":[{"StartTime":45310.0,"Position":329.0,"HyperDash":false},{"StartTime":45365.0,"Position":332.211578,"HyperDash":false},{"StartTime":45421.0,"Position":367.175873,"HyperDash":false},{"StartTime":45477.0,"Position":371.022522,"HyperDash":false},{"StartTime":45533.0,"Position":395.233124,"HyperDash":false},{"StartTime":45589.0,"Position":413.246216,"HyperDash":false},{"StartTime":45645.0,"Position":433.6284,"HyperDash":false},{"StartTime":45701.0,"Position":457.874817,"HyperDash":false},{"StartTime":45757.0,"Position":467.659363,"HyperDash":false},{"StartTime":45813.0,"Position":493.610321,"HyperDash":false},{"StartTime":45869.0,"Position":491.524567,"HyperDash":false},{"StartTime":45925.0,"Position":475.219482,"HyperDash":false},{"StartTime":45981.0,"Position":499.624725,"HyperDash":false},{"StartTime":46037.0,"Position":471.774384,"HyperDash":false},{"StartTime":46093.0,"Position":462.734833,"HyperDash":false},{"StartTime":46149.0,"Position":450.75238,"HyperDash":false},{"StartTime":46205.0,"Position":451.0282,"HyperDash":false},{"StartTime":46256.0,"Position":439.419067,"HyperDash":false},{"StartTime":46308.0,"Position":413.8077,"HyperDash":false},{"StartTime":46359.0,"Position":423.184723,"HyperDash":false},{"StartTime":46411.0,"Position":393.298828,"HyperDash":false},{"StartTime":46462.0,"Position":384.2213,"HyperDash":false},{"StartTime":46514.0,"Position":355.668274,"HyperDash":false},{"StartTime":46565.0,"Position":316.77417,"HyperDash":false},{"StartTime":46653.0,"Position":303.770752,"HyperDash":false}]},{"StartTime":47101.0,"Objects":[{"StartTime":47101.0,"Position":257.0,"HyperDash":false},{"StartTime":47184.0,"Position":212.304276,"HyperDash":false},{"StartTime":47268.0,"Position":213.274872,"HyperDash":false},{"StartTime":47352.0,"Position":179.2254,"HyperDash":false},{"StartTime":47436.0,"Position":142.9541,"HyperDash":false},{"StartTime":47511.0,"Position":150.761337,"HyperDash":false},{"StartTime":47586.0,"Position":198.741776,"HyperDash":false},{"StartTime":47661.0,"Position":220.961136,"HyperDash":false},{"StartTime":47772.0,"Position":257.0,"HyperDash":false}]},{"StartTime":47996.0,"Objects":[{"StartTime":47996.0,"Position":336.0,"HyperDash":false}]},{"StartTime":48220.0,"Objects":[{"StartTime":48220.0,"Position":417.0,"HyperDash":false},{"StartTime":48275.0,"Position":444.6565,"HyperDash":false},{"StartTime":48331.0,"Position":441.67038,"HyperDash":false},{"StartTime":48387.0,"Position":472.684265,"HyperDash":false},{"StartTime":48443.0,"Position":496.876831,"HyperDash":false},{"StartTime":48537.0,"Position":462.460815,"HyperDash":false},{"StartTime":48667.0,"Position":417.0,"HyperDash":false}]},{"StartTime":48892.0,"Objects":[{"StartTime":48892.0,"Position":379.0,"HyperDash":false},{"StartTime":48985.0,"Position":356.006134,"HyperDash":false},{"StartTime":49115.0,"Position":302.860016,"HyperDash":false}]},{"StartTime":49339.0,"Objects":[{"StartTime":49339.0,"Position":218.0,"HyperDash":false},{"StartTime":49422.0,"Position":228.320267,"HyperDash":false},{"StartTime":49506.0,"Position":263.682922,"HyperDash":false},{"StartTime":49590.0,"Position":263.529572,"HyperDash":false},{"StartTime":49674.0,"Position":266.142761,"HyperDash":false},{"StartTime":49749.0,"Position":265.0218,"HyperDash":false},{"StartTime":49824.0,"Position":252.383118,"HyperDash":false},{"StartTime":49899.0,"Position":244.59021,"HyperDash":false},{"StartTime":50010.0,"Position":218.0,"HyperDash":false}]},{"StartTime":50235.0,"Objects":[{"StartTime":50235.0,"Position":142.0,"HyperDash":false},{"StartTime":50328.0,"Position":154.293335,"HyperDash":false},{"StartTime":50458.0,"Position":135.509842,"HyperDash":false}]},{"StartTime":50683.0,"Objects":[{"StartTime":50683.0,"Position":75.0,"HyperDash":false},{"StartTime":50734.0,"Position":106.62645,"HyperDash":false},{"StartTime":50785.0,"Position":89.7852249,"HyperDash":false},{"StartTime":50837.0,"Position":105.419983,"HyperDash":false},{"StartTime":50888.0,"Position":153.41716,"HyperDash":false},{"StartTime":50939.0,"Position":166.651077,"HyperDash":false},{"StartTime":50991.0,"Position":157.985535,"HyperDash":false},{"StartTime":51042.0,"Position":194.261,"HyperDash":false},{"StartTime":51130.0,"Position":222.110641,"HyperDash":false}]},{"StartTime":51354.0,"Objects":[{"StartTime":51354.0,"Position":295.0,"HyperDash":false},{"StartTime":51405.0,"Position":294.626465,"HyperDash":false},{"StartTime":51456.0,"Position":306.785217,"HyperDash":false},{"StartTime":51508.0,"Position":347.419983,"HyperDash":false},{"StartTime":51559.0,"Position":363.417175,"HyperDash":false},{"StartTime":51610.0,"Position":396.6511,"HyperDash":false},{"StartTime":51662.0,"Position":408.985535,"HyperDash":false},{"StartTime":51713.0,"Position":417.261,"HyperDash":false},{"StartTime":51801.0,"Position":442.110657,"HyperDash":false}]},{"StartTime":52026.0,"Objects":[{"StartTime":52026.0,"Position":498.0,"HyperDash":false}]},{"StartTime":52474.0,"Objects":[{"StartTime":52474.0,"Position":404.0,"HyperDash":false},{"StartTime":52567.0,"Position":378.721558,"HyperDash":false},{"StartTime":52697.0,"Position":324.2033,"HyperDash":false}]},{"StartTime":52922.0,"Objects":[{"StartTime":52922.0,"Position":251.0,"HyperDash":false},{"StartTime":53005.0,"Position":216.759811,"HyperDash":false},{"StartTime":53089.0,"Position":195.34903,"HyperDash":false},{"StartTime":53173.0,"Position":148.36676,"HyperDash":false},{"StartTime":53257.0,"Position":135.014374,"HyperDash":false},{"StartTime":53332.0,"Position":141.829834,"HyperDash":false},{"StartTime":53407.0,"Position":167.570328,"HyperDash":false},{"StartTime":53482.0,"Position":217.1065,"HyperDash":false},{"StartTime":53593.0,"Position":251.0,"HyperDash":false}]},{"StartTime":53817.0,"Objects":[{"StartTime":53817.0,"Position":298.0,"HyperDash":false},{"StartTime":53910.0,"Position":296.8232,"HyperDash":false},{"StartTime":54040.0,"Position":295.178223,"HyperDash":false}]},{"StartTime":54265.0,"Objects":[{"StartTime":54265.0,"Position":249.0,"HyperDash":false},{"StartTime":54316.0,"Position":240.835571,"HyperDash":false},{"StartTime":54367.0,"Position":194.671127,"HyperDash":false},{"StartTime":54419.0,"Position":191.150528,"HyperDash":false},{"StartTime":54470.0,"Position":170.708618,"HyperDash":false},{"StartTime":54521.0,"Position":161.552643,"HyperDash":false},{"StartTime":54573.0,"Position":158.896118,"HyperDash":false},{"StartTime":54624.0,"Position":134.782074,"HyperDash":false},{"StartTime":54712.0,"Position":92.52641,"HyperDash":false}]},{"StartTime":55160.0,"Objects":[{"StartTime":55160.0,"Position":8.0,"HyperDash":false},{"StartTime":55253.0,"Position":34.09524,"HyperDash":false},{"StartTime":55383.0,"Position":85.37553,"HyperDash":false}]},{"StartTime":55608.0,"Objects":[{"StartTime":55608.0,"Position":165.0,"HyperDash":false},{"StartTime":55701.0,"Position":183.095245,"HyperDash":false},{"StartTime":55831.0,"Position":242.375519,"HyperDash":false}]},{"StartTime":56056.0,"Objects":[{"StartTime":56056.0,"Position":329.0,"HyperDash":false},{"StartTime":56107.0,"Position":349.227417,"HyperDash":false},{"StartTime":56158.0,"Position":353.454865,"HyperDash":false},{"StartTime":56210.0,"Position":358.902435,"HyperDash":false},{"StartTime":56261.0,"Position":360.282623,"HyperDash":false},{"StartTime":56312.0,"Position":376.968658,"HyperDash":false},{"StartTime":56364.0,"Position":354.628937,"HyperDash":false},{"StartTime":56415.0,"Position":382.314972,"HyperDash":false},{"StartTime":56503.0,"Position":361.04776,"HyperDash":false}]},{"StartTime":56951.0,"Objects":[{"StartTime":56951.0,"Position":189.0,"HyperDash":false},{"StartTime":57044.0,"Position":142.707138,"HyperDash":false},{"StartTime":57174.0,"Position":111.099754,"HyperDash":false}]},{"StartTime":57399.0,"Objects":[{"StartTime":57399.0,"Position":44.0,"HyperDash":false},{"StartTime":57492.0,"Position":42.46508,"HyperDash":false},{"StartTime":57622.0,"Position":57.39981,"HyperDash":false}]},{"StartTime":57847.0,"Objects":[{"StartTime":57847.0,"Position":97.0,"HyperDash":false},{"StartTime":57898.0,"Position":128.653931,"HyperDash":false},{"StartTime":57949.0,"Position":137.733063,"HyperDash":false},{"StartTime":58001.0,"Position":141.3299,"HyperDash":false},{"StartTime":58052.0,"Position":175.3739,"HyperDash":false},{"StartTime":58103.0,"Position":188.865829,"HyperDash":false},{"StartTime":58155.0,"Position":184.813812,"HyperDash":false},{"StartTime":58206.0,"Position":222.592514,"HyperDash":false},{"StartTime":58294.0,"Position":246.818512,"HyperDash":false}]},{"StartTime":58742.0,"Objects":[{"StartTime":58742.0,"Position":396.0,"HyperDash":false},{"StartTime":58835.0,"Position":405.3873,"HyperDash":false},{"StartTime":58965.0,"Position":406.520081,"HyperDash":false}]},{"StartTime":59190.0,"Objects":[{"StartTime":59190.0,"Position":473.0,"HyperDash":false},{"StartTime":59283.0,"Position":484.6127,"HyperDash":false},{"StartTime":59413.0,"Position":462.479919,"HyperDash":false}]},{"StartTime":59638.0,"Objects":[{"StartTime":59638.0,"Position":450.0,"HyperDash":false},{"StartTime":59689.0,"Position":425.546051,"HyperDash":false},{"StartTime":59740.0,"Position":404.6286,"HyperDash":false},{"StartTime":59792.0,"Position":403.0906,"HyperDash":false},{"StartTime":59843.0,"Position":359.851471,"HyperDash":false},{"StartTime":59894.0,"Position":346.7696,"HyperDash":false},{"StartTime":59946.0,"Position":349.71637,"HyperDash":false},{"StartTime":59997.0,"Position":332.582275,"HyperDash":false},{"StartTime":60085.0,"Position":296.934937,"HyperDash":false}]},{"StartTime":60310.0,"Objects":[{"StartTime":60310.0,"Position":137.0,"HyperDash":false}]},{"StartTime":60534.0,"Objects":[{"StartTime":60534.0,"Position":127.0,"HyperDash":false},{"StartTime":60627.0,"Position":133.780716,"HyperDash":false},{"StartTime":60757.0,"Position":121.678482,"HyperDash":false}]},{"StartTime":60981.0,"Objects":[{"StartTime":60981.0,"Position":111.0,"HyperDash":false}]},{"StartTime":61429.0,"Objects":[{"StartTime":61429.0,"Position":110.0,"HyperDash":false},{"StartTime":61512.0,"Position":137.803375,"HyperDash":false},{"StartTime":61596.0,"Position":149.4081,"HyperDash":false},{"StartTime":61680.0,"Position":212.379776,"HyperDash":false},{"StartTime":61764.0,"Position":226.716034,"HyperDash":false},{"StartTime":61839.0,"Position":203.918869,"HyperDash":false},{"StartTime":61914.0,"Position":175.198227,"HyperDash":false},{"StartTime":61989.0,"Position":145.558578,"HyperDash":false},{"StartTime":62100.0,"Position":110.0,"HyperDash":false}]},{"StartTime":62325.0,"Objects":[{"StartTime":62325.0,"Position":22.0,"HyperDash":false},{"StartTime":62418.0,"Position":37.5815735,"HyperDash":false},{"StartTime":62548.0,"Position":18.5988235,"HyperDash":false}]},{"StartTime":62772.0,"Objects":[{"StartTime":62772.0,"Position":2.0,"HyperDash":false}]},{"StartTime":62996.0,"Objects":[{"StartTime":62996.0,"Position":76.0,"HyperDash":false}]},{"StartTime":63220.0,"Objects":[{"StartTime":63220.0,"Position":154.0,"HyperDash":false},{"StartTime":63313.0,"Position":199.111572,"HyperDash":false},{"StartTime":63443.0,"Position":232.57634,"HyperDash":false}]},{"StartTime":63668.0,"Objects":[{"StartTime":63668.0,"Position":307.0,"HyperDash":false},{"StartTime":63751.0,"Position":314.019135,"HyperDash":false},{"StartTime":63835.0,"Position":318.026459,"HyperDash":false},{"StartTime":63919.0,"Position":289.0338,"HyperDash":false},{"StartTime":64003.0,"Position":303.035217,"HyperDash":false},{"StartTime":64078.0,"Position":308.915619,"HyperDash":false},{"StartTime":64153.0,"Position":315.801941,"HyperDash":false},{"StartTime":64228.0,"Position":288.688263,"HyperDash":false},{"StartTime":64339.0,"Position":307.0,"HyperDash":false}]},{"StartTime":64563.0,"Objects":[{"StartTime":64563.0,"Position":311.0,"HyperDash":false},{"StartTime":64656.0,"Position":362.111572,"HyperDash":false},{"StartTime":64786.0,"Position":389.576324,"HyperDash":false}]},{"StartTime":65011.0,"Objects":[{"StartTime":65011.0,"Position":435.0,"HyperDash":false},{"StartTime":65062.0,"Position":440.232056,"HyperDash":false},{"StartTime":65113.0,"Position":422.4641,"HyperDash":false},{"StartTime":65165.0,"Position":444.6811,"HyperDash":false},{"StartTime":65216.0,"Position":423.913147,"HyperDash":false},{"StartTime":65267.0,"Position":441.145172,"HyperDash":false},{"StartTime":65319.0,"Position":427.362183,"HyperDash":false},{"StartTime":65370.0,"Position":412.594238,"HyperDash":false},{"StartTime":65458.0,"Position":428.269135,"HyperDash":false}]},{"StartTime":65683.0,"Objects":[{"StartTime":65683.0,"Position":350.0,"HyperDash":false},{"StartTime":65734.0,"Position":314.27713,"HyperDash":false},{"StartTime":65785.0,"Position":300.566528,"HyperDash":false},{"StartTime":65837.0,"Position":315.7566,"HyperDash":false},{"StartTime":65888.0,"Position":262.77713,"HyperDash":false},{"StartTime":65939.0,"Position":282.5542,"HyperDash":false},{"StartTime":65991.0,"Position":226.007614,"HyperDash":false},{"StartTime":66042.0,"Position":227.1106,"HyperDash":false},{"StartTime":66130.0,"Position":197.703339,"HyperDash":false}]},{"StartTime":66354.0,"Objects":[{"StartTime":66354.0,"Position":36.0,"HyperDash":false}]},{"StartTime":66802.0,"Objects":[{"StartTime":66802.0,"Position":44.0,"HyperDash":false},{"StartTime":66895.0,"Position":34.5778,"HyperDash":false},{"StartTime":67025.0,"Position":49.4306221,"HyperDash":false}]},{"StartTime":67250.0,"Objects":[{"StartTime":67250.0,"Position":131.0,"HyperDash":false},{"StartTime":67333.0,"Position":87.4688339,"HyperDash":false},{"StartTime":67417.0,"Position":59.51071,"HyperDash":false},{"StartTime":67501.0,"Position":67.3197,"HyperDash":false},{"StartTime":67585.0,"Position":34.3176,"HyperDash":false},{"StartTime":67660.0,"Position":32.04751,"HyperDash":false},{"StartTime":67735.0,"Position":85.74523,"HyperDash":false},{"StartTime":67810.0,"Position":81.77102,"HyperDash":false},{"StartTime":67921.0,"Position":131.0,"HyperDash":false}]},{"StartTime":68145.0,"Objects":[{"StartTime":68145.0,"Position":206.0,"HyperDash":false},{"StartTime":68238.0,"Position":241.281784,"HyperDash":false},{"StartTime":68368.0,"Position":285.804718,"HyperDash":false}]},{"StartTime":68593.0,"Objects":[{"StartTime":68593.0,"Position":354.0,"HyperDash":false},{"StartTime":68644.0,"Position":371.9797,"HyperDash":false},{"StartTime":68695.0,"Position":374.9594,"HyperDash":false},{"StartTime":68747.0,"Position":363.977966,"HyperDash":false},{"StartTime":68798.0,"Position":348.931732,"HyperDash":false},{"StartTime":68849.0,"Position":335.783875,"HyperDash":false},{"StartTime":68901.0,"Position":349.448822,"HyperDash":false},{"StartTime":68952.0,"Position":338.5818,"HyperDash":false},{"StartTime":69040.0,"Position":346.262146,"HyperDash":false}]},{"StartTime":69489.0,"Objects":[{"StartTime":69489.0,"Position":479.0,"HyperDash":false},{"StartTime":69582.0,"Position":463.7517,"HyperDash":false},{"StartTime":69712.0,"Position":471.2111,"HyperDash":false}]},{"StartTime":69936.0,"Objects":[{"StartTime":69936.0,"Position":395.0,"HyperDash":false},{"StartTime":70029.0,"Position":351.9091,"HyperDash":false},{"StartTime":70159.0,"Position":317.104523,"HyperDash":false}]},{"StartTime":70384.0,"Objects":[{"StartTime":70384.0,"Position":239.0,"HyperDash":false},{"StartTime":70435.0,"Position":235.932266,"HyperDash":false},{"StartTime":70486.0,"Position":206.714127,"HyperDash":false},{"StartTime":70538.0,"Position":191.116684,"HyperDash":false},{"StartTime":70589.0,"Position":179.00943,"HyperDash":false},{"StartTime":70640.0,"Position":139.19429,"HyperDash":false},{"StartTime":70692.0,"Position":141.486526,"HyperDash":false},{"StartTime":70743.0,"Position":106.327019,"HyperDash":false},{"StartTime":70831.0,"Position":87.14302,"HyperDash":false}]},{"StartTime":71280.0,"Objects":[{"StartTime":71280.0,"Position":11.0,"HyperDash":false},{"StartTime":71373.0,"Position":37.1006241,"HyperDash":false},{"StartTime":71503.0,"Position":90.3703156,"HyperDash":false}]},{"StartTime":71728.0,"Objects":[{"StartTime":71728.0,"Position":152.0,"HyperDash":false},{"StartTime":71821.0,"Position":193.100616,"HyperDash":false},{"StartTime":71951.0,"Position":231.370316,"HyperDash":false}]},{"StartTime":72175.0,"Objects":[{"StartTime":72175.0,"Position":271.0,"HyperDash":false},{"StartTime":72226.0,"Position":263.6878,"HyperDash":false},{"StartTime":72277.0,"Position":283.464,"HyperDash":false},{"StartTime":72329.0,"Position":257.4186,"HyperDash":false},{"StartTime":72380.0,"Position":278.35257,"HyperDash":false},{"StartTime":72431.0,"Position":304.125275,"HyperDash":false},{"StartTime":72483.0,"Position":296.814362,"HyperDash":false},{"StartTime":72534.0,"Position":316.538055,"HyperDash":false},{"StartTime":72622.0,"Position":338.266479,"HyperDash":false}]},{"StartTime":72847.0,"Objects":[{"StartTime":72847.0,"Position":505.0,"HyperDash":false}]},{"StartTime":73071.0,"Objects":[{"StartTime":73071.0,"Position":489.0,"HyperDash":false},{"StartTime":73164.0,"Position":469.365631,"HyperDash":false},{"StartTime":73294.0,"Position":482.683167,"HyperDash":false}]},{"StartTime":73519.0,"Objects":[{"StartTime":73519.0,"Position":408.0,"HyperDash":false},{"StartTime":73612.0,"Position":403.634369,"HyperDash":false},{"StartTime":73742.0,"Position":414.316833,"HyperDash":false}]},{"StartTime":73966.0,"Objects":[{"StartTime":73966.0,"Position":482.0,"HyperDash":false},{"StartTime":74017.0,"Position":472.133667,"HyperDash":false},{"StartTime":74068.0,"Position":425.9474,"HyperDash":false},{"StartTime":74120.0,"Position":412.437225,"HyperDash":false},{"StartTime":74171.0,"Position":412.766479,"HyperDash":false},{"StartTime":74222.0,"Position":404.367828,"HyperDash":false},{"StartTime":74274.0,"Position":384.1732,"HyperDash":false},{"StartTime":74325.0,"Position":361.954468,"HyperDash":false},{"StartTime":74413.0,"Position":325.429016,"HyperDash":false}]},{"StartTime":74862.0,"Objects":[{"StartTime":74862.0,"Position":157.0,"HyperDash":false},{"StartTime":74917.0,"Position":132.397827,"HyperDash":false},{"StartTime":74973.0,"Position":108.439255,"HyperDash":false},{"StartTime":75029.0,"Position":111.480682,"HyperDash":false},{"StartTime":75085.0,"Position":77.3439,"HyperDash":false},{"StartTime":75179.0,"Position":113.667587,"HyperDash":false},{"StartTime":75309.0,"Position":157.0,"HyperDash":false}]},{"StartTime":75534.0,"Objects":[{"StartTime":75534.0,"Position":381.0,"HyperDash":false}]},{"StartTime":75757.0,"Objects":[{"StartTime":75757.0,"Position":288.0,"HyperDash":false},{"StartTime":75812.0,"Position":322.1354,"HyperDash":false},{"StartTime":75868.0,"Position":327.117,"HyperDash":false},{"StartTime":75924.0,"Position":334.290924,"HyperDash":false},{"StartTime":75980.0,"Position":378.117737,"HyperDash":false},{"StartTime":76036.0,"Position":383.1031,"HyperDash":false},{"StartTime":76092.0,"Position":388.735718,"HyperDash":false},{"StartTime":76148.0,"Position":435.4911,"HyperDash":false},{"StartTime":76204.0,"Position":437.060059,"HyperDash":false},{"StartTime":76255.0,"Position":440.4263,"HyperDash":false},{"StartTime":76307.0,"Position":393.159027,"HyperDash":false},{"StartTime":76358.0,"Position":398.4255,"HyperDash":false},{"StartTime":76410.0,"Position":353.908081,"HyperDash":false},{"StartTime":76461.0,"Position":365.736755,"HyperDash":false},{"StartTime":76513.0,"Position":343.5878,"HyperDash":false},{"StartTime":76564.0,"Position":302.556519,"HyperDash":false},{"StartTime":76652.0,"Position":288.0,"HyperDash":false}]},{"StartTime":76877.0,"Objects":[{"StartTime":76877.0,"Position":225.0,"HyperDash":false},{"StartTime":76932.0,"Position":237.844727,"HyperDash":false},{"StartTime":76988.0,"Position":244.722977,"HyperDash":false},{"StartTime":77044.0,"Position":249.601242,"HyperDash":false},{"StartTime":77100.0,"Position":232.496277,"HyperDash":false},{"StartTime":77194.0,"Position":239.360245,"HyperDash":false},{"StartTime":77324.0,"Position":225.0,"HyperDash":false}]},{"StartTime":77548.0,"Objects":[{"StartTime":77548.0,"Position":172.0,"HyperDash":false},{"StartTime":77599.0,"Position":161.128448,"HyperDash":false},{"StartTime":77650.0,"Position":135.2569,"HyperDash":false},{"StartTime":77702.0,"Position":147.846878,"HyperDash":false},{"StartTime":77753.0,"Position":143.823837,"HyperDash":false},{"StartTime":77804.0,"Position":137.800812,"HyperDash":false},{"StartTime":77856.0,"Position":146.836151,"HyperDash":false},{"StartTime":77907.0,"Position":164.81311,"HyperDash":false},{"StartTime":77995.0,"Position":162.949844,"HyperDash":false}]},{"StartTime":78444.0,"Objects":[{"StartTime":78444.0,"Position":9.0,"HyperDash":false},{"StartTime":78495.0,"Position":32.8715477,"HyperDash":false},{"StartTime":78546.0,"Position":21.7430954,"HyperDash":false},{"StartTime":78598.0,"Position":50.15313,"HyperDash":false},{"StartTime":78649.0,"Position":21.1761589,"HyperDash":false},{"StartTime":78700.0,"Position":17.19919,"HyperDash":false},{"StartTime":78752.0,"Position":41.16385,"HyperDash":false},{"StartTime":78803.0,"Position":32.186882,"HyperDash":false},{"StartTime":78891.0,"Position":18.05015,"HyperDash":false}]},{"StartTime":79339.0,"Objects":[{"StartTime":79339.0,"Position":186.0,"HyperDash":false},{"StartTime":79390.0,"Position":199.306229,"HyperDash":false},{"StartTime":79441.0,"Position":219.682114,"HyperDash":false},{"StartTime":79493.0,"Position":224.118561,"HyperDash":false},{"StartTime":79544.0,"Position":227.689743,"HyperDash":false},{"StartTime":79595.0,"Position":241.25592,"HyperDash":false},{"StartTime":79647.0,"Position":265.72113,"HyperDash":false},{"StartTime":79698.0,"Position":285.940369,"HyperDash":false},{"StartTime":79786.0,"Position":327.296021,"HyperDash":false}]},{"StartTime":80011.0,"Objects":[{"StartTime":80011.0,"Position":461.0,"HyperDash":false}]},{"StartTime":80235.0,"Objects":[{"StartTime":80235.0,"Position":482.0,"HyperDash":false},{"StartTime":80328.0,"Position":471.961243,"HyperDash":false},{"StartTime":80458.0,"Position":472.315643,"HyperDash":false}]},{"StartTime":80683.0,"Objects":[{"StartTime":80683.0,"Position":392.0,"HyperDash":false},{"StartTime":80776.0,"Position":394.038757,"HyperDash":false},{"StartTime":80906.0,"Position":401.684357,"HyperDash":false}]},{"StartTime":81131.0,"Objects":[{"StartTime":81131.0,"Position":474.0,"HyperDash":false},{"StartTime":81182.0,"Position":450.511719,"HyperDash":false},{"StartTime":81233.0,"Position":460.8919,"HyperDash":false},{"StartTime":81285.0,"Position":418.0802,"HyperDash":false},{"StartTime":81336.0,"Position":403.0688,"HyperDash":false},{"StartTime":81387.0,"Position":402.833557,"HyperDash":false},{"StartTime":81439.0,"Position":375.354675,"HyperDash":false},{"StartTime":81490.0,"Position":367.6674,"HyperDash":false},{"StartTime":81578.0,"Position":323.0545,"HyperDash":false}]},{"StartTime":82026.0,"Objects":[{"StartTime":82026.0,"Position":148.0,"HyperDash":false},{"StartTime":82077.0,"Position":153.363663,"HyperDash":false},{"StartTime":82128.0,"Position":124.853226,"HyperDash":false},{"StartTime":82180.0,"Position":123.51664,"HyperDash":false},{"StartTime":82231.0,"Position":135.651062,"HyperDash":false},{"StartTime":82282.0,"Position":107.183319,"HyperDash":false},{"StartTime":82334.0,"Position":111.284645,"HyperDash":false},{"StartTime":82385.0,"Position":125.730865,"HyperDash":false},{"StartTime":82473.0,"Position":141.718521,"HyperDash":false}]},{"StartTime":82922.0,"Objects":[{"StartTime":82922.0,"Position":287.0,"HyperDash":false},{"StartTime":82977.0,"Position":306.298553,"HyperDash":false},{"StartTime":83033.0,"Position":321.504669,"HyperDash":false},{"StartTime":83089.0,"Position":339.161163,"HyperDash":false},{"StartTime":83145.0,"Position":367.092316,"HyperDash":false},{"StartTime":83201.0,"Position":394.0961,"HyperDash":false},{"StartTime":83257.0,"Position":406.969055,"HyperDash":false},{"StartTime":83313.0,"Position":412.5311,"HyperDash":false},{"StartTime":83369.0,"Position":442.643555,"HyperDash":false},{"StartTime":83425.0,"Position":445.5296,"HyperDash":false},{"StartTime":83481.0,"Position":420.6327,"HyperDash":false},{"StartTime":83537.0,"Position":415.785919,"HyperDash":false},{"StartTime":83593.0,"Position":369.41394,"HyperDash":false},{"StartTime":83649.0,"Position":368.030121,"HyperDash":false},{"StartTime":83705.0,"Position":376.311218,"HyperDash":false},{"StartTime":83761.0,"Position":349.831451,"HyperDash":false},{"StartTime":83817.0,"Position":357.0095,"HyperDash":false},{"StartTime":83868.0,"Position":377.510834,"HyperDash":false},{"StartTime":83920.0,"Position":394.548126,"HyperDash":false},{"StartTime":83971.0,"Position":406.9447,"HyperDash":false},{"StartTime":84023.0,"Position":383.802063,"HyperDash":false},{"StartTime":84074.0,"Position":391.380249,"HyperDash":false},{"StartTime":84126.0,"Position":407.693,"HyperDash":false},{"StartTime":84177.0,"Position":408.468567,"HyperDash":false},{"StartTime":84265.0,"Position":418.7769,"HyperDash":false}]},{"StartTime":84713.0,"Objects":[{"StartTime":84713.0,"Position":242.0,"HyperDash":false},{"StartTime":84796.0,"Position":214.531952,"HyperDash":false},{"StartTime":84880.0,"Position":201.708862,"HyperDash":false},{"StartTime":84964.0,"Position":158.885773,"HyperDash":false},{"StartTime":85048.0,"Position":122.885155,"HyperDash":false},{"StartTime":85123.0,"Position":159.3354,"HyperDash":false},{"StartTime":85198.0,"Position":171.963165,"HyperDash":false},{"StartTime":85273.0,"Position":220.590912,"HyperDash":false},{"StartTime":85384.0,"Position":242.0,"HyperDash":false}]},{"StartTime":85608.0,"Objects":[{"StartTime":85608.0,"Position":277.0,"HyperDash":false},{"StartTime":85659.0,"Position":273.8022,"HyperDash":false},{"StartTime":85710.0,"Position":272.42923,"HyperDash":false},{"StartTime":85762.0,"Position":256.8426,"HyperDash":false},{"StartTime":85813.0,"Position":245.819153,"HyperDash":false},{"StartTime":85864.0,"Position":210.419479,"HyperDash":false},{"StartTime":85916.0,"Position":177.694885,"HyperDash":false},{"StartTime":85967.0,"Position":180.692947,"HyperDash":false},{"StartTime":86055.0,"Position":144.3092,"HyperDash":false}]},{"StartTime":86504.0,"Objects":[{"StartTime":86504.0,"Position":11.0,"HyperDash":false}]},{"StartTime":93668.0,"Objects":[{"StartTime":93668.0,"Position":321.0,"HyperDash":false},{"StartTime":93723.0,"Position":305.388947,"HyperDash":false},{"StartTime":93779.0,"Position":291.399963,"HyperDash":false},{"StartTime":93835.0,"Position":280.52063,"HyperDash":false},{"StartTime":93891.0,"Position":248.606445,"HyperDash":false},{"StartTime":93947.0,"Position":235.53479,"HyperDash":false},{"StartTime":94003.0,"Position":224.107117,"HyperDash":false},{"StartTime":94059.0,"Position":224.84407,"HyperDash":false},{"StartTime":94115.0,"Position":200.017365,"HyperDash":false},{"StartTime":94171.0,"Position":199.067291,"HyperDash":false},{"StartTime":94227.0,"Position":212.384537,"HyperDash":false},{"StartTime":94283.0,"Position":199.112579,"HyperDash":false},{"StartTime":94339.0,"Position":222.5897,"HyperDash":false},{"StartTime":94395.0,"Position":253.0729,"HyperDash":false},{"StartTime":94451.0,"Position":253.947144,"HyperDash":false},{"StartTime":94507.0,"Position":271.304932,"HyperDash":false},{"StartTime":94563.0,"Position":305.412964,"HyperDash":false},{"StartTime":94619.0,"Position":307.6401,"HyperDash":false},{"StartTime":94675.0,"Position":267.302582,"HyperDash":false},{"StartTime":94731.0,"Position":251.416916,"HyperDash":false},{"StartTime":94787.0,"Position":222.898773,"HyperDash":false},{"StartTime":94843.0,"Position":211.3582,"HyperDash":false},{"StartTime":94899.0,"Position":213.529022,"HyperDash":false},{"StartTime":94955.0,"Position":210.1259,"HyperDash":false},{"StartTime":95011.0,"Position":199.942,"HyperDash":false},{"StartTime":95062.0,"Position":191.884583,"HyperDash":false},{"StartTime":95114.0,"Position":201.545059,"HyperDash":false},{"StartTime":95165.0,"Position":236.775665,"HyperDash":false},{"StartTime":95217.0,"Position":265.954834,"HyperDash":false},{"StartTime":95268.0,"Position":272.007324,"HyperDash":false},{"StartTime":95320.0,"Position":299.217743,"HyperDash":false},{"StartTime":95371.0,"Position":310.421265,"HyperDash":false},{"StartTime":95459.0,"Position":321.0,"HyperDash":false}]},{"StartTime":97250.0,"Objects":[{"StartTime":97250.0,"Position":321.0,"HyperDash":false},{"StartTime":97305.0,"Position":349.148315,"HyperDash":false},{"StartTime":97361.0,"Position":367.604675,"HyperDash":false},{"StartTime":97417.0,"Position":379.5581,"HyperDash":false},{"StartTime":97473.0,"Position":395.380951,"HyperDash":false},{"StartTime":97529.0,"Position":430.504242,"HyperDash":false},{"StartTime":97585.0,"Position":442.613251,"HyperDash":false},{"StartTime":97641.0,"Position":458.59317,"HyperDash":false},{"StartTime":97697.0,"Position":467.732544,"HyperDash":false},{"StartTime":97753.0,"Position":444.03418,"HyperDash":false},{"StartTime":97809.0,"Position":450.705536,"HyperDash":false},{"StartTime":97865.0,"Position":456.036621,"HyperDash":false},{"StartTime":97921.0,"Position":460.436,"HyperDash":false},{"StartTime":97977.0,"Position":445.266327,"HyperDash":false},{"StartTime":98033.0,"Position":456.866272,"HyperDash":false},{"StartTime":98089.0,"Position":449.4119,"HyperDash":false},{"StartTime":98145.0,"Position":462.917175,"HyperDash":false},{"StartTime":98201.0,"Position":468.532471,"HyperDash":false},{"StartTime":98257.0,"Position":451.935547,"HyperDash":false},{"StartTime":98313.0,"Position":433.2847,"HyperDash":false},{"StartTime":98369.0,"Position":426.406769,"HyperDash":false},{"StartTime":98425.0,"Position":449.975067,"HyperDash":false},{"StartTime":98481.0,"Position":460.606018,"HyperDash":false},{"StartTime":98537.0,"Position":447.910065,"HyperDash":false},{"StartTime":98593.0,"Position":467.586945,"HyperDash":false},{"StartTime":98644.0,"Position":441.353149,"HyperDash":false},{"StartTime":98696.0,"Position":439.723267,"HyperDash":false},{"StartTime":98747.0,"Position":415.4601,"HyperDash":false},{"StartTime":98799.0,"Position":412.9643,"HyperDash":false},{"StartTime":98850.0,"Position":398.1049,"HyperDash":false},{"StartTime":98902.0,"Position":376.557465,"HyperDash":false},{"StartTime":98953.0,"Position":359.5229,"HyperDash":false},{"StartTime":99041.0,"Position":321.0,"HyperDash":false}]},{"StartTime":100832.0,"Objects":[{"StartTime":100832.0,"Position":321.0,"HyperDash":false},{"StartTime":100887.0,"Position":321.469482,"HyperDash":false},{"StartTime":100943.0,"Position":295.742432,"HyperDash":false},{"StartTime":100999.0,"Position":267.1522,"HyperDash":false},{"StartTime":101055.0,"Position":261.835083,"HyperDash":false},{"StartTime":101111.0,"Position":216.475037,"HyperDash":false},{"StartTime":101167.0,"Position":227.328217,"HyperDash":false},{"StartTime":101223.0,"Position":189.1814,"HyperDash":false},{"StartTime":101279.0,"Position":176.034576,"HyperDash":false},{"StartTime":101335.0,"Position":138.745392,"HyperDash":false},{"StartTime":101391.0,"Position":148.387146,"HyperDash":false},{"StartTime":101447.0,"Position":103.028908,"HyperDash":false},{"StartTime":101503.0,"Position":107.670639,"HyperDash":false},{"StartTime":101559.0,"Position":73.03934,"HyperDash":false},{"StartTime":101615.0,"Position":45.58867,"HyperDash":false},{"StartTime":101671.0,"Position":34.2676964,"HyperDash":false},{"StartTime":101727.0,"Position":31.1845322,"HyperDash":false},{"StartTime":101783.0,"Position":59.98834,"HyperDash":false},{"StartTime":101839.0,"Position":63.2845459,"HyperDash":false},{"StartTime":101895.0,"Position":71.71911,"HyperDash":false},{"StartTime":101951.0,"Position":103.324966,"HyperDash":false},{"StartTime":102007.0,"Position":111.683212,"HyperDash":false},{"StartTime":102063.0,"Position":126.041473,"HyperDash":false},{"StartTime":102119.0,"Position":162.399689,"HyperDash":false},{"StartTime":102175.0,"Position":175.71051,"HyperDash":false},{"StartTime":102226.0,"Position":204.237076,"HyperDash":false},{"StartTime":102278.0,"Position":214.0877,"HyperDash":false},{"StartTime":102329.0,"Position":210.614273,"HyperDash":false},{"StartTime":102381.0,"Position":249.4649,"HyperDash":false},{"StartTime":102432.0,"Position":251.954224,"HyperDash":false},{"StartTime":102484.0,"Position":265.549072,"HyperDash":false},{"StartTime":102535.0,"Position":284.1342,"HyperDash":false},{"StartTime":102623.0,"Position":321.0,"HyperDash":false}]},{"StartTime":102847.0,"Objects":[{"StartTime":102847.0,"Position":385.0,"HyperDash":false}]},{"StartTime":103071.0,"Objects":[{"StartTime":103071.0,"Position":322.0,"HyperDash":false},{"StartTime":103154.0,"Position":309.4082,"HyperDash":false},{"StartTime":103238.0,"Position":253.459869,"HyperDash":false},{"StartTime":103322.0,"Position":230.511536,"HyperDash":false},{"StartTime":103406.0,"Position":202.384949,"HyperDash":false},{"StartTime":103481.0,"Position":227.946259,"HyperDash":false},{"StartTime":103556.0,"Position":269.685852,"HyperDash":false},{"StartTime":103631.0,"Position":282.4254,"HyperDash":false},{"StartTime":103742.0,"Position":322.0,"HyperDash":false}]},{"StartTime":103966.0,"Objects":[{"StartTime":103966.0,"Position":404.0,"HyperDash":false},{"StartTime":104059.0,"Position":389.203644,"HyperDash":false},{"StartTime":104189.0,"Position":389.111877,"HyperDash":false}]},{"StartTime":104414.0,"Objects":[{"StartTime":104414.0,"Position":308.0,"HyperDash":false},{"StartTime":104507.0,"Position":288.7421,"HyperDash":false},{"StartTime":104637.0,"Position":230.940414,"HyperDash":false}]},{"StartTime":104862.0,"Objects":[{"StartTime":104862.0,"Position":164.0,"HyperDash":false},{"StartTime":104945.0,"Position":150.511658,"HyperDash":false},{"StartTime":105029.0,"Position":96.6680145,"HyperDash":false},{"StartTime":105113.0,"Position":58.8243866,"HyperDash":false},{"StartTime":105197.0,"Position":44.8031158,"HyperDash":false},{"StartTime":105272.0,"Position":73.2715759,"HyperDash":false},{"StartTime":105347.0,"Position":112.917679,"HyperDash":false},{"StartTime":105422.0,"Position":127.563766,"HyperDash":false},{"StartTime":105533.0,"Position":164.0,"HyperDash":false}]},{"StartTime":105757.0,"Objects":[{"StartTime":105757.0,"Position":369.0,"HyperDash":false}]},{"StartTime":106205.0,"Objects":[{"StartTime":106205.0,"Position":276.0,"HyperDash":false},{"StartTime":106260.0,"Position":301.5404,"HyperDash":false},{"StartTime":106316.0,"Position":299.28067,"HyperDash":false},{"StartTime":106372.0,"Position":337.27,"HyperDash":false},{"StartTime":106428.0,"Position":348.8408,"HyperDash":false},{"StartTime":106484.0,"Position":372.279419,"HyperDash":false},{"StartTime":106540.0,"Position":407.057281,"HyperDash":false},{"StartTime":106596.0,"Position":399.472778,"HyperDash":false},{"StartTime":106652.0,"Position":415.2087,"HyperDash":false},{"StartTime":106746.0,"Position":444.522675,"HyperDash":false},{"StartTime":106876.0,"Position":427.9771,"HyperDash":false}]},{"StartTime":107101.0,"Objects":[{"StartTime":107101.0,"Position":354.0,"HyperDash":false},{"StartTime":107156.0,"Position":351.361053,"HyperDash":false},{"StartTime":107212.0,"Position":319.711761,"HyperDash":false},{"StartTime":107268.0,"Position":312.725647,"HyperDash":false},{"StartTime":107324.0,"Position":292.795166,"HyperDash":false},{"StartTime":107380.0,"Position":257.278931,"HyperDash":false},{"StartTime":107436.0,"Position":250.434189,"HyperDash":false},{"StartTime":107492.0,"Position":228.3952,"HyperDash":false},{"StartTime":107548.0,"Position":202.1942,"HyperDash":false},{"StartTime":107642.0,"Position":183.650848,"HyperDash":false},{"StartTime":107772.0,"Position":130.2209,"HyperDash":false}]},{"StartTime":107996.0,"Objects":[{"StartTime":107996.0,"Position":55.0,"HyperDash":false}]},{"StartTime":108220.0,"Objects":[{"StartTime":108220.0,"Position":0.0,"HyperDash":false}]},{"StartTime":108444.0,"Objects":[{"StartTime":108444.0,"Position":43.0,"HyperDash":false},{"StartTime":108527.0,"Position":26.517498,"HyperDash":false},{"StartTime":108611.0,"Position":31.01714,"HyperDash":false},{"StartTime":108695.0,"Position":26.516777,"HyperDash":false},{"StartTime":108779.0,"Position":37.0074844,"HyperDash":false},{"StartTime":108854.0,"Position":40.33816,"HyperDash":false},{"StartTime":108929.0,"Position":23.6777725,"HyperDash":false},{"StartTime":109004.0,"Position":46.01738,"HyperDash":false},{"StartTime":109115.0,"Position":43.0,"HyperDash":false}]},{"StartTime":109339.0,"Objects":[{"StartTime":109339.0,"Position":128.0,"HyperDash":false},{"StartTime":109432.0,"Position":177.210678,"HyperDash":false},{"StartTime":109562.0,"Position":204.080414,"HyperDash":false}]},{"StartTime":109787.0,"Objects":[{"StartTime":109787.0,"Position":242.0,"HyperDash":false},{"StartTime":109842.0,"Position":213.635727,"HyperDash":false},{"StartTime":109898.0,"Position":229.2922,"HyperDash":false},{"StartTime":109954.0,"Position":229.500839,"HyperDash":false},{"StartTime":110010.0,"Position":245.173721,"HyperDash":false},{"StartTime":110066.0,"Position":240.366425,"HyperDash":false},{"StartTime":110122.0,"Position":243.8476,"HyperDash":false},{"StartTime":110178.0,"Position":253.385529,"HyperDash":false},{"StartTime":110234.0,"Position":267.757416,"HyperDash":false},{"StartTime":110285.0,"Position":252.804428,"HyperDash":false},{"StartTime":110337.0,"Position":250.689026,"HyperDash":false},{"StartTime":110388.0,"Position":223.27919,"HyperDash":false},{"StartTime":110440.0,"Position":223.56842,"HyperDash":false},{"StartTime":110491.0,"Position":243.800873,"HyperDash":false},{"StartTime":110543.0,"Position":223.941116,"HyperDash":false},{"StartTime":110594.0,"Position":226.059952,"HyperDash":false},{"StartTime":110682.0,"Position":242.0,"HyperDash":false}]},{"StartTime":111131.0,"Objects":[{"StartTime":111131.0,"Position":411.0,"HyperDash":false}]},{"StartTime":111578.0,"Objects":[{"StartTime":111578.0,"Position":503.0,"HyperDash":false},{"StartTime":111629.0,"Position":490.995636,"HyperDash":false},{"StartTime":111680.0,"Position":478.9913,"HyperDash":false},{"StartTime":111732.0,"Position":511.947632,"HyperDash":false},{"StartTime":111783.0,"Position":502.9433,"HyperDash":false},{"StartTime":111834.0,"Position":488.938934,"HyperDash":false},{"StartTime":111886.0,"Position":497.8953,"HyperDash":false},{"StartTime":111937.0,"Position":485.89093,"HyperDash":false},{"StartTime":112025.0,"Position":485.432434,"HyperDash":false}]},{"StartTime":112250.0,"Objects":[{"StartTime":112250.0,"Position":326.0,"HyperDash":false}]},{"StartTime":112474.0,"Objects":[{"StartTime":112474.0,"Position":333.0,"HyperDash":false},{"StartTime":112567.0,"Position":318.79068,"HyperDash":false},{"StartTime":112697.0,"Position":253.369049,"HyperDash":false}]},{"StartTime":112922.0,"Objects":[{"StartTime":112922.0,"Position":175.0,"HyperDash":false},{"StartTime":113015.0,"Position":142.79068,"HyperDash":false},{"StartTime":113145.0,"Position":95.36904,"HyperDash":false}]},{"StartTime":113369.0,"Objects":[{"StartTime":113369.0,"Position":28.0,"HyperDash":false},{"StartTime":113424.0,"Position":14.5683556,"HyperDash":false},{"StartTime":113480.0,"Position":0.0,"HyperDash":false},{"StartTime":113536.0,"Position":28.3534565,"HyperDash":false},{"StartTime":113592.0,"Position":8.926472,"HyperDash":false},{"StartTime":113648.0,"Position":14.8988361,"HyperDash":false},{"StartTime":113704.0,"Position":13.3887749,"HyperDash":false},{"StartTime":113760.0,"Position":28.1702747,"HyperDash":false},{"StartTime":113816.0,"Position":34.34165,"HyperDash":false},{"StartTime":113867.0,"Position":36.0318,"HyperDash":false},{"StartTime":113919.0,"Position":12.4058609,"HyperDash":false},{"StartTime":113970.0,"Position":10.89321,"HyperDash":false},{"StartTime":114022.0,"Position":0.0,"HyperDash":false},{"StartTime":114073.0,"Position":10.8660927,"HyperDash":false},{"StartTime":114125.0,"Position":28.46455,"HyperDash":false},{"StartTime":114176.0,"Position":10.1406345,"HyperDash":false},{"StartTime":114264.0,"Position":28.0,"HyperDash":false}]},{"StartTime":114713.0,"Objects":[{"StartTime":114713.0,"Position":190.0,"HyperDash":false}]},{"StartTime":115160.0,"Objects":[{"StartTime":115160.0,"Position":349.0,"HyperDash":false},{"StartTime":115215.0,"Position":385.515045,"HyperDash":false},{"StartTime":115271.0,"Position":399.481323,"HyperDash":false},{"StartTime":115327.0,"Position":411.652283,"HyperDash":false},{"StartTime":115383.0,"Position":433.181549,"HyperDash":false},{"StartTime":115439.0,"Position":451.6266,"HyperDash":false},{"StartTime":115495.0,"Position":475.6881,"HyperDash":false},{"StartTime":115551.0,"Position":468.64,"HyperDash":false},{"StartTime":115607.0,"Position":501.696655,"HyperDash":false},{"StartTime":115658.0,"Position":478.782867,"HyperDash":false},{"StartTime":115710.0,"Position":452.2243,"HyperDash":false},{"StartTime":115761.0,"Position":461.569977,"HyperDash":false},{"StartTime":115813.0,"Position":418.9793,"HyperDash":false},{"StartTime":115864.0,"Position":433.325836,"HyperDash":false},{"StartTime":115916.0,"Position":398.248627,"HyperDash":false},{"StartTime":115967.0,"Position":379.308319,"HyperDash":false},{"StartTime":116055.0,"Position":349.0,"HyperDash":false}]},{"StartTime":116280.0,"Objects":[{"StartTime":116280.0,"Position":265.0,"HyperDash":false}]},{"StartTime":116504.0,"Objects":[{"StartTime":116504.0,"Position":224.0,"HyperDash":false},{"StartTime":116597.0,"Position":239.949112,"HyperDash":false},{"StartTime":116727.0,"Position":235.867233,"HyperDash":false}]},{"StartTime":116951.0,"Objects":[{"StartTime":116951.0,"Position":320.0,"HyperDash":false},{"StartTime":117002.0,"Position":342.006653,"HyperDash":false},{"StartTime":117053.0,"Position":362.0133,"HyperDash":false},{"StartTime":117105.0,"Position":374.373047,"HyperDash":false},{"StartTime":117156.0,"Position":403.3797,"HyperDash":false},{"StartTime":117207.0,"Position":400.386353,"HyperDash":false},{"StartTime":117259.0,"Position":441.7282,"HyperDash":false},{"StartTime":117310.0,"Position":459.303955,"HyperDash":false},{"StartTime":117398.0,"Position":476.6307,"HyperDash":false}]},{"StartTime":117847.0,"Objects":[{"StartTime":117847.0,"Position":501.0,"HyperDash":false},{"StartTime":117898.0,"Position":485.993347,"HyperDash":false},{"StartTime":117949.0,"Position":475.9867,"HyperDash":false},{"StartTime":118001.0,"Position":440.626953,"HyperDash":false},{"StartTime":118052.0,"Position":413.6203,"HyperDash":false},{"StartTime":118103.0,"Position":415.613647,"HyperDash":false},{"StartTime":118155.0,"Position":403.2718,"HyperDash":false},{"StartTime":118206.0,"Position":374.696045,"HyperDash":false},{"StartTime":118294.0,"Position":344.3693,"HyperDash":false}]},{"StartTime":118742.0,"Objects":[{"StartTime":118742.0,"Position":200.0,"HyperDash":false},{"StartTime":118793.0,"Position":169.013748,"HyperDash":false},{"StartTime":118844.0,"Position":149.781937,"HyperDash":false},{"StartTime":118896.0,"Position":136.378891,"HyperDash":false},{"StartTime":118947.0,"Position":111.942886,"HyperDash":false},{"StartTime":118998.0,"Position":96.68911,"HyperDash":false},{"StartTime":119050.0,"Position":81.5406,"HyperDash":false},{"StartTime":119101.0,"Position":83.7234955,"HyperDash":false},{"StartTime":119189.0,"Position":45.337368,"HyperDash":false}]},{"StartTime":119638.0,"Objects":[{"StartTime":119638.0,"Position":16.0,"HyperDash":false},{"StartTime":119721.0,"Position":11.22777,"HyperDash":false},{"StartTime":119805.0,"Position":40.49443,"HyperDash":false},{"StartTime":119889.0,"Position":35.76109,"HyperDash":false},{"StartTime":119973.0,"Position":29.0471916,"HyperDash":false},{"StartTime":120048.0,"Position":34.1499748,"HyperDash":false},{"StartTime":120123.0,"Position":6.23331642,"HyperDash":false},{"StartTime":120198.0,"Position":34.316658,"HyperDash":false},{"StartTime":120309.0,"Position":16.0,"HyperDash":false}]},{"StartTime":120534.0,"Objects":[{"StartTime":120534.0,"Position":88.0,"HyperDash":false},{"StartTime":120589.0,"Position":99.09209,"HyperDash":false},{"StartTime":120645.0,"Position":138.513123,"HyperDash":false},{"StartTime":120701.0,"Position":128.008957,"HyperDash":false},{"StartTime":120757.0,"Position":153.9049,"HyperDash":false},{"StartTime":120813.0,"Position":191.800842,"HyperDash":false},{"StartTime":120869.0,"Position":199.696777,"HyperDash":false},{"StartTime":120925.0,"Position":239.592712,"HyperDash":false},{"StartTime":120981.0,"Position":242.66629,"HyperDash":false},{"StartTime":121032.0,"Position":217.724426,"HyperDash":false},{"StartTime":121084.0,"Position":218.249634,"HyperDash":false},{"StartTime":121135.0,"Position":197.130127,"HyperDash":false},{"StartTime":121187.0,"Position":167.6553,"HyperDash":false},{"StartTime":121238.0,"Position":142.5358,"HyperDash":false},{"StartTime":121290.0,"Position":147.723633,"HyperDash":false},{"StartTime":121341.0,"Position":129.947342,"HyperDash":false},{"StartTime":121429.0,"Position":88.0,"HyperDash":false}]},{"StartTime":121877.0,"Objects":[{"StartTime":121877.0,"Position":172.0,"HyperDash":false}]},{"StartTime":122325.0,"Objects":[{"StartTime":122325.0,"Position":322.0,"HyperDash":false},{"StartTime":122376.0,"Position":324.2495,"HyperDash":false},{"StartTime":122427.0,"Position":355.02713,"HyperDash":false},{"StartTime":122479.0,"Position":331.196777,"HyperDash":false},{"StartTime":122530.0,"Position":366.3613,"HyperDash":false},{"StartTime":122581.0,"Position":338.580322,"HyperDash":false},{"StartTime":122633.0,"Position":352.663971,"HyperDash":false},{"StartTime":122684.0,"Position":329.8923,"HyperDash":false},{"StartTime":122772.0,"Position":326.6841,"HyperDash":false}]},{"StartTime":123220.0,"Objects":[{"StartTime":123220.0,"Position":150.0,"HyperDash":false},{"StartTime":123271.0,"Position":143.7505,"HyperDash":false},{"StartTime":123322.0,"Position":113.97287,"HyperDash":false},{"StartTime":123374.0,"Position":108.803215,"HyperDash":false},{"StartTime":123425.0,"Position":131.6387,"HyperDash":false},{"StartTime":123476.0,"Position":132.419678,"HyperDash":false},{"StartTime":123528.0,"Position":126.336021,"HyperDash":false},{"StartTime":123579.0,"Position":126.1077,"HyperDash":false},{"StartTime":123667.0,"Position":145.315887,"HyperDash":false}]},{"StartTime":123892.0,"Objects":[{"StartTime":123892.0,"Position":238.0,"HyperDash":false}]},{"StartTime":124116.0,"Objects":[{"StartTime":124116.0,"Position":277.0,"HyperDash":false},{"StartTime":124171.0,"Position":313.7125,"HyperDash":false},{"StartTime":124227.0,"Position":317.3544,"HyperDash":false},{"StartTime":124283.0,"Position":342.320557,"HyperDash":false},{"StartTime":124339.0,"Position":372.249237,"HyperDash":false},{"StartTime":124395.0,"Position":379.760651,"HyperDash":false},{"StartTime":124451.0,"Position":399.5314,"HyperDash":false},{"StartTime":124507.0,"Position":411.37323,"HyperDash":false},{"StartTime":124563.0,"Position":421.66275,"HyperDash":false},{"StartTime":124619.0,"Position":395.6441,"HyperDash":false},{"StartTime":124675.0,"Position":426.7424,"HyperDash":false},{"StartTime":124731.0,"Position":411.428467,"HyperDash":false},{"StartTime":124787.0,"Position":416.085144,"HyperDash":false},{"StartTime":124843.0,"Position":392.878662,"HyperDash":false},{"StartTime":124899.0,"Position":418.688171,"HyperDash":false},{"StartTime":124955.0,"Position":407.149261,"HyperDash":false},{"StartTime":125011.0,"Position":431.788025,"HyperDash":false},{"StartTime":125062.0,"Position":407.509033,"HyperDash":false},{"StartTime":125114.0,"Position":382.834656,"HyperDash":false},{"StartTime":125165.0,"Position":397.090271,"HyperDash":false},{"StartTime":125217.0,"Position":376.698334,"HyperDash":false},{"StartTime":125268.0,"Position":346.500427,"HyperDash":false},{"StartTime":125320.0,"Position":337.9348,"HyperDash":false},{"StartTime":125371.0,"Position":290.849426,"HyperDash":false},{"StartTime":125459.0,"Position":276.2673,"HyperDash":false}]},{"StartTime":125907.0,"Objects":[{"StartTime":125907.0,"Position":121.0,"HyperDash":false},{"StartTime":125990.0,"Position":113.836914,"HyperDash":false},{"StartTime":126074.0,"Position":142.708008,"HyperDash":false},{"StartTime":126158.0,"Position":144.5791,"HyperDash":false},{"StartTime":126242.0,"Position":132.467285,"HyperDash":false},{"StartTime":126317.0,"Position":121.9209,"HyperDash":false},{"StartTime":126392.0,"Position":135.357422,"HyperDash":false},{"StartTime":126467.0,"Position":109.793945,"HyperDash":false},{"StartTime":126578.0,"Position":121.0,"HyperDash":false}]},{"StartTime":126802.0,"Objects":[{"StartTime":126802.0,"Position":75.0,"HyperDash":false}]},{"StartTime":127026.0,"Objects":[{"StartTime":127026.0,"Position":88.0,"HyperDash":false},{"StartTime":127081.0,"Position":65.86594,"HyperDash":false},{"StartTime":127137.0,"Position":35.8985558,"HyperDash":false},{"StartTime":127193.0,"Position":35.9736977,"HyperDash":false},{"StartTime":127249.0,"Position":9.451545,"HyperDash":false},{"StartTime":127343.0,"Position":22.10696,"HyperDash":false},{"StartTime":127473.0,"Position":88.0,"HyperDash":false}]},{"StartTime":127698.0,"Objects":[{"StartTime":127698.0,"Position":171.0,"HyperDash":false},{"StartTime":127791.0,"Position":186.182022,"HyperDash":false},{"StartTime":127921.0,"Position":250.565491,"HyperDash":false}]},{"StartTime":128145.0,"Objects":[{"StartTime":128145.0,"Position":333.0,"HyperDash":false},{"StartTime":128228.0,"Position":360.710541,"HyperDash":false},{"StartTime":128312.0,"Position":382.321838,"HyperDash":false},{"StartTime":128396.0,"Position":416.1943,"HyperDash":false},{"StartTime":128480.0,"Position":447.073883,"HyperDash":false},{"StartTime":128555.0,"Position":406.767181,"HyperDash":false},{"StartTime":128630.0,"Position":392.017242,"HyperDash":false},{"StartTime":128705.0,"Position":359.007629,"HyperDash":false},{"StartTime":128816.0,"Position":333.0,"HyperDash":false}]},{"StartTime":129041.0,"Objects":[{"StartTime":129041.0,"Position":318.0,"HyperDash":false},{"StartTime":129134.0,"Position":308.0215,"HyperDash":false},{"StartTime":129264.0,"Position":313.2559,"HyperDash":false}]},{"StartTime":129489.0,"Objects":[{"StartTime":129489.0,"Position":304.0,"HyperDash":false},{"StartTime":129540.0,"Position":336.395416,"HyperDash":false},{"StartTime":129591.0,"Position":329.216034,"HyperDash":false},{"StartTime":129643.0,"Position":344.559479,"HyperDash":false},{"StartTime":129694.0,"Position":350.5508,"HyperDash":false},{"StartTime":129745.0,"Position":370.245239,"HyperDash":false},{"StartTime":129797.0,"Position":405.714478,"HyperDash":false},{"StartTime":129848.0,"Position":411.953125,"HyperDash":false},{"StartTime":129936.0,"Position":450.890564,"HyperDash":false}]},{"StartTime":130160.0,"Objects":[{"StartTime":130160.0,"Position":506.0,"HyperDash":false},{"StartTime":130211.0,"Position":502.234955,"HyperDash":false},{"StartTime":130262.0,"Position":491.46994,"HyperDash":false},{"StartTime":130314.0,"Position":497.6703,"HyperDash":false},{"StartTime":130365.0,"Position":512.0,"HyperDash":false},{"StartTime":130416.0,"Position":496.1402,"HyperDash":false},{"StartTime":130468.0,"Position":479.340546,"HyperDash":false},{"StartTime":130519.0,"Position":512.0,"HyperDash":false},{"StartTime":130607.0,"Position":490.529968,"HyperDash":false}]},{"StartTime":130832.0,"Objects":[{"StartTime":130832.0,"Position":477.0,"HyperDash":false}]},{"StartTime":131280.0,"Objects":[{"StartTime":131280.0,"Position":308.0,"HyperDash":false},{"StartTime":131373.0,"Position":272.2126,"HyperDash":false},{"StartTime":131503.0,"Position":230.958725,"HyperDash":false}]},{"StartTime":131728.0,"Objects":[{"StartTime":131728.0,"Position":142.0,"HyperDash":false},{"StartTime":131811.0,"Position":136.278381,"HyperDash":false},{"StartTime":131895.0,"Position":128.596268,"HyperDash":false},{"StartTime":131979.0,"Position":142.914154,"HyperDash":false},{"StartTime":132063.0,"Position":155.251785,"HyperDash":false},{"StartTime":132138.0,"Position":138.309143,"HyperDash":false},{"StartTime":132213.0,"Position":167.346741,"HyperDash":false},{"StartTime":132288.0,"Position":142.384354,"HyperDash":false},{"StartTime":132399.0,"Position":142.0,"HyperDash":false}]},{"StartTime":132623.0,"Objects":[{"StartTime":132623.0,"Position":55.0,"HyperDash":false},{"StartTime":132716.0,"Position":62.0249329,"HyperDash":false},{"StartTime":132846.0,"Position":45.4683838,"HyperDash":false}]},{"StartTime":133071.0,"Objects":[{"StartTime":133071.0,"Position":33.0,"HyperDash":false},{"StartTime":133122.0,"Position":34.36902,"HyperDash":false},{"StartTime":133173.0,"Position":49.2077179,"HyperDash":false},{"StartTime":133225.0,"Position":74.56708,"HyperDash":false},{"StartTime":133276.0,"Position":53.8811874,"HyperDash":false},{"StartTime":133327.0,"Position":100.066032,"HyperDash":false},{"StartTime":133379.0,"Position":104.080582,"HyperDash":false},{"StartTime":133430.0,"Position":129.9765,"HyperDash":false},{"StartTime":133518.0,"Position":146.874619,"HyperDash":false}]},{"StartTime":133966.0,"Objects":[{"StartTime":133966.0,"Position":275.0,"HyperDash":false},{"StartTime":134059.0,"Position":303.328827,"HyperDash":false},{"StartTime":134189.0,"Position":354.91748,"HyperDash":false}]},{"StartTime":134414.0,"Objects":[{"StartTime":134414.0,"Position":389.0,"HyperDash":false},{"StartTime":134507.0,"Position":407.328827,"HyperDash":false},{"StartTime":134637.0,"Position":468.91748,"HyperDash":false}]},{"StartTime":134862.0,"Objects":[{"StartTime":134862.0,"Position":503.0,"HyperDash":false},{"StartTime":134913.0,"Position":500.255981,"HyperDash":false},{"StartTime":134964.0,"Position":512.0,"HyperDash":false},{"StartTime":135016.0,"Position":512.0,"HyperDash":false},{"StartTime":135067.0,"Position":510.048553,"HyperDash":false},{"StartTime":135118.0,"Position":501.304535,"HyperDash":false},{"StartTime":135170.0,"Position":512.0,"HyperDash":false},{"StartTime":135221.0,"Position":497.906158,"HyperDash":false},{"StartTime":135309.0,"Position":492.781982,"HyperDash":false}]},{"StartTime":135757.0,"Objects":[{"StartTime":135757.0,"Position":318.0,"HyperDash":false},{"StartTime":135850.0,"Position":298.671173,"HyperDash":false},{"StartTime":135980.0,"Position":238.08252,"HyperDash":false}]},{"StartTime":136205.0,"Objects":[{"StartTime":136205.0,"Position":204.0,"HyperDash":false},{"StartTime":136298.0,"Position":187.671188,"HyperDash":false},{"StartTime":136428.0,"Position":124.082512,"HyperDash":false}]},{"StartTime":136653.0,"Objects":[{"StartTime":136653.0,"Position":49.0,"HyperDash":false},{"StartTime":136704.0,"Position":21.2460976,"HyperDash":false},{"StartTime":136755.0,"Position":43.23652,"HyperDash":false},{"StartTime":136807.0,"Position":42.04418,"HyperDash":false},{"StartTime":136858.0,"Position":2.98967361,"HyperDash":false},{"StartTime":136909.0,"Position":20.9194527,"HyperDash":false},{"StartTime":136961.0,"Position":10.7384281,"HyperDash":false},{"StartTime":137012.0,"Position":13.6708527,"HyperDash":false},{"StartTime":137100.0,"Position":38.2821579,"HyperDash":false}]},{"StartTime":137548.0,"Objects":[{"StartTime":137548.0,"Position":200.0,"HyperDash":false},{"StartTime":137641.0,"Position":223.082932,"HyperDash":false},{"StartTime":137771.0,"Position":220.570145,"HyperDash":false}]},{"StartTime":137996.0,"Objects":[{"StartTime":137996.0,"Position":204.0,"HyperDash":false},{"StartTime":138089.0,"Position":193.917068,"HyperDash":false},{"StartTime":138219.0,"Position":183.429855,"HyperDash":false}]},{"StartTime":138444.0,"Objects":[{"StartTime":138444.0,"Position":270.0,"HyperDash":false},{"StartTime":138495.0,"Position":302.4524,"HyperDash":false},{"StartTime":138546.0,"Position":317.9048,"HyperDash":false},{"StartTime":138598.0,"Position":317.679779,"HyperDash":false},{"StartTime":138649.0,"Position":319.346863,"HyperDash":false},{"StartTime":138700.0,"Position":371.213379,"HyperDash":false},{"StartTime":138752.0,"Position":387.4302,"HyperDash":false},{"StartTime":138803.0,"Position":406.2967,"HyperDash":false},{"StartTime":138891.0,"Position":422.1252,"HyperDash":false}]},{"StartTime":139116.0,"Objects":[{"StartTime":139116.0,"Position":490.0,"HyperDash":false}]},{"StartTime":139339.0,"Objects":[{"StartTime":139339.0,"Position":504.0,"HyperDash":false},{"StartTime":139432.0,"Position":500.723053,"HyperDash":false},{"StartTime":139562.0,"Position":490.562256,"HyperDash":false}]},{"StartTime":139787.0,"Objects":[{"StartTime":139787.0,"Position":370.0,"HyperDash":false}]},{"StartTime":140235.0,"Objects":[{"StartTime":140235.0,"Position":268.0,"HyperDash":false},{"StartTime":140318.0,"Position":268.7403,"HyperDash":false},{"StartTime":140402.0,"Position":257.822449,"HyperDash":false},{"StartTime":140486.0,"Position":262.227783,"HyperDash":false},{"StartTime":140570.0,"Position":276.9804,"HyperDash":false},{"StartTime":140645.0,"Position":293.53894,"HyperDash":false},{"StartTime":140720.0,"Position":260.337555,"HyperDash":false},{"StartTime":140795.0,"Position":257.3968,"HyperDash":false},{"StartTime":140906.0,"Position":268.0,"HyperDash":false}]},{"StartTime":141131.0,"Objects":[{"StartTime":141131.0,"Position":207.0,"HyperDash":false},{"StartTime":141224.0,"Position":178.663437,"HyperDash":false},{"StartTime":141354.0,"Position":127.063927,"HyperDash":false}]},{"StartTime":141578.0,"Objects":[{"StartTime":141578.0,"Position":39.0,"HyperDash":false}]},{"StartTime":141802.0,"Objects":[{"StartTime":141802.0,"Position":8.0,"HyperDash":false}]},{"StartTime":142026.0,"Objects":[{"StartTime":142026.0,"Position":71.0,"HyperDash":false},{"StartTime":142119.0,"Position":106.114151,"HyperDash":false},{"StartTime":142249.0,"Position":149.484,"HyperDash":false}]},{"StartTime":142474.0,"Objects":[{"StartTime":142474.0,"Position":220.0,"HyperDash":false},{"StartTime":142557.0,"Position":238.606583,"HyperDash":false},{"StartTime":142641.0,"Position":276.5699,"HyperDash":false},{"StartTime":142725.0,"Position":317.533142,"HyperDash":false},{"StartTime":142809.0,"Position":339.6748,"HyperDash":false},{"StartTime":142884.0,"Position":301.10022,"HyperDash":false},{"StartTime":142959.0,"Position":303.3473,"HyperDash":false},{"StartTime":143034.0,"Position":253.59436,"HyperDash":false},{"StartTime":143145.0,"Position":220.0,"HyperDash":false}]},{"StartTime":143369.0,"Objects":[{"StartTime":143369.0,"Position":158.0,"HyperDash":false},{"StartTime":143462.0,"Position":168.4163,"HyperDash":false},{"StartTime":143592.0,"Position":155.389526,"HyperDash":false}]},{"StartTime":143817.0,"Objects":[{"StartTime":143817.0,"Position":192.0,"HyperDash":false},{"StartTime":143868.0,"Position":227.725708,"HyperDash":false},{"StartTime":143919.0,"Position":234.856445,"HyperDash":false},{"StartTime":143971.0,"Position":256.358948,"HyperDash":false},{"StartTime":144022.0,"Position":248.750854,"HyperDash":false},{"StartTime":144073.0,"Position":277.396729,"HyperDash":false},{"StartTime":144125.0,"Position":293.7474,"HyperDash":false},{"StartTime":144176.0,"Position":303.68158,"HyperDash":false},{"StartTime":144264.0,"Position":346.96463,"HyperDash":false}]},{"StartTime":144489.0,"Objects":[{"StartTime":144489.0,"Position":431.0,"HyperDash":false},{"StartTime":144540.0,"Position":448.9708,"HyperDash":false},{"StartTime":144591.0,"Position":446.9416,"HyperDash":false},{"StartTime":144643.0,"Position":435.9314,"HyperDash":false},{"StartTime":144694.0,"Position":443.9022,"HyperDash":false},{"StartTime":144745.0,"Position":416.873,"HyperDash":false},{"StartTime":144797.0,"Position":434.8628,"HyperDash":false},{"StartTime":144848.0,"Position":447.8336,"HyperDash":false},{"StartTime":144936.0,"Position":439.508667,"HyperDash":false}]},{"StartTime":145160.0,"Objects":[{"StartTime":145160.0,"Position":456.0,"HyperDash":false}]},{"StartTime":145608.0,"Objects":[{"StartTime":145608.0,"Position":272.0,"HyperDash":false},{"StartTime":145701.0,"Position":244.790558,"HyperDash":false},{"StartTime":145831.0,"Position":193.216751,"HyperDash":false}]},{"StartTime":146056.0,"Objects":[{"StartTime":146056.0,"Position":127.0,"HyperDash":false},{"StartTime":146139.0,"Position":105.417236,"HyperDash":false},{"StartTime":146223.0,"Position":79.47805,"HyperDash":false},{"StartTime":146307.0,"Position":53.5388641,"HyperDash":false},{"StartTime":146391.0,"Position":7.421463,"HyperDash":false},{"StartTime":146466.0,"Position":38.974678,"HyperDash":false},{"StartTime":146541.0,"Position":69.7061,"HyperDash":false},{"StartTime":146616.0,"Position":94.4375,"HyperDash":false},{"StartTime":146727.0,"Position":127.0,"HyperDash":false}]},{"StartTime":146951.0,"Objects":[{"StartTime":146951.0,"Position":193.0,"HyperDash":false},{"StartTime":147044.0,"Position":209.412018,"HyperDash":false},{"StartTime":147174.0,"Position":186.467926,"HyperDash":false}]},{"StartTime":147399.0,"Objects":[{"StartTime":147399.0,"Position":109.0,"HyperDash":false},{"StartTime":147450.0,"Position":145.151154,"HyperDash":false},{"StartTime":147501.0,"Position":151.302292,"HyperDash":false},{"StartTime":147553.0,"Position":163.809341,"HyperDash":false},{"StartTime":147604.0,"Position":170.440277,"HyperDash":false},{"StartTime":147655.0,"Position":216.034668,"HyperDash":false},{"StartTime":147707.0,"Position":210.1249,"HyperDash":false},{"StartTime":147758.0,"Position":230.252777,"HyperDash":false},{"StartTime":147846.0,"Position":266.5323,"HyperDash":false}]},{"StartTime":148295.0,"Objects":[{"StartTime":148295.0,"Position":441.0,"HyperDash":false},{"StartTime":148388.0,"Position":425.532318,"HyperDash":false},{"StartTime":148518.0,"Position":444.6743,"HyperDash":false}]},{"StartTime":148742.0,"Objects":[{"StartTime":148742.0,"Position":482.0,"HyperDash":false},{"StartTime":148835.0,"Position":486.467682,"HyperDash":false},{"StartTime":148965.0,"Position":478.3257,"HyperDash":false}]},{"StartTime":149190.0,"Objects":[{"StartTime":149190.0,"Position":390.0,"HyperDash":false},{"StartTime":149241.0,"Position":390.926971,"HyperDash":false},{"StartTime":149292.0,"Position":346.853943,"HyperDash":false},{"StartTime":149344.0,"Position":355.206665,"HyperDash":false},{"StartTime":149395.0,"Position":318.011047,"HyperDash":false},{"StartTime":149446.0,"Position":311.81546,"HyperDash":false},{"StartTime":149498.0,"Position":296.263062,"HyperDash":false},{"StartTime":149549.0,"Position":268.067444,"HyperDash":false},{"StartTime":149637.0,"Position":235.671082,"HyperDash":false}]},{"StartTime":150086.0,"Objects":[{"StartTime":150086.0,"Position":59.0,"HyperDash":false},{"StartTime":150179.0,"Position":44.27435,"HyperDash":false},{"StartTime":150309.0,"Position":42.77816,"HyperDash":false}]},{"StartTime":150534.0,"Objects":[{"StartTime":150534.0,"Position":94.0,"HyperDash":false},{"StartTime":150627.0,"Position":87.7256546,"HyperDash":false},{"StartTime":150757.0,"Position":110.221848,"HyperDash":false}]},{"StartTime":150981.0,"Objects":[{"StartTime":150981.0,"Position":42.0,"HyperDash":false},{"StartTime":151032.0,"Position":70.85617,"HyperDash":false},{"StartTime":151083.0,"Position":55.8612671,"HyperDash":false},{"StartTime":151135.0,"Position":104.001328,"HyperDash":false},{"StartTime":151186.0,"Position":120.188065,"HyperDash":false},{"StartTime":151237.0,"Position":126.371735,"HyperDash":false},{"StartTime":151289.0,"Position":155.4776,"HyperDash":false},{"StartTime":151340.0,"Position":163.413391,"HyperDash":false},{"StartTime":151428.0,"Position":190.731277,"HyperDash":false}]},{"StartTime":151653.0,"Objects":[{"StartTime":151653.0,"Position":324.0,"HyperDash":false}]},{"StartTime":151877.0,"Objects":[{"StartTime":151877.0,"Position":335.0,"HyperDash":false},{"StartTime":151970.0,"Position":335.9098,"HyperDash":false},{"StartTime":152100.0,"Position":327.590118,"HyperDash":false}]},{"StartTime":152325.0,"Objects":[{"StartTime":152325.0,"Position":264.0,"HyperDash":false},{"StartTime":152418.0,"Position":284.0902,"HyperDash":false},{"StartTime":152548.0,"Position":271.409882,"HyperDash":false}]},{"StartTime":152772.0,"Objects":[{"StartTime":152772.0,"Position":318.0,"HyperDash":false},{"StartTime":152823.0,"Position":332.202423,"HyperDash":false},{"StartTime":152874.0,"Position":339.075562,"HyperDash":false},{"StartTime":152926.0,"Position":384.6346,"HyperDash":false},{"StartTime":152977.0,"Position":390.811829,"HyperDash":false},{"StartTime":153028.0,"Position":421.607452,"HyperDash":false},{"StartTime":153080.0,"Position":434.969727,"HyperDash":false},{"StartTime":153131.0,"Position":424.9186,"HyperDash":false},{"StartTime":153219.0,"Position":465.022461,"HyperDash":false}]},{"StartTime":153668.0,"Objects":[{"StartTime":153668.0,"Position":494.0,"HyperDash":false},{"StartTime":153723.0,"Position":509.7584,"HyperDash":false},{"StartTime":153779.0,"Position":498.566925,"HyperDash":false},{"StartTime":153835.0,"Position":490.375458,"HyperDash":false},{"StartTime":153891.0,"Position":505.209076,"HyperDash":false},{"StartTime":153985.0,"Position":512.0,"HyperDash":false},{"StartTime":154115.0,"Position":494.0,"HyperDash":false}]},{"StartTime":154339.0,"Objects":[{"StartTime":154339.0,"Position":317.0,"HyperDash":false}]},{"StartTime":154563.0,"Objects":[{"StartTime":154563.0,"Position":332.0,"HyperDash":false},{"StartTime":154618.0,"Position":328.824219,"HyperDash":false},{"StartTime":154674.0,"Position":290.48703,"HyperDash":false},{"StartTime":154730.0,"Position":281.624817,"HyperDash":false},{"StartTime":154786.0,"Position":266.622284,"HyperDash":false},{"StartTime":154842.0,"Position":240.852814,"HyperDash":false},{"StartTime":154898.0,"Position":204.669556,"HyperDash":false},{"StartTime":154954.0,"Position":191.449188,"HyperDash":false},{"StartTime":155010.0,"Position":180.362961,"HyperDash":false},{"StartTime":155061.0,"Position":184.570953,"HyperDash":false},{"StartTime":155113.0,"Position":203.339157,"HyperDash":false},{"StartTime":155164.0,"Position":238.630051,"HyperDash":false},{"StartTime":155216.0,"Position":245.871323,"HyperDash":false},{"StartTime":155267.0,"Position":266.0493,"HyperDash":false},{"StartTime":155319.0,"Position":266.5972,"HyperDash":false},{"StartTime":155370.0,"Position":309.515717,"HyperDash":false},{"StartTime":155458.0,"Position":332.0,"HyperDash":false}]},{"StartTime":155683.0,"Objects":[{"StartTime":155683.0,"Position":413.0,"HyperDash":false},{"StartTime":155738.0,"Position":442.436737,"HyperDash":false},{"StartTime":155794.0,"Position":439.2269,"HyperDash":false},{"StartTime":155850.0,"Position":485.017029,"HyperDash":false},{"StartTime":155906.0,"Position":491.9839,"HyperDash":false},{"StartTime":156000.0,"Position":476.9414,"HyperDash":false},{"StartTime":156130.0,"Position":413.0,"HyperDash":false}]},{"StartTime":156354.0,"Objects":[{"StartTime":156354.0,"Position":379.0,"HyperDash":false},{"StartTime":156405.0,"Position":353.171,"HyperDash":false},{"StartTime":156456.0,"Position":333.342,"HyperDash":false},{"StartTime":156508.0,"Position":342.93924,"HyperDash":false},{"StartTime":156559.0,"Position":316.817322,"HyperDash":false},{"StartTime":156610.0,"Position":287.6954,"HyperDash":false},{"StartTime":156662.0,"Position":273.21814,"HyperDash":false},{"StartTime":156713.0,"Position":261.096252,"HyperDash":false},{"StartTime":156801.0,"Position":228.827026,"HyperDash":false}]},{"StartTime":157250.0,"Objects":[{"StartTime":157250.0,"Position":103.0,"HyperDash":false},{"StartTime":157301.0,"Position":109.828995,"HyperDash":false},{"StartTime":157352.0,"Position":131.65799,"HyperDash":false},{"StartTime":157404.0,"Position":139.06076,"HyperDash":false},{"StartTime":157455.0,"Position":150.182678,"HyperDash":false},{"StartTime":157506.0,"Position":189.3046,"HyperDash":false},{"StartTime":157558.0,"Position":199.78186,"HyperDash":false},{"StartTime":157609.0,"Position":219.903763,"HyperDash":false},{"StartTime":157697.0,"Position":253.172974,"HyperDash":false}]},{"StartTime":158145.0,"Objects":[{"StartTime":158145.0,"Position":131.0,"HyperDash":false},{"StartTime":158196.0,"Position":95.01886,"HyperDash":false},{"StartTime":158247.0,"Position":97.78887,"HyperDash":false},{"StartTime":158299.0,"Position":63.4222565,"HyperDash":false},{"StartTime":158350.0,"Position":75.0872,"HyperDash":false},{"StartTime":158401.0,"Position":22.8652954,"HyperDash":false},{"StartTime":158453.0,"Position":45.94365,"HyperDash":false},{"StartTime":158504.0,"Position":0.0,"HyperDash":false},{"StartTime":158592.0,"Position":0.0,"HyperDash":false}]},{"StartTime":158817.0,"Objects":[{"StartTime":158817.0,"Position":29.0,"HyperDash":false}]},{"StartTime":159041.0,"Objects":[{"StartTime":159041.0,"Position":54.0,"HyperDash":false},{"StartTime":159134.0,"Position":95.1591644,"HyperDash":false},{"StartTime":159264.0,"Position":133.5107,"HyperDash":false}]},{"StartTime":159489.0,"Objects":[{"StartTime":159489.0,"Position":194.0,"HyperDash":false},{"StartTime":159582.0,"Position":246.159164,"HyperDash":false},{"StartTime":159712.0,"Position":273.510681,"HyperDash":false}]},{"StartTime":159936.0,"Objects":[{"StartTime":159936.0,"Position":354.0,"HyperDash":false},{"StartTime":159987.0,"Position":380.1903,"HyperDash":false},{"StartTime":160038.0,"Position":355.7923,"HyperDash":false},{"StartTime":160090.0,"Position":369.8352,"HyperDash":false},{"StartTime":160141.0,"Position":386.028046,"HyperDash":false},{"StartTime":160192.0,"Position":388.432159,"HyperDash":false},{"StartTime":160244.0,"Position":401.998,"HyperDash":false},{"StartTime":160295.0,"Position":400.752838,"HyperDash":false},{"StartTime":160383.0,"Position":376.419128,"HyperDash":false}]},{"StartTime":160832.0,"Objects":[{"StartTime":160832.0,"Position":242.0,"HyperDash":false},{"StartTime":160883.0,"Position":217.809677,"HyperDash":false},{"StartTime":160934.0,"Position":242.2077,"HyperDash":false},{"StartTime":160986.0,"Position":224.16481,"HyperDash":false},{"StartTime":161037.0,"Position":196.971954,"HyperDash":false},{"StartTime":161088.0,"Position":210.567825,"HyperDash":false},{"StartTime":161140.0,"Position":211.002029,"HyperDash":false},{"StartTime":161191.0,"Position":221.247162,"HyperDash":false},{"StartTime":161279.0,"Position":219.580887,"HyperDash":false}]},{"StartTime":161728.0,"Objects":[{"StartTime":161728.0,"Position":481.0,"HyperDash":false}]},{"StartTime":162175.0,"Objects":[{"StartTime":162175.0,"Position":182.0,"HyperDash":false},{"StartTime":162268.0,"Position":165.752014,"HyperDash":false},{"StartTime":162398.0,"Position":102.276337,"HyperDash":false}]},{"StartTime":162623.0,"Objects":[{"StartTime":162623.0,"Position":22.0,"HyperDash":false},{"StartTime":162706.0,"Position":2.907238,"HyperDash":false},{"StartTime":162790.0,"Position":4.71697235,"HyperDash":false},{"StartTime":162874.0,"Position":13.9768333,"HyperDash":false},{"StartTime":162958.0,"Position":19.6685238,"HyperDash":false},{"StartTime":163033.0,"Position":4.88709259,"HyperDash":false},{"StartTime":163108.0,"Position":2.06014729,"HyperDash":false},{"StartTime":163183.0,"Position":22.1771469,"HyperDash":false},{"StartTime":163294.0,"Position":22.0,"HyperDash":false}]},{"StartTime":163519.0,"Objects":[{"StartTime":163519.0,"Position":176.0,"HyperDash":false}]},{"StartTime":163966.0,"Objects":[{"StartTime":163966.0,"Position":202.0,"HyperDash":false},{"StartTime":164059.0,"Position":221.322418,"HyperDash":false},{"StartTime":164189.0,"Position":281.902161,"HyperDash":false}]},{"StartTime":164414.0,"Objects":[{"StartTime":164414.0,"Position":355.0,"HyperDash":false},{"StartTime":164497.0,"Position":383.562683,"HyperDash":false},{"StartTime":164581.0,"Position":395.4695,"HyperDash":false},{"StartTime":164665.0,"Position":445.511963,"HyperDash":false},{"StartTime":164749.0,"Position":470.7404,"HyperDash":false},{"StartTime":164824.0,"Position":455.970947,"HyperDash":false},{"StartTime":164899.0,"Position":418.028564,"HyperDash":false},{"StartTime":164974.0,"Position":389.1983,"HyperDash":false},{"StartTime":165085.0,"Position":355.0,"HyperDash":false}]},{"StartTime":165310.0,"Objects":[{"StartTime":165310.0,"Position":76.0,"HyperDash":false}]},{"StartTime":165757.0,"Objects":[{"StartTime":165757.0,"Position":110.0,"HyperDash":false},{"StartTime":165850.0,"Position":113.949112,"HyperDash":false},{"StartTime":165980.0,"Position":121.867233,"HyperDash":false}]},{"StartTime":166205.0,"Objects":[{"StartTime":166205.0,"Position":188.0,"HyperDash":false},{"StartTime":166288.0,"Position":201.562683,"HyperDash":false},{"StartTime":166372.0,"Position":258.4695,"HyperDash":false},{"StartTime":166456.0,"Position":274.511963,"HyperDash":false},{"StartTime":166540.0,"Position":303.7404,"HyperDash":false},{"StartTime":166615.0,"Position":289.970947,"HyperDash":false},{"StartTime":166690.0,"Position":270.028564,"HyperDash":false},{"StartTime":166765.0,"Position":234.1983,"HyperDash":false},{"StartTime":166876.0,"Position":188.0,"HyperDash":false}]},{"StartTime":167101.0,"Objects":[{"StartTime":167101.0,"Position":206.0,"HyperDash":false},{"StartTime":167156.0,"Position":213.034912,"HyperDash":false},{"StartTime":167212.0,"Position":234.0148,"HyperDash":false},{"StartTime":167268.0,"Position":239.378357,"HyperDash":false},{"StartTime":167324.0,"Position":266.7099,"HyperDash":false},{"StartTime":167380.0,"Position":287.58194,"HyperDash":false},{"StartTime":167436.0,"Position":299.568817,"HyperDash":false},{"StartTime":167492.0,"Position":321.242737,"HyperDash":false},{"StartTime":167548.0,"Position":354.299927,"HyperDash":false},{"StartTime":167599.0,"Position":342.30304,"HyperDash":false},{"StartTime":167651.0,"Position":309.123352,"HyperDash":false},{"StartTime":167702.0,"Position":297.94458,"HyperDash":false},{"StartTime":167754.0,"Position":296.413849,"HyperDash":false},{"StartTime":167805.0,"Position":257.5692,"HyperDash":false},{"StartTime":167857.0,"Position":266.036133,"HyperDash":false},{"StartTime":167908.0,"Position":246.8481,"HyperDash":false},{"StartTime":167996.0,"Position":206.0,"HyperDash":false}]},{"StartTime":168332.0,"Objects":[{"StartTime":168332.0,"Position":98.0,"HyperDash":false},{"StartTime":168406.0,"Position":81.25128,"HyperDash":false},{"StartTime":168481.0,"Position":82.4519,"HyperDash":false},{"StartTime":168556.0,"Position":92.65252,"HyperDash":false},{"StartTime":168667.0,"Position":81.0294342,"HyperDash":false}]},{"StartTime":168892.0,"Objects":[{"StartTime":168892.0,"Position":70.0,"HyperDash":false}]},{"StartTime":169339.0,"Objects":[{"StartTime":169339.0,"Position":246.0,"HyperDash":false},{"StartTime":169432.0,"Position":292.1293,"HyperDash":false},{"StartTime":169562.0,"Position":325.439056,"HyperDash":false}]},{"StartTime":169787.0,"Objects":[{"StartTime":169787.0,"Position":385.0,"HyperDash":false},{"StartTime":169870.0,"Position":405.562683,"HyperDash":false},{"StartTime":169954.0,"Position":452.4695,"HyperDash":false},{"StartTime":170038.0,"Position":472.511963,"HyperDash":false},{"StartTime":170122.0,"Position":500.7404,"HyperDash":false},{"StartTime":170197.0,"Position":462.970947,"HyperDash":false},{"StartTime":170272.0,"Position":454.028564,"HyperDash":false},{"StartTime":170347.0,"Position":408.1983,"HyperDash":false},{"StartTime":170458.0,"Position":385.0,"HyperDash":false}]},{"StartTime":170683.0,"Objects":[{"StartTime":170683.0,"Position":106.0,"HyperDash":false}]},{"StartTime":171131.0,"Objects":[{"StartTime":171131.0,"Position":161.0,"HyperDash":false},{"StartTime":171224.0,"Position":131.715057,"HyperDash":false},{"StartTime":171354.0,"Position":81.18773,"HyperDash":false}]},{"StartTime":171578.0,"Objects":[{"StartTime":171578.0,"Position":22.0,"HyperDash":false},{"StartTime":171661.0,"Position":0.907238,"HyperDash":false},{"StartTime":171745.0,"Position":5.71697235,"HyperDash":false},{"StartTime":171829.0,"Position":4.97683334,"HyperDash":false},{"StartTime":171913.0,"Position":19.6685238,"HyperDash":false},{"StartTime":171988.0,"Position":4.88709259,"HyperDash":false},{"StartTime":172063.0,"Position":20.0601463,"HyperDash":false},{"StartTime":172138.0,"Position":0.0,"HyperDash":false},{"StartTime":172249.0,"Position":22.0,"HyperDash":false}]},{"StartTime":172474.0,"Objects":[{"StartTime":172474.0,"Position":196.0,"HyperDash":false}]},{"StartTime":172922.0,"Objects":[{"StartTime":172922.0,"Position":279.0,"HyperDash":false},{"StartTime":173015.0,"Position":321.282318,"HyperDash":false},{"StartTime":173145.0,"Position":358.80603,"HyperDash":false}]},{"StartTime":173369.0,"Objects":[{"StartTime":173369.0,"Position":385.0,"HyperDash":false},{"StartTime":173452.0,"Position":403.562683,"HyperDash":false},{"StartTime":173536.0,"Position":426.4695,"HyperDash":false},{"StartTime":173620.0,"Position":488.511963,"HyperDash":false},{"StartTime":173704.0,"Position":500.7404,"HyperDash":false},{"StartTime":173779.0,"Position":482.970947,"HyperDash":false},{"StartTime":173854.0,"Position":456.028564,"HyperDash":false},{"StartTime":173929.0,"Position":421.1983,"HyperDash":false},{"StartTime":174040.0,"Position":385.0,"HyperDash":false}]},{"StartTime":174265.0,"Objects":[{"StartTime":174265.0,"Position":307.0,"HyperDash":false},{"StartTime":174358.0,"Position":261.853668,"HyperDash":false},{"StartTime":174488.0,"Position":227.52005,"HyperDash":false}]},{"StartTime":174713.0,"Objects":[{"StartTime":174713.0,"Position":148.0,"HyperDash":false},{"StartTime":174796.0,"Position":106.520546,"HyperDash":false},{"StartTime":174880.0,"Position":80.68592,"HyperDash":false},{"StartTime":174964.0,"Position":68.8512955,"HyperDash":false},{"StartTime":175048.0,"Position":28.83908,"HyperDash":false},{"StartTime":175123.0,"Position":59.2995529,"HyperDash":false},{"StartTime":175198.0,"Position":89.9376144,"HyperDash":false},{"StartTime":175273.0,"Position":125.575668,"HyperDash":false},{"StartTime":175384.0,"Position":148.0,"HyperDash":true}]},{"StartTime":175608.0,"Objects":[{"StartTime":175608.0,"Position":439.0,"HyperDash":false}]},{"StartTime":176056.0,"Objects":[{"StartTime":176056.0,"Position":387.0,"HyperDash":false},{"StartTime":176139.0,"Position":390.25885,"HyperDash":false},{"StartTime":176223.0,"Position":407.5621,"HyperDash":false},{"StartTime":176307.0,"Position":401.7594,"HyperDash":false},{"StartTime":176391.0,"Position":410.638336,"HyperDash":false},{"StartTime":176466.0,"Position":423.467438,"HyperDash":false},{"StartTime":176541.0,"Position":433.8284,"HyperDash":false},{"StartTime":176616.0,"Position":391.564453,"HyperDash":false},{"StartTime":176727.0,"Position":387.0,"HyperDash":false}]},{"StartTime":176951.0,"Objects":[{"StartTime":176951.0,"Position":302.0,"HyperDash":false},{"StartTime":177002.0,"Position":276.291016,"HyperDash":false},{"StartTime":177053.0,"Position":253.17688,"HyperDash":false},{"StartTime":177105.0,"Position":259.690979,"HyperDash":false},{"StartTime":177156.0,"Position":233.457672,"HyperDash":false},{"StartTime":177207.0,"Position":200.839844,"HyperDash":false},{"StartTime":177259.0,"Position":195.088776,"HyperDash":false},{"StartTime":177310.0,"Position":160.934647,"HyperDash":false},{"StartTime":177398.0,"Position":146.743591,"HyperDash":false}]},{"StartTime":177623.0,"Objects":[{"StartTime":177623.0,"Position":10.0,"HyperDash":false}]},{"StartTime":177847.0,"Objects":[{"StartTime":177847.0,"Position":93.0,"HyperDash":false},{"StartTime":177902.0,"Position":121.613495,"HyperDash":false},{"StartTime":177958.0,"Position":114.5836,"HyperDash":false},{"StartTime":178014.0,"Position":147.553711,"HyperDash":false},{"StartTime":178070.0,"Position":172.702118,"HyperDash":false},{"StartTime":178164.0,"Position":121.359177,"HyperDash":false},{"StartTime":178294.0,"Position":93.0,"HyperDash":false}]},{"StartTime":178519.0,"Objects":[{"StartTime":178519.0,"Position":20.0,"HyperDash":false},{"StartTime":178570.0,"Position":12.202383,"HyperDash":false},{"StartTime":178621.0,"Position":17.4776764,"HyperDash":false},{"StartTime":178673.0,"Position":22.8649712,"HyperDash":false},{"StartTime":178724.0,"Position":53.9413567,"HyperDash":false},{"StartTime":178775.0,"Position":54.51453,"HyperDash":false},{"StartTime":178827.0,"Position":76.44822,"HyperDash":false},{"StartTime":178878.0,"Position":73.7426147,"HyperDash":false},{"StartTime":178966.0,"Position":117.336555,"HyperDash":false}]},{"StartTime":179190.0,"Objects":[{"StartTime":179190.0,"Position":260.0,"HyperDash":false}]},{"StartTime":179638.0,"Objects":[{"StartTime":179638.0,"Position":381.0,"HyperDash":false},{"StartTime":179731.0,"Position":403.239,"HyperDash":false},{"StartTime":179861.0,"Position":460.702118,"HyperDash":false}]},{"StartTime":180086.0,"Objects":[{"StartTime":180086.0,"Position":499.0,"HyperDash":false},{"StartTime":180169.0,"Position":492.7418,"HyperDash":false},{"StartTime":180253.0,"Position":479.880341,"HyperDash":false},{"StartTime":180337.0,"Position":491.247253,"HyperDash":false},{"StartTime":180421.0,"Position":476.24173,"HyperDash":false},{"StartTime":180496.0,"Position":474.9095,"HyperDash":false},{"StartTime":180571.0,"Position":490.40033,"HyperDash":false},{"StartTime":180646.0,"Position":497.418976,"HyperDash":false},{"StartTime":180757.0,"Position":499.0,"HyperDash":false}]},{"StartTime":180981.0,"Objects":[{"StartTime":180981.0,"Position":350.0,"HyperDash":false}]},{"StartTime":181429.0,"Objects":[{"StartTime":181429.0,"Position":237.0,"HyperDash":false},{"StartTime":181522.0,"Position":219.747375,"HyperDash":false},{"StartTime":181652.0,"Position":157.265228,"HyperDash":false}]},{"StartTime":181877.0,"Objects":[{"StartTime":181877.0,"Position":69.0,"HyperDash":false},{"StartTime":181960.0,"Position":62.7165451,"HyperDash":false},{"StartTime":182044.0,"Position":51.0702744,"HyperDash":false},{"StartTime":182128.0,"Position":58.38651,"HyperDash":false},{"StartTime":182212.0,"Position":46.79955,"HyperDash":false},{"StartTime":182287.0,"Position":57.2412,"HyperDash":false},{"StartTime":182362.0,"Position":36.87273,"HyperDash":false},{"StartTime":182437.0,"Position":68.721756,"HyperDash":false},{"StartTime":182548.0,"Position":69.0,"HyperDash":false}]},{"StartTime":182772.0,"Objects":[{"StartTime":182772.0,"Position":156.0,"HyperDash":false}]},{"StartTime":182996.0,"Objects":[{"StartTime":182996.0,"Position":188.0,"HyperDash":false}]},{"StartTime":183220.0,"Objects":[{"StartTime":183220.0,"Position":258.0,"HyperDash":false},{"StartTime":183271.0,"Position":290.116547,"HyperDash":false},{"StartTime":183322.0,"Position":294.3538,"HyperDash":false},{"StartTime":183374.0,"Position":307.583344,"HyperDash":false},{"StartTime":183425.0,"Position":340.892883,"HyperDash":false},{"StartTime":183476.0,"Position":330.0654,"HyperDash":false},{"StartTime":183528.0,"Position":366.9192,"HyperDash":false},{"StartTime":183579.0,"Position":359.8023,"HyperDash":false},{"StartTime":183667.0,"Position":410.248352,"HyperDash":false}]},{"StartTime":184116.0,"Objects":[{"StartTime":184116.0,"Position":500.0,"HyperDash":false},{"StartTime":184199.0,"Position":507.066162,"HyperDash":false},{"StartTime":184283.0,"Position":497.157227,"HyperDash":false},{"StartTime":184367.0,"Position":504.2483,"HyperDash":false},{"StartTime":184451.0,"Position":508.3518,"HyperDash":false},{"StartTime":184526.0,"Position":505.497223,"HyperDash":false},{"StartTime":184601.0,"Position":509.630219,"HyperDash":false},{"StartTime":184676.0,"Position":505.763184,"HyperDash":false},{"StartTime":184787.0,"Position":500.0,"HyperDash":false}]},{"StartTime":185011.0,"Objects":[{"StartTime":185011.0,"Position":424.0,"HyperDash":false},{"StartTime":185104.0,"Position":408.773682,"HyperDash":false},{"StartTime":185234.0,"Position":345.858856,"HyperDash":false}]},{"StartTime":185459.0,"Objects":[{"StartTime":185459.0,"Position":273.0,"HyperDash":false},{"StartTime":185533.0,"Position":247.05632,"HyperDash":false},{"StartTime":185608.0,"Position":204.745392,"HyperDash":false},{"StartTime":185683.0,"Position":207.012665,"HyperDash":false},{"StartTime":185794.0,"Position":159.200455,"HyperDash":false}]},{"StartTime":186131.0,"Objects":[{"StartTime":186131.0,"Position":66.0,"HyperDash":false},{"StartTime":186182.0,"Position":77.52162,"HyperDash":false},{"StartTime":186233.0,"Position":97.0432358,"HyperDash":false},{"StartTime":186285.0,"Position":113.692917,"HyperDash":false},{"StartTime":186336.0,"Position":147.840286,"HyperDash":false},{"StartTime":186387.0,"Position":162.98764,"HyperDash":false},{"StartTime":186439.0,"Position":155.490845,"HyperDash":false},{"StartTime":186490.0,"Position":179.638214,"HyperDash":false},{"StartTime":186578.0,"Position":217.951324,"HyperDash":false}]},{"StartTime":186802.0,"Objects":[{"StartTime":186802.0,"Position":301.0,"HyperDash":false},{"StartTime":186895.0,"Position":319.187317,"HyperDash":false},{"StartTime":187025.0,"Position":380.578247,"HyperDash":false}]},{"StartTime":187250.0,"Objects":[{"StartTime":187250.0,"Position":468.0,"HyperDash":false},{"StartTime":187333.0,"Position":477.219818,"HyperDash":false},{"StartTime":187417.0,"Position":470.918518,"HyperDash":false},{"StartTime":187501.0,"Position":480.95874,"HyperDash":false},{"StartTime":187585.0,"Position":487.3309,"HyperDash":false},{"StartTime":187660.0,"Position":500.324768,"HyperDash":false},{"StartTime":187735.0,"Position":496.985931,"HyperDash":false},{"StartTime":187810.0,"Position":459.305664,"HyperDash":false},{"StartTime":187921.0,"Position":468.0,"HyperDash":false}]},{"StartTime":188145.0,"Objects":[{"StartTime":188145.0,"Position":372.0,"HyperDash":false}]},{"StartTime":188593.0,"Objects":[{"StartTime":188593.0,"Position":255.0,"HyperDash":false},{"StartTime":188686.0,"Position":237.844971,"HyperDash":false},{"StartTime":188816.0,"Position":175.499252,"HyperDash":false}]},{"StartTime":189041.0,"Objects":[{"StartTime":189041.0,"Position":140.0,"HyperDash":false},{"StartTime":189124.0,"Position":120.208252,"HyperDash":false},{"StartTime":189208.0,"Position":79.71341,"HyperDash":false},{"StartTime":189292.0,"Position":62.945713,"HyperDash":false},{"StartTime":189376.0,"Position":21.8198166,"HyperDash":false},{"StartTime":189451.0,"Position":43.38784,"HyperDash":false},{"StartTime":189526.0,"Position":60.00197,"HyperDash":false},{"StartTime":189601.0,"Position":110.413246,"HyperDash":false},{"StartTime":189712.0,"Position":140.0,"HyperDash":false}]},{"StartTime":189936.0,"Objects":[{"StartTime":189936.0,"Position":409.0,"HyperDash":false}]},{"StartTime":190384.0,"Objects":[{"StartTime":190384.0,"Position":297.0,"HyperDash":false},{"StartTime":190467.0,"Position":334.5554,"HyperDash":false},{"StartTime":190551.0,"Position":360.466858,"HyperDash":false},{"StartTime":190635.0,"Position":367.378357,"HyperDash":false},{"StartTime":190719.0,"Position":416.4679,"HyperDash":false},{"StartTime":190794.0,"Position":383.93924,"HyperDash":false},{"StartTime":190869.0,"Position":350.232544,"HyperDash":false},{"StartTime":190944.0,"Position":345.525879,"HyperDash":false},{"StartTime":191055.0,"Position":297.0,"HyperDash":false}]},{"StartTime":191280.0,"Objects":[{"StartTime":191280.0,"Position":233.0,"HyperDash":false},{"StartTime":191335.0,"Position":238.967834,"HyperDash":false},{"StartTime":191391.0,"Position":212.5211,"HyperDash":false},{"StartTime":191447.0,"Position":237.94754,"HyperDash":false},{"StartTime":191503.0,"Position":229.915482,"HyperDash":false},{"StartTime":191559.0,"Position":237.2686,"HyperDash":false},{"StartTime":191615.0,"Position":275.501129,"HyperDash":false},{"StartTime":191671.0,"Position":284.155334,"HyperDash":false},{"StartTime":191727.0,"Position":303.59848,"HyperDash":false},{"StartTime":191821.0,"Position":353.735931,"HyperDash":false},{"StartTime":191951.0,"Position":381.505432,"HyperDash":false}]},{"StartTime":192175.0,"Objects":[{"StartTime":192175.0,"Position":468.0,"HyperDash":false},{"StartTime":192258.0,"Position":482.7641,"HyperDash":false},{"StartTime":192342.0,"Position":450.513336,"HyperDash":false},{"StartTime":192426.0,"Position":466.262543,"HyperDash":false},{"StartTime":192510.0,"Position":463.004333,"HyperDash":false},{"StartTime":192585.0,"Position":465.113647,"HyperDash":false},{"StartTime":192660.0,"Position":470.2304,"HyperDash":false},{"StartTime":192735.0,"Position":465.3472,"HyperDash":false},{"StartTime":192846.0,"Position":468.0,"HyperDash":false}]},{"StartTime":193071.0,"Objects":[{"StartTime":193071.0,"Position":497.0,"HyperDash":false},{"StartTime":193126.0,"Position":512.0,"HyperDash":false},{"StartTime":193182.0,"Position":490.965454,"HyperDash":false},{"StartTime":193238.0,"Position":505.365143,"HyperDash":false},{"StartTime":193294.0,"Position":498.1796,"HyperDash":false},{"StartTime":193350.0,"Position":458.746429,"HyperDash":false},{"StartTime":193406.0,"Position":465.362274,"HyperDash":false},{"StartTime":193462.0,"Position":428.6823,"HyperDash":false},{"StartTime":193518.0,"Position":425.1735,"HyperDash":false},{"StartTime":193612.0,"Position":399.024475,"HyperDash":false},{"StartTime":193742.0,"Position":347.213928,"HyperDash":false}]},{"StartTime":193966.0,"Objects":[{"StartTime":193966.0,"Position":292.0,"HyperDash":false},{"StartTime":194049.0,"Position":284.2359,"HyperDash":false},{"StartTime":194133.0,"Position":296.486664,"HyperDash":false},{"StartTime":194217.0,"Position":289.737457,"HyperDash":false},{"StartTime":194301.0,"Position":296.995667,"HyperDash":false},{"StartTime":194376.0,"Position":298.886353,"HyperDash":false},{"StartTime":194451.0,"Position":301.7696,"HyperDash":false},{"StartTime":194526.0,"Position":303.6528,"HyperDash":false},{"StartTime":194637.0,"Position":292.0,"HyperDash":false}]},{"StartTime":194862.0,"Objects":[{"StartTime":194862.0,"Position":233.0,"HyperDash":false},{"StartTime":194917.0,"Position":233.672577,"HyperDash":false},{"StartTime":194973.0,"Position":188.020615,"HyperDash":false},{"StartTime":195029.0,"Position":185.026245,"HyperDash":false},{"StartTime":195085.0,"Position":146.409729,"HyperDash":false},{"StartTime":195141.0,"Position":122.932129,"HyperDash":false},{"StartTime":195197.0,"Position":132.166672,"HyperDash":false},{"StartTime":195253.0,"Position":111.858551,"HyperDash":false},{"StartTime":195309.0,"Position":94.3505554,"HyperDash":false},{"StartTime":195403.0,"Position":84.74842,"HyperDash":false},{"StartTime":195533.0,"Position":83.93751,"HyperDash":false}]},{"StartTime":195757.0,"Objects":[{"StartTime":195757.0,"Position":156.0,"HyperDash":false}]},{"StartTime":196205.0,"Objects":[{"StartTime":196205.0,"Position":292.0,"HyperDash":false},{"StartTime":196288.0,"Position":315.547729,"HyperDash":false},{"StartTime":196372.0,"Position":356.451416,"HyperDash":false},{"StartTime":196456.0,"Position":363.355164,"HyperDash":false},{"StartTime":196540.0,"Position":411.436859,"HyperDash":false},{"StartTime":196615.0,"Position":378.9151,"HyperDash":false},{"StartTime":196690.0,"Position":351.215363,"HyperDash":false},{"StartTime":196765.0,"Position":317.515625,"HyperDash":false},{"StartTime":196876.0,"Position":292.0,"HyperDash":false}]},{"StartTime":197101.0,"Objects":[{"StartTime":197101.0,"Position":224.0,"HyperDash":false},{"StartTime":197194.0,"Position":208.802353,"HyperDash":false},{"StartTime":197324.0,"Position":144.397034,"HyperDash":false}]},{"StartTime":197548.0,"Objects":[{"StartTime":197548.0,"Position":66.0,"HyperDash":false},{"StartTime":197631.0,"Position":48.2919579,"HyperDash":false},{"StartTime":197715.0,"Position":35.05251,"HyperDash":false},{"StartTime":197799.0,"Position":38.5374374,"HyperDash":false},{"StartTime":197883.0,"Position":11.4361858,"HyperDash":false},{"StartTime":197958.0,"Position":13.2977371,"HyperDash":false},{"StartTime":198033.0,"Position":27.7316284,"HyperDash":false},{"StartTime":198108.0,"Position":56.1405029,"HyperDash":false},{"StartTime":198219.0,"Position":66.0,"HyperDash":false}]},{"StartTime":198444.0,"Objects":[{"StartTime":198444.0,"Position":42.0,"HyperDash":false},{"StartTime":198499.0,"Position":55.76585,"HyperDash":false},{"StartTime":198555.0,"Position":34.16329,"HyperDash":false},{"StartTime":198611.0,"Position":54.15536,"HyperDash":false},{"StartTime":198667.0,"Position":77.49657,"HyperDash":false},{"StartTime":198723.0,"Position":71.00532,"HyperDash":false},{"StartTime":198779.0,"Position":105.424828,"HyperDash":false},{"StartTime":198835.0,"Position":125.435341,"HyperDash":false},{"StartTime":198891.0,"Position":136.756622,"HyperDash":false},{"StartTime":198985.0,"Position":174.4071,"HyperDash":false},{"StartTime":199115.0,"Position":215.646362,"HyperDash":false}]},{"StartTime":199339.0,"Objects":[{"StartTime":199339.0,"Position":292.0,"HyperDash":false},{"StartTime":199422.0,"Position":330.217377,"HyperDash":false},{"StartTime":199506.0,"Position":361.968842,"HyperDash":false},{"StartTime":199590.0,"Position":372.687,"HyperDash":false},{"StartTime":199674.0,"Position":408.582062,"HyperDash":false},{"StartTime":199749.0,"Position":367.224884,"HyperDash":false},{"StartTime":199824.0,"Position":343.6908,"HyperDash":false},{"StartTime":199899.0,"Position":338.7365,"HyperDash":false},{"StartTime":200010.0,"Position":292.0,"HyperDash":false}]},{"StartTime":200235.0,"Objects":[{"StartTime":200235.0,"Position":235.0,"HyperDash":false},{"StartTime":200290.0,"Position":235.309448,"HyperDash":false},{"StartTime":200346.0,"Position":241.240967,"HyperDash":false},{"StartTime":200402.0,"Position":245.969574,"HyperDash":false},{"StartTime":200458.0,"Position":247.421249,"HyperDash":false},{"StartTime":200514.0,"Position":241.446747,"HyperDash":false},{"StartTime":200570.0,"Position":272.996338,"HyperDash":false},{"StartTime":200626.0,"Position":270.733429,"HyperDash":false},{"StartTime":200682.0,"Position":286.54422,"HyperDash":false},{"StartTime":200776.0,"Position":331.074341,"HyperDash":false},{"StartTime":200906.0,"Position":359.601563,"HyperDash":false}]},{"StartTime":201131.0,"Objects":[{"StartTime":201131.0,"Position":447.0,"HyperDash":false}]},{"StartTime":201578.0,"Objects":[{"StartTime":201578.0,"Position":472.0,"HyperDash":false},{"StartTime":201671.0,"Position":420.90976,"HyperDash":false},{"StartTime":201801.0,"Position":392.654541,"HyperDash":false}]},{"StartTime":202026.0,"Objects":[{"StartTime":202026.0,"Position":323.0,"HyperDash":false},{"StartTime":202109.0,"Position":280.374054,"HyperDash":false},{"StartTime":202193.0,"Position":263.163239,"HyperDash":false},{"StartTime":202277.0,"Position":238.104523,"HyperDash":false},{"StartTime":202361.0,"Position":213.4443,"HyperDash":false},{"StartTime":202436.0,"Position":215.121521,"HyperDash":false},{"StartTime":202511.0,"Position":262.801849,"HyperDash":false},{"StartTime":202586.0,"Position":278.475128,"HyperDash":false},{"StartTime":202697.0,"Position":323.0,"HyperDash":false}]},{"StartTime":202922.0,"Objects":[{"StartTime":202922.0,"Position":370.0,"HyperDash":false}]},{"StartTime":203369.0,"Objects":[{"StartTime":203369.0,"Position":472.0,"HyperDash":false},{"StartTime":203462.0,"Position":457.79657,"HyperDash":false},{"StartTime":203592.0,"Position":459.52298,"HyperDash":false}]},{"StartTime":203817.0,"Objects":[{"StartTime":203817.0,"Position":373.0,"HyperDash":false},{"StartTime":203900.0,"Position":398.412079,"HyperDash":false},{"StartTime":203984.0,"Position":390.1198,"HyperDash":false},{"StartTime":204068.0,"Position":402.6163,"HyperDash":false},{"StartTime":204152.0,"Position":398.979218,"HyperDash":false},{"StartTime":204227.0,"Position":415.909515,"HyperDash":false},{"StartTime":204302.0,"Position":375.485352,"HyperDash":false},{"StartTime":204377.0,"Position":384.754333,"HyperDash":false},{"StartTime":204488.0,"Position":373.0,"HyperDash":false}]},{"StartTime":204713.0,"Objects":[{"StartTime":204713.0,"Position":294.0,"HyperDash":false},{"StartTime":204764.0,"Position":285.134979,"HyperDash":false},{"StartTime":204815.0,"Position":243.269958,"HyperDash":false},{"StartTime":204867.0,"Position":248.074249,"HyperDash":false},{"StartTime":204918.0,"Position":228.209229,"HyperDash":false},{"StartTime":204969.0,"Position":192.333786,"HyperDash":false},{"StartTime":205021.0,"Position":173.952545,"HyperDash":false},{"StartTime":205072.0,"Position":183.9248,"HyperDash":false},{"StartTime":205160.0,"Position":140.818085,"HyperDash":false}]},{"StartTime":205608.0,"Objects":[{"StartTime":205608.0,"Position":29.0,"HyperDash":false},{"StartTime":205659.0,"Position":63.86502,"HyperDash":false},{"StartTime":205710.0,"Position":61.7300453,"HyperDash":false},{"StartTime":205762.0,"Position":82.92575,"HyperDash":false},{"StartTime":205813.0,"Position":97.79077,"HyperDash":false},{"StartTime":205864.0,"Position":130.666214,"HyperDash":false},{"StartTime":205916.0,"Position":148.047455,"HyperDash":false},{"StartTime":205967.0,"Position":142.0752,"HyperDash":false},{"StartTime":206055.0,"Position":182.181915,"HyperDash":false}]},{"StartTime":206280.0,"Objects":[{"StartTime":206280.0,"Position":322.0,"HyperDash":false}]},{"StartTime":206504.0,"Objects":[{"StartTime":206504.0,"Position":344.0,"HyperDash":false},{"StartTime":206587.0,"Position":365.904449,"HyperDash":false},{"StartTime":206671.0,"Position":418.4734,"HyperDash":false},{"StartTime":206755.0,"Position":413.206177,"HyperDash":false},{"StartTime":206839.0,"Position":457.994324,"HyperDash":false},{"StartTime":206914.0,"Position":431.638641,"HyperDash":false},{"StartTime":206989.0,"Position":403.264984,"HyperDash":false},{"StartTime":207064.0,"Position":377.594177,"HyperDash":false},{"StartTime":207175.0,"Position":344.0,"HyperDash":false}]},{"StartTime":207399.0,"Objects":[{"StartTime":207399.0,"Position":294.0,"HyperDash":false},{"StartTime":207454.0,"Position":297.1099,"HyperDash":false},{"StartTime":207510.0,"Position":290.9207,"HyperDash":false},{"StartTime":207566.0,"Position":289.514343,"HyperDash":false},{"StartTime":207622.0,"Position":319.350433,"HyperDash":false},{"StartTime":207678.0,"Position":342.16394,"HyperDash":false},{"StartTime":207734.0,"Position":371.241455,"HyperDash":false},{"StartTime":207790.0,"Position":385.045563,"HyperDash":false},{"StartTime":207846.0,"Position":390.7907,"HyperDash":false},{"StartTime":207897.0,"Position":395.987244,"HyperDash":false},{"StartTime":207949.0,"Position":428.121765,"HyperDash":false},{"StartTime":208000.0,"Position":447.949615,"HyperDash":false},{"StartTime":208052.0,"Position":476.569366,"HyperDash":false},{"StartTime":208103.0,"Position":470.83667,"HyperDash":false},{"StartTime":208155.0,"Position":476.915344,"HyperDash":false},{"StartTime":208206.0,"Position":511.044159,"HyperDash":false},{"StartTime":208294.0,"Position":498.7854,"HyperDash":false}]},{"StartTime":215459.0,"Objects":[{"StartTime":215459.0,"Position":479.0,"HyperDash":false},{"StartTime":215542.0,"Position":229.0,"HyperDash":false},{"StartTime":215626.0,"Position":331.0,"HyperDash":false},{"StartTime":215710.0,"Position":226.0,"HyperDash":false},{"StartTime":215794.0,"Position":205.0,"HyperDash":false},{"StartTime":215878.0,"Position":472.0,"HyperDash":false},{"StartTime":215962.0,"Position":426.0,"HyperDash":false},{"StartTime":216046.0,"Position":340.0,"HyperDash":false},{"StartTime":216130.0,"Position":379.0,"HyperDash":false},{"StartTime":216214.0,"Position":21.0,"HyperDash":false},{"StartTime":216298.0,"Position":302.0,"HyperDash":false},{"StartTime":216382.0,"Position":148.0,"HyperDash":false},{"StartTime":216466.0,"Position":431.0,"HyperDash":false},{"StartTime":216550.0,"Position":424.0,"HyperDash":false},{"StartTime":216634.0,"Position":14.0,"HyperDash":false},{"StartTime":216718.0,"Position":423.0,"HyperDash":false},{"StartTime":216802.0,"Position":16.0,"HyperDash":false},{"StartTime":216885.0,"Position":284.0,"HyperDash":false},{"StartTime":216969.0,"Position":201.0,"HyperDash":false},{"StartTime":217053.0,"Position":29.0,"HyperDash":false},{"StartTime":217137.0,"Position":203.0,"HyperDash":false},{"StartTime":217221.0,"Position":129.0,"HyperDash":false},{"StartTime":217305.0,"Position":285.0,"HyperDash":false},{"StartTime":217389.0,"Position":254.0,"HyperDash":false},{"StartTime":217473.0,"Position":145.0,"HyperDash":false},{"StartTime":217557.0,"Position":230.0,"HyperDash":false},{"StartTime":217641.0,"Position":466.0,"HyperDash":false},{"StartTime":217725.0,"Position":86.0,"HyperDash":false},{"StartTime":217809.0,"Position":434.0,"HyperDash":false},{"StartTime":217893.0,"Position":159.0,"HyperDash":false},{"StartTime":217977.0,"Position":493.0,"HyperDash":false},{"StartTime":218061.0,"Position":191.0,"HyperDash":false},{"StartTime":218145.0,"Position":200.0,"HyperDash":false}]},{"StartTime":219041.0,"Objects":[{"StartTime":219041.0,"Position":205.0,"HyperDash":false},{"StartTime":219092.0,"Position":176.805145,"HyperDash":false},{"StartTime":219143.0,"Position":178.610275,"HyperDash":false},{"StartTime":219195.0,"Position":155.058655,"HyperDash":false},{"StartTime":219246.0,"Position":127.8638,"HyperDash":false},{"StartTime":219297.0,"Position":96.12851,"HyperDash":false},{"StartTime":219349.0,"Position":102.176147,"HyperDash":false},{"StartTime":219400.0,"Position":75.54979,"HyperDash":false},{"StartTime":219488.0,"Position":51.8611755,"HyperDash":false}]},{"StartTime":219936.0,"Objects":[{"StartTime":219936.0,"Position":75.0,"HyperDash":false},{"StartTime":219987.0,"Position":82.19486,"HyperDash":false},{"StartTime":220038.0,"Position":115.389725,"HyperDash":false},{"StartTime":220090.0,"Position":110.941345,"HyperDash":false},{"StartTime":220141.0,"Position":143.1362,"HyperDash":false},{"StartTime":220192.0,"Position":161.87149,"HyperDash":false},{"StartTime":220244.0,"Position":186.823853,"HyperDash":false},{"StartTime":220295.0,"Position":188.4502,"HyperDash":false},{"StartTime":220383.0,"Position":228.138824,"HyperDash":false}]},{"StartTime":220832.0,"Objects":[{"StartTime":220832.0,"Position":337.0,"HyperDash":false},{"StartTime":220915.0,"Position":317.352051,"HyperDash":false},{"StartTime":220999.0,"Position":312.6722,"HyperDash":false},{"StartTime":221083.0,"Position":337.992371,"HyperDash":false},{"StartTime":221167.0,"Position":326.29657,"HyperDash":false},{"StartTime":221242.0,"Position":334.67334,"HyperDash":false},{"StartTime":221317.0,"Position":327.066071,"HyperDash":false},{"StartTime":221392.0,"Position":352.458771,"HyperDash":false},{"StartTime":221503.0,"Position":337.0,"HyperDash":false}]},{"StartTime":221951.0,"Objects":[{"StartTime":221951.0,"Position":457.0,"HyperDash":false},{"StartTime":222006.0,"Position":446.041077,"HyperDash":false},{"StartTime":222062.0,"Position":457.04657,"HyperDash":false},{"StartTime":222118.0,"Position":470.052032,"HyperDash":false},{"StartTime":222174.0,"Position":449.0397,"HyperDash":false},{"StartTime":222268.0,"Position":464.369843,"HyperDash":false},{"StartTime":222398.0,"Position":457.0,"HyperDash":false}]},{"StartTime":222623.0,"Objects":[{"StartTime":222623.0,"Position":495.0,"HyperDash":false}]},{"StartTime":223071.0,"Objects":[{"StartTime":223071.0,"Position":331.0,"HyperDash":false},{"StartTime":223154.0,"Position":317.6592,"HyperDash":false},{"StartTime":223238.0,"Position":271.751648,"HyperDash":false},{"StartTime":223322.0,"Position":250.900024,"HyperDash":false},{"StartTime":223406.0,"Position":215.870728,"HyperDash":false},{"StartTime":223481.0,"Position":250.346268,"HyperDash":false},{"StartTime":223556.0,"Position":287.9995,"HyperDash":false},{"StartTime":223631.0,"Position":302.435822,"HyperDash":false},{"StartTime":223742.0,"Position":331.0,"HyperDash":false}]},{"StartTime":223966.0,"Objects":[{"StartTime":223966.0,"Position":399.0,"HyperDash":false}]},{"StartTime":224414.0,"Objects":[{"StartTime":224414.0,"Position":471.0,"HyperDash":false},{"StartTime":224488.0,"Position":457.712158,"HyperDash":false},{"StartTime":224563.0,"Position":447.379883,"HyperDash":false},{"StartTime":224638.0,"Position":456.0476,"HyperDash":false},{"StartTime":224749.0,"Position":456.115845,"HyperDash":false}]},{"StartTime":225086.0,"Objects":[{"StartTime":225086.0,"Position":326.0,"HyperDash":false},{"StartTime":225137.0,"Position":300.208832,"HyperDash":false},{"StartTime":225188.0,"Position":275.417664,"HyperDash":false},{"StartTime":225240.0,"Position":290.316833,"HyperDash":false},{"StartTime":225291.0,"Position":243.612946,"HyperDash":false},{"StartTime":225342.0,"Position":241.580139,"HyperDash":false},{"StartTime":225394.0,"Position":232.193756,"HyperDash":false},{"StartTime":225445.0,"Position":210.16098,"HyperDash":false},{"StartTime":225533.0,"Position":175.045547,"HyperDash":false}]},{"StartTime":225757.0,"Objects":[{"StartTime":225757.0,"Position":88.0,"HyperDash":false},{"StartTime":225850.0,"Position":65.83169,"HyperDash":false},{"StartTime":225980.0,"Position":74.3185,"HyperDash":false}]},{"StartTime":226205.0,"Objects":[{"StartTime":226205.0,"Position":140.0,"HyperDash":false},{"StartTime":226298.0,"Position":123.645569,"HyperDash":false},{"StartTime":226428.0,"Position":143.945816,"HyperDash":false}]},{"StartTime":226653.0,"Objects":[{"StartTime":226653.0,"Position":116.0,"HyperDash":false},{"StartTime":226736.0,"Position":106.660728,"HyperDash":false},{"StartTime":226820.0,"Position":50.7313728,"HyperDash":false},{"StartTime":226904.0,"Position":15.8698654,"HyperDash":false},{"StartTime":226988.0,"Position":3.21379948,"HyperDash":false},{"StartTime":227063.0,"Position":23.62399,"HyperDash":false},{"StartTime":227138.0,"Position":46.0249748,"HyperDash":false},{"StartTime":227213.0,"Position":81.71385,"HyperDash":false},{"StartTime":227324.0,"Position":116.0,"HyperDash":false}]},{"StartTime":227548.0,"Objects":[{"StartTime":227548.0,"Position":202.0,"HyperDash":false},{"StartTime":227641.0,"Position":228.322632,"HyperDash":false},{"StartTime":227771.0,"Position":281.902618,"HyperDash":false}]},{"StartTime":227996.0,"Objects":[{"StartTime":227996.0,"Position":370.0,"HyperDash":false},{"StartTime":228047.0,"Position":379.322418,"HyperDash":false},{"StartTime":228098.0,"Position":404.644836,"HyperDash":false},{"StartTime":228150.0,"Position":412.9706,"HyperDash":false},{"StartTime":228201.0,"Position":407.2122,"HyperDash":false},{"StartTime":228252.0,"Position":406.4538,"HyperDash":false},{"StartTime":228304.0,"Position":390.660919,"HyperDash":false},{"StartTime":228355.0,"Position":399.902527,"HyperDash":false},{"StartTime":228443.0,"Position":393.8684,"HyperDash":false}]},{"StartTime":228892.0,"Objects":[{"StartTime":228892.0,"Position":291.0,"HyperDash":false},{"StartTime":228985.0,"Position":255.7421,"HyperDash":false},{"StartTime":229115.0,"Position":211.252533,"HyperDash":false}]},{"StartTime":229339.0,"Objects":[{"StartTime":229339.0,"Position":136.0,"HyperDash":false},{"StartTime":229432.0,"Position":97.7420959,"HyperDash":false},{"StartTime":229562.0,"Position":56.25254,"HyperDash":false}]},{"StartTime":229787.0,"Objects":[{"StartTime":229787.0,"Position":20.0,"HyperDash":false},{"StartTime":229838.0,"Position":17.0399265,"HyperDash":false},{"StartTime":229889.0,"Position":21.079855,"HyperDash":false},{"StartTime":229941.0,"Position":25.0421333,"HyperDash":false},{"StartTime":229992.0,"Position":22.7113285,"HyperDash":false},{"StartTime":230043.0,"Position":24.4840775,"HyperDash":false},{"StartTime":230095.0,"Position":14.3101463,"HyperDash":false},{"StartTime":230146.0,"Position":9.403353,"HyperDash":false},{"StartTime":230234.0,"Position":15.3877077,"HyperDash":false}]},{"StartTime":230683.0,"Objects":[{"StartTime":230683.0,"Position":156.0,"HyperDash":false},{"StartTime":230776.0,"Position":173.746826,"HyperDash":false},{"StartTime":230906.0,"Position":186.4041,"HyperDash":false}]},{"StartTime":231131.0,"Objects":[{"StartTime":231131.0,"Position":264.0,"HyperDash":false},{"StartTime":231224.0,"Position":253.253189,"HyperDash":false},{"StartTime":231354.0,"Position":233.595917,"HyperDash":false}]},{"StartTime":231578.0,"Objects":[{"StartTime":231578.0,"Position":262.0,"HyperDash":false},{"StartTime":231629.0,"Position":267.8308,"HyperDash":false},{"StartTime":231680.0,"Position":297.661621,"HyperDash":false},{"StartTime":231732.0,"Position":320.886,"HyperDash":false},{"StartTime":231783.0,"Position":341.016968,"HyperDash":false},{"StartTime":231834.0,"Position":347.147919,"HyperDash":false},{"StartTime":231886.0,"Position":352.6344,"HyperDash":false},{"StartTime":231937.0,"Position":373.76535,"HyperDash":false},{"StartTime":232025.0,"Position":417.05014,"HyperDash":false}]},{"StartTime":232250.0,"Objects":[{"StartTime":232250.0,"Position":479.0,"HyperDash":false}]},{"StartTime":232474.0,"Objects":[{"StartTime":232474.0,"Position":500.0,"HyperDash":false},{"StartTime":232567.0,"Position":485.105865,"HyperDash":false},{"StartTime":232697.0,"Position":481.10556,"HyperDash":false}]},{"StartTime":232922.0,"Objects":[{"StartTime":232922.0,"Position":396.0,"HyperDash":false},{"StartTime":233015.0,"Position":344.7835,"HyperDash":false},{"StartTime":233145.0,"Position":320.1601,"HyperDash":false}]},{"StartTime":233369.0,"Objects":[{"StartTime":233369.0,"Position":264.0,"HyperDash":false},{"StartTime":233420.0,"Position":256.891846,"HyperDash":false},{"StartTime":233471.0,"Position":238.654755,"HyperDash":false},{"StartTime":233523.0,"Position":225.308167,"HyperDash":false},{"StartTime":233574.0,"Position":201.429947,"HyperDash":false},{"StartTime":233625.0,"Position":188.241165,"HyperDash":false},{"StartTime":233677.0,"Position":164.716415,"HyperDash":false},{"StartTime":233728.0,"Position":147.656219,"HyperDash":false},{"StartTime":233816.0,"Position":109.216957,"HyperDash":false}]},{"StartTime":234265.0,"Objects":[{"StartTime":234265.0,"Position":39.0,"HyperDash":false},{"StartTime":234320.0,"Position":18.3255081,"HyperDash":false},{"StartTime":234376.0,"Position":20.620575,"HyperDash":false},{"StartTime":234432.0,"Position":27.915638,"HyperDash":false},{"StartTime":234488.0,"Position":32.19548,"HyperDash":false},{"StartTime":234582.0,"Position":41.0421143,"HyperDash":false},{"StartTime":234712.0,"Position":39.0,"HyperDash":false}]},{"StartTime":234936.0,"Objects":[{"StartTime":234936.0,"Position":214.0,"HyperDash":false}]},{"StartTime":235160.0,"Objects":[{"StartTime":235160.0,"Position":206.0,"HyperDash":false},{"StartTime":235215.0,"Position":221.503036,"HyperDash":false},{"StartTime":235271.0,"Position":257.307831,"HyperDash":false},{"StartTime":235327.0,"Position":245.8396,"HyperDash":false},{"StartTime":235383.0,"Position":280.764069,"HyperDash":false},{"StartTime":235439.0,"Position":285.755646,"HyperDash":false},{"StartTime":235495.0,"Position":305.4811,"HyperDash":false},{"StartTime":235551.0,"Position":349.636,"HyperDash":false},{"StartTime":235607.0,"Position":359.014679,"HyperDash":false},{"StartTime":235658.0,"Position":335.625427,"HyperDash":false},{"StartTime":235710.0,"Position":307.9622,"HyperDash":false},{"StartTime":235761.0,"Position":298.080017,"HyperDash":false},{"StartTime":235813.0,"Position":295.555237,"HyperDash":false},{"StartTime":235864.0,"Position":258.349457,"HyperDash":false},{"StartTime":235916.0,"Position":266.998871,"HyperDash":false},{"StartTime":235967.0,"Position":250.476349,"HyperDash":false},{"StartTime":236055.0,"Position":206.0,"HyperDash":false}]},{"StartTime":236280.0,"Objects":[{"StartTime":236280.0,"Position":136.0,"HyperDash":false},{"StartTime":236335.0,"Position":133.3588,"HyperDash":false},{"StartTime":236391.0,"Position":108.360489,"HyperDash":false},{"StartTime":236447.0,"Position":81.36217,"HyperDash":false},{"StartTime":236503.0,"Position":56.1853027,"HyperDash":false},{"StartTime":236597.0,"Position":85.57534,"HyperDash":false},{"StartTime":236727.0,"Position":136.0,"HyperDash":false}]},{"StartTime":236951.0,"Objects":[{"StartTime":236951.0,"Position":203.0,"HyperDash":false},{"StartTime":237002.0,"Position":235.515,"HyperDash":false},{"StartTime":237053.0,"Position":231.03,"HyperDash":false},{"StartTime":237105.0,"Position":235.849213,"HyperDash":false},{"StartTime":237156.0,"Position":257.413,"HyperDash":false},{"StartTime":237207.0,"Position":301.49884,"HyperDash":false},{"StartTime":237259.0,"Position":304.939331,"HyperDash":false},{"StartTime":237310.0,"Position":305.025177,"HyperDash":false},{"StartTime":237398.0,"Position":353.232178,"HyperDash":false}]},{"StartTime":237847.0,"Objects":[{"StartTime":237847.0,"Position":468.0,"HyperDash":false},{"StartTime":237898.0,"Position":450.485,"HyperDash":false},{"StartTime":237949.0,"Position":421.97,"HyperDash":false},{"StartTime":238001.0,"Position":401.1508,"HyperDash":false},{"StartTime":238052.0,"Position":410.587,"HyperDash":false},{"StartTime":238103.0,"Position":391.50116,"HyperDash":false},{"StartTime":238155.0,"Position":374.060669,"HyperDash":false},{"StartTime":238206.0,"Position":362.974823,"HyperDash":false},{"StartTime":238294.0,"Position":317.767822,"HyperDash":false}]},{"StartTime":238742.0,"Objects":[{"StartTime":238742.0,"Position":180.0,"HyperDash":false},{"StartTime":238793.0,"Position":173.605637,"HyperDash":false},{"StartTime":238844.0,"Position":127.565094,"HyperDash":false},{"StartTime":238896.0,"Position":130.980515,"HyperDash":false},{"StartTime":238947.0,"Position":94.05988,"HyperDash":false},{"StartTime":238998.0,"Position":89.93131,"HyperDash":false},{"StartTime":239050.0,"Position":62.7224731,"HyperDash":false},{"StartTime":239101.0,"Position":61.4846268,"HyperDash":false},{"StartTime":239189.0,"Position":40.9435463,"HyperDash":false}]},{"StartTime":239414.0,"Objects":[{"StartTime":239414.0,"Position":1.0,"HyperDash":false}]},{"StartTime":239638.0,"Objects":[{"StartTime":239638.0,"Position":65.0,"HyperDash":false},{"StartTime":239731.0,"Position":90.205574,"HyperDash":false},{"StartTime":239861.0,"Position":144.621979,"HyperDash":false}]},{"StartTime":240086.0,"Objects":[{"StartTime":240086.0,"Position":205.0,"HyperDash":false},{"StartTime":240179.0,"Position":248.205566,"HyperDash":false},{"StartTime":240309.0,"Position":284.621979,"HyperDash":false}]},{"StartTime":240534.0,"Objects":[{"StartTime":240534.0,"Position":366.0,"HyperDash":false},{"StartTime":240585.0,"Position":363.81723,"HyperDash":false},{"StartTime":240636.0,"Position":373.2125,"HyperDash":false},{"StartTime":240688.0,"Position":391.223755,"HyperDash":false},{"StartTime":240739.0,"Position":374.622253,"HyperDash":false},{"StartTime":240790.0,"Position":403.4788,"HyperDash":false},{"StartTime":240842.0,"Position":402.731842,"HyperDash":false},{"StartTime":240893.0,"Position":374.42746,"HyperDash":false},{"StartTime":240981.0,"Position":383.571564,"HyperDash":false}]},{"StartTime":241429.0,"Objects":[{"StartTime":241429.0,"Position":238.0,"HyperDash":false},{"StartTime":241480.0,"Position":236.18277,"HyperDash":false},{"StartTime":241531.0,"Position":235.787491,"HyperDash":false},{"StartTime":241583.0,"Position":219.776245,"HyperDash":false},{"StartTime":241634.0,"Position":209.377747,"HyperDash":false},{"StartTime":241685.0,"Position":209.52121,"HyperDash":false},{"StartTime":241737.0,"Position":227.268158,"HyperDash":false},{"StartTime":241788.0,"Position":224.572525,"HyperDash":false},{"StartTime":241876.0,"Position":220.428436,"HyperDash":false}]},{"StartTime":242325.0,"Objects":[{"StartTime":242325.0,"Position":297.0,"HyperDash":false},{"StartTime":242380.0,"Position":294.727844,"HyperDash":false},{"StartTime":242436.0,"Position":344.7645,"HyperDash":false},{"StartTime":242492.0,"Position":365.6436,"HyperDash":false},{"StartTime":242548.0,"Position":374.1311,"HyperDash":false},{"StartTime":242604.0,"Position":400.993958,"HyperDash":false},{"StartTime":242660.0,"Position":429.0038,"HyperDash":false},{"StartTime":242716.0,"Position":433.924957,"HyperDash":false},{"StartTime":242772.0,"Position":449.6772,"HyperDash":false},{"StartTime":242823.0,"Position":429.0385,"HyperDash":false},{"StartTime":242875.0,"Position":395.5763,"HyperDash":false},{"StartTime":242926.0,"Position":382.350677,"HyperDash":false},{"StartTime":242978.0,"Position":386.8408,"HyperDash":false},{"StartTime":243029.0,"Position":359.934326,"HyperDash":false},{"StartTime":243081.0,"Position":325.105682,"HyperDash":false},{"StartTime":243132.0,"Position":316.240143,"HyperDash":false},{"StartTime":243220.0,"Position":297.0,"HyperDash":false}]},{"StartTime":243444.0,"Objects":[{"StartTime":243444.0,"Position":216.0,"HyperDash":false}]},{"StartTime":243668.0,"Objects":[{"StartTime":243668.0,"Position":136.0,"HyperDash":false},{"StartTime":243761.0,"Position":118.763763,"HyperDash":false},{"StartTime":243891.0,"Position":56.3044968,"HyperDash":false}]},{"StartTime":244116.0,"Objects":[{"StartTime":244116.0,"Position":2.0,"HyperDash":false},{"StartTime":244167.0,"Position":18.7359352,"HyperDash":false},{"StartTime":244218.0,"Position":16.5715733,"HyperDash":false},{"StartTime":244270.0,"Position":30.5787716,"HyperDash":false},{"StartTime":244321.0,"Position":26.5514565,"HyperDash":false},{"StartTime":244372.0,"Position":31.5832443,"HyperDash":false},{"StartTime":244424.0,"Position":12.6607952,"HyperDash":false},{"StartTime":244475.0,"Position":44.7331161,"HyperDash":false},{"StartTime":244563.0,"Position":29.33616,"HyperDash":false}]},{"StartTime":244787.0,"Objects":[{"StartTime":244787.0,"Position":5.0,"HyperDash":false}]},{"StartTime":245011.0,"Objects":[{"StartTime":245011.0,"Position":64.0,"HyperDash":false},{"StartTime":245104.0,"Position":111.355347,"HyperDash":false},{"StartTime":245234.0,"Position":143.98111,"HyperDash":false}]},{"StartTime":245459.0,"Objects":[{"StartTime":245459.0,"Position":223.0,"HyperDash":false},{"StartTime":245552.0,"Position":239.355347,"HyperDash":false},{"StartTime":245682.0,"Position":302.9811,"HyperDash":false}]},{"StartTime":245907.0,"Objects":[{"StartTime":245907.0,"Position":379.0,"HyperDash":false},{"StartTime":245958.0,"Position":388.482635,"HyperDash":false},{"StartTime":246009.0,"Position":389.9838,"HyperDash":false},{"StartTime":246061.0,"Position":389.548859,"HyperDash":false},{"StartTime":246112.0,"Position":388.03,"HyperDash":false},{"StartTime":246163.0,"Position":411.496918,"HyperDash":false},{"StartTime":246215.0,"Position":407.907623,"HyperDash":false},{"StartTime":246266.0,"Position":408.277283,"HyperDash":false},{"StartTime":246354.0,"Position":392.807251,"HyperDash":false}]},{"StartTime":246802.0,"Objects":[{"StartTime":246802.0,"Position":240.0,"HyperDash":false},{"StartTime":246895.0,"Position":229.351563,"HyperDash":false},{"StartTime":247025.0,"Position":219.99736,"HyperDash":false}]},{"StartTime":247250.0,"Objects":[{"StartTime":247250.0,"Position":152.0,"HyperDash":false},{"StartTime":247343.0,"Position":152.648453,"HyperDash":false},{"StartTime":247473.0,"Position":172.00264,"HyperDash":false}]},{"StartTime":247698.0,"Objects":[{"StartTime":247698.0,"Position":118.0,"HyperDash":false},{"StartTime":247749.0,"Position":132.050278,"HyperDash":false},{"StartTime":247800.0,"Position":136.635315,"HyperDash":false},{"StartTime":247852.0,"Position":178.833282,"HyperDash":false},{"StartTime":247903.0,"Position":187.755432,"HyperDash":false},{"StartTime":247954.0,"Position":198.440247,"HyperDash":false},{"StartTime":248006.0,"Position":210.910767,"HyperDash":false},{"StartTime":248057.0,"Position":231.14679,"HyperDash":false},{"StartTime":248145.0,"Position":263.981781,"HyperDash":false}]},{"StartTime":248593.0,"Objects":[{"StartTime":248593.0,"Position":427.0,"HyperDash":false},{"StartTime":248644.0,"Position":435.745178,"HyperDash":false},{"StartTime":248695.0,"Position":436.695557,"HyperDash":false},{"StartTime":248747.0,"Position":452.8285,"HyperDash":false},{"StartTime":248798.0,"Position":483.6382,"HyperDash":false},{"StartTime":248849.0,"Position":486.1087,"HyperDash":false},{"StartTime":248901.0,"Position":482.262,"HyperDash":false},{"StartTime":248952.0,"Position":487.997559,"HyperDash":false},{"StartTime":249040.0,"Position":466.941925,"HyperDash":false}]},{"StartTime":249489.0,"Objects":[{"StartTime":249489.0,"Position":411.0,"HyperDash":false},{"StartTime":249544.0,"Position":390.345581,"HyperDash":false},{"StartTime":249600.0,"Position":379.354645,"HyperDash":false},{"StartTime":249656.0,"Position":353.452728,"HyperDash":false},{"StartTime":249712.0,"Position":332.7199,"HyperDash":false},{"StartTime":249768.0,"Position":300.245636,"HyperDash":false},{"StartTime":249824.0,"Position":302.125122,"HyperDash":false},{"StartTime":249880.0,"Position":276.454742,"HyperDash":false},{"StartTime":249936.0,"Position":257.2194,"HyperDash":false},{"StartTime":249992.0,"Position":266.046967,"HyperDash":false},{"StartTime":250048.0,"Position":259.874542,"HyperDash":false},{"StartTime":250104.0,"Position":287.702118,"HyperDash":false},{"StartTime":250160.0,"Position":273.529663,"HyperDash":false},{"StartTime":250216.0,"Position":266.357239,"HyperDash":false},{"StartTime":250272.0,"Position":273.1848,"HyperDash":false},{"StartTime":250328.0,"Position":293.0124,"HyperDash":false},{"StartTime":250384.0,"Position":303.839966,"HyperDash":false},{"StartTime":250435.0,"Position":300.715057,"HyperDash":false},{"StartTime":250487.0,"Position":268.3105,"HyperDash":false},{"StartTime":250538.0,"Position":273.694855,"HyperDash":false},{"StartTime":250590.0,"Position":252.267029,"HyperDash":false},{"StartTime":250641.0,"Position":220.7485,"HyperDash":false},{"StartTime":250693.0,"Position":222.549347,"HyperDash":false},{"StartTime":250744.0,"Position":192.463943,"HyperDash":false},{"StartTime":250832.0,"Position":161.041138,"HyperDash":false}]},{"StartTime":251280.0,"Objects":[{"StartTime":251280.0,"Position":21.0,"HyperDash":false},{"StartTime":251363.0,"Position":30.73253,"HyperDash":false},{"StartTime":251447.0,"Position":6.497982,"HyperDash":false},{"StartTime":251531.0,"Position":32.2634354,"HyperDash":false},{"StartTime":251615.0,"Position":32.04535,"HyperDash":false},{"StartTime":251690.0,"Position":26.5926552,"HyperDash":false},{"StartTime":251765.0,"Position":30.1235,"HyperDash":false},{"StartTime":251840.0,"Position":42.65435,"HyperDash":false},{"StartTime":251951.0,"Position":21.0,"HyperDash":false}]},{"StartTime":252175.0,"Objects":[{"StartTime":252175.0,"Position":2.0,"HyperDash":false},{"StartTime":252226.0,"Position":0.0,"HyperDash":false},{"StartTime":252277.0,"Position":0.0,"HyperDash":false},{"StartTime":252329.0,"Position":0.0,"HyperDash":false},{"StartTime":252380.0,"Position":21.3323555,"HyperDash":false},{"StartTime":252431.0,"Position":0.887104034,"HyperDash":false},{"StartTime":252483.0,"Position":30.8665218,"HyperDash":false},{"StartTime":252534.0,"Position":43.70045,"HyperDash":false},{"StartTime":252622.0,"Position":61.3145256,"HyperDash":false}]},{"StartTime":253071.0,"Objects":[{"StartTime":253071.0,"Position":388.0,"HyperDash":false}]},{"StartTime":259563.0,"Objects":[{"StartTime":259563.0,"Position":293.0,"HyperDash":false},{"StartTime":259618.0,"Position":312.5664,"HyperDash":false},{"StartTime":259674.0,"Position":329.488525,"HyperDash":false},{"StartTime":259730.0,"Position":338.410675,"HyperDash":false},{"StartTime":259786.0,"Position":372.510681,"HyperDash":false},{"StartTime":259880.0,"Position":328.247833,"HyperDash":false},{"StartTime":260010.0,"Position":293.0,"HyperDash":false}]},{"StartTime":260235.0,"Objects":[{"StartTime":260235.0,"Position":46.0,"HyperDash":false}]},{"StartTime":260683.0,"Objects":[{"StartTime":260683.0,"Position":115.0,"HyperDash":false},{"StartTime":260766.0,"Position":105.132309,"HyperDash":false},{"StartTime":260850.0,"Position":48.58029,"HyperDash":false},{"StartTime":260934.0,"Position":44.7662964,"HyperDash":false},{"StartTime":261018.0,"Position":0.7381573,"HyperDash":false},{"StartTime":261093.0,"Position":18.1906548,"HyperDash":false},{"StartTime":261168.0,"Position":39.9074936,"HyperDash":false},{"StartTime":261243.0,"Position":61.8353424,"HyperDash":false},{"StartTime":261354.0,"Position":115.0,"HyperDash":false}]},{"StartTime":261578.0,"Objects":[{"StartTime":261578.0,"Position":189.0,"HyperDash":false},{"StartTime":261671.0,"Position":204.326355,"HyperDash":false},{"StartTime":261801.0,"Position":268.91156,"HyperDash":false}]},{"StartTime":262026.0,"Objects":[{"StartTime":262026.0,"Position":334.0,"HyperDash":false},{"StartTime":262119.0,"Position":377.326355,"HyperDash":false},{"StartTime":262249.0,"Position":413.91156,"HyperDash":false}]},{"StartTime":262474.0,"Objects":[{"StartTime":262474.0,"Position":480.0,"HyperDash":false},{"StartTime":262557.0,"Position":478.9318,"HyperDash":false},{"StartTime":262641.0,"Position":487.9834,"HyperDash":false},{"StartTime":262725.0,"Position":487.311127,"HyperDash":false},{"StartTime":262809.0,"Position":470.9604,"HyperDash":false},{"StartTime":262884.0,"Position":456.461121,"HyperDash":false},{"StartTime":262959.0,"Position":484.5402,"HyperDash":false},{"StartTime":263034.0,"Position":483.23175,"HyperDash":false},{"StartTime":263145.0,"Position":480.0,"HyperDash":false}]},{"StartTime":263369.0,"Objects":[{"StartTime":263369.0,"Position":497.0,"HyperDash":false},{"StartTime":263462.0,"Position":512.0,"HyperDash":false},{"StartTime":263592.0,"Position":495.6382,"HyperDash":false}]},{"StartTime":263817.0,"Objects":[{"StartTime":263817.0,"Position":374.0,"HyperDash":false}]},{"StartTime":264265.0,"Objects":[{"StartTime":264265.0,"Position":262.0,"HyperDash":false},{"StartTime":264348.0,"Position":218.500381,"HyperDash":false},{"StartTime":264432.0,"Position":198.645355,"HyperDash":false},{"StartTime":264516.0,"Position":171.790344,"HyperDash":false},{"StartTime":264600.0,"Position":142.7576,"HyperDash":false},{"StartTime":264675.0,"Position":162.23616,"HyperDash":false},{"StartTime":264750.0,"Position":212.892441,"HyperDash":false},{"StartTime":264825.0,"Position":225.5487,"HyperDash":false},{"StartTime":264936.0,"Position":262.0,"HyperDash":false}]},{"StartTime":265160.0,"Objects":[{"StartTime":265160.0,"Position":329.0,"HyperDash":false},{"StartTime":265253.0,"Position":325.012848,"HyperDash":false},{"StartTime":265383.0,"Position":319.4394,"HyperDash":false}]},{"StartTime":265608.0,"Objects":[{"StartTime":265608.0,"Position":254.0,"HyperDash":false},{"StartTime":265701.0,"Position":204.112839,"HyperDash":false},{"StartTime":265831.0,"Position":176.4014,"HyperDash":false}]},{"StartTime":266056.0,"Objects":[{"StartTime":266056.0,"Position":95.0,"HyperDash":false},{"StartTime":266139.0,"Position":98.58954,"HyperDash":false},{"StartTime":266223.0,"Position":69.13798,"HyperDash":false},{"StartTime":266307.0,"Position":66.6864243,"HyperDash":false},{"StartTime":266391.0,"Position":81.214325,"HyperDash":false},{"StartTime":266466.0,"Position":67.27553,"HyperDash":false},{"StartTime":266541.0,"Position":104.357269,"HyperDash":false},{"StartTime":266616.0,"Position":108.439018,"HyperDash":false},{"StartTime":266727.0,"Position":95.0,"HyperDash":false}]},{"StartTime":266951.0,"Objects":[{"StartTime":266951.0,"Position":146.0,"HyperDash":false}]},{"StartTime":267175.0,"Objects":[{"StartTime":267175.0,"Position":210.0,"HyperDash":false}]},{"StartTime":267399.0,"Objects":[{"StartTime":267399.0,"Position":264.0,"HyperDash":false},{"StartTime":267492.0,"Position":314.92868,"HyperDash":false},{"StartTime":267622.0,"Position":342.981537,"HyperDash":false}]},{"StartTime":267847.0,"Objects":[{"StartTime":267847.0,"Position":395.0,"HyperDash":false},{"StartTime":267930.0,"Position":404.894226,"HyperDash":false},{"StartTime":268014.0,"Position":439.331,"HyperDash":false},{"StartTime":268098.0,"Position":471.236,"HyperDash":false},{"StartTime":268182.0,"Position":509.962616,"HyperDash":false},{"StartTime":268257.0,"Position":484.739044,"HyperDash":false},{"StartTime":268332.0,"Position":448.118866,"HyperDash":false},{"StartTime":268407.0,"Position":434.531128,"HyperDash":false},{"StartTime":268518.0,"Position":395.0,"HyperDash":false}]},{"StartTime":268742.0,"Objects":[{"StartTime":268742.0,"Position":326.0,"HyperDash":false},{"StartTime":268797.0,"Position":303.009155,"HyperDash":false},{"StartTime":268853.0,"Position":275.691162,"HyperDash":false},{"StartTime":268909.0,"Position":273.2251,"HyperDash":false},{"StartTime":268965.0,"Position":238.87439,"HyperDash":false},{"StartTime":269021.0,"Position":234.523651,"HyperDash":false},{"StartTime":269077.0,"Position":225.172928,"HyperDash":false},{"StartTime":269133.0,"Position":194.8222,"HyperDash":false},{"StartTime":269189.0,"Position":174.471481,"HyperDash":false},{"StartTime":269283.0,"Position":186.943192,"HyperDash":false},{"StartTime":269413.0,"Position":214.870941,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1431386.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1431386.osu
new file mode 100644
index 0000000000..aa82b6ef8c
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1431386.osu
@@ -0,0 +1,560 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:4
+CircleSize:3.3
+OverallDifficulty:4
+ApproachRate:5
+SliderMultiplier:1.6
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+//Break Periods
+2,86704,92468
+2,208494,214259
+2,253271,258363
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+
+[TimingPoints]
+534,447.761194029851,4,2,1,40,1,0
+4116,-100,4,2,1,20,0,0
+4563,-100,4,2,1,40,0,0
+5011,-100,4,2,1,60,0,0
+5459,-100,4,2,1,80,0,0
+5907,-100,4,2,1,80,0,0
+6242,-100,4,2,1,80,0,0
+6578,-100,4,2,1,80,0,0
+6802,-100,4,2,1,80,0,0
+7250,-100,4,2,1,80,0,0
+7922,-100,4,2,1,80,0,0
+14862,-100,4,2,1,80,0,0
+16653,-100,4,2,1,80,0,0
+22922,-100,4,2,1,80,0,0
+23369,-100,4,2,1,80,0,0
+24041,-100,4,2,1,80,0,0
+24265,-100,4,2,1,80,0,0
+26728,-100,4,2,1,80,0,0
+26951,-100,4,2,1,80,0,0
+27175,-100,4,2,1,80,0,0
+27399,-100,4,2,1,80,0,0
+29414,-100,4,2,1,80,0,0
+30981,-100,4,2,1,80,0,0
+38145,-100,4,2,1,80,0,0
+40832,-100,4,2,1,80,0,0
+41728,-100,4,2,1,80,0,0
+45310,-100,4,2,1,40,0,0
+45757,-100,4,2,1,40,0,0
+46205,-100,4,2,1,60,0,0
+46653,-100,4,2,1,80,0,0
+47101,-100,4,2,1,80,0,1
+47436,-100,4,2,1,80,0,1
+47772,-100,4,2,1,80,0,1
+47996,-100,4,2,1,80,0,0
+48892,-100,4,2,1,80,0,1
+56504,-100,4,2,1,80,0,1
+56728,-100,4,2,1,80,0,1
+58295,-100,4,2,1,80,0,1
+58519,-100,4,2,1,80,0,1
+62772,-100,4,2,1,80,0,1
+63220,-100,4,2,1,80,0,1
+63444,-100,4,2,1,80,0,1
+63668,-100,4,2,1,80,0,1
+70832,-100,4,2,1,80,0,1
+71056,-100,4,2,1,80,0,1
+72623,-100,4,2,1,80,0,1
+73071,-100,4,2,1,80,0,1
+73519,-100,4,2,1,80,0,1
+73966,-100,4,2,1,80,0,1
+75757,-100,4,2,1,80,0,1
+75981,-100,4,2,1,80,0,1
+77325,-100,4,2,1,80,0,1
+77548,-100,4,2,1,80,0,0
+80235,-100,4,2,1,80,0,0
+81131,-100,4,2,1,80,0,0
+82922,-100,4,2,1,80,0,0
+84713,-100,4,2,1,80,0,1
+85048,-100,4,2,1,80,0,1
+85384,-100,4,2,1,80,0,1
+85608,-100,4,2,1,80,0,1
+86056,-100,4,2,1,80,0,0
+93444,-100,4,2,1,80,0,0
+93668,-100,4,2,1,80,0,0
+101728,-100,4,2,1,80,0,0
+102175,-100,4,2,0,80,0,0
+102623,-100,4,2,1,80,0,0
+102847,-100,4,2,1,80,0,0
+103071,-100,4,2,1,80,0,0
+116951,-100,4,2,1,80,0,0
+119638,-100,4,2,1,80,0,0
+120534,-100,4,2,1,80,0,0
+124116,-100,4,2,0,80,0,0
+125459,-100,4,2,1,80,0,0
+125907,-100,4,2,1,80,0,1
+126242,-100,4,2,1,80,0,1
+126578,-100,4,2,1,80,0,1
+126802,-100,4,2,1,80,0,0
+127474,-100,4,2,1,80,0,0
+127698,-100,4,2,1,80,0,1
+135310,-100,4,2,1,80,0,1
+135534,-100,4,2,1,80,0,1
+137101,-100,4,2,1,80,0,1
+137325,-100,4,2,1,80,0,1
+142250,-100,4,2,1,80,0,1
+142474,-100,4,2,1,80,0,1
+149638,-100,4,2,1,80,0,1
+149862,-100,4,2,1,80,0,1
+151429,-100,4,2,1,80,0,1
+151877,-100,4,2,1,80,0,1
+152325,-100,4,2,1,80,0,1
+152772,-100,4,2,1,80,0,1
+154563,-100,4,2,1,80,0,1
+154787,-100,4,2,1,80,0,1
+156354,-100,4,2,1,80,0,0
+159041,-100,4,2,1,80,0,0
+159936,-100,4,2,1,80,0,0
+161168,-100,4,2,0,80,0,0
+161728,-100,4,2,1,80,0,0
+162623,-100,4,2,1,80,0,1
+163519,-100,4,2,1,80,0,0
+164414,-100,4,2,1,80,0,1
+165310,-100,4,2,1,80,0,0
+166205,-100,4,2,1,80,0,1
+167101,-100,4,2,1,80,0,0
+168332,-100,4,2,1,80,0,0
+168892,-100,4,2,1,80,0,0
+169787,-100,4,2,1,80,0,1
+170683,-100,4,2,1,80,0,0
+171578,-100,4,2,1,80,0,1
+172474,-100,4,2,1,80,0,0
+173369,-100,4,2,1,80,0,1
+173705,-100,4,2,1,80,0,0
+173929,-100,4,2,0,80,0,0
+174265,-100,4,2,1,80,0,0
+175048,-100,4,2,1,80,0,0
+175608,-100,4,2,1,80,0,0
+175832,-100,4,2,1,80,0,0
+176056,-100,4,2,1,80,0,1
+186131,-100,4,2,1,80,0,1
+186354,-100,4,2,1,80,0,1
+190384,-100,4,2,1,80,0,0
+206504,-100,4,2,1,80,0,0
+206839,-100,4,2,1,80,0,0
+207175,-100,4,2,1,80,0,0
+207399,-100,4,2,1,80,0,0
+207623,-100,4,2,1,80,0,0
+208071,-100,4,2,1,80,0,0
+208295,-100,4,2,1,80,0,0
+219041,-100,4,2,1,80,0,0
+220832,-100,4,2,1,80,0,0
+223071,-100,4,2,1,80,0,1
+223407,-100,4,2,1,80,0,0
+224414,-100,4,2,1,80,0,1
+225086,-100,4,2,1,80,0,1
+225422,-100,4,2,1,80,0,0
+226205,-100,4,2,1,80,0,1
+230235,-100,4,2,1,80,0,1
+230683,-100,4,2,1,80,0,1
+232026,-100,4,2,1,80,0,1
+232474,-100,4,2,1,80,0,1
+232922,-100,4,2,1,80,0,1
+233369,-100,4,2,1,80,0,1
+236951,-100,4,2,1,80,0,0
+239414,-100,4,2,1,80,0,0
+240533,-100,4,2,1,80,0,0
+244116,-100,4,2,1,80,0,0
+247698,-100,4,2,1,80,0,0
+250384,-100,4,2,1,80,0,0
+251280,-100,4,2,1,80,0,0
+251616,-100,4,2,1,80,0,0
+251951,-100,4,2,1,80,0,0
+252175,-100,4,2,1,80,0,0
+252623,-100,4,2,1,80,0,0
+253071,-100,4,2,1,80,0,0
+259563,-100,4,2,1,80,0,0
+260235,-100,4,2,1,80,0,0
+263593,-100,4,2,1,80,0,0
+263817,-100,4,2,1,80,0,0
+267399,-100,4,2,1,80,0,0
+268742,-100,4,2,1,80,0,0
+269414,-100,4,2,1,5,0,0
+
+[HitObjects]
+333,114,534,6,0,B|379:97|379:97|497:110,2,160,4|0|0,3:2|0:2|0:2,0:0:0:0:
+182,204,1877,1,0,0:2:0:0:
+333,290,2325,6,0,B|385:301|385:301|441:292|441:292|497:303,2,160,4|0|0,3:2|0:2|0:2,0:0:0:0:
+182,204,3668,1,0,0:2:0:0:
+26,121,4116,6,0,L|30:34,2,80,12|8|8,3:2|0:2|0:2,0:0:0:0:
+20,297,5011,2,0,P|58:297|100:311,1,80,8|8,0:2|0:2,0:0:0:0:
+178,348,5459,2,0,P|217:335|258:335,1,80,8|8,0:2|0:2,0:0:0:0:
+308,264,5907,6,0,L|445:280,2,120,12|12|12,3:2|3:2|3:2,0:0:0:0:
+224,234,6802,2,0,P|197:171|223:66,1,160,12|12,3:2|0:2,0:0:0:0:
+372,10,7698,6,0,P|389:44|391:94,1,80,4|8,3:2|0:2,0:0:0:0:
+390,173,8145,2,0,L|516:164,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+330,237,9041,2,0,L|234:230,1,80,0|8,3:2|0:2,0:0:0:0:
+171,190,9489,6,0,P|118:184|79:197,1,80,0|8,3:2|0:2,0:0:0:0:
+9,219,9936,2,0,L|0:99,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+28,305,10832,2,0,P|67:300|105:311,1,80,0|8,3:2|0:2,0:0:0:0:
+184,353,11280,5,0,3:2:0:0:
+343,277,11728,2,0,P|404:295|470:285,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+290,206,12623,2,0,L|297:118,1,80,0|8,3:2|0:2,0:0:0:0:
+265,43,13071,6,0,P|222:34|179:42,1,80,0|8,3:2|0:2,0:0:0:0:
+123,100,13519,2,0,L|3:92,2,120,0|0|0,3:2|0:2|0:2,0:0:0:0:
+187,160,14414,1,8,0:2:0:0:
+184,336,14862,6,0,P|218:348|274:342,1,80,4|2,3:2|0:2,0:0:0:0:
+343,310,15310,2,0,L|466:328,2,120,2|2|0,0:2|0:2|3:2,0:0:0:0:
+297,234,16205,1,8,0:2:0:0:
+219,76,16653,6,0,P|176:72|131:90,1,80,4|8,3:2|0:2,0:0:0:0:
+65,129,17101,2,0,P|26:85|17:27,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+144,170,17996,2,0,L|137:250,1,80,0|8,3:2|0:2,0:0:0:0:
+156,336,18444,6,0,P|198:347|241:341,1,80,0|8,3:2|0:2,0:0:0:0:
+309,296,18892,2,0,L|430:310,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+237,245,19787,2,0,P|229:197|236:162,1,80,0|8,3:2|0:2,0:0:0:0:
+296,103,20235,6,0,P|344:95|379:102,1,80,0|8,3:2|0:2,0:0:0:0:
+441,157,20683,2,0,P|423:95|448:35,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+501,220,21578,1,0,3:2:0:0:
+386,353,22026,6,0,B|304:367|241:304|241:304|164:362|79:328,2,320,0|2|0,3:2|3:2|3:2,0:0:0:0:
+465,315,24041,5,12,0:2:0:0:
+497,233,24265,2,0,L|486:100,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+410,247,25160,2,0,P|365:251|331:241,1,80,0|8,3:2|0:2,0:0:0:0:
+262,187,25608,6,0,P|223:176|183:181,1,80,0|8,3:2|0:2,0:0:0:0:
+136,254,26056,2,0,L|145:381,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+67,198,26951,1,0,3:2:0:0:
+118,29,27399,6,0,P|170:19|228:167,1,240,4|8,3:2|0:2,0:0:0:0:
+162,107,28295,2,0,B|240:90|240:90|316:114|316:114|409:97,1,240,4|8,3:2|0:2,0:0:0:0:
+481,84,29190,5,0,3:2:0:0:
+499,170,29414,1,12,0:2:0:0:
+454,246,29638,2,0,L|472:376,2,120,8|8|0,0:2|3:2|0:0,0:0:0:0:
+375,205,30533,2,0,P|329:207|286:227,1,80,8|8,0:2|0:2,0:0:0:0:
+220,263,30981,6,0,P|144:238|52:250,2,160,4|2|2,3:3|3:3|3:3,0:0:0:0:
+365,362,32325,1,2,3:3:0:0:
+480,229,32772,6,0,L|464:55,1,160,2|2,3:3|3:3,0:0:0:0:
+393,18,33444,1,10,0:3:0:0:
+323,72,33668,2,0,L|243:64,1,80,2|10,3:3|0:3,0:0:0:0:
+162,27,34116,2,0,L|82:35,1,80,2|10,3:3|0:3,0:0:0:0:
+31,106,34563,6,0,P|9:176|23:263,2,160,2|2|2,3:3|3:3|3:3,0:0:0:0:
+183,194,35907,1,2,3:3:0:0:
+336,278,36354,6,0,P|407:241|496:243,2,160,2|2|0,3:3|3:3|3:2,0:0:0:0:
+278,344,37474,1,0,3:2:0:0:
+218,278,37698,2,0,P|180:262|137:257,1,80,8|0,0:2|0:2,0:0:0:0:
+55,272,38145,6,0,B|29:230|29:230|47:114,1,160,4|8,3:2|0:2,0:0:0:0:
+188,16,39041,2,0,B|214:58|214:58|196:174,1,160,2|8,3:3|0:2,0:0:0:0:
+305,306,39936,6,0,B|348:305|380:330|380:330|405:305|459:300,1,160,2|8,3:3|0:2,0:0:0:0:
+486,127,40832,2,0,P|475:67|430:19,2,120,4|12|12,3:2|0:2|0:2,0:0:0:0:
+415,180,41728,6,0,P|334:166|260:194,2,160,8|8|8,0:2|0:2|0:2,0:0:0:0:
+353,344,43071,1,8,0:2:0:0:
+181,303,43519,6,0,L|16:319,1,160,8|8,0:2|0:2,0:0:0:0:
+21,142,44414,2,0,L|186:158,1,160,8|8,0:2|0:2,0:0:0:0:
+257,114,45086,1,0,3:2:0:0:
+329,63,45310,6,0,P|485:169|281:268,1,480,12|8,0:2|0:2,0:0:0:0:
+257,114,47101,6,0,B|200:92|200:92|130:110,2,120,12|12|12,0:2|0:2|0:2,0:0:0:0:
+336,151,47996,1,12,0:2:0:0:
+417,185,48220,2,0,L|507:180,2,80,8|8|8,0:2|0:2|0:2,0:0:0:0:
+379,264,48892,6,0,P|338:281|294:280,1,80,4|10,3:2|0:2,0:0:0:0:
+218,257,49339,2,0,P|257:302|263:376,2,120,0|0|10,3:2|0:2|0:2,0:0:0:0:
+142,210,50235,2,0,L|135:124,1,80,0|10,3:2|0:2,0:0:0:0:
+75,65,50683,6,0,P|132:92|231:60,1,160,0|0,3:2|0:0,0:0:0:0:
+295,116,51354,2,0,P|352:89|451:121,1,160,10|10,0:2|0:2,0:0:0:0:
+498,180,52026,1,0,3:2:0:0:
+404,329,52474,6,0,L|320:323,1,80,0|10,3:2|0:2,0:0:0:0:
+251,272,52922,2,0,P|206:288|132:281,2,120,0|0|10,3:2|0:2|0:2,0:0:0:0:
+298,196,53817,2,0,L|295:111,1,80,0|10,3:2|0:2,0:0:0:0:
+249,40,54265,6,0,B|189:34|189:34|145:50|145:50|73:41,1,160,0|0,3:2|3:2,0:0:0:0:
+8,197,55160,2,0,P|46:210|95:206,1,80,0|10,3:2|0:2,0:0:0:0:
+165,171,55608,2,0,P|203:158|252:162,1,80,0|10,3:2|0:2,0:0:0:0:
+329,173,56056,6,0,B|368:223|368:223|361:320,1,160,4|0,3:2|3:2,0:0:0:0:
+189,360,56951,2,0,P|146:358|102:342,1,80,0|10,3:2|0:2,0:0:0:0:
+44,288,57399,2,0,P|46:245|62:201,1,80,0|10,3:2|0:2,0:0:0:0:
+97,131,57847,6,0,B|153:113|203:139|203:139|258:107,1,160,0|0,3:2|3:2,0:0:0:0:
+396,20,58742,2,0,L|409:118,1,80,0|10,3:2|0:2,0:0:0:0:
+473,156,59190,2,0,L|460:254,1,80,0|10,3:2|0:2,0:0:0:0:
+450,322,59638,6,0,P|380:312|293:343,1,160,4|4,3:2|3:2,0:0:0:0:
+215,373,60310,1,10,0:2:0:0:
+127,363,60534,2,0,L|121:273,1,80,4|10,3:2|0:0,0:0:0:0:
+116,195,60981,1,4,3:2:0:0:
+110,18,61429,6,0,P|166:33|232:23,2,120,4|0|10,3:2|0:2|0:2,0:0:0:0:
+22,13,62325,2,0,L|18:107,1,80,0|0,3:2|0:2,0:0:0:0:
+10,180,62772,1,8,0:2:0:0:
+76,238,62996,1,0,3:2:0:0:
+154,197,63220,6,0,P|194:194|242:207,1,80,0|14,3:2|0:2,0:0:0:0:
+307,250,63668,2,0,L|303:371,2,120,0|0|10,3:2|0:2|0:2,0:0:0:0:
+311,162,64563,2,0,P|351:159|399:172,1,80,0|10,3:2|0:2,0:0:0:0:
+435,243,65011,6,0,L|427:53,1,160,0|0,3:2|0:0,0:0:0:0:
+350,41,65683,2,0,P|282:66|196:50,1,160,10|10,0:2|0:2,0:0:0:0:
+116,17,66354,1,0,3:2:0:0:
+44,177,66802,6,0,P|40:219|56:268,1,80,0|10,3:2|0:2,0:0:0:0:
+131,287,67250,2,0,P|83:294|29:360,2,120,0|0|10,3:2|0:2|0:2,0:0:0:0:
+206,332,68145,2,0,L|306:325,1,80,0|10,3:2|0:2,0:0:0:0:
+354,270,68593,6,0,B|360:215|360:215|340:168|340:168|348:100,1,160,0|0,3:2|3:2,0:0:0:0:
+479,230,69489,2,0,L|470:322,1,80,0|10,3:2|0:2,0:0:0:0:
+395,354,69936,2,0,P|357:363|307:352,1,80,0|10,3:2|0:2,0:0:0:0:
+239,314,70384,6,0,B|179:303|125:325|125:325|84:301,1,160,4|0,3:2|3:2,0:0:0:0:
+11,143,71280,2,0,L|114:130,1,80,0|10,3:2|0:2,0:0:0:0:
+152,69,71728,2,0,L|255:82,1,80,0|10,3:2|0:0,0:0:0:0:
+271,157,72175,6,0,P|271:100|345:26,1,160,4|4,3:2|3:2,0:0:0:0:
+425,16,72847,1,10,0:2:0:0:
+489,75,73071,2,0,L|481:176,1,80,4|10,3:2|0:2,0:0:0:0:
+408,203,73519,2,0,L|416:304,1,80,4|0,3:2|0:0,0:0:0:0:
+482,338,73966,6,0,B|402:317|398:370|320:339,1,160,4|0,3:2|3:2,0:0:0:0:
+157,287,74862,2,0,L|71:295,2,80,0|10|0,3:2|0:2|3:2,0:0:0:0:
+226,231,75534,1,10,0:2:0:0:
+288,169,75757,6,0,P|357:197|451:165,2,160,4|0|0,3:2|3:2|3:2,0:0:0:0:
+225,106,76877,2,0,L|233:21,2,80,0|8|0,0:0|0:2|3:2,0:0:0:0:
+172,176,77548,6,0,B|145:218|145:218|165:339,1,160,4|12,3:2|0:2,0:0:0:0:
+9,239,78444,2,0,B|36:197|36:197|16:76,1,160,0|12,3:2|0:2,0:0:0:0:
+186,37,79339,6,0,P|236:79|349:68,1,160,0|12,3:2|0:2,0:0:0:0:
+405,37,80011,1,0,0:2:0:0:
+482,77,80235,2,0,L|472:159,1,80,0|0,3:2|3:2,0:0:0:0:
+392,195,80683,2,0,L|402:277,1,80,12|8,0:2|0:2,0:0:0:0:
+474,324,81131,6,0,P|422:301|298:337,1,160,6|2,3:2|0:2,0:0:0:0:
+148,296,82026,2,0,P|125:244|161:120,1,160,6|2,3:2|0:2,0:0:0:0:
+287,44,82922,6,0,B|364:10|444:39|444:39|356:94|357:165|357:165|441:232|413:331,1,480,6|10,3:2|0:2,0:0:0:0:
+242,304,84713,6,0,L|111:320,2,120,12|12|12,3:2|3:2|3:2,0:0:0:0:
+277,223,85608,2,0,P|214:163|127:159,1,160,12|8,3:2|0:2,0:0:0:0:
+11,270,86504,5,4,3:2:0:0:
+321,111,93668,6,0,P|261:76|315:180,2,320,4|0|4,3:2|0:0|3:2,0:0:0:0:
+321,111,97250,6,0,B|393:147|468:85|468:85|424:181|468:248,2,320,0|0|0,3:2|0:0|3:2,0:0:0:0:
+321,111,100832,6,0,B|284:85|246:78|246:78|175:111|175:111|91:89|91:89|56:104|31:129,2,320,0|2|0,3:2|0:2|3:2,0:0:0:0:
+385,170,102847,5,12,0:2:0:0:
+322,231,103071,2,0,L|185:220,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+404,262,103966,2,0,P|401:311|382:350,1,80,0|8,3:2|0:2,0:0:0:0:
+308,374,104414,6,0,P|259:371|220:352,1,80,0|8,3:2|0:2,0:0:0:0:
+164,300,104862,2,0,L|35:315,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+202,221,105757,1,0,3:2:0:0:
+276,61,106205,6,0,P|371:63|426:190,1,240,4|8,3:2|0:2,0:0:0:0:
+354,230,107101,2,0,B|280:260|202:209|202:209|162:220|122:249,1,240,4|8,3:2|0:2,0:0:0:0:
+55,290,107996,5,0,3:2:0:0:
+0,220,108220,1,12,0:2:0:0:
+43,143,108444,2,0,L|37:23,2,120,8|8|0,0:2|3:2|0:2,0:0:0:0:
+128,164,109339,2,0,P|167:161|212:139,1,80,8|8,0:2|0:2,0:0:0:0:
+242,64,109787,6,0,P|227:110|276:215,2,160,4|2|2,3:3|3:3|3:3,0:0:0:0:
+411,14,111131,1,2,3:3:0:0:
+503,163,111578,6,0,L|484:335,1,160,2|2,3:3|3:3,0:0:0:0:
+405,360,112250,1,10,0:3:0:0:
+333,308,112474,2,0,L|250:316,1,80,2|10,3:3|0:3,0:0:0:0:
+175,357,112922,2,0,L|92:349,1,80,2|10,3:3|0:3,0:0:0:0:
+28,292,113369,6,0,P|13:201|47:120,2,160,2|2|2,3:3|3:3|3:3,0:0:0:0:
+190,222,114713,1,2,3:3:0:0:
+349,148,115160,6,0,B|433:133|419:192|504:176,2,160,2|2|0,3:3|3:3|3:2,0:0:0:0:
+265,176,116280,1,0,3:2:0:0:
+224,254,116504,2,0,L|239:354,1,80,8|0,0:2|0:2,0:0:0:0:
+320,357,116951,6,0,B|428:339|428:339|485:355,1,160,4|8,3:2|0:2,0:0:0:0:
+501,176,117847,2,0,B|393:194|393:194|336:178,1,160,2|8,3:3|0:2,0:0:0:0:
+200,78,118742,6,0,B|159:68|120:86|120:86|86:64|44:71,1,160,2|8,3:3|0:2,0:0:0:0:
+16,244,119638,2,0,L|30:372,2,120,4|12|12,3:2|0:2|0:2,0:0:0:0:
+88,193,120534,6,0,B|142:216|142:216|266:202,2,160,8|8|8,0:2|0:2|0:2,0:0:0:0:
+172,38,121877,1,8,0:2:0:0:
+322,129,122325,6,0,P|351:191|322:281,1,160,8|8,0:2|0:2,0:0:0:0:
+150,284,123220,2,0,P|121:222|150:132,1,160,8|8,0:2|0:2,0:0:0:0:
+194,63,123892,1,0,3:2:0:0:
+277,35,124116,6,0,B|353:64|424:16|424:16|380:99|432:172|432:172|347:133|256:169,1,480,4|8,0:2|0:2,0:0:0:0:
+121,246,125907,6,0,L|133:371,2,120,12|12|12,3:2|3:2|3:2,0:0:0:0:
+104,160,126802,1,12,3:2:0:0:
+88,72,127026,2,0,P|49:66|10:73,2,80,8|8|8,0:2|0:2|0:2,0:0:0:0:
+171,103,127698,6,0,L|257:94,1,80,4|10,3:2|0:2,0:0:0:0:
+333,66,128145,2,0,P|395:41|463:49,2,120,0|0|10,3:2|0:2|0:2,0:0:0:0:
+318,153,129041,2,0,L|312:254,1,80,0|10,3:2|0:2,0:0:0:0:
+304,320,129489,6,0,P|367:359|471:352,1,160,0|0,3:2|0:0,0:0:0:0:
+506,291,130160,2,0,L|489:116,1,160,10|10,0:2|0:2,0:0:0:0:
+483,43,130832,1,0,3:2:0:0:
+308,67,131280,6,0,P|270:81|216:76,1,80,0|10,3:2|0:2,0:0:0:0:
+142,85,131728,2,0,L|157:220,2,120,0|0|10,3:2|0:2|0:2,0:0:0:0:
+55,69,132623,2,0,L|43:169,1,80,0|10,3:2|0:2,0:0:0:0:
+33,235,133071,6,0,P|65:294|164:331,1,160,0|0,3:2|3:2,0:0:0:0:
+275,210,133966,2,0,L|363:214,1,80,0|10,3:2|0:2,0:0:0:0:
+389,294,134414,2,0,L|477:290,1,80,0|10,3:2|0:2,0:0:0:0:
+503,208,134862,6,0,B|511:92|511:92|489:44,1,160,4|0,3:2|3:2,0:0:0:0:
+318,30,135757,2,0,L|230:34,1,80,0|10,3:2|0:2,0:0:0:0:
+204,114,136205,2,0,L|116:110,1,80,0|10,3:2|0:2,0:0:0:0:
+49,62,136653,6,0,B|15:110|19:171|19:171|42:219,1,160,0|0,3:2|3:2,0:0:0:0:
+200,278,137548,2,0,P|215:245|220:193,1,80,0|10,3:2|0:2,0:0:0:0:
+204,114,137996,2,0,P|189:81|184:29,1,80,0|10,3:2|0:2,0:0:0:0:
+270,23,138444,6,0,B|322:48|322:48|446:22,1,160,4|4,3:2|3:2,0:0:0:0:
+490,83,139116,1,10,0:2:0:0:
+504,169,139339,2,0,P|503:213|486:254,1,80,4|10,3:2|0:2,0:0:0:0:
+428,309,139787,1,4,3:2:0:0:
+268,241,140235,6,0,P|272:303|278:371,2,120,4|0|10,3:2|0:2|0:2,0:0:0:0:
+207,176,141131,2,0,L|107:180,1,80,0|0,3:2|0:2,0:0:0:0:
+39,184,141578,1,8,0:2:0:0:
+8,101,141802,1,0,3:2:0:0:
+71,40,142026,6,0,P|127:30|162:36,1,80,0|14,3:2|0:2,0:0:0:0:
+220,85,142474,2,0,L|342:76,2,120,0|0|10,3:2|0:2|0:2,0:0:0:0:
+158,148,143369,2,0,P|150:196|161:241,1,80,0|10,3:2|0:2,0:0:0:0:
+192,306,143817,6,0,B|282:279|272:350|373:314,1,160,0|0,3:2|0:0,0:0:0:0:
+431,294,144489,2,0,L|440:125,1,160,10|10,0:2|0:2,0:0:0:0:
+448,46,145160,1,0,3:2:0:0:
+272,31,145608,6,0,P|223:30|180:43,1,80,0|10,3:2|0:2,0:0:0:0:
+127,96,146056,2,0,L|8:86,2,120,0|0|10,3:2|0:2|0:2,0:0:0:0:
+193,154,146951,2,0,P|194:203|181:246,1,80,0|10,3:2|0:2,0:0:0:0:
+109,276,147399,6,0,B|165:270|165:270|212:283|212:283|271:276,1,160,0|0,3:2|3:2,0:0:0:0:
+441,253,148295,2,0,L|445:166,1,80,0|10,3:2|0:2,0:0:0:0:
+482,93,148742,2,0,L|478:6,1,80,0|10,3:2|0:2,0:0:0:0:
+390,23,149190,6,0,B|351:44|351:44|215:33,1,160,4|0,3:2|3:2,0:0:0:0:
+59,21,150086,2,0,P|43:61|44:104,1,80,0|10,3:2|0:2,0:0:0:0:
+94,169,150534,2,0,P|110:209|109:252,1,80,0|10,3:2|0:2,0:0:0:0:
+42,301,150981,6,0,P|112:280|190:309,1,160,4|4,3:2|3:2,0:0:0:0:
+257,368,151653,1,10,0:2:0:0:
+335,327,151877,2,0,L|327:241,1,80,4|10,3:2|0:2,0:0:0:0:
+264,185,152325,2,0,L|272:99,1,80,12|8,0:0|0:0,0:0:0:0:
+318,30,152772,6,0,P|392:21|479:78,1,160,4|0,3:2|3:2,0:0:0:0:
+494,234,153668,2,0,L|509:340,2,80,0|10|0,3:2|0:2|3:2,0:0:0:0:
+413,198,154339,1,10,0:2:0:0:
+332,234,154563,6,0,P|275:249|179:220,2,160,4|0|0,3:2|3:2|3:2,0:0:0:0:
+413,198,155683,2,0,L|500:212,2,80,0|8|0,0:2|0:2|3:2,0:0:0:0:
+379,116,156354,6,0,B|340:88|340:88|200:105,1,160,4|12,3:2|0:2,0:0:0:0:
+103,225,157250,2,0,B|142:197|142:197|282:214,1,160,0|12,3:2|0:2,0:0:0:0:
+131,338,158145,6,0,P|53:330|-1:274,1,160,0|12,3:2|0:2,0:0:0:0:
+14,187,158817,1,0,0:2:0:0:
+54,108,159041,2,0,L|144:98,1,80,0|0,3:2|3:2,0:0:0:0:
+194,35,159489,2,0,L|284:45,1,80,12|8,0:2|0:2,0:0:0:0:
+354,78,159936,6,0,P|379:136|369:252,1,160,4|0,3:2|0:2,0:0:0:0:
+242,346,160832,2,0,P|217:288|227:172,1,160,4|0,3:2|0:2,0:0:0:0:
+354,78,161728,5,4,3:2:0:0:
+182,37,162175,2,0,L|98:30,1,80,10|2,0:2|3:2,0:0:0:0:
+22,68,162623,2,0,B|5:128|5:128|20:185,2,120,12|12|12,0:2|0:2|0:2,0:0:0:0:
+98,112,163519,5,4,3:2:0:0:
+202,253,163966,2,0,L|303:248,1,80,10|2,0:2|3:2,0:0:0:0:
+355,199,164414,2,0,B|415:182|415:182|472:197,2,120,12|12|12,0:2|0:2|0:2,0:0:0:0:
+274,161,165310,5,4,3:2:0:0:
+110,225,165757,2,0,L|125:325,1,80,10|2,0:2|3:2,0:0:0:0:
+188,362,166205,2,0,B|248:379|248:379|305:364,2,120,12|12|12,0:2|0:2|0:2,0:0:0:0:
+206,275,167101,6,0,P|262:242|380:262,2,160,4|12|12,3:2|0:2|0:2,0:0:0:0:
+98,352,168332,2,0,L|78:212,1,120,4|8,3:2|0:2,0:0:0:0:
+74,144,168892,5,4,3:2:0:0:
+246,110,169339,2,0,L|330:120,1,80,10|2,0:2|3:2,0:0:0:0:
+385,184,169787,2,0,B|445:167|445:167|502:182,2,120,12|12|12,0:2|0:2|0:2,0:0:0:0:
+304,221,170683,5,4,3:2:0:0:
+161,117,171131,2,0,L|59:124,1,80,10|2,0:2|3:2,0:0:0:0:
+22,188,171578,2,0,B|5:248|5:248|20:305,2,120,12|12|12,0:2|0:2|0:2,0:0:0:0:
+108,207,172474,1,4,3:2:0:0:
+279,244,172922,6,0,L|365:238,1,80,10|2,0:2|3:2,0:0:0:0:
+385,154,173369,2,0,B|445:171|445:171|502:156,2,120,12|12|4,0:2|0:2|0:3,0:0:0:0:
+307,111,174265,6,0,L|211:122,1,80,6|2,0:2|3:2,0:0:0:0:
+148,159,174713,2,0,L|5:142,2,120,14|6|0,0:2|3:2|0:2,0:0:0:0:
+222,206,175608,1,8,0:2:0:0:
+387,266,176056,6,0,P|416:206|409:150,2,120,6|2|8,3:2|0:2|0:2,0:0:0:0:
+302,291,176951,2,0,B|212:264|234:332|122:296,1,160,0|2,3:2|3:2,0:0:0:0:
+66,266,177623,1,10,0:2:0:0:
+93,182,177847,6,0,L|197:173,2,80,2|10|2,3:2|0:2|3:2,0:0:0:0:
+20,131,178519,2,0,P|47:58|150:26,1,160,10|8,0:2|0:2,0:0:0:0:
+205,17,179190,1,0,3:2:0:0:
+381,12,179638,6,0,L|485:21,1,80,2|10,3:2|0:2,0:0:0:0:
+499,99,180086,2,0,P|500:152|472:220,2,120,2|2|10,3:2|0:2|0:2,0:0:0:0:
+411,111,180981,1,2,3:2:0:0:
+237,142,181429,6,0,L|139:134,1,80,2|10,3:2|0:2,0:0:0:0:
+69,124,181877,2,0,P|48:55|48:-4,2,120,2|2|12,3:2|0:2|0:2,0:0:0:0:
+102,205,182772,1,4,3:2:0:0:
+172,258,182996,1,12,0:2:0:0:
+258,276,183220,6,0,B|350:261|319:316|412:306,1,160,2|2,3:2|3:2,0:0:0:0:
+500,154,184116,2,0,L|509:25,2,120,2|2|10,3:2|0:2|0:2,0:0:0:0:
+424,198,185011,6,0,P|354:203|335:196,1,80,2|10,3:2|0:2,0:0:0:0:
+273,148,185459,2,0,P|185:136|141:162,1,120,2|2,3:2|0:2,0:0:0:0:
+66,243,186131,2,0,B|108:269|108:269|218:257,1,160,14|10,0:2|0:2,0:0:0:0:
+301,230,186802,6,0,L|398:240,1,80,2|10,3:2|0:2,0:0:0:0:
+468,250,187250,2,0,P|483:178|488:111,2,120,2|2|10,3:2|0:2|0:2,0:0:0:0:
+430,329,188145,1,2,3:2:0:0:
+255,364,188593,6,0,L|157:353,1,80,2|14,3:2|0:2,0:0:0:0:
+140,274,189041,2,0,P|68:289|1:294,2,120,2|2|0,3:2|3:2|0:0,0:0:0:0:
+205,215,189936,1,0,3:2:0:0:
+297,64,190384,6,0,L|424:52,2,120,4|0|10,3:3|0:2|0:3,0:0:0:0:
+233,125,191280,2,0,P|263:228|384:244,1,240,2|10,3:3|0:3,0:0:0:0:
+468,231,192175,6,0,L|462:375,2,120,2|0|10,3:3|0:2|0:3,0:0:0:0:
+497,146,193071,2,0,P|461:39|348:26,1,240,2|10,3:3|0:3,0:0:0:0:
+292,94,193966,6,0,L|298:238,2,120,2|0|10,3:3|0:2|0:3,0:0:0:0:
+233,27,194862,2,0,P|120:39|84:147,1,240,2|10,3:3|0:3,0:0:0:0:
+120,227,195757,5,2,3:3:0:0:
+292,261,196205,2,0,L|436:247,2,120,2|0|10,3:3|0:2|0:3,0:0:0:0:
+224,317,197101,2,0,L|124:307,1,80,2|10,3:3|0:3,0:0:0:0:
+66,267,197548,6,0,P|49:324|12:370,2,120,6|0|10,3:3|0:2|0:3,0:0:0:0:
+42,181,198444,2,0,P|104:79|251:69,1,240,2|10,3:3|0:3,0:0:0:0:
+292,100,199339,6,0,B|344:83|344:83|418:94,2,120,2|0|10,3:3|0:2|0:3,0:0:0:0:
+235,168,200235,2,0,P|259:282|359:341,1,240,2|10,3:3|0:3,0:0:0:0:
+447,330,201131,5,6,3:3:0:0:
+472,156,201578,2,0,L|371:143,1,80,2|10,3:3|0:3,0:0:0:0:
+323,90,202026,2,0,P|264:83|212:50,2,120,6|0|10,3:3|0:2|0:3,0:0:0:0:
+370,15,202922,5,6,3:3:0:0:
+472,156,203369,2,0,L|457:251,1,80,2|10,3:3|0:3,0:0:0:0:
+373,256,203817,2,0,P|397:327|399:371,2,120,6|0|10,3:3|0:2|0:3,0:0:0:0:
+294,214,204713,6,0,B|224:243|224:243|111:225,1,160,6|6,3:3|3:3,0:0:0:0:
+29,93,205608,2,0,B|99:64|99:64|212:82,1,160,6|10,3:3|0:3,0:0:0:0:
+267,99,206280,1,2,3:3:0:0:
+344,141,206504,6,0,P|407:124|472:149,2,120,12|12|12,3:2|3:2|3:2,0:0:0:0:
+294,214,207399,2,0,P|325:292|499:216,1,320,12|4,3:2|3:2,0:0:0:0:
+256,192,215459,12,6,218145,3:2:0:0:
+205,114,219041,6,0,B|119:107|119:107|44:141,1,160,12|12,3:2|3:2,0:0:0:0:
+75,311,219936,2,0,B|161:318|161:318|236:284,1,160,12|12,3:2|3:2,0:0:0:0:
+337,149,220832,6,0,L|325:15,2,120,12|12|12,3:2|3:2|3:2,0:0:0:0:
+457,277,221951,2,0,L|447:377,2,80,0|8|8,3:2|0:2|0:2,0:0:0:0:
+471,189,222623,5,2,0:2:0:0:
+331,81,223071,2,0,B|279:103|279:103|200:94,2,120,4|8|0,3:2|0:2|3:2,0:0:0:0:
+399,26,223966,1,8,0:2:0:0:
+471,189,224414,6,0,L|453:333,1,120,12|12,3:2|3:2,0:0:0:0:
+326,335,225086,2,0,B|276:306|276:306|149:326,1,160,12|0,3:2|0:2,0:0:0:0:
+88,340,225757,2,0,P|75:299|76:251,1,80,8|8,0:2|0:2,0:0:0:0:
+140,204,226205,6,0,L|144:123,1,80,4|10,3:2|0:2,0:0:0:0:
+116,40,226653,2,0,P|58:49|3:25,2,120,0|0|10,3:2|0:2|0:2,0:0:0:0:
+202,21,227548,2,0,L|283:25,1,80,0|10,3:2|0:2,0:0:0:0:
+370,29,227996,6,0,B|404:72|404:72|392:196,1,160,0|0,3:2|3:2,0:0:0:0:
+291,320,228892,2,0,L|178:329,1,80,0|10,3:2|0:2,0:0:0:0:
+136,373,229339,2,0,L|23:364,1,80,0|10,3:2|0:2,0:0:0:0:
+20,285,229787,6,0,B|8:231|8:231|24:183|24:183|14:121,1,160,4|0,3:2|3:2,0:0:0:0:
+156,24,230683,2,0,P|182:74|187:103,1,80,0|10,3:2|0:2,0:0:0:0:
+264,138,231131,2,0,P|238:188|233:217,1,80,0|10,3:2|0:2,0:0:0:0:
+262,293,231578,6,0,B|312:314|312:314|440:299,1,160,4|4,3:2|3:2,0:0:0:0:
+479,239,232250,1,10,0:2:0:0:
+500,153,232474,2,0,P|499:119|481:77,1,80,4|10,3:2|0:2,0:0:0:0:
+396,50,232922,2,0,P|362:51|320:69,1,80,4|0,3:2|0:0,0:0:0:0:
+264,138,233369,6,0,B|173:153|201:102|101:116,1,160,4|0,3:2|3:2,0:0:0:0:
+39,277,234265,2,0,L|32:359,2,80,0|10|0,3:2|0:2|3:2,0:0:0:0:
+123,252,234936,1,10,0:2:0:0:
+206,225,235160,6,0,P|261:245|383:213,2,160,4|0|0,3:2|3:2|3:2,0:0:0:0:
+136,169,236280,2,0,L|48:175,2,80,0|8|0,0:2|0:2|3:2,0:0:0:0:
+203,112,236951,6,0,B|253:81|253:81|377:98,1,160,4|12,3:2|0:2,0:0:0:0:
+468,228,237847,2,0,B|418:197|418:197|294:214,1,160,0|12,3:2|0:2,0:0:0:0:
+180,321,238742,6,0,P|120:328|31:252,1,160,0|12,3:2|0:2,0:0:0:0:
+16,188,239414,1,0,0:2:0:0:
+65,115,239638,2,0,L|147:107,1,80,0|0,3:2|3:2,0:0:0:0:
+205,43,240086,2,0,L|287:51,1,80,12|0,0:2|0:2,0:0:0:0:
+366,83,240534,6,0,P|389:155|382:244,1,160,0|12,3:2|0:2,0:0:0:0:
+238,338,241429,2,0,P|215:266|222:177,1,160,0|12,3:2|0:2,0:0:0:0:
+297,24,242325,6,0,P|369:54|462:47,2,160,0|12|0,3:2|0:2|3:2,0:0:0:0:
+216,60,243444,1,0,3:2:0:0:
+136,96,243668,2,0,L|56:89,1,80,8|8,0:2|0:2,0:0:0:0:
+2,18,244116,6,0,P|26:102|26:206,1,160,4|0,3:2|3:2,0:0:0:0:
+5,259,244787,1,8,0:2:0:0:
+64,324,245011,2,0,L|156:326,1,80,0|8,3:2|0:2,0:0:0:0:
+223,364,245459,2,0,L|315:362,1,80,0|8,3:2|0:2,0:0:0:0:
+379,318,245907,6,0,P|395:247|390:145,1,160,4|0,3:2|3:2,0:0:0:0:
+240,72,246802,2,0,P|225:116|220:149,1,80,8|8,3:2|3:2,0:0:0:0:
+152,205,247250,2,0,P|167:249|172:282,1,80,8|8,3:2|3:2,0:0:0:0:
+118,352,247698,6,0,P|174:314|275:316,1,160,4|0,3:2|0:0,0:0:0:0:
+427,377,248593,2,0,P|465:321|463:220,1,160,4|0,3:2|0:0,0:0:0:0:
+411,63,249489,6,0,B|326:66|257:31|257:31|306:192|306:192|227:143|142:154,1,480,4|10,3:2|0:2,0:0:0:0:
+21,259,251280,6,0,L|32:378,2,120,12|12|12,3:2|3:2|3:2,0:0:0:0:
+2,173,252175,2,0,P|19:77|84:24,1,160,12|12,3:2|0:2,0:0:0:0:
+236,14,253071,5,4,3:2:0:0:
+293,276,259563,6,0,L|392:265,2,80,12|4|12,0:2|3:2|0:2,0:0:0:0:
+219,324,260235,5,0,3:2:0:0:
+115,181,260683,2,0,P|59:205|-18:200,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+189,133,261578,2,0,L|274:137,1,80,0|8,3:2|0:2,0:0:0:0:
+334,195,262026,6,0,L|419:191,1,80,0|8,3:2|0:2,0:0:0:0:
+480,132,262474,2,0,P|469:74|471:13,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+497,218,263369,2,0,P|500:258|494:305,1,80,0|8,3:2|0:2,0:0:0:0:
+434,361,263817,5,0,3:2:0:0:
+262,319,264265,2,0,L|138:333,2,120,0|0|8,3:2|0:2|0:2,0:0:0:0:
+329,262,265160,2,0,L|316:154,1,80,0|8,3:2|0:2,0:0:0:0:
+254,123,265608,6,0,P|205:120|161:140,1,80,0|8,3:2|0:2,0:0:0:0:
+95,164,266056,2,0,L|78:17,2,120,0|0|0,3:2|0:2|0:2,0:0:0:0:
+112,250,266951,1,8,0:2:0:0:
+178,308,267175,1,8,0:2:0:0:
+264,289,267399,6,0,P|301:284|368:300,1,80,2|2,3:2|0:2,0:0:0:0:
+395,218,267847,2,0,P|451:236|510:225,2,120,2|2|0,0:2|0:2|3:2,0:0:0:0:
+326,162,268742,6,0,B|274:185|274:185|158:154|158:154|231:119,1,240,12|0,0:2|0:0,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1597806-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1597806-expected-conversion.json
new file mode 100644
index 0000000000..c14bdf1453
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1597806-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":42.0,"Objects":[{"StartTime":42.0,"Position":288.0,"HyperDash":false},{"StartTime":124.0,"Position":246.095245,"HyperDash":false},{"StartTime":242.0,"Position":217.560577,"HyperDash":false}]},{"StartTime":443.0,"Objects":[{"StartTime":443.0,"Position":125.0,"HyperDash":false},{"StartTime":525.0,"Position":139.98082,"HyperDash":false},{"StartTime":643.0,"Position":171.8503,"HyperDash":false}]},{"StartTime":845.0,"Objects":[{"StartTime":845.0,"Position":95.0,"HyperDash":false},{"StartTime":927.0,"Position":92.32658,"HyperDash":false},{"StartTime":1045.0,"Position":117.385254,"HyperDash":false}]},{"StartTime":1247.0,"Objects":[{"StartTime":1247.0,"Position":250.0,"HyperDash":false},{"StartTime":1329.0,"Position":235.381714,"HyperDash":false},{"StartTime":1447.0,"Position":177.760284,"HyperDash":false}]},{"StartTime":1649.0,"Objects":[{"StartTime":1649.0,"Position":277.0,"HyperDash":false},{"StartTime":1731.0,"Position":323.6183,"HyperDash":false},{"StartTime":1849.0,"Position":349.239716,"HyperDash":false}]},{"StartTime":2051.0,"Objects":[{"StartTime":2051.0,"Position":448.0,"HyperDash":false},{"StartTime":2133.0,"Position":419.48,"HyperDash":false},{"StartTime":2251.0,"Position":376.0,"HyperDash":false}]},{"StartTime":2453.0,"Objects":[{"StartTime":2453.0,"Position":499.0,"HyperDash":false},{"StartTime":2535.0,"Position":501.8066,"HyperDash":false},{"StartTime":2653.0,"Position":496.029449,"HyperDash":false}]},{"StartTime":2855.0,"Objects":[{"StartTime":2855.0,"Position":397.0,"HyperDash":false},{"StartTime":2937.0,"Position":385.11322,"HyperDash":false},{"StartTime":3055.0,"Position":393.946869,"HyperDash":false}]},{"StartTime":3257.0,"Objects":[{"StartTime":3257.0,"Position":295.0,"HyperDash":false},{"StartTime":3339.0,"Position":290.097748,"HyperDash":false},{"StartTime":3457.0,"Position":291.69043,"HyperDash":false}]},{"StartTime":3658.0,"Objects":[{"StartTime":3658.0,"Position":134.0,"HyperDash":false},{"StartTime":3740.0,"Position":152.636856,"HyperDash":false},{"StartTime":3858.0,"Position":208.724045,"HyperDash":false}]},{"StartTime":4060.0,"Objects":[{"StartTime":4060.0,"Position":95.0,"HyperDash":false},{"StartTime":4142.0,"Position":103.823456,"HyperDash":false},{"StartTime":4260.0,"Position":126.276718,"HyperDash":false}]},{"StartTime":4462.0,"Objects":[{"StartTime":4462.0,"Position":217.0,"HyperDash":false},{"StartTime":4544.0,"Position":213.344086,"HyperDash":false},{"StartTime":4662.0,"Position":173.936813,"HyperDash":false}]},{"StartTime":4864.0,"Objects":[{"StartTime":4864.0,"Position":268.0,"HyperDash":false},{"StartTime":4946.0,"Position":265.3267,"HyperDash":false},{"StartTime":5064.0,"Position":265.68042,"HyperDash":false}]},{"StartTime":5266.0,"Objects":[{"StartTime":5266.0,"Position":418.0,"HyperDash":false},{"StartTime":5348.0,"Position":385.913544,"HyperDash":false},{"StartTime":5466.0,"Position":354.807678,"HyperDash":false}]},{"StartTime":5668.0,"Objects":[{"StartTime":5668.0,"Position":356.0,"HyperDash":false},{"StartTime":5750.0,"Position":390.300568,"HyperDash":false},{"StartTime":5868.0,"Position":421.002045,"HyperDash":false}]},{"StartTime":6070.0,"Objects":[{"StartTime":6070.0,"Position":265.0,"HyperDash":false},{"StartTime":6152.0,"Position":215.764069,"HyperDash":false},{"StartTime":6270.0,"Position":191.253845,"HyperDash":false}]},{"StartTime":6472.0,"Objects":[{"StartTime":6472.0,"Position":35.0,"HyperDash":false},{"StartTime":6554.0,"Position":56.2359238,"HyperDash":false},{"StartTime":6672.0,"Position":108.746155,"HyperDash":false}]},{"StartTime":6873.0,"Objects":[{"StartTime":6873.0,"Position":265.0,"HyperDash":false},{"StartTime":6955.0,"Position":252.764084,"HyperDash":false},{"StartTime":7073.0,"Position":191.253845,"HyperDash":false}]},{"StartTime":7275.0,"Objects":[{"StartTime":7275.0,"Position":323.0,"HyperDash":false},{"StartTime":7357.0,"Position":370.397949,"HyperDash":false},{"StartTime":7475.0,"Position":390.779846,"HyperDash":false}]},{"StartTime":7677.0,"Objects":[{"StartTime":7677.0,"Position":493.0,"HyperDash":false},{"StartTime":7759.0,"Position":475.602051,"HyperDash":false},{"StartTime":7877.0,"Position":425.220154,"HyperDash":false}]},{"StartTime":8079.0,"Objects":[{"StartTime":8079.0,"Position":323.0,"HyperDash":false},{"StartTime":8161.0,"Position":345.397949,"HyperDash":false},{"StartTime":8279.0,"Position":390.779846,"HyperDash":false}]},{"StartTime":8481.0,"Objects":[{"StartTime":8481.0,"Position":273.0,"HyperDash":false}]},{"StartTime":8682.0,"Objects":[{"StartTime":8682.0,"Position":187.0,"HyperDash":false}]},{"StartTime":8883.0,"Objects":[{"StartTime":8883.0,"Position":101.0,"HyperDash":false}]},{"StartTime":9084.0,"Objects":[{"StartTime":9084.0,"Position":187.0,"HyperDash":false}]},{"StartTime":9285.0,"Objects":[{"StartTime":9285.0,"Position":101.0,"HyperDash":false}]},{"StartTime":9486.0,"Objects":[{"StartTime":9486.0,"Position":15.0,"HyperDash":false}]},{"StartTime":9687.0,"Objects":[{"StartTime":9687.0,"Position":187.0,"HyperDash":false},{"StartTime":9769.0,"Position":140.010742,"HyperDash":false},{"StartTime":9887.0,"Position":113.855469,"HyperDash":false}]},{"StartTime":10088.0,"Objects":[{"StartTime":10088.0,"Position":264.0,"HyperDash":false},{"StartTime":10170.0,"Position":285.762848,"HyperDash":false},{"StartTime":10288.0,"Position":285.372772,"HyperDash":false}]},{"StartTime":10490.0,"Objects":[{"StartTime":10490.0,"Position":287.0,"HyperDash":false},{"StartTime":10572.0,"Position":302.9239,"HyperDash":false},{"StartTime":10690.0,"Position":338.033844,"HyperDash":false}]},{"StartTime":10892.0,"Objects":[{"StartTime":10892.0,"Position":422.0,"HyperDash":false},{"StartTime":10974.0,"Position":429.5159,"HyperDash":false},{"StartTime":11092.0,"Position":417.753174,"HyperDash":false}]},{"StartTime":11294.0,"Objects":[{"StartTime":11294.0,"Position":287.0,"HyperDash":false},{"StartTime":11376.0,"Position":299.820526,"HyperDash":false},{"StartTime":11494.0,"Position":348.207428,"HyperDash":false}]},{"StartTime":11696.0,"Objects":[{"StartTime":11696.0,"Position":166.0,"HyperDash":false},{"StartTime":11778.0,"Position":186.67955,"HyperDash":false},{"StartTime":11896.0,"Position":232.26709,"HyperDash":false}]},{"StartTime":12098.0,"Objects":[{"StartTime":12098.0,"Position":332.0,"HyperDash":false},{"StartTime":12180.0,"Position":300.8351,"HyperDash":false},{"StartTime":12298.0,"Position":258.427124,"HyperDash":false}]},{"StartTime":12500.0,"Objects":[{"StartTime":12500.0,"Position":394.0,"HyperDash":false},{"StartTime":12582.0,"Position":438.1649,"HyperDash":false},{"StartTime":12700.0,"Position":467.572876,"HyperDash":false}]},{"StartTime":12902.0,"Objects":[{"StartTime":12902.0,"Position":332.0,"HyperDash":false},{"StartTime":12984.0,"Position":286.8351,"HyperDash":false},{"StartTime":13102.0,"Position":258.427124,"HyperDash":false}]},{"StartTime":13303.0,"Objects":[{"StartTime":13303.0,"Position":413.0,"HyperDash":false},{"StartTime":13385.0,"Position":402.2547,"HyperDash":false},{"StartTime":13503.0,"Position":417.4853,"HyperDash":false}]},{"StartTime":13705.0,"Objects":[{"StartTime":13705.0,"Position":327.0,"HyperDash":false},{"StartTime":13787.0,"Position":319.2547,"HyperDash":false},{"StartTime":13905.0,"Position":331.4853,"HyperDash":false}]},{"StartTime":14107.0,"Objects":[{"StartTime":14107.0,"Position":241.0,"HyperDash":false},{"StartTime":14189.0,"Position":262.25473,"HyperDash":false},{"StartTime":14307.0,"Position":245.485291,"HyperDash":false}]},{"StartTime":14509.0,"Objects":[{"StartTime":14509.0,"Position":118.0,"HyperDash":false},{"StartTime":14591.0,"Position":165.460083,"HyperDash":false},{"StartTime":14709.0,"Position":192.2929,"HyperDash":false}]},{"StartTime":14911.0,"Objects":[{"StartTime":14911.0,"Position":297.0,"HyperDash":false},{"StartTime":14993.0,"Position":276.830261,"HyperDash":false},{"StartTime":15111.0,"Position":250.244568,"HyperDash":false}]},{"StartTime":15313.0,"Objects":[{"StartTime":15313.0,"Position":273.0,"HyperDash":false},{"StartTime":15395.0,"Position":254.357025,"HyperDash":false},{"StartTime":15513.0,"Position":244.602539,"HyperDash":false}]},{"StartTime":15715.0,"Objects":[{"StartTime":15715.0,"Position":235.0,"HyperDash":false},{"StartTime":15797.0,"Position":262.7597,"HyperDash":false},{"StartTime":15915.0,"Position":306.7758,"HyperDash":false}]},{"StartTime":16117.0,"Objects":[{"StartTime":16117.0,"Position":441.0,"HyperDash":false},{"StartTime":16199.0,"Position":431.2403,"HyperDash":false},{"StartTime":16317.0,"Position":369.2242,"HyperDash":false}]},{"StartTime":16518.0,"Objects":[{"StartTime":16518.0,"Position":235.0,"HyperDash":false},{"StartTime":16600.0,"Position":257.7597,"HyperDash":false},{"StartTime":16718.0,"Position":306.7758,"HyperDash":false}]},{"StartTime":16920.0,"Objects":[{"StartTime":16920.0,"Position":436.0,"HyperDash":false},{"StartTime":17002.0,"Position":444.7306,"HyperDash":false},{"StartTime":17120.0,"Position":445.098969,"HyperDash":false}]},{"StartTime":17322.0,"Objects":[{"StartTime":17322.0,"Position":345.0,"HyperDash":false},{"StartTime":17404.0,"Position":386.333862,"HyperDash":false},{"StartTime":17522.0,"Position":414.106964,"HyperDash":false}]},{"StartTime":17724.0,"Objects":[{"StartTime":17724.0,"Position":208.0,"HyperDash":false},{"StartTime":17806.0,"Position":249.6,"HyperDash":false},{"StartTime":17924.0,"Position":268.0,"HyperDash":false}]},{"StartTime":18126.0,"Objects":[{"StartTime":18126.0,"Position":187.0,"HyperDash":false}]},{"StartTime":18528.0,"Objects":[{"StartTime":18528.0,"Position":187.0,"HyperDash":false}]},{"StartTime":18930.0,"Objects":[{"StartTime":18930.0,"Position":187.0,"HyperDash":false}]},{"StartTime":19332.0,"Objects":[{"StartTime":19332.0,"Position":187.0,"HyperDash":false}]},{"StartTime":19532.0,"Objects":[{"StartTime":19532.0,"Position":187.0,"HyperDash":false}]},{"StartTime":19733.0,"Objects":[{"StartTime":19733.0,"Position":345.0,"HyperDash":false}]},{"StartTime":19933.0,"Objects":[{"StartTime":19933.0,"Position":257.0,"HyperDash":false}]},{"StartTime":20135.0,"Objects":[{"StartTime":20135.0,"Position":471.0,"HyperDash":false}]},{"StartTime":20335.0,"Objects":[{"StartTime":20335.0,"Position":384.0,"HyperDash":false}]},{"StartTime":20537.0,"Objects":[{"StartTime":20537.0,"Position":284.0,"HyperDash":false}]},{"StartTime":20737.0,"Objects":[{"StartTime":20737.0,"Position":371.0,"HyperDash":false}]},{"StartTime":20938.0,"Objects":[{"StartTime":20938.0,"Position":157.0,"HyperDash":false}]},{"StartTime":21140.0,"Objects":[{"StartTime":21140.0,"Position":244.0,"HyperDash":false}]},{"StartTime":21340.0,"Objects":[{"StartTime":21340.0,"Position":188.0,"HyperDash":false}]},{"StartTime":21542.0,"Objects":[{"StartTime":21542.0,"Position":188.0,"HyperDash":false}]},{"StartTime":21743.0,"Objects":[{"StartTime":21743.0,"Position":345.0,"HyperDash":false}]},{"StartTime":21944.0,"Objects":[{"StartTime":21944.0,"Position":250.0,"HyperDash":false}]},{"StartTime":22145.0,"Objects":[{"StartTime":22145.0,"Position":419.0,"HyperDash":false},{"StartTime":22227.0,"Position":405.25,"HyperDash":false},{"StartTime":22345.0,"Position":344.0,"HyperDash":false}]},{"StartTime":22547.0,"Objects":[{"StartTime":22547.0,"Position":196.0,"HyperDash":false},{"StartTime":22629.0,"Position":241.75,"HyperDash":false},{"StartTime":22747.0,"Position":271.0,"HyperDash":false}]},{"StartTime":22948.0,"Objects":[{"StartTime":22948.0,"Position":419.0,"HyperDash":false}]},{"StartTime":23149.0,"Objects":[{"StartTime":23149.0,"Position":344.0,"HyperDash":false}]},{"StartTime":23350.0,"Objects":[{"StartTime":23350.0,"Position":305.0,"HyperDash":false},{"StartTime":23432.0,"Position":326.616516,"HyperDash":false},{"StartTime":23550.0,"Position":306.871063,"HyperDash":false}]},{"StartTime":23752.0,"Objects":[{"StartTime":23752.0,"Position":240.0,"HyperDash":false},{"StartTime":23834.0,"Position":244.383484,"HyperDash":false},{"StartTime":23952.0,"Position":238.128937,"HyperDash":false}]},{"StartTime":24154.0,"Objects":[{"StartTime":24154.0,"Position":429.0,"HyperDash":false},{"StartTime":24236.0,"Position":381.322876,"HyperDash":false},{"StartTime":24354.0,"Position":354.177734,"HyperDash":false}]},{"StartTime":24556.0,"Objects":[{"StartTime":24556.0,"Position":232.0,"HyperDash":false},{"StartTime":24638.0,"Position":267.677124,"HyperDash":false},{"StartTime":24756.0,"Position":306.822266,"HyperDash":false}]},{"StartTime":24958.0,"Objects":[{"StartTime":24958.0,"Position":429.0,"HyperDash":false},{"StartTime":25040.0,"Position":386.322876,"HyperDash":false},{"StartTime":25158.0,"Position":354.177734,"HyperDash":false}]},{"StartTime":25360.0,"Objects":[{"StartTime":25360.0,"Position":501.0,"HyperDash":false}]},{"StartTime":25561.0,"Objects":[{"StartTime":25561.0,"Position":429.0,"HyperDash":false}]},{"StartTime":25762.0,"Objects":[{"StartTime":25762.0,"Position":491.0,"HyperDash":false},{"StartTime":25844.0,"Position":475.629547,"HyperDash":false},{"StartTime":25962.0,"Position":490.096466,"HyperDash":false}]},{"StartTime":26163.0,"Objects":[{"StartTime":26163.0,"Position":372.0,"HyperDash":false},{"StartTime":26245.0,"Position":390.370453,"HyperDash":false},{"StartTime":26363.0,"Position":372.903534,"HyperDash":false}]},{"StartTime":26565.0,"Objects":[{"StartTime":26565.0,"Position":372.0,"HyperDash":false}]},{"StartTime":26766.0,"Objects":[{"StartTime":26766.0,"Position":431.0,"HyperDash":false}]},{"StartTime":26967.0,"Objects":[{"StartTime":26967.0,"Position":372.0,"HyperDash":false}]},{"StartTime":27168.0,"Objects":[{"StartTime":27168.0,"Position":314.0,"HyperDash":false}]},{"StartTime":27369.0,"Objects":[{"StartTime":27369.0,"Position":254.0,"HyperDash":false}]},{"StartTime":27570.0,"Objects":[{"StartTime":27570.0,"Position":313.0,"HyperDash":false}]},{"StartTime":27771.0,"Objects":[{"StartTime":27771.0,"Position":372.0,"HyperDash":false},{"StartTime":27821.0,"Position":382.6753,"HyperDash":false},{"StartTime":27871.0,"Position":425.3506,"HyperDash":false},{"StartTime":27921.0,"Position":431.0259,"HyperDash":false},{"StartTime":27971.0,"Position":436.7012,"HyperDash":false},{"StartTime":28021.0,"Position":466.3765,"HyperDash":false},{"StartTime":28071.0,"Position":463.0,"HyperDash":false},{"StartTime":28121.0,"Position":473.0,"HyperDash":false},{"StartTime":28172.0,"Position":473.0,"HyperDash":false},{"StartTime":28222.0,"Position":457.0,"HyperDash":false},{"StartTime":28272.0,"Position":481.0,"HyperDash":false},{"StartTime":28322.0,"Position":460.0,"HyperDash":false},{"StartTime":28373.0,"Position":444.1494,"HyperDash":false},{"StartTime":28423.0,"Position":440.474121,"HyperDash":false},{"StartTime":28473.0,"Position":415.7988,"HyperDash":false},{"StartTime":28523.0,"Position":416.1235,"HyperDash":false},{"StartTime":28574.0,"Position":389.0747,"HyperDash":false},{"StartTime":28656.0,"Position":375.447235,"HyperDash":false},{"StartTime":28775.0,"Position":314.0,"HyperDash":false}]},{"StartTime":28977.0,"Objects":[{"StartTime":28977.0,"Position":185.0,"HyperDash":false},{"StartTime":29068.0,"Position":200.514755,"HyperDash":false},{"StartTime":29159.0,"Position":255.02951,"HyperDash":false},{"StartTime":29250.0,"Position":301.5764,"HyperDash":false},{"StartTime":29378.0,"Position":328.3668,"HyperDash":false}]},{"StartTime":29579.0,"Objects":[{"StartTime":29579.0,"Position":256.0,"HyperDash":false},{"StartTime":29679.0,"Position":256.0,"HyperDash":false},{"StartTime":29779.0,"Position":256.0,"HyperDash":false}]},{"StartTime":30182.0,"Objects":[{"StartTime":30182.0,"Position":467.0,"HyperDash":false}]},{"StartTime":30383.0,"Objects":[{"StartTime":30383.0,"Position":395.0,"HyperDash":false}]},{"StartTime":30584.0,"Objects":[{"StartTime":30584.0,"Position":323.0,"HyperDash":false}]},{"StartTime":30785.0,"Objects":[{"StartTime":30785.0,"Position":251.0,"HyperDash":false}]},{"StartTime":30986.0,"Objects":[{"StartTime":30986.0,"Position":179.0,"HyperDash":false}]},{"StartTime":31187.0,"Objects":[{"StartTime":31187.0,"Position":107.0,"HyperDash":false}]},{"StartTime":31388.0,"Objects":[{"StartTime":31388.0,"Position":35.0,"HyperDash":false},{"StartTime":31479.0,"Position":45.0,"HyperDash":false},{"StartTime":31570.0,"Position":45.0,"HyperDash":false},{"StartTime":31661.0,"Position":39.0,"HyperDash":false},{"StartTime":31789.0,"Position":35.0,"HyperDash":false}]},{"StartTime":31991.0,"Objects":[{"StartTime":31991.0,"Position":105.0,"HyperDash":false},{"StartTime":32091.0,"Position":142.5,"HyperDash":false},{"StartTime":32191.0,"Position":105.0,"HyperDash":false}]},{"StartTime":32593.0,"Objects":[{"StartTime":32593.0,"Position":314.0,"HyperDash":false}]},{"StartTime":32794.0,"Objects":[{"StartTime":32794.0,"Position":434.0,"HyperDash":false}]},{"StartTime":32995.0,"Objects":[{"StartTime":32995.0,"Position":314.0,"HyperDash":false}]},{"StartTime":33196.0,"Objects":[{"StartTime":33196.0,"Position":434.0,"HyperDash":false}]},{"StartTime":33397.0,"Objects":[{"StartTime":33397.0,"Position":314.0,"HyperDash":false}]},{"StartTime":33598.0,"Objects":[{"StartTime":33598.0,"Position":434.0,"HyperDash":false}]},{"StartTime":33799.0,"Objects":[{"StartTime":33799.0,"Position":314.0,"HyperDash":false},{"StartTime":33881.0,"Position":336.929565,"HyperDash":false},{"StartTime":33999.0,"Position":352.8526,"HyperDash":false}]},{"StartTime":34201.0,"Objects":[{"StartTime":34201.0,"Position":117.0,"HyperDash":false},{"StartTime":34283.0,"Position":163.741074,"HyperDash":false},{"StartTime":34401.0,"Position":191.978241,"HyperDash":false}]},{"StartTime":34603.0,"Objects":[{"StartTime":34603.0,"Position":56.0,"HyperDash":false},{"StartTime":34685.0,"Position":55.48987,"HyperDash":false},{"StartTime":34803.0,"Position":91.34114,"HyperDash":false}]},{"StartTime":35005.0,"Objects":[{"StartTime":35005.0,"Position":192.0,"HyperDash":false},{"StartTime":35087.0,"Position":172.904892,"HyperDash":false},{"StartTime":35205.0,"Position":152.743652,"HyperDash":false}]},{"StartTime":35407.0,"Objects":[{"StartTime":35407.0,"Position":389.0,"HyperDash":false},{"StartTime":35489.0,"Position":348.2696,"HyperDash":false},{"StartTime":35607.0,"Position":314.0478,"HyperDash":false}]},{"StartTime":35808.0,"Objects":[{"StartTime":35808.0,"Position":450.0,"HyperDash":false},{"StartTime":35890.0,"Position":440.377838,"HyperDash":false},{"StartTime":36008.0,"Position":414.3362,"HyperDash":false}]},{"StartTime":36210.0,"Objects":[{"StartTime":36210.0,"Position":314.0,"HyperDash":false}]},{"StartTime":36612.0,"Objects":[{"StartTime":36612.0,"Position":123.0,"HyperDash":false}]},{"StartTime":36813.0,"Objects":[{"StartTime":36813.0,"Position":230.0,"HyperDash":false}]},{"StartTime":37014.0,"Objects":[{"StartTime":37014.0,"Position":337.0,"HyperDash":false}]},{"StartTime":37215.0,"Objects":[{"StartTime":37215.0,"Position":230.0,"HyperDash":false}]},{"StartTime":37416.0,"Objects":[{"StartTime":37416.0,"Position":232.0,"HyperDash":false}]},{"StartTime":37516.0,"Objects":[{"StartTime":37516.0,"Position":232.0,"HyperDash":false}]},{"StartTime":37617.0,"Objects":[{"StartTime":37617.0,"Position":232.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1597806.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1597806.osu
new file mode 100644
index 0000000000..b9ce7a927d
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/1597806.osu
@@ -0,0 +1,152 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.4
+Mode: 0
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:7
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:1.5
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+
+[TimingPoints]
+42,401.875418620228,3,1,0,50,1,0
+18528,-100,3,1,0,40,0,0
+18930,-100,3,1,0,30,0,0
+19332,-100,3,1,0,50,0,1
+24154,-100,3,1,0,50,0,1
+27771,-100,3,1,0,50,0,0
+28977,-100,3,1,0,50,0,0
+30182,-100,3,1,0,50,0,0
+31388,-100,3,1,0,50,0,0
+32593,-100,3,1,0,50,0,0
+33799,-100,3,1,0,50,0,0
+
+[HitObjects]
+288,165,42,6,0,P|255:181|209:175,1,75,4|0,0:0|0:0,0:0:0:0:
+125,38,443,2,0,P|155:58|173:101,1,75,8|0,0:0|0:0,0:0:0:0:
+95,236,845,2,0,P|97:199|125:162,1,75,8|0,0:0|0:0,0:0:0:0:
+250,271,1247,6,0,L|164:295,1,75,8|0,0:0|0:0,0:0:0:0:
+277,199,1649,2,0,L|363:175,1,75,8|0,0:0|0:0,0:0:0:0:
+448,85,2051,2,0,L|376:106,1,75,8|0,0:0|0:0,0:0:0:0:
+499,211,2453,6,0,P|502:258|491:298,1,75,4|0,0:0|0:0,0:0:0:0:
+397,374,2855,2,0,P|400:336|394:300,1,75,8|0,0:0|0:0,0:0:0:0:
+295,211,3257,2,0,P|298:248|292:284,1,75,8|0,0:0|0:0,0:0:0:0:
+134,307,3658,6,0,L|227:315,1,75,8|0,0:0|0:0,0:0:0:0:
+95,143,4060,2,0,L|134:228,1,75,8|0,0:0|0:0,0:0:0:0:
+217,28,4462,2,0,L|163:105,1,75,8|0,0:0|0:0,0:0:0:0:
+268,199,4864,6,0,P|261:152|270:113,1,75,4|0,0:0|0:0,0:0:0:0:
+418,214,5266,2,0,P|380:243|342:255,1,75,8|0,0:0|0:0,0:0:0:0:
+356,76,5668,2,0,P|400:93|429:120,1,75,4|0,0:0|0:0,0:0:0:0:
+265,125,6070,6,0,L|184:140,1,75,8|0,0:0|0:0,0:0:0:0:
+35,204,6472,2,0,L|116:219,1,75,8|0,0:0|0:0,0:0:0:0:
+265,283,6873,2,0,L|184:298,1,75,4|0,0:0|0:0,0:0:0:0:
+323,195,7275,6,0,P|366:203|403:237,1,75,8|0,0:0|0:0,0:0:0:0:
+493,117,7677,2,0,P|450:125|413:159,1,75,8|0,0:0|0:0,0:0:0:0:
+323,39,8079,2,0,P|366:47|403:81,1,75,8|0,0:0|0:0,0:0:0:0:
+273,140,8481,5,4,0:0:0:0:
+187,31,8682,1,0,0:0:0:0:
+101,140,8883,1,8,0:0:0:0:
+187,249,9084,1,0,0:0:0:0:
+101,358,9285,1,8,0:0:0:0:
+15,249,9486,1,0,0:0:0:0:
+187,249,9687,6,0,L|112:266,1,75,4|0,0:0|0:0,0:0:0:0:
+264,181,10088,2,0,L|286:107,1,75,8|0,0:0|0:0,0:0:0:0:
+287,283,10490,2,0,L|339:339,1,75,8|0,0:0|0:0,0:0:0:0:
+422,222,10892,6,0,P|425:180|411:133,1,75,8|0,0:0|0:0,0:0:0:0:
+287,283,11294,2,0,P|324:264|358:228,1,75,8|0,0:0|0:0,0:0:0:0:
+166,196,11696,2,0,P|200:219|248:230,1,75,8|0,0:0|0:0,0:0:0:0:
+332,83,12098,6,0,L|236:102,1,75,4|0,0:0|0:0,0:0:0:0:
+394,139,12500,2,0,L|490:158,1,75,8|0,0:0|0:0,0:0:0:0:
+332,195,12902,2,0,L|236:214,1,75,8|0,0:0|0:0,0:0:0:0:
+413,321,13303,6,0,P|419:253|399:213,1,75,8|0,0:0|0:0,0:0:0:0:
+327,121,13705,2,0,P|333:189|313:229,1,75,8|0,0:0|0:0,0:0:0:0:
+241,321,14107,2,0,P|247:253|227:213,1,75,8|0,0:0|0:0,0:0:0:0:
+118,175,14509,6,0,L|212:188,1,75,4|0,0:0|0:0,0:0:0:0:
+297,100,14911,2,0,L|238:174,1,75,8|0,0:0|0:0,0:0:0:0:
+273,292,15313,2,0,L|237:204,1,75,4|0,0:0|0:0,0:0:0:0:
+235,357,15715,6,0,P|272:368|321:351,1,75,8|0,0:0|0:0,0:0:0:0:
+441,286,16117,2,0,P|404:297|355:280,1,75,8|0,0:0|0:0,0:0:0:0:
+235,215,16518,2,0,P|272:226|321:209,1,75,4|0,0:0|0:0,0:0:0:0:
+436,127,16920,6,0,L|447:217,1,75,8|0,0:0|0:0,0:0:0:0:
+345,22,17322,2,0,L|428:57,1,75,8|0,0:0|0:0,0:0:0:0:
+208,48,17724,2,0,L|280:-6,1,75,4|0,0:0|0:0,0:0:0:0:
+187,162,18126,5,4,0:0:0:0:
+187,162,18528,1,8,0:0:0:0:
+187,162,18930,1,8,0:0:0:0:
+187,162,19332,5,4,0:0:0:0:
+187,263,19532,1,0,0:0:0:0:
+345,107,19733,1,8,0:0:0:0:
+257,157,19933,1,0,0:0:0:0:
+471,216,20135,1,8,0:0:0:0:
+384,165,20335,1,0,0:0:0:0:
+284,300,20537,5,4,0:0:0:0:
+371,249,20737,1,0,0:0:0:0:
+157,190,20938,1,8,0:0:0:0:
+244,241,21140,1,0,0:0:0:0:
+188,27,21340,1,4,0:0:0:0:
+188,127,21542,1,0,0:0:0:0:
+345,40,21743,5,4,0:0:0:0:
+250,77,21944,1,0,0:0:0:0:
+419,147,22145,2,0,L|328:147,1,75,4|0,0:0|0:0,0:0:0:0:
+196,219,22547,2,0,L|287:219,1,75,8|0,0:0|0:0,0:0:0:0:
+419,291,22948,5,4,0:0:0:0:
+344,224,23149,1,0,0:0:0:0:
+305,352,23350,2,0,P|310:313|305:269,1,75,4|0,0:0|0:0,0:0:0:0:
+240,122,23752,2,0,P|235:161|240:205,1,75,8|0,0:0|0:0,0:0:0:0:
+429,207,24154,6,0,L|342:213,1,75,8|0,0:0|0:0,0:0:0:0:
+232,272,24556,2,0,L|319:278,1,75,8|0,0:0|0:0,0:0:0:0:
+429,337,24958,2,0,L|342:343,1,75,8|0,0:0|0:0,0:0:0:0:
+501,280,25360,5,4,0:0:0:0:
+429,207,25561,1,0,0:0:0:0:
+491,62,25762,2,0,L|490:145,1,75,4|0,0:0|0:0,0:0:0:0:
+372,236,26163,2,0,L|373:153,1,75,8|0,0:0|0:0,0:0:0:0:
+372,7,26565,5,4,0:0:0:0:
+431,121,26766,1,0,0:0:0:0:
+372,236,26967,1,8,0:0:0:0:
+314,121,27168,1,0,0:0:0:0:
+254,236,27369,1,8,0:0:0:0:
+313,351,27570,1,0,0:0:0:0:
+372,236,27771,6,0,B|473:236|473:236|473:121|473:121|306:121,1,375,4|0,0:0|0:0,0:0:0:0:
+185,192,28977,6,0,B|256:214|256:214|328:192,1,150,4|0,0:0|0:0,0:0:0:0:
+256,94,29579,6,0,L|256:43,2,37.5,4|0|8,0:0|0:0|0:0,0:0:0:0:
+467,188,30182,5,4,0:0:0:0:
+395,307,30383,1,0,0:0:0:0:
+323,188,30584,1,8,0:0:0:0:
+251,307,30785,1,0,0:0:0:0:
+179,188,30986,1,8,0:0:0:0:
+107,307,31187,1,0,0:0:0:0:
+35,188,31388,6,0,L|35:39,1,150,4|0,0:0|0:0,0:0:0:0:
+105,116,31991,2,0,L|154:116,2,37.5,4|0|8,0:0|0:0|0:0,0:0:0:0:
+314,4,32593,5,4,0:0:0:0:
+434,66,32794,1,0,0:0:0:0:
+314,128,32995,1,8,0:0:0:0:
+434,190,33196,1,0,0:0:0:0:
+314,252,33397,1,8,0:0:0:0:
+434,314,33598,1,0,0:0:0:0:
+314,384,33799,6,0,L|357:313,1,75,4|0,0:0|0:0,0:0:0:0:
+117,340,34201,2,0,L|200:342,1,75,8|0,0:0|0:0,0:0:0:0:
+56,148,34603,2,0,L|95:221,1,75,8|0,0:0|0:0,0:0:0:0:
+192,0,35005,2,0,L|149:70,1,75,4|0,0:0|0:0,0:0:0:0:
+389,42,35407,2,0,L|305:39,1,75,8|0,0:0|0:0,0:0:0:0:
+450,234,35808,2,0,L|410:160,1,75,8|0,0:0|0:0,0:0:0:0:
+314,384,36210,1,4,0:0:0:0:
+123,192,36612,5,4,0:0:0:0:
+230,327,36813,1,0,0:0:0:0:
+337,192,37014,1,8,0:0:0:0:
+230,57,37215,1,0,0:0:0:0:
+232,193,37416,5,4,0:0:0:0:
+232,193,37516,1,0,0:0:0:0:
+232,193,37617,1,8,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2190499-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2190499-expected-conversion.json
new file mode 100644
index 0000000000..fb919302d9
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2190499-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":1739.0,"Objects":[{"StartTime":1739.0,"Position":367.0,"HyperDash":false},{"StartTime":1817.0,"Position":334.444244,"HyperDash":false},{"StartTime":1896.0,"Position":321.501648,"HyperDash":false},{"StartTime":1975.0,"Position":314.851929,"HyperDash":false},{"StartTime":2054.0,"Position":307.22052,"HyperDash":false},{"StartTime":2124.0,"Position":315.042236,"HyperDash":false},{"StartTime":2194.0,"Position":286.526184,"HyperDash":false},{"StartTime":2264.0,"Position":269.750366,"HyperDash":false},{"StartTime":2370.0,"Position":246.8734,"HyperDash":false}]},{"StartTime":3002.0,"Objects":[{"StartTime":3002.0,"Position":161.0,"HyperDash":false},{"StartTime":3080.0,"Position":160.934677,"HyperDash":false},{"StartTime":3159.0,"Position":181.699768,"HyperDash":false},{"StartTime":3238.0,"Position":189.906845,"HyperDash":false},{"StartTime":3317.0,"Position":212.345535,"HyperDash":false},{"StartTime":3387.0,"Position":233.989639,"HyperDash":false},{"StartTime":3457.0,"Position":230.043228,"HyperDash":false},{"StartTime":3527.0,"Position":221.436966,"HyperDash":false},{"StartTime":3633.0,"Position":233.8208,"HyperDash":false}]},{"StartTime":4265.0,"Objects":[{"StartTime":4265.0,"Position":47.0,"HyperDash":false},{"StartTime":4334.0,"Position":63.4803925,"HyperDash":false},{"StartTime":4404.0,"Position":52.9349747,"HyperDash":false},{"StartTime":4474.0,"Position":77.8079,"HyperDash":false},{"StartTime":4580.0,"Position":111.004265,"HyperDash":false}]},{"StartTime":4897.0,"Objects":[{"StartTime":4897.0,"Position":235.0,"HyperDash":false},{"StartTime":4975.0,"Position":269.900024,"HyperDash":false},{"StartTime":5054.0,"Position":287.131927,"HyperDash":false},{"StartTime":5133.0,"Position":301.489746,"HyperDash":false},{"StartTime":5212.0,"Position":305.972,"HyperDash":false},{"StartTime":5273.0,"Position":301.195129,"HyperDash":false},{"StartTime":5370.0,"Position":334.383362,"HyperDash":false}]},{"StartTime":5528.0,"Objects":[{"StartTime":5528.0,"Position":372.0,"HyperDash":false},{"StartTime":5606.0,"Position":378.156158,"HyperDash":false},{"StartTime":5685.0,"Position":354.0074,"HyperDash":false},{"StartTime":5764.0,"Position":357.6568,"HyperDash":false},{"StartTime":5843.0,"Position":349.1154,"HyperDash":false},{"StartTime":5913.0,"Position":341.790833,"HyperDash":false},{"StartTime":5983.0,"Position":342.120453,"HyperDash":false},{"StartTime":6053.0,"Position":355.1087,"HyperDash":false},{"StartTime":6159.0,"Position":339.322418,"HyperDash":false}]},{"StartTime":6791.0,"Objects":[{"StartTime":6791.0,"Position":55.0,"HyperDash":false},{"StartTime":6860.0,"Position":49.3883972,"HyperDash":false},{"StartTime":6930.0,"Position":57.4187775,"HyperDash":false},{"StartTime":7000.0,"Position":74.47069,"HyperDash":false},{"StartTime":7106.0,"Position":114.237465,"HyperDash":false}]},{"StartTime":7423.0,"Objects":[{"StartTime":7423.0,"Position":240.0,"HyperDash":false},{"StartTime":7501.0,"Position":237.8742,"HyperDash":false},{"StartTime":7580.0,"Position":228.717819,"HyperDash":false},{"StartTime":7659.0,"Position":200.180328,"HyperDash":false},{"StartTime":7738.0,"Position":193.621948,"HyperDash":false},{"StartTime":7799.0,"Position":189.067337,"HyperDash":false},{"StartTime":7896.0,"Position":188.528091,"HyperDash":false}]},{"StartTime":8054.0,"Objects":[{"StartTime":8054.0,"Position":273.0,"HyperDash":false},{"StartTime":8132.0,"Position":306.8755,"HyperDash":false},{"StartTime":8211.0,"Position":298.36087,"HyperDash":false},{"StartTime":8290.0,"Position":326.902954,"HyperDash":false},{"StartTime":8369.0,"Position":340.2283,"HyperDash":false},{"StartTime":8439.0,"Position":337.1718,"HyperDash":false},{"StartTime":8509.0,"Position":325.47818,"HyperDash":false},{"StartTime":8579.0,"Position":310.550323,"HyperDash":false},{"StartTime":8685.0,"Position":273.0,"HyperDash":false}]},{"StartTime":9002.0,"Objects":[{"StartTime":9002.0,"Position":147.0,"HyperDash":false},{"StartTime":9062.0,"Position":147.914444,"HyperDash":false},{"StartTime":9159.0,"Position":110.615738,"HyperDash":false}]},{"StartTime":9318.0,"Objects":[{"StartTime":9318.0,"Position":59.0,"HyperDash":false},{"StartTime":9396.0,"Position":72.10824,"HyperDash":false},{"StartTime":9475.0,"Position":59.51161,"HyperDash":false},{"StartTime":9554.0,"Position":28.2636833,"HyperDash":false},{"StartTime":9633.0,"Position":39.3327179,"HyperDash":false},{"StartTime":9703.0,"Position":49.56317,"HyperDash":false},{"StartTime":9773.0,"Position":37.3222733,"HyperDash":false},{"StartTime":9843.0,"Position":38.56619,"HyperDash":false},{"StartTime":9949.0,"Position":59.0,"HyperDash":false}]},{"StartTime":10265.0,"Objects":[{"StartTime":10265.0,"Position":133.0,"HyperDash":false}]},{"StartTime":10581.0,"Objects":[{"StartTime":10581.0,"Position":494.0,"HyperDash":false},{"StartTime":10659.0,"Position":135.0,"HyperDash":false},{"StartTime":10738.0,"Position":30.0,"HyperDash":false},{"StartTime":10817.0,"Position":11.0,"HyperDash":false},{"StartTime":10896.0,"Position":239.0,"HyperDash":false},{"StartTime":10975.0,"Position":505.0,"HyperDash":false},{"StartTime":11054.0,"Position":353.0,"HyperDash":false},{"StartTime":11133.0,"Position":136.0,"HyperDash":false},{"StartTime":11212.0,"Position":135.0,"HyperDash":false},{"StartTime":11291.0,"Position":346.0,"HyperDash":false},{"StartTime":11370.0,"Position":39.0,"HyperDash":false},{"StartTime":11449.0,"Position":300.0,"HyperDash":false},{"StartTime":11528.0,"Position":398.0,"HyperDash":false},{"StartTime":11607.0,"Position":151.0,"HyperDash":false},{"StartTime":11686.0,"Position":73.0,"HyperDash":false},{"StartTime":11765.0,"Position":311.0,"HyperDash":false},{"StartTime":11844.0,"Position":90.0,"HyperDash":false}]},{"StartTime":13107.0,"Objects":[{"StartTime":13107.0,"Position":264.0,"HyperDash":false},{"StartTime":13185.0,"Position":477.0,"HyperDash":false},{"StartTime":13264.0,"Position":473.0,"HyperDash":false},{"StartTime":13343.0,"Position":120.0,"HyperDash":false},{"StartTime":13422.0,"Position":115.0,"HyperDash":false},{"StartTime":13501.0,"Position":163.0,"HyperDash":false},{"StartTime":13580.0,"Position":447.0,"HyperDash":false},{"StartTime":13659.0,"Position":72.0,"HyperDash":false},{"StartTime":13738.0,"Position":257.0,"HyperDash":false},{"StartTime":13817.0,"Position":153.0,"HyperDash":false},{"StartTime":13896.0,"Position":388.0,"HyperDash":false},{"StartTime":13975.0,"Position":336.0,"HyperDash":false},{"StartTime":14054.0,"Position":13.0,"HyperDash":false},{"StartTime":14133.0,"Position":429.0,"HyperDash":false},{"StartTime":14212.0,"Position":381.0,"HyperDash":false},{"StartTime":14291.0,"Position":186.0,"HyperDash":false},{"StartTime":14370.0,"Position":267.0,"HyperDash":false}]},{"StartTime":15633.0,"Objects":[{"StartTime":15633.0,"Position":74.0,"HyperDash":false},{"StartTime":15711.0,"Position":95.2118149,"HyperDash":false},{"StartTime":15790.0,"Position":106.218536,"HyperDash":false},{"StartTime":15869.0,"Position":134.014709,"HyperDash":false},{"StartTime":15948.0,"Position":138.984512,"HyperDash":false},{"StartTime":16008.0,"Position":164.493423,"HyperDash":false},{"StartTime":16068.0,"Position":149.9466,"HyperDash":false},{"StartTime":16128.0,"Position":159.583786,"HyperDash":false},{"StartTime":16225.0,"Position":198.210388,"HyperDash":false}]},{"StartTime":17844.0,"Objects":[{"StartTime":17844.0,"Position":189.0,"HyperDash":false}]},{"StartTime":18160.0,"Objects":[{"StartTime":18160.0,"Position":189.0,"HyperDash":false},{"StartTime":18220.0,"Position":203.848145,"HyperDash":false},{"StartTime":18317.0,"Position":255.355225,"HyperDash":false}]},{"StartTime":18476.0,"Objects":[{"StartTime":18476.0,"Position":402.0,"HyperDash":false},{"StartTime":18536.0,"Position":355.556671,"HyperDash":false},{"StartTime":18633.0,"Position":335.176544,"HyperDash":false}]},{"StartTime":18791.0,"Objects":[{"StartTime":18791.0,"Position":383.0,"HyperDash":false},{"StartTime":18860.0,"Position":387.0126,"HyperDash":false},{"StartTime":18930.0,"Position":402.196167,"HyperDash":false},{"StartTime":19000.0,"Position":402.402679,"HyperDash":false},{"StartTime":19106.0,"Position":403.979065,"HyperDash":false}]},{"StartTime":19265.0,"Objects":[{"StartTime":19265.0,"Position":254.0,"HyperDash":false}]},{"StartTime":19423.0,"Objects":[{"StartTime":19423.0,"Position":178.0,"HyperDash":false},{"StartTime":19483.0,"Position":149.544052,"HyperDash":false},{"StartTime":19580.0,"Position":105.085159,"HyperDash":false}]},{"StartTime":19739.0,"Objects":[{"StartTime":19739.0,"Position":245.0,"HyperDash":false},{"StartTime":19799.0,"Position":290.012634,"HyperDash":false},{"StartTime":19896.0,"Position":317.941528,"HyperDash":false}]},{"StartTime":20054.0,"Objects":[{"StartTime":20054.0,"Position":287.0,"HyperDash":false},{"StartTime":20123.0,"Position":275.9874,"HyperDash":false},{"StartTime":20193.0,"Position":286.803833,"HyperDash":false},{"StartTime":20263.0,"Position":255.597321,"HyperDash":false},{"StartTime":20369.0,"Position":266.020935,"HyperDash":false}]},{"StartTime":20528.0,"Objects":[{"StartTime":20528.0,"Position":167.0,"HyperDash":false}]},{"StartTime":20686.0,"Objects":[{"StartTime":20686.0,"Position":110.0,"HyperDash":false},{"StartTime":20746.0,"Position":87.56889,"HyperDash":false},{"StartTime":20843.0,"Position":44.4256668,"HyperDash":false}]},{"StartTime":21002.0,"Objects":[{"StartTime":21002.0,"Position":158.0,"HyperDash":false},{"StartTime":21062.0,"Position":174.0545,"HyperDash":false},{"StartTime":21159.0,"Position":223.260239,"HyperDash":false}]},{"StartTime":21318.0,"Objects":[{"StartTime":21318.0,"Position":105.0,"HyperDash":false},{"StartTime":21378.0,"Position":86.56889,"HyperDash":false},{"StartTime":21475.0,"Position":39.4256668,"HyperDash":false}]},{"StartTime":21634.0,"Objects":[{"StartTime":21634.0,"Position":153.0,"HyperDash":false},{"StartTime":21694.0,"Position":191.0545,"HyperDash":false},{"StartTime":21791.0,"Position":218.260239,"HyperDash":false}]},{"StartTime":21949.0,"Objects":[{"StartTime":21949.0,"Position":321.0,"HyperDash":false}]},{"StartTime":22107.0,"Objects":[{"StartTime":22107.0,"Position":372.0,"HyperDash":false}]},{"StartTime":22265.0,"Objects":[{"StartTime":22265.0,"Position":345.0,"HyperDash":false},{"StartTime":22325.0,"Position":332.141785,"HyperDash":false},{"StartTime":22422.0,"Position":327.377563,"HyperDash":false}]},{"StartTime":22581.0,"Objects":[{"StartTime":22581.0,"Position":413.0,"HyperDash":false}]},{"StartTime":22739.0,"Objects":[{"StartTime":22739.0,"Position":442.0,"HyperDash":false}]},{"StartTime":22897.0,"Objects":[{"StartTime":22897.0,"Position":409.0,"HyperDash":false},{"StartTime":22957.0,"Position":364.564,"HyperDash":false},{"StartTime":23054.0,"Position":338.834,"HyperDash":false}]},{"StartTime":23212.0,"Objects":[{"StartTime":23212.0,"Position":205.0,"HyperDash":false},{"StartTime":23272.0,"Position":218.780579,"HyperDash":false},{"StartTime":23369.0,"Position":224.420334,"HyperDash":false}]},{"StartTime":23528.0,"Objects":[{"StartTime":23528.0,"Position":73.0,"HyperDash":false},{"StartTime":23588.0,"Position":68.21941,"HyperDash":false},{"StartTime":23685.0,"Position":53.5796623,"HyperDash":false}]},{"StartTime":23844.0,"Objects":[{"StartTime":23844.0,"Position":240.0,"HyperDash":false},{"StartTime":23904.0,"Position":234.999878,"HyperDash":false},{"StartTime":24001.0,"Position":220.82193,"HyperDash":false}]},{"StartTime":24160.0,"Objects":[{"StartTime":24160.0,"Position":88.0,"HyperDash":false},{"StartTime":24220.0,"Position":60.3964767,"HyperDash":false},{"StartTime":24317.0,"Position":68.93455,"HyperDash":false}]},{"StartTime":24476.0,"Objects":[{"StartTime":24476.0,"Position":206.0,"HyperDash":false},{"StartTime":24536.0,"Position":215.970291,"HyperDash":false},{"StartTime":24633.0,"Position":281.8056,"HyperDash":false}]},{"StartTime":24791.0,"Objects":[{"StartTime":24791.0,"Position":425.0,"HyperDash":false},{"StartTime":24851.0,"Position":385.029724,"HyperDash":false},{"StartTime":24948.0,"Position":349.1944,"HyperDash":false}]},{"StartTime":25107.0,"Objects":[{"StartTime":25107.0,"Position":196.0,"HyperDash":false},{"StartTime":25167.0,"Position":233.970291,"HyperDash":false},{"StartTime":25264.0,"Position":271.8056,"HyperDash":false}]},{"StartTime":25423.0,"Objects":[{"StartTime":25423.0,"Position":415.0,"HyperDash":false}]},{"StartTime":25581.0,"Objects":[{"StartTime":25581.0,"Position":363.0,"HyperDash":false}]},{"StartTime":25739.0,"Objects":[{"StartTime":25739.0,"Position":263.0,"HyperDash":false},{"StartTime":25799.0,"Position":263.286316,"HyperDash":false},{"StartTime":25896.0,"Position":278.260681,"HyperDash":false}]},{"StartTime":26054.0,"Objects":[{"StartTime":26054.0,"Position":418.0,"HyperDash":false},{"StartTime":26114.0,"Position":438.267456,"HyperDash":false},{"StartTime":26211.0,"Position":432.8865,"HyperDash":false}]},{"StartTime":26370.0,"Objects":[{"StartTime":26370.0,"Position":251.0,"HyperDash":false},{"StartTime":26430.0,"Position":272.286316,"HyperDash":false},{"StartTime":26527.0,"Position":266.260681,"HyperDash":false}]},{"StartTime":26686.0,"Objects":[{"StartTime":26686.0,"Position":406.0,"HyperDash":false},{"StartTime":26746.0,"Position":403.267456,"HyperDash":false},{"StartTime":26843.0,"Position":420.8865,"HyperDash":false}]},{"StartTime":27002.0,"Objects":[{"StartTime":27002.0,"Position":326.0,"HyperDash":false},{"StartTime":27102.0,"Position":263.416656,"HyperDash":false},{"StartTime":27238.0,"Position":217.484329,"HyperDash":false}]},{"StartTime":27318.0,"Objects":[{"StartTime":27318.0,"Position":215.0,"HyperDash":false},{"StartTime":27418.0,"Position":244.682343,"HyperDash":false},{"StartTime":27554.0,"Position":323.347046,"HyperDash":false}]},{"StartTime":27633.0,"Objects":[{"StartTime":27633.0,"Position":324.0,"HyperDash":false},{"StartTime":27702.0,"Position":307.889435,"HyperDash":false},{"StartTime":27772.0,"Position":261.760223,"HyperDash":false},{"StartTime":27842.0,"Position":231.054062,"HyperDash":false},{"StartTime":27948.0,"Position":179.503586,"HyperDash":false}]},{"StartTime":28265.0,"Objects":[{"StartTime":28265.0,"Position":65.0,"HyperDash":false},{"StartTime":28334.0,"Position":61.494606,"HyperDash":false},{"StartTime":28404.0,"Position":60.7236862,"HyperDash":false},{"StartTime":28474.0,"Position":89.86115,"HyperDash":false},{"StartTime":28580.0,"Position":97.86348,"HyperDash":false}]},{"StartTime":28739.0,"Objects":[{"StartTime":28739.0,"Position":153.0,"HyperDash":false}]},{"StartTime":28897.0,"Objects":[{"StartTime":28897.0,"Position":153.0,"HyperDash":false}]},{"StartTime":29054.0,"Objects":[{"StartTime":29054.0,"Position":215.0,"HyperDash":false},{"StartTime":29114.0,"Position":247.582169,"HyperDash":false},{"StartTime":29211.0,"Position":279.019775,"HyperDash":false}]},{"StartTime":29370.0,"Objects":[{"StartTime":29370.0,"Position":332.0,"HyperDash":false},{"StartTime":29430.0,"Position":288.006042,"HyperDash":false},{"StartTime":29527.0,"Position":267.917969,"HyperDash":false}]},{"StartTime":29686.0,"Objects":[{"StartTime":29686.0,"Position":371.0,"HyperDash":false}]},{"StartTime":29844.0,"Objects":[{"StartTime":29844.0,"Position":371.0,"HyperDash":false}]},{"StartTime":30002.0,"Objects":[{"StartTime":30002.0,"Position":444.0,"HyperDash":false}]},{"StartTime":30160.0,"Objects":[{"StartTime":30160.0,"Position":444.0,"HyperDash":false},{"StartTime":30220.0,"Position":451.1502,"HyperDash":false},{"StartTime":30317.0,"Position":463.328674,"HyperDash":false}]},{"StartTime":30476.0,"Objects":[{"StartTime":30476.0,"Position":393.0,"HyperDash":false},{"StartTime":30536.0,"Position":364.8498,"HyperDash":false},{"StartTime":30633.0,"Position":373.671326,"HyperDash":false}]},{"StartTime":30791.0,"Objects":[{"StartTime":30791.0,"Position":265.0,"HyperDash":false},{"StartTime":30851.0,"Position":250.101547,"HyperDash":false},{"StartTime":30948.0,"Position":197.232391,"HyperDash":false}]},{"StartTime":31107.0,"Objects":[{"StartTime":31107.0,"Position":80.0,"HyperDash":false},{"StartTime":31167.0,"Position":86.86766,"HyperDash":false},{"StartTime":31264.0,"Position":147.687042,"HyperDash":false}]},{"StartTime":31423.0,"Objects":[{"StartTime":31423.0,"Position":124.0,"HyperDash":false},{"StartTime":31483.0,"Position":115.084091,"HyperDash":false},{"StartTime":31580.0,"Position":56.1867,"HyperDash":false}]},{"StartTime":31739.0,"Objects":[{"StartTime":31739.0,"Position":164.0,"HyperDash":false}]},{"StartTime":31897.0,"Objects":[{"StartTime":31897.0,"Position":164.0,"HyperDash":false},{"StartTime":31957.0,"Position":198.867661,"HyperDash":false},{"StartTime":32054.0,"Position":231.687042,"HyperDash":false}]},{"StartTime":32212.0,"Objects":[{"StartTime":32212.0,"Position":365.0,"HyperDash":false}]},{"StartTime":32370.0,"Objects":[{"StartTime":32370.0,"Position":365.0,"HyperDash":false},{"StartTime":32430.0,"Position":375.563446,"HyperDash":false},{"StartTime":32527.0,"Position":383.7374,"HyperDash":false}]},{"StartTime":32686.0,"Objects":[{"StartTime":32686.0,"Position":488.0,"HyperDash":false},{"StartTime":32755.0,"Position":478.588562,"HyperDash":false},{"StartTime":32825.0,"Position":485.259918,"HyperDash":false},{"StartTime":32895.0,"Position":471.216827,"HyperDash":false},{"StartTime":33001.0,"Position":467.5074,"HyperDash":false}]},{"StartTime":33160.0,"Objects":[{"StartTime":33160.0,"Position":406.0,"HyperDash":false}]},{"StartTime":33318.0,"Objects":[{"StartTime":33318.0,"Position":277.0,"HyperDash":false},{"StartTime":33387.0,"Position":249.144089,"HyperDash":false},{"StartTime":33457.0,"Position":211.528214,"HyperDash":false},{"StartTime":33527.0,"Position":207.367355,"HyperDash":false},{"StartTime":33633.0,"Position":161.097717,"HyperDash":false}]},{"StartTime":33791.0,"Objects":[{"StartTime":33791.0,"Position":283.0,"HyperDash":false}]},{"StartTime":33949.0,"Objects":[{"StartTime":33949.0,"Position":283.0,"HyperDash":false}]},{"StartTime":34107.0,"Objects":[{"StartTime":34107.0,"Position":158.0,"HyperDash":false},{"StartTime":34167.0,"Position":122.620682,"HyperDash":false},{"StartTime":34264.0,"Position":93.20762,"HyperDash":false}]},{"StartTime":34423.0,"Objects":[{"StartTime":34423.0,"Position":19.0,"HyperDash":false},{"StartTime":34483.0,"Position":37.9395447,"HyperDash":false},{"StartTime":34580.0,"Position":83.68275,"HyperDash":false}]},{"StartTime":34739.0,"Objects":[{"StartTime":34739.0,"Position":158.0,"HyperDash":false}]},{"StartTime":34897.0,"Objects":[{"StartTime":34897.0,"Position":158.0,"HyperDash":false}]},{"StartTime":35054.0,"Objects":[{"StartTime":35054.0,"Position":204.0,"HyperDash":false}]},{"StartTime":35212.0,"Objects":[{"StartTime":35212.0,"Position":204.0,"HyperDash":false},{"StartTime":35272.0,"Position":191.310013,"HyperDash":false},{"StartTime":35369.0,"Position":216.139023,"HyperDash":false}]},{"StartTime":35528.0,"Objects":[{"StartTime":35528.0,"Position":345.0,"HyperDash":false},{"StartTime":35588.0,"Position":339.8689,"HyperDash":false},{"StartTime":35685.0,"Position":332.011932,"HyperDash":false}]},{"StartTime":35844.0,"Objects":[{"StartTime":35844.0,"Position":461.0,"HyperDash":false},{"StartTime":35922.0,"Position":426.3106,"HyperDash":false},{"StartTime":36001.0,"Position":379.89856,"HyperDash":false},{"StartTime":36080.0,"Position":350.1098,"HyperDash":false},{"StartTime":36159.0,"Position":330.750031,"HyperDash":false},{"StartTime":36229.0,"Position":366.784668,"HyperDash":false},{"StartTime":36299.0,"Position":388.860931,"HyperDash":false},{"StartTime":36369.0,"Position":414.029144,"HyperDash":false},{"StartTime":36475.0,"Position":461.0,"HyperDash":false}]},{"StartTime":36791.0,"Objects":[{"StartTime":36791.0,"Position":248.0,"HyperDash":false}]},{"StartTime":36949.0,"Objects":[{"StartTime":36949.0,"Position":248.0,"HyperDash":false},{"StartTime":37009.0,"Position":242.674042,"HyperDash":false},{"StartTime":37106.0,"Position":261.06012,"HyperDash":false}]},{"StartTime":37265.0,"Objects":[{"StartTime":37265.0,"Position":189.0,"HyperDash":false}]},{"StartTime":37423.0,"Objects":[{"StartTime":37423.0,"Position":130.0,"HyperDash":false},{"StartTime":37483.0,"Position":98.5721054,"HyperDash":false},{"StartTime":37580.0,"Position":66.22712,"HyperDash":false}]},{"StartTime":37739.0,"Objects":[{"StartTime":37739.0,"Position":32.0,"HyperDash":false}]},{"StartTime":37897.0,"Objects":[{"StartTime":37897.0,"Position":79.0,"HyperDash":false}]},{"StartTime":38054.0,"Objects":[{"StartTime":38054.0,"Position":126.0,"HyperDash":false}]},{"StartTime":38212.0,"Objects":[{"StartTime":38212.0,"Position":67.0,"HyperDash":false}]},{"StartTime":38370.0,"Objects":[{"StartTime":38370.0,"Position":189.0,"HyperDash":false},{"StartTime":38439.0,"Position":208.518677,"HyperDash":false},{"StartTime":38509.0,"Position":230.192429,"HyperDash":false},{"StartTime":38579.0,"Position":265.933716,"HyperDash":false},{"StartTime":38685.0,"Position":294.0829,"HyperDash":false}]},{"StartTime":38844.0,"Objects":[{"StartTime":38844.0,"Position":281.0,"HyperDash":false},{"StartTime":38922.0,"Position":240.8632,"HyperDash":false},{"StartTime":39001.0,"Position":224.955368,"HyperDash":false},{"StartTime":39062.0,"Position":248.9081,"HyperDash":false},{"StartTime":39159.0,"Position":281.0,"HyperDash":false}]},{"StartTime":39318.0,"Objects":[{"StartTime":39318.0,"Position":367.0,"HyperDash":false},{"StartTime":39378.0,"Position":404.815552,"HyperDash":false},{"StartTime":39475.0,"Position":423.320465,"HyperDash":false}]},{"StartTime":39633.0,"Objects":[{"StartTime":39633.0,"Position":493.0,"HyperDash":false}]},{"StartTime":39791.0,"Objects":[{"StartTime":39791.0,"Position":493.0,"HyperDash":false},{"StartTime":39851.0,"Position":484.550964,"HyperDash":false},{"StartTime":39948.0,"Position":499.675018,"HyperDash":false}]},{"StartTime":40107.0,"Objects":[{"StartTime":40107.0,"Position":450.0,"HyperDash":false},{"StartTime":40167.0,"Position":441.449036,"HyperDash":false},{"StartTime":40264.0,"Position":443.324982,"HyperDash":false}]},{"StartTime":40423.0,"Objects":[{"StartTime":40423.0,"Position":379.0,"HyperDash":false}]},{"StartTime":40581.0,"Objects":[{"StartTime":40581.0,"Position":379.0,"HyperDash":false}]},{"StartTime":40739.0,"Objects":[{"StartTime":40739.0,"Position":312.0,"HyperDash":false},{"StartTime":40808.0,"Position":302.798431,"HyperDash":false},{"StartTime":40878.0,"Position":242.555145,"HyperDash":false},{"StartTime":40948.0,"Position":257.265869,"HyperDash":false},{"StartTime":41054.0,"Position":204.051636,"HyperDash":false}]},{"StartTime":41212.0,"Objects":[{"StartTime":41212.0,"Position":120.0,"HyperDash":false},{"StartTime":41290.0,"Position":125.193611,"HyperDash":false},{"StartTime":41369.0,"Position":107.002182,"HyperDash":false},{"StartTime":41430.0,"Position":88.91298,"HyperDash":false},{"StartTime":41527.0,"Position":120.0,"HyperDash":false}]},{"StartTime":41686.0,"Objects":[{"StartTime":41686.0,"Position":195.0,"HyperDash":false},{"StartTime":41746.0,"Position":179.895126,"HyperDash":false},{"StartTime":41843.0,"Position":181.9226,"HyperDash":false}]},{"StartTime":42002.0,"Objects":[{"StartTime":42002.0,"Position":81.0,"HyperDash":false}]},{"StartTime":42160.0,"Objects":[{"StartTime":42160.0,"Position":81.0,"HyperDash":false}]},{"StartTime":42318.0,"Objects":[{"StartTime":42318.0,"Position":157.0,"HyperDash":false}]},{"StartTime":42476.0,"Objects":[{"StartTime":42476.0,"Position":157.0,"HyperDash":false},{"StartTime":42536.0,"Position":192.028351,"HyperDash":false},{"StartTime":42633.0,"Position":217.2575,"HyperDash":false}]},{"StartTime":42791.0,"Objects":[{"StartTime":42791.0,"Position":314.0,"HyperDash":false},{"StartTime":42851.0,"Position":349.048828,"HyperDash":false},{"StartTime":42948.0,"Position":374.311127,"HyperDash":false}]},{"StartTime":43107.0,"Objects":[{"StartTime":43107.0,"Position":224.0,"HyperDash":false},{"StartTime":43176.0,"Position":212.567841,"HyperDash":false},{"StartTime":43246.0,"Position":162.7526,"HyperDash":false},{"StartTime":43316.0,"Position":129.937347,"HyperDash":false},{"StartTime":43422.0,"Position":103.331413,"HyperDash":false}]},{"StartTime":43581.0,"Objects":[{"StartTime":43581.0,"Position":18.0,"HyperDash":false},{"StartTime":43659.0,"Position":17.9562778,"HyperDash":false},{"StartTime":43738.0,"Position":25.988636,"HyperDash":false},{"StartTime":43799.0,"Position":35.9199829,"HyperDash":false},{"StartTime":43896.0,"Position":18.0,"HyperDash":false}]},{"StartTime":44054.0,"Objects":[{"StartTime":44054.0,"Position":118.0,"HyperDash":false},{"StartTime":44114.0,"Position":113.573334,"HyperDash":false},{"StartTime":44211.0,"Position":109.033562,"HyperDash":false}]},{"StartTime":44370.0,"Objects":[{"StartTime":44370.0,"Position":32.0,"HyperDash":false}]},{"StartTime":44528.0,"Objects":[{"StartTime":44528.0,"Position":32.0,"HyperDash":false},{"StartTime":44588.0,"Position":34.55097,"HyperDash":false},{"StartTime":44685.0,"Position":38.6750336,"HyperDash":false}]},{"StartTime":44844.0,"Objects":[{"StartTime":44844.0,"Position":131.0,"HyperDash":false}]},{"StartTime":45002.0,"Objects":[{"StartTime":45002.0,"Position":131.0,"HyperDash":false},{"StartTime":45062.0,"Position":121.323151,"HyperDash":false},{"StartTime":45159.0,"Position":123.99559,"HyperDash":false}]},{"StartTime":45318.0,"Objects":[{"StartTime":45318.0,"Position":215.0,"HyperDash":false}]},{"StartTime":45476.0,"Objects":[{"StartTime":45476.0,"Position":215.0,"HyperDash":false},{"StartTime":45536.0,"Position":253.997345,"HyperDash":false},{"StartTime":45633.0,"Position":275.176361,"HyperDash":false}]},{"StartTime":45791.0,"Objects":[{"StartTime":45791.0,"Position":362.0,"HyperDash":false}]},{"StartTime":45949.0,"Objects":[{"StartTime":45949.0,"Position":362.0,"HyperDash":false}]},{"StartTime":46107.0,"Objects":[{"StartTime":46107.0,"Position":350.0,"HyperDash":false},{"StartTime":46167.0,"Position":360.8421,"HyperDash":false},{"StartTime":46264.0,"Position":354.8202,"HyperDash":false}]},{"StartTime":46423.0,"Objects":[{"StartTime":46423.0,"Position":421.0,"HyperDash":false}]},{"StartTime":46581.0,"Objects":[{"StartTime":46581.0,"Position":421.0,"HyperDash":false}]},{"StartTime":46739.0,"Objects":[{"StartTime":46739.0,"Position":343.0,"HyperDash":false},{"StartTime":46799.0,"Position":312.973572,"HyperDash":false},{"StartTime":46896.0,"Position":282.7475,"HyperDash":false}]},{"StartTime":47054.0,"Objects":[{"StartTime":47054.0,"Position":212.0,"HyperDash":false}]},{"StartTime":47212.0,"Objects":[{"StartTime":47212.0,"Position":176.0,"HyperDash":false}]},{"StartTime":47370.0,"Objects":[{"StartTime":47370.0,"Position":104.0,"HyperDash":false}]},{"StartTime":47449.0,"Objects":[{"StartTime":47449.0,"Position":104.0,"HyperDash":false}]},{"StartTime":47528.0,"Objects":[{"StartTime":47528.0,"Position":104.0,"HyperDash":false},{"StartTime":47628.0,"Position":115.182846,"HyperDash":false},{"StartTime":47764.0,"Position":88.40525,"HyperDash":false}]},{"StartTime":47844.0,"Objects":[{"StartTime":47844.0,"Position":73.0,"HyperDash":false},{"StartTime":47944.0,"Position":61.8171539,"HyperDash":false},{"StartTime":48080.0,"Position":88.59475,"HyperDash":false}]},{"StartTime":48160.0,"Objects":[{"StartTime":48160.0,"Position":108.0,"HyperDash":false}]},{"StartTime":48476.0,"Objects":[{"StartTime":48476.0,"Position":108.0,"HyperDash":false},{"StartTime":48536.0,"Position":130.401276,"HyperDash":false},{"StartTime":48633.0,"Position":176.902069,"HyperDash":false}]},{"StartTime":48791.0,"Objects":[{"StartTime":48791.0,"Position":259.0,"HyperDash":false},{"StartTime":48851.0,"Position":213.142151,"HyperDash":false},{"StartTime":48948.0,"Position":190.198868,"HyperDash":false}]},{"StartTime":49107.0,"Objects":[{"StartTime":49107.0,"Position":329.0,"HyperDash":false},{"StartTime":49176.0,"Position":349.21228,"HyperDash":false},{"StartTime":49246.0,"Position":377.302368,"HyperDash":false},{"StartTime":49316.0,"Position":400.9881,"HyperDash":false},{"StartTime":49422.0,"Position":453.358215,"HyperDash":false}]},{"StartTime":49581.0,"Objects":[{"StartTime":49581.0,"Position":328.0,"HyperDash":false}]},{"StartTime":49739.0,"Objects":[{"StartTime":49739.0,"Position":472.0,"HyperDash":false},{"StartTime":49799.0,"Position":465.138245,"HyperDash":false},{"StartTime":49896.0,"Position":454.808044,"HyperDash":false}]},{"StartTime":50054.0,"Objects":[{"StartTime":50054.0,"Position":324.0,"HyperDash":false},{"StartTime":50114.0,"Position":308.1143,"HyperDash":false},{"StartTime":50211.0,"Position":306.059082,"HyperDash":false}]},{"StartTime":50370.0,"Objects":[{"StartTime":50370.0,"Position":190.0,"HyperDash":false},{"StartTime":50439.0,"Position":173.841064,"HyperDash":false},{"StartTime":50509.0,"Position":134.478058,"HyperDash":false},{"StartTime":50579.0,"Position":91.0187149,"HyperDash":false},{"StartTime":50685.0,"Position":84.73538,"HyperDash":false}]},{"StartTime":50844.0,"Objects":[{"StartTime":50844.0,"Position":206.0,"HyperDash":false}]},{"StartTime":51002.0,"Objects":[{"StartTime":51002.0,"Position":313.0,"HyperDash":false},{"StartTime":51062.0,"Position":334.872467,"HyperDash":false},{"StartTime":51159.0,"Position":326.793732,"HyperDash":false}]},{"StartTime":51318.0,"Objects":[{"StartTime":51318.0,"Position":223.0,"HyperDash":false},{"StartTime":51378.0,"Position":206.316574,"HyperDash":false},{"StartTime":51475.0,"Position":208.626953,"HyperDash":false}]},{"StartTime":51633.0,"Objects":[{"StartTime":51633.0,"Position":268.0,"HyperDash":false},{"StartTime":51693.0,"Position":280.674469,"HyperDash":false},{"StartTime":51790.0,"Position":337.344574,"HyperDash":false}]},{"StartTime":51949.0,"Objects":[{"StartTime":51949.0,"Position":382.0,"HyperDash":false},{"StartTime":52009.0,"Position":340.1904,"HyperDash":false},{"StartTime":52106.0,"Position":312.41745,"HyperDash":false}]},{"StartTime":52265.0,"Objects":[{"StartTime":52265.0,"Position":191.0,"HyperDash":false},{"StartTime":52334.0,"Position":178.67337,"HyperDash":false},{"StartTime":52404.0,"Position":200.576569,"HyperDash":false},{"StartTime":52474.0,"Position":208.688736,"HyperDash":false},{"StartTime":52580.0,"Position":218.40831,"HyperDash":false}]},{"StartTime":52739.0,"Objects":[{"StartTime":52739.0,"Position":145.0,"HyperDash":false}]},{"StartTime":52897.0,"Objects":[{"StartTime":52897.0,"Position":75.0,"HyperDash":false},{"StartTime":52957.0,"Position":116.384956,"HyperDash":false},{"StartTime":53054.0,"Position":143.260788,"HyperDash":false}]},{"StartTime":53212.0,"Objects":[{"StartTime":53212.0,"Position":223.0,"HyperDash":false},{"StartTime":53272.0,"Position":252.329483,"HyperDash":false},{"StartTime":53369.0,"Position":291.407745,"HyperDash":false}]},{"StartTime":53528.0,"Objects":[{"StartTime":53528.0,"Position":423.0,"HyperDash":false}]},{"StartTime":53686.0,"Objects":[{"StartTime":53686.0,"Position":383.0,"HyperDash":false},{"StartTime":53746.0,"Position":384.076538,"HyperDash":false},{"StartTime":53843.0,"Position":360.5784,"HyperDash":false}]},{"StartTime":54002.0,"Objects":[{"StartTime":54002.0,"Position":445.0,"HyperDash":false},{"StartTime":54062.0,"Position":446.261871,"HyperDash":false},{"StartTime":54159.0,"Position":421.7946,"HyperDash":false}]},{"StartTime":54318.0,"Objects":[{"StartTime":54318.0,"Position":346.0,"HyperDash":false}]},{"StartTime":54476.0,"Objects":[{"StartTime":54476.0,"Position":268.0,"HyperDash":false},{"StartTime":54536.0,"Position":223.1805,"HyperDash":false},{"StartTime":54633.0,"Position":196.522339,"HyperDash":false}]},{"StartTime":54791.0,"Objects":[{"StartTime":54791.0,"Position":79.0,"HyperDash":false},{"StartTime":54860.0,"Position":75.98414,"HyperDash":false},{"StartTime":54930.0,"Position":115.252335,"HyperDash":false},{"StartTime":55000.0,"Position":116.421585,"HyperDash":false},{"StartTime":55106.0,"Position":110.769684,"HyperDash":false}]},{"StartTime":55265.0,"Objects":[{"StartTime":55265.0,"Position":38.0,"HyperDash":false},{"StartTime":55325.0,"Position":23.5258217,"HyperDash":false},{"StartTime":55422.0,"Position":54.2080231,"HyperDash":false}]},{"StartTime":55581.0,"Objects":[{"StartTime":55581.0,"Position":189.0,"HyperDash":false}]},{"StartTime":55739.0,"Objects":[{"StartTime":55739.0,"Position":125.0,"HyperDash":false},{"StartTime":55799.0,"Position":137.109589,"HyperDash":false},{"StartTime":55896.0,"Position":141.0302,"HyperDash":false}]},{"StartTime":56054.0,"Objects":[{"StartTime":56054.0,"Position":279.0,"HyperDash":false},{"StartTime":56114.0,"Position":308.761017,"HyperDash":false},{"StartTime":56211.0,"Position":351.217346,"HyperDash":false}]},{"StartTime":56370.0,"Objects":[{"StartTime":56370.0,"Position":470.0,"HyperDash":false},{"StartTime":56430.0,"Position":449.3282,"HyperDash":false},{"StartTime":56527.0,"Position":397.632721,"HyperDash":false}]},{"StartTime":56686.0,"Objects":[{"StartTime":56686.0,"Position":438.0,"HyperDash":false},{"StartTime":56746.0,"Position":427.2124,"HyperDash":false},{"StartTime":56843.0,"Position":445.736,"HyperDash":false}]},{"StartTime":57002.0,"Objects":[{"StartTime":57002.0,"Position":287.0,"HyperDash":false},{"StartTime":57062.0,"Position":284.352478,"HyperDash":false},{"StartTime":57159.0,"Position":294.1198,"HyperDash":false}]},{"StartTime":57318.0,"Objects":[{"StartTime":57318.0,"Position":334.0,"HyperDash":false},{"StartTime":57396.0,"Position":298.0179,"HyperDash":false},{"StartTime":57475.0,"Position":334.0,"HyperDash":false},{"StartTime":57554.0,"Position":298.0179,"HyperDash":false}]},{"StartTime":57633.0,"Objects":[{"StartTime":57633.0,"Position":230.0,"HyperDash":false},{"StartTime":57693.0,"Position":208.152359,"HyperDash":false},{"StartTime":57790.0,"Position":164.896362,"HyperDash":false}]},{"StartTime":57949.0,"Objects":[{"StartTime":57949.0,"Position":42.0,"HyperDash":false},{"StartTime":58009.0,"Position":61.24403,"HyperDash":false},{"StartTime":58106.0,"Position":66.01679,"HyperDash":false}]},{"StartTime":58265.0,"Objects":[{"StartTime":58265.0,"Position":188.0,"HyperDash":false},{"StartTime":58325.0,"Position":163.755981,"HyperDash":false},{"StartTime":58422.0,"Position":163.983215,"HyperDash":false}]},{"StartTime":58581.0,"Objects":[{"StartTime":58581.0,"Position":230.0,"HyperDash":false},{"StartTime":58641.0,"Position":261.006683,"HyperDash":false},{"StartTime":58738.0,"Position":299.391846,"HyperDash":false}]},{"StartTime":58897.0,"Objects":[{"StartTime":58897.0,"Position":146.0,"HyperDash":false},{"StartTime":58957.0,"Position":115.275429,"HyperDash":false},{"StartTime":59054.0,"Position":76.5043,"HyperDash":false}]},{"StartTime":59212.0,"Objects":[{"StartTime":59212.0,"Position":293.0,"HyperDash":false},{"StartTime":59281.0,"Position":302.5204,"HyperDash":false},{"StartTime":59351.0,"Position":304.419159,"HyperDash":false},{"StartTime":59421.0,"Position":314.467,"HyperDash":false},{"StartTime":59527.0,"Position":318.606537,"HyperDash":false}]},{"StartTime":59686.0,"Objects":[{"StartTime":59686.0,"Position":224.0,"HyperDash":false}]},{"StartTime":59844.0,"Objects":[{"StartTime":59844.0,"Position":405.0,"HyperDash":false},{"StartTime":59904.0,"Position":420.876434,"HyperDash":false},{"StartTime":60001.0,"Position":412.2616,"HyperDash":false}]},{"StartTime":60160.0,"Objects":[{"StartTime":60160.0,"Position":500.0,"HyperDash":false},{"StartTime":60220.0,"Position":492.536743,"HyperDash":false},{"StartTime":60317.0,"Position":429.739,"HyperDash":false}]},{"StartTime":60476.0,"Objects":[{"StartTime":60476.0,"Position":303.0,"HyperDash":false},{"StartTime":60545.0,"Position":319.948517,"HyperDash":false},{"StartTime":60615.0,"Position":348.183044,"HyperDash":false},{"StartTime":60685.0,"Position":402.9306,"HyperDash":false},{"StartTime":60791.0,"Position":439.958466,"HyperDash":false}]},{"StartTime":60949.0,"Objects":[{"StartTime":60949.0,"Position":311.0,"HyperDash":false}]},{"StartTime":61107.0,"Objects":[{"StartTime":61107.0,"Position":143.0,"HyperDash":false},{"StartTime":61167.0,"Position":158.994171,"HyperDash":false},{"StartTime":61264.0,"Position":156.7843,"HyperDash":false}]},{"StartTime":61423.0,"Objects":[{"StartTime":61423.0,"Position":63.0,"HyperDash":false},{"StartTime":61483.0,"Position":43.900074,"HyperDash":false},{"StartTime":61580.0,"Position":76.12121,"HyperDash":false}]},{"StartTime":61739.0,"Objects":[{"StartTime":61739.0,"Position":160.0,"HyperDash":false},{"StartTime":61799.0,"Position":167.994171,"HyperDash":false},{"StartTime":61896.0,"Position":173.7843,"HyperDash":false}]},{"StartTime":62055.0,"Objects":[{"StartTime":62055.0,"Position":80.0,"HyperDash":false},{"StartTime":62115.0,"Position":65.90008,"HyperDash":false},{"StartTime":62212.0,"Position":93.12121,"HyperDash":false}]},{"StartTime":62370.0,"Objects":[{"StartTime":62370.0,"Position":184.0,"HyperDash":false},{"StartTime":62439.0,"Position":195.225571,"HyperDash":false},{"StartTime":62509.0,"Position":239.72702,"HyperDash":false},{"StartTime":62579.0,"Position":260.956116,"HyperDash":false},{"StartTime":62685.0,"Position":306.492645,"HyperDash":false}]},{"StartTime":62844.0,"Objects":[{"StartTime":62844.0,"Position":406.0,"HyperDash":false}]},{"StartTime":63002.0,"Objects":[{"StartTime":63002.0,"Position":473.0,"HyperDash":false},{"StartTime":63062.0,"Position":481.5252,"HyperDash":false},{"StartTime":63159.0,"Position":455.637146,"HyperDash":false}]},{"StartTime":63318.0,"Objects":[{"StartTime":63318.0,"Position":331.0,"HyperDash":false},{"StartTime":63378.0,"Position":349.711639,"HyperDash":false},{"StartTime":63475.0,"Position":347.2463,"HyperDash":false}]},{"StartTime":63633.0,"Objects":[{"StartTime":63633.0,"Position":234.0,"HyperDash":false}]},{"StartTime":63791.0,"Objects":[{"StartTime":63791.0,"Position":160.0,"HyperDash":false},{"StartTime":63851.0,"Position":187.355438,"HyperDash":false},{"StartTime":63948.0,"Position":231.69101,"HyperDash":false}]},{"StartTime":64107.0,"Objects":[{"StartTime":64107.0,"Position":147.0,"HyperDash":false},{"StartTime":64167.0,"Position":126.032143,"HyperDash":false},{"StartTime":64264.0,"Position":74.96641,"HyperDash":false}]},{"StartTime":64423.0,"Objects":[{"StartTime":64423.0,"Position":35.0,"HyperDash":false}]},{"StartTime":64581.0,"Objects":[{"StartTime":64581.0,"Position":148.0,"HyperDash":false},{"StartTime":64641.0,"Position":112.032143,"HyperDash":false},{"StartTime":64738.0,"Position":75.96641,"HyperDash":false}]},{"StartTime":64897.0,"Objects":[{"StartTime":64897.0,"Position":18.0,"HyperDash":false}]},{"StartTime":65054.0,"Objects":[{"StartTime":65054.0,"Position":133.0,"HyperDash":false},{"StartTime":65114.0,"Position":141.7638,"HyperDash":false},{"StartTime":65211.0,"Position":148.7033,"HyperDash":false}]},{"StartTime":65370.0,"Objects":[{"StartTime":65370.0,"Position":224.0,"HyperDash":false},{"StartTime":65439.0,"Position":210.371689,"HyperDash":false},{"StartTime":65509.0,"Position":211.28067,"HyperDash":false},{"StartTime":65579.0,"Position":215.692825,"HyperDash":false},{"StartTime":65685.0,"Position":246.723145,"HyperDash":false}]},{"StartTime":65844.0,"Objects":[{"StartTime":65844.0,"Position":367.0,"HyperDash":false},{"StartTime":65904.0,"Position":394.7037,"HyperDash":false},{"StartTime":66001.0,"Position":437.557922,"HyperDash":false}]},{"StartTime":66160.0,"Objects":[{"StartTime":66160.0,"Position":456.0,"HyperDash":false},{"StartTime":66220.0,"Position":443.412323,"HyperDash":false},{"StartTime":66317.0,"Position":430.542175,"HyperDash":false}]},{"StartTime":66476.0,"Objects":[{"StartTime":66476.0,"Position":310.0,"HyperDash":false},{"StartTime":66536.0,"Position":332.587646,"HyperDash":false},{"StartTime":66633.0,"Position":335.457825,"HyperDash":false}]},{"StartTime":66791.0,"Objects":[{"StartTime":66791.0,"Position":452.0,"HyperDash":false},{"StartTime":66851.0,"Position":421.412354,"HyperDash":false},{"StartTime":66948.0,"Position":426.542175,"HyperDash":false}]},{"StartTime":67107.0,"Objects":[{"StartTime":67107.0,"Position":250.0,"HyperDash":false},{"StartTime":67167.0,"Position":259.587646,"HyperDash":false},{"StartTime":67264.0,"Position":275.457825,"HyperDash":false}]},{"StartTime":67423.0,"Objects":[{"StartTime":67423.0,"Position":143.0,"HyperDash":false},{"StartTime":67483.0,"Position":107.965904,"HyperDash":false},{"StartTime":67580.0,"Position":67.02744,"HyperDash":false}]},{"StartTime":67739.0,"Objects":[{"StartTime":67739.0,"Position":8.0,"HyperDash":false},{"StartTime":67799.0,"Position":39.0340958,"HyperDash":false},{"StartTime":67896.0,"Position":83.97256,"HyperDash":false}]},{"StartTime":68054.0,"Objects":[{"StartTime":68054.0,"Position":153.0,"HyperDash":false},{"StartTime":68123.0,"Position":136.712723,"HyperDash":false},{"StartTime":68193.0,"Position":96.94302,"HyperDash":false},{"StartTime":68263.0,"Position":47.1733246,"HyperDash":false},{"StartTime":68369.0,"Position":1.03634644,"HyperDash":false}]},{"StartTime":68686.0,"Objects":[{"StartTime":68686.0,"Position":162.0,"HyperDash":false},{"StartTime":68764.0,"Position":140.279373,"HyperDash":false},{"StartTime":68843.0,"Position":149.194489,"HyperDash":false},{"StartTime":68904.0,"Position":160.855484,"HyperDash":false},{"StartTime":69001.0,"Position":162.0,"HyperDash":false}]},{"StartTime":69160.0,"Objects":[{"StartTime":69160.0,"Position":264.0,"HyperDash":false}]},{"StartTime":69318.0,"Objects":[{"StartTime":69318.0,"Position":264.0,"HyperDash":false},{"StartTime":69387.0,"Position":293.878754,"HyperDash":false},{"StartTime":69457.0,"Position":308.962463,"HyperDash":false},{"StartTime":69527.0,"Position":326.259735,"HyperDash":false},{"StartTime":69633.0,"Position":376.5735,"HyperDash":false}]},{"StartTime":69791.0,"Objects":[{"StartTime":69791.0,"Position":477.0,"HyperDash":false},{"StartTime":69851.0,"Position":473.9998,"HyperDash":false},{"StartTime":69948.0,"Position":451.330017,"HyperDash":false}]},{"StartTime":70107.0,"Objects":[{"StartTime":70107.0,"Position":352.0,"HyperDash":false}]},{"StartTime":70265.0,"Objects":[{"StartTime":70265.0,"Position":352.0,"HyperDash":false},{"StartTime":70325.0,"Position":355.88562,"HyperDash":false},{"StartTime":70422.0,"Position":377.063232,"HyperDash":false}]},{"StartTime":70581.0,"Objects":[{"StartTime":70581.0,"Position":252.0,"HyperDash":false},{"StartTime":70650.0,"Position":243.345444,"HyperDash":false},{"StartTime":70720.0,"Position":190.933167,"HyperDash":false},{"StartTime":70790.0,"Position":181.559875,"HyperDash":false},{"StartTime":70896.0,"Position":139.968262,"HyperDash":false}]},{"StartTime":71212.0,"Objects":[{"StartTime":71212.0,"Position":139.0,"HyperDash":false},{"StartTime":71272.0,"Position":142.551361,"HyperDash":false},{"StartTime":71369.0,"Position":117.237366,"HyperDash":false}]},{"StartTime":71528.0,"Objects":[{"StartTime":71528.0,"Position":197.0,"HyperDash":false}]},{"StartTime":71686.0,"Objects":[{"StartTime":71686.0,"Position":197.0,"HyperDash":false}]},{"StartTime":71844.0,"Objects":[{"StartTime":71844.0,"Position":246.0,"HyperDash":false},{"StartTime":71904.0,"Position":274.251373,"HyperDash":false},{"StartTime":72001.0,"Position":310.825043,"HyperDash":false}]},{"StartTime":72160.0,"Objects":[{"StartTime":72160.0,"Position":382.0,"HyperDash":false}]},{"StartTime":72318.0,"Objects":[{"StartTime":72318.0,"Position":382.0,"HyperDash":false},{"StartTime":72387.0,"Position":375.660431,"HyperDash":false},{"StartTime":72457.0,"Position":397.292725,"HyperDash":false},{"StartTime":72527.0,"Position":400.838165,"HyperDash":false},{"StartTime":72633.0,"Position":413.841949,"HyperDash":false}]},{"StartTime":72791.0,"Objects":[{"StartTime":72791.0,"Position":483.0,"HyperDash":false},{"StartTime":72851.0,"Position":443.387177,"HyperDash":false},{"StartTime":72948.0,"Position":422.070221,"HyperDash":false}]},{"StartTime":73107.0,"Objects":[{"StartTime":73107.0,"Position":316.0,"HyperDash":false}]},{"StartTime":73265.0,"Objects":[{"StartTime":73265.0,"Position":316.0,"HyperDash":false}]},{"StartTime":73423.0,"Objects":[{"StartTime":73423.0,"Position":213.0,"HyperDash":false},{"StartTime":73483.0,"Position":236.624237,"HyperDash":false},{"StartTime":73580.0,"Position":274.115784,"HyperDash":false}]},{"StartTime":73739.0,"Objects":[{"StartTime":73739.0,"Position":151.0,"HyperDash":false},{"StartTime":73808.0,"Position":168.107178,"HyperDash":false},{"StartTime":73878.0,"Position":188.948715,"HyperDash":false},{"StartTime":73948.0,"Position":173.253,"HyperDash":false},{"StartTime":74054.0,"Position":186.276779,"HyperDash":false}]},{"StartTime":74212.0,"Objects":[{"StartTime":74212.0,"Position":71.0,"HyperDash":false}]},{"StartTime":74370.0,"Objects":[{"StartTime":74370.0,"Position":71.0,"HyperDash":false},{"StartTime":74439.0,"Position":73.10717,"HyperDash":false},{"StartTime":74509.0,"Position":99.94872,"HyperDash":false},{"StartTime":74579.0,"Position":82.253,"HyperDash":false},{"StartTime":74685.0,"Position":106.276787,"HyperDash":false}]},{"StartTime":74844.0,"Objects":[{"StartTime":74844.0,"Position":217.0,"HyperDash":false},{"StartTime":74904.0,"Position":195.833557,"HyperDash":false},{"StartTime":75001.0,"Position":203.228043,"HyperDash":false}]},{"StartTime":75160.0,"Objects":[{"StartTime":75160.0,"Position":292.0,"HyperDash":false},{"StartTime":75220.0,"Position":322.137878,"HyperDash":false},{"StartTime":75317.0,"Position":355.583832,"HyperDash":false}]},{"StartTime":75476.0,"Objects":[{"StartTime":75476.0,"Position":470.0,"HyperDash":false}]},{"StartTime":75633.0,"Objects":[{"StartTime":75633.0,"Position":470.0,"HyperDash":false},{"StartTime":75702.0,"Position":451.070618,"HyperDash":false},{"StartTime":75772.0,"Position":423.6466,"HyperDash":false},{"StartTime":75842.0,"Position":385.354156,"HyperDash":false},{"StartTime":75948.0,"Position":339.91098,"HyperDash":false}]},{"StartTime":76265.0,"Objects":[{"StartTime":76265.0,"Position":339.0,"HyperDash":false},{"StartTime":76325.0,"Position":330.2449,"HyperDash":false},{"StartTime":76422.0,"Position":356.729736,"HyperDash":false}]},{"StartTime":76581.0,"Objects":[{"StartTime":76581.0,"Position":274.0,"HyperDash":false}]},{"StartTime":76739.0,"Objects":[{"StartTime":76739.0,"Position":274.0,"HyperDash":false}]},{"StartTime":76897.0,"Objects":[{"StartTime":76897.0,"Position":196.0,"HyperDash":false},{"StartTime":76957.0,"Position":202.336975,"HyperDash":false},{"StartTime":77054.0,"Position":177.609283,"HyperDash":false}]},{"StartTime":77212.0,"Objects":[{"StartTime":77212.0,"Position":76.0,"HyperDash":false},{"StartTime":77272.0,"Position":87.663,"HyperDash":false},{"StartTime":77369.0,"Position":94.3907,"HyperDash":false}]},{"StartTime":77528.0,"Objects":[{"StartTime":77528.0,"Position":193.0,"HyperDash":false},{"StartTime":77588.0,"Position":215.246429,"HyperDash":false},{"StartTime":77685.0,"Position":255.401413,"HyperDash":false}]},{"StartTime":77844.0,"Objects":[{"StartTime":77844.0,"Position":363.0,"HyperDash":false},{"StartTime":77904.0,"Position":335.063263,"HyperDash":false},{"StartTime":78001.0,"Position":300.441956,"HyperDash":false}]},{"StartTime":78160.0,"Objects":[{"StartTime":78160.0,"Position":424.0,"HyperDash":false},{"StartTime":78229.0,"Position":425.201782,"HyperDash":false},{"StartTime":78299.0,"Position":406.9763,"HyperDash":false},{"StartTime":78369.0,"Position":392.725616,"HyperDash":false},{"StartTime":78475.0,"Position":375.221161,"HyperDash":false}]},{"StartTime":78791.0,"Objects":[{"StartTime":78791.0,"Position":375.0,"HyperDash":false}]},{"StartTime":87633.0,"Objects":[{"StartTime":87633.0,"Position":59.0,"HyperDash":false},{"StartTime":87733.0,"Position":109.695786,"HyperDash":false},{"StartTime":87869.0,"Position":154.94931,"HyperDash":false}]},{"StartTime":87949.0,"Objects":[{"StartTime":87949.0,"Position":157.0,"HyperDash":false},{"StartTime":88049.0,"Position":98.90486,"HyperDash":false},{"StartTime":88185.0,"Position":61.01484,"HyperDash":false}]},{"StartTime":88265.0,"Objects":[{"StartTime":88265.0,"Position":65.0,"HyperDash":false},{"StartTime":88365.0,"Position":107.226257,"HyperDash":false},{"StartTime":88501.0,"Position":160.443985,"HyperDash":false}]},{"StartTime":88581.0,"Objects":[{"StartTime":88581.0,"Position":162.0,"HyperDash":false}]},{"StartTime":88897.0,"Objects":[{"StartTime":88897.0,"Position":410.0,"HyperDash":false},{"StartTime":88957.0,"Position":434.139282,"HyperDash":false},{"StartTime":89054.0,"Position":430.5437,"HyperDash":false}]},{"StartTime":89212.0,"Objects":[{"StartTime":89212.0,"Position":329.0,"HyperDash":false}]},{"StartTime":89370.0,"Objects":[{"StartTime":89370.0,"Position":237.0,"HyperDash":false},{"StartTime":89430.0,"Position":206.860718,"HyperDash":false},{"StartTime":89527.0,"Position":216.4563,"HyperDash":false}]},{"StartTime":89686.0,"Objects":[{"StartTime":89686.0,"Position":412.0,"HyperDash":false},{"StartTime":89746.0,"Position":427.040955,"HyperDash":false},{"StartTime":89843.0,"Position":390.8584,"HyperDash":false}]},{"StartTime":90002.0,"Objects":[{"StartTime":90002.0,"Position":224.0,"HyperDash":false},{"StartTime":90071.0,"Position":193.575424,"HyperDash":false},{"StartTime":90141.0,"Position":140.9065,"HyperDash":false},{"StartTime":90211.0,"Position":134.488129,"HyperDash":false},{"StartTime":90317.0,"Position":98.64927,"HyperDash":false}]},{"StartTime":90476.0,"Objects":[{"StartTime":90476.0,"Position":198.0,"HyperDash":false}]},{"StartTime":90633.0,"Objects":[{"StartTime":90633.0,"Position":197.0,"HyperDash":false}]},{"StartTime":90791.0,"Objects":[{"StartTime":90791.0,"Position":85.0,"HyperDash":false},{"StartTime":90851.0,"Position":83.48808,"HyperDash":false},{"StartTime":90948.0,"Position":98.0172348,"HyperDash":false}]},{"StartTime":91107.0,"Objects":[{"StartTime":91107.0,"Position":308.0,"HyperDash":false},{"StartTime":91167.0,"Position":319.751,"HyperDash":false},{"StartTime":91264.0,"Position":319.957062,"HyperDash":false}]},{"StartTime":91423.0,"Objects":[{"StartTime":91423.0,"Position":210.0,"HyperDash":false},{"StartTime":91483.0,"Position":236.879288,"HyperDash":false},{"StartTime":91580.0,"Position":290.540375,"HyperDash":false}]},{"StartTime":91739.0,"Objects":[{"StartTime":91739.0,"Position":196.0,"HyperDash":false}]},{"StartTime":91897.0,"Objects":[{"StartTime":91897.0,"Position":305.0,"HyperDash":false},{"StartTime":91957.0,"Position":317.8793,"HyperDash":false},{"StartTime":92054.0,"Position":385.540375,"HyperDash":false}]},{"StartTime":92212.0,"Objects":[{"StartTime":92212.0,"Position":212.0,"HyperDash":false},{"StartTime":92272.0,"Position":221.879288,"HyperDash":false},{"StartTime":92369.0,"Position":292.540375,"HyperDash":false}]},{"StartTime":92528.0,"Objects":[{"StartTime":92528.0,"Position":446.0,"HyperDash":false},{"StartTime":92597.0,"Position":444.5924,"HyperDash":false},{"StartTime":92667.0,"Position":489.460175,"HyperDash":false},{"StartTime":92737.0,"Position":462.152466,"HyperDash":false},{"StartTime":92843.0,"Position":484.6515,"HyperDash":false}]},{"StartTime":93002.0,"Objects":[{"StartTime":93002.0,"Position":286.0,"HyperDash":false}]},{"StartTime":93160.0,"Objects":[{"StartTime":93160.0,"Position":368.0,"HyperDash":false}]},{"StartTime":93318.0,"Objects":[{"StartTime":93318.0,"Position":268.0,"HyperDash":false},{"StartTime":93378.0,"Position":258.177734,"HyperDash":false},{"StartTime":93475.0,"Position":188.322281,"HyperDash":false}]},{"StartTime":93633.0,"Objects":[{"StartTime":93633.0,"Position":349.0,"HyperDash":false},{"StartTime":93693.0,"Position":301.103668,"HyperDash":false},{"StartTime":93790.0,"Position":269.135223,"HyperDash":false}]},{"StartTime":93949.0,"Objects":[{"StartTime":93949.0,"Position":138.0,"HyperDash":false},{"StartTime":94009.0,"Position":122.494843,"HyperDash":false},{"StartTime":94106.0,"Position":107.101913,"HyperDash":false}]},{"StartTime":94265.0,"Objects":[{"StartTime":94265.0,"Position":148.0,"HyperDash":false}]},{"StartTime":94423.0,"Objects":[{"StartTime":94423.0,"Position":22.0,"HyperDash":false},{"StartTime":94483.0,"Position":32.5051575,"HyperDash":false},{"StartTime":94580.0,"Position":52.89809,"HyperDash":false}]},{"StartTime":94739.0,"Objects":[{"StartTime":94739.0,"Position":243.0,"HyperDash":false},{"StartTime":94799.0,"Position":236.5184,"HyperDash":false},{"StartTime":94896.0,"Position":272.894073,"HyperDash":false}]},{"StartTime":95054.0,"Objects":[{"StartTime":95054.0,"Position":438.0,"HyperDash":false},{"StartTime":95123.0,"Position":388.7492,"HyperDash":false},{"StartTime":95193.0,"Position":392.3104,"HyperDash":false},{"StartTime":95263.0,"Position":331.956,"HyperDash":false},{"StartTime":95369.0,"Position":294.5527,"HyperDash":false}]},{"StartTime":95528.0,"Objects":[{"StartTime":95528.0,"Position":254.0,"HyperDash":false},{"StartTime":95588.0,"Position":290.0384,"HyperDash":false},{"StartTime":95685.0,"Position":283.842346,"HyperDash":false}]},{"StartTime":95844.0,"Objects":[{"StartTime":95844.0,"Position":427.0,"HyperDash":false},{"StartTime":95904.0,"Position":416.4857,"HyperDash":false},{"StartTime":96001.0,"Position":442.904083,"HyperDash":false}]},{"StartTime":96160.0,"Objects":[{"StartTime":96160.0,"Position":279.0,"HyperDash":false},{"StartTime":96220.0,"Position":299.0384,"HyperDash":false},{"StartTime":96317.0,"Position":308.842346,"HyperDash":false}]},{"StartTime":96476.0,"Objects":[{"StartTime":96476.0,"Position":225.0,"HyperDash":false},{"StartTime":96536.0,"Position":210.338287,"HyperDash":false},{"StartTime":96633.0,"Position":143.344467,"HyperDash":false}]},{"StartTime":96791.0,"Objects":[{"StartTime":96791.0,"Position":288.0,"HyperDash":false}]},{"StartTime":96949.0,"Objects":[{"StartTime":96949.0,"Position":180.0,"HyperDash":false},{"StartTime":97009.0,"Position":166.338287,"HyperDash":false},{"StartTime":97106.0,"Position":98.3444748,"HyperDash":false}]},{"StartTime":97265.0,"Objects":[{"StartTime":97265.0,"Position":274.0,"HyperDash":false},{"StartTime":97325.0,"Position":309.692352,"HyperDash":false},{"StartTime":97422.0,"Position":355.842438,"HyperDash":false}]},{"StartTime":97581.0,"Objects":[{"StartTime":97581.0,"Position":417.0,"HyperDash":false}]},{"StartTime":97739.0,"Objects":[{"StartTime":97739.0,"Position":420.0,"HyperDash":false},{"StartTime":97799.0,"Position":396.8472,"HyperDash":false},{"StartTime":97896.0,"Position":380.9233,"HyperDash":false}]},{"StartTime":98054.0,"Objects":[{"StartTime":98054.0,"Position":346.0,"HyperDash":false}]},{"StartTime":98212.0,"Objects":[{"StartTime":98212.0,"Position":299.0,"HyperDash":false}]},{"StartTime":98370.0,"Objects":[{"StartTime":98370.0,"Position":337.0,"HyperDash":false}]},{"StartTime":98528.0,"Objects":[{"StartTime":98528.0,"Position":290.0,"HyperDash":false}]},{"StartTime":98686.0,"Objects":[{"StartTime":98686.0,"Position":170.0,"HyperDash":false},{"StartTime":98746.0,"Position":129.894,"HyperDash":false},{"StartTime":98843.0,"Position":88.38194,"HyperDash":false}]},{"StartTime":99002.0,"Objects":[{"StartTime":99002.0,"Position":45.0,"HyperDash":false},{"StartTime":99062.0,"Position":73.99868,"HyperDash":false},{"StartTime":99159.0,"Position":87.32532,"HyperDash":false}]},{"StartTime":99318.0,"Objects":[{"StartTime":99318.0,"Position":164.0,"HyperDash":false}]},{"StartTime":99476.0,"Objects":[{"StartTime":99476.0,"Position":146.0,"HyperDash":false},{"StartTime":99536.0,"Position":113.96389,"HyperDash":false},{"StartTime":99633.0,"Position":66.87661,"HyperDash":false}]},{"StartTime":99791.0,"Objects":[{"StartTime":99791.0,"Position":163.0,"HyperDash":false},{"StartTime":99851.0,"Position":182.9796,"HyperDash":false},{"StartTime":99948.0,"Position":242.314056,"HyperDash":false}]},{"StartTime":100107.0,"Objects":[{"StartTime":100107.0,"Position":306.0,"HyperDash":false},{"StartTime":100176.0,"Position":272.841949,"HyperDash":false},{"StartTime":100246.0,"Position":282.58606,"HyperDash":false},{"StartTime":100316.0,"Position":262.382751,"HyperDash":false},{"StartTime":100422.0,"Position":258.4074,"HyperDash":false}]},{"StartTime":100581.0,"Objects":[{"StartTime":100581.0,"Position":446.0,"HyperDash":false}]},{"StartTime":100739.0,"Objects":[{"StartTime":100739.0,"Position":376.0,"HyperDash":false},{"StartTime":100799.0,"Position":361.111847,"HyperDash":false},{"StartTime":100896.0,"Position":305.5532,"HyperDash":false}]},{"StartTime":101054.0,"Objects":[{"StartTime":101054.0,"Position":236.0,"HyperDash":false}]},{"StartTime":101212.0,"Objects":[{"StartTime":101212.0,"Position":402.0,"HyperDash":false},{"StartTime":101272.0,"Position":446.655,"HyperDash":false},{"StartTime":101369.0,"Position":481.3611,"HyperDash":false}]},{"StartTime":101528.0,"Objects":[{"StartTime":101528.0,"Position":334.0,"HyperDash":false},{"StartTime":101588.0,"Position":334.394165,"HyperDash":false},{"StartTime":101685.0,"Position":350.023041,"HyperDash":false}]},{"StartTime":101844.0,"Objects":[{"StartTime":101844.0,"Position":219.0,"HyperDash":false}]},{"StartTime":102002.0,"Objects":[{"StartTime":102002.0,"Position":177.0,"HyperDash":false},{"StartTime":102062.0,"Position":159.9585,"HyperDash":false},{"StartTime":102159.0,"Position":98.64363,"HyperDash":false}]},{"StartTime":102318.0,"Objects":[{"StartTime":102318.0,"Position":140.0,"HyperDash":false},{"StartTime":102378.0,"Position":163.494385,"HyperDash":false},{"StartTime":102475.0,"Position":218.169327,"HyperDash":false}]},{"StartTime":102633.0,"Objects":[{"StartTime":102633.0,"Position":22.0,"HyperDash":false},{"StartTime":102702.0,"Position":31.6368866,"HyperDash":false},{"StartTime":102772.0,"Position":59.88773,"HyperDash":false},{"StartTime":102842.0,"Position":57.2475433,"HyperDash":false},{"StartTime":102948.0,"Position":67.89443,"HyperDash":false}]},{"StartTime":103107.0,"Objects":[{"StartTime":103107.0,"Position":182.0,"HyperDash":false}]},{"StartTime":103265.0,"Objects":[{"StartTime":103265.0,"Position":200.0,"HyperDash":false},{"StartTime":103325.0,"Position":221.459839,"HyperDash":false},{"StartTime":103422.0,"Position":217.979309,"HyperDash":false}]},{"StartTime":103581.0,"Objects":[{"StartTime":103581.0,"Position":337.0,"HyperDash":false}]},{"StartTime":103739.0,"Objects":[{"StartTime":103739.0,"Position":331.0,"HyperDash":false},{"StartTime":103799.0,"Position":312.540161,"HyperDash":false},{"StartTime":103896.0,"Position":313.0207,"HyperDash":false}]},{"StartTime":104054.0,"Objects":[{"StartTime":104054.0,"Position":194.0,"HyperDash":false},{"StartTime":104123.0,"Position":231.002213,"HyperDash":false},{"StartTime":104193.0,"Position":276.3082,"HyperDash":false},{"StartTime":104263.0,"Position":277.368225,"HyperDash":false},{"StartTime":104369.0,"Position":325.1272,"HyperDash":false}]},{"StartTime":104528.0,"Objects":[{"StartTime":104528.0,"Position":142.0,"HyperDash":false},{"StartTime":104588.0,"Position":118.666763,"HyperDash":false},{"StartTime":104685.0,"Position":61.4790764,"HyperDash":false}]},{"StartTime":104844.0,"Objects":[{"StartTime":104844.0,"Position":187.0,"HyperDash":false},{"StartTime":104904.0,"Position":140.796371,"HyperDash":false},{"StartTime":105001.0,"Position":106.642426,"HyperDash":false}]},{"StartTime":105160.0,"Objects":[{"StartTime":105160.0,"Position":210.0,"HyperDash":false},{"StartTime":105220.0,"Position":216.543152,"HyperDash":false},{"StartTime":105317.0,"Position":232.886017,"HyperDash":false}]},{"StartTime":105476.0,"Objects":[{"StartTime":105476.0,"Position":339.0,"HyperDash":false},{"StartTime":105536.0,"Position":350.726563,"HyperDash":false},{"StartTime":105633.0,"Position":361.889038,"HyperDash":false}]},{"StartTime":105791.0,"Objects":[{"StartTime":105791.0,"Position":309.0,"HyperDash":false}]},{"StartTime":105949.0,"Objects":[{"StartTime":105949.0,"Position":454.0,"HyperDash":false},{"StartTime":106009.0,"Position":420.0147,"HyperDash":false},{"StartTime":106106.0,"Position":430.975983,"HyperDash":false}]},{"StartTime":106265.0,"Objects":[{"StartTime":106265.0,"Position":246.0,"HyperDash":false},{"StartTime":106325.0,"Position":244.2446,"HyperDash":false},{"StartTime":106422.0,"Position":268.0487,"HyperDash":false}]},{"StartTime":106581.0,"Objects":[{"StartTime":106581.0,"Position":133.0,"HyperDash":false},{"StartTime":106641.0,"Position":103.963638,"HyperDash":false},{"StartTime":106738.0,"Position":49.17154,"HyperDash":false}]},{"StartTime":106897.0,"Objects":[{"StartTime":106897.0,"Position":260.0,"HyperDash":false},{"StartTime":106957.0,"Position":304.036346,"HyperDash":false},{"StartTime":107054.0,"Position":343.828461,"HyperDash":false}]},{"StartTime":107212.0,"Objects":[{"StartTime":107212.0,"Position":127.0,"HyperDash":false},{"StartTime":107272.0,"Position":104.963638,"HyperDash":false},{"StartTime":107369.0,"Position":43.17154,"HyperDash":false}]},{"StartTime":107528.0,"Objects":[{"StartTime":107528.0,"Position":254.0,"HyperDash":false},{"StartTime":107588.0,"Position":292.036346,"HyperDash":false},{"StartTime":107685.0,"Position":337.828461,"HyperDash":false}]},{"StartTime":107844.0,"Objects":[{"StartTime":107844.0,"Position":479.0,"HyperDash":false}]},{"StartTime":108002.0,"Objects":[{"StartTime":108002.0,"Position":411.0,"HyperDash":false}]},{"StartTime":108160.0,"Objects":[{"StartTime":108160.0,"Position":400.0,"HyperDash":false}]},{"StartTime":108318.0,"Objects":[{"StartTime":108318.0,"Position":488.0,"HyperDash":false}]},{"StartTime":108476.0,"Objects":[{"StartTime":108476.0,"Position":319.0,"HyperDash":false},{"StartTime":108536.0,"Position":311.9797,"HyperDash":false},{"StartTime":108633.0,"Position":313.713531,"HyperDash":false}]},{"StartTime":108791.0,"Objects":[{"StartTime":108791.0,"Position":298.0,"HyperDash":false}]},{"StartTime":108949.0,"Objects":[{"StartTime":108949.0,"Position":220.0,"HyperDash":false}]},{"StartTime":109107.0,"Objects":[{"StartTime":109107.0,"Position":163.0,"HyperDash":false}]},{"StartTime":110212.0,"Objects":[{"StartTime":110212.0,"Position":160.0,"HyperDash":false}]},{"StartTime":111002.0,"Objects":[{"StartTime":111002.0,"Position":160.0,"HyperDash":false},{"StartTime":111102.0,"Position":170.38269,"HyperDash":false},{"StartTime":111238.0,"Position":193.050369,"HyperDash":false}]},{"StartTime":111318.0,"Objects":[{"StartTime":111318.0,"Position":214.0,"HyperDash":false},{"StartTime":111378.0,"Position":214.7743,"HyperDash":false},{"StartTime":111475.0,"Position":186.350418,"HyperDash":false}]},{"StartTime":111554.0,"Objects":[{"StartTime":111554.0,"Position":202.0,"HyperDash":false}]},{"StartTime":111633.0,"Objects":[{"StartTime":111633.0,"Position":202.0,"HyperDash":false}]},{"StartTime":112739.0,"Objects":[{"StartTime":112739.0,"Position":197.0,"HyperDash":false}]},{"StartTime":113528.0,"Objects":[{"StartTime":113528.0,"Position":197.0,"HyperDash":false},{"StartTime":113628.0,"Position":234.305908,"HyperDash":false},{"StartTime":113764.0,"Position":282.864716,"HyperDash":false}]},{"StartTime":113844.0,"Objects":[{"StartTime":113844.0,"Position":293.0,"HyperDash":false},{"StartTime":113904.0,"Position":330.591919,"HyperDash":false},{"StartTime":114001.0,"Position":348.628937,"HyperDash":false}]},{"StartTime":114081.0,"Objects":[{"StartTime":114081.0,"Position":413.0,"HyperDash":false}]},{"StartTime":114160.0,"Objects":[{"StartTime":114160.0,"Position":413.0,"HyperDash":false},{"StartTime":114220.0,"Position":422.708557,"HyperDash":false},{"StartTime":114317.0,"Position":432.737671,"HyperDash":false}]},{"StartTime":114476.0,"Objects":[{"StartTime":114476.0,"Position":328.0,"HyperDash":false}]},{"StartTime":114633.0,"Objects":[{"StartTime":114633.0,"Position":388.0,"HyperDash":false},{"StartTime":114693.0,"Position":376.2914,"HyperDash":false},{"StartTime":114790.0,"Position":368.262329,"HyperDash":false}]},{"StartTime":114949.0,"Objects":[{"StartTime":114949.0,"Position":218.0,"HyperDash":false},{"StartTime":115009.0,"Position":239.708572,"HyperDash":false},{"StartTime":115106.0,"Position":237.737671,"HyperDash":false}]},{"StartTime":115265.0,"Objects":[{"StartTime":115265.0,"Position":114.0,"HyperDash":false},{"StartTime":115334.0,"Position":111.665535,"HyperDash":false},{"StartTime":115404.0,"Position":90.91377,"HyperDash":false},{"StartTime":115474.0,"Position":109.772278,"HyperDash":false},{"StartTime":115580.0,"Position":75.52312,"HyperDash":false}]},{"StartTime":115739.0,"Objects":[{"StartTime":115739.0,"Position":206.0,"HyperDash":false},{"StartTime":115799.0,"Position":204.020508,"HyperDash":false},{"StartTime":115896.0,"Position":138.2174,"HyperDash":false}]},{"StartTime":116054.0,"Objects":[{"StartTime":116054.0,"Position":247.0,"HyperDash":false},{"StartTime":116114.0,"Position":266.224854,"HyperDash":false},{"StartTime":116211.0,"Position":314.45578,"HyperDash":false}]},{"StartTime":116370.0,"Objects":[{"StartTime":116370.0,"Position":406.0,"HyperDash":false},{"StartTime":116430.0,"Position":420.447754,"HyperDash":false},{"StartTime":116527.0,"Position":416.6286,"HyperDash":false}]},{"StartTime":116686.0,"Objects":[{"StartTime":116686.0,"Position":477.0,"HyperDash":false},{"StartTime":116746.0,"Position":430.998718,"HyperDash":false},{"StartTime":116843.0,"Position":396.846619,"HyperDash":false}]},{"StartTime":117002.0,"Objects":[{"StartTime":117002.0,"Position":286.0,"HyperDash":false}]},{"StartTime":117160.0,"Objects":[{"StartTime":117160.0,"Position":210.0,"HyperDash":false},{"StartTime":117220.0,"Position":257.991272,"HyperDash":false},{"StartTime":117317.0,"Position":289.721649,"HyperDash":false}]},{"StartTime":117476.0,"Objects":[{"StartTime":117476.0,"Position":205.0,"HyperDash":false},{"StartTime":117536.0,"Position":227.503632,"HyperDash":false},{"StartTime":117633.0,"Position":225.386322,"HyperDash":false}]},{"StartTime":117791.0,"Objects":[{"StartTime":117791.0,"Position":80.0,"HyperDash":false},{"StartTime":117860.0,"Position":86.16029,"HyperDash":false},{"StartTime":117930.0,"Position":123.197845,"HyperDash":false},{"StartTime":118000.0,"Position":137.463959,"HyperDash":false},{"StartTime":118106.0,"Position":126.215904,"HyperDash":false}]},{"StartTime":118265.0,"Objects":[{"StartTime":118265.0,"Position":279.0,"HyperDash":false}]},{"StartTime":118423.0,"Objects":[{"StartTime":118423.0,"Position":243.0,"HyperDash":false}]},{"StartTime":118581.0,"Objects":[{"StartTime":118581.0,"Position":306.0,"HyperDash":false}]},{"StartTime":118739.0,"Objects":[{"StartTime":118739.0,"Position":325.0,"HyperDash":false}]},{"StartTime":118897.0,"Objects":[{"StartTime":118897.0,"Position":330.0,"HyperDash":false}]},{"StartTime":119054.0,"Objects":[{"StartTime":119054.0,"Position":402.0,"HyperDash":false}]},{"StartTime":119528.0,"Objects":[{"StartTime":119528.0,"Position":402.0,"HyperDash":false},{"StartTime":119606.0,"Position":383.853424,"HyperDash":false},{"StartTime":119685.0,"Position":340.13028,"HyperDash":false},{"StartTime":119764.0,"Position":306.988525,"HyperDash":false},{"StartTime":119843.0,"Position":292.3493,"HyperDash":false},{"StartTime":119893.0,"Position":278.4925,"HyperDash":false},{"StartTime":119943.0,"Position":251.240692,"HyperDash":false},{"StartTime":119993.0,"Position":219.893433,"HyperDash":false},{"StartTime":120080.0,"Position":193.130447,"HyperDash":false}]},{"StartTime":120160.0,"Objects":[{"StartTime":120160.0,"Position":184.0,"HyperDash":false},{"StartTime":120238.0,"Position":212.882935,"HyperDash":false},{"StartTime":120317.0,"Position":263.114868,"HyperDash":false},{"StartTime":120396.0,"Position":296.998444,"HyperDash":false},{"StartTime":120475.0,"Position":297.759338,"HyperDash":false},{"StartTime":120525.0,"Position":324.634857,"HyperDash":false},{"StartTime":120575.0,"Position":317.226563,"HyperDash":false},{"StartTime":120625.0,"Position":338.548218,"HyperDash":false},{"StartTime":120712.0,"Position":391.822418,"HyperDash":false}]},{"StartTime":120791.0,"Objects":[{"StartTime":120791.0,"Position":385.0,"HyperDash":false},{"StartTime":120869.0,"Position":362.920959,"HyperDash":false},{"StartTime":120948.0,"Position":322.3987,"HyperDash":false},{"StartTime":121027.0,"Position":293.5699,"HyperDash":false},{"StartTime":121106.0,"Position":276.9177,"HyperDash":false},{"StartTime":121156.0,"Position":259.442749,"HyperDash":false},{"StartTime":121206.0,"Position":226.077545,"HyperDash":false},{"StartTime":121256.0,"Position":199.502151,"HyperDash":false},{"StartTime":121343.0,"Position":177.427231,"HyperDash":false}]},{"StartTime":121423.0,"Objects":[{"StartTime":121423.0,"Position":171.0,"HyperDash":false},{"StartTime":121501.0,"Position":194.8829,"HyperDash":false},{"StartTime":121580.0,"Position":232.113251,"HyperDash":false},{"StartTime":121659.0,"Position":263.966827,"HyperDash":false},{"StartTime":121738.0,"Position":284.605957,"HyperDash":false},{"StartTime":121788.0,"Position":288.396973,"HyperDash":false},{"StartTime":121838.0,"Position":333.9621,"HyperDash":false},{"StartTime":121888.0,"Position":331.2913,"HyperDash":false},{"StartTime":121975.0,"Position":378.575928,"HyperDash":false}]},{"StartTime":122054.0,"Objects":[{"StartTime":122054.0,"Position":373.0,"HyperDash":false},{"StartTime":122132.0,"Position":332.9511,"HyperDash":false},{"StartTime":122211.0,"Position":316.390533,"HyperDash":false},{"StartTime":122290.0,"Position":285.1506,"HyperDash":false},{"StartTime":122369.0,"Position":264.59256,"HyperDash":false},{"StartTime":122419.0,"Position":264.4234,"HyperDash":false},{"StartTime":122469.0,"Position":223.247314,"HyperDash":false},{"StartTime":122519.0,"Position":204.743011,"HyperDash":false},{"StartTime":122606.0,"Position":165.707657,"HyperDash":false}]},{"StartTime":122686.0,"Objects":[{"StartTime":122686.0,"Position":156.0,"HyperDash":false},{"StartTime":122786.0,"Position":141.985443,"HyperDash":false},{"StartTime":122922.0,"Position":110.21537,"HyperDash":false}]},{"StartTime":123002.0,"Objects":[{"StartTime":123002.0,"Position":129.0,"HyperDash":false},{"StartTime":123062.0,"Position":124.04425,"HyperDash":false},{"StartTime":123159.0,"Position":151.706512,"HyperDash":false}]},{"StartTime":123318.0,"Objects":[{"StartTime":123318.0,"Position":247.0,"HyperDash":false}]},{"StartTime":123475.0,"Objects":[{"StartTime":123475.0,"Position":278.0,"HyperDash":false}]},{"StartTime":123633.0,"Objects":[{"StartTime":123633.0,"Position":339.0,"HyperDash":false}]},{"StartTime":123791.0,"Objects":[{"StartTime":123791.0,"Position":272.0,"HyperDash":false}]},{"StartTime":123949.0,"Objects":[{"StartTime":123949.0,"Position":224.0,"HyperDash":false}]},{"StartTime":124107.0,"Objects":[{"StartTime":124107.0,"Position":286.0,"HyperDash":false}]},{"StartTime":124265.0,"Objects":[{"StartTime":124265.0,"Position":374.0,"HyperDash":false},{"StartTime":124325.0,"Position":390.564056,"HyperDash":false},{"StartTime":124422.0,"Position":454.897156,"HyperDash":false}]},{"StartTime":124581.0,"Objects":[{"StartTime":124581.0,"Position":368.0,"HyperDash":false}]},{"StartTime":124739.0,"Objects":[{"StartTime":124739.0,"Position":222.0,"HyperDash":false},{"StartTime":124799.0,"Position":189.435959,"HyperDash":false},{"StartTime":124896.0,"Position":141.102829,"HyperDash":false}]},{"StartTime":125054.0,"Objects":[{"StartTime":125054.0,"Position":62.0,"HyperDash":false},{"StartTime":125114.0,"Position":76.30468,"HyperDash":false},{"StartTime":125211.0,"Position":87.89828,"HyperDash":false}]},{"StartTime":125370.0,"Objects":[{"StartTime":125370.0,"Position":261.0,"HyperDash":false},{"StartTime":125430.0,"Position":244.695313,"HyperDash":false},{"StartTime":125527.0,"Position":235.101715,"HyperDash":false}]},{"StartTime":125686.0,"Objects":[{"StartTime":125686.0,"Position":86.0,"HyperDash":false},{"StartTime":125746.0,"Position":49.1613235,"HyperDash":false},{"StartTime":125843.0,"Position":5.8006506,"HyperDash":false}]},{"StartTime":126002.0,"Objects":[{"StartTime":126002.0,"Position":164.0,"HyperDash":false}]},{"StartTime":126160.0,"Objects":[{"StartTime":126160.0,"Position":235.0,"HyperDash":false},{"StartTime":126220.0,"Position":269.911163,"HyperDash":false},{"StartTime":126317.0,"Position":315.594666,"HyperDash":false}]},{"StartTime":126476.0,"Objects":[{"StartTime":126476.0,"Position":454.0,"HyperDash":false},{"StartTime":126536.0,"Position":435.099762,"HyperDash":false},{"StartTime":126633.0,"Position":373.83255,"HyperDash":false}]},{"StartTime":126791.0,"Objects":[{"StartTime":126791.0,"Position":407.0,"HyperDash":false},{"StartTime":126851.0,"Position":407.6067,"HyperDash":false},{"StartTime":126948.0,"Position":400.7375,"HyperDash":false}]},{"StartTime":127107.0,"Objects":[{"StartTime":127107.0,"Position":274.0,"HyperDash":false},{"StartTime":127167.0,"Position":260.302338,"HyperDash":false},{"StartTime":127264.0,"Position":266.941132,"HyperDash":false}]},{"StartTime":127423.0,"Objects":[{"StartTime":127423.0,"Position":421.0,"HyperDash":false},{"StartTime":127483.0,"Position":428.6067,"HyperDash":false},{"StartTime":127580.0,"Position":414.7375,"HyperDash":false}]},{"StartTime":127739.0,"Objects":[{"StartTime":127739.0,"Position":288.0,"HyperDash":false},{"StartTime":127799.0,"Position":302.302338,"HyperDash":false},{"StartTime":127896.0,"Position":280.941132,"HyperDash":false}]},{"StartTime":128054.0,"Objects":[{"StartTime":128054.0,"Position":247.0,"HyperDash":false}]},{"StartTime":128212.0,"Objects":[{"StartTime":128212.0,"Position":212.0,"HyperDash":false}]},{"StartTime":128370.0,"Objects":[{"StartTime":128370.0,"Position":251.0,"HyperDash":false}]},{"StartTime":128528.0,"Objects":[{"StartTime":128528.0,"Position":216.0,"HyperDash":false}]},{"StartTime":128686.0,"Objects":[{"StartTime":128686.0,"Position":81.0,"HyperDash":false},{"StartTime":128746.0,"Position":91.28703,"HyperDash":false},{"StartTime":128843.0,"Position":86.9844,"HyperDash":false}]},{"StartTime":129002.0,"Objects":[{"StartTime":129002.0,"Position":100.0,"HyperDash":false}]},{"StartTime":129160.0,"Objects":[{"StartTime":129160.0,"Position":163.0,"HyperDash":false}]},{"StartTime":129318.0,"Objects":[{"StartTime":129318.0,"Position":91.0,"HyperDash":false}]},{"StartTime":134370.0,"Objects":[{"StartTime":134370.0,"Position":300.0,"HyperDash":false}]},{"StartTime":135633.0,"Objects":[{"StartTime":135633.0,"Position":300.0,"HyperDash":false}]},{"StartTime":136897.0,"Objects":[{"StartTime":136897.0,"Position":300.0,"HyperDash":false},{"StartTime":136997.0,"Position":279.788757,"HyperDash":false},{"StartTime":137133.0,"Position":203.92157,"HyperDash":false}]},{"StartTime":137212.0,"Objects":[{"StartTime":137212.0,"Position":200.0,"HyperDash":false},{"StartTime":137312.0,"Position":227.884033,"HyperDash":false},{"StartTime":137448.0,"Position":295.992767,"HyperDash":false}]},{"StartTime":137528.0,"Objects":[{"StartTime":137528.0,"Position":293.0,"HyperDash":false},{"StartTime":137628.0,"Position":249.348679,"HyperDash":false},{"StartTime":137764.0,"Position":196.522751,"HyperDash":false}]},{"StartTime":137844.0,"Objects":[{"StartTime":137844.0,"Position":193.0,"HyperDash":false}]},{"StartTime":138160.0,"Objects":[{"StartTime":138160.0,"Position":337.0,"HyperDash":false},{"StartTime":138220.0,"Position":361.473083,"HyperDash":false},{"StartTime":138317.0,"Position":359.068726,"HyperDash":false}]},{"StartTime":138476.0,"Objects":[{"StartTime":138476.0,"Position":277.0,"HyperDash":false}]},{"StartTime":138633.0,"Objects":[{"StartTime":138633.0,"Position":355.0,"HyperDash":false},{"StartTime":138702.0,"Position":356.575073,"HyperDash":false},{"StartTime":138772.0,"Position":392.665771,"HyperDash":false},{"StartTime":138842.0,"Position":386.999573,"HyperDash":false},{"StartTime":138948.0,"Position":381.707275,"HyperDash":false}]},{"StartTime":139107.0,"Objects":[{"StartTime":139107.0,"Position":276.0,"HyperDash":false}]},{"StartTime":139265.0,"Objects":[{"StartTime":139265.0,"Position":276.0,"HyperDash":false}]},{"StartTime":139423.0,"Objects":[{"StartTime":139423.0,"Position":209.0,"HyperDash":false},{"StartTime":139483.0,"Position":198.122162,"HyperDash":false},{"StartTime":139580.0,"Position":145.227173,"HyperDash":false}]},{"StartTime":139739.0,"Objects":[{"StartTime":139739.0,"Position":68.0,"HyperDash":false}]},{"StartTime":139896.0,"Objects":[{"StartTime":139896.0,"Position":213.0,"HyperDash":false},{"StartTime":139965.0,"Position":198.023071,"HyperDash":false},{"StartTime":140035.0,"Position":135.780731,"HyperDash":false},{"StartTime":140105.0,"Position":105.911324,"HyperDash":false},{"StartTime":140211.0,"Position":80.0672455,"HyperDash":false}]},{"StartTime":140370.0,"Objects":[{"StartTime":140370.0,"Position":207.0,"HyperDash":false}]},{"StartTime":140528.0,"Objects":[{"StartTime":140528.0,"Position":207.0,"HyperDash":false}]},{"StartTime":140686.0,"Objects":[{"StartTime":140686.0,"Position":308.0,"HyperDash":false},{"StartTime":140746.0,"Position":291.8725,"HyperDash":false},{"StartTime":140843.0,"Position":295.128967,"HyperDash":false}]},{"StartTime":141002.0,"Objects":[{"StartTime":141002.0,"Position":421.0,"HyperDash":false}]},{"StartTime":141160.0,"Objects":[{"StartTime":141160.0,"Position":293.0,"HyperDash":false},{"StartTime":141229.0,"Position":272.132019,"HyperDash":false},{"StartTime":141299.0,"Position":276.853546,"HyperDash":false},{"StartTime":141369.0,"Position":287.3533,"HyperDash":false},{"StartTime":141475.0,"Position":261.940155,"HyperDash":false}]},{"StartTime":141633.0,"Objects":[{"StartTime":141633.0,"Position":392.0,"HyperDash":false}]},{"StartTime":141791.0,"Objects":[{"StartTime":141791.0,"Position":392.0,"HyperDash":false}]},{"StartTime":142265.0,"Objects":[{"StartTime":142265.0,"Position":392.0,"HyperDash":false},{"StartTime":142365.0,"Position":391.062164,"HyperDash":false},{"StartTime":142501.0,"Position":338.346161,"HyperDash":false}]},{"StartTime":142581.0,"Objects":[{"StartTime":142581.0,"Position":326.0,"HyperDash":false},{"StartTime":142650.0,"Position":311.6683,"HyperDash":false},{"StartTime":142720.0,"Position":268.562744,"HyperDash":false},{"StartTime":142790.0,"Position":260.483276,"HyperDash":false},{"StartTime":142896.0,"Position":203.358475,"HyperDash":false}]},{"StartTime":143212.0,"Objects":[{"StartTime":143212.0,"Position":203.0,"HyperDash":false}]},{"StartTime":144476.0,"Objects":[{"StartTime":144476.0,"Position":214.0,"HyperDash":false}]},{"StartTime":145739.0,"Objects":[{"StartTime":145739.0,"Position":214.0,"HyperDash":false},{"StartTime":145839.0,"Position":245.348236,"HyperDash":false},{"StartTime":145975.0,"Position":258.064423,"HyperDash":false}]},{"StartTime":146054.0,"Objects":[{"StartTime":146054.0,"Position":248.0,"HyperDash":false},{"StartTime":146154.0,"Position":238.651749,"HyperDash":false},{"StartTime":146290.0,"Position":203.935547,"HyperDash":false}]},{"StartTime":146370.0,"Objects":[{"StartTime":146370.0,"Position":218.0,"HyperDash":false},{"StartTime":146470.0,"Position":271.72702,"HyperDash":false},{"StartTime":146606.0,"Position":316.220551,"HyperDash":false}]},{"StartTime":146686.0,"Objects":[{"StartTime":146686.0,"Position":326.0,"HyperDash":false}]},{"StartTime":147002.0,"Objects":[{"StartTime":147002.0,"Position":440.0,"HyperDash":false},{"StartTime":147062.0,"Position":454.914642,"HyperDash":false},{"StartTime":147159.0,"Position":431.926636,"HyperDash":false}]},{"StartTime":147318.0,"Objects":[{"StartTime":147318.0,"Position":346.0,"HyperDash":false}]},{"StartTime":147476.0,"Objects":[{"StartTime":147476.0,"Position":457.0,"HyperDash":false},{"StartTime":147545.0,"Position":452.315582,"HyperDash":false},{"StartTime":147615.0,"Position":433.5778,"HyperDash":false},{"StartTime":147685.0,"Position":450.839966,"HyperDash":false},{"StartTime":147791.0,"Position":440.179871,"HyperDash":false}]},{"StartTime":147949.0,"Objects":[{"StartTime":147949.0,"Position":326.0,"HyperDash":false}]},{"StartTime":148107.0,"Objects":[{"StartTime":148107.0,"Position":326.0,"HyperDash":false}]},{"StartTime":148265.0,"Objects":[{"StartTime":148265.0,"Position":170.0,"HyperDash":false},{"StartTime":148325.0,"Position":169.085358,"HyperDash":false},{"StartTime":148422.0,"Position":178.073349,"HyperDash":false}]},{"StartTime":148581.0,"Objects":[{"StartTime":148581.0,"Position":264.0,"HyperDash":false}]},{"StartTime":148739.0,"Objects":[{"StartTime":148739.0,"Position":153.0,"HyperDash":false},{"StartTime":148808.0,"Position":154.6844,"HyperDash":false},{"StartTime":148878.0,"Position":166.422211,"HyperDash":false},{"StartTime":148948.0,"Position":158.160019,"HyperDash":false},{"StartTime":149054.0,"Position":169.820129,"HyperDash":false}]},{"StartTime":149212.0,"Objects":[{"StartTime":149212.0,"Position":284.0,"HyperDash":false}]},{"StartTime":149370.0,"Objects":[{"StartTime":149370.0,"Position":284.0,"HyperDash":false}]},{"StartTime":149528.0,"Objects":[{"StartTime":149528.0,"Position":403.0,"HyperDash":false},{"StartTime":149588.0,"Position":399.914642,"HyperDash":false},{"StartTime":149685.0,"Position":394.926636,"HyperDash":false}]},{"StartTime":149844.0,"Objects":[{"StartTime":149844.0,"Position":309.0,"HyperDash":false}]},{"StartTime":150002.0,"Objects":[{"StartTime":150002.0,"Position":420.0,"HyperDash":false},{"StartTime":150071.0,"Position":421.315582,"HyperDash":false},{"StartTime":150141.0,"Position":430.5778,"HyperDash":false},{"StartTime":150211.0,"Position":409.839966,"HyperDash":false},{"StartTime":150317.0,"Position":403.179871,"HyperDash":false}]},{"StartTime":150475.0,"Objects":[{"StartTime":150475.0,"Position":289.0,"HyperDash":false}]},{"StartTime":150633.0,"Objects":[{"StartTime":150633.0,"Position":289.0,"HyperDash":false}]},{"StartTime":151107.0,"Objects":[{"StartTime":151107.0,"Position":97.0,"HyperDash":false},{"StartTime":151207.0,"Position":135.296875,"HyperDash":false},{"StartTime":151343.0,"Position":191.738083,"HyperDash":false}]},{"StartTime":151423.0,"Objects":[{"StartTime":151423.0,"Position":198.0,"HyperDash":false},{"StartTime":151492.0,"Position":183.569153,"HyperDash":false},{"StartTime":151562.0,"Position":141.428131,"HyperDash":false},{"StartTime":151632.0,"Position":136.803146,"HyperDash":false},{"StartTime":151738.0,"Position":137.3734,"HyperDash":false}]},{"StartTime":152054.0,"Objects":[{"StartTime":152054.0,"Position":297.0,"HyperDash":false},{"StartTime":152123.0,"Position":331.7846,"HyperDash":false},{"StartTime":152193.0,"Position":338.116882,"HyperDash":false},{"StartTime":152263.0,"Position":352.270721,"HyperDash":false},{"StartTime":152369.0,"Position":408.0906,"HyperDash":false}]},{"StartTime":152528.0,"Objects":[{"StartTime":152528.0,"Position":281.0,"HyperDash":false}]},{"StartTime":152686.0,"Objects":[{"StartTime":152686.0,"Position":446.0,"HyperDash":false},{"StartTime":152755.0,"Position":492.2877,"HyperDash":false},{"StartTime":152825.0,"Position":490.710327,"HyperDash":false},{"StartTime":152895.0,"Position":503.465729,"HyperDash":false},{"StartTime":153001.0,"Position":492.445526,"HyperDash":false}]},{"StartTime":153160.0,"Objects":[{"StartTime":153160.0,"Position":343.0,"HyperDash":false}]},{"StartTime":153318.0,"Objects":[{"StartTime":153318.0,"Position":297.0,"HyperDash":false},{"StartTime":153387.0,"Position":262.8003,"HyperDash":false},{"StartTime":153457.0,"Position":234.212128,"HyperDash":false},{"StartTime":153527.0,"Position":214.138336,"HyperDash":false},{"StartTime":153633.0,"Position":166.492523,"HyperDash":false}]},{"StartTime":153791.0,"Objects":[{"StartTime":153791.0,"Position":116.0,"HyperDash":false},{"StartTime":153860.0,"Position":144.280365,"HyperDash":false},{"StartTime":153930.0,"Position":132.43898,"HyperDash":false},{"StartTime":154000.0,"Position":140.923447,"HyperDash":false},{"StartTime":154106.0,"Position":158.507156,"HyperDash":false}]},{"StartTime":154265.0,"Objects":[{"StartTime":154265.0,"Position":264.0,"HyperDash":false},{"StartTime":154325.0,"Position":233.864212,"HyperDash":false},{"StartTime":154422.0,"Position":235.824112,"HyperDash":false}]},{"StartTime":154581.0,"Objects":[{"StartTime":154581.0,"Position":152.0,"HyperDash":false},{"StartTime":154650.0,"Position":125.809914,"HyperDash":false},{"StartTime":154720.0,"Position":104.5544,"HyperDash":false},{"StartTime":154790.0,"Position":63.7936554,"HyperDash":false},{"StartTime":154896.0,"Position":32.2917,"HyperDash":false}]},{"StartTime":155054.0,"Objects":[{"StartTime":155054.0,"Position":191.0,"HyperDash":false}]},{"StartTime":155212.0,"Objects":[{"StartTime":155212.0,"Position":264.0,"HyperDash":false},{"StartTime":155281.0,"Position":311.2232,"HyperDash":false},{"StartTime":155351.0,"Position":339.435272,"HyperDash":false},{"StartTime":155421.0,"Position":368.023529,"HyperDash":false},{"StartTime":155527.0,"Position":382.984161,"HyperDash":false}]},{"StartTime":155686.0,"Objects":[{"StartTime":155686.0,"Position":212.0,"HyperDash":false}]},{"StartTime":155844.0,"Objects":[{"StartTime":155844.0,"Position":405.0,"HyperDash":false},{"StartTime":155913.0,"Position":398.1627,"HyperDash":false},{"StartTime":155983.0,"Position":377.19342,"HyperDash":false},{"StartTime":156053.0,"Position":363.4817,"HyperDash":false},{"StartTime":156159.0,"Position":358.190857,"HyperDash":false}]},{"StartTime":156318.0,"Objects":[{"StartTime":156318.0,"Position":158.0,"HyperDash":false},{"StartTime":156387.0,"Position":166.012711,"HyperDash":false},{"StartTime":156457.0,"Position":151.858978,"HyperDash":false},{"StartTime":156527.0,"Position":139.665756,"HyperDash":false},{"StartTime":156633.0,"Position":111.16011,"HyperDash":false}]},{"StartTime":156791.0,"Objects":[{"StartTime":156791.0,"Position":9.0,"HyperDash":false},{"StartTime":156851.0,"Position":37.5505524,"HyperDash":false},{"StartTime":156948.0,"Position":77.09072,"HyperDash":false}]},{"StartTime":157107.0,"Objects":[{"StartTime":157107.0,"Position":270.0,"HyperDash":false},{"StartTime":157176.0,"Position":221.1834,"HyperDash":false},{"StartTime":157246.0,"Position":202.467163,"HyperDash":false},{"StartTime":157316.0,"Position":188.839691,"HyperDash":false},{"StartTime":157422.0,"Position":171.541748,"HyperDash":false}]},{"StartTime":157581.0,"Objects":[{"StartTime":157581.0,"Position":288.0,"HyperDash":false},{"StartTime":157650.0,"Position":334.9065,"HyperDash":false},{"StartTime":157720.0,"Position":351.398132,"HyperDash":false},{"StartTime":157790.0,"Position":383.620148,"HyperDash":false},{"StartTime":157896.0,"Position":385.24826,"HyperDash":false}]},{"StartTime":158054.0,"Objects":[{"StartTime":158054.0,"Position":248.0,"HyperDash":false},{"StartTime":158114.0,"Position":269.238434,"HyperDash":false},{"StartTime":158211.0,"Position":320.739136,"HyperDash":false}]},{"StartTime":158370.0,"Objects":[{"StartTime":158370.0,"Position":490.0,"HyperDash":false},{"StartTime":158439.0,"Position":483.703064,"HyperDash":false},{"StartTime":158509.0,"Position":456.281219,"HyperDash":false},{"StartTime":158579.0,"Position":428.409576,"HyperDash":false},{"StartTime":158685.0,"Position":432.63913,"HyperDash":false}]},{"StartTime":158844.0,"Objects":[{"StartTime":158844.0,"Position":467.0,"HyperDash":false},{"StartTime":158913.0,"Position":441.987579,"HyperDash":false},{"StartTime":158983.0,"Position":453.374176,"HyperDash":false},{"StartTime":159053.0,"Position":445.3904,"HyperDash":false},{"StartTime":159159.0,"Position":409.514771,"HyperDash":false}]},{"StartTime":159318.0,"Objects":[{"StartTime":159318.0,"Position":248.0,"HyperDash":false},{"StartTime":159378.0,"Position":264.964264,"HyperDash":false},{"StartTime":159475.0,"Position":321.196442,"HyperDash":false}]},{"StartTime":159633.0,"Objects":[{"StartTime":159633.0,"Position":320.0,"HyperDash":false}]},{"StartTime":160897.0,"Objects":[{"StartTime":160897.0,"Position":118.0,"HyperDash":false},{"StartTime":160997.0,"Position":109.104843,"HyperDash":false},{"StartTime":161133.0,"Position":125.327431,"HyperDash":false}]},{"StartTime":161212.0,"Objects":[{"StartTime":161212.0,"Position":146.0,"HyperDash":false},{"StartTime":161312.0,"Position":129.61203,"HyperDash":false},{"StartTime":161448.0,"Position":138.0044,"HyperDash":false}]},{"StartTime":161528.0,"Objects":[{"StartTime":161528.0,"Position":158.0,"HyperDash":false},{"StartTime":161628.0,"Position":162.38797,"HyperDash":false},{"StartTime":161764.0,"Position":165.9956,"HyperDash":false}]},{"StartTime":161844.0,"Objects":[{"StartTime":161844.0,"Position":185.0,"HyperDash":false}]},{"StartTime":162160.0,"Objects":[{"StartTime":162160.0,"Position":39.0,"HyperDash":false},{"StartTime":162220.0,"Position":18.8607216,"HyperDash":false},{"StartTime":162317.0,"Position":18.4563026,"HyperDash":false}]},{"StartTime":162475.0,"Objects":[{"StartTime":162475.0,"Position":153.0,"HyperDash":false}]},{"StartTime":162633.0,"Objects":[{"StartTime":162633.0,"Position":221.0,"HyperDash":false},{"StartTime":162693.0,"Position":242.139282,"HyperDash":false},{"StartTime":162790.0,"Position":241.543686,"HyperDash":false}]},{"StartTime":162949.0,"Objects":[{"StartTime":162949.0,"Position":64.0,"HyperDash":false},{"StartTime":163009.0,"Position":77.95903,"HyperDash":false},{"StartTime":163106.0,"Position":85.14159,"HyperDash":false}]},{"StartTime":163265.0,"Objects":[{"StartTime":163265.0,"Position":244.0,"HyperDash":false},{"StartTime":163334.0,"Position":288.4246,"HyperDash":false},{"StartTime":163404.0,"Position":325.0935,"HyperDash":false},{"StartTime":163474.0,"Position":362.511841,"HyperDash":false},{"StartTime":163580.0,"Position":369.3507,"HyperDash":false}]},{"StartTime":163739.0,"Objects":[{"StartTime":163739.0,"Position":322.0,"HyperDash":false}]},{"StartTime":163896.0,"Objects":[{"StartTime":163896.0,"Position":282.0,"HyperDash":false}]},{"StartTime":164054.0,"Objects":[{"StartTime":164054.0,"Position":419.0,"HyperDash":false},{"StartTime":164114.0,"Position":421.511932,"HyperDash":false},{"StartTime":164211.0,"Position":405.982758,"HyperDash":false}]},{"StartTime":164370.0,"Objects":[{"StartTime":164370.0,"Position":214.0,"HyperDash":false},{"StartTime":164430.0,"Position":211.248978,"HyperDash":false},{"StartTime":164527.0,"Position":202.042938,"HyperDash":false}]},{"StartTime":164686.0,"Objects":[{"StartTime":164686.0,"Position":295.0,"HyperDash":false},{"StartTime":164746.0,"Position":278.1207,"HyperDash":false},{"StartTime":164843.0,"Position":214.459625,"HyperDash":false}]},{"StartTime":165002.0,"Objects":[{"StartTime":165002.0,"Position":305.0,"HyperDash":false}]},{"StartTime":165160.0,"Objects":[{"StartTime":165160.0,"Position":209.0,"HyperDash":false},{"StartTime":165220.0,"Position":165.120712,"HyperDash":false},{"StartTime":165317.0,"Position":128.459641,"HyperDash":false}]},{"StartTime":165475.0,"Objects":[{"StartTime":165475.0,"Position":294.0,"HyperDash":false},{"StartTime":165535.0,"Position":279.1207,"HyperDash":false},{"StartTime":165632.0,"Position":213.459625,"HyperDash":false}]},{"StartTime":165791.0,"Objects":[{"StartTime":165791.0,"Position":66.0,"HyperDash":false},{"StartTime":165860.0,"Position":45.40761,"HyperDash":false},{"StartTime":165930.0,"Position":38.5398445,"HyperDash":false},{"StartTime":166000.0,"Position":12.8475342,"HyperDash":false},{"StartTime":166106.0,"Position":27.3485184,"HyperDash":false}]},{"StartTime":166265.0,"Objects":[{"StartTime":166265.0,"Position":226.0,"HyperDash":false}]},{"StartTime":166423.0,"Objects":[{"StartTime":166423.0,"Position":144.0,"HyperDash":false}]},{"StartTime":166581.0,"Objects":[{"StartTime":166581.0,"Position":244.0,"HyperDash":false},{"StartTime":166641.0,"Position":283.822266,"HyperDash":false},{"StartTime":166738.0,"Position":323.677734,"HyperDash":false}]},{"StartTime":166896.0,"Objects":[{"StartTime":166896.0,"Position":163.0,"HyperDash":false},{"StartTime":166956.0,"Position":176.896317,"HyperDash":false},{"StartTime":167053.0,"Position":242.864777,"HyperDash":false}]},{"StartTime":167212.0,"Objects":[{"StartTime":167212.0,"Position":374.0,"HyperDash":false},{"StartTime":167272.0,"Position":398.505157,"HyperDash":false},{"StartTime":167369.0,"Position":404.8981,"HyperDash":false}]},{"StartTime":167528.0,"Objects":[{"StartTime":167528.0,"Position":364.0,"HyperDash":false}]},{"StartTime":167686.0,"Objects":[{"StartTime":167686.0,"Position":490.0,"HyperDash":false},{"StartTime":167746.0,"Position":467.494843,"HyperDash":false},{"StartTime":167843.0,"Position":459.101929,"HyperDash":false}]},{"StartTime":168002.0,"Objects":[{"StartTime":168002.0,"Position":269.0,"HyperDash":false},{"StartTime":168062.0,"Position":244.4816,"HyperDash":false},{"StartTime":168159.0,"Position":239.105927,"HyperDash":false}]},{"StartTime":168317.0,"Objects":[{"StartTime":168317.0,"Position":74.0,"HyperDash":false},{"StartTime":168386.0,"Position":97.2507858,"HyperDash":false},{"StartTime":168456.0,"Position":150.689621,"HyperDash":false},{"StartTime":168526.0,"Position":165.044,"HyperDash":false},{"StartTime":168632.0,"Position":217.447281,"HyperDash":false}]},{"StartTime":168791.0,"Objects":[{"StartTime":168791.0,"Position":258.0,"HyperDash":false},{"StartTime":168851.0,"Position":231.961609,"HyperDash":false},{"StartTime":168948.0,"Position":228.157639,"HyperDash":false}]},{"StartTime":169107.0,"Objects":[{"StartTime":169107.0,"Position":85.0,"HyperDash":false},{"StartTime":169167.0,"Position":90.51432,"HyperDash":false},{"StartTime":169264.0,"Position":69.0959244,"HyperDash":false}]},{"StartTime":169423.0,"Objects":[{"StartTime":169423.0,"Position":233.0,"HyperDash":false},{"StartTime":169483.0,"Position":208.961609,"HyperDash":false},{"StartTime":169580.0,"Position":203.157639,"HyperDash":false}]},{"StartTime":169739.0,"Objects":[{"StartTime":169739.0,"Position":296.0,"HyperDash":false},{"StartTime":169799.0,"Position":315.6617,"HyperDash":false},{"StartTime":169896.0,"Position":377.655518,"HyperDash":false}]},{"StartTime":170054.0,"Objects":[{"StartTime":170054.0,"Position":224.0,"HyperDash":false}]},{"StartTime":170212.0,"Objects":[{"StartTime":170212.0,"Position":331.0,"HyperDash":false},{"StartTime":170272.0,"Position":367.6617,"HyperDash":false},{"StartTime":170369.0,"Position":412.655518,"HyperDash":false}]},{"StartTime":170528.0,"Objects":[{"StartTime":170528.0,"Position":238.0,"HyperDash":false},{"StartTime":170588.0,"Position":203.307648,"HyperDash":false},{"StartTime":170685.0,"Position":156.157562,"HyperDash":false}]},{"StartTime":170844.0,"Objects":[{"StartTime":170844.0,"Position":95.0,"HyperDash":false}]},{"StartTime":171002.0,"Objects":[{"StartTime":171002.0,"Position":92.0,"HyperDash":false},{"StartTime":171062.0,"Position":123.152824,"HyperDash":false},{"StartTime":171159.0,"Position":131.076691,"HyperDash":false}]},{"StartTime":171317.0,"Objects":[{"StartTime":171317.0,"Position":243.0,"HyperDash":false}]},{"StartTime":171475.0,"Objects":[{"StartTime":171475.0,"Position":218.0,"HyperDash":false}]},{"StartTime":171633.0,"Objects":[{"StartTime":171633.0,"Position":237.0,"HyperDash":false}]},{"StartTime":171791.0,"Objects":[{"StartTime":171791.0,"Position":212.0,"HyperDash":false}]},{"StartTime":171949.0,"Objects":[{"StartTime":171949.0,"Position":328.0,"HyperDash":false},{"StartTime":172009.0,"Position":361.2498,"HyperDash":false},{"StartTime":172106.0,"Position":407.426453,"HyperDash":false}]},{"StartTime":172265.0,"Objects":[{"StartTime":172265.0,"Position":447.0,"HyperDash":false},{"StartTime":172325.0,"Position":412.0013,"HyperDash":false},{"StartTime":172422.0,"Position":404.674683,"HyperDash":false}]},{"StartTime":172581.0,"Objects":[{"StartTime":172581.0,"Position":349.0,"HyperDash":false}]},{"StartTime":172739.0,"Objects":[{"StartTime":172739.0,"Position":337.0,"HyperDash":false},{"StartTime":172799.0,"Position":372.2498,"HyperDash":false},{"StartTime":172896.0,"Position":416.426453,"HyperDash":false}]},{"StartTime":173054.0,"Objects":[{"StartTime":173054.0,"Position":335.0,"HyperDash":false},{"StartTime":173114.0,"Position":295.0204,"HyperDash":false},{"StartTime":173211.0,"Position":255.685944,"HyperDash":false}]},{"StartTime":173370.0,"Objects":[{"StartTime":173370.0,"Position":195.0,"HyperDash":false},{"StartTime":173439.0,"Position":205.158081,"HyperDash":false},{"StartTime":173509.0,"Position":223.41394,"HyperDash":false},{"StartTime":173579.0,"Position":259.617249,"HyperDash":false},{"StartTime":173685.0,"Position":242.5926,"HyperDash":false}]},{"StartTime":173844.0,"Objects":[{"StartTime":173844.0,"Position":66.0,"HyperDash":false}]},{"StartTime":174002.0,"Objects":[{"StartTime":174002.0,"Position":125.0,"HyperDash":false},{"StartTime":174062.0,"Position":137.888153,"HyperDash":false},{"StartTime":174159.0,"Position":195.446823,"HyperDash":false}]},{"StartTime":174317.0,"Objects":[{"StartTime":174317.0,"Position":276.0,"HyperDash":false}]},{"StartTime":174475.0,"Objects":[{"StartTime":174475.0,"Position":104.0,"HyperDash":false},{"StartTime":174535.0,"Position":70.345,"HyperDash":false},{"StartTime":174632.0,"Position":24.6388855,"HyperDash":false}]},{"StartTime":174791.0,"Objects":[{"StartTime":174791.0,"Position":178.0,"HyperDash":false},{"StartTime":174851.0,"Position":167.60582,"HyperDash":false},{"StartTime":174948.0,"Position":161.976974,"HyperDash":false}]},{"StartTime":175107.0,"Objects":[{"StartTime":175107.0,"Position":293.0,"HyperDash":false}]},{"StartTime":175265.0,"Objects":[{"StartTime":175265.0,"Position":335.0,"HyperDash":false},{"StartTime":175325.0,"Position":377.0415,"HyperDash":false},{"StartTime":175422.0,"Position":413.356354,"HyperDash":false}]},{"StartTime":175581.0,"Objects":[{"StartTime":175581.0,"Position":366.0,"HyperDash":false},{"StartTime":175641.0,"Position":334.5056,"HyperDash":false},{"StartTime":175738.0,"Position":287.8307,"HyperDash":false}]},{"StartTime":175896.0,"Objects":[{"StartTime":175896.0,"Position":490.0,"HyperDash":false},{"StartTime":175965.0,"Position":458.363129,"HyperDash":false},{"StartTime":176035.0,"Position":474.112274,"HyperDash":false},{"StartTime":176105.0,"Position":466.752441,"HyperDash":false},{"StartTime":176211.0,"Position":444.10556,"HyperDash":false}]},{"StartTime":176370.0,"Objects":[{"StartTime":176370.0,"Position":330.0,"HyperDash":false}]},{"StartTime":176528.0,"Objects":[{"StartTime":176528.0,"Position":312.0,"HyperDash":false},{"StartTime":176588.0,"Position":298.540161,"HyperDash":false},{"StartTime":176685.0,"Position":294.0207,"HyperDash":false}]},{"StartTime":176844.0,"Objects":[{"StartTime":176844.0,"Position":175.0,"HyperDash":false}]},{"StartTime":177002.0,"Objects":[{"StartTime":177002.0,"Position":181.0,"HyperDash":false},{"StartTime":177062.0,"Position":170.459839,"HyperDash":false},{"StartTime":177159.0,"Position":198.979309,"HyperDash":false}]},{"StartTime":177317.0,"Objects":[{"StartTime":177317.0,"Position":318.0,"HyperDash":false},{"StartTime":177386.0,"Position":284.9978,"HyperDash":false},{"StartTime":177456.0,"Position":269.6918,"HyperDash":false},{"StartTime":177526.0,"Position":237.63176,"HyperDash":false},{"StartTime":177632.0,"Position":186.8728,"HyperDash":false}]},{"StartTime":177791.0,"Objects":[{"StartTime":177791.0,"Position":370.0,"HyperDash":false},{"StartTime":177851.0,"Position":406.333221,"HyperDash":false},{"StartTime":177948.0,"Position":450.520935,"HyperDash":false}]},{"StartTime":178107.0,"Objects":[{"StartTime":178107.0,"Position":325.0,"HyperDash":false},{"StartTime":178167.0,"Position":339.2036,"HyperDash":false},{"StartTime":178264.0,"Position":405.357574,"HyperDash":false}]},{"StartTime":178423.0,"Objects":[{"StartTime":178423.0,"Position":302.0,"HyperDash":false},{"StartTime":178483.0,"Position":291.456818,"HyperDash":false},{"StartTime":178580.0,"Position":279.113953,"HyperDash":false}]},{"StartTime":178739.0,"Objects":[{"StartTime":178739.0,"Position":173.0,"HyperDash":false},{"StartTime":178799.0,"Position":164.273453,"HyperDash":false},{"StartTime":178896.0,"Position":150.110962,"HyperDash":false}]},{"StartTime":179054.0,"Objects":[{"StartTime":179054.0,"Position":203.0,"HyperDash":false}]},{"StartTime":179212.0,"Objects":[{"StartTime":179212.0,"Position":58.0,"HyperDash":false},{"StartTime":179272.0,"Position":71.98529,"HyperDash":false},{"StartTime":179369.0,"Position":81.024,"HyperDash":false}]},{"StartTime":179528.0,"Objects":[{"StartTime":179528.0,"Position":266.0,"HyperDash":false},{"StartTime":179588.0,"Position":270.755371,"HyperDash":false},{"StartTime":179685.0,"Position":243.9513,"HyperDash":false}]},{"StartTime":179844.0,"Objects":[{"StartTime":179844.0,"Position":379.0,"HyperDash":false},{"StartTime":179904.0,"Position":407.036346,"HyperDash":false},{"StartTime":180001.0,"Position":462.828461,"HyperDash":false}]},{"StartTime":180160.0,"Objects":[{"StartTime":180160.0,"Position":252.0,"HyperDash":false},{"StartTime":180220.0,"Position":217.963638,"HyperDash":false},{"StartTime":180317.0,"Position":168.171539,"HyperDash":false}]},{"StartTime":180475.0,"Objects":[{"StartTime":180475.0,"Position":385.0,"HyperDash":false},{"StartTime":180535.0,"Position":434.036346,"HyperDash":false},{"StartTime":180632.0,"Position":468.828461,"HyperDash":false}]},{"StartTime":180791.0,"Objects":[{"StartTime":180791.0,"Position":258.0,"HyperDash":false},{"StartTime":180851.0,"Position":241.963638,"HyperDash":false},{"StartTime":180948.0,"Position":174.171539,"HyperDash":false}]},{"StartTime":181107.0,"Objects":[{"StartTime":181107.0,"Position":295.0,"HyperDash":false}]},{"StartTime":181265.0,"Objects":[{"StartTime":181265.0,"Position":334.0,"HyperDash":false}]},{"StartTime":181423.0,"Objects":[{"StartTime":181423.0,"Position":306.0,"HyperDash":false}]},{"StartTime":181581.0,"Objects":[{"StartTime":181581.0,"Position":347.0,"HyperDash":false}]},{"StartTime":181739.0,"Objects":[{"StartTime":181739.0,"Position":317.0,"HyperDash":false},{"StartTime":181799.0,"Position":323.0203,"HyperDash":false},{"StartTime":181896.0,"Position":322.286469,"HyperDash":false}]},{"StartTime":182054.0,"Objects":[{"StartTime":182054.0,"Position":237.0,"HyperDash":false}]},{"StartTime":182212.0,"Objects":[{"StartTime":182212.0,"Position":440.0,"HyperDash":false}]},{"StartTime":182370.0,"Objects":[{"StartTime":182370.0,"Position":225.0,"HyperDash":false}]},{"StartTime":183476.0,"Objects":[{"StartTime":183476.0,"Position":173.0,"HyperDash":false}]},{"StartTime":184265.0,"Objects":[{"StartTime":184265.0,"Position":173.0,"HyperDash":false},{"StartTime":184365.0,"Position":228.359283,"HyperDash":false},{"StartTime":184501.0,"Position":263.5279,"HyperDash":false}]},{"StartTime":184581.0,"Objects":[{"StartTime":184581.0,"Position":266.0,"HyperDash":false},{"StartTime":184641.0,"Position":259.91507,"HyperDash":false},{"StartTime":184738.0,"Position":205.594452,"HyperDash":false}]},{"StartTime":184818.0,"Objects":[{"StartTime":184818.0,"Position":180.0,"HyperDash":false}]},{"StartTime":184897.0,"Objects":[{"StartTime":184897.0,"Position":180.0,"HyperDash":false}]},{"StartTime":186002.0,"Objects":[{"StartTime":186002.0,"Position":402.0,"HyperDash":false}]},{"StartTime":186791.0,"Objects":[{"StartTime":186791.0,"Position":402.0,"HyperDash":false},{"StartTime":186891.0,"Position":364.639435,"HyperDash":false},{"StartTime":187027.0,"Position":311.469055,"HyperDash":false}]},{"StartTime":187107.0,"Objects":[{"StartTime":187107.0,"Position":309.0,"HyperDash":false},{"StartTime":187167.0,"Position":345.0628,"HyperDash":false},{"StartTime":187264.0,"Position":369.347656,"HyperDash":false}]},{"StartTime":187344.0,"Objects":[{"StartTime":187344.0,"Position":432.0,"HyperDash":false}]},{"StartTime":187423.0,"Objects":[{"StartTime":187423.0,"Position":432.0,"HyperDash":false},{"StartTime":187483.0,"Position":431.965149,"HyperDash":false},{"StartTime":187580.0,"Position":414.448761,"HyperDash":false}]},{"StartTime":187739.0,"Objects":[{"StartTime":187739.0,"Position":460.0,"HyperDash":false}]},{"StartTime":187897.0,"Objects":[{"StartTime":187897.0,"Position":270.0,"HyperDash":false},{"StartTime":187957.0,"Position":264.1196,"HyperDash":false},{"StartTime":188054.0,"Position":252.031967,"HyperDash":false}]},{"StartTime":188212.0,"Objects":[{"StartTime":188212.0,"Position":345.0,"HyperDash":false},{"StartTime":188272.0,"Position":362.0573,"HyperDash":false},{"StartTime":188369.0,"Position":362.009369,"HyperDash":false}]},{"StartTime":188528.0,"Objects":[{"StartTime":188528.0,"Position":223.0,"HyperDash":false},{"StartTime":188597.0,"Position":173.194031,"HyperDash":false},{"StartTime":188667.0,"Position":151.2194,"HyperDash":false},{"StartTime":188737.0,"Position":127.234268,"HyperDash":false},{"StartTime":188843.0,"Position":90.09637,"HyperDash":false}]},{"StartTime":189002.0,"Objects":[{"StartTime":189002.0,"Position":195.0,"HyperDash":false},{"StartTime":189062.0,"Position":228.972458,"HyperDash":false},{"StartTime":189159.0,"Position":277.218262,"HyperDash":false}]},{"StartTime":189318.0,"Objects":[{"StartTime":189318.0,"Position":315.0,"HyperDash":false},{"StartTime":189378.0,"Position":267.027557,"HyperDash":false},{"StartTime":189475.0,"Position":232.781723,"HyperDash":false}]},{"StartTime":189633.0,"Objects":[{"StartTime":189633.0,"Position":426.0,"HyperDash":false},{"StartTime":189693.0,"Position":416.778778,"HyperDash":false},{"StartTime":189790.0,"Position":397.035126,"HyperDash":false}]},{"StartTime":189949.0,"Objects":[{"StartTime":189949.0,"Position":370.0,"HyperDash":false},{"StartTime":190018.0,"Position":378.220642,"HyperDash":false},{"StartTime":190088.0,"Position":331.990845,"HyperDash":false},{"StartTime":190158.0,"Position":340.3975,"HyperDash":false},{"StartTime":190264.0,"Position":316.019745,"HyperDash":false}]},{"StartTime":190423.0,"Objects":[{"StartTime":190423.0,"Position":190.0,"HyperDash":false},{"StartTime":190483.0,"Position":164.497772,"HyperDash":false},{"StartTime":190580.0,"Position":110.287689,"HyperDash":false}]},{"StartTime":190739.0,"Objects":[{"StartTime":190739.0,"Position":221.0,"HyperDash":false},{"StartTime":190799.0,"Position":269.972839,"HyperDash":false},{"StartTime":190896.0,"Position":300.6956,"HyperDash":false}]},{"StartTime":191054.0,"Objects":[{"StartTime":191054.0,"Position":189.0,"HyperDash":false}]},{"StartTime":191212.0,"Objects":[{"StartTime":191212.0,"Position":378.0,"HyperDash":false},{"StartTime":191281.0,"Position":369.800842,"HyperDash":false},{"StartTime":191351.0,"Position":353.057861,"HyperDash":false},{"StartTime":191421.0,"Position":343.24173,"HyperDash":false},{"StartTime":191527.0,"Position":338.951782,"HyperDash":false}]},{"StartTime":191686.0,"Objects":[{"StartTime":191686.0,"Position":465.0,"HyperDash":false}]},{"StartTime":191844.0,"Objects":[{"StartTime":191844.0,"Position":363.0,"HyperDash":false},{"StartTime":191904.0,"Position":354.1089,"HyperDash":false},{"StartTime":192001.0,"Position":353.0403,"HyperDash":false}]},{"StartTime":192160.0,"Objects":[{"StartTime":192160.0,"Position":421.0,"HyperDash":false}]},{"StartTime":192318.0,"Objects":[{"StartTime":192318.0,"Position":421.0,"HyperDash":false}]},{"StartTime":192791.0,"Objects":[{"StartTime":192791.0,"Position":221.0,"HyperDash":false},{"StartTime":192869.0,"Position":265.146576,"HyperDash":false},{"StartTime":192948.0,"Position":280.86972,"HyperDash":false},{"StartTime":193027.0,"Position":309.011475,"HyperDash":false},{"StartTime":193106.0,"Position":330.6507,"HyperDash":false},{"StartTime":193156.0,"Position":343.5075,"HyperDash":false},{"StartTime":193206.0,"Position":362.759338,"HyperDash":false},{"StartTime":193256.0,"Position":379.106567,"HyperDash":false},{"StartTime":193343.0,"Position":429.869537,"HyperDash":false}]},{"StartTime":193423.0,"Objects":[{"StartTime":193423.0,"Position":439.0,"HyperDash":false},{"StartTime":193501.0,"Position":382.117065,"HyperDash":false},{"StartTime":193580.0,"Position":381.885132,"HyperDash":false},{"StartTime":193659.0,"Position":348.001556,"HyperDash":false},{"StartTime":193738.0,"Position":325.240662,"HyperDash":false},{"StartTime":193788.0,"Position":320.365143,"HyperDash":false},{"StartTime":193838.0,"Position":291.773438,"HyperDash":false},{"StartTime":193888.0,"Position":291.451782,"HyperDash":false},{"StartTime":193975.0,"Position":231.177582,"HyperDash":false}]},{"StartTime":194054.0,"Objects":[{"StartTime":194054.0,"Position":238.0,"HyperDash":false},{"StartTime":194132.0,"Position":276.079041,"HyperDash":false},{"StartTime":194211.0,"Position":303.6013,"HyperDash":false},{"StartTime":194290.0,"Position":315.4301,"HyperDash":false},{"StartTime":194369.0,"Position":346.0823,"HyperDash":false},{"StartTime":194419.0,"Position":358.557251,"HyperDash":false},{"StartTime":194469.0,"Position":382.922455,"HyperDash":false},{"StartTime":194519.0,"Position":399.497833,"HyperDash":false},{"StartTime":194606.0,"Position":445.572784,"HyperDash":false}]},{"StartTime":194686.0,"Objects":[{"StartTime":194686.0,"Position":452.0,"HyperDash":false},{"StartTime":194764.0,"Position":418.1171,"HyperDash":false},{"StartTime":194843.0,"Position":389.886749,"HyperDash":false},{"StartTime":194922.0,"Position":346.033173,"HyperDash":false},{"StartTime":195001.0,"Position":338.394043,"HyperDash":false},{"StartTime":195051.0,"Position":308.603027,"HyperDash":false},{"StartTime":195101.0,"Position":307.0379,"HyperDash":false},{"StartTime":195151.0,"Position":300.7087,"HyperDash":false},{"StartTime":195238.0,"Position":244.424088,"HyperDash":false}]},{"StartTime":195317.0,"Objects":[{"StartTime":195317.0,"Position":250.0,"HyperDash":false},{"StartTime":195395.0,"Position":280.0489,"HyperDash":false},{"StartTime":195474.0,"Position":338.609467,"HyperDash":false},{"StartTime":195553.0,"Position":354.8494,"HyperDash":false},{"StartTime":195632.0,"Position":358.40744,"HyperDash":false},{"StartTime":195682.0,"Position":381.576569,"HyperDash":false},{"StartTime":195732.0,"Position":402.7527,"HyperDash":false},{"StartTime":195782.0,"Position":430.257,"HyperDash":false},{"StartTime":195869.0,"Position":457.292328,"HyperDash":false}]},{"StartTime":195949.0,"Objects":[{"StartTime":195949.0,"Position":461.0,"HyperDash":false},{"StartTime":196049.0,"Position":446.167847,"HyperDash":false},{"StartTime":196185.0,"Position":438.391785,"HyperDash":false}]},{"StartTime":196265.0,"Objects":[{"StartTime":196265.0,"Position":411.0,"HyperDash":false},{"StartTime":196325.0,"Position":383.214722,"HyperDash":false},{"StartTime":196422.0,"Position":343.5428,"HyperDash":false}]},{"StartTime":196581.0,"Objects":[{"StartTime":196581.0,"Position":136.0,"HyperDash":false}]},{"StartTime":196739.0,"Objects":[{"StartTime":196739.0,"Position":314.0,"HyperDash":false}]},{"StartTime":196897.0,"Objects":[{"StartTime":196897.0,"Position":120.0,"HyperDash":false}]},{"StartTime":197055.0,"Objects":[{"StartTime":197055.0,"Position":298.0,"HyperDash":false}]},{"StartTime":197212.0,"Objects":[{"StartTime":197212.0,"Position":104.0,"HyperDash":false},{"StartTime":197272.0,"Position":85.28295,"HyperDash":false},{"StartTime":197369.0,"Position":92.47838,"HyperDash":false}]},{"StartTime":197528.0,"Objects":[{"StartTime":197528.0,"Position":136.0,"HyperDash":false},{"StartTime":197588.0,"Position":176.664658,"HyperDash":false},{"StartTime":197685.0,"Position":211.9784,"HyperDash":false}]},{"StartTime":197844.0,"Objects":[{"StartTime":197844.0,"Position":384.0,"HyperDash":false}]},{"StartTime":198002.0,"Objects":[{"StartTime":198002.0,"Position":317.0,"HyperDash":false},{"StartTime":198062.0,"Position":278.335327,"HyperDash":false},{"StartTime":198159.0,"Position":241.0216,"HyperDash":false}]},{"StartTime":198318.0,"Objects":[{"StartTime":198318.0,"Position":373.0,"HyperDash":false},{"StartTime":198378.0,"Position":422.153229,"HyperDash":false},{"StartTime":198475.0,"Position":448.229248,"HyperDash":false}]},{"StartTime":198633.0,"Objects":[{"StartTime":198633.0,"Position":436.0,"HyperDash":false},{"StartTime":198693.0,"Position":422.984,"HyperDash":false},{"StartTime":198790.0,"Position":412.4418,"HyperDash":false}]},{"StartTime":198949.0,"Objects":[{"StartTime":198949.0,"Position":264.0,"HyperDash":false},{"StartTime":199009.0,"Position":276.016,"HyperDash":false},{"StartTime":199106.0,"Position":287.5582,"HyperDash":false}]},{"StartTime":199265.0,"Objects":[{"StartTime":199265.0,"Position":242.0,"HyperDash":false}]},{"StartTime":199423.0,"Objects":[{"StartTime":199423.0,"Position":414.0,"HyperDash":false},{"StartTime":199483.0,"Position":411.984,"HyperDash":false},{"StartTime":199580.0,"Position":390.4418,"HyperDash":false}]},{"StartTime":199739.0,"Objects":[{"StartTime":199739.0,"Position":214.0,"HyperDash":false},{"StartTime":199799.0,"Position":212.821,"HyperDash":false},{"StartTime":199896.0,"Position":190.064774,"HyperDash":false}]},{"StartTime":200054.0,"Objects":[{"StartTime":200054.0,"Position":38.0,"HyperDash":false},{"StartTime":200114.0,"Position":47.9374542,"HyperDash":false},{"StartTime":200211.0,"Position":48.30301,"HyperDash":false}]},{"StartTime":200370.0,"Objects":[{"StartTime":200370.0,"Position":86.0,"HyperDash":false},{"StartTime":200430.0,"Position":89.79463,"HyperDash":false},{"StartTime":200527.0,"Position":95.92929,"HyperDash":false}]},{"StartTime":200686.0,"Objects":[{"StartTime":200686.0,"Position":48.0,"HyperDash":false},{"StartTime":200746.0,"Position":62.9374542,"HyperDash":false},{"StartTime":200843.0,"Position":58.30301,"HyperDash":false}]},{"StartTime":201002.0,"Objects":[{"StartTime":201002.0,"Position":96.0,"HyperDash":false},{"StartTime":201062.0,"Position":89.79463,"HyperDash":false},{"StartTime":201159.0,"Position":105.929291,"HyperDash":false}]},{"StartTime":201318.0,"Objects":[{"StartTime":201318.0,"Position":223.0,"HyperDash":false}]},{"StartTime":201476.0,"Objects":[{"StartTime":201476.0,"Position":211.0,"HyperDash":false}]},{"StartTime":201633.0,"Objects":[{"StartTime":201633.0,"Position":239.0,"HyperDash":false}]},{"StartTime":201791.0,"Objects":[{"StartTime":201791.0,"Position":227.0,"HyperDash":false}]},{"StartTime":201949.0,"Objects":[{"StartTime":201949.0,"Position":255.0,"HyperDash":false},{"StartTime":202009.0,"Position":263.68692,"HyperDash":false},{"StartTime":202106.0,"Position":243.714127,"HyperDash":false}]},{"StartTime":202265.0,"Objects":[{"StartTime":202265.0,"Position":218.0,"HyperDash":false}]},{"StartTime":202423.0,"Objects":[{"StartTime":202423.0,"Position":309.0,"HyperDash":false}]},{"StartTime":202581.0,"Objects":[{"StartTime":202581.0,"Position":328.0,"HyperDash":false}]},{"StartTime":203528.0,"Objects":[{"StartTime":203528.0,"Position":459.0,"HyperDash":false},{"StartTime":203588.0,"Position":448.977936,"HyperDash":false},{"StartTime":203685.0,"Position":398.758942,"HyperDash":false}]},{"StartTime":203844.0,"Objects":[{"StartTime":203844.0,"Position":305.0,"HyperDash":false}]},{"StartTime":204002.0,"Objects":[{"StartTime":204002.0,"Position":305.0,"HyperDash":false}]},{"StartTime":204160.0,"Objects":[{"StartTime":204160.0,"Position":264.0,"HyperDash":false}]},{"StartTime":204318.0,"Objects":[{"StartTime":204318.0,"Position":264.0,"HyperDash":false}]},{"StartTime":204476.0,"Objects":[{"StartTime":204476.0,"Position":210.0,"HyperDash":false}]},{"StartTime":204633.0,"Objects":[{"StartTime":204633.0,"Position":210.0,"HyperDash":false},{"StartTime":204693.0,"Position":211.007629,"HyperDash":false},{"StartTime":204790.0,"Position":204.786621,"HyperDash":false}]},{"StartTime":204949.0,"Objects":[{"StartTime":204949.0,"Position":62.0,"HyperDash":false},{"StartTime":205009.0,"Position":74.99237,"HyperDash":false},{"StartTime":205106.0,"Position":67.21338,"HyperDash":false}]},{"StartTime":205265.0,"Objects":[{"StartTime":205265.0,"Position":192.0,"HyperDash":false},{"StartTime":205325.0,"Position":214.8626,"HyperDash":false},{"StartTime":205422.0,"Position":262.080139,"HyperDash":false}]},{"StartTime":205581.0,"Objects":[{"StartTime":205581.0,"Position":398.0,"HyperDash":false},{"StartTime":205641.0,"Position":358.8581,"HyperDash":false},{"StartTime":205738.0,"Position":327.74704,"HyperDash":false}]},{"StartTime":205897.0,"Objects":[{"StartTime":205897.0,"Position":407.0,"HyperDash":false}]},{"StartTime":206054.0,"Objects":[{"StartTime":206054.0,"Position":493.0,"HyperDash":false},{"StartTime":206114.0,"Position":493.732544,"HyperDash":false},{"StartTime":206211.0,"Position":478.1135,"HyperDash":false}]},{"StartTime":206370.0,"Objects":[{"StartTime":206370.0,"Position":311.0,"HyperDash":false},{"StartTime":206430.0,"Position":296.786255,"HyperDash":false},{"StartTime":206527.0,"Position":239.579437,"HyperDash":false}]},{"StartTime":206686.0,"Objects":[{"StartTime":206686.0,"Position":76.0,"HyperDash":false}]},{"StartTime":206844.0,"Objects":[{"StartTime":206844.0,"Position":76.0,"HyperDash":false}]},{"StartTime":207002.0,"Objects":[{"StartTime":207002.0,"Position":186.0,"HyperDash":false}]},{"StartTime":207160.0,"Objects":[{"StartTime":207160.0,"Position":186.0,"HyperDash":false},{"StartTime":207220.0,"Position":211.157623,"HyperDash":false},{"StartTime":207317.0,"Position":257.432068,"HyperDash":false}]},{"StartTime":207476.0,"Objects":[{"StartTime":207476.0,"Position":102.0,"HyperDash":false},{"StartTime":207545.0,"Position":104.631119,"HyperDash":false},{"StartTime":207615.0,"Position":116.053741,"HyperDash":false},{"StartTime":207685.0,"Position":129.854782,"HyperDash":false},{"StartTime":207791.0,"Position":145.055069,"HyperDash":false}]},{"StartTime":207949.0,"Objects":[{"StartTime":207949.0,"Position":73.0,"HyperDash":false}]},{"StartTime":208107.0,"Objects":[{"StartTime":208107.0,"Position":73.0,"HyperDash":false}]},{"StartTime":208265.0,"Objects":[{"StartTime":208265.0,"Position":188.0,"HyperDash":false}]},{"StartTime":208423.0,"Objects":[{"StartTime":208423.0,"Position":188.0,"HyperDash":false},{"StartTime":208483.0,"Position":197.04393,"HyperDash":false},{"StartTime":208580.0,"Position":259.303467,"HyperDash":false}]},{"StartTime":208739.0,"Objects":[{"StartTime":208739.0,"Position":356.0,"HyperDash":false}]},{"StartTime":208897.0,"Objects":[{"StartTime":208897.0,"Position":428.0,"HyperDash":false},{"StartTime":208957.0,"Position":429.1922,"HyperDash":false},{"StartTime":209054.0,"Position":459.666473,"HyperDash":false}]},{"StartTime":209212.0,"Objects":[{"StartTime":209212.0,"Position":320.0,"HyperDash":false}]},{"StartTime":209370.0,"Objects":[{"StartTime":209370.0,"Position":320.0,"HyperDash":false}]},{"StartTime":209528.0,"Objects":[{"StartTime":209528.0,"Position":347.0,"HyperDash":false}]},{"StartTime":209686.0,"Objects":[{"StartTime":209686.0,"Position":347.0,"HyperDash":false}]},{"StartTime":209844.0,"Objects":[{"StartTime":209844.0,"Position":228.0,"HyperDash":false}]},{"StartTime":210002.0,"Objects":[{"StartTime":210002.0,"Position":135.0,"HyperDash":false},{"StartTime":210071.0,"Position":121.854248,"HyperDash":false},{"StartTime":210141.0,"Position":131.1977,"HyperDash":false},{"StartTime":210211.0,"Position":101.2941,"HyperDash":false},{"StartTime":210317.0,"Position":107.741356,"HyperDash":false}]},{"StartTime":210476.0,"Objects":[{"StartTime":210476.0,"Position":226.0,"HyperDash":false}]},{"StartTime":210633.0,"Objects":[{"StartTime":210633.0,"Position":226.0,"HyperDash":false}]},{"StartTime":210791.0,"Objects":[{"StartTime":210791.0,"Position":188.0,"HyperDash":false},{"StartTime":210851.0,"Position":221.829361,"HyperDash":false},{"StartTime":210948.0,"Position":216.115952,"HyperDash":false}]},{"StartTime":211107.0,"Objects":[{"StartTime":211107.0,"Position":289.0,"HyperDash":false}]},{"StartTime":211265.0,"Objects":[{"StartTime":211265.0,"Position":289.0,"HyperDash":false}]},{"StartTime":211423.0,"Objects":[{"StartTime":211423.0,"Position":357.0,"HyperDash":false},{"StartTime":211483.0,"Position":351.170654,"HyperDash":false},{"StartTime":211580.0,"Position":328.884064,"HyperDash":false}]},{"StartTime":211739.0,"Objects":[{"StartTime":211739.0,"Position":320.0,"HyperDash":false}]},{"StartTime":211897.0,"Objects":[{"StartTime":211897.0,"Position":420.0,"HyperDash":false},{"StartTime":211966.0,"Position":438.684967,"HyperDash":false},{"StartTime":212036.0,"Position":420.642761,"HyperDash":false},{"StartTime":212106.0,"Position":454.598969,"HyperDash":false},{"StartTime":212212.0,"Position":437.382416,"HyperDash":false}]},{"StartTime":212370.0,"Objects":[{"StartTime":212370.0,"Position":330.0,"HyperDash":false}]},{"StartTime":212528.0,"Objects":[{"StartTime":212528.0,"Position":188.0,"HyperDash":false},{"StartTime":212597.0,"Position":177.5667,"HyperDash":false},{"StartTime":212667.0,"Position":199.229538,"HyperDash":false},{"StartTime":212737.0,"Position":175.06488,"HyperDash":false},{"StartTime":212843.0,"Position":205.139709,"HyperDash":false}]},{"StartTime":213002.0,"Objects":[{"StartTime":213002.0,"Position":89.0,"HyperDash":false}]},{"StartTime":213160.0,"Objects":[{"StartTime":213160.0,"Position":89.0,"HyperDash":false}]},{"StartTime":213318.0,"Objects":[{"StartTime":213318.0,"Position":205.0,"HyperDash":false},{"StartTime":213378.0,"Position":224.953186,"HyperDash":false},{"StartTime":213475.0,"Position":276.3385,"HyperDash":false}]},{"StartTime":213633.0,"Objects":[{"StartTime":213633.0,"Position":355.0,"HyperDash":false}]},{"StartTime":213791.0,"Objects":[{"StartTime":213791.0,"Position":355.0,"HyperDash":false}]},{"StartTime":213949.0,"Objects":[{"StartTime":213949.0,"Position":377.0,"HyperDash":false},{"StartTime":214009.0,"Position":374.1648,"HyperDash":false},{"StartTime":214106.0,"Position":356.636047,"HyperDash":false}]},{"StartTime":214265.0,"Objects":[{"StartTime":214265.0,"Position":229.0,"HyperDash":false},{"StartTime":214325.0,"Position":222.07782,"HyperDash":false},{"StartTime":214422.0,"Position":207.805984,"HyperDash":false}]},{"StartTime":214581.0,"Objects":[{"StartTime":214581.0,"Position":109.0,"HyperDash":false}]},{"StartTime":214739.0,"Objects":[{"StartTime":214739.0,"Position":109.0,"HyperDash":false}]},{"StartTime":214897.0,"Objects":[{"StartTime":214897.0,"Position":176.0,"HyperDash":false},{"StartTime":214957.0,"Position":219.19249,"HyperDash":false},{"StartTime":215054.0,"Position":248.6392,"HyperDash":false}]},{"StartTime":215212.0,"Objects":[{"StartTime":215212.0,"Position":343.0,"HyperDash":false}]},{"StartTime":215370.0,"Objects":[{"StartTime":215370.0,"Position":343.0,"HyperDash":false}]},{"StartTime":215528.0,"Objects":[{"StartTime":215528.0,"Position":304.0,"HyperDash":false}]},{"StartTime":215686.0,"Objects":[{"StartTime":215686.0,"Position":304.0,"HyperDash":false}]},{"StartTime":215844.0,"Objects":[{"StartTime":215844.0,"Position":425.0,"HyperDash":false},{"StartTime":215904.0,"Position":443.940369,"HyperDash":false},{"StartTime":216001.0,"Position":497.363678,"HyperDash":false}]},{"StartTime":216160.0,"Objects":[{"StartTime":216160.0,"Position":386.0,"HyperDash":false},{"StartTime":216220.0,"Position":369.1159,"HyperDash":false},{"StartTime":216317.0,"Position":313.428955,"HyperDash":false}]},{"StartTime":216476.0,"Objects":[{"StartTime":216476.0,"Position":269.0,"HyperDash":false},{"StartTime":216545.0,"Position":292.429657,"HyperDash":false},{"StartTime":216615.0,"Position":293.77887,"HyperDash":false},{"StartTime":216685.0,"Position":296.7586,"HyperDash":false},{"StartTime":216791.0,"Position":316.2445,"HyperDash":false}]},{"StartTime":216949.0,"Objects":[{"StartTime":216949.0,"Position":343.0,"HyperDash":false}]},{"StartTime":217107.0,"Objects":[{"StartTime":217107.0,"Position":192.0,"HyperDash":false},{"StartTime":217167.0,"Position":199.294876,"HyperDash":false},{"StartTime":217264.0,"Position":180.090454,"HyperDash":false}]},{"StartTime":217423.0,"Objects":[{"StartTime":217423.0,"Position":73.0,"HyperDash":false}]},{"StartTime":217581.0,"Objects":[{"StartTime":217581.0,"Position":73.0,"HyperDash":false}]},{"StartTime":217739.0,"Objects":[{"StartTime":217739.0,"Position":197.0,"HyperDash":false},{"StartTime":217808.0,"Position":242.080475,"HyperDash":false},{"StartTime":217878.0,"Position":248.160492,"HyperDash":false},{"StartTime":217948.0,"Position":291.815369,"HyperDash":false},{"StartTime":218054.0,"Position":323.144318,"HyperDash":false}]},{"StartTime":218212.0,"Objects":[{"StartTime":218212.0,"Position":194.0,"HyperDash":false}]},{"StartTime":218370.0,"Objects":[{"StartTime":218370.0,"Position":345.0,"HyperDash":false},{"StartTime":218430.0,"Position":355.6937,"HyperDash":false},{"StartTime":218527.0,"Position":419.238617,"HyperDash":false}]},{"StartTime":218686.0,"Objects":[{"StartTime":218686.0,"Position":416.0,"HyperDash":false},{"StartTime":218746.0,"Position":402.107758,"HyperDash":false},{"StartTime":218843.0,"Position":341.536041,"HyperDash":false}]},{"StartTime":219002.0,"Objects":[{"StartTime":219002.0,"Position":485.0,"HyperDash":false},{"StartTime":219071.0,"Position":454.952484,"HyperDash":false},{"StartTime":219141.0,"Position":458.110535,"HyperDash":false},{"StartTime":219211.0,"Position":430.9237,"HyperDash":false},{"StartTime":219317.0,"Position":435.739746,"HyperDash":false}]},{"StartTime":219476.0,"Objects":[{"StartTime":219476.0,"Position":339.0,"HyperDash":false}]},{"StartTime":219633.0,"Objects":[{"StartTime":219633.0,"Position":374.0,"HyperDash":false},{"StartTime":219702.0,"Position":396.047546,"HyperDash":false},{"StartTime":219772.0,"Position":388.889465,"HyperDash":false},{"StartTime":219842.0,"Position":400.076324,"HyperDash":false},{"StartTime":219948.0,"Position":423.260254,"HyperDash":false}]},{"StartTime":220107.0,"Objects":[{"StartTime":220107.0,"Position":248.0,"HyperDash":false}]},{"StartTime":220265.0,"Objects":[{"StartTime":220265.0,"Position":201.0,"HyperDash":false}]},{"StartTime":220423.0,"Objects":[{"StartTime":220423.0,"Position":201.0,"HyperDash":false}]},{"StartTime":220581.0,"Objects":[{"StartTime":220581.0,"Position":239.0,"HyperDash":false}]},{"StartTime":220739.0,"Objects":[{"StartTime":220739.0,"Position":239.0,"HyperDash":false}]},{"StartTime":220897.0,"Objects":[{"StartTime":220897.0,"Position":122.0,"HyperDash":false},{"StartTime":220957.0,"Position":106.407677,"HyperDash":false},{"StartTime":221054.0,"Position":49.1845436,"HyperDash":false}]},{"StartTime":221212.0,"Objects":[{"StartTime":221212.0,"Position":257.0,"HyperDash":false},{"StartTime":221272.0,"Position":297.787933,"HyperDash":false},{"StartTime":221369.0,"Position":329.733826,"HyperDash":false}]},{"StartTime":221528.0,"Objects":[{"StartTime":221528.0,"Position":442.0,"HyperDash":false},{"StartTime":221588.0,"Position":442.869934,"HyperDash":false},{"StartTime":221685.0,"Position":436.426361,"HyperDash":false}]},{"StartTime":221844.0,"Objects":[{"StartTime":221844.0,"Position":417.0,"HyperDash":false},{"StartTime":221904.0,"Position":411.709747,"HyperDash":false},{"StartTime":222001.0,"Position":411.0072,"HyperDash":false}]},{"StartTime":222160.0,"Objects":[{"StartTime":222160.0,"Position":336.0,"HyperDash":false},{"StartTime":222220.0,"Position":351.869934,"HyperDash":false},{"StartTime":222317.0,"Position":330.426361,"HyperDash":false}]},{"StartTime":222476.0,"Objects":[{"StartTime":222476.0,"Position":311.0,"HyperDash":false},{"StartTime":222536.0,"Position":310.709747,"HyperDash":false},{"StartTime":222633.0,"Position":305.0072,"HyperDash":false}]},{"StartTime":222791.0,"Objects":[{"StartTime":222791.0,"Position":165.0,"HyperDash":false}]},{"StartTime":222949.0,"Objects":[{"StartTime":222949.0,"Position":143.0,"HyperDash":false}]},{"StartTime":223107.0,"Objects":[{"StartTime":223107.0,"Position":156.0,"HyperDash":false}]},{"StartTime":223265.0,"Objects":[{"StartTime":223265.0,"Position":125.0,"HyperDash":false}]},{"StartTime":223423.0,"Objects":[{"StartTime":223423.0,"Position":142.0,"HyperDash":false},{"StartTime":223483.0,"Position":119.964447,"HyperDash":false},{"StartTime":223580.0,"Position":66.02364,"HyperDash":false}]},{"StartTime":223739.0,"Objects":[{"StartTime":223739.0,"Position":209.0,"HyperDash":false}]},{"StartTime":223897.0,"Objects":[{"StartTime":223897.0,"Position":3.0,"HyperDash":false}]},{"StartTime":224054.0,"Objects":[{"StartTime":224054.0,"Position":111.0,"HyperDash":false}]},{"StartTime":234160.0,"Objects":[{"StartTime":234160.0,"Position":82.0,"HyperDash":false}]},{"StartTime":234476.0,"Objects":[{"StartTime":234476.0,"Position":82.0,"HyperDash":false}]},{"StartTime":234791.0,"Objects":[{"StartTime":234791.0,"Position":82.0,"HyperDash":false}]},{"StartTime":235107.0,"Objects":[{"StartTime":235107.0,"Position":82.0,"HyperDash":false}]},{"StartTime":235423.0,"Objects":[{"StartTime":235423.0,"Position":312.0,"HyperDash":false},{"StartTime":235483.0,"Position":357.5692,"HyperDash":false},{"StartTime":235580.0,"Position":391.4958,"HyperDash":false}]},{"StartTime":235739.0,"Objects":[{"StartTime":235739.0,"Position":262.0,"HyperDash":false}]},{"StartTime":235897.0,"Objects":[{"StartTime":235897.0,"Position":170.0,"HyperDash":false},{"StartTime":235957.0,"Position":146.430771,"HyperDash":false},{"StartTime":236054.0,"Position":90.5042,"HyperDash":false}]},{"StartTime":236212.0,"Objects":[{"StartTime":236212.0,"Position":83.0,"HyperDash":false},{"StartTime":236272.0,"Position":102.111885,"HyperDash":false},{"StartTime":236369.0,"Position":108.48745,"HyperDash":false}]},{"StartTime":236528.0,"Objects":[{"StartTime":236528.0,"Position":258.0,"HyperDash":false},{"StartTime":236597.0,"Position":241.951874,"HyperDash":false},{"StartTime":236667.0,"Position":212.802032,"HyperDash":false},{"StartTime":236737.0,"Position":200.97171,"HyperDash":false},{"StartTime":236843.0,"Position":210.516815,"HyperDash":false}]},{"StartTime":237002.0,"Objects":[{"StartTime":237002.0,"Position":327.0,"HyperDash":false}]},{"StartTime":237160.0,"Objects":[{"StartTime":237160.0,"Position":170.0,"HyperDash":false}]},{"StartTime":237318.0,"Objects":[{"StartTime":237318.0,"Position":316.0,"HyperDash":false},{"StartTime":237378.0,"Position":364.7829,"HyperDash":false},{"StartTime":237475.0,"Position":397.227,"HyperDash":false}]},{"StartTime":237633.0,"Objects":[{"StartTime":237633.0,"Position":417.0,"HyperDash":false},{"StartTime":237693.0,"Position":394.217072,"HyperDash":false},{"StartTime":237790.0,"Position":335.773,"HyperDash":false}]},{"StartTime":237949.0,"Objects":[{"StartTime":237949.0,"Position":153.0,"HyperDash":false},{"StartTime":238018.0,"Position":178.837616,"HyperDash":false},{"StartTime":238088.0,"Position":163.454758,"HyperDash":false},{"StartTime":238158.0,"Position":190.438675,"HyperDash":false},{"StartTime":238264.0,"Position":188.068771,"HyperDash":false}]},{"StartTime":238423.0,"Objects":[{"StartTime":238423.0,"Position":81.0,"HyperDash":false},{"StartTime":238483.0,"Position":68.7763062,"HyperDash":false},{"StartTime":238580.0,"Position":95.3198,"HyperDash":false}]},{"StartTime":238739.0,"Objects":[{"StartTime":238739.0,"Position":277.0,"HyperDash":false},{"StartTime":238799.0,"Position":285.009674,"HyperDash":false},{"StartTime":238896.0,"Position":291.003174,"HyperDash":false}]},{"StartTime":239054.0,"Objects":[{"StartTime":239054.0,"Position":429.0,"HyperDash":false},{"StartTime":239123.0,"Position":409.879852,"HyperDash":false},{"StartTime":239193.0,"Position":394.502,"HyperDash":false},{"StartTime":239263.0,"Position":421.1194,"HyperDash":false},{"StartTime":239369.0,"Position":401.762024,"HyperDash":false}]},{"StartTime":239528.0,"Objects":[{"StartTime":239528.0,"Position":252.0,"HyperDash":false}]},{"StartTime":239686.0,"Objects":[{"StartTime":239686.0,"Position":383.0,"HyperDash":false}]},{"StartTime":239844.0,"Objects":[{"StartTime":239844.0,"Position":224.0,"HyperDash":false},{"StartTime":239904.0,"Position":248.6068,"HyperDash":false},{"StartTime":240001.0,"Position":243.923813,"HyperDash":false}]},{"StartTime":240160.0,"Objects":[{"StartTime":240160.0,"Position":282.0,"HyperDash":false},{"StartTime":240220.0,"Position":294.4477,"HyperDash":false},{"StartTime":240317.0,"Position":300.9552,"HyperDash":false}]},{"StartTime":240476.0,"Objects":[{"StartTime":240476.0,"Position":155.0,"HyperDash":false},{"StartTime":240536.0,"Position":139.565125,"HyperDash":false},{"StartTime":240633.0,"Position":75.8260956,"HyperDash":false}]},{"StartTime":240791.0,"Objects":[{"StartTime":240791.0,"Position":177.0,"HyperDash":false}]},{"StartTime":240949.0,"Objects":[{"StartTime":240949.0,"Position":285.0,"HyperDash":false},{"StartTime":241009.0,"Position":297.434875,"HyperDash":false},{"StartTime":241106.0,"Position":364.1739,"HyperDash":false}]},{"StartTime":241265.0,"Objects":[{"StartTime":241265.0,"Position":190.0,"HyperDash":false},{"StartTime":241325.0,"Position":151.565109,"HyperDash":false},{"StartTime":241422.0,"Position":110.826096,"HyperDash":true}]},{"StartTime":241581.0,"Objects":[{"StartTime":241581.0,"Position":350.0,"HyperDash":false},{"StartTime":241650.0,"Position":379.1303,"HyperDash":false},{"StartTime":241720.0,"Position":386.2259,"HyperDash":false},{"StartTime":241790.0,"Position":365.848328,"HyperDash":false},{"StartTime":241896.0,"Position":367.289581,"HyperDash":false}]},{"StartTime":242054.0,"Objects":[{"StartTime":242054.0,"Position":172.0,"HyperDash":false},{"StartTime":242114.0,"Position":207.784363,"HyperDash":false},{"StartTime":242211.0,"Position":249.567841,"HyperDash":false}]},{"StartTime":242370.0,"Objects":[{"StartTime":242370.0,"Position":94.0,"HyperDash":false},{"StartTime":242430.0,"Position":107.155533,"HyperDash":false},{"StartTime":242527.0,"Position":172.076752,"HyperDash":false}]},{"StartTime":242686.0,"Objects":[{"StartTime":242686.0,"Position":256.0,"HyperDash":false},{"StartTime":242746.0,"Position":221.664886,"HyperDash":false},{"StartTime":242843.0,"Position":177.734055,"HyperDash":false}]},{"StartTime":243002.0,"Objects":[{"StartTime":243002.0,"Position":291.0,"HyperDash":false},{"StartTime":243062.0,"Position":288.7001,"HyperDash":false},{"StartTime":243159.0,"Position":309.460449,"HyperDash":false}]},{"StartTime":243318.0,"Objects":[{"StartTime":243318.0,"Position":386.0,"HyperDash":false}]},{"StartTime":243476.0,"Objects":[{"StartTime":243476.0,"Position":225.0,"HyperDash":false},{"StartTime":243536.0,"Position":221.299881,"HyperDash":false},{"StartTime":243633.0,"Position":206.539551,"HyperDash":false}]},{"StartTime":243791.0,"Objects":[{"StartTime":243791.0,"Position":406.0,"HyperDash":false},{"StartTime":243851.0,"Position":381.939,"HyperDash":false},{"StartTime":243948.0,"Position":386.849457,"HyperDash":false}]},{"StartTime":244107.0,"Objects":[{"StartTime":244107.0,"Position":308.0,"HyperDash":false}]},{"StartTime":244265.0,"Objects":[{"StartTime":244265.0,"Position":246.0,"HyperDash":false},{"StartTime":244325.0,"Position":196.524536,"HyperDash":false},{"StartTime":244422.0,"Position":163.999634,"HyperDash":false}]},{"StartTime":244581.0,"Objects":[{"StartTime":244581.0,"Position":89.0,"HyperDash":false}]},{"StartTime":244739.0,"Objects":[{"StartTime":244739.0,"Position":89.0,"HyperDash":false}]},{"StartTime":244897.0,"Objects":[{"StartTime":244897.0,"Position":242.0,"HyperDash":false},{"StartTime":244957.0,"Position":212.524536,"HyperDash":false},{"StartTime":245054.0,"Position":159.999634,"HyperDash":false}]},{"StartTime":245212.0,"Objects":[{"StartTime":245212.0,"Position":189.0,"HyperDash":false}]},{"StartTime":245370.0,"Objects":[{"StartTime":245370.0,"Position":189.0,"HyperDash":false}]},{"StartTime":245528.0,"Objects":[{"StartTime":245528.0,"Position":311.0,"HyperDash":false},{"StartTime":245588.0,"Position":334.7987,"HyperDash":false},{"StartTime":245685.0,"Position":390.993317,"HyperDash":false}]},{"StartTime":245844.0,"Objects":[{"StartTime":245844.0,"Position":400.0,"HyperDash":false}]},{"StartTime":246002.0,"Objects":[{"StartTime":246002.0,"Position":250.0,"HyperDash":false},{"StartTime":246062.0,"Position":220.210785,"HyperDash":false},{"StartTime":246159.0,"Position":170.042587,"HyperDash":false}]},{"StartTime":246318.0,"Objects":[{"StartTime":246318.0,"Position":320.0,"HyperDash":false},{"StartTime":246378.0,"Position":337.9858,"HyperDash":false},{"StartTime":246475.0,"Position":399.7238,"HyperDash":false}]},{"StartTime":246633.0,"Objects":[{"StartTime":246633.0,"Position":488.0,"HyperDash":false},{"StartTime":246693.0,"Position":475.33725,"HyperDash":false},{"StartTime":246790.0,"Position":466.066925,"HyperDash":false}]},{"StartTime":246949.0,"Objects":[{"StartTime":246949.0,"Position":314.0,"HyperDash":false},{"StartTime":247009.0,"Position":298.7121,"HyperDash":false},{"StartTime":247106.0,"Position":292.039,"HyperDash":false}]},{"StartTime":247265.0,"Objects":[{"StartTime":247265.0,"Position":202.0,"HyperDash":false},{"StartTime":247334.0,"Position":159.634674,"HyperDash":false},{"StartTime":247404.0,"Position":149.680634,"HyperDash":false},{"StartTime":247474.0,"Position":95.09981,"HyperDash":false},{"StartTime":247580.0,"Position":69.26001,"HyperDash":false}]},{"StartTime":247739.0,"Objects":[{"StartTime":247739.0,"Position":190.0,"HyperDash":false}]},{"StartTime":247897.0,"Objects":[{"StartTime":247897.0,"Position":200.0,"HyperDash":false}]},{"StartTime":248054.0,"Objects":[{"StartTime":248054.0,"Position":188.0,"HyperDash":false},{"StartTime":248114.0,"Position":208.2239,"HyperDash":false},{"StartTime":248211.0,"Position":262.024536,"HyperDash":false}]},{"StartTime":248370.0,"Objects":[{"StartTime":248370.0,"Position":342.0,"HyperDash":false}]},{"StartTime":248528.0,"Objects":[{"StartTime":248528.0,"Position":338.0,"HyperDash":false},{"StartTime":248588.0,"Position":338.277985,"HyperDash":false},{"StartTime":248685.0,"Position":366.8771,"HyperDash":false}]},{"StartTime":248844.0,"Objects":[{"StartTime":248844.0,"Position":290.0,"HyperDash":false},{"StartTime":248904.0,"Position":284.053131,"HyperDash":false},{"StartTime":249001.0,"Position":319.062073,"HyperDash":false}]},{"StartTime":249160.0,"Objects":[{"StartTime":249160.0,"Position":432.0,"HyperDash":false},{"StartTime":249220.0,"Position":451.277985,"HyperDash":false},{"StartTime":249317.0,"Position":460.877136,"HyperDash":false}]},{"StartTime":249476.0,"Objects":[{"StartTime":249476.0,"Position":384.0,"HyperDash":false},{"StartTime":249536.0,"Position":383.053131,"HyperDash":false},{"StartTime":249633.0,"Position":413.062042,"HyperDash":false}]},{"StartTime":249791.0,"Objects":[{"StartTime":249791.0,"Position":449.0,"HyperDash":false},{"StartTime":249860.0,"Position":463.458252,"HyperDash":false},{"StartTime":249930.0,"Position":466.69632,"HyperDash":false},{"StartTime":250000.0,"Position":482.1586,"HyperDash":false},{"StartTime":250106.0,"Position":487.1767,"HyperDash":false}]},{"StartTime":250265.0,"Objects":[{"StartTime":250265.0,"Position":351.0,"HyperDash":false}]},{"StartTime":250423.0,"Objects":[{"StartTime":250423.0,"Position":312.0,"HyperDash":false}]},{"StartTime":250581.0,"Objects":[{"StartTime":250581.0,"Position":196.0,"HyperDash":false},{"StartTime":250641.0,"Position":227.257263,"HyperDash":false},{"StartTime":250738.0,"Position":222.828583,"HyperDash":false}]},{"StartTime":250897.0,"Objects":[{"StartTime":250897.0,"Position":161.0,"HyperDash":false}]},{"StartTime":251054.0,"Objects":[{"StartTime":251054.0,"Position":88.0,"HyperDash":false},{"StartTime":251114.0,"Position":72.74277,"HyperDash":false},{"StartTime":251211.0,"Position":61.1714363,"HyperDash":false}]},{"StartTime":251370.0,"Objects":[{"StartTime":251370.0,"Position":188.0,"HyperDash":false},{"StartTime":251430.0,"Position":165.064133,"HyperDash":false},{"StartTime":251527.0,"Position":160.9748,"HyperDash":false}]},{"StartTime":251686.0,"Objects":[{"StartTime":251686.0,"Position":206.0,"HyperDash":false},{"StartTime":251746.0,"Position":254.490585,"HyperDash":false},{"StartTime":251843.0,"Position":286.597961,"HyperDash":false}]},{"StartTime":252002.0,"Objects":[{"StartTime":252002.0,"Position":381.0,"HyperDash":false},{"StartTime":252062.0,"Position":344.076172,"HyperDash":false},{"StartTime":252159.0,"Position":300.619,"HyperDash":false}]},{"StartTime":252318.0,"Objects":[{"StartTime":252318.0,"Position":430.0,"HyperDash":false}]},{"StartTime":252476.0,"Objects":[{"StartTime":252476.0,"Position":440.0,"HyperDash":false},{"StartTime":252536.0,"Position":447.263672,"HyperDash":false},{"StartTime":252633.0,"Position":467.223053,"HyperDash":false}]},{"StartTime":252791.0,"Objects":[{"StartTime":252791.0,"Position":349.0,"HyperDash":false},{"StartTime":252851.0,"Position":324.82547,"HyperDash":false},{"StartTime":252948.0,"Position":321.497559,"HyperDash":false}]},{"StartTime":253107.0,"Objects":[{"StartTime":253107.0,"Position":217.0,"HyperDash":false}]},{"StartTime":253265.0,"Objects":[{"StartTime":253265.0,"Position":229.0,"HyperDash":false}]},{"StartTime":253423.0,"Objects":[{"StartTime":253423.0,"Position":235.0,"HyperDash":false}]},{"StartTime":253581.0,"Objects":[{"StartTime":253581.0,"Position":225.0,"HyperDash":false},{"StartTime":253641.0,"Position":189.989166,"HyperDash":false},{"StartTime":253738.0,"Position":150.638168,"HyperDash":false}]},{"StartTime":253897.0,"Objects":[{"StartTime":253897.0,"Position":318.0,"HyperDash":false}]},{"StartTime":254054.0,"Objects":[{"StartTime":254054.0,"Position":337.0,"HyperDash":false}]},{"StartTime":254212.0,"Objects":[{"StartTime":254212.0,"Position":407.0,"HyperDash":false}]},{"StartTime":254291.0,"Objects":[{"StartTime":254291.0,"Position":407.0,"HyperDash":false}]},{"StartTime":254370.0,"Objects":[{"StartTime":254370.0,"Position":407.0,"HyperDash":false},{"StartTime":254430.0,"Position":396.4197,"HyperDash":false},{"StartTime":254527.0,"Position":415.948242,"HyperDash":false}]},{"StartTime":254686.0,"Objects":[{"StartTime":254686.0,"Position":282.0,"HyperDash":false}]},{"StartTime":254844.0,"Objects":[{"StartTime":254844.0,"Position":314.0,"HyperDash":false},{"StartTime":254904.0,"Position":328.5803,"HyperDash":false},{"StartTime":255001.0,"Position":305.051758,"HyperDash":false}]},{"StartTime":255160.0,"Objects":[{"StartTime":255160.0,"Position":150.0,"HyperDash":false}]},{"StartTime":255318.0,"Objects":[{"StartTime":255318.0,"Position":297.0,"HyperDash":true}]},{"StartTime":255476.0,"Objects":[{"StartTime":255476.0,"Position":74.0,"HyperDash":false}]},{"StartTime":255633.0,"Objects":[{"StartTime":255633.0,"Position":184.0,"HyperDash":false}]},{"StartTime":259423.0,"Objects":[{"StartTime":259423.0,"Position":66.0,"HyperDash":false},{"StartTime":259483.0,"Position":83.09656,"HyperDash":false},{"StartTime":259580.0,"Position":123.771538,"HyperDash":false}]},{"StartTime":259739.0,"Objects":[{"StartTime":259739.0,"Position":227.0,"HyperDash":false},{"StartTime":259799.0,"Position":259.148071,"HyperDash":false},{"StartTime":259896.0,"Position":284.876556,"HyperDash":false}]},{"StartTime":260054.0,"Objects":[{"StartTime":260054.0,"Position":374.0,"HyperDash":false}]},{"StartTime":260212.0,"Objects":[{"StartTime":260212.0,"Position":399.0,"HyperDash":false}]},{"StartTime":260370.0,"Objects":[{"StartTime":260370.0,"Position":455.0,"HyperDash":false}]},{"StartTime":260528.0,"Objects":[{"StartTime":260528.0,"Position":396.0,"HyperDash":false}]},{"StartTime":260686.0,"Objects":[{"StartTime":260686.0,"Position":288.0,"HyperDash":false},{"StartTime":260746.0,"Position":257.008453,"HyperDash":false},{"StartTime":260843.0,"Position":211.3641,"HyperDash":false}]},{"StartTime":261002.0,"Objects":[{"StartTime":261002.0,"Position":83.0,"HyperDash":false}]},{"StartTime":261160.0,"Objects":[{"StartTime":261160.0,"Position":120.0,"HyperDash":false},{"StartTime":261220.0,"Position":138.656952,"HyperDash":false},{"StartTime":261317.0,"Position":149.021484,"HyperDash":false}]},{"StartTime":261476.0,"Objects":[{"StartTime":261476.0,"Position":168.0,"HyperDash":false},{"StartTime":261536.0,"Position":191.8636,"HyperDash":false},{"StartTime":261633.0,"Position":196.8266,"HyperDash":false}]},{"StartTime":261791.0,"Objects":[{"StartTime":261791.0,"Position":300.0,"HyperDash":false},{"StartTime":261860.0,"Position":319.492554,"HyperDash":false},{"StartTime":261930.0,"Position":380.197144,"HyperDash":false},{"StartTime":262000.0,"Position":391.054535,"HyperDash":false},{"StartTime":262106.0,"Position":437.8109,"HyperDash":false}]},{"StartTime":262265.0,"Objects":[{"StartTime":262265.0,"Position":319.0,"HyperDash":false},{"StartTime":262325.0,"Position":323.6614,"HyperDash":false},{"StartTime":262422.0,"Position":301.140259,"HyperDash":false}]},{"StartTime":262581.0,"Objects":[{"StartTime":262581.0,"Position":160.0,"HyperDash":false},{"StartTime":262641.0,"Position":149.948944,"HyperDash":false},{"StartTime":262738.0,"Position":141.732,"HyperDash":false}]},{"StartTime":262897.0,"Objects":[{"StartTime":262897.0,"Position":297.0,"HyperDash":false},{"StartTime":262957.0,"Position":272.6614,"HyperDash":false},{"StartTime":263054.0,"Position":279.140259,"HyperDash":false}]},{"StartTime":263212.0,"Objects":[{"StartTime":263212.0,"Position":430.0,"HyperDash":false},{"StartTime":263272.0,"Position":455.104431,"HyperDash":false},{"StartTime":263369.0,"Position":510.4512,"HyperDash":false}]},{"StartTime":263528.0,"Objects":[{"StartTime":263528.0,"Position":401.0,"HyperDash":false}]},{"StartTime":263686.0,"Objects":[{"StartTime":263686.0,"Position":282.0,"HyperDash":false},{"StartTime":263746.0,"Position":270.895569,"HyperDash":false},{"StartTime":263843.0,"Position":201.548782,"HyperDash":false}]},{"StartTime":264002.0,"Objects":[{"StartTime":264002.0,"Position":124.0,"HyperDash":false},{"StartTime":264062.0,"Position":170.993927,"HyperDash":false},{"StartTime":264159.0,"Position":204.329208,"HyperDash":false}]},{"StartTime":264318.0,"Objects":[{"StartTime":264318.0,"Position":93.0,"HyperDash":false}]},{"StartTime":264476.0,"Objects":[{"StartTime":264476.0,"Position":61.0,"HyperDash":false},{"StartTime":264536.0,"Position":72.74982,"HyperDash":false},{"StartTime":264633.0,"Position":76.9942856,"HyperDash":false}]},{"StartTime":264791.0,"Objects":[{"StartTime":264791.0,"Position":229.0,"HyperDash":false},{"StartTime":264851.0,"Position":210.380234,"HyperDash":false},{"StartTime":264948.0,"Position":212.7894,"HyperDash":false}]},{"StartTime":265107.0,"Objects":[{"StartTime":265107.0,"Position":358.0,"HyperDash":false},{"StartTime":265167.0,"Position":382.749847,"HyperDash":false},{"StartTime":265264.0,"Position":373.9943,"HyperDash":false}]},{"StartTime":265423.0,"Objects":[{"StartTime":265423.0,"Position":470.0,"HyperDash":false}]},{"StartTime":265581.0,"Objects":[{"StartTime":265581.0,"Position":470.0,"HyperDash":false}]},{"StartTime":266054.0,"Objects":[{"StartTime":266054.0,"Position":149.0,"HyperDash":false},{"StartTime":266132.0,"Position":167.136108,"HyperDash":false},{"StartTime":266211.0,"Position":211.849609,"HyperDash":false},{"StartTime":266290.0,"Position":233.369949,"HyperDash":false},{"StartTime":266369.0,"Position":230.355377,"HyperDash":false},{"StartTime":266419.0,"Position":248.772461,"HyperDash":false},{"StartTime":266469.0,"Position":258.240936,"HyperDash":false},{"StartTime":266519.0,"Position":225.7301,"HyperDash":false},{"StartTime":266606.0,"Position":243.291763,"HyperDash":false}]},{"StartTime":266686.0,"Objects":[{"StartTime":266686.0,"Position":253.0,"HyperDash":false},{"StartTime":266764.0,"Position":255.375717,"HyperDash":false},{"StartTime":266843.0,"Position":240.91098,"HyperDash":false},{"StartTime":266922.0,"Position":228.636566,"HyperDash":false},{"StartTime":267001.0,"Position":225.662109,"HyperDash":false},{"StartTime":267051.0,"Position":218.509918,"HyperDash":false},{"StartTime":267101.0,"Position":217.651337,"HyperDash":false},{"StartTime":267151.0,"Position":202.171875,"HyperDash":false},{"StartTime":267238.0,"Position":158.415985,"HyperDash":false}]},{"StartTime":267318.0,"Objects":[{"StartTime":267318.0,"Position":168.0,"HyperDash":false},{"StartTime":267396.0,"Position":192.136108,"HyperDash":false},{"StartTime":267475.0,"Position":198.849609,"HyperDash":false},{"StartTime":267554.0,"Position":251.369949,"HyperDash":false},{"StartTime":267633.0,"Position":249.355377,"HyperDash":false},{"StartTime":267683.0,"Position":270.772461,"HyperDash":false},{"StartTime":267733.0,"Position":256.240936,"HyperDash":false},{"StartTime":267783.0,"Position":261.7301,"HyperDash":false},{"StartTime":267870.0,"Position":262.291779,"HyperDash":false}]},{"StartTime":267949.0,"Objects":[{"StartTime":267949.0,"Position":272.0,"HyperDash":false},{"StartTime":268027.0,"Position":258.375732,"HyperDash":false},{"StartTime":268106.0,"Position":255.91098,"HyperDash":false},{"StartTime":268185.0,"Position":277.636566,"HyperDash":false},{"StartTime":268264.0,"Position":244.662109,"HyperDash":false},{"StartTime":268314.0,"Position":220.509918,"HyperDash":false},{"StartTime":268364.0,"Position":225.651337,"HyperDash":false},{"StartTime":268414.0,"Position":209.171875,"HyperDash":false},{"StartTime":268501.0,"Position":177.415985,"HyperDash":false}]},{"StartTime":268581.0,"Objects":[{"StartTime":268581.0,"Position":187.0,"HyperDash":false},{"StartTime":268659.0,"Position":202.237671,"HyperDash":false},{"StartTime":268738.0,"Position":233.0073,"HyperDash":false},{"StartTime":268817.0,"Position":262.5497,"HyperDash":false},{"StartTime":268896.0,"Position":268.5099,"HyperDash":false},{"StartTime":268946.0,"Position":291.870758,"HyperDash":false},{"StartTime":268996.0,"Position":273.257019,"HyperDash":false},{"StartTime":269046.0,"Position":299.637756,"HyperDash":false},{"StartTime":269133.0,"Position":280.97876,"HyperDash":false}]},{"StartTime":269212.0,"Objects":[{"StartTime":269212.0,"Position":294.0,"HyperDash":false},{"StartTime":269312.0,"Position":315.9435,"HyperDash":false},{"StartTime":269448.0,"Position":321.1469,"HyperDash":false}]},{"StartTime":269528.0,"Objects":[{"StartTime":269528.0,"Position":340.0,"HyperDash":false},{"StartTime":269588.0,"Position":365.320465,"HyperDash":false},{"StartTime":269685.0,"Position":377.5064,"HyperDash":false}]},{"StartTime":269844.0,"Objects":[{"StartTime":269844.0,"Position":447.0,"HyperDash":false}]},{"StartTime":270002.0,"Objects":[{"StartTime":270002.0,"Position":465.0,"HyperDash":false}]},{"StartTime":270160.0,"Objects":[{"StartTime":270160.0,"Position":450.0,"HyperDash":false}]},{"StartTime":270318.0,"Objects":[{"StartTime":270318.0,"Position":468.0,"HyperDash":false}]},{"StartTime":270476.0,"Objects":[{"StartTime":270476.0,"Position":344.0,"HyperDash":false},{"StartTime":270536.0,"Position":326.693817,"HyperDash":false},{"StartTime":270633.0,"Position":270.128,"HyperDash":false}]},{"StartTime":270791.0,"Objects":[{"StartTime":270791.0,"Position":146.0,"HyperDash":false},{"StartTime":270851.0,"Position":119.05838,"HyperDash":false},{"StartTime":270948.0,"Position":124.892738,"HyperDash":false}]},{"StartTime":271107.0,"Objects":[{"StartTime":271107.0,"Position":264.0,"HyperDash":false}]},{"StartTime":271265.0,"Objects":[{"StartTime":271265.0,"Position":218.0,"HyperDash":false},{"StartTime":271325.0,"Position":192.312866,"HyperDash":false},{"StartTime":271422.0,"Position":147.21402,"HyperDash":false}]},{"StartTime":271581.0,"Objects":[{"StartTime":271581.0,"Position":245.0,"HyperDash":false},{"StartTime":271641.0,"Position":271.938019,"HyperDash":false},{"StartTime":271738.0,"Position":315.481079,"HyperDash":false}]},{"StartTime":271897.0,"Objects":[{"StartTime":271897.0,"Position":349.0,"HyperDash":false},{"StartTime":271957.0,"Position":327.700134,"HyperDash":false},{"StartTime":272054.0,"Position":336.267517,"HyperDash":false}]},{"StartTime":272212.0,"Objects":[{"StartTime":272212.0,"Position":446.0,"HyperDash":false},{"StartTime":272272.0,"Position":462.1508,"HyperDash":false},{"StartTime":272369.0,"Position":432.882324,"HyperDash":false}]},{"StartTime":272528.0,"Objects":[{"StartTime":272528.0,"Position":324.0,"HyperDash":false}]},{"StartTime":272686.0,"Objects":[{"StartTime":272686.0,"Position":415.0,"HyperDash":false},{"StartTime":272746.0,"Position":460.961884,"HyperDash":false},{"StartTime":272843.0,"Position":493.6076,"HyperDash":false}]},{"StartTime":273002.0,"Objects":[{"StartTime":273002.0,"Position":349.0,"HyperDash":false},{"StartTime":273062.0,"Position":319.039642,"HyperDash":false},{"StartTime":273159.0,"Position":270.206818,"HyperDash":false}]},{"StartTime":273318.0,"Objects":[{"StartTime":273318.0,"Position":148.0,"HyperDash":false},{"StartTime":273378.0,"Position":142.55928,"HyperDash":false},{"StartTime":273475.0,"Position":125.789063,"HyperDash":false}]},{"StartTime":273633.0,"Objects":[{"StartTime":273633.0,"Position":199.0,"HyperDash":false}]},{"StartTime":273791.0,"Objects":[{"StartTime":273791.0,"Position":247.0,"HyperDash":false},{"StartTime":273851.0,"Position":242.4407,"HyperDash":false},{"StartTime":273948.0,"Position":269.210938,"HyperDash":false}]},{"StartTime":274107.0,"Objects":[{"StartTime":274107.0,"Position":242.0,"HyperDash":false}]},{"StartTime":274265.0,"Objects":[{"StartTime":274265.0,"Position":143.0,"HyperDash":false},{"StartTime":274325.0,"Position":126.55928,"HyperDash":false},{"StartTime":274422.0,"Position":120.789063,"HyperDash":false}]},{"StartTime":274581.0,"Objects":[{"StartTime":274581.0,"Position":272.0,"HyperDash":false},{"StartTime":274641.0,"Position":314.038574,"HyperDash":false},{"StartTime":274738.0,"Position":355.8343,"HyperDash":false}]},{"StartTime":274897.0,"Objects":[{"StartTime":274897.0,"Position":488.0,"HyperDash":false},{"StartTime":274957.0,"Position":461.961426,"HyperDash":false},{"StartTime":275054.0,"Position":404.1657,"HyperDash":false}]},{"StartTime":275212.0,"Objects":[{"StartTime":275212.0,"Position":285.0,"HyperDash":false}]},{"StartTime":275370.0,"Objects":[{"StartTime":275370.0,"Position":315.0,"HyperDash":false}]},{"StartTime":275528.0,"Objects":[{"StartTime":275528.0,"Position":283.0,"HyperDash":false}]},{"StartTime":275686.0,"Objects":[{"StartTime":275686.0,"Position":313.0,"HyperDash":false}]},{"StartTime":275844.0,"Objects":[{"StartTime":275844.0,"Position":254.0,"HyperDash":false}]},{"StartTime":278370.0,"Objects":[{"StartTime":278370.0,"Position":71.0,"HyperDash":false},{"StartTime":278470.0,"Position":130.124451,"HyperDash":false},{"StartTime":278606.0,"Position":152.874481,"HyperDash":false}]},{"StartTime":278686.0,"Objects":[{"StartTime":278686.0,"Position":256.0,"HyperDash":false},{"StartTime":278786.0,"Position":279.959045,"HyperDash":false},{"StartTime":278922.0,"Position":336.141327,"HyperDash":false}]},{"StartTime":279002.0,"Objects":[{"StartTime":279002.0,"Position":351.0,"HyperDash":false},{"StartTime":279102.0,"Position":306.33313,"HyperDash":false},{"StartTime":279238.0,"Position":260.928619,"HyperDash":false}]},{"StartTime":279318.0,"Objects":[{"StartTime":279318.0,"Position":149.0,"HyperDash":false},{"StartTime":279418.0,"Position":144.369186,"HyperDash":false},{"StartTime":279554.0,"Position":58.3702,"HyperDash":true}]},{"StartTime":279633.0,"Objects":[{"StartTime":279633.0,"Position":205.0,"HyperDash":false}]},{"StartTime":280265.0,"Objects":[{"StartTime":280265.0,"Position":480.0,"HyperDash":false},{"StartTime":280343.0,"Position":474.7398,"HyperDash":false},{"StartTime":280422.0,"Position":458.350433,"HyperDash":false},{"StartTime":280501.0,"Position":451.037842,"HyperDash":false},{"StartTime":280580.0,"Position":422.829529,"HyperDash":false},{"StartTime":280659.0,"Position":414.7673,"HyperDash":false},{"StartTime":280738.0,"Position":394.904449,"HyperDash":false},{"StartTime":280817.0,"Position":370.3106,"HyperDash":false},{"StartTime":280896.0,"Position":368.073456,"HyperDash":false},{"StartTime":280975.0,"Position":348.296478,"HyperDash":false},{"StartTime":281054.0,"Position":338.1456,"HyperDash":false},{"StartTime":281133.0,"Position":314.726532,"HyperDash":false},{"StartTime":281212.0,"Position":321.195465,"HyperDash":false},{"StartTime":281291.0,"Position":328.64563,"HyperDash":false},{"StartTime":281370.0,"Position":292.093872,"HyperDash":false},{"StartTime":281449.0,"Position":310.49472,"HyperDash":false},{"StartTime":281528.0,"Position":288.733521,"HyperDash":false},{"StartTime":281606.0,"Position":290.7206,"HyperDash":false},{"StartTime":281685.0,"Position":288.1208,"HyperDash":false},{"StartTime":281764.0,"Position":272.7766,"HyperDash":false},{"StartTime":281843.0,"Position":266.504364,"HyperDash":false},{"StartTime":281922.0,"Position":241.107452,"HyperDash":false},{"StartTime":282001.0,"Position":268.358948,"HyperDash":false},{"StartTime":282080.0,"Position":230.079391,"HyperDash":false},{"StartTime":282159.0,"Position":242.0971,"HyperDash":false},{"StartTime":282238.0,"Position":243.277161,"HyperDash":false},{"StartTime":282317.0,"Position":222.536377,"HyperDash":false},{"StartTime":282396.0,"Position":223.8562,"HyperDash":false},{"StartTime":282475.0,"Position":205.2843,"HyperDash":false},{"StartTime":282554.0,"Position":197.88031,"HyperDash":false},{"StartTime":282633.0,"Position":198.803864,"HyperDash":false},{"StartTime":282712.0,"Position":166.135483,"HyperDash":false},{"StartTime":282791.0,"Position":156.019943,"HyperDash":false},{"StartTime":282870.0,"Position":155.553528,"HyperDash":false},{"StartTime":282949.0,"Position":129.81575,"HyperDash":false},{"StartTime":283028.0,"Position":128.8722,"HyperDash":false},{"StartTime":283107.0,"Position":100.768196,"HyperDash":false},{"StartTime":283176.0,"Position":72.3494644,"HyperDash":false},{"StartTime":283246.0,"Position":88.6788,"HyperDash":false},{"StartTime":283316.0,"Position":61.952446,"HyperDash":false},{"StartTime":283422.0,"Position":43.60075,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2190499.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2190499.osu
new file mode 100644
index 0000000000..c0df81b7e4
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2190499.osu
@@ -0,0 +1,977 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:4.7
+CircleSize:3.7
+OverallDifficulty:8.4
+ApproachRate:9
+SliderMultiplier:1.57
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+//Break Periods
+2,78991,87033
+2,129518,133770
+2,224254,233560
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+476,315.789473684211,4,2,1,50,1,0
+1739,-212.76595744681,4,2,1,50,0,0
+17054,-212.76595744681,4,2,1,5,0,0
+17133,-212.76595744681,4,2,1,50,0,0
+17370,-212.76595744681,4,2,1,5,0,0
+17449,-212.76595744681,4,2,1,50,0,0
+17686,-212.76595744681,4,2,1,50,0,0
+17765,-212.76595744681,4,2,1,5,0,0
+17844,-212.76595744681,4,2,1,50,0,0
+18160,-103.092783505155,4,2,1,70,0,0
+27239,-212.76595744681,4,2,1,70,0,0
+27318,-103.092783505155,4,2,1,70,0,0
+27554,-212.76595744681,4,2,1,70,0,0
+27633,-103.092783505155,4,2,1,70,0,0
+28265,-114.942528735633,4,2,1,60,0,0
+38370,-129.87012987013,4,2,1,50,0,0
+47765,-129.87012987013,4,2,1,5,0,0
+47844,-129.87012987013,4,2,1,50,0,0
+48081,-129.87012987013,4,2,1,5,0,0
+48160,-129.87012987013,4,2,1,50,0,0
+48476,-103.092783505155,4,2,1,70,0,0
+68686,-114.942528735633,4,2,1,60,0,0
+78791,-129.87012987013,4,2,1,50,0,0
+79344,-129.87012987013,4,2,1,5,0,0
+79423,-129.87012987013,4,2,1,50,0,0
+81870,-129.87012987013,4,2,1,5,0,0
+81949,-129.87012987013,4,2,1,50,0,0
+82502,-129.87012987013,4,2,1,5,0,0
+82581,-129.87012987013,4,2,1,50,0,0
+87633,-114.942528735633,4,2,1,60,0,0
+87870,-114.942528735633,4,2,1,5,0,0
+87949,-114.942528735633,4,2,1,60,0,0
+88186,-114.942528735633,4,2,1,5,0,0
+88265,-114.942528735633,4,2,1,60,0,0
+88502,-114.942528735633,4,2,1,5,0,0
+88581,-114.942528735633,4,2,1,60,0,0
+88897,-93.4579439252336,4,2,1,75,0,0
+109107,-129.87012987013,4,2,1,70,0,0
+111239,-129.87012987013,4,2,1,5,0,0
+111318,-129.87012987013,4,2,1,70,0,0
+113765,-129.87012987013,4,2,1,5,0,0
+113844,-129.87012987013,4,2,1,70,0,0
+114160,-93.4579439252336,4,2,1,75,0,0
+119054,-103.092783505155,4,2,1,75,0,0
+119212,-103.092783505155,4,2,1,70,0,0
+119449,-103.092783505155,4,2,1,5,0,0
+119528,-103.092783505155,4,2,1,70,0,0
+120081,-103.092783505155,4,2,1,5,0,0
+120160,-103.092783505155,4,2,1,70,0,0
+120712,-103.092783505155,4,2,1,5,0,0
+120791,-103.092783505155,4,2,1,70,0,0
+121344,-103.092783505155,4,2,1,5,0,0
+121423,-103.092783505155,4,2,1,70,0,0
+121976,-103.092783505155,4,2,1,5,0,0
+122054,-103.092783505155,4,2,1,70,0,0
+122607,-103.092783505155,4,2,1,5,0,0
+122686,-103.092783505155,4,2,1,70,0,0
+122923,-103.092783505155,4,2,1,5,0,0
+123002,-103.092783505155,4,2,1,70,0,0
+124265,-93.4579439252336,4,2,1,75,0,0
+129318,-129.87012987013,4,2,1,50,0,0
+133502,-129.87012987013,4,2,1,5,0,0
+133581,-129.87012987013,4,2,1,50,0,0
+134370,-114.942528735633,4,2,1,70,0,0
+137133,-114.942528735633,4,2,1,5,0,0
+137212,-114.942528735633,4,2,1,70,0,0
+137449,-114.942528735633,4,2,1,5,0,0
+137528,-114.942528735633,4,2,1,70,0,0
+137765,-114.942528735633,4,2,1,5,0,0
+137844,-114.942528735633,4,2,1,70,0,0
+142502,-114.942528735633,4,2,1,5,0,0
+142581,-114.942528735633,4,2,1,70,0,0
+145976,-114.942528735633,4,2,1,5,0,0
+146054,-114.942528735633,4,2,1,70,0,0
+146291,-114.942528735633,4,2,1,5,0,0
+146370,-114.942528735633,4,2,1,70,0,0
+146607,-114.942528735633,4,2,1,5,0,0
+146686,-114.942528735633,4,2,1,70,0,0
+151344,-114.942528735633,4,2,1,5,0,0
+151423,-114.942528735633,4,2,1,70,0,0
+152054,-103.092783505155,4,2,1,70,0,0
+161133,-103.092783505155,4,2,1,5,0,0
+161212,-103.092783505155,4,2,1,70,0,0
+161449,-103.092783505155,4,2,1,5,0,0
+161528,-103.092783505155,4,2,1,70,0,0
+161765,-103.092783505155,4,2,1,5,0,0
+161844,-103.092783505155,4,2,1,70,0,0
+162160,-93.4579439252336,4,2,1,75,0,0
+182370,-129.87012987013,4,2,1,70,0,0
+184502,-129.87012987013,4,2,1,5,0,0
+184581,-129.87012987013,4,2,1,70,0,0
+187028,-129.87012987013,4,2,1,5,0,0
+187107,-129.87012987013,4,2,1,70,0,0
+187423,-93.4579439252336,4,2,1,75,0,0
+192318,-103.092783505155,4,2,1,75,0,0
+192476,-103.092783505155,4,2,1,70,0,0
+192712,-103.092783505155,4,2,1,5,0,0
+192791,-103.092783505155,4,2,1,70,0,0
+193344,-103.092783505155,4,2,1,5,0,0
+193423,-103.092783505155,4,2,1,70,0,0
+193976,-103.092783505155,4,2,1,5,0,0
+194054,-103.092783505155,4,2,1,70,0,0
+194607,-103.092783505155,4,2,1,5,0,0
+194686,-103.092783505155,4,2,1,70,0,0
+195239,-103.092783505155,4,2,1,5,0,0
+195318,-103.092783505155,4,2,1,70,0,0
+195870,-103.092783505155,4,2,1,5,0,0
+195949,-103.092783505155,4,2,1,70,0,0
+196186,-103.092783505155,4,2,1,5,0,0
+196265,-103.092783505155,4,2,1,70,0,0
+197528,-93.4579439252336,4,2,1,75,0,0
+202581,-129.87012987013,4,2,1,70,0,0
+203844,-103.092783505155,4,2,1,70,0,0
+224054,-129.87012987013,4,2,1,60,0,0
+235423,-93.4579439252336,4,2,1,75,0,0
+255633,-129.87012987013,4,2,1,60,0,0
+260686,-93.4579439252336,4,2,1,75,0,0
+265581,-103.092783505155,4,2,1,75,0,0
+265739,-103.092783505155,4,2,1,70,0,0
+265976,-103.092783505155,4,2,1,5,0,0
+266054,-103.092783505155,4,2,1,70,0,0
+266607,-103.092783505155,4,2,1,5,0,0
+266686,-103.092783505155,4,2,1,70,0,0
+267239,-103.092783505155,4,2,1,5,0,0
+267318,-103.092783505155,4,2,1,70,0,0
+267870,-103.092783505155,4,2,1,5,0,0
+267949,-103.092783505155,4,2,1,70,0,0
+268502,-103.092783505155,4,2,1,5,0,0
+268581,-103.092783505155,4,2,1,70,0,0
+269133,-103.092783505155,4,2,1,5,0,0
+269212,-103.092783505155,4,2,1,70,0,0
+269449,-103.092783505155,4,2,1,5,0,0
+269528,-103.092783505155,4,2,1,70,0,0
+270791,-93.4579439252336,4,2,1,75,0,0
+275844,-129.87012987013,4,2,1,60,0,0
+278370,-93.4579439252336,4,2,1,75,0,0
+278607,-93.4579439252336,4,2,1,5,0,0
+278686,-93.4579439252336,4,2,1,75,0,0
+278923,-93.4579439252336,4,2,1,5,0,0
+279002,-78.7401574803149,4,2,1,75,0,0
+279239,-78.7401574803149,4,2,1,5,0,0
+279318,-78.7401574803149,4,2,1,75,0,0
+279554,-78.7401574803149,4,2,1,5,0,0
+279633,-129.87012987013,4,2,1,70,0,0
+280265,-270.270270270271,4,2,1,70,0,0
+283423,-270.270270270271,4,2,1,10,0,0
+
+[HitObjects]
+367,158,1739,6,0,B|277:179|338:219|236:236,1,147.579997748108,2|2,0:0|0:0,0:0:0:0:
+161,20,3002,6,0,P|188:41|234:156,1,147.579997748108,2|2,0:0|0:0,0:0:0:0:
+47,263,4265,6,0,P|91:234|115:230,1,73.789998874054,2|2,0:0|0:0,0:0:0:0:
+235,344,4897,2,0,P|299:349|342:311,1,110.684998311081,2|2,0:0|0:0,0:0:0:0:
+372,233,5528,2,0,P|351:171|339:79,1,147.579997748108,2|0,0:0|0:0,0:0:0:0:
+55,109,6791,6,0,P|89:141|126:149,1,73.789998874054,2|2,0:0|0:0,0:0:0:0:
+240,23,7423,2,0,P|203:58|189:121,1,110.684998311081,2|2,0:0|0:0,0:0:0:0:
+273,203,8054,2,0,P|300:186|348:175,2,73.789998874054,2|2|2,0:0|0:0|0:0,0:0:0:0:
+147,324,9002,2,0,P|124:323|97:314,1,36.894999437027,2|2,0:0|0:0,0:0:0:0:
+59,247,9318,6,0,P|51:213|39:175,2,73.789998874054,2|2|2,0:0|0:0|0:0,0:0:0:0:
+133,53,10265,1,2,0:0:0:0:
+256,192,10581,12,0,11844,0:0:0:0:
+256,192,13107,12,0,14370,0:0:0:0:
+74,66,15633,6,0,B|151:62|120:116|198:112,1,138.356247888851,2|2,0:0|0:0,0:0:0:0:
+189,105,17844,5,4,0:0:0:0:
+189,105,18160,6,0,P|222:130|274:136,1,76.1450018009148,6|2,1:2|0:0,0:0:0:0:
+402,27,18476,2,0,P|365:36|335:59,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+383,259,18791,2,0,P|400:173|404:106,1,152.29000360183,2|10,1:2|0:2,0:0:0:0:
+254,55,19265,1,0,0:0:0:0:
+178,227,19423,6,0,P|140:242|92:242,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+245,84,19739,2,0,P|282:86|317:100,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+287,315,20054,2,0,P|270:229|266:162,1,152.29000360183,2|8,1:2|0:2,0:0:0:0:
+167,252,20528,1,0,0:0:0:0:
+110,91,20686,6,0,P|77:65|24:58,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+158,225,21002,2,0,P|194:214|223:190,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+105,73,21318,2,0,P|72:47|19:40,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+153,207,21634,2,0,P|189:196|218:172,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+321,19,21949,5,6,1:2:0:0:
+372,198,22107,1,2,0:0:0:0:
+345,14,22265,2,0,P|334:50|326:104,1,76.1450018009148,10|2,0:2|0:0,0:0:0:0:
+413,295,22581,1,6,1:2:0:0:
+442,141,22739,1,10,0:2:0:0:
+409,316,22897,2,0,P|370:337|316:337,1,76.1450018009148,10|2,0:2|0:0,0:0:0:0:
+205,239,23212,6,0,P|219:282|226:330,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+73,189,23528,2,0,P|59:232|52:280,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+240,312,23844,2,0,P|233:275|221:239,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+88,189,24160,2,0,P|76:225|69:262,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+206,54,24476,6,0,L|301:45,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+425,174,24791,2,0,L|330:165,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+196,41,25107,2,0,L|291:32,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+415,161,25423,1,10,0:2:0:0:
+363,43,25581,1,0,0:0:0:0:
+263,180,25739,6,0,P|272:216|279:261,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+418,374,26054,2,0,P|424:336|433:299,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+251,184,26370,2,0,P|260:220|267:265,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+406,378,26686,2,0,P|412:340|421:303,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+326,119,27002,6,0,P|266:96|196:111,1,114.217502701372,14|0,0:2|0:0,0:0:0:0:
+215,85,27318,2,0,P|271:80|323:102,1,114.217502701372,8|0,0:2|0:0,0:0:0:0:
+324,89,27633,2,0,P|250:68|174:92,1,152.29000360183,12|4,0:2|0:2,0:0:0:0:
+65,343,28265,6,0,B|57:248|105:312|97:183,1,136.590001146309,6|8,1:2|0:2,0:0:0:0:
+153,332,28739,1,2,1:2:0:0:
+153,332,28897,1,2,0:0:0:0:
+215,226,29054,2,0,P|247:210|288:209,1,68.2950005731545,2|8,1:2|0:2,0:0:0:0:
+332,322,29370,2,0,P|298:319|267:303,1,68.2950005731545,2|0,0:0|1:2,0:0:0:0:
+371,217,29686,1,2,0:0:0:0:
+371,217,29844,1,10,0:2:0:0:
+444,302,30002,1,2,1:2:0:0:
+444,302,30160,2,0,P|460:262|462:211,1,68.2950005731545,2|0,0:0|1:2,0:0:0:0:
+393,130,30476,2,0,P|377:90|375:39,1,68.2950005731545,10|0,0:2|0:0,0:0:0:0:
+265,134,30791,6,0,L|169:122,1,68.2950005731545,2|0,1:2|0:0,0:0:0:0:
+80,53,31107,2,0,L|147:44,1,68.2950005731545,10|0,0:2|1:2,0:0:0:0:
+124,189,31423,2,0,L|57:181,1,68.2950005731545,2|0,0:0|1:2,0:0:0:0:
+164,296,31739,1,10,0:2:0:0:
+164,296,31897,2,0,L|231:287,1,68.2950005731545,2|0,0:0|1:2,0:0:0:0:
+365,211,32212,1,2,0:0:0:0:
+365,211,32370,2,0,P|379:246|384:289,1,68.2950005731545,10|0,0:2|1:2,0:0:0:0:
+488,162,32686,2,0,P|472:228|468:310,1,136.590001146309,2|8,0:0|0:2,0:0:0:0:
+406,132,33160,1,0,1:2:0:0:
+277,224,33318,6,0,B|197:212|245:168|149:160,1,136.590001146309,6|8,1:2|0:2,0:0:0:0:
+283,146,33791,1,2,1:2:0:0:
+283,146,33949,1,2,0:0:0:0:
+158,238,34107,2,0,P|123:253|68:253,1,68.2950005731545,2|8,1:2|0:2,0:0:0:0:
+19,126,34423,2,0,P|52:130|83:144,1,68.2950005731545,2|0,1:2|1:2,0:0:0:0:
+158,238,34739,1,2,0:0:0:0:
+158,238,34897,1,10,0:2:0:0:
+204,124,35054,1,2,1:2:0:0:
+204,124,35212,2,0,P|213:84|217:31,1,68.2950005731545,2|2,0:0|1:2,0:0:0:0:
+345,175,35528,2,0,P|336:141|332:108,1,68.2950005731545,10|0,0:2|1:2,0:0:0:0:
+461,237,35844,6,0,P|424:218|324:207,2,136.590001146309,2|10|2,1:2|0:2|1:2,0:0:0:0:
+248,360,36791,1,10,0:2:0:0:
+248,360,36949,2,0,P|259:318|261:281,1,68.2950005731545,2|8,0:0|0:2,0:0:0:0:
+189,145,37265,5,2,1:2:0:0:
+130,295,37423,2,0,P|96:312|48:311,1,68.2950005731545,10|0,0:2|1:2,0:0:0:0:
+32,119,37739,5,10,0:2:0:0:
+79,229,37897,1,0,1:2:0:0:
+126,47,38054,5,12,0:2:0:0:
+67,202,38212,1,0,1:2:0:0:
+189,145,38370,6,0,P|236:139|304:205,1,120.889997601975,4|2,1:2|0:0,0:0:0:0:
+281,297,38844,2,0,P|256:311|215:316,2,60.4449988009873,2|2|2,0:0|0:0|0:0,0:0:0:0:
+367,240,39318,2,0,P|396:245|423:259,1,60.4449988009873,2|2,0:0|0:0,0:0:0:0:
+493,325,39633,1,2,0:0:0:0:
+493,325,39791,2,0,L|500:262,1,60.4449988009873,2|2,1:2|0:0,0:0:0:0:
+450,183,40107,2,0,L|443:120,1,60.4449988009873,2|2,0:0|0:0,0:0:0:0:
+379,41,40423,1,2,1:2:0:0:
+379,41,40581,1,2,0:0:0:0:
+312,120,40739,6,0,B|229:114|279:80|188:72,1,120.889997601975,2|2,0:0|0:0,0:0:0:0:
+120,125,41212,2,0,P|107:98|107:68,2,60.4449988009873,2|2|2,0:0|0:0|0:0,0:0:0:0:
+195,158,41686,2,0,P|195:187|182:215,1,60.4449988009873,2|2,0:0|0:0,0:0:0:0:
+81,267,42002,1,2,0:0:0:0:
+81,267,42160,1,2,0:0:0:0:
+157,335,42318,1,2,1:2:0:0:
+157,335,42476,2,0,L|233:329,1,60.4449988009873,2|0,0:0|0:0,0:0:0:0:
+314,250,42791,2,0,L|374:254,1,60.4449988009873,2|2,1:2|0:0,0:0:0:0:
+224,343,43107,6,0,L|92:351,1,120.889997601975,2|0,0:0|0:0,0:0:0:0:
+18,308,43581,2,0,L|26:248,2,60.4449988009873,2|2|2,1:2|0:0|0:0,0:0:0:0:
+118,245,44054,2,0,L|109:185,1,60.4449988009873,2|2,0:0|0:0,0:0:0:0:
+32,119,44370,1,2,0:0:0:0:
+32,119,44528,2,0,L|39:56,1,60.4449988009873,2|2,0:0|0:0,0:0:0:0:
+131,30,44844,1,2,1:2:0:0:
+131,30,45002,2,0,L|124:90,1,60.4449988009873,2|2,0:0|0:0,0:0:0:0:
+215,147,45318,1,2,0:0:0:0:
+215,147,45476,2,0,L|289:140,1,60.4449988009873,2|2,1:2|0:0,0:0:0:0:
+362,98,45791,5,2,0:0:0:0:
+362,98,45949,1,2,1:2:0:0:
+350,203,46107,2,0,L|356:278,1,60.4449988009873,2|0,0:0|0:0,0:0:0:0:
+421,352,46423,1,2,0:0:0:0:
+421,352,46581,1,2,1:2:0:0:
+343,276,46739,2,0,L|268:282,1,60.4449988009873,2|0,0:0|0:0,0:0:0:0:
+212,353,47054,5,2,0:0:0:0:
+176,245,47212,1,2,1:2:0:0:
+104,346,47370,1,2,0:0:0:0:
+104,346,47449,1,2,0:0:0:0:
+104,346,47528,2,0,P|96:290|81:231,1,90.6674982014809,2|0,1:2|0:0,0:0:0:0:
+73,246,47844,2,0,P|81:190|96:131,1,90.6674982014809,2|0,1:2|0:0,0:0:0:0:
+108,144,48160,1,4,0:2:0:0:
+108,144,48476,6,0,P|146:167|197:167,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+259,24,48791,2,0,P|221:29|190:50,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+329,179,49107,2,0,B|429:161|369:117|469:97,1,152.29000360183,2|8,0:0|0:2,0:0:0:0:
+328,96,49581,1,0,0:0:0:0:
+472,190,49739,6,0,P|462:222|454:274,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+324,372,50054,2,0,P|317:334|306:298,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+190,174,50370,2,0,P|128:184|85:268,1,152.29000360183,2|8,0:0|0:2,0:0:0:0:
+206,294,50844,1,0,0:0:0:0:
+313,170,51002,6,0,P|323:125|328:78,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+223,271,51318,2,0,P|212:226|208:179,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+268,40,51633,2,0,P|302:19|358:19,1,76.1450018009148,2|0,0:0|1:2,0:0:0:0:
+382,195,51949,2,0,P|344:189|312:169,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+191,14,52265,6,0,B|176:109|235:65|217:167,1,152.29000360183,6|10,1:2|0:2,0:0:0:0:
+145,291,52739,1,0,1:2:0:0:
+75,165,52897,2,0,P|106:144|152:135,1,76.1450018009148,2|0,0:0|1:2,0:0:0:0:
+223,271,53212,2,0,P|254:292|291:300,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+423,166,53528,5,2,1:2:0:0:
+383,316,53686,2,0,P|364:275|364:218,1,76.1450018009148,2|8,0:0|0:2,0:0:0:0:
+445,94,54002,2,0,P|439:131|422:165,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+346,37,54318,1,2,1:2:0:0:
+268,179,54476,2,0,P|230:173|196:156,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+79,28,54791,6,0,P|101:82|110:184,1,152.29000360183,2|10,1:2|0:2,0:0:0:0:
+38,334,55265,2,0,P|44:293|61:244,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+189,362,55581,1,0,1:2:0:0:
+125,198,55739,2,0,P|135:234|141:272,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+279,380,56054,6,0,P|329:379|372:344,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+470,222,56370,2,0,P|432:219|397:234,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+438,384,56686,2,0,P|444:338|446:293,1,76.1450018009148,2|0,0:0|1:2,0:0:0:0:
+287,222,57002,2,0,P|289:259|294:297,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+334,124,57318,6,0,P|311:115|285:110,3,38.0725009004574,6|2|2|2,1:2|0:0|0:0|0:0,0:0:0:0:
+230,148,57633,2,0,P|201:173|146:180,1,76.1450018009148,6|2,1:2|0:0,0:0:0:0:
+42,81,57949,2,0,P|56:112|68:176,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+188,17,58265,2,0,P|174:48|162:112,1,76.1450018009148,14|0,0:2|0:0,0:0:0:0:
+230,245,58581,6,0,P|265:266|320:270,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+146,162,58897,2,0,P|108:169|76:189,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+293,188,59212,2,0,P|315:102|318:24,1,152.29000360183,2|8,0:2|0:2,0:0:0:0:
+224,147,59686,1,0,0:0:0:0:
+405,82,59844,6,0,P|407:124|415:170,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+500,268,60160,2,0,P|467:249|410:247,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+303,384,60476,2,0,B|401:376|349:337|442:328,1,152.29000360183,2|8,0:0|0:2,0:0:0:0:
+311,298,60949,1,0,0:0:0:0:
+143,368,61107,6,0,P|155:325|155:273,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+63,156,61423,2,0,P|65:193|76:230,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+160,367,61739,2,0,P|172:324|172:272,1,76.1450018009148,2|0,0:0|1:2,0:0:0:0:
+80,155,62055,2,0,P|82:192|93:229,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+184,86,62370,6,0,B|260:109|205:146|318:171,1,152.29000360183,2|10,1:2|0:2,0:0:0:0:
+406,65,62844,1,0,1:2:0:0:
+473,202,63002,2,0,P|462:240|454:292,1,76.1450018009148,2|0,0:0|1:2,0:0:0:0:
+331,146,63318,2,0,P|341:184|349:236,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+234,347,63633,1,2,1:2:0:0:
+160,216,63791,6,0,P|202:198|234:200,1,76.1450018009148,2|8,0:0|0:2,0:0:0:0:
+147,367,64107,2,0,P|109:366|75:350,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+35,213,64423,1,2,1:2:0:0:
+148,349,64581,2,0,P|110:348|76:332,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+18,190,64897,5,2,1:2:0:0:
+133,269,65054,2,0,P|143:231|150:180,1,76.1450018009148,2|8,0:0|0:2,0:0:0:0:
+224,55,65370,2,0,P|231:127|249:214,1,152.29000360183,2|0,1:2|1:2,0:0:0:0:
+367,345,65844,2,0,P|405:365|463:364,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+456,181,66160,6,0,P|439:219|428:272,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+310,127,66476,2,0,P|327:165|338:218,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+452,31,66791,2,0,P|435:69|424:122,1,76.1450018009148,2|0,0:0|1:2,0:0:0:0:
+250,41,67107,2,0,P|267:79|278:132,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+143,235,67423,6,0,L|54:241,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+8,75,67739,2,0,L|97:81,1,76.1450018009148,4|0,1:2|0:0,0:0:0:0:
+153,254,68054,2,0,L|-30:266,1,152.29000360183,4|8,1:2|0:2,0:0:0:0:
+162,272,68686,6,0,P|153:306|149:343,2,68.2950005731545,6|2|10,1:2|0:0|0:2,0:0:0:0:
+264,197,69160,1,2,1:2:0:0:
+264,197,69318,2,0,B|339:217|287:248|378:266,1,136.590001146309,2|10,1:2|0:2,0:0:0:0:
+477,162,69791,2,0,P|462:186|451:227,1,68.2950005731545,2|0,0:0|1:2,0:0:0:0:
+352,127,70107,1,2,1:2:0:0:
+352,127,70265,2,0,P|369:156|377:189,1,68.2950005731545,10|0,0:2|1:2,0:0:0:0:
+252,75,70581,2,0,B|176:96|234:131|127:146,1,136.590001146309,2|8,1:2|0:2,0:0:0:0:
+139,143,71212,6,0,P|125:177|114:231,1,68.2950005731545,2|0,1:2|0:0,0:0:0:0:
+197,312,71528,1,10,0:2:0:0:
+197,312,71686,1,2,1:2:0:0:
+246,212,71844,2,0,P|281:197|322:197,1,68.2950005731545,2|2,1:2|0:0,0:0:0:0:
+382,297,72160,1,10,0:2:0:0:
+382,297,72318,2,0,P|395:222|417:157,1,136.590001146309,2|0,0:0|1:2,0:0:0:0:
+483,40,72791,2,0,P|454:60|408:66,1,68.2950005731545,10|0,0:2|1:2,0:0:0:0:
+316,8,73107,1,2,1:2:0:0:
+316,8,73265,1,8,0:2:0:0:
+213,106,73423,2,0,P|240:125|273:132,1,68.2950005731545,8|0,0:2|0:0,0:0:0:0:
+151,36,73739,6,0,P|176:103|187:195,1,136.590001146309,2|10,1:2|0:2,0:0:0:0:
+71,297,74212,1,2,1:2:0:0:
+71,297,74370,2,0,P|96:230|107:138,1,136.590001146309,2|8,1:2|0:2,0:0:0:0:
+217,308,74844,2,0,P|205:264|205:212,1,68.2950005731545,2|0,0:0|1:2,0:0:0:0:
+292,129,75160,2,0,P|321:113|364:113,1,68.2950005731545,2|8,1:2|0:2,0:0:0:0:
+470,226,75476,1,2,1:2:0:0:
+470,226,75633,2,0,P|407:200|322:187,1,136.590001146309,2|10,1:2|0:2,0:0:0:0:
+339,187,76265,6,0,P|351:221|357:255,1,68.2950005731545,2|2,1:2|0:0,0:0:0:0:
+274,344,76581,1,10,0:2:0:0:
+274,344,76739,1,2,1:2:0:0:
+196,237,76897,2,0,P|183:277|174:332,1,68.2950005731545,2|0,1:2|0:0,0:0:0:0:
+76,200,77212,2,0,P|89:240|98:295,1,68.2950005731545,10|0,0:2|0:0,0:0:0:0:
+193,110,77528,6,0,P|225:91|266:91,1,68.2950005731545,2|2,1:2|0:0,0:0:0:0:
+363,209,77844,2,0,P|329:205|300:187,1,68.2950005731545,2|2,1:2|0:0,0:0:0:0:
+424,69,78160,2,0,P|392:129|373:223,1,136.590001146309,2|10,1:2|0:2,0:0:0:0:
+375,195,78791,5,6,0:0:0:0:
+59,101,87633,6,0,P|100:79|160:79,1,102.442500859732,2|0,1:2|0:0,0:0:0:0:
+157,92,87949,2,0,P|106:92|61:115,1,102.442500859732,2|0,1:2|0:0,0:0:0:0:
+65,127,88265,2,0,P|110:103|160:103,1,102.442500859732,2|0,1:2|0:0,0:0:0:0:
+162,116,88581,1,6,0:2:0:0:
+410,340,88897,6,0,P|428:292|428:236,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+329,109,89212,1,10,0:2:0:0:
+237,283,89370,2,0,P|219:235|219:179,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+412,90,89686,2,0,P|407:131|391:170,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+224,11,90002,6,0,P|132:31|99:124,1,167.989994873352,2|2,0:2|0:2,0:0:0:0:
+198,242,90476,1,8,0:2:0:0:
+197,90,90633,1,2,0:2:0:0:
+85,257,90791,2,0,P|94:304|99:355,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+308,229,91107,2,0,P|311:187|320:146,1,83.9949974366761,14|0,0:2|0:0,0:0:0:0:
+210,341,91423,6,0,P|251:326|325:317,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+196,202,91739,1,10,0:2:0:0:
+305,335,91897,2,0,P|346:350|420:359,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+212,222,92212,2,0,P|253:207|327:198,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+446,275,92528,6,0,P|480:177|483:88,1,167.989994873352,2|2,0:2|0:2,0:0:0:0:
+286,70,93002,1,8,0:2:0:0:
+368,232,93160,1,2,0:2:0:0:
+268,50,93318,2,0,P|230:33|158:30,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+349,208,93633,2,0,P|310:225|269:230,1,83.9949974366761,14|0,0:2|0:0,0:0:0:0:
+138,89,93949,6,0,P|116:133|104:208,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+148,304,94265,1,10,0:2:0:0:
+22,167,94423,2,0,P|44:211|56:286,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+243,347,94739,2,0,P|254:306|273:269,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+438,109,95054,6,0,B|340:127|418:167|266:192,1,167.989994873352,6|0,0:2|0:0,0:0:0:0:
+254,24,95528,2,0,P|277:62|282:122,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+427,285,95844,2,0,P|428:243|443:204,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+279,25,96160,2,0,P|302:63|307:123,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+225,237,96476,6,0,P|184:225|105:216,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+288,132,96791,1,10,0:2:0:0:
+180,316,96949,2,0,P|139:328|60:337,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+274,159,97265,2,0,P|315:166|355:177,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+417,302,97581,1,2,0:2:0:0:
+420,94,97739,6,0,P|393:134|376:202,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+346,384,98054,1,10,0:2:0:0:
+299,208,98212,1,0,0:0:0:0:
+337,355,98370,1,2,1:2:0:0:
+290,179,98528,1,0,0:0:0:0:
+170,364,98686,2,0,P|124:378|65:374,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+45,139,99002,6,0,P|70:172|96:263,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+164,51,99318,1,10,0:2:0:0:
+146,275,99476,2,0,P|106:294|39:288,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+163,76,99791,2,0,P|204:78|242:96,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+306,272,100107,6,0,P|261:187|261:103,1,167.989994873352,6|2,0:2|0:2,0:0:0:0:
+446,105,100581,1,8,0:2:0:0:
+376,319,100739,2,0,P|345:348|305:358,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+236,147,101054,1,0,0:0:0:0:
+402,242,101212,2,0,P|443:245|481:228,1,83.9949974366761,8|0,0:2|0:0,0:0:0:0:
+334,39,101528,6,0,P|346:82|350:135,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+219,239,101844,1,10,0:2:0:0:
+177,71,102002,2,0,P|137:51|71:45,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+140,267,102318,2,0,P|181:258|218:239,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+22,135,102633,6,0,P|64:254|68:317,1,167.989994873352,6|2,0:2|0:2,0:0:0:0:
+182,139,103107,1,8,0:2:0:0:
+200,320,103265,2,0,P|209:272|222:225,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+337,118,103581,1,0,0:0:0:0:
+331,305,103739,2,0,P|322:257|309:210,1,83.9949974366761,8|0,0:2|0:0,0:0:0:0:
+194,51,104054,6,0,B|300:74|225:123|355:155,1,167.989994873352,6|10,1:2|0:2,0:0:0:0:
+142,226,104528,2,0,P|91:244|21:238,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+187,83,104844,2,0,P|148:67|106:63,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+210,283,105160,6,0,P|229:235|232:181,1,83.9949974366761,6|0,0:2|1:2,0:0:0:0:
+339,35,105476,2,0,P|345:76|362:115,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+309,282,105791,1,2,0:2:0:0:
+454,125,105949,2,0,P|437:163|431:204,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+246,91,106265,2,0,P|262:129|268:170,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+133,354,106581,6,0,L|22:361,1,83.9949974366761,6|2,1:2|0:2,0:0:0:0:
+260,193,106897,2,0,L|371:200,1,83.9949974366761,10|2,0:2|0:2,0:0:0:0:
+127,339,107212,2,0,L|16:346,1,83.9949974366761,2|2,1:2|0:2,0:0:0:0:
+254,178,107528,2,0,L|365:185,1,83.9949974366761,10|2,0:2|0:2,0:0:0:0:
+479,344,107844,5,2,1:2:0:0:
+411,172,108002,1,10,0:2:0:0:
+400,363,108160,1,2,1:2:0:0:
+488,188,108318,1,2,0:2:0:0:
+319,384,108476,2,0,L|312:273,1,83.9949974366761,10|10,0:2|0:2,0:0:0:0:
+298,87,108791,1,2,1:2:0:0:
+220,275,108949,1,10,0:2:0:0:
+163,74,109107,5,14,0:2:0:0:
+160,0,110212,5,14,0:2:0:0:
+160,0,111002,6,0,P|188:57|194:109,1,90.6674982014809,14|0,0:2|0:0,0:0:0:0:
+214,98,111318,2,0,P|191:137|182:176,1,60.4449988009873,14|0,0:2|1:2,0:0:0:0:
+202,188,111554,1,0,1:2:0:0:
+202,188,111633,1,6,1:2:0:0:
+197,204,112739,5,14,0:2:0:0:
+197,204,113528,2,0,P|242:224|311:221,1,90.6674982014809,14|0,0:0|0:0,0:0:0:0:
+293,200,113844,2,0,P|333:181|366:180,1,60.4449988009873,14|0,0:0|1:0,0:0:0:0:
+413,235,114081,5,0,1:0:0:0:
+413,235,114160,2,0,P|420:193|433:153,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+328,286,114476,1,10,0:2:0:0:
+388,95,114633,2,0,P|381:53|368:13,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+218,171,114949,2,0,P|225:129|238:89,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+114,267,115265,6,0,P|99:177|71:93,1,167.989994873352,6|0,0:0|0:0,0:0:0:0:
+206,327,115739,2,0,P|174:359|99:370,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+247,175,116054,2,0,P|285:190|314:220,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+406,380,116370,2,0,P|411:328|422:274,1,83.9949974366761,8|0,0:0|0:0,0:0:0:0:
+477,101,116686,6,0,P|432:104|382:131,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+286,270,117002,1,10,0:2:0:0:
+210,82,117160,2,0,P|251:84|289:101,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+205,284,117476,2,0,P|220:236|227:166,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+80,62,117791,6,0,P|113:131|123:259,1,167.989994873352,2|2,0:0|0:0,0:0:0:0:
+279,362,118265,5,10,0:2:0:0:
+243,170,118423,1,2,0:0:0:0:
+306,359,118581,5,2,1:2:0:0:
+325,169,118739,1,2,0:0:0:0:
+330,355,118897,5,8,0:2:0:0:
+402,171,119054,1,10,0:2:0:0:
+402,171,119528,6,0,B|239:156|377:58|170:31,1,266.507506303202,12|0,0:2|0:0,0:0:0:0:
+184,44,120160,2,0,B|357:69|233:164|392:180,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+385,190,120791,2,0,B|227:174|351:79|178:54,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+171,64,121423,2,0,B|344:89|220:184|378:200,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+373,211,122054,2,0,B|214:194|338:99|165:74,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+156,90,122686,2,0,P|127:134|109:220,1,114.217502701372,12|0,0:0|0:0,0:0:0:0:
+129,218,123002,6,0,P|144:261|158:324,1,76.1450018009148,0|10,1:2|0:2,0:0:0:0:
+247,142,123318,1,8,0:2:0:0:
+278,283,123475,1,2,1:2:0:0:
+339,100,123633,1,8,0:2:0:0:
+272,251,123791,1,8,0:2:0:0:
+224,58,123949,1,8,0:2:0:0:
+286,225,124107,1,8,0:2:0:0:
+374,24,124265,6,0,P|414:9|473:9,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+368,190,124581,1,10,0:2:0:0:
+222,28,124739,2,0,P|182:13|123:13,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+62,237,125054,2,0,P|82:187|90:129,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+261,271,125370,2,0,P|241:221|233:163,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+86,328,125686,2,0,P|37:328|-12:298,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+164,160,126002,1,2,0:0:0:0:
+235,355,126160,2,0,P|276:356|315:341,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+454,180,126476,2,0,P|415:164|373:166,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+407,347,126791,6,0,L|399:240,1,83.9949974366761,6|2,1:2|0:2,0:0:0:0:
+274,71,127107,2,0,L|267:154,1,83.9949974366761,14|2,0:2|0:0,0:0:0:0:
+421,337,127423,2,0,L|413:230,1,83.9949974366761,6|2,1:2|0:0,0:0:0:0:
+288,61,127739,2,0,L|281:144,1,83.9949974366761,14|2,0:2|0:0,0:0:0:0:
+247,369,128054,5,2,1:2:0:0:
+212,184,128212,1,10,0:2:0:0:
+251,384,128370,1,10,0:2:0:0:
+216,204,128528,1,2,0:0:0:0:
+81,380,128686,2,0,L|87:296,1,83.9949974366761,10|10,0:2|0:2,0:0:0:0:
+100,65,129002,1,2,1:2:0:0:
+163,261,129160,1,10,0:2:0:0:
+91,165,129318,5,4,0:2:0:0:
+300,51,134370,5,6,1:2:0:0:
+300,51,135633,5,4,1:2:0:0:
+300,51,136897,6,0,P|260:72|200:81,1,102.442500859732,4|2,1:2|0:0,0:0:0:0:
+200,72,137212,2,0,P|250:64|296:41,1,102.442500859732,4|0,1:2|0:0,0:0:0:0:
+293,33,137528,2,0,P|247:55|196:63,1,102.442500859732,6|2,1:2|0:0,0:0:0:0:
+193,44,137844,1,12,0:2:0:0:
+337,298,138160,6,0,P|355:259|359:217,1,68.2950005731545,6|0,1:2|0:0,0:0:0:0:
+277,157,138476,1,10,0:2:0:0:
+355,302,138633,2,0,P|379:215|380:139,1,136.590001146309,2|2,1:2|1:2,0:0:0:0:
+276,58,139107,1,10,0:2:0:0:
+276,58,139265,1,2,1:2:0:0:
+209,217,139423,6,0,P|170:235|128:239,1,68.2950005731545,6|0,1:2|0:0,0:0:0:0:
+68,157,139739,1,10,0:2:0:0:
+213,235,139896,2,0,P|126:259|50:260,1,136.590001146309,2|2,1:2|1:2,0:0:0:0:
+207,118,140370,1,10,0:2:0:0:
+207,118,140528,1,2,1:2:0:0:
+308,272,140686,6,0,P|299:306|295:361,1,68.2950005731545,6|0,1:2|0:0,0:0:0:0:
+421,220,141002,1,10,0:2:0:0:
+293,252,141160,2,0,P|273:317|262:384,1,136.590001146309,2|2,1:2|1:2,0:0:0:0:
+392,137,141633,1,10,0:2:0:0:
+392,137,141791,1,2,1:2:0:0:
+392,137,142265,6,0,P|384:93|322:62,1,102.442500859732,6|0,1:2|0:0,0:0:0:0:
+326,79,142581,2,0,P|281:103|200:75,1,136.590001146309,6|12,1:2|0:2,0:0:0:0:
+203,78,143212,5,6,1:2:0:0:
+214,89,144476,5,4,1:2:0:0:
+214,90,145739,6,0,P|249:146|260:207,1,102.442500859732,6|0,1:2|0:0,0:0:0:0:
+248,201,146054,2,0,P|213:257|202:318,1,102.442500859732,6|0,1:2|0:0,0:0:0:0:
+218,313,146370,2,0,P|265:294|316:291,1,102.442500859732,6|0,1:2|0:0,0:0:0:0:
+326,305,146686,1,14,0:2:0:0:
+440,83,147002,6,0,L|430:167,1,68.2950005731545,6|0,1:2|0:0,0:0:0:0:
+346,18,147318,1,10,0:2:0:0:
+457,94,147476,2,0,L|440:231,1,136.590001146309,2|2,1:2|1:2,0:0:0:0:
+326,305,147949,1,10,0:2:0:0:
+326,305,148107,1,2,1:2:0:0:
+170,162,148265,6,0,L|180:246,1,68.2950005731545,6|0,1:2|0:0,0:0:0:0:
+264,97,148581,1,10,0:2:0:0:
+153,173,148739,2,0,L|170:310,1,136.590001146309,2|2,1:2|1:2,0:0:0:0:
+284,384,149212,1,10,0:2:0:0:
+284,384,149370,1,2,1:2:0:0:
+403,159,149528,6,0,L|393:243,1,68.2950005731545,6|0,1:2|0:0,0:0:0:0:
+309,94,149844,1,10,0:2:0:0:
+420,170,150002,2,0,L|403:307,1,136.590001146309,2|2,1:2|1:2,0:0:0:0:
+289,381,150475,1,10,0:2:0:0:
+289,381,150633,1,2,1:2:0:0:
+97,68,151107,6,0,P|140:48|196:63,1,102.442500859732,4|0,1:2|0:0,0:0:0:0:
+198,79,151423,2,0,P|154:129|139:218,1,136.590001146309,4|12,1:2|0:0,0:0:0:0:
+297,317,152054,6,0,B|391:288|336:242|424:215,1,152.29000360183,6|8,1:2|0:2,0:0:0:0:
+281,212,152528,1,0,1:2:0:0:
+446,306,152686,2,0,P|490:265|476:153,1,152.29000360183,2|8,0:0|0:2,0:0:0:0:
+343,142,153160,1,2,1:2:0:0:
+297,317,153318,6,0,P|226:345|155:276,1,152.29000360183,6|8,1:2|0:2,0:0:0:0:
+116,157,153791,2,0,P|150:228|158:309,1,152.29000360183,0|0,1:2|1:2,0:0:0:0:
+264,170,154265,2,0,P|244:206|235:263,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+152,77,154581,6,0,P|84:75|30:158,1,152.29000360183,6|8,1:2|0:2,0:0:0:0:
+191,214,155054,1,0,1:2:0:0:
+264,60,155212,2,0,P|331:58|385:141,1,152.29000360183,2|8,0:0|0:2,0:0:0:0:
+212,171,155686,1,0,1:2:0:0:
+405,112,155844,6,0,P|379:165|357:279,1,152.29000360183,6|8,1:2|0:2,0:0:0:0:
+158,360,156318,2,0,P|142:285|111:216,1,152.29000360183,0|0,1:2|1:2,0:0:0:0:
+9,64,156791,2,0,P|45:87|104:95,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+270,12,157107,6,0,P|187:35|179:115,1,152.29000360183,6|8,1:2|0:2,0:0:0:0:
+288,228,157581,2,0,P|370:204|378:124,1,152.29000360183,0|0,1:2|1:2,0:0:0:0:
+248,83,158054,2,0,P|280:97|327:97,1,76.1450018009148,10|0,0:2|1:2,0:0:0:0:
+490,16,158370,6,0,P|451:77|433:186,1,152.29000360183,6|8,1:2|0:2,0:0:0:0:
+467,312,158844,2,0,P|449:238|409:173,1,152.29000360183,0|0,1:2|1:2,0:0:0:0:
+248,208,159318,2,0,P|292:207|331:188,1,76.1450018009148,8|0,0:2|1:2,0:0:0:0:
+320,98,159633,5,2,0:0:0:0:
+118,79,160897,6,0,L|127:219,1,114.217502701372,2|0,1:2|0:0,0:0:0:0:
+146,197,161212,2,0,L|138:83,1,114.217502701372,2|0,1:2|0:0,0:0:0:0:
+158,87,161528,2,0,L|166:201,1,114.217502701372,2|0,1:2|0:0,0:0:0:0:
+185,203,161844,1,6,0:2:0:0:
+39,359,162160,6,0,P|21:311|21:255,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+153,158,162475,1,10,0:2:0:0:
+221,372,162633,2,0,P|239:324|239:268,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+64,135,162949,2,0,P|69:176|85:215,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+244,41,163265,6,0,P|336:61|369:154,1,167.989994873352,2|2,0:2|0:2,0:0:0:0:
+322,264,163739,1,8,0:2:0:0:
+282,124,163896,1,2,0:2:0:0:
+419,289,164054,2,0,P|410:336|405:387,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+214,234,164370,2,0,P|211:192|202:151,1,83.9949974366761,14|0,0:2|0:0,0:0:0:0:
+295,355,164686,6,0,P|254:340|180:331,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+305,196,165002,1,10,0:2:0:0:
+209,350,165160,2,0,P|168:365|94:374,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+294,219,165475,2,0,P|253:204|179:195,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+66,275,165791,6,0,P|32:177|29:88,1,167.989994873352,2|2,0:2|0:2,0:0:0:0:
+226,70,166265,1,8,0:2:0:0:
+144,232,166423,1,2,0:2:0:0:
+244,50,166581,2,0,P|282:33|354:30,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+163,208,166896,2,0,P|202:225|243:230,1,83.9949974366761,14|0,0:2|0:0,0:0:0:0:
+374,89,167212,6,0,P|396:133|408:208,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+364,304,167528,1,10,0:2:0:0:
+490,167,167686,2,0,P|468:211|456:286,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+269,347,168002,2,0,P|258:306|239:269,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+74,109,168317,6,0,B|172:127|94:167|246:192,1,167.989994873352,6|0,0:2|0:0,0:0:0:0:
+258,24,168791,2,0,P|235:62|230:122,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+85,285,169107,2,0,P|84:243|69:204,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+233,25,169423,2,0,P|210:63|205:123,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+296,252,169739,6,0,P|337:240|416:231,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+224,132,170054,1,10,0:2:0:0:
+331,331,170212,2,0,P|372:343|451:352,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+238,159,170528,2,0,P|197:166|157:177,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+95,302,170844,1,2,0:2:0:0:
+92,94,171002,6,0,P|119:134|136:202,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+243,353,171317,1,10,0:2:0:0:
+218,162,171475,1,0,0:0:0:0:
+237,323,171633,1,2,1:2:0:0:
+212,132,171791,1,0,0:0:0:0:
+328,311,171949,2,0,P|372:330|433:321,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+447,131,172265,6,0,P|422:164|396:255,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+349,97,172581,1,10,0:2:0:0:
+337,298,172739,2,0,P|381:317|442:308,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+335,81,173054,2,0,P|294:83|256:101,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+195,272,173370,6,0,P|240:187|240:103,1,167.989994873352,6|2,0:2|0:2,0:0:0:0:
+66,105,173844,1,8,0:2:0:0:
+125,318,174002,2,0,P|156:347|196:357,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+276,147,174317,1,0,0:0:0:0:
+104,236,174475,2,0,P|63:239|25:222,1,83.9949974366761,8|0,0:2|0:0,0:0:0:0:
+178,39,174791,6,0,P|166:82|162:135,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+293,239,175107,1,10,0:2:0:0:
+335,71,175265,2,0,P|375:51|441:45,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+366,284,175581,2,0,P|325:275|288:256,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+490,135,175896,6,0,P|448:254|444:317,1,167.989994873352,6|2,0:2|0:2,0:0:0:0:
+330,139,176370,1,8,0:2:0:0:
+312,320,176528,2,0,P|303:272|290:225,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+175,118,176844,1,0,0:0:0:0:
+181,305,177002,2,0,P|190:257|203:210,1,83.9949974366761,8|0,0:2|0:0,0:0:0:0:
+318,51,177317,6,0,B|212:74|287:123|157:155,1,167.989994873352,6|10,1:2|0:2,0:0:0:0:
+370,226,177791,2,0,P|421:244|491:238,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+325,83,178107,2,0,P|364:67|406:63,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+302,283,178423,6,0,P|283:235|280:181,1,83.9949974366761,6|0,0:2|1:2,0:0:0:0:
+173,35,178739,2,0,P|167:76|150:115,1,83.9949974366761,2|8,0:2|0:2,0:0:0:0:
+203,282,179054,1,2,0:2:0:0:
+58,125,179212,2,0,P|75:163|81:204,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+266,91,179528,2,0,P|250:129|244:170,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+379,354,179844,6,0,L|490:361,1,83.9949974366761,6|2,1:2|0:2,0:0:0:0:
+252,193,180160,2,0,L|141:200,1,83.9949974366761,10|2,0:2|0:2,0:0:0:0:
+385,339,180475,2,0,L|496:346,1,83.9949974366761,2|2,1:2|0:2,0:0:0:0:
+258,178,180791,2,0,L|147:185,1,83.9949974366761,10|2,0:2|0:2,0:0:0:0:
+295,333,181107,5,2,1:2:0:0:
+334,153,181265,1,10,0:2:0:0:
+306,325,181423,1,2,1:2:0:0:
+347,148,181581,1,2,0:2:0:0:
+317,319,181739,2,0,L|324:208,1,83.9949974366761,10|10,0:2|0:2,0:0:0:0:
+237,65,182054,1,2,1:2:0:0:
+440,112,182212,1,10,0:2:0:0:
+225,77,182370,5,14,0:2:0:0:
+173,281,183476,5,14,0:2:0:0:
+173,281,184265,6,0,L|263:276,1,90.6674982014809,14|0,0:2|0:0,0:0:0:0:
+266,265,184581,2,0,L|183:268,1,60.4449988009873,14|0,0:2|1:2,0:0:0:0:
+180,254,184818,1,0,1:2:0:0:
+180,254,184897,1,6,1:2:0:0:
+402,65,186002,5,14,0:2:0:0:
+402,65,186791,6,0,L|311:60,1,90.6674982014809,14|0,0:0|0:0,0:0:0:0:
+309,49,187107,2,0,L|397:54,1,60.4449988009873,14|0,0:0|1:0,0:0:0:0:
+432,107,187344,5,0,1:0:0:0:
+432,107,187423,2,0,P|420:151|413:220,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+460,324,187739,1,10,0:2:0:0:
+270,233,187897,2,0,P|263:191|252:151,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+345,361,188212,2,0,P|351:319|362:279,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+223,129,188528,6,0,B|121:153|190:198|70:228,1,167.989994873352,6|0,0:0|0:0,0:0:0:0:
+195,36,189002,2,0,P|245:36|304:61,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+315,225,189318,2,0,P|265:225|206:200,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+426,87,189633,2,0,P|406:131|393:207,1,83.9949974366761,8|0,0:0|0:0,0:0:0:0:
+370,384,189949,6,0,P|344:289|302:200,1,167.989994873352,6|10,1:2|0:2,0:0:0:0:
+190,82,190423,2,0,P|153:65|108:64,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+221,254,190739,2,0,P|262:253|300:236,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+189,116,191054,1,2,0:0:0:0:
+378,11,191212,6,0,P|348:92|339:178,1,167.989994873352,2|10,1:2|0:2,0:0:0:0:
+465,289,191686,1,2,0:0:0:0:
+363,105,191844,2,0,P|354:153|356:219,1,83.9949974366761,2|2,1:2|0:0,0:0:0:0:
+421,369,192160,1,8,0:2:0:0:
+421,369,192318,1,10,0:2:0:0:
+221,263,192791,6,0,B|384:248|246:150|453:123,1,266.507506303202,12|0,0:2|0:0,0:0:0:0:
+439,136,193423,2,0,B|266:161|390:256|231:272,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+238,282,194054,2,0,B|396:266|272:171|445:146,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+452,156,194686,2,0,B|279:181|403:276|245:292,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+250,303,195317,2,0,B|409:286|285:191|458:166,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+461,188,195949,2,0,P|458:133|433:68,1,114.217502701372,12|0,0:0|0:0,0:0:0:0:
+411,61,196265,6,0,P|376:85|317:90,1,76.1450018009148,0|10,1:2|0:2,0:0:0:0:
+136,47,196581,1,8,0:2:0:0:
+314,7,196739,1,2,1:2:0:0:
+120,52,196897,1,8,0:2:0:0:
+298,12,197055,1,8,0:2:0:0:
+104,58,197212,2,0,P|96:101|91:167,1,76.1450018009148,8|8,0:2|0:2,0:0:0:0:
+136,317,197528,6,0,P|205:285|247:284,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+384,371,197844,1,10,0:2:0:0:
+317,207,198002,2,0,P|248:175|206:174,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+373,345,198318,2,0,P|413:334|448:311,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+436,127,198633,6,0,P|419:169|412:229,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+264,23,198949,2,0,P|281:65|288:125,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+242,254,199265,1,2,0:0:0:0:
+414,124,199423,2,0,P|397:166|390:226,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+214,266,199739,2,0,P|206:224|190:186,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+38,39,200054,6,0,L|49:128,1,83.9949974366761,6|2,1:2|0:2,0:0:0:0:
+86,302,200370,2,0,L|96:218,1,83.9949974366761,14|2,0:2|0:0,0:0:0:0:
+48,34,200686,2,0,L|59:123,1,83.9949974366761,6|2,1:2|0:0,0:0:0:0:
+96,297,201002,2,0,L|106:213,1,83.9949974366761,14|2,0:2|0:0,0:0:0:0:
+223,68,201318,5,2,1:2:0:0:
+211,238,201476,1,10,0:2:0:0:
+239,61,201633,1,10,0:2:0:0:
+227,231,201791,1,2,0:0:0:0:
+255,52,201949,2,0,L|239:170,1,83.9949974366761,10|10,0:2|0:2,0:0:0:0:
+218,340,202265,1,2,1:2:0:0:
+309,179,202423,1,10,0:2:0:0:
+328,301,202581,5,6,0:2:0:0:
+459,23,203528,6,0,L|374:30,1,60.4449988009873,14|2,0:2|0:2,0:0:0:0:
+305,177,203844,5,6,1:2:0:0:
+305,177,204002,1,2,0:2:0:0:
+264,26,204160,1,10,0:2:0:0:
+264,26,204318,1,2,0:2:0:0:
+210,186,204476,1,2,1:2:0:0:
+210,186,204633,2,0,L|203:288,1,76.1450018009148,2|8,0:2|0:2,0:0:0:0:
+62,159,204949,6,0,L|69:261,1,76.1450018009148,2|0,0:0|1:2,0:0:0:0:
+192,357,205265,2,0,P|232:356|272:325,1,76.1450018009148,2|8,0:0|0:2,0:0:0:0:
+398,216,205581,2,0,P|365:197|327:197,1,76.1450018009148,2|4,0:0|1:2,0:0:0:0:
+407,341,205897,1,2,0:0:0:0:
+493,184,206054,2,0,P|487:146|478:109,1,76.1450018009148,14|2,0:2|0:0,0:0:0:0:
+311,23,206370,6,0,P|278:40|225:40,1,76.1450018009148,4|2,1:2|0:0,0:0:0:0:
+76,13,206686,1,10,0:2:0:0:
+76,13,206844,1,2,0:0:0:0:
+186,145,207002,1,2,1:2:0:0:
+186,145,207160,2,0,P|219:162|257:164,1,76.1450018009148,2|10,0:0|0:2,0:0:0:0:
+102,30,207476,6,0,P|132:97|145:198,1,152.29000360183,2|0,0:0|0:0,0:0:0:0:
+73,352,207949,1,8,0:2:0:0:
+73,352,208107,1,0,0:0:0:0:
+188,244,208265,1,6,1:2:0:0:
+188,244,208423,2,0,P|245:224|279:232,1,76.1450018009148,2|14,0:0|0:2,0:0:0:0:
+356,326,208739,1,2,0:0:0:0:
+428,170,208897,6,0,P|450:206|462:261,1,76.1450018009148,6|2,1:2|0:0,0:0:0:0:
+320,106,209212,1,10,0:2:0:0:
+320,106,209370,1,2,0:0:0:0:
+347,275,209528,1,2,1:2:0:0:
+347,275,209686,1,2,0:0:0:0:
+228,135,209844,1,10,0:2:0:0:
+135,283,210002,6,0,B|142:192|95:232|109:126,1,152.29000360183,6|2,0:0|0:0,0:0:0:0:
+226,12,210476,1,8,0:2:0:0:
+226,12,210633,1,2,0:0:0:0:
+188,167,210791,2,0,P|210:206|215:264,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+289,102,211107,1,10,0:2:0:0:
+289,102,211265,1,2,0:0:0:0:
+357,254,211423,6,0,P|335:293|330:351,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+320,177,211739,1,8,0:2:0:0:
+420,337,211897,2,0,P|438:270|437:185,1,152.29000360183,2|2,0:0|0:0,0:0:0:0:
+330,24,212370,1,8,0:2:0:0:
+188,167,212528,6,0,P|186:242|205:316,1,152.29000360183,6|0,0:0|0:0,0:0:0:0:
+89,221,213002,1,12,0:2:0:0:
+89,221,213160,1,0,0:0:0:0:
+205,316,213318,2,0,P|247:311|292:280,1,76.1450018009148,4|0,1:2|0:0,0:0:0:0:
+355,148,213633,1,12,0:2:0:0:
+355,148,213791,1,0,0:0:0:0:
+377,310,213949,6,0,P|360:265|358:210,1,76.1450018009148,6|2,1:2|0:0,0:0:0:0:
+229,84,214265,2,0,P|223:121|208:156,1,76.1450018009148,10|0,0:2|0:0,0:0:0:0:
+109,231,214581,1,2,1:2:0:0:
+109,231,214739,1,2,0:0:0:0:
+176,22,214897,2,0,P|211:7|249:5,1,76.1450018009148,10|4,0:2|0:0,0:0:0:0:
+343,176,215212,5,2,1:2:0:0:
+343,176,215370,1,2,0:0:0:0:
+304,15,215528,1,10,0:2:0:0:
+304,15,215686,1,2,0:0:0:0:
+425,197,215844,2,0,P|459:212|516:204,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+386,33,216160,2,0,P|348:32|313:47,1,76.1450018009148,8|0,0:2|0:0,0:0:0:0:
+269,217,216476,6,0,P|303:301|320:394,1,152.29000360183,6|10,1:2|0:2,0:0:0:0:
+343,178,216949,1,0,0:0:0:0:
+192,259,217107,2,0,P|183:301|180:354,1,76.1450018009148,2|2,1:2|0:0,0:0:0:0:
+73,212,217423,1,10,0:2:0:0:
+73,212,217581,1,4,0:0:0:0:
+197,75,217739,6,0,B|295:94|237:137|354:161,1,152.29000360183,2|8,1:2|0:2,0:0:0:0:
+194,159,218212,1,0,0:0:0:0:
+345,61,218370,2,0,P|394:48|452:48,1,76.1450018009148,6|0,1:2|0:0,0:0:0:0:
+416,260,218686,2,0,P|378:255|341:245,1,76.1450018009148,14|0,0:2|0:0,0:0:0:0:
+485,93,219002,6,0,P|451:161|435:252,1,152.29000360183,6|8,1:2|0:2,0:0:0:0:
+339,360,219476,1,0,0:0:0:0:
+374,147,219633,2,0,P|408:215|424:306,1,152.29000360183,0|10,1:2|0:2,0:0:0:0:
+248,368,220107,1,6,0:0:0:0:
+201,179,220265,5,2,1:2:0:0:
+201,179,220423,1,2,0:0:0:0:
+239,341,220581,1,10,0:2:0:0:
+239,341,220739,1,2,0:0:0:0:
+122,203,220897,2,0,P|88:189|38:184,1,76.1450018009148,2|0,1:2|0:0,0:0:0:0:
+257,253,221212,2,0,P|294:247|329:233,1,76.1450018009148,8|0,0:2|0:0,0:0:0:0:
+442,40,221528,6,0,L|434:149,1,76.1450018009148,6|2,1:2|0:0,0:0:0:0:
+417,284,221844,2,0,L|411:208,1,76.1450018009148,10|2,0:2|0:0,0:0:0:0:
+336,36,222160,2,0,L|328:145,1,76.1450018009148,2|2,1:2|0:0,0:0:0:0:
+311,280,222476,2,0,L|305:204,1,76.1450018009148,10|2,0:2|0:0,0:0:0:0:
+165,91,222791,5,2,1:2:0:0:
+143,229,222949,1,10,0:2:0:0:
+156,57,223107,1,10,0:2:0:0:
+125,249,223265,1,2,0:0:0:0:
+142,30,223423,2,0,L|67:25,1,76.1450018009148,2|10,1:2|0:2,0:0:0:0:
+209,171,223739,1,2,1:2:0:0:
+3,159,223897,1,10,0:2:0:0:
+111,129,224054,5,6,0:2:0:0:
+82,60,234160,5,2,1:2:0:0:
+82,60,234476,5,2,1:2:0:0:
+82,60,234791,5,2,1:2:0:0:
+82,60,235107,5,6,0:2:0:0:
+312,238,235423,6,0,P|360:258|414:258,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+262,105,235739,1,10,0:2:0:0:
+170,284,235897,2,0,P|122:304|68:304,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+83,113,236212,2,0,P|101:157|110:208,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+258,40,236528,6,0,P|226:117|210:207,1,167.989994873352,2|2,0:0|0:0,0:0:0:0:
+327,323,237002,1,10,0:2:0:0:
+170,284,237160,1,2,0:0:0:0:
+316,147,237318,2,0,P|361:132|413:134,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+417,319,237633,2,0,P|372:304|320:306,1,83.9949974366761,14|0,0:2|0:0,0:0:0:0:
+153,376,237949,6,0,P|177:308|188:208,1,167.989994873352,6|10,1:2|0:2,0:0:0:0:
+81,67,238423,2,0,P|85:113|102:165,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+277,190,238739,2,0,P|288:149|291:107,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+429,281,239054,6,0,P|412:222|402:108,1,167.989994873352,2|2,0:0|0:0,0:0:0:0:
+252,12,239528,1,10,0:2:0:0:
+383,93,239686,1,2,0:0:0:0:
+224,0,239844,2,0,P|237:44|245:90,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+282,275,240160,2,0,P|294:234|301:193,1,83.9949974366761,14|0,0:2|0:0,0:0:0:0:
+155,74,240476,6,0,P|110:54|58:51,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+177,214,240791,1,10,0:2:0:0:
+285,27,240949,2,0,P|330:7|382:4,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+190,181,241265,2,0,P|145:161|93:158,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+350,91,241581,6,0,P|370:154|363:271,1,167.989994873352,6|0,0:0|0:0,0:0:0:0:
+172,349,242054,2,0,P|212:328|267:318,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+94,180,242370,2,0,P|134:200|189:210,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+256,347,242686,2,0,P|215:357|177:376,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+291,209,243002,6,0,P|306:160|309:104,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+386,277,243318,1,10,0:2:0:0:
+225,165,243476,2,0,P|210:116|207:60,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+406,36,243791,2,0,P|400:77|387:117,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+308,225,244107,1,2,0:0:0:0:
+246,15,244265,6,0,P|196:10|149:27,1,83.9949974366761,2|2,1:2|0:0,0:0:0:0:
+89,217,244581,1,10,0:2:0:0:
+89,217,244739,1,2,0:0:0:0:
+242,41,244897,2,0,P|192:36|145:53,1,83.9949974366761,2|2,1:2|0:0,0:0:0:0:
+189,240,245212,1,10,0:2:0:0:
+189,240,245370,1,2,0:0:0:0:
+311,93,245528,6,0,P|355:75|401:75,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+400,292,245844,1,10,0:2:0:0:
+250,154,246002,2,0,P|211:137|170:134,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+320,311,246318,2,0,P|361:308|399:291,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+488,108,246633,6,0,P|474:150|464:206,1,83.9949974366761,6|0,0:0|1:2,0:0:0:0:
+314,323,246949,2,0,P|305:281|292:242,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+202,67,247265,2,0,P|163:54|67:145,1,167.989994873352,2|0,0:0|0:0,0:0:0:0:
+190,256,247739,1,8,0:2:0:0:
+200,100,247897,1,0,0:0:0:0:
+188,283,248054,6,0,P|228:311|277:313,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+342,145,248370,1,10,0:2:0:0:
+338,350,248528,2,0,P|359:307|368:260,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+290,80,248844,2,0,P|300:120|319:158,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+432,320,249160,6,0,P|453:277|462:230,1,83.9949974366761,6|0,0:0|1:2,0:0:0:0:
+384,50,249476,2,0,P|394:90|413:128,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+449,329,249791,2,0,P|479:256|487:165,1,167.989994873352,2|0,0:0|0:0,0:0:0:0:
+351,34,250265,1,12,0:2:0:0:
+312,187,250423,1,0,0:0:0:0:
+196,18,250581,6,0,P|215:60|224:126,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+161,257,250897,1,10,0:2:0:0:
+88,110,251054,2,0,P|69:152|60:218,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+188,336,251370,2,0,P|178:295|161:257,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+206,65,251686,6,0,P|265:46|305:46,1,83.9949974366761,6|0,0:0|1:2,0:0:0:0:
+381,245,252002,2,0,P|339:240|300:224,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+430,103,252318,1,2,0:0:0:0:
+440,308,252476,2,0,P|463:261|466:209,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+349,86,252791,2,0,P|342:127|322:163,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+217,345,253107,5,6,1:2:0:0:
+229,190,253265,1,2,0:2:0:0:
+235,365,253423,1,10,0:2:0:0:
+225,169,253581,2,0,P|187:144|119:129,1,83.9949974366761,2|2,0:2|1:2,0:0:0:0:
+318,271,253897,1,2,0:2:0:0:
+337,90,254054,1,10,0:2:0:0:
+407,267,254212,5,2,0:2:0:0:
+407,267,254291,1,2,0:2:0:0:
+407,267,254370,2,0,L|419:155,1,83.9949974366761,2|10,1:2|0:2,0:0:0:0:
+282,25,254686,1,10,0:2:0:0:
+314,248,254844,2,0,L|302:136,1,83.9949974366761,2|10,0:2|0:2,0:0:0:0:
+150,22,255160,1,10,0:2:0:0:
+297,137,255318,1,2,1:2:0:0:
+74,180,255476,1,10,0:2:0:0:
+184,109,255633,5,6,0:0:0:0:
+66,184,259423,6,0,P|114:169|135:169,1,60.4449988009873,6|0,1:2|1:2,0:0:0:0:
+227,278,259739,2,0,P|254:289|284:293,1,60.4449988009873,0|0,1:2|1:2,0:0:0:0:
+374,106,260054,1,6,1:2:0:0:
+399,293,260212,1,2,1:2:0:0:
+455,78,260370,1,8,0:2:0:0:
+396,261,260528,1,8,0:2:0:0:
+288,83,260686,6,0,P|242:58|191:51,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+83,215,261002,1,10,0:2:0:0:
+120,39,261160,2,0,P|139:75|150:135,1,83.9949974366761,2|0,0:2|1:2,0:0:0:0:
+168,286,261476,2,0,P|177:245|197:208,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+300,62,261791,6,0,B|402:90|337:130|449:151,1,167.989994873352,6|0,0:0|0:0,0:0:0:0:
+319,285,262265,2,0,P|306:238|300:177,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+160,42,262581,2,0,P|153:83|142:123,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+297,272,262897,2,0,P|284:225|278:164,1,83.9949974366761,8|0,0:0|0:0,0:0:0:0:
+430,55,263212,6,0,P|470:39|518:40,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+401,194,263528,1,10,0:2:0:0:
+282,28,263686,2,0,P|242:12|194:13,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+124,200,264002,2,0,P|165:199|204:183,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+93,85,264318,1,2,0:0:0:0:
+61,277,264476,6,0,P|72:313|77:364,1,83.9949974366761,2|2,1:2|0:0,0:0:0:0:
+229,203,264791,2,0,P|217:239|213:290,1,83.9949974366761,10|2,0:2|0:0,0:0:0:0:
+358,126,265107,2,0,P|369:162|374:213,1,83.9949974366761,2|2,1:2|0:0,0:0:0:0:
+470,69,265423,1,8,0:2:0:0:
+470,69,265581,1,10,0:2:0:0:
+149,40,266054,6,0,P|184:78|242:292,1,266.507506303202,12|0,0:2|0:0,0:0:0:0:
+253,277,266686,2,0,P|233:146|158:37,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+168,33,267318,2,0,P|203:71|261:285,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+272,270,267949,2,0,P|252:139|177:30,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+187,23,268581,2,0,P|262:131|281:262,1,266.507506303202,12|0,0:0|0:0,0:0:0:0:
+294,261,269212,2,0,P|303:193|327:142,1,114.217502701372,12|0,0:0|0:0,0:0:0:0:
+340,145,269528,6,0,P|363:175|378:212,1,76.1450018009148,0|10,1:2|0:2,0:0:0:0:
+447,373,269844,1,8,0:2:0:0:
+465,198,270002,1,2,1:2:0:0:
+450,358,270160,1,8,0:2:0:0:
+468,183,270318,1,8,0:2:0:0:
+344,367,270476,2,0,P|303:380|248:380,1,76.1450018009148,8|8,0:2|0:2,0:0:0:0:
+146,242,270791,6,0,P|129:193|126:127,1,83.9949974366761,6|0,1:2|0:0,0:0:0:0:
+264,74,271107,1,10,0:2:0:0:
+218,287,271265,2,0,P|181:318|119:326,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+245,153,271581,2,0,P|284:165|315:193,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+349,382,271897,6,0,P|337:335|337:292,1,83.9949974366761,2|0,0:0|1:2,0:0:0:0:
+446,128,272212,2,0,P|444:169|433:210,1,83.9949974366761,2|8,0:0|0:2,0:0:0:0:
+324,72,272528,1,2,0:0:0:0:
+415,294,272686,2,0,P|464:289|506:260,1,83.9949974366761,2|0,1:2|0:0,0:0:0:0:
+349,149,273002,2,0,P|307:151|270:170,1,83.9949974366761,10|0,0:2|0:0,0:0:0:0:
+148,303,273318,6,0,P|129:259|127:210,1,83.9949974366761,6|2,1:2|0:2,0:0:0:0:
+199,70,273633,1,14,0:2:0:0:
+247,249,273791,2,0,P|266:205|268:156,1,83.9949974366761,2|6,0:0|1:2,0:0:0:0:
+242,3,274107,1,2,0:0:0:0:
+143,195,274265,2,0,P|124:151|122:102,1,83.9949974366761,14|2,0:2|0:0,0:0:0:0:
+272,13,274581,6,0,L|385:20,1,83.9949974366761,2|10,1:2|0:2,0:0:0:0:
+488,195,274897,2,0,L|375:202,1,83.9949974366761,10|2,0:2|0:0,0:0:0:0:
+285,37,275212,1,10,0:2:0:0:
+315,233,275370,1,10,0:2:0:0:
+283,20,275528,1,2,1:2:0:0:
+313,216,275686,1,10,0:2:0:0:
+254,127,275844,5,6,0:2:0:0:
+71,80,278370,6,0,B|118:74|166:40|166:40|130:88,1,125.992496155014,12|0,0:0|0:0,0:0:0:0:
+256,61,278686,2,0,B|242:43|242:43|291:77|337:83,1,125.992496155014,8|0,0:0|0:0,0:0:0:0:
+351,186,279002,2,0,B|297:179|242:141|242:141|261:165,1,149.542498859081,12|0,0:0|0:0,0:0:0:0:
+149,163,279318,2,0,B|167:138|167:138|112:176|59:183,1,149.542498859081,8|0,0:0|0:0,0:0:0:0:
+205,229,279633,5,14,0:2:0:0:
+480,25,280265,6,0,B|160:57|384:313|32:345,1,580.900014182129,6|0,1:2|0:0,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2571731-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2571731-expected-conversion.json
new file mode 100644
index 0000000000..1817ef4742
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2571731-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":1254.0,"Objects":[{"StartTime":1254.0,"Position":229.0,"HyperDash":false},{"StartTime":1332.0,"Position":187.422012,"HyperDash":false},{"StartTime":1410.0,"Position":169.115814,"HyperDash":false},{"StartTime":1488.0,"Position":162.374466,"HyperDash":false},{"StartTime":1566.0,"Position":160.452332,"HyperDash":false},{"StartTime":1635.0,"Position":181.787521,"HyperDash":false},{"StartTime":1704.0,"Position":177.835266,"HyperDash":false},{"StartTime":1773.0,"Position":194.2059,"HyperDash":false},{"StartTime":1878.0,"Position":230.367538,"HyperDash":false}]},{"StartTime":2191.0,"Objects":[{"StartTime":2191.0,"Position":470.0,"HyperDash":false}]},{"StartTime":2504.0,"Objects":[{"StartTime":2504.0,"Position":228.0,"HyperDash":false},{"StartTime":2573.0,"Position":188.673691,"HyperDash":false},{"StartTime":2642.0,"Position":171.347382,"HyperDash":false},{"StartTime":2711.0,"Position":143.021057,"HyperDash":false},{"StartTime":2816.0,"Position":118.002762,"HyperDash":false}]},{"StartTime":3129.0,"Objects":[{"StartTime":3129.0,"Position":231.0,"HyperDash":false},{"StartTime":3198.0,"Position":251.326309,"HyperDash":false},{"StartTime":3267.0,"Position":293.652618,"HyperDash":false},{"StartTime":3336.0,"Position":307.978943,"HyperDash":false},{"StartTime":3441.0,"Position":340.997253,"HyperDash":false}]},{"StartTime":3754.0,"Objects":[{"StartTime":3754.0,"Position":465.0,"HyperDash":false},{"StartTime":3832.0,"Position":458.7602,"HyperDash":false},{"StartTime":3910.0,"Position":469.2429,"HyperDash":false},{"StartTime":3988.0,"Position":435.549255,"HyperDash":false},{"StartTime":4066.0,"Position":439.174347,"HyperDash":false},{"StartTime":4135.0,"Position":439.5499,"HyperDash":false},{"StartTime":4204.0,"Position":417.896637,"HyperDash":false},{"StartTime":4273.0,"Position":391.087067,"HyperDash":false},{"StartTime":4379.0,"Position":341.072845,"HyperDash":false}]},{"StartTime":4691.0,"Objects":[{"StartTime":4691.0,"Position":131.0,"HyperDash":false}]},{"StartTime":5004.0,"Objects":[{"StartTime":5004.0,"Position":365.0,"HyperDash":false},{"StartTime":5073.0,"Position":357.3771,"HyperDash":false},{"StartTime":5142.0,"Position":348.754242,"HyperDash":false},{"StartTime":5211.0,"Position":379.131348,"HyperDash":false},{"StartTime":5316.0,"Position":366.705231,"HyperDash":false}]},{"StartTime":5629.0,"Objects":[{"StartTime":5629.0,"Position":228.0,"HyperDash":false},{"StartTime":5698.0,"Position":247.324,"HyperDash":false},{"StartTime":5767.0,"Position":280.648,"HyperDash":false},{"StartTime":5836.0,"Position":285.972,"HyperDash":false},{"StartTime":5941.0,"Position":337.9868,"HyperDash":false}]},{"StartTime":6254.0,"Objects":[{"StartTime":6254.0,"Position":197.0,"HyperDash":false},{"StartTime":6332.0,"Position":165.6015,"HyperDash":false},{"StartTime":6410.0,"Position":141.904709,"HyperDash":false},{"StartTime":6488.0,"Position":132.042267,"HyperDash":false},{"StartTime":6566.0,"Position":96.16125,"HyperDash":false},{"StartTime":6635.0,"Position":60.9876633,"HyperDash":false},{"StartTime":6704.0,"Position":51.4006424,"HyperDash":false},{"StartTime":6773.0,"Position":71.82723,"HyperDash":false},{"StartTime":6879.0,"Position":54.095974,"HyperDash":false}]},{"StartTime":7191.0,"Objects":[{"StartTime":7191.0,"Position":283.0,"HyperDash":false}]},{"StartTime":7504.0,"Objects":[{"StartTime":7504.0,"Position":290.0,"HyperDash":false},{"StartTime":7573.0,"Position":310.169,"HyperDash":false},{"StartTime":7642.0,"Position":295.338,"HyperDash":false},{"StartTime":7711.0,"Position":292.507019,"HyperDash":false},{"StartTime":7816.0,"Position":304.3294,"HyperDash":false}]},{"StartTime":8129.0,"Objects":[{"StartTime":8129.0,"Position":48.0,"HyperDash":false}]},{"StartTime":8441.0,"Objects":[{"StartTime":8441.0,"Position":308.0,"HyperDash":false}]},{"StartTime":8754.0,"Objects":[{"StartTime":8754.0,"Position":168.0,"HyperDash":false},{"StartTime":8823.0,"Position":142.687775,"HyperDash":false},{"StartTime":8892.0,"Position":138.375549,"HyperDash":false},{"StartTime":8961.0,"Position":89.06334,"HyperDash":false},{"StartTime":9066.0,"Position":58.0664749,"HyperDash":false}]},{"StartTime":9379.0,"Objects":[{"StartTime":9379.0,"Position":226.0,"HyperDash":false},{"StartTime":9448.0,"Position":255.312714,"HyperDash":false},{"StartTime":9517.0,"Position":287.625427,"HyperDash":false},{"StartTime":9586.0,"Position":315.938171,"HyperDash":false},{"StartTime":9691.0,"Position":335.9358,"HyperDash":false}]},{"StartTime":10004.0,"Objects":[{"StartTime":10004.0,"Position":477.0,"HyperDash":false},{"StartTime":10062.0,"Position":43.0,"HyperDash":false},{"StartTime":10121.0,"Position":494.0,"HyperDash":false},{"StartTime":10179.0,"Position":135.0,"HyperDash":false},{"StartTime":10238.0,"Position":30.0,"HyperDash":false},{"StartTime":10296.0,"Position":11.0,"HyperDash":false},{"StartTime":10355.0,"Position":239.0,"HyperDash":false},{"StartTime":10413.0,"Position":505.0,"HyperDash":false},{"StartTime":10472.0,"Position":353.0,"HyperDash":false},{"StartTime":10531.0,"Position":136.0,"HyperDash":false},{"StartTime":10589.0,"Position":135.0,"HyperDash":false},{"StartTime":10648.0,"Position":346.0,"HyperDash":false},{"StartTime":10706.0,"Position":39.0,"HyperDash":false},{"StartTime":10765.0,"Position":300.0,"HyperDash":false},{"StartTime":10823.0,"Position":398.0,"HyperDash":false},{"StartTime":10882.0,"Position":151.0,"HyperDash":false},{"StartTime":10941.0,"Position":73.0,"HyperDash":false}]},{"StartTime":11254.0,"Objects":[{"StartTime":11254.0,"Position":173.0,"HyperDash":false},{"StartTime":11332.0,"Position":151.138428,"HyperDash":false},{"StartTime":11410.0,"Position":132.025146,"HyperDash":false},{"StartTime":11488.0,"Position":91.37633,"HyperDash":false},{"StartTime":11566.0,"Position":80.290535,"HyperDash":false},{"StartTime":11635.0,"Position":61.6581879,"HyperDash":false},{"StartTime":11704.0,"Position":80.94798,"HyperDash":false},{"StartTime":11773.0,"Position":108.710762,"HyperDash":false},{"StartTime":11879.0,"Position":120.303291,"HyperDash":false}]},{"StartTime":12191.0,"Objects":[{"StartTime":12191.0,"Position":348.0,"HyperDash":false}]},{"StartTime":12504.0,"Objects":[{"StartTime":12504.0,"Position":119.0,"HyperDash":false},{"StartTime":12573.0,"Position":113.579384,"HyperDash":false},{"StartTime":12642.0,"Position":114.15876,"HyperDash":false},{"StartTime":12711.0,"Position":93.7381439,"HyperDash":false},{"StartTime":12816.0,"Position":108.054588,"HyperDash":false}]},{"StartTime":13129.0,"Objects":[{"StartTime":13129.0,"Position":246.0,"HyperDash":false},{"StartTime":13198.0,"Position":207.673676,"HyperDash":false},{"StartTime":13267.0,"Position":196.347351,"HyperDash":false},{"StartTime":13336.0,"Position":190.021027,"HyperDash":false},{"StartTime":13441.0,"Position":136.002686,"HyperDash":false}]},{"StartTime":13754.0,"Objects":[{"StartTime":13754.0,"Position":290.0,"HyperDash":false},{"StartTime":13832.0,"Position":327.611237,"HyperDash":false},{"StartTime":13910.0,"Position":353.671875,"HyperDash":false},{"StartTime":13988.0,"Position":363.8803,"HyperDash":false},{"StartTime":14066.0,"Position":380.478455,"HyperDash":false},{"StartTime":14135.0,"Position":374.964325,"HyperDash":false},{"StartTime":14204.0,"Position":392.930969,"HyperDash":false},{"StartTime":14273.0,"Position":350.32254,"HyperDash":false},{"StartTime":14379.0,"Position":329.753876,"HyperDash":false}]},{"StartTime":14691.0,"Objects":[{"StartTime":14691.0,"Position":80.0,"HyperDash":false}]},{"StartTime":15004.0,"Objects":[{"StartTime":15004.0,"Position":335.0,"HyperDash":false},{"StartTime":15082.0,"Position":297.345367,"HyperDash":false},{"StartTime":15160.0,"Position":285.690735,"HyperDash":false},{"StartTime":15238.0,"Position":243.036133,"HyperDash":false},{"StartTime":15316.0,"Position":228.3815,"HyperDash":false},{"StartTime":15385.0,"Position":192.802429,"HyperDash":false},{"StartTime":15454.0,"Position":180.223328,"HyperDash":false},{"StartTime":15523.0,"Position":144.644241,"HyperDash":false},{"StartTime":15628.0,"Position":121.763031,"HyperDash":false}]},{"StartTime":15941.0,"Objects":[{"StartTime":15941.0,"Position":475.0,"HyperDash":false}]},{"StartTime":16254.0,"Objects":[{"StartTime":16254.0,"Position":120.0,"HyperDash":false},{"StartTime":16332.0,"Position":112.4255,"HyperDash":false},{"StartTime":16410.0,"Position":115.254448,"HyperDash":false},{"StartTime":16488.0,"Position":125.264832,"HyperDash":false},{"StartTime":16566.0,"Position":150.934219,"HyperDash":false},{"StartTime":16635.0,"Position":164.5551,"HyperDash":false},{"StartTime":16704.0,"Position":205.001038,"HyperDash":false},{"StartTime":16773.0,"Position":217.329178,"HyperDash":false},{"StartTime":16879.0,"Position":251.47258,"HyperDash":false}]},{"StartTime":17191.0,"Objects":[{"StartTime":17191.0,"Position":405.0,"HyperDash":false}]},{"StartTime":17504.0,"Objects":[{"StartTime":17504.0,"Position":250.0,"HyperDash":false},{"StartTime":17582.0,"Position":210.776382,"HyperDash":false},{"StartTime":17660.0,"Position":183.552765,"HyperDash":false},{"StartTime":17738.0,"Position":153.329163,"HyperDash":false},{"StartTime":17816.0,"Position":141.10556,"HyperDash":false},{"StartTime":17885.0,"Position":161.187988,"HyperDash":false},{"StartTime":17954.0,"Position":192.2704,"HyperDash":false},{"StartTime":18023.0,"Position":194.352844,"HyperDash":false},{"StartTime":18128.0,"Position":250.0,"HyperDash":false}]},{"StartTime":18441.0,"Objects":[{"StartTime":18441.0,"Position":403.0,"HyperDash":false}]},{"StartTime":18754.0,"Objects":[{"StartTime":18754.0,"Position":250.0,"HyperDash":false},{"StartTime":18832.0,"Position":222.847168,"HyperDash":false},{"StartTime":18910.0,"Position":212.124878,"HyperDash":false},{"StartTime":18988.0,"Position":180.067841,"HyperDash":false},{"StartTime":19066.0,"Position":177.484818,"HyperDash":false},{"StartTime":19135.0,"Position":173.0804,"HyperDash":false},{"StartTime":19204.0,"Position":184.026764,"HyperDash":false},{"StartTime":19273.0,"Position":200.533371,"HyperDash":false},{"StartTime":19378.0,"Position":250.553848,"HyperDash":false}]},{"StartTime":19691.0,"Objects":[{"StartTime":19691.0,"Position":404.0,"HyperDash":false}]},{"StartTime":20004.0,"Objects":[{"StartTime":20004.0,"Position":249.0,"HyperDash":false}]},{"StartTime":20316.0,"Objects":[{"StartTime":20316.0,"Position":241.0,"HyperDash":false}]},{"StartTime":20629.0,"Objects":[{"StartTime":20629.0,"Position":239.0,"HyperDash":false}]},{"StartTime":20941.0,"Objects":[{"StartTime":20941.0,"Position":399.0,"HyperDash":false}]},{"StartTime":21254.0,"Objects":[{"StartTime":21254.0,"Position":240.0,"HyperDash":false},{"StartTime":21332.0,"Position":230.589066,"HyperDash":false},{"StartTime":21410.0,"Position":196.0483,"HyperDash":false},{"StartTime":21488.0,"Position":180.546143,"HyperDash":false},{"StartTime":21566.0,"Position":140.131409,"HyperDash":false},{"StartTime":21635.0,"Position":118.503845,"HyperDash":false},{"StartTime":21704.0,"Position":118.550331,"HyperDash":false},{"StartTime":21773.0,"Position":116.676407,"HyperDash":false},{"StartTime":21878.0,"Position":101.092834,"HyperDash":false}]},{"StartTime":22191.0,"Objects":[{"StartTime":22191.0,"Position":372.0,"HyperDash":false}]},{"StartTime":22504.0,"Objects":[{"StartTime":22504.0,"Position":386.0,"HyperDash":false},{"StartTime":22573.0,"Position":375.75766,"HyperDash":false},{"StartTime":22642.0,"Position":377.51532,"HyperDash":false},{"StartTime":22711.0,"Position":375.273,"HyperDash":false},{"StartTime":22816.0,"Position":398.469452,"HyperDash":false}]},{"StartTime":23129.0,"Objects":[{"StartTime":23129.0,"Position":264.0,"HyperDash":false},{"StartTime":23198.0,"Position":242.675385,"HyperDash":false},{"StartTime":23267.0,"Position":201.350769,"HyperDash":false},{"StartTime":23336.0,"Position":197.026169,"HyperDash":false},{"StartTime":23441.0,"Position":154.010468,"HyperDash":false}]},{"StartTime":23754.0,"Objects":[{"StartTime":23754.0,"Position":292.0,"HyperDash":false},{"StartTime":23832.0,"Position":331.63,"HyperDash":false},{"StartTime":23910.0,"Position":331.0578,"HyperDash":false},{"StartTime":23988.0,"Position":348.8628,"HyperDash":false},{"StartTime":24066.0,"Position":360.9073,"HyperDash":false},{"StartTime":24135.0,"Position":365.5993,"HyperDash":false},{"StartTime":24204.0,"Position":351.536926,"HyperDash":false},{"StartTime":24273.0,"Position":324.124176,"HyperDash":false},{"StartTime":24378.0,"Position":290.904083,"HyperDash":false}]},{"StartTime":24691.0,"Objects":[{"StartTime":24691.0,"Position":24.0,"HyperDash":false}]},{"StartTime":25004.0,"Objects":[{"StartTime":25004.0,"Position":285.0,"HyperDash":false},{"StartTime":25082.0,"Position":313.548859,"HyperDash":false},{"StartTime":25160.0,"Position":324.0977,"HyperDash":false},{"StartTime":25238.0,"Position":345.646545,"HyperDash":false},{"StartTime":25316.0,"Position":375.195374,"HyperDash":false},{"StartTime":25385.0,"Position":374.248322,"HyperDash":false},{"StartTime":25454.0,"Position":330.30127,"HyperDash":false},{"StartTime":25523.0,"Position":315.354218,"HyperDash":false},{"StartTime":25628.0,"Position":285.0,"HyperDash":false}]},{"StartTime":25941.0,"Objects":[{"StartTime":25941.0,"Position":465.0,"HyperDash":false}]},{"StartTime":26254.0,"Objects":[{"StartTime":26254.0,"Position":284.0,"HyperDash":false},{"StartTime":26332.0,"Position":297.848755,"HyperDash":false},{"StartTime":26410.0,"Position":271.5647,"HyperDash":false},{"StartTime":26488.0,"Position":314.9722,"HyperDash":false},{"StartTime":26566.0,"Position":313.667419,"HyperDash":false},{"StartTime":26635.0,"Position":327.281128,"HyperDash":false},{"StartTime":26704.0,"Position":359.75528,"HyperDash":false},{"StartTime":26773.0,"Position":373.334259,"HyperDash":false},{"StartTime":26879.0,"Position":411.1939,"HyperDash":false}]},{"StartTime":27191.0,"Objects":[{"StartTime":27191.0,"Position":108.0,"HyperDash":false}]},{"StartTime":27504.0,"Objects":[{"StartTime":27504.0,"Position":124.0,"HyperDash":false},{"StartTime":27573.0,"Position":136.610931,"HyperDash":false},{"StartTime":27642.0,"Position":107.221848,"HyperDash":false},{"StartTime":27711.0,"Position":100.832764,"HyperDash":false},{"StartTime":27816.0,"Position":113.197212,"HyperDash":false}]},{"StartTime":28129.0,"Objects":[{"StartTime":28129.0,"Position":250.0,"HyperDash":false},{"StartTime":28198.0,"Position":219.04863,"HyperDash":false},{"StartTime":28267.0,"Position":184.097244,"HyperDash":false},{"StartTime":28336.0,"Position":174.145874,"HyperDash":false},{"StartTime":28441.0,"Position":141.69812,"HyperDash":false}]},{"StartTime":28754.0,"Objects":[{"StartTime":28754.0,"Position":284.0,"HyperDash":false},{"StartTime":28832.0,"Position":316.245941,"HyperDash":false},{"StartTime":28910.0,"Position":338.3189,"HyperDash":false},{"StartTime":28988.0,"Position":359.1247,"HyperDash":false},{"StartTime":29066.0,"Position":381.5727,"HyperDash":false},{"StartTime":29135.0,"Position":393.2293,"HyperDash":false},{"StartTime":29204.0,"Position":421.124542,"HyperDash":false},{"StartTime":29273.0,"Position":400.894043,"HyperDash":false},{"StartTime":29379.0,"Position":415.7917,"HyperDash":false}]},{"StartTime":29691.0,"Objects":[{"StartTime":29691.0,"Position":135.0,"HyperDash":false}]},{"StartTime":30004.0,"Objects":[{"StartTime":30004.0,"Position":416.0,"HyperDash":false}]},{"StartTime":30316.0,"Objects":[{"StartTime":30316.0,"Position":456.0,"HyperDash":false}]},{"StartTime":30629.0,"Objects":[{"StartTime":30629.0,"Position":294.0,"HyperDash":false},{"StartTime":30698.0,"Position":268.673065,"HyperDash":false},{"StartTime":30767.0,"Position":233.346161,"HyperDash":false},{"StartTime":30836.0,"Position":224.019226,"HyperDash":false},{"StartTime":30941.0,"Position":184.0,"HyperDash":false}]},{"StartTime":31254.0,"Objects":[{"StartTime":31254.0,"Position":351.0,"HyperDash":false},{"StartTime":31332.0,"Position":388.3603,"HyperDash":false},{"StartTime":31410.0,"Position":400.4129,"HyperDash":false},{"StartTime":31488.0,"Position":406.2265,"HyperDash":false},{"StartTime":31566.0,"Position":441.396118,"HyperDash":false},{"StartTime":31635.0,"Position":452.909637,"HyperDash":false},{"StartTime":31704.0,"Position":447.317657,"HyperDash":false},{"StartTime":31773.0,"Position":421.671265,"HyperDash":false},{"StartTime":31878.0,"Position":416.158752,"HyperDash":false}]},{"StartTime":32191.0,"Objects":[{"StartTime":32191.0,"Position":149.0,"HyperDash":false}]},{"StartTime":32504.0,"Objects":[{"StartTime":32504.0,"Position":144.0,"HyperDash":false},{"StartTime":32582.0,"Position":152.122482,"HyperDash":false},{"StartTime":32660.0,"Position":187.244965,"HyperDash":false},{"StartTime":32738.0,"Position":234.367462,"HyperDash":false},{"StartTime":32816.0,"Position":252.489944,"HyperDash":false},{"StartTime":32885.0,"Position":292.4829,"HyperDash":false},{"StartTime":32954.0,"Position":314.4759,"HyperDash":false},{"StartTime":33023.0,"Position":317.468872,"HyperDash":false},{"StartTime":33129.0,"Position":361.327637,"HyperDash":false}]},{"StartTime":33440.0,"Objects":[{"StartTime":33440.0,"Position":201.0,"HyperDash":false}]},{"StartTime":33597.0,"Objects":[{"StartTime":33597.0,"Position":140.0,"HyperDash":false},{"StartTime":33675.0,"Position":97.84354,"HyperDash":false},{"StartTime":33753.0,"Position":83.79872,"HyperDash":false},{"StartTime":33831.0,"Position":111.743484,"HyperDash":false},{"StartTime":33909.0,"Position":105.502647,"HyperDash":false},{"StartTime":33969.0,"Position":122.537575,"HyperDash":false},{"StartTime":34065.0,"Position":148.435272,"HyperDash":false}]},{"StartTime":34379.0,"Objects":[{"StartTime":34379.0,"Position":239.0,"HyperDash":false},{"StartTime":34448.0,"Position":211.884613,"HyperDash":false},{"StartTime":34517.0,"Position":177.769226,"HyperDash":false},{"StartTime":34586.0,"Position":165.653839,"HyperDash":false},{"StartTime":34691.0,"Position":129.956512,"HyperDash":false}]},{"StartTime":35004.0,"Objects":[{"StartTime":35004.0,"Position":264.0,"HyperDash":false},{"StartTime":35073.0,"Position":298.150146,"HyperDash":false},{"StartTime":35142.0,"Position":294.300323,"HyperDash":false},{"StartTime":35211.0,"Position":332.45047,"HyperDash":false},{"StartTime":35316.0,"Position":373.2007,"HyperDash":false}]},{"StartTime":35629.0,"Objects":[{"StartTime":35629.0,"Position":223.0,"HyperDash":false},{"StartTime":35698.0,"Position":205.019867,"HyperDash":false},{"StartTime":35767.0,"Position":232.039749,"HyperDash":false},{"StartTime":35836.0,"Position":201.059616,"HyperDash":false},{"StartTime":35941.0,"Position":218.568115,"HyperDash":false}]},{"StartTime":36254.0,"Objects":[{"StartTime":36254.0,"Position":379.0,"HyperDash":false}]},{"StartTime":37035.0,"Objects":[{"StartTime":37035.0,"Position":398.0,"HyperDash":false},{"StartTime":37134.0,"Position":416.853973,"HyperDash":false},{"StartTime":37269.0,"Position":402.3821,"HyperDash":false}]},{"StartTime":37504.0,"Objects":[{"StartTime":37504.0,"Position":284.0,"HyperDash":false},{"StartTime":37573.0,"Position":268.747223,"HyperDash":false},{"StartTime":37642.0,"Position":235.494461,"HyperDash":false},{"StartTime":37711.0,"Position":210.2417,"HyperDash":false},{"StartTime":37816.0,"Position":174.335327,"HyperDash":false}]},{"StartTime":38129.0,"Objects":[{"StartTime":38129.0,"Position":305.0,"HyperDash":false},{"StartTime":38198.0,"Position":341.240051,"HyperDash":false},{"StartTime":38267.0,"Position":355.480072,"HyperDash":false},{"StartTime":38336.0,"Position":378.7201,"HyperDash":false},{"StartTime":38441.0,"Position":414.607117,"HyperDash":false}]},{"StartTime":38597.0,"Objects":[{"StartTime":38597.0,"Position":415.0,"HyperDash":false},{"StartTime":38675.0,"Position":374.605652,"HyperDash":false},{"StartTime":38753.0,"Position":363.2113,"HyperDash":false},{"StartTime":38831.0,"Position":320.816956,"HyperDash":false},{"StartTime":38909.0,"Position":305.4226,"HyperDash":false},{"StartTime":38969.0,"Position":265.350037,"HyperDash":false},{"StartTime":39065.0,"Position":250.633942,"HyperDash":false}]},{"StartTime":39379.0,"Objects":[{"StartTime":39379.0,"Position":113.0,"HyperDash":false},{"StartTime":39448.0,"Position":113.075348,"HyperDash":false},{"StartTime":39517.0,"Position":104.150688,"HyperDash":false},{"StartTime":39586.0,"Position":88.2260361,"HyperDash":false},{"StartTime":39691.0,"Position":104.297211,"HyperDash":false}]},{"StartTime":40004.0,"Objects":[{"StartTime":40004.0,"Position":385.0,"HyperDash":false}]},{"StartTime":40316.0,"Objects":[{"StartTime":40316.0,"Position":250.0,"HyperDash":false}]},{"StartTime":40629.0,"Objects":[{"StartTime":40629.0,"Position":256.0,"HyperDash":false}]},{"StartTime":40941.0,"Objects":[{"StartTime":40941.0,"Position":89.0,"HyperDash":false}]},{"StartTime":41254.0,"Objects":[{"StartTime":41254.0,"Position":256.0,"HyperDash":false},{"StartTime":41332.0,"Position":267.961151,"HyperDash":false},{"StartTime":41410.0,"Position":316.030029,"HyperDash":false},{"StartTime":41488.0,"Position":332.626129,"HyperDash":false},{"StartTime":41566.0,"Position":354.210022,"HyperDash":false},{"StartTime":41644.0,"Position":353.98996,"HyperDash":false},{"StartTime":41722.0,"Position":371.766144,"HyperDash":false},{"StartTime":41800.0,"Position":358.108276,"HyperDash":false},{"StartTime":41879.0,"Position":354.210022,"HyperDash":false},{"StartTime":41948.0,"Position":326.1343,"HyperDash":false},{"StartTime":42017.0,"Position":316.00824,"HyperDash":false},{"StartTime":42086.0,"Position":278.452332,"HyperDash":false},{"StartTime":42191.0,"Position":256.0,"HyperDash":false}]},{"StartTime":42504.0,"Objects":[{"StartTime":42504.0,"Position":98.0,"HyperDash":false},{"StartTime":42582.0,"Position":125.961151,"HyperDash":false},{"StartTime":42660.0,"Position":167.030014,"HyperDash":false},{"StartTime":42738.0,"Position":165.626129,"HyperDash":false},{"StartTime":42816.0,"Position":196.210022,"HyperDash":false},{"StartTime":42894.0,"Position":225.98996,"HyperDash":false},{"StartTime":42972.0,"Position":213.766159,"HyperDash":false},{"StartTime":43050.0,"Position":190.108276,"HyperDash":false},{"StartTime":43129.0,"Position":196.210022,"HyperDash":false},{"StartTime":43198.0,"Position":197.134308,"HyperDash":false},{"StartTime":43267.0,"Position":141.00824,"HyperDash":false},{"StartTime":43336.0,"Position":118.452332,"HyperDash":false},{"StartTime":43441.0,"Position":98.0,"HyperDash":false}]},{"StartTime":43754.0,"Objects":[{"StartTime":43754.0,"Position":249.0,"HyperDash":false},{"StartTime":43832.0,"Position":233.529724,"HyperDash":false},{"StartTime":43910.0,"Position":206.059448,"HyperDash":false},{"StartTime":43988.0,"Position":181.589172,"HyperDash":false},{"StartTime":44066.0,"Position":139.1189,"HyperDash":false},{"StartTime":44144.0,"Position":97.64862,"HyperDash":false},{"StartTime":44222.0,"Position":84.00227,"HyperDash":false},{"StartTime":44300.0,"Position":107.296448,"HyperDash":false},{"StartTime":44378.0,"Position":138.766724,"HyperDash":false},{"StartTime":44447.0,"Position":162.067352,"HyperDash":false},{"StartTime":44516.0,"Position":187.367981,"HyperDash":false},{"StartTime":44585.0,"Position":204.66861,"HyperDash":false},{"StartTime":44691.0,"Position":249.0,"HyperDash":false}]},{"StartTime":45004.0,"Objects":[{"StartTime":45004.0,"Position":466.0,"HyperDash":false},{"StartTime":45062.0,"Position":56.0,"HyperDash":false},{"StartTime":45121.0,"Position":109.0,"HyperDash":false},{"StartTime":45179.0,"Position":482.0,"HyperDash":false},{"StartTime":45238.0,"Position":147.0,"HyperDash":false},{"StartTime":45296.0,"Position":285.0,"HyperDash":false},{"StartTime":45355.0,"Position":452.0,"HyperDash":false},{"StartTime":45413.0,"Position":419.0,"HyperDash":false},{"StartTime":45472.0,"Position":269.0,"HyperDash":false},{"StartTime":45531.0,"Position":249.0,"HyperDash":false},{"StartTime":45589.0,"Position":233.0,"HyperDash":false},{"StartTime":45648.0,"Position":449.0,"HyperDash":false},{"StartTime":45706.0,"Position":411.0,"HyperDash":false},{"StartTime":45765.0,"Position":75.0,"HyperDash":false},{"StartTime":45823.0,"Position":474.0,"HyperDash":false},{"StartTime":45882.0,"Position":176.0,"HyperDash":false},{"StartTime":45941.0,"Position":1.0,"HyperDash":false}]},{"StartTime":46254.0,"Objects":[{"StartTime":46254.0,"Position":332.0,"HyperDash":false},{"StartTime":46332.0,"Position":341.35257,"HyperDash":false},{"StartTime":46410.0,"Position":382.281,"HyperDash":false},{"StartTime":46488.0,"Position":401.661774,"HyperDash":false},{"StartTime":46566.0,"Position":424.539063,"HyperDash":false},{"StartTime":46644.0,"Position":451.522461,"HyperDash":false},{"StartTime":46722.0,"Position":436.847626,"HyperDash":false},{"StartTime":46800.0,"Position":445.602142,"HyperDash":false},{"StartTime":46879.0,"Position":424.539063,"HyperDash":false},{"StartTime":46948.0,"Position":396.89386,"HyperDash":false},{"StartTime":47017.0,"Position":399.831055,"HyperDash":false},{"StartTime":47086.0,"Position":370.600555,"HyperDash":false},{"StartTime":47191.0,"Position":332.0,"HyperDash":false}]},{"StartTime":47504.0,"Objects":[{"StartTime":47504.0,"Position":180.0,"HyperDash":false},{"StartTime":47582.0,"Position":148.647415,"HyperDash":false},{"StartTime":47660.0,"Position":119.718979,"HyperDash":false},{"StartTime":47738.0,"Position":115.338226,"HyperDash":false},{"StartTime":47816.0,"Position":87.4609146,"HyperDash":false},{"StartTime":47894.0,"Position":96.4775,"HyperDash":false},{"StartTime":47972.0,"Position":75.15235,"HyperDash":false},{"StartTime":48050.0,"Position":64.3978348,"HyperDash":false},{"StartTime":48129.0,"Position":87.4609146,"HyperDash":false},{"StartTime":48198.0,"Position":116.106155,"HyperDash":false},{"StartTime":48267.0,"Position":126.168938,"HyperDash":false},{"StartTime":48336.0,"Position":133.399445,"HyperDash":false},{"StartTime":48441.0,"Position":180.0,"HyperDash":false}]},{"StartTime":48754.0,"Objects":[{"StartTime":48754.0,"Position":335.0,"HyperDash":false},{"StartTime":48832.0,"Position":313.529724,"HyperDash":false},{"StartTime":48910.0,"Position":282.059448,"HyperDash":false},{"StartTime":48988.0,"Position":233.589188,"HyperDash":false},{"StartTime":49066.0,"Position":225.118927,"HyperDash":false},{"StartTime":49144.0,"Position":202.648651,"HyperDash":false},{"StartTime":49222.0,"Position":170.002289,"HyperDash":false},{"StartTime":49300.0,"Position":213.296478,"HyperDash":false},{"StartTime":49379.0,"Position":225.118927,"HyperDash":false},{"StartTime":49448.0,"Position":239.41954,"HyperDash":false},{"StartTime":49517.0,"Position":280.720154,"HyperDash":false},{"StartTime":49586.0,"Position":280.020782,"HyperDash":false},{"StartTime":49691.0,"Position":335.0,"HyperDash":false}]},{"StartTime":50004.0,"Objects":[{"StartTime":50004.0,"Position":93.0,"HyperDash":false},{"StartTime":50062.0,"Position":267.0,"HyperDash":false},{"StartTime":50121.0,"Position":276.0,"HyperDash":false},{"StartTime":50179.0,"Position":367.0,"HyperDash":false},{"StartTime":50238.0,"Position":409.0,"HyperDash":false},{"StartTime":50296.0,"Position":117.0,"HyperDash":false},{"StartTime":50355.0,"Position":226.0,"HyperDash":false},{"StartTime":50413.0,"Position":469.0,"HyperDash":false},{"StartTime":50472.0,"Position":267.0,"HyperDash":false},{"StartTime":50531.0,"Position":477.0,"HyperDash":false},{"StartTime":50589.0,"Position":282.0,"HyperDash":false},{"StartTime":50648.0,"Position":216.0,"HyperDash":false},{"StartTime":50706.0,"Position":106.0,"HyperDash":false},{"StartTime":50765.0,"Position":353.0,"HyperDash":false},{"StartTime":50823.0,"Position":162.0,"HyperDash":false},{"StartTime":50882.0,"Position":473.0,"HyperDash":false},{"StartTime":50941.0,"Position":260.0,"HyperDash":false}]},{"StartTime":51254.0,"Objects":[{"StartTime":51254.0,"Position":119.0,"HyperDash":false},{"StartTime":51353.0,"Position":121.8725,"HyperDash":false},{"StartTime":51488.0,"Position":106.880455,"HyperDash":false}]},{"StartTime":51722.0,"Objects":[{"StartTime":51722.0,"Position":230.0,"HyperDash":false},{"StartTime":51800.0,"Position":213.529388,"HyperDash":false},{"StartTime":51878.0,"Position":222.058777,"HyperDash":false},{"StartTime":51956.0,"Position":243.588165,"HyperDash":false},{"StartTime":52034.0,"Position":244.117569,"HyperDash":false},{"StartTime":52094.0,"Position":256.8325,"HyperDash":false},{"StartTime":52190.0,"Position":251.176346,"HyperDash":false}]},{"StartTime":52504.0,"Objects":[{"StartTime":52504.0,"Position":373.0,"HyperDash":false},{"StartTime":52603.0,"Position":384.1275,"HyperDash":false},{"StartTime":52738.0,"Position":385.119537,"HyperDash":false}]},{"StartTime":52972.0,"Objects":[{"StartTime":52972.0,"Position":269.0,"HyperDash":false},{"StartTime":53050.0,"Position":243.9549,"HyperDash":false},{"StartTime":53128.0,"Position":227.363922,"HyperDash":false},{"StartTime":53206.0,"Position":246.705673,"HyperDash":false},{"StartTime":53284.0,"Position":238.662781,"HyperDash":false},{"StartTime":53344.0,"Position":267.1444,"HyperDash":false},{"StartTime":53440.0,"Position":274.832428,"HyperDash":false}]},{"StartTime":53754.0,"Objects":[{"StartTime":53754.0,"Position":424.0,"HyperDash":false},{"StartTime":53853.0,"Position":394.183075,"HyperDash":false},{"StartTime":53988.0,"Position":341.705444,"HyperDash":false}]},{"StartTime":54222.0,"Objects":[{"StartTime":54222.0,"Position":228.0,"HyperDash":false},{"StartTime":54300.0,"Position":248.405014,"HyperDash":false},{"StartTime":54378.0,"Position":299.810028,"HyperDash":false},{"StartTime":54456.0,"Position":312.215027,"HyperDash":false},{"StartTime":54534.0,"Position":337.620056,"HyperDash":false},{"StartTime":54594.0,"Position":374.7008,"HyperDash":false},{"StartTime":54690.0,"Position":392.430054,"HyperDash":false}]},{"StartTime":55004.0,"Objects":[{"StartTime":55004.0,"Position":241.0,"HyperDash":false},{"StartTime":55103.0,"Position":294.816925,"HyperDash":false},{"StartTime":55238.0,"Position":323.294556,"HyperDash":false}]},{"StartTime":55472.0,"Objects":[{"StartTime":55472.0,"Position":437.0,"HyperDash":false},{"StartTime":55550.0,"Position":398.595,"HyperDash":false},{"StartTime":55628.0,"Position":394.189972,"HyperDash":false},{"StartTime":55706.0,"Position":340.784973,"HyperDash":false},{"StartTime":55784.0,"Position":327.379944,"HyperDash":false},{"StartTime":55844.0,"Position":318.2992,"HyperDash":false},{"StartTime":55940.0,"Position":272.569946,"HyperDash":false}]},{"StartTime":56254.0,"Objects":[{"StartTime":56254.0,"Position":3.0,"HyperDash":false}]},{"StartTime":56488.0,"Objects":[{"StartTime":56488.0,"Position":260.0,"HyperDash":false},{"StartTime":56587.0,"Position":252.118042,"HyperDash":false},{"StartTime":56722.0,"Position":269.733521,"HyperDash":false}]},{"StartTime":56957.0,"Objects":[{"StartTime":56957.0,"Position":162.0,"HyperDash":false},{"StartTime":57056.0,"Position":138.870941,"HyperDash":false},{"StartTime":57191.0,"Position":81.3313,"HyperDash":false}]},{"StartTime":57504.0,"Objects":[{"StartTime":57504.0,"Position":402.0,"HyperDash":false}]},{"StartTime":57738.0,"Objects":[{"StartTime":57738.0,"Position":363.0,"HyperDash":false},{"StartTime":57837.0,"Position":344.432251,"HyperDash":false},{"StartTime":57972.0,"Position":281.2944,"HyperDash":false}]},{"StartTime":58207.0,"Objects":[{"StartTime":58207.0,"Position":174.0,"HyperDash":false},{"StartTime":58306.0,"Position":158.870941,"HyperDash":false},{"StartTime":58441.0,"Position":93.3313,"HyperDash":false}]},{"StartTime":58754.0,"Objects":[{"StartTime":58754.0,"Position":261.0,"HyperDash":false},{"StartTime":58832.0,"Position":243.6731,"HyperDash":false},{"StartTime":58910.0,"Position":205.346176,"HyperDash":false},{"StartTime":58988.0,"Position":162.019257,"HyperDash":false},{"StartTime":59066.0,"Position":151.692352,"HyperDash":false},{"StartTime":59144.0,"Position":119.365463,"HyperDash":false},{"StartTime":59222.0,"Position":96.86337,"HyperDash":false},{"StartTime":59300.0,"Position":110.015121,"HyperDash":false},{"StartTime":59379.0,"Position":151.692352,"HyperDash":false},{"StartTime":59448.0,"Position":182.866165,"HyperDash":false},{"StartTime":59517.0,"Position":214.039978,"HyperDash":false},{"StartTime":59586.0,"Position":217.213776,"HyperDash":false},{"StartTime":59691.0,"Position":261.0,"HyperDash":false}]},{"StartTime":60004.0,"Objects":[{"StartTime":60004.0,"Position":456.0,"HyperDash":false},{"StartTime":60062.0,"Position":371.0,"HyperDash":false},{"StartTime":60121.0,"Position":73.0,"HyperDash":false},{"StartTime":60179.0,"Position":190.0,"HyperDash":false},{"StartTime":60238.0,"Position":180.0,"HyperDash":false},{"StartTime":60296.0,"Position":461.0,"HyperDash":false},{"StartTime":60355.0,"Position":433.0,"HyperDash":false},{"StartTime":60413.0,"Position":275.0,"HyperDash":false},{"StartTime":60472.0,"Position":395.0,"HyperDash":false},{"StartTime":60531.0,"Position":473.0,"HyperDash":false},{"StartTime":60589.0,"Position":192.0,"HyperDash":false},{"StartTime":60648.0,"Position":362.0,"HyperDash":false},{"StartTime":60706.0,"Position":7.0,"HyperDash":false},{"StartTime":60765.0,"Position":500.0,"HyperDash":false},{"StartTime":60823.0,"Position":487.0,"HyperDash":false},{"StartTime":60882.0,"Position":487.0,"HyperDash":false},{"StartTime":60941.0,"Position":213.0,"HyperDash":false}]},{"StartTime":71254.0,"Objects":[{"StartTime":71254.0,"Position":258.0,"HyperDash":false}]},{"StartTime":71722.0,"Objects":[{"StartTime":71722.0,"Position":69.0,"HyperDash":false},{"StartTime":71800.0,"Position":67.48298,"HyperDash":false},{"StartTime":71878.0,"Position":70.96595,"HyperDash":false},{"StartTime":71956.0,"Position":82.44893,"HyperDash":false},{"StartTime":72034.0,"Position":62.9319038,"HyperDash":false},{"StartTime":72094.0,"Position":61.76496,"HyperDash":false},{"StartTime":72190.0,"Position":59.8978577,"HyperDash":false}]},{"StartTime":72504.0,"Objects":[{"StartTime":72504.0,"Position":381.0,"HyperDash":false}]},{"StartTime":73754.0,"Objects":[{"StartTime":73754.0,"Position":254.0,"HyperDash":false}]},{"StartTime":74222.0,"Objects":[{"StartTime":74222.0,"Position":443.0,"HyperDash":false},{"StartTime":74300.0,"Position":452.517029,"HyperDash":false},{"StartTime":74378.0,"Position":430.034058,"HyperDash":false},{"StartTime":74456.0,"Position":439.5511,"HyperDash":false},{"StartTime":74534.0,"Position":449.068085,"HyperDash":false},{"StartTime":74594.0,"Position":435.235046,"HyperDash":false},{"StartTime":74690.0,"Position":452.102142,"HyperDash":false}]},{"StartTime":75004.0,"Objects":[{"StartTime":75004.0,"Position":131.0,"HyperDash":false}]},{"StartTime":76254.0,"Objects":[{"StartTime":76254.0,"Position":136.0,"HyperDash":false}]},{"StartTime":76722.0,"Objects":[{"StartTime":76722.0,"Position":349.0,"HyperDash":false},{"StartTime":76800.0,"Position":304.5004,"HyperDash":false},{"StartTime":76878.0,"Position":313.000824,"HyperDash":false},{"StartTime":76956.0,"Position":264.501221,"HyperDash":false},{"StartTime":77034.0,"Position":239.001617,"HyperDash":false},{"StartTime":77094.0,"Position":209.848083,"HyperDash":false},{"StartTime":77190.0,"Position":184.002426,"HyperDash":false}]},{"StartTime":77504.0,"Objects":[{"StartTime":77504.0,"Position":350.0,"HyperDash":false}]},{"StartTime":78754.0,"Objects":[{"StartTime":78754.0,"Position":376.0,"HyperDash":false}]},{"StartTime":79222.0,"Objects":[{"StartTime":79222.0,"Position":163.0,"HyperDash":false},{"StartTime":79300.0,"Position":186.499588,"HyperDash":false},{"StartTime":79378.0,"Position":226.999191,"HyperDash":false},{"StartTime":79456.0,"Position":256.498779,"HyperDash":false},{"StartTime":79534.0,"Position":272.998383,"HyperDash":false},{"StartTime":79594.0,"Position":280.151917,"HyperDash":false},{"StartTime":79690.0,"Position":327.997559,"HyperDash":false}]},{"StartTime":80004.0,"Objects":[{"StartTime":80004.0,"Position":11.0,"HyperDash":false}]},{"StartTime":80316.0,"Objects":[{"StartTime":80316.0,"Position":165.0,"HyperDash":false}]},{"StartTime":80629.0,"Objects":[{"StartTime":80629.0,"Position":11.0,"HyperDash":false}]},{"StartTime":80941.0,"Objects":[{"StartTime":80941.0,"Position":192.0,"HyperDash":false}]},{"StartTime":81254.0,"Objects":[{"StartTime":81254.0,"Position":336.0,"HyperDash":false},{"StartTime":81323.0,"Position":296.6767,"HyperDash":false},{"StartTime":81392.0,"Position":293.3534,"HyperDash":false},{"StartTime":81461.0,"Position":281.03006,"HyperDash":false},{"StartTime":81566.0,"Position":226.016357,"HyperDash":false}]},{"StartTime":81879.0,"Objects":[{"StartTime":81879.0,"Position":366.0,"HyperDash":false},{"StartTime":81948.0,"Position":396.3233,"HyperDash":false},{"StartTime":82017.0,"Position":429.6466,"HyperDash":false},{"StartTime":82086.0,"Position":448.96994,"HyperDash":false},{"StartTime":82191.0,"Position":475.983643,"HyperDash":false}]},{"StartTime":82504.0,"Objects":[{"StartTime":82504.0,"Position":156.0,"HyperDash":false}]},{"StartTime":82816.0,"Objects":[{"StartTime":82816.0,"Position":292.0,"HyperDash":false}]},{"StartTime":83129.0,"Objects":[{"StartTime":83129.0,"Position":100.0,"HyperDash":false}]},{"StartTime":83441.0,"Objects":[{"StartTime":83441.0,"Position":248.0,"HyperDash":false}]},{"StartTime":83754.0,"Objects":[{"StartTime":83754.0,"Position":390.0,"HyperDash":false},{"StartTime":83832.0,"Position":372.544983,"HyperDash":false},{"StartTime":83910.0,"Position":344.089935,"HyperDash":false},{"StartTime":83988.0,"Position":308.634918,"HyperDash":false},{"StartTime":84066.0,"Position":280.003876,"HyperDash":false},{"StartTime":84135.0,"Position":301.115051,"HyperDash":false},{"StartTime":84204.0,"Position":341.4022,"HyperDash":false},{"StartTime":84273.0,"Position":359.6893,"HyperDash":false},{"StartTime":84379.0,"Position":390.0,"HyperDash":false}]},{"StartTime":85004.0,"Objects":[{"StartTime":85004.0,"Position":104.0,"HyperDash":false}]},{"StartTime":86254.0,"Objects":[{"StartTime":86254.0,"Position":324.0,"HyperDash":false}]},{"StartTime":86566.0,"Objects":[{"StartTime":86566.0,"Position":422.0,"HyperDash":false}]},{"StartTime":86879.0,"Objects":[{"StartTime":86879.0,"Position":470.0,"HyperDash":false}]},{"StartTime":87191.0,"Objects":[{"StartTime":87191.0,"Position":352.0,"HyperDash":false}]},{"StartTime":87504.0,"Objects":[{"StartTime":87504.0,"Position":287.0,"HyperDash":false},{"StartTime":87573.0,"Position":317.323242,"HyperDash":false},{"StartTime":87642.0,"Position":340.646484,"HyperDash":false},{"StartTime":87711.0,"Position":343.969727,"HyperDash":false},{"StartTime":87816.0,"Position":396.983368,"HyperDash":false}]},{"StartTime":88129.0,"Objects":[{"StartTime":88129.0,"Position":265.0,"HyperDash":false},{"StartTime":88198.0,"Position":237.676239,"HyperDash":false},{"StartTime":88267.0,"Position":223.352478,"HyperDash":false},{"StartTime":88336.0,"Position":206.028717,"HyperDash":false},{"StartTime":88441.0,"Position":155.014313,"HyperDash":false}]},{"StartTime":88754.0,"Objects":[{"StartTime":88754.0,"Position":475.0,"HyperDash":false}]},{"StartTime":89066.0,"Objects":[{"StartTime":89066.0,"Position":341.0,"HyperDash":false}]},{"StartTime":89379.0,"Objects":[{"StartTime":89379.0,"Position":432.0,"HyperDash":false}]},{"StartTime":89691.0,"Objects":[{"StartTime":89691.0,"Position":264.0,"HyperDash":false}]},{"StartTime":90004.0,"Objects":[{"StartTime":90004.0,"Position":255.0,"HyperDash":false},{"StartTime":90062.0,"Position":294.0,"HyperDash":false},{"StartTime":90121.0,"Position":354.0,"HyperDash":false},{"StartTime":90179.0,"Position":270.0,"HyperDash":false},{"StartTime":90238.0,"Position":362.0,"HyperDash":false},{"StartTime":90296.0,"Position":255.0,"HyperDash":false},{"StartTime":90355.0,"Position":203.0,"HyperDash":false},{"StartTime":90413.0,"Position":67.0,"HyperDash":false},{"StartTime":90472.0,"Position":112.0,"HyperDash":false},{"StartTime":90531.0,"Position":326.0,"HyperDash":false},{"StartTime":90589.0,"Position":219.0,"HyperDash":false},{"StartTime":90648.0,"Position":351.0,"HyperDash":false},{"StartTime":90706.0,"Position":477.0,"HyperDash":false},{"StartTime":90765.0,"Position":439.0,"HyperDash":false},{"StartTime":90823.0,"Position":471.0,"HyperDash":false},{"StartTime":90882.0,"Position":449.0,"HyperDash":false},{"StartTime":90941.0,"Position":295.0,"HyperDash":false}]},{"StartTime":91254.0,"Objects":[{"StartTime":91254.0,"Position":140.0,"HyperDash":false},{"StartTime":91332.0,"Position":109.180054,"HyperDash":false},{"StartTime":91410.0,"Position":88.36357,"HyperDash":false},{"StartTime":91488.0,"Position":92.07944,"HyperDash":false},{"StartTime":91566.0,"Position":69.79061,"HyperDash":false},{"StartTime":91635.0,"Position":78.01627,"HyperDash":false},{"StartTime":91704.0,"Position":103.148987,"HyperDash":false},{"StartTime":91773.0,"Position":121.717133,"HyperDash":false},{"StartTime":91878.0,"Position":140.090958,"HyperDash":false}]},{"StartTime":92191.0,"Objects":[{"StartTime":92191.0,"Position":380.0,"HyperDash":false}]},{"StartTime":92504.0,"Objects":[{"StartTime":92504.0,"Position":405.0,"HyperDash":false},{"StartTime":92573.0,"Position":381.6738,"HyperDash":false},{"StartTime":92642.0,"Position":369.347565,"HyperDash":false},{"StartTime":92711.0,"Position":341.021362,"HyperDash":false},{"StartTime":92816.0,"Position":295.0032,"HyperDash":false}]},{"StartTime":93129.0,"Objects":[{"StartTime":93129.0,"Position":154.0,"HyperDash":false},{"StartTime":93198.0,"Position":177.324478,"HyperDash":false},{"StartTime":93267.0,"Position":215.648956,"HyperDash":false},{"StartTime":93336.0,"Position":211.973434,"HyperDash":false},{"StartTime":93441.0,"Position":263.988922,"HyperDash":false}]},{"StartTime":93754.0,"Objects":[{"StartTime":93754.0,"Position":135.0,"HyperDash":false},{"StartTime":93832.0,"Position":153.455765,"HyperDash":false},{"StartTime":93910.0,"Position":177.911545,"HyperDash":false},{"StartTime":93988.0,"Position":219.36731,"HyperDash":false},{"StartTime":94066.0,"Position":244.82309,"HyperDash":false},{"StartTime":94135.0,"Position":274.1109,"HyperDash":false},{"StartTime":94204.0,"Position":309.398682,"HyperDash":false},{"StartTime":94273.0,"Position":297.686462,"HyperDash":false},{"StartTime":94379.0,"Position":354.998169,"HyperDash":false}]},{"StartTime":94691.0,"Objects":[{"StartTime":94691.0,"Position":98.0,"HyperDash":false}]},{"StartTime":95004.0,"Objects":[{"StartTime":95004.0,"Position":354.0,"HyperDash":false},{"StartTime":95073.0,"Position":330.775818,"HyperDash":false},{"StartTime":95142.0,"Position":308.551636,"HyperDash":false},{"StartTime":95211.0,"Position":298.327454,"HyperDash":false},{"StartTime":95316.0,"Position":244.464569,"HyperDash":false}]},{"StartTime":95629.0,"Objects":[{"StartTime":95629.0,"Position":97.0,"HyperDash":false},{"StartTime":95698.0,"Position":100.173164,"HyperDash":false},{"StartTime":95767.0,"Position":91.34632,"HyperDash":false},{"StartTime":95836.0,"Position":85.5194855,"HyperDash":false},{"StartTime":95941.0,"Position":79.69604,"HyperDash":false}]},{"StartTime":96254.0,"Objects":[{"StartTime":96254.0,"Position":238.0,"HyperDash":false},{"StartTime":96332.0,"Position":263.193329,"HyperDash":false},{"StartTime":96410.0,"Position":297.398376,"HyperDash":false},{"StartTime":96488.0,"Position":296.3632,"HyperDash":false},{"StartTime":96566.0,"Position":315.395416,"HyperDash":false},{"StartTime":96635.0,"Position":328.299622,"HyperDash":false},{"StartTime":96704.0,"Position":295.141235,"HyperDash":false},{"StartTime":96773.0,"Position":274.06,"HyperDash":false},{"StartTime":96878.0,"Position":241.776031,"HyperDash":false}]},{"StartTime":97191.0,"Objects":[{"StartTime":97191.0,"Position":497.0,"HyperDash":false}]},{"StartTime":97504.0,"Objects":[{"StartTime":97504.0,"Position":252.0,"HyperDash":false},{"StartTime":97582.0,"Position":214.922928,"HyperDash":false},{"StartTime":97660.0,"Position":177.845856,"HyperDash":false},{"StartTime":97738.0,"Position":185.7688,"HyperDash":false},{"StartTime":97816.0,"Position":143.518143,"HyperDash":false},{"StartTime":97885.0,"Position":175.297363,"HyperDash":false},{"StartTime":97954.0,"Position":187.250168,"HyperDash":false},{"StartTime":98023.0,"Position":222.202957,"HyperDash":false},{"StartTime":98129.0,"Position":252.0,"HyperDash":false}]},{"StartTime":98441.0,"Objects":[{"StartTime":98441.0,"Position":363.0,"HyperDash":false}]},{"StartTime":98754.0,"Objects":[{"StartTime":98754.0,"Position":223.0,"HyperDash":false},{"StartTime":98823.0,"Position":195.875366,"HyperDash":false},{"StartTime":98892.0,"Position":193.750732,"HyperDash":false},{"StartTime":98961.0,"Position":151.626083,"HyperDash":false},{"StartTime":99066.0,"Position":113.914696,"HyperDash":false}]},{"StartTime":99379.0,"Objects":[{"StartTime":99379.0,"Position":494.0,"HyperDash":false}]},{"StartTime":99691.0,"Objects":[{"StartTime":99691.0,"Position":298.0,"HyperDash":false}]},{"StartTime":100004.0,"Objects":[{"StartTime":100004.0,"Position":236.0,"HyperDash":false},{"StartTime":100082.0,"Position":203.256851,"HyperDash":false},{"StartTime":100160.0,"Position":168.009674,"HyperDash":false},{"StartTime":100238.0,"Position":177.094879,"HyperDash":false},{"StartTime":100316.0,"Position":141.201492,"HyperDash":false},{"StartTime":100385.0,"Position":127.635262,"HyperDash":false},{"StartTime":100454.0,"Position":110.29274,"HyperDash":false},{"StartTime":100523.0,"Position":110.453743,"HyperDash":false},{"StartTime":100628.0,"Position":102.687973,"HyperDash":false}]},{"StartTime":100941.0,"Objects":[{"StartTime":100941.0,"Position":349.0,"HyperDash":false}]},{"StartTime":101254.0,"Objects":[{"StartTime":101254.0,"Position":383.0,"HyperDash":false},{"StartTime":101332.0,"Position":419.957733,"HyperDash":false},{"StartTime":101410.0,"Position":426.299622,"HyperDash":false},{"StartTime":101488.0,"Position":445.490662,"HyperDash":false},{"StartTime":101566.0,"Position":455.829254,"HyperDash":false},{"StartTime":101635.0,"Position":451.601563,"HyperDash":false},{"StartTime":101704.0,"Position":456.379,"HyperDash":false},{"StartTime":101773.0,"Position":416.516266,"HyperDash":false},{"StartTime":101879.0,"Position":388.265564,"HyperDash":false}]},{"StartTime":102191.0,"Objects":[{"StartTime":102191.0,"Position":135.0,"HyperDash":false}]},{"StartTime":102504.0,"Objects":[{"StartTime":102504.0,"Position":123.0,"HyperDash":false},{"StartTime":102573.0,"Position":136.53656,"HyperDash":false},{"StartTime":102642.0,"Position":127.073128,"HyperDash":false},{"StartTime":102711.0,"Position":116.609695,"HyperDash":false},{"StartTime":102816.0,"Position":107.339249,"HyperDash":false}]},{"StartTime":103129.0,"Objects":[{"StartTime":103129.0,"Position":252.0,"HyperDash":false},{"StartTime":103198.0,"Position":284.326935,"HyperDash":false},{"StartTime":103267.0,"Position":309.653839,"HyperDash":false},{"StartTime":103336.0,"Position":338.980774,"HyperDash":false},{"StartTime":103441.0,"Position":362.0,"HyperDash":false}]},{"StartTime":103754.0,"Objects":[{"StartTime":103754.0,"Position":215.0,"HyperDash":false},{"StartTime":103832.0,"Position":174.651,"HyperDash":false},{"StartTime":103910.0,"Position":155.666367,"HyperDash":false},{"StartTime":103988.0,"Position":122.457794,"HyperDash":false},{"StartTime":104066.0,"Position":113.4155,"HyperDash":false},{"StartTime":104135.0,"Position":85.44563,"HyperDash":false},{"StartTime":104204.0,"Position":103.505188,"HyperDash":false},{"StartTime":104273.0,"Position":78.09056,"HyperDash":false},{"StartTime":104379.0,"Position":76.11086,"HyperDash":false}]},{"StartTime":104691.0,"Objects":[{"StartTime":104691.0,"Position":353.0,"HyperDash":false}]},{"StartTime":105004.0,"Objects":[{"StartTime":105004.0,"Position":359.0,"HyperDash":false},{"StartTime":105073.0,"Position":360.169861,"HyperDash":false},{"StartTime":105142.0,"Position":374.3397,"HyperDash":false},{"StartTime":105211.0,"Position":369.509552,"HyperDash":false},{"StartTime":105316.0,"Position":368.8115,"HyperDash":false}]},{"StartTime":105629.0,"Objects":[{"StartTime":105629.0,"Position":215.0,"HyperDash":false},{"StartTime":105698.0,"Position":245.2746,"HyperDash":false},{"StartTime":105767.0,"Position":263.5492,"HyperDash":false},{"StartTime":105836.0,"Position":298.8238,"HyperDash":false},{"StartTime":105941.0,"Position":324.7634,"HyperDash":false}]},{"StartTime":106254.0,"Objects":[{"StartTime":106254.0,"Position":164.0,"HyperDash":false},{"StartTime":106332.0,"Position":181.330521,"HyperDash":false},{"StartTime":106410.0,"Position":231.661041,"HyperDash":false},{"StartTime":106488.0,"Position":258.991547,"HyperDash":false},{"StartTime":106566.0,"Position":273.322083,"HyperDash":false},{"StartTime":106635.0,"Position":308.499084,"HyperDash":false},{"StartTime":106704.0,"Position":315.6761,"HyperDash":false},{"StartTime":106773.0,"Position":330.8531,"HyperDash":false},{"StartTime":106878.0,"Position":382.644135,"HyperDash":false}]},{"StartTime":107191.0,"Objects":[{"StartTime":107191.0,"Position":64.0,"HyperDash":false}]},{"StartTime":107504.0,"Objects":[{"StartTime":107504.0,"Position":390.0,"HyperDash":false},{"StartTime":107582.0,"Position":367.983734,"HyperDash":false},{"StartTime":107660.0,"Position":346.967468,"HyperDash":false},{"StartTime":107738.0,"Position":308.9512,"HyperDash":false},{"StartTime":107816.0,"Position":281.934967,"HyperDash":false},{"StartTime":107885.0,"Position":292.833954,"HyperDash":false},{"StartTime":107954.0,"Position":315.732941,"HyperDash":false},{"StartTime":108023.0,"Position":344.631958,"HyperDash":false},{"StartTime":108128.0,"Position":390.0,"HyperDash":false}]},{"StartTime":108441.0,"Objects":[{"StartTime":108441.0,"Position":219.0,"HyperDash":false}]},{"StartTime":108754.0,"Objects":[{"StartTime":108754.0,"Position":99.0,"HyperDash":false},{"StartTime":108823.0,"Position":80.78087,"HyperDash":false},{"StartTime":108892.0,"Position":79.56174,"HyperDash":false},{"StartTime":108961.0,"Position":79.34261,"HyperDash":false},{"StartTime":109066.0,"Position":88.9656754,"HyperDash":false}]},{"StartTime":109379.0,"Objects":[{"StartTime":109379.0,"Position":228.0,"HyperDash":false},{"StartTime":109448.0,"Position":259.2614,"HyperDash":false},{"StartTime":109517.0,"Position":268.522858,"HyperDash":false},{"StartTime":109586.0,"Position":318.7843,"HyperDash":false},{"StartTime":109691.0,"Position":337.703827,"HyperDash":false}]},{"StartTime":110004.0,"Objects":[{"StartTime":110004.0,"Position":183.0,"HyperDash":false},{"StartTime":110082.0,"Position":220.45372,"HyperDash":false},{"StartTime":110160.0,"Position":245.90744,"HyperDash":false},{"StartTime":110238.0,"Position":248.361145,"HyperDash":false},{"StartTime":110316.0,"Position":292.81488,"HyperDash":false},{"StartTime":110385.0,"Position":310.10083,"HyperDash":false},{"StartTime":110454.0,"Position":355.386841,"HyperDash":false},{"StartTime":110523.0,"Position":350.6728,"HyperDash":false},{"StartTime":110628.0,"Position":402.6297,"HyperDash":false}]},{"StartTime":110941.0,"Objects":[{"StartTime":110941.0,"Position":108.0,"HyperDash":false}]},{"StartTime":111254.0,"Objects":[{"StartTime":111254.0,"Position":114.0,"HyperDash":false},{"StartTime":111323.0,"Position":102.780869,"HyperDash":false},{"StartTime":111392.0,"Position":118.561737,"HyperDash":false},{"StartTime":111461.0,"Position":104.342613,"HyperDash":false},{"StartTime":111566.0,"Position":103.965675,"HyperDash":false}]},{"StartTime":111879.0,"Objects":[{"StartTime":111879.0,"Position":243.0,"HyperDash":false},{"StartTime":111948.0,"Position":284.2614,"HyperDash":false},{"StartTime":112017.0,"Position":284.522858,"HyperDash":false},{"StartTime":112086.0,"Position":327.7843,"HyperDash":false},{"StartTime":112191.0,"Position":352.703827,"HyperDash":false}]},{"StartTime":112504.0,"Objects":[{"StartTime":112504.0,"Position":198.0,"HyperDash":false},{"StartTime":112582.0,"Position":234.45372,"HyperDash":false},{"StartTime":112660.0,"Position":250.90744,"HyperDash":false},{"StartTime":112738.0,"Position":271.361145,"HyperDash":false},{"StartTime":112816.0,"Position":307.81488,"HyperDash":false},{"StartTime":112885.0,"Position":345.10083,"HyperDash":false},{"StartTime":112954.0,"Position":347.386841,"HyperDash":false},{"StartTime":113023.0,"Position":393.6728,"HyperDash":false},{"StartTime":113128.0,"Position":417.6297,"HyperDash":false}]},{"StartTime":113441.0,"Objects":[{"StartTime":113441.0,"Position":123.0,"HyperDash":false}]},{"StartTime":113754.0,"Objects":[{"StartTime":113754.0,"Position":151.0,"HyperDash":false}]},{"StartTime":113910.0,"Objects":[{"StartTime":113910.0,"Position":103.0,"HyperDash":false}]},{"StartTime":114379.0,"Objects":[{"StartTime":114379.0,"Position":314.0,"HyperDash":false},{"StartTime":114478.0,"Position":299.4618,"HyperDash":false},{"StartTime":114613.0,"Position":319.818817,"HyperDash":false}]},{"StartTime":114847.0,"Objects":[{"StartTime":114847.0,"Position":211.0,"HyperDash":false},{"StartTime":114925.0,"Position":253.437714,"HyperDash":false},{"StartTime":115003.0,"Position":252.875427,"HyperDash":false},{"StartTime":115081.0,"Position":297.313171,"HyperDash":false},{"StartTime":115159.0,"Position":320.7509,"HyperDash":false},{"StartTime":115219.0,"Position":346.8568,"HyperDash":false},{"StartTime":115315.0,"Position":375.6263,"HyperDash":false}]},{"StartTime":115629.0,"Objects":[{"StartTime":115629.0,"Position":141.0,"HyperDash":false}]},{"StartTime":115941.0,"Objects":[{"StartTime":115941.0,"Position":407.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2571731.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2571731.osu
new file mode 100644
index 0000000000..bef278e769
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2571731.osu
@@ -0,0 +1,277 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:2
+CircleSize:2
+OverallDifficulty:6
+ApproachRate:6
+SliderMultiplier:1.1
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+//Break Periods
+2,61250,70204
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+4,312.5,4,2,1,70,1,0
+7425,-100,4,2,1,75,0,0
+8754,-100,4,2,1,80,0,0
+9379,-100,4,2,1,80,0,0
+10004,-100,4,2,1,40,0,0
+10472,-100,4,2,1,55,0,0
+10629,-100,4,2,1,65,0,0
+10941,-100,4,2,1,70,0,0
+11254,-100,4,2,3,65,0,0
+12504,-100,4,2,3,65,0,0
+21254,-100,4,2,1,70,0,0
+30629,-100,4,2,1,70,0,0
+30941,-100,4,2,1,70,0,0
+31254,-100,4,2,1,70,0,0
+32191,-100,4,2,1,70,0,0
+32504,-100,4,2,1,70,0,0
+35629,-100,4,2,1,70,0,0
+36254,-100,4,2,1,70,0,0
+37035,-100,4,2,1,70,0,0
+37504,-100,4,2,1,70,0,0
+41722,-100,4,2,1,70,0,0
+42504,-100,4,2,1,70,0,0
+42816,-100,4,2,1,70,0,0
+43754,-100,4,2,1,70,0,0
+44222,-100,4,2,1,70,0,0
+44691,-100,4,2,1,70,0,0
+45004,-100,4,2,1,70,0,0
+45941,-100,4,2,1,70,0,0
+46254,-100,4,2,1,70,0,0
+46722,-100,4,2,1,70,0,0
+47504,-100,4,2,1,70,0,0
+47816,-100,4,2,1,70,0,0
+48441,-100,4,2,1,70,0,0
+48754,-100,4,2,1,70,0,0
+49222,-100,4,2,1,70,0,0
+50004,-100,4,2,1,70,0,0
+50082,-100,4,2,1,25,0,0
+50160,-100,4,2,1,25,0,0
+50238,-100,4,2,1,25,0,0
+50316,-100,4,2,1,25,0,0
+50394,-100,4,2,1,25,0,0
+50472,-100,4,2,1,25,0,0
+50550,-100,4,2,1,25,0,0
+50629,-100,4,2,1,25,0,0
+50707,-100,4,2,1,25,0,0
+50785,-100,4,2,1,25,0,0
+50863,-100,4,2,1,25,0,0
+50941,-100,4,2,1,70,0,0
+51254,-100,4,2,1,70,0,0
+53754,-100,4,2,1,70,0,0
+55004,-100,4,2,1,70,0,0
+56722,-100,4,2,1,70,0,0
+57972,-100,4,2,1,70,0,0
+58754,-100,4,2,1,70,0,0
+59847,-100,4,1,1,65,0,0
+71254,-100,4,2,1,70,0,0
+81254,-100,4,2,1,70,0,0
+83754,-100,4,2,1,70,0,0
+86254,-100,4,2,1,70,0,0
+87504,-100,4,2,1,70,0,0
+91254,-100,4,2,1,70,0,1
+93754,-100,4,2,1,70,0,1
+95004,-100,4,2,1,70,0,1
+100004,-100,4,2,1,70,0,1
+100550,-100,4,2,1,70,0,1
+100941,-100,4,2,1,70,0,1
+103754,-100,4,2,1,70,0,1
+105004,-100,4,2,1,70,0,1
+108754,-100,4,2,1,70,0,1
+110004,-100,4,2,1,70,0,1
+110629,-100,4,2,1,70,0,1
+112504,-100,4,2,1,70,0,1
+113129,-100,4,2,1,70,0,1
+113754,-100,4,2,1,70,0,1
+114379,-100,4,2,1,70,0,1
+114847,-100,4,2,1,70,0,1
+115863,-100,4,2,1,70,0,0
+115941,-100,4,2,1,70,0,1
+116019,-100,4,2,1,70,0,0
+
+[HitObjects]
+229,264,1254,6,0,P|161:183|254:125,1,220,4|8,1:2|0:0,0:0:0:0:
+362,120,2191,1,2,0:0:0:0:
+228,119,2504,2,0,L|87:118,1,110,0|2,1:0|0:0,0:0:0:0:
+231,216,3129,2,0,L|372:215,1,110,8|2,0:0|0:0,0:0:0:0:
+465,214,3754,6,0,P|439:111|303:80,1,220,0|10,1:0|0:0,0:0:0:0:
+217,117,4691,1,2,0:0:0:0:
+365,123,5004,2,0,L|367:252,1,110,0|2,1:0|0:0,0:0:0:0:
+228,313,5629,2,0,L|357:315,1,110,8|2,2:0|0:0,0:0:0:0:
+197,303,6254,6,0,P|98:270|59:136,1,220,4|8,1:2|0:0,0:0:0:0:
+171,156,7191,1,2,0:0:0:0:
+290,138,7504,2,0,L|308:275,1,110,0|2,1:0|0:0,0:0:0:0:
+178,249,8129,1,8,0:0:0:0:
+308,247,8441,1,2,0:0:0:0:
+168,249,8754,6,0,L|53:245,1,110,4|0,1:2|3:0,0:0:0:0:
+226,153,9379,2,0,L|343:149,1,110,2|2,1:3|3:2,0:0:0:0:
+256,192,10004,12,2,10941,1:3:0:0:
+173,329,11254,6,0,P|79:249|178:220,1,220,4|2,0:0|1:3,0:0:0:0:
+263,211,12191,1,10,0:0:0:0:
+119,212,12504,2,0,L|103:52,1,110,2|8,1:3|0:0,0:0:0:0:
+246,65,13129,2,0,L|103:66,1,110,2|8,1:3|0:0,0:0:0:0:
+290,64,13754,6,0,P|384:120|284:162,1,220,6|2,1:3|1:3,0:0:0:0:
+182,220,14691,1,8,0:0:0:0:
+335,208,15004,2,0,L|75:142,1,220,2|2,1:3|1:3,0:0:0:0:
+275,153,15941,1,8,0:0:0:0:
+120,151,16254,6,0,P|157:258|268:282,1,220,6|2,1:3|1:3,0:0:0:0:
+405,290,17191,1,10,0:0:0:0:
+250,286,17504,2,0,L|96:264,2,110,6|8|2,1:3|0:0|1:3,0:0:0:0:
+403,275,18441,1,8,0:0:0:0:
+250,286,18754,6,0,P|186:189|264:160,1,220,6|6,1:3|1:3,0:0:0:0:
+404,157,19691,1,8,0:0:0:0:
+249,151,20004,5,6,1:3:0:0:
+245,233,20316,1,8,0:0:0:0:
+240,317,20629,1,8,0:0:0:0:
+399,222,20941,1,4,1:2:0:0:
+240,317,21254,6,0,P|140:279|114:128,1,220,4|2,1:2|1:3,0:0:0:0:
+243,184,22191,1,8,1:0:0:0:
+386,178,22504,2,0,L|403:327,1,110,0|8,1:0|1:0,0:0:0:0:
+264,338,23129,2,0,L|119:336,1,110,2|8,1:3|1:0,0:0:0:0:
+292,300,23754,6,0,P|361:228|270:161,1,220,0|2,1:0|1:3,0:0:0:0:
+147,160,24691,1,8,1:0:0:0:
+285,124,25004,2,0,L|391:50,2,110,4|10|2,1:0|1:0|1:0,0:0:0:0:
+428,128,25941,1,0,1:0:0:0:
+284,130,26254,6,0,P|319:238|428:274,1,220,4|2,1:2|1:3,0:0:0:0:
+268,276,27191,1,8,1:0:0:0:
+124,277,27504,2,0,L|109:125,1,110,0|8,1:0|0:0,0:0:0:0:
+250,126,28129,2,0,L|115:102,1,110,2|8,1:3|1:0,0:0:0:0:
+284,96,28754,6,0,P|385:143|411:266,1,220,4|2,1:0|1:0,0:0:0:0:
+273,240,29691,1,8,1:0:0:0:
+416,236,30004,5,4,1:2:0:0:
+436,94,30316,1,8,1:0:0:0:
+294,75,30629,2,0,L|144:75,1,110,6|0,1:0|3:0,0:0:0:0:
+351,138,31254,6,0,P|441:184|405:291,1,220,4|8,0:0|0:0,0:0:0:0:
+277,246,32191,1,2,1:2:0:0:
+144,299,32504,2,0,L|411:257,1,220,4|8,1:0|1:0,0:0:0:0:
+201,244,33440,1,4,1:0:0:0:
+140,283,33597,6,0,P|98:231|162:160,1,165,4|8,1:2|0:0,0:0:0:0:
+239,112,34379,2,0,L|126:97,1,110,4|8,3:0|1:0,0:0:0:0:
+264,173,35004,6,0,L|396:189,1,110,0|8,1:0|1:0,0:0:0:0:
+223,227,35629,2,0,L|218:103,1,110,10|2,1:0|1:2,0:0:0:0:
+379,115,36254,1,4,1:2:0:0:
+398,117,37035,2,0,L|403:211,1,82.5,4|4,1:0|1:0,0:0:0:0:
+284,252,37504,6,0,L|169:243,1,110,0|2,1:0|0:0,0:0:0:0:
+305,327,38129,2,0,L|423:317,1,110,2|8,0:0|1:2,0:0:0:0:
+415,223,38597,6,0,L|233:207,1,165,4|14,1:2|1:0,0:0:0:0:
+113,252,39379,2,0,L|103:126,1,110,6|6,1:0|1:0,0:0:0:0:
+244,114,40004,5,4,1:2:0:0:
+250,185,40316,1,2,2:0:0:0:
+253,260,40629,1,2,1:2:0:0:
+89,272,40941,1,0,1:0:0:0:
+256,305,41254,6,0,P|342:288|366:191,2,165,4|4|8,1:0|1:0|2:0,0:0:0:0:
+98,202,42504,2,0,P|184:185|208:88,2,165,4|4|8,1:0|1:0|1:0,0:0:0:0:
+249,82,43754,6,0,L|58:83,2,165,4|4|8,1:0|1:0|1:0,0:0:0:0:
+256,192,45004,12,2,45941,1:0:0:0:
+332,305,46254,6,0,P|396:289|434:187,2,165,4|0|0,1:0|1:0|1:0,0:0:0:0:
+180,305,47504,2,0,P|116:289|78:187,2,165,4|4|0,1:0|1:0|1:0,0:0:0:0:
+335,231,48754,6,0,L|145:232,2,165,4|4|8,1:0|1:0|1:0,0:0:0:0:
+256,192,50004,12,2,50941,0:0:0:0:
+119,198,51254,6,0,L|104:299,1,82.5,4|4,1:0|1:0,0:0:0:0:
+230,290,51722,2,0,L|252:120,1,165,4|2,1:0|1:0,0:0:0:0:
+373,113,52504,6,0,L|388:214,1,82.5,4|4,1:0|1:0,0:0:0:0:
+269,207,52972,2,0,P|240:107|282:67,1,165,4|2,1:0|1:0,0:0:0:0:
+424,88,53754,6,0,L|325:81,1,82.5,4|4,1:0|1:0,0:0:0:0:
+228,196,54222,2,0,L|408:181,1,165,4|2,1:0|1:0,0:0:0:0:
+241,238,55004,6,0,L|340:231,1,82.5,4|4,1:0|1:0,0:0:0:0:
+437,346,55472,2,0,L|257:331,1,165,2|10,1:0|1:0,0:0:0:0:
+130,320,56254,5,4,1:2:0:0:
+260,244,56488,2,0,L|272:143,1,82.5,2|2,1:0|1:0,0:0:0:0:
+162,106,56957,2,0,L|64:127,1,82.5,2|2,1:0|1:0,0:0:0:0:
+233,322,57504,5,2,1:0:0:0:
+363,246,57738,2,0,L|270:233,1,82.5,2|2,1:0|1:0,0:0:0:0:
+174,230,58207,2,0,L|76:251,1,82.5,2|2,1:0|1:0,0:0:0:0:
+261,143,58754,6,0,L|76:124,2,165,4|4|4,1:2|1:2|1:2,0:0:0:0:
+256,192,60004,12,0,60941,1:0:0:0:
+258,195,71254,5,0,1:0:0:0:
+69,186,71722,2,0,L|59:367,1,165,2|2,0:0|0:0,0:0:0:0:
+220,198,72504,1,2,0:0:0:0:
+254,195,73754,5,4,0:0:0:0:
+443,186,74222,2,0,L|453:367,1,165,2|2,0:0|0:0,0:0:0:0:
+292,198,75004,1,2,0:0:0:0:
+136,196,76254,5,4,0:0:0:0:
+349,161,76722,2,0,L|165:160,1,165,2|2,0:0|0:0,0:0:0:0:
+350,161,77504,1,2,0:0:0:0:
+376,196,78754,5,4,0:0:0:0:
+163,161,79222,2,0,L|347:160,1,165,0|2,0:0|0:0,0:0:0:0:
+179,253,80004,1,2,0:0:0:0:
+88,255,80316,1,2,0:0:0:0:
+88,255,80629,1,2,0:0:0:0:
+192,256,80941,1,6,1:2:0:0:
+336,252,81254,6,0,L|220:254,1,110,4|10,1:2|1:0,0:0:0:0:
+366,149,81879,2,0,L|482:151,1,110,4|10,1:2|1:0,0:0:0:0:
+319,41,82504,1,4,1:2:0:0:
+224,96,82816,1,8,1:0:0:0:
+196,202,83129,1,4,1:2:0:0:
+248,298,83441,1,10,1:0:0:0:
+390,323,83754,6,0,L|271:324,2,110,4|2|2,1:2|0:0|0:0,0:0:0:0:
+104,321,85004,1,4,1:2:0:0:
+324,329,86254,5,4,1:0:0:0:
+422,281,86566,1,4,1:0:0:0:
+446,173,86879,1,4,1:0:0:0:
+411,68,87191,1,4,1:0:0:0:
+287,49,87504,6,0,L|402:51,1,110,4|6,1:0|1:0,0:0:0:0:
+265,155,88129,2,0,L|141:153,1,110,4|6,1:0|1:0,0:0:0:0:
+308,153,88754,5,2,1:0:0:0:
+408,197,89066,1,2,1:0:0:0:
+432,304,89379,1,2,1:0:0:0:
+348,374,89691,1,2,1:0:0:0:
+256,192,90004,12,4,90941,1:2:0:0:
+140,282,91254,6,0,P|71:226|156:145,1,220,4|4,1:2|1:0,0:0:0:0:
+268,155,92191,1,8,1:0:0:0:
+405,152,92504,2,0,L|274:151,1,110,2|10,1:0|1:0,0:0:0:0:
+154,250,93129,2,0,L|295:252,1,110,2|10,1:0|1:0,0:0:0:0:
+135,329,93754,6,0,L|380:330,1,220,4|0,1:2|1:0,0:0:0:0:
+239,290,94691,1,8,1:0:0:0:
+354,223,95004,2,0,L|213:210,1,110,4|8,1:0|1:0,0:0:0:0:
+97,240,95629,2,0,L|79:127,1,110,2|10,1:0|1:0,0:0:0:0:
+238,55,96254,6,0,P|313:95|229:166,1,220,4|0,1:2|1:0,0:0:0:0:
+363,205,97191,1,8,1:0:0:0:
+252,247,97504,2,0,L|115:270,2,110,2|10|2,1:0|1:0|1:0,0:0:0:0:
+363,287,98441,1,10,1:0:0:0:
+223,343,98754,6,0,L|92:326,1,110,4|10,1:2|1:0,0:0:0:0:
+293,262,99379,1,2,1:0:0:0:
+396,244,99691,1,8,1:0:0:0:
+236,219,100004,6,0,P|160:186|103:55,1,220,4|0,1:2|1:0,0:0:0:0:
+226,68,100941,1,0,1:0:0:0:
+383,69,101254,6,0,P|456:139|387:208,1,220,4|2,1:2|1:0,0:0:0:0:
+261,244,102191,1,10,1:0:0:0:
+123,311,102504,2,0,L|102:165,1,110,2|10,1:0|1:0,0:0:0:0:
+252,178,103129,2,0,L|386:178,1,110,2|10,1:0|1:0,0:0:0:0:
+215,263,103754,6,0,P|123:241|79:117,1,220,4|2,1:2|1:0,0:0:0:0:
+216,121,104691,1,10,1:0:0:0:
+359,106,105004,2,0,L|371:240,1,110,4|8,1:0|1:0,0:0:0:0:
+215,312,105629,2,0,L|352:321,1,110,2|10,1:0|1:0,0:0:0:0:
+164,359,106254,6,0,L|424:330,1,220,4|2,1:2|1:0,0:0:0:0:
+244,297,107191,1,10,1:0:0:0:
+390,278,107504,2,0,L|269:255,2,110,2|10|2,1:0|1:0|1:0,0:0:0:0:
+244,276,108441,1,10,1:0:0:0:
+99,281,108754,6,0,L|87:150,1,110,4|10,1:2|1:0,0:0:0:0:
+228,146,109379,2,0,L|364:136,1,110,2|10,1:0|1:0,0:0:0:0:
+183,278,110004,6,0,L|424:264,1,220,4|2,1:2|0:0,0:0:0:0:
+266,255,110941,1,10,1:0:0:0:
+114,283,111254,6,0,L|102:152,1,110,4|10,0:0|1:0,0:0:0:0:
+243,148,111879,2,0,L|379:138,1,110,2|10,1:0|1:0,0:0:0:0:
+198,280,112504,6,0,L|439:266,1,220,4|2,1:2|1:0,0:0:0:0:
+281,257,113441,1,8,1:0:0:0:
+137,295,113754,5,4,1:2:0:0:
+127,239,113910,1,4,1:2:0:0:
+314,108,114379,2,0,L|321:207,1,82.5,4|4,0:0|0:0,0:0:0:0:
+211,254,114847,6,0,L|389:266,1,165,6|6,1:0|1:0,0:0:0:0:
+265,275,115629,1,4,1:0:0:0:
+407,299,115941,1,4,1:2:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2768615-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2768615-expected-conversion.json
new file mode 100644
index 0000000000..2ebebdbe7a
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2768615-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":514.0,"Objects":[{"StartTime":514.0,"Position":6.0,"HyperDash":false},{"StartTime":586.0,"Position":0.0,"HyperDash":false},{"StartTime":695.0,"Position":8.064062,"HyperDash":false}]},{"StartTime":877.0,"Objects":[{"StartTime":877.0,"Position":20.0,"HyperDash":false}]},{"StartTime":1059.0,"Objects":[{"StartTime":1059.0,"Position":14.0,"HyperDash":false},{"StartTime":1131.0,"Position":3.79381847,"HyperDash":false},{"StartTime":1240.0,"Position":15.99557,"HyperDash":false}]},{"StartTime":1604.0,"Objects":[{"StartTime":1604.0,"Position":21.0,"HyperDash":false},{"StartTime":1685.0,"Position":19.13056,"HyperDash":false},{"StartTime":1767.0,"Position":38.2750778,"HyperDash":false},{"StartTime":1849.0,"Position":41.4195938,"HyperDash":false},{"StartTime":1967.0,"Position":26.0665855,"HyperDash":false}]},{"StartTime":2332.0,"Objects":[{"StartTime":2332.0,"Position":28.0,"HyperDash":false}]},{"StartTime":2513.0,"Objects":[{"StartTime":2513.0,"Position":27.0,"HyperDash":false},{"StartTime":2576.0,"Position":28.8067379,"HyperDash":false},{"StartTime":2640.0,"Position":27.6262817,"HyperDash":false},{"StartTime":2703.0,"Position":14.43302,"HyperDash":false},{"StartTime":2767.0,"Position":22.2525616,"HyperDash":false},{"StartTime":2831.0,"Position":19.0721054,"HyperDash":false},{"StartTime":2894.0,"Position":27.8788433,"HyperDash":false},{"StartTime":2958.0,"Position":46.6983871,"HyperDash":false},{"StartTime":3058.0,"Position":33.9789238,"HyperDash":false}]},{"StartTime":3423.0,"Objects":[{"StartTime":3423.0,"Position":46.0,"HyperDash":false},{"StartTime":3495.0,"Position":50.821064,"HyperDash":false},{"StartTime":3604.0,"Position":48.064064,"HyperDash":false}]},{"StartTime":3786.0,"Objects":[{"StartTime":3786.0,"Position":60.0,"HyperDash":false}]},{"StartTime":3968.0,"Objects":[{"StartTime":3968.0,"Position":54.0,"HyperDash":false},{"StartTime":4040.0,"Position":45.79382,"HyperDash":false},{"StartTime":4149.0,"Position":55.99557,"HyperDash":false}]},{"StartTime":4513.0,"Objects":[{"StartTime":4513.0,"Position":61.0,"HyperDash":false},{"StartTime":4585.0,"Position":66.82106,"HyperDash":false},{"StartTime":4694.0,"Position":63.064064,"HyperDash":false}]},{"StartTime":4877.0,"Objects":[{"StartTime":4877.0,"Position":65.0,"HyperDash":false},{"StartTime":4967.0,"Position":66.0687,"HyperDash":false},{"StartTime":5058.0,"Position":65.0,"HyperDash":false}]},{"StartTime":5241.0,"Objects":[{"StartTime":5241.0,"Position":68.0,"HyperDash":false},{"StartTime":5313.0,"Position":49.8210678,"HyperDash":false},{"StartTime":5422.0,"Position":70.064064,"HyperDash":false}]},{"StartTime":5604.0,"Objects":[{"StartTime":5604.0,"Position":77.0,"HyperDash":false},{"StartTime":5660.0,"Position":67.75663,"HyperDash":false},{"StartTime":5717.0,"Position":94.50892,"HyperDash":false},{"StartTime":5774.0,"Position":93.26121,"HyperDash":false},{"StartTime":5831.0,"Position":76.0135,"HyperDash":false},{"StartTime":5926.0,"Position":89.42635,"HyperDash":false},{"StartTime":6058.0,"Position":77.0,"HyperDash":false}]},{"StartTime":6332.0,"Objects":[{"StartTime":6332.0,"Position":96.0,"HyperDash":false}]},{"StartTime":6513.0,"Objects":[{"StartTime":6513.0,"Position":80.0,"HyperDash":false}]},{"StartTime":6877.0,"Objects":[{"StartTime":6877.0,"Position":108.0,"HyperDash":false}]},{"StartTime":7059.0,"Objects":[{"StartTime":7059.0,"Position":96.0,"HyperDash":false},{"StartTime":7131.0,"Position":91.4434738,"HyperDash":false},{"StartTime":7240.0,"Position":98.95893,"HyperDash":false}]},{"StartTime":7423.0,"Objects":[{"StartTime":7423.0,"Position":101.0,"HyperDash":false},{"StartTime":7495.0,"Position":79.8501,"HyperDash":false},{"StartTime":7604.0,"Position":96.87991,"HyperDash":false}]},{"StartTime":7786.0,"Objects":[{"StartTime":7786.0,"Position":115.0,"HyperDash":false}]},{"StartTime":7968.0,"Objects":[{"StartTime":7968.0,"Position":95.0,"HyperDash":false}]},{"StartTime":8150.0,"Objects":[{"StartTime":8150.0,"Position":127.0,"HyperDash":false}]},{"StartTime":8332.0,"Objects":[{"StartTime":8332.0,"Position":110.0,"HyperDash":false},{"StartTime":8404.0,"Position":123.196411,"HyperDash":false},{"StartTime":8513.0,"Position":105.877426,"HyperDash":false}]},{"StartTime":8695.0,"Objects":[{"StartTime":8695.0,"Position":110.0,"HyperDash":false},{"StartTime":8767.0,"Position":104.810783,"HyperDash":false},{"StartTime":8876.0,"Position":113.827438,"HyperDash":false}]},{"StartTime":9241.0,"Objects":[{"StartTime":9241.0,"Position":138.0,"HyperDash":false}]},{"StartTime":9423.0,"Objects":[{"StartTime":9423.0,"Position":131.0,"HyperDash":false},{"StartTime":9495.0,"Position":133.615219,"HyperDash":false},{"StartTime":9604.0,"Position":128.964035,"HyperDash":false}]},{"StartTime":9786.0,"Objects":[{"StartTime":9786.0,"Position":143.0,"HyperDash":false}]},{"StartTime":9968.0,"Objects":[{"StartTime":9968.0,"Position":136.0,"HyperDash":false},{"StartTime":10027.0,"Position":122.678848,"HyperDash":false},{"StartTime":10086.0,"Position":134.039719,"HyperDash":false},{"StartTime":10145.0,"Position":136.077042,"HyperDash":false},{"StartTime":10240.0,"Position":132.939224,"HyperDash":false}]},{"StartTime":10332.0,"Objects":[{"StartTime":10332.0,"Position":139.0,"HyperDash":false},{"StartTime":10391.0,"Position":156.013535,"HyperDash":false},{"StartTime":10450.0,"Position":128.715408,"HyperDash":false},{"StartTime":10509.0,"Position":125.074265,"HyperDash":false},{"StartTime":10604.0,"Position":141.969208,"HyperDash":false}]},{"StartTime":10695.0,"Objects":[{"StartTime":10695.0,"Position":150.0,"HyperDash":false}]},{"StartTime":10877.0,"Objects":[{"StartTime":10877.0,"Position":146.0,"HyperDash":false}]},{"StartTime":11059.0,"Objects":[{"StartTime":11059.0,"Position":156.0,"HyperDash":false}]},{"StartTime":11241.0,"Objects":[{"StartTime":11241.0,"Position":150.0,"HyperDash":false}]},{"StartTime":11423.0,"Objects":[{"StartTime":11423.0,"Position":156.0,"HyperDash":false},{"StartTime":11513.0,"Position":158.989288,"HyperDash":false}]},{"StartTime":11604.0,"Objects":[{"StartTime":11604.0,"Position":157.0,"HyperDash":false}]},{"StartTime":11695.0,"Objects":[{"StartTime":11695.0,"Position":163.0,"HyperDash":false}]},{"StartTime":11786.0,"Objects":[{"StartTime":11786.0,"Position":161.0,"HyperDash":false},{"StartTime":11876.0,"Position":161.977341,"HyperDash":false}]},{"StartTime":11968.0,"Objects":[{"StartTime":11968.0,"Position":165.0,"HyperDash":false},{"StartTime":12058.0,"Position":165.977341,"HyperDash":false}]},{"StartTime":12150.0,"Objects":[{"StartTime":12150.0,"Position":166.0,"HyperDash":false},{"StartTime":12222.0,"Position":150.82106,"HyperDash":false},{"StartTime":12331.0,"Position":168.064056,"HyperDash":false}]},{"StartTime":12513.0,"Objects":[{"StartTime":12513.0,"Position":180.0,"HyperDash":false}]},{"StartTime":12695.0,"Objects":[{"StartTime":12695.0,"Position":174.0,"HyperDash":false},{"StartTime":12747.0,"Position":187.463669,"HyperDash":false},{"StartTime":12799.0,"Position":191.927322,"HyperDash":false},{"StartTime":12851.0,"Position":174.390991,"HyperDash":false},{"StartTime":12904.0,"Position":168.863571,"HyperDash":false},{"StartTime":12956.0,"Position":175.32724,"HyperDash":false},{"StartTime":13008.0,"Position":195.7909,"HyperDash":false},{"StartTime":13060.0,"Position":171.254562,"HyperDash":false},{"StartTime":13149.0,"Position":178.048141,"HyperDash":false}]},{"StartTime":13241.0,"Objects":[{"StartTime":13241.0,"Position":183.0,"HyperDash":false},{"StartTime":13313.0,"Position":187.17894,"HyperDash":false},{"StartTime":13422.0,"Position":180.935944,"HyperDash":false}]},{"StartTime":13604.0,"Objects":[{"StartTime":13604.0,"Position":191.0,"HyperDash":false}]},{"StartTime":13786.0,"Objects":[{"StartTime":13786.0,"Position":185.0,"HyperDash":false}]},{"StartTime":13968.0,"Objects":[{"StartTime":13968.0,"Position":197.0,"HyperDash":false}]},{"StartTime":14150.0,"Objects":[{"StartTime":14150.0,"Position":191.0,"HyperDash":false},{"StartTime":14213.0,"Position":204.4671,"HyperDash":false},{"StartTime":14277.0,"Position":208.941635,"HyperDash":false},{"StartTime":14340.0,"Position":209.408737,"HyperDash":false},{"StartTime":14404.0,"Position":207.88327,"HyperDash":false},{"StartTime":14468.0,"Position":210.357788,"HyperDash":false},{"StartTime":14531.0,"Position":202.82489,"HyperDash":false},{"StartTime":14595.0,"Position":177.299423,"HyperDash":false},{"StartTime":14695.0,"Position":195.040863,"HyperDash":false}]},{"StartTime":15059.0,"Objects":[{"StartTime":15059.0,"Position":217.0,"HyperDash":false}]},{"StartTime":15150.0,"Objects":[{"StartTime":15150.0,"Position":197.0,"HyperDash":false}]},{"StartTime":15240.0,"Objects":[{"StartTime":15240.0,"Position":219.0,"HyperDash":false}]},{"StartTime":15422.0,"Objects":[{"StartTime":15422.0,"Position":209.0,"HyperDash":false}]},{"StartTime":15604.0,"Objects":[{"StartTime":15604.0,"Position":214.0,"HyperDash":false},{"StartTime":15656.0,"Position":219.463669,"HyperDash":false},{"StartTime":15708.0,"Position":202.927322,"HyperDash":false},{"StartTime":15760.0,"Position":200.390991,"HyperDash":false},{"StartTime":15813.0,"Position":233.863571,"HyperDash":false},{"StartTime":15865.0,"Position":208.32724,"HyperDash":false},{"StartTime":15917.0,"Position":232.7909,"HyperDash":false},{"StartTime":15969.0,"Position":220.254562,"HyperDash":false},{"StartTime":16058.0,"Position":218.048141,"HyperDash":false}]},{"StartTime":16150.0,"Objects":[{"StartTime":16150.0,"Position":223.0,"HyperDash":false},{"StartTime":16218.0,"Position":212.065735,"HyperDash":false},{"StartTime":16286.0,"Position":221.13147,"HyperDash":false},{"StartTime":16422.0,"Position":223.0,"HyperDash":false}]},{"StartTime":16513.0,"Objects":[{"StartTime":16513.0,"Position":231.0,"HyperDash":false}]},{"StartTime":16695.0,"Objects":[{"StartTime":16695.0,"Position":227.0,"HyperDash":false}]},{"StartTime":16785.0,"Objects":[{"StartTime":16785.0,"Position":233.0,"HyperDash":false}]},{"StartTime":16877.0,"Objects":[{"StartTime":16877.0,"Position":231.0,"HyperDash":false},{"StartTime":16949.0,"Position":232.82106,"HyperDash":false},{"StartTime":17058.0,"Position":233.064056,"HyperDash":false}]},{"StartTime":17241.0,"Objects":[{"StartTime":17241.0,"Position":236.0,"HyperDash":false},{"StartTime":17297.0,"Position":226.466782,"HyperDash":false},{"StartTime":17354.0,"Position":236.9419,"HyperDash":false},{"StartTime":17411.0,"Position":219.417,"HyperDash":false},{"StartTime":17468.0,"Position":237.89212,"HyperDash":false},{"StartTime":17563.0,"Position":221.100266,"HyperDash":false},{"StartTime":17695.0,"Position":236.0,"HyperDash":false}]},{"StartTime":18150.0,"Objects":[{"StartTime":18150.0,"Position":254.0,"HyperDash":false}]},{"StartTime":18331.0,"Objects":[{"StartTime":18331.0,"Position":242.0,"HyperDash":false}]},{"StartTime":18695.0,"Objects":[{"StartTime":18695.0,"Position":264.0,"HyperDash":false}]},{"StartTime":18877.0,"Objects":[{"StartTime":18877.0,"Position":250.0,"HyperDash":false}]},{"StartTime":19059.0,"Objects":[{"StartTime":19059.0,"Position":261.0,"HyperDash":false},{"StartTime":19149.0,"Position":273.538757,"HyperDash":false},{"StartTime":19240.0,"Position":265.1201,"HyperDash":false},{"StartTime":19313.0,"Position":252.953827,"HyperDash":false},{"StartTime":19422.0,"Position":261.0,"HyperDash":false}]},{"StartTime":19604.0,"Objects":[{"StartTime":19604.0,"Position":267.0,"HyperDash":false}]},{"StartTime":19786.0,"Objects":[{"StartTime":19786.0,"Position":271.0,"HyperDash":false}]},{"StartTime":19876.0,"Objects":[{"StartTime":19876.0,"Position":269.0,"HyperDash":false}]},{"StartTime":19968.0,"Objects":[{"StartTime":19968.0,"Position":271.0,"HyperDash":false},{"StartTime":20058.0,"Position":271.71347,"HyperDash":false},{"StartTime":20149.0,"Position":271.0,"HyperDash":false}]},{"StartTime":20331.0,"Objects":[{"StartTime":20331.0,"Position":278.0,"HyperDash":false}]},{"StartTime":20422.0,"Objects":[{"StartTime":20422.0,"Position":276.0,"HyperDash":false},{"StartTime":20494.0,"Position":256.991028,"HyperDash":false},{"StartTime":20603.0,"Position":276.034363,"HyperDash":false}]},{"StartTime":20695.0,"Objects":[{"StartTime":20695.0,"Position":281.0,"HyperDash":false},{"StartTime":20767.0,"Position":276.1846,"HyperDash":false},{"StartTime":20876.0,"Position":282.9045,"HyperDash":false}]},{"StartTime":21059.0,"Objects":[{"StartTime":21059.0,"Position":290.0,"HyperDash":false}]},{"StartTime":21240.0,"Objects":[{"StartTime":21240.0,"Position":291.0,"HyperDash":false},{"StartTime":21312.0,"Position":274.790222,"HyperDash":false},{"StartTime":21421.0,"Position":290.691162,"HyperDash":false}]},{"StartTime":21604.0,"Objects":[{"StartTime":21604.0,"Position":301.0,"HyperDash":false}]},{"StartTime":21786.0,"Objects":[{"StartTime":21786.0,"Position":296.0,"HyperDash":false},{"StartTime":21858.0,"Position":307.443481,"HyperDash":false},{"StartTime":21967.0,"Position":298.958923,"HyperDash":false}]},{"StartTime":22150.0,"Objects":[{"StartTime":22150.0,"Position":301.0,"HyperDash":false},{"StartTime":22222.0,"Position":295.69693,"HyperDash":false},{"StartTime":22331.0,"Position":296.97644,"HyperDash":false}]},{"StartTime":22513.0,"Objects":[{"StartTime":22513.0,"Position":315.0,"HyperDash":false}]},{"StartTime":22695.0,"Objects":[{"StartTime":22695.0,"Position":307.0,"HyperDash":false}]},{"StartTime":22786.0,"Objects":[{"StartTime":22786.0,"Position":315.0,"HyperDash":false}]},{"StartTime":22877.0,"Objects":[{"StartTime":22877.0,"Position":307.0,"HyperDash":false}]},{"StartTime":22968.0,"Objects":[{"StartTime":22968.0,"Position":319.0,"HyperDash":false}]},{"StartTime":23059.0,"Objects":[{"StartTime":23059.0,"Position":309.0,"HyperDash":false}]},{"StartTime":23150.0,"Objects":[{"StartTime":23150.0,"Position":321.0,"HyperDash":false}]},{"StartTime":23240.0,"Objects":[{"StartTime":23240.0,"Position":316.0,"HyperDash":false},{"StartTime":23330.0,"Position":305.998932,"HyperDash":false}]},{"StartTime":23421.0,"Objects":[{"StartTime":23421.0,"Position":332.0,"HyperDash":false}]},{"StartTime":23604.0,"Objects":[{"StartTime":23604.0,"Position":319.0,"HyperDash":false},{"StartTime":23694.0,"Position":319.977325,"HyperDash":false}]},{"StartTime":23786.0,"Objects":[{"StartTime":23786.0,"Position":323.0,"HyperDash":false},{"StartTime":23876.0,"Position":323.977325,"HyperDash":false}]},{"StartTime":23968.0,"Objects":[{"StartTime":23968.0,"Position":332.0,"HyperDash":false}]},{"StartTime":24150.0,"Objects":[{"StartTime":24150.0,"Position":328.0,"HyperDash":false},{"StartTime":24222.0,"Position":344.178925,"HyperDash":false},{"StartTime":24331.0,"Position":325.935944,"HyperDash":false}]},{"StartTime":24513.0,"Objects":[{"StartTime":24513.0,"Position":336.0,"HyperDash":false}]},{"StartTime":24695.0,"Objects":[{"StartTime":24695.0,"Position":340.0,"HyperDash":false}]},{"StartTime":24787.0,"Objects":[{"StartTime":24787.0,"Position":337.0,"HyperDash":false},{"StartTime":24877.0,"Position":336.002228,"HyperDash":false}]},{"StartTime":25059.0,"Objects":[{"StartTime":25059.0,"Position":341.0,"HyperDash":false},{"StartTime":25131.0,"Position":323.178925,"HyperDash":false},{"StartTime":25240.0,"Position":338.935944,"HyperDash":false}]},{"StartTime":25422.0,"Objects":[{"StartTime":25422.0,"Position":363.0,"HyperDash":false}]},{"StartTime":25604.0,"Objects":[{"StartTime":25604.0,"Position":351.0,"HyperDash":false},{"StartTime":25694.0,"Position":351.997772,"HyperDash":false},{"StartTime":25785.0,"Position":351.0,"HyperDash":false}]},{"StartTime":25968.0,"Objects":[{"StartTime":25968.0,"Position":356.0,"HyperDash":false}]},{"StartTime":26059.0,"Objects":[{"StartTime":26059.0,"Position":354.0,"HyperDash":false}]},{"StartTime":26149.0,"Objects":[{"StartTime":26149.0,"Position":356.0,"HyperDash":false},{"StartTime":26239.0,"Position":362.0235,"HyperDash":false},{"StartTime":26330.0,"Position":358.064056,"HyperDash":false},{"StartTime":26403.0,"Position":376.239563,"HyperDash":false},{"StartTime":26512.0,"Position":356.0,"HyperDash":false}]},{"StartTime":26877.0,"Objects":[{"StartTime":26877.0,"Position":374.0,"HyperDash":false}]},{"StartTime":27059.0,"Objects":[{"StartTime":27059.0,"Position":364.0,"HyperDash":false}]},{"StartTime":27149.0,"Objects":[{"StartTime":27149.0,"Position":376.0,"HyperDash":false}]},{"StartTime":27240.0,"Objects":[{"StartTime":27240.0,"Position":371.0,"HyperDash":false},{"StartTime":27330.0,"Position":371.0,"HyperDash":false},{"StartTime":27421.0,"Position":371.0,"HyperDash":false}]},{"StartTime":27604.0,"Objects":[{"StartTime":27604.0,"Position":381.0,"HyperDash":false}]},{"StartTime":27696.0,"Objects":[{"StartTime":27696.0,"Position":377.0,"HyperDash":false},{"StartTime":27786.0,"Position":377.71347,"HyperDash":false}]},{"StartTime":27968.0,"Objects":[{"StartTime":27968.0,"Position":381.0,"HyperDash":false},{"StartTime":28040.0,"Position":390.178925,"HyperDash":false},{"StartTime":28149.0,"Position":378.935944,"HyperDash":false}]},{"StartTime":28331.0,"Objects":[{"StartTime":28331.0,"Position":393.0,"HyperDash":false}]},{"StartTime":28513.0,"Objects":[{"StartTime":28513.0,"Position":385.0,"HyperDash":false}]},{"StartTime":28604.0,"Objects":[{"StartTime":28604.0,"Position":395.0,"HyperDash":false}]},{"StartTime":28695.0,"Objects":[{"StartTime":28695.0,"Position":391.0,"HyperDash":false},{"StartTime":28767.0,"Position":401.821075,"HyperDash":false},{"StartTime":28876.0,"Position":393.064056,"HyperDash":false}]},{"StartTime":29059.0,"Objects":[{"StartTime":29059.0,"Position":398.0,"HyperDash":false},{"StartTime":29115.0,"Position":401.513763,"HyperDash":false},{"StartTime":29172.0,"Position":404.01886,"HyperDash":false},{"StartTime":29229.0,"Position":412.523956,"HyperDash":false},{"StartTime":29286.0,"Position":396.029053,"HyperDash":false},{"StartTime":29381.0,"Position":381.8539,"HyperDash":false},{"StartTime":29513.0,"Position":398.0,"HyperDash":false}]},{"StartTime":29786.0,"Objects":[{"StartTime":29786.0,"Position":416.0,"HyperDash":false}]},{"StartTime":29967.0,"Objects":[{"StartTime":29967.0,"Position":400.0,"HyperDash":false}]},{"StartTime":30331.0,"Objects":[{"StartTime":30331.0,"Position":426.0,"HyperDash":false}]},{"StartTime":30513.0,"Objects":[{"StartTime":30513.0,"Position":408.0,"HyperDash":false}]},{"StartTime":30605.0,"Objects":[{"StartTime":30605.0,"Position":418.0,"HyperDash":false},{"StartTime":30695.0,"Position":418.71347,"HyperDash":false}]},{"StartTime":30877.0,"Objects":[{"StartTime":30877.0,"Position":421.0,"HyperDash":false},{"StartTime":30949.0,"Position":422.1499,"HyperDash":false},{"StartTime":31058.0,"Position":425.1201,"HyperDash":false}]},{"StartTime":31240.0,"Objects":[{"StartTime":31240.0,"Position":427.0,"HyperDash":false}]},{"StartTime":31422.0,"Objects":[{"StartTime":31422.0,"Position":431.0,"HyperDash":false}]},{"StartTime":31513.0,"Objects":[{"StartTime":31513.0,"Position":429.0,"HyperDash":false}]},{"StartTime":31603.0,"Objects":[{"StartTime":31603.0,"Position":433.0,"HyperDash":false}]},{"StartTime":31695.0,"Objects":[{"StartTime":31695.0,"Position":419.0,"HyperDash":false}]},{"StartTime":31786.0,"Objects":[{"StartTime":31786.0,"Position":434.0,"HyperDash":false},{"StartTime":31858.0,"Position":444.725983,"HyperDash":false},{"StartTime":31967.0,"Position":435.019226,"HyperDash":false}]},{"StartTime":32149.0,"Objects":[{"StartTime":32149.0,"Position":442.0,"HyperDash":false},{"StartTime":32221.0,"Position":443.390778,"HyperDash":false},{"StartTime":32330.0,"Position":440.069153,"HyperDash":false}]},{"StartTime":32695.0,"Objects":[{"StartTime":32695.0,"Position":452.0,"HyperDash":false}]},{"StartTime":32877.0,"Objects":[{"StartTime":32877.0,"Position":451.0,"HyperDash":false},{"StartTime":32949.0,"Position":434.066742,"HyperDash":false},{"StartTime":33058.0,"Position":450.7317,"HyperDash":false}]},{"StartTime":33240.0,"Objects":[{"StartTime":33240.0,"Position":461.0,"HyperDash":false}]},{"StartTime":33422.0,"Objects":[{"StartTime":33422.0,"Position":451.0,"HyperDash":false}]},{"StartTime":33513.0,"Objects":[{"StartTime":33513.0,"Position":457.0,"HyperDash":false},{"StartTime":33585.0,"Position":444.147736,"HyperDash":false},{"StartTime":33694.0,"Position":445.292816,"HyperDash":false}]},{"StartTime":33786.0,"Objects":[{"StartTime":33786.0,"Position":479.0,"HyperDash":false}]},{"StartTime":33877.0,"Objects":[{"StartTime":33877.0,"Position":462.0,"HyperDash":false},{"StartTime":33967.0,"Position":462.0,"HyperDash":false}]},{"StartTime":34149.0,"Objects":[{"StartTime":34149.0,"Position":470.0,"HyperDash":false}]},{"StartTime":34331.0,"Objects":[{"StartTime":34331.0,"Position":450.0,"HyperDash":false}]},{"StartTime":34422.0,"Objects":[{"StartTime":34422.0,"Position":450.0,"HyperDash":false}]},{"StartTime":34513.0,"Objects":[{"StartTime":34513.0,"Position":490.0,"HyperDash":false}]},{"StartTime":34604.0,"Objects":[{"StartTime":34604.0,"Position":472.0,"HyperDash":false}]},{"StartTime":34695.0,"Objects":[{"StartTime":34695.0,"Position":489.0,"HyperDash":false}]},{"StartTime":34877.0,"Objects":[{"StartTime":34877.0,"Position":476.0,"HyperDash":false},{"StartTime":34967.0,"Position":474.8665,"HyperDash":false}]},{"StartTime":35059.0,"Objects":[{"StartTime":35059.0,"Position":483.0,"HyperDash":false}]},{"StartTime":35240.0,"Objects":[{"StartTime":35240.0,"Position":479.0,"HyperDash":false},{"StartTime":35330.0,"Position":479.977325,"HyperDash":false}]},{"StartTime":35422.0,"Objects":[{"StartTime":35422.0,"Position":483.0,"HyperDash":false},{"StartTime":35512.0,"Position":483.977325,"HyperDash":false}]},{"StartTime":35604.0,"Objects":[{"StartTime":35604.0,"Position":287.0,"HyperDash":false},{"StartTime":35692.0,"Position":361.0,"HyperDash":false},{"StartTime":35780.0,"Position":479.0,"HyperDash":false},{"StartTime":35868.0,"Position":346.0,"HyperDash":false},{"StartTime":35956.0,"Position":266.0,"HyperDash":false},{"StartTime":36044.0,"Position":400.0,"HyperDash":false},{"StartTime":36132.0,"Position":202.0,"HyperDash":false},{"StartTime":36220.0,"Position":500.0,"HyperDash":false},{"StartTime":36308.0,"Position":80.0,"HyperDash":false},{"StartTime":36396.0,"Position":399.0,"HyperDash":false},{"StartTime":36484.0,"Position":455.0,"HyperDash":false},{"StartTime":36572.0,"Position":105.0,"HyperDash":false},{"StartTime":36660.0,"Position":100.0,"HyperDash":false},{"StartTime":36748.0,"Position":195.0,"HyperDash":false},{"StartTime":36836.0,"Position":106.0,"HyperDash":false},{"StartTime":36924.0,"Position":305.0,"HyperDash":false},{"StartTime":37013.0,"Position":225.0,"HyperDash":false}]},{"StartTime":37059.0,"Objects":[{"StartTime":37059.0,"Position":79.0,"HyperDash":false},{"StartTime":37124.0,"Position":38.0,"HyperDash":false},{"StartTime":37189.0,"Position":99.0,"HyperDash":false},{"StartTime":37254.0,"Position":79.0,"HyperDash":false},{"StartTime":37320.0,"Position":169.0,"HyperDash":false},{"StartTime":37385.0,"Position":238.0,"HyperDash":false},{"StartTime":37450.0,"Position":511.0,"HyperDash":false},{"StartTime":37516.0,"Position":58.0,"HyperDash":false},{"StartTime":37581.0,"Position":368.0,"HyperDash":false},{"StartTime":37646.0,"Position":52.0,"HyperDash":false},{"StartTime":37712.0,"Position":327.0,"HyperDash":false},{"StartTime":37777.0,"Position":226.0,"HyperDash":false},{"StartTime":37842.0,"Position":110.0,"HyperDash":false},{"StartTime":37908.0,"Position":3.0,"HyperDash":false},{"StartTime":37973.0,"Position":26.0,"HyperDash":false},{"StartTime":38038.0,"Position":173.0,"HyperDash":false},{"StartTime":38104.0,"Position":18.0,"HyperDash":false},{"StartTime":38169.0,"Position":310.0,"HyperDash":false},{"StartTime":38234.0,"Position":394.0,"HyperDash":false},{"StartTime":38299.0,"Position":406.0,"HyperDash":false},{"StartTime":38365.0,"Position":262.0,"HyperDash":false},{"StartTime":38430.0,"Position":278.0,"HyperDash":false},{"StartTime":38495.0,"Position":171.0,"HyperDash":false},{"StartTime":38561.0,"Position":22.0,"HyperDash":false},{"StartTime":38626.0,"Position":187.0,"HyperDash":false},{"StartTime":38691.0,"Position":124.0,"HyperDash":false},{"StartTime":38757.0,"Position":454.0,"HyperDash":false},{"StartTime":38822.0,"Position":16.0,"HyperDash":false},{"StartTime":38887.0,"Position":61.0,"HyperDash":false},{"StartTime":38953.0,"Position":161.0,"HyperDash":false},{"StartTime":39018.0,"Position":243.0,"HyperDash":false},{"StartTime":39083.0,"Position":375.0,"HyperDash":false},{"StartTime":39149.0,"Position":247.0,"HyperDash":false}]},{"StartTime":40695.0,"Objects":[{"StartTime":40695.0,"Position":496.0,"HyperDash":false},{"StartTime":40767.0,"Position":489.6517,"HyperDash":false},{"StartTime":40876.0,"Position":495.903229,"HyperDash":false}]},{"StartTime":41059.0,"Objects":[{"StartTime":41059.0,"Position":510.0,"HyperDash":false}]},{"StartTime":41150.0,"Objects":[{"StartTime":41150.0,"Position":498.0,"HyperDash":false}]},{"StartTime":41240.0,"Objects":[{"StartTime":41240.0,"Position":505.0,"HyperDash":false},{"StartTime":41285.0,"Position":505.934265,"HyperDash":false},{"StartTime":41330.0,"Position":505.0,"HyperDash":false},{"StartTime":41376.0,"Position":505.934265,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2768615.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2768615.osu
new file mode 100644
index 0000000000..19439172cd
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2768615.osu
@@ -0,0 +1,200 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.4
+Mode: 0
+
+[Difficulty]
+HPDrainRate:4.5
+CircleSize:9
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:1.2
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+514,727.272727272727,4,2,1,50,1,0
+9241,-83.3333333333333,4,2,1,50,0,0
+9968,-100,4,2,1,50,0,0
+10241,-100,4,2,99,5,0,0
+10332,-100,4,2,1,50,0,0
+10604,-100,4,2,99,5,0,0
+10695,-100,4,2,1,50,0,0
+11423,-66.6666666666667,4,2,1,50,0,0
+12150,-100,4,2,1,50,0,0
+13150,-100,4,2,99,5,0,0
+13241,-100,4,2,1,50,0,0
+16059,-100,4,2,99,5,0,0
+16150,-100,4,2,1,50,0,0
+17241,909.090909090909,4,2,1,50,1,0
+17241,-83.3333333333333,4,2,1,50,0,0
+18150,727.272727272727,4,2,1,50,1,0
+20604,-100,4,2,99,5,0,0
+20695,-100,4,2,1,50,0,0
+21059,-83.3333333333333,4,2,1,50,0,0
+21786,-100,4,2,1,50,0,0
+23240,-66.6666666666667,4,2,1,50,0,0
+23968,-100,4,2,1,50,0,0
+32695,-83.3333333333333,4,2,1,50,0,0
+33422,-100,4,2,1,50,0,0
+33695,-100,4,2,99,5,0,0
+33786,-100,4,2,1,50,0,0
+34877,-66.6666666666667,4,2,1,50,0,0
+37013,-100,4,2,1,45,0,0
+39149,-100,4,2,1,40,0,0
+40695,-66.6666666666667,4,2,1,35,0,0
+
+[HitObjects]
+6,0,514,6,0,L|8:29,1,30,2|0,3:2|0:0,0:0:0:0:
+14,66,877,1,0,0:0:0:0:
+14,66,1059,2,0,L|16:36,1,30,0|0,0:0|1:0,0:0:0:0:
+21,31,1604,6,0,L|26:90,1,60,2|0,0:0|3:0,0:0:0:0:
+27,186,2332,1,0,3:0:0:0:
+27,186,2513,2,0,L|34:96,1,90,2|0,0:0|0:0,0:0:0:0:
+46,269,3423,38,0,L|48:298,1,30,2|0,3:2|0:0,0:0:0:0:
+54,335,3786,1,0,0:0:0:0:
+54,335,3968,2,0,L|56:305,1,30,0|0,0:0|1:0,0:0:0:0:
+61,300,4513,6,0,L|63:271,1,30,2|0,0:0|0:0,0:0:0:0:
+65,200,4877,2,0,L|66:186,2,15,0|0|0,3:2|0:0|0:0,0:0:0:0:
+68,265,5241,2,0,L|70:236,1,30,2|0,3:2|0:0,0:0:0:0:
+77,335,5604,6,0,L|76:373,2,37.5,0|0|0,1:0|3:0|3:0,0:0:0:0:
+86,152,6332,21,2,3:2:0:0:
+88,199,6513,1,2,0:0:0:0:
+94,157,6877,5,2,0:0:0:0:
+96,204,7059,2,0,P|100:218|99:233,1,30,2|0,1:2|0:0,0:0:0:0:
+101,161,7423,2,0,P|96:146|97:131,1,30,2|0,0:2|0:1,0:0:0:0:
+106,85,7786,37,0,3:3:0:0:
+105,49,7968,1,0,0:3:0:0:
+111,82,8150,1,2,3:3:0:0:
+110,45,8332,2,0,P|110:30|106:16,1,30,2|0,0:3|0:0,0:0:0:0:
+110,87,8695,2,0,P|110:102|114:117,1,30,2|0,0:3|0:0,0:0:0:0:
+126,290,9241,5,4,3:3:0:0:
+131,232,9423,2,0,B|134:220|124:211|124:211|129:218|129:223,1,35.9999989013672,8|0,0:3|0:0,0:0:0:0:
+136,297,9786,37,4,0:3:0:0:
+136,234,9968,2,0,P|138:212|133:190,1,45,2|0,1:2|0:0,0:0:0:0:
+139,191,10332,2,0,P|144:212|142:235,1,45,2|0,0:0|0:0,0:0:0:0:
+146,264,10695,5,2,3:1:0:0:
+148,306,10877,1,2,0:1:0:0:
+151,267,11059,1,2,3:1:0:0:
+153,309,11241,1,2,0:1:0:0:
+156,351,11423,6,0,B|158:362|158:362|159:354|159:350,1,22.5000008583069,2|0,1:0|0:0,0:0:0:0:
+158,311,11604,1,2,0:3:0:0:
+160,289,11695,1,2,0:3:0:0:
+161,267,11786,2,0,L|162:244,1,22.5000008583069,2|0,0:3|0:0,0:0:0:0:
+165,268,11968,2,0,L|166:245,1,22.5000008583069,2|0,0:3|0:0,0:0:0:0:
+166,187,12150,22,0,L|168:158,1,30,2|0,3:2|0:0,0:0:0:0:
+174,121,12513,1,2,0:0:0:0:
+174,121,12695,2,0,L|178:195,1,75,2|0,0:0|0:0,0:0:0:0:
+183,199,13241,2,0,L|181:170,1,30,2|0,0:0|0:0,0:0:0:0:
+186,72,13604,5,0,3:0:0:0:
+188,35,13786,1,0,3:0:0:0:
+191,0,13968,1,0,3:2:0:0:
+191,0,14150,2,0,L|195:89,1,90,2|2,0:0|0:0,0:0:0:0:
+206,181,15059,37,2,3:2:0:0:
+207,167,15150,1,2,0:0:0:0:
+208,152,15240,1,2,0:0:0:0:
+214,115,15422,1,2,0:0:0:0:
+214,115,15604,2,0,L|218:189,1,75,2|0,0:0|0:0,0:0:0:0:
+223,193,16150,6,0,L|221:169,2,22.5,2|2|2,0:0|0:0|0:0,0:0:0:0:
+226,228,16513,1,2,3:1:0:0:
+229,263,16695,1,2,0:1:0:0:
+230,277,16785,1,2,0:1:0:0:
+231,292,16877,2,0,L|233:321,1,30,2|0,3:1|0:0,0:0:0:0:
+236,218,17241,6,0,L|238:180,2,35.9999989013672,0|0|0,1:0|3:0|3:0,0:0:0:0:
+246,362,18150,21,2,3:2:0:0:
+248,315,18331,1,2,0:0:0:0:
+253,358,18695,5,2,0:0:0:0:
+257,310,18877,1,2,1:2:0:0:
+261,354,19059,2,0,P|266:369|265:384,2,30,2|0|0,0:0|0:1|0:0,0:0:0:0:
+266,305,19604,37,0,3:0:0:0:
+269,254,19786,1,2,0:3:0:0:
+270,240,19876,1,2,0:3:0:0:
+271,225,19968,2,0,L|272:204,2,15,2|2|2,3:1|0:1|0:1,0:0:0:0:
+275,301,20331,1,2,1:0:0:0:
+276,316,20422,2,0,B|277:328|277:328|275:332|275:332|276:345,1,30,2|0,0:1|0:0,0:0:0:0:
+281,349,20695,2,0,B|278:335|287:332|282:316,1,30,2|0,0:1|0:0,0:0:0:0:
+286,142,21059,5,4,3:0:0:0:
+291,199,21240,2,0,B|291:209|283:214|283:214|281:204|291:199,1,35.9999989013672,8|0,0:3|0:0,0:0:0:0:
+296,139,21604,37,4,0:3:0:0:
+296,197,21786,2,0,P|300:211|299:226,1,30,2|0,1:1|0:0,0:0:0:0:
+301,291,22150,2,0,P|297:276|297:261,1,30,2|0,0:1|0:0,0:0:0:0:
+306,136,22513,5,2,3:3:0:0:
+311,97,22695,1,2,0:3:0:0:
+311,97,22786,1,2,0:3:0:0:
+311,97,22877,1,2,3:1:0:0:
+313,106,22968,1,2,0:1:0:0:
+314,115,23059,1,2,0:1:0:0:
+315,124,23150,1,2,0:1:0:0:
+316,133,23240,6,0,B|308:125|308:125|306:136,1,22.5000008583069,2|0,1:1|0:0,0:0:0:0:
+319,168,23421,5,2,0:1:0:0:
+319,201,23604,38,0,L|320:224,1,22.5000008583069,2|0,0:3|0:0,0:0:0:0:
+323,200,23786,2,0,L|324:223,1,22.5000008583069,2|0,0:3|0:0,0:0:0:0:
+328,297,23968,21,2,3:2:0:0:
+328,297,24150,2,0,L|326:268,1,30,2|0,0:0|0:0,0:0:0:0:
+331,373,24513,1,2,0:0:0:0:
+338,344,24695,1,2,1:0:0:0:
+337,329,24787,2,0,L|336:314,1,15,2|0,0:1|0:0,0:0:0:0:
+341,239,25059,2,0,L|339:210,1,30,2|0,0:1|0:0,0:0:0:0:
+351,122,25422,5,2,3:2:0:0:
+351,122,25604,2,0,L|352:107,2,15,2|2|2,0:0|0:0|3:2,0:0:0:0:
+354,195,25968,1,2,0:3:0:0:
+355,180,26059,1,2,0:3:0:0:
+356,165,26149,2,0,L|358:136,2,30,2|0|0,1:3|0:0|0:0,0:0:0:0:
+366,79,26877,37,2,3:2:0:0:
+369,44,27059,1,2,0:1:0:0:
+370,30,27149,1,2,0:1:0:0:
+371,15,27240,2,0,L|371:0,2,15,2|2|2,0:1|0:1|0:1,0:0:0:0:
+376,101,27604,1,2,1:1:0:0:
+377,86,27696,2,0,L|378:65,1,15,2|0,0:1|0:0,0:0:0:0:
+381,138,27968,2,0,L|379:167,1,30,2|0,0:1|0:0,0:0:0:0:
+386,277,28331,5,2,3:3:0:0:
+389,242,28513,1,2,0:3:0:0:
+390,227,28604,1,2,0:3:0:0:
+391,212,28695,2,0,L|393:183,1,30,2|2,0:3|0:3,0:0:0:0:
+398,293,29059,6,0,L|396:331,2,37.5,2|2|2,1:0|3:1|3:1,0:0:0:0:
+406,83,29786,21,2,3:2:0:0:
+408,130,29967,1,2,0:0:0:0:
+413,87,30331,5,2,0:0:0:0:
+417,135,30513,1,2,1:0:0:0:
+418,150,30605,2,0,L|419:171,1,15,2|0,0:1|0:0,0:0:0:0:
+421,91,30877,2,0,P|426:76|425:61,1,30,2|0,0:1|0:0,0:0:0:0:
+426,140,31240,37,2,3:2:0:0:
+429,193,31422,1,2,0:1:0:0:
+430,208,31513,1,2,0:1:0:0:
+431,223,31603,1,2,0:1:0:0:
+433,237,31695,1,2,0:1:0:0:
+434,252,31786,2,0,P|436:237|435:222,1,30,2|0,0:2|1:0,0:0:0:0:
+442,296,32149,2,0,P|439:310|440:325,1,30,2|0,0:0|0:0,0:0:0:0:
+446,120,32695,5,4,3:0:0:0:
+451,63,32877,2,0,B|448:54|448:54|441:49|441:49|443:57|443:57|451:63,1,35.9999989013672,8|0,0:3|0:0,0:0:0:0:
+456,123,33240,37,4,0:3:0:0:
+456,65,33422,1,2,1:0:0:0:
+457,50,33513,2,0,P|451:31|443:20,1,30,2|0,0:1|0:0,0:0:0:0:
+461,0,33786,1,2,0:1:0:0:
+462,15,33877,2,0,L|462:29,1,15,2|0,0:1|0:0,0:0:0:0:
+466,127,34149,5,2,3:3:0:0:
+470,180,34331,1,2,0:3:0:0:
+470,180,34422,1,2,0:3:0:0:
+470,180,34513,1,2,3:1:0:0:
+471,171,34604,1,2,0:1:0:0:
+472,162,34695,1,2,0:1:0:0:
+476,130,34877,6,0,B|486:125|486:125|481:127|475:126,1,22.5000008583069,2|0,1:1|0:0,0:0:0:0:
+479,95,35059,5,2,0:1:0:0:
+479,62,35240,38,0,L|480:39,1,22.5000008583069,2|0,0:3|0:0,0:0:0:0:
+483,63,35422,2,0,L|484:40,1,22.5000008583069,2|0,0:3|0:0,0:0:0:0:
+256,192,35604,12,4,37013,0:3:0:0:
+256,192,37059,12,4,39149,0:3:0:0:
+496,360,40695,6,0,B|498:344|498:344|495:329|495:329|496:314,1,45.0000017166138,2|0,3:1|0:0,0:0:0:0:
+503,270,41059,1,2,0:1:0:0:
+504,262,41150,1,2,0:1:0:0:
+505,254,41240,2,0,L|506:242,3,11.2500004291535,2|0|0|0,0:1|0:0|0:0|0:0,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2781126-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2781126-expected-conversion.json
new file mode 100644
index 0000000000..e03f6ae672
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2781126-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":313.0,"Objects":[{"StartTime":313.0,"Position":65.0,"HyperDash":false},{"StartTime":366.0,"Position":482.0,"HyperDash":false},{"StartTime":420.0,"Position":164.0,"HyperDash":false},{"StartTime":474.0,"Position":315.0,"HyperDash":false},{"StartTime":528.0,"Position":145.0,"HyperDash":false},{"StartTime":582.0,"Position":159.0,"HyperDash":false},{"StartTime":636.0,"Position":310.0,"HyperDash":false},{"StartTime":690.0,"Position":441.0,"HyperDash":false},{"StartTime":744.0,"Position":428.0,"HyperDash":false},{"StartTime":797.0,"Position":243.0,"HyperDash":false},{"StartTime":851.0,"Position":422.0,"HyperDash":false},{"StartTime":905.0,"Position":481.0,"HyperDash":false},{"StartTime":959.0,"Position":104.0,"HyperDash":false},{"StartTime":1013.0,"Position":473.0,"HyperDash":false},{"StartTime":1067.0,"Position":135.0,"HyperDash":false},{"StartTime":1121.0,"Position":360.0,"HyperDash":false},{"StartTime":1175.0,"Position":123.0,"HyperDash":false}]},{"StartTime":1348.0,"Objects":[{"StartTime":1348.0,"Position":224.0,"HyperDash":false}]},{"StartTime":1434.0,"Objects":[{"StartTime":1434.0,"Position":177.0,"HyperDash":false}]},{"StartTime":1520.0,"Objects":[{"StartTime":1520.0,"Position":179.0,"HyperDash":false}]},{"StartTime":1606.0,"Objects":[{"StartTime":1606.0,"Position":227.0,"HyperDash":false}]},{"StartTime":1693.0,"Objects":[{"StartTime":1693.0,"Position":292.0,"HyperDash":false},{"StartTime":1779.0,"Position":295.206116,"HyperDash":true}]},{"StartTime":1865.0,"Objects":[{"StartTime":1865.0,"Position":116.0,"HyperDash":false},{"StartTime":1951.0,"Position":99.0,"HyperDash":false},{"StartTime":2037.0,"Position":117.970421,"HyperDash":false},{"StartTime":2105.0,"Position":172.025635,"HyperDash":false},{"StartTime":2209.0,"Position":206.639481,"HyperDash":false}]},{"StartTime":2296.0,"Objects":[{"StartTime":2296.0,"Position":116.0,"HyperDash":false}]},{"StartTime":2382.0,"Objects":[{"StartTime":2382.0,"Position":26.0,"HyperDash":false},{"StartTime":2450.0,"Position":34.6324959,"HyperDash":false},{"StartTime":2554.0,"Position":22.54102,"HyperDash":true}]},{"StartTime":2727.0,"Objects":[{"StartTime":2727.0,"Position":292.0,"HyperDash":false},{"StartTime":2795.0,"Position":337.5814,"HyperDash":false},{"StartTime":2899.0,"Position":382.0,"HyperDash":false}]},{"StartTime":2986.0,"Objects":[{"StartTime":2986.0,"Position":328.0,"HyperDash":false}]},{"StartTime":3072.0,"Objects":[{"StartTime":3072.0,"Position":276.0,"HyperDash":false}]},{"StartTime":3244.0,"Objects":[{"StartTime":3244.0,"Position":448.0,"HyperDash":false}]},{"StartTime":3417.0,"Objects":[{"StartTime":3417.0,"Position":268.0,"HyperDash":false},{"StartTime":3485.0,"Position":236.41861,"HyperDash":false},{"StartTime":3589.0,"Position":178.0,"HyperDash":false}]},{"StartTime":3675.0,"Objects":[{"StartTime":3675.0,"Position":244.0,"HyperDash":false}]},{"StartTime":3762.0,"Objects":[{"StartTime":3762.0,"Position":178.0,"HyperDash":false},{"StartTime":3830.0,"Position":149.41861,"HyperDash":false},{"StartTime":3934.0,"Position":88.0,"HyperDash":true}]},{"StartTime":4106.0,"Objects":[{"StartTime":4106.0,"Position":444.0,"HyperDash":false},{"StartTime":4192.0,"Position":447.737061,"HyperDash":false}]},{"StartTime":4279.0,"Objects":[{"StartTime":4279.0,"Position":376.0,"HyperDash":false},{"StartTime":4365.0,"Position":372.262939,"HyperDash":false}]},{"StartTime":4451.0,"Objects":[{"StartTime":4451.0,"Position":300.0,"HyperDash":false}]},{"StartTime":4624.0,"Objects":[{"StartTime":4624.0,"Position":472.0,"HyperDash":false},{"StartTime":4710.0,"Position":475.451355,"HyperDash":true}]},{"StartTime":4796.0,"Objects":[{"StartTime":4796.0,"Position":296.0,"HyperDash":false},{"StartTime":4864.0,"Position":285.639862,"HyperDash":false},{"StartTime":4968.0,"Position":274.157928,"HyperDash":false}]},{"StartTime":5055.0,"Objects":[{"StartTime":5055.0,"Position":366.0,"HyperDash":false}]},{"StartTime":5141.0,"Objects":[{"StartTime":5141.0,"Position":456.0,"HyperDash":false},{"StartTime":5209.0,"Position":405.4186,"HyperDash":false},{"StartTime":5313.0,"Position":366.0,"HyperDash":true}]},{"StartTime":5486.0,"Objects":[{"StartTime":5486.0,"Position":112.0,"HyperDash":false},{"StartTime":5554.0,"Position":144.58139,"HyperDash":false},{"StartTime":5658.0,"Position":202.0,"HyperDash":false}]},{"StartTime":5744.0,"Objects":[{"StartTime":5744.0,"Position":268.0,"HyperDash":false}]},{"StartTime":5831.0,"Objects":[{"StartTime":5831.0,"Position":202.0,"HyperDash":false}]},{"StartTime":6003.0,"Objects":[{"StartTime":6003.0,"Position":360.0,"HyperDash":false}]},{"StartTime":6175.0,"Objects":[{"StartTime":6175.0,"Position":192.0,"HyperDash":false},{"StartTime":6243.0,"Position":146.41861,"HyperDash":false},{"StartTime":6347.0,"Position":102.0,"HyperDash":false}]},{"StartTime":6434.0,"Objects":[{"StartTime":6434.0,"Position":172.0,"HyperDash":false}]},{"StartTime":6520.0,"Objects":[{"StartTime":6520.0,"Position":102.0,"HyperDash":false},{"StartTime":6588.0,"Position":71.4186,"HyperDash":false},{"StartTime":6692.0,"Position":12.0,"HyperDash":true}]},{"StartTime":6865.0,"Objects":[{"StartTime":6865.0,"Position":288.0,"HyperDash":false}]},{"StartTime":6951.0,"Objects":[{"StartTime":6951.0,"Position":335.0,"HyperDash":false}]},{"StartTime":7037.0,"Objects":[{"StartTime":7037.0,"Position":333.0,"HyperDash":false}]},{"StartTime":7124.0,"Objects":[{"StartTime":7124.0,"Position":285.0,"HyperDash":false}]},{"StartTime":7210.0,"Objects":[{"StartTime":7210.0,"Position":220.0,"HyperDash":false},{"StartTime":7296.0,"Position":216.793884,"HyperDash":false}]},{"StartTime":7382.0,"Objects":[{"StartTime":7382.0,"Position":320.0,"HyperDash":false}]},{"StartTime":7555.0,"Objects":[{"StartTime":7555.0,"Position":204.0,"HyperDash":true}]},{"StartTime":7727.0,"Objects":[{"StartTime":7727.0,"Position":456.0,"HyperDash":false}]},{"StartTime":7813.0,"Objects":[{"StartTime":7813.0,"Position":460.0,"HyperDash":false}]},{"StartTime":7900.0,"Objects":[{"StartTime":7900.0,"Position":464.0,"HyperDash":false},{"StartTime":7968.0,"Position":437.4186,"HyperDash":false},{"StartTime":8072.0,"Position":374.0,"HyperDash":true}]},{"StartTime":8244.0,"Objects":[{"StartTime":8244.0,"Position":120.0,"HyperDash":false},{"StartTime":8312.0,"Position":159.58139,"HyperDash":false},{"StartTime":8416.0,"Position":210.0,"HyperDash":false}]},{"StartTime":8503.0,"Objects":[{"StartTime":8503.0,"Position":280.0,"HyperDash":false}]},{"StartTime":8589.0,"Objects":[{"StartTime":8589.0,"Position":348.0,"HyperDash":false}]},{"StartTime":8762.0,"Objects":[{"StartTime":8762.0,"Position":176.0,"HyperDash":false}]},{"StartTime":8934.0,"Objects":[{"StartTime":8934.0,"Position":354.0,"HyperDash":false},{"StartTime":9002.0,"Position":379.5814,"HyperDash":false},{"StartTime":9106.0,"Position":444.0,"HyperDash":false}]},{"StartTime":9193.0,"Objects":[{"StartTime":9193.0,"Position":374.0,"HyperDash":false}]},{"StartTime":9279.0,"Objects":[{"StartTime":9279.0,"Position":306.0,"HyperDash":false},{"StartTime":9347.0,"Position":331.5814,"HyperDash":false},{"StartTime":9451.0,"Position":396.0,"HyperDash":true}]},{"StartTime":9624.0,"Objects":[{"StartTime":9624.0,"Position":148.0,"HyperDash":false},{"StartTime":9710.0,"Position":104.34359,"HyperDash":false}]},{"StartTime":9796.0,"Objects":[{"StartTime":9796.0,"Position":176.0,"HyperDash":false},{"StartTime":9882.0,"Position":219.6564,"HyperDash":false}]},{"StartTime":9969.0,"Objects":[{"StartTime":9969.0,"Position":148.0,"HyperDash":false}]},{"StartTime":10141.0,"Objects":[{"StartTime":10141.0,"Position":308.0,"HyperDash":false}]},{"StartTime":10313.0,"Objects":[{"StartTime":10313.0,"Position":140.0,"HyperDash":true}]},{"StartTime":10486.0,"Objects":[{"StartTime":10486.0,"Position":396.0,"HyperDash":false},{"StartTime":10572.0,"Position":441.0,"HyperDash":false},{"StartTime":10658.0,"Position":396.0,"HyperDash":false}]},{"StartTime":10831.0,"Objects":[{"StartTime":10831.0,"Position":228.0,"HyperDash":true}]},{"StartTime":11003.0,"Objects":[{"StartTime":11003.0,"Position":460.0,"HyperDash":false},{"StartTime":11089.0,"Position":482.326263,"HyperDash":false}]},{"StartTime":11175.0,"Objects":[{"StartTime":11175.0,"Position":392.0,"HyperDash":false},{"StartTime":11261.0,"Position":414.326263,"HyperDash":false}]},{"StartTime":11348.0,"Objects":[{"StartTime":11348.0,"Position":324.0,"HyperDash":false},{"StartTime":11434.0,"Position":345.614166,"HyperDash":false}]},{"StartTime":11520.0,"Objects":[{"StartTime":11520.0,"Position":260.0,"HyperDash":false},{"StartTime":11606.0,"Position":282.326263,"HyperDash":false}]},{"StartTime":11693.0,"Objects":[{"StartTime":11693.0,"Position":384.0,"HyperDash":false}]},{"StartTime":11865.0,"Objects":[{"StartTime":11865.0,"Position":220.0,"HyperDash":false},{"StartTime":11951.0,"Position":175.0,"HyperDash":true}]},{"StartTime":12037.0,"Objects":[{"StartTime":12037.0,"Position":400.0,"HyperDash":false},{"StartTime":12123.0,"Position":463.25,"HyperDash":false},{"StartTime":12209.0,"Position":488.0,"HyperDash":false},{"StartTime":12295.0,"Position":488.0,"HyperDash":true}]},{"StartTime":12382.0,"Objects":[{"StartTime":12382.0,"Position":284.0,"HyperDash":false},{"StartTime":12450.0,"Position":255.41861,"HyperDash":false},{"StartTime":12554.0,"Position":194.0,"HyperDash":false}]},{"StartTime":12641.0,"Objects":[{"StartTime":12641.0,"Position":264.0,"HyperDash":true}]},{"StartTime":12727.0,"Objects":[{"StartTime":12727.0,"Position":436.0,"HyperDash":false}]},{"StartTime":12900.0,"Objects":[{"StartTime":12900.0,"Position":328.0,"HyperDash":false},{"StartTime":12986.0,"Position":324.793884,"HyperDash":false}]},{"StartTime":13072.0,"Objects":[{"StartTime":13072.0,"Position":424.0,"HyperDash":false},{"StartTime":13140.0,"Position":437.3675,"HyperDash":false},{"StartTime":13244.0,"Position":427.458984,"HyperDash":false}]},{"StartTime":13331.0,"Objects":[{"StartTime":13331.0,"Position":360.0,"HyperDash":true}]},{"StartTime":13417.0,"Objects":[{"StartTime":13417.0,"Position":208.0,"HyperDash":false},{"StartTime":13485.0,"Position":174.41861,"HyperDash":false},{"StartTime":13589.0,"Position":118.0,"HyperDash":false}]},{"StartTime":13762.0,"Objects":[{"StartTime":13762.0,"Position":292.0,"HyperDash":false},{"StartTime":13830.0,"Position":274.545563,"HyperDash":false},{"StartTime":13934.0,"Position":295.909363,"HyperDash":false}]},{"StartTime":14020.0,"Objects":[{"StartTime":14020.0,"Position":228.0,"HyperDash":true}]},{"StartTime":14106.0,"Objects":[{"StartTime":14106.0,"Position":408.0,"HyperDash":false},{"StartTime":14174.0,"Position":426.5814,"HyperDash":false},{"StartTime":14278.0,"Position":498.0,"HyperDash":true}]},{"StartTime":14451.0,"Objects":[{"StartTime":14451.0,"Position":228.0,"HyperDash":false},{"StartTime":14519.0,"Position":266.5814,"HyperDash":false},{"StartTime":14623.0,"Position":318.0,"HyperDash":true}]},{"StartTime":14796.0,"Objects":[{"StartTime":14796.0,"Position":48.0,"HyperDash":false},{"StartTime":14864.0,"Position":91.5814,"HyperDash":false},{"StartTime":14968.0,"Position":138.0,"HyperDash":true}]},{"StartTime":15141.0,"Objects":[{"StartTime":15141.0,"Position":392.0,"HyperDash":false},{"StartTime":15227.0,"Position":394.993347,"HyperDash":false}]},{"StartTime":15313.0,"Objects":[{"StartTime":15313.0,"Position":320.0,"HyperDash":false},{"StartTime":15399.0,"Position":317.006653,"HyperDash":true}]},{"StartTime":15486.0,"Objects":[{"StartTime":15486.0,"Position":488.0,"HyperDash":false}]},{"StartTime":15658.0,"Objects":[{"StartTime":15658.0,"Position":388.0,"HyperDash":false},{"StartTime":15744.0,"Position":343.0,"HyperDash":false}]},{"StartTime":15831.0,"Objects":[{"StartTime":15831.0,"Position":240.0,"HyperDash":false},{"StartTime":15899.0,"Position":231.454437,"HyperDash":false},{"StartTime":16003.0,"Position":236.090652,"HyperDash":false}]},{"StartTime":16089.0,"Objects":[{"StartTime":16089.0,"Position":304.0,"HyperDash":true}]},{"StartTime":16175.0,"Objects":[{"StartTime":16175.0,"Position":132.0,"HyperDash":false},{"StartTime":16243.0,"Position":99.4186,"HyperDash":false},{"StartTime":16347.0,"Position":42.0,"HyperDash":true}]},{"StartTime":16520.0,"Objects":[{"StartTime":16520.0,"Position":312.0,"HyperDash":false},{"StartTime":16588.0,"Position":274.4186,"HyperDash":false},{"StartTime":16692.0,"Position":222.0,"HyperDash":false}]},{"StartTime":16779.0,"Objects":[{"StartTime":16779.0,"Position":152.0,"HyperDash":true}]},{"StartTime":16865.0,"Objects":[{"StartTime":16865.0,"Position":328.0,"HyperDash":false},{"StartTime":16933.0,"Position":309.4186,"HyperDash":false},{"StartTime":17037.0,"Position":238.0,"HyperDash":false}]},{"StartTime":17210.0,"Objects":[{"StartTime":17210.0,"Position":328.0,"HyperDash":false}]},{"StartTime":17382.0,"Objects":[{"StartTime":17382.0,"Position":164.0,"HyperDash":false},{"StartTime":17468.0,"Position":160.54866,"HyperDash":true}]},{"StartTime":17555.0,"Objects":[{"StartTime":17555.0,"Position":336.0,"HyperDash":false},{"StartTime":17623.0,"Position":354.5814,"HyperDash":false},{"StartTime":17727.0,"Position":426.0,"HyperDash":true}]},{"StartTime":17900.0,"Objects":[{"StartTime":17900.0,"Position":152.0,"HyperDash":false}]},{"StartTime":17986.0,"Objects":[{"StartTime":17986.0,"Position":155.0,"HyperDash":false}]},{"StartTime":18072.0,"Objects":[{"StartTime":18072.0,"Position":192.0,"HyperDash":false}]},{"StartTime":18158.0,"Objects":[{"StartTime":18158.0,"Position":252.0,"HyperDash":true}]},{"StartTime":18244.0,"Objects":[{"StartTime":18244.0,"Position":404.0,"HyperDash":false},{"StartTime":18312.0,"Position":416.481262,"HyperDash":false},{"StartTime":18416.0,"Position":407.746735,"HyperDash":true}]},{"StartTime":18589.0,"Objects":[{"StartTime":18589.0,"Position":156.0,"HyperDash":false},{"StartTime":18657.0,"Position":101.4186,"HyperDash":false},{"StartTime":18761.0,"Position":66.0,"HyperDash":false}]},{"StartTime":18848.0,"Objects":[{"StartTime":18848.0,"Position":136.0,"HyperDash":true}]},{"StartTime":18934.0,"Objects":[{"StartTime":18934.0,"Position":304.0,"HyperDash":false},{"StartTime":19002.0,"Position":346.5814,"HyperDash":false},{"StartTime":19106.0,"Position":394.0,"HyperDash":true}]},{"StartTime":19279.0,"Objects":[{"StartTime":19279.0,"Position":120.0,"HyperDash":false},{"StartTime":19347.0,"Position":113.063881,"HyperDash":false},{"StartTime":19451.0,"Position":111.495346,"HyperDash":false}]},{"StartTime":19537.0,"Objects":[{"StartTime":19537.0,"Position":180.0,"HyperDash":true}]},{"StartTime":19624.0,"Objects":[{"StartTime":19624.0,"Position":360.0,"HyperDash":false},{"StartTime":19692.0,"Position":315.4186,"HyperDash":false},{"StartTime":19796.0,"Position":270.0,"HyperDash":true}]},{"StartTime":19969.0,"Objects":[{"StartTime":19969.0,"Position":32.0,"HyperDash":false},{"StartTime":20037.0,"Position":60.581398,"HyperDash":false},{"StartTime":20141.0,"Position":122.0,"HyperDash":false}]},{"StartTime":20227.0,"Objects":[{"StartTime":20227.0,"Position":188.0,"HyperDash":true}]},{"StartTime":20313.0,"Objects":[{"StartTime":20313.0,"Position":16.0,"HyperDash":false},{"StartTime":20381.0,"Position":51.581398,"HyperDash":false},{"StartTime":20485.0,"Position":106.0,"HyperDash":true}]},{"StartTime":20658.0,"Objects":[{"StartTime":20658.0,"Position":368.0,"HyperDash":false},{"StartTime":20744.0,"Position":320.104462,"HyperDash":false},{"StartTime":20830.0,"Position":260.0,"HyperDash":false},{"StartTime":20916.0,"Position":298.686646,"HyperDash":false},{"StartTime":21002.0,"Position":368.0,"HyperDash":false},{"StartTime":21070.0,"Position":333.8027,"HyperDash":false},{"StartTime":21175.0,"Position":260.0,"HyperDash":true}]},{"StartTime":21348.0,"Objects":[{"StartTime":21348.0,"Position":496.0,"HyperDash":false}]},{"StartTime":21520.0,"Objects":[{"StartTime":21520.0,"Position":324.0,"HyperDash":false}]},{"StartTime":21693.0,"Objects":[{"StartTime":21693.0,"Position":496.0,"HyperDash":false}]},{"StartTime":21865.0,"Objects":[{"StartTime":21865.0,"Position":388.0,"HyperDash":false},{"StartTime":21951.0,"Position":343.0,"HyperDash":true}]},{"StartTime":22037.0,"Objects":[{"StartTime":22037.0,"Position":144.0,"HyperDash":false}]},{"StartTime":22210.0,"Objects":[{"StartTime":22210.0,"Position":252.0,"HyperDash":false},{"StartTime":22296.0,"Position":231.875381,"HyperDash":false}]},{"StartTime":22382.0,"Objects":[{"StartTime":22382.0,"Position":312.0,"HyperDash":false},{"StartTime":22468.0,"Position":291.8754,"HyperDash":false}]},{"StartTime":22555.0,"Objects":[{"StartTime":22555.0,"Position":372.0,"HyperDash":false},{"StartTime":22641.0,"Position":351.8754,"HyperDash":true}]},{"StartTime":22727.0,"Objects":[{"StartTime":22727.0,"Position":180.0,"HyperDash":false},{"StartTime":22795.0,"Position":226.58139,"HyperDash":false},{"StartTime":22899.0,"Position":270.0,"HyperDash":false}]},{"StartTime":22986.0,"Objects":[{"StartTime":22986.0,"Position":208.0,"HyperDash":true}]},{"StartTime":23072.0,"Objects":[{"StartTime":23072.0,"Position":436.0,"HyperDash":false},{"StartTime":23158.0,"Position":486.800659,"HyperDash":false},{"StartTime":23244.0,"Position":494.721924,"HyperDash":false},{"StartTime":23330.0,"Position":435.854675,"HyperDash":true}]},{"StartTime":23417.0,"Objects":[{"StartTime":23417.0,"Position":208.0,"HyperDash":false},{"StartTime":23503.0,"Position":163.75,"HyperDash":false},{"StartTime":23589.0,"Position":95.5,"HyperDash":false},{"StartTime":23657.0,"Position":134.976746,"HyperDash":false},{"StartTime":23761.0,"Position":208.0,"HyperDash":false}]},{"StartTime":23934.0,"Objects":[{"StartTime":23934.0,"Position":312.0,"HyperDash":false}]},{"StartTime":24020.0,"Objects":[{"StartTime":24020.0,"Position":220.0,"HyperDash":false}]},{"StartTime":24106.0,"Objects":[{"StartTime":24106.0,"Position":128.0,"HyperDash":false},{"StartTime":24174.0,"Position":164.58139,"HyperDash":false},{"StartTime":24278.0,"Position":218.0,"HyperDash":false}]},{"StartTime":24451.0,"Objects":[{"StartTime":24451.0,"Position":392.0,"HyperDash":false}]},{"StartTime":24537.0,"Objects":[{"StartTime":24537.0,"Position":444.0,"HyperDash":false}]},{"StartTime":24624.0,"Objects":[{"StartTime":24624.0,"Position":444.0,"HyperDash":false}]},{"StartTime":24710.0,"Objects":[{"StartTime":24710.0,"Position":392.0,"HyperDash":true}]},{"StartTime":24796.0,"Objects":[{"StartTime":24796.0,"Position":212.0,"HyperDash":false},{"StartTime":24882.0,"Position":244.0,"HyperDash":false},{"StartTime":24968.0,"Position":302.0,"HyperDash":false},{"StartTime":25036.0,"Position":269.4186,"HyperDash":false},{"StartTime":25140.0,"Position":212.0,"HyperDash":false}]},{"StartTime":25313.0,"Objects":[{"StartTime":25313.0,"Position":320.0,"HyperDash":false}]},{"StartTime":25400.0,"Objects":[{"StartTime":25400.0,"Position":384.0,"HyperDash":false}]},{"StartTime":25486.0,"Objects":[{"StartTime":25486.0,"Position":284.0,"HyperDash":false},{"StartTime":25554.0,"Position":267.4186,"HyperDash":false},{"StartTime":25658.0,"Position":194.0,"HyperDash":true}]},{"StartTime":25831.0,"Objects":[{"StartTime":25831.0,"Position":448.0,"HyperDash":false},{"StartTime":25917.0,"Position":444.548645,"HyperDash":false}]},{"StartTime":26003.0,"Objects":[{"StartTime":26003.0,"Position":344.0,"HyperDash":false},{"StartTime":26089.0,"Position":299.0,"HyperDash":true}]},{"StartTime":26175.0,"Objects":[{"StartTime":26175.0,"Position":128.0,"HyperDash":false},{"StartTime":26261.0,"Position":80.0,"HyperDash":false},{"StartTime":26347.0,"Position":38.0,"HyperDash":false},{"StartTime":26415.0,"Position":73.58139,"HyperDash":false},{"StartTime":26519.0,"Position":128.0,"HyperDash":false}]},{"StartTime":26693.0,"Objects":[{"StartTime":26693.0,"Position":236.0,"HyperDash":false}]},{"StartTime":26779.0,"Objects":[{"StartTime":26779.0,"Position":299.0,"HyperDash":false}]},{"StartTime":26865.0,"Objects":[{"StartTime":26865.0,"Position":362.0,"HyperDash":false}]},{"StartTime":27037.0,"Objects":[{"StartTime":27037.0,"Position":196.0,"HyperDash":false}]},{"StartTime":27210.0,"Objects":[{"StartTime":27210.0,"Position":352.0,"HyperDash":false}]},{"StartTime":27296.0,"Objects":[{"StartTime":27296.0,"Position":352.0,"HyperDash":false}]},{"StartTime":27382.0,"Objects":[{"StartTime":27382.0,"Position":312.0,"HyperDash":false}]},{"StartTime":27469.0,"Objects":[{"StartTime":27469.0,"Position":248.0,"HyperDash":true}]},{"StartTime":27555.0,"Objects":[{"StartTime":27555.0,"Position":412.0,"HyperDash":false},{"StartTime":27641.0,"Position":349.0,"HyperDash":false},{"StartTime":27727.0,"Position":322.0,"HyperDash":false},{"StartTime":27795.0,"Position":343.5814,"HyperDash":false},{"StartTime":27899.0,"Position":412.0,"HyperDash":false}]},{"StartTime":28072.0,"Objects":[{"StartTime":28072.0,"Position":304.0,"HyperDash":false}]},{"StartTime":28158.0,"Objects":[{"StartTime":28158.0,"Position":396.0,"HyperDash":false}]},{"StartTime":28244.0,"Objects":[{"StartTime":28244.0,"Position":488.0,"HyperDash":false},{"StartTime":28312.0,"Position":451.4186,"HyperDash":false},{"StartTime":28416.0,"Position":398.0,"HyperDash":true}]},{"StartTime":28589.0,"Objects":[{"StartTime":28589.0,"Position":88.0,"HyperDash":false}]},{"StartTime":28934.0,"Objects":[{"StartTime":28934.0,"Position":340.0,"HyperDash":false},{"StartTime":29002.0,"Position":358.545563,"HyperDash":false},{"StartTime":29106.0,"Position":343.909363,"HyperDash":false}]},{"StartTime":29279.0,"Objects":[{"StartTime":29279.0,"Position":172.0,"HyperDash":false},{"StartTime":29347.0,"Position":182.577881,"HyperDash":false},{"StartTime":29451.0,"Position":168.402878,"HyperDash":false}]},{"StartTime":29537.0,"Objects":[{"StartTime":29537.0,"Position":268.0,"HyperDash":false}]},{"StartTime":29624.0,"Objects":[{"StartTime":29624.0,"Position":368.0,"HyperDash":false},{"StartTime":29692.0,"Position":343.4186,"HyperDash":false},{"StartTime":29796.0,"Position":278.0,"HyperDash":false}]},{"StartTime":29969.0,"Objects":[{"StartTime":29969.0,"Position":452.0,"HyperDash":false},{"StartTime":30055.0,"Position":459.397949,"HyperDash":false},{"StartTime":30141.0,"Position":452.0,"HyperDash":true}]},{"StartTime":30313.0,"Objects":[{"StartTime":30313.0,"Position":200.0,"HyperDash":false},{"StartTime":30381.0,"Position":196.454437,"HyperDash":false},{"StartTime":30485.0,"Position":196.090652,"HyperDash":false}]},{"StartTime":30658.0,"Objects":[{"StartTime":30658.0,"Position":368.0,"HyperDash":false},{"StartTime":30726.0,"Position":349.4186,"HyperDash":false},{"StartTime":30830.0,"Position":278.0,"HyperDash":false}]},{"StartTime":30917.0,"Objects":[{"StartTime":30917.0,"Position":380.0,"HyperDash":false}]},{"StartTime":31003.0,"Objects":[{"StartTime":31003.0,"Position":480.0,"HyperDash":false},{"StartTime":31071.0,"Position":435.4186,"HyperDash":false},{"StartTime":31175.0,"Position":390.0,"HyperDash":true}]},{"StartTime":31348.0,"Objects":[{"StartTime":31348.0,"Position":128.0,"HyperDash":false},{"StartTime":31434.0,"Position":124.54866,"HyperDash":false}]},{"StartTime":31520.0,"Objects":[{"StartTime":31520.0,"Position":228.0,"HyperDash":false},{"StartTime":31606.0,"Position":273.0,"HyperDash":true}]},{"StartTime":31693.0,"Objects":[{"StartTime":31693.0,"Position":88.0,"HyperDash":false},{"StartTime":31761.0,"Position":101.632492,"HyperDash":false},{"StartTime":31865.0,"Position":84.5410156,"HyperDash":false}]},{"StartTime":32037.0,"Objects":[{"StartTime":32037.0,"Position":256.0,"HyperDash":false},{"StartTime":32105.0,"Position":278.5814,"HyperDash":false},{"StartTime":32209.0,"Position":346.0,"HyperDash":false}]},{"StartTime":32296.0,"Objects":[{"StartTime":32296.0,"Position":246.0,"HyperDash":false}]},{"StartTime":32382.0,"Objects":[{"StartTime":32382.0,"Position":148.0,"HyperDash":false},{"StartTime":32450.0,"Position":101.4186,"HyperDash":false},{"StartTime":32554.0,"Position":58.0,"HyperDash":false}]},{"StartTime":32727.0,"Objects":[{"StartTime":32727.0,"Position":232.0,"HyperDash":false}]},{"StartTime":32813.0,"Objects":[{"StartTime":32813.0,"Position":180.0,"HyperDash":false}]},{"StartTime":32900.0,"Objects":[{"StartTime":32900.0,"Position":124.0,"HyperDash":true}]},{"StartTime":33072.0,"Objects":[{"StartTime":33072.0,"Position":376.0,"HyperDash":false},{"StartTime":33140.0,"Position":415.5814,"HyperDash":false},{"StartTime":33244.0,"Position":466.0,"HyperDash":false}]},{"StartTime":33417.0,"Objects":[{"StartTime":33417.0,"Position":300.0,"HyperDash":false},{"StartTime":33485.0,"Position":323.5814,"HyperDash":false},{"StartTime":33589.0,"Position":390.0,"HyperDash":false}]},{"StartTime":33762.0,"Objects":[{"StartTime":33762.0,"Position":220.0,"HyperDash":false},{"StartTime":33830.0,"Position":200.41861,"HyperDash":false},{"StartTime":33934.0,"Position":130.0,"HyperDash":true}]},{"StartTime":34106.0,"Objects":[{"StartTime":34106.0,"Position":416.0,"HyperDash":false},{"StartTime":34149.0,"Position":438.5,"HyperDash":false},{"StartTime":34192.0,"Position":416.0,"HyperDash":false},{"StartTime":34235.0,"Position":438.5,"HyperDash":false},{"StartTime":34278.0,"Position":416.0,"HyperDash":false},{"StartTime":34321.0,"Position":438.5,"HyperDash":false},{"StartTime":34364.0,"Position":416.0,"HyperDash":false},{"StartTime":34407.0,"Position":438.5,"HyperDash":true}]},{"StartTime":34451.0,"Objects":[{"StartTime":34451.0,"Position":265.0,"HyperDash":false},{"StartTime":34519.0,"Position":199.6279,"HyperDash":false},{"StartTime":34623.0,"Position":130.0,"HyperDash":false}]},{"StartTime":34796.0,"Objects":[{"StartTime":34796.0,"Position":300.0,"HyperDash":false},{"StartTime":34864.0,"Position":300.496857,"HyperDash":false},{"StartTime":34968.0,"Position":303.786133,"HyperDash":false}]},{"StartTime":35141.0,"Objects":[{"StartTime":35141.0,"Position":140.0,"HyperDash":true}]},{"StartTime":35313.0,"Objects":[{"StartTime":35313.0,"Position":376.0,"HyperDash":false}]},{"StartTime":35486.0,"Objects":[{"StartTime":35486.0,"Position":268.0,"HyperDash":false},{"StartTime":35554.0,"Position":253.518738,"HyperDash":false},{"StartTime":35658.0,"Position":264.253265,"HyperDash":true}]},{"StartTime":35831.0,"Objects":[{"StartTime":35831.0,"Position":496.0,"HyperDash":false},{"StartTime":35899.0,"Position":454.4186,"HyperDash":false},{"StartTime":36003.0,"Position":406.0,"HyperDash":false}]},{"StartTime":36175.0,"Objects":[{"StartTime":36175.0,"Position":236.0,"HyperDash":false},{"StartTime":36243.0,"Position":192.41861,"HyperDash":false},{"StartTime":36347.0,"Position":146.0,"HyperDash":true}]},{"StartTime":36520.0,"Objects":[{"StartTime":36520.0,"Position":400.0,"HyperDash":false}]},{"StartTime":36693.0,"Objects":[{"StartTime":36693.0,"Position":236.0,"HyperDash":true}]},{"StartTime":36865.0,"Objects":[{"StartTime":36865.0,"Position":476.0,"HyperDash":false}]},{"StartTime":36951.0,"Objects":[{"StartTime":36951.0,"Position":476.0,"HyperDash":false}]},{"StartTime":37037.0,"Objects":[{"StartTime":37037.0,"Position":434.0,"HyperDash":false}]},{"StartTime":37124.0,"Objects":[{"StartTime":37124.0,"Position":369.0,"HyperDash":true}]},{"StartTime":37210.0,"Objects":[{"StartTime":37210.0,"Position":196.0,"HyperDash":false},{"StartTime":37278.0,"Position":151.41861,"HyperDash":false},{"StartTime":37382.0,"Position":106.0,"HyperDash":false}]},{"StartTime":37555.0,"Objects":[{"StartTime":37555.0,"Position":272.0,"HyperDash":false},{"StartTime":37623.0,"Position":302.5814,"HyperDash":false},{"StartTime":37727.0,"Position":362.0,"HyperDash":false}]},{"StartTime":37900.0,"Objects":[{"StartTime":37900.0,"Position":196.0,"HyperDash":true}]},{"StartTime":38072.0,"Objects":[{"StartTime":38072.0,"Position":432.0,"HyperDash":false}]},{"StartTime":38244.0,"Objects":[{"StartTime":38244.0,"Position":324.0,"HyperDash":false}]},{"StartTime":38331.0,"Objects":[{"StartTime":38331.0,"Position":272.0,"HyperDash":false}]},{"StartTime":38417.0,"Objects":[{"StartTime":38417.0,"Position":224.0,"HyperDash":true}]},{"StartTime":38589.0,"Objects":[{"StartTime":38589.0,"Position":488.0,"HyperDash":false},{"StartTime":38657.0,"Position":483.690765,"HyperDash":false},{"StartTime":38761.0,"Position":489.747253,"HyperDash":false}]},{"StartTime":38934.0,"Objects":[{"StartTime":38934.0,"Position":324.0,"HyperDash":false},{"StartTime":39002.0,"Position":339.316925,"HyperDash":false},{"StartTime":39106.0,"Position":327.331055,"HyperDash":true}]},{"StartTime":39279.0,"Objects":[{"StartTime":39279.0,"Position":88.0,"HyperDash":false}]},{"StartTime":39451.0,"Objects":[{"StartTime":39451.0,"Position":256.0,"HyperDash":true}]},{"StartTime":39624.0,"Objects":[{"StartTime":39624.0,"Position":16.0,"HyperDash":true}]},{"StartTime":39969.0,"Objects":[{"StartTime":39969.0,"Position":428.0,"HyperDash":false},{"StartTime":40055.0,"Position":475.928162,"HyperDash":false},{"StartTime":40141.0,"Position":473.713928,"HyperDash":false},{"StartTime":40227.0,"Position":429.731,"HyperDash":false}]},{"StartTime":40313.0,"Objects":[{"StartTime":40313.0,"Position":328.0,"HyperDash":false},{"StartTime":40399.0,"Position":262.213257,"HyperDash":false},{"StartTime":40485.0,"Position":239.814941,"HyperDash":false},{"StartTime":40571.0,"Position":239.657425,"HyperDash":true}]},{"StartTime":40658.0,"Objects":[{"StartTime":40658.0,"Position":412.0,"HyperDash":false},{"StartTime":40744.0,"Position":464.25,"HyperDash":false},{"StartTime":40830.0,"Position":497.294128,"HyperDash":false},{"StartTime":40916.0,"Position":499.8483,"HyperDash":true}]},{"StartTime":41003.0,"Objects":[{"StartTime":41003.0,"Position":272.0,"HyperDash":false},{"StartTime":41089.0,"Position":253.0,"HyperDash":false},{"StartTime":41175.0,"Position":300.4706,"HyperDash":false},{"StartTime":41261.0,"Position":356.6626,"HyperDash":true}]},{"StartTime":41348.0,"Objects":[{"StartTime":41348.0,"Position":116.0,"HyperDash":false},{"StartTime":41434.0,"Position":72.26963,"HyperDash":false},{"StartTime":41520.0,"Position":61.0594635,"HyperDash":false},{"StartTime":41606.0,"Position":119.336884,"HyperDash":true}]},{"StartTime":41693.0,"Objects":[{"StartTime":41693.0,"Position":340.0,"HyperDash":false},{"StartTime":41779.0,"Position":288.5,"HyperDash":false},{"StartTime":41865.0,"Position":204.999985,"HyperDash":false},{"StartTime":41951.0,"Position":137.5,"HyperDash":true}]},{"StartTime":42037.0,"Objects":[{"StartTime":42037.0,"Position":312.0,"HyperDash":false}]},{"StartTime":42210.0,"Objects":[{"StartTime":42210.0,"Position":164.0,"HyperDash":false}]},{"StartTime":42382.0,"Objects":[{"StartTime":42382.0,"Position":324.0,"HyperDash":false}]},{"StartTime":42555.0,"Objects":[{"StartTime":42555.0,"Position":152.0,"HyperDash":true}]},{"StartTime":42727.0,"Objects":[{"StartTime":42727.0,"Position":404.0,"HyperDash":false}]},{"StartTime":42813.0,"Objects":[{"StartTime":42813.0,"Position":460.0,"HyperDash":false}]},{"StartTime":42900.0,"Objects":[{"StartTime":42900.0,"Position":460.0,"HyperDash":false}]},{"StartTime":42986.0,"Objects":[{"StartTime":42986.0,"Position":404.0,"HyperDash":true}]},{"StartTime":43072.0,"Objects":[{"StartTime":43072.0,"Position":208.0,"HyperDash":false},{"StartTime":43158.0,"Position":204.54866,"HyperDash":false}]},{"StartTime":43244.0,"Objects":[{"StartTime":43244.0,"Position":280.0,"HyperDash":false},{"StartTime":43330.0,"Position":283.451355,"HyperDash":true}]},{"StartTime":43417.0,"Objects":[{"StartTime":43417.0,"Position":104.0,"HyperDash":false},{"StartTime":43503.0,"Position":59.0,"HyperDash":true}]},{"StartTime":43589.0,"Objects":[{"StartTime":43589.0,"Position":240.0,"HyperDash":false},{"StartTime":43675.0,"Position":285.0,"HyperDash":true}]},{"StartTime":43762.0,"Objects":[{"StartTime":43762.0,"Position":80.0,"HyperDash":false},{"StartTime":43848.0,"Position":125.0,"HyperDash":true}]},{"StartTime":43934.0,"Objects":[{"StartTime":43934.0,"Position":372.0,"HyperDash":false},{"StartTime":44020.0,"Position":327.0,"HyperDash":true}]},{"StartTime":44106.0,"Objects":[{"StartTime":44106.0,"Position":124.0,"HyperDash":true}]},{"StartTime":44279.0,"Objects":[{"StartTime":44279.0,"Position":368.0,"HyperDash":true}]},{"StartTime":44451.0,"Objects":[{"StartTime":44451.0,"Position":116.0,"HyperDash":false},{"StartTime":44537.0,"Position":71.0,"HyperDash":false}]},{"StartTime":44624.0,"Objects":[{"StartTime":44624.0,"Position":172.0,"HyperDash":false},{"StartTime":44710.0,"Position":127.0,"HyperDash":true}]},{"StartTime":44796.0,"Objects":[{"StartTime":44796.0,"Position":300.0,"HyperDash":false},{"StartTime":44882.0,"Position":356.5,"HyperDash":false},{"StartTime":44968.0,"Position":435.0,"HyperDash":false},{"StartTime":45011.0,"Position":468.75,"HyperDash":true}]},{"StartTime":45141.0,"Objects":[{"StartTime":45141.0,"Position":260.0,"HyperDash":false},{"StartTime":45227.0,"Position":345.5,"HyperDash":false},{"StartTime":45313.0,"Position":395.0,"HyperDash":false},{"StartTime":45356.0,"Position":428.75,"HyperDash":true}]},{"StartTime":45486.0,"Objects":[{"StartTime":45486.0,"Position":176.0,"HyperDash":false}]},{"StartTime":45507.0,"Objects":[{"StartTime":45507.0,"Position":158.0,"HyperDash":false}]},{"StartTime":45529.0,"Objects":[{"StartTime":45529.0,"Position":143.0,"HyperDash":false}]},{"StartTime":45550.0,"Objects":[{"StartTime":45550.0,"Position":129.0,"HyperDash":false}]},{"StartTime":45572.0,"Objects":[{"StartTime":45572.0,"Position":119.0,"HyperDash":false}]},{"StartTime":45594.0,"Objects":[{"StartTime":45594.0,"Position":111.0,"HyperDash":false}]},{"StartTime":45615.0,"Objects":[{"StartTime":45615.0,"Position":108.0,"HyperDash":false}]},{"StartTime":45637.0,"Objects":[{"StartTime":45637.0,"Position":108.0,"HyperDash":false}]},{"StartTime":45658.0,"Objects":[{"StartTime":45658.0,"Position":112.0,"HyperDash":false}]},{"StartTime":45680.0,"Objects":[{"StartTime":45680.0,"Position":120.0,"HyperDash":false}]},{"StartTime":45701.0,"Objects":[{"StartTime":45701.0,"Position":131.0,"HyperDash":false}]},{"StartTime":45723.0,"Objects":[{"StartTime":45723.0,"Position":145.0,"HyperDash":false}]},{"StartTime":45744.0,"Objects":[{"StartTime":45744.0,"Position":161.0,"HyperDash":false}]},{"StartTime":45766.0,"Objects":[{"StartTime":45766.0,"Position":178.0,"HyperDash":false}]},{"StartTime":45787.0,"Objects":[{"StartTime":45787.0,"Position":196.0,"HyperDash":false}]},{"StartTime":45809.0,"Objects":[{"StartTime":45809.0,"Position":214.0,"HyperDash":false}]},{"StartTime":45831.0,"Objects":[{"StartTime":45831.0,"Position":240.0,"HyperDash":false}]},{"StartTime":45852.0,"Objects":[{"StartTime":45852.0,"Position":257.0,"HyperDash":false}]},{"StartTime":45874.0,"Objects":[{"StartTime":45874.0,"Position":275.0,"HyperDash":false}]},{"StartTime":45895.0,"Objects":[{"StartTime":45895.0,"Position":291.0,"HyperDash":false}]},{"StartTime":45917.0,"Objects":[{"StartTime":45917.0,"Position":304.0,"HyperDash":false}]},{"StartTime":45938.0,"Objects":[{"StartTime":45938.0,"Position":315.0,"HyperDash":false}]},{"StartTime":45960.0,"Objects":[{"StartTime":45960.0,"Position":323.0,"HyperDash":false}]},{"StartTime":45981.0,"Objects":[{"StartTime":45981.0,"Position":327.0,"HyperDash":false}]},{"StartTime":46003.0,"Objects":[{"StartTime":46003.0,"Position":327.0,"HyperDash":false}]},{"StartTime":46025.0,"Objects":[{"StartTime":46025.0,"Position":324.0,"HyperDash":false}]},{"StartTime":46046.0,"Objects":[{"StartTime":46046.0,"Position":317.0,"HyperDash":false}]},{"StartTime":46068.0,"Objects":[{"StartTime":46068.0,"Position":306.0,"HyperDash":false}]},{"StartTime":46089.0,"Objects":[{"StartTime":46089.0,"Position":293.0,"HyperDash":false}]},{"StartTime":46111.0,"Objects":[{"StartTime":46111.0,"Position":277.0,"HyperDash":false}]},{"StartTime":46132.0,"Objects":[{"StartTime":46132.0,"Position":260.0,"HyperDash":true}]},{"StartTime":46175.0,"Objects":[{"StartTime":46175.0,"Position":76.0,"HyperDash":false},{"StartTime":46243.0,"Position":41.627903,"HyperDash":false},{"StartTime":46347.0,"Position":75.00001,"HyperDash":false}]},{"StartTime":46434.0,"Objects":[{"StartTime":46434.0,"Position":120.0,"HyperDash":true}]},{"StartTime":46520.0,"Objects":[{"StartTime":46520.0,"Position":280.0,"HyperDash":false},{"StartTime":46588.0,"Position":298.5814,"HyperDash":false},{"StartTime":46692.0,"Position":370.0,"HyperDash":false}]},{"StartTime":46779.0,"Objects":[{"StartTime":46779.0,"Position":324.0,"HyperDash":true}]},{"StartTime":46865.0,"Objects":[{"StartTime":46865.0,"Position":152.0,"HyperDash":false},{"StartTime":46951.0,"Position":107.0,"HyperDash":false}]},{"StartTime":47037.0,"Objects":[{"StartTime":47037.0,"Position":172.0,"HyperDash":false},{"StartTime":47123.0,"Position":127.0,"HyperDash":true}]},{"StartTime":47210.0,"Objects":[{"StartTime":47210.0,"Position":336.0,"HyperDash":false}]},{"StartTime":47253.0,"Objects":[{"StartTime":47253.0,"Position":363.0,"HyperDash":false}]},{"StartTime":47296.0,"Objects":[{"StartTime":47296.0,"Position":384.0,"HyperDash":false}]},{"StartTime":47339.0,"Objects":[{"StartTime":47339.0,"Position":393.0,"HyperDash":false}]},{"StartTime":47382.0,"Objects":[{"StartTime":47382.0,"Position":389.0,"HyperDash":false}]},{"StartTime":47425.0,"Objects":[{"StartTime":47425.0,"Position":372.0,"HyperDash":false}]},{"StartTime":47469.0,"Objects":[{"StartTime":47469.0,"Position":347.0,"HyperDash":true}]},{"StartTime":47555.0,"Objects":[{"StartTime":47555.0,"Position":168.0,"HyperDash":false},{"StartTime":47623.0,"Position":126.41861,"HyperDash":false},{"StartTime":47727.0,"Position":78.0,"HyperDash":false}]},{"StartTime":47900.0,"Objects":[{"StartTime":47900.0,"Position":244.0,"HyperDash":false},{"StartTime":47968.0,"Position":214.41861,"HyperDash":false},{"StartTime":48072.0,"Position":154.0,"HyperDash":true}]},{"StartTime":48244.0,"Objects":[{"StartTime":48244.0,"Position":400.0,"HyperDash":false},{"StartTime":48330.0,"Position":403.451355,"HyperDash":false}]},{"StartTime":48503.0,"Objects":[{"StartTime":48503.0,"Position":312.0,"HyperDash":true}]},{"StartTime":48589.0,"Objects":[{"StartTime":48589.0,"Position":140.0,"HyperDash":false}]},{"StartTime":48762.0,"Objects":[{"StartTime":48762.0,"Position":248.0,"HyperDash":true}]},{"StartTime":48934.0,"Objects":[{"StartTime":48934.0,"Position":16.0,"HyperDash":false},{"StartTime":49020.0,"Position":61.0,"HyperDash":false}]},{"StartTime":49193.0,"Objects":[{"StartTime":49193.0,"Position":160.0,"HyperDash":true}]},{"StartTime":49279.0,"Objects":[{"StartTime":49279.0,"Position":16.0,"HyperDash":false},{"StartTime":49365.0,"Position":20.0741081,"HyperDash":false}]},{"StartTime":49451.0,"Objects":[{"StartTime":49451.0,"Position":76.0,"HyperDash":false},{"StartTime":49537.0,"Position":121.0,"HyperDash":true}]},{"StartTime":49624.0,"Objects":[{"StartTime":49624.0,"Position":304.0,"HyperDash":false}]},{"StartTime":49667.0,"Objects":[{"StartTime":49667.0,"Position":317.0,"HyperDash":false}]},{"StartTime":49710.0,"Objects":[{"StartTime":49710.0,"Position":326.0,"HyperDash":false}]},{"StartTime":49753.0,"Objects":[{"StartTime":49753.0,"Position":328.0,"HyperDash":false}]},{"StartTime":49796.0,"Objects":[{"StartTime":49796.0,"Position":325.0,"HyperDash":false}]},{"StartTime":49839.0,"Objects":[{"StartTime":49839.0,"Position":316.0,"HyperDash":false}]},{"StartTime":49882.0,"Objects":[{"StartTime":49882.0,"Position":301.0,"HyperDash":true}]},{"StartTime":49969.0,"Objects":[{"StartTime":49969.0,"Position":120.0,"HyperDash":false}]},{"StartTime":50055.0,"Objects":[{"StartTime":50055.0,"Position":52.0,"HyperDash":false}]},{"StartTime":50141.0,"Objects":[{"StartTime":50141.0,"Position":120.0,"HyperDash":false}]},{"StartTime":50313.0,"Objects":[{"StartTime":50313.0,"Position":288.0,"HyperDash":false}]},{"StartTime":50400.0,"Objects":[{"StartTime":50400.0,"Position":332.0,"HyperDash":false}]},{"StartTime":50486.0,"Objects":[{"StartTime":50486.0,"Position":328.0,"HyperDash":false}]},{"StartTime":50572.0,"Objects":[{"StartTime":50572.0,"Position":280.0,"HyperDash":true}]},{"StartTime":50658.0,"Objects":[{"StartTime":50658.0,"Position":104.0,"HyperDash":false},{"StartTime":50744.0,"Position":59.0,"HyperDash":false}]},{"StartTime":50831.0,"Objects":[{"StartTime":50831.0,"Position":104.0,"HyperDash":false},{"StartTime":50917.0,"Position":149.0,"HyperDash":true}]},{"StartTime":51003.0,"Objects":[{"StartTime":51003.0,"Position":328.0,"HyperDash":false},{"StartTime":51071.0,"Position":375.5814,"HyperDash":false},{"StartTime":51175.0,"Position":334.0,"HyperDash":false}]},{"StartTime":51262.0,"Objects":[{"StartTime":51262.0,"Position":280.0,"HyperDash":true}]},{"StartTime":51348.0,"Objects":[{"StartTime":51348.0,"Position":128.0,"HyperDash":true},{"StartTime":51405.0,"Position":204.775,"HyperDash":false},{"StartTime":51498.0,"Position":364.25,"HyperDash":false}]},{"StartTime":51520.0,"Objects":[{"StartTime":51520.0,"Position":364.0,"HyperDash":false},{"StartTime":51588.0,"Position":296.6279,"HyperDash":false},{"StartTime":51692.0,"Position":229.0,"HyperDash":true}]},{"StartTime":51736.0,"Objects":[{"StartTime":51736.0,"Position":368.0,"HyperDash":false},{"StartTime":51865.0,"Position":435.5,"HyperDash":false}]},{"StartTime":51951.0,"Objects":[{"StartTime":51951.0,"Position":380.0,"HyperDash":true}]},{"StartTime":52037.0,"Objects":[{"StartTime":52037.0,"Position":204.0,"HyperDash":false},{"StartTime":52123.0,"Position":136.5,"HyperDash":false}]},{"StartTime":52210.0,"Objects":[{"StartTime":52210.0,"Position":223.0,"HyperDash":false},{"StartTime":52296.0,"Position":155.5,"HyperDash":true}]},{"StartTime":52382.0,"Objects":[{"StartTime":52382.0,"Position":388.0,"HyperDash":false},{"StartTime":52468.0,"Position":455.5,"HyperDash":false}]},{"StartTime":52555.0,"Objects":[{"StartTime":52555.0,"Position":368.0,"HyperDash":false},{"StartTime":52641.0,"Position":435.5,"HyperDash":true}]},{"StartTime":52727.0,"Objects":[{"StartTime":52727.0,"Position":224.0,"HyperDash":false}]},{"StartTime":52770.0,"Objects":[{"StartTime":52770.0,"Position":194.0,"HyperDash":false}]},{"StartTime":52813.0,"Objects":[{"StartTime":52813.0,"Position":169.0,"HyperDash":false}]},{"StartTime":52856.0,"Objects":[{"StartTime":52856.0,"Position":149.0,"HyperDash":false}]},{"StartTime":52900.0,"Objects":[{"StartTime":52900.0,"Position":137.0,"HyperDash":false}]},{"StartTime":52943.0,"Objects":[{"StartTime":52943.0,"Position":134.0,"HyperDash":false}]},{"StartTime":52986.0,"Objects":[{"StartTime":52986.0,"Position":141.0,"HyperDash":true}]},{"StartTime":53072.0,"Objects":[{"StartTime":53072.0,"Position":368.0,"HyperDash":true},{"StartTime":53140.0,"Position":260.0465,"HyperDash":false},{"StartTime":53244.0,"Position":143.0,"HyperDash":true}]},{"StartTime":53417.0,"Objects":[{"StartTime":53417.0,"Position":444.0,"HyperDash":true},{"StartTime":53485.0,"Position":358.0465,"HyperDash":false},{"StartTime":53589.0,"Position":219.0,"HyperDash":true}]},{"StartTime":53762.0,"Objects":[{"StartTime":53762.0,"Position":488.0,"HyperDash":false},{"StartTime":53830.0,"Position":475.545563,"HyperDash":false},{"StartTime":53934.0,"Position":491.909363,"HyperDash":false}]},{"StartTime":54106.0,"Objects":[{"StartTime":54106.0,"Position":336.0,"HyperDash":false}]},{"StartTime":54193.0,"Objects":[{"StartTime":54193.0,"Position":280.0,"HyperDash":false}]},{"StartTime":54279.0,"Objects":[{"StartTime":54279.0,"Position":228.0,"HyperDash":false}]},{"StartTime":54451.0,"Objects":[{"StartTime":54451.0,"Position":392.0,"HyperDash":false},{"StartTime":54494.0,"Position":394.4847,"HyperDash":true}]},{"StartTime":54624.0,"Objects":[{"StartTime":54624.0,"Position":188.0,"HyperDash":false},{"StartTime":54667.0,"Position":185.089874,"HyperDash":true}]},{"StartTime":54796.0,"Objects":[{"StartTime":54796.0,"Position":408.0,"HyperDash":false},{"StartTime":54882.0,"Position":363.0,"HyperDash":true}]},{"StartTime":54969.0,"Objects":[{"StartTime":54969.0,"Position":136.0,"HyperDash":false},{"StartTime":55055.0,"Position":181.0,"HyperDash":true}]},{"StartTime":55141.0,"Objects":[{"StartTime":55141.0,"Position":384.0,"HyperDash":false},{"StartTime":55198.0,"Position":345.1965,"HyperDash":false},{"StartTime":55255.0,"Position":294.0,"HyperDash":false},{"StartTime":55370.0,"Position":384.0,"HyperDash":true}]},{"StartTime":55486.0,"Objects":[{"StartTime":55486.0,"Position":172.0,"HyperDash":false}]},{"StartTime":55601.0,"Objects":[{"StartTime":55601.0,"Position":280.0,"HyperDash":false}]},{"StartTime":55716.0,"Objects":[{"StartTime":55716.0,"Position":388.0,"HyperDash":true}]},{"StartTime":55831.0,"Objects":[{"StartTime":55831.0,"Position":164.0,"HyperDash":false},{"StartTime":55888.0,"Position":147.131012,"HyperDash":false},{"StartTime":55945.0,"Position":104.0,"HyperDash":false},{"StartTime":56060.0,"Position":164.0,"HyperDash":true}]},{"StartTime":56175.0,"Objects":[{"StartTime":56175.0,"Position":340.0,"HyperDash":false}]},{"StartTime":56290.0,"Objects":[{"StartTime":56290.0,"Position":412.0,"HyperDash":false}]},{"StartTime":56405.0,"Objects":[{"StartTime":56405.0,"Position":412.0,"HyperDash":true}]},{"StartTime":56520.0,"Objects":[{"StartTime":56520.0,"Position":212.0,"HyperDash":false},{"StartTime":56606.0,"Position":148.1791,"HyperDash":false},{"StartTime":56692.0,"Position":144.4465,"HyperDash":false},{"StartTime":56778.0,"Position":188.107758,"HyperDash":false},{"StartTime":56864.0,"Position":241.294647,"HyperDash":false},{"StartTime":56950.0,"Position":307.139038,"HyperDash":false},{"StartTime":57037.0,"Position":323.301819,"HyperDash":false},{"StartTime":57123.0,"Position":297.7406,"HyperDash":true}]},{"StartTime":57210.0,"Objects":[{"StartTime":57210.0,"Position":128.0,"HyperDash":false}]},{"StartTime":57231.0,"Objects":[{"StartTime":57231.0,"Position":112.0,"HyperDash":false}]},{"StartTime":57253.0,"Objects":[{"StartTime":57253.0,"Position":97.0,"HyperDash":false}]},{"StartTime":57275.0,"Objects":[{"StartTime":57275.0,"Position":83.0,"HyperDash":false}]},{"StartTime":57296.0,"Objects":[{"StartTime":57296.0,"Position":70.0,"HyperDash":false}]},{"StartTime":57318.0,"Objects":[{"StartTime":57318.0,"Position":57.0,"HyperDash":false}]},{"StartTime":57339.0,"Objects":[{"StartTime":57339.0,"Position":46.0,"HyperDash":false}]},{"StartTime":57361.0,"Objects":[{"StartTime":57361.0,"Position":35.0,"HyperDash":false}]},{"StartTime":57382.0,"Objects":[{"StartTime":57382.0,"Position":26.0,"HyperDash":false}]},{"StartTime":57404.0,"Objects":[{"StartTime":57404.0,"Position":19.0,"HyperDash":false}]},{"StartTime":57425.0,"Objects":[{"StartTime":57425.0,"Position":13.0,"HyperDash":false}]},{"StartTime":57447.0,"Objects":[{"StartTime":57447.0,"Position":8.0,"HyperDash":false}]},{"StartTime":57469.0,"Objects":[{"StartTime":57469.0,"Position":5.0,"HyperDash":false}]},{"StartTime":57490.0,"Objects":[{"StartTime":57490.0,"Position":3.0,"HyperDash":false}]},{"StartTime":57512.0,"Objects":[{"StartTime":57512.0,"Position":3.0,"HyperDash":false}]},{"StartTime":57533.0,"Objects":[{"StartTime":57533.0,"Position":5.0,"HyperDash":false}]},{"StartTime":57555.0,"Objects":[{"StartTime":57555.0,"Position":8.0,"HyperDash":false}]},{"StartTime":57576.0,"Objects":[{"StartTime":57576.0,"Position":12.0,"HyperDash":false}]},{"StartTime":57598.0,"Objects":[{"StartTime":57598.0,"Position":18.0,"HyperDash":false}]},{"StartTime":57619.0,"Objects":[{"StartTime":57619.0,"Position":26.0,"HyperDash":false}]},{"StartTime":57641.0,"Objects":[{"StartTime":57641.0,"Position":35.0,"HyperDash":false}]},{"StartTime":57662.0,"Objects":[{"StartTime":57662.0,"Position":45.0,"HyperDash":false}]},{"StartTime":57684.0,"Objects":[{"StartTime":57684.0,"Position":56.0,"HyperDash":false}]},{"StartTime":57706.0,"Objects":[{"StartTime":57706.0,"Position":69.0,"HyperDash":false}]},{"StartTime":57727.0,"Objects":[{"StartTime":57727.0,"Position":82.0,"HyperDash":false}]},{"StartTime":57749.0,"Objects":[{"StartTime":57749.0,"Position":96.0,"HyperDash":false}]},{"StartTime":57770.0,"Objects":[{"StartTime":57770.0,"Position":111.0,"HyperDash":false}]},{"StartTime":57792.0,"Objects":[{"StartTime":57792.0,"Position":126.0,"HyperDash":false}]},{"StartTime":57813.0,"Objects":[{"StartTime":57813.0,"Position":142.0,"HyperDash":false}]},{"StartTime":57835.0,"Objects":[{"StartTime":57835.0,"Position":158.0,"HyperDash":false}]},{"StartTime":57856.0,"Objects":[{"StartTime":57856.0,"Position":174.0,"HyperDash":true}]},{"StartTime":57900.0,"Objects":[{"StartTime":57900.0,"Position":312.0,"HyperDash":false},{"StartTime":57968.0,"Position":371.3721,"HyperDash":false},{"StartTime":58072.0,"Position":447.0,"HyperDash":false}]},{"StartTime":58158.0,"Objects":[{"StartTime":58158.0,"Position":392.0,"HyperDash":true}]},{"StartTime":58244.0,"Objects":[{"StartTime":58244.0,"Position":216.0,"HyperDash":false},{"StartTime":58330.0,"Position":159.75,"HyperDash":false}]},{"StartTime":58417.0,"Objects":[{"StartTime":58417.0,"Position":232.0,"HyperDash":false},{"StartTime":58503.0,"Position":175.75,"HyperDash":true}]},{"StartTime":58589.0,"Objects":[{"StartTime":58589.0,"Position":20.0,"HyperDash":false},{"StartTime":58657.0,"Position":49.581398,"HyperDash":false},{"StartTime":58761.0,"Position":110.0,"HyperDash":false}]},{"StartTime":58934.0,"Objects":[{"StartTime":58934.0,"Position":276.0,"HyperDash":false},{"StartTime":59002.0,"Position":233.41861,"HyperDash":false},{"StartTime":59106.0,"Position":186.0,"HyperDash":true}]},{"StartTime":59279.0,"Objects":[{"StartTime":59279.0,"Position":440.0,"HyperDash":false}]},{"StartTime":59322.0,"Objects":[{"StartTime":59322.0,"Position":466.0,"HyperDash":false}]},{"StartTime":59365.0,"Objects":[{"StartTime":59365.0,"Position":484.0,"HyperDash":false}]},{"StartTime":59408.0,"Objects":[{"StartTime":59408.0,"Position":491.0,"HyperDash":false}]},{"StartTime":59451.0,"Objects":[{"StartTime":59451.0,"Position":484.0,"HyperDash":false}]},{"StartTime":59537.0,"Objects":[{"StartTime":59537.0,"Position":428.0,"HyperDash":true}]},{"StartTime":59624.0,"Objects":[{"StartTime":59624.0,"Position":260.0,"HyperDash":false},{"StartTime":59710.0,"Position":215.0,"HyperDash":false},{"StartTime":59796.0,"Position":260.0,"HyperDash":true}]},{"StartTime":59969.0,"Objects":[{"StartTime":59969.0,"Position":494.0,"HyperDash":false},{"StartTime":60055.0,"Position":497.451355,"HyperDash":false}]},{"StartTime":60227.0,"Objects":[{"StartTime":60227.0,"Position":392.0,"HyperDash":true}]},{"StartTime":60313.0,"Objects":[{"StartTime":60313.0,"Position":212.0,"HyperDash":false}]},{"StartTime":60486.0,"Objects":[{"StartTime":60486.0,"Position":356.0,"HyperDash":true}]},{"StartTime":60658.0,"Objects":[{"StartTime":60658.0,"Position":104.0,"HyperDash":false},{"StartTime":60744.0,"Position":100.262955,"HyperDash":false}]},{"StartTime":60917.0,"Objects":[{"StartTime":60917.0,"Position":204.0,"HyperDash":true}]},{"StartTime":61003.0,"Objects":[{"StartTime":61003.0,"Position":384.0,"HyperDash":false},{"StartTime":61089.0,"Position":339.0,"HyperDash":true}]},{"StartTime":61175.0,"Objects":[{"StartTime":61175.0,"Position":159.0,"HyperDash":false},{"StartTime":61261.0,"Position":226.5,"HyperDash":true}]},{"StartTime":61348.0,"Objects":[{"StartTime":61348.0,"Position":72.0,"HyperDash":false}]},{"StartTime":61434.0,"Objects":[{"StartTime":61434.0,"Position":9.0,"HyperDash":false}]},{"StartTime":61520.0,"Objects":[{"StartTime":61520.0,"Position":9.0,"HyperDash":false}]},{"StartTime":61606.0,"Objects":[{"StartTime":61606.0,"Position":70.0,"HyperDash":true}]},{"StartTime":61693.0,"Objects":[{"StartTime":61693.0,"Position":250.0,"HyperDash":false},{"StartTime":61761.0,"Position":304.5814,"HyperDash":false},{"StartTime":61865.0,"Position":340.0,"HyperDash":false}]},{"StartTime":62037.0,"Objects":[{"StartTime":62037.0,"Position":184.0,"HyperDash":false},{"StartTime":62105.0,"Position":143.41861,"HyperDash":false},{"StartTime":62209.0,"Position":178.0,"HyperDash":false}]},{"StartTime":62296.0,"Objects":[{"StartTime":62296.0,"Position":232.0,"HyperDash":true}]},{"StartTime":62382.0,"Objects":[{"StartTime":62382.0,"Position":384.0,"HyperDash":true},{"StartTime":62439.0,"Position":294.225,"HyperDash":false},{"StartTime":62532.0,"Position":147.749985,"HyperDash":false}]},{"StartTime":62555.0,"Objects":[{"StartTime":62555.0,"Position":148.0,"HyperDash":false},{"StartTime":62623.0,"Position":216.3721,"HyperDash":false},{"StartTime":62727.0,"Position":283.0,"HyperDash":true}]},{"StartTime":62770.0,"Objects":[{"StartTime":62770.0,"Position":144.0,"HyperDash":false},{"StartTime":62899.0,"Position":76.5,"HyperDash":false}]},{"StartTime":62986.0,"Objects":[{"StartTime":62986.0,"Position":132.0,"HyperDash":true}]},{"StartTime":63072.0,"Objects":[{"StartTime":63072.0,"Position":300.0,"HyperDash":false},{"StartTime":63158.0,"Position":345.0,"HyperDash":true}]},{"StartTime":63244.0,"Objects":[{"StartTime":63244.0,"Position":184.0,"HyperDash":false},{"StartTime":63330.0,"Position":229.0,"HyperDash":true}]},{"StartTime":63417.0,"Objects":[{"StartTime":63417.0,"Position":64.0,"HyperDash":false},{"StartTime":63503.0,"Position":19.0,"HyperDash":true}]},{"StartTime":63589.0,"Objects":[{"StartTime":63589.0,"Position":184.0,"HyperDash":false},{"StartTime":63675.0,"Position":139.0,"HyperDash":true}]},{"StartTime":63762.0,"Objects":[{"StartTime":63762.0,"Position":345.0,"HyperDash":false}]},{"StartTime":63805.0,"Objects":[{"StartTime":63805.0,"Position":375.0,"HyperDash":false}]},{"StartTime":63848.0,"Objects":[{"StartTime":63848.0,"Position":400.0,"HyperDash":false}]},{"StartTime":63891.0,"Objects":[{"StartTime":63891.0,"Position":420.0,"HyperDash":false}]},{"StartTime":63934.0,"Objects":[{"StartTime":63934.0,"Position":432.0,"HyperDash":false}]},{"StartTime":63977.0,"Objects":[{"StartTime":63977.0,"Position":435.0,"HyperDash":false}]},{"StartTime":64020.0,"Objects":[{"StartTime":64020.0,"Position":428.0,"HyperDash":true}]},{"StartTime":64106.0,"Objects":[{"StartTime":64106.0,"Position":224.0,"HyperDash":true},{"StartTime":64174.0,"Position":296.9535,"HyperDash":false},{"StartTime":64278.0,"Position":449.0,"HyperDash":true}]},{"StartTime":64451.0,"Objects":[{"StartTime":64451.0,"Position":148.0,"HyperDash":true},{"StartTime":64519.0,"Position":253.953491,"HyperDash":false},{"StartTime":64623.0,"Position":373.0,"HyperDash":true}]},{"StartTime":64796.0,"Objects":[{"StartTime":64796.0,"Position":120.0,"HyperDash":true}]},{"StartTime":64911.0,"Objects":[{"StartTime":64911.0,"Position":324.0,"HyperDash":true}]},{"StartTime":65026.0,"Objects":[{"StartTime":65026.0,"Position":120.0,"HyperDash":true}]},{"StartTime":65141.0,"Objects":[{"StartTime":65141.0,"Position":336.0,"HyperDash":false}]},{"StartTime":65256.0,"Objects":[{"StartTime":65256.0,"Position":222.0,"HyperDash":false}]},{"StartTime":65371.0,"Objects":[{"StartTime":65371.0,"Position":108.0,"HyperDash":true}]},{"StartTime":65486.0,"Objects":[{"StartTime":65486.0,"Position":336.0,"HyperDash":false}]},{"StartTime":65601.0,"Objects":[{"StartTime":65601.0,"Position":444.0,"HyperDash":false}]},{"StartTime":65716.0,"Objects":[{"StartTime":65716.0,"Position":336.0,"HyperDash":true}]},{"StartTime":65831.0,"Objects":[{"StartTime":65831.0,"Position":144.0,"HyperDash":false}]},{"StartTime":65946.0,"Objects":[{"StartTime":65946.0,"Position":252.0,"HyperDash":false}]},{"StartTime":66060.0,"Objects":[{"StartTime":66060.0,"Position":144.0,"HyperDash":true}]},{"StartTime":66175.0,"Objects":[{"StartTime":66175.0,"Position":360.0,"HyperDash":false},{"StartTime":66243.0,"Position":398.5814,"HyperDash":false},{"StartTime":66347.0,"Position":450.0,"HyperDash":false}]},{"StartTime":66434.0,"Objects":[{"StartTime":66434.0,"Position":396.0,"HyperDash":true}]},{"StartTime":66520.0,"Objects":[{"StartTime":66520.0,"Position":224.0,"HyperDash":false}]},{"StartTime":66693.0,"Objects":[{"StartTime":66693.0,"Position":388.0,"HyperDash":true}]},{"StartTime":66865.0,"Objects":[{"StartTime":66865.0,"Position":124.0,"HyperDash":false},{"StartTime":66951.0,"Position":120.54866,"HyperDash":false}]},{"StartTime":67037.0,"Objects":[{"StartTime":67037.0,"Position":204.0,"HyperDash":false},{"StartTime":67123.0,"Position":200.54866,"HyperDash":true}]},{"StartTime":67210.0,"Objects":[{"StartTime":67210.0,"Position":368.0,"HyperDash":false}]},{"StartTime":67382.0,"Objects":[{"StartTime":67382.0,"Position":204.0,"HyperDash":true}]},{"StartTime":67555.0,"Objects":[{"StartTime":67555.0,"Position":476.0,"HyperDash":false}]},{"StartTime":67900.0,"Objects":[{"StartTime":67900.0,"Position":188.0,"HyperDash":false}]},{"StartTime":68244.0,"Objects":[{"StartTime":68244.0,"Position":488.0,"HyperDash":false}]},{"StartTime":68417.0,"Objects":[{"StartTime":68417.0,"Position":356.0,"HyperDash":false},{"StartTime":68503.0,"Position":423.5,"HyperDash":true}]},{"StartTime":68589.0,"Objects":[{"StartTime":68589.0,"Position":172.0,"HyperDash":false},{"StartTime":68657.0,"Position":166.454437,"HyperDash":false},{"StartTime":68761.0,"Position":168.090652,"HyperDash":true}]},{"StartTime":68934.0,"Objects":[{"StartTime":68934.0,"Position":484.0,"HyperDash":false}]},{"StartTime":69279.0,"Objects":[{"StartTime":69279.0,"Position":368.0,"HyperDash":false},{"StartTime":69343.0,"Position":52.0,"HyperDash":false},{"StartTime":69408.0,"Position":327.0,"HyperDash":false},{"StartTime":69472.0,"Position":226.0,"HyperDash":false},{"StartTime":69537.0,"Position":110.0,"HyperDash":false},{"StartTime":69602.0,"Position":3.0,"HyperDash":false},{"StartTime":69666.0,"Position":26.0,"HyperDash":false},{"StartTime":69731.0,"Position":173.0,"HyperDash":false},{"StartTime":69796.0,"Position":18.0,"HyperDash":false},{"StartTime":69860.0,"Position":310.0,"HyperDash":false},{"StartTime":69925.0,"Position":394.0,"HyperDash":false},{"StartTime":69990.0,"Position":406.0,"HyperDash":false},{"StartTime":70054.0,"Position":262.0,"HyperDash":false},{"StartTime":70119.0,"Position":278.0,"HyperDash":false},{"StartTime":70184.0,"Position":171.0,"HyperDash":false},{"StartTime":70248.0,"Position":22.0,"HyperDash":false},{"StartTime":70313.0,"Position":187.0,"HyperDash":false},{"StartTime":70378.0,"Position":124.0,"HyperDash":false},{"StartTime":70442.0,"Position":454.0,"HyperDash":false},{"StartTime":70507.0,"Position":16.0,"HyperDash":false},{"StartTime":70572.0,"Position":61.0,"HyperDash":false},{"StartTime":70636.0,"Position":161.0,"HyperDash":false},{"StartTime":70701.0,"Position":243.0,"HyperDash":false},{"StartTime":70766.0,"Position":375.0,"HyperDash":false},{"StartTime":70830.0,"Position":247.0,"HyperDash":false},{"StartTime":70895.0,"Position":162.0,"HyperDash":false},{"StartTime":70960.0,"Position":383.0,"HyperDash":false},{"StartTime":71024.0,"Position":127.0,"HyperDash":false},{"StartTime":71089.0,"Position":161.0,"HyperDash":false},{"StartTime":71154.0,"Position":332.0,"HyperDash":false},{"StartTime":71218.0,"Position":356.0,"HyperDash":false},{"StartTime":71283.0,"Position":362.0,"HyperDash":false},{"StartTime":71348.0,"Position":347.0,"HyperDash":false}]},{"StartTime":71693.0,"Objects":[{"StartTime":71693.0,"Position":232.0,"HyperDash":false},{"StartTime":71714.0,"Position":229.7937,"HyperDash":false},{"StartTime":71736.0,"Position":232.0,"HyperDash":false},{"StartTime":71757.0,"Position":229.7937,"HyperDash":false},{"StartTime":71779.0,"Position":232.0,"HyperDash":false},{"StartTime":71800.0,"Position":229.7937,"HyperDash":false},{"StartTime":71822.0,"Position":232.0,"HyperDash":false},{"StartTime":71843.0,"Position":229.7937,"HyperDash":false},{"StartTime":71865.0,"Position":232.0,"HyperDash":false},{"StartTime":71886.0,"Position":229.7937,"HyperDash":false},{"StartTime":71908.0,"Position":232.0,"HyperDash":false},{"StartTime":71930.0,"Position":229.7937,"HyperDash":false},{"StartTime":71951.0,"Position":232.0,"HyperDash":false},{"StartTime":71973.0,"Position":229.7937,"HyperDash":false},{"StartTime":71994.0,"Position":232.0,"HyperDash":false}]},{"StartTime":72037.0,"Objects":[{"StartTime":72037.0,"Position":272.0,"HyperDash":false},{"StartTime":72058.0,"Position":277.46347,"HyperDash":false},{"StartTime":72080.0,"Position":272.0,"HyperDash":false},{"StartTime":72101.0,"Position":277.46347,"HyperDash":false},{"StartTime":72123.0,"Position":272.0,"HyperDash":false},{"StartTime":72144.0,"Position":277.46347,"HyperDash":false},{"StartTime":72166.0,"Position":272.0,"HyperDash":false},{"StartTime":72187.0,"Position":277.46347,"HyperDash":false},{"StartTime":72209.0,"Position":272.0,"HyperDash":false},{"StartTime":72230.0,"Position":277.46347,"HyperDash":false},{"StartTime":72252.0,"Position":272.0,"HyperDash":false},{"StartTime":72274.0,"Position":277.46347,"HyperDash":false},{"StartTime":72295.0,"Position":272.0,"HyperDash":false},{"StartTime":72317.0,"Position":277.46347,"HyperDash":false},{"StartTime":72338.0,"Position":272.0,"HyperDash":false}]},{"StartTime":72382.0,"Objects":[{"StartTime":72382.0,"Position":316.0,"HyperDash":false},{"StartTime":72403.0,"Position":324.5015,"HyperDash":false},{"StartTime":72425.0,"Position":316.0,"HyperDash":false},{"StartTime":72446.0,"Position":324.5015,"HyperDash":false},{"StartTime":72468.0,"Position":316.0,"HyperDash":false},{"StartTime":72489.0,"Position":324.5015,"HyperDash":false},{"StartTime":72511.0,"Position":316.0,"HyperDash":false},{"StartTime":72532.0,"Position":324.5015,"HyperDash":false},{"StartTime":72554.0,"Position":316.0,"HyperDash":false},{"StartTime":72575.0,"Position":324.5015,"HyperDash":false},{"StartTime":72597.0,"Position":316.0,"HyperDash":false},{"StartTime":72619.0,"Position":324.5015,"HyperDash":false},{"StartTime":72640.0,"Position":316.0,"HyperDash":false},{"StartTime":72662.0,"Position":324.5015,"HyperDash":false},{"StartTime":72683.0,"Position":316.0,"HyperDash":false}]},{"StartTime":72727.0,"Objects":[{"StartTime":72727.0,"Position":360.0,"HyperDash":false},{"StartTime":72748.0,"Position":368.5015,"HyperDash":false},{"StartTime":72770.0,"Position":360.0,"HyperDash":false},{"StartTime":72791.0,"Position":368.5015,"HyperDash":false},{"StartTime":72813.0,"Position":360.0,"HyperDash":false},{"StartTime":72834.0,"Position":368.5015,"HyperDash":false},{"StartTime":72856.0,"Position":360.0,"HyperDash":false},{"StartTime":72877.0,"Position":368.5015,"HyperDash":false},{"StartTime":72899.0,"Position":360.0,"HyperDash":false},{"StartTime":72920.0,"Position":368.5015,"HyperDash":false},{"StartTime":72942.0,"Position":360.0,"HyperDash":false},{"StartTime":72964.0,"Position":368.5015,"HyperDash":false},{"StartTime":72985.0,"Position":360.0,"HyperDash":false},{"StartTime":73007.0,"Position":368.5015,"HyperDash":false},{"StartTime":73028.0,"Position":360.0,"HyperDash":true}]},{"StartTime":73072.0,"Objects":[{"StartTime":73072.0,"Position":256.0,"HyperDash":false}]},{"StartTime":73094.0,"Objects":[{"StartTime":73094.0,"Position":244.0,"HyperDash":false}]},{"StartTime":73115.0,"Objects":[{"StartTime":73115.0,"Position":233.0,"HyperDash":false}]},{"StartTime":73137.0,"Objects":[{"StartTime":73137.0,"Position":224.0,"HyperDash":false}]},{"StartTime":73158.0,"Objects":[{"StartTime":73158.0,"Position":215.0,"HyperDash":false}]},{"StartTime":73180.0,"Objects":[{"StartTime":73180.0,"Position":209.0,"HyperDash":false}]},{"StartTime":73201.0,"Objects":[{"StartTime":73201.0,"Position":205.0,"HyperDash":false}]},{"StartTime":73223.0,"Objects":[{"StartTime":73223.0,"Position":202.0,"HyperDash":false}]},{"StartTime":73244.0,"Objects":[{"StartTime":73244.0,"Position":203.0,"HyperDash":false}]},{"StartTime":73266.0,"Objects":[{"StartTime":73266.0,"Position":205.0,"HyperDash":false}]},{"StartTime":73287.0,"Objects":[{"StartTime":73287.0,"Position":210.0,"HyperDash":false}]},{"StartTime":73309.0,"Objects":[{"StartTime":73309.0,"Position":217.0,"HyperDash":false}]},{"StartTime":73331.0,"Objects":[{"StartTime":73331.0,"Position":226.0,"HyperDash":false}]},{"StartTime":73352.0,"Objects":[{"StartTime":73352.0,"Position":236.0,"HyperDash":false}]},{"StartTime":73374.0,"Objects":[{"StartTime":73374.0,"Position":247.0,"HyperDash":false}]},{"StartTime":73395.0,"Objects":[{"StartTime":73395.0,"Position":258.0,"HyperDash":false}]},{"StartTime":73417.0,"Objects":[{"StartTime":73417.0,"Position":270.0,"HyperDash":false}]},{"StartTime":73438.0,"Objects":[{"StartTime":73438.0,"Position":281.0,"HyperDash":false}]},{"StartTime":73460.0,"Objects":[{"StartTime":73460.0,"Position":291.0,"HyperDash":false}]},{"StartTime":73481.0,"Objects":[{"StartTime":73481.0,"Position":300.0,"HyperDash":false}]},{"StartTime":73503.0,"Objects":[{"StartTime":73503.0,"Position":307.0,"HyperDash":false}]},{"StartTime":73525.0,"Objects":[{"StartTime":73525.0,"Position":313.0,"HyperDash":false}]},{"StartTime":73546.0,"Objects":[{"StartTime":73546.0,"Position":316.0,"HyperDash":false}]},{"StartTime":73568.0,"Objects":[{"StartTime":73568.0,"Position":317.0,"HyperDash":false}]},{"StartTime":73589.0,"Objects":[{"StartTime":73589.0,"Position":315.0,"HyperDash":false}]},{"StartTime":73611.0,"Objects":[{"StartTime":73611.0,"Position":311.0,"HyperDash":false}]},{"StartTime":73632.0,"Objects":[{"StartTime":73632.0,"Position":305.0,"HyperDash":false}]},{"StartTime":73654.0,"Objects":[{"StartTime":73654.0,"Position":297.0,"HyperDash":false}]},{"StartTime":73675.0,"Objects":[{"StartTime":73675.0,"Position":288.0,"HyperDash":false}]},{"StartTime":73697.0,"Objects":[{"StartTime":73697.0,"Position":277.0,"HyperDash":false}]},{"StartTime":73719.0,"Objects":[{"StartTime":73719.0,"Position":266.0,"HyperDash":true}]},{"StartTime":73762.0,"Objects":[{"StartTime":73762.0,"Position":164.0,"HyperDash":false}]},{"StartTime":73783.0,"Objects":[{"StartTime":73783.0,"Position":153.0,"HyperDash":false}]},{"StartTime":73805.0,"Objects":[{"StartTime":73805.0,"Position":143.0,"HyperDash":false}]},{"StartTime":73826.0,"Objects":[{"StartTime":73826.0,"Position":133.0,"HyperDash":false}]},{"StartTime":73848.0,"Objects":[{"StartTime":73848.0,"Position":124.0,"HyperDash":false}]},{"StartTime":73869.0,"Objects":[{"StartTime":73869.0,"Position":115.0,"HyperDash":false}]},{"StartTime":73891.0,"Objects":[{"StartTime":73891.0,"Position":108.0,"HyperDash":false}]},{"StartTime":73912.0,"Objects":[{"StartTime":73912.0,"Position":101.0,"HyperDash":false}]},{"StartTime":73934.0,"Objects":[{"StartTime":73934.0,"Position":95.0,"HyperDash":false}]},{"StartTime":73956.0,"Objects":[{"StartTime":73956.0,"Position":90.0,"HyperDash":false}]},{"StartTime":73977.0,"Objects":[{"StartTime":73977.0,"Position":85.0,"HyperDash":false}]},{"StartTime":73999.0,"Objects":[{"StartTime":73999.0,"Position":82.0,"HyperDash":false}]},{"StartTime":74020.0,"Objects":[{"StartTime":74020.0,"Position":80.0,"HyperDash":false}]},{"StartTime":74042.0,"Objects":[{"StartTime":74042.0,"Position":79.0,"HyperDash":false}]},{"StartTime":74063.0,"Objects":[{"StartTime":74063.0,"Position":79.0,"HyperDash":true}]},{"StartTime":74106.0,"Objects":[{"StartTime":74106.0,"Position":180.0,"HyperDash":false}]},{"StartTime":74128.0,"Objects":[{"StartTime":74128.0,"Position":190.0,"HyperDash":false}]},{"StartTime":74150.0,"Objects":[{"StartTime":74150.0,"Position":200.0,"HyperDash":false}]},{"StartTime":74171.0,"Objects":[{"StartTime":74171.0,"Position":210.0,"HyperDash":false}]},{"StartTime":74193.0,"Objects":[{"StartTime":74193.0,"Position":219.0,"HyperDash":false}]},{"StartTime":74214.0,"Objects":[{"StartTime":74214.0,"Position":228.0,"HyperDash":false}]},{"StartTime":74236.0,"Objects":[{"StartTime":74236.0,"Position":235.0,"HyperDash":false}]},{"StartTime":74257.0,"Objects":[{"StartTime":74257.0,"Position":242.0,"HyperDash":false}]},{"StartTime":74279.0,"Objects":[{"StartTime":74279.0,"Position":248.0,"HyperDash":false}]},{"StartTime":74300.0,"Objects":[{"StartTime":74300.0,"Position":253.0,"HyperDash":false}]},{"StartTime":74322.0,"Objects":[{"StartTime":74322.0,"Position":258.0,"HyperDash":false}]},{"StartTime":74344.0,"Objects":[{"StartTime":74344.0,"Position":261.0,"HyperDash":false}]},{"StartTime":74365.0,"Objects":[{"StartTime":74365.0,"Position":263.0,"HyperDash":false}]},{"StartTime":74387.0,"Objects":[{"StartTime":74387.0,"Position":264.0,"HyperDash":false}]},{"StartTime":74408.0,"Objects":[{"StartTime":74408.0,"Position":264.0,"HyperDash":true}]},{"StartTime":74451.0,"Objects":[{"StartTime":74451.0,"Position":148.0,"HyperDash":false},{"StartTime":74519.0,"Position":111.4186,"HyperDash":false},{"StartTime":74623.0,"Position":58.0,"HyperDash":false}]},{"StartTime":74796.0,"Objects":[{"StartTime":74796.0,"Position":196.0,"HyperDash":false},{"StartTime":74864.0,"Position":187.840836,"HyperDash":false},{"StartTime":74968.0,"Position":193.068,"HyperDash":false}]},{"StartTime":75141.0,"Objects":[{"StartTime":75141.0,"Position":328.0,"HyperDash":false},{"StartTime":75209.0,"Position":324.84082,"HyperDash":false},{"StartTime":75313.0,"Position":325.068,"HyperDash":false}]},{"StartTime":75486.0,"Objects":[{"StartTime":75486.0,"Position":228.0,"HyperDash":false}]},{"StartTime":75658.0,"Objects":[{"StartTime":75658.0,"Position":396.0,"HyperDash":true}]},{"StartTime":75831.0,"Objects":[{"StartTime":75831.0,"Position":124.0,"HyperDash":false}]},{"StartTime":76003.0,"Objects":[{"StartTime":76003.0,"Position":36.0,"HyperDash":false}]},{"StartTime":76175.0,"Objects":[{"StartTime":76175.0,"Position":36.0,"HyperDash":false}]},{"StartTime":76348.0,"Objects":[{"StartTime":76348.0,"Position":124.0,"HyperDash":false}]},{"StartTime":76520.0,"Objects":[{"StartTime":76520.0,"Position":292.0,"HyperDash":false},{"StartTime":76588.0,"Position":308.15918,"HyperDash":false},{"StartTime":76692.0,"Position":294.932,"HyperDash":false}]},{"StartTime":76865.0,"Objects":[{"StartTime":76865.0,"Position":192.0,"HyperDash":false},{"StartTime":76933.0,"Position":210.48027,"HyperDash":false},{"StartTime":77037.0,"Position":195.744232,"HyperDash":false}]},{"StartTime":77210.0,"Objects":[{"StartTime":77210.0,"Position":368.0,"HyperDash":false},{"StartTime":77296.0,"Position":391.6784,"HyperDash":false},{"StartTime":77382.0,"Position":424.106964,"HyperDash":false},{"StartTime":77450.0,"Position":426.0137,"HyperDash":false},{"StartTime":77554.0,"Position":368.760162,"HyperDash":false}]},{"StartTime":77727.0,"Objects":[{"StartTime":77727.0,"Position":272.0,"HyperDash":false}]},{"StartTime":77900.0,"Objects":[{"StartTime":77900.0,"Position":176.0,"HyperDash":false},{"StartTime":77968.0,"Position":181.840836,"HyperDash":false},{"StartTime":78072.0,"Position":173.068,"HyperDash":false}]},{"StartTime":78244.0,"Objects":[{"StartTime":78244.0,"Position":272.0,"HyperDash":false}]},{"StartTime":78417.0,"Objects":[{"StartTime":78417.0,"Position":104.0,"HyperDash":true}]},{"StartTime":78589.0,"Objects":[{"StartTime":78589.0,"Position":380.0,"HyperDash":false},{"StartTime":78675.0,"Position":393.75,"HyperDash":false},{"StartTime":78761.0,"Position":447.5,"HyperDash":false},{"StartTime":78829.0,"Position":419.813965,"HyperDash":false},{"StartTime":78933.0,"Position":380.0,"HyperDash":false}]},{"StartTime":79106.0,"Objects":[{"StartTime":79106.0,"Position":284.0,"HyperDash":false}]},{"StartTime":79279.0,"Objects":[{"StartTime":79279.0,"Position":116.0,"HyperDash":false},{"StartTime":79347.0,"Position":99.84083,"HyperDash":false},{"StartTime":79451.0,"Position":113.067986,"HyperDash":false}]},{"StartTime":79624.0,"Objects":[{"StartTime":79624.0,"Position":216.0,"HyperDash":false},{"StartTime":79692.0,"Position":223.68605,"HyperDash":false},{"StartTime":79796.0,"Position":283.5,"HyperDash":false}]},{"StartTime":79882.0,"Objects":[{"StartTime":79882.0,"Position":324.0,"HyperDash":true}]},{"StartTime":79969.0,"Objects":[{"StartTime":79969.0,"Position":152.0,"HyperDash":false},{"StartTime":80055.0,"Position":111.0,"HyperDash":false},{"StartTime":80141.0,"Position":62.0,"HyperDash":false},{"StartTime":80209.0,"Position":99.58139,"HyperDash":false},{"StartTime":80313.0,"Position":152.0,"HyperDash":false}]},{"StartTime":80486.0,"Objects":[{"StartTime":80486.0,"Position":248.0,"HyperDash":false}]},{"StartTime":80658.0,"Objects":[{"StartTime":80658.0,"Position":416.0,"HyperDash":false},{"StartTime":80726.0,"Position":434.4803,"HyperDash":false},{"StartTime":80830.0,"Position":419.744232,"HyperDash":false}]},{"StartTime":81003.0,"Objects":[{"StartTime":81003.0,"Position":324.0,"HyperDash":false},{"StartTime":81071.0,"Position":308.313965,"HyperDash":false},{"StartTime":81175.0,"Position":256.5,"HyperDash":false}]},{"StartTime":81262.0,"Objects":[{"StartTime":81262.0,"Position":208.0,"HyperDash":true}]},{"StartTime":81348.0,"Objects":[{"StartTime":81348.0,"Position":384.0,"HyperDash":false},{"StartTime":81434.0,"Position":431.0,"HyperDash":false},{"StartTime":81520.0,"Position":474.0,"HyperDash":false},{"StartTime":81588.0,"Position":446.4186,"HyperDash":false},{"StartTime":81692.0,"Position":384.0,"HyperDash":false}]},{"StartTime":81865.0,"Objects":[{"StartTime":81865.0,"Position":212.0,"HyperDash":true}]},{"StartTime":82037.0,"Objects":[{"StartTime":82037.0,"Position":444.0,"HyperDash":false},{"StartTime":82105.0,"Position":438.4026,"HyperDash":false},{"StartTime":82209.0,"Position":447.547729,"HyperDash":true}]},{"StartTime":82382.0,"Objects":[{"StartTime":82382.0,"Position":212.0,"HyperDash":false}]},{"StartTime":82469.0,"Objects":[{"StartTime":82469.0,"Position":172.0,"HyperDash":false}]},{"StartTime":82555.0,"Objects":[{"StartTime":82555.0,"Position":132.0,"HyperDash":true}]},{"StartTime":82727.0,"Objects":[{"StartTime":82727.0,"Position":432.0,"HyperDash":false},{"StartTime":82813.0,"Position":480.699646,"HyperDash":false},{"StartTime":82899.0,"Position":500.151184,"HyperDash":false},{"StartTime":82967.0,"Position":468.371918,"HyperDash":false},{"StartTime":83071.0,"Position":432.553162,"HyperDash":false}]},{"StartTime":83244.0,"Objects":[{"StartTime":83244.0,"Position":272.0,"HyperDash":false}]},{"StartTime":83417.0,"Objects":[{"StartTime":83417.0,"Position":440.0,"HyperDash":false},{"StartTime":83485.0,"Position":421.4803,"HyperDash":false},{"StartTime":83589.0,"Position":443.744232,"HyperDash":true}]},{"StartTime":83762.0,"Objects":[{"StartTime":83762.0,"Position":200.0,"HyperDash":false}]},{"StartTime":83934.0,"Objects":[{"StartTime":83934.0,"Position":352.0,"HyperDash":true}]},{"StartTime":84106.0,"Objects":[{"StartTime":84106.0,"Position":104.0,"HyperDash":false},{"StartTime":84192.0,"Position":62.0,"HyperDash":false},{"StartTime":84278.0,"Position":14.0,"HyperDash":false},{"StartTime":84346.0,"Position":49.58139,"HyperDash":false},{"StartTime":84450.0,"Position":104.0,"HyperDash":false}]},{"StartTime":84624.0,"Objects":[{"StartTime":84624.0,"Position":272.0,"HyperDash":false}]},{"StartTime":84796.0,"Objects":[{"StartTime":84796.0,"Position":112.0,"HyperDash":false},{"StartTime":84864.0,"Position":120.667366,"HyperDash":false},{"StartTime":84968.0,"Position":108.629211,"HyperDash":false}]},{"StartTime":85055.0,"Objects":[{"StartTime":85055.0,"Position":164.0,"HyperDash":false}]},{"StartTime":85141.0,"Objects":[{"StartTime":85141.0,"Position":216.0,"HyperDash":false},{"StartTime":85209.0,"Position":224.68605,"HyperDash":false},{"StartTime":85313.0,"Position":283.5,"HyperDash":true}]},{"StartTime":85486.0,"Objects":[{"StartTime":85486.0,"Position":32.0,"HyperDash":false},{"StartTime":85572.0,"Position":0.299288034,"HyperDash":false},{"StartTime":85658.0,"Position":4.98187447,"HyperDash":false},{"StartTime":85744.0,"Position":36.15001,"HyperDash":false}]},{"StartTime":85831.0,"Objects":[{"StartTime":85831.0,"Position":108.0,"HyperDash":false},{"StartTime":85899.0,"Position":145.58139,"HyperDash":false},{"StartTime":86003.0,"Position":198.0,"HyperDash":false}]},{"StartTime":86175.0,"Objects":[{"StartTime":86175.0,"Position":20.0,"HyperDash":false}]},{"StartTime":86348.0,"Objects":[{"StartTime":86348.0,"Position":128.0,"HyperDash":false},{"StartTime":86434.0,"Position":173.0,"HyperDash":true}]},{"StartTime":86520.0,"Objects":[{"StartTime":86520.0,"Position":344.0,"HyperDash":false},{"StartTime":86588.0,"Position":325.4186,"HyperDash":false},{"StartTime":86692.0,"Position":254.0,"HyperDash":false}]},{"StartTime":86865.0,"Objects":[{"StartTime":86865.0,"Position":436.0,"HyperDash":false},{"StartTime":86933.0,"Position":448.3675,"HyperDash":false},{"StartTime":87037.0,"Position":439.458984,"HyperDash":false}]},{"StartTime":87124.0,"Objects":[{"StartTime":87124.0,"Position":375.0,"HyperDash":false}]},{"StartTime":87210.0,"Objects":[{"StartTime":87210.0,"Position":312.0,"HyperDash":false}]},{"StartTime":87382.0,"Objects":[{"StartTime":87382.0,"Position":472.0,"HyperDash":false}]},{"StartTime":87555.0,"Objects":[{"StartTime":87555.0,"Position":300.0,"HyperDash":false},{"StartTime":87623.0,"Position":293.518738,"HyperDash":false},{"StartTime":87727.0,"Position":296.253265,"HyperDash":false}]},{"StartTime":87813.0,"Objects":[{"StartTime":87813.0,"Position":360.0,"HyperDash":true}]},{"StartTime":87900.0,"Objects":[{"StartTime":87900.0,"Position":196.0,"HyperDash":false},{"StartTime":87968.0,"Position":147.41861,"HyperDash":false},{"StartTime":88072.0,"Position":106.0,"HyperDash":false}]},{"StartTime":88244.0,"Objects":[{"StartTime":88244.0,"Position":276.0,"HyperDash":false},{"StartTime":88312.0,"Position":320.5814,"HyperDash":false},{"StartTime":88416.0,"Position":366.0,"HyperDash":false}]},{"StartTime":88503.0,"Objects":[{"StartTime":88503.0,"Position":312.0,"HyperDash":false}]},{"StartTime":88589.0,"Objects":[{"StartTime":88589.0,"Position":260.0,"HyperDash":false}]},{"StartTime":88762.0,"Objects":[{"StartTime":88762.0,"Position":440.0,"HyperDash":true}]},{"StartTime":88934.0,"Objects":[{"StartTime":88934.0,"Position":192.0,"HyperDash":false},{"StartTime":89002.0,"Position":158.41861,"HyperDash":false},{"StartTime":89106.0,"Position":102.0,"HyperDash":false}]},{"StartTime":89193.0,"Objects":[{"StartTime":89193.0,"Position":164.0,"HyperDash":false}]},{"StartTime":89279.0,"Objects":[{"StartTime":89279.0,"Position":228.0,"HyperDash":false},{"StartTime":89347.0,"Position":188.41861,"HyperDash":false},{"StartTime":89451.0,"Position":138.0,"HyperDash":false}]},{"StartTime":89624.0,"Objects":[{"StartTime":89624.0,"Position":306.0,"HyperDash":false},{"StartTime":89692.0,"Position":334.5814,"HyperDash":false},{"StartTime":89796.0,"Position":396.0,"HyperDash":false}]},{"StartTime":89882.0,"Objects":[{"StartTime":89882.0,"Position":450.0,"HyperDash":false}]},{"StartTime":89969.0,"Objects":[{"StartTime":89969.0,"Position":396.0,"HyperDash":false}]},{"StartTime":90141.0,"Objects":[{"StartTime":90141.0,"Position":228.0,"HyperDash":false}]},{"StartTime":90313.0,"Objects":[{"StartTime":90313.0,"Position":396.0,"HyperDash":false},{"StartTime":90381.0,"Position":408.481262,"HyperDash":false},{"StartTime":90485.0,"Position":399.746735,"HyperDash":false}]},{"StartTime":90572.0,"Objects":[{"StartTime":90572.0,"Position":332.0,"HyperDash":false}]},{"StartTime":90658.0,"Objects":[{"StartTime":90658.0,"Position":264.0,"HyperDash":false},{"StartTime":90726.0,"Position":289.5814,"HyperDash":false},{"StartTime":90830.0,"Position":354.0,"HyperDash":false}]},{"StartTime":91003.0,"Objects":[{"StartTime":91003.0,"Position":184.0,"HyperDash":false},{"StartTime":91071.0,"Position":167.41861,"HyperDash":false},{"StartTime":91175.0,"Position":94.0,"HyperDash":false}]},{"StartTime":91262.0,"Objects":[{"StartTime":91262.0,"Position":148.0,"HyperDash":false}]},{"StartTime":91348.0,"Objects":[{"StartTime":91348.0,"Position":200.0,"HyperDash":false}]},{"StartTime":91520.0,"Objects":[{"StartTime":91520.0,"Position":32.0,"HyperDash":true}]},{"StartTime":91693.0,"Objects":[{"StartTime":91693.0,"Position":296.0,"HyperDash":false},{"StartTime":91761.0,"Position":318.5814,"HyperDash":false},{"StartTime":91865.0,"Position":302.0,"HyperDash":false}]},{"StartTime":91951.0,"Objects":[{"StartTime":91951.0,"Position":240.0,"HyperDash":false}]},{"StartTime":92037.0,"Objects":[{"StartTime":92037.0,"Position":136.0,"HyperDash":false},{"StartTime":92123.0,"Position":133.503845,"HyperDash":false}]},{"StartTime":92210.0,"Objects":[{"StartTime":92210.0,"Position":196.0,"HyperDash":false},{"StartTime":92296.0,"Position":199.206116,"HyperDash":true}]},{"StartTime":92382.0,"Objects":[{"StartTime":92382.0,"Position":48.0,"HyperDash":false},{"StartTime":92450.0,"Position":10.418602,"HyperDash":false},{"StartTime":92554.0,"Position":50.0,"HyperDash":false}]},{"StartTime":92641.0,"Objects":[{"StartTime":92641.0,"Position":120.0,"HyperDash":false}]},{"StartTime":92727.0,"Objects":[{"StartTime":92727.0,"Position":188.0,"HyperDash":false}]},{"StartTime":92900.0,"Objects":[{"StartTime":92900.0,"Position":360.0,"HyperDash":true}]},{"StartTime":93072.0,"Objects":[{"StartTime":93072.0,"Position":123.0,"HyperDash":false},{"StartTime":93140.0,"Position":135.518738,"HyperDash":false},{"StartTime":93244.0,"Position":119.25325,"HyperDash":false}]},{"StartTime":93331.0,"Objects":[{"StartTime":93331.0,"Position":188.0,"HyperDash":true}]},{"StartTime":93417.0,"Objects":[{"StartTime":93417.0,"Position":368.0,"HyperDash":false},{"StartTime":93503.0,"Position":413.0,"HyperDash":false},{"StartTime":93589.0,"Position":368.0,"HyperDash":true}]},{"StartTime":93762.0,"Objects":[{"StartTime":93762.0,"Position":96.0,"HyperDash":false}]},{"StartTime":93848.0,"Objects":[{"StartTime":93848.0,"Position":53.0,"HyperDash":false}]},{"StartTime":93934.0,"Objects":[{"StartTime":93934.0,"Position":45.0,"HyperDash":false}]},{"StartTime":94020.0,"Objects":[{"StartTime":94020.0,"Position":75.0,"HyperDash":false}]},{"StartTime":94106.0,"Objects":[{"StartTime":94106.0,"Position":128.0,"HyperDash":false}]},{"StartTime":94279.0,"Objects":[{"StartTime":94279.0,"Position":316.0,"HyperDash":true}]},{"StartTime":94451.0,"Objects":[{"StartTime":94451.0,"Position":48.0,"HyperDash":false},{"StartTime":94519.0,"Position":51.57788,"HyperDash":false},{"StartTime":94623.0,"Position":44.4028778,"HyperDash":false}]},{"StartTime":94710.0,"Objects":[{"StartTime":94710.0,"Position":112.0,"HyperDash":true}]},{"StartTime":94796.0,"Objects":[{"StartTime":94796.0,"Position":300.0,"HyperDash":false}]},{"StartTime":94969.0,"Objects":[{"StartTime":94969.0,"Position":416.0,"HyperDash":false},{"StartTime":95055.0,"Position":371.0,"HyperDash":true}]},{"StartTime":95141.0,"Objects":[{"StartTime":95141.0,"Position":180.0,"HyperDash":false}]},{"StartTime":95227.0,"Objects":[{"StartTime":95227.0,"Position":128.0,"HyperDash":false}]},{"StartTime":95313.0,"Objects":[{"StartTime":95313.0,"Position":76.0,"HyperDash":false}]},{"StartTime":95486.0,"Objects":[{"StartTime":95486.0,"Position":248.0,"HyperDash":false}]},{"StartTime":95658.0,"Objects":[{"StartTime":95658.0,"Position":68.0,"HyperDash":true}]},{"StartTime":95831.0,"Objects":[{"StartTime":95831.0,"Position":348.0,"HyperDash":false},{"StartTime":95899.0,"Position":373.5814,"HyperDash":false},{"StartTime":96003.0,"Position":438.0,"HyperDash":true}]},{"StartTime":96175.0,"Objects":[{"StartTime":96175.0,"Position":176.0,"HyperDash":false},{"StartTime":96261.0,"Position":102.839455,"HyperDash":false},{"StartTime":96347.0,"Position":70.72701,"HyperDash":false},{"StartTime":96433.0,"Position":95.68428,"HyperDash":false},{"StartTime":96519.0,"Position":200.009659,"HyperDash":false},{"StartTime":96605.0,"Position":276.00058,"HyperDash":false},{"StartTime":96692.0,"Position":280.8676,"HyperDash":false},{"StartTime":96821.0,"Position":179.5454,"HyperDash":false}]},{"StartTime":96865.0,"Objects":[{"StartTime":96865.0,"Position":156.0,"HyperDash":false},{"StartTime":96951.0,"Position":90.61737,"HyperDash":false},{"StartTime":97037.0,"Position":78.41168,"HyperDash":false},{"StartTime":97123.0,"Position":117.060234,"HyperDash":false},{"StartTime":97209.0,"Position":173.374588,"HyperDash":false},{"StartTime":97295.0,"Position":216.741837,"HyperDash":false},{"StartTime":97382.0,"Position":244.734863,"HyperDash":false},{"StartTime":97511.0,"Position":177.973221,"HyperDash":false}]},{"StartTime":97555.0,"Objects":[{"StartTime":97555.0,"Position":144.0,"HyperDash":false},{"StartTime":97641.0,"Position":112.369415,"HyperDash":false},{"StartTime":97727.0,"Position":88.02037,"HyperDash":false},{"StartTime":97813.0,"Position":103.779022,"HyperDash":false},{"StartTime":97899.0,"Position":143.185013,"HyperDash":false},{"StartTime":97985.0,"Position":200.21698,"HyperDash":false},{"StartTime":98072.0,"Position":207.316086,"HyperDash":false},{"StartTime":98140.0,"Position":203.132828,"HyperDash":false},{"StartTime":98244.0,"Position":161.018463,"HyperDash":false}]},{"StartTime":99279.0,"Objects":[{"StartTime":99279.0,"Position":164.0,"HyperDash":false}]},{"StartTime":99451.0,"Objects":[{"StartTime":99451.0,"Position":324.0,"HyperDash":false},{"StartTime":99494.0,"Position":333.138123,"HyperDash":false},{"StartTime":99537.0,"Position":324.0,"HyperDash":false},{"StartTime":99580.0,"Position":333.138123,"HyperDash":true}]},{"StartTime":99624.0,"Objects":[{"StartTime":99624.0,"Position":204.0,"HyperDash":false},{"StartTime":99692.0,"Position":148.6279,"HyperDash":false},{"StartTime":99796.0,"Position":69.0,"HyperDash":true}]},{"StartTime":99969.0,"Objects":[{"StartTime":99969.0,"Position":340.0,"HyperDash":false},{"StartTime":100037.0,"Position":303.6279,"HyperDash":false},{"StartTime":100141.0,"Position":205.0,"HyperDash":true}]},{"StartTime":100313.0,"Objects":[{"StartTime":100313.0,"Position":472.0,"HyperDash":true}]},{"StartTime":100658.0,"Objects":[{"StartTime":100658.0,"Position":64.0,"HyperDash":false},{"StartTime":100744.0,"Position":10.0,"HyperDash":false},{"StartTime":100830.0,"Position":64.0,"HyperDash":true}]},{"StartTime":101003.0,"Objects":[{"StartTime":101003.0,"Position":336.0,"HyperDash":false}]},{"StartTime":101175.0,"Objects":[{"StartTime":101175.0,"Position":176.0,"HyperDash":true}]},{"StartTime":101348.0,"Objects":[{"StartTime":101348.0,"Position":448.0,"HyperDash":false},{"StartTime":101416.0,"Position":502.697662,"HyperDash":false},{"StartTime":101520.0,"Position":444.0,"HyperDash":false}]},{"StartTime":101606.0,"Objects":[{"StartTime":101606.0,"Position":384.0,"HyperDash":true}]},{"StartTime":101693.0,"Objects":[{"StartTime":101693.0,"Position":220.0,"HyperDash":false},{"StartTime":101761.0,"Position":270.697662,"HyperDash":false},{"StartTime":101865.0,"Position":328.0,"HyperDash":false}]},{"StartTime":101951.0,"Objects":[{"StartTime":101951.0,"Position":264.0,"HyperDash":true}]},{"StartTime":102037.0,"Objects":[{"StartTime":102037.0,"Position":112.0,"HyperDash":false}]},{"StartTime":102124.0,"Objects":[{"StartTime":102124.0,"Position":56.0,"HyperDash":false}]},{"StartTime":102210.0,"Objects":[{"StartTime":102210.0,"Position":56.0,"HyperDash":true}]},{"StartTime":102382.0,"Objects":[{"StartTime":102382.0,"Position":344.0,"HyperDash":true}]},{"StartTime":102555.0,"Objects":[{"StartTime":102555.0,"Position":56.0,"HyperDash":true}]},{"StartTime":102727.0,"Objects":[{"StartTime":102727.0,"Position":368.0,"HyperDash":false},{"StartTime":102795.0,"Position":407.851135,"HyperDash":false},{"StartTime":102899.0,"Position":390.870453,"HyperDash":false}]},{"StartTime":102986.0,"Objects":[{"StartTime":102986.0,"Position":332.0,"HyperDash":true}]},{"StartTime":103072.0,"Objects":[{"StartTime":103072.0,"Position":168.0,"HyperDash":false},{"StartTime":103140.0,"Position":110.302322,"HyperDash":false},{"StartTime":103244.0,"Position":60.0,"HyperDash":false}]},{"StartTime":103331.0,"Objects":[{"StartTime":103331.0,"Position":120.0,"HyperDash":true}]},{"StartTime":103417.0,"Objects":[{"StartTime":103417.0,"Position":304.0,"HyperDash":false}]},{"StartTime":103503.0,"Objects":[{"StartTime":103503.0,"Position":364.0,"HyperDash":false}]},{"StartTime":103589.0,"Objects":[{"StartTime":103589.0,"Position":424.0,"HyperDash":true}]},{"StartTime":103762.0,"Objects":[{"StartTime":103762.0,"Position":152.0,"HyperDash":false}]},{"StartTime":103934.0,"Objects":[{"StartTime":103934.0,"Position":316.0,"HyperDash":true}]},{"StartTime":104106.0,"Objects":[{"StartTime":104106.0,"Position":56.0,"HyperDash":false},{"StartTime":104174.0,"Position":18.3023262,"HyperDash":false},{"StartTime":104278.0,"Position":59.9999962,"HyperDash":false}]},{"StartTime":104365.0,"Objects":[{"StartTime":104365.0,"Position":116.0,"HyperDash":true}]},{"StartTime":104451.0,"Objects":[{"StartTime":104451.0,"Position":304.0,"HyperDash":false},{"StartTime":104519.0,"Position":357.697662,"HyperDash":false},{"StartTime":104623.0,"Position":412.0,"HyperDash":false}]},{"StartTime":104710.0,"Objects":[{"StartTime":104710.0,"Position":356.0,"HyperDash":true}]},{"StartTime":104796.0,"Objects":[{"StartTime":104796.0,"Position":168.0,"HyperDash":false},{"StartTime":104882.0,"Position":114.0,"HyperDash":false},{"StartTime":104968.0,"Position":168.0,"HyperDash":true}]},{"StartTime":105141.0,"Objects":[{"StartTime":105141.0,"Position":440.0,"HyperDash":true}]},{"StartTime":105313.0,"Objects":[{"StartTime":105313.0,"Position":144.0,"HyperDash":true}]},{"StartTime":105486.0,"Objects":[{"StartTime":105486.0,"Position":468.0,"HyperDash":false},{"StartTime":105554.0,"Position":451.0,"HyperDash":false},{"StartTime":105658.0,"Position":412.0,"HyperDash":false}]},{"StartTime":105744.0,"Objects":[{"StartTime":105744.0,"Position":360.0,"HyperDash":true}]},{"StartTime":105831.0,"Objects":[{"StartTime":105831.0,"Position":164.0,"HyperDash":false},{"StartTime":105899.0,"Position":224.697678,"HyperDash":false},{"StartTime":106003.0,"Position":272.0,"HyperDash":false}]},{"StartTime":106089.0,"Objects":[{"StartTime":106089.0,"Position":212.0,"HyperDash":true}]},{"StartTime":106175.0,"Objects":[{"StartTime":106175.0,"Position":24.0,"HyperDash":false}]},{"StartTime":106262.0,"Objects":[{"StartTime":106262.0,"Position":20.0,"HyperDash":false}]},{"StartTime":106348.0,"Objects":[{"StartTime":106348.0,"Position":16.0,"HyperDash":true}]},{"StartTime":106520.0,"Objects":[{"StartTime":106520.0,"Position":296.0,"HyperDash":false}]},{"StartTime":106693.0,"Objects":[{"StartTime":106693.0,"Position":132.0,"HyperDash":true}]},{"StartTime":106865.0,"Objects":[{"StartTime":106865.0,"Position":400.0,"HyperDash":false},{"StartTime":106933.0,"Position":443.234375,"HyperDash":false},{"StartTime":107037.0,"Position":447.13623,"HyperDash":false}]},{"StartTime":107124.0,"Objects":[{"StartTime":107124.0,"Position":388.0,"HyperDash":true}]},{"StartTime":107210.0,"Objects":[{"StartTime":107210.0,"Position":196.0,"HyperDash":false},{"StartTime":107278.0,"Position":142.302322,"HyperDash":false},{"StartTime":107382.0,"Position":88.0,"HyperDash":false}]},{"StartTime":107469.0,"Objects":[{"StartTime":107469.0,"Position":148.0,"HyperDash":true}]},{"StartTime":107555.0,"Objects":[{"StartTime":107555.0,"Position":304.0,"HyperDash":false}]},{"StartTime":107641.0,"Objects":[{"StartTime":107641.0,"Position":358.0,"HyperDash":false}]},{"StartTime":107727.0,"Objects":[{"StartTime":107727.0,"Position":412.0,"HyperDash":true}]},{"StartTime":107900.0,"Objects":[{"StartTime":107900.0,"Position":136.0,"HyperDash":true}]},{"StartTime":108072.0,"Objects":[{"StartTime":108072.0,"Position":432.0,"HyperDash":true}]},{"StartTime":108244.0,"Objects":[{"StartTime":108244.0,"Position":160.0,"HyperDash":false},{"StartTime":108312.0,"Position":129.302322,"HyperDash":false},{"StartTime":108416.0,"Position":52.0,"HyperDash":false}]},{"StartTime":108503.0,"Objects":[{"StartTime":108503.0,"Position":112.0,"HyperDash":true}]},{"StartTime":108589.0,"Objects":[{"StartTime":108589.0,"Position":300.0,"HyperDash":false},{"StartTime":108657.0,"Position":249.302338,"HyperDash":false},{"StartTime":108761.0,"Position":192.0,"HyperDash":false}]},{"StartTime":108848.0,"Objects":[{"StartTime":108848.0,"Position":248.0,"HyperDash":true}]},{"StartTime":108934.0,"Objects":[{"StartTime":108934.0,"Position":436.0,"HyperDash":false},{"StartTime":109020.0,"Position":490.0,"HyperDash":false},{"StartTime":109106.0,"Position":436.0,"HyperDash":true}]},{"StartTime":109279.0,"Objects":[{"StartTime":109279.0,"Position":164.0,"HyperDash":false}]},{"StartTime":109451.0,"Objects":[{"StartTime":109451.0,"Position":324.0,"HyperDash":true}]},{"StartTime":109624.0,"Objects":[{"StartTime":109624.0,"Position":52.0,"HyperDash":false},{"StartTime":109692.0,"Position":35.4452477,"HyperDash":false},{"StartTime":109796.0,"Position":52.0779152,"HyperDash":false}]},{"StartTime":109882.0,"Objects":[{"StartTime":109882.0,"Position":112.0,"HyperDash":true}]},{"StartTime":109969.0,"Objects":[{"StartTime":109969.0,"Position":316.0,"HyperDash":false},{"StartTime":110037.0,"Position":270.302338,"HyperDash":false},{"StartTime":110141.0,"Position":208.0,"HyperDash":false}]},{"StartTime":110227.0,"Objects":[{"StartTime":110227.0,"Position":268.0,"HyperDash":true}]},{"StartTime":110313.0,"Objects":[{"StartTime":110313.0,"Position":456.0,"HyperDash":false},{"StartTime":110381.0,"Position":440.422455,"HyperDash":false},{"StartTime":110485.0,"Position":459.598,"HyperDash":false}]},{"StartTime":110658.0,"Objects":[{"StartTime":110658.0,"Position":292.0,"HyperDash":false},{"StartTime":110726.0,"Position":273.422455,"HyperDash":false},{"StartTime":110830.0,"Position":295.598,"HyperDash":true}]},{"StartTime":111003.0,"Objects":[{"StartTime":111003.0,"Position":32.0,"HyperDash":false}]},{"StartTime":111118.0,"Objects":[{"StartTime":111118.0,"Position":140.0,"HyperDash":false}]},{"StartTime":111233.0,"Objects":[{"StartTime":111233.0,"Position":248.0,"HyperDash":true}]},{"StartTime":111348.0,"Objects":[{"StartTime":111348.0,"Position":44.0,"HyperDash":false},{"StartTime":111405.0,"Position":62.84279,"HyperDash":false},{"StartTime":111462.0,"Position":116.0,"HyperDash":false},{"StartTime":111577.0,"Position":44.0,"HyperDash":true}]},{"StartTime":111693.0,"Objects":[{"StartTime":111693.0,"Position":320.0,"HyperDash":false}]},{"StartTime":111779.0,"Objects":[{"StartTime":111779.0,"Position":392.0,"HyperDash":false}]},{"StartTime":111865.0,"Objects":[{"StartTime":111865.0,"Position":464.0,"HyperDash":true}]},{"StartTime":112037.0,"Objects":[{"StartTime":112037.0,"Position":196.0,"HyperDash":false}]},{"StartTime":112210.0,"Objects":[{"StartTime":112210.0,"Position":364.0,"HyperDash":true}]},{"StartTime":112382.0,"Objects":[{"StartTime":112382.0,"Position":92.0,"HyperDash":false},{"StartTime":112450.0,"Position":150.697678,"HyperDash":false},{"StartTime":112554.0,"Position":200.0,"HyperDash":false}]},{"StartTime":112641.0,"Objects":[{"StartTime":112641.0,"Position":140.0,"HyperDash":true}]},{"StartTime":112727.0,"Objects":[{"StartTime":112727.0,"Position":356.0,"HyperDash":false},{"StartTime":112795.0,"Position":379.697662,"HyperDash":false},{"StartTime":112899.0,"Position":352.0,"HyperDash":false}]},{"StartTime":112986.0,"Objects":[{"StartTime":112986.0,"Position":292.0,"HyperDash":true}]},{"StartTime":113072.0,"Objects":[{"StartTime":113072.0,"Position":96.0,"HyperDash":false}]},{"StartTime":113158.0,"Objects":[{"StartTime":113158.0,"Position":36.0,"HyperDash":false}]},{"StartTime":113244.0,"Objects":[{"StartTime":113244.0,"Position":96.0,"HyperDash":true}]},{"StartTime":113417.0,"Objects":[{"StartTime":113417.0,"Position":368.0,"HyperDash":true}]},{"StartTime":113589.0,"Objects":[{"StartTime":113589.0,"Position":72.0,"HyperDash":true}]},{"StartTime":113762.0,"Objects":[{"StartTime":113762.0,"Position":364.0,"HyperDash":false},{"StartTime":113830.0,"Position":340.302338,"HyperDash":false},{"StartTime":113934.0,"Position":256.0,"HyperDash":false}]},{"StartTime":114020.0,"Objects":[{"StartTime":114020.0,"Position":316.0,"HyperDash":true}]},{"StartTime":114106.0,"Objects":[{"StartTime":114106.0,"Position":120.0,"HyperDash":false},{"StartTime":114174.0,"Position":143.697678,"HyperDash":false},{"StartTime":114278.0,"Position":228.0,"HyperDash":false}]},{"StartTime":114365.0,"Objects":[{"StartTime":114365.0,"Position":168.0,"HyperDash":true}]},{"StartTime":114451.0,"Objects":[{"StartTime":114451.0,"Position":384.0,"HyperDash":false}]},{"StartTime":114537.0,"Objects":[{"StartTime":114537.0,"Position":444.0,"HyperDash":false}]},{"StartTime":114624.0,"Objects":[{"StartTime":114624.0,"Position":444.0,"HyperDash":true}]},{"StartTime":114796.0,"Objects":[{"StartTime":114796.0,"Position":176.0,"HyperDash":false}]},{"StartTime":114969.0,"Objects":[{"StartTime":114969.0,"Position":344.0,"HyperDash":true}]},{"StartTime":115141.0,"Objects":[{"StartTime":115141.0,"Position":76.0,"HyperDash":false},{"StartTime":115209.0,"Position":33.3023262,"HyperDash":false},{"StartTime":115313.0,"Position":20.0,"HyperDash":false}]},{"StartTime":115400.0,"Objects":[{"StartTime":115400.0,"Position":80.0,"HyperDash":true}]},{"StartTime":115486.0,"Objects":[{"StartTime":115486.0,"Position":284.0,"HyperDash":false},{"StartTime":115554.0,"Position":236.302322,"HyperDash":false},{"StartTime":115658.0,"Position":176.0,"HyperDash":false}]},{"StartTime":115744.0,"Objects":[{"StartTime":115744.0,"Position":236.0,"HyperDash":true}]},{"StartTime":115831.0,"Objects":[{"StartTime":115831.0,"Position":28.0,"HyperDash":false},{"StartTime":115917.0,"Position":82.0,"HyperDash":false},{"StartTime":116003.0,"Position":28.0,"HyperDash":true}]},{"StartTime":116175.0,"Objects":[{"StartTime":116175.0,"Position":300.0,"HyperDash":false}]},{"StartTime":116348.0,"Objects":[{"StartTime":116348.0,"Position":132.0,"HyperDash":true}]},{"StartTime":116520.0,"Objects":[{"StartTime":116520.0,"Position":408.0,"HyperDash":false},{"StartTime":116588.0,"Position":351.302338,"HyperDash":false},{"StartTime":116692.0,"Position":300.0,"HyperDash":false}]},{"StartTime":116779.0,"Objects":[{"StartTime":116779.0,"Position":360.0,"HyperDash":true}]},{"StartTime":116865.0,"Objects":[{"StartTime":116865.0,"Position":156.0,"HyperDash":false},{"StartTime":116933.0,"Position":184.697678,"HyperDash":false},{"StartTime":117037.0,"Position":264.0,"HyperDash":false}]},{"StartTime":117124.0,"Objects":[{"StartTime":117124.0,"Position":204.0,"HyperDash":true}]},{"StartTime":117210.0,"Objects":[{"StartTime":117210.0,"Position":384.0,"HyperDash":false}]},{"StartTime":117296.0,"Objects":[{"StartTime":117296.0,"Position":444.0,"HyperDash":false}]},{"StartTime":117382.0,"Objects":[{"StartTime":117382.0,"Position":504.0,"HyperDash":true}]},{"StartTime":117555.0,"Objects":[{"StartTime":117555.0,"Position":228.0,"HyperDash":false},{"StartTime":117623.0,"Position":287.697662,"HyperDash":false},{"StartTime":117727.0,"Position":336.0,"HyperDash":true}]},{"StartTime":117900.0,"Objects":[{"StartTime":117900.0,"Position":60.0,"HyperDash":false},{"StartTime":117968.0,"Position":86.69768,"HyperDash":false},{"StartTime":118072.0,"Position":168.0,"HyperDash":false}]},{"StartTime":118158.0,"Objects":[{"StartTime":118158.0,"Position":108.0,"HyperDash":true}]},{"StartTime":118244.0,"Objects":[{"StartTime":118244.0,"Position":324.0,"HyperDash":false},{"StartTime":118312.0,"Position":384.697662,"HyperDash":false},{"StartTime":118416.0,"Position":380.0,"HyperDash":false}]},{"StartTime":118503.0,"Objects":[{"StartTime":118503.0,"Position":320.0,"HyperDash":true}]},{"StartTime":118589.0,"Objects":[{"StartTime":118589.0,"Position":132.0,"HyperDash":false}]},{"StartTime":118675.0,"Objects":[{"StartTime":118675.0,"Position":72.0,"HyperDash":false}]},{"StartTime":118762.0,"Objects":[{"StartTime":118762.0,"Position":132.0,"HyperDash":true}]},{"StartTime":118934.0,"Objects":[{"StartTime":118934.0,"Position":428.0,"HyperDash":true}]},{"StartTime":119106.0,"Objects":[{"StartTime":119106.0,"Position":80.0,"HyperDash":true}]},{"StartTime":119279.0,"Objects":[{"StartTime":119279.0,"Position":352.0,"HyperDash":false},{"StartTime":119347.0,"Position":288.6279,"HyperDash":false},{"StartTime":119451.0,"Position":217.0,"HyperDash":false}]},{"StartTime":119537.0,"Objects":[{"StartTime":119537.0,"Position":148.0,"HyperDash":true}]},{"StartTime":119624.0,"Objects":[{"StartTime":119624.0,"Position":388.0,"HyperDash":false},{"StartTime":119692.0,"Position":336.6279,"HyperDash":false},{"StartTime":119796.0,"Position":253.0,"HyperDash":false}]},{"StartTime":119882.0,"Objects":[{"StartTime":119882.0,"Position":320.0,"HyperDash":true}]},{"StartTime":119969.0,"Objects":[{"StartTime":119969.0,"Position":100.0,"HyperDash":false},{"StartTime":120055.0,"Position":46.0,"HyperDash":false},{"StartTime":120141.0,"Position":100.0,"HyperDash":true}]},{"StartTime":120313.0,"Objects":[{"StartTime":120313.0,"Position":384.0,"HyperDash":true}]},{"StartTime":120486.0,"Objects":[{"StartTime":120486.0,"Position":112.0,"HyperDash":true}]},{"StartTime":120658.0,"Objects":[{"StartTime":120658.0,"Position":408.0,"HyperDash":false},{"StartTime":120726.0,"Position":466.697662,"HyperDash":false},{"StartTime":120830.0,"Position":412.0,"HyperDash":false}]},{"StartTime":120917.0,"Objects":[{"StartTime":120917.0,"Position":348.0,"HyperDash":true}]},{"StartTime":121003.0,"Objects":[{"StartTime":121003.0,"Position":132.0,"HyperDash":false},{"StartTime":121071.0,"Position":77.837204,"HyperDash":false},{"StartTime":121175.0,"Position":127.999992,"HyperDash":false}]},{"StartTime":121262.0,"Objects":[{"StartTime":121262.0,"Position":196.0,"HyperDash":true}]},{"StartTime":121348.0,"Objects":[{"StartTime":121348.0,"Position":384.0,"HyperDash":false},{"StartTime":121434.0,"Position":387.368439,"HyperDash":true}]},{"StartTime":121520.0,"Objects":[{"StartTime":121520.0,"Position":188.0,"HyperDash":false},{"StartTime":121606.0,"Position":184.631577,"HyperDash":true}]},{"StartTime":121693.0,"Objects":[{"StartTime":121693.0,"Position":400.0,"HyperDash":false},{"StartTime":121779.0,"Position":346.0,"HyperDash":true}]},{"StartTime":121865.0,"Objects":[{"StartTime":121865.0,"Position":128.0,"HyperDash":false},{"StartTime":121951.0,"Position":124.407974,"HyperDash":true}]},{"StartTime":122037.0,"Objects":[{"StartTime":122037.0,"Position":336.0,"HyperDash":false},{"StartTime":122123.0,"Position":282.0,"HyperDash":true}]},{"StartTime":122210.0,"Objects":[{"StartTime":122210.0,"Position":484.0,"HyperDash":false},{"StartTime":122296.0,"Position":486.696625,"HyperDash":true}]},{"StartTime":122382.0,"Objects":[{"StartTime":122382.0,"Position":272.0,"HyperDash":false},{"StartTime":122468.0,"Position":326.0,"HyperDash":true}]},{"StartTime":122555.0,"Objects":[{"StartTime":122555.0,"Position":108.0,"HyperDash":false},{"StartTime":122641.0,"Position":54.0,"HyperDash":true}]},{"StartTime":122727.0,"Objects":[{"StartTime":122727.0,"Position":280.0,"HyperDash":false}]},{"StartTime":122813.0,"Objects":[{"StartTime":122813.0,"Position":347.0,"HyperDash":false}]},{"StartTime":122900.0,"Objects":[{"StartTime":122900.0,"Position":415.0,"HyperDash":false}]},{"StartTime":123072.0,"Objects":[{"StartTime":123072.0,"Position":256.0,"HyperDash":false}]},{"StartTime":123158.0,"Objects":[{"StartTime":123158.0,"Position":308.0,"HyperDash":false}]},{"StartTime":123244.0,"Objects":[{"StartTime":123244.0,"Position":360.0,"HyperDash":false}]},{"StartTime":123417.0,"Objects":[{"StartTime":123417.0,"Position":228.0,"HyperDash":false}]},{"StartTime":123503.0,"Objects":[{"StartTime":123503.0,"Position":260.0,"HyperDash":false}]},{"StartTime":123589.0,"Objects":[{"StartTime":123589.0,"Position":292.0,"HyperDash":false}]},{"StartTime":123762.0,"Objects":[{"StartTime":123762.0,"Position":188.0,"HyperDash":false}]},{"StartTime":123848.0,"Objects":[{"StartTime":123848.0,"Position":196.0,"HyperDash":false}]},{"StartTime":123934.0,"Objects":[{"StartTime":123934.0,"Position":204.0,"HyperDash":false}]},{"StartTime":124106.0,"Objects":[{"StartTime":124106.0,"Position":311.0,"HyperDash":false},{"StartTime":124170.0,"Position":216.0,"HyperDash":false},{"StartTime":124235.0,"Position":310.0,"HyperDash":false},{"StartTime":124299.0,"Position":397.0,"HyperDash":false},{"StartTime":124364.0,"Position":214.0,"HyperDash":false},{"StartTime":124429.0,"Position":505.0,"HyperDash":false},{"StartTime":124493.0,"Position":173.0,"HyperDash":false},{"StartTime":124558.0,"Position":295.0,"HyperDash":false},{"StartTime":124623.0,"Position":199.0,"HyperDash":false},{"StartTime":124687.0,"Position":494.0,"HyperDash":false},{"StartTime":124752.0,"Position":293.0,"HyperDash":false},{"StartTime":124817.0,"Position":115.0,"HyperDash":false},{"StartTime":124881.0,"Position":412.0,"HyperDash":false},{"StartTime":124946.0,"Position":506.0,"HyperDash":false},{"StartTime":125011.0,"Position":293.0,"HyperDash":false},{"StartTime":125075.0,"Position":346.0,"HyperDash":false},{"StartTime":125140.0,"Position":117.0,"HyperDash":false},{"StartTime":125205.0,"Position":285.0,"HyperDash":false},{"StartTime":125269.0,"Position":17.0,"HyperDash":false},{"StartTime":125334.0,"Position":238.0,"HyperDash":false},{"StartTime":125399.0,"Position":222.0,"HyperDash":false},{"StartTime":125463.0,"Position":450.0,"HyperDash":false},{"StartTime":125528.0,"Position":67.0,"HyperDash":false},{"StartTime":125593.0,"Position":219.0,"HyperDash":false},{"StartTime":125657.0,"Position":307.0,"HyperDash":false},{"StartTime":125722.0,"Position":367.0,"HyperDash":false},{"StartTime":125787.0,"Position":412.0,"HyperDash":false},{"StartTime":125851.0,"Position":413.0,"HyperDash":false},{"StartTime":125916.0,"Position":143.0,"HyperDash":false},{"StartTime":125981.0,"Position":339.0,"HyperDash":false},{"StartTime":126045.0,"Position":342.0,"HyperDash":false},{"StartTime":126110.0,"Position":249.0,"HyperDash":false},{"StartTime":126175.0,"Position":235.0,"HyperDash":false},{"StartTime":126239.0,"Position":323.0,"HyperDash":false},{"StartTime":126304.0,"Position":365.0,"HyperDash":false},{"StartTime":126368.0,"Position":74.0,"HyperDash":false},{"StartTime":126433.0,"Position":281.0,"HyperDash":false},{"StartTime":126498.0,"Position":398.0,"HyperDash":false},{"StartTime":126562.0,"Position":335.0,"HyperDash":false},{"StartTime":126627.0,"Position":388.0,"HyperDash":false},{"StartTime":126692.0,"Position":228.0,"HyperDash":false},{"StartTime":126756.0,"Position":323.0,"HyperDash":false},{"StartTime":126821.0,"Position":441.0,"HyperDash":false},{"StartTime":126886.0,"Position":442.0,"HyperDash":false},{"StartTime":126950.0,"Position":278.0,"HyperDash":false},{"StartTime":127015.0,"Position":90.0,"HyperDash":false},{"StartTime":127080.0,"Position":409.0,"HyperDash":false},{"StartTime":127144.0,"Position":377.0,"HyperDash":false},{"StartTime":127209.0,"Position":457.0,"HyperDash":false},{"StartTime":127274.0,"Position":409.0,"HyperDash":false},{"StartTime":127338.0,"Position":43.0,"HyperDash":false},{"StartTime":127403.0,"Position":162.0,"HyperDash":false},{"StartTime":127468.0,"Position":341.0,"HyperDash":false},{"StartTime":127532.0,"Position":72.0,"HyperDash":false},{"StartTime":127597.0,"Position":135.0,"HyperDash":false},{"StartTime":127662.0,"Position":252.0,"HyperDash":false},{"StartTime":127726.0,"Position":446.0,"HyperDash":false},{"StartTime":127791.0,"Position":284.0,"HyperDash":false},{"StartTime":127856.0,"Position":70.0,"HyperDash":false},{"StartTime":127920.0,"Position":494.0,"HyperDash":false},{"StartTime":127985.0,"Position":463.0,"HyperDash":false},{"StartTime":128050.0,"Position":277.0,"HyperDash":false},{"StartTime":128114.0,"Position":425.0,"HyperDash":false},{"StartTime":128179.0,"Position":281.0,"HyperDash":false},{"StartTime":128244.0,"Position":3.0,"HyperDash":false},{"StartTime":128308.0,"Position":346.0,"HyperDash":false},{"StartTime":128373.0,"Position":350.0,"HyperDash":false},{"StartTime":128437.0,"Position":217.0,"HyperDash":false},{"StartTime":128502.0,"Position":455.0,"HyperDash":false},{"StartTime":128567.0,"Position":229.0,"HyperDash":false},{"StartTime":128631.0,"Position":51.0,"HyperDash":false},{"StartTime":128696.0,"Position":199.0,"HyperDash":false},{"StartTime":128761.0,"Position":208.0,"HyperDash":false},{"StartTime":128825.0,"Position":173.0,"HyperDash":false},{"StartTime":128890.0,"Position":367.0,"HyperDash":false},{"StartTime":128955.0,"Position":193.0,"HyperDash":false},{"StartTime":129019.0,"Position":488.0,"HyperDash":false},{"StartTime":129084.0,"Position":314.0,"HyperDash":false},{"StartTime":129149.0,"Position":135.0,"HyperDash":false},{"StartTime":129213.0,"Position":399.0,"HyperDash":false},{"StartTime":129278.0,"Position":404.0,"HyperDash":false},{"StartTime":129343.0,"Position":152.0,"HyperDash":false},{"StartTime":129407.0,"Position":353.0,"HyperDash":false},{"StartTime":129472.0,"Position":358.0,"HyperDash":false},{"StartTime":129537.0,"Position":447.0,"HyperDash":false},{"StartTime":129601.0,"Position":222.0,"HyperDash":false},{"StartTime":129666.0,"Position":382.0,"HyperDash":false},{"StartTime":129731.0,"Position":433.0,"HyperDash":false},{"StartTime":129795.0,"Position":450.0,"HyperDash":false},{"StartTime":129860.0,"Position":326.0,"HyperDash":false},{"StartTime":129925.0,"Position":414.0,"HyperDash":false},{"StartTime":129989.0,"Position":285.0,"HyperDash":false},{"StartTime":130054.0,"Position":336.0,"HyperDash":false},{"StartTime":130119.0,"Position":509.0,"HyperDash":false},{"StartTime":130183.0,"Position":334.0,"HyperDash":false},{"StartTime":130248.0,"Position":72.0,"HyperDash":false},{"StartTime":130313.0,"Position":425.0,"HyperDash":false},{"StartTime":130377.0,"Position":451.0,"HyperDash":false},{"StartTime":130442.0,"Position":220.0,"HyperDash":false},{"StartTime":130506.0,"Position":25.0,"HyperDash":false},{"StartTime":130571.0,"Position":77.0,"HyperDash":false},{"StartTime":130636.0,"Position":509.0,"HyperDash":false},{"StartTime":130700.0,"Position":90.0,"HyperDash":false},{"StartTime":130765.0,"Position":118.0,"HyperDash":false},{"StartTime":130830.0,"Position":58.0,"HyperDash":false},{"StartTime":130894.0,"Position":12.0,"HyperDash":false},{"StartTime":130959.0,"Position":215.0,"HyperDash":false},{"StartTime":131024.0,"Position":487.0,"HyperDash":false},{"StartTime":131088.0,"Position":446.0,"HyperDash":false},{"StartTime":131153.0,"Position":491.0,"HyperDash":false},{"StartTime":131218.0,"Position":459.0,"HyperDash":false},{"StartTime":131282.0,"Position":37.0,"HyperDash":false},{"StartTime":131347.0,"Position":291.0,"HyperDash":false},{"StartTime":131412.0,"Position":315.0,"HyperDash":false},{"StartTime":131476.0,"Position":35.0,"HyperDash":false},{"StartTime":131541.0,"Position":208.0,"HyperDash":false},{"StartTime":131606.0,"Position":504.0,"HyperDash":false},{"StartTime":131670.0,"Position":296.0,"HyperDash":false},{"StartTime":131735.0,"Position":105.0,"HyperDash":false},{"StartTime":131800.0,"Position":488.0,"HyperDash":false},{"StartTime":131864.0,"Position":230.0,"HyperDash":false},{"StartTime":131929.0,"Position":446.0,"HyperDash":false},{"StartTime":131994.0,"Position":241.0,"HyperDash":false},{"StartTime":132058.0,"Position":413.0,"HyperDash":false},{"StartTime":132123.0,"Position":357.0,"HyperDash":false},{"StartTime":132188.0,"Position":256.0,"HyperDash":false},{"StartTime":132252.0,"Position":192.0,"HyperDash":false},{"StartTime":132317.0,"Position":116.0,"HyperDash":false},{"StartTime":132382.0,"Position":397.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2781126.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2781126.osu
new file mode 100644
index 0000000000..af7cd296d7
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/2781126.osu
@@ -0,0 +1,908 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4.5
+OverallDifficulty:9.5
+ApproachRate:9.5
+SliderMultiplier:1.8
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+-31,344.827586206897,4,2,1,15,1,0
+486,-100,4,2,1,50,0,0
+658,-100,4,2,1,55,0,0
+831,-100,4,2,1,60,0,0
+1003,-100,4,2,1,65,0,0
+1175,-100,4,2,1,5,0,0
+1348,-100,4,2,1,80,0,0
+11089,-100,4,2,2,40,0,0
+11175,-100,4,2,2,45,0,0
+11262,-100,4,2,2,50,0,0
+11348,-100,4,2,2,55,0,0
+11434,-100,4,2,2,60,0,0
+11520,-100,4,2,2,65,0,0
+11606,-100,4,2,2,70,0,0
+11693,-100,4,2,1,75,0,0
+11865,-100,4,2,1,70,0,0
+12037,-80,4,2,1,75,0,0
+12296,-100,4,2,1,100,0,0
+12382,-100,4,2,1,85,0,0
+20658,-83.3333333333333,4,2,1,85,0,0
+21175,-100,4,2,1,85,0,0
+22037,-100,4,2,1,80,0,0
+22210,-100,4,2,2,50,0,0
+22727,-100,4,2,1,80,0,0
+23072,-66.6666666666667,4,2,1,100,0,0
+23331,-100,4,2,1,100,0,0
+23417,-80,4,2,1,75,0,0
+23762,-100,4,2,1,100,0,0
+34451,-66.6666666666667,4,2,1,80,0,0
+34624,-100,4,2,1,80,0,0
+39969,-80,4,2,1,80,0,0
+40658,-80,4,2,1,100,0,0
+41348,-66.6666666666667,4,2,1,100,0,0
+42037,-100,4,2,1,100,0,0
+44106,-66.6666666666667,4,2,1,70,0,0
+44279,-100,4,2,1,100,0,0
+44796,-66.6666666666667,4,2,1,100,0,0
+46175,-66.6666666666667,4,2,1,90,0,1
+46348,-100,4,2,1,90,0,1
+51348,-33.3333333333333,4,2,1,90,0,1
+51520,-66.6666666666667,4,2,1,90,0,1
+51693,-100,4,2,1,100,0,1
+52037,-66.6666666666667,4,2,1,100,0,1
+52727,-100,4,2,1,100,0,1
+53072,-40,4,2,1,100,0,1
+53762,-100,4,2,1,100,0,1
+55141,-66.6666666666667,4,2,1,100,0,1
+55371,-100,4,2,1,100,0,1
+56520,-66.6666666666667,4,2,1,90,0,0
+56606,-66.6666666666667,4,2,2,47,0,0
+56693,-66.6666666666667,4,2,1,54,0,0
+56779,-66.6666666666667,4,2,2,61,0,0
+56865,-66.6666666666667,4,2,1,68,0,0
+56951,-66.6666666666667,4,2,2,75,0,0
+57037,-66.6666666666667,4,2,1,81,0,0
+57124,-66.6666666666667,4,2,2,88,0,0
+57210,-100,4,2,1,90,0,0
+57900,-66.6666666666667,4,2,1,90,0,1
+58072,-100,4,2,1,90,0,1
+58244,-80,4,2,1,90,0,1
+58589,-100,4,2,1,90,0,1
+61175,-66.6666666666667,4,2,1,90,0,1
+61348,-100,4,2,1,90,0,1
+62382,-33.3333333333333,4,2,1,100,0,1
+62555,-66.6666666666667,4,2,1,100,0,1
+62770,-100,4,2,1,100,0,1
+64106,-40,4,2,1,100,0,1
+64796,-100,4,2,1,100,0,1
+66175,-100,4,2,1,80,0,0
+68417,-66.6666666666667,4,2,1,80,0,0
+68589,-100,4,2,1,80,0,0
+68934,-100,4,2,1,70,0,1
+69020,-100,4,2,1,10,0,0
+71003,-100,4,2,1,15,0,0
+71693,-100,4,2,1,20,0,0
+71865,-100,4,2,1,23,0,0
+72037,-100,4,2,1,26,0,0
+72210,-100,4,2,1,29,0,0
+72382,-100,4,2,1,32,0,0
+72555,-100,4,2,1,35,0,0
+72727,-100,4,2,1,38,0,0
+72900,-100,4,2,1,41,0,0
+73072,-100,4,2,1,44,0,0
+73244,-100,4,2,1,47,0,0
+73417,-100,4,2,1,50,0,0
+73589,-100,4,2,1,53,0,0
+73762,-100,4,2,1,56,0,0
+73934,-100,4,2,1,59,0,0
+74106,-100,4,2,1,62,0,0
+74279,-100,4,2,1,65,0,0
+74451,-100,4,2,1,40,0,0
+74624,-133.333333333333,4,2,1,40,0,0
+77210,-100,4,2,1,40,0,0
+77555,-133.333333333333,4,2,1,40,0,0
+79969,-100,4,2,1,40,0,0
+80313,-133.333333333333,4,2,1,40,0,0
+81348,-100,4,2,1,40,0,0
+81692,-133.333333333333,4,2,1,40,0,0
+82727,-86.9565217391304,4,2,1,40,0,0
+83072,-133.333333333333,4,2,1,40,0,0
+84106,-100,4,2,1,40,0,0
+84450,-133.333333333333,4,2,1,40,0,0
+85486,-100,4,2,2,50,0,0
+96175,-50,4,2,2,60,0,0
+96520,-50,4,2,1,55,0,0
+96822,-50,4,2,1,5,0,0
+96865,-66.6666666666667,4,2,1,50,0,0
+97210,-66.6666666666667,4,2,1,45,0,0
+97512,-66.6666666666667,4,2,1,5,0,0
+97555,-100,4,2,1,40,0,0
+97900,-100,4,2,1,35,0,0
+98244,-100,4,2,1,5,0,0
+99279,-100,4,2,1,75,0,0
+99624,-66.6666666666667,4,2,1,75,0,0
+99796,-66.6666666666667,4,2,1,75,0,0
+100313,-100,4,2,1,75,0,0
+100658,-83.3333333333333,4,2,1,90,0,1
+111578,-83.3333333333333,4,2,1,90,0,0
+111693,-83.3333333333333,4,2,1,90,0,1
+119279,-66.6666666666667,4,2,1,90,0,1
+119969,-83.3333333333333,4,2,1,90,0,1
+121003,-50,4,2,1,90,0,1
+121175,-83.3333333333333,4,2,1,90,0,1
+122727,-100,4,2,1,90,0,0
+123072,-100,4,2,1,50,0,0
+123417,-100,4,2,1,46,0,0
+123762,-100,4,2,1,42,0,0
+124106,-100,4,2,1,38,0,0
+124451,-100,4,2,1,35,0,0
+124796,-100,4,2,1,32,0,0
+125141,-100,4,2,1,29,0,0
+125486,-100,4,2,1,26,0,0
+125831,-100,4,2,1,24,0,0
+126175,-100,4,2,1,22,0,0
+126520,-100,4,2,1,20,0,0
+126865,-100,4,2,1,18,0,0
+127210,-100,4,2,1,16,0,0
+127555,-100,4,2,1,14,0,0
+127900,-100,4,2,1,12,0,0
+128244,-100,4,2,1,10,0,0
+128934,-100,4,2,1,9,0,0
+129624,-100,4,2,1,8,0,0
+130313,-100,4,2,1,7,0,0
+131003,-100,4,2,1,6,0,0
+131693,-100,4,2,1,5,0,0
+
+[HitObjects]
+256,192,313,12,2,1175,0:0:0:0:
+224,192,1348,5,6,3:2:0:0:
+177,157,1434,1,0,0:0:0:0:
+179,100,1520,1,2,0:2:0:0:
+227,68,1606,1,2,0:2:0:0:
+292,68,1693,2,0,L|296:12,1,45,2|0,0:0|0:0,0:0:0:0:
+116,192,1865,2,0,B|116:280|116:280|208:296,1,180,0|2,3:0|0:1,0:0:0:0:
+116,280,2296,1,0,0:0:0:0:
+26,264,2382,2,0,L|22:160,1,90,0|2,3:2|0:3,0:0:0:0:
+292,192,2727,6,0,L|384:192,1,90,2|2,3:2|0:3,0:0:0:0:
+328,192,2986,1,2,0:3:0:0:
+276,192,3072,1,2,0:0:0:0:
+448,192,3244,1,0,3:0:0:0:
+268,96,3417,2,0,B|176:96,1,90,0|2,0:0|0:3,0:0:0:0:
+244,96,3675,1,2,0:3:0:0:
+178,96,3762,2,0,L|82:96,1,90,0|2,3:0|0:3,0:0:0:0:
+444,304,4106,6,0,L|448:256,1,45,2|2,3:2|0:2,0:0:0:0:
+376,256,4279,2,0,L|372:208,1,45,2|2,0:2|0:2,0:0:0:0:
+300,192,4451,1,2,0:0:0:0:
+472,136,4624,2,0,L|476:84,1,45,0|0,3:0|0:0,0:0:0:0:
+296,28,4796,2,0,P|264:72|280:108,1,90,0|2,0:0|0:1,0:0:0:0:
+366,152,5055,1,0,0:0:0:0:
+456,211,5141,2,0,L|352:211,1,90,0|2,3:2|0:3,0:0:0:0:
+112,192,5486,6,0,L|208:192,1,90,2|2,3:2|0:3,0:0:0:0:
+268,192,5744,1,2,0:3:0:0:
+202,192,5831,1,2,0:0:0:0:
+360,192,6003,1,0,3:0:0:0:
+192,284,6175,2,0,L|100:284,1,90,0|2,0:0|0:3,0:0:0:0:
+172,284,6434,1,2,0:3:0:0:
+102,284,6520,2,0,L|10:284,1,90,0|2,3:0|0:3,0:0:0:0:
+288,284,6865,5,2,3:2:0:0:
+335,249,6951,1,2,0:2:0:0:
+333,192,7037,1,2,0:2:0:0:
+285,160,7124,1,2,0:2:0:0:
+220,160,7210,2,0,L|216:104,1,45,2|0,0:0|0:0,0:0:0:0:
+320,56,7382,1,0,3:0:0:0:
+204,56,7555,1,0,0:0:0:0:
+456,52,7727,1,2,0:1:0:0:
+460,104,7813,1,0,0:0:0:0:
+464,160,7900,2,0,L|372:160,1,90,0|2,3:2|0:3,0:0:0:0:
+120,160,8244,6,0,B|212:160,1,90,2|2,3:2|0:3,0:0:0:0:
+280,160,8503,1,2,0:3:0:0:
+348,160,8589,1,2,0:0:0:0:
+176,160,8762,1,0,3:0:0:0:
+354,160,8934,2,0,L|446:160,1,90,0|2,0:0|0:3,0:0:0:0:
+374,160,9193,1,2,0:3:0:0:
+306,160,9279,2,0,L|406:160,1,90,0|2,3:0|0:3,0:0:0:0:
+148,56,9624,6,0,L|100:44,1,45,2|2,3:2|0:2,0:0:0:0:
+176,120,9796,2,0,L|224:108,1,45,2|2,0:2|0:2,0:0:0:0:
+148,56,9969,1,2,0:0:0:0:
+308,56,10141,1,0,3:0:0:0:
+140,120,10313,1,0,0:0:0:0:
+396,192,10486,2,0,L|440:192,2,45,2|0|0,0:1|0:0|3:2,0:0:0:0:
+228,192,10831,1,2,0:3:0:0:
+460,312,11003,6,0,L|484:270,1,45,0|2,3:3|0:3,0:0:0:0:
+392,288,11175,2,0,L|416:246,1,45,2|2,0:3|0:3,0:0:0:0:
+324,264,11348,2,0,L|347:222,1,45,2|2,0:3|0:3,0:0:0:0:
+260,232,11520,2,0,L|284:190,1,45,2|2,0:3|0:3,0:0:0:0:
+384,192,11693,1,0,3:0:0:0:
+220,188,11865,2,0,L|156:188,1,45,8|0,0:2|3:0,0:0:0:0:
+400,192,12037,2,0,B|488:192|488:192|488:108,1,168.75,8|0,3:2|0:0,0:0:0:0:
+284,56,12382,6,0,L|192:56,1,90,6|2,3:2|0:2,0:0:0:0:
+264,56,12641,1,2,0:2:0:0:
+436,56,12727,1,10,3:2:0:0:
+328,56,12900,2,0,L|324:112,1,45,0|0,3:0|0:0,3:3:0:0:
+424,112,13072,2,0,L|428:216,1,90,0|2,0:0|0:1,0:0:0:0:
+360,200,13331,1,2,0:3:0:0:
+208,200,13417,2,0,L|116:200,1,90,8|2,3:2|0:3,0:0:0:0:
+292,200,13762,6,0,L|296:292,1,90,2|2,3:2|0:3,0:0:0:0:
+228,292,14020,1,2,0:3:0:0:
+408,288,14106,2,0,L|508:288,1,90,10|0,3:2|3:0,0:0:0:0:
+228,192,14451,2,0,L|324:192,1,90,8|2,3:2|3:3,0:0:0:0:
+48,192,14796,2,0,L|140:192,1,90,8|2,3:2|0:3,0:0:0:0:
+392,192,15141,6,0,L|396:132,1,45,2|2,3:2|0:2,0:0:0:0:
+320,120,15313,2,0,L|316:60,1,45,2|2,0:2|0:2,0:0:0:0:
+488,60,15486,1,10,3:2:0:0:
+388,60,15658,2,0,L|332:60,1,45,0|0,3:0|0:0,3:3:0:0:
+240,60,15831,2,0,L|236:152,1,90,0|2,0:0|0:1,0:0:0:0:
+304,152,16089,1,2,0:3:0:0:
+132,152,16175,2,0,L|36:152,1,90,8|2,3:2|0:3,0:0:0:0:
+312,256,16520,6,0,L|216:256,1,90,10|2,3:2|0:3,0:0:0:0:
+152,256,16779,1,2,0:3:0:0:
+328,328,16865,2,0,L|236:328,1,90,10|0,3:2|3:0,0:0:0:0:
+328,328,17210,1,0,0:0:0:0:
+164,328,17382,2,0,L|160:276,1,45,2|2,0:3|0:3,0:0:0:0:
+336,240,17555,2,0,L|440:240,1,90,8|2,3:2|0:3,0:0:0:0:
+152,56,17900,5,10,3:2:0:0:
+155,114,17986,1,2,0:2:0:0:
+192,160,18072,1,2,0:2:0:0:
+252,168,18158,1,2,0:2:0:0:
+404,168,18244,2,0,L|408:72,1,90,10|2,0:2|3:2,0:0:0:0:
+156,232,18589,2,0,L|64:232,1,90,8|2,0:0|0:3,0:0:0:0:
+136,232,18848,1,2,0:3:0:0:
+304,232,18934,2,0,L|396:232,1,90,8|0,3:2|0:3,0:0:0:0:
+120,76,19279,6,0,P|100:120|120:168,1,90,8|0,3:2|0:0,0:0:0:0:
+180,160,19537,1,0,0:0:0:0:
+360,160,19624,2,0,L|268:160,1,90,8|0,0:0|3:0,0:0:0:0:
+32,316,19969,2,0,L|132:316,1,90,8|2,3:2|0:3,0:0:0:0:
+188,316,20227,1,0,0:0:0:0:
+16,232,20313,2,0,L|116:232,1,90,8|2,3:2|0:3,0:0:0:0:
+368,232,20658,6,0,L|256:232,3,107.999996704102,10|10|10|8,3:2|0:2|3:2|3:2,0:0:0:0:
+496,232,21348,1,8,0:0:0:0:
+324,232,21520,1,8,3:2:0:0:
+496,232,21693,1,8,3:2:0:0:
+388,232,21865,2,0,L|332:232,1,45,8|8,3:2|3:2,0:0:0:0:
+144,232,22037,5,2,3:2:0:0:
+252,232,22210,2,0,L|232:192,1,45,2|0,3:0|0:0,0:0:0:0:
+312,164,22382,2,0,L|292:124,1,45,2|0,3:0|0:0,0:0:0:0:
+372,96,22555,2,0,L|352:56,1,45,2|0,3:0|0:0,0:0:0:0:
+180,56,22727,2,0,L|276:56,1,90,2|8,3:2|0:0,0:0:0:0:
+208,56,22986,1,0,3:0:0:0:
+436,56,23072,2,0,P|504:104|436:168,1,202.500007724762,8|0,3:2|0:0,0:0:0:0:
+208,192,23417,6,0,L|92:192,2,112.5,6|2|2,3:2|0:0|0:0,0:0:0:0:
+312,192,23934,1,2,0:0:0:0:
+220,192,24020,1,2,0:0:0:0:
+128,192,24106,2,0,L|220:192,1,90,2|2,0:0|0:1,0:0:0:0:
+392,192,24451,1,0,3:0:0:0:
+444,176,24537,1,2,0:0:0:0:
+444,120,24624,1,2,0:0:0:0:
+392,100,24710,1,2,0:0:0:0:
+212,276,24796,6,0,L|308:276,2,90,2|2|2,0:2|0:2|0:2,0:0:0:0:
+320,276,25313,1,2,0:2:0:0:
+384,276,25400,1,2,0:2:0:0:
+284,352,25486,2,0,L|192:352,1,90,2|2,0:2|0:0,0:0:0:0:
+448,276,25831,2,0,L|444:224,1,45,2|2,3:2|0:2,0:0:0:0:
+344,192,26003,2,0,L|300:192,1,45,2|2,0:2|0:2,0:0:0:0:
+128,192,26175,6,0,L|28:192,2,90,2|2|2,3:2|0:0|0:0,0:0:0:0:
+236,192,26693,1,2,0:0:0:0:
+299,192,26779,1,2,0:0:0:0:
+362,192,26865,1,2,0:0:0:0:
+196,192,27037,1,2,0:1:0:0:
+352,192,27210,1,2,3:2:0:0:
+352,128,27296,1,2,0:2:0:0:
+312,80,27382,1,2,0:2:0:0:
+248,80,27469,1,2,0:2:0:0:
+412,80,27555,6,0,L|320:80,2,90,2|2|2,0:2|0:0|0:0,0:0:0:0:
+304,80,28072,1,2,0:0:0:0:
+396,80,28158,1,2,0:0:0:0:
+488,80,28244,2,0,L|396:80,1,90,2|2,0:0|0:0,0:0:0:0:
+88,80,28589,1,8,3:2:0:0:
+340,80,28934,6,0,L|344:172,1,90,2|2,3:2|0:2,0:0:0:0:
+172,192,29279,2,0,L|168:292,1,90,2|2,3:2|0:2,0:0:0:0:
+268,284,29537,1,2,0:2:0:0:
+368,284,29624,2,0,L|268:284,1,90,2|2,3:2|0:1,0:0:0:0:
+452,284,29969,2,0,L|460:236,2,45,0|0|2,3:2|0:0|0:2,0:0:0:0:
+200,372,30313,6,0,L|196:280,1,90,2|2,3:2|0:2,0:0:0:0:
+368,160,30658,2,0,L|264:160,1,90,2|2,3:2|0:2,0:0:0:0:
+380,160,30917,1,2,0:2:0:0:
+480,160,31003,2,0,L|374:160,1,90,2|2,3:2|0:2,0:0:0:0:
+128,192,31348,2,0,L|124:140,1,45,2|2,3:2|0:2,0:0:0:0:
+228,104,31520,2,0,L|292:104,1,45,2|2,0:2|0:2,0:0:0:0:
+88,148,31693,6,0,L|84:252,1,90,2|2,3:2|0:2,0:0:0:0:
+256,236,32037,2,0,L|352:236,1,90,2|2,3:2|0:2,0:0:0:0:
+246,236,32296,1,2,0:2:0:0:
+148,236,32382,2,0,L|48:236,1,90,2|2,3:2|0:2,0:0:0:0:
+232,68,32727,1,0,3:2:0:0:
+180,68,32813,1,0,0:0:0:0:
+124,68,32900,1,2,0:2:0:0:
+376,68,33072,6,0,L|476:68,1,90,2|2,3:2|0:2,0:0:0:0:
+300,192,33417,2,0,L|396:192,1,90,2|2,3:2|0:2,0:0:0:0:
+220,192,33762,2,0,L|128:192,1,90,2|2,3:2|0:2,0:0:0:0:
+416,192,34106,2,0,L|448:192,7,22.5,0|0|0|0|0|0|0|0,3:0|3:0|3:0|3:0|3:0|3:0|3:0|0:0,0:0:0:0:
+265,192,34451,6,0,L|129:192,1,135.000005149842,10|2,3:2|0:2,0:0:0:0:
+300,192,34796,2,0,L|304:97,1,90,2|2,3:2|0:2,0:0:0:0:
+140,100,35141,1,10,3:2:0:0:
+376,100,35313,1,2,0:1:0:0:
+268,100,35486,2,0,L|264:196,1,90,0|2,3:2|0:2,0:0:0:0:
+496,192,35831,6,0,L|404:192,1,90,10|2,3:2|0:2,0:0:0:0:
+236,192,36175,2,0,L|140:192,1,90,2|2,3:2|0:2,0:0:0:0:
+400,256,36520,1,10,3:2:0:0:
+236,256,36693,1,2,0:2:0:0:
+476,256,36865,1,2,3:2:0:0:
+476,322,36951,1,0,0:0:0:0:
+434,372,37037,1,2,0:2:0:0:
+369,383,37124,1,0,0:0:0:0:
+196,384,37210,6,0,L|104:384,1,90,10|2,3:2|0:2,0:0:0:0:
+272,384,37555,2,0,L|368:384,1,90,2|2,3:2|0:2,0:0:0:0:
+196,384,37900,1,10,3:2:0:0:
+432,384,38072,1,2,0:1:0:0:
+324,384,38244,1,0,3:2:0:0:
+272,384,38331,1,0,0:0:0:0:
+224,384,38417,1,2,0:2:0:0:
+488,384,38589,6,0,L|490:281,1,90,10|2,3:2|0:2,0:0:0:0:
+324,296,38934,2,0,L|328:188,1,90,2|2,3:2|0:2,0:0:0:0:
+88,204,39279,1,10,3:2:0:0:
+256,204,39451,1,2,0:2:0:0:
+16,204,39624,1,10,3:2:0:0:
+428,208,39969,6,0,P|480:152|428:92,1,168.75,8|2,3:2|0:0,0:0:0:0:
+328,92,40313,2,0,P|256:120|240:204,1,168.75,10|0,3:2|0:0,0:0:0:0:
+412,208,40658,2,0,B|496:208|496:208|500:296,1,168.75,8|0,3:2|0:0,0:0:0:0:
+272,376,41003,2,0,B|272:292|272:292|360:288,1,168.75,8|0,3:2|0:0,0:0:0:0:
+116,296,41348,6,0,P|52:224|120:176,1,202.500007724762,8|0,3:2|0:0,0:0:0:0:
+340,176,41693,2,0,L|132:176,1,202.500007724762,8|0,3:2|0:0,0:0:0:0:
+312,96,42037,1,8,3:2:0:0:
+164,96,42210,1,8,3:2:0:0:
+324,96,42382,1,8,3:2:0:0:
+152,96,42555,1,8,3:2:0:0:
+404,96,42727,5,8,3:2:0:0:
+460,128,42813,1,8,3:2:0:0:
+460,192,42900,1,8,3:2:0:0:
+404,224,42986,1,8,3:2:0:0:
+208,192,43072,2,0,L|204:244,1,45,8|8,3:2|3:2,0:0:0:0:
+280,240,43244,2,0,L|284:292,1,45,8|8,3:2|3:2,0:0:0:0:
+104,328,43417,6,8,L|48:328,1,45,8|8,3:2|3:2,0:0:0:0:
+240,364,43589,2,8,L|300:364,1,45,8|8,3:2|3:2,0:0:0:0:
+80,192,43762,2,0,L|136:192,1,45,8|8,3:2|3:2,0:0:0:0:
+372,224,43934,2,0,L|316:224,1,45,8|8,3:2|3:2,0:0:0:0:
+124,44,44106,5,8,3:2:0:0:
+368,44,44279,1,2,0:0:0:0:
+116,44,44451,2,0,L|64:44,1,45,2|2,0:0|0:0,0:0:0:0:
+172,116,44624,2,0,L|112:116,1,45,2|2,0:0|0:0,0:0:0:0:
+300,116,44796,2,0,L|476:116,1,168.750006437302,2|2,0:0|0:0,0:0:0:0:
+260,192,45141,2,0,L|428:192,1,168.750006437302,2|2,0:0|0:0,0:0:0:0:
+176,328,45486,5,2,3:2:0:0:
+158,322,45507,1,0,0:0:0:0:
+143,313,45529,1,0,0:0:0:0:
+129,301,45550,1,0,0:0:0:0:
+119,287,45572,1,0,0:0:0:0:
+111,270,45594,1,0,0:0:0:0:
+108,253,45615,1,0,0:0:0:0:
+108,235,45637,1,0,0:0:0:0:
+112,217,45658,1,0,0:0:0:0:
+120,201,45680,1,0,0:0:0:0:
+131,187,45701,1,0,0:0:0:0:
+145,175,45723,1,0,0:0:0:0:
+161,167,45744,1,0,0:0:0:0:
+178,162,45766,1,0,0:0:0:0:
+196,161,45787,1,0,0:0:0:0:
+214,164,45809,1,0,0:0:0:0:
+240,168,45831,1,0,0:0:0:0:
+257,167,45852,1,0,0:0:0:0:
+275,162,45874,1,0,0:0:0:0:
+291,153,45895,1,0,0:0:0:0:
+304,142,45917,1,0,0:0:0:0:
+315,128,45938,1,0,0:0:0:0:
+323,111,45960,1,0,0:0:0:0:
+327,94,45981,1,0,0:0:0:0:
+327,76,46003,1,0,0:0:0:0:
+324,58,46025,1,0,0:0:0:0:
+317,42,46046,1,0,0:0:0:0:
+306,27,46068,1,0,0:0:0:0:
+293,16,46089,1,0,0:0:0:0:
+277,7,46111,1,0,0:0:0:0:
+260,1,46132,1,0,0:0:0:0:
+76,52,46175,6,0,B|8:52|8:52|80:52,1,135.000005149842,4|2,3:2|0:0,0:0:0:0:
+120,52,46434,1,2,0:0:0:0:
+280,52,46520,2,0,L|376:52,1,90,8|2,3:2|0:0,0:0:0:0:
+324,52,46779,1,2,0:0:0:0:
+152,136,46865,2,0,L|96:136,1,45,2|2,3:2|0:0,0:0:0:0:
+172,208,47037,2,0,L|112:208,1,45,2|2,0:0|0:0,0:0:0:0:
+336,192,47210,1,8,3:2:0:0:
+363,202,47253,1,0,0:0:0:0:
+384,224,47296,1,0,0:0:0:0:
+393,252,47339,1,0,0:0:0:0:
+389,282,47382,1,0,0:0:0:0:
+372,306,47425,1,0,0:0:0:0:
+347,322,47469,1,0,0:0:0:0:
+168,324,47555,6,0,L|76:324,1,90,2|0,3:2|0:0,0:0:0:0:
+244,208,47900,2,0,L|152:208,1,90,10|2,3:2|0:3,0:0:0:0:
+400,208,48244,2,0,L|404:156,1,45,2|2,3:2|0:2,0:0:0:0:
+312,76,48503,1,2,0:2:0:0:
+140,76,48589,1,10,0:2:0:0:
+248,76,48762,1,2,0:2:0:0:
+16,76,48934,6,0,L|60:76,1,45,2|2,3:2|0:0,0:0:0:0:
+160,76,49193,1,2,3:2:0:0:
+16,76,49279,2,0,L|20:120,1,45,10|2,3:2|0:2,0:0:0:0:
+76,164,49451,2,0,L|140:164,1,45,2|2,0:2|0:2,0:0:0:0:
+304,192,49624,5,0,3:0:0:0:
+317,209,49667,1,0,0:0:0:0:
+326,230,49710,1,0,0:0:0:0:
+328,252,49753,1,0,0:0:0:0:
+325,274,49796,1,2,0:0:0:0:
+316,295,49839,1,0,0:0:0:0:
+301,312,49882,1,0,0:0:0:0:
+120,312,49969,1,8,3:2:0:0:
+52,312,50055,1,2,0:0:0:0:
+120,312,50141,1,2,0:0:0:0:
+288,312,50313,5,2,3:2:0:0:
+332,273,50400,1,2,3:2:0:0:
+328,215,50486,1,2,3:2:0:0:
+280,184,50572,1,2,3:2:0:0:
+104,92,50658,2,0,L|60:92,1,45,10|2,3:2|0:3,0:0:0:0:
+104,184,50831,2,0,L|148:184,1,45,2|0,0:3|0:0,0:0:0:0:
+328,215,51003,6,0,B|376:215|376:215|324:215,1,90,4|2,3:2|0:0,0:0:0:0:
+280,215,51262,1,2,0:0:0:0:
+128,296,51348,2,0,L|364:296,1,236.250009012223,8|0,3:2|0:0,0:0:0:0:
+364,296,51520,2,0,L|224:296,1,135.000005149842,2|2,0:0|0:0,0:0:0:0:
+368,144,51736,2,0,L|440:144,1,67.5,2|2,0:0|3:2,0:0:0:0:
+380,144,51951,1,2,0:0:0:0:
+204,64,52037,2,0,L|128:64,1,67.5000025749208,10|0,0:0|0:0,0:0:0:0:
+223,64,52210,2,0,L|148:64,1,67.5000025749208,2|2,0:2|0:2,0:0:0:0:
+388,240,52382,6,0,L|464:240,1,67.5000025749208,2|2,3:2|0:2,0:0:0:0:
+368,144,52555,2,0,L|436:144,1,67.5000025749208,2|2,0:2|0:2,0:0:0:0:
+224,144,52727,1,10,3:2:0:0:
+194,150,52770,1,0,0:0:0:0:
+169,165,52813,1,0,0:0:0:0:
+149,188,52856,1,0,0:0:0:0:
+137,215,52900,1,2,0:3:0:0:
+134,245,52943,1,0,0:0:0:0:
+141,274,52986,1,0,0:0:0:0:
+368,348,53072,2,0,B|144:348,1,225,10|0,3:2|0:0,0:0:0:0:
+444,272,53417,2,0,B|220:272,1,225,10|2,3:2|0:3,0:0:0:0:
+488,184,53762,6,0,L|492:276,1,90,2|2,3:2|0:3,0:0:0:0:
+336,184,54106,1,8,3:2:0:0:
+280,184,54193,1,2,0:3:0:0:
+228,184,54279,1,2,0:3:0:0:
+392,276,54451,2,0,L|396:312,1,22.5,2|0,3:2|0:0,0:0:0:0:
+188,328,54624,2,0,L|185:305,1,22.5,2|0,0:3|0:0,0:0:0:0:
+408,108,54796,2,0,L|356:108,1,45,10|2,3:2|0:3,0:0:0:0:
+136,176,54969,2,0,L|188:176,1,45,2|0,0:0|0:0,0:0:0:0:
+384,192,55141,6,0,L|292:192,2,90.0000034332277,2|2|2,3:2|0:2|0:2,0:0:0:0:
+172,272,55486,1,2,3:2:0:0:
+280,272,55601,1,2,0:2:0:0:
+388,272,55716,1,2,0:2:0:0:
+164,192,55831,2,0,L|96:192,2,60,2|2|2,3:2|0:2|0:2,0:0:0:0:
+340,192,56175,1,2,3:2:0:0:
+412,192,56290,1,2,0:2:0:0:
+412,120,56405,1,2,0:2:0:0:
+212,120,56520,6,0,P|160:260|288:136,1,472.500018024445,0|0,3:2|0:0,0:0:0:0:
+128,40,57210,5,2,3:2:0:0:
+112,44,57231,1,0,0:0:0:0:
+97,50,57253,1,0,0:0:0:0:
+83,58,57275,1,0,0:0:0:0:
+70,67,57296,1,0,0:0:0:0:
+57,77,57318,1,0,0:0:0:0:
+46,89,57339,1,0,0:0:0:0:
+35,101,57361,1,0,0:0:0:0:
+26,114,57382,1,0,0:0:0:0:
+19,129,57404,1,0,0:0:0:0:
+13,143,57425,1,0,0:0:0:0:
+8,159,57447,1,0,0:0:0:0:
+5,175,57469,1,0,0:0:0:0:
+3,191,57490,1,0,0:0:0:0:
+3,207,57512,1,0,0:0:0:0:
+5,223,57533,1,0,0:0:0:0:
+8,239,57555,1,0,0:0:0:0:
+12,254,57576,1,0,0:0:0:0:
+18,269,57598,1,0,0:0:0:0:
+26,283,57619,1,0,0:0:0:0:
+35,297,57641,1,0,0:0:0:0:
+45,309,57662,1,0,0:0:0:0:
+56,321,57684,1,0,0:0:0:0:
+69,331,57706,1,0,0:0:0:0:
+82,340,57727,1,0,0:0:0:0:
+96,348,57749,1,0,0:0:0:0:
+111,354,57770,1,0,0:0:0:0:
+126,359,57792,1,0,0:0:0:0:
+142,362,57813,1,0,0:0:0:0:
+158,364,57835,1,0,0:0:0:0:
+174,364,57856,1,0,0:0:0:0:
+312,364,57900,6,0,L|448:364,1,135.000005149842,12|2,3:2|0:0,0:0:0:0:
+392,364,58158,1,2,0:0:0:0:
+216,192,58244,2,0,L|160:192,1,56.25,10|0,3:2|0:0,0:0:0:0:
+232,124,58417,2,0,L|176:124,1,56.25,2|2,0:0|0:0,0:0:0:0:
+20,192,58589,2,0,L|112:192,1,90,2|2,3:2|0:0,0:0:0:0:
+276,264,58934,2,0,L|180:264,1,90,8|2,3:2|0:3,0:0:0:0:
+440,264,59279,5,0,3:0:0:0:
+466,250,59322,1,0,0:0:0:0:
+484,226,59365,1,0,0:0:0:0:
+491,198,59408,1,0,0:0:0:0:
+484,168,59451,1,2,0:3:0:0:
+428,128,59537,1,0,0:0:0:0:
+260,128,59624,2,0,L|216:128,2,45,8|2|2,3:2|0:0|0:0,0:0:0:0:
+494,129,59969,2,0,L|498:181,1,45,2|2,3:2|0:2,0:0:0:0:
+392,260,60227,1,2,0:2:0:0:
+212,260,60313,1,10,3:2:0:0:
+356,260,60486,1,2,0:2:0:0:
+104,64,60658,6,0,L|100:112,1,45,2|2,3:2|0:2,0:0:0:0:
+204,192,60917,1,2,0:2:0:0:
+384,128,61003,2,0,L|340:128,1,45,10|2,3:2|0:2,0:0:0:0:
+159,192,61175,2,0,L|240:192,1,67.5000025749208,2|2,0:2|0:2,0:0:0:0:
+72,192,61348,5,2,3:2:0:0:
+9,228,61434,1,2,3:2:0:0:
+9,300,61520,1,2,3:2:0:0:
+70,336,61606,1,2,3:2:0:0:
+250,272,61693,2,0,L|350:272,1,90,10|0,3:2|0:0,0:0:0:0:
+184,215,62037,6,0,B|136:215|136:215|188:215,1,90,6|2,3:2|0:3,0:0:0:0:
+232,215,62296,1,2,0:3:0:0:
+384,296,62382,2,0,L|148:296,1,236.250009012223,8|0,0:0|0:0,0:0:0:0:
+148,296,62555,2,0,L|288:296,1,135.000005149842,2|2,0:0|3:2,0:0:0:0:
+144,144,62770,2,0,L|72:144,1,67.5,2|2,0:0|0:0,0:0:0:0:
+132,144,62986,1,2,0:0:0:0:
+300,64,63072,2,0,L|344:64,1,45,8|0,3:2|0:0,0:0:0:0:
+184,192,63244,2,0,L|232:192,1,45,2|2,0:0|0:0,0:0:0:0:
+64,64,63417,6,0,L|20:64,1,45,2|2,3:2|0:0,0:0:0:0:
+184,192,63589,2,0,L|140:192,1,45,2|2,0:0|0:0,0:0:0:0:
+345,64,63762,1,10,0:0:0:0:
+375,70,63805,1,0,0:0:0:0:
+400,85,63848,1,0,0:0:0:0:
+420,108,63891,1,0,0:0:0:0:
+432,135,63934,1,0,0:0:0:0:
+435,165,63977,1,0,0:0:0:0:
+428,194,64020,1,0,0:0:0:0:
+224,344,64106,2,0,B|448:344,1,225,8|2,3:2|3:2,0:0:0:0:
+148,268,64451,2,0,B|372:268,1,225,8|0,3:2|0:0,0:0:0:0:
+120,344,64796,5,6,3:2:0:0:
+324,344,64911,1,2,0:0:0:0:
+120,344,65026,1,2,0:0:0:0:
+336,168,65141,1,10,3:2:0:0:
+222,168,65256,1,2,0:0:0:0:
+108,168,65371,1,2,0:0:0:0:
+336,92,65486,1,2,3:2:0:0:
+444,92,65601,1,2,0:0:0:0:
+336,92,65716,1,2,0:0:0:0:
+144,92,65831,1,10,3:2:0:0:
+252,92,65946,1,2,0:0:0:0:
+144,92,66060,1,2,0:0:0:0:
+360,288,66175,6,0,L|468:288,1,90,2|2,0:0|0:0,0:0:0:0:
+396,288,66434,1,2,0:0:0:0:
+224,192,66520,1,2,0:0:0:0:
+388,192,66693,1,2,0:0:0:0:
+124,316,66865,2,0,L|120:264,1,45,2|2,0:0|0:0,0:0:0:0:
+204,352,67037,2,0,L|200:300,1,45,2|2,0:0|0:0,0:0:0:0:
+368,192,67210,1,2,0:0:0:0:
+204,192,67382,1,2,0:0:0:0:
+476,192,67555,5,6,3:2:0:0:
+188,192,67900,1,6,3:2:0:0:
+488,192,68244,1,0,3:0:0:0:
+356,192,68417,2,0,L|424:192,1,67.5000025749208,0|0,3:0|3:0,0:0:0:0:
+172,192,68589,2,0,L|168:100,1,90,8|2,0:0|0:0,0:0:0:0:
+484,60,68934,5,4,3:2:0:0:
+256,192,69279,12,0,71348,0:0:0:0:
+232,196,71693,6,0,L|228:176,14,11.25,2|0|0|0|0|0|0|0|0|0|0|0|0|0|0,0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0,0:0:0:0:
+272,164,72037,2,0,L|282:146,14,11.25,2|0|0|0|0|0|0|0|0|0|0|0|0|0|0,0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0,0:0:0:0:
+316,216,72382,6,0,L|331:203,14,11.25,2|0|0|0|0|0|0|0|0|0|0|0|0|0|0,0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0,0:0:0:0:
+360,140,72727,2,0,L|375:127,14,11.25,2|0|0|0|0|0|0|0|0|0|0|0|0|0|0,0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0,0:0:0:0:
+256,76,73072,5,2,0:0:0:0:
+244,78,73094,1,0,0:0:0:0:
+233,82,73115,1,0,0:0:0:0:
+224,88,73137,1,0,0:0:0:0:
+215,96,73158,1,0,0:0:0:0:
+209,106,73180,1,0,0:0:0:0:
+205,117,73201,1,0,0:0:0:0:
+202,128,73223,1,0,0:0:0:0:
+203,140,73244,1,0,0:0:0:0:
+205,151,73266,1,0,0:0:0:0:
+210,162,73287,1,0,0:0:0:0:
+217,171,73309,1,0,0:0:0:0:
+226,179,73331,1,0,0:0:0:0:
+236,184,73352,1,0,0:0:0:0:
+247,188,73374,1,0,0:0:0:0:
+258,190,73395,1,0,0:0:0:0:
+270,189,73417,1,0,0:0:0:0:
+281,185,73438,1,0,0:0:0:0:
+291,180,73460,1,0,0:0:0:0:
+300,173,73481,1,0,0:0:0:0:
+307,164,73503,1,0,0:0:0:0:
+313,153,73525,1,0,0:0:0:0:
+316,142,73546,1,0,0:0:0:0:
+317,131,73568,1,0,0:0:0:0:
+315,119,73589,1,0,0:0:0:0:
+311,108,73611,1,0,0:0:0:0:
+305,98,73632,1,0,0:0:0:0:
+297,90,73654,1,0,0:0:0:0:
+288,83,73675,1,0,0:0:0:0:
+277,78,73697,1,0,0:0:0:0:
+266,76,73719,1,0,0:0:0:0:
+164,20,73762,5,2,0:0:0:0:
+153,23,73783,1,0,0:0:0:0:
+143,28,73805,1,0,0:0:0:0:
+133,34,73826,1,0,0:0:0:0:
+124,40,73848,1,0,0:0:0:0:
+115,48,73869,1,0,0:0:0:0:
+108,56,73891,1,0,0:0:0:0:
+101,65,73912,1,0,0:0:0:0:
+95,74,73934,1,0,0:0:0:0:
+90,84,73956,1,0,0:0:0:0:
+85,95,73977,1,0,0:0:0:0:
+82,105,73999,1,0,0:0:0:0:
+80,116,74020,1,0,0:0:0:0:
+79,128,74042,1,0,0:0:0:0:
+79,139,74063,1,0,0:0:0:0:
+180,148,74106,1,2,0:0:0:0:
+190,151,74128,1,0,0:0:0:0:
+200,156,74150,1,0,0:0:0:0:
+210,162,74171,1,0,0:0:0:0:
+219,168,74193,1,0,0:0:0:0:
+228,176,74214,1,0,0:0:0:0:
+235,184,74236,1,0,0:0:0:0:
+242,193,74257,1,0,0:0:0:0:
+248,202,74279,1,0,0:0:0:0:
+253,212,74300,1,0,0:0:0:0:
+258,223,74322,1,0,0:0:0:0:
+261,233,74344,1,0,0:0:0:0:
+263,244,74365,1,0,0:0:0:0:
+264,256,74387,1,0,0:0:0:0:
+264,267,74408,1,0,0:0:0:0:
+148,236,74451,6,0,L|52:236,1,90,6|0,0:1|0:0,0:0:0:0:
+196,124,74796,2,0,L|192:32,1,67.5000025749208
+328,208,75141,2,0,L|324:116,1,67.5000025749208,0|0,0:0|0:0,0:0:0:0:
+228,168,75486,1,2,0:0:0:0:
+396,208,75658,1,2,0:0:0:0:
+124,168,75831,5,2,0:0:0:0:
+36,168,76003,1,0,0:0:0:0:
+36,80,76175,1,0,0:0:0:0:
+124,80,76348,1,0,0:0:0:0:
+292,80,76520,2,0,L|296:172,1,67.5000025749208,2|0,0:0|0:0,0:0:0:0:
+192,224,76865,2,0,L|196:152,1,67.5000025749208,0|0,0:0|0:0,0:0:0:0:
+368,148,77210,6,0,P|424:204|368:268,1,180,2|0,0:0|0:0,0:0:0:0:
+272,268,77727,1,0,0:0:0:0:
+176,268,77900,2,0,L|172:360,1,67.5000025749208,0|0,0:0|0:0,0:0:0:0:
+272,268,78244,1,2,0:0:0:0:
+104,336,78417,1,2,0:0:0:0:
+380,268,78589,6,0,L|456:268,2,67.5000025749208,2|0|0,0:0|0:0|0:0,0:0:0:0:
+284,268,79106,1,0,0:0:0:0:
+116,268,79279,2,0,L|112:176,1,67.5000025749208,2|0,0:0|0:0,0:0:0:0:
+216,192,79624,2,0,L|312:192,1,67.5000025749208,0|0,0:0|0:0,0:0:0:0:
+324,192,79882,1,0,0:0:0:0:
+152,96,79969,6,0,B|56:96,2,90,2|0|0,0:0|0:0|0:0,0:0:0:0:
+248,96,80486,1,0,0:0:0:0:
+416,96,80658,2,0,L|420:168,1,67.5000025749208,2|0,0:0|0:0,0:0:0:0:
+324,192,81003,2,0,L|252:192,1,67.5000025749208,0|0,0:0|0:0,0:0:0:0:
+208,192,81262,1,0,0:0:0:0:
+384,256,81348,6,0,B|480:256,2,90,2|0|0,0:0|0:0|0:0,0:0:0:0:
+212,296,81865,1,2,0:0:0:0:
+444,360,82037,2,0,L|448:284,1,67.5000025749208,2|0,0:0|0:0,0:0:0:0:
+212,296,82382,1,2,0:0:0:0:
+172,296,82469,1,0,0:0:0:0:
+132,296,82555,1,0,0:0:0:0:
+432,24,82727,6,0,P|500:80|432:148,1,207.000003948212,2|0,0:0|0:0,0:0:0:0:
+272,148,83244,1,0,0:0:0:0:
+440,148,83417,2,0,L|444:220,1,67.5000025749208,0|0,0:0|0:0,0:0:0:0:
+200,148,83762,1,2,0:0:0:0:
+352,148,83934,1,2,0:0:0:0:
+104,148,84106,6,0,B|8:148,2,90,2|0|0,0:0|0:0|0:0,0:0:0:0:
+272,196,84624,1,0,0:0:0:0:
+112,148,84796,2,0,L|108:228,1,67.5000025749208,2|2,0:0|0:0,0:0:0:0:
+164,216,85055,1,2,0:0:0:0:
+216,216,85141,2,0,L|292:216,1,67.5000025749208,2|2,0:0|0:0,0:0:0:0:
+32,216,85486,6,0,P|0:264|36:324,1,135,6|0,3:1|0:0,0:0:0:0:
+108,324,85831,2,0,L|216:324,1,90,0|2,3:2|0:2,0:0:0:0:
+20,324,86175,1,2,3:2:0:0:
+128,324,86348,2,0,L|180:324,1,45,0|0,0:2|0:0,0:0:0:0:
+344,192,86520,2,0,L|248:192,1,90,2|2,3:2|0:2,0:0:0:0:
+436,312,86865,6,0,L|440:208,1,90,2|2,3:2|0:2,0:0:0:0:
+375,208,87124,1,2,0:2:0:0:
+312,192,87210,1,2,3:2:0:0:
+472,192,87382,1,2,0:2:0:0:
+300,192,87555,2,0,L|296:96,1,90,2|2,3:2|0:2,0:0:0:0:
+360,100,87813,1,2,0:2:0:0:
+196,100,87900,2,0,L|104:100,1,90,2|2,3:2|0:2,0:0:0:0:
+276,16,88244,6,0,L|368:16,1,90,2|0,3:2|0:0,0:0:0:0:
+312,16,88503,1,0,0:0:0:0:
+260,16,88589,1,0,3:2:0:0:
+440,16,88762,1,2,0:2:0:0:
+192,16,88934,2,0,L|100:16,1,90,2|0,3:2|0:2,0:0:0:0:
+164,16,89193,1,0,0:0:0:0:
+228,16,89279,2,0,L|136:16,1,90,2|2,3:2|0:2,0:0:0:0:
+306,112,89624,6,0,L|414:112,1,90,2|2,3:2|0:2,0:0:0:0:
+450,112,89882,1,2,0:2:0:0:
+396,112,89969,1,2,3:2:0:0:
+228,112,90141,1,2,0:2:0:0:
+396,112,90313,2,0,L|400:208,1,90,2|0,3:2|0:2,0:0:0:0:
+332,204,90572,1,0,0:0:0:0:
+264,204,90658,2,0,L|360:204,1,90,2|0,3:2|0:2,0:0:0:0:
+184,204,91003,6,0,L|80:204,1,90,2|2,3:2|0:2,0:0:0:0:
+148,204,91262,1,0,0:0:0:0:
+200,204,91348,1,2,3:2:0:0:
+32,204,91520,1,2,0:2:0:0:
+296,204,91693,2,0,B|344:204|344:204|296:204,1,90,2|2,3:2|0:2,0:0:0:0:
+240,204,91951,1,0,0:0:0:0:
+136,204,92037,2,0,L|132:132,1,45,0|0,3:2|0:0,0:0:0:0:
+196,112,92210,2,0,L|200:168,1,45,0|0,0:2|0:0,0:0:0:0:
+48,204,92382,6,0,B|4:204|4:204|52:204,1,90,2|2,3:2|0:2,0:0:0:0:
+120,204,92641,1,0,0:0:0:0:
+188,204,92727,1,0,3:2:0:0:
+360,204,92900,1,2,0:2:0:0:
+123,293,93072,2,0,L|119:197,1,90,2|2,3:2|0:2,0:0:0:0:
+188,204,93331,1,2,0:2:0:0:
+368,204,93417,2,0,L|424:204,2,45,2|2|2,3:2|0:2|0:2,0:0:0:0:
+96,204,93762,5,2,3:2:0:0:
+53,169,93848,1,0,0:0:0:0:
+45,114,93934,1,2,0:2:0:0:
+75,69,94020,1,0,0:0:0:0:
+128,55,94106,1,2,3:2:0:0:
+316,56,94279,1,2,0:2:0:0:
+48,52,94451,2,0,L|44:152,1,90,2|0,3:2|0:2,0:0:0:0:
+112,160,94710,1,0,0:0:0:0:
+300,160,94796,1,2,3:2:0:0:
+416,160,94969,2,0,L|352:160,1,45,2|0,0:2|0:0,0:0:0:0:
+180,232,95141,5,2,3:2:0:0:
+128,232,95227,1,0,0:0:0:0:
+76,232,95313,1,2,0:2:0:0:
+248,232,95486,1,2,3:2:0:0:
+68,232,95658,1,2,0:2:0:0:
+348,232,95831,2,0,L|440:232,1,90,2|2,3:2|0:2,0:0:0:0:
+176,232,96175,6,0,P|176:16|180:232,1,675,2|0,3:2|0:0,0:0:0:0:
+156,232,96865,2,0,P|160:64|168:232,1,506.250019311906,0|0,0:0|0:0,0:0:0:0:
+144,232,97555,2,0,P|148:112|152:232,1,360,0|0,0:0|0:0,0:0:0:0:
+164,320,99279,5,0,3:0:0:0:
+324,320,99451,2,0,L|340:284,3,22.5,8|8|8|8,0:2|0:2|0:2|0:2,0:0:0:0:
+204,320,99624,2,0,L|64:320,1,135.000005149842,8|0,3:2|3:0,0:0:0:0:
+340,228,99969,2,0,L|200:228,1,135.000005149842,8|0,3:2|3:0,0:0:0:0:
+472,228,100313,1,8,3:2:0:0:
+64,172,100658,6,0,L|8:172,2,53.9999983520508,4|2|2,3:2|0:0|0:0,0:0:0:0:
+336,228,101003,1,10,3:2:0:0:
+176,228,101175,1,2,0:0:0:0:
+448,228,101348,2,0,B|500:228|500:228|444:228,1,107.999996704102,2|2,3:2|3:2,0:0:0:0:
+384,228,101606,1,2,0:0:0:0:
+220,128,101693,2,0,L|328:128,1,107.999996704102,8|2,3:2|0:0,0:0:0:0:
+264,128,101951,1,2,0:0:0:0:
+112,128,102037,5,2,3:2:0:0:
+56,128,102124,1,2,0:0:0:0:
+56,180,102210,1,2,0:0:0:0:
+344,252,102382,1,8,3:2:0:0:
+56,180,102555,1,2,0:0:0:0:
+368,252,102727,2,0,P|400:304|388:352,1,107.999996704102,0|2,3:0|3:2,0:0:0:0:
+332,348,102986,1,2,0:2:0:0:
+168,348,103072,2,0,L|56:348,1,107.999996704102,10|2,3:2|0:0,0:0:0:0:
+120,348,103331,1,0,0:0:0:0:
+304,192,103417,5,0,3:2:0:0:
+364,192,103503,1,2,0:0:0:0:
+424,192,103589,1,2,0:0:0:0:
+152,192,103762,1,10,3:2:0:0:
+316,192,103934,1,2,0:0:0:0:
+56,192,104106,2,0,B|4:192|4:192|60:192,1,107.999996704102,2|2,3:2|3:2,0:0:0:0:
+116,192,104365,1,2,0:0:0:0:
+304,192,104451,2,0,L|416:192,1,107.999996704102,8|2,3:2|0:0,0:0:0:0:
+356,192,104710,1,2,0:0:0:0:
+168,112,104796,6,0,L|112:112,2,53.9999983520508,2|2|2,3:2|0:0|0:0,0:0:0:0:
+440,112,105141,1,8,3:2:0:0:
+144,112,105313,1,2,0:0:0:0:
+468,112,105486,2,0,B|468:60|468:60|412:60,1,107.999996704102,0|2,3:0|3:2,0:0:0:0:
+360,60,105744,1,2,0:2:0:0:
+164,192,105831,2,0,L|276:192,1,107.999996704102,10|2,3:2|0:0,0:0:0:0:
+212,192,106089,1,2,0:0:0:0:
+24,192,106175,5,2,3:2:0:0:
+20,132,106262,1,2,0:0:0:0:
+16,72,106348,1,2,0:0:0:0:
+296,72,106520,1,8,3:2:0:0:
+132,72,106693,1,2,0:0:0:0:
+400,72,106865,2,0,P|448:108|440:164,1,107.999996704102,0|2,3:0|3:2,0:0:0:0:
+388,192,107124,1,2,0:2:0:0:
+196,192,107210,2,0,L|88:192,1,107.999996704102,10|2,3:2|0:0,0:0:0:0:
+148,192,107469,1,2,0:0:0:0:
+304,12,107555,5,2,3:2:0:0:
+358,12,107641,1,2,0:0:0:0:
+412,12,107727,1,2,0:0:0:0:
+136,12,107900,1,8,3:2:0:0:
+432,12,108072,1,2,0:0:0:0:
+160,116,108244,2,0,L|52:116,1,107.999996704102,0|2,3:0|3:2,0:0:0:0:
+112,116,108503,1,2,0:2:0:0:
+300,192,108589,2,0,L|188:192,1,107.999996704102,10|2,3:2|0:0,0:0:0:0:
+248,192,108848,1,2,0:0:0:0:
+436,192,108934,6,0,L|496:192,2,53.9999983520508,2|2|2,3:2|0:0|0:0,0:0:0:0:
+164,192,109279,1,8,3:2:0:0:
+324,192,109451,1,2,0:0:0:0:
+52,192,109624,2,0,P|24:235|60:280,1,107.999996704102,0|2,3:0|3:2,0:0:0:0:
+112,276,109882,1,2,0:2:0:0:
+316,276,109969,2,0,L|204:276,1,107.999996704102,10|2,3:2|0:0,0:0:0:0:
+268,276,110227,1,2,0:0:0:0:
+456,272,110313,6,0,L|460:152,1,107.999996704102,2|2,3:2|0:0,0:0:0:0:
+292,276,110658,2,0,L|296:156,1,107.999996704102,8|2,3:2|0:0,0:0:0:0:
+32,168,111003,1,8,3:2:0:0:
+140,168,111118,1,2,0:0:0:0:
+248,168,111233,1,2,0:0:0:0:
+44,168,111348,2,0,L|124:168,2,71.9999978027344,10|2|2,3:2|0:2|0:2,0:0:0:0:
+320,168,111693,5,4,3:2:0:0:
+392,168,111779,1,2,0:0:0:0:
+464,168,111865,1,2,0:0:0:0:
+196,168,112037,1,10,3:2:0:0:
+364,168,112210,1,2,0:0:0:0:
+92,80,112382,2,0,L|204:80,1,107.999996704102,2|2,3:2|3:2,0:0:0:0:
+140,80,112641,1,2,0:0:0:0:
+356,80,112727,2,0,B|408:80|408:80|352:80,1,107.999996704102,8|2,3:2|0:0,0:0:0:0:
+292,80,112986,1,2,0:0:0:0:
+96,168,113072,5,2,3:2:0:0:
+36,168,113158,1,2,0:0:0:0:
+96,168,113244,1,2,0:0:0:0:
+368,168,113417,1,8,3:2:0:0:
+72,168,113589,1,2,0:0:0:0:
+364,264,113762,2,0,L|252:264,1,107.999996704102,0|2,3:0|3:2,0:0:0:0:
+316,264,114020,1,2,0:2:0:0:
+120,344,114106,2,0,L|228:344,1,107.999996704102,10|2,3:2|0:0,0:0:0:0:
+168,344,114365,1,2,0:0:0:0:
+384,264,114451,5,2,3:2:0:0:
+444,264,114537,1,2,0:0:0:0:
+444,324,114624,1,2,0:0:0:0:
+176,344,114796,1,8,3:2:0:0:
+344,344,114969,1,2,0:0:0:0:
+76,292,115141,2,0,B|20:292|20:292|20:344,1,107.999996704102,0|2,3:0|3:2,0:0:0:0:
+80,344,115400,1,2,0:2:0:0:
+284,192,115486,2,0,L|176:192,1,107.999996704102,10|2,3:2|0:0,0:0:0:0:
+236,192,115744,1,2,0:0:0:0:
+28,192,115831,6,0,L|84:192,2,53.9999983520508,2|2|2,3:2|0:0|0:0,0:0:0:0:
+300,192,116175,1,8,3:2:0:0:
+132,192,116348,1,2,0:0:0:0:
+408,192,116520,2,0,L|300:192,1,107.999996704102,0|2,3:0|3:2,0:0:0:0:
+360,192,116779,1,2,0:2:0:0:
+156,84,116865,2,0,L|268:84,1,107.999996704102,10|2,3:2|0:0,0:0:0:0:
+204,84,117124,1,2,0:0:0:0:
+384,84,117210,5,10,3:2:0:0:
+444,84,117296,1,2,0:0:0:0:
+504,84,117382,1,2,0:0:0:0:
+228,284,117555,2,0,L|344:284,1,107.999996704102,8|2,3:2|0:0,0:0:0:0:
+60,192,117900,2,0,L|169:192,1,107.999996704102,8|2,3:2|3:2,0:0:0:0:
+108,192,118158,1,2,0:2:0:0:
+324,192,118244,2,0,B|380:192|380:192|380:140,1,107.999996704102,10|2,3:2|0:0,0:0:0:0:
+320,112,118503,1,2,0:0:0:0:
+132,112,118589,5,10,3:2:0:0:
+72,112,118675,1,2,0:0:0:0:
+132,112,118762,1,2,0:0:0:0:
+428,140,118934,1,8,3:2:0:0:
+80,112,119106,1,2,0:0:0:0:
+352,192,119279,2,0,L|216:192,1,135.000005149842,8|2,3:2|3:2,0:0:0:0:
+148,192,119537,1,2,0:2:0:0:
+388,264,119624,2,0,L|252:264,1,135.000005149842,10|2,3:2|0:0,0:0:0:0:
+320,264,119882,1,2,0:0:0:0:
+100,264,119969,6,0,L|40:264,2,53.9999983520508,10|2|10,3:2|0:0|0:2,0:0:0:0:
+384,192,120313,1,8,3:2:0:0:
+112,192,120486,1,10,0:2:0:0:
+408,192,120658,2,0,B|464:192|464:192|404:192,1,107.999996704102,8|10,3:2|3:2,0:0:0:0:
+348,192,120917,1,2,0:2:0:0:
+132,96,121003,2,0,B|40:96|40:96|134:96,1,180,10|10,3:2|0:2,0:0:0:0:
+196,96,121262,1,2,0:0:0:0:
+384,96,121348,6,0,L|388:160,1,53.9999983520508,10|0,3:2|0:0,0:0:0:0:
+188,192,121520,2,0,L|184:256,1,53.9999983520508,10|0,0:2|0:0,0:0:0:0:
+400,248,121693,2,0,L|336:248,1,53.9999983520508,8|0,3:2|0:0,0:0:0:0:
+128,192,121865,2,0,L|124:252,1,53.9999983520508,10|0,0:2|0:0,0:0:0:0:
+336,96,122037,6,0,L|276:96,1,53.9999983520508,8|0,3:2|0:0,0:0:0:0:
+484,96,122210,2,0,L|488:176,1,53.9999983520508,10|2,3:2|0:2,0:0:0:0:
+272,192,122382,2,0,L|328:192,1,53.9999983520508,10|0,3:2|0:0,0:0:0:0:
+108,192,122555,2,0,L|52:192,1,53.9999983520508,8|0,0:2|0:0,0:0:0:0:
+280,272,122727,5,8,3:2:0:0:
+347,272,122813,1,0,0:0:0:0:
+415,272,122900,1,0,0:0:0:0:
+256,192,123072,1,2,0:0:0:0:
+308,192,123158,1,0,0:0:0:0:
+360,192,123244,1,0,0:0:0:0:
+228,112,123417,5,2,0:0:0:0:
+260,112,123503,1,0,0:0:0:0:
+292,112,123589,1,0,0:0:0:0:
+188,28,123762,1,2,0:0:0:0:
+196,28,123848,1,0,0:0:0:0:
+204,28,123934,1,0,0:0:0:0:
+256,192,124106,12,0,132382,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3152510-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3152510-expected-conversion.json
new file mode 100644
index 0000000000..990550408d
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3152510-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":512.0,"Objects":[{"StartTime":512.0,"Position":368.0,"HyperDash":false},{"StartTime":573.0,"Position":353.0,"HyperDash":false},{"StartTime":670.0,"Position":368.0,"HyperDash":true}]},{"StartTime":829.0,"Objects":[{"StartTime":829.0,"Position":136.0,"HyperDash":false}]},{"StartTime":988.0,"Objects":[{"StartTime":988.0,"Position":272.0,"HyperDash":false}]},{"StartTime":1146.0,"Objects":[{"StartTime":1146.0,"Position":136.0,"HyperDash":false},{"StartTime":1207.0,"Position":125.0,"HyperDash":false},{"StartTime":1304.0,"Position":136.0,"HyperDash":true}]},{"StartTime":1464.0,"Objects":[{"StartTime":1464.0,"Position":368.0,"HyperDash":true}]},{"StartTime":1623.0,"Objects":[{"StartTime":1623.0,"Position":136.0,"HyperDash":false},{"StartTime":1702.0,"Position":87.4122238,"HyperDash":false},{"StartTime":1781.0,"Position":64.73344,"HyperDash":false},{"StartTime":1842.0,"Position":87.7600861,"HyperDash":false},{"StartTime":1940.0,"Position":119.014381,"HyperDash":false}]},{"StartTime":2019.0,"Objects":[{"StartTime":2019.0,"Position":176.0,"HyperDash":true}]},{"StartTime":2099.0,"Objects":[{"StartTime":2099.0,"Position":368.0,"HyperDash":false}]},{"StartTime":2258.0,"Objects":[{"StartTime":2258.0,"Position":232.0,"HyperDash":false}]},{"StartTime":2416.0,"Objects":[{"StartTime":2416.0,"Position":368.0,"HyperDash":false},{"StartTime":2477.0,"Position":369.0,"HyperDash":false},{"StartTime":2574.0,"Position":368.0,"HyperDash":true}]},{"StartTime":2734.0,"Objects":[{"StartTime":2734.0,"Position":136.0,"HyperDash":false},{"StartTime":2795.0,"Position":98.3227844,"HyperDash":false},{"StartTime":2892.0,"Position":41.0,"HyperDash":true}]},{"StartTime":3051.0,"Objects":[{"StartTime":3051.0,"Position":280.0,"HyperDash":false},{"StartTime":3112.0,"Position":301.677216,"HyperDash":false},{"StartTime":3209.0,"Position":375.0,"HyperDash":true}]},{"StartTime":3369.0,"Objects":[{"StartTime":3369.0,"Position":136.0,"HyperDash":false}]},{"StartTime":3527.0,"Objects":[{"StartTime":3527.0,"Position":272.0,"HyperDash":false}]},{"StartTime":3686.0,"Objects":[{"StartTime":3686.0,"Position":136.0,"HyperDash":false},{"StartTime":3747.0,"Position":128.0,"HyperDash":false},{"StartTime":3844.0,"Position":136.0,"HyperDash":true}]},{"StartTime":4004.0,"Objects":[{"StartTime":4004.0,"Position":384.0,"HyperDash":true}]},{"StartTime":4162.0,"Objects":[{"StartTime":4162.0,"Position":136.0,"HyperDash":false},{"StartTime":4241.0,"Position":171.350159,"HyperDash":false},{"StartTime":4320.0,"Position":230.700317,"HyperDash":false},{"StartTime":4381.0,"Position":281.261841,"HyperDash":false},{"StartTime":4479.0,"Position":326.0,"HyperDash":false}]},{"StartTime":4559.0,"Objects":[{"StartTime":4559.0,"Position":272.0,"HyperDash":true}]},{"StartTime":4638.0,"Objects":[{"StartTime":4638.0,"Position":80.0,"HyperDash":false}]},{"StartTime":4797.0,"Objects":[{"StartTime":4797.0,"Position":216.0,"HyperDash":false}]},{"StartTime":4956.0,"Objects":[{"StartTime":4956.0,"Position":80.0,"HyperDash":false},{"StartTime":5017.0,"Position":84.0,"HyperDash":false},{"StartTime":5114.0,"Position":80.0,"HyperDash":true}]},{"StartTime":5273.0,"Objects":[{"StartTime":5273.0,"Position":312.0,"HyperDash":false},{"StartTime":5334.0,"Position":266.322784,"HyperDash":false},{"StartTime":5431.0,"Position":217.0,"HyperDash":true}]},{"StartTime":5591.0,"Objects":[{"StartTime":5591.0,"Position":456.0,"HyperDash":false},{"StartTime":5652.0,"Position":461.0,"HyperDash":false},{"StartTime":5749.0,"Position":456.0,"HyperDash":true}]},{"StartTime":5908.0,"Objects":[{"StartTime":5908.0,"Position":216.0,"HyperDash":false}]},{"StartTime":6067.0,"Objects":[{"StartTime":6067.0,"Position":352.0,"HyperDash":false}]},{"StartTime":6226.0,"Objects":[{"StartTime":6226.0,"Position":216.0,"HyperDash":false},{"StartTime":6287.0,"Position":197.0,"HyperDash":false},{"StartTime":6384.0,"Position":216.0,"HyperDash":true}]},{"StartTime":6543.0,"Objects":[{"StartTime":6543.0,"Position":456.0,"HyperDash":true}]},{"StartTime":6702.0,"Objects":[{"StartTime":6702.0,"Position":216.0,"HyperDash":false},{"StartTime":6781.0,"Position":163.345444,"HyperDash":false},{"StartTime":6860.0,"Position":152.1179,"HyperDash":false},{"StartTime":6921.0,"Position":177.651291,"HyperDash":false},{"StartTime":7019.0,"Position":209.232849,"HyperDash":false}]},{"StartTime":7099.0,"Objects":[{"StartTime":7099.0,"Position":264.0,"HyperDash":true}]},{"StartTime":7178.0,"Objects":[{"StartTime":7178.0,"Position":456.0,"HyperDash":false}]},{"StartTime":7337.0,"Objects":[{"StartTime":7337.0,"Position":320.0,"HyperDash":false}]},{"StartTime":7496.0,"Objects":[{"StartTime":7496.0,"Position":456.0,"HyperDash":false},{"StartTime":7557.0,"Position":469.0,"HyperDash":false},{"StartTime":7654.0,"Position":456.0,"HyperDash":true}]},{"StartTime":7813.0,"Objects":[{"StartTime":7813.0,"Position":216.0,"HyperDash":false},{"StartTime":7874.0,"Position":171.322784,"HyperDash":false},{"StartTime":7971.0,"Position":121.0,"HyperDash":true}]},{"StartTime":8131.0,"Objects":[{"StartTime":8131.0,"Position":368.0,"HyperDash":false},{"StartTime":8192.0,"Position":351.0,"HyperDash":false},{"StartTime":8289.0,"Position":368.0,"HyperDash":true}]},{"StartTime":8448.0,"Objects":[{"StartTime":8448.0,"Position":128.0,"HyperDash":false}]},{"StartTime":8607.0,"Objects":[{"StartTime":8607.0,"Position":264.0,"HyperDash":false}]},{"StartTime":8765.0,"Objects":[{"StartTime":8765.0,"Position":128.0,"HyperDash":false},{"StartTime":8826.0,"Position":141.0,"HyperDash":false},{"StartTime":8923.0,"Position":128.0,"HyperDash":true}]},{"StartTime":9083.0,"Objects":[{"StartTime":9083.0,"Position":368.0,"HyperDash":true}]},{"StartTime":9242.0,"Objects":[{"StartTime":9242.0,"Position":128.0,"HyperDash":false},{"StartTime":9321.0,"Position":170.350159,"HyperDash":false},{"StartTime":9400.0,"Position":222.700317,"HyperDash":false},{"StartTime":9461.0,"Position":244.261841,"HyperDash":false},{"StartTime":9559.0,"Position":318.0,"HyperDash":false}]},{"StartTime":9638.0,"Objects":[{"StartTime":9638.0,"Position":264.0,"HyperDash":true}]},{"StartTime":9718.0,"Objects":[{"StartTime":9718.0,"Position":72.0,"HyperDash":false}]},{"StartTime":9877.0,"Objects":[{"StartTime":9877.0,"Position":208.0,"HyperDash":false}]},{"StartTime":10035.0,"Objects":[{"StartTime":10035.0,"Position":72.0,"HyperDash":false},{"StartTime":10096.0,"Position":68.0,"HyperDash":false},{"StartTime":10193.0,"Position":72.0,"HyperDash":true}]},{"StartTime":10353.0,"Objects":[{"StartTime":10353.0,"Position":312.0,"HyperDash":false},{"StartTime":10414.0,"Position":274.322784,"HyperDash":false},{"StartTime":10511.0,"Position":217.0,"HyperDash":true}]},{"StartTime":10670.0,"Objects":[{"StartTime":10670.0,"Position":464.0,"HyperDash":false},{"StartTime":10731.0,"Position":478.0,"HyperDash":false},{"StartTime":10828.0,"Position":464.0,"HyperDash":true}]},{"StartTime":10988.0,"Objects":[{"StartTime":10988.0,"Position":224.0,"HyperDash":false},{"StartTime":11049.0,"Position":209.0,"HyperDash":false},{"StartTime":11146.0,"Position":224.0,"HyperDash":false}]},{"StartTime":11305.0,"Objects":[{"StartTime":11305.0,"Position":360.0,"HyperDash":false}]},{"StartTime":11464.0,"Objects":[{"StartTime":11464.0,"Position":224.0,"HyperDash":true}]},{"StartTime":11623.0,"Objects":[{"StartTime":11623.0,"Position":464.0,"HyperDash":false}]},{"StartTime":11781.0,"Objects":[{"StartTime":11781.0,"Position":328.0,"HyperDash":false},{"StartTime":11842.0,"Position":309.0,"HyperDash":false},{"StartTime":11939.0,"Position":328.0,"HyperDash":false}]},{"StartTime":12099.0,"Objects":[{"StartTime":12099.0,"Position":464.0,"HyperDash":false},{"StartTime":12160.0,"Position":448.0,"HyperDash":false},{"StartTime":12257.0,"Position":464.0,"HyperDash":false}]},{"StartTime":12416.0,"Objects":[{"StartTime":12416.0,"Position":328.0,"HyperDash":false},{"StartTime":12477.0,"Position":377.677216,"HyperDash":false},{"StartTime":12574.0,"Position":423.0,"HyperDash":false}]},{"StartTime":12734.0,"Objects":[{"StartTime":12734.0,"Position":288.0,"HyperDash":false}]},{"StartTime":12892.0,"Objects":[{"StartTime":12892.0,"Position":424.0,"HyperDash":false},{"StartTime":12953.0,"Position":441.0,"HyperDash":false},{"StartTime":13050.0,"Position":424.0,"HyperDash":true}]},{"StartTime":13210.0,"Objects":[{"StartTime":13210.0,"Position":192.0,"HyperDash":false},{"StartTime":13271.0,"Position":191.0,"HyperDash":false},{"StartTime":13368.0,"Position":192.0,"HyperDash":true}]},{"StartTime":13527.0,"Objects":[{"StartTime":13527.0,"Position":424.0,"HyperDash":false},{"StartTime":13588.0,"Position":417.0,"HyperDash":false},{"StartTime":13685.0,"Position":424.0,"HyperDash":false}]},{"StartTime":13845.0,"Objects":[{"StartTime":13845.0,"Position":288.0,"HyperDash":false}]},{"StartTime":14004.0,"Objects":[{"StartTime":14004.0,"Position":424.0,"HyperDash":true}]},{"StartTime":14162.0,"Objects":[{"StartTime":14162.0,"Position":184.0,"HyperDash":false}]},{"StartTime":14321.0,"Objects":[{"StartTime":14321.0,"Position":320.0,"HyperDash":false},{"StartTime":14382.0,"Position":319.0,"HyperDash":false},{"StartTime":14479.0,"Position":320.0,"HyperDash":true}]},{"StartTime":14638.0,"Objects":[{"StartTime":14638.0,"Position":88.0,"HyperDash":false},{"StartTime":14699.0,"Position":107.0,"HyperDash":false},{"StartTime":14796.0,"Position":88.0,"HyperDash":false}]},{"StartTime":14956.0,"Objects":[{"StartTime":14956.0,"Position":224.0,"HyperDash":false}]},{"StartTime":15115.0,"Objects":[{"StartTime":15115.0,"Position":88.0,"HyperDash":false},{"StartTime":15176.0,"Position":82.0,"HyperDash":false},{"StartTime":15273.0,"Position":88.0,"HyperDash":true}]},{"StartTime":15432.0,"Objects":[{"StartTime":15432.0,"Position":328.0,"HyperDash":false},{"StartTime":15493.0,"Position":369.677216,"HyperDash":false},{"StartTime":15590.0,"Position":423.0,"HyperDash":true}]},{"StartTime":15750.0,"Objects":[{"StartTime":15750.0,"Position":192.0,"HyperDash":false}]},{"StartTime":15908.0,"Objects":[{"StartTime":15908.0,"Position":328.0,"HyperDash":false}]},{"StartTime":16067.0,"Objects":[{"StartTime":16067.0,"Position":192.0,"HyperDash":false},{"StartTime":16128.0,"Position":168.322784,"HyperDash":false},{"StartTime":16225.0,"Position":97.0,"HyperDash":false}]},{"StartTime":16385.0,"Objects":[{"StartTime":16385.0,"Position":232.0,"HyperDash":false}]},{"StartTime":16543.0,"Objects":[{"StartTime":16543.0,"Position":96.0,"HyperDash":true}]},{"StartTime":16702.0,"Objects":[{"StartTime":16702.0,"Position":336.0,"HyperDash":false}]},{"StartTime":16861.0,"Objects":[{"StartTime":16861.0,"Position":200.0,"HyperDash":false},{"StartTime":16922.0,"Position":217.0,"HyperDash":false},{"StartTime":17019.0,"Position":200.0,"HyperDash":true}]},{"StartTime":17178.0,"Objects":[{"StartTime":17178.0,"Position":440.0,"HyperDash":false}]},{"StartTime":17337.0,"Objects":[{"StartTime":17337.0,"Position":304.0,"HyperDash":false}]},{"StartTime":17496.0,"Objects":[{"StartTime":17496.0,"Position":408.0,"HyperDash":false},{"StartTime":17557.0,"Position":461.677216,"HyperDash":false},{"StartTime":17654.0,"Position":503.0,"HyperDash":false}]},{"StartTime":17813.0,"Objects":[{"StartTime":17813.0,"Position":360.0,"HyperDash":false}]},{"StartTime":17972.0,"Objects":[{"StartTime":17972.0,"Position":496.0,"HyperDash":false},{"StartTime":18033.0,"Position":511.0,"HyperDash":false},{"StartTime":18130.0,"Position":496.0,"HyperDash":true}]},{"StartTime":18289.0,"Objects":[{"StartTime":18289.0,"Position":256.0,"HyperDash":false},{"StartTime":18350.0,"Position":236.322784,"HyperDash":false},{"StartTime":18447.0,"Position":161.0,"HyperDash":true}]},{"StartTime":18607.0,"Objects":[{"StartTime":18607.0,"Position":392.0,"HyperDash":false},{"StartTime":18668.0,"Position":401.0,"HyperDash":false},{"StartTime":18765.0,"Position":392.0,"HyperDash":false}]},{"StartTime":18924.0,"Objects":[{"StartTime":18924.0,"Position":256.0,"HyperDash":false}]},{"StartTime":19083.0,"Objects":[{"StartTime":19083.0,"Position":392.0,"HyperDash":true}]},{"StartTime":19242.0,"Objects":[{"StartTime":19242.0,"Position":152.0,"HyperDash":false}]},{"StartTime":19400.0,"Objects":[{"StartTime":19400.0,"Position":288.0,"HyperDash":false},{"StartTime":19461.0,"Position":271.0,"HyperDash":false},{"StartTime":19558.0,"Position":288.0,"HyperDash":true}]},{"StartTime":19718.0,"Objects":[{"StartTime":19718.0,"Position":48.0,"HyperDash":false},{"StartTime":19779.0,"Position":53.0,"HyperDash":false},{"StartTime":19876.0,"Position":48.0,"HyperDash":false}]},{"StartTime":20035.0,"Objects":[{"StartTime":20035.0,"Position":168.0,"HyperDash":false}]},{"StartTime":20194.0,"Objects":[{"StartTime":20194.0,"Position":48.0,"HyperDash":false},{"StartTime":20273.0,"Position":83.30042,"HyperDash":false},{"StartTime":20352.0,"Position":142.600845,"HyperDash":false},{"StartTime":20431.0,"Position":207.90126,"HyperDash":false},{"StartTime":20511.0,"Position":237.800415,"HyperDash":false},{"StartTime":20572.0,"Position":290.323517,"HyperDash":false},{"StartTime":20670.0,"Position":333.0,"HyperDash":true}]},{"StartTime":20829.0,"Objects":[{"StartTime":20829.0,"Position":88.0,"HyperDash":false},{"StartTime":20890.0,"Position":91.0,"HyperDash":false},{"StartTime":20987.0,"Position":88.0,"HyperDash":false}]},{"StartTime":21146.0,"Objects":[{"StartTime":21146.0,"Position":232.0,"HyperDash":false},{"StartTime":21207.0,"Position":222.0,"HyperDash":false},{"StartTime":21304.0,"Position":232.0,"HyperDash":false}]},{"StartTime":21464.0,"Objects":[{"StartTime":21464.0,"Position":88.0,"HyperDash":false},{"StartTime":21525.0,"Position":125.677216,"HyperDash":false},{"StartTime":21622.0,"Position":183.0,"HyperDash":false}]},{"StartTime":21781.0,"Objects":[{"StartTime":21781.0,"Position":320.0,"HyperDash":false}]},{"StartTime":21940.0,"Objects":[{"StartTime":21940.0,"Position":184.0,"HyperDash":false},{"StartTime":22001.0,"Position":174.0,"HyperDash":false},{"StartTime":22098.0,"Position":184.0,"HyperDash":false}]},{"StartTime":22258.0,"Objects":[{"StartTime":22258.0,"Position":320.0,"HyperDash":false},{"StartTime":22319.0,"Position":320.0,"HyperDash":false},{"StartTime":22416.0,"Position":320.0,"HyperDash":false}]},{"StartTime":22575.0,"Objects":[{"StartTime":22575.0,"Position":184.0,"HyperDash":false},{"StartTime":22636.0,"Position":166.0,"HyperDash":false},{"StartTime":22733.0,"Position":184.0,"HyperDash":false}]},{"StartTime":22892.0,"Objects":[{"StartTime":22892.0,"Position":320.0,"HyperDash":false}]},{"StartTime":23051.0,"Objects":[{"StartTime":23051.0,"Position":184.0,"HyperDash":false},{"StartTime":23112.0,"Position":131.322784,"HyperDash":false},{"StartTime":23209.0,"Position":89.0,"HyperDash":true}]},{"StartTime":23369.0,"Objects":[{"StartTime":23369.0,"Position":328.0,"HyperDash":false},{"StartTime":23448.0,"Position":383.3004,"HyperDash":false},{"StartTime":23527.0,"Position":422.60083,"HyperDash":false},{"StartTime":23607.0,"Position":470.5,"HyperDash":false}]},{"StartTime":23686.0,"Objects":[{"StartTime":23686.0,"Position":416.0,"HyperDash":false}]},{"StartTime":23845.0,"Objects":[{"StartTime":23845.0,"Position":280.0,"HyperDash":false},{"StartTime":23924.0,"Position":212.649841,"HyperDash":false},{"StartTime":24003.0,"Position":185.0,"HyperDash":false},{"StartTime":24064.0,"Position":216.261841,"HyperDash":false},{"StartTime":24162.0,"Position":280.0,"HyperDash":false}]},{"StartTime":24321.0,"Objects":[{"StartTime":24321.0,"Position":424.0,"HyperDash":false}]},{"StartTime":24480.0,"Objects":[{"StartTime":24480.0,"Position":288.0,"HyperDash":false},{"StartTime":24559.0,"Position":324.350159,"HyperDash":false},{"StartTime":24638.0,"Position":382.700317,"HyperDash":false},{"StartTime":24699.0,"Position":417.261841,"HyperDash":false},{"StartTime":24797.0,"Position":478.0,"HyperDash":false}]},{"StartTime":24956.0,"Objects":[{"StartTime":24956.0,"Position":360.0,"HyperDash":false}]},{"StartTime":25115.0,"Objects":[{"StartTime":25115.0,"Position":224.0,"HyperDash":false}]},{"StartTime":25273.0,"Objects":[{"StartTime":25273.0,"Position":360.0,"HyperDash":false},{"StartTime":25352.0,"Position":360.0,"HyperDash":false}]},{"StartTime":25432.0,"Objects":[{"StartTime":25432.0,"Position":288.0,"HyperDash":false},{"StartTime":25511.0,"Position":288.0,"HyperDash":true}]},{"StartTime":25591.0,"Objects":[{"StartTime":25591.0,"Position":448.0,"HyperDash":false},{"StartTime":25652.0,"Position":465.0,"HyperDash":false},{"StartTime":25749.0,"Position":448.0,"HyperDash":true}]},{"StartTime":25908.0,"Objects":[{"StartTime":25908.0,"Position":208.0,"HyperDash":false},{"StartTime":25969.0,"Position":154.322784,"HyperDash":false},{"StartTime":26066.0,"Position":113.0,"HyperDash":false}]},{"StartTime":26226.0,"Objects":[{"StartTime":26226.0,"Position":248.0,"HyperDash":false},{"StartTime":26287.0,"Position":289.677216,"HyperDash":false},{"StartTime":26384.0,"Position":343.0,"HyperDash":false}]},{"StartTime":26543.0,"Objects":[{"StartTime":26543.0,"Position":208.0,"HyperDash":false},{"StartTime":26604.0,"Position":227.0,"HyperDash":false},{"StartTime":26701.0,"Position":208.0,"HyperDash":false}]},{"StartTime":26861.0,"Objects":[{"StartTime":26861.0,"Position":344.0,"HyperDash":false}]},{"StartTime":27019.0,"Objects":[{"StartTime":27019.0,"Position":208.0,"HyperDash":false},{"StartTime":27080.0,"Position":181.322784,"HyperDash":false},{"StartTime":27177.0,"Position":113.0,"HyperDash":false}]},{"StartTime":27337.0,"Objects":[{"StartTime":27337.0,"Position":248.0,"HyperDash":false},{"StartTime":27398.0,"Position":294.677216,"HyperDash":false},{"StartTime":27495.0,"Position":343.0,"HyperDash":false}]},{"StartTime":27654.0,"Objects":[{"StartTime":27654.0,"Position":208.0,"HyperDash":false}]},{"StartTime":27813.0,"Objects":[{"StartTime":27813.0,"Position":344.0,"HyperDash":false}]},{"StartTime":27972.0,"Objects":[{"StartTime":27972.0,"Position":208.0,"HyperDash":false}]},{"StartTime":28131.0,"Objects":[{"StartTime":28131.0,"Position":344.0,"HyperDash":false},{"StartTime":28192.0,"Position":384.677216,"HyperDash":false},{"StartTime":28289.0,"Position":439.0,"HyperDash":true}]},{"StartTime":28448.0,"Objects":[{"StartTime":28448.0,"Position":208.0,"HyperDash":false},{"StartTime":28527.0,"Position":167.699585,"HyperDash":false},{"StartTime":28606.0,"Position":113.399155,"HyperDash":false},{"StartTime":28686.0,"Position":65.5,"HyperDash":false}]},{"StartTime":28765.0,"Objects":[{"StartTime":28765.0,"Position":120.0,"HyperDash":false}]},{"StartTime":28924.0,"Objects":[{"StartTime":28924.0,"Position":256.0,"HyperDash":false},{"StartTime":29003.0,"Position":288.350159,"HyperDash":false},{"StartTime":29082.0,"Position":351.0,"HyperDash":false},{"StartTime":29143.0,"Position":311.738159,"HyperDash":false},{"StartTime":29241.0,"Position":256.0,"HyperDash":false}]},{"StartTime":29400.0,"Objects":[{"StartTime":29400.0,"Position":112.0,"HyperDash":false}]},{"StartTime":29559.0,"Objects":[{"StartTime":29559.0,"Position":248.0,"HyperDash":false},{"StartTime":29638.0,"Position":190.649841,"HyperDash":false},{"StartTime":29717.0,"Position":153.299683,"HyperDash":false},{"StartTime":29778.0,"Position":125.738174,"HyperDash":false},{"StartTime":29876.0,"Position":58.0,"HyperDash":false}]},{"StartTime":30035.0,"Objects":[{"StartTime":30035.0,"Position":192.0,"HyperDash":false}]},{"StartTime":30194.0,"Objects":[{"StartTime":30194.0,"Position":328.0,"HyperDash":false}]},{"StartTime":30353.0,"Objects":[{"StartTime":30353.0,"Position":192.0,"HyperDash":false},{"StartTime":30414.0,"Position":196.0,"HyperDash":false},{"StartTime":30511.0,"Position":192.0,"HyperDash":true}]},{"StartTime":30670.0,"Objects":[{"StartTime":30670.0,"Position":432.0,"HyperDash":false},{"StartTime":30749.0,"Position":384.5,"HyperDash":true}]},{"StartTime":30829.0,"Objects":[{"StartTime":30829.0,"Position":192.0,"HyperDash":false},{"StartTime":30908.0,"Position":144.5,"HyperDash":true}]},{"StartTime":30988.0,"Objects":[{"StartTime":30988.0,"Position":336.0,"HyperDash":false},{"StartTime":31049.0,"Position":326.0,"HyperDash":false},{"StartTime":31146.0,"Position":336.0,"HyperDash":false}]},{"StartTime":31305.0,"Objects":[{"StartTime":31305.0,"Position":208.0,"HyperDash":false},{"StartTime":31366.0,"Position":198.0,"HyperDash":false},{"StartTime":31463.0,"Position":208.0,"HyperDash":false}]},{"StartTime":31623.0,"Objects":[{"StartTime":31623.0,"Position":80.0,"HyperDash":false},{"StartTime":31684.0,"Position":87.0,"HyperDash":false},{"StartTime":31781.0,"Position":80.0,"HyperDash":false}]},{"StartTime":31940.0,"Objects":[{"StartTime":31940.0,"Position":208.0,"HyperDash":false}]},{"StartTime":32099.0,"Objects":[{"StartTime":32099.0,"Position":80.0,"HyperDash":false},{"StartTime":32160.0,"Position":130.677216,"HyperDash":false},{"StartTime":32257.0,"Position":175.0,"HyperDash":false}]},{"StartTime":32416.0,"Objects":[{"StartTime":32416.0,"Position":296.0,"HyperDash":false},{"StartTime":32477.0,"Position":303.0,"HyperDash":false},{"StartTime":32574.0,"Position":296.0,"HyperDash":false}]},{"StartTime":32734.0,"Objects":[{"StartTime":32734.0,"Position":176.0,"HyperDash":false},{"StartTime":32795.0,"Position":188.0,"HyperDash":false},{"StartTime":32892.0,"Position":176.0,"HyperDash":false}]},{"StartTime":33051.0,"Objects":[{"StartTime":33051.0,"Position":296.0,"HyperDash":false},{"StartTime":33130.0,"Position":250.649841,"HyperDash":false},{"StartTime":33209.0,"Position":201.0,"HyperDash":false},{"StartTime":33270.0,"Position":218.261841,"HyperDash":false},{"StartTime":33368.0,"Position":296.0,"HyperDash":true}]},{"StartTime":33527.0,"Objects":[{"StartTime":33527.0,"Position":48.0,"HyperDash":false}]},{"StartTime":33686.0,"Objects":[{"StartTime":33686.0,"Position":160.0,"HyperDash":false}]},{"StartTime":33845.0,"Objects":[{"StartTime":33845.0,"Position":272.0,"HyperDash":false}]},{"StartTime":34004.0,"Objects":[{"StartTime":34004.0,"Position":160.0,"HyperDash":false}]},{"StartTime":34162.0,"Objects":[{"StartTime":34162.0,"Position":304.0,"HyperDash":false},{"StartTime":34241.0,"Position":332.587769,"HyperDash":false},{"StartTime":34320.0,"Position":375.266571,"HyperDash":false},{"StartTime":34381.0,"Position":377.239929,"HyperDash":false},{"StartTime":34479.0,"Position":320.985657,"HyperDash":false}]},{"StartTime":34638.0,"Objects":[{"StartTime":34638.0,"Position":184.0,"HyperDash":false},{"StartTime":34717.0,"Position":224.350159,"HyperDash":false},{"StartTime":34796.0,"Position":278.700317,"HyperDash":false},{"StartTime":34857.0,"Position":313.261841,"HyperDash":false},{"StartTime":34955.0,"Position":374.0,"HyperDash":false}]},{"StartTime":35035.0,"Objects":[{"StartTime":35035.0,"Position":440.0,"HyperDash":false}]},{"StartTime":35115.0,"Objects":[{"StartTime":35115.0,"Position":376.0,"HyperDash":false}]},{"StartTime":35273.0,"Objects":[{"StartTime":35273.0,"Position":224.0,"HyperDash":false}]},{"StartTime":35432.0,"Objects":[{"StartTime":35432.0,"Position":368.0,"HyperDash":false},{"StartTime":35511.0,"Position":430.6414,"HyperDash":false},{"StartTime":35590.0,"Position":439.319336,"HyperDash":false},{"StartTime":35651.0,"Position":442.987732,"HyperDash":false},{"StartTime":35749.0,"Position":381.729523,"HyperDash":false}]},{"StartTime":35908.0,"Objects":[{"StartTime":35908.0,"Position":288.0,"HyperDash":true}]},{"StartTime":36067.0,"Objects":[{"StartTime":36067.0,"Position":72.0,"HyperDash":false}]},{"StartTime":36146.0,"Objects":[{"StartTime":36146.0,"Position":16.0,"HyperDash":false}]},{"StartTime":36226.0,"Objects":[{"StartTime":36226.0,"Position":16.0,"HyperDash":false}]},{"StartTime":36305.0,"Objects":[{"StartTime":36305.0,"Position":72.0,"HyperDash":true}]},{"StartTime":36385.0,"Objects":[{"StartTime":36385.0,"Position":264.0,"HyperDash":false}]},{"StartTime":36464.0,"Objects":[{"StartTime":36464.0,"Position":328.0,"HyperDash":false}]},{"StartTime":36543.0,"Objects":[{"StartTime":36543.0,"Position":264.0,"HyperDash":false}]},{"StartTime":36623.0,"Objects":[{"StartTime":36623.0,"Position":200.0,"HyperDash":true}]},{"StartTime":36702.0,"Objects":[{"StartTime":36702.0,"Position":392.0,"HyperDash":false},{"StartTime":36781.0,"Position":439.5,"HyperDash":true}]},{"StartTime":36861.0,"Objects":[{"StartTime":36861.0,"Position":232.0,"HyperDash":false},{"StartTime":36940.0,"Position":226.108353,"HyperDash":false}]},{"StartTime":37019.0,"Objects":[{"StartTime":37019.0,"Position":304.0,"HyperDash":false},{"StartTime":37098.0,"Position":315.520447,"HyperDash":true}]},{"StartTime":37178.0,"Objects":[{"StartTime":37178.0,"Position":104.0,"HyperDash":false},{"StartTime":37257.0,"Position":56.5,"HyperDash":true}]},{"StartTime":37337.0,"Objects":[{"StartTime":37337.0,"Position":264.0,"HyperDash":false},{"StartTime":37416.0,"Position":279.0208,"HyperDash":false}]},{"StartTime":37496.0,"Objects":[{"StartTime":37496.0,"Position":208.0,"HyperDash":false},{"StartTime":37575.0,"Position":201.282486,"HyperDash":true}]},{"StartTime":37654.0,"Objects":[{"StartTime":37654.0,"Position":392.0,"HyperDash":false}]},{"StartTime":37734.0,"Objects":[{"StartTime":37734.0,"Position":448.0,"HyperDash":false}]},{"StartTime":37813.0,"Objects":[{"StartTime":37813.0,"Position":448.0,"HyperDash":false}]},{"StartTime":37892.0,"Objects":[{"StartTime":37892.0,"Position":392.0,"HyperDash":true}]},{"StartTime":37972.0,"Objects":[{"StartTime":37972.0,"Position":192.0,"HyperDash":false},{"StartTime":38051.0,"Position":239.5,"HyperDash":true}]},{"StartTime":38131.0,"Objects":[{"StartTime":38131.0,"Position":410.0,"HyperDash":false},{"StartTime":38210.0,"Position":457.5,"HyperDash":true}]},{"StartTime":38289.0,"Objects":[{"StartTime":38289.0,"Position":264.0,"HyperDash":false},{"StartTime":38368.0,"Position":216.5,"HyperDash":true}]},{"StartTime":38448.0,"Objects":[{"StartTime":38448.0,"Position":448.0,"HyperDash":false},{"StartTime":38527.0,"Position":495.5,"HyperDash":true}]},{"StartTime":38607.0,"Objects":[{"StartTime":38607.0,"Position":296.0,"HyperDash":false}]},{"StartTime":38924.0,"Objects":[{"StartTime":38924.0,"Position":440.0,"HyperDash":false}]},{"StartTime":39242.0,"Objects":[{"StartTime":39242.0,"Position":296.0,"HyperDash":false}]},{"StartTime":39559.0,"Objects":[{"StartTime":39559.0,"Position":152.0,"HyperDash":false}]},{"StartTime":39877.0,"Objects":[{"StartTime":39877.0,"Position":352.0,"HyperDash":false},{"StartTime":39956.0,"Position":285.84314,"HyperDash":false},{"StartTime":40035.0,"Position":257.328156,"HyperDash":false},{"StartTime":40114.0,"Position":311.126862,"HyperDash":false},{"StartTime":40194.0,"Position":352.0,"HyperDash":false},{"StartTime":40273.0,"Position":315.962524,"HyperDash":false},{"StartTime":40353.0,"Position":257.328156,"HyperDash":false},{"StartTime":40432.0,"Position":295.60437,"HyperDash":false},{"StartTime":40511.0,"Position":352.0,"HyperDash":false},{"StartTime":40572.0,"Position":308.8265,"HyperDash":false},{"StartTime":40670.0,"Position":257.328156,"HyperDash":false}]},{"StartTime":40829.0,"Objects":[{"StartTime":40829.0,"Position":432.0,"HyperDash":true},{"StartTime":40890.0,"Position":349.476257,"HyperDash":false},{"StartTime":40987.0,"Position":218.25,"HyperDash":true}]},{"StartTime":41146.0,"Objects":[{"StartTime":41146.0,"Position":440.0,"HyperDash":false},{"StartTime":41225.0,"Position":485.905121,"HyperDash":false},{"StartTime":41304.0,"Position":484.021484,"HyperDash":false},{"StartTime":41384.0,"Position":448.07428,"HyperDash":true}]},{"StartTime":41464.0,"Objects":[{"StartTime":41464.0,"Position":256.0,"HyperDash":false}]},{"StartTime":41623.0,"Objects":[{"StartTime":41623.0,"Position":400.0,"HyperDash":true}]},{"StartTime":41781.0,"Objects":[{"StartTime":41781.0,"Position":168.0,"HyperDash":false},{"StartTime":41842.0,"Position":176.0,"HyperDash":false},{"StartTime":41939.0,"Position":168.0,"HyperDash":true}]},{"StartTime":42099.0,"Objects":[{"StartTime":42099.0,"Position":400.0,"HyperDash":false}]},{"StartTime":42258.0,"Objects":[{"StartTime":42258.0,"Position":256.0,"HyperDash":false},{"StartTime":42319.0,"Position":267.0,"HyperDash":false},{"StartTime":42416.0,"Position":256.0,"HyperDash":false}]},{"StartTime":42575.0,"Objects":[{"StartTime":42575.0,"Position":400.0,"HyperDash":false}]},{"StartTime":42734.0,"Objects":[{"StartTime":42734.0,"Position":256.0,"HyperDash":true}]},{"StartTime":42892.0,"Objects":[{"StartTime":42892.0,"Position":488.0,"HyperDash":false},{"StartTime":42953.0,"Position":480.0,"HyperDash":false},{"StartTime":43050.0,"Position":488.0,"HyperDash":true}]},{"StartTime":43210.0,"Objects":[{"StartTime":43210.0,"Position":256.0,"HyperDash":false}]},{"StartTime":43369.0,"Objects":[{"StartTime":43369.0,"Position":368.0,"HyperDash":false}]},{"StartTime":43527.0,"Objects":[{"StartTime":43527.0,"Position":480.0,"HyperDash":true}]},{"StartTime":43686.0,"Objects":[{"StartTime":43686.0,"Position":256.0,"HyperDash":false},{"StartTime":43747.0,"Position":223.322784,"HyperDash":false},{"StartTime":43844.0,"Position":161.0,"HyperDash":true}]},{"StartTime":44004.0,"Objects":[{"StartTime":44004.0,"Position":392.0,"HyperDash":false}]},{"StartTime":44162.0,"Objects":[{"StartTime":44162.0,"Position":248.0,"HyperDash":false},{"StartTime":44223.0,"Position":260.0,"HyperDash":false},{"StartTime":44320.0,"Position":248.0,"HyperDash":true}]},{"StartTime":44480.0,"Objects":[{"StartTime":44480.0,"Position":480.0,"HyperDash":false},{"StartTime":44541.0,"Position":475.0,"HyperDash":false},{"StartTime":44638.0,"Position":480.0,"HyperDash":true}]},{"StartTime":44797.0,"Objects":[{"StartTime":44797.0,"Position":248.0,"HyperDash":false},{"StartTime":44858.0,"Position":285.677216,"HyperDash":false},{"StartTime":44955.0,"Position":343.0,"HyperDash":true}]},{"StartTime":45115.0,"Objects":[{"StartTime":45115.0,"Position":104.0,"HyperDash":false},{"StartTime":45194.0,"Position":104.0,"HyperDash":true}]},{"StartTime":45273.0,"Objects":[{"StartTime":45273.0,"Position":296.0,"HyperDash":false}]},{"StartTime":45432.0,"Objects":[{"StartTime":45432.0,"Position":160.0,"HyperDash":true}]},{"StartTime":45591.0,"Objects":[{"StartTime":45591.0,"Position":392.0,"HyperDash":false},{"StartTime":45652.0,"Position":379.0,"HyperDash":false},{"StartTime":45749.0,"Position":392.0,"HyperDash":true}]},{"StartTime":45908.0,"Objects":[{"StartTime":45908.0,"Position":160.0,"HyperDash":true},{"StartTime":45969.0,"Position":245.523743,"HyperDash":false},{"StartTime":46066.0,"Position":373.75,"HyperDash":true}]},{"StartTime":46226.0,"Objects":[{"StartTime":46226.0,"Position":136.0,"HyperDash":false},{"StartTime":46305.0,"Position":111.869118,"HyperDash":false},{"StartTime":46384.0,"Position":80.52514,"HyperDash":false},{"StartTime":46464.0,"Position":110.225082,"HyperDash":true}]},{"StartTime":46543.0,"Objects":[{"StartTime":46543.0,"Position":304.0,"HyperDash":false}]},{"StartTime":46702.0,"Objects":[{"StartTime":46702.0,"Position":160.0,"HyperDash":true}]},{"StartTime":46861.0,"Objects":[{"StartTime":46861.0,"Position":400.0,"HyperDash":false},{"StartTime":46922.0,"Position":400.0,"HyperDash":false},{"StartTime":47019.0,"Position":400.0,"HyperDash":true}]},{"StartTime":47178.0,"Objects":[{"StartTime":47178.0,"Position":160.0,"HyperDash":false}]},{"StartTime":47337.0,"Objects":[{"StartTime":47337.0,"Position":296.0,"HyperDash":false},{"StartTime":47398.0,"Position":314.677216,"HyperDash":false},{"StartTime":47495.0,"Position":391.0,"HyperDash":false}]},{"StartTime":47654.0,"Objects":[{"StartTime":47654.0,"Position":248.0,"HyperDash":false}]},{"StartTime":47734.0,"Objects":[{"StartTime":47734.0,"Position":304.0,"HyperDash":false}]},{"StartTime":47813.0,"Objects":[{"StartTime":47813.0,"Position":360.0,"HyperDash":true}]},{"StartTime":47972.0,"Objects":[{"StartTime":47972.0,"Position":136.0,"HyperDash":false},{"StartTime":48033.0,"Position":122.0,"HyperDash":false},{"StartTime":48130.0,"Position":136.0,"HyperDash":true}]},{"StartTime":48289.0,"Objects":[{"StartTime":48289.0,"Position":376.0,"HyperDash":false}]},{"StartTime":48448.0,"Objects":[{"StartTime":48448.0,"Position":264.0,"HyperDash":false}]},{"StartTime":48607.0,"Objects":[{"StartTime":48607.0,"Position":152.0,"HyperDash":true}]},{"StartTime":48765.0,"Objects":[{"StartTime":48765.0,"Position":392.0,"HyperDash":false},{"StartTime":48826.0,"Position":391.0,"HyperDash":false},{"StartTime":48923.0,"Position":392.0,"HyperDash":true}]},{"StartTime":49083.0,"Objects":[{"StartTime":49083.0,"Position":160.0,"HyperDash":false}]},{"StartTime":49241.0,"Objects":[{"StartTime":49241.0,"Position":304.0,"HyperDash":false},{"StartTime":49302.0,"Position":321.0,"HyperDash":false},{"StartTime":49399.0,"Position":304.0,"HyperDash":true}]},{"StartTime":49559.0,"Objects":[{"StartTime":49559.0,"Position":64.0,"HyperDash":false},{"StartTime":49620.0,"Position":76.0,"HyperDash":false},{"StartTime":49717.0,"Position":64.0,"HyperDash":true}]},{"StartTime":49877.0,"Objects":[{"StartTime":49877.0,"Position":304.0,"HyperDash":false},{"StartTime":49938.0,"Position":278.322784,"HyperDash":false},{"StartTime":50035.0,"Position":209.0,"HyperDash":true}]},{"StartTime":50194.0,"Objects":[{"StartTime":50194.0,"Position":448.0,"HyperDash":false},{"StartTime":50255.0,"Position":446.0,"HyperDash":false},{"StartTime":50352.0,"Position":448.0,"HyperDash":true}]},{"StartTime":50511.0,"Objects":[{"StartTime":50511.0,"Position":208.0,"HyperDash":false},{"StartTime":50590.0,"Position":160.5,"HyperDash":true}]},{"StartTime":50670.0,"Objects":[{"StartTime":50670.0,"Position":352.0,"HyperDash":false},{"StartTime":50731.0,"Position":369.0,"HyperDash":false},{"StartTime":50828.0,"Position":352.0,"HyperDash":true}]},{"StartTime":50988.0,"Objects":[{"StartTime":50988.0,"Position":128.0,"HyperDash":true},{"StartTime":51049.0,"Position":201.523743,"HyperDash":false},{"StartTime":51146.0,"Position":341.75,"HyperDash":true}]},{"StartTime":51305.0,"Objects":[{"StartTime":51305.0,"Position":104.0,"HyperDash":false},{"StartTime":51384.0,"Position":76.12657,"HyperDash":false},{"StartTime":51463.0,"Position":49.38173,"HyperDash":false},{"StartTime":51543.0,"Position":79.5740662,"HyperDash":true}]},{"StartTime":51623.0,"Objects":[{"StartTime":51623.0,"Position":272.0,"HyperDash":false}]},{"StartTime":51781.0,"Objects":[{"StartTime":51781.0,"Position":128.0,"HyperDash":true}]},{"StartTime":51940.0,"Objects":[{"StartTime":51940.0,"Position":368.0,"HyperDash":false},{"StartTime":52001.0,"Position":357.0,"HyperDash":false},{"StartTime":52098.0,"Position":368.0,"HyperDash":true}]},{"StartTime":52258.0,"Objects":[{"StartTime":52258.0,"Position":128.0,"HyperDash":false}]},{"StartTime":52416.0,"Objects":[{"StartTime":52416.0,"Position":272.0,"HyperDash":false},{"StartTime":52477.0,"Position":276.0,"HyperDash":false},{"StartTime":52574.0,"Position":272.0,"HyperDash":false}]},{"StartTime":52734.0,"Objects":[{"StartTime":52734.0,"Position":128.0,"HyperDash":false}]},{"StartTime":52813.0,"Objects":[{"StartTime":52813.0,"Position":184.0,"HyperDash":false}]},{"StartTime":52892.0,"Objects":[{"StartTime":52892.0,"Position":240.0,"HyperDash":true}]},{"StartTime":53051.0,"Objects":[{"StartTime":53051.0,"Position":16.0,"HyperDash":false},{"StartTime":53112.0,"Position":4.0,"HyperDash":false},{"StartTime":53209.0,"Position":16.0,"HyperDash":true}]},{"StartTime":53369.0,"Objects":[{"StartTime":53369.0,"Position":264.0,"HyperDash":false}]},{"StartTime":53527.0,"Objects":[{"StartTime":53527.0,"Position":152.0,"HyperDash":false}]},{"StartTime":53686.0,"Objects":[{"StartTime":53686.0,"Position":40.0,"HyperDash":true}]},{"StartTime":53845.0,"Objects":[{"StartTime":53845.0,"Position":280.0,"HyperDash":false},{"StartTime":53906.0,"Position":296.0,"HyperDash":false},{"StartTime":54003.0,"Position":280.0,"HyperDash":true}]},{"StartTime":54162.0,"Objects":[{"StartTime":54162.0,"Position":56.0,"HyperDash":false}]},{"StartTime":54321.0,"Objects":[{"StartTime":54321.0,"Position":184.0,"HyperDash":false},{"StartTime":54382.0,"Position":208.677216,"HyperDash":false},{"StartTime":54479.0,"Position":279.0,"HyperDash":true}]},{"StartTime":54638.0,"Objects":[{"StartTime":54638.0,"Position":32.0,"HyperDash":false},{"StartTime":54699.0,"Position":31.0,"HyperDash":false},{"StartTime":54796.0,"Position":32.0,"HyperDash":true}]},{"StartTime":54956.0,"Objects":[{"StartTime":54956.0,"Position":264.0,"HyperDash":false},{"StartTime":55017.0,"Position":287.677216,"HyperDash":false},{"StartTime":55114.0,"Position":359.0,"HyperDash":true}]},{"StartTime":55274.0,"Objects":[{"StartTime":55274.0,"Position":120.0,"HyperDash":false},{"StartTime":55353.0,"Position":120.0,"HyperDash":true}]},{"StartTime":55432.0,"Objects":[{"StartTime":55432.0,"Position":312.0,"HyperDash":false}]},{"StartTime":55591.0,"Objects":[{"StartTime":55591.0,"Position":176.0,"HyperDash":true}]},{"StartTime":55750.0,"Objects":[{"StartTime":55750.0,"Position":408.0,"HyperDash":false},{"StartTime":55811.0,"Position":402.0,"HyperDash":false},{"StartTime":55908.0,"Position":408.0,"HyperDash":true}]},{"StartTime":56067.0,"Objects":[{"StartTime":56067.0,"Position":136.0,"HyperDash":true},{"StartTime":56128.0,"Position":210.523743,"HyperDash":false},{"StartTime":56225.0,"Position":349.75,"HyperDash":true}]},{"StartTime":56385.0,"Objects":[{"StartTime":56385.0,"Position":112.0,"HyperDash":false},{"StartTime":56464.0,"Position":63.0948868,"HyperDash":false},{"StartTime":56543.0,"Position":67.97851,"HyperDash":false},{"StartTime":56623.0,"Position":103.92572,"HyperDash":true}]},{"StartTime":56702.0,"Objects":[{"StartTime":56702.0,"Position":296.0,"HyperDash":false}]},{"StartTime":56861.0,"Objects":[{"StartTime":56861.0,"Position":152.0,"HyperDash":true}]},{"StartTime":57019.0,"Objects":[{"StartTime":57019.0,"Position":392.0,"HyperDash":false},{"StartTime":57080.0,"Position":387.0,"HyperDash":false},{"StartTime":57177.0,"Position":392.0,"HyperDash":true}]},{"StartTime":57337.0,"Objects":[{"StartTime":57337.0,"Position":152.0,"HyperDash":false}]},{"StartTime":57496.0,"Objects":[{"StartTime":57496.0,"Position":296.0,"HyperDash":false},{"StartTime":57557.0,"Position":346.677216,"HyperDash":false},{"StartTime":57654.0,"Position":391.0,"HyperDash":false}]},{"StartTime":57813.0,"Objects":[{"StartTime":57813.0,"Position":248.0,"HyperDash":false}]},{"StartTime":57972.0,"Objects":[{"StartTime":57972.0,"Position":392.0,"HyperDash":true}]},{"StartTime":58131.0,"Objects":[{"StartTime":58131.0,"Position":152.0,"HyperDash":false},{"StartTime":58192.0,"Position":155.0,"HyperDash":false},{"StartTime":58289.0,"Position":152.0,"HyperDash":true}]},{"StartTime":58448.0,"Objects":[{"StartTime":58448.0,"Position":392.0,"HyperDash":false}]},{"StartTime":58607.0,"Objects":[{"StartTime":58607.0,"Position":280.0,"HyperDash":false}]},{"StartTime":58765.0,"Objects":[{"StartTime":58765.0,"Position":168.0,"HyperDash":true}]},{"StartTime":58924.0,"Objects":[{"StartTime":58924.0,"Position":392.0,"HyperDash":false}]},{"StartTime":59083.0,"Objects":[{"StartTime":59083.0,"Position":248.0,"HyperDash":false},{"StartTime":59144.0,"Position":236.0,"HyperDash":false},{"StartTime":59241.0,"Position":248.0,"HyperDash":true}]},{"StartTime":59400.0,"Objects":[{"StartTime":59400.0,"Position":488.0,"HyperDash":false},{"StartTime":59461.0,"Position":476.0,"HyperDash":false},{"StartTime":59558.0,"Position":488.0,"HyperDash":true}]},{"StartTime":59718.0,"Objects":[{"StartTime":59718.0,"Position":248.0,"HyperDash":false},{"StartTime":59779.0,"Position":233.0,"HyperDash":false},{"StartTime":59876.0,"Position":248.0,"HyperDash":true}]},{"StartTime":60035.0,"Objects":[{"StartTime":60035.0,"Position":488.0,"HyperDash":false},{"StartTime":60114.0,"Position":436.649841,"HyperDash":false},{"StartTime":60193.0,"Position":393.299683,"HyperDash":false},{"StartTime":60254.0,"Position":337.738159,"HyperDash":false},{"StartTime":60352.0,"Position":298.0,"HyperDash":false}]},{"StartTime":60511.0,"Objects":[{"StartTime":60511.0,"Position":448.0,"HyperDash":false},{"StartTime":60572.0,"Position":448.0,"HyperDash":false},{"StartTime":60669.0,"Position":448.0,"HyperDash":true}]},{"StartTime":60829.0,"Objects":[{"StartTime":60829.0,"Position":200.0,"HyperDash":true}]},{"StartTime":60988.0,"Objects":[{"StartTime":60988.0,"Position":448.0,"HyperDash":false},{"StartTime":61067.0,"Position":495.5,"HyperDash":true}]},{"StartTime":61146.0,"Objects":[{"StartTime":61146.0,"Position":304.0,"HyperDash":false},{"StartTime":61225.0,"Position":256.5,"HyperDash":true}]},{"StartTime":61305.0,"Objects":[{"StartTime":61305.0,"Position":448.0,"HyperDash":false},{"StartTime":61384.0,"Position":495.5,"HyperDash":true}]},{"StartTime":61464.0,"Objects":[{"StartTime":61464.0,"Position":304.0,"HyperDash":false},{"StartTime":61543.0,"Position":273.8691,"HyperDash":false},{"StartTime":61622.0,"Position":248.525131,"HyperDash":false},{"StartTime":61702.0,"Position":278.225067,"HyperDash":true}]},{"StartTime":61781.0,"Objects":[{"StartTime":61781.0,"Position":448.0,"HyperDash":false},{"StartTime":61860.0,"Position":503.905121,"HyperDash":false},{"StartTime":61939.0,"Position":492.021484,"HyperDash":false},{"StartTime":62019.0,"Position":456.07428,"HyperDash":true}]},{"StartTime":62099.0,"Objects":[{"StartTime":62099.0,"Position":272.0,"HyperDash":false}]},{"StartTime":62258.0,"Objects":[{"StartTime":62258.0,"Position":408.0,"HyperDash":true}]},{"StartTime":62416.0,"Objects":[{"StartTime":62416.0,"Position":168.0,"HyperDash":false}]},{"StartTime":62575.0,"Objects":[{"StartTime":62575.0,"Position":312.0,"HyperDash":false},{"StartTime":62636.0,"Position":301.0,"HyperDash":false},{"StartTime":62733.0,"Position":312.0,"HyperDash":true}]},{"StartTime":62892.0,"Objects":[{"StartTime":62892.0,"Position":72.0,"HyperDash":false},{"StartTime":62953.0,"Position":58.0,"HyperDash":false},{"StartTime":63050.0,"Position":72.0,"HyperDash":true}]},{"StartTime":63210.0,"Objects":[{"StartTime":63210.0,"Position":312.0,"HyperDash":false}]},{"StartTime":63369.0,"Objects":[{"StartTime":63369.0,"Position":176.0,"HyperDash":false},{"StartTime":63430.0,"Position":194.0,"HyperDash":false},{"StartTime":63527.0,"Position":176.0,"HyperDash":false}]},{"StartTime":63686.0,"Objects":[{"StartTime":63686.0,"Position":312.0,"HyperDash":false}]},{"StartTime":63845.0,"Objects":[{"StartTime":63845.0,"Position":176.0,"HyperDash":true}]},{"StartTime":64004.0,"Objects":[{"StartTime":64004.0,"Position":408.0,"HyperDash":false},{"StartTime":64083.0,"Position":460.8734,"HyperDash":false},{"StartTime":64162.0,"Position":462.618256,"HyperDash":false},{"StartTime":64242.0,"Position":432.4259,"HyperDash":true}]},{"StartTime":64321.0,"Objects":[{"StartTime":64321.0,"Position":240.0,"HyperDash":false}]},{"StartTime":64480.0,"Objects":[{"StartTime":64480.0,"Position":376.0,"HyperDash":true}]},{"StartTime":64638.0,"Objects":[{"StartTime":64638.0,"Position":136.0,"HyperDash":false},{"StartTime":64699.0,"Position":119.0,"HyperDash":false},{"StartTime":64796.0,"Position":136.0,"HyperDash":false}]},{"StartTime":64956.0,"Objects":[{"StartTime":64956.0,"Position":272.0,"HyperDash":true}]},{"StartTime":65115.0,"Objects":[{"StartTime":65115.0,"Position":32.0,"HyperDash":false},{"StartTime":65176.0,"Position":26.0,"HyperDash":false},{"StartTime":65273.0,"Position":32.0,"HyperDash":true}]},{"StartTime":65432.0,"Objects":[{"StartTime":65432.0,"Position":272.0,"HyperDash":false},{"StartTime":65493.0,"Position":314.677216,"HyperDash":false},{"StartTime":65590.0,"Position":367.0,"HyperDash":true}]},{"StartTime":65750.0,"Objects":[{"StartTime":65750.0,"Position":128.0,"HyperDash":false}]},{"StartTime":65908.0,"Objects":[{"StartTime":65908.0,"Position":264.0,"HyperDash":false}]},{"StartTime":66067.0,"Objects":[{"StartTime":66067.0,"Position":128.0,"HyperDash":false},{"StartTime":66128.0,"Position":140.0,"HyperDash":false},{"StartTime":66225.0,"Position":128.0,"HyperDash":false}]},{"StartTime":66385.0,"Objects":[{"StartTime":66385.0,"Position":264.0,"HyperDash":true}]},{"StartTime":66543.0,"Objects":[{"StartTime":66543.0,"Position":32.0,"HyperDash":false},{"StartTime":66604.0,"Position":19.0,"HyperDash":false},{"StartTime":66701.0,"Position":32.0,"HyperDash":true}]},{"StartTime":66861.0,"Objects":[{"StartTime":66861.0,"Position":280.0,"HyperDash":false}]},{"StartTime":67019.0,"Objects":[{"StartTime":67019.0,"Position":144.0,"HyperDash":false}]},{"StartTime":67178.0,"Objects":[{"StartTime":67178.0,"Position":280.0,"HyperDash":false},{"StartTime":67239.0,"Position":302.677216,"HyperDash":false},{"StartTime":67336.0,"Position":375.0,"HyperDash":true}]},{"StartTime":67496.0,"Objects":[{"StartTime":67496.0,"Position":136.0,"HyperDash":false}]},{"StartTime":67654.0,"Objects":[{"StartTime":67654.0,"Position":272.0,"HyperDash":false},{"StartTime":67733.0,"Position":292.355682,"HyperDash":false},{"StartTime":67812.0,"Position":317.325684,"HyperDash":false},{"StartTime":67892.0,"Position":284.836639,"HyperDash":true}]},{"StartTime":67972.0,"Objects":[{"StartTime":67972.0,"Position":96.0,"HyperDash":false},{"StartTime":68033.0,"Position":82.0,"HyperDash":false},{"StartTime":68130.0,"Position":96.0,"HyperDash":true}]},{"StartTime":68289.0,"Objects":[{"StartTime":68289.0,"Position":328.0,"HyperDash":false}]},{"StartTime":68448.0,"Objects":[{"StartTime":68448.0,"Position":192.0,"HyperDash":false}]},{"StartTime":68607.0,"Objects":[{"StartTime":68607.0,"Position":328.0,"HyperDash":true}]},{"StartTime":68765.0,"Objects":[{"StartTime":68765.0,"Position":96.0,"HyperDash":false}]},{"StartTime":68924.0,"Objects":[{"StartTime":68924.0,"Position":232.0,"HyperDash":true}]},{"StartTime":69083.0,"Objects":[{"StartTime":69083.0,"Position":472.0,"HyperDash":false},{"StartTime":69144.0,"Position":478.0,"HyperDash":false},{"StartTime":69241.0,"Position":472.0,"HyperDash":false}]},{"StartTime":69400.0,"Objects":[{"StartTime":69400.0,"Position":368.0,"HyperDash":true}]},{"StartTime":69559.0,"Objects":[{"StartTime":69559.0,"Position":152.0,"HyperDash":false}]},{"StartTime":69718.0,"Objects":[{"StartTime":69718.0,"Position":288.0,"HyperDash":false}]},{"StartTime":69877.0,"Objects":[{"StartTime":69877.0,"Position":152.0,"HyperDash":true}]},{"StartTime":70035.0,"Objects":[{"StartTime":70035.0,"Position":384.0,"HyperDash":false}]},{"StartTime":70194.0,"Objects":[{"StartTime":70194.0,"Position":248.0,"HyperDash":false},{"StartTime":70255.0,"Position":261.0,"HyperDash":false},{"StartTime":70352.0,"Position":248.0,"HyperDash":false}]},{"StartTime":70511.0,"Objects":[{"StartTime":70511.0,"Position":384.0,"HyperDash":false}]},{"StartTime":70670.0,"Objects":[{"StartTime":70670.0,"Position":248.0,"HyperDash":false},{"StartTime":70749.0,"Position":194.869125,"HyperDash":false},{"StartTime":70828.0,"Position":192.525131,"HyperDash":false},{"StartTime":70908.0,"Position":222.225082,"HyperDash":true}]},{"StartTime":70988.0,"Objects":[{"StartTime":70988.0,"Position":416.0,"HyperDash":false},{"StartTime":71049.0,"Position":426.0,"HyperDash":false},{"StartTime":71146.0,"Position":416.0,"HyperDash":false}]},{"StartTime":71226.0,"Objects":[{"StartTime":71226.0,"Position":352.0,"HyperDash":true}]},{"StartTime":71305.0,"Objects":[{"StartTime":71305.0,"Position":168.0,"HyperDash":false},{"StartTime":71384.0,"Position":120.5,"HyperDash":true}]},{"StartTime":71464.0,"Objects":[{"StartTime":71464.0,"Position":312.0,"HyperDash":false},{"StartTime":71543.0,"Position":359.5,"HyperDash":true}]},{"StartTime":71623.0,"Objects":[{"StartTime":71623.0,"Position":168.0,"HyperDash":false},{"StartTime":71684.0,"Position":140.322784,"HyperDash":false},{"StartTime":71781.0,"Position":73.0,"HyperDash":true}]},{"StartTime":71940.0,"Objects":[{"StartTime":71940.0,"Position":312.0,"HyperDash":false}]},{"StartTime":72099.0,"Objects":[{"StartTime":72099.0,"Position":168.0,"HyperDash":false},{"StartTime":72160.0,"Position":138.322784,"HyperDash":false},{"StartTime":72257.0,"Position":73.0,"HyperDash":true}]},{"StartTime":72416.0,"Objects":[{"StartTime":72416.0,"Position":312.0,"HyperDash":false},{"StartTime":72477.0,"Position":310.0,"HyperDash":false},{"StartTime":72574.0,"Position":312.0,"HyperDash":false}]},{"StartTime":72734.0,"Objects":[{"StartTime":72734.0,"Position":176.0,"HyperDash":true}]},{"StartTime":72892.0,"Objects":[{"StartTime":72892.0,"Position":416.0,"HyperDash":false}]},{"StartTime":73051.0,"Objects":[{"StartTime":73051.0,"Position":280.0,"HyperDash":false},{"StartTime":73112.0,"Position":286.0,"HyperDash":false},{"StartTime":73209.0,"Position":280.0,"HyperDash":false}]},{"StartTime":73369.0,"Objects":[{"StartTime":73369.0,"Position":416.0,"HyperDash":true}]},{"StartTime":73527.0,"Objects":[{"StartTime":73527.0,"Position":176.0,"HyperDash":false},{"StartTime":73606.0,"Position":130.644318,"HyperDash":false},{"StartTime":73685.0,"Position":130.674316,"HyperDash":false},{"StartTime":73765.0,"Position":163.163345,"HyperDash":true}]},{"StartTime":73845.0,"Objects":[{"StartTime":73845.0,"Position":352.0,"HyperDash":false},{"StartTime":73906.0,"Position":371.0,"HyperDash":false},{"StartTime":74003.0,"Position":352.0,"HyperDash":true}]},{"StartTime":74162.0,"Objects":[{"StartTime":74162.0,"Position":104.0,"HyperDash":false}]},{"StartTime":74321.0,"Objects":[{"StartTime":74321.0,"Position":240.0,"HyperDash":false},{"StartTime":74382.0,"Position":235.0,"HyperDash":false},{"StartTime":74479.0,"Position":240.0,"HyperDash":false}]},{"StartTime":74638.0,"Objects":[{"StartTime":74638.0,"Position":104.0,"HyperDash":true}]},{"StartTime":74797.0,"Objects":[{"StartTime":74797.0,"Position":344.0,"HyperDash":false}]},{"StartTime":74956.0,"Objects":[{"StartTime":74956.0,"Position":208.0,"HyperDash":false}]},{"StartTime":75115.0,"Objects":[{"StartTime":75115.0,"Position":344.0,"HyperDash":true}]},{"StartTime":75273.0,"Objects":[{"StartTime":75273.0,"Position":104.0,"HyperDash":false},{"StartTime":75334.0,"Position":104.0,"HyperDash":false},{"StartTime":75431.0,"Position":104.0,"HyperDash":false}]},{"StartTime":75591.0,"Objects":[{"StartTime":75591.0,"Position":240.0,"HyperDash":true}]},{"StartTime":75750.0,"Objects":[{"StartTime":75750.0,"Position":16.0,"HyperDash":false}]},{"StartTime":75908.0,"Objects":[{"StartTime":75908.0,"Position":152.0,"HyperDash":false}]},{"StartTime":76067.0,"Objects":[{"StartTime":76067.0,"Position":16.0,"HyperDash":false},{"StartTime":76128.0,"Position":31.0,"HyperDash":false},{"StartTime":76225.0,"Position":16.0,"HyperDash":true}]},{"StartTime":76385.0,"Objects":[{"StartTime":76385.0,"Position":256.0,"HyperDash":false},{"StartTime":76446.0,"Position":276.677216,"HyperDash":false},{"StartTime":76543.0,"Position":351.0,"HyperDash":true}]},{"StartTime":76702.0,"Objects":[{"StartTime":76702.0,"Position":112.0,"HyperDash":false}]},{"StartTime":76861.0,"Objects":[{"StartTime":76861.0,"Position":248.0,"HyperDash":false}]},{"StartTime":77019.0,"Objects":[{"StartTime":77019.0,"Position":112.0,"HyperDash":false},{"StartTime":77080.0,"Position":129.0,"HyperDash":false},{"StartTime":77177.0,"Position":112.0,"HyperDash":false}]},{"StartTime":77258.0,"Objects":[{"StartTime":77258.0,"Position":176.0,"HyperDash":true}]},{"StartTime":77337.0,"Objects":[{"StartTime":77337.0,"Position":368.0,"HyperDash":false},{"StartTime":77398.0,"Position":371.0,"HyperDash":false},{"StartTime":77495.0,"Position":368.0,"HyperDash":false}]},{"StartTime":77654.0,"Objects":[{"StartTime":77654.0,"Position":232.0,"HyperDash":false}]},{"StartTime":77813.0,"Objects":[{"StartTime":77813.0,"Position":368.0,"HyperDash":true}]},{"StartTime":77972.0,"Objects":[{"StartTime":77972.0,"Position":80.0,"HyperDash":false}]},{"StartTime":79242.0,"Objects":[{"StartTime":79242.0,"Position":64.0,"HyperDash":false},{"StartTime":79303.0,"Position":60.0,"HyperDash":false},{"StartTime":79400.0,"Position":64.0,"HyperDash":true}]},{"StartTime":79559.0,"Objects":[{"StartTime":79559.0,"Position":296.0,"HyperDash":false}]},{"StartTime":79718.0,"Objects":[{"StartTime":79718.0,"Position":160.0,"HyperDash":false}]},{"StartTime":79876.0,"Objects":[{"StartTime":79876.0,"Position":296.0,"HyperDash":false},{"StartTime":79937.0,"Position":304.0,"HyperDash":false},{"StartTime":80034.0,"Position":296.0,"HyperDash":true}]},{"StartTime":80194.0,"Objects":[{"StartTime":80194.0,"Position":64.0,"HyperDash":true}]},{"StartTime":80353.0,"Objects":[{"StartTime":80353.0,"Position":296.0,"HyperDash":false},{"StartTime":80432.0,"Position":340.5878,"HyperDash":false},{"StartTime":80511.0,"Position":367.266571,"HyperDash":false},{"StartTime":80572.0,"Position":349.239929,"HyperDash":false},{"StartTime":80670.0,"Position":312.985657,"HyperDash":false}]},{"StartTime":80749.0,"Objects":[{"StartTime":80749.0,"Position":256.0,"HyperDash":true}]},{"StartTime":80829.0,"Objects":[{"StartTime":80829.0,"Position":64.0,"HyperDash":false}]},{"StartTime":80988.0,"Objects":[{"StartTime":80988.0,"Position":200.0,"HyperDash":false}]},{"StartTime":81146.0,"Objects":[{"StartTime":81146.0,"Position":64.0,"HyperDash":false},{"StartTime":81207.0,"Position":48.0,"HyperDash":false},{"StartTime":81304.0,"Position":64.0,"HyperDash":true}]},{"StartTime":81464.0,"Objects":[{"StartTime":81464.0,"Position":296.0,"HyperDash":false},{"StartTime":81525.0,"Position":325.677216,"HyperDash":false},{"StartTime":81622.0,"Position":391.0,"HyperDash":true}]},{"StartTime":81781.0,"Objects":[{"StartTime":81781.0,"Position":152.0,"HyperDash":false},{"StartTime":81842.0,"Position":97.3227844,"HyperDash":false},{"StartTime":81939.0,"Position":57.0,"HyperDash":true}]},{"StartTime":82099.0,"Objects":[{"StartTime":82099.0,"Position":296.0,"HyperDash":false}]},{"StartTime":82257.0,"Objects":[{"StartTime":82257.0,"Position":160.0,"HyperDash":false}]},{"StartTime":82416.0,"Objects":[{"StartTime":82416.0,"Position":296.0,"HyperDash":false},{"StartTime":82477.0,"Position":292.0,"HyperDash":false},{"StartTime":82574.0,"Position":296.0,"HyperDash":true}]},{"StartTime":82734.0,"Objects":[{"StartTime":82734.0,"Position":48.0,"HyperDash":true}]},{"StartTime":82892.0,"Objects":[{"StartTime":82892.0,"Position":296.0,"HyperDash":false},{"StartTime":82971.0,"Position":253.649841,"HyperDash":false},{"StartTime":83050.0,"Position":201.299683,"HyperDash":false},{"StartTime":83111.0,"Position":162.738174,"HyperDash":false},{"StartTime":83209.0,"Position":106.0,"HyperDash":false}]},{"StartTime":83289.0,"Objects":[{"StartTime":83289.0,"Position":160.0,"HyperDash":true}]},{"StartTime":83368.0,"Objects":[{"StartTime":83368.0,"Position":352.0,"HyperDash":false}]},{"StartTime":83527.0,"Objects":[{"StartTime":83527.0,"Position":216.0,"HyperDash":false}]},{"StartTime":83686.0,"Objects":[{"StartTime":83686.0,"Position":352.0,"HyperDash":false},{"StartTime":83747.0,"Position":368.0,"HyperDash":false},{"StartTime":83844.0,"Position":352.0,"HyperDash":true}]},{"StartTime":84003.0,"Objects":[{"StartTime":84003.0,"Position":120.0,"HyperDash":false},{"StartTime":84064.0,"Position":80.3227844,"HyperDash":false},{"StartTime":84161.0,"Position":25.0,"HyperDash":true}]},{"StartTime":84321.0,"Objects":[{"StartTime":84321.0,"Position":264.0,"HyperDash":false}]},{"StartTime":84480.0,"Objects":[{"StartTime":84480.0,"Position":128.0,"HyperDash":true}]},{"StartTime":84638.0,"Objects":[{"StartTime":84638.0,"Position":368.0,"HyperDash":false}]},{"StartTime":84797.0,"Objects":[{"StartTime":84797.0,"Position":464.0,"HyperDash":false}]},{"StartTime":84956.0,"Objects":[{"StartTime":84956.0,"Position":464.0,"HyperDash":false}]},{"StartTime":85115.0,"Objects":[{"StartTime":85115.0,"Position":368.0,"HyperDash":false}]},{"StartTime":85273.0,"Objects":[{"StartTime":85273.0,"Position":232.0,"HyperDash":true}]},{"StartTime":85432.0,"Objects":[{"StartTime":85432.0,"Position":472.0,"HyperDash":false},{"StartTime":85493.0,"Position":486.0,"HyperDash":false},{"StartTime":85590.0,"Position":472.0,"HyperDash":true}]},{"StartTime":85750.0,"Objects":[{"StartTime":85750.0,"Position":232.0,"HyperDash":false},{"StartTime":85811.0,"Position":219.0,"HyperDash":false},{"StartTime":85908.0,"Position":232.0,"HyperDash":false}]},{"StartTime":86067.0,"Objects":[{"StartTime":86067.0,"Position":368.0,"HyperDash":false}]},{"StartTime":86226.0,"Objects":[{"StartTime":86226.0,"Position":232.0,"HyperDash":false},{"StartTime":86287.0,"Position":194.322784,"HyperDash":false},{"StartTime":86384.0,"Position":137.0,"HyperDash":false}]},{"StartTime":86543.0,"Objects":[{"StartTime":86543.0,"Position":272.0,"HyperDash":false},{"StartTime":86604.0,"Position":296.677216,"HyperDash":false},{"StartTime":86701.0,"Position":367.0,"HyperDash":true}]},{"StartTime":86861.0,"Objects":[{"StartTime":86861.0,"Position":128.0,"HyperDash":false}]},{"StartTime":87019.0,"Objects":[{"StartTime":87019.0,"Position":264.0,"HyperDash":true}]},{"StartTime":87178.0,"Objects":[{"StartTime":87178.0,"Position":24.0,"HyperDash":false}]},{"StartTime":87337.0,"Objects":[{"StartTime":87337.0,"Position":24.0,"HyperDash":false}]},{"StartTime":87496.0,"Objects":[{"StartTime":87496.0,"Position":160.0,"HyperDash":false}]},{"StartTime":87654.0,"Objects":[{"StartTime":87654.0,"Position":24.0,"HyperDash":true}]},{"StartTime":87813.0,"Objects":[{"StartTime":87813.0,"Position":272.0,"HyperDash":true}]},{"StartTime":87972.0,"Objects":[{"StartTime":87972.0,"Position":24.0,"HyperDash":false}]},{"StartTime":88131.0,"Objects":[{"StartTime":88131.0,"Position":295.0,"HyperDash":false},{"StartTime":88210.0,"Position":311.0,"HyperDash":false},{"StartTime":88289.0,"Position":17.0,"HyperDash":false},{"StartTime":88368.0,"Position":467.0,"HyperDash":false},{"StartTime":88448.0,"Position":30.0,"HyperDash":false},{"StartTime":88527.0,"Position":218.0,"HyperDash":false},{"StartTime":88606.0,"Position":26.0,"HyperDash":false},{"StartTime":88686.0,"Position":16.0,"HyperDash":false},{"StartTime":88765.0,"Position":248.0,"HyperDash":false},{"StartTime":88844.0,"Position":100.0,"HyperDash":false},{"StartTime":88924.0,"Position":24.0,"HyperDash":false},{"StartTime":89003.0,"Position":66.0,"HyperDash":false},{"StartTime":89082.0,"Position":97.0,"HyperDash":false},{"StartTime":89162.0,"Position":267.0,"HyperDash":false},{"StartTime":89241.0,"Position":116.0,"HyperDash":false},{"StartTime":89320.0,"Position":451.0,"HyperDash":false},{"StartTime":89400.0,"Position":414.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3152510.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3152510.osu
new file mode 100644
index 0000000000..9d65d5cc19
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3152510.osu
@@ -0,0 +1,468 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4.2
+OverallDifficulty:9.2
+ApproachRate:9.2
+SliderMultiplier:1.9
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+512,317.460317460317,4,2,1,70,1,0
+2972,-100,4,2,1,5,0,0
+3051,-100,4,2,1,70,0,0
+8051,-100,4,2,1,5,0,0
+8131,-100,4,2,1,70,0,0
+10591,-100,4,2,1,5,0,0
+10670,-100,4,2,1,60,0,0
+12019,-100,4,2,1,5,0,0
+12099,-100,4,2,1,60,0,0
+12654,-100,4,2,1,5,0,0
+12734,-100,4,2,1,60,0,0
+14559,-100,4,2,1,5,0,0
+14638,-100,4,2,1,60,0,0
+17734,-100,4,2,1,5,0,0
+17813,-100,4,2,1,60,0,0
+21385,-100,4,2,1,5,0,0
+21464,-100,4,2,1,60,0,0
+22178,-100,4,2,1,5,0,0
+22257,-100,4,2,1,60,0,0
+30988,-100,4,2,1,50,0,0
+40829,-44.4444444444445,4,2,1,80,0,0
+41067,-44.4444444444445,4,2,1,5,0,0
+41146,-100,4,2,1,80,0,1
+41385,-100,4,2,1,5,0,1
+41464,-100,4,2,1,80,0,1
+45908,-44.4444444444445,4,2,1,80,0,1
+46146,-44.4444444444445,4,2,1,5,0,1
+46226,-100,4,2,1,80,0,1
+46464,-100,4,2,1,5,0,1
+46543,-100,4,2,1,80,0,1
+50988,-44.4444444444445,4,2,1,80,0,1
+51226,-44.4444444444445,4,2,1,5,0,1
+51305,-100,4,2,1,80,0,1
+51543,-100,4,2,1,5,0,1
+51622,-100,4,2,1,80,0,1
+56067,-44.4444444444445,4,2,1,80,0,1
+56305,-44.4444444444445,4,2,1,5,0,1
+56385,-100,4,2,1,80,0,1
+56623,-100,4,2,1,5,0,1
+56702,-100,4,2,1,80,0,1
+61464,-100,4,2,1,70,0,0
+63607,-100,4,2,1,5,0,0
+63686,-100,4,2,1,80,0,0
+66305,-100,4,2,1,5,0,0
+66384,-100,4,2,1,80,0,0
+77972,-100,4,2,1,60,0,0
+79242,-100,4,2,1,70,0,0
+84321,-100,4,2,1,60,0,0
+85670,-100,4,2,1,5,0,0
+85750,-100,4,2,1,60,0,0
+85988,-100,4,2,1,5,0,0
+86068,-100,4,2,1,60,0,0
+88131,-100,4,2,1,50,0,0
+88289,-100,4,2,1,45,0,0
+88448,-100,4,2,1,40,0,0
+88607,-100,4,2,1,35,0,0
+88765,-100,4,2,1,30,0,0
+88924,-100,4,2,1,25,0,0
+89083,-100,4,2,1,20,0,0
+89242,-100,4,2,1,15,0,0
+89400,-100,4,2,1,10,0,0
+
+[HitObjects]
+368,312,512,6,0,L|368:200,1,95,6|0,3:2|0:2,0:0:0:0:
+136,152,829,1,8,0:2:0:0:
+272,152,988,1,8,0:2:0:0:
+136,192,1146,2,0,L|136:304,1,95,0|0,3:2|3:2,0:2:0:0:
+368,96,1464,1,8,0:2:0:0:
+136,256,1623,6,0,P|64:208|136:152,1,190,2|0,3:2|3:2,0:2:0:0:
+176,144,2019,1,0,3:2:0:0:
+368,160,2099,1,8,0:2:0:0:
+232,112,2258,1,8,0:2:0:0:
+368,224,2416,2,0,L|368:344,1,95,0|0,3:2|3:2,0:0:0:0:
+136,152,2734,2,0,L|32:152,1,95,8|0,0:2|0:0,0:2:0:0:
+280,176,3051,6,0,L|384:176,1,95,2|0,3:2|3:2,0:2:0:0:
+136,96,3369,1,8,0:2:0:0:
+272,96,3527,1,8,0:2:0:0:
+136,160,3686,2,0,L|136:280,1,95,0|0,3:2|3:2,0:0:0:0:
+384,56,4004,1,8,0:2:0:0:
+136,216,4162,6,0,L|344:216,1,190,2|0,3:2|3:2,0:2:0:0:
+272,168,4559,1,0,3:2:0:0:
+80,136,4638,1,8,0:2:0:0:
+216,96,4797,1,8,0:2:0:0:
+80,192,4956,2,0,L|80:304,1,95,0|0,3:2|3:2,0:0:0:0:
+312,144,5273,2,0,L|192:144,1,95,8|0,0:2|0:2,0:2:0:0:
+456,184,5591,6,0,L|456:80,1,95,2|0,3:2|3:2,0:0:0:0:
+216,264,5908,1,8,0:2:0:0:
+352,264,6067,1,8,0:2:0:0:
+216,264,6226,2,0,L|216:168,1,95,0|0,3:2|3:2,0:2:0:0:
+456,144,6543,1,8,0:2:0:0:
+216,184,6702,6,0,P|152:128|216:64,1,190,2|0,3:2|3:2,0:2:0:0:
+264,56,7099,1,0,3:2:0:0:
+456,184,7178,1,8,0:2:0:0:
+320,152,7337,1,8,0:2:0:0:
+456,224,7496,2,0,L|456:320,1,95,0|0,3:2|3:2,0:2:0:0:
+216,192,7813,2,0,L|112:192,1,95,8|0,0:2|0:0,0:2:0:0:
+368,184,8131,6,0,L|368:80,1,95,2|0,3:2|3:2,0:0:0:0:
+128,272,8448,1,8,0:2:0:0:
+264,264,8607,1,8,0:2:0:0:
+128,216,8765,2,0,L|128:120,1,95,0|0,3:2|3:2,0:0:0:0:
+368,136,9083,1,8,0:2:0:0:
+128,272,9242,6,0,L|344:272,1,190,2|0,3:2|3:2,0:2:0:0:
+264,224,9638,1,0,3:2:0:0:
+72,144,9718,1,8,0:2:0:0:
+208,128,9877,1,8,0:2:0:0:
+72,200,10035,2,0,L|72:312,1,95,0|0,3:2|3:2,0:2:0:0:
+312,288,10353,2,0,L|208:288,1,95,8|0,0:2|0:0,0:2:0:0:
+464,192,10670,6,0,L|464:88,1,95,2|0,3:2|0:0,0:2:0:0:
+224,192,10988,2,0,L|224:80,1,95,8|0,0:2|0:0,0:2:0:0:
+360,200,11305,1,0,0:2:0:0:
+224,192,11464,1,0,0:2:0:0:
+464,320,11623,1,8,0:2:0:0:
+328,264,11781,6,0,L|328:168,1,95,2|0,3:2|0:0,0:2:0:0:
+464,232,12099,2,0,L|464:128,1,95,0|8,3:2|0:2,0:2:0:0:
+328,184,12416,2,0,L|432:184,1,95,2|0,0:2|0:0,0:2:0:0:
+288,120,12734,1,0,0:2:0:0:
+424,128,12892,2,0,L|424:16,1,95,8|0,0:2|0:2,0:0:0:0:
+192,192,13210,6,0,L|192:88,1,95,2|0,3:2|0:0,0:2:0:0:
+424,200,13527,2,0,L|424:88,1,95,8|0,0:2|0:2,0:2:0:0:
+288,176,13845,1,0,0:2:0:0:
+424,176,14004,1,0,0:2:0:0:
+184,288,14162,1,8,0:2:0:0:
+320,248,14321,6,0,L|320:136,1,95,2|0,3:2|0:0,0:2:0:0:
+88,176,14638,2,0,L|88:72,1,95,0|8,3:2|0:2,0:0:0:0:
+224,176,14956,1,0,0:2:0:0:
+88,224,15115,2,0,L|88:128,1,95,2|0,0:2|0:0,0:0:0:0:
+328,224,15432,2,0,L|424:224,1,95,8|0,0:2|0:0,0:0:0:0:
+192,184,15750,5,2,3:2:0:0:
+328,168,15908,1,0,0:0:0:0:
+192,240,16067,2,0,L|80:240,1,95,8|0,0:2|0:2,0:2:0:0:
+232,168,16385,1,2,0:2:0:0:
+96,144,16543,1,0,0:2:0:0:
+336,288,16702,1,8,0:2:0:0:
+200,256,16861,6,0,L|200:152,1,95,2|0,3:2|0:2,0:2:0:0:
+440,168,17178,1,0,3:2:0:0:
+304,160,17337,1,8,0:2:0:0:
+408,160,17496,2,0,L|504:160,1,95
+360,192,17813,1,0,0:2:0:0:
+496,144,17972,2,0,L|496:40,1,95,8|0,0:2|0:2,0:0:0:0:
+256,288,18289,6,0,L|128:288,1,95,2|0,3:2|0:0,0:2:0:0:
+392,256,18607,2,0,L|392:152,1,95,8|0,0:2|0:2,0:2:0:0:
+256,224,18924,1,0,0:2:0:0:
+392,224,19083,1,0,0:2:0:0:
+152,288,19242,1,8,0:2:0:0:
+288,224,19400,6,0,L|288:120,1,95,2|0,3:2|0:0,0:2:0:0:
+48,192,19718,2,0,L|48:96,1,95
+168,168,20035,1,0,0:0:0:0:
+48,248,20194,2,0,L|344:248,1,285
+88,320,20829,6,0,L|88:224,1,95,6|0,3:2|0:0,0:2:0:0:
+232,176,21146,2,0,L|232:80,1,95,8|0,0:2|0:0,0:2:0:0:
+88,176,21464,2,0,L|200:176,1,95,0|0,0:2|3:2,0:0:0:0:
+320,168,21781,1,8,0:2:0:0:
+184,312,21940,6,0,L|184:200,1,95,2|0,3:2|0:0,0:2:0:0:
+320,224,22258,2,0,L|320:128,1,95,0|8,3:2|0:2,0:2:0:0:
+184,336,22575,2,0,L|184:208,1,95,2|0,3:2|0:0,0:2:0:0:
+320,280,22892,1,0,3:2:0:0:
+184,264,23051,2,0,L|80:264,1,95,8|0,0:2|0:2,0:2:0:0:
+328,216,23369,6,0,L|488:216,1,142.5,6|2,3:2|3:2,0:0:0:0:
+416,160,23686,1,0,0:0:0:0:
+280,120,23845,2,0,L|184:120,2,95,2|2|0,3:2|0:2|3:2,0:0:0:0:
+424,232,24321,1,8,0:2:0:0:
+288,176,24480,6,0,L|480:176,1,190,2|2,3:2|3:2,0:2:0:0:
+360,120,24956,1,8,0:2:0:0:
+224,280,25115,1,0,3:2:0:0:
+360,224,25273,2,0,L|360:176,1,47.5,0|0,3:2|3:0,3:0:0:0:
+288,152,25432,2,0,L|288:88,1,47.5,0|0,3:0|3:0,3:0:0:0:
+448,176,25591,2,0,L|448:56,1,95,8|0,0:2|0:0,0:0:0:0:
+208,312,25908,6,0,L|96:312,1,95,2|0,3:2|3:2,0:2:0:0:
+248,240,26226,2,0,L|352:240,1,95,8|0,0:2|3:2,0:2:0:0:
+208,184,26543,2,0,L|208:80,1,95,0|0,0:2|3:2,0:0:0:0:
+344,80,26861,1,8,0:2:0:0:
+208,240,27019,6,0,L|104:240,1,95,2|0,3:2|0:2,0:2:0:0:
+248,176,27337,2,0,L|352:176,1,95,0|8,3:2|0:2,0:2:0:0:
+208,80,27654,1,0,0:2:0:0:
+344,248,27813,1,0,3:2:0:0:
+208,152,27972,1,0,3:2:0:0:
+344,152,28131,2,0,L|456:152,1,95,8|0,0:2|0:2,0:2:0:0:
+208,216,28448,6,0,L|48:216,1,142.5,6|2,3:2|3:2,0:2:0:0:
+120,160,28765,1,0,0:0:0:0:
+256,120,28924,2,0,L|352:120,2,95,2|0|0,3:2|0:2|3:2,0:0:0:0:
+112,232,29400,1,8,0:2:0:0:
+248,176,29559,6,0,L|56:176,1,190,2|2,3:2|3:2,0:2:0:0:
+192,128,30035,1,0,0:0:0:0:
+328,184,30194,1,2,3:2:0:0:
+192,200,30353,2,0,L|192:104,1,95,8|0,0:2|3:2,0:0:0:0:
+432,184,30670,2,0,L|368:184,1,47.5,8|8,0:2|0:2,0:0:0:0:
+192,256,30829,2,0,L|136:256,1,47.5,8|8,0:2|0:2,0:0:0:0:
+336,304,30988,6,0,L|336:192,1,95,2|0,3:2|0:2,0:2:0:0:
+208,176,31305,2,0,L|208:80,1,95,0|0,3:2|0:2,0:2:0:0:
+80,192,31623,2,0,L|80:288,1,95,0|0,3:2|0:2,0:2:0:0:
+208,224,31940,1,0,3:2:0:0:
+80,192,32099,6,0,L|184:192,1,95,0|2,0:2|3:2,0:0:0:0:
+296,176,32416,2,0,L|296:56,1,95,0|0,0:2|3:2,0:0:0:0:
+176,128,32734,2,0,L|176:24,1,95,0|0,0:2|3:2,0:0:0:0:
+296,224,33051,2,0,L|184:224,2,95,0|0|0,0:2|3:2|0:2,0:0:0:0:
+48,144,33527,5,0,3:2:0:0:
+160,144,33686,1,2,0:2:0:0:
+272,144,33845,1,0,3:2:0:0:
+160,144,34004,1,2,0:2:0:0:
+304,272,34162,2,0,P|376:216|304:168,1,190,0|0,3:2|3:2,0:0:0:0:
+184,160,34638,6,0,L|408:160,1,190,2|2,0:2|0:2,0:2:0:0:
+440,160,35035,1,0,0:0:0:0:
+376,120,35115,1,0,3:2:0:0:
+224,248,35273,1,0,0:2:0:0:
+368,184,35432,2,0,P|440:136|368:88,1,190,0|0,3:2|3:2,0:2:0:0:
+288,80,35908,1,0,0:2:0:0:
+72,328,36067,5,4,3:2:0:0:
+16,296,36146,1,0,3:0:0:0:
+16,240,36226,1,0,3:0:0:0:
+72,208,36305,1,0,3:0:0:0:
+264,168,36385,1,8,3:0:0:0:
+328,168,36464,1,0,3:0:0:0:
+264,168,36543,1,0,3:0:0:0:
+200,168,36623,1,0,3:0:0:0:
+392,272,36702,6,0,L|440:272,1,47.5,8|0,3:0|3:0,0:0:0:0:
+232,280,36861,2,0,L|224:216,1,47.5,0|0,3:0|3:0,0:0:0:0:
+304,208,37019,2,0,L|320:144,1,47.5,0|0,3:0|3:0,0:0:0:0:
+104,96,37178,2,0,L|40:96,1,47.5,0|0,3:0|3:0,0:0:0:0:
+264,344,37337,6,0,L|280:296,1,47.5,8|0,3:0|3:0,0:0:0:0:
+208,264,37496,2,0,L|200:208,1,47.5,0|0,3:0|3:0,0:0:0:0:
+392,192,37654,1,8,3:0:0:0:
+448,152,37734,1,0,3:0:0:0:
+448,96,37813,1,0,3:0:0:0:
+392,64,37892,1,0,3:0:0:0:
+192,192,37972,6,0,L|272:192,1,47.5,8|0,3:0|3:0,0:0:0:0:
+410,263,38131,2,0,L|458:263,1,47.5,0|0,3:0|3:0,0:0:0:0:
+264,160,38289,2,0,L|208:160,1,47.5,8|0,0:0|3:0,0:0:0:0:
+448,208,38448,2,0,L|496:208,1,47.5,0|0,3:0|3:0,0:0:0:0:
+296,224,38607,5,0,3:2:0:0:
+440,152,38924,1,0,3:2:0:0:
+296,160,39242,1,0,3:2:0:0:
+152,128,39559,1,0,3:2:0:0:
+352,264,39877,6,0,L|256:256,5,95
+432,192,40829,6,0,L|184:192,1,213.750008153916,2|0,0:2|0:0,0:2:0:0:
+440,264,41146,6,0,P|488:216|440:168,1,142.5,6|0,3:2|0:0,0:2:0:0:
+256,168,41464,1,8,0:2:0:0:
+400,128,41623,1,8,0:2:0:0:
+168,248,41781,2,0,L|168:152,1,95,0|0,3:2|3:2,0:0:0:0:
+400,192,42099,1,8,0:2:0:0:
+256,136,42258,6,0,L|256:32,1,95,2|0,3:2|0:2,0:2:0:0:
+400,248,42575,1,0,3:2:0:0:
+256,200,42734,1,8,0:2:0:0:
+488,192,42892,2,0,L|488:96,1,95,8|0,0:2|3:2,0:2:0:0:
+256,136,43210,1,0,3:2:0:0:
+368,136,43369,1,8,0:2:0:0:
+480,136,43527,1,0,0:2:0:0:
+256,136,43686,6,0,L|136:136,1,95,2|0,3:2|3:2,0:0:0:0:
+392,296,44004,1,8,0:2:0:0:
+248,248,44162,2,0,L|248:136,1,95,8|0,0:2|3:2,0:0:0:0:
+480,184,44480,2,0,L|480:80,1,95,0|8,3:2|0:2,0:0:0:0:
+248,248,44797,6,0,L|352:248,1,95,2|0,3:2|0:0,0:2:0:0:
+104,176,45115,2,0,L|104:104,1,47.5,0|0,3:2|3:2,0:0:0:0:
+296,176,45273,1,8,0:2:0:0:
+160,112,45432,1,8,0:2:0:0:
+392,200,45591,2,0,L|392:88,1,95,0|0,3:2|3:2,0:0:0:0:
+160,176,45908,2,0,L|376:176,1,213.750008153916,10|0,0:2|0:0,0:2:0:0:
+136,288,46226,6,0,P|80:232|136:192,1,142.5,6|0,3:2|0:0,0:2:0:0:
+304,192,46543,1,8,0:2:0:0:
+160,128,46702,1,8,0:2:0:0:
+400,296,46861,2,0,L|400:192,1,95,0|0,3:2|3:2,0:0:0:0:
+160,72,47178,1,8,0:2:0:0:
+296,72,47337,6,0,L|408:72,1,95,2|0,3:2|0:2,0:2:0:0:
+248,168,47654,1,0,3:2:0:0:
+304,152,47734,1,0,3:2:0:0:
+360,128,47813,1,8,0:2:0:0:
+136,224,47972,2,0,L|136:128,1,95,8|0,0:2|3:2,0:0:0:0:
+376,64,48289,1,0,3:2:0:0:
+264,64,48448,1,8,0:2:0:0:
+152,64,48607,1,0,0:2:0:0:
+392,168,48765,6,0,L|392:72,1,95,2|0,3:2|3:2,0:2:0:0:
+160,320,49083,1,8,0:2:0:0:
+304,272,49241,2,0,L|304:160,1,95,8|0,0:2|3:2,0:2:0:0:
+64,208,49559,2,0,L|64:112,1,95,0|8,3:2|0:2,0:0:0:0:
+304,272,49877,6,0,L|200:272,1,95,2|0,3:2|0:0,0:2:0:0:
+448,192,50194,2,0,L|448:80,1,95,2|8,3:2|0:2,0:2:0:0:
+208,96,50511,2,0,L|144:96,1,47.5,8|0,0:2|0:0,0:0:0:0:
+352,96,50670,2,0,L|352:200,1,95,0|0,3:2|3:2,0:2:0:0:
+128,160,50988,2,0,L|360:160,1,213.750008153916,2|0,3:2|0:0,0:2:0:0:
+104,288,51305,6,0,P|48:240|104:192,1,142.5,6|0,0:2|0:0,0:2:0:0:
+272,176,51623,1,8,0:2:0:0:
+128,120,51781,1,8,0:2:0:0:
+368,280,51940,2,0,L|368:176,1,95,0|0,3:2|3:2,0:0:0:0:
+128,184,52258,1,8,0:2:0:0:
+272,184,52416,6,0,L|272:80,1,95,2|0,3:2|0:2,0:2:0:0:
+128,120,52734,1,0,3:2:0:0:
+184,112,52813,1,0,3:2:0:0:
+240,96,52892,1,8,0:2:0:0:
+16,312,53051,2,0,L|16:208,1,95,8|0,0:2|3:2,0:0:0:0:
+264,168,53369,1,0,3:2:0:0:
+152,168,53527,1,8,0:2:0:0:
+40,168,53686,1,0,0:2:0:0:
+280,256,53845,6,0,L|280:136,1,95,2|0,3:2|3:2,0:0:0:0:
+56,240,54162,1,8,0:2:0:0:
+184,232,54321,2,0,L|304:232,1,95,8|0,0:2|3:2,0:0:0:0:
+32,320,54638,2,0,L|32:224,1,95,0|8,3:2|0:2,0:0:0:0:
+264,248,54956,6,0,L|368:248,1,95,2|0,3:2|0:0,0:2:0:0:
+120,176,55274,2,0,L|120:104,1,47.5,2|0,3:2|0:0,0:0:0:0:
+312,176,55432,1,8,0:2:0:0:
+176,112,55591,1,8,0:2:0:0:
+408,200,55750,2,0,L|408:88,1,95,0|0,0:0|3:2,0:0:0:0:
+136,288,56067,2,0,L|352:288,1,213.750008153916,10|0,0:2|0:0,0:2:0:0:
+112,224,56385,6,0,P|64:176|112:128,1,142.5,6|0,3:2|0:0,0:2:0:0:
+296,192,56702,1,8,0:2:0:0:
+152,128,56861,1,8,0:2:0:0:
+392,296,57019,2,0,L|392:192,1,95,0|0,3:2|3:2,0:2:0:0:
+152,184,57337,1,8,0:2:0:0:
+296,192,57496,6,0,L|416:192,1,95,2|0,3:2|0:2,0:2:0:0:
+248,120,57813,1,0,3:2:0:0:
+392,80,57972,1,8,0:2:0:0:
+152,288,58131,2,0,L|152:192,1,95,8|0,0:2|3:2,0:2:0:0:
+392,184,58448,1,0,3:2:0:0:
+280,192,58607,1,8,0:2:0:0:
+168,192,58765,1,0,0:2:0:0:
+392,272,58924,5,2,3:2:0:0:
+248,224,59083,2,0,L|248:120,1,95,0|8,3:2|0:2,0:0:0:0:
+488,192,59400,2,0,L|488:96,1,95,10|0,0:2|3:2,0:2:0:0:
+248,160,59718,2,0,L|248:56,1,95,2|8,3:2|0:2,0:2:0:0:
+488,256,60035,6,0,L|280:256,1,190,2|2,3:2|3:2,0:0:0:0:
+448,336,60511,2,0,L|448:232,1,95,2|0,0:2|3:2,0:0:0:0:
+200,200,60829,1,8,0:2:0:0:
+448,336,60988,2,0,L|504:336,1,47.5,8|8,0:2|0:2,0:0:0:0:
+304,208,61146,2,0,L|224:208,1,47.5,8|8,0:2|0:2,0:0:0:0:
+448,280,61305,2,0,L|496:280,1,47.5,8|8,0:2|0:2,0:0:0:0:
+304,288,61464,6,0,P|248:232|304:192,1,142.5,6|0,3:2|0:0,0:2:0:0:
+448,224,61781,2,0,P|496:176|448:128,1,142.5,8|0,0:2|0:0,0:2:0:0:
+272,184,62099,1,0,3:2:0:0:
+408,128,62258,1,0,3:2:0:0:
+168,200,62416,1,8,0:2:0:0:
+312,152,62575,6,0,L|312:48,1,95,2|0,3:2|3:2,0:2:0:0:
+72,144,62892,2,0,L|72:32,1,95,0|8,0:2|0:2,0:2:0:0:
+312,304,63210,1,0,0:2:0:0:
+176,232,63369,2,0,L|176:128,1,95,0|0,3:2|0:0,0:2:0:0:
+312,232,63686,1,8,0:2:0:0:
+176,232,63845,1,0,0:2:0:0:
+408,232,64004,6,0,P|464:184|408:136,1,142.5,2|0,3:2|0:0,0:2:0:0:
+240,120,64321,1,8,0:2:0:0:
+376,64,64480,1,0,0:2:0:0:
+136,272,64638,2,0,L|136:168,1,95,0|0,3:2|0:2,0:0:0:0:
+272,288,64956,1,8,0:2:0:0:
+32,192,65115,6,0,L|32:88,1,95,2|0,3:2|3:2,0:2:0:0:
+272,136,65432,2,0,L|368:136,1,95,0|8,0:2|0:2,0:2:0:0:
+128,240,65750,1,0,0:2:0:0:
+264,192,65908,1,0,3:2:0:0:
+128,184,66067,2,0,L|128:80,1,95,8|0,0:2|0:0,0:2:0:0:
+264,128,66385,1,10,0:2:0:0:
+32,144,66543,6,0,L|32:40,1,95,0|0,0:0|0:2,0:0:0:0:
+280,240,66861,1,8,0:2:0:0:
+144,240,67019,1,0,0:2:0:0:
+280,240,67178,2,0,L|384:240,1,95,0|0,3:2|0:2,0:0:0:0:
+136,104,67496,1,8,0:2:0:0:
+272,136,67654,6,0,P|320:80|272:32,1,142.5,2|0,3:2|0:0,0:2:0:0:
+96,80,67972,2,0,L|96:176,1,95,0|8,0:2|0:2,0:2:0:0:
+328,232,68289,1,0,0:2:0:0:
+192,224,68448,1,0,3:2:0:0:
+328,232,68607,1,0,0:2:0:0:
+96,152,68765,1,8,0:2:0:0:
+232,136,68924,1,2,3:2:0:0:
+472,296,69083,6,0,L|472:176,1,95,0|0,3:2|0:2,0:0:0:0:
+368,168,69400,1,8,0:2:0:0:
+152,192,69559,1,0,0:2:0:0:
+288,160,69718,1,0,3:2:0:0:
+152,144,69877,1,0,0:2:0:0:
+384,184,70035,1,8,0:2:0:0:
+248,168,70194,6,0,L|248:56,1,95,2|0,3:2|0:0,0:2:0:0:
+384,120,70511,1,0,0:2:0:0:
+248,112,70670,2,0,P|192:56|248:16,1,142.5,8|0,0:2|0:0,0:2:0:0:
+416,128,70988,2,0,L|416:24,1,95,0|8,3:2|0:2,0:0:0:0:
+352,128,71226,1,8,0:2:0:0:
+168,192,71305,2,0,L|96:192,1,47.5,8|8,0:2|0:2,0:0:0:0:
+312,208,71464,2,0,L|384:208,1,47.5,8|8,0:2|0:2,0:0:0:0:
+168,272,71623,6,0,L|64:272,1,95,6|0,3:2|0:2,0:2:0:0:
+312,312,71940,1,8,0:2:0:0:
+168,248,72099,2,0,L|56:248,1,95,0|0,3:2|3:2,0:2:0:0:
+312,200,72416,2,0,L|312:88,1,95,0|8,0:2|0:2,0:2:0:0:
+176,80,72734,1,2,3:2:0:0:
+416,264,72892,5,0,3:2:0:0:
+280,192,73051,2,0,L|280:80,1,95,0|8,0:2|0:2,0:0:0:0:
+416,200,73369,1,0,0:2:0:0:
+176,184,73527,2,0,P|128:128|176:80,1,142.5,0|0,3:2|0:0,0:2:0:0:
+352,192,73845,2,0,L|352:88,1,95,8|2,0:2|3:2,0:0:0:0:
+104,192,74162,5,0,3:2:0:0:
+240,144,74321,2,0,L|240:48,1,95,0|8,0:2|0:2,0:2:0:0:
+104,104,74638,1,0,0:2:0:0:
+344,304,74797,1,0,3:2:0:0:
+208,256,74956,1,0,0:2:0:0:
+344,240,75115,1,8,0:2:0:0:
+104,184,75273,6,0,L|104:80,1,95,2|0,3:2|3:2,0:2:0:0:
+240,72,75591,1,0,0:2:0:0:
+16,312,75750,1,8,0:2:0:0:
+152,320,75908,1,0,0:2:0:0:
+16,264,76067,2,0,L|16:168,1,95,0|0,3:2|0:2,0:0:0:0:
+256,192,76385,2,0,L|376:192,1,95,10|0,0:2|0:0,0:2:0:0:
+112,128,76702,5,0,3:2:0:0:
+248,120,76861,1,8,0:2:0:0:
+112,176,77019,2,0,L|112:280,1,95,0|0,0:2|3:2,0:0:0:0:
+176,176,77258,1,0,3:2:0:0:
+368,176,77337,2,0,L|368:80,1,95,8|0,0:2|0:2,0:2:0:0:
+232,152,77654,1,0,0:2:0:0:
+368,160,77813,1,0,0:2:0:0:
+80,96,77972,5,10,0:2:0:0:
+64,296,79242,6,0,L|64:184,1,95,6|0,3:2|3:2,0:0:0:0:
+296,136,79559,1,8,0:2:0:0:
+160,136,79718,1,8,0:2:0:0:
+296,176,79876,2,0,L|296:288,1,95,0|0,3:2|3:2,0:2:0:0:
+64,80,80194,1,8,0:2:0:0:
+296,240,80353,6,0,P|368:192|296:136,1,190,2|0,3:2|3:2,0:2:0:0:
+256,128,80749,1,0,3:2:0:0:
+64,144,80829,1,8,0:2:0:0:
+200,96,80988,1,8,0:2:0:0:
+64,208,81146,2,0,L|64:328,1,95,0|0,3:2|3:2,0:2:0:0:
+296,136,81464,2,0,L|400:136,1,95,8|0,0:2|0:2,0:2:0:0:
+152,160,81781,6,0,L|48:160,1,95,2|0,3:2|3:2,0:2:0:0:
+296,80,82099,1,8,0:2:0:0:
+160,80,82257,1,8,0:2:0:0:
+296,144,82416,2,0,L|296:264,1,95,0|0,3:2|3:2,0:0:0:0:
+48,40,82734,1,8,0:2:0:0:
+296,200,82892,6,0,L|88:200,1,190,2|0,3:2|3:2,0:2:0:0:
+160,152,83289,1,0,3:2:0:0:
+352,120,83368,1,8,0:2:0:0:
+216,80,83527,1,8,0:2:0:0:
+352,176,83686,2,0,L|352:288,1,95,0|0,3:2|3:2,0:2:0:0:
+120,128,84003,2,0,L|16:128,1,95,8|0,0:2|0:2,0:0:0:0:
+264,232,84321,5,10,0:2:0:0:
+128,152,84480,1,8,0:2:0:0:
+368,320,84638,1,0,3:2:0:0:
+464,272,84797,1,8,0:2:0:0:
+464,184,84956,1,0,3:2:0:0:
+368,136,85115,1,0,0:2:0:0:
+232,104,85273,1,8,0:2:0:0:
+472,344,85432,6,0,L|472:240,1,95,10|0,0:2|0:0,0:2:0:0:
+232,160,85750,2,0,L|232:40,1,95,10|0,0:2|0:0,0:2:0:0:
+368,144,86067,1,8,3:2:0:0:
+232,208,86226,2,0,L|136:208,1,95,0|0,3:2|0:2,0:2:0:0:
+272,64,86543,2,0,L|400:64,1,95,0|0,3:2|0:2,0:2:0:0:
+128,320,86861,5,10,0:0:0:0:
+264,272,87019,1,8,0:0:0:0:
+24,224,87178,1,2,3:0:0:0:
+24,128,87337,1,2,0:0:0:0:
+160,104,87496,1,8,3:0:0:0:
+24,104,87654,1,0,3:0:0:0:
+272,144,87813,1,8,0:0:0:0:
+24,56,87972,5,8,0:0:0:0:
+256,192,88131,12,0,89400,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3227428-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3227428-expected-conversion.json
new file mode 100644
index 0000000000..bd1c6d658f
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3227428-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":22.0,"Objects":[{"StartTime":22.0,"Position":206.0,"HyperDash":false}]},{"StartTime":362.0,"Objects":[{"StartTime":362.0,"Position":137.0,"HyperDash":false},{"StartTime":447.0,"Position":104.571175,"HyperDash":false},{"StartTime":532.0,"Position":91.14235,"HyperDash":false},{"StartTime":617.0,"Position":81.71353,"HyperDash":false},{"StartTime":702.0,"Position":67.18218,"HyperDash":false},{"StartTime":778.0,"Position":97.66308,"HyperDash":false},{"StartTime":854.0,"Position":115.24649,"HyperDash":false},{"StartTime":930.0,"Position":114.82991,"HyperDash":false},{"StartTime":1043.0,"Position":137.0,"HyperDash":false}]},{"StartTime":1385.0,"Objects":[{"StartTime":1385.0,"Position":220.0,"HyperDash":false},{"StartTime":1465.0,"Position":233.326752,"HyperDash":false},{"StartTime":1546.0,"Position":231.079025,"HyperDash":false},{"StartTime":1626.0,"Position":246.1162,"HyperDash":false},{"StartTime":1707.0,"Position":246.012085,"HyperDash":false},{"StartTime":1788.0,"Position":253.358887,"HyperDash":false},{"StartTime":1868.0,"Position":266.303955,"HyperDash":false},{"StartTime":1949.0,"Position":247.094482,"HyperDash":false},{"StartTime":2066.0,"Position":224.02179,"HyperDash":false}]},{"StartTime":2408.0,"Objects":[{"StartTime":2408.0,"Position":160.0,"HyperDash":false},{"StartTime":2493.0,"Position":133.573441,"HyperDash":false},{"StartTime":2578.0,"Position":130.146881,"HyperDash":false},{"StartTime":2663.0,"Position":88.72033,"HyperDash":false},{"StartTime":2748.0,"Position":90.19126,"HyperDash":false},{"StartTime":2824.0,"Position":96.67014,"HyperDash":false},{"StartTime":2900.0,"Position":139.251526,"HyperDash":false},{"StartTime":2976.0,"Position":153.832932,"HyperDash":false},{"StartTime":3089.0,"Position":160.0,"HyperDash":false}]},{"StartTime":3772.0,"Objects":[{"StartTime":3772.0,"Position":340.0,"HyperDash":false}]},{"StartTime":4112.0,"Objects":[{"StartTime":4112.0,"Position":401.0,"HyperDash":false},{"StartTime":4192.0,"Position":414.4298,"HyperDash":false},{"StartTime":4273.0,"Position":393.865021,"HyperDash":false},{"StartTime":4353.0,"Position":385.29483,"HyperDash":false},{"StartTime":4434.0,"Position":415.730042,"HyperDash":false},{"StartTime":4515.0,"Position":398.165222,"HyperDash":false},{"StartTime":4595.0,"Position":407.595062,"HyperDash":false},{"StartTime":4676.0,"Position":389.030243,"HyperDash":false},{"StartTime":4793.0,"Position":404.658875,"HyperDash":false}]},{"StartTime":5135.0,"Objects":[{"StartTime":5135.0,"Position":343.0,"HyperDash":false},{"StartTime":5211.0,"Position":324.279724,"HyperDash":false},{"StartTime":5287.0,"Position":312.955536,"HyperDash":false},{"StartTime":5363.0,"Position":314.093536,"HyperDash":false},{"StartTime":5475.0,"Position":280.640778,"HyperDash":false}]},{"StartTime":5817.0,"Objects":[{"StartTime":5817.0,"Position":189.0,"HyperDash":false},{"StartTime":5902.0,"Position":156.58606,"HyperDash":false},{"StartTime":5987.0,"Position":135.172119,"HyperDash":false},{"StartTime":6072.0,"Position":120.758179,"HyperDash":false},{"StartTime":6157.0,"Position":119.241791,"HyperDash":false},{"StartTime":6233.0,"Position":147.709473,"HyperDash":false},{"StartTime":6309.0,"Position":167.279587,"HyperDash":false},{"StartTime":6385.0,"Position":164.8497,"HyperDash":false},{"StartTime":6498.0,"Position":189.0,"HyperDash":false}]},{"StartTime":6840.0,"Objects":[{"StartTime":6840.0,"Position":208.0,"HyperDash":false},{"StartTime":6920.0,"Position":217.418747,"HyperDash":false},{"StartTime":7001.0,"Position":240.042725,"HyperDash":false},{"StartTime":7081.0,"Position":276.4615,"HyperDash":false},{"StartTime":7162.0,"Position":268.085449,"HyperDash":false},{"StartTime":7243.0,"Position":295.709442,"HyperDash":false},{"StartTime":7323.0,"Position":320.128174,"HyperDash":false},{"StartTime":7404.0,"Position":340.752167,"HyperDash":false},{"StartTime":7521.0,"Position":347.7646,"HyperDash":false}]},{"StartTime":7862.0,"Objects":[{"StartTime":7862.0,"Position":416.0,"HyperDash":false},{"StartTime":7947.0,"Position":441.4566,"HyperDash":false},{"StartTime":8032.0,"Position":446.637848,"HyperDash":false},{"StartTime":8117.0,"Position":454.495941,"HyperDash":false},{"StartTime":8202.0,"Position":442.012817,"HyperDash":false},{"StartTime":8278.0,"Position":447.07373,"HyperDash":false},{"StartTime":8354.0,"Position":416.0334,"HyperDash":false},{"StartTime":8430.0,"Position":431.9387,"HyperDash":false},{"StartTime":8543.0,"Position":416.0,"HyperDash":false}]},{"StartTime":9226.0,"Objects":[{"StartTime":9226.0,"Position":275.0,"HyperDash":false}]},{"StartTime":9567.0,"Objects":[{"StartTime":9567.0,"Position":208.0,"HyperDash":false},{"StartTime":9652.0,"Position":187.257431,"HyperDash":false},{"StartTime":9737.0,"Position":176.772141,"HyperDash":false},{"StartTime":9822.0,"Position":203.593216,"HyperDash":false},{"StartTime":9907.0,"Position":172.761276,"HyperDash":false},{"StartTime":9992.0,"Position":193.308182,"HyperDash":false},{"StartTime":10077.0,"Position":178.273483,"HyperDash":false},{"StartTime":10162.0,"Position":164.69072,"HyperDash":false},{"StartTime":10248.0,"Position":175.555847,"HyperDash":false},{"StartTime":10328.0,"Position":175.714554,"HyperDash":false},{"StartTime":10409.0,"Position":165.140945,"HyperDash":false},{"StartTime":10490.0,"Position":176.860687,"HyperDash":false},{"StartTime":10571.0,"Position":161.863419,"HyperDash":false},{"StartTime":10651.0,"Position":168.073318,"HyperDash":false},{"StartTime":10732.0,"Position":197.565277,"HyperDash":false},{"StartTime":10813.0,"Position":183.264725,"HyperDash":false},{"StartTime":10930.0,"Position":208.0,"HyperDash":false}]},{"StartTime":11272.0,"Objects":[{"StartTime":11272.0,"Position":272.0,"HyperDash":false},{"StartTime":11348.0,"Position":267.478119,"HyperDash":false},{"StartTime":11424.0,"Position":297.956238,"HyperDash":false},{"StartTime":11500.0,"Position":307.4344,"HyperDash":false},{"StartTime":11612.0,"Position":341.244232,"HyperDash":false}]},{"StartTime":11953.0,"Objects":[{"StartTime":11953.0,"Position":397.0,"HyperDash":false},{"StartTime":12038.0,"Position":422.321472,"HyperDash":false},{"StartTime":12123.0,"Position":429.5693,"HyperDash":false},{"StartTime":12208.0,"Position":465.729126,"HyperDash":false},{"StartTime":12293.0,"Position":465.889526,"HyperDash":false},{"StartTime":12369.0,"Position":433.739624,"HyperDash":false},{"StartTime":12445.0,"Position":440.41095,"HyperDash":false},{"StartTime":12521.0,"Position":439.010223,"HyperDash":false},{"StartTime":12634.0,"Position":397.0,"HyperDash":false}]},{"StartTime":12976.0,"Objects":[{"StartTime":12976.0,"Position":309.0,"HyperDash":false},{"StartTime":13052.0,"Position":315.9078,"HyperDash":false},{"StartTime":13128.0,"Position":313.544037,"HyperDash":false},{"StartTime":13204.0,"Position":305.913849,"HyperDash":false},{"StartTime":13316.0,"Position":300.853455,"HyperDash":false}]},{"StartTime":13658.0,"Objects":[{"StartTime":13658.0,"Position":226.0,"HyperDash":false},{"StartTime":13738.0,"Position":220.477478,"HyperDash":false},{"StartTime":13819.0,"Position":214.759888,"HyperDash":false},{"StartTime":13899.0,"Position":167.911179,"HyperDash":false},{"StartTime":13980.0,"Position":163.303925,"HyperDash":false},{"StartTime":14061.0,"Position":139.940048,"HyperDash":false},{"StartTime":14141.0,"Position":139.7893,"HyperDash":false},{"StartTime":14222.0,"Position":130.218536,"HyperDash":false},{"StartTime":14339.0,"Position":106.02227,"HyperDash":false}]},{"StartTime":14681.0,"Objects":[{"StartTime":14681.0,"Position":71.0,"HyperDash":false}]},{"StartTime":15022.0,"Objects":[{"StartTime":15022.0,"Position":109.0,"HyperDash":false},{"StartTime":15102.0,"Position":125.26535,"HyperDash":false},{"StartTime":15183.0,"Position":125.837524,"HyperDash":false},{"StartTime":15263.0,"Position":141.6249,"HyperDash":false},{"StartTime":15344.0,"Position":175.222168,"HyperDash":false},{"StartTime":15425.0,"Position":198.591125,"HyperDash":false},{"StartTime":15505.0,"Position":206.724686,"HyperDash":false},{"StartTime":15586.0,"Position":225.222351,"HyperDash":false},{"StartTime":15703.0,"Position":228.196915,"HyperDash":false}]},{"StartTime":16044.0,"Objects":[{"StartTime":16044.0,"Position":305.0,"HyperDash":false},{"StartTime":16120.0,"Position":322.564636,"HyperDash":false},{"StartTime":16196.0,"Position":317.036682,"HyperDash":false},{"StartTime":16272.0,"Position":334.3818,"HyperDash":false},{"StartTime":16384.0,"Position":373.692017,"HyperDash":false}]},{"StartTime":16726.0,"Objects":[{"StartTime":16726.0,"Position":416.0,"HyperDash":false},{"StartTime":16811.0,"Position":436.3275,"HyperDash":false},{"StartTime":16896.0,"Position":458.65506,"HyperDash":false},{"StartTime":16981.0,"Position":460.982574,"HyperDash":false},{"StartTime":17066.0,"Position":485.412048,"HyperDash":false},{"StartTime":17142.0,"Position":473.021118,"HyperDash":false},{"StartTime":17218.0,"Position":452.528259,"HyperDash":false},{"StartTime":17294.0,"Position":456.035431,"HyperDash":false},{"StartTime":17407.0,"Position":416.0,"HyperDash":false}]},{"StartTime":17749.0,"Objects":[{"StartTime":17749.0,"Position":338.0,"HyperDash":false},{"StartTime":17829.0,"Position":314.194427,"HyperDash":false},{"StartTime":17910.0,"Position":335.3038,"HyperDash":false},{"StartTime":17990.0,"Position":298.49823,"HyperDash":false},{"StartTime":18071.0,"Position":319.4706,"HyperDash":false},{"StartTime":18152.0,"Position":321.945831,"HyperDash":false},{"StartTime":18232.0,"Position":300.43985,"HyperDash":false},{"StartTime":18313.0,"Position":300.91507,"HyperDash":false},{"StartTime":18430.0,"Position":305.712616,"HyperDash":false}]},{"StartTime":18772.0,"Objects":[{"StartTime":18772.0,"Position":293.0,"HyperDash":false}]},{"StartTime":19112.0,"Objects":[{"StartTime":19112.0,"Position":201.0,"HyperDash":false},{"StartTime":19192.0,"Position":184.726288,"HyperDash":false},{"StartTime":19273.0,"Position":174.249146,"HyperDash":false},{"StartTime":19353.0,"Position":136.975433,"HyperDash":false},{"StartTime":19434.0,"Position":143.498291,"HyperDash":false},{"StartTime":19515.0,"Position":130.021179,"HyperDash":false},{"StartTime":19595.0,"Position":94.91766,"HyperDash":false},{"StartTime":19676.0,"Position":90.74364,"HyperDash":false},{"StartTime":19793.0,"Position":63.3811569,"HyperDash":false}]},{"StartTime":20476.0,"Objects":[{"StartTime":20476.0,"Position":129.0,"HyperDash":false},{"StartTime":20556.0,"Position":157.2956,"HyperDash":false},{"StartTime":20637.0,"Position":156.794876,"HyperDash":false},{"StartTime":20717.0,"Position":179.090469,"HyperDash":false},{"StartTime":20798.0,"Position":181.589752,"HyperDash":false},{"StartTime":20879.0,"Position":214.089035,"HyperDash":false},{"StartTime":20959.0,"Position":246.179916,"HyperDash":false},{"StartTime":21040.0,"Position":240.353943,"HyperDash":false},{"StartTime":21157.0,"Position":266.716431,"HyperDash":false}]},{"StartTime":21499.0,"Objects":[{"StartTime":21499.0,"Position":352.0,"HyperDash":false},{"StartTime":21584.0,"Position":366.69278,"HyperDash":false},{"StartTime":21669.0,"Position":363.83432,"HyperDash":false},{"StartTime":21754.0,"Position":383.387665,"HyperDash":false},{"StartTime":21839.0,"Position":413.4099,"HyperDash":false},{"StartTime":21915.0,"Position":398.248138,"HyperDash":false},{"StartTime":21991.0,"Position":402.284668,"HyperDash":false},{"StartTime":22067.0,"Position":383.640961,"HyperDash":false},{"StartTime":22180.0,"Position":352.0,"HyperDash":false}]},{"StartTime":22522.0,"Objects":[{"StartTime":22522.0,"Position":337.0,"HyperDash":false}]},{"StartTime":22862.0,"Objects":[{"StartTime":22862.0,"Position":412.0,"HyperDash":false},{"StartTime":22938.0,"Position":422.0278,"HyperDash":false},{"StartTime":23014.0,"Position":407.799652,"HyperDash":false},{"StartTime":23090.0,"Position":425.315735,"HyperDash":false},{"StartTime":23202.0,"Position":405.6633,"HyperDash":false}]},{"StartTime":23885.0,"Objects":[{"StartTime":23885.0,"Position":214.0,"HyperDash":false},{"StartTime":23970.0,"Position":199.7902,"HyperDash":false},{"StartTime":24055.0,"Position":219.068054,"HyperDash":false},{"StartTime":24140.0,"Position":186.837479,"HyperDash":false},{"StartTime":24225.0,"Position":196.081757,"HyperDash":false},{"StartTime":24301.0,"Position":188.375519,"HyperDash":false},{"StartTime":24377.0,"Position":207.0842,"HyperDash":false},{"StartTime":24453.0,"Position":195.185028,"HyperDash":false},{"StartTime":24566.0,"Position":214.0,"HyperDash":false}]},{"StartTime":24908.0,"Objects":[{"StartTime":24908.0,"Position":301.0,"HyperDash":false},{"StartTime":24988.0,"Position":317.5747,"HyperDash":false},{"StartTime":25069.0,"Position":290.1566,"HyperDash":false},{"StartTime":25149.0,"Position":301.7313,"HyperDash":false},{"StartTime":25230.0,"Position":290.313171,"HyperDash":false},{"StartTime":25311.0,"Position":297.89505,"HyperDash":false},{"StartTime":25391.0,"Position":296.469727,"HyperDash":false},{"StartTime":25472.0,"Position":296.051636,"HyperDash":false},{"StartTime":25589.0,"Position":305.89212,"HyperDash":false}]},{"StartTime":25931.0,"Objects":[{"StartTime":25931.0,"Position":302.0,"HyperDash":false}]},{"StartTime":26612.0,"Objects":[{"StartTime":26612.0,"Position":131.0,"HyperDash":false}]},{"StartTime":26953.0,"Objects":[{"StartTime":26953.0,"Position":67.0,"HyperDash":false},{"StartTime":27029.0,"Position":61.19864,"HyperDash":false},{"StartTime":27105.0,"Position":60.3972778,"HyperDash":false},{"StartTime":27181.0,"Position":78.59592,"HyperDash":false},{"StartTime":27293.0,"Position":63.4149666,"HyperDash":false}]},{"StartTime":27635.0,"Objects":[{"StartTime":27635.0,"Position":96.0,"HyperDash":false},{"StartTime":27720.0,"Position":101.143433,"HyperDash":false},{"StartTime":27805.0,"Position":88.28687,"HyperDash":false},{"StartTime":27890.0,"Position":90.4303055,"HyperDash":false},{"StartTime":27975.0,"Position":104.586349,"HyperDash":false},{"StartTime":28051.0,"Position":87.68248,"HyperDash":false},{"StartTime":28127.0,"Position":96.76599,"HyperDash":false},{"StartTime":28203.0,"Position":101.84951,"HyperDash":false},{"StartTime":28316.0,"Position":96.0,"HyperDash":false}]},{"StartTime":28658.0,"Objects":[{"StartTime":28658.0,"Position":165.0,"HyperDash":false},{"StartTime":28738.0,"Position":161.813614,"HyperDash":false},{"StartTime":28819.0,"Position":196.82489,"HyperDash":false},{"StartTime":28899.0,"Position":225.6385,"HyperDash":false},{"StartTime":28980.0,"Position":225.64978,"HyperDash":false},{"StartTime":29061.0,"Position":260.60907,"HyperDash":false},{"StartTime":29141.0,"Position":251.337646,"HyperDash":false},{"StartTime":29222.0,"Position":265.2628,"HyperDash":false},{"StartTime":29339.0,"Position":299.265778,"HyperDash":false}]},{"StartTime":29681.0,"Objects":[{"StartTime":29681.0,"Position":385.0,"HyperDash":false},{"StartTime":29766.0,"Position":388.458282,"HyperDash":false},{"StartTime":29851.0,"Position":437.916565,"HyperDash":false},{"StartTime":29936.0,"Position":447.374817,"HyperDash":false},{"StartTime":30021.0,"Position":454.9358,"HyperDash":false},{"StartTime":30097.0,"Position":458.428741,"HyperDash":false},{"StartTime":30173.0,"Position":406.819,"HyperDash":false},{"StartTime":30249.0,"Position":402.209229,"HyperDash":false},{"StartTime":30362.0,"Position":385.0,"HyperDash":false}]},{"StartTime":31044.0,"Objects":[{"StartTime":31044.0,"Position":202.0,"HyperDash":false}]},{"StartTime":31385.0,"Objects":[{"StartTime":31385.0,"Position":197.0,"HyperDash":false},{"StartTime":31470.0,"Position":185.578781,"HyperDash":false},{"StartTime":31555.0,"Position":174.157562,"HyperDash":false},{"StartTime":31640.0,"Position":131.736343,"HyperDash":false},{"StartTime":31725.0,"Position":113.315117,"HyperDash":false},{"StartTime":31810.0,"Position":90.8939,"HyperDash":false},{"StartTime":31895.0,"Position":95.47269,"HyperDash":false},{"StartTime":31980.0,"Position":61.0514679,"HyperDash":false},{"StartTime":32066.0,"Position":57.3228149,"HyperDash":false},{"StartTime":32146.0,"Position":79.6167755,"HyperDash":false},{"StartTime":32227.0,"Position":103.21817,"HyperDash":false},{"StartTime":32308.0,"Position":96.81957,"HyperDash":false},{"StartTime":32389.0,"Position":116.420967,"HyperDash":false},{"StartTime":32469.0,"Position":149.817413,"HyperDash":false},{"StartTime":32550.0,"Position":165.418808,"HyperDash":false},{"StartTime":32631.0,"Position":180.0202,"HyperDash":false},{"StartTime":32748.0,"Position":197.0,"HyperDash":false}]},{"StartTime":33090.0,"Objects":[{"StartTime":33090.0,"Position":285.0,"HyperDash":false},{"StartTime":33175.0,"Position":283.775879,"HyperDash":false},{"StartTime":33260.0,"Position":292.551727,"HyperDash":false},{"StartTime":33345.0,"Position":281.3276,"HyperDash":false},{"StartTime":33430.0,"Position":288.108032,"HyperDash":false},{"StartTime":33506.0,"Position":280.418884,"HyperDash":false},{"StartTime":33582.0,"Position":305.725159,"HyperDash":false},{"StartTime":33658.0,"Position":281.031433,"HyperDash":false},{"StartTime":33771.0,"Position":285.0,"HyperDash":false}]},{"StartTime":34112.0,"Objects":[{"StartTime":34112.0,"Position":286.0,"HyperDash":false},{"StartTime":34188.0,"Position":286.694733,"HyperDash":false},{"StartTime":34264.0,"Position":302.389465,"HyperDash":false},{"StartTime":34340.0,"Position":272.0842,"HyperDash":false},{"StartTime":34452.0,"Position":289.108032,"HyperDash":false}]},{"StartTime":34794.0,"Objects":[{"StartTime":34794.0,"Position":373.0,"HyperDash":false},{"StartTime":34870.0,"Position":405.631622,"HyperDash":false},{"StartTime":34946.0,"Position":407.263245,"HyperDash":false},{"StartTime":35022.0,"Position":415.8949,"HyperDash":false},{"StartTime":35134.0,"Position":442.930969,"HyperDash":false}]},{"StartTime":35476.0,"Objects":[{"StartTime":35476.0,"Position":453.0,"HyperDash":false},{"StartTime":35556.0,"Position":463.4278,"HyperDash":false},{"StartTime":35637.0,"Position":456.885925,"HyperDash":false},{"StartTime":35717.0,"Position":475.313721,"HyperDash":false},{"StartTime":35798.0,"Position":450.771881,"HyperDash":false},{"StartTime":35879.0,"Position":441.79422,"HyperDash":false},{"StartTime":35959.0,"Position":445.1267,"HyperDash":false},{"StartTime":36040.0,"Position":428.388367,"HyperDash":false},{"StartTime":36157.0,"Position":438.09967,"HyperDash":false}]},{"StartTime":36499.0,"Objects":[{"StartTime":36499.0,"Position":362.0,"HyperDash":false}]},{"StartTime":36840.0,"Objects":[{"StartTime":36840.0,"Position":304.0,"HyperDash":false},{"StartTime":36920.0,"Position":297.5722,"HyperDash":false},{"StartTime":37001.0,"Position":304.114075,"HyperDash":false},{"StartTime":37081.0,"Position":297.686279,"HyperDash":false},{"StartTime":37162.0,"Position":292.228119,"HyperDash":false},{"StartTime":37243.0,"Position":315.20578,"HyperDash":false},{"StartTime":37323.0,"Position":301.8733,"HyperDash":false},{"StartTime":37404.0,"Position":324.611633,"HyperDash":false},{"StartTime":37521.0,"Position":318.90033,"HyperDash":false}]},{"StartTime":38203.0,"Objects":[{"StartTime":38203.0,"Position":160.0,"HyperDash":false},{"StartTime":38279.0,"Position":131.357956,"HyperDash":false},{"StartTime":38355.0,"Position":127.715912,"HyperDash":false},{"StartTime":38431.0,"Position":101.07386,"HyperDash":false},{"StartTime":38543.0,"Position":90.02242,"HyperDash":false}]},{"StartTime":38885.0,"Objects":[{"StartTime":38885.0,"Position":48.0,"HyperDash":false},{"StartTime":38970.0,"Position":51.7274666,"HyperDash":false},{"StartTime":39055.0,"Position":59.45493,"HyperDash":false},{"StartTime":39140.0,"Position":46.1823959,"HyperDash":false},{"StartTime":39225.0,"Position":50.91414,"HyperDash":false},{"StartTime":39301.0,"Position":30.2679787,"HyperDash":false},{"StartTime":39377.0,"Position":53.61754,"HyperDash":false},{"StartTime":39453.0,"Position":53.9671021,"HyperDash":false},{"StartTime":39566.0,"Position":48.0,"HyperDash":false}]},{"StartTime":40249.0,"Objects":[{"StartTime":40249.0,"Position":219.0,"HyperDash":false},{"StartTime":40325.0,"Position":234.6352,"HyperDash":false},{"StartTime":40401.0,"Position":232.270386,"HyperDash":false},{"StartTime":40477.0,"Position":246.905579,"HyperDash":false},{"StartTime":40589.0,"Position":288.94693,"HyperDash":false}]},{"StartTime":40931.0,"Objects":[{"StartTime":40931.0,"Position":379.0,"HyperDash":false},{"StartTime":41016.0,"Position":385.054565,"HyperDash":false},{"StartTime":41101.0,"Position":420.911255,"HyperDash":false},{"StartTime":41186.0,"Position":418.812378,"HyperDash":false},{"StartTime":41271.0,"Position":453.0934,"HyperDash":false},{"StartTime":41356.0,"Position":459.2142,"HyperDash":false},{"StartTime":41441.0,"Position":442.7846,"HyperDash":false},{"StartTime":41526.0,"Position":431.531372,"HyperDash":false},{"StartTime":41612.0,"Position":447.3299,"HyperDash":false},{"StartTime":41692.0,"Position":455.0114,"HyperDash":false},{"StartTime":41773.0,"Position":432.572144,"HyperDash":false},{"StartTime":41854.0,"Position":423.492432,"HyperDash":false},{"StartTime":41935.0,"Position":402.304352,"HyperDash":false},{"StartTime":42015.0,"Position":376.832733,"HyperDash":false},{"StartTime":42096.0,"Position":372.3723,"HyperDash":false},{"StartTime":42177.0,"Position":366.8342,"HyperDash":false},{"StartTime":42294.0,"Position":334.281647,"HyperDash":false}]},{"StartTime":42976.0,"Objects":[{"StartTime":42976.0,"Position":172.0,"HyperDash":false},{"StartTime":43056.0,"Position":148.8692,"HyperDash":false},{"StartTime":43137.0,"Position":157.674286,"HyperDash":false},{"StartTime":43217.0,"Position":139.543488,"HyperDash":false},{"StartTime":43298.0,"Position":162.348572,"HyperDash":false},{"StartTime":43379.0,"Position":134.066162,"HyperDash":false},{"StartTime":43459.0,"Position":174.156235,"HyperDash":false},{"StartTime":43540.0,"Position":170.297409,"HyperDash":false},{"StartTime":43657.0,"Position":167.279129,"HyperDash":false}]},{"StartTime":43999.0,"Objects":[{"StartTime":43999.0,"Position":255.0,"HyperDash":false},{"StartTime":44084.0,"Position":272.431122,"HyperDash":false},{"StartTime":44169.0,"Position":288.862274,"HyperDash":false},{"StartTime":44254.0,"Position":319.2934,"HyperDash":false},{"StartTime":44339.0,"Position":324.827057,"HyperDash":false},{"StartTime":44415.0,"Position":311.344116,"HyperDash":false},{"StartTime":44491.0,"Position":294.758636,"HyperDash":false},{"StartTime":44567.0,"Position":265.173157,"HyperDash":false},{"StartTime":44680.0,"Position":255.0,"HyperDash":false}]},{"StartTime":45022.0,"Objects":[{"StartTime":45022.0,"Position":163.0,"HyperDash":false},{"StartTime":45098.0,"Position":150.362976,"HyperDash":false},{"StartTime":45174.0,"Position":119.747879,"HyperDash":false},{"StartTime":45250.0,"Position":109.167084,"HyperDash":false},{"StartTime":45362.0,"Position":93.2945,"HyperDash":false}]},{"StartTime":45703.0,"Objects":[{"StartTime":45703.0,"Position":81.0,"HyperDash":false},{"StartTime":45779.0,"Position":67.62006,"HyperDash":false},{"StartTime":45855.0,"Position":93.24382,"HyperDash":false},{"StartTime":45931.0,"Position":89.85092,"HyperDash":false},{"StartTime":46043.0,"Position":98.2657852,"HyperDash":false}]},{"StartTime":46385.0,"Objects":[{"StartTime":46385.0,"Position":123.0,"HyperDash":false},{"StartTime":46465.0,"Position":115.7731,"HyperDash":false},{"StartTime":46546.0,"Position":133.424759,"HyperDash":false},{"StartTime":46626.0,"Position":169.264114,"HyperDash":false},{"StartTime":46707.0,"Position":177.250015,"HyperDash":false},{"StartTime":46788.0,"Position":189.772232,"HyperDash":false},{"StartTime":46868.0,"Position":199.175552,"HyperDash":false},{"StartTime":46949.0,"Position":219.42218,"HyperDash":false},{"StartTime":47066.0,"Position":250.349442,"HyperDash":false}]},{"StartTime":47408.0,"Objects":[{"StartTime":47408.0,"Position":339.0,"HyperDash":false},{"StartTime":47484.0,"Position":348.605347,"HyperDash":false},{"StartTime":47560.0,"Position":359.2107,"HyperDash":false},{"StartTime":47636.0,"Position":385.816,"HyperDash":false},{"StartTime":47748.0,"Position":408.813354,"HyperDash":false}]},{"StartTime":48431.0,"Objects":[{"StartTime":48431.0,"Position":436.0,"HyperDash":false},{"StartTime":48511.0,"Position":410.2269,"HyperDash":false},{"StartTime":48592.0,"Position":411.575226,"HyperDash":false},{"StartTime":48672.0,"Position":410.73587,"HyperDash":false},{"StartTime":48753.0,"Position":368.749969,"HyperDash":false},{"StartTime":48834.0,"Position":357.227753,"HyperDash":false},{"StartTime":48914.0,"Position":363.824432,"HyperDash":false},{"StartTime":48995.0,"Position":311.57782,"HyperDash":false},{"StartTime":49112.0,"Position":308.650574,"HyperDash":false}]},{"StartTime":49453.0,"Objects":[{"StartTime":49453.0,"Position":217.0,"HyperDash":false},{"StartTime":49538.0,"Position":226.735519,"HyperDash":false},{"StartTime":49623.0,"Position":224.662048,"HyperDash":false},{"StartTime":49708.0,"Position":184.780319,"HyperDash":false},{"StartTime":49793.0,"Position":197.063889,"HyperDash":false},{"StartTime":49869.0,"Position":185.218567,"HyperDash":false},{"StartTime":49945.0,"Position":217.554169,"HyperDash":false},{"StartTime":50021.0,"Position":222.04332,"HyperDash":false},{"StartTime":50134.0,"Position":217.0,"HyperDash":false}]},{"StartTime":50476.0,"Objects":[{"StartTime":50476.0,"Position":153.0,"HyperDash":false},{"StartTime":50552.0,"Position":152.801224,"HyperDash":false},{"StartTime":50628.0,"Position":114.521843,"HyperDash":false},{"StartTime":50704.0,"Position":93.1696854,"HyperDash":false},{"StartTime":50816.0,"Position":84.42975,"HyperDash":false}]},{"StartTime":51158.0,"Objects":[{"StartTime":51158.0,"Position":115.0,"HyperDash":false},{"StartTime":51238.0,"Position":126.432373,"HyperDash":false},{"StartTime":51319.0,"Position":159.057648,"HyperDash":false},{"StartTime":51399.0,"Position":160.49,"HyperDash":false},{"StartTime":51480.0,"Position":177.372131,"HyperDash":false},{"StartTime":51561.0,"Position":186.782,"HyperDash":false},{"StartTime":51641.0,"Position":225.989288,"HyperDash":false},{"StartTime":51722.0,"Position":235.399139,"HyperDash":false},{"StartTime":51839.0,"Position":250.10228,"HyperDash":false}]},{"StartTime":52181.0,"Objects":[{"StartTime":52181.0,"Position":339.0,"HyperDash":false}]},{"StartTime":52862.0,"Objects":[{"StartTime":52862.0,"Position":347.0,"HyperDash":false}]},{"StartTime":53203.0,"Objects":[{"StartTime":53203.0,"Position":253.0,"HyperDash":false},{"StartTime":53288.0,"Position":228.749466,"HyperDash":false},{"StartTime":53373.0,"Position":234.498917,"HyperDash":false},{"StartTime":53458.0,"Position":185.284058,"HyperDash":false},{"StartTime":53543.0,"Position":183.852417,"HyperDash":false},{"StartTime":53628.0,"Position":151.420776,"HyperDash":false},{"StartTime":53713.0,"Position":139.989136,"HyperDash":false},{"StartTime":53798.0,"Position":123.557495,"HyperDash":false},{"StartTime":53884.0,"Position":118.835892,"HyperDash":false},{"StartTime":53964.0,"Position":126.204315,"HyperDash":false},{"StartTime":54045.0,"Position":151.862686,"HyperDash":false},{"StartTime":54126.0,"Position":154.521072,"HyperDash":false},{"StartTime":54207.0,"Position":198.179474,"HyperDash":false},{"StartTime":54287.0,"Position":205.644547,"HyperDash":false},{"StartTime":54368.0,"Position":202.816391,"HyperDash":false},{"StartTime":54449.0,"Position":244.255142,"HyperDash":false},{"StartTime":54566.0,"Position":253.0,"HyperDash":false}]},{"StartTime":54908.0,"Objects":[{"StartTime":54908.0,"Position":343.0,"HyperDash":false}]},{"StartTime":55249.0,"Objects":[{"StartTime":55249.0,"Position":418.0,"HyperDash":false},{"StartTime":55325.0,"Position":411.540649,"HyperDash":false},{"StartTime":55401.0,"Position":412.081329,"HyperDash":false},{"StartTime":55477.0,"Position":412.621979,"HyperDash":false},{"StartTime":55589.0,"Position":429.366119,"HyperDash":false}]},{"StartTime":55931.0,"Objects":[{"StartTime":55931.0,"Position":415.0,"HyperDash":false},{"StartTime":56011.0,"Position":388.6705,"HyperDash":false},{"StartTime":56092.0,"Position":384.1857,"HyperDash":false},{"StartTime":56172.0,"Position":357.960541,"HyperDash":false},{"StartTime":56253.0,"Position":367.598083,"HyperDash":false},{"StartTime":56334.0,"Position":339.3097,"HyperDash":false},{"StartTime":56414.0,"Position":332.302979,"HyperDash":false},{"StartTime":56495.0,"Position":306.186432,"HyperDash":false},{"StartTime":56612.0,"Position":278.082428,"HyperDash":false}]},{"StartTime":56953.0,"Objects":[{"StartTime":56953.0,"Position":187.0,"HyperDash":false}]},{"StartTime":57294.0,"Objects":[{"StartTime":57294.0,"Position":96.0,"HyperDash":false},{"StartTime":57374.0,"Position":78.94491,"HyperDash":false},{"StartTime":57455.0,"Position":76.87663,"HyperDash":false},{"StartTime":57535.0,"Position":104.821541,"HyperDash":false},{"StartTime":57616.0,"Position":98.75326,"HyperDash":false},{"StartTime":57697.0,"Position":72.68498,"HyperDash":false},{"StartTime":57777.0,"Position":93.62989,"HyperDash":false},{"StartTime":57858.0,"Position":89.56161,"HyperDash":false},{"StartTime":57975.0,"Position":87.01854,"HyperDash":false}]},{"StartTime":58317.0,"Objects":[{"StartTime":58317.0,"Position":149.0,"HyperDash":false}]},{"StartTime":58658.0,"Objects":[{"StartTime":58658.0,"Position":239.0,"HyperDash":false},{"StartTime":58738.0,"Position":248.055084,"HyperDash":false},{"StartTime":58819.0,"Position":226.123367,"HyperDash":false},{"StartTime":58899.0,"Position":238.178467,"HyperDash":false},{"StartTime":58980.0,"Position":242.246735,"HyperDash":false},{"StartTime":59061.0,"Position":251.315018,"HyperDash":false},{"StartTime":59141.0,"Position":233.370117,"HyperDash":false},{"StartTime":59222.0,"Position":253.438385,"HyperDash":false},{"StartTime":59339.0,"Position":247.981461,"HyperDash":false}]},{"StartTime":60022.0,"Objects":[{"StartTime":60022.0,"Position":365.0,"HyperDash":false},{"StartTime":60098.0,"Position":378.011719,"HyperDash":false},{"StartTime":60174.0,"Position":393.785217,"HyperDash":false},{"StartTime":60250.0,"Position":402.2842,"HyperDash":false},{"StartTime":60362.0,"Position":430.07663,"HyperDash":false}]},{"StartTime":60703.0,"Objects":[{"StartTime":60703.0,"Position":436.0,"HyperDash":false},{"StartTime":60779.0,"Position":419.315674,"HyperDash":false},{"StartTime":60855.0,"Position":421.518646,"HyperDash":false},{"StartTime":60931.0,"Position":408.615723,"HyperDash":false},{"StartTime":61043.0,"Position":369.475067,"HyperDash":false}]},{"StartTime":61385.0,"Objects":[{"StartTime":61385.0,"Position":294.0,"HyperDash":false},{"StartTime":61465.0,"Position":267.3266,"HyperDash":false},{"StartTime":61546.0,"Position":256.9999,"HyperDash":false},{"StartTime":61626.0,"Position":281.482758,"HyperDash":false},{"StartTime":61707.0,"Position":273.83606,"HyperDash":false},{"StartTime":61788.0,"Position":247.226837,"HyperDash":false},{"StartTime":61868.0,"Position":269.576416,"HyperDash":false},{"StartTime":61949.0,"Position":261.865753,"HyperDash":false},{"StartTime":62066.0,"Position":290.626923,"HyperDash":false}]},{"StartTime":62408.0,"Objects":[{"StartTime":62408.0,"Position":368.0,"HyperDash":false}]},{"StartTime":62749.0,"Objects":[{"StartTime":62749.0,"Position":451.0,"HyperDash":false},{"StartTime":62829.0,"Position":437.402985,"HyperDash":false},{"StartTime":62910.0,"Position":465.8735,"HyperDash":false},{"StartTime":62990.0,"Position":468.8882,"HyperDash":false},{"StartTime":63071.0,"Position":481.67627,"HyperDash":false},{"StartTime":63152.0,"Position":473.464355,"HyperDash":false},{"StartTime":63232.0,"Position":462.279724,"HyperDash":false},{"StartTime":63313.0,"Position":466.06778,"HyperDash":false},{"StartTime":63430.0,"Position":454.872772,"HyperDash":false}]},{"StartTime":64112.0,"Objects":[{"StartTime":64112.0,"Position":288.0,"HyperDash":false},{"StartTime":64192.0,"Position":265.466431,"HyperDash":false},{"StartTime":64273.0,"Position":257.738678,"HyperDash":false},{"StartTime":64353.0,"Position":225.165848,"HyperDash":false},{"StartTime":64434.0,"Position":205.661438,"HyperDash":false},{"StartTime":64515.0,"Position":188.157013,"HyperDash":false},{"StartTime":64595.0,"Position":194.856354,"HyperDash":false},{"StartTime":64676.0,"Position":175.351929,"HyperDash":false},{"StartTime":64793.0,"Position":151.512222,"HyperDash":false}]},{"StartTime":65135.0,"Objects":[{"StartTime":65135.0,"Position":124.0,"HyperDash":false},{"StartTime":65220.0,"Position":116.567741,"HyperDash":false},{"StartTime":65305.0,"Position":71.23689,"HyperDash":false},{"StartTime":65390.0,"Position":69.06891,"HyperDash":false},{"StartTime":65475.0,"Position":55.0260773,"HyperDash":false},{"StartTime":65551.0,"Position":64.0663147,"HyperDash":false},{"StartTime":65627.0,"Position":87.38679,"HyperDash":false},{"StartTime":65703.0,"Position":117.8468,"HyperDash":false},{"StartTime":65816.0,"Position":124.0,"HyperDash":false}]},{"StartTime":66158.0,"Objects":[{"StartTime":66158.0,"Position":212.0,"HyperDash":false}]},{"StartTime":66499.0,"Objects":[{"StartTime":66499.0,"Position":190.0,"HyperDash":false},{"StartTime":66575.0,"Position":206.978012,"HyperDash":false},{"StartTime":66651.0,"Position":197.713776,"HyperDash":false},{"StartTime":66727.0,"Position":197.188354,"HyperDash":false},{"StartTime":66839.0,"Position":222.507156,"HyperDash":false}]},{"StartTime":67522.0,"Objects":[{"StartTime":67522.0,"Position":400.0,"HyperDash":false},{"StartTime":67598.0,"Position":417.733978,"HyperDash":false},{"StartTime":67674.0,"Position":418.6181,"HyperDash":false},{"StartTime":67750.0,"Position":419.6206,"HyperDash":false},{"StartTime":67862.0,"Position":432.309723,"HyperDash":false}]},{"StartTime":68203.0,"Objects":[{"StartTime":68203.0,"Position":441.0,"HyperDash":false},{"StartTime":68283.0,"Position":421.1902,"HyperDash":false},{"StartTime":68364.0,"Position":424.512329,"HyperDash":false},{"StartTime":68444.0,"Position":387.838,"HyperDash":false},{"StartTime":68525.0,"Position":400.321259,"HyperDash":false},{"StartTime":68606.0,"Position":351.733856,"HyperDash":false},{"StartTime":68686.0,"Position":346.847382,"HyperDash":false},{"StartTime":68767.0,"Position":347.826874,"HyperDash":false},{"StartTime":68884.0,"Position":315.044037,"HyperDash":false}]},{"StartTime":69226.0,"Objects":[{"StartTime":69226.0,"Position":271.0,"HyperDash":false},{"StartTime":69302.0,"Position":260.591034,"HyperDash":false},{"StartTime":69378.0,"Position":230.182068,"HyperDash":false},{"StartTime":69454.0,"Position":230.7731,"HyperDash":false},{"StartTime":69566.0,"Position":202.065155,"HyperDash":false}]},{"StartTime":70249.0,"Objects":[{"StartTime":70249.0,"Position":71.0,"HyperDash":false},{"StartTime":70329.0,"Position":88.54798,"HyperDash":false},{"StartTime":70410.0,"Position":83.29032,"HyperDash":false},{"StartTime":70490.0,"Position":120.8383,"HyperDash":false},{"StartTime":70571.0,"Position":138.779388,"HyperDash":false},{"StartTime":70652.0,"Position":166.2048,"HyperDash":false},{"StartTime":70732.0,"Position":159.427444,"HyperDash":false},{"StartTime":70813.0,"Position":172.852844,"HyperDash":false},{"StartTime":70930.0,"Position":206.578461,"HyperDash":false}]},{"StartTime":71272.0,"Objects":[{"StartTime":71272.0,"Position":285.0,"HyperDash":false},{"StartTime":71357.0,"Position":295.671265,"HyperDash":false},{"StartTime":71442.0,"Position":272.7821,"HyperDash":false},{"StartTime":71527.0,"Position":278.3155,"HyperDash":false},{"StartTime":71612.0,"Position":290.256958,"HyperDash":false},{"StartTime":71688.0,"Position":299.285034,"HyperDash":false},{"StartTime":71764.0,"Position":299.052734,"HyperDash":false},{"StartTime":71840.0,"Position":298.55127,"HyperDash":false},{"StartTime":71953.0,"Position":285.0,"HyperDash":false}]},{"StartTime":72294.0,"Objects":[{"StartTime":72294.0,"Position":257.0,"HyperDash":false},{"StartTime":72370.0,"Position":270.334442,"HyperDash":false},{"StartTime":72446.0,"Position":266.123962,"HyperDash":false},{"StartTime":72522.0,"Position":313.321533,"HyperDash":false},{"StartTime":72634.0,"Position":319.88623,"HyperDash":false}]},{"StartTime":72976.0,"Objects":[{"StartTime":72976.0,"Position":367.0,"HyperDash":false},{"StartTime":73056.0,"Position":386.222748,"HyperDash":false},{"StartTime":73137.0,"Position":399.63,"HyperDash":false},{"StartTime":73217.0,"Position":410.031372,"HyperDash":false},{"StartTime":73298.0,"Position":440.0546,"HyperDash":false},{"StartTime":73379.0,"Position":442.924225,"HyperDash":false},{"StartTime":73459.0,"Position":443.179749,"HyperDash":false},{"StartTime":73540.0,"Position":448.717773,"HyperDash":false},{"StartTime":73657.0,"Position":429.740936,"HyperDash":false}]},{"StartTime":73999.0,"Objects":[{"StartTime":73999.0,"Position":368.0,"HyperDash":false}]},{"StartTime":74681.0,"Objects":[{"StartTime":74681.0,"Position":2.0,"HyperDash":false}]},{"StartTime":75022.0,"Objects":[{"StartTime":75022.0,"Position":108.0,"HyperDash":false},{"StartTime":75107.0,"Position":87.6573639,"HyperDash":false},{"StartTime":75192.0,"Position":106.552719,"HyperDash":false},{"StartTime":75277.0,"Position":115.749847,"HyperDash":false},{"StartTime":75362.0,"Position":95.05077,"HyperDash":false},{"StartTime":75447.0,"Position":141.007874,"HyperDash":false},{"StartTime":75532.0,"Position":142.951065,"HyperDash":false},{"StartTime":75617.0,"Position":142.0284,"HyperDash":false},{"StartTime":75703.0,"Position":170.5651,"HyperDash":false},{"StartTime":75783.0,"Position":166.401367,"HyperDash":false},{"StartTime":75864.0,"Position":130.8922,"HyperDash":false},{"StartTime":75945.0,"Position":135.213562,"HyperDash":false},{"StartTime":76026.0,"Position":111.1313,"HyperDash":false},{"StartTime":76106.0,"Position":89.331665,"HyperDash":false},{"StartTime":76187.0,"Position":82.0756454,"HyperDash":false},{"StartTime":76268.0,"Position":84.71052,"HyperDash":false},{"StartTime":76385.0,"Position":108.0,"HyperDash":false}]},{"StartTime":76726.0,"Objects":[{"StartTime":76726.0,"Position":185.0,"HyperDash":false}]},{"StartTime":77067.0,"Objects":[{"StartTime":77067.0,"Position":134.0,"HyperDash":false},{"StartTime":77152.0,"Position":132.526932,"HyperDash":false},{"StartTime":77237.0,"Position":80.05387,"HyperDash":false},{"StartTime":77322.0,"Position":100.580811,"HyperDash":false},{"StartTime":77407.0,"Position":64.00496,"HyperDash":false},{"StartTime":77483.0,"Position":60.5251465,"HyperDash":false},{"StartTime":77559.0,"Position":95.1481247,"HyperDash":false},{"StartTime":77635.0,"Position":105.7711,"HyperDash":false},{"StartTime":77748.0,"Position":134.0,"HyperDash":false}]},{"StartTime":78090.0,"Objects":[{"StartTime":78090.0,"Position":225.0,"HyperDash":false},{"StartTime":78166.0,"Position":226.044952,"HyperDash":false},{"StartTime":78242.0,"Position":241.340271,"HyperDash":false},{"StartTime":78318.0,"Position":287.819031,"HyperDash":false},{"StartTime":78430.0,"Position":293.820984,"HyperDash":false}]},{"StartTime":78772.0,"Objects":[{"StartTime":78772.0,"Position":461.0,"HyperDash":false}]},{"StartTime":79112.0,"Objects":[{"StartTime":79112.0,"Position":429.0,"HyperDash":false},{"StartTime":79192.0,"Position":416.857025,"HyperDash":false},{"StartTime":79273.0,"Position":453.389954,"HyperDash":false},{"StartTime":79353.0,"Position":426.5255,"HyperDash":false},{"StartTime":79434.0,"Position":438.278229,"HyperDash":false},{"StartTime":79515.0,"Position":450.6304,"HyperDash":false},{"StartTime":79595.0,"Position":448.640656,"HyperDash":false},{"StartTime":79676.0,"Position":431.2529,"HyperDash":false},{"StartTime":79793.0,"Position":418.566681,"HyperDash":false}]},{"StartTime":80135.0,"Objects":[{"StartTime":80135.0,"Position":330.0,"HyperDash":false}]},{"StartTime":80476.0,"Objects":[{"StartTime":80476.0,"Position":239.0,"HyperDash":false},{"StartTime":80556.0,"Position":231.143,"HyperDash":false},{"StartTime":80637.0,"Position":222.610062,"HyperDash":false},{"StartTime":80717.0,"Position":240.474518,"HyperDash":false},{"StartTime":80798.0,"Position":227.721756,"HyperDash":false},{"StartTime":80879.0,"Position":221.3696,"HyperDash":false},{"StartTime":80959.0,"Position":225.35936,"HyperDash":false},{"StartTime":81040.0,"Position":255.747116,"HyperDash":false},{"StartTime":81157.0,"Position":249.43335,"HyperDash":false}]},{"StartTime":81840.0,"Objects":[{"StartTime":81840.0,"Position":372.0,"HyperDash":false},{"StartTime":81916.0,"Position":360.517242,"HyperDash":false},{"StartTime":81992.0,"Position":348.0345,"HyperDash":false},{"StartTime":82068.0,"Position":338.5517,"HyperDash":false},{"StartTime":82180.0,"Position":302.735016,"HyperDash":false}]},{"StartTime":82522.0,"Objects":[{"StartTime":82522.0,"Position":222.0,"HyperDash":false},{"StartTime":82607.0,"Position":195.592834,"HyperDash":false},{"StartTime":82692.0,"Position":198.185669,"HyperDash":false},{"StartTime":82777.0,"Position":161.7785,"HyperDash":false},{"StartTime":82862.0,"Position":152.268951,"HyperDash":false},{"StartTime":82938.0,"Position":160.730591,"HyperDash":false},{"StartTime":83014.0,"Position":191.294647,"HyperDash":false},{"StartTime":83090.0,"Position":194.8587,"HyperDash":false},{"StartTime":83203.0,"Position":222.0,"HyperDash":false}]},{"StartTime":83885.0,"Objects":[{"StartTime":83885.0,"Position":374.0,"HyperDash":false},{"StartTime":83961.0,"Position":382.5809,"HyperDash":false},{"StartTime":84037.0,"Position":345.4707,"HyperDash":false},{"StartTime":84113.0,"Position":351.689972,"HyperDash":false},{"StartTime":84225.0,"Position":335.561218,"HyperDash":false}]},{"StartTime":84567.0,"Objects":[{"StartTime":84567.0,"Position":246.0,"HyperDash":false},{"StartTime":84652.0,"Position":250.610764,"HyperDash":false},{"StartTime":84737.0,"Position":219.0491,"HyperDash":false},{"StartTime":84822.0,"Position":214.657715,"HyperDash":false},{"StartTime":84907.0,"Position":183.720428,"HyperDash":false},{"StartTime":84992.0,"Position":188.454575,"HyperDash":false},{"StartTime":85077.0,"Position":201.005173,"HyperDash":false},{"StartTime":85162.0,"Position":173.53,"HyperDash":false},{"StartTime":85248.0,"Position":196.9969,"HyperDash":false},{"StartTime":85333.0,"Position":206.210022,"HyperDash":false},{"StartTime":85418.0,"Position":224.027588,"HyperDash":false},{"StartTime":85503.0,"Position":233.208817,"HyperDash":false},{"StartTime":85589.0,"Position":242.6152,"HyperDash":false},{"StartTime":85674.0,"Position":246.61525,"HyperDash":false},{"StartTime":85759.0,"Position":258.8727,"HyperDash":false},{"StartTime":85844.0,"Position":298.942719,"HyperDash":false},{"StartTime":85930.0,"Position":302.666138,"HyperDash":false},{"StartTime":86015.0,"Position":288.350464,"HyperDash":false},{"StartTime":86100.0,"Position":286.2681,"HyperDash":false},{"StartTime":86185.0,"Position":256.988831,"HyperDash":false},{"StartTime":86271.0,"Position":229.786652,"HyperDash":false},{"StartTime":86356.0,"Position":240.490692,"HyperDash":false},{"StartTime":86441.0,"Position":214.260208,"HyperDash":false},{"StartTime":86526.0,"Position":191.387848,"HyperDash":false},{"StartTime":86612.0,"Position":197.0563,"HyperDash":false},{"StartTime":86692.0,"Position":212.729446,"HyperDash":false},{"StartTime":86773.0,"Position":181.9589,"HyperDash":false},{"StartTime":86854.0,"Position":206.823822,"HyperDash":false},{"StartTime":86935.0,"Position":185.277771,"HyperDash":false},{"StartTime":87015.0,"Position":222.114685,"HyperDash":false},{"StartTime":87096.0,"Position":227.322708,"HyperDash":false},{"StartTime":87177.0,"Position":214.614655,"HyperDash":false},{"StartTime":87294.0,"Position":246.0,"HyperDash":false}]},{"StartTime":87465.0,"Objects":[{"StartTime":87465.0,"Position":408.0,"HyperDash":false},{"StartTime":87547.0,"Position":243.0,"HyperDash":false},{"StartTime":87630.0,"Position":78.0,"HyperDash":false},{"StartTime":87712.0,"Position":172.0,"HyperDash":false},{"StartTime":87795.0,"Position":450.0,"HyperDash":false},{"StartTime":87877.0,"Position":231.0,"HyperDash":false},{"StartTime":87960.0,"Position":118.0,"HyperDash":false},{"StartTime":88042.0,"Position":511.0,"HyperDash":false},{"StartTime":88125.0,"Position":333.0,"HyperDash":false},{"StartTime":88208.0,"Position":234.0,"HyperDash":false},{"StartTime":88290.0,"Position":228.0,"HyperDash":false},{"StartTime":88373.0,"Position":302.0,"HyperDash":false},{"StartTime":88455.0,"Position":390.0,"HyperDash":false},{"StartTime":88538.0,"Position":75.0,"HyperDash":false},{"StartTime":88620.0,"Position":506.0,"HyperDash":false},{"StartTime":88703.0,"Position":3.0,"HyperDash":false},{"StartTime":88786.0,"Position":289.0,"HyperDash":false},{"StartTime":88868.0,"Position":217.0,"HyperDash":false},{"StartTime":88951.0,"Position":447.0,"HyperDash":false},{"StartTime":89033.0,"Position":324.0,"HyperDash":false},{"StartTime":89116.0,"Position":183.0,"HyperDash":false},{"StartTime":89198.0,"Position":279.0,"HyperDash":false},{"StartTime":89281.0,"Position":157.0,"HyperDash":false},{"StartTime":89363.0,"Position":501.0,"HyperDash":false},{"StartTime":89446.0,"Position":215.0,"HyperDash":false},{"StartTime":89529.0,"Position":79.0,"HyperDash":false},{"StartTime":89611.0,"Position":337.0,"HyperDash":false},{"StartTime":89694.0,"Position":380.0,"HyperDash":false},{"StartTime":89776.0,"Position":348.0,"HyperDash":false},{"StartTime":89859.0,"Position":225.0,"HyperDash":false},{"StartTime":89941.0,"Position":363.0,"HyperDash":false},{"StartTime":90024.0,"Position":96.0,"HyperDash":false},{"StartTime":90107.0,"Position":104.0,"HyperDash":false},{"StartTime":90189.0,"Position":173.0,"HyperDash":false},{"StartTime":90272.0,"Position":373.0,"HyperDash":false},{"StartTime":90354.0,"Position":424.0,"HyperDash":false},{"StartTime":90437.0,"Position":268.0,"HyperDash":false},{"StartTime":90519.0,"Position":373.0,"HyperDash":false},{"StartTime":90602.0,"Position":436.0,"HyperDash":false},{"StartTime":90684.0,"Position":190.0,"HyperDash":false},{"StartTime":90767.0,"Position":419.0,"HyperDash":false},{"StartTime":90850.0,"Position":158.0,"HyperDash":false},{"StartTime":90932.0,"Position":143.0,"HyperDash":false},{"StartTime":91015.0,"Position":266.0,"HyperDash":false},{"StartTime":91097.0,"Position":166.0,"HyperDash":false},{"StartTime":91180.0,"Position":297.0,"HyperDash":false},{"StartTime":91262.0,"Position":198.0,"HyperDash":false},{"StartTime":91345.0,"Position":241.0,"HyperDash":false},{"StartTime":91428.0,"Position":477.0,"HyperDash":false},{"StartTime":91510.0,"Position":371.0,"HyperDash":false},{"StartTime":91593.0,"Position":152.0,"HyperDash":false},{"StartTime":91675.0,"Position":321.0,"HyperDash":false},{"StartTime":91758.0,"Position":303.0,"HyperDash":false},{"StartTime":91840.0,"Position":259.0,"HyperDash":false},{"StartTime":91923.0,"Position":186.0,"HyperDash":false},{"StartTime":92005.0,"Position":140.0,"HyperDash":false},{"StartTime":92088.0,"Position":207.0,"HyperDash":false},{"StartTime":92171.0,"Position":278.0,"HyperDash":false},{"StartTime":92253.0,"Position":223.0,"HyperDash":false},{"StartTime":92336.0,"Position":389.0,"HyperDash":false},{"StartTime":92418.0,"Position":245.0,"HyperDash":false},{"StartTime":92501.0,"Position":400.0,"HyperDash":false},{"StartTime":92583.0,"Position":445.0,"HyperDash":false},{"StartTime":92666.0,"Position":443.0,"HyperDash":false},{"StartTime":92749.0,"Position":245.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3227428.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3227428.osu
new file mode 100644
index 0000000000..7f9cdb97cc
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3227428.osu
@@ -0,0 +1,142 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:4
+CircleSize:3.5
+OverallDifficulty:4
+ApproachRate:4
+SliderMultiplier:1.4
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+22,681.818181818182,4,2,1,60,1,0
+9908,-100,4,2,1,40,0,0
+10931,-100,4,2,1,67,0,0
+31726,-100,4,2,1,40,0,0
+33090,-100,4,2,1,67,0,0
+43658,-100,4,2,1,74,0,0
+53544,-100,4,2,1,50,0,0
+54908,-100,4,2,1,74,0,0
+75362,-100,4,2,1,50,0,0
+76726,-100,4,2,1,74,0,0
+86612,-100,4,2,1,67,0,0
+87294,-100,4,2,1,40,0,0
+87465,-100,4,2,1,67,0,0
+90022,-100,4,2,1,57,0,0
+91385,-100,4,2,1,37,0,0
+92067,-100,4,2,1,17,0,0
+92749,-100,4,2,1,5,0,0
+
+[HitObjects]
+206,12,22,5,0,2:0:0:0:
+137,71,362,2,0,L|54:77,2,70,2|0|0,2:0|2:0|2:0,0:0:0:0:
+220,108,1385,2,0,P|258:171|211:223,1,140,2|0,0:0|0:0,0:0:0:0:
+160,283,2408,2,0,L|79:277,2,70,0|2|2,0:0|0:0|0:1,0:0:0:0:
+340,303,3772,1,0,0:0:0:0:
+401,235,4112,2,0,L|405:82,1,140,2|0,0:0|0:0,0:0:0:0:
+343,27,5135,2,0,P|309:41|263:72,1,70,0|2,0:0|0:1,0:0:0:0:
+189,63,5817,6,0,L|93:55,2,70,2|0|0,0:0|0:0|0:0,0:0:0:0:
+208,151,6840,2,0,B|363:142,1,140,2|0,0:0|0:0,0:0:0:0:
+416,202,7862,2,0,P|436:245|446:291,2,70,0|2|2,0:0|0:0|0:1,0:0:0:0:
+275,86,9226,1,0,0:0:0:0:
+208,151,9567,2,0,P|187:194|177:297,2,140,6|0|2,0:0|0:0|0:1,0:0:0:0:
+272,87,11272,6,0,L|353:99,1,70,2|0,0:0|0:0,0:0:0:0:
+397,169,11953,2,0,P|431:164|465:157,2,70,0|2|0,0:0|0:1|0:0,0:0:0:0:
+309,196,12976,2,0,P|302:241|301:280,1,70
+226,317,13658,2,0,P|162:340|106:303,1,140,2|0,0:0|0:0,0:0:0:0:
+71,218,14681,1,0,0:0:0:0:
+109,135,15022,2,0,P|172:111|228:148,1,140,2|0,0:0|0:0,0:0:0:0:
+305,192,16044,2,0,P|342:187|384:176,1,70,0|2,0:0|0:1,0:0:0:0:
+416,99,16726,6,0,L|508:111,2,70,2|0|0,0:0|0:0|0:0,0:0:0:0:
+338,58,17749,2,0,B|313:113|313:113|305:200,1,140,2|0,0:0|0:0,0:0:0:0:
+293,287,18772,1,0,0:0:0:0:
+201,278,19112,2,0,B|112:265|112:265|63:277,1,140,2|0,0:0|0:0,0:0:0:0:
+129,107,20476,2,0,B|217:119|217:119|266:107,1,140,2|0,0:0|0:0,0:0:0:0:
+352,75,21499,6,0,P|393:51|436:33,2,70,0|2|2,0:0|0:1|0:0,0:0:0:0:
+337,165,22522,1,2,0:0:0:0:
+412,214,22862,2,0,P|409:254|403:303,1,70,0|2,0:0|0:0,0:0:0:0:
+214,306,23885,2,0,P|205:276|195:233,2,70,0|0|2,0:0|0:0|0:0,0:0:0:0:
+301,331,24908,2,0,L|306:188,1,140,2|0,0:1|0:0,0:0:0:0:
+302,99,25931,1,2,0:0:0:0:
+131,34,26612,1,0,0:0:0:0:
+67,99,26953,2,0,L|63:177,1,70,0|2,0:0|0:1,0:0:0:0:
+96,254,27635,6,0,L|107:343,2,70,2|0|0,0:0|0:0|0:0,0:0:0:0:
+165,194,28658,2,0,B|235:174|235:174|307:196,1,140,2|0,0:1|0:0,0:0:0:0:
+385,223,29681,2,0,L|455:220,2,70,0|2|2,0:0|0:0|0:0,0:0:0:0:
+202,223,31044,1,0,0:0:0:0:
+197,132,31385,2,0,L|50:122,2,140,6|0|0,0:0|0:0|0:0,0:0:0:0:
+285,111,33090,6,0,L|289:21,2,70,2|0|0,0:0|0:0|0:0,0:0:0:0:
+286,202,34112,2,0,L|290:292,1,70,2|0,0:0|0:0,0:0:0:0:
+373,306,34794,2,0,L|463:302,1,70
+453,212,35476,2,0,B|463:145|463:145|434:66,1,140,2|0,0:0|0:0,0:0:0:0:
+362,25,36499,1,2,0:0:0:0:
+304,95,36840,2,0,B|294:162|294:162|323:241,1,140,2|0,0:0|0:0,0:0:0:0:
+160,319,38203,6,0,L|81:317,1,70,2|0,0:0|0:0,0:0:0:0:
+48,235,38885,2,0,L|51:163,2,70,0|0|2,0:0|0:0|0:0,0:0:0:0:
+219,295,40249,2,0,L|296:292,1,70,2|0,0:0|0:0,0:0:0:0:
+379,284,40931,2,2,P|450:216|324:142,1,280,2|0,0:0|0:0,0:0:0:0:
+172,210,42976,6,0,B|150:143|150:143|169:69,1,140,2|6,0:0|0:0,0:0:0:0:
+255,54,43999,2,0,L|326:59,2,70,2|2|0,0:0|0:0|0:0,0:0:0:0:
+163,56,45022,2,0,P|126:58|80:64,1,70,2|0,0:0|0:0,0:0:0:0:
+81,153,45703,2,0,P|97:210|99:230,1,70
+123,308,46385,2,0,P|154:284|260:294,1,140,2|0,0:0|0:0,0:0:0:0:
+339,307,47408,2,0,L|421:313,1,70,0|2,0:0|0:0,0:0:0:0:
+436,132,48431,2,0,P|405:108|299:118,1,140,0|2,0:0|0:1,0:0:0:0:
+217,111,49453,6,0,P|205:72|196:40,2,70,2|2|0,0:0|0:0|0:0,0:0:0:0:
+153,175,50476,2,0,P|123:182|77:190,1,70,2|0,0:0|0:0,0:0:0:0:
+115,274,51158,2,0,B|172:253|172:253|259:268,1,140,0|2,0:0|0:0,0:0:0:0:
+339,247,52181,1,0,0:0:0:0:
+343,65,52862,1,0,0:0:0:0:
+253,81,53203,2,0,B|202:89|202:89|113:57,2,140,6|0|2,0:0|0:0|0:1,0:0:0:0:
+343,65,54908,5,2,0:0:0:0:
+418,116,55249,2,0,L|431:195,1,70
+415,279,55931,2,0,P|350:269|263:246,1,140,2|0,0:0|0:0,0:0:0:0:
+187,254,56953,1,0,0:0:0:0:
+96,242,57294,2,0,L|87:102,1,140,2|0,0:0|0:0,0:0:0:0:
+149,35,58317,1,2,0:0:0:0:
+239,29,58658,2,0,L|248:169,1,140,2|0,0:0|0:0,0:0:0:0:
+365,304,60022,6,0,P|406:290|435:276,1,70,2|2,0:1|0:0,0:0:0:0:
+436,187,60703,2,0,P|405:176|357:162,1,70
+294,217,61385,2,0,P|268:168|295:86,1,140,2|0,0:0|0:0,0:0:0:0:
+368,43,62408,1,0,0:0:0:0:
+451,79,62749,2,0,B|467:125|467:125|454:222,1,140,2|0,0:0|0:0,0:0:0:0:
+288,290,64112,2,0,B|242:306|242:306|145:293,1,140
+124,206,65135,6,0,P|80:211|48:219,2,70,0|2|2,0:0|0:1|0:0,0:0:0:0:
+212,184,66158,1,2,0:0:0:0:
+190,95,66499,2,0,P|205:62|224:31,1,70,2|2,0:0|0:0,0:0:0:0:
+400,67,67522,2,0,P|418:96|432:128,1,70
+441,219,68203,2,0,P|398:242|305:204,1,140,2|0,0:0|0:0,0:0:0:0:
+271,136,69226,2,0,L|186:151,1,70,0|2,0:0|0:0,0:0:0:0:
+71,275,70249,2,0,B|129:295|129:295|225:279,1,140,0|2,0:0|0:1,0:0:0:0:
+285,236,71272,6,0,P|291:273|290:308,2,70,2|2|0,0:0|0:0|0:0,0:0:0:0:
+257,150,72294,2,0,P|287:133|322:119,1,70,2|0,0:0|0:0,0:0:0:0:
+367,42,72976,2,0,P|415:63|420:159,1,140,0|2,0:0|0:0,0:0:0:0:
+368,210,73999,1,0,0:0:0:0:
+185,209,74681,1,0,0:0:0:0:
+108,159,75022,2,0,P|112:92|171:59,2,140,6|0|2,0:0|0:0|0:1,0:0:0:0:
+185,209,76726,5,2,0:0:0:0:
+134,284,77067,2,0,L|50:283,2,70,0|0|2,0:0|0:0|0:0,0:0:0:0:
+225,289,78090,2,0,P|264:280|309:278,1,70
+385,274,78772,1,0,0:0:0:0:
+429,194,79112,2,0,P|436:124|409:39,1,140,2|0,0:0|0:0,0:0:0:0:
+330,33,80135,1,2,0:0:0:0:
+239,38,80476,2,0,P|232:108|259:193,1,140,2|0,0:0|0:0,0:0:0:0:
+372,316,81840,6,0,L|283:303,1,70,2|0,0:0|0:0,0:0:0:0:
+222,262,82522,2,0,L|131:270,2,70,0|0|2,0:0|0:0|0:0,0:0:0:0:
+374,161,83885,2,0,P|356:130|335:102,1,70
+246,110,84567,2,0,P|214:138|321:303,2,280,2|0|2,0:0|0:0|0:1,0:0:0:0:
+256,192,87465,12,0,92749,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3524302-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3524302-expected-conversion.json
new file mode 100644
index 0000000000..b4ccc8da8f
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3524302-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":14259.0,"Objects":[{"StartTime":14259.0,"Position":65.0,"HyperDash":false},{"StartTime":14354.0,"Position":482.0,"HyperDash":false},{"StartTime":14450.0,"Position":164.0,"HyperDash":false},{"StartTime":14546.0,"Position":315.0,"HyperDash":false},{"StartTime":14642.0,"Position":145.0,"HyperDash":false},{"StartTime":14738.0,"Position":159.0,"HyperDash":false},{"StartTime":14833.0,"Position":310.0,"HyperDash":false},{"StartTime":14929.0,"Position":441.0,"HyperDash":false},{"StartTime":15025.0,"Position":428.0,"HyperDash":false},{"StartTime":15121.0,"Position":243.0,"HyperDash":false},{"StartTime":15217.0,"Position":422.0,"HyperDash":false},{"StartTime":15312.0,"Position":481.0,"HyperDash":false},{"StartTime":15408.0,"Position":104.0,"HyperDash":false},{"StartTime":15504.0,"Position":473.0,"HyperDash":false},{"StartTime":15600.0,"Position":135.0,"HyperDash":false},{"StartTime":15696.0,"Position":360.0,"HyperDash":false},{"StartTime":15792.0,"Position":123.0,"HyperDash":false},{"StartTime":15887.0,"Position":42.0,"HyperDash":false},{"StartTime":15983.0,"Position":393.0,"HyperDash":false},{"StartTime":16079.0,"Position":75.0,"HyperDash":false},{"StartTime":16175.0,"Position":377.0,"HyperDash":false},{"StartTime":16271.0,"Position":354.0,"HyperDash":false},{"StartTime":16366.0,"Position":287.0,"HyperDash":false},{"StartTime":16462.0,"Position":361.0,"HyperDash":false},{"StartTime":16558.0,"Position":479.0,"HyperDash":false},{"StartTime":16654.0,"Position":346.0,"HyperDash":false},{"StartTime":16750.0,"Position":266.0,"HyperDash":false},{"StartTime":16845.0,"Position":400.0,"HyperDash":false},{"StartTime":16941.0,"Position":202.0,"HyperDash":false},{"StartTime":17037.0,"Position":500.0,"HyperDash":false},{"StartTime":17133.0,"Position":80.0,"HyperDash":false},{"StartTime":17229.0,"Position":399.0,"HyperDash":false},{"StartTime":17325.0,"Position":455.0,"HyperDash":false}]},{"StartTime":17763.0,"Objects":[{"StartTime":17763.0,"Position":166.0,"HyperDash":false},{"StartTime":17854.0,"Position":153.171234,"HyperDash":false},{"StartTime":17981.0,"Position":164.014587,"HyperDash":false}]},{"StartTime":18201.0,"Objects":[{"StartTime":18201.0,"Position":358.0,"HyperDash":false},{"StartTime":18292.0,"Position":374.828766,"HyperDash":false},{"StartTime":18419.0,"Position":359.9854,"HyperDash":false}]},{"StartTime":18639.0,"Objects":[{"StartTime":18639.0,"Position":165.0,"HyperDash":false},{"StartTime":18730.0,"Position":95.399826,"HyperDash":false},{"StartTime":18857.0,"Position":27.0127716,"HyperDash":false}]},{"StartTime":18967.0,"Objects":[{"StartTime":18967.0,"Position":137.0,"HyperDash":false},{"StartTime":19076.0,"Position":205.993164,"HyperDash":false}]},{"StartTime":19296.0,"Objects":[{"StartTime":19296.0,"Position":25.0,"HyperDash":false}]},{"StartTime":19515.0,"Objects":[{"StartTime":19515.0,"Position":314.0,"HyperDash":false}]},{"StartTime":19624.0,"Objects":[{"StartTime":19624.0,"Position":350.0,"HyperDash":false}]},{"StartTime":19734.0,"Objects":[{"StartTime":19734.0,"Position":312.0,"HyperDash":false}]},{"StartTime":19953.0,"Objects":[{"StartTime":19953.0,"Position":118.0,"HyperDash":false},{"StartTime":20044.0,"Position":174.604065,"HyperDash":false},{"StartTime":20171.0,"Position":255.996536,"HyperDash":false}]},{"StartTime":20390.0,"Objects":[{"StartTime":20390.0,"Position":449.0,"HyperDash":false},{"StartTime":20481.0,"Position":437.183441,"HyperDash":false},{"StartTime":20608.0,"Position":451.835022,"HyperDash":false}]},{"StartTime":20828.0,"Objects":[{"StartTime":20828.0,"Position":271.0,"HyperDash":false}]},{"StartTime":21047.0,"Objects":[{"StartTime":21047.0,"Position":451.0,"HyperDash":true}]},{"StartTime":21266.0,"Objects":[{"StartTime":21266.0,"Position":133.0,"HyperDash":false}]},{"StartTime":21376.0,"Objects":[{"StartTime":21376.0,"Position":97.0,"HyperDash":false}]},{"StartTime":21485.0,"Objects":[{"StartTime":21485.0,"Position":136.0,"HyperDash":false}]},{"StartTime":21704.0,"Objects":[{"StartTime":21704.0,"Position":329.0,"HyperDash":false},{"StartTime":21795.0,"Position":323.8056,"HyperDash":false},{"StartTime":21922.0,"Position":330.929871,"HyperDash":false}]},{"StartTime":22142.0,"Objects":[{"StartTime":22142.0,"Position":136.0,"HyperDash":false},{"StartTime":22233.0,"Position":185.6055,"HyperDash":false},{"StartTime":22360.0,"Position":274.0,"HyperDash":false}]},{"StartTime":22471.0,"Objects":[{"StartTime":22471.0,"Position":385.0,"HyperDash":false},{"StartTime":22580.0,"Position":316.0,"HyperDash":false}]},{"StartTime":22799.0,"Objects":[{"StartTime":22799.0,"Position":136.0,"HyperDash":false}]},{"StartTime":23018.0,"Objects":[{"StartTime":23018.0,"Position":425.0,"HyperDash":false}]},{"StartTime":23128.0,"Objects":[{"StartTime":23128.0,"Position":461.0,"HyperDash":false}]},{"StartTime":23237.0,"Objects":[{"StartTime":23237.0,"Position":421.0,"HyperDash":false}]},{"StartTime":23456.0,"Objects":[{"StartTime":23456.0,"Position":227.0,"HyperDash":false},{"StartTime":23547.0,"Position":216.765884,"HyperDash":false},{"StartTime":23674.0,"Position":224.043533,"HyperDash":false}]},{"StartTime":23894.0,"Objects":[{"StartTime":23894.0,"Position":404.0,"HyperDash":false}]},{"StartTime":24113.0,"Objects":[{"StartTime":24113.0,"Position":224.0,"HyperDash":false}]},{"StartTime":24332.0,"Objects":[{"StartTime":24332.0,"Position":417.0,"HyperDash":false},{"StartTime":24423.0,"Position":412.811279,"HyperDash":false},{"StartTime":24550.0,"Position":418.943481,"HyperDash":false}]},{"StartTime":24661.0,"Objects":[{"StartTime":24661.0,"Position":341.0,"HyperDash":true}]},{"StartTime":24770.0,"Objects":[{"StartTime":24770.0,"Position":107.0,"HyperDash":false}]},{"StartTime":24880.0,"Objects":[{"StartTime":24880.0,"Position":69.0,"HyperDash":false}]},{"StartTime":24989.0,"Objects":[{"StartTime":24989.0,"Position":111.0,"HyperDash":false}]},{"StartTime":25208.0,"Objects":[{"StartTime":25208.0,"Position":304.0,"HyperDash":false},{"StartTime":25299.0,"Position":299.828766,"HyperDash":false},{"StartTime":25426.0,"Position":305.9854,"HyperDash":false}]},{"StartTime":25646.0,"Objects":[{"StartTime":25646.0,"Position":111.0,"HyperDash":false},{"StartTime":25737.0,"Position":124.585579,"HyperDash":false},{"StartTime":25864.0,"Position":110.007217,"HyperDash":false}]},{"StartTime":25974.0,"Objects":[{"StartTime":25974.0,"Position":220.0,"HyperDash":false},{"StartTime":26083.0,"Position":289.0,"HyperDash":false}]},{"StartTime":26303.0,"Objects":[{"StartTime":26303.0,"Position":108.0,"HyperDash":false}]},{"StartTime":26522.0,"Objects":[{"StartTime":26522.0,"Position":397.0,"HyperDash":false}]},{"StartTime":26631.0,"Objects":[{"StartTime":26631.0,"Position":432.0,"HyperDash":false}]},{"StartTime":26741.0,"Objects":[{"StartTime":26741.0,"Position":395.0,"HyperDash":false}]},{"StartTime":26960.0,"Objects":[{"StartTime":26960.0,"Position":215.0,"HyperDash":false}]},{"StartTime":27179.0,"Objects":[{"StartTime":27179.0,"Position":395.0,"HyperDash":false}]},{"StartTime":27398.0,"Objects":[{"StartTime":27398.0,"Position":201.0,"HyperDash":false},{"StartTime":27489.0,"Position":203.591461,"HyperDash":false},{"StartTime":27616.0,"Position":200.0213,"HyperDash":false}]},{"StartTime":27836.0,"Objects":[{"StartTime":27836.0,"Position":380.0,"HyperDash":false}]},{"StartTime":28055.0,"Objects":[{"StartTime":28055.0,"Position":200.0,"HyperDash":false}]},{"StartTime":28164.0,"Objects":[{"StartTime":28164.0,"Position":131.0,"HyperDash":true}]},{"StartTime":28274.0,"Objects":[{"StartTime":28274.0,"Position":365.0,"HyperDash":false},{"StartTime":28328.0,"Position":386.782776,"HyperDash":false},{"StartTime":28383.0,"Position":416.967926,"HyperDash":false},{"StartTime":28437.0,"Position":433.199036,"HyperDash":false},{"StartTime":28492.0,"Position":453.031036,"HyperDash":false},{"StartTime":28583.0,"Position":429.885376,"HyperDash":false},{"StartTime":28711.0,"Position":350.852478,"HyperDash":false}]},{"StartTime":28931.0,"Objects":[{"StartTime":28931.0,"Position":170.0,"HyperDash":false}]},{"StartTime":29150.0,"Objects":[{"StartTime":29150.0,"Position":349.0,"HyperDash":false},{"StartTime":29204.0,"Position":363.954376,"HyperDash":false},{"StartTime":29259.0,"Position":416.5623,"HyperDash":false},{"StartTime":29313.0,"Position":458.929749,"HyperDash":false},{"StartTime":29368.0,"Position":469.713531,"HyperDash":false},{"StartTime":29459.0,"Position":506.401428,"HyperDash":false},{"StartTime":29587.0,"Position":474.2096,"HyperDash":false}]},{"StartTime":30026.0,"Objects":[{"StartTime":30026.0,"Position":114.0,"HyperDash":false}]},{"StartTime":30244.0,"Objects":[{"StartTime":30244.0,"Position":292.0,"HyperDash":false}]},{"StartTime":30463.0,"Objects":[{"StartTime":30463.0,"Position":114.0,"HyperDash":false},{"StartTime":30554.0,"Position":104.591461,"HyperDash":false},{"StartTime":30681.0,"Position":113.0213,"HyperDash":false}]},{"StartTime":30901.0,"Objects":[{"StartTime":30901.0,"Position":307.0,"HyperDash":false},{"StartTime":30992.0,"Position":296.817017,"HyperDash":false},{"StartTime":31119.0,"Position":308.957245,"HyperDash":false}]},{"StartTime":31230.0,"Objects":[{"StartTime":31230.0,"Position":197.0,"HyperDash":false},{"StartTime":31339.0,"Position":128.007462,"HyperDash":false}]},{"StartTime":31558.0,"Objects":[{"StartTime":31558.0,"Position":417.0,"HyperDash":false},{"StartTime":31667.0,"Position":417.932343,"HyperDash":true}]},{"StartTime":31777.0,"Objects":[{"StartTime":31777.0,"Position":148.0,"HyperDash":false}]},{"StartTime":31887.0,"Objects":[{"StartTime":31887.0,"Position":78.0,"HyperDash":false}]},{"StartTime":31996.0,"Objects":[{"StartTime":31996.0,"Position":148.0,"HyperDash":false}]},{"StartTime":32215.0,"Objects":[{"StartTime":32215.0,"Position":341.0,"HyperDash":false},{"StartTime":32306.0,"Position":339.731537,"HyperDash":false},{"StartTime":32433.0,"Position":342.362183,"HyperDash":false}]},{"StartTime":32544.0,"Objects":[{"StartTime":32544.0,"Position":265.0,"HyperDash":false}]},{"StartTime":32653.0,"Objects":[{"StartTime":32653.0,"Position":155.0,"HyperDash":false},{"StartTime":32744.0,"Position":115.395584,"HyperDash":false},{"StartTime":32871.0,"Position":17.0026245,"HyperDash":false}]},{"StartTime":32982.0,"Objects":[{"StartTime":32982.0,"Position":93.0,"HyperDash":true}]},{"StartTime":33091.0,"Objects":[{"StartTime":33091.0,"Position":292.0,"HyperDash":false}]},{"StartTime":33310.0,"Objects":[{"StartTime":33310.0,"Position":112.0,"HyperDash":false},{"StartTime":33419.0,"Position":110.057106,"HyperDash":true}]},{"StartTime":33529.0,"Objects":[{"StartTime":33529.0,"Position":327.0,"HyperDash":false}]},{"StartTime":33639.0,"Objects":[{"StartTime":33639.0,"Position":396.0,"HyperDash":false}]},{"StartTime":33748.0,"Objects":[{"StartTime":33748.0,"Position":327.0,"HyperDash":false}]},{"StartTime":33967.0,"Objects":[{"StartTime":33967.0,"Position":133.0,"HyperDash":false},{"StartTime":34058.0,"Position":142.165222,"HyperDash":false},{"StartTime":34185.0,"Position":131.000214,"HyperDash":false}]},{"StartTime":34296.0,"Objects":[{"StartTime":34296.0,"Position":207.0,"HyperDash":false}]},{"StartTime":34405.0,"Objects":[{"StartTime":34405.0,"Position":316.0,"HyperDash":false},{"StartTime":34496.0,"Position":277.3945,"HyperDash":false},{"StartTime":34623.0,"Position":178.0,"HyperDash":false}]},{"StartTime":34734.0,"Objects":[{"StartTime":34734.0,"Position":254.0,"HyperDash":true}]},{"StartTime":34843.0,"Objects":[{"StartTime":34843.0,"Position":453.0,"HyperDash":false},{"StartTime":34934.0,"Position":448.526672,"HyperDash":false},{"StartTime":35061.0,"Position":455.260864,"HyperDash":false}]},{"StartTime":35172.0,"Objects":[{"StartTime":35172.0,"Position":378.0,"HyperDash":true}]},{"StartTime":35281.0,"Objects":[{"StartTime":35281.0,"Position":145.0,"HyperDash":false}]},{"StartTime":35390.0,"Objects":[{"StartTime":35390.0,"Position":76.0,"HyperDash":false}]},{"StartTime":35500.0,"Objects":[{"StartTime":35500.0,"Position":145.0,"HyperDash":false}]},{"StartTime":35719.0,"Objects":[{"StartTime":35719.0,"Position":338.0,"HyperDash":false},{"StartTime":35810.0,"Position":332.840851,"HyperDash":false},{"StartTime":35937.0,"Position":340.014374,"HyperDash":false}]},{"StartTime":36047.0,"Objects":[{"StartTime":36047.0,"Position":263.0,"HyperDash":false}]},{"StartTime":36157.0,"Objects":[{"StartTime":36157.0,"Position":165.0,"HyperDash":false}]},{"StartTime":36266.0,"Objects":[{"StartTime":36266.0,"Position":263.0,"HyperDash":false}]},{"StartTime":36376.0,"Objects":[{"StartTime":36376.0,"Position":339.0,"HyperDash":false}]},{"StartTime":36485.0,"Objects":[{"StartTime":36485.0,"Position":263.0,"HyperDash":true}]},{"StartTime":36595.0,"Objects":[{"StartTime":36595.0,"Position":61.0,"HyperDash":false},{"StartTime":36686.0,"Position":51.31877,"HyperDash":false},{"StartTime":36813.0,"Position":59.2572021,"HyperDash":false}]},{"StartTime":36923.0,"Objects":[{"StartTime":36923.0,"Position":135.0,"HyperDash":true}]},{"StartTime":37033.0,"Objects":[{"StartTime":37033.0,"Position":371.0,"HyperDash":false}]},{"StartTime":37142.0,"Objects":[{"StartTime":37142.0,"Position":439.0,"HyperDash":false}]},{"StartTime":37252.0,"Objects":[{"StartTime":37252.0,"Position":371.0,"HyperDash":false}]},{"StartTime":37471.0,"Objects":[{"StartTime":37471.0,"Position":177.0,"HyperDash":false},{"StartTime":37562.0,"Position":246.6055,"HyperDash":false},{"StartTime":37689.0,"Position":315.0,"HyperDash":false}]},{"StartTime":37799.0,"Objects":[{"StartTime":37799.0,"Position":238.0,"HyperDash":false}]},{"StartTime":37909.0,"Objects":[{"StartTime":37909.0,"Position":127.0,"HyperDash":false},{"StartTime":38000.0,"Position":113.171227,"HyperDash":false},{"StartTime":38127.0,"Position":125.014595,"HyperDash":false}]},{"StartTime":38237.0,"Objects":[{"StartTime":38237.0,"Position":201.0,"HyperDash":true}]},{"StartTime":38347.0,"Objects":[{"StartTime":38347.0,"Position":402.0,"HyperDash":false},{"StartTime":38438.0,"Position":395.763641,"HyperDash":false},{"StartTime":38565.0,"Position":404.707062,"HyperDash":false}]},{"StartTime":38675.0,"Objects":[{"StartTime":38675.0,"Position":328.0,"HyperDash":true}]},{"StartTime":38785.0,"Objects":[{"StartTime":38785.0,"Position":92.0,"HyperDash":false}]},{"StartTime":38894.0,"Objects":[{"StartTime":38894.0,"Position":23.0,"HyperDash":false}]},{"StartTime":39004.0,"Objects":[{"StartTime":39004.0,"Position":92.0,"HyperDash":false}]},{"StartTime":39223.0,"Objects":[{"StartTime":39223.0,"Position":285.0,"HyperDash":false},{"StartTime":39314.0,"Position":323.6055,"HyperDash":false},{"StartTime":39441.0,"Position":423.0,"HyperDash":false}]},{"StartTime":39551.0,"Objects":[{"StartTime":39551.0,"Position":346.0,"HyperDash":false}]},{"StartTime":39661.0,"Objects":[{"StartTime":39661.0,"Position":235.0,"HyperDash":false},{"StartTime":39770.0,"Position":234.054886,"HyperDash":false}]},{"StartTime":39880.0,"Objects":[{"StartTime":39880.0,"Position":344.0,"HyperDash":false},{"StartTime":39989.0,"Position":345.9429,"HyperDash":true}]},{"StartTime":40099.0,"Objects":[{"StartTime":40099.0,"Position":144.0,"HyperDash":false},{"StartTime":40190.0,"Position":89.39449,"HyperDash":false},{"StartTime":40317.0,"Position":6.0,"HyperDash":false}]},{"StartTime":40427.0,"Objects":[{"StartTime":40427.0,"Position":82.0,"HyperDash":true}]},{"StartTime":40536.0,"Objects":[{"StartTime":40536.0,"Position":315.0,"HyperDash":false}]},{"StartTime":40646.0,"Objects":[{"StartTime":40646.0,"Position":384.0,"HyperDash":false}]},{"StartTime":40755.0,"Objects":[{"StartTime":40755.0,"Position":315.0,"HyperDash":false}]},{"StartTime":40974.0,"Objects":[{"StartTime":40974.0,"Position":121.0,"HyperDash":false},{"StartTime":41065.0,"Position":106.171227,"HyperDash":false},{"StartTime":41192.0,"Position":119.014595,"HyperDash":false}]},{"StartTime":41303.0,"Objects":[{"StartTime":41303.0,"Position":195.0,"HyperDash":true}]},{"StartTime":41412.0,"Objects":[{"StartTime":41412.0,"Position":394.0,"HyperDash":false}]},{"StartTime":41631.0,"Objects":[{"StartTime":41631.0,"Position":214.0,"HyperDash":false}]},{"StartTime":41741.0,"Objects":[{"StartTime":41741.0,"Position":144.0,"HyperDash":false}]},{"StartTime":41850.0,"Objects":[{"StartTime":41850.0,"Position":214.0,"HyperDash":false}]},{"StartTime":42069.0,"Objects":[{"StartTime":42069.0,"Position":407.0,"HyperDash":false},{"StartTime":42178.0,"Position":476.0,"HyperDash":true}]},{"StartTime":42288.0,"Objects":[{"StartTime":42288.0,"Position":240.0,"HyperDash":false}]},{"StartTime":42398.0,"Objects":[{"StartTime":42398.0,"Position":170.0,"HyperDash":false}]},{"StartTime":42507.0,"Objects":[{"StartTime":42507.0,"Position":240.0,"HyperDash":false}]},{"StartTime":42726.0,"Objects":[{"StartTime":42726.0,"Position":419.0,"HyperDash":false}]},{"StartTime":42945.0,"Objects":[{"StartTime":42945.0,"Position":129.0,"HyperDash":false},{"StartTime":43054.0,"Position":128.028259,"HyperDash":false}]},{"StartTime":43164.0,"Objects":[{"StartTime":43164.0,"Position":238.0,"HyperDash":false},{"StartTime":43255.0,"Position":301.604065,"HyperDash":false},{"StartTime":43382.0,"Position":375.996582,"HyperDash":false}]},{"StartTime":43493.0,"Objects":[{"StartTime":43493.0,"Position":299.0,"HyperDash":false}]},{"StartTime":43602.0,"Objects":[{"StartTime":43602.0,"Position":195.0,"HyperDash":false}]},{"StartTime":43821.0,"Objects":[{"StartTime":43821.0,"Position":374.0,"HyperDash":false}]},{"StartTime":43931.0,"Objects":[{"StartTime":43931.0,"Position":376.0,"HyperDash":true}]},{"StartTime":44040.0,"Objects":[{"StartTime":44040.0,"Position":108.0,"HyperDash":false}]},{"StartTime":44150.0,"Objects":[{"StartTime":44150.0,"Position":106.0,"HyperDash":false}]},{"StartTime":44259.0,"Objects":[{"StartTime":44259.0,"Position":209.0,"HyperDash":false}]},{"StartTime":44478.0,"Objects":[{"StartTime":44478.0,"Position":388.0,"HyperDash":false}]},{"StartTime":44697.0,"Objects":[{"StartTime":44697.0,"Position":195.0,"HyperDash":false}]},{"StartTime":44916.0,"Objects":[{"StartTime":44916.0,"Position":484.0,"HyperDash":false}]},{"StartTime":45026.0,"Objects":[{"StartTime":45026.0,"Position":407.0,"HyperDash":false}]},{"StartTime":45244.0,"Objects":[{"StartTime":45244.0,"Position":213.0,"HyperDash":false}]},{"StartTime":45354.0,"Objects":[{"StartTime":45354.0,"Position":316.0,"HyperDash":false},{"StartTime":45445.0,"Position":386.604126,"HyperDash":false},{"StartTime":45572.0,"Position":453.996674,"HyperDash":true}]},{"StartTime":45792.0,"Objects":[{"StartTime":45792.0,"Position":103.0,"HyperDash":false},{"StartTime":45846.0,"Position":59.25476,"HyperDash":false},{"StartTime":45901.0,"Position":32.3233032,"HyperDash":false},{"StartTime":45955.0,"Position":30.0666771,"HyperDash":false},{"StartTime":46010.0,"Position":14.6513605,"HyperDash":false},{"StartTime":46101.0,"Position":45.94827,"HyperDash":false},{"StartTime":46229.0,"Position":114.217232,"HyperDash":false}]},{"StartTime":46449.0,"Objects":[{"StartTime":46449.0,"Position":294.0,"HyperDash":false},{"StartTime":46503.0,"Position":260.4281,"HyperDash":false},{"StartTime":46558.0,"Position":236.271561,"HyperDash":false},{"StartTime":46612.0,"Position":192.699677,"HyperDash":false},{"StartTime":46667.0,"Position":166.543121,"HyperDash":false},{"StartTime":46758.0,"Position":132.338623,"HyperDash":false},{"StartTime":46886.0,"Position":38.5015564,"HyperDash":false}]},{"StartTime":47106.0,"Objects":[{"StartTime":47106.0,"Position":204.0,"HyperDash":false}]},{"StartTime":47325.0,"Objects":[{"StartTime":47325.0,"Position":38.0,"HyperDash":true}]},{"StartTime":47544.0,"Objects":[{"StartTime":47544.0,"Position":355.0,"HyperDash":false},{"StartTime":47598.0,"Position":383.787079,"HyperDash":false},{"StartTime":47653.0,"Position":419.23172,"HyperDash":false},{"StartTime":47707.0,"Position":453.6615,"HyperDash":false},{"StartTime":47762.0,"Position":443.4226,"HyperDash":false},{"StartTime":47853.0,"Position":433.484253,"HyperDash":false},{"StartTime":47981.0,"Position":340.2439,"HyperDash":false}]},{"StartTime":48201.0,"Objects":[{"StartTime":48201.0,"Position":173.0,"HyperDash":false}]},{"StartTime":48420.0,"Objects":[{"StartTime":48420.0,"Position":338.0,"HyperDash":false},{"StartTime":48474.0,"Position":355.147217,"HyperDash":false},{"StartTime":48529.0,"Position":351.588867,"HyperDash":false},{"StartTime":48583.0,"Position":355.8642,"HyperDash":false},{"StartTime":48638.0,"Position":329.530029,"HyperDash":false},{"StartTime":48729.0,"Position":296.7339,"HyperDash":false},{"StartTime":48857.0,"Position":203.29097,"HyperDash":false}]},{"StartTime":49077.0,"Objects":[{"StartTime":49077.0,"Position":369.0,"HyperDash":true}]},{"StartTime":49296.0,"Objects":[{"StartTime":49296.0,"Position":51.0,"HyperDash":false},{"StartTime":49387.0,"Position":38.1829834,"HyperDash":false},{"StartTime":49514.0,"Position":49.04275,"HyperDash":false}]},{"StartTime":49734.0,"Objects":[{"StartTime":49734.0,"Position":229.0,"HyperDash":false},{"StartTime":49825.0,"Position":270.604065,"HyperDash":false},{"StartTime":49952.0,"Position":366.996582,"HyperDash":false}]},{"StartTime":50172.0,"Objects":[{"StartTime":50172.0,"Position":186.0,"HyperDash":false},{"StartTime":50263.0,"Position":121.395981,"HyperDash":false},{"StartTime":50390.0,"Position":48.00357,"HyperDash":false}]},{"StartTime":50609.0,"Objects":[{"StartTime":50609.0,"Position":227.0,"HyperDash":false}]},{"StartTime":50828.0,"Objects":[{"StartTime":50828.0,"Position":47.0,"HyperDash":true}]},{"StartTime":51047.0,"Objects":[{"StartTime":51047.0,"Position":347.0,"HyperDash":false},{"StartTime":51101.0,"Position":362.642029,"HyperDash":false},{"StartTime":51156.0,"Position":410.800537,"HyperDash":false},{"StartTime":51210.0,"Position":450.264282,"HyperDash":false},{"StartTime":51265.0,"Position":470.407257,"HyperDash":false},{"StartTime":51356.0,"Position":491.032837,"HyperDash":false},{"StartTime":51484.0,"Position":477.784576,"HyperDash":false}]},{"StartTime":51923.0,"Objects":[{"StartTime":51923.0,"Position":118.0,"HyperDash":false},{"StartTime":52014.0,"Position":119.348648,"HyperDash":false},{"StartTime":52141.0,"Position":119.0904,"HyperDash":false}]},{"StartTime":52361.0,"Objects":[{"StartTime":52361.0,"Position":313.0,"HyperDash":false}]},{"StartTime":52580.0,"Objects":[{"StartTime":52580.0,"Position":119.0,"HyperDash":true}]},{"StartTime":52799.0,"Objects":[{"StartTime":52799.0,"Position":436.0,"HyperDash":false},{"StartTime":52853.0,"Position":399.0876,"HyperDash":false},{"StartTime":52908.0,"Position":381.54715,"HyperDash":false},{"StartTime":52962.0,"Position":320.634735,"HyperDash":false},{"StartTime":53017.0,"Position":299.0943,"HyperDash":false},{"StartTime":53108.0,"Position":229.9456,"HyperDash":false},{"StartTime":53236.0,"Position":161.560608,"HyperDash":false}]},{"StartTime":53456.0,"Objects":[{"StartTime":53456.0,"Position":452.0,"HyperDash":false}]},{"StartTime":53566.0,"Objects":[{"StartTime":53566.0,"Position":489.0,"HyperDash":false}]},{"StartTime":53675.0,"Objects":[{"StartTime":53675.0,"Position":454.0,"HyperDash":false}]},{"StartTime":53894.0,"Objects":[{"StartTime":53894.0,"Position":274.0,"HyperDash":false}]},{"StartTime":54113.0,"Objects":[{"StartTime":54113.0,"Position":454.0,"HyperDash":false},{"StartTime":54204.0,"Position":399.395721,"HyperDash":false},{"StartTime":54331.0,"Position":316.00293,"HyperDash":true}]},{"StartTime":54551.0,"Objects":[{"StartTime":54551.0,"Position":24.0,"HyperDash":false},{"StartTime":54605.0,"Position":67.96123,"HyperDash":false},{"StartTime":54660.0,"Position":88.55135,"HyperDash":false},{"StartTime":54714.0,"Position":106.512581,"HyperDash":false},{"StartTime":54769.0,"Position":161.1027,"HyperDash":false},{"StartTime":54860.0,"Position":223.333679,"HyperDash":false},{"StartTime":54988.0,"Position":298.834351,"HyperDash":false}]},{"StartTime":55208.0,"Objects":[{"StartTime":55208.0,"Position":104.0,"HyperDash":false}]},{"StartTime":55317.0,"Objects":[{"StartTime":55317.0,"Position":62.0,"HyperDash":false}]},{"StartTime":55427.0,"Objects":[{"StartTime":55427.0,"Position":104.0,"HyperDash":false}]},{"StartTime":55646.0,"Objects":[{"StartTime":55646.0,"Position":393.0,"HyperDash":false},{"StartTime":55737.0,"Position":340.600342,"HyperDash":false},{"StartTime":55864.0,"Position":267.4712,"HyperDash":false}]},{"StartTime":56084.0,"Objects":[{"StartTime":56084.0,"Position":87.0,"HyperDash":true}]},{"StartTime":56303.0,"Objects":[{"StartTime":56303.0,"Position":432.0,"HyperDash":false},{"StartTime":56357.0,"Position":388.775055,"HyperDash":false},{"StartTime":56412.0,"Position":359.8976,"HyperDash":false},{"StartTime":56466.0,"Position":338.6523,"HyperDash":false},{"StartTime":56521.0,"Position":318.247742,"HyperDash":false},{"StartTime":56612.0,"Position":256.532,"HyperDash":false},{"StartTime":56740.0,"Position":183.343277,"HyperDash":false}]},{"StartTime":56960.0,"Objects":[{"StartTime":56960.0,"Position":365.0,"HyperDash":false}]},{"StartTime":57179.0,"Objects":[{"StartTime":57179.0,"Position":75.0,"HyperDash":false},{"StartTime":57270.0,"Position":148.586823,"HyperDash":false},{"StartTime":57397.0,"Position":212.955231,"HyperDash":false}]},{"StartTime":57617.0,"Objects":[{"StartTime":57617.0,"Position":407.0,"HyperDash":false},{"StartTime":57708.0,"Position":422.1916,"HyperDash":false},{"StartTime":57835.0,"Position":409.854553,"HyperDash":true}]},{"StartTime":58055.0,"Objects":[{"StartTime":58055.0,"Position":118.0,"HyperDash":false},{"StartTime":58109.0,"Position":145.079269,"HyperDash":false},{"StartTime":58164.0,"Position":167.789642,"HyperDash":false},{"StartTime":58218.0,"Position":202.8689,"HyperDash":false},{"StartTime":58273.0,"Position":255.579269,"HyperDash":false},{"StartTime":58328.0,"Position":291.2896,"HyperDash":false},{"StartTime":58383.0,"Position":325.0,"HyperDash":false},{"StartTime":58437.0,"Position":294.920746,"HyperDash":false},{"StartTime":58492.0,"Position":256.210358,"HyperDash":false},{"StartTime":58583.0,"Position":185.780487,"HyperDash":false},{"StartTime":58711.0,"Position":118.0,"HyperDash":false}]},{"StartTime":58931.0,"Objects":[{"StartTime":58931.0,"Position":312.0,"HyperDash":false},{"StartTime":58985.0,"Position":312.3719,"HyperDash":false},{"StartTime":59040.0,"Position":318.289,"HyperDash":false},{"StartTime":59094.0,"Position":279.119,"HyperDash":false},{"StartTime":59149.0,"Position":279.84906,"HyperDash":false},{"StartTime":59203.0,"Position":240.6435,"HyperDash":false},{"StartTime":59258.0,"Position":241.519592,"HyperDash":false},{"StartTime":59313.0,"Position":180.829834,"HyperDash":false},{"StartTime":59368.0,"Position":166.661133,"HyperDash":false},{"StartTime":59459.0,"Position":118.512878,"HyperDash":false},{"StartTime":59587.0,"Position":33.8594971,"HyperDash":true}]},{"StartTime":59807.0,"Objects":[{"StartTime":59807.0,"Position":380.0,"HyperDash":false},{"StartTime":59898.0,"Position":403.4091,"HyperDash":false},{"StartTime":60025.0,"Position":380.555023,"HyperDash":false}]},{"StartTime":60135.0,"Objects":[{"StartTime":60135.0,"Position":290.0,"HyperDash":false}]},{"StartTime":60244.0,"Objects":[{"StartTime":60244.0,"Position":380.0,"HyperDash":false},{"StartTime":60353.0,"Position":381.815155,"HyperDash":true}]},{"StartTime":60463.0,"Objects":[{"StartTime":60463.0,"Position":180.0,"HyperDash":false},{"StartTime":60572.0,"Position":111.0,"HyperDash":true}]},{"StartTime":60682.0,"Objects":[{"StartTime":60682.0,"Position":346.0,"HyperDash":false},{"StartTime":60791.0,"Position":346.0,"HyperDash":true}]},{"StartTime":60901.0,"Objects":[{"StartTime":60901.0,"Position":144.0,"HyperDash":true}]},{"StartTime":61011.0,"Objects":[{"StartTime":61011.0,"Position":345.0,"HyperDash":false}]},{"StartTime":61120.0,"Objects":[{"StartTime":61120.0,"Position":441.0,"HyperDash":false},{"StartTime":61211.0,"Position":474.310272,"HyperDash":false},{"StartTime":61338.0,"Position":439.1717,"HyperDash":false}]},{"StartTime":61449.0,"Objects":[{"StartTime":61449.0,"Position":355.0,"HyperDash":true}]},{"StartTime":61558.0,"Objects":[{"StartTime":61558.0,"Position":121.0,"HyperDash":false},{"StartTime":61667.0,"Position":120.041756,"HyperDash":true}]},{"StartTime":61777.0,"Objects":[{"StartTime":61777.0,"Position":321.0,"HyperDash":true}]},{"StartTime":61887.0,"Objects":[{"StartTime":61887.0,"Position":120.0,"HyperDash":false}]},{"StartTime":61996.0,"Objects":[{"StartTime":61996.0,"Position":23.0,"HyperDash":false},{"StartTime":62087.0,"Position":92.6042938,"HyperDash":false},{"StartTime":62214.0,"Position":160.997086,"HyperDash":false}]},{"StartTime":62325.0,"Objects":[{"StartTime":62325.0,"Position":63.0,"HyperDash":true}]},{"StartTime":62434.0,"Objects":[{"StartTime":62434.0,"Position":296.0,"HyperDash":false},{"StartTime":62543.0,"Position":296.971741,"HyperDash":false}]},{"StartTime":62653.0,"Objects":[{"StartTime":62653.0,"Position":199.0,"HyperDash":true}]},{"StartTime":62763.0,"Objects":[{"StartTime":62763.0,"Position":400.0,"HyperDash":false}]},{"StartTime":62872.0,"Objects":[{"StartTime":62872.0,"Position":303.0,"HyperDash":false},{"StartTime":62963.0,"Position":294.5297,"HyperDash":false},{"StartTime":63090.0,"Position":354.147156,"HyperDash":false}]},{"StartTime":63201.0,"Objects":[{"StartTime":63201.0,"Position":438.0,"HyperDash":true}]},{"StartTime":63310.0,"Objects":[{"StartTime":63310.0,"Position":204.0,"HyperDash":false},{"StartTime":63401.0,"Position":148.549332,"HyperDash":false},{"StartTime":63528.0,"Position":93.9026642,"HyperDash":false}]},{"StartTime":63639.0,"Objects":[{"StartTime":63639.0,"Position":184.0,"HyperDash":false}]},{"StartTime":63748.0,"Objects":[{"StartTime":63748.0,"Position":93.0,"HyperDash":false},{"StartTime":63857.0,"Position":92.17863,"HyperDash":true}]},{"StartTime":63967.0,"Objects":[{"StartTime":63967.0,"Position":293.0,"HyperDash":false},{"StartTime":64076.0,"Position":293.919922,"HyperDash":true}]},{"StartTime":64186.0,"Objects":[{"StartTime":64186.0,"Position":93.0,"HyperDash":true}]},{"StartTime":64296.0,"Objects":[{"StartTime":64296.0,"Position":293.0,"HyperDash":false},{"StartTime":64405.0,"Position":362.0,"HyperDash":true}]},{"StartTime":64515.0,"Objects":[{"StartTime":64515.0,"Position":160.0,"HyperDash":false}]},{"StartTime":64624.0,"Objects":[{"StartTime":64624.0,"Position":63.0,"HyperDash":false},{"StartTime":64715.0,"Position":16.49675,"HyperDash":false},{"StartTime":64842.0,"Position":70.69653,"HyperDash":false}]},{"StartTime":64953.0,"Objects":[{"StartTime":64953.0,"Position":154.0,"HyperDash":true}]},{"StartTime":65062.0,"Objects":[{"StartTime":65062.0,"Position":387.0,"HyperDash":false},{"StartTime":65171.0,"Position":318.007446,"HyperDash":true}]},{"StartTime":65281.0,"Objects":[{"StartTime":65281.0,"Position":116.0,"HyperDash":true}]},{"StartTime":65390.0,"Objects":[{"StartTime":65390.0,"Position":318.0,"HyperDash":false}]},{"StartTime":65500.0,"Objects":[{"StartTime":65500.0,"Position":415.0,"HyperDash":false},{"StartTime":65591.0,"Position":455.432068,"HyperDash":false},{"StartTime":65718.0,"Position":412.315582,"HyperDash":false}]},{"StartTime":65828.0,"Objects":[{"StartTime":65828.0,"Position":315.0,"HyperDash":true}]},{"StartTime":65938.0,"Objects":[{"StartTime":65938.0,"Position":79.0,"HyperDash":false},{"StartTime":66047.0,"Position":78.01439,"HyperDash":false}]},{"StartTime":66157.0,"Objects":[{"StartTime":66157.0,"Position":175.0,"HyperDash":true}]},{"StartTime":66266.0,"Objects":[{"StartTime":66266.0,"Position":374.0,"HyperDash":false}]},{"StartTime":66376.0,"Objects":[{"StartTime":66376.0,"Position":276.0,"HyperDash":false},{"StartTime":66467.0,"Position":321.6042,"HyperDash":false},{"StartTime":66594.0,"Position":413.996857,"HyperDash":false}]},{"StartTime":66704.0,"Objects":[{"StartTime":66704.0,"Position":331.0,"HyperDash":true}]},{"StartTime":66814.0,"Objects":[{"StartTime":66814.0,"Position":60.0,"HyperDash":false},{"StartTime":66905.0,"Position":21.5649185,"HyperDash":false},{"StartTime":67032.0,"Position":61.75552,"HyperDash":false}]},{"StartTime":67142.0,"Objects":[{"StartTime":67142.0,"Position":151.0,"HyperDash":false}]},{"StartTime":67252.0,"Objects":[{"StartTime":67252.0,"Position":61.0,"HyperDash":true}]},{"StartTime":67471.0,"Objects":[{"StartTime":67471.0,"Position":378.0,"HyperDash":false}]},{"StartTime":67580.0,"Objects":[{"StartTime":67580.0,"Position":422.0,"HyperDash":false}]},{"StartTime":67690.0,"Objects":[{"StartTime":67690.0,"Position":381.0,"HyperDash":false}]},{"StartTime":67799.0,"Objects":[{"StartTime":67799.0,"Position":305.0,"HyperDash":false}]},{"StartTime":67909.0,"Objects":[{"StartTime":67909.0,"Position":194.0,"HyperDash":false},{"StartTime":68018.0,"Position":193.103973,"HyperDash":true}]},{"StartTime":68128.0,"Objects":[{"StartTime":68128.0,"Position":428.0,"HyperDash":false},{"StartTime":68219.0,"Position":351.3945,"HyperDash":false},{"StartTime":68346.0,"Position":290.0,"HyperDash":false}]},{"StartTime":68456.0,"Objects":[{"StartTime":68456.0,"Position":373.0,"HyperDash":true}]},{"StartTime":68566.0,"Objects":[{"StartTime":68566.0,"Position":137.0,"HyperDash":false},{"StartTime":68675.0,"Position":135.057114,"HyperDash":false}]},{"StartTime":68785.0,"Objects":[{"StartTime":68785.0,"Position":245.0,"HyperDash":false},{"StartTime":68894.0,"Position":245.896027,"HyperDash":true}]},{"StartTime":69004.0,"Objects":[{"StartTime":69004.0,"Position":44.0,"HyperDash":false},{"StartTime":69095.0,"Position":103.604172,"HyperDash":false},{"StartTime":69222.0,"Position":181.9968,"HyperDash":false}]},{"StartTime":69332.0,"Objects":[{"StartTime":69332.0,"Position":98.0,"HyperDash":true}]},{"StartTime":69442.0,"Objects":[{"StartTime":69442.0,"Position":333.0,"HyperDash":false},{"StartTime":69551.0,"Position":334.768646,"HyperDash":true}]},{"StartTime":69661.0,"Objects":[{"StartTime":69661.0,"Position":133.0,"HyperDash":false}]},{"StartTime":69880.0,"Objects":[{"StartTime":69880.0,"Position":326.0,"HyperDash":false}]},{"StartTime":70099.0,"Objects":[{"StartTime":70099.0,"Position":133.0,"HyperDash":false},{"StartTime":70208.0,"Position":131.084076,"HyperDash":true}]},{"StartTime":70317.0,"Objects":[{"StartTime":70317.0,"Position":398.0,"HyperDash":false},{"StartTime":70371.0,"Position":358.896545,"HyperDash":false},{"StartTime":70426.0,"Position":310.16153,"HyperDash":false},{"StartTime":70480.0,"Position":280.058075,"HyperDash":false},{"StartTime":70535.0,"Position":260.323059,"HyperDash":false},{"StartTime":70626.0,"Position":200.8524,"HyperDash":false},{"StartTime":70754.0,"Position":122.014557,"HyperDash":true}]},{"StartTime":70974.0,"Objects":[{"StartTime":70974.0,"Position":468.0,"HyperDash":false},{"StartTime":71028.0,"Position":427.894928,"HyperDash":false},{"StartTime":71083.0,"Position":386.1583,"HyperDash":false},{"StartTime":71137.0,"Position":356.053223,"HyperDash":false},{"StartTime":71192.0,"Position":330.3166,"HyperDash":false},{"StartTime":71283.0,"Position":261.843262,"HyperDash":false},{"StartTime":71411.0,"Position":192.001617,"HyperDash":false}]},{"StartTime":71631.0,"Objects":[{"StartTime":71631.0,"Position":483.0,"HyperDash":false},{"StartTime":71722.0,"Position":425.3945,"HyperDash":false},{"StartTime":71849.0,"Position":345.0,"HyperDash":true}]},{"StartTime":72069.0,"Objects":[{"StartTime":72069.0,"Position":26.0,"HyperDash":false},{"StartTime":72123.0,"Position":46.07927,"HyperDash":false},{"StartTime":72178.0,"Position":95.7896347,"HyperDash":false},{"StartTime":72232.0,"Position":143.8689,"HyperDash":false},{"StartTime":72287.0,"Position":163.579269,"HyperDash":false},{"StartTime":72342.0,"Position":192.289627,"HyperDash":false},{"StartTime":72397.0,"Position":233.0,"HyperDash":false},{"StartTime":72451.0,"Position":215.920746,"HyperDash":false},{"StartTime":72506.0,"Position":164.210358,"HyperDash":false},{"StartTime":72597.0,"Position":121.780487,"HyperDash":false},{"StartTime":72725.0,"Position":26.0,"HyperDash":true}]},{"StartTime":72945.0,"Objects":[{"StartTime":72945.0,"Position":344.0,"HyperDash":false},{"StartTime":72999.0,"Position":395.749939,"HyperDash":false},{"StartTime":73054.0,"Position":392.115662,"HyperDash":false},{"StartTime":73108.0,"Position":414.29538,"HyperDash":false},{"StartTime":73163.0,"Position":437.262848,"HyperDash":false},{"StartTime":73254.0,"Position":425.923279,"HyperDash":false},{"StartTime":73382.0,"Position":338.6331,"HyperDash":false}]},{"StartTime":73493.0,"Objects":[{"StartTime":73493.0,"Position":247.0,"HyperDash":false}]},{"StartTime":73602.0,"Objects":[{"StartTime":73602.0,"Position":338.0,"HyperDash":true}]},{"StartTime":73712.0,"Objects":[{"StartTime":73712.0,"Position":102.0,"HyperDash":true}]},{"StartTime":73821.0,"Objects":[{"StartTime":73821.0,"Position":338.0,"HyperDash":false},{"StartTime":73912.0,"Position":386.8002,"HyperDash":false},{"StartTime":74039.0,"Position":335.152557,"HyperDash":false}]},{"StartTime":74150.0,"Objects":[{"StartTime":74150.0,"Position":244.0,"HyperDash":false}]},{"StartTime":74259.0,"Objects":[{"StartTime":74259.0,"Position":334.0,"HyperDash":false},{"StartTime":74368.0,"Position":334.958252,"HyperDash":true}]},{"StartTime":74478.0,"Objects":[{"StartTime":74478.0,"Position":133.0,"HyperDash":false},{"StartTime":74587.0,"Position":131.253723,"HyperDash":true}]},{"StartTime":74697.0,"Objects":[{"StartTime":74697.0,"Position":366.0,"HyperDash":false},{"StartTime":74806.0,"Position":366.896027,"HyperDash":true}]},{"StartTime":74916.0,"Objects":[{"StartTime":74916.0,"Position":165.0,"HyperDash":true}]},{"StartTime":75026.0,"Objects":[{"StartTime":75026.0,"Position":366.0,"HyperDash":false}]},{"StartTime":75135.0,"Objects":[{"StartTime":75135.0,"Position":462.0,"HyperDash":false},{"StartTime":75226.0,"Position":396.3945,"HyperDash":false},{"StartTime":75353.0,"Position":324.0,"HyperDash":false}]},{"StartTime":75463.0,"Objects":[{"StartTime":75463.0,"Position":407.0,"HyperDash":true}]},{"StartTime":75573.0,"Objects":[{"StartTime":75573.0,"Position":171.0,"HyperDash":false},{"StartTime":75682.0,"Position":169.3576,"HyperDash":true}]},{"StartTime":75792.0,"Objects":[{"StartTime":75792.0,"Position":370.0,"HyperDash":true}]},{"StartTime":75901.0,"Objects":[{"StartTime":75901.0,"Position":170.0,"HyperDash":false}]},{"StartTime":76011.0,"Objects":[{"StartTime":76011.0,"Position":72.0,"HyperDash":false},{"StartTime":76102.0,"Position":31.1678276,"HyperDash":false},{"StartTime":76229.0,"Position":82.8498,"HyperDash":false}]},{"StartTime":76339.0,"Objects":[{"StartTime":76339.0,"Position":179.0,"HyperDash":true}]},{"StartTime":76449.0,"Objects":[{"StartTime":76449.0,"Position":414.0,"HyperDash":false},{"StartTime":76558.0,"Position":483.0,"HyperDash":false}]},{"StartTime":76668.0,"Objects":[{"StartTime":76668.0,"Position":385.0,"HyperDash":true}]},{"StartTime":76777.0,"Objects":[{"StartTime":76777.0,"Position":185.0,"HyperDash":false}]},{"StartTime":76887.0,"Objects":[{"StartTime":76887.0,"Position":282.0,"HyperDash":false},{"StartTime":76978.0,"Position":335.60437,"HyperDash":false},{"StartTime":77105.0,"Position":419.9973,"HyperDash":false}]},{"StartTime":77215.0,"Objects":[{"StartTime":77215.0,"Position":336.0,"HyperDash":true}]},{"StartTime":77325.0,"Objects":[{"StartTime":77325.0,"Position":100.0,"HyperDash":false},{"StartTime":77416.0,"Position":88.294014,"HyperDash":false},{"StartTime":77543.0,"Position":102.248474,"HyperDash":false}]},{"StartTime":77653.0,"Objects":[{"StartTime":77653.0,"Position":192.0,"HyperDash":false}]},{"StartTime":77763.0,"Objects":[{"StartTime":77763.0,"Position":102.0,"HyperDash":false},{"StartTime":77872.0,"Position":100.2084,"HyperDash":true}]},{"StartTime":77982.0,"Objects":[{"StartTime":77982.0,"Position":301.0,"HyperDash":false},{"StartTime":78091.0,"Position":370.0,"HyperDash":true}]},{"StartTime":78201.0,"Objects":[{"StartTime":78201.0,"Position":134.0,"HyperDash":false},{"StartTime":78310.0,"Position":133.028259,"HyperDash":true}]},{"StartTime":78420.0,"Objects":[{"StartTime":78420.0,"Position":334.0,"HyperDash":true}]},{"StartTime":78529.0,"Objects":[{"StartTime":78529.0,"Position":135.0,"HyperDash":false}]},{"StartTime":78639.0,"Objects":[{"StartTime":78639.0,"Position":37.0,"HyperDash":false},{"StartTime":78730.0,"Position":18.6601868,"HyperDash":false},{"StartTime":78857.0,"Position":64.53217,"HyperDash":false}]},{"StartTime":78967.0,"Objects":[{"StartTime":78967.0,"Position":147.0,"HyperDash":true}]},{"StartTime":79077.0,"Objects":[{"StartTime":79077.0,"Position":382.0,"HyperDash":false},{"StartTime":79186.0,"Position":384.028534,"HyperDash":false}]},{"StartTime":79296.0,"Objects":[{"StartTime":79296.0,"Position":273.0,"HyperDash":false},{"StartTime":79405.0,"Position":270.971466,"HyperDash":true}]},{"StartTime":79515.0,"Objects":[{"StartTime":79515.0,"Position":472.0,"HyperDash":false},{"StartTime":79624.0,"Position":473.915924,"HyperDash":true}]},{"StartTime":79734.0,"Objects":[{"StartTime":79734.0,"Position":203.0,"HyperDash":false},{"StartTime":79843.0,"Position":134.006836,"HyperDash":false}]},{"StartTime":79953.0,"Objects":[{"StartTime":79953.0,"Position":244.0,"HyperDash":false},{"StartTime":80062.0,"Position":313.0,"HyperDash":true}]},{"StartTime":80172.0,"Objects":[{"StartTime":80172.0,"Position":111.0,"HyperDash":false},{"StartTime":80281.0,"Position":108.002831,"HyperDash":true}]},{"StartTime":80390.0,"Objects":[{"StartTime":80390.0,"Position":307.0,"HyperDash":false},{"StartTime":80499.0,"Position":376.0,"HyperDash":true}]},{"StartTime":80609.0,"Objects":[{"StartTime":80609.0,"Position":140.0,"HyperDash":false},{"StartTime":80718.0,"Position":71.0,"HyperDash":true}]},{"StartTime":80828.0,"Objects":[{"StartTime":80828.0,"Position":341.0,"HyperDash":false},{"StartTime":80919.0,"Position":398.6055,"HyperDash":false},{"StartTime":81046.0,"Position":479.0,"HyperDash":false}]},{"StartTime":81157.0,"Objects":[{"StartTime":81157.0,"Position":388.0,"HyperDash":false}]},{"StartTime":81266.0,"Objects":[{"StartTime":81266.0,"Position":476.0,"HyperDash":true}]},{"StartTime":81485.0,"Objects":[{"StartTime":81485.0,"Position":161.0,"HyperDash":false}]},{"StartTime":81595.0,"Objects":[{"StartTime":81595.0,"Position":124.0,"HyperDash":false}]},{"StartTime":81704.0,"Objects":[{"StartTime":81704.0,"Position":166.0,"HyperDash":false}]},{"StartTime":81814.0,"Objects":[{"StartTime":81814.0,"Position":242.0,"HyperDash":false}]},{"StartTime":81923.0,"Objects":[{"StartTime":81923.0,"Position":351.0,"HyperDash":false},{"StartTime":82032.0,"Position":351.9999,"HyperDash":true}]},{"StartTime":82142.0,"Objects":[{"StartTime":82142.0,"Position":150.0,"HyperDash":false}]},{"StartTime":82252.0,"Objects":[{"StartTime":82252.0,"Position":74.0,"HyperDash":false}]},{"StartTime":82361.0,"Objects":[{"StartTime":82361.0,"Position":84.0,"HyperDash":false}]},{"StartTime":82471.0,"Objects":[{"StartTime":82471.0,"Position":166.0,"HyperDash":true}]},{"StartTime":82580.0,"Objects":[{"StartTime":82580.0,"Position":399.0,"HyperDash":false}]},{"StartTime":82690.0,"Objects":[{"StartTime":82690.0,"Position":442.0,"HyperDash":false}]},{"StartTime":82799.0,"Objects":[{"StartTime":82799.0,"Position":399.0,"HyperDash":false}]},{"StartTime":82909.0,"Objects":[{"StartTime":82909.0,"Position":316.0,"HyperDash":false}]},{"StartTime":83018.0,"Objects":[{"StartTime":83018.0,"Position":206.0,"HyperDash":false},{"StartTime":83127.0,"Position":204.184845,"HyperDash":false}]},{"StartTime":83237.0,"Objects":[{"StartTime":83237.0,"Position":315.0,"HyperDash":false},{"StartTime":83346.0,"Position":315.971741,"HyperDash":true}]},{"StartTime":83456.0,"Objects":[{"StartTime":83456.0,"Position":80.0,"HyperDash":false},{"StartTime":83565.0,"Position":78.18484,"HyperDash":false}]},{"StartTime":83675.0,"Objects":[{"StartTime":83675.0,"Position":182.0,"HyperDash":false}]},{"StartTime":83894.0,"Objects":[{"StartTime":83894.0,"Position":375.0,"HyperDash":true}]},{"StartTime":84113.0,"Objects":[{"StartTime":84113.0,"Position":57.0,"HyperDash":false}]},{"StartTime":84223.0,"Objects":[{"StartTime":84223.0,"Position":133.0,"HyperDash":true}]},{"StartTime":84332.0,"Objects":[{"StartTime":84332.0,"Position":366.0,"HyperDash":false}]},{"StartTime":84442.0,"Objects":[{"StartTime":84442.0,"Position":405.0,"HyperDash":false}]},{"StartTime":84551.0,"Objects":[{"StartTime":84551.0,"Position":361.0,"HyperDash":false}]},{"StartTime":84661.0,"Objects":[{"StartTime":84661.0,"Position":284.0,"HyperDash":false}]},{"StartTime":84770.0,"Objects":[{"StartTime":84770.0,"Position":174.0,"HyperDash":false},{"StartTime":84879.0,"Position":172.184845,"HyperDash":true}]},{"StartTime":84989.0,"Objects":[{"StartTime":84989.0,"Position":442.0,"HyperDash":false}]},{"StartTime":85099.0,"Objects":[{"StartTime":85099.0,"Position":358.0,"HyperDash":false}]},{"StartTime":85208.0,"Objects":[{"StartTime":85208.0,"Position":321.0,"HyperDash":false}]},{"StartTime":85317.0,"Objects":[{"StartTime":85317.0,"Position":365.0,"HyperDash":false}]},{"StartTime":85427.0,"Objects":[{"StartTime":85427.0,"Position":475.0,"HyperDash":false},{"StartTime":85536.0,"Position":475.919922,"HyperDash":true}]},{"StartTime":85646.0,"Objects":[{"StartTime":85646.0,"Position":274.0,"HyperDash":false},{"StartTime":85755.0,"Position":273.103973,"HyperDash":false}]},{"StartTime":85865.0,"Objects":[{"StartTime":85865.0,"Position":363.0,"HyperDash":false}]},{"StartTime":85974.0,"Objects":[{"StartTime":85974.0,"Position":273.0,"HyperDash":true}]},{"StartTime":86084.0,"Objects":[{"StartTime":86084.0,"Position":71.0,"HyperDash":false},{"StartTime":86193.0,"Position":70.21596,"HyperDash":true}]},{"StartTime":86303.0,"Objects":[{"StartTime":86303.0,"Position":305.0,"HyperDash":false},{"StartTime":86412.0,"Position":305.0,"HyperDash":true}]},{"StartTime":86522.0,"Objects":[{"StartTime":86522.0,"Position":103.0,"HyperDash":true}]},{"StartTime":86631.0,"Objects":[{"StartTime":86631.0,"Position":305.0,"HyperDash":false},{"StartTime":86740.0,"Position":373.995,"HyperDash":true}]},{"StartTime":86960.0,"Objects":[{"StartTime":86960.0,"Position":55.0,"HyperDash":false},{"StartTime":87014.0,"Position":76.89231,"HyperDash":false},{"StartTime":87069.0,"Position":136.4433,"HyperDash":false},{"StartTime":87123.0,"Position":166.220535,"HyperDash":false},{"StartTime":87178.0,"Position":189.010239,"HyperDash":false},{"StartTime":87232.0,"Position":225.342209,"HyperDash":false},{"StartTime":87287.0,"Position":199.378647,"HyperDash":false},{"StartTime":87342.0,"Position":204.410217,"HyperDash":false},{"StartTime":87397.0,"Position":181.37085,"HyperDash":false},{"StartTime":87488.0,"Position":110.687065,"HyperDash":false},{"StartTime":87616.0,"Position":48.63235,"HyperDash":true}]},{"StartTime":87836.0,"Objects":[{"StartTime":87836.0,"Position":398.0,"HyperDash":false}]},{"StartTime":101412.0,"Objects":[{"StartTime":101412.0,"Position":77.0,"HyperDash":false}]},{"StartTime":101850.0,"Objects":[{"StartTime":101850.0,"Position":435.0,"HyperDash":false},{"StartTime":101941.0,"Position":437.939,"HyperDash":false},{"StartTime":102068.0,"Position":434.39502,"HyperDash":false}]},{"StartTime":102288.0,"Objects":[{"StartTime":102288.0,"Position":240.0,"HyperDash":false},{"StartTime":102379.0,"Position":174.395935,"HyperDash":false},{"StartTime":102506.0,"Position":102.003464,"HyperDash":false}]},{"StartTime":102726.0,"Objects":[{"StartTime":102726.0,"Position":296.0,"HyperDash":false},{"StartTime":102817.0,"Position":355.604065,"HyperDash":false},{"StartTime":102944.0,"Position":433.996521,"HyperDash":false}]},{"StartTime":103055.0,"Objects":[{"StartTime":103055.0,"Position":322.0,"HyperDash":false},{"StartTime":103164.0,"Position":253.0,"HyperDash":false}]},{"StartTime":103383.0,"Objects":[{"StartTime":103383.0,"Position":433.0,"HyperDash":false}]},{"StartTime":103602.0,"Objects":[{"StartTime":103602.0,"Position":145.0,"HyperDash":false}]},{"StartTime":103712.0,"Objects":[{"StartTime":103712.0,"Position":228.0,"HyperDash":false}]},{"StartTime":103821.0,"Objects":[{"StartTime":103821.0,"Position":283.0,"HyperDash":false}]},{"StartTime":104040.0,"Objects":[{"StartTime":104040.0,"Position":89.0,"HyperDash":false},{"StartTime":104131.0,"Position":77.58258,"HyperDash":false},{"StartTime":104258.0,"Position":88.00002,"HyperDash":false}]},{"StartTime":104478.0,"Objects":[{"StartTime":104478.0,"Position":268.0,"HyperDash":false}]},{"StartTime":104697.0,"Objects":[{"StartTime":104697.0,"Position":88.0,"HyperDash":false}]},{"StartTime":104916.0,"Objects":[{"StartTime":104916.0,"Position":281.0,"HyperDash":false},{"StartTime":105007.0,"Position":355.604126,"HyperDash":false},{"StartTime":105134.0,"Position":418.9967,"HyperDash":false}]},{"StartTime":105354.0,"Objects":[{"StartTime":105354.0,"Position":129.0,"HyperDash":false}]},{"StartTime":105463.0,"Objects":[{"StartTime":105463.0,"Position":211.0,"HyperDash":false}]},{"StartTime":105573.0,"Objects":[{"StartTime":105573.0,"Position":266.0,"HyperDash":false}]},{"StartTime":105792.0,"Objects":[{"StartTime":105792.0,"Position":72.0,"HyperDash":false},{"StartTime":105883.0,"Position":80.618515,"HyperDash":false},{"StartTime":106010.0,"Position":71.08611,"HyperDash":false}]},{"StartTime":106230.0,"Objects":[{"StartTime":106230.0,"Position":265.0,"HyperDash":false},{"StartTime":106321.0,"Position":197.395813,"HyperDash":false},{"StartTime":106448.0,"Position":127.003143,"HyperDash":false}]},{"StartTime":106558.0,"Objects":[{"StartTime":106558.0,"Position":237.0,"HyperDash":false},{"StartTime":106667.0,"Position":306.0,"HyperDash":false}]},{"StartTime":106887.0,"Objects":[{"StartTime":106887.0,"Position":126.0,"HyperDash":false}]},{"StartTime":107106.0,"Objects":[{"StartTime":107106.0,"Position":415.0,"HyperDash":false}]},{"StartTime":107215.0,"Objects":[{"StartTime":107215.0,"Position":332.0,"HyperDash":false}]},{"StartTime":107325.0,"Objects":[{"StartTime":107325.0,"Position":276.0,"HyperDash":false}]},{"StartTime":107544.0,"Objects":[{"StartTime":107544.0,"Position":469.0,"HyperDash":false},{"StartTime":107635.0,"Position":484.411469,"HyperDash":false},{"StartTime":107762.0,"Position":469.9857,"HyperDash":false}]},{"StartTime":107982.0,"Objects":[{"StartTime":107982.0,"Position":289.0,"HyperDash":false}]},{"StartTime":108201.0,"Objects":[{"StartTime":108201.0,"Position":469.0,"HyperDash":false}]},{"StartTime":108420.0,"Objects":[{"StartTime":108420.0,"Position":275.0,"HyperDash":false},{"StartTime":108511.0,"Position":208.3945,"HyperDash":false},{"StartTime":108638.0,"Position":137.0,"HyperDash":false}]},{"StartTime":108858.0,"Objects":[{"StartTime":108858.0,"Position":428.0,"HyperDash":false}]},{"StartTime":108967.0,"Objects":[{"StartTime":108967.0,"Position":345.0,"HyperDash":false}]},{"StartTime":109077.0,"Objects":[{"StartTime":109077.0,"Position":289.0,"HyperDash":false}]},{"StartTime":109296.0,"Objects":[{"StartTime":109296.0,"Position":482.0,"HyperDash":false},{"StartTime":109387.0,"Position":471.822845,"HyperDash":false},{"StartTime":109514.0,"Position":483.971222,"HyperDash":false}]},{"StartTime":109734.0,"Objects":[{"StartTime":109734.0,"Position":291.0,"HyperDash":false},{"StartTime":109825.0,"Position":335.604,"HyperDash":false},{"StartTime":109952.0,"Position":428.9964,"HyperDash":false}]},{"StartTime":110062.0,"Objects":[{"StartTime":110062.0,"Position":318.0,"HyperDash":false},{"StartTime":110171.0,"Position":249.005829,"HyperDash":false}]},{"StartTime":110390.0,"Objects":[{"StartTime":110390.0,"Position":428.0,"HyperDash":false}]},{"StartTime":110609.0,"Objects":[{"StartTime":110609.0,"Position":138.0,"HyperDash":false}]},{"StartTime":110719.0,"Objects":[{"StartTime":110719.0,"Position":215.0,"HyperDash":false}]},{"StartTime":110828.0,"Objects":[{"StartTime":110828.0,"Position":277.0,"HyperDash":false}]},{"StartTime":111047.0,"Objects":[{"StartTime":111047.0,"Position":83.0,"HyperDash":false},{"StartTime":111138.0,"Position":130.6055,"HyperDash":false},{"StartTime":111265.0,"Position":221.0,"HyperDash":false}]},{"StartTime":111485.0,"Objects":[{"StartTime":111485.0,"Position":26.0,"HyperDash":false},{"StartTime":111576.0,"Position":27.5795326,"HyperDash":false},{"StartTime":111703.0,"Position":24.9927273,"HyperDash":false}]},{"StartTime":111923.0,"Objects":[{"StartTime":111923.0,"Position":205.0,"HyperDash":false}]},{"StartTime":112142.0,"Objects":[{"StartTime":112142.0,"Position":25.0,"HyperDash":false}]},{"StartTime":112361.0,"Objects":[{"StartTime":112361.0,"Position":314.0,"HyperDash":false}]},{"StartTime":112471.0,"Objects":[{"StartTime":112471.0,"Position":230.0,"HyperDash":false}]},{"StartTime":112580.0,"Objects":[{"StartTime":112580.0,"Position":314.0,"HyperDash":false},{"StartTime":112634.0,"Position":339.679535,"HyperDash":false},{"StartTime":112689.0,"Position":397.080627,"HyperDash":false},{"StartTime":112743.0,"Position":405.857666,"HyperDash":false},{"StartTime":112798.0,"Position":405.816559,"HyperDash":false},{"StartTime":112889.0,"Position":384.664124,"HyperDash":false},{"StartTime":113017.0,"Position":303.560425,"HyperDash":false}]},{"StartTime":113237.0,"Objects":[{"StartTime":113237.0,"Position":109.0,"HyperDash":false},{"StartTime":113291.0,"Position":59.27102,"HyperDash":false},{"StartTime":113346.0,"Position":27.2394676,"HyperDash":false},{"StartTime":113400.0,"Position":36.17946,"HyperDash":false},{"StartTime":113455.0,"Position":19.1602039,"HyperDash":false},{"StartTime":113546.0,"Position":28.68512,"HyperDash":false},{"StartTime":113674.0,"Position":122.962029,"HyperDash":false}]},{"StartTime":114113.0,"Objects":[{"StartTime":114113.0,"Position":482.0,"HyperDash":false}]},{"StartTime":114332.0,"Objects":[{"StartTime":114332.0,"Position":288.0,"HyperDash":false}]},{"StartTime":114551.0,"Objects":[{"StartTime":114551.0,"Position":482.0,"HyperDash":false},{"StartTime":114642.0,"Position":428.3945,"HyperDash":false},{"StartTime":114769.0,"Position":344.0,"HyperDash":false}]},{"StartTime":114989.0,"Objects":[{"StartTime":114989.0,"Position":149.0,"HyperDash":false},{"StartTime":115080.0,"Position":207.6055,"HyperDash":false},{"StartTime":115207.0,"Position":287.0,"HyperDash":false}]},{"StartTime":115317.0,"Objects":[{"StartTime":115317.0,"Position":397.0,"HyperDash":false},{"StartTime":115426.0,"Position":328.004547,"HyperDash":false}]},{"StartTime":115646.0,"Objects":[{"StartTime":115646.0,"Position":133.0,"HyperDash":false},{"StartTime":115755.0,"Position":132.092178,"HyperDash":true}]},{"StartTime":115865.0,"Objects":[{"StartTime":115865.0,"Position":367.0,"HyperDash":false}]},{"StartTime":115974.0,"Objects":[{"StartTime":115974.0,"Position":284.0,"HyperDash":false}]},{"StartTime":116084.0,"Objects":[{"StartTime":116084.0,"Position":228.0,"HyperDash":false}]},{"StartTime":116303.0,"Objects":[{"StartTime":116303.0,"Position":421.0,"HyperDash":false},{"StartTime":116394.0,"Position":429.822845,"HyperDash":false},{"StartTime":116521.0,"Position":422.971222,"HyperDash":false}]},{"StartTime":116631.0,"Objects":[{"StartTime":116631.0,"Position":346.0,"HyperDash":false}]},{"StartTime":116741.0,"Objects":[{"StartTime":116741.0,"Position":235.0,"HyperDash":false},{"StartTime":116832.0,"Position":277.6042,"HyperDash":false},{"StartTime":116959.0,"Position":372.996857,"HyperDash":false}]},{"StartTime":117069.0,"Objects":[{"StartTime":117069.0,"Position":296.0,"HyperDash":true}]},{"StartTime":117179.0,"Objects":[{"StartTime":117179.0,"Position":94.0,"HyperDash":false}]},{"StartTime":117398.0,"Objects":[{"StartTime":117398.0,"Position":273.0,"HyperDash":false},{"StartTime":117507.0,"Position":341.99353,"HyperDash":true}]},{"StartTime":117617.0,"Objects":[{"StartTime":117617.0,"Position":129.0,"HyperDash":false}]},{"StartTime":117726.0,"Objects":[{"StartTime":117726.0,"Position":60.0,"HyperDash":false}]},{"StartTime":117836.0,"Objects":[{"StartTime":117836.0,"Position":131.0,"HyperDash":false}]},{"StartTime":118055.0,"Objects":[{"StartTime":118055.0,"Position":324.0,"HyperDash":false},{"StartTime":118146.0,"Position":262.3945,"HyperDash":false},{"StartTime":118273.0,"Position":186.0,"HyperDash":false}]},{"StartTime":118383.0,"Objects":[{"StartTime":118383.0,"Position":262.0,"HyperDash":false}]},{"StartTime":118493.0,"Objects":[{"StartTime":118493.0,"Position":372.0,"HyperDash":false},{"StartTime":118584.0,"Position":427.036163,"HyperDash":false},{"StartTime":118711.0,"Position":476.603577,"HyperDash":false}]},{"StartTime":118821.0,"Objects":[{"StartTime":118821.0,"Position":400.0,"HyperDash":true}]},{"StartTime":118931.0,"Objects":[{"StartTime":118931.0,"Position":198.0,"HyperDash":false}]},{"StartTime":119150.0,"Objects":[{"StartTime":119150.0,"Position":391.0,"HyperDash":false},{"StartTime":119259.0,"Position":391.8414,"HyperDash":true}]},{"StartTime":119369.0,"Objects":[{"StartTime":119369.0,"Position":156.0,"HyperDash":false}]},{"StartTime":119478.0,"Objects":[{"StartTime":119478.0,"Position":238.0,"HyperDash":false}]},{"StartTime":119588.0,"Objects":[{"StartTime":119588.0,"Position":293.0,"HyperDash":false}]},{"StartTime":119807.0,"Objects":[{"StartTime":119807.0,"Position":99.0,"HyperDash":false},{"StartTime":119898.0,"Position":105.171227,"HyperDash":false},{"StartTime":120025.0,"Position":97.014595,"HyperDash":false}]},{"StartTime":120135.0,"Objects":[{"StartTime":120135.0,"Position":174.0,"HyperDash":false}]},{"StartTime":120244.0,"Objects":[{"StartTime":120244.0,"Position":283.0,"HyperDash":false}]},{"StartTime":120354.0,"Objects":[{"StartTime":120354.0,"Position":333.0,"HyperDash":false}]},{"StartTime":120463.0,"Objects":[{"StartTime":120463.0,"Position":283.0,"HyperDash":false}]},{"StartTime":120573.0,"Objects":[{"StartTime":120573.0,"Position":185.0,"HyperDash":true}]},{"StartTime":120682.0,"Objects":[{"StartTime":120682.0,"Position":384.0,"HyperDash":false},{"StartTime":120773.0,"Position":427.280121,"HyperDash":false},{"StartTime":120900.0,"Position":482.186859,"HyperDash":false}]},{"StartTime":121011.0,"Objects":[{"StartTime":121011.0,"Position":412.0,"HyperDash":true}]},{"StartTime":121120.0,"Objects":[{"StartTime":121120.0,"Position":178.0,"HyperDash":false}]},{"StartTime":121230.0,"Objects":[{"StartTime":121230.0,"Position":108.0,"HyperDash":false}]},{"StartTime":121339.0,"Objects":[{"StartTime":121339.0,"Position":178.0,"HyperDash":false}]},{"StartTime":121558.0,"Objects":[{"StartTime":121558.0,"Position":371.0,"HyperDash":false},{"StartTime":121649.0,"Position":320.3945,"HyperDash":false},{"StartTime":121776.0,"Position":233.0,"HyperDash":false}]},{"StartTime":121887.0,"Objects":[{"StartTime":121887.0,"Position":309.0,"HyperDash":false}]},{"StartTime":121996.0,"Objects":[{"StartTime":121996.0,"Position":418.0,"HyperDash":false},{"StartTime":122087.0,"Position":443.873138,"HyperDash":false},{"StartTime":122214.0,"Position":414.947174,"HyperDash":false}]},{"StartTime":122325.0,"Objects":[{"StartTime":122325.0,"Position":337.0,"HyperDash":true}]},{"StartTime":122434.0,"Objects":[{"StartTime":122434.0,"Position":137.0,"HyperDash":false},{"StartTime":122525.0,"Position":79.57886,"HyperDash":false},{"StartTime":122652.0,"Position":25.39234,"HyperDash":false}]},{"StartTime":122763.0,"Objects":[{"StartTime":122763.0,"Position":102.0,"HyperDash":true}]},{"StartTime":122872.0,"Objects":[{"StartTime":122872.0,"Position":335.0,"HyperDash":false}]},{"StartTime":122982.0,"Objects":[{"StartTime":122982.0,"Position":251.0,"HyperDash":false}]},{"StartTime":123091.0,"Objects":[{"StartTime":123091.0,"Position":196.0,"HyperDash":false}]},{"StartTime":123310.0,"Objects":[{"StartTime":123310.0,"Position":389.0,"HyperDash":false},{"StartTime":123401.0,"Position":399.5055,"HyperDash":false},{"StartTime":123528.0,"Position":387.780823,"HyperDash":false}]},{"StartTime":123639.0,"Objects":[{"StartTime":123639.0,"Position":312.0,"HyperDash":false}]},{"StartTime":123748.0,"Objects":[{"StartTime":123748.0,"Position":202.0,"HyperDash":false},{"StartTime":123839.0,"Position":146.4552,"HyperDash":false},{"StartTime":123966.0,"Position":122.737045,"HyperDash":false}]},{"StartTime":124077.0,"Objects":[{"StartTime":124077.0,"Position":200.0,"HyperDash":true}]},{"StartTime":124186.0,"Objects":[{"StartTime":124186.0,"Position":399.0,"HyperDash":false}]},{"StartTime":124405.0,"Objects":[{"StartTime":124405.0,"Position":219.0,"HyperDash":false},{"StartTime":124514.0,"Position":150.0,"HyperDash":true}]},{"StartTime":124624.0,"Objects":[{"StartTime":124624.0,"Position":386.0,"HyperDash":false}]},{"StartTime":124734.0,"Objects":[{"StartTime":124734.0,"Position":455.0,"HyperDash":false}]},{"StartTime":124843.0,"Objects":[{"StartTime":124843.0,"Position":386.0,"HyperDash":false}]},{"StartTime":125062.0,"Objects":[{"StartTime":125062.0,"Position":192.0,"HyperDash":false},{"StartTime":125153.0,"Position":149.893311,"HyperDash":false},{"StartTime":125280.0,"Position":68.0014954,"HyperDash":false}]},{"StartTime":125390.0,"Objects":[{"StartTime":125390.0,"Position":144.0,"HyperDash":true}]},{"StartTime":125500.0,"Objects":[{"StartTime":125500.0,"Position":345.0,"HyperDash":false},{"StartTime":125591.0,"Position":419.1067,"HyperDash":false},{"StartTime":125718.0,"Position":468.9985,"HyperDash":false}]},{"StartTime":125828.0,"Objects":[{"StartTime":125828.0,"Position":393.0,"HyperDash":false}]},{"StartTime":125938.0,"Objects":[{"StartTime":125938.0,"Position":282.0,"HyperDash":false}]},{"StartTime":126157.0,"Objects":[{"StartTime":126157.0,"Position":475.0,"HyperDash":false},{"StartTime":126266.0,"Position":475.9078,"HyperDash":true}]},{"StartTime":126376.0,"Objects":[{"StartTime":126376.0,"Position":240.0,"HyperDash":false}]},{"StartTime":126485.0,"Objects":[{"StartTime":126485.0,"Position":322.0,"HyperDash":false}]},{"StartTime":126595.0,"Objects":[{"StartTime":126595.0,"Position":377.0,"HyperDash":false}]},{"StartTime":126814.0,"Objects":[{"StartTime":126814.0,"Position":183.0,"HyperDash":false}]},{"StartTime":127033.0,"Objects":[{"StartTime":127033.0,"Position":472.0,"HyperDash":false}]},{"StartTime":127142.0,"Objects":[{"StartTime":127142.0,"Position":389.0,"HyperDash":false}]},{"StartTime":127252.0,"Objects":[{"StartTime":127252.0,"Position":333.0,"HyperDash":false}]},{"StartTime":127471.0,"Objects":[{"StartTime":127471.0,"Position":153.0,"HyperDash":false},{"StartTime":127580.0,"Position":152.067657,"HyperDash":false}]},{"StartTime":127690.0,"Objects":[{"StartTime":127690.0,"Position":256.0,"HyperDash":false}]},{"StartTime":127909.0,"Objects":[{"StartTime":127909.0,"Position":76.0,"HyperDash":true}]},{"StartTime":128128.0,"Objects":[{"StartTime":128128.0,"Position":421.0,"HyperDash":false}]},{"StartTime":128237.0,"Objects":[{"StartTime":128237.0,"Position":423.0,"HyperDash":false}]},{"StartTime":128347.0,"Objects":[{"StartTime":128347.0,"Position":319.0,"HyperDash":false}]},{"StartTime":128566.0,"Objects":[{"StartTime":128566.0,"Position":139.0,"HyperDash":false}]},{"StartTime":128785.0,"Objects":[{"StartTime":128785.0,"Position":332.0,"HyperDash":false}]},{"StartTime":129004.0,"Objects":[{"StartTime":129004.0,"Position":42.0,"HyperDash":false}]},{"StartTime":129113.0,"Objects":[{"StartTime":129113.0,"Position":111.0,"HyperDash":false}]},{"StartTime":129332.0,"Objects":[{"StartTime":129332.0,"Position":304.0,"HyperDash":false},{"StartTime":129386.0,"Position":253.920715,"HyperDash":false},{"StartTime":129441.0,"Position":217.210358,"HyperDash":false},{"StartTime":129495.0,"Position":213.1311,"HyperDash":false},{"StartTime":129550.0,"Position":166.420731,"HyperDash":false},{"StartTime":129660.0,"Position":97.0,"HyperDash":true}]},{"StartTime":129880.0,"Objects":[{"StartTime":129880.0,"Position":408.0,"HyperDash":false},{"StartTime":129934.0,"Position":421.643433,"HyperDash":false},{"StartTime":129989.0,"Position":469.5894,"HyperDash":false},{"StartTime":130043.0,"Position":472.515442,"HyperDash":false},{"StartTime":130098.0,"Position":489.2183,"HyperDash":false},{"StartTime":130189.0,"Position":462.087952,"HyperDash":false},{"StartTime":130317.0,"Position":381.479523,"HyperDash":false}]},{"StartTime":130536.0,"Objects":[{"StartTime":130536.0,"Position":188.0,"HyperDash":false},{"StartTime":130590.0,"Position":224.105255,"HyperDash":false},{"StartTime":130645.0,"Position":273.8421,"HyperDash":false},{"StartTime":130699.0,"Position":301.947357,"HyperDash":false},{"StartTime":130754.0,"Position":325.6842,"HyperDash":false},{"StartTime":130845.0,"Position":391.1579,"HyperDash":false},{"StartTime":130973.0,"Position":464.0,"HyperDash":false}]},{"StartTime":131193.0,"Objects":[{"StartTime":131193.0,"Position":283.0,"HyperDash":false}]},{"StartTime":131412.0,"Objects":[{"StartTime":131412.0,"Position":463.0,"HyperDash":true}]},{"StartTime":131631.0,"Objects":[{"StartTime":131631.0,"Position":145.0,"HyperDash":false},{"StartTime":131685.0,"Position":104.253967,"HyperDash":false},{"StartTime":131740.0,"Position":82.46871,"HyperDash":false},{"StartTime":131794.0,"Position":46.8594933,"HyperDash":false},{"StartTime":131849.0,"Position":58.7363319,"HyperDash":false},{"StartTime":131940.0,"Position":65.76372,"HyperDash":false},{"StartTime":132068.0,"Position":161.933884,"HyperDash":false}]},{"StartTime":132288.0,"Objects":[{"StartTime":132288.0,"Position":342.0,"HyperDash":false}]},{"StartTime":132507.0,"Objects":[{"StartTime":132507.0,"Position":148.0,"HyperDash":false},{"StartTime":132598.0,"Position":150.628357,"HyperDash":false},{"StartTime":132725.0,"Position":147.1097,"HyperDash":false}]},{"StartTime":132945.0,"Objects":[{"StartTime":132945.0,"Position":327.0,"HyperDash":false}]},{"StartTime":133164.0,"Objects":[{"StartTime":133164.0,"Position":147.0,"HyperDash":true}]},{"StartTime":133383.0,"Objects":[{"StartTime":133383.0,"Position":464.0,"HyperDash":false},{"StartTime":133437.0,"Position":470.84375,"HyperDash":false},{"StartTime":133492.0,"Position":474.752625,"HyperDash":false},{"StartTime":133546.0,"Position":428.8388,"HyperDash":false},{"StartTime":133601.0,"Position":419.0386,"HyperDash":false},{"StartTime":133711.0,"Position":351.443878,"HyperDash":false}]},{"StartTime":133821.0,"Objects":[{"StartTime":133821.0,"Position":240.0,"HyperDash":false},{"StartTime":133875.0,"Position":265.918579,"HyperDash":false},{"StartTime":133930.0,"Position":308.4777,"HyperDash":false},{"StartTime":133984.0,"Position":356.101166,"HyperDash":false},{"StartTime":134039.0,"Position":367.7393,"HyperDash":false},{"StartTime":134130.0,"Position":392.480377,"HyperDash":false},{"StartTime":134258.0,"Position":390.924835,"HyperDash":false}]},{"StartTime":134478.0,"Objects":[{"StartTime":134478.0,"Position":196.0,"HyperDash":false},{"StartTime":134569.0,"Position":183.414413,"HyperDash":false},{"StartTime":134696.0,"Position":196.992783,"HyperDash":false}]},{"StartTime":134916.0,"Objects":[{"StartTime":134916.0,"Position":391.0,"HyperDash":true}]},{"StartTime":135135.0,"Objects":[{"StartTime":135135.0,"Position":73.0,"HyperDash":false},{"StartTime":135189.0,"Position":110.225349,"HyperDash":false},{"StartTime":135244.0,"Position":131.973389,"HyperDash":false},{"StartTime":135298.0,"Position":154.19873,"HyperDash":false},{"StartTime":135353.0,"Position":186.946777,"HyperDash":false},{"StartTime":135444.0,"Position":152.597885,"HyperDash":false},{"StartTime":135572.0,"Position":74.8510361,"HyperDash":false}]},{"StartTime":136011.0,"Objects":[{"StartTime":136011.0,"Position":434.0,"HyperDash":false},{"StartTime":136102.0,"Position":424.411469,"HyperDash":false},{"StartTime":136229.0,"Position":434.9857,"HyperDash":false}]},{"StartTime":136449.0,"Objects":[{"StartTime":136449.0,"Position":227.0,"HyperDash":false}]},{"StartTime":136668.0,"Objects":[{"StartTime":136668.0,"Position":434.0,"HyperDash":true}]},{"StartTime":136887.0,"Objects":[{"StartTime":136887.0,"Position":116.0,"HyperDash":false},{"StartTime":136941.0,"Position":169.105255,"HyperDash":false},{"StartTime":136996.0,"Position":171.8421,"HyperDash":false},{"StartTime":137050.0,"Position":216.947357,"HyperDash":false},{"StartTime":137105.0,"Position":253.6842,"HyperDash":false},{"StartTime":137196.0,"Position":316.1579,"HyperDash":false},{"StartTime":137324.0,"Position":392.0,"HyperDash":true}]},{"StartTime":137544.0,"Objects":[{"StartTime":137544.0,"Position":100.0,"HyperDash":false}]},{"StartTime":137653.0,"Objects":[{"StartTime":137653.0,"Position":182.0,"HyperDash":false}]},{"StartTime":137763.0,"Objects":[{"StartTime":137763.0,"Position":242.0,"HyperDash":false}]},{"StartTime":137982.0,"Objects":[{"StartTime":137982.0,"Position":62.0,"HyperDash":false}]},{"StartTime":138201.0,"Objects":[{"StartTime":138201.0,"Position":241.0,"HyperDash":false},{"StartTime":138292.0,"Position":173.399414,"HyperDash":false},{"StartTime":138419.0,"Position":103.011795,"HyperDash":true}]},{"StartTime":138639.0,"Objects":[{"StartTime":138639.0,"Position":421.0,"HyperDash":false},{"StartTime":138693.0,"Position":392.894928,"HyperDash":false},{"StartTime":138748.0,"Position":354.1583,"HyperDash":false},{"StartTime":138802.0,"Position":299.053223,"HyperDash":false},{"StartTime":138857.0,"Position":283.3166,"HyperDash":false},{"StartTime":138948.0,"Position":230.843246,"HyperDash":false},{"StartTime":139076.0,"Position":145.001617,"HyperDash":false}]},{"StartTime":139296.0,"Objects":[{"StartTime":139296.0,"Position":339.0,"HyperDash":false},{"StartTime":139405.0,"Position":339.884552,"HyperDash":false}]},{"StartTime":139515.0,"Objects":[{"StartTime":139515.0,"Position":235.0,"HyperDash":false}]},{"StartTime":139734.0,"Objects":[{"StartTime":139734.0,"Position":55.0,"HyperDash":false}]},{"StartTime":139953.0,"Objects":[{"StartTime":139953.0,"Position":344.0,"HyperDash":false},{"StartTime":140044.0,"Position":417.604126,"HyperDash":false},{"StartTime":140171.0,"Position":481.9967,"HyperDash":true}]},{"StartTime":140390.0,"Objects":[{"StartTime":140390.0,"Position":136.0,"HyperDash":false},{"StartTime":140481.0,"Position":128.599976,"HyperDash":false},{"StartTime":140608.0,"Position":135.041687,"HyperDash":false}]},{"StartTime":140828.0,"Objects":[{"StartTime":140828.0,"Position":328.0,"HyperDash":false}]},{"StartTime":141047.0,"Objects":[{"StartTime":141047.0,"Position":135.0,"HyperDash":false}]},{"StartTime":141266.0,"Objects":[{"StartTime":141266.0,"Position":342.0,"HyperDash":false}]},{"StartTime":141485.0,"Objects":[{"StartTime":141485.0,"Position":493.0,"HyperDash":false}]},{"StartTime":141704.0,"Objects":[{"StartTime":141704.0,"Position":299.0,"HyperDash":false}]},{"StartTime":141923.0,"Objects":[{"StartTime":141923.0,"Position":91.0,"HyperDash":false}]},{"StartTime":142142.0,"Objects":[{"StartTime":142142.0,"Position":380.0,"HyperDash":false},{"StartTime":142196.0,"Position":335.923767,"HyperDash":false},{"StartTime":142251.0,"Position":318.2165,"HyperDash":false},{"StartTime":142305.0,"Position":259.140259,"HyperDash":false},{"StartTime":142360.0,"Position":242.432953,"HyperDash":false},{"StartTime":142415.0,"Position":215.7257,"HyperDash":false},{"StartTime":142470.0,"Position":173.0184,"HyperDash":false},{"StartTime":142524.0,"Position":215.09462,"HyperDash":false},{"StartTime":142579.0,"Position":241.801926,"HyperDash":false},{"StartTime":142670.0,"Position":299.226685,"HyperDash":false},{"StartTime":142798.0,"Position":380.0,"HyperDash":false}]},{"StartTime":143018.0,"Objects":[{"StartTime":143018.0,"Position":185.0,"HyperDash":false},{"StartTime":143072.0,"Position":198.796173,"HyperDash":false},{"StartTime":143127.0,"Position":265.955566,"HyperDash":false},{"StartTime":143181.0,"Position":287.965,"HyperDash":false},{"StartTime":143236.0,"Position":318.749146,"HyperDash":false},{"StartTime":143290.0,"Position":347.800385,"HyperDash":false},{"StartTime":143345.0,"Position":395.071777,"HyperDash":false},{"StartTime":143400.0,"Position":413.8512,"HyperDash":false},{"StartTime":143455.0,"Position":420.164917,"HyperDash":false},{"StartTime":143546.0,"Position":449.768,"HyperDash":false},{"StartTime":143674.0,"Position":428.7935,"HyperDash":true}]},{"StartTime":143894.0,"Objects":[{"StartTime":143894.0,"Position":82.0,"HyperDash":false},{"StartTime":143985.0,"Position":35.4371643,"HyperDash":false},{"StartTime":144112.0,"Position":83.57783,"HyperDash":false}]},{"StartTime":144223.0,"Objects":[{"StartTime":144223.0,"Position":174.0,"HyperDash":false}]},{"StartTime":144332.0,"Objects":[{"StartTime":144332.0,"Position":84.0,"HyperDash":false},{"StartTime":144441.0,"Position":83.06765,"HyperDash":true}]},{"StartTime":144551.0,"Objects":[{"StartTime":144551.0,"Position":284.0,"HyperDash":false},{"StartTime":144660.0,"Position":353.0,"HyperDash":true}]},{"StartTime":144770.0,"Objects":[{"StartTime":144770.0,"Position":117.0,"HyperDash":false},{"StartTime":144879.0,"Position":48.0,"HyperDash":true}]},{"StartTime":144989.0,"Objects":[{"StartTime":144989.0,"Position":249.0,"HyperDash":true}]},{"StartTime":145099.0,"Objects":[{"StartTime":145099.0,"Position":48.0,"HyperDash":false}]},{"StartTime":145208.0,"Objects":[{"StartTime":145208.0,"Position":144.0,"HyperDash":false},{"StartTime":145299.0,"Position":184.508865,"HyperDash":false},{"StartTime":145426.0,"Position":138.552429,"HyperDash":false}]},{"StartTime":145536.0,"Objects":[{"StartTime":145536.0,"Position":55.0,"HyperDash":true}]},{"StartTime":145646.0,"Objects":[{"StartTime":145646.0,"Position":290.0,"HyperDash":false},{"StartTime":145755.0,"Position":358.994629,"HyperDash":true}]},{"StartTime":145865.0,"Objects":[{"StartTime":145865.0,"Position":157.0,"HyperDash":true}]},{"StartTime":145974.0,"Objects":[{"StartTime":145974.0,"Position":356.0,"HyperDash":false}]},{"StartTime":146084.0,"Objects":[{"StartTime":146084.0,"Position":453.0,"HyperDash":false},{"StartTime":146175.0,"Position":406.3945,"HyperDash":false},{"StartTime":146302.0,"Position":315.0,"HyperDash":false}]},{"StartTime":146412.0,"Objects":[{"StartTime":146412.0,"Position":412.0,"HyperDash":true}]},{"StartTime":146522.0,"Objects":[{"StartTime":146522.0,"Position":176.0,"HyperDash":false}]},{"StartTime":146631.0,"Objects":[{"StartTime":146631.0,"Position":272.0,"HyperDash":false},{"StartTime":146740.0,"Position":272.9078,"HyperDash":true}]},{"StartTime":146850.0,"Objects":[{"StartTime":146850.0,"Position":71.0,"HyperDash":false}]},{"StartTime":146960.0,"Objects":[{"StartTime":146960.0,"Position":168.0,"HyperDash":false},{"StartTime":147051.0,"Position":93.39449,"HyperDash":false},{"StartTime":147178.0,"Position":30.0000153,"HyperDash":false}]},{"StartTime":147288.0,"Objects":[{"StartTime":147288.0,"Position":113.0,"HyperDash":true}]},{"StartTime":147398.0,"Objects":[{"StartTime":147398.0,"Position":348.0,"HyperDash":false},{"StartTime":147489.0,"Position":401.9966,"HyperDash":false},{"StartTime":147616.0,"Position":345.685974,"HyperDash":false}]},{"StartTime":147726.0,"Objects":[{"StartTime":147726.0,"Position":255.0,"HyperDash":false}]},{"StartTime":147836.0,"Objects":[{"StartTime":147836.0,"Position":345.0,"HyperDash":false},{"StartTime":147945.0,"Position":347.028534,"HyperDash":true}]},{"StartTime":148055.0,"Objects":[{"StartTime":148055.0,"Position":145.0,"HyperDash":false}]},{"StartTime":148164.0,"Objects":[{"StartTime":148164.0,"Position":76.0,"HyperDash":true}]},{"StartTime":148274.0,"Objects":[{"StartTime":148274.0,"Position":280.0,"HyperDash":false},{"StartTime":148383.0,"Position":349.0,"HyperDash":true}]},{"StartTime":148493.0,"Objects":[{"StartTime":148493.0,"Position":147.0,"HyperDash":true}]},{"StartTime":148602.0,"Objects":[{"StartTime":148602.0,"Position":346.0,"HyperDash":false}]},{"StartTime":148712.0,"Objects":[{"StartTime":148712.0,"Position":248.0,"HyperDash":false},{"StartTime":148803.0,"Position":196.3945,"HyperDash":false},{"StartTime":148930.0,"Position":110.0,"HyperDash":false}]},{"StartTime":149040.0,"Objects":[{"StartTime":149040.0,"Position":193.0,"HyperDash":true}]},{"StartTime":149150.0,"Objects":[{"StartTime":149150.0,"Position":428.0,"HyperDash":false},{"StartTime":149241.0,"Position":448.54718,"HyperDash":false},{"StartTime":149368.0,"Position":427.29248,"HyperDash":true}]},{"StartTime":149478.0,"Objects":[{"StartTime":149478.0,"Position":226.0,"HyperDash":false}]},{"StartTime":149588.0,"Objects":[{"StartTime":149588.0,"Position":323.0,"HyperDash":false},{"StartTime":149679.0,"Position":392.6055,"HyperDash":false},{"StartTime":149806.0,"Position":461.0,"HyperDash":false}]},{"StartTime":149916.0,"Objects":[{"StartTime":149916.0,"Position":377.0,"HyperDash":true}]},{"StartTime":150026.0,"Objects":[{"StartTime":150026.0,"Position":141.0,"HyperDash":false}]},{"StartTime":150135.0,"Objects":[{"StartTime":150135.0,"Position":237.0,"HyperDash":false},{"StartTime":150244.0,"Position":238.915924,"HyperDash":true}]},{"StartTime":150354.0,"Objects":[{"StartTime":150354.0,"Position":37.0,"HyperDash":false}]},{"StartTime":150463.0,"Objects":[{"StartTime":150463.0,"Position":133.0,"HyperDash":false},{"StartTime":150554.0,"Position":160.2725,"HyperDash":false},{"StartTime":150681.0,"Position":126.154518,"HyperDash":false}]},{"StartTime":150792.0,"Objects":[{"StartTime":150792.0,"Position":42.0,"HyperDash":true}]},{"StartTime":150901.0,"Objects":[{"StartTime":150901.0,"Position":309.0,"HyperDash":false},{"StartTime":150992.0,"Position":376.6055,"HyperDash":false},{"StartTime":151119.0,"Position":447.0,"HyperDash":false}]},{"StartTime":151230.0,"Objects":[{"StartTime":151230.0,"Position":356.0,"HyperDash":false}]},{"StartTime":151339.0,"Objects":[{"StartTime":151339.0,"Position":445.0,"HyperDash":true}]},{"StartTime":151558.0,"Objects":[{"StartTime":151558.0,"Position":127.0,"HyperDash":false}]},{"StartTime":151668.0,"Objects":[{"StartTime":151668.0,"Position":203.0,"HyperDash":false}]},{"StartTime":151777.0,"Objects":[{"StartTime":151777.0,"Position":239.0,"HyperDash":false}]},{"StartTime":151887.0,"Objects":[{"StartTime":151887.0,"Position":196.0,"HyperDash":false}]},{"StartTime":151996.0,"Objects":[{"StartTime":151996.0,"Position":86.0,"HyperDash":false},{"StartTime":152105.0,"Position":84.23135,"HyperDash":true}]},{"StartTime":152215.0,"Objects":[{"StartTime":152215.0,"Position":285.0,"HyperDash":false},{"StartTime":152306.0,"Position":224.395935,"HyperDash":false},{"StartTime":152433.0,"Position":147.003464,"HyperDash":false}]},{"StartTime":152544.0,"Objects":[{"StartTime":152544.0,"Position":230.0,"HyperDash":true}]},{"StartTime":152653.0,"Objects":[{"StartTime":152653.0,"Position":463.0,"HyperDash":false},{"StartTime":152762.0,"Position":394.006836,"HyperDash":false}]},{"StartTime":152872.0,"Objects":[{"StartTime":152872.0,"Position":284.0,"HyperDash":false},{"StartTime":152981.0,"Position":282.231354,"HyperDash":true}]},{"StartTime":153091.0,"Objects":[{"StartTime":153091.0,"Position":483.0,"HyperDash":false},{"StartTime":153182.0,"Position":408.3958,"HyperDash":false},{"StartTime":153309.0,"Position":345.0032,"HyperDash":false}]},{"StartTime":153420.0,"Objects":[{"StartTime":153420.0,"Position":428.0,"HyperDash":true}]},{"StartTime":153529.0,"Objects":[{"StartTime":153529.0,"Position":227.0,"HyperDash":false},{"StartTime":153638.0,"Position":226.115463,"HyperDash":false}]},{"StartTime":153748.0,"Objects":[{"StartTime":153748.0,"Position":323.0,"HyperDash":false}]},{"StartTime":153967.0,"Objects":[{"StartTime":153967.0,"Position":33.0,"HyperDash":false},{"StartTime":154058.0,"Position":11.8165741,"HyperDash":false},{"StartTime":154185.0,"Position":30.1649818,"HyperDash":false}]},{"StartTime":154296.0,"Objects":[{"StartTime":154296.0,"Position":114.0,"HyperDash":true}]},{"StartTime":154405.0,"Objects":[{"StartTime":154405.0,"Position":381.0,"HyperDash":false},{"StartTime":154459.0,"Position":329.8956,"HyperDash":false},{"StartTime":154514.0,"Position":328.159637,"HyperDash":false},{"StartTime":154568.0,"Position":259.055237,"HyperDash":false},{"StartTime":154623.0,"Position":243.31926,"HyperDash":false},{"StartTime":154714.0,"Position":166.847,"HyperDash":false},{"StartTime":154842.0,"Position":105.006927,"HyperDash":true}]},{"StartTime":155062.0,"Objects":[{"StartTime":155062.0,"Position":451.0,"HyperDash":false},{"StartTime":155116.0,"Position":474.1808,"HyperDash":false},{"StartTime":155171.0,"Position":482.115234,"HyperDash":false},{"StartTime":155225.0,"Position":473.658417,"HyperDash":false},{"StartTime":155280.0,"Position":475.76123,"HyperDash":false},{"StartTime":155371.0,"Position":450.3246,"HyperDash":false},{"StartTime":155499.0,"Position":354.987061,"HyperDash":true}]},{"StartTime":155719.0,"Objects":[{"StartTime":155719.0,"Position":22.0,"HyperDash":false},{"StartTime":155810.0,"Position":63.60431,"HyperDash":false},{"StartTime":155937.0,"Position":159.997131,"HyperDash":true}]},{"StartTime":156157.0,"Objects":[{"StartTime":156157.0,"Position":478.0,"HyperDash":false},{"StartTime":156211.0,"Position":461.9211,"HyperDash":false},{"StartTime":156266.0,"Position":399.211151,"HyperDash":false},{"StartTime":156320.0,"Position":377.132263,"HyperDash":false},{"StartTime":156375.0,"Position":340.4223,"HyperDash":false},{"StartTime":156430.0,"Position":322.712341,"HyperDash":false},{"StartTime":156485.0,"Position":271.00235,"HyperDash":false},{"StartTime":156539.0,"Position":309.0812,"HyperDash":false},{"StartTime":156594.0,"Position":339.7912,"HyperDash":false},{"StartTime":156685.0,"Position":387.220428,"HyperDash":false},{"StartTime":156813.0,"Position":478.0,"HyperDash":true}]},{"StartTime":157033.0,"Objects":[{"StartTime":157033.0,"Position":159.0,"HyperDash":false},{"StartTime":157087.0,"Position":134.242828,"HyperDash":false},{"StartTime":157142.0,"Position":89.84937,"HyperDash":false},{"StartTime":157196.0,"Position":60.5968933,"HyperDash":false},{"StartTime":157251.0,"Position":65.38586,"HyperDash":false},{"StartTime":157342.0,"Position":103.223328,"HyperDash":false},{"StartTime":157470.0,"Position":163.359787,"HyperDash":false}]},{"StartTime":157580.0,"Objects":[{"StartTime":157580.0,"Position":254.0,"HyperDash":false}]},{"StartTime":157690.0,"Objects":[{"StartTime":157690.0,"Position":163.0,"HyperDash":true}]},{"StartTime":157799.0,"Objects":[{"StartTime":157799.0,"Position":396.0,"HyperDash":true}]},{"StartTime":157909.0,"Objects":[{"StartTime":157909.0,"Position":163.0,"HyperDash":false},{"StartTime":158000.0,"Position":136.677887,"HyperDash":false},{"StartTime":158127.0,"Position":164.098557,"HyperDash":false}]},{"StartTime":158237.0,"Objects":[{"StartTime":158237.0,"Position":255.0,"HyperDash":false}]},{"StartTime":158347.0,"Objects":[{"StartTime":158347.0,"Position":164.0,"HyperDash":false},{"StartTime":158456.0,"Position":162.135818,"HyperDash":true}]},{"StartTime":158566.0,"Objects":[{"StartTime":158566.0,"Position":363.0,"HyperDash":false},{"StartTime":158675.0,"Position":363.919922,"HyperDash":true}]},{"StartTime":158785.0,"Objects":[{"StartTime":158785.0,"Position":128.0,"HyperDash":false},{"StartTime":158894.0,"Position":196.994614,"HyperDash":true}]},{"StartTime":159004.0,"Objects":[{"StartTime":159004.0,"Position":398.0,"HyperDash":true}]},{"StartTime":159113.0,"Objects":[{"StartTime":159113.0,"Position":198.0,"HyperDash":false}]},{"StartTime":159223.0,"Objects":[{"StartTime":159223.0,"Position":100.0,"HyperDash":false},{"StartTime":159314.0,"Position":80.50117,"HyperDash":false},{"StartTime":159441.0,"Position":104.636375,"HyperDash":false}]},{"StartTime":159551.0,"Objects":[{"StartTime":159551.0,"Position":187.0,"HyperDash":true}]},{"StartTime":159661.0,"Objects":[{"StartTime":159661.0,"Position":422.0,"HyperDash":false},{"StartTime":159770.0,"Position":353.00705,"HyperDash":true}]},{"StartTime":159880.0,"Objects":[{"StartTime":159880.0,"Position":151.0,"HyperDash":true}]},{"StartTime":159989.0,"Objects":[{"StartTime":159989.0,"Position":350.0,"HyperDash":false}]},{"StartTime":160099.0,"Objects":[{"StartTime":160099.0,"Position":254.0,"HyperDash":false},{"StartTime":160190.0,"Position":324.6055,"HyperDash":false},{"StartTime":160317.0,"Position":392.0,"HyperDash":false}]},{"StartTime":160427.0,"Objects":[{"StartTime":160427.0,"Position":296.0,"HyperDash":true}]},{"StartTime":160536.0,"Objects":[{"StartTime":160536.0,"Position":62.0,"HyperDash":false},{"StartTime":160645.0,"Position":61.054882,"HyperDash":false}]},{"StartTime":160755.0,"Objects":[{"StartTime":160755.0,"Position":171.0,"HyperDash":false},{"StartTime":160864.0,"Position":240.0,"HyperDash":true}]},{"StartTime":160974.0,"Objects":[{"StartTime":160974.0,"Position":441.0,"HyperDash":false},{"StartTime":161065.0,"Position":460.246124,"HyperDash":false},{"StartTime":161192.0,"Position":438.9324,"HyperDash":false}]},{"StartTime":161303.0,"Objects":[{"StartTime":161303.0,"Position":354.0,"HyperDash":true}]},{"StartTime":161412.0,"Objects":[{"StartTime":161412.0,"Position":120.0,"HyperDash":false},{"StartTime":161503.0,"Position":188.6055,"HyperDash":false},{"StartTime":161630.0,"Position":258.0,"HyperDash":false}]},{"StartTime":161741.0,"Objects":[{"StartTime":161741.0,"Position":167.0,"HyperDash":false}]},{"StartTime":161850.0,"Objects":[{"StartTime":161850.0,"Position":256.0,"HyperDash":false},{"StartTime":161959.0,"Position":256.873352,"HyperDash":true}]},{"StartTime":162069.0,"Objects":[{"StartTime":162069.0,"Position":55.0,"HyperDash":false},{"StartTime":162178.0,"Position":53.2083969,"HyperDash":true}]},{"StartTime":162288.0,"Objects":[{"StartTime":162288.0,"Position":288.0,"HyperDash":false},{"StartTime":162397.0,"Position":357.0,"HyperDash":true}]},{"StartTime":162507.0,"Objects":[{"StartTime":162507.0,"Position":155.0,"HyperDash":true}]},{"StartTime":162617.0,"Objects":[{"StartTime":162617.0,"Position":356.0,"HyperDash":false}]},{"StartTime":162726.0,"Objects":[{"StartTime":162726.0,"Position":452.0,"HyperDash":false},{"StartTime":162817.0,"Position":467.2106,"HyperDash":false},{"StartTime":162944.0,"Position":448.8102,"HyperDash":false}]},{"StartTime":163055.0,"Objects":[{"StartTime":163055.0,"Position":364.0,"HyperDash":true}]},{"StartTime":163164.0,"Objects":[{"StartTime":163164.0,"Position":130.0,"HyperDash":false},{"StartTime":163273.0,"Position":128.231354,"HyperDash":false}]},{"StartTime":163383.0,"Objects":[{"StartTime":163383.0,"Position":239.0,"HyperDash":false},{"StartTime":163492.0,"Position":240.915924,"HyperDash":true}]},{"StartTime":163602.0,"Objects":[{"StartTime":163602.0,"Position":39.0,"HyperDash":false},{"StartTime":163711.0,"Position":108.0,"HyperDash":true}]},{"StartTime":163821.0,"Objects":[{"StartTime":163821.0,"Position":378.0,"HyperDash":false},{"StartTime":163930.0,"Position":379.0146,"HyperDash":false}]},{"StartTime":164040.0,"Objects":[{"StartTime":164040.0,"Position":268.0,"HyperDash":false},{"StartTime":164149.0,"Position":199.0,"HyperDash":true}]},{"StartTime":164259.0,"Objects":[{"StartTime":164259.0,"Position":400.0,"HyperDash":false},{"StartTime":164368.0,"Position":401.8897,"HyperDash":true}]},{"StartTime":164478.0,"Objects":[{"StartTime":164478.0,"Position":200.0,"HyperDash":false},{"StartTime":164587.0,"Position":131.0,"HyperDash":true}]},{"StartTime":164697.0,"Objects":[{"StartTime":164697.0,"Position":366.0,"HyperDash":false},{"StartTime":164806.0,"Position":434.995453,"HyperDash":true}]},{"StartTime":164916.0,"Objects":[{"StartTime":164916.0,"Position":164.0,"HyperDash":false},{"StartTime":165007.0,"Position":99.39598,"HyperDash":false},{"StartTime":165134.0,"Position":26.00357,"HyperDash":false}]},{"StartTime":165244.0,"Objects":[{"StartTime":165244.0,"Position":116.0,"HyperDash":false}]},{"StartTime":165354.0,"Objects":[{"StartTime":165354.0,"Position":27.0,"HyperDash":true}]},{"StartTime":165573.0,"Objects":[{"StartTime":165573.0,"Position":344.0,"HyperDash":false}]},{"StartTime":165682.0,"Objects":[{"StartTime":165682.0,"Position":381.0,"HyperDash":false}]},{"StartTime":165792.0,"Objects":[{"StartTime":165792.0,"Position":339.0,"HyperDash":false}]},{"StartTime":165901.0,"Objects":[{"StartTime":165901.0,"Position":263.0,"HyperDash":false}]},{"StartTime":166011.0,"Objects":[{"StartTime":166011.0,"Position":152.0,"HyperDash":false},{"StartTime":166120.0,"Position":151.092178,"HyperDash":true}]},{"StartTime":166230.0,"Objects":[{"StartTime":166230.0,"Position":352.0,"HyperDash":false}]},{"StartTime":166339.0,"Objects":[{"StartTime":166339.0,"Position":427.0,"HyperDash":false}]},{"StartTime":166449.0,"Objects":[{"StartTime":166449.0,"Position":464.0,"HyperDash":false}]},{"StartTime":166558.0,"Objects":[{"StartTime":166558.0,"Position":425.0,"HyperDash":true}]},{"StartTime":166668.0,"Objects":[{"StartTime":166668.0,"Position":189.0,"HyperDash":false}]},{"StartTime":166777.0,"Objects":[{"StartTime":166777.0,"Position":116.0,"HyperDash":false}]},{"StartTime":166887.0,"Objects":[{"StartTime":166887.0,"Position":125.0,"HyperDash":false}]},{"StartTime":166996.0,"Objects":[{"StartTime":166996.0,"Position":199.0,"HyperDash":false}]},{"StartTime":167106.0,"Objects":[{"StartTime":167106.0,"Position":309.0,"HyperDash":false},{"StartTime":167215.0,"Position":310.768646,"HyperDash":false}]},{"StartTime":167325.0,"Objects":[{"StartTime":167325.0,"Position":199.0,"HyperDash":false},{"StartTime":167434.0,"Position":197.084076,"HyperDash":true}]},{"StartTime":167544.0,"Objects":[{"StartTime":167544.0,"Position":398.0,"HyperDash":false},{"StartTime":167653.0,"Position":467.0,"HyperDash":false}]},{"StartTime":167763.0,"Objects":[{"StartTime":167763.0,"Position":356.0,"HyperDash":false},{"StartTime":167872.0,"Position":287.00647,"HyperDash":true}]},{"StartTime":167982.0,"Objects":[{"StartTime":167982.0,"Position":85.0,"HyperDash":false},{"StartTime":168091.0,"Position":16.0,"HyperDash":false}]},{"StartTime":168201.0,"Objects":[{"StartTime":168201.0,"Position":126.0,"HyperDash":false},{"StartTime":168310.0,"Position":195.0,"HyperDash":true}]},{"StartTime":168420.0,"Objects":[{"StartTime":168420.0,"Position":430.0,"HyperDash":false},{"StartTime":168474.0,"Position":467.7612,"HyperDash":false},{"StartTime":168529.0,"Position":476.801575,"HyperDash":false},{"StartTime":168583.0,"Position":504.865875,"HyperDash":false},{"StartTime":168638.0,"Position":482.8523,"HyperDash":false},{"StartTime":168729.0,"Position":447.068665,"HyperDash":false},{"StartTime":168857.0,"Position":367.438934,"HyperDash":false}]},{"StartTime":169077.0,"Objects":[{"StartTime":169077.0,"Position":174.0,"HyperDash":false}]},{"StartTime":169186.0,"Objects":[{"StartTime":169186.0,"Position":99.0,"HyperDash":false}]},{"StartTime":169296.0,"Objects":[{"StartTime":169296.0,"Position":67.0,"HyperDash":false}]},{"StartTime":169405.0,"Objects":[{"StartTime":169405.0,"Position":101.0,"HyperDash":false}]},{"StartTime":169515.0,"Objects":[{"StartTime":169515.0,"Position":176.0,"HyperDash":false}]},{"StartTime":169734.0,"Objects":[{"StartTime":169734.0,"Position":465.0,"HyperDash":false},{"StartTime":169825.0,"Position":484.828766,"HyperDash":false},{"StartTime":169952.0,"Position":466.9854,"HyperDash":false}]},{"StartTime":170062.0,"Objects":[{"StartTime":170062.0,"Position":390.0,"HyperDash":true}]},{"StartTime":170172.0,"Objects":[{"StartTime":170172.0,"Position":154.0,"HyperDash":false},{"StartTime":170226.0,"Position":188.078888,"HyperDash":false},{"StartTime":170281.0,"Position":228.788879,"HyperDash":false},{"StartTime":170335.0,"Position":239.867767,"HyperDash":false},{"StartTime":170390.0,"Position":291.577759,"HyperDash":false},{"StartTime":170500.0,"Position":360.997742,"HyperDash":true}]},{"StartTime":170609.0,"Objects":[{"StartTime":170609.0,"Position":127.0,"HyperDash":false},{"StartTime":170700.0,"Position":112.127007,"HyperDash":false},{"StartTime":170827.0,"Position":125.797905,"HyperDash":false}]},{"StartTime":170938.0,"Objects":[{"StartTime":170938.0,"Position":202.0,"HyperDash":true}]},{"StartTime":171047.0,"Objects":[{"StartTime":171047.0,"Position":401.0,"HyperDash":false},{"StartTime":171101.0,"Position":350.353882,"HyperDash":false},{"StartTime":171156.0,"Position":321.8849,"HyperDash":false},{"StartTime":171210.0,"Position":305.955536,"HyperDash":false},{"StartTime":171265.0,"Position":268.51535,"HyperDash":false},{"StartTime":171319.0,"Position":246.017654,"HyperDash":false},{"StartTime":171374.0,"Position":211.42424,"HyperDash":false},{"StartTime":171429.0,"Position":173.4286,"HyperDash":false},{"StartTime":171484.0,"Position":155.9888,"HyperDash":false},{"StartTime":171575.0,"Position":145.032578,"HyperDash":false},{"StartTime":171703.0,"Position":125.051888,"HyperDash":false}]},{"StartTime":171923.0,"Objects":[{"StartTime":171923.0,"Position":416.0,"HyperDash":false}]},{"StartTime":178712.0,"Objects":[{"StartTime":178712.0,"Position":85.0,"HyperDash":true}]},{"StartTime":178931.0,"Objects":[{"StartTime":178931.0,"Position":402.0,"HyperDash":false},{"StartTime":179022.0,"Position":430.926239,"HyperDash":false},{"StartTime":179149.0,"Position":400.1261,"HyperDash":false}]},{"StartTime":179259.0,"Objects":[{"StartTime":179259.0,"Position":323.0,"HyperDash":false}]},{"StartTime":179369.0,"Objects":[{"StartTime":179369.0,"Position":212.0,"HyperDash":false},{"StartTime":179460.0,"Position":173.1731,"HyperDash":false},{"StartTime":179587.0,"Position":94.04442,"HyperDash":false}]},{"StartTime":179697.0,"Objects":[{"StartTime":179697.0,"Position":170.0,"HyperDash":false}]},{"StartTime":179807.0,"Objects":[{"StartTime":179807.0,"Position":280.0,"HyperDash":false},{"StartTime":179898.0,"Position":342.6055,"HyperDash":false},{"StartTime":180025.0,"Position":418.0,"HyperDash":false}]},{"StartTime":180135.0,"Objects":[{"StartTime":180135.0,"Position":307.0,"HyperDash":false}]},{"StartTime":180244.0,"Objects":[{"StartTime":180244.0,"Position":238.0,"HyperDash":false}]},{"StartTime":180354.0,"Objects":[{"StartTime":180354.0,"Position":307.0,"HyperDash":false}]},{"StartTime":180463.0,"Objects":[{"StartTime":180463.0,"Position":417.0,"HyperDash":false},{"StartTime":180572.0,"Position":417.896027,"HyperDash":true}]},{"StartTime":180682.0,"Objects":[{"StartTime":180682.0,"Position":216.0,"HyperDash":false}]},{"StartTime":180792.0,"Objects":[{"StartTime":180792.0,"Position":313.0,"HyperDash":false}]},{"StartTime":180901.0,"Objects":[{"StartTime":180901.0,"Position":381.0,"HyperDash":false}]},{"StartTime":181011.0,"Objects":[{"StartTime":181011.0,"Position":313.0,"HyperDash":false}]},{"StartTime":181120.0,"Objects":[{"StartTime":181120.0,"Position":203.0,"HyperDash":false}]},{"StartTime":181230.0,"Objects":[{"StartTime":181230.0,"Position":133.0,"HyperDash":false}]},{"StartTime":181339.0,"Objects":[{"StartTime":181339.0,"Position":203.0,"HyperDash":false}]},{"StartTime":181558.0,"Objects":[{"StartTime":181558.0,"Position":396.0,"HyperDash":false},{"StartTime":181649.0,"Position":414.144623,"HyperDash":false},{"StartTime":181776.0,"Position":397.136444,"HyperDash":false}]},{"StartTime":181887.0,"Objects":[{"StartTime":181887.0,"Position":320.0,"HyperDash":false}]},{"StartTime":181996.0,"Objects":[{"StartTime":181996.0,"Position":210.0,"HyperDash":false},{"StartTime":182087.0,"Position":169.395859,"HyperDash":false},{"StartTime":182214.0,"Position":72.00328,"HyperDash":false}]},{"StartTime":182325.0,"Objects":[{"StartTime":182325.0,"Position":148.0,"HyperDash":true}]},{"StartTime":182434.0,"Objects":[{"StartTime":182434.0,"Position":347.0,"HyperDash":false}]},{"StartTime":182544.0,"Objects":[{"StartTime":182544.0,"Position":416.0,"HyperDash":false}]},{"StartTime":182653.0,"Objects":[{"StartTime":182653.0,"Position":347.0,"HyperDash":false}]},{"StartTime":182872.0,"Objects":[{"StartTime":182872.0,"Position":154.0,"HyperDash":false}]},{"StartTime":182982.0,"Objects":[{"StartTime":182982.0,"Position":85.0,"HyperDash":false}]},{"StartTime":183091.0,"Objects":[{"StartTime":183091.0,"Position":154.0,"HyperDash":false}]},{"StartTime":183310.0,"Objects":[{"StartTime":183310.0,"Position":347.0,"HyperDash":false},{"StartTime":183401.0,"Position":374.666382,"HyperDash":false},{"StartTime":183528.0,"Position":343.605865,"HyperDash":false}]},{"StartTime":183639.0,"Objects":[{"StartTime":183639.0,"Position":231.0,"HyperDash":false}]},{"StartTime":183748.0,"Objects":[{"StartTime":183748.0,"Position":162.0,"HyperDash":false}]},{"StartTime":183858.0,"Objects":[{"StartTime":183858.0,"Position":231.0,"HyperDash":false}]},{"StartTime":183967.0,"Objects":[{"StartTime":183967.0,"Position":343.0,"HyperDash":false},{"StartTime":184076.0,"Position":344.8897,"HyperDash":true}]},{"StartTime":184186.0,"Objects":[{"StartTime":184186.0,"Position":143.0,"HyperDash":false}]},{"StartTime":184405.0,"Objects":[{"StartTime":184405.0,"Position":323.0,"HyperDash":false}]},{"StartTime":184624.0,"Objects":[{"StartTime":184624.0,"Position":143.0,"HyperDash":false},{"StartTime":184715.0,"Position":105.191986,"HyperDash":false},{"StartTime":184842.0,"Position":143.952225,"HyperDash":false}]},{"StartTime":184953.0,"Objects":[{"StartTime":184953.0,"Position":221.0,"HyperDash":true}]},{"StartTime":185062.0,"Objects":[{"StartTime":185062.0,"Position":421.0,"HyperDash":false},{"StartTime":185116.0,"Position":402.9211,"HyperDash":false},{"StartTime":185171.0,"Position":371.211121,"HyperDash":false},{"StartTime":185225.0,"Position":307.1322,"HyperDash":false},{"StartTime":185280.0,"Position":283.422241,"HyperDash":false},{"StartTime":185335.0,"Position":234.712234,"HyperDash":false},{"StartTime":185390.0,"Position":214.002228,"HyperDash":false},{"StartTime":185444.0,"Position":264.081116,"HyperDash":false},{"StartTime":185499.0,"Position":282.791138,"HyperDash":false},{"StartTime":185590.0,"Position":328.2204,"HyperDash":false},{"StartTime":185718.0,"Position":421.0,"HyperDash":true}]},{"StartTime":185938.0,"Objects":[{"StartTime":185938.0,"Position":102.0,"HyperDash":false},{"StartTime":186029.0,"Position":81.6439056,"HyperDash":false},{"StartTime":186156.0,"Position":105.267693,"HyperDash":false}]},{"StartTime":186266.0,"Objects":[{"StartTime":186266.0,"Position":181.0,"HyperDash":false}]},{"StartTime":186376.0,"Objects":[{"StartTime":186376.0,"Position":291.0,"HyperDash":false},{"StartTime":186467.0,"Position":364.6055,"HyperDash":false},{"StartTime":186594.0,"Position":429.0,"HyperDash":false}]},{"StartTime":186704.0,"Objects":[{"StartTime":186704.0,"Position":352.0,"HyperDash":true}]},{"StartTime":186814.0,"Objects":[{"StartTime":186814.0,"Position":150.0,"HyperDash":false},{"StartTime":186905.0,"Position":147.9285,"HyperDash":false},{"StartTime":187032.0,"Position":146.246689,"HyperDash":false}]},{"StartTime":187142.0,"Objects":[{"StartTime":187142.0,"Position":257.0,"HyperDash":false}]},{"StartTime":187252.0,"Objects":[{"StartTime":187252.0,"Position":325.0,"HyperDash":false}]},{"StartTime":187361.0,"Objects":[{"StartTime":187361.0,"Position":253.0,"HyperDash":false}]},{"StartTime":187471.0,"Objects":[{"StartTime":187471.0,"Position":141.0,"HyperDash":false},{"StartTime":187580.0,"Position":72.0,"HyperDash":true}]},{"StartTime":187690.0,"Objects":[{"StartTime":187690.0,"Position":307.0,"HyperDash":false},{"StartTime":187781.0,"Position":334.582428,"HyperDash":false},{"StartTime":187908.0,"Position":308.8075,"HyperDash":false}]},{"StartTime":188128.0,"Objects":[{"StartTime":188128.0,"Position":113.0,"HyperDash":false},{"StartTime":188219.0,"Position":99.06281,"HyperDash":false},{"StartTime":188346.0,"Position":114.246552,"HyperDash":false}]},{"StartTime":188456.0,"Objects":[{"StartTime":188456.0,"Position":190.0,"HyperDash":true}]},{"StartTime":188566.0,"Objects":[{"StartTime":188566.0,"Position":391.0,"HyperDash":false}]},{"StartTime":188785.0,"Objects":[{"StartTime":188785.0,"Position":211.0,"HyperDash":false}]},{"StartTime":189004.0,"Objects":[{"StartTime":189004.0,"Position":390.0,"HyperDash":false},{"StartTime":189095.0,"Position":373.8,"HyperDash":false},{"StartTime":189222.0,"Position":391.916473,"HyperDash":true}]},{"StartTime":189442.0,"Objects":[{"StartTime":189442.0,"Position":73.0,"HyperDash":false}]},{"StartTime":189551.0,"Objects":[{"StartTime":189551.0,"Position":39.0,"HyperDash":false}]},{"StartTime":189661.0,"Objects":[{"StartTime":189661.0,"Position":76.0,"HyperDash":false}]},{"StartTime":189770.0,"Objects":[{"StartTime":189770.0,"Position":158.0,"HyperDash":false}]},{"StartTime":189880.0,"Objects":[{"StartTime":189880.0,"Position":268.0,"HyperDash":false},{"StartTime":189971.0,"Position":212.3957,"HyperDash":false},{"StartTime":190098.0,"Position":130.002914,"HyperDash":false}]},{"StartTime":190208.0,"Objects":[{"StartTime":190208.0,"Position":213.0,"HyperDash":true}]},{"StartTime":190317.0,"Objects":[{"StartTime":190317.0,"Position":412.0,"HyperDash":false},{"StartTime":190408.0,"Position":424.883728,"HyperDash":false},{"StartTime":190535.0,"Position":410.9749,"HyperDash":false}]},{"StartTime":190646.0,"Objects":[{"StartTime":190646.0,"Position":320.0,"HyperDash":false}]},{"StartTime":190755.0,"Objects":[{"StartTime":190755.0,"Position":230.0,"HyperDash":false}]},{"StartTime":190974.0,"Objects":[{"StartTime":190974.0,"Position":409.0,"HyperDash":true}]},{"StartTime":191193.0,"Objects":[{"StartTime":191193.0,"Position":91.0,"HyperDash":false},{"StartTime":191247.0,"Position":44.74952,"HyperDash":false},{"StartTime":191302.0,"Position":25.7194824,"HyperDash":false},{"StartTime":191356.0,"Position":28.6760178,"HyperDash":false},{"StartTime":191411.0,"Position":24.610136,"HyperDash":false},{"StartTime":191502.0,"Position":53.48176,"HyperDash":false},{"StartTime":191630.0,"Position":137.592667,"HyperDash":false}]},{"StartTime":191850.0,"Objects":[{"StartTime":191850.0,"Position":344.0,"HyperDash":false}]},{"StartTime":191960.0,"Objects":[{"StartTime":191960.0,"Position":427.0,"HyperDash":false}]},{"StartTime":192069.0,"Objects":[{"StartTime":192069.0,"Position":344.0,"HyperDash":false}]},{"StartTime":192288.0,"Objects":[{"StartTime":192288.0,"Position":138.0,"HyperDash":false}]},{"StartTime":192507.0,"Objects":[{"StartTime":192507.0,"Position":427.0,"HyperDash":false},{"StartTime":192598.0,"Position":442.391876,"HyperDash":false},{"StartTime":192725.0,"Position":427.938751,"HyperDash":true}]},{"StartTime":192945.0,"Objects":[{"StartTime":192945.0,"Position":81.0,"HyperDash":false},{"StartTime":193036.0,"Position":144.887146,"HyperDash":false},{"StartTime":193163.0,"Position":260.4,"HyperDash":false}]},{"StartTime":193383.0,"Objects":[{"StartTime":193383.0,"Position":81.0,"HyperDash":true},{"StartTime":193474.0,"Position":189.970917,"HyperDash":false},{"StartTime":193601.0,"Position":370.798462,"HyperDash":false}]},{"StartTime":193821.0,"Objects":[{"StartTime":193821.0,"Position":190.0,"HyperDash":false},{"StartTime":193912.0,"Position":279.887146,"HyperDash":false},{"StartTime":194039.0,"Position":369.4,"HyperDash":false}]},{"StartTime":194259.0,"Objects":[{"StartTime":194259.0,"Position":78.0,"HyperDash":true},{"StartTime":194350.0,"Position":207.970978,"HyperDash":false},{"StartTime":194477.0,"Position":367.798584,"HyperDash":true}]},{"StartTime":194697.0,"Objects":[{"StartTime":194697.0,"Position":76.0,"HyperDash":false},{"StartTime":194788.0,"Position":77.1591339,"HyperDash":false},{"StartTime":194915.0,"Position":73.98562,"HyperDash":false}]},{"StartTime":195135.0,"Objects":[{"StartTime":195135.0,"Position":365.0,"HyperDash":true},{"StartTime":195226.0,"Position":253.0291,"HyperDash":false},{"StartTime":195353.0,"Position":75.2016,"HyperDash":true}]},{"StartTime":195573.0,"Objects":[{"StartTime":195573.0,"Position":394.0,"HyperDash":false},{"StartTime":195664.0,"Position":392.411469,"HyperDash":false},{"StartTime":195791.0,"Position":394.9857,"HyperDash":false}]},{"StartTime":196011.0,"Objects":[{"StartTime":196011.0,"Position":105.0,"HyperDash":true},{"StartTime":196102.0,"Position":210.9709,"HyperDash":false},{"StartTime":196229.0,"Position":394.7984,"HyperDash":true}]},{"StartTime":196449.0,"Objects":[{"StartTime":196449.0,"Position":75.0,"HyperDash":true}]},{"StartTime":196668.0,"Objects":[{"StartTime":196668.0,"Position":422.0,"HyperDash":true},{"StartTime":196722.0,"Position":331.3793,"HyperDash":false},{"StartTime":196777.0,"Position":264.4323,"HyperDash":false},{"StartTime":196831.0,"Position":194.811615,"HyperDash":false},{"StartTime":196886.0,"Position":132.201477,"HyperDash":false},{"StartTime":196977.0,"Position":246.232452,"HyperDash":false},{"StartTime":197105.0,"Position":422.0,"HyperDash":true}]},{"StartTime":197325.0,"Objects":[{"StartTime":197325.0,"Position":75.0,"HyperDash":true},{"StartTime":197379.0,"Position":144.6207,"HyperDash":false},{"StartTime":197434.0,"Position":211.567688,"HyperDash":false},{"StartTime":197488.0,"Position":310.1884,"HyperDash":false},{"StartTime":197543.0,"Position":364.798523,"HyperDash":false},{"StartTime":197634.0,"Position":238.767548,"HyperDash":false},{"StartTime":197762.0,"Position":75.0,"HyperDash":true}]},{"StartTime":197982.0,"Objects":[{"StartTime":197982.0,"Position":395.0,"HyperDash":true}]},{"StartTime":198201.0,"Objects":[{"StartTime":198201.0,"Position":47.0,"HyperDash":true},{"StartTime":198292.0,"Position":164.970886,"HyperDash":false},{"StartTime":198419.0,"Position":336.7984,"HyperDash":false}]},{"StartTime":198639.0,"Objects":[{"StartTime":198639.0,"Position":142.0,"HyperDash":false},{"StartTime":198730.0,"Position":237.6467,"HyperDash":false},{"StartTime":198857.0,"Position":335.197571,"HyperDash":true}]},{"StartTime":199077.0,"Objects":[{"StartTime":199077.0,"Position":26.0,"HyperDash":true}]},{"StartTime":199296.0,"Objects":[{"StartTime":199296.0,"Position":371.0,"HyperDash":false},{"StartTime":199350.0,"Position":333.0469,"HyperDash":false},{"StartTime":199405.0,"Position":303.045837,"HyperDash":false},{"StartTime":199459.0,"Position":275.5022,"HyperDash":false},{"StartTime":199514.0,"Position":251.71991,"HyperDash":false},{"StartTime":199605.0,"Position":278.949951,"HyperDash":false},{"StartTime":199733.0,"Position":378.108917,"HyperDash":true}]},{"StartTime":199953.0,"Objects":[{"StartTime":199953.0,"Position":56.0,"HyperDash":false},{"StartTime":200007.0,"Position":103.078979,"HyperDash":false},{"StartTime":200062.0,"Position":109.78904,"HyperDash":false},{"StartTime":200116.0,"Position":145.868011,"HyperDash":false},{"StartTime":200171.0,"Position":193.578079,"HyperDash":false},{"StartTime":200226.0,"Position":229.288147,"HyperDash":false},{"StartTime":200281.0,"Position":262.99823,"HyperDash":false},{"StartTime":200335.0,"Position":225.91925,"HyperDash":false},{"StartTime":200390.0,"Position":194.209167,"HyperDash":false},{"StartTime":200481.0,"Position":139.779785,"HyperDash":false},{"StartTime":200609.0,"Position":56.0,"HyperDash":false}]},{"StartTime":200828.0,"Objects":[{"StartTime":200828.0,"Position":249.0,"HyperDash":false},{"StartTime":200937.0,"Position":250.56778,"HyperDash":false}]},{"StartTime":201047.0,"Objects":[{"StartTime":201047.0,"Position":160.0,"HyperDash":false}]},{"StartTime":201157.0,"Objects":[{"StartTime":201157.0,"Position":250.0,"HyperDash":true}]},{"StartTime":201266.0,"Objects":[{"StartTime":201266.0,"Position":50.0,"HyperDash":false}]},{"StartTime":201376.0,"Objects":[{"StartTime":201376.0,"Position":139.0,"HyperDash":false}]},{"StartTime":201485.0,"Objects":[{"StartTime":201485.0,"Position":50.0,"HyperDash":true}]},{"StartTime":201595.0,"Objects":[{"StartTime":201595.0,"Position":285.0,"HyperDash":true}]},{"StartTime":201704.0,"Objects":[{"StartTime":201704.0,"Position":50.0,"HyperDash":false},{"StartTime":201813.0,"Position":48.2537231,"HyperDash":true}]},{"StartTime":201923.0,"Objects":[{"StartTime":201923.0,"Position":249.0,"HyperDash":true}]},{"StartTime":202033.0,"Objects":[{"StartTime":202033.0,"Position":48.0,"HyperDash":false}]},{"StartTime":202142.0,"Objects":[{"StartTime":202142.0,"Position":141.0,"HyperDash":false},{"StartTime":202233.0,"Position":181.263123,"HyperDash":false},{"StartTime":202360.0,"Position":140.921326,"HyperDash":false}]},{"StartTime":202471.0,"Objects":[{"StartTime":202471.0,"Position":45.0,"HyperDash":true}]},{"StartTime":202580.0,"Objects":[{"StartTime":202580.0,"Position":278.0,"HyperDash":false}]},{"StartTime":202690.0,"Objects":[{"StartTime":202690.0,"Position":180.0,"HyperDash":false},{"StartTime":202799.0,"Position":179.028259,"HyperDash":true}]},{"StartTime":202909.0,"Objects":[{"StartTime":202909.0,"Position":380.0,"HyperDash":false}]},{"StartTime":203018.0,"Objects":[{"StartTime":203018.0,"Position":283.0,"HyperDash":false},{"StartTime":203109.0,"Position":343.604553,"HyperDash":false},{"StartTime":203236.0,"Position":420.997742,"HyperDash":false}]},{"StartTime":203347.0,"Objects":[{"StartTime":203347.0,"Position":337.0,"HyperDash":true}]},{"StartTime":203456.0,"Objects":[{"StartTime":203456.0,"Position":103.0,"HyperDash":false},{"StartTime":203547.0,"Position":60.25659,"HyperDash":false},{"StartTime":203674.0,"Position":111.501694,"HyperDash":false}]},{"StartTime":203785.0,"Objects":[{"StartTime":203785.0,"Position":202.0,"HyperDash":false}]},{"StartTime":203894.0,"Objects":[{"StartTime":203894.0,"Position":111.0,"HyperDash":false},{"StartTime":204003.0,"Position":109.296814,"HyperDash":true}]},{"StartTime":204113.0,"Objects":[{"StartTime":204113.0,"Position":310.0,"HyperDash":false},{"StartTime":204222.0,"Position":378.995667,"HyperDash":true}]},{"StartTime":204332.0,"Objects":[{"StartTime":204332.0,"Position":177.0,"HyperDash":true}]},{"StartTime":204442.0,"Objects":[{"StartTime":204442.0,"Position":378.0,"HyperDash":false},{"StartTime":204551.0,"Position":378.932343,"HyperDash":true}]},{"StartTime":204661.0,"Objects":[{"StartTime":204661.0,"Position":177.0,"HyperDash":false}]},{"StartTime":204770.0,"Objects":[{"StartTime":204770.0,"Position":80.0,"HyperDash":false},{"StartTime":204861.0,"Position":65.8601456,"HyperDash":false},{"StartTime":204988.0,"Position":78.31786,"HyperDash":false}]},{"StartTime":205099.0,"Objects":[{"StartTime":205099.0,"Position":162.0,"HyperDash":true}]},{"StartTime":205208.0,"Objects":[{"StartTime":205208.0,"Position":395.0,"HyperDash":false},{"StartTime":205317.0,"Position":326.0,"HyperDash":true}]},{"StartTime":205427.0,"Objects":[{"StartTime":205427.0,"Position":124.0,"HyperDash":true}]},{"StartTime":205536.0,"Objects":[{"StartTime":205536.0,"Position":323.0,"HyperDash":false}]},{"StartTime":205646.0,"Objects":[{"StartTime":205646.0,"Position":420.0,"HyperDash":false},{"StartTime":205737.0,"Position":379.3955,"HyperDash":false},{"StartTime":205864.0,"Position":282.002441,"HyperDash":false}]},{"StartTime":205974.0,"Objects":[{"StartTime":205974.0,"Position":379.0,"HyperDash":true}]},{"StartTime":206084.0,"Objects":[{"StartTime":206084.0,"Position":143.0,"HyperDash":false},{"StartTime":206193.0,"Position":74.02588,"HyperDash":false}]},{"StartTime":206303.0,"Objects":[{"StartTime":206303.0,"Position":171.0,"HyperDash":true}]},{"StartTime":206412.0,"Objects":[{"StartTime":206412.0,"Position":370.0,"HyperDash":false}]},{"StartTime":206522.0,"Objects":[{"StartTime":206522.0,"Position":467.0,"HyperDash":false},{"StartTime":206613.0,"Position":501.909729,"HyperDash":false},{"StartTime":206740.0,"Position":463.333649,"HyperDash":false}]},{"StartTime":206850.0,"Objects":[{"StartTime":206850.0,"Position":380.0,"HyperDash":true}]},{"StartTime":206960.0,"Objects":[{"StartTime":206960.0,"Position":109.0,"HyperDash":false},{"StartTime":207051.0,"Position":184.6055,"HyperDash":false},{"StartTime":207178.0,"Position":247.0,"HyperDash":false}]},{"StartTime":207288.0,"Objects":[{"StartTime":207288.0,"Position":156.0,"HyperDash":false}]},{"StartTime":207398.0,"Objects":[{"StartTime":207398.0,"Position":65.0,"HyperDash":true}]},{"StartTime":207617.0,"Objects":[{"StartTime":207617.0,"Position":382.0,"HyperDash":false}]},{"StartTime":207726.0,"Objects":[{"StartTime":207726.0,"Position":420.0,"HyperDash":false}]},{"StartTime":207836.0,"Objects":[{"StartTime":207836.0,"Position":378.0,"HyperDash":false}]},{"StartTime":207945.0,"Objects":[{"StartTime":207945.0,"Position":302.0,"HyperDash":false}]},{"StartTime":208055.0,"Objects":[{"StartTime":208055.0,"Position":191.0,"HyperDash":false},{"StartTime":208164.0,"Position":190.092178,"HyperDash":true}]},{"StartTime":208274.0,"Objects":[{"StartTime":208274.0,"Position":391.0,"HyperDash":false},{"StartTime":208365.0,"Position":402.309845,"HyperDash":false},{"StartTime":208492.0,"Position":381.4403,"HyperDash":false}]},{"StartTime":208602.0,"Objects":[{"StartTime":208602.0,"Position":298.0,"HyperDash":true}]},{"StartTime":208712.0,"Objects":[{"StartTime":208712.0,"Position":62.0,"HyperDash":false},{"StartTime":208821.0,"Position":61.1154556,"HyperDash":false}]},{"StartTime":208931.0,"Objects":[{"StartTime":208931.0,"Position":172.0,"HyperDash":false},{"StartTime":209040.0,"Position":240.99353,"HyperDash":true}]},{"StartTime":209150.0,"Objects":[{"StartTime":209150.0,"Position":442.0,"HyperDash":false},{"StartTime":209241.0,"Position":460.81012,"HyperDash":false},{"StartTime":209368.0,"Position":438.616364,"HyperDash":false}]},{"StartTime":209478.0,"Objects":[{"StartTime":209478.0,"Position":355.0,"HyperDash":true}]},{"StartTime":209588.0,"Objects":[{"StartTime":209588.0,"Position":119.0,"HyperDash":false},{"StartTime":209697.0,"Position":116.205,"HyperDash":false}]},{"StartTime":209807.0,"Objects":[{"StartTime":209807.0,"Position":220.0,"HyperDash":false}]},{"StartTime":210026.0,"Objects":[{"StartTime":210026.0,"Position":413.0,"HyperDash":false}]},{"StartTime":210244.0,"Objects":[{"StartTime":210244.0,"Position":124.0,"HyperDash":false},{"StartTime":210353.0,"Position":55.0,"HyperDash":true}]},{"StartTime":210463.0,"Objects":[{"StartTime":210463.0,"Position":325.0,"HyperDash":false},{"StartTime":210517.0,"Position":370.597351,"HyperDash":false},{"StartTime":210572.0,"Position":383.999176,"HyperDash":false},{"StartTime":210626.0,"Position":443.559265,"HyperDash":false},{"StartTime":210681.0,"Position":452.158966,"HyperDash":false},{"StartTime":210772.0,"Position":494.5323,"HyperDash":false},{"StartTime":210900.0,"Position":484.299774,"HyperDash":true}]},{"StartTime":211120.0,"Objects":[{"StartTime":211120.0,"Position":165.0,"HyperDash":false},{"StartTime":211174.0,"Position":212.105072,"HyperDash":false},{"StartTime":211229.0,"Position":213.841736,"HyperDash":false},{"StartTime":211283.0,"Position":247.946808,"HyperDash":false},{"StartTime":211338.0,"Position":302.683472,"HyperDash":false},{"StartTime":211429.0,"Position":349.15686,"HyperDash":false},{"StartTime":211557.0,"Position":440.9985,"HyperDash":true}]},{"StartTime":211777.0,"Objects":[{"StartTime":211777.0,"Position":149.0,"HyperDash":false},{"StartTime":211868.0,"Position":93.3959351,"HyperDash":false},{"StartTime":211995.0,"Position":11.0034637,"HyperDash":true}]},{"StartTime":212215.0,"Objects":[{"StartTime":212215.0,"Position":357.0,"HyperDash":false},{"StartTime":212269.0,"Position":341.920715,"HyperDash":false},{"StartTime":212324.0,"Position":294.210358,"HyperDash":false},{"StartTime":212378.0,"Position":264.1311,"HyperDash":false},{"StartTime":212433.0,"Position":219.420731,"HyperDash":false},{"StartTime":212488.0,"Position":202.710373,"HyperDash":false},{"StartTime":212543.0,"Position":150.0,"HyperDash":false},{"StartTime":212597.0,"Position":190.079254,"HyperDash":false},{"StartTime":212652.0,"Position":218.789642,"HyperDash":false},{"StartTime":212743.0,"Position":290.2195,"HyperDash":false},{"StartTime":212871.0,"Position":357.0,"HyperDash":true}]},{"StartTime":213091.0,"Objects":[{"StartTime":213091.0,"Position":65.0,"HyperDash":false},{"StartTime":213145.0,"Position":117.105263,"HyperDash":false},{"StartTime":213200.0,"Position":132.8421,"HyperDash":false},{"StartTime":213254.0,"Position":151.947357,"HyperDash":false},{"StartTime":213309.0,"Position":202.6842,"HyperDash":false},{"StartTime":213400.0,"Position":256.1579,"HyperDash":false},{"StartTime":213528.0,"Position":341.0,"HyperDash":false}]},{"StartTime":213639.0,"Objects":[{"StartTime":213639.0,"Position":250.0,"HyperDash":false}]},{"StartTime":213748.0,"Objects":[{"StartTime":213748.0,"Position":339.0,"HyperDash":true}]},{"StartTime":213858.0,"Objects":[{"StartTime":213858.0,"Position":103.0,"HyperDash":true}]},{"StartTime":213967.0,"Objects":[{"StartTime":213967.0,"Position":339.0,"HyperDash":false},{"StartTime":214058.0,"Position":364.006348,"HyperDash":false},{"StartTime":214185.0,"Position":336.10022,"HyperDash":false}]},{"StartTime":214296.0,"Objects":[{"StartTime":214296.0,"Position":245.0,"HyperDash":false}]},{"StartTime":214405.0,"Objects":[{"StartTime":214405.0,"Position":334.0,"HyperDash":false},{"StartTime":214514.0,"Position":335.746277,"HyperDash":true}]},{"StartTime":214624.0,"Objects":[{"StartTime":214624.0,"Position":134.0,"HyperDash":false},{"StartTime":214733.0,"Position":65.0045547,"HyperDash":true}]},{"StartTime":214843.0,"Objects":[{"StartTime":214843.0,"Position":300.0,"HyperDash":false},{"StartTime":214952.0,"Position":300.896027,"HyperDash":true}]},{"StartTime":215062.0,"Objects":[{"StartTime":215062.0,"Position":99.0,"HyperDash":true}]},{"StartTime":215172.0,"Objects":[{"StartTime":215172.0,"Position":300.0,"HyperDash":false}]},{"StartTime":215281.0,"Objects":[{"StartTime":215281.0,"Position":203.0,"HyperDash":false},{"StartTime":215372.0,"Position":151.402954,"HyperDash":false},{"StartTime":215499.0,"Position":65.02028,"HyperDash":false}]},{"StartTime":215609.0,"Objects":[{"StartTime":215609.0,"Position":148.0,"HyperDash":true}]},{"StartTime":215719.0,"Objects":[{"StartTime":215719.0,"Position":383.0,"HyperDash":false},{"StartTime":215828.0,"Position":314.0,"HyperDash":true}]},{"StartTime":215938.0,"Objects":[{"StartTime":215938.0,"Position":112.0,"HyperDash":true}]},{"StartTime":216047.0,"Objects":[{"StartTime":216047.0,"Position":311.0,"HyperDash":false}]},{"StartTime":216157.0,"Objects":[{"StartTime":216157.0,"Position":408.0,"HyperDash":false},{"StartTime":216248.0,"Position":431.067078,"HyperDash":false},{"StartTime":216375.0,"Position":402.494934,"HyperDash":false}]},{"StartTime":216485.0,"Objects":[{"StartTime":216485.0,"Position":305.0,"HyperDash":true}]},{"StartTime":216595.0,"Objects":[{"StartTime":216595.0,"Position":69.0,"HyperDash":false},{"StartTime":216704.0,"Position":68.16873,"HyperDash":false}]},{"StartTime":216814.0,"Objects":[{"StartTime":216814.0,"Position":179.0,"HyperDash":false},{"StartTime":216923.0,"Position":247.995117,"HyperDash":true}]},{"StartTime":217033.0,"Objects":[{"StartTime":217033.0,"Position":449.0,"HyperDash":false},{"StartTime":217142.0,"Position":380.0034,"HyperDash":true}]},{"StartTime":217252.0,"Objects":[{"StartTime":217252.0,"Position":178.0,"HyperDash":false},{"StartTime":217361.0,"Position":109.0,"HyperDash":true}]},{"StartTime":217471.0,"Objects":[{"StartTime":217471.0,"Position":344.0,"HyperDash":false},{"StartTime":217562.0,"Position":286.3945,"HyperDash":false},{"StartTime":217689.0,"Position":206.0,"HyperDash":false}]},{"StartTime":217799.0,"Objects":[{"StartTime":217799.0,"Position":289.0,"HyperDash":false}]},{"StartTime":217909.0,"Objects":[{"StartTime":217909.0,"Position":206.0,"HyperDash":false},{"StartTime":218018.0,"Position":205.092178,"HyperDash":true}]},{"StartTime":218128.0,"Objects":[{"StartTime":218128.0,"Position":406.0,"HyperDash":false},{"StartTime":218237.0,"Position":474.99353,"HyperDash":true}]},{"StartTime":218347.0,"Objects":[{"StartTime":218347.0,"Position":239.0,"HyperDash":false},{"StartTime":218456.0,"Position":170.005249,"HyperDash":true}]},{"StartTime":218566.0,"Objects":[{"StartTime":218566.0,"Position":371.0,"HyperDash":true}]},{"StartTime":218675.0,"Objects":[{"StartTime":218675.0,"Position":170.0,"HyperDash":false}]},{"StartTime":218785.0,"Objects":[{"StartTime":218785.0,"Position":267.0,"HyperDash":false},{"StartTime":218876.0,"Position":329.6045,"HyperDash":false},{"StartTime":219003.0,"Position":404.997559,"HyperDash":false}]},{"StartTime":219113.0,"Objects":[{"StartTime":219113.0,"Position":321.0,"HyperDash":true}]},{"StartTime":219223.0,"Objects":[{"StartTime":219223.0,"Position":85.0,"HyperDash":false},{"StartTime":219332.0,"Position":85.0,"HyperDash":true}]},{"StartTime":219442.0,"Objects":[{"StartTime":219442.0,"Position":286.0,"HyperDash":false},{"StartTime":219551.0,"Position":354.996,"HyperDash":true}]},{"StartTime":219661.0,"Objects":[{"StartTime":219661.0,"Position":119.0,"HyperDash":false},{"StartTime":219770.0,"Position":50.0000076,"HyperDash":true}]},{"StartTime":219880.0,"Objects":[{"StartTime":219880.0,"Position":320.0,"HyperDash":false}]},{"StartTime":219989.0,"Objects":[{"StartTime":219989.0,"Position":399.0,"HyperDash":false}]},{"StartTime":220099.0,"Objects":[{"StartTime":220099.0,"Position":402.0,"HyperDash":false}]},{"StartTime":220208.0,"Objects":[{"StartTime":220208.0,"Position":327.0,"HyperDash":true}]},{"StartTime":220317.0,"Objects":[{"StartTime":220317.0,"Position":129.0,"HyperDash":false},{"StartTime":220426.0,"Position":129.0,"HyperDash":true}]},{"StartTime":220536.0,"Objects":[{"StartTime":220536.0,"Position":330.0,"HyperDash":false},{"StartTime":220645.0,"Position":398.953857,"HyperDash":true}]},{"StartTime":220755.0,"Objects":[{"StartTime":220755.0,"Position":163.0,"HyperDash":false},{"StartTime":220864.0,"Position":94.00001,"HyperDash":true}]},{"StartTime":220974.0,"Objects":[{"StartTime":220974.0,"Position":364.0,"HyperDash":false}]},{"StartTime":221084.0,"Objects":[{"StartTime":221084.0,"Position":439.0,"HyperDash":false}]},{"StartTime":221193.0,"Objects":[{"StartTime":221193.0,"Position":426.0,"HyperDash":false}]},{"StartTime":221303.0,"Objects":[{"StartTime":221303.0,"Position":350.0,"HyperDash":false}]},{"StartTime":221412.0,"Objects":[{"StartTime":221412.0,"Position":240.0,"HyperDash":false},{"StartTime":221521.0,"Position":239.148209,"HyperDash":true}]},{"StartTime":221631.0,"Objects":[{"StartTime":221631.0,"Position":440.0,"HyperDash":false}]},{"StartTime":221741.0,"Objects":[{"StartTime":221741.0,"Position":472.0,"HyperDash":false}]},{"StartTime":221850.0,"Objects":[{"StartTime":221850.0,"Position":434.0,"HyperDash":false}]},{"StartTime":221960.0,"Objects":[{"StartTime":221960.0,"Position":357.0,"HyperDash":true}]},{"StartTime":222069.0,"Objects":[{"StartTime":222069.0,"Position":157.0,"HyperDash":false},{"StartTime":222178.0,"Position":88.06657,"HyperDash":true}]},{"StartTime":222288.0,"Objects":[{"StartTime":222288.0,"Position":289.0,"HyperDash":false},{"StartTime":222379.0,"Position":364.60202,"HyperDash":false},{"StartTime":222506.0,"Position":426.991669,"HyperDash":false}]},{"StartTime":222617.0,"Objects":[{"StartTime":222617.0,"Position":343.0,"HyperDash":true}]},{"StartTime":222726.0,"Objects":[{"StartTime":222726.0,"Position":109.0,"HyperDash":false},{"StartTime":222817.0,"Position":84.0503159,"HyperDash":false},{"StartTime":222944.0,"Position":116.766586,"HyperDash":false}]},{"StartTime":223055.0,"Objects":[{"StartTime":223055.0,"Position":207.0,"HyperDash":false}]},{"StartTime":223164.0,"Objects":[{"StartTime":223164.0,"Position":117.0,"HyperDash":false},{"StartTime":223273.0,"Position":114.6221,"HyperDash":true}]},{"StartTime":223383.0,"Objects":[{"StartTime":223383.0,"Position":315.0,"HyperDash":false},{"StartTime":223492.0,"Position":383.995117,"HyperDash":true}]},{"StartTime":223602.0,"Objects":[{"StartTime":223602.0,"Position":148.0,"HyperDash":false},{"StartTime":223711.0,"Position":145.971466,"HyperDash":false}]},{"StartTime":223821.0,"Objects":[{"StartTime":223821.0,"Position":256.0,"HyperDash":false},{"StartTime":223930.0,"Position":325.0,"HyperDash":true}]},{"StartTime":224040.0,"Objects":[{"StartTime":224040.0,"Position":123.0,"HyperDash":false},{"StartTime":224149.0,"Position":192.0,"HyperDash":true}]},{"StartTime":224259.0,"Objects":[{"StartTime":224259.0,"Position":393.0,"HyperDash":false},{"StartTime":224368.0,"Position":393.896027,"HyperDash":true}]},{"StartTime":224478.0,"Objects":[{"StartTime":224478.0,"Position":158.0,"HyperDash":false}]},{"StartTime":224588.0,"Objects":[{"StartTime":224588.0,"Position":82.0,"HyperDash":false}]},{"StartTime":224697.0,"Objects":[{"StartTime":224697.0,"Position":44.0,"HyperDash":false}]},{"StartTime":224807.0,"Objects":[{"StartTime":224807.0,"Position":86.0,"HyperDash":true}]},{"StartTime":224916.0,"Objects":[{"StartTime":224916.0,"Position":285.0,"HyperDash":false},{"StartTime":225025.0,"Position":353.996,"HyperDash":true}]},{"StartTime":225135.0,"Objects":[{"StartTime":225135.0,"Position":83.0,"HyperDash":false}]},{"StartTime":225244.0,"Objects":[{"StartTime":225244.0,"Position":41.0,"HyperDash":false}]},{"StartTime":225354.0,"Objects":[{"StartTime":225354.0,"Position":82.0,"HyperDash":false}]},{"StartTime":225463.0,"Objects":[{"StartTime":225463.0,"Position":157.0,"HyperDash":false}]},{"StartTime":225573.0,"Objects":[{"StartTime":225573.0,"Position":267.0,"HyperDash":false},{"StartTime":225682.0,"Position":267.0,"HyperDash":true}]},{"StartTime":225792.0,"Objects":[{"StartTime":225792.0,"Position":65.0,"HyperDash":false},{"StartTime":225901.0,"Position":64.19773,"HyperDash":false}]},{"StartTime":226011.0,"Objects":[{"StartTime":226011.0,"Position":154.0,"HyperDash":false}]},{"StartTime":226120.0,"Objects":[{"StartTime":226120.0,"Position":64.0,"HyperDash":true}]},{"StartTime":226230.0,"Objects":[{"StartTime":226230.0,"Position":299.0,"HyperDash":false}]},{"StartTime":226449.0,"Objects":[{"StartTime":226449.0,"Position":105.0,"HyperDash":false},{"StartTime":226558.0,"Position":104.115456,"HyperDash":true}]},{"StartTime":226668.0,"Objects":[{"StartTime":226668.0,"Position":305.0,"HyperDash":true}]},{"StartTime":226777.0,"Objects":[{"StartTime":226777.0,"Position":104.0,"HyperDash":false},{"StartTime":226886.0,"Position":35.0059738,"HyperDash":true}]},{"StartTime":227106.0,"Objects":[{"StartTime":227106.0,"Position":383.0,"HyperDash":false},{"StartTime":227160.0,"Position":350.499268,"HyperDash":false},{"StartTime":227215.0,"Position":324.281738,"HyperDash":false},{"StartTime":227269.0,"Position":266.25296,"HyperDash":false},{"StartTime":227324.0,"Position":247.835876,"HyperDash":false},{"StartTime":227378.0,"Position":218.959808,"HyperDash":false},{"StartTime":227433.0,"Position":168.075058,"HyperDash":false},{"StartTime":227488.0,"Position":136.432785,"HyperDash":false},{"StartTime":227543.0,"Position":126.625404,"HyperDash":false},{"StartTime":227597.0,"Position":101.627563,"HyperDash":false},{"StartTime":227652.0,"Position":86.03102,"HyperDash":false},{"StartTime":227707.0,"Position":60.6709824,"HyperDash":false},{"StartTime":227762.0,"Position":57.8545761,"HyperDash":false},{"StartTime":227853.0,"Position":59.5702324,"HyperDash":false},{"StartTime":227981.0,"Position":63.0289955,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3524302.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3524302.osu
new file mode 100644
index 0000000000..36f52c4ae2
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3524302.osu
@@ -0,0 +1,889 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4
+OverallDifficulty:9.2
+ApproachRate:9.2
+SliderMultiplier:2.76
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+2,88036,100842
+2,172123,178142
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+245,437.956204379562,4,2,1,30,1,0
+17763,-100,4,2,1,65,0,0
+31777,-100,4,2,1,70,0,0
+45792,-100,4,2,1,75,0,0
+52799,-100,4,2,1,80,0,0
+59807,-100,4,2,1,85,0,1
+86960,-90.9090909090909,4,2,1,80,0,1
+87836,-100,4,2,1,75,0,0
+101850,-100,4,2,1,65,0,0
+115865,-100,4,2,1,70,0,0
+129880,-100,4,2,1,75,0,0
+136887,-100,4,2,1,80,0,0
+140828,-100,4,2,1,60,0,0
+141485,-100,4,2,1,65,0,0
+141704,-100,4,2,1,70,0,0
+141923,-100,4,2,1,75,0,0
+142142,-100,4,2,1,80,0,0
+143894,-100,4,2,1,85,0,1
+171923,-100,4,2,1,75,0,0
+178931,-100,4,2,1,75,0,0
+192945,-76.9230769230769,4,2,1,85,0,1
+193383,-47.6190476190476,4,2,1,85,0,1
+193821,-76.9230769230769,4,2,1,85,0,1
+194259,-47.6190476190476,4,2,1,85,0,1
+194697,-100,4,2,1,85,0,1
+195135,-47.6190476190476,4,2,1,85,0,1
+195573,-100,4,2,1,85,0,1
+196011,-47.6190476190476,4,2,1,85,0,1
+196449,-100,4,2,1,85,0,1
+196668,-47.6190476190476,4,2,1,85,0,1
+198639,-71.4285714285714,4,2,2,85,0,1
+199077,-100,4,2,2,85,0,1
+199296,-76.9230769230769,4,2,1,85,0,1
+199953,-100,4,2,1,80,0,0
+201704,-100,4,2,1,85,0,1
+227982,-100,4,2,1,30,0,0
+
+[HitObjects]
+256,192,14259,12,0,17325,0:0:0:0:
+166,339,17763,6,0,L|164:200,1,138,2|0,1:2|0:0,0:0:0:0:
+358,201,18201,2,0,L|360:62,1,138,0|0,1:2|0:0,0:0:0:0:
+165,63,18639,2,0,L|18:65,1,138,2|2,1:2|0:0,0:0:0:0:
+137,64,18967,2,0,L|208:65,1,69,2|0,0:0|1:2,0:0:0:0:
+25,64,19296,1,2,0:0:0:0:
+314,64,19515,5,2,1:2:0:0:
+350,130,19624,1,0,0:0:0:0:
+312,196,19734,1,2,0:0:0:0:
+118,196,19953,2,0,L|259:197,1,138,2|2,1:2|0:0,0:0:0:0:
+449,196,20390,2,0,L|452:342,1,138,2|2,1:2|0:0,0:0:0:0:
+271,333,20828,1,2,1:2:0:0:
+451,333,21047,1,2,0:0:0:0:
+133,333,21266,5,2,1:2:0:0:
+97,265,21376,1,0,0:0:0:0:
+136,200,21485,1,0,0:0:0:0:
+329,200,21704,2,0,L|331:57,1,138,0|0,1:2|0:0,0:0:0:0:
+136,62,22142,2,0,L|297:62,1,138,2|2,1:2|0:0,0:0:0:0:
+385,62,22471,2,0,L|294:62,1,69,2|0,0:0|1:2,0:0:0:0:
+136,62,22799,1,2,0:0:0:0:
+425,62,23018,5,2,1:2:0:0:
+461,128,23128,1,0,0:0:0:0:
+421,192,23237,1,2,0:0:0:0:
+227,192,23456,2,0,L|224:332,1,138,2|2,1:2|0:0,0:0:0:0:
+404,329,23894,1,2,1:2:0:0:
+224,329,24113,1,2,0:0:0:0:
+417,329,24332,2,0,L|419:187,1,138,2|2,1:2|0:0,0:0:0:0:
+341,191,24661,1,2,0:0:0:0:
+107,191,24770,5,2,1:2:0:0:
+69,124,24880,1,0,0:0:0:0:
+111,61,24989,1,0,0:0:0:0:
+304,61,25208,2,0,L|306:200,1,138,0|0,1:2|0:0,0:0:0:0:
+111,198,25646,2,0,L|110:337,1,138,2|0,1:2|0:0,0:0:0:0:
+220,335,25974,2,0,L|292:335,1,69,2|0,0:0|1:2,0:0:0:0:
+108,335,26303,1,2,0:0:0:0:
+397,335,26522,5,2,1:2:0:0:
+432,268,26631,1,0,0:0:0:0:
+395,200,26741,1,2,0:0:0:0:
+215,200,26960,1,2,1:2:0:0:
+395,200,27179,1,2,0:0:0:0:
+201,200,27398,2,0,L|200:59,1,138,2|0,1:2|0:0,0:0:0:0:
+380,62,27836,1,0,1:2:0:0:
+200,62,28055,1,2,0:0:0:0:
+131,62,28164,1,2,0:0:0:0:
+365,62,28274,6,0,P|452:120|350:202,1,276,2|0,1:2|0:0,0:0:0:0:
+170,202,28931,1,2,0:0:0:0:
+349,202,29150,2,0,P|415:208|474:382,1,276,2|0,0:0|0:0,0:0:0:0:
+114,381,30026,5,0,1:2:0:0:
+292,381,30244,1,8,0:3:0:0:
+114,381,30463,2,0,L|113:240,1,138,8|0,0:3|0:0,0:0:0:0:
+307,243,30901,2,0,L|309:102,1,138,4|0,0:3|0:0,0:0:0:0:
+197,105,31230,2,0,L|129:106,1,69,4|0,0:3|1:2,0:0:0:0:
+417,106,31558,2,0,L|418:180,1,69,0|0,3:2|0:0,0:0:0:0:
+148,174,31777,5,2,1:2:0:0:
+78,174,31887,1,0,0:0:0:0:
+148,174,31996,1,0,0:0:0:0:
+341,174,32215,2,0,P|354:234|340:315,1,138,0|0,3:2|0:0,0:0:0:0:
+265,311,32544,1,0,1:2:0:0:
+155,311,32653,2,0,L|-7:310,1,138,2|2,0:0|1:2,0:0:0:0:
+93,310,32982,1,2,0:0:0:0:
+292,310,33091,1,0,3:2:0:0:
+112,310,33310,2,0,L|110:239,1,69,2|0,0:0|0:0,0:0:0:0:
+327,242,33529,5,2,1:2:0:0:
+396,242,33639,1,0,0:0:0:0:
+327,242,33748,1,0,0:0:0:0:
+133,242,33967,2,0,L|131:104,1,138,2|2,3:2|0:0,0:0:0:0:
+207,104,34296,1,0,1:2:0:0:
+316,104,34405,2,0,L|170:104,1,138,2|2,0:0|1:2,0:0:0:0:
+254,104,34734,1,0,0:0:0:0:
+453,104,34843,2,0,P|466:169|455:240,1,138,2|2,3:2|0:0,0:0:0:0:
+378,239,35172,1,2,0:0:0:0:
+145,239,35281,5,2,1:2:0:0:
+76,239,35390,1,0,0:0:0:0:
+145,239,35500,1,0,0:0:0:0:
+338,239,35719,2,0,L|340:102,1,138,0|0,3:2|0:0,0:0:0:0:
+263,101,36047,1,0,1:2:0:0:
+165,101,36157,1,2,0:0:0:0:
+263,101,36266,1,2,0:0:0:0:
+339,101,36376,1,2,1:2:0:0:
+263,101,36485,1,2,0:0:0:0:
+61,101,36595,2,0,P|45:160|61:238,1,138,0|2,3:2|0:0,0:0:0:0:
+135,234,36923,1,0,0:0:0:0:
+371,233,37033,5,2,1:2:0:0:
+439,233,37142,1,0,0:0:0:0:
+371,233,37252,1,0,0:0:0:0:
+177,233,37471,2,0,L|318:233,1,138,2|0,3:2|0:0,0:0:0:0:
+238,233,37799,1,0,1:2:0:0:
+127,233,37909,2,0,L|125:94,1,138,2|2,0:0|1:2,0:0:0:0:
+201,95,38237,1,0,0:0:0:0:
+402,95,38347,2,0,P|410:157|404:236,1,138,2|2,3:2|0:0,0:0:0:0:
+328,232,38675,1,0,0:0:0:0:
+92,233,38785,5,2,1:2:0:0:
+23,233,38894,1,0,0:0:0:0:
+92,233,39004,1,0,0:0:0:0:
+285,233,39223,2,0,L|430:233,1,138,0|0,3:2|0:0,0:0:0:0:
+346,233,39551,1,0,1:2:0:0:
+235,233,39661,2,0,L|234:160,1,69,2|2,0:0|0:0,0:0:0:0:
+344,164,39880,2,0,L|346:93,1,69,2|2,1:2|0:0,0:0:0:0:
+144,95,40099,2,0,L|5:95,1,138,0|2,3:2|0:0,0:0:0:0:
+82,95,40427,1,0,0:0:0:0:
+315,95,40536,5,2,1:2:0:0:
+384,95,40646,1,0,0:0:0:0:
+315,95,40755,1,2,0:0:0:0:
+121,95,40974,2,0,L|119:234,1,138,2|2,3:2|0:0,0:0:0:0:
+195,232,41303,1,0,1:2:0:0:
+394,232,41412,1,2,0:0:0:0:
+214,232,41631,1,0,1:2:0:0:
+144,232,41741,1,0,0:0:0:0:
+214,232,41850,1,0,3:2:0:0:
+407,232,42069,2,0,L|492:232,1,69,2|2,0:0|0:0,0:0:0:0:
+240,232,42288,5,2,1:2:0:0:
+170,232,42398,1,0,0:0:0:0:
+240,232,42507,1,0,0:0:0:0:
+419,232,42726,1,2,3:2:0:0:
+129,232,42945,2,0,L|128:161,1,69,2|0,0:0|1:2,0:0:0:0:
+238,163,43164,2,0,L|380:164,1,138,2|2,0:0|1:2,0:0:0:0:
+299,163,43493,1,0,0:0:0:0:
+195,163,43602,1,2,3:2:0:0:
+374,163,43821,1,2,0:0:0:0:
+376,93,43931,1,0,0:0:0:0:
+108,163,44040,5,6,1:2:0:0:
+106,93,44150,1,2,0:0:0:0:
+209,93,44259,1,0,3:2:0:0:
+388,93,44478,1,0,3:2:0:0:
+195,93,44697,1,2,1:2:0:0:
+484,93,44916,1,8,0:3:0:0:
+407,93,45026,1,8,0:3:0:0:
+213,93,45244,1,8,0:3:0:0:
+316,93,45354,2,0,L|460:94,1,138,2|4,0:0|0:3,0:0:0:0:
+103,93,45792,6,0,P|17:149|121:239,1,276,6|0,1:2|0:0,0:0:0:0:
+294,241,46449,2,0,L|37:136,1,276,2|2,0:0|0:0,0:0:0:0:
+204,136,47106,1,2,0:0:0:0:
+38,136,47325,1,2,0:0:0:0:
+355,136,47544,6,0,P|438:178|341:272,1,276,6|0,1:2|0:0,0:0:0:0:
+173,271,48201,1,0,0:0:0:0:
+338,271,48420,2,0,P|355:199|200:122,1,276,2|2,0:0|0:0,0:0:0:0:
+369,120,49077,1,2,0:0:0:0:
+51,120,49296,6,0,L|49:261,1,138,6|2,1:2|0:0,0:0:0:0:
+229,257,49734,2,0,L|371:256,1,138,2|2,0:0|0:0,0:0:0:0:
+186,256,50172,2,0,L|47:255,1,138,2|2,0:0|0:0,0:0:0:0:
+227,255,50609,1,2,0:0:0:0:
+47,255,50828,1,2,0:0:0:0:
+347,254,51047,6,0,P|438:243|478:85,1,276,6|0,1:2|0:0,0:0:0:0:
+118,84,51923,2,0,P|103:147|121:221,1,138,2|2,3:2|3:2,0:0:0:0:
+313,217,52361,1,8,0:3:0:0:
+119,217,52580,1,8,0:3:0:0:
+436,217,52799,6,0,L|127:184,1,276,2|2,1:2|3:2,0:0:0:0:
+452,187,53456,1,2,0:0:0:0:
+489,128,53566,1,0,1:2:0:0:
+454,68,53675,1,0,0:0:0:0:
+274,68,53894,1,2,1:2:0:0:
+454,68,54113,2,0,L|301:69,1,138,2|2,3:2|0:0,0:0:0:0:
+24,68,54551,6,0,L|306:94,1,276,0|0,1:2|3:2,0:0:0:0:
+104,93,55208,1,0,0:0:0:0:
+62,93,55317,1,0,1:2:0:0:
+104,93,55427,1,2,0:0:0:0:
+393,93,55646,2,0,L|266:151,1,138,2|0,1:2|3:2,0:0:0:0:
+87,150,56084,1,2,0:0:0:0:
+432,116,56303,6,0,P|308:196|181:218,1,276,6|2,1:2|3:2,0:0:0:0:
+365,218,56960,1,2,1:2:0:0:
+75,218,57179,2,0,L|232:214,1,138,2|2,3:2|1:2,0:0:0:0:
+407,214,57617,2,0,L|410:69,1,138,2|2,3:2|0:0,0:0:0:0:
+118,76,58055,6,0,L|335:76,2,207,2|2|2,1:2|0:0|0:0,0:0:0:0:
+312,76,58931,2,0,P|275:213|34:256,1,414,2|0,0:0|0:0,0:0:0:0:
+380,255,59807,6,0,P|404:186|380:128,1,138,6|0,1:2|0:0,0:0:0:0:
+290,128,60135,1,2,0:0:0:0:
+380,128,60244,2,0,L|382:52,1,69,0|0,3:2|0:0,0:0:0:0:
+180,59,60463,2,0,L|96:59,1,69,2|0,0:0|1:2,0:0:0:0:
+346,59,60682,6,0,L|346:144,1,69,2|2,0:0|0:0,0:0:0:0:
+144,128,60901,1,2,1:2:0:0:
+345,128,61011,1,2,0:0:0:0:
+441,128,61120,2,0,P|475:194|424:240,1,138,0|2,3:2|0:0,0:0:0:0:
+355,236,61449,1,0,0:0:0:0:
+121,236,61558,6,0,L|120:164,1,69,2|2,1:2|0:0,0:0:0:0:
+321,167,61777,1,2,0:0:0:0:
+120,167,61887,1,2,0:0:0:0:
+23,167,61996,2,0,L|177:166,1,138,0|2,3:2|0:0,0:0:0:0:
+63,166,62325,1,0,1:2:0:0:
+296,166,62434,6,0,L|297:95,1,69,2|2,0:0|0:0,0:0:0:0:
+199,97,62653,1,0,1:2:0:0:
+400,97,62763,1,2,0:0:0:0:
+303,97,62872,2,0,P|293:153|354:193,1,138,0|2,3:2|0:0,0:0:0:0:
+438,192,63201,1,0,0:0:0:0:
+204,192,63310,6,0,P|133:187|94:138,1,138,2|0,1:2|0:0,0:0:0:0:
+184,137,63639,1,2,0:0:0:0:
+93,137,63748,2,0,L|92:53,1,69,0|0,3:2|0:0,0:0:0:0:
+293,68,63967,2,0,L|294:143,1,69,2|0,0:0|1:2,0:0:0:0:
+93,137,64186,5,2,0:0:0:0:
+293,136,64296,2,0,L|361:136,1,69,2|0,0:0|1:2,0:0:0:0:
+160,136,64515,1,2,0:0:0:0:
+63,136,64624,2,0,P|29:83|79:30,1,138,0|2,3:2|0:0,0:0:0:0:
+154,31,64953,1,0,0:0:0:0:
+387,31,65062,6,0,L|319:30,1,69,2|2,1:2|0:0,0:0:0:0:
+116,29,65281,1,2,0:0:0:0:
+318,29,65390,1,2,0:0:0:0:
+415,29,65500,2,0,P|452:91|413:129,1,138,0|2,3:2|0:0,0:0:0:0:
+315,129,65828,1,0,1:2:0:0:
+79,129,65938,6,0,L|78:59,1,69,2|2,0:0|0:0,0:0:0:0:
+175,60,66157,1,0,1:2:0:0:
+374,60,66266,1,2,0:0:0:0:
+276,60,66376,2,0,L|424:61,1,138,0|2,3:2|0:0,0:0:0:0:
+331,60,66704,1,0,0:0:0:0:
+60,60,66814,6,0,P|28:123|66:176,1,138,6|0,1:2|0:0,0:0:0:0:
+151,173,67142,1,2,0:0:0:0:
+61,173,67252,1,0,3:2:0:0:
+378,173,67471,5,2,1:2:0:0:
+422,111,67580,1,0,0:0:0:0:
+381,46,67690,1,0,0:0:0:0:
+305,44,67799,1,0,0:0:0:0:
+194,44,67909,2,0,L|193:121,1,69,0|0,1:2|0:0,0:0:0:0:
+428,112,68128,2,0,L|288:112,1,138,2|2,3:2|0:0,0:0:0:0:
+373,112,68456,1,0,0:0:0:0:
+137,112,68566,6,0,L|135:183,1,69,2|0,1:2|0:0,0:0:0:0:
+245,181,68785,2,0,L|246:258,1,69,2|0,0:0|0:0,0:0:0:0:
+44,249,69004,2,0,L|191:248,1,138,2|2,3:2|1:2,0:0:0:0:
+98,248,69332,1,0,0:0:0:0:
+333,248,69442,6,0,L|335:170,1,69,2|0,1:2|0:0,0:0:0:0:
+133,179,69661,1,2,1:2:0:0:
+326,179,69880,1,2,3:2:0:0:
+133,179,70099,2,0,L|131:251,1,69,2|0,0:0|0:0,0:0:0:0:
+398,247,70317,6,0,L|106:250,1,276,6|2,1:2|3:2,0:0:0:0:
+468,249,70974,2,0,L|177:250,1,276,6|0,1:2|1:2,0:0:0:0:
+483,249,71631,2,0,L|334:249,1,138,2|2,3:2|0:0,0:0:0:0:
+26,249,72069,6,0,L|243:249,2,207,6|8|8,1:2|0:3|0:3,0:0:0:0:
+344,249,72945,2,0,P|434:201|334:113,1,276,6|0,1:2|3:2,0:0:0:0:
+247,111,73493,1,0,3:2:0:0:
+338,111,73602,1,0,3:2:0:0:
+102,111,73712,1,0,3:2:0:0:
+338,111,73821,6,0,P|372:156|334:220,1,138,6|0,1:2|0:0,0:0:0:0:
+244,219,74150,1,2,0:0:0:0:
+334,219,74259,2,0,L|335:147,1,69,0|0,3:2|0:0,0:0:0:0:
+133,150,74478,2,0,L|131:71,1,69,2|0,0:0|1:2,0:0:0:0:
+366,81,74697,6,0,L|367:158,1,69,2|2,0:0|0:0,0:0:0:0:
+165,149,74916,1,2,1:2:0:0:
+366,149,75026,1,2,0:0:0:0:
+462,149,75135,2,0,L|296:149,1,138,0|2,3:2|0:0,0:0:0:0:
+407,149,75463,1,0,0:0:0:0:
+171,149,75573,6,0,L|169:233,1,69,2|2,1:2|0:0,0:0:0:0:
+370,217,75792,1,2,0:0:0:0:
+170,217,75901,1,2,0:0:0:0:
+72,217,76011,2,0,P|46:151|98:97,1,138,0|2,3:2|0:0,0:0:0:0:
+179,102,76339,1,0,1:2:0:0:
+414,102,76449,6,0,L|491:102,1,69,2|2,0:0|0:0,0:0:0:0:
+385,102,76668,1,0,1:2:0:0:
+185,102,76777,1,2,0:0:0:0:
+282,102,76887,2,0,L|442:101,1,138,0|2,3:2|0:0,0:0:0:0:
+336,101,77215,1,0,0:0:0:0:
+100,101,77325,6,0,P|75:169|105:227,1,138,2|0,1:2|0:0,0:0:0:0:
+192,224,77653,1,2,0:0:0:0:
+102,224,77763,2,0,L|100:301,1,69,0|0,3:2|0:0,0:0:0:0:
+301,292,77982,2,0,L|394:292,1,69,2|0,0:0|1:2,0:0:0:0:
+134,292,78201,6,0,L|133:221,1,69,2|2,0:0|0:0,0:0:0:0:
+334,223,78420,1,2,1:2:0:0:
+135,223,78529,1,2,0:0:0:0:
+37,223,78639,2,0,P|21:160|69:106,1,138,0|2,3:2|0:0,0:0:0:0:
+147,107,78967,1,0,0:0:0:0:
+382,107,79077,6,0,L|384:175,1,69,2|0,1:2|0:0,0:0:0:0:
+273,175,79296,2,0,L|271:243,1,69,2|0,1:2|0:0,0:0:0:0:
+472,243,79515,2,0,L|474:315,1,69,2|0,3:2|0:0,0:0:0:0:
+203,311,79734,6,0,L|132:312,1,69,6|0,1:2|0:0,0:0:0:0:
+244,311,79953,2,0,L|317:311,1,69,2|0,0:0|0:0,0:0:0:0:
+111,311,80172,2,0,L|108:242,1,69,8|0,2:3|0:0,0:0:0:0:
+307,242,80390,2,0,L|385:242,1,69,8|0,2:3|0:0,0:0:0:0:
+140,242,80609,2,0,L|69:242,1,69,4|0,2:3|0:0,0:0:0:0:
+341,242,80828,6,0,L|495:242,1,138,6|0,1:2|0:0,0:0:0:0:
+388,242,81157,1,2,0:0:0:0:
+476,242,81266,1,0,3:2:0:0:
+161,242,81485,5,2,1:2:0:0:
+124,175,81595,1,0,0:0:0:0:
+166,112,81704,1,0,0:0:0:0:
+242,106,81814,1,0,0:0:0:0:
+351,106,81923,2,0,L|352:37,1,69,0|0,1:2|0:0,0:0:0:0:
+150,37,82142,1,2,3:2:0:0:
+74,50,82252,1,0,0:0:0:0:
+84,124,82361,1,0,0:0:0:0:
+166,131,82471,1,0,0:0:0:0:
+399,131,82580,5,2,1:2:0:0:
+442,193,82690,1,0,0:0:0:0:
+399,255,82799,1,0,0:0:0:0:
+316,261,82909,1,2,0:0:0:0:
+206,261,83018,2,0,L|204:185,1,69,0|0,3:2|0:0,0:0:0:0:
+315,192,83237,2,0,L|316:121,1,69,2|0,1:2|0:0,0:0:0:0:
+80,123,83456,6,0,L|78:47,1,69,2|0,1:2|0:0,0:0:0:0:
+182,54,83675,1,2,1:2:0:0:
+375,54,83894,1,2,3:2:0:0:
+57,54,84113,1,2,0:0:0:0:
+133,54,84223,1,0,0:0:0:0:
+366,54,84332,5,2,1:2:0:0:
+405,119,84442,1,0,0:0:0:0:
+361,180,84551,1,0,0:0:0:0:
+284,180,84661,1,0,0:0:0:0:
+174,180,84770,2,0,L|172:256,1,69,0|0,3:2|0:0,0:0:0:0:
+442,248,84989,5,6,1:2:0:0:
+358,248,85099,1,0,0:0:0:0:
+321,183,85208,1,0,0:0:0:0:
+365,123,85317,1,0,0:0:0:0:
+475,123,85427,2,0,L|476:48,1,69,0|0,1:2|0:0,0:0:0:0:
+274,54,85646,2,0,L|273:131,1,69,0|0,3:2|0:0,0:0:0:0:
+363,122,85865,1,0,0:0:0:0:
+273,122,85974,1,0,0:0:0:0:
+71,122,86084,6,0,L|70:210,1,69,0|0,1:2|0:0,0:0:0:0:
+305,190,86303,2,0,L|305:270,1,69,8|0,0:3|0:0,0:0:0:0:
+103,259,86522,1,0,3:2:0:0:
+305,259,86631,2,0,L|388:258,1,69,8|2,0:3|0:0,0:0:0:0:
+55,258,86960,2,0,P|215:211|49:153,1,455.400013897705,2|0,1:2|0:0,0:0:0:0:
+398,117,87836,5,6,1:2:0:0:
+77,106,101412,5,0,3:2:0:0:
+435,106,101850,6,0,P|450:162|434:240,1,138,2|0,1:2|0:0,0:0:0:0:
+240,239,102288,2,0,L|99:240,1,138,0|0,1:2|0:0,0:0:0:0:
+296,239,102726,2,0,L|437:238,1,138,2|0,1:2|0:0,0:0:0:0:
+322,238,103055,2,0,L|243:238,1,69,2|0,0:0|1:2,0:0:0:0:
+433,238,103383,1,2,0:0:0:0:
+145,242,103602,5,2,1:2:0:0:
+228,242,103712,1,0,0:0:0:0:
+283,242,103821,1,2,0:0:0:0:
+89,242,104040,2,0,L|88:104,1,138,2|2,1:2|0:0,0:0:0:0:
+268,104,104478,1,2,1:2:0:0:
+88,104,104697,1,2,0:0:0:0:
+281,104,104916,2,0,L|426:105,1,138,2|0,1:2|0:0,0:0:0:0:
+129,104,105354,5,2,1:2:0:0:
+211,104,105463,1,0,0:0:0:0:
+266,104,105573,1,0,0:0:0:0:
+72,104,105792,2,0,L|71:255,1,138,0|0,1:2|0:0,0:0:0:0:
+265,241,106230,2,0,L|117:242,1,138,2|2,1:2|0:0,0:0:0:0:
+237,241,106558,2,0,L|307:241,1,69,2|0,0:0|1:2,0:0:0:0:
+126,240,106887,1,2,0:0:0:0:
+415,240,107106,5,2,1:2:0:0:
+332,240,107215,1,0,0:0:0:0:
+276,240,107325,1,2,0:0:0:0:
+469,240,107544,2,0,L|470:100,1,138,2|2,1:2|0:0,0:0:0:0:
+289,102,107982,1,2,1:2:0:0:
+469,102,108201,1,2,0:0:0:0:
+275,102,108420,2,0,L|138:102,1,138,2|0,1:2|0:0,0:0:0:0:
+428,102,108858,5,2,1:2:0:0:
+345,102,108967,1,0,0:0:0:0:
+289,102,109077,1,0,0:0:0:0:
+482,102,109296,2,0,L|484:242,1,138,0|0,1:2|0:0,0:0:0:0:
+291,239,109734,2,0,L|429:240,1,138,2|0,1:2|0:0,0:0:0:0:
+318,239,110062,2,0,L|241:238,1,69,2|0,0:0|1:2,0:0:0:0:
+428,239,110390,1,2,0:0:0:0:
+138,239,110609,5,2,1:2:0:0:
+215,239,110719,1,0,0:0:0:0:
+277,239,110828,1,2,0:0:0:0:
+83,239,111047,2,0,L|229:239,1,138,2|2,1:2|0:0,0:0:0:0:
+26,239,111485,2,0,L|25:102,1,138,2|0,1:2|0:0,0:0:0:0:
+205,101,111923,1,0,1:2:0:0:
+25,101,112142,1,2,0:0:0:0:
+314,101,112361,5,2,1:2:0:0:
+230,101,112471,1,2,0:0:0:0:
+314,101,112580,2,0,P|399:137|304:230,1,276,2|2,0:0|0:0,0:0:0:0:
+109,229,113237,2,0,P|23:186|123:101,1,276,2|0,0:0|0:0,0:0:0:0:
+482,100,114113,5,0,1:2:0:0:
+288,100,114332,1,8,0:3:0:0:
+482,100,114551,2,0,L|324:100,1,138,8|0,0:3|0:0,0:0:0:0:
+149,100,114989,2,0,L|292:100,1,138,4|0,0:3|0:0,0:0:0:0:
+397,100,115317,2,0,L|310:101,1,69,4|0,0:3|1:2,0:0:0:0:
+133,100,115646,2,0,L|132:176,1,69,0|0,3:2|0:0,0:0:0:0:
+367,168,115865,5,2,1:2:0:0:
+284,168,115974,1,0,0:0:0:0:
+228,168,116084,1,0,0:0:0:0:
+421,168,116303,2,0,L|423:308,1,138,0|0,3:2|0:0,0:0:0:0:
+346,305,116631,1,0,1:2:0:0:
+235,305,116741,2,0,L|383:306,1,138,2|2,0:0|1:2,0:0:0:0:
+296,305,117069,1,2,0:0:0:0:
+94,305,117179,1,0,3:2:0:0:
+273,305,117398,2,0,L|346:306,1,69,2|0,0:0|0:0,0:0:0:0:
+129,304,117617,5,2,1:2:0:0:
+60,304,117726,1,0,0:0:0:0:
+131,304,117836,1,0,0:0:0:0:
+324,304,118055,2,0,L|177:304,1,138,2|2,3:2|0:0,0:0:0:0:
+262,304,118383,1,0,1:2:0:0:
+372,304,118493,2,0,P|443:286|477:233,1,138,2|2,0:0|1:2,0:0:0:0:
+400,234,118821,1,0,0:0:0:0:
+198,234,118931,1,2,3:2:0:0:
+391,234,119150,2,0,L|392:152,1,69,0|0,0:0|0:0,0:0:0:0:
+156,165,119369,5,2,1:2:0:0:
+238,165,119478,1,0,0:0:0:0:
+293,165,119588,1,0,0:0:0:0:
+99,165,119807,2,0,L|97:26,1,138,0|0,3:2|0:0,0:0:0:0:
+174,27,120135,1,0,1:2:0:0:
+283,27,120244,1,2,0:0:0:0:
+333,79,120354,1,2,0:0:0:0:
+283,27,120463,1,2,1:2:0:0:
+185,27,120573,1,2,0:0:0:0:
+384,27,120682,2,0,P|442:41|483:113,1,138,0|2,3:2|0:0,0:0:0:0:
+412,104,121011,1,0,0:0:0:0:
+178,104,121120,5,2,1:2:0:0:
+108,104,121230,1,0,0:0:0:0:
+178,104,121339,1,0,0:0:0:0:
+371,104,121558,2,0,L|224:104,1,138,2|0,3:2|0:0,0:0:0:0:
+309,104,121887,1,0,1:2:0:0:
+418,104,121996,2,0,P|446:171|408:227,1,138,2|2,0:0|1:2,0:0:0:0:
+337,222,122325,1,0,0:0:0:0:
+137,222,122434,2,0,P|64:206|23:153,1,138,2|0,3:2|0:0,0:0:0:0:
+102,159,122763,1,0,0:0:0:0:
+335,159,122872,5,2,1:2:0:0:
+251,159,122982,1,0,0:0:0:0:
+196,159,123091,1,0,0:0:0:0:
+389,159,123310,2,0,P|406:239|386:293,1,138,0|0,3:2|0:0,0:0:0:0:
+312,290,123639,1,0,1:2:0:0:
+202,290,123748,2,0,P|128:246|123:199,1,138,2|2,0:0|1:2,0:0:0:0:
+200,162,124077,1,2,0:0:0:0:
+399,161,124186,1,0,3:2:0:0:
+219,92,124405,2,0,L|148:92,1,69,2|0,0:0|0:0,0:0:0:0:
+386,227,124624,5,2,1:2:0:0:
+455,227,124734,1,0,0:0:0:0:
+386,227,124843,1,2,0:0:0:0:
+192,227,125062,2,0,P|106:213|67:181,1,138,2|2,3:2|0:0,0:0:0:0:
+144,182,125390,1,0,1:2:0:0:
+345,182,125500,2,0,P|431:168|470:136,1,138,2|0,0:0|1:2,0:0:0:0:
+393,137,125828,1,0,0:0:0:0:
+282,137,125938,1,0,3:2:0:0:
+475,137,126157,2,0,L|476:213,1,69,2|0,0:0|0:0,0:0:0:0:
+240,205,126376,5,2,1:2:0:0:
+322,205,126485,1,0,0:0:0:0:
+377,205,126595,1,0,0:0:0:0:
+183,205,126814,1,2,3:2:0:0:
+472,205,127033,1,2,0:0:0:0:
+389,205,127142,1,0,1:2:0:0:
+333,205,127252,1,0,0:0:0:0:
+153,205,127471,2,0,L|152:131,1,69,2|0,1:2|0:0,0:0:0:0:
+256,136,127690,1,2,3:2:0:0:
+76,136,127909,1,2,0:0:0:0:
+421,136,128128,5,6,1:2:0:0:
+423,67,128237,1,2,0:0:0:0:
+319,67,128347,1,2,3:2:0:0:
+139,67,128566,1,2,3:2:0:0:
+332,67,128785,1,2,1:2:0:0:
+42,67,129004,1,8,0:3:0:0:
+111,67,129113,1,8,0:3:0:0:
+304,67,129332,2,0,L|72:67,1,207,8|4,0:3|0:3,0:0:0:0:
+408,67,129880,6,0,P|490:129|379:199,1,276,6|0,1:2|0:0,0:0:0:0:
+188,200,130536,2,0,L|483:200,1,276,2|2,0:0|0:0,0:0:0:0:
+283,200,131193,1,2,0:0:0:0:
+463,200,131412,1,2,0:0:0:0:
+145,200,131631,6,0,P|59:138|164:60,1,276,6|0,1:2|0:0,0:0:0:0:
+342,59,132288,1,0,0:0:0:0:
+148,59,132507,2,0,L|147:214,1,138,2|2,0:0|0:0,0:0:0:0:
+327,196,132945,1,2,0:0:0:0:
+147,196,133164,1,2,0:0:0:0:
+464,196,133383,6,0,P|469:249|351:316,1,207,6|0,1:2|0:0,0:0:0:0:
+240,316,133821,2,0,P|354:311|391:173,1,276,2|2,0:0|0:0,0:0:0:0:
+196,172,134478,2,0,L|197:33,1,138,2|2,0:0|0:0,0:0:0:0:
+391,34,134916,1,2,0:0:0:0:
+73,34,135135,6,0,B|188:112|188:112|68:30,1,276,6|0,1:2|0:0,0:0:0:0:
+434,34,136011,2,0,L|435:174,1,138,2|2,3:2|3:2,0:0:0:0:
+227,171,136449,1,8,0:3:0:0:
+434,171,136668,1,8,0:3:0:0:
+116,171,136887,6,0,L|412:171,1,276,2|2,1:2|3:2,0:0:0:0:
+100,171,137544,1,2,0:0:0:0:
+182,171,137653,1,0,1:2:0:0:
+242,171,137763,1,0,0:0:0:0:
+62,171,137982,1,2,1:2:0:0:
+241,171,138201,2,0,L|88:169,1,138,2|2,3:2|0:0,0:0:0:0:
+421,169,138639,6,0,L|128:168,1,276,0|0,1:2|3:2,0:0:0:0:
+339,168,139296,2,0,L|340:90,1,69,0|0,0:0|1:2,0:0:0:0:
+235,99,139515,1,2,0:0:0:0:
+55,99,139734,1,2,1:2:0:0:
+344,99,139953,2,0,L|489:98,1,138,0|2,3:2|0:0,0:0:0:0:
+136,98,140390,6,0,L|135:242,1,138,6|2,1:2|0:0,0:0:0:0:
+328,235,140828,1,2,3:2:0:0:
+135,235,141047,1,2,3:2:0:0:
+342,235,141266,1,2,3:2:0:0:
+493,235,141485,1,2,3:2:0:0:
+299,235,141704,1,2,3:2:0:0:
+91,235,141923,1,2,3:2:0:0:
+380,235,142142,6,0,L|155:232,2,207,2|2|2,1:2|0:0|0:0,0:0:0:0:
+185,235,143018,2,0,P|347:232|428:19,1,414,2|0,0:0|0:0,0:0:0:0:
+82,21,143894,6,0,P|50:85|84:135,1,138,6|0,1:2|0:0,0:0:0:0:
+174,134,144223,1,2,0:0:0:0:
+84,134,144332,2,0,L|83:208,1,69,0|0,3:2|0:0,0:0:0:0:
+284,202,144551,2,0,L|368:202,1,69,2|0,0:0|1:2,0:0:0:0:
+117,202,144770,6,0,L|46:202,1,69,2|2,0:0|0:0,0:0:0:0:
+249,202,144989,1,2,1:2:0:0:
+48,202,145099,1,2,0:0:0:0:
+144,202,145208,2,0,P|180:157|139:100,1,138,0|2,3:2|0:0,0:0:0:0:
+55,99,145536,1,0,0:0:0:0:
+290,99,145646,6,0,L|370:98,1,69,2|2,1:2|0:0,0:0:0:0:
+157,98,145865,1,2,0:0:0:0:
+356,98,145974,1,2,0:0:0:0:
+453,98,146084,2,0,L|277:98,1,138,0|2,3:2|0:0,0:0:0:0:
+412,98,146412,1,0,1:2:0:0:
+176,98,146522,5,2,0:0:0:0:
+272,98,146631,2,0,L|273:174,1,69,2|0,0:0|1:2,0:0:0:0:
+71,166,146850,1,2,0:0:0:0:
+168,166,146960,2,0,L|27:166,1,138,0|2,3:2|0:0,0:0:0:0:
+113,166,147288,1,0,0:0:0:0:
+348,166,147398,6,0,P|385:115|346:62,1,138,2|0,1:2|0:0,0:0:0:0:
+255,61,147726,1,2,0:0:0:0:
+345,61,147836,2,0,L|347:129,1,69,0|0,3:2|0:0,0:0:0:0:
+145,129,148055,1,2,0:0:0:0:
+76,129,148164,1,0,1:2:0:0:
+280,97,148274,6,0,L|360:97,1,69,2|2,0:0|0:0,0:0:0:0:
+147,97,148493,1,2,1:2:0:0:
+346,97,148602,1,2,0:0:0:0:
+248,97,148712,2,0,L|103:97,1,138,0|2,3:2|0:0,0:0:0:0:
+193,97,149040,1,0,0:0:0:0:
+428,97,149150,6,0,P|459:168|420:215,1,138,2|0,1:2|0:0,0:0:0:0:
+226,211,149478,1,2,0:0:0:0:
+323,211,149588,2,0,L|466:211,1,138,0|2,3:2|0:0,0:0:0:0:
+377,211,149916,1,0,1:2:0:0:
+141,211,150026,5,2,0:0:0:0:
+237,211,150135,2,0,L|239:139,1,69,2|0,0:0|1:2,0:0:0:0:
+37,142,150354,1,2,0:0:0:0:
+133,142,150463,2,0,P|166:75|119:40,1,138,0|2,3:2|0:0,0:0:0:0:
+42,40,150792,1,0,0:0:0:0:
+309,40,150901,6,0,L|465:40,1,138,6|0,1:2|0:0,0:0:0:0:
+356,40,151230,1,2,0:0:0:0:
+445,40,151339,1,0,3:2:0:0:
+127,40,151558,5,2,1:2:0:0:
+203,45,151668,1,0,0:0:0:0:
+239,111,151777,1,0,0:0:0:0:
+196,174,151887,1,0,0:0:0:0:
+86,174,151996,2,0,L|84:252,1,69,0|0,1:2|0:0,0:0:0:0:
+285,242,152215,2,0,L|144:241,1,138,2|2,3:2|0:0,0:0:0:0:
+230,241,152544,1,0,0:0:0:0:
+463,241,152653,6,0,L|392:240,1,69,0|0,1:2|0:0,0:0:0:0:
+284,242,152872,2,0,L|282:164,1,69,2|0,0:0|0:0,0:0:0:0:
+483,173,153091,2,0,L|336:172,1,138,2|2,3:2|1:2,0:0:0:0:
+428,172,153420,1,0,0:0:0:0:
+227,171,153529,6,0,L|226:93,1,69,2|0,1:2|0:0,0:0:0:0:
+323,102,153748,1,2,1:2:0:0:
+33,102,153967,2,0,L|30:248,1,138,2|2,3:2|0:0,0:0:0:0:
+114,239,154296,1,0,0:0:0:0:
+381,239,154405,6,0,L|99:237,1,276,6|2,1:2|3:2,0:0:0:0:
+451,237,155062,2,0,P|488:148|355:78,1,276,6|0,1:2|1:2,0:0:0:0:
+22,80,155719,2,0,L|177:81,1,138,2|2,3:2|0:0,0:0:0:0:
+478,80,156157,6,0,L|268:81,2,207,6|8|8,1:2|0:3|0:3,0:0:0:0:
+159,80,157033,2,0,P|66:140|166:218,1,276,6|0,1:2|3:2,0:0:0:0:
+254,218,157580,1,0,3:2:0:0:
+163,218,157690,1,0,3:2:0:0:
+396,218,157799,1,0,3:2:0:0:
+163,218,157909,6,0,P|132:155|167:100,1,138,6|0,1:2|0:0,0:0:0:0:
+255,100,158237,1,2,0:0:0:0:
+164,100,158347,2,0,L|162:174,1,69,0|0,3:2|0:0,0:0:0:0:
+363,168,158566,2,0,L|364:243,1,69,2|0,0:0|1:2,0:0:0:0:
+128,236,158785,6,0,L|208:237,1,69,2|2,0:0|0:0,0:0:0:0:
+398,236,159004,1,2,1:2:0:0:
+198,236,159113,1,2,0:0:0:0:
+100,236,159223,2,0,P|73:178|105:116,1,138,0|2,3:2|0:0,0:0:0:0:
+187,116,159551,1,0,0:0:0:0:
+422,116,159661,6,0,L|352:115,1,69,2|0,1:2|0:0,0:0:0:0:
+151,115,159880,1,2,0:0:0:0:
+350,115,159989,1,2,0:0:0:0:
+254,115,160099,2,0,L|426:115,1,138,0|2,3:2|0:0,0:0:0:0:
+296,115,160427,1,0,1:2:0:0:
+62,115,160536,6,0,L|61:188,1,69,2|0,0:0|0:0,0:0:0:0:
+171,183,160755,2,0,L|250:183,1,69,2|0,1:2|0:0,0:0:0:0:
+441,183,160974,2,0,P|470:243|434:305,1,138,2|2,3:2|0:0,0:0:0:0:
+354,301,161303,1,0,0:0:0:0:
+120,301,161412,6,0,L|271:301,1,138,2|0,1:2|0:0,0:0:0:0:
+167,301,161741,1,2,0:0:0:0:
+256,301,161850,2,0,L|257:222,1,69,0|0,3:2|0:0,0:0:0:0:
+55,232,162069,2,0,L|53:155,1,69,2|0,0:0|1:2,0:0:0:0:
+288,163,162288,6,0,L|363:163,1,69,2|0,0:0|0:0,0:0:0:0:
+155,163,162507,1,2,1:2:0:0:
+356,163,162617,1,2,0:0:0:0:
+452,163,162726,2,0,P|475:235|443:293,1,138,0|2,3:2|0:0,0:0:0:0:
+364,287,163055,1,0,0:0:0:0:
+130,287,163164,6,0,L|128:209,1,69,2|0,1:2|0:0,0:0:0:0:
+239,218,163383,2,0,L|241:146,1,69,2|0,1:2|0:0,0:0:0:0:
+39,149,163602,2,0,L|120:149,1,69,2|0,3:2|0:0,0:0:0:0:
+378,149,163821,6,0,L|379:81,1,69,6|0,1:2|0:0,0:0:0:0:
+268,80,164040,2,0,L|172:80,1,69,2|0,0:0|0:0,0:0:0:0:
+400,80,164259,2,0,L|402:153,1,69,8|0,2:3|0:0,0:0:0:0:
+200,148,164478,2,0,L|112:148,1,69,8|0,2:3|0:0,0:0:0:0:
+366,148,164697,2,0,L|453:149,1,69,4|0,2:3|0:0,0:0:0:0:
+164,148,164916,6,0,L|25:149,1,138,6|0,1:2|0:0,0:0:0:0:
+116,148,165244,1,2,0:0:0:0:
+27,148,165354,1,0,3:2:0:0:
+344,148,165573,5,2,1:2:0:0:
+381,213,165682,1,0,0:0:0:0:
+339,277,165792,1,0,0:0:0:0:
+263,277,165901,1,0,0:0:0:0:
+152,277,166011,2,0,L|151:353,1,69,0|0,1:2|0:0,0:0:0:0:
+352,345,166230,1,2,3:2:0:0:
+427,345,166339,1,0,0:0:0:0:
+464,278,166449,1,0,0:0:0:0:
+425,212,166558,1,0,0:0:0:0:
+189,212,166668,5,2,1:2:0:0:
+116,189,166777,1,0,0:0:0:0:
+125,113,166887,1,0,0:0:0:0:
+199,102,166996,1,2,0:0:0:0:
+309,102,167106,2,0,L|311:180,1,69,0|0,3:2|0:0,0:0:0:0:
+199,170,167325,2,0,L|197:242,1,69,2|0,1:2|0:0,0:0:0:0:
+398,238,167544,6,0,L|483:238,1,69,2|0,1:2|0:0,0:0:0:0:
+356,238,167763,2,0,L|283:237,1,69,2|0,1:2|0:0,0:0:0:0:
+85,237,167982,2,0,L|11:237,1,69,2|0,3:2|0:0,0:0:0:0:
+126,237,168201,2,0,L|206:237,1,69,2|0,0:0|0:0,0:0:0:0:
+430,237,168420,6,0,P|487:176|366:86,1,276,2|0,1:2|3:2,0:0:0:0:
+174,89,169077,1,2,1:2:0:0:
+99,98,169186,1,0,0:0:0:0:
+67,167,169296,1,0,0:0:0:0:
+101,234,169405,1,0,0:0:0:0:
+176,243,169515,1,0,1:2:0:0:
+465,243,169734,2,0,L|467:104,1,138,0|0,3:2|1:2,0:0:0:0:
+390,105,170062,1,0,0:0:0:0:
+154,105,170172,6,0,L|367:106,1,207,2|2,1:2|0:0,0:0:0:0:
+127,105,170609,2,0,P|104:181|130:237,1,138,0|2,3:2|0:0,0:0:0:0:
+202,232,170938,1,2,0:0:0:0:
+401,232,171047,2,0,P|176:204|125:49,1,414,2|0,1:2|0:0,0:0:0:0:
+416,48,171923,5,2,1:2:0:0:
+85,274,178712,5,0,3:2:0:0:
+402,274,178931,6,0,P|428:204|398:150,1,138,2|2,1:2|0:0,0:0:0:0:
+323,151,179259,1,2,0:0:0:0:
+212,151,179369,2,0,P|134:143|92:99,1,138,2|2,1:2|0:0,0:0:0:0:
+170,102,179697,1,2,0:0:0:0:
+280,102,179807,2,0,L|429:102,1,138,2|2,1:2|0:0,0:0:0:0:
+307,102,180135,1,2,0:0:0:0:
+238,102,180244,1,0,1:2:0:0:
+307,102,180354,1,2,0:0:0:0:
+417,102,180463,2,0,L|418:179,1,69,2|0,0:0|0:0,0:0:0:0:
+216,159,180682,5,2,1:2:0:0:
+313,159,180792,1,2,0:0:0:0:
+381,159,180901,1,2,0:0:0:0:
+313,159,181011,1,2,0:0:0:0:
+203,159,181120,1,2,1:2:0:0:
+133,159,181230,1,2,0:0:0:0:
+203,159,181339,1,2,0:0:0:0:
+396,159,181558,2,0,P|422:224|388:292,1,138,2|2,1:2|0:0,0:0:0:0:
+320,283,181887,1,2,0:0:0:0:
+210,283,181996,2,0,L|65:282,1,138,0|0,1:2|0:0,0:0:0:0:
+148,282,182325,1,0,0:0:0:0:
+347,282,182434,5,2,1:2:0:0:
+416,282,182544,1,2,0:0:0:0:
+347,282,182653,1,2,0:0:0:0:
+154,282,182872,1,2,1:2:0:0:
+85,282,182982,1,2,0:0:0:0:
+154,282,183091,1,2,0:0:0:0:
+347,282,183310,2,0,P|373:217|342:159,1,138,2|2,1:2|0:0,0:0:0:0:
+231,160,183639,1,2,0:0:0:0:
+162,160,183748,1,0,1:2:0:0:
+231,160,183858,1,2,0:0:0:0:
+343,160,183967,2,0,L|345:87,1,69,2|0,0:0|0:0,0:0:0:0:
+143,91,184186,5,2,1:2:0:0:
+323,91,184405,1,8,0:3:0:0:
+143,91,184624,2,0,P|118:168|149:218,1,138,8|2,0:3|0:0,0:0:0:0:
+221,213,184953,1,2,0:0:0:0:
+421,270,185062,2,0,L|206:271,2,207,4|4|0,0:3|0:3|3:2,0:0:0:0:
+102,270,185938,6,0,P|72:198|110:155,1,138,2|2,1:2|0:0,0:0:0:0:
+181,157,186266,1,2,0:0:0:0:
+291,157,186376,2,0,L|432:157,1,138,2|2,3:2|0:0,0:0:0:0:
+352,157,186704,1,2,1:2:0:0:
+150,157,186814,2,0,P|128:221|149:291,1,138,2|2,0:0|1:2,0:0:0:0:
+257,286,187142,1,2,0:0:0:0:
+325,227,187252,1,0,3:2:0:0:
+253,155,187361,1,2,0:0:0:0:
+141,155,187471,2,0,L|52:155,1,69,2|0,0:0|0:0,0:0:0:0:
+307,155,187690,6,0,P|325:214|306:292,1,138,0|0,1:2|0:0,0:0:0:0:
+113,292,188128,2,0,P|100:235|115:156,1,138,0|0,3:2|0:0,0:0:0:0:
+190,157,188456,1,0,1:2:0:0:
+391,157,188566,1,0,0:0:0:0:
+211,157,188785,1,0,1:2:0:0:
+390,157,189004,2,0,L|392:13,1,138,0|0,3:2|0:0,0:0:0:0:
+73,19,189442,5,2,1:2:0:0:
+39,86,189551,1,2,0:0:0:0:
+76,152,189661,1,2,0:0:0:0:
+158,152,189770,1,2,0:0:0:0:
+268,152,189880,2,0,L|114:153,1,138,2|2,3:2|0:0,0:0:0:0:
+213,152,190208,1,2,1:2:0:0:
+412,152,190317,2,0,P|430:226|409:286,1,138,2|2,0:0|1:2,0:0:0:0:
+320,282,190646,1,2,0:0:0:0:
+230,282,190755,1,0,3:2:0:0:
+409,282,190974,1,2,0:0:0:0:
+91,282,191193,6,0,P|23:224|137:141,1,276,0|0,1:2|3:2,0:0:0:0:
+344,141,191850,1,0,1:2:0:0:
+427,141,191960,1,0,1:2:0:0:
+344,141,192069,1,2,3:2:0:0:
+138,141,192288,1,0,1:2:0:0:
+427,141,192507,2,0,L|428:288,1,138,2|0,3:2|0:0,0:0:0:0:
+81,278,192945,6,0,L|266:278,1,179.39999178772,6|2,1:2|1:1,0:0:0:0:
+81,278,193383,2,0,L|388:279,1,289.799991156006,2|2,1:1|1:1,0:0:0:0:
+190,278,193821,2,0,L|381:278,1,179.39999178772,2|2,1:2|1:1,0:0:0:0:
+78,278,194259,2,0,L|401:277,1,289.799991156006,2|2,1:1|1:1,0:0:0:0:
+76,277,194697,6,0,L|74:140,1,138,2|2,1:2|1:1,0:0:0:0:
+365,139,195135,2,0,L|59:138,1,289.799991156006,2|2,1:1|1:1,0:0:0:0:
+394,138,195573,2,0,L|395:278,1,138,2|2,1:2|1:1,0:0:0:0:
+105,276,196011,2,0,L|411:277,1,289.799991156006,2|2,1:1|1:1,0:0:0:0:
+75,276,196449,5,2,3:2:0:0:
+422,276,196668,2,0,L|108:275,2,289.799991156006,6|6|6,1:1|1:1|1:1,0:0:0:0:
+75,276,197325,2,0,L|389:275,2,289.799991156006,6|6|6,1:1|1:1|1:1,0:0:0:0:
+395,276,197982,1,6,1:1:0:0:
+47,276,198201,6,0,L|349:277,1,289.799991156006,6|6,1:1|1:1,0:0:0:0:
+142,276,198639,2,0,L|342:277,1,193.199994104004,14|14,2:3|2:3,0:0:0:0:
+26,277,199077,1,14,2:3:0:0:
+371,277,199296,2,0,P|254:202|378:86,1,358.79998357544,6|0,1:2|0:0,0:0:0:0:
+56,81,199953,6,0,L|297:80,2,207,6|2|2,1:2|0:0|0:0,0:0:0:0:
+249,81,200828,2,0,L|251:169,1,69,2|2,0:0|0:0,0:0:0:0:
+160,149,201047,1,2,0:0:0:0:
+250,149,201157,1,2,0:0:0:0:
+50,149,201266,1,0,3:2:0:0:
+139,149,201376,1,0,3:2:0:0:
+50,149,201485,1,2,3:2:0:0:
+285,149,201595,1,0,3:2:0:0:
+50,149,201704,6,0,L|48:228,1,69,6|2,1:2|0:0,0:0:0:0:
+249,217,201923,1,2,0:0:0:0:
+48,217,202033,1,2,0:0:0:0:
+141,217,202142,2,0,P|172:281|134:338,1,138,0|2,3:2|0:0,0:0:0:0:
+45,333,202471,1,0,1:2:0:0:
+278,333,202580,5,2,0:0:0:0:
+180,333,202690,2,0,L|179:262,1,69,2|0,0:0|1:2,0:0:0:0:
+380,264,202909,1,2,0:0:0:0:
+283,264,203018,2,0,L|457:265,1,138,0|2,3:2|0:0,0:0:0:0:
+337,264,203347,1,0,0:0:0:0:
+103,264,203456,6,0,P|72:200|117:155,1,138,0|0,1:2|0:0,0:0:0:0:
+202,156,203785,1,2,0:0:0:0:
+111,156,203894,2,0,L|109:75,1,69,0|0,3:2|0:0,0:0:0:0:
+310,87,204113,2,0,L|399:86,1,69,2|0,0:0|1:2,0:0:0:0:
+177,86,204332,5,2,0:0:0:0:
+378,86,204442,2,0,L|379:160,1,69,2|0,0:0|1:2,0:0:0:0:
+177,154,204661,1,2,0:0:0:0:
+80,154,204770,2,0,P|55:217|80:282,1,138,0|2,3:2|0:0,0:0:0:0:
+162,280,205099,1,0,0:0:0:0:
+395,280,205208,6,0,L|312:280,1,69,2|2,1:2|0:0,0:0:0:0:
+124,280,205427,1,2,0:0:0:0:
+323,280,205536,1,2,0:0:0:0:
+420,280,205646,2,0,L|252:279,1,138,0|2,3:2|0:0,0:0:0:0:
+379,279,205974,1,0,1:2:0:0:
+143,279,206084,6,0,L|70:281,1,69,2|2,0:0|0:0,0:0:0:0:
+171,280,206303,1,0,1:2:0:0:
+370,280,206412,1,2,0:0:0:0:
+467,280,206522,2,0,P|494:213|463:160,1,138,0|2,3:2|0:0,0:0:0:0:
+380,160,206850,1,0,0:0:0:0:
+109,160,206960,6,0,L|259:160,1,138,6|0,1:2|0:0,0:0:0:0:
+156,160,207288,1,2,0:0:0:0:
+65,160,207398,1,0,3:2:0:0:
+382,160,207617,5,2,1:2:0:0:
+420,224,207726,1,0,0:0:0:0:
+378,288,207836,1,0,0:0:0:0:
+302,288,207945,1,0,0:0:0:0:
+191,288,208055,2,0,L|190:212,1,69,0|0,1:2|0:0,0:0:0:0:
+391,219,208274,2,0,P|417:155|379:101,1,138,2|2,3:2|0:0,0:0:0:0:
+298,102,208602,1,0,0:0:0:0:
+62,102,208712,6,0,L|61:180,1,69,0|0,1:2|0:0,0:0:0:0:
+172,170,208931,2,0,L|245:169,1,69,2|0,0:0|0:0,0:0:0:0:
+442,169,209150,2,0,P|466:237|434:297,1,138,2|2,3:2|1:2,0:0:0:0:
+355,292,209478,1,0,0:0:0:0:
+119,292,209588,6,0,L|116:218,1,69,2|0,0:0|0:0,0:0:0:0:
+220,223,209807,1,2,1:2:0:0:
+413,223,210026,1,2,3:2:0:0:
+124,223,210244,2,0,L|48:223,1,69,2|2,0:0|0:0,0:0:0:0:
+325,223,210463,6,0,P|407:220|484:62,1,276,6|2,1:2|3:2,0:0:0:0:
+165,63,211120,2,0,L|469:62,1,276,6|0,1:2|1:2,0:0:0:0:
+149,62,211777,2,0,L|8:61,1,138,2|2,3:2|0:0,0:0:0:0:
+357,61,212215,6,0,L|142:61,2,207,6|8|8,1:2|0:3|0:3,0:0:0:0:
+65,61,213091,2,0,L|375:61,1,276,6|0,1:2|3:2,0:0:0:0:
+250,61,213639,1,0,3:2:0:0:
+339,61,213748,1,0,3:2:0:0:
+103,61,213858,1,0,3:2:0:0:
+339,61,213967,6,0,P|366:130|332:184,1,138,6|0,1:2|0:0,0:0:0:0:
+245,180,214296,1,2,0:0:0:0:
+334,180,214405,2,0,L|336:259,1,69,0|0,3:2|0:0,0:0:0:0:
+134,248,214624,2,0,L|47:249,1,69,2|0,0:0|1:2,0:0:0:0:
+300,248,214843,6,0,L|301:171,1,69,2|0,0:0|0:0,0:0:0:0:
+99,179,215062,1,2,1:2:0:0:
+300,179,215172,1,2,0:0:0:0:
+203,179,215281,2,0,L|28:176,1,138,0|2,3:2|0:0,0:0:0:0:
+148,176,215609,1,0,0:0:0:0:
+383,176,215719,6,0,L|290:176,1,69,2|2,1:2|0:0,0:0:0:0:
+112,176,215938,1,2,0:0:0:0:
+311,176,216047,1,2,0:0:0:0:
+408,176,216157,2,0,P|437:111|399:59,1,138,0|2,3:2|0:0,0:0:0:0:
+305,60,216485,1,0,1:2:0:0:
+69,60,216595,6,0,L|68:143,1,69,2|0,0:0|0:0,0:0:0:0:
+179,128,216814,2,0,L|263:129,1,69,2|0,1:2|0:0,0:0:0:0:
+449,128,217033,2,0,L|348:129,1,69,2|0,3:2|0:0,0:0:0:0:
+178,128,217252,2,0,L|86:128,1,69,2|0,0:0|0:0,0:0:0:0:
+344,128,217471,6,0,L|197:128,1,138,2|0,1:2|0:0,0:0:0:0:
+289,128,217799,1,2,0:0:0:0:
+206,128,217909,2,0,L|205:204,1,69,0|0,3:2|0:0,0:0:0:0:
+406,196,218128,2,0,L|479:195,1,69,2|0,0:0|1:2,0:0:0:0:
+239,195,218347,6,0,L|158:196,1,69,2|0,0:0|0:0,0:0:0:0:
+371,195,218566,1,2,1:2:0:0:
+170,195,218675,1,2,0:0:0:0:
+267,195,218785,2,0,L|435:196,1,138,0|2,3:2|0:0,0:0:0:0:
+321,195,219113,1,0,0:0:0:0:
+85,195,219223,6,0,L|85:273,1,69,2|0,1:2|0:0,0:0:0:0:
+286,264,219442,2,0,L|379:265,1,69,2|0,1:2|0:0,0:0:0:0:
+119,264,219661,2,0,L|37:264,1,69,2|0,3:2|0:0,0:0:0:0:
+320,264,219880,5,6,1:2:0:0:
+399,257,219989,1,0,0:0:0:0:
+402,180,220099,1,0,0:0:0:0:
+327,170,220208,1,0,0:0:0:0:
+129,120,220317,2,0,L|129:48,1,69,8|0,0:3|0:0,0:0:0:0:
+330,51,220536,2,0,L|412:48,1,69,8|0,0:3|0:0,0:0:0:0:
+163,48,220755,2,0,L|80:48,1,69,4|0,0:3|0:0,0:0:0:0:
+364,52,220974,5,6,1:2:0:0:
+439,64,221084,1,0,0:0:0:0:
+426,139,221193,1,0,0:0:0:0:
+350,146,221303,1,2,0:0:0:0:
+240,146,221412,2,0,L|239:227,1,69,0|0,3:2|0:0,0:0:0:0:
+440,214,221631,5,2,1:2:0:0:
+472,282,221741,1,0,0:0:0:0:
+434,346,221850,1,0,0:0:0:0:
+357,352,221960,1,0,0:0:0:0:
+157,352,222069,2,0,L|66:348,1,69,2|0,1:2|0:0,0:0:0:0:
+289,348,222288,2,0,L|471:346,1,138,2|2,3:2|0:0,0:0:0:0:
+343,346,222617,1,0,0:0:0:0:
+109,346,222726,6,0,P|83:283|123:224,1,138,2|0,1:2|0:0,0:0:0:0:
+207,227,223055,1,2,0:0:0:0:
+117,227,223164,2,0,L|114:140,1,69,0|0,3:2|0:0,0:0:0:0:
+315,158,223383,2,0,L|399:159,1,69,2|0,1:2|0:0,0:0:0:0:
+148,158,223602,6,0,L|146:226,1,69,2|0,0:0|0:0,0:0:0:0:
+256,226,223821,2,0,L|346:226,1,69,2|0,1:2|0:0,0:0:0:0:
+123,226,224040,2,0,L|209:226,1,69,2|0,3:2|0:0,0:0:0:0:
+393,226,224259,2,0,L|394:149,1,69,2|0,0:0|0:0,0:0:0:0:
+158,157,224478,5,2,1:2:0:0:
+82,163,224588,1,0,0:0:0:0:
+44,228,224697,1,0,0:0:0:0:
+86,291,224807,1,0,0:0:0:0:
+285,291,224916,2,0,L|378:292,1,69,0|0,3:2|0:0,0:0:0:0:
+83,291,225135,5,6,1:2:0:0:
+41,227,225244,1,0,0:0:0:0:
+82,163,225354,1,0,0:0:0:0:
+157,156,225463,1,0,0:0:0:0:
+267,156,225573,2,0,L|267:86,1,69,0|0,1:2|0:0,0:0:0:0:
+65,87,225792,2,0,L|64:173,1,69,2|0,3:2|0:0,0:0:0:0:
+154,155,226011,1,2,0:0:0:0:
+64,155,226120,1,2,0:0:0:0:
+299,155,226230,5,2,1:2:0:0:
+105,155,226449,2,0,L|104:233,1,69,8|0,0:3|0:0,0:0:0:0:
+305,223,226668,1,0,3:2:0:0:
+104,223,226777,2,0,L|28:224,1,69,8|2,0:3|0:0,0:0:0:0:
+383,353,227106,6,0,P|161:330|63:49,1,552,6|2,1:2|0:0,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3644427-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3644427-expected-conversion.json
new file mode 100644
index 0000000000..9d4210c71e
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3644427-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":22.0,"Objects":[{"StartTime":22.0,"Position":28.0,"HyperDash":false},{"StartTime":90.0,"Position":34.2658119,"HyperDash":false},{"StartTime":158.0,"Position":28.0,"HyperDash":false},{"StartTime":226.0,"Position":34.2658119,"HyperDash":false},{"StartTime":294.0,"Position":28.0,"HyperDash":false},{"StartTime":362.0,"Position":34.2658119,"HyperDash":false}]},{"StartTime":431.0,"Objects":[{"StartTime":431.0,"Position":106.0,"HyperDash":false},{"StartTime":499.0,"Position":114.369232,"HyperDash":false},{"StartTime":567.0,"Position":106.0,"HyperDash":false},{"StartTime":635.0,"Position":114.369232,"HyperDash":false},{"StartTime":703.0,"Position":106.0,"HyperDash":false},{"StartTime":771.0,"Position":114.369232,"HyperDash":false}]},{"StartTime":840.0,"Objects":[{"StartTime":840.0,"Position":207.0,"HyperDash":false},{"StartTime":891.0,"Position":229.046875,"HyperDash":false},{"StartTime":942.0,"Position":270.0929,"HyperDash":false},{"StartTime":993.0,"Position":315.1283,"HyperDash":false},{"StartTime":1044.0,"Position":355.531,"HyperDash":false},{"StartTime":1128.0,"Position":309.8878,"HyperDash":false},{"StartTime":1249.0,"Position":207.0,"HyperDash":false}]},{"StartTime":1385.0,"Objects":[{"StartTime":1385.0,"Position":313.0,"HyperDash":false},{"StartTime":1453.0,"Position":346.417664,"HyperDash":false},{"StartTime":1521.0,"Position":313.0,"HyperDash":false},{"StartTime":1589.0,"Position":346.417664,"HyperDash":false},{"StartTime":1657.0,"Position":313.0,"HyperDash":false},{"StartTime":1725.0,"Position":346.417664,"HyperDash":false}]},{"StartTime":1794.0,"Objects":[{"StartTime":1794.0,"Position":347.0,"HyperDash":false},{"StartTime":1862.0,"Position":379.8631,"HyperDash":false},{"StartTime":1930.0,"Position":347.0,"HyperDash":false},{"StartTime":1998.0,"Position":379.8631,"HyperDash":false},{"StartTime":2066.0,"Position":347.0,"HyperDash":false},{"StartTime":2134.0,"Position":379.8631,"HyperDash":false}]},{"StartTime":2203.0,"Objects":[{"StartTime":2203.0,"Position":415.0,"HyperDash":false},{"StartTime":2254.0,"Position":441.134857,"HyperDash":false},{"StartTime":2305.0,"Position":433.726776,"HyperDash":false},{"StartTime":2356.0,"Position":437.454437,"HyperDash":false},{"StartTime":2407.0,"Position":447.7087,"HyperDash":false},{"StartTime":2491.0,"Position":417.7042,"HyperDash":false},{"StartTime":2612.0,"Position":415.0,"HyperDash":false}]},{"StartTime":2749.0,"Objects":[{"StartTime":2749.0,"Position":235.0,"HyperDash":false},{"StartTime":2817.0,"Position":201.582336,"HyperDash":false},{"StartTime":2885.0,"Position":235.0,"HyperDash":false},{"StartTime":2953.0,"Position":201.582336,"HyperDash":false},{"StartTime":3021.0,"Position":235.0,"HyperDash":false},{"StartTime":3089.0,"Position":201.582336,"HyperDash":false}]},{"StartTime":3158.0,"Objects":[{"StartTime":3158.0,"Position":219.0,"HyperDash":false},{"StartTime":3226.0,"Position":229.565125,"HyperDash":false},{"StartTime":3294.0,"Position":219.0,"HyperDash":false},{"StartTime":3362.0,"Position":229.565125,"HyperDash":false},{"StartTime":3430.0,"Position":219.0,"HyperDash":false},{"StartTime":3498.0,"Position":229.565125,"HyperDash":false}]},{"StartTime":3567.0,"Objects":[{"StartTime":3567.0,"Position":299.0,"HyperDash":false},{"StartTime":3618.0,"Position":253.857819,"HyperDash":false},{"StartTime":3669.0,"Position":212.7368,"HyperDash":false},{"StartTime":3720.0,"Position":183.691315,"HyperDash":false},{"StartTime":3771.0,"Position":150.281219,"HyperDash":false},{"StartTime":3855.0,"Position":224.9364,"HyperDash":false},{"StartTime":3976.0,"Position":299.0,"HyperDash":false}]},{"StartTime":4112.0,"Objects":[{"StartTime":4112.0,"Position":234.0,"HyperDash":false},{"StartTime":4180.0,"Position":201.015152,"HyperDash":false},{"StartTime":4248.0,"Position":234.0,"HyperDash":false},{"StartTime":4316.0,"Position":201.015152,"HyperDash":false},{"StartTime":4384.0,"Position":234.0,"HyperDash":false},{"StartTime":4452.0,"Position":201.015152,"HyperDash":false}]},{"StartTime":4522.0,"Objects":[{"StartTime":4522.0,"Position":135.0,"HyperDash":false},{"StartTime":4590.0,"Position":102.015152,"HyperDash":false},{"StartTime":4658.0,"Position":135.0,"HyperDash":false},{"StartTime":4726.0,"Position":102.015152,"HyperDash":false},{"StartTime":4794.0,"Position":135.0,"HyperDash":false},{"StartTime":4862.0,"Position":102.015152,"HyperDash":false}]},{"StartTime":4931.0,"Objects":[{"StartTime":4931.0,"Position":35.0,"HyperDash":false},{"StartTime":4982.0,"Position":48.13485,"HyperDash":false},{"StartTime":5033.0,"Position":43.7267761,"HyperDash":false},{"StartTime":5084.0,"Position":63.454422,"HyperDash":false},{"StartTime":5135.0,"Position":67.7087,"HyperDash":false},{"StartTime":5219.0,"Position":33.7041931,"HyperDash":false},{"StartTime":5340.0,"Position":35.0,"HyperDash":false}]},{"StartTime":5476.0,"Objects":[{"StartTime":5476.0,"Position":22.0,"HyperDash":false},{"StartTime":5544.0,"Position":18.9217854,"HyperDash":false},{"StartTime":5612.0,"Position":22.0,"HyperDash":false},{"StartTime":5680.0,"Position":18.9217854,"HyperDash":false},{"StartTime":5748.0,"Position":22.0,"HyperDash":false},{"StartTime":5816.0,"Position":18.9217854,"HyperDash":false}]},{"StartTime":5885.0,"Objects":[{"StartTime":5885.0,"Position":120.0,"HyperDash":false},{"StartTime":5953.0,"Position":152.061676,"HyperDash":false},{"StartTime":6021.0,"Position":120.0,"HyperDash":false},{"StartTime":6089.0,"Position":152.061676,"HyperDash":false},{"StartTime":6157.0,"Position":120.0,"HyperDash":false},{"StartTime":6225.0,"Position":152.061676,"HyperDash":false}]},{"StartTime":6294.0,"Objects":[{"StartTime":6294.0,"Position":187.0,"HyperDash":false},{"StartTime":6345.0,"Position":140.953125,"HyperDash":false},{"StartTime":6396.0,"Position":130.9071,"HyperDash":false},{"StartTime":6447.0,"Position":92.8717041,"HyperDash":false},{"StartTime":6498.0,"Position":38.469,"HyperDash":false},{"StartTime":6582.0,"Position":112.112221,"HyperDash":false},{"StartTime":6703.0,"Position":187.0,"HyperDash":false}]},{"StartTime":6840.0,"Objects":[{"StartTime":6840.0,"Position":363.0,"HyperDash":false},{"StartTime":6908.0,"Position":359.921783,"HyperDash":false},{"StartTime":6976.0,"Position":363.0,"HyperDash":false},{"StartTime":7044.0,"Position":359.921783,"HyperDash":false},{"StartTime":7112.0,"Position":363.0,"HyperDash":false},{"StartTime":7180.0,"Position":359.921783,"HyperDash":false}]},{"StartTime":7249.0,"Objects":[{"StartTime":7249.0,"Position":411.0,"HyperDash":false},{"StartTime":7317.0,"Position":443.061676,"HyperDash":false},{"StartTime":7385.0,"Position":411.0,"HyperDash":false},{"StartTime":7453.0,"Position":443.061676,"HyperDash":false},{"StartTime":7521.0,"Position":411.0,"HyperDash":false},{"StartTime":7589.0,"Position":443.061676,"HyperDash":false}]},{"StartTime":7658.0,"Objects":[{"StartTime":7658.0,"Position":355.0,"HyperDash":false},{"StartTime":7709.0,"Position":356.134857,"HyperDash":false},{"StartTime":7760.0,"Position":355.726776,"HyperDash":false},{"StartTime":7811.0,"Position":391.454437,"HyperDash":false},{"StartTime":7862.0,"Position":387.7087,"HyperDash":false},{"StartTime":7946.0,"Position":367.7042,"HyperDash":false},{"StartTime":8067.0,"Position":355.0,"HyperDash":false}]},{"StartTime":8203.0,"Objects":[{"StartTime":8203.0,"Position":502.0,"HyperDash":false},{"StartTime":8271.0,"Position":508.2658,"HyperDash":false},{"StartTime":8339.0,"Position":502.0,"HyperDash":false},{"StartTime":8407.0,"Position":508.2658,"HyperDash":false},{"StartTime":8475.0,"Position":502.0,"HyperDash":false},{"StartTime":8543.0,"Position":508.2658,"HyperDash":false}]},{"StartTime":8612.0,"Objects":[{"StartTime":8612.0,"Position":419.0,"HyperDash":false},{"StartTime":8680.0,"Position":429.565125,"HyperDash":false},{"StartTime":8748.0,"Position":419.0,"HyperDash":false},{"StartTime":8816.0,"Position":429.565125,"HyperDash":false},{"StartTime":8884.0,"Position":419.0,"HyperDash":false},{"StartTime":8952.0,"Position":429.565125,"HyperDash":false}]},{"StartTime":9022.0,"Objects":[{"StartTime":9022.0,"Position":364.0,"HyperDash":false},{"StartTime":9073.0,"Position":405.046875,"HyperDash":false},{"StartTime":9124.0,"Position":423.0929,"HyperDash":false},{"StartTime":9175.0,"Position":471.1283,"HyperDash":false},{"StartTime":9226.0,"Position":512.0,"HyperDash":false},{"StartTime":9310.0,"Position":450.8878,"HyperDash":false},{"StartTime":9431.0,"Position":364.0,"HyperDash":false}]},{"StartTime":9567.0,"Objects":[{"StartTime":9567.0,"Position":233.0,"HyperDash":false},{"StartTime":9635.0,"Position":226.21344,"HyperDash":false},{"StartTime":9703.0,"Position":233.0,"HyperDash":false},{"StartTime":9771.0,"Position":226.21344,"HyperDash":false},{"StartTime":9839.0,"Position":233.0,"HyperDash":false},{"StartTime":9907.0,"Position":226.21344,"HyperDash":false}]},{"StartTime":9976.0,"Objects":[{"StartTime":9976.0,"Position":284.0,"HyperDash":false},{"StartTime":10044.0,"Position":302.4323,"HyperDash":false},{"StartTime":10112.0,"Position":284.0,"HyperDash":false},{"StartTime":10180.0,"Position":302.4323,"HyperDash":false},{"StartTime":10248.0,"Position":284.0,"HyperDash":false},{"StartTime":10316.0,"Position":302.4323,"HyperDash":false}]},{"StartTime":10385.0,"Objects":[{"StartTime":10385.0,"Position":245.0,"HyperDash":false},{"StartTime":10436.0,"Position":221.437592,"HyperDash":false},{"StartTime":10487.0,"Position":156.41156,"HyperDash":false},{"StartTime":10538.0,"Position":124.576111,"HyperDash":false},{"StartTime":10589.0,"Position":129.145676,"HyperDash":false},{"StartTime":10673.0,"Position":143.747086,"HyperDash":false},{"StartTime":10794.0,"Position":245.0,"HyperDash":false}]},{"StartTime":12021.0,"Objects":[{"StartTime":12021.0,"Position":407.0,"HyperDash":false},{"StartTime":12157.0,"Position":430.1819,"HyperDash":false}]},{"StartTime":12225.0,"Objects":[{"StartTime":12225.0,"Position":484.0,"HyperDash":false}]},{"StartTime":12293.0,"Objects":[{"StartTime":12293.0,"Position":484.0,"HyperDash":false},{"StartTime":12429.0,"Position":405.168243,"HyperDash":false}]},{"StartTime":12566.0,"Objects":[{"StartTime":12566.0,"Position":387.0,"HyperDash":false},{"StartTime":12617.0,"Position":436.7446,"HyperDash":false},{"StartTime":12668.0,"Position":476.301575,"HyperDash":false},{"StartTime":12719.0,"Position":481.9031,"HyperDash":false},{"StartTime":12770.0,"Position":487.317719,"HyperDash":false},{"StartTime":12854.0,"Position":463.006,"HyperDash":false},{"StartTime":12975.0,"Position":387.0,"HyperDash":false}]},{"StartTime":13111.0,"Objects":[{"StartTime":13111.0,"Position":274.0,"HyperDash":false},{"StartTime":13247.0,"Position":173.621216,"HyperDash":false}]},{"StartTime":13316.0,"Objects":[{"StartTime":13316.0,"Position":124.0,"HyperDash":false}]},{"StartTime":13384.0,"Objects":[{"StartTime":13384.0,"Position":124.0,"HyperDash":false},{"StartTime":13520.0,"Position":23.6840134,"HyperDash":false}]},{"StartTime":13657.0,"Objects":[{"StartTime":13657.0,"Position":24.0,"HyperDash":false},{"StartTime":13741.0,"Position":80.13487,"HyperDash":false},{"StartTime":13861.0,"Position":108.188271,"HyperDash":false}]},{"StartTime":14066.0,"Objects":[{"StartTime":14066.0,"Position":229.0,"HyperDash":false}]},{"StartTime":14202.0,"Objects":[{"StartTime":14202.0,"Position":328.0,"HyperDash":false},{"StartTime":14338.0,"Position":300.487976,"HyperDash":false}]},{"StartTime":14407.0,"Objects":[{"StartTime":14407.0,"Position":256.0,"HyperDash":false}]},{"StartTime":14475.0,"Objects":[{"StartTime":14475.0,"Position":256.0,"HyperDash":false},{"StartTime":14611.0,"Position":333.4403,"HyperDash":false}]},{"StartTime":14748.0,"Objects":[{"StartTime":14748.0,"Position":378.0,"HyperDash":false},{"StartTime":14799.0,"Position":434.77832,"HyperDash":false},{"StartTime":14850.0,"Position":445.8225,"HyperDash":false},{"StartTime":14901.0,"Position":485.582428,"HyperDash":false},{"StartTime":14952.0,"Position":497.584961,"HyperDash":false},{"StartTime":15036.0,"Position":476.6938,"HyperDash":false},{"StartTime":15157.0,"Position":378.0,"HyperDash":false}]},{"StartTime":15293.0,"Objects":[{"StartTime":15293.0,"Position":277.0,"HyperDash":false},{"StartTime":15429.0,"Position":252.447769,"HyperDash":false}]},{"StartTime":15498.0,"Objects":[{"StartTime":15498.0,"Position":212.0,"HyperDash":false}]},{"StartTime":15566.0,"Objects":[{"StartTime":15566.0,"Position":212.0,"HyperDash":false},{"StartTime":15702.0,"Position":236.552231,"HyperDash":false}]},{"StartTime":15839.0,"Objects":[{"StartTime":15839.0,"Position":256.0,"HyperDash":false},{"StartTime":15923.0,"Position":331.136047,"HyperDash":false},{"StartTime":16043.0,"Position":396.792,"HyperDash":false}]},{"StartTime":16248.0,"Objects":[{"StartTime":16248.0,"Position":473.0,"HyperDash":false}]},{"StartTime":16384.0,"Objects":[{"StartTime":16384.0,"Position":486.0,"HyperDash":false},{"StartTime":16520.0,"Position":397.151581,"HyperDash":false}]},{"StartTime":16589.0,"Objects":[{"StartTime":16589.0,"Position":382.0,"HyperDash":false}]},{"StartTime":16657.0,"Objects":[{"StartTime":16657.0,"Position":382.0,"HyperDash":false},{"StartTime":16793.0,"Position":297.671143,"HyperDash":false}]},{"StartTime":16930.0,"Objects":[{"StartTime":16930.0,"Position":201.0,"HyperDash":false},{"StartTime":16981.0,"Position":215.6601,"HyperDash":false},{"StartTime":17032.0,"Position":193.010483,"HyperDash":false},{"StartTime":17083.0,"Position":161.445236,"HyperDash":false},{"StartTime":17134.0,"Position":106.410675,"HyperDash":false},{"StartTime":17218.0,"Position":175.619278,"HyperDash":false},{"StartTime":17339.0,"Position":201.0,"HyperDash":false}]},{"StartTime":17475.0,"Objects":[{"StartTime":17475.0,"Position":40.0,"HyperDash":false},{"StartTime":17611.0,"Position":56.7687,"HyperDash":false}]},{"StartTime":17680.0,"Objects":[{"StartTime":17680.0,"Position":97.0,"HyperDash":false}]},{"StartTime":17748.0,"Objects":[{"StartTime":17748.0,"Position":97.0,"HyperDash":false},{"StartTime":17884.0,"Position":197.612183,"HyperDash":false}]},{"StartTime":18021.0,"Objects":[{"StartTime":18021.0,"Position":275.0,"HyperDash":false},{"StartTime":18105.0,"Position":227.99115,"HyperDash":false},{"StartTime":18225.0,"Position":263.429932,"HyperDash":false}]},{"StartTime":18430.0,"Objects":[{"StartTime":18430.0,"Position":415.0,"HyperDash":false}]},{"StartTime":18566.0,"Objects":[{"StartTime":18566.0,"Position":355.0,"HyperDash":false},{"StartTime":18702.0,"Position":450.052368,"HyperDash":false}]},{"StartTime":18771.0,"Objects":[{"StartTime":18771.0,"Position":486.0,"HyperDash":false}]},{"StartTime":18839.0,"Objects":[{"StartTime":18839.0,"Position":486.0,"HyperDash":false},{"StartTime":18975.0,"Position":451.9095,"HyperDash":false}]},{"StartTime":19111.0,"Objects":[{"StartTime":19111.0,"Position":476.0,"HyperDash":false},{"StartTime":19162.0,"Position":467.7854,"HyperDash":false},{"StartTime":19213.0,"Position":421.959442,"HyperDash":false},{"StartTime":19264.0,"Position":381.8976,"HyperDash":false},{"StartTime":19315.0,"Position":360.902435,"HyperDash":false},{"StartTime":19399.0,"Position":438.64032,"HyperDash":false},{"StartTime":19520.0,"Position":476.0,"HyperDash":false}]},{"StartTime":19657.0,"Objects":[{"StartTime":19657.0,"Position":306.0,"HyperDash":false},{"StartTime":19793.0,"Position":210.46254,"HyperDash":false}]},{"StartTime":19861.0,"Objects":[{"StartTime":19861.0,"Position":161.0,"HyperDash":false}]},{"StartTime":19930.0,"Objects":[{"StartTime":19930.0,"Position":161.0,"HyperDash":false},{"StartTime":20066.0,"Position":196.729462,"HyperDash":false}]},{"StartTime":20202.0,"Objects":[{"StartTime":20202.0,"Position":127.0,"HyperDash":false},{"StartTime":20338.0,"Position":32.14918,"HyperDash":false}]},{"StartTime":20475.0,"Objects":[{"StartTime":20475.0,"Position":41.0,"HyperDash":false}]},{"StartTime":20543.0,"Objects":[{"StartTime":20543.0,"Position":48.0,"HyperDash":false}]},{"StartTime":20611.0,"Objects":[{"StartTime":20611.0,"Position":64.0,"HyperDash":false}]},{"StartTime":20679.0,"Objects":[{"StartTime":20679.0,"Position":86.0,"HyperDash":false}]},{"StartTime":20748.0,"Objects":[{"StartTime":20748.0,"Position":111.0,"HyperDash":false},{"StartTime":20884.0,"Position":197.677109,"HyperDash":false}]},{"StartTime":20952.0,"Objects":[{"StartTime":20952.0,"Position":249.0,"HyperDash":false}]},{"StartTime":21021.0,"Objects":[{"StartTime":21021.0,"Position":249.0,"HyperDash":false},{"StartTime":21157.0,"Position":350.174561,"HyperDash":false}]},{"StartTime":21293.0,"Objects":[{"StartTime":21293.0,"Position":451.0,"HyperDash":false},{"StartTime":21377.0,"Position":450.080383,"HyperDash":false},{"StartTime":21497.0,"Position":406.784882,"HyperDash":false}]},{"StartTime":21702.0,"Objects":[{"StartTime":21702.0,"Position":398.0,"HyperDash":false}]},{"StartTime":21839.0,"Objects":[{"StartTime":21839.0,"Position":337.0,"HyperDash":false},{"StartTime":21975.0,"Position":245.5466,"HyperDash":false}]},{"StartTime":22043.0,"Objects":[{"StartTime":22043.0,"Position":202.0,"HyperDash":false}]},{"StartTime":22111.0,"Objects":[{"StartTime":22111.0,"Position":202.0,"HyperDash":false},{"StartTime":22247.0,"Position":175.162018,"HyperDash":false}]},{"StartTime":22384.0,"Objects":[{"StartTime":22384.0,"Position":7.0,"HyperDash":false}]},{"StartTime":22589.0,"Objects":[{"StartTime":22589.0,"Position":7.0,"HyperDash":false}]},{"StartTime":22793.0,"Objects":[{"StartTime":22793.0,"Position":7.0,"HyperDash":false}]},{"StartTime":22930.0,"Objects":[{"StartTime":22930.0,"Position":61.0,"HyperDash":false},{"StartTime":23066.0,"Position":50.69364,"HyperDash":false}]},{"StartTime":23134.0,"Objects":[{"StartTime":23134.0,"Position":92.0,"HyperDash":false}]},{"StartTime":23202.0,"Objects":[{"StartTime":23202.0,"Position":92.0,"HyperDash":false},{"StartTime":23338.0,"Position":179.7528,"HyperDash":false}]},{"StartTime":23475.0,"Objects":[{"StartTime":23475.0,"Position":262.0,"HyperDash":false},{"StartTime":23559.0,"Position":335.717,"HyperDash":false},{"StartTime":23679.0,"Position":354.8034,"HyperDash":false}]},{"StartTime":23884.0,"Objects":[{"StartTime":23884.0,"Position":467.0,"HyperDash":false}]},{"StartTime":24021.0,"Objects":[{"StartTime":24021.0,"Position":430.0,"HyperDash":false},{"StartTime":24157.0,"Position":329.387817,"HyperDash":false}]},{"StartTime":24225.0,"Objects":[{"StartTime":24225.0,"Position":284.0,"HyperDash":false}]},{"StartTime":24293.0,"Objects":[{"StartTime":24293.0,"Position":284.0,"HyperDash":false},{"StartTime":24429.0,"Position":261.101257,"HyperDash":false}]},{"StartTime":24566.0,"Objects":[{"StartTime":24566.0,"Position":386.0,"HyperDash":false}]},{"StartTime":24771.0,"Objects":[{"StartTime":24771.0,"Position":386.0,"HyperDash":false}]},{"StartTime":24975.0,"Objects":[{"StartTime":24975.0,"Position":386.0,"HyperDash":false}]},{"StartTime":25111.0,"Objects":[{"StartTime":25111.0,"Position":432.0,"HyperDash":false},{"StartTime":25247.0,"Position":447.35553,"HyperDash":false}]},{"StartTime":25316.0,"Objects":[{"StartTime":25316.0,"Position":416.0,"HyperDash":false}]},{"StartTime":25384.0,"Objects":[{"StartTime":25384.0,"Position":416.0,"HyperDash":false},{"StartTime":25520.0,"Position":316.536438,"HyperDash":false}]},{"StartTime":25657.0,"Objects":[{"StartTime":25657.0,"Position":219.0,"HyperDash":false},{"StartTime":25741.0,"Position":178.386673,"HyperDash":false},{"StartTime":25861.0,"Position":167.07811,"HyperDash":false}]},{"StartTime":26066.0,"Objects":[{"StartTime":26066.0,"Position":40.0,"HyperDash":false}]},{"StartTime":26202.0,"Objects":[{"StartTime":26202.0,"Position":28.0,"HyperDash":false},{"StartTime":26338.0,"Position":101.876366,"HyperDash":false}]},{"StartTime":26407.0,"Objects":[{"StartTime":26407.0,"Position":125.0,"HyperDash":false}]},{"StartTime":26475.0,"Objects":[{"StartTime":26475.0,"Position":125.0,"HyperDash":false},{"StartTime":26611.0,"Position":142.871735,"HyperDash":false}]},{"StartTime":26748.0,"Objects":[{"StartTime":26748.0,"Position":221.0,"HyperDash":false}]},{"StartTime":26953.0,"Objects":[{"StartTime":26953.0,"Position":221.0,"HyperDash":false}]},{"StartTime":27157.0,"Objects":[{"StartTime":27157.0,"Position":221.0,"HyperDash":false}]},{"StartTime":27293.0,"Objects":[{"StartTime":27293.0,"Position":379.0,"HyperDash":false},{"StartTime":27429.0,"Position":479.272156,"HyperDash":false}]},{"StartTime":27498.0,"Objects":[{"StartTime":27498.0,"Position":510.0,"HyperDash":false}]},{"StartTime":27566.0,"Objects":[{"StartTime":27566.0,"Position":510.0,"HyperDash":false},{"StartTime":27702.0,"Position":491.238281,"HyperDash":false}]},{"StartTime":27839.0,"Objects":[{"StartTime":27839.0,"Position":503.0,"HyperDash":false},{"StartTime":27923.0,"Position":457.324524,"HyperDash":false},{"StartTime":28043.0,"Position":381.6685,"HyperDash":false}]},{"StartTime":28248.0,"Objects":[{"StartTime":28248.0,"Position":256.0,"HyperDash":false}]},{"StartTime":28384.0,"Objects":[{"StartTime":28384.0,"Position":190.0,"HyperDash":false}]},{"StartTime":28521.0,"Objects":[{"StartTime":28521.0,"Position":269.0,"HyperDash":false}]},{"StartTime":28589.0,"Objects":[{"StartTime":28589.0,"Position":272.0,"HyperDash":false}]},{"StartTime":28657.0,"Objects":[{"StartTime":28657.0,"Position":275.0,"HyperDash":false},{"StartTime":28793.0,"Position":264.133636,"HyperDash":false}]},{"StartTime":28930.0,"Objects":[{"StartTime":28930.0,"Position":179.0,"HyperDash":false}]},{"StartTime":28998.0,"Objects":[{"StartTime":28998.0,"Position":154.0,"HyperDash":false}]},{"StartTime":29066.0,"Objects":[{"StartTime":29066.0,"Position":135.0,"HyperDash":false}]},{"StartTime":29134.0,"Objects":[{"StartTime":29134.0,"Position":122.0,"HyperDash":false}]},{"StartTime":29202.0,"Objects":[{"StartTime":29202.0,"Position":118.0,"HyperDash":false},{"StartTime":29270.0,"Position":107.667114,"HyperDash":false},{"StartTime":29338.0,"Position":118.0,"HyperDash":false},{"StartTime":29406.0,"Position":107.667114,"HyperDash":false}]},{"StartTime":29475.0,"Objects":[{"StartTime":29475.0,"Position":45.0,"HyperDash":false},{"StartTime":29543.0,"Position":4.39538574,"HyperDash":false},{"StartTime":29611.0,"Position":45.0,"HyperDash":false},{"StartTime":29679.0,"Position":4.39538574,"HyperDash":false}]},{"StartTime":29748.0,"Objects":[{"StartTime":29748.0,"Position":102.0,"HyperDash":false},{"StartTime":29816.0,"Position":142.604614,"HyperDash":false},{"StartTime":29884.0,"Position":102.0,"HyperDash":false},{"StartTime":29952.0,"Position":142.604614,"HyperDash":false}]},{"StartTime":30021.0,"Objects":[{"StartTime":30021.0,"Position":193.0,"HyperDash":false},{"StartTime":30089.0,"Position":205.21228,"HyperDash":false},{"StartTime":30157.0,"Position":193.0,"HyperDash":false},{"StartTime":30225.0,"Position":205.21228,"HyperDash":false}]},{"StartTime":30293.0,"Objects":[{"StartTime":30293.0,"Position":291.0,"HyperDash":false},{"StartTime":30361.0,"Position":302.9382,"HyperDash":false},{"StartTime":30429.0,"Position":291.0,"HyperDash":false},{"StartTime":30497.0,"Position":302.9382,"HyperDash":false}]},{"StartTime":30566.0,"Objects":[{"StartTime":30566.0,"Position":391.0,"HyperDash":false}]},{"StartTime":30634.0,"Objects":[{"StartTime":30634.0,"Position":400.0,"HyperDash":false}]},{"StartTime":30702.0,"Objects":[{"StartTime":30702.0,"Position":409.0,"HyperDash":false}]},{"StartTime":30839.0,"Objects":[{"StartTime":30839.0,"Position":434.0,"HyperDash":false}]},{"StartTime":30907.0,"Objects":[{"StartTime":30907.0,"Position":425.0,"HyperDash":false}]},{"StartTime":30975.0,"Objects":[{"StartTime":30975.0,"Position":416.0,"HyperDash":false}]},{"StartTime":31111.0,"Objects":[{"StartTime":31111.0,"Position":512.0,"HyperDash":false},{"StartTime":31179.0,"Position":499.154633,"HyperDash":false},{"StartTime":31247.0,"Position":512.0,"HyperDash":false}]},{"StartTime":31384.0,"Objects":[{"StartTime":31384.0,"Position":435.0,"HyperDash":false},{"StartTime":31452.0,"Position":446.9382,"HyperDash":false},{"StartTime":31520.0,"Position":435.0,"HyperDash":false}]},{"StartTime":31657.0,"Objects":[{"StartTime":31657.0,"Position":381.0,"HyperDash":false},{"StartTime":31725.0,"Position":340.211151,"HyperDash":false},{"StartTime":31793.0,"Position":381.0,"HyperDash":false},{"StartTime":31861.0,"Position":340.211151,"HyperDash":false}]},{"StartTime":31930.0,"Objects":[{"StartTime":31930.0,"Position":251.0,"HyperDash":false},{"StartTime":31998.0,"Position":210.395386,"HyperDash":false},{"StartTime":32066.0,"Position":251.0,"HyperDash":false},{"StartTime":32134.0,"Position":210.395386,"HyperDash":false}]},{"StartTime":32202.0,"Objects":[{"StartTime":32202.0,"Position":146.0,"HyperDash":false},{"StartTime":32270.0,"Position":158.21228,"HyperDash":false},{"StartTime":32338.0,"Position":146.0,"HyperDash":false},{"StartTime":32406.0,"Position":158.21228,"HyperDash":false}]},{"StartTime":32475.0,"Objects":[{"StartTime":32475.0,"Position":56.0,"HyperDash":false},{"StartTime":32543.0,"Position":68.21229,"HyperDash":false},{"StartTime":32611.0,"Position":56.0,"HyperDash":false},{"StartTime":32679.0,"Position":68.21229,"HyperDash":false}]},{"StartTime":32748.0,"Objects":[{"StartTime":32748.0,"Position":22.0,"HyperDash":false}]},{"StartTime":32816.0,"Objects":[{"StartTime":32816.0,"Position":25.0,"HyperDash":false}]},{"StartTime":32884.0,"Objects":[{"StartTime":32884.0,"Position":28.0,"HyperDash":false}]},{"StartTime":33021.0,"Objects":[{"StartTime":33021.0,"Position":93.0,"HyperDash":false}]},{"StartTime":33089.0,"Objects":[{"StartTime":33089.0,"Position":90.0,"HyperDash":false}]},{"StartTime":33157.0,"Objects":[{"StartTime":33157.0,"Position":87.0,"HyperDash":false}]},{"StartTime":33293.0,"Objects":[{"StartTime":33293.0,"Position":168.0,"HyperDash":false}]},{"StartTime":33361.0,"Objects":[{"StartTime":33361.0,"Position":176.0,"HyperDash":false}]},{"StartTime":33430.0,"Objects":[{"StartTime":33430.0,"Position":184.0,"HyperDash":false},{"StartTime":33566.0,"Position":268.439758,"HyperDash":false}]},{"StartTime":33839.0,"Objects":[{"StartTime":33839.0,"Position":274.0,"HyperDash":false},{"StartTime":33907.0,"Position":261.78772,"HyperDash":false},{"StartTime":33975.0,"Position":274.0,"HyperDash":false},{"StartTime":34043.0,"Position":261.78772,"HyperDash":false}]},{"StartTime":34112.0,"Objects":[{"StartTime":34112.0,"Position":330.0,"HyperDash":false},{"StartTime":34180.0,"Position":342.21228,"HyperDash":false},{"StartTime":34248.0,"Position":330.0,"HyperDash":false},{"StartTime":34316.0,"Position":342.21228,"HyperDash":false}]},{"StartTime":34384.0,"Objects":[{"StartTime":34384.0,"Position":422.0,"HyperDash":false},{"StartTime":34452.0,"Position":462.788849,"HyperDash":false},{"StartTime":34520.0,"Position":422.0,"HyperDash":false},{"StartTime":34588.0,"Position":462.788849,"HyperDash":false}]},{"StartTime":34657.0,"Objects":[{"StartTime":34657.0,"Position":461.0,"HyperDash":false},{"StartTime":34725.0,"Position":501.6046,"HyperDash":false},{"StartTime":34793.0,"Position":461.0,"HyperDash":false},{"StartTime":34861.0,"Position":501.6046,"HyperDash":false}]},{"StartTime":34930.0,"Objects":[{"StartTime":34930.0,"Position":448.0,"HyperDash":false}]},{"StartTime":34998.0,"Objects":[{"StartTime":34998.0,"Position":439.0,"HyperDash":false}]},{"StartTime":35066.0,"Objects":[{"StartTime":35066.0,"Position":430.0,"HyperDash":false}]},{"StartTime":35202.0,"Objects":[{"StartTime":35202.0,"Position":321.0,"HyperDash":false}]},{"StartTime":35270.0,"Objects":[{"StartTime":35270.0,"Position":312.0,"HyperDash":false}]},{"StartTime":35338.0,"Objects":[{"StartTime":35338.0,"Position":303.0,"HyperDash":false}]},{"StartTime":35475.0,"Objects":[{"StartTime":35475.0,"Position":269.0,"HyperDash":false},{"StartTime":35543.0,"Position":228.395386,"HyperDash":false},{"StartTime":35611.0,"Position":269.0,"HyperDash":false}]},{"StartTime":35748.0,"Objects":[{"StartTime":35748.0,"Position":162.0,"HyperDash":false},{"StartTime":35816.0,"Position":202.788834,"HyperDash":false},{"StartTime":35884.0,"Position":162.0,"HyperDash":false}]},{"StartTime":36021.0,"Objects":[{"StartTime":36021.0,"Position":87.0,"HyperDash":false},{"StartTime":36089.0,"Position":99.21229,"HyperDash":false},{"StartTime":36157.0,"Position":87.0,"HyperDash":false},{"StartTime":36225.0,"Position":99.21229,"HyperDash":false}]},{"StartTime":36294.0,"Objects":[{"StartTime":36294.0,"Position":31.0,"HyperDash":false},{"StartTime":36362.0,"Position":18.7877159,"HyperDash":false},{"StartTime":36430.0,"Position":31.0,"HyperDash":false},{"StartTime":36498.0,"Position":18.7877159,"HyperDash":false}]},{"StartTime":36566.0,"Objects":[{"StartTime":36566.0,"Position":101.0,"HyperDash":false},{"StartTime":36634.0,"Position":141.788834,"HyperDash":false},{"StartTime":36702.0,"Position":101.0,"HyperDash":false},{"StartTime":36770.0,"Position":141.788834,"HyperDash":false}]},{"StartTime":36839.0,"Objects":[{"StartTime":36839.0,"Position":184.0,"HyperDash":false},{"StartTime":36907.0,"Position":224.604614,"HyperDash":false},{"StartTime":36975.0,"Position":184.0,"HyperDash":false},{"StartTime":37043.0,"Position":224.604614,"HyperDash":false}]},{"StartTime":37111.0,"Objects":[{"StartTime":37111.0,"Position":304.0,"HyperDash":false}]},{"StartTime":37179.0,"Objects":[{"StartTime":37179.0,"Position":307.0,"HyperDash":false}]},{"StartTime":37247.0,"Objects":[{"StartTime":37247.0,"Position":310.0,"HyperDash":false}]},{"StartTime":37384.0,"Objects":[{"StartTime":37384.0,"Position":392.0,"HyperDash":false}]},{"StartTime":37452.0,"Objects":[{"StartTime":37452.0,"Position":395.0,"HyperDash":false}]},{"StartTime":37520.0,"Objects":[{"StartTime":37520.0,"Position":398.0,"HyperDash":false}]},{"StartTime":37657.0,"Objects":[{"StartTime":37657.0,"Position":341.0,"HyperDash":false},{"StartTime":37725.0,"Position":356.784119,"HyperDash":false},{"StartTime":37793.0,"Position":341.0,"HyperDash":false},{"StartTime":37861.0,"Position":356.784119,"HyperDash":false}]},{"StartTime":37930.0,"Objects":[{"StartTime":37930.0,"Position":352.0,"HyperDash":false},{"StartTime":37998.0,"Position":367.784119,"HyperDash":false},{"StartTime":38066.0,"Position":352.0,"HyperDash":false},{"StartTime":38134.0,"Position":367.784119,"HyperDash":false}]},{"StartTime":38202.0,"Objects":[{"StartTime":38202.0,"Position":449.0,"HyperDash":false},{"StartTime":38261.0,"Position":474.06,"HyperDash":false},{"StartTime":38320.0,"Position":479.854156,"HyperDash":false},{"StartTime":38379.0,"Position":497.1734,"HyperDash":false},{"StartTime":38474.0,"Position":487.267334,"HyperDash":false}]},{"StartTime":38748.0,"Objects":[{"StartTime":38748.0,"Position":487.0,"HyperDash":false},{"StartTime":38807.0,"Position":440.148621,"HyperDash":false},{"StartTime":38866.0,"Position":413.297272,"HyperDash":false},{"StartTime":38925.0,"Position":408.4459,"HyperDash":false},{"StartTime":39020.0,"Position":353.9903,"HyperDash":false}]},{"StartTime":39293.0,"Objects":[{"StartTime":39293.0,"Position":403.0,"HyperDash":false},{"StartTime":39352.0,"Position":361.224365,"HyperDash":false},{"StartTime":39411.0,"Position":329.028229,"HyperDash":false},{"StartTime":39470.0,"Position":319.025146,"HyperDash":false},{"StartTime":39565.0,"Position":277.9407,"HyperDash":false}]},{"StartTime":39702.0,"Objects":[{"StartTime":39702.0,"Position":277.0,"HyperDash":false}]},{"StartTime":39839.0,"Objects":[{"StartTime":39839.0,"Position":155.0,"HyperDash":false},{"StartTime":39975.0,"Position":184.883255,"HyperDash":false}]},{"StartTime":40111.0,"Objects":[{"StartTime":40111.0,"Position":65.0,"HyperDash":false}]},{"StartTime":40384.0,"Objects":[{"StartTime":40384.0,"Position":65.0,"HyperDash":false},{"StartTime":40520.0,"Position":148.5545,"HyperDash":false}]},{"StartTime":40657.0,"Objects":[{"StartTime":40657.0,"Position":90.0,"HyperDash":false},{"StartTime":40793.0,"Position":6.445488,"HyperDash":false}]},{"StartTime":40930.0,"Objects":[{"StartTime":40930.0,"Position":180.0,"HyperDash":false}]},{"StartTime":41066.0,"Objects":[{"StartTime":41066.0,"Position":280.0,"HyperDash":false}]},{"StartTime":41134.0,"Objects":[{"StartTime":41134.0,"Position":280.0,"HyperDash":false}]},{"StartTime":41202.0,"Objects":[{"StartTime":41202.0,"Position":280.0,"HyperDash":false},{"StartTime":41338.0,"Position":363.5545,"HyperDash":false}]},{"StartTime":41475.0,"Objects":[{"StartTime":41475.0,"Position":208.0,"HyperDash":false}]},{"StartTime":41611.0,"Objects":[{"StartTime":41611.0,"Position":208.0,"HyperDash":false}]},{"StartTime":41748.0,"Objects":[{"StartTime":41748.0,"Position":372.0,"HyperDash":false},{"StartTime":41884.0,"Position":288.4455,"HyperDash":false}]},{"StartTime":42021.0,"Objects":[{"StartTime":42021.0,"Position":170.0,"HyperDash":false},{"StartTime":42157.0,"Position":187.164719,"HyperDash":false}]},{"StartTime":42293.0,"Objects":[{"StartTime":42293.0,"Position":64.0,"HyperDash":false},{"StartTime":42361.0,"Position":71.60263,"HyperDash":false},{"StartTime":42429.0,"Position":64.0,"HyperDash":false},{"StartTime":42497.0,"Position":71.60263,"HyperDash":false}]},{"StartTime":42566.0,"Objects":[{"StartTime":42566.0,"Position":25.0,"HyperDash":false},{"StartTime":42625.0,"Position":29.524353,"HyperDash":false},{"StartTime":42684.0,"Position":56.72582,"HyperDash":false},{"StartTime":42743.0,"Position":46.7086868,"HyperDash":false},{"StartTime":42838.0,"Position":32.0564842,"HyperDash":false}]},{"StartTime":43111.0,"Objects":[{"StartTime":43111.0,"Position":32.0,"HyperDash":false},{"StartTime":43170.0,"Position":77.73514,"HyperDash":false},{"StartTime":43229.0,"Position":72.4702759,"HyperDash":false},{"StartTime":43288.0,"Position":123.205421,"HyperDash":false},{"StartTime":43383.0,"Position":164.473862,"HyperDash":false}]},{"StartTime":43657.0,"Objects":[{"StartTime":43657.0,"Position":420.0,"HyperDash":false},{"StartTime":43716.0,"Position":410.224365,"HyperDash":false},{"StartTime":43775.0,"Position":376.028229,"HyperDash":false},{"StartTime":43834.0,"Position":351.025146,"HyperDash":false},{"StartTime":43929.0,"Position":294.9407,"HyperDash":false}]},{"StartTime":44066.0,"Objects":[{"StartTime":44066.0,"Position":294.0,"HyperDash":false}]},{"StartTime":44202.0,"Objects":[{"StartTime":44202.0,"Position":204.0,"HyperDash":false},{"StartTime":44338.0,"Position":217.130188,"HyperDash":false}]},{"StartTime":44475.0,"Objects":[{"StartTime":44475.0,"Position":381.0,"HyperDash":false}]},{"StartTime":44748.0,"Objects":[{"StartTime":44748.0,"Position":381.0,"HyperDash":false},{"StartTime":44884.0,"Position":392.2908,"HyperDash":false}]},{"StartTime":45021.0,"Objects":[{"StartTime":45021.0,"Position":500.0,"HyperDash":false},{"StartTime":45157.0,"Position":488.7092,"HyperDash":false}]},{"StartTime":45293.0,"Objects":[{"StartTime":45293.0,"Position":285.0,"HyperDash":false}]},{"StartTime":45430.0,"Objects":[{"StartTime":45430.0,"Position":397.0,"HyperDash":false}]},{"StartTime":45498.0,"Objects":[{"StartTime":45498.0,"Position":397.0,"HyperDash":false}]},{"StartTime":45566.0,"Objects":[{"StartTime":45566.0,"Position":397.0,"HyperDash":false},{"StartTime":45702.0,"Position":385.7092,"HyperDash":false}]},{"StartTime":45839.0,"Objects":[{"StartTime":45839.0,"Position":208.0,"HyperDash":false}]},{"StartTime":45907.0,"Objects":[{"StartTime":45907.0,"Position":208.0,"HyperDash":false}]},{"StartTime":45975.0,"Objects":[{"StartTime":45975.0,"Position":208.0,"HyperDash":false},{"StartTime":46111.0,"Position":131.34523,"HyperDash":false}]},{"StartTime":46248.0,"Objects":[{"StartTime":46248.0,"Position":47.0,"HyperDash":false}]},{"StartTime":46316.0,"Objects":[{"StartTime":46316.0,"Position":54.0,"HyperDash":false}]},{"StartTime":46384.0,"Objects":[{"StartTime":46384.0,"Position":61.0,"HyperDash":false}]},{"StartTime":46521.0,"Objects":[{"StartTime":46521.0,"Position":118.0,"HyperDash":false},{"StartTime":46589.0,"Position":111.337379,"HyperDash":false},{"StartTime":46657.0,"Position":118.0,"HyperDash":false},{"StartTime":46725.0,"Position":111.337379,"HyperDash":false},{"StartTime":46793.0,"Position":118.0,"HyperDash":false},{"StartTime":46861.0,"Position":111.337379,"HyperDash":false}]},{"StartTime":46930.0,"Objects":[{"StartTime":46930.0,"Position":186.0,"HyperDash":false},{"StartTime":47066.0,"Position":274.623718,"HyperDash":false}]},{"StartTime":47202.0,"Objects":[{"StartTime":47202.0,"Position":446.0,"HyperDash":false},{"StartTime":47338.0,"Position":357.889038,"HyperDash":false}]},{"StartTime":47475.0,"Objects":[{"StartTime":47475.0,"Position":367.0,"HyperDash":false},{"StartTime":47611.0,"Position":390.840118,"HyperDash":false}]},{"StartTime":47748.0,"Objects":[{"StartTime":47748.0,"Position":297.0,"HyperDash":false},{"StartTime":47884.0,"Position":319.863068,"HyperDash":false}]},{"StartTime":48021.0,"Objects":[{"StartTime":48021.0,"Position":243.0,"HyperDash":false},{"StartTime":48157.0,"Position":143.595367,"HyperDash":false}]},{"StartTime":48293.0,"Objects":[{"StartTime":48293.0,"Position":188.0,"HyperDash":false}]},{"StartTime":48430.0,"Objects":[{"StartTime":48430.0,"Position":188.0,"HyperDash":false}]},{"StartTime":48566.0,"Objects":[{"StartTime":48566.0,"Position":59.0,"HyperDash":false},{"StartTime":48702.0,"Position":43.64902,"HyperDash":false}]},{"StartTime":48839.0,"Objects":[{"StartTime":48839.0,"Position":174.0,"HyperDash":false},{"StartTime":48975.0,"Position":273.404633,"HyperDash":false}]},{"StartTime":49111.0,"Objects":[{"StartTime":49111.0,"Position":423.0,"HyperDash":false},{"StartTime":49247.0,"Position":415.1793,"HyperDash":false}]},{"StartTime":49384.0,"Objects":[{"StartTime":49384.0,"Position":346.0,"HyperDash":false},{"StartTime":49520.0,"Position":433.371735,"HyperDash":true}]},{"StartTime":49657.0,"Objects":[{"StartTime":49657.0,"Position":217.0,"HyperDash":false}]},{"StartTime":49793.0,"Objects":[{"StartTime":49793.0,"Position":208.0,"HyperDash":false}]},{"StartTime":49861.0,"Objects":[{"StartTime":49861.0,"Position":208.0,"HyperDash":false}]},{"StartTime":49930.0,"Objects":[{"StartTime":49930.0,"Position":208.0,"HyperDash":false},{"StartTime":50066.0,"Position":107.101242,"HyperDash":false}]},{"StartTime":50202.0,"Objects":[{"StartTime":50202.0,"Position":45.0,"HyperDash":false}]},{"StartTime":50338.0,"Objects":[{"StartTime":50338.0,"Position":108.0,"HyperDash":false}]},{"StartTime":50475.0,"Objects":[{"StartTime":50475.0,"Position":107.0,"HyperDash":false}]},{"StartTime":50611.0,"Objects":[{"StartTime":50611.0,"Position":44.0,"HyperDash":false}]},{"StartTime":50748.0,"Objects":[{"StartTime":50748.0,"Position":70.0,"HyperDash":false},{"StartTime":50807.0,"Position":117.635452,"HyperDash":false},{"StartTime":50866.0,"Position":164.2709,"HyperDash":false},{"StartTime":50925.0,"Position":211.774979,"HyperDash":false},{"StartTime":51020.0,"Position":266.492462,"HyperDash":false}]},{"StartTime":51157.0,"Objects":[{"StartTime":51157.0,"Position":441.0,"HyperDash":false}]},{"StartTime":51225.0,"Objects":[{"StartTime":51225.0,"Position":434.0,"HyperDash":false}]},{"StartTime":51293.0,"Objects":[{"StartTime":51293.0,"Position":427.0,"HyperDash":false},{"StartTime":51429.0,"Position":405.05188,"HyperDash":false}]},{"StartTime":51566.0,"Objects":[{"StartTime":51566.0,"Position":482.0,"HyperDash":false},{"StartTime":51702.0,"Position":460.05188,"HyperDash":false}]},{"StartTime":51839.0,"Objects":[{"StartTime":51839.0,"Position":357.0,"HyperDash":false},{"StartTime":51975.0,"Position":265.6038,"HyperDash":false}]},{"StartTime":52111.0,"Objects":[{"StartTime":52111.0,"Position":119.0,"HyperDash":false},{"StartTime":52247.0,"Position":210.2502,"HyperDash":false}]},{"StartTime":52384.0,"Objects":[{"StartTime":52384.0,"Position":164.0,"HyperDash":false},{"StartTime":52520.0,"Position":74.00247,"HyperDash":false}]},{"StartTime":52657.0,"Objects":[{"StartTime":52657.0,"Position":0.0,"HyperDash":false}]},{"StartTime":52793.0,"Objects":[{"StartTime":52793.0,"Position":0.0,"HyperDash":false}]},{"StartTime":52930.0,"Objects":[{"StartTime":52930.0,"Position":124.0,"HyperDash":false},{"StartTime":53066.0,"Position":225.212341,"HyperDash":false}]},{"StartTime":53202.0,"Objects":[{"StartTime":53202.0,"Position":316.0,"HyperDash":false},{"StartTime":53338.0,"Position":303.34845,"HyperDash":false}]},{"StartTime":53475.0,"Objects":[{"StartTime":53475.0,"Position":332.0,"HyperDash":false},{"StartTime":53611.0,"Position":415.923523,"HyperDash":false}]},{"StartTime":53748.0,"Objects":[{"StartTime":53748.0,"Position":512.0,"HyperDash":false},{"StartTime":53884.0,"Position":428.076477,"HyperDash":false}]},{"StartTime":54021.0,"Objects":[{"StartTime":54021.0,"Position":512.0,"HyperDash":false}]},{"StartTime":54157.0,"Objects":[{"StartTime":54157.0,"Position":363.0,"HyperDash":false}]},{"StartTime":54225.0,"Objects":[{"StartTime":54225.0,"Position":363.0,"HyperDash":false}]},{"StartTime":54293.0,"Objects":[{"StartTime":54293.0,"Position":363.0,"HyperDash":false},{"StartTime":54429.0,"Position":262.3189,"HyperDash":false}]},{"StartTime":54566.0,"Objects":[{"StartTime":54566.0,"Position":308.0,"HyperDash":false}]},{"StartTime":54634.0,"Objects":[{"StartTime":54634.0,"Position":269.0,"HyperDash":false}]},{"StartTime":54702.0,"Objects":[{"StartTime":54702.0,"Position":227.0,"HyperDash":false}]},{"StartTime":54770.0,"Objects":[{"StartTime":54770.0,"Position":193.0,"HyperDash":false}]},{"StartTime":54838.0,"Objects":[{"StartTime":54838.0,"Position":175.0,"HyperDash":false}]},{"StartTime":54975.0,"Objects":[{"StartTime":54975.0,"Position":81.0,"HyperDash":false}]},{"StartTime":55043.0,"Objects":[{"StartTime":55043.0,"Position":74.0,"HyperDash":false}]},{"StartTime":55111.0,"Objects":[{"StartTime":55111.0,"Position":67.0,"HyperDash":false}]},{"StartTime":55248.0,"Objects":[{"StartTime":55248.0,"Position":18.0,"HyperDash":false},{"StartTime":55316.0,"Position":25.9951439,"HyperDash":false},{"StartTime":55384.0,"Position":18.0,"HyperDash":false},{"StartTime":55452.0,"Position":25.9951439,"HyperDash":false},{"StartTime":55520.0,"Position":18.0,"HyperDash":false},{"StartTime":55588.0,"Position":25.9951439,"HyperDash":false}]},{"StartTime":55657.0,"Objects":[{"StartTime":55657.0,"Position":87.0,"HyperDash":false},{"StartTime":55725.0,"Position":127.788834,"HyperDash":false},{"StartTime":55793.0,"Position":87.0,"HyperDash":false},{"StartTime":55861.0,"Position":127.788834,"HyperDash":false}]},{"StartTime":55929.0,"Objects":[{"StartTime":55929.0,"Position":175.0,"HyperDash":false},{"StartTime":55997.0,"Position":215.604614,"HyperDash":false},{"StartTime":56065.0,"Position":175.0,"HyperDash":false},{"StartTime":56133.0,"Position":215.604614,"HyperDash":false}]},{"StartTime":56202.0,"Objects":[{"StartTime":56202.0,"Position":295.0,"HyperDash":false},{"StartTime":56270.0,"Position":307.21228,"HyperDash":false},{"StartTime":56338.0,"Position":295.0,"HyperDash":false},{"StartTime":56406.0,"Position":307.21228,"HyperDash":false}]},{"StartTime":56475.0,"Objects":[{"StartTime":56475.0,"Position":265.0,"HyperDash":false},{"StartTime":56543.0,"Position":252.78772,"HyperDash":false},{"StartTime":56611.0,"Position":265.0,"HyperDash":false},{"StartTime":56679.0,"Position":252.78772,"HyperDash":false}]},{"StartTime":56748.0,"Objects":[{"StartTime":56748.0,"Position":327.0,"HyperDash":false}]},{"StartTime":56816.0,"Objects":[{"StartTime":56816.0,"Position":336.0,"HyperDash":false}]},{"StartTime":56884.0,"Objects":[{"StartTime":56884.0,"Position":345.0,"HyperDash":false}]},{"StartTime":57021.0,"Objects":[{"StartTime":57021.0,"Position":414.0,"HyperDash":false}]},{"StartTime":57089.0,"Objects":[{"StartTime":57089.0,"Position":423.0,"HyperDash":false}]},{"StartTime":57157.0,"Objects":[{"StartTime":57157.0,"Position":432.0,"HyperDash":false}]},{"StartTime":57293.0,"Objects":[{"StartTime":57293.0,"Position":502.0,"HyperDash":false},{"StartTime":57361.0,"Position":489.78772,"HyperDash":false},{"StartTime":57429.0,"Position":502.0,"HyperDash":false}]},{"StartTime":57566.0,"Objects":[{"StartTime":57566.0,"Position":431.0,"HyperDash":false},{"StartTime":57634.0,"Position":443.21228,"HyperDash":false},{"StartTime":57702.0,"Position":431.0,"HyperDash":false}]},{"StartTime":57839.0,"Objects":[{"StartTime":57839.0,"Position":356.0,"HyperDash":false},{"StartTime":57907.0,"Position":343.78772,"HyperDash":false},{"StartTime":57975.0,"Position":356.0,"HyperDash":false},{"StartTime":58043.0,"Position":343.78772,"HyperDash":false}]},{"StartTime":58112.0,"Objects":[{"StartTime":58112.0,"Position":294.0,"HyperDash":false},{"StartTime":58180.0,"Position":334.7076,"HyperDash":false},{"StartTime":58248.0,"Position":294.0,"HyperDash":false},{"StartTime":58316.0,"Position":334.7076,"HyperDash":false}]},{"StartTime":58384.0,"Objects":[{"StartTime":58384.0,"Position":205.0,"HyperDash":false},{"StartTime":58452.0,"Position":192.78772,"HyperDash":false},{"StartTime":58520.0,"Position":205.0,"HyperDash":false},{"StartTime":58588.0,"Position":192.78772,"HyperDash":false}]},{"StartTime":58657.0,"Objects":[{"StartTime":58657.0,"Position":151.0,"HyperDash":false},{"StartTime":58725.0,"Position":110.292381,"HyperDash":false},{"StartTime":58793.0,"Position":151.0,"HyperDash":false},{"StartTime":58861.0,"Position":110.292381,"HyperDash":false}]},{"StartTime":58930.0,"Objects":[{"StartTime":58930.0,"Position":21.0,"HyperDash":false}]},{"StartTime":58998.0,"Objects":[{"StartTime":58998.0,"Position":18.0,"HyperDash":false}]},{"StartTime":59066.0,"Objects":[{"StartTime":59066.0,"Position":15.0,"HyperDash":false}]},{"StartTime":59202.0,"Objects":[{"StartTime":59202.0,"Position":96.0,"HyperDash":false}]},{"StartTime":59270.0,"Objects":[{"StartTime":59270.0,"Position":93.0,"HyperDash":false}]},{"StartTime":59338.0,"Objects":[{"StartTime":59338.0,"Position":90.0,"HyperDash":false}]},{"StartTime":59475.0,"Objects":[{"StartTime":59475.0,"Position":38.0,"HyperDash":false}]},{"StartTime":59543.0,"Objects":[{"StartTime":59543.0,"Position":41.0,"HyperDash":false}]},{"StartTime":59611.0,"Objects":[{"StartTime":59611.0,"Position":44.0,"HyperDash":false},{"StartTime":59747.0,"Position":35.8773422,"HyperDash":false}]},{"StartTime":60021.0,"Objects":[{"StartTime":60021.0,"Position":227.0,"HyperDash":false},{"StartTime":60089.0,"Position":214.78772,"HyperDash":false},{"StartTime":60157.0,"Position":227.0,"HyperDash":false},{"StartTime":60225.0,"Position":214.78772,"HyperDash":false}]},{"StartTime":60294.0,"Objects":[{"StartTime":60294.0,"Position":257.0,"HyperDash":false},{"StartTime":60362.0,"Position":269.21228,"HyperDash":false},{"StartTime":60430.0,"Position":257.0,"HyperDash":false},{"StartTime":60498.0,"Position":269.21228,"HyperDash":false}]},{"StartTime":60566.0,"Objects":[{"StartTime":60566.0,"Position":357.0,"HyperDash":false},{"StartTime":60634.0,"Position":397.788849,"HyperDash":false},{"StartTime":60702.0,"Position":357.0,"HyperDash":false},{"StartTime":60770.0,"Position":397.788849,"HyperDash":false}]},{"StartTime":60838.0,"Objects":[{"StartTime":60838.0,"Position":445.0,"HyperDash":false},{"StartTime":60906.0,"Position":485.6046,"HyperDash":false},{"StartTime":60974.0,"Position":445.0,"HyperDash":false},{"StartTime":61042.0,"Position":485.6046,"HyperDash":false}]},{"StartTime":61111.0,"Objects":[{"StartTime":61111.0,"Position":496.0,"HyperDash":false}]},{"StartTime":61179.0,"Objects":[{"StartTime":61179.0,"Position":493.0,"HyperDash":false}]},{"StartTime":61247.0,"Objects":[{"StartTime":61247.0,"Position":490.0,"HyperDash":false}]},{"StartTime":61384.0,"Objects":[{"StartTime":61384.0,"Position":420.0,"HyperDash":false}]},{"StartTime":61452.0,"Objects":[{"StartTime":61452.0,"Position":417.0,"HyperDash":false}]},{"StartTime":61521.0,"Objects":[{"StartTime":61521.0,"Position":414.0,"HyperDash":false}]},{"StartTime":61657.0,"Objects":[{"StartTime":61657.0,"Position":389.0,"HyperDash":false},{"StartTime":61725.0,"Position":348.2924,"HyperDash":false},{"StartTime":61793.0,"Position":389.0,"HyperDash":false}]},{"StartTime":61930.0,"Objects":[{"StartTime":61930.0,"Position":277.0,"HyperDash":false},{"StartTime":61998.0,"Position":236.292389,"HyperDash":false},{"StartTime":62066.0,"Position":277.0,"HyperDash":false}]},{"StartTime":62202.0,"Objects":[{"StartTime":62202.0,"Position":161.0,"HyperDash":false},{"StartTime":62270.0,"Position":148.78772,"HyperDash":false},{"StartTime":62338.0,"Position":161.0,"HyperDash":false},{"StartTime":62406.0,"Position":148.78772,"HyperDash":false}]},{"StartTime":62475.0,"Objects":[{"StartTime":62475.0,"Position":142.0,"HyperDash":false},{"StartTime":62543.0,"Position":101.292381,"HyperDash":false},{"StartTime":62611.0,"Position":142.0,"HyperDash":false},{"StartTime":62679.0,"Position":101.292381,"HyperDash":false}]},{"StartTime":62748.0,"Objects":[{"StartTime":62748.0,"Position":2.0,"HyperDash":false},{"StartTime":62816.0,"Position":14.212285,"HyperDash":false},{"StartTime":62884.0,"Position":2.0,"HyperDash":false},{"StartTime":62952.0,"Position":14.212285,"HyperDash":false}]},{"StartTime":63021.0,"Objects":[{"StartTime":63021.0,"Position":0.0,"HyperDash":false},{"StartTime":63089.0,"Position":40.70762,"HyperDash":false},{"StartTime":63157.0,"Position":0.0,"HyperDash":false},{"StartTime":63225.0,"Position":40.70762,"HyperDash":false}]},{"StartTime":63293.0,"Objects":[{"StartTime":63293.0,"Position":95.0,"HyperDash":false}]},{"StartTime":63361.0,"Objects":[{"StartTime":63361.0,"Position":104.0,"HyperDash":false}]},{"StartTime":63429.0,"Objects":[{"StartTime":63429.0,"Position":113.0,"HyperDash":false}]},{"StartTime":63566.0,"Objects":[{"StartTime":63566.0,"Position":189.0,"HyperDash":false}]},{"StartTime":63634.0,"Objects":[{"StartTime":63634.0,"Position":198.0,"HyperDash":false}]},{"StartTime":63702.0,"Objects":[{"StartTime":63702.0,"Position":207.0,"HyperDash":false}]},{"StartTime":63839.0,"Objects":[{"StartTime":63839.0,"Position":281.0,"HyperDash":false},{"StartTime":63907.0,"Position":322.273315,"HyperDash":false},{"StartTime":63975.0,"Position":281.0,"HyperDash":false},{"StartTime":64043.0,"Position":322.273315,"HyperDash":false}]},{"StartTime":64111.0,"Objects":[{"StartTime":64111.0,"Position":362.0,"HyperDash":false},{"StartTime":64179.0,"Position":403.273315,"HyperDash":false},{"StartTime":64247.0,"Position":362.0,"HyperDash":false},{"StartTime":64315.0,"Position":403.273315,"HyperDash":false}]},{"StartTime":64384.0,"Objects":[{"StartTime":64384.0,"Position":478.0,"HyperDash":false},{"StartTime":64443.0,"Position":442.243439,"HyperDash":false},{"StartTime":64502.0,"Position":440.1484,"HyperDash":false},{"StartTime":64561.0,"Position":427.0997,"HyperDash":false},{"StartTime":64656.0,"Position":444.9422,"HyperDash":false}]},{"StartTime":64930.0,"Objects":[{"StartTime":64930.0,"Position":485.0,"HyperDash":false},{"StartTime":64989.0,"Position":461.072876,"HyperDash":false},{"StartTime":65048.0,"Position":436.145752,"HyperDash":false},{"StartTime":65107.0,"Position":402.2186,"HyperDash":false},{"StartTime":65202.0,"Position":351.641022,"HyperDash":false}]},{"StartTime":65475.0,"Objects":[{"StartTime":65475.0,"Position":222.0,"HyperDash":false},{"StartTime":65534.0,"Position":184.205688,"HyperDash":false},{"StartTime":65593.0,"Position":161.582535,"HyperDash":false},{"StartTime":65652.0,"Position":155.982361,"HyperDash":false},{"StartTime":65747.0,"Position":104.778061,"HyperDash":false}]},{"StartTime":65884.0,"Objects":[{"StartTime":65884.0,"Position":104.0,"HyperDash":false}]},{"StartTime":66021.0,"Objects":[{"StartTime":66021.0,"Position":16.0,"HyperDash":false},{"StartTime":66157.0,"Position":28.7026157,"HyperDash":false}]},{"StartTime":66225.0,"Objects":[{"StartTime":66225.0,"Position":28.0,"HyperDash":false}]},{"StartTime":66293.0,"Objects":[{"StartTime":66293.0,"Position":28.0,"HyperDash":false}]},{"StartTime":66566.0,"Objects":[{"StartTime":66566.0,"Position":90.0,"HyperDash":false},{"StartTime":66702.0,"Position":76.934906,"HyperDash":false}]},{"StartTime":66839.0,"Objects":[{"StartTime":66839.0,"Position":256.0,"HyperDash":false},{"StartTime":66975.0,"Position":242.9349,"HyperDash":false}]},{"StartTime":67111.0,"Objects":[{"StartTime":67111.0,"Position":186.0,"HyperDash":false}]},{"StartTime":67248.0,"Objects":[{"StartTime":67248.0,"Position":273.0,"HyperDash":false}]},{"StartTime":67316.0,"Objects":[{"StartTime":67316.0,"Position":273.0,"HyperDash":false}]},{"StartTime":67384.0,"Objects":[{"StartTime":67384.0,"Position":273.0,"HyperDash":false},{"StartTime":67520.0,"Position":357.364716,"HyperDash":false}]},{"StartTime":67657.0,"Objects":[{"StartTime":67657.0,"Position":471.0,"HyperDash":false}]},{"StartTime":67793.0,"Objects":[{"StartTime":67793.0,"Position":471.0,"HyperDash":false}]},{"StartTime":67930.0,"Objects":[{"StartTime":67930.0,"Position":392.0,"HyperDash":false},{"StartTime":68066.0,"Position":307.582184,"HyperDash":false}]},{"StartTime":68202.0,"Objects":[{"StartTime":68202.0,"Position":165.0,"HyperDash":false},{"StartTime":68338.0,"Position":178.0651,"HyperDash":false}]},{"StartTime":68475.0,"Objects":[{"StartTime":68475.0,"Position":266.0,"HyperDash":false},{"StartTime":68543.0,"Position":307.8938,"HyperDash":false},{"StartTime":68611.0,"Position":266.0,"HyperDash":false},{"StartTime":68679.0,"Position":307.8938,"HyperDash":false}]},{"StartTime":68748.0,"Objects":[{"StartTime":68748.0,"Position":358.0,"HyperDash":false},{"StartTime":68807.0,"Position":396.968262,"HyperDash":false},{"StartTime":68866.0,"Position":418.199738,"HyperDash":false},{"StartTime":68925.0,"Position":452.599548,"HyperDash":false},{"StartTime":69020.0,"Position":484.638855,"HyperDash":false}]},{"StartTime":69293.0,"Objects":[{"StartTime":69293.0,"Position":447.0,"HyperDash":false},{"StartTime":69352.0,"Position":453.674744,"HyperDash":false},{"StartTime":69411.0,"Position":437.3495,"HyperDash":false},{"StartTime":69470.0,"Position":444.024231,"HyperDash":false},{"StartTime":69565.0,"Position":468.551361,"HyperDash":false}]},{"StartTime":69839.0,"Objects":[{"StartTime":69839.0,"Position":343.0,"HyperDash":false},{"StartTime":69898.0,"Position":329.563446,"HyperDash":false},{"StartTime":69957.0,"Position":311.8805,"HyperDash":false},{"StartTime":70016.0,"Position":271.0514,"HyperDash":false},{"StartTime":70111.0,"Position":243.183487,"HyperDash":false}]},{"StartTime":70248.0,"Objects":[{"StartTime":70248.0,"Position":216.0,"HyperDash":false}]},{"StartTime":70316.0,"Objects":[{"StartTime":70316.0,"Position":216.0,"HyperDash":false}]},{"StartTime":70384.0,"Objects":[{"StartTime":70384.0,"Position":216.0,"HyperDash":false},{"StartTime":70520.0,"Position":154.538864,"HyperDash":false}]},{"StartTime":70657.0,"Objects":[{"StartTime":70657.0,"Position":58.0,"HyperDash":false}]},{"StartTime":70930.0,"Objects":[{"StartTime":70930.0,"Position":58.0,"HyperDash":false},{"StartTime":71066.0,"Position":48.7692032,"HyperDash":false}]},{"StartTime":71202.0,"Objects":[{"StartTime":71202.0,"Position":129.0,"HyperDash":false},{"StartTime":71338.0,"Position":138.2308,"HyperDash":false}]},{"StartTime":71475.0,"Objects":[{"StartTime":71475.0,"Position":132.0,"HyperDash":false}]},{"StartTime":71611.0,"Objects":[{"StartTime":71611.0,"Position":228.0,"HyperDash":false}]},{"StartTime":71680.0,"Objects":[{"StartTime":71680.0,"Position":228.0,"HyperDash":false}]},{"StartTime":71748.0,"Objects":[{"StartTime":71748.0,"Position":228.0,"HyperDash":false},{"StartTime":71884.0,"Position":312.5163,"HyperDash":false}]},{"StartTime":72021.0,"Objects":[{"StartTime":72021.0,"Position":382.0,"HyperDash":false}]},{"StartTime":72089.0,"Objects":[{"StartTime":72089.0,"Position":414.0,"HyperDash":false}]},{"StartTime":72157.0,"Objects":[{"StartTime":72157.0,"Position":448.0,"HyperDash":false}]},{"StartTime":72225.0,"Objects":[{"StartTime":72225.0,"Position":478.0,"HyperDash":false}]},{"StartTime":72293.0,"Objects":[{"StartTime":72293.0,"Position":500.0,"HyperDash":false}]},{"StartTime":72430.0,"Objects":[{"StartTime":72430.0,"Position":453.0,"HyperDash":false}]},{"StartTime":72498.0,"Objects":[{"StartTime":72498.0,"Position":449.0,"HyperDash":false}]},{"StartTime":72566.0,"Objects":[{"StartTime":72566.0,"Position":445.0,"HyperDash":false},{"StartTime":72634.0,"Position":427.8085,"HyperDash":false},{"StartTime":72702.0,"Position":445.0,"HyperDash":false}]},{"StartTime":72839.0,"Objects":[{"StartTime":72839.0,"Position":486.0,"HyperDash":false},{"StartTime":72907.0,"Position":502.9824,"HyperDash":false}]},{"StartTime":72975.0,"Objects":[{"StartTime":72975.0,"Position":414.0,"HyperDash":false},{"StartTime":73043.0,"Position":430.9824,"HyperDash":false}]},{"StartTime":73111.0,"Objects":[{"StartTime":73111.0,"Position":344.0,"HyperDash":false}]},{"StartTime":75293.0,"Objects":[{"StartTime":75293.0,"Position":62.0,"HyperDash":false}]},{"StartTime":76930.0,"Objects":[{"StartTime":76930.0,"Position":403.0,"HyperDash":false},{"StartTime":77020.0,"Position":467.2785,"HyperDash":false},{"StartTime":77111.0,"Position":403.0,"HyperDash":false},{"StartTime":77202.0,"Position":467.2785,"HyperDash":false},{"StartTime":77293.0,"Position":403.0,"HyperDash":false},{"StartTime":77384.0,"Position":467.2785,"HyperDash":false}]},{"StartTime":77475.0,"Objects":[{"StartTime":77475.0,"Position":412.0,"HyperDash":false},{"StartTime":77565.0,"Position":439.85,"HyperDash":false},{"StartTime":77656.0,"Position":412.0,"HyperDash":false}]},{"StartTime":77748.0,"Objects":[{"StartTime":77748.0,"Position":320.0,"HyperDash":false},{"StartTime":77838.0,"Position":313.270081,"HyperDash":false},{"StartTime":77929.0,"Position":320.0,"HyperDash":false}]},{"StartTime":78021.0,"Objects":[{"StartTime":78021.0,"Position":248.0,"HyperDash":false},{"StartTime":78111.0,"Position":275.85,"HyperDash":false},{"StartTime":78202.0,"Position":248.0,"HyperDash":false}]},{"StartTime":78294.0,"Objects":[{"StartTime":78294.0,"Position":156.0,"HyperDash":false},{"StartTime":78384.0,"Position":149.56723,"HyperDash":false},{"StartTime":78475.0,"Position":156.0,"HyperDash":false}]},{"StartTime":78566.0,"Objects":[{"StartTime":78566.0,"Position":97.0,"HyperDash":false}]},{"StartTime":78657.0,"Objects":[{"StartTime":78657.0,"Position":89.0,"HyperDash":false},{"StartTime":78747.0,"Position":22.422142,"HyperDash":false}]},{"StartTime":78839.0,"Objects":[{"StartTime":78839.0,"Position":10.0,"HyperDash":false}]},{"StartTime":78930.0,"Objects":[{"StartTime":78930.0,"Position":52.0,"HyperDash":false}]},{"StartTime":79021.0,"Objects":[{"StartTime":79021.0,"Position":106.0,"HyperDash":false}]},{"StartTime":79111.0,"Objects":[{"StartTime":79111.0,"Position":154.0,"HyperDash":false},{"StartTime":79170.0,"Position":200.598,"HyperDash":false},{"StartTime":79229.0,"Position":235.269073,"HyperDash":false},{"StartTime":79288.0,"Position":279.5065,"HyperDash":false},{"StartTime":79383.0,"Position":258.247284,"HyperDash":false}]},{"StartTime":79657.0,"Objects":[{"StartTime":79657.0,"Position":258.0,"HyperDash":false},{"StartTime":79747.0,"Position":190.279266,"HyperDash":false},{"StartTime":79838.0,"Position":258.0,"HyperDash":false}]},{"StartTime":79930.0,"Objects":[{"StartTime":79930.0,"Position":226.0,"HyperDash":false},{"StartTime":80020.0,"Position":158.966843,"HyperDash":false},{"StartTime":80111.0,"Position":226.0,"HyperDash":false}]},{"StartTime":80202.0,"Objects":[{"StartTime":80202.0,"Position":287.0,"HyperDash":false},{"StartTime":80292.0,"Position":354.0113,"HyperDash":false},{"StartTime":80383.0,"Position":287.0,"HyperDash":false}]},{"StartTime":80475.0,"Objects":[{"StartTime":80475.0,"Position":293.0,"HyperDash":false},{"StartTime":80565.0,"Position":354.718628,"HyperDash":false},{"StartTime":80656.0,"Position":293.0,"HyperDash":false}]},{"StartTime":80748.0,"Objects":[{"StartTime":80748.0,"Position":218.0,"HyperDash":false}]},{"StartTime":80839.0,"Objects":[{"StartTime":80839.0,"Position":209.0,"HyperDash":false},{"StartTime":80929.0,"Position":195.476837,"HyperDash":false}]},{"StartTime":81021.0,"Objects":[{"StartTime":81021.0,"Position":256.0,"HyperDash":false}]},{"StartTime":81111.0,"Objects":[{"StartTime":81111.0,"Position":299.0,"HyperDash":false}]},{"StartTime":81202.0,"Objects":[{"StartTime":81202.0,"Position":352.0,"HyperDash":false}]},{"StartTime":81293.0,"Objects":[{"StartTime":81293.0,"Position":398.0,"HyperDash":false},{"StartTime":81352.0,"Position":388.6871,"HyperDash":false},{"StartTime":81411.0,"Position":437.698456,"HyperDash":false},{"StartTime":81470.0,"Position":430.344421,"HyperDash":false},{"StartTime":81565.0,"Position":462.164764,"HyperDash":false}]},{"StartTime":81839.0,"Objects":[{"StartTime":81839.0,"Position":462.0,"HyperDash":false},{"StartTime":81929.0,"Position":398.4922,"HyperDash":false},{"StartTime":82020.0,"Position":462.0,"HyperDash":false}]},{"StartTime":82111.0,"Objects":[{"StartTime":82111.0,"Position":347.0,"HyperDash":false},{"StartTime":82201.0,"Position":301.8704,"HyperDash":false},{"StartTime":82292.0,"Position":347.0,"HyperDash":false}]},{"StartTime":82384.0,"Objects":[{"StartTime":82384.0,"Position":368.0,"HyperDash":false},{"StartTime":82474.0,"Position":323.2633,"HyperDash":false},{"StartTime":82565.0,"Position":368.0,"HyperDash":false}]},{"StartTime":82657.0,"Objects":[{"StartTime":82657.0,"Position":238.0,"HyperDash":false},{"StartTime":82747.0,"Position":223.616516,"HyperDash":false},{"StartTime":82838.0,"Position":238.0,"HyperDash":false}]},{"StartTime":82930.0,"Objects":[{"StartTime":82930.0,"Position":135.0,"HyperDash":false}]},{"StartTime":83021.0,"Objects":[{"StartTime":83021.0,"Position":139.0,"HyperDash":false},{"StartTime":83111.0,"Position":190.412811,"HyperDash":false}]},{"StartTime":83202.0,"Objects":[{"StartTime":83202.0,"Position":41.0,"HyperDash":false}]},{"StartTime":83293.0,"Objects":[{"StartTime":83293.0,"Position":83.0,"HyperDash":false}]},{"StartTime":83384.0,"Objects":[{"StartTime":83384.0,"Position":103.0,"HyperDash":false}]},{"StartTime":83475.0,"Objects":[{"StartTime":83475.0,"Position":99.0,"HyperDash":false},{"StartTime":83534.0,"Position":103.780617,"HyperDash":false},{"StartTime":83593.0,"Position":126.401306,"HyperDash":false},{"StartTime":83652.0,"Position":141.544952,"HyperDash":false},{"StartTime":83747.0,"Position":219.928558,"HyperDash":false}]},{"StartTime":84021.0,"Objects":[{"StartTime":84021.0,"Position":219.0,"HyperDash":false},{"StartTime":84111.0,"Position":155.1237,"HyperDash":false},{"StartTime":84202.0,"Position":219.0,"HyperDash":false}]},{"StartTime":84293.0,"Objects":[{"StartTime":84293.0,"Position":237.0,"HyperDash":false},{"StartTime":84383.0,"Position":181.530167,"HyperDash":false},{"StartTime":84474.0,"Position":237.0,"HyperDash":false}]},{"StartTime":84566.0,"Objects":[{"StartTime":84566.0,"Position":291.0,"HyperDash":false},{"StartTime":84656.0,"Position":354.876282,"HyperDash":false},{"StartTime":84747.0,"Position":291.0,"HyperDash":false}]},{"StartTime":84839.0,"Objects":[{"StartTime":84839.0,"Position":273.0,"HyperDash":false},{"StartTime":84929.0,"Position":328.1262,"HyperDash":false},{"StartTime":85020.0,"Position":273.0,"HyperDash":false}]},{"StartTime":85111.0,"Objects":[{"StartTime":85111.0,"Position":210.0,"HyperDash":false}]},{"StartTime":85202.0,"Objects":[{"StartTime":85202.0,"Position":199.0,"HyperDash":false},{"StartTime":85292.0,"Position":175.375092,"HyperDash":false}]},{"StartTime":85384.0,"Objects":[{"StartTime":85384.0,"Position":227.0,"HyperDash":false}]},{"StartTime":85475.0,"Objects":[{"StartTime":85475.0,"Position":280.0,"HyperDash":false}]},{"StartTime":85566.0,"Objects":[{"StartTime":85566.0,"Position":326.0,"HyperDash":false}]},{"StartTime":85657.0,"Objects":[{"StartTime":85657.0,"Position":380.0,"HyperDash":false},{"StartTime":85708.0,"Position":410.039581,"HyperDash":false},{"StartTime":85759.0,"Position":454.079163,"HyperDash":false},{"StartTime":85810.0,"Position":496.148,"HyperDash":false},{"StartTime":85861.0,"Position":512.0,"HyperDash":false},{"StartTime":85945.0,"Position":452.8782,"HyperDash":false},{"StartTime":86066.0,"Position":380.0,"HyperDash":false}]},{"StartTime":86202.0,"Objects":[{"StartTime":86202.0,"Position":414.0,"HyperDash":false},{"StartTime":86270.0,"Position":406.751984,"HyperDash":false},{"StartTime":86338.0,"Position":414.0,"HyperDash":false},{"StartTime":86406.0,"Position":406.751984,"HyperDash":false}]},{"StartTime":86475.0,"Objects":[{"StartTime":86475.0,"Position":313.0,"HyperDash":false},{"StartTime":86543.0,"Position":320.248016,"HyperDash":false},{"StartTime":86611.0,"Position":313.0,"HyperDash":false},{"StartTime":86679.0,"Position":320.248016,"HyperDash":false}]},{"StartTime":86748.0,"Objects":[{"StartTime":86748.0,"Position":229.0,"HyperDash":false},{"StartTime":86816.0,"Position":236.248016,"HyperDash":false}]},{"StartTime":86884.0,"Objects":[{"StartTime":86884.0,"Position":140.0,"HyperDash":false},{"StartTime":86952.0,"Position":147.248016,"HyperDash":false}]},{"StartTime":87021.0,"Objects":[{"StartTime":87021.0,"Position":51.0,"HyperDash":false},{"StartTime":87089.0,"Position":58.2480125,"HyperDash":false},{"StartTime":87157.0,"Position":51.0,"HyperDash":false},{"StartTime":87225.0,"Position":58.2480125,"HyperDash":false}]},{"StartTime":87293.0,"Objects":[{"StartTime":87293.0,"Position":41.0,"HyperDash":false},{"StartTime":87361.0,"Position":0.0,"HyperDash":false},{"StartTime":87429.0,"Position":41.0,"HyperDash":false}]},{"StartTime":87566.0,"Objects":[{"StartTime":87566.0,"Position":111.0,"HyperDash":false}]},{"StartTime":87634.0,"Objects":[{"StartTime":87634.0,"Position":119.0,"HyperDash":false}]},{"StartTime":87702.0,"Objects":[{"StartTime":87702.0,"Position":127.0,"HyperDash":false}]},{"StartTime":87839.0,"Objects":[{"StartTime":87839.0,"Position":152.0,"HyperDash":false},{"StartTime":87907.0,"Position":110.122604,"HyperDash":false},{"StartTime":87975.0,"Position":152.0,"HyperDash":false}]},{"StartTime":88112.0,"Objects":[{"StartTime":88112.0,"Position":222.0,"HyperDash":false}]},{"StartTime":88180.0,"Objects":[{"StartTime":88180.0,"Position":230.0,"HyperDash":false}]},{"StartTime":88248.0,"Objects":[{"StartTime":88248.0,"Position":238.0,"HyperDash":false}]},{"StartTime":88384.0,"Objects":[{"StartTime":88384.0,"Position":295.0,"HyperDash":false},{"StartTime":88452.0,"Position":336.8774,"HyperDash":false},{"StartTime":88520.0,"Position":295.0,"HyperDash":false},{"StartTime":88588.0,"Position":336.8774,"HyperDash":false}]},{"StartTime":88657.0,"Objects":[{"StartTime":88657.0,"Position":334.0,"HyperDash":false},{"StartTime":88725.0,"Position":375.8774,"HyperDash":false},{"StartTime":88793.0,"Position":334.0,"HyperDash":false},{"StartTime":88861.0,"Position":375.8774,"HyperDash":false}]},{"StartTime":88930.0,"Objects":[{"StartTime":88930.0,"Position":464.0,"HyperDash":false},{"StartTime":88998.0,"Position":471.248016,"HyperDash":false}]},{"StartTime":89066.0,"Objects":[{"StartTime":89066.0,"Position":449.0,"HyperDash":false},{"StartTime":89134.0,"Position":456.248016,"HyperDash":false}]},{"StartTime":89202.0,"Objects":[{"StartTime":89202.0,"Position":434.0,"HyperDash":false},{"StartTime":89270.0,"Position":441.248016,"HyperDash":false},{"StartTime":89338.0,"Position":434.0,"HyperDash":false},{"StartTime":89406.0,"Position":441.248016,"HyperDash":false}]},{"StartTime":89475.0,"Objects":[{"StartTime":89475.0,"Position":362.0,"HyperDash":false}]},{"StartTime":89543.0,"Objects":[{"StartTime":89543.0,"Position":360.0,"HyperDash":false}]},{"StartTime":89611.0,"Objects":[{"StartTime":89611.0,"Position":358.0,"HyperDash":false}]},{"StartTime":89748.0,"Objects":[{"StartTime":89748.0,"Position":288.0,"HyperDash":false}]},{"StartTime":89816.0,"Objects":[{"StartTime":89816.0,"Position":286.0,"HyperDash":false}]},{"StartTime":89884.0,"Objects":[{"StartTime":89884.0,"Position":284.0,"HyperDash":false}]},{"StartTime":90021.0,"Objects":[{"StartTime":90021.0,"Position":201.0,"HyperDash":false}]},{"StartTime":90089.0,"Objects":[{"StartTime":90089.0,"Position":193.0,"HyperDash":false}]},{"StartTime":90158.0,"Objects":[{"StartTime":90158.0,"Position":185.0,"HyperDash":false},{"StartTime":90294.0,"Position":100.560234,"HyperDash":false}]},{"StartTime":90566.0,"Objects":[{"StartTime":90566.0,"Position":67.0,"HyperDash":false},{"StartTime":90634.0,"Position":25.1226,"HyperDash":false},{"StartTime":90702.0,"Position":67.0,"HyperDash":false},{"StartTime":90770.0,"Position":25.1226,"HyperDash":false}]},{"StartTime":90839.0,"Objects":[{"StartTime":90839.0,"Position":50.0,"HyperDash":false},{"StartTime":90907.0,"Position":8.122601,"HyperDash":false},{"StartTime":90975.0,"Position":50.0,"HyperDash":false},{"StartTime":91043.0,"Position":8.122601,"HyperDash":false}]},{"StartTime":91111.0,"Objects":[{"StartTime":91111.0,"Position":147.0,"HyperDash":false},{"StartTime":91179.0,"Position":139.751984,"HyperDash":false}]},{"StartTime":91247.0,"Objects":[{"StartTime":91247.0,"Position":236.0,"HyperDash":false},{"StartTime":91315.0,"Position":228.751984,"HyperDash":false}]},{"StartTime":91384.0,"Objects":[{"StartTime":91384.0,"Position":325.0,"HyperDash":false},{"StartTime":91452.0,"Position":317.751984,"HyperDash":false},{"StartTime":91520.0,"Position":325.0,"HyperDash":false},{"StartTime":91588.0,"Position":317.751984,"HyperDash":false}]},{"StartTime":91657.0,"Objects":[{"StartTime":91657.0,"Position":257.0,"HyperDash":false},{"StartTime":91725.0,"Position":249.751984,"HyperDash":false},{"StartTime":91793.0,"Position":257.0,"HyperDash":false}]},{"StartTime":91930.0,"Objects":[{"StartTime":91930.0,"Position":154.0,"HyperDash":false}]},{"StartTime":91998.0,"Objects":[{"StartTime":91998.0,"Position":156.0,"HyperDash":false}]},{"StartTime":92066.0,"Objects":[{"StartTime":92066.0,"Position":158.0,"HyperDash":false}]},{"StartTime":92203.0,"Objects":[{"StartTime":92203.0,"Position":231.0,"HyperDash":false},{"StartTime":92271.0,"Position":238.248016,"HyperDash":false},{"StartTime":92339.0,"Position":231.0,"HyperDash":false}]},{"StartTime":92476.0,"Objects":[{"StartTime":92476.0,"Position":327.0,"HyperDash":false}]},{"StartTime":92544.0,"Objects":[{"StartTime":92544.0,"Position":329.0,"HyperDash":false}]},{"StartTime":92612.0,"Objects":[{"StartTime":92612.0,"Position":331.0,"HyperDash":false}]},{"StartTime":92748.0,"Objects":[{"StartTime":92748.0,"Position":431.0,"HyperDash":false},{"StartTime":92816.0,"Position":423.751984,"HyperDash":false},{"StartTime":92884.0,"Position":431.0,"HyperDash":false},{"StartTime":92952.0,"Position":423.751984,"HyperDash":false}]},{"StartTime":93021.0,"Objects":[{"StartTime":93021.0,"Position":503.0,"HyperDash":false},{"StartTime":93089.0,"Position":495.047729,"HyperDash":false},{"StartTime":93157.0,"Position":503.0,"HyperDash":false},{"StartTime":93225.0,"Position":495.047729,"HyperDash":false}]},{"StartTime":93293.0,"Objects":[{"StartTime":93293.0,"Position":457.0,"HyperDash":false},{"StartTime":93361.0,"Position":498.8774,"HyperDash":false}]},{"StartTime":93429.0,"Objects":[{"StartTime":93429.0,"Position":371.0,"HyperDash":false},{"StartTime":93497.0,"Position":412.8774,"HyperDash":false}]},{"StartTime":93566.0,"Objects":[{"StartTime":93566.0,"Position":286.0,"HyperDash":false},{"StartTime":93634.0,"Position":327.8774,"HyperDash":false},{"StartTime":93702.0,"Position":286.0,"HyperDash":false},{"StartTime":93770.0,"Position":327.8774,"HyperDash":false}]},{"StartTime":93839.0,"Objects":[{"StartTime":93839.0,"Position":195.0,"HyperDash":false}]},{"StartTime":93907.0,"Objects":[{"StartTime":93907.0,"Position":193.0,"HyperDash":false}]},{"StartTime":93975.0,"Objects":[{"StartTime":93975.0,"Position":191.0,"HyperDash":false}]},{"StartTime":94112.0,"Objects":[{"StartTime":94112.0,"Position":118.0,"HyperDash":false}]},{"StartTime":94180.0,"Objects":[{"StartTime":94180.0,"Position":120.0,"HyperDash":false}]},{"StartTime":94248.0,"Objects":[{"StartTime":94248.0,"Position":122.0,"HyperDash":false}]},{"StartTime":94385.0,"Objects":[{"StartTime":94385.0,"Position":145.0,"HyperDash":false}]},{"StartTime":94453.0,"Objects":[{"StartTime":94453.0,"Position":143.0,"HyperDash":false}]},{"StartTime":94522.0,"Objects":[{"StartTime":94522.0,"Position":141.0,"HyperDash":false},{"StartTime":94658.0,"Position":150.743042,"HyperDash":false}]},{"StartTime":94930.0,"Objects":[{"StartTime":94930.0,"Position":48.0,"HyperDash":false}]},{"StartTime":94998.0,"Objects":[{"StartTime":94998.0,"Position":41.0,"HyperDash":false}]},{"StartTime":95066.0,"Objects":[{"StartTime":95066.0,"Position":34.0,"HyperDash":false},{"StartTime":95134.0,"Position":75.8533,"HyperDash":false},{"StartTime":95202.0,"Position":34.0,"HyperDash":false},{"StartTime":95270.0,"Position":75.8533,"HyperDash":false}]},{"StartTime":95339.0,"Objects":[{"StartTime":95339.0,"Position":77.0,"HyperDash":false},{"StartTime":95407.0,"Position":118.8533,"HyperDash":false}]},{"StartTime":95475.0,"Objects":[{"StartTime":95475.0,"Position":37.0,"HyperDash":false},{"StartTime":95543.0,"Position":78.8533,"HyperDash":false},{"StartTime":95611.0,"Position":37.0,"HyperDash":false},{"StartTime":95679.0,"Position":78.8533,"HyperDash":false},{"StartTime":95747.0,"Position":37.0,"HyperDash":false},{"StartTime":95815.0,"Position":78.8533,"HyperDash":false},{"StartTime":95884.0,"Position":37.0,"HyperDash":false},{"StartTime":95952.0,"Position":78.8533,"HyperDash":false},{"StartTime":96020.0,"Position":37.0,"HyperDash":false}]},{"StartTime":104748.0,"Objects":[{"StartTime":104748.0,"Position":285.0,"HyperDash":false},{"StartTime":104884.0,"Position":196.3763,"HyperDash":false}]},{"StartTime":105020.0,"Objects":[{"StartTime":105020.0,"Position":372.0,"HyperDash":false},{"StartTime":105156.0,"Position":460.110962,"HyperDash":false}]},{"StartTime":105293.0,"Objects":[{"StartTime":105293.0,"Position":483.0,"HyperDash":false},{"StartTime":105429.0,"Position":506.840118,"HyperDash":false}]},{"StartTime":105566.0,"Objects":[{"StartTime":105566.0,"Position":381.0,"HyperDash":false},{"StartTime":105702.0,"Position":403.863068,"HyperDash":false}]},{"StartTime":105839.0,"Objects":[{"StartTime":105839.0,"Position":336.0,"HyperDash":false},{"StartTime":105975.0,"Position":236.595367,"HyperDash":false}]},{"StartTime":106111.0,"Objects":[{"StartTime":106111.0,"Position":190.0,"HyperDash":false}]},{"StartTime":106248.0,"Objects":[{"StartTime":106248.0,"Position":190.0,"HyperDash":false}]},{"StartTime":106384.0,"Objects":[{"StartTime":106384.0,"Position":66.0,"HyperDash":false},{"StartTime":106520.0,"Position":50.64902,"HyperDash":false}]},{"StartTime":106657.0,"Objects":[{"StartTime":106657.0,"Position":160.0,"HyperDash":false},{"StartTime":106793.0,"Position":256.028931,"HyperDash":false}]},{"StartTime":106929.0,"Objects":[{"StartTime":106929.0,"Position":419.0,"HyperDash":false},{"StartTime":107065.0,"Position":411.1793,"HyperDash":false}]},{"StartTime":107202.0,"Objects":[{"StartTime":107202.0,"Position":350.0,"HyperDash":false},{"StartTime":107338.0,"Position":437.371735,"HyperDash":false}]},{"StartTime":107475.0,"Objects":[{"StartTime":107475.0,"Position":500.0,"HyperDash":false}]},{"StartTime":107611.0,"Objects":[{"StartTime":107611.0,"Position":387.0,"HyperDash":false}]},{"StartTime":107679.0,"Objects":[{"StartTime":107679.0,"Position":387.0,"HyperDash":false}]},{"StartTime":107748.0,"Objects":[{"StartTime":107748.0,"Position":387.0,"HyperDash":false},{"StartTime":107884.0,"Position":286.101257,"HyperDash":false}]},{"StartTime":108020.0,"Objects":[{"StartTime":108020.0,"Position":126.0,"HyperDash":false}]},{"StartTime":108156.0,"Objects":[{"StartTime":108156.0,"Position":139.0,"HyperDash":false}]},{"StartTime":108293.0,"Objects":[{"StartTime":108293.0,"Position":213.0,"HyperDash":false}]},{"StartTime":108429.0,"Objects":[{"StartTime":108429.0,"Position":301.0,"HyperDash":false}]},{"StartTime":108566.0,"Objects":[{"StartTime":108566.0,"Position":267.0,"HyperDash":false},{"StartTime":108625.0,"Position":232.172058,"HyperDash":false},{"StartTime":108684.0,"Position":191.248871,"HyperDash":false},{"StartTime":108743.0,"Position":129.18779,"HyperDash":false},{"StartTime":108838.0,"Position":67.07219,"HyperDash":false}]},{"StartTime":108975.0,"Objects":[{"StartTime":108975.0,"Position":55.0,"HyperDash":false}]},{"StartTime":109043.0,"Objects":[{"StartTime":109043.0,"Position":44.0,"HyperDash":false}]},{"StartTime":109111.0,"Objects":[{"StartTime":109111.0,"Position":35.0,"HyperDash":false},{"StartTime":109247.0,"Position":134.610657,"HyperDash":false}]},{"StartTime":109384.0,"Objects":[{"StartTime":109384.0,"Position":279.0,"HyperDash":false},{"StartTime":109520.0,"Position":378.779877,"HyperDash":false}]},{"StartTime":109657.0,"Objects":[{"StartTime":109657.0,"Position":474.0,"HyperDash":false},{"StartTime":109793.0,"Position":414.009949,"HyperDash":false}]},{"StartTime":109929.0,"Objects":[{"StartTime":109929.0,"Position":357.0,"HyperDash":false},{"StartTime":110065.0,"Position":448.250183,"HyperDash":false}]},{"StartTime":110202.0,"Objects":[{"StartTime":110202.0,"Position":499.0,"HyperDash":false},{"StartTime":110338.0,"Position":409.002472,"HyperDash":false}]},{"StartTime":110475.0,"Objects":[{"StartTime":110475.0,"Position":280.0,"HyperDash":false}]},{"StartTime":110611.0,"Objects":[{"StartTime":110611.0,"Position":280.0,"HyperDash":false}]},{"StartTime":110748.0,"Objects":[{"StartTime":110748.0,"Position":357.0,"HyperDash":false},{"StartTime":110884.0,"Position":344.34845,"HyperDash":false}]},{"StartTime":111020.0,"Objects":[{"StartTime":111020.0,"Position":209.0,"HyperDash":false},{"StartTime":111156.0,"Position":196.34845,"HyperDash":false}]},{"StartTime":111293.0,"Objects":[{"StartTime":111293.0,"Position":65.0,"HyperDash":false},{"StartTime":111429.0,"Position":148.923523,"HyperDash":false}]},{"StartTime":111566.0,"Objects":[{"StartTime":111566.0,"Position":80.0,"HyperDash":false},{"StartTime":111702.0,"Position":78.81489,"HyperDash":false}]},{"StartTime":111839.0,"Objects":[{"StartTime":111839.0,"Position":148.0,"HyperDash":false}]},{"StartTime":111975.0,"Objects":[{"StartTime":111975.0,"Position":269.0,"HyperDash":false}]},{"StartTime":112043.0,"Objects":[{"StartTime":112043.0,"Position":269.0,"HyperDash":false}]},{"StartTime":112111.0,"Objects":[{"StartTime":112111.0,"Position":269.0,"HyperDash":false},{"StartTime":112247.0,"Position":369.6811,"HyperDash":false}]},{"StartTime":112384.0,"Objects":[{"StartTime":112384.0,"Position":369.0,"HyperDash":false}]},{"StartTime":112452.0,"Objects":[{"StartTime":112452.0,"Position":410.0,"HyperDash":false}]},{"StartTime":112520.0,"Objects":[{"StartTime":112520.0,"Position":450.0,"HyperDash":false}]},{"StartTime":112588.0,"Objects":[{"StartTime":112588.0,"Position":478.0,"HyperDash":false}]},{"StartTime":112656.0,"Objects":[{"StartTime":112656.0,"Position":487.0,"HyperDash":false}]},{"StartTime":112793.0,"Objects":[{"StartTime":112793.0,"Position":413.0,"HyperDash":false}]},{"StartTime":112861.0,"Objects":[{"StartTime":112861.0,"Position":371.0,"HyperDash":false}]},{"StartTime":112929.0,"Objects":[{"StartTime":112929.0,"Position":329.0,"HyperDash":false}]},{"StartTime":113066.0,"Objects":[{"StartTime":113066.0,"Position":259.0,"HyperDash":false},{"StartTime":113134.0,"Position":208.630585,"HyperDash":false},{"StartTime":113202.0,"Position":259.0,"HyperDash":false},{"StartTime":113270.0,"Position":208.630585,"HyperDash":false},{"StartTime":113338.0,"Position":259.0,"HyperDash":false},{"StartTime":113406.0,"Position":208.630585,"HyperDash":false},{"StartTime":113475.0,"Position":259.0,"HyperDash":false}]},{"StartTime":117839.0,"Objects":[{"StartTime":117839.0,"Position":352.0,"HyperDash":false},{"StartTime":117907.0,"Position":367.7046,"HyperDash":false},{"StartTime":117975.0,"Position":377.8776,"HyperDash":false},{"StartTime":118043.0,"Position":353.339722,"HyperDash":false},{"StartTime":118111.0,"Position":341.5588,"HyperDash":false},{"StartTime":118170.0,"Position":357.394043,"HyperDash":false},{"StartTime":118229.0,"Position":351.709229,"HyperDash":false},{"StartTime":118288.0,"Position":368.7251,"HyperDash":false},{"StartTime":118384.0,"Position":352.0,"HyperDash":false}]},{"StartTime":118521.0,"Objects":[{"StartTime":118521.0,"Position":435.0,"HyperDash":false}]},{"StartTime":118657.0,"Objects":[{"StartTime":118657.0,"Position":435.0,"HyperDash":false},{"StartTime":118716.0,"Position":424.944855,"HyperDash":false},{"StartTime":118775.0,"Position":373.775269,"HyperDash":false},{"StartTime":118834.0,"Position":349.8368,"HyperDash":false},{"StartTime":118929.0,"Position":316.293427,"HyperDash":false}]},{"StartTime":119203.0,"Objects":[{"StartTime":119203.0,"Position":353.0,"HyperDash":false}]},{"StartTime":119339.0,"Objects":[{"StartTime":119339.0,"Position":353.0,"HyperDash":false},{"StartTime":119398.0,"Position":364.062378,"HyperDash":false},{"StartTime":119457.0,"Position":397.124756,"HyperDash":false},{"StartTime":119516.0,"Position":439.1871,"HyperDash":false},{"StartTime":119611.0,"Position":486.982452,"HyperDash":true}]},{"StartTime":119748.0,"Objects":[{"StartTime":119748.0,"Position":273.0,"HyperDash":false}]},{"StartTime":120021.0,"Objects":[{"StartTime":120021.0,"Position":90.0,"HyperDash":false},{"StartTime":120089.0,"Position":108.62011,"HyperDash":false},{"StartTime":120157.0,"Position":95.3407,"HyperDash":false},{"StartTime":120225.0,"Position":76.87965,"HyperDash":false},{"StartTime":120293.0,"Position":40.5374374,"HyperDash":false},{"StartTime":120352.0,"Position":60.58837,"HyperDash":false},{"StartTime":120411.0,"Position":96.3111343,"HyperDash":false},{"StartTime":120470.0,"Position":80.33538,"HyperDash":false},{"StartTime":120566.0,"Position":90.0,"HyperDash":false}]},{"StartTime":120703.0,"Objects":[{"StartTime":120703.0,"Position":128.0,"HyperDash":false}]},{"StartTime":120839.0,"Objects":[{"StartTime":120839.0,"Position":128.0,"HyperDash":false},{"StartTime":120975.0,"Position":68.21395,"HyperDash":false}]},{"StartTime":121112.0,"Objects":[{"StartTime":121112.0,"Position":14.0,"HyperDash":false},{"StartTime":121180.0,"Position":34.0660934,"HyperDash":false},{"StartTime":121248.0,"Position":24.13219,"HyperDash":false},{"StartTime":121384.0,"Position":14.0,"HyperDash":false}]},{"StartTime":121521.0,"Objects":[{"StartTime":121521.0,"Position":68.0,"HyperDash":false},{"StartTime":121580.0,"Position":75.36682,"HyperDash":false},{"StartTime":121639.0,"Position":102.431969,"HyperDash":false},{"StartTime":121698.0,"Position":145.603821,"HyperDash":false},{"StartTime":121793.0,"Position":188.698318,"HyperDash":false}]},{"StartTime":121930.0,"Objects":[{"StartTime":121930.0,"Position":267.0,"HyperDash":false}]},{"StartTime":122202.0,"Objects":[{"StartTime":122202.0,"Position":267.0,"HyperDash":false},{"StartTime":122261.0,"Position":230.862274,"HyperDash":false},{"StartTime":122320.0,"Position":245.4149,"HyperDash":false},{"StartTime":122379.0,"Position":216.465454,"HyperDash":false},{"StartTime":122474.0,"Position":252.568588,"HyperDash":false}]},{"StartTime":122611.0,"Objects":[{"StartTime":122611.0,"Position":252.0,"HyperDash":false},{"StartTime":122670.0,"Position":237.2295,"HyperDash":false},{"StartTime":122729.0,"Position":198.886948,"HyperDash":false},{"StartTime":122788.0,"Position":171.432022,"HyperDash":false},{"StartTime":122883.0,"Position":120.432274,"HyperDash":false}]},{"StartTime":123021.0,"Objects":[{"StartTime":123021.0,"Position":58.0,"HyperDash":false},{"StartTime":123157.0,"Position":78.36528,"HyperDash":false}]},{"StartTime":123293.0,"Objects":[{"StartTime":123293.0,"Position":6.0,"HyperDash":false},{"StartTime":123429.0,"Position":88.6607361,"HyperDash":false}]},{"StartTime":123566.0,"Objects":[{"StartTime":123566.0,"Position":156.0,"HyperDash":false},{"StartTime":123702.0,"Position":224.188141,"HyperDash":false}]},{"StartTime":123839.0,"Objects":[{"StartTime":123839.0,"Position":349.0,"HyperDash":false}]},{"StartTime":123975.0,"Objects":[{"StartTime":123975.0,"Position":375.0,"HyperDash":false}]},{"StartTime":124111.0,"Objects":[{"StartTime":124111.0,"Position":456.0,"HyperDash":false},{"StartTime":124195.0,"Position":453.9612,"HyperDash":false},{"StartTime":124315.0,"Position":470.4772,"HyperDash":false}]},{"StartTime":124384.0,"Objects":[{"StartTime":124384.0,"Position":498.0,"HyperDash":false},{"StartTime":124443.0,"Position":452.638641,"HyperDash":false},{"StartTime":124502.0,"Position":424.858124,"HyperDash":false},{"StartTime":124561.0,"Position":402.805267,"HyperDash":false},{"StartTime":124656.0,"Position":400.806458,"HyperDash":false}]},{"StartTime":124793.0,"Objects":[{"StartTime":124793.0,"Position":400.0,"HyperDash":false}]},{"StartTime":124930.0,"Objects":[{"StartTime":124930.0,"Position":320.0,"HyperDash":false},{"StartTime":125020.0,"Position":265.6432,"HyperDash":false},{"StartTime":125111.0,"Position":320.0,"HyperDash":false}]},{"StartTime":125202.0,"Objects":[{"StartTime":125202.0,"Position":226.0,"HyperDash":false},{"StartTime":125292.0,"Position":184.534943,"HyperDash":false},{"StartTime":125383.0,"Position":226.0,"HyperDash":false}]},{"StartTime":125475.0,"Objects":[{"StartTime":125475.0,"Position":165.0,"HyperDash":false},{"StartTime":125565.0,"Position":148.008514,"HyperDash":false},{"StartTime":125656.0,"Position":165.0,"HyperDash":false}]},{"StartTime":125748.0,"Objects":[{"StartTime":125748.0,"Position":64.0,"HyperDash":false},{"StartTime":125838.0,"Position":76.2514648,"HyperDash":false},{"StartTime":125929.0,"Position":64.0,"HyperDash":false}]},{"StartTime":126021.0,"Objects":[{"StartTime":126021.0,"Position":98.0,"HyperDash":false},{"StartTime":126111.0,"Position":42.3349533,"HyperDash":false},{"StartTime":126202.0,"Position":98.0,"HyperDash":false}]},{"StartTime":126293.0,"Objects":[{"StartTime":126293.0,"Position":168.0,"HyperDash":false}]},{"StartTime":126384.0,"Objects":[{"StartTime":126384.0,"Position":176.0,"HyperDash":false},{"StartTime":126474.0,"Position":231.724014,"HyperDash":false}]},{"StartTime":126566.0,"Objects":[{"StartTime":126566.0,"Position":294.0,"HyperDash":false},{"StartTime":126625.0,"Position":304.065277,"HyperDash":false},{"StartTime":126684.0,"Position":289.130554,"HyperDash":false},{"StartTime":126743.0,"Position":270.195831,"HyperDash":false},{"StartTime":126838.0,"Position":275.86026,"HyperDash":false}]},{"StartTime":126975.0,"Objects":[{"StartTime":126975.0,"Position":269.0,"HyperDash":false},{"StartTime":127034.0,"Position":238.030014,"HyperDash":false},{"StartTime":127093.0,"Position":206.798035,"HyperDash":false},{"StartTime":127152.0,"Position":183.373825,"HyperDash":false},{"StartTime":127247.0,"Position":128.954315,"HyperDash":false}]},{"StartTime":127384.0,"Objects":[{"StartTime":127384.0,"Position":128.0,"HyperDash":false},{"StartTime":127443.0,"Position":104.877335,"HyperDash":false},{"StartTime":127502.0,"Position":66.8338852,"HyperDash":false},{"StartTime":127561.0,"Position":81.92623,"HyperDash":false},{"StartTime":127656.0,"Position":101.414925,"HyperDash":false}]},{"StartTime":127930.0,"Objects":[{"StartTime":127930.0,"Position":102.0,"HyperDash":false},{"StartTime":128066.0,"Position":185.98468,"HyperDash":false}]},{"StartTime":128202.0,"Objects":[{"StartTime":128202.0,"Position":268.0,"HyperDash":false},{"StartTime":128338.0,"Position":276.750061,"HyperDash":false}]},{"StartTime":128475.0,"Objects":[{"StartTime":128475.0,"Position":220.0,"HyperDash":false}]},{"StartTime":128611.0,"Objects":[{"StartTime":128611.0,"Position":246.0,"HyperDash":false}]},{"StartTime":128748.0,"Objects":[{"StartTime":128748.0,"Position":272.0,"HyperDash":false},{"StartTime":128838.0,"Position":259.471741,"HyperDash":false},{"StartTime":128929.0,"Position":272.0,"HyperDash":false}]},{"StartTime":129021.0,"Objects":[{"StartTime":129021.0,"Position":341.0,"HyperDash":false},{"StartTime":129111.0,"Position":356.802368,"HyperDash":false},{"StartTime":129202.0,"Position":341.0,"HyperDash":false}]},{"StartTime":129293.0,"Objects":[{"StartTime":129293.0,"Position":374.0,"HyperDash":false},{"StartTime":129383.0,"Position":414.349274,"HyperDash":false},{"StartTime":129474.0,"Position":374.0,"HyperDash":false}]},{"StartTime":129566.0,"Objects":[{"StartTime":129566.0,"Position":363.0,"HyperDash":false},{"StartTime":129656.0,"Position":417.3568,"HyperDash":false},{"StartTime":129747.0,"Position":363.0,"HyperDash":false}]},{"StartTime":129839.0,"Objects":[{"StartTime":129839.0,"Position":399.0,"HyperDash":false}]},{"StartTime":129930.0,"Objects":[{"StartTime":129930.0,"Position":363.0,"HyperDash":false}]},{"StartTime":130021.0,"Objects":[{"StartTime":130021.0,"Position":319.0,"HyperDash":false}]},{"StartTime":130111.0,"Objects":[{"StartTime":130111.0,"Position":274.0,"HyperDash":false}]},{"StartTime":130202.0,"Objects":[{"StartTime":130202.0,"Position":233.0,"HyperDash":false}]},{"StartTime":130293.0,"Objects":[{"StartTime":130293.0,"Position":188.0,"HyperDash":false}]},{"StartTime":130384.0,"Objects":[{"StartTime":130384.0,"Position":144.0,"HyperDash":false},{"StartTime":130443.0,"Position":136.688782,"HyperDash":false},{"StartTime":130502.0,"Position":118.278656,"HyperDash":false},{"StartTime":130561.0,"Position":153.723068,"HyperDash":false},{"StartTime":130656.0,"Position":190.433411,"HyperDash":false}]},{"StartTime":130793.0,"Objects":[{"StartTime":130793.0,"Position":282.0,"HyperDash":false}]},{"StartTime":130861.0,"Objects":[{"StartTime":130861.0,"Position":282.0,"HyperDash":false}]},{"StartTime":130930.0,"Objects":[{"StartTime":130930.0,"Position":282.0,"HyperDash":false},{"StartTime":130989.0,"Position":284.273651,"HyperDash":false},{"StartTime":131048.0,"Position":293.547333,"HyperDash":false},{"StartTime":131107.0,"Position":301.820984,"HyperDash":false},{"StartTime":131202.0,"Position":264.598328,"HyperDash":false}]},{"StartTime":131339.0,"Objects":[{"StartTime":131339.0,"Position":264.0,"HyperDash":false},{"StartTime":131398.0,"Position":248.803833,"HyperDash":false},{"StartTime":131457.0,"Position":204.483932,"HyperDash":false},{"StartTime":131516.0,"Position":177.141281,"HyperDash":false},{"StartTime":131611.0,"Position":107.439949,"HyperDash":false}]},{"StartTime":131748.0,"Objects":[{"StartTime":131748.0,"Position":107.0,"HyperDash":false},{"StartTime":131884.0,"Position":136.185135,"HyperDash":false}]},{"StartTime":132021.0,"Objects":[{"StartTime":132021.0,"Position":88.0,"HyperDash":false},{"StartTime":132080.0,"Position":51.873764,"HyperDash":false},{"StartTime":132139.0,"Position":55.46241,"HyperDash":false},{"StartTime":132198.0,"Position":72.92975,"HyperDash":false},{"StartTime":132293.0,"Position":100.14119,"HyperDash":false}]},{"StartTime":132430.0,"Objects":[{"StartTime":132430.0,"Position":100.0,"HyperDash":false},{"StartTime":132489.0,"Position":75.71915,"HyperDash":false},{"StartTime":132548.0,"Position":18.4710484,"HyperDash":false},{"StartTime":132607.0,"Position":27.815239,"HyperDash":false},{"StartTime":132702.0,"Position":100.250526,"HyperDash":false}]},{"StartTime":132839.0,"Objects":[{"StartTime":132839.0,"Position":100.0,"HyperDash":false},{"StartTime":132975.0,"Position":179.952286,"HyperDash":false}]},{"StartTime":133111.0,"Objects":[{"StartTime":133111.0,"Position":246.0,"HyperDash":false},{"StartTime":133247.0,"Position":327.362976,"HyperDash":false}]},{"StartTime":133384.0,"Objects":[{"StartTime":133384.0,"Position":390.0,"HyperDash":false}]},{"StartTime":133521.0,"Objects":[{"StartTime":133521.0,"Position":472.0,"HyperDash":false}]},{"StartTime":133657.0,"Objects":[{"StartTime":133657.0,"Position":491.0,"HyperDash":false}]},{"StartTime":133793.0,"Objects":[{"StartTime":133793.0,"Position":439.0,"HyperDash":false}]},{"StartTime":133930.0,"Objects":[{"StartTime":133930.0,"Position":420.0,"HyperDash":false}]},{"StartTime":134066.0,"Objects":[{"StartTime":134066.0,"Position":461.0,"HyperDash":false}]},{"StartTime":134202.0,"Objects":[{"StartTime":134202.0,"Position":448.0,"HyperDash":false}]},{"StartTime":134339.0,"Objects":[{"StartTime":134339.0,"Position":381.0,"HyperDash":false}]},{"StartTime":134475.0,"Objects":[{"StartTime":134475.0,"Position":296.0,"HyperDash":false}]},{"StartTime":134611.0,"Objects":[{"StartTime":134611.0,"Position":214.0,"HyperDash":false}]},{"StartTime":134748.0,"Objects":[{"StartTime":134748.0,"Position":164.0,"HyperDash":false},{"StartTime":134884.0,"Position":83.35544,"HyperDash":false}]},{"StartTime":135021.0,"Objects":[{"StartTime":135021.0,"Position":19.0,"HyperDash":false},{"StartTime":135157.0,"Position":99.57382,"HyperDash":false}]},{"StartTime":135293.0,"Objects":[{"StartTime":135293.0,"Position":25.0,"HyperDash":false},{"StartTime":135352.0,"Position":41.8271523,"HyperDash":false},{"StartTime":135411.0,"Position":95.72167,"HyperDash":false},{"StartTime":135470.0,"Position":108.490532,"HyperDash":false},{"StartTime":135565.0,"Position":179.471237,"HyperDash":false}]},{"StartTime":135702.0,"Objects":[{"StartTime":135702.0,"Position":252.0,"HyperDash":false}]},{"StartTime":135839.0,"Objects":[{"StartTime":135839.0,"Position":252.0,"HyperDash":false},{"StartTime":135975.0,"Position":241.337753,"HyperDash":false}]},{"StartTime":136111.0,"Objects":[{"StartTime":136111.0,"Position":175.0,"HyperDash":false},{"StartTime":136247.0,"Position":185.662247,"HyperDash":false}]},{"StartTime":136384.0,"Objects":[{"StartTime":136384.0,"Position":138.0,"HyperDash":false}]},{"StartTime":136521.0,"Objects":[{"StartTime":136521.0,"Position":194.0,"HyperDash":false}]},{"StartTime":136657.0,"Objects":[{"StartTime":136657.0,"Position":278.0,"HyperDash":false}]},{"StartTime":136793.0,"Objects":[{"StartTime":136793.0,"Position":360.0,"HyperDash":false}]},{"StartTime":136930.0,"Objects":[{"StartTime":136930.0,"Position":407.0,"HyperDash":false}]},{"StartTime":137066.0,"Objects":[{"StartTime":137066.0,"Position":447.0,"HyperDash":false}]},{"StartTime":137202.0,"Objects":[{"StartTime":137202.0,"Position":367.0,"HyperDash":false}]},{"StartTime":137338.0,"Objects":[{"StartTime":137338.0,"Position":407.0,"HyperDash":false}]},{"StartTime":137475.0,"Objects":[{"StartTime":137475.0,"Position":280.0,"HyperDash":false}]},{"StartTime":137611.0,"Objects":[{"StartTime":137611.0,"Position":194.0,"HyperDash":false}]},{"StartTime":137748.0,"Objects":[{"StartTime":137748.0,"Position":207.0,"HyperDash":false}]},{"StartTime":137884.0,"Objects":[{"StartTime":137884.0,"Position":293.0,"HyperDash":false}]},{"StartTime":138021.0,"Objects":[{"StartTime":138021.0,"Position":198.0,"HyperDash":false},{"StartTime":138080.0,"Position":186.6536,"HyperDash":false},{"StartTime":138139.0,"Position":165.980225,"HyperDash":false},{"StartTime":138198.0,"Position":108.5129,"HyperDash":false},{"StartTime":138293.0,"Position":60.4876747,"HyperDash":false}]},{"StartTime":138566.0,"Objects":[{"StartTime":138566.0,"Position":20.0,"HyperDash":false}]},{"StartTime":138657.0,"Objects":[{"StartTime":138657.0,"Position":67.0,"HyperDash":false}]},{"StartTime":138748.0,"Objects":[{"StartTime":138748.0,"Position":122.0,"HyperDash":false}]},{"StartTime":138839.0,"Objects":[{"StartTime":138839.0,"Position":178.0,"HyperDash":false}]},{"StartTime":138930.0,"Objects":[{"StartTime":138930.0,"Position":221.0,"HyperDash":false}]},{"StartTime":139021.0,"Objects":[{"StartTime":139021.0,"Position":244.0,"HyperDash":false}]},{"StartTime":139111.0,"Objects":[{"StartTime":139111.0,"Position":248.0,"HyperDash":false},{"StartTime":139201.0,"Position":233.246613,"HyperDash":false},{"StartTime":139292.0,"Position":248.0,"HyperDash":false}]},{"StartTime":139384.0,"Objects":[{"StartTime":139384.0,"Position":327.0,"HyperDash":false},{"StartTime":139468.0,"Position":372.042328,"HyperDash":false},{"StartTime":139588.0,"Position":453.388519,"HyperDash":false}]},{"StartTime":139657.0,"Objects":[{"StartTime":139657.0,"Position":489.0,"HyperDash":false},{"StartTime":139716.0,"Position":500.969269,"HyperDash":false},{"StartTime":139775.0,"Position":484.081482,"HyperDash":false},{"StartTime":139834.0,"Position":452.1301,"HyperDash":false},{"StartTime":139929.0,"Position":387.50766,"HyperDash":false}]},{"StartTime":140066.0,"Objects":[{"StartTime":140066.0,"Position":311.0,"HyperDash":false},{"StartTime":140125.0,"Position":300.9206,"HyperDash":false},{"StartTime":140184.0,"Position":285.442963,"HyperDash":false},{"StartTime":140243.0,"Position":239.63205,"HyperDash":false},{"StartTime":140338.0,"Position":189.411591,"HyperDash":false}]},{"StartTime":140475.0,"Objects":[{"StartTime":140475.0,"Position":118.0,"HyperDash":false},{"StartTime":140611.0,"Position":39.25152,"HyperDash":false}]},{"StartTime":140748.0,"Objects":[{"StartTime":140748.0,"Position":13.0,"HyperDash":false}]},{"StartTime":140884.0,"Objects":[{"StartTime":140884.0,"Position":93.0,"HyperDash":false}]},{"StartTime":141021.0,"Objects":[{"StartTime":141021.0,"Position":30.0,"HyperDash":false}]},{"StartTime":141157.0,"Objects":[{"StartTime":141157.0,"Position":91.0,"HyperDash":false},{"StartTime":141216.0,"Position":120.467026,"HyperDash":false},{"StartTime":141275.0,"Position":182.934052,"HyperDash":false},{"StartTime":141334.0,"Position":189.6184,"HyperDash":false},{"StartTime":141429.0,"Position":253.543488,"HyperDash":false}]},{"StartTime":141566.0,"Objects":[{"StartTime":141566.0,"Position":253.0,"HyperDash":false},{"StartTime":141702.0,"Position":252.173325,"HyperDash":false}]},{"StartTime":141839.0,"Objects":[{"StartTime":141839.0,"Position":302.0,"HyperDash":false},{"StartTime":141898.0,"Position":271.164337,"HyperDash":false},{"StartTime":141957.0,"Position":265.036316,"HyperDash":false},{"StartTime":142016.0,"Position":225.854385,"HyperDash":false},{"StartTime":142111.0,"Position":258.0618,"HyperDash":false}]},{"StartTime":142248.0,"Objects":[{"StartTime":142248.0,"Position":329.0,"HyperDash":false}]},{"StartTime":142384.0,"Objects":[{"StartTime":142384.0,"Position":401.0,"HyperDash":false},{"StartTime":142474.0,"Position":456.101929,"HyperDash":false},{"StartTime":142565.0,"Position":401.0,"HyperDash":false}]},{"StartTime":142657.0,"Objects":[{"StartTime":142657.0,"Position":430.0,"HyperDash":false},{"StartTime":142747.0,"Position":485.101929,"HyperDash":false},{"StartTime":142838.0,"Position":430.0,"HyperDash":false}]},{"StartTime":142930.0,"Objects":[{"StartTime":142930.0,"Position":474.0,"HyperDash":false}]},{"StartTime":143020.0,"Objects":[{"StartTime":143020.0,"Position":433.0,"HyperDash":false}]},{"StartTime":143111.0,"Objects":[{"StartTime":143111.0,"Position":389.0,"HyperDash":false}]},{"StartTime":143202.0,"Objects":[{"StartTime":143202.0,"Position":356.0,"HyperDash":false}]},{"StartTime":143293.0,"Objects":[{"StartTime":143293.0,"Position":347.0,"HyperDash":false}]},{"StartTime":143384.0,"Objects":[{"StartTime":143384.0,"Position":363.0,"HyperDash":false}]},{"StartTime":143475.0,"Objects":[{"StartTime":143475.0,"Position":403.0,"HyperDash":false},{"StartTime":143565.0,"Position":458.0956,"HyperDash":false}]},{"StartTime":143657.0,"Objects":[{"StartTime":143657.0,"Position":315.0,"HyperDash":false}]},{"StartTime":143748.0,"Objects":[{"StartTime":143748.0,"Position":303.0,"HyperDash":false},{"StartTime":143838.0,"Position":247.904388,"HyperDash":false}]},{"StartTime":143930.0,"Objects":[{"StartTime":143930.0,"Position":152.0,"HyperDash":false}]},{"StartTime":144021.0,"Objects":[{"StartTime":144021.0,"Position":140.0,"HyperDash":false},{"StartTime":144080.0,"Position":123.703255,"HyperDash":false},{"StartTime":144139.0,"Position":84.1756058,"HyperDash":false},{"StartTime":144198.0,"Position":55.1062,"HyperDash":false},{"StartTime":144293.0,"Position":34.28666,"HyperDash":false}]},{"StartTime":144430.0,"Objects":[{"StartTime":144430.0,"Position":34.0,"HyperDash":false},{"StartTime":144489.0,"Position":39.2494774,"HyperDash":false},{"StartTime":144548.0,"Position":42.4028931,"HyperDash":false},{"StartTime":144607.0,"Position":83.5909,"HyperDash":false},{"StartTime":144702.0,"Position":124.747566,"HyperDash":false}]},{"StartTime":144839.0,"Objects":[{"StartTime":144839.0,"Position":151.0,"HyperDash":false}]},{"StartTime":144975.0,"Objects":[{"StartTime":144975.0,"Position":151.0,"HyperDash":false}]},{"StartTime":145111.0,"Objects":[{"StartTime":145111.0,"Position":91.0,"HyperDash":false},{"StartTime":145247.0,"Position":6.988411,"HyperDash":false}]},{"StartTime":145384.0,"Objects":[{"StartTime":145384.0,"Position":124.0,"HyperDash":false},{"StartTime":145520.0,"Position":208.0116,"HyperDash":false}]},{"StartTime":145657.0,"Objects":[{"StartTime":145657.0,"Position":284.0,"HyperDash":false}]},{"StartTime":145793.0,"Objects":[{"StartTime":145793.0,"Position":330.0,"HyperDash":false}]},{"StartTime":145930.0,"Objects":[{"StartTime":145930.0,"Position":412.0,"HyperDash":false}]},{"StartTime":146066.0,"Objects":[{"StartTime":146066.0,"Position":494.0,"HyperDash":false}]},{"StartTime":146202.0,"Objects":[{"StartTime":146202.0,"Position":422.0,"HyperDash":false},{"StartTime":146261.0,"Position":374.5958,"HyperDash":false},{"StartTime":146320.0,"Position":340.97818,"HyperDash":false},{"StartTime":146379.0,"Position":321.774567,"HyperDash":false},{"StartTime":146474.0,"Position":273.590363,"HyperDash":false}]},{"StartTime":146611.0,"Objects":[{"StartTime":146611.0,"Position":273.0,"HyperDash":false}]},{"StartTime":146748.0,"Objects":[{"StartTime":146748.0,"Position":242.0,"HyperDash":false},{"StartTime":146884.0,"Position":179.186676,"HyperDash":false}]},{"StartTime":147021.0,"Objects":[{"StartTime":147021.0,"Position":33.0,"HyperDash":false},{"StartTime":147157.0,"Position":95.18677,"HyperDash":false}]},{"StartTime":147293.0,"Objects":[{"StartTime":147293.0,"Position":120.0,"HyperDash":false},{"StartTime":147383.0,"Position":174.276825,"HyperDash":false},{"StartTime":147474.0,"Position":120.0,"HyperDash":false}]},{"StartTime":147566.0,"Objects":[{"StartTime":147566.0,"Position":83.0,"HyperDash":false},{"StartTime":147702.0,"Position":0.0,"HyperDash":false}]},{"StartTime":147839.0,"Objects":[{"StartTime":147839.0,"Position":175.0,"HyperDash":false}]},{"StartTime":147975.0,"Objects":[{"StartTime":147975.0,"Position":256.0,"HyperDash":false}]},{"StartTime":148111.0,"Objects":[{"StartTime":148111.0,"Position":195.0,"HyperDash":false}]},{"StartTime":148248.0,"Objects":[{"StartTime":148248.0,"Position":300.0,"HyperDash":false}]},{"StartTime":148316.0,"Objects":[{"StartTime":148316.0,"Position":300.0,"HyperDash":false}]},{"StartTime":148384.0,"Objects":[{"StartTime":148384.0,"Position":300.0,"HyperDash":false},{"StartTime":148452.0,"Position":241.037445,"HyperDash":false},{"StartTime":148520.0,"Position":208.872025,"HyperDash":false},{"StartTime":148588.0,"Position":167.7589,"HyperDash":false},{"StartTime":148656.0,"Position":112.687119,"HyperDash":false},{"StartTime":148724.0,"Position":64.53349,"HyperDash":false},{"StartTime":148792.0,"Position":45.59254,"HyperDash":false},{"StartTime":148860.0,"Position":57.11486,"HyperDash":false},{"StartTime":148929.0,"Position":103.807991,"HyperDash":false},{"StartTime":148997.0,"Position":140.8881,"HyperDash":false},{"StartTime":149065.0,"Position":203.1637,"HyperDash":false},{"StartTime":149133.0,"Position":175.605743,"HyperDash":false},{"StartTime":149202.0,"Position":157.292023,"HyperDash":false},{"StartTime":149261.0,"Position":179.837387,"HyperDash":false},{"StartTime":149320.0,"Position":205.033386,"HyperDash":false},{"StartTime":149379.0,"Position":230.499939,"HyperDash":false},{"StartTime":149474.0,"Position":318.759552,"HyperDash":false}]},{"StartTime":149611.0,"Objects":[{"StartTime":149611.0,"Position":416.0,"HyperDash":false},{"StartTime":149679.0,"Position":459.112885,"HyperDash":false},{"StartTime":149747.0,"Position":483.116028,"HyperDash":false},{"StartTime":149883.0,"Position":416.0,"HyperDash":false}]},{"StartTime":150021.0,"Objects":[{"StartTime":150021.0,"Position":318.0,"HyperDash":false}]},{"StartTime":150157.0,"Objects":[{"StartTime":150157.0,"Position":318.0,"HyperDash":false}]},{"StartTime":150293.0,"Objects":[{"StartTime":150293.0,"Position":395.0,"HyperDash":false},{"StartTime":150429.0,"Position":388.707062,"HyperDash":false}]},{"StartTime":150566.0,"Objects":[{"StartTime":150566.0,"Position":502.0,"HyperDash":false}]},{"StartTime":150702.0,"Objects":[{"StartTime":150702.0,"Position":388.0,"HyperDash":false}]},{"StartTime":150839.0,"Objects":[{"StartTime":150839.0,"Position":388.0,"HyperDash":false}]},{"StartTime":150975.0,"Objects":[{"StartTime":150975.0,"Position":354.0,"HyperDash":false},{"StartTime":151043.0,"Position":308.8965,"HyperDash":false},{"StartTime":151111.0,"Position":257.082336,"HyperDash":false},{"StartTime":151179.0,"Position":200.233047,"HyperDash":false},{"StartTime":151247.0,"Position":179.148392,"HyperDash":false},{"StartTime":151315.0,"Position":121.330429,"HyperDash":false},{"StartTime":151383.0,"Position":91.3323,"HyperDash":false},{"StartTime":151451.0,"Position":105.334328,"HyperDash":false},{"StartTime":151520.0,"Position":163.270889,"HyperDash":false},{"StartTime":151588.0,"Position":222.52066,"HyperDash":false},{"StartTime":151656.0,"Position":236.967346,"HyperDash":false},{"StartTime":151724.0,"Position":197.664108,"HyperDash":false},{"StartTime":151793.0,"Position":170.657684,"HyperDash":false},{"StartTime":151929.0,"Position":122.385834,"HyperDash":false}]},{"StartTime":152066.0,"Objects":[{"StartTime":152066.0,"Position":37.0,"HyperDash":false},{"StartTime":152134.0,"Position":38.1493454,"HyperDash":false},{"StartTime":152202.0,"Position":25.2637386,"HyperDash":false},{"StartTime":152338.0,"Position":37.0,"HyperDash":false}]},{"StartTime":152475.0,"Objects":[{"StartTime":152475.0,"Position":73.0,"HyperDash":false},{"StartTime":152611.0,"Position":125.983765,"HyperDash":false}]},{"StartTime":152748.0,"Objects":[{"StartTime":152748.0,"Position":211.0,"HyperDash":false},{"StartTime":152807.0,"Position":232.132385,"HyperDash":false},{"StartTime":152866.0,"Position":265.062622,"HyperDash":false},{"StartTime":152925.0,"Position":293.685852,"HyperDash":false},{"StartTime":153020.0,"Position":353.2395,"HyperDash":false}]},{"StartTime":153157.0,"Objects":[{"StartTime":153157.0,"Position":499.0,"HyperDash":false},{"StartTime":153216.0,"Position":449.435883,"HyperDash":false},{"StartTime":153275.0,"Position":424.8718,"HyperDash":false},{"StartTime":153334.0,"Position":399.307678,"HyperDash":false},{"StartTime":153429.0,"Position":330.433258,"HyperDash":false}]},{"StartTime":153566.0,"Objects":[{"StartTime":153566.0,"Position":279.0,"HyperDash":false},{"StartTime":153702.0,"Position":299.1634,"HyperDash":false}]},{"StartTime":153839.0,"Objects":[{"StartTime":153839.0,"Position":236.0,"HyperDash":false}]},{"StartTime":153975.0,"Objects":[{"StartTime":153975.0,"Position":299.0,"HyperDash":false}]},{"StartTime":154111.0,"Objects":[{"StartTime":154111.0,"Position":375.0,"HyperDash":false}]},{"StartTime":154248.0,"Objects":[{"StartTime":154248.0,"Position":448.0,"HyperDash":false},{"StartTime":154316.0,"Position":448.704071,"HyperDash":false},{"StartTime":154384.0,"Position":459.51297,"HyperDash":false},{"StartTime":154452.0,"Position":410.957947,"HyperDash":false},{"StartTime":154520.0,"Position":385.861572,"HyperDash":false},{"StartTime":154570.0,"Position":337.801727,"HyperDash":false},{"StartTime":154657.0,"Position":317.3621,"HyperDash":false}]},{"StartTime":154930.0,"Objects":[{"StartTime":154930.0,"Position":41.0,"HyperDash":false}]},{"StartTime":155020.0,"Objects":[{"StartTime":155020.0,"Position":28.0,"HyperDash":false}]},{"StartTime":155111.0,"Objects":[{"StartTime":155111.0,"Position":40.0,"HyperDash":false}]},{"StartTime":155202.0,"Objects":[{"StartTime":155202.0,"Position":72.0,"HyperDash":false}]},{"StartTime":155293.0,"Objects":[{"StartTime":155293.0,"Position":115.0,"HyperDash":false}]},{"StartTime":155384.0,"Objects":[{"StartTime":155384.0,"Position":158.0,"HyperDash":false}]},{"StartTime":155475.0,"Objects":[{"StartTime":155475.0,"Position":198.0,"HyperDash":false}]},{"StartTime":155565.0,"Objects":[{"StartTime":155565.0,"Position":254.0,"HyperDash":false}]},{"StartTime":155656.0,"Objects":[{"StartTime":155656.0,"Position":309.0,"HyperDash":false}]},{"StartTime":155747.0,"Objects":[{"StartTime":155747.0,"Position":356.0,"HyperDash":false}]},{"StartTime":155838.0,"Objects":[{"StartTime":155838.0,"Position":392.0,"HyperDash":false}]},{"StartTime":155929.0,"Objects":[{"StartTime":155929.0,"Position":411.0,"HyperDash":false}]},{"StartTime":156021.0,"Objects":[{"StartTime":156021.0,"Position":411.0,"HyperDash":false},{"StartTime":156089.0,"Position":395.962219,"HyperDash":false},{"StartTime":156157.0,"Position":339.266174,"HyperDash":false},{"StartTime":156225.0,"Position":303.955,"HyperDash":false},{"StartTime":156293.0,"Position":318.589355,"HyperDash":false},{"StartTime":156361.0,"Position":368.6844,"HyperDash":false},{"StartTime":156429.0,"Position":387.036835,"HyperDash":false},{"StartTime":156497.0,"Position":393.426025,"HyperDash":false},{"StartTime":156566.0,"Position":373.163116,"HyperDash":false},{"StartTime":156625.0,"Position":341.85965,"HyperDash":false},{"StartTime":156684.0,"Position":283.9819,"HyperDash":false},{"StartTime":156743.0,"Position":246.838165,"HyperDash":false},{"StartTime":156839.0,"Position":212.31163,"HyperDash":false}]},{"StartTime":156907.0,"Objects":[{"StartTime":156907.0,"Position":213.0,"HyperDash":false}]},{"StartTime":156975.0,"Objects":[{"StartTime":156975.0,"Position":214.0,"HyperDash":false}]},{"StartTime":157043.0,"Objects":[{"StartTime":157043.0,"Position":215.0,"HyperDash":false}]},{"StartTime":157111.0,"Objects":[{"StartTime":157111.0,"Position":216.0,"HyperDash":false},{"StartTime":157247.0,"Position":114.869156,"HyperDash":false}]},{"StartTime":157384.0,"Objects":[{"StartTime":157384.0,"Position":3.0,"HyperDash":false},{"StartTime":157520.0,"Position":104.052589,"HyperDash":false}]},{"StartTime":157657.0,"Objects":[{"StartTime":157657.0,"Position":124.0,"HyperDash":false},{"StartTime":157793.0,"Position":225.052582,"HyperDash":false}]},{"StartTime":157930.0,"Objects":[{"StartTime":157930.0,"Position":13.0,"HyperDash":false},{"StartTime":158066.0,"Position":114.052589,"HyperDash":false}]},{"StartTime":158202.0,"Objects":[{"StartTime":158202.0,"Position":134.0,"HyperDash":false},{"StartTime":158338.0,"Position":235.052582,"HyperDash":false}]},{"StartTime":158475.0,"Objects":[{"StartTime":158475.0,"Position":23.0,"HyperDash":false},{"StartTime":158611.0,"Position":124.052589,"HyperDash":false}]},{"StartTime":158748.0,"Objects":[{"StartTime":158748.0,"Position":144.0,"HyperDash":false},{"StartTime":158884.0,"Position":245.052582,"HyperDash":false}]},{"StartTime":159021.0,"Objects":[{"StartTime":159021.0,"Position":33.0,"HyperDash":false},{"StartTime":159157.0,"Position":134.052582,"HyperDash":false}]},{"StartTime":159293.0,"Objects":[{"StartTime":159293.0,"Position":154.0,"HyperDash":false},{"StartTime":159429.0,"Position":255.052582,"HyperDash":false}]},{"StartTime":159566.0,"Objects":[{"StartTime":159566.0,"Position":43.0,"HyperDash":false},{"StartTime":159702.0,"Position":144.052582,"HyperDash":false}]},{"StartTime":159839.0,"Objects":[{"StartTime":159839.0,"Position":164.0,"HyperDash":false},{"StartTime":159975.0,"Position":265.052582,"HyperDash":false}]},{"StartTime":160112.0,"Objects":[{"StartTime":160112.0,"Position":53.0,"HyperDash":false},{"StartTime":160248.0,"Position":154.052582,"HyperDash":false}]},{"StartTime":160384.0,"Objects":[{"StartTime":160384.0,"Position":174.0,"HyperDash":false},{"StartTime":160520.0,"Position":275.052582,"HyperDash":false}]},{"StartTime":160657.0,"Objects":[{"StartTime":160657.0,"Position":63.0,"HyperDash":false},{"StartTime":160793.0,"Position":164.052582,"HyperDash":false}]},{"StartTime":160930.0,"Objects":[{"StartTime":160930.0,"Position":184.0,"HyperDash":false},{"StartTime":161066.0,"Position":285.052582,"HyperDash":true}]},{"StartTime":161202.0,"Objects":[{"StartTime":161202.0,"Position":73.0,"HyperDash":false},{"StartTime":161338.0,"Position":174.052582,"HyperDash":false}]},{"StartTime":161475.0,"Objects":[{"StartTime":161475.0,"Position":300.0,"HyperDash":false},{"StartTime":161611.0,"Position":401.130859,"HyperDash":false}]},{"StartTime":161748.0,"Objects":[{"StartTime":161748.0,"Position":512.0,"HyperDash":false},{"StartTime":161884.0,"Position":410.818481,"HyperDash":false}]},{"StartTime":162021.0,"Objects":[{"StartTime":162021.0,"Position":391.0,"HyperDash":false},{"StartTime":162157.0,"Position":289.818481,"HyperDash":false}]},{"StartTime":162294.0,"Objects":[{"StartTime":162294.0,"Position":502.0,"HyperDash":false},{"StartTime":162430.0,"Position":400.818481,"HyperDash":false}]},{"StartTime":162566.0,"Objects":[{"StartTime":162566.0,"Position":381.0,"HyperDash":false},{"StartTime":162702.0,"Position":279.818481,"HyperDash":false}]},{"StartTime":162839.0,"Objects":[{"StartTime":162839.0,"Position":492.0,"HyperDash":false},{"StartTime":162975.0,"Position":390.818481,"HyperDash":false}]},{"StartTime":163112.0,"Objects":[{"StartTime":163112.0,"Position":371.0,"HyperDash":false},{"StartTime":163248.0,"Position":269.818481,"HyperDash":false}]},{"StartTime":163385.0,"Objects":[{"StartTime":163385.0,"Position":482.0,"HyperDash":false},{"StartTime":163521.0,"Position":380.818481,"HyperDash":false}]},{"StartTime":163657.0,"Objects":[{"StartTime":163657.0,"Position":361.0,"HyperDash":false},{"StartTime":163793.0,"Position":259.818481,"HyperDash":false}]},{"StartTime":163930.0,"Objects":[{"StartTime":163930.0,"Position":472.0,"HyperDash":false},{"StartTime":164066.0,"Position":370.818481,"HyperDash":false}]},{"StartTime":164203.0,"Objects":[{"StartTime":164203.0,"Position":351.0,"HyperDash":false},{"StartTime":164339.0,"Position":249.818481,"HyperDash":false}]},{"StartTime":164476.0,"Objects":[{"StartTime":164476.0,"Position":462.0,"HyperDash":false},{"StartTime":164612.0,"Position":360.818481,"HyperDash":false}]},{"StartTime":164748.0,"Objects":[{"StartTime":164748.0,"Position":341.0,"HyperDash":false},{"StartTime":164884.0,"Position":239.818481,"HyperDash":false}]},{"StartTime":165021.0,"Objects":[{"StartTime":165021.0,"Position":452.0,"HyperDash":false},{"StartTime":165157.0,"Position":350.818481,"HyperDash":false}]},{"StartTime":165294.0,"Objects":[{"StartTime":165294.0,"Position":331.0,"HyperDash":false},{"StartTime":165430.0,"Position":229.818481,"HyperDash":false}]},{"StartTime":165566.0,"Objects":[{"StartTime":165566.0,"Position":396.0,"HyperDash":false}]},{"StartTime":165702.0,"Objects":[{"StartTime":165702.0,"Position":216.0,"HyperDash":false}]},{"StartTime":165771.0,"Objects":[{"StartTime":165771.0,"Position":216.0,"HyperDash":false}]},{"StartTime":165839.0,"Objects":[{"StartTime":165839.0,"Position":216.0,"HyperDash":false},{"StartTime":165975.0,"Position":229.287262,"HyperDash":false}]},{"StartTime":166112.0,"Objects":[{"StartTime":166112.0,"Position":103.0,"HyperDash":false},{"StartTime":166248.0,"Position":89.1300354,"HyperDash":false}]},{"StartTime":166385.0,"Objects":[{"StartTime":166385.0,"Position":218.0,"HyperDash":false},{"StartTime":166521.0,"Position":204.130035,"HyperDash":false}]},{"StartTime":166658.0,"Objects":[{"StartTime":166658.0,"Position":91.0,"HyperDash":false},{"StartTime":166794.0,"Position":77.1300354,"HyperDash":false}]},{"StartTime":166930.0,"Objects":[{"StartTime":166930.0,"Position":206.0,"HyperDash":false},{"StartTime":167066.0,"Position":192.130035,"HyperDash":false}]},{"StartTime":167203.0,"Objects":[{"StartTime":167203.0,"Position":79.0,"HyperDash":false},{"StartTime":167339.0,"Position":65.1300354,"HyperDash":false}]},{"StartTime":167476.0,"Objects":[{"StartTime":167476.0,"Position":194.0,"HyperDash":false},{"StartTime":167612.0,"Position":180.130035,"HyperDash":false}]},{"StartTime":167749.0,"Objects":[{"StartTime":167749.0,"Position":67.0,"HyperDash":false},{"StartTime":167885.0,"Position":53.1300354,"HyperDash":false}]},{"StartTime":168021.0,"Objects":[{"StartTime":168021.0,"Position":182.0,"HyperDash":false},{"StartTime":168157.0,"Position":168.130035,"HyperDash":false}]},{"StartTime":168294.0,"Objects":[{"StartTime":168294.0,"Position":55.0,"HyperDash":false},{"StartTime":168430.0,"Position":41.1300354,"HyperDash":false}]},{"StartTime":168567.0,"Objects":[{"StartTime":168567.0,"Position":170.0,"HyperDash":false},{"StartTime":168703.0,"Position":156.130035,"HyperDash":false}]},{"StartTime":168840.0,"Objects":[{"StartTime":168840.0,"Position":43.0,"HyperDash":false},{"StartTime":168976.0,"Position":29.1300373,"HyperDash":false}]},{"StartTime":169112.0,"Objects":[{"StartTime":169112.0,"Position":158.0,"HyperDash":false},{"StartTime":169248.0,"Position":144.130035,"HyperDash":false}]},{"StartTime":169385.0,"Objects":[{"StartTime":169385.0,"Position":31.0,"HyperDash":false},{"StartTime":169521.0,"Position":17.1300373,"HyperDash":false}]},{"StartTime":169658.0,"Objects":[{"StartTime":169658.0,"Position":146.0,"HyperDash":false},{"StartTime":169794.0,"Position":132.130035,"HyperDash":false}]},{"StartTime":169930.0,"Objects":[{"StartTime":169930.0,"Position":19.0,"HyperDash":false},{"StartTime":170066.0,"Position":5.13003731,"HyperDash":true}]},{"StartTime":170202.0,"Objects":[{"StartTime":170202.0,"Position":280.0,"HyperDash":false},{"StartTime":170338.0,"Position":266.712738,"HyperDash":false}]},{"StartTime":170475.0,"Objects":[{"StartTime":170475.0,"Position":393.0,"HyperDash":false},{"StartTime":170611.0,"Position":406.869965,"HyperDash":false}]},{"StartTime":170748.0,"Objects":[{"StartTime":170748.0,"Position":278.0,"HyperDash":false},{"StartTime":170884.0,"Position":291.869965,"HyperDash":false}]},{"StartTime":171021.0,"Objects":[{"StartTime":171021.0,"Position":405.0,"HyperDash":false},{"StartTime":171157.0,"Position":418.869965,"HyperDash":false}]},{"StartTime":171293.0,"Objects":[{"StartTime":171293.0,"Position":290.0,"HyperDash":false},{"StartTime":171429.0,"Position":303.869965,"HyperDash":false}]},{"StartTime":171566.0,"Objects":[{"StartTime":171566.0,"Position":417.0,"HyperDash":false},{"StartTime":171702.0,"Position":430.869965,"HyperDash":false}]},{"StartTime":171839.0,"Objects":[{"StartTime":171839.0,"Position":302.0,"HyperDash":false},{"StartTime":171975.0,"Position":315.869965,"HyperDash":false}]},{"StartTime":172112.0,"Objects":[{"StartTime":172112.0,"Position":429.0,"HyperDash":false},{"StartTime":172248.0,"Position":442.869965,"HyperDash":false}]},{"StartTime":172384.0,"Objects":[{"StartTime":172384.0,"Position":512.0,"HyperDash":false}]},{"StartTime":173278.0,"Objects":[{"StartTime":173278.0,"Position":512.0,"HyperDash":false},{"StartTime":173333.0,"Position":461.544647,"HyperDash":false},{"StartTime":173389.0,"Position":440.884155,"HyperDash":false},{"StartTime":173444.0,"Position":394.892883,"HyperDash":false},{"StartTime":173500.0,"Position":373.234924,"HyperDash":false},{"StartTime":173611.0,"Position":383.5925,"HyperDash":false}]},{"StartTime":173722.0,"Objects":[{"StartTime":173722.0,"Position":327.0,"HyperDash":false},{"StartTime":173796.0,"Position":271.28595,"HyperDash":false},{"StartTime":173870.0,"Position":327.0,"HyperDash":false},{"StartTime":173944.0,"Position":271.28595,"HyperDash":false},{"StartTime":174018.0,"Position":327.0,"HyperDash":false},{"StartTime":174092.0,"Position":271.28595,"HyperDash":false}]},{"StartTime":174166.0,"Objects":[{"StartTime":174166.0,"Position":178.0,"HyperDash":false},{"StartTime":174240.0,"Position":233.714035,"HyperDash":false},{"StartTime":174314.0,"Position":178.0,"HyperDash":false},{"StartTime":174388.0,"Position":233.714035,"HyperDash":false},{"StartTime":174462.0,"Position":178.0,"HyperDash":false},{"StartTime":174536.0,"Position":233.714035,"HyperDash":false}]},{"StartTime":174611.0,"Objects":[{"StartTime":174611.0,"Position":92.0,"HyperDash":false},{"StartTime":174685.0,"Position":36.285965,"HyperDash":false},{"StartTime":174759.0,"Position":92.0,"HyperDash":false}]},{"StartTime":174833.0,"Objects":[{"StartTime":174833.0,"Position":99.0,"HyperDash":false},{"StartTime":174907.0,"Position":43.285965,"HyperDash":false},{"StartTime":174981.0,"Position":99.0,"HyperDash":false}]},{"StartTime":175055.0,"Objects":[{"StartTime":175055.0,"Position":179.0,"HyperDash":false},{"StartTime":175166.0,"Position":178.317825,"HyperDash":false}]},{"StartTime":175278.0,"Objects":[{"StartTime":175278.0,"Position":84.0,"HyperDash":false}]},{"StartTime":175389.0,"Objects":[{"StartTime":175389.0,"Position":84.0,"HyperDash":false}]},{"StartTime":175500.0,"Objects":[{"StartTime":175500.0,"Position":84.0,"HyperDash":false},{"StartTime":175611.0,"Position":0.0,"HyperDash":false}]},{"StartTime":175722.0,"Objects":[{"StartTime":175722.0,"Position":176.0,"HyperDash":false},{"StartTime":175833.0,"Position":260.304535,"HyperDash":false}]},{"StartTime":175944.0,"Objects":[{"StartTime":175944.0,"Position":378.0,"HyperDash":false}]},{"StartTime":176055.0,"Objects":[{"StartTime":176055.0,"Position":359.0,"HyperDash":false}]},{"StartTime":176166.0,"Objects":[{"StartTime":176166.0,"Position":380.0,"HyperDash":false}]},{"StartTime":176278.0,"Objects":[{"StartTime":176278.0,"Position":437.0,"HyperDash":false}]},{"StartTime":176389.0,"Objects":[{"StartTime":176389.0,"Position":504.0,"HyperDash":false},{"StartTime":176500.0,"Position":500.1198,"HyperDash":false}]},{"StartTime":176611.0,"Objects":[{"StartTime":176611.0,"Position":464.0,"HyperDash":false},{"StartTime":176722.0,"Position":395.9769,"HyperDash":false}]},{"StartTime":176833.0,"Objects":[{"StartTime":176833.0,"Position":223.0,"HyperDash":false},{"StartTime":176888.0,"Position":222.049377,"HyperDash":false},{"StartTime":176944.0,"Position":265.432465,"HyperDash":false},{"StartTime":176999.0,"Position":288.0414,"HyperDash":false},{"StartTime":177055.0,"Position":311.180634,"HyperDash":false},{"StartTime":177166.0,"Position":320.170959,"HyperDash":false}]},{"StartTime":177278.0,"Objects":[{"StartTime":177278.0,"Position":314.0,"HyperDash":false}]},{"StartTime":177389.0,"Objects":[{"StartTime":177389.0,"Position":393.0,"HyperDash":false}]},{"StartTime":177500.0,"Objects":[{"StartTime":177500.0,"Position":393.0,"HyperDash":false},{"StartTime":177611.0,"Position":476.258362,"HyperDash":true}]},{"StartTime":177722.0,"Objects":[{"StartTime":177722.0,"Position":238.0,"HyperDash":false}]},{"StartTime":177833.0,"Objects":[{"StartTime":177833.0,"Position":238.0,"HyperDash":false}]},{"StartTime":177944.0,"Objects":[{"StartTime":177944.0,"Position":238.0,"HyperDash":false},{"StartTime":178055.0,"Position":154.741638,"HyperDash":false}]},{"StartTime":178166.0,"Objects":[{"StartTime":178166.0,"Position":51.0,"HyperDash":false},{"StartTime":178277.0,"Position":38.63025,"HyperDash":false}]},{"StartTime":178389.0,"Objects":[{"StartTime":178389.0,"Position":136.0,"HyperDash":false},{"StartTime":178500.0,"Position":149.298233,"HyperDash":false}]},{"StartTime":178611.0,"Objects":[{"StartTime":178611.0,"Position":311.0,"HyperDash":false},{"StartTime":178685.0,"Position":365.846741,"HyperDash":false},{"StartTime":178759.0,"Position":311.0,"HyperDash":false}]},{"StartTime":178833.0,"Objects":[{"StartTime":178833.0,"Position":361.0,"HyperDash":false},{"StartTime":178907.0,"Position":415.431976,"HyperDash":false},{"StartTime":178981.0,"Position":361.0,"HyperDash":false}]},{"StartTime":179055.0,"Objects":[{"StartTime":179055.0,"Position":368.0,"HyperDash":false},{"StartTime":179129.0,"Position":407.3476,"HyperDash":false},{"StartTime":179203.0,"Position":368.0,"HyperDash":false}]},{"StartTime":179278.0,"Objects":[{"StartTime":179278.0,"Position":330.0,"HyperDash":false},{"StartTime":179352.0,"Position":344.074615,"HyperDash":false},{"StartTime":179426.0,"Position":330.0,"HyperDash":false}]},{"StartTime":179500.0,"Objects":[{"StartTime":179500.0,"Position":442.0,"HyperDash":false}]},{"StartTime":179574.0,"Objects":[{"StartTime":179574.0,"Position":442.0,"HyperDash":false}]},{"StartTime":179648.0,"Objects":[{"StartTime":179648.0,"Position":442.0,"HyperDash":false}]},{"StartTime":179722.0,"Objects":[{"StartTime":179722.0,"Position":442.0,"HyperDash":false},{"StartTime":179796.0,"Position":427.7541,"HyperDash":false},{"StartTime":179870.0,"Position":442.0,"HyperDash":false}]},{"StartTime":179944.0,"Objects":[{"StartTime":179944.0,"Position":488.0,"HyperDash":false},{"StartTime":180037.0,"Position":417.2783,"HyperDash":false},{"StartTime":180166.0,"Position":350.759735,"HyperDash":false}]},{"StartTime":180389.0,"Objects":[{"StartTime":180389.0,"Position":114.0,"HyperDash":false},{"StartTime":180500.0,"Position":42.9713974,"HyperDash":false}]},{"StartTime":180611.0,"Objects":[{"StartTime":180611.0,"Position":0.0,"HyperDash":false},{"StartTime":180722.0,"Position":70.18777,"HyperDash":false}]},{"StartTime":180833.0,"Objects":[{"StartTime":180833.0,"Position":124.0,"HyperDash":false},{"StartTime":180944.0,"Position":110.17556,"HyperDash":false}]},{"StartTime":181055.0,"Objects":[{"StartTime":181055.0,"Position":201.0,"HyperDash":false},{"StartTime":181166.0,"Position":214.824432,"HyperDash":false}]},{"StartTime":181278.0,"Objects":[{"StartTime":181278.0,"Position":350.0,"HyperDash":false},{"StartTime":181389.0,"Position":414.6709,"HyperDash":false}]},{"StartTime":181500.0,"Objects":[{"StartTime":181500.0,"Position":497.0,"HyperDash":false},{"StartTime":181555.0,"Position":495.534149,"HyperDash":false},{"StartTime":181611.0,"Position":512.0,"HyperDash":false},{"StartTime":181722.0,"Position":497.0,"HyperDash":false}]},{"StartTime":181833.0,"Objects":[{"StartTime":181833.0,"Position":414.0,"HyperDash":false}]},{"StartTime":181944.0,"Objects":[{"StartTime":181944.0,"Position":414.0,"HyperDash":false},{"StartTime":182055.0,"Position":339.763519,"HyperDash":false}]},{"StartTime":182166.0,"Objects":[{"StartTime":182166.0,"Position":254.0,"HyperDash":false}]},{"StartTime":182278.0,"Objects":[{"StartTime":182278.0,"Position":186.0,"HyperDash":false}]},{"StartTime":182389.0,"Objects":[{"StartTime":182389.0,"Position":123.0,"HyperDash":false}]},{"StartTime":182500.0,"Objects":[{"StartTime":182500.0,"Position":89.0,"HyperDash":false}]},{"StartTime":182611.0,"Objects":[{"StartTime":182611.0,"Position":101.0,"HyperDash":false},{"StartTime":182666.0,"Position":108.090492,"HyperDash":false},{"StartTime":182722.0,"Position":101.513573,"HyperDash":false},{"StartTime":182777.0,"Position":95.97452,"HyperDash":false},{"StartTime":182833.0,"Position":76.8446,"HyperDash":false},{"StartTime":182944.0,"Position":79.74396,"HyperDash":false}]},{"StartTime":183055.0,"Objects":[{"StartTime":183055.0,"Position":0.0,"HyperDash":false},{"StartTime":183166.0,"Position":73.6922455,"HyperDash":false}]},{"StartTime":183278.0,"Objects":[{"StartTime":183278.0,"Position":176.0,"HyperDash":false},{"StartTime":183389.0,"Position":242.907639,"HyperDash":false}]},{"StartTime":183500.0,"Objects":[{"StartTime":183500.0,"Position":353.0,"HyperDash":false},{"StartTime":183611.0,"Position":361.0935,"HyperDash":false}]},{"StartTime":183722.0,"Objects":[{"StartTime":183722.0,"Position":473.0,"HyperDash":false},{"StartTime":183833.0,"Position":464.9065,"HyperDash":false}]},{"StartTime":183944.0,"Objects":[{"StartTime":183944.0,"Position":447.0,"HyperDash":false}]},{"StartTime":184055.0,"Objects":[{"StartTime":184055.0,"Position":447.0,"HyperDash":false}]},{"StartTime":184166.0,"Objects":[{"StartTime":184166.0,"Position":447.0,"HyperDash":false}]},{"StartTime":184277.0,"Objects":[{"StartTime":184277.0,"Position":463.0,"HyperDash":false}]},{"StartTime":184388.0,"Objects":[{"StartTime":184388.0,"Position":487.0,"HyperDash":false},{"StartTime":184499.0,"Position":478.9065,"HyperDash":false}]},{"StartTime":184611.0,"Objects":[{"StartTime":184611.0,"Position":344.0,"HyperDash":false},{"StartTime":184722.0,"Position":335.9065,"HyperDash":false}]},{"StartTime":184833.0,"Objects":[{"StartTime":184833.0,"Position":233.0,"HyperDash":false},{"StartTime":184944.0,"Position":153.960419,"HyperDash":false}]},{"StartTime":185055.0,"Objects":[{"StartTime":185055.0,"Position":19.0,"HyperDash":false},{"StartTime":185166.0,"Position":98.20671,"HyperDash":false}]},{"StartTime":185278.0,"Objects":[{"StartTime":185278.0,"Position":224.0,"HyperDash":false}]},{"StartTime":185389.0,"Objects":[{"StartTime":185389.0,"Position":229.0,"HyperDash":false}]},{"StartTime":185500.0,"Objects":[{"StartTime":185500.0,"Position":203.0,"HyperDash":false}]},{"StartTime":185611.0,"Objects":[{"StartTime":185611.0,"Position":148.0,"HyperDash":false}]},{"StartTime":185722.0,"Objects":[{"StartTime":185722.0,"Position":80.0,"HyperDash":false},{"StartTime":185833.0,"Position":31.5825539,"HyperDash":true}]},{"StartTime":185944.0,"Objects":[{"StartTime":185944.0,"Position":227.0,"HyperDash":false},{"StartTime":186018.0,"Position":266.7068,"HyperDash":false},{"StartTime":186092.0,"Position":227.0,"HyperDash":false}]},{"StartTime":186166.0,"Objects":[{"StartTime":186166.0,"Position":306.0,"HyperDash":false},{"StartTime":186240.0,"Position":360.619873,"HyperDash":false},{"StartTime":186314.0,"Position":306.0,"HyperDash":false}]},{"StartTime":186388.0,"Objects":[{"StartTime":186388.0,"Position":358.0,"HyperDash":false},{"StartTime":186462.0,"Position":412.8009,"HyperDash":false},{"StartTime":186536.0,"Position":358.0,"HyperDash":false}]},{"StartTime":186611.0,"Objects":[{"StartTime":186611.0,"Position":366.0,"HyperDash":false},{"StartTime":186685.0,"Position":406.4224,"HyperDash":false},{"StartTime":186759.0,"Position":366.0,"HyperDash":false}]},{"StartTime":186833.0,"Objects":[{"StartTime":186833.0,"Position":512.0,"HyperDash":false}]},{"StartTime":186907.0,"Objects":[{"StartTime":186907.0,"Position":512.0,"HyperDash":false}]},{"StartTime":186981.0,"Objects":[{"StartTime":186981.0,"Position":512.0,"HyperDash":false}]},{"StartTime":187055.0,"Objects":[{"StartTime":187055.0,"Position":512.0,"HyperDash":false},{"StartTime":187129.0,"Position":471.5776,"HyperDash":false},{"StartTime":187203.0,"Position":512.0,"HyperDash":false}]},{"StartTime":187277.0,"Objects":[{"StartTime":187277.0,"Position":469.0,"HyperDash":false},{"StartTime":187333.0,"Position":428.048767,"HyperDash":false},{"StartTime":187425.0,"Position":370.993652,"HyperDash":false}]},{"StartTime":187500.0,"Objects":[{"StartTime":187500.0,"Position":346.0,"HyperDash":false},{"StartTime":187555.0,"Position":324.884857,"HyperDash":false},{"StartTime":187611.0,"Position":281.551849,"HyperDash":false},{"StartTime":187666.0,"Position":288.422363,"HyperDash":false},{"StartTime":187722.0,"Position":306.796173,"HyperDash":false},{"StartTime":187833.0,"Position":357.976379,"HyperDash":false}]},{"StartTime":187944.0,"Objects":[{"StartTime":187944.0,"Position":326.0,"HyperDash":false}]},{"StartTime":188055.0,"Objects":[{"StartTime":188055.0,"Position":397.0,"HyperDash":false},{"StartTime":188166.0,"Position":479.230957,"HyperDash":true}]},{"StartTime":188278.0,"Objects":[{"StartTime":188278.0,"Position":269.0,"HyperDash":false}]},{"StartTime":188389.0,"Objects":[{"StartTime":188389.0,"Position":269.0,"HyperDash":false},{"StartTime":188500.0,"Position":220.272171,"HyperDash":false}]},{"StartTime":188611.0,"Objects":[{"StartTime":188611.0,"Position":209.0,"HyperDash":false},{"StartTime":188722.0,"Position":124.709274,"HyperDash":false}]},{"StartTime":188833.0,"Objects":[{"StartTime":188833.0,"Position":13.0,"HyperDash":false},{"StartTime":188944.0,"Position":97.2907257,"HyperDash":false}]},{"StartTime":189055.0,"Objects":[{"StartTime":189055.0,"Position":163.0,"HyperDash":false},{"StartTime":189166.0,"Position":78.7092743,"HyperDash":false}]},{"StartTime":189277.0,"Objects":[{"StartTime":189277.0,"Position":133.0,"HyperDash":false},{"StartTime":189388.0,"Position":217.403992,"HyperDash":false}]},{"StartTime":189499.0,"Objects":[{"StartTime":189499.0,"Position":248.0,"HyperDash":false},{"StartTime":189573.0,"Position":288.0694,"HyperDash":false},{"StartTime":189647.0,"Position":248.0,"HyperDash":false}]},{"StartTime":189721.0,"Objects":[{"StartTime":189721.0,"Position":309.0,"HyperDash":false},{"StartTime":189795.0,"Position":323.2212,"HyperDash":false},{"StartTime":189869.0,"Position":309.0,"HyperDash":false}]},{"StartTime":189944.0,"Objects":[{"StartTime":189944.0,"Position":414.0,"HyperDash":false},{"StartTime":190018.0,"Position":398.833527,"HyperDash":false},{"StartTime":190092.0,"Position":414.0,"HyperDash":false}]},{"StartTime":190166.0,"Objects":[{"StartTime":190166.0,"Position":468.0,"HyperDash":false},{"StartTime":190240.0,"Position":482.2459,"HyperDash":false},{"StartTime":190314.0,"Position":468.0,"HyperDash":false},{"StartTime":190388.0,"Position":482.2459,"HyperDash":false},{"StartTime":190462.0,"Position":468.0,"HyperDash":false},{"StartTime":190536.0,"Position":482.2459,"HyperDash":false}]},{"StartTime":190611.0,"Objects":[{"StartTime":190611.0,"Position":408.0,"HyperDash":false},{"StartTime":190685.0,"Position":422.909973,"HyperDash":false},{"StartTime":190759.0,"Position":408.0,"HyperDash":false}]},{"StartTime":190833.0,"Objects":[{"StartTime":190833.0,"Position":399.0,"HyperDash":false},{"StartTime":190907.0,"Position":413.2212,"HyperDash":false},{"StartTime":190981.0,"Position":399.0,"HyperDash":false}]},{"StartTime":191055.0,"Objects":[{"StartTime":191055.0,"Position":311.0,"HyperDash":false},{"StartTime":191148.0,"Position":357.4903,"HyperDash":false},{"StartTime":191277.0,"Position":394.428223,"HyperDash":false}]},{"StartTime":191389.0,"Objects":[{"StartTime":191389.0,"Position":272.0,"HyperDash":false}]},{"StartTime":191500.0,"Objects":[{"StartTime":191500.0,"Position":272.0,"HyperDash":false},{"StartTime":191611.0,"Position":336.857483,"HyperDash":false}]},{"StartTime":191722.0,"Objects":[{"StartTime":191722.0,"Position":461.0,"HyperDash":false},{"StartTime":191833.0,"Position":383.333038,"HyperDash":false}]},{"StartTime":191944.0,"Objects":[{"StartTime":191944.0,"Position":215.0,"HyperDash":false}]},{"StartTime":192055.0,"Objects":[{"StartTime":192055.0,"Position":189.0,"HyperDash":false}]},{"StartTime":192166.0,"Objects":[{"StartTime":192166.0,"Position":157.0,"HyperDash":false}]},{"StartTime":192277.0,"Objects":[{"StartTime":192277.0,"Position":123.0,"HyperDash":false}]},{"StartTime":192389.0,"Objects":[{"StartTime":192389.0,"Position":89.0,"HyperDash":false},{"StartTime":192500.0,"Position":17.9128532,"HyperDash":false}]},{"StartTime":192611.0,"Objects":[{"StartTime":192611.0,"Position":54.0,"HyperDash":false},{"StartTime":192722.0,"Position":52.84656,"HyperDash":false}]},{"StartTime":192833.0,"Objects":[{"StartTime":192833.0,"Position":208.0,"HyperDash":false},{"StartTime":192944.0,"Position":194.175568,"HyperDash":false}]},{"StartTime":193055.0,"Objects":[{"StartTime":193055.0,"Position":275.0,"HyperDash":false},{"StartTime":193166.0,"Position":288.824432,"HyperDash":false}]},{"StartTime":193277.0,"Objects":[{"StartTime":193277.0,"Position":415.0,"HyperDash":false}]},{"StartTime":193389.0,"Objects":[{"StartTime":193389.0,"Position":461.0,"HyperDash":false}]},{"StartTime":193500.0,"Objects":[{"StartTime":193500.0,"Position":458.0,"HyperDash":false}]},{"StartTime":193611.0,"Objects":[{"StartTime":193611.0,"Position":413.0,"HyperDash":false}]},{"StartTime":193722.0,"Objects":[{"StartTime":193722.0,"Position":329.0,"HyperDash":false},{"StartTime":193833.0,"Position":246.696991,"HyperDash":false}]},{"StartTime":193944.0,"Objects":[{"StartTime":193944.0,"Position":377.0,"HyperDash":false},{"StartTime":194055.0,"Position":459.303,"HyperDash":false}]},{"StartTime":194166.0,"Objects":[{"StartTime":194166.0,"Position":491.0,"HyperDash":false},{"StartTime":194259.0,"Position":480.782471,"HyperDash":false},{"StartTime":194388.0,"Position":427.072449,"HyperDash":true}]},{"StartTime":194611.0,"Objects":[{"StartTime":194611.0,"Position":51.0,"HyperDash":false},{"StartTime":194666.0,"Position":105.644623,"HyperDash":false},{"StartTime":194722.0,"Position":112.4984,"HyperDash":false},{"StartTime":194777.0,"Position":153.00119,"HyperDash":false},{"StartTime":194833.0,"Position":192.190445,"HyperDash":false},{"StartTime":194926.0,"Position":250.960892,"HyperDash":false},{"StartTime":195055.0,"Position":334.876526,"HyperDash":false}]},{"StartTime":195166.0,"Objects":[{"StartTime":195166.0,"Position":165.0,"HyperDash":false}]},{"StartTime":195277.0,"Objects":[{"StartTime":195277.0,"Position":201.0,"HyperDash":false},{"StartTime":195388.0,"Position":256.006256,"HyperDash":true}]},{"StartTime":195500.0,"Objects":[{"StartTime":195500.0,"Position":47.0,"HyperDash":false},{"StartTime":195611.0,"Position":70.89899,"HyperDash":false}]},{"StartTime":195722.0,"Objects":[{"StartTime":195722.0,"Position":238.0,"HyperDash":false}]},{"StartTime":195833.0,"Objects":[{"StartTime":195833.0,"Position":320.0,"HyperDash":false}]},{"StartTime":195944.0,"Objects":[{"StartTime":195944.0,"Position":402.0,"HyperDash":false}]},{"StartTime":196055.0,"Objects":[{"StartTime":196055.0,"Position":462.0,"HyperDash":false}]},{"StartTime":196166.0,"Objects":[{"StartTime":196166.0,"Position":484.0,"HyperDash":false},{"StartTime":196222.0,"Position":495.415375,"HyperDash":false},{"StartTime":196314.0,"Position":425.076019,"HyperDash":false}]},{"StartTime":196389.0,"Objects":[{"StartTime":196389.0,"Position":354.0,"HyperDash":false},{"StartTime":196463.0,"Position":360.907166,"HyperDash":false},{"StartTime":196537.0,"Position":354.0,"HyperDash":false}]},{"StartTime":196611.0,"Objects":[{"StartTime":196611.0,"Position":290.0,"HyperDash":false},{"StartTime":196685.0,"Position":296.907166,"HyperDash":false},{"StartTime":196759.0,"Position":290.0,"HyperDash":false},{"StartTime":196833.0,"Position":296.907166,"HyperDash":false}]},{"StartTime":196907.0,"Objects":[{"StartTime":196907.0,"Position":242.0,"HyperDash":false},{"StartTime":196981.0,"Position":233.986115,"HyperDash":false}]},{"StartTime":197055.0,"Objects":[{"StartTime":197055.0,"Position":192.0,"HyperDash":false},{"StartTime":197129.0,"Position":199.028641,"HyperDash":false},{"StartTime":197203.0,"Position":192.0,"HyperDash":false}]},{"StartTime":197277.0,"Objects":[{"StartTime":197277.0,"Position":108.0,"HyperDash":false},{"StartTime":197351.0,"Position":51.770916,"HyperDash":false},{"StartTime":197425.0,"Position":108.0,"HyperDash":false},{"StartTime":197499.0,"Position":51.770916,"HyperDash":false},{"StartTime":197573.0,"Position":108.0,"HyperDash":false},{"StartTime":197647.0,"Position":51.770916,"HyperDash":false}]},{"StartTime":197722.0,"Objects":[{"StartTime":197722.0,"Position":0.0,"HyperDash":false},{"StartTime":197815.0,"Position":60.3444443,"HyperDash":false},{"StartTime":197944.0,"Position":111.30835,"HyperDash":false}]},{"StartTime":198166.0,"Objects":[{"StartTime":198166.0,"Position":391.0,"HyperDash":false},{"StartTime":198240.0,"Position":446.9797,"HyperDash":false},{"StartTime":198314.0,"Position":391.0,"HyperDash":false},{"StartTime":198388.0,"Position":446.9797,"HyperDash":false},{"StartTime":198462.0,"Position":391.0,"HyperDash":false},{"StartTime":198536.0,"Position":446.9797,"HyperDash":false}]},{"StartTime":198611.0,"Objects":[{"StartTime":198611.0,"Position":317.0,"HyperDash":false}]},{"StartTime":198685.0,"Objects":[{"StartTime":198685.0,"Position":317.0,"HyperDash":false}]},{"StartTime":198759.0,"Objects":[{"StartTime":198759.0,"Position":317.0,"HyperDash":false}]},{"StartTime":198833.0,"Objects":[{"StartTime":198833.0,"Position":317.0,"HyperDash":false},{"StartTime":198907.0,"Position":261.0203,"HyperDash":false},{"StartTime":198981.0,"Position":317.0,"HyperDash":false}]},{"StartTime":199055.0,"Objects":[{"StartTime":199055.0,"Position":392.0,"HyperDash":false},{"StartTime":199129.0,"Position":400.7968,"HyperDash":false},{"StartTime":199203.0,"Position":392.0,"HyperDash":false},{"StartTime":199277.0,"Position":400.7968,"HyperDash":false},{"StartTime":199351.0,"Position":392.0,"HyperDash":false},{"StartTime":199425.0,"Position":400.7968,"HyperDash":false}]},{"StartTime":199500.0,"Objects":[{"StartTime":199500.0,"Position":494.0,"HyperDash":false},{"StartTime":199574.0,"Position":485.2032,"HyperDash":false},{"StartTime":199648.0,"Position":494.0,"HyperDash":false},{"StartTime":199722.0,"Position":485.2032,"HyperDash":false},{"StartTime":199796.0,"Position":494.0,"HyperDash":false},{"StartTime":199870.0,"Position":485.2032,"HyperDash":false}]},{"StartTime":199944.0,"Objects":[{"StartTime":199944.0,"Position":400.0,"HyperDash":false},{"StartTime":200018.0,"Position":344.0203,"HyperDash":false},{"StartTime":200092.0,"Position":400.0,"HyperDash":false},{"StartTime":200166.0,"Position":344.0203,"HyperDash":false},{"StartTime":200240.0,"Position":400.0,"HyperDash":false},{"StartTime":200314.0,"Position":344.0203,"HyperDash":false}]},{"StartTime":200389.0,"Objects":[{"StartTime":200389.0,"Position":267.0,"HyperDash":false}]},{"StartTime":200463.0,"Objects":[{"StartTime":200463.0,"Position":267.0,"HyperDash":false}]},{"StartTime":200537.0,"Objects":[{"StartTime":200537.0,"Position":267.0,"HyperDash":false}]},{"StartTime":200611.0,"Objects":[{"StartTime":200611.0,"Position":267.0,"HyperDash":false},{"StartTime":200685.0,"Position":211.0203,"HyperDash":false},{"StartTime":200759.0,"Position":267.0,"HyperDash":false}]},{"StartTime":200833.0,"Objects":[{"StartTime":200833.0,"Position":121.0,"HyperDash":false},{"StartTime":200907.0,"Position":112.203186,"HyperDash":false},{"StartTime":200981.0,"Position":121.0,"HyperDash":false},{"StartTime":201055.0,"Position":112.203186,"HyperDash":false},{"StartTime":201129.0,"Position":121.0,"HyperDash":false},{"StartTime":201203.0,"Position":112.203186,"HyperDash":false}]},{"StartTime":201277.0,"Objects":[{"StartTime":201277.0,"Position":179.0,"HyperDash":false},{"StartTime":201351.0,"Position":170.203186,"HyperDash":false},{"StartTime":201425.0,"Position":179.0,"HyperDash":false}]},{"StartTime":201500.0,"Objects":[{"StartTime":201500.0,"Position":67.0,"HyperDash":false},{"StartTime":201574.0,"Position":75.796814,"HyperDash":false},{"StartTime":201648.0,"Position":67.0,"HyperDash":false}]},{"StartTime":201722.0,"Objects":[{"StartTime":201722.0,"Position":11.0,"HyperDash":false}]},{"StartTime":201776.0,"Objects":[{"StartTime":201776.0,"Position":88.0,"HyperDash":false},{"StartTime":201830.0,"Position":257.0,"HyperDash":false},{"StartTime":201885.0,"Position":175.0,"HyperDash":false},{"StartTime":201940.0,"Position":38.0,"HyperDash":false},{"StartTime":201994.0,"Position":283.0,"HyperDash":false},{"StartTime":202049.0,"Position":138.0,"HyperDash":false},{"StartTime":202104.0,"Position":102.0,"HyperDash":false},{"StartTime":202158.0,"Position":494.0,"HyperDash":false},{"StartTime":202213.0,"Position":54.0,"HyperDash":false},{"StartTime":202268.0,"Position":29.0,"HyperDash":false},{"StartTime":202322.0,"Position":69.0,"HyperDash":false},{"StartTime":202377.0,"Position":110.0,"HyperDash":false},{"StartTime":202432.0,"Position":167.0,"HyperDash":false},{"StartTime":202486.0,"Position":56.0,"HyperDash":false},{"StartTime":202541.0,"Position":10.0,"HyperDash":false},{"StartTime":202596.0,"Position":308.0,"HyperDash":false},{"StartTime":202651.0,"Position":288.0,"HyperDash":false},{"StartTime":202705.0,"Position":57.0,"HyperDash":false},{"StartTime":202760.0,"Position":258.0,"HyperDash":false},{"StartTime":202815.0,"Position":180.0,"HyperDash":false},{"StartTime":202869.0,"Position":198.0,"HyperDash":false},{"StartTime":202924.0,"Position":211.0,"HyperDash":false},{"StartTime":202979.0,"Position":503.0,"HyperDash":false},{"StartTime":203033.0,"Position":324.0,"HyperDash":false},{"StartTime":203088.0,"Position":20.0,"HyperDash":false},{"StartTime":203143.0,"Position":169.0,"HyperDash":false},{"StartTime":203197.0,"Position":93.0,"HyperDash":false},{"StartTime":203252.0,"Position":267.0,"HyperDash":false},{"StartTime":203307.0,"Position":276.0,"HyperDash":false},{"StartTime":203361.0,"Position":367.0,"HyperDash":false},{"StartTime":203416.0,"Position":409.0,"HyperDash":false},{"StartTime":203471.0,"Position":117.0,"HyperDash":false},{"StartTime":203526.0,"Position":226.0,"HyperDash":false},{"StartTime":203580.0,"Position":469.0,"HyperDash":false},{"StartTime":203635.0,"Position":267.0,"HyperDash":false},{"StartTime":203690.0,"Position":477.0,"HyperDash":false},{"StartTime":203744.0,"Position":282.0,"HyperDash":false},{"StartTime":203799.0,"Position":216.0,"HyperDash":false},{"StartTime":203854.0,"Position":106.0,"HyperDash":false},{"StartTime":203908.0,"Position":353.0,"HyperDash":false},{"StartTime":203963.0,"Position":162.0,"HyperDash":false},{"StartTime":204018.0,"Position":473.0,"HyperDash":false},{"StartTime":204072.0,"Position":260.0,"HyperDash":false},{"StartTime":204127.0,"Position":367.0,"HyperDash":false},{"StartTime":204182.0,"Position":409.0,"HyperDash":false},{"StartTime":204236.0,"Position":145.0,"HyperDash":false},{"StartTime":204291.0,"Position":330.0,"HyperDash":false},{"StartTime":204346.0,"Position":104.0,"HyperDash":false},{"StartTime":204401.0,"Position":412.0,"HyperDash":false},{"StartTime":204455.0,"Position":104.0,"HyperDash":false},{"StartTime":204510.0,"Position":396.0,"HyperDash":false},{"StartTime":204565.0,"Position":192.0,"HyperDash":false},{"StartTime":204619.0,"Position":446.0,"HyperDash":false},{"StartTime":204674.0,"Position":110.0,"HyperDash":false},{"StartTime":204729.0,"Position":372.0,"HyperDash":false},{"StartTime":204783.0,"Position":100.0,"HyperDash":false},{"StartTime":204838.0,"Position":161.0,"HyperDash":false},{"StartTime":204893.0,"Position":456.0,"HyperDash":false},{"StartTime":204947.0,"Position":187.0,"HyperDash":false},{"StartTime":205002.0,"Position":99.0,"HyperDash":false},{"StartTime":205057.0,"Position":197.0,"HyperDash":false},{"StartTime":205111.0,"Position":116.0,"HyperDash":false},{"StartTime":205166.0,"Position":496.0,"HyperDash":false},{"StartTime":205221.0,"Position":143.0,"HyperDash":false},{"StartTime":205276.0,"Position":431.0,"HyperDash":false}]},{"StartTime":207943.0,"Objects":[{"StartTime":207943.0,"Position":171.0,"HyperDash":false},{"StartTime":208011.0,"Position":175.536011,"HyperDash":false},{"StartTime":208079.0,"Position":171.0,"HyperDash":false},{"StartTime":208147.0,"Position":175.536011,"HyperDash":false},{"StartTime":208215.0,"Position":171.0,"HyperDash":false},{"StartTime":208283.0,"Position":175.536011,"HyperDash":false},{"StartTime":208352.0,"Position":171.0,"HyperDash":false},{"StartTime":208420.0,"Position":175.536011,"HyperDash":false},{"StartTime":208488.0,"Position":171.0,"HyperDash":false},{"StartTime":208556.0,"Position":175.536011,"HyperDash":false},{"StartTime":208624.0,"Position":171.0,"HyperDash":false},{"StartTime":208693.0,"Position":175.536011,"HyperDash":false},{"StartTime":208761.0,"Position":171.0,"HyperDash":false},{"StartTime":208829.0,"Position":175.536011,"HyperDash":false},{"StartTime":208897.0,"Position":171.0,"HyperDash":false},{"StartTime":208965.0,"Position":175.536011,"HyperDash":false},{"StartTime":209033.0,"Position":171.0,"HyperDash":false},{"StartTime":209102.0,"Position":175.536011,"HyperDash":false},{"StartTime":209170.0,"Position":171.0,"HyperDash":false},{"StartTime":209238.0,"Position":175.536011,"HyperDash":false},{"StartTime":209306.0,"Position":171.0,"HyperDash":false},{"StartTime":209374.0,"Position":175.536011,"HyperDash":false},{"StartTime":209443.0,"Position":171.0,"HyperDash":false},{"StartTime":209511.0,"Position":175.536011,"HyperDash":false},{"StartTime":209579.0,"Position":171.0,"HyperDash":false},{"StartTime":209647.0,"Position":175.536011,"HyperDash":false},{"StartTime":209715.0,"Position":171.0,"HyperDash":false},{"StartTime":209783.0,"Position":175.536011,"HyperDash":false},{"StartTime":209852.0,"Position":171.0,"HyperDash":false},{"StartTime":209920.0,"Position":175.536011,"HyperDash":false},{"StartTime":209988.0,"Position":171.0,"HyperDash":false},{"StartTime":210056.0,"Position":175.536011,"HyperDash":false}]},{"StartTime":210124.0,"Objects":[{"StartTime":210124.0,"Position":85.0,"HyperDash":false}]},{"StartTime":210329.0,"Objects":[{"StartTime":210329.0,"Position":73.0,"HyperDash":false}]},{"StartTime":210533.0,"Objects":[{"StartTime":210533.0,"Position":243.0,"HyperDash":false}]},{"StartTime":210670.0,"Objects":[{"StartTime":210670.0,"Position":122.0,"HyperDash":false}]},{"StartTime":210875.0,"Objects":[{"StartTime":210875.0,"Position":61.0,"HyperDash":false}]},{"StartTime":211079.0,"Objects":[{"StartTime":211079.0,"Position":246.0,"HyperDash":false}]},{"StartTime":211215.0,"Objects":[{"StartTime":211215.0,"Position":294.0,"HyperDash":false},{"StartTime":211283.0,"Position":253.395386,"HyperDash":false},{"StartTime":211351.0,"Position":294.0,"HyperDash":false},{"StartTime":211419.0,"Position":253.395386,"HyperDash":false}]},{"StartTime":211488.0,"Objects":[{"StartTime":211488.0,"Position":369.0,"HyperDash":false},{"StartTime":211556.0,"Position":409.5123,"HyperDash":false},{"StartTime":211624.0,"Position":369.0,"HyperDash":false},{"StartTime":211692.0,"Position":409.5123,"HyperDash":false}]},{"StartTime":211761.0,"Objects":[{"StartTime":211761.0,"Position":319.0,"HyperDash":false},{"StartTime":211829.0,"Position":306.78772,"HyperDash":false},{"StartTime":211897.0,"Position":319.0,"HyperDash":false},{"StartTime":211965.0,"Position":306.78772,"HyperDash":false}]},{"StartTime":212033.0,"Objects":[{"StartTime":212033.0,"Position":221.0,"HyperDash":false},{"StartTime":212101.0,"Position":209.0618,"HyperDash":false},{"StartTime":212169.0,"Position":221.0,"HyperDash":false},{"StartTime":212237.0,"Position":209.0618,"HyperDash":false}]},{"StartTime":212306.0,"Objects":[{"StartTime":212306.0,"Position":121.0,"HyperDash":false}]},{"StartTime":212374.0,"Objects":[{"StartTime":212374.0,"Position":112.0,"HyperDash":false}]},{"StartTime":212442.0,"Objects":[{"StartTime":212442.0,"Position":103.0,"HyperDash":false}]},{"StartTime":212579.0,"Objects":[{"StartTime":212579.0,"Position":78.0,"HyperDash":false}]},{"StartTime":212647.0,"Objects":[{"StartTime":212647.0,"Position":87.0,"HyperDash":false}]},{"StartTime":212715.0,"Objects":[{"StartTime":212715.0,"Position":96.0,"HyperDash":false}]},{"StartTime":212851.0,"Objects":[{"StartTime":212851.0,"Position":0.0,"HyperDash":false},{"StartTime":212919.0,"Position":12.8453636,"HyperDash":false},{"StartTime":212987.0,"Position":0.0,"HyperDash":false}]},{"StartTime":213124.0,"Objects":[{"StartTime":213124.0,"Position":77.0,"HyperDash":false},{"StartTime":213192.0,"Position":65.0618057,"HyperDash":false},{"StartTime":213260.0,"Position":77.0,"HyperDash":false}]},{"StartTime":213397.0,"Objects":[{"StartTime":213397.0,"Position":131.0,"HyperDash":false},{"StartTime":213465.0,"Position":171.788834,"HyperDash":false},{"StartTime":213533.0,"Position":131.0,"HyperDash":false},{"StartTime":213601.0,"Position":171.788834,"HyperDash":false}]},{"StartTime":213670.0,"Objects":[{"StartTime":213670.0,"Position":261.0,"HyperDash":false},{"StartTime":213738.0,"Position":301.6046,"HyperDash":false},{"StartTime":213806.0,"Position":261.0,"HyperDash":false},{"StartTime":213874.0,"Position":301.6046,"HyperDash":false}]},{"StartTime":213942.0,"Objects":[{"StartTime":213942.0,"Position":366.0,"HyperDash":false},{"StartTime":214010.0,"Position":353.78772,"HyperDash":false},{"StartTime":214078.0,"Position":366.0,"HyperDash":false},{"StartTime":214146.0,"Position":353.78772,"HyperDash":false}]},{"StartTime":214215.0,"Objects":[{"StartTime":214215.0,"Position":456.0,"HyperDash":false},{"StartTime":214283.0,"Position":443.78772,"HyperDash":false},{"StartTime":214351.0,"Position":456.0,"HyperDash":false},{"StartTime":214419.0,"Position":443.78772,"HyperDash":false}]},{"StartTime":214488.0,"Objects":[{"StartTime":214488.0,"Position":490.0,"HyperDash":false}]},{"StartTime":214556.0,"Objects":[{"StartTime":214556.0,"Position":487.0,"HyperDash":false}]},{"StartTime":214624.0,"Objects":[{"StartTime":214624.0,"Position":484.0,"HyperDash":false}]},{"StartTime":214761.0,"Objects":[{"StartTime":214761.0,"Position":419.0,"HyperDash":false}]},{"StartTime":214829.0,"Objects":[{"StartTime":214829.0,"Position":422.0,"HyperDash":false}]},{"StartTime":214897.0,"Objects":[{"StartTime":214897.0,"Position":425.0,"HyperDash":false}]},{"StartTime":215033.0,"Objects":[{"StartTime":215033.0,"Position":344.0,"HyperDash":false}]},{"StartTime":215101.0,"Objects":[{"StartTime":215101.0,"Position":336.0,"HyperDash":false}]},{"StartTime":215170.0,"Objects":[{"StartTime":215170.0,"Position":328.0,"HyperDash":false},{"StartTime":215306.0,"Position":243.560242,"HyperDash":false}]},{"StartTime":215579.0,"Objects":[{"StartTime":215579.0,"Position":238.0,"HyperDash":false},{"StartTime":215647.0,"Position":250.21228,"HyperDash":false},{"StartTime":215715.0,"Position":238.0,"HyperDash":false},{"StartTime":215783.0,"Position":250.21228,"HyperDash":false}]},{"StartTime":215852.0,"Objects":[{"StartTime":215852.0,"Position":182.0,"HyperDash":false},{"StartTime":215920.0,"Position":169.78772,"HyperDash":false},{"StartTime":215988.0,"Position":182.0,"HyperDash":false},{"StartTime":216056.0,"Position":169.78772,"HyperDash":false}]},{"StartTime":216124.0,"Objects":[{"StartTime":216124.0,"Position":90.0,"HyperDash":false},{"StartTime":216192.0,"Position":49.2111626,"HyperDash":false},{"StartTime":216260.0,"Position":90.0,"HyperDash":false},{"StartTime":216328.0,"Position":49.2111626,"HyperDash":false}]},{"StartTime":216397.0,"Objects":[{"StartTime":216397.0,"Position":51.0,"HyperDash":false},{"StartTime":216465.0,"Position":10.3953857,"HyperDash":false},{"StartTime":216533.0,"Position":51.0,"HyperDash":false},{"StartTime":216601.0,"Position":10.3953857,"HyperDash":false}]},{"StartTime":216670.0,"Objects":[{"StartTime":216670.0,"Position":64.0,"HyperDash":false}]},{"StartTime":216738.0,"Objects":[{"StartTime":216738.0,"Position":73.0,"HyperDash":false}]},{"StartTime":216806.0,"Objects":[{"StartTime":216806.0,"Position":82.0,"HyperDash":false}]},{"StartTime":216942.0,"Objects":[{"StartTime":216942.0,"Position":191.0,"HyperDash":false}]},{"StartTime":217010.0,"Objects":[{"StartTime":217010.0,"Position":200.0,"HyperDash":false}]},{"StartTime":217078.0,"Objects":[{"StartTime":217078.0,"Position":209.0,"HyperDash":false}]},{"StartTime":217215.0,"Objects":[{"StartTime":217215.0,"Position":243.0,"HyperDash":false},{"StartTime":217283.0,"Position":283.6046,"HyperDash":false},{"StartTime":217351.0,"Position":243.0,"HyperDash":false}]},{"StartTime":217488.0,"Objects":[{"StartTime":217488.0,"Position":350.0,"HyperDash":false},{"StartTime":217556.0,"Position":309.211151,"HyperDash":false},{"StartTime":217624.0,"Position":350.0,"HyperDash":false}]},{"StartTime":217761.0,"Objects":[{"StartTime":217761.0,"Position":425.0,"HyperDash":false},{"StartTime":217829.0,"Position":412.78772,"HyperDash":false},{"StartTime":217897.0,"Position":425.0,"HyperDash":false},{"StartTime":217965.0,"Position":412.78772,"HyperDash":false}]},{"StartTime":218034.0,"Objects":[{"StartTime":218034.0,"Position":481.0,"HyperDash":false},{"StartTime":218102.0,"Position":493.21228,"HyperDash":false},{"StartTime":218170.0,"Position":481.0,"HyperDash":false},{"StartTime":218238.0,"Position":493.21228,"HyperDash":false}]},{"StartTime":218306.0,"Objects":[{"StartTime":218306.0,"Position":411.0,"HyperDash":false},{"StartTime":218374.0,"Position":370.211151,"HyperDash":false},{"StartTime":218442.0,"Position":411.0,"HyperDash":false},{"StartTime":218510.0,"Position":370.211151,"HyperDash":false}]},{"StartTime":218579.0,"Objects":[{"StartTime":218579.0,"Position":328.0,"HyperDash":false},{"StartTime":218647.0,"Position":287.3954,"HyperDash":false},{"StartTime":218715.0,"Position":328.0,"HyperDash":false},{"StartTime":218783.0,"Position":287.3954,"HyperDash":false}]},{"StartTime":218851.0,"Objects":[{"StartTime":218851.0,"Position":208.0,"HyperDash":false}]},{"StartTime":218919.0,"Objects":[{"StartTime":218919.0,"Position":205.0,"HyperDash":false}]},{"StartTime":218987.0,"Objects":[{"StartTime":218987.0,"Position":202.0,"HyperDash":false}]},{"StartTime":219124.0,"Objects":[{"StartTime":219124.0,"Position":120.0,"HyperDash":false}]},{"StartTime":219192.0,"Objects":[{"StartTime":219192.0,"Position":117.0,"HyperDash":false}]},{"StartTime":219260.0,"Objects":[{"StartTime":219260.0,"Position":114.0,"HyperDash":false}]},{"StartTime":219397.0,"Objects":[{"StartTime":219397.0,"Position":44.0,"HyperDash":false},{"StartTime":219465.0,"Position":51.91918,"HyperDash":false},{"StartTime":219533.0,"Position":44.0,"HyperDash":false},{"StartTime":219601.0,"Position":51.91918,"HyperDash":false},{"StartTime":219669.0,"Position":44.0,"HyperDash":false},{"StartTime":219737.0,"Position":51.91918,"HyperDash":false},{"StartTime":219806.0,"Position":44.0,"HyperDash":false},{"StartTime":219874.0,"Position":51.91918,"HyperDash":false}]},{"StartTime":219943.0,"Objects":[{"StartTime":219943.0,"Position":142.0,"HyperDash":false}]},{"StartTime":220011.0,"Objects":[{"StartTime":220011.0,"Position":146.0,"HyperDash":false}]},{"StartTime":220079.0,"Objects":[{"StartTime":220079.0,"Position":151.0,"HyperDash":false},{"StartTime":220147.0,"Position":192.8533,"HyperDash":false},{"StartTime":220215.0,"Position":151.0,"HyperDash":false},{"StartTime":220283.0,"Position":192.8533,"HyperDash":false}]},{"StartTime":220352.0,"Objects":[{"StartTime":220352.0,"Position":269.0,"HyperDash":false},{"StartTime":220420.0,"Position":310.8533,"HyperDash":false}]},{"StartTime":220488.0,"Objects":[{"StartTime":220488.0,"Position":320.0,"HyperDash":false},{"StartTime":220556.0,"Position":361.8533,"HyperDash":false},{"StartTime":220624.0,"Position":320.0,"HyperDash":false},{"StartTime":220692.0,"Position":361.8533,"HyperDash":false},{"StartTime":220760.0,"Position":320.0,"HyperDash":false},{"StartTime":220828.0,"Position":361.8533,"HyperDash":false},{"StartTime":220897.0,"Position":320.0,"HyperDash":false},{"StartTime":220965.0,"Position":361.8533,"HyperDash":false},{"StartTime":221033.0,"Position":320.0,"HyperDash":false}]},{"StartTime":222670.0,"Objects":[{"StartTime":222670.0,"Position":364.0,"HyperDash":false},{"StartTime":222738.0,"Position":404.113983,"HyperDash":false},{"StartTime":222806.0,"Position":364.0,"HyperDash":false},{"StartTime":222874.0,"Position":404.113983,"HyperDash":false},{"StartTime":222942.0,"Position":364.0,"HyperDash":false},{"StartTime":223010.0,"Position":404.113983,"HyperDash":false},{"StartTime":223079.0,"Position":364.0,"HyperDash":false},{"StartTime":223147.0,"Position":404.113983,"HyperDash":false}]},{"StartTime":223215.0,"Objects":[{"StartTime":223215.0,"Position":487.0,"HyperDash":false},{"StartTime":223351.0,"Position":471.39093,"HyperDash":false}]},{"StartTime":223488.0,"Objects":[{"StartTime":223488.0,"Position":437.0,"HyperDash":false},{"StartTime":223624.0,"Position":421.39093,"HyperDash":false}]},{"StartTime":223761.0,"Objects":[{"StartTime":223761.0,"Position":314.0,"HyperDash":false}]},{"StartTime":223897.0,"Objects":[{"StartTime":223897.0,"Position":240.0,"HyperDash":false}]},{"StartTime":223965.0,"Objects":[{"StartTime":223965.0,"Position":240.0,"HyperDash":false}]},{"StartTime":224033.0,"Objects":[{"StartTime":224033.0,"Position":240.0,"HyperDash":false},{"StartTime":224169.0,"Position":156.4455,"HyperDash":false}]},{"StartTime":224306.0,"Objects":[{"StartTime":224306.0,"Position":37.0,"HyperDash":false}]},{"StartTime":224443.0,"Objects":[{"StartTime":224443.0,"Position":37.0,"HyperDash":false}]},{"StartTime":224579.0,"Objects":[{"StartTime":224579.0,"Position":142.0,"HyperDash":false},{"StartTime":224715.0,"Position":225.463379,"HyperDash":false}]},{"StartTime":224852.0,"Objects":[{"StartTime":224852.0,"Position":304.0,"HyperDash":false},{"StartTime":224988.0,"Position":287.910675,"HyperDash":false}]},{"StartTime":225124.0,"Objects":[{"StartTime":225124.0,"Position":164.0,"HyperDash":false},{"StartTime":225192.0,"Position":172.139191,"HyperDash":false},{"StartTime":225260.0,"Position":164.0,"HyperDash":false},{"StartTime":225328.0,"Position":172.139191,"HyperDash":false}]},{"StartTime":225397.0,"Objects":[{"StartTime":225397.0,"Position":84.0,"HyperDash":false},{"StartTime":225533.0,"Position":144.172775,"HyperDash":false}]},{"StartTime":225670.0,"Objects":[{"StartTime":225670.0,"Position":86.0,"HyperDash":false},{"StartTime":225806.0,"Position":25.8272362,"HyperDash":false}]},{"StartTime":225943.0,"Objects":[{"StartTime":225943.0,"Position":39.0,"HyperDash":false},{"StartTime":226079.0,"Position":47.27571,"HyperDash":false}]},{"StartTime":226215.0,"Objects":[{"StartTime":226215.0,"Position":137.0,"HyperDash":false},{"StartTime":226351.0,"Position":128.724289,"HyperDash":false}]},{"StartTime":226488.0,"Objects":[{"StartTime":226488.0,"Position":237.0,"HyperDash":false},{"StartTime":226624.0,"Position":321.596161,"HyperDash":false}]},{"StartTime":226761.0,"Objects":[{"StartTime":226761.0,"Position":361.0,"HyperDash":false}]},{"StartTime":226897.0,"Objects":[{"StartTime":226897.0,"Position":361.0,"HyperDash":false}]},{"StartTime":227033.0,"Objects":[{"StartTime":227033.0,"Position":488.0,"HyperDash":false},{"StartTime":227169.0,"Position":479.724274,"HyperDash":false}]},{"StartTime":227306.0,"Objects":[{"StartTime":227306.0,"Position":429.0,"HyperDash":false},{"StartTime":227442.0,"Position":437.275726,"HyperDash":false}]},{"StartTime":227579.0,"Objects":[{"StartTime":227579.0,"Position":361.0,"HyperDash":false},{"StartTime":227715.0,"Position":346.8173,"HyperDash":false}]},{"StartTime":227852.0,"Objects":[{"StartTime":227852.0,"Position":195.0,"HyperDash":false},{"StartTime":227988.0,"Position":179.865,"HyperDash":false}]},{"StartTime":228124.0,"Objects":[{"StartTime":228124.0,"Position":211.0,"HyperDash":false}]},{"StartTime":228261.0,"Objects":[{"StartTime":228261.0,"Position":131.0,"HyperDash":false}]},{"StartTime":228329.0,"Objects":[{"StartTime":228329.0,"Position":131.0,"HyperDash":false}]},{"StartTime":228397.0,"Objects":[{"StartTime":228397.0,"Position":131.0,"HyperDash":false},{"StartTime":228533.0,"Position":46.3490829,"HyperDash":false}]},{"StartTime":228670.0,"Objects":[{"StartTime":228670.0,"Position":67.0,"HyperDash":false}]},{"StartTime":228738.0,"Objects":[{"StartTime":228738.0,"Position":59.0,"HyperDash":false}]},{"StartTime":228806.0,"Objects":[{"StartTime":228806.0,"Position":63.0,"HyperDash":false}]},{"StartTime":228874.0,"Objects":[{"StartTime":228874.0,"Position":79.0,"HyperDash":false}]},{"StartTime":228942.0,"Objects":[{"StartTime":228942.0,"Position":104.0,"HyperDash":false}]},{"StartTime":229079.0,"Objects":[{"StartTime":229079.0,"Position":210.0,"HyperDash":false}]},{"StartTime":229147.0,"Objects":[{"StartTime":229147.0,"Position":224.0,"HyperDash":false}]},{"StartTime":229215.0,"Objects":[{"StartTime":229215.0,"Position":238.0,"HyperDash":false},{"StartTime":229283.0,"Position":199.132248,"HyperDash":false},{"StartTime":229351.0,"Position":238.0,"HyperDash":false}]},{"StartTime":229488.0,"Objects":[{"StartTime":229488.0,"Position":353.0,"HyperDash":false},{"StartTime":229556.0,"Position":336.0176,"HyperDash":false}]},{"StartTime":229624.0,"Objects":[{"StartTime":229624.0,"Position":425.0,"HyperDash":false},{"StartTime":229692.0,"Position":408.0176,"HyperDash":false}]},{"StartTime":229760.0,"Objects":[{"StartTime":229760.0,"Position":495.0,"HyperDash":false}]},{"StartTime":231943.0,"Objects":[{"StartTime":231943.0,"Position":221.0,"HyperDash":false}]},{"StartTime":233579.0,"Objects":[{"StartTime":233579.0,"Position":102.0,"HyperDash":false},{"StartTime":233669.0,"Position":37.721508,"HyperDash":false},{"StartTime":233760.0,"Position":102.0,"HyperDash":false},{"StartTime":233851.0,"Position":37.721508,"HyperDash":false},{"StartTime":233942.0,"Position":102.0,"HyperDash":false},{"StartTime":234033.0,"Position":37.721508,"HyperDash":false}]},{"StartTime":234124.0,"Objects":[{"StartTime":234124.0,"Position":93.0,"HyperDash":false},{"StartTime":234214.0,"Position":65.15,"HyperDash":false},{"StartTime":234305.0,"Position":93.0,"HyperDash":false}]},{"StartTime":234397.0,"Objects":[{"StartTime":234397.0,"Position":185.0,"HyperDash":false},{"StartTime":234487.0,"Position":191.729935,"HyperDash":false},{"StartTime":234578.0,"Position":185.0,"HyperDash":false}]},{"StartTime":234670.0,"Objects":[{"StartTime":234670.0,"Position":257.0,"HyperDash":false},{"StartTime":234760.0,"Position":229.150009,"HyperDash":false},{"StartTime":234851.0,"Position":257.0,"HyperDash":false}]},{"StartTime":234943.0,"Objects":[{"StartTime":234943.0,"Position":349.0,"HyperDash":false},{"StartTime":235033.0,"Position":355.43277,"HyperDash":false},{"StartTime":235124.0,"Position":349.0,"HyperDash":false}]},{"StartTime":235215.0,"Objects":[{"StartTime":235215.0,"Position":431.0,"HyperDash":false}]},{"StartTime":235306.0,"Objects":[{"StartTime":235306.0,"Position":439.0,"HyperDash":false},{"StartTime":235396.0,"Position":505.57785,"HyperDash":false}]},{"StartTime":235488.0,"Objects":[{"StartTime":235488.0,"Position":502.0,"HyperDash":false}]},{"StartTime":235579.0,"Objects":[{"StartTime":235579.0,"Position":460.0,"HyperDash":false}]},{"StartTime":235670.0,"Objects":[{"StartTime":235670.0,"Position":406.0,"HyperDash":false}]},{"StartTime":235760.0,"Objects":[{"StartTime":235760.0,"Position":358.0,"HyperDash":false},{"StartTime":235819.0,"Position":304.872559,"HyperDash":false},{"StartTime":235878.0,"Position":274.370667,"HyperDash":false},{"StartTime":235937.0,"Position":254.265121,"HyperDash":false},{"StartTime":236032.0,"Position":204.708969,"HyperDash":false}]},{"StartTime":236306.0,"Objects":[{"StartTime":236306.0,"Position":204.0,"HyperDash":false},{"StartTime":236396.0,"Position":271.720734,"HyperDash":false},{"StartTime":236487.0,"Position":204.0,"HyperDash":false}]},{"StartTime":236579.0,"Objects":[{"StartTime":236579.0,"Position":161.0,"HyperDash":false},{"StartTime":236669.0,"Position":228.033157,"HyperDash":false},{"StartTime":236760.0,"Position":161.0,"HyperDash":false}]},{"StartTime":236852.0,"Objects":[{"StartTime":236852.0,"Position":77.0,"HyperDash":false},{"StartTime":236942.0,"Position":9.279259,"HyperDash":false},{"StartTime":237033.0,"Position":77.0,"HyperDash":false}]},{"StartTime":237125.0,"Objects":[{"StartTime":237125.0,"Position":120.0,"HyperDash":false},{"StartTime":237215.0,"Position":52.9668427,"HyperDash":false},{"StartTime":237306.0,"Position":120.0,"HyperDash":false}]},{"StartTime":237397.0,"Objects":[{"StartTime":237397.0,"Position":194.0,"HyperDash":false}]},{"StartTime":237488.0,"Objects":[{"StartTime":237488.0,"Position":203.0,"HyperDash":false},{"StartTime":237578.0,"Position":216.523163,"HyperDash":false}]},{"StartTime":237670.0,"Objects":[{"StartTime":237670.0,"Position":296.0,"HyperDash":false}]},{"StartTime":237760.0,"Objects":[{"StartTime":237760.0,"Position":349.0,"HyperDash":false}]},{"StartTime":237851.0,"Objects":[{"StartTime":237851.0,"Position":391.0,"HyperDash":false}]},{"StartTime":237942.0,"Objects":[{"StartTime":237942.0,"Position":400.0,"HyperDash":false},{"StartTime":238001.0,"Position":373.357147,"HyperDash":false},{"StartTime":238060.0,"Position":359.412537,"HyperDash":false},{"StartTime":238119.0,"Position":345.3219,"HyperDash":false},{"StartTime":238214.0,"Position":385.5706,"HyperDash":false}]},{"StartTime":238488.0,"Objects":[{"StartTime":238488.0,"Position":385.0,"HyperDash":false},{"StartTime":238578.0,"Position":370.624329,"HyperDash":false},{"StartTime":238669.0,"Position":385.0,"HyperDash":false}]},{"StartTime":238761.0,"Objects":[{"StartTime":238761.0,"Position":276.0,"HyperDash":false},{"StartTime":238851.0,"Position":295.94812,"HyperDash":false},{"StartTime":238942.0,"Position":276.0,"HyperDash":false}]},{"StartTime":239033.0,"Objects":[{"StartTime":239033.0,"Position":188.0,"HyperDash":false},{"StartTime":239123.0,"Position":208.0458,"HyperDash":false},{"StartTime":239214.0,"Position":188.0,"HyperDash":false}]},{"StartTime":239306.0,"Objects":[{"StartTime":239306.0,"Position":129.0,"HyperDash":false},{"StartTime":239396.0,"Position":177.393921,"HyperDash":false},{"StartTime":239487.0,"Position":129.0,"HyperDash":false}]},{"StartTime":239579.0,"Objects":[{"StartTime":239579.0,"Position":38.0,"HyperDash":false}]},{"StartTime":239670.0,"Objects":[{"StartTime":239670.0,"Position":32.0,"HyperDash":false},{"StartTime":239760.0,"Position":54.9123878,"HyperDash":false}]},{"StartTime":239851.0,"Objects":[{"StartTime":239851.0,"Position":20.0,"HyperDash":false}]},{"StartTime":239942.0,"Objects":[{"StartTime":239942.0,"Position":57.0,"HyperDash":false}]},{"StartTime":240033.0,"Objects":[{"StartTime":240033.0,"Position":108.0,"HyperDash":false}]},{"StartTime":240124.0,"Objects":[{"StartTime":240124.0,"Position":161.0,"HyperDash":false},{"StartTime":240183.0,"Position":220.613419,"HyperDash":false},{"StartTime":240242.0,"Position":252.59671,"HyperDash":false},{"StartTime":240301.0,"Position":306.131134,"HyperDash":false},{"StartTime":240396.0,"Position":360.49115,"HyperDash":false}]},{"StartTime":240670.0,"Objects":[{"StartTime":240670.0,"Position":360.0,"HyperDash":false},{"StartTime":240760.0,"Position":296.123718,"HyperDash":false},{"StartTime":240851.0,"Position":360.0,"HyperDash":false}]},{"StartTime":240942.0,"Objects":[{"StartTime":240942.0,"Position":460.0,"HyperDash":false},{"StartTime":241032.0,"Position":404.530151,"HyperDash":false},{"StartTime":241123.0,"Position":460.0,"HyperDash":false}]},{"StartTime":241215.0,"Objects":[{"StartTime":241215.0,"Position":448.0,"HyperDash":false},{"StartTime":241305.0,"Position":511.876282,"HyperDash":false},{"StartTime":241396.0,"Position":448.0,"HyperDash":false}]},{"StartTime":241488.0,"Objects":[{"StartTime":241488.0,"Position":430.0,"HyperDash":false},{"StartTime":241578.0,"Position":485.1262,"HyperDash":false},{"StartTime":241669.0,"Position":430.0,"HyperDash":false}]},{"StartTime":241760.0,"Objects":[{"StartTime":241760.0,"Position":365.0,"HyperDash":false}]},{"StartTime":241852.0,"Objects":[{"StartTime":241852.0,"Position":354.0,"HyperDash":false},{"StartTime":241942.0,"Position":330.3751,"HyperDash":false}]},{"StartTime":242033.0,"Objects":[{"StartTime":242033.0,"Position":244.0,"HyperDash":false}]},{"StartTime":242124.0,"Objects":[{"StartTime":242124.0,"Position":191.0,"HyperDash":false}]},{"StartTime":242215.0,"Objects":[{"StartTime":242215.0,"Position":145.0,"HyperDash":false}]},{"StartTime":242306.0,"Objects":[{"StartTime":242306.0,"Position":91.0,"HyperDash":false},{"StartTime":242396.0,"Position":116.832222,"HyperDash":false},{"StartTime":242487.0,"Position":96.35042,"HyperDash":false},{"StartTime":242560.0,"Position":123.330132,"HyperDash":false},{"StartTime":242669.0,"Position":91.0,"HyperDash":false}]},{"StartTime":242852.0,"Objects":[{"StartTime":242852.0,"Position":33.0,"HyperDash":false},{"StartTime":242920.0,"Position":40.2480125,"HyperDash":false},{"StartTime":242988.0,"Position":33.0,"HyperDash":false},{"StartTime":243056.0,"Position":40.2480125,"HyperDash":false}]},{"StartTime":243125.0,"Objects":[{"StartTime":243125.0,"Position":134.0,"HyperDash":false},{"StartTime":243193.0,"Position":126.751991,"HyperDash":false},{"StartTime":243261.0,"Position":134.0,"HyperDash":false},{"StartTime":243329.0,"Position":126.751991,"HyperDash":false}]},{"StartTime":243397.0,"Objects":[{"StartTime":243397.0,"Position":228.0,"HyperDash":false},{"StartTime":243465.0,"Position":269.713348,"HyperDash":false}]},{"StartTime":243534.0,"Objects":[{"StartTime":243534.0,"Position":251.0,"HyperDash":false},{"StartTime":243602.0,"Position":292.713348,"HyperDash":false}]},{"StartTime":243671.0,"Objects":[{"StartTime":243671.0,"Position":276.0,"HyperDash":false},{"StartTime":243739.0,"Position":317.713348,"HyperDash":false},{"StartTime":243807.0,"Position":276.0,"HyperDash":false},{"StartTime":243875.0,"Position":317.713348,"HyperDash":false}]},{"StartTime":243943.0,"Objects":[{"StartTime":243943.0,"Position":388.0,"HyperDash":false},{"StartTime":244011.0,"Position":380.751984,"HyperDash":false},{"StartTime":244079.0,"Position":388.0,"HyperDash":false}]},{"StartTime":244216.0,"Objects":[{"StartTime":244216.0,"Position":409.0,"HyperDash":false}]},{"StartTime":244284.0,"Objects":[{"StartTime":244284.0,"Position":407.0,"HyperDash":false}]},{"StartTime":244352.0,"Objects":[{"StartTime":244352.0,"Position":405.0,"HyperDash":false}]},{"StartTime":244489.0,"Objects":[{"StartTime":244489.0,"Position":495.0,"HyperDash":false},{"StartTime":244557.0,"Position":502.248016,"HyperDash":false},{"StartTime":244625.0,"Position":495.0,"HyperDash":false}]},{"StartTime":244762.0,"Objects":[{"StartTime":244762.0,"Position":426.0,"HyperDash":false}]},{"StartTime":244830.0,"Objects":[{"StartTime":244830.0,"Position":428.0,"HyperDash":false}]},{"StartTime":244898.0,"Objects":[{"StartTime":244898.0,"Position":430.0,"HyperDash":false}]},{"StartTime":245034.0,"Objects":[{"StartTime":245034.0,"Position":370.0,"HyperDash":false},{"StartTime":245102.0,"Position":328.1226,"HyperDash":false},{"StartTime":245170.0,"Position":370.0,"HyperDash":false},{"StartTime":245238.0,"Position":328.1226,"HyperDash":false}]},{"StartTime":245307.0,"Objects":[{"StartTime":245307.0,"Position":331.0,"HyperDash":false},{"StartTime":245375.0,"Position":289.1226,"HyperDash":false},{"StartTime":245443.0,"Position":331.0,"HyperDash":false},{"StartTime":245511.0,"Position":289.1226,"HyperDash":false}]},{"StartTime":245579.0,"Objects":[{"StartTime":245579.0,"Position":229.0,"HyperDash":false},{"StartTime":245647.0,"Position":235.986954,"HyperDash":false}]},{"StartTime":245716.0,"Objects":[{"StartTime":245716.0,"Position":140.0,"HyperDash":false},{"StartTime":245784.0,"Position":146.986954,"HyperDash":false}]},{"StartTime":245853.0,"Objects":[{"StartTime":245853.0,"Position":50.0,"HyperDash":false},{"StartTime":245921.0,"Position":56.9869576,"HyperDash":false},{"StartTime":245989.0,"Position":50.0,"HyperDash":false},{"StartTime":246057.0,"Position":56.9869576,"HyperDash":false}]},{"StartTime":246124.0,"Objects":[{"StartTime":246124.0,"Position":120.0,"HyperDash":false}]},{"StartTime":246193.0,"Objects":[{"StartTime":246193.0,"Position":122.0,"HyperDash":false}]},{"StartTime":246261.0,"Objects":[{"StartTime":246261.0,"Position":124.0,"HyperDash":false}]},{"StartTime":246397.0,"Objects":[{"StartTime":246397.0,"Position":171.0,"HyperDash":false}]},{"StartTime":246465.0,"Objects":[{"StartTime":246465.0,"Position":173.0,"HyperDash":false}]},{"StartTime":246533.0,"Objects":[{"StartTime":246533.0,"Position":175.0,"HyperDash":false}]},{"StartTime":246670.0,"Objects":[{"StartTime":246670.0,"Position":123.0,"HyperDash":false}]},{"StartTime":246738.0,"Objects":[{"StartTime":246738.0,"Position":125.0,"HyperDash":false}]},{"StartTime":246806.0,"Objects":[{"StartTime":246806.0,"Position":127.0,"HyperDash":false},{"StartTime":246942.0,"Position":118.059486,"HyperDash":false}]},{"StartTime":247215.0,"Objects":[{"StartTime":247215.0,"Position":289.0,"HyperDash":false},{"StartTime":247283.0,"Position":330.8774,"HyperDash":false},{"StartTime":247351.0,"Position":289.0,"HyperDash":false},{"StartTime":247419.0,"Position":330.8774,"HyperDash":false}]},{"StartTime":247488.0,"Objects":[{"StartTime":247488.0,"Position":306.0,"HyperDash":false},{"StartTime":247556.0,"Position":347.8774,"HyperDash":false},{"StartTime":247624.0,"Position":306.0,"HyperDash":false},{"StartTime":247692.0,"Position":347.8774,"HyperDash":false}]},{"StartTime":247761.0,"Objects":[{"StartTime":247761.0,"Position":440.0,"HyperDash":false},{"StartTime":247829.0,"Position":447.248016,"HyperDash":false}]},{"StartTime":247897.0,"Objects":[{"StartTime":247897.0,"Position":425.0,"HyperDash":false},{"StartTime":247965.0,"Position":432.248016,"HyperDash":false}]},{"StartTime":248033.0,"Objects":[{"StartTime":248033.0,"Position":410.0,"HyperDash":false},{"StartTime":248101.0,"Position":417.248016,"HyperDash":false},{"StartTime":248169.0,"Position":410.0,"HyperDash":false},{"StartTime":248237.0,"Position":417.248016,"HyperDash":false}]},{"StartTime":248306.0,"Objects":[{"StartTime":248306.0,"Position":346.0,"HyperDash":false},{"StartTime":248374.0,"Position":304.1226,"HyperDash":false},{"StartTime":248442.0,"Position":346.0,"HyperDash":false}]},{"StartTime":248579.0,"Objects":[{"StartTime":248579.0,"Position":287.0,"HyperDash":false}]},{"StartTime":248647.0,"Objects":[{"StartTime":248647.0,"Position":279.0,"HyperDash":false}]},{"StartTime":248715.0,"Objects":[{"StartTime":248715.0,"Position":271.0,"HyperDash":false}]},{"StartTime":248852.0,"Objects":[{"StartTime":248852.0,"Position":193.0,"HyperDash":false},{"StartTime":248920.0,"Position":151.1226,"HyperDash":false},{"StartTime":248988.0,"Position":193.0,"HyperDash":false}]},{"StartTime":249124.0,"Objects":[{"StartTime":249124.0,"Position":139.0,"HyperDash":false}]},{"StartTime":249194.0,"Objects":[{"StartTime":249194.0,"Position":131.0,"HyperDash":false}]},{"StartTime":249261.0,"Objects":[{"StartTime":249261.0,"Position":123.0,"HyperDash":false}]},{"StartTime":249397.0,"Objects":[{"StartTime":249397.0,"Position":53.0,"HyperDash":false},{"StartTime":249465.0,"Position":60.2480125,"HyperDash":false},{"StartTime":249533.0,"Position":53.0,"HyperDash":false},{"StartTime":249601.0,"Position":60.2480125,"HyperDash":false}]},{"StartTime":249670.0,"Objects":[{"StartTime":249670.0,"Position":0.0,"HyperDash":false},{"StartTime":249738.0,"Position":7.952265,"HyperDash":false},{"StartTime":249806.0,"Position":0.0,"HyperDash":false},{"StartTime":249874.0,"Position":7.952265,"HyperDash":false}]},{"StartTime":249943.0,"Objects":[{"StartTime":249943.0,"Position":41.0,"HyperDash":false},{"StartTime":250011.0,"Position":0.0,"HyperDash":false}]},{"StartTime":250079.0,"Objects":[{"StartTime":250079.0,"Position":127.0,"HyperDash":false},{"StartTime":250147.0,"Position":85.1226044,"HyperDash":false}]},{"StartTime":250215.0,"Objects":[{"StartTime":250215.0,"Position":212.0,"HyperDash":false},{"StartTime":250283.0,"Position":170.1226,"HyperDash":false},{"StartTime":250351.0,"Position":212.0,"HyperDash":false},{"StartTime":250419.0,"Position":170.1226,"HyperDash":false}]},{"StartTime":250488.0,"Objects":[{"StartTime":250488.0,"Position":210.0,"HyperDash":false}]},{"StartTime":250556.0,"Objects":[{"StartTime":250556.0,"Position":212.0,"HyperDash":false}]},{"StartTime":250624.0,"Objects":[{"StartTime":250624.0,"Position":214.0,"HyperDash":false}]},{"StartTime":250761.0,"Objects":[{"StartTime":250761.0,"Position":295.0,"HyperDash":false}]},{"StartTime":250829.0,"Objects":[{"StartTime":250829.0,"Position":293.0,"HyperDash":false}]},{"StartTime":250898.0,"Objects":[{"StartTime":250898.0,"Position":291.0,"HyperDash":false}]},{"StartTime":251033.0,"Objects":[{"StartTime":251033.0,"Position":235.0,"HyperDash":false}]},{"StartTime":251102.0,"Objects":[{"StartTime":251102.0,"Position":237.0,"HyperDash":false}]},{"StartTime":251170.0,"Objects":[{"StartTime":251170.0,"Position":239.0,"HyperDash":false},{"StartTime":251238.0,"Position":231.8979,"HyperDash":false},{"StartTime":251306.0,"Position":239.0,"HyperDash":false},{"StartTime":251374.0,"Position":231.8979,"HyperDash":false},{"StartTime":251442.0,"Position":239.0,"HyperDash":false},{"StartTime":251510.0,"Position":231.8979,"HyperDash":false}]},{"StartTime":251579.0,"Objects":[{"StartTime":251579.0,"Position":229.0,"HyperDash":false},{"StartTime":251715.0,"Position":317.623718,"HyperDash":false}]},{"StartTime":251852.0,"Objects":[{"StartTime":251852.0,"Position":475.0,"HyperDash":false},{"StartTime":251988.0,"Position":386.889038,"HyperDash":false}]},{"StartTime":252124.0,"Objects":[{"StartTime":252124.0,"Position":440.0,"HyperDash":false},{"StartTime":252260.0,"Position":463.840118,"HyperDash":false}]},{"StartTime":252397.0,"Objects":[{"StartTime":252397.0,"Position":297.0,"HyperDash":false},{"StartTime":252533.0,"Position":319.863068,"HyperDash":false}]},{"StartTime":252670.0,"Objects":[{"StartTime":252670.0,"Position":205.0,"HyperDash":false},{"StartTime":252806.0,"Position":105.595367,"HyperDash":false}]},{"StartTime":252942.0,"Objects":[{"StartTime":252942.0,"Position":42.0,"HyperDash":false}]},{"StartTime":253079.0,"Objects":[{"StartTime":253079.0,"Position":42.0,"HyperDash":false}]},{"StartTime":253215.0,"Objects":[{"StartTime":253215.0,"Position":1.0,"HyperDash":false},{"StartTime":253351.0,"Position":97.26073,"HyperDash":false}]},{"StartTime":253488.0,"Objects":[{"StartTime":253488.0,"Position":248.0,"HyperDash":false},{"StartTime":253624.0,"Position":148.595367,"HyperDash":true}]},{"StartTime":253760.0,"Objects":[{"StartTime":253760.0,"Position":408.0,"HyperDash":false},{"StartTime":253896.0,"Position":487.4551,"HyperDash":false}]},{"StartTime":254033.0,"Objects":[{"StartTime":254033.0,"Position":318.0,"HyperDash":false},{"StartTime":254169.0,"Position":309.7604,"HyperDash":false}]},{"StartTime":254306.0,"Objects":[{"StartTime":254306.0,"Position":202.0,"HyperDash":false}]},{"StartTime":254442.0,"Objects":[{"StartTime":254442.0,"Position":295.0,"HyperDash":false}]},{"StartTime":254510.0,"Objects":[{"StartTime":254510.0,"Position":295.0,"HyperDash":false}]},{"StartTime":254579.0,"Objects":[{"StartTime":254579.0,"Position":295.0,"HyperDash":false},{"StartTime":254715.0,"Position":395.898743,"HyperDash":false}]},{"StartTime":254851.0,"Objects":[{"StartTime":254851.0,"Position":486.0,"HyperDash":false}]},{"StartTime":254987.0,"Objects":[{"StartTime":254987.0,"Position":423.0,"HyperDash":false}]},{"StartTime":255124.0,"Objects":[{"StartTime":255124.0,"Position":424.0,"HyperDash":false}]},{"StartTime":255260.0,"Objects":[{"StartTime":255260.0,"Position":487.0,"HyperDash":false}]},{"StartTime":255397.0,"Objects":[{"StartTime":255397.0,"Position":412.0,"HyperDash":false},{"StartTime":255456.0,"Position":367.364532,"HyperDash":false},{"StartTime":255515.0,"Position":308.7291,"HyperDash":false},{"StartTime":255574.0,"Position":291.225,"HyperDash":false},{"StartTime":255669.0,"Position":215.507538,"HyperDash":false}]},{"StartTime":255806.0,"Objects":[{"StartTime":255806.0,"Position":80.0,"HyperDash":false}]},{"StartTime":255874.0,"Objects":[{"StartTime":255874.0,"Position":87.0,"HyperDash":false}]},{"StartTime":255942.0,"Objects":[{"StartTime":255942.0,"Position":94.0,"HyperDash":false},{"StartTime":256078.0,"Position":115.948105,"HyperDash":false}]},{"StartTime":256215.0,"Objects":[{"StartTime":256215.0,"Position":14.0,"HyperDash":false},{"StartTime":256351.0,"Position":35.94811,"HyperDash":false}]},{"StartTime":256488.0,"Objects":[{"StartTime":256488.0,"Position":172.0,"HyperDash":false},{"StartTime":256624.0,"Position":263.280975,"HyperDash":false}]},{"StartTime":256760.0,"Objects":[{"StartTime":256760.0,"Position":238.0,"HyperDash":false},{"StartTime":256896.0,"Position":146.7498,"HyperDash":false}]},{"StartTime":257033.0,"Objects":[{"StartTime":257033.0,"Position":115.0,"HyperDash":false},{"StartTime":257169.0,"Position":205.031708,"HyperDash":false}]},{"StartTime":257306.0,"Objects":[{"StartTime":257306.0,"Position":342.0,"HyperDash":false}]},{"StartTime":257442.0,"Objects":[{"StartTime":257442.0,"Position":342.0,"HyperDash":false}]},{"StartTime":257579.0,"Objects":[{"StartTime":257579.0,"Position":455.0,"HyperDash":false},{"StartTime":257715.0,"Position":467.65155,"HyperDash":false}]},{"StartTime":257851.0,"Objects":[{"StartTime":257851.0,"Position":381.0,"HyperDash":false},{"StartTime":257987.0,"Position":393.65155,"HyperDash":false}]},{"StartTime":258124.0,"Objects":[{"StartTime":258124.0,"Position":267.0,"HyperDash":false},{"StartTime":258260.0,"Position":183.076477,"HyperDash":false}]},{"StartTime":258397.0,"Objects":[{"StartTime":258397.0,"Position":95.0,"HyperDash":false},{"StartTime":258533.0,"Position":11.07647,"HyperDash":false}]},{"StartTime":258670.0,"Objects":[{"StartTime":258670.0,"Position":101.0,"HyperDash":false}]},{"StartTime":258806.0,"Objects":[{"StartTime":258806.0,"Position":22.0,"HyperDash":false}]},{"StartTime":258874.0,"Objects":[{"StartTime":258874.0,"Position":22.0,"HyperDash":false}]},{"StartTime":258942.0,"Objects":[{"StartTime":258942.0,"Position":22.0,"HyperDash":false},{"StartTime":259078.0,"Position":5.65008163,"HyperDash":false}]},{"StartTime":259215.0,"Objects":[{"StartTime":259215.0,"Position":158.0,"HyperDash":false}]},{"StartTime":259283.0,"Objects":[{"StartTime":259283.0,"Position":197.0,"HyperDash":false}]},{"StartTime":259351.0,"Objects":[{"StartTime":259351.0,"Position":239.0,"HyperDash":false}]},{"StartTime":259419.0,"Objects":[{"StartTime":259419.0,"Position":273.0,"HyperDash":false}]},{"StartTime":259487.0,"Objects":[{"StartTime":259487.0,"Position":291.0,"HyperDash":false}]},{"StartTime":259624.0,"Objects":[{"StartTime":259624.0,"Position":405.0,"HyperDash":false}]},{"StartTime":259692.0,"Objects":[{"StartTime":259692.0,"Position":415.0,"HyperDash":false}]},{"StartTime":259761.0,"Objects":[{"StartTime":259761.0,"Position":425.0,"HyperDash":false},{"StartTime":259829.0,"Position":436.342346,"HyperDash":false},{"StartTime":259897.0,"Position":425.0,"HyperDash":false}]},{"StartTime":260033.0,"Objects":[{"StartTime":260033.0,"Position":355.0,"HyperDash":false},{"StartTime":260101.0,"Position":366.342346,"HyperDash":false},{"StartTime":260169.0,"Position":355.0,"HyperDash":false},{"StartTime":260237.0,"Position":366.342346,"HyperDash":false}]},{"StartTime":260306.0,"Objects":[{"StartTime":260306.0,"Position":376.0,"HyperDash":false},{"StartTime":260442.0,"Position":287.376282,"HyperDash":false}]},{"StartTime":260578.0,"Objects":[{"StartTime":260578.0,"Position":112.0,"HyperDash":false},{"StartTime":260714.0,"Position":200.110962,"HyperDash":false}]},{"StartTime":260851.0,"Objects":[{"StartTime":260851.0,"Position":240.0,"HyperDash":false},{"StartTime":260987.0,"Position":140.825165,"HyperDash":false}]},{"StartTime":261124.0,"Objects":[{"StartTime":261124.0,"Position":1.0,"HyperDash":false},{"StartTime":261260.0,"Position":100.404633,"HyperDash":false}]},{"StartTime":261397.0,"Objects":[{"StartTime":261397.0,"Position":296.0,"HyperDash":false},{"StartTime":261533.0,"Position":196.595367,"HyperDash":false}]},{"StartTime":261669.0,"Objects":[{"StartTime":261669.0,"Position":324.0,"HyperDash":false}]},{"StartTime":261806.0,"Objects":[{"StartTime":261806.0,"Position":324.0,"HyperDash":false}]},{"StartTime":261942.0,"Objects":[{"StartTime":261942.0,"Position":445.0,"HyperDash":false},{"StartTime":262078.0,"Position":460.350983,"HyperDash":false}]},{"StartTime":262215.0,"Objects":[{"StartTime":262215.0,"Position":360.0,"HyperDash":false},{"StartTime":262351.0,"Position":456.028931,"HyperDash":false}]},{"StartTime":262487.0,"Objects":[{"StartTime":262487.0,"Position":274.0,"HyperDash":false},{"StartTime":262623.0,"Position":194.151871,"HyperDash":false}]},{"StartTime":262760.0,"Objects":[{"StartTime":262760.0,"Position":38.0,"HyperDash":false},{"StartTime":262896.0,"Position":125.37175,"HyperDash":false}]},{"StartTime":263033.0,"Objects":[{"StartTime":263033.0,"Position":194.0,"HyperDash":false}]},{"StartTime":263169.0,"Objects":[{"StartTime":263169.0,"Position":312.0,"HyperDash":false}]},{"StartTime":263237.0,"Objects":[{"StartTime":263237.0,"Position":312.0,"HyperDash":false}]},{"StartTime":263306.0,"Objects":[{"StartTime":263306.0,"Position":312.0,"HyperDash":false},{"StartTime":263442.0,"Position":412.898743,"HyperDash":false}]},{"StartTime":263578.0,"Objects":[{"StartTime":263578.0,"Position":503.0,"HyperDash":false}]},{"StartTime":263714.0,"Objects":[{"StartTime":263714.0,"Position":456.0,"HyperDash":false}]},{"StartTime":263851.0,"Objects":[{"StartTime":263851.0,"Position":367.0,"HyperDash":false}]},{"StartTime":263987.0,"Objects":[{"StartTime":263987.0,"Position":292.0,"HyperDash":false}]},{"StartTime":264124.0,"Objects":[{"StartTime":264124.0,"Position":206.0,"HyperDash":false},{"StartTime":264183.0,"Position":158.319275,"HyperDash":false},{"StartTime":264242.0,"Position":120.702431,"HyperDash":false},{"StartTime":264301.0,"Position":92.96848,"HyperDash":false},{"StartTime":264396.0,"Position":18.7677212,"HyperDash":false}]},{"StartTime":264533.0,"Objects":[{"StartTime":264533.0,"Position":173.0,"HyperDash":false}]},{"StartTime":264601.0,"Objects":[{"StartTime":264601.0,"Position":166.0,"HyperDash":false}]},{"StartTime":264669.0,"Objects":[{"StartTime":264669.0,"Position":159.0,"HyperDash":false},{"StartTime":264805.0,"Position":137.0519,"HyperDash":false}]},{"StartTime":264942.0,"Objects":[{"StartTime":264942.0,"Position":302.0,"HyperDash":false},{"StartTime":265078.0,"Position":280.834564,"HyperDash":false}]},{"StartTime":265215.0,"Objects":[{"StartTime":265215.0,"Position":399.0,"HyperDash":false},{"StartTime":265351.0,"Position":434.304535,"HyperDash":false}]},{"StartTime":265487.0,"Objects":[{"StartTime":265487.0,"Position":496.0,"HyperDash":false},{"StartTime":265623.0,"Position":404.622,"HyperDash":false}]},{"StartTime":265760.0,"Objects":[{"StartTime":265760.0,"Position":362.0,"HyperDash":false},{"StartTime":265896.0,"Position":452.0317,"HyperDash":false}]},{"StartTime":266033.0,"Objects":[{"StartTime":266033.0,"Position":288.0,"HyperDash":false}]},{"StartTime":266169.0,"Objects":[{"StartTime":266169.0,"Position":288.0,"HyperDash":false}]},{"StartTime":266306.0,"Objects":[{"StartTime":266306.0,"Position":171.0,"HyperDash":false},{"StartTime":266442.0,"Position":158.34845,"HyperDash":false}]},{"StartTime":266578.0,"Objects":[{"StartTime":266578.0,"Position":251.0,"HyperDash":false},{"StartTime":266714.0,"Position":238.34845,"HyperDash":false}]},{"StartTime":266851.0,"Objects":[{"StartTime":266851.0,"Position":56.0,"HyperDash":false},{"StartTime":266987.0,"Position":104.910339,"HyperDash":false}]},{"StartTime":267124.0,"Objects":[{"StartTime":267124.0,"Position":35.0,"HyperDash":false},{"StartTime":267260.0,"Position":33.814888,"HyperDash":false}]},{"StartTime":267397.0,"Objects":[{"StartTime":267397.0,"Position":123.0,"HyperDash":false}]},{"StartTime":267533.0,"Objects":[{"StartTime":267533.0,"Position":253.0,"HyperDash":false}]},{"StartTime":267601.0,"Objects":[{"StartTime":267601.0,"Position":253.0,"HyperDash":false}]},{"StartTime":267669.0,"Objects":[{"StartTime":267669.0,"Position":253.0,"HyperDash":false},{"StartTime":267805.0,"Position":353.6811,"HyperDash":false}]},{"StartTime":267942.0,"Objects":[{"StartTime":267942.0,"Position":463.0,"HyperDash":false}]},{"StartTime":268010.0,"Objects":[{"StartTime":268010.0,"Position":489.0,"HyperDash":false}]},{"StartTime":268078.0,"Objects":[{"StartTime":268078.0,"Position":498.0,"HyperDash":false}]},{"StartTime":268146.0,"Objects":[{"StartTime":268146.0,"Position":485.0,"HyperDash":false}]},{"StartTime":268214.0,"Objects":[{"StartTime":268214.0,"Position":455.0,"HyperDash":false}]},{"StartTime":268352.0,"Objects":[{"StartTime":268352.0,"Position":419.0,"HyperDash":false}]},{"StartTime":268420.0,"Objects":[{"StartTime":268420.0,"Position":403.0,"HyperDash":false}]},{"StartTime":268488.0,"Objects":[{"StartTime":268488.0,"Position":372.0,"HyperDash":false}]},{"StartTime":268556.0,"Objects":[{"StartTime":268556.0,"Position":332.0,"HyperDash":false}]},{"StartTime":268624.0,"Objects":[{"StartTime":268624.0,"Position":292.0,"HyperDash":false}]},{"StartTime":268761.0,"Objects":[{"StartTime":268761.0,"Position":231.0,"HyperDash":false},{"StartTime":268829.0,"Position":180.408112,"HyperDash":false},{"StartTime":268897.0,"Position":231.0,"HyperDash":false},{"StartTime":268965.0,"Position":180.408112,"HyperDash":false}]},{"StartTime":269033.0,"Objects":[{"StartTime":269033.0,"Position":96.0,"HyperDash":false},{"StartTime":269099.0,"Position":107.997719,"HyperDash":false},{"StartTime":269166.0,"Position":130.581879,"HyperDash":false},{"StartTime":269232.0,"Position":149.897186,"HyperDash":false},{"StartTime":269299.0,"Position":175.084061,"HyperDash":false},{"StartTime":269365.0,"Position":167.6238,"HyperDash":false},{"StartTime":269432.0,"Position":173.461578,"HyperDash":false},{"StartTime":269498.0,"Position":185.410263,"HyperDash":false},{"StartTime":269565.0,"Position":178.44928,"HyperDash":false},{"StartTime":269655.0,"Position":167.081726,"HyperDash":false},{"StartTime":269746.0,"Position":170.346115,"HyperDash":false},{"StartTime":269837.0,"Position":137.438,"HyperDash":false},{"StartTime":269964.0,"Position":125.546143,"HyperDash":false}]},{"StartTime":270097.0,"Objects":[{"StartTime":270097.0,"Position":121.0,"HyperDash":false},{"StartTime":270163.0,"Position":78.13265,"HyperDash":false},{"StartTime":270230.0,"Position":95.43977,"HyperDash":false},{"StartTime":270296.0,"Position":65.59505,"HyperDash":false},{"StartTime":270363.0,"Position":71.33265,"HyperDash":false},{"StartTime":270429.0,"Position":73.41984,"HyperDash":false},{"StartTime":270496.0,"Position":98.806366,"HyperDash":false},{"StartTime":270562.0,"Position":139.458054,"HyperDash":false},{"StartTime":270629.0,"Position":162.000076,"HyperDash":false},{"StartTime":270686.0,"Position":174.872726,"HyperDash":false},{"StartTime":270744.0,"Position":199.77951,"HyperDash":false},{"StartTime":270801.0,"Position":218.731812,"HyperDash":false},{"StartTime":270895.0,"Position":252.733368,"HyperDash":false}]},{"StartTime":271028.0,"Objects":[{"StartTime":271028.0,"Position":319.0,"HyperDash":false}]},{"StartTime":271161.0,"Objects":[{"StartTime":271161.0,"Position":312.0,"HyperDash":false},{"StartTime":271223.0,"Position":302.2162,"HyperDash":false},{"StartTime":271285.0,"Position":302.676941,"HyperDash":false},{"StartTime":271347.0,"Position":283.679169,"HyperDash":false},{"StartTime":271409.0,"Position":290.484436,"HyperDash":false},{"StartTime":271471.0,"Position":288.101379,"HyperDash":false},{"StartTime":271533.0,"Position":295.433258,"HyperDash":false},{"StartTime":271595.0,"Position":306.336884,"HyperDash":false},{"StartTime":271693.0,"Position":324.652863,"HyperDash":false}]},{"StartTime":271959.0,"Objects":[{"StartTime":271959.0,"Position":400.0,"HyperDash":false}]},{"StartTime":272225.0,"Objects":[{"StartTime":272225.0,"Position":400.0,"HyperDash":false},{"StartTime":272313.0,"Position":405.1424,"HyperDash":false},{"StartTime":272402.0,"Position":408.331879,"HyperDash":false},{"StartTime":272472.0,"Position":402.036774,"HyperDash":false},{"StartTime":272579.0,"Position":400.0,"HyperDash":false}]},{"StartTime":272758.0,"Objects":[{"StartTime":272758.0,"Position":442.0,"HyperDash":false},{"StartTime":272846.0,"Position":459.1424,"HyperDash":false},{"StartTime":272935.0,"Position":450.331879,"HyperDash":false},{"StartTime":273005.0,"Position":454.036774,"HyperDash":false},{"StartTime":273112.0,"Position":442.0,"HyperDash":false}]},{"StartTime":273290.0,"Objects":[{"StartTime":273290.0,"Position":512.0,"HyperDash":false},{"StartTime":273355.0,"Position":498.977875,"HyperDash":false},{"StartTime":273420.0,"Position":478.2446,"HyperDash":false},{"StartTime":273485.0,"Position":437.965363,"HyperDash":false},{"StartTime":273551.0,"Position":433.034943,"HyperDash":false},{"StartTime":273616.0,"Position":428.07312,"HyperDash":false},{"StartTime":273681.0,"Position":423.756653,"HyperDash":false},{"StartTime":273746.0,"Position":401.5979,"HyperDash":false},{"StartTime":273848.0,"Position":401.115448,"HyperDash":false}]},{"StartTime":274048.0,"Objects":[{"StartTime":274048.0,"Position":303.0,"HyperDash":false},{"StartTime":274129.0,"Position":308.57135,"HyperDash":false},{"StartTime":274247.0,"Position":297.033356,"HyperDash":false}]},{"StartTime":274498.0,"Objects":[{"StartTime":274498.0,"Position":202.0,"HyperDash":false},{"StartTime":274560.0,"Position":191.209839,"HyperDash":false},{"StartTime":274622.0,"Position":190.373,"HyperDash":false},{"StartTime":274747.0,"Position":202.0,"HyperDash":false}]},{"StartTime":274873.0,"Objects":[{"StartTime":274873.0,"Position":105.0,"HyperDash":false},{"StartTime":274939.0,"Position":120.3023,"HyperDash":false},{"StartTime":275006.0,"Position":107.624329,"HyperDash":false},{"StartTime":275139.0,"Position":105.0,"HyperDash":false}]},{"StartTime":275273.0,"Objects":[{"StartTime":275273.0,"Position":31.0,"HyperDash":false},{"StartTime":275349.0,"Position":42.15374,"HyperDash":false},{"StartTime":275426.0,"Position":47.4684143,"HyperDash":false},{"StartTime":275485.0,"Position":28.1921768,"HyperDash":false},{"StartTime":275580.0,"Position":31.0,"HyperDash":false}]},{"StartTime":275734.0,"Objects":[{"StartTime":275734.0,"Position":0.0,"HyperDash":false},{"StartTime":275813.0,"Position":0.0,"HyperDash":false},{"StartTime":275893.0,"Position":25.7255154,"HyperDash":false},{"StartTime":275955.0,"Position":16.8062725,"HyperDash":false},{"StartTime":276053.0,"Position":0.0,"HyperDash":false}]},{"StartTime":276254.0,"Objects":[{"StartTime":276254.0,"Position":21.0,"HyperDash":false}]},{"StartTime":276419.0,"Objects":[{"StartTime":276419.0,"Position":354.0,"HyperDash":false},{"StartTime":276494.0,"Position":270.0,"HyperDash":false},{"StartTime":276569.0,"Position":362.0,"HyperDash":false},{"StartTime":276645.0,"Position":255.0,"HyperDash":false},{"StartTime":276720.0,"Position":203.0,"HyperDash":false},{"StartTime":276795.0,"Position":67.0,"HyperDash":false},{"StartTime":276871.0,"Position":112.0,"HyperDash":false},{"StartTime":276946.0,"Position":326.0,"HyperDash":false},{"StartTime":277021.0,"Position":219.0,"HyperDash":false},{"StartTime":277097.0,"Position":351.0,"HyperDash":false},{"StartTime":277172.0,"Position":477.0,"HyperDash":false},{"StartTime":277247.0,"Position":439.0,"HyperDash":false},{"StartTime":277323.0,"Position":471.0,"HyperDash":false},{"StartTime":277398.0,"Position":449.0,"HyperDash":false},{"StartTime":277473.0,"Position":295.0,"HyperDash":false},{"StartTime":277549.0,"Position":217.0,"HyperDash":false},{"StartTime":277624.0,"Position":308.0,"HyperDash":false},{"StartTime":277699.0,"Position":430.0,"HyperDash":false},{"StartTime":277775.0,"Position":73.0,"HyperDash":false},{"StartTime":277850.0,"Position":53.0,"HyperDash":false},{"StartTime":277925.0,"Position":276.0,"HyperDash":false},{"StartTime":278001.0,"Position":289.0,"HyperDash":false},{"StartTime":278076.0,"Position":104.0,"HyperDash":false},{"StartTime":278151.0,"Position":212.0,"HyperDash":false},{"StartTime":278227.0,"Position":359.0,"HyperDash":false},{"StartTime":278302.0,"Position":500.0,"HyperDash":false},{"StartTime":278377.0,"Position":467.0,"HyperDash":false},{"StartTime":278453.0,"Position":303.0,"HyperDash":false},{"StartTime":278528.0,"Position":29.0,"HyperDash":false},{"StartTime":278603.0,"Position":482.0,"HyperDash":false},{"StartTime":278679.0,"Position":379.0,"HyperDash":false},{"StartTime":278754.0,"Position":93.0,"HyperDash":false},{"StartTime":278830.0,"Position":266.0,"HyperDash":false},{"StartTime":278905.0,"Position":342.0,"HyperDash":false},{"StartTime":278980.0,"Position":423.0,"HyperDash":false},{"StartTime":279056.0,"Position":190.0,"HyperDash":false},{"StartTime":279131.0,"Position":266.0,"HyperDash":false},{"StartTime":279206.0,"Position":56.0,"HyperDash":false},{"StartTime":279282.0,"Position":164.0,"HyperDash":false},{"StartTime":279357.0,"Position":44.0,"HyperDash":false},{"StartTime":279432.0,"Position":68.0,"HyperDash":false},{"StartTime":279508.0,"Position":476.0,"HyperDash":false},{"StartTime":279583.0,"Position":237.0,"HyperDash":false},{"StartTime":279658.0,"Position":146.0,"HyperDash":false},{"StartTime":279734.0,"Position":99.0,"HyperDash":false},{"StartTime":279809.0,"Position":52.0,"HyperDash":false},{"StartTime":279884.0,"Position":294.0,"HyperDash":false},{"StartTime":279960.0,"Position":346.0,"HyperDash":false},{"StartTime":280035.0,"Position":256.0,"HyperDash":false},{"StartTime":280110.0,"Position":353.0,"HyperDash":false},{"StartTime":280186.0,"Position":85.0,"HyperDash":false},{"StartTime":280261.0,"Position":473.0,"HyperDash":false},{"StartTime":280336.0,"Position":55.0,"HyperDash":false},{"StartTime":280412.0,"Position":158.0,"HyperDash":false},{"StartTime":280487.0,"Position":97.0,"HyperDash":false},{"StartTime":280562.0,"Position":288.0,"HyperDash":false},{"StartTime":280638.0,"Position":236.0,"HyperDash":false},{"StartTime":280713.0,"Position":226.0,"HyperDash":false},{"StartTime":280788.0,"Position":317.0,"HyperDash":false},{"StartTime":280864.0,"Position":227.0,"HyperDash":false},{"StartTime":280939.0,"Position":507.0,"HyperDash":false},{"StartTime":281014.0,"Position":144.0,"HyperDash":false},{"StartTime":281090.0,"Position":409.0,"HyperDash":false},{"StartTime":281165.0,"Position":76.0,"HyperDash":false},{"StartTime":281241.0,"Position":193.0,"HyperDash":false},{"StartTime":281316.0,"Position":456.0,"HyperDash":false},{"StartTime":281391.0,"Position":161.0,"HyperDash":false},{"StartTime":281467.0,"Position":417.0,"HyperDash":false},{"StartTime":281542.0,"Position":157.0,"HyperDash":false},{"StartTime":281617.0,"Position":464.0,"HyperDash":false},{"StartTime":281693.0,"Position":462.0,"HyperDash":false},{"StartTime":281768.0,"Position":254.0,"HyperDash":false},{"StartTime":281843.0,"Position":103.0,"HyperDash":false},{"StartTime":281919.0,"Position":125.0,"HyperDash":false},{"StartTime":281994.0,"Position":485.0,"HyperDash":false},{"StartTime":282069.0,"Position":350.0,"HyperDash":false},{"StartTime":282145.0,"Position":206.0,"HyperDash":false},{"StartTime":282220.0,"Position":285.0,"HyperDash":false},{"StartTime":282295.0,"Position":390.0,"HyperDash":false},{"StartTime":282371.0,"Position":463.0,"HyperDash":false},{"StartTime":282446.0,"Position":447.0,"HyperDash":false},{"StartTime":282521.0,"Position":126.0,"HyperDash":false},{"StartTime":282597.0,"Position":44.0,"HyperDash":false},{"StartTime":282672.0,"Position":451.0,"HyperDash":false},{"StartTime":282747.0,"Position":278.0,"HyperDash":false},{"StartTime":282823.0,"Position":24.0,"HyperDash":false},{"StartTime":282898.0,"Position":367.0,"HyperDash":false},{"StartTime":282973.0,"Position":221.0,"HyperDash":false},{"StartTime":283049.0,"Position":439.0,"HyperDash":false},{"StartTime":283124.0,"Position":243.0,"HyperDash":false},{"StartTime":283199.0,"Position":213.0,"HyperDash":false},{"StartTime":283275.0,"Position":120.0,"HyperDash":false},{"StartTime":283350.0,"Position":379.0,"HyperDash":false},{"StartTime":283425.0,"Position":353.0,"HyperDash":false},{"StartTime":283501.0,"Position":496.0,"HyperDash":false},{"StartTime":283576.0,"Position":288.0,"HyperDash":false},{"StartTime":283652.0,"Position":163.0,"HyperDash":false},{"StartTime":283727.0,"Position":314.0,"HyperDash":false},{"StartTime":283802.0,"Position":296.0,"HyperDash":false},{"StartTime":283878.0,"Position":488.0,"HyperDash":false},{"StartTime":283953.0,"Position":482.0,"HyperDash":false},{"StartTime":284028.0,"Position":321.0,"HyperDash":false},{"StartTime":284104.0,"Position":474.0,"HyperDash":false},{"StartTime":284179.0,"Position":252.0,"HyperDash":false},{"StartTime":284254.0,"Position":247.0,"HyperDash":false},{"StartTime":284330.0,"Position":406.0,"HyperDash":false},{"StartTime":284405.0,"Position":319.0,"HyperDash":false},{"StartTime":284480.0,"Position":253.0,"HyperDash":false},{"StartTime":284556.0,"Position":411.0,"HyperDash":false},{"StartTime":284631.0,"Position":205.0,"HyperDash":false},{"StartTime":284706.0,"Position":54.0,"HyperDash":false},{"StartTime":284782.0,"Position":224.0,"HyperDash":false},{"StartTime":284857.0,"Position":465.0,"HyperDash":false},{"StartTime":284932.0,"Position":432.0,"HyperDash":false},{"StartTime":285008.0,"Position":108.0,"HyperDash":false},{"StartTime":285083.0,"Position":95.0,"HyperDash":false},{"StartTime":285158.0,"Position":436.0,"HyperDash":false},{"StartTime":285234.0,"Position":61.0,"HyperDash":false},{"StartTime":285309.0,"Position":234.0,"HyperDash":false},{"StartTime":285384.0,"Position":394.0,"HyperDash":false},{"StartTime":285460.0,"Position":86.0,"HyperDash":false},{"StartTime":285535.0,"Position":491.0,"HyperDash":false},{"StartTime":285610.0,"Position":416.0,"HyperDash":false},{"StartTime":285686.0,"Position":44.0,"HyperDash":false},{"StartTime":285761.0,"Position":29.0,"HyperDash":false},{"StartTime":285836.0,"Position":402.0,"HyperDash":false},{"StartTime":285912.0,"Position":115.0,"HyperDash":false},{"StartTime":285987.0,"Position":87.0,"HyperDash":false}]},{"StartTime":286725.0,"Objects":[{"StartTime":286725.0,"Position":80.0,"HyperDash":false},{"StartTime":286776.0,"Position":116.003235,"HyperDash":false},{"StartTime":286827.0,"Position":150.517319,"HyperDash":false},{"StartTime":286878.0,"Position":201.896988,"HyperDash":false},{"StartTime":286930.0,"Position":241.944443,"HyperDash":false},{"StartTime":286981.0,"Position":259.183777,"HyperDash":false},{"StartTime":287032.0,"Position":320.093781,"HyperDash":false},{"StartTime":287084.0,"Position":319.821442,"HyperDash":false},{"StartTime":287135.0,"Position":270.5175,"HyperDash":false},{"StartTime":287186.0,"Position":225.266876,"HyperDash":false},{"StartTime":287238.0,"Position":212.995529,"HyperDash":false},{"StartTime":287289.0,"Position":225.29332,"HyperDash":false},{"StartTime":287340.0,"Position":285.537354,"HyperDash":false},{"StartTime":287392.0,"Position":301.644073,"HyperDash":false},{"StartTime":287443.0,"Position":366.0163,"HyperDash":false},{"StartTime":287494.0,"Position":394.099243,"HyperDash":false},{"StartTime":287582.0,"Position":465.1608,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3644427.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3644427.osu
new file mode 100644
index 0000000000..522f8d5a4a
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3644427.osu
@@ -0,0 +1,1450 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.8
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:3
+OverallDifficulty:8
+ApproachRate:9.2
+SliderMultiplier:1.7
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+//Break Periods
+2,96220,104148
+2,113675,117239
+2,205476,207343
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+22,272.727272727273,5,2,1,50,1,0
+22,-125,4,2,1,50,0,0
+840,-83.3333333333333,4,2,1,50,0,0
+1385,-125,4,2,1,50,0,0
+2203,-83.3333333333333,4,2,1,50,0,0
+2749,-125,4,2,1,50,0,0
+3567,-83.3333333333333,4,2,1,50,0,0
+4112,-125,4,2,1,50,0,0
+4931,-83.3333333333333,4,2,1,50,0,0
+5476,-125,4,2,1,50,0,0
+6294,-83.3333333333333,4,2,1,50,0,0
+6840,-125,4,2,1,50,0,0
+7658,-83.3333333333333,4,2,1,50,0,0
+8203,-125,4,2,1,50,0,0
+9022,-83.3333333333333,4,2,1,50,0,0
+9567,-125,4,2,1,50,0,0
+10385,-83.3333333333333,4,2,1,50,0,0
+10931,-125,4,2,1,50,0,0
+12021,272.727272727273,4,2,1,70,1,0
+12021,-83.3333333333333,4,2,1,70,0,0
+29475,-100,4,2,1,70,0,0
+38202,-125,4,2,1,50,0,0
+40384,-100,4,2,1,70,0,0
+42566,-125,4,2,1,50,0,0
+44748,-100,4,2,1,70,0,0
+46930,-83.3333333333333,4,2,1,80,0,1
+48702,-83.3333333333333,4,2,2,80,0,1
+48771,-83.3333333333333,4,2,1,80,0,1
+48975,-83.3333333333333,4,2,2,80,0,1
+49043,-83.3333333333333,4,2,1,80,0,1
+53066,-83.3333333333333,4,2,2,80,0,1
+53134,-83.3333333333333,4,2,1,80,0,1
+55657,-100,4,2,1,70,0,0
+64384,-125,4,2,1,60,0,0
+66566,-100,4,2,1,80,0,0
+68748,-125,4,2,1,60,0,0
+70930,-100,4,2,1,80,0,0
+73111,-100,4,2,1,50,0,0
+74202,-100,4,2,3,50,0,0
+74293,-100,4,2,2,50,0,0
+74475,-100,4,2,3,50,0,0
+74566,-100,4,2,2,50,0,0
+74748,-100,4,2,3,50,0,0
+74839,-100,4,2,2,50,0,0
+75021,-100,4,2,3,50,0,0
+75111,-100,4,2,2,50,0,0
+75293,-100,4,2,1,50,0,0
+76384,-100,4,2,4,50,0,0
+76475,-100,4,2,1,50,0,0
+76657,-100,4,2,4,50,0,0
+76748,-100,4,2,1,50,0,0
+76930,-83.3333333333333,4,2,1,55,0,0
+77475,-83.3333333333333,4,2,1,65,0,0
+86202,-100,4,2,1,75,0,0
+96021,-100,4,2,1,40,0,0
+103657,-100,4,2,2,50,0,0
+104202,-100,4,2,1,60,0,0
+104748,-83.3333333333333,4,2,1,80,0,1
+107066,-83.3333333333333,4,2,2,80,0,1
+107134,-83.3333333333333,4,2,1,80,0,1
+107339,-83.3333333333333,4,2,2,80,0,1
+107407,-83.3333333333333,4,2,1,80,0,1
+107611,-83.3333333333333,4,2,2,80,0,1
+107680,-83.3333333333333,4,2,1,80,0,1
+107884,-83.3333333333333,4,2,2,80,0,1
+107952,-83.3333333333333,4,2,1,80,0,1
+108157,-83.3333333333333,4,2,2,80,0,1
+108225,-83.3333333333333,4,2,1,80,0,1
+108430,-83.3333333333333,4,2,2,80,0,1
+108498,-83.3333333333333,4,2,1,80,0,1
+111430,-83.3333333333333,4,2,2,80,0,1
+111498,-83.3333333333333,4,2,1,80,0,1
+111702,-83.3333333333333,4,2,2,80,0,1
+111771,-83.3333333333333,4,2,1,80,0,1
+111975,-83.3333333333333,4,2,2,80,0,1
+112043,-83.3333333333333,4,2,1,80,0,1
+112248,-83.3333333333333,4,2,2,80,0,1
+112316,-83.3333333333333,4,2,1,80,0,1
+113475,-125,4,2,3,50,0,0
+113748,-125,4,2,4,50,0,0
+117839,-125,4,2,3,50,0,0
+117975,-125,4,2,1,50,0,0
+118111,-125,4,2,4,50,0,0
+118248,-125,4,2,1,50,0,0
+118384,-125,4,2,4,50,0,0
+118521,-125,4,2,1,50,0,0
+118657,-125,4,2,4,50,0,0
+118793,-125,4,2,1,50,0,0
+118930,-125,4,2,4,50,0,0
+119066,-125,4,2,1,50,0,0
+119202,-125,4,2,4,50,0,0
+119339,-125,4,2,1,50,0,0
+119475,-125,4,2,4,50,0,0
+119611,-125,4,2,1,50,0,0
+119748,-125,4,2,4,50,0,0
+119884,-125,4,2,1,50,0,0
+120021,-125,4,2,4,50,0,0
+120157,-125,4,2,1,50,0,0
+120293,-125,4,2,4,50,0,0
+120430,-125,4,2,1,50,0,0
+120566,-125,4,2,4,50,0,0
+120702,-125,4,2,1,50,0,0
+120839,-125,4,2,4,50,0,0
+120975,-125,4,2,1,50,0,0
+121111,-125,4,2,4,50,0,0
+121248,-125,4,2,1,50,0,0
+121384,-125,4,2,4,50,0,0
+121521,-125,4,2,1,50,0,0
+121657,-125,4,2,4,50,0,0
+121793,-125,4,2,1,50,0,0
+121930,-125,4,2,4,50,0,0
+122066,-125,4,2,1,50,0,0
+122202,-100,4,2,1,60,0,0
+148384,-83.3333333333333,4,2,1,60,0,0
+149611,-100,4,2,1,60,0,0
+150975,-83.3333333333333,4,2,1,60,0,0
+152066,-100,4,2,1,60,0,0
+156021,-83.3333333333333,4,2,1,60,0,0
+157111,-83.3333333333333,4,2,1,65,0,0
+172384,-83.3333333333333,4,2,3,65,0,0
+172566,-83.3333333333333,4,2,2,65,0,0
+172930,-83.3333333333333,4,2,1,65,0,0
+173067,210.526315789474,4,2,1,65,1,0
+173277,222.222222222222,4,2,1,85,1,0
+173277,-100,4,2,1,85,0,1
+207943,272.727272727273,4,2,1,50,1,1
+207943,-125,4,2,1,50,0,0
+211215,-100,4,2,1,70,0,0
+219943,-100,4,2,1,60,0,0
+223215,-100,4,2,1,80,0,0
+227715,-100,4,2,2,80,0,0
+227783,-100,4,2,1,80,0,0
+227988,-100,4,2,2,80,0,0
+228056,-100,4,2,1,80,0,0
+228261,-100,4,2,2,80,0,0
+228329,-100,4,2,1,80,0,0
+228533,-100,4,2,2,80,0,0
+228602,-100,4,2,1,80,0,0
+229761,-100,4,2,1,50,0,0
+230852,-100,4,2,3,50,0,0
+230943,-100,4,2,2,50,0,0
+231124,-100,4,2,3,50,0,0
+231215,-100,4,2,2,50,0,0
+231397,-100,4,2,3,50,0,0
+231488,-100,4,2,2,50,0,0
+231670,-100,4,2,3,50,0,0
+231761,-100,4,2,2,50,0,0
+231943,-100,4,2,1,50,0,0
+233033,-100,4,2,3,50,0,0
+233124,-100,4,2,1,50,0,0
+233306,-100,4,2,3,50,0,0
+233397,-100,4,2,1,50,0,0
+233579,-83.3333333333333,4,2,1,50,0,0
+234124,-83.3333333333333,4,2,1,65,0,0
+242852,-100,4,2,1,75,0,0
+251579,-83.3333333333333,4,2,1,80,0,1
+253897,-83.3333333333333,4,2,2,80,0,1
+253965,-83.3333333333333,4,2,1,80,0,1
+254170,-83.3333333333333,4,2,2,80,0,1
+254238,-83.3333333333333,4,2,1,80,0,1
+254443,-83.3333333333333,4,2,2,80,0,1
+254511,-83.3333333333333,4,2,1,80,0,1
+254715,-83.3333333333333,4,2,2,80,0,1
+254783,-83.3333333333333,4,2,1,80,0,1
+254988,-83.3333333333333,4,2,2,80,0,1
+255056,-83.3333333333333,4,2,1,80,0,1
+255261,-83.3333333333333,4,2,2,80,0,1
+255329,-83.3333333333333,4,2,1,80,0,1
+258261,-83.3333333333333,4,2,2,80,0,1
+258329,-83.3333333333333,4,2,1,80,0,1
+258533,-83.3333333333333,4,2,2,80,0,1
+258602,-83.3333333333333,4,2,1,80,0,1
+258806,-83.3333333333333,4,2,2,80,0,1
+258874,-83.3333333333333,4,2,1,80,0,1
+259079,-83.3333333333333,4,2,2,80,0,1
+259147,-100,4,2,1,80,0,1
+260033,-100,4,2,1,80,0,1
+260306,-83.3333333333333,4,2,1,90,0,1
+260313,-83.3333333333333,4,2,1,90,0,1
+262624,-83.3333333333333,4,2,2,90,0,1
+262693,-83.3333333333333,4,2,1,90,0,1
+262897,-83.3333333333333,4,2,2,90,0,1
+262965,-83.3333333333333,4,2,1,90,0,1
+263170,-83.3333333333333,4,2,2,90,0,1
+263238,-83.3333333333333,4,2,1,90,0,1
+263443,-83.3333333333333,4,2,2,90,0,1
+263511,-83.3333333333333,4,2,1,90,0,1
+263715,-83.3333333333333,4,2,2,90,0,1
+263783,-83.3333333333333,4,2,1,90,0,1
+263988,-83.3333333333333,4,2,2,90,0,1
+264056,-83.3333333333333,4,2,1,90,0,1
+266988,-83.3333333333333,4,2,2,90,0,1
+267056,-83.3333333333333,4,2,1,90,0,1
+267261,-83.3333333333333,4,2,2,90,0,1
+267329,-83.3333333333333,4,2,1,90,0,1
+267533,-83.3333333333333,4,2,2,90,0,1
+267602,-83.3333333333333,4,2,1,90,0,1
+267806,-83.3333333333333,4,2,2,90,0,1
+267874,-83.3333333333333,4,2,1,90,0,1
+269033,532.150776053215,4,2,1,60,1,1
+269033,-100,4,2,1,60,0,0
+269965,-100,4,2,1,5,0,0
+270097,-66.6666666666667,4,2,1,60,0,0
+272211,-100,4,2,1,60,0,0
+273282,-100,4,2,1,60,0,0
+273290,558.139534883721,4,2,1,60,1,0
+273848,600,4,2,1,60,1,0
+273848,-100,4,2,1,60,0,0
+274248,750,4,2,1,60,1,0
+274269,-100,4,2,1,60,0,0
+274498,750,4,2,1,60,1,0
+274498,-100,4,2,1,60,0,0
+274873,800,4,2,1,60,1,0
+274873,-100,4,2,1,60,0,0
+275273,923.076923076923,4,2,1,60,1,0
+275273,-100,4,2,1,60,0,0
+275734,960,4,2,1,60,1,0
+275734,-100,4,2,1,60,0,0
+276054,1200,4,2,1,60,1,0
+276254,995.850622406639,4,2,1,70,1,0
+276254,-100,4,2,1,70,0,0
+276257,-100,4,2,1,70,0,0
+277249,764.331210191083,4,2,1,70,1,0
+277257,-100,4,2,1,70,0,0
+277503,693.64161849711,4,2,1,70,1,0
+277737,-100,4,2,1,70,0,0
+278181,-100,4,2,1,70,0,0
+278196,631.578947368421,4,2,1,70,1,0
+278609,-100,4,2,1,70,0,0
+278617,588.235294117647,4,2,1,70,1,0
+278813,545.454545454546,4,2,1,70,1,0
+279009,-100,4,2,1,70,0,0
+279358,521.739130434783,4,2,1,70,1,0
+279372,-100,4,2,1,70,0,0
+279687,-100,4,2,1,70,0,0
+279705,718.562874251497,4,2,1,70,1,0
+279944,666.666666666667,4,2,1,70,1,0
+279947,-100,4,2,1,70,0,0
+280170,-100,4,2,1,70,0,0
+280604,-100,4,2,1,70,0,0
+280610,558.139534883721,4,2,1,70,1,0
+280889,521.739130434783,4,2,1,70,1,0
+281149,576.923076923077,4,2,1,70,1,0
+281436,-100,4,2,1,70,0,0
+281437,609.137055837563,4,2,1,70,1,0
+281736,-100,4,2,1,70,0,0
+281741,631.578947368421,4,2,1,70,1,0
+281843,-100,4,2,1,70,0,0
+282056,406.779661016949,4,2,1,70,1,0
+282259,415.22491349481,4,2,1,70,1,0
+282669,-100,4,2,1,70,0,0
+282674,428.571428571429,4,2,1,70,1,0
+283097,-100,4,2,1,70,0,0
+283497,-100,4,2,1,70,0,0
+283531,400,4,2,1,70,1,0
+283931,375,4,2,1,70,1,0
+284118,436.363636363636,4,2,1,70,1,0
+284247,-100,4,2,1,70,0,0
+284554,461.538461538462,4,2,1,70,1,0
+284647,-100,4,2,1,70,0,0
+285015,480,4,2,1,70,1,0
+285247,-100,4,2,1,70,0,0
+285255,500,4,2,1,70,1,0
+285599,-100,4,2,1,70,0,0
+285741,-100,4,2,1,70,0,0
+285755,369.230769230769,4,2,1,70,1,0
+286124,601.642483981269,4,2,1,70,1,0
+286725,857.142857142857,4,2,1,90,1,0
+286725,-25,4,2,1,90,0,0
+
+[HitObjects]
+28,123,22,6,0,L|40:187,5,34,6|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+106,58,431,2,0,L|122:-5,5,34,2|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+207,61,840,2,0,B|280:43|280:43|288:45|288:45|385:21,2,152.999995330811,6|6|6,3:2|3:2|3:2,0:0:0:0:
+313,147,1385,6,0,L|377:159,5,34,6|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+347,252,1794,2,0,L|396:239,5,34,2|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+415,328,2203,2,0,B|433:255|433:255|431:247|431:247|455:150,2,152.999995330811,6|6|6,3:2|3:2|3:2,0:0:0:0:
+235,343,2749,6,0,L|171:331,5,34,6|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+219,239,3158,2,0,L|236:187,5,34,2|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+299,136,3567,2,0,B|231:152|231:152|223:150|223:150|150:168,2,152.999995330811,6|6|6,3:2|3:2|3:2,0:0:0:0:
+234,11,4112,6,0,L|182:-2,5,34,6|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+135,70,4522,2,0,L|83:83,5,34,2|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+35,15,4931,2,0,B|53:88|53:88|51:96|51:96|75:193,2,152.999995330811,6|6|6,3:2|3:2|3:2,0:0:0:0:
+22,251,5476,6,0,L|17:306,5,34,6|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+120,238,5885,2,0,L|171:256,5,34,2|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+187,333,6294,2,0,B|114:351|114:351|106:349|106:349|9:373,2,152.999995330811,6|6|6,3:2|3:2|3:2,0:0:0:0:
+363,340,6840,6,0,L|358:285,5,34,6|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+411,223,7249,2,0,L|462:205,5,34,2|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+355,148,7658,2,0,B|373:75|373:75|371:67|371:67|395:-30,2,152.999995330811,6|6|6,3:2|3:2|3:2,0:0:0:0:
+502,158,8203,6,0,L|514:222,5,34,6|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+419,236,8612,2,0,L|436:288,5,34,2|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+364,341,9022,2,0,B|437:359|437:359|445:357|445:357|542:381,2,152.999995330811,6|6|6,3:2|3:2|3:2,0:0:0:0:
+233,235,9567,6,0,L|222:181,5,34,6|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+284,125,9976,2,0,L|304:94,5,34,2|2|2|2|2|2,3:2|1:2|1:2|3:2|1:2|1:2,0:0:0:0:
+245,16,10385,6,0,P|171:23|132:125,2,152.999995330811,6|6|6,3:2|3:2|3:2,0:0:0:0:
+407,374,12021,6,0,P|406:316|461:265,1,101.999996887207,6|8,3:2|2:2,0:0:0:0:
+484,281,12225,1,2,3:2:0:0:
+484,281,12293,2,0,P|429:260|401:212,1,101.999996887207,0|8,3:3|2:2,0:0:0:0:
+387,125,12566,2,0,P|462:119|484:41,2,152.999995330811,2|2|10,3:2|3:2|3:2,0:0:0:0:
+274,30,13111,6,0,L|141:54,1,101.999996887207,2|8,3:2|3:2,0:0:0:0:
+124,33,13316,1,2,3:2:0:0:
+124,33,13384,2,0,L|-1:56,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+24,154,13657,2,0,P|81:177|106:268,1,152.999995330811,2|2,3:2|3:2,0:0:0:0:
+229,353,14066,1,10,3:2:0:0:
+328,376,14202,6,0,P|324:316|293:277,1,101.999996887207,2|8,3:2|3:2,0:0:0:0:
+256,265,14407,1,2,3:2:0:0:
+256,265,14475,2,0,P|306:242|339:189,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+378,113,14748,2,0,P|449:120|500:192,2,152.999995330811,2|2|10,3:2|3:2|3:2,0:0:0:0:
+277,8,15293,6,0,L|246:133,1,101.999996887207,2|8,3:2|3:2,0:0:0:0:
+212,137,15498,1,2,3:2:0:0:
+212,137,15566,2,0,L|243:262,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+256,336,15839,2,0,P|314:314|423:379,1,152.999995330811,2|2,3:2|3:2,0:0:0:0:
+473,159,16248,1,10,3:2:0:0:
+486,58,16384,6,0,P|431:61|387:116,1,101.999996887207,6|8,3:2|3:2,0:0:0:0:
+382,142,16589,1,2,3:2:0:0:
+382,142,16657,2,0,P|336:101|269:103,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+201,131,16930,2,0,P|189:74|105:47,2,152.999995330811,2|2|10,3:2|3:2|3:2,0:0:0:0:
+40,174,17475,6,0,L|63:312,1,101.999996887207,2|8,3:2|3:2,0:0:0:0:
+97,307,17680,1,2,3:2:0:0:
+97,307,17748,2,0,L|235:284,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+275,223,18021,2,0,P|243:290|273:374,1,152.999995330811,2|2,3:2|3:2,0:0:0:0:
+415,382,18430,1,10,3:2:0:0:
+355,299,18566,6,0,P|394:279|466:297,1,101.999996887207,2|8,3:2|3:2,0:0:0:0:
+486,250,18771,1,2,3:2:0:0:
+486,250,18839,2,0,P|453:208|460:142,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+476,62,19111,2,0,P|444:116|342:98,2,152.999995330811,2|2|10,3:2|3:2|3:2,0:0:0:0:
+306,4,19657,6,0,L|183:50,1,101.999996887207,6|8,3:2|3:2,0:0:0:0:
+161,32,19861,1,2,3:2:0:0:
+161,32,19930,2,0,L|207:155,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+127,201,20202,2,0,P|67:223|6:192,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+41,380,20475,1,0,1:1:0:0:
+48,355,20543,1,8,2:3:0:0:
+64,336,20611,1,8,2:3:0:0:
+86,323,20679,1,4,2:3:0:0:
+111,319,20748,6,0,P|172:336|208:385,1,101.999996887207,6|8,3:2|3:2,0:0:0:0:
+249,382,20952,1,2,3:2:0:0:
+249,382,21021,2,0,L|374:366,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+451,381,21293,2,0,P|460:339|385:240,1,152.999995330811,2|2,3:2|3:2,0:0:0:0:
+398,95,21702,1,10,3:2:0:0:
+337,177,21839,6,0,P|288:208|226:199,1,101.999996887207,2|8,3:2|3:2,0:0:0:0:
+202,192,22043,1,2,3:2:0:0:
+202,192,22111,2,0,L|172:82,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+7,86,22384,1,2,3:2:0:0:
+7,86,22589,1,2,3:2:0:0:
+7,86,22793,1,10,3:2:0:0:
+61,245,22930,6,0,L|48:373,1,101.999996887207,2|8,3:2|3:2,0:0:0:0:
+92,384,23134,1,2,3:2:0:0:
+92,384,23202,2,0,P|149:373|187:330,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+262,283,23475,2,0,P|328:313|350:411,1,152.999995330811,2|2,3:2|3:2,0:0:0:0:
+467,280,23884,1,10,3:2:0:0:
+430,184,24021,6,0,L|310:204,1,101.999996887207,2|8,3:2|3:2,0:0:0:0:
+284,192,24225,1,2,3:2:0:0:
+284,192,24293,2,0,P|257:131|272:74,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+386,4,24566,1,2,3:2:0:0:
+386,4,24771,1,2,3:2:0:0:
+386,4,24975,1,10,3:2:0:0:
+432,136,25111,6,0,P|427:195|465:245,1,101.999996887207,6|8,3:2|3:2,0:0:0:0:
+416,272,25316,1,2,3:2:0:0:
+416,272,25384,2,0,L|306:247,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+219,215,25657,2,0,P|172:266|191:388,1,152.999995330811,2|2,3:2|3:2,0:0:0:0:
+40,259,26066,1,10,3:2:0:0:
+28,157,26202,6,0,P|69:144|104:73,1,101.999996887207,2|8,3:2|3:2,0:0:0:0:
+125,53,26407,1,2,3:2:0:0:
+125,53,26475,2,0,L|146:171,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+221,307,26748,1,2,3:2:0:0:
+221,307,26953,1,2,3:2:0:0:
+221,307,27157,1,10,3:2:0:0:
+379,281,27293,6,0,L|497:303,1,101.999996887207,2|8,3:2|3:2,0:0:0:0:
+510,259,27498,1,2,3:2:0:0:
+510,259,27566,2,0,P|514:209|471:147,1,101.999996887207,0|10,3:3|3:2,0:0:0:0:
+503,62,27839,2,0,P|461:116|373:111,1,152.999995330811,2|2,3:2|3:2,0:0:0:0:
+256,28,28248,1,10,3:2:0:0:
+190,105,28384,5,8,2:3:0:0:
+269,169,28521,1,4,2:3:0:0:
+272,178,28589,1,8,2:3:0:0:
+275,187,28657,2,0,L|260:327,1,101.999996887207,8|8,2:3|2:3,0:0:0:0:
+179,345,28930,1,8,2:3:0:0:
+154,338,28998,1,8,2:3:0:0:
+135,322,29066,1,4,2:3:0:0:
+122,300,29134,1,8,2:3:0:0:
+118,275,29202,2,0,L|106:333,3,50.9999984436036,8|4|8|8,2:3|2:3|2:3|2:3,0:0:0:0:
+45,207,29475,6,0,L|-10:224,3,42.5,14|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+102,137,29748,2,0,L|157:154,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+193,228,30021,2,0,L|205:268,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+291,311,30293,2,0,L|303:270,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+391,243,30566,5,10,3:2:0:0:
+400,246,30634,1,0,3:3:0:0:
+409,249,30702,1,0,3:3:0:0:
+434,344,30839,1,10,3:2:0:0:
+425,347,30907,1,0,3:3:0:0:
+416,350,30975,1,0,3:3:0:0:
+512,269,31111,2,0,L|499:228,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+435,152,31384,2,0,L|447:111,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+381,34,31657,6,0,L|340:46,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+251,83,31930,2,0,L|196:66,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+146,137,32202,2,0,L|158:177,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+56,112,32475,2,0,L|68:72,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+22,199,32748,5,10,3:2:0:0:
+25,208,32816,1,0,3:3:0:0:
+28,217,32884,1,0,3:3:0:0:
+93,292,33021,1,10,3:2:0:0:
+90,301,33089,1,0,3:3:0:0:
+87,310,33157,1,0,3:3:0:0:
+168,367,33293,1,10,3:2:0:0:
+176,365,33361,1,0,3:3:0:0:
+184,363,33430,2,0,L|288:375,1,85,0|10,3:3|3:2,0:0:0:0:
+274,168,33839,6,0,L|262:128,3,42.5,14|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+330,66,34112,2,0,L|342:26,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+422,109,34384,2,0,L|463:121,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+461,218,34657,2,0,L|516:201,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+448,314,34930,5,10,3:2:0:0:
+439,311,34998,1,0,3:3:0:0:
+430,308,35066,1,0,3:3:0:0:
+321,262,35202,1,10,3:2:0:0:
+312,265,35270,1,0,3:3:0:0:
+303,268,35338,1,0,3:3:0:0:
+269,366,35475,2,0,L|214:349,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+162,271,35748,2,0,L|203:259,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+87,207,36021,6,0,L|99:167,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+31,105,36294,2,0,L|19:65,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+101,9,36566,2,0,L|142:21,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+184,108,36839,2,0,L|239:91,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+304,31,37111,5,10,3:2:0:0:
+307,22,37179,1,0,3:3:0:0:
+310,13,37247,1,0,3:3:0:0:
+392,90,37384,1,10,3:2:0:0:
+395,99,37452,1,0,3:3:0:0:
+398,108,37520,1,0,3:3:0:0:
+341,194,37657,2,0,L|363:249,3,42.5,8|8|8|8,2:3|2:3|2:3|2:3,0:0:0:0:
+352,320,37930,2,0,L|374:375,3,42.5,4|4|4|4,2:3|2:3|2:3|2:3,0:0:0:0:
+449,384,38202,6,0,P|490:343|470:247,1,136,6|2,3:2|2:2,0:0:0:0:
+487,268,38748,2,0,L|351:239,1,136,2|2,1:2|2:2,0:0:0:0:
+403,58,39293,2,0,B|330:66|368:102|248:108,1,136,2|2,3:2|3:2,0:0:0:0:
+277,105,39702,1,2,3:2:0:0:
+155,6,39839,2,0,P|184:59|184:92,1,68,2|0,1:2|1:1,0:0:0:0:
+65,163,40111,1,2,1:2:0:0:
+65,163,40384,6,0,L|156:180,1,85,6|2,3:2|1:2,0:0:0:0:
+90,336,40657,2,0,L|-1:353,1,85,0|2,3:3|1:2,0:0:0:0:
+180,280,40930,1,2,3:2:0:0:
+280,304,41066,1,2,1:2:0:0:
+280,304,41134,1,2,2:2:0:0:
+280,304,41202,2,0,L|371:321,1,85,2|2,3:2|1:2,0:0:0:0:
+208,384,41475,5,2,3:2:0:0:
+208,384,41611,1,2,1:2:0:0:
+372,304,41748,2,0,L|281:287,1,85,2|2,3:2|1:2,0:0:0:0:
+170,216,42021,2,0,L|190:119,1,85,2|0,3:2|1:1,0:0:0:0:
+64,75,42293,2,0,L|72:31,3,42.5,8|8|4|4,2:3|2:3|2:3|2:3,0:0:0:0:
+25,148,42566,6,0,P|49:229|11:298,1,136,6|2,3:2|2:2,0:0:0:0:
+32,274,43111,2,0,L|187:310,1,136,2|2,1:2|2:2,0:0:0:0:
+420,179,43657,2,0,B|347:187|385:223|265:229,1,136,2|2,3:2|3:2,0:0:0:0:
+294,226,44066,1,2,3:2:0:0:
+204,146,44202,2,0,P|204:111|236:62,1,68,2|0,1:2|1:1,0:0:0:0:
+381,14,44475,1,2,1:2:0:0:
+381,14,44748,6,0,L|394:111,1,85,6|2,3:2|1:2,0:0:0:0:
+500,237,45021,2,0,L|487:334,1,85,2|2,2:2|1:2,0:0:0:0:
+285,242,45293,1,2,2:2:0:0:
+397,200,45430,1,2,1:2:0:0:
+397,200,45498,1,2,3:2:0:0:
+397,200,45566,2,0,L|384:297,1,85,2|2,2:2|1:2,0:0:0:0:
+208,318,45839,5,0,1:1:0:0:
+208,318,45907,1,0,1:1:0:0:
+208,318,45975,2,0,P|166:292|113:291,1,85,8|4,2:3|2:3,0:0:0:0:
+47,227,46248,1,0,1:1:0:0:
+54,185,46316,1,0,1:1:0:0:
+61,143,46384,1,8,2:3:0:0:
+118,57,46521,2,0,L|108:-6,5,42.5,8|8|4|4|4|4,2:3|2:3|2:3|2:3|2:3|2:3,0:0:0:0:
+186,106,46930,6,0,P|246:93|289:35,1,101.999996887207,6|0,3:2|1:1,0:0:0:0:
+446,47,47202,2,0,P|407:14|357:7,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+367,108,47475,2,0,L|392:212,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+297,383,47748,2,0,L|320:283,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+243,216,48021,6,0,L|143:239,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+188,88,48293,1,2,3:2:0:0:
+188,88,48430,1,2,1:2:0:0:
+59,159,48566,2,0,P|39:239|63:287,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+174,359,48839,2,0,L|274:382,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+423,310,49111,6,0,P|430:244|402:199,1,101.999996887207,6|2,3:2|1:2,0:0:0:0:
+346,71,49384,2,0,P|399:110|452:108,1,101.999996887207,2|2,3:2|1:2,0:0:0:0:
+217,12,49657,1,2,3:2:0:0:
+208,152,49793,1,2,1:2:0:0:
+208,152,49861,1,2,2:2:0:0:
+208,152,49930,2,0,L|73:172,1,101.999996887207,2|2,3:2|1:2,0:0:0:0:
+45,14,50202,5,2,3:2:0:0:
+108,77,50338,1,2,1:2:0:0:
+107,167,50475,1,2,3:2:0:0:
+44,230,50611,1,2,1:2:0:0:
+70,316,50748,2,0,B|165:332|165:332|180:346|180:346|302:361,1,203.999993774414,8|4,3:3|2:3,0:0:0:0:
+441,286,51157,5,4,2:3:0:0:
+434,296,51225,1,4,2:3:0:0:
+427,306,51293,2,0,L|401:188,1,101.999996887207,6|0,3:2|1:1,0:0:0:0:
+482,12,51566,2,0,L|456:130,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+357,113,51839,2,0,P|316:142|257:142,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+119,20,52111,2,0,P|169:22|210:51,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+164,143,52384,6,0,P|123:174|31:168,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+0,304,52657,1,2,3:2:0:0:
+0,304,52793,1,2,1:2:0:0:
+124,339,52930,2,0,L|236:353,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+316,242,53202,2,0,L|302:130,1,101.999996887207,2|0,3:2|3:1,0:0:0:0:
+332,0,53475,6,0,P|389:17|424:69,1,101.999996887207,6|0,3:2|1:1,0:0:0:0:
+512,147,53748,2,0,P|455:164|420:216,1,101.999996887207,8|0,2:3|1:1,0:0:0:0:
+512,332,54021,1,0,3:3:0:0:
+363,319,54157,1,0,1:1:0:0:
+363,319,54225,1,0,2:2:0:0:
+363,319,54293,2,0,L|246:300,1,101.999996887207,4|0,3:3|1:1,0:0:0:0:
+308,164,54566,5,0,3:3:0:0:
+269,181,54634,1,0,3:3:0:0:
+227,177,54702,1,0,1:1:0:0:
+193,153,54770,1,0,1:1:0:0:
+175,116,54838,1,8,2:3:0:0:
+81,73,54975,1,0,1:1:0:0:
+74,115,55043,1,0,1:1:0:0:
+67,157,55111,1,4,2:3:0:0:
+18,247,55248,2,0,L|28:310,5,50.9999984436036,0|0|8|8|4|4,1:1|1:1|2:3|2:3|2:3|2:3,0:0:0:0:
+87,361,55657,6,0,L|128:349,3,42.5,14|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+175,263,55929,2,0,L|230:280,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+295,228,56202,2,0,L|307:188,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+265,105,56475,2,0,L|253:65,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+327,8,56748,5,10,3:2:0:0:
+336,11,56816,1,0,3:3:0:0:
+345,14,56884,1,0,3:3:0:0:
+414,83,57021,1,10,3:2:0:0:
+423,80,57089,1,0,3:3:0:0:
+432,77,57157,1,0,3:3:0:0:
+502,143,57293,2,0,L|490:183,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+431,255,57566,2,0,L|443:295,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+356,334,57839,6,0,L|344:374,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+294,256,58112,2,0,L|334:244,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+205,299,58384,2,0,L|193:259,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+151,377,58657,2,0,L|111:365,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+21,328,58930,5,10,3:2:0:0:
+18,337,58998,1,0,3:3:0:0:
+15,346,59066,1,0,3:3:0:0:
+96,263,59202,1,10,3:2:0:0:
+93,254,59270,1,0,3:3:0:0:
+90,245,59338,1,0,3:3:0:0:
+38,161,59475,1,10,3:2:0:0:
+41,152,59543,1,0,3:3:0:0:
+44,143,59611,2,0,L|32:18,1,85,0|10,3:3|3:2,0:0:0:0:
+227,20,60021,6,0,L|215:60,3,42.5,14|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+257,143,60294,2,0,L|269:183,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+357,143,60566,2,0,L|398:131,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+445,45,60838,2,0,L|500:62,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+496,149,61111,5,10,3:2:0:0:
+493,158,61179,1,0,3:3:0:0:
+490,167,61247,1,0,3:3:0:0:
+420,245,61384,1,10,3:2:0:0:
+417,236,61452,1,0,3:3:0:0:
+414,227,61521,1,0,3:3:0:0:
+389,337,61657,2,0,L|349:325,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+277,266,61930,2,0,L|237:278,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+161,214,62202,6,0,L|149:174,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+142,307,62475,2,0,L|102:295,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+2,292,62748,2,0,L|14:252,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+0,158,63021,2,0,L|40:146,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+95,70,63293,5,10,3:2:0:0:
+104,73,63361,1,0,3:3:0:0:
+113,76,63429,1,0,3:3:0:0:
+189,141,63566,1,10,3:2:0:0:
+198,138,63634,1,0,3:3:0:0:
+207,135,63702,1,0,3:3:0:0:
+281,59,63839,2,0,L|338:73,3,42.5,8|8|8|8,2:3|2:3|2:3|2:3,0:0:0:0:
+362,142,64111,2,0,L|419:156,3,42.5,4|4|4|4,2:3|2:3|2:3|2:3,0:0:0:0:
+478,112,64384,6,0,P|441:165|461:260,1,136,6|2,3:2|1:2,0:0:0:0:
+485,364,64930,2,0,L|325:332,1,136,2|0,3:2|1:1,0:0:0:0:
+222,294,65475,2,0,B|156:309|190:338|97:360,1,136,2|2,3:2|1:2,0:0:0:0:
+104,358,65884,1,2,3:2:0:0:
+16,285,66021,2,0,P|18:244|44:201,1,68,2|0,3:2|1:1,0:0:0:0:
+28,219,66225,1,0,1:1:0:0:
+28,219,66293,1,10,2:3:0:0:
+90,145,66566,6,0,L|76:55,1,85,6|0,3:2|1:1,0:0:0:0:
+256,0,66839,2,0,L|242:90,1,85,0|0,3:2|1:1,0:0:0:0:
+186,179,67111,1,0,3:3:0:0:
+273,263,67248,1,2,1:2:0:0:
+273,263,67316,1,2,3:2:0:0:
+273,263,67384,2,0,L|395:248,1,85,2|2,3:2|1:2,0:0:0:0:
+471,151,67657,5,2,3:2:0:0:
+471,151,67793,1,2,1:2:0:0:
+392,272,67930,2,0,L|307:282,1,85,2|2,3:2|1:2,0:0:0:0:
+165,327,68202,2,0,L|179:237,1,85,2|0,3:2|1:1,0:0:0:0:
+266,112,68475,2,0,L|307:119,3,42.5,8|8|4|4,3:3|2:3|2:3|2:3,0:0:0:0:
+358,51,68748,6,0,P|439:27|508:65,1,136,6|2,3:2|1:2,0:0:0:0:
+447,174,69293,2,0,L|473:336,1,136,2|2,3:2|1:2,0:0:0:0:
+343,253,69839,2,0,B|308:188|278:221|230:145,1,136,2|2,3:2|1:2,0:0:0:0:
+216,58,70248,1,0,1:1:0:0:
+216,58,70316,1,0,1:1:0:0:
+216,58,70384,2,0,P|177:80|140:84,1,68,8|8,2:3|2:3,0:0:0:0:
+58,36,70657,1,4,2:3:0:0:
+58,36,70930,6,0,L|45:155,1,85,6|2,3:2|1:2,0:0:0:0:
+129,284,71202,2,0,L|142:403,1,85,2|2,3:2|1:2,0:0:0:0:
+132,180,71475,1,2,3:2:0:0:
+228,241,71611,1,2,1:2:0:0:
+228,241,71680,1,2,3:2:0:0:
+228,241,71748,2,0,L|312:250,1,85,2|2,3:2|1:2,0:0:0:0:
+382,363,72021,5,2,3:2:0:0:
+414,371,72089,1,0,1:1:0:0:
+448,367,72157,1,0,1:1:0:0:
+478,351,72225,1,0,1:1:0:0:
+500,326,72293,1,0,1:1:0:0:
+453,220,72430,1,0,1:1:0:0:
+449,206,72498,1,0,1:1:0:0:
+445,192,72566,2,0,L|422:244,2,42.5,0|0|0,3:3|1:1|1:1,0:0:0:0:
+486,110,72839,2,0,L|503:71,1,42.5,0|0,1:1|1:1,0:0:0:0:
+414,68,72975,2,0,L|431:29,1,42.5,0|0,1:1|1:1,0:0:0:0:
+344,23,73111,5,6,3:2:0:0:
+62,180,75293,1,6,3:2:0:0:
+403,350,76930,2,0,P|452:342|476:326,5,67.9999979248048,2|2|2|8|8|4,1:2|1:2|1:2|2:3|2:3|2:3,0:0:0:0:
+412,257,77475,6,0,P|419:224|443:195,2,67.9999979248048,6|2|2,3:2|2:2|2:2,0:0:0:0:
+320,230,77748,2,0,P|309:197|315:160,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+248,289,78021,2,0,P|255:322|279:351,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+156,316,78294,2,0,P|145:348|151:385,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+97,240,78566,5,2,3:2:0:0:
+89,250,78657,2,0,L|12:266,1,67.9999979248048,2|2,2:2|2:2,0:0:0:0:
+10,169,78839,1,10,2:2:0:0:
+52,134,78930,1,2,2:2:0:0:
+106,132,79021,1,2,2:2:0:0:
+154,154,79111,2,0,P|231:144|238:9,1,203.999993774414,2|10,3:2|2:2,0:0:0:0:
+258,34,79657,6,0,L|170:26,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+226,127,79930,2,0,L|138:142,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+287,204,80202,2,0,L|374:219,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+293,302,80475,2,0,L|373:339,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+218,362,80748,5,2,3:2:0:0:
+209,352,80839,2,0,P|194:313|204:265,1,67.9999979248048,2|2,2:2|2:2,0:0:0:0:
+256,215,81021,1,10,2:2:0:0:
+299,183,81111,1,2,2:2:0:0:
+352,172,81202,1,2,2:2:0:0:
+398,143,81293,2,0,B|402:238|466:224|462:346,1,203.999993774414,10|2,3:2|1:2,0:0:0:0:
+462,332,81839,6,0,P|421:340|377:374,2,67.9999979248048,6|2|2,3:2|2:2|2:2,0:0:0:0:
+347,273,82111,2,0,P|315:300|294:351,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+368,179,82384,2,0,P|336:151|315:100,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+238,172,82657,2,0,P|224:132|231:77,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+135,75,82930,5,2,3:2:0:0:
+139,58,83021,2,0,P|156:36|228:13,1,67.9999979248048,2|2,2:2|2:2,0:0:0:0:
+41,127,83202,1,10,2:2:0:0:
+83,161,83293,1,2,2:2:0:0:
+103,211,83384,1,2,2:2:0:0:
+99,265,83475,2,0,P|143:371|254:349,1,203.999993774414,2|10,3:2|2:2,0:0:0:0:
+219,374,84021,6,0,L|156:351,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+237,275,84293,2,0,L|182:236,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+291,189,84566,2,0,L|354:166,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+273,90,84839,2,0,L|327:51,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+210,14,85111,5,2,3:2:0:0:
+199,27,85202,2,0,P|177:68|182:118,1,67.9999979248048,2|2,2:2|2:2,0:0:0:0:
+227,174,85384,1,2,1:2:0:0:
+280,183,85475,1,2,1:2:0:0:
+326,210,85566,1,2,1:2:0:0:
+380,206,85657,2,0,B|477:182|477:182|551:217,2,152.999995330811,6|6|2,1:2|1:2|1:2,0:0:0:0:
+414,298,86202,6,0,L|405:350,3,42.5,6|0|8|0,3:2|3:3|3:2|0:0,0:0:0:0:
+313,333,86475,2,0,L|322:385,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+229,285,86748,6,0,L|238:233,1,42.5,2|0,3:2|3:3,0:0:0:0:
+140,308,86884,2,0,L|149:256,1,42.5,8|0,3:2|0:0,0:0:0:0:
+51,334,87021,2,0,L|60:282,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+41,200,87293,6,0,L|-11:209,2,42.5,2|0|8,3:2|3:3|3:2,0:0:0:0:
+111,132,87566,1,2,3:2:0:0:
+119,134,87634,1,0,3:3:0:0:
+127,136,87702,1,8,3:2:0:0:
+152,45,87839,2,0,L|100:36,2,42.5,2|0|8,3:2|3:3|3:2,0:0:0:0:
+222,113,88112,1,2,3:2:0:0:
+230,111,88180,1,0,3:3:0:0:
+238,109,88248,1,8,3:2:0:0:
+295,32,88384,6,0,L|347:23,3,42.5,2|0|8|0,3:2|3:3|3:2|0:0,0:0:0:0:
+334,129,88657,2,0,L|386:138,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+464,98,88930,6,0,L|473:150,1,42.5,2|0,3:2|3:3,0:0:0:0:
+449,184,89066,2,0,L|458:236,1,42.5,8|0,3:2|0:0,0:0:0:0:
+434,270,89202,2,0,L|443:322,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+362,365,89475,5,2,3:2:0:0:
+360,372,89543,1,0,3:3:0:0:
+358,381,89611,1,8,3:2:0:0:
+288,302,89748,1,2,3:2:0:0:
+286,295,89816,1,0,3:3:0:0:
+284,286,89884,1,8,3:2:0:0:
+201,348,90021,1,2,3:2:0:0:
+193,346,90089,1,0,3:3:0:0:
+185,344,90158,2,0,L|81:356,1,85,8|2,3:2|3:2,0:0:0:0:
+67,179,90566,6,0,L|15:170,3,42.5,6|0|8|0,3:2|3:3|3:2|0:0,0:0:0:0:
+50,69,90839,2,0,L|-2:78,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+147,88,91111,6,0,L|138:36,1,42.5,2|0,3:2|3:3,0:0:0:0:
+236,111,91247,2,0,L|227:59,1,42.5,8|0,3:2|0:0,0:0:0:0:
+325,137,91384,2,0,L|316:85,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+257,207,91657,6,0,L|248:259,2,42.5,2|0|8,3:2|3:3|3:2,0:0:0:0:
+154,263,91930,1,2,3:2:0:0:
+156,271,91998,1,0,3:3:0:0:
+158,279,92066,1,8,3:2:0:0:
+231,342,92203,2,0,L|240:394,2,42.5,2|0|8,3:2|3:3|3:2,0:0:0:0:
+327,324,92476,1,2,3:2:0:0:
+329,316,92544,1,0,3:3:0:0:
+331,308,92612,1,8,3:2:0:0:
+431,315,92748,6,0,L|422:367,3,42.5,2|0|8|0,3:2|3:3|3:2|0:0,0:0:0:0:
+503,248,93021,2,0,L|495:206,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+457,113,93293,6,0,L|509:122,1,42.5,2|0,3:2|3:3,0:0:0:0:
+371,79,93429,2,0,L|423:88,1,42.5,8|0,3:2|0:0,0:0:0:0:
+286,47,93566,2,0,L|338:56,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+195,22,93839,5,2,3:2:0:0:
+193,29,93907,1,0,3:3:0:0:
+191,38,93975,1,8,3:2:0:0:
+118,104,94112,1,2,3:2:0:0:
+120,111,94180,1,0,3:3:0:0:
+122,120,94248,1,8,3:2:0:0:
+145,217,94385,1,2,3:2:0:0:
+143,225,94453,1,0,3:3:0:0:
+141,233,94522,2,0,L|153:337,1,85,8|2,3:2|3:2,0:0:0:0:
+48,13,94930,5,0,1:1:0:0:
+41,21,94998,1,0,1:1:0:0:
+34,29,95066,2,0,L|85:20,3,42.5,0|0|0|0,1:1|1:1|1:1|1:1,0:0:0:0:
+77,103,95339,2,0,L|128:94,1,42.5,0|0,1:1|1:1,0:0:0:0:
+37,192,95475,2,0,L|88:183,8,42.5,0|0|0|0|0|0|0|0|6,1:1|1:1|1:1|1:1|1:1|1:1|1:1|1:1|2:2,0:0:0:0:
+285,375,104748,6,0,P|225:362|182:304,1,101.999996887207,6|0,3:2|1:1,0:0:0:0:
+372,333,105020,2,0,P|411:300|461:293,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+483,207,105293,2,0,L|508:103,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+381,19,105566,2,0,L|404:119,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+336,191,105839,6,0,L|236:214,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+190,349,106111,1,2,3:2:0:0:
+190,349,106248,1,2,1:2:0:0:
+66,289,106384,2,0,P|46:209|70:161,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+160,78,106657,2,0,P|210:83|256:62,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+419,106,106929,6,0,P|426:40|398:-5,1,101.999996887207,6|2,3:2|3:2,0:0:0:0:
+350,180,107202,2,0,P|403:219|456:217,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+500,297,107475,1,2,3:2:0:0:
+387,370,107611,1,2,3:2:0:0:
+387,370,107679,1,2,3:2:0:0:
+387,370,107748,2,0,L|252:390,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+126,374,108020,5,2,3:2:0:0:
+139,286,108156,1,2,3:2:0:0:
+213,233,108293,1,2,3:2:0:0:
+301,247,108429,1,2,3:2:0:0:
+267,163,108566,2,0,B|156:202|174:128|41:180,1,203.999993774414,2|8,3:2|2:3,0:0:0:0:
+55,35,108975,5,4,2:3:0:0:
+44,28,109043,1,4,2:3:0:0:
+35,21,109111,2,0,L|153:-5,1,101.999996887207,6|0,3:2|1:1,0:0:0:0:
+279,66,109384,2,0,L|378:87,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+474,77,109657,2,0,P|455:30|405:-1,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+357,183,109929,2,0,P|407:185|448:214,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+499,342,110202,6,0,P|458:373|366:367,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+280,304,110475,1,2,3:2:0:0:
+280,304,110611,1,2,1:2:0:0:
+357,183,110748,2,0,L|343:71,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+209,0,111020,2,0,L|195:112,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+65,166,111293,6,0,P|122:183|157:235,1,101.999996887207,6|2,3:2|3:2,0:0:0:0:
+80,384,111566,2,0,P|66:326|93:269,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+148,213,111839,1,2,3:2:0:0:
+269,287,111975,1,2,3:2:0:0:
+269,287,112043,1,2,3:2:0:0:
+269,287,112111,2,0,L|386:268,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+369,170,112384,5,8,2:3:0:0:
+410,177,112452,1,8,2:3:0:0:
+450,164,112520,1,8,2:3:0:0:
+478,133,112588,1,8,2:3:0:0:
+487,93,112656,1,4,2:3:0:0:
+413,21,112793,1,4,2:3:0:0:
+371,14,112861,1,4,2:3:0:0:
+329,7,112929,1,8,2:3:0:0:
+259,85,113066,2,0,L|196:95,6,50.9999984436036,8|8|4|4|4|4|6,2:3|2:3|2:3|2:3|2:3|2:3|3:2,0:0:0:0:
+352,256,117839,6,0,P|366:320|331:396,2,136,6|2|2,3:2|1:3|3:3,0:0:0:0:
+435,212,118521,1,2,3:2:0:0:
+435,212,118657,2,0,P|363:208|306:147,1,136,2|2,1:3|3:3,0:0:0:0:
+353,23,119203,1,2,1:3:0:0:
+353,23,119339,2,0,L|508:50,1,136,2|2,3:2|3:2,0:0:0:0:
+273,80,119748,1,2,1:3:0:0:
+90,125,120021,6,0,P|84:60|27:-1,2,136,2|2|2,3:3|1:3|2:3,0:0:0:0:
+128,215,120703,1,2,3:2:0:0:
+128,215,120839,2,0,P|74:237|59:256,1,68,2|2,1:3|3:2,0:0:0:0:
+14,317,121112,2,0,L|25:390,2,68,2|2|2,3:3|3:2|1:3,0:0:0:0:
+68,243,121521,2,0,P|141:288|214:276,1,136,2|0,3:2|3:0,0:0:0:0:
+267,337,121930,1,2,1:3:0:0:
+267,337,122202,6,0,P|231:282|271:168,1,170,6|2,3:2|1:2,0:0:0:0:
+252,185,122611,2,0,P|214:243|97:224,1,170,2|2,2:2|3:2,0:0:0:0:
+58,185,123021,2,0,P|61:139|92:90,1,85,2|2,1:2|2:2,0:0:0:0:
+6,0,123293,6,0,L|102:23,1,85,2|2,3:2|2:2,0:0:0:0:
+156,71,123566,2,0,B|186:37|186:37|261:16,1,85,2|2,1:2|3:2,0:0:0:0:
+349,103,123839,1,2,2:2:0:0:
+375,21,123975,1,2,3:2:0:0:
+456,45,124111,2,0,L|472:185,1,127.5,2|0,1:2|0:0,0:0:0:0:
+498,203,124384,6,0,P|450:212|405:327,1,170,2|2,3:2|1:2,0:0:0:0:
+400,312,124793,1,0,0:0:0:0:
+320,342,124930,2,0,P|288:345|244:372,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+226,280,125202,2,0,P|199:298|175:343,2,56.6666666666667,2|2|2,1:2|2:2|2:2,0:0:0:0:
+165,218,125475,6,0,P|151:188|152:137,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+64,166,125748,2,0,P|67:133|94:90,2,56.6666666666667,2|2|2,1:2|2:2|2:2,0:0:0:0:
+98,29,126021,2,0,P|65:26|18:45,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+168,81,126293,1,2,1:2:0:0:
+176,84,126384,2,0,P|208:86|256:67,1,56.6666666666667,2|2,2:2|2:2,0:0:0:0:
+294,22,126566,6,0,L|272:227,1,170,6|2,3:2|1:2,0:0:0:0:
+269,279,126975,2,0,P|216:221|108:227,1,170,2|2,2:2|3:2,0:0:0:0:
+128,216,127384,2,0,P|84:282|118:385,1,170,2|2,1:2|3:2,0:0:0:0:
+102,367,127930,6,0,L|211:350,1,85,2|2,1:2|3:2,0:0:0:0:
+268,375,128202,2,0,B|286:335|286:335|274:283,1,85,2|2,2:2|3:2,0:0:0:0:
+220,230,128475,1,2,1:2:0:0:
+246,149,128611,1,2,2:2:0:0:
+272,67,128748,6,0,P|269:35|242:-9,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+341,119,129021,2,0,P|354:89|353:38,2,56.6666666666667,2|2|2,1:2|2:2|2:2,0:0:0:0:
+374,198,129293,2,0,P|400:179|424:134,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+363,283,129566,2,0,P|395:280|439:253,2,56.6666666666667,2|2|2,1:2|2:2|2:2,0:0:0:0:
+399,365,129839,1,2,3:2:0:0:
+363,336,129930,1,2,2:2:0:0:
+319,321,130021,1,2,2:2:0:0:
+274,327,130111,1,2,1:2:0:0:
+233,348,130202,1,2,2:2:0:0:
+188,355,130293,1,2,2:2:0:0:
+144,341,130384,2,0,P|120:293|207:221,1,170,2|2,3:2|1:2,0:0:0:0:
+282,129,130793,5,0,1:1:0:0:
+282,129,130861,1,0,1:1:0:0:
+282,129,130930,2,0,B|317:20|317:20|237:48,1,170,6|2,3:2|1:2,0:0:0:0:
+264,38,131339,2,0,P|186:59|98:14,1,170,2|2,2:2|3:2,0:0:0:0:
+107,24,131748,2,0,P|133:66|130:126,1,85,2|0,1:2|2:2,0:0:0:0:
+88,171,132021,6,0,P|62:230|115:333,1,170,2|0,3:2|1:1,0:0:0:0:
+100,322,132430,2,0,B|51:323|21:355|21:355|63:331|120:358,1,170,2|0,3:2|3:3,0:0:0:0:
+100,350,132839,2,0,P|148:352|184:332,1,85,2|0,1:2|2:2,0:0:0:0:
+246,281,133111,6,0,L|332:307,1,85,2|0,3:2|0:0,0:0:0:0:
+390,362,133384,1,0,1:1:0:0:
+472,339,133521,1,2,2:2:0:0:
+491,256,133657,1,2,3:2:0:0:
+439,188,133793,1,2,3:2:0:0:
+420,104,133930,1,2,1:2:0:0:
+461,29,134066,1,2,3:2:0:0:
+448,181,134202,5,0,3:3:0:0:
+381,127,134339,1,2,3:2:0:0:
+296,115,134475,1,0,1:1:0:0:
+214,139,134611,1,2,3:2:0:0:
+164,208,134748,2,0,P|121:226|70:220,1,85,2|0,2:2|3:3,0:0:0:0:
+19,113,135021,2,0,P|61:112|99:129,1,85,2|0,1:2|3:3,0:0:0:0:
+25,309,135293,6,0,B|122:323|78:369|209:375,1,170,6|0,3:2|1:1,0:0:0:0:
+252,328,135702,1,2,2:2:0:0:
+252,328,135839,2,0,L|241:241,1,85,2|2,3:2|3:2,0:0:0:0:
+175,190,136111,2,0,L|186:103,1,85,2|2,1:2|2:2,0:0:0:0:
+138,34,136384,5,2,3:2:0:0:
+194,98,136521,1,2,2:2:0:0:
+278,109,136657,1,2,1:2:0:0:
+360,89,136793,1,2,3:2:0:0:
+407,17,136930,5,2,2:2:0:0:
+447,139,137066,1,2,3:2:0:0:
+367,239,137202,1,2,1:2:0:0:
+407,361,137338,1,2,2:2:0:0:
+280,384,137475,5,2,3:2:0:0:
+194,371,137611,1,2,2:2:0:0:
+207,285,137748,1,2,1:2:0:0:
+293,298,137884,1,2,2:2:0:0:
+198,273,138021,2,0,P|184:301|47:327,1,170,2|2,3:2|1:2,0:0:0:0:
+20,80,138566,5,2,3:2:0:0:
+67,49,138657,1,2,2:2:0:0:
+122,40,138748,1,2,2:2:0:0:
+178,47,138839,1,2,1:2:0:0:
+221,83,138930,1,2,2:2:0:0:
+244,135,139021,1,2,2:2:0:0:
+248,190,139111,2,0,P|240:230|225:257,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+327,154,139384,6,0,L|485:175,1,127.5,8|4,2:3|2:3,0:0:0:0:
+489,146,139657,2,0,P|448:57|374:68,1,170,6|2,3:2|1:2,0:0:0:0:
+311,20,140066,2,0,P|284:80|187:82,1,170,2|2,2:2|3:2,0:0:0:0:
+118,35,140475,2,0,P|72:33|32:60,1,85,2|2,1:2|2:2,0:0:0:0:
+13,133,140748,5,2,3:2:0:0:
+93,158,140884,1,2,2:2:0:0:
+30,216,141021,1,2,1:2:0:0:
+91,338,141157,2,0,B|171:350|171:350|180:362|180:362|285:375,1,170,2|2,3:2|3:2,0:0:0:0:
+253,371,141566,2,0,B|265:333|265:333|249:279,1,85,2|2,1:2|2:2,0:0:0:0:
+302,220,141839,6,0,P|255:180|262:73,1,170,2|2,3:2|1:2,0:0:0:0:
+329,31,142248,1,0,0:0:0:0:
+401,75,142384,2,0,L|476:57,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+430,153,142657,2,0,L|505:135,2,56.6666666666667,2|2|2,1:2|2:2|2:2,0:0:0:0:
+474,226,142930,1,2,3:2:0:0:
+433,207,143020,1,2,2:2:0:0:
+389,215,143111,1,2,2:2:0:0:
+356,246,143202,1,2,1:2:0:0:
+347,289,143293,1,2,2:2:0:0:
+363,331,143384,1,2,2:2:0:0:
+403,353,143475,6,0,L|482:334,1,56.6666666666667,2|2,3:2|2:2,0:0:0:0:
+315,310,143657,1,2,2:2:0:0:
+303,314,143748,2,0,L|224:333,1,56.6666666666667,2|2,1:2|2:2,0:0:0:0:
+152,306,143930,1,2,2:2:0:0:
+140,310,144021,6,0,B|90:324|70:373|70:373|26:351|36:287,1,170,6|2,3:2|1:2,0:0:0:0:
+34,314,144430,2,0,P|40:249|156:209,1,170,2|2,2:2|3:2,0:0:0:0:
+151,40,144839,1,2,1:2:0:0:
+151,40,144975,1,2,2:2:0:0:
+91,111,145111,6,0,L|0:97,1,85,2|2,3:2|2:2,0:0:0:0:
+124,200,145384,2,0,L|215:186,1,85,2|2,1:2|3:2,0:0:0:0:
+284,148,145657,1,2,2:2:0:0:
+330,77,145793,1,2,3:2:0:0:
+412,55,145930,1,2,1:2:0:0:
+494,75,146066,1,2,2:2:0:0:
+422,196,146202,6,0,B|333:210|378:259|237:279,1,170,2|2,3:2|1:2,0:0:0:0:
+273,272,146611,1,2,2:2:0:0:
+242,384,146748,2,0,P|204:342|143:323,1,85,2|2,3:2|3:2,0:0:0:0:
+33,327,147021,2,0,P|69:305|95:272,1,85,2|2,1:2|3:2,0:0:0:0:
+120,188,147293,6,0,L|190:167,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+83,110,147566,2,0,L|-14:91,1,85,2|0,1:2|0:0,0:0:0:0:
+175,0,147839,1,2,3:2:0:0:
+256,22,147975,1,2,1:2:0:0:
+195,80,148111,1,2,1:2:0:0:
+300,176,148248,5,0,1:1:0:0:
+300,176,148316,1,0,1:1:0:0:
+300,176,148384,2,0,B|165:59|28:174|28:174|85:282|220:240|220:240|95:264|150:399|277:387|218:278|354:337,1,815.999975097657,6|0,3:2|3:3,0:0:0:0:
+416,358,149611,2,0,P|476:322|492:287,2,85,2|2|2,2:2|1:2|3:2,0:0:0:0:
+318,324,150021,1,2,2:2:0:0:
+318,324,150157,1,2,3:2:0:0:
+395,257,150293,2,0,P|383:208|403:147,1,85,2|2,1:2|2:2,0:0:0:0:
+502,55,150566,5,2,3:2:0:0:
+388,174,150702,1,2,2:2:0:0:
+388,174,150839,1,2,1:2:0:0:
+354,23,150975,2,0,B|185:40|253:129|72:146|72:146|193:127|252:221|252:221|114:248|122:369,1,713.99997821045,2|0,2:2|1:1,0:0:0:0:
+37,281,152066,2,0,P|24:322|28:375,2,85,2|2|2,3:2|2:2|3:2,0:0:0:0:
+73,147,152475,2,0,P|120:193|129:237,1,85,2|2,3:2|3:2,0:0:0:0:
+211,372,152748,6,0,P|247:328|376:346,1,170,4|2,3:2|1:2,0:0:0:0:
+499,342,153157,2,0,L|323:365,1,170,2|2,2:2|3:2,0:0:0:0:
+279,292,153566,2,0,L|300:206,1,85,2|2,1:2|2:2,0:0:0:0:
+236,151,153839,5,2,3:2:0:0:
+299,209,153975,1,2,2:2:0:0:
+375,172,154111,1,2,1:2:0:0:
+448,128,154248,2,0,B|479:97|461:40|461:40|346:20|305:110,1,255,2|0,3:2|1:1,0:0:0:0:
+41,18,154930,5,2,3:2:0:0:
+28,61,155020,1,2,2:2:0:0:
+40,104,155111,1,2,2:2:0:0:
+72,135,155202,1,2,1:2:0:0:
+115,146,155293,1,2,2:2:0:0:
+158,134,155384,1,2,2:2:0:0:
+198,111,155475,1,2,3:2:0:0:
+254,104,155565,1,2,2:2:0:0:
+309,117,155656,1,2,2:2:0:0:
+356,146,155747,1,2,1:2:0:0:
+392,190,155838,1,2,2:2:0:0:
+411,243,155929,1,2,2:2:0:0:
+411,300,156021,6,0,B|389:376|282:346|282:264|334:228|334:228|440:151|406:51|345:3|259:6|200:62|212:132,1,611.999981323243,2|8,3:2|2:3,0:0:0:0:
+213,110,156907,1,8,2:3:0:0:
+214,120,156975,1,4,2:3:0:0:
+215,130,157043,1,4,2:3:0:0:
+216,140,157111,6,0,L|79:122,1,101.999996887207,6|0,3:2|2:2,0:0:0:0:
+3,253,157384,2,0,L|105:267,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+124,138,157657,2,0,L|226:152,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+13,265,157930,2,0,L|115:279,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+134,150,158202,2,0,L|236:164,1,101.999996887207,2|0,3:2|2:2,0:0:0:0:
+23,277,158475,2,0,L|125:291,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+144,162,158748,2,0,L|246:176,1,101.999996887207,2|0,2:2|3:3,0:0:0:0:
+33,289,159021,2,0,L|135:303,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+154,174,159293,2,0,L|256:188,1,101.999996887207,2|0,3:2|2:2,0:0:0:0:
+43,301,159566,2,0,L|145:315,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+164,186,159839,2,0,L|266:200,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+53,313,160112,2,0,L|155:327,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+174,198,160384,2,0,L|276:212,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+63,325,160657,2,0,L|165:339,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+184,210,160930,2,0,L|286:224,1,101.999996887207,2|0,2:2|3:3,0:0:0:0:
+73,337,161202,2,0,L|175:351,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+300,105,161475,6,0,L|437:87,1,101.999996887207,6|0,3:2|2:2,0:0:0:0:
+512,218,161748,2,0,L|410:231,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+391,103,162021,2,0,L|289:116,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+502,230,162294,2,0,L|400:243,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+381,115,162566,2,0,L|279:128,1,101.999996887207,2|0,3:2|2:2,0:0:0:0:
+492,242,162839,2,0,L|390:255,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+371,127,163112,2,0,L|269:140,1,101.999996887207,2|0,2:2|3:3,0:0:0:0:
+482,254,163385,2,0,L|380:267,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+361,139,163657,2,0,L|259:152,1,101.999996887207,2|0,3:2|2:2,0:0:0:0:
+472,266,163930,2,0,L|370:279,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+351,151,164203,2,0,L|249:164,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+462,278,164476,2,0,L|360:291,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+341,163,164748,2,0,L|239:176,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+452,290,165021,2,0,L|350:303,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+331,175,165294,2,0,L|229:188,1,101.999996887207,2|0,2:2|3:3,0:0:0:0:
+396,99,165566,1,2,1:2:0:0:
+216,86,165702,5,0,1:1:0:0:
+216,86,165771,1,0,1:1:0:0:
+216,86,165839,2,0,L|234:223,1,101.999996887207,6|0,3:2|2:2,0:0:0:0:
+103,299,166112,2,0,L|89:197,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+218,178,166385,2,0,L|204:76,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+91,289,166658,2,0,L|77:187,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+206,168,166930,2,0,L|192:66,1,101.999996887207,2|0,3:2|2:2,0:0:0:0:
+79,279,167203,2,0,L|65:177,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+194,158,167476,2,0,L|180:56,1,101.999996887207,2|0,2:2|3:3,0:0:0:0:
+67,269,167749,2,0,L|53:167,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+182,148,168021,2,0,L|168:46,1,101.999996887207,2|0,3:2|2:2,0:0:0:0:
+55,259,168294,2,0,L|41:157,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+170,138,168567,2,0,L|156:36,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+43,249,168840,2,0,L|29:147,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+158,128,169112,2,0,L|144:26,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+31,239,169385,2,0,L|17:137,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+146,118,169658,2,0,L|132:16,1,101.999996887207,2|0,2:2|3:3,0:0:0:0:
+19,229,169930,2,0,L|5:127,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+280,171,170202,6,0,L|262:308,1,101.999996887207,6|0,3:2|2:2,0:0:0:0:
+393,384,170475,2,0,L|407:282,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+278,263,170748,2,0,L|292:161,1,101.999996887207,2|0,3:2|3:3,0:0:0:0:
+405,374,171021,2,0,L|419:272,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+290,253,171293,2,0,L|304:151,1,101.999996887207,2|0,3:2|2:2,0:0:0:0:
+417,364,171566,2,0,L|431:262,1,101.999996887207,2|0,1:2|3:3,0:0:0:0:
+302,243,171839,2,0,L|316:141,1,101.999996887207,2|0,2:2|3:3,0:0:0:0:
+429,354,172112,2,0,L|443:252,1,101.999996887207,2|0,1:2|2:2,0:0:0:0:
+512,181,172384,1,2,3:3:0:0:
+512,181,173278,6,0,P|452:146|386:277,1,255,6|0,3:2|0:0,0:0:0:0:
+327,334,173722,2,0,L|257:321,5,56.6666666666667,0|0|0|2|2|2,3:3|0:0|0:0|3:2|2:2|2:2,0:0:0:0:
+178,230,174166,2,0,L|248:217,5,56.6666666666667,2|2|2|2|2|2,3:2|2:2|2:2|3:2|2:2|2:2,0:0:0:0:
+92,334,174611,2,0,L|22:321,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+99,348,174833,2,0,L|29:335,2,56.6666666666667,2|0|0,3:2|0:0|0:0,0:0:0:0:
+179,312,175055,6,0,P|188:278|169:215,1,85,2|2,3:2|1:2,0:0:0:0:
+84,148,175278,1,2,3:2:0:0:
+84,148,175389,1,2,1:2:0:0:
+84,148,175500,2,0,L|-17:135,1,85,2|2,3:2|1:2,0:0:0:0:
+176,61,175722,2,0,L|277:48,1,85,2|2,3:2|1:2,0:0:0:0:
+378,32,175944,1,2,3:2:0:0:
+359,97,176055,1,0,0:0:0:0:
+380,161,176166,1,2,3:2:0:0:
+437,198,176278,1,0,0:0:0:0:
+504,198,176389,2,0,P|513:147|489:106,1,85,2|0,3:2|0:0,0:0:0:0:
+464,293,176611,2,0,P|415:310|391:351,1,85,2|0,3:2|0:0,0:0:0:0:
+223,292,176833,6,0,B|246:357|246:357|352:294|309:142,1,255,2|2,3:2|1:2,0:0:0:0:
+314,26,177278,1,2,3:2:0:0:
+393,73,177389,1,2,1:2:0:0:
+393,73,177500,2,0,L|500:51,1,85,2|2,3:2|1:2,0:0:0:0:
+238,144,177722,5,2,3:2:0:0:
+238,144,177833,1,2,1:2:0:0:
+238,144,177944,2,0,L|131:122,1,85,2|2,3:2|1:2,0:0:0:0:
+51,179,178166,2,0,P|53:134|32:88,1,85,2|0,3:2|0:0,0:0:0:0:
+136,321,178389,2,0,P|134:279|149:240,1,85,2|0,3:2|0:0,0:0:0:0:
+311,365,178611,6,0,L|388:385,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+361,293,178833,2,0,L|437:271,2,56.6666666666667,2|0|0,3:2|0:0|0:0,0:0:0:0:
+368,205,179055,2,0,L|423:148,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+330,125,179278,2,0,L|350:47,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+442,29,179500,5,2,3:2:0:0:
+442,29,179574,1,2,2:2:0:0:
+442,29,179648,1,2,2:2:0:0:
+442,29,179722,2,0,L|422:106,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+488,149,179944,2,0,B|406:177|450:214|340:247,1,170,2|2,3:2|1:2,0:0:0:0:
+114,91,180389,6,0,P|80:60|39:51,1,85,6|2,3:2|1:2,0:0:0:0:
+0,130,180611,2,0,P|30:160|71:171,1,85,2|2,3:2|1:2,0:0:0:0:
+124,301,180833,2,0,L|109:392,1,85,2|2,3:2|1:2,0:0:0:0:
+201,378,181055,2,0,L|216:287,1,85,2|2,3:2|1:2,0:0:0:0:
+350,243,181278,2,0,L|418:301,1,85,2|2,3:2|1:2,0:0:0:0:
+497,261,181500,2,0,L|513:173,2,85,2|2|2,3:2|1:2|3:2,0:0:0:0:
+414,298,181833,1,2,1:2:0:0:
+414,298,181944,2,0,P|365:311|334:341,1,85,2|0,3:2|0:0,0:0:0:0:
+254,216,182166,5,2,3:2:0:0:
+186,206,182278,1,2,1:2:0:0:
+123,233,182389,1,2,3:2:0:0:
+89,291,182500,1,2,1:2:0:0:
+101,357,182611,2,0,B|135:293|107:231|93:241|46:187|83:107,1,255,2|0,3:2|1:1,0:0:0:0:
+0,29,183055,6,0,P|27:53|84:63,1,85,2|0,3:2|0:0,0:0:0:0:
+176,171,183278,2,0,P|210:159|247:115,1,85,2|2,3:2|1:2,0:0:0:0:
+353,40,183500,2,0,L|364:155,1,85,2|2,3:2|1:2,0:0:0:0:
+473,10,183722,2,0,L|462:125,1,85,2|2,3:2|1:2,0:0:0:0:
+447,199,183944,5,2,3:2:0:0:
+447,199,184055,1,0,0:0:0:0:
+447,199,184166,1,2,3:2:0:0:
+463,223,184277,1,0,0:0:0:0:
+487,237,184388,2,0,L|476:352,1,85,2|2,3:2|1:2,0:0:0:0:
+344,381,184611,2,0,L|333:266,1,85,2|2,3:2|1:2,0:0:0:0:
+233,174,184833,6,0,P|186:180|144:208,1,85,2|2,3:2|1:2,0:0:0:0:
+19,319,185055,2,0,P|56:339|98:343,1,85,2|2,3:2|1:2,0:0:0:0:
+224,268,185278,1,2,3:2:0:0:
+229,200,185389,1,2,1:2:0:0:
+203,136,185500,1,2,3:2:0:0:
+148,95,185611,1,0,0:0:0:0:
+80,84,185722,2,0,P|45:119|29:167,1,85,2|0,3:2|0:0,0:0:0:0:
+227,49,185944,6,0,L|282:-7,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+306,84,186166,2,0,L|382:63,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+358,156,186388,2,0,L|434:176,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+366,244,186611,2,0,L|423:300,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+512,269,186833,5,2,3:2:0:0:
+512,269,186907,1,2,2:2:0:0:
+512,269,186981,1,2,0:0:0:0:
+512,269,187055,2,0,L|455:213,2,56.6666666666667,2|0|0,1:2|0:0|0:0,0:0:0:0:
+469,351,187277,2,0,P|423:346|367:392,1,113.333333333333,8|0,2:3|0:0,0:0:0:0:
+346,383,187500,6,0,B|296:353|296:353|274:238|376:162,1,255,6|0,3:2|1:1,0:0:0:0:
+326,22,187944,1,2,3:2:0:0:
+397,68,188055,2,0,P|439:74|505:42,1,85,2|0,1:2|3:3,0:0:0:0:
+269,143,188278,1,2,1:2:0:0:
+269,143,188389,2,0,P|236:175|218:221,1,85,2|2,3:2|1:2,0:0:0:0:
+209,352,188611,6,0,L|109:339,1,85,2|2,3:2|1:2,0:0:0:0:
+13,230,188833,2,0,L|113:217,1,85,2|2,3:2|1:2,0:0:0:0:
+163,98,189055,2,0,L|63:85,1,85,2|2,3:2|1:2,0:0:0:0:
+133,9,189277,6,0,L|217:19,1,85,2|2,3:2|1:2,0:0:0:0:
+248,145,189499,2,0,L|288:105,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+309,248,189721,2,0,L|323:194,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+414,304,189944,2,0,L|399:250,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+468,194,190166,6,0,L|488:117,5,56.6666666666667,2|2|2|2|2|2,3:2|2:2|2:2|3:2|2:2|2:2,0:0:0:0:
+408,16,190611,2,0,L|423:71,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+399,25,190833,2,0,L|413:79,2,56.6666666666667,2|0|0,3:2|0:0|0:0,0:0:0:0:
+311,21,191055,6,0,P|386:53|353:174,1,170,2|2,3:2|3:2,0:0:0:0:
+272,212,191389,1,2,1:2:0:0:
+272,212,191500,2,0,P|303:227|343:276,1,85,2|2,3:2|1:2,0:0:0:0:
+461,327,191722,2,0,P|432:346|370:356,1,85,2|2,3:2|1:2,0:0:0:0:
+215,380,191944,1,2,3:2:0:0:
+189,357,192055,1,2,1:2:0:0:
+157,343,192166,1,2,3:2:0:0:
+123,340,192277,1,2,1:2:0:0:
+89,347,192389,2,0,P|49:335|11:294,1,85,2|0,3:2|1:1,0:0:0:0:
+54,172,192611,2,0,P|44:131|60:77,1,85,2|0,3:2|1:0,0:0:0:0:
+208,24,192833,2,0,L|193:115,1,85,2|2,3:2|1:2,0:0:0:0:
+275,157,193055,2,0,L|290:66,1,85,2|2,3:2|1:2,0:0:0:0:
+415,27,193277,5,2,3:2:0:0:
+461,98,193389,1,2,1:2:0:0:
+458,182,193500,1,2,3:2:0:0:
+413,254,193611,1,2,1:2:0:0:
+329,269,193722,2,0,P|286:264|227:290,1,85,2|0,3:2|0:0,0:0:0:0:
+377,373,193944,2,0,P|420:378|479:352,1,85,2|0,3:2|0:0,0:0:0:0:
+491,288,194166,2,0,B|475:189|434:241|422:89,1,170,2|0,3:2|1:1,0:0:0:0:
+51,35,194611,6,0,B|97:71|166:63|166:63|220:147|220:147|287:120|391:189,1,340,6|0,3:2|3:3,0:0:0:0:
+165,279,195166,1,2,1:2:0:0:
+201,189,195277,2,0,P|241:220|260:277,1,85,2|2,3:2|1:2,0:0:0:0:
+47,321,195500,2,0,P|53:270|93:225,1,85,2|2,3:2|1:2,0:0:0:0:
+238,346,195722,5,2,3:2:0:0:
+320,365,195833,1,2,1:2:0:0:
+402,345,195944,1,2,3:2:0:0:
+462,285,196055,1,2,1:2:0:0:
+484,203,196166,2,0,P|479:158|404:126,1,113.333333333333,2|2,3:2|0:0,0:0:0:0:
+354,57,196389,6,0,L|361:0,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+290,124,196611,2,0,L|297:67,3,56.6666666666667,2|2|2|2,3:2|2:2|2:2|3:2,0:0:0:0:
+242,209,196907,2,0,L|234:265,1,56.6666666666667,2|2,2:2|2:2,0:0:0:0:
+192,279,197055,2,0,L|199:335,2,56.6666666666667,2|2|2,3:2|2:2|2:2,0:0:0:0:
+108,239,197277,2,0,L|52:232,5,56.6666666666667,2|2|2|2|2|2,3:2|2:2|2:2|3:2|2:2|2:2,0:0:0:0:
+0,305,197722,2,0,P|65:299|94:417,1,170,2|2,3:2|3:2,0:0:0:0:
+391,327,198166,6,0,L|461:316,5,56.6666666666667,2|2|2|2|2|2,3:2|0:2|0:2|3:2|0:2|0:2,0:0:0:0:
+317,265,198611,1,2,3:2:0:0:
+317,265,198685,1,2,0:2:0:0:
+317,265,198759,1,2,0:2:0:0:
+317,265,198833,2,0,L|247:254,2,56.6666666666667,2|2|0,3:2|0:0|0:0,0:0:0:0:
+392,180,199055,2,0,L|403:110,5,56.6666666666667,2|2|2|2|0|0,3:2|0:2|0:2|3:2|0:0|0:0,0:0:0:0:
+494,85,199500,2,0,L|483:15,5,56.6666666666667,2|2|2|2|0|0,3:2|0:2|0:2|3:2|0:0|0:0,0:0:0:0:
+400,124,199944,6,0,L|330:113,5,56.6666666666667,2|2|2|2|2|2,3:2|0:2|0:2|3:2|0:2|0:2,0:0:0:0:
+267,59,200389,1,2,3:2:0:0:
+267,59,200463,1,2,0:2:0:0:
+267,59,200537,1,2,0:2:0:0:
+267,59,200611,2,0,L|197:70,2,56.6666666666667,2|2|0,3:2|0:0|0:0,0:0:0:0:
+121,115,200833,2,0,L|110:45,5,56.6666666666667,2|2|2|2|2|2,3:2|0:2|0:2|3:2|0:2|0:2,0:0:0:0:
+179,202,201277,2,0,L|168:272,2,56.6666666666667,2|0|0,1:2|0:0|0:0,0:0:0:0:
+67,245,201500,2,0,L|78:315,2,56.6666666666667,8|0|0,2:3|0:0|0:0,0:0:0:0:
+11,377,201722,5,4,3:2:0:0:
+256,192,201776,12,4,205276,3:2:0:0:
+171,17,207943,6,0,L|178:69,31,34,0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0,3:3|0:0|0:0|0:0|0:0|3:3|0:0|0:0|0:0|0:0|3:3|0:0|0:0|0:0|0:0|3:3|0:0|0:0|0:0|0:0|3:3|0:0|0:0|0:0|0:0|3:3|0:0|0:0|0:0|0:0|3:3|0:0,0:0:0:0:
+85,45,210124,5,8,3:3:0:0:
+73,234,210329,1,4,3:3:0:0:
+243,150,210533,1,8,3:3:0:0:
+122,74,210670,5,8,3:3:0:0:
+61,252,210875,1,4,3:3:0:0:
+246,215,211079,1,8,3:3:0:0:
+294,296,211215,6,0,L|239:313,3,42.5,14|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+369,234,211488,2,0,L|410:247,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+319,156,211761,2,0,L|307:116,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+221,73,212033,2,0,L|209:114,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+121,141,212306,5,10,3:2:0:0:
+112,138,212374,1,0,3:3:0:0:
+103,135,212442,1,0,3:3:0:0:
+78,40,212579,1,10,3:2:0:0:
+87,37,212647,1,0,3:3:0:0:
+96,34,212715,1,0,3:3:0:0:
+0,115,212851,2,0,L|13:156,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+77,232,213124,2,0,L|65:273,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+131,350,213397,6,0,L|172:338,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+261,301,213670,2,0,L|316:318,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+366,247,213942,2,0,L|354:207,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+456,272,214215,2,0,L|444:312,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+490,185,214488,5,10,3:2:0:0:
+487,176,214556,1,0,3:3:0:0:
+484,167,214624,1,0,3:3:0:0:
+419,92,214761,1,10,3:2:0:0:
+422,83,214829,1,0,3:3:0:0:
+425,74,214897,1,0,3:3:0:0:
+344,17,215033,1,10,3:2:0:0:
+336,19,215101,1,0,3:3:0:0:
+328,21,215170,2,0,L|224:9,1,85,0|10,3:3|3:2,0:0:0:0:
+238,216,215579,6,0,L|250:256,3,42.5,14|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+182,318,215852,2,0,L|170:358,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+90,275,216124,2,0,L|49:263,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+51,166,216397,2,0,L|-4:183,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+64,70,216670,5,10,3:2:0:0:
+73,73,216738,1,0,3:3:0:0:
+82,76,216806,1,0,3:3:0:0:
+191,122,216942,1,10,3:2:0:0:
+200,119,217010,1,0,3:3:0:0:
+209,116,217078,1,0,3:3:0:0:
+243,18,217215,2,0,L|298:35,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+350,113,217488,2,0,L|309:125,2,42.5,10|0|0,3:2|3:3|3:3,0:0:0:0:
+425,177,217761,6,0,L|413:217,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+481,279,218034,2,0,L|493:319,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+411,375,218306,2,0,L|370:363,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+328,276,218579,2,0,L|273:293,3,42.5,10|0|0|0,3:2|3:3|3:3|3:3,0:0:0:0:
+208,353,218851,5,10,3:2:0:0:
+205,362,218919,1,0,3:3:0:0:
+202,371,218987,1,0,3:3:0:0:
+120,294,219124,1,10,3:2:0:0:
+117,285,219192,1,0,3:3:0:0:
+114,276,219260,1,0,3:3:0:0:
+44,203,219397,2,0,L|55:145,7,42.5,10|0|0|0|0|0|0|0,3:2|3:3|3:3|3:3|3:3|3:3|3:3|3:3,0:0:0:0:
+142,171,219943,5,0,1:1:0:0:
+146,181,220011,1,0,1:1:0:0:
+151,190,220079,2,0,L|202:199,3,42.5,0|0|0|0,1:1|1:1|1:1|1:1,0:0:0:0:
+269,153,220352,2,0,L|320:162,1,42.5,0|0,1:1|1:1,0:0:0:0:
+320,248,220488,2,0,L|371:257,8,42.5,0|0|0|0|0|0|0|0|0,1:1|1:1|1:1|1:1|1:1|1:1|1:1|1:1|0:0,0:0:0:0:
+364,28,222670,6,0,L|424:7,7,42.5,4|8|8|8|4|4|4|4,1:2|2:3|2:3|2:3|2:3|2:3|2:3|2:3,0:0:0:0:
+487,58,223215,2,0,L|470:149,1,85,6|2,3:2|1:2,0:0:0:0:
+437,312,223488,2,0,L|420:221,1,85,0|2,3:2|1:2,0:0:0:0:
+314,245,223761,1,2,3:2:0:0:
+240,320,223897,1,2,1:2:0:0:
+240,320,223965,1,2,3:2:0:0:
+240,320,224033,2,0,L|149:337,1,85,2|2,3:2|1:2,0:0:0:0:
+37,266,224306,5,2,3:2:0:0:
+37,266,224443,1,2,1:2:0:0:
+142,352,224579,2,0,L|225:336,1,85,2|2,3:2|1:2,0:0:0:0:
+304,206,224852,2,0,L|288:123,1,85,2|0,3:2|1:1,0:0:0:0:
+164,41,225124,2,0,L|172:0,3,42.5,0|0|0|0,3:3|3:3|1:1|3:3,0:0:0:0:
+84,68,225397,6,0,P|125:92|149:148,1,85,2|0,3:2|1:1,0:0:0:0:
+86,190,225670,2,0,P|45:166|21:110,1,85,2|0,3:2|1:1,0:0:0:0:
+39,266,225943,2,0,L|48:358,1,85,2|0,3:2|1:1,0:0:0:0:
+137,365,226215,2,0,L|128:273,1,85,2|0,3:2|1:1,0:0:0:0:
+237,209,226488,6,0,L|329:218,1,85,2|0,3:2|1:1,0:0:0:0:
+361,127,226761,1,2,3:2:0:0:
+361,127,226897,1,2,1:2:0:0:
+488,185,227033,2,0,L|479:277,1,85,2|0,3:2|1:1,0:0:0:0:
+429,362,227306,2,0,L|438:270,1,85,2|0,3:2|1:1,0:0:0:0:
+361,127,227579,6,0,P|344:82|354:27,1,85,6|2,3:2|3:2,0:0:0:0:
+195,127,227852,2,0,P|196:169|180:208,1,85,0|2,3:3|3:2,0:0:0:0:
+211,346,228124,1,2,3:2:0:0:
+131,297,228261,1,2,3:2:0:0:
+131,297,228329,1,2,3:2:0:0:
+131,297,228397,2,0,L|32:288,1,85,2|2,3:2|3:2,0:0:0:0:
+67,158,228670,5,8,2:3:0:0:
+59,126,228738,1,8,2:3:0:0:
+63,92,228806,1,8,2:3:0:0:
+79,62,228874,1,8,2:3:0:0:
+104,40,228942,1,4,2:3:0:0:
+210,91,229079,1,4,2:3:0:0:
+224,95,229147,1,4,2:3:0:0:
+238,99,229215,2,0,L|186:122,2,42.5,8|8|8,2:3|2:3|2:3,0:0:0:0:
+353,24,229488,2,0,L|336:63,1,42.5,4|4,2:3|2:3,0:0:0:0:
+425,66,229624,2,0,L|408:105,1,42.5,4|4,2:3|2:3,0:0:0:0:
+495,111,229760,5,6,3:2:0:0:
+221,375,231943,1,6,3:2:0:0:
+102,54,233579,2,0,P|53:62|29:78,5,67.9999979248048,2|2|2|10|10|6,1:2|1:2|1:2|2:3|2:3|2:3,0:0:0:0:
+93,147,234124,6,0,P|86:180|62:209,2,67.9999979248048,6|2|2,3:2|2:2|2:2,0:0:0:0:
+185,174,234397,2,0,P|196:207|190:244,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+257,115,234670,2,0,P|250:82|226:53,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+349,88,234943,2,0,P|360:56|354:19,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+431,140,235215,5,2,3:2:0:0:
+439,130,235306,2,0,L|516:114,1,67.9999979248048,2|2,2:2|2:2,0:0:0:0:
+502,215,235488,1,10,2:2:0:0:
+460,250,235579,1,2,2:2:0:0:
+406,252,235670,1,2,2:2:0:0:
+358,230,235760,2,0,P|289:219|204:322,1,203.999993774414,2|10,3:2|2:2,0:0:0:0:
+204,309,236306,6,0,L|292:317,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+161,221,236579,2,0,L|249:206,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+77,165,236852,2,0,L|-11:173,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+120,77,237125,2,0,L|32:62,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+194,12,237397,5,2,3:2:0:0:
+203,22,237488,2,0,P|218:61|208:109,1,67.9999979248048,2|2,2:2|2:2,0:0:0:0:
+296,151,237670,1,10,2:2:0:0:
+349,144,237760,1,2,2:2:0:0:
+391,109,237851,1,2,2:2:0:0:
+400,55,237942,2,0,P|349:167|431:250,1,203.999993774414,10|2,3:2|1:2,0:0:0:0:
+385,228,238488,6,0,P|371:267|378:322,2,67.9999979248048,6|2|2,3:2|2:2|2:2,0:0:0:0:
+276,298,238761,2,0,P|283:339|317:382,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+188,248,239033,2,0,P|196:206|229:162,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+129,131,239306,2,0,P|156:98|207:77,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+38,119,239579,5,2,3:2:0:0:
+32,135,239670,2,0,P|35:162|86:218,1,67.9999979248048,2|2,2:2|2:2,0:0:0:0:
+20,291,239851,1,10,2:2:0:0:
+57,251,239942,1,2,2:2:0:0:
+108,235,240033,1,2,2:2:0:0:
+161,244,240124,2,0,B|269:295|276:214|401:275,1,203.999993774414,2|10,3:2|2:2,0:0:0:0:
+360,258,240670,6,0,L|297:281,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+460,308,240942,2,0,L|405:347,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+448,213,241215,2,0,L|511:190,2,67.9999979248048,2|2|2,3:2|2:2|2:2,0:0:0:0:
+430,114,241488,2,0,L|484:75,2,67.9999979248048,10|2|2,2:2|2:2|2:2,0:0:0:0:
+365,38,241760,5,2,3:2:0:0:
+354,51,241852,2,0,P|332:92|337:142,1,67.9999979248048,2|2,2:2|2:2,0:0:0:0:
+244,165,242033,1,2,1:2:0:0:
+191,156,242124,1,2,1:2:0:0:
+145,129,242215,1,2,1:2:0:0:
+91,133,242306,2,0,B|109:32|109:32|82:-34,2,135.99999584961,6|0|0,1:2|0:0|0:0,0:0:0:0:
+33,221,242852,6,0,L|42:273,3,42.5,6|0|8|0,3:2|3:3|3:2|0:0,0:0:0:0:
+134,256,243125,2,0,L|125:308,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+228,299,243397,6,0,L|269:291,1,42.5,2|0,3:2|3:3,0:0:0:0:
+251,210,243534,2,0,L|292:202,1,42.5,8|0,3:2|0:0,0:0:0:0:
+276,120,243671,2,0,L|317:112,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+388,48,243943,6,0,L|379:-4,2,42.5,2|0|8,3:2|3:3|3:2,0:0:0:0:
+409,139,244216,1,2,3:2:0:0:
+407,147,244284,1,0,3:3:0:0:
+405,155,244352,1,8,3:2:0:0:
+495,191,244489,2,0,L|504:139,2,42.5,2|0|8,3:2|3:3|3:2,0:0:0:0:
+426,254,244762,1,2,3:2:0:0:
+428,262,244830,1,0,3:3:0:0:
+430,270,244898,1,8,3:2:0:0:
+370,354,245034,6,0,L|318:363,3,42.5,2|0|8|0,3:2|3:3|3:2|0:0,0:0:0:0:
+331,257,245307,2,0,L|279:248,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+229,187,245579,6,0,L|236:145,1,42.5,2|0,3:2|3:3,0:0:0:0:
+140,210,245716,2,0,L|147:168,1,42.5,8|0,3:2|0:0,0:0:0:0:
+50,235,245853,2,0,L|57:193,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+120,299,246124,5,2,3:2:0:0:
+122,306,246193,1,0,3:3:0:0:
+124,315,246261,1,8,3:2:0:0:
+171,218,246397,1,2,3:2:0:0:
+173,211,246465,1,0,3:3:0:0:
+175,202,246533,1,8,3:2:0:0:
+123,119,246670,1,2,3:2:0:0:
+125,111,246738,1,0,3:3:0:0:
+127,103,246806,2,0,L|116:-1,1,85,8|2,3:2|3:2,0:0:0:0:
+289,8,247215,6,0,L|341:17,3,42.5,6|0|8|0,3:2|3:3|3:2|0:0,0:0:0:0:
+306,118,247488,2,0,L|358:109,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+440,82,247761,6,0,L|449:134,1,42.5,2|0,3:2|3:3,0:0:0:0:
+425,168,247897,2,0,L|434:220,1,42.5,8|0,3:2|0:0,0:0:0:0:
+410,254,248033,2,0,L|419:306,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+346,361,248306,6,0,L|294:352,2,42.5,2|0|8,3:2|3:3|3:2,0:0:0:0:
+287,258,248579,1,2,3:2:0:0:
+279,260,248647,1,0,3:3:0:0:
+271,262,248715,1,8,3:2:0:0:
+193,320,248852,2,0,L|141:329,2,42.5,2|0|8,3:2|3:3|3:2,0:0:0:0:
+139,231,249124,1,2,3:2:0:0:
+131,229,249194,1,0,3:3:0:0:
+123,227,249261,1,8,3:2:0:0:
+53,294,249397,6,0,L|62:346,3,42.5,2|0|8|0,3:2|3:3|3:2|0:0,0:0:0:0:
+0,214,249670,2,0,L|8:172,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+41,78,249943,6,0,L|-11:87,1,42.5,2|0,3:2|3:3,0:0:0:0:
+127,44,250079,2,0,L|75:53,1,42.5,8|0,3:2|0:0,0:0:0:0:
+212,12,250215,2,0,L|160:21,3,42.5,2|0|8|0,3:2|0:0|3:2|0:0,0:0:0:0:
+210,113,250488,5,2,3:2:0:0:
+212,120,250556,1,0,3:3:0:0:
+214,129,250624,1,8,3:2:0:0:
+295,186,250761,1,2,3:2:0:0:
+293,193,250829,1,0,3:3:0:0:
+291,202,250898,1,8,3:2:0:0:
+235,284,251033,1,2,3:2:0:0:
+237,292,251102,1,0,3:3:0:0:
+239,300,251170,2,0,L|229:359,5,42.5,8|0|2|0|8|0,3:2|3:3|3:2|3:3|3:2|3:3,0:0:0:0:
+229,205,251579,6,0,P|289:218|332:276,1,101.999996887207,6|0,3:2|1:1,0:0:0:0:
+475,279,251852,2,0,P|436:312|386:319,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+440,188,252124,2,0,L|465:84,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+297,1,252397,2,0,L|320:101,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+205,178,252670,6,0,L|105:155,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+42,63,252942,1,2,3:2:0:0:
+42,63,253079,1,2,1:2:0:0:
+1,237,253215,2,0,P|81:257|129:233,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+248,325,253488,2,0,L|148:348,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+408,308,253760,6,0,P|468:334|493:381,1,101.999996887207,6|2,3:2|3:2,0:0:0:0:
+318,250,254033,2,0,P|300:202|310:153,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+202,8,254306,1,2,3:2:0:0:
+295,60,254442,1,2,3:2:0:0:
+295,60,254510,1,2,3:2:0:0:
+295,60,254579,2,0,L|430:40,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+486,147,254851,5,2,3:2:0:0:
+423,210,254987,1,2,3:2:0:0:
+424,300,255124,1,2,3:2:0:0:
+487,363,255260,1,2,3:2:0:0:
+412,309,255397,2,0,B|317:325|317:325|302:339|302:339|180:354,1,203.999993774414,2|8,3:2|2:3,0:0:0:0:
+80,349,255806,5,4,2:3:0:0:
+87,359,255874,1,4,2:3:0:0:
+94,369,255942,2,0,L|120:251,1,101.999996887207,6|0,3:2|1:1,0:0:0:0:
+14,99,256215,2,0,L|40:217,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+172,177,256488,2,0,P|222:174|263:145,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+238,37,256760,2,0,P|188:39|147:68,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+115,269,257033,6,0,P|164:276|205:307,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+342,384,257306,1,2,3:2:0:0:
+342,384,257442,1,2,1:2:0:0:
+455,305,257579,2,0,L|469:193,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+381,25,257851,2,0,L|395:137,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+267,206,258124,6,0,P|210:189|175:137,1,101.999996887207,6|2,3:2|3:2,0:0:0:0:
+95,26,258397,2,0,P|38:43|3:95,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+101,216,258670,1,2,3:2:0:0:
+22,284,258806,1,2,3:2:0:0:
+22,284,258874,1,2,3:2:0:0:
+22,284,258942,2,0,L|3:401,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+158,357,259215,5,8,2:3:0:0:
+197,374,259283,1,8,2:3:0:0:
+239,370,259351,1,8,2:3:0:0:
+273,346,259419,1,8,2:3:0:0:
+291,309,259487,1,4,2:3:0:0:
+405,309,259624,1,4,2:3:0:0:
+415,315,259692,1,4,2:3:0:0:
+425,321,259761,2,0,L|443:386,2,42.5,8|8|8,2:3|2:3|2:3,0:0:0:0:
+355,215,260033,2,0,L|373:150,3,42.5,4|4|4|4,2:3|2:3|2:3|2:3,0:0:0:0:
+376,74,260306,6,0,P|316:87|273:145,1,101.999996887207,6|0,3:2|1:1,0:0:0:0:
+112,21,260578,2,0,P|151:54|201:61,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+240,204,260851,2,0,L|136:229,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+1,306,261124,2,0,L|101:329,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+296,380,261397,6,0,L|196:357,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+324,269,261669,1,2,3:2:0:0:
+324,269,261806,1,2,1:2:0:0:
+445,346,261942,2,0,P|465:266|441:218,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+360,112,262215,2,0,P|410:107|456:128,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+274,175,262487,6,0,P|213:148|188:101,1,101.999996887207,6|2,3:2|3:2,0:0:0:0:
+38,82,262760,2,0,P|91:43|144:45,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+194,119,263033,1,2,3:2:0:0:
+312,17,263169,1,2,3:2:0:0:
+312,17,263237,1,2,3:2:0:0:
+312,17,263306,2,0,L|447:37,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+503,159,263578,5,2,3:2:0:0:
+456,234,263714,1,2,3:2:0:0:
+367,254,263851,1,2,3:2:0:0:
+292,207,263987,1,2,3:2:0:0:
+206,230,264124,2,0,B|88:237|134:298|-8:302,1,203.999993774414,2|8,3:2|2:3,0:0:0:0:
+173,364,264533,5,4,2:3:0:0:
+166,375,264601,1,4,2:3:0:0:
+159,384,264669,2,0,L|133:266,1,101.999996887207,6|0,3:2|1:1,0:0:0:0:
+302,214,264942,2,0,L|281:313,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+399,384,265215,2,0,P|430:344|432:285,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+496,158,265487,2,0,P|455:187|404:189,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+362,12,265760,6,0,P|411:19|452:50,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+288,107,266033,1,2,3:2:0:0:
+288,107,266169,1,2,1:2:0:0:
+171,18,266306,2,0,L|157:130,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+251,304,266578,2,0,L|237:192,1,101.999996887207,2|0,3:2|1:1,0:0:0:0:
+56,123,266851,6,0,P|68:171|104:206,1,101.999996887207,6|2,3:2|3:2,0:0:0:0:
+35,378,267124,2,0,P|21:320|48:263,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+123,331,267397,1,2,3:2:0:0:
+253,263,267533,1,2,3:2:0:0:
+253,263,267601,1,2,3:2:0:0:
+253,263,267669,2,0,L|370:282,1,101.999996887207,2|2,3:2|3:2,0:0:0:0:
+463,369,267942,5,8,2:3:0:0:
+489,336,268010,1,8,2:3:0:0:
+498,295,268078,1,8,2:3:0:0:
+485,256,268146,1,8,2:3:0:0:
+455,228,268214,1,4,2:3:0:0:
+419,94,268352,1,4,2:3:0:0:
+403,133,268420,1,4,2:3:0:0:
+372,161,268488,1,8,2:3:0:0:
+332,169,268556,1,8,2:3:0:0:
+292,157,268624,1,8,2:3:0:0:
+231,79,268761,2,0,L|176:72,3,50.9999984436036,4|4|4|4,2:3|2:3|2:3|2:3,0:0:0:0:
+96,25,269033,6,0,P|145:65|95:296,1,297.5,6|0,3:2|0:0,0:0:0:0:
+121,370,270097,2,0,P|70:261|250:314,1,382.500014591218,6|0,3:2|3:3,0:0:0:0:
+319,356,271028,1,0,3:3:0:0:
+312,347,271161,6,0,P|281:282|332:105,1,255.000009727478,6|0,1:2|3:3,0:0:0:0:
+400,56,271959,1,0,3:3:0:0:
+400,56,272225,2,0,L|411:-18,2,56.6666666666667,0|0|0,1:1|1:1|1:1,0:0:0:0:
+442,224,272758,2,0,L|453:150,2,56.6666666666667,0|0|0,1:1|1:1|1:1,0:0:0:0:
+512,288,273290,6,0,P|443:291|403:383,1,170,6|2,3:2|3:2,0:0:0:0:
+303,339,274048,2,0,L|294:254,1,56.6666666666667,0|0,3:3|3:3,0:0:0:0:
+202,300,274498,6,0,L|184:260,2,28.3333333333333,0|0|0,1:1|1:1|1:1,0:0:0:0:
+105,278,274873,2,0,L|109:235,2,28.3333333333333,8|8|8,2:3|2:3|2:3,0:0:0:0:
+31,211,275273,2,0,L|56:176,2,28.3333333333333,4|4|4,2:3|2:3|2:3,0:0:0:0:
+0,115,275734,2,0,L|39:97,2,28.3333333333333,4|0|0,2:3|3:3|3:3,0:0:0:0:
+21,17,276254,5,6,3:2:0:0:
+256,192,276419,12,4,286062,2:3:0:0:
+80,113,286725,6,0,B|137:185|228:143|230:143|231:143|330:119|372:183|321:239|260:239|196:214|196:214|299:265|347:186|469:261,1,680,6|4,3:2|3:2,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3689906-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3689906-expected-conversion.json
new file mode 100644
index 0000000000..31743d99ac
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3689906-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":390.0,"Objects":[{"StartTime":390.0,"Position":124.0,"HyperDash":false},{"StartTime":480.0,"Position":109.0,"HyperDash":false},{"StartTime":571.0,"Position":124.0,"HyperDash":false},{"StartTime":644.0,"Position":121.0,"HyperDash":false},{"StartTime":753.0,"Position":124.0,"HyperDash":false}]},{"StartTime":935.0,"Objects":[{"StartTime":935.0,"Position":208.0,"HyperDash":false}]},{"StartTime":1117.0,"Objects":[{"StartTime":1117.0,"Position":380.0,"HyperDash":false},{"StartTime":1207.0,"Position":395.0,"HyperDash":false},{"StartTime":1298.0,"Position":380.0,"HyperDash":false},{"StartTime":1371.0,"Position":381.0,"HyperDash":false},{"StartTime":1480.0,"Position":380.0,"HyperDash":false}]},{"StartTime":1844.0,"Objects":[{"StartTime":1844.0,"Position":208.0,"HyperDash":false}]},{"StartTime":2208.0,"Objects":[{"StartTime":2208.0,"Position":360.0,"HyperDash":false}]},{"StartTime":2390.0,"Objects":[{"StartTime":2390.0,"Position":188.0,"HyperDash":false}]},{"StartTime":2480.0,"Objects":[{"StartTime":2480.0,"Position":152.0,"HyperDash":false}]},{"StartTime":2571.0,"Objects":[{"StartTime":2571.0,"Position":112.0,"HyperDash":false},{"StartTime":2643.0,"Position":111.0,"HyperDash":false},{"StartTime":2752.0,"Position":112.0,"HyperDash":false}]},{"StartTime":2935.0,"Objects":[{"StartTime":2935.0,"Position":196.0,"HyperDash":false}]},{"StartTime":3117.0,"Objects":[{"StartTime":3117.0,"Position":280.0,"HyperDash":false}]},{"StartTime":3299.0,"Objects":[{"StartTime":3299.0,"Position":196.0,"HyperDash":false}]},{"StartTime":3480.0,"Objects":[{"StartTime":3480.0,"Position":288.0,"HyperDash":false},{"StartTime":3570.0,"Position":273.0,"HyperDash":false},{"StartTime":3661.0,"Position":288.0,"HyperDash":false},{"StartTime":3734.0,"Position":276.0,"HyperDash":false},{"StartTime":3843.0,"Position":288.0,"HyperDash":false}]},{"StartTime":4026.0,"Objects":[{"StartTime":4026.0,"Position":116.0,"HyperDash":false}]},{"StartTime":4390.0,"Objects":[{"StartTime":4390.0,"Position":300.0,"HyperDash":false}]},{"StartTime":4753.0,"Objects":[{"StartTime":4753.0,"Position":28.0,"HyperDash":false},{"StartTime":4825.0,"Position":24.0,"HyperDash":false},{"StartTime":4934.0,"Position":28.0,"HyperDash":false}]},{"StartTime":5117.0,"Objects":[{"StartTime":5117.0,"Position":112.0,"HyperDash":false}]},{"StartTime":5299.0,"Objects":[{"StartTime":5299.0,"Position":20.0,"HyperDash":false}]},{"StartTime":5480.0,"Objects":[{"StartTime":5480.0,"Position":192.0,"HyperDash":false},{"StartTime":5570.0,"Position":248.148758,"HyperDash":false},{"StartTime":5661.0,"Position":277.0,"HyperDash":false},{"StartTime":5734.0,"Position":247.046844,"HyperDash":false},{"StartTime":5843.0,"Position":192.0,"HyperDash":false}]},{"StartTime":6208.0,"Objects":[{"StartTime":6208.0,"Position":484.0,"HyperDash":false},{"StartTime":6298.0,"Position":475.0,"HyperDash":false},{"StartTime":6389.0,"Position":484.0,"HyperDash":false},{"StartTime":6462.0,"Position":465.0,"HyperDash":false},{"StartTime":6571.0,"Position":484.0,"HyperDash":false}]},{"StartTime":6753.0,"Objects":[{"StartTime":6753.0,"Position":400.0,"HyperDash":false}]},{"StartTime":6935.0,"Objects":[{"StartTime":6935.0,"Position":228.0,"HyperDash":false},{"StartTime":7025.0,"Position":219.0,"HyperDash":false},{"StartTime":7116.0,"Position":228.0,"HyperDash":false},{"StartTime":7189.0,"Position":245.0,"HyperDash":false},{"StartTime":7298.0,"Position":228.0,"HyperDash":false}]},{"StartTime":7662.0,"Objects":[{"StartTime":7662.0,"Position":396.0,"HyperDash":false}]},{"StartTime":8026.0,"Objects":[{"StartTime":8026.0,"Position":244.0,"HyperDash":false}]},{"StartTime":8208.0,"Objects":[{"StartTime":8208.0,"Position":416.0,"HyperDash":false}]},{"StartTime":8298.0,"Objects":[{"StartTime":8298.0,"Position":452.0,"HyperDash":false}]},{"StartTime":8389.0,"Objects":[{"StartTime":8389.0,"Position":492.0,"HyperDash":false},{"StartTime":8461.0,"Position":505.0,"HyperDash":false},{"StartTime":8570.0,"Position":492.0,"HyperDash":false}]},{"StartTime":8753.0,"Objects":[{"StartTime":8753.0,"Position":396.0,"HyperDash":false}]},{"StartTime":8935.0,"Objects":[{"StartTime":8935.0,"Position":304.0,"HyperDash":false}]},{"StartTime":9117.0,"Objects":[{"StartTime":9117.0,"Position":212.0,"HyperDash":false}]},{"StartTime":9298.0,"Objects":[{"StartTime":9298.0,"Position":312.0,"HyperDash":false},{"StartTime":9388.0,"Position":304.0,"HyperDash":false},{"StartTime":9479.0,"Position":312.0,"HyperDash":false},{"StartTime":9552.0,"Position":325.0,"HyperDash":false},{"StartTime":9661.0,"Position":312.0,"HyperDash":false}]},{"StartTime":9844.0,"Objects":[{"StartTime":9844.0,"Position":140.0,"HyperDash":false}]},{"StartTime":10208.0,"Objects":[{"StartTime":10208.0,"Position":324.0,"HyperDash":false}]},{"StartTime":10571.0,"Objects":[{"StartTime":10571.0,"Position":136.0,"HyperDash":false},{"StartTime":10643.0,"Position":164.812149,"HyperDash":false},{"StartTime":10752.0,"Position":221.0,"HyperDash":false}]},{"StartTime":10935.0,"Objects":[{"StartTime":10935.0,"Position":128.0,"HyperDash":false},{"StartTime":11007.0,"Position":165.812149,"HyperDash":false},{"StartTime":11116.0,"Position":213.0,"HyperDash":false}]},{"StartTime":11299.0,"Objects":[{"StartTime":11299.0,"Position":384.0,"HyperDash":false}]},{"StartTime":11480.0,"Objects":[{"StartTime":11480.0,"Position":292.0,"HyperDash":false}]},{"StartTime":11662.0,"Objects":[{"StartTime":11662.0,"Position":200.0,"HyperDash":false}]},{"StartTime":12026.0,"Objects":[{"StartTime":12026.0,"Position":488.0,"HyperDash":false},{"StartTime":12116.0,"Position":473.0,"HyperDash":false},{"StartTime":12207.0,"Position":487.234161,"HyperDash":false},{"StartTime":12280.0,"Position":452.046844,"HyperDash":false},{"StartTime":12389.0,"Position":402.0,"HyperDash":false}]},{"StartTime":12571.0,"Objects":[{"StartTime":12571.0,"Position":316.0,"HyperDash":false}]},{"StartTime":12753.0,"Objects":[{"StartTime":12753.0,"Position":144.0,"HyperDash":false},{"StartTime":12843.0,"Position":158.0,"HyperDash":false},{"StartTime":12934.0,"Position":144.0,"HyperDash":false},{"StartTime":13007.0,"Position":125.0,"HyperDash":false},{"StartTime":13116.0,"Position":144.0,"HyperDash":false}]},{"StartTime":13480.0,"Objects":[{"StartTime":13480.0,"Position":314.0,"HyperDash":false},{"StartTime":13570.0,"Position":255.851257,"HyperDash":false},{"StartTime":13661.0,"Position":229.234161,"HyperDash":false},{"StartTime":13734.0,"Position":212.046844,"HyperDash":false},{"StartTime":13843.0,"Position":144.0,"HyperDash":false}]},{"StartTime":14026.0,"Objects":[{"StartTime":14026.0,"Position":144.0,"HyperDash":false}]},{"StartTime":14208.0,"Objects":[{"StartTime":14208.0,"Position":314.0,"HyperDash":false},{"StartTime":14280.0,"Position":346.812164,"HyperDash":false},{"StartTime":14389.0,"Position":399.0,"HyperDash":false}]},{"StartTime":14571.0,"Objects":[{"StartTime":14571.0,"Position":304.0,"HyperDash":false},{"StartTime":14643.0,"Position":297.0,"HyperDash":false},{"StartTime":14752.0,"Position":304.0,"HyperDash":false}]},{"StartTime":14935.0,"Objects":[{"StartTime":14935.0,"Position":132.0,"HyperDash":false},{"StartTime":15025.0,"Position":88.85124,"HyperDash":false},{"StartTime":15116.0,"Position":48.0,"HyperDash":false},{"StartTime":15189.0,"Position":42.0,"HyperDash":false},{"StartTime":15298.0,"Position":48.0,"HyperDash":false}]},{"StartTime":15480.0,"Objects":[{"StartTime":15480.0,"Position":132.0,"HyperDash":false}]},{"StartTime":15662.0,"Objects":[{"StartTime":15662.0,"Position":304.0,"HyperDash":false}]},{"StartTime":16026.0,"Objects":[{"StartTime":16026.0,"Position":132.0,"HyperDash":false}]},{"StartTime":16390.0,"Objects":[{"StartTime":16390.0,"Position":284.0,"HyperDash":false},{"StartTime":16462.0,"Position":289.0,"HyperDash":false},{"StartTime":16571.0,"Position":284.0,"HyperDash":false}]},{"StartTime":16753.0,"Objects":[{"StartTime":16753.0,"Position":192.0,"HyperDash":false}]},{"StartTime":16935.0,"Objects":[{"StartTime":16935.0,"Position":192.0,"HyperDash":false}]},{"StartTime":17117.0,"Objects":[{"StartTime":17117.0,"Position":364.0,"HyperDash":false},{"StartTime":17207.0,"Position":419.148743,"HyperDash":false},{"StartTime":17298.0,"Position":449.0,"HyperDash":false},{"StartTime":17371.0,"Position":432.046844,"HyperDash":false},{"StartTime":17480.0,"Position":364.0,"HyperDash":false}]},{"StartTime":17844.0,"Objects":[{"StartTime":17844.0,"Position":64.0,"HyperDash":false},{"StartTime":17916.0,"Position":81.0,"HyperDash":false},{"StartTime":18025.0,"Position":64.0,"HyperDash":false}]},{"StartTime":18208.0,"Objects":[{"StartTime":18208.0,"Position":148.0,"HyperDash":false},{"StartTime":18280.0,"Position":163.0,"HyperDash":false},{"StartTime":18389.0,"Position":148.0,"HyperDash":false}]},{"StartTime":18571.0,"Objects":[{"StartTime":18571.0,"Position":320.0,"HyperDash":false}]},{"StartTime":18935.0,"Objects":[{"StartTime":18935.0,"Position":132.0,"HyperDash":false}]},{"StartTime":19299.0,"Objects":[{"StartTime":19299.0,"Position":132.0,"HyperDash":false},{"StartTime":19389.0,"Position":191.148758,"HyperDash":false},{"StartTime":19480.0,"Position":216.765839,"HyperDash":false},{"StartTime":19553.0,"Position":233.953156,"HyperDash":false},{"StartTime":19662.0,"Position":302.0,"HyperDash":false}]},{"StartTime":19844.0,"Objects":[{"StartTime":19844.0,"Position":388.0,"HyperDash":false}]},{"StartTime":20026.0,"Objects":[{"StartTime":20026.0,"Position":216.0,"HyperDash":false},{"StartTime":20098.0,"Position":187.187851,"HyperDash":false},{"StartTime":20207.0,"Position":131.0,"HyperDash":false}]},{"StartTime":20390.0,"Objects":[{"StartTime":20390.0,"Position":224.0,"HyperDash":false},{"StartTime":20462.0,"Position":212.0,"HyperDash":false},{"StartTime":20571.0,"Position":224.0,"HyperDash":false}]},{"StartTime":20753.0,"Objects":[{"StartTime":20753.0,"Position":52.0,"HyperDash":false},{"StartTime":20843.0,"Position":37.0,"HyperDash":false},{"StartTime":20934.0,"Position":52.0,"HyperDash":false},{"StartTime":21007.0,"Position":74.95316,"HyperDash":false},{"StartTime":21116.0,"Position":134.0,"HyperDash":false}]},{"StartTime":21299.0,"Objects":[{"StartTime":21299.0,"Position":224.0,"HyperDash":false}]},{"StartTime":21480.0,"Objects":[{"StartTime":21480.0,"Position":396.0,"HyperDash":false}]},{"StartTime":21844.0,"Objects":[{"StartTime":21844.0,"Position":224.0,"HyperDash":false}]},{"StartTime":22026.0,"Objects":[{"StartTime":22026.0,"Position":132.0,"HyperDash":false}]},{"StartTime":22208.0,"Objects":[{"StartTime":22208.0,"Position":224.0,"HyperDash":false}]},{"StartTime":22299.0,"Objects":[{"StartTime":22299.0,"Position":176.0,"HyperDash":false}]},{"StartTime":22390.0,"Objects":[{"StartTime":22390.0,"Position":132.0,"HyperDash":false}]},{"StartTime":22571.0,"Objects":[{"StartTime":22571.0,"Position":232.0,"HyperDash":false}]},{"StartTime":22753.0,"Objects":[{"StartTime":22753.0,"Position":404.0,"HyperDash":false}]},{"StartTime":22935.0,"Objects":[{"StartTime":22935.0,"Position":232.0,"HyperDash":false},{"StartTime":23007.0,"Position":248.0,"HyperDash":false},{"StartTime":23116.0,"Position":232.0,"HyperDash":false}]},{"StartTime":23299.0,"Objects":[{"StartTime":23299.0,"Position":404.0,"HyperDash":false}]},{"StartTime":23389.0,"Objects":[{"StartTime":23389.0,"Position":448.0,"HyperDash":false}]},{"StartTime":23480.0,"Objects":[{"StartTime":23480.0,"Position":492.0,"HyperDash":true}]},{"StartTime":23662.0,"Objects":[{"StartTime":23662.0,"Position":212.0,"HyperDash":false},{"StartTime":23752.0,"Position":164.4215,"HyperDash":false},{"StartTime":23843.0,"Position":110.280991,"HyperDash":false},{"StartTime":23916.0,"Position":70.25621,"HyperDash":false},{"StartTime":24025.0,"Position":8.0,"HyperDash":false}]},{"StartTime":24208.0,"Objects":[{"StartTime":24208.0,"Position":92.0,"HyperDash":false}]},{"StartTime":24390.0,"Objects":[{"StartTime":24390.0,"Position":272.0,"HyperDash":false},{"StartTime":24462.0,"Position":262.0,"HyperDash":false},{"StartTime":24571.0,"Position":272.0,"HyperDash":false}]},{"StartTime":24753.0,"Objects":[{"StartTime":24753.0,"Position":180.0,"HyperDash":false}]},{"StartTime":25117.0,"Objects":[{"StartTime":25117.0,"Position":348.0,"HyperDash":false},{"StartTime":25189.0,"Position":314.187836,"HyperDash":false},{"StartTime":25298.0,"Position":263.0,"HyperDash":false}]},{"StartTime":25480.0,"Objects":[{"StartTime":25480.0,"Position":355.0,"HyperDash":false}]},{"StartTime":25662.0,"Objects":[{"StartTime":25662.0,"Position":179.0,"HyperDash":false}]},{"StartTime":25752.0,"Objects":[{"StartTime":25752.0,"Position":135.0,"HyperDash":false}]},{"StartTime":25843.0,"Objects":[{"StartTime":25843.0,"Position":91.0,"HyperDash":false},{"StartTime":25933.0,"Position":30.8512421,"HyperDash":false},{"StartTime":26024.0,"Position":6.0,"HyperDash":false},{"StartTime":26097.0,"Position":23.9531631,"HyperDash":false},{"StartTime":26206.0,"Position":91.0,"HyperDash":false}]},{"StartTime":26571.0,"Objects":[{"StartTime":26571.0,"Position":383.0,"HyperDash":false}]},{"StartTime":26753.0,"Objects":[{"StartTime":26753.0,"Position":299.0,"HyperDash":false},{"StartTime":26843.0,"Position":264.851257,"HyperDash":false},{"StartTime":26934.0,"Position":215.0,"HyperDash":false},{"StartTime":27007.0,"Position":195.0,"HyperDash":false},{"StartTime":27116.0,"Position":215.0,"HyperDash":false}]},{"StartTime":27299.0,"Objects":[{"StartTime":27299.0,"Position":391.0,"HyperDash":false}]},{"StartTime":27662.0,"Objects":[{"StartTime":27662.0,"Position":239.0,"HyperDash":false},{"StartTime":27734.0,"Position":234.0,"HyperDash":false},{"StartTime":27843.0,"Position":239.0,"HyperDash":false}]},{"StartTime":28026.0,"Objects":[{"StartTime":28026.0,"Position":323.0,"HyperDash":false}]},{"StartTime":28208.0,"Objects":[{"StartTime":28208.0,"Position":231.0,"HyperDash":false}]},{"StartTime":28390.0,"Objects":[{"StartTime":28390.0,"Position":315.0,"HyperDash":false}]},{"StartTime":28571.0,"Objects":[{"StartTime":28571.0,"Position":143.0,"HyperDash":false}]},{"StartTime":28753.0,"Objects":[{"StartTime":28753.0,"Position":315.0,"HyperDash":false}]},{"StartTime":28935.0,"Objects":[{"StartTime":28935.0,"Position":407.0,"HyperDash":false},{"StartTime":29025.0,"Position":446.57605,"HyperDash":false},{"StartTime":29116.0,"Position":508.0,"HyperDash":false},{"StartTime":29189.0,"Position":506.0,"HyperDash":false},{"StartTime":29298.0,"Position":508.0,"HyperDash":true}]},{"StartTime":29480.0,"Objects":[{"StartTime":29480.0,"Position":212.0,"HyperDash":false},{"StartTime":29570.0,"Position":178.4679,"HyperDash":false},{"StartTime":29661.0,"Position":110.374321,"HyperDash":false},{"StartTime":29752.0,"Position":113.0,"HyperDash":false},{"StartTime":29843.0,"Position":108.0,"HyperDash":false},{"StartTime":29916.0,"Position":158.8,"HyperDash":false},{"StartTime":30025.0,"Position":210.0,"HyperDash":false}]},{"StartTime":30208.0,"Objects":[{"StartTime":30208.0,"Position":304.0,"HyperDash":false},{"StartTime":30298.0,"Position":356.148743,"HyperDash":false},{"StartTime":30389.0,"Position":389.0,"HyperDash":false},{"StartTime":30462.0,"Position":359.046844,"HyperDash":false},{"StartTime":30571.0,"Position":304.0,"HyperDash":false}]},{"StartTime":30935.0,"Objects":[{"StartTime":30935.0,"Position":152.0,"HyperDash":false},{"StartTime":31007.0,"Position":159.0,"HyperDash":false},{"StartTime":31116.0,"Position":152.0,"HyperDash":false}]},{"StartTime":31299.0,"Objects":[{"StartTime":31299.0,"Position":236.0,"HyperDash":false},{"StartTime":31371.0,"Position":252.0,"HyperDash":false},{"StartTime":31480.0,"Position":236.0,"HyperDash":false}]},{"StartTime":31662.0,"Objects":[{"StartTime":31662.0,"Position":320.0,"HyperDash":false},{"StartTime":31752.0,"Position":262.851257,"HyperDash":false},{"StartTime":31843.0,"Position":235.0,"HyperDash":false},{"StartTime":31916.0,"Position":265.953156,"HyperDash":false},{"StartTime":32025.0,"Position":320.0,"HyperDash":false}]},{"StartTime":32390.0,"Objects":[{"StartTime":32390.0,"Position":136.0,"HyperDash":false},{"StartTime":32458.0,"Position":135.0,"HyperDash":false},{"StartTime":32526.0,"Position":346.0,"HyperDash":false},{"StartTime":32594.0,"Position":39.0,"HyperDash":false},{"StartTime":32662.0,"Position":300.0,"HyperDash":false},{"StartTime":32730.0,"Position":398.0,"HyperDash":false},{"StartTime":32798.0,"Position":151.0,"HyperDash":false},{"StartTime":32866.0,"Position":73.0,"HyperDash":false},{"StartTime":32935.0,"Position":311.0,"HyperDash":false},{"StartTime":33003.0,"Position":90.0,"HyperDash":false},{"StartTime":33071.0,"Position":264.0,"HyperDash":false},{"StartTime":33139.0,"Position":477.0,"HyperDash":false},{"StartTime":33207.0,"Position":473.0,"HyperDash":false},{"StartTime":33275.0,"Position":120.0,"HyperDash":false},{"StartTime":33343.0,"Position":115.0,"HyperDash":false},{"StartTime":33411.0,"Position":163.0,"HyperDash":false},{"StartTime":33480.0,"Position":447.0,"HyperDash":false}]},{"StartTime":33844.0,"Objects":[{"StartTime":33844.0,"Position":428.0,"HyperDash":false},{"StartTime":33934.0,"Position":428.0,"HyperDash":false},{"StartTime":34025.0,"Position":428.0,"HyperDash":false}]},{"StartTime":34208.0,"Objects":[{"StartTime":34208.0,"Position":256.0,"HyperDash":false},{"StartTime":34280.0,"Position":207.187851,"HyperDash":false},{"StartTime":34389.0,"Position":171.0,"HyperDash":false}]},{"StartTime":34480.0,"Objects":[{"StartTime":34480.0,"Position":216.0,"HyperDash":false}]},{"StartTime":34571.0,"Objects":[{"StartTime":34571.0,"Position":264.0,"HyperDash":false},{"StartTime":34661.0,"Position":306.5,"HyperDash":false},{"StartTime":34752.0,"Position":264.0,"HyperDash":false}]},{"StartTime":34935.0,"Objects":[{"StartTime":34935.0,"Position":92.0,"HyperDash":false},{"StartTime":35007.0,"Position":54.1878471,"HyperDash":false},{"StartTime":35116.0,"Position":7.0,"HyperDash":true}]},{"StartTime":35299.0,"Objects":[{"StartTime":35299.0,"Position":288.0,"HyperDash":false},{"StartTime":35389.0,"Position":341.578522,"HyperDash":false},{"StartTime":35480.0,"Position":389.719,"HyperDash":false},{"StartTime":35553.0,"Position":430.743774,"HyperDash":false},{"StartTime":35662.0,"Position":492.0,"HyperDash":false}]},{"StartTime":35844.0,"Objects":[{"StartTime":35844.0,"Position":400.0,"HyperDash":false}]},{"StartTime":36026.0,"Objects":[{"StartTime":36026.0,"Position":224.0,"HyperDash":false},{"StartTime":36098.0,"Position":203.187851,"HyperDash":false},{"StartTime":36207.0,"Position":139.0,"HyperDash":false}]},{"StartTime":36390.0,"Objects":[{"StartTime":36390.0,"Position":232.0,"HyperDash":false},{"StartTime":36462.0,"Position":229.0,"HyperDash":false},{"StartTime":36571.0,"Position":232.0,"HyperDash":false}]},{"StartTime":36753.0,"Objects":[{"StartTime":36753.0,"Position":56.0,"HyperDash":false},{"StartTime":36825.0,"Position":72.0,"HyperDash":false},{"StartTime":36934.0,"Position":56.0,"HyperDash":false}]},{"StartTime":37026.0,"Objects":[{"StartTime":37026.0,"Position":104.0,"HyperDash":false}]},{"StartTime":37117.0,"Objects":[{"StartTime":37117.0,"Position":152.0,"HyperDash":false}]},{"StartTime":37299.0,"Objects":[{"StartTime":37299.0,"Position":244.0,"HyperDash":false}]},{"StartTime":37480.0,"Objects":[{"StartTime":37480.0,"Position":152.0,"HyperDash":false},{"StartTime":37552.0,"Position":109.187851,"HyperDash":false},{"StartTime":37661.0,"Position":67.0,"HyperDash":false}]},{"StartTime":37844.0,"Objects":[{"StartTime":37844.0,"Position":244.0,"HyperDash":false},{"StartTime":37916.0,"Position":233.0,"HyperDash":false},{"StartTime":38025.0,"Position":244.0,"HyperDash":false}]},{"StartTime":38208.0,"Objects":[{"StartTime":38208.0,"Position":496.0,"HyperDash":false},{"StartTime":38298.0,"Position":482.0,"HyperDash":false},{"StartTime":38389.0,"Position":495.234161,"HyperDash":false},{"StartTime":38462.0,"Position":471.046844,"HyperDash":false},{"StartTime":38571.0,"Position":410.0,"HyperDash":false}]},{"StartTime":38753.0,"Objects":[{"StartTime":38753.0,"Position":504.0,"HyperDash":false},{"StartTime":38843.0,"Position":480.851257,"HyperDash":false},{"StartTime":38934.0,"Position":419.234161,"HyperDash":false},{"StartTime":39007.0,"Position":379.046844,"HyperDash":false},{"StartTime":39116.0,"Position":334.0,"HyperDash":false}]},{"StartTime":39299.0,"Objects":[{"StartTime":39299.0,"Position":156.0,"HyperDash":false},{"StartTime":39371.0,"Position":128.187851,"HyperDash":false},{"StartTime":39480.0,"Position":71.0,"HyperDash":false}]},{"StartTime":39662.0,"Objects":[{"StartTime":39662.0,"Position":252.0,"HyperDash":false},{"StartTime":39752.0,"Position":294.5,"HyperDash":false},{"StartTime":39843.0,"Position":252.0,"HyperDash":false}]},{"StartTime":40026.0,"Objects":[{"StartTime":40026.0,"Position":71.0,"HyperDash":false},{"StartTime":40098.0,"Position":83.0,"HyperDash":false},{"StartTime":40207.0,"Position":71.0,"HyperDash":false}]},{"StartTime":40390.0,"Objects":[{"StartTime":40390.0,"Position":164.0,"HyperDash":false},{"StartTime":40462.0,"Position":117.187851,"HyperDash":false},{"StartTime":40571.0,"Position":79.0,"HyperDash":false}]},{"StartTime":40753.0,"Objects":[{"StartTime":40753.0,"Position":256.0,"HyperDash":false},{"StartTime":40825.0,"Position":275.812164,"HyperDash":false},{"StartTime":40934.0,"Position":341.0,"HyperDash":false}]},{"StartTime":41117.0,"Objects":[{"StartTime":41117.0,"Position":84.0,"HyperDash":false},{"StartTime":41207.0,"Position":107.148758,"HyperDash":false},{"StartTime":41298.0,"Position":168.765839,"HyperDash":false},{"StartTime":41371.0,"Position":188.953156,"HyperDash":false},{"StartTime":41480.0,"Position":254.0,"HyperDash":false}]},{"StartTime":41662.0,"Objects":[{"StartTime":41662.0,"Position":432.0,"HyperDash":false},{"StartTime":41734.0,"Position":438.0,"HyperDash":false},{"StartTime":41843.0,"Position":432.0,"HyperDash":false}]},{"StartTime":42026.0,"Objects":[{"StartTime":42026.0,"Position":348.0,"HyperDash":false}]},{"StartTime":42208.0,"Objects":[{"StartTime":42208.0,"Position":432.0,"HyperDash":false},{"StartTime":42280.0,"Position":411.187836,"HyperDash":false},{"StartTime":42389.0,"Position":347.0,"HyperDash":false}]},{"StartTime":42571.0,"Objects":[{"StartTime":42571.0,"Position":176.0,"HyperDash":false},{"StartTime":42643.0,"Position":132.187851,"HyperDash":false},{"StartTime":42752.0,"Position":91.0,"HyperDash":false}]},{"StartTime":42844.0,"Objects":[{"StartTime":42844.0,"Position":132.0,"HyperDash":false}]},{"StartTime":42935.0,"Objects":[{"StartTime":42935.0,"Position":176.0,"HyperDash":false}]},{"StartTime":43117.0,"Objects":[{"StartTime":43117.0,"Position":260.0,"HyperDash":false},{"StartTime":43207.0,"Position":210.851242,"HyperDash":false},{"StartTime":43298.0,"Position":175.0,"HyperDash":false},{"StartTime":43371.0,"Position":218.953156,"HyperDash":false},{"StartTime":43480.0,"Position":260.0,"HyperDash":false}]},{"StartTime":43662.0,"Objects":[{"StartTime":43662.0,"Position":84.0,"HyperDash":false},{"StartTime":43734.0,"Position":93.0,"HyperDash":false},{"StartTime":43843.0,"Position":84.0,"HyperDash":false}]},{"StartTime":44026.0,"Objects":[{"StartTime":44026.0,"Position":336.0,"HyperDash":false},{"StartTime":44116.0,"Position":393.578522,"HyperDash":false},{"StartTime":44207.0,"Position":436.0,"HyperDash":false},{"StartTime":44280.0,"Position":442.0,"HyperDash":false},{"StartTime":44389.0,"Position":436.0,"HyperDash":false}]},{"StartTime":44571.0,"Objects":[{"StartTime":44571.0,"Position":344.0,"HyperDash":false}]},{"StartTime":44753.0,"Objects":[{"StartTime":44753.0,"Position":252.0,"HyperDash":false},{"StartTime":44825.0,"Position":246.0,"HyperDash":false},{"StartTime":44934.0,"Position":252.0,"HyperDash":false}]},{"StartTime":45117.0,"Objects":[{"StartTime":45117.0,"Position":428.0,"HyperDash":false},{"StartTime":45189.0,"Position":387.187836,"HyperDash":false},{"StartTime":45298.0,"Position":343.0,"HyperDash":false}]},{"StartTime":45480.0,"Objects":[{"StartTime":45480.0,"Position":164.0,"HyperDash":false}]},{"StartTime":45570.0,"Objects":[{"StartTime":45570.0,"Position":121.0,"HyperDash":false}]},{"StartTime":45661.0,"Objects":[{"StartTime":45661.0,"Position":79.0,"HyperDash":false}]},{"StartTime":45844.0,"Objects":[{"StartTime":45844.0,"Position":256.0,"HyperDash":false},{"StartTime":45916.0,"Position":275.0,"HyperDash":false},{"StartTime":46025.0,"Position":256.0,"HyperDash":false}]},{"StartTime":46208.0,"Objects":[{"StartTime":46208.0,"Position":160.0,"HyperDash":false},{"StartTime":46280.0,"Position":188.812149,"HyperDash":false},{"StartTime":46389.0,"Position":245.0,"HyperDash":false}]},{"StartTime":46571.0,"Objects":[{"StartTime":46571.0,"Position":68.0,"HyperDash":false},{"StartTime":46643.0,"Position":68.0,"HyperDash":false},{"StartTime":46752.0,"Position":68.0,"HyperDash":false}]},{"StartTime":46935.0,"Objects":[{"StartTime":46935.0,"Position":324.0,"HyperDash":false},{"StartTime":47025.0,"Position":381.148743,"HyperDash":false},{"StartTime":47116.0,"Position":409.0,"HyperDash":false},{"StartTime":47189.0,"Position":359.046844,"HyperDash":false},{"StartTime":47298.0,"Position":324.0,"HyperDash":false}]},{"StartTime":47480.0,"Objects":[{"StartTime":47480.0,"Position":154.0,"HyperDash":false},{"StartTime":47570.0,"Position":213.148758,"HyperDash":false},{"StartTime":47661.0,"Position":238.765839,"HyperDash":false},{"StartTime":47734.0,"Position":268.953156,"HyperDash":false},{"StartTime":47843.0,"Position":324.0,"HyperDash":false}]},{"StartTime":48026.0,"Objects":[{"StartTime":48026.0,"Position":420.0,"HyperDash":false},{"StartTime":48098.0,"Position":428.0,"HyperDash":false},{"StartTime":48207.0,"Position":420.0,"HyperDash":false}]},{"StartTime":48390.0,"Objects":[{"StartTime":48390.0,"Position":240.0,"HyperDash":false},{"StartTime":48462.0,"Position":205.187851,"HyperDash":false},{"StartTime":48571.0,"Position":155.0,"HyperDash":false}]},{"StartTime":48662.0,"Objects":[{"StartTime":48662.0,"Position":112.0,"HyperDash":false}]},{"StartTime":48753.0,"Objects":[{"StartTime":48753.0,"Position":68.0,"HyperDash":false}]},{"StartTime":48935.0,"Objects":[{"StartTime":48935.0,"Position":160.0,"HyperDash":false},{"StartTime":49025.0,"Position":132.851242,"HyperDash":false},{"StartTime":49116.0,"Position":75.0,"HyperDash":false},{"StartTime":49189.0,"Position":96.95316,"HyperDash":false},{"StartTime":49298.0,"Position":160.0,"HyperDash":false}]},{"StartTime":49480.0,"Objects":[{"StartTime":49480.0,"Position":336.0,"HyperDash":false},{"StartTime":49552.0,"Position":353.812164,"HyperDash":false},{"StartTime":49661.0,"Position":421.0,"HyperDash":false}]},{"StartTime":49844.0,"Objects":[{"StartTime":49844.0,"Position":164.0,"HyperDash":false},{"StartTime":49916.0,"Position":123.187851,"HyperDash":false},{"StartTime":50025.0,"Position":79.0,"HyperDash":false}]},{"StartTime":50117.0,"Objects":[{"StartTime":50117.0,"Position":79.0,"HyperDash":false}]},{"StartTime":50208.0,"Objects":[{"StartTime":50208.0,"Position":79.0,"HyperDash":false}]},{"StartTime":50390.0,"Objects":[{"StartTime":50390.0,"Position":172.0,"HyperDash":false},{"StartTime":50480.0,"Position":196.148758,"HyperDash":false},{"StartTime":50571.0,"Position":256.0,"HyperDash":false},{"StartTime":50644.0,"Position":261.0,"HyperDash":false},{"StartTime":50753.0,"Position":256.0,"HyperDash":false}]},{"StartTime":50935.0,"Objects":[{"StartTime":50935.0,"Position":80.0,"HyperDash":false},{"StartTime":51007.0,"Position":81.0,"HyperDash":false},{"StartTime":51116.0,"Position":80.0,"HyperDash":false}]},{"StartTime":51299.0,"Objects":[{"StartTime":51299.0,"Position":256.0,"HyperDash":false},{"StartTime":51389.0,"Position":296.148743,"HyperDash":false},{"StartTime":51480.0,"Position":340.765839,"HyperDash":false},{"StartTime":51553.0,"Position":371.953156,"HyperDash":false},{"StartTime":51662.0,"Position":426.0,"HyperDash":false}]},{"StartTime":51844.0,"Objects":[{"StartTime":51844.0,"Position":340.0,"HyperDash":false}]},{"StartTime":52026.0,"Objects":[{"StartTime":52026.0,"Position":426.0,"HyperDash":false},{"StartTime":52098.0,"Position":406.187836,"HyperDash":false},{"StartTime":52207.0,"Position":341.0,"HyperDash":false}]},{"StartTime":52390.0,"Objects":[{"StartTime":52390.0,"Position":164.0,"HyperDash":false},{"StartTime":52462.0,"Position":117.187851,"HyperDash":false},{"StartTime":52571.0,"Position":79.0,"HyperDash":true}]},{"StartTime":52753.0,"Objects":[{"StartTime":52753.0,"Position":336.0,"HyperDash":false},{"StartTime":52843.0,"Position":377.148743,"HyperDash":false},{"StartTime":52934.0,"Position":420.765839,"HyperDash":false},{"StartTime":53007.0,"Position":457.953156,"HyperDash":false},{"StartTime":53116.0,"Position":506.0,"HyperDash":false}]},{"StartTime":53299.0,"Objects":[{"StartTime":53299.0,"Position":328.0,"HyperDash":false},{"StartTime":53389.0,"Position":380.148743,"HyperDash":false},{"StartTime":53480.0,"Position":412.765839,"HyperDash":false},{"StartTime":53553.0,"Position":426.953156,"HyperDash":false},{"StartTime":53662.0,"Position":498.0,"HyperDash":false}]},{"StartTime":53844.0,"Objects":[{"StartTime":53844.0,"Position":412.0,"HyperDash":false},{"StartTime":53916.0,"Position":416.0,"HyperDash":false},{"StartTime":54025.0,"Position":412.0,"HyperDash":false}]},{"StartTime":54208.0,"Objects":[{"StartTime":54208.0,"Position":236.0,"HyperDash":false},{"StartTime":54280.0,"Position":207.187851,"HyperDash":false},{"StartTime":54389.0,"Position":151.0,"HyperDash":false}]},{"StartTime":54480.0,"Objects":[{"StartTime":54480.0,"Position":192.0,"HyperDash":false}]},{"StartTime":54571.0,"Objects":[{"StartTime":54571.0,"Position":236.0,"HyperDash":false}]},{"StartTime":54753.0,"Objects":[{"StartTime":54753.0,"Position":320.0,"HyperDash":false}]},{"StartTime":54935.0,"Objects":[{"StartTime":54935.0,"Position":236.0,"HyperDash":false}]},{"StartTime":55117.0,"Objects":[{"StartTime":55117.0,"Position":152.0,"HyperDash":false}]},{"StartTime":55299.0,"Objects":[{"StartTime":55299.0,"Position":328.0,"HyperDash":false},{"StartTime":55371.0,"Position":328.0,"HyperDash":false},{"StartTime":55480.0,"Position":328.0,"HyperDash":false}]},{"StartTime":55662.0,"Objects":[{"StartTime":55662.0,"Position":72.0,"HyperDash":false},{"StartTime":55734.0,"Position":54.0,"HyperDash":false},{"StartTime":55843.0,"Position":72.0,"HyperDash":false}]},{"StartTime":55935.0,"Objects":[{"StartTime":55935.0,"Position":116.0,"HyperDash":false}]},{"StartTime":56026.0,"Objects":[{"StartTime":56026.0,"Position":160.0,"HyperDash":false}]},{"StartTime":56208.0,"Objects":[{"StartTime":56208.0,"Position":244.0,"HyperDash":false},{"StartTime":56298.0,"Position":182.851242,"HyperDash":false},{"StartTime":56389.0,"Position":159.0,"HyperDash":false},{"StartTime":56462.0,"Position":181.953156,"HyperDash":false},{"StartTime":56571.0,"Position":244.0,"HyperDash":false}]},{"StartTime":56753.0,"Objects":[{"StartTime":56753.0,"Position":72.0,"HyperDash":false},{"StartTime":56825.0,"Position":81.0,"HyperDash":false},{"StartTime":56934.0,"Position":72.0,"HyperDash":false}]},{"StartTime":57117.0,"Objects":[{"StartTime":57117.0,"Position":248.0,"HyperDash":false},{"StartTime":57207.0,"Position":290.5,"HyperDash":false},{"StartTime":57298.0,"Position":248.0,"HyperDash":false}]},{"StartTime":57481.0,"Objects":[{"StartTime":57481.0,"Position":78.0,"HyperDash":false},{"StartTime":57553.0,"Position":71.67611,"HyperDash":false},{"StartTime":57662.0,"Position":79.69966,"HyperDash":false}]},{"StartTime":57844.0,"Objects":[{"StartTime":57844.0,"Position":164.0,"HyperDash":false},{"StartTime":57916.0,"Position":146.187851,"HyperDash":false},{"StartTime":58025.0,"Position":79.0,"HyperDash":false}]},{"StartTime":58208.0,"Objects":[{"StartTime":58208.0,"Position":248.0,"HyperDash":false},{"StartTime":58280.0,"Position":228.187851,"HyperDash":false},{"StartTime":58389.0,"Position":163.0,"HyperDash":false}]},{"StartTime":58571.0,"Objects":[{"StartTime":58571.0,"Position":416.0,"HyperDash":false},{"StartTime":58661.0,"Position":451.148743,"HyperDash":false},{"StartTime":58752.0,"Position":499.234161,"HyperDash":false},{"StartTime":58825.0,"Position":447.046844,"HyperDash":false},{"StartTime":58934.0,"Position":414.0,"HyperDash":false}]},{"StartTime":59117.0,"Objects":[{"StartTime":59117.0,"Position":320.0,"HyperDash":false}]},{"StartTime":59299.0,"Objects":[{"StartTime":59299.0,"Position":140.0,"HyperDash":false},{"StartTime":59389.0,"Position":111.851242,"HyperDash":false},{"StartTime":59480.0,"Position":55.0,"HyperDash":false},{"StartTime":59553.0,"Position":89.95316,"HyperDash":false},{"StartTime":59662.0,"Position":140.0,"HyperDash":false}]},{"StartTime":60026.0,"Objects":[{"StartTime":60026.0,"Position":428.0,"HyperDash":false},{"StartTime":60098.0,"Position":432.0,"HyperDash":false},{"StartTime":60207.0,"Position":428.0,"HyperDash":false}]},{"StartTime":60390.0,"Objects":[{"StartTime":60390.0,"Position":332.0,"HyperDash":false},{"StartTime":60462.0,"Position":362.812164,"HyperDash":false},{"StartTime":60571.0,"Position":417.0,"HyperDash":false}]},{"StartTime":60753.0,"Objects":[{"StartTime":60753.0,"Position":324.0,"HyperDash":false}]},{"StartTime":60843.0,"Objects":[{"StartTime":60843.0,"Position":366.0,"HyperDash":false}]},{"StartTime":60934.0,"Objects":[{"StartTime":60934.0,"Position":409.0,"HyperDash":false}]},{"StartTime":61117.0,"Objects":[{"StartTime":61117.0,"Position":228.0,"HyperDash":false},{"StartTime":61189.0,"Position":181.187851,"HyperDash":false},{"StartTime":61298.0,"Position":143.0,"HyperDash":false}]},{"StartTime":61480.0,"Objects":[{"StartTime":61480.0,"Position":324.0,"HyperDash":false},{"StartTime":61570.0,"Position":323.0,"HyperDash":false},{"StartTime":61661.0,"Position":324.0,"HyperDash":false},{"StartTime":61734.0,"Position":306.0,"HyperDash":false},{"StartTime":61843.0,"Position":324.0,"HyperDash":false}]},{"StartTime":62026.0,"Objects":[{"StartTime":62026.0,"Position":228.0,"HyperDash":false}]},{"StartTime":62208.0,"Objects":[{"StartTime":62208.0,"Position":408.0,"HyperDash":false},{"StartTime":62298.0,"Position":361.851257,"HyperDash":false},{"StartTime":62389.0,"Position":323.0,"HyperDash":false},{"StartTime":62462.0,"Position":339.953156,"HyperDash":false},{"StartTime":62571.0,"Position":408.0,"HyperDash":false}]},{"StartTime":62935.0,"Objects":[{"StartTime":62935.0,"Position":120.0,"HyperDash":false},{"StartTime":63025.0,"Position":77.5,"HyperDash":false},{"StartTime":63116.0,"Position":120.0,"HyperDash":false}]},{"StartTime":63299.0,"Objects":[{"StartTime":63299.0,"Position":216.0,"HyperDash":false},{"StartTime":63371.0,"Position":227.0,"HyperDash":false},{"StartTime":63480.0,"Position":216.0,"HyperDash":false}]},{"StartTime":63662.0,"Objects":[{"StartTime":63662.0,"Position":396.0,"HyperDash":false},{"StartTime":63734.0,"Position":343.187836,"HyperDash":false},{"StartTime":63843.0,"Position":311.0,"HyperDash":false}]},{"StartTime":64026.0,"Objects":[{"StartTime":64026.0,"Position":148.0,"HyperDash":false}]},{"StartTime":64208.0,"Objects":[{"StartTime":64208.0,"Position":320.0,"HyperDash":false}]},{"StartTime":64390.0,"Objects":[{"StartTime":64390.0,"Position":140.0,"HyperDash":false},{"StartTime":64480.0,"Position":114.851242,"HyperDash":false},{"StartTime":64571.0,"Position":56.0,"HyperDash":false},{"StartTime":64644.0,"Position":56.0,"HyperDash":false},{"StartTime":64753.0,"Position":56.0,"HyperDash":false}]},{"StartTime":64935.0,"Objects":[{"StartTime":64935.0,"Position":140.0,"HyperDash":false}]},{"StartTime":65117.0,"Objects":[{"StartTime":65117.0,"Position":396.0,"HyperDash":false},{"StartTime":65189.0,"Position":395.0,"HyperDash":false},{"StartTime":65298.0,"Position":396.0,"HyperDash":false}]},{"StartTime":65480.0,"Objects":[{"StartTime":65480.0,"Position":312.0,"HyperDash":false}]},{"StartTime":65662.0,"Objects":[{"StartTime":65662.0,"Position":404.0,"HyperDash":false}]},{"StartTime":65844.0,"Objects":[{"StartTime":65844.0,"Position":300.0,"HyperDash":false},{"StartTime":65916.0,"Position":278.187836,"HyperDash":false},{"StartTime":66025.0,"Position":215.0,"HyperDash":false}]},{"StartTime":66208.0,"Objects":[{"StartTime":66208.0,"Position":392.0,"HyperDash":false},{"StartTime":66280.0,"Position":394.0,"HyperDash":false},{"StartTime":66389.0,"Position":392.0,"HyperDash":false}]},{"StartTime":66571.0,"Objects":[{"StartTime":66571.0,"Position":136.0,"HyperDash":false},{"StartTime":66643.0,"Position":137.0,"HyperDash":false},{"StartTime":66752.0,"Position":136.0,"HyperDash":false}]},{"StartTime":66935.0,"Objects":[{"StartTime":66935.0,"Position":307.0,"HyperDash":false},{"StartTime":67007.0,"Position":327.812164,"HyperDash":false},{"StartTime":67116.0,"Position":392.0,"HyperDash":false}]},{"StartTime":67299.0,"Objects":[{"StartTime":67299.0,"Position":476.0,"HyperDash":false},{"StartTime":67371.0,"Position":479.0,"HyperDash":false},{"StartTime":67480.0,"Position":476.0,"HyperDash":false}]},{"StartTime":67662.0,"Objects":[{"StartTime":67662.0,"Position":307.0,"HyperDash":false},{"StartTime":67734.0,"Position":295.0,"HyperDash":false},{"StartTime":67843.0,"Position":307.0,"HyperDash":true}]},{"StartTime":68026.0,"Objects":[{"StartTime":68026.0,"Position":48.0,"HyperDash":false},{"StartTime":68098.0,"Position":74.81215,"HyperDash":false},{"StartTime":68207.0,"Position":133.0,"HyperDash":false}]},{"StartTime":68390.0,"Objects":[{"StartTime":68390.0,"Position":307.0,"HyperDash":false},{"StartTime":68462.0,"Position":288.0,"HyperDash":false},{"StartTime":68571.0,"Position":307.0,"HyperDash":false}]},{"StartTime":68753.0,"Objects":[{"StartTime":68753.0,"Position":222.0,"HyperDash":false},{"StartTime":68825.0,"Position":257.812134,"HyperDash":false},{"StartTime":68934.0,"Position":307.0,"HyperDash":false}]},{"StartTime":69117.0,"Objects":[{"StartTime":69117.0,"Position":136.0,"HyperDash":false},{"StartTime":69189.0,"Position":131.0,"HyperDash":false},{"StartTime":69298.0,"Position":136.0,"HyperDash":false}]},{"StartTime":69480.0,"Objects":[{"StartTime":69480.0,"Position":228.0,"HyperDash":false},{"StartTime":69552.0,"Position":175.187851,"HyperDash":false},{"StartTime":69661.0,"Position":143.0,"HyperDash":false}]},{"StartTime":69844.0,"Objects":[{"StartTime":69844.0,"Position":236.0,"HyperDash":false},{"StartTime":69916.0,"Position":254.812164,"HyperDash":false},{"StartTime":70025.0,"Position":321.0,"HyperDash":true}]},{"StartTime":70208.0,"Objects":[{"StartTime":70208.0,"Position":60.0,"HyperDash":false},{"StartTime":70298.0,"Position":66.0,"HyperDash":false},{"StartTime":70389.0,"Position":60.76584,"HyperDash":false},{"StartTime":70462.0,"Position":88.95316,"HyperDash":false},{"StartTime":70571.0,"Position":146.0,"HyperDash":false}]},{"StartTime":70753.0,"Objects":[{"StartTime":70753.0,"Position":232.0,"HyperDash":false}]},{"StartTime":70935.0,"Objects":[{"StartTime":70935.0,"Position":412.0,"HyperDash":false},{"StartTime":71025.0,"Position":356.851257,"HyperDash":false},{"StartTime":71116.0,"Position":327.0,"HyperDash":false},{"StartTime":71189.0,"Position":351.953156,"HyperDash":false},{"StartTime":71298.0,"Position":412.0,"HyperDash":false}]},{"StartTime":71662.0,"Objects":[{"StartTime":71662.0,"Position":124.0,"HyperDash":false},{"StartTime":71734.0,"Position":118.0,"HyperDash":false},{"StartTime":71843.0,"Position":124.0,"HyperDash":false}]},{"StartTime":72026.0,"Objects":[{"StartTime":72026.0,"Position":220.0,"HyperDash":false},{"StartTime":72098.0,"Position":242.812149,"HyperDash":false},{"StartTime":72207.0,"Position":305.0,"HyperDash":false}]},{"StartTime":72389.0,"Objects":[{"StartTime":72389.0,"Position":212.0,"HyperDash":false}]},{"StartTime":72571.0,"Objects":[{"StartTime":72571.0,"Position":316.0,"HyperDash":false}]},{"StartTime":72753.0,"Objects":[{"StartTime":72753.0,"Position":136.0,"HyperDash":false},{"StartTime":72825.0,"Position":102.187851,"HyperDash":false},{"StartTime":72934.0,"Position":51.0,"HyperDash":true}]},{"StartTime":73116.0,"Objects":[{"StartTime":73116.0,"Position":316.0,"HyperDash":false},{"StartTime":73206.0,"Position":344.148743,"HyperDash":false},{"StartTime":73297.0,"Position":400.0,"HyperDash":false},{"StartTime":73370.0,"Position":415.0,"HyperDash":false},{"StartTime":73479.0,"Position":400.0,"HyperDash":false}]},{"StartTime":73662.0,"Objects":[{"StartTime":73662.0,"Position":316.0,"HyperDash":false}]},{"StartTime":73844.0,"Objects":[{"StartTime":73844.0,"Position":144.0,"HyperDash":false}]},{"StartTime":74026.0,"Objects":[{"StartTime":74026.0,"Position":236.0,"HyperDash":false}]},{"StartTime":74208.0,"Objects":[{"StartTime":74208.0,"Position":328.0,"HyperDash":false}]},{"StartTime":74571.0,"Objects":[{"StartTime":74571.0,"Position":56.0,"HyperDash":false}]},{"StartTime":74753.0,"Objects":[{"StartTime":74753.0,"Position":228.0,"HyperDash":false}]},{"StartTime":74935.0,"Objects":[{"StartTime":74935.0,"Position":400.0,"HyperDash":false},{"StartTime":75007.0,"Position":389.0,"HyperDash":false},{"StartTime":75116.0,"Position":400.0,"HyperDash":false}]},{"StartTime":75298.0,"Objects":[{"StartTime":75298.0,"Position":308.0,"HyperDash":false},{"StartTime":75370.0,"Position":335.812164,"HyperDash":false},{"StartTime":75479.0,"Position":393.0,"HyperDash":false}]},{"StartTime":75662.0,"Objects":[{"StartTime":75662.0,"Position":232.0,"HyperDash":false}]},{"StartTime":75844.0,"Objects":[{"StartTime":75844.0,"Position":401.0,"HyperDash":false}]},{"StartTime":76026.0,"Objects":[{"StartTime":76026.0,"Position":224.0,"HyperDash":false},{"StartTime":76116.0,"Position":198.851242,"HyperDash":false},{"StartTime":76207.0,"Position":140.765839,"HyperDash":false},{"StartTime":76280.0,"Position":189.953156,"HyperDash":false},{"StartTime":76389.0,"Position":226.0,"HyperDash":false}]},{"StartTime":76571.0,"Objects":[{"StartTime":76571.0,"Position":312.0,"HyperDash":false}]},{"StartTime":76753.0,"Objects":[{"StartTime":76753.0,"Position":56.0,"HyperDash":false},{"StartTime":76825.0,"Position":74.0,"HyperDash":false},{"StartTime":76934.0,"Position":56.0,"HyperDash":false}]},{"StartTime":77116.0,"Objects":[{"StartTime":77116.0,"Position":140.0,"HyperDash":false}]},{"StartTime":77298.0,"Objects":[{"StartTime":77298.0,"Position":48.0,"HyperDash":false}]},{"StartTime":77480.0,"Objects":[{"StartTime":77480.0,"Position":148.0,"HyperDash":false},{"StartTime":77552.0,"Position":164.812149,"HyperDash":false},{"StartTime":77661.0,"Position":233.0,"HyperDash":false}]},{"StartTime":77844.0,"Objects":[{"StartTime":77844.0,"Position":408.0,"HyperDash":false},{"StartTime":77916.0,"Position":392.0,"HyperDash":false},{"StartTime":78025.0,"Position":408.0,"HyperDash":false}]},{"StartTime":78207.0,"Objects":[{"StartTime":78207.0,"Position":236.0,"HyperDash":false},{"StartTime":78279.0,"Position":281.812164,"HyperDash":false},{"StartTime":78388.0,"Position":321.0,"HyperDash":false}]},{"StartTime":78571.0,"Objects":[{"StartTime":78571.0,"Position":493.0,"HyperDash":false},{"StartTime":78643.0,"Position":471.187836,"HyperDash":false},{"StartTime":78752.0,"Position":408.0,"HyperDash":false}]},{"StartTime":78935.0,"Objects":[{"StartTime":78935.0,"Position":504.0,"HyperDash":false}]},{"StartTime":79117.0,"Objects":[{"StartTime":79117.0,"Position":332.0,"HyperDash":false}]},{"StartTime":79208.0,"Objects":[{"StartTime":79208.0,"Position":284.0,"HyperDash":false}]},{"StartTime":79298.0,"Objects":[{"StartTime":79298.0,"Position":236.0,"HyperDash":false},{"StartTime":79370.0,"Position":251.0,"HyperDash":false},{"StartTime":79479.0,"Position":236.0,"HyperDash":false}]},{"StartTime":79662.0,"Objects":[{"StartTime":79662.0,"Position":60.0,"HyperDash":false},{"StartTime":79734.0,"Position":52.0,"HyperDash":false},{"StartTime":79843.0,"Position":60.0,"HyperDash":false}]},{"StartTime":80026.0,"Objects":[{"StartTime":80026.0,"Position":236.0,"HyperDash":false},{"StartTime":80098.0,"Position":255.812164,"HyperDash":false},{"StartTime":80207.0,"Position":321.0,"HyperDash":false}]},{"StartTime":80389.0,"Objects":[{"StartTime":80389.0,"Position":228.0,"HyperDash":false}]},{"StartTime":80479.0,"Objects":[{"StartTime":80479.0,"Position":228.0,"HyperDash":false}]},{"StartTime":80570.0,"Objects":[{"StartTime":80570.0,"Position":228.0,"HyperDash":false}]},{"StartTime":80753.0,"Objects":[{"StartTime":80753.0,"Position":404.0,"HyperDash":false},{"StartTime":80825.0,"Position":400.0,"HyperDash":false},{"StartTime":80934.0,"Position":404.0,"HyperDash":false}]},{"StartTime":81116.0,"Objects":[{"StartTime":81116.0,"Position":227.0,"HyperDash":false},{"StartTime":81188.0,"Position":273.812164,"HyperDash":false},{"StartTime":81297.0,"Position":312.0,"HyperDash":false}]},{"StartTime":81480.0,"Objects":[{"StartTime":81480.0,"Position":404.0,"HyperDash":false},{"StartTime":81552.0,"Position":369.187836,"HyperDash":false},{"StartTime":81661.0,"Position":319.0,"HyperDash":false}]},{"StartTime":81844.0,"Objects":[{"StartTime":81844.0,"Position":133.0,"HyperDash":false},{"StartTime":81934.0,"Position":90.5,"HyperDash":false},{"StartTime":82025.0,"Position":133.0,"HyperDash":false}]},{"StartTime":82208.0,"Objects":[{"StartTime":82208.0,"Position":303.0,"HyperDash":false},{"StartTime":82280.0,"Position":269.187836,"HyperDash":false},{"StartTime":82389.0,"Position":218.0,"HyperDash":false}]},{"StartTime":82480.0,"Objects":[{"StartTime":82480.0,"Position":264.0,"HyperDash":false}]},{"StartTime":82572.0,"Objects":[{"StartTime":82572.0,"Position":313.0,"HyperDash":false},{"StartTime":82644.0,"Position":272.187836,"HyperDash":false},{"StartTime":82753.0,"Position":228.0,"HyperDash":false}]},{"StartTime":82935.0,"Objects":[{"StartTime":82935.0,"Position":48.0,"HyperDash":false},{"StartTime":83007.0,"Position":97.81215,"HyperDash":false},{"StartTime":83116.0,"Position":133.0,"HyperDash":true}]},{"StartTime":83299.0,"Objects":[{"StartTime":83299.0,"Position":392.0,"HyperDash":false},{"StartTime":83389.0,"Position":451.578522,"HyperDash":false},{"StartTime":83480.0,"Position":493.719,"HyperDash":false},{"StartTime":83553.0,"Position":512.0,"HyperDash":false},{"StartTime":83662.0,"Position":496.0,"HyperDash":false}]},{"StartTime":83753.0,"Objects":[{"StartTime":83753.0,"Position":452.0,"HyperDash":false}]},{"StartTime":83844.0,"Objects":[{"StartTime":83844.0,"Position":408.0,"HyperDash":false}]},{"StartTime":84026.0,"Objects":[{"StartTime":84026.0,"Position":324.0,"HyperDash":false},{"StartTime":84098.0,"Position":308.0,"HyperDash":false},{"StartTime":84207.0,"Position":324.0,"HyperDash":false}]},{"StartTime":84390.0,"Objects":[{"StartTime":84390.0,"Position":152.0,"HyperDash":false},{"StartTime":84480.0,"Position":152.0,"HyperDash":false}]},{"StartTime":84662.0,"Objects":[{"StartTime":84662.0,"Position":248.0,"HyperDash":false}]},{"StartTime":84753.0,"Objects":[{"StartTime":84753.0,"Position":248.0,"HyperDash":false},{"StartTime":84825.0,"Position":213.187851,"HyperDash":false},{"StartTime":84934.0,"Position":163.0,"HyperDash":false}]},{"StartTime":85117.0,"Objects":[{"StartTime":85117.0,"Position":332.0,"HyperDash":false},{"StartTime":85207.0,"Position":332.0,"HyperDash":false},{"StartTime":85298.0,"Position":332.0,"HyperDash":false}]},{"StartTime":85480.0,"Objects":[{"StartTime":85480.0,"Position":244.0,"HyperDash":false}]},{"StartTime":85662.0,"Objects":[{"StartTime":85662.0,"Position":332.0,"HyperDash":false}]},{"StartTime":85844.0,"Objects":[{"StartTime":85844.0,"Position":156.0,"HyperDash":false},{"StartTime":85916.0,"Position":105.187851,"HyperDash":false},{"StartTime":86025.0,"Position":71.0,"HyperDash":false}]},{"StartTime":86208.0,"Objects":[{"StartTime":86208.0,"Position":164.0,"HyperDash":false},{"StartTime":86280.0,"Position":185.812149,"HyperDash":false},{"StartTime":86389.0,"Position":249.0,"HyperDash":false}]},{"StartTime":86571.0,"Objects":[{"StartTime":86571.0,"Position":80.0,"HyperDash":false}]},{"StartTime":86661.0,"Objects":[{"StartTime":86661.0,"Position":122.0,"HyperDash":false}]},{"StartTime":86752.0,"Objects":[{"StartTime":86752.0,"Position":165.0,"HyperDash":false}]},{"StartTime":86935.0,"Objects":[{"StartTime":86935.0,"Position":252.0,"HyperDash":false}]},{"StartTime":87117.0,"Objects":[{"StartTime":87117.0,"Position":156.0,"HyperDash":false}]},{"StartTime":87299.0,"Objects":[{"StartTime":87299.0,"Position":328.0,"HyperDash":false},{"StartTime":87389.0,"Position":328.0,"HyperDash":false}]},{"StartTime":87662.0,"Objects":[{"StartTime":87662.0,"Position":152.0,"HyperDash":false},{"StartTime":87752.0,"Position":109.5,"HyperDash":false},{"StartTime":87843.0,"Position":152.0,"HyperDash":false}]},{"StartTime":88026.0,"Objects":[{"StartTime":88026.0,"Position":236.0,"HyperDash":false},{"StartTime":88098.0,"Position":190.187851,"HyperDash":false},{"StartTime":88207.0,"Position":151.0,"HyperDash":false}]},{"StartTime":88390.0,"Objects":[{"StartTime":88390.0,"Position":328.0,"HyperDash":false},{"StartTime":88462.0,"Position":320.0,"HyperDash":false},{"StartTime":88571.0,"Position":328.0,"HyperDash":false}]},{"StartTime":88753.0,"Objects":[{"StartTime":88753.0,"Position":152.0,"HyperDash":false},{"StartTime":88825.0,"Position":120.187851,"HyperDash":false},{"StartTime":88934.0,"Position":67.0,"HyperDash":false}]},{"StartTime":89117.0,"Objects":[{"StartTime":89117.0,"Position":324.0,"HyperDash":false},{"StartTime":89207.0,"Position":355.148743,"HyperDash":false},{"StartTime":89298.0,"Position":408.765839,"HyperDash":false},{"StartTime":89371.0,"Position":451.953156,"HyperDash":false},{"StartTime":89480.0,"Position":494.0,"HyperDash":false}]},{"StartTime":89571.0,"Objects":[{"StartTime":89571.0,"Position":452.0,"HyperDash":false}]},{"StartTime":89662.0,"Objects":[{"StartTime":89662.0,"Position":408.0,"HyperDash":false}]},{"StartTime":89844.0,"Objects":[{"StartTime":89844.0,"Position":324.0,"HyperDash":false},{"StartTime":89916.0,"Position":314.0,"HyperDash":false},{"StartTime":90025.0,"Position":324.0,"HyperDash":false}]},{"StartTime":90208.0,"Objects":[{"StartTime":90208.0,"Position":148.0,"HyperDash":false},{"StartTime":90298.0,"Position":148.0,"HyperDash":false}]},{"StartTime":90480.0,"Objects":[{"StartTime":90480.0,"Position":232.0,"HyperDash":false}]},{"StartTime":90571.0,"Objects":[{"StartTime":90571.0,"Position":284.0,"HyperDash":false},{"StartTime":90643.0,"Position":299.0,"HyperDash":false},{"StartTime":90752.0,"Position":284.0,"HyperDash":false}]},{"StartTime":90844.0,"Objects":[{"StartTime":90844.0,"Position":236.0,"HyperDash":false},{"StartTime":90916.0,"Position":193.187851,"HyperDash":false},{"StartTime":91025.0,"Position":151.0,"HyperDash":false}]},{"StartTime":91117.0,"Objects":[{"StartTime":91117.0,"Position":152.0,"HyperDash":false}]},{"StartTime":91299.0,"Objects":[{"StartTime":91299.0,"Position":236.0,"HyperDash":false}]},{"StartTime":91480.0,"Objects":[{"StartTime":91480.0,"Position":144.0,"HyperDash":false}]},{"StartTime":91662.0,"Objects":[{"StartTime":91662.0,"Position":320.0,"HyperDash":false},{"StartTime":91734.0,"Position":309.0,"HyperDash":false},{"StartTime":91843.0,"Position":320.0,"HyperDash":false}]},{"StartTime":92026.0,"Objects":[{"StartTime":92026.0,"Position":224.0,"HyperDash":false},{"StartTime":92098.0,"Position":177.187851,"HyperDash":false},{"StartTime":92207.0,"Position":139.0,"HyperDash":false}]},{"StartTime":92299.0,"Objects":[{"StartTime":92299.0,"Position":92.0,"HyperDash":false},{"StartTime":92371.0,"Position":115.812149,"HyperDash":false},{"StartTime":92480.0,"Position":177.0,"HyperDash":false}]},{"StartTime":92571.0,"Objects":[{"StartTime":92571.0,"Position":224.0,"HyperDash":false}]},{"StartTime":92753.0,"Objects":[{"StartTime":92753.0,"Position":132.0,"HyperDash":false},{"StartTime":92825.0,"Position":167.812149,"HyperDash":false},{"StartTime":92934.0,"Position":217.0,"HyperDash":false}]},{"StartTime":93117.0,"Objects":[{"StartTime":93117.0,"Position":392.0,"HyperDash":false},{"StartTime":93189.0,"Position":384.0,"HyperDash":false},{"StartTime":93298.0,"Position":392.0,"HyperDash":false}]},{"StartTime":93480.0,"Objects":[{"StartTime":93480.0,"Position":216.0,"HyperDash":false}]},{"StartTime":93570.0,"Objects":[{"StartTime":93570.0,"Position":173.0,"HyperDash":false}]},{"StartTime":93661.0,"Objects":[{"StartTime":93661.0,"Position":131.0,"HyperDash":false}]},{"StartTime":93844.0,"Objects":[{"StartTime":93844.0,"Position":224.0,"HyperDash":false}]},{"StartTime":93934.0,"Objects":[{"StartTime":93934.0,"Position":181.0,"HyperDash":false}]},{"StartTime":94025.0,"Objects":[{"StartTime":94025.0,"Position":139.0,"HyperDash":false}]},{"StartTime":94208.0,"Objects":[{"StartTime":94208.0,"Position":312.0,"HyperDash":false},{"StartTime":94280.0,"Position":363.812164,"HyperDash":false},{"StartTime":94389.0,"Position":397.0,"HyperDash":false}]},{"StartTime":94571.0,"Objects":[{"StartTime":94571.0,"Position":220.0,"HyperDash":false},{"StartTime":94643.0,"Position":192.187851,"HyperDash":false},{"StartTime":94752.0,"Position":135.0,"HyperDash":false}]},{"StartTime":94935.0,"Objects":[{"StartTime":94935.0,"Position":392.0,"HyperDash":false},{"StartTime":95007.0,"Position":440.812164,"HyperDash":false},{"StartTime":95116.0,"Position":477.0,"HyperDash":false}]},{"StartTime":95299.0,"Objects":[{"StartTime":95299.0,"Position":384.0,"HyperDash":false},{"StartTime":95371.0,"Position":389.0,"HyperDash":false},{"StartTime":95480.0,"Position":384.0,"HyperDash":false}]},{"StartTime":95662.0,"Objects":[{"StartTime":95662.0,"Position":212.0,"HyperDash":false}]},{"StartTime":95844.0,"Objects":[{"StartTime":95844.0,"Position":306.0,"HyperDash":false}]},{"StartTime":96026.0,"Objects":[{"StartTime":96026.0,"Position":477.0,"HyperDash":false},{"StartTime":96098.0,"Position":461.0,"HyperDash":false},{"StartTime":96207.0,"Position":477.0,"HyperDash":false}]},{"StartTime":96390.0,"Objects":[{"StartTime":96390.0,"Position":300.0,"HyperDash":false},{"StartTime":96462.0,"Position":249.187836,"HyperDash":false},{"StartTime":96571.0,"Position":215.0,"HyperDash":false}]},{"StartTime":96753.0,"Objects":[{"StartTime":96753.0,"Position":308.0,"HyperDash":false},{"StartTime":96825.0,"Position":320.0,"HyperDash":false},{"StartTime":96934.0,"Position":308.0,"HyperDash":false}]},{"StartTime":97117.0,"Objects":[{"StartTime":97117.0,"Position":136.0,"HyperDash":false}]},{"StartTime":97299.0,"Objects":[{"StartTime":97299.0,"Position":300.0,"HyperDash":false}]},{"StartTime":97480.0,"Objects":[{"StartTime":97480.0,"Position":128.0,"HyperDash":false},{"StartTime":97552.0,"Position":135.0,"HyperDash":false},{"StartTime":97661.0,"Position":128.0,"HyperDash":false}]},{"StartTime":97844.0,"Objects":[{"StartTime":97844.0,"Position":300.0,"HyperDash":false},{"StartTime":97916.0,"Position":248.187836,"HyperDash":false},{"StartTime":98025.0,"Position":215.0,"HyperDash":false}]},{"StartTime":98208.0,"Objects":[{"StartTime":98208.0,"Position":308.0,"HyperDash":false}]},{"StartTime":98298.0,"Objects":[{"StartTime":98298.0,"Position":308.0,"HyperDash":false}]},{"StartTime":98389.0,"Objects":[{"StartTime":98389.0,"Position":308.0,"HyperDash":false}]},{"StartTime":98571.0,"Objects":[{"StartTime":98571.0,"Position":136.0,"HyperDash":false},{"StartTime":98643.0,"Position":173.812149,"HyperDash":false},{"StartTime":98752.0,"Position":221.0,"HyperDash":false}]},{"StartTime":98935.0,"Objects":[{"StartTime":98935.0,"Position":404.0,"HyperDash":false},{"StartTime":99007.0,"Position":405.0,"HyperDash":false},{"StartTime":99116.0,"Position":404.0,"HyperDash":false}]},{"StartTime":99299.0,"Objects":[{"StartTime":99299.0,"Position":224.0,"HyperDash":false},{"StartTime":99371.0,"Position":198.187851,"HyperDash":false},{"StartTime":99480.0,"Position":139.0,"HyperDash":false}]},{"StartTime":99662.0,"Objects":[{"StartTime":99662.0,"Position":312.0,"HyperDash":false},{"StartTime":99734.0,"Position":297.0,"HyperDash":false},{"StartTime":99843.0,"Position":312.0,"HyperDash":false}]},{"StartTime":100026.0,"Objects":[{"StartTime":100026.0,"Position":220.0,"HyperDash":false}]},{"StartTime":100208.0,"Objects":[{"StartTime":100208.0,"Position":312.0,"HyperDash":false}]},{"StartTime":100390.0,"Objects":[{"StartTime":100390.0,"Position":136.0,"HyperDash":false},{"StartTime":100462.0,"Position":98.18785,"HyperDash":false},{"StartTime":100571.0,"Position":51.0,"HyperDash":true}]},{"StartTime":100753.0,"Objects":[{"StartTime":100753.0,"Position":308.0,"HyperDash":false},{"StartTime":100825.0,"Position":340.812164,"HyperDash":false},{"StartTime":100934.0,"Position":393.0,"HyperDash":false}]},{"StartTime":101117.0,"Objects":[{"StartTime":101117.0,"Position":216.0,"HyperDash":false},{"StartTime":101189.0,"Position":223.0,"HyperDash":false},{"StartTime":101298.0,"Position":216.0,"HyperDash":false}]},{"StartTime":101480.0,"Objects":[{"StartTime":101480.0,"Position":300.0,"HyperDash":false}]},{"StartTime":101662.0,"Objects":[{"StartTime":101662.0,"Position":208.0,"HyperDash":false}]},{"StartTime":101844.0,"Objects":[{"StartTime":101844.0,"Position":384.0,"HyperDash":false},{"StartTime":101916.0,"Position":372.0,"HyperDash":false},{"StartTime":102025.0,"Position":384.0,"HyperDash":false}]},{"StartTime":102208.0,"Objects":[{"StartTime":102208.0,"Position":208.0,"HyperDash":false},{"StartTime":102280.0,"Position":181.187851,"HyperDash":false},{"StartTime":102389.0,"Position":123.0,"HyperDash":false}]},{"StartTime":102571.0,"Objects":[{"StartTime":102571.0,"Position":216.0,"HyperDash":false},{"StartTime":102643.0,"Position":214.0,"HyperDash":false},{"StartTime":102752.0,"Position":216.0,"HyperDash":false}]},{"StartTime":102935.0,"Objects":[{"StartTime":102935.0,"Position":52.0,"HyperDash":false}]},{"StartTime":103117.0,"Objects":[{"StartTime":103117.0,"Position":224.0,"HyperDash":false}]},{"StartTime":103299.0,"Objects":[{"StartTime":103299.0,"Position":44.0,"HyperDash":false},{"StartTime":103371.0,"Position":43.0,"HyperDash":false},{"StartTime":103480.0,"Position":44.0,"HyperDash":false}]},{"StartTime":103662.0,"Objects":[{"StartTime":103662.0,"Position":136.0,"HyperDash":false},{"StartTime":103734.0,"Position":162.812149,"HyperDash":false},{"StartTime":103843.0,"Position":221.0,"HyperDash":false}]},{"StartTime":103935.0,"Objects":[{"StartTime":103935.0,"Position":268.0,"HyperDash":false}]},{"StartTime":104026.0,"Objects":[{"StartTime":104026.0,"Position":316.0,"HyperDash":false},{"StartTime":104098.0,"Position":314.0,"HyperDash":false},{"StartTime":104207.0,"Position":316.0,"HyperDash":false}]},{"StartTime":104390.0,"Objects":[{"StartTime":104390.0,"Position":140.0,"HyperDash":false},{"StartTime":104462.0,"Position":188.812149,"HyperDash":false},{"StartTime":104571.0,"Position":225.0,"HyperDash":false}]},{"StartTime":104753.0,"Objects":[{"StartTime":104753.0,"Position":400.0,"HyperDash":false},{"StartTime":104825.0,"Position":417.0,"HyperDash":false},{"StartTime":104934.0,"Position":400.0,"HyperDash":false}]},{"StartTime":105117.0,"Objects":[{"StartTime":105117.0,"Position":224.0,"HyperDash":false}]},{"StartTime":105207.0,"Objects":[{"StartTime":105207.0,"Position":181.0,"HyperDash":false}]},{"StartTime":105298.0,"Objects":[{"StartTime":105298.0,"Position":139.0,"HyperDash":false}]},{"StartTime":105480.0,"Objects":[{"StartTime":105480.0,"Position":309.0,"HyperDash":false},{"StartTime":105552.0,"Position":259.187836,"HyperDash":false},{"StartTime":105661.0,"Position":224.0,"HyperDash":false}]},{"StartTime":105844.0,"Objects":[{"StartTime":105844.0,"Position":128.0,"HyperDash":false}]},{"StartTime":106026.0,"Objects":[{"StartTime":106026.0,"Position":216.0,"HyperDash":false}]},{"StartTime":106208.0,"Objects":[{"StartTime":106208.0,"Position":393.0,"HyperDash":false},{"StartTime":106280.0,"Position":408.812164,"HyperDash":false},{"StartTime":106389.0,"Position":478.0,"HyperDash":true}]},{"StartTime":106571.0,"Objects":[{"StartTime":106571.0,"Position":216.0,"HyperDash":false},{"StartTime":106643.0,"Position":194.187851,"HyperDash":false},{"StartTime":106752.0,"Position":131.0,"HyperDash":false}]},{"StartTime":106844.0,"Objects":[{"StartTime":106844.0,"Position":84.0,"HyperDash":false}]},{"StartTime":106935.0,"Objects":[{"StartTime":106935.0,"Position":131.0,"HyperDash":false},{"StartTime":107007.0,"Position":171.812149,"HyperDash":false},{"StartTime":107116.0,"Position":216.0,"HyperDash":false}]},{"StartTime":107299.0,"Objects":[{"StartTime":107299.0,"Position":312.0,"HyperDash":false}]},{"StartTime":107480.0,"Objects":[{"StartTime":107480.0,"Position":212.0,"HyperDash":false}]},{"StartTime":107662.0,"Objects":[{"StartTime":107662.0,"Position":392.0,"HyperDash":false},{"StartTime":107734.0,"Position":372.0,"HyperDash":false},{"StartTime":107843.0,"Position":392.0,"HyperDash":false}]},{"StartTime":108026.0,"Objects":[{"StartTime":108026.0,"Position":136.0,"HyperDash":false},{"StartTime":108098.0,"Position":101.187851,"HyperDash":false},{"StartTime":108207.0,"Position":51.0,"HyperDash":false}]},{"StartTime":108390.0,"Objects":[{"StartTime":108390.0,"Position":144.0,"HyperDash":false},{"StartTime":108462.0,"Position":129.0,"HyperDash":false},{"StartTime":108571.0,"Position":144.0,"HyperDash":false}]},{"StartTime":108753.0,"Objects":[{"StartTime":108753.0,"Position":304.0,"HyperDash":false}]},{"StartTime":108935.0,"Objects":[{"StartTime":108935.0,"Position":140.0,"HyperDash":false}]},{"StartTime":109117.0,"Objects":[{"StartTime":109117.0,"Position":312.0,"HyperDash":false},{"StartTime":109189.0,"Position":293.0,"HyperDash":false},{"StartTime":109298.0,"Position":312.0,"HyperDash":false}]},{"StartTime":109480.0,"Objects":[{"StartTime":109480.0,"Position":56.0,"HyperDash":false},{"StartTime":109552.0,"Position":60.0,"HyperDash":false},{"StartTime":109661.0,"Position":56.0,"HyperDash":false}]},{"StartTime":109844.0,"Objects":[{"StartTime":109844.0,"Position":140.0,"HyperDash":false}]},{"StartTime":109934.0,"Objects":[{"StartTime":109934.0,"Position":182.0,"HyperDash":false}]},{"StartTime":110025.0,"Objects":[{"StartTime":110025.0,"Position":225.0,"HyperDash":false}]},{"StartTime":110208.0,"Objects":[{"StartTime":110208.0,"Position":56.0,"HyperDash":false}]},{"StartTime":110390.0,"Objects":[{"StartTime":110390.0,"Position":152.0,"HyperDash":false}]},{"StartTime":110571.0,"Objects":[{"StartTime":110571.0,"Position":52.0,"HyperDash":false},{"StartTime":110643.0,"Position":54.0,"HyperDash":false},{"StartTime":110752.0,"Position":52.0,"HyperDash":true}]},{"StartTime":110935.0,"Objects":[{"StartTime":110935.0,"Position":312.0,"HyperDash":false},{"StartTime":111007.0,"Position":362.812164,"HyperDash":false},{"StartTime":111116.0,"Position":397.0,"HyperDash":false}]},{"StartTime":111299.0,"Objects":[{"StartTime":111299.0,"Position":304.0,"HyperDash":false}]},{"StartTime":111480.0,"Objects":[{"StartTime":111480.0,"Position":404.0,"HyperDash":false}]},{"StartTime":111662.0,"Objects":[{"StartTime":111662.0,"Position":312.0,"HyperDash":false}]},{"StartTime":111752.0,"Objects":[{"StartTime":111752.0,"Position":269.0,"HyperDash":false}]},{"StartTime":111843.0,"Objects":[{"StartTime":111843.0,"Position":227.0,"HyperDash":false}]},{"StartTime":112026.0,"Objects":[{"StartTime":112026.0,"Position":328.0,"HyperDash":false},{"StartTime":112098.0,"Position":339.0,"HyperDash":false},{"StartTime":112207.0,"Position":328.0,"HyperDash":true}]},{"StartTime":112390.0,"Objects":[{"StartTime":112390.0,"Position":68.0,"HyperDash":false},{"StartTime":112462.0,"Position":70.0,"HyperDash":false},{"StartTime":112571.0,"Position":68.0,"HyperDash":false}]},{"StartTime":112753.0,"Objects":[{"StartTime":112753.0,"Position":160.0,"HyperDash":false},{"StartTime":112825.0,"Position":201.812149,"HyperDash":false},{"StartTime":112934.0,"Position":245.0,"HyperDash":false}]},{"StartTime":113117.0,"Objects":[{"StartTime":113117.0,"Position":420.0,"HyperDash":false},{"StartTime":113189.0,"Position":413.0,"HyperDash":false},{"StartTime":113298.0,"Position":420.0,"HyperDash":false}]},{"StartTime":113480.0,"Objects":[{"StartTime":113480.0,"Position":328.0,"HyperDash":false}]},{"StartTime":113570.0,"Objects":[{"StartTime":113570.0,"Position":285.0,"HyperDash":false}]},{"StartTime":113661.0,"Objects":[{"StartTime":113661.0,"Position":243.0,"HyperDash":false}]},{"StartTime":113844.0,"Objects":[{"StartTime":113844.0,"Position":492.0,"HyperDash":false},{"StartTime":113916.0,"Position":493.0,"HyperDash":false},{"StartTime":114025.0,"Position":492.0,"HyperDash":false}]},{"StartTime":114208.0,"Objects":[{"StartTime":114208.0,"Position":396.0,"HyperDash":false},{"StartTime":114280.0,"Position":346.187836,"HyperDash":false},{"StartTime":114389.0,"Position":311.0,"HyperDash":false}]},{"StartTime":114571.0,"Objects":[{"StartTime":114571.0,"Position":140.0,"HyperDash":false}]},{"StartTime":114753.0,"Objects":[{"StartTime":114753.0,"Position":311.0,"HyperDash":false}]},{"StartTime":114935.0,"Objects":[{"StartTime":114935.0,"Position":140.0,"HyperDash":false},{"StartTime":115007.0,"Position":121.0,"HyperDash":false},{"StartTime":115116.0,"Position":140.0,"HyperDash":false}]},{"StartTime":115299.0,"Objects":[{"StartTime":115299.0,"Position":396.0,"HyperDash":false},{"StartTime":115371.0,"Position":409.812164,"HyperDash":false},{"StartTime":115480.0,"Position":481.0,"HyperDash":false}]},{"StartTime":115662.0,"Objects":[{"StartTime":115662.0,"Position":308.0,"HyperDash":false},{"StartTime":115734.0,"Position":311.0,"HyperDash":false},{"StartTime":115843.0,"Position":308.0,"HyperDash":false}]},{"StartTime":116026.0,"Objects":[{"StartTime":116026.0,"Position":136.0,"HyperDash":false}]},{"StartTime":116208.0,"Objects":[{"StartTime":116208.0,"Position":228.0,"HyperDash":false}]},{"StartTime":116390.0,"Objects":[{"StartTime":116390.0,"Position":56.0,"HyperDash":false},{"StartTime":116462.0,"Position":56.0,"HyperDash":false},{"StartTime":116571.0,"Position":56.0,"HyperDash":false}]},{"StartTime":116753.0,"Objects":[{"StartTime":116753.0,"Position":312.0,"HyperDash":false},{"StartTime":116825.0,"Position":322.0,"HyperDash":false},{"StartTime":116934.0,"Position":312.0,"HyperDash":false}]},{"StartTime":117117.0,"Objects":[{"StartTime":117117.0,"Position":484.0,"HyperDash":false},{"StartTime":117207.0,"Position":484.0,"HyperDash":false},{"StartTime":117298.0,"Position":484.0,"HyperDash":false}]},{"StartTime":117480.0,"Objects":[{"StartTime":117480.0,"Position":392.0,"HyperDash":false}]},{"StartTime":117662.0,"Objects":[{"StartTime":117662.0,"Position":476.0,"HyperDash":false}]},{"StartTime":117844.0,"Objects":[{"StartTime":117844.0,"Position":304.0,"HyperDash":false}]},{"StartTime":117934.0,"Objects":[{"StartTime":117934.0,"Position":262.0,"HyperDash":false}]},{"StartTime":118025.0,"Objects":[{"StartTime":118025.0,"Position":219.0,"HyperDash":false}]},{"StartTime":118208.0,"Objects":[{"StartTime":118208.0,"Position":476.0,"HyperDash":false}]},{"StartTime":118299.0,"Objects":[{"StartTime":118299.0,"Position":476.0,"HyperDash":false}]},{"StartTime":118390.0,"Objects":[{"StartTime":118390.0,"Position":432.0,"HyperDash":false}]},{"StartTime":118571.0,"Objects":[{"StartTime":118571.0,"Position":260.0,"HyperDash":false}]},{"StartTime":118662.0,"Objects":[{"StartTime":118662.0,"Position":260.0,"HyperDash":false}]},{"StartTime":118753.0,"Objects":[{"StartTime":118753.0,"Position":260.0,"HyperDash":false}]},{"StartTime":118935.0,"Objects":[{"StartTime":118935.0,"Position":88.0,"HyperDash":false}]},{"StartTime":119026.0,"Objects":[{"StartTime":119026.0,"Position":88.0,"HyperDash":false}]},{"StartTime":119117.0,"Objects":[{"StartTime":119117.0,"Position":132.0,"HyperDash":false}]},{"StartTime":119299.0,"Objects":[{"StartTime":119299.0,"Position":304.0,"HyperDash":false},{"StartTime":119371.0,"Position":319.812164,"HyperDash":false},{"StartTime":119480.0,"Position":389.0,"HyperDash":true}]},{"StartTime":119662.0,"Objects":[{"StartTime":119662.0,"Position":112.0,"HyperDash":false}]},{"StartTime":120026.0,"Objects":[{"StartTime":120026.0,"Position":221.0,"HyperDash":false},{"StartTime":120111.0,"Position":407.0,"HyperDash":false},{"StartTime":120196.0,"Position":287.0,"HyperDash":false},{"StartTime":120281.0,"Position":135.0,"HyperDash":false},{"StartTime":120366.0,"Position":437.0,"HyperDash":false},{"StartTime":120452.0,"Position":289.0,"HyperDash":false},{"StartTime":120537.0,"Position":464.0,"HyperDash":false},{"StartTime":120622.0,"Position":36.0,"HyperDash":false},{"StartTime":120707.0,"Position":378.0,"HyperDash":false},{"StartTime":120792.0,"Position":297.0,"HyperDash":false},{"StartTime":120878.0,"Position":418.0,"HyperDash":false},{"StartTime":120963.0,"Position":329.0,"HyperDash":false},{"StartTime":121048.0,"Position":338.0,"HyperDash":false},{"StartTime":121133.0,"Position":394.0,"HyperDash":false},{"StartTime":121219.0,"Position":40.0,"HyperDash":false},{"StartTime":121304.0,"Position":13.0,"HyperDash":false},{"StartTime":121389.0,"Position":80.0,"HyperDash":false},{"StartTime":121474.0,"Position":138.0,"HyperDash":false},{"StartTime":121559.0,"Position":311.0,"HyperDash":false},{"StartTime":121645.0,"Position":216.0,"HyperDash":false},{"StartTime":121730.0,"Position":310.0,"HyperDash":false},{"StartTime":121815.0,"Position":397.0,"HyperDash":false},{"StartTime":121900.0,"Position":214.0,"HyperDash":false},{"StartTime":121986.0,"Position":505.0,"HyperDash":false},{"StartTime":122071.0,"Position":173.0,"HyperDash":false},{"StartTime":122156.0,"Position":295.0,"HyperDash":false},{"StartTime":122241.0,"Position":199.0,"HyperDash":false},{"StartTime":122326.0,"Position":494.0,"HyperDash":false},{"StartTime":122412.0,"Position":293.0,"HyperDash":false},{"StartTime":122497.0,"Position":115.0,"HyperDash":false},{"StartTime":122582.0,"Position":412.0,"HyperDash":false},{"StartTime":122667.0,"Position":506.0,"HyperDash":false},{"StartTime":122753.0,"Position":293.0,"HyperDash":false},{"StartTime":122838.0,"Position":346.0,"HyperDash":false},{"StartTime":122923.0,"Position":117.0,"HyperDash":false},{"StartTime":123008.0,"Position":285.0,"HyperDash":false},{"StartTime":123093.0,"Position":17.0,"HyperDash":false},{"StartTime":123179.0,"Position":238.0,"HyperDash":false},{"StartTime":123264.0,"Position":222.0,"HyperDash":false},{"StartTime":123349.0,"Position":450.0,"HyperDash":false},{"StartTime":123434.0,"Position":67.0,"HyperDash":false},{"StartTime":123519.0,"Position":219.0,"HyperDash":false},{"StartTime":123605.0,"Position":307.0,"HyperDash":false},{"StartTime":123690.0,"Position":367.0,"HyperDash":false},{"StartTime":123775.0,"Position":412.0,"HyperDash":false},{"StartTime":123860.0,"Position":413.0,"HyperDash":false},{"StartTime":123946.0,"Position":143.0,"HyperDash":false},{"StartTime":124031.0,"Position":339.0,"HyperDash":false},{"StartTime":124116.0,"Position":342.0,"HyperDash":false},{"StartTime":124201.0,"Position":249.0,"HyperDash":false},{"StartTime":124286.0,"Position":235.0,"HyperDash":false},{"StartTime":124372.0,"Position":323.0,"HyperDash":false},{"StartTime":124457.0,"Position":365.0,"HyperDash":false},{"StartTime":124542.0,"Position":74.0,"HyperDash":false},{"StartTime":124627.0,"Position":281.0,"HyperDash":false},{"StartTime":124713.0,"Position":398.0,"HyperDash":false},{"StartTime":124798.0,"Position":335.0,"HyperDash":false},{"StartTime":124883.0,"Position":388.0,"HyperDash":false},{"StartTime":124968.0,"Position":228.0,"HyperDash":false},{"StartTime":125053.0,"Position":323.0,"HyperDash":false},{"StartTime":125139.0,"Position":441.0,"HyperDash":false},{"StartTime":125224.0,"Position":442.0,"HyperDash":false},{"StartTime":125309.0,"Position":278.0,"HyperDash":false},{"StartTime":125394.0,"Position":90.0,"HyperDash":false},{"StartTime":125480.0,"Position":409.0,"HyperDash":false}]},{"StartTime":131299.0,"Objects":[{"StartTime":131299.0,"Position":296.0,"HyperDash":false},{"StartTime":131389.0,"Position":305.0,"HyperDash":false},{"StartTime":131480.0,"Position":296.0,"HyperDash":false},{"StartTime":131553.0,"Position":309.0,"HyperDash":false},{"StartTime":131662.0,"Position":296.0,"HyperDash":false}]},{"StartTime":132026.0,"Objects":[{"StartTime":132026.0,"Position":152.0,"HyperDash":false}]},{"StartTime":132208.0,"Objects":[{"StartTime":132208.0,"Position":244.0,"HyperDash":false}]},{"StartTime":132390.0,"Objects":[{"StartTime":132390.0,"Position":336.0,"HyperDash":false}]},{"StartTime":132571.0,"Objects":[{"StartTime":132571.0,"Position":244.0,"HyperDash":false}]},{"StartTime":132753.0,"Objects":[{"StartTime":132753.0,"Position":416.0,"HyperDash":false},{"StartTime":132843.0,"Position":402.0,"HyperDash":false},{"StartTime":132934.0,"Position":416.0,"HyperDash":false},{"StartTime":133025.0,"Position":411.0,"HyperDash":false},{"StartTime":133116.0,"Position":416.0,"HyperDash":false},{"StartTime":133207.0,"Position":416.0,"HyperDash":false},{"StartTime":133298.0,"Position":416.0,"HyperDash":false},{"StartTime":133371.0,"Position":427.0,"HyperDash":false},{"StartTime":133480.0,"Position":416.0,"HyperDash":false}]},{"StartTime":133844.0,"Objects":[{"StartTime":133844.0,"Position":280.0,"HyperDash":false}]},{"StartTime":134026.0,"Objects":[{"StartTime":134026.0,"Position":188.0,"HyperDash":false}]},{"StartTime":134208.0,"Objects":[{"StartTime":134208.0,"Position":16.0,"HyperDash":false},{"StartTime":134298.0,"Position":1.0,"HyperDash":false},{"StartTime":134389.0,"Position":16.0,"HyperDash":false},{"StartTime":134462.0,"Position":9.0,"HyperDash":false},{"StartTime":134571.0,"Position":16.0,"HyperDash":false}]},{"StartTime":134935.0,"Objects":[{"StartTime":134935.0,"Position":176.0,"HyperDash":false}]},{"StartTime":135299.0,"Objects":[{"StartTime":135299.0,"Position":32.0,"HyperDash":false}]},{"StartTime":135662.0,"Objects":[{"StartTime":135662.0,"Position":272.0,"HyperDash":false},{"StartTime":135752.0,"Position":255.0,"HyperDash":false},{"StartTime":135843.0,"Position":272.0,"HyperDash":false},{"StartTime":135916.0,"Position":286.0,"HyperDash":false},{"StartTime":136025.0,"Position":272.0,"HyperDash":false}]},{"StartTime":136390.0,"Objects":[{"StartTime":136390.0,"Position":428.0,"HyperDash":false},{"StartTime":136480.0,"Position":429.0,"HyperDash":false},{"StartTime":136571.0,"Position":428.0,"HyperDash":false},{"StartTime":136644.0,"Position":433.0,"HyperDash":false},{"StartTime":136753.0,"Position":428.0,"HyperDash":false}]},{"StartTime":137117.0,"Objects":[{"StartTime":137117.0,"Position":132.0,"HyperDash":false},{"StartTime":137207.0,"Position":168.09079,"HyperDash":false},{"StartTime":137298.0,"Position":216.649246,"HyperDash":false},{"StartTime":137389.0,"Position":265.2077,"HyperDash":false},{"StartTime":137480.0,"Position":302.0,"HyperDash":false},{"StartTime":137571.0,"Position":256.675385,"HyperDash":false},{"StartTime":137662.0,"Position":217.116913,"HyperDash":false},{"StartTime":137735.0,"Position":187.976624,"HyperDash":false},{"StartTime":137844.0,"Position":132.0,"HyperDash":false}]},{"StartTime":138571.0,"Objects":[{"StartTime":138571.0,"Position":336.0,"HyperDash":false},{"StartTime":138661.0,"Position":321.0,"HyperDash":false},{"StartTime":138752.0,"Position":336.0,"HyperDash":false},{"StartTime":138825.0,"Position":328.0,"HyperDash":false},{"StartTime":138934.0,"Position":336.0,"HyperDash":false}]},{"StartTime":139117.0,"Objects":[{"StartTime":139117.0,"Position":240.0,"HyperDash":false}]},{"StartTime":139299.0,"Objects":[{"StartTime":139299.0,"Position":336.0,"HyperDash":false}]},{"StartTime":139662.0,"Objects":[{"StartTime":139662.0,"Position":480.0,"HyperDash":false}]},{"StartTime":139844.0,"Objects":[{"StartTime":139844.0,"Position":388.0,"HyperDash":false}]},{"StartTime":140026.0,"Objects":[{"StartTime":140026.0,"Position":212.0,"HyperDash":false},{"StartTime":140116.0,"Position":200.0,"HyperDash":false},{"StartTime":140207.0,"Position":212.0,"HyperDash":false},{"StartTime":140298.0,"Position":229.0,"HyperDash":false},{"StartTime":140389.0,"Position":212.0,"HyperDash":false},{"StartTime":140480.0,"Position":203.0,"HyperDash":false},{"StartTime":140571.0,"Position":212.0,"HyperDash":false},{"StartTime":140644.0,"Position":211.0,"HyperDash":false},{"StartTime":140753.0,"Position":212.0,"HyperDash":false}]},{"StartTime":141480.0,"Objects":[{"StartTime":141480.0,"Position":448.0,"HyperDash":false},{"StartTime":141570.0,"Position":415.636353,"HyperDash":false},{"StartTime":141661.0,"Position":354.5,"HyperDash":false},{"StartTime":141734.0,"Position":391.84848,"HyperDash":false},{"StartTime":141843.0,"Position":448.0,"HyperDash":false}]},{"StartTime":142208.0,"Objects":[{"StartTime":142208.0,"Position":244.0,"HyperDash":false}]},{"StartTime":142390.0,"Objects":[{"StartTime":142390.0,"Position":348.0,"HyperDash":false}]},{"StartTime":142571.0,"Objects":[{"StartTime":142571.0,"Position":448.0,"HyperDash":false}]},{"StartTime":142935.0,"Objects":[{"StartTime":142935.0,"Position":152.0,"HyperDash":false},{"StartTime":143025.0,"Position":137.0,"HyperDash":false},{"StartTime":143116.0,"Position":152.0,"HyperDash":false},{"StartTime":143189.0,"Position":168.0,"HyperDash":false},{"StartTime":143298.0,"Position":152.0,"HyperDash":false}]},{"StartTime":143480.0,"Objects":[{"StartTime":143480.0,"Position":236.0,"HyperDash":false}]},{"StartTime":143662.0,"Objects":[{"StartTime":143662.0,"Position":144.0,"HyperDash":false},{"StartTime":143752.0,"Position":93.85124,"HyperDash":false},{"StartTime":143843.0,"Position":59.0,"HyperDash":false},{"StartTime":143916.0,"Position":76.95316,"HyperDash":false},{"StartTime":144025.0,"Position":144.0,"HyperDash":false}]},{"StartTime":144390.0,"Objects":[{"StartTime":144390.0,"Position":316.0,"HyperDash":false}]},{"StartTime":144571.0,"Objects":[{"StartTime":144571.0,"Position":232.0,"HyperDash":false}]},{"StartTime":144753.0,"Objects":[{"StartTime":144753.0,"Position":148.0,"HyperDash":false}]},{"StartTime":145117.0,"Objects":[{"StartTime":145117.0,"Position":316.0,"HyperDash":false},{"StartTime":145207.0,"Position":275.851257,"HyperDash":false},{"StartTime":145298.0,"Position":231.0,"HyperDash":false},{"StartTime":145371.0,"Position":279.953156,"HyperDash":false},{"StartTime":145480.0,"Position":316.0,"HyperDash":false}]},{"StartTime":145844.0,"Objects":[{"StartTime":145844.0,"Position":144.0,"HyperDash":false},{"StartTime":145916.0,"Position":147.0,"HyperDash":false},{"StartTime":146025.0,"Position":144.0,"HyperDash":false}]},{"StartTime":146208.0,"Objects":[{"StartTime":146208.0,"Position":228.0,"HyperDash":false}]},{"StartTime":146571.0,"Objects":[{"StartTime":146571.0,"Position":59.0,"HyperDash":false},{"StartTime":146661.0,"Position":108.148758,"HyperDash":false},{"StartTime":146752.0,"Position":144.0,"HyperDash":false},{"StartTime":146825.0,"Position":95.04684,"HyperDash":false},{"StartTime":146934.0,"Position":59.0,"HyperDash":false}]},{"StartTime":147299.0,"Objects":[{"StartTime":147299.0,"Position":228.0,"HyperDash":false},{"StartTime":147371.0,"Position":264.812164,"HyperDash":false},{"StartTime":147480.0,"Position":313.0,"HyperDash":false}]},{"StartTime":147662.0,"Objects":[{"StartTime":147662.0,"Position":220.0,"HyperDash":false},{"StartTime":147734.0,"Position":215.0,"HyperDash":false},{"StartTime":147843.0,"Position":220.0,"HyperDash":false}]},{"StartTime":148026.0,"Objects":[{"StartTime":148026.0,"Position":313.0,"HyperDash":false},{"StartTime":148098.0,"Position":313.0,"HyperDash":false},{"StartTime":148207.0,"Position":313.0,"HyperDash":false}]},{"StartTime":148390.0,"Objects":[{"StartTime":148390.0,"Position":228.0,"HyperDash":false}]},{"StartTime":148571.0,"Objects":[{"StartTime":148571.0,"Position":320.0,"HyperDash":false}]},{"StartTime":148753.0,"Objects":[{"StartTime":148753.0,"Position":64.0,"HyperDash":false},{"StartTime":148825.0,"Position":82.0,"HyperDash":false},{"StartTime":148934.0,"Position":64.0,"HyperDash":false}]},{"StartTime":149117.0,"Objects":[{"StartTime":149117.0,"Position":152.0,"HyperDash":false},{"StartTime":149189.0,"Position":148.0,"HyperDash":false},{"StartTime":149298.0,"Position":152.0,"HyperDash":false}]},{"StartTime":149480.0,"Objects":[{"StartTime":149480.0,"Position":328.0,"HyperDash":false}]},{"StartTime":149844.0,"Objects":[{"StartTime":149844.0,"Position":184.0,"HyperDash":false},{"StartTime":149916.0,"Position":215.812149,"HyperDash":false},{"StartTime":150025.0,"Position":269.0,"HyperDash":false}]},{"StartTime":150208.0,"Objects":[{"StartTime":150208.0,"Position":356.0,"HyperDash":false}]},{"StartTime":150571.0,"Objects":[{"StartTime":150571.0,"Position":204.0,"HyperDash":false},{"StartTime":150643.0,"Position":221.0,"HyperDash":false},{"StartTime":150752.0,"Position":204.0,"HyperDash":false}]},{"StartTime":150935.0,"Objects":[{"StartTime":150935.0,"Position":28.0,"HyperDash":false}]},{"StartTime":151299.0,"Objects":[{"StartTime":151299.0,"Position":172.0,"HyperDash":false},{"StartTime":151371.0,"Position":221.812149,"HyperDash":false},{"StartTime":151480.0,"Position":257.0,"HyperDash":false}]},{"StartTime":151662.0,"Objects":[{"StartTime":151662.0,"Position":164.0,"HyperDash":false},{"StartTime":151734.0,"Position":168.0,"HyperDash":false},{"StartTime":151843.0,"Position":164.0,"HyperDash":false}]},{"StartTime":152026.0,"Objects":[{"StartTime":152026.0,"Position":257.0,"HyperDash":false},{"StartTime":152098.0,"Position":274.0,"HyperDash":false},{"StartTime":152207.0,"Position":257.0,"HyperDash":false}]},{"StartTime":152390.0,"Objects":[{"StartTime":152390.0,"Position":432.0,"HyperDash":false}]},{"StartTime":152753.0,"Objects":[{"StartTime":152753.0,"Position":288.0,"HyperDash":false},{"StartTime":152825.0,"Position":271.187866,"HyperDash":false},{"StartTime":152934.0,"Position":203.0,"HyperDash":false}]},{"StartTime":153117.0,"Objects":[{"StartTime":153117.0,"Position":380.0,"HyperDash":false},{"StartTime":153189.0,"Position":381.0,"HyperDash":false},{"StartTime":153298.0,"Position":380.0,"HyperDash":false}]},{"StartTime":153480.0,"Objects":[{"StartTime":153480.0,"Position":288.0,"HyperDash":false},{"StartTime":153552.0,"Position":301.0,"HyperDash":false},{"StartTime":153661.0,"Position":288.0,"HyperDash":false}]},{"StartTime":153844.0,"Objects":[{"StartTime":153844.0,"Position":112.0,"HyperDash":false},{"StartTime":153916.0,"Position":121.0,"HyperDash":false},{"StartTime":154025.0,"Position":112.0,"HyperDash":false}]},{"StartTime":154208.0,"Objects":[{"StartTime":154208.0,"Position":203.0,"HyperDash":false},{"StartTime":154280.0,"Position":235.812149,"HyperDash":false},{"StartTime":154389.0,"Position":288.0,"HyperDash":false}]},{"StartTime":154571.0,"Objects":[{"StartTime":154571.0,"Position":32.0,"HyperDash":false},{"StartTime":154661.0,"Position":45.0,"HyperDash":false},{"StartTime":154752.0,"Position":32.0,"HyperDash":false},{"StartTime":154825.0,"Position":23.0,"HyperDash":false},{"StartTime":154934.0,"Position":32.0,"HyperDash":false}]},{"StartTime":155299.0,"Objects":[{"StartTime":155299.0,"Position":216.0,"HyperDash":false}]},{"StartTime":155480.0,"Objects":[{"StartTime":155480.0,"Position":124.0,"HyperDash":false}]},{"StartTime":155662.0,"Objects":[{"StartTime":155662.0,"Position":32.0,"HyperDash":false}]},{"StartTime":156026.0,"Objects":[{"StartTime":156026.0,"Position":216.0,"HyperDash":false},{"StartTime":156098.0,"Position":237.803421,"HyperDash":false},{"StartTime":156207.0,"Position":300.978058,"HyperDash":false}]},{"StartTime":156390.0,"Objects":[{"StartTime":156390.0,"Position":300.0,"HyperDash":false}]},{"StartTime":156753.0,"Objects":[{"StartTime":156753.0,"Position":132.0,"HyperDash":false},{"StartTime":156843.0,"Position":176.148758,"HyperDash":false},{"StartTime":156934.0,"Position":217.0,"HyperDash":false},{"StartTime":157007.0,"Position":167.046844,"HyperDash":false},{"StartTime":157116.0,"Position":132.0,"HyperDash":false}]},{"StartTime":157299.0,"Objects":[{"StartTime":157299.0,"Position":48.0,"HyperDash":false}]},{"StartTime":157480.0,"Objects":[{"StartTime":157480.0,"Position":140.0,"HyperDash":false},{"StartTime":157552.0,"Position":145.0,"HyperDash":false},{"StartTime":157661.0,"Position":140.0,"HyperDash":false}]},{"StartTime":157844.0,"Objects":[{"StartTime":157844.0,"Position":236.0,"HyperDash":false},{"StartTime":157916.0,"Position":252.0,"HyperDash":false},{"StartTime":158025.0,"Position":236.0,"HyperDash":false}]},{"StartTime":158208.0,"Objects":[{"StartTime":158208.0,"Position":412.0,"HyperDash":false},{"StartTime":158298.0,"Position":434.148743,"HyperDash":false},{"StartTime":158389.0,"Position":497.0,"HyperDash":false},{"StartTime":158462.0,"Position":464.046844,"HyperDash":false},{"StartTime":158571.0,"Position":412.0,"HyperDash":false}]},{"StartTime":158935.0,"Objects":[{"StartTime":158935.0,"Position":268.0,"HyperDash":false}]},{"StartTime":159117.0,"Objects":[{"StartTime":159117.0,"Position":344.0,"HyperDash":false}]},{"StartTime":159299.0,"Objects":[{"StartTime":159299.0,"Position":420.0,"HyperDash":false}]},{"StartTime":159480.0,"Objects":[{"StartTime":159480.0,"Position":496.0,"HyperDash":false}]},{"StartTime":159662.0,"Objects":[{"StartTime":159662.0,"Position":412.0,"HyperDash":false},{"StartTime":159734.0,"Position":448.812164,"HyperDash":false},{"StartTime":159843.0,"Position":497.0,"HyperDash":false}]},{"StartTime":160026.0,"Objects":[{"StartTime":160026.0,"Position":324.0,"HyperDash":false},{"StartTime":160098.0,"Position":341.0,"HyperDash":false},{"StartTime":160207.0,"Position":324.0,"HyperDash":false}]},{"StartTime":160390.0,"Objects":[{"StartTime":160390.0,"Position":68.0,"HyperDash":false},{"StartTime":160462.0,"Position":75.0,"HyperDash":false},{"StartTime":160571.0,"Position":68.0,"HyperDash":false}]},{"StartTime":160753.0,"Objects":[{"StartTime":160753.0,"Position":152.0,"HyperDash":false},{"StartTime":160825.0,"Position":187.812149,"HyperDash":false},{"StartTime":160934.0,"Position":237.0,"HyperDash":false}]},{"StartTime":161117.0,"Objects":[{"StartTime":161117.0,"Position":409.0,"HyperDash":false},{"StartTime":161189.0,"Position":409.0,"HyperDash":false},{"StartTime":161298.0,"Position":409.0,"HyperDash":false}]},{"StartTime":161480.0,"Objects":[{"StartTime":161480.0,"Position":324.0,"HyperDash":false},{"StartTime":161552.0,"Position":355.812164,"HyperDash":false},{"StartTime":161661.0,"Position":409.0,"HyperDash":false}]},{"StartTime":161844.0,"Objects":[{"StartTime":161844.0,"Position":313.0,"HyperDash":false},{"StartTime":161916.0,"Position":320.0,"HyperDash":false},{"StartTime":162025.0,"Position":313.0,"HyperDash":false}]},{"StartTime":162208.0,"Objects":[{"StartTime":162208.0,"Position":140.0,"HyperDash":false},{"StartTime":162280.0,"Position":128.0,"HyperDash":false},{"StartTime":162389.0,"Position":140.0,"HyperDash":false}]},{"StartTime":162480.0,"Objects":[{"StartTime":162480.0,"Position":184.0,"HyperDash":false}]},{"StartTime":162571.0,"Objects":[{"StartTime":162571.0,"Position":228.0,"HyperDash":false},{"StartTime":162643.0,"Position":255.812164,"HyperDash":false},{"StartTime":162752.0,"Position":313.0,"HyperDash":false}]},{"StartTime":162935.0,"Objects":[{"StartTime":162935.0,"Position":400.0,"HyperDash":false},{"StartTime":163007.0,"Position":417.0,"HyperDash":false},{"StartTime":163116.0,"Position":400.0,"HyperDash":false}]},{"StartTime":163299.0,"Objects":[{"StartTime":163299.0,"Position":217.0,"HyperDash":false},{"StartTime":163367.0,"Position":455.0,"HyperDash":false},{"StartTime":163435.0,"Position":229.0,"HyperDash":false},{"StartTime":163503.0,"Position":51.0,"HyperDash":false},{"StartTime":163571.0,"Position":199.0,"HyperDash":false},{"StartTime":163639.0,"Position":208.0,"HyperDash":false},{"StartTime":163707.0,"Position":173.0,"HyperDash":false},{"StartTime":163775.0,"Position":367.0,"HyperDash":false},{"StartTime":163844.0,"Position":193.0,"HyperDash":false},{"StartTime":163912.0,"Position":488.0,"HyperDash":false},{"StartTime":163980.0,"Position":314.0,"HyperDash":false},{"StartTime":164048.0,"Position":135.0,"HyperDash":false},{"StartTime":164116.0,"Position":399.0,"HyperDash":false},{"StartTime":164184.0,"Position":404.0,"HyperDash":false},{"StartTime":164252.0,"Position":152.0,"HyperDash":false},{"StartTime":164320.0,"Position":353.0,"HyperDash":false},{"StartTime":164389.0,"Position":358.0,"HyperDash":false}]},{"StartTime":164753.0,"Objects":[{"StartTime":164753.0,"Position":132.0,"HyperDash":false},{"StartTime":164843.0,"Position":132.0,"HyperDash":false},{"StartTime":164934.0,"Position":132.0,"HyperDash":false}]},{"StartTime":165117.0,"Objects":[{"StartTime":165117.0,"Position":304.0,"HyperDash":false}]},{"StartTime":165207.0,"Objects":[{"StartTime":165207.0,"Position":352.0,"HyperDash":false}]},{"StartTime":165298.0,"Objects":[{"StartTime":165298.0,"Position":372.0,"HyperDash":false}]},{"StartTime":165389.0,"Objects":[{"StartTime":165389.0,"Position":351.0,"HyperDash":false}]},{"StartTime":165480.0,"Objects":[{"StartTime":165480.0,"Position":303.0,"HyperDash":false}]},{"StartTime":165662.0,"Objects":[{"StartTime":165662.0,"Position":208.0,"HyperDash":false}]},{"StartTime":165844.0,"Objects":[{"StartTime":165844.0,"Position":388.0,"HyperDash":false},{"StartTime":165916.0,"Position":435.812164,"HyperDash":false},{"StartTime":166025.0,"Position":473.0,"HyperDash":false}]},{"StartTime":166208.0,"Objects":[{"StartTime":166208.0,"Position":216.0,"HyperDash":false},{"StartTime":166298.0,"Position":158.851242,"HyperDash":false},{"StartTime":166389.0,"Position":131.0,"HyperDash":false},{"StartTime":166462.0,"Position":155.953156,"HyperDash":false},{"StartTime":166571.0,"Position":216.0,"HyperDash":false}]},{"StartTime":166753.0,"Objects":[{"StartTime":166753.0,"Position":308.0,"HyperDash":false},{"StartTime":166843.0,"Position":274.851257,"HyperDash":false},{"StartTime":166934.0,"Position":223.234161,"HyperDash":false},{"StartTime":167007.0,"Position":206.046844,"HyperDash":false},{"StartTime":167116.0,"Position":138.0,"HyperDash":false}]},{"StartTime":167299.0,"Objects":[{"StartTime":167299.0,"Position":312.0,"HyperDash":false},{"StartTime":167371.0,"Position":305.0,"HyperDash":false},{"StartTime":167480.0,"Position":312.0,"HyperDash":false}]},{"StartTime":167662.0,"Objects":[{"StartTime":167662.0,"Position":138.0,"HyperDash":false},{"StartTime":167752.0,"Position":192.148758,"HyperDash":false},{"StartTime":167843.0,"Position":222.765839,"HyperDash":false},{"StartTime":167916.0,"Position":254.953156,"HyperDash":false},{"StartTime":168025.0,"Position":308.0,"HyperDash":false}]},{"StartTime":168208.0,"Objects":[{"StartTime":168208.0,"Position":404.0,"HyperDash":false},{"StartTime":168298.0,"Position":395.0,"HyperDash":false},{"StartTime":168389.0,"Position":403.234161,"HyperDash":false},{"StartTime":168462.0,"Position":382.046844,"HyperDash":false},{"StartTime":168571.0,"Position":318.0,"HyperDash":false}]},{"StartTime":168753.0,"Objects":[{"StartTime":168753.0,"Position":140.0,"HyperDash":false},{"StartTime":168825.0,"Position":131.0,"HyperDash":false},{"StartTime":168934.0,"Position":140.0,"HyperDash":false}]},{"StartTime":169117.0,"Objects":[{"StartTime":169117.0,"Position":320.0,"HyperDash":false},{"StartTime":169207.0,"Position":375.148743,"HyperDash":false},{"StartTime":169298.0,"Position":404.0,"HyperDash":false},{"StartTime":169371.0,"Position":419.0,"HyperDash":false},{"StartTime":169480.0,"Position":404.0,"HyperDash":false}]},{"StartTime":169662.0,"Objects":[{"StartTime":169662.0,"Position":232.0,"HyperDash":false},{"StartTime":169752.0,"Position":176.851242,"HyperDash":false},{"StartTime":169843.0,"Position":147.234161,"HyperDash":false},{"StartTime":169916.0,"Position":100.046837,"HyperDash":false},{"StartTime":170025.0,"Position":62.0,"HyperDash":false}]},{"StartTime":170208.0,"Objects":[{"StartTime":170208.0,"Position":232.0,"HyperDash":false},{"StartTime":170280.0,"Position":203.187851,"HyperDash":false},{"StartTime":170389.0,"Position":147.0,"HyperDash":false}]},{"StartTime":170571.0,"Objects":[{"StartTime":170571.0,"Position":52.0,"HyperDash":false},{"StartTime":170661.0,"Position":52.0,"HyperDash":false}]},{"StartTime":170753.0,"Objects":[{"StartTime":170753.0,"Position":100.0,"HyperDash":false}]},{"StartTime":170935.0,"Objects":[{"StartTime":170935.0,"Position":192.0,"HyperDash":false}]},{"StartTime":171117.0,"Objects":[{"StartTime":171117.0,"Position":448.0,"HyperDash":false},{"StartTime":171189.0,"Position":432.0,"HyperDash":false},{"StartTime":171298.0,"Position":448.0,"HyperDash":false}]},{"StartTime":171480.0,"Objects":[{"StartTime":171480.0,"Position":356.0,"HyperDash":false}]},{"StartTime":171662.0,"Objects":[{"StartTime":171662.0,"Position":184.0,"HyperDash":false},{"StartTime":171734.0,"Position":202.812149,"HyperDash":false},{"StartTime":171843.0,"Position":269.0,"HyperDash":false}]},{"StartTime":172026.0,"Objects":[{"StartTime":172026.0,"Position":20.0,"HyperDash":false},{"StartTime":172116.0,"Position":20.0,"HyperDash":false},{"StartTime":172207.0,"Position":20.0,"HyperDash":false}]},{"StartTime":172390.0,"Objects":[{"StartTime":172390.0,"Position":116.0,"HyperDash":false}]},{"StartTime":172571.0,"Objects":[{"StartTime":172571.0,"Position":32.0,"HyperDash":false}]},{"StartTime":172753.0,"Objects":[{"StartTime":172753.0,"Position":208.0,"HyperDash":false},{"StartTime":172825.0,"Position":252.812149,"HyperDash":false},{"StartTime":172934.0,"Position":293.0,"HyperDash":false}]},{"StartTime":173117.0,"Objects":[{"StartTime":173117.0,"Position":200.0,"HyperDash":false},{"StartTime":173189.0,"Position":212.0,"HyperDash":false},{"StartTime":173298.0,"Position":200.0,"HyperDash":false}]},{"StartTime":173480.0,"Objects":[{"StartTime":173480.0,"Position":376.0,"HyperDash":false},{"StartTime":173552.0,"Position":379.0,"HyperDash":false},{"StartTime":173661.0,"Position":376.0,"HyperDash":false}]},{"StartTime":173844.0,"Objects":[{"StartTime":173844.0,"Position":200.0,"HyperDash":false}]},{"StartTime":174026.0,"Objects":[{"StartTime":174026.0,"Position":116.0,"HyperDash":false},{"StartTime":174116.0,"Position":76.2682648,"HyperDash":false},{"StartTime":174207.0,"Position":64.10713,"HyperDash":false},{"StartTime":174280.0,"Position":75.55404,"HyperDash":false},{"StartTime":174389.0,"Position":115.499283,"HyperDash":false}]},{"StartTime":174571.0,"Objects":[{"StartTime":174571.0,"Position":372.0,"HyperDash":false},{"StartTime":174643.0,"Position":412.812164,"HyperDash":false},{"StartTime":174752.0,"Position":457.0,"HyperDash":false}]},{"StartTime":174935.0,"Objects":[{"StartTime":174935.0,"Position":280.0,"HyperDash":false},{"StartTime":175007.0,"Position":297.0,"HyperDash":false},{"StartTime":175116.0,"Position":280.0,"HyperDash":false}]},{"StartTime":175299.0,"Objects":[{"StartTime":175299.0,"Position":368.0,"HyperDash":false}]},{"StartTime":175480.0,"Objects":[{"StartTime":175480.0,"Position":192.0,"HyperDash":false},{"StartTime":175552.0,"Position":197.0,"HyperDash":false},{"StartTime":175661.0,"Position":192.0,"HyperDash":false}]},{"StartTime":175844.0,"Objects":[{"StartTime":175844.0,"Position":280.0,"HyperDash":false}]},{"StartTime":176026.0,"Objects":[{"StartTime":176026.0,"Position":453.0,"HyperDash":false},{"StartTime":176098.0,"Position":425.187836,"HyperDash":false},{"StartTime":176207.0,"Position":368.0,"HyperDash":false}]},{"StartTime":176390.0,"Objects":[{"StartTime":176390.0,"Position":112.0,"HyperDash":false},{"StartTime":176480.0,"Position":69.85124,"HyperDash":false},{"StartTime":176571.0,"Position":27.0,"HyperDash":false},{"StartTime":176644.0,"Position":44.9531631,"HyperDash":false},{"StartTime":176753.0,"Position":112.0,"HyperDash":false}]},{"StartTime":176935.0,"Objects":[{"StartTime":176935.0,"Position":292.0,"HyperDash":false},{"StartTime":177025.0,"Position":231.851242,"HyperDash":false},{"StartTime":177116.0,"Position":207.234161,"HyperDash":false},{"StartTime":177189.0,"Position":180.046844,"HyperDash":false},{"StartTime":177298.0,"Position":122.0,"HyperDash":false}]},{"StartTime":177480.0,"Objects":[{"StartTime":177480.0,"Position":304.0,"HyperDash":false},{"StartTime":177552.0,"Position":349.812164,"HyperDash":false},{"StartTime":177661.0,"Position":389.0,"HyperDash":false}]},{"StartTime":177844.0,"Objects":[{"StartTime":177844.0,"Position":132.0,"HyperDash":false},{"StartTime":177934.0,"Position":67.42149,"HyperDash":false},{"StartTime":178025.0,"Position":32.0,"HyperDash":false},{"StartTime":178098.0,"Position":18.0,"HyperDash":false},{"StartTime":178207.0,"Position":32.0,"HyperDash":false}]},{"StartTime":178390.0,"Objects":[{"StartTime":178390.0,"Position":208.0,"HyperDash":false},{"StartTime":178480.0,"Position":249.148758,"HyperDash":false},{"StartTime":178571.0,"Position":292.765839,"HyperDash":false},{"StartTime":178644.0,"Position":311.953156,"HyperDash":false},{"StartTime":178753.0,"Position":378.0,"HyperDash":false}]},{"StartTime":178935.0,"Objects":[{"StartTime":178935.0,"Position":284.0,"HyperDash":false},{"StartTime":179007.0,"Position":301.0,"HyperDash":false},{"StartTime":179116.0,"Position":284.0,"HyperDash":false}]},{"StartTime":179299.0,"Objects":[{"StartTime":179299.0,"Position":464.0,"HyperDash":false},{"StartTime":179371.0,"Position":479.0,"HyperDash":false},{"StartTime":179480.0,"Position":464.0,"HyperDash":false}]},{"StartTime":179662.0,"Objects":[{"StartTime":179662.0,"Position":380.0,"HyperDash":false}]},{"StartTime":179844.0,"Objects":[{"StartTime":179844.0,"Position":204.0,"HyperDash":false},{"StartTime":179934.0,"Position":249.148758,"HyperDash":false},{"StartTime":180025.0,"Position":288.765839,"HyperDash":false},{"StartTime":180098.0,"Position":306.953156,"HyperDash":false},{"StartTime":180207.0,"Position":374.0,"HyperDash":false}]},{"StartTime":180390.0,"Objects":[{"StartTime":180390.0,"Position":460.0,"HyperDash":false},{"StartTime":180462.0,"Position":450.0,"HyperDash":false},{"StartTime":180571.0,"Position":460.0,"HyperDash":false}]},{"StartTime":180753.0,"Objects":[{"StartTime":180753.0,"Position":284.0,"HyperDash":false},{"StartTime":180843.0,"Position":257.851257,"HyperDash":false},{"StartTime":180934.0,"Position":200.0,"HyperDash":false},{"StartTime":181007.0,"Position":192.0,"HyperDash":false},{"StartTime":181116.0,"Position":200.0,"HyperDash":false}]},{"StartTime":181299.0,"Objects":[{"StartTime":181299.0,"Position":380.0,"HyperDash":false},{"StartTime":181389.0,"Position":345.851257,"HyperDash":false},{"StartTime":181480.0,"Position":295.234161,"HyperDash":false},{"StartTime":181553.0,"Position":258.046844,"HyperDash":false},{"StartTime":181662.0,"Position":210.0,"HyperDash":false}]},{"StartTime":181844.0,"Objects":[{"StartTime":181844.0,"Position":302.0,"HyperDash":false},{"StartTime":181916.0,"Position":255.187836,"HyperDash":false},{"StartTime":182025.0,"Position":217.0,"HyperDash":false}]},{"StartTime":182208.0,"Objects":[{"StartTime":182208.0,"Position":124.0,"HyperDash":false},{"StartTime":182280.0,"Position":131.0,"HyperDash":false},{"StartTime":182389.0,"Position":124.0,"HyperDash":false}]},{"StartTime":182571.0,"Objects":[{"StartTime":182571.0,"Position":302.0,"HyperDash":false},{"StartTime":182643.0,"Position":248.187836,"HyperDash":false},{"StartTime":182752.0,"Position":217.0,"HyperDash":false}]},{"StartTime":182935.0,"Objects":[{"StartTime":182935.0,"Position":312.0,"HyperDash":false},{"StartTime":183025.0,"Position":354.5,"HyperDash":false},{"StartTime":183116.0,"Position":312.0,"HyperDash":false}]},{"StartTime":183299.0,"Objects":[{"StartTime":183299.0,"Position":132.0,"HyperDash":false},{"StartTime":183371.0,"Position":80.18785,"HyperDash":false},{"StartTime":183480.0,"Position":47.0,"HyperDash":true}]},{"StartTime":183662.0,"Objects":[{"StartTime":183662.0,"Position":312.0,"HyperDash":false},{"StartTime":183752.0,"Position":350.73175,"HyperDash":false},{"StartTime":183843.0,"Position":363.892883,"HyperDash":false},{"StartTime":183916.0,"Position":353.445984,"HyperDash":false},{"StartTime":184025.0,"Position":312.500732,"HyperDash":false}]},{"StartTime":184208.0,"Objects":[{"StartTime":184208.0,"Position":220.0,"HyperDash":false}]},{"StartTime":184390.0,"Objects":[{"StartTime":184390.0,"Position":324.0,"HyperDash":false},{"StartTime":184462.0,"Position":310.0,"HyperDash":false},{"StartTime":184571.0,"Position":324.0,"HyperDash":false}]},{"StartTime":184753.0,"Objects":[{"StartTime":184753.0,"Position":144.0,"HyperDash":false},{"StartTime":184825.0,"Position":142.0,"HyperDash":false},{"StartTime":184934.0,"Position":144.0,"HyperDash":false}]},{"StartTime":185117.0,"Objects":[{"StartTime":185117.0,"Position":324.0,"HyperDash":false},{"StartTime":185189.0,"Position":348.812164,"HyperDash":false},{"StartTime":185298.0,"Position":409.0,"HyperDash":false}]},{"StartTime":185480.0,"Objects":[{"StartTime":185480.0,"Position":232.0,"HyperDash":false},{"StartTime":185552.0,"Position":224.0,"HyperDash":false},{"StartTime":185661.0,"Position":232.0,"HyperDash":false}]},{"StartTime":185844.0,"Objects":[{"StartTime":185844.0,"Position":316.0,"HyperDash":false}]},{"StartTime":186026.0,"Objects":[{"StartTime":186026.0,"Position":232.0,"HyperDash":false}]},{"StartTime":186208.0,"Objects":[{"StartTime":186208.0,"Position":408.0,"HyperDash":false},{"StartTime":186280.0,"Position":427.0,"HyperDash":false},{"StartTime":186389.0,"Position":408.0,"HyperDash":false}]},{"StartTime":186571.0,"Objects":[{"StartTime":186571.0,"Position":152.0,"HyperDash":false},{"StartTime":186661.0,"Position":106.851242,"HyperDash":false},{"StartTime":186752.0,"Position":68.76584,"HyperDash":false},{"StartTime":186825.0,"Position":87.95316,"HyperDash":false},{"StartTime":186934.0,"Position":154.0,"HyperDash":false}]},{"StartTime":187117.0,"Objects":[{"StartTime":187117.0,"Position":332.0,"HyperDash":false},{"StartTime":187207.0,"Position":276.851257,"HyperDash":false},{"StartTime":187298.0,"Position":247.234161,"HyperDash":false},{"StartTime":187371.0,"Position":205.046844,"HyperDash":false},{"StartTime":187480.0,"Position":162.0,"HyperDash":false}]},{"StartTime":187662.0,"Objects":[{"StartTime":187662.0,"Position":76.0,"HyperDash":false},{"StartTime":187734.0,"Position":74.0,"HyperDash":false},{"StartTime":187843.0,"Position":76.0,"HyperDash":false}]},{"StartTime":188026.0,"Objects":[{"StartTime":188026.0,"Position":252.0,"HyperDash":false}]},{"StartTime":188116.0,"Objects":[{"StartTime":188116.0,"Position":294.0,"HyperDash":false}]},{"StartTime":188207.0,"Objects":[{"StartTime":188207.0,"Position":337.0,"HyperDash":false}]},{"StartTime":188390.0,"Objects":[{"StartTime":188390.0,"Position":176.0,"HyperDash":false}]},{"StartTime":188571.0,"Objects":[{"StartTime":188571.0,"Position":344.0,"HyperDash":false},{"StartTime":188661.0,"Position":370.214264,"HyperDash":false},{"StartTime":188752.0,"Position":396.42868,"HyperDash":false},{"StartTime":188825.0,"Position":403.238831,"HyperDash":false},{"StartTime":188934.0,"Position":343.061737,"HyperDash":false}]},{"StartTime":189117.0,"Objects":[{"StartTime":189117.0,"Position":168.0,"HyperDash":false},{"StartTime":189189.0,"Position":133.187851,"HyperDash":false},{"StartTime":189298.0,"Position":83.0,"HyperDash":true}]},{"StartTime":189480.0,"Objects":[{"StartTime":189480.0,"Position":344.0,"HyperDash":false},{"StartTime":189570.0,"Position":378.578522,"HyperDash":false},{"StartTime":189661.0,"Position":445.719,"HyperDash":false},{"StartTime":189734.0,"Position":443.0,"HyperDash":false},{"StartTime":189843.0,"Position":448.0,"HyperDash":false}]},{"StartTime":190026.0,"Objects":[{"StartTime":190026.0,"Position":352.0,"HyperDash":false},{"StartTime":190116.0,"Position":300.851257,"HyperDash":false},{"StartTime":190207.0,"Position":267.234161,"HyperDash":false},{"StartTime":190280.0,"Position":224.046844,"HyperDash":false},{"StartTime":190389.0,"Position":182.0,"HyperDash":false}]},{"StartTime":190571.0,"Objects":[{"StartTime":190571.0,"Position":276.0,"HyperDash":false},{"StartTime":190643.0,"Position":262.0,"HyperDash":false},{"StartTime":190752.0,"Position":276.0,"HyperDash":false}]},{"StartTime":190935.0,"Objects":[{"StartTime":190935.0,"Position":96.0,"HyperDash":false},{"StartTime":191007.0,"Position":114.0,"HyperDash":false},{"StartTime":191116.0,"Position":96.0,"HyperDash":false}]},{"StartTime":191299.0,"Objects":[{"StartTime":191299.0,"Position":192.0,"HyperDash":false},{"StartTime":191371.0,"Position":154.187851,"HyperDash":false},{"StartTime":191480.0,"Position":107.0,"HyperDash":false}]},{"StartTime":191662.0,"Objects":[{"StartTime":191662.0,"Position":284.0,"HyperDash":false},{"StartTime":191734.0,"Position":328.812164,"HyperDash":false},{"StartTime":191843.0,"Position":369.0,"HyperDash":false}]},{"StartTime":192026.0,"Objects":[{"StartTime":192026.0,"Position":464.0,"HyperDash":false},{"StartTime":192116.0,"Position":464.0,"HyperDash":false}]},{"StartTime":192208.0,"Objects":[{"StartTime":192208.0,"Position":420.0,"HyperDash":false}]},{"StartTime":192390.0,"Objects":[{"StartTime":192390.0,"Position":240.0,"HyperDash":false},{"StartTime":192480.0,"Position":193.851242,"HyperDash":false},{"StartTime":192571.0,"Position":155.234161,"HyperDash":false},{"StartTime":192644.0,"Position":139.046844,"HyperDash":false},{"StartTime":192753.0,"Position":70.0,"HyperDash":false}]},{"StartTime":192935.0,"Objects":[{"StartTime":192935.0,"Position":156.0,"HyperDash":false}]},{"StartTime":193117.0,"Objects":[{"StartTime":193117.0,"Position":64.0,"HyperDash":false},{"StartTime":193189.0,"Position":49.0,"HyperDash":false},{"StartTime":193298.0,"Position":64.0,"HyperDash":false}]},{"StartTime":193480.0,"Objects":[{"StartTime":193480.0,"Position":156.0,"HyperDash":false},{"StartTime":193552.0,"Position":173.0,"HyperDash":false},{"StartTime":193661.0,"Position":156.0,"HyperDash":false}]},{"StartTime":193844.0,"Objects":[{"StartTime":193844.0,"Position":332.0,"HyperDash":false},{"StartTime":193934.0,"Position":374.5,"HyperDash":false},{"StartTime":194025.0,"Position":332.0,"HyperDash":false}]},{"StartTime":194208.0,"Objects":[{"StartTime":194208.0,"Position":156.0,"HyperDash":false},{"StartTime":194280.0,"Position":194.812149,"HyperDash":false},{"StartTime":194389.0,"Position":241.0,"HyperDash":false}]},{"StartTime":194571.0,"Objects":[{"StartTime":194571.0,"Position":328.0,"HyperDash":false}]},{"StartTime":194753.0,"Objects":[{"StartTime":194753.0,"Position":236.0,"HyperDash":false}]},{"StartTime":194935.0,"Objects":[{"StartTime":194935.0,"Position":416.0,"HyperDash":false},{"StartTime":195007.0,"Position":430.0,"HyperDash":false},{"StartTime":195116.0,"Position":416.0,"HyperDash":false}]},{"StartTime":195299.0,"Objects":[{"StartTime":195299.0,"Position":160.0,"HyperDash":false},{"StartTime":195389.0,"Position":112.851242,"HyperDash":false},{"StartTime":195480.0,"Position":76.0,"HyperDash":false},{"StartTime":195553.0,"Position":72.0,"HyperDash":false},{"StartTime":195662.0,"Position":76.0,"HyperDash":false}]},{"StartTime":195844.0,"Objects":[{"StartTime":195844.0,"Position":164.0,"HyperDash":false},{"StartTime":195934.0,"Position":224.148758,"HyperDash":false},{"StartTime":196025.0,"Position":248.765839,"HyperDash":false},{"StartTime":196098.0,"Position":284.953156,"HyperDash":false},{"StartTime":196207.0,"Position":334.0,"HyperDash":false}]},{"StartTime":196389.0,"Objects":[{"StartTime":196389.0,"Position":240.0,"HyperDash":false},{"StartTime":196461.0,"Position":232.0,"HyperDash":false},{"StartTime":196570.0,"Position":240.0,"HyperDash":false}]},{"StartTime":196753.0,"Objects":[{"StartTime":196753.0,"Position":420.0,"HyperDash":false},{"StartTime":196825.0,"Position":435.0,"HyperDash":false},{"StartTime":196934.0,"Position":420.0,"HyperDash":false}]},{"StartTime":197026.0,"Objects":[{"StartTime":197026.0,"Position":372.0,"HyperDash":false}]},{"StartTime":197117.0,"Objects":[{"StartTime":197117.0,"Position":324.0,"HyperDash":false},{"StartTime":197189.0,"Position":282.187836,"HyperDash":false},{"StartTime":197298.0,"Position":239.0,"HyperDash":false}]},{"StartTime":197480.0,"Objects":[{"StartTime":197480.0,"Position":332.0,"HyperDash":false},{"StartTime":197552.0,"Position":346.0,"HyperDash":false},{"StartTime":197661.0,"Position":332.0,"HyperDash":false}]},{"StartTime":197844.0,"Objects":[{"StartTime":197844.0,"Position":152.0,"HyperDash":false},{"StartTime":197934.0,"Position":109.5,"HyperDash":false},{"StartTime":198025.0,"Position":152.0,"HyperDash":false}]},{"StartTime":198208.0,"Objects":[{"StartTime":198208.0,"Position":328.0,"HyperDash":false},{"StartTime":198298.0,"Position":387.148743,"HyperDash":false},{"StartTime":198389.0,"Position":412.765839,"HyperDash":false},{"StartTime":198462.0,"Position":458.953156,"HyperDash":false},{"StartTime":198571.0,"Position":498.0,"HyperDash":false}]},{"StartTime":198753.0,"Objects":[{"StartTime":198753.0,"Position":412.0,"HyperDash":false}]},{"StartTime":198935.0,"Objects":[{"StartTime":198935.0,"Position":236.0,"HyperDash":false},{"StartTime":199007.0,"Position":253.0,"HyperDash":false},{"StartTime":199116.0,"Position":236.0,"HyperDash":false}]},{"StartTime":199298.0,"Objects":[{"StartTime":199298.0,"Position":328.0,"HyperDash":false},{"StartTime":199370.0,"Position":276.187836,"HyperDash":false},{"StartTime":199479.0,"Position":243.0,"HyperDash":false}]},{"StartTime":199662.0,"Objects":[{"StartTime":199662.0,"Position":64.0,"HyperDash":false},{"StartTime":199734.0,"Position":66.0,"HyperDash":false},{"StartTime":199843.0,"Position":64.0,"HyperDash":false}]},{"StartTime":200026.0,"Objects":[{"StartTime":200026.0,"Position":160.0,"HyperDash":false}]},{"StartTime":200116.0,"Objects":[{"StartTime":200116.0,"Position":112.0,"HyperDash":false}]},{"StartTime":200207.0,"Objects":[{"StartTime":200207.0,"Position":64.0,"HyperDash":false}]},{"StartTime":200390.0,"Objects":[{"StartTime":200390.0,"Position":240.0,"HyperDash":false},{"StartTime":200462.0,"Position":232.0,"HyperDash":false},{"StartTime":200571.0,"Position":240.0,"HyperDash":false}]},{"StartTime":200753.0,"Objects":[{"StartTime":200753.0,"Position":416.0,"HyperDash":false},{"StartTime":200825.0,"Position":438.812164,"HyperDash":false},{"StartTime":200934.0,"Position":501.0,"HyperDash":true}]},{"StartTime":201117.0,"Objects":[{"StartTime":201117.0,"Position":240.0,"HyperDash":false},{"StartTime":201207.0,"Position":198.4215,"HyperDash":false},{"StartTime":201298.0,"Position":138.280991,"HyperDash":false},{"StartTime":201371.0,"Position":113.25621,"HyperDash":false},{"StartTime":201480.0,"Position":36.0,"HyperDash":false}]},{"StartTime":201662.0,"Objects":[{"StartTime":201662.0,"Position":128.0,"HyperDash":false},{"StartTime":201752.0,"Position":185.148758,"HyperDash":false},{"StartTime":201843.0,"Position":212.765839,"HyperDash":false},{"StartTime":201916.0,"Position":198.0,"HyperDash":false},{"StartTime":202025.0,"Position":216.0,"HyperDash":false}]},{"StartTime":202208.0,"Objects":[{"StartTime":202208.0,"Position":40.0,"HyperDash":false},{"StartTime":202280.0,"Position":56.0,"HyperDash":false},{"StartTime":202389.0,"Position":40.0,"HyperDash":false}]},{"StartTime":202571.0,"Objects":[{"StartTime":202571.0,"Position":216.0,"HyperDash":false},{"StartTime":202643.0,"Position":263.812134,"HyperDash":false},{"StartTime":202752.0,"Position":301.0,"HyperDash":false}]},{"StartTime":202844.0,"Objects":[{"StartTime":202844.0,"Position":348.0,"HyperDash":false}]},{"StartTime":202935.0,"Objects":[{"StartTime":202935.0,"Position":396.0,"HyperDash":false},{"StartTime":203007.0,"Position":411.0,"HyperDash":false},{"StartTime":203116.0,"Position":396.0,"HyperDash":false}]},{"StartTime":203299.0,"Objects":[{"StartTime":203299.0,"Position":492.0,"HyperDash":false},{"StartTime":203371.0,"Position":454.187836,"HyperDash":false},{"StartTime":203480.0,"Position":407.0,"HyperDash":false}]},{"StartTime":203662.0,"Objects":[{"StartTime":203662.0,"Position":232.0,"HyperDash":false},{"StartTime":203734.0,"Position":231.0,"HyperDash":false},{"StartTime":203843.0,"Position":232.0,"HyperDash":false}]},{"StartTime":204026.0,"Objects":[{"StartTime":204026.0,"Position":408.0,"HyperDash":false},{"StartTime":204116.0,"Position":436.148743,"HyperDash":false},{"StartTime":204207.0,"Position":493.0,"HyperDash":false},{"StartTime":204280.0,"Position":447.046844,"HyperDash":false},{"StartTime":204389.0,"Position":408.0,"HyperDash":false}]},{"StartTime":204571.0,"Objects":[{"StartTime":204571.0,"Position":316.0,"HyperDash":false},{"StartTime":204661.0,"Position":377.148743,"HyperDash":false},{"StartTime":204752.0,"Position":400.765839,"HyperDash":false},{"StartTime":204825.0,"Position":421.953156,"HyperDash":false},{"StartTime":204934.0,"Position":486.0,"HyperDash":false}]},{"StartTime":205117.0,"Objects":[{"StartTime":205117.0,"Position":308.0,"HyperDash":false},{"StartTime":205189.0,"Position":279.187836,"HyperDash":false},{"StartTime":205298.0,"Position":223.0,"HyperDash":false}]},{"StartTime":205480.0,"Objects":[{"StartTime":205480.0,"Position":48.0,"HyperDash":false},{"StartTime":205552.0,"Position":51.0,"HyperDash":false},{"StartTime":205661.0,"Position":48.0,"HyperDash":false}]},{"StartTime":205844.0,"Objects":[{"StartTime":205844.0,"Position":224.0,"HyperDash":false},{"StartTime":205916.0,"Position":246.812164,"HyperDash":false},{"StartTime":206025.0,"Position":309.0,"HyperDash":false}]},{"StartTime":206208.0,"Objects":[{"StartTime":206208.0,"Position":216.0,"HyperDash":false}]},{"StartTime":206390.0,"Objects":[{"StartTime":206390.0,"Position":320.0,"HyperDash":false}]},{"StartTime":206571.0,"Objects":[{"StartTime":206571.0,"Position":144.0,"HyperDash":false},{"StartTime":206643.0,"Position":107.187851,"HyperDash":false},{"StartTime":206752.0,"Position":59.0,"HyperDash":true}]},{"StartTime":206935.0,"Objects":[{"StartTime":206935.0,"Position":320.0,"HyperDash":false},{"StartTime":207007.0,"Position":361.812164,"HyperDash":false},{"StartTime":207116.0,"Position":405.0,"HyperDash":false}]},{"StartTime":207208.0,"Objects":[{"StartTime":207208.0,"Position":405.0,"HyperDash":false}]},{"StartTime":207299.0,"Objects":[{"StartTime":207299.0,"Position":405.0,"HyperDash":false}]},{"StartTime":207480.0,"Objects":[{"StartTime":207480.0,"Position":312.0,"HyperDash":false},{"StartTime":207570.0,"Position":265.367828,"HyperDash":false},{"StartTime":207661.0,"Position":263.844818,"HyperDash":false},{"StartTime":207734.0,"Position":266.8324,"HyperDash":false},{"StartTime":207843.0,"Position":312.8251,"HyperDash":false}]},{"StartTime":208026.0,"Objects":[{"StartTime":208026.0,"Position":488.0,"HyperDash":false},{"StartTime":208098.0,"Position":506.0,"HyperDash":false},{"StartTime":208207.0,"Position":488.0,"HyperDash":false}]},{"StartTime":208390.0,"Objects":[{"StartTime":208390.0,"Position":308.0,"HyperDash":false},{"StartTime":208462.0,"Position":292.187836,"HyperDash":false},{"StartTime":208571.0,"Position":223.0,"HyperDash":false}]},{"StartTime":208753.0,"Objects":[{"StartTime":208753.0,"Position":404.0,"HyperDash":false},{"StartTime":208825.0,"Position":411.0,"HyperDash":false},{"StartTime":208934.0,"Position":404.0,"HyperDash":false}]},{"StartTime":209117.0,"Objects":[{"StartTime":209117.0,"Position":308.0,"HyperDash":false}]},{"StartTime":209299.0,"Objects":[{"StartTime":209299.0,"Position":392.0,"HyperDash":false}]},{"StartTime":209480.0,"Objects":[{"StartTime":209480.0,"Position":216.0,"HyperDash":false},{"StartTime":209552.0,"Position":192.187851,"HyperDash":false},{"StartTime":209661.0,"Position":131.0,"HyperDash":false}]},{"StartTime":209844.0,"Objects":[{"StartTime":209844.0,"Position":308.0,"HyperDash":false},{"StartTime":209916.0,"Position":293.0,"HyperDash":false},{"StartTime":210025.0,"Position":308.0,"HyperDash":false}]},{"StartTime":210117.0,"Objects":[{"StartTime":210117.0,"Position":264.0,"HyperDash":false}]},{"StartTime":210208.0,"Objects":[{"StartTime":210208.0,"Position":220.0,"HyperDash":false}]},{"StartTime":210390.0,"Objects":[{"StartTime":210390.0,"Position":308.0,"HyperDash":false},{"StartTime":210480.0,"Position":347.148743,"HyperDash":false},{"StartTime":210571.0,"Position":392.765839,"HyperDash":false},{"StartTime":210644.0,"Position":414.953156,"HyperDash":false},{"StartTime":210753.0,"Position":478.0,"HyperDash":false}]},{"StartTime":210935.0,"Objects":[{"StartTime":210935.0,"Position":296.0,"HyperDash":false},{"StartTime":211007.0,"Position":313.0,"HyperDash":false},{"StartTime":211116.0,"Position":296.0,"HyperDash":false}]},{"StartTime":211299.0,"Objects":[{"StartTime":211299.0,"Position":120.0,"HyperDash":false}]},{"StartTime":211389.0,"Objects":[{"StartTime":211389.0,"Position":120.0,"HyperDash":false}]},{"StartTime":211480.0,"Objects":[{"StartTime":211480.0,"Position":120.0,"HyperDash":false}]},{"StartTime":211662.0,"Objects":[{"StartTime":211662.0,"Position":296.0,"HyperDash":false},{"StartTime":211734.0,"Position":276.187836,"HyperDash":false},{"StartTime":211843.0,"Position":211.0,"HyperDash":false}]},{"StartTime":212026.0,"Objects":[{"StartTime":212026.0,"Position":120.0,"HyperDash":false},{"StartTime":212098.0,"Position":122.0,"HyperDash":false},{"StartTime":212207.0,"Position":120.0,"HyperDash":false}]},{"StartTime":212390.0,"Objects":[{"StartTime":212390.0,"Position":296.0,"HyperDash":false}]},{"StartTime":212571.0,"Objects":[{"StartTime":212571.0,"Position":196.0,"HyperDash":true}]},{"StartTime":212753.0,"Objects":[{"StartTime":212753.0,"Position":456.0,"HyperDash":false},{"StartTime":212825.0,"Position":465.0,"HyperDash":false},{"StartTime":212934.0,"Position":456.0,"HyperDash":false}]},{"StartTime":213117.0,"Objects":[{"StartTime":213117.0,"Position":276.0,"HyperDash":false},{"StartTime":213189.0,"Position":223.187851,"HyperDash":false},{"StartTime":213298.0,"Position":191.0,"HyperDash":false}]},{"StartTime":213480.0,"Objects":[{"StartTime":213480.0,"Position":284.0,"HyperDash":false},{"StartTime":213552.0,"Position":282.0,"HyperDash":false},{"StartTime":213661.0,"Position":284.0,"HyperDash":false}]},{"StartTime":213844.0,"Objects":[{"StartTime":213844.0,"Position":104.0,"HyperDash":false},{"StartTime":213916.0,"Position":147.812149,"HyperDash":false},{"StartTime":214025.0,"Position":189.0,"HyperDash":true}]},{"StartTime":214208.0,"Objects":[{"StartTime":214208.0,"Position":448.0,"HyperDash":false},{"StartTime":214280.0,"Position":454.0,"HyperDash":false},{"StartTime":214389.0,"Position":448.0,"HyperDash":false}]},{"StartTime":214480.0,"Objects":[{"StartTime":214480.0,"Position":400.0,"HyperDash":false}]},{"StartTime":214571.0,"Objects":[{"StartTime":214571.0,"Position":352.0,"HyperDash":false}]},{"StartTime":214753.0,"Objects":[{"StartTime":214753.0,"Position":448.0,"HyperDash":false}]},{"StartTime":214935.0,"Objects":[{"StartTime":214935.0,"Position":272.0,"HyperDash":false},{"StartTime":215007.0,"Position":280.0,"HyperDash":false},{"StartTime":215116.0,"Position":272.0,"HyperDash":false}]},{"StartTime":215299.0,"Objects":[{"StartTime":215299.0,"Position":96.0,"HyperDash":false},{"StartTime":215371.0,"Position":74.18785,"HyperDash":false},{"StartTime":215480.0,"Position":11.0,"HyperDash":true}]},{"StartTime":215662.0,"Objects":[{"StartTime":215662.0,"Position":272.0,"HyperDash":false},{"StartTime":215734.0,"Position":321.812164,"HyperDash":false},{"StartTime":215843.0,"Position":357.0,"HyperDash":false}]},{"StartTime":216026.0,"Objects":[{"StartTime":216026.0,"Position":180.0,"HyperDash":false},{"StartTime":216098.0,"Position":185.0,"HyperDash":false},{"StartTime":216207.0,"Position":180.0,"HyperDash":false}]},{"StartTime":216390.0,"Objects":[{"StartTime":216390.0,"Position":356.0,"HyperDash":false}]},{"StartTime":216571.0,"Objects":[{"StartTime":216571.0,"Position":256.0,"HyperDash":false}]},{"StartTime":216753.0,"Objects":[{"StartTime":216753.0,"Position":436.0,"HyperDash":false},{"StartTime":216825.0,"Position":411.187836,"HyperDash":false},{"StartTime":216934.0,"Position":351.0,"HyperDash":false}]},{"StartTime":217117.0,"Objects":[{"StartTime":217117.0,"Position":96.0,"HyperDash":false},{"StartTime":217207.0,"Position":60.8512421,"HyperDash":false},{"StartTime":217298.0,"Position":12.7658386,"HyperDash":false},{"StartTime":217371.0,"Position":64.95316,"HyperDash":false},{"StartTime":217480.0,"Position":98.0,"HyperDash":false}]},{"StartTime":217662.0,"Objects":[{"StartTime":217662.0,"Position":276.0,"HyperDash":false},{"StartTime":217752.0,"Position":324.148743,"HyperDash":false},{"StartTime":217843.0,"Position":361.0,"HyperDash":false},{"StartTime":217916.0,"Position":327.046844,"HyperDash":false},{"StartTime":218025.0,"Position":276.0,"HyperDash":false}]},{"StartTime":218208.0,"Objects":[{"StartTime":218208.0,"Position":98.0,"HyperDash":false},{"StartTime":218280.0,"Position":87.0,"HyperDash":false},{"StartTime":218389.0,"Position":98.0,"HyperDash":true}]},{"StartTime":218571.0,"Objects":[{"StartTime":218571.0,"Position":360.0,"HyperDash":false},{"StartTime":218661.0,"Position":414.2143,"HyperDash":false},{"StartTime":218752.0,"Position":412.42868,"HyperDash":false},{"StartTime":218825.0,"Position":397.238861,"HyperDash":false},{"StartTime":218934.0,"Position":359.061737,"HyperDash":false}]},{"StartTime":219026.0,"Objects":[{"StartTime":219026.0,"Position":312.0,"HyperDash":false}]},{"StartTime":219117.0,"Objects":[{"StartTime":219117.0,"Position":264.0,"HyperDash":false}]},{"StartTime":219299.0,"Objects":[{"StartTime":219299.0,"Position":88.0,"HyperDash":false},{"StartTime":219371.0,"Position":104.812149,"HyperDash":false},{"StartTime":219480.0,"Position":173.0,"HyperDash":false}]},{"StartTime":219662.0,"Objects":[{"StartTime":219662.0,"Position":268.0,"HyperDash":false},{"StartTime":219734.0,"Position":274.0,"HyperDash":false},{"StartTime":219843.0,"Position":268.0,"HyperDash":false}]},{"StartTime":220026.0,"Objects":[{"StartTime":220026.0,"Position":88.0,"HyperDash":false},{"StartTime":220098.0,"Position":105.0,"HyperDash":false},{"StartTime":220207.0,"Position":88.0,"HyperDash":false}]},{"StartTime":220390.0,"Objects":[{"StartTime":220390.0,"Position":268.0,"HyperDash":false}]},{"StartTime":220571.0,"Objects":[{"StartTime":220571.0,"Position":180.0,"HyperDash":false}]},{"StartTime":220753.0,"Objects":[{"StartTime":220753.0,"Position":436.0,"HyperDash":false},{"StartTime":220825.0,"Position":425.0,"HyperDash":false},{"StartTime":220934.0,"Position":436.0,"HyperDash":false}]},{"StartTime":221117.0,"Objects":[{"StartTime":221117.0,"Position":260.0,"HyperDash":false},{"StartTime":221189.0,"Position":241.187851,"HyperDash":false},{"StartTime":221298.0,"Position":175.0,"HyperDash":true}]},{"StartTime":221480.0,"Objects":[{"StartTime":221480.0,"Position":436.0,"HyperDash":false},{"StartTime":221552.0,"Position":398.187836,"HyperDash":false},{"StartTime":221661.0,"Position":351.0,"HyperDash":false}]},{"StartTime":221753.0,"Objects":[{"StartTime":221753.0,"Position":308.0,"HyperDash":false}]},{"StartTime":221844.0,"Objects":[{"StartTime":221844.0,"Position":264.0,"HyperDash":false}]},{"StartTime":222026.0,"Objects":[{"StartTime":222026.0,"Position":356.0,"HyperDash":false}]},{"StartTime":222208.0,"Objects":[{"StartTime":222208.0,"Position":100.0,"HyperDash":false},{"StartTime":222280.0,"Position":74.18785,"HyperDash":false},{"StartTime":222389.0,"Position":15.0,"HyperDash":false}]},{"StartTime":222571.0,"Objects":[{"StartTime":222571.0,"Position":108.0,"HyperDash":false},{"StartTime":222643.0,"Position":119.0,"HyperDash":false},{"StartTime":222752.0,"Position":108.0,"HyperDash":true}]},{"StartTime":222935.0,"Objects":[{"StartTime":222935.0,"Position":368.0,"HyperDash":false},{"StartTime":223025.0,"Position":410.5,"HyperDash":false},{"StartTime":223116.0,"Position":368.0,"HyperDash":false}]},{"StartTime":223299.0,"Objects":[{"StartTime":223299.0,"Position":188.0,"HyperDash":false}]},{"StartTime":223480.0,"Objects":[{"StartTime":223480.0,"Position":280.0,"HyperDash":false}]},{"StartTime":223571.0,"Objects":[{"StartTime":223571.0,"Position":328.0,"HyperDash":false}]},{"StartTime":223662.0,"Objects":[{"StartTime":223662.0,"Position":376.0,"HyperDash":false},{"StartTime":223734.0,"Position":377.0,"HyperDash":false},{"StartTime":223843.0,"Position":376.0,"HyperDash":false}]},{"StartTime":224026.0,"Objects":[{"StartTime":224026.0,"Position":196.0,"HyperDash":false},{"StartTime":224098.0,"Position":161.187851,"HyperDash":false},{"StartTime":224207.0,"Position":111.0,"HyperDash":true}]},{"StartTime":224390.0,"Objects":[{"StartTime":224390.0,"Position":376.0,"HyperDash":false},{"StartTime":224480.0,"Position":398.812927,"HyperDash":false},{"StartTime":224571.0,"Position":435.886963,"HyperDash":false},{"StartTime":224644.0,"Position":405.66272,"HyperDash":false},{"StartTime":224753.0,"Position":375.3338,"HyperDash":false}]},{"StartTime":225117.0,"Objects":[{"StartTime":225117.0,"Position":96.0,"HyperDash":false},{"StartTime":225189.0,"Position":107.0,"HyperDash":false},{"StartTime":225298.0,"Position":96.0,"HyperDash":false}]},{"StartTime":225480.0,"Objects":[{"StartTime":225480.0,"Position":180.0,"HyperDash":false}]},{"StartTime":225662.0,"Objects":[{"StartTime":225662.0,"Position":356.0,"HyperDash":false}]},{"StartTime":225753.0,"Objects":[{"StartTime":225753.0,"Position":400.0,"HyperDash":false}]},{"StartTime":225844.0,"Objects":[{"StartTime":225844.0,"Position":444.0,"HyperDash":false},{"StartTime":225916.0,"Position":453.0,"HyperDash":false},{"StartTime":226025.0,"Position":444.0,"HyperDash":false}]},{"StartTime":226208.0,"Objects":[{"StartTime":226208.0,"Position":360.0,"HyperDash":false},{"StartTime":226280.0,"Position":323.187836,"HyperDash":false},{"StartTime":226389.0,"Position":275.0,"HyperDash":false}]},{"StartTime":226571.0,"Objects":[{"StartTime":226571.0,"Position":96.0,"HyperDash":false},{"StartTime":226643.0,"Position":104.0,"HyperDash":false},{"StartTime":226752.0,"Position":96.0,"HyperDash":false}]},{"StartTime":226935.0,"Objects":[{"StartTime":226935.0,"Position":181.0,"HyperDash":false},{"StartTime":227007.0,"Position":146.187851,"HyperDash":false},{"StartTime":227116.0,"Position":96.0,"HyperDash":false}]},{"StartTime":227299.0,"Objects":[{"StartTime":227299.0,"Position":276.0,"HyperDash":false},{"StartTime":227389.0,"Position":322.148743,"HyperDash":false},{"StartTime":227480.0,"Position":360.0,"HyperDash":false},{"StartTime":227553.0,"Position":357.0,"HyperDash":false},{"StartTime":227662.0,"Position":360.0,"HyperDash":false}]},{"StartTime":227844.0,"Objects":[{"StartTime":227844.0,"Position":276.0,"HyperDash":false}]},{"StartTime":228026.0,"Objects":[{"StartTime":228026.0,"Position":96.0,"HyperDash":false},{"StartTime":228098.0,"Position":82.0,"HyperDash":false},{"StartTime":228207.0,"Position":96.0,"HyperDash":false}]},{"StartTime":228390.0,"Objects":[{"StartTime":228390.0,"Position":180.0,"HyperDash":false},{"StartTime":228462.0,"Position":193.0,"HyperDash":false},{"StartTime":228571.0,"Position":180.0,"HyperDash":false}]},{"StartTime":228753.0,"Objects":[{"StartTime":228753.0,"Position":356.0,"HyperDash":false}]},{"StartTime":228935.0,"Objects":[{"StartTime":228935.0,"Position":440.0,"HyperDash":false}]},{"StartTime":229117.0,"Objects":[{"StartTime":229117.0,"Position":440.0,"HyperDash":false}]},{"StartTime":229299.0,"Objects":[{"StartTime":229299.0,"Position":356.0,"HyperDash":false}]},{"StartTime":229480.0,"Objects":[{"StartTime":229480.0,"Position":176.0,"HyperDash":false},{"StartTime":229552.0,"Position":177.0,"HyperDash":false},{"StartTime":229661.0,"Position":176.0,"HyperDash":false}]},{"StartTime":229844.0,"Objects":[{"StartTime":229844.0,"Position":264.0,"HyperDash":false}]},{"StartTime":229934.0,"Objects":[{"StartTime":229934.0,"Position":310.0,"HyperDash":false}]},{"StartTime":230025.0,"Objects":[{"StartTime":230025.0,"Position":356.0,"HyperDash":false}]},{"StartTime":230208.0,"Objects":[{"StartTime":230208.0,"Position":176.0,"HyperDash":false},{"StartTime":230298.0,"Position":147.851242,"HyperDash":false},{"StartTime":230389.0,"Position":91.23416,"HyperDash":false},{"StartTime":230462.0,"Position":41.0468369,"HyperDash":false},{"StartTime":230571.0,"Position":6.0,"HyperDash":false}]},{"StartTime":230753.0,"Objects":[{"StartTime":230753.0,"Position":92.0,"HyperDash":false}]},{"StartTime":230935.0,"Objects":[{"StartTime":230935.0,"Position":268.0,"HyperDash":false},{"StartTime":231007.0,"Position":314.812164,"HyperDash":false},{"StartTime":231116.0,"Position":353.0,"HyperDash":false}]},{"StartTime":231299.0,"Objects":[{"StartTime":231299.0,"Position":260.0,"HyperDash":false},{"StartTime":231371.0,"Position":259.0,"HyperDash":false},{"StartTime":231480.0,"Position":260.0,"HyperDash":false}]},{"StartTime":231571.0,"Objects":[{"StartTime":231571.0,"Position":308.0,"HyperDash":false}]},{"StartTime":231662.0,"Objects":[{"StartTime":231662.0,"Position":356.0,"HyperDash":false},{"StartTime":231752.0,"Position":386.148743,"HyperDash":false},{"StartTime":231843.0,"Position":440.0,"HyperDash":false},{"StartTime":231916.0,"Position":455.0,"HyperDash":false},{"StartTime":232025.0,"Position":440.0,"HyperDash":false}]},{"StartTime":232208.0,"Objects":[{"StartTime":232208.0,"Position":356.0,"HyperDash":false}]},{"StartTime":232390.0,"Objects":[{"StartTime":232390.0,"Position":180.0,"HyperDash":false},{"StartTime":232462.0,"Position":176.0,"HyperDash":false},{"StartTime":232571.0,"Position":180.0,"HyperDash":false}]},{"StartTime":232753.0,"Objects":[{"StartTime":232753.0,"Position":272.0,"HyperDash":false},{"StartTime":232843.0,"Position":272.0,"HyperDash":false},{"StartTime":232934.0,"Position":272.0,"HyperDash":false}]},{"StartTime":233117.0,"Objects":[{"StartTime":233117.0,"Position":92.0,"HyperDash":false},{"StartTime":233207.0,"Position":62.53518,"HyperDash":false},{"StartTime":233298.0,"Position":40.0084,"HyperDash":false},{"StartTime":233371.0,"Position":54.41962,"HyperDash":false},{"StartTime":233480.0,"Position":88.82208,"HyperDash":false}]},{"StartTime":233662.0,"Objects":[{"StartTime":233662.0,"Position":172.0,"HyperDash":false}]},{"StartTime":233844.0,"Objects":[{"StartTime":233844.0,"Position":352.0,"HyperDash":false},{"StartTime":233916.0,"Position":341.0,"HyperDash":false},{"StartTime":234025.0,"Position":352.0,"HyperDash":false}]},{"StartTime":234208.0,"Objects":[{"StartTime":234208.0,"Position":268.0,"HyperDash":false}]},{"StartTime":234390.0,"Objects":[{"StartTime":234390.0,"Position":360.0,"HyperDash":false}]},{"StartTime":234571.0,"Objects":[{"StartTime":234571.0,"Position":172.0,"HyperDash":false},{"StartTime":234661.0,"Position":172.0,"HyperDash":false},{"StartTime":234752.0,"Position":172.0,"HyperDash":false}]},{"StartTime":234935.0,"Objects":[{"StartTime":234935.0,"Position":268.0,"HyperDash":false},{"StartTime":235007.0,"Position":228.187851,"HyperDash":false},{"StartTime":235116.0,"Position":183.0,"HyperDash":false}]},{"StartTime":235298.0,"Objects":[{"StartTime":235298.0,"Position":364.0,"HyperDash":false},{"StartTime":235370.0,"Position":353.0,"HyperDash":false},{"StartTime":235479.0,"Position":364.0,"HyperDash":false}]},{"StartTime":235662.0,"Objects":[{"StartTime":235662.0,"Position":183.0,"HyperDash":false}]},{"StartTime":235752.0,"Objects":[{"StartTime":235752.0,"Position":140.0,"HyperDash":false}]},{"StartTime":235843.0,"Objects":[{"StartTime":235843.0,"Position":98.0,"HyperDash":true}]},{"StartTime":236026.0,"Objects":[{"StartTime":236026.0,"Position":376.0,"HyperDash":false}]},{"StartTime":236390.0,"Objects":[{"StartTime":236390.0,"Position":224.0,"HyperDash":false}]},{"StartTime":236753.0,"Objects":[{"StartTime":236753.0,"Position":496.0,"HyperDash":false},{"StartTime":236843.0,"Position":487.0,"HyperDash":false},{"StartTime":236934.0,"Position":496.0,"HyperDash":false},{"StartTime":237007.0,"Position":494.0,"HyperDash":false},{"StartTime":237116.0,"Position":496.0,"HyperDash":false}]},{"StartTime":237480.0,"Objects":[{"StartTime":237480.0,"Position":266.0,"HyperDash":false},{"StartTime":237548.0,"Position":100.0,"HyperDash":false},{"StartTime":237616.0,"Position":57.0,"HyperDash":false},{"StartTime":237684.0,"Position":199.0,"HyperDash":false},{"StartTime":237752.0,"Position":129.0,"HyperDash":false},{"StartTime":237820.0,"Position":232.0,"HyperDash":false},{"StartTime":237889.0,"Position":464.0,"HyperDash":false},{"StartTime":237957.0,"Position":364.0,"HyperDash":false},{"StartTime":238025.0,"Position":170.0,"HyperDash":false},{"StartTime":238093.0,"Position":496.0,"HyperDash":false},{"StartTime":238161.0,"Position":27.0,"HyperDash":false},{"StartTime":238230.0,"Position":477.0,"HyperDash":false},{"StartTime":238298.0,"Position":163.0,"HyperDash":false},{"StartTime":238366.0,"Position":260.0,"HyperDash":false},{"StartTime":238434.0,"Position":253.0,"HyperDash":false},{"StartTime":238502.0,"Position":423.0,"HyperDash":false},{"StartTime":238571.0,"Position":367.0,"HyperDash":false}]},{"StartTime":238935.0,"Objects":[{"StartTime":238935.0,"Position":256.0,"HyperDash":false},{"StartTime":239025.0,"Position":247.0,"HyperDash":false},{"StartTime":239116.0,"Position":256.0,"HyperDash":false},{"StartTime":239189.0,"Position":240.0,"HyperDash":false},{"StartTime":239298.0,"Position":256.0,"HyperDash":false}]},{"StartTime":239662.0,"Objects":[{"StartTime":239662.0,"Position":78.0,"HyperDash":false},{"StartTime":239713.0,"Position":446.0,"HyperDash":false},{"StartTime":239764.0,"Position":99.0,"HyperDash":false},{"StartTime":239815.0,"Position":155.0,"HyperDash":false},{"StartTime":239866.0,"Position":322.0,"HyperDash":false},{"StartTime":239917.0,"Position":261.0,"HyperDash":false},{"StartTime":239968.0,"Position":22.0,"HyperDash":false},{"StartTime":240019.0,"Position":481.0,"HyperDash":false},{"StartTime":240071.0,"Position":103.0,"HyperDash":false},{"StartTime":240122.0,"Position":316.0,"HyperDash":false},{"StartTime":240173.0,"Position":175.0,"HyperDash":false},{"StartTime":240224.0,"Position":48.0,"HyperDash":false},{"StartTime":240275.0,"Position":307.0,"HyperDash":false},{"StartTime":240326.0,"Position":375.0,"HyperDash":false},{"StartTime":240377.0,"Position":149.0,"HyperDash":false},{"StartTime":240429.0,"Position":250.0,"HyperDash":false},{"StartTime":240480.0,"Position":142.0,"HyperDash":false},{"StartTime":240531.0,"Position":170.0,"HyperDash":false},{"StartTime":240582.0,"Position":281.0,"HyperDash":false},{"StartTime":240633.0,"Position":444.0,"HyperDash":false},{"StartTime":240684.0,"Position":414.0,"HyperDash":false},{"StartTime":240735.0,"Position":321.0,"HyperDash":false},{"StartTime":240787.0,"Position":328.0,"HyperDash":false},{"StartTime":240838.0,"Position":32.0,"HyperDash":false},{"StartTime":240889.0,"Position":259.0,"HyperDash":false},{"StartTime":240940.0,"Position":169.0,"HyperDash":false},{"StartTime":240991.0,"Position":207.0,"HyperDash":false},{"StartTime":241042.0,"Position":464.0,"HyperDash":false},{"StartTime":241093.0,"Position":192.0,"HyperDash":false},{"StartTime":241145.0,"Position":317.0,"HyperDash":false},{"StartTime":241196.0,"Position":376.0,"HyperDash":false},{"StartTime":241247.0,"Position":100.0,"HyperDash":false},{"StartTime":241298.0,"Position":70.0,"HyperDash":false},{"StartTime":241349.0,"Position":287.0,"HyperDash":false},{"StartTime":241400.0,"Position":468.0,"HyperDash":false},{"StartTime":241451.0,"Position":58.0,"HyperDash":false},{"StartTime":241503.0,"Position":352.0,"HyperDash":false},{"StartTime":241554.0,"Position":305.0,"HyperDash":false},{"StartTime":241605.0,"Position":177.0,"HyperDash":false},{"StartTime":241656.0,"Position":414.0,"HyperDash":false},{"StartTime":241707.0,"Position":182.0,"HyperDash":false},{"StartTime":241758.0,"Position":174.0,"HyperDash":false},{"StartTime":241809.0,"Position":89.0,"HyperDash":false},{"StartTime":241861.0,"Position":254.0,"HyperDash":false},{"StartTime":241912.0,"Position":320.0,"HyperDash":false},{"StartTime":241963.0,"Position":406.0,"HyperDash":false},{"StartTime":242014.0,"Position":182.0,"HyperDash":false},{"StartTime":242065.0,"Position":301.0,"HyperDash":false},{"StartTime":242116.0,"Position":169.0,"HyperDash":false},{"StartTime":242167.0,"Position":470.0,"HyperDash":false},{"StartTime":242219.0,"Position":278.0,"HyperDash":false},{"StartTime":242270.0,"Position":146.0,"HyperDash":false},{"StartTime":242321.0,"Position":480.0,"HyperDash":false},{"StartTime":242372.0,"Position":41.0,"HyperDash":false},{"StartTime":242423.0,"Position":51.0,"HyperDash":false},{"StartTime":242474.0,"Position":295.0,"HyperDash":false},{"StartTime":242525.0,"Position":145.0,"HyperDash":false},{"StartTime":242577.0,"Position":237.0,"HyperDash":false},{"StartTime":242628.0,"Position":152.0,"HyperDash":false},{"StartTime":242679.0,"Position":500.0,"HyperDash":false},{"StartTime":242730.0,"Position":278.0,"HyperDash":false},{"StartTime":242781.0,"Position":174.0,"HyperDash":false},{"StartTime":242832.0,"Position":92.0,"HyperDash":false},{"StartTime":242883.0,"Position":248.0,"HyperDash":false},{"StartTime":242935.0,"Position":284.0,"HyperDash":false},{"StartTime":242986.0,"Position":296.0,"HyperDash":false},{"StartTime":243037.0,"Position":325.0,"HyperDash":false},{"StartTime":243088.0,"Position":116.0,"HyperDash":false},{"StartTime":243139.0,"Position":293.0,"HyperDash":false},{"StartTime":243190.0,"Position":511.0,"HyperDash":false},{"StartTime":243241.0,"Position":17.0,"HyperDash":false},{"StartTime":243292.0,"Position":64.0,"HyperDash":false},{"StartTime":243344.0,"Position":486.0,"HyperDash":false},{"StartTime":243395.0,"Position":209.0,"HyperDash":false},{"StartTime":243446.0,"Position":264.0,"HyperDash":false},{"StartTime":243497.0,"Position":47.0,"HyperDash":false},{"StartTime":243548.0,"Position":206.0,"HyperDash":false},{"StartTime":243599.0,"Position":353.0,"HyperDash":false},{"StartTime":243650.0,"Position":244.0,"HyperDash":false},{"StartTime":243702.0,"Position":157.0,"HyperDash":false},{"StartTime":243753.0,"Position":227.0,"HyperDash":false},{"StartTime":243804.0,"Position":167.0,"HyperDash":false},{"StartTime":243855.0,"Position":420.0,"HyperDash":false},{"StartTime":243906.0,"Position":103.0,"HyperDash":false},{"StartTime":243957.0,"Position":188.0,"HyperDash":false},{"StartTime":244008.0,"Position":300.0,"HyperDash":false},{"StartTime":244060.0,"Position":60.0,"HyperDash":false},{"StartTime":244111.0,"Position":120.0,"HyperDash":false},{"StartTime":244162.0,"Position":501.0,"HyperDash":false},{"StartTime":244213.0,"Position":341.0,"HyperDash":false},{"StartTime":244264.0,"Position":181.0,"HyperDash":false},{"StartTime":244315.0,"Position":337.0,"HyperDash":false},{"StartTime":244366.0,"Position":269.0,"HyperDash":false},{"StartTime":244418.0,"Position":398.0,"HyperDash":false},{"StartTime":244469.0,"Position":308.0,"HyperDash":false},{"StartTime":244520.0,"Position":323.0,"HyperDash":false},{"StartTime":244571.0,"Position":201.0,"HyperDash":false},{"StartTime":244622.0,"Position":204.0,"HyperDash":false},{"StartTime":244673.0,"Position":44.0,"HyperDash":false},{"StartTime":244724.0,"Position":217.0,"HyperDash":false},{"StartTime":244776.0,"Position":510.0,"HyperDash":false},{"StartTime":244827.0,"Position":324.0,"HyperDash":false},{"StartTime":244878.0,"Position":131.0,"HyperDash":false},{"StartTime":244929.0,"Position":13.0,"HyperDash":false},{"StartTime":244980.0,"Position":360.0,"HyperDash":false},{"StartTime":245031.0,"Position":510.0,"HyperDash":false},{"StartTime":245082.0,"Position":203.0,"HyperDash":false},{"StartTime":245134.0,"Position":416.0,"HyperDash":false},{"StartTime":245185.0,"Position":162.0,"HyperDash":false},{"StartTime":245236.0,"Position":277.0,"HyperDash":false},{"StartTime":245287.0,"Position":329.0,"HyperDash":false},{"StartTime":245338.0,"Position":357.0,"HyperDash":false},{"StartTime":245389.0,"Position":388.0,"HyperDash":false},{"StartTime":245440.0,"Position":87.0,"HyperDash":false},{"StartTime":245492.0,"Position":462.0,"HyperDash":false},{"StartTime":245543.0,"Position":357.0,"HyperDash":false},{"StartTime":245594.0,"Position":343.0,"HyperDash":false},{"StartTime":245645.0,"Position":248.0,"HyperDash":false},{"StartTime":245696.0,"Position":174.0,"HyperDash":false},{"StartTime":245747.0,"Position":112.0,"HyperDash":false},{"StartTime":245798.0,"Position":420.0,"HyperDash":false},{"StartTime":245850.0,"Position":229.0,"HyperDash":false},{"StartTime":245901.0,"Position":270.0,"HyperDash":false},{"StartTime":245952.0,"Position":3.0,"HyperDash":false},{"StartTime":246003.0,"Position":446.0,"HyperDash":false},{"StartTime":246054.0,"Position":78.0,"HyperDash":false},{"StartTime":246105.0,"Position":157.0,"HyperDash":false},{"StartTime":246156.0,"Position":344.0,"HyperDash":false},{"StartTime":246208.0,"Position":72.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3689906.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3689906.osu
new file mode 100644
index 0000000000..070143fcf1
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3689906.osu
@@ -0,0 +1,942 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:4
+CircleSize:3.2
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:1.7
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+2,125844,129844
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+390,363.636363636364,4,2,1,60,1,0
+3480,-100,4,2,2,70,0,0
+3662,-100,4,2,1,60,0,0
+4753,-100,4,2,2,50,0,0
+4935,-100,4,2,1,60,0,0
+6208,-100,4,2,3,60,0,0
+6390,-100,4,2,1,60,0,0
+9299,-100,4,2,2,70,0,0
+9480,-100,4,2,1,60,0,0
+12026,-100,4,2,3,70,0,0
+12208,-100,4,2,1,70,0,0
+23662,-83.3333333333333,4,2,3,70,0,0
+24026,-100,4,2,1,80,0,0
+26753,-100,4,2,2,80,0,0
+26935,-100,4,2,1,80,0,0
+28935,-83.3333333333333,4,2,1,80,0,0
+29480,-83.3333333333333,4,2,3,70,0,0
+30026,-100,4,2,1,70,0,0
+30935,-100,4,2,1,30,0,0
+31662,-100,4,2,1,40,0,0
+32390,-100,4,2,1,30,0,0
+32753,-100,4,2,1,40,0,0
+33117,-100,4,2,1,50,0,0
+33480,-100,4,2,1,60,0,0
+33844,-100,4,2,1,70,0,0
+34117,-100,4,2,1,40,0,0
+34208,-100,4,2,1,70,0,0
+34299,-100,4,2,1,40,0,0
+34480,-100,4,2,1,70,0,0
+34662,-100,4,2,1,40,0,0
+34753,-100,4,2,1,70,0,0
+34935,-100,4,2,77,80,0,0
+35299,-83.3333333333333,4,2,3,80,0,0
+35662,-100,4,2,1,80,0,0
+38753,-100,4,2,1,80,0,0
+39117,-100,4,2,1,80,0,0
+44026,-83.3333333333333,4,2,1,80,0,0
+44390,-100,4,2,1,80,0,0
+46208,-100,4,2,1,80,0,0
+46571,-100,4,2,77,90,0,0
+46753,-100,4,2,1,80,0,0
+46935,-100,4,2,3,80,0,0
+47117,-100,4,2,1,80,0,0
+52390,-100,4,2,1,80,0,0
+52753,-100,4,2,1,80,0,0
+55662,-100,4,2,1,85,0,0
+57117,-100,4,2,1,90,0,0
+58208,-100,4,2,77,90,0,0
+58390,-100,4,2,1,80,0,0
+58571,-100,4,2,3,90,0,1
+58753,-100,4,2,1,90,0,1
+69844,-100,4,2,1,90,0,0
+70208,-100,4,2,3,90,0,1
+70390,-100,4,2,1,90,0,1
+82935,-100,4,2,77,90,0,1
+83299,-83.3333333333333,4,2,3,80,0,0
+83662,-100,4,2,1,80,0,0
+88753,-100,4,2,1,80,0,0
+89117,-100,4,2,1,80,0,0
+94571,-100,4,2,77,80,0,0
+94753,-100,4,2,1,80,0,0
+94935,-100,4,2,3,80,0,0
+95117,-100,4,2,1,80,0,0
+106208,-100,4,2,77,80,0,0
+106571,-100,4,2,1,80,0,0
+112390,-100,4,2,77,90,0,0
+112571,-100,4,2,1,80,0,0
+117117,-100,4,2,1,40,0,0
+117480,-100,4,2,1,50,0,0
+117844,-100,4,2,1,60,0,0
+118208,-100,4,2,1,55,0,0
+118571,-100,4,2,1,65,0,0
+118935,-100,4,2,1,75,0,0
+119299,-100,4,2,1,85,0,0
+119662,-100,4,2,3,100,0,0
+120026,-100,4,2,1,30,0,0
+125480,-100,4,2,1,5,0,0
+131299,-100,4,2,4,60,0,0
+136390,-100,4,2,4,60,0,0
+137117,-100,4,2,4,70,0,0
+137480,-100,4,2,4,50,0,0
+138571,-100,4,2,4,60,0,0
+141480,-90.9090909090909,4,2,4,50,0,0
+141844,-100,4,2,4,50,0,0
+142662,-100,4,2,78,50,0,0
+143117,-100,4,2,4,60,0,0
+148753,-100,4,2,78,50,0,0
+148935,-100,4,2,4,60,0,0
+153117,-100,4,2,4,50,0,0
+154571,-100,4,2,78,50,0,0
+154753,-100,4,2,4,60,0,0
+160390,-100,4,2,3,60,0,0
+160571,-100,4,2,4,60,0,0
+163299,-100,4,2,1,30,0,0
+163480,-100,4,2,5,30,0,0
+163571,-100,4,2,1,30,0,0
+163662,-100,4,2,1,40,0,0
+163844,-100,4,2,5,40,0,0
+163935,-100,4,2,1,40,0,0
+164026,-100,4,2,1,50,0,0
+164208,-100,4,2,5,50,0,0
+164299,-100,4,2,1,50,0,0
+164390,-100,4,2,1,60,0,0
+164571,-100,4,2,5,60,0,0
+164662,-100,4,2,1,60,0,0
+164753,-100,4,2,1,70,0,0
+165117,-100,4,2,1,70,0,0
+165480,-100,4,2,1,70,0,0
+165844,-100,4,2,77,80,0,0
+166208,-100,4,2,1,80,0,0
+174571,-100,4,2,1,80,0,0
+174935,-100,4,2,1,80,0,0
+177844,-83.3333333333333,4,2,1,80,0,0
+178208,-100,4,2,1,80,0,0
+186571,-100,4,2,1,80,0,0
+187117,-100,4,2,1,80,0,0
+187480,-100,4,2,1,80,0,0
+188571,-100,4,2,1,80,0,0
+188934,-100,4,2,1,80,0,0
+189480,-83.3333333333333,4,2,3,90,0,1
+189844,-100,4,2,1,90,0,1
+194208,-100,4,2,1,90,0,1
+194571,-100,4,2,1,90,0,1
+195844,-100,4,2,1,90,0,1
+196208,-100,4,2,1,90,0,1
+200753,-100,4,2,1,90,0,1
+200935,-100,4,2,1,90,0,0
+201117,-83.3333333333333,4,2,1,90,0,1
+201480,-100,4,2,1,90,0,1
+212026,-100,4,2,77,90,0,1
+212571,-100,4,2,1,90,0,0
+212753,-100,4,2,3,90,0,1
+212935,-100,4,2,1,90,0,1
+214026,-100,4,2,5,60,0,1
+214117,-100,4,2,1,90,0,1
+215480,-100,4,2,5,60,0,1
+215571,-100,4,2,1,90,0,1
+216935,-100,4,2,5,60,0,1
+217026,-100,4,2,1,90,0,1
+218390,-100,4,2,5,60,0,1
+218481,-100,4,2,1,90,0,1
+219844,-100,4,2,5,60,0,1
+219935,-100,4,2,1,90,0,1
+221299,-100,4,2,5,60,0,1
+221390,-100,4,2,1,90,0,1
+222753,-100,4,2,5,60,0,1
+222844,-100,4,2,1,90,0,1
+224208,-100,4,2,77,90,0,1
+224390,-83.3333333333333,4,2,3,80,0,0
+224753,-100,4,2,1,80,0,0
+225662,-100,4,2,5,60,0,0
+225753,-100,4,2,1,90,0,0
+226026,-100,4,2,5,60,0,0
+226117,-100,4,2,1,90,0,0
+227844,-100,4,2,5,60,0,0
+227935,-100,4,2,1,90,0,0
+228571,-100,4,2,5,60,0,0
+228662,-100,4,2,1,90,0,0
+230026,-100,4,2,5,60,0,0
+230117,-100,4,2,1,90,0,0
+230753,-100,4,2,5,60,0,0
+230844,-100,4,2,1,90,0,0
+231480,-100,4,2,5,60,0,0
+231571,-100,4,2,1,90,0,0
+232208,-100,4,2,5,60,0,0
+232299,-100,4,2,1,90,0,0
+233117,-100,4,2,1,35,0,0
+233480,-100,4,2,1,45,0,0
+233844,-100,4,2,1,55,0,0
+234208,-100,4,2,1,75,0,0
+234299,-100,4,2,1,65,0,0
+234390,-100,4,2,1,75,0,0
+234480,-100,4,2,1,65,0,0
+234571,-100,4,2,1,75,0,0
+234935,-100,4,2,1,85,0,0
+235299,-100,4,2,1,95,0,0
+235662,-100,4,2,1,85,0,0
+236026,-100,4,2,3,80,0,0
+236390,-100,4,2,4,70,0,0
+236753,-100,4,2,78,70,0,0
+237480,-100,4,2,0,50,0,0
+237844,-100,4,2,0,40,0,0
+238208,-100,4,2,0,30,0,0
+238571,-100,4,2,0,20,0,0
+238935,-100,4,2,78,50,0,0
+239662,-100,4,2,0,50,0,0
+240390,-100,4,2,0,45,0,0
+241117,-100,4,2,0,40,0,0
+241844,-100,4,2,0,35,0,0
+242571,-100,4,2,0,30,0,0
+243299,-100,4,2,0,25,0,0
+244026,-100,4,2,0,20,0,0
+244753,-100,4,2,0,15,0,0
+245480,-100,4,2,0,10,0,0
+246208,-100,4,2,0,5,0,0
+
+[HitObjects]
+124,320,390,6,0,L|124:128,1,170,4|0,0:0|0:0,0:0:0:0:
+208,148,935,1,0,0:0:0:0:
+380,192,1117,2,0,L|380:16,1,170,8|2,0:0|0:0,0:0:0:0:
+208,24,1844,5,0,0:0:0:0:
+360,24,2208,1,2,0:0:0:0:
+188,24,2390,1,2,0:0:0:0:
+152,24,2480,1,2,0:0:0:0:
+112,24,2571,2,0,L|112:128,1,85,8|2,0:0|0:0,0:0:0:0:
+196,108,2935,1,0,0:0:0:0:
+280,108,3117,1,0,0:0:0:0:
+196,108,3299,5,2,0:0:0:0:
+288,108,3480,2,0,L|288:292,1,170,2|0,0:0|0:0,0:0:0:0:
+116,312,4026,1,8,0:0:0:0:
+300,280,4390,1,2,0:0:0:0:
+28,192,4753,6,0,L|28:100,1,85,4|2,0:0|0:0,0:0:0:0:
+112,108,5117,1,0,0:0:0:0:
+20,108,5299,1,2,0:0:0:0:
+192,108,5480,2,0,L|280:108,2,85,8|2|0,0:0|0:0|0:0,0:0:0:0:
+484,364,6208,6,0,L|484:172,1,170,14|0,0:0|0:0,0:0:0:0:
+400,192,6753,1,0,0:0:0:0:
+228,236,6935,2,0,L|228:60,1,170,8|2,0:0|0:0,0:0:0:0:
+396,64,7662,5,0,0:0:0:0:
+244,64,8026,1,2,0:0:0:0:
+416,64,8208,1,2,0:0:0:0:
+452,64,8298,1,2,0:0:0:0:
+492,64,8389,2,0,L|492:168,1,85,8|2,0:0|0:0,0:0:0:0:
+396,148,8753,1,0,0:0:0:0:
+304,148,8935,1,0,0:0:0:0:
+212,148,9117,5,2,0:0:0:0:
+312,148,9298,2,0,L|312:332,1,170,2|0,0:0|0:0,0:0:0:0:
+140,352,9844,1,8,0:0:0:0:
+324,320,10208,1,2,0:0:0:0:
+136,192,10571,6,0,L|232:192,1,85,2|2,0:0|0:0,0:0:0:0:
+128,192,10935,2,0,L|216:192,1,85,0|2,0:0|0:0,0:0:0:0:
+384,192,11299,1,8,0:0:0:0:
+292,192,11480,1,2,0:0:0:0:
+200,192,11662,1,0,0:0:0:0:
+488,192,12026,6,0,B|488:108|488:108|400:108,1,170,10|0,0:0|0:0,0:0:0:0:
+316,108,12571,1,0,0:0:0:0:
+144,108,12753,2,0,L|144:296,1,170,8|2,0:0|0:0,0:0:0:0:
+314,278,13480,6,0,L|134:278,1,170,0|2,0:0|0:0,0:0:0:0:
+144,278,14026,1,2,0:0:0:0:
+314,278,14208,2,0,L|406:278,1,85,8|2,0:0|0:0,0:0:0:0:
+304,276,14571,2,0,L|304:172,1,85,0|0,0:0|0:0,0:0:0:0:
+132,192,14935,6,0,B|48:192|48:192|48:104,1,170,2|0,0:0|0:0,0:0:0:0:
+132,104,15480,1,0,0:0:0:0:
+304,48,15662,1,8,0:0:0:0:
+132,104,16026,1,2,0:0:0:0:
+284,104,16390,6,0,L|284:188,1,85,0|0,0:0|0:0,0:0:0:0:
+192,192,16753,1,2,0:0:0:0:
+192,192,16935,1,2,0:0:0:0:
+364,192,17117,2,0,L|456:192,2,85,8|2|0,0:0|0:0|0:0,0:0:0:0:
+64,192,17844,6,0,L|64:292,1,85,2|0,0:0|0:0,0:0:0:0:
+148,192,18208,2,0,L|148:288,1,85,0|0,0:0|0:0,0:0:0:0:
+320,192,18571,1,8,0:0:0:0:
+132,192,18935,1,2,0:0:0:0:
+132,192,19299,6,0,L|304:192,1,170,0|2,0:0|0:0,0:0:0:0:
+388,192,19844,1,2,0:0:0:0:
+216,192,20026,2,0,L|124:192,1,85,8|2,0:0|0:0,0:0:0:0:
+224,192,20390,2,0,L|224:100,1,85,0|0,0:0|0:0,0:0:0:0:
+52,20,20753,6,0,B|52:108|52:108|140:108,1,170,2|0,0:0|0:0,0:0:0:0:
+224,107,21299,1,0,0:0:0:0:
+396,192,21480,1,8,0:0:0:0:
+224,192,21844,1,2,0:0:0:0:
+132,192,22026,1,2,0:0:0:0:
+224,192,22208,5,0,0:0:0:0:
+176,192,22299,1,2,0:0:0:0:
+132,192,22390,1,2,0:0:0:0:
+232,192,22571,1,2,0:0:0:0:
+404,192,22753,1,8,0:0:0:0:
+232,192,22935,2,0,L|232:288,1,85,8|2,0:0|0:0,0:0:0:0:
+404,277,23299,1,2,0:0:0:0:
+448,276,23389,1,2,0:0:0:0:
+492,276,23480,1,2,0:0:0:0:
+212,192,23662,6,0,L|8:192,1,203.999993774414,10|0,0:0|0:0,0:0:0:0:
+92,192,24208,1,0,0:0:0:0:
+272,192,24390,2,0,L|272:96,1,85,8|0,0:0|0:0,0:0:0:0:
+180,108,24753,1,2,0:0:0:0:
+348,104,25117,6,0,L|252:104,1,85,0|0,0:0|0:0,0:0:0:0:
+355,105,25480,1,2,0:0:0:0:
+179,105,25662,1,2,0:0:0:0:
+135,105,25752,1,2,0:0:0:0:
+91,105,25843,2,0,L|7:105,2,85,8|2|0,0:0|0:0|0:0,0:0:0:0:
+383,105,26571,5,2,0:0:0:0:
+299,105,26753,2,0,B|215:105|215:105|215:193,1,170,2|0,0:0|0:0,0:0:0:0:
+391,105,27299,1,8,0:0:0:0:
+239,193,27662,2,0,L|239:281,1,85,2|0,0:0|0:0,0:0:0:0:
+323,277,28026,5,0,0:0:0:0:
+231,277,28208,1,2,0:0:0:0:
+315,277,28390,1,0,0:0:0:0:
+143,277,28571,1,2,0:0:0:0:
+315,277,28753,1,8,0:0:0:0:
+407,277,28935,2,0,B|508:276|508:276|508:168,1,203.999993774414,2|0,0:0|0:0,0:0:0:0:
+212,192,29480,6,0,B|108:192|108:192|108:92|108:92|212:92,1,305.999990661621,6|0,0:0|0:0,0:0:0:0:
+304,92,30208,2,0,L|392:92,2,85,2|0|2,0:0|0:0|0:0,0:0:0:0:
+152,96,30935,6,0,L|152:180,1,85,2|2,0:0|0:0,0:0:0:0:
+236,192,31299,2,0,L|236:296,1,85,2|2,0:0|0:0,0:0:0:0:
+320,276,31662,2,0,L|232:276,2,85,2|2|2,0:0|0:0|0:0,0:0:0:0:
+256,192,32390,12,8,33480,0:0:0:0:
+428,192,33844,6,0,L|428:132,2,42.5,2|2|2,0:0|0:0|0:0,0:0:0:0:
+256,192,34208,2,0,L|160:192,1,85,2|8,0:0|0:0,0:0:0:0:
+216,192,34480,1,2,0:0:0:0:
+264,192,34571,2,0,L|316:192,2,42.5,2|8|2,0:0|0:0|0:0,0:0:0:0:
+92,192,34935,2,0,L|8:192,1,85,12|8,0:0|0:0,0:0:0:0:
+288,192,35299,6,0,L|492:192,1,203.999993774414,10|8,3:2|3:2,3:3:0:0:
+400,192,35844,1,2,3:2:0:0:
+224,192,36026,2,0,L|136:192,1,85,0|2,3:2|3:2,0:0:0:0:
+232,192,36390,2,0,L|232:104,1,85,8|0,3:2|3:2,3:3:0:0:
+56,32,36753,6,0,L|56:116,1,85,6|0,3:2|3:2,3:3:0:0:
+104,120,37026,1,0,3:2:0:0:
+152,124,37117,1,8,3:2:0:0:
+244,124,37299,1,2,3:2:0:0:
+152,124,37480,2,0,L|64:124,1,85,0|2,3:2|3:2,0:0:0:0:
+244,124,37844,2,0,L|244:216,1,85,8|0,3:2|3:2,3:3:0:0:
+496,296,38208,6,0,B|496:212|496:212|408:212,1,170,6|8,3:2|3:2,3:3:0:0:
+504,212,38753,2,0,L|324:212,1,170,2|2,3:2|3:2,3:3:0:0:
+156,192,39299,2,0,L|60:192,1,85,8|0,3:2|3:2,3:3:0:0:
+252,192,39662,6,0,L|312:192,2,42.5,6|2|2,3:2|3:2|3:2,3:3:0:0:
+71,192,40026,2,0,L|71:92,1,85,8|2,3:2|3:2,3:3:0:0:
+164,108,40390,2,0,L|80:108,1,85,0|2,3:2|3:2,0:0:0:0:
+256,108,40753,2,0,L|340:108,1,85,8|0,3:2|3:2,3:3:0:0:
+84,192,41117,6,0,L|276:192,1,170,6|8,3:2|3:2,3:3:0:0:
+432,192,41662,2,0,L|432:104,1,85,2|0,3:2|3:2,3:3:0:0:
+348,108,42026,1,2,3:2:0:0:
+432,192,42208,2,0,L|348:192,1,85,8|0,3:2|3:2,3:3:0:0:
+176,192,42571,6,0,L|84:192,1,85,6|0,3:2|3:2,3:3:0:0:
+132,192,42844,1,0,3:2:0:0:
+176,192,42935,1,8,3:2:0:0:
+260,192,43117,2,0,L|176:192,2,85,2|0|2,3:2|3:2|3:2,3:3:0:0:
+84,192,43662,2,0,L|84:288,1,85,8|0,3:2|3:2,3:3:0:0:
+336,192,44026,6,0,B|436:192|436:192|436:296,1,203.999993774414,6|8,3:2|3:2,3:3:0:0:
+344,296,44571,1,2,3:2:0:0:
+252,296,44753,2,0,L|252:212,1,85,0|2,3:2|3:2,3:3:0:0:
+428,192,45117,2,0,L|340:192,1,85,8|0,3:2|3:2,3:3:0:0:
+164,192,45480,5,6,3:2:0:0:
+121,192,45570,1,2,3:2:0:0:
+79,192,45661,1,2,3:2:0:0:
+256,192,45844,2,0,L|256:104,1,85,8|2,3:2|3:2,3:3:0:0:
+160,104,46208,2,0,L|244:104,1,85,2|2,3:2|3:2,3:3:0:0:
+68,32,46571,2,0,L|68:120,1,85,12|2,3:2|3:2,3:3:0:0:
+324,192,46935,6,0,L|408:192,2,85,10|0|8,3:2|3:2|3:2,3:3:0:0:
+154,192,47480,2,0,L|338:192,1,170,2|2,3:2|3:2,3:3:0:0:
+420,192,48026,2,0,L|420:280,1,85,8|0,3:2|3:2,3:3:0:0:
+240,328,48390,6,0,B|156:328,1,85,6|0,3:2|3:2,3:3:0:0:
+112,328,48662,1,0,3:2:0:0:
+68,328,48753,1,8,3:2:0:0:
+160,244,48935,2,0,L|72:244,2,85,2|0|2,3:2|3:2|3:2,0:0:0:0:
+336,244,49480,2,0,L|420:244,1,85,8|0,3:2|3:2,3:3:0:0:
+164,116,49844,6,0,B|80:116,1,85,6|0,3:2|3:2,3:3:0:0:
+79,116,50117,1,0,3:2:0:0:
+79,116,50208,1,8,3:2:0:0:
+172,116,50390,2,0,B|256:116|256:116|256:28,1,170,2|2,3:2|3:2,3:3:0:0:
+80,30,50935,2,0,L|80:126,1,85,8|0,3:2|3:2,3:3:0:0:
+256,192,51299,6,0,L|436:192,1,170,6|8,3:2|3:2,3:3:0:0:
+340,192,51844,1,2,3:2:0:0:
+426,192,52026,2,0,L|338:192,1,85,0|2,3:2|3:2,3:3:0:0:
+164,192,52390,2,0,L|64:192,1,85,8|0,3:2|0:0,3:3:0:0:
+336,72,52753,6,0,L|508:72,1,170,6|8,3:2|3:2,3:3:0:0:
+328,160,53299,2,0,L|500:160,1,170,2|2,3:2|3:2,3:3:0:0:
+412,160,53844,2,0,L|412:260,1,85,8|0,3:2|3:2,3:3:0:0:
+236,192,54208,6,0,L|144:192,1,85,6|0,3:2|3:2,3:3:0:0:
+192,192,54480,1,0,3:2:0:0:
+236,192,54571,1,8,3:2:0:0:
+320,192,54753,1,2,3:2:0:0:
+236,192,54935,1,0,3:2:0:0:
+152,192,55117,1,2,3:2:0:0:
+328,192,55299,2,0,L|328:280,1,85,8|0,3:2|3:2,3:3:0:0:
+72,192,55662,6,0,L|72:100,1,85,6|0,3:2|3:2,3:3:0:0:
+116,104,55935,1,0,3:2:0:0:
+160,100,56026,1,8,3:2:0:0:
+244,100,56208,2,0,L|156:100,2,85,2|0|2,3:2|3:2|3:2,3:3:0:0:
+72,107,56753,2,0,L|72:19,1,85,8|0,3:2|3:2,0:0:0:0:
+248,192,57117,6,0,L|292:192,2,42.5,2|2|2,3:2|3:2|3:2,0:0:0:0:
+78,192,57481,2,0,L|80:92,1,85,8|2,3:2|3:2,0:0:0:0:
+164,107,57844,2,0,L|64:107,1,85,8|2,3:2|3:2,3:3:0:0:
+248,192,58208,2,0,L|164:192,1,85,12|2,3:2|3:2,3:3:0:0:
+416,192,58571,6,0,B|500:192|500:192|412:192,1,170,10|8,3:2|3:2,3:3:0:0:
+320,192,59117,1,2,3:2:0:0:
+140,192,59299,2,0,L|56:192,2,85,0|2|8,3:2|3:2|3:2,0:0:0:0:
+428,192,60026,6,0,L|428:104,1,85,2|0,3:2|3:2,3:3:0:0:
+332,108,60390,2,0,L|420:108,1,85,8|2,3:2|3:2,3:3:0:0:
+324,108,60753,1,2,3:2:0:0:
+366,108,60843,1,2,3:2:0:0:
+409,108,60934,1,2,3:2:0:0:
+228,108,61117,2,0,L|140:108,1,85,8|0,3:2|3:2,3:3:0:0:
+324,108,61480,6,0,L|324:280,1,170,2|8,3:2|3:2,3:3:0:0:
+228,280,62026,1,2,3:2:0:0:
+408,192,62208,2,0,L|312:192,2,85,0|2|8,3:2|3:2|3:2,3:3:0:0:
+120,192,62935,6,0,L|72:192,2,42.5,2|2|2,3:2|3:2|3:2,0:0:0:0:
+216,192,63299,2,0,L|216:96,1,85,8|0,3:2|3:2,3:3:0:0:
+396,60,63662,2,0,L|312:60,1,85,2|0,3:2|3:2,3:3:0:0:
+148,192,64026,1,8,3:2:0:0:
+320,60,64208,1,2,3:2:0:0:
+140,192,64390,6,0,B|56:192|56:192|56:104,1,170,2|8,3:2|3:2,0:0:0:0:
+140,104,64935,1,2,3:2:0:0:
+396,145,65117,2,0,L|396:57,1,85,0|2,3:2|3:2,0:0:0:0:
+312,61,65480,1,8,3:2:0:0:
+404,61,65662,1,0,3:2:0:0:
+300,60,65844,6,0,L|212:60,1,85,2|0,3:2|3:2,3:3:0:0:
+392,60,66208,2,0,L|392:160,1,85,8|2,3:2|3:2,3:3:0:0:
+136,192,66571,2,0,L|136:104,1,85,2|2,3:2|3:2,3:3:0:0:
+307,145,66935,2,0,L|395:145,1,85,8|0,3:2|3:2,3:3:0:0:
+476,144,67299,6,0,L|476:244,1,85,2|0,3:2|3:2,3:3:0:0:
+307,145,67662,2,0,L|307:45,1,85,8|2,3:2|3:2,3:3:0:0:
+48,192,68026,2,0,L|140:192,1,85,0|2,3:2|3:2,3:3:0:0:
+307,145,68390,2,0,L|307:233,1,85,8|0,3:2|3:2,3:3:0:0:
+222,230,68753,6,0,L|326:230,1,85,2|2,3:2|3:2,0:0:0:0:
+136,228,69117,2,0,L|136:324,1,85,8|2,3:2|3:2,3:3:0:0:
+228,312,69480,2,0,L|132:312,1,85,2|2,3:2|3:2,3:3:0:0:
+236,312,69844,2,0,L|327:312,1,85,8|0,3:2|3:2,3:3:0:0:
+60,312,70208,6,0,B|60:228|60:228|148:228,1,170,10|8,3:2|3:2,3:3:0:0:
+232,228,70753,1,2,3:2:0:0:
+412,192,70935,2,0,L|320:192,2,85,0|2|8,3:2|3:2|3:2,0:0:0:0:
+124,192,71662,6,0,L|124:104,1,85,2|0,3:2|3:2,3:3:0:0:
+220,108,72026,2,0,L|320:108,1,85,8|2,3:2|3:2,3:3:0:0:
+212,108,72389,1,2,3:2:0:0:
+316,108,72571,1,2,3:2:0:0:
+136,108,72753,2,0,L|48:108,1,85,8|0,3:2|3:2,3:3:0:0:
+316,108,73116,6,0,B|400:108|400:108|400:200,1,170,2|8,3:2|3:2,3:3:0:0:
+316,192,73662,1,2,3:2:0:0:
+144,192,73844,1,2,3:2:0:0:
+236,192,74026,1,2,3:2:0:0:
+328,192,74208,1,8,3:2:0:0:
+56,192,74571,5,2,3:2:0:0:
+228,192,74753,1,2,3:2:0:0:
+400,192,74935,2,0,L|400:96,1,85,8|0,3:2|3:2,3:3:0:0:
+308,108,75298,2,0,L|392:108,1,85,2|2,3:2|3:2,3:3:0:0:
+232,192,75662,1,8,3:2:0:0:
+401,107,75844,1,2,3:2:0:0:
+224,192,76026,6,0,B|140:192|140:192|228:192,1,170,2|8,3:2|3:2,0:0:0:0:
+312,192,76571,1,2,3:2:0:0:
+56,192,76753,2,0,L|56:104,1,85,0|2,3:2|3:2,0:0:0:0:
+140,108,77116,1,8,3:2:0:0:
+48,108,77298,1,0,3:2:0:0:
+148,107,77480,6,0,L|236:107,1,85,2|0,3:2|3:2,3:3:0:0:
+408,108,77844,2,0,L|408:208,1,85,8|2,3:2|3:2,3:3:0:0:
+236,192,78207,2,0,L|320:192,1,85,0|2,3:2|3:2,3:3:0:0:
+493,193,78571,2,0,L|409:193,1,85,8|0,3:2|3:2,3:3:0:0:
+504,192,78935,5,2,3:2:0:0:
+332,192,79117,1,2,3:2:0:0:
+284,192,79208,1,0,0:0:0:0:
+236,192,79298,2,0,L|236:92,1,85,8|0,3:2|3:2,3:3:0:0:
+60,28,79662,2,0,L|60:119,1,85,0|2,3:2|3:2,3:3:0:0:
+236,107,80026,2,0,L|328:107,1,85,8|2,3:2|3:2,3:3:0:0:
+228,108,80389,5,2,3:2:0:0:
+228,150,80479,1,2,3:2:0:0:
+228,193,80570,1,2,3:2:0:0:
+404,192,80753,2,0,L|404:288,1,85,8|2,3:2|3:2,3:3:0:0:
+227,280,81116,2,0,L|323:280,1,85,0|2,3:2|3:2,3:3:0:0:
+404,277,81480,2,0,L|313:277,1,85,8|2,3:2|3:2,3:3:0:0:
+133,193,81844,6,0,L|89:193,2,42.5,2|2|2,3:2|3:2|3:2,0:0:0:0:
+303,193,82208,2,0,L|217:193,1,85,8|0,3:2|3:2,3:3:0:0:
+264,192,82480,1,2,3:2:0:0:
+313,193,82572,2,0,L|229:193,1,85,8|2,3:2|3:2,3:3:0:0:
+48,193,82935,2,0,L|132:193,1,85,12|0,3:2|3:2,3:3:0:0:
+392,192,83299,6,0,B|496:192|496:192|496:88,1,203.999993774414,10|8,3:2|3:2,0:0:0:0:
+452,92,83753,1,0,3:2:0:0:
+408,92,83844,1,2,3:2:0:0:
+324,92,84026,2,0,L|324:-8,1,85,0|2,3:2|3:2,3:3:0:0:
+152,8,84390,2,0,L|152:56,1,42.5,8|2,3:2|3:2,3:3:0:0:
+248,92,84662,1,2,3:2:0:0:
+248,92,84753,6,0,L|156:92,1,85,2|0,3:2|3:2,3:3:0:0:
+332,92,85117,2,0,L|332:152,2,42.5,8|0|2,3:2|3:2|3:2,3:3:0:0:
+244,192,85480,1,0,3:2:0:0:
+332,92,85662,1,2,3:2:0:0:
+156,192,85844,2,0,L|68:192,1,85,8|2,3:2|3:2,3:3:0:0:
+164,192,86208,6,0,L|256:192,1,85,2|0,3:2|3:2,3:3:0:0:
+80,296,86571,1,8,3:2:0:0:
+122,296,86661,1,0,3:2:0:0:
+165,296,86752,1,2,3:2:0:0:
+252,296,86935,1,0,3:2:0:0:
+156,296,87117,1,2,3:2:0:0:
+328,296,87299,2,0,L|328:232,1,42.5,8|2,3:2|3:2,3:3:0:0:
+152,192,87662,6,0,L|104:192,2,42.5,2|0|2,3:2|3:2|3:2,0:0:0:0:
+236,192,88026,2,0,L|144:192,1,85,8|2,3:2|3:2,3:3:0:0:
+328,192,88390,2,0,L|328:104,1,85,2|2,3:2|3:2,3:3:0:0:
+152,32,88753,2,0,L|64:32,1,85,8|0,3:2|3:2,3:3:0:0:
+324,32,89117,6,0,L|496:32,1,170,2|8,3:2|3:2,3:3:0:0:
+452,32,89571,1,0,3:2:0:0:
+408,32,89662,1,0,3:2:0:0:
+324,32,89844,2,0,L|324:128,1,85,2|2,3:2|3:2,3:3:0:0:
+148,192,90208,2,0,L|148:244,1,42.5,8|2,3:2|3:2,3:3:0:0:
+232,192,90480,1,2,3:2:0:0:
+284,192,90571,6,0,L|284:280,1,85,2|0,3:2|3:2,3:3:0:0:
+236,316,90844,2,0,L|144:316,1,85,2|0,3:2|3:2,3:3:0:0:
+152,316,91117,1,2,3:2:0:0:
+236,316,91299,1,2,3:2:0:0:
+144,316,91480,1,2,3:2:0:0:
+320,316,91662,2,0,L|320:216,1,85,8|2,3:2|3:2,3:3:0:0:
+224,192,92026,6,0,L|136:192,1,85,2|0,3:2|3:2,3:3:0:0:
+92,192,92299,2,0,L|184:192,1,85,2|0,3:2|3:2,3:3:0:0:
+224,192,92571,1,2,3:2:0:0:
+132,192,92753,2,0,L|216:192,1,85,2|2,3:2|3:2,3:3:0:0:
+392,192,93117,2,0,L|392:104,1,85,8|2,3:2|3:2,0:0:0:0:
+216,44,93480,5,2,3:2:0:0:
+173,44,93570,1,2,3:2:0:0:
+131,44,93661,1,2,3:2:0:0:
+224,128,93844,1,8,3:2:0:0:
+181,128,93934,1,0,3:2:0:0:
+139,128,94025,1,2,3:2:0:0:
+312,128,94208,2,0,L|396:128,1,85,8|2,3:2|3:2,3:3:0:0:
+220,224,94571,2,0,L|136:224,1,85,12|2,3:2|3:2,3:3:0:0:
+392,224,94935,6,0,L|484:224,1,85,10|0,3:2|3:2,3:3:0:0:
+384,224,95299,2,0,L|384:128,1,85,8|0,3:2|3:2,3:3:0:0:
+212,224,95662,1,2,3:2:0:0:
+306,224,95844,1,2,3:2:0:0:
+477,224,96026,2,0,L|477:136,1,85,8|0,3:2|3:2,3:3:0:0:
+300,136,96390,6,0,L|212:136,1,85,6|0,3:2|3:2,3:3:0:0:
+308,136,96753,2,0,L|308:44,1,85,8|2,3:2|3:2,3:2:0:0:
+136,136,97117,1,2,3:2:0:0:
+300,136,97299,1,2,3:2:0:0:
+128,136,97480,2,0,L|128:40,1,85,8|0,3:2|3:2,3:3:0:0:
+300,136,97844,6,0,L|212:136,1,85,6|0,3:2|3:2,3:3:0:0:
+308,136,98208,1,8,3:2:0:0:
+308,93,98298,1,0,0:0:0:0:
+308,51,98389,1,0,3:2:0:0:
+136,40,98571,2,0,L|224:40,1,85,2|2,3:2|3:2,3:3:0:0:
+404,140,98935,2,0,L|404:240,1,85,8|0,3:2|3:2,0:0:0:0:
+224,288,99299,6,0,L|136:288,1,85,2|2,3:2|3:2,3:3:0:0:
+312,288,99662,2,0,L|312:196,1,85,8|2,3:2|3:2,3:3:0:0:
+220,192,100026,1,0,3:2:0:0:
+312,288,100208,1,2,3:2:0:0:
+136,192,100390,2,0,L|52:192,1,85,8|0,3:2|3:2,3:3:0:0:
+308,192,100753,6,0,B|392:192,1,85,6|0,3:2|3:2,3:3:0:0:
+216,192,101117,2,0,L|216:104,1,85,8|2,3:2|3:2,3:3:0:0:
+300,108,101480,1,0,3:2:0:0:
+208,108,101662,1,2,3:2:0:0:
+384,108,101844,2,0,L|384:12,1,85,8|0,3:2|3:2,3:3:0:0:
+208,108,102208,6,0,L|104:108,1,85,6|0,3:2|3:2,3:3:0:0:
+216,108,102571,2,0,L|216:192,1,85,8|2,3:2|3:2,0:0:0:0:
+52,108,102935,1,2,3:2:0:0:
+224,192,103117,1,2,3:2:0:0:
+44,108,103299,2,0,L|44:204,1,85,8|2,3:2|3:2,3:3:0:0:
+136,192,103662,6,0,L|224:192,1,85,6|0,3:2|3:2,3:3:0:0:
+268,192,103935,1,0,3:2:0:0:
+316,192,104026,2,0,L|316:96,1,85,8|2,3:2|3:2,3:3:0:0:
+140,36,104390,2,0,L|228:36,1,85,2|2,3:2|3:2,0:0:0:0:
+400,36,104753,2,0,L|400:136,1,85,8|0,3:2|3:2,3:3:0:0:
+224,192,105117,5,2,3:2:0:0:
+181,192,105207,1,2,3:2:0:0:
+139,192,105298,1,2,3:2:0:0:
+309,192,105480,2,0,L|221:192,1,85,8|2,3:2|3:2,3:3:0:0:
+128,192,105844,1,0,3:2:0:0:
+216,192,106026,1,2,3:2:0:0:
+393,192,106208,2,0,L|493:192,1,85,12|0,3:2|0:0,3:3:0:0:
+216,276,106571,6,0,L|128:276,1,85,6|0,3:2|3:2,3:3:0:0:
+84,276,106844,1,0,3:2:0:0:
+131,276,106935,2,0,L|216:276,1,85,8|2,3:2|3:2,3:3:0:0:
+312,276,107299,1,0,3:2:0:0:
+212,276,107480,1,2,3:2:0:0:
+392,276,107662,2,0,L|392:176,1,85,8|2,3:2|3:2,3:3:0:0:
+136,192,108026,6,0,B|44:192,1,85,6|0,3:2|3:2,3:3:0:0:
+144,192,108390,2,0,L|144:104,1,85,8|0,3:2|3:2,0:0:0:0:
+304,68,108753,1,2,3:2:0:0:
+140,192,108935,1,2,3:2:0:0:
+312,68,109117,2,0,L|312:168,1,85,8|2,3:2|3:2,3:3:0:0:
+56,192,109480,6,0,L|56:284,1,85,6|0,3:2|3:2,3:3:0:0:
+140,280,109844,1,8,3:2:0:0:
+182,280,109934,1,0,3:2:0:0:
+225,280,110025,1,2,3:2:0:0:
+56,277,110208,1,2,3:2:0:0:
+152,280,110390,1,2,3:2:0:0:
+52,277,110571,2,0,L|52:189,1,85,8|0,3:2|0:0,3:3:0:0:
+312,192,110935,6,0,L|396:192,1,85,2|2,3:2|3:2,3:3:0:0:
+304,192,111299,1,8,3:2:0:0:
+404,192,111480,1,2,3:2:0:0:
+312,192,111662,1,0,3:2:0:0:
+269,192,111752,1,0,3:2:0:0:
+227,192,111843,1,2,3:2:0:0:
+328,192,112026,2,0,L|328:96,1,85,8|0,3:2|3:2,3:3:0:0:
+68,192,112390,6,0,L|68:104,1,85,6|0,3:2|3:2,3:3:0:0:
+160,108,112753,2,0,L|248:108,1,85,8|2,3:2|3:2,0:0:0:0:
+420,108,113117,2,0,L|420:196,1,85,0|2,3:2|3:2,0:0:0:0:
+328,192,113480,1,8,3:2:0:0:
+285,192,113570,1,0,0:0:0:0:
+243,192,113661,1,0,3:2:0:0:
+492,192,113844,6,4,L|492:292,1,85,6|4,3:2|3:2,3:3:0:0:
+396,276,114208,2,0,L|304:276,1,85,8|2,3:2|3:2,3:3:0:0:
+140,276,114571,1,2,3:2:0:0:
+311,276,114753,1,2,3:2:0:0:
+140,276,114935,2,0,L|140:192,1,85,8|0,3:2|3:2,3:3:0:0:
+396,192,115299,6,0,L|492:192,1,85,6|0,3:2|3:2,3:3:0:0:
+308,192,115662,2,0,L|308:96,1,85,8|2,3:2|3:2,0:0:0:0:
+136,192,116026,1,2,3:2:0:0:
+228,192,116208,1,2,3:2:0:0:
+56,192,116390,2,0,L|56:96,1,85,8|2,3:2|3:2,0:0:0:0:
+312,192,116753,6,0,L|312:96,1,85,10|2,3:2|3:2,3:3:0:0:
+484,28,117117,2,0,L|484:84,2,42.5,8|2|2,3:2|3:2|3:2,3:3:0:0:
+392,28,117480,1,8,3:2:0:0:
+476,28,117662,1,2,3:2:0:0:
+304,28,117844,1,8,3:2:0:0:
+262,28,117934,1,2,3:2:0:0:
+219,28,118025,1,2,3:2:0:0:
+476,28,118208,5,0,0:0:0:0:
+476,28,118299,1,0,0:0:0:0:
+432,28,118390,1,0,0:0:0:0:
+260,132,118571,1,0,0:0:0:0:
+260,132,118662,1,0,0:0:0:0:
+260,132,118753,1,0,0:0:0:0:
+88,236,118935,1,8,0:0:0:0:
+88,236,119026,1,2,0:0:0:0:
+132,236,119117,1,2,0:0:0:0:
+304,288,119299,2,0,L|392:288,1,85,8|8,0:0|0:0,0:0:0:0:
+112,236,119662,5,10,0:0:0:0:
+256,192,120026,12,0,125480,0:0:0:0:
+296,284,131299,6,0,L|296:108,1,170,4|0,0:0|0:0,0:0:0:0:
+152,192,132026,1,2,0:0:0:0:
+244,192,132208,1,0,0:0:0:0:
+336,192,132390,1,0,0:0:0:0:
+244,192,132571,1,0,0:0:0:0:
+416,192,132753,6,0,L|416:20,2,170,2|0|0,0:0|0:0|0:0,0:0:0:0:
+280,192,133844,1,0,0:0:0:0:
+188,192,134026,1,0,0:0:0:0:
+16,192,134208,6,0,L|16:16,1,170,2|0,0:0|0:0,0:0:0:0:
+176,20,134935,1,2,0:0:0:0:
+32,24,135299,1,0,0:0:0:0:
+272,16,135662,6,0,L|272:192,1,170,2|0,0:0|0:0,0:0:0:0:
+428,80,136390,2,0,L|428:272,1,170,2|0,0:0|0:0,0:0:0:0:
+132,52,137117,6,0,B|304:52,2,170,4|8|8,0:0|0:0|0:0,0:0:0:0:
+336,52,138571,6,0,L|336:224,1,170,2|0,0:0|0:0,0:0:0:0:
+240,224,139117,1,0,0:0:0:0:
+336,222,139299,1,2,0:0:0:0:
+480,192,139662,1,2,0:0:0:0:
+388,192,139844,1,0,0:0:0:0:
+212,192,140026,6,0,L|212:364,2,170,2|0|2,0:0|0:0|0:0,0:0:0:0:
+448,192,141480,6,0,L|344:192,2,93.5000028533936,8|8|8,0:0|0:0|0:0,0:0:0:0:
+244,192,142208,1,8,0:0:0:0:
+348,192,142390,1,8,0:0:0:0:
+448,192,142571,1,8,0:0:0:0:
+152,192,142935,6,0,L|152:12,1,170,4|0,0:0|0:0,0:0:0:0:
+236,20,143480,1,0,0:0:0:0:
+144,20,143662,2,0,L|60:20,2,85,2|0|0,0:0|0:0|0:0,0:0:0:0:
+316,136,144390,5,2,0:0:0:0:
+232,136,144571,1,0,0:0:0:0:
+148,136,144753,1,0,0:0:0:0:
+316,136,145117,2,0,L|232:136,2,85,2|0|0,0:0|0:0|0:0,0:0:0:0:
+144,136,145844,6,0,L|144:224,1,85,2|0,0:0|0:0,0:0:0:0:
+228,220,146208,1,2,0:0:0:0:
+59,221,146571,2,0,L|159:221,2,85,2|0|0,0:0|0:0|0:0,0:0:0:0:
+228,224,147299,6,0,L|312:224,1,85,2|0,0:0|0:0,0:0:0:0:
+220,224,147662,2,0,L|220:320,1,85,0|0,0:0|0:0,0:0:0:0:
+313,309,148026,2,0,L|313:225,1,85,2|0,0:0|0:0,0:0:0:0:
+228,224,148390,1,0,0:0:0:0:
+320,224,148571,1,0,0:0:0:0:
+64,276,148753,6,0,L|64:192,1,85,4|0,0:0|0:0,0:0:0:0:
+152,192,149117,2,0,L|152:104,1,85,2|0,0:0|0:0,0:0:0:0:
+328,108,149480,1,2,0:0:0:0:
+184,108,149844,2,0,L|268:108,1,85,2|0,0:0|0:0,0:0:0:0:
+356,108,150208,5,2,0:0:0:0:
+204,108,150571,2,0,L|204:208,1,85,2|0,0:0|0:0,0:0:0:0:
+28,192,150935,1,2,0:0:0:0:
+172,192,151299,2,0,L|256:192,1,85,2|0,0:0|0:0,0:0:0:0:
+164,192,151662,6,0,L|164:292,1,85,2|0,0:0|0:0,0:0:0:0:
+257,277,152026,2,0,L|257:193,1,85,2|0,0:0|0:0,0:0:0:0:
+432,192,152390,1,2,0:0:0:0:
+288,192,152753,2,0,L|200:192,1,85,2|0,0:0|0:0,0:0:0:0:
+380,192,153117,6,0,L|380:104,1,85,8|8,0:0|0:0,0:0:0:0:
+288,108,153480,2,0,L|288:20,1,85,8|0,0:0|0:0,0:0:0:0:
+112,24,153844,2,0,L|112:108,1,85,8|8,0:0|0:0,0:0:0:0:
+203,108,154208,2,0,L|291:108,1,85,8|0,0:0|0:0,0:0:0:0:
+32,108,154571,6,0,L|32:288,1,170,4|0,0:0|0:0,0:0:0:0:
+216,278,155299,1,2,0:0:0:0:
+124,278,155480,1,0,0:0:0:0:
+32,278,155662,1,0,0:0:0:0:
+216,278,156026,6,0,L|304:280,1,85,8|0,0:0|0:0,0:0:0:0:
+300,279,156390,1,0,0:0:0:0:
+132,192,156753,2,0,L|220:192,2,85,2|0|0,0:0|0:0|0:0,0:0:0:0:
+48,192,157299,1,0,0:0:0:0:
+140,192,157480,6,0,L|140:104,1,85,8|0,0:0|0:0,0:0:0:0:
+236,108,157844,2,0,L|236:20,1,85,0|0,0:0|0:0,0:0:0:0:
+412,48,158208,2,0,L|496:48,2,85,2|0|0,0:0|0:0|0:0,0:0:0:0:
+268,192,158935,5,8,0:0:0:0:
+344,192,159117,1,8,0:0:0:0:
+420,192,159299,1,8,0:0:0:0:
+496,192,159480,1,8,0:0:0:0:
+412,192,159662,2,0,L|496:192,1,85,2|0,0:0|0:0,0:0:0:0:
+324,192,160026,2,0,L|324:104,1,85,2|0,0:0|0:0,0:0:0:0:
+68,192,160390,6,0,L|68:108,1,85,10|0,0:0|0:0,0:0:0:0:
+152,108,160753,2,0,L|240:108,1,85,8|0,0:0|0:0,0:0:0:0:
+409,107,161117,2,0,L|409:191,1,85,2|2,0:0|0:0,0:0:0:0:
+324,192,161480,2,0,L|412:192,1,85,8|0,0:0|0:0,0:0:0:0:
+313,191,161844,6,0,L|313:299,1,85,2|0,0:0|0:0,0:0:0:0:
+140,192,162208,2,0,L|140:284,1,85,8|0,0:0|0:0,0:0:0:0:
+184,276,162480,1,0,0:0:0:0:
+228,276,162571,2,0,L|312:276,1,85,2|2,0:0|0:0,0:0:0:0:
+400,276,162935,2,0,L|400:192,1,85,8|8,0:0|0:0,0:0:0:0:
+256,192,163299,12,8,164389,0:0:0:0:
+132,192,164753,6,0,L|132:132,2,42.5,8|2|2,0:0|0:0|0:0,0:0:0:0:
+304,192,165117,1,8,0:0:0:0:
+352,173,165207,1,2,0:0:0:0:
+372,125,165298,1,2,0:0:0:0:
+351,78,165389,1,2,0:0:0:0:
+303,59,165480,1,8,0:0:0:0:
+208,60,165662,1,2,0:0:0:0:
+388,8,165844,2,0,L|472:8,1,85,12|0,0:0|0:0,0:0:0:0:
+216,192,166208,6,0,L|120:192,2,85,6|0|8,3:2|3:2|3:2,3:3:0:0:
+308,192,166753,2,0,L|136:192,1,170,6|2,3:2|3:2,3:3:0:0:
+312,192,167299,2,0,L|312:296,1,85,8|0,3:2|3:2,3:3:0:0:
+138,192,167662,6,0,L|310:192,1,170,6|8,3:2|3:2,3:3:0:0:
+404,192,168208,2,0,B|404:276|404:276|316:276,1,170,2|2,3:2|3:2,3:3:0:0:
+140,336,168753,2,0,L|140:248,1,85,8|0,3:2|3:2,3:3:0:0:
+320,192,169117,6,0,B|404:192|404:192|404:104,1,170,2|8,3:2|3:2,3:3:0:0:
+232,32,169662,2,0,L|52:32,1,170,2|2,3:2|3:2,3:3:0:0:
+232,32,170208,2,0,L|128:32,1,85,8|0,3:2|3:2,3:3:0:0:
+52,32,170571,6,0,L|52:88,1,42.5,2|2,3:2|3:2,3:3:0:0:
+100,76,170753,1,2,3:2:0:0:
+192,76,170935,1,8,3:2:0:0:
+448,192,171117,2,0,L|448:104,1,85,2|0,3:2|3:2,0:0:0:0:
+356,104,171480,1,0,3:2:0:0:
+184,192,171662,2,0,L|268:192,1,85,8|0,3:2|3:2,3:3:0:0:
+20,192,172026,6,0,L|20:144,2,42.5,6|0|0,3:2|3:2|3:2,3:3:0:0:
+116,192,172390,1,8,3:2:0:0:
+32,192,172571,1,2,3:2:0:0:
+208,192,172753,2,0,L|312:192,1,85,0|2,3:2|3:2,3:3:0:0:
+200,192,173117,2,0,L|200:280,1,85,8|0,3:2|3:2,3:3:0:0:
+376,192,173480,6,0,L|376:108,1,85,6|0,3:2|3:2,3:3:0:0:
+200,192,173844,1,8,3:2:0:0:
+116,192,174026,2,0,P|64:132|116:76,1,170,2|2,3:2|3:2,3:3:0:0:
+372,76,174571,2,0,L|460:76,1,85,8|0,3:2|3:2,3:3:0:0:
+280,76,174935,6,0,L|280:172,1,85,2|2,3:2|3:2,3:3:0:0:
+368,192,175299,1,8,3:2:0:0:
+192,192,175480,2,0,L|192:288,1,85,2|0,3:2|3:2,3:3:0:0:
+280,308,175844,1,2,3:2:0:0:
+453,192,176026,2,0,L|365:192,1,85,8|2,3:2|3:2,0:0:0:0:
+112,192,176390,6,0,L|20:192,2,85,8|2|8,3:2|3:2|3:2,3:3:0:0:
+292,192,176935,2,0,L|116:192,1,170,2|2,3:2|3:2,3:3:0:0:
+304,192,177480,2,0,L|402:192,1,85,8|0,3:2|3:2,3:3:0:0:
+132,192,177844,6,0,B|32:192|32:192|32:88,1,203.999993774414,6|8,3:2|3:2,3:3:0:0:
+208,44,178390,2,0,L|380:44,1,170,6|2,3:2|3:2,3:3:0:0:
+284,44,178935,2,0,L|284:140,1,85,8|0,3:2|3:2,3:3:0:0:
+464,136,179299,6,0,L|464:232,1,85,2|0,3:2|3:2,3:3:0:0:
+380,220,179662,1,8,3:2:0:0:
+204,192,179844,2,0,L|376:192,1,170,2|2,3:2|1:3,3:3:0:0:
+460,192,180390,2,0,L|460:92,1,85,8|0,3:2|3:2,3:3:0:0:
+284,16,180753,6,0,B|200:16|200:16|200:104,1,170,2|8,3:2|3:2,3:3:0:0:
+380,192,181299,2,0,L|204:192,1,170,2|2,3:2|3:2,3:3:0:0:
+302,193,181844,2,0,L|210:193,1,85,8|0,3:2|3:2,3:3:0:0:
+124,192,182208,6,0,L|124:288,1,85,2|2,3:2|3:2,3:3:0:0:
+302,193,182571,2,0,L|210:193,1,85,8|2,3:2|3:2,0:0:0:0:
+312,192,182935,2,0,L|360:192,2,42.5,0|0|2,3:2|3:2|3:2,3:3:0:0:
+132,192,183299,2,0,L|32:192,1,85,8|0,3:2|3:2,3:3:0:0:
+312,192,183662,6,0,P|364:248|312:308,1,170,6|8,3:2|3:2,3:3:0:0:
+220,308,184208,1,2,3:2:0:0:
+324,308,184390,2,0,L|324:216,1,85,0|2,3:2|3:2,3:3:0:0:
+144,192,184753,2,0,L|144:280,1,85,8|0,3:2|3:2,3:3:0:0:
+324,224,185117,6,0,L|408:224,1,85,2|2,3:2|3:2,3:3:0:0:
+232,192,185480,2,0,L|232:96,1,85,8|2,3:2|3:2,3:3:0:0:
+316,108,185844,1,0,3:2:0:0:
+232,108,186026,1,2,3:2:0:0:
+408,108,186208,2,0,L|408:16,1,85,8|0,3:2|3:2,3:3:0:0:
+152,20,186571,6,0,B|68:20|68:20|156:20,1,170,6|0,3:2|3:2,3:3:0:0:
+332,132,187117,2,0,L|152:132,1,170,6|2,3:2|3:2,3:3:0:0:
+76,132,187662,2,0,L|76:216,1,85,8|0,3:2|3:2,3:3:0:0:
+252,280,188026,5,2,3:2:0:0:
+294,280,188116,1,2,3:2:0:0:
+337,280,188207,1,2,3:2:0:0:
+176,280,188390,1,8,3:2:0:0:
+344,280,188571,2,0,P|396:232|344:168,1,170,6|2,3:2|3:2,3:3:0:0:
+168,192,189117,2,0,L|80:192,1,85,8|0,3:2|3:2,3:3:0:0:
+344,168,189480,6,0,B|448:168|448:168|448:64,1,203.999993774414,10|8,3:2|3:2,3:3:0:0:
+352,68,190026,2,0,L|172:68,1,170,0|2,3:2|3:2,0:0:0:0:
+276,68,190571,2,0,L|276:164,1,85,8|0,3:2|3:2,3:3:0:0:
+96,192,190935,6,0,L|96:96,1,85,2|0,3:2|3:2,3:3:0:0:
+192,104,191299,2,0,L|100:104,1,85,8|2,3:2|3:2,3:3:0:0:
+284,192,191662,2,0,L|372:192,1,85,0|2,3:2|3:2,3:3:0:0:
+464,192,192026,2,0,L|464:148,1,42.5,8|0,3:2|0:0,3:3:0:0:
+420,132,192208,1,0,3:2:0:0:
+240,192,192390,6,0,L|64:192,1,170,2|8,3:2|3:2,3:3:0:0:
+156,192,192935,1,2,3:2:0:0:
+64,192,193117,2,0,L|64:100,1,85,2|2,3:2|3:2,3:3:0:0:
+156,192,193480,2,0,L|156:108,1,85,8|0,3:2|3:2,3:3:0:0:
+332,192,193844,6,0,L|376:192,2,42.5,2|2|2,3:2|3:2|3:2,0:0:0:0:
+156,192,194208,2,0,L|244:192,1,85,8|0,3:2|3:2,3:3:0:0:
+328,192,194571,1,2,3:2:0:0:
+236,192,194753,1,2,3:2:0:0:
+416,192,194935,2,0,L|416:284,1,85,8|0,3:2|3:2,3:3:0:0:
+160,336,195299,6,0,B|76:336|76:336|76:244,1,170,6|8,3:2|3:2,3:3:0:0:
+164,192,195844,2,0,L|344:192,1,170,6|2,3:2|3:2,3:3:0:0:
+240,192,196389,2,0,L|240:96,1,85,8|0,3:2|3:2,3:3:0:0:
+420,68,196753,6,0,L|420:164,1,85,6|2,3:2|3:2,3:3:0:0:
+372,156,197026,1,2,3:2:0:0:
+324,156,197117,2,0,L|240:156,1,85,8|2,3:2|3:2,3:3:0:0:
+332,156,197480,2,0,L|332:72,1,85,0|2,3:2|3:2,3:3:0:0:
+152,20,197844,2,0,L|108:20,2,42.5,8|0|0,3:2|3:2|3:2,0:0:0:0:
+328,192,198208,6,0,L|504:192,1,170,6|8,3:2|3:2,3:3:0:0:
+412,192,198753,1,2,3:2:0:0:
+236,192,198935,2,0,L|236:100,1,85,2|2,3:2|3:2,3:3:0:0:
+328,192,199298,2,0,L|240:192,1,85,8|2,3:2|3:2,0:0:0:0:
+64,192,199662,6,0,L|64:280,1,85,6|2,3:2|3:2,3:3:0:0:
+160,276,200026,1,8,3:2:0:0:
+112,276,200116,1,2,3:2:0:0:
+64,277,200207,1,8,3:2:0:0:
+240,192,200390,2,0,L|240:280,1,85,8|2,3:2|3:2,3:3:0:0:
+416,192,200753,2,0,L|508:192,1,85,8|2,3:2|3:2,3:3:0:0:
+240,192,201117,6,0,L|36:192,1,203.999993774414,6|8,3:2|3:2,3:3:0:0:
+128,192,201662,2,0,B|216:192|216:192|216:104,1,170,2|2,3:2|3:2,0:0:0:0:
+40,16,202208,2,0,L|40:104,1,85,8|0,3:2|3:2,3:3:0:0:
+216,110,202571,6,0,L|308:110,1,85,6|2,3:2|3:2,3:3:0:0:
+348,112,202844,1,2,3:2:0:0:
+396,112,202935,2,0,L|396:24,1,85,8|2,3:2|3:2,3:3:0:0:
+492,28,203299,2,0,L|404:28,1,85,4|2,3:2|3:2,3:3:0:0:
+232,32,203662,2,0,L|232:116,1,85,8|0,3:2|3:2,0:0:0:0:
+408,192,204026,6,0,L|500:192,2,85,6|2|8,3:2|3:2|3:2,3:3:0:0:
+316,192,204571,2,0,L|492:192,1,170,2|2,3:2|3:2,0:0:0:0:
+308,192,205117,2,0,L|220:192,1,85,8|0,3:2|3:2,3:3:0:0:
+48,192,205480,6,0,L|48:284,1,85,2|2,3:2|3:2,3:3:0:0:
+224,192,205844,2,0,L|312:192,1,85,8|2,3:2|3:2,0:0:0:0:
+216,192,206208,1,2,3:2:0:0:
+320,192,206390,1,2,3:2:0:0:
+144,192,206571,2,0,L|60:192,1,85,8|2,3:2|3:2,3:3:0:0:
+320,192,206935,6,0,L|408:192,1,85,6|2,3:2|3:2,3:3:0:0:
+405,192,207208,1,2,3:2:0:0:
+405,192,207299,1,8,3:2:0:0:
+312,192,207480,2,0,P|264:136|312:68,1,170,2|0,3:2|3:2,0:0:0:0:
+488,68,208026,2,0,L|488:152,1,85,8|2,3:2|3:2,3:3:0:0:
+308,192,208390,6,0,L|220:192,1,85,6|2,3:2|3:2,3:3:0:0:
+404,192,208753,2,0,L|404:280,1,85,8|2,3:2|3:2,3:3:0:0:
+308,276,209117,1,4,3:2:0:0:
+392,276,209299,1,2,3:2:0:0:
+216,276,209480,2,0,L|120:276,1,85,8|2,3:2|3:2,3:3:0:0:
+308,276,209844,6,0,L|308:192,1,85,6|2,3:2|3:2,3:3:0:0:
+264,192,210117,1,2,3:2:0:0:
+220,192,210208,1,8,3:2:0:0:
+308,192,210390,2,0,L|480:192,1,170,6|2,3:2|3:2,3:3:0:0:
+296,192,210935,2,0,L|296:100,1,85,8|2,3:2|3:2,3:3:0:0:
+120,28,211299,5,2,3:2:0:0:
+120,70,211389,1,2,3:2:0:0:
+120,113,211480,1,2,3:2:0:0:
+296,192,211662,2,0,L|200:192,1,85,8|8,3:2|3:2,3:3:0:0:
+120,113,212026,2,0,L|120:200,1,85,12|0,3:2|3:2,3:3:0:0:
+296,192,212390,1,12,3:2:0:0:
+196,192,212571,1,2,3:2:0:0:
+456,192,212753,6,0,L|456:280,1,85,10|0,3:2|3:2,3:3:0:0:
+276,336,213117,2,0,L|180:336,1,85,8|2,3:2|3:2,0:0:0:0:
+284,336,213480,2,0,L|284:240,1,85,2|2,3:2|3:2,0:0:0:0:
+104,192,213844,2,0,L|188:192,1,85,8|2,3:2|3:2,0:0:0:0:
+448,192,214208,6,0,L|448:100,1,85,2|2,3:2|3:2,3:3:0:0:
+400,108,214480,1,2,3:2:0:0:
+352,108,214571,1,8,3:2:0:0:
+448,192,214753,1,2,3:2:0:0:
+272,192,214935,2,0,L|272:108,1,85,0|2,3:2|3:2,3:3:0:0:
+96,192,215299,2,0,L|8:192,1,85,8|2,3:2|3:2,0:0:0:0:
+272,192,215662,6,0,L|360:192,1,85,6|2,3:2|3:2,3:3:0:0:
+180,192,216026,2,0,L|180:104,1,85,8|2,3:2|3:2,3:3:0:0:
+356,192,216390,1,2,3:2:0:0:
+256,192,216571,1,2,3:2:0:0:
+436,192,216753,2,0,L|332:192,1,85,8|2,3:2|3:2,3:3:0:0:
+96,192,217117,6,0,B|12:192|12:192|100:192,1,170,2|8,3:2|3:2,3:3:0:0:
+276,192,217662,2,0,L|364:192,2,85,2|2|2,3:2|3:2|3:2,0:0:0:0:
+98,192,218208,2,0,L|98:104,1,85,8|2,3:2|3:2,3:3:0:0:
+360,192,218571,6,0,P|412:128|360:80,1,170,6|8,3:2|3:2,3:3:0:0:
+312,80,219026,1,2,3:2:0:0:
+264,80,219117,1,2,3:2:0:0:
+88,80,219299,2,0,L|172:80,1,85,4|2,3:2|3:2,3:3:0:0:
+268,80,219662,2,0,L|268:168,1,85,8|2,3:2|3:2,3:3:0:0:
+88,192,220026,6,0,L|88:280,1,85,6|2,3:2|3:2,3:3:0:0:
+268,164,220390,1,8,3:2:0:0:
+180,192,220571,1,2,3:2:0:0:
+436,192,220753,2,0,L|436:96,1,85,0|2,0:0|3:2,0:0:0:0:
+260,44,221117,2,0,L|168:44,1,85,8|2,3:2|3:2,3:3:0:0:
+436,192,221480,6,0,L|352:192,1,85,6|2,3:2|3:2,3:3:0:0:
+308,192,221753,1,2,3:2:0:0:
+264,192,221844,1,8,3:2:0:0:
+356,192,222026,1,2,3:2:0:0:
+100,192,222208,2,0,L|16:192,1,85,4|2,3:2|3:2,3:3:0:0:
+108,192,222571,2,0,L|108:104,1,85,8|2,3:2|3:2,3:3:0:0:
+368,192,222935,6,0,L|416:192,2,42.5,2|2|2,3:2|3:2|3:2,3:3:0:0:
+188,192,223299,1,8,3:2:0:0:
+280,192,223480,1,0,3:2:0:0:
+328,192,223571,1,2,3:2:0:0:
+376,192,223662,2,0,L|376:104,1,85,8|2,3:2|3:2,0:0:0:0:
+196,48,224026,2,0,L|104:48,1,85,8|0,3:2|0:0,0:0:0:0:
+376,24,224390,6,0,P|436:96|376:168,1,203.999993774414,14|2,0:0|0:0,0:0:0:0:
+96,192,225117,2,0,L|96:280,1,85,8|0,0:0|0:0,0:0:0:0:
+180,276,225480,1,2,0:0:0:0:
+356,192,225662,1,2,0:0:0:0:
+400,192,225753,1,0,0:0:0:0:
+444,192,225844,6,0,L|444:280,1,85,0|0,0:0|0:0,0:0:0:0:
+360,276,226208,2,0,L|276:276,1,85,2|2,0:0|0:0,0:0:0:0:
+96,192,226571,2,0,L|96:276,1,85,8|0,0:0|0:0,0:0:0:0:
+181,277,226935,2,0,L|97:277,1,85,2|0,0:0|0:0,0:0:0:0:
+276,192,227299,6,0,B|360:192|360:192|360:104,1,170,2|2,0:0|0:0,0:0:0:0:
+276,104,227844,1,2,0:0:0:0:
+96,104,228026,2,0,L|96:188,1,85,8|0,0:0|0:0,0:0:0:0:
+180,192,228390,2,0,L|180:104,1,85,2|2,0:0|0:0,0:0:0:0:
+356,192,228753,5,2,0:0:0:0:
+440,192,228935,1,2,0:0:0:0:
+440,108,229117,1,0,0:0:0:0:
+356,108,229299,1,2,0:0:0:0:
+176,108,229480,2,0,L|176:192,1,85,8|0,0:0|0:0,0:0:0:0:
+264,192,229844,1,2,0:0:0:0:
+310,192,229934,1,0,0:0:0:0:
+356,192,230025,1,2,0:0:0:0:
+176,192,230208,6,0,L|4:192,1,170,6|2,0:0|0:0,0:0:0:0:
+92,192,230753,1,2,0:0:0:0:
+268,192,230935,2,0,L|356:192,1,85,8|0,0:0|0:0,0:0:0:0:
+260,192,231299,2,0,L|260:108,1,85,2|2,0:0|0:0,0:0:0:0:
+308,104,231571,1,0,0:0:0:0:
+356,104,231662,6,0,B|440:104|440:104|440:192,1,170,2|2,0:0|0:0,0:0:0:0:
+356,192,232208,1,2,0:0:0:0:
+180,192,232390,2,0,L|180:304,1,85,8|0,0:0|0:0,0:0:0:0:
+272,280,232753,2,0,L|272:232,2,42.5,2|0|0,0:0|0:0|0:0,0:0:0:0:
+92,280,233117,6,0,P|40:224|92:160,1,170,8|8,0:0|0:0,0:0:0:0:
+172,160,233662,1,8,0:0:0:0:
+352,160,233844,2,0,L|352:68,1,85,8|8,0:0|0:0,0:0:0:0:
+268,76,234208,1,2,0:0:0:0:
+360,76,234390,1,2,0:0:0:0:
+172,160,234571,6,0,L|172:100,2,42.5,2|2|2,0:0|0:0|0:0,0:0:0:0:
+268,192,234935,2,0,L|172:192,1,85,8|2,0:0|0:0,0:0:0:0:
+364,192,235298,2,0,L|364:280,1,85,8|2,0:0|0:0,0:0:0:0:
+183,192,235662,1,2,0:0:0:0:
+140,192,235752,1,2,0:0:0:0:
+98,192,235843,1,2,0:0:0:0:
+376,192,236026,5,6,0:0:0:0:
+224,192,236390,1,2,0:0:0:0:
+496,192,236753,6,0,L|496:20,1,170,4|0,0:0|0:0,0:0:0:0:
+256,192,237480,12,0,238571,0:0:0:0:
+256,192,238935,6,0,L|256:368,1,170,4|0,0:0|0:0,0:0:0:0:
+256,192,239662,12,0,246208,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/37902-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/37902-expected-conversion.json
new file mode 100644
index 0000000000..efc1144d05
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/37902-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":12017.0,"Objects":[{"StartTime":12017.0,"Position":48.0,"HyperDash":false},{"StartTime":12091.0,"Position":44.67537,"HyperDash":false},{"StartTime":12166.0,"Position":74.08286,"HyperDash":false},{"StartTime":12241.0,"Position":88.0374,"HyperDash":false},{"StartTime":12316.0,"Position":110.33316,"HyperDash":false},{"StartTime":12391.0,"Position":148.554672,"HyperDash":false},{"StartTime":12466.0,"Position":154.24501,"HyperDash":false},{"StartTime":12541.0,"Position":176.957489,"HyperDash":false},{"StartTime":12616.0,"Position":202.32959,"HyperDash":false},{"StartTime":12673.0,"Position":213.120667,"HyperDash":false},{"StartTime":12766.0,"Position":252.041336,"HyperDash":false}]},{"StartTime":13067.0,"Objects":[{"StartTime":13067.0,"Position":320.0,"HyperDash":false}]},{"StartTime":13367.0,"Objects":[{"StartTime":13367.0,"Position":464.0,"HyperDash":false}]},{"StartTime":13667.0,"Objects":[{"StartTime":13667.0,"Position":484.0,"HyperDash":false}]},{"StartTime":13966.0,"Objects":[{"StartTime":13966.0,"Position":444.0,"HyperDash":false}]},{"StartTime":14116.0,"Objects":[{"StartTime":14116.0,"Position":444.0,"HyperDash":false}]},{"StartTime":14416.0,"Objects":[{"StartTime":14416.0,"Position":464.0,"HyperDash":false},{"StartTime":14490.0,"Position":453.158569,"HyperDash":false},{"StartTime":14565.0,"Position":455.987671,"HyperDash":false},{"StartTime":14640.0,"Position":425.82608,"HyperDash":false},{"StartTime":14715.0,"Position":428.8319,"HyperDash":false},{"StartTime":14790.0,"Position":427.066162,"HyperDash":false},{"StartTime":14865.0,"Position":386.833649,"HyperDash":false},{"StartTime":14940.0,"Position":376.186218,"HyperDash":false},{"StartTime":15015.0,"Position":338.7702,"HyperDash":false},{"StartTime":15072.0,"Position":302.942566,"HyperDash":false},{"StartTime":15165.0,"Position":288.993134,"HyperDash":false}]},{"StartTime":15466.0,"Objects":[{"StartTime":15466.0,"Position":216.0,"HyperDash":false}]},{"StartTime":15766.0,"Objects":[{"StartTime":15766.0,"Position":72.0,"HyperDash":false}]},{"StartTime":16066.0,"Objects":[{"StartTime":16066.0,"Position":92.0,"HyperDash":false}]},{"StartTime":16366.0,"Objects":[{"StartTime":16366.0,"Position":52.0,"HyperDash":false}]},{"StartTime":16815.0,"Objects":[{"StartTime":16815.0,"Position":72.0,"HyperDash":false},{"StartTime":16889.0,"Position":79.642746,"HyperDash":false},{"StartTime":16964.0,"Position":89.107,"HyperDash":false},{"StartTime":17039.0,"Position":108.5208,"HyperDash":false},{"StartTime":17114.0,"Position":136.488754,"HyperDash":false},{"StartTime":17189.0,"Position":172.402725,"HyperDash":false},{"StartTime":17264.0,"Position":179.293137,"HyperDash":false},{"StartTime":17339.0,"Position":180.858765,"HyperDash":false},{"StartTime":17414.0,"Position":220.396072,"HyperDash":false},{"StartTime":17471.0,"Position":249.039856,"HyperDash":false},{"StartTime":17564.0,"Position":261.951355,"HyperDash":false}]},{"StartTime":17865.0,"Objects":[{"StartTime":17865.0,"Position":320.0,"HyperDash":false}]},{"StartTime":18165.0,"Objects":[{"StartTime":18165.0,"Position":432.0,"HyperDash":false}]},{"StartTime":18465.0,"Objects":[{"StartTime":18465.0,"Position":448.0,"HyperDash":false}]},{"StartTime":18765.0,"Objects":[{"StartTime":18765.0,"Position":504.0,"HyperDash":false}]},{"StartTime":18915.0,"Objects":[{"StartTime":18915.0,"Position":484.0,"HyperDash":false}]},{"StartTime":19215.0,"Objects":[{"StartTime":19215.0,"Position":504.0,"HyperDash":false},{"StartTime":19289.0,"Position":501.08197,"HyperDash":false},{"StartTime":19364.0,"Position":495.2131,"HyperDash":false},{"StartTime":19439.0,"Position":481.1128,"HyperDash":false},{"StartTime":19514.0,"Position":463.28656,"HyperDash":false},{"StartTime":19589.0,"Position":434.907227,"HyperDash":false},{"StartTime":19664.0,"Position":416.885864,"HyperDash":false},{"StartTime":19739.0,"Position":405.201477,"HyperDash":false},{"StartTime":19814.0,"Position":367.272461,"HyperDash":false},{"StartTime":19871.0,"Position":365.267731,"HyperDash":false},{"StartTime":19964.0,"Position":317.231384,"HyperDash":false}]},{"StartTime":20264.0,"Objects":[{"StartTime":20264.0,"Position":248.0,"HyperDash":false}]},{"StartTime":20564.0,"Objects":[{"StartTime":20564.0,"Position":268.0,"HyperDash":false}]},{"StartTime":20864.0,"Objects":[{"StartTime":20864.0,"Position":104.0,"HyperDash":false}]},{"StartTime":21164.0,"Objects":[{"StartTime":21164.0,"Position":248.0,"HyperDash":false}]},{"StartTime":21614.0,"Objects":[{"StartTime":21614.0,"Position":72.0,"HyperDash":false},{"StartTime":21688.0,"Position":89.44662,"HyperDash":false},{"StartTime":21763.0,"Position":74.09614,"HyperDash":false},{"StartTime":21838.0,"Position":60.5660629,"HyperDash":false},{"StartTime":21913.0,"Position":83.94954,"HyperDash":false},{"StartTime":21988.0,"Position":82.8251,"HyperDash":false},{"StartTime":22063.0,"Position":111.00235,"HyperDash":false},{"StartTime":22138.0,"Position":149.062637,"HyperDash":false},{"StartTime":22213.0,"Position":152.832413,"HyperDash":false},{"StartTime":22270.0,"Position":185.730072,"HyperDash":false},{"StartTime":22363.0,"Position":197.239868,"HyperDash":false}]},{"StartTime":22663.0,"Objects":[{"StartTime":22663.0,"Position":264.0,"HyperDash":false},{"StartTime":22737.0,"Position":291.67392,"HyperDash":false},{"StartTime":22812.0,"Position":313.532043,"HyperDash":false},{"StartTime":22887.0,"Position":338.985229,"HyperDash":false},{"StartTime":22962.0,"Position":361.614532,"HyperDash":false},{"StartTime":23037.0,"Position":383.778625,"HyperDash":false},{"StartTime":23112.0,"Position":403.659546,"HyperDash":false},{"StartTime":23187.0,"Position":404.466278,"HyperDash":false},{"StartTime":23262.0,"Position":433.744751,"HyperDash":false},{"StartTime":23337.0,"Position":430.5013,"HyperDash":false},{"StartTime":23412.0,"Position":450.112335,"HyperDash":false},{"StartTime":23469.0,"Position":448.32254,"HyperDash":false},{"StartTime":23562.0,"Position":455.8164,"HyperDash":false}]},{"StartTime":23863.0,"Objects":[{"StartTime":23863.0,"Position":456.0,"HyperDash":false},{"StartTime":23937.0,"Position":420.344849,"HyperDash":false},{"StartTime":24012.0,"Position":406.676758,"HyperDash":false},{"StartTime":24087.0,"Position":381.029877,"HyperDash":false},{"StartTime":24162.0,"Position":361.682678,"HyperDash":false},{"StartTime":24237.0,"Position":326.453217,"HyperDash":false},{"StartTime":24312.0,"Position":325.5777,"HyperDash":false},{"StartTime":24387.0,"Position":323.0864,"HyperDash":false},{"StartTime":24462.0,"Position":280.111542,"HyperDash":false},{"StartTime":24537.0,"Position":265.3847,"HyperDash":false},{"StartTime":24612.0,"Position":230.444534,"HyperDash":false},{"StartTime":24669.0,"Position":218.443909,"HyperDash":false},{"StartTime":24762.0,"Position":180.416458,"HyperDash":false}]},{"StartTime":25063.0,"Objects":[{"StartTime":25063.0,"Position":184.0,"HyperDash":false}]},{"StartTime":25662.0,"Objects":[{"StartTime":25662.0,"Position":204.0,"HyperDash":false}]},{"StartTime":26262.0,"Objects":[{"StartTime":26262.0,"Position":320.0,"HyperDash":false}]},{"StartTime":26862.0,"Objects":[{"StartTime":26862.0,"Position":300.0,"HyperDash":false}]},{"StartTime":27612.0,"Objects":[{"StartTime":27612.0,"Position":96.0,"HyperDash":false},{"StartTime":27686.0,"Position":93.6587143,"HyperDash":false},{"StartTime":27761.0,"Position":98.89105,"HyperDash":false},{"StartTime":27836.0,"Position":108.2196,"HyperDash":false},{"StartTime":27911.0,"Position":110.334862,"HyperDash":false},{"StartTime":27986.0,"Position":125.092537,"HyperDash":false},{"StartTime":28061.0,"Position":136.262375,"HyperDash":false},{"StartTime":28136.0,"Position":145.71701,"HyperDash":false},{"StartTime":28211.0,"Position":178.315811,"HyperDash":false},{"StartTime":28268.0,"Position":210.647934,"HyperDash":false},{"StartTime":28361.0,"Position":227.43338,"HyperDash":false}]},{"StartTime":28661.0,"Objects":[{"StartTime":28661.0,"Position":296.0,"HyperDash":false},{"StartTime":28735.0,"Position":302.1624,"HyperDash":false},{"StartTime":28810.0,"Position":292.488281,"HyperDash":false},{"StartTime":28885.0,"Position":289.777161,"HyperDash":false},{"StartTime":28960.0,"Position":280.749847,"HyperDash":false},{"StartTime":29035.0,"Position":254.2413,"HyperDash":false},{"StartTime":29110.0,"Position":259.131836,"HyperDash":false},{"StartTime":29185.0,"Position":252.401169,"HyperDash":false},{"StartTime":29260.0,"Position":227.176636,"HyperDash":false},{"StartTime":29335.0,"Position":210.735916,"HyperDash":false},{"StartTime":29410.0,"Position":186.45578,"HyperDash":false},{"StartTime":29467.0,"Position":186.31813,"HyperDash":false},{"StartTime":29560.0,"Position":140.066452,"HyperDash":false}]},{"StartTime":29861.0,"Objects":[{"StartTime":29861.0,"Position":72.0,"HyperDash":false},{"StartTime":29935.0,"Position":47.3521729,"HyperDash":false},{"StartTime":30010.0,"Position":57.88796,"HyperDash":false},{"StartTime":30085.0,"Position":33.71809,"HyperDash":false},{"StartTime":30160.0,"Position":48.9088,"HyperDash":false},{"StartTime":30235.0,"Position":57.53698,"HyperDash":false},{"StartTime":30310.0,"Position":45.7225456,"HyperDash":false},{"StartTime":30385.0,"Position":39.74385,"HyperDash":false},{"StartTime":30460.0,"Position":49.84991,"HyperDash":false},{"StartTime":30535.0,"Position":61.4995155,"HyperDash":false},{"StartTime":30610.0,"Position":64.31644,"HyperDash":false},{"StartTime":30667.0,"Position":81.55949,"HyperDash":false},{"StartTime":30760.0,"Position":93.98463,"HyperDash":false}]},{"StartTime":31060.0,"Objects":[{"StartTime":31060.0,"Position":160.0,"HyperDash":false}]},{"StartTime":31660.0,"Objects":[{"StartTime":31660.0,"Position":432.0,"HyperDash":false}]},{"StartTime":32260.0,"Objects":[{"StartTime":32260.0,"Position":412.0,"HyperDash":false}]},{"StartTime":32860.0,"Objects":[{"StartTime":32860.0,"Position":432.0,"HyperDash":false}]},{"StartTime":33610.0,"Objects":[{"StartTime":33610.0,"Position":256.0,"HyperDash":false},{"StartTime":33684.0,"Position":223.29216,"HyperDash":false},{"StartTime":33759.0,"Position":206.250412,"HyperDash":false},{"StartTime":33834.0,"Position":193.208679,"HyperDash":false},{"StartTime":33909.0,"Position":156.0,"HyperDash":false},{"StartTime":33984.0,"Position":175.874786,"HyperDash":false},{"StartTime":34059.0,"Position":205.916534,"HyperDash":false},{"StartTime":34116.0,"Position":211.948242,"HyperDash":false},{"StartTime":34209.0,"Position":256.0,"HyperDash":false}]},{"StartTime":34359.0,"Objects":[{"StartTime":34359.0,"Position":376.0,"HyperDash":false}]},{"StartTime":34659.0,"Objects":[{"StartTime":34659.0,"Position":256.0,"HyperDash":false}]},{"StartTime":34809.0,"Objects":[{"StartTime":34809.0,"Position":256.0,"HyperDash":false},{"StartTime":34883.0,"Position":283.707855,"HyperDash":false},{"StartTime":34958.0,"Position":305.749573,"HyperDash":false},{"StartTime":35033.0,"Position":327.791321,"HyperDash":false},{"StartTime":35108.0,"Position":356.0,"HyperDash":false},{"StartTime":35183.0,"Position":331.1252,"HyperDash":false},{"StartTime":35258.0,"Position":306.083466,"HyperDash":false},{"StartTime":35315.0,"Position":273.051758,"HyperDash":false},{"StartTime":35408.0,"Position":256.0,"HyperDash":false}]},{"StartTime":35559.0,"Objects":[{"StartTime":35559.0,"Position":128.0,"HyperDash":false}]},{"StartTime":35859.0,"Objects":[{"StartTime":35859.0,"Position":256.0,"HyperDash":false}]},{"StartTime":36009.0,"Objects":[{"StartTime":36009.0,"Position":256.0,"HyperDash":false},{"StartTime":36083.0,"Position":230.29216,"HyperDash":false},{"StartTime":36158.0,"Position":206.250412,"HyperDash":false},{"StartTime":36233.0,"Position":193.208679,"HyperDash":false},{"StartTime":36308.0,"Position":156.0,"HyperDash":false},{"StartTime":36383.0,"Position":191.874786,"HyperDash":false},{"StartTime":36458.0,"Position":205.916534,"HyperDash":false},{"StartTime":36515.0,"Position":241.948242,"HyperDash":false},{"StartTime":36608.0,"Position":256.0,"HyperDash":false}]},{"StartTime":36758.0,"Objects":[{"StartTime":36758.0,"Position":376.0,"HyperDash":false}]},{"StartTime":37058.0,"Objects":[{"StartTime":37058.0,"Position":328.0,"HyperDash":false},{"StartTime":37132.0,"Position":343.611969,"HyperDash":false},{"StartTime":37207.0,"Position":376.99472,"HyperDash":false},{"StartTime":37282.0,"Position":386.735321,"HyperDash":false},{"StartTime":37357.0,"Position":419.270874,"HyperDash":false},{"StartTime":37432.0,"Position":438.334564,"HyperDash":false},{"StartTime":37507.0,"Position":444.7913,"HyperDash":false},{"StartTime":37582.0,"Position":467.3238,"HyperDash":false},{"StartTime":37657.0,"Position":454.839142,"HyperDash":false},{"StartTime":37732.0,"Position":439.412842,"HyperDash":false},{"StartTime":37807.0,"Position":444.935333,"HyperDash":false},{"StartTime":37882.0,"Position":421.561951,"HyperDash":false},{"StartTime":37957.0,"Position":419.5829,"HyperDash":false},{"StartTime":38032.0,"Position":392.116547,"HyperDash":false},{"StartTime":38107.0,"Position":377.418579,"HyperDash":false},{"StartTime":38182.0,"Position":348.0527,"HyperDash":false},{"StartTime":38257.0,"Position":328.0,"HyperDash":false},{"StartTime":38332.0,"Position":347.832336,"HyperDash":false},{"StartTime":38407.0,"Position":377.206635,"HyperDash":false},{"StartTime":38482.0,"Position":402.925934,"HyperDash":false},{"StartTime":38557.0,"Position":419.42688,"HyperDash":false},{"StartTime":38632.0,"Position":422.448273,"HyperDash":false},{"StartTime":38707.0,"Position":444.8633,"HyperDash":false},{"StartTime":38764.0,"Position":446.1127,"HyperDash":false},{"StartTime":38857.0,"Position":454.839142,"HyperDash":false}]},{"StartTime":39607.0,"Objects":[{"StartTime":39607.0,"Position":440.0,"HyperDash":false}]},{"StartTime":39907.0,"Objects":[{"StartTime":39907.0,"Position":296.0,"HyperDash":false}]},{"StartTime":40207.0,"Objects":[{"StartTime":40207.0,"Position":316.0,"HyperDash":false}]},{"StartTime":40357.0,"Objects":[{"StartTime":40357.0,"Position":256.0,"HyperDash":false},{"StartTime":40431.0,"Position":212.250839,"HyperDash":false},{"StartTime":40506.0,"Position":206.167221,"HyperDash":false},{"StartTime":40563.0,"Position":200.103668,"HyperDash":false},{"StartTime":40656.0,"Position":156.0,"HyperDash":false}]},{"StartTime":41107.0,"Objects":[{"StartTime":41107.0,"Position":64.0,"HyperDash":false}]},{"StartTime":41407.0,"Objects":[{"StartTime":41407.0,"Position":256.0,"HyperDash":false}]},{"StartTime":41557.0,"Objects":[{"StartTime":41557.0,"Position":192.0,"HyperDash":false},{"StartTime":41631.0,"Position":213.749161,"HyperDash":false},{"StartTime":41706.0,"Position":241.832779,"HyperDash":false},{"StartTime":41763.0,"Position":251.896332,"HyperDash":false},{"StartTime":41856.0,"Position":292.0,"HyperDash":false}]},{"StartTime":42307.0,"Objects":[{"StartTime":42307.0,"Position":392.0,"HyperDash":false}]},{"StartTime":42606.0,"Objects":[{"StartTime":42606.0,"Position":288.0,"HyperDash":false}]},{"StartTime":42756.0,"Objects":[{"StartTime":42756.0,"Position":256.0,"HyperDash":false},{"StartTime":42830.0,"Position":220.250839,"HyperDash":false},{"StartTime":42905.0,"Position":206.167221,"HyperDash":false},{"StartTime":42962.0,"Position":205.103668,"HyperDash":false},{"StartTime":43055.0,"Position":156.0,"HyperDash":false}]},{"StartTime":43356.0,"Objects":[{"StartTime":43356.0,"Position":172.0,"HyperDash":false}]},{"StartTime":43506.0,"Objects":[{"StartTime":43506.0,"Position":144.0,"HyperDash":false}]},{"StartTime":43656.0,"Objects":[{"StartTime":43656.0,"Position":172.0,"HyperDash":false}]},{"StartTime":43956.0,"Objects":[{"StartTime":43956.0,"Position":288.0,"HyperDash":false}]},{"StartTime":44106.0,"Objects":[{"StartTime":44106.0,"Position":230.0,"HyperDash":false}]},{"StartTime":44256.0,"Objects":[{"StartTime":44256.0,"Position":250.0,"HyperDash":false}]},{"StartTime":44556.0,"Objects":[{"StartTime":44556.0,"Position":374.0,"HyperDash":false}]},{"StartTime":44706.0,"Objects":[{"StartTime":44706.0,"Position":302.0,"HyperDash":false}]},{"StartTime":44856.0,"Objects":[{"StartTime":44856.0,"Position":282.0,"HyperDash":false}]},{"StartTime":45605.0,"Objects":[{"StartTime":45605.0,"Position":256.0,"HyperDash":false},{"StartTime":45679.0,"Position":263.6996,"HyperDash":false},{"StartTime":45754.0,"Position":306.0,"HyperDash":false},{"StartTime":45829.0,"Position":275.233643,"HyperDash":false},{"StartTime":45904.0,"Position":256.0,"HyperDash":false},{"StartTime":45979.0,"Position":286.8331,"HyperDash":false},{"StartTime":46054.0,"Position":306.0,"HyperDash":false},{"StartTime":46129.0,"Position":293.100128,"HyperDash":false},{"StartTime":46204.0,"Position":256.0,"HyperDash":false},{"StartTime":46261.0,"Position":261.958618,"HyperDash":false},{"StartTime":46354.0,"Position":306.0,"HyperDash":false}]},{"StartTime":46655.0,"Objects":[{"StartTime":46655.0,"Position":376.0,"HyperDash":false}]},{"StartTime":46955.0,"Objects":[{"StartTime":46955.0,"Position":448.0,"HyperDash":false}]},{"StartTime":47255.0,"Objects":[{"StartTime":47255.0,"Position":459.0,"HyperDash":false}]},{"StartTime":47555.0,"Objects":[{"StartTime":47555.0,"Position":304.0,"HyperDash":false}]},{"StartTime":47705.0,"Objects":[{"StartTime":47705.0,"Position":376.0,"HyperDash":false}]},{"StartTime":48005.0,"Objects":[{"StartTime":48005.0,"Position":376.0,"HyperDash":false},{"StartTime":48079.0,"Position":381.749176,"HyperDash":false},{"StartTime":48154.0,"Position":426.0,"HyperDash":false},{"StartTime":48211.0,"Position":410.103668,"HyperDash":false},{"StartTime":48304.0,"Position":376.0,"HyperDash":false}]},{"StartTime":48454.0,"Objects":[{"StartTime":48454.0,"Position":232.0,"HyperDash":false}]},{"StartTime":48604.0,"Objects":[{"StartTime":48604.0,"Position":304.0,"HyperDash":false}]},{"StartTime":48754.0,"Objects":[{"StartTime":48754.0,"Position":224.0,"HyperDash":false}]},{"StartTime":49054.0,"Objects":[{"StartTime":49054.0,"Position":160.0,"HyperDash":false}]},{"StartTime":49354.0,"Objects":[{"StartTime":49354.0,"Position":80.0,"HyperDash":false}]},{"StartTime":49654.0,"Objects":[{"StartTime":49654.0,"Position":16.0,"HyperDash":false}]},{"StartTime":49954.0,"Objects":[{"StartTime":49954.0,"Position":80.0,"HyperDash":false}]},{"StartTime":50404.0,"Objects":[{"StartTime":50404.0,"Position":48.0,"HyperDash":false},{"StartTime":50460.0,"Position":52.7919464,"HyperDash":false},{"StartTime":50553.0,"Position":98.0,"HyperDash":false}]},{"StartTime":50704.0,"Objects":[{"StartTime":50704.0,"Position":136.0,"HyperDash":false},{"StartTime":50760.0,"Position":160.791946,"HyperDash":false},{"StartTime":50853.0,"Position":186.0,"HyperDash":false}]},{"StartTime":51003.0,"Objects":[{"StartTime":51003.0,"Position":224.0,"HyperDash":false},{"StartTime":51059.0,"Position":255.791946,"HyperDash":false},{"StartTime":51152.0,"Position":274.0,"HyperDash":false}]},{"StartTime":51453.0,"Objects":[{"StartTime":51453.0,"Position":400.0,"HyperDash":false}]},{"StartTime":51753.0,"Objects":[{"StartTime":51753.0,"Position":432.0,"HyperDash":false}]},{"StartTime":52053.0,"Objects":[{"StartTime":52053.0,"Position":488.0,"HyperDash":false}]},{"StartTime":52353.0,"Objects":[{"StartTime":52353.0,"Position":507.0,"HyperDash":false}]},{"StartTime":52503.0,"Objects":[{"StartTime":52503.0,"Position":508.0,"HyperDash":false}]},{"StartTime":52803.0,"Objects":[{"StartTime":52803.0,"Position":488.0,"HyperDash":false},{"StartTime":52877.0,"Position":473.278381,"HyperDash":false},{"StartTime":52952.0,"Position":438.0,"HyperDash":false},{"StartTime":53027.0,"Position":471.832977,"HyperDash":false},{"StartTime":53102.0,"Position":488.0,"HyperDash":false},{"StartTime":53159.0,"Position":476.069031,"HyperDash":false},{"StartTime":53252.0,"Position":438.0,"HyperDash":false}]},{"StartTime":53403.0,"Objects":[{"StartTime":53403.0,"Position":368.0,"HyperDash":false}]},{"StartTime":53553.0,"Objects":[{"StartTime":53553.0,"Position":368.0,"HyperDash":false},{"StartTime":53627.0,"Position":341.4955,"HyperDash":false},{"StartTime":53702.0,"Position":320.428864,"HyperDash":false},{"StartTime":53777.0,"Position":295.8305,"HyperDash":false},{"StartTime":53852.0,"Position":289.023224,"HyperDash":false},{"StartTime":53927.0,"Position":294.625671,"HyperDash":false},{"StartTime":54002.0,"Position":320.1455,"HyperDash":false},{"StartTime":54059.0,"Position":332.386719,"HyperDash":false},{"StartTime":54152.0,"Position":368.0,"HyperDash":false}]},{"StartTime":54452.0,"Objects":[{"StartTime":54452.0,"Position":368.0,"HyperDash":false},{"StartTime":54526.0,"Position":361.6083,"HyperDash":false},{"StartTime":54601.0,"Position":346.408356,"HyperDash":false},{"StartTime":54676.0,"Position":309.5409,"HyperDash":false},{"StartTime":54751.0,"Position":302.165344,"HyperDash":false},{"StartTime":54826.0,"Position":280.769684,"HyperDash":false},{"StartTime":54901.0,"Position":252.958511,"HyperDash":false},{"StartTime":54976.0,"Position":235.981033,"HyperDash":false},{"StartTime":55051.0,"Position":202.952667,"HyperDash":false},{"StartTime":55108.0,"Position":198.931656,"HyperDash":false},{"StartTime":55201.0,"Position":152.9338,"HyperDash":false}]},{"StartTime":60000.0,"Objects":[{"StartTime":60000.0,"Position":256.0,"HyperDash":false},{"StartTime":60074.0,"Position":256.3498,"HyperDash":false},{"StartTime":60149.0,"Position":264.8665,"HyperDash":false},{"StartTime":60224.0,"Position":286.383179,"HyperDash":false},{"StartTime":60299.0,"Position":305.899872,"HyperDash":false},{"StartTime":60374.0,"Position":314.416565,"HyperDash":false},{"StartTime":60449.0,"Position":335.933228,"HyperDash":false},{"StartTime":60524.0,"Position":344.449921,"HyperDash":false},{"StartTime":60599.0,"Position":355.9666,"HyperDash":false},{"StartTime":60656.0,"Position":381.4793,"HyperDash":false},{"StartTime":60749.0,"Position":381.0,"HyperDash":false}]},{"StartTime":61050.0,"Objects":[{"StartTime":61050.0,"Position":416.0,"HyperDash":false},{"StartTime":61124.0,"Position":413.0,"HyperDash":false},{"StartTime":61199.0,"Position":430.0,"HyperDash":false},{"StartTime":61274.0,"Position":403.0,"HyperDash":false},{"StartTime":61349.0,"Position":416.0,"HyperDash":false},{"StartTime":61424.0,"Position":404.0,"HyperDash":false},{"StartTime":61499.0,"Position":419.0,"HyperDash":false},{"StartTime":61574.0,"Position":426.0,"HyperDash":false},{"StartTime":61649.0,"Position":416.0,"HyperDash":false},{"StartTime":61715.0,"Position":396.0,"HyperDash":false},{"StartTime":61781.0,"Position":420.0,"HyperDash":false},{"StartTime":61847.0,"Position":421.0,"HyperDash":false},{"StartTime":61949.0,"Position":416.0,"HyperDash":false}]},{"StartTime":62250.0,"Objects":[{"StartTime":62250.0,"Position":416.0,"HyperDash":false},{"StartTime":62324.0,"Position":403.652954,"HyperDash":false},{"StartTime":62399.0,"Position":373.139038,"HyperDash":false},{"StartTime":62474.0,"Position":359.625122,"HyperDash":false},{"StartTime":62549.0,"Position":366.111237,"HyperDash":false},{"StartTime":62624.0,"Position":362.597321,"HyperDash":false},{"StartTime":62699.0,"Position":334.083435,"HyperDash":false},{"StartTime":62774.0,"Position":344.569519,"HyperDash":false},{"StartTime":62849.0,"Position":316.0556,"HyperDash":false},{"StartTime":62915.0,"Position":298.0434,"HyperDash":false},{"StartTime":62981.0,"Position":275.031158,"HyperDash":false},{"StartTime":63047.0,"Position":265.018921,"HyperDash":false},{"StartTime":63149.0,"Position":266.0,"HyperDash":false}]},{"StartTime":63449.0,"Objects":[{"StartTime":63449.0,"Position":232.0,"HyperDash":false},{"StartTime":63523.0,"Position":246.0,"HyperDash":false},{"StartTime":63598.0,"Position":233.0,"HyperDash":false},{"StartTime":63673.0,"Position":236.0,"HyperDash":false},{"StartTime":63748.0,"Position":232.0,"HyperDash":false},{"StartTime":63823.0,"Position":219.0,"HyperDash":false},{"StartTime":63898.0,"Position":231.0,"HyperDash":false},{"StartTime":63973.0,"Position":242.0,"HyperDash":false},{"StartTime":64048.0,"Position":232.0,"HyperDash":false},{"StartTime":64123.0,"Position":228.0,"HyperDash":false},{"StartTime":64198.0,"Position":215.0,"HyperDash":false},{"StartTime":64273.0,"Position":243.0,"HyperDash":false},{"StartTime":64348.0,"Position":232.0,"HyperDash":false},{"StartTime":64405.0,"Position":249.0,"HyperDash":false},{"StartTime":64498.0,"Position":232.0,"HyperDash":false}]},{"StartTime":64799.0,"Objects":[{"StartTime":64799.0,"Position":160.0,"HyperDash":false},{"StartTime":64873.0,"Position":144.3059,"HyperDash":false},{"StartTime":64948.0,"Position":110.278084,"HyperDash":false},{"StartTime":65023.0,"Position":84.25028,"HyperDash":false},{"StartTime":65098.0,"Position":60.0,"HyperDash":false},{"StartTime":65173.0,"Position":96.80534,"HyperDash":false},{"StartTime":65248.0,"Position":109.833145,"HyperDash":false},{"StartTime":65323.0,"Position":135.860962,"HyperDash":false},{"StartTime":65398.0,"Position":160.0,"HyperDash":false},{"StartTime":65473.0,"Position":122.08342,"HyperDash":false},{"StartTime":65548.0,"Position":110.055618,"HyperDash":false},{"StartTime":65605.0,"Position":79.03449,"HyperDash":false},{"StartTime":65698.0,"Position":60.0,"HyperDash":false}]},{"StartTime":65998.0,"Objects":[{"StartTime":65998.0,"Position":56.0,"HyperDash":false}]},{"StartTime":66298.0,"Objects":[{"StartTime":66298.0,"Position":36.0,"HyperDash":false}]},{"StartTime":66598.0,"Objects":[{"StartTime":66598.0,"Position":63.0,"HyperDash":false}]},{"StartTime":66898.0,"Objects":[{"StartTime":66898.0,"Position":200.0,"HyperDash":false}]},{"StartTime":67198.0,"Objects":[{"StartTime":67198.0,"Position":287.0,"HyperDash":false},{"StartTime":67272.0,"Position":341.0,"HyperDash":false},{"StartTime":67347.0,"Position":145.0,"HyperDash":false},{"StartTime":67422.0,"Position":84.0,"HyperDash":false},{"StartTime":67497.0,"Position":189.0,"HyperDash":false},{"StartTime":67572.0,"Position":498.0,"HyperDash":false},{"StartTime":67647.0,"Position":416.0,"HyperDash":false},{"StartTime":67722.0,"Position":211.0,"HyperDash":false},{"StartTime":67797.0,"Position":167.0,"HyperDash":false},{"StartTime":67872.0,"Position":466.0,"HyperDash":false},{"StartTime":67947.0,"Position":114.0,"HyperDash":false},{"StartTime":68022.0,"Position":125.0,"HyperDash":false},{"StartTime":68097.0,"Position":457.0,"HyperDash":false},{"StartTime":68172.0,"Position":131.0,"HyperDash":false},{"StartTime":68247.0,"Position":337.0,"HyperDash":false},{"StartTime":68322.0,"Position":39.0,"HyperDash":false},{"StartTime":68397.0,"Position":311.0,"HyperDash":false},{"StartTime":68472.0,"Position":208.0,"HyperDash":false},{"StartTime":68547.0,"Position":357.0,"HyperDash":false},{"StartTime":68622.0,"Position":240.0,"HyperDash":false},{"StartTime":68697.0,"Position":35.0,"HyperDash":false},{"StartTime":68772.0,"Position":254.0,"HyperDash":false},{"StartTime":68847.0,"Position":292.0,"HyperDash":false},{"StartTime":68922.0,"Position":369.0,"HyperDash":false},{"StartTime":68997.0,"Position":14.0,"HyperDash":false},{"StartTime":69072.0,"Position":390.0,"HyperDash":false},{"StartTime":69147.0,"Position":286.0,"HyperDash":false},{"StartTime":69222.0,"Position":92.0,"HyperDash":false},{"StartTime":69297.0,"Position":170.0,"HyperDash":false},{"StartTime":69372.0,"Position":93.0,"HyperDash":false},{"StartTime":69447.0,"Position":139.0,"HyperDash":false},{"StartTime":69522.0,"Position":301.0,"HyperDash":false},{"StartTime":69597.0,"Position":137.0,"HyperDash":false}]},{"StartTime":69897.0,"Objects":[{"StartTime":69897.0,"Position":256.0,"HyperDash":false}]},{"StartTime":70047.0,"Objects":[{"StartTime":70047.0,"Position":320.0,"HyperDash":false}]},{"StartTime":70197.0,"Objects":[{"StartTime":70197.0,"Position":340.0,"HyperDash":false}]},{"StartTime":70497.0,"Objects":[{"StartTime":70497.0,"Position":340.0,"HyperDash":false}]},{"StartTime":70797.0,"Objects":[{"StartTime":70797.0,"Position":300.0,"HyperDash":false}]},{"StartTime":71096.0,"Objects":[{"StartTime":71096.0,"Position":248.0,"HyperDash":false}]},{"StartTime":71246.0,"Objects":[{"StartTime":71246.0,"Position":168.0,"HyperDash":false}]},{"StartTime":71396.0,"Objects":[{"StartTime":71396.0,"Position":184.0,"HyperDash":false}]},{"StartTime":71696.0,"Objects":[{"StartTime":71696.0,"Position":24.0,"HyperDash":false}]},{"StartTime":71996.0,"Objects":[{"StartTime":71996.0,"Position":104.0,"HyperDash":false},{"StartTime":72070.0,"Position":79.25084,"HyperDash":false},{"StartTime":72145.0,"Position":54.0,"HyperDash":false},{"StartTime":72202.0,"Position":54.8963242,"HyperDash":false},{"StartTime":72295.0,"Position":104.0,"HyperDash":false}]},{"StartTime":72446.0,"Objects":[{"StartTime":72446.0,"Position":192.0,"HyperDash":false}]},{"StartTime":72746.0,"Objects":[{"StartTime":72746.0,"Position":16.0,"HyperDash":false}]},{"StartTime":73046.0,"Objects":[{"StartTime":73046.0,"Position":104.0,"HyperDash":false},{"StartTime":73120.0,"Position":123.738281,"HyperDash":false},{"StartTime":73195.0,"Position":123.252632,"HyperDash":false},{"StartTime":73270.0,"Position":144.834549,"HyperDash":false},{"StartTime":73345.0,"Position":166.952621,"HyperDash":false},{"StartTime":73420.0,"Position":208.089325,"HyperDash":false},{"StartTime":73495.0,"Position":215.686081,"HyperDash":false},{"StartTime":73570.0,"Position":248.499512,"HyperDash":false},{"StartTime":73645.0,"Position":265.421631,"HyperDash":false},{"StartTime":73720.0,"Position":275.398376,"HyperDash":false},{"StartTime":73795.0,"Position":315.4022,"HyperDash":false},{"StartTime":73870.0,"Position":351.418854,"HyperDash":false},{"StartTime":73945.0,"Position":365.440521,"HyperDash":false},{"StartTime":74002.0,"Position":402.458252,"HyperDash":false},{"StartTime":74095.0,"Position":415.4878,"HyperDash":false}]},{"StartTime":74395.0,"Objects":[{"StartTime":74395.0,"Position":416.0,"HyperDash":false},{"StartTime":74469.0,"Position":417.7021,"HyperDash":false},{"StartTime":74544.0,"Position":397.104645,"HyperDash":false},{"StartTime":74619.0,"Position":387.306122,"HyperDash":false},{"StartTime":74694.0,"Position":350.779144,"HyperDash":false},{"StartTime":74769.0,"Position":366.889374,"HyperDash":false},{"StartTime":74844.0,"Position":396.758,"HyperDash":false},{"StartTime":74919.0,"Position":408.543182,"HyperDash":false},{"StartTime":74994.0,"Position":416.0,"HyperDash":false},{"StartTime":75069.0,"Position":394.62265,"HyperDash":false},{"StartTime":75144.0,"Position":396.931335,"HyperDash":false},{"StartTime":75201.0,"Position":363.6833,"HyperDash":false},{"StartTime":75294.0,"Position":350.779144,"HyperDash":false}]},{"StartTime":75595.0,"Objects":[{"StartTime":75595.0,"Position":280.0,"HyperDash":false}]},{"StartTime":75895.0,"Objects":[{"StartTime":75895.0,"Position":136.0,"HyperDash":false}]},{"StartTime":76195.0,"Objects":[{"StartTime":76195.0,"Position":280.0,"HyperDash":false}]},{"StartTime":76345.0,"Objects":[{"StartTime":76345.0,"Position":208.0,"HyperDash":false}]},{"StartTime":76495.0,"Objects":[{"StartTime":76495.0,"Position":228.0,"HyperDash":false}]},{"StartTime":76794.0,"Objects":[{"StartTime":76794.0,"Position":21.0,"HyperDash":false},{"StartTime":76859.0,"Position":193.0,"HyperDash":false},{"StartTime":76925.0,"Position":52.0,"HyperDash":false},{"StartTime":76990.0,"Position":466.0,"HyperDash":false},{"StartTime":77056.0,"Position":135.0,"HyperDash":false},{"StartTime":77121.0,"Position":121.0,"HyperDash":false},{"StartTime":77187.0,"Position":427.0,"HyperDash":false},{"StartTime":77253.0,"Position":176.0,"HyperDash":false},{"StartTime":77318.0,"Position":96.0,"HyperDash":false},{"StartTime":77384.0,"Position":345.0,"HyperDash":false},{"StartTime":77449.0,"Position":11.0,"HyperDash":false},{"StartTime":77515.0,"Position":393.0,"HyperDash":false},{"StartTime":77581.0,"Position":440.0,"HyperDash":false},{"StartTime":77646.0,"Position":179.0,"HyperDash":false},{"StartTime":77712.0,"Position":470.0,"HyperDash":false},{"StartTime":77777.0,"Position":89.0,"HyperDash":false},{"StartTime":77843.0,"Position":408.0,"HyperDash":false},{"StartTime":77909.0,"Position":243.0,"HyperDash":false},{"StartTime":77974.0,"Position":78.0,"HyperDash":false},{"StartTime":78040.0,"Position":172.0,"HyperDash":false},{"StartTime":78105.0,"Position":450.0,"HyperDash":false},{"StartTime":78171.0,"Position":231.0,"HyperDash":false},{"StartTime":78237.0,"Position":118.0,"HyperDash":false},{"StartTime":78302.0,"Position":511.0,"HyperDash":false},{"StartTime":78368.0,"Position":333.0,"HyperDash":false},{"StartTime":78433.0,"Position":234.0,"HyperDash":false},{"StartTime":78499.0,"Position":228.0,"HyperDash":false},{"StartTime":78565.0,"Position":302.0,"HyperDash":false},{"StartTime":78630.0,"Position":390.0,"HyperDash":false},{"StartTime":78696.0,"Position":75.0,"HyperDash":false},{"StartTime":78761.0,"Position":506.0,"HyperDash":false},{"StartTime":78827.0,"Position":3.0,"HyperDash":false},{"StartTime":78893.0,"Position":289.0,"HyperDash":false}]},{"StartTime":79194.0,"Objects":[{"StartTime":79194.0,"Position":256.0,"HyperDash":false},{"StartTime":79268.0,"Position":249.6807,"HyperDash":false},{"StartTime":79343.0,"Position":245.6988,"HyperDash":false},{"StartTime":79418.0,"Position":237.299881,"HyperDash":false},{"StartTime":79493.0,"Position":211.7363,"HyperDash":false},{"StartTime":79550.0,"Position":208.713608,"HyperDash":false},{"StartTime":79643.0,"Position":165.0138,"HyperDash":false}]},{"StartTime":79793.0,"Objects":[{"StartTime":79793.0,"Position":128.0,"HyperDash":false},{"StartTime":79867.0,"Position":121.464394,"HyperDash":false},{"StartTime":79942.0,"Position":81.6096039,"HyperDash":false},{"StartTime":80017.0,"Position":52.0348129,"HyperDash":false},{"StartTime":80092.0,"Position":60.8326073,"HyperDash":false},{"StartTime":80149.0,"Position":53.9088326,"HyperDash":false},{"StartTime":80242.0,"Position":56.0562,"HyperDash":false}]},{"StartTime":80543.0,"Objects":[{"StartTime":80543.0,"Position":76.0,"HyperDash":false}]},{"StartTime":80843.0,"Objects":[{"StartTime":80843.0,"Position":56.0,"HyperDash":false}]},{"StartTime":81143.0,"Objects":[{"StartTime":81143.0,"Position":200.0,"HyperDash":false}]},{"StartTime":81443.0,"Objects":[{"StartTime":81443.0,"Position":180.0,"HyperDash":false}]},{"StartTime":81593.0,"Objects":[{"StartTime":81593.0,"Position":200.0,"HyperDash":false},{"StartTime":81667.0,"Position":218.643234,"HyperDash":false},{"StartTime":81742.0,"Position":249.328659,"HyperDash":false},{"StartTime":81817.0,"Position":278.3164,"HyperDash":false},{"StartTime":81892.0,"Position":296.1659,"HyperDash":false},{"StartTime":81967.0,"Position":318.451416,"HyperDash":false},{"StartTime":82042.0,"Position":336.820862,"HyperDash":false},{"StartTime":82117.0,"Position":362.178284,"HyperDash":false},{"StartTime":82192.0,"Position":369.602051,"HyperDash":false},{"StartTime":82267.0,"Position":338.393555,"HyperDash":false},{"StartTime":82342.0,"Position":337.067169,"HyperDash":false},{"StartTime":82417.0,"Position":321.719727,"HyperDash":false},{"StartTime":82492.0,"Position":296.459869,"HyperDash":false},{"StartTime":82567.0,"Position":256.630157,"HyperDash":false},{"StartTime":82642.0,"Position":249.6552,"HyperDash":false},{"StartTime":82699.0,"Position":228.9382,"HyperDash":false},{"StartTime":82792.0,"Position":200.0,"HyperDash":false}]},{"StartTime":82942.0,"Objects":[{"StartTime":82942.0,"Position":200.0,"HyperDash":false}]},{"StartTime":83242.0,"Objects":[{"StartTime":83242.0,"Position":180.0,"HyperDash":false}]},{"StartTime":83542.0,"Objects":[{"StartTime":83542.0,"Position":180.0,"HyperDash":false}]},{"StartTime":83692.0,"Objects":[{"StartTime":83692.0,"Position":220.0,"HyperDash":false}]},{"StartTime":83842.0,"Objects":[{"StartTime":83842.0,"Position":220.0,"HyperDash":false}]},{"StartTime":83992.0,"Objects":[{"StartTime":83992.0,"Position":200.0,"HyperDash":false},{"StartTime":84066.0,"Position":214.895981,"HyperDash":false},{"StartTime":84141.0,"Position":217.903488,"HyperDash":false},{"StartTime":84216.0,"Position":225.305542,"HyperDash":false},{"StartTime":84291.0,"Position":263.285431,"HyperDash":false},{"StartTime":84348.0,"Position":288.04718,"HyperDash":false},{"StartTime":84441.0,"Position":312.975067,"HyperDash":false}]},{"StartTime":84592.0,"Objects":[{"StartTime":84592.0,"Position":344.0,"HyperDash":false},{"StartTime":84666.0,"Position":386.711,"HyperDash":false},{"StartTime":84741.0,"Position":393.655243,"HyperDash":false},{"StartTime":84816.0,"Position":433.20578,"HyperDash":false},{"StartTime":84891.0,"Position":441.4496,"HyperDash":false},{"StartTime":84948.0,"Position":466.8295,"HyperDash":false},{"StartTime":85041.0,"Position":473.5803,"HyperDash":false}]},{"StartTime":85341.0,"Objects":[{"StartTime":85341.0,"Position":464.0,"HyperDash":false}]},{"StartTime":85641.0,"Objects":[{"StartTime":85641.0,"Position":480.0,"HyperDash":false}]},{"StartTime":85941.0,"Objects":[{"StartTime":85941.0,"Position":464.0,"HyperDash":false}]},{"StartTime":86241.0,"Objects":[{"StartTime":86241.0,"Position":336.0,"HyperDash":false}]},{"StartTime":86391.0,"Objects":[{"StartTime":86391.0,"Position":400.0,"HyperDash":false},{"StartTime":86465.0,"Position":384.340973,"HyperDash":false},{"StartTime":86540.0,"Position":350.5981,"HyperDash":false},{"StartTime":86615.0,"Position":323.677429,"HyperDash":false},{"StartTime":86690.0,"Position":304.500153,"HyperDash":false},{"StartTime":86765.0,"Position":291.3181,"HyperDash":false},{"StartTime":86840.0,"Position":264.219,"HyperDash":false},{"StartTime":86915.0,"Position":246.938583,"HyperDash":false},{"StartTime":86990.0,"Position":217.532028,"HyperDash":false},{"StartTime":87065.0,"Position":225.6241,"HyperDash":false},{"StartTime":87140.0,"Position":263.9408,"HyperDash":false},{"StartTime":87215.0,"Position":291.0559,"HyperDash":false},{"StartTime":87290.0,"Position":304.220367,"HyperDash":false},{"StartTime":87365.0,"Position":325.3685,"HyperDash":false},{"StartTime":87440.0,"Position":350.271576,"HyperDash":false},{"StartTime":87497.0,"Position":364.034241,"HyperDash":false},{"StartTime":87590.0,"Position":400.0,"HyperDash":false}]},{"StartTime":87741.0,"Objects":[{"StartTime":87741.0,"Position":400.0,"HyperDash":false}]},{"StartTime":88041.0,"Objects":[{"StartTime":88041.0,"Position":420.0,"HyperDash":false}]},{"StartTime":88340.0,"Objects":[{"StartTime":88340.0,"Position":380.0,"HyperDash":false}]},{"StartTime":88490.0,"Objects":[{"StartTime":88490.0,"Position":320.0,"HyperDash":false}]},{"StartTime":88640.0,"Objects":[{"StartTime":88640.0,"Position":314.0,"HyperDash":false}]},{"StartTime":88940.0,"Objects":[{"StartTime":88940.0,"Position":0.0,"HyperDash":false},{"StartTime":89033.0,"Position":111.0,"HyperDash":false},{"StartTime":89127.0,"Position":358.0,"HyperDash":false},{"StartTime":89221.0,"Position":476.0,"HyperDash":false},{"StartTime":89315.0,"Position":87.0,"HyperDash":false},{"StartTime":89408.0,"Position":33.0,"HyperDash":false},{"StartTime":89502.0,"Position":166.0,"HyperDash":false},{"StartTime":89596.0,"Position":275.0,"HyperDash":false},{"StartTime":89690.0,"Position":119.0,"HyperDash":false}]},{"StartTime":89990.0,"Objects":[{"StartTime":89990.0,"Position":56.0,"HyperDash":false}]},{"StartTime":90140.0,"Objects":[{"StartTime":90140.0,"Position":76.0,"HyperDash":false}]},{"StartTime":90290.0,"Objects":[{"StartTime":90290.0,"Position":36.0,"HyperDash":false}]},{"StartTime":90590.0,"Objects":[{"StartTime":90590.0,"Position":200.0,"HyperDash":false}]},{"StartTime":90740.0,"Objects":[{"StartTime":90740.0,"Position":160.0,"HyperDash":false},{"StartTime":90814.0,"Position":176.321808,"HyperDash":false},{"StartTime":90889.0,"Position":206.339,"HyperDash":false},{"StartTime":90964.0,"Position":213.574585,"HyperDash":false},{"StartTime":91039.0,"Position":236.2215,"HyperDash":false},{"StartTime":91114.0,"Position":240.839,"HyperDash":false},{"StartTime":91189.0,"Position":206.688522,"HyperDash":false},{"StartTime":91264.0,"Position":182.7456,"HyperDash":false},{"StartTime":91339.0,"Position":160.0,"HyperDash":false},{"StartTime":91414.0,"Position":183.5337,"HyperDash":false},{"StartTime":91489.0,"Position":206.513763,"HyperDash":false},{"StartTime":91546.0,"Position":220.042145,"HyperDash":false},{"StartTime":91639.0,"Position":236.2215,"HyperDash":false}]},{"StartTime":91939.0,"Objects":[{"StartTime":91939.0,"Position":264.0,"HyperDash":false}]},{"StartTime":92089.0,"Objects":[{"StartTime":92089.0,"Position":259.0,"HyperDash":false}]},{"StartTime":92389.0,"Objects":[{"StartTime":92389.0,"Position":408.0,"HyperDash":false}]},{"StartTime":92539.0,"Objects":[{"StartTime":92539.0,"Position":328.0,"HyperDash":false}]},{"StartTime":92689.0,"Objects":[{"StartTime":92689.0,"Position":400.0,"HyperDash":false}]},{"StartTime":92839.0,"Objects":[{"StartTime":92839.0,"Position":464.0,"HyperDash":false}]},{"StartTime":92989.0,"Objects":[{"StartTime":92989.0,"Position":484.0,"HyperDash":false}]},{"StartTime":93139.0,"Objects":[{"StartTime":93139.0,"Position":496.0,"HyperDash":false}]},{"StartTime":93439.0,"Objects":[{"StartTime":93439.0,"Position":496.0,"HyperDash":false},{"StartTime":93513.0,"Position":508.470551,"HyperDash":false},{"StartTime":93588.0,"Position":481.299042,"HyperDash":false},{"StartTime":93663.0,"Position":447.88858,"HyperDash":false},{"StartTime":93738.0,"Position":442.8401,"HyperDash":false},{"StartTime":93813.0,"Position":434.920868,"HyperDash":false},{"StartTime":93888.0,"Position":396.039459,"HyperDash":false},{"StartTime":93963.0,"Position":378.642273,"HyperDash":false},{"StartTime":94038.0,"Position":346.954773,"HyperDash":false},{"StartTime":94113.0,"Position":325.103058,"HyperDash":false},{"StartTime":94188.0,"Position":297.157654,"HyperDash":false},{"StartTime":94245.0,"Position":278.1643,"HyperDash":false},{"StartTime":94338.0,"Position":247.142532,"HyperDash":false}]},{"StartTime":94788.0,"Objects":[{"StartTime":94788.0,"Position":160.0,"HyperDash":false},{"StartTime":94862.0,"Position":178.0,"HyperDash":false},{"StartTime":94937.0,"Position":160.0,"HyperDash":false},{"StartTime":94994.0,"Position":156.0,"HyperDash":false},{"StartTime":95087.0,"Position":160.0,"HyperDash":false}]},{"StartTime":95238.0,"Objects":[{"StartTime":95238.0,"Position":180.0,"HyperDash":false}]},{"StartTime":95388.0,"Objects":[{"StartTime":95388.0,"Position":140.0,"HyperDash":false}]},{"StartTime":95538.0,"Objects":[{"StartTime":95538.0,"Position":160.0,"HyperDash":false},{"StartTime":95612.0,"Position":178.7418,"HyperDash":false},{"StartTime":95687.0,"Position":173.08049,"HyperDash":false},{"StartTime":95744.0,"Position":203.788971,"HyperDash":false},{"StartTime":95837.0,"Position":215.526108,"HyperDash":false}]},{"StartTime":96138.0,"Objects":[{"StartTime":96138.0,"Position":296.0,"HyperDash":false},{"StartTime":96212.0,"Position":337.7064,"HyperDash":false},{"StartTime":96287.0,"Position":345.412964,"HyperDash":false},{"StartTime":96344.0,"Position":376.616638,"HyperDash":false},{"StartTime":96437.0,"Position":391.160645,"HyperDash":false}]},{"StartTime":96737.0,"Objects":[{"StartTime":96737.0,"Position":464.0,"HyperDash":false}]},{"StartTime":96887.0,"Objects":[{"StartTime":96887.0,"Position":416.0,"HyperDash":false}]},{"StartTime":97187.0,"Objects":[{"StartTime":97187.0,"Position":440.0,"HyperDash":false},{"StartTime":97261.0,"Position":447.4056,"HyperDash":false},{"StartTime":97336.0,"Position":432.9317,"HyperDash":false},{"StartTime":97411.0,"Position":435.742554,"HyperDash":false},{"StartTime":97486.0,"Position":407.575775,"HyperDash":false},{"StartTime":97561.0,"Position":379.243927,"HyperDash":false},{"StartTime":97636.0,"Position":366.1177,"HyperDash":false},{"StartTime":97711.0,"Position":344.4165,"HyperDash":false},{"StartTime":97786.0,"Position":317.914917,"HyperDash":false},{"StartTime":97843.0,"Position":304.0325,"HyperDash":false},{"StartTime":97936.0,"Position":268.035461,"HyperDash":false}]},{"StartTime":98237.0,"Objects":[{"StartTime":98237.0,"Position":200.0,"HyperDash":false}]},{"StartTime":98537.0,"Objects":[{"StartTime":98537.0,"Position":56.0,"HyperDash":false}]},{"StartTime":98837.0,"Objects":[{"StartTime":98837.0,"Position":76.0,"HyperDash":false}]},{"StartTime":99137.0,"Objects":[{"StartTime":99137.0,"Position":56.0,"HyperDash":false},{"StartTime":99211.0,"Position":60.74916,"HyperDash":false},{"StartTime":99286.0,"Position":106.0,"HyperDash":false},{"StartTime":99343.0,"Position":88.1036758,"HyperDash":false},{"StartTime":99436.0,"Position":56.0,"HyperDash":false}]},{"StartTime":99586.0,"Objects":[{"StartTime":99586.0,"Position":56.0,"HyperDash":false},{"StartTime":99660.0,"Position":61.48453,"HyperDash":false},{"StartTime":99735.0,"Position":67.69644,"HyperDash":false},{"StartTime":99810.0,"Position":92.0094,"HyperDash":false},{"StartTime":99885.0,"Position":107.968033,"HyperDash":false},{"StartTime":99960.0,"Position":87.38017,"HyperDash":false},{"StartTime":100035.0,"Position":67.9301,"HyperDash":false},{"StartTime":100110.0,"Position":56.5835648,"HyperDash":false},{"StartTime":100185.0,"Position":56.0,"HyperDash":false},{"StartTime":100260.0,"Position":65.53404,"HyperDash":false},{"StartTime":100335.0,"Position":67.81326,"HyperDash":false},{"StartTime":100392.0,"Position":74.3646545,"HyperDash":false},{"StartTime":100485.0,"Position":107.968033,"HyperDash":false}]},{"StartTime":100636.0,"Objects":[{"StartTime":100636.0,"Position":144.0,"HyperDash":false}]},{"StartTime":100936.0,"Objects":[{"StartTime":100936.0,"Position":288.0,"HyperDash":false}]},{"StartTime":101236.0,"Objects":[{"StartTime":101236.0,"Position":268.0,"HyperDash":false}]},{"StartTime":101536.0,"Objects":[{"StartTime":101536.0,"Position":360.0,"HyperDash":false},{"StartTime":101610.0,"Position":381.602356,"HyperDash":false},{"StartTime":101685.0,"Position":408.7352,"HyperDash":false},{"StartTime":101760.0,"Position":420.921082,"HyperDash":false},{"StartTime":101835.0,"Position":450.0819,"HyperDash":false},{"StartTime":101910.0,"Position":480.7513,"HyperDash":false},{"StartTime":101985.0,"Position":478.132416,"HyperDash":false},{"StartTime":102042.0,"Position":481.652863,"HyperDash":false},{"StartTime":102135.0,"Position":495.055,"HyperDash":false}]},{"StartTime":102435.0,"Objects":[{"StartTime":102435.0,"Position":496.0,"HyperDash":false},{"StartTime":102509.0,"Position":478.3312,"HyperDash":false},{"StartTime":102584.0,"Position":446.623962,"HyperDash":false},{"StartTime":102659.0,"Position":441.667145,"HyperDash":false},{"StartTime":102734.0,"Position":400.097137,"HyperDash":false},{"StartTime":102809.0,"Position":373.617828,"HyperDash":false},{"StartTime":102884.0,"Position":361.791168,"HyperDash":false},{"StartTime":102941.0,"Position":366.174866,"HyperDash":false},{"StartTime":103034.0,"Position":334.736969,"HyperDash":false}]},{"StartTime":103335.0,"Objects":[{"StartTime":103335.0,"Position":288.0,"HyperDash":false}]},{"StartTime":103635.0,"Objects":[{"StartTime":103635.0,"Position":272.0,"HyperDash":false}]},{"StartTime":103935.0,"Objects":[{"StartTime":103935.0,"Position":176.0,"HyperDash":false}]},{"StartTime":104385.0,"Objects":[{"StartTime":104385.0,"Position":64.0,"HyperDash":false}]},{"StartTime":104535.0,"Objects":[{"StartTime":104535.0,"Position":120.0,"HyperDash":false}]},{"StartTime":104685.0,"Objects":[{"StartTime":104685.0,"Position":104.0,"HyperDash":false}]},{"StartTime":104835.0,"Objects":[{"StartTime":104835.0,"Position":140.0,"HyperDash":false}]},{"StartTime":104985.0,"Objects":[{"StartTime":104985.0,"Position":140.0,"HyperDash":false}]},{"StartTime":105135.0,"Objects":[{"StartTime":105135.0,"Position":120.0,"HyperDash":false},{"StartTime":105209.0,"Position":126.278061,"HyperDash":false},{"StartTime":105284.0,"Position":134.685547,"HyperDash":false},{"StartTime":105359.0,"Position":146.535583,"HyperDash":false},{"StartTime":105434.0,"Position":176.619583,"HyperDash":false},{"StartTime":105509.0,"Position":149.913956,"HyperDash":false},{"StartTime":105584.0,"Position":134.963058,"HyperDash":false},{"StartTime":105659.0,"Position":122.398125,"HyperDash":false},{"StartTime":105734.0,"Position":120.0,"HyperDash":false},{"StartTime":105809.0,"Position":138.336151,"HyperDash":false},{"StartTime":105884.0,"Position":134.8243,"HyperDash":false},{"StartTime":105941.0,"Position":165.701263,"HyperDash":false},{"StartTime":106034.0,"Position":176.619583,"HyperDash":false}]},{"StartTime":106334.0,"Objects":[{"StartTime":106334.0,"Position":248.0,"HyperDash":false},{"StartTime":106408.0,"Position":283.699738,"HyperDash":false},{"StartTime":106483.0,"Position":297.674133,"HyperDash":false},{"StartTime":106558.0,"Position":330.484833,"HyperDash":false},{"StartTime":106633.0,"Position":346.951965,"HyperDash":false},{"StartTime":106708.0,"Position":384.7983,"HyperDash":false},{"StartTime":106783.0,"Position":393.6557,"HyperDash":false},{"StartTime":106840.0,"Position":405.136719,"HyperDash":false},{"StartTime":106933.0,"Position":435.388184,"HyperDash":false}]},{"StartTime":107234.0,"Objects":[{"StartTime":107234.0,"Position":464.0,"HyperDash":false},{"StartTime":107308.0,"Position":456.621124,"HyperDash":false},{"StartTime":107383.0,"Position":471.782776,"HyperDash":false},{"StartTime":107458.0,"Position":457.492584,"HyperDash":false},{"StartTime":107533.0,"Position":461.751678,"HyperDash":false},{"StartTime":107608.0,"Position":448.0888,"HyperDash":false},{"StartTime":107683.0,"Position":429.117279,"HyperDash":false},{"StartTime":107740.0,"Position":423.223846,"HyperDash":false},{"StartTime":107833.0,"Position":382.2534,"HyperDash":false}]},{"StartTime":108134.0,"Objects":[{"StartTime":108134.0,"Position":24.0,"HyperDash":false}]},{"StartTime":108433.0,"Objects":[{"StartTime":108433.0,"Position":88.0,"HyperDash":false}]},{"StartTime":108733.0,"Objects":[{"StartTime":108733.0,"Position":200.0,"HyperDash":false}]},{"StartTime":108883.0,"Objects":[{"StartTime":108883.0,"Position":220.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/37902.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/37902.osu
new file mode 100644
index 0000000000..04942acb1e
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/37902.osu
@@ -0,0 +1,230 @@
+osu file format v5
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:3
+OverallDifficulty:5
+SliderMultiplier:1
+SliderTickRate:2
+
+[Events]
+//Break Periods
+2,55404,58804
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+//Background Colour Transformations
+3,100,163,162,255
+
+[TimingPoints]
+2421,299.895036737142,4,1,0,100,1,0
+27079,-100,4,2,0,100,0,0
+27529,-100,4,1,0,100,0,0
+33077,-100,4,2,0,100,0,0
+33527,-100,4,1,0,100,0,0
+39075,-100,4,2,0,100,0,0
+39525,-100,4,1,0,100,0,0
+45073,-100,4,2,0,100,0,0
+53696,-100,4,1,0,100,0,0
+60000,-200,4,1,0,100,0,0
+64799,-100,4,1,0,100,0,0
+
+[HitObjects]
+48,192,12017,2,0,B|104:312|272:312,1,250,0|2
+320,312,13067,1,0
+392,312,13367,1,2
+464,312,13667,1,0
+464,240,13966,1,4
+464,240,14116,1,4
+464,168,14416,6,0,B|464:80|400:32|272:32,1,250,0|2
+216,32,15466,1,0
+144,32,15766,1,2
+72,32,16066,1,0
+72,104,16366,1,4
+72,208,16815,6,0,B|72:288|152:288|152:208|248:208|248:160|296:160,1,250,0|2
+320,128,17865,1,0
+376,88,18165,1,2
+440,64,18465,1,0
+504,48,18765,1,4
+504,48,18915,1,4
+504,120,19215,6,0,B|504:232|400:232|296:232,1,250,0|2
+248,232,20264,1,0
+248,160,20564,1,2
+176,160,20864,1,0
+176,232,21164,1,4
+72,232,21614,6,0,B|72:88|112:88|200:40,1,250,0|2
+264,32,22663,2,0,B|456:32|456:224,1,300,0|2
+456,280,23863,2,0,B|360:280|336:320|336:352|320:368|168:368,1,300,0|2
+184,296,25063,5,4
+184,152,25662,1,4
+320,152,26262,1,4
+320,296,26862,1,4
+96,296,27612,6,0,B|96:168|144:120|240:120,1,250,0|2
+296,120,28661,2,0,B|296:248|232:328|128:352,1,300,0|2
+72,352,29861,2,0,B|32:240|32:96|112:56,1,300,0|2
+160,64,31060,5,4
+296,64,31660,1,4
+432,64,32260,1,4
+432,200,32860,1,4
+256,192,33610,6,0,B|136:192,2,100
+256,192,34359,1,2
+256,264,34659,1,2
+256,264,34809,2,0,B|384:264,2,100
+256,264,35559,1,2
+256,336,35859,1,2
+256,336,36009,2,0,B|136:336,2,100
+256,336,36758,1,2
+328,336,37058,2,0,B|456:336|456:184,3,200,4|4|4|4
+440,40,39607,5,0
+368,40,39907,1,0
+296,40,40207,1,0
+256,40,40357,2,2,B|112:40,1,100
+88,120,41107,1,0
+160,120,41407,1,0
+192,120,41557,2,2,B|328:120,1,100
+360,192,42307,1,0
+288,192,42606,1,0
+256,192,42756,2,2,B|144:192,1,100,2|4
+158,262,43356,5,0
+158,262,43506,1,0
+158,262,43656,1,4
+230,262,43956,1,0
+230,262,44106,1,0
+230,262,44256,1,4
+302,262,44556,1,0
+302,262,44706,1,0
+302,262,44856,1,4
+256,88,45605,6,2,B|328:88,5,50,2|2|2|2|0|2
+376,88,46655,1,0
+448,88,46955,1,2
+448,160,47255,1,0
+376,160,47555,1,0
+376,160,47705,1,4
+376,232,48005,6,2,B|440:232,2,50
+336,232,48454,1,2
+304,232,48604,1,0
+264,232,48754,1,2
+192,232,49054,1,0
+120,232,49354,1,2
+48,232,49654,1,0
+48,160,49954,1,4
+48,56,50404,6,2,B|112:56,1,50
+136,56,50704,2,2,B|208:56,1,50
+224,56,51003,2,2,B|288:56,1,50,0|2
+344,56,51453,1,0
+416,56,51753,1,2
+488,56,52053,1,0
+488,128,52353,1,0
+488,128,52503,1,4
+488,200,52803,6,2,B|432:200,3,50
+400,200,53403,1,0
+368,200,53553,2,0,B|296:200|280:120,2,100,2|4|4
+368,272,54452,2,4,B|360:368|120:344,1,250,4|4
+256,288,60000,6,0,B|400:288,1,125
+416,288,61050,2,0,B|416:128,1,150
+416,104,62250,2,0,B|240:104,1,150,0|0
+232,104,63449,2,0,B|232:296,1,175,0|4
+160,280,64799,6,0,B|48:280,3,100,0|8|0|8
+56,208,65998,1,0
+56,136,66298,1,8
+56,64,66598,1,0
+128,64,66898,1,8
+256,192,67198,12,0,69597
+256,192,69897,5,8
+288,192,70047,1,0
+320,192,70197,1,0
+320,120,70497,1,8
+320,48,70797,1,0
+248,48,71096,1,8
+208,48,71246,1,0
+176,48,71396,1,0
+104,48,71696,1,8
+104,120,71996,6,0,B|16:120,2,50,0|0|8
+104,120,72446,1,2
+104,192,72746,1,2
+104,264,73046,2,2,B|104:352|264:352|424:352,1,350,2|4
+416,280,74395,6,0,B|416:216|320:216,3,100,0|8|0|8
+280,216,75595,1,0
+208,216,75895,1,8
+208,144,76195,1,0
+208,112,76345,1,0
+208,80,76495,1,8
+256,192,76794,12,0,78893
+256,192,79194,6,2,B|256:104|152:88,1,150,6|0
+128,88,79793,2,2,B|56:72|56:200,1,150,2|0
+56,264,80543,1,2
+56,336,80843,1,0
+128,336,81143,1,2
+200,336,81443,1,4
+200,336,81593,6,2,B|320:336|384:224,2,200,6|2|0
+200,336,82942,1,2
+200,264,83242,1,2
+200,192,83542,1,4
+200,160,83692,1,4
+200,128,83842,1,4
+200,96,83992,6,2,B|200:40|248:24|360:24,1,150,6|0
+344,24,84592,2,2,B|440:24|480:48|480:120,1,150,2|0
+472,144,85341,1,2
+472,216,85641,1,0
+472,288,85941,1,2
+400,288,86241,1,4
+400,288,86391,6,2,B|272:288|296:216|192:216,2,200,6|2|0
+400,288,87741,5,2
+400,216,88041,1,2
+400,144,88340,1,4
+360,144,88490,1,4
+320,144,88640,1,4
+256,192,88940,12,0,89690
+56,192,89990,5,0
+56,192,90140,1,0
+56,192,90290,1,8
+128,192,90590,1,0
+160,192,90740,2,2,B|224:192|248:104,3,100
+264,72,91939,1,4
+264,72,92089,1,4
+336,72,92389,5,0
+368,72,92539,1,0
+400,72,92689,1,8
+432,72,92839,1,0
+464,72,92989,1,0
+496,72,93139,1,2
+496,144,93439,2,2,B|496:256|232:256,1,300,2|4
+160,192,94788,6,0,B|160:136,2,50,0|0|8
+160,224,95238,1,0
+160,256,95388,1,0
+160,288,95538,2,2,B|160:360|238:362,1,100
+296,360,96138,2,2,B|376:360|416:312,1,100
+440,288,96737,1,4
+440,288,96887,1,4
+440,216,97187,6,0,B|440:80|264:80,1,250,0|2
+200,80,98237,1,2
+128,80,98537,1,2
+56,80,98837,1,4
+56,152,99137,6,0,B|136:152,2,50
+56,184,99586,2,0,B|56:264|144:264,3,100,8|8|8|8
+144,264,100636,1,4
+216,264,100936,1,4
+288,264,101236,1,4
+360,264,101536,2,0,B|464:264|496:136,1,200,4|0
+496,72,102435,6,0,B|360:72|320:208,1,200
+304,232,103335,1,2
+280,296,103635,1,0
+224,344,103935,1,4
+120,296,104385,5,8
+120,264,104535,1,0
+120,232,104685,1,8
+120,200,104835,1,0
+120,168,104985,1,8
+120,136,105135,2,4,B|120:64|216:56,3,100,0|4|4|4
+248,48,106334,2,0,B|376:48|416:88|464:128,1,200,4|0
+464,168,107234,2,0,B|488:248|456:312|376:320,1,200,0|4
+200,320,108134,5,4
+56,192,108433,1,4
+200,64,108733,1,4
+200,64,108883,1,4
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/39206-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/39206-expected-conversion.json
new file mode 100644
index 0000000000..35fcd88d4e
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/39206-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":678.0,"Objects":[{"StartTime":678.0,"Position":256.0,"HyperDash":false}]},{"StartTime":1021.0,"Objects":[{"StartTime":1021.0,"Position":456.0,"HyperDash":false}]},{"StartTime":1193.0,"Objects":[{"StartTime":1193.0,"Position":456.0,"HyperDash":false}]},{"StartTime":1364.0,"Objects":[{"StartTime":1364.0,"Position":456.0,"HyperDash":false}]},{"StartTime":1707.0,"Objects":[{"StartTime":1707.0,"Position":312.0,"HyperDash":false}]},{"StartTime":1878.0,"Objects":[{"StartTime":1878.0,"Position":312.0,"HyperDash":false}]},{"StartTime":2050.0,"Objects":[{"StartTime":2050.0,"Position":312.0,"HyperDash":false}]},{"StartTime":2393.0,"Objects":[{"StartTime":2393.0,"Position":168.0,"HyperDash":false}]},{"StartTime":2564.0,"Objects":[{"StartTime":2564.0,"Position":168.0,"HyperDash":false}]},{"StartTime":2736.0,"Objects":[{"StartTime":2736.0,"Position":168.0,"HyperDash":false}]},{"StartTime":3078.0,"Objects":[{"StartTime":3078.0,"Position":24.0,"HyperDash":false}]},{"StartTime":3250.0,"Objects":[{"StartTime":3250.0,"Position":24.0,"HyperDash":false}]},{"StartTime":3421.0,"Objects":[{"StartTime":3421.0,"Position":24.0,"HyperDash":false}]},{"StartTime":3764.0,"Objects":[{"StartTime":3764.0,"Position":56.0,"HyperDash":false}]},{"StartTime":3936.0,"Objects":[{"StartTime":3936.0,"Position":136.0,"HyperDash":false}]},{"StartTime":4107.0,"Objects":[{"StartTime":4107.0,"Position":216.0,"HyperDash":false}]},{"StartTime":4450.0,"Objects":[{"StartTime":4450.0,"Position":296.0,"HyperDash":false}]},{"StartTime":4621.0,"Objects":[{"StartTime":4621.0,"Position":376.0,"HyperDash":false}]},{"StartTime":4793.0,"Objects":[{"StartTime":4793.0,"Position":456.0,"HyperDash":false}]},{"StartTime":5135.0,"Objects":[{"StartTime":5135.0,"Position":456.0,"HyperDash":false}]},{"StartTime":5307.0,"Objects":[{"StartTime":5307.0,"Position":376.0,"HyperDash":false}]},{"StartTime":5478.0,"Objects":[{"StartTime":5478.0,"Position":296.0,"HyperDash":false}]},{"StartTime":5821.0,"Objects":[{"StartTime":5821.0,"Position":216.0,"HyperDash":false}]},{"StartTime":5993.0,"Objects":[{"StartTime":5993.0,"Position":136.0,"HyperDash":false}]},{"StartTime":6164.0,"Objects":[{"StartTime":6164.0,"Position":56.0,"HyperDash":false}]},{"StartTime":6507.0,"Objects":[{"StartTime":6507.0,"Position":24.0,"HyperDash":false},{"StartTime":6583.0,"Position":9.0,"HyperDash":false},{"StartTime":6660.0,"Position":13.0,"HyperDash":false},{"StartTime":6736.0,"Position":21.0,"HyperDash":false},{"StartTime":6849.0,"Position":24.0,"HyperDash":false}]},{"StartTime":7193.0,"Objects":[{"StartTime":7193.0,"Position":144.0,"HyperDash":false},{"StartTime":7269.0,"Position":159.0,"HyperDash":false},{"StartTime":7346.0,"Position":161.0,"HyperDash":false},{"StartTime":7422.0,"Position":145.0,"HyperDash":false},{"StartTime":7535.0,"Position":144.0,"HyperDash":false}]},{"StartTime":7878.0,"Objects":[{"StartTime":7878.0,"Position":256.0,"HyperDash":false},{"StartTime":7954.0,"Position":255.0,"HyperDash":false},{"StartTime":8031.0,"Position":241.0,"HyperDash":false},{"StartTime":8107.0,"Position":248.0,"HyperDash":false},{"StartTime":8220.0,"Position":256.0,"HyperDash":false}]},{"StartTime":8564.0,"Objects":[{"StartTime":8564.0,"Position":376.0,"HyperDash":false},{"StartTime":8640.0,"Position":364.0,"HyperDash":false},{"StartTime":8717.0,"Position":372.0,"HyperDash":false},{"StartTime":8793.0,"Position":390.0,"HyperDash":false},{"StartTime":8906.0,"Position":376.0,"HyperDash":false}]},{"StartTime":9250.0,"Objects":[{"StartTime":9250.0,"Position":488.0,"HyperDash":false},{"StartTime":9326.0,"Position":492.0,"HyperDash":false},{"StartTime":9403.0,"Position":479.0,"HyperDash":false},{"StartTime":9479.0,"Position":493.0,"HyperDash":false},{"StartTime":9592.0,"Position":488.0,"HyperDash":false}]},{"StartTime":9935.0,"Objects":[{"StartTime":9935.0,"Position":17.0,"HyperDash":false},{"StartTime":10004.0,"Position":433.0,"HyperDash":false},{"StartTime":10074.0,"Position":201.0,"HyperDash":false},{"StartTime":10144.0,"Position":244.0,"HyperDash":false},{"StartTime":10213.0,"Position":55.0,"HyperDash":false},{"StartTime":10283.0,"Position":166.0,"HyperDash":false},{"StartTime":10353.0,"Position":332.0,"HyperDash":false},{"StartTime":10422.0,"Position":460.0,"HyperDash":false},{"StartTime":10492.0,"Position":329.0,"HyperDash":false},{"StartTime":10562.0,"Position":156.0,"HyperDash":false},{"StartTime":10631.0,"Position":273.0,"HyperDash":false},{"StartTime":10701.0,"Position":57.0,"HyperDash":false},{"StartTime":10771.0,"Position":199.0,"HyperDash":false},{"StartTime":10840.0,"Position":485.0,"HyperDash":false},{"StartTime":10910.0,"Position":388.0,"HyperDash":false},{"StartTime":10980.0,"Position":470.0,"HyperDash":false},{"StartTime":11050.0,"Position":326.0,"HyperDash":false}]},{"StartTime":11307.0,"Objects":[{"StartTime":11307.0,"Position":40.0,"HyperDash":false}]},{"StartTime":11393.0,"Objects":[{"StartTime":11393.0,"Position":56.0,"HyperDash":false}]},{"StartTime":11478.0,"Objects":[{"StartTime":11478.0,"Position":80.0,"HyperDash":false}]},{"StartTime":11564.0,"Objects":[{"StartTime":11564.0,"Position":104.0,"HyperDash":false}]},{"StartTime":11650.0,"Objects":[{"StartTime":11650.0,"Position":128.0,"HyperDash":false},{"StartTime":11726.0,"Position":139.513672,"HyperDash":false},{"StartTime":11803.0,"Position":178.88179,"HyperDash":false},{"StartTime":11879.0,"Position":208.079636,"HyperDash":false},{"StartTime":11992.0,"Position":226.574265,"HyperDash":false}]},{"StartTime":12336.0,"Objects":[{"StartTime":12336.0,"Position":288.0,"HyperDash":false},{"StartTime":12412.0,"Position":273.486328,"HyperDash":false},{"StartTime":12489.0,"Position":256.118225,"HyperDash":false},{"StartTime":12565.0,"Position":223.920364,"HyperDash":false},{"StartTime":12678.0,"Position":189.425735,"HyperDash":false}]},{"StartTime":13021.0,"Objects":[{"StartTime":13021.0,"Position":344.0,"HyperDash":false},{"StartTime":13097.0,"Position":346.513672,"HyperDash":false},{"StartTime":13174.0,"Position":370.8818,"HyperDash":false},{"StartTime":13250.0,"Position":413.079651,"HyperDash":false},{"StartTime":13363.0,"Position":442.574249,"HyperDash":false}]},{"StartTime":13707.0,"Objects":[{"StartTime":13707.0,"Position":504.0,"HyperDash":false},{"StartTime":13783.0,"Position":490.486328,"HyperDash":false},{"StartTime":13860.0,"Position":453.1182,"HyperDash":false},{"StartTime":13936.0,"Position":440.920349,"HyperDash":false},{"StartTime":14049.0,"Position":405.425751,"HyperDash":false}]},{"StartTime":14221.0,"Objects":[{"StartTime":14221.0,"Position":328.0,"HyperDash":false}]},{"StartTime":14307.0,"Objects":[{"StartTime":14307.0,"Position":312.0,"HyperDash":false}]},{"StartTime":14393.0,"Objects":[{"StartTime":14393.0,"Position":296.0,"HyperDash":false},{"StartTime":14469.0,"Position":285.453,"HyperDash":false},{"StartTime":14546.0,"Position":295.793518,"HyperDash":false},{"StartTime":14622.0,"Position":253.246521,"HyperDash":false},{"StartTime":14735.0,"Position":257.538452,"HyperDash":false}]},{"StartTime":15078.0,"Objects":[{"StartTime":15078.0,"Position":160.0,"HyperDash":false},{"StartTime":15154.0,"Position":179.547012,"HyperDash":false},{"StartTime":15231.0,"Position":158.206482,"HyperDash":false},{"StartTime":15307.0,"Position":192.7535,"HyperDash":false},{"StartTime":15420.0,"Position":198.461548,"HyperDash":false}]},{"StartTime":15764.0,"Objects":[{"StartTime":15764.0,"Position":296.0,"HyperDash":false},{"StartTime":15840.0,"Position":298.453,"HyperDash":false},{"StartTime":15917.0,"Position":269.793518,"HyperDash":false},{"StartTime":15993.0,"Position":263.246521,"HyperDash":false},{"StartTime":16106.0,"Position":257.538452,"HyperDash":false}]},{"StartTime":16450.0,"Objects":[{"StartTime":16450.0,"Position":160.0,"HyperDash":false},{"StartTime":16526.0,"Position":168.547012,"HyperDash":false},{"StartTime":16603.0,"Position":183.206482,"HyperDash":false},{"StartTime":16679.0,"Position":170.7535,"HyperDash":false},{"StartTime":16792.0,"Position":198.461548,"HyperDash":false}]},{"StartTime":16964.0,"Objects":[{"StartTime":16964.0,"Position":112.0,"HyperDash":false}]},{"StartTime":17050.0,"Objects":[{"StartTime":17050.0,"Position":96.0,"HyperDash":false}]},{"StartTime":17136.0,"Objects":[{"StartTime":17136.0,"Position":88.0,"HyperDash":false},{"StartTime":17221.0,"Position":108.141563,"HyperDash":false},{"StartTime":17307.0,"Position":125.724724,"HyperDash":false},{"StartTime":17392.0,"Position":123.658127,"HyperDash":false},{"StartTime":17478.0,"Position":151.393967,"HyperDash":false},{"StartTime":17564.0,"Position":185.463791,"HyperDash":false},{"StartTime":17650.0,"Position":197.255447,"HyperDash":false},{"StartTime":17735.0,"Position":168.730637,"HyperDash":false},{"StartTime":17821.0,"Position":151.639252,"HyperDash":false},{"StartTime":17897.0,"Position":121.04126,"HyperDash":false},{"StartTime":17974.0,"Position":121.285477,"HyperDash":false},{"StartTime":18051.0,"Position":123.615044,"HyperDash":false},{"StartTime":18164.0,"Position":88.0,"HyperDash":false}]},{"StartTime":18507.0,"Objects":[{"StartTime":18507.0,"Position":424.0,"HyperDash":false},{"StartTime":18592.0,"Position":408.858429,"HyperDash":false},{"StartTime":18678.0,"Position":397.275269,"HyperDash":false},{"StartTime":18763.0,"Position":362.3419,"HyperDash":false},{"StartTime":18849.0,"Position":360.606018,"HyperDash":false},{"StartTime":18935.0,"Position":337.536224,"HyperDash":false},{"StartTime":19021.0,"Position":314.744537,"HyperDash":false},{"StartTime":19106.0,"Position":355.269379,"HyperDash":false},{"StartTime":19192.0,"Position":360.360748,"HyperDash":false},{"StartTime":19268.0,"Position":388.95874,"HyperDash":false},{"StartTime":19345.0,"Position":391.7145,"HyperDash":false},{"StartTime":19422.0,"Position":424.384949,"HyperDash":false},{"StartTime":19535.0,"Position":424.0,"HyperDash":false}]},{"StartTime":19707.0,"Objects":[{"StartTime":19707.0,"Position":368.0,"HyperDash":false}]},{"StartTime":19793.0,"Objects":[{"StartTime":19793.0,"Position":352.0,"HyperDash":false}]},{"StartTime":19878.0,"Objects":[{"StartTime":19878.0,"Position":336.0,"HyperDash":false},{"StartTime":19954.0,"Position":304.777771,"HyperDash":false},{"StartTime":20031.0,"Position":306.263153,"HyperDash":false},{"StartTime":20107.0,"Position":256.040924,"HyperDash":false},{"StartTime":20220.0,"Position":236.0,"HyperDash":false}]},{"StartTime":20564.0,"Objects":[{"StartTime":20564.0,"Position":136.0,"HyperDash":false},{"StartTime":20640.0,"Position":147.222229,"HyperDash":false},{"StartTime":20717.0,"Position":184.736847,"HyperDash":false},{"StartTime":20793.0,"Position":190.959076,"HyperDash":false},{"StartTime":20906.0,"Position":236.0,"HyperDash":false}]},{"StartTime":21250.0,"Objects":[{"StartTime":21250.0,"Position":392.0,"HyperDash":false},{"StartTime":21335.0,"Position":420.1406,"HyperDash":false},{"StartTime":21421.0,"Position":400.481,"HyperDash":false},{"StartTime":21506.0,"Position":414.916046,"HyperDash":false},{"StartTime":21592.0,"Position":414.21582,"HyperDash":false},{"StartTime":21660.0,"Position":403.507965,"HyperDash":false},{"StartTime":21764.0,"Position":397.683655,"HyperDash":true}]},{"StartTime":21936.0,"Objects":[{"StartTime":21936.0,"Position":120.0,"HyperDash":false},{"StartTime":22021.0,"Position":99.85941,"HyperDash":false},{"StartTime":22107.0,"Position":90.5190048,"HyperDash":false},{"StartTime":22192.0,"Position":91.0839539,"HyperDash":false},{"StartTime":22278.0,"Position":97.78417,"HyperDash":false},{"StartTime":22346.0,"Position":116.49202,"HyperDash":false},{"StartTime":22450.0,"Position":114.31633,"HyperDash":false}]},{"StartTime":22621.0,"Objects":[{"StartTime":22621.0,"Position":176.0,"HyperDash":false},{"StartTime":22706.0,"Position":203.4664,"HyperDash":false},{"StartTime":22792.0,"Position":212.3834,"HyperDash":false},{"StartTime":22877.0,"Position":234.448669,"HyperDash":false},{"StartTime":22963.0,"Position":266.38324,"HyperDash":false},{"StartTime":23031.0,"Position":276.057281,"HyperDash":false},{"StartTime":23135.0,"Position":297.221375,"HyperDash":false}]},{"StartTime":23307.0,"Objects":[{"StartTime":23307.0,"Position":297.0,"HyperDash":false}]},{"StartTime":23821.0,"Objects":[{"StartTime":23821.0,"Position":448.0,"HyperDash":false}]},{"StartTime":23993.0,"Objects":[{"StartTime":23993.0,"Position":352.0,"HyperDash":false},{"StartTime":24069.0,"Position":334.661774,"HyperDash":false},{"StartTime":24146.0,"Position":291.266022,"HyperDash":false},{"StartTime":24222.0,"Position":288.570435,"HyperDash":false},{"StartTime":24335.0,"Position":255.710861,"HyperDash":false}]},{"StartTime":24507.0,"Objects":[{"StartTime":24507.0,"Position":160.0,"HyperDash":false}]},{"StartTime":24593.0,"Objects":[{"StartTime":24593.0,"Position":160.0,"HyperDash":false}]},{"StartTime":24678.0,"Objects":[{"StartTime":24678.0,"Position":160.0,"HyperDash":false}]},{"StartTime":25021.0,"Objects":[{"StartTime":25021.0,"Position":88.0,"HyperDash":false}]},{"StartTime":25193.0,"Objects":[{"StartTime":25193.0,"Position":176.0,"HyperDash":false}]},{"StartTime":25364.0,"Objects":[{"StartTime":25364.0,"Position":256.0,"HyperDash":false}]},{"StartTime":25707.0,"Objects":[{"StartTime":25707.0,"Position":424.0,"HyperDash":false}]},{"StartTime":25878.0,"Objects":[{"StartTime":25878.0,"Position":448.0,"HyperDash":false}]},{"StartTime":26050.0,"Objects":[{"StartTime":26050.0,"Position":472.0,"HyperDash":false},{"StartTime":26135.0,"Position":467.1815,"HyperDash":false},{"StartTime":26221.0,"Position":430.508972,"HyperDash":false},{"StartTime":26306.0,"Position":426.762726,"HyperDash":false},{"StartTime":26392.0,"Position":386.21756,"HyperDash":false},{"StartTime":26460.0,"Position":355.4007,"HyperDash":false},{"StartTime":26564.0,"Position":336.352875,"HyperDash":false}]},{"StartTime":26736.0,"Objects":[{"StartTime":26736.0,"Position":304.0,"HyperDash":false},{"StartTime":26812.0,"Position":269.465637,"HyperDash":false},{"StartTime":26889.0,"Position":283.52124,"HyperDash":false},{"StartTime":26965.0,"Position":262.29248,"HyperDash":false},{"StartTime":27078.0,"Position":241.4827,"HyperDash":false}]},{"StartTime":27250.0,"Objects":[{"StartTime":27250.0,"Position":508.0,"HyperDash":false},{"StartTime":27303.0,"Position":417.0,"HyperDash":false},{"StartTime":27357.0,"Position":302.0,"HyperDash":false},{"StartTime":27410.0,"Position":132.0,"HyperDash":false},{"StartTime":27464.0,"Position":352.0,"HyperDash":false},{"StartTime":27517.0,"Position":174.0,"HyperDash":false},{"StartTime":27571.0,"Position":453.0,"HyperDash":false},{"StartTime":27624.0,"Position":205.0,"HyperDash":false},{"StartTime":27678.0,"Position":105.0,"HyperDash":false},{"StartTime":27732.0,"Position":213.0,"HyperDash":false},{"StartTime":27785.0,"Position":472.0,"HyperDash":false},{"StartTime":27839.0,"Position":251.0,"HyperDash":false},{"StartTime":27892.0,"Position":208.0,"HyperDash":false},{"StartTime":27946.0,"Position":261.0,"HyperDash":false},{"StartTime":27999.0,"Position":382.0,"HyperDash":false},{"StartTime":28053.0,"Position":170.0,"HyperDash":false},{"StartTime":28107.0,"Position":269.0,"HyperDash":false}]},{"StartTime":28621.0,"Objects":[{"StartTime":28621.0,"Position":32.0,"HyperDash":false}]},{"StartTime":28793.0,"Objects":[{"StartTime":28793.0,"Position":80.0,"HyperDash":false}]},{"StartTime":29307.0,"Objects":[{"StartTime":29307.0,"Position":352.0,"HyperDash":false}]},{"StartTime":29478.0,"Objects":[{"StartTime":29478.0,"Position":424.0,"HyperDash":false}]},{"StartTime":29650.0,"Objects":[{"StartTime":29650.0,"Position":472.0,"HyperDash":false}]},{"StartTime":29821.0,"Objects":[{"StartTime":29821.0,"Position":432.0,"HyperDash":false}]},{"StartTime":29993.0,"Objects":[{"StartTime":29993.0,"Position":360.0,"HyperDash":false}]},{"StartTime":30078.0,"Objects":[{"StartTime":30078.0,"Position":360.0,"HyperDash":false}]},{"StartTime":30164.0,"Objects":[{"StartTime":30164.0,"Position":360.0,"HyperDash":false}]},{"StartTime":30507.0,"Objects":[{"StartTime":30507.0,"Position":184.0,"HyperDash":false},{"StartTime":30592.0,"Position":194.11496,"HyperDash":false},{"StartTime":30678.0,"Position":206.360687,"HyperDash":false},{"StartTime":30745.0,"Position":207.599487,"HyperDash":false},{"StartTime":30849.0,"Position":184.0,"HyperDash":false}]},{"StartTime":31193.0,"Objects":[{"StartTime":31193.0,"Position":64.0,"HyperDash":false},{"StartTime":31278.0,"Position":59.6773758,"HyperDash":false},{"StartTime":31364.0,"Position":91.51566,"HyperDash":false},{"StartTime":31431.0,"Position":76.73467,"HyperDash":false},{"StartTime":31535.0,"Position":64.0,"HyperDash":false}]},{"StartTime":31878.0,"Objects":[{"StartTime":31878.0,"Position":352.0,"HyperDash":false},{"StartTime":31963.0,"Position":310.184479,"HyperDash":false},{"StartTime":32049.0,"Position":302.077,"HyperDash":false},{"StartTime":32116.0,"Position":332.637482,"HyperDash":false},{"StartTime":32220.0,"Position":352.0,"HyperDash":false}]},{"StartTime":32393.0,"Objects":[{"StartTime":32393.0,"Position":320.0,"HyperDash":false},{"StartTime":32435.0,"Position":297.345428,"HyperDash":false},{"StartTime":32478.0,"Position":320.0,"HyperDash":false},{"StartTime":32521.0,"Position":297.345428,"HyperDash":false},{"StartTime":32564.0,"Position":320.0,"HyperDash":false},{"StartTime":32607.0,"Position":297.345428,"HyperDash":false}]},{"StartTime":32736.0,"Objects":[{"StartTime":32736.0,"Position":342.0,"HyperDash":false},{"StartTime":32778.0,"Position":319.345428,"HyperDash":false},{"StartTime":32821.0,"Position":342.0,"HyperDash":false},{"StartTime":32864.0,"Position":319.345428,"HyperDash":false},{"StartTime":32907.0,"Position":342.0,"HyperDash":false},{"StartTime":32950.0,"Position":319.345428,"HyperDash":false}]},{"StartTime":33078.0,"Objects":[{"StartTime":33078.0,"Position":399.0,"HyperDash":false},{"StartTime":33120.0,"Position":376.345428,"HyperDash":false},{"StartTime":33163.0,"Position":399.0,"HyperDash":false},{"StartTime":33206.0,"Position":376.345428,"HyperDash":false},{"StartTime":33249.0,"Position":399.0,"HyperDash":false},{"StartTime":33292.0,"Position":376.345428,"HyperDash":false}]},{"StartTime":33421.0,"Objects":[{"StartTime":33421.0,"Position":422.0,"HyperDash":false},{"StartTime":33463.0,"Position":399.345428,"HyperDash":false},{"StartTime":33506.0,"Position":422.0,"HyperDash":false},{"StartTime":33549.0,"Position":399.345428,"HyperDash":false},{"StartTime":33592.0,"Position":422.0,"HyperDash":false},{"StartTime":33635.0,"Position":399.345428,"HyperDash":false},{"StartTime":33678.0,"Position":422.0,"HyperDash":false}]},{"StartTime":34107.0,"Objects":[{"StartTime":34107.0,"Position":368.0,"HyperDash":false}]},{"StartTime":34278.0,"Objects":[{"StartTime":34278.0,"Position":280.0,"HyperDash":false}]},{"StartTime":34793.0,"Objects":[{"StartTime":34793.0,"Position":280.0,"HyperDash":false}]},{"StartTime":34964.0,"Objects":[{"StartTime":34964.0,"Position":184.0,"HyperDash":false}]},{"StartTime":35136.0,"Objects":[{"StartTime":35136.0,"Position":112.0,"HyperDash":false}]},{"StartTime":35307.0,"Objects":[{"StartTime":35307.0,"Position":64.0,"HyperDash":false}]},{"StartTime":35478.0,"Objects":[{"StartTime":35478.0,"Position":32.0,"HyperDash":false}]},{"StartTime":35564.0,"Objects":[{"StartTime":35564.0,"Position":32.0,"HyperDash":false}]},{"StartTime":35650.0,"Objects":[{"StartTime":35650.0,"Position":32.0,"HyperDash":false}]},{"StartTime":35993.0,"Objects":[{"StartTime":35993.0,"Position":232.0,"HyperDash":false}]},{"StartTime":36164.0,"Objects":[{"StartTime":36164.0,"Position":328.0,"HyperDash":false}]},{"StartTime":36336.0,"Objects":[{"StartTime":36336.0,"Position":408.0,"HyperDash":false}]},{"StartTime":36507.0,"Objects":[{"StartTime":36507.0,"Position":464.0,"HyperDash":false}]},{"StartTime":36678.0,"Objects":[{"StartTime":36678.0,"Position":408.0,"HyperDash":false}]},{"StartTime":36850.0,"Objects":[{"StartTime":36850.0,"Position":328.0,"HyperDash":false}]},{"StartTime":37021.0,"Objects":[{"StartTime":37021.0,"Position":232.0,"HyperDash":false}]},{"StartTime":37535.0,"Objects":[{"StartTime":37535.0,"Position":72.0,"HyperDash":false}]},{"StartTime":37707.0,"Objects":[{"StartTime":37707.0,"Position":112.0,"HyperDash":false}]},{"StartTime":37878.0,"Objects":[{"StartTime":37878.0,"Position":144.0,"HyperDash":false},{"StartTime":37920.0,"Position":119.0,"HyperDash":false},{"StartTime":37963.0,"Position":144.0,"HyperDash":false},{"StartTime":38006.0,"Position":119.0,"HyperDash":false},{"StartTime":38049.0,"Position":144.0,"HyperDash":false}]},{"StartTime":38221.0,"Objects":[{"StartTime":38221.0,"Position":232.0,"HyperDash":false},{"StartTime":38263.0,"Position":207.0,"HyperDash":false},{"StartTime":38306.0,"Position":232.0,"HyperDash":false},{"StartTime":38349.0,"Position":207.0,"HyperDash":false},{"StartTime":38392.0,"Position":232.0,"HyperDash":false}]},{"StartTime":38564.0,"Objects":[{"StartTime":38564.0,"Position":320.0,"HyperDash":false},{"StartTime":38606.0,"Position":295.0,"HyperDash":false},{"StartTime":38649.0,"Position":320.0,"HyperDash":false},{"StartTime":38692.0,"Position":295.0,"HyperDash":false},{"StartTime":38735.0,"Position":320.0,"HyperDash":false}]},{"StartTime":38907.0,"Objects":[{"StartTime":38907.0,"Position":408.0,"HyperDash":false},{"StartTime":38949.0,"Position":383.0,"HyperDash":false},{"StartTime":38992.0,"Position":408.0,"HyperDash":false},{"StartTime":39035.0,"Position":383.0,"HyperDash":false},{"StartTime":39078.0,"Position":408.0,"HyperDash":false}]},{"StartTime":39593.0,"Objects":[{"StartTime":39593.0,"Position":304.0,"HyperDash":false}]},{"StartTime":39764.0,"Objects":[{"StartTime":39764.0,"Position":208.0,"HyperDash":false}]},{"StartTime":40278.0,"Objects":[{"StartTime":40278.0,"Position":40.0,"HyperDash":false}]},{"StartTime":40450.0,"Objects":[{"StartTime":40450.0,"Position":112.0,"HyperDash":false}]},{"StartTime":40621.0,"Objects":[{"StartTime":40621.0,"Position":200.0,"HyperDash":false}]},{"StartTime":40793.0,"Objects":[{"StartTime":40793.0,"Position":264.0,"HyperDash":false}]},{"StartTime":40964.0,"Objects":[{"StartTime":40964.0,"Position":352.0,"HyperDash":false}]},{"StartTime":41050.0,"Objects":[{"StartTime":41050.0,"Position":352.0,"HyperDash":false}]},{"StartTime":41135.0,"Objects":[{"StartTime":41135.0,"Position":352.0,"HyperDash":false}]},{"StartTime":41478.0,"Objects":[{"StartTime":41478.0,"Position":480.0,"HyperDash":false}]},{"StartTime":41650.0,"Objects":[{"StartTime":41650.0,"Position":422.0,"HyperDash":false}]},{"StartTime":41821.0,"Objects":[{"StartTime":41821.0,"Position":364.0,"HyperDash":false}]},{"StartTime":41993.0,"Objects":[{"StartTime":41993.0,"Position":422.0,"HyperDash":false}]},{"StartTime":42164.0,"Objects":[{"StartTime":42164.0,"Position":327.0,"HyperDash":false}]},{"StartTime":42335.0,"Objects":[{"StartTime":42335.0,"Position":226.0,"HyperDash":false}]},{"StartTime":42507.0,"Objects":[{"StartTime":42507.0,"Position":327.0,"HyperDash":false}]},{"StartTime":42678.0,"Objects":[{"StartTime":42678.0,"Position":381.0,"HyperDash":false}]},{"StartTime":42850.0,"Objects":[{"StartTime":42850.0,"Position":437.0,"HyperDash":false}]},{"StartTime":43021.0,"Objects":[{"StartTime":43021.0,"Position":381.0,"HyperDash":false}]},{"StartTime":43193.0,"Objects":[{"StartTime":43193.0,"Position":327.0,"HyperDash":false}]},{"StartTime":43278.0,"Objects":[{"StartTime":43278.0,"Position":16.0,"HyperDash":false},{"StartTime":43374.0,"Position":248.0,"HyperDash":false},{"StartTime":43471.0,"Position":100.0,"HyperDash":false},{"StartTime":43567.0,"Position":24.0,"HyperDash":false},{"StartTime":43664.0,"Position":66.0,"HyperDash":false},{"StartTime":43760.0,"Position":97.0,"HyperDash":false},{"StartTime":43857.0,"Position":267.0,"HyperDash":false},{"StartTime":43953.0,"Position":116.0,"HyperDash":false},{"StartTime":44050.0,"Position":451.0,"HyperDash":false}]},{"StartTime":44221.0,"Objects":[{"StartTime":44221.0,"Position":328.0,"HyperDash":false},{"StartTime":44297.0,"Position":357.352631,"HyperDash":false},{"StartTime":44374.0,"Position":374.9336,"HyperDash":false},{"StartTime":44450.0,"Position":395.286255,"HyperDash":false},{"StartTime":44563.0,"Position":406.086884,"HyperDash":false}]},{"StartTime":44907.0,"Objects":[{"StartTime":44907.0,"Position":184.0,"HyperDash":false},{"StartTime":44983.0,"Position":158.647354,"HyperDash":false},{"StartTime":45060.0,"Position":135.0664,"HyperDash":false},{"StartTime":45136.0,"Position":127.713745,"HyperDash":false},{"StartTime":45249.0,"Position":105.913116,"HyperDash":false}]},{"StartTime":45421.0,"Objects":[{"StartTime":45421.0,"Position":192.0,"HyperDash":false}]},{"StartTime":45507.0,"Objects":[{"StartTime":45507.0,"Position":192.0,"HyperDash":false}]},{"StartTime":45593.0,"Objects":[{"StartTime":45593.0,"Position":192.0,"HyperDash":false}]},{"StartTime":45764.0,"Objects":[{"StartTime":45764.0,"Position":106.0,"HyperDash":false}]},{"StartTime":45850.0,"Objects":[{"StartTime":45850.0,"Position":106.0,"HyperDash":false}]},{"StartTime":45935.0,"Objects":[{"StartTime":45935.0,"Position":106.0,"HyperDash":false}]},{"StartTime":46107.0,"Objects":[{"StartTime":46107.0,"Position":154.0,"HyperDash":false}]},{"StartTime":46278.0,"Objects":[{"StartTime":46278.0,"Position":237.0,"HyperDash":false}]},{"StartTime":46364.0,"Objects":[{"StartTime":46364.0,"Position":237.0,"HyperDash":false}]},{"StartTime":46450.0,"Objects":[{"StartTime":46450.0,"Position":237.0,"HyperDash":false}]},{"StartTime":46535.0,"Objects":[{"StartTime":46535.0,"Position":237.0,"HyperDash":false}]},{"StartTime":46621.0,"Objects":[{"StartTime":46621.0,"Position":237.0,"HyperDash":false}]},{"StartTime":46964.0,"Objects":[{"StartTime":46964.0,"Position":410.0,"HyperDash":false}]},{"StartTime":47135.0,"Objects":[{"StartTime":47135.0,"Position":410.0,"HyperDash":false}]},{"StartTime":47307.0,"Objects":[{"StartTime":47307.0,"Position":462.0,"HyperDash":false}]},{"StartTime":47478.0,"Objects":[{"StartTime":47478.0,"Position":462.0,"HyperDash":false}]},{"StartTime":47650.0,"Objects":[{"StartTime":47650.0,"Position":379.0,"HyperDash":false}]},{"StartTime":47821.0,"Objects":[{"StartTime":47821.0,"Position":379.0,"HyperDash":false}]},{"StartTime":47993.0,"Objects":[{"StartTime":47993.0,"Position":328.0,"HyperDash":false}]},{"StartTime":48164.0,"Objects":[{"StartTime":48164.0,"Position":328.0,"HyperDash":false}]},{"StartTime":48335.0,"Objects":[{"StartTime":48335.0,"Position":237.0,"HyperDash":false}]},{"StartTime":48507.0,"Objects":[{"StartTime":48507.0,"Position":328.0,"HyperDash":false}]},{"StartTime":48678.0,"Objects":[{"StartTime":48678.0,"Position":410.0,"HyperDash":false}]},{"StartTime":48935.0,"Objects":[{"StartTime":48935.0,"Position":264.0,"HyperDash":false}]},{"StartTime":49021.0,"Objects":[{"StartTime":49021.0,"Position":264.0,"HyperDash":false}]},{"StartTime":49193.0,"Objects":[{"StartTime":49193.0,"Position":304.0,"HyperDash":false}]},{"StartTime":49364.0,"Objects":[{"StartTime":49364.0,"Position":368.0,"HyperDash":false}]},{"StartTime":49707.0,"Objects":[{"StartTime":49707.0,"Position":368.0,"HyperDash":false},{"StartTime":49783.0,"Position":403.222229,"HyperDash":false},{"StartTime":49860.0,"Position":411.736847,"HyperDash":false},{"StartTime":49936.0,"Position":434.959076,"HyperDash":false},{"StartTime":50049.0,"Position":468.0,"HyperDash":false}]},{"StartTime":50393.0,"Objects":[{"StartTime":50393.0,"Position":280.0,"HyperDash":false},{"StartTime":50469.0,"Position":295.222229,"HyperDash":false},{"StartTime":50546.0,"Position":340.736847,"HyperDash":false},{"StartTime":50622.0,"Position":355.959076,"HyperDash":false},{"StartTime":50735.0,"Position":380.0,"HyperDash":false}]},{"StartTime":51250.0,"Objects":[{"StartTime":51250.0,"Position":88.0,"HyperDash":false},{"StartTime":51326.0,"Position":103.222221,"HyperDash":false},{"StartTime":51403.0,"Position":148.736847,"HyperDash":false},{"StartTime":51479.0,"Position":138.959076,"HyperDash":false},{"StartTime":51592.0,"Position":188.0,"HyperDash":false}]},{"StartTime":51764.0,"Objects":[{"StartTime":51764.0,"Position":264.0,"HyperDash":false}]},{"StartTime":51850.0,"Objects":[{"StartTime":51850.0,"Position":280.0,"HyperDash":false}]},{"StartTime":51935.0,"Objects":[{"StartTime":51935.0,"Position":296.0,"HyperDash":false}]},{"StartTime":52021.0,"Objects":[{"StartTime":52021.0,"Position":312.0,"HyperDash":false}]},{"StartTime":52107.0,"Objects":[{"StartTime":52107.0,"Position":328.0,"HyperDash":false}]},{"StartTime":52450.0,"Objects":[{"StartTime":52450.0,"Position":208.0,"HyperDash":false}]},{"StartTime":52621.0,"Objects":[{"StartTime":52621.0,"Position":304.0,"HyperDash":false}]},{"StartTime":52793.0,"Objects":[{"StartTime":52793.0,"Position":256.0,"HyperDash":false}]},{"StartTime":53135.0,"Objects":[{"StartTime":53135.0,"Position":208.0,"HyperDash":false}]},{"StartTime":53307.0,"Objects":[{"StartTime":53307.0,"Position":304.0,"HyperDash":false}]},{"StartTime":53478.0,"Objects":[{"StartTime":53478.0,"Position":208.0,"HyperDash":false}]},{"StartTime":53650.0,"Objects":[{"StartTime":53650.0,"Position":304.0,"HyperDash":false}]},{"StartTime":53821.0,"Objects":[{"StartTime":53821.0,"Position":208.0,"HyperDash":false}]},{"StartTime":53993.0,"Objects":[{"StartTime":53993.0,"Position":304.0,"HyperDash":false}]},{"StartTime":54164.0,"Objects":[{"StartTime":54164.0,"Position":247.0,"HyperDash":false},{"StartTime":54217.0,"Position":162.0,"HyperDash":false},{"StartTime":54271.0,"Position":383.0,"HyperDash":false},{"StartTime":54324.0,"Position":127.0,"HyperDash":false},{"StartTime":54378.0,"Position":161.0,"HyperDash":false},{"StartTime":54431.0,"Position":332.0,"HyperDash":false},{"StartTime":54485.0,"Position":356.0,"HyperDash":false},{"StartTime":54538.0,"Position":362.0,"HyperDash":false},{"StartTime":54592.0,"Position":347.0,"HyperDash":false},{"StartTime":54646.0,"Position":252.0,"HyperDash":false},{"StartTime":54699.0,"Position":477.0,"HyperDash":false},{"StartTime":54753.0,"Position":358.0,"HyperDash":false},{"StartTime":54806.0,"Position":17.0,"HyperDash":false},{"StartTime":54860.0,"Position":399.0,"HyperDash":false},{"StartTime":54913.0,"Position":280.0,"HyperDash":false},{"StartTime":54967.0,"Position":304.0,"HyperDash":false},{"StartTime":55021.0,"Position":221.0,"HyperDash":false}]},{"StartTime":55193.0,"Objects":[{"StartTime":55193.0,"Position":256.0,"HyperDash":false},{"StartTime":55269.0,"Position":251.286514,"HyperDash":false},{"StartTime":55346.0,"Position":219.366272,"HyperDash":false},{"StartTime":55422.0,"Position":195.652786,"HyperDash":false},{"StartTime":55535.0,"Position":185.289337,"HyperDash":false}]},{"StartTime":55878.0,"Objects":[{"StartTime":55878.0,"Position":256.0,"HyperDash":false},{"StartTime":55954.0,"Position":280.71347,"HyperDash":false},{"StartTime":56031.0,"Position":289.633728,"HyperDash":false},{"StartTime":56107.0,"Position":299.3472,"HyperDash":false},{"StartTime":56220.0,"Position":326.710663,"HyperDash":false}]},{"StartTime":56393.0,"Objects":[{"StartTime":56393.0,"Position":256.0,"HyperDash":false}]},{"StartTime":56564.0,"Objects":[{"StartTime":56564.0,"Position":160.0,"HyperDash":false}]},{"StartTime":56650.0,"Objects":[{"StartTime":56650.0,"Position":160.0,"HyperDash":false}]},{"StartTime":56735.0,"Objects":[{"StartTime":56735.0,"Position":160.0,"HyperDash":false}]},{"StartTime":56907.0,"Objects":[{"StartTime":56907.0,"Position":160.0,"HyperDash":false}]},{"StartTime":57078.0,"Objects":[{"StartTime":57078.0,"Position":256.0,"HyperDash":false}]},{"StartTime":57250.0,"Objects":[{"StartTime":57250.0,"Position":352.0,"HyperDash":false}]},{"StartTime":57335.0,"Objects":[{"StartTime":57335.0,"Position":360.0,"HyperDash":false}]},{"StartTime":57421.0,"Objects":[{"StartTime":57421.0,"Position":368.0,"HyperDash":false}]},{"StartTime":57507.0,"Objects":[{"StartTime":57507.0,"Position":376.0,"HyperDash":false}]},{"StartTime":57593.0,"Objects":[{"StartTime":57593.0,"Position":384.0,"HyperDash":false}]},{"StartTime":57935.0,"Objects":[{"StartTime":57935.0,"Position":472.0,"HyperDash":false}]},{"StartTime":58107.0,"Objects":[{"StartTime":58107.0,"Position":387.0,"HyperDash":false}]},{"StartTime":58278.0,"Objects":[{"StartTime":58278.0,"Position":284.0,"HyperDash":false}]},{"StartTime":58450.0,"Objects":[{"StartTime":58450.0,"Position":193.0,"HyperDash":false}]},{"StartTime":58621.0,"Objects":[{"StartTime":58621.0,"Position":139.0,"HyperDash":false}]},{"StartTime":58793.0,"Objects":[{"StartTime":58793.0,"Position":132.0,"HyperDash":false}]},{"StartTime":58964.0,"Objects":[{"StartTime":58964.0,"Position":174.0,"HyperDash":false}]},{"StartTime":59307.0,"Objects":[{"StartTime":59307.0,"Position":256.0,"HyperDash":false}]},{"StartTime":59478.0,"Objects":[{"StartTime":59478.0,"Position":208.0,"HyperDash":false}]},{"StartTime":59650.0,"Objects":[{"StartTime":59650.0,"Position":304.0,"HyperDash":false}]},{"StartTime":59821.0,"Objects":[{"StartTime":59821.0,"Position":344.0,"HyperDash":false}]},{"StartTime":59907.0,"Objects":[{"StartTime":59907.0,"Position":312.0,"HyperDash":false}]},{"StartTime":59993.0,"Objects":[{"StartTime":59993.0,"Position":280.0,"HyperDash":false}]},{"StartTime":60164.0,"Objects":[{"StartTime":60164.0,"Position":208.0,"HyperDash":false}]},{"StartTime":60335.0,"Objects":[{"StartTime":60335.0,"Position":304.0,"HyperDash":false}]},{"StartTime":60678.0,"Objects":[{"StartTime":60678.0,"Position":200.0,"HyperDash":false},{"StartTime":60754.0,"Position":175.647354,"HyperDash":false},{"StartTime":60831.0,"Position":176.0664,"HyperDash":false},{"StartTime":60907.0,"Position":137.713745,"HyperDash":false},{"StartTime":61020.0,"Position":121.913116,"HyperDash":false}]},{"StartTime":61364.0,"Objects":[{"StartTime":61364.0,"Position":312.0,"HyperDash":false},{"StartTime":61440.0,"Position":348.352631,"HyperDash":false},{"StartTime":61517.0,"Position":333.9336,"HyperDash":false},{"StartTime":61593.0,"Position":362.286255,"HyperDash":false},{"StartTime":61706.0,"Position":390.086884,"HyperDash":false}]},{"StartTime":62050.0,"Objects":[{"StartTime":62050.0,"Position":390.0,"HyperDash":false}]},{"StartTime":62393.0,"Objects":[{"StartTime":62393.0,"Position":121.0,"HyperDash":false}]},{"StartTime":62735.0,"Objects":[{"StartTime":62735.0,"Position":256.0,"HyperDash":false}]},{"StartTime":62821.0,"Objects":[{"StartTime":62821.0,"Position":256.0,"HyperDash":false}]},{"StartTime":62907.0,"Objects":[{"StartTime":62907.0,"Position":256.0,"HyperDash":false}]},{"StartTime":62993.0,"Objects":[{"StartTime":62993.0,"Position":256.0,"HyperDash":false}]},{"StartTime":63078.0,"Objects":[{"StartTime":63078.0,"Position":256.0,"HyperDash":false}]},{"StartTime":63421.0,"Objects":[{"StartTime":63421.0,"Position":432.0,"HyperDash":false}]},{"StartTime":63593.0,"Objects":[{"StartTime":63593.0,"Position":496.0,"HyperDash":false}]},{"StartTime":63764.0,"Objects":[{"StartTime":63764.0,"Position":496.0,"HyperDash":false}]},{"StartTime":63935.0,"Objects":[{"StartTime":63935.0,"Position":440.0,"HyperDash":false}]},{"StartTime":64107.0,"Objects":[{"StartTime":64107.0,"Position":352.0,"HyperDash":false}]},{"StartTime":64278.0,"Objects":[{"StartTime":64278.0,"Position":256.0,"HyperDash":false}]},{"StartTime":64450.0,"Objects":[{"StartTime":64450.0,"Position":160.0,"HyperDash":false}]},{"StartTime":64621.0,"Objects":[{"StartTime":64621.0,"Position":72.0,"HyperDash":false}]},{"StartTime":64793.0,"Objects":[{"StartTime":64793.0,"Position":8.0,"HyperDash":false}]},{"StartTime":64964.0,"Objects":[{"StartTime":64964.0,"Position":8.0,"HyperDash":false}]},{"StartTime":65135.0,"Objects":[{"StartTime":65135.0,"Position":56.0,"HyperDash":false}]},{"StartTime":65221.0,"Objects":[{"StartTime":65221.0,"Position":437.0,"HyperDash":false},{"StartTime":65317.0,"Position":289.0,"HyperDash":false},{"StartTime":65414.0,"Position":464.0,"HyperDash":false},{"StartTime":65510.0,"Position":36.0,"HyperDash":false},{"StartTime":65607.0,"Position":378.0,"HyperDash":false},{"StartTime":65703.0,"Position":297.0,"HyperDash":false},{"StartTime":65800.0,"Position":418.0,"HyperDash":false},{"StartTime":65896.0,"Position":329.0,"HyperDash":false},{"StartTime":65993.0,"Position":338.0,"HyperDash":false}]},{"StartTime":66164.0,"Objects":[{"StartTime":66164.0,"Position":296.0,"HyperDash":false},{"StartTime":66240.0,"Position":317.930573,"HyperDash":false},{"StartTime":66317.0,"Position":317.018127,"HyperDash":false},{"StartTime":66393.0,"Position":314.9487,"HyperDash":false},{"StartTime":66506.0,"Position":349.687561,"HyperDash":false}]},{"StartTime":66850.0,"Objects":[{"StartTime":66850.0,"Position":216.0,"HyperDash":false},{"StartTime":66926.0,"Position":184.069427,"HyperDash":false},{"StartTime":67003.0,"Position":174.981888,"HyperDash":false},{"StartTime":67079.0,"Position":196.051315,"HyperDash":false},{"StartTime":67192.0,"Position":162.312454,"HyperDash":false}]},{"StartTime":67535.0,"Objects":[{"StartTime":67535.0,"Position":296.0,"HyperDash":false},{"StartTime":67611.0,"Position":288.930573,"HyperDash":false},{"StartTime":67688.0,"Position":339.018127,"HyperDash":false},{"StartTime":67764.0,"Position":312.9487,"HyperDash":false},{"StartTime":67877.0,"Position":349.687561,"HyperDash":false}]},{"StartTime":67964.0,"Objects":[{"StartTime":67964.0,"Position":267.0,"HyperDash":false},{"StartTime":68060.0,"Position":477.0,"HyperDash":false},{"StartTime":68156.0,"Position":282.0,"HyperDash":false},{"StartTime":68253.0,"Position":216.0,"HyperDash":false},{"StartTime":68349.0,"Position":106.0,"HyperDash":false},{"StartTime":68445.0,"Position":353.0,"HyperDash":false},{"StartTime":68542.0,"Position":162.0,"HyperDash":false},{"StartTime":68638.0,"Position":473.0,"HyperDash":false},{"StartTime":68735.0,"Position":260.0,"HyperDash":false}]},{"StartTime":68907.0,"Objects":[{"StartTime":68907.0,"Position":304.0,"HyperDash":false},{"StartTime":68983.0,"Position":334.222229,"HyperDash":false},{"StartTime":69060.0,"Position":328.736847,"HyperDash":false},{"StartTime":69136.0,"Position":355.959076,"HyperDash":false},{"StartTime":69249.0,"Position":404.0,"HyperDash":false}]},{"StartTime":69593.0,"Objects":[{"StartTime":69593.0,"Position":208.0,"HyperDash":false},{"StartTime":69669.0,"Position":188.777771,"HyperDash":false},{"StartTime":69746.0,"Position":175.263153,"HyperDash":false},{"StartTime":69822.0,"Position":151.040924,"HyperDash":false},{"StartTime":69935.0,"Position":108.0,"HyperDash":false}]},{"StartTime":70278.0,"Objects":[{"StartTime":70278.0,"Position":304.0,"HyperDash":false},{"StartTime":70354.0,"Position":332.222229,"HyperDash":false},{"StartTime":70431.0,"Position":343.736847,"HyperDash":false},{"StartTime":70507.0,"Position":361.959076,"HyperDash":false},{"StartTime":70620.0,"Position":404.0,"HyperDash":false}]},{"StartTime":71307.0,"Objects":[{"StartTime":71307.0,"Position":56.0,"HyperDash":false},{"StartTime":71392.0,"Position":57.8317223,"HyperDash":false},{"StartTime":71478.0,"Position":43.0449677,"HyperDash":false},{"StartTime":71563.0,"Position":62.4877777,"HyperDash":false},{"StartTime":71649.0,"Position":54.65224,"HyperDash":false},{"StartTime":71725.0,"Position":50.5213776,"HyperDash":false},{"StartTime":71802.0,"Position":33.41652,"HyperDash":false},{"StartTime":71879.0,"Position":58.5728569,"HyperDash":false},{"StartTime":71992.0,"Position":56.0,"HyperDash":false}]},{"StartTime":72335.0,"Objects":[{"StartTime":72335.0,"Position":256.0,"HyperDash":false}]},{"StartTime":72507.0,"Objects":[{"StartTime":72507.0,"Position":328.0,"HyperDash":false}]},{"StartTime":72678.0,"Objects":[{"StartTime":72678.0,"Position":400.0,"HyperDash":false}]},{"StartTime":73021.0,"Objects":[{"StartTime":73021.0,"Position":400.0,"HyperDash":false},{"StartTime":73097.0,"Position":415.600647,"HyperDash":false},{"StartTime":73174.0,"Position":409.291138,"HyperDash":false},{"StartTime":73250.0,"Position":437.285278,"HyperDash":false},{"StartTime":73363.0,"Position":410.36676,"HyperDash":false}]},{"StartTime":73707.0,"Objects":[{"StartTime":73707.0,"Position":112.0,"HyperDash":false},{"StartTime":73783.0,"Position":117.399353,"HyperDash":false},{"StartTime":73860.0,"Position":79.7088547,"HyperDash":false},{"StartTime":73936.0,"Position":102.714714,"HyperDash":false},{"StartTime":74049.0,"Position":101.633247,"HyperDash":false}]},{"StartTime":74393.0,"Objects":[{"StartTime":74393.0,"Position":304.0,"HyperDash":false},{"StartTime":74469.0,"Position":301.197144,"HyperDash":false},{"StartTime":74546.0,"Position":342.5416,"HyperDash":false},{"StartTime":74622.0,"Position":349.738739,"HyperDash":false},{"StartTime":74735.0,"Position":354.387115,"HyperDash":false}]},{"StartTime":75078.0,"Objects":[{"StartTime":75078.0,"Position":304.0,"HyperDash":false},{"StartTime":75154.0,"Position":303.197144,"HyperDash":false},{"StartTime":75231.0,"Position":337.5416,"HyperDash":false},{"StartTime":75307.0,"Position":353.738739,"HyperDash":false},{"StartTime":75420.0,"Position":354.387115,"HyperDash":false}]},{"StartTime":75764.0,"Objects":[{"StartTime":75764.0,"Position":464.0,"HyperDash":false}]},{"StartTime":75935.0,"Objects":[{"StartTime":75935.0,"Position":384.0,"HyperDash":false}]},{"StartTime":76107.0,"Objects":[{"StartTime":76107.0,"Position":304.0,"HyperDash":false}]},{"StartTime":76278.0,"Objects":[{"StartTime":76278.0,"Position":232.0,"HyperDash":false}]},{"StartTime":76450.0,"Objects":[{"StartTime":76450.0,"Position":160.0,"HyperDash":false},{"StartTime":76535.0,"Position":135.0,"HyperDash":false},{"StartTime":76621.0,"Position":160.0,"HyperDash":false}]},{"StartTime":76793.0,"Objects":[{"StartTime":76793.0,"Position":80.0,"HyperDash":false}]},{"StartTime":77135.0,"Objects":[{"StartTime":77135.0,"Position":120.0,"HyperDash":false},{"StartTime":77211.0,"Position":119.7057,"HyperDash":false},{"StartTime":77288.0,"Position":91.15754,"HyperDash":false},{"StartTime":77364.0,"Position":60.8632431,"HyperDash":false},{"StartTime":77477.0,"Position":33.1756821,"HyperDash":false}]},{"StartTime":77821.0,"Objects":[{"StartTime":77821.0,"Position":232.0,"HyperDash":false},{"StartTime":77897.0,"Position":234.148621,"HyperDash":false},{"StartTime":77974.0,"Position":272.5492,"HyperDash":false},{"StartTime":78050.0,"Position":284.6978,"HyperDash":false},{"StartTime":78163.0,"Position":318.1688,"HyperDash":false}]},{"StartTime":78507.0,"Objects":[{"StartTime":78507.0,"Position":176.0,"HyperDash":false},{"StartTime":78583.0,"Position":142.7057,"HyperDash":false},{"StartTime":78660.0,"Position":129.157532,"HyperDash":false},{"StartTime":78736.0,"Position":124.863243,"HyperDash":false},{"StartTime":78849.0,"Position":89.17568,"HyperDash":false}]},{"StartTime":79193.0,"Objects":[{"StartTime":79193.0,"Position":288.0,"HyperDash":false},{"StartTime":79269.0,"Position":321.241455,"HyperDash":false},{"StartTime":79346.0,"Position":319.736084,"HyperDash":false},{"StartTime":79422.0,"Position":360.9775,"HyperDash":false},{"StartTime":79535.0,"Position":374.586517,"HyperDash":false}]},{"StartTime":79878.0,"Objects":[{"StartTime":79878.0,"Position":240.0,"HyperDash":false},{"StartTime":79954.0,"Position":209.7057,"HyperDash":false},{"StartTime":80031.0,"Position":189.157532,"HyperDash":false},{"StartTime":80107.0,"Position":196.863251,"HyperDash":false},{"StartTime":80220.0,"Position":153.17569,"HyperDash":false}]},{"StartTime":80564.0,"Objects":[{"StartTime":80564.0,"Position":32.0,"HyperDash":false}]},{"StartTime":80735.0,"Objects":[{"StartTime":80735.0,"Position":66.0,"HyperDash":false}]},{"StartTime":80907.0,"Objects":[{"StartTime":80907.0,"Position":161.0,"HyperDash":false}]},{"StartTime":81078.0,"Objects":[{"StartTime":81078.0,"Position":190.0,"HyperDash":false}]},{"StartTime":81250.0,"Objects":[{"StartTime":81250.0,"Position":285.0,"HyperDash":false}]},{"StartTime":81593.0,"Objects":[{"StartTime":81593.0,"Position":384.0,"HyperDash":false},{"StartTime":81652.0,"Position":401.608948,"HyperDash":false},{"StartTime":81712.0,"Position":403.3638,"HyperDash":false},{"StartTime":81772.0,"Position":419.118683,"HyperDash":false},{"StartTime":81832.0,"Position":416.873535,"HyperDash":false},{"StartTime":81891.0,"Position":412.482483,"HyperDash":false},{"StartTime":81951.0,"Position":417.237366,"HyperDash":false},{"StartTime":82011.0,"Position":431.992218,"HyperDash":false},{"StartTime":82107.0,"Position":459.0,"HyperDash":false}]},{"StartTime":82278.0,"Objects":[{"StartTime":82278.0,"Position":440.0,"HyperDash":false},{"StartTime":82345.0,"Position":418.133057,"HyperDash":false},{"StartTime":82449.0,"Position":412.264984,"HyperDash":false}]},{"StartTime":82621.0,"Objects":[{"StartTime":82621.0,"Position":320.0,"HyperDash":false},{"StartTime":82688.0,"Position":303.133057,"HyperDash":false},{"StartTime":82792.0,"Position":292.264984,"HyperDash":false}]},{"StartTime":82964.0,"Objects":[{"StartTime":82964.0,"Position":200.0,"HyperDash":false},{"StartTime":83031.0,"Position":187.133057,"HyperDash":false},{"StartTime":83135.0,"Position":172.264984,"HyperDash":false}]},{"StartTime":83307.0,"Objects":[{"StartTime":83307.0,"Position":248.0,"HyperDash":false}]},{"StartTime":83478.0,"Objects":[{"StartTime":83478.0,"Position":344.0,"HyperDash":false}]},{"StartTime":83650.0,"Objects":[{"StartTime":83650.0,"Position":448.0,"HyperDash":false}]},{"StartTime":83993.0,"Objects":[{"StartTime":83993.0,"Position":400.0,"HyperDash":false},{"StartTime":84060.0,"Position":372.409363,"HyperDash":false},{"StartTime":84164.0,"Position":350.0,"HyperDash":false}]},{"StartTime":84335.0,"Objects":[{"StartTime":84335.0,"Position":400.0,"HyperDash":false},{"StartTime":84402.0,"Position":438.590637,"HyperDash":false},{"StartTime":84506.0,"Position":450.0,"HyperDash":false}]},{"StartTime":84678.0,"Objects":[{"StartTime":84678.0,"Position":408.0,"HyperDash":false}]},{"StartTime":84850.0,"Objects":[{"StartTime":84850.0,"Position":304.0,"HyperDash":false}]},{"StartTime":85021.0,"Objects":[{"StartTime":85021.0,"Position":208.0,"HyperDash":false}]},{"StartTime":85364.0,"Objects":[{"StartTime":85364.0,"Position":208.0,"HyperDash":false},{"StartTime":85440.0,"Position":179.777771,"HyperDash":false},{"StartTime":85517.0,"Position":160.263153,"HyperDash":false},{"StartTime":85593.0,"Position":156.040924,"HyperDash":false},{"StartTime":85706.0,"Position":108.0,"HyperDash":false}]},{"StartTime":86050.0,"Objects":[{"StartTime":86050.0,"Position":304.0,"HyperDash":false},{"StartTime":86126.0,"Position":332.222229,"HyperDash":false},{"StartTime":86203.0,"Position":364.736847,"HyperDash":false},{"StartTime":86279.0,"Position":385.959076,"HyperDash":false},{"StartTime":86392.0,"Position":404.0,"HyperDash":false}]},{"StartTime":86735.0,"Objects":[{"StartTime":86735.0,"Position":480.0,"HyperDash":false}]},{"StartTime":86907.0,"Objects":[{"StartTime":86907.0,"Position":376.0,"HyperDash":false}]},{"StartTime":87078.0,"Objects":[{"StartTime":87078.0,"Position":272.0,"HyperDash":false}]},{"StartTime":87250.0,"Objects":[{"StartTime":87250.0,"Position":168.0,"HyperDash":false}]},{"StartTime":87421.0,"Objects":[{"StartTime":87421.0,"Position":64.0,"HyperDash":false},{"StartTime":87506.0,"Position":39.0,"HyperDash":false},{"StartTime":87592.0,"Position":64.0,"HyperDash":false}]},{"StartTime":87764.0,"Objects":[{"StartTime":87764.0,"Position":64.0,"HyperDash":false}]},{"StartTime":88107.0,"Objects":[{"StartTime":88107.0,"Position":208.0,"HyperDash":false},{"StartTime":88183.0,"Position":190.802856,"HyperDash":false},{"StartTime":88260.0,"Position":183.4584,"HyperDash":false},{"StartTime":88336.0,"Position":187.261261,"HyperDash":false},{"StartTime":88449.0,"Position":157.612885,"HyperDash":false}]},{"StartTime":88793.0,"Objects":[{"StartTime":88793.0,"Position":304.0,"HyperDash":false},{"StartTime":88869.0,"Position":300.197144,"HyperDash":false},{"StartTime":88946.0,"Position":313.5416,"HyperDash":false},{"StartTime":89022.0,"Position":334.738739,"HyperDash":false},{"StartTime":89135.0,"Position":354.387115,"HyperDash":false}]},{"StartTime":89478.0,"Objects":[{"StartTime":89478.0,"Position":208.0,"HyperDash":false},{"StartTime":89554.0,"Position":197.802872,"HyperDash":false},{"StartTime":89631.0,"Position":182.4584,"HyperDash":false},{"StartTime":89707.0,"Position":169.261261,"HyperDash":false},{"StartTime":89820.0,"Position":157.612885,"HyperDash":false}]},{"StartTime":90164.0,"Objects":[{"StartTime":90164.0,"Position":304.0,"HyperDash":false},{"StartTime":90249.0,"Position":316.8624,"HyperDash":false},{"StartTime":90335.0,"Position":304.0,"HyperDash":false}]},{"StartTime":90507.0,"Objects":[{"StartTime":90507.0,"Position":208.0,"HyperDash":false}]},{"StartTime":90850.0,"Objects":[{"StartTime":90850.0,"Position":56.0,"HyperDash":false}]},{"StartTime":91021.0,"Objects":[{"StartTime":91021.0,"Position":56.0,"HyperDash":false}]},{"StartTime":91193.0,"Objects":[{"StartTime":91193.0,"Position":144.0,"HyperDash":false}]},{"StartTime":91536.0,"Objects":[{"StartTime":91536.0,"Position":344.0,"HyperDash":false}]},{"StartTime":91707.0,"Objects":[{"StartTime":91707.0,"Position":424.0,"HyperDash":false}]},{"StartTime":91878.0,"Objects":[{"StartTime":91878.0,"Position":424.0,"HyperDash":false}]},{"StartTime":92050.0,"Objects":[{"StartTime":92050.0,"Position":344.0,"HyperDash":false}]},{"StartTime":92221.0,"Objects":[{"StartTime":92221.0,"Position":256.0,"HyperDash":false}]},{"StartTime":92564.0,"Objects":[{"StartTime":92564.0,"Position":160.0,"HyperDash":false},{"StartTime":92649.0,"Position":142.69455,"HyperDash":false},{"StartTime":92735.0,"Position":131.871,"HyperDash":false},{"StartTime":92820.0,"Position":111.443245,"HyperDash":false},{"StartTime":92906.0,"Position":100.496979,"HyperDash":false},{"StartTime":92974.0,"Position":108.492638,"HyperDash":false},{"StartTime":93078.0,"Position":101.630577,"HyperDash":true}]},{"StartTime":93250.0,"Objects":[{"StartTime":93250.0,"Position":352.0,"HyperDash":false},{"StartTime":93335.0,"Position":389.30545,"HyperDash":false},{"StartTime":93421.0,"Position":398.129,"HyperDash":false},{"StartTime":93506.0,"Position":421.556763,"HyperDash":false},{"StartTime":93592.0,"Position":411.503021,"HyperDash":false},{"StartTime":93660.0,"Position":408.507355,"HyperDash":false},{"StartTime":93764.0,"Position":410.369415,"HyperDash":false}]},{"StartTime":93936.0,"Objects":[{"StartTime":93936.0,"Position":256.0,"HyperDash":false}]},{"StartTime":94021.0,"Objects":[{"StartTime":94021.0,"Position":256.0,"HyperDash":false}]},{"StartTime":94107.0,"Objects":[{"StartTime":94107.0,"Position":256.0,"HyperDash":false}]},{"StartTime":94193.0,"Objects":[{"StartTime":94193.0,"Position":256.0,"HyperDash":false}]},{"StartTime":94278.0,"Objects":[{"StartTime":94278.0,"Position":256.0,"HyperDash":false}]},{"StartTime":94364.0,"Objects":[{"StartTime":94364.0,"Position":256.0,"HyperDash":false}]},{"StartTime":94450.0,"Objects":[{"StartTime":94450.0,"Position":256.0,"HyperDash":false}]},{"StartTime":94536.0,"Objects":[{"StartTime":94536.0,"Position":256.0,"HyperDash":false}]},{"StartTime":94621.0,"Objects":[{"StartTime":94621.0,"Position":256.0,"HyperDash":false},{"StartTime":94706.0,"Position":317.7076,"HyperDash":false},{"StartTime":94792.0,"Position":356.0,"HyperDash":false},{"StartTime":94859.0,"Position":307.8187,"HyperDash":false},{"StartTime":94963.0,"Position":256.0,"HyperDash":false}]},{"StartTime":95136.0,"Objects":[{"StartTime":95136.0,"Position":448.0,"HyperDash":false},{"StartTime":95203.0,"Position":427.818726,"HyperDash":false},{"StartTime":95307.0,"Position":348.0,"HyperDash":false}]},{"StartTime":95650.0,"Objects":[{"StartTime":95650.0,"Position":40.0,"HyperDash":false},{"StartTime":95735.0,"Position":86.81512,"HyperDash":false},{"StartTime":95821.0,"Position":118.086884,"HyperDash":false},{"StartTime":95888.0,"Position":133.0,"HyperDash":false},{"StartTime":95992.0,"Position":120.0,"HyperDash":false}]},{"StartTime":96336.0,"Objects":[{"StartTime":96336.0,"Position":480.0,"HyperDash":false},{"StartTime":96403.0,"Position":422.173248,"HyperDash":false},{"StartTime":96507.0,"Position":383.4571,"HyperDash":false}]},{"StartTime":96678.0,"Objects":[{"StartTime":96678.0,"Position":176.0,"HyperDash":false},{"StartTime":96745.0,"Position":193.826752,"HyperDash":false},{"StartTime":96849.0,"Position":272.5429,"HyperDash":false}]},{"StartTime":97021.0,"Objects":[{"StartTime":97021.0,"Position":440.0,"HyperDash":false},{"StartTime":97106.0,"Position":383.010834,"HyperDash":false},{"StartTime":97192.0,"Position":343.4571,"HyperDash":false},{"StartTime":97259.0,"Position":370.283844,"HyperDash":false},{"StartTime":97363.0,"Position":440.0,"HyperDash":false}]},{"StartTime":97707.0,"Objects":[{"StartTime":97707.0,"Position":40.0,"HyperDash":false},{"StartTime":97792.0,"Position":41.5126953,"HyperDash":false},{"StartTime":97878.0,"Position":39.0196533,"HyperDash":false},{"StartTime":97945.0,"Position":73.99493,"HyperDash":false},{"StartTime":98049.0,"Position":115.429176,"HyperDash":false}]},{"StartTime":98393.0,"Objects":[{"StartTime":98393.0,"Position":440.0,"HyperDash":false},{"StartTime":98478.0,"Position":400.2924,"HyperDash":false},{"StartTime":98564.0,"Position":340.0,"HyperDash":false},{"StartTime":98631.0,"Position":332.355255,"HyperDash":false},{"StartTime":98735.0,"Position":276.290741,"HyperDash":false}]},{"StartTime":99078.0,"Objects":[{"StartTime":99078.0,"Position":32.0,"HyperDash":false},{"StartTime":99145.0,"Position":65.70535,"HyperDash":false},{"StartTime":99249.0,"Position":102.710678,"HyperDash":false}]},{"StartTime":99421.0,"Objects":[{"StartTime":99421.0,"Position":296.0,"HyperDash":false},{"StartTime":99488.0,"Position":284.294647,"HyperDash":false},{"StartTime":99592.0,"Position":225.289322,"HyperDash":false}]},{"StartTime":99764.0,"Objects":[{"StartTime":99764.0,"Position":408.0,"HyperDash":false},{"StartTime":99849.0,"Position":457.1486,"HyperDash":false},{"StartTime":99935.0,"Position":478.7107,"HyperDash":false},{"StartTime":100002.0,"Position":469.0053,"HyperDash":false},{"StartTime":100106.0,"Position":408.0,"HyperDash":false}]},{"StartTime":100450.0,"Objects":[{"StartTime":100450.0,"Position":32.0,"HyperDash":false},{"StartTime":100535.0,"Position":80.7076,"HyperDash":false},{"StartTime":100621.0,"Position":132.0,"HyperDash":false},{"StartTime":100688.0,"Position":176.18129,"HyperDash":false},{"StartTime":100792.0,"Position":232.0,"HyperDash":false}]},{"StartTime":101136.0,"Objects":[{"StartTime":101136.0,"Position":480.0,"HyperDash":false},{"StartTime":101221.0,"Position":426.2924,"HyperDash":false},{"StartTime":101307.0,"Position":380.0,"HyperDash":false},{"StartTime":101374.0,"Position":346.818726,"HyperDash":false},{"StartTime":101478.0,"Position":280.0,"HyperDash":false}]},{"StartTime":101821.0,"Objects":[{"StartTime":101821.0,"Position":256.0,"HyperDash":false},{"StartTime":101906.0,"Position":250.0,"HyperDash":false},{"StartTime":101992.0,"Position":256.0,"HyperDash":false},{"StartTime":102059.0,"Position":256.0,"HyperDash":false},{"StartTime":102163.0,"Position":256.0,"HyperDash":false}]},{"StartTime":102336.0,"Objects":[{"StartTime":102336.0,"Position":256.0,"HyperDash":false}]},{"StartTime":102507.0,"Objects":[{"StartTime":102507.0,"Position":256.0,"HyperDash":false},{"StartTime":102592.0,"Position":261.0,"HyperDash":false},{"StartTime":102678.0,"Position":256.0,"HyperDash":false},{"StartTime":102745.0,"Position":274.0,"HyperDash":false},{"StartTime":102849.0,"Position":256.0,"HyperDash":false}]},{"StartTime":103193.0,"Objects":[{"StartTime":103193.0,"Position":432.0,"HyperDash":false}]},{"StartTime":103364.0,"Objects":[{"StartTime":103364.0,"Position":256.0,"HyperDash":false}]},{"StartTime":103536.0,"Objects":[{"StartTime":103536.0,"Position":80.0,"HyperDash":true}]},{"StartTime":103878.0,"Objects":[{"StartTime":103878.0,"Position":480.0,"HyperDash":false}]},{"StartTime":104050.0,"Objects":[{"StartTime":104050.0,"Position":408.0,"HyperDash":false}]},{"StartTime":104221.0,"Objects":[{"StartTime":104221.0,"Position":336.0,"HyperDash":false}]},{"StartTime":104393.0,"Objects":[{"StartTime":104393.0,"Position":264.0,"HyperDash":false}]},{"StartTime":104564.0,"Objects":[{"StartTime":104564.0,"Position":184.0,"HyperDash":false}]},{"StartTime":104736.0,"Objects":[{"StartTime":104736.0,"Position":104.0,"HyperDash":false}]},{"StartTime":104907.0,"Objects":[{"StartTime":104907.0,"Position":32.0,"HyperDash":false}]},{"StartTime":105593.0,"Objects":[{"StartTime":105593.0,"Position":376.0,"HyperDash":false},{"StartTime":105678.0,"Position":422.963257,"HyperDash":false}]},{"StartTime":105764.0,"Objects":[{"StartTime":105764.0,"Position":411.0,"HyperDash":false},{"StartTime":105849.0,"Position":461.0,"HyperDash":false}]},{"StartTime":105936.0,"Objects":[{"StartTime":105936.0,"Position":438.0,"HyperDash":false},{"StartTime":106021.0,"Position":486.1759,"HyperDash":false}]},{"StartTime":106107.0,"Objects":[{"StartTime":106107.0,"Position":447.0,"HyperDash":false},{"StartTime":106192.0,"Position":492.579346,"HyperDash":false}]},{"StartTime":106278.0,"Objects":[{"StartTime":106278.0,"Position":492.0,"HyperDash":false}]},{"StartTime":106621.0,"Objects":[{"StartTime":106621.0,"Position":120.0,"HyperDash":false},{"StartTime":106706.0,"Position":80.04692,"HyperDash":false},{"StartTime":106792.0,"Position":49.0288429,"HyperDash":false},{"StartTime":106859.0,"Position":45.9070129,"HyperDash":false},{"StartTime":106963.0,"Position":40.4979248,"HyperDash":false}]},{"StartTime":107307.0,"Objects":[{"StartTime":107307.0,"Position":400.0,"HyperDash":false},{"StartTime":107392.0,"Position":359.373077,"HyperDash":false}]},{"StartTime":107478.0,"Objects":[{"StartTime":107478.0,"Position":422.0,"HyperDash":false},{"StartTime":107563.0,"Position":374.933044,"HyperDash":false}]},{"StartTime":107650.0,"Objects":[{"StartTime":107650.0,"Position":436.0,"HyperDash":false},{"StartTime":107735.0,"Position":386.191254,"HyperDash":false}]},{"StartTime":107821.0,"Objects":[{"StartTime":107821.0,"Position":430.0,"HyperDash":false},{"StartTime":107906.0,"Position":380.633484,"HyperDash":false}]},{"StartTime":107993.0,"Objects":[{"StartTime":107993.0,"Position":410.0,"HyperDash":false},{"StartTime":108078.0,"Position":364.420654,"HyperDash":false}]},{"StartTime":108164.0,"Objects":[{"StartTime":108164.0,"Position":377.0,"HyperDash":false},{"StartTime":108249.0,"Position":339.099457,"HyperDash":false}]},{"StartTime":108336.0,"Objects":[{"StartTime":108336.0,"Position":343.0,"HyperDash":false}]},{"StartTime":108678.0,"Objects":[{"StartTime":108678.0,"Position":48.0,"HyperDash":false},{"StartTime":108763.0,"Position":72.7952957,"HyperDash":false},{"StartTime":108849.0,"Position":118.469154,"HyperDash":false},{"StartTime":108916.0,"Position":133.274063,"HyperDash":false},{"StartTime":109020.0,"Position":126.387558,"HyperDash":false}]},{"StartTime":109364.0,"Objects":[{"StartTime":109364.0,"Position":464.0,"HyperDash":false},{"StartTime":109449.0,"Position":407.88382,"HyperDash":false},{"StartTime":109535.0,"Position":392.819672,"HyperDash":false},{"StartTime":109602.0,"Position":400.819,"HyperDash":false},{"StartTime":109706.0,"Position":384.6482,"HyperDash":false}]},{"StartTime":110050.0,"Objects":[{"StartTime":110050.0,"Position":32.0,"HyperDash":false},{"StartTime":110135.0,"Position":80.1758957,"HyperDash":false}]},{"StartTime":110221.0,"Objects":[{"StartTime":110221.0,"Position":16.0,"HyperDash":false},{"StartTime":110306.0,"Position":59.1889458,"HyperDash":false}]},{"StartTime":110393.0,"Objects":[{"StartTime":110393.0,"Position":27.0,"HyperDash":false},{"StartTime":110478.0,"Position":62.3553429,"HyperDash":false}]},{"StartTime":110564.0,"Objects":[{"StartTime":110564.0,"Position":42.0,"HyperDash":false},{"StartTime":110649.0,"Position":66.13023,"HyperDash":false}]},{"StartTime":110736.0,"Objects":[{"StartTime":110736.0,"Position":76.0,"HyperDash":false},{"StartTime":110821.0,"Position":88.54811,"HyperDash":false}]},{"StartTime":110907.0,"Objects":[{"StartTime":110907.0,"Position":134.0,"HyperDash":false},{"StartTime":110992.0,"Position":133.107285,"HyperDash":false}]},{"StartTime":111078.0,"Objects":[{"StartTime":111078.0,"Position":134.0,"HyperDash":false}]},{"StartTime":111421.0,"Objects":[{"StartTime":111421.0,"Position":456.0,"HyperDash":false},{"StartTime":111506.0,"Position":404.2924,"HyperDash":false},{"StartTime":111592.0,"Position":356.0,"HyperDash":false},{"StartTime":111659.0,"Position":397.1813,"HyperDash":false},{"StartTime":111763.0,"Position":456.0,"HyperDash":false}]},{"StartTime":112107.0,"Objects":[{"StartTime":112107.0,"Position":56.0,"HyperDash":false},{"StartTime":112192.0,"Position":97.7076,"HyperDash":false},{"StartTime":112278.0,"Position":156.0,"HyperDash":false},{"StartTime":112345.0,"Position":112.81871,"HyperDash":false},{"StartTime":112449.0,"Position":56.0,"HyperDash":false}]},{"StartTime":112793.0,"Objects":[{"StartTime":112793.0,"Position":16.0,"HyperDash":false}]},{"StartTime":112964.0,"Objects":[{"StartTime":112964.0,"Position":96.0,"HyperDash":false}]},{"StartTime":113136.0,"Objects":[{"StartTime":113136.0,"Position":176.0,"HyperDash":false}]},{"StartTime":113307.0,"Objects":[{"StartTime":113307.0,"Position":256.0,"HyperDash":false}]},{"StartTime":113478.0,"Objects":[{"StartTime":113478.0,"Position":336.0,"HyperDash":false}]},{"StartTime":113650.0,"Objects":[{"StartTime":113650.0,"Position":416.0,"HyperDash":false}]},{"StartTime":113821.0,"Objects":[{"StartTime":113821.0,"Position":496.0,"HyperDash":false}]},{"StartTime":114164.0,"Objects":[{"StartTime":114164.0,"Position":312.0,"HyperDash":false}]},{"StartTime":114336.0,"Objects":[{"StartTime":114336.0,"Position":256.0,"HyperDash":false}]},{"StartTime":114507.0,"Objects":[{"StartTime":114507.0,"Position":192.0,"HyperDash":false}]},{"StartTime":114850.0,"Objects":[{"StartTime":114850.0,"Position":256.0,"HyperDash":false}]},{"StartTime":115021.0,"Objects":[{"StartTime":115021.0,"Position":344.0,"HyperDash":false}]},{"StartTime":115193.0,"Objects":[{"StartTime":115193.0,"Position":312.0,"HyperDash":false}]},{"StartTime":115364.0,"Objects":[{"StartTime":115364.0,"Position":208.0,"HyperDash":false}]},{"StartTime":115536.0,"Objects":[{"StartTime":115536.0,"Position":176.0,"HyperDash":false}]},{"StartTime":115707.0,"Objects":[{"StartTime":115707.0,"Position":256.0,"HyperDash":false}]},{"StartTime":115878.0,"Objects":[{"StartTime":115878.0,"Position":256.0,"HyperDash":false}]},{"StartTime":116564.0,"Objects":[{"StartTime":116564.0,"Position":120.0,"HyperDash":false},{"StartTime":116640.0,"Position":111.647354,"HyperDash":false},{"StartTime":116717.0,"Position":96.06639,"HyperDash":false},{"StartTime":116793.0,"Position":53.7137451,"HyperDash":false},{"StartTime":116906.0,"Position":41.9131165,"HyperDash":false}]},{"StartTime":117250.0,"Objects":[{"StartTime":117250.0,"Position":368.0,"HyperDash":false},{"StartTime":117326.0,"Position":376.156769,"HyperDash":false},{"StartTime":117403.0,"Position":397.605072,"HyperDash":false},{"StartTime":117479.0,"Position":440.761841,"HyperDash":false},{"StartTime":117592.0,"Position":467.705444,"HyperDash":false}]},{"StartTime":117936.0,"Objects":[{"StartTime":117936.0,"Position":72.0,"HyperDash":false},{"StartTime":118012.0,"Position":82.97272,"HyperDash":false},{"StartTime":118089.0,"Position":63.8529663,"HyperDash":false},{"StartTime":118165.0,"Position":65.82568,"HyperDash":false},{"StartTime":118278.0,"Position":40.377224,"HyperDash":false}]},{"StartTime":118621.0,"Objects":[{"StartTime":118621.0,"Position":368.0,"HyperDash":false},{"StartTime":118706.0,"Position":353.255585,"HyperDash":false},{"StartTime":118792.0,"Position":328.220032,"HyperDash":false},{"StartTime":118877.0,"Position":302.475647,"HyperDash":false},{"StartTime":118963.0,"Position":268.294556,"HyperDash":false},{"StartTime":119039.0,"Position":291.273438,"HyperDash":false},{"StartTime":119116.0,"Position":309.688965,"HyperDash":false},{"StartTime":119193.0,"Position":348.1045,"HyperDash":false},{"StartTime":119306.0,"Position":368.0,"HyperDash":false}]},{"StartTime":119650.0,"Objects":[{"StartTime":119650.0,"Position":392.0,"HyperDash":false}]},{"StartTime":119821.0,"Objects":[{"StartTime":119821.0,"Position":392.0,"HyperDash":false}]},{"StartTime":119993.0,"Objects":[{"StartTime":119993.0,"Position":448.0,"HyperDash":false}]},{"StartTime":120164.0,"Objects":[{"StartTime":120164.0,"Position":448.0,"HyperDash":false}]},{"StartTime":120336.0,"Objects":[{"StartTime":120336.0,"Position":480.0,"HyperDash":false}]},{"StartTime":120507.0,"Objects":[{"StartTime":120507.0,"Position":480.0,"HyperDash":false}]},{"StartTime":120678.0,"Objects":[{"StartTime":120678.0,"Position":480.0,"HyperDash":false}]},{"StartTime":121021.0,"Objects":[{"StartTime":121021.0,"Position":448.0,"HyperDash":false}]},{"StartTime":121107.0,"Objects":[{"StartTime":121107.0,"Position":440.0,"HyperDash":false}]},{"StartTime":121193.0,"Objects":[{"StartTime":121193.0,"Position":432.0,"HyperDash":false}]},{"StartTime":121278.0,"Objects":[{"StartTime":121278.0,"Position":424.0,"HyperDash":false}]},{"StartTime":121364.0,"Objects":[{"StartTime":121364.0,"Position":416.0,"HyperDash":false}]},{"StartTime":121621.0,"Objects":[{"StartTime":121621.0,"Position":312.0,"HyperDash":false}]},{"StartTime":121707.0,"Objects":[{"StartTime":121707.0,"Position":312.0,"HyperDash":false}]},{"StartTime":121878.0,"Objects":[{"StartTime":121878.0,"Position":232.0,"HyperDash":false}]},{"StartTime":122050.0,"Objects":[{"StartTime":122050.0,"Position":168.0,"HyperDash":false}]},{"StartTime":122393.0,"Objects":[{"StartTime":122393.0,"Position":352.0,"HyperDash":false}]},{"StartTime":122564.0,"Objects":[{"StartTime":122564.0,"Position":376.0,"HyperDash":false}]},{"StartTime":122736.0,"Objects":[{"StartTime":122736.0,"Position":352.0,"HyperDash":false}]},{"StartTime":123078.0,"Objects":[{"StartTime":123078.0,"Position":168.0,"HyperDash":false}]},{"StartTime":123250.0,"Objects":[{"StartTime":123250.0,"Position":144.0,"HyperDash":false}]},{"StartTime":123421.0,"Objects":[{"StartTime":123421.0,"Position":168.0,"HyperDash":false}]},{"StartTime":123936.0,"Objects":[{"StartTime":123936.0,"Position":400.0,"HyperDash":false}]},{"StartTime":124107.0,"Objects":[{"StartTime":124107.0,"Position":467.0,"HyperDash":false}]},{"StartTime":124278.0,"Objects":[{"StartTime":124278.0,"Position":400.0,"HyperDash":false}]},{"StartTime":124450.0,"Objects":[{"StartTime":124450.0,"Position":326.0,"HyperDash":false}]},{"StartTime":124536.0,"Objects":[{"StartTime":124536.0,"Position":320.0,"HyperDash":false}]},{"StartTime":124621.0,"Objects":[{"StartTime":124621.0,"Position":315.0,"HyperDash":false}]},{"StartTime":124707.0,"Objects":[{"StartTime":124707.0,"Position":309.0,"HyperDash":false}]},{"StartTime":124793.0,"Objects":[{"StartTime":124793.0,"Position":303.0,"HyperDash":false}]},{"StartTime":125136.0,"Objects":[{"StartTime":125136.0,"Position":112.0,"HyperDash":false}]},{"StartTime":125307.0,"Objects":[{"StartTime":125307.0,"Position":112.0,"HyperDash":false}]},{"StartTime":125478.0,"Objects":[{"StartTime":125478.0,"Position":44.0,"HyperDash":false}]},{"StartTime":125650.0,"Objects":[{"StartTime":125650.0,"Position":44.0,"HyperDash":false}]},{"StartTime":125821.0,"Objects":[{"StartTime":125821.0,"Position":112.0,"HyperDash":false}]},{"StartTime":125993.0,"Objects":[{"StartTime":125993.0,"Position":112.0,"HyperDash":false}]},{"StartTime":126164.0,"Objects":[{"StartTime":126164.0,"Position":184.0,"HyperDash":false}]},{"StartTime":126250.0,"Objects":[{"StartTime":126250.0,"Position":189.0,"HyperDash":false}]},{"StartTime":126336.0,"Objects":[{"StartTime":126336.0,"Position":195.0,"HyperDash":false}]},{"StartTime":126421.0,"Objects":[{"StartTime":126421.0,"Position":200.0,"HyperDash":false}]},{"StartTime":126507.0,"Objects":[{"StartTime":126507.0,"Position":206.0,"HyperDash":false}]},{"StartTime":126593.0,"Objects":[{"StartTime":126593.0,"Position":212.0,"HyperDash":false}]},{"StartTime":126678.0,"Objects":[{"StartTime":126678.0,"Position":217.0,"HyperDash":false}]},{"StartTime":126764.0,"Objects":[{"StartTime":126764.0,"Position":223.0,"HyperDash":false}]},{"StartTime":126850.0,"Objects":[{"StartTime":126850.0,"Position":229.0,"HyperDash":false}]},{"StartTime":127536.0,"Objects":[{"StartTime":127536.0,"Position":72.0,"HyperDash":false}]},{"StartTime":127707.0,"Objects":[{"StartTime":127707.0,"Position":72.0,"HyperDash":false}]},{"StartTime":127878.0,"Objects":[{"StartTime":127878.0,"Position":112.0,"HyperDash":false}]},{"StartTime":128050.0,"Objects":[{"StartTime":128050.0,"Position":112.0,"HyperDash":false}]},{"StartTime":128221.0,"Objects":[{"StartTime":128221.0,"Position":152.0,"HyperDash":false}]},{"StartTime":128393.0,"Objects":[{"StartTime":128393.0,"Position":152.0,"HyperDash":false}]},{"StartTime":128564.0,"Objects":[{"StartTime":128564.0,"Position":192.0,"HyperDash":false}]},{"StartTime":128736.0,"Objects":[{"StartTime":128736.0,"Position":192.0,"HyperDash":false}]},{"StartTime":128907.0,"Objects":[{"StartTime":128907.0,"Position":280.0,"HyperDash":false}]},{"StartTime":129250.0,"Objects":[{"StartTime":129250.0,"Position":296.0,"HyperDash":false}]},{"StartTime":129421.0,"Objects":[{"StartTime":129421.0,"Position":395.0,"HyperDash":false}]},{"StartTime":129593.0,"Objects":[{"StartTime":129593.0,"Position":395.0,"HyperDash":false}]},{"StartTime":129764.0,"Objects":[{"StartTime":129764.0,"Position":295.0,"HyperDash":false}]},{"StartTime":129936.0,"Objects":[{"StartTime":129936.0,"Position":295.0,"HyperDash":false}]},{"StartTime":130107.0,"Objects":[{"StartTime":130107.0,"Position":391.0,"HyperDash":false}]},{"StartTime":130278.0,"Objects":[{"StartTime":130278.0,"Position":391.0,"HyperDash":false}]},{"StartTime":130621.0,"Objects":[{"StartTime":130621.0,"Position":256.0,"HyperDash":false}]},{"StartTime":130793.0,"Objects":[{"StartTime":130793.0,"Position":168.0,"HyperDash":false}]},{"StartTime":130964.0,"Objects":[{"StartTime":130964.0,"Position":256.0,"HyperDash":false}]},{"StartTime":131136.0,"Objects":[{"StartTime":131136.0,"Position":344.0,"HyperDash":false}]},{"StartTime":131307.0,"Objects":[{"StartTime":131307.0,"Position":344.0,"HyperDash":false}]},{"StartTime":131478.0,"Objects":[{"StartTime":131478.0,"Position":344.0,"HyperDash":false}]},{"StartTime":131650.0,"Objects":[{"StartTime":131650.0,"Position":344.0,"HyperDash":false}]},{"StartTime":131993.0,"Objects":[{"StartTime":131993.0,"Position":168.0,"HyperDash":false}]},{"StartTime":132164.0,"Objects":[{"StartTime":132164.0,"Position":168.0,"HyperDash":false}]},{"StartTime":132336.0,"Objects":[{"StartTime":132336.0,"Position":168.0,"HyperDash":false}]},{"StartTime":132593.0,"Objects":[{"StartTime":132593.0,"Position":272.0,"HyperDash":false}]},{"StartTime":132678.0,"Objects":[{"StartTime":132678.0,"Position":272.0,"HyperDash":false}]},{"StartTime":132850.0,"Objects":[{"StartTime":132850.0,"Position":168.0,"HyperDash":false}]},{"StartTime":133021.0,"Objects":[{"StartTime":133021.0,"Position":168.0,"HyperDash":false}]},{"StartTime":133364.0,"Objects":[{"StartTime":133364.0,"Position":40.0,"HyperDash":false},{"StartTime":133440.0,"Position":47.0,"HyperDash":false},{"StartTime":133517.0,"Position":46.0,"HyperDash":false},{"StartTime":133593.0,"Position":45.0,"HyperDash":false},{"StartTime":133706.0,"Position":40.0,"HyperDash":false}]},{"StartTime":134050.0,"Objects":[{"StartTime":134050.0,"Position":208.0,"HyperDash":false},{"StartTime":134126.0,"Position":192.0,"HyperDash":false},{"StartTime":134203.0,"Position":205.0,"HyperDash":false},{"StartTime":134279.0,"Position":215.0,"HyperDash":false},{"StartTime":134392.0,"Position":208.0,"HyperDash":false}]},{"StartTime":134736.0,"Objects":[{"StartTime":134736.0,"Position":208.0,"HyperDash":false}]},{"StartTime":134907.0,"Objects":[{"StartTime":134907.0,"Position":208.0,"HyperDash":false}]},{"StartTime":135078.0,"Objects":[{"StartTime":135078.0,"Position":304.0,"HyperDash":false}]},{"StartTime":135250.0,"Objects":[{"StartTime":135250.0,"Position":304.0,"HyperDash":false}]},{"StartTime":135421.0,"Objects":[{"StartTime":135421.0,"Position":400.0,"HyperDash":false}]},{"StartTime":135593.0,"Objects":[{"StartTime":135593.0,"Position":400.0,"HyperDash":false}]},{"StartTime":135764.0,"Objects":[{"StartTime":135764.0,"Position":496.0,"HyperDash":false}]},{"StartTime":136107.0,"Objects":[{"StartTime":136107.0,"Position":296.0,"HyperDash":false}]},{"StartTime":136278.0,"Objects":[{"StartTime":136278.0,"Position":216.0,"HyperDash":false}]},{"StartTime":136450.0,"Objects":[{"StartTime":136450.0,"Position":296.0,"HyperDash":false}]},{"StartTime":136621.0,"Objects":[{"StartTime":136621.0,"Position":216.0,"HyperDash":false}]},{"StartTime":136793.0,"Objects":[{"StartTime":136793.0,"Position":296.0,"HyperDash":false}]},{"StartTime":136964.0,"Objects":[{"StartTime":136964.0,"Position":292.0,"HyperDash":false}]},{"StartTime":137050.0,"Objects":[{"StartTime":137050.0,"Position":300.0,"HyperDash":false}]},{"StartTime":137136.0,"Objects":[{"StartTime":137136.0,"Position":308.0,"HyperDash":false}]},{"StartTime":137307.0,"Objects":[{"StartTime":137307.0,"Position":220.0,"HyperDash":false}]},{"StartTime":137393.0,"Objects":[{"StartTime":137393.0,"Position":212.0,"HyperDash":false}]},{"StartTime":137478.0,"Objects":[{"StartTime":137478.0,"Position":204.0,"HyperDash":false}]},{"StartTime":137650.0,"Objects":[{"StartTime":137650.0,"Position":260.0,"HyperDash":false}]},{"StartTime":137736.0,"Objects":[{"StartTime":137736.0,"Position":260.0,"HyperDash":false}]},{"StartTime":137821.0,"Objects":[{"StartTime":137821.0,"Position":260.0,"HyperDash":false}]},{"StartTime":137993.0,"Objects":[{"StartTime":137993.0,"Position":441.0,"HyperDash":false},{"StartTime":138057.0,"Position":442.0,"HyperDash":false},{"StartTime":138121.0,"Position":278.0,"HyperDash":false},{"StartTime":138185.0,"Position":90.0,"HyperDash":false},{"StartTime":138250.0,"Position":409.0,"HyperDash":false},{"StartTime":138314.0,"Position":377.0,"HyperDash":false},{"StartTime":138378.0,"Position":457.0,"HyperDash":false},{"StartTime":138442.0,"Position":409.0,"HyperDash":false},{"StartTime":138507.0,"Position":43.0,"HyperDash":false},{"StartTime":138571.0,"Position":162.0,"HyperDash":false},{"StartTime":138635.0,"Position":341.0,"HyperDash":false},{"StartTime":138699.0,"Position":72.0,"HyperDash":false},{"StartTime":138764.0,"Position":135.0,"HyperDash":false},{"StartTime":138828.0,"Position":252.0,"HyperDash":false},{"StartTime":138892.0,"Position":446.0,"HyperDash":false},{"StartTime":138956.0,"Position":284.0,"HyperDash":false},{"StartTime":139021.0,"Position":70.0,"HyperDash":false}]},{"StartTime":139193.0,"Objects":[{"StartTime":139193.0,"Position":256.0,"HyperDash":false}]},{"StartTime":139536.0,"Objects":[{"StartTime":139536.0,"Position":256.0,"HyperDash":false},{"StartTime":139612.0,"Position":285.1111,"HyperDash":false},{"StartTime":139689.0,"Position":274.3684,"HyperDash":false},{"StartTime":139765.0,"Position":287.479523,"HyperDash":false},{"StartTime":139878.0,"Position":306.0,"HyperDash":false}]},{"StartTime":140221.0,"Objects":[{"StartTime":140221.0,"Position":256.0,"HyperDash":false},{"StartTime":140297.0,"Position":261.8889,"HyperDash":false},{"StartTime":140374.0,"Position":249.631577,"HyperDash":false},{"StartTime":140450.0,"Position":226.520462,"HyperDash":false},{"StartTime":140563.0,"Position":206.0,"HyperDash":false}]},{"StartTime":140907.0,"Objects":[{"StartTime":140907.0,"Position":256.0,"HyperDash":false},{"StartTime":140983.0,"Position":284.1111,"HyperDash":false},{"StartTime":141060.0,"Position":295.3684,"HyperDash":false},{"StartTime":141136.0,"Position":290.479523,"HyperDash":false},{"StartTime":141249.0,"Position":306.0,"HyperDash":false}]},{"StartTime":141593.0,"Objects":[{"StartTime":141593.0,"Position":256.0,"HyperDash":false},{"StartTime":141669.0,"Position":257.8889,"HyperDash":false},{"StartTime":141746.0,"Position":242.631577,"HyperDash":false},{"StartTime":141822.0,"Position":221.520462,"HyperDash":false},{"StartTime":141935.0,"Position":206.0,"HyperDash":false}]},{"StartTime":142278.0,"Objects":[{"StartTime":142278.0,"Position":425.0,"HyperDash":false},{"StartTime":142363.0,"Position":281.0,"HyperDash":false},{"StartTime":142449.0,"Position":3.0,"HyperDash":false},{"StartTime":142535.0,"Position":346.0,"HyperDash":false},{"StartTime":142620.0,"Position":350.0,"HyperDash":false},{"StartTime":142706.0,"Position":217.0,"HyperDash":false},{"StartTime":142792.0,"Position":455.0,"HyperDash":false},{"StartTime":142878.0,"Position":229.0,"HyperDash":false},{"StartTime":142963.0,"Position":51.0,"HyperDash":false},{"StartTime":143049.0,"Position":199.0,"HyperDash":false},{"StartTime":143135.0,"Position":208.0,"HyperDash":false},{"StartTime":143220.0,"Position":173.0,"HyperDash":false},{"StartTime":143306.0,"Position":367.0,"HyperDash":false},{"StartTime":143392.0,"Position":193.0,"HyperDash":false},{"StartTime":143478.0,"Position":488.0,"HyperDash":false},{"StartTime":143563.0,"Position":314.0,"HyperDash":false},{"StartTime":143649.0,"Position":135.0,"HyperDash":false},{"StartTime":143735.0,"Position":399.0,"HyperDash":false},{"StartTime":143820.0,"Position":404.0,"HyperDash":false},{"StartTime":143906.0,"Position":152.0,"HyperDash":false},{"StartTime":143992.0,"Position":353.0,"HyperDash":false},{"StartTime":144078.0,"Position":358.0,"HyperDash":false},{"StartTime":144163.0,"Position":447.0,"HyperDash":false},{"StartTime":144249.0,"Position":222.0,"HyperDash":false},{"StartTime":144335.0,"Position":382.0,"HyperDash":false},{"StartTime":144420.0,"Position":433.0,"HyperDash":false},{"StartTime":144506.0,"Position":450.0,"HyperDash":false},{"StartTime":144592.0,"Position":326.0,"HyperDash":false},{"StartTime":144678.0,"Position":414.0,"HyperDash":false},{"StartTime":144763.0,"Position":285.0,"HyperDash":false},{"StartTime":144849.0,"Position":336.0,"HyperDash":false},{"StartTime":144935.0,"Position":509.0,"HyperDash":false},{"StartTime":145021.0,"Position":334.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/39206.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/39206.osu
new file mode 100644
index 0000000000..3aeb80e9d5
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/39206.osu
@@ -0,0 +1,524 @@
+osu file format v7
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:4
+OverallDifficulty:8
+SliderMultiplier:1
+SliderTickRate:1
+
+[Events]
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+//Background Colour Transformations
+3,100,163,162,255
+
+[TimingPoints]
+336,342.857142857143,4,1,0,100,1,0
+1020,-100,4,2,0,100,0,0
+21250,-100,4,1,0,100,0,0
+23131,-100,4,1,0,100,0,0
+26731,-100,4,1,0,100,0,0
+27931,-50,4,1,0,100,0,0
+28616,-100,4,1,0,100,0,0
+32388,-50,4,1,0,100,0,0
+34102,-100,4,1,0,100,0,0
+37874,-50,4,1,0,100,0,0
+39588,-100,4,1,0,100,0,0
+51759,-100,4,2,0,100,0,0
+52445,-100,4,1,0,100,0,0
+62730,-100,4,2,0,100,0,0
+63416,-100,4,2,0,100,0,0
+66159,-100,4,2,0,100,0,0
+81588,-200,4,2,0,100,0,0
+82278,-100,4,2,0,100,0,0
+85359,-100,4,2,0,100,0,0
+92564,-100,4,1,0,100,0,0
+94616,-50,4,1,0,100,0,0
+116559,-100,4,1,0,100,0,0
+139188,-200,4,2,0,100,0,0
+
+[HitObjects]
+256,192,678,1,0
+456,216,1021,5,2
+456,264,1193,1,2
+456,312,1364,1,2
+312,168,1707,1,2
+312,120,1878,1,2
+312,72,2050,1,2
+168,216,2393,1,2
+168,264,2564,1,2
+168,312,2736,1,2
+24,168,3078,1,2
+24,120,3250,1,2
+24,72,3421,1,2
+56,272,3764,5,2
+136,336,3936,1,2
+216,272,4107,1,2
+296,88,4450,1,2
+376,24,4621,1,2
+456,88,4793,1,2
+456,288,5135,1,2
+376,352,5307,1,2
+296,288,5478,1,2
+216,104,5821,1,2
+136,40,5993,1,2
+56,104,6164,1,2
+24,304,6507,6,2,B|24:200,1,100
+144,40,7193,2,2,B|144:144,1,100
+256,304,7878,2,2,B|256:200,1,100
+376,40,8564,2,2,B|376:144,1,100
+488,304,9250,2,2,B|488:200,1,100
+256,208,9935,12,0,11050
+40,104,11307,5,2
+56,88,11393,1,2
+80,72,11478,1,2
+104,64,11564,1,2
+128,56,11650,2,2,B|176:40|232:56,1,100
+288,248,12336,2,2,B|240:264|184:248,1,100
+344,120,13021,2,2,B|392:104|448:120,1,100
+504,312,13707,2,2,B|456:328|400:312,1,100
+328,264,14221,5,2
+312,264,14307,1,2
+296,264,14393,2,2,B|256:360,1,100
+160,184,15078,2,2,B|200:280,1,100,2|2
+296,104,15764,2,2,B|256:200,1,100
+160,24,16450,2,2,B|200:120,1,100
+112,160,16964,5,2
+96,176,17050,1,2
+88,200,17136,2,2,B|128:280|200:296,2,150
+424,184,18507,2,2,B|384:104|312:88,2,150
+368,256,19707,1,2
+352,256,19793,1,2
+336,256,19878,2,2,B|232:256,1,100
+136,80,20564,2,2,B|240:80,1,100
+392,208,21250,6,0,B|440:280|392:360,1,150
+120,176,21936,2,0,B|72:104|120:24,1,150
+176,112,22621,6,0,B|269:103|307:15,1,150
+297,35,23307,1,0
+448,296,23821,1,0
+352,328,23993,2,0,B|304:352|248:352,1,100
+160,352,24507,1,0
+160,352,24593,1,0
+160,352,24678,1,0
+88,168,25021,5,0
+176,112,25193,1,0
+256,56,25364,1,0
+424,160,25707,1,0
+448,256,25878,1,0
+472,352,26050,2,0,B|414:287|325:312,1,150,0|0
+304,216,26736,2,0,B|248:232|240:296,1,100
+256,208,27250,12,0,28107
+32,248,28621,5,0
+80,160,28793,1,0
+352,32,29307,1,0
+424,104,29478,1,0
+472,192,29650,1,0
+432,280,29821,1,0
+360,352,29993,1,0
+360,352,30078,1,0
+360,352,30164,1,0
+184,256,30507,6,0,B|208:208,2,50
+64,56,31193,2,0,B|93:100,2,50,0|0|0
+352,40,31878,2,0,B|298:43,2,50,0|0|0
+320,136,32393,6,0,B|290:122,5,25
+342,181,32736,2,0,B|312:167,5,25,0|0|0|0|0|0
+399,173,33078,2,0,B|369:159,5,25
+422,219,33421,2,0,B|392:205,6,25
+368,104,34107,5,0
+280,48,34278,1,0
+280,344,34793,1,0
+184,320,34964,1,0
+112,248,35136,1,0
+64,160,35307,1,0
+32,64,35478,1,0
+32,64,35564,1,0
+32,64,35650,1,0
+232,32,35993,5,0
+328,56,36164,1,0
+408,120,36336,1,0
+464,200,36507,1,0
+408,120,36678,1,0
+328,56,36850,1,0
+232,32,37021,1,0
+72,288,37535,5,0
+112,192,37707,1,0
+144,96,37878,6,0,B|112:96,4,25
+232,144,38221,2,0,B|200:144,4,25,0|0|0|0|0
+320,96,38564,2,0,B|288:96,4,25
+408,144,38907,2,0,B|376:144,4,25
+304,248,39593,5,0
+208,280,39764,1,0
+40,48,40278,1,0
+112,120,40450,1,0
+200,72,40621,1,0
+264,152,40793,1,0
+352,104,40964,1,0
+352,104,41050,1,0
+352,104,41135,1,0
+480,256,41478,5,0
+422,179,41650,1,0
+364,102,41821,1,0
+422,179,41993,1,0
+327,199,42164,1,0
+226,220,42335,1,0
+327,199,42507,1,0
+381,118,42678,1,0
+437,32,42850,1,0
+381,118,43021,1,0
+327,199,43193,1,0
+256,208,43278,12,0,44050
+328,184,44221,6,0,B|408:248,1,100
+184,200,44907,2,0,B|104:136,1,100
+192,88,45421,5,0
+192,88,45507,1,0
+192,88,45593,1,0
+106,135,45764,1,0
+106,135,45850,1,0
+106,135,45935,1,0
+154,219,46107,1,0
+237,170,46278,1,0
+237,170,46364,1,0
+237,170,46450,1,0
+237,170,46535,1,0
+237,170,46621,1,0
+410,70,46964,5,0
+410,70,47135,1,0
+462,160,47307,1,0
+462,160,47478,1,0
+379,209,47650,1,0
+379,209,47821,1,0
+328,119,47993,1,0
+328,119,48164,1,0
+237,170,48335,1,0
+328,119,48507,1,0
+410,71,48678,1,0
+264,88,48935,5,0
+264,88,49021,1,0
+304,184,49193,1,0
+368,256,49364,1,0
+368,256,49707,6,0,B|472:256,1,100,0|0
+280,184,50393,2,0,B|392:184,1,100
+88,248,51250,2,0,B|200:248,1,100
+264,312,51764,1,4
+280,312,51850,1,4
+296,312,51935,1,4
+312,312,52021,1,4
+328,312,52107,1,4
+208,152,52450,5,0
+304,152,52621,1,0
+256,64,52793,1,0
+208,256,53135,1,0
+304,256,53307,1,0
+208,216,53478,1,0
+304,216,53650,1,0
+208,176,53821,1,0
+304,176,53993,1,0
+256,208,54164,12,0,55021
+256,320,55193,6,0,B|184:248,1,100
+256,64,55878,2,0,B|328:136,1,100
+256,192,56393,5,4
+160,192,56564,1,4
+160,192,56650,1,4
+160,192,56735,1,4
+160,88,56907,1,4
+256,88,57078,1,4
+352,88,57250,1,0
+360,88,57335,1,0
+368,88,57421,1,0
+376,88,57507,1,0
+384,88,57593,1,0
+472,264,57935,5,0
+387,318,58107,1,0
+284,325,58278,1,0
+193,291,58450,1,0
+139,207,58621,1,0
+132,103,58793,1,0
+174,12,58964,1,0
+256,200,59307,5,0
+208,288,59478,1,0
+304,288,59650,1,0
+344,200,59821,1,0
+312,160,59907,1,0
+280,120,59993,1,0
+208,56,60164,1,0
+304,56,60335,1,0
+200,224,60678,6,0,B|120:288,1,100
+312,224,61364,2,0,B|392:288,1,100
+390,286,62050,1,0
+121,286,62393,1,0
+256,224,62735,1,4
+256,232,62821,1,4
+256,240,62907,1,4
+256,248,62993,1,4
+256,256,63078,1,4
+432,352,63421,5,2
+496,272,63593,1,2
+496,168,63764,1,2
+440,88,63935,1,2
+352,32,64107,1,2
+256,8,64278,1,2
+160,32,64450,1,2
+72,88,64621,1,2
+8,168,64793,1,2
+8,264,64964,1,2
+56,352,65135,1,2
+256,208,65221,12,4,65993
+296,232,66164,6,2,B|352:320,1,100
+216,160,66850,2,2,B|160:248,1,100
+296,88,67535,2,2,B|352:176,1,100
+256,208,67964,12,4,68735
+304,136,68907,6,2,B|408:136,1,100
+208,192,69593,2,2,B|104:192,1,100
+304,248,70278,2,2,B|408:248,1,100
+56,48,71307,6,0,B|24:88|56:144,2,100
+256,48,72335,1,2
+328,120,72507,1,2
+400,48,72678,1,2
+400,48,73021,2,4,B|440:88|408:144,1,100,4|0
+112,336,73707,2,4,B|72:296|104:240,1,100,4|0
+304,264,74393,6,2,B|360:360,1,100
+304,120,75078,2,2,B|360:24,1,100
+464,200,75764,1,2
+384,264,75935,1,2
+304,200,76107,1,2
+232,264,76278,1,2
+160,200,76450,2,4,B|120:200,2,25
+80,264,76793,1,4
+120,72,77135,6,2,B|29:124,1,100,2|2
+232,96,77821,2,2,B|322:43,1,100
+176,184,78507,2,2,B|85:236,1,100
+288,208,79193,2,2,B|378:156,1,100,2|2
+240,304,79878,2,2,B|149:356,1,100,2|2
+32,192,80564,5,2
+66,95,80735,1,2
+161,131,80907,1,2
+190,38,81078,1,2
+285,73,81250,1,2
+384,72,81593,2,12,B|464:72,1,75,4|4
+440,176,82278,6,0,B|408:224,1,50
+320,176,82621,2,0,B|288:128,1,50
+200,176,82964,2,0,B|168:224,1,50
+248,280,83307,1,2
+344,280,83478,1,2
+448,280,83650,1,2
+400,80,83993,2,0,L|344:80,1,50
+400,80,84335,2,0,L|456:80,1,50
+408,168,84678,1,2
+304,168,84850,1,2
+208,168,85021,1,2
+208,168,85364,6,0,B|104:168,1,100,0|4
+304,216,86050,2,0,B|408:216,1,100,0|4
+480,32,86735,1,2
+376,32,86907,1,2
+272,32,87078,1,2
+168,32,87250,1,2
+64,32,87421,2,2,B|16:32,2,25
+64,32,87764,1,2
+208,168,88107,6,0,B|152:72,1,100,0|2
+304,224,88793,2,0,B|360:128,1,100,0|4
+208,272,89478,2,0,B|152:176,1,100,0|4
+304,328,90164,2,2,B|328:288,2,25
+208,368,90507,1,2
+56,232,90850,5,2
+56,128,91021,1,2
+144,80,91193,1,2
+344,80,91536,5,2
+424,136,91707,1,2
+424,232,91878,1,2
+344,288,92050,1,2
+256,248,92221,1,2
+160,56,92564,6,0,B|80:104|104:192,1,150
+352,328,93250,2,0,B|432:280|408:192,1,150
+256,192,93936,1,0
+256,200,94021,1,0
+256,208,94107,1,0
+256,216,94193,1,0
+256,224,94278,1,0
+256,232,94364,1,0
+256,240,94450,1,0
+256,248,94536,1,4
+256,256,94621,6,0,B|360:256,2,100
+448,328,95136,2,0,B|344:328,1,100
+40,72,95650,2,0,L|120:136|120:240,1,200
+480,64,96336,2,0,B|380:37,1,100
+176,48,96678,2,0,B|276:75,1,100
+440,184,97021,2,0,B|340:157,2,100
+40,176,97707,6,0,L|39:278|120:343,1,200,0|0
+440,112,98393,2,0,L|337:112|272:31,1,200,0|0
+32,344,99078,2,0,B|111:265,1,100,0|0
+296,200,99421,2,0,B|217:279,1,100,0|0
+408,184,99764,2,0,B|487:105,2,100
+32,32,100450,6,0,L|232:32,1,200
+480,352,101136,2,0,L|280:352,1,200
+256,192,101821,2,0,B|256:296,2,100,0|0|0
+256,192,102336,1,0
+256,192,102507,2,0,B|256:88,2,100,0|0|0
+432,344,103193,5,0
+256,248,103364,1,0
+80,344,103536,1,0
+480,256,103878,5,0
+408,72,104050,1,0
+336,256,104221,1,0
+264,72,104393,1,0
+184,256,104564,1,0
+104,72,104736,1,0
+32,256,104907,1,8
+376,48,105593,6,0,B|428:29,1,50,0|0
+411,78,105764,2,0,B|467:78,1,50,0|0
+438,127,105936,2,0,B|492:142,1,50,0|0
+447,176,106107,2,0,B|498:199,1,50,0|0
+492,196,106278,1,8
+120,344,106621,2,0,B|13:289|43:167,1,200
+400,352,107307,6,0,B|354:319,1,50,0|0
+422,286,107478,2,0,B|369:267,1,50,0|0
+436,219,107650,2,0,B|379:214,1,50,0|0
+430,152,107821,2,0,B|374:161,1,50,0|0
+410,89,107993,2,0,B|359:112,1,50,0|0
+377,34,108164,2,0,B|334:71,1,50,0|0
+343,68,108336,1,8
+48,344,108678,6,0,B|154:289|124:167,1,200
+464,40,109364,2,0,B|357:94|387:216,1,200
+32,32,110050,6,0,B|86:17,1,50
+16,94,110221,2,0,B|64:66,1,50
+27,165,110393,2,0,B|67:125,1,50
+42,226,110564,2,0,B|69:177,1,50
+76,282,110736,2,0,B|90:228,1,50
+134,324,110907,2,0,B|133:268,1,50
+134,274,111078,1,8
+456,40,111421,6,0,B|352:40,2,100,0|0|8
+56,40,112107,2,0,B|160:40,2,100,0|0|8
+16,192,112793,5,0
+96,192,112964,1,0
+176,192,113136,1,0
+256,192,113307,1,0
+336,192,113478,1,0
+416,192,113650,1,0
+496,192,113821,1,8
+312,112,114164,5,0
+256,192,114336,1,0
+192,112,114507,1,0
+256,304,114850,5,0
+344,256,115021,1,0
+312,160,115193,1,0
+208,160,115364,1,0
+176,256,115536,1,0
+256,304,115707,1,0
+256,304,115878,1,2
+120,160,116564,6,0,B|40:96,1,100,0|0
+368,336,117250,2,0,B|472:328,1,100,0|0
+72,248,117936,2,0,B|40:344,1,100
+368,112,118621,2,0,B|264:104,2,100
+392,312,119650,5,0
+392,312,119821,1,0
+448,264,119993,1,0
+448,264,120164,1,0
+480,200,120336,1,0
+480,200,120507,1,0
+480,200,120678,1,0
+448,48,121021,5,0
+440,48,121107,1,0
+432,48,121193,1,0
+424,48,121278,1,0
+416,48,121364,1,0
+312,96,121621,1,0
+312,96,121707,1,0
+232,104,121878,1,0
+168,144,122050,1,0
+352,232,122393,5,0
+376,192,122564,1,0
+352,144,122736,1,0
+168,144,123078,1,0
+144,184,123250,1,0
+168,232,123421,1,0
+400,48,123936,5,0
+467,115,124107,1,0
+400,183,124278,1,0
+326,110,124450,1,0
+320,104,124536,1,0
+315,98,124621,1,0
+309,93,124707,1,0
+303,87,124793,1,0
+112,336,125136,5,0
+112,336,125307,1,0
+44,268,125478,1,0
+44,268,125650,1,0
+112,200,125821,1,0
+112,200,125993,1,0
+184,264,126164,1,0
+189,258,126250,1,0
+195,252,126336,1,0
+200,247,126421,1,0
+206,241,126507,1,0
+212,235,126593,1,0
+217,230,126678,1,0
+223,224,126764,1,0
+229,218,126850,1,0
+72,96,127536,5,0
+72,192,127707,1,0
+112,96,127878,1,0
+112,192,128050,1,0
+152,96,128221,1,0
+152,192,128393,1,0
+192,96,128564,1,0
+192,192,128736,1,0
+280,144,128907,1,0
+296,344,129250,5,0
+395,344,129421,1,0
+395,243,129593,1,0
+295,241,129764,1,0
+295,137,129936,1,0
+391,137,130107,1,0
+391,33,130278,1,0
+256,104,130621,5,0
+168,192,130793,1,0
+256,280,130964,1,0
+344,192,131136,1,0
+344,192,131307,1,0
+344,288,131478,1,0
+344,96,131650,1,0
+168,184,131993,5,0
+168,184,132164,1,0
+168,184,132336,1,0
+272,80,132593,1,0
+272,80,132678,1,0
+168,80,132850,1,0
+168,80,133021,1,0
+40,240,133364,6,0,B|40:344,1,100
+208,224,134050,2,0,B|208:120,1,100
+208,328,134736,1,0
+208,224,134907,1,0
+304,224,135078,1,0
+304,120,135250,1,0
+400,120,135421,1,0
+400,16,135593,1,0
+496,16,135764,1,0
+296,56,136107,5,0
+216,112,136278,1,0
+296,168,136450,1,0
+216,232,136621,1,0
+296,288,136793,1,0
+292,188,136964,5,4
+300,188,137050,1,4
+308,188,137136,1,4
+220,188,137307,1,4
+212,188,137393,1,4
+204,188,137478,1,4
+260,268,137650,1,4
+260,276,137736,1,4
+260,284,137821,1,4
+256,208,137993,12,4,139021
+256,16,139193,5,2
+256,112,139536,2,2,B|312:112,1,50,2|2
+256,200,140221,2,2,B|200:200,1,50,2|2
+256,288,140907,2,2,B|312:288,1,50,2|2
+256,376,141593,2,2,B|200:376,1,50
+256,208,142278,12,4,145021
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3949367-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3949367-expected-conversion.json
new file mode 100644
index 0000000000..da0e4e120a
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3949367-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":6003.0,"Objects":[{"StartTime":6003.0,"Position":64.0,"HyperDash":false}]},{"StartTime":6366.0,"Objects":[{"StartTime":6366.0,"Position":192.0,"HyperDash":false}]},{"StartTime":6730.0,"Objects":[{"StartTime":6730.0,"Position":64.0,"HyperDash":false}]},{"StartTime":7094.0,"Objects":[{"StartTime":7094.0,"Position":192.0,"HyperDash":false}]},{"StartTime":7457.0,"Objects":[{"StartTime":7457.0,"Position":320.0,"HyperDash":false}]},{"StartTime":7821.0,"Objects":[{"StartTime":7821.0,"Position":192.0,"HyperDash":false}]},{"StartTime":8185.0,"Objects":[{"StartTime":8185.0,"Position":320.0,"HyperDash":false}]},{"StartTime":8548.0,"Objects":[{"StartTime":8548.0,"Position":192.0,"HyperDash":false}]},{"StartTime":8912.0,"Objects":[{"StartTime":8912.0,"Position":320.0,"HyperDash":false}]},{"StartTime":9275.0,"Objects":[{"StartTime":9275.0,"Position":448.0,"HyperDash":false}]},{"StartTime":9639.0,"Objects":[{"StartTime":9639.0,"Position":320.0,"HyperDash":false}]},{"StartTime":10003.0,"Objects":[{"StartTime":10003.0,"Position":448.0,"HyperDash":false}]},{"StartTime":10366.0,"Objects":[{"StartTime":10366.0,"Position":65.0,"HyperDash":false},{"StartTime":10434.0,"Position":482.0,"HyperDash":false},{"StartTime":10502.0,"Position":164.0,"HyperDash":false},{"StartTime":10570.0,"Position":315.0,"HyperDash":false},{"StartTime":10638.0,"Position":145.0,"HyperDash":false},{"StartTime":10706.0,"Position":159.0,"HyperDash":false},{"StartTime":10775.0,"Position":310.0,"HyperDash":false},{"StartTime":10843.0,"Position":441.0,"HyperDash":false},{"StartTime":10911.0,"Position":428.0,"HyperDash":false},{"StartTime":10979.0,"Position":243.0,"HyperDash":false},{"StartTime":11047.0,"Position":422.0,"HyperDash":false},{"StartTime":11116.0,"Position":481.0,"HyperDash":false},{"StartTime":11184.0,"Position":104.0,"HyperDash":false},{"StartTime":11252.0,"Position":473.0,"HyperDash":false},{"StartTime":11320.0,"Position":135.0,"HyperDash":false},{"StartTime":11388.0,"Position":360.0,"HyperDash":false},{"StartTime":11457.0,"Position":123.0,"HyperDash":false}]},{"StartTime":11821.0,"Objects":[{"StartTime":11821.0,"Position":96.0,"HyperDash":false}]},{"StartTime":12003.0,"Objects":[{"StartTime":12003.0,"Position":176.0,"HyperDash":false},{"StartTime":12093.0,"Position":204.284271,"HyperDash":false},{"StartTime":12184.0,"Position":176.0,"HyperDash":false}]},{"StartTime":12366.0,"Objects":[{"StartTime":12366.0,"Position":64.0,"HyperDash":false}]},{"StartTime":12730.0,"Objects":[{"StartTime":12730.0,"Position":224.0,"HyperDash":false},{"StartTime":12820.0,"Position":252.284271,"HyperDash":false},{"StartTime":12911.0,"Position":224.0,"HyperDash":false}]},{"StartTime":13094.0,"Objects":[{"StartTime":13094.0,"Position":144.0,"HyperDash":false}]},{"StartTime":13275.0,"Objects":[{"StartTime":13275.0,"Position":320.0,"HyperDash":false}]},{"StartTime":13366.0,"Objects":[{"StartTime":13366.0,"Position":368.0,"HyperDash":false}]},{"StartTime":13457.0,"Objects":[{"StartTime":13457.0,"Position":320.0,"HyperDash":false}]},{"StartTime":13639.0,"Objects":[{"StartTime":13639.0,"Position":208.0,"HyperDash":false}]},{"StartTime":13730.0,"Objects":[{"StartTime":13730.0,"Position":160.0,"HyperDash":false},{"StartTime":13820.0,"Position":160.0,"HyperDash":false}]},{"StartTime":14003.0,"Objects":[{"StartTime":14003.0,"Position":240.0,"HyperDash":false}]},{"StartTime":14185.0,"Objects":[{"StartTime":14185.0,"Position":128.0,"HyperDash":false}]},{"StartTime":14366.0,"Objects":[{"StartTime":14366.0,"Position":208.0,"HyperDash":false},{"StartTime":14456.0,"Position":208.0,"HyperDash":false}]},{"StartTime":14548.0,"Objects":[{"StartTime":14548.0,"Position":160.0,"HyperDash":false}]},{"StartTime":14730.0,"Objects":[{"StartTime":14730.0,"Position":336.0,"HyperDash":false}]},{"StartTime":14912.0,"Objects":[{"StartTime":14912.0,"Position":256.0,"HyperDash":false},{"StartTime":15002.0,"Position":227.715729,"HyperDash":false},{"StartTime":15093.0,"Position":256.0,"HyperDash":false}]},{"StartTime":15275.0,"Objects":[{"StartTime":15275.0,"Position":368.0,"HyperDash":false}]},{"StartTime":15639.0,"Objects":[{"StartTime":15639.0,"Position":208.0,"HyperDash":false},{"StartTime":15729.0,"Position":179.715729,"HyperDash":false},{"StartTime":15820.0,"Position":208.0,"HyperDash":false}]},{"StartTime":16003.0,"Objects":[{"StartTime":16003.0,"Position":288.0,"HyperDash":false}]},{"StartTime":16185.0,"Objects":[{"StartTime":16185.0,"Position":112.0,"HyperDash":false}]},{"StartTime":16275.0,"Objects":[{"StartTime":16275.0,"Position":64.0,"HyperDash":false}]},{"StartTime":16366.0,"Objects":[{"StartTime":16366.0,"Position":112.0,"HyperDash":false}]},{"StartTime":16548.0,"Objects":[{"StartTime":16548.0,"Position":224.0,"HyperDash":false}]},{"StartTime":16639.0,"Objects":[{"StartTime":16639.0,"Position":272.0,"HyperDash":false},{"StartTime":16729.0,"Position":272.0,"HyperDash":false}]},{"StartTime":16912.0,"Objects":[{"StartTime":16912.0,"Position":160.0,"HyperDash":false}]},{"StartTime":17003.0,"Objects":[{"StartTime":17003.0,"Position":208.0,"HyperDash":false}]},{"StartTime":17094.0,"Objects":[{"StartTime":17094.0,"Position":256.0,"HyperDash":false}]},{"StartTime":17275.0,"Objects":[{"StartTime":17275.0,"Position":144.0,"HyperDash":false}]},{"StartTime":17366.0,"Objects":[{"StartTime":17366.0,"Position":80.0,"HyperDash":false}]},{"StartTime":17457.0,"Objects":[{"StartTime":17457.0,"Position":144.0,"HyperDash":false}]},{"StartTime":17639.0,"Objects":[{"StartTime":17639.0,"Position":320.0,"HyperDash":false}]},{"StartTime":17821.0,"Objects":[{"StartTime":17821.0,"Position":400.0,"HyperDash":false}]},{"StartTime":17912.0,"Objects":[{"StartTime":17912.0,"Position":352.0,"HyperDash":false}]},{"StartTime":18003.0,"Objects":[{"StartTime":18003.0,"Position":304.0,"HyperDash":false}]},{"StartTime":18185.0,"Objects":[{"StartTime":18185.0,"Position":416.0,"HyperDash":false},{"StartTime":18275.0,"Position":406.779816,"HyperDash":false},{"StartTime":18366.0,"Position":431.646057,"HyperDash":false},{"StartTime":18439.0,"Position":420.6284,"HyperDash":false},{"StartTime":18548.0,"Position":353.58432,"HyperDash":false}]},{"StartTime":18639.0,"Objects":[{"StartTime":18639.0,"Position":400.0,"HyperDash":false}]},{"StartTime":18730.0,"Objects":[{"StartTime":18730.0,"Position":448.0,"HyperDash":false}]},{"StartTime":18912.0,"Objects":[{"StartTime":18912.0,"Position":368.0,"HyperDash":false}]},{"StartTime":19094.0,"Objects":[{"StartTime":19094.0,"Position":192.0,"HyperDash":false}]},{"StartTime":19185.0,"Objects":[{"StartTime":19185.0,"Position":144.0,"HyperDash":false}]},{"StartTime":19275.0,"Objects":[{"StartTime":19275.0,"Position":192.0,"HyperDash":false}]},{"StartTime":19457.0,"Objects":[{"StartTime":19457.0,"Position":304.0,"HyperDash":false}]},{"StartTime":19548.0,"Objects":[{"StartTime":19548.0,"Position":352.0,"HyperDash":false},{"StartTime":19638.0,"Position":352.0,"HyperDash":false}]},{"StartTime":19821.0,"Objects":[{"StartTime":19821.0,"Position":272.0,"HyperDash":false}]},{"StartTime":20003.0,"Objects":[{"StartTime":20003.0,"Position":384.0,"HyperDash":false}]},{"StartTime":20185.0,"Objects":[{"StartTime":20185.0,"Position":304.0,"HyperDash":false},{"StartTime":20275.0,"Position":304.0,"HyperDash":false}]},{"StartTime":20366.0,"Objects":[{"StartTime":20366.0,"Position":352.0,"HyperDash":false}]},{"StartTime":20548.0,"Objects":[{"StartTime":20548.0,"Position":176.0,"HyperDash":false}]},{"StartTime":20730.0,"Objects":[{"StartTime":20730.0,"Position":96.0,"HyperDash":false}]},{"StartTime":20821.0,"Objects":[{"StartTime":20821.0,"Position":144.0,"HyperDash":false}]},{"StartTime":20912.0,"Objects":[{"StartTime":20912.0,"Position":192.0,"HyperDash":false}]},{"StartTime":21094.0,"Objects":[{"StartTime":21094.0,"Position":80.0,"HyperDash":false},{"StartTime":21184.0,"Position":82.2201843,"HyperDash":false},{"StartTime":21275.0,"Position":64.35393,"HyperDash":false},{"StartTime":21348.0,"Position":98.3716049,"HyperDash":false},{"StartTime":21457.0,"Position":142.41568,"HyperDash":false}]},{"StartTime":21548.0,"Objects":[{"StartTime":21548.0,"Position":96.0,"HyperDash":false}]},{"StartTime":21639.0,"Objects":[{"StartTime":21639.0,"Position":48.0,"HyperDash":false}]},{"StartTime":21821.0,"Objects":[{"StartTime":21821.0,"Position":128.0,"HyperDash":false}]},{"StartTime":22003.0,"Objects":[{"StartTime":22003.0,"Position":304.0,"HyperDash":false}]},{"StartTime":22094.0,"Objects":[{"StartTime":22094.0,"Position":352.0,"HyperDash":false}]},{"StartTime":22185.0,"Objects":[{"StartTime":22185.0,"Position":304.0,"HyperDash":false}]},{"StartTime":22366.0,"Objects":[{"StartTime":22366.0,"Position":192.0,"HyperDash":false}]},{"StartTime":22457.0,"Objects":[{"StartTime":22457.0,"Position":144.0,"HyperDash":false},{"StartTime":22547.0,"Position":144.0,"HyperDash":false}]},{"StartTime":22730.0,"Objects":[{"StartTime":22730.0,"Position":224.0,"HyperDash":false},{"StartTime":22820.0,"Position":191.366974,"HyperDash":false},{"StartTime":22911.0,"Position":144.293579,"HyperDash":false},{"StartTime":23002.0,"Position":168.779816,"HyperDash":false},{"StartTime":23093.0,"Position":223.85321,"HyperDash":false},{"StartTime":23166.0,"Position":182.0,"HyperDash":false},{"StartTime":23275.0,"Position":144.0,"HyperDash":true}]},{"StartTime":23457.0,"Objects":[{"StartTime":23457.0,"Position":400.0,"HyperDash":false}]},{"StartTime":23639.0,"Objects":[{"StartTime":23639.0,"Position":480.0,"HyperDash":false},{"StartTime":23729.0,"Position":480.0,"HyperDash":false}]},{"StartTime":23821.0,"Objects":[{"StartTime":23821.0,"Position":432.0,"HyperDash":false}]},{"StartTime":24003.0,"Objects":[{"StartTime":24003.0,"Position":320.0,"HyperDash":true}]},{"StartTime":24185.0,"Objects":[{"StartTime":24185.0,"Position":64.0,"HyperDash":false},{"StartTime":24257.0,"Position":62.7589569,"HyperDash":false},{"StartTime":24366.0,"Position":48.3107071,"HyperDash":false}]},{"StartTime":24457.0,"Objects":[{"StartTime":24457.0,"Position":96.0,"HyperDash":false}]},{"StartTime":24548.0,"Objects":[{"StartTime":24548.0,"Position":144.0,"HyperDash":false}]},{"StartTime":24730.0,"Objects":[{"StartTime":24730.0,"Position":64.0,"HyperDash":false}]},{"StartTime":24912.0,"Objects":[{"StartTime":24912.0,"Position":240.0,"HyperDash":false}]},{"StartTime":25094.0,"Objects":[{"StartTime":25094.0,"Position":320.0,"HyperDash":false},{"StartTime":25184.0,"Position":360.0,"HyperDash":false},{"StartTime":25275.0,"Position":320.0,"HyperDash":false}]},{"StartTime":25457.0,"Objects":[{"StartTime":25457.0,"Position":208.0,"HyperDash":true}]},{"StartTime":25639.0,"Objects":[{"StartTime":25639.0,"Position":464.0,"HyperDash":false},{"StartTime":25711.0,"Position":466.758942,"HyperDash":false},{"StartTime":25820.0,"Position":448.3107,"HyperDash":false}]},{"StartTime":26003.0,"Objects":[{"StartTime":26003.0,"Position":336.0,"HyperDash":false},{"StartTime":26075.0,"Position":333.758942,"HyperDash":false},{"StartTime":26184.0,"Position":320.3107,"HyperDash":false}]},{"StartTime":26366.0,"Objects":[{"StartTime":26366.0,"Position":496.0,"HyperDash":false}]},{"StartTime":26548.0,"Objects":[{"StartTime":26548.0,"Position":416.0,"HyperDash":false},{"StartTime":26638.0,"Position":416.0,"HyperDash":false}]},{"StartTime":26730.0,"Objects":[{"StartTime":26730.0,"Position":464.0,"HyperDash":false}]},{"StartTime":26912.0,"Objects":[{"StartTime":26912.0,"Position":352.0,"HyperDash":true}]},{"StartTime":27094.0,"Objects":[{"StartTime":27094.0,"Position":96.0,"HyperDash":false},{"StartTime":27166.0,"Position":79.75896,"HyperDash":false},{"StartTime":27275.0,"Position":80.31071,"HyperDash":false}]},{"StartTime":27457.0,"Objects":[{"StartTime":27457.0,"Position":192.0,"HyperDash":false}]},{"StartTime":27548.0,"Objects":[{"StartTime":27548.0,"Position":240.0,"HyperDash":false},{"StartTime":27638.0,"Position":240.0,"HyperDash":false}]},{"StartTime":27821.0,"Objects":[{"StartTime":27821.0,"Position":64.0,"HyperDash":false}]},{"StartTime":28003.0,"Objects":[{"StartTime":28003.0,"Position":176.0,"HyperDash":false}]},{"StartTime":28185.0,"Objects":[{"StartTime":28185.0,"Position":64.0,"HyperDash":false}]},{"StartTime":28275.0,"Objects":[{"StartTime":28275.0,"Position":16.0,"HyperDash":false},{"StartTime":28365.0,"Position":16.0,"HyperDash":false}]},{"StartTime":28548.0,"Objects":[{"StartTime":28548.0,"Position":272.0,"HyperDash":false},{"StartTime":28620.0,"Position":293.8232,"HyperDash":false},{"StartTime":28729.0,"Position":352.0,"HyperDash":false}]},{"StartTime":28912.0,"Objects":[{"StartTime":28912.0,"Position":240.0,"HyperDash":false},{"StartTime":28984.0,"Position":215.176788,"HyperDash":false},{"StartTime":29093.0,"Position":160.0,"HyperDash":true}]},{"StartTime":29275.0,"Objects":[{"StartTime":29275.0,"Position":416.0,"HyperDash":false}]},{"StartTime":29457.0,"Objects":[{"StartTime":29457.0,"Position":496.0,"HyperDash":false},{"StartTime":29547.0,"Position":496.0,"HyperDash":false}]},{"StartTime":29639.0,"Objects":[{"StartTime":29639.0,"Position":448.0,"HyperDash":false}]},{"StartTime":29821.0,"Objects":[{"StartTime":29821.0,"Position":336.0,"HyperDash":true}]},{"StartTime":30003.0,"Objects":[{"StartTime":30003.0,"Position":80.0,"HyperDash":false},{"StartTime":30075.0,"Position":74.90608,"HyperDash":false},{"StartTime":30184.0,"Position":32.0,"HyperDash":false}]},{"StartTime":30275.0,"Objects":[{"StartTime":30275.0,"Position":32.0,"HyperDash":false}]},{"StartTime":30366.0,"Objects":[{"StartTime":30366.0,"Position":64.0,"HyperDash":false}]},{"StartTime":30548.0,"Objects":[{"StartTime":30548.0,"Position":144.0,"HyperDash":false}]},{"StartTime":30730.0,"Objects":[{"StartTime":30730.0,"Position":320.0,"HyperDash":false}]},{"StartTime":30912.0,"Objects":[{"StartTime":30912.0,"Position":240.0,"HyperDash":false},{"StartTime":31002.0,"Position":200.0,"HyperDash":false},{"StartTime":31093.0,"Position":240.0,"HyperDash":false}]},{"StartTime":31275.0,"Objects":[{"StartTime":31275.0,"Position":352.0,"HyperDash":true}]},{"StartTime":31457.0,"Objects":[{"StartTime":31457.0,"Position":96.0,"HyperDash":false},{"StartTime":31529.0,"Position":96.75896,"HyperDash":false},{"StartTime":31638.0,"Position":80.31071,"HyperDash":false}]},{"StartTime":31821.0,"Objects":[{"StartTime":31821.0,"Position":192.0,"HyperDash":false}]},{"StartTime":32003.0,"Objects":[{"StartTime":32003.0,"Position":80.0,"HyperDash":false}]},{"StartTime":32185.0,"Objects":[{"StartTime":32185.0,"Position":256.0,"HyperDash":false}]},{"StartTime":32366.0,"Objects":[{"StartTime":32366.0,"Position":336.0,"HyperDash":false},{"StartTime":32456.0,"Position":336.0,"HyperDash":false}]},{"StartTime":32548.0,"Objects":[{"StartTime":32548.0,"Position":288.0,"HyperDash":false}]},{"StartTime":32730.0,"Objects":[{"StartTime":32730.0,"Position":400.0,"HyperDash":true}]},{"StartTime":32912.0,"Objects":[{"StartTime":32912.0,"Position":144.0,"HyperDash":false},{"StartTime":32984.0,"Position":149.758957,"HyperDash":false},{"StartTime":33093.0,"Position":128.310715,"HyperDash":false}]},{"StartTime":33275.0,"Objects":[{"StartTime":33275.0,"Position":240.0,"HyperDash":false}]},{"StartTime":33366.0,"Objects":[{"StartTime":33366.0,"Position":288.0,"HyperDash":false}]},{"StartTime":33457.0,"Objects":[{"StartTime":33457.0,"Position":240.0,"HyperDash":false}]},{"StartTime":33639.0,"Objects":[{"StartTime":33639.0,"Position":128.0,"HyperDash":false}]},{"StartTime":33821.0,"Objects":[{"StartTime":33821.0,"Position":240.0,"HyperDash":false}]},{"StartTime":34003.0,"Objects":[{"StartTime":34003.0,"Position":128.0,"HyperDash":false}]},{"StartTime":34094.0,"Objects":[{"StartTime":34094.0,"Position":80.0,"HyperDash":false},{"StartTime":34184.0,"Position":80.0,"HyperDash":true}]},{"StartTime":34366.0,"Objects":[{"StartTime":34366.0,"Position":336.0,"HyperDash":false},{"StartTime":34438.0,"Position":369.8232,"HyperDash":false},{"StartTime":34547.0,"Position":416.0,"HyperDash":false}]},{"StartTime":34730.0,"Objects":[{"StartTime":34730.0,"Position":240.0,"HyperDash":false},{"StartTime":34802.0,"Position":189.176788,"HyperDash":false},{"StartTime":34911.0,"Position":160.0,"HyperDash":true}]},{"StartTime":35094.0,"Objects":[{"StartTime":35094.0,"Position":432.0,"HyperDash":false},{"StartTime":35184.0,"Position":432.0,"HyperDash":false}]},{"StartTime":35275.0,"Objects":[{"StartTime":35275.0,"Position":384.0,"HyperDash":false}]},{"StartTime":35457.0,"Objects":[{"StartTime":35457.0,"Position":208.0,"HyperDash":false},{"StartTime":35529.0,"Position":159.176788,"HyperDash":false},{"StartTime":35638.0,"Position":128.0,"HyperDash":false}]},{"StartTime":35821.0,"Objects":[{"StartTime":35821.0,"Position":384.0,"HyperDash":false}]},{"StartTime":36003.0,"Objects":[{"StartTime":36003.0,"Position":464.0,"HyperDash":false}]},{"StartTime":36094.0,"Objects":[{"StartTime":36094.0,"Position":384.0,"HyperDash":false}]},{"StartTime":36185.0,"Objects":[{"StartTime":36185.0,"Position":336.0,"HyperDash":false}]},{"StartTime":36366.0,"Objects":[{"StartTime":36366.0,"Position":448.0,"HyperDash":true}]},{"StartTime":36548.0,"Objects":[{"StartTime":36548.0,"Position":192.0,"HyperDash":false},{"StartTime":36638.0,"Position":152.0,"HyperDash":false},{"StartTime":36729.0,"Position":192.0,"HyperDash":false}]},{"StartTime":36912.0,"Objects":[{"StartTime":36912.0,"Position":368.0,"HyperDash":false}]},{"StartTime":37003.0,"Objects":[{"StartTime":37003.0,"Position":416.0,"HyperDash":false},{"StartTime":37093.0,"Position":416.0,"HyperDash":true}]},{"StartTime":37275.0,"Objects":[{"StartTime":37275.0,"Position":160.0,"HyperDash":false},{"StartTime":37347.0,"Position":156.758957,"HyperDash":false},{"StartTime":37456.0,"Position":144.310715,"HyperDash":false}]},{"StartTime":37548.0,"Objects":[{"StartTime":37548.0,"Position":192.0,"HyperDash":false}]},{"StartTime":37639.0,"Objects":[{"StartTime":37639.0,"Position":272.0,"HyperDash":false}]},{"StartTime":37821.0,"Objects":[{"StartTime":37821.0,"Position":160.0,"HyperDash":true}]},{"StartTime":38003.0,"Objects":[{"StartTime":38003.0,"Position":416.0,"HyperDash":false}]},{"StartTime":38185.0,"Objects":[{"StartTime":38185.0,"Position":496.0,"HyperDash":false},{"StartTime":38275.0,"Position":496.0,"HyperDash":false}]},{"StartTime":38366.0,"Objects":[{"StartTime":38366.0,"Position":416.0,"HyperDash":false}]},{"StartTime":38548.0,"Objects":[{"StartTime":38548.0,"Position":496.0,"HyperDash":true}]},{"StartTime":38730.0,"Objects":[{"StartTime":38730.0,"Position":240.0,"HyperDash":false}]},{"StartTime":38821.0,"Objects":[{"StartTime":38821.0,"Position":192.0,"HyperDash":false}]},{"StartTime":38912.0,"Objects":[{"StartTime":38912.0,"Position":240.0,"HyperDash":false}]},{"StartTime":39094.0,"Objects":[{"StartTime":39094.0,"Position":352.0,"HyperDash":false},{"StartTime":39166.0,"Position":328.1768,"HyperDash":false},{"StartTime":39275.0,"Position":272.0,"HyperDash":true}]},{"StartTime":39457.0,"Objects":[{"StartTime":39457.0,"Position":16.0,"HyperDash":false},{"StartTime":39547.0,"Position":16.0,"HyperDash":false}]},{"StartTime":39639.0,"Objects":[{"StartTime":39639.0,"Position":64.0,"HyperDash":false}]},{"StartTime":39821.0,"Objects":[{"StartTime":39821.0,"Position":240.0,"HyperDash":false},{"StartTime":39911.0,"Position":211.715729,"HyperDash":false}]},{"StartTime":40003.0,"Objects":[{"StartTime":40003.0,"Position":160.0,"HyperDash":true}]},{"StartTime":40185.0,"Objects":[{"StartTime":40185.0,"Position":416.0,"HyperDash":false}]},{"StartTime":40275.0,"Objects":[{"StartTime":40275.0,"Position":464.0,"HyperDash":false}]},{"StartTime":40366.0,"Objects":[{"StartTime":40366.0,"Position":416.0,"HyperDash":false}]},{"StartTime":40548.0,"Objects":[{"StartTime":40548.0,"Position":240.0,"HyperDash":false}]},{"StartTime":40639.0,"Objects":[{"StartTime":40639.0,"Position":288.0,"HyperDash":false}]},{"StartTime":40730.0,"Objects":[{"StartTime":40730.0,"Position":336.0,"HyperDash":true}]},{"StartTime":40912.0,"Objects":[{"StartTime":40912.0,"Position":64.0,"HyperDash":false},{"StartTime":41002.0,"Position":64.0,"HyperDash":false}]},{"StartTime":41094.0,"Objects":[{"StartTime":41094.0,"Position":112.0,"HyperDash":false}]},{"StartTime":41275.0,"Objects":[{"StartTime":41275.0,"Position":288.0,"HyperDash":false},{"StartTime":41347.0,"Position":312.8232,"HyperDash":false},{"StartTime":41456.0,"Position":368.0,"HyperDash":false}]},{"StartTime":41639.0,"Objects":[{"StartTime":41639.0,"Position":112.0,"HyperDash":false}]},{"StartTime":41821.0,"Objects":[{"StartTime":41821.0,"Position":32.0,"HyperDash":false}]},{"StartTime":41912.0,"Objects":[{"StartTime":41912.0,"Position":112.0,"HyperDash":false}]},{"StartTime":42003.0,"Objects":[{"StartTime":42003.0,"Position":160.0,"HyperDash":false}]},{"StartTime":42185.0,"Objects":[{"StartTime":42185.0,"Position":48.0,"HyperDash":true}]},{"StartTime":42366.0,"Objects":[{"StartTime":42366.0,"Position":304.0,"HyperDash":false},{"StartTime":42438.0,"Position":338.8232,"HyperDash":false},{"StartTime":42547.0,"Position":384.0,"HyperDash":false}]},{"StartTime":42730.0,"Objects":[{"StartTime":42730.0,"Position":208.0,"HyperDash":false},{"StartTime":42802.0,"Position":174.176788,"HyperDash":false},{"StartTime":42911.0,"Position":128.0,"HyperDash":false}]},{"StartTime":43094.0,"Objects":[{"StartTime":43094.0,"Position":384.0,"HyperDash":false},{"StartTime":43166.0,"Position":407.241058,"HyperDash":false},{"StartTime":43275.0,"Position":399.6893,"HyperDash":false}]},{"StartTime":43366.0,"Objects":[{"StartTime":43366.0,"Position":352.0,"HyperDash":false}]},{"StartTime":43457.0,"Objects":[{"StartTime":43457.0,"Position":272.0,"HyperDash":false}]},{"StartTime":43639.0,"Objects":[{"StartTime":43639.0,"Position":384.0,"HyperDash":true}]},{"StartTime":43821.0,"Objects":[{"StartTime":43821.0,"Position":128.0,"HyperDash":false}]},{"StartTime":44003.0,"Objects":[{"StartTime":44003.0,"Position":48.0,"HyperDash":false},{"StartTime":44093.0,"Position":48.0,"HyperDash":false}]},{"StartTime":44185.0,"Objects":[{"StartTime":44185.0,"Position":128.0,"HyperDash":false}]},{"StartTime":44366.0,"Objects":[{"StartTime":44366.0,"Position":48.0,"HyperDash":true}]},{"StartTime":44548.0,"Objects":[{"StartTime":44548.0,"Position":304.0,"HyperDash":false}]},{"StartTime":44730.0,"Objects":[{"StartTime":44730.0,"Position":384.0,"HyperDash":false}]},{"StartTime":44821.0,"Objects":[{"StartTime":44821.0,"Position":336.0,"HyperDash":false}]},{"StartTime":44912.0,"Objects":[{"StartTime":44912.0,"Position":256.0,"HyperDash":false}]},{"StartTime":45094.0,"Objects":[{"StartTime":45094.0,"Position":368.0,"HyperDash":true}]},{"StartTime":45275.0,"Objects":[{"StartTime":45275.0,"Position":112.0,"HyperDash":false}]},{"StartTime":45366.0,"Objects":[{"StartTime":45366.0,"Position":64.0,"HyperDash":false}]},{"StartTime":45457.0,"Objects":[{"StartTime":45457.0,"Position":112.0,"HyperDash":false}]},{"StartTime":45639.0,"Objects":[{"StartTime":45639.0,"Position":288.0,"HyperDash":false}]},{"StartTime":45730.0,"Objects":[{"StartTime":45730.0,"Position":336.0,"HyperDash":false},{"StartTime":45820.0,"Position":336.0,"HyperDash":false}]},{"StartTime":46003.0,"Objects":[{"StartTime":46003.0,"Position":80.0,"HyperDash":false},{"StartTime":46093.0,"Position":80.0,"HyperDash":false}]},{"StartTime":46185.0,"Objects":[{"StartTime":46185.0,"Position":128.0,"HyperDash":false}]},{"StartTime":46366.0,"Objects":[{"StartTime":46366.0,"Position":304.0,"HyperDash":false}]},{"StartTime":46457.0,"Objects":[{"StartTime":46457.0,"Position":256.0,"HyperDash":false}]},{"StartTime":46548.0,"Objects":[{"StartTime":46548.0,"Position":208.0,"HyperDash":true}]},{"StartTime":46730.0,"Objects":[{"StartTime":46730.0,"Position":464.0,"HyperDash":false}]},{"StartTime":46912.0,"Objects":[{"StartTime":46912.0,"Position":45.0,"HyperDash":false},{"StartTime":46997.0,"Position":397.0,"HyperDash":false},{"StartTime":47082.0,"Position":342.0,"HyperDash":false},{"StartTime":47167.0,"Position":163.0,"HyperDash":false},{"StartTime":47252.0,"Position":278.0,"HyperDash":false},{"StartTime":47338.0,"Position":220.0,"HyperDash":false},{"StartTime":47423.0,"Position":253.0,"HyperDash":false},{"StartTime":47508.0,"Position":233.0,"HyperDash":false},{"StartTime":47593.0,"Position":97.0,"HyperDash":false},{"StartTime":47678.0,"Position":473.0,"HyperDash":false},{"StartTime":47764.0,"Position":189.0,"HyperDash":false},{"StartTime":47849.0,"Position":194.0,"HyperDash":false},{"StartTime":47934.0,"Position":107.0,"HyperDash":false},{"StartTime":48019.0,"Position":21.0,"HyperDash":false},{"StartTime":48105.0,"Position":461.0,"HyperDash":false},{"StartTime":48190.0,"Position":498.0,"HyperDash":false},{"StartTime":48275.0,"Position":184.0,"HyperDash":false},{"StartTime":48360.0,"Position":78.0,"HyperDash":false},{"StartTime":48445.0,"Position":338.0,"HyperDash":false},{"StartTime":48531.0,"Position":392.0,"HyperDash":false},{"StartTime":48616.0,"Position":335.0,"HyperDash":false},{"StartTime":48701.0,"Position":193.0,"HyperDash":false},{"StartTime":48786.0,"Position":478.0,"HyperDash":false},{"StartTime":48872.0,"Position":255.0,"HyperDash":false},{"StartTime":48957.0,"Position":175.0,"HyperDash":false},{"StartTime":49042.0,"Position":274.0,"HyperDash":false},{"StartTime":49127.0,"Position":442.0,"HyperDash":false},{"StartTime":49212.0,"Position":295.0,"HyperDash":false},{"StartTime":49298.0,"Position":311.0,"HyperDash":false},{"StartTime":49383.0,"Position":17.0,"HyperDash":false},{"StartTime":49468.0,"Position":467.0,"HyperDash":false},{"StartTime":49553.0,"Position":30.0,"HyperDash":false},{"StartTime":49639.0,"Position":218.0,"HyperDash":false}]},{"StartTime":52548.0,"Objects":[{"StartTime":52548.0,"Position":200.0,"HyperDash":false},{"StartTime":52620.0,"Position":175.758957,"HyperDash":false},{"StartTime":52729.0,"Position":184.310715,"HyperDash":false}]},{"StartTime":52912.0,"Objects":[{"StartTime":52912.0,"Position":280.0,"HyperDash":false},{"StartTime":52984.0,"Position":269.758942,"HyperDash":false},{"StartTime":53093.0,"Position":264.3107,"HyperDash":false}]},{"StartTime":53457.0,"Objects":[{"StartTime":53457.0,"Position":104.0,"HyperDash":false}]},{"StartTime":53639.0,"Objects":[{"StartTime":53639.0,"Position":184.0,"HyperDash":false}]},{"StartTime":54003.0,"Objects":[{"StartTime":54003.0,"Position":344.0,"HyperDash":false},{"StartTime":54075.0,"Position":333.241058,"HyperDash":false},{"StartTime":54184.0,"Position":359.6893,"HyperDash":false}]},{"StartTime":54366.0,"Objects":[{"StartTime":54366.0,"Position":256.0,"HyperDash":false},{"StartTime":54438.0,"Position":273.241058,"HyperDash":false},{"StartTime":54547.0,"Position":271.6893,"HyperDash":false}]},{"StartTime":54912.0,"Objects":[{"StartTime":54912.0,"Position":448.0,"HyperDash":false}]},{"StartTime":55094.0,"Objects":[{"StartTime":55094.0,"Position":360.0,"HyperDash":false}]},{"StartTime":55457.0,"Objects":[{"StartTime":55457.0,"Position":176.0,"HyperDash":false},{"StartTime":55529.0,"Position":150.758957,"HyperDash":false},{"StartTime":55638.0,"Position":160.310715,"HyperDash":false}]},{"StartTime":55821.0,"Objects":[{"StartTime":55821.0,"Position":272.0,"HyperDash":false},{"StartTime":55893.0,"Position":282.758942,"HyperDash":false},{"StartTime":56002.0,"Position":256.3107,"HyperDash":false}]},{"StartTime":56366.0,"Objects":[{"StartTime":56366.0,"Position":64.0,"HyperDash":false}]},{"StartTime":56548.0,"Objects":[{"StartTime":56548.0,"Position":160.0,"HyperDash":false}]},{"StartTime":56912.0,"Objects":[{"StartTime":56912.0,"Position":368.0,"HyperDash":false},{"StartTime":56984.0,"Position":383.241058,"HyperDash":false},{"StartTime":57093.0,"Position":383.6893,"HyperDash":false}]},{"StartTime":57275.0,"Objects":[{"StartTime":57275.0,"Position":264.0,"HyperDash":false},{"StartTime":57347.0,"Position":270.241058,"HyperDash":false},{"StartTime":57456.0,"Position":279.6893,"HyperDash":false}]},{"StartTime":57639.0,"Objects":[{"StartTime":57639.0,"Position":400.0,"HyperDash":false},{"StartTime":57711.0,"Position":367.1768,"HyperDash":false},{"StartTime":57820.0,"Position":320.0,"HyperDash":false}]},{"StartTime":58003.0,"Objects":[{"StartTime":58003.0,"Position":464.0,"HyperDash":false}]},{"StartTime":58185.0,"Objects":[{"StartTime":58185.0,"Position":320.0,"HyperDash":false}]},{"StartTime":58366.0,"Objects":[{"StartTime":58366.0,"Position":144.0,"HyperDash":false}]},{"StartTime":58548.0,"Objects":[{"StartTime":58548.0,"Position":224.0,"HyperDash":false},{"StartTime":58638.0,"Position":264.0,"HyperDash":false},{"StartTime":58729.0,"Position":224.0,"HyperDash":false}]},{"StartTime":58912.0,"Objects":[{"StartTime":58912.0,"Position":144.0,"HyperDash":false}]},{"StartTime":59094.0,"Objects":[{"StartTime":59094.0,"Position":16.0,"HyperDash":false},{"StartTime":59184.0,"Position":16.0,"HyperDash":false}]},{"StartTime":59275.0,"Objects":[{"StartTime":59275.0,"Position":64.0,"HyperDash":false}]},{"StartTime":59457.0,"Objects":[{"StartTime":59457.0,"Position":144.0,"HyperDash":false}]},{"StartTime":59639.0,"Objects":[{"StartTime":59639.0,"Position":64.0,"HyperDash":false}]},{"StartTime":59821.0,"Objects":[{"StartTime":59821.0,"Position":240.0,"HyperDash":false},{"StartTime":59911.0,"Position":240.0,"HyperDash":false}]},{"StartTime":60003.0,"Objects":[{"StartTime":60003.0,"Position":192.0,"HyperDash":false}]},{"StartTime":60185.0,"Objects":[{"StartTime":60185.0,"Position":80.0,"HyperDash":false}]},{"StartTime":60275.0,"Objects":[{"StartTime":60275.0,"Position":128.0,"HyperDash":false}]},{"StartTime":60366.0,"Objects":[{"StartTime":60366.0,"Position":176.0,"HyperDash":false}]},{"StartTime":60548.0,"Objects":[{"StartTime":60548.0,"Position":64.0,"HyperDash":false},{"StartTime":60638.0,"Position":64.0,"HyperDash":false}]},{"StartTime":60730.0,"Objects":[{"StartTime":60730.0,"Position":112.0,"HyperDash":false}]},{"StartTime":60912.0,"Objects":[{"StartTime":60912.0,"Position":224.0,"HyperDash":false},{"StartTime":60984.0,"Position":204.176788,"HyperDash":false},{"StartTime":61093.0,"Position":144.0,"HyperDash":false}]},{"StartTime":61275.0,"Objects":[{"StartTime":61275.0,"Position":320.0,"HyperDash":false}]},{"StartTime":61457.0,"Objects":[{"StartTime":61457.0,"Position":400.0,"HyperDash":false},{"StartTime":61547.0,"Position":400.0,"HyperDash":false}]},{"StartTime":61639.0,"Objects":[{"StartTime":61639.0,"Position":352.0,"HyperDash":false}]},{"StartTime":61821.0,"Objects":[{"StartTime":61821.0,"Position":432.0,"HyperDash":false}]},{"StartTime":62003.0,"Objects":[{"StartTime":62003.0,"Position":320.0,"HyperDash":false},{"StartTime":62093.0,"Position":320.0,"HyperDash":false}]},{"StartTime":62185.0,"Objects":[{"StartTime":62185.0,"Position":368.0,"HyperDash":false}]},{"StartTime":62366.0,"Objects":[{"StartTime":62366.0,"Position":448.0,"HyperDash":false}]},{"StartTime":62548.0,"Objects":[{"StartTime":62548.0,"Position":368.0,"HyperDash":false}]},{"StartTime":62730.0,"Objects":[{"StartTime":62730.0,"Position":192.0,"HyperDash":false}]},{"StartTime":62912.0,"Objects":[{"StartTime":62912.0,"Position":272.0,"HyperDash":false}]},{"StartTime":63094.0,"Objects":[{"StartTime":63094.0,"Position":192.0,"HyperDash":false},{"StartTime":63184.0,"Position":152.0,"HyperDash":false},{"StartTime":63275.0,"Position":192.0,"HyperDash":false}]},{"StartTime":63457.0,"Objects":[{"StartTime":63457.0,"Position":304.0,"HyperDash":false},{"StartTime":63529.0,"Position":274.1768,"HyperDash":false},{"StartTime":63638.0,"Position":224.0,"HyperDash":false}]},{"StartTime":63821.0,"Objects":[{"StartTime":63821.0,"Position":112.0,"HyperDash":false},{"StartTime":63893.0,"Position":144.823212,"HyperDash":false},{"StartTime":64002.0,"Position":192.0,"HyperDash":false}]},{"StartTime":64185.0,"Objects":[{"StartTime":64185.0,"Position":368.0,"HyperDash":false}]},{"StartTime":64366.0,"Objects":[{"StartTime":64366.0,"Position":288.0,"HyperDash":false},{"StartTime":64456.0,"Position":248.0,"HyperDash":false},{"StartTime":64547.0,"Position":288.0,"HyperDash":false}]},{"StartTime":64730.0,"Objects":[{"StartTime":64730.0,"Position":368.0,"HyperDash":false}]},{"StartTime":64912.0,"Objects":[{"StartTime":64912.0,"Position":448.0,"HyperDash":false}]},{"StartTime":65094.0,"Objects":[{"StartTime":65094.0,"Position":368.0,"HyperDash":false},{"StartTime":65184.0,"Position":328.0,"HyperDash":false},{"StartTime":65275.0,"Position":368.0,"HyperDash":false}]},{"StartTime":65457.0,"Objects":[{"StartTime":65457.0,"Position":448.0,"HyperDash":false}]},{"StartTime":65639.0,"Objects":[{"StartTime":65639.0,"Position":272.0,"HyperDash":false},{"StartTime":65729.0,"Position":272.0,"HyperDash":false}]},{"StartTime":65821.0,"Objects":[{"StartTime":65821.0,"Position":320.0,"HyperDash":false}]},{"StartTime":66003.0,"Objects":[{"StartTime":66003.0,"Position":432.0,"HyperDash":false}]},{"StartTime":66094.0,"Objects":[{"StartTime":66094.0,"Position":384.0,"HyperDash":false}]},{"StartTime":66185.0,"Objects":[{"StartTime":66185.0,"Position":336.0,"HyperDash":false}]},{"StartTime":66366.0,"Objects":[{"StartTime":66366.0,"Position":224.0,"HyperDash":false}]},{"StartTime":66457.0,"Objects":[{"StartTime":66457.0,"Position":272.0,"HyperDash":false}]},{"StartTime":66548.0,"Objects":[{"StartTime":66548.0,"Position":320.0,"HyperDash":false}]},{"StartTime":66730.0,"Objects":[{"StartTime":66730.0,"Position":432.0,"HyperDash":false}]},{"StartTime":66912.0,"Objects":[{"StartTime":66912.0,"Position":320.0,"HyperDash":false}]},{"StartTime":67094.0,"Objects":[{"StartTime":67094.0,"Position":144.0,"HyperDash":false}]},{"StartTime":67275.0,"Objects":[{"StartTime":67275.0,"Position":64.0,"HyperDash":false},{"StartTime":67365.0,"Position":64.0,"HyperDash":false}]},{"StartTime":67457.0,"Objects":[{"StartTime":67457.0,"Position":112.0,"HyperDash":false}]},{"StartTime":67639.0,"Objects":[{"StartTime":67639.0,"Position":192.0,"HyperDash":false}]},{"StartTime":67821.0,"Objects":[{"StartTime":67821.0,"Position":80.0,"HyperDash":false},{"StartTime":67911.0,"Position":92.64911,"HyperDash":false}]},{"StartTime":68003.0,"Objects":[{"StartTime":68003.0,"Position":144.0,"HyperDash":false}]},{"StartTime":68185.0,"Objects":[{"StartTime":68185.0,"Position":224.0,"HyperDash":false}]},{"StartTime":68366.0,"Objects":[{"StartTime":68366.0,"Position":144.0,"HyperDash":false}]},{"StartTime":68548.0,"Objects":[{"StartTime":68548.0,"Position":320.0,"HyperDash":false}]},{"StartTime":68730.0,"Objects":[{"StartTime":68730.0,"Position":400.0,"HyperDash":false},{"StartTime":68820.0,"Position":407.844635,"HyperDash":false}]},{"StartTime":69003.0,"Objects":[{"StartTime":69003.0,"Position":296.0,"HyperDash":false},{"StartTime":69093.0,"Position":256.0,"HyperDash":false}]},{"StartTime":69275.0,"Objects":[{"StartTime":69275.0,"Position":368.0,"HyperDash":false}]},{"StartTime":69457.0,"Objects":[{"StartTime":69457.0,"Position":256.0,"HyperDash":false}]},{"StartTime":69639.0,"Objects":[{"StartTime":69639.0,"Position":80.0,"HyperDash":false}]},{"StartTime":69821.0,"Objects":[{"StartTime":69821.0,"Position":192.0,"HyperDash":true}]},{"StartTime":70003.0,"Objects":[{"StartTime":70003.0,"Position":448.0,"HyperDash":false}]},{"StartTime":75821.0,"Objects":[{"StartTime":75821.0,"Position":160.0,"HyperDash":false},{"StartTime":75893.0,"Position":115.176788,"HyperDash":false},{"StartTime":76002.0,"Position":80.0,"HyperDash":false}]},{"StartTime":76185.0,"Objects":[{"StartTime":76185.0,"Position":160.0,"HyperDash":false},{"StartTime":76257.0,"Position":131.176788,"HyperDash":false},{"StartTime":76366.0,"Position":80.0,"HyperDash":false}]},{"StartTime":76548.0,"Objects":[{"StartTime":76548.0,"Position":160.0,"HyperDash":false}]},{"StartTime":76730.0,"Objects":[{"StartTime":76730.0,"Position":240.0,"HyperDash":false}]},{"StartTime":76912.0,"Objects":[{"StartTime":76912.0,"Position":240.0,"HyperDash":false}]},{"StartTime":77094.0,"Objects":[{"StartTime":77094.0,"Position":240.0,"HyperDash":false}]},{"StartTime":77275.0,"Objects":[{"StartTime":77275.0,"Position":368.0,"HyperDash":false},{"StartTime":77347.0,"Position":387.8232,"HyperDash":false},{"StartTime":77456.0,"Position":448.0,"HyperDash":false}]},{"StartTime":77639.0,"Objects":[{"StartTime":77639.0,"Position":368.0,"HyperDash":false},{"StartTime":77711.0,"Position":392.8232,"HyperDash":false},{"StartTime":77820.0,"Position":448.0,"HyperDash":false}]},{"StartTime":78003.0,"Objects":[{"StartTime":78003.0,"Position":352.0,"HyperDash":false}]},{"StartTime":78185.0,"Objects":[{"StartTime":78185.0,"Position":256.0,"HyperDash":false}]},{"StartTime":78366.0,"Objects":[{"StartTime":78366.0,"Position":256.0,"HyperDash":false}]},{"StartTime":78548.0,"Objects":[{"StartTime":78548.0,"Position":352.0,"HyperDash":false}]},{"StartTime":78730.0,"Objects":[{"StartTime":78730.0,"Position":176.0,"HyperDash":false},{"StartTime":78802.0,"Position":125.176788,"HyperDash":false},{"StartTime":78911.0,"Position":96.0,"HyperDash":false}]},{"StartTime":79094.0,"Objects":[{"StartTime":79094.0,"Position":176.0,"HyperDash":false},{"StartTime":79166.0,"Position":146.176788,"HyperDash":false},{"StartTime":79275.0,"Position":96.0,"HyperDash":false}]},{"StartTime":79457.0,"Objects":[{"StartTime":79457.0,"Position":192.0,"HyperDash":false}]},{"StartTime":79639.0,"Objects":[{"StartTime":79639.0,"Position":288.0,"HyperDash":false}]},{"StartTime":79821.0,"Objects":[{"StartTime":79821.0,"Position":192.0,"HyperDash":false}]},{"StartTime":80003.0,"Objects":[{"StartTime":80003.0,"Position":288.0,"HyperDash":false}]},{"StartTime":80185.0,"Objects":[{"StartTime":80185.0,"Position":194.0,"HyperDash":false},{"StartTime":80253.0,"Position":234.0,"HyperDash":false},{"StartTime":80321.0,"Position":179.0,"HyperDash":false},{"StartTime":80389.0,"Position":278.0,"HyperDash":false},{"StartTime":80457.0,"Position":474.0,"HyperDash":false},{"StartTime":80525.0,"Position":50.0,"HyperDash":false},{"StartTime":80593.0,"Position":458.0,"HyperDash":false},{"StartTime":80661.0,"Position":425.0,"HyperDash":false},{"StartTime":80730.0,"Position":466.0,"HyperDash":false},{"StartTime":80798.0,"Position":56.0,"HyperDash":false},{"StartTime":80866.0,"Position":109.0,"HyperDash":false},{"StartTime":80934.0,"Position":482.0,"HyperDash":false},{"StartTime":81002.0,"Position":147.0,"HyperDash":false},{"StartTime":81070.0,"Position":285.0,"HyperDash":false},{"StartTime":81138.0,"Position":452.0,"HyperDash":false},{"StartTime":81206.0,"Position":419.0,"HyperDash":false},{"StartTime":81275.0,"Position":269.0,"HyperDash":false}]},{"StartTime":81639.0,"Objects":[{"StartTime":81639.0,"Position":416.0,"HyperDash":false}]},{"StartTime":81821.0,"Objects":[{"StartTime":81821.0,"Position":336.0,"HyperDash":false},{"StartTime":81911.0,"Position":307.715729,"HyperDash":false},{"StartTime":82002.0,"Position":336.0,"HyperDash":false}]},{"StartTime":82185.0,"Objects":[{"StartTime":82185.0,"Position":448.0,"HyperDash":false}]},{"StartTime":82548.0,"Objects":[{"StartTime":82548.0,"Position":288.0,"HyperDash":false},{"StartTime":82638.0,"Position":259.715729,"HyperDash":false},{"StartTime":82729.0,"Position":288.0,"HyperDash":false}]},{"StartTime":82912.0,"Objects":[{"StartTime":82912.0,"Position":368.0,"HyperDash":false}]},{"StartTime":83094.0,"Objects":[{"StartTime":83094.0,"Position":192.0,"HyperDash":false}]},{"StartTime":83185.0,"Objects":[{"StartTime":83185.0,"Position":144.0,"HyperDash":false}]},{"StartTime":83275.0,"Objects":[{"StartTime":83275.0,"Position":192.0,"HyperDash":false}]},{"StartTime":83457.0,"Objects":[{"StartTime":83457.0,"Position":304.0,"HyperDash":false}]},{"StartTime":83548.0,"Objects":[{"StartTime":83548.0,"Position":352.0,"HyperDash":false},{"StartTime":83638.0,"Position":352.0,"HyperDash":false}]},{"StartTime":83821.0,"Objects":[{"StartTime":83821.0,"Position":272.0,"HyperDash":false}]},{"StartTime":84003.0,"Objects":[{"StartTime":84003.0,"Position":384.0,"HyperDash":false}]},{"StartTime":84185.0,"Objects":[{"StartTime":84185.0,"Position":304.0,"HyperDash":false},{"StartTime":84275.0,"Position":304.0,"HyperDash":false}]},{"StartTime":84366.0,"Objects":[{"StartTime":84366.0,"Position":352.0,"HyperDash":false}]},{"StartTime":84548.0,"Objects":[{"StartTime":84548.0,"Position":176.0,"HyperDash":false}]},{"StartTime":84730.0,"Objects":[{"StartTime":84730.0,"Position":256.0,"HyperDash":false},{"StartTime":84820.0,"Position":284.284271,"HyperDash":false},{"StartTime":84911.0,"Position":256.0,"HyperDash":false}]},{"StartTime":85094.0,"Objects":[{"StartTime":85094.0,"Position":144.0,"HyperDash":false}]},{"StartTime":85457.0,"Objects":[{"StartTime":85457.0,"Position":304.0,"HyperDash":false},{"StartTime":85547.0,"Position":332.284271,"HyperDash":false},{"StartTime":85638.0,"Position":304.0,"HyperDash":false}]},{"StartTime":85821.0,"Objects":[{"StartTime":85821.0,"Position":224.0,"HyperDash":false}]},{"StartTime":86003.0,"Objects":[{"StartTime":86003.0,"Position":400.0,"HyperDash":false}]},{"StartTime":86094.0,"Objects":[{"StartTime":86094.0,"Position":448.0,"HyperDash":false}]},{"StartTime":86185.0,"Objects":[{"StartTime":86185.0,"Position":400.0,"HyperDash":false}]},{"StartTime":86366.0,"Objects":[{"StartTime":86366.0,"Position":288.0,"HyperDash":false}]},{"StartTime":86457.0,"Objects":[{"StartTime":86457.0,"Position":240.0,"HyperDash":false},{"StartTime":86547.0,"Position":240.0,"HyperDash":false}]},{"StartTime":86730.0,"Objects":[{"StartTime":86730.0,"Position":352.0,"HyperDash":false}]},{"StartTime":86821.0,"Objects":[{"StartTime":86821.0,"Position":304.0,"HyperDash":false}]},{"StartTime":86912.0,"Objects":[{"StartTime":86912.0,"Position":256.0,"HyperDash":false}]},{"StartTime":87094.0,"Objects":[{"StartTime":87094.0,"Position":368.0,"HyperDash":false}]},{"StartTime":87185.0,"Objects":[{"StartTime":87185.0,"Position":432.0,"HyperDash":false}]},{"StartTime":87275.0,"Objects":[{"StartTime":87275.0,"Position":368.0,"HyperDash":false}]},{"StartTime":87457.0,"Objects":[{"StartTime":87457.0,"Position":192.0,"HyperDash":false}]},{"StartTime":87639.0,"Objects":[{"StartTime":87639.0,"Position":112.0,"HyperDash":false}]},{"StartTime":87730.0,"Objects":[{"StartTime":87730.0,"Position":160.0,"HyperDash":false}]},{"StartTime":87821.0,"Objects":[{"StartTime":87821.0,"Position":208.0,"HyperDash":false}]},{"StartTime":88003.0,"Objects":[{"StartTime":88003.0,"Position":96.0,"HyperDash":false},{"StartTime":88093.0,"Position":87.2201843,"HyperDash":false},{"StartTime":88184.0,"Position":80.35393,"HyperDash":false},{"StartTime":88257.0,"Position":98.3716049,"HyperDash":false},{"StartTime":88366.0,"Position":158.41568,"HyperDash":false}]},{"StartTime":88457.0,"Objects":[{"StartTime":88457.0,"Position":112.0,"HyperDash":false}]},{"StartTime":88548.0,"Objects":[{"StartTime":88548.0,"Position":64.0,"HyperDash":false}]},{"StartTime":88730.0,"Objects":[{"StartTime":88730.0,"Position":144.0,"HyperDash":false}]},{"StartTime":88912.0,"Objects":[{"StartTime":88912.0,"Position":320.0,"HyperDash":false}]},{"StartTime":89003.0,"Objects":[{"StartTime":89003.0,"Position":368.0,"HyperDash":false}]},{"StartTime":89094.0,"Objects":[{"StartTime":89094.0,"Position":320.0,"HyperDash":false}]},{"StartTime":89275.0,"Objects":[{"StartTime":89275.0,"Position":208.0,"HyperDash":false}]},{"StartTime":89366.0,"Objects":[{"StartTime":89366.0,"Position":160.0,"HyperDash":false},{"StartTime":89456.0,"Position":160.0,"HyperDash":false}]},{"StartTime":89639.0,"Objects":[{"StartTime":89639.0,"Position":240.0,"HyperDash":false}]},{"StartTime":89821.0,"Objects":[{"StartTime":89821.0,"Position":128.0,"HyperDash":false}]},{"StartTime":90003.0,"Objects":[{"StartTime":90003.0,"Position":208.0,"HyperDash":false},{"StartTime":90093.0,"Position":208.0,"HyperDash":false}]},{"StartTime":90185.0,"Objects":[{"StartTime":90185.0,"Position":160.0,"HyperDash":false}]},{"StartTime":90366.0,"Objects":[{"StartTime":90366.0,"Position":336.0,"HyperDash":false}]},{"StartTime":90548.0,"Objects":[{"StartTime":90548.0,"Position":416.0,"HyperDash":false}]},{"StartTime":90639.0,"Objects":[{"StartTime":90639.0,"Position":368.0,"HyperDash":false}]},{"StartTime":90730.0,"Objects":[{"StartTime":90730.0,"Position":320.0,"HyperDash":false}]},{"StartTime":90912.0,"Objects":[{"StartTime":90912.0,"Position":432.0,"HyperDash":false},{"StartTime":91002.0,"Position":446.779816,"HyperDash":false},{"StartTime":91093.0,"Position":447.646057,"HyperDash":false},{"StartTime":91166.0,"Position":416.6284,"HyperDash":false},{"StartTime":91275.0,"Position":369.58432,"HyperDash":false}]},{"StartTime":91366.0,"Objects":[{"StartTime":91366.0,"Position":416.0,"HyperDash":false}]},{"StartTime":91457.0,"Objects":[{"StartTime":91457.0,"Position":464.0,"HyperDash":false}]},{"StartTime":91639.0,"Objects":[{"StartTime":91639.0,"Position":384.0,"HyperDash":false}]},{"StartTime":91821.0,"Objects":[{"StartTime":91821.0,"Position":208.0,"HyperDash":false}]},{"StartTime":91912.0,"Objects":[{"StartTime":91912.0,"Position":160.0,"HyperDash":false}]},{"StartTime":92003.0,"Objects":[{"StartTime":92003.0,"Position":208.0,"HyperDash":false}]},{"StartTime":92185.0,"Objects":[{"StartTime":92185.0,"Position":320.0,"HyperDash":false}]},{"StartTime":92275.0,"Objects":[{"StartTime":92275.0,"Position":368.0,"HyperDash":false},{"StartTime":92365.0,"Position":368.0,"HyperDash":false}]},{"StartTime":92548.0,"Objects":[{"StartTime":92548.0,"Position":288.0,"HyperDash":false},{"StartTime":92638.0,"Position":241.366974,"HyperDash":false},{"StartTime":92729.0,"Position":208.293579,"HyperDash":false},{"StartTime":92820.0,"Position":262.779816,"HyperDash":false},{"StartTime":92911.0,"Position":287.8532,"HyperDash":false},{"StartTime":92984.0,"Position":304.0,"HyperDash":false},{"StartTime":93093.0,"Position":368.0,"HyperDash":true}]},{"StartTime":93275.0,"Objects":[{"StartTime":93275.0,"Position":112.0,"HyperDash":false}]},{"StartTime":93457.0,"Objects":[{"StartTime":93457.0,"Position":32.0,"HyperDash":false},{"StartTime":93547.0,"Position":32.0,"HyperDash":false}]},{"StartTime":93639.0,"Objects":[{"StartTime":93639.0,"Position":80.0,"HyperDash":false}]},{"StartTime":93821.0,"Objects":[{"StartTime":93821.0,"Position":192.0,"HyperDash":true}]},{"StartTime":94003.0,"Objects":[{"StartTime":94003.0,"Position":448.0,"HyperDash":false},{"StartTime":94075.0,"Position":436.241058,"HyperDash":false},{"StartTime":94184.0,"Position":463.6893,"HyperDash":false}]},{"StartTime":94275.0,"Objects":[{"StartTime":94275.0,"Position":416.0,"HyperDash":false}]},{"StartTime":94366.0,"Objects":[{"StartTime":94366.0,"Position":368.0,"HyperDash":false}]},{"StartTime":94548.0,"Objects":[{"StartTime":94548.0,"Position":448.0,"HyperDash":false}]},{"StartTime":94730.0,"Objects":[{"StartTime":94730.0,"Position":272.0,"HyperDash":false}]},{"StartTime":94912.0,"Objects":[{"StartTime":94912.0,"Position":192.0,"HyperDash":false},{"StartTime":95002.0,"Position":152.0,"HyperDash":false},{"StartTime":95093.0,"Position":192.0,"HyperDash":false}]},{"StartTime":95275.0,"Objects":[{"StartTime":95275.0,"Position":304.0,"HyperDash":true}]},{"StartTime":95457.0,"Objects":[{"StartTime":95457.0,"Position":48.0,"HyperDash":false},{"StartTime":95529.0,"Position":66.24104,"HyperDash":false},{"StartTime":95638.0,"Position":63.6892929,"HyperDash":false}]},{"StartTime":95821.0,"Objects":[{"StartTime":95821.0,"Position":176.0,"HyperDash":false},{"StartTime":95893.0,"Position":189.241043,"HyperDash":false},{"StartTime":96002.0,"Position":191.689285,"HyperDash":false}]},{"StartTime":96185.0,"Objects":[{"StartTime":96185.0,"Position":16.0,"HyperDash":false}]},{"StartTime":96366.0,"Objects":[{"StartTime":96366.0,"Position":96.0,"HyperDash":false},{"StartTime":96456.0,"Position":96.0,"HyperDash":false}]},{"StartTime":96548.0,"Objects":[{"StartTime":96548.0,"Position":48.0,"HyperDash":false}]},{"StartTime":96730.0,"Objects":[{"StartTime":96730.0,"Position":160.0,"HyperDash":true}]},{"StartTime":96912.0,"Objects":[{"StartTime":96912.0,"Position":416.0,"HyperDash":false},{"StartTime":96984.0,"Position":402.241058,"HyperDash":false},{"StartTime":97093.0,"Position":431.6893,"HyperDash":false}]},{"StartTime":97275.0,"Objects":[{"StartTime":97275.0,"Position":320.0,"HyperDash":false}]},{"StartTime":97366.0,"Objects":[{"StartTime":97366.0,"Position":272.0,"HyperDash":false},{"StartTime":97456.0,"Position":272.0,"HyperDash":false}]},{"StartTime":97639.0,"Objects":[{"StartTime":97639.0,"Position":448.0,"HyperDash":false}]},{"StartTime":97821.0,"Objects":[{"StartTime":97821.0,"Position":336.0,"HyperDash":false}]},{"StartTime":98003.0,"Objects":[{"StartTime":98003.0,"Position":448.0,"HyperDash":false}]},{"StartTime":98094.0,"Objects":[{"StartTime":98094.0,"Position":496.0,"HyperDash":false},{"StartTime":98184.0,"Position":496.0,"HyperDash":true}]},{"StartTime":98366.0,"Objects":[{"StartTime":98366.0,"Position":240.0,"HyperDash":false},{"StartTime":98438.0,"Position":199.221,"HyperDash":false},{"StartTime":98547.0,"Position":140.0,"HyperDash":false}]},{"StartTime":98730.0,"Objects":[{"StartTime":98730.0,"Position":240.0,"HyperDash":false},{"StartTime":98802.0,"Position":264.779,"HyperDash":false},{"StartTime":98911.0,"Position":340.0,"HyperDash":false}]},{"StartTime":99094.0,"Objects":[{"StartTime":99094.0,"Position":96.0,"HyperDash":false}]},{"StartTime":99275.0,"Objects":[{"StartTime":99275.0,"Position":16.0,"HyperDash":false},{"StartTime":99365.0,"Position":16.0,"HyperDash":false}]},{"StartTime":99457.0,"Objects":[{"StartTime":99457.0,"Position":64.0,"HyperDash":false}]},{"StartTime":99639.0,"Objects":[{"StartTime":99639.0,"Position":176.0,"HyperDash":true}]},{"StartTime":99821.0,"Objects":[{"StartTime":99821.0,"Position":432.0,"HyperDash":false},{"StartTime":99893.0,"Position":432.093933,"HyperDash":false},{"StartTime":100002.0,"Position":480.0,"HyperDash":false}]},{"StartTime":100094.0,"Objects":[{"StartTime":100094.0,"Position":480.0,"HyperDash":false}]},{"StartTime":100185.0,"Objects":[{"StartTime":100185.0,"Position":448.0,"HyperDash":false}]},{"StartTime":100366.0,"Objects":[{"StartTime":100366.0,"Position":368.0,"HyperDash":false}]},{"StartTime":100548.0,"Objects":[{"StartTime":100548.0,"Position":192.0,"HyperDash":false}]},{"StartTime":100730.0,"Objects":[{"StartTime":100730.0,"Position":272.0,"HyperDash":false},{"StartTime":100820.0,"Position":312.0,"HyperDash":false},{"StartTime":100911.0,"Position":272.0,"HyperDash":false}]},{"StartTime":101094.0,"Objects":[{"StartTime":101094.0,"Position":160.0,"HyperDash":true}]},{"StartTime":101275.0,"Objects":[{"StartTime":101275.0,"Position":416.0,"HyperDash":false},{"StartTime":101347.0,"Position":426.241058,"HyperDash":false},{"StartTime":101456.0,"Position":431.6893,"HyperDash":false}]},{"StartTime":101639.0,"Objects":[{"StartTime":101639.0,"Position":320.0,"HyperDash":false}]},{"StartTime":101821.0,"Objects":[{"StartTime":101821.0,"Position":432.0,"HyperDash":false}]},{"StartTime":102003.0,"Objects":[{"StartTime":102003.0,"Position":256.0,"HyperDash":false}]},{"StartTime":102185.0,"Objects":[{"StartTime":102185.0,"Position":176.0,"HyperDash":false},{"StartTime":102275.0,"Position":176.0,"HyperDash":false}]},{"StartTime":102366.0,"Objects":[{"StartTime":102366.0,"Position":224.0,"HyperDash":false}]},{"StartTime":102548.0,"Objects":[{"StartTime":102548.0,"Position":112.0,"HyperDash":true}]},{"StartTime":102730.0,"Objects":[{"StartTime":102730.0,"Position":368.0,"HyperDash":false},{"StartTime":102802.0,"Position":376.241058,"HyperDash":false},{"StartTime":102911.0,"Position":383.6893,"HyperDash":false}]},{"StartTime":103094.0,"Objects":[{"StartTime":103094.0,"Position":272.0,"HyperDash":false}]},{"StartTime":103185.0,"Objects":[{"StartTime":103185.0,"Position":224.0,"HyperDash":false}]},{"StartTime":103275.0,"Objects":[{"StartTime":103275.0,"Position":272.0,"HyperDash":false}]},{"StartTime":103457.0,"Objects":[{"StartTime":103457.0,"Position":384.0,"HyperDash":false}]},{"StartTime":103639.0,"Objects":[{"StartTime":103639.0,"Position":272.0,"HyperDash":false}]},{"StartTime":103821.0,"Objects":[{"StartTime":103821.0,"Position":384.0,"HyperDash":false}]},{"StartTime":103912.0,"Objects":[{"StartTime":103912.0,"Position":432.0,"HyperDash":false},{"StartTime":104002.0,"Position":432.0,"HyperDash":false}]},{"StartTime":104185.0,"Objects":[{"StartTime":104185.0,"Position":176.0,"HyperDash":false},{"StartTime":104257.0,"Position":161.176788,"HyperDash":false},{"StartTime":104366.0,"Position":96.0,"HyperDash":false}]},{"StartTime":104548.0,"Objects":[{"StartTime":104548.0,"Position":272.0,"HyperDash":false},{"StartTime":104620.0,"Position":314.8232,"HyperDash":false},{"StartTime":104729.0,"Position":352.0,"HyperDash":true}]},{"StartTime":104912.0,"Objects":[{"StartTime":104912.0,"Position":80.0,"HyperDash":false},{"StartTime":105002.0,"Position":80.0,"HyperDash":false}]},{"StartTime":105094.0,"Objects":[{"StartTime":105094.0,"Position":128.0,"HyperDash":false}]},{"StartTime":105275.0,"Objects":[{"StartTime":105275.0,"Position":304.0,"HyperDash":false},{"StartTime":105347.0,"Position":337.8232,"HyperDash":false},{"StartTime":105456.0,"Position":384.0,"HyperDash":false}]},{"StartTime":105639.0,"Objects":[{"StartTime":105639.0,"Position":128.0,"HyperDash":false}]},{"StartTime":105821.0,"Objects":[{"StartTime":105821.0,"Position":48.0,"HyperDash":false}]},{"StartTime":105912.0,"Objects":[{"StartTime":105912.0,"Position":128.0,"HyperDash":false}]},{"StartTime":106003.0,"Objects":[{"StartTime":106003.0,"Position":176.0,"HyperDash":false}]},{"StartTime":106185.0,"Objects":[{"StartTime":106185.0,"Position":64.0,"HyperDash":true}]},{"StartTime":106366.0,"Objects":[{"StartTime":106366.0,"Position":320.0,"HyperDash":false},{"StartTime":106456.0,"Position":360.0,"HyperDash":false},{"StartTime":106547.0,"Position":320.0,"HyperDash":false}]},{"StartTime":106730.0,"Objects":[{"StartTime":106730.0,"Position":144.0,"HyperDash":false}]},{"StartTime":106821.0,"Objects":[{"StartTime":106821.0,"Position":96.0,"HyperDash":false},{"StartTime":106911.0,"Position":96.0,"HyperDash":false}]},{"StartTime":107094.0,"Objects":[{"StartTime":107094.0,"Position":352.0,"HyperDash":false},{"StartTime":107166.0,"Position":366.241058,"HyperDash":false},{"StartTime":107275.0,"Position":367.6893,"HyperDash":false}]},{"StartTime":107366.0,"Objects":[{"StartTime":107366.0,"Position":320.0,"HyperDash":false}]},{"StartTime":107457.0,"Objects":[{"StartTime":107457.0,"Position":240.0,"HyperDash":false}]},{"StartTime":107639.0,"Objects":[{"StartTime":107639.0,"Position":352.0,"HyperDash":true}]},{"StartTime":107821.0,"Objects":[{"StartTime":107821.0,"Position":96.0,"HyperDash":false}]},{"StartTime":108003.0,"Objects":[{"StartTime":108003.0,"Position":16.0,"HyperDash":false},{"StartTime":108093.0,"Position":16.0,"HyperDash":false}]},{"StartTime":108185.0,"Objects":[{"StartTime":108185.0,"Position":96.0,"HyperDash":false}]},{"StartTime":108366.0,"Objects":[{"StartTime":108366.0,"Position":16.0,"HyperDash":true}]},{"StartTime":108548.0,"Objects":[{"StartTime":108548.0,"Position":272.0,"HyperDash":false}]},{"StartTime":108639.0,"Objects":[{"StartTime":108639.0,"Position":320.0,"HyperDash":false}]},{"StartTime":108730.0,"Objects":[{"StartTime":108730.0,"Position":272.0,"HyperDash":false}]},{"StartTime":108912.0,"Objects":[{"StartTime":108912.0,"Position":160.0,"HyperDash":false},{"StartTime":108984.0,"Position":184.823212,"HyperDash":false},{"StartTime":109093.0,"Position":240.0,"HyperDash":true}]},{"StartTime":109275.0,"Objects":[{"StartTime":109275.0,"Position":496.0,"HyperDash":false},{"StartTime":109365.0,"Position":496.0,"HyperDash":false}]},{"StartTime":109457.0,"Objects":[{"StartTime":109457.0,"Position":448.0,"HyperDash":false}]},{"StartTime":109639.0,"Objects":[{"StartTime":109639.0,"Position":272.0,"HyperDash":false},{"StartTime":109729.0,"Position":300.284271,"HyperDash":false}]},{"StartTime":109821.0,"Objects":[{"StartTime":109821.0,"Position":352.0,"HyperDash":true}]},{"StartTime":110003.0,"Objects":[{"StartTime":110003.0,"Position":96.0,"HyperDash":false}]},{"StartTime":110094.0,"Objects":[{"StartTime":110094.0,"Position":48.0,"HyperDash":false}]},{"StartTime":110185.0,"Objects":[{"StartTime":110185.0,"Position":96.0,"HyperDash":false}]},{"StartTime":110366.0,"Objects":[{"StartTime":110366.0,"Position":272.0,"HyperDash":false}]},{"StartTime":110457.0,"Objects":[{"StartTime":110457.0,"Position":224.0,"HyperDash":false}]},{"StartTime":110548.0,"Objects":[{"StartTime":110548.0,"Position":176.0,"HyperDash":true}]},{"StartTime":110730.0,"Objects":[{"StartTime":110730.0,"Position":448.0,"HyperDash":false},{"StartTime":110820.0,"Position":448.0,"HyperDash":false}]},{"StartTime":110912.0,"Objects":[{"StartTime":110912.0,"Position":400.0,"HyperDash":false}]},{"StartTime":111094.0,"Objects":[{"StartTime":111094.0,"Position":224.0,"HyperDash":false},{"StartTime":111166.0,"Position":193.176788,"HyperDash":false},{"StartTime":111275.0,"Position":144.0,"HyperDash":true}]},{"StartTime":111457.0,"Objects":[{"StartTime":111457.0,"Position":400.0,"HyperDash":false}]},{"StartTime":111639.0,"Objects":[{"StartTime":111639.0,"Position":480.0,"HyperDash":false}]},{"StartTime":111730.0,"Objects":[{"StartTime":111730.0,"Position":400.0,"HyperDash":false}]},{"StartTime":111821.0,"Objects":[{"StartTime":111821.0,"Position":352.0,"HyperDash":false}]},{"StartTime":112003.0,"Objects":[{"StartTime":112003.0,"Position":464.0,"HyperDash":true}]},{"StartTime":112185.0,"Objects":[{"StartTime":112185.0,"Position":208.0,"HyperDash":false},{"StartTime":112257.0,"Position":160.176788,"HyperDash":false},{"StartTime":112366.0,"Position":128.0,"HyperDash":false}]},{"StartTime":112548.0,"Objects":[{"StartTime":112548.0,"Position":304.0,"HyperDash":false},{"StartTime":112620.0,"Position":316.8232,"HyperDash":false},{"StartTime":112729.0,"Position":384.0,"HyperDash":false}]},{"StartTime":112912.0,"Objects":[{"StartTime":112912.0,"Position":128.0,"HyperDash":false},{"StartTime":112984.0,"Position":101.758957,"HyperDash":false},{"StartTime":113093.0,"Position":112.310707,"HyperDash":false}]},{"StartTime":113185.0,"Objects":[{"StartTime":113185.0,"Position":160.0,"HyperDash":false}]},{"StartTime":113275.0,"Objects":[{"StartTime":113275.0,"Position":240.0,"HyperDash":false}]},{"StartTime":113457.0,"Objects":[{"StartTime":113457.0,"Position":128.0,"HyperDash":true}]},{"StartTime":113639.0,"Objects":[{"StartTime":113639.0,"Position":384.0,"HyperDash":false}]},{"StartTime":113821.0,"Objects":[{"StartTime":113821.0,"Position":464.0,"HyperDash":false},{"StartTime":113911.0,"Position":464.0,"HyperDash":false}]},{"StartTime":114003.0,"Objects":[{"StartTime":114003.0,"Position":384.0,"HyperDash":false}]},{"StartTime":114185.0,"Objects":[{"StartTime":114185.0,"Position":464.0,"HyperDash":true}]},{"StartTime":114366.0,"Objects":[{"StartTime":114366.0,"Position":208.0,"HyperDash":false}]},{"StartTime":114548.0,"Objects":[{"StartTime":114548.0,"Position":128.0,"HyperDash":false}]},{"StartTime":114639.0,"Objects":[{"StartTime":114639.0,"Position":176.0,"HyperDash":false}]},{"StartTime":114730.0,"Objects":[{"StartTime":114730.0,"Position":256.0,"HyperDash":false}]},{"StartTime":114912.0,"Objects":[{"StartTime":114912.0,"Position":144.0,"HyperDash":true}]},{"StartTime":115094.0,"Objects":[{"StartTime":115094.0,"Position":400.0,"HyperDash":false}]},{"StartTime":115185.0,"Objects":[{"StartTime":115185.0,"Position":448.0,"HyperDash":false}]},{"StartTime":115275.0,"Objects":[{"StartTime":115275.0,"Position":400.0,"HyperDash":false}]},{"StartTime":115457.0,"Objects":[{"StartTime":115457.0,"Position":224.0,"HyperDash":false}]},{"StartTime":115548.0,"Objects":[{"StartTime":115548.0,"Position":176.0,"HyperDash":false},{"StartTime":115638.0,"Position":176.0,"HyperDash":false}]},{"StartTime":115821.0,"Objects":[{"StartTime":115821.0,"Position":432.0,"HyperDash":false},{"StartTime":115911.0,"Position":432.0,"HyperDash":false}]},{"StartTime":116003.0,"Objects":[{"StartTime":116003.0,"Position":384.0,"HyperDash":false}]},{"StartTime":116185.0,"Objects":[{"StartTime":116185.0,"Position":208.0,"HyperDash":false}]},{"StartTime":116275.0,"Objects":[{"StartTime":116275.0,"Position":256.0,"HyperDash":false}]},{"StartTime":116366.0,"Objects":[{"StartTime":116366.0,"Position":304.0,"HyperDash":true}]},{"StartTime":116548.0,"Objects":[{"StartTime":116548.0,"Position":48.0,"HyperDash":false}]},{"StartTime":116730.0,"Objects":[{"StartTime":116730.0,"Position":304.0,"HyperDash":false},{"StartTime":116815.0,"Position":221.0,"HyperDash":false},{"StartTime":116900.0,"Position":407.0,"HyperDash":false},{"StartTime":116985.0,"Position":287.0,"HyperDash":false},{"StartTime":117070.0,"Position":135.0,"HyperDash":false},{"StartTime":117156.0,"Position":437.0,"HyperDash":false},{"StartTime":117241.0,"Position":289.0,"HyperDash":false},{"StartTime":117326.0,"Position":464.0,"HyperDash":false},{"StartTime":117411.0,"Position":36.0,"HyperDash":false},{"StartTime":117496.0,"Position":378.0,"HyperDash":false},{"StartTime":117582.0,"Position":297.0,"HyperDash":false},{"StartTime":117667.0,"Position":418.0,"HyperDash":false},{"StartTime":117752.0,"Position":329.0,"HyperDash":false},{"StartTime":117837.0,"Position":338.0,"HyperDash":false},{"StartTime":117923.0,"Position":394.0,"HyperDash":false},{"StartTime":118008.0,"Position":40.0,"HyperDash":false},{"StartTime":118093.0,"Position":13.0,"HyperDash":false},{"StartTime":118178.0,"Position":80.0,"HyperDash":false},{"StartTime":118263.0,"Position":138.0,"HyperDash":false},{"StartTime":118349.0,"Position":311.0,"HyperDash":false},{"StartTime":118434.0,"Position":216.0,"HyperDash":false},{"StartTime":118519.0,"Position":310.0,"HyperDash":false},{"StartTime":118604.0,"Position":397.0,"HyperDash":false},{"StartTime":118690.0,"Position":214.0,"HyperDash":false},{"StartTime":118775.0,"Position":505.0,"HyperDash":false},{"StartTime":118860.0,"Position":173.0,"HyperDash":false},{"StartTime":118945.0,"Position":295.0,"HyperDash":false},{"StartTime":119030.0,"Position":199.0,"HyperDash":false},{"StartTime":119116.0,"Position":494.0,"HyperDash":false},{"StartTime":119201.0,"Position":293.0,"HyperDash":false},{"StartTime":119286.0,"Position":115.0,"HyperDash":false},{"StartTime":119371.0,"Position":412.0,"HyperDash":false},{"StartTime":119457.0,"Position":506.0,"HyperDash":false}]},{"StartTime":122366.0,"Objects":[{"StartTime":122366.0,"Position":312.0,"HyperDash":false},{"StartTime":122438.0,"Position":320.241058,"HyperDash":false},{"StartTime":122547.0,"Position":327.6893,"HyperDash":false}]},{"StartTime":122730.0,"Objects":[{"StartTime":122730.0,"Position":232.0,"HyperDash":false},{"StartTime":122802.0,"Position":233.241043,"HyperDash":false},{"StartTime":122911.0,"Position":247.689285,"HyperDash":false}]},{"StartTime":123275.0,"Objects":[{"StartTime":123275.0,"Position":408.0,"HyperDash":false}]},{"StartTime":123457.0,"Objects":[{"StartTime":123457.0,"Position":328.0,"HyperDash":false}]},{"StartTime":123821.0,"Objects":[{"StartTime":123821.0,"Position":168.0,"HyperDash":false},{"StartTime":123893.0,"Position":147.758957,"HyperDash":false},{"StartTime":124002.0,"Position":152.310715,"HyperDash":false}]},{"StartTime":124185.0,"Objects":[{"StartTime":124185.0,"Position":256.0,"HyperDash":false},{"StartTime":124257.0,"Position":241.758957,"HyperDash":false},{"StartTime":124366.0,"Position":240.310715,"HyperDash":false}]},{"StartTime":124730.0,"Objects":[{"StartTime":124730.0,"Position":64.0,"HyperDash":false}]},{"StartTime":124912.0,"Objects":[{"StartTime":124912.0,"Position":152.0,"HyperDash":false}]},{"StartTime":125275.0,"Objects":[{"StartTime":125275.0,"Position":336.0,"HyperDash":false},{"StartTime":125347.0,"Position":349.241058,"HyperDash":false},{"StartTime":125456.0,"Position":351.6893,"HyperDash":false}]},{"StartTime":125639.0,"Objects":[{"StartTime":125639.0,"Position":240.0,"HyperDash":false},{"StartTime":125711.0,"Position":260.241028,"HyperDash":false},{"StartTime":125820.0,"Position":255.689285,"HyperDash":false}]},{"StartTime":126185.0,"Objects":[{"StartTime":126185.0,"Position":448.0,"HyperDash":false}]},{"StartTime":126366.0,"Objects":[{"StartTime":126366.0,"Position":352.0,"HyperDash":false}]},{"StartTime":126730.0,"Objects":[{"StartTime":126730.0,"Position":144.0,"HyperDash":false},{"StartTime":126802.0,"Position":130.758957,"HyperDash":false},{"StartTime":126911.0,"Position":128.310715,"HyperDash":false}]},{"StartTime":127094.0,"Objects":[{"StartTime":127094.0,"Position":248.0,"HyperDash":false},{"StartTime":127166.0,"Position":256.758972,"HyperDash":false},{"StartTime":127275.0,"Position":232.310715,"HyperDash":false}]},{"StartTime":127457.0,"Objects":[{"StartTime":127457.0,"Position":112.0,"HyperDash":false},{"StartTime":127529.0,"Position":132.823212,"HyperDash":false},{"StartTime":127638.0,"Position":192.0,"HyperDash":false}]},{"StartTime":127821.0,"Objects":[{"StartTime":127821.0,"Position":48.0,"HyperDash":false}]},{"StartTime":128003.0,"Objects":[{"StartTime":128003.0,"Position":192.0,"HyperDash":false}]},{"StartTime":128185.0,"Objects":[{"StartTime":128185.0,"Position":368.0,"HyperDash":false}]},{"StartTime":128366.0,"Objects":[{"StartTime":128366.0,"Position":288.0,"HyperDash":false},{"StartTime":128456.0,"Position":248.0,"HyperDash":false},{"StartTime":128547.0,"Position":288.0,"HyperDash":false}]},{"StartTime":128730.0,"Objects":[{"StartTime":128730.0,"Position":368.0,"HyperDash":false}]},{"StartTime":128912.0,"Objects":[{"StartTime":128912.0,"Position":496.0,"HyperDash":false},{"StartTime":129002.0,"Position":496.0,"HyperDash":false}]},{"StartTime":129094.0,"Objects":[{"StartTime":129094.0,"Position":448.0,"HyperDash":false}]},{"StartTime":129275.0,"Objects":[{"StartTime":129275.0,"Position":368.0,"HyperDash":false}]},{"StartTime":129457.0,"Objects":[{"StartTime":129457.0,"Position":448.0,"HyperDash":false}]},{"StartTime":129639.0,"Objects":[{"StartTime":129639.0,"Position":272.0,"HyperDash":false},{"StartTime":129729.0,"Position":272.0,"HyperDash":false}]},{"StartTime":129821.0,"Objects":[{"StartTime":129821.0,"Position":320.0,"HyperDash":false}]},{"StartTime":130003.0,"Objects":[{"StartTime":130003.0,"Position":432.0,"HyperDash":false}]},{"StartTime":130094.0,"Objects":[{"StartTime":130094.0,"Position":384.0,"HyperDash":false}]},{"StartTime":130185.0,"Objects":[{"StartTime":130185.0,"Position":336.0,"HyperDash":false}]},{"StartTime":130366.0,"Objects":[{"StartTime":130366.0,"Position":448.0,"HyperDash":false},{"StartTime":130456.0,"Position":448.0,"HyperDash":false}]},{"StartTime":130548.0,"Objects":[{"StartTime":130548.0,"Position":400.0,"HyperDash":false}]},{"StartTime":130730.0,"Objects":[{"StartTime":130730.0,"Position":288.0,"HyperDash":false},{"StartTime":130802.0,"Position":307.8232,"HyperDash":false},{"StartTime":130911.0,"Position":368.0,"HyperDash":false}]},{"StartTime":131094.0,"Objects":[{"StartTime":131094.0,"Position":192.0,"HyperDash":false}]},{"StartTime":131275.0,"Objects":[{"StartTime":131275.0,"Position":112.0,"HyperDash":false},{"StartTime":131365.0,"Position":112.0,"HyperDash":false}]},{"StartTime":131457.0,"Objects":[{"StartTime":131457.0,"Position":160.0,"HyperDash":false}]},{"StartTime":131639.0,"Objects":[{"StartTime":131639.0,"Position":80.0,"HyperDash":false}]},{"StartTime":131821.0,"Objects":[{"StartTime":131821.0,"Position":192.0,"HyperDash":false},{"StartTime":131911.0,"Position":192.0,"HyperDash":false}]},{"StartTime":132003.0,"Objects":[{"StartTime":132003.0,"Position":144.0,"HyperDash":false}]},{"StartTime":132185.0,"Objects":[{"StartTime":132185.0,"Position":64.0,"HyperDash":false}]},{"StartTime":132366.0,"Objects":[{"StartTime":132366.0,"Position":144.0,"HyperDash":false}]},{"StartTime":132548.0,"Objects":[{"StartTime":132548.0,"Position":320.0,"HyperDash":false}]},{"StartTime":132730.0,"Objects":[{"StartTime":132730.0,"Position":240.0,"HyperDash":false}]},{"StartTime":132912.0,"Objects":[{"StartTime":132912.0,"Position":320.0,"HyperDash":false},{"StartTime":133002.0,"Position":360.0,"HyperDash":false},{"StartTime":133093.0,"Position":320.0,"HyperDash":false}]},{"StartTime":133275.0,"Objects":[{"StartTime":133275.0,"Position":208.0,"HyperDash":false},{"StartTime":133347.0,"Position":254.823212,"HyperDash":false},{"StartTime":133456.0,"Position":288.0,"HyperDash":false}]},{"StartTime":133639.0,"Objects":[{"StartTime":133639.0,"Position":400.0,"HyperDash":false},{"StartTime":133711.0,"Position":377.1768,"HyperDash":false},{"StartTime":133820.0,"Position":320.0,"HyperDash":false}]},{"StartTime":134003.0,"Objects":[{"StartTime":134003.0,"Position":144.0,"HyperDash":false}]},{"StartTime":134185.0,"Objects":[{"StartTime":134185.0,"Position":224.0,"HyperDash":false},{"StartTime":134275.0,"Position":264.0,"HyperDash":false},{"StartTime":134366.0,"Position":224.0,"HyperDash":false}]},{"StartTime":134548.0,"Objects":[{"StartTime":134548.0,"Position":144.0,"HyperDash":false}]},{"StartTime":134730.0,"Objects":[{"StartTime":134730.0,"Position":64.0,"HyperDash":false}]},{"StartTime":134912.0,"Objects":[{"StartTime":134912.0,"Position":144.0,"HyperDash":false},{"StartTime":135002.0,"Position":184.0,"HyperDash":false},{"StartTime":135093.0,"Position":144.0,"HyperDash":false}]},{"StartTime":135275.0,"Objects":[{"StartTime":135275.0,"Position":64.0,"HyperDash":false}]},{"StartTime":135457.0,"Objects":[{"StartTime":135457.0,"Position":240.0,"HyperDash":false},{"StartTime":135547.0,"Position":240.0,"HyperDash":false}]},{"StartTime":135639.0,"Objects":[{"StartTime":135639.0,"Position":192.0,"HyperDash":false}]},{"StartTime":135821.0,"Objects":[{"StartTime":135821.0,"Position":80.0,"HyperDash":false}]},{"StartTime":135912.0,"Objects":[{"StartTime":135912.0,"Position":128.0,"HyperDash":false}]},{"StartTime":136003.0,"Objects":[{"StartTime":136003.0,"Position":176.0,"HyperDash":false}]},{"StartTime":136185.0,"Objects":[{"StartTime":136185.0,"Position":288.0,"HyperDash":false}]},{"StartTime":136275.0,"Objects":[{"StartTime":136275.0,"Position":240.0,"HyperDash":false}]},{"StartTime":136366.0,"Objects":[{"StartTime":136366.0,"Position":192.0,"HyperDash":false}]},{"StartTime":136548.0,"Objects":[{"StartTime":136548.0,"Position":80.0,"HyperDash":false}]},{"StartTime":136730.0,"Objects":[{"StartTime":136730.0,"Position":192.0,"HyperDash":false}]},{"StartTime":136912.0,"Objects":[{"StartTime":136912.0,"Position":368.0,"HyperDash":false}]},{"StartTime":137094.0,"Objects":[{"StartTime":137094.0,"Position":448.0,"HyperDash":false},{"StartTime":137184.0,"Position":448.0,"HyperDash":false}]},{"StartTime":137275.0,"Objects":[{"StartTime":137275.0,"Position":400.0,"HyperDash":false}]},{"StartTime":137457.0,"Objects":[{"StartTime":137457.0,"Position":320.0,"HyperDash":false}]},{"StartTime":137639.0,"Objects":[{"StartTime":137639.0,"Position":432.0,"HyperDash":false},{"StartTime":137729.0,"Position":419.3509,"HyperDash":false}]},{"StartTime":137821.0,"Objects":[{"StartTime":137821.0,"Position":368.0,"HyperDash":false}]},{"StartTime":138003.0,"Objects":[{"StartTime":138003.0,"Position":288.0,"HyperDash":false}]},{"StartTime":138185.0,"Objects":[{"StartTime":138185.0,"Position":368.0,"HyperDash":false}]},{"StartTime":138366.0,"Objects":[{"StartTime":138366.0,"Position":192.0,"HyperDash":false}]},{"StartTime":138548.0,"Objects":[{"StartTime":138548.0,"Position":112.0,"HyperDash":false},{"StartTime":138638.0,"Position":104.155357,"HyperDash":false}]},{"StartTime":138821.0,"Objects":[{"StartTime":138821.0,"Position":216.0,"HyperDash":false},{"StartTime":138911.0,"Position":256.0,"HyperDash":false}]},{"StartTime":139094.0,"Objects":[{"StartTime":139094.0,"Position":144.0,"HyperDash":false}]},{"StartTime":139275.0,"Objects":[{"StartTime":139275.0,"Position":224.0,"HyperDash":false}]},{"StartTime":139457.0,"Objects":[{"StartTime":139457.0,"Position":48.0,"HyperDash":false}]},{"StartTime":139639.0,"Objects":[{"StartTime":139639.0,"Position":160.0,"HyperDash":true}]},{"StartTime":139821.0,"Objects":[{"StartTime":139821.0,"Position":416.0,"HyperDash":false}]},{"StartTime":140003.0,"Objects":[{"StartTime":140003.0,"Position":285.0,"HyperDash":false},{"StartTime":140056.0,"Position":17.0,"HyperDash":false},{"StartTime":140110.0,"Position":238.0,"HyperDash":false},{"StartTime":140164.0,"Position":222.0,"HyperDash":false},{"StartTime":140218.0,"Position":450.0,"HyperDash":false},{"StartTime":140272.0,"Position":67.0,"HyperDash":false},{"StartTime":140326.0,"Position":219.0,"HyperDash":false},{"StartTime":140380.0,"Position":307.0,"HyperDash":false},{"StartTime":140434.0,"Position":367.0,"HyperDash":false},{"StartTime":140488.0,"Position":412.0,"HyperDash":false},{"StartTime":140542.0,"Position":413.0,"HyperDash":false},{"StartTime":140596.0,"Position":143.0,"HyperDash":false},{"StartTime":140650.0,"Position":339.0,"HyperDash":false},{"StartTime":140704.0,"Position":342.0,"HyperDash":false},{"StartTime":140758.0,"Position":249.0,"HyperDash":false},{"StartTime":140812.0,"Position":235.0,"HyperDash":false},{"StartTime":140866.0,"Position":323.0,"HyperDash":false},{"StartTime":140920.0,"Position":365.0,"HyperDash":false},{"StartTime":140974.0,"Position":74.0,"HyperDash":false},{"StartTime":141028.0,"Position":281.0,"HyperDash":false},{"StartTime":141082.0,"Position":398.0,"HyperDash":false},{"StartTime":141136.0,"Position":335.0,"HyperDash":false},{"StartTime":141190.0,"Position":388.0,"HyperDash":false},{"StartTime":141244.0,"Position":228.0,"HyperDash":false},{"StartTime":141298.0,"Position":323.0,"HyperDash":false},{"StartTime":141352.0,"Position":441.0,"HyperDash":false},{"StartTime":141406.0,"Position":442.0,"HyperDash":false},{"StartTime":141460.0,"Position":278.0,"HyperDash":false},{"StartTime":141514.0,"Position":90.0,"HyperDash":false},{"StartTime":141568.0,"Position":409.0,"HyperDash":false},{"StartTime":141622.0,"Position":377.0,"HyperDash":false},{"StartTime":141676.0,"Position":457.0,"HyperDash":false},{"StartTime":141730.0,"Position":409.0,"HyperDash":false},{"StartTime":141783.0,"Position":43.0,"HyperDash":false},{"StartTime":141837.0,"Position":162.0,"HyperDash":false},{"StartTime":141891.0,"Position":341.0,"HyperDash":false},{"StartTime":141945.0,"Position":72.0,"HyperDash":false},{"StartTime":141999.0,"Position":135.0,"HyperDash":false},{"StartTime":142053.0,"Position":252.0,"HyperDash":false},{"StartTime":142107.0,"Position":446.0,"HyperDash":false},{"StartTime":142161.0,"Position":284.0,"HyperDash":false},{"StartTime":142215.0,"Position":70.0,"HyperDash":false},{"StartTime":142269.0,"Position":494.0,"HyperDash":false},{"StartTime":142323.0,"Position":463.0,"HyperDash":false},{"StartTime":142377.0,"Position":277.0,"HyperDash":false},{"StartTime":142431.0,"Position":425.0,"HyperDash":false},{"StartTime":142485.0,"Position":281.0,"HyperDash":false},{"StartTime":142539.0,"Position":3.0,"HyperDash":false},{"StartTime":142593.0,"Position":346.0,"HyperDash":false},{"StartTime":142647.0,"Position":350.0,"HyperDash":false},{"StartTime":142701.0,"Position":217.0,"HyperDash":false},{"StartTime":142755.0,"Position":455.0,"HyperDash":false},{"StartTime":142809.0,"Position":229.0,"HyperDash":false},{"StartTime":142863.0,"Position":51.0,"HyperDash":false},{"StartTime":142917.0,"Position":199.0,"HyperDash":false},{"StartTime":142971.0,"Position":208.0,"HyperDash":false},{"StartTime":143025.0,"Position":173.0,"HyperDash":false},{"StartTime":143079.0,"Position":367.0,"HyperDash":false},{"StartTime":143133.0,"Position":193.0,"HyperDash":false},{"StartTime":143187.0,"Position":488.0,"HyperDash":false},{"StartTime":143241.0,"Position":314.0,"HyperDash":false},{"StartTime":143295.0,"Position":135.0,"HyperDash":false},{"StartTime":143349.0,"Position":399.0,"HyperDash":false},{"StartTime":143403.0,"Position":404.0,"HyperDash":false},{"StartTime":143457.0,"Position":152.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3949367.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3949367.osu
new file mode 100644
index 0000000000..19fab1c61c
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/3949367.osu
@@ -0,0 +1,832 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 2
+
+[Difficulty]
+HPDrainRate:4
+CircleSize:3.5
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:1.6
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+2,49839,51798
+2,70203,75071
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Layer 4 (Overlay)
+//Storyboard Sound Samples
+
+[TimingPoints]
+185,363.636363636364,4,2,0,50,1,0
+7457,-100,4,2,0,55,0,0
+8912,-100,4,2,0,60,0,0
+10366,-100,4,2,0,65,0,0
+10730,-100,4,2,0,70,0,0
+11094,-100,4,2,0,75,0,0
+11457,-100,4,2,0,80,0,0
+11821,-100,4,1,1,80,0,0
+17821,-100,4,1,0,70,0,0
+17912,-100,4,1,1,80,0,0
+18003,-100,4,1,0,70,0,0
+18094,-100,4,1,1,80,0,0
+18366,-100,4,1,0,70,0,0
+18457,-100,4,1,1,80,0,0
+19275,-100,4,1,0,70,0,0
+19366,-100,4,1,1,80,0,0
+19457,-100,4,1,0,70,0,0
+19548,-100,4,1,1,80,0,0
+19821,-100,4,1,0,70,0,0
+19912,-100,4,1,1,80,0,0
+20639,-100,4,1,0,70,0,0
+21094,-100,4,1,1,80,0,0
+21185,-100,4,1,0,70,0,0
+21457,-100,4,1,1,80,0,0
+21548,-100,4,1,0,70,0,0
+21639,-100,4,1,1,80,0,0
+22094,-100,4,1,0,70,0,0
+22548,-100,4,1,1,80,0,0
+22639,-100,4,1,0,70,0,0
+22730,-100,4,2,0,60,0,0
+22912,-100,4,2,0,30,0,0
+23094,-100,4,2,0,60,0,0
+23276,-100,4,2,0,30,0,0
+23457,-100,4,3,1,80,0,0
+24185,-100,4,3,2,80,0,0
+24275,-100,4,3,1,80,0,0
+25275,-100,4,3,1,80,0,0
+25639,-100,4,3,2,80,0,0
+25730,-100,4,3,1,80,0,0
+26003,-100,4,3,1,80,0,0
+27094,-100,4,3,2,80,0,0
+27184,-100,4,3,1,80,0,0
+28548,-100,4,3,2,80,0,0
+28638,-100,4,3,1,80,0,0
+30003,-100,4,3,2,80,0,0
+30093,-100,4,3,1,80,0,0
+31094,-100,4,3,1,80,0,0
+31457,-100,4,3,2,80,0,0
+31548,-100,4,3,1,80,0,0
+31821,-100,4,3,1,80,0,0
+32185,-100,4,3,1,80,0,0
+32912,-100,4,3,2,80,0,0
+33002,-100,4,3,1,80,0,0
+34366,-100,4,3,2,80,0,0
+34456,-100,4,3,1,80,0,0
+35094,-100,4,3,3,90,0,1
+35821,-100,4,1,0,80,0,1
+35912,-100,4,3,3,90,0,1
+37275,-100,4,1,0,80,0,1
+37366,-100,4,3,3,90,0,1
+38730,-100,4,1,0,80,0,1
+38821,-100,4,3,3,90,0,1
+40185,-100,4,1,0,80,0,1
+40366,-100,4,3,3,90,0,1
+40457,-100,4,1,0,80,0,1
+40548,-100,4,3,3,90,0,1
+40639,-100,4,1,0,80,0,1
+40730,-100,4,3,3,90,0,1
+40821,-100,4,1,0,80,0,1
+40912,-100,4,3,3,90,0,1
+41639,-100,4,1,0,80,0,1
+41730,-100,4,3,3,90,0,1
+43093,-100,4,1,0,80,0,1
+43184,-100,4,3,3,90,0,1
+43457,-100,4,3,3,90,0,1
+43639,-100,4,3,3,90,0,1
+44548,-100,4,1,0,80,0,1
+44639,-100,4,3,3,90,0,1
+46003,-100,4,1,0,80,0,1
+46184,-100,4,3,3,90,0,1
+46275,-100,4,1,0,80,0,1
+46366,-100,4,3,3,90,0,1
+46457,-100,4,1,0,80,0,1
+46548,-100,4,3,3,90,0,1
+46639,-100,4,1,0,80,0,1
+46730,-100,4,1,2,80,0,0
+46912,-100,4,2,0,50,0,0
+51094,-100,4,2,0,55,0,0
+52548,-100,4,2,0,60,0,0
+54003,-100,4,2,0,65,0,0
+55457,-100,4,2,0,70,0,0
+56912,-100,4,2,0,75,0,0
+57639,-100,4,2,0,80,0,0
+58003,-100,4,2,0,85,0,0
+58366,-100,4,1,1,80,0,0
+58548,-100,4,2,1,60,0,0
+69275,-100,4,2,1,70,0,0
+69639,-100,4,2,1,80,0,0
+70003,-100,4,1,1,80,0,0
+70185,-100,4,2,1,50,0,0
+70548,-100,4,3,0,50,0,0
+71457,-100,4,2,1,50,0,0
+72003,-100,4,3,0,50,0,0
+72912,-100,4,2,1,60,0,0
+73457,-100,4,3,0,50,0,0
+74366,-100,4,2,1,60,0,0
+74912,-100,4,3,0,50,0,0
+75094,-100,4,2,1,60,0,0
+75275,-100,4,3,0,50,0,0
+75457,-100,4,2,1,60,0,0
+75639,-100,4,3,0,50,0,0
+75821,-100,4,2,1,70,0,0
+76003,-100,4,3,0,50,0,0
+76185,-100,4,2,1,70,0,0
+76366,-100,4,3,0,50,0,0
+76548,-100,4,2,1,70,0,0
+76730,-100,4,3,0,50,0,0
+76912,-100,4,2,1,70,0,0
+77094,-100,4,3,0,50,0,0
+77275,-100,4,2,1,70,0,0
+77457,-100,4,3,0,50,0,0
+77639,-100,4,2,1,70,0,0
+77820,-100,4,3,0,50,0,0
+78002,-100,4,2,1,70,0,0
+78184,-100,4,3,0,50,0,0
+78366,-100,4,2,1,70,0,0
+78548,-100,4,3,0,50,0,0
+78730,-100,4,2,1,75,0,0
+78912,-100,4,3,0,50,0,0
+79094,-100,4,2,1,75,0,0
+79275,-100,4,3,0,50,0,0
+79457,-100,4,2,1,75,0,0
+79639,-100,4,3,0,50,0,0
+79821,-100,4,2,1,75,0,0
+80003,-100,4,3,0,50,0,0
+80185,-100,4,2,1,75,0,0
+80367,-100,4,3,0,50,0,0
+80549,-100,4,2,1,75,0,0
+80730,-100,4,3,0,50,0,0
+80912,-100,4,2,1,80,0,0
+81094,-100,4,3,0,50,0,0
+81276,-100,4,2,1,80,0,0
+81458,-100,4,3,0,50,0,0
+81639,-100,4,1,1,80,0,0
+87639,-100,4,1,0,70,0,0
+87730,-100,4,1,1,80,0,0
+87821,-100,4,1,0,70,0,0
+87912,-100,4,1,1,80,0,0
+88184,-100,4,1,0,70,0,0
+88275,-100,4,1,1,80,0,0
+89093,-100,4,1,0,70,0,0
+89184,-100,4,1,1,80,0,0
+89275,-100,4,1,0,70,0,0
+89366,-100,4,1,1,80,0,0
+89639,-100,4,1,0,70,0,0
+89730,-100,4,1,1,80,0,0
+90457,-100,4,1,0,70,0,0
+90912,-100,4,1,1,80,0,0
+91003,-100,4,1,0,70,0,0
+91275,-100,4,1,1,80,0,0
+91366,-100,4,1,0,70,0,0
+91457,-100,4,1,1,80,0,0
+91912,-100,4,1,0,70,0,0
+92366,-100,4,1,1,80,0,0
+92457,-100,4,1,0,70,0,0
+92548,-100,4,2,0,60,0,0
+92594,-100,4,2,0,30,0,0
+92730,-100,4,2,0,60,0,0
+92776,-100,4,2,0,30,0,0
+92912,-100,4,2,0,60,0,0
+92958,-100,4,2,0,30,0,0
+93094,-100,4,2,0,60,0,0
+93140,-100,4,2,0,30,0,0
+93275,-100,4,3,1,80,0,0
+94003,-100,4,3,2,80,0,0
+94093,-100,4,3,1,80,0,0
+95094,-100,4,3,1,80,0,0
+95457,-100,4,3,2,80,0,0
+95548,-100,4,3,1,80,0,0
+95821,-100,4,3,1,80,0,0
+96912,-100,4,3,2,80,0,0
+97002,-100,4,3,1,80,0,0
+98366,-80,4,3,2,80,0,0
+98456,-80,4,3,1,80,0,0
+99094,-100,4,3,1,80,0,0
+99821,-100,4,3,2,80,0,0
+99911,-100,4,3,1,80,0,0
+100912,-100,4,3,1,80,0,0
+101275,-100,4,3,2,80,0,0
+101366,-100,4,3,1,80,0,0
+101639,-100,4,3,1,80,0,0
+102003,-100,4,3,1,80,0,0
+102730,-100,4,3,2,80,0,0
+102820,-100,4,3,1,80,0,0
+104184,-100,4,3,2,80,0,0
+104274,-100,4,3,1,80,0,0
+104912,-100,4,3,3,90,0,1
+105639,-100,4,1,0,80,0,1
+105730,-100,4,3,3,90,0,1
+107093,-100,4,1,0,80,0,1
+107184,-100,4,3,3,90,0,1
+108548,-100,4,1,0,80,0,1
+108639,-100,4,3,3,90,0,1
+110003,-100,4,1,0,80,0,1
+110184,-100,4,3,3,90,0,1
+110275,-100,4,1,0,80,0,1
+110366,-100,4,3,3,90,0,1
+110457,-100,4,1,0,80,0,1
+110548,-100,4,3,3,90,0,1
+110639,-100,4,1,0,80,0,1
+110730,-100,4,3,3,90,0,1
+111457,-100,4,1,0,80,0,1
+111548,-100,4,3,3,90,0,1
+112911,-100,4,1,0,80,0,1
+113002,-100,4,3,3,90,0,1
+113275,-100,4,3,3,90,0,1
+113457,-100,4,3,3,90,0,1
+114366,-100,4,1,0,80,0,1
+114457,-100,4,3,3,90,0,1
+115821,-100,4,1,0,80,0,1
+116002,-100,4,3,3,90,0,1
+116093,-100,4,1,0,80,0,1
+116184,-100,4,3,3,90,0,1
+116275,-100,4,1,0,80,0,1
+116366,-100,4,3,3,90,0,1
+116457,-100,4,1,0,80,0,1
+116548,-100,4,1,2,80,0,0
+116730,-100,4,2,0,50,0,0
+120912,-100,4,2,0,55,0,0
+122366,-100,4,2,0,60,0,0
+123821,-100,4,2,0,65,0,0
+125275,-100,4,2,0,70,0,0
+126730,-100,4,2,0,75,0,0
+127457,-100,4,2,0,80,0,0
+127821,-100,4,2,0,85,0,0
+128184,-100,4,1,1,80,0,0
+128366,-100,4,2,1,60,0,0
+139093,-100,4,2,1,70,0,0
+139457,-100,4,2,1,80,0,0
+139821,-100,4,1,1,80,0,0
+140003,-100,4,2,1,50,0,0
+140548,-100,4,2,1,45,0,0
+140912,-100,4,2,1,40,0,0
+141275,-100,4,2,1,35,0,0
+141639,-100,4,2,1,30,0,0
+142003,-100,4,2,1,25,0,0
+142366,-100,4,2,1,20,0,0
+142730,-100,4,2,1,15,0,0
+143094,-100,4,2,1,10,0,0
+143457,-100,4,2,1,5,0,0
+
+[HitObjects]
+64,192,6003,5,2,0:0:0:0:
+192,192,6366,1,0,0:0:0:0:
+64,192,6730,1,2,0:0:0:0:
+192,192,7094,1,0,0:0:0:0:
+320,192,7457,5,2,0:0:0:0:
+192,192,7821,1,0,0:0:0:0:
+320,192,8185,1,2,0:0:0:0:
+192,192,8548,1,0,0:0:0:0:
+320,192,8912,5,2,0:0:0:0:
+448,192,9275,1,0,0:0:0:0:
+320,192,9639,1,2,0:0:0:0:
+448,192,10003,1,0,0:0:0:0:
+256,192,10366,12,2,11457,0:0:0:0:
+96,192,11821,5,14,0:0:0:0:
+176,192,12003,2,0,L|208:160,2,40
+64,192,12366,1,2,0:0:0:0:
+224,192,12730,2,0,L|252:220,2,40,2|0|2,0:0|0:0|0:0,0:0:0:0:
+144,192,13094,1,2,0:0:0:0:
+320,192,13275,5,10,0:0:0:0:
+368,192,13366,1,0,0:0:0:0:
+320,192,13457,1,0,0:0:0:0:
+208,192,13639,1,0,0:0:0:0:
+160,192,13730,2,0,L|160:144,1,40,0|2,0:0|0:0,0:0:0:0:
+240,112,14003,1,0,0:0:0:0:
+128,112,14185,1,2,0:0:0:0:
+208,112,14366,2,0,L|208:160,1,40,2|0,0:0|0:0,0:0:0:0:
+160,192,14548,1,2,0:0:0:0:
+336,192,14730,5,10,0:0:0:0:
+256,192,14912,2,0,L|224:224,2,40,0|0|0,0:0|0:0|0:0,0:0:0:0:
+368,192,15275,1,2,0:0:0:0:
+208,192,15639,2,0,L|180:164,2,40,2|0|2,0:0|0:0|0:0,0:0:0:0:
+288,192,16003,1,2,0:0:0:0:
+112,192,16185,5,10,0:0:0:0:
+64,192,16275,1,0,0:0:0:0:
+112,192,16366,1,0,0:0:0:0:
+224,192,16548,1,0,0:0:0:0:
+272,192,16639,2,0,L|272:240,1,40,0|2,0:0|0:0,0:0:0:0:
+160,192,16912,1,0,0:0:0:0:
+208,192,17003,1,0,0:0:0:0:
+256,192,17094,1,2,0:0:0:0:
+144,112,17275,1,2,0:0:0:0:
+80,112,17366,1,0,0:0:0:0:
+144,112,17457,1,2,0:0:0:0:
+320,112,17639,5,10,0:0:0:0:
+400,112,17821,1,0,0:0:0:0:
+352,112,17912,1,0,0:0:0:0:
+304,112,18003,1,0,0:0:0:0:
+416,112,18185,2,0,B|432:192|432:192|352:192,1,160,2|2,0:0|0:0,0:0:0:0:
+400,192,18639,1,0,0:0:0:0:
+448,192,18730,1,2,0:0:0:0:
+368,192,18912,1,2,0:0:0:0:
+192,192,19094,5,10,0:0:0:0:
+144,192,19185,1,0,0:0:0:0:
+192,192,19275,1,0,0:0:0:0:
+304,192,19457,1,0,0:0:0:0:
+352,192,19548,2,0,L|352:240,1,40,0|2,0:0|0:0,0:0:0:0:
+272,272,19821,1,0,0:0:0:0:
+384,272,20003,1,2,0:0:0:0:
+304,272,20185,2,0,L|304:224,1,40,2|0,0:0|0:0,0:0:0:0:
+352,192,20366,1,2,0:0:0:0:
+176,272,20548,5,10,0:0:0:0:
+96,272,20730,1,0,0:0:0:0:
+144,272,20821,1,0,0:0:0:0:
+192,272,20912,1,0,0:0:0:0:
+80,272,21094,2,0,B|64:192|64:192|144:192,1,160,2|2,0:0|0:0,0:0:0:0:
+96,192,21548,1,0,0:0:0:0:
+48,192,21639,1,2,0:0:0:0:
+128,192,21821,1,2,0:0:0:0:
+304,192,22003,5,10,0:0:0:0:
+352,192,22094,1,0,0:0:0:0:
+304,192,22185,1,0,0:0:0:0:
+192,192,22366,1,0,0:0:0:0:
+144,192,22457,2,0,L|144:144,1,40,0|2,0:0|0:0,0:0:0:0:
+224,80,22730,6,0,B|144:80|144:80|224:80|224:80|144:80,1,240,2|2,0:0|0:0,0:0:0:0:
+400,80,23457,5,12,0:0:0:0:
+480,80,23639,2,0,L|480:128,1,40,2|0,0:0|0:0,0:0:0:0:
+432,144,23821,1,2,0:0:0:0:
+320,144,24003,1,8,0:0:0:0:
+64,192,24185,2,0,L|48:112,1,80,10|2,0:0|0:0,0:0:0:0:
+96,96,24457,1,0,0:0:0:0:
+144,80,24548,1,0,0:0:0:0:
+64,80,24730,1,2,0:0:0:0:
+240,80,24912,5,8,0:0:0:0:
+320,80,25094,2,0,L|368:80,2,40,2|0|2,0:0|0:0|0:0,0:0:0:0:
+208,80,25457,1,8,0:0:0:0:
+464,192,25639,2,0,L|448:112,1,80,8|2,0:0|2:0,0:0:0:0:
+336,192,26003,2,0,L|320:112,1,80,2|2,0:0|2:0,0:0:0:0:
+496,48,26366,5,8,0:0:0:0:
+416,48,26548,2,0,L|416:96,1,40,2|0,0:0|0:0,0:0:0:0:
+464,128,26730,1,2,0:0:0:0:
+352,128,26912,1,8,0:0:0:0:
+96,128,27094,2,0,L|80:48,1,80,10|2,0:0|0:0,0:0:0:0:
+192,48,27457,1,0,0:0:0:0:
+240,48,27548,2,0,L|240:96,1,40,0|2,0:0|0:0,0:0:0:0:
+64,192,27821,5,8,0:0:0:0:
+176,192,28003,1,2,0:0:0:0:
+64,192,28185,1,2,0:0:0:0:
+16,192,28275,2,0,L|16:144,1,40,0|8,0:0|0:0,0:0:0:0:
+272,192,28548,2,0,L|352:192,1,80,10|10,0:0|0:0,0:0:0:0:
+240,128,28912,2,0,L|160:128,1,80,8|10,0:0|0:0,0:0:0:0:
+416,128,29275,5,12,0:0:0:0:
+496,128,29457,2,0,L|496:80,1,40,2|0,0:0|0:0,0:0:0:0:
+448,64,29639,1,2,0:0:0:0:
+336,64,29821,1,8,0:0:0:0:
+80,192,30003,2,0,L|32:128,1,80,10|2,0:0|0:0,0:0:0:0:
+32,80,30275,1,0,0:0:0:0:
+64,80,30366,1,0,0:0:0:0:
+144,80,30548,1,2,0:0:0:0:
+320,80,30730,5,8,0:0:0:0:
+240,80,30912,2,0,L|192:80,2,40,2|0|2,0:0|0:0|0:0,0:0:0:0:
+352,80,31275,1,8,0:0:0:0:
+96,192,31457,2,0,L|80:112,1,80,8|2,0:0|2:0,0:0:0:0:
+192,112,31821,1,2,0:0:0:0:
+80,112,32003,1,2,2:0:0:0:
+256,112,32185,5,8,0:0:0:0:
+336,112,32366,2,0,L|336:160,1,40,2|0,0:0|0:0,0:0:0:0:
+288,192,32548,1,2,0:0:0:0:
+400,192,32730,1,8,0:0:0:0:
+144,192,32912,2,0,L|128:112,1,80,10|2,0:0|0:0,0:0:0:0:
+240,112,33275,1,0,0:0:0:0:
+288,112,33366,1,0,0:0:0:0:
+240,112,33457,1,2,0:0:0:0:
+128,192,33639,5,8,0:0:0:0:
+240,192,33821,1,2,0:0:0:0:
+128,192,34003,1,2,0:0:0:0:
+80,192,34094,2,0,L|80:144,1,40,0|8,0:0|0:0,0:0:0:0:
+336,192,34366,2,0,L|416:192,1,80,10|0,0:0|0:0,0:0:0:0:
+240,128,34730,2,0,L|160:128,1,80,10|0,0:0|0:0,0:0:0:0:
+432,128,35094,6,0,L|432:80,1,40,12|0,0:0|0:0,0:0:0:0:
+384,64,35275,1,2,0:0:0:0:
+208,64,35457,2,0,L|128:64,1,80,8|0,0:0|0:0,0:0:0:0:
+384,192,35821,1,8,0:0:0:0:
+464,128,36003,1,2,0:0:0:0:
+384,128,36094,1,2,0:0:0:0:
+336,128,36185,1,8,0:0:0:0:
+448,128,36366,1,2,0:0:0:0:
+192,128,36548,6,0,L|144:128,2,40,8|0|2,0:0|0:0|0:0,0:0:0:0:
+368,128,36912,1,8,0:0:0:0:
+416,144,37003,2,0,L|416:192,1,40,0|2,0:0|0:0,0:0:0:0:
+160,192,37275,2,0,L|144:112,1,80,8|2,0:0|0:0,0:0:0:0:
+192,80,37548,1,2,0:0:0:0:
+272,80,37639,1,8,0:0:0:0:
+160,80,37821,1,2,0:0:0:0:
+416,192,38003,5,8,0:0:0:0:
+496,192,38185,2,0,L|496:144,1,40,2|0,0:0|0:0,0:0:0:0:
+416,144,38366,1,8,0:0:0:0:
+496,144,38548,1,0,0:0:0:0:
+240,144,38730,1,8,0:0:0:0:
+192,144,38821,1,0,0:0:0:0:
+240,144,38912,1,2,0:0:0:0:
+352,144,39094,2,0,L|272:144,1,80,8|2,0:0|0:0,0:0:0:0:
+16,192,39457,6,0,L|16:144,1,40,8|0,0:0|0:0,0:0:0:0:
+64,128,39639,1,2,0:0:0:0:
+240,176,39821,2,0,L|208:144,1,40,8|0,0:0|0:0,0:0:0:0:
+160,128,40003,1,2,0:0:0:0:
+416,128,40185,1,8,0:0:0:0:
+464,128,40275,1,0,0:0:0:0:
+416,128,40366,1,2,0:0:0:0:
+240,128,40548,1,8,0:0:0:0:
+288,128,40639,1,0,0:0:0:0:
+336,128,40730,1,2,0:0:0:0:
+64,128,40912,6,0,L|64:80,1,40,12|0,0:0|0:0,0:0:0:0:
+112,64,41094,1,2,0:0:0:0:
+288,64,41275,2,0,L|368:64,1,80,8|0,0:0|0:0,0:0:0:0:
+112,192,41639,1,8,0:0:0:0:
+32,128,41821,1,2,0:0:0:0:
+112,128,41912,1,2,0:0:0:0:
+160,128,42003,1,8,0:0:0:0:
+48,128,42185,1,2,0:0:0:0:
+304,192,42366,6,0,L|384:192,1,80,8|2,0:0|0:0,0:0:0:0:
+208,96,42730,2,0,L|128:96,1,80,8|2,0:0|0:0,0:0:0:0:
+384,192,43094,2,0,L|400:272,1,80,8|2,0:0|0:0,0:0:0:0:
+352,304,43366,1,2,0:0:0:0:
+272,304,43457,1,8,0:0:0:0:
+384,304,43639,1,2,0:0:0:0:
+128,192,43821,5,8,0:0:0:0:
+48,192,44003,2,0,L|48:144,1,40,2|0,0:0|0:0,0:0:0:0:
+128,144,44185,1,8,0:0:0:0:
+48,144,44366,1,2,0:0:0:0:
+304,144,44548,1,8,0:0:0:0:
+384,144,44730,1,2,0:0:0:0:
+336,144,44821,1,0,0:0:0:0:
+256,144,44912,1,8,0:0:0:0:
+368,144,45094,1,2,0:0:0:0:
+112,256,45275,5,8,0:0:0:0:
+64,256,45366,1,0,0:0:0:0:
+112,256,45457,1,2,0:0:0:0:
+288,256,45639,1,8,0:0:0:0:
+336,224,45730,2,0,L|336:176,1,40,0|2,0:0|0:0,0:0:0:0:
+80,192,46003,2,0,L|80:152,1,40,8|0,0:0|0:0,0:0:0:0:
+128,120,46185,1,2,0:0:0:0:
+304,128,46366,1,8,0:0:0:0:
+256,128,46457,1,0,0:0:0:0:
+208,128,46548,1,2,0:0:0:0:
+464,192,46730,5,12,0:0:0:0:
+256,192,46912,12,2,49639,0:0:0:0:
+200,192,52548,6,0,L|184:112,1,80,2|0,0:0|0:0,0:0:0:0:
+280,192,52912,2,0,L|264:112,1,80,2|0,0:0|0:0,0:0:0:0:
+104,112,53457,1,2,0:0:0:0:
+184,113,53639,1,2,0:0:0:0:
+344,192,54003,6,0,L|360:112,1,80,2|0,0:0|0:0,0:0:0:0:
+256,192,54366,2,0,L|272:112,1,80,2|0,0:0|0:0,0:0:0:0:
+448,112,54912,1,0,0:0:0:0:
+360,112,55094,1,2,0:0:0:0:
+176,192,55457,6,0,L|160:112,1,80,2|0,0:0|0:0,0:0:0:0:
+272,192,55821,2,0,L|256:112,1,80,2|0,0:0|0:0,0:0:0:0:
+64,112,56366,1,2,0:0:0:0:
+160,112,56548,1,2,0:0:0:0:
+368,192,56912,6,0,L|384:112,1,80,2|0,0:0|0:0,0:0:0:0:
+264,192,57275,2,0,L|280:112,1,80,2|0,0:0|0:0,0:0:0:0:
+400,112,57639,2,0,L|320:112,1,80,2|2,0:0|0:0,0:0:0:0:
+464,112,58003,1,2,0:0:0:0:
+320,112,58185,1,2,0:0:0:0:
+144,112,58366,5,12,0:0:0:0:
+224,112,58548,2,0,L|272:112,2,40,2|0|8,0:0|0:0|0:0,0:0:0:0:
+144,112,58912,1,2,0:0:0:0:
+16,192,59094,2,0,L|16:144,1,40,2|0,3:0|0:0,0:0:0:0:
+64,112,59275,1,2,0:0:0:0:
+144,112,59457,1,8,0:0:0:0:
+64,112,59639,1,2,0:0:0:0:
+240,192,59821,6,0,L|240:144,1,40,2|0,3:0|0:0,0:0:0:0:
+192,128,60003,1,2,0:0:0:0:
+80,192,60185,1,8,0:0:0:0:
+128,192,60275,1,0,0:0:0:0:
+176,192,60366,1,2,0:0:0:0:
+64,192,60548,2,0,L|64:144,1,40,2|0,3:0|0:0,0:0:0:0:
+112,128,60730,1,2,0:0:0:0:
+224,128,60912,2,0,L|144:128,1,80,10|10,0:0|0:0,0:0:0:0:
+320,128,61275,5,2,3:0:0:0:
+400,128,61457,2,0,L|400:176,1,40,2|0,0:0|0:0,0:0:0:0:
+352,192,61639,1,8,0:0:0:0:
+432,192,61821,1,2,0:0:0:0:
+320,192,62003,2,0,L|320:240,1,40,2|0,3:0|0:0,0:0:0:0:
+368,272,62185,1,2,0:0:0:0:
+448,272,62366,1,8,0:0:0:0:
+368,272,62548,1,2,0:0:0:0:
+192,272,62730,5,2,3:0:0:0:
+272,272,62912,1,2,0:0:0:0:
+192,272,63094,2,0,L|144:272,2,40,8|0|2,0:0|0:0|0:0,0:0:0:0:
+304,192,63457,2,0,L|224:192,1,80,2|2,3:0|0:0,0:0:0:0:
+112,112,63821,2,0,L|192:112,1,80,10|10,0:0|0:0,0:0:0:0:
+368,112,64185,5,2,3:0:0:0:
+288,112,64366,2,0,L|240:112,2,40,2|0|8,0:0|0:0|0:0,0:0:0:0:
+368,112,64730,1,2,0:0:0:0:
+448,192,64912,1,2,3:0:0:0:
+368,192,65094,2,0,L|320:192,2,40,2|0|8,0:0|0:0|0:0,0:0:0:0:
+448,192,65457,1,2,0:0:0:0:
+272,192,65639,6,0,L|272:240,1,40,2|0,3:0|0:0,0:0:0:0:
+320,256,65821,1,2,0:0:0:0:
+432,192,66003,1,8,0:0:0:0:
+384,192,66094,1,0,0:0:0:0:
+336,192,66185,1,2,0:0:0:0:
+224,112,66366,1,2,3:0:0:0:
+272,112,66457,1,0,0:0:0:0:
+320,112,66548,1,2,0:0:0:0:
+432,112,66730,1,10,0:0:0:0:
+320,112,66912,1,10,0:0:0:0:
+144,112,67094,5,2,3:0:0:0:
+64,112,67275,2,0,L|64:160,1,40,2|0,0:0|0:0,0:0:0:0:
+112,176,67457,1,8,0:0:0:0:
+192,176,67639,1,2,0:0:0:0:
+80,176,67821,2,0,L|96:224,1,40,2|0,3:0|0:0,0:0:0:0:
+144,256,68003,1,2,0:0:0:0:
+224,256,68185,1,8,0:0:0:0:
+144,256,68366,1,2,0:0:0:0:
+320,192,68548,5,2,3:0:0:0:
+400,112,68730,2,0,L|408:72,1,40,8|2,0:0|0:0,0:0:0:0:
+296,64,69003,2,0,L|256:64,1,40,2|10,0:0|0:0,0:0:0:0:
+368,192,69275,1,2,3:0:0:0:
+256,192,69457,1,10,0:0:0:0:
+80,192,69639,1,10,0:0:0:0:
+192,192,69821,1,10,0:0:0:0:
+448,192,70003,5,12,0:0:0:0:
+160,192,75821,6,0,L|80:192,1,80,10|0,0:0|0:0,0:0:0:0:
+160,112,76185,2,0,L|80:112,1,80,10|0,0:0|0:0,0:0:0:0:
+160,112,76548,1,2,0:0:0:0:
+240,112,76730,1,0,0:0:0:0:
+240,112,76912,1,2,0:0:0:0:
+240,112,77094,1,0,0:0:0:0:
+368,192,77275,6,0,L|448:192,1,80,10|0,0:0|0:0,0:0:0:0:
+368,112,77639,2,0,L|448:112,1,80,10|0,0:0|0:0,0:0:0:0:
+352,112,78003,1,2,0:0:0:0:
+256,112,78185,1,0,0:0:0:0:
+256,208,78366,1,2,0:0:0:0:
+352,208,78548,1,0,0:0:0:0:
+176,192,78730,6,0,L|96:192,1,80,10|0,0:0|0:0,0:0:0:0:
+176,112,79094,2,0,L|96:112,1,80,10|0,0:0|0:0,0:0:0:0:
+192,112,79457,1,2,0:0:0:0:
+288,112,79639,1,0,0:0:0:0:
+192,208,79821,1,2,0:0:0:0:
+288,208,80003,1,0,0:0:0:0:
+256,192,80185,12,10,81275,0:0:0:0:
+416,192,81639,5,14,0:0:0:0:
+336,192,81821,2,0,L|304:160,2,40
+448,192,82185,1,2,0:0:0:0:
+288,192,82548,2,0,L|260:220,2,40,2|0|2,0:0|0:0|0:0,0:0:0:0:
+368,192,82912,1,2,0:0:0:0:
+192,192,83094,5,10,0:0:0:0:
+144,192,83185,1,0,0:0:0:0:
+192,192,83275,1,0,0:0:0:0:
+304,192,83457,1,0,0:0:0:0:
+352,192,83548,2,0,L|352:144,1,40,0|2,0:0|0:0,0:0:0:0:
+272,112,83821,1,0,0:0:0:0:
+384,112,84003,1,2,0:0:0:0:
+304,112,84185,2,0,L|304:160,1,40,2|0,0:0|0:0,0:0:0:0:
+352,192,84366,1,2,0:0:0:0:
+176,192,84548,5,10,0:0:0:0:
+256,192,84730,2,0,L|288:224,2,40,0|0|0,0:0|0:0|0:0,0:0:0:0:
+144,192,85094,1,2,0:0:0:0:
+304,192,85457,2,0,L|332:164,2,40,2|0|2,0:0|0:0|0:0,0:0:0:0:
+224,192,85821,1,2,0:0:0:0:
+400,192,86003,5,10,0:0:0:0:
+448,192,86094,1,0,0:0:0:0:
+400,192,86185,1,0,0:0:0:0:
+288,192,86366,1,0,0:0:0:0:
+240,192,86457,2,0,L|240:240,1,40,0|2,0:0|0:0,0:0:0:0:
+352,192,86730,1,0,0:0:0:0:
+304,192,86821,1,0,0:0:0:0:
+256,192,86912,1,2,0:0:0:0:
+368,112,87094,1,2,0:0:0:0:
+432,112,87185,1,0,0:0:0:0:
+368,112,87275,1,2,0:0:0:0:
+192,112,87457,5,10,0:0:0:0:
+112,112,87639,1,0,0:0:0:0:
+160,112,87730,1,0,0:0:0:0:
+208,112,87821,1,0,0:0:0:0:
+96,112,88003,2,0,B|80:192|80:192|160:192,1,160,2|2,0:0|0:0,0:0:0:0:
+112,192,88457,1,0,0:0:0:0:
+64,192,88548,1,2,0:0:0:0:
+144,192,88730,1,2,0:0:0:0:
+320,192,88912,5,10,0:0:0:0:
+368,192,89003,1,0,0:0:0:0:
+320,192,89094,1,0,0:0:0:0:
+208,192,89275,1,0,0:0:0:0:
+160,192,89366,2,0,L|160:240,1,40,0|2,0:0|0:0,0:0:0:0:
+240,272,89639,1,0,0:0:0:0:
+128,272,89821,1,2,0:0:0:0:
+208,272,90003,2,0,L|208:224,1,40,2|0,0:0|0:0,0:0:0:0:
+160,192,90185,1,2,0:0:0:0:
+336,272,90366,5,10,0:0:0:0:
+416,272,90548,1,0,0:0:0:0:
+368,272,90639,1,0,0:0:0:0:
+320,272,90730,1,0,0:0:0:0:
+432,272,90912,2,0,B|448:192|448:192|368:192,1,160,2|2,0:0|0:0,0:0:0:0:
+416,192,91366,1,0,0:0:0:0:
+464,192,91457,1,2,0:0:0:0:
+384,192,91639,1,2,0:0:0:0:
+208,192,91821,5,10,0:0:0:0:
+160,192,91912,1,0,0:0:0:0:
+208,192,92003,1,0,0:0:0:0:
+320,192,92185,1,0,0:0:0:0:
+368,192,92275,2,0,L|368:144,1,40,0|2,0:0|0:0,0:0:0:0:
+288,80,92548,6,0,B|208:80|208:80|288:80|288:80|368:80,1,240,2|2,0:0|0:0,0:0:0:0:
+112,80,93275,5,12,0:0:0:0:
+32,80,93457,2,0,L|32:128,1,40,2|0,0:0|0:0,0:0:0:0:
+80,144,93639,1,2,0:0:0:0:
+192,144,93821,1,8,0:0:0:0:
+448,192,94003,2,0,L|464:112,1,80,10|2,0:0|0:0,0:0:0:0:
+416,96,94275,1,0,0:0:0:0:
+368,80,94366,1,0,0:0:0:0:
+448,80,94548,1,2,0:0:0:0:
+272,80,94730,5,8,0:0:0:0:
+192,80,94912,2,0,L|144:80,2,40,2|0|2,0:0|0:0|0:0,0:0:0:0:
+304,80,95275,1,8,0:0:0:0:
+48,192,95457,2,0,L|64:112,1,80,8|2,0:0|2:0,0:0:0:0:
+176,192,95821,2,0,L|192:112,1,80,2|2,0:0|2:0,0:0:0:0:
+16,48,96185,5,8,0:0:0:0:
+96,48,96366,2,0,L|96:96,1,40,2|0,0:0|0:0,0:0:0:0:
+48,128,96548,1,2,0:0:0:0:
+160,128,96730,1,8,0:0:0:0:
+416,128,96912,2,0,L|432:48,1,80,10|2,0:0|0:0,0:0:0:0:
+320,48,97275,1,0,0:0:0:0:
+272,48,97366,2,0,L|272:96,1,40,0|2,0:0|0:0,0:0:0:0:
+448,192,97639,5,8,0:0:0:0:
+336,192,97821,1,2,0:0:0:0:
+448,192,98003,1,2,0:0:0:0:
+496,192,98094,2,0,L|496:144,1,40,0|8,0:0|0:0,0:0:0:0:
+240,192,98366,2,0,L|128:192,1,100,10|10,0:0|0:0,0:0:0:0:
+240,128,98730,2,0,L|352:128,1,100,8|10,0:0|0:0,0:0:0:0:
+96,128,99094,5,12,0:0:0:0:
+16,128,99275,2,0,L|16:80,1,40,2|0,0:0|0:0,0:0:0:0:
+64,64,99457,1,2,0:0:0:0:
+176,64,99639,1,8,0:0:0:0:
+432,192,99821,2,0,L|480:128,1,80,10|2,0:0|0:0,0:0:0:0:
+480,80,100094,1,0,0:0:0:0:
+448,80,100185,1,0,0:0:0:0:
+368,80,100366,1,2,0:0:0:0:
+192,80,100548,5,8,0:0:0:0:
+272,80,100730,2,0,L|320:80,2,40,2|0|2,0:0|0:0|0:0,0:0:0:0:
+160,80,101094,1,8,0:0:0:0:
+416,192,101275,2,0,L|432:112,1,80,8|2,0:0|2:0,0:0:0:0:
+320,112,101639,1,2,0:0:0:0:
+432,112,101821,1,2,2:0:0:0:
+256,112,102003,5,8,0:0:0:0:
+176,112,102185,2,0,L|176:160,1,40,2|0,0:0|0:0,0:0:0:0:
+224,192,102366,1,2,0:0:0:0:
+112,192,102548,1,8,0:0:0:0:
+368,192,102730,2,0,L|384:112,1,80,10|2,0:0|0:0,0:0:0:0:
+272,112,103094,1,0,0:0:0:0:
+224,112,103185,1,0,0:0:0:0:
+272,112,103275,1,2,0:0:0:0:
+384,192,103457,5,8,0:0:0:0:
+272,192,103639,1,2,0:0:0:0:
+384,192,103821,1,2,0:0:0:0:
+432,192,103912,2,0,L|432:144,1,40,0|8,0:0|0:0,0:0:0:0:
+176,192,104185,2,0,L|96:192,1,80,10|0,0:0|0:0,0:0:0:0:
+272,128,104548,2,0,L|352:128,1,80,10|0,0:0|0:0,0:0:0:0:
+80,128,104912,6,0,L|80:80,1,40,12|0,0:0|0:0,0:0:0:0:
+128,64,105094,1,2,0:0:0:0:
+304,64,105275,2,0,L|384:64,1,80,8|0,0:0|0:0,0:0:0:0:
+128,192,105639,1,8,0:0:0:0:
+48,128,105821,1,2,0:0:0:0:
+128,128,105912,1,2,0:0:0:0:
+176,128,106003,1,8,0:0:0:0:
+64,128,106185,1,2,0:0:0:0:
+320,128,106366,6,0,L|368:128,2,40,8|0|2,0:0|0:0|0:0,0:0:0:0:
+144,128,106730,1,8,0:0:0:0:
+96,144,106821,2,0,L|96:192,1,40,0|2,0:0|0:0,0:0:0:0:
+352,192,107094,2,0,L|368:112,1,80,8|2,0:0|0:0,0:0:0:0:
+320,80,107366,1,2,0:0:0:0:
+240,80,107457,1,8,0:0:0:0:
+352,80,107639,1,2,0:0:0:0:
+96,192,107821,5,8,0:0:0:0:
+16,192,108003,2,0,L|16:144,1,40,2|0,0:0|0:0,0:0:0:0:
+96,144,108185,1,8,0:0:0:0:
+16,144,108366,1,0,0:0:0:0:
+272,144,108548,1,8,0:0:0:0:
+320,144,108639,1,0,0:0:0:0:
+272,144,108730,1,2,0:0:0:0:
+160,144,108912,2,0,L|240:144,1,80,8|2,0:0|0:0,0:0:0:0:
+496,192,109275,6,0,L|496:144,1,40,8|0,0:0|0:0,0:0:0:0:
+448,128,109457,1,2,0:0:0:0:
+272,176,109639,2,0,L|304:144,1,40,8|0,0:0|0:0,0:0:0:0:
+352,128,109821,1,2,0:0:0:0:
+96,128,110003,1,8,0:0:0:0:
+48,128,110094,1,0,0:0:0:0:
+96,128,110185,1,2,0:0:0:0:
+272,128,110366,1,8,0:0:0:0:
+224,128,110457,1,0,0:0:0:0:
+176,128,110548,1,2,0:0:0:0:
+448,128,110730,6,0,L|448:80,1,40,12|0,0:0|0:0,0:0:0:0:
+400,64,110912,1,2,0:0:0:0:
+224,64,111094,2,0,L|144:64,1,80,8|0,0:0|0:0,0:0:0:0:
+400,192,111457,1,8,0:0:0:0:
+480,128,111639,1,2,0:0:0:0:
+400,128,111730,1,2,0:0:0:0:
+352,128,111821,1,8,0:0:0:0:
+464,128,112003,1,2,0:0:0:0:
+208,192,112185,6,0,L|128:192,1,80,8|2,0:0|0:0,0:0:0:0:
+304,96,112548,2,0,L|384:96,1,80,8|2,0:0|0:0,0:0:0:0:
+128,192,112912,2,0,L|112:272,1,80,8|2,0:0|0:0,0:0:0:0:
+160,304,113185,1,2,0:0:0:0:
+240,304,113275,1,8,0:0:0:0:
+128,304,113457,1,2,0:0:0:0:
+384,192,113639,5,8,0:0:0:0:
+464,192,113821,2,0,L|464:144,1,40,2|0,0:0|0:0,0:0:0:0:
+384,144,114003,1,8,0:0:0:0:
+464,144,114185,1,2,0:0:0:0:
+208,144,114366,1,8,0:0:0:0:
+128,144,114548,1,2,0:0:0:0:
+176,144,114639,1,0,0:0:0:0:
+256,144,114730,1,8,0:0:0:0:
+144,144,114912,1,2,0:0:0:0:
+400,256,115094,5,8,0:0:0:0:
+448,256,115185,1,0,0:0:0:0:
+400,256,115275,1,2,0:0:0:0:
+224,256,115457,1,8,0:0:0:0:
+176,224,115548,2,0,L|176:176,1,40,0|2,0:0|0:0,0:0:0:0:
+432,192,115821,2,0,L|432:152,1,40,8|0,0:0|0:0,0:0:0:0:
+384,120,116003,1,2,0:0:0:0:
+208,128,116185,1,8,0:0:0:0:
+256,128,116275,1,0,0:0:0:0:
+304,128,116366,1,2,0:0:0:0:
+48,192,116548,5,12,0:0:0:0:
+256,192,116730,12,2,119457,0:0:0:0:
+312,192,122366,6,0,L|328:112,1,80,2|0,0:0|0:0,0:0:0:0:
+232,192,122730,2,0,L|248:112,1,80,2|0,0:0|0:0,0:0:0:0:
+408,112,123275,1,2,0:0:0:0:
+328,113,123457,1,2,0:0:0:0:
+168,192,123821,6,0,L|152:112,1,80,2|0,0:0|0:0,0:0:0:0:
+256,192,124185,2,0,L|240:112,1,80,2|0,0:0|0:0,0:0:0:0:
+64,112,124730,1,0,0:0:0:0:
+152,112,124912,1,2,0:0:0:0:
+336,192,125275,6,0,L|352:112,1,80,2|0,0:0|0:0,0:0:0:0:
+240,192,125639,2,0,L|256:112,1,80,2|0,0:0|0:0,0:0:0:0:
+448,112,126185,1,2,0:0:0:0:
+352,112,126366,1,2,0:0:0:0:
+144,192,126730,6,0,L|128:112,1,80,2|0,0:0|0:0,0:0:0:0:
+248,192,127094,2,0,L|232:112,1,80,2|0,0:0|0:0,0:0:0:0:
+112,112,127457,2,0,L|192:112,1,80,2|2,0:0|0:0,0:0:0:0:
+48,112,127821,1,2,0:0:0:0:
+192,112,128003,1,2,0:0:0:0:
+368,112,128185,5,12,0:0:0:0:
+288,112,128366,2,0,L|240:112,2,40,2|0|8,0:0|0:0|0:0,0:0:0:0:
+368,112,128730,1,2,0:0:0:0:
+496,192,128912,2,0,L|496:144,1,40,2|0,3:0|0:0,0:0:0:0:
+448,112,129094,1,2,0:0:0:0:
+368,112,129275,1,8,0:0:0:0:
+448,112,129457,1,2,0:0:0:0:
+272,192,129639,6,0,L|272:144,1,40,2|0,3:0|0:0,0:0:0:0:
+320,128,129821,1,2,0:0:0:0:
+432,192,130003,1,8,0:0:0:0:
+384,192,130094,1,0,0:0:0:0:
+336,192,130185,1,2,0:0:0:0:
+448,192,130366,2,0,L|448:144,1,40,2|0,3:0|0:0,0:0:0:0:
+400,128,130548,1,2,0:0:0:0:
+288,128,130730,2,0,L|368:128,1,80,10|10,0:0|0:0,0:0:0:0:
+192,128,131094,5,2,3:0:0:0:
+112,128,131275,2,0,L|112:176,1,40,2|0,0:0|0:0,0:0:0:0:
+160,192,131457,1,8,0:0:0:0:
+80,192,131639,1,2,0:0:0:0:
+192,192,131821,2,0,L|192:240,1,40,2|0,3:0|0:0,0:0:0:0:
+144,272,132003,1,2,0:0:0:0:
+64,272,132185,1,8,0:0:0:0:
+144,272,132366,1,2,0:0:0:0:
+320,272,132548,5,2,3:0:0:0:
+240,272,132730,1,2,0:0:0:0:
+320,272,132912,2,0,L|368:272,2,40,8|0|2,0:0|0:0|0:0,0:0:0:0:
+208,192,133275,2,0,L|288:192,1,80,2|2,3:0|0:0,0:0:0:0:
+400,112,133639,2,0,L|320:112,1,80,10|10,0:0|0:0,0:0:0:0:
+144,112,134003,5,2,3:0:0:0:
+224,112,134185,2,0,L|272:112,2,40,2|0|8,0:0|0:0|0:0,0:0:0:0:
+144,112,134548,1,2,0:0:0:0:
+64,192,134730,1,2,3:0:0:0:
+144,192,134912,2,0,L|192:192,2,40,2|0|8,0:0|0:0|0:0,0:0:0:0:
+64,192,135275,1,2,0:0:0:0:
+240,192,135457,6,0,L|240:240,1,40,2|0,3:0|0:0,0:0:0:0:
+192,256,135639,1,2,0:0:0:0:
+80,192,135821,1,8,0:0:0:0:
+128,192,135912,1,0,0:0:0:0:
+176,192,136003,1,2,0:0:0:0:
+288,112,136185,1,2,3:0:0:0:
+240,112,136275,1,0,0:0:0:0:
+192,112,136366,1,2,0:0:0:0:
+80,112,136548,1,10,0:0:0:0:
+192,112,136730,1,10,0:0:0:0:
+368,112,136912,5,2,3:0:0:0:
+448,112,137094,2,0,L|448:160,1,40,2|0,0:0|0:0,0:0:0:0:
+400,176,137275,1,8,0:0:0:0:
+320,176,137457,1,2,0:0:0:0:
+432,176,137639,2,0,L|416:224,1,40,2|0,3:0|0:0,0:0:0:0:
+368,256,137821,1,2,0:0:0:0:
+288,256,138003,1,8,0:0:0:0:
+368,256,138185,1,2,0:0:0:0:
+192,192,138366,5,2,3:0:0:0:
+112,112,138548,2,0,L|104:72,1,40,8|2,0:0|0:0,0:0:0:0:
+216,64,138821,2,0,L|256:64,1,40,2|10,0:0|0:0,0:0:0:0:
+144,192,139094,1,2,3:0:0:0:
+224,192,139275,1,10,0:0:0:0:
+48,192,139457,1,10,0:0:0:0:
+160,192,139639,1,10,0:0:0:0:
+416,192,139821,5,12,0:0:0:0:
+256,192,140003,12,0,143457,0:0:0:0:
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/42587-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/42587-expected-conversion.json
new file mode 100644
index 0000000000..42df40a57e
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/42587-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":24383.0,"Objects":[{"StartTime":24383.0,"Position":376.0,"HyperDash":false}]},{"StartTime":24478.0,"Objects":[{"StartTime":24478.0,"Position":392.0,"HyperDash":false}]},{"StartTime":24573.0,"Objects":[{"StartTime":24573.0,"Position":408.0,"HyperDash":false}]},{"StartTime":24763.0,"Objects":[{"StartTime":24763.0,"Position":448.0,"HyperDash":false},{"StartTime":24839.0,"Position":396.8095,"HyperDash":false},{"StartTime":24952.0,"Position":358.0,"HyperDash":false}]},{"StartTime":25143.0,"Objects":[{"StartTime":25143.0,"Position":280.0,"HyperDash":false}]},{"StartTime":25333.0,"Objects":[{"StartTime":25333.0,"Position":232.0,"HyperDash":false}]},{"StartTime":25523.0,"Objects":[{"StartTime":25523.0,"Position":152.0,"HyperDash":false},{"StartTime":25599.0,"Position":104.809525,"HyperDash":false},{"StartTime":25712.0,"Position":62.0,"HyperDash":false}]},{"StartTime":25902.0,"Objects":[{"StartTime":25902.0,"Position":32.0,"HyperDash":false}]},{"StartTime":26092.0,"Objects":[{"StartTime":26092.0,"Position":96.0,"HyperDash":false},{"StartTime":26186.0,"Position":119.750992,"HyperDash":false},{"StartTime":26281.0,"Position":168.644272,"HyperDash":false},{"StartTime":26376.0,"Position":215.703568,"HyperDash":false},{"StartTime":26471.0,"Position":244.0,"HyperDash":false},{"StartTime":26557.0,"Position":204.446625,"HyperDash":false},{"StartTime":26643.0,"Position":161.656128,"HyperDash":false},{"StartTime":26729.0,"Position":115.71936,"HyperDash":false},{"StartTime":26851.0,"Position":96.0,"HyperDash":false}]},{"StartTime":27042.0,"Objects":[{"StartTime":27042.0,"Position":96.0,"HyperDash":false}]},{"StartTime":27232.0,"Objects":[{"StartTime":27232.0,"Position":176.0,"HyperDash":false},{"StartTime":27308.0,"Position":204.190475,"HyperDash":false},{"StartTime":27421.0,"Position":266.0,"HyperDash":false}]},{"StartTime":27801.0,"Objects":[{"StartTime":27801.0,"Position":448.0,"HyperDash":false}]},{"StartTime":27991.0,"Objects":[{"StartTime":27991.0,"Position":360.0,"HyperDash":false}]},{"StartTime":28371.0,"Objects":[{"StartTime":28371.0,"Position":192.0,"HyperDash":false}]},{"StartTime":28561.0,"Objects":[{"StartTime":28561.0,"Position":280.0,"HyperDash":false}]},{"StartTime":28751.0,"Objects":[{"StartTime":28751.0,"Position":368.0,"HyperDash":false}]},{"StartTime":28940.0,"Objects":[{"StartTime":28940.0,"Position":456.0,"HyperDash":false}]},{"StartTime":29130.0,"Objects":[{"StartTime":29130.0,"Position":456.0,"HyperDash":false},{"StartTime":29224.0,"Position":417.249023,"HyperDash":false},{"StartTime":29319.0,"Position":394.3557,"HyperDash":false},{"StartTime":29414.0,"Position":367.296448,"HyperDash":false},{"StartTime":29509.0,"Position":308.0,"HyperDash":false},{"StartTime":29595.0,"Position":352.553375,"HyperDash":false},{"StartTime":29681.0,"Position":380.343872,"HyperDash":false},{"StartTime":29767.0,"Position":426.28064,"HyperDash":false},{"StartTime":29889.0,"Position":456.0,"HyperDash":false}]},{"StartTime":30080.0,"Objects":[{"StartTime":30080.0,"Position":456.0,"HyperDash":false}]},{"StartTime":30270.0,"Objects":[{"StartTime":30270.0,"Position":376.0,"HyperDash":false},{"StartTime":30346.0,"Position":320.8095,"HyperDash":false},{"StartTime":30459.0,"Position":286.0,"HyperDash":false}]},{"StartTime":30839.0,"Objects":[{"StartTime":30839.0,"Position":112.0,"HyperDash":false}]},{"StartTime":31029.0,"Objects":[{"StartTime":31029.0,"Position":176.0,"HyperDash":false}]},{"StartTime":31219.0,"Objects":[{"StartTime":31219.0,"Position":112.0,"HyperDash":false}]},{"StartTime":31314.0,"Objects":[{"StartTime":31314.0,"Position":112.0,"HyperDash":false}]},{"StartTime":31409.0,"Objects":[{"StartTime":31409.0,"Position":112.0,"HyperDash":false}]},{"StartTime":31599.0,"Objects":[{"StartTime":31599.0,"Position":176.0,"HyperDash":false}]},{"StartTime":31788.0,"Objects":[{"StartTime":31788.0,"Position":240.0,"HyperDash":false}]},{"StartTime":31978.0,"Objects":[{"StartTime":31978.0,"Position":176.0,"HyperDash":false}]},{"StartTime":32168.0,"Objects":[{"StartTime":32168.0,"Position":240.0,"HyperDash":false},{"StartTime":32262.0,"Position":264.85144,"HyperDash":false},{"StartTime":32357.0,"Position":329.8879,"HyperDash":false},{"StartTime":32452.0,"Position":373.9472,"HyperDash":false},{"StartTime":32547.0,"Position":402.243652,"HyperDash":false},{"StartTime":32633.0,"Position":374.690277,"HyperDash":false},{"StartTime":32719.0,"Position":312.89978,"HyperDash":false},{"StartTime":32805.0,"Position":266.934845,"HyperDash":false},{"StartTime":32927.0,"Position":240.0,"HyperDash":false}]},{"StartTime":33118.0,"Objects":[{"StartTime":33118.0,"Position":240.0,"HyperDash":false}]},{"StartTime":33307.0,"Objects":[{"StartTime":33307.0,"Position":328.0,"HyperDash":false},{"StartTime":33383.0,"Position":341.0,"HyperDash":false},{"StartTime":33496.0,"Position":298.93808,"HyperDash":false}]},{"StartTime":33877.0,"Objects":[{"StartTime":33877.0,"Position":136.0,"HyperDash":false}]},{"StartTime":34067.0,"Objects":[{"StartTime":34067.0,"Position":80.0,"HyperDash":false}]},{"StartTime":34257.0,"Objects":[{"StartTime":34257.0,"Position":24.0,"HyperDash":false}]},{"StartTime":34352.0,"Objects":[{"StartTime":34352.0,"Position":24.0,"HyperDash":false}]},{"StartTime":34447.0,"Objects":[{"StartTime":34447.0,"Position":24.0,"HyperDash":false}]},{"StartTime":34542.0,"Objects":[{"StartTime":34542.0,"Position":40.0,"HyperDash":false}]},{"StartTime":34637.0,"Objects":[{"StartTime":34637.0,"Position":56.0,"HyperDash":false}]},{"StartTime":34826.0,"Objects":[{"StartTime":34826.0,"Position":144.0,"HyperDash":false}]},{"StartTime":35016.0,"Objects":[{"StartTime":35016.0,"Position":232.0,"HyperDash":false}]},{"StartTime":35206.0,"Objects":[{"StartTime":35206.0,"Position":376.0,"HyperDash":false},{"StartTime":35300.0,"Position":413.2887,"HyperDash":false},{"StartTime":35395.0,"Position":455.196533,"HyperDash":false},{"StartTime":35472.0,"Position":429.631622,"HyperDash":false},{"StartTime":35585.0,"Position":376.0,"HyperDash":false}]},{"StartTime":35776.0,"Objects":[{"StartTime":35776.0,"Position":232.0,"HyperDash":false},{"StartTime":35852.0,"Position":181.590073,"HyperDash":false},{"StartTime":35965.0,"Position":152.803467,"HyperDash":false}]},{"StartTime":36156.0,"Objects":[{"StartTime":36156.0,"Position":304.0,"HyperDash":false}]},{"StartTime":36345.0,"Objects":[{"StartTime":36345.0,"Position":304.0,"HyperDash":false},{"StartTime":36421.0,"Position":300.0,"HyperDash":false},{"StartTime":36534.0,"Position":304.0,"HyperDash":false}]},{"StartTime":36725.0,"Objects":[{"StartTime":36725.0,"Position":112.0,"HyperDash":false},{"StartTime":36801.0,"Position":78.63026,"HyperDash":false},{"StartTime":36914.0,"Position":31.5015564,"HyperDash":false}]},{"StartTime":37105.0,"Objects":[{"StartTime":37105.0,"Position":112.0,"HyperDash":false},{"StartTime":37181.0,"Position":93.63026,"HyperDash":false},{"StartTime":37294.0,"Position":31.5015564,"HyperDash":false}]},{"StartTime":37485.0,"Objects":[{"StartTime":37485.0,"Position":112.0,"HyperDash":false}]},{"StartTime":37675.0,"Objects":[{"StartTime":37675.0,"Position":112.0,"HyperDash":false},{"StartTime":37769.0,"Position":57.8074036,"HyperDash":false},{"StartTime":37864.0,"Position":32.9893951,"HyperDash":false},{"StartTime":37941.0,"Position":45.885498,"HyperDash":false},{"StartTime":38054.0,"Position":112.0,"HyperDash":false}]},{"StartTime":38244.0,"Objects":[{"StartTime":38244.0,"Position":112.0,"HyperDash":false}]},{"StartTime":38434.0,"Objects":[{"StartTime":38434.0,"Position":32.0,"HyperDash":false}]},{"StartTime":38624.0,"Objects":[{"StartTime":38624.0,"Position":112.0,"HyperDash":false}]},{"StartTime":38814.0,"Objects":[{"StartTime":38814.0,"Position":32.0,"HyperDash":false}]},{"StartTime":39004.0,"Objects":[{"StartTime":39004.0,"Position":112.0,"HyperDash":false}]},{"StartTime":39194.0,"Objects":[{"StartTime":39194.0,"Position":200.0,"HyperDash":false},{"StartTime":39270.0,"Position":220.190475,"HyperDash":false},{"StartTime":39383.0,"Position":290.0,"HyperDash":false}]},{"StartTime":39573.0,"Objects":[{"StartTime":39573.0,"Position":384.0,"HyperDash":false},{"StartTime":39649.0,"Position":360.8095,"HyperDash":false},{"StartTime":39762.0,"Position":294.0,"HyperDash":false}]},{"StartTime":39953.0,"Objects":[{"StartTime":39953.0,"Position":200.0,"HyperDash":false},{"StartTime":40047.0,"Position":261.604553,"HyperDash":false},{"StartTime":40142.0,"Position":290.0,"HyperDash":false},{"StartTime":40237.0,"Position":244.237259,"HyperDash":false},{"StartTime":40332.0,"Position":200.0,"HyperDash":false},{"StartTime":40409.0,"Position":229.379608,"HyperDash":false},{"StartTime":40522.0,"Position":290.0,"HyperDash":false}]},{"StartTime":40713.0,"Objects":[{"StartTime":40713.0,"Position":408.0,"HyperDash":false}]},{"StartTime":40902.0,"Objects":[{"StartTime":40902.0,"Position":360.0,"HyperDash":false}]},{"StartTime":41092.0,"Objects":[{"StartTime":41092.0,"Position":280.0,"HyperDash":false},{"StartTime":41177.0,"Position":240.0683,"HyperDash":false},{"StartTime":41263.0,"Position":219.442886,"HyperDash":false},{"StartTime":41349.0,"Position":153.743317,"HyperDash":false},{"StartTime":41471.0,"Position":103.528549,"HyperDash":false}]},{"StartTime":41662.0,"Objects":[{"StartTime":41662.0,"Position":168.0,"HyperDash":false},{"StartTime":41756.0,"Position":130.327,"HyperDash":false},{"StartTime":41851.0,"Position":85.20778,"HyperDash":false},{"StartTime":41928.0,"Position":130.082031,"HyperDash":false},{"StartTime":42041.0,"Position":168.0,"HyperDash":false}]},{"StartTime":42232.0,"Objects":[{"StartTime":42232.0,"Position":264.0,"HyperDash":false},{"StartTime":42317.0,"Position":321.196838,"HyperDash":false},{"StartTime":42403.0,"Position":360.600128,"HyperDash":false},{"StartTime":42489.0,"Position":394.9759,"HyperDash":false},{"StartTime":42611.0,"Position":423.349854,"HyperDash":false}]},{"StartTime":42801.0,"Objects":[{"StartTime":42801.0,"Position":320.0,"HyperDash":false},{"StartTime":42877.0,"Position":322.0243,"HyperDash":false},{"StartTime":42990.0,"Position":282.757751,"HyperDash":false}]},{"StartTime":43181.0,"Objects":[{"StartTime":43181.0,"Position":184.0,"HyperDash":false},{"StartTime":43257.0,"Position":210.32988,"HyperDash":false},{"StartTime":43370.0,"Position":227.0967,"HyperDash":false}]},{"StartTime":43561.0,"Objects":[{"StartTime":43561.0,"Position":227.0,"HyperDash":false}]},{"StartTime":43751.0,"Objects":[{"StartTime":43751.0,"Position":192.0,"HyperDash":false},{"StartTime":43845.0,"Position":152.03096,"HyperDash":false},{"StartTime":43940.0,"Position":145.695374,"HyperDash":false},{"StartTime":44017.0,"Position":169.388275,"HyperDash":false},{"StartTime":44130.0,"Position":192.0,"HyperDash":false}]},{"StartTime":44320.0,"Objects":[{"StartTime":44320.0,"Position":128.0,"HyperDash":false},{"StartTime":44405.0,"Position":142.777267,"HyperDash":false},{"StartTime":44491.0,"Position":173.576416,"HyperDash":false},{"StartTime":44577.0,"Position":244.930679,"HyperDash":false},{"StartTime":44699.0,"Position":284.40564,"HyperDash":false}]},{"StartTime":44890.0,"Objects":[{"StartTime":44890.0,"Position":376.0,"HyperDash":false}]},{"StartTime":45270.0,"Objects":[{"StartTime":45270.0,"Position":440.0,"HyperDash":false}]},{"StartTime":45459.0,"Objects":[{"StartTime":45459.0,"Position":384.0,"HyperDash":false}]},{"StartTime":45649.0,"Objects":[{"StartTime":45649.0,"Position":304.0,"HyperDash":false}]},{"StartTime":45839.0,"Objects":[{"StartTime":45839.0,"Position":216.0,"HyperDash":false},{"StartTime":45924.0,"Position":169.327576,"HyperDash":false},{"StartTime":46010.0,"Position":156.035263,"HyperDash":false},{"StartTime":46096.0,"Position":110.220467,"HyperDash":false},{"StartTime":46218.0,"Position":68.60332,"HyperDash":false}]},{"StartTime":46409.0,"Objects":[{"StartTime":46409.0,"Position":56.0,"HyperDash":false}]},{"StartTime":46788.0,"Objects":[{"StartTime":46788.0,"Position":216.0,"HyperDash":false}]},{"StartTime":46978.0,"Objects":[{"StartTime":46978.0,"Position":296.0,"HyperDash":false}]},{"StartTime":47168.0,"Objects":[{"StartTime":47168.0,"Position":216.0,"HyperDash":false}]},{"StartTime":47358.0,"Objects":[{"StartTime":47358.0,"Position":296.0,"HyperDash":false}]},{"StartTime":47738.0,"Objects":[{"StartTime":47738.0,"Position":136.0,"HyperDash":false}]},{"StartTime":48118.0,"Objects":[{"StartTime":48118.0,"Position":376.0,"HyperDash":false}]},{"StartTime":48497.0,"Objects":[{"StartTime":48497.0,"Position":136.0,"HyperDash":false}]},{"StartTime":48877.0,"Objects":[{"StartTime":48877.0,"Position":376.0,"HyperDash":false},{"StartTime":48953.0,"Position":329.8095,"HyperDash":false},{"StartTime":49066.0,"Position":286.0,"HyperDash":false}]},{"StartTime":49257.0,"Objects":[{"StartTime":49257.0,"Position":192.0,"HyperDash":false}]},{"StartTime":49447.0,"Objects":[{"StartTime":49447.0,"Position":128.0,"HyperDash":false}]},{"StartTime":49637.0,"Objects":[{"StartTime":49637.0,"Position":216.0,"HyperDash":false},{"StartTime":49731.0,"Position":261.604553,"HyperDash":false},{"StartTime":49826.0,"Position":306.0,"HyperDash":false},{"StartTime":49921.0,"Position":251.237244,"HyperDash":false},{"StartTime":50016.0,"Position":216.0,"HyperDash":false},{"StartTime":50093.0,"Position":252.379608,"HyperDash":false},{"StartTime":50206.0,"Position":306.0,"HyperDash":false}]},{"StartTime":50396.0,"Objects":[{"StartTime":50396.0,"Position":400.0,"HyperDash":false},{"StartTime":50481.0,"Position":405.0538,"HyperDash":false},{"StartTime":50567.0,"Position":419.1245,"HyperDash":false},{"StartTime":50653.0,"Position":441.139374,"HyperDash":false},{"StartTime":50775.0,"Position":411.5338,"HyperDash":false}]},{"StartTime":50966.0,"Objects":[{"StartTime":50966.0,"Position":336.0,"HyperDash":false},{"StartTime":51042.0,"Position":300.082825,"HyperDash":false},{"StartTime":51155.0,"Position":279.0086,"HyperDash":false}]},{"StartTime":51345.0,"Objects":[{"StartTime":51345.0,"Position":208.0,"HyperDash":false}]},{"StartTime":51535.0,"Objects":[{"StartTime":51535.0,"Position":168.0,"HyperDash":false}]},{"StartTime":51725.0,"Objects":[{"StartTime":51725.0,"Position":120.0,"HyperDash":false}]},{"StartTime":51915.0,"Objects":[{"StartTime":51915.0,"Position":72.0,"HyperDash":false},{"StartTime":52000.0,"Position":46.90651,"HyperDash":false},{"StartTime":52086.0,"Position":66.65258,"HyperDash":false},{"StartTime":52172.0,"Position":76.80537,"HyperDash":false},{"StartTime":52294.0,"Position":126.392281,"HyperDash":false}]},{"StartTime":52485.0,"Objects":[{"StartTime":52485.0,"Position":216.0,"HyperDash":false}]},{"StartTime":52675.0,"Objects":[{"StartTime":52675.0,"Position":304.0,"HyperDash":false}]},{"StartTime":52864.0,"Objects":[{"StartTime":52864.0,"Position":232.0,"HyperDash":false}]},{"StartTime":53054.0,"Objects":[{"StartTime":53054.0,"Position":312.0,"HyperDash":false}]},{"StartTime":53244.0,"Objects":[{"StartTime":53244.0,"Position":288.0,"HyperDash":false},{"StartTime":53329.0,"Position":335.2697,"HyperDash":false},{"StartTime":53415.0,"Position":365.515228,"HyperDash":false},{"StartTime":53501.0,"Position":421.4718,"HyperDash":false},{"StartTime":53623.0,"Position":449.9475,"HyperDash":false}]},{"StartTime":53814.0,"Objects":[{"StartTime":53814.0,"Position":392.0,"HyperDash":false},{"StartTime":53890.0,"Position":357.8421,"HyperDash":false},{"StartTime":54003.0,"Position":349.331024,"HyperDash":false}]},{"StartTime":54194.0,"Objects":[{"StartTime":54194.0,"Position":280.0,"HyperDash":false},{"StartTime":54270.0,"Position":256.0476,"HyperDash":false},{"StartTime":54383.0,"Position":208.0,"HyperDash":false}]},{"StartTime":54573.0,"Objects":[{"StartTime":54573.0,"Position":176.0,"HyperDash":false}]},{"StartTime":54763.0,"Objects":[{"StartTime":54763.0,"Position":104.0,"HyperDash":false},{"StartTime":54829.0,"Position":110.83445,"HyperDash":false},{"StartTime":54896.0,"Position":93.97989,"HyperDash":false},{"StartTime":54962.0,"Position":92.00793,"HyperDash":false},{"StartTime":55029.0,"Position":91.28976,"HyperDash":false},{"StartTime":55096.0,"Position":107.652794,"HyperDash":false},{"StartTime":55162.0,"Position":137.152725,"HyperDash":false},{"StartTime":55229.0,"Position":132.523422,"HyperDash":false},{"StartTime":55332.0,"Position":193.99971,"HyperDash":false}]},{"StartTime":55523.0,"Objects":[{"StartTime":55523.0,"Position":216.0,"HyperDash":false}]},{"StartTime":55713.0,"Objects":[{"StartTime":55713.0,"Position":264.0,"HyperDash":false}]},{"StartTime":55902.0,"Objects":[{"StartTime":55902.0,"Position":352.0,"HyperDash":false}]},{"StartTime":56092.0,"Objects":[{"StartTime":56092.0,"Position":440.0,"HyperDash":false}]},{"StartTime":56282.0,"Objects":[{"StartTime":56282.0,"Position":352.0,"HyperDash":false}]},{"StartTime":56472.0,"Objects":[{"StartTime":56472.0,"Position":264.0,"HyperDash":false},{"StartTime":56538.0,"Position":236.1824,"HyperDash":false},{"StartTime":56605.0,"Position":201.573,"HyperDash":false},{"StartTime":56671.0,"Position":187.143539,"HyperDash":false},{"StartTime":56738.0,"Position":159.746231,"HyperDash":false},{"StartTime":56805.0,"Position":123.075737,"HyperDash":false},{"StartTime":56871.0,"Position":78.82073,"HyperDash":false},{"StartTime":56938.0,"Position":49.782032,"HyperDash":false},{"StartTime":57041.0,"Position":18.8103733,"HyperDash":false}]},{"StartTime":57421.0,"Objects":[{"StartTime":57421.0,"Position":160.0,"HyperDash":false}]},{"StartTime":57611.0,"Objects":[{"StartTime":57611.0,"Position":32.0,"HyperDash":false}]},{"StartTime":57801.0,"Objects":[{"StartTime":57801.0,"Position":160.0,"HyperDash":false}]},{"StartTime":57991.0,"Objects":[{"StartTime":57991.0,"Position":248.0,"HyperDash":false},{"StartTime":58057.0,"Position":279.8176,"HyperDash":false},{"StartTime":58124.0,"Position":314.427,"HyperDash":false},{"StartTime":58190.0,"Position":336.856445,"HyperDash":false},{"StartTime":58257.0,"Position":373.253754,"HyperDash":false},{"StartTime":58324.0,"Position":394.924255,"HyperDash":false},{"StartTime":58390.0,"Position":404.17926,"HyperDash":false},{"StartTime":58457.0,"Position":435.217957,"HyperDash":false},{"StartTime":58560.0,"Position":493.189636,"HyperDash":false}]},{"StartTime":58940.0,"Objects":[{"StartTime":58940.0,"Position":360.0,"HyperDash":false}]},{"StartTime":59130.0,"Objects":[{"StartTime":59130.0,"Position":256.0,"HyperDash":false}]},{"StartTime":59320.0,"Objects":[{"StartTime":59320.0,"Position":152.0,"HyperDash":false}]},{"StartTime":59510.0,"Objects":[{"StartTime":59510.0,"Position":168.0,"HyperDash":false},{"StartTime":59604.0,"Position":213.268082,"HyperDash":false},{"StartTime":59699.0,"Position":263.009766,"HyperDash":false},{"StartTime":59794.0,"Position":292.74585,"HyperDash":false},{"StartTime":59889.0,"Position":343.451233,"HyperDash":false},{"StartTime":59984.0,"Position":303.3675,"HyperDash":false},{"StartTime":60079.0,"Position":253.641876,"HyperDash":false},{"StartTime":60174.0,"Position":227.887085,"HyperDash":false},{"StartTime":60269.0,"Position":168.0,"HyperDash":false},{"StartTime":60355.0,"Position":189.407471,"HyperDash":false},{"StartTime":60441.0,"Position":257.7932,"HyperDash":false},{"StartTime":60527.0,"Position":268.439819,"HyperDash":false},{"StartTime":60649.0,"Position":343.451233,"HyperDash":false}]},{"StartTime":60839.0,"Objects":[{"StartTime":60839.0,"Position":408.0,"HyperDash":false}]},{"StartTime":60934.0,"Objects":[{"StartTime":60934.0,"Position":408.0,"HyperDash":false}]},{"StartTime":61029.0,"Objects":[{"StartTime":61029.0,"Position":408.0,"HyperDash":false},{"StartTime":61114.0,"Position":391.84967,"HyperDash":false},{"StartTime":61200.0,"Position":372.427,"HyperDash":false},{"StartTime":61286.0,"Position":329.0043,"HyperDash":false},{"StartTime":61408.0,"Position":304.776764,"HyperDash":false}]},{"StartTime":61599.0,"Objects":[{"StartTime":61599.0,"Position":304.0,"HyperDash":false}]},{"StartTime":61788.0,"Objects":[{"StartTime":61788.0,"Position":216.0,"HyperDash":false},{"StartTime":61873.0,"Position":231.980789,"HyperDash":false},{"StartTime":61959.0,"Position":262.282928,"HyperDash":false},{"StartTime":62045.0,"Position":291.630219,"HyperDash":false},{"StartTime":62167.0,"Position":318.820038,"HyperDash":false}]},{"StartTime":62358.0,"Objects":[{"StartTime":62358.0,"Position":319.0,"HyperDash":false}]},{"StartTime":62548.0,"Objects":[{"StartTime":62548.0,"Position":240.0,"HyperDash":false},{"StartTime":62642.0,"Position":251.786285,"HyperDash":false},{"StartTime":62737.0,"Position":294.0,"HyperDash":false},{"StartTime":62814.0,"Position":280.200531,"HyperDash":false},{"StartTime":62927.0,"Position":240.0,"HyperDash":false}]},{"StartTime":63118.0,"Objects":[{"StartTime":63118.0,"Position":192.0,"HyperDash":false},{"StartTime":63203.0,"Position":179.84967,"HyperDash":false},{"StartTime":63289.0,"Position":137.426987,"HyperDash":false},{"StartTime":63375.0,"Position":126.0043,"HyperDash":false},{"StartTime":63497.0,"Position":88.77678,"HyperDash":false}]},{"StartTime":63687.0,"Objects":[{"StartTime":63687.0,"Position":176.0,"HyperDash":false}]},{"StartTime":63877.0,"Objects":[{"StartTime":63877.0,"Position":264.0,"HyperDash":false}]},{"StartTime":64067.0,"Objects":[{"StartTime":64067.0,"Position":352.0,"HyperDash":false},{"StartTime":64152.0,"Position":394.99942,"HyperDash":false},{"StartTime":64238.0,"Position":401.898163,"HyperDash":false},{"StartTime":64324.0,"Position":421.559357,"HyperDash":false},{"StartTime":64446.0,"Position":422.749817,"HyperDash":false}]},{"StartTime":64637.0,"Objects":[{"StartTime":64637.0,"Position":352.0,"HyperDash":false}]},{"StartTime":64826.0,"Objects":[{"StartTime":64826.0,"Position":272.0,"HyperDash":false},{"StartTime":64902.0,"Position":280.7143,"HyperDash":false},{"StartTime":65015.0,"Position":326.0,"HyperDash":false}]},{"StartTime":65206.0,"Objects":[{"StartTime":65206.0,"Position":326.0,"HyperDash":false}]},{"StartTime":65396.0,"Objects":[{"StartTime":65396.0,"Position":272.0,"HyperDash":false},{"StartTime":65481.0,"Position":237.667328,"HyperDash":false},{"StartTime":65567.0,"Position":221.486267,"HyperDash":false},{"StartTime":65653.0,"Position":177.3163,"HyperDash":false},{"StartTime":65775.0,"Position":167.831314,"HyperDash":false}]},{"StartTime":65966.0,"Objects":[{"StartTime":65966.0,"Position":104.0,"HyperDash":false}]},{"StartTime":66156.0,"Objects":[{"StartTime":66156.0,"Position":48.0,"HyperDash":false}]},{"StartTime":66345.0,"Objects":[{"StartTime":66345.0,"Position":104.0,"HyperDash":false}]},{"StartTime":66535.0,"Objects":[{"StartTime":66535.0,"Position":56.0,"HyperDash":false}]},{"StartTime":66630.0,"Objects":[{"StartTime":66630.0,"Position":80.0,"HyperDash":false}]},{"StartTime":66725.0,"Objects":[{"StartTime":66725.0,"Position":104.0,"HyperDash":false}]},{"StartTime":66915.0,"Objects":[{"StartTime":66915.0,"Position":192.0,"HyperDash":false}]},{"StartTime":67105.0,"Objects":[{"StartTime":67105.0,"Position":280.0,"HyperDash":false},{"StartTime":67190.0,"Position":314.967377,"HyperDash":false},{"StartTime":67276.0,"Position":332.346161,"HyperDash":false},{"StartTime":67362.0,"Position":371.7249,"HyperDash":false},{"StartTime":67484.0,"Position":435.9134,"HyperDash":false}]},{"StartTime":67675.0,"Objects":[{"StartTime":67675.0,"Position":448.0,"HyperDash":false}]},{"StartTime":67864.0,"Objects":[{"StartTime":67864.0,"Position":456.0,"HyperDash":false},{"StartTime":67949.0,"Position":419.88092,"HyperDash":false},{"StartTime":68035.0,"Position":402.3487,"HyperDash":false},{"StartTime":68121.0,"Position":361.816467,"HyperDash":false},{"StartTime":68243.0,"Position":299.410278,"HyperDash":false}]},{"StartTime":68434.0,"Objects":[{"StartTime":68434.0,"Position":288.0,"HyperDash":false}]},{"StartTime":68624.0,"Objects":[{"StartTime":68624.0,"Position":208.0,"HyperDash":false}]},{"StartTime":68814.0,"Objects":[{"StartTime":68814.0,"Position":128.0,"HyperDash":false}]},{"StartTime":69004.0,"Objects":[{"StartTime":69004.0,"Position":48.0,"HyperDash":false}]},{"StartTime":69194.0,"Objects":[{"StartTime":69194.0,"Position":128.0,"HyperDash":false},{"StartTime":69279.0,"Position":167.7291,"HyperDash":false},{"StartTime":69365.0,"Position":176.461563,"HyperDash":false},{"StartTime":69451.0,"Position":208.0288,"HyperDash":false},{"StartTime":69573.0,"Position":193.863922,"HyperDash":false}]},{"StartTime":69763.0,"Objects":[{"StartTime":69763.0,"Position":256.0,"HyperDash":false}]},{"StartTime":69953.0,"Objects":[{"StartTime":69953.0,"Position":256.0,"HyperDash":false}]},{"StartTime":70143.0,"Objects":[{"StartTime":70143.0,"Position":318.0,"HyperDash":false},{"StartTime":70228.0,"Position":307.361053,"HyperDash":false},{"StartTime":70314.0,"Position":339.541077,"HyperDash":false},{"StartTime":70400.0,"Position":329.926361,"HyperDash":false},{"StartTime":70522.0,"Position":382.366,"HyperDash":false}]},{"StartTime":70902.0,"Objects":[{"StartTime":70902.0,"Position":256.0,"HyperDash":false},{"StartTime":70973.0,"Position":237.22084,"HyperDash":false},{"StartTime":71044.0,"Position":261.5726,"HyperDash":false},{"StartTime":71115.0,"Position":256.317383,"HyperDash":false},{"StartTime":71186.0,"Position":259.616821,"HyperDash":false},{"StartTime":71248.0,"Position":284.489624,"HyperDash":false},{"StartTime":71310.0,"Position":249.320618,"HyperDash":false},{"StartTime":71372.0,"Position":249.26532,"HyperDash":false},{"StartTime":71471.0,"Position":256.0,"HyperDash":false}]},{"StartTime":71662.0,"Objects":[{"StartTime":71662.0,"Position":256.0,"HyperDash":false}]},{"StartTime":72042.0,"Objects":[{"StartTime":72042.0,"Position":256.0,"HyperDash":false}]},{"StartTime":72421.0,"Objects":[{"StartTime":72421.0,"Position":160.0,"HyperDash":false}]},{"StartTime":72611.0,"Objects":[{"StartTime":72611.0,"Position":224.0,"HyperDash":false}]},{"StartTime":72801.0,"Objects":[{"StartTime":72801.0,"Position":288.0,"HyperDash":false}]},{"StartTime":72991.0,"Objects":[{"StartTime":72991.0,"Position":352.0,"HyperDash":false}]},{"StartTime":73181.0,"Objects":[{"StartTime":73181.0,"Position":408.0,"HyperDash":false}]},{"StartTime":73371.0,"Objects":[{"StartTime":73371.0,"Position":304.0,"HyperDash":false}]},{"StartTime":73561.0,"Objects":[{"StartTime":73561.0,"Position":208.0,"HyperDash":false}]},{"StartTime":73751.0,"Objects":[{"StartTime":73751.0,"Position":112.0,"HyperDash":false}]},{"StartTime":73940.0,"Objects":[{"StartTime":73940.0,"Position":160.0,"HyperDash":false}]},{"StartTime":74130.0,"Objects":[{"StartTime":74130.0,"Position":224.0,"HyperDash":false}]},{"StartTime":74225.0,"Objects":[{"StartTime":74225.0,"Position":248.0,"HyperDash":false}]},{"StartTime":74320.0,"Objects":[{"StartTime":74320.0,"Position":272.0,"HyperDash":false}]},{"StartTime":74415.0,"Objects":[{"StartTime":74415.0,"Position":296.0,"HyperDash":false}]},{"StartTime":74510.0,"Objects":[{"StartTime":74510.0,"Position":320.0,"HyperDash":false}]},{"StartTime":74605.0,"Objects":[{"StartTime":74605.0,"Position":344.0,"HyperDash":false}]},{"StartTime":74700.0,"Objects":[{"StartTime":74700.0,"Position":368.0,"HyperDash":false},{"StartTime":74785.0,"Position":391.4436,"HyperDash":false},{"StartTime":74871.0,"Position":429.4646,"HyperDash":false},{"StartTime":74957.0,"Position":450.2139,"HyperDash":false},{"StartTime":75079.0,"Position":476.639343,"HyperDash":false}]},{"StartTime":75270.0,"Objects":[{"StartTime":75270.0,"Position":368.0,"HyperDash":false}]},{"StartTime":75459.0,"Objects":[{"StartTime":75459.0,"Position":296.0,"HyperDash":false},{"StartTime":75535.0,"Position":252.914215,"HyperDash":false},{"StartTime":75648.0,"Position":210.849869,"HyperDash":false}]},{"StartTime":75839.0,"Objects":[{"StartTime":75839.0,"Position":144.0,"HyperDash":false}]},{"StartTime":76029.0,"Objects":[{"StartTime":76029.0,"Position":168.0,"HyperDash":false},{"StartTime":76114.0,"Position":202.25589,"HyperDash":false},{"StartTime":76200.0,"Position":242.877075,"HyperDash":false},{"StartTime":76286.0,"Position":302.62854,"HyperDash":false},{"StartTime":76408.0,"Position":345.765717,"HyperDash":false}]},{"StartTime":76599.0,"Objects":[{"StartTime":76599.0,"Position":344.0,"HyperDash":false},{"StartTime":76684.0,"Position":307.766968,"HyperDash":false},{"StartTime":76770.0,"Position":252.272888,"HyperDash":false},{"StartTime":76856.0,"Position":211.514786,"HyperDash":false},{"StartTime":76978.0,"Position":167.090546,"HyperDash":false}]},{"StartTime":77168.0,"Objects":[{"StartTime":77168.0,"Position":256.0,"HyperDash":false}]},{"StartTime":77358.0,"Objects":[{"StartTime":77358.0,"Position":256.0,"HyperDash":false}]},{"StartTime":77548.0,"Objects":[{"StartTime":77548.0,"Position":424.0,"HyperDash":false},{"StartTime":77633.0,"Position":417.615356,"HyperDash":false},{"StartTime":77719.0,"Position":433.1576,"HyperDash":false},{"StartTime":77805.0,"Position":439.338928,"HyperDash":false},{"StartTime":77927.0,"Position":425.7557,"HyperDash":false}]},{"StartTime":78118.0,"Objects":[{"StartTime":78118.0,"Position":296.0,"HyperDash":false},{"StartTime":78194.0,"Position":289.17218,"HyperDash":false},{"StartTime":78307.0,"Position":326.270264,"HyperDash":false}]},{"StartTime":78497.0,"Objects":[{"StartTime":78497.0,"Position":240.0,"HyperDash":false},{"StartTime":78573.0,"Position":252.172165,"HyperDash":false},{"StartTime":78686.0,"Position":270.270264,"HyperDash":false}]},{"StartTime":78877.0,"Objects":[{"StartTime":78877.0,"Position":168.0,"HyperDash":false},{"StartTime":78953.0,"Position":193.367844,"HyperDash":false},{"StartTime":79066.0,"Position":198.756882,"HyperDash":false}]},{"StartTime":79257.0,"Objects":[{"StartTime":79257.0,"Position":104.0,"HyperDash":false},{"StartTime":79333.0,"Position":113.367844,"HyperDash":false},{"StartTime":79446.0,"Position":134.756882,"HyperDash":false}]},{"StartTime":79637.0,"Objects":[{"StartTime":79637.0,"Position":48.0,"HyperDash":false},{"StartTime":79731.0,"Position":47.97381,"HyperDash":false},{"StartTime":79826.0,"Position":15.6918831,"HyperDash":false},{"StartTime":79903.0,"Position":19.7344723,"HyperDash":false},{"StartTime":80016.0,"Position":48.0,"HyperDash":false}]},{"StartTime":80206.0,"Objects":[{"StartTime":80206.0,"Position":48.0,"HyperDash":false}]},{"StartTime":80396.0,"Objects":[{"StartTime":80396.0,"Position":48.0,"HyperDash":false}]},{"StartTime":80586.0,"Objects":[{"StartTime":80586.0,"Position":48.0,"HyperDash":false},{"StartTime":80671.0,"Position":50.6653442,"HyperDash":false},{"StartTime":80757.0,"Position":72.3398361,"HyperDash":false},{"StartTime":80843.0,"Position":138.798065,"HyperDash":false},{"StartTime":80965.0,"Position":177.234756,"HyperDash":false}]},{"StartTime":81156.0,"Objects":[{"StartTime":81156.0,"Position":334.0,"HyperDash":false},{"StartTime":81241.0,"Position":384.0748,"HyperDash":false},{"StartTime":81327.0,"Position":430.608582,"HyperDash":false},{"StartTime":81413.0,"Position":423.721344,"HyperDash":false},{"StartTime":81535.0,"Position":463.472778,"HyperDash":false}]},{"StartTime":81725.0,"Objects":[{"StartTime":81725.0,"Position":256.0,"HyperDash":false}]},{"StartTime":81915.0,"Objects":[{"StartTime":81915.0,"Position":256.0,"HyperDash":false}]},{"StartTime":82105.0,"Objects":[{"StartTime":82105.0,"Position":48.0,"HyperDash":false},{"StartTime":82190.0,"Position":55.6653442,"HyperDash":false},{"StartTime":82276.0,"Position":92.3398361,"HyperDash":false},{"StartTime":82362.0,"Position":132.798065,"HyperDash":false},{"StartTime":82484.0,"Position":177.234756,"HyperDash":false}]},{"StartTime":82675.0,"Objects":[{"StartTime":82675.0,"Position":334.0,"HyperDash":false},{"StartTime":82760.0,"Position":361.0748,"HyperDash":false},{"StartTime":82846.0,"Position":397.608582,"HyperDash":false},{"StartTime":82932.0,"Position":421.721344,"HyperDash":false},{"StartTime":83054.0,"Position":463.472778,"HyperDash":false}]},{"StartTime":83244.0,"Objects":[{"StartTime":83244.0,"Position":256.0,"HyperDash":false}]},{"StartTime":83434.0,"Objects":[{"StartTime":83434.0,"Position":256.0,"HyperDash":false}]},{"StartTime":83624.0,"Objects":[{"StartTime":83624.0,"Position":177.0,"HyperDash":false},{"StartTime":83709.0,"Position":139.9757,"HyperDash":false},{"StartTime":83795.0,"Position":85.66393,"HyperDash":false},{"StartTime":83881.0,"Position":76.88606,"HyperDash":false},{"StartTime":84003.0,"Position":48.41881,"HyperDash":false}]},{"StartTime":84194.0,"Objects":[{"StartTime":84194.0,"Position":240.0,"HyperDash":false},{"StartTime":84270.0,"Position":217.612869,"HyperDash":false},{"StartTime":84383.0,"Position":151.997787,"HyperDash":false}]},{"StartTime":84573.0,"Objects":[{"StartTime":84573.0,"Position":40.0,"HyperDash":false},{"StartTime":84649.0,"Position":65.48768,"HyperDash":false},{"StartTime":84762.0,"Position":128.252258,"HyperDash":false}]},{"StartTime":84953.0,"Objects":[{"StartTime":84953.0,"Position":280.0,"HyperDash":false},{"StartTime":85029.0,"Position":237.890076,"HyperDash":false},{"StartTime":85142.0,"Position":192.68718,"HyperDash":false}]},{"StartTime":85333.0,"Objects":[{"StartTime":85333.0,"Position":392.0,"HyperDash":false},{"StartTime":85392.0,"Position":335.0,"HyperDash":false},{"StartTime":85451.0,"Position":193.0,"HyperDash":false},{"StartTime":85510.0,"Position":478.0,"HyperDash":false},{"StartTime":85570.0,"Position":255.0,"HyperDash":false},{"StartTime":85629.0,"Position":175.0,"HyperDash":false},{"StartTime":85688.0,"Position":274.0,"HyperDash":false},{"StartTime":85748.0,"Position":442.0,"HyperDash":false},{"StartTime":85807.0,"Position":295.0,"HyperDash":false},{"StartTime":85866.0,"Position":311.0,"HyperDash":false},{"StartTime":85926.0,"Position":17.0,"HyperDash":false},{"StartTime":85985.0,"Position":467.0,"HyperDash":false},{"StartTime":86044.0,"Position":30.0,"HyperDash":false},{"StartTime":86104.0,"Position":218.0,"HyperDash":false},{"StartTime":86163.0,"Position":26.0,"HyperDash":false},{"StartTime":86222.0,"Position":16.0,"HyperDash":false},{"StartTime":86282.0,"Position":248.0,"HyperDash":false}]},{"StartTime":86472.0,"Objects":[{"StartTime":86472.0,"Position":256.0,"HyperDash":false}]},{"StartTime":86662.0,"Objects":[{"StartTime":86662.0,"Position":128.0,"HyperDash":false}]},{"StartTime":86757.0,"Objects":[{"StartTime":86757.0,"Position":152.0,"HyperDash":false}]},{"StartTime":86852.0,"Objects":[{"StartTime":86852.0,"Position":176.0,"HyperDash":false},{"StartTime":86928.0,"Position":199.190475,"HyperDash":false},{"StartTime":87041.0,"Position":266.0,"HyperDash":false}]},{"StartTime":87232.0,"Objects":[{"StartTime":87232.0,"Position":360.0,"HyperDash":false},{"StartTime":87317.0,"Position":331.134338,"HyperDash":false},{"StartTime":87403.0,"Position":283.893768,"HyperDash":false},{"StartTime":87489.0,"Position":250.155975,"HyperDash":false},{"StartTime":87611.0,"Position":199.214035,"HyperDash":false}]},{"StartTime":87801.0,"Objects":[{"StartTime":87801.0,"Position":136.0,"HyperDash":false},{"StartTime":87877.0,"Position":153.190475,"HyperDash":false},{"StartTime":87990.0,"Position":226.0,"HyperDash":false}]},{"StartTime":88181.0,"Objects":[{"StartTime":88181.0,"Position":440.0,"HyperDash":false},{"StartTime":88266.0,"Position":401.6306,"HyperDash":false},{"StartTime":88352.0,"Position":361.417969,"HyperDash":false},{"StartTime":88438.0,"Position":315.9722,"HyperDash":false},{"StartTime":88560.0,"Position":286.761566,"HyperDash":false}]},{"StartTime":88751.0,"Objects":[{"StartTime":88751.0,"Position":72.0,"HyperDash":false},{"StartTime":88836.0,"Position":97.36939,"HyperDash":false},{"StartTime":88922.0,"Position":151.554047,"HyperDash":false},{"StartTime":89008.0,"Position":175.23497,"HyperDash":false},{"StartTime":89130.0,"Position":225.445587,"HyperDash":false}]},{"StartTime":89320.0,"Objects":[{"StartTime":89320.0,"Position":256.0,"HyperDash":false},{"StartTime":89414.0,"Position":256.0,"HyperDash":false},{"StartTime":89509.0,"Position":256.0,"HyperDash":false}]},{"StartTime":89700.0,"Objects":[{"StartTime":89700.0,"Position":488.0,"HyperDash":false},{"StartTime":89785.0,"Position":441.7927,"HyperDash":false},{"StartTime":89871.0,"Position":394.103729,"HyperDash":false},{"StartTime":89957.0,"Position":358.440735,"HyperDash":false},{"StartTime":90079.0,"Position":314.813538,"HyperDash":false}]},{"StartTime":90270.0,"Objects":[{"StartTime":90270.0,"Position":256.0,"HyperDash":false}]},{"StartTime":90459.0,"Objects":[{"StartTime":90459.0,"Position":160.0,"HyperDash":false}]},{"StartTime":90649.0,"Objects":[{"StartTime":90649.0,"Position":64.0,"HyperDash":false}]},{"StartTime":90839.0,"Objects":[{"StartTime":90839.0,"Position":160.0,"HyperDash":false}]},{"StartTime":91029.0,"Objects":[{"StartTime":91029.0,"Position":256.0,"HyperDash":false}]},{"StartTime":91219.0,"Objects":[{"StartTime":91219.0,"Position":352.0,"HyperDash":false}]},{"StartTime":91409.0,"Objects":[{"StartTime":91409.0,"Position":448.0,"HyperDash":false}]},{"StartTime":91599.0,"Objects":[{"StartTime":91599.0,"Position":352.0,"HyperDash":false}]},{"StartTime":91788.0,"Objects":[{"StartTime":91788.0,"Position":256.0,"HyperDash":false}]},{"StartTime":91978.0,"Objects":[{"StartTime":91978.0,"Position":256.0,"HyperDash":false}]},{"StartTime":92168.0,"Objects":[{"StartTime":92168.0,"Position":256.0,"HyperDash":false}]},{"StartTime":92358.0,"Objects":[{"StartTime":92358.0,"Position":256.0,"HyperDash":false},{"StartTime":92434.0,"Position":250.0,"HyperDash":false},{"StartTime":92547.0,"Position":256.0,"HyperDash":false}]},{"StartTime":92738.0,"Objects":[{"StartTime":92738.0,"Position":32.0,"HyperDash":false},{"StartTime":92823.0,"Position":61.3693924,"HyperDash":false},{"StartTime":92909.0,"Position":113.213722,"HyperDash":false},{"StartTime":92995.0,"Position":137.112122,"HyperDash":false},{"StartTime":93117.0,"Position":192.083252,"HyperDash":false}]},{"StartTime":93307.0,"Objects":[{"StartTime":93307.0,"Position":64.0,"HyperDash":false},{"StartTime":93383.0,"Position":90.59053,"HyperDash":false},{"StartTime":93496.0,"Position":127.639618,"HyperDash":false}]},{"StartTime":93687.0,"Objects":[{"StartTime":93687.0,"Position":256.0,"HyperDash":false},{"StartTime":93763.0,"Position":296.590546,"HyperDash":false},{"StartTime":93876.0,"Position":319.639618,"HyperDash":false}]},{"StartTime":94067.0,"Objects":[{"StartTime":94067.0,"Position":424.0,"HyperDash":false}]},{"StartTime":94257.0,"Objects":[{"StartTime":94257.0,"Position":256.0,"HyperDash":false},{"StartTime":94342.0,"Position":210.766815,"HyperDash":false},{"StartTime":94428.0,"Position":186.0,"HyperDash":false},{"StartTime":94514.0,"Position":209.0,"HyperDash":false},{"StartTime":94636.0,"Position":192.0,"HyperDash":false}]},{"StartTime":94826.0,"Objects":[{"StartTime":94826.0,"Position":328.0,"HyperDash":false},{"StartTime":94920.0,"Position":353.6438,"HyperDash":false},{"StartTime":95015.0,"Position":418.0,"HyperDash":false},{"StartTime":95092.0,"Position":396.667542,"HyperDash":false},{"StartTime":95205.0,"Position":328.0,"HyperDash":false}]},{"StartTime":95396.0,"Objects":[{"StartTime":95396.0,"Position":328.0,"HyperDash":false}]},{"StartTime":95586.0,"Objects":[{"StartTime":95586.0,"Position":328.0,"HyperDash":false}]},{"StartTime":95776.0,"Objects":[{"StartTime":95776.0,"Position":192.0,"HyperDash":false},{"StartTime":95861.0,"Position":170.3153,"HyperDash":false},{"StartTime":95947.0,"Position":94.6082153,"HyperDash":false},{"StartTime":96033.0,"Position":54.801857,"HyperDash":false},{"StartTime":96155.0,"Position":13.5809069,"HyperDash":false}]},{"StartTime":96345.0,"Objects":[{"StartTime":96345.0,"Position":56.0,"HyperDash":false},{"StartTime":96421.0,"Position":104.190475,"HyperDash":false},{"StartTime":96534.0,"Position":146.0,"HyperDash":false}]},{"StartTime":96725.0,"Objects":[{"StartTime":96725.0,"Position":232.0,"HyperDash":false}]},{"StartTime":96915.0,"Objects":[{"StartTime":96915.0,"Position":280.0,"HyperDash":false}]},{"StartTime":97105.0,"Objects":[{"StartTime":97105.0,"Position":360.0,"HyperDash":false},{"StartTime":97181.0,"Position":408.1905,"HyperDash":false},{"StartTime":97294.0,"Position":450.0,"HyperDash":false}]},{"StartTime":97485.0,"Objects":[{"StartTime":97485.0,"Position":458.0,"HyperDash":false},{"StartTime":97579.0,"Position":425.0,"HyperDash":false},{"StartTime":97674.0,"Position":466.0,"HyperDash":false},{"StartTime":97769.0,"Position":56.0,"HyperDash":false},{"StartTime":97864.0,"Position":109.0,"HyperDash":false},{"StartTime":97959.0,"Position":482.0,"HyperDash":false},{"StartTime":98054.0,"Position":147.0,"HyperDash":false},{"StartTime":98149.0,"Position":285.0,"HyperDash":false},{"StartTime":98244.0,"Position":452.0,"HyperDash":false},{"StartTime":98339.0,"Position":419.0,"HyperDash":false},{"StartTime":98434.0,"Position":269.0,"HyperDash":false},{"StartTime":98529.0,"Position":249.0,"HyperDash":false},{"StartTime":98624.0,"Position":233.0,"HyperDash":false},{"StartTime":98719.0,"Position":449.0,"HyperDash":false},{"StartTime":98814.0,"Position":411.0,"HyperDash":false},{"StartTime":98909.0,"Position":75.0,"HyperDash":false},{"StartTime":99004.0,"Position":474.0,"HyperDash":false}]},{"StartTime":111156.0,"Objects":[{"StartTime":111156.0,"Position":256.0,"HyperDash":false}]},{"StartTime":111915.0,"Objects":[{"StartTime":111915.0,"Position":256.0,"HyperDash":false}]},{"StartTime":112105.0,"Objects":[{"StartTime":112105.0,"Position":256.0,"HyperDash":false}]},{"StartTime":112295.0,"Objects":[{"StartTime":112295.0,"Position":256.0,"HyperDash":false}]},{"StartTime":112485.0,"Objects":[{"StartTime":112485.0,"Position":256.0,"HyperDash":false}]},{"StartTime":112675.0,"Objects":[{"StartTime":112675.0,"Position":328.0,"HyperDash":false},{"StartTime":112760.0,"Position":361.17868,"HyperDash":false},{"StartTime":112846.0,"Position":407.7525,"HyperDash":false},{"StartTime":112932.0,"Position":421.257233,"HyperDash":false},{"StartTime":113054.0,"Position":455.379,"HyperDash":false}]},{"StartTime":113244.0,"Objects":[{"StartTime":113244.0,"Position":456.0,"HyperDash":false}]},{"StartTime":113434.0,"Objects":[{"StartTime":113434.0,"Position":456.0,"HyperDash":false}]},{"StartTime":113624.0,"Objects":[{"StartTime":113624.0,"Position":368.0,"HyperDash":false},{"StartTime":113718.0,"Position":305.349274,"HyperDash":false},{"StartTime":113813.0,"Position":287.706543,"HyperDash":false},{"StartTime":113890.0,"Position":296.162018,"HyperDash":false},{"StartTime":114003.0,"Position":368.0,"HyperDash":false}]},{"StartTime":114194.0,"Objects":[{"StartTime":114194.0,"Position":456.0,"HyperDash":false},{"StartTime":114279.0,"Position":435.479034,"HyperDash":false},{"StartTime":114365.0,"Position":402.81424,"HyperDash":false},{"StartTime":114451.0,"Position":376.903717,"HyperDash":false},{"StartTime":114573.0,"Position":310.688843,"HyperDash":false}]},{"StartTime":114763.0,"Objects":[{"StartTime":114763.0,"Position":256.0,"HyperDash":false},{"StartTime":114839.0,"Position":203.173843,"HyperDash":false},{"StartTime":114952.0,"Position":176.330536,"HyperDash":false}]},{"StartTime":115143.0,"Objects":[{"StartTime":115143.0,"Position":112.0,"HyperDash":false}]},{"StartTime":115333.0,"Objects":[{"StartTime":115333.0,"Position":176.0,"HyperDash":false}]},{"StartTime":115523.0,"Objects":[{"StartTime":115523.0,"Position":240.0,"HyperDash":false}]},{"StartTime":115713.0,"Objects":[{"StartTime":115713.0,"Position":176.0,"HyperDash":false},{"StartTime":115798.0,"Position":197.9177,"HyperDash":false},{"StartTime":115884.0,"Position":227.720581,"HyperDash":false},{"StartTime":115970.0,"Position":273.524536,"HyperDash":false},{"StartTime":116092.0,"Position":328.682556,"HyperDash":false}]},{"StartTime":116282.0,"Objects":[{"StartTime":116282.0,"Position":296.0,"HyperDash":false}]},{"StartTime":116472.0,"Objects":[{"StartTime":116472.0,"Position":360.0,"HyperDash":false}]},{"StartTime":116662.0,"Objects":[{"StartTime":116662.0,"Position":448.0,"HyperDash":false},{"StartTime":116738.0,"Position":439.409454,"HyperDash":false},{"StartTime":116851.0,"Position":384.360382,"HyperDash":false}]},{"StartTime":117042.0,"Objects":[{"StartTime":117042.0,"Position":384.0,"HyperDash":false},{"StartTime":117127.0,"Position":354.734955,"HyperDash":false},{"StartTime":117213.0,"Position":299.665924,"HyperDash":false},{"StartTime":117299.0,"Position":257.5697,"HyperDash":false},{"StartTime":117421.0,"Position":234.549561,"HyperDash":false}]},{"StartTime":117611.0,"Objects":[{"StartTime":117611.0,"Position":280.0,"HyperDash":false},{"StartTime":117687.0,"Position":309.4148,"HyperDash":false},{"StartTime":117800.0,"Position":286.3127,"HyperDash":false}]},{"StartTime":117991.0,"Objects":[{"StartTime":117991.0,"Position":192.0,"HyperDash":false},{"StartTime":118067.0,"Position":177.6565,"HyperDash":false},{"StartTime":118180.0,"Position":196.931625,"HyperDash":false}]},{"StartTime":118561.0,"Objects":[{"StartTime":118561.0,"Position":248.0,"HyperDash":false}]},{"StartTime":118940.0,"Objects":[{"StartTime":118940.0,"Position":248.0,"HyperDash":false}]},{"StartTime":119320.0,"Objects":[{"StartTime":119320.0,"Position":248.0,"HyperDash":false}]},{"StartTime":119700.0,"Objects":[{"StartTime":119700.0,"Position":448.0,"HyperDash":false}]},{"StartTime":119890.0,"Objects":[{"StartTime":119890.0,"Position":384.0,"HyperDash":false}]},{"StartTime":120080.0,"Objects":[{"StartTime":120080.0,"Position":320.0,"HyperDash":false}]},{"StartTime":120270.0,"Objects":[{"StartTime":120270.0,"Position":256.0,"HyperDash":false},{"StartTime":120355.0,"Position":213.1814,"HyperDash":false},{"StartTime":120441.0,"Position":169.527481,"HyperDash":false},{"StartTime":120527.0,"Position":146.788452,"HyperDash":false},{"StartTime":120649.0,"Position":78.92116,"HyperDash":false}]},{"StartTime":120839.0,"Objects":[{"StartTime":120839.0,"Position":80.0,"HyperDash":false}]},{"StartTime":121219.0,"Objects":[{"StartTime":121219.0,"Position":32.0,"HyperDash":false}]},{"StartTime":121409.0,"Objects":[{"StartTime":121409.0,"Position":120.0,"HyperDash":false}]},{"StartTime":121599.0,"Objects":[{"StartTime":121599.0,"Position":208.0,"HyperDash":false}]},{"StartTime":121788.0,"Objects":[{"StartTime":121788.0,"Position":296.0,"HyperDash":false},{"StartTime":121873.0,"Position":324.8186,"HyperDash":false},{"StartTime":121959.0,"Position":394.4725,"HyperDash":false},{"StartTime":122045.0,"Position":403.211548,"HyperDash":false},{"StartTime":122167.0,"Position":473.078827,"HyperDash":false}]},{"StartTime":122358.0,"Objects":[{"StartTime":122358.0,"Position":472.0,"HyperDash":false}]},{"StartTime":122738.0,"Objects":[{"StartTime":122738.0,"Position":208.0,"HyperDash":false}]},{"StartTime":122928.0,"Objects":[{"StartTime":122928.0,"Position":256.0,"HyperDash":false}]},{"StartTime":123117.0,"Objects":[{"StartTime":123117.0,"Position":304.0,"HyperDash":false}]},{"StartTime":123307.0,"Objects":[{"StartTime":123307.0,"Position":256.0,"HyperDash":false}]},{"StartTime":123687.0,"Objects":[{"StartTime":123687.0,"Position":256.0,"HyperDash":false}]},{"StartTime":124067.0,"Objects":[{"StartTime":124067.0,"Position":256.0,"HyperDash":false}]},{"StartTime":124257.0,"Objects":[{"StartTime":124257.0,"Position":256.0,"HyperDash":false}]},{"StartTime":124447.0,"Objects":[{"StartTime":124447.0,"Position":256.0,"HyperDash":false}]},{"StartTime":124637.0,"Objects":[{"StartTime":124637.0,"Position":256.0,"HyperDash":false}]},{"StartTime":124732.0,"Objects":[{"StartTime":124732.0,"Position":256.0,"HyperDash":false}]},{"StartTime":124826.0,"Objects":[{"StartTime":124826.0,"Position":256.0,"HyperDash":false},{"StartTime":124911.0,"Position":294.15155,"HyperDash":false},{"StartTime":124997.0,"Position":348.2999,"HyperDash":false},{"StartTime":125083.0,"Position":367.688416,"HyperDash":false},{"StartTime":125205.0,"Position":375.982025,"HyperDash":false}]},{"StartTime":125396.0,"Objects":[{"StartTime":125396.0,"Position":456.0,"HyperDash":false}]},{"StartTime":125586.0,"Objects":[{"StartTime":125586.0,"Position":392.0,"HyperDash":false}]},{"StartTime":125776.0,"Objects":[{"StartTime":125776.0,"Position":304.0,"HyperDash":false},{"StartTime":125852.0,"Position":263.17807,"HyperDash":false},{"StartTime":125965.0,"Position":227.350739,"HyperDash":false}]},{"StartTime":126156.0,"Objects":[{"StartTime":126156.0,"Position":192.0,"HyperDash":false}]},{"StartTime":126345.0,"Objects":[{"StartTime":126345.0,"Position":160.0,"HyperDash":false},{"StartTime":126430.0,"Position":126.124176,"HyperDash":false},{"StartTime":126516.0,"Position":85.81763,"HyperDash":false},{"StartTime":126602.0,"Position":37.2244949,"HyperDash":false},{"StartTime":126724.0,"Position":32.57615,"HyperDash":false}]},{"StartTime":126915.0,"Objects":[{"StartTime":126915.0,"Position":120.0,"HyperDash":false},{"StartTime":126991.0,"Position":102.400024,"HyperDash":false},{"StartTime":127104.0,"Position":68.7711,"HyperDash":false}]},{"StartTime":127295.0,"Objects":[{"StartTime":127295.0,"Position":136.0,"HyperDash":false},{"StartTime":127389.0,"Position":114.741783,"HyperDash":false},{"StartTime":127484.0,"Position":83.06455,"HyperDash":false},{"StartTime":127561.0,"Position":120.434265,"HyperDash":false},{"StartTime":127674.0,"Position":136.0,"HyperDash":false}]},{"StartTime":127864.0,"Objects":[{"StartTime":127864.0,"Position":184.0,"HyperDash":false},{"StartTime":127949.0,"Position":200.744141,"HyperDash":false},{"StartTime":128035.0,"Position":221.767609,"HyperDash":false},{"StartTime":128121.0,"Position":262.7911,"HyperDash":false},{"StartTime":128243.0,"Position":289.8709,"HyperDash":false}]},{"StartTime":128434.0,"Objects":[{"StartTime":128434.0,"Position":384.0,"HyperDash":false}]},{"StartTime":128624.0,"Objects":[{"StartTime":128624.0,"Position":448.0,"HyperDash":false}]},{"StartTime":128814.0,"Objects":[{"StartTime":128814.0,"Position":448.0,"HyperDash":false},{"StartTime":128890.0,"Position":398.135345,"HyperDash":false},{"StartTime":129003.0,"Position":368.7576,"HyperDash":false}]},{"StartTime":129194.0,"Objects":[{"StartTime":129194.0,"Position":440.0,"HyperDash":false},{"StartTime":129279.0,"Position":389.377838,"HyperDash":false},{"StartTime":129365.0,"Position":370.438324,"HyperDash":false},{"StartTime":129451.0,"Position":329.820526,"HyperDash":false},{"StartTime":129573.0,"Position":267.138855,"HyperDash":false}]},{"StartTime":129763.0,"Objects":[{"StartTime":129763.0,"Position":208.0,"HyperDash":false}]},{"StartTime":129953.0,"Objects":[{"StartTime":129953.0,"Position":128.0,"HyperDash":false}]},{"StartTime":130143.0,"Objects":[{"StartTime":130143.0,"Position":208.0,"HyperDash":false}]},{"StartTime":130333.0,"Objects":[{"StartTime":130333.0,"Position":288.0,"HyperDash":false},{"StartTime":130409.0,"Position":333.1905,"HyperDash":false},{"StartTime":130522.0,"Position":378.0,"HyperDash":false}]},{"StartTime":130713.0,"Objects":[{"StartTime":130713.0,"Position":448.0,"HyperDash":false},{"StartTime":130789.0,"Position":411.8095,"HyperDash":false},{"StartTime":130902.0,"Position":358.0,"HyperDash":false}]},{"StartTime":131282.0,"Objects":[{"StartTime":131282.0,"Position":176.0,"HyperDash":false}]},{"StartTime":131662.0,"Objects":[{"StartTime":131662.0,"Position":360.0,"HyperDash":false}]},{"StartTime":131852.0,"Objects":[{"StartTime":131852.0,"Position":288.0,"HyperDash":false}]},{"StartTime":132042.0,"Objects":[{"StartTime":132042.0,"Position":200.0,"HyperDash":false}]},{"StartTime":132232.0,"Objects":[{"StartTime":132232.0,"Position":112.0,"HyperDash":false}]},{"StartTime":132421.0,"Objects":[{"StartTime":132421.0,"Position":96.0,"HyperDash":false},{"StartTime":132487.0,"Position":49.5101624,"HyperDash":false},{"StartTime":132554.0,"Position":57.3071823,"HyperDash":false},{"StartTime":132620.0,"Position":26.5927753,"HyperDash":false},{"StartTime":132687.0,"Position":15.30433,"HyperDash":false},{"StartTime":132754.0,"Position":15.7045517,"HyperDash":false},{"StartTime":132820.0,"Position":49.43814,"HyperDash":false},{"StartTime":132887.0,"Position":66.86148,"HyperDash":false},{"StartTime":132990.0,"Position":96.71054,"HyperDash":false}]},{"StartTime":133371.0,"Objects":[{"StartTime":133371.0,"Position":224.0,"HyperDash":false}]},{"StartTime":133561.0,"Objects":[{"StartTime":133561.0,"Position":312.0,"HyperDash":false}]},{"StartTime":133751.0,"Objects":[{"StartTime":133751.0,"Position":400.0,"HyperDash":false}]},{"StartTime":133940.0,"Objects":[{"StartTime":133940.0,"Position":416.0,"HyperDash":false},{"StartTime":134006.0,"Position":452.489838,"HyperDash":false},{"StartTime":134073.0,"Position":482.6928,"HyperDash":false},{"StartTime":134139.0,"Position":473.407227,"HyperDash":false},{"StartTime":134206.0,"Position":502.695679,"HyperDash":false},{"StartTime":134273.0,"Position":505.295471,"HyperDash":false},{"StartTime":134339.0,"Position":462.561859,"HyperDash":false},{"StartTime":134406.0,"Position":475.138519,"HyperDash":false},{"StartTime":134509.0,"Position":415.289459,"HyperDash":false}]},{"StartTime":134890.0,"Objects":[{"StartTime":134890.0,"Position":80.0,"HyperDash":false}]},{"StartTime":135080.0,"Objects":[{"StartTime":135080.0,"Position":160.0,"HyperDash":false}]},{"StartTime":135270.0,"Objects":[{"StartTime":135270.0,"Position":200.0,"HyperDash":false}]},{"StartTime":135459.0,"Objects":[{"StartTime":135459.0,"Position":280.0,"HyperDash":false}]},{"StartTime":135839.0,"Objects":[{"StartTime":135839.0,"Position":464.0,"HyperDash":false}]},{"StartTime":136029.0,"Objects":[{"StartTime":136029.0,"Position":376.0,"HyperDash":false}]},{"StartTime":136219.0,"Objects":[{"StartTime":136219.0,"Position":376.0,"HyperDash":false}]},{"StartTime":136409.0,"Objects":[{"StartTime":136409.0,"Position":280.0,"HyperDash":false}]},{"StartTime":136599.0,"Objects":[{"StartTime":136599.0,"Position":280.0,"HyperDash":false}]},{"StartTime":136978.0,"Objects":[{"StartTime":136978.0,"Position":56.0,"HyperDash":false},{"StartTime":137063.0,"Position":98.33999,"HyperDash":false},{"StartTime":137149.0,"Position":121.429718,"HyperDash":false},{"StartTime":137235.0,"Position":184.982086,"HyperDash":false},{"StartTime":137357.0,"Position":227.214722,"HyperDash":false}]},{"StartTime":137738.0,"Objects":[{"StartTime":137738.0,"Position":456.0,"HyperDash":false},{"StartTime":137823.0,"Position":411.66,"HyperDash":false},{"StartTime":137909.0,"Position":389.570282,"HyperDash":false},{"StartTime":137995.0,"Position":336.0179,"HyperDash":false},{"StartTime":138117.0,"Position":284.785278,"HyperDash":false}]},{"StartTime":138497.0,"Objects":[{"StartTime":138497.0,"Position":256.0,"HyperDash":false}]},{"StartTime":138687.0,"Objects":[{"StartTime":138687.0,"Position":200.0,"HyperDash":false}]},{"StartTime":138877.0,"Objects":[{"StartTime":138877.0,"Position":256.0,"HyperDash":false}]},{"StartTime":139067.0,"Objects":[{"StartTime":139067.0,"Position":312.0,"HyperDash":false},{"StartTime":139143.0,"Position":331.1905,"HyperDash":false},{"StartTime":139256.0,"Position":402.0,"HyperDash":false}]},{"StartTime":139447.0,"Objects":[{"StartTime":139447.0,"Position":400.0,"HyperDash":false},{"StartTime":139541.0,"Position":424.6438,"HyperDash":false},{"StartTime":139636.0,"Position":490.0,"HyperDash":false},{"StartTime":139713.0,"Position":436.667542,"HyperDash":false},{"StartTime":139826.0,"Position":400.0,"HyperDash":false}]},{"StartTime":140016.0,"Objects":[{"StartTime":140016.0,"Position":400.0,"HyperDash":false},{"StartTime":140101.0,"Position":405.018951,"HyperDash":false},{"StartTime":140187.0,"Position":337.8755,"HyperDash":false},{"StartTime":140273.0,"Position":336.351257,"HyperDash":false},{"StartTime":140395.0,"Position":259.5054,"HyperDash":false}]},{"StartTime":140586.0,"Objects":[{"StartTime":140586.0,"Position":224.0,"HyperDash":false}]},{"StartTime":140776.0,"Objects":[{"StartTime":140776.0,"Position":296.0,"HyperDash":false}]},{"StartTime":140966.0,"Objects":[{"StartTime":140966.0,"Position":224.0,"HyperDash":false}]},{"StartTime":141156.0,"Objects":[{"StartTime":141156.0,"Position":296.0,"HyperDash":false}]},{"StartTime":141345.0,"Objects":[{"StartTime":141345.0,"Position":256.0,"HyperDash":false},{"StartTime":141430.0,"Position":196.648087,"HyperDash":false},{"StartTime":141516.0,"Position":175.249878,"HyperDash":false},{"StartTime":141602.0,"Position":133.184525,"HyperDash":false},{"StartTime":141724.0,"Position":114.597687,"HyperDash":false}]},{"StartTime":141915.0,"Objects":[{"StartTime":141915.0,"Position":112.0,"HyperDash":false},{"StartTime":142009.0,"Position":98.0,"HyperDash":false},{"StartTime":142104.0,"Position":112.0,"HyperDash":false},{"StartTime":142181.0,"Position":98.0,"HyperDash":false},{"StartTime":142294.0,"Position":112.0,"HyperDash":false}]},{"StartTime":142485.0,"Objects":[{"StartTime":142485.0,"Position":112.0,"HyperDash":false}]},{"StartTime":142580.0,"Objects":[{"StartTime":142580.0,"Position":112.0,"HyperDash":false}]},{"StartTime":142675.0,"Objects":[{"StartTime":142675.0,"Position":112.0,"HyperDash":false}]},{"StartTime":142864.0,"Objects":[{"StartTime":142864.0,"Position":112.0,"HyperDash":false}]},{"StartTime":143054.0,"Objects":[{"StartTime":143054.0,"Position":232.0,"HyperDash":false},{"StartTime":143139.0,"Position":225.714432,"HyperDash":false},{"StartTime":143225.0,"Position":180.464615,"HyperDash":false},{"StartTime":143311.0,"Position":216.858948,"HyperDash":false},{"StartTime":143433.0,"Position":221.927963,"HyperDash":false}]},{"StartTime":143814.0,"Objects":[{"StartTime":143814.0,"Position":280.0,"HyperDash":false},{"StartTime":143899.0,"Position":293.285583,"HyperDash":false},{"StartTime":143985.0,"Position":317.53537,"HyperDash":false},{"StartTime":144071.0,"Position":329.141052,"HyperDash":false},{"StartTime":144193.0,"Position":290.072052,"HyperDash":false}]},{"StartTime":144573.0,"Objects":[{"StartTime":144573.0,"Position":256.0,"HyperDash":false}]},{"StartTime":144763.0,"Objects":[{"StartTime":144763.0,"Position":344.0,"HyperDash":false}]},{"StartTime":144953.0,"Objects":[{"StartTime":144953.0,"Position":416.0,"HyperDash":false}]},{"StartTime":145143.0,"Objects":[{"StartTime":145143.0,"Position":416.0,"HyperDash":false},{"StartTime":145228.0,"Position":392.6306,"HyperDash":false},{"StartTime":145314.0,"Position":338.7863,"HyperDash":false},{"StartTime":145400.0,"Position":289.941956,"HyperDash":false},{"StartTime":145522.0,"Position":236.0,"HyperDash":false}]},{"StartTime":145713.0,"Objects":[{"StartTime":145713.0,"Position":144.0,"HyperDash":false}]},{"StartTime":145902.0,"Objects":[{"StartTime":145902.0,"Position":80.0,"HyperDash":false}]},{"StartTime":146092.0,"Objects":[{"StartTime":146092.0,"Position":16.0,"HyperDash":false}]},{"StartTime":146472.0,"Objects":[{"StartTime":146472.0,"Position":256.0,"HyperDash":false}]},{"StartTime":146852.0,"Objects":[{"StartTime":146852.0,"Position":496.0,"HyperDash":false}]},{"StartTime":147137.0,"Objects":[{"StartTime":147137.0,"Position":352.0,"HyperDash":false}]},{"StartTime":147421.0,"Objects":[{"StartTime":147421.0,"Position":160.0,"HyperDash":false}]},{"StartTime":147611.0,"Objects":[{"StartTime":147611.0,"Position":256.0,"HyperDash":false}]},{"StartTime":147991.0,"Objects":[{"StartTime":147991.0,"Position":256.0,"HyperDash":false}]},{"StartTime":148371.0,"Objects":[{"StartTime":148371.0,"Position":256.0,"HyperDash":false}]},{"StartTime":148561.0,"Objects":[{"StartTime":148561.0,"Position":368.0,"HyperDash":false}]},{"StartTime":148751.0,"Objects":[{"StartTime":148751.0,"Position":256.0,"HyperDash":false}]},{"StartTime":148940.0,"Objects":[{"StartTime":148940.0,"Position":144.0,"HyperDash":false}]},{"StartTime":149130.0,"Objects":[{"StartTime":149130.0,"Position":288.0,"HyperDash":false}]},{"StartTime":149225.0,"Objects":[{"StartTime":149225.0,"Position":312.0,"HyperDash":false}]},{"StartTime":149320.0,"Objects":[{"StartTime":149320.0,"Position":336.0,"HyperDash":false}]},{"StartTime":149415.0,"Objects":[{"StartTime":149415.0,"Position":312.0,"HyperDash":false}]},{"StartTime":149510.0,"Objects":[{"StartTime":149510.0,"Position":288.0,"HyperDash":false}]},{"StartTime":149700.0,"Objects":[{"StartTime":149700.0,"Position":224.0,"HyperDash":false}]},{"StartTime":149795.0,"Objects":[{"StartTime":149795.0,"Position":200.0,"HyperDash":false}]},{"StartTime":149890.0,"Objects":[{"StartTime":149890.0,"Position":176.0,"HyperDash":false}]},{"StartTime":149985.0,"Objects":[{"StartTime":149985.0,"Position":200.0,"HyperDash":false}]},{"StartTime":150080.0,"Objects":[{"StartTime":150080.0,"Position":224.0,"HyperDash":false}]},{"StartTime":150175.0,"Objects":[{"StartTime":150175.0,"Position":256.0,"HyperDash":false}]},{"StartTime":150270.0,"Objects":[{"StartTime":150270.0,"Position":256.0,"HyperDash":false}]},{"StartTime":150649.0,"Objects":[{"StartTime":150649.0,"Position":168.0,"HyperDash":false},{"StartTime":150725.0,"Position":142.229309,"HyperDash":false},{"StartTime":150838.0,"Position":168.0,"HyperDash":false}]},{"StartTime":151029.0,"Objects":[{"StartTime":151029.0,"Position":344.0,"HyperDash":false},{"StartTime":151105.0,"Position":368.7707,"HyperDash":false},{"StartTime":151218.0,"Position":344.0,"HyperDash":false}]},{"StartTime":151409.0,"Objects":[{"StartTime":151409.0,"Position":256.0,"HyperDash":false}]},{"StartTime":151599.0,"Objects":[{"StartTime":151599.0,"Position":256.0,"HyperDash":false}]},{"StartTime":151694.0,"Objects":[{"StartTime":151694.0,"Position":256.0,"HyperDash":false}]},{"StartTime":151788.0,"Objects":[{"StartTime":151788.0,"Position":256.0,"HyperDash":false}]},{"StartTime":151978.0,"Objects":[{"StartTime":151978.0,"Position":464.0,"HyperDash":false},{"StartTime":152063.0,"Position":422.517944,"HyperDash":false},{"StartTime":152149.0,"Position":426.162018,"HyperDash":false},{"StartTime":152235.0,"Position":393.104584,"HyperDash":false},{"StartTime":152357.0,"Position":346.162628,"HyperDash":true}]},{"StartTime":152548.0,"Objects":[{"StartTime":152548.0,"Position":48.0,"HyperDash":false},{"StartTime":152633.0,"Position":100.48204,"HyperDash":false},{"StartTime":152719.0,"Position":77.83798,"HyperDash":false},{"StartTime":152805.0,"Position":114.895416,"HyperDash":false},{"StartTime":152927.0,"Position":165.837372,"HyperDash":false}]},{"StartTime":153118.0,"Objects":[{"StartTime":153118.0,"Position":256.0,"HyperDash":false}]},{"StartTime":153213.0,"Objects":[{"StartTime":153213.0,"Position":256.0,"HyperDash":false}]},{"StartTime":153307.0,"Objects":[{"StartTime":153307.0,"Position":256.0,"HyperDash":false}]},{"StartTime":153497.0,"Objects":[{"StartTime":153497.0,"Position":168.0,"HyperDash":false},{"StartTime":153582.0,"Position":217.34,"HyperDash":false},{"StartTime":153668.0,"Position":235.429718,"HyperDash":false},{"StartTime":153754.0,"Position":295.9821,"HyperDash":false},{"StartTime":153876.0,"Position":339.214722,"HyperDash":false}]},{"StartTime":154067.0,"Objects":[{"StartTime":154067.0,"Position":168.0,"HyperDash":false},{"StartTime":154143.0,"Position":134.40947,"HyperDash":false},{"StartTime":154256.0,"Position":104.3604,"HyperDash":false}]},{"StartTime":154447.0,"Objects":[{"StartTime":154447.0,"Position":344.0,"HyperDash":false},{"StartTime":154523.0,"Position":362.5905,"HyperDash":false},{"StartTime":154636.0,"Position":407.6396,"HyperDash":true}]},{"StartTime":154826.0,"Objects":[{"StartTime":154826.0,"Position":168.0,"HyperDash":false},{"StartTime":154902.0,"Position":150.40947,"HyperDash":false},{"StartTime":155015.0,"Position":104.3604,"HyperDash":false}]},{"StartTime":155206.0,"Objects":[{"StartTime":155206.0,"Position":344.0,"HyperDash":false},{"StartTime":155282.0,"Position":365.5905,"HyperDash":false},{"StartTime":155395.0,"Position":407.6396,"HyperDash":false}]},{"StartTime":155586.0,"Objects":[{"StartTime":155586.0,"Position":256.0,"HyperDash":false},{"StartTime":155680.0,"Position":270.830933,"HyperDash":false},{"StartTime":155775.0,"Position":254.810913,"HyperDash":false},{"StartTime":155852.0,"Position":238.329559,"HyperDash":false},{"StartTime":155965.0,"Position":256.0,"HyperDash":false}]},{"StartTime":156156.0,"Objects":[{"StartTime":156156.0,"Position":256.0,"HyperDash":false}]},{"StartTime":156345.0,"Objects":[{"StartTime":156345.0,"Position":256.0,"HyperDash":false}]},{"StartTime":156535.0,"Objects":[{"StartTime":156535.0,"Position":96.0,"HyperDash":false},{"StartTime":156620.0,"Position":138.369385,"HyperDash":false},{"StartTime":156706.0,"Position":196.213715,"HyperDash":false},{"StartTime":156792.0,"Position":213.399918,"HyperDash":false},{"StartTime":156914.0,"Position":244.507538,"HyperDash":false}]},{"StartTime":157105.0,"Objects":[{"StartTime":157105.0,"Position":152.0,"HyperDash":false},{"StartTime":157181.0,"Position":158.0,"HyperDash":false},{"StartTime":157294.0,"Position":122.301514,"HyperDash":false}]},{"StartTime":157485.0,"Objects":[{"StartTime":157485.0,"Position":32.0,"HyperDash":false},{"StartTime":157561.0,"Position":15.0,"HyperDash":false},{"StartTime":157674.0,"Position":61.6984863,"HyperDash":false}]},{"StartTime":157864.0,"Objects":[{"StartTime":157864.0,"Position":152.0,"HyperDash":true}]},{"StartTime":158054.0,"Objects":[{"StartTime":158054.0,"Position":416.0,"HyperDash":false},{"StartTime":158139.0,"Position":368.6306,"HyperDash":false},{"StartTime":158225.0,"Position":342.7863,"HyperDash":false},{"StartTime":158311.0,"Position":278.600067,"HyperDash":false},{"StartTime":158433.0,"Position":267.492462,"HyperDash":false}]},{"StartTime":158624.0,"Objects":[{"StartTime":158624.0,"Position":360.0,"HyperDash":false},{"StartTime":158700.0,"Position":345.0,"HyperDash":false},{"StartTime":158813.0,"Position":389.6985,"HyperDash":false}]},{"StartTime":159004.0,"Objects":[{"StartTime":159004.0,"Position":480.0,"HyperDash":false},{"StartTime":159080.0,"Position":483.0,"HyperDash":false},{"StartTime":159193.0,"Position":450.3015,"HyperDash":false}]},{"StartTime":159383.0,"Objects":[{"StartTime":159383.0,"Position":360.0,"HyperDash":false}]},{"StartTime":159573.0,"Objects":[{"StartTime":159573.0,"Position":255.0,"HyperDash":false},{"StartTime":159658.0,"Position":267.0,"HyperDash":false},{"StartTime":159744.0,"Position":265.0,"HyperDash":false},{"StartTime":159830.0,"Position":261.0,"HyperDash":false},{"StartTime":159952.0,"Position":255.0,"HyperDash":false}]},{"StartTime":160143.0,"Objects":[{"StartTime":160143.0,"Position":256.0,"HyperDash":false}]},{"StartTime":160333.0,"Objects":[{"StartTime":160333.0,"Position":376.0,"HyperDash":false}]},{"StartTime":160523.0,"Objects":[{"StartTime":160523.0,"Position":376.0,"HyperDash":false}]},{"StartTime":160713.0,"Objects":[{"StartTime":160713.0,"Position":256.0,"HyperDash":false}]},{"StartTime":160902.0,"Objects":[{"StartTime":160902.0,"Position":136.0,"HyperDash":false}]},{"StartTime":161092.0,"Objects":[{"StartTime":161092.0,"Position":136.0,"HyperDash":false}]},{"StartTime":161282.0,"Objects":[{"StartTime":161282.0,"Position":199.0,"HyperDash":false},{"StartTime":161341.0,"Position":494.0,"HyperDash":false},{"StartTime":161400.0,"Position":293.0,"HyperDash":false},{"StartTime":161460.0,"Position":115.0,"HyperDash":false},{"StartTime":161519.0,"Position":412.0,"HyperDash":false},{"StartTime":161578.0,"Position":506.0,"HyperDash":false},{"StartTime":161638.0,"Position":293.0,"HyperDash":false},{"StartTime":161697.0,"Position":346.0,"HyperDash":false},{"StartTime":161757.0,"Position":117.0,"HyperDash":false},{"StartTime":161816.0,"Position":285.0,"HyperDash":false},{"StartTime":161875.0,"Position":17.0,"HyperDash":false},{"StartTime":161935.0,"Position":238.0,"HyperDash":false},{"StartTime":161994.0,"Position":222.0,"HyperDash":false},{"StartTime":162053.0,"Position":450.0,"HyperDash":false},{"StartTime":162113.0,"Position":67.0,"HyperDash":false},{"StartTime":162172.0,"Position":219.0,"HyperDash":false},{"StartTime":162232.0,"Position":307.0,"HyperDash":false}]},{"StartTime":162421.0,"Objects":[{"StartTime":162421.0,"Position":256.0,"HyperDash":false}]},{"StartTime":162611.0,"Objects":[{"StartTime":162611.0,"Position":168.0,"HyperDash":false}]},{"StartTime":162706.0,"Objects":[{"StartTime":162706.0,"Position":152.0,"HyperDash":false}]},{"StartTime":162801.0,"Objects":[{"StartTime":162801.0,"Position":136.0,"HyperDash":false},{"StartTime":162886.0,"Position":184.369385,"HyperDash":false},{"StartTime":162972.0,"Position":235.213715,"HyperDash":false},{"StartTime":163058.0,"Position":243.058044,"HyperDash":false},{"StartTime":163180.0,"Position":306.314148,"HyperDash":false}]},{"StartTime":163371.0,"Objects":[{"StartTime":163371.0,"Position":392.0,"HyperDash":false},{"StartTime":163447.0,"Position":387.0,"HyperDash":false},{"StartTime":163560.0,"Position":392.0,"HyperDash":false}]},{"StartTime":163751.0,"Objects":[{"StartTime":163751.0,"Position":440.0,"HyperDash":false}]},{"StartTime":163940.0,"Objects":[{"StartTime":163940.0,"Position":344.0,"HyperDash":false}]},{"StartTime":164130.0,"Objects":[{"StartTime":164130.0,"Position":120.0,"HyperDash":false},{"StartTime":164215.0,"Position":96.0444,"HyperDash":false},{"StartTime":164301.0,"Position":55.6488266,"HyperDash":false},{"StartTime":164387.0,"Position":88.2046661,"HyperDash":false},{"StartTime":164509.0,"Position":93.82585,"HyperDash":false}]},{"StartTime":164700.0,"Objects":[{"StartTime":164700.0,"Position":232.0,"HyperDash":false},{"StartTime":164785.0,"Position":275.9556,"HyperDash":false},{"StartTime":164871.0,"Position":299.351166,"HyperDash":false},{"StartTime":164957.0,"Position":295.795349,"HyperDash":false},{"StartTime":165079.0,"Position":258.174164,"HyperDash":false}]},{"StartTime":165270.0,"Objects":[{"StartTime":165270.0,"Position":160.0,"HyperDash":false}]},{"StartTime":165459.0,"Objects":[{"StartTime":165459.0,"Position":160.0,"HyperDash":false}]},{"StartTime":165649.0,"Objects":[{"StartTime":165649.0,"Position":304.0,"HyperDash":false},{"StartTime":165734.0,"Position":324.3694,"HyperDash":false},{"StartTime":165820.0,"Position":364.7582,"HyperDash":false},{"StartTime":165906.0,"Position":401.273468,"HyperDash":false},{"StartTime":166028.0,"Position":446.4695,"HyperDash":false}]},{"StartTime":166219.0,"Objects":[{"StartTime":166219.0,"Position":320.0,"HyperDash":false},{"StartTime":166295.0,"Position":331.608,"HyperDash":false},{"StartTime":166408.0,"Position":376.222565,"HyperDash":false}]},{"StartTime":166599.0,"Objects":[{"StartTime":166599.0,"Position":456.0,"HyperDash":false},{"StartTime":166693.0,"Position":485.888763,"HyperDash":false},{"StartTime":166788.0,"Position":512.0,"HyperDash":false},{"StartTime":166865.0,"Position":508.525848,"HyperDash":false},{"StartTime":166978.0,"Position":456.0,"HyperDash":false}]},{"StartTime":167168.0,"Objects":[{"StartTime":167168.0,"Position":376.0,"HyperDash":false}]},{"StartTime":167358.0,"Objects":[{"StartTime":167358.0,"Position":376.0,"HyperDash":false},{"StartTime":167434.0,"Position":359.082825,"HyperDash":false},{"StartTime":167547.0,"Position":319.0086,"HyperDash":false}]},{"StartTime":167738.0,"Objects":[{"StartTime":167738.0,"Position":240.0,"HyperDash":false},{"StartTime":167814.0,"Position":227.391983,"HyperDash":false},{"StartTime":167927.0,"Position":183.777435,"HyperDash":false}]},{"StartTime":168118.0,"Objects":[{"StartTime":168118.0,"Position":112.0,"HyperDash":false},{"StartTime":168203.0,"Position":82.78144,"HyperDash":false},{"StartTime":168289.0,"Position":79.26619,"HyperDash":false},{"StartTime":168375.0,"Position":41.750946,"HyperDash":false},{"StartTime":168497.0,"Position":0.0,"HyperDash":true}]},{"StartTime":168687.0,"Objects":[{"StartTime":168687.0,"Position":256.0,"HyperDash":false},{"StartTime":168772.0,"Position":272.0,"HyperDash":false},{"StartTime":168858.0,"Position":270.0,"HyperDash":false},{"StartTime":168944.0,"Position":274.0,"HyperDash":false},{"StartTime":169066.0,"Position":256.0,"HyperDash":false}]},{"StartTime":169257.0,"Objects":[{"StartTime":169257.0,"Position":328.0,"HyperDash":false}]},{"StartTime":169447.0,"Objects":[{"StartTime":169447.0,"Position":256.0,"HyperDash":false}]},{"StartTime":169637.0,"Objects":[{"StartTime":169637.0,"Position":184.0,"HyperDash":false}]},{"StartTime":169827.0,"Objects":[{"StartTime":169827.0,"Position":256.0,"HyperDash":false}]},{"StartTime":170016.0,"Objects":[{"StartTime":170016.0,"Position":328.0,"HyperDash":true}]},{"StartTime":170206.0,"Objects":[{"StartTime":170206.0,"Position":32.0,"HyperDash":false},{"StartTime":170291.0,"Position":69.44879,"HyperDash":false},{"StartTime":170377.0,"Position":93.3499146,"HyperDash":false},{"StartTime":170463.0,"Position":153.251038,"HyperDash":false},{"StartTime":170585.0,"Position":203.43634,"HyperDash":true}]},{"StartTime":170776.0,"Objects":[{"StartTime":170776.0,"Position":480.0,"HyperDash":false},{"StartTime":170861.0,"Position":437.5512,"HyperDash":false},{"StartTime":170947.0,"Position":400.6501,"HyperDash":false},{"StartTime":171033.0,"Position":369.748962,"HyperDash":false},{"StartTime":171155.0,"Position":308.56366,"HyperDash":false}]},{"StartTime":171345.0,"Objects":[{"StartTime":171345.0,"Position":328.0,"HyperDash":false}]},{"StartTime":171535.0,"Objects":[{"StartTime":171535.0,"Position":184.0,"HyperDash":true}]},{"StartTime":171725.0,"Objects":[{"StartTime":171725.0,"Position":440.0,"HyperDash":false},{"StartTime":171810.0,"Position":393.6306,"HyperDash":false},{"StartTime":171896.0,"Position":358.7863,"HyperDash":false},{"StartTime":171982.0,"Position":322.941956,"HyperDash":false},{"StartTime":172104.0,"Position":260.0,"HyperDash":false}]},{"StartTime":172295.0,"Objects":[{"StartTime":172295.0,"Position":152.0,"HyperDash":false}]},{"StartTime":172485.0,"Objects":[{"StartTime":172485.0,"Position":192.0,"HyperDash":false}]},{"StartTime":172675.0,"Objects":[{"StartTime":172675.0,"Position":320.0,"HyperDash":false}]},{"StartTime":172864.0,"Objects":[{"StartTime":172864.0,"Position":360.0,"HyperDash":false}]},{"StartTime":173054.0,"Objects":[{"StartTime":173054.0,"Position":320.0,"HyperDash":false}]},{"StartTime":173244.0,"Objects":[{"StartTime":173244.0,"Position":192.0,"HyperDash":false}]},{"StartTime":173434.0,"Objects":[{"StartTime":173434.0,"Position":487.0,"HyperDash":false},{"StartTime":173528.0,"Position":53.0,"HyperDash":false},{"StartTime":173623.0,"Position":40.0,"HyperDash":false},{"StartTime":173718.0,"Position":153.0,"HyperDash":false},{"StartTime":173813.0,"Position":79.0,"HyperDash":false},{"StartTime":173908.0,"Position":488.0,"HyperDash":false},{"StartTime":174003.0,"Position":396.0,"HyperDash":false},{"StartTime":174098.0,"Position":428.0,"HyperDash":false},{"StartTime":174193.0,"Position":59.0,"HyperDash":false},{"StartTime":174288.0,"Position":255.0,"HyperDash":false},{"StartTime":174383.0,"Position":294.0,"HyperDash":false},{"StartTime":174478.0,"Position":354.0,"HyperDash":false},{"StartTime":174573.0,"Position":270.0,"HyperDash":false},{"StartTime":174668.0,"Position":362.0,"HyperDash":false},{"StartTime":174763.0,"Position":255.0,"HyperDash":false},{"StartTime":174858.0,"Position":203.0,"HyperDash":false},{"StartTime":174953.0,"Position":67.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/42587.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/42587.osu
new file mode 100644
index 0000000000..41366eab43
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/42587.osu
@@ -0,0 +1,528 @@
+osu file format v6
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:8
+CircleSize:5
+OverallDifficulty:8
+SliderMultiplier:1.8
+SliderTickRate:0.5
+
+[Events]
+//Break Periods
+2,99204,110406
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+//Background Colour Transformations
+3,100,0,0,0
+
+[TimingPoints]
+270,379.746835443038,4,2,1,85,1,0
+48782,-100,4,2,0,50,0,0
+48972,-100,4,2,0,85,0,0
+60744,-100,4,2,1,85,0,0
+60982,-100,4,2,1,65,0,0
+61171,-100,4,2,1,85,0,0
+71092,-100,4,2,1,40,0,0
+71282,-100,4,2,1,85,0,0
+71567,-100,4,2,0,60,0,0
+71852,-100,4,2,1,85,0,0
+72232,-100,4,2,1,85,0,0
+73086,-100,4,1,0,60,0,0
+74035,-100,4,1,1,50,0,0
+74890,-100,4,2,1,85,0,0
+81061,-100,4,2,1,60,0,0
+81251,-100,4,2,1,85,0,0
+82580,-100,4,2,1,60,0,0
+82770,-100,4,2,1,85,0,0
+86804,-100,4,2,1,60,0,0
+86947,-100,4,2,1,85,0,0
+87137,-100,4,2,1,60,0,0
+87326,-100,4,2,1,85,0,0
+88656,-100,4,2,1,60,0,0
+88845,-100,4,2,1,85,0,0
+92643,-100,4,2,1,60,0,0
+92833,-100,4,2,1,85,0,0
+93592,-100,4,2,1,60,0,0
+93782,-100,4,2,1,86,0,0
+94162,-100,4,2,1,60,0,0
+94352,-100,4,2,1,85,0,0
+95111,-100,4,2,1,60,0,0
+95301,-100,4,2,1,85,0,0
+98624,-100,4,1,1,70,0,0
+110966,-100,4,1,0,60,0,0
+112390,-100,4,2,1,85,0,0
+118371,-100,4,2,1,75,0,0
+118751,-100,4,2,1,65,0,0
+119130,-100,4,2,1,55,0,0
+119510,-100,4,2,1,85,0,0
+135934,-100,4,1,1,80,0,0
+136314,-100,4,2,1,85,0,0
+136883,-100,4,2,1,65,0,0
+137073,-100,4,2,1,85,0,0
+147516,-100,4,2,0,60,0,0
+147801,-100,4,2,1,85,0,0
+149035,-100,4,1,1,65,0,0
+149605,-100,4,1,1,75,0,0
+150459,-100,4,2,1,70,0,0
+150744,-100,4,2,1,85,0,0
+150934,-100,4,2,1,70,0,0
+151124,-100,4,2,1,85,0,0
+157010,-100,4,2,1,70,0,0
+157200,-100,4,2,1,85,0,0
+158529,-100,4,2,1,70,0,0
+158719,-100,4,2,1,85,0,0
+162754,-100,4,2,1,70,0,0
+162896,-100,4,2,1,85,0,0
+163466,-100,4,2,1,70,0,0
+163656,-100,4,2,1,85,0,0
+164035,-100,4,2,1,70,0,0
+164225,-100,4,2,1,85,0,0
+164605,-100,4,2,1,70,0,0
+164795,-100,4,2,1,85,0,0
+168592,-100,4,2,1,70,0,0
+168782,-100,4,2,1,85,0,0
+169542,-100,4,2,1,70,0,0
+169732,-100,4,2,1,85,0,0
+170111,-100,4,2,1,70,0,0
+170301,-100,4,2,1,85,0,0
+170681,-100,4,2,1,70,0,0
+170871,-100,4,2,1,85,0,0
+173339,-100,4,1,0,51,0,0
+
+[HitObjects]
+376,288,24383,1,0
+392,264,24478,1,0
+408,240,24573,1,8
+448,160,24763,2,0,B|344:160,1,90,0|0
+280,120,25143,1,0
+232,200,25333,1,0
+152,160,25523,2,0,B|56:160,1,90,0|0
+32,248,25902,1,0
+96,312,26092,6,0,L|144:376|264:376,2,180
+96,224,27042,1,0
+176,264,27232,2,0,B|288:264,1,90
+448,264,27801,1,0
+360,264,27991,1,0
+192,192,28371,1,0
+280,192,28561,1,0
+368,192,28751,1,0
+456,192,28940,1,0
+456,192,29130,6,0,L|408:128|288:128,2,180
+456,280,30080,1,0
+376,240,30270,2,0,B|256:240,1,90
+112,280,30839,1,0
+176,216,31029,1,0
+112,152,31219,1,0
+112,152,31314,1,0
+112,152,31409,1,0
+176,88,31599,1,0
+240,152,31788,1,0
+176,216,31978,1,0
+240,280,32168,6,0,L|296:328|416:328,2,180
+240,192,33118,1,0
+328,192,33307,2,0,L|328:152|288:96,1,90
+136,32,33877,1,0
+80,104,34067,1,0
+24,176,34257,1,0
+24,200,34352,1,0
+24,224,34447,1,0
+40,240,34542,1,0
+56,248,34637,1,0
+144,248,34826,1,0
+232,248,35016,1,0
+376,248,35206,6,0,L|408:248|464:288,2,90,0|0|0
+232,248,35776,2,0,L|200:248|144:288,1,90
+304,352,36156,1,0
+304,248,36345,2,0,B|304:152,1,90
+112,80,36725,6,0,B|16:128,1,90,8|0
+112,160,37105,2,0,B|16:208,1,90
+112,240,37485,1,0
+112,328,37675,6,0,B|24:376,2,90
+112,240,38244,1,0
+32,200,38434,1,0
+112,160,38624,1,0
+32,120,38814,1,0
+112,80,39004,1,0
+200,80,39194,6,0,B|304:80,1,90
+384,168,39573,2,0,B|272:168,1,90
+200,256,39953,2,0,B|296:256,3,90
+408,200,40713,5,0
+360,112,40902,1,0
+280,56,41092,2,0,B|192:24|88:64,1,180
+168,128,41662,2,0,B|120:136|64:176,2,90
+264,128,42232,2,0,B|384:128|448:232,1,180
+320,224,42801,2,0,B|280:312,1,90,0|0
+184,336,43181,2,0,B|232:248,1,90
+227,256,43561,1,0
+192,176,43751,6,0,B|144:256,2,90,0|0|0
+128,112,44320,2,0,B|184:32|304:40,1,180
+376,40,44890,1,0
+440,208,45270,5,0
+384,280,45459,1,0
+304,312,45649,1,0
+216,328,45839,2,0,B|141:308|112:292|56:216,1,180
+56,144,46409,1,0
+216,64,46788,5,0
+296,96,46978,1,0
+216,144,47168,1,0
+296,176,47358,1,0
+136,232,47738,1,0
+376,296,48118,1,0
+136,360,48497,1,0
+376,184,48877,6,0,B|256:184,1,90,4|0
+192,184,49257,1,0
+128,120,49447,1,0
+216,120,49637,2,0,B|328:120,3,90
+400,120,50396,2,0,B|472:200|400:304,1,180
+336,232,50966,2,0,B|264:320,1,90
+208,360,51345,5,0
+168,280,51535,1,0
+120,360,51725,1,0
+72,280,51915,2,0,B|48:176|136:112,1,180
+216,88,52485,1,0
+304,112,52675,1,0
+232,168,52864,5,0
+312,200,53054,1,0
+288,288,53244,2,0,B|368:320|456:232,1,180
+392,176,53814,2,0,B|336:72,1,90
+280,152,54194,2,0,B|184:80,1,90,0|0
+176,192,54573,1,0
+104,136,54763,2,0,B|48:248|104:336|208:344,1,270
+216,256,55523,1,0
+264,184,55713,1,0
+352,184,55902,5,0
+440,136,56092,1,0
+352,88,56282,1,0
+264,88,56472,2,0,B|144:-16|8:96,1,270
+160,152,57421,5,0
+32,216,57611,1,0
+160,280,57801,1,0
+248,312,57991,2,0,B|368:416|504:304,1,270
+360,192,58940,5,0
+256,192,59130,1,0
+152,192,59320,1,0
+168,96,59510,2,0,B|256:56|368:104,3,180
+408,136,60839,1,4
+408,136,60934,1,4
+408,136,61029,6,0,B|352:216|296:296,1,180,8|4
+304,283,61599,1,0
+216,280,61788,2,0,B|263:212|319:132,1,180,0|4
+319,132,62358,1,0
+240,96,62548,6,0,B|312:0,2,90,0|0|4
+192,168,63118,2,0,B|136:248|80:328,1,180,0|0
+176,312,63687,1,4
+264,312,63877,1,0
+352,312,64067,6,0,B|448:248|416:120,1,180,0|4
+352,208,64637,1,0
+272,168,64826,2,0,B|344:72,1,90
+326,96,65206,1,4
+272,24,65396,2,0,B|160:56|168:184,1,180
+104,96,65966,1,4
+48,168,66156,1,0
+104,232,66345,1,0
+56,312,66535,1,0
+80,328,66630,1,0
+104,344,66725,1,4
+192,312,66915,1,0
+280,344,67105,6,0,B|436:254,1,180,0|4
+448,168,67675,1,0
+456,80,67864,2,0,B|299:169,1,180,0|4
+288,256,68434,1,0
+208,296,68624,5,0
+128,256,68814,1,0
+48,296,69004,1,4
+128,256,69194,2,0,B|208:192|192:80,1,180
+256,32,69763,1,4
+256,32,69953,1,0
+318,96,70143,6,0,B|304:192|384:256,1,180,0|4
+256,120,70902,2,0,B|224:184|304:200|248:264,2,135
+256,32,71662,5,4
+256,32,72042,1,4
+160,144,72421,5,2
+224,144,72611,1,2
+288,144,72801,1,2
+352,144,72991,1,2
+408,216,73181,5,0
+304,216,73371,1,0
+208,216,73561,1,0
+112,216,73751,1,0
+160,288,73940,5,0
+224,288,74130,1,8
+248,288,74225,1,8
+272,288,74320,1,8
+296,288,74415,1,0
+320,288,74510,1,0
+344,288,74605,1,4
+368,288,74700,6,0,B|464:256|480:136,1,180,4|4
+368,64,75270,1,0
+296,176,75459,2,0,B|240:208|184:152,1,90
+144,64,75839,1,4
+168,328,76029,6,0,B|224:344|262:347|352:328,1,180,0|0
+344,192,76599,2,0,B|282:175|232:167|144:200,1,180,4|0
+256,256,77168,1,0
+256,256,77358,1,4
+424,256,77548,6,0,B|444:180|440:128|424:72,1,180
+296,32,78118,2,0,B|336:144,1,90,4|0
+240,264,78497,2,0,B|280:152,1,90
+168,32,78877,2,0,B|200:120,1,90,4|0
+104,264,79257,2,0,B|136:176,1,90
+48,120,79637,2,0,B|8:16,2,90,4|0|0
+48,120,80206,1,4
+48,120,80396,1,4
+48,256,80586,6,0,B|72:360|192:360,1,180,0|0
+334,359,81156,2,0,B|440:360|464:256,1,180,12|0
+256,192,81725,1,0
+256,192,81915,1,4
+48,128,82105,6,0,B|72:24|192:24,1,180,0|0
+334,25,82675,2,0,B|440:24|464:128,1,180,12|0
+256,192,83244,1,0
+256,192,83434,1,4
+177,24,83624,6,0,B|72:24|48:128,1,180
+240,96,84194,2,0,B|128:120,1,90,4|0
+40,208,84573,2,0,B|160:184,1,90,0|0
+280,216,84953,2,0,B|184:240,1,90,4|0
+256,208,85333,12,4,86282
+256,192,86472,5,4
+128,80,86662,5,4
+152,64,86757,1,4
+176,48,86852,2,0,B|288:48,1,90,12|0
+360,56,87232,2,0,L|288:112|176:112,1,180,12|0
+136,176,87801,2,0,B|240:176,1,90,0|4
+440,352,88181,6,0,L|389:352|344:312|272:360,1,180,0|0
+72,352,88751,2,0,L|122:352|168:312|240:360,1,180,12|0
+256,192,89320,2,0,B|256:240,2,45,0|0|4
+488,48,89700,6,0,B|389:33|304:88,1,180
+256,192,90270,1,4
+160,280,90459,1,0
+64,192,90649,1,0
+160,104,90839,1,0
+256,192,91029,1,4
+352,280,91219,1,0
+448,192,91409,1,0
+352,104,91599,1,0
+256,192,91788,1,4
+256,64,91978,1,0
+256,192,92168,1,0
+256,192,92358,2,0,B|256:304,1,90,4|4
+32,32,92738,6,0,L|144:32|200:88,1,180,8|0
+64,128,93307,2,0,B|127:191,1,90,4|0
+256,152,93687,2,0,B|319:215,1,90,8|0
+424,304,94067,1,4
+256,368,94257,6,0,L|192:328|192:216,1,180,8|0
+328,224,94826,2,0,B|440:224,2,90,4|0|8
+328,88,95396,1,0
+328,88,95586,1,4
+192,88,95776,6,0,B|104:67|12:88,1,180,0|2
+56,192,96345,2,0,B|176:192,1,90,6|2
+232,232,96725,1,2
+280,152,96915,1,2
+360,192,97105,2,12,B|472:192,1,90,6|2
+256,208,97485,12,4,99004
+256,352,111156,5,4
+256,192,111915,1,0
+256,192,112105,1,0
+256,192,112295,1,0
+256,104,112485,1,0
+328,48,112675,6,0,B|416:48|456:88|456:160,1,180
+456,232,113244,1,0
+456,320,113434,1,0
+368,336,113624,2,0,B|304:336|272:392,2,90
+456,320,114194,2,0,B|416:256|376:232|288:224,1,180
+256,296,114763,2,0,B|200:288|160:240,1,90
+112,192,115143,5,0
+176,256,115333,1,0
+240,192,115523,1,0
+176,128,115713,2,0,B|224:48|344:48,1,180
+296,128,116282,1,0
+360,192,116472,1,0
+448,192,116662,6,0,B|368:272,1,90
+384,352,117042,2,0,B|264:360|216:232,1,180
+280,192,117611,2,0,B|323:159|280:104,1,90
+192,112,117991,2,0,B|155:158|198:191,1,90
+248,360,118561,1,0
+248,296,118940,1,0
+248,232,119320,1,0
+448,240,119700,5,0
+384,304,119890,1,0
+320,240,120080,1,0
+256,304,120270,2,0,B|176:336|48:296,1,180
+80,304,120839,1,0
+32,32,121219,5,0
+120,136,121409,1,0
+208,32,121599,1,0
+296,136,121788,2,0,B|376:104|504:144,1,180
+472,136,122358,1,0
+208,192,122738,5,0
+256,112,122928,1,0
+304,192,123117,1,0
+256,272,123307,1,0
+256,48,123687,1,0
+256,336,124067,1,0
+256,248,124257,5,4
+256,160,124447,1,4
+256,72,124637,1,4
+256,72,124732,1,4
+256,72,124826,2,4,B|376:72|376:176,1,180,0|4
+456,224,125396,1,0
+392,288,125586,1,0
+304,288,125776,6,0,B|200:352,1,90,0|4
+192,248,126156,1,0
+160,336,126345,2,0,B|48:336|24:192,1,180,0|4
+120,224,126915,2,0,B|48:120,1,90
+136,96,127295,2,0,B|72:8,2,90,0|4|0
+184,168,127864,2,0,B|312:344,1,180,0|4
+384,312,128434,1,0
+448,256,128624,1,0
+448,168,128814,6,0,B|344:112,1,90,0|4
+440,72,129194,2,0,B|368:40|328:40|248:80,1,180
+208,136,129763,1,4
+128,184,129953,1,0
+208,232,130143,1,0
+288,184,130333,2,0,B|400:184,1,90,0|4
+448,248,130713,2,0,B|352:248,1,90
+176,248,131282,1,4
+360,248,131662,1,0
+288,192,131852,5,0
+200,192,132042,1,4
+112,192,132232,1,0
+96,288,132421,2,0,B|0:256|-32:144|112:88,1,270
+224,192,133371,5,0
+312,192,133561,1,4
+400,192,133751,1,0
+416,288,133940,2,0,B|512:256|544:144|400:88,1,270
+80,192,134890,5,0
+160,152,135080,1,4
+200,232,135270,1,0
+280,192,135459,1,0
+464,192,135839,1,4
+376,192,136029,1,0
+376,192,136219,1,0
+280,192,136409,1,4
+280,192,136599,1,4
+56,216,136978,6,0,B|144:272|256:200,1,180,8|4
+456,168,137738,2,0,B|368:112|256:184,1,180,0|4
+256,32,138497,5,0
+200,104,138687,1,0
+256,176,138877,1,4
+312,104,139067,2,0,B|424:104,1,90
+400,192,139447,2,0,B|504:192,2,90,0|4|0
+400,280,140016,6,0,B|400:368|232:352,1,180,0|4
+224,272,140586,1,0
+296,216,140776,1,0
+224,168,140966,1,0
+296,112,141156,1,4
+256,32,141345,2,0,B|107:25|115:113,1,180,0|0
+112,200,141915,2,0,B|112:312,2,90,4|0|0
+112,112,142485,1,0
+112,112,142580,1,0
+112,112,142675,1,4
+112,24,142864,1,0
+232,8,143054,6,0,B|152:96|248:208,1,180,0|4
+280,376,143814,2,0,B|360:288|264:176,1,180,0|4
+256,32,144573,5,0
+344,32,144763,1,0
+416,88,144953,1,4
+416,176,145143,2,0,B|232:176,1,180
+144,176,145713,1,4
+80,112,145902,1,0
+16,176,146092,5,0
+256,304,146472,1,4
+496,176,146852,1,0
+352,32,147137,1,0
+160,32,147421,1,0
+256,160,147611,5,4
+256,224,147991,1,4
+256,96,148371,5,2
+368,192,148561,1,2
+256,288,148751,1,2
+144,192,148940,1,2
+288,144,149130,5,0
+312,168,149225,1,8
+336,192,149320,1,0
+312,216,149415,1,8
+288,240,149510,1,0
+224,144,149700,5,0
+200,168,149795,1,8
+176,192,149890,1,0
+200,216,149985,1,8
+224,240,150080,1,0
+256,256,150175,1,8
+256,288,150270,1,0
+168,24,150649,6,4,L|152:56|168:80|168:128,1,90,8|0
+344,24,151029,2,0,L|360:56|344:80|344:128,1,90,12|0
+256,264,151409,1,8
+256,80,151599,1,0
+256,80,151694,1,0
+256,80,151788,1,4
+464,224,151978,6,0,L|424:240|424:240|440:280|328:280,1,180,0|0
+48,280,152548,2,0,L|88:264|88:264|72:224|184:224,1,180,4|0
+256,80,153118,1,0
+256,80,153213,1,0
+256,80,153307,1,4
+168,312,153497,6,0,B|256:368|368:296,1,180
+168,248,154067,2,0,B|96:176,1,90,4|0
+344,248,154447,2,0,B|416:176,1,90
+168,160,154826,2,0,B|96:88,1,90,4|0
+344,160,155206,2,0,B|416:88,1,90
+256,352,155586,2,0,B|280:312|216:296|272:248,2,90,4|0|0
+256,352,156156,1,4
+256,352,156345,1,4
+96,32,156535,6,0,L|208:32|264:120,1,180,0|0
+152,96,157105,2,0,L|152:144|112:184,1,90,12|0
+32,176,157485,2,0,L|32:224|64:256,1,90
+152,256,157864,1,4
+416,352,158054,6,0,L|304:352|248:264,1,180
+360,288,158624,2,0,L|360:240|400:200,1,90,12|0
+480,208,159004,2,0,L|480:160|448:128,1,90
+360,128,159383,1,4
+255,236,159573,6,0,B|255:52,1,180
+256,56,160143,1,4
+376,120,160333,1,0
+376,264,160523,1,0
+256,328,160713,1,0
+136,264,160902,1,4
+136,120,161092,1,0
+256,208,161282,12,4,162232
+256,192,162421,5,4
+168,320,162611,5,4
+152,336,162706,1,4
+136,352,162801,2,0,L|264:352|320:312,1,180,12|4
+392,352,163371,2,0,B|392:248,1,90,0|8
+440,184,163751,1,0
+344,184,163940,1,4
+120,32,164130,6,0,B|8:64|120:216,1,180,8|0
+232,136,164700,2,0,B|344:168|232:320,1,180,8|0
+160,360,165270,1,0
+160,360,165459,1,4
+304,360,165649,6,0,L|384:360|448:280,1,180
+320,288,166219,2,0,B|384:208,1,90,4|0
+456,120,166599,2,0,B|512:50,2,90,0|0|4
+376,216,167168,1,0
+376,88,167358,2,0,B|304:176,1,90
+240,120,167738,2,0,B|176:200,1,90,4|0
+112,144,168118,2,0,B|-16:304,1,180,0|4
+256,360,168687,6,0,B|256:168,1,180,8|0
+328,96,169257,1,4
+256,16,169447,1,0
+184,96,169637,1,8
+256,176,169827,1,0
+328,96,170016,1,4
+32,304,170206,6,0,B|232:240,1,180,8|0
+480,80,170776,2,0,B|280:144,1,180,8|0
+328,280,171345,1,0
+184,104,171535,1,4
+440,192,171725,6,4,B|248:192,1,180,0|2
+152,192,172295,1,2
+192,72,172485,1,2
+320,72,172675,1,2
+360,192,172864,1,2
+320,312,173054,1,2
+192,312,173244,1,2
+256,208,173434,12,4,174953
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/50859-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/50859-expected-conversion.json
new file mode 100644
index 0000000000..ee89090492
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/50859-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":179.0,"Objects":[{"StartTime":179.0,"Position":120.0,"HyperDash":false}]},{"StartTime":786.0,"Objects":[{"StartTime":786.0,"Position":311.0,"HyperDash":false},{"StartTime":852.0,"Position":322.1386,"HyperDash":false},{"StartTime":919.0,"Position":352.673279,"HyperDash":false},{"StartTime":986.0,"Position":387.207916,"HyperDash":false},{"StartTime":1089.0,"Position":431.0,"HyperDash":false}]},{"StartTime":1392.0,"Objects":[{"StartTime":1392.0,"Position":431.0,"HyperDash":false},{"StartTime":1458.0,"Position":419.8614,"HyperDash":false},{"StartTime":1525.0,"Position":395.326721,"HyperDash":false},{"StartTime":1592.0,"Position":352.792084,"HyperDash":false},{"StartTime":1695.0,"Position":311.0,"HyperDash":false}]},{"StartTime":1998.0,"Objects":[{"StartTime":1998.0,"Position":215.0,"HyperDash":false}]},{"StartTime":2301.0,"Objects":[{"StartTime":2301.0,"Position":119.0,"HyperDash":false},{"StartTime":2376.0,"Position":147.702972,"HyperDash":false},{"StartTime":2452.0,"Position":163.801971,"HyperDash":false},{"StartTime":2528.0,"Position":200.900986,"HyperDash":false},{"StartTime":2604.0,"Position":239.0,"HyperDash":false},{"StartTime":2679.0,"Position":264.702972,"HyperDash":false},{"StartTime":2755.0,"Position":312.801971,"HyperDash":false},{"StartTime":2831.0,"Position":332.901,"HyperDash":false},{"StartTime":2907.0,"Position":359.0,"HyperDash":false},{"StartTime":2973.0,"Position":390.1386,"HyperDash":false},{"StartTime":3040.0,"Position":392.673279,"HyperDash":false},{"StartTime":3107.0,"Position":429.207916,"HyperDash":false},{"StartTime":3210.0,"Position":479.0,"HyperDash":false}]},{"StartTime":3513.0,"Objects":[{"StartTime":3513.0,"Position":478.0,"HyperDash":false}]},{"StartTime":3816.0,"Objects":[{"StartTime":3816.0,"Position":382.0,"HyperDash":false},{"StartTime":3882.0,"Position":373.8614,"HyperDash":false},{"StartTime":3949.0,"Position":346.326721,"HyperDash":false},{"StartTime":4016.0,"Position":315.792084,"HyperDash":false},{"StartTime":4119.0,"Position":262.0,"HyperDash":false}]},{"StartTime":4422.0,"Objects":[{"StartTime":4422.0,"Position":166.0,"HyperDash":false},{"StartTime":4488.0,"Position":158.0,"HyperDash":false},{"StartTime":4555.0,"Position":149.0,"HyperDash":false},{"StartTime":4622.0,"Position":179.0,"HyperDash":false},{"StartTime":4725.0,"Position":166.0,"HyperDash":false}]},{"StartTime":5331.0,"Objects":[{"StartTime":5331.0,"Position":166.0,"HyperDash":false}]},{"StartTime":5634.0,"Objects":[{"StartTime":5634.0,"Position":261.0,"HyperDash":false},{"StartTime":5691.0,"Position":278.649017,"HyperDash":false},{"StartTime":5785.0,"Position":321.0,"HyperDash":false}]},{"StartTime":6089.0,"Objects":[{"StartTime":6089.0,"Position":321.0,"HyperDash":false},{"StartTime":6146.0,"Position":325.0,"HyperDash":false},{"StartTime":6240.0,"Position":321.0,"HyperDash":false}]},{"StartTime":6543.0,"Objects":[{"StartTime":6543.0,"Position":321.0,"HyperDash":false}]},{"StartTime":6998.0,"Objects":[{"StartTime":6998.0,"Position":465.0,"HyperDash":false},{"StartTime":7055.0,"Position":450.0,"HyperDash":false},{"StartTime":7149.0,"Position":465.0,"HyperDash":false}]},{"StartTime":7452.0,"Objects":[{"StartTime":7452.0,"Position":369.0,"HyperDash":false},{"StartTime":7518.0,"Position":365.0,"HyperDash":false},{"StartTime":7585.0,"Position":368.0,"HyperDash":false},{"StartTime":7652.0,"Position":383.0,"HyperDash":false},{"StartTime":7755.0,"Position":369.0,"HyperDash":false}]},{"StartTime":8058.0,"Objects":[{"StartTime":8058.0,"Position":464.0,"HyperDash":false}]},{"StartTime":8361.0,"Objects":[{"StartTime":8361.0,"Position":464.0,"HyperDash":false},{"StartTime":8427.0,"Position":422.8614,"HyperDash":false},{"StartTime":8494.0,"Position":392.326721,"HyperDash":false},{"StartTime":8561.0,"Position":368.792084,"HyperDash":false},{"StartTime":8664.0,"Position":344.0,"HyperDash":false}]},{"StartTime":8967.0,"Objects":[{"StartTime":8967.0,"Position":248.0,"HyperDash":false}]},{"StartTime":9270.0,"Objects":[{"StartTime":9270.0,"Position":200.0,"HyperDash":false}]},{"StartTime":9573.0,"Objects":[{"StartTime":9573.0,"Position":296.0,"HyperDash":false}]},{"StartTime":10180.0,"Objects":[{"StartTime":10180.0,"Position":275.0,"HyperDash":false}]},{"StartTime":10483.0,"Objects":[{"StartTime":10483.0,"Position":179.0,"HyperDash":false}]},{"StartTime":10786.0,"Objects":[{"StartTime":10786.0,"Position":179.0,"HyperDash":false},{"StartTime":10852.0,"Position":218.138611,"HyperDash":false},{"StartTime":10919.0,"Position":248.673264,"HyperDash":false},{"StartTime":10986.0,"Position":257.207916,"HyperDash":false},{"StartTime":11089.0,"Position":299.0,"HyperDash":false}]},{"StartTime":11392.0,"Objects":[{"StartTime":11392.0,"Position":299.0,"HyperDash":false}]},{"StartTime":11695.0,"Objects":[{"StartTime":11695.0,"Position":203.0,"HyperDash":false},{"StartTime":11752.0,"Position":173.351,"HyperDash":false},{"StartTime":11846.0,"Position":143.0,"HyperDash":false}]},{"StartTime":11998.0,"Objects":[{"StartTime":11998.0,"Position":94.0,"HyperDash":false}]},{"StartTime":12301.0,"Objects":[{"StartTime":12301.0,"Position":94.0,"HyperDash":false}]},{"StartTime":12604.0,"Objects":[{"StartTime":12604.0,"Position":189.0,"HyperDash":false}]},{"StartTime":13513.0,"Objects":[{"StartTime":13513.0,"Position":476.0,"HyperDash":false}]},{"StartTime":13816.0,"Objects":[{"StartTime":13816.0,"Position":380.0,"HyperDash":false}]},{"StartTime":14725.0,"Objects":[{"StartTime":14725.0,"Position":272.0,"HyperDash":false},{"StartTime":14782.0,"Position":248.351,"HyperDash":false},{"StartTime":14876.0,"Position":212.0,"HyperDash":false}]},{"StartTime":15028.0,"Objects":[{"StartTime":15028.0,"Position":177.0,"HyperDash":false},{"StartTime":15085.0,"Position":196.0,"HyperDash":false},{"StartTime":15179.0,"Position":177.0,"HyperDash":false}]},{"StartTime":15331.0,"Objects":[{"StartTime":15331.0,"Position":225.0,"HyperDash":false}]},{"StartTime":15483.0,"Objects":[{"StartTime":15483.0,"Position":273.0,"HyperDash":false}]},{"StartTime":15786.0,"Objects":[{"StartTime":15786.0,"Position":273.0,"HyperDash":false}]},{"StartTime":16089.0,"Objects":[{"StartTime":16089.0,"Position":273.0,"HyperDash":false}]},{"StartTime":16846.0,"Objects":[{"StartTime":16846.0,"Position":33.0,"HyperDash":false},{"StartTime":16903.0,"Position":27.0,"HyperDash":false},{"StartTime":16997.0,"Position":33.0,"HyperDash":false}]},{"StartTime":17149.0,"Objects":[{"StartTime":17149.0,"Position":33.0,"HyperDash":false}]},{"StartTime":17755.0,"Objects":[{"StartTime":17755.0,"Position":224.0,"HyperDash":false}]},{"StartTime":18967.0,"Objects":[{"StartTime":18967.0,"Position":277.0,"HyperDash":false}]},{"StartTime":19119.0,"Objects":[{"StartTime":19119.0,"Position":228.0,"HyperDash":false}]},{"StartTime":19270.0,"Objects":[{"StartTime":19270.0,"Position":181.0,"HyperDash":false}]},{"StartTime":19573.0,"Objects":[{"StartTime":19573.0,"Position":181.0,"HyperDash":false}]},{"StartTime":19876.0,"Objects":[{"StartTime":19876.0,"Position":181.0,"HyperDash":false}]},{"StartTime":20786.0,"Objects":[{"StartTime":20786.0,"Position":469.0,"HyperDash":false}]},{"StartTime":21089.0,"Objects":[{"StartTime":21089.0,"Position":373.0,"HyperDash":false}]},{"StartTime":21392.0,"Objects":[{"StartTime":21392.0,"Position":277.0,"HyperDash":false}]},{"StartTime":21998.0,"Objects":[{"StartTime":21998.0,"Position":243.0,"HyperDash":false}]},{"StartTime":22149.0,"Objects":[{"StartTime":22149.0,"Position":243.0,"HyperDash":false}]},{"StartTime":22301.0,"Objects":[{"StartTime":22301.0,"Position":243.0,"HyperDash":false}]},{"StartTime":22452.0,"Objects":[{"StartTime":22452.0,"Position":290.0,"HyperDash":false},{"StartTime":22509.0,"Position":295.0,"HyperDash":false},{"StartTime":22603.0,"Position":290.0,"HyperDash":false}]},{"StartTime":22755.0,"Objects":[{"StartTime":22755.0,"Position":290.0,"HyperDash":false}]},{"StartTime":23058.0,"Objects":[{"StartTime":23058.0,"Position":385.0,"HyperDash":false}]},{"StartTime":23361.0,"Objects":[{"StartTime":23361.0,"Position":385.0,"HyperDash":false}]},{"StartTime":24119.0,"Objects":[{"StartTime":24119.0,"Position":213.0,"HyperDash":false},{"StartTime":24176.0,"Position":203.351,"HyperDash":false},{"StartTime":24270.0,"Position":153.0,"HyperDash":false}]},{"StartTime":24422.0,"Objects":[{"StartTime":24422.0,"Position":104.0,"HyperDash":false}]},{"StartTime":25028.0,"Objects":[{"StartTime":25028.0,"Position":295.0,"HyperDash":false}]},{"StartTime":26240.0,"Objects":[{"StartTime":26240.0,"Position":56.0,"HyperDash":false}]},{"StartTime":26392.0,"Objects":[{"StartTime":26392.0,"Position":56.0,"HyperDash":false}]},{"StartTime":26543.0,"Objects":[{"StartTime":26543.0,"Position":56.0,"HyperDash":false}]},{"StartTime":26846.0,"Objects":[{"StartTime":26846.0,"Position":56.0,"HyperDash":false}]},{"StartTime":27149.0,"Objects":[{"StartTime":27149.0,"Position":151.0,"HyperDash":false}]},{"StartTime":28058.0,"Objects":[{"StartTime":28058.0,"Position":438.0,"HyperDash":false},{"StartTime":28124.0,"Position":455.0,"HyperDash":false},{"StartTime":28191.0,"Position":455.0,"HyperDash":false},{"StartTime":28258.0,"Position":453.0,"HyperDash":false},{"StartTime":28361.0,"Position":438.0,"HyperDash":false}]},{"StartTime":29270.0,"Objects":[{"StartTime":29270.0,"Position":184.0,"HyperDash":false},{"StartTime":29336.0,"Position":227.138611,"HyperDash":false},{"StartTime":29403.0,"Position":245.673264,"HyperDash":false},{"StartTime":29470.0,"Position":246.207916,"HyperDash":false},{"StartTime":29573.0,"Position":304.0,"HyperDash":false}]},{"StartTime":29876.0,"Objects":[{"StartTime":29876.0,"Position":399.0,"HyperDash":false}]},{"StartTime":30180.0,"Objects":[{"StartTime":30180.0,"Position":399.0,"HyperDash":false}]},{"StartTime":30483.0,"Objects":[{"StartTime":30483.0,"Position":303.0,"HyperDash":false},{"StartTime":30549.0,"Position":281.8614,"HyperDash":false},{"StartTime":30616.0,"Position":238.326736,"HyperDash":false},{"StartTime":30683.0,"Position":208.792084,"HyperDash":false},{"StartTime":30786.0,"Position":183.0,"HyperDash":false}]},{"StartTime":31089.0,"Objects":[{"StartTime":31089.0,"Position":115.0,"HyperDash":false},{"StartTime":31155.0,"Position":159.138611,"HyperDash":false},{"StartTime":31222.0,"Position":159.673264,"HyperDash":false},{"StartTime":31289.0,"Position":210.207916,"HyperDash":false},{"StartTime":31392.0,"Position":235.0,"HyperDash":false}]},{"StartTime":31695.0,"Objects":[{"StartTime":31695.0,"Position":330.0,"HyperDash":false}]},{"StartTime":31998.0,"Objects":[{"StartTime":31998.0,"Position":425.0,"HyperDash":false}]},{"StartTime":32301.0,"Objects":[{"StartTime":32301.0,"Position":425.0,"HyperDash":false},{"StartTime":32367.0,"Position":401.8614,"HyperDash":false},{"StartTime":32434.0,"Position":362.326721,"HyperDash":false},{"StartTime":32501.0,"Position":346.792084,"HyperDash":false},{"StartTime":32604.0,"Position":305.0,"HyperDash":false}]},{"StartTime":32907.0,"Objects":[{"StartTime":32907.0,"Position":209.0,"HyperDash":false},{"StartTime":32973.0,"Position":172.861389,"HyperDash":false},{"StartTime":33040.0,"Position":156.326736,"HyperDash":false},{"StartTime":33107.0,"Position":111.792084,"HyperDash":false},{"StartTime":33210.0,"Position":89.0,"HyperDash":false}]},{"StartTime":33513.0,"Objects":[{"StartTime":33513.0,"Position":89.0,"HyperDash":false}]},{"StartTime":33816.0,"Objects":[{"StartTime":33816.0,"Position":184.0,"HyperDash":false}]},{"StartTime":34119.0,"Objects":[{"StartTime":34119.0,"Position":279.0,"HyperDash":false}]},{"StartTime":34422.0,"Objects":[{"StartTime":34422.0,"Position":374.0,"HyperDash":false}]},{"StartTime":34725.0,"Objects":[{"StartTime":34725.0,"Position":469.0,"HyperDash":false},{"StartTime":34791.0,"Position":453.0,"HyperDash":false},{"StartTime":34858.0,"Position":477.0,"HyperDash":false},{"StartTime":34925.0,"Position":456.0,"HyperDash":false},{"StartTime":35028.0,"Position":469.0,"HyperDash":false}]},{"StartTime":35331.0,"Objects":[{"StartTime":35331.0,"Position":373.0,"HyperDash":false},{"StartTime":35397.0,"Position":326.8614,"HyperDash":false},{"StartTime":35464.0,"Position":315.326721,"HyperDash":false},{"StartTime":35531.0,"Position":282.792084,"HyperDash":false},{"StartTime":35634.0,"Position":253.0,"HyperDash":false}]},{"StartTime":35937.0,"Objects":[{"StartTime":35937.0,"Position":157.0,"HyperDash":false}]},{"StartTime":36240.0,"Objects":[{"StartTime":36240.0,"Position":157.0,"HyperDash":false}]},{"StartTime":36392.0,"Objects":[{"StartTime":36392.0,"Position":157.0,"HyperDash":false}]},{"StartTime":36543.0,"Objects":[{"StartTime":36543.0,"Position":204.0,"HyperDash":false},{"StartTime":36618.0,"Position":241.702972,"HyperDash":false},{"StartTime":36694.0,"Position":264.0,"HyperDash":false},{"StartTime":36752.0,"Position":239.227722,"HyperDash":false},{"StartTime":36846.0,"Position":204.0,"HyperDash":false}]},{"StartTime":36998.0,"Objects":[{"StartTime":36998.0,"Position":204.0,"HyperDash":false},{"StartTime":37055.0,"Position":221.0,"HyperDash":false},{"StartTime":37149.0,"Position":204.0,"HyperDash":false}]},{"StartTime":37301.0,"Objects":[{"StartTime":37301.0,"Position":205.0,"HyperDash":false}]},{"StartTime":37604.0,"Objects":[{"StartTime":37604.0,"Position":300.0,"HyperDash":false}]},{"StartTime":37907.0,"Objects":[{"StartTime":37907.0,"Position":300.0,"HyperDash":false}]},{"StartTime":38967.0,"Objects":[{"StartTime":38967.0,"Position":32.0,"HyperDash":false}]},{"StartTime":39573.0,"Objects":[{"StartTime":39573.0,"Position":32.0,"HyperDash":false}]},{"StartTime":40786.0,"Objects":[{"StartTime":40786.0,"Position":416.0,"HyperDash":false}]},{"StartTime":40937.0,"Objects":[{"StartTime":40937.0,"Position":416.0,"HyperDash":false}]},{"StartTime":41089.0,"Objects":[{"StartTime":41089.0,"Position":416.0,"HyperDash":false}]},{"StartTime":41392.0,"Objects":[{"StartTime":41392.0,"Position":320.0,"HyperDash":false}]},{"StartTime":41695.0,"Objects":[{"StartTime":41695.0,"Position":320.0,"HyperDash":false}]},{"StartTime":42604.0,"Objects":[{"StartTime":42604.0,"Position":48.0,"HyperDash":false},{"StartTime":42670.0,"Position":57.13861,"HyperDash":false},{"StartTime":42737.0,"Position":105.673264,"HyperDash":false},{"StartTime":42804.0,"Position":146.207916,"HyperDash":false},{"StartTime":42907.0,"Position":168.0,"HyperDash":false}]},{"StartTime":43210.0,"Objects":[{"StartTime":43210.0,"Position":263.0,"HyperDash":false}]},{"StartTime":43816.0,"Objects":[{"StartTime":43816.0,"Position":376.0,"HyperDash":false},{"StartTime":43891.0,"Position":326.594055,"HyperDash":false},{"StartTime":43967.0,"Position":256.396027,"HyperDash":false},{"StartTime":44043.0,"Position":200.198029,"HyperDash":false},{"StartTime":44119.0,"Position":136.0,"HyperDash":false},{"StartTime":44194.0,"Position":202.405945,"HyperDash":false},{"StartTime":44270.0,"Position":255.603943,"HyperDash":false},{"StartTime":44346.0,"Position":300.802,"HyperDash":false},{"StartTime":44422.0,"Position":376.0,"HyperDash":false},{"StartTime":44497.0,"Position":313.594055,"HyperDash":false},{"StartTime":44573.0,"Position":256.396027,"HyperDash":false},{"StartTime":44649.0,"Position":201.198044,"HyperDash":false},{"StartTime":44725.0,"Position":136.0,"HyperDash":false},{"StartTime":44800.0,"Position":204.405945,"HyperDash":false},{"StartTime":44876.0,"Position":255.603973,"HyperDash":false},{"StartTime":44952.0,"Position":305.801971,"HyperDash":false},{"StartTime":45028.0,"Position":376.0,"HyperDash":false},{"StartTime":45103.0,"Position":306.594055,"HyperDash":false},{"StartTime":45179.0,"Position":256.3961,"HyperDash":false},{"StartTime":45237.0,"Position":224.45549,"HyperDash":false},{"StartTime":45331.0,"Position":136.0,"HyperDash":false}]},{"StartTime":45634.0,"Objects":[{"StartTime":45634.0,"Position":376.0,"HyperDash":false},{"StartTime":45709.0,"Position":323.594055,"HyperDash":false},{"StartTime":45785.0,"Position":256.396027,"HyperDash":false},{"StartTime":45861.0,"Position":198.198029,"HyperDash":false},{"StartTime":45937.0,"Position":136.0,"HyperDash":false},{"StartTime":46012.0,"Position":176.405945,"HyperDash":false},{"StartTime":46088.0,"Position":255.603943,"HyperDash":false},{"StartTime":46164.0,"Position":318.802,"HyperDash":false},{"StartTime":46240.0,"Position":376.0,"HyperDash":false},{"StartTime":46315.0,"Position":324.594055,"HyperDash":false},{"StartTime":46391.0,"Position":256.396027,"HyperDash":false},{"StartTime":46467.0,"Position":199.198044,"HyperDash":false},{"StartTime":46543.0,"Position":136.0,"HyperDash":false},{"StartTime":46618.0,"Position":193.405945,"HyperDash":false},{"StartTime":46694.0,"Position":255.603973,"HyperDash":false},{"StartTime":46770.0,"Position":298.801971,"HyperDash":false},{"StartTime":46846.0,"Position":376.0,"HyperDash":false},{"StartTime":46921.0,"Position":327.594055,"HyperDash":false},{"StartTime":46997.0,"Position":256.3961,"HyperDash":false},{"StartTime":47055.0,"Position":217.45549,"HyperDash":false},{"StartTime":47149.0,"Position":136.0,"HyperDash":false}]},{"StartTime":47452.0,"Objects":[{"StartTime":47452.0,"Position":376.0,"HyperDash":false},{"StartTime":47527.0,"Position":327.594055,"HyperDash":false},{"StartTime":47603.0,"Position":256.396027,"HyperDash":false},{"StartTime":47679.0,"Position":189.198029,"HyperDash":false},{"StartTime":47755.0,"Position":136.0,"HyperDash":false},{"StartTime":47830.0,"Position":195.405945,"HyperDash":false},{"StartTime":47906.0,"Position":255.603943,"HyperDash":false},{"StartTime":47982.0,"Position":300.802,"HyperDash":false},{"StartTime":48058.0,"Position":376.0,"HyperDash":false},{"StartTime":48133.0,"Position":324.594055,"HyperDash":false},{"StartTime":48209.0,"Position":256.396027,"HyperDash":false},{"StartTime":48285.0,"Position":188.198044,"HyperDash":false},{"StartTime":48361.0,"Position":136.0,"HyperDash":false},{"StartTime":48436.0,"Position":199.405945,"HyperDash":false},{"StartTime":48512.0,"Position":255.603973,"HyperDash":false},{"StartTime":48588.0,"Position":310.801971,"HyperDash":false},{"StartTime":48664.0,"Position":376.0,"HyperDash":false},{"StartTime":48739.0,"Position":317.594055,"HyperDash":false},{"StartTime":48815.0,"Position":256.3961,"HyperDash":false},{"StartTime":48873.0,"Position":213.45549,"HyperDash":false},{"StartTime":48967.0,"Position":136.0,"HyperDash":false}]},{"StartTime":49270.0,"Objects":[{"StartTime":49270.0,"Position":376.0,"HyperDash":false},{"StartTime":49345.0,"Position":335.594482,"HyperDash":false},{"StartTime":49421.0,"Position":256.396881,"HyperDash":false},{"StartTime":49479.0,"Position":210.456619,"HyperDash":false},{"StartTime":49573.0,"Position":136.001678,"HyperDash":false}]},{"StartTime":49876.0,"Objects":[{"StartTime":49876.0,"Position":136.0,"HyperDash":false}]},{"StartTime":50180.0,"Objects":[{"StartTime":50180.0,"Position":328.0,"HyperDash":false}]},{"StartTime":50483.0,"Objects":[{"StartTime":50483.0,"Position":329.0,"HyperDash":false}]},{"StartTime":50786.0,"Objects":[{"StartTime":50786.0,"Position":136.0,"HyperDash":false}]},{"StartTime":50937.0,"Objects":[{"StartTime":50937.0,"Position":138.0,"HyperDash":false}]},{"StartTime":51089.0,"Objects":[{"StartTime":51089.0,"Position":138.0,"HyperDash":false},{"StartTime":51146.0,"Position":142.649,"HyperDash":false},{"StartTime":51240.0,"Position":198.0,"HyperDash":false}]},{"StartTime":51392.0,"Objects":[{"StartTime":51392.0,"Position":198.0,"HyperDash":false}]},{"StartTime":51543.0,"Objects":[{"StartTime":51543.0,"Position":246.0,"HyperDash":false}]},{"StartTime":51695.0,"Objects":[{"StartTime":51695.0,"Position":295.0,"HyperDash":false},{"StartTime":51752.0,"Position":303.649017,"HyperDash":false},{"StartTime":51846.0,"Position":355.0,"HyperDash":false}]},{"StartTime":52149.0,"Objects":[{"StartTime":52149.0,"Position":355.0,"HyperDash":false}]},{"StartTime":52452.0,"Objects":[{"StartTime":52452.0,"Position":260.0,"HyperDash":false}]},{"StartTime":53513.0,"Objects":[{"StartTime":53513.0,"Position":40.0,"HyperDash":false},{"StartTime":53588.0,"Position":68.70297,"HyperDash":false},{"StartTime":53664.0,"Position":116.801987,"HyperDash":false},{"StartTime":53740.0,"Position":141.900986,"HyperDash":false},{"StartTime":53816.0,"Position":160.0,"HyperDash":false},{"StartTime":53882.0,"Position":184.138626,"HyperDash":false},{"StartTime":53949.0,"Position":229.673264,"HyperDash":false},{"StartTime":54016.0,"Position":230.207916,"HyperDash":false},{"StartTime":54119.0,"Position":280.0,"HyperDash":false}]},{"StartTime":55331.0,"Objects":[{"StartTime":55331.0,"Position":40.0,"HyperDash":false},{"StartTime":55406.0,"Position":84.70297,"HyperDash":false},{"StartTime":55482.0,"Position":100.0,"HyperDash":false},{"StartTime":55540.0,"Position":64.22772,"HyperDash":false},{"StartTime":55634.0,"Position":40.0,"HyperDash":false}]},{"StartTime":55937.0,"Objects":[{"StartTime":55937.0,"Position":40.0,"HyperDash":false},{"StartTime":56003.0,"Position":29.0,"HyperDash":false},{"StartTime":56070.0,"Position":44.0,"HyperDash":false},{"StartTime":56137.0,"Position":28.0,"HyperDash":false},{"StartTime":56240.0,"Position":40.0,"HyperDash":false}]},{"StartTime":57149.0,"Objects":[{"StartTime":57149.0,"Position":300.0,"HyperDash":false},{"StartTime":57215.0,"Position":316.0,"HyperDash":false},{"StartTime":57282.0,"Position":288.0,"HyperDash":false},{"StartTime":57349.0,"Position":299.0,"HyperDash":false},{"StartTime":57452.0,"Position":300.0,"HyperDash":false}]},{"StartTime":58361.0,"Objects":[{"StartTime":58361.0,"Position":256.0,"HyperDash":false},{"StartTime":58418.0,"Position":265.649017,"HyperDash":false},{"StartTime":58512.0,"Position":316.0,"HyperDash":false}]},{"StartTime":58664.0,"Objects":[{"StartTime":58664.0,"Position":364.0,"HyperDash":false},{"StartTime":58721.0,"Position":358.0,"HyperDash":false},{"StartTime":58815.0,"Position":364.0,"HyperDash":false}]},{"StartTime":58967.0,"Objects":[{"StartTime":58967.0,"Position":329.0,"HyperDash":false}]},{"StartTime":59119.0,"Objects":[{"StartTime":59119.0,"Position":280.0,"HyperDash":false},{"StartTime":59176.0,"Position":249.350983,"HyperDash":false},{"StartTime":59270.0,"Position":220.0,"HyperDash":false}]},{"StartTime":59422.0,"Objects":[{"StartTime":59422.0,"Position":185.0,"HyperDash":false},{"StartTime":59479.0,"Position":176.0,"HyperDash":false},{"StartTime":59573.0,"Position":185.0,"HyperDash":false}]},{"StartTime":59876.0,"Objects":[{"StartTime":59876.0,"Position":185.0,"HyperDash":false}]},{"StartTime":60180.0,"Objects":[{"StartTime":60180.0,"Position":253.0,"HyperDash":false}]},{"StartTime":60331.0,"Objects":[{"StartTime":60331.0,"Position":253.0,"HyperDash":false}]},{"StartTime":60483.0,"Objects":[{"StartTime":60483.0,"Position":253.0,"HyperDash":false}]},{"StartTime":60634.0,"Objects":[{"StartTime":60634.0,"Position":253.0,"HyperDash":false}]},{"StartTime":60786.0,"Objects":[{"StartTime":60786.0,"Position":253.0,"HyperDash":false},{"StartTime":60861.0,"Position":218.297028,"HyperDash":false},{"StartTime":60937.0,"Position":193.0,"HyperDash":false},{"StartTime":61013.0,"Position":217.900986,"HyperDash":false},{"StartTime":61089.0,"Position":253.0,"HyperDash":false},{"StartTime":61164.0,"Position":237.297028,"HyperDash":false},{"StartTime":61240.0,"Position":193.0,"HyperDash":false},{"StartTime":61298.0,"Position":218.772278,"HyperDash":false},{"StartTime":61392.0,"Position":253.0,"HyperDash":false}]},{"StartTime":61695.0,"Objects":[{"StartTime":61695.0,"Position":253.0,"HyperDash":false}]},{"StartTime":61998.0,"Objects":[{"StartTime":61998.0,"Position":348.0,"HyperDash":false},{"StartTime":62073.0,"Position":336.0,"HyperDash":false},{"StartTime":62149.0,"Position":348.0,"HyperDash":false},{"StartTime":62225.0,"Position":336.0,"HyperDash":false},{"StartTime":62301.0,"Position":348.0,"HyperDash":false},{"StartTime":62376.0,"Position":333.0,"HyperDash":false},{"StartTime":62452.0,"Position":348.0,"HyperDash":false},{"StartTime":62510.0,"Position":344.0,"HyperDash":false},{"StartTime":62604.0,"Position":348.0,"HyperDash":false}]},{"StartTime":62755.0,"Objects":[{"StartTime":62755.0,"Position":348.0,"HyperDash":false}]},{"StartTime":62907.0,"Objects":[{"StartTime":62907.0,"Position":348.0,"HyperDash":false}]},{"StartTime":63058.0,"Objects":[{"StartTime":63058.0,"Position":348.0,"HyperDash":false}]},{"StartTime":63210.0,"Objects":[{"StartTime":63210.0,"Position":348.0,"HyperDash":false}]},{"StartTime":63513.0,"Objects":[{"StartTime":63513.0,"Position":252.0,"HyperDash":false}]},{"StartTime":63816.0,"Objects":[{"StartTime":63816.0,"Position":252.0,"HyperDash":false}]},{"StartTime":63967.0,"Objects":[{"StartTime":63967.0,"Position":252.0,"HyperDash":false},{"StartTime":64042.0,"Position":225.264313,"HyperDash":false},{"StartTime":64118.0,"Position":192.0,"HyperDash":false},{"StartTime":64194.0,"Position":203.0,"HyperDash":false},{"StartTime":64270.0,"Position":252.0,"HyperDash":false},{"StartTime":64327.0,"Position":229.268738,"HyperDash":false},{"StartTime":64421.0,"Position":192.0,"HyperDash":false}]},{"StartTime":64725.0,"Objects":[{"StartTime":64725.0,"Position":288.0,"HyperDash":false}]},{"StartTime":65028.0,"Objects":[{"StartTime":65028.0,"Position":383.0,"HyperDash":false}]},{"StartTime":65331.0,"Objects":[{"StartTime":65331.0,"Position":383.0,"HyperDash":false}]},{"StartTime":65634.0,"Objects":[{"StartTime":65634.0,"Position":287.0,"HyperDash":false},{"StartTime":65691.0,"Position":277.350983,"HyperDash":false},{"StartTime":65785.0,"Position":227.0,"HyperDash":false}]},{"StartTime":65937.0,"Objects":[{"StartTime":65937.0,"Position":178.0,"HyperDash":false}]},{"StartTime":66089.0,"Objects":[{"StartTime":66089.0,"Position":129.0,"HyperDash":false}]},{"StartTime":66240.0,"Objects":[{"StartTime":66240.0,"Position":81.0,"HyperDash":false}]},{"StartTime":66392.0,"Objects":[{"StartTime":66392.0,"Position":81.0,"HyperDash":false}]},{"StartTime":66543.0,"Objects":[{"StartTime":66543.0,"Position":81.0,"HyperDash":false},{"StartTime":66600.0,"Position":100.64901,"HyperDash":false},{"StartTime":66694.0,"Position":141.0,"HyperDash":false}]},{"StartTime":66846.0,"Objects":[{"StartTime":66846.0,"Position":189.0,"HyperDash":false},{"StartTime":66903.0,"Position":227.649,"HyperDash":false},{"StartTime":66997.0,"Position":249.0,"HyperDash":false}]},{"StartTime":67755.0,"Objects":[{"StartTime":67755.0,"Position":192.0,"HyperDash":false},{"StartTime":67812.0,"Position":205.649,"HyperDash":false},{"StartTime":67906.0,"Position":252.0,"HyperDash":false}]},{"StartTime":68058.0,"Objects":[{"StartTime":68058.0,"Position":300.0,"HyperDash":false}]},{"StartTime":68664.0,"Objects":[{"StartTime":68664.0,"Position":300.0,"HyperDash":false}]},{"StartTime":68967.0,"Objects":[{"StartTime":68967.0,"Position":300.0,"HyperDash":false}]},{"StartTime":69270.0,"Objects":[{"StartTime":69270.0,"Position":204.0,"HyperDash":false}]},{"StartTime":69876.0,"Objects":[{"StartTime":69876.0,"Position":395.0,"HyperDash":false},{"StartTime":69933.0,"Position":384.272858,"HyperDash":false},{"StartTime":70027.0,"Position":395.722839,"HyperDash":false}]},{"StartTime":70180.0,"Objects":[{"StartTime":70180.0,"Position":395.0,"HyperDash":false}]},{"StartTime":70483.0,"Objects":[{"StartTime":70483.0,"Position":296.0,"HyperDash":false}]},{"StartTime":70786.0,"Objects":[{"StartTime":70786.0,"Position":200.0,"HyperDash":false}]},{"StartTime":71695.0,"Objects":[{"StartTime":71695.0,"Position":200.0,"HyperDash":false}]},{"StartTime":71998.0,"Objects":[{"StartTime":71998.0,"Position":295.0,"HyperDash":false}]},{"StartTime":72907.0,"Objects":[{"StartTime":72907.0,"Position":91.0,"HyperDash":false}]},{"StartTime":73058.0,"Objects":[{"StartTime":73058.0,"Position":138.0,"HyperDash":false}]},{"StartTime":73210.0,"Objects":[{"StartTime":73210.0,"Position":186.0,"HyperDash":false}]},{"StartTime":73361.0,"Objects":[{"StartTime":73361.0,"Position":186.0,"HyperDash":false},{"StartTime":73418.0,"Position":194.649,"HyperDash":false},{"StartTime":73512.0,"Position":246.0,"HyperDash":false}]},{"StartTime":73664.0,"Objects":[{"StartTime":73664.0,"Position":294.0,"HyperDash":false},{"StartTime":73721.0,"Position":334.649017,"HyperDash":false},{"StartTime":73815.0,"Position":354.0,"HyperDash":false}]},{"StartTime":73967.0,"Objects":[{"StartTime":73967.0,"Position":354.0,"HyperDash":false}]},{"StartTime":74270.0,"Objects":[{"StartTime":74270.0,"Position":354.0,"HyperDash":false}]},{"StartTime":75331.0,"Objects":[{"StartTime":75331.0,"Position":40.0,"HyperDash":false}]},{"StartTime":75937.0,"Objects":[{"StartTime":75937.0,"Position":160.0,"HyperDash":false}]},{"StartTime":76089.0,"Objects":[{"StartTime":76089.0,"Position":160.0,"HyperDash":false}]},{"StartTime":76543.0,"Objects":[{"StartTime":76543.0,"Position":303.0,"HyperDash":false}]},{"StartTime":77149.0,"Objects":[{"StartTime":77149.0,"Position":160.0,"HyperDash":false},{"StartTime":77206.0,"Position":192.649,"HyperDash":false},{"StartTime":77300.0,"Position":220.0,"HyperDash":false}]},{"StartTime":77452.0,"Objects":[{"StartTime":77452.0,"Position":268.0,"HyperDash":false}]},{"StartTime":77755.0,"Objects":[{"StartTime":77755.0,"Position":268.0,"HyperDash":false}]},{"StartTime":78058.0,"Objects":[{"StartTime":78058.0,"Position":268.0,"HyperDash":false}]},{"StartTime":78361.0,"Objects":[{"StartTime":78361.0,"Position":363.0,"HyperDash":false},{"StartTime":78418.0,"Position":382.0,"HyperDash":false},{"StartTime":78512.0,"Position":363.0,"HyperDash":false}]},{"StartTime":78967.0,"Objects":[{"StartTime":78967.0,"Position":363.0,"HyperDash":false}]},{"StartTime":79270.0,"Objects":[{"StartTime":79270.0,"Position":267.0,"HyperDash":false},{"StartTime":79336.0,"Position":223.861389,"HyperDash":false},{"StartTime":79403.0,"Position":208.326736,"HyperDash":false},{"StartTime":79470.0,"Position":193.792084,"HyperDash":false},{"StartTime":79573.0,"Position":147.0,"HyperDash":false}]},{"StartTime":80180.0,"Objects":[{"StartTime":80180.0,"Position":96.0,"HyperDash":false},{"StartTime":80255.0,"Position":108.0,"HyperDash":false},{"StartTime":80331.0,"Position":83.0,"HyperDash":false},{"StartTime":80407.0,"Position":82.0,"HyperDash":false},{"StartTime":80483.0,"Position":96.0,"HyperDash":false},{"StartTime":80558.0,"Position":99.0,"HyperDash":false},{"StartTime":80634.0,"Position":82.0,"HyperDash":false},{"StartTime":80710.0,"Position":102.0,"HyperDash":false},{"StartTime":80786.0,"Position":96.0,"HyperDash":false},{"StartTime":80861.0,"Position":86.0,"HyperDash":false},{"StartTime":80937.0,"Position":89.0,"HyperDash":false},{"StartTime":81013.0,"Position":123.90097,"HyperDash":false},{"StartTime":81089.0,"Position":144.0,"HyperDash":false},{"StartTime":81155.0,"Position":177.138611,"HyperDash":false},{"StartTime":81222.0,"Position":194.673279,"HyperDash":false},{"StartTime":81289.0,"Position":229.207916,"HyperDash":false},{"StartTime":81392.0,"Position":264.0,"HyperDash":false}]},{"StartTime":81695.0,"Objects":[{"StartTime":81695.0,"Position":360.0,"HyperDash":false}]},{"StartTime":81998.0,"Objects":[{"StartTime":81998.0,"Position":455.0,"HyperDash":false},{"StartTime":82073.0,"Position":449.0,"HyperDash":false},{"StartTime":82149.0,"Position":448.0,"HyperDash":false},{"StartTime":82225.0,"Position":474.0,"HyperDash":false},{"StartTime":82301.0,"Position":455.0,"HyperDash":false},{"StartTime":82376.0,"Position":455.0,"HyperDash":false},{"StartTime":82452.0,"Position":470.0,"HyperDash":false},{"StartTime":82528.0,"Position":439.0,"HyperDash":false},{"StartTime":82604.0,"Position":455.0,"HyperDash":false},{"StartTime":82679.0,"Position":458.0,"HyperDash":false},{"StartTime":82755.0,"Position":451.0,"HyperDash":false},{"StartTime":82831.0,"Position":445.09903,"HyperDash":false},{"StartTime":82907.0,"Position":407.0,"HyperDash":false},{"StartTime":82982.0,"Position":392.297028,"HyperDash":false},{"StartTime":83058.0,"Position":335.198029,"HyperDash":false},{"StartTime":83134.0,"Position":301.09903,"HyperDash":false},{"StartTime":83210.0,"Position":287.0,"HyperDash":false},{"StartTime":83276.0,"Position":242.861389,"HyperDash":false},{"StartTime":83343.0,"Position":230.326721,"HyperDash":false},{"StartTime":83410.0,"Position":212.792053,"HyperDash":false},{"StartTime":83513.0,"Position":167.0,"HyperDash":false}]},{"StartTime":83816.0,"Objects":[{"StartTime":83816.0,"Position":124.0,"HyperDash":false},{"StartTime":83891.0,"Position":154.702972,"HyperDash":false},{"StartTime":83967.0,"Position":181.801987,"HyperDash":false},{"StartTime":84043.0,"Position":229.900986,"HyperDash":false},{"StartTime":84119.0,"Position":244.0,"HyperDash":false},{"StartTime":84194.0,"Position":287.702972,"HyperDash":false},{"StartTime":84270.0,"Position":290.801971,"HyperDash":false},{"StartTime":84346.0,"Position":332.901,"HyperDash":false},{"StartTime":84422.0,"Position":364.0,"HyperDash":false},{"StartTime":84497.0,"Position":367.0,"HyperDash":false},{"StartTime":84573.0,"Position":374.0,"HyperDash":false},{"StartTime":84649.0,"Position":360.0,"HyperDash":false},{"StartTime":84725.0,"Position":364.0,"HyperDash":false},{"StartTime":84791.0,"Position":368.0,"HyperDash":false},{"StartTime":84858.0,"Position":369.0,"HyperDash":false},{"StartTime":84925.0,"Position":364.0,"HyperDash":false},{"StartTime":85028.0,"Position":364.0,"HyperDash":false}]},{"StartTime":85331.0,"Objects":[{"StartTime":85331.0,"Position":268.0,"HyperDash":false}]},{"StartTime":85634.0,"Objects":[{"StartTime":85634.0,"Position":172.0,"HyperDash":false},{"StartTime":85709.0,"Position":124.288116,"HyperDash":false},{"StartTime":85785.0,"Position":93.18007,"HyperDash":false},{"StartTime":85861.0,"Position":71.07203,"HyperDash":false},{"StartTime":85937.0,"Position":52.0,"HyperDash":false},{"StartTime":86012.0,"Position":45.0,"HyperDash":false},{"StartTime":86088.0,"Position":68.0,"HyperDash":false},{"StartTime":86164.0,"Position":66.0,"HyperDash":false},{"StartTime":86240.0,"Position":52.0,"HyperDash":false},{"StartTime":86315.0,"Position":33.0,"HyperDash":false},{"StartTime":86391.0,"Position":34.0,"HyperDash":false},{"StartTime":86467.0,"Position":66.0,"HyperDash":false},{"StartTime":86543.0,"Position":76.10803,"HyperDash":false},{"StartTime":86618.0,"Position":109.819916,"HyperDash":false},{"StartTime":86694.0,"Position":132.927948,"HyperDash":false},{"StartTime":86770.0,"Position":153.036011,"HyperDash":false},{"StartTime":86846.0,"Position":196.144073,"HyperDash":false},{"StartTime":86921.0,"Position":235.855927,"HyperDash":false},{"StartTime":86997.0,"Position":237.963989,"HyperDash":false},{"StartTime":87073.0,"Position":282.072021,"HyperDash":false},{"StartTime":87149.0,"Position":316.0,"HyperDash":false},{"StartTime":87206.0,"Position":327.0,"HyperDash":false},{"StartTime":87300.0,"Position":316.0,"HyperDash":false}]},{"StartTime":87452.0,"Objects":[{"StartTime":87452.0,"Position":316.0,"HyperDash":false},{"StartTime":87518.0,"Position":297.0,"HyperDash":false},{"StartTime":87585.0,"Position":333.0,"HyperDash":false},{"StartTime":87652.0,"Position":325.0,"HyperDash":false},{"StartTime":87755.0,"Position":316.0,"HyperDash":false}]},{"StartTime":88058.0,"Objects":[{"StartTime":88058.0,"Position":411.0,"HyperDash":false},{"StartTime":88133.0,"Position":411.0,"HyperDash":false},{"StartTime":88209.0,"Position":410.0,"HyperDash":false},{"StartTime":88285.0,"Position":423.0,"HyperDash":false},{"StartTime":88361.0,"Position":411.0,"HyperDash":false},{"StartTime":88436.0,"Position":412.0,"HyperDash":false},{"StartTime":88512.0,"Position":398.0,"HyperDash":false},{"StartTime":88588.0,"Position":414.0,"HyperDash":false},{"StartTime":88664.0,"Position":411.0,"HyperDash":false},{"StartTime":88739.0,"Position":382.297028,"HyperDash":false},{"StartTime":88815.0,"Position":340.198,"HyperDash":false},{"StartTime":88891.0,"Position":331.09903,"HyperDash":false},{"StartTime":88967.0,"Position":299.0,"HyperDash":false},{"StartTime":89033.0,"Position":253.861389,"HyperDash":false},{"StartTime":89100.0,"Position":231.326721,"HyperDash":false},{"StartTime":89167.0,"Position":225.792084,"HyperDash":false},{"StartTime":89270.0,"Position":179.0,"HyperDash":false}]},{"StartTime":89876.0,"Objects":[{"StartTime":89876.0,"Position":176.0,"HyperDash":false},{"StartTime":89951.0,"Position":144.297028,"HyperDash":false},{"StartTime":90027.0,"Position":110.198013,"HyperDash":false},{"StartTime":90103.0,"Position":73.0990143,"HyperDash":false},{"StartTime":90179.0,"Position":56.0,"HyperDash":false},{"StartTime":90245.0,"Position":34.0,"HyperDash":false},{"StartTime":90312.0,"Position":29.0,"HyperDash":false},{"StartTime":90379.0,"Position":40.0,"HyperDash":false},{"StartTime":90482.0,"Position":40.0,"HyperDash":false}]},{"StartTime":91089.0,"Objects":[{"StartTime":91089.0,"Position":232.0,"HyperDash":false}]},{"StartTime":91695.0,"Objects":[{"StartTime":91695.0,"Position":423.0,"HyperDash":false},{"StartTime":91770.0,"Position":409.0,"HyperDash":false},{"StartTime":91846.0,"Position":424.0,"HyperDash":false},{"StartTime":91922.0,"Position":438.0,"HyperDash":false},{"StartTime":91998.0,"Position":423.0,"HyperDash":false},{"StartTime":92073.0,"Position":417.0,"HyperDash":false},{"StartTime":92149.0,"Position":420.198029,"HyperDash":false},{"StartTime":92225.0,"Position":354.099,"HyperDash":false},{"StartTime":92301.0,"Position":343.0,"HyperDash":false},{"StartTime":92376.0,"Position":331.297028,"HyperDash":false},{"StartTime":92452.0,"Position":266.198,"HyperDash":false},{"StartTime":92528.0,"Position":237.09903,"HyperDash":false},{"StartTime":92604.0,"Position":223.0,"HyperDash":false},{"StartTime":92670.0,"Position":208.861389,"HyperDash":false},{"StartTime":92737.0,"Position":185.326721,"HyperDash":false},{"StartTime":92804.0,"Position":135.792084,"HyperDash":false},{"StartTime":92907.0,"Position":103.0,"HyperDash":false}]},{"StartTime":93513.0,"Objects":[{"StartTime":93513.0,"Position":112.0,"HyperDash":false}]},{"StartTime":94119.0,"Objects":[{"StartTime":94119.0,"Position":303.0,"HyperDash":false}]},{"StartTime":94725.0,"Objects":[{"StartTime":94725.0,"Position":440.0,"HyperDash":false},{"StartTime":94800.0,"Position":426.0,"HyperDash":false},{"StartTime":94876.0,"Position":436.0,"HyperDash":false},{"StartTime":94952.0,"Position":453.0,"HyperDash":false},{"StartTime":95028.0,"Position":440.0,"HyperDash":false},{"StartTime":95103.0,"Position":440.0,"HyperDash":false},{"StartTime":95179.0,"Position":433.0,"HyperDash":false},{"StartTime":95255.0,"Position":456.0,"HyperDash":false},{"StartTime":95331.0,"Position":440.0,"HyperDash":false},{"StartTime":95406.0,"Position":449.0,"HyperDash":false},{"StartTime":95482.0,"Position":433.0,"HyperDash":false},{"StartTime":95558.0,"Position":456.0,"HyperDash":false},{"StartTime":95634.0,"Position":440.0,"HyperDash":false},{"StartTime":95700.0,"Position":439.0,"HyperDash":false},{"StartTime":95767.0,"Position":423.0,"HyperDash":false},{"StartTime":95834.0,"Position":428.0,"HyperDash":false},{"StartTime":95937.0,"Position":440.0,"HyperDash":false}]},{"StartTime":96543.0,"Objects":[{"StartTime":96543.0,"Position":216.0,"HyperDash":false},{"StartTime":96618.0,"Position":204.0,"HyperDash":false},{"StartTime":96694.0,"Position":208.0,"HyperDash":false},{"StartTime":96770.0,"Position":218.0,"HyperDash":false},{"StartTime":96846.0,"Position":216.0,"HyperDash":false},{"StartTime":96912.0,"Position":233.0,"HyperDash":false},{"StartTime":96979.0,"Position":225.0,"HyperDash":false},{"StartTime":97046.0,"Position":206.0,"HyperDash":false},{"StartTime":97149.0,"Position":216.0,"HyperDash":false}]},{"StartTime":97755.0,"Objects":[{"StartTime":97755.0,"Position":48.0,"HyperDash":false}]},{"StartTime":98361.0,"Objects":[{"StartTime":98361.0,"Position":216.0,"HyperDash":false}]},{"StartTime":98967.0,"Objects":[{"StartTime":98967.0,"Position":216.0,"HyperDash":false},{"StartTime":99042.0,"Position":231.0,"HyperDash":false},{"StartTime":99118.0,"Position":207.0,"HyperDash":false},{"StartTime":99194.0,"Position":205.0,"HyperDash":false},{"StartTime":99270.0,"Position":216.0,"HyperDash":false},{"StartTime":99345.0,"Position":206.0,"HyperDash":false},{"StartTime":99421.0,"Position":218.0,"HyperDash":false},{"StartTime":99497.0,"Position":208.0,"HyperDash":false},{"StartTime":99573.0,"Position":216.0,"HyperDash":false},{"StartTime":99648.0,"Position":234.0,"HyperDash":false},{"StartTime":99724.0,"Position":222.0,"HyperDash":false},{"StartTime":99800.0,"Position":231.0,"HyperDash":false},{"StartTime":99876.0,"Position":216.0,"HyperDash":false},{"StartTime":99942.0,"Position":200.0,"HyperDash":false},{"StartTime":100009.0,"Position":199.0,"HyperDash":false},{"StartTime":100076.0,"Position":228.0,"HyperDash":false},{"StartTime":100179.0,"Position":216.0,"HyperDash":false}]},{"StartTime":100786.0,"Objects":[{"StartTime":100786.0,"Position":216.0,"HyperDash":false}]},{"StartTime":101392.0,"Objects":[{"StartTime":101392.0,"Position":216.0,"HyperDash":false}]},{"StartTime":101998.0,"Objects":[{"StartTime":101998.0,"Position":356.0,"HyperDash":false},{"StartTime":102054.0,"Position":362.0,"HyperDash":false},{"StartTime":102111.0,"Position":347.0,"HyperDash":false},{"StartTime":102168.0,"Position":252.0,"HyperDash":false},{"StartTime":102225.0,"Position":477.0,"HyperDash":false},{"StartTime":102282.0,"Position":358.0,"HyperDash":false},{"StartTime":102338.0,"Position":17.0,"HyperDash":false},{"StartTime":102395.0,"Position":399.0,"HyperDash":false},{"StartTime":102452.0,"Position":280.0,"HyperDash":false},{"StartTime":102509.0,"Position":304.0,"HyperDash":false},{"StartTime":102566.0,"Position":221.0,"HyperDash":false},{"StartTime":102622.0,"Position":407.0,"HyperDash":false},{"StartTime":102679.0,"Position":287.0,"HyperDash":false},{"StartTime":102736.0,"Position":135.0,"HyperDash":false},{"StartTime":102793.0,"Position":437.0,"HyperDash":false},{"StartTime":102850.0,"Position":289.0,"HyperDash":false},{"StartTime":102907.0,"Position":464.0,"HyperDash":false},{"StartTime":102963.0,"Position":36.0,"HyperDash":false},{"StartTime":103020.0,"Position":378.0,"HyperDash":false},{"StartTime":103077.0,"Position":297.0,"HyperDash":false},{"StartTime":103134.0,"Position":418.0,"HyperDash":false},{"StartTime":103191.0,"Position":329.0,"HyperDash":false},{"StartTime":103247.0,"Position":338.0,"HyperDash":false},{"StartTime":103304.0,"Position":394.0,"HyperDash":false},{"StartTime":103361.0,"Position":40.0,"HyperDash":false},{"StartTime":103418.0,"Position":13.0,"HyperDash":false},{"StartTime":103475.0,"Position":80.0,"HyperDash":false},{"StartTime":103531.0,"Position":138.0,"HyperDash":false},{"StartTime":103588.0,"Position":311.0,"HyperDash":false},{"StartTime":103645.0,"Position":216.0,"HyperDash":false},{"StartTime":103702.0,"Position":310.0,"HyperDash":false},{"StartTime":103759.0,"Position":397.0,"HyperDash":false},{"StartTime":103816.0,"Position":214.0,"HyperDash":false},{"StartTime":103872.0,"Position":505.0,"HyperDash":false},{"StartTime":103929.0,"Position":173.0,"HyperDash":false},{"StartTime":103986.0,"Position":295.0,"HyperDash":false},{"StartTime":104043.0,"Position":199.0,"HyperDash":false},{"StartTime":104100.0,"Position":494.0,"HyperDash":false},{"StartTime":104156.0,"Position":293.0,"HyperDash":false},{"StartTime":104213.0,"Position":115.0,"HyperDash":false},{"StartTime":104270.0,"Position":412.0,"HyperDash":false},{"StartTime":104327.0,"Position":506.0,"HyperDash":false},{"StartTime":104384.0,"Position":293.0,"HyperDash":false},{"StartTime":104440.0,"Position":346.0,"HyperDash":false},{"StartTime":104497.0,"Position":117.0,"HyperDash":false},{"StartTime":104554.0,"Position":285.0,"HyperDash":false},{"StartTime":104611.0,"Position":17.0,"HyperDash":false},{"StartTime":104668.0,"Position":238.0,"HyperDash":false},{"StartTime":104725.0,"Position":222.0,"HyperDash":false},{"StartTime":104781.0,"Position":450.0,"HyperDash":false},{"StartTime":104838.0,"Position":67.0,"HyperDash":false},{"StartTime":104895.0,"Position":219.0,"HyperDash":false},{"StartTime":104952.0,"Position":307.0,"HyperDash":false},{"StartTime":105009.0,"Position":367.0,"HyperDash":false},{"StartTime":105065.0,"Position":412.0,"HyperDash":false},{"StartTime":105122.0,"Position":413.0,"HyperDash":false},{"StartTime":105179.0,"Position":143.0,"HyperDash":false},{"StartTime":105236.0,"Position":339.0,"HyperDash":false},{"StartTime":105293.0,"Position":342.0,"HyperDash":false},{"StartTime":105349.0,"Position":249.0,"HyperDash":false},{"StartTime":105406.0,"Position":235.0,"HyperDash":false},{"StartTime":105463.0,"Position":323.0,"HyperDash":false},{"StartTime":105520.0,"Position":365.0,"HyperDash":false},{"StartTime":105577.0,"Position":74.0,"HyperDash":false},{"StartTime":105634.0,"Position":281.0,"HyperDash":false},{"StartTime":105690.0,"Position":398.0,"HyperDash":false},{"StartTime":105747.0,"Position":335.0,"HyperDash":false},{"StartTime":105804.0,"Position":388.0,"HyperDash":false},{"StartTime":105861.0,"Position":228.0,"HyperDash":false},{"StartTime":105918.0,"Position":323.0,"HyperDash":false},{"StartTime":105974.0,"Position":441.0,"HyperDash":false},{"StartTime":106031.0,"Position":442.0,"HyperDash":false},{"StartTime":106088.0,"Position":278.0,"HyperDash":false},{"StartTime":106145.0,"Position":90.0,"HyperDash":false},{"StartTime":106202.0,"Position":409.0,"HyperDash":false},{"StartTime":106258.0,"Position":377.0,"HyperDash":false},{"StartTime":106315.0,"Position":457.0,"HyperDash":false},{"StartTime":106372.0,"Position":409.0,"HyperDash":false},{"StartTime":106429.0,"Position":43.0,"HyperDash":false},{"StartTime":106486.0,"Position":162.0,"HyperDash":false},{"StartTime":106543.0,"Position":341.0,"HyperDash":false},{"StartTime":106599.0,"Position":72.0,"HyperDash":false},{"StartTime":106656.0,"Position":135.0,"HyperDash":false},{"StartTime":106713.0,"Position":252.0,"HyperDash":false},{"StartTime":106770.0,"Position":446.0,"HyperDash":false},{"StartTime":106827.0,"Position":284.0,"HyperDash":false},{"StartTime":106883.0,"Position":70.0,"HyperDash":false},{"StartTime":106940.0,"Position":494.0,"HyperDash":false},{"StartTime":106997.0,"Position":463.0,"HyperDash":false},{"StartTime":107054.0,"Position":277.0,"HyperDash":false},{"StartTime":107111.0,"Position":425.0,"HyperDash":false},{"StartTime":107167.0,"Position":281.0,"HyperDash":false},{"StartTime":107224.0,"Position":3.0,"HyperDash":false},{"StartTime":107281.0,"Position":346.0,"HyperDash":false},{"StartTime":107338.0,"Position":350.0,"HyperDash":false},{"StartTime":107395.0,"Position":217.0,"HyperDash":false},{"StartTime":107452.0,"Position":455.0,"HyperDash":false},{"StartTime":107508.0,"Position":229.0,"HyperDash":false},{"StartTime":107565.0,"Position":51.0,"HyperDash":false},{"StartTime":107622.0,"Position":199.0,"HyperDash":false},{"StartTime":107679.0,"Position":208.0,"HyperDash":false},{"StartTime":107736.0,"Position":173.0,"HyperDash":false},{"StartTime":107792.0,"Position":367.0,"HyperDash":false},{"StartTime":107849.0,"Position":193.0,"HyperDash":false},{"StartTime":107906.0,"Position":488.0,"HyperDash":false},{"StartTime":107963.0,"Position":314.0,"HyperDash":false},{"StartTime":108020.0,"Position":135.0,"HyperDash":false},{"StartTime":108076.0,"Position":399.0,"HyperDash":false},{"StartTime":108133.0,"Position":404.0,"HyperDash":false},{"StartTime":108190.0,"Position":152.0,"HyperDash":false},{"StartTime":108247.0,"Position":353.0,"HyperDash":false},{"StartTime":108304.0,"Position":358.0,"HyperDash":false},{"StartTime":108361.0,"Position":447.0,"HyperDash":false},{"StartTime":108417.0,"Position":222.0,"HyperDash":false},{"StartTime":108474.0,"Position":382.0,"HyperDash":false},{"StartTime":108531.0,"Position":433.0,"HyperDash":false},{"StartTime":108588.0,"Position":450.0,"HyperDash":false},{"StartTime":108645.0,"Position":326.0,"HyperDash":false},{"StartTime":108701.0,"Position":414.0,"HyperDash":false},{"StartTime":108758.0,"Position":285.0,"HyperDash":false},{"StartTime":108815.0,"Position":336.0,"HyperDash":false},{"StartTime":108872.0,"Position":509.0,"HyperDash":false},{"StartTime":108929.0,"Position":334.0,"HyperDash":false},{"StartTime":108985.0,"Position":72.0,"HyperDash":false},{"StartTime":109042.0,"Position":425.0,"HyperDash":false},{"StartTime":109099.0,"Position":451.0,"HyperDash":false},{"StartTime":109156.0,"Position":220.0,"HyperDash":false},{"StartTime":109213.0,"Position":25.0,"HyperDash":false},{"StartTime":109270.0,"Position":77.0,"HyperDash":false}]},{"StartTime":111392.0,"Objects":[{"StartTime":111392.0,"Position":48.0,"HyperDash":false},{"StartTime":111449.0,"Position":89.64901,"HyperDash":false},{"StartTime":111543.0,"Position":108.0,"HyperDash":false}]},{"StartTime":111695.0,"Objects":[{"StartTime":111695.0,"Position":156.0,"HyperDash":false}]},{"StartTime":112301.0,"Objects":[{"StartTime":112301.0,"Position":347.0,"HyperDash":false},{"StartTime":112358.0,"Position":344.0,"HyperDash":false},{"StartTime":112452.0,"Position":347.0,"HyperDash":false}]},{"StartTime":112604.0,"Objects":[{"StartTime":112604.0,"Position":347.0,"HyperDash":false},{"StartTime":112661.0,"Position":343.0,"HyperDash":false},{"StartTime":112755.0,"Position":347.0,"HyperDash":false}]},{"StartTime":112907.0,"Objects":[{"StartTime":112907.0,"Position":347.0,"HyperDash":false}]},{"StartTime":113513.0,"Objects":[{"StartTime":113513.0,"Position":155.0,"HyperDash":false}]},{"StartTime":113664.0,"Objects":[{"StartTime":113664.0,"Position":155.0,"HyperDash":false}]},{"StartTime":113816.0,"Objects":[{"StartTime":113816.0,"Position":155.0,"HyperDash":false},{"StartTime":113891.0,"Position":169.702972,"HyperDash":false},{"StartTime":113967.0,"Position":201.801987,"HyperDash":false},{"StartTime":114043.0,"Position":248.900986,"HyperDash":false},{"StartTime":114119.0,"Position":275.0,"HyperDash":false},{"StartTime":114185.0,"Position":240.861389,"HyperDash":false},{"StartTime":114252.0,"Position":220.326736,"HyperDash":false},{"StartTime":114319.0,"Position":184.792084,"HyperDash":false},{"StartTime":114422.0,"Position":155.0,"HyperDash":false}]},{"StartTime":114725.0,"Objects":[{"StartTime":114725.0,"Position":155.0,"HyperDash":false},{"StartTime":114782.0,"Position":174.649,"HyperDash":false},{"StartTime":114876.0,"Position":215.0,"HyperDash":false}]},{"StartTime":115331.0,"Objects":[{"StartTime":115331.0,"Position":359.0,"HyperDash":false}]},{"StartTime":115634.0,"Objects":[{"StartTime":115634.0,"Position":359.0,"HyperDash":false},{"StartTime":115700.0,"Position":376.0,"HyperDash":false},{"StartTime":115767.0,"Position":358.0,"HyperDash":false},{"StartTime":115834.0,"Position":343.0,"HyperDash":false},{"StartTime":115937.0,"Position":359.0,"HyperDash":false}]},{"StartTime":116543.0,"Objects":[{"StartTime":116543.0,"Position":167.0,"HyperDash":false},{"StartTime":116600.0,"Position":186.0,"HyperDash":false},{"StartTime":116694.0,"Position":167.0,"HyperDash":false}]},{"StartTime":116846.0,"Objects":[{"StartTime":116846.0,"Position":167.0,"HyperDash":false}]},{"StartTime":116998.0,"Objects":[{"StartTime":116998.0,"Position":215.0,"HyperDash":false},{"StartTime":117055.0,"Position":232.649,"HyperDash":false},{"StartTime":117149.0,"Position":275.0,"HyperDash":false}]},{"StartTime":117301.0,"Objects":[{"StartTime":117301.0,"Position":323.0,"HyperDash":false}]},{"StartTime":117604.0,"Objects":[{"StartTime":117604.0,"Position":323.0,"HyperDash":false}]},{"StartTime":117907.0,"Objects":[{"StartTime":117907.0,"Position":227.0,"HyperDash":false}]},{"StartTime":118967.0,"Objects":[{"StartTime":118967.0,"Position":40.0,"HyperDash":false}]},{"StartTime":119573.0,"Objects":[{"StartTime":119573.0,"Position":231.0,"HyperDash":false}]},{"StartTime":120180.0,"Objects":[{"StartTime":120180.0,"Position":422.0,"HyperDash":false},{"StartTime":120255.0,"Position":413.0,"HyperDash":false},{"StartTime":120331.0,"Position":402.0,"HyperDash":false},{"StartTime":120407.0,"Position":413.0,"HyperDash":false},{"StartTime":120483.0,"Position":422.0,"HyperDash":false},{"StartTime":120549.0,"Position":440.0,"HyperDash":false},{"StartTime":120616.0,"Position":418.0,"HyperDash":false},{"StartTime":120683.0,"Position":433.0,"HyperDash":false},{"StartTime":120786.0,"Position":422.0,"HyperDash":false}]},{"StartTime":120937.0,"Objects":[{"StartTime":120937.0,"Position":373.0,"HyperDash":false}]},{"StartTime":121089.0,"Objects":[{"StartTime":121089.0,"Position":324.0,"HyperDash":false},{"StartTime":121155.0,"Position":293.8614,"HyperDash":false},{"StartTime":121222.0,"Position":274.326721,"HyperDash":false},{"StartTime":121289.0,"Position":262.792084,"HyperDash":false},{"StartTime":121392.0,"Position":204.0,"HyperDash":false}]},{"StartTime":121695.0,"Objects":[{"StartTime":121695.0,"Position":204.0,"HyperDash":false}]},{"StartTime":122604.0,"Objects":[{"StartTime":122604.0,"Position":40.0,"HyperDash":false}]},{"StartTime":122907.0,"Objects":[{"StartTime":122907.0,"Position":256.0,"HyperDash":false}]},{"StartTime":123210.0,"Objects":[{"StartTime":123210.0,"Position":472.0,"HyperDash":false}]},{"StartTime":123816.0,"Objects":[{"StartTime":123816.0,"Position":472.0,"HyperDash":false},{"StartTime":123891.0,"Position":427.297028,"HyperDash":false},{"StartTime":123967.0,"Position":429.198029,"HyperDash":false},{"StartTime":124043.0,"Position":387.099,"HyperDash":false},{"StartTime":124119.0,"Position":352.0,"HyperDash":false},{"StartTime":124194.0,"Position":317.297028,"HyperDash":false},{"StartTime":124270.0,"Position":277.198029,"HyperDash":false},{"StartTime":124346.0,"Position":258.099,"HyperDash":false},{"StartTime":124422.0,"Position":232.0,"HyperDash":false},{"StartTime":124497.0,"Position":217.297028,"HyperDash":false},{"StartTime":124573.0,"Position":174.198029,"HyperDash":false},{"StartTime":124649.0,"Position":134.09903,"HyperDash":false},{"StartTime":124725.0,"Position":112.0,"HyperDash":false},{"StartTime":124800.0,"Position":74.29706,"HyperDash":false},{"StartTime":124876.0,"Position":66.19803,"HyperDash":false},{"StartTime":124952.0,"Position":49.0,"HyperDash":false},{"StartTime":125028.0,"Position":32.0,"HyperDash":false},{"StartTime":125103.0,"Position":44.0,"HyperDash":false},{"StartTime":125179.0,"Position":49.0,"HyperDash":false},{"StartTime":125255.0,"Position":39.901,"HyperDash":false},{"StartTime":125331.0,"Position":88.0,"HyperDash":false},{"StartTime":125397.0,"Position":106.138611,"HyperDash":false},{"StartTime":125464.0,"Position":129.673279,"HyperDash":false},{"StartTime":125531.0,"Position":176.207947,"HyperDash":false},{"StartTime":125634.0,"Position":208.0,"HyperDash":false}]},{"StartTime":126240.0,"Objects":[{"StartTime":126240.0,"Position":399.0,"HyperDash":false}]},{"StartTime":126846.0,"Objects":[{"StartTime":126846.0,"Position":399.0,"HyperDash":false}]},{"StartTime":127452.0,"Objects":[{"StartTime":127452.0,"Position":315.0,"HyperDash":false},{"StartTime":127508.0,"Position":35.0,"HyperDash":false},{"StartTime":127565.0,"Position":208.0,"HyperDash":false},{"StartTime":127622.0,"Position":504.0,"HyperDash":false},{"StartTime":127679.0,"Position":296.0,"HyperDash":false},{"StartTime":127736.0,"Position":105.0,"HyperDash":false},{"StartTime":127792.0,"Position":488.0,"HyperDash":false},{"StartTime":127849.0,"Position":230.0,"HyperDash":false},{"StartTime":127906.0,"Position":446.0,"HyperDash":false},{"StartTime":127963.0,"Position":241.0,"HyperDash":false},{"StartTime":128020.0,"Position":413.0,"HyperDash":false},{"StartTime":128076.0,"Position":357.0,"HyperDash":false},{"StartTime":128133.0,"Position":256.0,"HyperDash":false},{"StartTime":128190.0,"Position":192.0,"HyperDash":false},{"StartTime":128247.0,"Position":116.0,"HyperDash":false},{"StartTime":128304.0,"Position":397.0,"HyperDash":false},{"StartTime":128361.0,"Position":422.0,"HyperDash":false},{"StartTime":128417.0,"Position":230.0,"HyperDash":false},{"StartTime":128474.0,"Position":479.0,"HyperDash":false},{"StartTime":128531.0,"Position":276.0,"HyperDash":false},{"StartTime":128588.0,"Position":423.0,"HyperDash":false},{"StartTime":128645.0,"Position":450.0,"HyperDash":false},{"StartTime":128701.0,"Position":336.0,"HyperDash":false},{"StartTime":128758.0,"Position":145.0,"HyperDash":false},{"StartTime":128815.0,"Position":30.0,"HyperDash":false},{"StartTime":128872.0,"Position":426.0,"HyperDash":false},{"StartTime":128929.0,"Position":394.0,"HyperDash":false},{"StartTime":128985.0,"Position":274.0,"HyperDash":false},{"StartTime":129042.0,"Position":44.0,"HyperDash":false},{"StartTime":129099.0,"Position":32.0,"HyperDash":false},{"StartTime":129156.0,"Position":10.0,"HyperDash":false},{"StartTime":129213.0,"Position":505.0,"HyperDash":false},{"StartTime":129270.0,"Position":321.0,"HyperDash":false}]},{"StartTime":129876.0,"Objects":[{"StartTime":129876.0,"Position":48.0,"HyperDash":false}]},{"StartTime":130483.0,"Objects":[{"StartTime":130483.0,"Position":144.0,"HyperDash":false}]},{"StartTime":131089.0,"Objects":[{"StartTime":131089.0,"Position":240.0,"HyperDash":false},{"StartTime":131164.0,"Position":239.851486,"HyperDash":false},{"StartTime":131240.0,"Position":286.901,"HyperDash":false},{"StartTime":131316.0,"Position":289.9505,"HyperDash":false},{"StartTime":131392.0,"Position":282.0,"HyperDash":false},{"StartTime":131467.0,"Position":312.8515,"HyperDash":false},{"StartTime":131543.0,"Position":328.901,"HyperDash":false},{"StartTime":131619.0,"Position":352.9505,"HyperDash":false},{"StartTime":131695.0,"Position":360.0,"HyperDash":false},{"StartTime":131770.0,"Position":349.0,"HyperDash":false},{"StartTime":131846.0,"Position":359.0,"HyperDash":false},{"StartTime":131922.0,"Position":362.0,"HyperDash":false},{"StartTime":131998.0,"Position":352.0,"HyperDash":false},{"StartTime":132073.0,"Position":356.0,"HyperDash":false},{"StartTime":132149.0,"Position":371.0,"HyperDash":false},{"StartTime":132225.0,"Position":346.0,"HyperDash":false},{"StartTime":132301.0,"Position":360.0,"HyperDash":false},{"StartTime":132372.0,"Position":328.9406,"HyperDash":false},{"StartTime":132443.0,"Position":335.8812,"HyperDash":false},{"StartTime":132514.0,"Position":328.821777,"HyperDash":false},{"StartTime":132586.0,"Position":302.564362,"HyperDash":false},{"StartTime":132657.0,"Position":285.504944,"HyperDash":false},{"StartTime":132728.0,"Position":274.445557,"HyperDash":false},{"StartTime":132799.0,"Position":246.386139,"HyperDash":false},{"StartTime":132907.0,"Position":240.0,"HyperDash":false}]},{"StartTime":133513.0,"Objects":[{"StartTime":133513.0,"Position":144.0,"HyperDash":false}]},{"StartTime":134119.0,"Objects":[{"StartTime":134119.0,"Position":144.0,"HyperDash":false}]},{"StartTime":134725.0,"Objects":[{"StartTime":134725.0,"Position":423.0,"HyperDash":false},{"StartTime":134781.0,"Position":367.0,"HyperDash":false},{"StartTime":134838.0,"Position":146.0,"HyperDash":false},{"StartTime":134895.0,"Position":322.0,"HyperDash":false},{"StartTime":134952.0,"Position":169.0,"HyperDash":false},{"StartTime":135009.0,"Position":159.0,"HyperDash":false},{"StartTime":135065.0,"Position":388.0,"HyperDash":false},{"StartTime":135122.0,"Position":67.0,"HyperDash":false},{"StartTime":135179.0,"Position":176.0,"HyperDash":false},{"StartTime":135236.0,"Position":371.0,"HyperDash":false},{"StartTime":135293.0,"Position":365.0,"HyperDash":false},{"StartTime":135349.0,"Position":104.0,"HyperDash":false},{"StartTime":135406.0,"Position":363.0,"HyperDash":false},{"StartTime":135463.0,"Position":75.0,"HyperDash":false},{"StartTime":135520.0,"Position":158.0,"HyperDash":false},{"StartTime":135577.0,"Position":98.0,"HyperDash":false},{"StartTime":135634.0,"Position":30.0,"HyperDash":false},{"StartTime":135690.0,"Position":164.0,"HyperDash":false},{"StartTime":135747.0,"Position":341.0,"HyperDash":false},{"StartTime":135804.0,"Position":18.0,"HyperDash":false},{"StartTime":135861.0,"Position":210.0,"HyperDash":false},{"StartTime":135918.0,"Position":420.0,"HyperDash":false},{"StartTime":135974.0,"Position":447.0,"HyperDash":false},{"StartTime":136031.0,"Position":78.0,"HyperDash":false},{"StartTime":136088.0,"Position":177.0,"HyperDash":false},{"StartTime":136145.0,"Position":305.0,"HyperDash":false},{"StartTime":136202.0,"Position":400.0,"HyperDash":false},{"StartTime":136258.0,"Position":462.0,"HyperDash":false},{"StartTime":136315.0,"Position":64.0,"HyperDash":false},{"StartTime":136372.0,"Position":458.0,"HyperDash":false},{"StartTime":136429.0,"Position":380.0,"HyperDash":false},{"StartTime":136486.0,"Position":65.0,"HyperDash":false},{"StartTime":136543.0,"Position":23.0,"HyperDash":false},{"StartTime":136599.0,"Position":379.0,"HyperDash":false},{"StartTime":136656.0,"Position":44.0,"HyperDash":false},{"StartTime":136713.0,"Position":485.0,"HyperDash":false},{"StartTime":136770.0,"Position":269.0,"HyperDash":false},{"StartTime":136827.0,"Position":155.0,"HyperDash":false},{"StartTime":136883.0,"Position":324.0,"HyperDash":false},{"StartTime":136940.0,"Position":149.0,"HyperDash":false},{"StartTime":136997.0,"Position":351.0,"HyperDash":false},{"StartTime":137054.0,"Position":385.0,"HyperDash":false},{"StartTime":137111.0,"Position":338.0,"HyperDash":false},{"StartTime":137167.0,"Position":322.0,"HyperDash":false},{"StartTime":137224.0,"Position":84.0,"HyperDash":false},{"StartTime":137281.0,"Position":342.0,"HyperDash":false},{"StartTime":137338.0,"Position":395.0,"HyperDash":false},{"StartTime":137395.0,"Position":72.0,"HyperDash":false},{"StartTime":137452.0,"Position":324.0,"HyperDash":false},{"StartTime":137508.0,"Position":67.0,"HyperDash":false},{"StartTime":137565.0,"Position":371.0,"HyperDash":false},{"StartTime":137622.0,"Position":446.0,"HyperDash":false},{"StartTime":137679.0,"Position":29.0,"HyperDash":false},{"StartTime":137736.0,"Position":22.0,"HyperDash":false},{"StartTime":137792.0,"Position":432.0,"HyperDash":false},{"StartTime":137849.0,"Position":12.0,"HyperDash":false},{"StartTime":137906.0,"Position":330.0,"HyperDash":false},{"StartTime":137963.0,"Position":419.0,"HyperDash":false},{"StartTime":138020.0,"Position":278.0,"HyperDash":false},{"StartTime":138076.0,"Position":202.0,"HyperDash":false},{"StartTime":138133.0,"Position":208.0,"HyperDash":false},{"StartTime":138190.0,"Position":21.0,"HyperDash":false},{"StartTime":138247.0,"Position":437.0,"HyperDash":false},{"StartTime":138304.0,"Position":312.0,"HyperDash":false},{"StartTime":138361.0,"Position":508.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/50859.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/50859.osu
new file mode 100644
index 0000000000..8272b8b1db
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/50859.osu
@@ -0,0 +1,290 @@
+osu file format v7
+
+[General]
+StackLeniency: 0.5
+Mode: 0
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4
+OverallDifficulty:7
+SliderMultiplier:2.4
+SliderTickRate:2
+
+[Events]
+//Break Periods
+2,109470,110492
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+//Background Colour Transformations
+3,100,163,162,255
+
+[TimingPoints]
+180,606.060606060606,3,2,1,20,1,0
+11528,-100,4,2,1,50,0,0
+28952,-100,4,2,1,20,0,0
+36452,-100,4,2,1,50,0,0
+43523,-50,4,2,2,20,0,0
+50921,-100,4,2,1,40,0,0
+51073,-100,4,2,1,60,0,0
+53371,-100,4,2,2,60,0,0
+54280,-100,4,2,1,60,0,0
+58195,-100,4,2,1,40,0,0
+65468,-100,4,2,1,60,0,0
+68801,-100,4,1,0,30,0,0
+69129,-100,4,1,1,30,0,0
+69407,-100,4,2,1,60,0,0
+75644,-100,4,1,0,35,0,0
+76680,-100,4,2,1,60,0,0
+78195,-100,4,2,1,40,0,0
+78649,-100,4,2,1,60,0,0
+87386,-100,4,1,2,30,0,0
+101856,-100,4,1,1,40,0,0
+109583,-100,4,2,2,60,0,0
+112008,-100,4,1,2,20,0,0
+113068,-100,4,2,2,60,0,0
+114583,-100,4,2,2,40,0,0
+115038,-100,4,2,2,60,0,0
+123523,-100,4,1,2,30,0,0
+124280,-100,4,1,0,30,0,0
+124583,-100,4,1,2,30,0,0
+124886,-100,4,1,0,30,0,0
+125189,-100,4,1,2,30,0,0
+125644,-100,4,1,1,30,0,0
+125947,-100,4,1,2,20,0,0
+127159,-100,4,1,1,60,0,0
+129583,-200,4,1,0,20,0,0
+134583,-200,4,1,1,0,0,0
+
+[HitObjects]
+120,72,179,1,0
+311,72,786,2,0,B|448:72,1,120,2|0
+431,167,1392,2,0,B|303:167,1,120,2|2
+215,167,1998,1,0
+119,167,2301,6,0,B|487:167,1,360,2|2
+478,261,3513,1,0
+382,261,3816,6,0,B|254:261,1,120
+166,261,4422,2,0,B|166:138,1,120,2|2
+166,332,5331,1,0
+261,332,5634,2,0,L|327:332,1,60,0|2
+321,235,6089,2,0,L|321:175,1,60,0|2
+321,79,6543,1,0
+465,79,6998,2,0,L|465:143,1,60,0|2
+369,139,7452,6,0,B|369:278,1,120
+464,259,8058,1,2
+464,163,8361,2,0,B|288:163,1,120,0|2
+248,163,8967,1,0
+200,243,9270,1,0
+296,243,9573,1,2
+275,37,10180,5,0
+179,37,10483,1,2
+179,132,10786,2,0,B|307:132,1,120,2|0
+299,227,11392,1,0
+203,227,11695,6,0,L|142:227,1,60
+94,227,11998,1,2
+94,131,12301,1,2
+189,131,12604,1,0
+476,131,13513,1,0
+380,131,13816,1,2
+272,23,14725,6,0,L|208:23,1,60,2|0
+177,57,15028,2,0,L|177:129,1,60
+225,117,15331,1,0
+273,117,15483,1,2
+273,211,15786,1,2
+273,306,16089,1,2
+33,306,16846,6,0,L|33:242,1,60
+33,197,17149,1,2
+224,197,17755,1,0
+277,50,18967,5,0
+228,50,19119,1,0
+181,50,19270,1,2
+181,145,19573,1,2
+181,240,19876,1,0
+469,240,20786,5,0
+373,240,21089,1,2
+277,240,21392,1,0
+243,350,21998,5,2
+243,302,22149,1,0
+243,254,22301,1,2
+290,254,22452,2,0,L|290:193,1,60
+290,146,22755,1,2
+385,146,23058,1,2
+385,241,23361,1,2
+213,68,24119,6,0,L|149:68,1,60,0|0
+104,68,24422,1,2
+295,68,25028,1,0
+56,64,26240,5,0
+56,64,26392,1,0
+56,64,26543,1,2
+56,159,26846,1,2
+151,159,27149,1,0
+438,159,28058,6,0,B|438:303,1,120,0|2
+184,192,29270,6,0,B|312:192,1,120,6|0
+399,192,29876,1,2
+399,95,30180,1,0
+303,95,30483,2,0,B|129:95,1,120,2|0
+115,162,31089,6,0,B|243:162,1,120,2|0
+330,162,31695,1,2
+425,162,31998,1,0
+425,257,32301,2,0,B|265:257,1,120,2|0
+209,257,32907,6,0,B|65:257,1,120,6|0
+89,160,33513,1,2
+184,160,33816,1,0
+279,160,34119,1,2
+374,160,34422,1,0
+469,160,34725,6,0,B|469:304,1,120,2|0
+373,280,35331,2,0,B|216:280,1,120,2|0
+157,280,35937,1,2
+157,184,36240,1,0
+157,135,36392,1,0
+204,135,36543,6,0,B|268:135,2,60,2|0|2
+204,183,36998,2,0,B|204:255,1,60
+205,291,37301,1,2
+300,291,37604,1,2
+300,195,37907,1,2
+32,32,38967,5,2
+32,223,39573,1,0
+416,223,40786,5,0
+416,176,40937,1,0
+416,128,41089,1,2
+320,128,41392,1,2
+320,224,41695,1,0
+48,128,42604,6,0,B|192:128,1,120,0|2
+263,128,43210,1,0
+376,192,43816,6,0,B|136:192,5,240,6|0|2|0|2|0
+376,248,45634,6,0,B|136:248,5,240,2|0|2|0|2|0
+376,184,47452,6,0,B|136:184,5,240,6|0|2|0|2|0
+376,248,49270,6,0,B|109:247,1,240,2|0
+136,136,49876,1,2
+328,136,50180,1,0
+329,326,50483,1,2
+136,328,50786,1,0
+138,278,50937,1,0
+138,229,51089,6,0,B|255:229,1,60,6|0
+198,180,51392,1,2
+246,180,51543,1,0
+295,180,51695,2,0,B|365:180,1,60,0|2
+355,84,52149,1,2
+260,84,52452,1,2
+40,344,53513,6,0,L|280:344,1,240,2|0
+40,40,55331,6,0,L|120:40,2,60,0|0|2
+40,135,55937,2,0,L|40:262,1,120,2|0
+300,132,57149,6,0,L|300:272,1,120,0|2
+256,192,58361,6,0,L|336:192,1,60,2|0
+364,192,58664,2,0,L|364:256,1,60,2|0
+329,286,58967,1,0
+280,286,59119,2,0,L|208:286,1,60,2|0
+185,251,59422,2,0,L|185:179,1,60,2|0
+185,95,59876,1,4
+253,163,60180,5,2
+253,163,60331,1,2
+253,163,60483,1,2
+253,163,60634,1,0
+253,211,60786,2,0,L|192:211,4,60,2|0|2|0|2
+253,115,61695,1,4
+348,115,61998,6,0,L|348:51,4,60,2|0|2|0|2
+348,162,62755,1,2
+348,210,62907,1,2
+348,257,63058,1,0
+348,257,63210,1,2
+252,257,63513,1,4
+252,161,63816,5,0
+252,113,63967,2,0,L|169:113,3,60,2|0|2|0
+288,113,64725,1,4
+383,113,65028,1,4
+383,208,65331,1,0
+287,208,65634,6,0,L|195:208,1,60,2|0
+178,208,65937,1,2
+129,208,66089,1,0
+81,208,66240,1,0
+81,256,66392,1,2
+81,303,66543,2,0,L|145:303,1,60,0|2
+189,303,66846,2,0,L|253:303,1,60,0|2
+192,48,67755,6,0,L|304:48,1,60
+300,48,68058,1,2
+300,239,68664,1,0
+300,143,68967,5,0
+204,143,69270,1,4
+395,143,69876,6,0,L|396:226,1,60,0|0
+395,251,70180,1,2
+296,248,70483,1,2
+200,248,70786,1,0
+200,40,71695,1,0
+295,40,71998,1,2
+91,243,72907,5,2
+138,243,73058,1,0
+186,243,73210,1,0
+186,290,73361,2,0,L|254:290,1,60,2|0
+294,290,73664,2,0,L|371:290,1,60,2|0
+354,241,73967,1,2
+354,145,74270,1,2
+40,40,75331,5,2
+160,208,75937,1,0
+160,208,76089,1,0
+303,208,76543,1,4
+160,80,77149,6,0,L|232:80,1,60,0|0
+268,80,77452,1,2
+268,175,77755,1,2
+268,270,78058,1,0
+363,270,78361,6,4,L|363:187,1,60
+363,65,78967,5,0
+267,65,79270,2,0,L|126:65,1,120,2|0
+96,32,80180,6,0,L|96:344|296:344,1,480
+360,344,81695,1,0
+455,344,81998,2,0,L|455:32|159:32,1,600,2|0
+124,99,83816,6,0,L|364:99|364:347,1,480
+268,339,85331,1,4
+172,339,85634,2,0,L|52:339|52:235|52:123|156:123|316:123|316:219,1,660
+316,231,87452,6,0,L|316:354,1,120
+411,351,88058,2,0,L|411:103|147:103,1,480,4|0
+176,296,89876,2,0,L|40:296|40:152,1,240
+232,191,91089,5,4
+423,191,91695,2,0,L|423:351|71:351,1,480,4|4
+112,167,93513,1,0
+303,167,94119,1,0
+440,280,94725,6,0,L|440:35,2,240,4|4|0
+216,280,96543,2,0,L|216:32,1,240,4|0
+48,160,97755,1,0
+216,40,98361,5,4
+216,352,98967,2,0,L|216:104,2,240,4|0|4
+216,32,100786,1,4
+216,352,101392,1,0
+256,192,101998,12,0,109270
+48,48,111392,6,0,L|128:48,1,60
+156,48,111695,1,2
+347,48,112301,2,0,L|347:112,1,60
+347,156,112604,2,0,L|347:220,1,60
+347,264,112907,1,4
+155,264,113513,5,0
+155,216,113664,1,0
+155,167,113816,2,0,L|275:167,2,120,2|2|0
+155,71,114725,6,4,L|217:71,1,60
+359,71,115331,5,0
+359,166,115634,2,0,L|359:296,1,120,2|0
+167,286,116543,6,0,L|167:205,1,60,2|0
+167,177,116846,1,0
+215,177,116998,2,0,L|281:177,1,60,2|0
+323,177,117301,5,2
+323,81,117604,1,2
+227,81,117907,1,2
+40,344,118967,5,2
+231,344,119573,1,0
+422,344,120180,6,0,L|422:50,1,240
+373,104,120937,1,0
+324,104,121089,2,0,L|204:104,1,120,2|2
+204,199,121695,1,0
+40,40,122604,5,0
+256,40,122907,1,2
+472,40,123210,1,0
+472,232,123816,6,2,L|32:232|32:336|240:336,1,720,2|2
+399,336,126240,1,8
+399,144,126846,1,8
+256,192,127452,12,0,129270
+48,192,129876,5,8
+144,192,130483,1,8
+240,192,131089,2,2,L|360:192|360:72|240:72,1,360,2|2
+144,72,133513,1,8
+144,167,134119,1,8
+256,192,134725,12,0,138361
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/75858-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/75858-expected-conversion.json
new file mode 100644
index 0000000000..d5db48bc8c
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/75858-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":1173.0,"Objects":[{"StartTime":1173.0,"Position":94.0,"HyperDash":false},{"StartTime":1251.0,"Position":94.284874,"HyperDash":false},{"StartTime":1330.0,"Position":115.604385,"HyperDash":false},{"StartTime":1409.0,"Position":141.8706,"HyperDash":false},{"StartTime":1488.0,"Position":178.597519,"HyperDash":false},{"StartTime":1566.0,"Position":199.289474,"HyperDash":false},{"StartTime":1645.0,"Position":202.258377,"HyperDash":false},{"StartTime":1724.0,"Position":219.14473,"HyperDash":false},{"StartTime":1839.0,"Position":247.271439,"HyperDash":false}]},{"StartTime":2506.0,"Objects":[{"StartTime":2506.0,"Position":398.0,"HyperDash":false}]},{"StartTime":3172.0,"Objects":[{"StartTime":3172.0,"Position":471.0,"HyperDash":false}]},{"StartTime":3839.0,"Objects":[{"StartTime":3839.0,"Position":320.0,"HyperDash":false},{"StartTime":3917.0,"Position":287.205841,"HyperDash":false},{"StartTime":3996.0,"Position":275.6191,"HyperDash":false},{"StartTime":4075.0,"Position":252.736725,"HyperDash":false},{"StartTime":4154.0,"Position":241.768585,"HyperDash":false},{"StartTime":4232.0,"Position":241.149734,"HyperDash":false},{"StartTime":4311.0,"Position":212.634354,"HyperDash":false},{"StartTime":4390.0,"Position":181.770065,"HyperDash":false},{"StartTime":4505.0,"Position":166.756821,"HyperDash":false}]},{"StartTime":5173.0,"Objects":[{"StartTime":5173.0,"Position":65.0,"HyperDash":false}]},{"StartTime":5839.0,"Objects":[{"StartTime":5839.0,"Position":233.0,"HyperDash":false}]},{"StartTime":6506.0,"Objects":[{"StartTime":6506.0,"Position":239.0,"HyperDash":false},{"StartTime":6584.0,"Position":262.183746,"HyperDash":false},{"StartTime":6663.0,"Position":257.084351,"HyperDash":false},{"StartTime":6742.0,"Position":286.044983,"HyperDash":false},{"StartTime":6821.0,"Position":331.921021,"HyperDash":false},{"StartTime":6899.0,"Position":349.51355,"HyperDash":false},{"StartTime":6978.0,"Position":364.384766,"HyperDash":false},{"StartTime":7057.0,"Position":362.333984,"HyperDash":false},{"StartTime":7172.0,"Position":397.8736,"HyperDash":false}]},{"StartTime":7839.0,"Objects":[{"StartTime":7839.0,"Position":493.0,"HyperDash":false}]},{"StartTime":8506.0,"Objects":[{"StartTime":8506.0,"Position":175.0,"HyperDash":false}]},{"StartTime":9173.0,"Objects":[{"StartTime":9173.0,"Position":223.0,"HyperDash":false}]},{"StartTime":9839.0,"Objects":[{"StartTime":9839.0,"Position":119.0,"HyperDash":false}]},{"StartTime":10506.0,"Objects":[{"StartTime":10506.0,"Position":423.0,"HyperDash":false}]},{"StartTime":10839.0,"Objects":[{"StartTime":10839.0,"Position":199.0,"HyperDash":false},{"StartTime":10917.0,"Position":173.819885,"HyperDash":false},{"StartTime":10996.0,"Position":195.248886,"HyperDash":false},{"StartTime":11075.0,"Position":168.416779,"HyperDash":false},{"StartTime":11154.0,"Position":168.359177,"HyperDash":false},{"StartTime":11232.0,"Position":140.23172,"HyperDash":false},{"StartTime":11311.0,"Position":141.862854,"HyperDash":false},{"StartTime":11390.0,"Position":135.414291,"HyperDash":false},{"StartTime":11505.0,"Position":122.606651,"HyperDash":false}]},{"StartTime":11839.0,"Objects":[{"StartTime":11839.0,"Position":42.0,"HyperDash":false}]},{"StartTime":12506.0,"Objects":[{"StartTime":12506.0,"Position":178.0,"HyperDash":false}]},{"StartTime":13172.0,"Objects":[{"StartTime":13172.0,"Position":263.0,"HyperDash":false},{"StartTime":13250.0,"Position":294.723358,"HyperDash":false},{"StartTime":13329.0,"Position":284.270325,"HyperDash":false},{"StartTime":13408.0,"Position":299.0951,"HyperDash":false},{"StartTime":13487.0,"Position":321.0376,"HyperDash":false},{"StartTime":13565.0,"Position":368.773682,"HyperDash":false},{"StartTime":13644.0,"Position":391.718231,"HyperDash":false},{"StartTime":13723.0,"Position":392.566528,"HyperDash":false},{"StartTime":13838.0,"Position":420.607758,"HyperDash":false}]},{"StartTime":14506.0,"Objects":[{"StartTime":14506.0,"Position":293.0,"HyperDash":false},{"StartTime":14584.0,"Position":277.467133,"HyperDash":false},{"StartTime":14663.0,"Position":271.341,"HyperDash":false},{"StartTime":14742.0,"Position":276.740753,"HyperDash":false},{"StartTime":14821.0,"Position":235.4871,"HyperDash":false},{"StartTime":14899.0,"Position":229.366821,"HyperDash":false},{"StartTime":14978.0,"Position":219.329987,"HyperDash":false},{"StartTime":15057.0,"Position":204.814072,"HyperDash":false},{"StartTime":15172.0,"Position":160.38443,"HyperDash":false}]},{"StartTime":15839.0,"Objects":[{"StartTime":15839.0,"Position":282.0,"HyperDash":false},{"StartTime":15917.0,"Position":307.532867,"HyperDash":false},{"StartTime":15996.0,"Position":317.659,"HyperDash":false},{"StartTime":16075.0,"Position":334.259247,"HyperDash":false},{"StartTime":16154.0,"Position":342.512878,"HyperDash":false},{"StartTime":16232.0,"Position":333.633179,"HyperDash":false},{"StartTime":16311.0,"Position":373.67,"HyperDash":false},{"StartTime":16390.0,"Position":375.1859,"HyperDash":false},{"StartTime":16505.0,"Position":414.61557,"HyperDash":false}]},{"StartTime":17172.0,"Objects":[{"StartTime":17172.0,"Position":416.0,"HyperDash":false}]},{"StartTime":17839.0,"Objects":[{"StartTime":17839.0,"Position":256.0,"HyperDash":false},{"StartTime":17920.0,"Position":221.750565,"HyperDash":false},{"StartTime":18001.0,"Position":235.501129,"HyperDash":false},{"StartTime":18082.0,"Position":190.251709,"HyperDash":false},{"StartTime":18163.0,"Position":195.002274,"HyperDash":false},{"StartTime":18244.0,"Position":183.643,"HyperDash":false},{"StartTime":18325.0,"Position":181.956619,"HyperDash":false},{"StartTime":18406.0,"Position":200.650589,"HyperDash":false},{"StartTime":18487.0,"Position":193.194916,"HyperDash":false},{"StartTime":18568.0,"Position":202.48082,"HyperDash":false},{"StartTime":18649.0,"Position":179.827667,"HyperDash":false},{"StartTime":18730.0,"Position":173.703339,"HyperDash":false},{"StartTime":18811.0,"Position":186.446991,"HyperDash":false},{"StartTime":18892.0,"Position":151.2917,"HyperDash":false},{"StartTime":18973.0,"Position":126.879227,"HyperDash":false},{"StartTime":19054.0,"Position":122.770569,"HyperDash":false},{"StartTime":19172.0,"Position":99.93324,"HyperDash":false}]},{"StartTime":19839.0,"Objects":[{"StartTime":19839.0,"Position":256.0,"HyperDash":false}]},{"StartTime":20173.0,"Objects":[{"StartTime":20173.0,"Position":123.0,"HyperDash":false},{"StartTime":20245.0,"Position":42.0,"HyperDash":false},{"StartTime":20318.0,"Position":393.0,"HyperDash":false},{"StartTime":20391.0,"Position":75.0,"HyperDash":false},{"StartTime":20464.0,"Position":377.0,"HyperDash":false},{"StartTime":20537.0,"Position":354.0,"HyperDash":false},{"StartTime":20610.0,"Position":287.0,"HyperDash":false},{"StartTime":20683.0,"Position":361.0,"HyperDash":false},{"StartTime":20756.0,"Position":479.0,"HyperDash":false},{"StartTime":20829.0,"Position":346.0,"HyperDash":false},{"StartTime":20902.0,"Position":266.0,"HyperDash":false},{"StartTime":20974.0,"Position":400.0,"HyperDash":false},{"StartTime":21047.0,"Position":202.0,"HyperDash":false},{"StartTime":21120.0,"Position":500.0,"HyperDash":false},{"StartTime":21193.0,"Position":80.0,"HyperDash":false},{"StartTime":21266.0,"Position":399.0,"HyperDash":false},{"StartTime":21339.0,"Position":455.0,"HyperDash":false},{"StartTime":21412.0,"Position":105.0,"HyperDash":false},{"StartTime":21485.0,"Position":100.0,"HyperDash":false},{"StartTime":21558.0,"Position":195.0,"HyperDash":false},{"StartTime":21631.0,"Position":106.0,"HyperDash":false},{"StartTime":21704.0,"Position":305.0,"HyperDash":false},{"StartTime":21776.0,"Position":225.0,"HyperDash":false},{"StartTime":21849.0,"Position":79.0,"HyperDash":false},{"StartTime":21922.0,"Position":38.0,"HyperDash":false},{"StartTime":21995.0,"Position":99.0,"HyperDash":false},{"StartTime":22068.0,"Position":79.0,"HyperDash":false},{"StartTime":22141.0,"Position":169.0,"HyperDash":false},{"StartTime":22214.0,"Position":238.0,"HyperDash":false},{"StartTime":22287.0,"Position":511.0,"HyperDash":false},{"StartTime":22360.0,"Position":58.0,"HyperDash":false},{"StartTime":22433.0,"Position":368.0,"HyperDash":false},{"StartTime":22506.0,"Position":52.0,"HyperDash":false}]},{"StartTime":22961.0,"Objects":[{"StartTime":22961.0,"Position":256.0,"HyperDash":false}]},{"StartTime":23415.0,"Objects":[{"StartTime":23415.0,"Position":236.0,"HyperDash":false}]},{"StartTime":23870.0,"Objects":[{"StartTime":23870.0,"Position":104.0,"HyperDash":false},{"StartTime":23926.0,"Position":115.299927,"HyperDash":false},{"StartTime":23983.0,"Position":150.004791,"HyperDash":false},{"StartTime":24040.0,"Position":149.768875,"HyperDash":false},{"StartTime":24097.0,"Position":172.51532,"HyperDash":false},{"StartTime":24192.0,"Position":154.09137,"HyperDash":false},{"StartTime":24324.0,"Position":104.0,"HyperDash":false}]},{"StartTime":24779.0,"Objects":[{"StartTime":24779.0,"Position":256.0,"HyperDash":false},{"StartTime":24835.0,"Position":262.6648,"HyperDash":false},{"StartTime":24892.0,"Position":294.163452,"HyperDash":false},{"StartTime":24949.0,"Position":301.429565,"HyperDash":false},{"StartTime":25006.0,"Position":329.7457,"HyperDash":false},{"StartTime":25101.0,"Position":304.427277,"HyperDash":false},{"StartTime":25233.0,"Position":256.0,"HyperDash":false}]},{"StartTime":25688.0,"Objects":[{"StartTime":25688.0,"Position":118.0,"HyperDash":false},{"StartTime":25783.0,"Position":160.2344,"HyperDash":false},{"StartTime":25915.0,"Position":196.5579,"HyperDash":false}]},{"StartTime":26142.0,"Objects":[{"StartTime":26142.0,"Position":321.0,"HyperDash":false}]},{"StartTime":26597.0,"Objects":[{"StartTime":26597.0,"Position":419.0,"HyperDash":false},{"StartTime":26692.0,"Position":383.782776,"HyperDash":false},{"StartTime":26824.0,"Position":341.8768,"HyperDash":false}]},{"StartTime":27052.0,"Objects":[{"StartTime":27052.0,"Position":185.0,"HyperDash":false}]},{"StartTime":27506.0,"Objects":[{"StartTime":27506.0,"Position":71.0,"HyperDash":false}]},{"StartTime":27733.0,"Objects":[{"StartTime":27733.0,"Position":97.0,"HyperDash":false},{"StartTime":27828.0,"Position":69.73373,"HyperDash":false},{"StartTime":27960.0,"Position":95.43024,"HyperDash":false}]},{"StartTime":28415.0,"Objects":[{"StartTime":28415.0,"Position":376.0,"HyperDash":false}]},{"StartTime":28642.0,"Objects":[{"StartTime":28642.0,"Position":313.0,"HyperDash":false},{"StartTime":28737.0,"Position":349.615631,"HyperDash":false},{"StartTime":28869.0,"Position":392.036163,"HyperDash":false}]},{"StartTime":29324.0,"Objects":[{"StartTime":29324.0,"Position":501.0,"HyperDash":false}]},{"StartTime":29552.0,"Objects":[{"StartTime":29552.0,"Position":411.0,"HyperDash":false}]},{"StartTime":29779.0,"Objects":[{"StartTime":29779.0,"Position":501.0,"HyperDash":false}]},{"StartTime":30233.0,"Objects":[{"StartTime":30233.0,"Position":311.0,"HyperDash":false}]},{"StartTime":30461.0,"Objects":[{"StartTime":30461.0,"Position":231.0,"HyperDash":false}]},{"StartTime":30688.0,"Objects":[{"StartTime":30688.0,"Position":151.0,"HyperDash":false},{"StartTime":30744.0,"Position":136.485382,"HyperDash":false},{"StartTime":30801.0,"Position":111.448036,"HyperDash":false},{"StartTime":30915.0,"Position":151.0,"HyperDash":false}]},{"StartTime":31142.0,"Objects":[{"StartTime":31142.0,"Position":364.0,"HyperDash":false}]},{"StartTime":31370.0,"Objects":[{"StartTime":31370.0,"Position":202.0,"HyperDash":false}]},{"StartTime":31597.0,"Objects":[{"StartTime":31597.0,"Position":194.0,"HyperDash":false},{"StartTime":31649.0,"Position":193.329712,"HyperDash":false},{"StartTime":31701.0,"Position":177.29129,"HyperDash":false},{"StartTime":31753.0,"Position":180.897339,"HyperDash":false},{"StartTime":31806.0,"Position":196.245209,"HyperDash":false},{"StartTime":31858.0,"Position":225.942978,"HyperDash":false},{"StartTime":31910.0,"Position":221.896729,"HyperDash":false},{"StartTime":31962.0,"Position":258.838379,"HyperDash":false},{"StartTime":32051.0,"Position":270.298431,"HyperDash":false}]},{"StartTime":32279.0,"Objects":[{"StartTime":32279.0,"Position":316.0,"HyperDash":false}]},{"StartTime":32506.0,"Objects":[{"StartTime":32506.0,"Position":273.0,"HyperDash":false},{"StartTime":32558.0,"Position":268.772461,"HyperDash":false},{"StartTime":32610.0,"Position":229.84964,"HyperDash":false},{"StartTime":32662.0,"Position":200.402817,"HyperDash":false},{"StartTime":32715.0,"Position":184.266861,"HyperDash":false},{"StartTime":32767.0,"Position":200.3539,"HyperDash":false},{"StartTime":32819.0,"Position":172.707291,"HyperDash":false},{"StartTime":32871.0,"Position":162.9561,"HyperDash":false},{"StartTime":32960.0,"Position":144.968948,"HyperDash":false}]},{"StartTime":33188.0,"Objects":[{"StartTime":33188.0,"Position":294.0,"HyperDash":false}]},{"StartTime":33415.0,"Objects":[{"StartTime":33415.0,"Position":295.0,"HyperDash":false},{"StartTime":33467.0,"Position":281.203522,"HyperDash":false},{"StartTime":33519.0,"Position":263.38385,"HyperDash":false},{"StartTime":33571.0,"Position":270.625458,"HyperDash":false},{"StartTime":33624.0,"Position":279.906525,"HyperDash":false},{"StartTime":33676.0,"Position":253.1824,"HyperDash":false},{"StartTime":33728.0,"Position":271.372864,"HyperDash":false},{"StartTime":33780.0,"Position":265.406738,"HyperDash":false},{"StartTime":33869.0,"Position":300.795166,"HyperDash":false}]},{"StartTime":34097.0,"Objects":[{"StartTime":34097.0,"Position":406.0,"HyperDash":false}]},{"StartTime":34324.0,"Objects":[{"StartTime":34324.0,"Position":372.0,"HyperDash":false},{"StartTime":34376.0,"Position":366.75238,"HyperDash":false},{"StartTime":34428.0,"Position":319.542755,"HyperDash":false},{"StartTime":34480.0,"Position":337.707428,"HyperDash":false},{"StartTime":34533.0,"Position":311.1586,"HyperDash":false},{"StartTime":34585.0,"Position":283.844269,"HyperDash":false},{"StartTime":34637.0,"Position":264.676025,"HyperDash":false},{"StartTime":34689.0,"Position":259.952332,"HyperDash":false},{"StartTime":34778.0,"Position":219.572815,"HyperDash":false}]},{"StartTime":35006.0,"Objects":[{"StartTime":35006.0,"Position":117.0,"HyperDash":false}]},{"StartTime":35233.0,"Objects":[{"StartTime":35233.0,"Position":107.0,"HyperDash":false},{"StartTime":35285.0,"Position":123.10994,"HyperDash":false},{"StartTime":35337.0,"Position":138.9144,"HyperDash":false},{"StartTime":35389.0,"Position":142.755829,"HyperDash":false},{"StartTime":35442.0,"Position":177.3442,"HyperDash":false},{"StartTime":35494.0,"Position":180.653748,"HyperDash":false},{"StartTime":35546.0,"Position":203.782745,"HyperDash":false},{"StartTime":35598.0,"Position":209.428528,"HyperDash":false},{"StartTime":35687.0,"Position":255.847168,"HyperDash":false}]},{"StartTime":35915.0,"Objects":[{"StartTime":35915.0,"Position":370.0,"HyperDash":false}]},{"StartTime":36142.0,"Objects":[{"StartTime":36142.0,"Position":330.0,"HyperDash":false}]},{"StartTime":36597.0,"Objects":[{"StartTime":36597.0,"Position":370.0,"HyperDash":false}]},{"StartTime":36824.0,"Objects":[{"StartTime":36824.0,"Position":416.0,"HyperDash":false}]},{"StartTime":37051.0,"Objects":[{"StartTime":37051.0,"Position":406.0,"HyperDash":false},{"StartTime":37103.0,"Position":403.974335,"HyperDash":false},{"StartTime":37155.0,"Position":389.16626,"HyperDash":false},{"StartTime":37207.0,"Position":364.729828,"HyperDash":false},{"StartTime":37260.0,"Position":356.0597,"HyperDash":false},{"StartTime":37312.0,"Position":363.056549,"HyperDash":false},{"StartTime":37364.0,"Position":339.779724,"HyperDash":false},{"StartTime":37416.0,"Position":319.443939,"HyperDash":false},{"StartTime":37505.0,"Position":295.632843,"HyperDash":false}]},{"StartTime":37733.0,"Objects":[{"StartTime":37733.0,"Position":161.0,"HyperDash":false}]},{"StartTime":37961.0,"Objects":[{"StartTime":37961.0,"Position":147.0,"HyperDash":false}]},{"StartTime":38074.0,"Objects":[{"StartTime":38074.0,"Position":161.0,"HyperDash":false}]},{"StartTime":38188.0,"Objects":[{"StartTime":38188.0,"Position":147.0,"HyperDash":false}]},{"StartTime":46142.0,"Objects":[{"StartTime":46142.0,"Position":105.0,"HyperDash":false},{"StartTime":46194.0,"Position":101.3565,"HyperDash":false},{"StartTime":46246.0,"Position":117.818565,"HyperDash":false},{"StartTime":46298.0,"Position":135.426117,"HyperDash":false},{"StartTime":46351.0,"Position":146.825043,"HyperDash":false},{"StartTime":46403.0,"Position":174.897232,"HyperDash":false},{"StartTime":46455.0,"Position":178.608673,"HyperDash":false},{"StartTime":46507.0,"Position":211.715851,"HyperDash":false},{"StartTime":46596.0,"Position":242.038391,"HyperDash":false}]},{"StartTime":47051.0,"Objects":[{"StartTime":47051.0,"Position":399.0,"HyperDash":false},{"StartTime":47107.0,"Position":433.4483,"HyperDash":false},{"StartTime":47164.0,"Position":427.2428,"HyperDash":false},{"StartTime":47221.0,"Position":452.0353,"HyperDash":false},{"StartTime":47278.0,"Position":477.822449,"HyperDash":false},{"StartTime":47373.0,"Position":461.8406,"HyperDash":false},{"StartTime":47505.0,"Position":399.0,"HyperDash":false}]},{"StartTime":47961.0,"Objects":[{"StartTime":47961.0,"Position":422.0,"HyperDash":false},{"StartTime":48013.0,"Position":393.6435,"HyperDash":false},{"StartTime":48065.0,"Position":415.181427,"HyperDash":false},{"StartTime":48117.0,"Position":403.573883,"HyperDash":false},{"StartTime":48170.0,"Position":352.174957,"HyperDash":false},{"StartTime":48222.0,"Position":336.102783,"HyperDash":false},{"StartTime":48274.0,"Position":346.391327,"HyperDash":false},{"StartTime":48326.0,"Position":328.284149,"HyperDash":false},{"StartTime":48415.0,"Position":284.9616,"HyperDash":false}]},{"StartTime":48870.0,"Objects":[{"StartTime":48870.0,"Position":128.0,"HyperDash":false},{"StartTime":48926.0,"Position":123.551682,"HyperDash":false},{"StartTime":48983.0,"Position":80.7571945,"HyperDash":false},{"StartTime":49040.0,"Position":54.96469,"HyperDash":false},{"StartTime":49097.0,"Position":49.17756,"HyperDash":false},{"StartTime":49192.0,"Position":78.1594,"HyperDash":false},{"StartTime":49324.0,"Position":128.0,"HyperDash":false}]},{"StartTime":49779.0,"Objects":[{"StartTime":49779.0,"Position":252.0,"HyperDash":false},{"StartTime":49831.0,"Position":281.5043,"HyperDash":false},{"StartTime":49883.0,"Position":284.787231,"HyperDash":false},{"StartTime":49935.0,"Position":303.602631,"HyperDash":false},{"StartTime":49988.0,"Position":315.098541,"HyperDash":false},{"StartTime":50040.0,"Position":356.3944,"HyperDash":false},{"StartTime":50092.0,"Position":367.7095,"HyperDash":false},{"StartTime":50144.0,"Position":369.952545,"HyperDash":false},{"StartTime":50233.0,"Position":407.8509,"HyperDash":false}]},{"StartTime":50688.0,"Objects":[{"StartTime":50688.0,"Position":248.0,"HyperDash":false}]},{"StartTime":50915.0,"Objects":[{"StartTime":50915.0,"Position":377.0,"HyperDash":false},{"StartTime":51010.0,"Position":359.866516,"HyperDash":false},{"StartTime":51142.0,"Position":298.613647,"HyperDash":false}]},{"StartTime":51370.0,"Objects":[{"StartTime":51370.0,"Position":161.0,"HyperDash":false}]},{"StartTime":51597.0,"Objects":[{"StartTime":51597.0,"Position":159.0,"HyperDash":false},{"StartTime":51692.0,"Position":111.3809,"HyperDash":false},{"StartTime":51824.0,"Position":81.1563339,"HyperDash":false}]},{"StartTime":52051.0,"Objects":[{"StartTime":52051.0,"Position":107.0,"HyperDash":false},{"StartTime":52146.0,"Position":72.66428,"HyperDash":false},{"StartTime":52278.0,"Position":28.8123531,"HyperDash":false}]},{"StartTime":52506.0,"Objects":[{"StartTime":52506.0,"Position":75.0,"HyperDash":false},{"StartTime":52558.0,"Position":76.23376,"HyperDash":false},{"StartTime":52610.0,"Position":99.55078,"HyperDash":false},{"StartTime":52662.0,"Position":117.824188,"HyperDash":false},{"StartTime":52715.0,"Position":140.248856,"HyperDash":false},{"StartTime":52767.0,"Position":167.9607,"HyperDash":false},{"StartTime":52819.0,"Position":172.073,"HyperDash":false},{"StartTime":52871.0,"Position":216.350311,"HyperDash":false},{"StartTime":52960.0,"Position":224.446579,"HyperDash":false}]},{"StartTime":53415.0,"Objects":[{"StartTime":53415.0,"Position":413.0,"HyperDash":false}]},{"StartTime":53642.0,"Objects":[{"StartTime":53642.0,"Position":321.0,"HyperDash":false}]},{"StartTime":53870.0,"Objects":[{"StartTime":53870.0,"Position":321.0,"HyperDash":false},{"StartTime":53922.0,"Position":347.217651,"HyperDash":false},{"StartTime":53974.0,"Position":342.931427,"HyperDash":false},{"StartTime":54026.0,"Position":379.435669,"HyperDash":false},{"StartTime":54079.0,"Position":363.721619,"HyperDash":false},{"StartTime":54131.0,"Position":366.5289,"HyperDash":false},{"StartTime":54183.0,"Position":366.0941,"HyperDash":false},{"StartTime":54235.0,"Position":367.430542,"HyperDash":false},{"StartTime":54324.0,"Position":367.2075,"HyperDash":false}]},{"StartTime":54551.0,"Objects":[{"StartTime":54551.0,"Position":310.0,"HyperDash":false}]},{"StartTime":54779.0,"Objects":[{"StartTime":54779.0,"Position":222.0,"HyperDash":false}]},{"StartTime":55233.0,"Objects":[{"StartTime":55233.0,"Position":310.0,"HyperDash":false}]},{"StartTime":55461.0,"Objects":[{"StartTime":55461.0,"Position":222.0,"HyperDash":false}]},{"StartTime":55688.0,"Objects":[{"StartTime":55688.0,"Position":266.0,"HyperDash":false},{"StartTime":55740.0,"Position":250.312454,"HyperDash":false},{"StartTime":55792.0,"Position":222.151321,"HyperDash":false},{"StartTime":55844.0,"Position":229.8381,"HyperDash":false},{"StartTime":55897.0,"Position":199.311859,"HyperDash":false},{"StartTime":55949.0,"Position":190.573822,"HyperDash":false},{"StartTime":56001.0,"Position":163.5982,"HyperDash":false},{"StartTime":56053.0,"Position":126.797623,"HyperDash":false},{"StartTime":56142.0,"Position":119.985596,"HyperDash":false}]},{"StartTime":56370.0,"Objects":[{"StartTime":56370.0,"Position":70.0,"HyperDash":false}]},{"StartTime":56597.0,"Objects":[{"StartTime":56597.0,"Position":128.0,"HyperDash":false}]},{"StartTime":57051.0,"Objects":[{"StartTime":57051.0,"Position":70.0,"HyperDash":false}]},{"StartTime":57279.0,"Objects":[{"StartTime":57279.0,"Position":128.0,"HyperDash":false}]},{"StartTime":57506.0,"Objects":[{"StartTime":57506.0,"Position":99.0,"HyperDash":false},{"StartTime":57558.0,"Position":95.98298,"HyperDash":false},{"StartTime":57610.0,"Position":141.1198,"HyperDash":false},{"StartTime":57662.0,"Position":153.374634,"HyperDash":false},{"StartTime":57715.0,"Position":146.589783,"HyperDash":false},{"StartTime":57767.0,"Position":186.773819,"HyperDash":false},{"StartTime":57819.0,"Position":202.087418,"HyperDash":false},{"StartTime":57871.0,"Position":227.361313,"HyperDash":false},{"StartTime":57960.0,"Position":249.971191,"HyperDash":false}]},{"StartTime":58188.0,"Objects":[{"StartTime":58188.0,"Position":398.0,"HyperDash":false}]},{"StartTime":58415.0,"Objects":[{"StartTime":58415.0,"Position":366.0,"HyperDash":false}]},{"StartTime":58642.0,"Objects":[{"StartTime":58642.0,"Position":401.0,"HyperDash":false},{"StartTime":58737.0,"Position":372.52832,"HyperDash":false},{"StartTime":58869.0,"Position":348.93866,"HyperDash":false}]},{"StartTime":59097.0,"Objects":[{"StartTime":59097.0,"Position":203.0,"HyperDash":false}]},{"StartTime":59324.0,"Objects":[{"StartTime":59324.0,"Position":337.0,"HyperDash":false},{"StartTime":59419.0,"Position":354.740051,"HyperDash":false},{"StartTime":59551.0,"Position":364.726837,"HyperDash":false}]},{"StartTime":59779.0,"Objects":[{"StartTime":59779.0,"Position":284.0,"HyperDash":false},{"StartTime":59831.0,"Position":267.281219,"HyperDash":false},{"StartTime":59883.0,"Position":257.357849,"HyperDash":false},{"StartTime":59935.0,"Position":220.054123,"HyperDash":false},{"StartTime":59988.0,"Position":220.521576,"HyperDash":false},{"StartTime":60040.0,"Position":193.393219,"HyperDash":false},{"StartTime":60092.0,"Position":176.168411,"HyperDash":false},{"StartTime":60144.0,"Position":151.876328,"HyperDash":false},{"StartTime":60233.0,"Position":130.344528,"HyperDash":false}]},{"StartTime":60688.0,"Objects":[{"StartTime":60688.0,"Position":41.0,"HyperDash":false}]},{"StartTime":61142.0,"Objects":[{"StartTime":61142.0,"Position":191.0,"HyperDash":false},{"StartTime":61237.0,"Position":220.210571,"HyperDash":false},{"StartTime":61369.0,"Position":265.576843,"HyperDash":false}]},{"StartTime":61597.0,"Objects":[{"StartTime":61597.0,"Position":254.0,"HyperDash":false},{"StartTime":61692.0,"Position":300.210571,"HyperDash":false},{"StartTime":61824.0,"Position":328.576843,"HyperDash":false}]},{"StartTime":62051.0,"Objects":[{"StartTime":62051.0,"Position":299.0,"HyperDash":false}]},{"StartTime":62279.0,"Objects":[{"StartTime":62279.0,"Position":319.0,"HyperDash":false},{"StartTime":62374.0,"Position":304.789429,"HyperDash":false},{"StartTime":62506.0,"Position":244.423172,"HyperDash":false}]},{"StartTime":62733.0,"Objects":[{"StartTime":62733.0,"Position":102.0,"HyperDash":false}]},{"StartTime":62961.0,"Objects":[{"StartTime":62961.0,"Position":80.0,"HyperDash":false}]},{"StartTime":63188.0,"Objects":[{"StartTime":63188.0,"Position":31.0,"HyperDash":false}]},{"StartTime":63415.0,"Objects":[{"StartTime":63415.0,"Position":31.0,"HyperDash":false},{"StartTime":63471.0,"Position":15.0,"HyperDash":false},{"StartTime":63528.0,"Position":13.0,"HyperDash":false},{"StartTime":63585.0,"Position":43.0,"HyperDash":false},{"StartTime":63642.0,"Position":31.0,"HyperDash":false},{"StartTime":63737.0,"Position":38.0,"HyperDash":false},{"StartTime":63869.0,"Position":31.0,"HyperDash":false}]},{"StartTime":64324.0,"Objects":[{"StartTime":64324.0,"Position":331.0,"HyperDash":false}]},{"StartTime":64779.0,"Objects":[{"StartTime":64779.0,"Position":335.0,"HyperDash":false},{"StartTime":64874.0,"Position":315.0,"HyperDash":false},{"StartTime":65006.0,"Position":335.0,"HyperDash":false}]},{"StartTime":65233.0,"Objects":[{"StartTime":65233.0,"Position":405.0,"HyperDash":false},{"StartTime":65328.0,"Position":404.0,"HyperDash":false},{"StartTime":65460.0,"Position":405.0,"HyperDash":false}]},{"StartTime":65688.0,"Objects":[{"StartTime":65688.0,"Position":475.0,"HyperDash":false}]},{"StartTime":65915.0,"Objects":[{"StartTime":65915.0,"Position":475.0,"HyperDash":false},{"StartTime":66010.0,"Position":460.0,"HyperDash":false},{"StartTime":66142.0,"Position":475.0,"HyperDash":false}]},{"StartTime":66370.0,"Objects":[{"StartTime":66370.0,"Position":335.0,"HyperDash":false}]},{"StartTime":66597.0,"Objects":[{"StartTime":66597.0,"Position":315.0,"HyperDash":false}]},{"StartTime":66824.0,"Objects":[{"StartTime":66824.0,"Position":189.0,"HyperDash":false}]},{"StartTime":67051.0,"Objects":[{"StartTime":67051.0,"Position":219.0,"HyperDash":false}]},{"StartTime":67279.0,"Objects":[{"StartTime":67279.0,"Position":159.0,"HyperDash":false}]},{"StartTime":67506.0,"Objects":[{"StartTime":67506.0,"Position":245.0,"HyperDash":false}]},{"StartTime":67733.0,"Objects":[{"StartTime":67733.0,"Position":255.0,"HyperDash":false}]},{"StartTime":67961.0,"Objects":[{"StartTime":67961.0,"Position":329.0,"HyperDash":false},{"StartTime":68056.0,"Position":343.033264,"HyperDash":false},{"StartTime":68188.0,"Position":407.932129,"HyperDash":false}]},{"StartTime":68415.0,"Objects":[{"StartTime":68415.0,"Position":427.0,"HyperDash":false},{"StartTime":68510.0,"Position":397.966736,"HyperDash":false},{"StartTime":68642.0,"Position":348.067871,"HyperDash":false}]},{"StartTime":68870.0,"Objects":[{"StartTime":68870.0,"Position":303.0,"HyperDash":false},{"StartTime":68965.0,"Position":338.033264,"HyperDash":false},{"StartTime":69097.0,"Position":381.932129,"HyperDash":false}]},{"StartTime":69324.0,"Objects":[{"StartTime":69324.0,"Position":401.0,"HyperDash":false},{"StartTime":69419.0,"Position":384.966736,"HyperDash":false},{"StartTime":69551.0,"Position":322.067871,"HyperDash":false}]},{"StartTime":69779.0,"Objects":[{"StartTime":69779.0,"Position":186.0,"HyperDash":false}]},{"StartTime":70006.0,"Objects":[{"StartTime":70006.0,"Position":298.0,"HyperDash":false}]},{"StartTime":70233.0,"Objects":[{"StartTime":70233.0,"Position":163.0,"HyperDash":false}]},{"StartTime":70461.0,"Objects":[{"StartTime":70461.0,"Position":143.0,"HyperDash":false}]},{"StartTime":70688.0,"Objects":[{"StartTime":70688.0,"Position":84.0,"HyperDash":false},{"StartTime":70744.0,"Position":78.72694,"HyperDash":false},{"StartTime":70801.0,"Position":82.25869,"HyperDash":false},{"StartTime":70858.0,"Position":70.21074,"HyperDash":false},{"StartTime":70915.0,"Position":84.71703,"HyperDash":false},{"StartTime":70971.0,"Position":78.31016,"HyperDash":false},{"StartTime":71028.0,"Position":58.2654724,"HyperDash":false},{"StartTime":71085.0,"Position":57.63716,"HyperDash":false},{"StartTime":71142.0,"Position":84.0,"HyperDash":false},{"StartTime":71237.0,"Position":54.4390259,"HyperDash":false},{"StartTime":71369.0,"Position":84.71703,"HyperDash":false}]},{"StartTime":71597.0,"Objects":[{"StartTime":71597.0,"Position":148.0,"HyperDash":false},{"StartTime":71649.0,"Position":165.786362,"HyperDash":false},{"StartTime":71701.0,"Position":179.3862,"HyperDash":false},{"StartTime":71753.0,"Position":206.911774,"HyperDash":false},{"StartTime":71806.0,"Position":197.271149,"HyperDash":false},{"StartTime":71858.0,"Position":230.514236,"HyperDash":false},{"StartTime":71910.0,"Position":245.834518,"HyperDash":false},{"StartTime":71962.0,"Position":272.100525,"HyperDash":false},{"StartTime":72051.0,"Position":300.802856,"HyperDash":false}]},{"StartTime":72506.0,"Objects":[{"StartTime":72506.0,"Position":374.0,"HyperDash":false},{"StartTime":72558.0,"Position":376.213623,"HyperDash":false},{"StartTime":72610.0,"Position":353.6138,"HyperDash":false},{"StartTime":72662.0,"Position":320.088226,"HyperDash":false},{"StartTime":72715.0,"Position":293.728851,"HyperDash":false},{"StartTime":72767.0,"Position":297.485779,"HyperDash":false},{"StartTime":72819.0,"Position":272.165466,"HyperDash":false},{"StartTime":72871.0,"Position":247.899475,"HyperDash":false},{"StartTime":72960.0,"Position":221.197159,"HyperDash":false}]},{"StartTime":73188.0,"Objects":[{"StartTime":73188.0,"Position":77.0,"HyperDash":false}]},{"StartTime":73415.0,"Objects":[{"StartTime":73415.0,"Position":213.0,"HyperDash":false},{"StartTime":73510.0,"Position":233.974548,"HyperDash":false},{"StartTime":73642.0,"Position":279.844421,"HyperDash":false}]},{"StartTime":73870.0,"Objects":[{"StartTime":73870.0,"Position":346.0,"HyperDash":false},{"StartTime":73965.0,"Position":336.709564,"HyperDash":false},{"StartTime":74097.0,"Position":297.516541,"HyperDash":false}]},{"StartTime":74324.0,"Objects":[{"StartTime":74324.0,"Position":222.0,"HyperDash":false}]},{"StartTime":74551.0,"Objects":[{"StartTime":74551.0,"Position":282.0,"HyperDash":false}]},{"StartTime":74779.0,"Objects":[{"StartTime":74779.0,"Position":252.0,"HyperDash":false},{"StartTime":74835.0,"Position":222.93634,"HyperDash":false},{"StartTime":74892.0,"Position":231.971436,"HyperDash":false},{"StartTime":74949.0,"Position":179.985031,"HyperDash":false},{"StartTime":75006.0,"Position":173.674133,"HyperDash":false},{"StartTime":75101.0,"Position":204.278076,"HyperDash":false},{"StartTime":75233.0,"Position":252.0,"HyperDash":false}]},{"StartTime":75688.0,"Objects":[{"StartTime":75688.0,"Position":194.0,"HyperDash":false},{"StartTime":75744.0,"Position":188.93634,"HyperDash":false},{"StartTime":75801.0,"Position":159.971436,"HyperDash":false},{"StartTime":75858.0,"Position":124.985031,"HyperDash":false},{"StartTime":75915.0,"Position":115.674141,"HyperDash":false},{"StartTime":76010.0,"Position":154.278076,"HyperDash":false},{"StartTime":76142.0,"Position":194.0,"HyperDash":false}]},{"StartTime":76597.0,"Objects":[{"StartTime":76597.0,"Position":347.0,"HyperDash":false}]},{"StartTime":76824.0,"Objects":[{"StartTime":76824.0,"Position":327.0,"HyperDash":false}]},{"StartTime":77051.0,"Objects":[{"StartTime":77051.0,"Position":351.0,"HyperDash":false}]},{"StartTime":77506.0,"Objects":[{"StartTime":77506.0,"Position":448.0,"HyperDash":false}]},{"StartTime":77733.0,"Objects":[{"StartTime":77733.0,"Position":368.0,"HyperDash":false}]},{"StartTime":77961.0,"Objects":[{"StartTime":77961.0,"Position":242.0,"HyperDash":false}]},{"StartTime":78415.0,"Objects":[{"StartTime":78415.0,"Position":50.0,"HyperDash":false}]},{"StartTime":78642.0,"Objects":[{"StartTime":78642.0,"Position":118.0,"HyperDash":false},{"StartTime":78737.0,"Position":102.772095,"HyperDash":false},{"StartTime":78869.0,"Position":62.0753326,"HyperDash":false}]},{"StartTime":79324.0,"Objects":[{"StartTime":79324.0,"Position":218.0,"HyperDash":false},{"StartTime":79419.0,"Position":253.274826,"HyperDash":false},{"StartTime":79551.0,"Position":294.3989,"HyperDash":false}]},{"StartTime":79779.0,"Objects":[{"StartTime":79779.0,"Position":443.0,"HyperDash":false}]},{"StartTime":80233.0,"Objects":[{"StartTime":80233.0,"Position":286.0,"HyperDash":false},{"StartTime":80289.0,"Position":301.1139,"HyperDash":false},{"StartTime":80346.0,"Position":277.211975,"HyperDash":false},{"StartTime":80403.0,"Position":273.310028,"HyperDash":false},{"StartTime":80460.0,"Position":282.4081,"HyperDash":false},{"StartTime":80555.0,"Position":290.911316,"HyperDash":false},{"StartTime":80687.0,"Position":286.0,"HyperDash":false}]},{"StartTime":81142.0,"Objects":[{"StartTime":81142.0,"Position":427.0,"HyperDash":false}]},{"StartTime":81370.0,"Objects":[{"StartTime":81370.0,"Position":423.0,"HyperDash":false}]},{"StartTime":81597.0,"Objects":[{"StartTime":81597.0,"Position":427.0,"HyperDash":false},{"StartTime":81653.0,"Position":415.357849,"HyperDash":false},{"StartTime":81710.0,"Position":429.752075,"HyperDash":false},{"StartTime":81824.0,"Position":427.0,"HyperDash":false}]},{"StartTime":82051.0,"Objects":[{"StartTime":82051.0,"Position":411.0,"HyperDash":false}]},{"StartTime":82279.0,"Objects":[{"StartTime":82279.0,"Position":301.0,"HyperDash":false}]},{"StartTime":82506.0,"Objects":[{"StartTime":82506.0,"Position":285.0,"HyperDash":false},{"StartTime":82558.0,"Position":275.960876,"HyperDash":false},{"StartTime":82610.0,"Position":258.1504,"HyperDash":false},{"StartTime":82662.0,"Position":240.960434,"HyperDash":false},{"StartTime":82715.0,"Position":213.29361,"HyperDash":false},{"StartTime":82767.0,"Position":177.039841,"HyperDash":false},{"StartTime":82819.0,"Position":192.027191,"HyperDash":false},{"StartTime":82871.0,"Position":162.507034,"HyperDash":false},{"StartTime":82960.0,"Position":132.24411,"HyperDash":false}]},{"StartTime":83188.0,"Objects":[{"StartTime":83188.0,"Position":246.0,"HyperDash":false}]},{"StartTime":83415.0,"Objects":[{"StartTime":83415.0,"Position":267.0,"HyperDash":false},{"StartTime":83467.0,"Position":277.3109,"HyperDash":false},{"StartTime":83519.0,"Position":280.6682,"HyperDash":false},{"StartTime":83571.0,"Position":302.941681,"HyperDash":false},{"StartTime":83624.0,"Position":298.1128,"HyperDash":false},{"StartTime":83676.0,"Position":291.2743,"HyperDash":false},{"StartTime":83728.0,"Position":290.638519,"HyperDash":false},{"StartTime":83780.0,"Position":254.4002,"HyperDash":false},{"StartTime":83869.0,"Position":250.128326,"HyperDash":false}]},{"StartTime":84097.0,"Objects":[{"StartTime":84097.0,"Position":161.0,"HyperDash":false}]},{"StartTime":84324.0,"Objects":[{"StartTime":84324.0,"Position":188.0,"HyperDash":false},{"StartTime":84376.0,"Position":211.223328,"HyperDash":false},{"StartTime":84428.0,"Position":235.527512,"HyperDash":false},{"StartTime":84480.0,"Position":225.64093,"HyperDash":false},{"StartTime":84533.0,"Position":278.681366,"HyperDash":false},{"StartTime":84585.0,"Position":283.741333,"HyperDash":false},{"StartTime":84637.0,"Position":282.889923,"HyperDash":false},{"StartTime":84689.0,"Position":320.765961,"HyperDash":false},{"StartTime":84778.0,"Position":329.839569,"HyperDash":false}]},{"StartTime":85006.0,"Objects":[{"StartTime":85006.0,"Position":177.0,"HyperDash":false}]},{"StartTime":85233.0,"Objects":[{"StartTime":85233.0,"Position":177.0,"HyperDash":false},{"StartTime":85285.0,"Position":165.201,"HyperDash":false},{"StartTime":85337.0,"Position":182.838409,"HyperDash":false},{"StartTime":85389.0,"Position":172.951111,"HyperDash":false},{"StartTime":85442.0,"Position":165.6638,"HyperDash":false},{"StartTime":85494.0,"Position":172.542755,"HyperDash":false},{"StartTime":85546.0,"Position":188.28334,"HyperDash":false},{"StartTime":85598.0,"Position":236.294235,"HyperDash":false},{"StartTime":85687.0,"Position":249.329514,"HyperDash":false}]},{"StartTime":85915.0,"Objects":[{"StartTime":85915.0,"Position":368.0,"HyperDash":false}]},{"StartTime":86142.0,"Objects":[{"StartTime":86142.0,"Position":404.0,"HyperDash":false},{"StartTime":86194.0,"Position":401.8277,"HyperDash":false},{"StartTime":86246.0,"Position":454.150146,"HyperDash":false},{"StartTime":86298.0,"Position":426.349945,"HyperDash":false},{"StartTime":86351.0,"Position":450.306671,"HyperDash":false},{"StartTime":86403.0,"Position":444.439728,"HyperDash":false},{"StartTime":86455.0,"Position":429.120422,"HyperDash":false},{"StartTime":86507.0,"Position":418.0135,"HyperDash":false},{"StartTime":86596.0,"Position":405.457642,"HyperDash":false}]},{"StartTime":86824.0,"Objects":[{"StartTime":86824.0,"Position":272.0,"HyperDash":false}]},{"StartTime":87051.0,"Objects":[{"StartTime":87051.0,"Position":220.0,"HyperDash":false}]},{"StartTime":87506.0,"Objects":[{"StartTime":87506.0,"Position":272.0,"HyperDash":false}]},{"StartTime":87733.0,"Objects":[{"StartTime":87733.0,"Position":192.0,"HyperDash":false}]},{"StartTime":87961.0,"Objects":[{"StartTime":87961.0,"Position":168.0,"HyperDash":false},{"StartTime":88013.0,"Position":180.07048,"HyperDash":false},{"StartTime":88065.0,"Position":145.3697,"HyperDash":false},{"StartTime":88117.0,"Position":181.001678,"HyperDash":false},{"StartTime":88170.0,"Position":158.001877,"HyperDash":false},{"StartTime":88222.0,"Position":177.868271,"HyperDash":false},{"StartTime":88274.0,"Position":202.302979,"HyperDash":false},{"StartTime":88326.0,"Position":215.876221,"HyperDash":false},{"StartTime":88415.0,"Position":224.187881,"HyperDash":false}]},{"StartTime":88642.0,"Objects":[{"StartTime":88642.0,"Position":363.0,"HyperDash":false}]},{"StartTime":88870.0,"Objects":[{"StartTime":88870.0,"Position":393.0,"HyperDash":false}]},{"StartTime":88983.0,"Objects":[{"StartTime":88983.0,"Position":363.0,"HyperDash":false}]},{"StartTime":89097.0,"Objects":[{"StartTime":89097.0,"Position":393.0,"HyperDash":false}]},{"StartTime":93415.0,"Objects":[{"StartTime":93415.0,"Position":330.0,"HyperDash":false},{"StartTime":93500.0,"Position":362.93335,"HyperDash":false},{"StartTime":93585.0,"Position":384.5453,"HyperDash":false},{"StartTime":93670.0,"Position":408.46228,"HyperDash":false},{"StartTime":93755.0,"Position":448.525055,"HyperDash":false},{"StartTime":93831.0,"Position":430.9859,"HyperDash":false},{"StartTime":93907.0,"Position":391.21936,"HyperDash":false},{"StartTime":93983.0,"Position":356.6329,"HyperDash":false},{"StartTime":94096.0,"Position":330.0,"HyperDash":false}]},{"StartTime":94324.0,"Objects":[{"StartTime":94324.0,"Position":55.0,"HyperDash":false}]},{"StartTime":94552.0,"Objects":[{"StartTime":94552.0,"Position":181.0,"HyperDash":false},{"StartTime":94665.0,"Position":145.222916,"HyperDash":false}]},{"StartTime":95233.0,"Objects":[{"StartTime":95233.0,"Position":181.0,"HyperDash":false},{"StartTime":95318.0,"Position":141.066635,"HyperDash":false},{"StartTime":95403.0,"Position":137.4547,"HyperDash":false},{"StartTime":95488.0,"Position":96.53772,"HyperDash":false},{"StartTime":95573.0,"Position":62.47494,"HyperDash":false},{"StartTime":95649.0,"Position":96.0141144,"HyperDash":false},{"StartTime":95725.0,"Position":128.78064,"HyperDash":false},{"StartTime":95801.0,"Position":133.367081,"HyperDash":false},{"StartTime":95914.0,"Position":181.0,"HyperDash":false}]},{"StartTime":96142.0,"Objects":[{"StartTime":96142.0,"Position":456.0,"HyperDash":false}]},{"StartTime":96370.0,"Objects":[{"StartTime":96370.0,"Position":330.0,"HyperDash":false},{"StartTime":96483.0,"Position":365.7771,"HyperDash":false}]},{"StartTime":97052.0,"Objects":[{"StartTime":97052.0,"Position":330.0,"HyperDash":false},{"StartTime":97137.0,"Position":369.93335,"HyperDash":false},{"StartTime":97222.0,"Position":380.5453,"HyperDash":false},{"StartTime":97307.0,"Position":411.46228,"HyperDash":false},{"StartTime":97392.0,"Position":448.525055,"HyperDash":false},{"StartTime":97468.0,"Position":429.9859,"HyperDash":false},{"StartTime":97544.0,"Position":391.21936,"HyperDash":false},{"StartTime":97620.0,"Position":384.6329,"HyperDash":false},{"StartTime":97733.0,"Position":330.0,"HyperDash":false}]},{"StartTime":97961.0,"Objects":[{"StartTime":97961.0,"Position":55.0,"HyperDash":false}]},{"StartTime":98188.0,"Objects":[{"StartTime":98188.0,"Position":181.0,"HyperDash":false},{"StartTime":98301.0,"Position":145.222916,"HyperDash":false}]},{"StartTime":98870.0,"Objects":[{"StartTime":98870.0,"Position":181.0,"HyperDash":false},{"StartTime":98955.0,"Position":139.066635,"HyperDash":false},{"StartTime":99040.0,"Position":124.4547,"HyperDash":false},{"StartTime":99125.0,"Position":111.53772,"HyperDash":false},{"StartTime":99210.0,"Position":62.47494,"HyperDash":false},{"StartTime":99286.0,"Position":89.0141144,"HyperDash":false},{"StartTime":99362.0,"Position":121.780647,"HyperDash":false},{"StartTime":99438.0,"Position":125.367081,"HyperDash":false},{"StartTime":99551.0,"Position":181.0,"HyperDash":false}]},{"StartTime":99779.0,"Objects":[{"StartTime":99779.0,"Position":456.0,"HyperDash":false}]},{"StartTime":100006.0,"Objects":[{"StartTime":100006.0,"Position":330.0,"HyperDash":false},{"StartTime":100119.0,"Position":365.7771,"HyperDash":false}]},{"StartTime":100688.0,"Objects":[{"StartTime":100688.0,"Position":454.0,"HyperDash":false},{"StartTime":100801.0,"Position":414.608643,"HyperDash":false}]},{"StartTime":101029.0,"Objects":[{"StartTime":101029.0,"Position":335.0,"HyperDash":false},{"StartTime":101142.0,"Position":295.465118,"HyperDash":false}]},{"StartTime":101370.0,"Objects":[{"StartTime":101370.0,"Position":162.0,"HyperDash":false}]},{"StartTime":101597.0,"Objects":[{"StartTime":101597.0,"Position":137.0,"HyperDash":false},{"StartTime":101692.0,"Position":96.96697,"HyperDash":false},{"StartTime":101824.0,"Position":57.5450439,"HyperDash":false}]},{"StartTime":101938.0,"Objects":[{"StartTime":101938.0,"Position":84.0,"HyperDash":false}]},{"StartTime":102506.0,"Objects":[{"StartTime":102506.0,"Position":57.0,"HyperDash":false},{"StartTime":102619.0,"Position":96.39134,"HyperDash":false}]},{"StartTime":102847.0,"Objects":[{"StartTime":102847.0,"Position":176.0,"HyperDash":false},{"StartTime":102960.0,"Position":215.520477,"HyperDash":false}]},{"StartTime":103188.0,"Objects":[{"StartTime":103188.0,"Position":350.0,"HyperDash":false}]},{"StartTime":103415.0,"Objects":[{"StartTime":103415.0,"Position":374.0,"HyperDash":false},{"StartTime":103510.0,"Position":415.03302,"HyperDash":false},{"StartTime":103642.0,"Position":453.454956,"HyperDash":false}]},{"StartTime":103756.0,"Objects":[{"StartTime":103756.0,"Position":427.0,"HyperDash":false}]},{"StartTime":104324.0,"Objects":[{"StartTime":104324.0,"Position":454.0,"HyperDash":false},{"StartTime":104437.0,"Position":414.608643,"HyperDash":false}]},{"StartTime":104665.0,"Objects":[{"StartTime":104665.0,"Position":335.0,"HyperDash":false},{"StartTime":104778.0,"Position":295.465118,"HyperDash":false}]},{"StartTime":105006.0,"Objects":[{"StartTime":105006.0,"Position":162.0,"HyperDash":false}]},{"StartTime":105120.0,"Objects":[{"StartTime":105120.0,"Position":190.0,"HyperDash":false}]},{"StartTime":105233.0,"Objects":[{"StartTime":105233.0,"Position":137.0,"HyperDash":false},{"StartTime":105328.0,"Position":83.96697,"HyperDash":false},{"StartTime":105460.0,"Position":57.5450439,"HyperDash":false}]},{"StartTime":105574.0,"Objects":[{"StartTime":105574.0,"Position":84.0,"HyperDash":false}]},{"StartTime":106142.0,"Objects":[{"StartTime":106142.0,"Position":57.0,"HyperDash":false},{"StartTime":106255.0,"Position":96.39134,"HyperDash":false}]},{"StartTime":106483.0,"Objects":[{"StartTime":106483.0,"Position":176.0,"HyperDash":false},{"StartTime":106596.0,"Position":215.520477,"HyperDash":false}]},{"StartTime":106824.0,"Objects":[{"StartTime":106824.0,"Position":295.0,"HyperDash":false},{"StartTime":106904.0,"Position":306.2746,"HyperDash":false},{"StartTime":106985.0,"Position":352.66098,"HyperDash":false},{"StartTime":107065.0,"Position":389.650146,"HyperDash":false},{"StartTime":107146.0,"Position":414.777618,"HyperDash":false},{"StartTime":107227.0,"Position":392.217163,"HyperDash":false},{"StartTime":107307.0,"Position":354.003235,"HyperDash":false},{"StartTime":107388.0,"Position":321.594,"HyperDash":false},{"StartTime":107505.0,"Position":294.390747,"HyperDash":false}]},{"StartTime":115233.0,"Objects":[{"StartTime":115233.0,"Position":114.0,"HyperDash":false},{"StartTime":115285.0,"Position":143.939957,"HyperDash":false},{"StartTime":115337.0,"Position":150.324554,"HyperDash":false},{"StartTime":115389.0,"Position":183.259644,"HyperDash":false},{"StartTime":115442.0,"Position":188.794647,"HyperDash":false},{"StartTime":115494.0,"Position":195.08873,"HyperDash":false},{"StartTime":115546.0,"Position":237.411819,"HyperDash":false},{"StartTime":115598.0,"Position":240.698227,"HyperDash":false},{"StartTime":115687.0,"Position":269.692047,"HyperDash":false}]},{"StartTime":115915.0,"Objects":[{"StartTime":115915.0,"Position":413.0,"HyperDash":false}]},{"StartTime":116142.0,"Objects":[{"StartTime":116142.0,"Position":419.0,"HyperDash":false},{"StartTime":116198.0,"Position":419.6598,"HyperDash":false},{"StartTime":116255.0,"Position":457.3915,"HyperDash":false},{"StartTime":116312.0,"Position":466.4778,"HyperDash":false},{"StartTime":116369.0,"Position":449.986969,"HyperDash":false},{"StartTime":116464.0,"Position":432.831818,"HyperDash":false},{"StartTime":116596.0,"Position":419.0,"HyperDash":false}]},{"StartTime":117052.0,"Objects":[{"StartTime":117052.0,"Position":366.0,"HyperDash":false},{"StartTime":117147.0,"Position":351.721741,"HyperDash":false},{"StartTime":117279.0,"Position":295.245026,"HyperDash":false}]},{"StartTime":117506.0,"Objects":[{"StartTime":117506.0,"Position":157.0,"HyperDash":false}]},{"StartTime":117733.0,"Objects":[{"StartTime":117733.0,"Position":141.0,"HyperDash":false}]},{"StartTime":117961.0,"Objects":[{"StartTime":117961.0,"Position":84.0,"HyperDash":false},{"StartTime":118017.0,"Position":70.0,"HyperDash":false},{"StartTime":118074.0,"Position":100.0,"HyperDash":false},{"StartTime":118131.0,"Position":96.0,"HyperDash":false},{"StartTime":118188.0,"Position":84.0,"HyperDash":false},{"StartTime":118244.0,"Position":72.0,"HyperDash":false},{"StartTime":118301.0,"Position":95.0,"HyperDash":false},{"StartTime":118358.0,"Position":100.0,"HyperDash":false},{"StartTime":118415.0,"Position":84.0,"HyperDash":false},{"StartTime":118510.0,"Position":103.0,"HyperDash":false},{"StartTime":118642.0,"Position":84.0,"HyperDash":false}]},{"StartTime":118870.0,"Objects":[{"StartTime":118870.0,"Position":86.0,"HyperDash":false}]},{"StartTime":119097.0,"Objects":[{"StartTime":119097.0,"Position":224.0,"HyperDash":false}]},{"StartTime":119324.0,"Objects":[{"StartTime":119324.0,"Position":226.0,"HyperDash":false}]},{"StartTime":119552.0,"Objects":[{"StartTime":119552.0,"Position":366.0,"HyperDash":false}]},{"StartTime":119779.0,"Objects":[{"StartTime":119779.0,"Position":368.0,"HyperDash":false},{"StartTime":119835.0,"Position":397.255524,"HyperDash":false},{"StartTime":119892.0,"Position":406.27597,"HyperDash":false},{"StartTime":119949.0,"Position":410.2929,"HyperDash":false},{"StartTime":120006.0,"Position":446.9768,"HyperDash":false},{"StartTime":120101.0,"Position":415.96817,"HyperDash":false},{"StartTime":120233.0,"Position":368.0,"HyperDash":false}]},{"StartTime":120688.0,"Objects":[{"StartTime":120688.0,"Position":407.0,"HyperDash":false}]},{"StartTime":120915.0,"Objects":[{"StartTime":120915.0,"Position":321.0,"HyperDash":false}]},{"StartTime":121142.0,"Objects":[{"StartTime":121142.0,"Position":286.0,"HyperDash":false},{"StartTime":121194.0,"Position":262.810974,"HyperDash":false},{"StartTime":121246.0,"Position":235.4965,"HyperDash":false},{"StartTime":121298.0,"Position":223.241028,"HyperDash":false},{"StartTime":121351.0,"Position":219.863861,"HyperDash":false},{"StartTime":121403.0,"Position":209.2498,"HyperDash":false},{"StartTime":121455.0,"Position":171.249588,"HyperDash":false},{"StartTime":121507.0,"Position":177.110733,"HyperDash":false},{"StartTime":121596.0,"Position":137.418732,"HyperDash":false}]},{"StartTime":121824.0,"Objects":[{"StartTime":121824.0,"Position":78.0,"HyperDash":false}]},{"StartTime":122052.0,"Objects":[{"StartTime":122052.0,"Position":102.0,"HyperDash":false},{"StartTime":122147.0,"Position":99.41432,"HyperDash":false},{"StartTime":122279.0,"Position":141.1235,"HyperDash":false}]},{"StartTime":122506.0,"Objects":[{"StartTime":122506.0,"Position":187.0,"HyperDash":false},{"StartTime":122558.0,"Position":192.496933,"HyperDash":false},{"StartTime":122610.0,"Position":237.792938,"HyperDash":false},{"StartTime":122662.0,"Position":249.932373,"HyperDash":false},{"StartTime":122715.0,"Position":261.228668,"HyperDash":false},{"StartTime":122767.0,"Position":286.120331,"HyperDash":false},{"StartTime":122819.0,"Position":293.076569,"HyperDash":false},{"StartTime":122871.0,"Position":298.186584,"HyperDash":false},{"StartTime":122960.0,"Position":344.480072,"HyperDash":false}]},{"StartTime":123188.0,"Objects":[{"StartTime":123188.0,"Position":450.0,"HyperDash":false}]},{"StartTime":123415.0,"Objects":[{"StartTime":123415.0,"Position":342.0,"HyperDash":false},{"StartTime":123467.0,"Position":304.888275,"HyperDash":false},{"StartTime":123519.0,"Position":292.63266,"HyperDash":false},{"StartTime":123571.0,"Position":276.625946,"HyperDash":false},{"StartTime":123624.0,"Position":263.464172,"HyperDash":false},{"StartTime":123676.0,"Position":249.683212,"HyperDash":false},{"StartTime":123728.0,"Position":225.779449,"HyperDash":false},{"StartTime":123780.0,"Position":234.624741,"HyperDash":false},{"StartTime":123869.0,"Position":184.843155,"HyperDash":false}]},{"StartTime":124097.0,"Objects":[{"StartTime":124097.0,"Position":52.0,"HyperDash":false}]},{"StartTime":124324.0,"Objects":[{"StartTime":124324.0,"Position":184.0,"HyperDash":false},{"StartTime":124376.0,"Position":195.443817,"HyperDash":false},{"StartTime":124428.0,"Position":216.739166,"HyperDash":false},{"StartTime":124480.0,"Position":252.924118,"HyperDash":false},{"StartTime":124533.0,"Position":262.274628,"HyperDash":false},{"StartTime":124585.0,"Position":290.18573,"HyperDash":false},{"StartTime":124637.0,"Position":307.118835,"HyperDash":false},{"StartTime":124689.0,"Position":304.171661,"HyperDash":false},{"StartTime":124778.0,"Position":341.434662,"HyperDash":false}]},{"StartTime":125006.0,"Objects":[{"StartTime":125006.0,"Position":437.0,"HyperDash":false}]},{"StartTime":125233.0,"Objects":[{"StartTime":125233.0,"Position":474.0,"HyperDash":false},{"StartTime":125328.0,"Position":482.109436,"HyperDash":false},{"StartTime":125460.0,"Position":475.3147,"HyperDash":false}]},{"StartTime":125688.0,"Objects":[{"StartTime":125688.0,"Position":437.0,"HyperDash":false},{"StartTime":125783.0,"Position":440.578949,"HyperDash":false},{"StartTime":125915.0,"Position":435.0608,"HyperDash":false}]},{"StartTime":126142.0,"Objects":[{"StartTime":126142.0,"Position":506.0,"HyperDash":false},{"StartTime":126194.0,"Position":472.674347,"HyperDash":false},{"StartTime":126246.0,"Position":456.3487,"HyperDash":false},{"StartTime":126298.0,"Position":448.023041,"HyperDash":false},{"StartTime":126351.0,"Position":433.344971,"HyperDash":false},{"StartTime":126403.0,"Position":411.019348,"HyperDash":false},{"StartTime":126455.0,"Position":390.693665,"HyperDash":false},{"StartTime":126507.0,"Position":380.368042,"HyperDash":false},{"StartTime":126596.0,"Position":346.003,"HyperDash":false}]},{"StartTime":127052.0,"Objects":[{"StartTime":127052.0,"Position":28.0,"HyperDash":false},{"StartTime":127104.0,"Position":56.3256531,"HyperDash":false},{"StartTime":127156.0,"Position":67.6513062,"HyperDash":false},{"StartTime":127208.0,"Position":71.97695,"HyperDash":false},{"StartTime":127261.0,"Position":111.655014,"HyperDash":false},{"StartTime":127313.0,"Position":136.980667,"HyperDash":false},{"StartTime":127365.0,"Position":146.30632,"HyperDash":false},{"StartTime":127417.0,"Position":174.631958,"HyperDash":false},{"StartTime":127506.0,"Position":187.997025,"HyperDash":false}]},{"StartTime":127733.0,"Objects":[{"StartTime":127733.0,"Position":342.0,"HyperDash":false}]},{"StartTime":127961.0,"Objects":[{"StartTime":127961.0,"Position":226.0,"HyperDash":false},{"StartTime":128017.0,"Position":203.38623,"HyperDash":false},{"StartTime":128074.0,"Position":210.367325,"HyperDash":false},{"StartTime":128131.0,"Position":229.320847,"HyperDash":false},{"StartTime":128188.0,"Position":223.423782,"HyperDash":false},{"StartTime":128283.0,"Position":206.484131,"HyperDash":false},{"StartTime":128415.0,"Position":226.0,"HyperDash":false}]},{"StartTime":128642.0,"Objects":[{"StartTime":128642.0,"Position":302.0,"HyperDash":false}]},{"StartTime":128870.0,"Objects":[{"StartTime":128870.0,"Position":314.0,"HyperDash":false}]},{"StartTime":129097.0,"Objects":[{"StartTime":129097.0,"Position":302.0,"HyperDash":false}]},{"StartTime":129324.0,"Objects":[{"StartTime":129324.0,"Position":314.0,"HyperDash":false}]},{"StartTime":129779.0,"Objects":[{"StartTime":129779.0,"Position":308.0,"HyperDash":false},{"StartTime":129835.0,"Position":334.61377,"HyperDash":false},{"StartTime":129892.0,"Position":326.6327,"HyperDash":false},{"StartTime":129949.0,"Position":328.679138,"HyperDash":false},{"StartTime":130006.0,"Position":310.576233,"HyperDash":false},{"StartTime":130101.0,"Position":331.515869,"HyperDash":false},{"StartTime":130233.0,"Position":308.0,"HyperDash":false}]},{"StartTime":130461.0,"Objects":[{"StartTime":130461.0,"Position":232.0,"HyperDash":false}]},{"StartTime":130688.0,"Objects":[{"StartTime":130688.0,"Position":220.0,"HyperDash":false}]},{"StartTime":130915.0,"Objects":[{"StartTime":130915.0,"Position":232.0,"HyperDash":false}]},{"StartTime":131142.0,"Objects":[{"StartTime":131142.0,"Position":220.0,"HyperDash":false}]},{"StartTime":131597.0,"Objects":[{"StartTime":131597.0,"Position":18.0,"HyperDash":false}]},{"StartTime":132052.0,"Objects":[{"StartTime":132052.0,"Position":278.0,"HyperDash":false}]},{"StartTime":132506.0,"Objects":[{"StartTime":132506.0,"Position":326.0,"HyperDash":false}]},{"StartTime":132961.0,"Objects":[{"StartTime":132961.0,"Position":430.0,"HyperDash":false}]},{"StartTime":133415.0,"Objects":[{"StartTime":133415.0,"Position":358.0,"HyperDash":false}]},{"StartTime":133870.0,"Objects":[{"StartTime":133870.0,"Position":122.0,"HyperDash":false}]},{"StartTime":134324.0,"Objects":[{"StartTime":134324.0,"Position":119.0,"HyperDash":false},{"StartTime":134419.0,"Position":68.98176,"HyperDash":false},{"StartTime":134551.0,"Position":42.8232956,"HyperDash":false}]},{"StartTime":134779.0,"Objects":[{"StartTime":134779.0,"Position":113.0,"HyperDash":false}]},{"StartTime":135233.0,"Objects":[{"StartTime":135233.0,"Position":243.0,"HyperDash":false}]},{"StartTime":135688.0,"Objects":[{"StartTime":135688.0,"Position":251.0,"HyperDash":false}]},{"StartTime":136142.0,"Objects":[{"StartTime":136142.0,"Position":406.0,"HyperDash":false}]},{"StartTime":136597.0,"Objects":[{"StartTime":136597.0,"Position":484.0,"HyperDash":false}]},{"StartTime":137052.0,"Objects":[{"StartTime":137052.0,"Position":352.0,"HyperDash":false}]},{"StartTime":137506.0,"Objects":[{"StartTime":137506.0,"Position":164.0,"HyperDash":false}]},{"StartTime":137961.0,"Objects":[{"StartTime":137961.0,"Position":178.0,"HyperDash":false},{"StartTime":138056.0,"Position":131.390686,"HyperDash":false},{"StartTime":138188.0,"Position":107.408012,"HyperDash":false}]},{"StartTime":138415.0,"Objects":[{"StartTime":138415.0,"Position":129.0,"HyperDash":false}]},{"StartTime":138870.0,"Objects":[{"StartTime":138870.0,"Position":247.0,"HyperDash":false},{"StartTime":138965.0,"Position":268.5533,"HyperDash":false},{"StartTime":139097.0,"Position":323.543732,"HyperDash":false}]},{"StartTime":139324.0,"Objects":[{"StartTime":139324.0,"Position":469.0,"HyperDash":false}]},{"StartTime":139779.0,"Objects":[{"StartTime":139779.0,"Position":309.0,"HyperDash":false},{"StartTime":139874.0,"Position":267.4467,"HyperDash":false},{"StartTime":140006.0,"Position":232.456268,"HyperDash":false}]},{"StartTime":140233.0,"Objects":[{"StartTime":140233.0,"Position":87.0,"HyperDash":false}]},{"StartTime":140688.0,"Objects":[{"StartTime":140688.0,"Position":109.0,"HyperDash":false}]},{"StartTime":140915.0,"Objects":[{"StartTime":140915.0,"Position":241.0,"HyperDash":false}]},{"StartTime":141142.0,"Objects":[{"StartTime":141142.0,"Position":243.0,"HyperDash":false}]},{"StartTime":141370.0,"Objects":[{"StartTime":141370.0,"Position":305.0,"HyperDash":false}]},{"StartTime":141597.0,"Objects":[{"StartTime":141597.0,"Position":349.0,"HyperDash":false}]},{"StartTime":141824.0,"Objects":[{"StartTime":141824.0,"Position":449.0,"HyperDash":false}]},{"StartTime":142052.0,"Objects":[{"StartTime":142052.0,"Position":493.0,"HyperDash":false}]},{"StartTime":142506.0,"Objects":[{"StartTime":142506.0,"Position":401.0,"HyperDash":false},{"StartTime":142562.0,"Position":403.0,"HyperDash":false},{"StartTime":142619.0,"Position":420.0,"HyperDash":false},{"StartTime":142676.0,"Position":407.0,"HyperDash":false},{"StartTime":142733.0,"Position":401.0,"HyperDash":false},{"StartTime":142828.0,"Position":411.0,"HyperDash":false},{"StartTime":142960.0,"Position":401.0,"HyperDash":false}]},{"StartTime":143415.0,"Objects":[{"StartTime":143415.0,"Position":246.0,"HyperDash":false},{"StartTime":143471.0,"Position":242.0,"HyperDash":false},{"StartTime":143528.0,"Position":264.0,"HyperDash":false},{"StartTime":143585.0,"Position":252.0,"HyperDash":false},{"StartTime":143642.0,"Position":246.0,"HyperDash":false},{"StartTime":143737.0,"Position":262.0,"HyperDash":false},{"StartTime":143869.0,"Position":246.0,"HyperDash":false}]},{"StartTime":144324.0,"Objects":[{"StartTime":144324.0,"Position":91.0,"HyperDash":false}]},{"StartTime":144552.0,"Objects":[{"StartTime":144552.0,"Position":45.0,"HyperDash":false}]},{"StartTime":144779.0,"Objects":[{"StartTime":144779.0,"Position":135.0,"HyperDash":false}]},{"StartTime":145006.0,"Objects":[{"StartTime":145006.0,"Position":45.0,"HyperDash":false}]},{"StartTime":145233.0,"Objects":[{"StartTime":145233.0,"Position":133.0,"HyperDash":false}]},{"StartTime":145688.0,"Objects":[{"StartTime":145688.0,"Position":337.0,"HyperDash":false}]},{"StartTime":145915.0,"Objects":[{"StartTime":145915.0,"Position":277.0,"HyperDash":false}]},{"StartTime":146142.0,"Objects":[{"StartTime":146142.0,"Position":386.0,"HyperDash":false}]},{"StartTime":146597.0,"Objects":[{"StartTime":146597.0,"Position":406.0,"HyperDash":false}]},{"StartTime":146824.0,"Objects":[{"StartTime":146824.0,"Position":320.0,"HyperDash":false}]},{"StartTime":147051.0,"Objects":[{"StartTime":147051.0,"Position":378.0,"HyperDash":false}]},{"StartTime":147506.0,"Objects":[{"StartTime":147506.0,"Position":320.0,"HyperDash":false}]},{"StartTime":147733.0,"Objects":[{"StartTime":147733.0,"Position":282.0,"HyperDash":false},{"StartTime":147828.0,"Position":269.560242,"HyperDash":false},{"StartTime":147960.0,"Position":205.662415,"HyperDash":false}]},{"StartTime":148415.0,"Objects":[{"StartTime":148415.0,"Position":234.0,"HyperDash":false},{"StartTime":148510.0,"Position":236.789261,"HyperDash":false},{"StartTime":148642.0,"Position":226.947067,"HyperDash":false}]},{"StartTime":148870.0,"Objects":[{"StartTime":148870.0,"Position":194.0,"HyperDash":false}]},{"StartTime":149324.0,"Objects":[{"StartTime":149324.0,"Position":88.0,"HyperDash":false},{"StartTime":149380.0,"Position":61.61062,"HyperDash":false},{"StartTime":149437.0,"Position":75.7172852,"HyperDash":false},{"StartTime":149494.0,"Position":64.72825,"HyperDash":false},{"StartTime":149551.0,"Position":71.9050446,"HyperDash":false},{"StartTime":149646.0,"Position":67.47814,"HyperDash":false},{"StartTime":149778.0,"Position":88.0,"HyperDash":false}]},{"StartTime":150233.0,"Objects":[{"StartTime":150233.0,"Position":120.0,"HyperDash":false},{"StartTime":150289.0,"Position":137.763626,"HyperDash":false},{"StartTime":150346.0,"Position":141.788849,"HyperDash":false},{"StartTime":150403.0,"Position":166.251251,"HyperDash":false},{"StartTime":150460.0,"Position":185.8204,"HyperDash":false},{"StartTime":150555.0,"Position":158.755432,"HyperDash":false},{"StartTime":150687.0,"Position":120.0,"HyperDash":false}]},{"StartTime":151142.0,"Objects":[{"StartTime":151142.0,"Position":276.0,"HyperDash":false},{"StartTime":151198.0,"Position":313.273468,"HyperDash":false},{"StartTime":151255.0,"Position":314.899536,"HyperDash":false},{"StartTime":151312.0,"Position":331.123352,"HyperDash":false},{"StartTime":151369.0,"Position":346.809448,"HyperDash":false},{"StartTime":151464.0,"Position":327.8075,"HyperDash":false},{"StartTime":151596.0,"Position":276.0,"HyperDash":false}]},{"StartTime":152051.0,"Objects":[{"StartTime":152051.0,"Position":384.0,"HyperDash":false},{"StartTime":152146.0,"Position":373.33017,"HyperDash":false},{"StartTime":152278.0,"Position":375.168457,"HyperDash":false}]},{"StartTime":152506.0,"Objects":[{"StartTime":152506.0,"Position":256.0,"HyperDash":false}]},{"StartTime":152733.0,"Objects":[{"StartTime":152733.0,"Position":218.0,"HyperDash":false}]},{"StartTime":152961.0,"Objects":[{"StartTime":152961.0,"Position":100.0,"HyperDash":false}]},{"StartTime":153188.0,"Objects":[{"StartTime":153188.0,"Position":104.0,"HyperDash":false}]},{"StartTime":153415.0,"Objects":[{"StartTime":153415.0,"Position":60.0,"HyperDash":false}]},{"StartTime":153870.0,"Objects":[{"StartTime":153870.0,"Position":241.0,"HyperDash":false},{"StartTime":153965.0,"Position":262.296783,"HyperDash":false},{"StartTime":154097.0,"Position":297.158661,"HyperDash":false}]},{"StartTime":154324.0,"Objects":[{"StartTime":154324.0,"Position":311.0,"HyperDash":false}]},{"StartTime":154779.0,"Objects":[{"StartTime":154779.0,"Position":365.0,"HyperDash":false},{"StartTime":154835.0,"Position":380.953857,"HyperDash":false},{"StartTime":154892.0,"Position":377.488251,"HyperDash":false},{"StartTime":154949.0,"Position":393.8036,"HyperDash":false},{"StartTime":155006.0,"Position":430.5609,"HyperDash":false},{"StartTime":155101.0,"Position":417.3473,"HyperDash":false},{"StartTime":155233.0,"Position":365.0,"HyperDash":false}]},{"StartTime":155688.0,"Objects":[{"StartTime":155688.0,"Position":179.0,"HyperDash":false}]},{"StartTime":155915.0,"Objects":[{"StartTime":155915.0,"Position":285.0,"HyperDash":false}]},{"StartTime":156142.0,"Objects":[{"StartTime":156142.0,"Position":154.0,"HyperDash":false}]},{"StartTime":156597.0,"Objects":[{"StartTime":156597.0,"Position":26.0,"HyperDash":false}]},{"StartTime":156824.0,"Objects":[{"StartTime":156824.0,"Position":166.0,"HyperDash":false},{"StartTime":156919.0,"Position":196.995117,"HyperDash":false},{"StartTime":157051.0,"Position":244.69249,"HyperDash":false}]},{"StartTime":157506.0,"Objects":[{"StartTime":157506.0,"Position":305.0,"HyperDash":false},{"StartTime":157601.0,"Position":339.2251,"HyperDash":false},{"StartTime":157733.0,"Position":383.441528,"HyperDash":false}]},{"StartTime":157961.0,"Objects":[{"StartTime":157961.0,"Position":461.0,"HyperDash":false}]},{"StartTime":158415.0,"Objects":[{"StartTime":158415.0,"Position":279.0,"HyperDash":false}]},{"StartTime":158642.0,"Objects":[{"StartTime":158642.0,"Position":370.0,"HyperDash":false}]},{"StartTime":158870.0,"Objects":[{"StartTime":158870.0,"Position":353.0,"HyperDash":false}]},{"StartTime":159324.0,"Objects":[{"StartTime":159324.0,"Position":140.0,"HyperDash":false}]},{"StartTime":159551.0,"Objects":[{"StartTime":159551.0,"Position":320.0,"HyperDash":false}]},{"StartTime":159779.0,"Objects":[{"StartTime":159779.0,"Position":399.0,"HyperDash":false}]},{"StartTime":160006.0,"Objects":[{"StartTime":160006.0,"Position":320.0,"HyperDash":false}]},{"StartTime":160233.0,"Objects":[{"StartTime":160233.0,"Position":255.0,"HyperDash":false},{"StartTime":160328.0,"Position":225.620453,"HyperDash":false},{"StartTime":160460.0,"Position":209.024933,"HyperDash":false}]},{"StartTime":160688.0,"Objects":[{"StartTime":160688.0,"Position":187.0,"HyperDash":false}]},{"StartTime":161142.0,"Objects":[{"StartTime":161142.0,"Position":354.0,"HyperDash":false},{"StartTime":161237.0,"Position":355.953247,"HyperDash":false},{"StartTime":161369.0,"Position":320.988251,"HyperDash":false}]},{"StartTime":161597.0,"Objects":[{"StartTime":161597.0,"Position":207.0,"HyperDash":false}]},{"StartTime":162051.0,"Objects":[{"StartTime":162051.0,"Position":43.0,"HyperDash":false}]},{"StartTime":162279.0,"Objects":[{"StartTime":162279.0,"Position":119.0,"HyperDash":false},{"StartTime":162374.0,"Position":150.19606,"HyperDash":false},{"StartTime":162506.0,"Position":180.9159,"HyperDash":false}]},{"StartTime":162961.0,"Objects":[{"StartTime":162961.0,"Position":195.0,"HyperDash":false},{"StartTime":163056.0,"Position":148.134537,"HyperDash":false},{"StartTime":163188.0,"Position":125.699371,"HyperDash":false}]},{"StartTime":163415.0,"Objects":[{"StartTime":163415.0,"Position":266.0,"HyperDash":false}]},{"StartTime":163870.0,"Objects":[{"StartTime":163870.0,"Position":337.0,"HyperDash":false},{"StartTime":163926.0,"Position":340.576416,"HyperDash":false},{"StartTime":163983.0,"Position":358.8032,"HyperDash":false},{"StartTime":164040.0,"Position":399.717,"HyperDash":false},{"StartTime":164097.0,"Position":413.786346,"HyperDash":false},{"StartTime":164192.0,"Position":398.392517,"HyperDash":false},{"StartTime":164324.0,"Position":337.0,"HyperDash":false}]},{"StartTime":164779.0,"Objects":[{"StartTime":164779.0,"Position":365.0,"HyperDash":false},{"StartTime":164874.0,"Position":341.216339,"HyperDash":false},{"StartTime":165006.0,"Position":289.0602,"HyperDash":false}]},{"StartTime":165233.0,"Objects":[{"StartTime":165233.0,"Position":164.0,"HyperDash":false}]},{"StartTime":165688.0,"Objects":[{"StartTime":165688.0,"Position":420.0,"HyperDash":false}]},{"StartTime":165915.0,"Objects":[{"StartTime":165915.0,"Position":347.0,"HyperDash":false},{"StartTime":166010.0,"Position":378.42804,"HyperDash":false},{"StartTime":166142.0,"Position":365.11972,"HyperDash":false}]},{"StartTime":166597.0,"Objects":[{"StartTime":166597.0,"Position":86.0,"HyperDash":false}]},{"StartTime":166824.0,"Objects":[{"StartTime":166824.0,"Position":212.0,"HyperDash":false}]},{"StartTime":167051.0,"Objects":[{"StartTime":167051.0,"Position":74.0,"HyperDash":false},{"StartTime":167107.0,"Position":65.55724,"HyperDash":false},{"StartTime":167164.0,"Position":36.62049,"HyperDash":false},{"StartTime":167278.0,"Position":74.0,"HyperDash":false}]},{"StartTime":167506.0,"Objects":[{"StartTime":167506.0,"Position":244.0,"HyperDash":false}]},{"StartTime":167733.0,"Objects":[{"StartTime":167733.0,"Position":166.0,"HyperDash":false}]},{"StartTime":167961.0,"Objects":[{"StartTime":167961.0,"Position":274.0,"HyperDash":false},{"StartTime":168013.0,"Position":301.951935,"HyperDash":false},{"StartTime":168065.0,"Position":319.251465,"HyperDash":false},{"StartTime":168117.0,"Position":329.4265,"HyperDash":false},{"StartTime":168170.0,"Position":343.4541,"HyperDash":false},{"StartTime":168222.0,"Position":376.318848,"HyperDash":false},{"StartTime":168274.0,"Position":385.979645,"HyperDash":false},{"StartTime":168326.0,"Position":398.919922,"HyperDash":false},{"StartTime":168415.0,"Position":410.559265,"HyperDash":false}]},{"StartTime":168642.0,"Objects":[{"StartTime":168642.0,"Position":266.0,"HyperDash":false}]},{"StartTime":168870.0,"Objects":[{"StartTime":168870.0,"Position":262.0,"HyperDash":false},{"StartTime":168922.0,"Position":264.549957,"HyperDash":false},{"StartTime":168974.0,"Position":244.610046,"HyperDash":false},{"StartTime":169026.0,"Position":261.6293,"HyperDash":false},{"StartTime":169079.0,"Position":278.3733,"HyperDash":false},{"StartTime":169131.0,"Position":294.3729,"HyperDash":false},{"StartTime":169183.0,"Position":290.6487,"HyperDash":false},{"StartTime":169235.0,"Position":313.168427,"HyperDash":false},{"StartTime":169324.0,"Position":333.1015,"HyperDash":false}]},{"StartTime":169551.0,"Objects":[{"StartTime":169551.0,"Position":391.0,"HyperDash":false}]},{"StartTime":169779.0,"Objects":[{"StartTime":169779.0,"Position":340.0,"HyperDash":false},{"StartTime":169831.0,"Position":319.4877,"HyperDash":false},{"StartTime":169883.0,"Position":321.416565,"HyperDash":false},{"StartTime":169935.0,"Position":292.492767,"HyperDash":false},{"StartTime":169988.0,"Position":257.8616,"HyperDash":false},{"StartTime":170040.0,"Position":232.613708,"HyperDash":false},{"StartTime":170092.0,"Position":235.74971,"HyperDash":false},{"StartTime":170144.0,"Position":224.646179,"HyperDash":false},{"StartTime":170233.0,"Position":191.472458,"HyperDash":false}]},{"StartTime":170461.0,"Objects":[{"StartTime":170461.0,"Position":300.0,"HyperDash":false}]},{"StartTime":170688.0,"Objects":[{"StartTime":170688.0,"Position":319.0,"HyperDash":false},{"StartTime":170740.0,"Position":317.817749,"HyperDash":false},{"StartTime":170792.0,"Position":324.806122,"HyperDash":false},{"StartTime":170844.0,"Position":327.30014,"HyperDash":false},{"StartTime":170897.0,"Position":341.6977,"HyperDash":false},{"StartTime":170949.0,"Position":331.214264,"HyperDash":false},{"StartTime":171001.0,"Position":340.934967,"HyperDash":false},{"StartTime":171053.0,"Position":335.773926,"HyperDash":false},{"StartTime":171142.0,"Position":303.6745,"HyperDash":false}]},{"StartTime":171370.0,"Objects":[{"StartTime":171370.0,"Position":157.0,"HyperDash":false}]},{"StartTime":171597.0,"Objects":[{"StartTime":171597.0,"Position":184.0,"HyperDash":false},{"StartTime":171649.0,"Position":177.816864,"HyperDash":false},{"StartTime":171701.0,"Position":167.695633,"HyperDash":false},{"StartTime":171753.0,"Position":168.327789,"HyperDash":false},{"StartTime":171806.0,"Position":156.99791,"HyperDash":false},{"StartTime":171858.0,"Position":147.82634,"HyperDash":false},{"StartTime":171910.0,"Position":166.402451,"HyperDash":false},{"StartTime":171962.0,"Position":147.244476,"HyperDash":false},{"StartTime":172051.0,"Position":180.821411,"HyperDash":false}]},{"StartTime":172279.0,"Objects":[{"StartTime":172279.0,"Position":296.0,"HyperDash":false}]},{"StartTime":172506.0,"Objects":[{"StartTime":172506.0,"Position":366.0,"HyperDash":false}]},{"StartTime":172961.0,"Objects":[{"StartTime":172961.0,"Position":296.0,"HyperDash":false}]},{"StartTime":173188.0,"Objects":[{"StartTime":173188.0,"Position":272.0,"HyperDash":false}]},{"StartTime":173415.0,"Objects":[{"StartTime":173415.0,"Position":216.0,"HyperDash":false},{"StartTime":173467.0,"Position":213.8114,"HyperDash":false},{"StartTime":173519.0,"Position":176.041458,"HyperDash":false},{"StartTime":173571.0,"Position":162.964,"HyperDash":false},{"StartTime":173624.0,"Position":126.355881,"HyperDash":false},{"StartTime":173676.0,"Position":137.035782,"HyperDash":false},{"StartTime":173728.0,"Position":92.75827,"HyperDash":false},{"StartTime":173780.0,"Position":98.66459,"HyperDash":false},{"StartTime":173869.0,"Position":60.0903053,"HyperDash":false}]},{"StartTime":174097.0,"Objects":[{"StartTime":174097.0,"Position":156.0,"HyperDash":false}]},{"StartTime":174324.0,"Objects":[{"StartTime":174324.0,"Position":150.0,"HyperDash":false}]},{"StartTime":174438.0,"Objects":[{"StartTime":174438.0,"Position":156.0,"HyperDash":false}]},{"StartTime":174551.0,"Objects":[{"StartTime":174551.0,"Position":150.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/75858.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/75858.osu
new file mode 100644
index 0000000000..637273efad
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/75858.osu
@@ -0,0 +1,417 @@
+osu file format v8
+
+[General]
+StackLeniency: 0.6
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:4
+OverallDifficulty:7
+ApproachRate:7
+SliderMultiplier:1.6
+SliderTickRate:0.5
+
+[Events]
+//Background and Video events
+//Break Periods
+2,38388,45242
+2,89297,92515
+2,107705,114333
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+//Background Colour Transformations
+3,100,163,162,255
+
+[TimingPoints]
+1173,666.666666666667,4,2,1,60,1,0
+2173,-100,4,2,1,50,0,0
+2839,-100,4,2,1,60,0,0
+4839,-100,4,2,1,50,0,0
+5506,-100,4,2,1,60,0,0
+7506,-100,4,2,1,50,0,0
+8173,-100,4,2,1,60,0,0
+10673,-200,4,2,1,60,0,0
+11173,-200,4,2,1,10,0,0
+11673,-100,4,2,1,60,0,0
+12839,-100,4,2,1,50,0,0
+13506,-100,4,2,1,60,0,0
+15506,-100,4,2,1,50,0,0
+16173,-100,4,2,1,60,0,0
+16839,-100,4,2,1,50,0,0
+17506,-100,4,2,1,60,0,0
+19506,-100,4,2,1,70,0,0
+20006,-100,4,2,1,30,0,0
+22052,454.545454545455,4,2,1,40,1,0
+23642,-100,4,2,2,70,0,0
+23870,-100,4,2,2,70,0,1
+38415,-100,4,2,2,70,0,0
+45915,-100,4,2,2,60,0,0
+52733,-100,4,2,2,25,0,0
+53188,-100,4,2,2,60,0,0
+60006,-100,4,2,2,25,0,0
+60460,-100,4,2,1,45,0,0
+67620,-100,4,2,1,50,0,0
+71483,-100,4,2,1,55,0,0
+74267,-100,4,2,1,70,0,0
+74665,-100,4,2,2,80,0,0
+74779,-100,4,2,2,80,0,1
+89324,-100,4,2,2,80,0,0
+92961,-100,4,2,2,65,0,0
+107279,-100,4,2,1,40,0,0
+107733,-100,4,2,1,45,0,0
+126029,-100,4,2,1,50,0,0
+128813,-100,4,2,1,60,0,0
+129211,-100,4,2,1,70,0,0
+129438,-100,4,2,1,55,0,0
+130631,-100,4,2,1,65,0,0
+131029,-100,4,2,1,75,0,0
+131370,-100,4,2,2,65,0,0
+145461,-100,4,2,2,75,0,0
+145688,-100,4,2,2,75,0,1
+160120,-100,4,2,2,80,0,0
+160233,-100,4,2,2,80,0,1
+174779,-100,4,2,2,80,0,0
+
+[HitObjects]
+94,279,1173,2,0,B|125:307|190:315|253:298,1,160,8|2
+398,247,2506,1,0
+471,104,3172,1,2
+320,51,3839,6,0,B|275:33|209:34|165:67,1,160,8|2
+65,190,5173,1,0
+149,325,5839,1,2
+239,192,6506,6,0,B|295:173|352:207|417:188,1,160,4|2
+493,320,7839,1,0
+334,340,8506,1,2
+199,253,9173,5,0
+171,95,9839,1,2
+271,219,10506,1,0
+199,253,10839,2,0,B|161:276|115:272,1,80,2|0
+42,266,11839,5,4
+110,121,12506,1,2
+263,168,13172,2,0,B|305:186|378:185|423:172,1,160,0|2
+293,75,14506,6,0,B|276:121|216:147|156:149,1,160,8|2
+282,251,15839,2,0,B|299:297|359:323|419:325,1,160,0|2
+416,164,17172,1,4
+256,148,17839,2,0,B|172:136|172:136|230:189|198:266|154:289|154:289|85:276,1,320,2|2
+256,148,19839,1,4
+256,192,20173,12,8,22506
+256,192,22961,5,8
+256,192,23415,1,8
+104,245,23870,6,0,B|132:284|196:282,2,80,2|0|2
+256,192,24779,2,0,B|314:192|348:238,2,80,2|0|2
+118,111,25688,2,0,B|165:91|229:112,1,80,0|2
+275,113,26142,1,0
+419,185,26597,2,0,B|383:204|338:204|337:204,1,80,2|0
+261,196,27052,1,2
+128,285,27506,5,0
+97,211,27733,2,0,B|82:168|96:131,1,80,2|0
+236,56,28415,1,0
+313,77,28642,2,0,B|356:91|411:84,1,80,0|2
+456,232,29324,1,0
+456,232,29552,1,2
+456,232,29779,1,0
+311,299,30233,1,0
+231,312,30461,1,2
+151,300,30688,2,0,B|98:292,2,40,0|0|0
+231,312,31142,5,2
+202,236,31370,1,0
+194,156,31597,2,0,B|188:101|218:47|274:27,1,160,2|2
+295,104,32279,1,0
+273,181,32506,2,0,B|218:179|150:144|144:96,1,160,2|0
+219,72,33188,1,2
+295,104,33415,2,0,B|252:152|265:239|328:269,1,160
+367,205,34097,1,0
+372,125,34324,2,0,B|323:95|242:92|191:148,1,160,2|0
+154,170,35006,1,2
+107,234,35233,6,0,B|134:267|226:268|262:230,1,160,0|2
+316,183,35915,1,0
+350,111,36142,1,2
+350,111,36597,1,0
+393,178,36824,1,2
+406,257,37051,2,0,B|402:303|344:360|271:363,1,160,0|2
+216,350,37733,1,0
+154,298,37961,5,2
+154,298,38074,1,2
+154,298,38188,1,2
+105,136,46142,6,0,B|125:91|191:64|257:74,1,160,0|2
+399,102,47051,2,0,B|486:117|485:117,2,80,0|2|0
+422,260,47961,2,0,B|402:305|336:332|270:322,1,160,0|2
+128,294,48870,2,0,B|41:279|42:279,2,80,0|2|0
+252,193,49779,6,0,B|297:168|358:163|436:186,1,160,0|2
+342,324,50688,1,0
+377,252,50915,2,0,B|335:241|293:260,1,80,2|0
+227,293,51370,1,0
+159,335,51597,2,0,B|118:354|78:347,1,80,2|0
+107,271,52051,2,0,B|56:280|16:255,1,80,2|0
+75,196,52506,2,0,B|132:204|191:190|229:151,1,160,4|0
+321,27,53415,5,2
+321,27,53642,1,0
+321,27,53870,2,0,B|376:37|403:124|352:180,1,160
+331,230,54551,1,2
+266,276,54779,1,0
+266,276,55233,5,2
+266,276,55461,1,0
+266,276,55688,2,0,B|208:296|133:275|108:219,1,160
+89,164,56370,1,2
+99,84,56597,1,0
+99,84,57051,5,2
+99,84,57279,1,0
+99,84,57506,2,0,B|128:116|201:127|254:108,1,160
+326,84,58188,1,2
+382,27,58415,1,0
+401,104,58642,2,0,B|392:148|345:160,1,80,0|2
+274,188,59097,1,0
+337,236,59324,2,0,B|374:265|364:310,1,80,2|0
+284,298,59779,2,0,B|243:334|169:279|128:318,1,160,4|0
+41,182,60688,5,0
+191,127,61142,2,0,B|276:94,1,80,2|0
+254,177,61597,2,0,B|339:144,1,80
+319,227,62051,1,2
+319,227,62279,2,0,B|234:260,1,80,0|8
+168,281,62733,1,0
+91,305,62961,1,2
+31,252,63188,1,0
+31,172,63415,2,0,B|31:88,2,80,0|2|2
+181,116,64324,5,8
+335,74,64779,2,0,B|335:162,1,80,2|0
+405,116,65233,2,0,B|405:198,1,80
+475,157,65688,1,2
+475,157,65915,2,0,B|475:69,1,80,0|8
+405,37,66370,1,0
+325,26,66597,1,2
+252,60,66824,1,8
+204,124,67051,1,0
+189,202,67279,1,2
+202,280,67506,1,10
+250,343,67733,1,0
+329,332,67961,6,0,B|432:315,1,80,0|8
+427,241,68415,2,0,B|324:258,1,80,2|8
+303,187,68870,2,0,B|406:170,1,80,0|8
+401,96,69324,2,0,B|298:113,1,80,2|8
+242,122,69779,5,0
+242,122,70006,1,8
+163,135,70233,1,2
+163,135,70461,1,8
+84,150,70688,2,0,B|60:195|95:243,3,80,0|2|2|0
+148,275,71597,6,0,B|180:305|252:312|305:295,1,160,4|10
+374,86,72506,2,0,B|342:56|270:49|217:66,1,160,4|10
+147,97,73188,1,0
+213,141,73415,2,0,B|286:189,1,80,8|2
+346,229,73870,2,0,B|282:313,1,80,8|2
+252,358,74324,1,10
+252,358,74551,1,10
+252,358,74779,6,0,B|208:373|169:356,2,80,0|0|2
+194,208,75688,2,0,B|150:193|111:210,2,80,2|0|2
+347,252,76597,1,0
+347,252,76824,1,2
+347,252,77051,1,0
+448,128,77506,1,0
+368,117,77733,1,0
+305,67,77961,1,2
+146,87,78415,5,0
+118,161,78642,2,0,B|99:205|41:224,1,80,2|0
+218,249,79324,2,0,B|252:272|301:266,1,80
+372,247,79779,1,2
+286,112,80233,2,0,B|282:23,2,80,0|2|0
+427,186,81142,1,0
+427,186,81370,1,2
+427,186,81597,2,0,B|431:244,2,40
+421,105,82051,5,0
+356,152,82279,1,0
+285,188,82506,2,0,B|236:212|160:202|130:174,1,160,2|2
+188,119,83188,1,0
+267,110,83415,2,0,B|303:160|289:236|225:276,1,160,2|0
+193,198,84097,1,2
+188,119,84324,2,0,B|240:128|312:104|337:51,1,160
+257,29,85006,1,0
+177,39,85233,2,0,B|160:93|191:163|284:166,1,160,2|0
+326,183,85915,1,2
+404,197,86142,6,0,B|455:212|468:261|448:314|380:320,1,160
+326,330,86824,1,0
+246,322,87051,1,2
+246,322,87506,1,0
+192,262,87733,1,2
+168,185,87961,2,0,B|148:132|174:73|235:44,1,160,0|2
+299,23,88642,1,0
+378,36,88870,5,2
+378,36,88983,1,2
+378,36,89097,1,2
+330,47,93415,6,0,B|388:28|453:36,2,120,2|0|2
+254,74,94324,1,0
+181,108,94552,2,0,B|129:134,1,40
+181,107,95233,6,0,B|123:88|58:96,2,120,2|0|2
+257,134,96142,1,0
+330,168,96370,2,0,B|382:194,1,40
+330,168,97052,6,0,B|388:149|453:157,2,120,2|0|2
+254,195,97961,1,0
+181,229,98188,2,0,B|129:255,1,40
+181,228,98870,6,0,B|123:209|58:217,2,120,2|0|2
+257,255,99779,1,0
+330,289,100006,2,0,B|382:315,1,40
+454,74,100688,6,0,B|403:83,1,40,2|0
+335,95,101029,2,0,B|270:105,1,40,2|0
+216,114,101370,1,0
+137,127,101597,2,0,B|89:139|30:126,1,80,2|0
+57,130,101938,1,0
+57,130,102506,6,0,B|108:139,1,40,2|0
+176,151,102847,2,0,B|240:161,1,40,2|0
+295,170,103188,1,0
+374,183,103415,2,0,B|422:195|481:182,1,80,2|0
+454,187,103756,1,0
+454,187,104324,6,0,B|403:196,1,40,2|0
+335,208,104665,2,0,B|270:218,1,40,2|0
+216,227,105006,1,0
+176,234,105120,1,0
+137,240,105233,2,0,B|89:252|30:239,1,80,2|0
+57,244,105574,1,0
+57,244,106142,6,0,B|108:253,1,40,2|0
+176,265,106483,2,0,B|240:275,1,40,2|0
+295,284,106824,2,0,B|320:300|372:301|408:283|408:283|371:256|318:256|291:287,1,240,0|12
+114,269,115233,6,0,B|145:293|228:297|281:282,1,160,0|2
+347,264,115915,1,0
+419,230,116142,2,0,B|452:197|450:147,2,80,0|0|2
+366,78,117052,2,0,B|330:116|275:110,1,80,8|0
+216,99,117506,1,2
+149,54,117733,1,0
+84,102,117961,2,0,B|84:216,3,80,0|2|2|0
+85,262,118870,5,8
+155,299,119097,1,0
+225,261,119324,1,2
+296,297,119552,1,0
+368,263,119779,2,0,B|411:250|461:267,2,80,0|0|2
+434,117,120688,1,0
+364,77,120915,1,8
+286,58,121142,2,0,B|229:48|161:67|126:113,1,160,2|0
+102,172,121824,1,10
+102,252,122052,2,0,B|104:301|150:325|152:324,1,80,2|0
+187,253,122506,6,0,B|228:231|312:284|368:259,1,160,8|2
+409,217,123188,1,0
+342,172,123415,2,0,B|297:185|225:140|184:159,1,160,0|2
+118,114,124097,1,0
+184,70,124324,2,0,B|226:47|319:101|365:76,1,160,8|2
+401,29,125006,1,0
+474,59,125233,2,0,B|496:100|472:142,1,80,0|2
+437,206,125688,2,0,B|415:251|442:297,1,80,2|0
+506,246,126142,6,0,B|342:247,1,160,0|10
+28,229,127052,2,0,B|192:228,1,160,0|10
+267,228,127733,1,0
+226,297,127961,2,0,B|202:340|232:391,2,80,8|0|10
+267,228,128642,1,0
+308,159,128870,1,8
+308,159,129097,1,10
+308,159,129324,1,4
+308,159,129779,6,0,B|332:202|302:253,2,80,10|0|10
+267,90,130461,1,0
+226,21,130688,1,10
+226,21,130915,1,10
+226,21,131142,1,6
+119,140,131597,5,2
+148,297,132052,1,0
+302,338,132506,1,2
+430,242,132961,1,0
+394,86,133415,1,2
+240,40,133870,1,0
+119,140,134324,2,0,B|81:168|17:153,1,80,2|0
+65,80,134779,1,0
+178,192,135233,5,2
+247,336,135688,1,0
+406,343,136142,1,2
+484,203,136597,1,0
+418,57,137052,1,2
+258,52,137506,1,0
+178,192,137961,2,0,B|141:228|91:227,1,80,2|2
+110,146,138415,1,0
+247,228,138870,6,0,B|282:250|337:247,1,80,2|0
+403,246,139324,1,0
+309,115,139779,2,0,B|274:93|219:96,1,80,2|0
+153,97,140233,1,0
+98,247,140688,1,2
+175,265,140915,1,0
+242,221,141142,1,2
+274,147,141370,1,0
+327,87,141597,1,2
+399,52,141824,1,0
+471,86,142052,1,0
+401,230,142506,6,0,B|401:323,2,80,2|0|0
+246,272,143415,2,0,B|246:365,2,80,2|0|0
+91,314,144324,1,2
+45,247,144552,1,0
+90,181,144779,1,2
+45,114,145006,1,0
+89,47,145233,1,2
+235,112,145688,5,0
+307,146,145915,1,0
+386,139,146142,1,2
+386,139,146597,1,2
+353,211,146824,1,0
+349,291,147051,1,2
+349,291,147506,1,0
+282,246,147733,2,0,B|245:222|179:226,1,80,2|0
+234,70,148415,2,0,B|247:122|216:167,1,80,2|0
+205,225,148870,1,2
+88,116,149324,6,0,B|56:159|77:205,2,80,0|2|0
+120,272,150233,2,0,B|139:307|193:313,2,80,2|0|2
+276,304,151142,2,0,B|324:298|364:252,2,80,0|2|0
+384,185,152051,2,0,B|399:140|372:104,1,80,0|2
+314,56,152506,1,0
+237,34,152733,1,0
+159,54,152961,5,2
+102,110,153188,1,0
+82,187,153415,1,2
+241,172,153870,2,0,B|296:192|303:250,1,80
+307,304,154324,1,2
+365,155,154779,2,0,B|389:116|435:115,2,80,0|2|0
+307,304,155688,1,2
+232,334,155915,1,0
+154,315,156142,1,2
+90,167,156597,5,0
+166,189,156824,2,0,B|211:202|257:182,1,80,2|0
+305,38,157506,2,0,B|345:21|392:34,1,80,2|0
+461,50,157961,1,2
+370,181,158415,1,0
+370,181,158642,1,2
+370,181,158870,1,0
+255,292,159324,1,0
+320,337,159551,1,2
+399,341,159779,5,2
+320,337,160006,1,0
+255,292,160233,2,0,B|209:264|205:203,1,80,2|0
+196,149,160688,1,2
+354,171,161142,2,0,B|352:219|305:256,1,80
+256,290,161597,1,2
+125,197,162051,1,0
+119,117,162279,2,0,B|138:78|187:70,1,80,2|0
+195,230,162961,2,0,B|143:232|114:179,1,80,2|0
+190,150,163415,1,2
+337,86,163870,6,0,B|372:64|421:70,2,80,0|2|0
+365,243,164779,2,0,B|328:272|260:256,1,80,2|0
+212,239,165233,1,2
+292,111,165688,1,0
+347,168,165915,2,0,B|377:201|362:257,1,80,2|0
+224,320,166597,1,0
+149,292,166824,1,2
+74,261,167051,2,0,B|32:245,2,40
+138,213,167506,5,2
+205,169,167733,1,0
+274,129,167961,2,0,B|328:113|400:144|414:196,1,160,2|0
+340,224,168642,1,0
+262,204,168870,2,0,B|249:152|288:80|343:74,1,160,2|0
+367,148,169551,1,2
+340,224,169779,2,0,B|298:191|219:196|180:244,1,160,0|2
+240,295,170461,1,0
+319,301,170688,2,0,B|355:264|345:184|301:156,1,160,2|0
+229,127,171370,1,2
+184,60,171597,6,0,B|131:94|134:176|208:218,1,160
+252,234,172279,1,0
+331,241,172506,1,2
+331,241,172961,1,0
+284,306,173188,1,2
+216,348,173415,2,0,B|171:368|94:370|56:347,1,160,0|2
+106,283,174097,1,0
+153,218,174324,5,2
+153,218,174438,1,2
+153,218,174551,1,2
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/871815-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/871815-expected-conversion.json
new file mode 100644
index 0000000000..c8ebf04ca4
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/871815-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":1459.0,"Objects":[{"StartTime":1459.0,"Position":150.0,"HyperDash":false}]},{"StartTime":1809.0,"Objects":[{"StartTime":1809.0,"Position":150.0,"HyperDash":false},{"StartTime":1896.0,"Position":172.185562,"HyperDash":false},{"StartTime":1984.0,"Position":224.798538,"HyperDash":false},{"StartTime":2072.0,"Position":262.41153,"HyperDash":false}]},{"StartTime":2160.0,"Objects":[{"StartTime":2160.0,"Position":281.0,"HyperDash":false},{"StartTime":2229.0,"Position":285.0371,"HyperDash":false},{"StartTime":2335.0,"Position":285.094574,"HyperDash":false}]},{"StartTime":2511.0,"Objects":[{"StartTime":2511.0,"Position":272.0,"HyperDash":false}]},{"StartTime":2687.0,"Objects":[{"StartTime":2687.0,"Position":367.0,"HyperDash":false},{"StartTime":2774.0,"Position":395.071045,"HyperDash":false},{"StartTime":2862.0,"Position":385.323761,"HyperDash":false},{"StartTime":2931.0,"Position":384.634644,"HyperDash":false},{"StartTime":3037.0,"Position":371.162445,"HyperDash":false}]},{"StartTime":3213.0,"Objects":[{"StartTime":3213.0,"Position":278.0,"HyperDash":false}]},{"StartTime":3388.0,"Objects":[{"StartTime":3388.0,"Position":113.0,"HyperDash":false}]},{"StartTime":3476.0,"Objects":[{"StartTime":3476.0,"Position":116.0,"HyperDash":false}]},{"StartTime":3564.0,"Objects":[{"StartTime":3564.0,"Position":121.0,"HyperDash":false},{"StartTime":3607.0,"Position":121.720619,"HyperDash":false},{"StartTime":3651.0,"Position":121.0,"HyperDash":false},{"StartTime":3695.0,"Position":121.720619,"HyperDash":false},{"StartTime":3739.0,"Position":121.0,"HyperDash":false},{"StartTime":3783.0,"Position":121.720619,"HyperDash":false},{"StartTime":3827.0,"Position":121.0,"HyperDash":false},{"StartTime":3871.0,"Position":121.720619,"HyperDash":false},{"StartTime":3914.0,"Position":121.0,"HyperDash":false}]},{"StartTime":4266.0,"Objects":[{"StartTime":4266.0,"Position":368.0,"HyperDash":false},{"StartTime":4353.0,"Position":394.044952,"HyperDash":false},{"StartTime":4441.0,"Position":430.602478,"HyperDash":false},{"StartTime":4510.0,"Position":451.933838,"HyperDash":false},{"StartTime":4616.0,"Position":498.848267,"HyperDash":false}]},{"StartTime":4792.0,"Objects":[{"StartTime":4792.0,"Position":440.0,"HyperDash":false}]},{"StartTime":4967.0,"Objects":[{"StartTime":4967.0,"Position":289.0,"HyperDash":false},{"StartTime":5036.0,"Position":249.229553,"HyperDash":false},{"StartTime":5142.0,"Position":216.522751,"HyperDash":false}]},{"StartTime":5318.0,"Objects":[{"StartTime":5318.0,"Position":105.0,"HyperDash":false}]},{"StartTime":5494.0,"Objects":[{"StartTime":5494.0,"Position":119.0,"HyperDash":false},{"StartTime":5581.0,"Position":96.97381,"HyperDash":false},{"StartTime":5669.0,"Position":97.10305,"HyperDash":false},{"StartTime":5738.0,"Position":108.834061,"HyperDash":false},{"StartTime":5844.0,"Position":132.852325,"HyperDash":false}]},{"StartTime":6020.0,"Objects":[{"StartTime":6020.0,"Position":192.0,"HyperDash":true}]},{"StartTime":6195.0,"Objects":[{"StartTime":6195.0,"Position":451.0,"HyperDash":false},{"StartTime":6282.0,"Position":417.845947,"HyperDash":false},{"StartTime":6370.0,"Position":392.282257,"HyperDash":false},{"StartTime":6439.0,"Position":343.915466,"HyperDash":false},{"StartTime":6545.0,"Position":323.918671,"HyperDash":false}]},{"StartTime":6722.0,"Objects":[{"StartTime":6722.0,"Position":380.0,"HyperDash":false}]},{"StartTime":6897.0,"Objects":[{"StartTime":6897.0,"Position":334.0,"HyperDash":false}]},{"StartTime":6985.0,"Objects":[{"StartTime":6985.0,"Position":334.0,"HyperDash":false}]},{"StartTime":7073.0,"Objects":[{"StartTime":7073.0,"Position":334.0,"HyperDash":false},{"StartTime":7160.0,"Position":336.334045,"HyperDash":false},{"StartTime":7248.0,"Position":347.94342,"HyperDash":false},{"StartTime":7317.0,"Position":360.6226,"HyperDash":false},{"StartTime":7423.0,"Position":326.399445,"HyperDash":false}]},{"StartTime":7599.0,"Objects":[{"StartTime":7599.0,"Position":281.0,"HyperDash":false}]},{"StartTime":7774.0,"Objects":[{"StartTime":7774.0,"Position":140.0,"HyperDash":false}]},{"StartTime":7950.0,"Objects":[{"StartTime":7950.0,"Position":274.0,"HyperDash":false}]},{"StartTime":8125.0,"Objects":[{"StartTime":8125.0,"Position":138.0,"HyperDash":false}]},{"StartTime":8301.0,"Objects":[{"StartTime":8301.0,"Position":266.0,"HyperDash":false},{"StartTime":8388.0,"Position":316.25592,"HyperDash":false},{"StartTime":8476.0,"Position":340.940063,"HyperDash":false},{"StartTime":8545.0,"Position":353.487854,"HyperDash":false},{"StartTime":8651.0,"Position":415.880127,"HyperDash":false}]},{"StartTime":8827.0,"Objects":[{"StartTime":8827.0,"Position":512.0,"HyperDash":false}]},{"StartTime":9002.0,"Objects":[{"StartTime":9002.0,"Position":490.0,"HyperDash":false},{"StartTime":9089.0,"Position":482.986267,"HyperDash":false},{"StartTime":9177.0,"Position":439.110077,"HyperDash":false},{"StartTime":9246.0,"Position":414.503052,"HyperDash":false},{"StartTime":9352.0,"Position":366.139923,"HyperDash":false}]},{"StartTime":9529.0,"Objects":[{"StartTime":9529.0,"Position":260.0,"HyperDash":false},{"StartTime":9598.0,"Position":239.881287,"HyperDash":false},{"StartTime":9704.0,"Position":261.6383,"HyperDash":false}]},{"StartTime":9792.0,"Objects":[{"StartTime":9792.0,"Position":267.0,"HyperDash":false}]},{"StartTime":9880.0,"Objects":[{"StartTime":9880.0,"Position":267.0,"HyperDash":false},{"StartTime":9967.0,"Position":234.350662,"HyperDash":false},{"StartTime":10055.0,"Position":203.079025,"HyperDash":false},{"StartTime":10124.0,"Position":187.624725,"HyperDash":false},{"StartTime":10230.0,"Position":130.615417,"HyperDash":false}]},{"StartTime":10406.0,"Objects":[{"StartTime":10406.0,"Position":185.0,"HyperDash":false}]},{"StartTime":10581.0,"Objects":[{"StartTime":10581.0,"Position":177.0,"HyperDash":false},{"StartTime":10650.0,"Position":191.354156,"HyperDash":false},{"StartTime":10756.0,"Position":249.516769,"HyperDash":false}]},{"StartTime":10932.0,"Objects":[{"StartTime":10932.0,"Position":352.0,"HyperDash":false}]},{"StartTime":11108.0,"Objects":[{"StartTime":11108.0,"Position":436.0,"HyperDash":false},{"StartTime":11177.0,"Position":446.0463,"HyperDash":false},{"StartTime":11283.0,"Position":509.668152,"HyperDash":false}]},{"StartTime":11458.0,"Objects":[{"StartTime":11458.0,"Position":368.0,"HyperDash":false},{"StartTime":11527.0,"Position":322.9537,"HyperDash":false},{"StartTime":11633.0,"Position":294.331848,"HyperDash":false}]},{"StartTime":11809.0,"Objects":[{"StartTime":11809.0,"Position":181.0,"HyperDash":false},{"StartTime":11878.0,"Position":187.9666,"HyperDash":false},{"StartTime":11984.0,"Position":184.937943,"HyperDash":false}]},{"StartTime":12160.0,"Objects":[{"StartTime":12160.0,"Position":221.0,"HyperDash":false}]},{"StartTime":12248.0,"Objects":[{"StartTime":12248.0,"Position":221.0,"HyperDash":false}]},{"StartTime":12336.0,"Objects":[{"StartTime":12336.0,"Position":221.0,"HyperDash":false},{"StartTime":12405.0,"Position":266.95636,"HyperDash":false},{"StartTime":12511.0,"Position":293.24704,"HyperDash":false}]},{"StartTime":12687.0,"Objects":[{"StartTime":12687.0,"Position":440.0,"HyperDash":false},{"StartTime":12774.0,"Position":402.903931,"HyperDash":false},{"StartTime":12862.0,"Position":366.3639,"HyperDash":false},{"StartTime":12931.0,"Position":335.8872,"HyperDash":false},{"StartTime":13037.0,"Position":292.814026,"HyperDash":false}]},{"StartTime":13213.0,"Objects":[{"StartTime":13213.0,"Position":330.0,"HyperDash":false}]},{"StartTime":13301.0,"Objects":[{"StartTime":13301.0,"Position":330.0,"HyperDash":false}]},{"StartTime":13388.0,"Objects":[{"StartTime":13388.0,"Position":330.0,"HyperDash":false},{"StartTime":13457.0,"Position":378.510529,"HyperDash":false},{"StartTime":13563.0,"Position":404.689636,"HyperDash":false}]},{"StartTime":13739.0,"Objects":[{"StartTime":13739.0,"Position":494.0,"HyperDash":false}]},{"StartTime":13915.0,"Objects":[{"StartTime":13915.0,"Position":321.0,"HyperDash":false}]},{"StartTime":14002.0,"Objects":[{"StartTime":14002.0,"Position":321.0,"HyperDash":false}]},{"StartTime":14090.0,"Objects":[{"StartTime":14090.0,"Position":321.0,"HyperDash":false},{"StartTime":14159.0,"Position":343.727631,"HyperDash":false},{"StartTime":14265.0,"Position":391.072754,"HyperDash":false}]},{"StartTime":14441.0,"Objects":[{"StartTime":14441.0,"Position":231.0,"HyperDash":false}]},{"StartTime":14616.0,"Objects":[{"StartTime":14616.0,"Position":188.0,"HyperDash":false},{"StartTime":14703.0,"Position":182.992142,"HyperDash":false},{"StartTime":14791.0,"Position":176.795868,"HyperDash":false},{"StartTime":14860.0,"Position":189.954117,"HyperDash":false},{"StartTime":14966.0,"Position":188.0,"HyperDash":false}]},{"StartTime":15143.0,"Objects":[{"StartTime":15143.0,"Position":125.0,"HyperDash":false},{"StartTime":15230.0,"Position":105.420952,"HyperDash":false},{"StartTime":15318.0,"Position":59.72222,"HyperDash":false},{"StartTime":15406.0,"Position":22.9492321,"HyperDash":false}]},{"StartTime":15494.0,"Objects":[{"StartTime":15494.0,"Position":17.0,"HyperDash":false},{"StartTime":15563.0,"Position":33.37393,"HyperDash":false},{"StartTime":15669.0,"Position":20.4846058,"HyperDash":false}]},{"StartTime":15844.0,"Objects":[{"StartTime":15844.0,"Position":29.0,"HyperDash":false}]},{"StartTime":16020.0,"Objects":[{"StartTime":16020.0,"Position":130.0,"HyperDash":false}]},{"StartTime":16108.0,"Objects":[{"StartTime":16108.0,"Position":130.0,"HyperDash":false}]},{"StartTime":16195.0,"Objects":[{"StartTime":16195.0,"Position":130.0,"HyperDash":false},{"StartTime":16264.0,"Position":176.33783,"HyperDash":false},{"StartTime":16370.0,"Position":203.709747,"HyperDash":false}]},{"StartTime":16546.0,"Objects":[{"StartTime":16546.0,"Position":287.0,"HyperDash":false}]},{"StartTime":16722.0,"Objects":[{"StartTime":16722.0,"Position":402.0,"HyperDash":false},{"StartTime":16791.0,"Position":440.382324,"HyperDash":false},{"StartTime":16897.0,"Position":476.5204,"HyperDash":false}]},{"StartTime":17073.0,"Objects":[{"StartTime":17073.0,"Position":326.0,"HyperDash":false},{"StartTime":17142.0,"Position":279.617676,"HyperDash":false},{"StartTime":17248.0,"Position":251.479614,"HyperDash":false}]},{"StartTime":17423.0,"Objects":[{"StartTime":17423.0,"Position":125.0,"HyperDash":false},{"StartTime":17492.0,"Position":122.322762,"HyperDash":false},{"StartTime":17598.0,"Position":119.049225,"HyperDash":false}]},{"StartTime":17774.0,"Objects":[{"StartTime":17774.0,"Position":125.0,"HyperDash":false}]},{"StartTime":17862.0,"Objects":[{"StartTime":17862.0,"Position":125.0,"HyperDash":false}]},{"StartTime":17950.0,"Objects":[{"StartTime":17950.0,"Position":125.0,"HyperDash":false},{"StartTime":18019.0,"Position":142.158081,"HyperDash":false},{"StartTime":18125.0,"Position":198.3747,"HyperDash":false}]},{"StartTime":18301.0,"Objects":[{"StartTime":18301.0,"Position":245.0,"HyperDash":false},{"StartTime":18388.0,"Position":193.484589,"HyperDash":false},{"StartTime":18476.0,"Position":170.83812,"HyperDash":false},{"StartTime":18545.0,"Position":133.486023,"HyperDash":false},{"StartTime":18651.0,"Position":97.91507,"HyperDash":false}]},{"StartTime":18827.0,"Objects":[{"StartTime":18827.0,"Position":15.0,"HyperDash":false}]},{"StartTime":18915.0,"Objects":[{"StartTime":18915.0,"Position":15.0,"HyperDash":false}]},{"StartTime":19002.0,"Objects":[{"StartTime":19002.0,"Position":15.0,"HyperDash":false},{"StartTime":19071.0,"Position":21.7103615,"HyperDash":false},{"StartTime":19177.0,"Position":4.26349068,"HyperDash":false}]},{"StartTime":19353.0,"Objects":[{"StartTime":19353.0,"Position":0.0,"HyperDash":false}]},{"StartTime":19529.0,"Objects":[{"StartTime":19529.0,"Position":137.0,"HyperDash":false},{"StartTime":19598.0,"Position":169.483047,"HyperDash":false},{"StartTime":19704.0,"Position":210.398544,"HyperDash":false}]},{"StartTime":19880.0,"Objects":[{"StartTime":19880.0,"Position":328.0,"HyperDash":false},{"StartTime":19949.0,"Position":319.217133,"HyperDash":false},{"StartTime":20055.0,"Position":318.546051,"HyperDash":false}]},{"StartTime":20230.0,"Objects":[{"StartTime":20230.0,"Position":264.0,"HyperDash":false}]},{"StartTime":20318.0,"Objects":[{"StartTime":20318.0,"Position":264.0,"HyperDash":false}]},{"StartTime":20406.0,"Objects":[{"StartTime":20406.0,"Position":264.0,"HyperDash":false},{"StartTime":20493.0,"Position":295.147522,"HyperDash":false},{"StartTime":20581.0,"Position":330.866455,"HyperDash":false},{"StartTime":20650.0,"Position":359.710419,"HyperDash":false},{"StartTime":20756.0,"Position":396.14447,"HyperDash":false}]},{"StartTime":21108.0,"Objects":[{"StartTime":21108.0,"Position":412.0,"HyperDash":false},{"StartTime":21195.0,"Position":395.0836,"HyperDash":false},{"StartTime":21283.0,"Position":414.179626,"HyperDash":false},{"StartTime":21370.0,"Position":423.2632,"HyperDash":false},{"StartTime":21458.0,"Position":416.359283,"HyperDash":false},{"StartTime":21528.0,"Position":397.23114,"HyperDash":false},{"StartTime":21634.0,"Position":418.551361,"HyperDash":false}]},{"StartTime":21809.0,"Objects":[{"StartTime":21809.0,"Position":496.0,"HyperDash":false},{"StartTime":21896.0,"Position":491.214264,"HyperDash":false},{"StartTime":21984.0,"Position":496.431,"HyperDash":false},{"StartTime":22053.0,"Position":504.600922,"HyperDash":false},{"StartTime":22159.0,"Position":496.862,"HyperDash":false}]},{"StartTime":22336.0,"Objects":[{"StartTime":22336.0,"Position":499.0,"HyperDash":false}]},{"StartTime":22511.0,"Objects":[{"StartTime":22511.0,"Position":379.0,"HyperDash":false},{"StartTime":22598.0,"Position":360.8092,"HyperDash":false},{"StartTime":22686.0,"Position":345.0908,"HyperDash":false},{"StartTime":22773.0,"Position":309.7649,"HyperDash":false},{"StartTime":22861.0,"Position":307.9739,"HyperDash":false},{"StartTime":22931.0,"Position":312.241852,"HyperDash":false},{"StartTime":23037.0,"Position":271.985718,"HyperDash":false}]},{"StartTime":23213.0,"Objects":[{"StartTime":23213.0,"Position":322.0,"HyperDash":false},{"StartTime":23300.0,"Position":336.858,"HyperDash":false},{"StartTime":23388.0,"Position":327.7828,"HyperDash":false},{"StartTime":23457.0,"Position":329.661743,"HyperDash":false},{"StartTime":23563.0,"Position":317.734131,"HyperDash":false}]},{"StartTime":23739.0,"Objects":[{"StartTime":23739.0,"Position":240.0,"HyperDash":false}]},{"StartTime":23915.0,"Objects":[{"StartTime":23915.0,"Position":345.0,"HyperDash":false},{"StartTime":23984.0,"Position":381.55426,"HyperDash":false},{"StartTime":24090.0,"Position":419.956451,"HyperDash":false}]},{"StartTime":24266.0,"Objects":[{"StartTime":24266.0,"Position":283.0,"HyperDash":false}]},{"StartTime":24441.0,"Objects":[{"StartTime":24441.0,"Position":111.0,"HyperDash":false},{"StartTime":24510.0,"Position":97.44574,"HyperDash":false},{"StartTime":24616.0,"Position":36.04355,"HyperDash":false}]},{"StartTime":24792.0,"Objects":[{"StartTime":24792.0,"Position":173.0,"HyperDash":false}]},{"StartTime":24967.0,"Objects":[{"StartTime":24967.0,"Position":263.0,"HyperDash":false}]},{"StartTime":25055.0,"Objects":[{"StartTime":25055.0,"Position":280.0,"HyperDash":false}]},{"StartTime":25143.0,"Objects":[{"StartTime":25143.0,"Position":297.0,"HyperDash":false}]},{"StartTime":25230.0,"Objects":[{"StartTime":25230.0,"Position":314.0,"HyperDash":false}]},{"StartTime":25318.0,"Objects":[{"StartTime":25318.0,"Position":337.0,"HyperDash":false},{"StartTime":25376.0,"Position":334.666473,"HyperDash":false},{"StartTime":25434.0,"Position":337.0,"HyperDash":false},{"StartTime":25493.0,"Position":334.666473,"HyperDash":false},{"StartTime":25551.0,"Position":337.0,"HyperDash":false},{"StartTime":25610.0,"Position":334.666473,"HyperDash":false},{"StartTime":25668.0,"Position":337.0,"HyperDash":false}]},{"StartTime":25844.0,"Objects":[{"StartTime":25844.0,"Position":447.0,"HyperDash":false}]},{"StartTime":26020.0,"Objects":[{"StartTime":26020.0,"Position":436.0,"HyperDash":false}]},{"StartTime":26195.0,"Objects":[{"StartTime":26195.0,"Position":297.0,"HyperDash":false}]},{"StartTime":26546.0,"Objects":[{"StartTime":26546.0,"Position":297.0,"HyperDash":false},{"StartTime":26633.0,"Position":249.353119,"HyperDash":false},{"StartTime":26721.0,"Position":227.527557,"HyperDash":false},{"StartTime":26790.0,"Position":188.1133,"HyperDash":false},{"StartTime":26896.0,"Position":156.074387,"HyperDash":false}]},{"StartTime":27072.0,"Objects":[{"StartTime":27072.0,"Position":51.0,"HyperDash":false}]},{"StartTime":27247.0,"Objects":[{"StartTime":27247.0,"Position":185.0,"HyperDash":false},{"StartTime":27316.0,"Position":218.59346,"HyperDash":false},{"StartTime":27422.0,"Position":258.538177,"HyperDash":false}]},{"StartTime":27598.0,"Objects":[{"StartTime":27598.0,"Position":436.0,"HyperDash":false},{"StartTime":27667.0,"Position":416.406555,"HyperDash":false},{"StartTime":27773.0,"Position":362.461823,"HyperDash":false}]},{"StartTime":27949.0,"Objects":[{"StartTime":27949.0,"Position":151.0,"HyperDash":false},{"StartTime":28036.0,"Position":189.972488,"HyperDash":false},{"StartTime":28124.0,"Position":223.203812,"HyperDash":false},{"StartTime":28193.0,"Position":242.7229,"HyperDash":false},{"StartTime":28299.0,"Position":296.7707,"HyperDash":false}]},{"StartTime":28475.0,"Objects":[{"StartTime":28475.0,"Position":223.0,"HyperDash":false}]},{"StartTime":28651.0,"Objects":[{"StartTime":28651.0,"Position":296.0,"HyperDash":false},{"StartTime":28738.0,"Position":337.803925,"HyperDash":false},{"StartTime":28826.0,"Position":368.138336,"HyperDash":false},{"StartTime":28895.0,"Position":404.540863,"HyperDash":false},{"StartTime":29001.0,"Position":440.327179,"HyperDash":false}]},{"StartTime":29177.0,"Objects":[{"StartTime":29177.0,"Position":486.0,"HyperDash":false}]},{"StartTime":29353.0,"Objects":[{"StartTime":29353.0,"Position":366.0,"HyperDash":false},{"StartTime":29422.0,"Position":350.499329,"HyperDash":false},{"StartTime":29528.0,"Position":293.446533,"HyperDash":false}]},{"StartTime":29703.0,"Objects":[{"StartTime":29703.0,"Position":169.0,"HyperDash":false}]},{"StartTime":29879.0,"Objects":[{"StartTime":29879.0,"Position":245.0,"HyperDash":false}]},{"StartTime":30054.0,"Objects":[{"StartTime":30054.0,"Position":126.0,"HyperDash":false},{"StartTime":30123.0,"Position":155.500671,"HyperDash":false},{"StartTime":30229.0,"Position":198.553482,"HyperDash":false}]},{"StartTime":30404.0,"Objects":[{"StartTime":30404.0,"Position":323.0,"HyperDash":false}]},{"StartTime":30580.0,"Objects":[{"StartTime":30580.0,"Position":247.0,"HyperDash":false}]},{"StartTime":30756.0,"Objects":[{"StartTime":30756.0,"Position":349.0,"HyperDash":false},{"StartTime":30843.0,"Position":365.629761,"HyperDash":false},{"StartTime":30931.0,"Position":422.0551,"HyperDash":false},{"StartTime":31000.0,"Position":454.551147,"HyperDash":false},{"StartTime":31106.0,"Position":495.5697,"HyperDash":false}]},{"StartTime":31282.0,"Objects":[{"StartTime":31282.0,"Position":423.0,"HyperDash":false}]},{"StartTime":31458.0,"Objects":[{"StartTime":31458.0,"Position":323.0,"HyperDash":false},{"StartTime":31545.0,"Position":295.370239,"HyperDash":false},{"StartTime":31633.0,"Position":249.944885,"HyperDash":false},{"StartTime":31702.0,"Position":223.448853,"HyperDash":false},{"StartTime":31808.0,"Position":176.4303,"HyperDash":false}]},{"StartTime":31984.0,"Objects":[{"StartTime":31984.0,"Position":247.0,"HyperDash":false}]},{"StartTime":32160.0,"Objects":[{"StartTime":32160.0,"Position":99.0,"HyperDash":false},{"StartTime":32247.0,"Position":84.41518,"HyperDash":false},{"StartTime":32335.0,"Position":83.6537247,"HyperDash":false},{"StartTime":32404.0,"Position":71.69304,"HyperDash":false},{"StartTime":32510.0,"Position":108.235535,"HyperDash":false}]},{"StartTime":32686.0,"Objects":[{"StartTime":32686.0,"Position":164.0,"HyperDash":false}]},{"StartTime":32861.0,"Objects":[{"StartTime":32861.0,"Position":323.0,"HyperDash":false},{"StartTime":32930.0,"Position":362.799,"HyperDash":false},{"StartTime":33036.0,"Position":396.638153,"HyperDash":false}]},{"StartTime":33212.0,"Objects":[{"StartTime":33212.0,"Position":164.0,"HyperDash":false},{"StartTime":33281.0,"Position":116.200989,"HyperDash":false},{"StartTime":33387.0,"Position":90.36186,"HyperDash":false}]},{"StartTime":33563.0,"Objects":[{"StartTime":33563.0,"Position":323.0,"HyperDash":false},{"StartTime":33632.0,"Position":336.507568,"HyperDash":false},{"StartTime":33738.0,"Position":323.911469,"HyperDash":true}]},{"StartTime":33914.0,"Objects":[{"StartTime":33914.0,"Position":78.0,"HyperDash":false},{"StartTime":33983.0,"Position":82.492424,"HyperDash":false},{"StartTime":34089.0,"Position":77.08854,"HyperDash":false}]},{"StartTime":34265.0,"Objects":[{"StartTime":34265.0,"Position":234.0,"HyperDash":false},{"StartTime":34352.0,"Position":191.5233,"HyperDash":false},{"StartTime":34440.0,"Position":164.09671,"HyperDash":false},{"StartTime":34509.0,"Position":134.647873,"HyperDash":false},{"StartTime":34615.0,"Position":89.6628342,"HyperDash":false}]},{"StartTime":34791.0,"Objects":[{"StartTime":34791.0,"Position":148.0,"HyperDash":false}]},{"StartTime":34967.0,"Objects":[{"StartTime":34967.0,"Position":175.0,"HyperDash":false},{"StartTime":35054.0,"Position":199.913467,"HyperDash":false},{"StartTime":35142.0,"Position":201.876785,"HyperDash":false},{"StartTime":35211.0,"Position":207.491714,"HyperDash":false},{"StartTime":35317.0,"Position":181.816238,"HyperDash":false}]},{"StartTime":35493.0,"Objects":[{"StartTime":35493.0,"Position":94.0,"HyperDash":false}]},{"StartTime":35668.0,"Objects":[{"StartTime":35668.0,"Position":95.0,"HyperDash":false},{"StartTime":35755.0,"Position":137.9405,"HyperDash":false},{"StartTime":35843.0,"Position":163.627121,"HyperDash":false},{"StartTime":35912.0,"Position":197.017715,"HyperDash":false},{"StartTime":36018.0,"Position":234.539215,"HyperDash":false}]},{"StartTime":36195.0,"Objects":[{"StartTime":36195.0,"Position":319.0,"HyperDash":false}]},{"StartTime":36370.0,"Objects":[{"StartTime":36370.0,"Position":251.0,"HyperDash":false},{"StartTime":36457.0,"Position":231.0595,"HyperDash":false},{"StartTime":36545.0,"Position":182.372879,"HyperDash":false},{"StartTime":36614.0,"Position":153.982285,"HyperDash":false},{"StartTime":36720.0,"Position":111.460777,"HyperDash":false}]},{"StartTime":36896.0,"Objects":[{"StartTime":36896.0,"Position":175.0,"HyperDash":false}]},{"StartTime":37072.0,"Objects":[{"StartTime":37072.0,"Position":229.0,"HyperDash":false}]},{"StartTime":37160.0,"Objects":[{"StartTime":37160.0,"Position":245.0,"HyperDash":false}]},{"StartTime":37247.0,"Objects":[{"StartTime":37247.0,"Position":261.0,"HyperDash":false}]},{"StartTime":37335.0,"Objects":[{"StartTime":37335.0,"Position":277.0,"HyperDash":false}]},{"StartTime":37423.0,"Objects":[{"StartTime":37423.0,"Position":292.0,"HyperDash":false},{"StartTime":37492.0,"Position":308.471649,"HyperDash":false},{"StartTime":37598.0,"Position":366.746948,"HyperDash":false}]},{"StartTime":37774.0,"Objects":[{"StartTime":37774.0,"Position":491.0,"HyperDash":false}]},{"StartTime":38124.0,"Objects":[{"StartTime":38124.0,"Position":491.0,"HyperDash":false}]},{"StartTime":38300.0,"Objects":[{"StartTime":38300.0,"Position":422.0,"HyperDash":false}]},{"StartTime":38475.0,"Objects":[{"StartTime":38475.0,"Position":388.0,"HyperDash":false}]},{"StartTime":38826.0,"Objects":[{"StartTime":38826.0,"Position":388.0,"HyperDash":false}]},{"StartTime":39002.0,"Objects":[{"StartTime":39002.0,"Position":270.0,"HyperDash":false}]},{"StartTime":39177.0,"Objects":[{"StartTime":39177.0,"Position":305.0,"HyperDash":false},{"StartTime":39264.0,"Position":31.0,"HyperDash":false},{"StartTime":39352.0,"Position":421.0,"HyperDash":false},{"StartTime":39440.0,"Position":145.0,"HyperDash":false},{"StartTime":39528.0,"Position":318.0,"HyperDash":false},{"StartTime":39615.0,"Position":249.0,"HyperDash":false},{"StartTime":39703.0,"Position":147.0,"HyperDash":false},{"StartTime":39791.0,"Position":302.0,"HyperDash":false},{"StartTime":39879.0,"Position":212.0,"HyperDash":false},{"StartTime":39966.0,"Position":427.0,"HyperDash":false},{"StartTime":40054.0,"Position":116.0,"HyperDash":false},{"StartTime":40142.0,"Position":508.0,"HyperDash":false},{"StartTime":40230.0,"Position":417.0,"HyperDash":false},{"StartTime":40317.0,"Position":302.0,"HyperDash":false},{"StartTime":40405.0,"Position":132.0,"HyperDash":false},{"StartTime":40493.0,"Position":352.0,"HyperDash":false},{"StartTime":40581.0,"Position":174.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/871815.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/871815.osu
new file mode 100644
index 0000000000..668c12fc0c
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/871815.osu
@@ -0,0 +1,165 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.3
+Mode: 0
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4
+OverallDifficulty:6
+ApproachRate:8.3
+SliderMultiplier:1.5
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+
+[TimingPoints]
+1459,350.877192982456,4,2,1,45,1,0
+21108,-200,4,2,1,45,0,0
+23915,-100,4,2,1,45,0,0
+26546,350.877192982456,4,2,1,65,1,1
+40581,-100,4,2,1,45,0,0
+
+[HitObjects]
+150,114,1459,5,2,0:0:0:0:
+150,114,1809,2,0,L|276:109,1,112.5,2|0,0:0|0:0,0:0:0:0:
+281,109,2160,2,0,P|289:151|282:193,1,75,0|0,0:0|0:0,0:0:0:0:
+272,298,2511,1,0,0:0:0:0:
+367,70,2687,6,0,P|384:125|366:226,1,150,2|0,0:0|0:0,0:0:0:0:
+278,289,3213,1,0,0:0:0:0:
+113,221,3388,1,0,1:0:0:0:
+116,235,3476,1,0,1:0:0:0:
+121,248,3564,2,0,L|122:274,8,18.75,0|0|0|0|2|0|0|0|2,1:0|0:0|0:0|0:0|0:0|0:0|0:0|0:0|1:0,0:0:0:0:
+368,70,4266,6,0,P|412:37|501:60,1,150,4|8,1:0|1:0,0:0:0:0:
+440,119,4792,1,0,0:0:0:0:
+289,84,4967,2,0,P|250:95|210:87,1,75,0|0,0:0|1:0,0:0:0:0:
+105,24,5318,1,0,1:0:0:0:
+119,191,5494,6,0,P|98:235|145:332,1,150,4|0,1:0|1:0,0:0:0:0:
+192,253,6020,1,0,1:0:0:0:
+451,314,6195,2,0,P|393:272|315:306,1,150,4|0,1:0|0:0,0:0:0:0:
+380,360,6722,1,0,1:0:0:0:
+334,189,6897,1,2,0:0:0:0:
+334,189,6985,1,0,0:0:0:0:
+334,189,7073,6,0,P|348:132|320:35,1,150,4|0,1:0|1:0,0:0:0:0:
+281,256,7599,1,0,0:0:0:0:
+140,171,7774,1,0,0:0:0:0:
+274,290,7950,1,2,0:0:0:0:
+138,135,8125,1,0,1:0:0:0:
+266,321,8301,6,0,L|416:315,1,150,0|0,1:0|0:0,0:0:0:0:
+512,307,8827,1,0,1:0:0:0:
+490,150,9002,2,0,P|435:96|347:109,1,150,2|2,0:0|0:0,0:0:0:0:
+260,59,9529,2,0,P|255:102|268:147,1,75,8|0,1:0|1:0,0:0:0:0:
+267,164,9792,1,0,0:0:0:0:
+267,164,9880,6,0,P|217:197|121:182,1,150,4|0,1:0|1:0,0:0:0:0:
+185,106,10406,1,0,0:0:0:0:
+177,283,10581,2,0,P|219:284|260:266,1,75,0|0,1:0|0:0,0:0:0:0:
+352,225,10932,1,0,1:0:0:0:
+436,132,11108,6,0,L|525:149,1,75,2|0,1:2|0:0,0:0:0:0:
+368,30,11458,2,0,L|279:47,1,75,2|0,0:2|1:0,0:0:0:0:
+181,124,11809,2,0,P|175:162|190:205,1,75,2|0,0:0|1:0,0:0:0:0:
+221,325,12160,1,0,0:0:0:0:
+221,325,12248,1,0,0:0:0:0:
+221,325,12336,2,0,P|257:330|294:318,1,75,0|0,1:0|0:0,0:0:0:0:
+440,318,12687,6,0,P|378:306|272:327,1,150,2|0,1:2|1:0,0:0:0:0:
+330,209,13213,1,0,0:0:0:0:
+330,209,13301,1,0,0:0:0:0:
+330,209,13388,2,0,P|388:209|417:204,1,75,0|0,0:0|0:0,0:0:0:0:
+494,149,13739,1,0,1:0:0:0:
+321,99,13915,1,2,1:2:0:0:
+321,99,14002,1,0,0:0:0:0:
+321,99,14090,6,0,P|364:87|392:73,1,75,0|0,0:0|0:0,0:0:0:0:
+231,160,14441,1,0,1:0:0:0:
+188,259,14616,2,0,P|177:302|177:335,2,75,2|0|0,1:2|0:0|0:0,0:0:0:0:
+125,87,15143,6,0,B|99:97|70:83|70:83|73:86|73:86|35:72|7:97,1,112.5,8|0,1:0|0:0,0:0:0:0:
+17,99,15494,6,0,L|21:185,1,75,4|0,1:0|0:0,0:0:0:0:
+29,282,15844,1,0,1:0:0:0:
+130,334,16020,1,0,0:0:0:0:
+130,334,16108,1,0,0:0:0:0:
+130,334,16195,2,0,P|165:337|208:327,1,75,0|0,1:0|0:0,0:0:0:0:
+287,251,16546,1,0,1:0:0:0:
+402,165,16722,6,0,L|490:155,1,75,2|0,1:2|0:0,0:0:0:0:
+326,67,17073,2,0,L|238:57,1,75,2|0,0:2|1:0,0:0:0:0:
+125,41,17423,2,0,P|116:84|124:131,1,75,2|0,0:0|1:0,0:0:0:0:
+125,238,17774,1,2,0:0:0:0:
+125,238,17862,1,0,0:0:0:0:
+125,238,17950,2,0,P|165:242|204:231,1,75,0|0,1:0|0:0,0:0:0:0:
+245,344,18301,6,0,P|162:336|85:357,1,150,2|0,1:2|1:0,0:0:0:0:
+15,271,18827,1,0,0:0:0:0:
+15,271,18915,1,0,0:0:0:0:
+15,271,19002,2,0,P|3:222|7:184,1,75,0|2,0:0|0:0,0:0:0:0:
+0,85,19353,1,0,1:0:0:0:
+137,68,19529,6,0,P|170:69|214:57,1,75,4|0,1:2|1:0,0:0:0:0:
+328,191,19880,2,0,P|329:158|317:114,1,75,0|2,0:0|1:0,0:0:0:0:
+264,261,20230,1,0,1:0:0:0:
+264,261,20318,1,0,0:0:0:0:
+264,261,20406,2,0,P|318:289|401:251,1,150,0|8,0:0|1:0,0:0:0:0:
+412,245,21108,6,0,L|419:365,1,112.5,4|0,1:0|0:0,0:0:0:0:
+496,259,21809,2,0,L|497:172,1,75,0|0,1:0|0:0,0:0:0:0:
+499,82,22336,1,0,0:0:0:0:
+379,42,22511,6,0,P|338:25|265:38,1,112.5,2|2,0:0|0:0,0:0:0:0:
+322,179,23213,2,0,P|328:145|318:107,1,75,0|0,0:0|0:0,0:0:0:0:
+240,150,23739,1,0,0:0:0:0:
+345,271,23915,6,0,L|433:274,1,75,4|0,1:0|0:0,0:0:0:0:
+283,331,24266,1,0,0:0:0:0:
+111,275,24441,6,0,L|23:272,1,75,4|0,1:0|0:0,0:0:0:0:
+173,215,24792,1,0,0:0:0:0:
+263,127,24967,5,0,1:0:0:0:
+280,119,25055,1,0,0:0:0:0:
+297,112,25143,1,0,1:0:0:0:
+314,105,25230,1,0,0:0:0:0:
+337,95,25318,6,0,L|334:127,6,25,0|0|0|0|0|0|0,1:0|0:0|0:0|1:0|0:0|0:0|1:0,0:0:0:0:
+447,46,25844,1,0,1:0:0:0:
+436,197,26020,1,0,0:0:0:0:
+297,263,26195,1,2,1:0:0:0:
+297,263,26546,6,0,P|230:288|143:260,1,150,4|0,1:0|0:0,0:0:0:0:
+51,182,27072,1,2,1:0:0:0:
+185,111,27247,2,0,P|224:103|271:112,1,75,0|0,0:0|0:0,0:0:0:0:
+436,197,27598,2,0,P|397:205|350:196,1,75,0|2,0:0|1:0,0:0:0:0:
+151,269,27949,6,0,P|208:252|320:273,1,150,0|0,1:0|0:0,0:0:0:0:
+223,342,28475,1,0,0:0:0:0:
+296,262,28651,2,0,P|353:279|456:253,1,150,0|0,1:0|0:0,0:0:0:0:
+486,133,29177,1,2,1:0:0:0:
+366,52,29353,6,0,P|324:39|288:42,1,75,2|0,0:0|0:0,0:0:0:0:
+169,61,29703,1,0,0:0:0:0:
+245,149,29879,1,2,1:0:0:0:
+126,258,30054,6,0,P|168:271|204:268,1,75,2|0,0:0|0:0,0:0:0:0:
+323,249,30404,1,0,0:0:0:0:
+247,161,30580,1,0,0:0:0:0:
+349,54,30756,6,0,P|397:41|502:54,1,150,2|0,0:0|0:0,0:0:0:0:
+423,138,31282,1,0,1:0:0:0:
+323,249,31458,2,0,P|275:262|170:249,1,150,0|0,1:0|0:0,0:0:0:0:
+247,161,31984,1,2,1:0:0:0:
+99,42,32160,6,0,P|85:127|121:200,1,150,4|0,1:0|0:0,0:0:0:0:
+164,309,32686,1,2,1:0:0:0:
+323,249,32861,2,0,P|376:243|401:249,1,75,0|0,0:0|0:0,0:0:0:0:
+164,309,33212,2,0,P|111:315|86:309,1,75,0|2,0:0|1:0,0:0:0:0:
+323,249,33563,6,0,P|330:211|316:158,1,75,0|0,1:0|0:0,0:0:0:0:
+78,57,33914,2,0,P|71:95|85:148,1,75,0|0,0:0|0:0,0:0:0:0:
+234,300,34265,2,0,P|174:276|80:280,1,150,0|0,1:0|0:0,0:0:0:0:
+148,364,34791,1,2,1:0:0:0:
+175,186,34967,6,0,P|199:138|172:34,1,150,4|0,1:0|0:0,0:0:0:0:
+94,115,35493,1,2,1:0:0:0:
+95,260,35668,2,0,P|143:284|247:257,1,150,4|0,1:0|0:0,0:0:0:0:
+319,199,36195,1,0,0:0:0:0:
+251,89,36370,6,0,P|203:65|99:92,1,150,0|0,1:0|0:0,0:0:0:0:
+175,186,36896,1,0,0:0:0:0:
+229,329,37072,1,0,1:0:0:0:
+245,337,37160,1,0,1:0:0:0:
+261,345,37247,1,0,1:0:0:0:
+277,353,37335,1,0,0:0:0:0:
+292,361,37423,2,0,L|377:368,1,75,0|0,1:0|1:0,0:0:0:0:
+491,315,37774,5,4,1:0:0:0:
+491,315,38124,1,0,1:0:0:0:
+422,209,38300,1,0,1:0:0:0:
+388,68,38475,1,4,1:0:0:0:
+388,68,38826,1,0,1:0:0:0:
+270,153,39002,1,0,1:0:0:0:
+256,192,39177,12,4,40581,1:0:0:0:
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/basic-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/basic-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/basic-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/basic-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/basic-hyperdash-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/basic-hyperdash-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/basic-hyperdash-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/basic-hyperdash-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/basic-hyperdash.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/basic-hyperdash.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/basic-hyperdash.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/basic-hyperdash.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/basic.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/basic.osu
similarity index 96%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/basic.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/basic.osu
index 40b4409760..abd2ff2ee6 100644
--- a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/basic.osu
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/basic.osu
@@ -1,27 +1,27 @@
-osu file format v14
-
-[Difficulty]
-HPDrainRate:6
-CircleSize:4
-OverallDifficulty:7
-ApproachRate:8.3
-SliderMultiplier:1.6
-SliderTickRate:1
-
-[TimingPoints]
-500,500,4,2,1,50,1,0
-13426,-100,4,3,1,45,0,0
-14884,-100,4,2,1,50,0,0
-
-[HitObjects]
-96,192,500,6,0,L|416:192,2,320
-256,192,3000,12,0,4000,0:0:0:0:
-256,192,4500,12,0,5500,0:0:0:0:
-256,192,6000,12,0,6500,0:0:0:0:
-256,128,7000,6,0,L|352:128,4,80
-32,192,8500,6,0,B|32:384|256:384|256:192|256:192|256:0|512:0|512:192,1,800
-256,192,11500,12,0,12000,0:0:0:0:
-512,320,12500,6,0,B|0:256|0:256|512:96|512:96|256:32,1,1280
-256,256,17000,6,0,L|160:256,4,80
-256,192,18500,12,0,19450,0:0:0:0:
-216,231,19875,6,0,B|216:135|280:135|344:135|344:199|344:263|248:327|248:327|120:327|120:327|56:39|408:39|408:39|472:150|408:342,1,1280
+osu file format v14
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4
+OverallDifficulty:7
+ApproachRate:8.3
+SliderMultiplier:1.6
+SliderTickRate:1
+
+[TimingPoints]
+500,500,4,2,1,50,1,0
+13426,-100,4,3,1,45,0,0
+14884,-100,4,2,1,50,0,0
+
+[HitObjects]
+96,192,500,6,0,L|416:192,2,320
+256,192,3000,12,0,4000,0:0:0:0:
+256,192,4500,12,0,5500,0:0:0:0:
+256,192,6000,12,0,6500,0:0:0:0:
+256,128,7000,6,0,L|352:128,4,80
+32,192,8500,6,0,B|32:384|256:384|256:192|256:192|256:0|512:0|512:192,1,800
+256,192,11500,12,0,12000,0:0:0:0:
+512,320,12500,6,0,B|0:256|0:256|512:96|512:96|256:32,1,1280
+256,256,17000,6,0,L|160:256,4,80
+256,192,18500,12,0,19450,0:0:0:0:
+216,231,19875,6,0,B|216:135|280:135|344:135|344:199|344:263|248:327|248:327|120:327|120:327|56:39|408:39|408:39|472:150|408:342,1,1280
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/diffcalc-test.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/diffcalc-test.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/diffcalc-test.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/diffcalc-test.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-repeat-slider-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-repeat-slider-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-repeat-slider-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-repeat-slider-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-repeat-slider.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-repeat-slider.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-repeat-slider.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-repeat-slider.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-spinner-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-spinner-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-spinner-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-spinner-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-spinner.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-spinner.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-spinner.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-spinner.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-stream-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-stream-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-stream-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-stream-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-stream.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-stream.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/hardrock-stream.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/hardrock-stream.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/pixel-jump-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/pixel-jump-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/pixel-jump.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/pixel-jump.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/pixel-jump.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/right-bound-hr-offset-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/right-bound-hr-offset-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/right-bound-hr-offset.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/right-bound-hr-offset.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/right-bound-hr-offset.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/slider-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/slider-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/slider-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/slider-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/slider.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/slider.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/slider.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/slider.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-and-circles-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner-and-circles-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-and-circles-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner-and-circles-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-and-circles.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner-and-circles.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-and-circles.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner-and-circles.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner-precision-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner-precision-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner-precision.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner-precision.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner-precision.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/spinner.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/spinner.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/tiny-ticks-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/tiny-ticks-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/tiny-ticks.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/tiny-ticks.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/tiny-ticks.osu
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/v8-tick-distance-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance-expected-conversion.json
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/v8-tick-distance-expected-conversion.json
diff --git a/osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/v8-tick-distance.osu
similarity index 100%
rename from osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/v8-tick-distance.osu
rename to osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/v8-tick-distance.osu

From 40ff95d586aa0e45079e6aff38fb99a5a3e9b0f2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 6 Dec 2023 12:19:12 +0900
Subject: [PATCH 1869/2296] Fix diffcalc tests

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

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
index 880316f177..6a70173c4a 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 {
     public class CatchDifficultyCalculatorTest : DifficultyCalculatorTest
     {
-        protected override string ResourceAssembly => "osu.Game.Rulesets.Catch";
+        protected override string ResourceAssembly => "osu.Game.Rulesets.Catch.Tests";
 
         [TestCase(4.0505463516206195d, 127, "diffcalc-test")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)

From 0af16732b81a39ba6347bb6c036fe6a5b5a71800 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 13:38:46 +0900
Subject: [PATCH 1870/2296] Change default slider velocity to 1.4

This is the default in osu!stable and plays better than 1.0.
---
 osu.Game/Beatmaps/BeatmapDifficulty.cs           | 2 +-
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficulty.cs b/osu.Game/Beatmaps/BeatmapDifficulty.cs
index 217f3b89a4..ac2267380d 100644
--- a/osu.Game/Beatmaps/BeatmapDifficulty.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficulty.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Beatmaps
         public float OverallDifficulty { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
         public float ApproachRate { get; set; } = IBeatmapDifficultyInfo.DEFAULT_DIFFICULTY;
 
-        public double SliderMultiplier { get; set; } = 1;
+        public double SliderMultiplier { get; set; } = 1.4;
         public double SliderTickRate { get; set; } = 1;
 
         public BeatmapDifficulty()
diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 1915b0cfd1..8028df6c0f 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Screens.Edit.Setup
                     Description = EditorSetupStrings.BaseVelocityDescription,
                     Current = new BindableDouble(Beatmap.Difficulty.SliderMultiplier)
                     {
-                        Default = 1,
+                        Default = 1.4,
                         MinValue = 0.4,
                         MaxValue = 3.6,
                         Precision = 0.01f,

From f9dd5bd828fc6f2df9677141649da5733eade565 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 13:39:59 +0900
Subject: [PATCH 1871/2296] Remove unused constant

---
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 2551321ff2..b9d65d2631 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -31,11 +31,6 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
         /// </summary>
         private const float osu_base_scoring_distance = 100;
 
-        /// <summary>
-        /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
-        /// </summary>
-        private const float taiko_base_distance = 100;
-
         private readonly bool isForCurrentRuleset;
 
         public TaikoBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)

From 79826dee58b62c72f19352a03bd3da4db829f725 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 13:50:10 +0900
Subject: [PATCH 1872/2296] Fix tests which were relying on
 `SliderMultiplier==1`

---
 osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs  |  6 +++++-
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs  |  6 +++++-
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs    | 12 +++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 3c222662f5..8c179fe9a9 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -63,7 +63,11 @@ namespace osu.Game.Rulesets.Catch.Tests
                 BeatmapInfo =
                 {
                     Ruleset = ruleset,
-                    Difficulty = new BeatmapDifficulty { CircleSize = 3.6f }
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        CircleSize = 3.6f,
+                        SliderMultiplier = 1,
+                    },
                 }
             };
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index d6a030ba64..716d2e0756 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -507,7 +507,11 @@ namespace osu.Game.Rulesets.Osu.Tests
                     HitObjects = { slider },
                     BeatmapInfo =
                     {
-                        Difficulty = new BeatmapDifficulty { SliderTickRate = tickRate ?? 3 },
+                        Difficulty = new BeatmapDifficulty
+                        {
+                            SliderTickRate = tickRate ?? 3,
+                            SliderMultiplier = 1,
+                        },
                         Ruleset = new OsuRuleset().RulesetInfo,
                     },
                     ControlPointInfo = cpi,
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 4c898feb48..697fb787e6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -251,7 +251,17 @@ namespace osu.Game.Tests.Visual.Gameplay
         /// <returns>The <see cref="IBeatmap"/>.</returns>
         private IBeatmap createBeatmap(Func<int, TestHitObject> createAction = null)
         {
-            var beatmap = new Beatmap<TestHitObject> { BeatmapInfo = { Ruleset = new OsuRuleset().RulesetInfo } };
+            var beatmap = new Beatmap<TestHitObject>
+            {
+                BeatmapInfo =
+                {
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        SliderMultiplier = 1
+                    },
+                    Ruleset = new OsuRuleset().RulesetInfo
+                }
+            };
 
             for (int i = 0; i < 10; i++)
             {

From 160edcd2707d64aede30385eb9bf59ef4641fb7b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 6 Dec 2023 07:09:46 +0300
Subject: [PATCH 1873/2296] Move objects at a constant speed whenever possible

---
 osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs | 54 ++++++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
index 16517a2f36..0defebc1c3 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
@@ -27,8 +27,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModMagnetised), typeof(OsuModRepel), typeof(OsuModFreezeFrame), typeof(ModWithVisibilityAdjustment) }).ToArray();
 
-        private static readonly Vector3 camera_position = new Vector3(OsuPlayfield.BASE_SIZE.X * 0.5f, OsuPlayfield.BASE_SIZE.Y * 0.5f, -100);
-        private readonly float minDepth = depthForScale(1.5f);
+        private static readonly Vector3 camera_position = new Vector3(OsuPlayfield.BASE_SIZE.X * 0.5f, OsuPlayfield.BASE_SIZE.Y * 0.5f, -200);
+        private readonly float sliderMinDepth = depthForScale(1.5f); // Depth at which slider's scale will be 1.5f
 
         [SettingSource("Maximum depth", "How far away objects appear.", 0)]
         public BindableFloat MaxDepth { get; } = new BindableFloat(100)
@@ -80,30 +80,60 @@ namespace osu.Game.Rulesets.Osu.Mods
                 switch (drawable)
                 {
                     case DrawableHitCircle circle:
-                        processObject(time, circle, 0);
+                        processHitObject(time, circle);
                         break;
 
                     case DrawableSlider slider:
-                        processObject(time, slider, slider.HitObject.Duration);
+                        processSlider(time, slider);
                         break;
                 }
             }
         }
 
-        private void processObject(double time, DrawableOsuHitObject drawable, double duration)
+        private void processHitObject(double time, DrawableOsuHitObject drawable)
         {
             var hitObject = drawable.HitObject;
 
+            // Circles are always moving at the constant speed. They'll fade out before reaching the camera even at extreme conditions (AR 11, max depth).
+            double speed = MaxDepth.Value / hitObject.TimePreempt;
+            double appearTime = hitObject.StartTime - hitObject.TimePreempt;
+            float z = MaxDepth.Value - (float)((Math.Max(time, appearTime) - appearTime) * speed);
+
+            float scale = scaleForDepth(z);
+            drawable.Position = toPlayfieldPosition(scale, hitObject.Position);
+            drawable.Scale = new Vector2(scale);
+        }
+
+        private void processSlider(double time, DrawableSlider drawableSlider)
+        {
+            var hitObject = drawableSlider.HitObject;
+
             double baseSpeed = MaxDepth.Value / hitObject.TimePreempt;
-            double offsetAfterStartTime = duration + hitObject.MaximumJudgementOffset + 500;
-            double slowSpeed = Math.Min(-minDepth / offsetAfterStartTime, baseSpeed);
+            double appearTime = hitObject.StartTime - hitObject.TimePreempt;
+
+            // Allow slider to move at a constant speed if its scale at the end time will be lower than 1.5f
+            float zEnd = MaxDepth.Value - (float)((Math.Max(hitObject.StartTime + hitObject.Duration, appearTime) - appearTime) * baseSpeed);
+
+            if (zEnd > sliderMinDepth)
+            {
+                processHitObject(time, drawableSlider);
+                return;
+            }
+
+            double offsetAfterStartTime = hitObject.Duration + 500;
+            double slowSpeed = Math.Min(-sliderMinDepth / offsetAfterStartTime, baseSpeed);
 
             double decelerationTime = hitObject.TimePreempt * 0.2;
             float decelerationDistance = (float)(decelerationTime * (baseSpeed + slowSpeed) * 0.5);
 
             float z;
 
-            if (time < hitObject.StartTime)
+            if (time < hitObject.StartTime - decelerationTime)
+            {
+                float fullDistance = decelerationDistance + (float)(baseSpeed * (hitObject.TimePreempt - decelerationTime));
+                z = fullDistance - (float)((Math.Max(time, appearTime) - appearTime) * baseSpeed);
+            }
+            else if (time < hitObject.StartTime)
             {
                 double timeOffset = time - (hitObject.StartTime - decelerationTime);
                 double deceleration = (slowSpeed - baseSpeed) / decelerationTime;
@@ -116,13 +146,13 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
 
             float scale = scaleForDepth(z);
-            drawable.Position = toPlayfieldPosition(scale, hitObject.Position);
-            drawable.Scale = new Vector2(scale);
+            drawableSlider.Position = toPlayfieldPosition(scale, hitObject.Position);
+            drawableSlider.Scale = new Vector2(scale);
         }
 
-        private static float scaleForDepth(float depth) => 100 / (depth - camera_position.Z);
+        private static float scaleForDepth(float depth) => -camera_position.Z / Math.Max(1f, depth - camera_position.Z);
 
-        private static float depthForScale(float scale) => 100 / scale + camera_position.Z;
+        private static float depthForScale(float scale) => -camera_position.Z / scale + camera_position.Z;
 
         private static Vector2 toPlayfieldPosition(float scale, Vector2 positionAtZeroDepth)
         {

From 394ea73055e5a7592daccde911bad0fd04f9093c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 6 Dec 2023 14:50:03 +0900
Subject: [PATCH 1874/2296] Add some comments where truncations were added

---
 osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs | 2 ++
 osu.Game.Rulesets.Catch/Objects/BananaShower.cs           | 1 +
 2 files changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 50e6fd9673..02d4cdbb94 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -247,6 +247,8 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 currentObject.DistanceToHyperDash = 0;
 
                 int thisDirection = nextObject.EffectiveX > currentObject.EffectiveX ? 1 : -1;
+
+                // Int truncation added to match osu!stable.
                 double timeToNext = (int)nextObject.StartTime - (int)currentObject.StartTime - 1000f / 60f / 4; // 1/4th of a frame of grace time, taken from osu-stable
                 double distanceToNext = Math.Abs(nextObject.EffectiveX - currentObject.EffectiveX) - (lastDirection == thisDirection ? lastExcess : halfCatcherWidth);
                 float distanceToHyper = (float)(timeToNext * Catcher.BASE_DASH_SPEED - distanceToNext);
diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index abeb7fe61d..328cc2b52a 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         private void createBananas(CancellationToken cancellationToken)
         {
+            // Int truncation added to match osu!stable.
             int startTime = (int)StartTime;
             int endTime = (int)EndTime;
             float spacing = (float)(EndTime - StartTime);

From 43dc9082571901919914e43cbce34dd3db8ec89c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 15:59:29 +0900
Subject: [PATCH 1875/2296] Fix test value getting clobbered due to stupid
 stuff

Don't even ask. Just smile and nod.
---
 .../Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 697fb787e6..e4d39bb6de 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -198,7 +198,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var beatmap = createBeatmap();
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
-            beatmap.Difficulty.SliderMultiplier = 2;
+            beatmap.BeatmapInfo.Difficulty.SliderMultiplier = 2;
 
             createTest(beatmap);
             AddStep("adjust time range", () => drawableRuleset.TimeRange.Value = 2000);
@@ -237,7 +237,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         });
 
         private void assertPosition(int index, float relativeY) => AddAssert($"hitobject {index} at {relativeY}",
-            () => Precision.AlmostEquals(getDrawableHitObject(index)?.DrawPosition.Y ?? -1, yScale * relativeY));
+            () => getDrawableHitObject(index)?.DrawPosition.Y / yScale ?? -1, () => Is.EqualTo(relativeY).Within(Precision.FLOAT_EPSILON));
 
         private void setTime(double time)
         {

From b5bae566c23afa718762527a224f96f0c0eba219 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 14:22:50 +0900
Subject: [PATCH 1876/2296] Fix incorrect slider velocity being written on
 export for osu!taiko beatmaps

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index b375a6f7ff..78c663195a 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -149,11 +149,7 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine(FormattableString.Invariant($"OverallDifficulty: {beatmap.Difficulty.OverallDifficulty}"));
             writer.WriteLine(FormattableString.Invariant($"ApproachRate: {beatmap.Difficulty.ApproachRate}"));
 
-            // Taiko adjusts the slider multiplier (see: LEGACY_TAIKO_VELOCITY_MULTIPLIER)
-            writer.WriteLine(onlineRulesetID == 1
-                ? FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.SliderMultiplier / LEGACY_TAIKO_VELOCITY_MULTIPLIER}")
-                : FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.SliderMultiplier}"));
-
+            writer.WriteLine(FormattableString.Invariant($"SliderMultiplier: {beatmap.Difficulty.SliderMultiplier}"));
             writer.WriteLine(FormattableString.Invariant($"SliderTickRate: {beatmap.Difficulty.SliderTickRate}"));
         }
 

From 1cb3c710ba316a8d6642f25b9a4472fc37c75a8d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 14:30:35 +0900
Subject: [PATCH 1877/2296] Remove complex implementation of taiko SV
 multiplier

---
 .../Editor/TestSceneTaikoEditorSaving.cs      |  7 +--
 .../Beatmaps/TaikoBeatmapConverter.cs         | 43 -------------------
 2 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
index af7db2251b..1d5efb01e4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Utils;
-using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Editor
@@ -27,11 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Editor
 
             bool assertTaikoSliderMulitplier()
             {
-                // we can only assert value correctness on TaikoMultiplierAppliedDifficulty, because that is the final difficulty converted taiko beatmaps use.
-                // therefore, ensure that we have that difficulty type by calling .CopyFrom(), which is a no-op if the type is already correct.
-                var taikoDifficulty = new TaikoBeatmapConverter.TaikoMultiplierAppliedDifficulty();
-                taikoDifficulty.CopyFrom(EditorBeatmap.Difficulty);
-                return Precision.AlmostEquals(taikoDifficulty.SliderMultiplier, 2);
+                return Precision.AlmostEquals(EditorBeatmap.Difficulty.SliderMultiplier, 2);
             }
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index b9d65d2631..5229d3ff23 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -10,7 +10,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Utils;
 using System.Threading;
-using JetBrains.Annotations;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Formats;
@@ -43,12 +42,6 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
         protected override Beatmap<TaikoHitObject> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
         {
-            if (!(original.Difficulty is TaikoMultiplierAppliedDifficulty))
-            {
-                // Rewrite the beatmap info to add the slider velocity multiplier
-                original.Difficulty = new TaikoMultiplierAppliedDifficulty(original.Difficulty);
-            }
-
             Beatmap<TaikoHitObject> converted = base.ConvertBeatmap(original, cancellationToken);
 
             if (original.BeatmapInfo.Ruleset.OnlineID == 0)
@@ -218,41 +211,5 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
         }
 
         protected override Beatmap<TaikoHitObject> CreateBeatmap() => new TaikoBeatmap();
-
-        // Important to note that this is subclassing a realm object.
-        // Realm doesn't allow this, but for now this can work since we aren't (in theory?) persisting this to the database.
-        // It is only used during beatmap conversion and processing.
-        internal class TaikoMultiplierAppliedDifficulty : BeatmapDifficulty
-        {
-            public TaikoMultiplierAppliedDifficulty(IBeatmapDifficultyInfo difficulty)
-            {
-                CopyFrom(difficulty);
-            }
-
-            [UsedImplicitly]
-            public TaikoMultiplierAppliedDifficulty()
-            {
-            }
-
-            #region Overrides of BeatmapDifficulty
-
-            public override BeatmapDifficulty Clone() => new TaikoMultiplierAppliedDifficulty(this);
-
-            public override void CopyTo(BeatmapDifficulty other)
-            {
-                base.CopyTo(other);
-                if (!(other is TaikoMultiplierAppliedDifficulty))
-                    other.SliderMultiplier /= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
-            }
-
-            public override void CopyFrom(IBeatmapDifficultyInfo other)
-            {
-                base.CopyFrom(other);
-                if (!(other is TaikoMultiplierAppliedDifficulty))
-                    SliderMultiplier *= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
-            }
-
-            #endregion
-        }
     }
 }

From 8a0d152bcf74b3166019288f7860966624d25fe2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 14:57:52 +0900
Subject: [PATCH 1878/2296] Reapply legacy taiko velocity multiplier in all
 relevant places

---
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs | 2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs               | 2 +-
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 5229d3ff23..e63a65cd80 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             else
                 beatLength = timingPoint.BeatLength;
 
-            double sliderScoringPointDistance = osu_base_scoring_distance * beatmap.Difficulty.SliderMultiplier / beatmap.Difficulty.SliderTickRate;
+            double sliderScoringPointDistance = osu_base_scoring_distance * (beatmap.Difficulty.SliderMultiplier * LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER) / beatmap.Difficulty.SliderTickRate;
 
             // The velocity and duration of the taiko hit object - calculated as the velocity of a drum roll.
             double taikoVelocity = sliderScoringPointDistance * beatmap.Difficulty.SliderTickRate;
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 2a76782a08..6845ae2efa 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
             EffectControlPoint effectPoint = controlPointInfo.EffectPointAt(StartTime);
 
-            double scoringDistance = base_distance * difficulty.SliderMultiplier * effectPoint.ScrollSpeed;
+            double scoringDistance = base_distance * (difficulty.SliderMultiplier * LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER) * effectPoint.ScrollSpeed;
             Velocity = scoringDistance / timingPoint.BeatLength;
 
             TickRate = difficulty.SliderTickRate == 3 ? 3 : 4;
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 2af4c0c2e8..24391d544f 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -10,6 +10,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
 using osu.Game.Configuration;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
@@ -70,7 +71,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         protected virtual double ComputeTimeRange()
         {
             // Taiko scrolls at a constant 100px per 1000ms. More notes become visible as the playfield is lengthened.
-            const float scroll_rate = 10;
+            const float scroll_rate = 10 / LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
 
             // Since the time range will depend on a positional value, it is referenced to the x480 pixel space.
             // Width is used because it defines how many notes fit on the playfield.

From 1b50d1011ab7dcac5ff2135e13a10199d975a894 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 15:26:32 +0900
Subject: [PATCH 1879/2296] Move constant local to taiko

---
 .../Beatmaps/TaikoBeatmapConverter.cs            | 16 +++++++++++++---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs      |  8 ++++----
 .../UI/DrawableTaikoRuleset.cs                   |  4 ++--
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs     |  6 ------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index e63a65cd80..5975458f16 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -12,13 +12,23 @@ using osu.Framework.Utils;
 using System.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Rulesets.Taiko.Beatmaps
 {
     internal class TaikoBeatmapConverter : BeatmapConverter<TaikoHitObject>
     {
+        /// <summary>
+        /// A speed multiplier applied globally to osu!taiko.
+        /// </summary>
+        /// <remarks>
+        /// osu! is generally slower than taiko, so a factor was historically added to increase speed for converts.
+        /// This must be used everywhere slider length or beat length is used in taiko.
+        ///
+        /// Of note, this has never been exposed to the end user, and is considered a hidden internal multiplier.
+        /// </remarks>
+        public const float VELOCITY_MULTIPLIER = 1.4f;
+
         /// <summary>
         /// Because swells are easier in taiko than spinners are in osu!,
         /// legacy taiko multiplies a factor when converting the number of required hits.
@@ -173,7 +183,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             double distance = pathData.Path.ExpectedDistance.Value ?? 0;
 
             // Do not combine the following two lines!
-            distance *= LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
+            distance *= VELOCITY_MULTIPLIER;
             distance *= spans;
 
             TimingControlPoint timingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime);
@@ -185,7 +195,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             else
                 beatLength = timingPoint.BeatLength;
 
-            double sliderScoringPointDistance = osu_base_scoring_distance * (beatmap.Difficulty.SliderMultiplier * LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER) / beatmap.Difficulty.SliderTickRate;
+            double sliderScoringPointDistance = osu_base_scoring_distance * (beatmap.Difficulty.SliderMultiplier * TaikoBeatmapConverter.VELOCITY_MULTIPLIER) / beatmap.Difficulty.SliderTickRate;
 
             // The velocity and duration of the taiko hit object - calculated as the velocity of a drum roll.
             double taikoVelocity = sliderScoringPointDistance * beatmap.Difficulty.SliderTickRate;
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 6845ae2efa..f3143de345 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -1,14 +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.Game.Rulesets.Objects.Types;
 using System.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Beatmaps.Formats;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Beatmaps;
 using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
             EffectControlPoint effectPoint = controlPointInfo.EffectPointAt(StartTime);
 
-            double scoringDistance = base_distance * (difficulty.SliderMultiplier * LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER) * effectPoint.ScrollSpeed;
+            double scoringDistance = base_distance * (difficulty.SliderMultiplier * TaikoBeatmapConverter.VELOCITY_MULTIPLIER) * effectPoint.ScrollSpeed;
             Velocity = scoringDistance / timingPoint.BeatLength;
 
             TickRate = difficulty.SliderTickRate == 3 ? 3 : 4;
@@ -116,7 +116,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
         double IHasDistance.Distance => Duration * Velocity;
 
         SliderPath IHasPath.Path
-            => new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(1) }, ((IHasDistance)this).Distance / LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER);
+            => new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(1) }, ((IHasDistance)this).Distance / TaikoBeatmapConverter.VELOCITY_MULTIPLIER);
 
         #endregion
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 24391d544f..88085dfe97 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -10,13 +10,13 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Formats;
 using osu.Game.Configuration;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Replays;
 using osu.Game.Rulesets.Timing;
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         protected virtual double ComputeTimeRange()
         {
             // Taiko scrolls at a constant 100px per 1000ms. More notes become visible as the playfield is lengthened.
-            const float scroll_rate = 10 / LegacyBeatmapEncoder.LEGACY_TAIKO_VELOCITY_MULTIPLIER;
+            const float scroll_rate = 10 / TaikoBeatmapConverter.VELOCITY_MULTIPLIER;
 
             // Since the time range will depend on a positional value, it is referenced to the x480 pixel space.
             // Width is used because it defines how many notes fit on the playfield.
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 78c663195a..290d29090a 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -23,12 +23,6 @@ namespace osu.Game.Beatmaps.Formats
     {
         public const int FIRST_LAZER_VERSION = 128;
 
-        /// <summary>
-        /// osu! is generally slower than taiko, so a factor is added to increase
-        /// speed. This must be used everywhere slider length or beat length is used.
-        /// </summary>
-        public const float LEGACY_TAIKO_VELOCITY_MULTIPLIER = 1.4f;
-
         private readonly IBeatmap beatmap;
 
         private readonly ISkin? skin;

From 51f9377e3de5181ad3a31697495e3e64deaa0c12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 16:03:32 +0900
Subject: [PATCH 1880/2296] Remove pointless test

---
 .../Editor/TestSceneTaikoEditorSaving.cs      | 33 -------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
deleted file mode 100644
index 1d5efb01e4..0000000000
--- a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
+++ /dev/null
@@ -1,33 +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 NUnit.Framework;
-using osu.Framework.Utils;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Taiko.Tests.Editor
-{
-    public partial class TestSceneTaikoEditorSaving : EditorSavingTestScene
-    {
-        protected override Ruleset CreateRuleset() => new TaikoRuleset();
-
-        [Test]
-        public void TestTaikoSliderMultiplier()
-        {
-            AddStep("Set slider multiplier", () => EditorBeatmap.Difficulty.SliderMultiplier = 2);
-
-            SaveEditor();
-
-            AddAssert("Beatmap has correct slider multiplier", assertTaikoSliderMulitplier);
-
-            ReloadEditorToSameBeatmap();
-
-            AddAssert("Beatmap still has correct slider multiplier", assertTaikoSliderMulitplier);
-
-            bool assertTaikoSliderMulitplier()
-            {
-                return Precision.AlmostEquals(EditorBeatmap.Difficulty.SliderMultiplier, 2);
-            }
-        }
-    }
-}

From b0878e36cf39baeb92da9b646e2a47c62acf7891 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 6 Dec 2023 10:30:21 +0300
Subject: [PATCH 1881/2296] Fix stacks having incorrect position

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
index 0defebc1c3..f71acf95b8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             float z = MaxDepth.Value - (float)((Math.Max(time, appearTime) - appearTime) * speed);
 
             float scale = scaleForDepth(z);
-            drawable.Position = toPlayfieldPosition(scale, hitObject.Position);
+            drawable.Position = toPlayfieldPosition(scale, hitObject.StackedPosition);
             drawable.Scale = new Vector2(scale);
         }
 
@@ -146,7 +146,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
 
             float scale = scaleForDepth(z);
-            drawableSlider.Position = toPlayfieldPosition(scale, hitObject.Position);
+            drawableSlider.Position = toPlayfieldPosition(scale, hitObject.StackedPosition);
             drawableSlider.Scale = new Vector2(scale);
         }
 

From 01c614935b2edc68a1ee37de654e22406890021d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 17:09:12 +0900
Subject: [PATCH 1882/2296] Revert "Remove pointless test"

This reverts commit 51f9377e3de5181ad3a31697495e3e64deaa0c12.
---
 .../Editor/TestSceneTaikoEditorSaving.cs      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
new file mode 100644
index 0000000000..1d5efb01e4
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.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 NUnit.Framework;
+using osu.Framework.Utils;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests.Editor
+{
+    public partial class TestSceneTaikoEditorSaving : EditorSavingTestScene
+    {
+        protected override Ruleset CreateRuleset() => new TaikoRuleset();
+
+        [Test]
+        public void TestTaikoSliderMultiplier()
+        {
+            AddStep("Set slider multiplier", () => EditorBeatmap.Difficulty.SliderMultiplier = 2);
+
+            SaveEditor();
+
+            AddAssert("Beatmap has correct slider multiplier", assertTaikoSliderMulitplier);
+
+            ReloadEditorToSameBeatmap();
+
+            AddAssert("Beatmap still has correct slider multiplier", assertTaikoSliderMulitplier);
+
+            bool assertTaikoSliderMulitplier()
+            {
+                return Precision.AlmostEquals(EditorBeatmap.Difficulty.SliderMultiplier, 2);
+            }
+        }
+    }
+}

From 853d67f9cc587bb0f86cf751cd96d013eefd3488 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 17:11:28 +0900
Subject: [PATCH 1883/2296] Add test coverage of correct multiplier written to
 `.osu` file

---
 .../Editor/TestSceneTaikoEditorSaving.cs      | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
index 1d5efb01e4..64ce97da7b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
@@ -1,9 +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;
+using System.Globalization;
+using System.IO;
+using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Extensions;
 using osu.Framework.Utils;
 using osu.Game.Tests.Visual;
+using SharpCompress.Archives.Zip;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Editor
 {
@@ -11,6 +17,40 @@ namespace osu.Game.Rulesets.Taiko.Tests.Editor
     {
         protected override Ruleset CreateRuleset() => new TaikoRuleset();
 
+        [Test]
+        public void TestTaikoSliderMultiplierInExport()
+        {
+            AddStep("Set slider multiplier", () => EditorBeatmap.Difficulty.SliderMultiplier = 2);
+
+            SaveEditor();
+            AddStep("export beatmap", () => Game.BeatmapManager.Export(EditorBeatmap.BeatmapInfo.BeatmapSet!).WaitSafely());
+
+            AddAssert("check slider multiplier correct in file", () =>
+            {
+                string export = LocalStorage.GetFiles("exports").First();
+
+                using (var stream = LocalStorage.GetStream(export))
+                using (var zip = ZipArchive.Open(stream))
+                {
+                    using (var osuStream = zip.Entries.First().OpenEntryStream())
+                    using (var reader = new StreamReader(osuStream))
+                    {
+                        string? line;
+
+                        while ((line = reader.ReadLine()) != null)
+                        {
+                            if (line.StartsWith("SliderMultiplier", StringComparison.Ordinal))
+                            {
+                                return float.Parse(line.Split(':', StringSplitOptions.TrimEntries).Last(), provider: CultureInfo.InvariantCulture);
+                            }
+                        }
+                    }
+                }
+
+                return 0;
+            }, () => Is.EqualTo(2));
+        }
+
         [Test]
         public void TestTaikoSliderMultiplier()
         {

From 44beecb840fae9db881b862caad12e2d339d0956 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 17:16:20 +0900
Subject: [PATCH 1884/2296] Test multiple values, including default

---
 .../Editor/TestSceneTaikoEditorSaving.cs            | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
index 64ce97da7b..fb05502158 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Editor/TestSceneTaikoEditorSaving.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Extensions;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps;
 using osu.Game.Tests.Visual;
 using SharpCompress.Archives.Zip;
 
@@ -17,10 +18,14 @@ namespace osu.Game.Rulesets.Taiko.Tests.Editor
     {
         protected override Ruleset CreateRuleset() => new TaikoRuleset();
 
-        [Test]
-        public void TestTaikoSliderMultiplierInExport()
+        [TestCase(null)]
+        [TestCase(1f)]
+        [TestCase(2f)]
+        [TestCase(2.4f)]
+        public void TestTaikoSliderMultiplierInExport(float? multiplier)
         {
-            AddStep("Set slider multiplier", () => EditorBeatmap.Difficulty.SliderMultiplier = 2);
+            if (multiplier.HasValue)
+                AddStep("Set slider multiplier", () => EditorBeatmap.Difficulty.SliderMultiplier = multiplier.Value);
 
             SaveEditor();
             AddStep("export beatmap", () => Game.BeatmapManager.Export(EditorBeatmap.BeatmapInfo.BeatmapSet!).WaitSafely());
@@ -48,7 +53,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Editor
                 }
 
                 return 0;
-            }, () => Is.EqualTo(2));
+            }, () => Is.EqualTo(multiplier ?? new BeatmapDifficulty().SliderMultiplier).Within(Precision.FLOAT_EPSILON));
         }
 
         [Test]

From ca991f1f546f0a20333d49265513466056661426 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 17:18:35 +0900
Subject: [PATCH 1885/2296] Move flags local to `EndlessPlayer`

---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 4 ++++
 osu.Game/Screens/Play/Player.cs                   | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index be7ddd115b..262ce263bd 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -290,6 +290,10 @@ namespace osu.Game.Overlays.SkinEditor
         {
             protected override UserActivity? InitialActivity => null;
 
+            public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+            public override bool? AllowGlobalTrackControl => false;
+
             public EndlessPlayer(Func<IBeatmap, IReadOnlyList<Mod>, Score> createScore)
                 : base(createScore, new PlayerConfiguration
                 {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 48411e9c87..1c97efcff7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -59,10 +59,6 @@ namespace osu.Game.Screens.Play
 
         protected override bool PlayExitSound => !isRestarting;
 
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
-        public override bool? AllowGlobalTrackControl => false;
-
         protected override UserActivity InitialActivity => new UserActivity.InSoloGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
 
         public override float BackgroundParallaxAmount => 0.1f;

From faf60cec919637b0c8b04b3c69b15b909cfd90f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Dec 2023 10:11:41 +0100
Subject: [PATCH 1886/2296] Extend test coverage of skin editor open to fail
 better

---
 .../Visual/Navigation/TestSceneSkinEditorNavigation.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
index fa85c8c9f8..57f1b2fbe9 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
@@ -283,15 +283,17 @@ namespace osu.Game.Tests.Visual.Navigation
             openSkinEditor();
         }
 
-        [Test]
-        public void TestOpenSkinEditorGameplaySceneWhenDifferentRulesetActive()
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        public void TestOpenSkinEditorGameplaySceneWhenDifferentRulesetActive(int rulesetId)
         {
             BeatmapSetInfo beatmapSet = null!;
 
             AddStep("import beatmap", () => beatmapSet = BeatmapImportHelper.LoadQuickOszIntoOsu(Game).GetResultSafely());
-            AddStep("select mania difficulty", () =>
+            AddStep($"select difficulty for ruleset w/ ID {rulesetId}", () =>
             {
-                var beatmap = beatmapSet.Beatmaps.First(b => b.Ruleset.OnlineID == 3);
+                var beatmap = beatmapSet.Beatmaps.First(b => b.Ruleset.OnlineID == rulesetId);
                 Game.Beatmap.Value = Game.BeatmapManager.GetWorkingBeatmap(beatmap);
             });
 

From f239d03d75aaeb02118f5a316c6febf135b291dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Dec 2023 10:12:25 +0100
Subject: [PATCH 1887/2296] Forcibly change ruleset to correct one before
 entering gameplay from main menu

Closes #25663 (again).

As it turns out, in some scenarios it can be the case that the current
game-global `Beatmap` is not valid for the current game-global
`Ruleset`. The validity of one and the other in conjunction is only
really validated by the song select screen; elsewhere there is no
guarantee that the global beatmap is playable using the global ruleset.

However, this only comes up in very specific circumstances, namely one:
when trying to autoplay a catch beatmap with osu! ruleset globally
active via the skin editor flow.

`Player` is responsible for retrieving the beatmap to be played. It does
so by invoking the appropriate beatmap converter and asking it if the
beatmap can be converted:

	https://github.com/ppy/osu/blob/6d64538d7a3130df63574eb75a8ebe044154c799/osu.Game/Beatmaps/WorkingBeatmap.cs#L262-L266

If the code above throws, `Player` actually silently covers for this, by
trying the beatmap's default ruleset instead:

	https://github.com/ppy/osu/blob/6d64538d7a3130df63574eb75a8ebe044154c799/osu.Game/Screens/Play/Player.cs#L529-L536

However, for the pairing of osu! ruleset and catch beatmap, this fails,
as `OsuBeatmapConverter`'s condition necessary for permitting conversion
is that the objects have a defined position:

	https://github.com/ppy/osu/blob/6d64538d7a3130df63574eb75a8ebe044154c799/osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs#L25

which they will do, due to the fact that all catch beatmaps are really
just osu! beatmaps but with conversion steps applied, and thus `Player`
succeeds to load the catch beatmap in osu! ruleset.

In the skin editor scenario, this would lead to the secondary failure
of the skin editor trying to apply `CatchModAutoplay` on top of all
of that, which would fail at the hard-cast of the beatmap
to `CatchBeatmap`.
---
 osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
index 262ce263bd..bedaf12c9b 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs
@@ -17,6 +17,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;
@@ -58,6 +59,9 @@ namespace osu.Game.Overlays.SkinEditor
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
+        [Resolved]
+        private Bindable<RulesetInfo> ruleset { get; set; } = null!;
+
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
 
@@ -153,7 +157,11 @@ namespace osu.Game.Overlays.SkinEditor
                 if (screen is Player)
                     return;
 
-                var replayGeneratingMod = beatmap.Value.BeatmapInfo.Ruleset.CreateInstance().GetAutoplayMod();
+                // the validity of the current game-wide beatmap + ruleset combination is enforced by song select.
+                // if we're anywhere else, the state is unknown and may not make sense, so forcibly set something that does.
+                if (screen is not PlaySongSelect)
+                    ruleset.Value = beatmap.Value.BeatmapInfo.Ruleset;
+                var replayGeneratingMod = ruleset.Value.CreateInstance().GetAutoplayMod();
 
                 IReadOnlyList<Mod> usableMods = mods.Value;
 

From b8694aba98631438d64d20820c05dd6351cee14f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Dec 2023 22:00:35 +0900
Subject: [PATCH 1888/2296] Remove unnecessary prefix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 5975458f16..010b1f0a7a 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -195,7 +195,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             else
                 beatLength = timingPoint.BeatLength;
 
-            double sliderScoringPointDistance = osu_base_scoring_distance * (beatmap.Difficulty.SliderMultiplier * TaikoBeatmapConverter.VELOCITY_MULTIPLIER) / beatmap.Difficulty.SliderTickRate;
+            double sliderScoringPointDistance = osu_base_scoring_distance * (beatmap.Difficulty.SliderMultiplier * VELOCITY_MULTIPLIER) / beatmap.Difficulty.SliderTickRate;
 
             // The velocity and duration of the taiko hit object - calculated as the velocity of a drum roll.
             double taikoVelocity = sliderScoringPointDistance * beatmap.Difficulty.SliderTickRate;

From a8f3a0533ac72da3a7abd1696770c27a21b4c692 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 6 Dec 2023 16:35:59 +0100
Subject: [PATCH 1889/2296] Use 4th order BSpline by default

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs           | 8 ++++----
 .../Sliders/Components/PathControlPointVisualiser.cs      | 2 +-
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index f889999fe3..bbded55732 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -312,7 +312,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertLength(808, tolerance: 10);
             assertControlPointCount(5);
-            assertControlPointType(0, PathType.BSpline(3));
+            assertControlPointType(0, PathType.BSpline(4));
             assertControlPointType(1, null);
             assertControlPointType(2, null);
             assertControlPointType(3, null);
@@ -337,9 +337,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertLength(600, tolerance: 10);
             assertControlPointCount(4);
-            assertControlPointType(0, PathType.BSpline(3));
-            assertControlPointType(1, PathType.BSpline(3));
-            assertControlPointType(2, PathType.BSpline(3));
+            assertControlPointType(0, PathType.BSpline(4));
+            assertControlPointType(1, PathType.BSpline(4));
+            assertControlPointType(2, PathType.BSpline(4));
             assertControlPointType(3, null);
         }
 
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 3add95b2b2..24e2210b45 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -373,7 +373,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 curveTypeItems.Add(createMenuItemForPathType(PathType.LINEAR));
                 curveTypeItems.Add(createMenuItemForPathType(PathType.PERFECT_CURVE));
                 curveTypeItems.Add(createMenuItemForPathType(PathType.BEZIER));
-                curveTypeItems.Add(createMenuItemForPathType(PathType.BSpline(3)));
+                curveTypeItems.Add(createMenuItemForPathType(PathType.BSpline(4)));
 
                 if (selectedPieces.Any(piece => piece.ControlPoint.Type?.Type == SplineType.Catmull))
                     curveTypeItems.Add(createMenuItemForPathType(PathType.CATMULL));
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index e13a46d0cd..672ac43f2c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [Resolved(CanBeNull = true)]
         private FreehandSliderToolboxGroup freehandToolboxGroup { get; set; }
 
-        private readonly IncrementalBSplineBuilder bSplineBuilder = new IncrementalBSplineBuilder();
+        private readonly IncrementalBSplineBuilder bSplineBuilder = new IncrementalBSplineBuilder { Degree = 4 };
 
         protected override bool IsValidForPlacement => HitObject.Path.HasValidLength;
 
@@ -239,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             if (state == SliderPlacementState.Drawing)
             {
-                segmentStart.Type = PathType.BSpline(3);
+                segmentStart.Type = PathType.BSpline(4);
                 return;
             }
 
@@ -335,7 +335,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 if (segment.Count == 0)
                     continue;
 
-                HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[0], PathType.BSpline(3)));
+                HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[0], PathType.BSpline(4)));
                 for (int j = 1; j < segment.Count - 1; j++)
                     HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[j]));
 

From 22287f3a7f3acc256f13d5759665e2dbf4a27983 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Wed, 6 Dec 2023 16:36:24 +0100
Subject: [PATCH 1890/2296] decrease max tolerance

---
 osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
index 87dd8636c9..7d1eb4e270 100644
--- a/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
+++ b/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         public BindableFloat Tolerance { get; } = new BindableFloat(2f)
         {
             MinValue = 0.05f,
-            MaxValue = 3f,
+            MaxValue = 2.0f,
             Precision = 0.01f
         };
 
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         };
 
         // We map internal ranges to a more standard range of values for display to the user.
-        private readonly BindableInt displayTolerance = new BindableInt(66)
+        private readonly BindableInt displayTolerance = new BindableInt(100)
         {
             MinValue = 5,
             MaxValue = 100
@@ -90,8 +90,8 @@ namespace osu.Game.Rulesets.Osu.Edit
                 displayCornerThreshold.Value = internalToDisplayCornerThreshold(threshold.NewValue)
             );
 
-            float displayToInternalTolerance(float v) => v / 33f;
-            int internalToDisplayTolerance(float v) => (int)Math.Round(v * 33f);
+            float displayToInternalTolerance(float v) => v / 50f;
+            int internalToDisplayTolerance(float v) => (int)Math.Round(v * 50f);
 
             float displayToInternalCornerThreshold(float v) => v / 100f;
             int internalToDisplayCornerThreshold(float v) => (int)Math.Round(v * 100f);

From cb823f367f92fdeaf4db1a7ea3f75777f5a787bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Dec 2023 18:16:45 +0100
Subject: [PATCH 1891/2296] Simplify `UserActivity` for serialisability over
 the wire

Up until now, the `UserActivity` class hierarchy contained things like
beatmap info, room info, full replay info, etc. While this was
convenient, it is soon going to be less so, as the data is sent over the
wire to the spectator server so that the user's activity can be
broadcast to other clients.

To counteract this without creating a second separate and slimmed-down
class hierarchy, slim down the `UserActivity` structure to contain the
bare minimum amounts of data such that the structures aren't overly
large and complex to serialise, but also contain enough data that they
can be used by receiving clients directly without having to do beatmap
or score lookups.
---
 osu.Desktop/DiscordRichPresence.cs        |  36 +--
 osu.Game/Online/Chat/NowPlayingCommand.cs |  21 +-
 osu.Game/Online/SignalRWorkaroundTypes.cs |  16 ++
 osu.Game/Users/UserActivity.cs            | 276 +++++++++++++++-------
 4 files changed, 227 insertions(+), 122 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index caf0a1d9fd..c66725e3e3 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -9,7 +9,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
-using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Extensions;
 using osu.Game.Online.API;
@@ -95,17 +94,18 @@ namespace osu.Desktop
 
             if (status.Value is UserStatusOnline && activity.Value != null)
             {
-                presence.State = truncate(activity.Value.GetStatus(privacyMode.Value == DiscordRichPresenceMode.Limited));
-                presence.Details = truncate(getDetails(activity.Value));
+                bool hideIdentifiableInformation = privacyMode.Value == DiscordRichPresenceMode.Limited;
+                presence.State = truncate(activity.Value.GetStatus(hideIdentifiableInformation));
+                presence.Details = truncate(activity.Value.GetDetails(hideIdentifiableInformation) ?? string.Empty);
 
-                if (getBeatmap(activity.Value) is IBeatmapInfo beatmap && beatmap.OnlineID > 0)
+                if (getBeatmapID(activity.Value) is int beatmapId && beatmapId > 0)
                 {
                     presence.Buttons = new[]
                     {
                         new Button
                         {
                             Label = "View beatmap",
-                            Url = $@"{api.WebsiteRootUrl}/beatmapsets/{beatmap.BeatmapSet?.OnlineID}#{ruleset.Value.ShortName}/{beatmap.OnlineID}"
+                            Url = $@"{api.WebsiteRootUrl}/beatmaps/{beatmapId}?mode={ruleset.Value.ShortName}"
                         }
                     };
                 }
@@ -159,40 +159,20 @@ namespace osu.Desktop
             });
         }
 
-        private IBeatmapInfo? getBeatmap(UserActivity activity)
+        private int? getBeatmapID(UserActivity activity)
         {
             switch (activity)
             {
                 case UserActivity.InGame game:
-                    return game.BeatmapInfo;
+                    return game.BeatmapID;
 
                 case UserActivity.EditingBeatmap edit:
-                    return edit.BeatmapInfo;
+                    return edit.BeatmapID;
             }
 
             return null;
         }
 
-        private string getDetails(UserActivity activity)
-        {
-            switch (activity)
-            {
-                case UserActivity.InGame game:
-                    return game.BeatmapInfo.ToString() ?? string.Empty;
-
-                case UserActivity.EditingBeatmap edit:
-                    return edit.BeatmapInfo.ToString() ?? string.Empty;
-
-                case UserActivity.WatchingReplay watching:
-                    return watching.BeatmapInfo?.ToString() ?? string.Empty;
-
-                case UserActivity.InLobby lobby:
-                    return privacyMode.Value == DiscordRichPresenceMode.Limited ? string.Empty : lobby.Room.Name.Value;
-            }
-
-            return string.Empty;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             client.Dispose();
diff --git a/osu.Game/Online/Chat/NowPlayingCommand.cs b/osu.Game/Online/Chat/NowPlayingCommand.cs
index e7018d6993..0e6f6f0bf6 100644
--- a/osu.Game/Online/Chat/NowPlayingCommand.cs
+++ b/osu.Game/Online/Chat/NowPlayingCommand.cs
@@ -7,7 +7,6 @@ using System.Text;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Rulesets;
@@ -33,9 +32,6 @@ namespace osu.Game.Online.Chat
         [Resolved]
         private IBindable<RulesetInfo> currentRuleset { get; set; } = null!;
 
-        [Resolved]
-        private LocalisationManager localisation { get; set; } = null!;
-
         private readonly Channel? target;
 
         /// <summary>
@@ -52,23 +48,28 @@ namespace osu.Game.Online.Chat
             base.LoadComplete();
 
             string verb;
-            IBeatmapInfo beatmapInfo;
+
+            int beatmapOnlineID;
+            string beatmapDisplayTitle;
 
             switch (api.Activity.Value)
             {
                 case UserActivity.InGame game:
                     verb = "playing";
-                    beatmapInfo = game.BeatmapInfo;
+                    beatmapOnlineID = game.BeatmapID;
+                    beatmapDisplayTitle = game.BeatmapDisplayTitle;
                     break;
 
                 case UserActivity.EditingBeatmap edit:
                     verb = "editing";
-                    beatmapInfo = edit.BeatmapInfo;
+                    beatmapOnlineID = edit.BeatmapID;
+                    beatmapDisplayTitle = edit.BeatmapDisplayTitle;
                     break;
 
                 default:
                     verb = "listening to";
-                    beatmapInfo = currentBeatmap.Value.BeatmapInfo;
+                    beatmapOnlineID = currentBeatmap.Value.BeatmapInfo.OnlineID;
+                    beatmapDisplayTitle = currentBeatmap.Value.BeatmapInfo.GetDisplayTitle();
                     break;
             }
 
@@ -86,9 +87,7 @@ namespace osu.Game.Online.Chat
 
             string getBeatmapPart()
             {
-                string beatmapInfoString = localisation.GetLocalisedBindableString(beatmapInfo.GetDisplayTitleRomanisable()).Value;
-
-                return beatmapInfo.OnlineID > 0 ? $"[{api.WebsiteRootUrl}/b/{beatmapInfo.OnlineID} {beatmapInfoString}]" : beatmapInfoString;
+                return beatmapOnlineID > 0 ? $"[{api.WebsiteRootUrl}/b/{beatmapOnlineID} {beatmapDisplayTitle}]" : beatmapDisplayTitle;
             }
 
             string getRulesetPart()
diff --git a/osu.Game/Online/SignalRWorkaroundTypes.cs b/osu.Game/Online/SignalRWorkaroundTypes.cs
index 0e3eb0aab0..59a12b3bf1 100644
--- a/osu.Game/Online/SignalRWorkaroundTypes.cs
+++ b/osu.Game/Online/SignalRWorkaroundTypes.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.Countdown;
 using osu.Game.Online.Multiplayer.MatchTypes.TeamVersus;
+using osu.Game.Users;
 
 namespace osu.Game.Online
 {
@@ -18,6 +19,7 @@ namespace osu.Game.Online
     {
         internal static readonly IReadOnlyList<(Type derivedType, Type baseType)> BASE_TYPE_MAPPING = new[]
         {
+            // multiplayer
             (typeof(ChangeTeamRequest), typeof(MatchUserRequest)),
             (typeof(StartMatchCountdownRequest), typeof(MatchUserRequest)),
             (typeof(StopCountdownRequest), typeof(MatchUserRequest)),
@@ -28,6 +30,20 @@ namespace osu.Game.Online
             (typeof(MatchStartCountdown), typeof(MultiplayerCountdown)),
             (typeof(ForceGameplayStartCountdown), typeof(MultiplayerCountdown)),
             (typeof(ServerShuttingDownCountdown), typeof(MultiplayerCountdown)),
+
+            // metadata
+            (typeof(UserActivity.ChoosingBeatmap), typeof(UserActivity)),
+            (typeof(UserActivity.InSoloGame), typeof(UserActivity)),
+            (typeof(UserActivity.WatchingReplay), typeof(UserActivity)),
+            (typeof(UserActivity.SpectatingUser), typeof(UserActivity)),
+            (typeof(UserActivity.SearchingForLobby), typeof(UserActivity)),
+            (typeof(UserActivity.InLobby), typeof(UserActivity)),
+            (typeof(UserActivity.InMultiplayerGame), typeof(UserActivity)),
+            (typeof(UserActivity.SpectatingMultiplayerGame), typeof(UserActivity)),
+            (typeof(UserActivity.InPlaylistGame), typeof(UserActivity)),
+            (typeof(UserActivity.EditingBeatmap), typeof(UserActivity)),
+            (typeof(UserActivity.ModdingBeatmap), typeof(UserActivity)),
+            (typeof(UserActivity.TestingBeatmap), typeof(UserActivity)),
         };
     }
 }
diff --git a/osu.Game/Users/UserActivity.cs b/osu.Game/Users/UserActivity.cs
index c82f642fdc..1b09666df6 100644
--- a/osu.Game/Users/UserActivity.cs
+++ b/osu.Game/Users/UserActivity.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 System;
+using MessagePack;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Online;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
@@ -10,43 +13,84 @@ using osuTK.Graphics;
 
 namespace osu.Game.Users
 {
+    /// <summary>
+    /// Base class for all structures describing the user's current activity.
+    /// </summary>
+    /// <remarks>
+    /// Warning: keep <see cref="UnionAttribute"/> specs consistent with
+    /// <see cref="SignalRWorkaroundTypes.BASE_TYPE_MAPPING"/>.
+    /// </remarks>
+    [Serializable]
+    [MessagePackObject]
+    [Union(11, typeof(ChoosingBeatmap))]
+    [Union(12, typeof(InSoloGame))]
+    [Union(13, typeof(WatchingReplay))]
+    [Union(14, typeof(SpectatingUser))]
+    [Union(21, typeof(SearchingForLobby))]
+    [Union(22, typeof(InLobby))]
+    [Union(23, typeof(InMultiplayerGame))]
+    [Union(24, typeof(SpectatingMultiplayerGame))]
+    [Union(31, typeof(InPlaylistGame))]
+    [Union(41, typeof(EditingBeatmap))]
+    [Union(42, typeof(ModdingBeatmap))]
+    [Union(43, typeof(TestingBeatmap))]
     public abstract class UserActivity
     {
         public abstract string GetStatus(bool hideIdentifiableInformation = false);
+        public virtual string? GetDetails(bool hideIdentifiableInformation = false) => null;
 
         public virtual Color4 GetAppropriateColour(OsuColour colours) => colours.GreenDarker;
 
-        public class ModdingBeatmap : EditingBeatmap
-        {
-            public override string GetStatus(bool hideIdentifiableInformation = false) => "Modding a beatmap";
-            public override Color4 GetAppropriateColour(OsuColour colours) => colours.PurpleDark;
-
-            public ModdingBeatmap(IBeatmapInfo info)
-                : base(info)
-            {
-            }
-        }
-
+        [MessagePackObject]
         public class ChoosingBeatmap : UserActivity
         {
             public override string GetStatus(bool hideIdentifiableInformation = false) => "Choosing a beatmap";
         }
 
+        [MessagePackObject]
         public abstract class InGame : UserActivity
         {
-            public IBeatmapInfo BeatmapInfo { get; }
+            [Key(0)]
+            public int BeatmapID { get; set; }
 
-            public IRulesetInfo Ruleset { get; }
+            [Key(1)]
+            public string BeatmapDisplayTitle { get; set; } = string.Empty;
+
+            [Key(2)]
+            public int RulesetID { get; set; }
+
+            [Key(3)]
+            public string RulesetPlayingVerb { get; set; } = string.Empty; // TODO: i'm going with this for now, but this is wasteful
 
             protected InGame(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset)
             {
-                BeatmapInfo = beatmapInfo;
-                Ruleset = ruleset;
+                BeatmapID = beatmapInfo.OnlineID;
+                BeatmapDisplayTitle = beatmapInfo.GetDisplayTitle();
+
+                RulesetID = ruleset.OnlineID;
+                RulesetPlayingVerb = ruleset.CreateInstance().PlayingVerb;
             }
 
-            public override string GetStatus(bool hideIdentifiableInformation = false) => Ruleset.CreateInstance().PlayingVerb;
+            [SerializationConstructor]
+            protected InGame() { }
+
+            public override string GetStatus(bool hideIdentifiableInformation = false) => RulesetPlayingVerb;
+            public override string GetDetails(bool hideIdentifiableInformation = false) => BeatmapDisplayTitle;
         }
 
+        [MessagePackObject]
+        public class InSoloGame : InGame
+        {
+            public InSoloGame(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset)
+                : base(beatmapInfo, ruleset)
+            {
+            }
+
+            [SerializationConstructor]
+            public InSoloGame() { }
+        }
+
+        [MessagePackObject]
         public class InMultiplayerGame : InGame
         {
             public InMultiplayerGame(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset)
@@ -54,9 +98,122 @@ namespace osu.Game.Users
             {
             }
 
+            [SerializationConstructor]
+            public InMultiplayerGame()
+            {
+            }
+
             public override string GetStatus(bool hideIdentifiableInformation = false) => $@"{base.GetStatus(hideIdentifiableInformation)} with others";
         }
 
+        [MessagePackObject]
+        public class InPlaylistGame : InGame
+        {
+            public InPlaylistGame(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset)
+                : base(beatmapInfo, ruleset)
+            {
+            }
+
+            [SerializationConstructor]
+            public InPlaylistGame() { }
+        }
+
+        [MessagePackObject]
+        public class TestingBeatmap : InGame
+        {
+            public TestingBeatmap(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset)
+                : base(beatmapInfo, ruleset)
+            {
+            }
+
+            [SerializationConstructor]
+            public TestingBeatmap() { }
+
+            public override string GetStatus(bool hideIdentifiableInformation = false) => "Testing a beatmap";
+        }
+
+        [MessagePackObject]
+        public class EditingBeatmap : UserActivity
+        {
+            [Key(0)]
+            public int BeatmapID { get; set; }
+
+            [Key(1)]
+            public string BeatmapDisplayTitle { get; set; } = string.Empty;
+
+            public EditingBeatmap(IBeatmapInfo info)
+            {
+                BeatmapID = info.OnlineID;
+                BeatmapDisplayTitle = info.GetDisplayTitle();
+            }
+
+            [SerializationConstructor]
+            public EditingBeatmap() { }
+
+            public override string GetStatus(bool hideIdentifiableInformation = false) => @"Editing a beatmap";
+            public override string GetDetails(bool hideIdentifiableInformation = false) => BeatmapDisplayTitle;
+        }
+
+        [MessagePackObject]
+        public class ModdingBeatmap : EditingBeatmap
+        {
+            public ModdingBeatmap(IBeatmapInfo info)
+                : base(info)
+            {
+            }
+
+            [SerializationConstructor]
+            public ModdingBeatmap() { }
+
+            public override string GetStatus(bool hideIdentifiableInformation = false) => "Modding a beatmap";
+            public override Color4 GetAppropriateColour(OsuColour colours) => colours.PurpleDark;
+        }
+
+        [MessagePackObject]
+        public class WatchingReplay : UserActivity
+        {
+            [Key(0)]
+            public long ScoreID { get; set; }
+
+            [Key(1)]
+            public string PlayerName { get; set; } = string.Empty;
+
+            [Key(2)]
+            public int BeatmapID { get; set; }
+
+            [Key(3)]
+            public string? BeatmapDisplayTitle { get; set; }
+
+            public WatchingReplay(ScoreInfo score)
+            {
+                ScoreID = score.OnlineID;
+                PlayerName = score.User.Username;
+                BeatmapID = score.BeatmapInfo?.OnlineID ?? -1;
+                BeatmapDisplayTitle = score.BeatmapInfo?.GetDisplayTitle();
+            }
+
+            [SerializationConstructor]
+            public WatchingReplay() { }
+
+            public override string GetStatus(bool hideIdentifiableInformation = false) => hideIdentifiableInformation ? @"Watching a replay" : $@"Watching {PlayerName}'s replay";
+            public override string? GetDetails(bool hideIdentifiableInformation = false) => BeatmapDisplayTitle;
+        }
+
+        [MessagePackObject]
+        public class SpectatingUser : WatchingReplay
+        {
+            public SpectatingUser(ScoreInfo score)
+                : base(score)
+            {
+            }
+
+            [SerializationConstructor]
+            public SpectatingUser() { }
+
+            public override string GetStatus(bool hideIdentifiableInformation = false) => hideIdentifiableInformation ? @"Spectating a user" : $@"Spectating {PlayerName}";
+        }
+
+        [MessagePackObject]
         public class SpectatingMultiplayerGame : InGame
         {
             public SpectatingMultiplayerGame(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset)
@@ -64,88 +221,41 @@ namespace osu.Game.Users
             {
             }
 
+            [SerializationConstructor]
+            public SpectatingMultiplayerGame() { }
+
             public override string GetStatus(bool hideIdentifiableInformation = false) => $"Watching others {base.GetStatus(hideIdentifiableInformation).ToLowerInvariant()}";
         }
 
-        public class InPlaylistGame : InGame
-        {
-            public InPlaylistGame(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset)
-                : base(beatmapInfo, ruleset)
-            {
-            }
-        }
-
-        public class InSoloGame : InGame
-        {
-            public InSoloGame(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset)
-                : base(beatmapInfo, ruleset)
-            {
-            }
-        }
-
-        public class TestingBeatmap : InGame
-        {
-            public override string GetStatus(bool hideIdentifiableInformation = false) => "Testing a beatmap";
-
-            public TestingBeatmap(IBeatmapInfo beatmapInfo, IRulesetInfo ruleset)
-                : base(beatmapInfo, ruleset)
-            {
-            }
-        }
-
-        public class EditingBeatmap : UserActivity
-        {
-            public IBeatmapInfo BeatmapInfo { get; }
-
-            public EditingBeatmap(IBeatmapInfo info)
-            {
-                BeatmapInfo = info;
-            }
-
-            public override string GetStatus(bool hideIdentifiableInformation = false) => @"Editing a beatmap";
-        }
-
-        public class WatchingReplay : UserActivity
-        {
-            private readonly ScoreInfo score;
-
-            protected string Username => score.User.Username;
-
-            public BeatmapInfo? BeatmapInfo => score.BeatmapInfo;
-
-            public WatchingReplay(ScoreInfo score)
-            {
-                this.score = score;
-            }
-
-            public override string GetStatus(bool hideIdentifiableInformation = false) => hideIdentifiableInformation ? @"Watching a replay" : $@"Watching {Username}'s replay";
-        }
-
-        public class SpectatingUser : WatchingReplay
-        {
-            public override string GetStatus(bool hideIdentifiableInformation = false) => hideIdentifiableInformation ? @"Spectating a user" : $@"Spectating {Username}";
-
-            public SpectatingUser(ScoreInfo score)
-                : base(score)
-            {
-            }
-        }
-
+        [MessagePackObject]
         public class SearchingForLobby : UserActivity
         {
             public override string GetStatus(bool hideIdentifiableInformation = false) => @"Looking for a lobby";
         }
 
+        [MessagePackObject]
         public class InLobby : UserActivity
         {
-            public override string GetStatus(bool hideIdentifiableInformation = false) => @"In a lobby";
+            [Key(0)]
+            public long RoomID { get; set; }
 
-            public readonly Room Room;
+            [Key(1)]
+            public string RoomName { get; set; } = string.Empty;
 
             public InLobby(Room room)
             {
-                Room = room;
+                RoomID = room.RoomID.Value ?? -1;
+                RoomName = room.Name.Value;
             }
+
+            [SerializationConstructor]
+            public InLobby() { }
+
+            public override string GetStatus(bool hideIdentifiableInformation = false) => @"In a lobby";
+
+            public override string? GetDetails(bool hideIdentifiableInformation = false) => hideIdentifiableInformation
+                ? null
+                : RoomName;
         }
     }
 }

From d66fa093205320b3a09a20ded2632b68dbf3fe21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Dec 2023 18:21:44 +0100
Subject: [PATCH 1892/2296] Simplify `UserStatus` to be an enumeration type

There were absolutely no gains from having it be a reference type /
class, only complications, especially when coming from the serialisation
angle.
---
 osu.Desktop/DiscordRichPresence.cs            |  6 +--
 .../Online/TestSceneUserClickableAvatar.cs    |  2 +-
 .../Visual/Online/TestSceneUserPanel.cs       | 18 ++++----
 osu.Game/Online/API/APIAccess.cs              |  2 +-
 .../Online/API/Requests/Responses/APIUser.cs  |  2 +-
 osu.Game/Overlays/Login/LoginPanel.cs         |  6 +--
 osu.Game/Users/ExtendedUserPanel.cs           | 17 +++----
 osu.Game/Users/UserStatus.cs                  | 46 +++++++++++--------
 8 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index c66725e3e3..f990fd55fc 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -33,7 +33,7 @@ namespace osu.Desktop
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
-        private readonly IBindable<UserStatus> status = new Bindable<UserStatus>();
+        private readonly IBindable<UserStatus?> status = new Bindable<UserStatus?>();
         private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();
 
         private readonly Bindable<DiscordRichPresenceMode> privacyMode = new Bindable<DiscordRichPresenceMode>();
@@ -86,13 +86,13 @@ namespace osu.Desktop
             if (!client.IsInitialized)
                 return;
 
-            if (status.Value is UserStatusOffline || privacyMode.Value == DiscordRichPresenceMode.Off)
+            if (status.Value == UserStatus.Offline || privacyMode.Value == DiscordRichPresenceMode.Off)
             {
                 client.ClearPresence();
                 return;
             }
 
-            if (status.Value is UserStatusOnline && activity.Value != null)
+            if (status.Value == UserStatus.Online && activity.Value != null)
             {
                 bool hideIdentifiableInformation = privacyMode.Value == DiscordRichPresenceMode.Limited;
                 presence.State = truncate(activity.Value.GetStatus(hideIdentifiableInformation));
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
index 9edaa841b2..4539eae25f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserClickableAvatar.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Online
                 Colour = color ?? "000000",
                 Status =
                 {
-                    Value = new UserStatusOnline()
+                    Value = UserStatus.Online
                 },
             };
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index c61b572d8c..b3b8fd78d3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
     public partial class TestSceneUserPanel : OsuTestScene
     {
         private readonly Bindable<UserActivity> activity = new Bindable<UserActivity>();
-        private readonly Bindable<UserStatus> status = new Bindable<UserStatus>();
+        private readonly Bindable<UserStatus?> status = new Bindable<UserStatus?>();
 
         private UserGridPanel boundPanel1;
         private TestUserListPanel boundPanel2;
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.Online
                         Id = 3103765,
                         CountryCode = CountryCode.JP,
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
-                        Status = { Value = new UserStatusOnline() }
+                        Status = { Value = UserStatus.Online }
                     }) { Width = 300 },
                     boundPanel1 = new UserGridPanel(new APIUser
                     {
@@ -99,16 +99,16 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestUserStatus()
         {
-            AddStep("online", () => status.Value = new UserStatusOnline());
-            AddStep("do not disturb", () => status.Value = new UserStatusDoNotDisturb());
-            AddStep("offline", () => status.Value = new UserStatusOffline());
+            AddStep("online", () => status.Value = UserStatus.Online);
+            AddStep("do not disturb", () => status.Value = UserStatus.DoNotDisturb);
+            AddStep("offline", () => status.Value = UserStatus.Offline);
             AddStep("null status", () => status.Value = null);
         }
 
         [Test]
         public void TestUserActivity()
         {
-            AddStep("set online status", () => status.Value = new UserStatusOnline());
+            AddStep("set online status", () => status.Value = UserStatus.Online);
 
             AddStep("idle", () => activity.Value = null);
             AddStep("watching replay", () => activity.Value = new UserActivity.WatchingReplay(createScore(@"nats")));
@@ -127,12 +127,12 @@ namespace osu.Game.Tests.Visual.Online
         public void TestUserActivityChange()
         {
             AddAssert("visit message is visible", () => boundPanel2.LastVisitMessage.IsPresent);
-            AddStep("set online status", () => status.Value = new UserStatusOnline());
+            AddStep("set online status", () => status.Value = UserStatus.Online);
             AddAssert("visit message is not visible", () => !boundPanel2.LastVisitMessage.IsPresent);
             AddStep("set choosing activity", () => activity.Value = new UserActivity.ChoosingBeatmap());
-            AddStep("set offline status", () => status.Value = new UserStatusOffline());
+            AddStep("set offline status", () => status.Value = UserStatus.Offline);
             AddAssert("visit message is visible", () => boundPanel2.LastVisitMessage.IsPresent);
-            AddStep("set online status", () => status.Value = new UserStatusOnline());
+            AddStep("set online status", () => status.Value = UserStatus.Online);
             AddAssert("visit message is not visible", () => !boundPanel2.LastVisitMessage.IsPresent);
         }
 
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 4f586c8fff..21107d61fc 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Online.API
             userReq.Success += user =>
             {
                 // todo: save/pull from settings
-                user.Status.Value = new UserStatusOnline();
+                user.Status.Value = UserStatus.Online;
 
                 setLocalUser(user);
 
diff --git a/osu.Game/Online/API/Requests/Responses/APIUser.cs b/osu.Game/Online/API/Requests/Responses/APIUser.cs
index 2ee66453cf..56eec19fa1 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUser.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Online.API.Requests.Responses
             set => countryCodeString = value.ToString();
         }
 
-        public readonly Bindable<UserStatus> Status = new Bindable<UserStatus>();
+        public readonly Bindable<UserStatus?> Status = new Bindable<UserStatus?>();
 
         public readonly Bindable<UserActivity> Activity = new Bindable<UserActivity>();
 
diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index 71ecf2e75a..19af95459f 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -148,17 +148,17 @@ namespace osu.Game.Overlays.Login
                         switch (action.NewValue)
                         {
                             case UserAction.Online:
-                                api.LocalUser.Value.Status.Value = new UserStatusOnline();
+                                api.LocalUser.Value.Status.Value = UserStatus.Online;
                                 dropdown.StatusColour = colours.Green;
                                 break;
 
                             case UserAction.DoNotDisturb:
-                                api.LocalUser.Value.Status.Value = new UserStatusDoNotDisturb();
+                                api.LocalUser.Value.Status.Value = UserStatus.DoNotDisturb;
                                 dropdown.StatusColour = colours.Red;
                                 break;
 
                             case UserAction.AppearOffline:
-                                api.LocalUser.Value.Status.Value = new UserStatusOffline();
+                                api.LocalUser.Value.Status.Value = UserStatus.Offline;
                                 dropdown.StatusColour = colours.Gray7;
                                 break;
 
diff --git a/osu.Game/Users/ExtendedUserPanel.cs b/osu.Game/Users/ExtendedUserPanel.cs
index 3c1b68f9ef..18fe852556 100644
--- a/osu.Game/Users/ExtendedUserPanel.cs
+++ b/osu.Game/Users/ExtendedUserPanel.cs
@@ -6,6 +6,7 @@
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -18,7 +19,7 @@ namespace osu.Game.Users
 {
     public abstract partial class ExtendedUserPanel : UserPanel
     {
-        public readonly Bindable<UserStatus> Status = new Bindable<UserStatus>();
+        public readonly Bindable<UserStatus?> Status = new Bindable<UserStatus?>();
 
         public readonly IBindable<UserActivity> Activity = new Bindable<UserActivity>();
 
@@ -97,14 +98,14 @@ namespace osu.Game.Users
             return statusContainer;
         }
 
-        private void displayStatus(UserStatus status, UserActivity activity = null)
+        private void displayStatus(UserStatus? status, UserActivity activity = null)
         {
             if (status != null)
             {
-                LastVisitMessage.FadeTo(status is UserStatusOffline && User.LastVisit.HasValue ? 1 : 0);
+                LastVisitMessage.FadeTo(status == UserStatus.Offline && User.LastVisit.HasValue ? 1 : 0);
 
                 // Set status message based on activity (if we have one) and status is not offline
-                if (activity != null && !(status is UserStatusOffline))
+                if (activity != null && status != UserStatus.Offline)
                 {
                     statusMessage.Text = activity.GetStatus();
                     statusIcon.FadeColour(activity.GetAppropriateColour(Colours), 500, Easing.OutQuint);
@@ -112,8 +113,8 @@ namespace osu.Game.Users
                 }
 
                 // Otherwise use only status
-                statusMessage.Text = status.Message;
-                statusIcon.FadeColour(status.GetAppropriateColour(Colours), 500, Easing.OutQuint);
+                statusMessage.Text = status.GetLocalisableDescription();
+                statusIcon.FadeColour(status.Value.GetAppropriateColour(Colours), 500, Easing.OutQuint);
 
                 return;
             }
@@ -121,11 +122,11 @@ namespace osu.Game.Users
             // Fallback to web status if local one is null
             if (User.IsOnline)
             {
-                Status.Value = new UserStatusOnline();
+                Status.Value = UserStatus.Online;
                 return;
             }
 
-            Status.Value = new UserStatusOffline();
+            Status.Value = UserStatus.Offline;
         }
 
         protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Users/UserStatus.cs b/osu.Game/Users/UserStatus.cs
index ffd86b78c7..cd25add4d1 100644
--- a/osu.Game/Users/UserStatus.cs
+++ b/osu.Game/Users/UserStatus.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 System.ComponentModel;
 using osu.Framework.Localisation;
 using osuTK.Graphics;
 using osu.Game.Graphics;
@@ -8,32 +10,36 @@ using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Users
 {
-    public abstract class UserStatus
+    public enum UserStatus
     {
-        public abstract LocalisableString Message { get; }
-        public abstract Color4 GetAppropriateColour(OsuColour colours);
+        [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.StatusOffline))]
+        Offline,
+
+        [Description("Do not disturb")]
+        DoNotDisturb,
+
+        [LocalisableDescription(typeof(UsersStrings), nameof(UsersStrings.StatusOnline))]
+        Online,
     }
 
-    public class UserStatusOnline : UserStatus
+    public static class UserStatusExtensions
     {
-        public override LocalisableString Message => UsersStrings.StatusOnline;
-        public override Color4 GetAppropriateColour(OsuColour colours) => colours.GreenLight;
-    }
+        public static Color4 GetAppropriateColour(this UserStatus userStatus, OsuColour colours)
+        {
+            switch (userStatus)
+            {
+                case UserStatus.Offline:
+                    return Color4.Black;
 
-    public abstract class UserStatusBusy : UserStatusOnline
-    {
-        public override Color4 GetAppropriateColour(OsuColour colours) => colours.YellowDark;
-    }
+                case UserStatus.DoNotDisturb:
+                    return colours.RedDark;
 
-    public class UserStatusOffline : UserStatus
-    {
-        public override LocalisableString Message => UsersStrings.StatusOffline;
-        public override Color4 GetAppropriateColour(OsuColour colours) => Color4.Black;
-    }
+                case UserStatus.Online:
+                    return colours.GreenDark;
 
-    public class UserStatusDoNotDisturb : UserStatus
-    {
-        public override LocalisableString Message => "Do not disturb";
-        public override Color4 GetAppropriateColour(OsuColour colours) => colours.RedDark;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(userStatus), userStatus, "Unsupported user status");
+            }
+        }
     }
 }

From 602550b9c233280d81cb65f8b39d1167a2ccaeca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Dec 2023 19:31:42 +0100
Subject: [PATCH 1893/2296] Fix test failures

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
index fb36580a42..1e9b0317fb 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
@@ -11,8 +11,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Rooms;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestPlayActivity()
         {
-            AddStep("Set activity", () => api.Activity.Value = new UserActivity.InSoloGame(new BeatmapInfo(), new RulesetInfo()));
+            AddStep("Set activity", () => api.Activity.Value = new UserActivity.InSoloGame(new BeatmapInfo(), new OsuRuleset().RulesetInfo));
 
             AddStep("Run command", () => Add(new NowPlayingCommand(new Channel())));
 
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestModPresence()
         {
-            AddStep("Set activity", () => api.Activity.Value = new UserActivity.InSoloGame(new BeatmapInfo(), new RulesetInfo()));
+            AddStep("Set activity", () => api.Activity.Value = new UserActivity.InSoloGame(new BeatmapInfo(), new OsuRuleset().RulesetInfo));
 
             AddStep("Add Hidden mod", () => SelectedMods.Value = new[] { Ruleset.Value.CreateInstance().CreateMod<ModHidden>() });
 

From 41c33f74f27822889290aea330ade6654eb6f5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Dec 2023 18:24:31 +0100
Subject: [PATCH 1894/2296] Extend metadata client with user presence-observing
 capabilities

---
 osu.Game/Online/Metadata/IMetadataClient.cs   |  14 +-
 osu.Game/Online/Metadata/IMetadataServer.cs   |  21 +++
 osu.Game/Online/Metadata/MetadataClient.cs    |  53 +++++++-
 .../Online/Metadata/OnlineMetadataClient.cs   | 120 +++++++++++++++++-
 osu.Game/Online/OnlineStatusNotifier.cs       |   8 ++
 osu.Game/Users/UserPresence.cs                |  28 ++++
 6 files changed, 239 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Users/UserPresence.cs

diff --git a/osu.Game/Online/Metadata/IMetadataClient.cs b/osu.Game/Online/Metadata/IMetadataClient.cs
index ad1e7ebbaf..7102554ae9 100644
--- a/osu.Game/Online/Metadata/IMetadataClient.cs
+++ b/osu.Game/Online/Metadata/IMetadataClient.cs
@@ -2,11 +2,23 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading.Tasks;
+using osu.Game.Users;
 
 namespace osu.Game.Online.Metadata
 {
-    public interface IMetadataClient
+    /// <summary>
+    /// Interface for metadata-related remote procedure calls to be executed on the client side.
+    /// </summary>
+    public interface IMetadataClient : IStatefulUserHubClient
     {
+        /// <summary>
+        /// Delivers the set of requested <see cref="BeatmapUpdates"/> to the client.
+        /// </summary>
         Task BeatmapSetsUpdated(BeatmapUpdates updates);
+
+        /// <summary>
+        /// Delivers an update of the <see cref="UserPresence"/> of the user with the supplied <paramref name="userId"/>.
+        /// </summary>
+        Task UserPresenceUpdated(int userId, UserPresence? status);
     }
 }
diff --git a/osu.Game/Online/Metadata/IMetadataServer.cs b/osu.Game/Online/Metadata/IMetadataServer.cs
index 994f60f877..9780045333 100644
--- a/osu.Game/Online/Metadata/IMetadataServer.cs
+++ b/osu.Game/Online/Metadata/IMetadataServer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading.Tasks;
+using osu.Game.Users;
 
 namespace osu.Game.Online.Metadata
 {
@@ -17,5 +18,25 @@ namespace osu.Game.Online.Metadata
         /// <param name="queueId">The last processed queue ID.</param>
         /// <returns></returns>
         Task<BeatmapUpdates> GetChangesSince(int queueId);
+
+        /// <summary>
+        /// Signals to the server that the current user's <see cref="UserActivity"/> has changed.
+        /// </summary>
+        Task UpdateActivity(UserActivity? activity);
+
+        /// <summary>
+        /// Signals to the server that the current user's <see cref="UserStatus"/> has changed.
+        /// </summary>
+        Task UpdateStatus(UserStatus? status);
+
+        /// <summary>
+        /// Signals to the server that the current user would like to begin receiving updates on other users' online presence.
+        /// </summary>
+        Task BeginWatchingUserPresence();
+
+        /// <summary>
+        /// Signals to the server that the current user would like to stop receiving updates on other users' online presence.
+        /// </summary>
+        Task EndWatchingUserPresence();
     }
 }
diff --git a/osu.Game/Online/Metadata/MetadataClient.cs b/osu.Game/Online/Metadata/MetadataClient.cs
index d4e7540fe7..8e99a9b2cb 100644
--- a/osu.Game/Online/Metadata/MetadataClient.cs
+++ b/osu.Game/Online/Metadata/MetadataClient.cs
@@ -4,22 +4,71 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Users;
 
 namespace osu.Game.Online.Metadata
 {
     public abstract partial class MetadataClient : Component, IMetadataClient, IMetadataServer
     {
-        public abstract Task BeatmapSetsUpdated(BeatmapUpdates updates);
+        public abstract IBindable<bool> IsConnected { get; }
+
+        #region Beatmap metadata updates
 
         public abstract Task<BeatmapUpdates> GetChangesSince(int queueId);
 
-        public Action<int[]>? ChangedBeatmapSetsArrived;
+        public abstract Task BeatmapSetsUpdated(BeatmapUpdates updates);
+
+        public event Action<int[]>? ChangedBeatmapSetsArrived;
 
         protected Task ProcessChanges(int[] beatmapSetIDs)
         {
             ChangedBeatmapSetsArrived?.Invoke(beatmapSetIDs.Distinct().ToArray());
             return Task.CompletedTask;
         }
+
+        #endregion
+
+        #region User presence updates
+
+        /// <summary>
+        /// Whether the client is currently receiving user presence updates from the server.
+        /// </summary>
+        public abstract IBindable<bool> IsWatchingUserPresence { get; }
+
+        /// <summary>
+        /// Dictionary keyed by user ID containing all of the <see cref="UserPresence"/> information about currently online users received from the server.
+        /// </summary>
+        public abstract IBindableDictionary<int, UserPresence> UserStates { get; }
+
+        /// <inheritdoc/>
+        public abstract Task UpdateActivity(UserActivity? activity);
+
+        /// <inheritdoc/>
+        public abstract Task UpdateStatus(UserStatus? status);
+
+        /// <inheritdoc/>
+        public abstract Task BeginWatchingUserPresence();
+
+        /// <inheritdoc/>
+        public abstract Task EndWatchingUserPresence();
+
+        /// <inheritdoc/>
+        public abstract Task UserPresenceUpdated(int userId, UserPresence? presence);
+
+        #endregion
+
+        #region Disconnection handling
+
+        public event Action? Disconnecting;
+
+        public virtual Task DisconnectRequested()
+        {
+            Schedule(() => Disconnecting?.Invoke());
+            return Task.CompletedTask;
+        }
+
+        #endregion
     }
 }
diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
index 57311419f7..27093d7961 100644
--- a/osu.Game/Online/Metadata/OnlineMetadataClient.cs
+++ b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
@@ -10,17 +11,32 @@ using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Configuration;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users;
 
 namespace osu.Game.Online.Metadata
 {
     public partial class OnlineMetadataClient : MetadataClient
     {
+        public override IBindable<bool> IsConnected { get; } = new Bindable<bool>();
+
+        public override IBindable<bool> IsWatchingUserPresence => isWatchingUserPresence;
+        private readonly BindableBool isWatchingUserPresence = new BindableBool();
+
+        // ReSharper disable once InconsistentlySynchronizedField
+        public override IBindableDictionary<int, UserPresence> UserStates => userStates;
+        private readonly BindableDictionary<int, UserPresence> userStates = new BindableDictionary<int, UserPresence>();
+
         private readonly string endpoint;
 
         private IHubClientConnector? connector;
 
         private Bindable<int> lastQueueId = null!;
 
+        private IBindable<APIUser> localUser = null!;
+        private IBindable<UserActivity?> userActivity = null!;
+        private IBindable<UserStatus?>? userStatus;
+
         private HubConnection? connection => connector?.CurrentConnection;
 
         public OnlineMetadataClient(EndpointConfiguration endpoints)
@@ -33,7 +49,7 @@ namespace osu.Game.Online.Metadata
         {
             // Importantly, we are intentionally not using MessagePack here to correctly support derived class serialization.
             // More information on the limitations / reasoning can be found in osu-server-spectator's initialisation code.
-            connector = api.GetHubConnector(nameof(OnlineMetadataClient), endpoint);
+            connector = api.GetHubConnector(nameof(OnlineMetadataClient), endpoint, false);
 
             if (connector != null)
             {
@@ -42,12 +58,37 @@ namespace osu.Game.Online.Metadata
                     // this is kind of SILLY
                     // https://github.com/dotnet/aspnetcore/issues/15198
                     connection.On<BeatmapUpdates>(nameof(IMetadataClient.BeatmapSetsUpdated), ((IMetadataClient)this).BeatmapSetsUpdated);
+                    connection.On<int, UserPresence?>(nameof(IMetadataClient.UserPresenceUpdated), ((IMetadataClient)this).UserPresenceUpdated);
                 };
 
-                connector.IsConnected.BindValueChanged(isConnectedChanged, true);
+                IsConnected.BindTo(connector.IsConnected);
+                IsConnected.BindValueChanged(isConnectedChanged, true);
             }
 
             lastQueueId = config.GetBindable<int>(OsuSetting.LastProcessedMetadataId);
+
+            localUser = api.LocalUser.GetBoundCopy();
+            userActivity = api.Activity.GetBoundCopy()!;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            localUser.BindValueChanged(_ =>
+            {
+                if (localUser.Value is not GuestUser)
+                {
+                    userStatus = localUser.Value.Status.GetBoundCopy();
+                    userStatus.BindValueChanged(status => UpdateStatus(status.NewValue), true);
+                }
+                else
+                    userStatus = null;
+            }, true);
+            userActivity.BindValueChanged(activity =>
+            {
+                if (localUser.Value is not GuestUser)
+                    UpdateActivity(activity.NewValue);
+            }, true);
         }
 
         private bool catchingUp;
@@ -55,7 +96,17 @@ namespace osu.Game.Online.Metadata
         private void isConnectedChanged(ValueChangedEvent<bool> connected)
         {
             if (!connected.NewValue)
+            {
+                isWatchingUserPresence.Value = false;
+                userStates.Clear();
                 return;
+            }
+
+            if (localUser.Value is not GuestUser)
+            {
+                UpdateActivity(userActivity.Value);
+                UpdateStatus(userStatus?.Value);
+            }
 
             if (lastQueueId.Value >= 0)
             {
@@ -116,6 +167,71 @@ namespace osu.Game.Online.Metadata
             return connection.InvokeAsync<BeatmapUpdates>(nameof(IMetadataServer.GetChangesSince), queueId);
         }
 
+        public override Task UpdateActivity(UserActivity? activity)
+        {
+            if (connector?.IsConnected.Value != true)
+                return Task.FromCanceled(new CancellationToken(true));
+
+            Debug.Assert(connection != null);
+            return connection.InvokeAsync(nameof(IMetadataServer.UpdateActivity), activity);
+        }
+
+        public override Task UpdateStatus(UserStatus? status)
+        {
+            if (connector?.IsConnected.Value != true)
+                return Task.FromCanceled(new CancellationToken(true));
+
+            Debug.Assert(connection != null);
+            return connection.InvokeAsync(nameof(IMetadataServer.UpdateStatus), status);
+        }
+
+        public override Task UserPresenceUpdated(int userId, UserPresence? presence)
+        {
+            lock (userStates)
+            {
+                if (presence != null)
+                    userStates[userId] = presence.Value;
+                else
+                    userStates.Remove(userId);
+            }
+
+            return Task.CompletedTask;
+        }
+
+        public override async Task BeginWatchingUserPresence()
+        {
+            if (connector?.IsConnected.Value != true)
+                throw new OperationCanceledException();
+
+            Debug.Assert(connection != null);
+            await connection.InvokeAsync(nameof(IMetadataServer.BeginWatchingUserPresence)).ConfigureAwait(false);
+            isWatchingUserPresence.Value = true;
+        }
+
+        public override async Task EndWatchingUserPresence()
+        {
+            try
+            {
+                if (connector?.IsConnected.Value != true)
+                    throw new OperationCanceledException();
+
+                // must happen synchronously before any remote calls to avoid misordering.
+                userStates.Clear();
+                Debug.Assert(connection != null);
+                await connection.InvokeAsync(nameof(IMetadataServer.EndWatchingUserPresence)).ConfigureAwait(false);
+            }
+            finally
+            {
+                isWatchingUserPresence.Value = false;
+            }
+        }
+
+        public override async Task DisconnectRequested()
+        {
+            await base.DisconnectRequested().ConfigureAwait(false);
+            await EndWatchingUserPresence().ConfigureAwait(false);
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Online/OnlineStatusNotifier.cs b/osu.Game/Online/OnlineStatusNotifier.cs
index 0d846f7d27..c36e4ab894 100644
--- a/osu.Game/Online/OnlineStatusNotifier.cs
+++ b/osu.Game/Online/OnlineStatusNotifier.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
+using osu.Game.Online.Metadata;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
@@ -30,6 +31,9 @@ namespace osu.Game.Online
         [Resolved]
         private SpectatorClient spectatorClient { get; set; } = null!;
 
+        [Resolved]
+        private MetadataClient metadataClient { get; set; } = null!;
+
         [Resolved]
         private INotificationOverlay? notificationOverlay { get; set; }
 
@@ -56,6 +60,7 @@ namespace osu.Game.Online
 
             multiplayerClient.Disconnecting += notifyAboutForcedDisconnection;
             spectatorClient.Disconnecting += notifyAboutForcedDisconnection;
+            metadataClient.Disconnecting += notifyAboutForcedDisconnection;
         }
 
         protected override void LoadComplete()
@@ -131,6 +136,9 @@ namespace osu.Game.Online
 
             if (multiplayerClient.IsNotNull())
                 multiplayerClient.Disconnecting -= notifyAboutForcedDisconnection;
+
+            if (metadataClient.IsNotNull())
+                metadataClient.Disconnecting -= notifyAboutForcedDisconnection;
         }
     }
 }
diff --git a/osu.Game/Users/UserPresence.cs b/osu.Game/Users/UserPresence.cs
new file mode 100644
index 0000000000..dff40a9889
--- /dev/null
+++ b/osu.Game/Users/UserPresence.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 System;
+using MessagePack;
+
+namespace osu.Game.Users
+{
+    /// <summary>
+    /// Structure containing all relevant information about a user's online presence.
+    /// </summary>
+    [Serializable]
+    [MessagePackObject]
+    public struct UserPresence
+    {
+        /// <summary>
+        /// The user's current activity.
+        /// </summary>
+        [Key(0)]
+        public UserActivity? Activity { get; set; }
+
+        /// <summary>
+        /// The user's current status.
+        /// </summary>
+        [Key(1)]
+        public UserStatus? Status { get; set; }
+    }
+}

From 54f3a622beb982ce82542db39b17e1917b6a6bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Dec 2023 18:25:16 +0100
Subject: [PATCH 1895/2296] Retrofit user presence watching into dashboard
 overlay

---
 ...ngDisplay.cs => CurrentlyOnlineDisplay.cs} | 113 ++++++++++++++----
 .../Dashboard/DashboardOverlayHeader.cs       |   2 +-
 osu.Game/Overlays/DashboardOverlay.cs         |  33 ++++-
 3 files changed, 124 insertions(+), 24 deletions(-)
 rename osu.Game/Overlays/Dashboard/{CurrentlyPlayingDisplay.cs => CurrentlyOnlineDisplay.cs} (63%)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
similarity index 63%
rename from osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
rename to osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
index 6967a61204..fe3151398f 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -20,6 +19,7 @@ using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Metadata;
 using osu.Game.Online.Spectator;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Screens;
@@ -30,19 +30,27 @@ using osuTK;
 
 namespace osu.Game.Overlays.Dashboard
 {
-    internal partial class CurrentlyPlayingDisplay : CompositeDrawable
+    internal partial class CurrentlyOnlineDisplay : CompositeDrawable
     {
         private const float search_textbox_height = 40;
         private const float padding = 10;
 
         private readonly IBindableList<int> playingUsers = new BindableList<int>();
+        private readonly IBindableDictionary<int, UserPresence> onlineUsers = new BindableDictionary<int, UserPresence>();
+        private readonly Dictionary<int, OnlineUserPanel> userPanels = new Dictionary<int, OnlineUserPanel>();
 
-        private SearchContainer<PlayingUserPanel> userFlow;
+        private SearchContainer<OnlineUserPanel> userFlow;
         private BasicSearchTextBox searchTextBox;
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         [Resolved]
         private SpectatorClient spectatorClient { get; set; }
 
+        [Resolved]
+        private MetadataClient metadataClient { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
@@ -72,7 +80,7 @@ namespace osu.Game.Overlays.Dashboard
                         PlaceholderText = HomeStrings.SearchPlaceholder,
                     },
                 },
-                userFlow = new SearchContainer<PlayingUserPanel>
+                userFlow = new SearchContainer<OnlineUserPanel>
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
@@ -97,6 +105,9 @@ namespace osu.Game.Overlays.Dashboard
         {
             base.LoadComplete();
 
+            onlineUsers.BindTo(metadataClient.UserStates);
+            onlineUsers.BindCollectionChanged(onUserUpdated, true);
+
             playingUsers.BindTo(spectatorClient.PlayingUsers);
             playingUsers.BindCollectionChanged(onPlayingUsersChanged, true);
         }
@@ -108,15 +119,20 @@ namespace osu.Game.Overlays.Dashboard
             searchTextBox.TakeFocus();
         }
 
-        private void onPlayingUsersChanged(object sender, NotifyCollectionChangedEventArgs e) => Schedule(() =>
+        private void onUserUpdated(object sender, NotifyDictionaryChangedEventArgs<int, UserPresence> e) => Schedule(() =>
         {
             switch (e.Action)
             {
-                case NotifyCollectionChangedAction.Add:
+                case NotifyDictionaryChangedAction.Add:
                     Debug.Assert(e.NewItems != null);
 
-                    foreach (int userId in e.NewItems)
+                    foreach (var kvp in e.NewItems)
                     {
+                        int userId = kvp.Key;
+
+                        if (userId == api.LocalUser.Value.Id)
+                            continue;
+
                         users.GetUserAsync(userId).ContinueWith(task =>
                         {
                             APIUser user = task.GetResultSafely();
@@ -126,40 +142,90 @@ namespace osu.Game.Overlays.Dashboard
 
                             Schedule(() =>
                             {
-                                // user may no longer be playing.
-                                if (!playingUsers.Contains(user.Id))
-                                    return;
+                                // explicitly refetch the user's status.
+                                // things may have changed in between the time of scheduling and the time of actual execution.
+                                if (onlineUsers.TryGetValue(userId, out var updatedStatus))
+                                {
+                                    user.Activity.Value = updatedStatus.Activity;
+                                    user.Status.Value = updatedStatus.Status;
+                                }
 
-                                // TODO: remove this once online state is being updated more correctly.
-                                user.IsOnline = true;
-
-                                userFlow.Add(createUserPanel(user));
+                                userFlow.Add(userPanels[userId] = createUserPanel(user));
                             });
                         });
                     }
 
                     break;
 
+                case NotifyDictionaryChangedAction.Replace:
+                    Debug.Assert(e.NewItems != null);
+
+                    foreach (var kvp in e.NewItems)
+                    {
+                        if (userPanels.TryGetValue(kvp.Key, out var panel))
+                        {
+                            panel.User.Activity.Value = kvp.Value.Activity;
+                            panel.User.Status.Value = kvp.Value.Status;
+                        }
+                    }
+
+                    break;
+
+                case NotifyDictionaryChangedAction.Remove:
+                    Debug.Assert(e.OldItems != null);
+
+                    foreach (var kvp in e.OldItems)
+                    {
+                        int userId = kvp.Key;
+                        if (userPanels.Remove(userId, out var userPanel))
+                            userPanel.Expire();
+                    }
+
+                    break;
+            }
+        });
+
+        private void onPlayingUsersChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    Debug.Assert(e.NewItems != null);
+
+                    foreach (int userId in e.NewItems)
+                    {
+                        if (userPanels.TryGetValue(userId, out var panel))
+                            panel.CanSpectate.Value = userId != api.LocalUser.Value.Id;
+                    }
+
+                    break;
+
                 case NotifyCollectionChangedAction.Remove:
                     Debug.Assert(e.OldItems != null);
 
                     foreach (int userId in e.OldItems)
-                        userFlow.FirstOrDefault(card => card.User.Id == userId)?.Expire();
+                    {
+                        if (userPanels.TryGetValue(userId, out var panel))
+                            panel.CanSpectate.Value = false;
+                    }
+
                     break;
             }
-        });
+        }
 
-        private PlayingUserPanel createUserPanel(APIUser user) =>
-            new PlayingUserPanel(user).With(panel =>
+        private OnlineUserPanel createUserPanel(APIUser user) =>
+            new OnlineUserPanel(user).With(panel =>
             {
                 panel.Anchor = Anchor.TopCentre;
                 panel.Origin = Anchor.TopCentre;
             });
 
-        public partial class PlayingUserPanel : CompositeDrawable, IFilterable
+        public partial class OnlineUserPanel : CompositeDrawable, IFilterable
         {
             public readonly APIUser User;
 
+            public BindableBool CanSpectate { get; } = new BindableBool();
+
             public IEnumerable<LocalisableString> FilterTerms { get; }
 
             [Resolved(canBeNull: true)]
@@ -178,7 +244,7 @@ namespace osu.Game.Overlays.Dashboard
                 }
             }
 
-            public PlayingUserPanel(APIUser user)
+            public OnlineUserPanel(APIUser user)
             {
                 User = user;
 
@@ -188,7 +254,7 @@ namespace osu.Game.Overlays.Dashboard
             }
 
             [BackgroundDependencyLoader]
-            private void load(IAPIProvider api)
+            private void load()
             {
                 InternalChildren = new Drawable[]
                 {
@@ -205,6 +271,9 @@ namespace osu.Game.Overlays.Dashboard
                                 RelativeSizeAxes = Axes.X,
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
+                                // this is SHOCKING
+                                Activity = { BindTarget = User.Activity },
+                                Status = { BindTarget = User.Status },
                             },
                             new PurpleRoundedButton
                             {
@@ -213,7 +282,7 @@ namespace osu.Game.Overlays.Dashboard
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Action = () => performer?.PerformFromScreen(s => s.Push(new SoloSpectatorScreen(User))),
-                                Enabled = { Value = User.Id != api.LocalUser.Value.Id }
+                                Enabled = { BindTarget = CanSpectate }
                             }
                         }
                     },
diff --git a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
index b9d869c2ec..104f0943dc 100644
--- a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
+++ b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Dashboard
         [LocalisableDescription(typeof(FriendsStrings), nameof(FriendsStrings.TitleCompact))]
         Friends,
 
-        [Description("Currently Playing")]
+        [Description("Currently online")]
         CurrentlyPlaying
     }
 }
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 2f96421531..1861f892bd 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -2,6 +2,11 @@
 // 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.Containers;
+using osu.Game.Online.Metadata;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays.Dashboard;
 using osu.Game.Overlays.Dashboard.Friends;
 
@@ -9,6 +14,11 @@ namespace osu.Game.Overlays
 {
     public partial class DashboardOverlay : TabbableOnlineOverlay<DashboardOverlayHeader, DashboardOverlayTabs>
     {
+        [Resolved]
+        private MetadataClient metadataClient { get; set; } = null!;
+
+        private IBindable<bool> metadataConnected = null!;
+
         public DashboardOverlay()
             : base(OverlayColourScheme.Purple)
         {
@@ -27,12 +37,33 @@ namespace osu.Game.Overlays
                     break;
 
                 case DashboardOverlayTabs.CurrentlyPlaying:
-                    LoadDisplay(new CurrentlyPlayingDisplay());
+                    LoadDisplay(new CurrentlyOnlineDisplay());
                     break;
 
                 default:
                     throw new NotImplementedException($"Display for {tab} tab is not implemented");
             }
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            metadataConnected = metadataClient.IsConnected.GetBoundCopy();
+            metadataConnected.BindValueChanged(_ => updateUserPresenceState());
+            State.BindValueChanged(_ => updateUserPresenceState());
+            updateUserPresenceState();
+        }
+
+        private void updateUserPresenceState()
+        {
+            if (!metadataConnected.Value)
+                return;
+
+            if (State.Value == Visibility.Visible)
+                metadataClient.BeginWatchingUserPresence().FireAndForget();
+            else
+                metadataClient.EndWatchingUserPresence().FireAndForget();
+        }
     }
 }

From 86e003aec1cfc97014aebe00c71fe11e999dfae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Dec 2023 18:25:30 +0100
Subject: [PATCH 1896/2296] Update currently online display tests

---
 ....cs => TestSceneCurrentlyOnlineDisplay.cs} | 33 ++++++--
 .../Visual/Metadata/TestMetadataClient.cs     | 81 +++++++++++++++++++
 2 files changed, 106 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Visual/Online/{TestSceneCurrentlyPlayingDisplay.cs => TestSceneCurrentlyOnlineDisplay.cs} (60%)
 create mode 100644 osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs
similarity index 60%
rename from osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
rename to osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs
index 5237238f63..7687cd195d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs
@@ -10,43 +10,50 @@ using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Metadata;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dashboard;
+using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Tests.Visual.Metadata;
 using osu.Game.Tests.Visual.Spectator;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public partial class TestSceneCurrentlyPlayingDisplay : OsuTestScene
+    public partial class TestSceneCurrentlyOnlineDisplay : OsuTestScene
     {
         private readonly APIUser streamingUser = new APIUser { Id = 2, Username = "Test user" };
 
         private TestSpectatorClient spectatorClient = null!;
-        private CurrentlyPlayingDisplay currentlyPlaying = null!;
+        private TestMetadataClient metadataClient = null!;
+        private CurrentlyOnlineDisplay currentlyOnline = null!;
 
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("add streaming client", () =>
+            AddStep("set up components", () =>
             {
                 spectatorClient = new TestSpectatorClient();
+                metadataClient = new TestMetadataClient();
                 var lookupCache = new TestUserLookupCache();
 
                 Children = new Drawable[]
                 {
                     lookupCache,
                     spectatorClient,
+                    metadataClient,
                     new DependencyProvidingContainer
                     {
                         RelativeSizeAxes = Axes.Both,
                         CachedDependencies = new (Type, object)[]
                         {
                             (typeof(SpectatorClient), spectatorClient),
+                            (typeof(MetadataClient), metadataClient),
                             (typeof(UserLookupCache), lookupCache),
                             (typeof(OverlayColourProvider), new OverlayColourProvider(OverlayColourScheme.Purple)),
                         },
-                        Child = currentlyPlaying = new CurrentlyPlayingDisplay
+                        Child = currentlyOnline = new CurrentlyOnlineDisplay
                         {
                             RelativeSizeAxes = Axes.Both,
                         }
@@ -58,10 +65,20 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestBasicDisplay()
         {
-            AddStep("Add playing user", () => spectatorClient.SendStartPlay(streamingUser.Id, 0));
-            AddUntilStep("Panel loaded", () => currentlyPlaying.ChildrenOfType<UserGridPanel>().FirstOrDefault()?.User.Id == 2);
-            AddStep("Remove playing user", () => spectatorClient.SendEndPlay(streamingUser.Id));
-            AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any());
+            AddStep("Begin watching user presence", () => metadataClient.BeginWatchingUserPresence());
+            AddStep("Add online user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, new UserPresence { Status = UserStatus.Online, Activity = new UserActivity.ChoosingBeatmap() }));
+            AddUntilStep("Panel loaded", () => currentlyOnline.ChildrenOfType<UserGridPanel>().FirstOrDefault()?.User.Id == 2);
+            AddAssert("Spectate button disabled", () => currentlyOnline.ChildrenOfType<PurpleRoundedButton>().First().Enabled.Value, () => Is.False);
+
+            AddStep("User began playing", () => spectatorClient.SendStartPlay(streamingUser.Id, 0));
+            AddAssert("Spectate button enabled", () => currentlyOnline.ChildrenOfType<PurpleRoundedButton>().First().Enabled.Value, () => Is.True);
+
+            AddStep("User finished playing", () => spectatorClient.SendEndPlay(streamingUser.Id));
+            AddAssert("Spectate button disabled", () => currentlyOnline.ChildrenOfType<PurpleRoundedButton>().First().Enabled.Value, () => Is.False);
+
+            AddStep("Remove playing user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, null));
+            AddUntilStep("Panel no longer present", () => !currentlyOnline.ChildrenOfType<UserGridPanel>().Any());
+            AddStep("End watching user presence", () => metadataClient.EndWatchingUserPresence());
         }
 
         internal partial class TestUserLookupCache : UserLookupCache
diff --git a/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs b/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs
new file mode 100644
index 0000000000..16cbf879df
--- /dev/null
+++ b/osu.Game/Tests/Visual/Metadata/TestMetadataClient.cs
@@ -0,0 +1,81 @@
+// 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.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
+using osu.Game.Online.Metadata;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Metadata
+{
+    public partial class TestMetadataClient : MetadataClient
+    {
+        public override IBindable<bool> IsConnected => new BindableBool(true);
+
+        public override IBindable<bool> IsWatchingUserPresence => isWatchingUserPresence;
+        private readonly BindableBool isWatchingUserPresence = new BindableBool();
+
+        public override IBindableDictionary<int, UserPresence> UserStates => userStates;
+        private readonly BindableDictionary<int, UserPresence> userStates = new BindableDictionary<int, UserPresence>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        public override Task BeginWatchingUserPresence()
+        {
+            isWatchingUserPresence.Value = true;
+            return Task.CompletedTask;
+        }
+
+        public override Task EndWatchingUserPresence()
+        {
+            isWatchingUserPresence.Value = false;
+            return Task.CompletedTask;
+        }
+
+        public override Task UpdateActivity(UserActivity? activity)
+        {
+            if (isWatchingUserPresence.Value)
+            {
+                userStates.TryGetValue(api.LocalUser.Value.Id, out var localUserPresence);
+                localUserPresence = localUserPresence with { Activity = activity };
+                userStates[api.LocalUser.Value.Id] = localUserPresence;
+            }
+
+            return Task.CompletedTask;
+        }
+
+        public override Task UpdateStatus(UserStatus? status)
+        {
+            if (isWatchingUserPresence.Value)
+            {
+                userStates.TryGetValue(api.LocalUser.Value.Id, out var localUserPresence);
+                localUserPresence = localUserPresence with { Status = status };
+                userStates[api.LocalUser.Value.Id] = localUserPresence;
+            }
+
+            return Task.CompletedTask;
+        }
+
+        public override Task UserPresenceUpdated(int userId, UserPresence? presence)
+        {
+            if (isWatchingUserPresence.Value)
+            {
+                if (presence.HasValue)
+                    userStates[userId] = presence.Value;
+                else
+                    userStates.Remove(userId);
+            }
+
+            return Task.CompletedTask;
+        }
+
+        public override Task<BeatmapUpdates> GetChangesSince(int queueId)
+            => Task.FromResult(new BeatmapUpdates(Array.Empty<int>(), queueId));
+
+        public override Task BeatmapSetsUpdated(BeatmapUpdates updates) => Task.CompletedTask;
+    }
+}

From 37049d41b4850da8c15f5dedc0c7f06a6807be4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Dec 2023 18:25:50 +0100
Subject: [PATCH 1897/2296] Show user's status as tooltip on the extended user
 panel

---
 osu.Game/Users/ExtendedUserPanel.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Users/ExtendedUserPanel.cs b/osu.Game/Users/ExtendedUserPanel.cs
index 18fe852556..1359f5d792 100644
--- a/osu.Game/Users/ExtendedUserPanel.cs
+++ b/osu.Game/Users/ExtendedUserPanel.cs
@@ -9,10 +9,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Users.Drawables;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Users
@@ -26,7 +28,7 @@ namespace osu.Game.Users
         protected TextFlowContainer LastVisitMessage { get; private set; }
 
         private StatusIcon statusIcon;
-        private OsuSpriteText statusMessage;
+        private StatusText statusMessage;
 
         protected ExtendedUserPanel(APIUser user)
             : base(user)
@@ -88,7 +90,7 @@ namespace osu.Game.Users
                 }
             }));
 
-            statusContainer.Add(statusMessage = new OsuSpriteText
+            statusContainer.Add(statusMessage = new StatusText
             {
                 Anchor = alignment,
                 Origin = alignment,
@@ -108,12 +110,14 @@ namespace osu.Game.Users
                 if (activity != null && status != UserStatus.Offline)
                 {
                     statusMessage.Text = activity.GetStatus();
+                    statusMessage.TooltipText = activity.GetDetails();
                     statusIcon.FadeColour(activity.GetAppropriateColour(Colours), 500, Easing.OutQuint);
                     return;
                 }
 
                 // Otherwise use only status
                 statusMessage.Text = status.GetLocalisableDescription();
+                statusMessage.TooltipText = string.Empty;
                 statusIcon.FadeColour(status.Value.GetAppropriateColour(Colours), 500, Easing.OutQuint);
 
                 return;
@@ -140,5 +144,10 @@ namespace osu.Game.Users
             BorderThickness = 0;
             base.OnHoverLost(e);
         }
+
+        private partial class StatusText : OsuSpriteText, IHasTooltip
+        {
+            public LocalisableString TooltipText { get; set; }
+        }
     }
 }

From 193047619210ce42a2a54e87dcce2bffb5ddab70 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Thu, 7 Dec 2023 00:26:13 +0100
Subject: [PATCH 1898/2296] Add circle arc segments

---
 .../Sliders/SliderPlacementBlueprint.cs       | 77 ++++++++++++++++++-
 1 file changed, 74 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 672ac43f2c..f5d0d82c2a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -335,15 +336,85 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 if (segment.Count == 0)
                     continue;
 
-                HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[0], PathType.BSpline(4)));
-                for (int j = 1; j < segment.Count - 1; j++)
-                    HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[j]));
+                // Replace this segment with a circular arc if it is a reasonable substitute.
+                var circleArcSegment = tryCircleArc(segment);
+
+                if (circleArcSegment is not null)
+                {
+                    HitObject.Path.ControlPoints.Add(new PathControlPoint(circleArcSegment[0], PathType.PERFECT_CURVE));
+                    HitObject.Path.ControlPoints.Add(new PathControlPoint(circleArcSegment[1]));
+                }
+                else
+                {
+                    HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[0], PathType.BSpline(4)));
+                    for (int j = 1; j < segment.Count - 1; j++)
+                        HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[j]));
+                }
 
                 if (isLastSegment)
                     HitObject.Path.ControlPoints.Add(new PathControlPoint(segment[^1]));
             }
         }
 
+        private Vector2[] tryCircleArc(List<Vector2> segment)
+        {
+            if (segment.Count < 3) return null;
+
+            // Assume the segment creates a reasonable circular arc and then check if it reasonable
+            var points = PathApproximator.BSplineToPiecewiseLinear(segment.ToArray(), bSplineBuilder.Degree);
+            var circleArcControlPoints = new[] { points[0], points[points.Count / 2], points[^1] };
+            var circleArc = new CircularArcProperties(circleArcControlPoints);
+
+            if (!circleArc.IsValid) return null;
+
+            double length = circleArc.ThetaRange * circleArc.Radius;
+
+            if (length > 1000) return null;
+
+            double loss = 0;
+            Vector2? lastPoint = null;
+            Vector2? lastVec = null;
+            int? lastDir = null;
+            double totalWinding = 0;
+
+            // Loop through the points and check if they are not too far away from the circular arc.
+            // Also make sure it curves monotonically in one direction and at most one loop is done.
+            foreach (var point in points)
+            {
+                loss += Math.Pow((Vector2.Distance(point, circleArc.Centre) - circleArc.Radius) / length, 2);
+
+                if (lastPoint.HasValue)
+                {
+                    var vec = point - lastPoint.Value;
+
+                    if (lastVec.HasValue)
+                    {
+                        double dot = Vector2.Dot(vec, lastVec.Value);
+                        double det = lastVec.Value.X * vec.Y - lastVec.Value.Y * vec.X;
+                        double angle = Math.Atan2(det, dot);
+                        int dir = Math.Sign(angle);
+
+                        if (dir == 0)
+                            continue;
+
+                        if (lastDir.HasValue && dir != lastDir)
+                            return null; // Curvature changed, like in an S-shape
+
+                        totalWinding += Math.Abs(angle);
+                        lastDir = dir;
+                    }
+
+                    lastVec = vec;
+                }
+
+                lastPoint = point;
+            }
+
+            loss /= points.Count;
+
+            return loss > 0.002 || totalWinding > MathHelper.TwoPi ? null : circleArcControlPoints;
+        }
+
         private enum SliderPlacementState
         {
             Initial,

From 89859b85b7e8523171fe6e7d686bf4e6ecb99d3c Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Thu, 7 Dec 2023 00:43:34 +0100
Subject: [PATCH 1899/2296] add controllable leniency

---
 .../Sliders/SliderPlacementBlueprint.cs       |  9 ++++--
 .../Edit/FreehandSliderToolboxGroup.cs        | 32 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index f5d0d82c2a..5878c0e11b 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -95,6 +95,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                     bSplineBuilder.CornerThreshold = e.NewValue;
                     Scheduler.AddOnce(updateSliderPathFromBSplineBuilder);
                 }, true);
+
+                freehandToolboxGroup.CircleThreshold.BindValueChanged(e =>
+                {
+                    Scheduler.AddOnce(updateSliderPathFromBSplineBuilder);
+                }, true);
             }
         }
 
@@ -358,7 +363,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private Vector2[] tryCircleArc(List<Vector2> segment)
         {
-            if (segment.Count < 3) return null;
+            if (segment.Count < 3 || freehandToolboxGroup.CircleThreshold.Value == 0) return null;
 
             // Assume the segment creates a reasonable circular arc and then check if it reasonable
             var points = PathApproximator.BSplineToPiecewiseLinear(segment.ToArray(), bSplineBuilder.Degree);
@@ -412,7 +417,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             loss /= points.Count;
 
-            return loss > 0.002 || totalWinding > MathHelper.TwoPi ? null : circleArcControlPoints;
+            return loss > freehandToolboxGroup.CircleThreshold.Value || totalWinding > MathHelper.TwoPi ? null : circleArcControlPoints;
         }
 
         private enum SliderPlacementState
diff --git a/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
index 7d1eb4e270..c574280267 100644
--- a/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
+++ b/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
@@ -31,6 +31,13 @@ namespace osu.Game.Rulesets.Osu.Edit
             Precision = 0.01f
         };
 
+        public BindableFloat CircleThreshold { get; } = new BindableFloat(0.002f)
+        {
+            MinValue = 0f,
+            MaxValue = 0.005f,
+            Precision = 0.0001f
+        };
+
         // We map internal ranges to a more standard range of values for display to the user.
         private readonly BindableInt displayTolerance = new BindableInt(100)
         {
@@ -44,8 +51,15 @@ namespace osu.Game.Rulesets.Osu.Edit
             MaxValue = 100
         };
 
+        private readonly BindableInt displayCircleThreshold = new BindableInt(40)
+        {
+            MinValue = 0,
+            MaxValue = 100
+        };
+
         private ExpandableSlider<int> toleranceSlider = null!;
         private ExpandableSlider<int> cornerThresholdSlider = null!;
+        private ExpandableSlider<int> circleThresholdSlider = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -59,6 +73,10 @@ namespace osu.Game.Rulesets.Osu.Edit
                 cornerThresholdSlider = new ExpandableSlider<int>
                 {
                     Current = displayCornerThreshold
+                },
+                circleThresholdSlider = new ExpandableSlider<int>
+                {
+                    Current = displayCircleThreshold
                 }
             };
         }
@@ -83,18 +101,32 @@ namespace osu.Game.Rulesets.Osu.Edit
                 CornerThreshold.Value = displayToInternalCornerThreshold(threshold.NewValue);
             }, true);
 
+            displayCircleThreshold.BindValueChanged(threshold =>
+            {
+                circleThresholdSlider.ContractedLabelText = $"P. C. T.: {threshold.NewValue:N0}";
+                circleThresholdSlider.ExpandedLabelText = $"Perfect Curve Threshold: {threshold.NewValue:N0}";
+
+                CircleThreshold.Value = displayToInternalCircleThreshold(threshold.NewValue);
+            }, true);
+
             Tolerance.BindValueChanged(tolerance =>
                 displayTolerance.Value = internalToDisplayTolerance(tolerance.NewValue)
             );
             CornerThreshold.BindValueChanged(threshold =>
                 displayCornerThreshold.Value = internalToDisplayCornerThreshold(threshold.NewValue)
             );
+            CircleThreshold.BindValueChanged(threshold =>
+                displayCircleThreshold.Value = internalToDisplayCircleThreshold(threshold.NewValue)
+            );
 
             float displayToInternalTolerance(float v) => v / 50f;
             int internalToDisplayTolerance(float v) => (int)Math.Round(v * 50f);
 
             float displayToInternalCornerThreshold(float v) => v / 100f;
             int internalToDisplayCornerThreshold(float v) => (int)Math.Round(v * 100f);
+
+            float displayToInternalCircleThreshold(float v) => v / 20000f;
+            int internalToDisplayCircleThreshold(float v) => (int)Math.Round(v * 20000f);
         }
     }
 }

From a2ec75d824b4bc80198a8937944ed84d7f904158 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Thu, 7 Dec 2023 00:57:29 +0100
Subject: [PATCH 1900/2296] Fix illegal circle arc with center out of polygon

---
 .../Sliders/SliderPlacementBlueprint.cs       | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 5878c0e11b..e5dada19bb 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -379,37 +379,56 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             double loss = 0;
             Vector2? lastPoint = null;
             Vector2? lastVec = null;
+            Vector2? lastVec2 = null;
             int? lastDir = null;
+            int? lastDir2 = null;
             double totalWinding = 0;
 
             // Loop through the points and check if they are not too far away from the circular arc.
             // Also make sure it curves monotonically in one direction and at most one loop is done.
             foreach (var point in points)
             {
-                loss += Math.Pow((Vector2.Distance(point, circleArc.Centre) - circleArc.Radius) / length, 2);
+                var vec = point - circleArc.Centre;
+                loss += Math.Pow((vec.Length - circleArc.Radius) / length, 2);
+
+                if (lastVec.HasValue)
+                {
+                    double det = lastVec.Value.X * vec.Y - lastVec.Value.Y * vec.X;
+                    int dir = Math.Sign(det);
+
+                    if (dir == 0)
+                        continue;
+
+                    if (lastDir.HasValue && dir != lastDir)
+                        return null; // Circle center is not inside the polygon
+
+                    lastDir = dir;
+                }
+
+                lastVec = vec;
 
                 if (lastPoint.HasValue)
                 {
-                    var vec = point - lastPoint.Value;
+                    var vec2 = point - lastPoint.Value;
 
-                    if (lastVec.HasValue)
+                    if (lastVec2.HasValue)
                     {
-                        double dot = Vector2.Dot(vec, lastVec.Value);
-                        double det = lastVec.Value.X * vec.Y - lastVec.Value.Y * vec.X;
+                        double dot = Vector2.Dot(vec2, lastVec2.Value);
+                        double det = lastVec2.Value.X * vec2.Y - lastVec2.Value.Y * vec2.X;
                         double angle = Math.Atan2(det, dot);
-                        int dir = Math.Sign(angle);
+                        int dir2 = Math.Sign(angle);
 
-                        if (dir == 0)
+                        if (dir2 == 0)
                             continue;
 
-                        if (lastDir.HasValue && dir != lastDir)
+                        if (lastDir2.HasValue && dir2 != lastDir2)
                             return null; // Curvature changed, like in an S-shape
 
                         totalWinding += Math.Abs(angle);
-                        lastDir = dir;
+                        lastDir2 = dir2;
                     }
 
-                    lastVec = vec;
+                    lastVec2 = vec2;
                 }
 
                 lastPoint = point;

From 7b49db05d134676605efd0859016c78f9900ebee Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Thu, 7 Dec 2023 01:15:42 +0100
Subject: [PATCH 1901/2296] Update default parameters to be slightly better

---
 osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
index c574280267..f17118ba34 100644
--- a/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
+++ b/osu.Game.Rulesets.Osu/Edit/FreehandSliderToolboxGroup.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        public BindableFloat Tolerance { get; } = new BindableFloat(2f)
+        public BindableFloat Tolerance { get; } = new BindableFloat(1.8f)
         {
             MinValue = 0.05f,
             MaxValue = 2.0f,
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             Precision = 0.01f
         };
 
-        public BindableFloat CircleThreshold { get; } = new BindableFloat(0.002f)
+        public BindableFloat CircleThreshold { get; } = new BindableFloat(0.0015f)
         {
             MinValue = 0f,
             MaxValue = 0.005f,
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         };
 
         // We map internal ranges to a more standard range of values for display to the user.
-        private readonly BindableInt displayTolerance = new BindableInt(100)
+        private readonly BindableInt displayTolerance = new BindableInt(90)
         {
             MinValue = 5,
             MaxValue = 100
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             MaxValue = 100
         };
 
-        private readonly BindableInt displayCircleThreshold = new BindableInt(40)
+        private readonly BindableInt displayCircleThreshold = new BindableInt(30)
         {
             MinValue = 0,
             MaxValue = 100

From d6cb8b70bb653ae2bdf4a3a483818dc06bc1f7a3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 7 Dec 2023 12:25:23 +0900
Subject: [PATCH 1902/2296] Fix FP precision issue when converting mania
 beatmaps

---
 .../ManiaBeatmapConversionTest.cs             |   4 +-
 .../ManiaBeatmapSampleConversionTest.cs       |   2 +-
 .../ManiaDifficultyCalculatorTest.cs          |   2 +-
 .../Beatmaps/100374-expected-conversion.json  |   1 +
 .../Resources/Testing/Beatmaps/100374.osu     | 449 ++++++++++++++++++
 .../Beatmaps/20544-expected-conversion.json   |   1 +
 .../Resources/Testing/Beatmaps/20544.osu      | 126 +++++
 .../Beatmaps/basic-expected-conversion.json   |   0
 .../Resources/Testing/Beatmaps/basic.osu      |  54 +--
 .../convert-samples-expected-conversion.json  |   0
 .../Testing/Beatmaps/convert-samples.osu      |   0
 .../Testing/Beatmaps/diffcalc-test.osu        |   0
 .../mania-samples-expected-conversion.json    |   0
 .../Testing/Beatmaps/mania-samples.osu        |   0
 ...r-convert-samples-expected-conversion.json |   0
 .../Beatmaps/slider-convert-samples.osu       |   0
 ...ero-length-slider-expected-conversion.json |   0
 .../Testing/Beatmaps/zero-length-slider.osu   |   0
 .../Patterns/Legacy/PatternGenerator.cs       |   8 +-
 19 files changed, 615 insertions(+), 32 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374.osu
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544.osu
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/basic-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/basic.osu (96%)
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/convert-samples.osu (100%)
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/diffcalc-test.osu (100%)
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/mania-samples.osu (100%)
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/slider-convert-samples.osu (100%)
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Mania => osu.Game.Rulesets.Mania.Tests}/Resources/Testing/Beatmaps/zero-length-slider.osu (100%)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
index ef6dca620a..435d5e737e 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
@@ -18,10 +18,12 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class ManiaBeatmapConversionTest : BeatmapConversionTest<ManiaConvertMapping, ConvertValue>
     {
-        protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
+        protected override string ResourceAssembly => "osu.Game.Rulesets.Mania.Tests";
 
         [TestCase("basic")]
         [TestCase("zero-length-slider")]
+        [TestCase("20544")]
+        [TestCase("100374")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
index 51f35d3c3d..99598557a6 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapSampleConversionTest.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class ManiaBeatmapSampleConversionTest : BeatmapConversionTest<ConvertMapping<SampleConvertValue>, SampleConvertValue>
     {
-        protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
+        protected override string ResourceAssembly => "osu.Game.Rulesets.Mania.Tests";
 
         [TestCase("convert-samples")]
         [TestCase("mania-samples")]
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
index 7b0171a9ee..229df4b67b 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 {
     public class ManiaDifficultyCalculatorTest : DifficultyCalculatorTest
     {
-        protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
+        protected override string ResourceAssembly => "osu.Game.Rulesets.Mania.Tests";
 
         [TestCase(2.3493769750220914d, 242, "diffcalc-test")]
         public void Test(double expectedStarRating, int expectedMaxCombo, string name)
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374-expected-conversion.json
new file mode 100644
index 0000000000..59f73f7ad4
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"RandomW":273084013,"RandomX":842502087,"RandomY":3579807591,"RandomZ":273326509,"StartTime":15562.0,"Objects":[{"StartTime":15562.0,"EndTime":17155.0,"Column":0}]},{"RandomW":2659258901,"RandomX":3579807591,"RandomY":273326509,"RandomZ":273084013,"StartTime":17686.0,"Objects":[{"StartTime":17686.0,"EndTime":17686.0,"Column":0},{"StartTime":17686.0,"EndTime":17686.0,"Column":1}]},{"RandomW":3083655709,"RandomX":273326509,"RandomY":273084013,"RandomZ":2659258901,"StartTime":17951.0,"Objects":[{"StartTime":17951.0,"EndTime":17951.0,"Column":1}]},{"RandomW":3588026162,"RandomX":2659258901,"RandomY":3083655709,"RandomZ":4073603712,"StartTime":18217.0,"Objects":[{"StartTime":18217.0,"EndTime":18217.0,"Column":2},{"StartTime":18217.0,"EndTime":18217.0,"Column":4}]},{"RandomW":1130061350,"RandomX":3083655709,"RandomY":4073603712,"RandomZ":3588026162,"StartTime":18482.0,"Objects":[{"StartTime":18482.0,"EndTime":18482.0,"Column":2}]},{"RandomW":315421426,"RandomX":3588026162,"RandomY":1130061350,"RandomZ":2459334754,"StartTime":18748.0,"Objects":[{"StartTime":18748.0,"EndTime":19013.0,"Column":0}]},{"RandomW":3110660773,"RandomX":2459334754,"RandomY":315421426,"RandomZ":542845670,"StartTime":19279.0,"Objects":[{"StartTime":19279.0,"EndTime":19809.0,"Column":3},{"StartTime":19544.0,"EndTime":19544.0,"Column":1},{"StartTime":19809.0,"EndTime":19809.0,"Column":1}]},{"RandomW":3110660773,"RandomX":2459334754,"RandomY":315421426,"RandomZ":542845670,"StartTime":20075.0,"Objects":[{"StartTime":20075.0,"EndTime":20075.0,"Column":4},{"StartTime":20075.0,"EndTime":20075.0,"Column":2}]},{"RandomW":2552021122,"RandomX":315421426,"RandomY":542845670,"RandomZ":3110660773,"StartTime":20341.0,"Objects":[{"StartTime":20341.0,"EndTime":20341.0,"Column":3}]},{"RandomW":3979536913,"RandomX":542845670,"RandomY":3110660773,"RandomZ":2552021122,"StartTime":20606.0,"Objects":[{"StartTime":20606.0,"EndTime":20606.0,"Column":2},{"StartTime":20606.0,"EndTime":20606.0,"Column":3}]},{"RandomW":3926138036,"RandomX":2552021122,"RandomY":3979536913,"RandomZ":348643659,"StartTime":20871.0,"Objects":[{"StartTime":20871.0,"EndTime":21401.0,"Column":4}]},{"RandomW":4001028953,"RandomX":348643659,"RandomY":3926138036,"RandomZ":2489502118,"StartTime":21933.0,"Objects":[{"StartTime":21933.0,"EndTime":22198.0,"Column":5}]},{"RandomW":263714783,"RandomX":2489502118,"RandomY":4001028953,"RandomZ":3315380836,"StartTime":22464.0,"Objects":[{"StartTime":22464.0,"EndTime":22729.0,"Column":0}]},{"RandomW":3045229215,"RandomX":3315380836,"RandomY":263714783,"RandomZ":2367299702,"StartTime":22995.0,"Objects":[{"StartTime":22995.0,"EndTime":23791.0,"Column":2}]},{"RandomW":622075324,"RandomX":2367299702,"RandomY":3045229215,"RandomZ":2511145433,"StartTime":24057.0,"Objects":[{"StartTime":24057.0,"EndTime":24322.0,"Column":1}]},{"RandomW":1428674661,"RandomX":3630592823,"RandomY":628640291,"RandomZ":2684635853,"StartTime":24588.0,"Objects":[{"StartTime":24588.0,"EndTime":24853.0,"Column":4},{"StartTime":24588.0,"EndTime":24853.0,"Column":3}]},{"RandomW":2963472042,"RandomX":3191072317,"RandomY":1509788298,"RandomZ":3677221210,"StartTime":25119.0,"Objects":[{"StartTime":25119.0,"EndTime":25649.0,"Column":2}]},{"RandomW":2441208973,"RandomX":1509788298,"RandomY":3677221210,"RandomZ":2963472042,"StartTime":26181.0,"Objects":[{"StartTime":26181.0,"EndTime":26181.0,"Column":2},{"StartTime":26181.0,"EndTime":26181.0,"Column":3}]},{"RandomW":614303213,"RandomX":3677221210,"RandomY":2963472042,"RandomZ":2441208973,"StartTime":26447.0,"Objects":[{"StartTime":26447.0,"EndTime":26447.0,"Column":3}]},{"RandomW":931064848,"RandomX":2441208973,"RandomY":614303213,"RandomZ":2425227013,"StartTime":26712.0,"Objects":[{"StartTime":26712.0,"EndTime":26977.0,"Column":2}]},{"RandomW":1631554006,"RandomX":2425227013,"RandomY":931064848,"RandomZ":2839921662,"StartTime":27243.0,"Objects":[{"StartTime":27243.0,"EndTime":27508.0,"Column":4}]},{"RandomW":1102544522,"RandomX":2839921662,"RandomY":1631554006,"RandomZ":2171149531,"StartTime":27774.0,"Objects":[{"StartTime":27774.0,"EndTime":28039.0,"Column":3}]},{"RandomW":1535528787,"RandomX":2171149531,"RandomY":1102544522,"RandomZ":3328843633,"StartTime":28305.0,"Objects":[{"StartTime":28305.0,"EndTime":28835.0,"Column":4},{"StartTime":28305.0,"EndTime":28305.0,"Column":3},{"StartTime":28570.0,"EndTime":28570.0,"Column":3},{"StartTime":28835.0,"EndTime":28835.0,"Column":3}]},{"RandomW":2462060348,"RandomX":1102544522,"RandomY":3328843633,"RandomZ":1535528787,"StartTime":29102.0,"Objects":[{"StartTime":29102.0,"EndTime":29102.0,"Column":3}]},{"RandomW":2548780898,"RandomX":2462060348,"RandomY":1752789184,"RandomZ":4269701929,"StartTime":29367.0,"Objects":[{"StartTime":29367.0,"EndTime":29897.0,"Column":5},{"StartTime":29367.0,"EndTime":29897.0,"Column":1}]},{"RandomW":2872444045,"RandomX":2548780898,"RandomY":96471884,"RandomZ":2795275332,"StartTime":30429.0,"Objects":[{"StartTime":30429.0,"EndTime":30694.0,"Column":2}]},{"RandomW":554186146,"RandomX":2872444045,"RandomY":1718345430,"RandomZ":1676944188,"StartTime":30960.0,"Objects":[{"StartTime":30960.0,"EndTime":31225.0,"Column":4},{"StartTime":30960.0,"EndTime":31225.0,"Column":1}]},{"RandomW":44350362,"RandomX":1676944188,"RandomY":554186146,"RandomZ":973164386,"StartTime":31491.0,"Objects":[{"StartTime":31491.0,"EndTime":32287.0,"Column":0}]},{"RandomW":2689469863,"RandomX":973164386,"RandomY":44350362,"RandomZ":3230373169,"StartTime":32553.0,"Objects":[{"StartTime":32553.0,"EndTime":32818.0,"Column":1}]},{"RandomW":3076210018,"RandomX":3230373169,"RandomY":2689469863,"RandomZ":2416196755,"StartTime":33084.0,"Objects":[{"StartTime":33084.0,"EndTime":33349.0,"Column":2}]},{"RandomW":4212524875,"RandomX":2416196755,"RandomY":3076210018,"RandomZ":736433317,"StartTime":33615.0,"Objects":[{"StartTime":33615.0,"EndTime":34145.0,"Column":5}]},{"RandomW":668643347,"RandomX":4212524875,"RandomY":1246190622,"RandomZ":614058009,"StartTime":34677.0,"Objects":[{"StartTime":34677.0,"EndTime":34677.0,"Column":0},{"StartTime":34677.0,"EndTime":34677.0,"Column":5}]},{"RandomW":4133034829,"RandomX":668643347,"RandomY":1824376828,"RandomZ":476758489,"StartTime":34942.0,"Objects":[{"StartTime":34942.0,"EndTime":34942.0,"Column":1},{"StartTime":34942.0,"EndTime":34942.0,"Column":5}]},{"RandomW":82933693,"RandomX":1824376828,"RandomY":476758489,"RandomZ":4133034829,"StartTime":35208.0,"Objects":[{"StartTime":35208.0,"EndTime":35208.0,"Column":0},{"StartTime":35208.0,"EndTime":35208.0,"Column":1}]},{"RandomW":2263995128,"RandomX":476758489,"RandomY":4133034829,"RandomZ":82933693,"StartTime":35473.0,"Objects":[{"StartTime":35473.0,"EndTime":35473.0,"Column":1}]},{"RandomW":3437211638,"RandomX":4133034829,"RandomY":82933693,"RandomZ":2263995128,"StartTime":35739.0,"Objects":[{"StartTime":35739.0,"EndTime":35739.0,"Column":2}]},{"RandomW":2107738941,"RandomX":2263995128,"RandomY":3437211638,"RandomZ":4066526803,"StartTime":36004.0,"Objects":[{"StartTime":36004.0,"EndTime":36004.0,"Column":2},{"StartTime":36004.0,"EndTime":36004.0,"Column":5}]},{"RandomW":1976561763,"RandomX":3437211638,"RandomY":4066526803,"RandomZ":2107738941,"StartTime":36270.0,"Objects":[{"StartTime":36270.0,"EndTime":36270.0,"Column":3},{"StartTime":36270.0,"EndTime":36270.0,"Column":4}]},{"RandomW":1147027763,"RandomX":4066526803,"RandomY":2107738941,"RandomZ":1976561763,"StartTime":36535.0,"Objects":[{"StartTime":36535.0,"EndTime":36535.0,"Column":3}]},{"RandomW":3580315894,"RandomX":1976561763,"RandomY":1147027763,"RandomZ":2767111989,"StartTime":36801.0,"Objects":[{"StartTime":36801.0,"EndTime":37331.0,"Column":4}]},{"RandomW":3743545041,"RandomX":1147027763,"RandomY":2767111989,"RandomZ":3580315894,"StartTime":37597.0,"Objects":[{"StartTime":37597.0,"EndTime":37597.0,"Column":1}]},{"RandomW":1409948107,"RandomX":3743545041,"RandomY":1774216159,"RandomZ":3150304957,"StartTime":37863.0,"Objects":[{"StartTime":37863.0,"EndTime":38393.0,"Column":2},{"StartTime":37863.0,"EndTime":38393.0,"Column":3}]},{"RandomW":4009340712,"RandomX":3150304957,"RandomY":1409948107,"RandomZ":2219703013,"StartTime":38925.0,"Objects":[{"StartTime":38925.0,"EndTime":39190.0,"Column":5}]},{"RandomW":3071167491,"RandomX":2065497204,"RandomY":2145154717,"RandomZ":2494378321,"StartTime":39456.0,"Objects":[{"StartTime":39456.0,"EndTime":39721.0,"Column":0},{"StartTime":39456.0,"EndTime":39721.0,"Column":2}]},{"RandomW":1245938367,"RandomX":3071167491,"RandomY":728627658,"RandomZ":3080260260,"StartTime":39987.0,"Objects":[{"StartTime":39987.0,"EndTime":40783.0,"Column":3}]},{"RandomW":3032241617,"RandomX":1245938367,"RandomY":2414391712,"RandomZ":3406801470,"StartTime":41048.0,"Objects":[{"StartTime":41048.0,"EndTime":41313.0,"Column":2}]},{"RandomW":3367991920,"RandomX":3804000131,"RandomY":672376773,"RandomZ":2667292323,"StartTime":41579.0,"Objects":[{"StartTime":41579.0,"EndTime":41844.0,"Column":1},{"StartTime":41579.0,"EndTime":41844.0,"Column":3}]},{"RandomW":2095476726,"RandomX":2667292323,"RandomY":3367991920,"RandomZ":3380532371,"StartTime":42110.0,"Objects":[{"StartTime":42110.0,"EndTime":42640.0,"Column":5}]},{"RandomW":869340745,"RandomX":2095476726,"RandomY":1063981175,"RandomZ":204767504,"StartTime":43172.0,"Objects":[{"StartTime":43172.0,"EndTime":43172.0,"Column":1},{"StartTime":43172.0,"EndTime":43172.0,"Column":4}]},{"RandomW":461904197,"RandomX":204767504,"RandomY":869340745,"RandomZ":2080855578,"StartTime":43438.0,"Objects":[{"StartTime":43438.0,"EndTime":43438.0,"Column":2},{"StartTime":43438.0,"EndTime":43438.0,"Column":1}]},{"RandomW":3004966693,"RandomX":869340745,"RandomY":2080855578,"RandomZ":461904197,"StartTime":43703.0,"Objects":[{"StartTime":43703.0,"EndTime":43703.0,"Column":3},{"StartTime":43703.0,"EndTime":43703.0,"Column":4}]},{"RandomW":147065937,"RandomX":2080855578,"RandomY":461904197,"RandomZ":3004966693,"StartTime":43969.0,"Objects":[{"StartTime":43969.0,"EndTime":43969.0,"Column":4}]},{"RandomW":1312111829,"RandomX":461904197,"RandomY":3004966693,"RandomZ":147065937,"StartTime":44234.0,"Objects":[{"StartTime":44234.0,"EndTime":44234.0,"Column":4}]},{"RandomW":355223143,"RandomX":3004966693,"RandomY":147065937,"RandomZ":1312111829,"StartTime":44500.0,"Objects":[{"StartTime":44500.0,"EndTime":44500.0,"Column":3}]},{"RandomW":1197174504,"RandomX":147065937,"RandomY":1312111829,"RandomZ":355223143,"StartTime":44765.0,"Objects":[{"StartTime":44765.0,"EndTime":44765.0,"Column":2},{"StartTime":44765.0,"EndTime":44765.0,"Column":3}]},{"RandomW":2296450669,"RandomX":355223143,"RandomY":1197174504,"RandomZ":1876247766,"StartTime":45031.0,"Objects":[{"StartTime":45031.0,"EndTime":45031.0,"Column":1},{"StartTime":45031.0,"EndTime":45031.0,"Column":0}]},{"RandomW":1664705375,"RandomX":1876247766,"RandomY":2296450669,"RandomZ":4287200872,"StartTime":45296.0,"Objects":[{"StartTime":45296.0,"EndTime":45296.0,"Column":0},{"StartTime":45296.0,"EndTime":45296.0,"Column":4}]},{"RandomW":2786027546,"RandomX":2296450669,"RandomY":4287200872,"RandomZ":1664705375,"StartTime":45562.0,"Objects":[{"StartTime":45562.0,"EndTime":45562.0,"Column":1}]},{"RandomW":639469776,"RandomX":4287200872,"RandomY":1664705375,"RandomZ":2786027546,"StartTime":45827.0,"Objects":[{"StartTime":45827.0,"EndTime":45827.0,"Column":3},{"StartTime":45827.0,"EndTime":45827.0,"Column":4}]},{"RandomW":2463352901,"RandomX":1664705375,"RandomY":2786027546,"RandomZ":639469776,"StartTime":46093.0,"Objects":[{"StartTime":46093.0,"EndTime":46093.0,"Column":4}]},{"RandomW":760995091,"RandomX":2463352901,"RandomY":978871003,"RandomZ":3888812594,"StartTime":46358.0,"Objects":[{"StartTime":46358.0,"EndTime":46888.0,"Column":2}]},{"RandomW":3631307076,"RandomX":3888812594,"RandomY":760995091,"RandomZ":566667549,"StartTime":47420.0,"Objects":[{"StartTime":47420.0,"EndTime":47685.0,"Column":4}]},{"RandomW":2353216536,"RandomX":3631307076,"RandomY":1805196154,"RandomZ":2564415583,"StartTime":47951.0,"Objects":[{"StartTime":47951.0,"EndTime":48216.0,"Column":1},{"StartTime":47951.0,"EndTime":48216.0,"Column":0}]},{"RandomW":717730087,"RandomX":2353216536,"RandomY":3735744429,"RandomZ":2102099401,"StartTime":48482.0,"Objects":[{"StartTime":48482.0,"EndTime":49278.0,"Column":5},{"StartTime":48482.0,"EndTime":49278.0,"Column":2}]},{"RandomW":271333990,"RandomX":717730087,"RandomY":3220302747,"RandomZ":917482575,"StartTime":49544.0,"Objects":[{"StartTime":49544.0,"EndTime":49809.0,"Column":0}]},{"RandomW":937976203,"RandomX":917482575,"RandomY":271333990,"RandomZ":125173709,"StartTime":50075.0,"Objects":[{"StartTime":50075.0,"EndTime":50340.0,"Column":2}]},{"RandomW":2781059562,"RandomX":937976203,"RandomY":2087616237,"RandomZ":232817676,"StartTime":50606.0,"Objects":[{"StartTime":50606.0,"EndTime":51667.0,"Column":0},{"StartTime":50606.0,"EndTime":51667.0,"Column":1}]},{"RandomW":3511898336,"RandomX":2087616237,"RandomY":232817676,"RandomZ":2781059562,"StartTime":52730.0,"Objects":[{"StartTime":52730.0,"EndTime":52730.0,"Column":4}]},{"RandomW":623291556,"RandomX":3737503025,"RandomY":3607951873,"RandomZ":1857627587,"StartTime":53792.0,"Objects":[{"StartTime":53792.0,"EndTime":54322.0,"Column":5},{"StartTime":53792.0,"EndTime":54322.0,"Column":1}]},{"RandomW":3577350524,"RandomX":3607951873,"RandomY":1857627587,"RandomZ":623291556,"StartTime":54588.0,"Objects":[{"StartTime":54588.0,"EndTime":54588.0,"Column":2}]},{"RandomW":3611414219,"RandomX":1700150568,"RandomY":3261504380,"RandomZ":3526708248,"StartTime":54854.0,"Objects":[{"StartTime":54854.0,"EndTime":55384.0,"Column":3},{"StartTime":54854.0,"EndTime":55384.0,"Column":4}]},{"RandomW":4116828180,"RandomX":3526708248,"RandomY":3611414219,"RandomZ":53089910,"StartTime":55916.0,"Objects":[{"StartTime":55916.0,"EndTime":56446.0,"Column":5}]},{"RandomW":1419945944,"RandomX":53089910,"RandomY":4116828180,"RandomZ":2370574124,"StartTime":56978.0,"Objects":[{"StartTime":56978.0,"EndTime":57549.0,"Column":3}]},{"RandomW":4235330325,"RandomX":2370574124,"RandomY":1419945944,"RandomZ":124293788,"StartTime":58120.0,"Objects":[{"StartTime":58120.0,"EndTime":58405.0,"Column":5}]},{"RandomW":1354196818,"RandomX":124293788,"RandomY":4235330325,"RandomZ":292200128,"StartTime":58692.0,"Objects":[{"StartTime":58692.0,"EndTime":58973.0,"Column":3}]},{"RandomW":2131632245,"RandomX":292200128,"RandomY":1354196818,"RandomZ":319349674,"StartTime":59325.0,"Objects":[{"StartTime":59325.0,"EndTime":60170.0,"Column":5}]},{"RandomW":987180490,"RandomX":1354196818,"RandomY":319349674,"RandomZ":2131632245,"StartTime":60513.0,"Objects":[{"StartTime":60513.0,"EndTime":60513.0,"Column":3}]},{"RandomW":2247158810,"RandomX":2131632245,"RandomY":987180490,"RandomZ":3518058549,"StartTime":60778.0,"Objects":[{"StartTime":60778.0,"EndTime":61043.0,"Column":0}]},{"RandomW":2347989337,"RandomX":987180490,"RandomY":3518058549,"RandomZ":2247158810,"StartTime":61309.0,"Objects":[{"StartTime":61309.0,"EndTime":61309.0,"Column":3}]},{"RandomW":82954311,"RandomX":1403151684,"RandomY":1362150166,"RandomZ":1092174296,"StartTime":61840.0,"Objects":[{"StartTime":61840.0,"EndTime":62105.0,"Column":0}]},{"RandomW":408605211,"RandomX":82954311,"RandomY":1144587736,"RandomZ":2479248954,"StartTime":62371.0,"Objects":[{"StartTime":62371.0,"EndTime":62901.0,"Column":1}]},{"RandomW":2455999143,"RandomX":1144587736,"RandomY":2479248954,"RandomZ":408605211,"StartTime":63168.0,"Objects":[{"StartTime":63168.0,"EndTime":63168.0,"Column":2}]},{"RandomW":1898608481,"RandomX":2455999143,"RandomY":519590646,"RandomZ":3207504021,"StartTime":63433.0,"Objects":[{"StartTime":63433.0,"EndTime":63963.0,"Column":5}]},{"RandomW":601995191,"RandomX":3207504021,"RandomY":1898608481,"RandomZ":4283573577,"StartTime":64230.0,"Objects":[{"StartTime":64230.0,"EndTime":64230.0,"Column":5},{"StartTime":64230.0,"EndTime":64230.0,"Column":1}]},{"RandomW":3909194070,"RandomX":1898608481,"RandomY":4283573577,"RandomZ":601995191,"StartTime":64495.0,"Objects":[{"StartTime":64495.0,"EndTime":64495.0,"Column":3},{"StartTime":64495.0,"EndTime":64495.0,"Column":4}]},{"RandomW":3417465448,"RandomX":4283573577,"RandomY":601995191,"RandomZ":3909194070,"StartTime":64761.0,"Objects":[{"StartTime":64761.0,"EndTime":64761.0,"Column":4}]},{"RandomW":2779016762,"RandomX":601995191,"RandomY":3909194070,"RandomZ":3417465448,"StartTime":65026.0,"Objects":[{"StartTime":65026.0,"EndTime":65026.0,"Column":4},{"StartTime":65026.0,"EndTime":65026.0,"Column":5}]},{"RandomW":2346068278,"RandomX":3909194070,"RandomY":3417465448,"RandomZ":2779016762,"StartTime":65292.0,"Objects":[{"StartTime":65292.0,"EndTime":65292.0,"Column":3}]},{"RandomW":1857589819,"RandomX":3417465448,"RandomY":2779016762,"RandomZ":2346068278,"StartTime":65557.0,"Objects":[{"StartTime":65557.0,"EndTime":65557.0,"Column":4},{"StartTime":65557.0,"EndTime":65557.0,"Column":5}]},{"RandomW":910236838,"RandomX":2779016762,"RandomY":2346068278,"RandomZ":1857589819,"StartTime":66088.0,"Objects":[{"StartTime":66088.0,"EndTime":66088.0,"Column":2},{"StartTime":66088.0,"EndTime":66088.0,"Column":3}]},{"RandomW":910236838,"RandomX":2779016762,"RandomY":2346068278,"RandomZ":1857589819,"StartTime":66354.0,"Objects":[{"StartTime":66354.0,"EndTime":66354.0,"Column":3},{"StartTime":66354.0,"EndTime":66354.0,"Column":2}]},{"RandomW":2327273799,"RandomX":1857589819,"RandomY":910236838,"RandomZ":2953998826,"StartTime":66619.0,"Objects":[{"StartTime":66619.0,"EndTime":67149.0,"Column":0}]},{"RandomW":540283744,"RandomX":910236838,"RandomY":2953998826,"RandomZ":2327273799,"StartTime":67416.0,"Objects":[{"StartTime":67416.0,"EndTime":67416.0,"Column":0}]},{"RandomW":1024467186,"RandomX":2327273799,"RandomY":540283744,"RandomZ":514760684,"StartTime":67681.0,"Objects":[{"StartTime":67681.0,"EndTime":68211.0,"Column":2}]},{"RandomW":211600206,"RandomX":540283744,"RandomY":514760684,"RandomZ":1024467186,"StartTime":68478.0,"Objects":[{"StartTime":68478.0,"EndTime":68478.0,"Column":2}]},{"RandomW":2360573614,"RandomX":514760684,"RandomY":1024467186,"RandomZ":211600206,"StartTime":68743.0,"Objects":[{"StartTime":68743.0,"EndTime":68743.0,"Column":4},{"StartTime":68743.0,"EndTime":68743.0,"Column":5}]},{"RandomW":3867722027,"RandomX":1024467186,"RandomY":211600206,"RandomZ":2360573614,"StartTime":69009.0,"Objects":[{"StartTime":69009.0,"EndTime":69009.0,"Column":3}]},{"RandomW":1512274616,"RandomX":211600206,"RandomY":2360573614,"RandomZ":3867722027,"StartTime":69274.0,"Objects":[{"StartTime":69274.0,"EndTime":69274.0,"Column":4},{"StartTime":69274.0,"EndTime":69274.0,"Column":5}]},{"RandomW":2957984769,"RandomX":2360573614,"RandomY":3867722027,"RandomZ":1512274616,"StartTime":69540.0,"Objects":[{"StartTime":69540.0,"EndTime":69540.0,"Column":3}]},{"RandomW":2803767976,"RandomX":3867722027,"RandomY":1512274616,"RandomZ":2957984769,"StartTime":69805.0,"Objects":[{"StartTime":69805.0,"EndTime":69805.0,"Column":4},{"StartTime":69805.0,"EndTime":69805.0,"Column":5}]},{"RandomW":1183341084,"RandomX":2957984769,"RandomY":2803767976,"RandomZ":121575161,"StartTime":70336.0,"Objects":[{"StartTime":70336.0,"EndTime":70601.0,"Column":3}]},{"RandomW":3685872119,"RandomX":121575161,"RandomY":1183341084,"RandomZ":2351788416,"StartTime":70867.0,"Objects":[{"StartTime":70867.0,"EndTime":71397.0,"Column":4}]},{"RandomW":617004198,"RandomX":1183341084,"RandomY":2351788416,"RandomZ":3685872119,"StartTime":71663.0,"Objects":[{"StartTime":71663.0,"EndTime":71663.0,"Column":3}]},{"RandomW":2478235967,"RandomX":617004198,"RandomY":546986648,"RandomZ":3353120378,"StartTime":71929.0,"Objects":[{"StartTime":71929.0,"EndTime":72459.0,"Column":0}]},{"RandomW":2189712483,"RandomX":546986648,"RandomY":3353120378,"RandomZ":2478235967,"StartTime":72725.0,"Objects":[{"StartTime":72725.0,"EndTime":72725.0,"Column":2}]},{"RandomW":1882757169,"RandomX":3353120378,"RandomY":2478235967,"RandomZ":2189712483,"StartTime":72991.0,"Objects":[{"StartTime":72991.0,"EndTime":72991.0,"Column":3},{"StartTime":72991.0,"EndTime":72991.0,"Column":4}]},{"RandomW":1404331794,"RandomX":2478235967,"RandomY":2189712483,"RandomZ":1882757169,"StartTime":73256.0,"Objects":[{"StartTime":73256.0,"EndTime":73256.0,"Column":1}]},{"RandomW":1999620930,"RandomX":2189712483,"RandomY":1882757169,"RandomZ":1404331794,"StartTime":73522.0,"Objects":[{"StartTime":73522.0,"EndTime":73522.0,"Column":3},{"StartTime":73522.0,"EndTime":73522.0,"Column":4}]},{"RandomW":3622364800,"RandomX":1882757169,"RandomY":1404331794,"RandomZ":1999620930,"StartTime":73787.0,"Objects":[{"StartTime":73787.0,"EndTime":73787.0,"Column":2}]},{"RandomW":1671763292,"RandomX":1404331794,"RandomY":1999620930,"RandomZ":3622364800,"StartTime":74053.0,"Objects":[{"StartTime":74053.0,"EndTime":74053.0,"Column":3},{"StartTime":74053.0,"EndTime":74053.0,"Column":4}]},{"RandomW":2594561583,"RandomX":3622364800,"RandomY":1671763292,"RandomZ":2480497357,"StartTime":74584.0,"Objects":[{"StartTime":74584.0,"EndTime":74849.0,"Column":1}]},{"RandomW":1101860073,"RandomX":2480497357,"RandomY":2594561583,"RandomZ":183105309,"StartTime":75115.0,"Objects":[{"StartTime":75115.0,"EndTime":75645.0,"Column":3}]},{"RandomW":423280923,"RandomX":2594561583,"RandomY":183105309,"RandomZ":1101860073,"StartTime":75911.0,"Objects":[{"StartTime":75911.0,"EndTime":75911.0,"Column":2}]},{"RandomW":3905841932,"RandomX":1101860073,"RandomY":423280923,"RandomZ":2916757685,"StartTime":76177.0,"Objects":[{"StartTime":76177.0,"EndTime":76707.0,"Column":4}]},{"RandomW":3241015480,"RandomX":423280923,"RandomY":2916757685,"RandomZ":3905841932,"StartTime":76973.0,"Objects":[{"StartTime":76973.0,"EndTime":76973.0,"Column":3}]},{"RandomW":1928531304,"RandomX":3905841932,"RandomY":3241015480,"RandomZ":248564639,"StartTime":77239.0,"Objects":[{"StartTime":77239.0,"EndTime":77504.0,"Column":5}]},{"RandomW":634267655,"RandomX":3925777969,"RandomY":1203262350,"RandomZ":3485263061,"StartTime":77770.0,"Objects":[{"StartTime":77770.0,"EndTime":78035.0,"Column":3},{"StartTime":77770.0,"EndTime":78035.0,"Column":1}]},{"RandomW":953955737,"RandomX":1203262350,"RandomY":3485263061,"RandomZ":634267655,"StartTime":78301.0,"Objects":[{"StartTime":78301.0,"EndTime":78301.0,"Column":3}]},{"RandomW":3179099439,"RandomX":3485263061,"RandomY":634267655,"RandomZ":953955737,"StartTime":78566.0,"Objects":[{"StartTime":78566.0,"EndTime":78566.0,"Column":2},{"StartTime":78566.0,"EndTime":78566.0,"Column":3}]},{"RandomW":2513433625,"RandomX":634267655,"RandomY":953955737,"RandomZ":3179099439,"StartTime":78832.0,"Objects":[{"StartTime":78832.0,"EndTime":78832.0,"Column":3},{"StartTime":78832.0,"EndTime":78832.0,"Column":4}]},{"RandomW":3239409847,"RandomX":953955737,"RandomY":3179099439,"RandomZ":2513433625,"StartTime":79097.0,"Objects":[{"StartTime":79097.0,"EndTime":79097.0,"Column":5},{"StartTime":79097.0,"EndTime":79097.0,"Column":0}]},{"RandomW":1279031172,"RandomX":2513433625,"RandomY":3239409847,"RandomZ":415034865,"StartTime":79363.0,"Objects":[{"StartTime":79363.0,"EndTime":79893.0,"Column":3}]},{"RandomW":2797153574,"RandomX":3239409847,"RandomY":415034865,"RandomZ":1279031172,"StartTime":80159.0,"Objects":[{"StartTime":80159.0,"EndTime":80159.0,"Column":3}]},{"RandomW":858752658,"RandomX":1279031172,"RandomY":2797153574,"RandomZ":3422759302,"StartTime":80424.0,"Objects":[{"StartTime":80424.0,"EndTime":80954.0,"Column":2}]},{"RandomW":2617268004,"RandomX":2797153574,"RandomY":3422759302,"RandomZ":858752658,"StartTime":81221.0,"Objects":[{"StartTime":81221.0,"EndTime":81221.0,"Column":4}]},{"RandomW":4089416095,"RandomX":3422759302,"RandomY":858752658,"RandomZ":2617268004,"StartTime":81486.0,"Objects":[{"StartTime":81486.0,"EndTime":81486.0,"Column":4},{"StartTime":81486.0,"EndTime":81486.0,"Column":5}]},{"RandomW":640008567,"RandomX":858752658,"RandomY":2617268004,"RandomZ":4089416095,"StartTime":81752.0,"Objects":[{"StartTime":81752.0,"EndTime":81752.0,"Column":4}]},{"RandomW":1769064503,"RandomX":2617268004,"RandomY":4089416095,"RandomZ":640008567,"StartTime":82017.0,"Objects":[{"StartTime":82017.0,"EndTime":82017.0,"Column":5},{"StartTime":82017.0,"EndTime":82017.0,"Column":0}]},{"RandomW":4171929422,"RandomX":640008567,"RandomY":1769064503,"RandomZ":4149611338,"StartTime":82283.0,"Objects":[{"StartTime":82283.0,"EndTime":82283.0,"Column":3},{"StartTime":82283.0,"EndTime":82283.0,"Column":5}]},{"RandomW":4035764053,"RandomX":1769064503,"RandomY":4149611338,"RandomZ":4171929422,"StartTime":82548.0,"Objects":[{"StartTime":82548.0,"EndTime":82548.0,"Column":5},{"StartTime":82548.0,"EndTime":82548.0,"Column":0}]},{"RandomW":391872771,"RandomX":4149611338,"RandomY":4171929422,"RandomZ":4035764053,"StartTime":83079.0,"Objects":[{"StartTime":83079.0,"EndTime":83079.0,"Column":3},{"StartTime":83079.0,"EndTime":83079.0,"Column":4}]},{"RandomW":391872771,"RandomX":4149611338,"RandomY":4171929422,"RandomZ":4035764053,"StartTime":83345.0,"Objects":[{"StartTime":83345.0,"EndTime":83345.0,"Column":2},{"StartTime":83345.0,"EndTime":83345.0,"Column":1}]},{"RandomW":4239141202,"RandomX":4035764053,"RandomY":391872771,"RandomZ":1343280377,"StartTime":83610.0,"Objects":[{"StartTime":83610.0,"EndTime":84140.0,"Column":5}]},{"RandomW":2008371177,"RandomX":4239141202,"RandomY":1783379941,"RandomZ":2715086902,"StartTime":84407.0,"Objects":[{"StartTime":84407.0,"EndTime":84407.0,"Column":1},{"StartTime":84407.0,"EndTime":84407.0,"Column":5}]},{"RandomW":980563717,"RandomX":3939376884,"RandomY":3778473815,"RandomZ":3882214919,"StartTime":84672.0,"Objects":[{"StartTime":84672.0,"EndTime":85202.0,"Column":4},{"StartTime":84672.0,"EndTime":85202.0,"Column":2}]},{"RandomW":2698098433,"RandomX":3778473815,"RandomY":3882214919,"RandomZ":980563717,"StartTime":85469.0,"Objects":[{"StartTime":85469.0,"EndTime":85469.0,"Column":1}]},{"RandomW":4140546075,"RandomX":3882214919,"RandomY":980563717,"RandomZ":2698098433,"StartTime":85734.0,"Objects":[{"StartTime":85734.0,"EndTime":85734.0,"Column":3},{"StartTime":85734.0,"EndTime":85734.0,"Column":4}]},{"RandomW":1045835035,"RandomX":980563717,"RandomY":2698098433,"RandomZ":4140546075,"StartTime":86000.0,"Objects":[{"StartTime":86000.0,"EndTime":86000.0,"Column":1}]},{"RandomW":2503475147,"RandomX":2698098433,"RandomY":4140546075,"RandomZ":1045835035,"StartTime":86265.0,"Objects":[{"StartTime":86265.0,"EndTime":86265.0,"Column":1},{"StartTime":86265.0,"EndTime":86265.0,"Column":2}]},{"RandomW":3094559699,"RandomX":4140546075,"RandomY":1045835035,"RandomZ":2503475147,"StartTime":86531.0,"Objects":[{"StartTime":86531.0,"EndTime":86531.0,"Column":3}]},{"RandomW":332613542,"RandomX":1045835035,"RandomY":2503475147,"RandomZ":3094559699,"StartTime":86796.0,"Objects":[{"StartTime":86796.0,"EndTime":86796.0,"Column":2},{"StartTime":86796.0,"EndTime":86796.0,"Column":3}]},{"RandomW":2534271858,"RandomX":332613542,"RandomY":2623704626,"RandomZ":3061969874,"StartTime":87327.0,"Objects":[{"StartTime":87327.0,"EndTime":87592.0,"Column":1}]},{"RandomW":794230988,"RandomX":2534271858,"RandomY":510287938,"RandomZ":2532404899,"StartTime":87858.0,"Objects":[{"StartTime":87858.0,"EndTime":88388.0,"Column":2}]},{"RandomW":3623430191,"RandomX":510287938,"RandomY":2532404899,"RandomZ":794230988,"StartTime":88655.0,"Objects":[{"StartTime":88655.0,"EndTime":88655.0,"Column":2}]},{"RandomW":2269498220,"RandomX":794230988,"RandomY":3623430191,"RandomZ":2598120162,"StartTime":88920.0,"Objects":[{"StartTime":88920.0,"EndTime":89450.0,"Column":0}]},{"RandomW":277080616,"RandomX":3623430191,"RandomY":2598120162,"RandomZ":2269498220,"StartTime":89717.0,"Objects":[{"StartTime":89717.0,"EndTime":89717.0,"Column":2}]},{"RandomW":237305927,"RandomX":2598120162,"RandomY":2269498220,"RandomZ":277080616,"StartTime":89982.0,"Objects":[{"StartTime":89982.0,"EndTime":89982.0,"Column":1},{"StartTime":89982.0,"EndTime":89982.0,"Column":2}]},{"RandomW":3697412902,"RandomX":277080616,"RandomY":237305927,"RandomZ":1976938587,"StartTime":90247.0,"Objects":[{"StartTime":90247.0,"EndTime":90247.0,"Column":1},{"StartTime":90247.0,"EndTime":90247.0,"Column":4}]},{"RandomW":3552536616,"RandomX":237305927,"RandomY":1976938587,"RandomZ":3697412902,"StartTime":90513.0,"Objects":[{"StartTime":90513.0,"EndTime":90513.0,"Column":2},{"StartTime":90513.0,"EndTime":90513.0,"Column":3}]},{"RandomW":758205604,"RandomX":3697412902,"RandomY":3552536616,"RandomZ":4122897696,"StartTime":90778.0,"Objects":[{"StartTime":90778.0,"EndTime":90778.0,"Column":1},{"StartTime":90778.0,"EndTime":90778.0,"Column":2}]},{"RandomW":3787868447,"RandomX":3552536616,"RandomY":4122897696,"RandomZ":758205604,"StartTime":91044.0,"Objects":[{"StartTime":91044.0,"EndTime":91044.0,"Column":2},{"StartTime":91044.0,"EndTime":91044.0,"Column":3}]},{"RandomW":1748107640,"RandomX":3787868447,"RandomY":3373302567,"RandomZ":3485540424,"StartTime":91575.0,"Objects":[{"StartTime":91575.0,"EndTime":91840.0,"Column":4}]},{"RandomW":4130051617,"RandomX":3485540424,"RandomY":1748107640,"RandomZ":3144627152,"StartTime":92106.0,"Objects":[{"StartTime":92106.0,"EndTime":92636.0,"Column":5}]},{"RandomW":808332236,"RandomX":1748107640,"RandomY":3144627152,"RandomZ":4130051617,"StartTime":92902.0,"Objects":[{"StartTime":92902.0,"EndTime":92902.0,"Column":3}]},{"RandomW":182226446,"RandomX":4130051617,"RandomY":808332236,"RandomZ":3371160944,"StartTime":93168.0,"Objects":[{"StartTime":93168.0,"EndTime":93698.0,"Column":0}]},{"RandomW":2699856874,"RandomX":808332236,"RandomY":3371160944,"RandomZ":182226446,"StartTime":93964.0,"Objects":[{"StartTime":93964.0,"EndTime":93964.0,"Column":1}]},{"RandomW":3110990203,"RandomX":2699856874,"RandomY":3789399152,"RandomZ":1462741358,"StartTime":94230.0,"Objects":[{"StartTime":94230.0,"EndTime":94495.0,"Column":4},{"StartTime":94230.0,"EndTime":94495.0,"Column":2}]},{"RandomW":2375429180,"RandomX":2098892391,"RandomY":1911053200,"RandomZ":1537665050,"StartTime":94761.0,"Objects":[{"StartTime":94761.0,"EndTime":95026.0,"Column":5},{"StartTime":94761.0,"EndTime":95026.0,"Column":0}]},{"RandomW":391186846,"RandomX":1537665050,"RandomY":2375429180,"RandomZ":609673823,"StartTime":95292.0,"Objects":[{"StartTime":95292.0,"EndTime":96353.0,"Column":1}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":96486.0,"Objects":[{"StartTime":96486.0,"EndTime":98478.0,"Column":5}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":113345.0,"Objects":[{"StartTime":113345.0,"EndTime":113345.0,"Column":4}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":113876.0,"Objects":[{"StartTime":113876.0,"EndTime":113876.0,"Column":1}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":114407.0,"Objects":[{"StartTime":114407.0,"EndTime":114407.0,"Column":4}]},{"RandomW":1192288733,"RandomX":609673823,"RandomY":391186846,"RandomZ":2078004566,"StartTime":114672.0,"Objects":[{"StartTime":114672.0,"EndTime":114672.0,"Column":2},{"StartTime":114672.0,"EndTime":114672.0,"Column":3}]},{"RandomW":3569858426,"RandomX":391186846,"RandomY":2078004566,"RandomZ":1192288733,"StartTime":114938.0,"Objects":[{"StartTime":114938.0,"EndTime":114938.0,"Column":2}]},{"RandomW":1262832005,"RandomX":2078004566,"RandomY":1192288733,"RandomZ":3569858426,"StartTime":115203.0,"Objects":[{"StartTime":115203.0,"EndTime":115203.0,"Column":3},{"StartTime":115203.0,"EndTime":115203.0,"Column":4}]},{"RandomW":4002501854,"RandomX":1192288733,"RandomY":3569858426,"RandomZ":1262832005,"StartTime":115469.0,"Objects":[{"StartTime":115469.0,"EndTime":115469.0,"Column":3},{"StartTime":115469.0,"EndTime":115469.0,"Column":4}]},{"RandomW":776953560,"RandomX":3569858426,"RandomY":1262832005,"RandomZ":4002501854,"StartTime":116000.0,"Objects":[{"StartTime":116000.0,"EndTime":116000.0,"Column":3},{"StartTime":116000.0,"EndTime":116000.0,"Column":4}]},{"RandomW":776953560,"RandomX":3569858426,"RandomY":1262832005,"RandomZ":4002501854,"StartTime":116531.0,"Objects":[{"StartTime":116531.0,"EndTime":116531.0,"Column":2},{"StartTime":116531.0,"EndTime":116531.0,"Column":1}]},{"RandomW":3352969228,"RandomX":1262832005,"RandomY":4002501854,"RandomZ":776953560,"StartTime":117062.0,"Objects":[{"StartTime":117062.0,"EndTime":117062.0,"Column":3},{"StartTime":117062.0,"EndTime":117062.0,"Column":4}]},{"RandomW":2796695571,"RandomX":4002501854,"RandomY":776953560,"RandomZ":3352969228,"StartTime":117327.0,"Objects":[{"StartTime":117327.0,"EndTime":117327.0,"Column":2}]},{"RandomW":3269572543,"RandomX":776953560,"RandomY":3352969228,"RandomZ":2796695571,"StartTime":117593.0,"Objects":[{"StartTime":117593.0,"EndTime":117593.0,"Column":4},{"StartTime":117593.0,"EndTime":117593.0,"Column":5}]},{"RandomW":3269572543,"RandomX":776953560,"RandomY":3352969228,"RandomZ":2796695571,"StartTime":118124.0,"Objects":[{"StartTime":118124.0,"EndTime":118124.0,"Column":1},{"StartTime":118124.0,"EndTime":118124.0,"Column":0}]},{"RandomW":3269572543,"RandomX":776953560,"RandomY":3352969228,"RandomZ":2796695571,"StartTime":118655.0,"Objects":[{"StartTime":118655.0,"EndTime":118655.0,"Column":5},{"StartTime":118655.0,"EndTime":118655.0,"Column":4}]},{"RandomW":2517403813,"RandomX":3352969228,"RandomY":2796695571,"RandomZ":3269572543,"StartTime":118920.0,"Objects":[{"StartTime":118920.0,"EndTime":118920.0,"Column":2},{"StartTime":118920.0,"EndTime":118920.0,"Column":3}]},{"RandomW":2210619464,"RandomX":2796695571,"RandomY":3269572543,"RandomZ":2517403813,"StartTime":119186.0,"Objects":[{"StartTime":119186.0,"EndTime":119186.0,"Column":4}]},{"RandomW":3032935051,"RandomX":3269572543,"RandomY":2517403813,"RandomZ":2210619464,"StartTime":119451.0,"Objects":[{"StartTime":119451.0,"EndTime":119451.0,"Column":5},{"StartTime":119451.0,"EndTime":119451.0,"Column":0}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":119717.0,"Objects":[{"StartTime":119717.0,"EndTime":119717.0,"Column":4},{"StartTime":119717.0,"EndTime":119717.0,"Column":5}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":120247.0,"Objects":[{"StartTime":120247.0,"EndTime":120247.0,"Column":1},{"StartTime":120247.0,"EndTime":120247.0,"Column":0}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":120778.0,"Objects":[{"StartTime":120778.0,"EndTime":120778.0,"Column":5},{"StartTime":120778.0,"EndTime":120778.0,"Column":4}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":121309.0,"Objects":[{"StartTime":121309.0,"EndTime":121309.0,"Column":1},{"StartTime":121309.0,"EndTime":121309.0,"Column":0}]},{"RandomW":2314078604,"RandomX":2210619464,"RandomY":3032935051,"RandomZ":2069229539,"StartTime":121575.0,"Objects":[{"StartTime":121575.0,"EndTime":121575.0,"Column":3}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":121840.0,"Objects":[{"StartTime":121840.0,"EndTime":121840.0,"Column":2},{"StartTime":121840.0,"EndTime":121840.0,"Column":3}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":122371.0,"Objects":[{"StartTime":122371.0,"EndTime":122371.0,"Column":3},{"StartTime":122371.0,"EndTime":122371.0,"Column":2}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":122902.0,"Objects":[{"StartTime":122902.0,"EndTime":122902.0,"Column":3},{"StartTime":122902.0,"EndTime":122902.0,"Column":2}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":123433.0,"Objects":[{"StartTime":123433.0,"EndTime":123433.0,"Column":3},{"StartTime":123433.0,"EndTime":123433.0,"Column":2}]},{"RandomW":2460408790,"RandomX":2069229539,"RandomY":2314078604,"RandomZ":297269721,"StartTime":123699.0,"Objects":[{"StartTime":123699.0,"EndTime":123699.0,"Column":1}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":123964.0,"Objects":[{"StartTime":123964.0,"EndTime":123964.0,"Column":3},{"StartTime":123964.0,"EndTime":123964.0,"Column":4}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":124495.0,"Objects":[{"StartTime":124495.0,"EndTime":124495.0,"Column":2},{"StartTime":124495.0,"EndTime":124495.0,"Column":1}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":125026.0,"Objects":[{"StartTime":125026.0,"EndTime":125026.0,"Column":4},{"StartTime":125026.0,"EndTime":125026.0,"Column":3}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":125557.0,"Objects":[{"StartTime":125557.0,"EndTime":125557.0,"Column":2},{"StartTime":125557.0,"EndTime":125557.0,"Column":1}]},{"RandomW":3204700088,"RandomX":297269721,"RandomY":2460408790,"RandomZ":1180177558,"StartTime":125823.0,"Objects":[{"StartTime":125823.0,"EndTime":125823.0,"Column":2}]},{"RandomW":299141296,"RandomX":2460408790,"RandomY":1180177558,"RandomZ":3204700088,"StartTime":126088.0,"Objects":[{"StartTime":126088.0,"EndTime":126088.0,"Column":3},{"StartTime":126088.0,"EndTime":126088.0,"Column":4}]},{"RandomW":299141296,"RandomX":2460408790,"RandomY":1180177558,"RandomZ":3204700088,"StartTime":126619.0,"Objects":[{"StartTime":126619.0,"EndTime":126619.0,"Column":2},{"StartTime":126619.0,"EndTime":126619.0,"Column":1}]},{"RandomW":299141296,"RandomX":2460408790,"RandomY":1180177558,"RandomZ":3204700088,"StartTime":127150.0,"Objects":[{"StartTime":127150.0,"EndTime":127150.0,"Column":4},{"StartTime":127150.0,"EndTime":127150.0,"Column":3}]},{"RandomW":3037239607,"RandomX":1180177558,"RandomY":3204700088,"RandomZ":299141296,"StartTime":127416.0,"Objects":[{"StartTime":127416.0,"EndTime":127416.0,"Column":4},{"StartTime":127416.0,"EndTime":127416.0,"Column":5}]},{"RandomW":863164324,"RandomX":3204700088,"RandomY":299141296,"RandomZ":3037239607,"StartTime":127681.0,"Objects":[{"StartTime":127681.0,"EndTime":127681.0,"Column":5}]},{"RandomW":2456647781,"RandomX":299141296,"RandomY":3037239607,"RandomZ":863164324,"StartTime":127947.0,"Objects":[{"StartTime":127947.0,"EndTime":127947.0,"Column":4},{"StartTime":127947.0,"EndTime":127947.0,"Column":5}]},{"RandomW":659157904,"RandomX":3037239607,"RandomY":863164324,"RandomZ":2456647781,"StartTime":128212.0,"Objects":[{"StartTime":128212.0,"EndTime":128212.0,"Column":3},{"StartTime":128212.0,"EndTime":128212.0,"Column":4}]},{"RandomW":659157904,"RandomX":3037239607,"RandomY":863164324,"RandomZ":2456647781,"StartTime":128743.0,"Objects":[{"StartTime":128743.0,"EndTime":128743.0,"Column":2},{"StartTime":128743.0,"EndTime":128743.0,"Column":1}]},{"RandomW":659157904,"RandomX":3037239607,"RandomY":863164324,"RandomZ":2456647781,"StartTime":129274.0,"Objects":[{"StartTime":129274.0,"EndTime":129274.0,"Column":4},{"StartTime":129274.0,"EndTime":129274.0,"Column":3}]},{"RandomW":3598260079,"RandomX":863164324,"RandomY":2456647781,"RandomZ":659157904,"StartTime":129540.0,"Objects":[{"StartTime":129540.0,"EndTime":129540.0,"Column":3},{"StartTime":129540.0,"EndTime":129540.0,"Column":4}]},{"RandomW":1930638835,"RandomX":2456647781,"RandomY":659157904,"RandomZ":3598260079,"StartTime":129805.0,"Objects":[{"StartTime":129805.0,"EndTime":129805.0,"Column":1},{"StartTime":129805.0,"EndTime":129805.0,"Column":2}]},{"RandomW":4230333264,"RandomX":1930638835,"RandomY":2319762852,"RandomZ":3807998479,"StartTime":130071.0,"Objects":[{"StartTime":130071.0,"EndTime":130071.0,"Column":2},{"StartTime":130071.0,"EndTime":130071.0,"Column":3}]},{"RandomW":2482386774,"RandomX":4230333264,"RandomY":376688010,"RandomZ":3132506885,"StartTime":132460.0,"Objects":[{"StartTime":132460.0,"EndTime":132990.0,"Column":0}]},{"RandomW":3381449487,"RandomX":3132506885,"RandomY":2482386774,"RandomZ":1092311355,"StartTime":133522.0,"Objects":[{"StartTime":133522.0,"EndTime":134052.0,"Column":3}]},{"RandomW":3812940964,"RandomX":1092311355,"RandomY":3381449487,"RandomZ":3240759120,"StartTime":134318.0,"Objects":[{"StartTime":134318.0,"EndTime":134848.0,"Column":4}]},{"RandomW":2199106412,"RandomX":2014155638,"RandomY":3619038163,"RandomZ":1182263034,"StartTime":135115.0,"Objects":[{"StartTime":135115.0,"EndTime":135380.0,"Column":3},{"StartTime":135115.0,"EndTime":135380.0,"Column":0}]},{"RandomW":4049541057,"RandomX":1182263034,"RandomY":2199106412,"RandomZ":2542868059,"StartTime":135646.0,"Objects":[{"StartTime":135646.0,"EndTime":136176.0,"Column":5}]},{"RandomW":376448389,"RandomX":2542868059,"RandomY":4049541057,"RandomZ":149323558,"StartTime":136708.0,"Objects":[{"StartTime":136708.0,"EndTime":136973.0,"Column":1}]},{"RandomW":10761513,"RandomX":149323558,"RandomY":376448389,"RandomZ":156027614,"StartTime":137239.0,"Objects":[{"StartTime":137239.0,"EndTime":137504.0,"Column":0}]},{"RandomW":2890609580,"RandomX":156027614,"RandomY":10761513,"RandomZ":998270292,"StartTime":137770.0,"Objects":[{"StartTime":137770.0,"EndTime":138566.0,"Column":2}]},{"RandomW":3792858866,"RandomX":998270292,"RandomY":2890609580,"RandomZ":3275622081,"StartTime":138832.0,"Objects":[{"StartTime":138832.0,"EndTime":139097.0,"Column":4}]},{"RandomW":479756469,"RandomX":3792858866,"RandomY":3665829153,"RandomZ":799245198,"StartTime":139363.0,"Objects":[{"StartTime":139363.0,"EndTime":139628.0,"Column":2},{"StartTime":139363.0,"EndTime":139628.0,"Column":1}]},{"RandomW":1559664190,"RandomX":1837897770,"RandomY":3074386351,"RandomZ":2226336565,"StartTime":139894.0,"Objects":[{"StartTime":139894.0,"EndTime":140690.0,"Column":0},{"StartTime":139894.0,"EndTime":140690.0,"Column":4}]},{"RandomW":1370921154,"RandomX":3074386351,"RandomY":2226336565,"RandomZ":1559664190,"StartTime":140955.0,"Objects":[{"StartTime":140955.0,"EndTime":140955.0,"Column":4}]},{"RandomW":12534613,"RandomX":1559664190,"RandomY":1370921154,"RandomZ":495513930,"StartTime":141221.0,"Objects":[{"StartTime":141221.0,"EndTime":141751.0,"Column":3},{"StartTime":141486.0,"EndTime":141486.0,"Column":1},{"StartTime":141751.0,"EndTime":141751.0,"Column":1}]},{"RandomW":1474110729,"RandomX":12534613,"RandomY":3893387802,"RandomZ":226854738,"StartTime":142017.0,"Objects":[{"StartTime":142017.0,"EndTime":142017.0,"Column":2},{"StartTime":142017.0,"EndTime":142017.0,"Column":3}]},{"RandomW":3883366092,"RandomX":1474110729,"RandomY":2911002956,"RandomZ":3337209428,"StartTime":142283.0,"Objects":[{"StartTime":142283.0,"EndTime":142548.0,"Column":4}]},{"RandomW":1868157439,"RandomX":3883366092,"RandomY":1497166406,"RandomZ":3876220972,"StartTime":142814.0,"Objects":[{"StartTime":142814.0,"EndTime":143079.0,"Column":5}]},{"RandomW":868486094,"RandomX":1497166406,"RandomY":3876220972,"RandomZ":1868157439,"StartTime":143345.0,"Objects":[{"StartTime":143345.0,"EndTime":143345.0,"Column":2}]},{"RandomW":2379505970,"RandomX":3876220972,"RandomY":1868157439,"RandomZ":868486094,"StartTime":143610.0,"Objects":[{"StartTime":143610.0,"EndTime":143610.0,"Column":2}]},{"RandomW":971762612,"RandomX":1868157439,"RandomY":868486094,"RandomZ":2379505970,"StartTime":143876.0,"Objects":[{"StartTime":143876.0,"EndTime":143876.0,"Column":4}]},{"RandomW":2333467129,"RandomX":2379505970,"RandomY":971762612,"RandomZ":2560365407,"StartTime":144141.0,"Objects":[{"StartTime":144141.0,"EndTime":144671.0,"Column":0}]},{"RandomW":3275109659,"RandomX":2560365407,"RandomY":2333467129,"RandomZ":2783370328,"StartTime":145203.0,"Objects":[{"StartTime":145203.0,"EndTime":145468.0,"Column":3}]},{"RandomW":2675369072,"RandomX":2783370328,"RandomY":3275109659,"RandomZ":3142107337,"StartTime":145734.0,"Objects":[{"StartTime":145734.0,"EndTime":145999.0,"Column":1}]},{"RandomW":2114821552,"RandomX":3142107337,"RandomY":2675369072,"RandomZ":216133594,"StartTime":146265.0,"Objects":[{"StartTime":146265.0,"EndTime":146795.0,"Column":5}]},{"RandomW":2210288688,"RandomX":2675369072,"RandomY":216133594,"RandomZ":2114821552,"StartTime":147062.0,"Objects":[{"StartTime":147062.0,"EndTime":147062.0,"Column":3}]},{"RandomW":2824847566,"RandomX":2114821552,"RandomY":2210288688,"RandomZ":2881713491,"StartTime":147327.0,"Objects":[{"StartTime":147327.0,"EndTime":147592.0,"Column":1}]},{"RandomW":3418617049,"RandomX":2881713491,"RandomY":2824847566,"RandomZ":3131910248,"StartTime":147858.0,"Objects":[{"StartTime":147858.0,"EndTime":148123.0,"Column":3}]},{"RandomW":4264037536,"RandomX":3418617049,"RandomY":2065328415,"RandomZ":756387586,"StartTime":148389.0,"Objects":[{"StartTime":148389.0,"EndTime":149450.0,"Column":2},{"StartTime":148389.0,"EndTime":149450.0,"Column":5}]},{"RandomW":714689152,"RandomX":2065328415,"RandomY":756387586,"RandomZ":4264037536,"StartTime":149717.0,"Objects":[{"StartTime":149717.0,"EndTime":149717.0,"Column":2}]},{"RandomW":2187562077,"RandomX":756387586,"RandomY":4264037536,"RandomZ":714689152,"StartTime":149982.0,"Objects":[{"StartTime":149982.0,"EndTime":149982.0,"Column":1},{"StartTime":149982.0,"EndTime":149982.0,"Column":2}]},{"RandomW":59731596,"RandomX":4264037536,"RandomY":714689152,"RandomZ":2187562077,"StartTime":150247.0,"Objects":[{"StartTime":150247.0,"EndTime":150247.0,"Column":0}]},{"RandomW":3179032401,"RandomX":714689152,"RandomY":2187562077,"RandomZ":59731596,"StartTime":150513.0,"Objects":[{"StartTime":150513.0,"EndTime":150513.0,"Column":1}]},{"RandomW":1565638452,"RandomX":2187562077,"RandomY":59731596,"RandomZ":3179032401,"StartTime":150778.0,"Objects":[{"StartTime":150778.0,"EndTime":150778.0,"Column":2}]},{"RandomW":3285111207,"RandomX":59731596,"RandomY":3179032401,"RandomZ":1565638452,"StartTime":151044.0,"Objects":[{"StartTime":151044.0,"EndTime":151044.0,"Column":3},{"StartTime":151044.0,"EndTime":151044.0,"Column":4}]},{"RandomW":3142401116,"RandomX":3179032401,"RandomY":1565638452,"RandomZ":3285111207,"StartTime":151309.0,"Objects":[{"StartTime":151309.0,"EndTime":151309.0,"Column":4}]},{"RandomW":2191101353,"RandomX":3142401116,"RandomY":3877079747,"RandomZ":930029834,"StartTime":151575.0,"Objects":[{"StartTime":151575.0,"EndTime":152105.0,"Column":2},{"StartTime":151575.0,"EndTime":152105.0,"Column":0}]},{"RandomW":1171726387,"RandomX":2191101353,"RandomY":1357180538,"RandomZ":201209655,"StartTime":152637.0,"Objects":[{"StartTime":152637.0,"EndTime":152902.0,"Column":3}]},{"RandomW":2089660876,"RandomX":201209655,"RandomY":1171726387,"RandomZ":191699429,"StartTime":153168.0,"Objects":[{"StartTime":153168.0,"EndTime":153698.0,"Column":5}]},{"RandomW":2251323109,"RandomX":1171726387,"RandomY":191699429,"RandomZ":2089660876,"StartTime":153964.0,"Objects":[{"StartTime":153964.0,"EndTime":153964.0,"Column":2}]},{"RandomW":147408153,"RandomX":2251323109,"RandomY":2048526504,"RandomZ":433820735,"StartTime":154230.0,"Objects":[{"StartTime":154230.0,"EndTime":154230.0,"Column":0},{"StartTime":154230.0,"EndTime":154230.0,"Column":5}]},{"RandomW":223059387,"RandomX":2048526504,"RandomY":433820735,"RandomZ":147408153,"StartTime":154495.0,"Objects":[{"StartTime":154495.0,"EndTime":154495.0,"Column":3}]},{"RandomW":1644267862,"RandomX":147408153,"RandomY":223059387,"RandomZ":2814282738,"StartTime":154761.0,"Objects":[{"StartTime":154761.0,"EndTime":155026.0,"Column":4}]},{"RandomW":585628331,"RandomX":1644267862,"RandomY":547547522,"RandomZ":1901399656,"StartTime":155292.0,"Objects":[{"StartTime":155292.0,"EndTime":155292.0,"Column":0},{"StartTime":155292.0,"EndTime":155292.0,"Column":5}]},{"RandomW":1287818392,"RandomX":547547522,"RandomY":1901399656,"RandomZ":585628331,"StartTime":155557.0,"Objects":[{"StartTime":155557.0,"EndTime":155557.0,"Column":1}]},{"RandomW":3879046214,"RandomX":2065404539,"RandomY":2732913982,"RandomZ":3217781099,"StartTime":155823.0,"Objects":[{"StartTime":155823.0,"EndTime":156088.0,"Column":2},{"StartTime":155823.0,"EndTime":156088.0,"Column":4}]},{"RandomW":3318878889,"RandomX":3217781099,"RandomY":3879046214,"RandomZ":1075466897,"StartTime":156354.0,"Objects":[{"StartTime":156354.0,"EndTime":156619.0,"Column":3}]},{"RandomW":1785367685,"RandomX":1075466897,"RandomY":3318878889,"RandomZ":561406801,"StartTime":156885.0,"Objects":[{"StartTime":156885.0,"EndTime":157415.0,"Column":4}]},{"RandomW":2909067134,"RandomX":561406801,"RandomY":1785367685,"RandomZ":4168537475,"StartTime":157947.0,"Objects":[{"StartTime":157947.0,"EndTime":157947.0,"Column":5},{"StartTime":157947.0,"EndTime":157947.0,"Column":2}]},{"RandomW":1067074920,"RandomX":1785367685,"RandomY":4168537475,"RandomZ":2909067134,"StartTime":158212.0,"Objects":[{"StartTime":158212.0,"EndTime":158212.0,"Column":4}]},{"RandomW":27977914,"RandomX":4168537475,"RandomY":2909067134,"RandomZ":1067074920,"StartTime":158478.0,"Objects":[{"StartTime":158478.0,"EndTime":158478.0,"Column":5},{"StartTime":158478.0,"EndTime":158478.0,"Column":0}]},{"RandomW":1329528769,"RandomX":2909067134,"RandomY":1067074920,"RandomZ":27977914,"StartTime":158743.0,"Objects":[{"StartTime":158743.0,"EndTime":158743.0,"Column":4}]},{"RandomW":3295284863,"RandomX":1067074920,"RandomY":27977914,"RandomZ":1329528769,"StartTime":159009.0,"Objects":[{"StartTime":159009.0,"EndTime":159009.0,"Column":5}]},{"RandomW":691446431,"RandomX":27977914,"RandomY":1329528769,"RandomZ":3295284863,"StartTime":159540.0,"Objects":[{"StartTime":159540.0,"EndTime":159540.0,"Column":3},{"StartTime":159540.0,"EndTime":159540.0,"Column":4}]},{"RandomW":3354872060,"RandomX":3295284863,"RandomY":691446431,"RandomZ":2140106811,"StartTime":159805.0,"Objects":[{"StartTime":159805.0,"EndTime":159805.0,"Column":2},{"StartTime":159805.0,"EndTime":159805.0,"Column":3}]},{"RandomW":1400553355,"RandomX":691446431,"RandomY":2140106811,"RandomZ":3354872060,"StartTime":160071.0,"Objects":[{"StartTime":160071.0,"EndTime":160071.0,"Column":2}]},{"RandomW":1400553355,"RandomX":691446431,"RandomY":2140106811,"RandomZ":3354872060,"StartTime":160601.0,"Objects":[{"StartTime":160601.0,"EndTime":160601.0,"Column":3}]},{"RandomW":3485781281,"RandomX":2140106811,"RandomY":3354872060,"RandomZ":1400553355,"StartTime":160867.0,"Objects":[{"StartTime":160867.0,"EndTime":160867.0,"Column":3}]},{"RandomW":3053679463,"RandomX":1400553355,"RandomY":3485781281,"RandomZ":3419304522,"StartTime":161132.0,"Objects":[{"StartTime":161132.0,"EndTime":161397.0,"Column":2}]},{"RandomW":3645336111,"RandomX":3419304522,"RandomY":3053679463,"RandomZ":805504203,"StartTime":161663.0,"Objects":[{"StartTime":161663.0,"EndTime":162193.0,"Column":4}]},{"RandomW":1638076271,"RandomX":3053679463,"RandomY":805504203,"RandomZ":3645336111,"StartTime":162460.0,"Objects":[{"StartTime":162460.0,"EndTime":162460.0,"Column":3}]},{"RandomW":107981020,"RandomX":1638076271,"RandomY":3432435831,"RandomZ":3835408498,"StartTime":162725.0,"Objects":[{"StartTime":162725.0,"EndTime":162725.0,"Column":0},{"StartTime":162725.0,"EndTime":162725.0,"Column":5}]},{"RandomW":94467567,"RandomX":3835408498,"RandomY":107981020,"RandomZ":2144208649,"StartTime":163256.0,"Objects":[{"StartTime":163256.0,"EndTime":163256.0,"Column":4},{"StartTime":163256.0,"EndTime":163256.0,"Column":0}]},{"RandomW":1015041289,"RandomX":107981020,"RandomY":2144208649,"RandomZ":94467567,"StartTime":163522.0,"Objects":[{"StartTime":163522.0,"EndTime":163522.0,"Column":3}]},{"RandomW":2029876639,"RandomX":1204955917,"RandomY":1210817201,"RandomZ":1177260118,"StartTime":163787.0,"Objects":[{"StartTime":163787.0,"EndTime":164052.0,"Column":5}]},{"RandomW":3125496505,"RandomX":1177260118,"RandomY":2029876639,"RandomZ":2929832910,"StartTime":164318.0,"Objects":[{"StartTime":164318.0,"EndTime":164583.0,"Column":2}]},{"RandomW":2426857185,"RandomX":3125496505,"RandomY":2700661894,"RandomZ":859446411,"StartTime":164849.0,"Objects":[{"StartTime":164849.0,"EndTime":165114.0,"Column":0}]},{"RandomW":4116661924,"RandomX":2426857185,"RandomY":1884842190,"RandomZ":375578279,"StartTime":165380.0,"Objects":[{"StartTime":165380.0,"EndTime":165910.0,"Column":1},{"StartTime":165380.0,"EndTime":165910.0,"Column":5}]},{"RandomW":3787729819,"RandomX":375578279,"RandomY":4116661924,"RandomZ":1382622976,"StartTime":166442.0,"Objects":[{"StartTime":166442.0,"EndTime":166972.0,"Column":4}]},{"RandomW":3780331234,"RandomX":4116661924,"RandomY":1382622976,"RandomZ":3787729819,"StartTime":167239.0,"Objects":[{"StartTime":167239.0,"EndTime":167239.0,"Column":3}]},{"RandomW":891570220,"RandomX":3780331234,"RandomY":3996538378,"RandomZ":4118560235,"StartTime":167504.0,"Objects":[{"StartTime":167504.0,"EndTime":168034.0,"Column":5},{"StartTime":167504.0,"EndTime":168034.0,"Column":2}]},{"RandomW":1312521276,"RandomX":3996538378,"RandomY":4118560235,"RandomZ":891570220,"StartTime":168301.0,"Objects":[{"StartTime":168301.0,"EndTime":168301.0,"Column":0}]},{"RandomW":316798455,"RandomX":4118560235,"RandomY":891570220,"RandomZ":1312521276,"StartTime":168566.0,"Objects":[{"StartTime":168566.0,"EndTime":168566.0,"Column":2},{"StartTime":168566.0,"EndTime":168566.0,"Column":3}]},{"RandomW":107348261,"RandomX":891570220,"RandomY":1312521276,"RandomZ":316798455,"StartTime":168832.0,"Objects":[{"StartTime":168832.0,"EndTime":168832.0,"Column":1}]},{"RandomW":286543085,"RandomX":1312521276,"RandomY":316798455,"RandomZ":107348261,"StartTime":169097.0,"Objects":[{"StartTime":169097.0,"EndTime":169097.0,"Column":1},{"StartTime":169097.0,"EndTime":169097.0,"Column":2}]},{"RandomW":2220558447,"RandomX":316798455,"RandomY":107348261,"RandomZ":286543085,"StartTime":169363.0,"Objects":[{"StartTime":169363.0,"EndTime":169363.0,"Column":2}]},{"RandomW":2567445342,"RandomX":107348261,"RandomY":286543085,"RandomZ":2220558447,"StartTime":169628.0,"Objects":[{"StartTime":169628.0,"EndTime":169628.0,"Column":1},{"StartTime":169628.0,"EndTime":169628.0,"Column":2}]},{"RandomW":2941341299,"RandomX":286543085,"RandomY":2220558447,"RandomZ":2567445342,"StartTime":170159.0,"Objects":[{"StartTime":170159.0,"EndTime":170159.0,"Column":3},{"StartTime":170159.0,"EndTime":170159.0,"Column":4}]},{"RandomW":2941341299,"RandomX":286543085,"RandomY":2220558447,"RandomZ":2567445342,"StartTime":170424.0,"Objects":[{"StartTime":170424.0,"EndTime":170424.0,"Column":2},{"StartTime":170424.0,"EndTime":170424.0,"Column":1}]},{"RandomW":1087727581,"RandomX":2567445342,"RandomY":2941341299,"RandomZ":479267920,"StartTime":170690.0,"Objects":[{"StartTime":170690.0,"EndTime":171220.0,"Column":3}]},{"RandomW":2581485170,"RandomX":2941341299,"RandomY":479267920,"RandomZ":1087727581,"StartTime":171486.0,"Objects":[{"StartTime":171486.0,"EndTime":171486.0,"Column":5}]},{"RandomW":683596203,"RandomX":1087727581,"RandomY":2581485170,"RandomZ":3168383468,"StartTime":171752.0,"Objects":[{"StartTime":171752.0,"EndTime":172282.0,"Column":1}]},{"RandomW":3284056302,"RandomX":2581485170,"RandomY":3168383468,"RandomZ":683596203,"StartTime":172548.0,"Objects":[{"StartTime":172548.0,"EndTime":172548.0,"Column":2}]},{"RandomW":2830633773,"RandomX":3168383468,"RandomY":683596203,"RandomZ":3284056302,"StartTime":172814.0,"Objects":[{"StartTime":172814.0,"EndTime":172814.0,"Column":3},{"StartTime":172814.0,"EndTime":172814.0,"Column":4}]},{"RandomW":3651115271,"RandomX":683596203,"RandomY":3284056302,"RandomZ":2830633773,"StartTime":173079.0,"Objects":[{"StartTime":173079.0,"EndTime":173079.0,"Column":3}]},{"RandomW":120746014,"RandomX":3284056302,"RandomY":2830633773,"RandomZ":3651115271,"StartTime":173345.0,"Objects":[{"StartTime":173345.0,"EndTime":173345.0,"Column":3},{"StartTime":173345.0,"EndTime":173345.0,"Column":4}]},{"RandomW":830325214,"RandomX":2830633773,"RandomY":3651115271,"RandomZ":120746014,"StartTime":173610.0,"Objects":[{"StartTime":173610.0,"EndTime":173610.0,"Column":4}]},{"RandomW":1509180863,"RandomX":3651115271,"RandomY":120746014,"RandomZ":830325214,"StartTime":173876.0,"Objects":[{"StartTime":173876.0,"EndTime":173876.0,"Column":3},{"StartTime":173876.0,"EndTime":173876.0,"Column":4}]},{"RandomW":2233493011,"RandomX":3902833961,"RandomY":923589330,"RandomZ":3425613873,"StartTime":174407.0,"Objects":[{"StartTime":174407.0,"EndTime":174672.0,"Column":2},{"StartTime":174407.0,"EndTime":174672.0,"Column":0}]},{"RandomW":2517643905,"RandomX":1207989122,"RandomY":993303558,"RandomZ":3011821377,"StartTime":174938.0,"Objects":[{"StartTime":174938.0,"EndTime":175468.0,"Column":3},{"StartTime":174938.0,"EndTime":175468.0,"Column":1}]},{"RandomW":3720863650,"RandomX":993303558,"RandomY":3011821377,"RandomZ":2517643905,"StartTime":175734.0,"Objects":[{"StartTime":175734.0,"EndTime":175734.0,"Column":2}]},{"RandomW":3563355415,"RandomX":2517643905,"RandomY":3720863650,"RandomZ":1116519600,"StartTime":176000.0,"Objects":[{"StartTime":176000.0,"EndTime":176530.0,"Column":3}]},{"RandomW":3287800096,"RandomX":3720863650,"RandomY":1116519600,"RandomZ":3563355415,"StartTime":176796.0,"Objects":[{"StartTime":176796.0,"EndTime":176796.0,"Column":3}]},{"RandomW":539898931,"RandomX":1116519600,"RandomY":3563355415,"RandomZ":3287800096,"StartTime":177062.0,"Objects":[{"StartTime":177062.0,"EndTime":177062.0,"Column":2},{"StartTime":177062.0,"EndTime":177062.0,"Column":3}]},{"RandomW":123758010,"RandomX":3563355415,"RandomY":3287800096,"RandomZ":539898931,"StartTime":177327.0,"Objects":[{"StartTime":177327.0,"EndTime":177327.0,"Column":4}]},{"RandomW":4028312708,"RandomX":3287800096,"RandomY":539898931,"RandomZ":123758010,"StartTime":177593.0,"Objects":[{"StartTime":177593.0,"EndTime":177593.0,"Column":2},{"StartTime":177593.0,"EndTime":177593.0,"Column":3}]},{"RandomW":2371409278,"RandomX":539898931,"RandomY":123758010,"RandomZ":4028312708,"StartTime":177858.0,"Objects":[{"StartTime":177858.0,"EndTime":177858.0,"Column":3}]},{"RandomW":3699828554,"RandomX":123758010,"RandomY":4028312708,"RandomZ":2371409278,"StartTime":178124.0,"Objects":[{"StartTime":178124.0,"EndTime":178124.0,"Column":2},{"StartTime":178124.0,"EndTime":178124.0,"Column":3}]},{"RandomW":4053363780,"RandomX":2371409278,"RandomY":3699828554,"RandomZ":3637445845,"StartTime":178655.0,"Objects":[{"StartTime":178655.0,"EndTime":178920.0,"Column":5}]},{"RandomW":1366734997,"RandomX":3637445845,"RandomY":4053363780,"RandomZ":3122766892,"StartTime":179186.0,"Objects":[{"StartTime":179186.0,"EndTime":179716.0,"Column":3}]},{"RandomW":2085192570,"RandomX":1366734997,"RandomY":4047501250,"RandomZ":3422445293,"StartTime":179982.0,"Objects":[{"StartTime":179982.0,"EndTime":179982.0,"Column":3},{"StartTime":179982.0,"EndTime":179982.0,"Column":5}]},{"RandomW":2526042960,"RandomX":3422445293,"RandomY":2085192570,"RandomZ":2552180342,"StartTime":180247.0,"Objects":[{"StartTime":180247.0,"EndTime":180777.0,"Column":1}]},{"RandomW":2946528857,"RandomX":2085192570,"RandomY":2552180342,"RandomZ":2526042960,"StartTime":181044.0,"Objects":[{"StartTime":181044.0,"EndTime":181044.0,"Column":2}]},{"RandomW":4275012500,"RandomX":2526042960,"RandomY":2946528857,"RandomZ":2680316548,"StartTime":181309.0,"Objects":[{"StartTime":181309.0,"EndTime":181574.0,"Column":5}]},{"RandomW":716767862,"RandomX":1177533555,"RandomY":3396673648,"RandomZ":1210370441,"StartTime":181840.0,"Objects":[{"StartTime":181840.0,"EndTime":182105.0,"Column":3},{"StartTime":181840.0,"EndTime":182105.0,"Column":2}]},{"RandomW":1918581647,"RandomX":1210370441,"RandomY":716767862,"RandomZ":290385782,"StartTime":182371.0,"Objects":[{"StartTime":182371.0,"EndTime":182636.0,"Column":5}]},{"RandomW":2554770024,"RandomX":1918581647,"RandomY":475913420,"RandomZ":4262840195,"StartTime":182902.0,"Objects":[{"StartTime":182902.0,"EndTime":183432.0,"Column":1}]},{"RandomW":862610860,"RandomX":475913420,"RandomY":4262840195,"RandomZ":2554770024,"StartTime":183699.0,"Objects":[{"StartTime":183699.0,"EndTime":185557.0,"Column":2}]},{"RandomW":3240322225,"RandomX":4262840195,"RandomY":2554770024,"RandomZ":862610860,"StartTime":202017.0,"Objects":[{"StartTime":202017.0,"EndTime":202017.0,"Column":0}]},{"RandomW":2438630089,"RandomX":2554770024,"RandomY":862610860,"RandomZ":3240322225,"StartTime":202283.0,"Objects":[{"StartTime":202283.0,"EndTime":202283.0,"Column":1}]},{"RandomW":1543895637,"RandomX":3240322225,"RandomY":2438630089,"RandomZ":1008910200,"StartTime":202548.0,"Objects":[{"StartTime":202548.0,"EndTime":203078.0,"Column":4}]},{"RandomW":2262375304,"RandomX":2438630089,"RandomY":1008910200,"RandomZ":1543895637,"StartTime":203345.0,"Objects":[{"StartTime":203345.0,"EndTime":203345.0,"Column":2}]},{"RandomW":3932191533,"RandomX":1543895637,"RandomY":2262375304,"RandomZ":3281044824,"StartTime":203610.0,"Objects":[{"StartTime":203610.0,"EndTime":203875.0,"Column":4}]},{"RandomW":2456816417,"RandomX":3932191533,"RandomY":2579817318,"RandomZ":3616517773,"StartTime":204141.0,"Objects":[{"StartTime":204141.0,"EndTime":204406.0,"Column":0}]},{"RandomW":1863357795,"RandomX":2456816417,"RandomY":2065740625,"RandomZ":3309416576,"StartTime":204672.0,"Objects":[{"StartTime":204672.0,"EndTime":205202.0,"Column":3},{"StartTime":204672.0,"EndTime":205202.0,"Column":5}]},{"RandomW":66010220,"RandomX":3309416576,"RandomY":1863357795,"RandomZ":2100015779,"StartTime":205469.0,"Objects":[{"StartTime":205469.0,"EndTime":205469.0,"Column":4},{"StartTime":205469.0,"EndTime":205469.0,"Column":0}]},{"RandomW":548562611,"RandomX":2100015779,"RandomY":66010220,"RandomZ":3420604705,"StartTime":205734.0,"Objects":[{"StartTime":205734.0,"EndTime":205999.0,"Column":1}]},{"RandomW":2052728473,"RandomX":3420604705,"RandomY":548562611,"RandomZ":2913964,"StartTime":206265.0,"Objects":[{"StartTime":206265.0,"EndTime":206530.0,"Column":5}]},{"RandomW":1944462115,"RandomX":2052728473,"RandomY":2737357746,"RandomZ":270315162,"StartTime":206796.0,"Objects":[{"StartTime":206796.0,"EndTime":206796.0,"Column":2},{"StartTime":206796.0,"EndTime":206796.0,"Column":3}]},{"RandomW":3626216744,"RandomX":2737357746,"RandomY":270315162,"RandomZ":1944462115,"StartTime":207062.0,"Objects":[{"StartTime":207062.0,"EndTime":207062.0,"Column":5}]},{"RandomW":1039388877,"RandomX":270315162,"RandomY":1944462115,"RandomZ":3626216744,"StartTime":207327.0,"Objects":[{"StartTime":207327.0,"EndTime":207327.0,"Column":4}]},{"RandomW":3362701719,"RandomX":1944462115,"RandomY":3626216744,"RandomZ":1039388877,"StartTime":207593.0,"Objects":[{"StartTime":207593.0,"EndTime":207593.0,"Column":3}]},{"RandomW":3968495235,"RandomX":3362701719,"RandomY":2329091202,"RandomZ":1331472925,"StartTime":207858.0,"Objects":[{"StartTime":207858.0,"EndTime":208388.0,"Column":5}]},{"RandomW":1381394684,"RandomX":2329091202,"RandomY":1331472925,"RandomZ":3968495235,"StartTime":208655.0,"Objects":[{"StartTime":208655.0,"EndTime":208655.0,"Column":5}]},{"RandomW":1435798214,"RandomX":1381394684,"RandomY":1081301304,"RandomZ":3939835753,"StartTime":208920.0,"Objects":[{"StartTime":208920.0,"EndTime":209450.0,"Column":4}]},{"RandomW":3026458880,"RandomX":1081301304,"RandomY":3939835753,"RandomZ":1435798214,"StartTime":209717.0,"Objects":[{"StartTime":209717.0,"EndTime":209717.0,"Column":5}]},{"RandomW":3713738018,"RandomX":3026458880,"RandomY":1845767213,"RandomZ":745035987,"StartTime":209982.0,"Objects":[{"StartTime":209982.0,"EndTime":210512.0,"Column":2},{"StartTime":209982.0,"EndTime":210512.0,"Column":4}]},{"RandomW":1231260560,"RandomX":1845767213,"RandomY":745035987,"RandomZ":3713738018,"StartTime":210778.0,"Objects":[{"StartTime":210778.0,"EndTime":210778.0,"Column":4}]},{"RandomW":105489365,"RandomX":745035987,"RandomY":3713738018,"RandomZ":1231260560,"StartTime":211044.0,"Objects":[{"StartTime":211044.0,"EndTime":211044.0,"Column":4}]},{"RandomW":1753861391,"RandomX":3713738018,"RandomY":1231260560,"RandomZ":105489365,"StartTime":211309.0,"Objects":[{"StartTime":211309.0,"EndTime":211309.0,"Column":2}]},{"RandomW":966114829,"RandomX":105489365,"RandomY":1753861391,"RandomZ":1828685577,"StartTime":211575.0,"Objects":[{"StartTime":211575.0,"EndTime":211575.0,"Column":3},{"StartTime":211575.0,"EndTime":211575.0,"Column":2}]},{"RandomW":1431749195,"RandomX":1836275468,"RandomY":1290011463,"RandomZ":1159621643,"StartTime":211840.0,"Objects":[{"StartTime":211840.0,"EndTime":212370.0,"Column":5},{"StartTime":211840.0,"EndTime":212370.0,"Column":4}]},{"RandomW":3472418283,"RandomX":1159621643,"RandomY":1431749195,"RandomZ":2724869338,"StartTime":212637.0,"Objects":[{"StartTime":212637.0,"EndTime":212902.0,"Column":3}]},{"RandomW":1755864208,"RandomX":3472418283,"RandomY":2016458251,"RandomZ":2610391004,"StartTime":213168.0,"Objects":[{"StartTime":213168.0,"EndTime":213698.0,"Column":1},{"StartTime":213168.0,"EndTime":213698.0,"Column":4}]},{"RandomW":1635138515,"RandomX":2016458251,"RandomY":2610391004,"RandomZ":1755864208,"StartTime":213964.0,"Objects":[{"StartTime":213964.0,"EndTime":213964.0,"Column":3}]},{"RandomW":3162662082,"RandomX":1755864208,"RandomY":1635138515,"RandomZ":2617989400,"StartTime":214230.0,"Objects":[{"StartTime":214230.0,"EndTime":214495.0,"Column":2}]},{"RandomW":1184692914,"RandomX":2617989400,"RandomY":3162662082,"RandomZ":2531582750,"StartTime":214761.0,"Objects":[{"StartTime":214761.0,"EndTime":215026.0,"Column":3}]},{"RandomW":798124101,"RandomX":2531582750,"RandomY":1184692914,"RandomZ":2157553888,"StartTime":215292.0,"Objects":[{"StartTime":215292.0,"EndTime":215557.0,"Column":2}]},{"RandomW":1923400471,"RandomX":798124101,"RandomY":2665448122,"RandomZ":1060614841,"StartTime":215823.0,"Objects":[{"StartTime":215823.0,"EndTime":216088.0,"Column":5}]},{"RandomW":775950648,"RandomX":1923400471,"RandomY":3469237574,"RandomZ":2892029047,"StartTime":216354.0,"Objects":[{"StartTime":216354.0,"EndTime":216354.0,"Column":1},{"StartTime":216354.0,"EndTime":216354.0,"Column":4}]},{"RandomW":1321234603,"RandomX":4127626210,"RandomY":1546611249,"RandomZ":1925740893,"StartTime":216885.0,"Objects":[{"StartTime":216885.0,"EndTime":217150.0,"Column":5},{"StartTime":216885.0,"EndTime":217150.0,"Column":3}]},{"RandomW":2881678930,"RandomX":1925740893,"RandomY":1321234603,"RandomZ":2358993682,"StartTime":217416.0,"Objects":[{"StartTime":217416.0,"EndTime":217946.0,"Column":2}]},{"RandomW":2599512294,"RandomX":1321234603,"RandomY":2358993682,"RandomZ":2881678930,"StartTime":218212.0,"Objects":[{"StartTime":218212.0,"EndTime":218212.0,"Column":1}]},{"RandomW":2150464549,"RandomX":2881678930,"RandomY":2599512294,"RandomZ":3623425595,"StartTime":218478.0,"Objects":[{"StartTime":218478.0,"EndTime":219008.0,"Column":0}]},{"RandomW":763775798,"RandomX":3623425595,"RandomY":2150464549,"RandomZ":1008837132,"StartTime":219274.0,"Objects":[{"StartTime":219274.0,"EndTime":221132.0,"Column":2}]},{"RandomW":3656799832,"RandomX":1008837132,"RandomY":763775798,"RandomZ":852609139,"StartTime":221663.0,"Objects":[{"StartTime":221663.0,"EndTime":222193.0,"Column":4}]},{"RandomW":4147545979,"RandomX":852609139,"RandomY":3656799832,"RandomZ":3908484776,"StartTime":222460.0,"Objects":[{"StartTime":222460.0,"EndTime":222460.0,"Column":2},{"StartTime":222460.0,"EndTime":222460.0,"Column":5}]},{"RandomW":540508179,"RandomX":3908484776,"RandomY":4147545979,"RandomZ":1259887550,"StartTime":222725.0,"Objects":[{"StartTime":222725.0,"EndTime":223255.0,"Column":1}]},{"RandomW":1042752714,"RandomX":1259887550,"RandomY":540508179,"RandomZ":2104064323,"StartTime":223522.0,"Objects":[{"StartTime":223522.0,"EndTime":223522.0,"Column":5},{"StartTime":223522.0,"EndTime":223522.0,"Column":2}]},{"RandomW":3077262619,"RandomX":540508179,"RandomY":2104064323,"RandomZ":1042752714,"StartTime":223787.0,"Objects":[{"StartTime":223787.0,"EndTime":223787.0,"Column":3},{"StartTime":223787.0,"EndTime":223787.0,"Column":4}]},{"RandomW":734033149,"RandomX":2104064323,"RandomY":1042752714,"RandomZ":3077262619,"StartTime":224053.0,"Objects":[{"StartTime":224053.0,"EndTime":224053.0,"Column":4}]},{"RandomW":492155815,"RandomX":1042752714,"RandomY":3077262619,"RandomZ":734033149,"StartTime":224318.0,"Objects":[{"StartTime":224318.0,"EndTime":224318.0,"Column":4},{"StartTime":224318.0,"EndTime":224318.0,"Column":5}]},{"RandomW":441697715,"RandomX":3077262619,"RandomY":734033149,"RandomZ":492155815,"StartTime":224584.0,"Objects":[{"StartTime":224584.0,"EndTime":224584.0,"Column":3}]},{"RandomW":4156379255,"RandomX":734033149,"RandomY":492155815,"RandomZ":441697715,"StartTime":224849.0,"Objects":[{"StartTime":224849.0,"EndTime":224849.0,"Column":4},{"StartTime":224849.0,"EndTime":224849.0,"Column":5}]},{"RandomW":3757225441,"RandomX":492155815,"RandomY":441697715,"RandomZ":4156379255,"StartTime":225380.0,"Objects":[{"StartTime":225380.0,"EndTime":225380.0,"Column":2},{"StartTime":225380.0,"EndTime":225380.0,"Column":3}]},{"RandomW":3757225441,"RandomX":492155815,"RandomY":441697715,"RandomZ":4156379255,"StartTime":225646.0,"Objects":[{"StartTime":225646.0,"EndTime":225646.0,"Column":3},{"StartTime":225646.0,"EndTime":225646.0,"Column":2}]},{"RandomW":2225043333,"RandomX":3950035756,"RandomY":4132636893,"RandomZ":3158636107,"StartTime":225911.0,"Objects":[{"StartTime":225911.0,"EndTime":226441.0,"Column":5},{"StartTime":225911.0,"EndTime":226441.0,"Column":0}]},{"RandomW":479006094,"RandomX":2225043333,"RandomY":3919293849,"RandomZ":2279622039,"StartTime":226708.0,"Objects":[{"StartTime":226708.0,"EndTime":226708.0,"Column":0},{"StartTime":226708.0,"EndTime":226708.0,"Column":1}]},{"RandomW":3529234379,"RandomX":479006094,"RandomY":1674670789,"RandomZ":1460857923,"StartTime":226973.0,"Objects":[{"StartTime":226973.0,"EndTime":227503.0,"Column":4},{"StartTime":226973.0,"EndTime":227503.0,"Column":3}]},{"RandomW":2798539123,"RandomX":1674670789,"RandomY":1460857923,"RandomZ":3529234379,"StartTime":227770.0,"Objects":[{"StartTime":227770.0,"EndTime":227770.0,"Column":3}]},{"RandomW":1315002421,"RandomX":1460857923,"RandomY":3529234379,"RandomZ":2798539123,"StartTime":228035.0,"Objects":[{"StartTime":228035.0,"EndTime":228035.0,"Column":2},{"StartTime":228035.0,"EndTime":228035.0,"Column":3}]},{"RandomW":2396116302,"RandomX":3529234379,"RandomY":2798539123,"RandomZ":1315002421,"StartTime":228301.0,"Objects":[{"StartTime":228301.0,"EndTime":228301.0,"Column":1}]},{"RandomW":2184752848,"RandomX":2798539123,"RandomY":1315002421,"RandomZ":2396116302,"StartTime":228566.0,"Objects":[{"StartTime":228566.0,"EndTime":228566.0,"Column":2},{"StartTime":228566.0,"EndTime":228566.0,"Column":3}]},{"RandomW":1453929005,"RandomX":1315002421,"RandomY":2396116302,"RandomZ":2184752848,"StartTime":228832.0,"Objects":[{"StartTime":228832.0,"EndTime":228832.0,"Column":1}]},{"RandomW":307062845,"RandomX":2396116302,"RandomY":2184752848,"RandomZ":1453929005,"StartTime":229097.0,"Objects":[{"StartTime":229097.0,"EndTime":229097.0,"Column":2},{"StartTime":229097.0,"EndTime":229097.0,"Column":3}]},{"RandomW":2488853431,"RandomX":1430246951,"RandomY":1243135735,"RandomZ":862796553,"StartTime":229628.0,"Objects":[{"StartTime":229628.0,"EndTime":229893.0,"Column":0}]},{"RandomW":2954723307,"RandomX":862796553,"RandomY":2488853431,"RandomZ":1065193973,"StartTime":230159.0,"Objects":[{"StartTime":230159.0,"EndTime":230689.0,"Column":2}]},{"RandomW":3118771232,"RandomX":1065193973,"RandomY":2954723307,"RandomZ":3941773202,"StartTime":230955.0,"Objects":[{"StartTime":230955.0,"EndTime":230955.0,"Column":3},{"StartTime":230955.0,"EndTime":230955.0,"Column":2}]},{"RandomW":1630107201,"RandomX":3532926875,"RandomY":2476115689,"RandomZ":1207743047,"StartTime":231221.0,"Objects":[{"StartTime":231221.0,"EndTime":231751.0,"Column":0},{"StartTime":231221.0,"EndTime":231751.0,"Column":4}]},{"RandomW":313681160,"RandomX":2476115689,"RandomY":1207743047,"RandomZ":1630107201,"StartTime":232017.0,"Objects":[{"StartTime":232017.0,"EndTime":232017.0,"Column":2}]},{"RandomW":892602489,"RandomX":1207743047,"RandomY":1630107201,"RandomZ":313681160,"StartTime":232283.0,"Objects":[{"StartTime":232283.0,"EndTime":232283.0,"Column":3},{"StartTime":232283.0,"EndTime":232283.0,"Column":4}]},{"RandomW":2549672466,"RandomX":1630107201,"RandomY":313681160,"RandomZ":892602489,"StartTime":232548.0,"Objects":[{"StartTime":232548.0,"EndTime":232548.0,"Column":1}]},{"RandomW":3175685586,"RandomX":313681160,"RandomY":892602489,"RandomZ":2549672466,"StartTime":232814.0,"Objects":[{"StartTime":232814.0,"EndTime":232814.0,"Column":3},{"StartTime":232814.0,"EndTime":232814.0,"Column":4}]},{"RandomW":1012053334,"RandomX":892602489,"RandomY":2549672466,"RandomZ":3175685586,"StartTime":233079.0,"Objects":[{"StartTime":233079.0,"EndTime":233079.0,"Column":2}]},{"RandomW":2846885221,"RandomX":2549672466,"RandomY":3175685586,"RandomZ":1012053334,"StartTime":233345.0,"Objects":[{"StartTime":233345.0,"EndTime":233345.0,"Column":3},{"StartTime":233345.0,"EndTime":233345.0,"Column":4}]},{"RandomW":2773158813,"RandomX":2846885221,"RandomY":4182295099,"RandomZ":203093837,"StartTime":233876.0,"Objects":[{"StartTime":233876.0,"EndTime":234141.0,"Column":0},{"StartTime":233876.0,"EndTime":234141.0,"Column":1}]},{"RandomW":857734082,"RandomX":203093837,"RandomY":2773158813,"RandomZ":2365172092,"StartTime":234407.0,"Objects":[{"StartTime":234407.0,"EndTime":234937.0,"Column":2}]},{"RandomW":3898917491,"RandomX":2773158813,"RandomY":2365172092,"RandomZ":857734082,"StartTime":235203.0,"Objects":[{"StartTime":235203.0,"EndTime":235203.0,"Column":2}]},{"RandomW":1417532037,"RandomX":857734082,"RandomY":3898917491,"RandomZ":361638657,"StartTime":235469.0,"Objects":[{"StartTime":235469.0,"EndTime":235999.0,"Column":3}]},{"RandomW":2557538851,"RandomX":3898917491,"RandomY":361638657,"RandomZ":1417532037,"StartTime":236265.0,"Objects":[{"StartTime":236265.0,"EndTime":236265.0,"Column":3}]},{"RandomW":846935039,"RandomX":1417532037,"RandomY":2557538851,"RandomZ":1456065540,"StartTime":236531.0,"Objects":[{"StartTime":236531.0,"EndTime":236796.0,"Column":2}]},{"RandomW":2547399683,"RandomX":1456065540,"RandomY":846935039,"RandomZ":2284332751,"StartTime":237062.0,"Objects":[{"StartTime":237062.0,"EndTime":237327.0,"Column":1}]},{"RandomW":2405919505,"RandomX":846935039,"RandomY":2284332751,"RandomZ":2547399683,"StartTime":237593.0,"Objects":[{"StartTime":237593.0,"EndTime":237593.0,"Column":3},{"StartTime":237593.0,"EndTime":237593.0,"Column":4}]},{"RandomW":1684559305,"RandomX":2284332751,"RandomY":2547399683,"RandomZ":2405919505,"StartTime":237858.0,"Objects":[{"StartTime":237858.0,"EndTime":237858.0,"Column":5},{"StartTime":237858.0,"EndTime":237858.0,"Column":0}]},{"RandomW":2914982357,"RandomX":2547399683,"RandomY":2405919505,"RandomZ":1684559305,"StartTime":238124.0,"Objects":[{"StartTime":238124.0,"EndTime":238124.0,"Column":2},{"StartTime":238124.0,"EndTime":238124.0,"Column":3}]},{"RandomW":2343509573,"RandomX":2405919505,"RandomY":1684559305,"RandomZ":2914982357,"StartTime":238389.0,"Objects":[{"StartTime":238389.0,"EndTime":238389.0,"Column":5}]},{"RandomW":1059378114,"RandomX":1684559305,"RandomY":2914982357,"RandomZ":2343509573,"StartTime":238655.0,"Objects":[{"StartTime":238655.0,"EndTime":240778.0,"Column":2}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374.osu b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374.osu
new file mode 100644
index 0000000000..50f943b9e6
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374.osu
@@ -0,0 +1,449 @@
+osu file format v9
+
+[General]
+StackLeniency: 0.4
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:4
+OverallDifficulty:5
+ApproachRate:6
+SliderMultiplier:1.7
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+2,98678,112295
+2,185757,200967
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+//Background Colour Transformations
+3,100,163,162,255
+
+[TimingPoints]
+695,530.973451327434,4,2,1,20,1,0
+33457,-100,4,2,1,25,0,0
+33988,-100,4,2,1,30,0,0
+34386,-100,4,1,0,30,0,0
+38649,-100,4,1,1,30,0,0
+42897,-100,4,1,0,30,0,0
+47144,-100,4,1,1,30,0,0
+51530,-100,4,2,1,20,0,0
+56978,571.428571428571,4,2,1,20,1,0
+58692,845.070422535211,4,2,1,20,1,0
+60248,530.973451327434,4,2,1,20,1,0
+60740,-100,4,1,1,30,0,0
+61555,-66.6666666666667,4,1,1,30,0,0
+62219,-100,4,1,0,40,0,0
+78148,-100,4,1,0,30,0,0
+78413,-100,4,1,0,35,0,0
+78679,-100,4,1,0,40,0,0
+78944,-100,4,1,0,45,0,0
+79210,-100,4,1,0,40,0,0
+96466,-100,4,2,1,30,0,0
+132285,-100,4,2,1,20,0,0
+149453,-100,4,1,1,35,0,0
+153790,-100,4,2,1,40,0,0
+157639,-100,4,1,1,35,0,0
+162020,-100,4,2,1,40,0,0
+166158,-100,4,1,0,40,0,0
+201733,-100,4,2,1,20,0,0
+219099,-133.333333333333,4,2,1,20,0,0
+221024,-100,4,1,1,30,0,0
+221290,-100,4,1,0,30,0,0
+
+[HitObjects]
+256,192,15562,12,0,17155
+72,120,17686,5,8
+128,224,17951,1,0
+185,119,18217,1,0
+246,220,18482,1,0
+128,224,18748,2,0,B|161:262|208:264,1,85,4|0
+309,213,19279,2,0,B|297:169|325:120,2,85,0|0|8
+309,213,20075,5,0
+309,332,20341,1,0
+206,272,20606,1,8
+309,213,20871,2,0,B|336:117|261:56,1,170,4|0
+205,272,21933,6,0,B|183:307|125:328,1,85,8|0
+149,256,22464,2,0,B|114:281|45:280,1,85,0|0
+101,216,22995,2,0,B|16:264|-56:176|16:72|104:128,1,255,4|0
+149,136,24057,6,0,B|170:100|229:80,1,85,8|0
+205,149,24588,2,0,B|239:123|309:125,1,85,0|8
+253,189,25119,2,0,B|349:144|413:221,1,170,4|8
+240,336,26181,5,8
+288,264,26447,1,0
+344,328,26712,2,0,B|391:339|440:328,1,85,0|0
+488,270,27243,2,0,B|424:256|392:200,1,85,4|0
+329,230,27774,2,0,B|328:176|386:142,1,85,0|0
+363,69,28305,2,0,B|328:40|280:56,2,85,8|0|0
+312,136,29102,1,0
+224,120,29367,2,0,B|192:168|256:240|224:296,1,170,4|8
+96,240,30429,6,0,B|83:195|56:160,1,85,8|0
+96,88,30960,2,0,B|83:132|56:168,1,85,0|0
+59,164,31491,2,0,B|129:182|187:167|254:149|323:168,1,255,4|0
+312,165,32553,6,0,B|302:210|256:237,1,85,8|0
+312,166,33084,2,0,B|321:120|368:94,1,85,8|0
+312,166,33615,2,0,B|318:204|374:193|426:183|450:247,1,170,8|8
+200,232,34677,5,4
+119,169,34942,1,0
+57,248,35208,1,8
+137,311,35473,1,0
+200,232,35739,5,0
+248,302,36004,1,0
+318,254,36270,1,8
+270,183,36535,1,0
+200,232,36801,6,0,B|120:272|120:272|40:224,1,170,0|8
+130,183,37597,1,0
+200,232,37863,2,0,B|280:192|280:192|368:240,1,170,0|8
+167,111,38925,6,0,B|134:71|98:65,1,85,8|0
+167,112,39456,2,0,B|115:116|90:142,1,85,4|0
+167,112,39987,2,0,B|120:192|176:248|240:312|152:368,1,255,8|0
+173,351,41048,6,0,B|142:305|80:288,1,85,8|0
+173,351,41579,2,0,B|194:299|175:238,1,85,4|0
+173,351,42110,2,0,B|237:351|253:303|269:255|341:263,1,170,8|8
+128,144,43172,5,4
+208,176,43438,1,0
+288,144,43703,1,8
+368,176,43969,1,0
+408,272,44234,5,0
+312,312,44500,1,0
+216,272,44765,1,8
+120,312,45031,1,0
+48,240,45296,5,0
+160,272,45562,1,0
+272,240,45827,1,8
+384,280,46093,1,0
+496,240,46358,2,0,B|448:208|448:208|496:176|504:128|442:127,1,170,0|8
+152,128,47420,6,0,B|122:167|120:224,1,85,8|0
+88,128,47951,2,0,B|95:177|133:218,1,85,4|0
+121,204,48482,2,0,B|140:296|264:280|308:368,1,255,8|0
+308,368,49544,6,0,B|293:318|324:264,1,85,8|0
+368,348,50075,2,0,B|322:323|305:263,1,85,4|0
+324,200,50606,2,0,B|274:214|203:224|142:108|131:56|243:32|243:120|211:160|107:136,1,340,8|2
+369,216,52730,5,2
+176,312,53792,2,0,B|166:217|64:144,1,170,0|0
+179,150,54588,1,0
+120,88,54854,2,0,B|107:176|38:232,1,170,2|0
+464,320,55916,6,0,B|392:252|288:280,1,170,0|0
+280,104,56978,6,0,B|312:192|416:208,1,170,2|0
+192,160,58120,2,0,B|182:224|112:240,1,85,2|0
+24,240,58692,6,0,B|72:240|88:272,1,56.6666666666667,6|0
+224,296,59325,2,0,B|240:200|200:120,1,170
+316,136,60513,5,0
+400,156,60778,2,0,B|408:100|364:56,1,85,10|0
+320,16,61309,1,2
+160,112,61840,6,0,B|95:104|28:135,1,127.499996200204,8|0
+160,112,62371,6,0,B|80:168|96:296,1,170,4|8
+176,280,63168,1,0
+224,208,63433,2,0,B|280:288|392:264,1,170,0|8
+456,184,64230,1,0
+328,144,64495,1,8
+416,248,64761,1,0
+408,112,65026,1,8
+336,232,65292,1,0
+388,182,65557,1,8
+256,288,66088,5,8
+256,288,66354,1,0
+256,288,66619,2,0,B|200:360|72:368,1,170,0|8
+44,308,67416,1,0
+87,234,67681,2,0,B|163:279|207:386,1,170,0|8
+256,288,68478,1,0
+400,120,68743,5,8
+328,256,69009,1,0
+400,120,69274,1,8
+264,184,69540,1,0
+400,120,69805,1,8
+400,120,70336,6,0,B|395:173|368:200,1,85,8|0
+213,255,70867,2,0,B|279:198|383:198,1,170,4|8
+329,125,71663,1,0
+248,104,71929,2,0,B|184:168|80:152,1,170,0|8
+200,224,72725,1,0
+272,339,72991,5,8
+151,276,73256,1,0
+267,204,73522,1,8
+204,322,73787,1,0
+287,272,74053,1,8
+287,272,74584,6,0,B|336:256|368:208,1,85,8|0
+372,140,75115,2,0,B|323:206|324:308,1,170,0|8
+240,288,75911,1,0
+160,248,76177,2,0,B|216:176|320:216,1,170,0|8
+272,136,76973,1,0
+200,88,77239,6,0,B|216:136|192:176,1,85,8|0
+160,248,77770,2,0,B|160:296|208:320,1,85,8|0
+328,232,78301,5,0
+233,133,78566,1,8
+297,15,78832,1,8
+432,40,79097,1,8
+453,176,79363,6,0,B|448:240|384:272|328:232,1,170,4|8
+286,306,80159,1,0
+203,288,80424,2,0,B|208:224|272:192|328:232,1,170,0|8
+404,231,81221,1,0
+408,160,81486,5,8
+360,288,81752,1,0
+472,216,82017,1,8
+336,208,82283,1,0
+440,296,82548,1,8
+288,320,83079,5,8
+288,320,83345,1,0
+288,320,83610,2,0,B|200:314|128:248,1,170,0|8
+88,320,84407,1,0
+56,240,84672,2,0,B|133:287|176:392,1,170,0|8
+163,274,85469,1,0
+296,216,85734,5,8
+165,75,86000,1,0
+99,178,86265,1,8
+282,97,86531,1,0
+184,264,86796,1,8
+184,264,87327,6,0,B|159:295|110:299,1,85,8|0
+23,247,87858,2,0,B|91:300|192:261,1,170,4|8
+245,326,88655,1,0
+293,254,88920,2,0,B|213:198|109:246,1,170,0|8
+181,302,89717,1,0
+165,166,89982,5,8
+141,302,90247,1,0
+205,182,90513,1,8
+109,278,90778,1,0
+229,214,91044,1,8
+376,132,91575,6,0,B|424:140|464:100,1,85,8|0
+464,192,92106,2,0,B|456:280|352:320,1,170,0|8
+300,256,92902,1,0
+228,212,93168,2,0,B|268:116|164:60,1,170,0|8
+100,32,93964,1,0
+84,116,94230,2,0,B|116:156|108:212,1,85,8|0
+188,160,94761,2,0,B|188:208|232:244,1,85,8|0
+296,196,95292,2,0,B|320:236|349:239|399:242|379:198|379:198|334:185|358:245|368:276|440:260|480:316|416:356,1,340,8|4
+256,192,96486,12,8,98478
+264,192,113345,5,8
+264,192,113876,1,8
+264,192,114407,5,0
+172,236,114672,1,8
+184,336,114938,1,0
+284,356,115203,1,8
+340,268,115469,1,8
+304,100,116000,1,8
+304,100,116531,1,0
+272,336,117062,5,8
+248,200,117327,1,0
+376,152,117593,1,8
+376,152,118124,1,8
+376,152,118655,5,0
+240,128,118920,1,8
+376,192,119186,1,0
+496,152,119451,1,8
+376,224,119717,1,8
+376,224,120247,1,8
+376,224,120778,1,0
+376,224,121309,5,8
+264,296,121575,1,0
+256,160,121840,1,8
+256,160,122371,1,8
+256,160,122902,1,0
+256,160,123433,5,8
+168,264,123699,1,0
+312,280,123964,1,8
+312,280,124495,1,8
+312,280,125026,1,0
+312,280,125557,5,8
+200,200,125823,1,0
+312,280,126088,1,8
+312,280,126619,1,8
+312,280,127150,5,0
+416,200,127416,1,8
+432,336,127681,1,0
+416,200,127947,1,8
+312,280,128212,1,8
+312,280,128743,1,8
+312,280,129274,5,8
+264,152,129540,1,8
+136,192,129805,1,8
+184,320,130071,1,12
+88,120,132460,6,0,B|127:224|104:304,1,170,2|0
+424,264,133522,2,0,B|384:159|408:80,1,170
+448,168,134318,2,0,B|369:240|297:240,1,170,4|0
+301,158,135115,2,0,B|277:206|309:262,1,85
+395,295,135646,2,0,B|323:263|227:287,1,170,0|2
+176,88,136708,6,0,B|134:57|80:64,1,85
+176,88,137239,2,0,B|221:64|264:64,1,85,8|0
+176,88,137770,2,0,B|137:175|196:220|272:272|208:344,1,255,4|0
+136,328,138832,6,0,B|83:306|40:328,1,85
+136,328,139363,2,0,B|184:312|224:328,1,85,2|0
+300,296,139894,2,0,B|300:198|388:200|468:200|452:104,1,255,4|0
+372,100,140955,1,0
+292,72,141221,6,0,B|250:102|244:152,2,85,0|8|0
+332,148,142017,1,4
+388,212,142283,2,0,B|414:243|465:241,1,85
+440,148,142814,2,0,B|400:172|388:213,1,85
+236,232,143345,1,0
+204,84,143610,1,0
+356,64,143876,1,0
+388,212,144141,2,0,B|350:295|228:308,1,170,4|0
+96,304,145203,6,0,B|96:208,1,85
+144,203,145734,2,0,B|144:288,1,85,8|0
+192,272,146265,2,0,B|192:176|192:176|192:120|256:112,1,170,4|0
+312,56,147062,1,0
+392,120,147327,6,0,B|392:208,1,85
+336,221,147858,2,0,B|336:136,1,85,8|0
+280,152,148389,2,0,B|280:256|280:256|264:272|280:288|280:288|296:304|280:320|280:320|248:336|280:352|280:352|312:368|312:368|280:376|224:384,1,340,4|4
+172,322,149717,5,0
+136,248,149982,1,8
+64,208,150247,1,0
+147,112,150513,5,0
+224,80,150778,1,0
+304,112,151044,1,8
+384,88,151309,1,0
+336,192,151575,6,0,B|280:272|176:264,1,170,0|8
+408,216,152637,2,0,B|429:173|464:152,1,85,0|0
+360,80,153168,2,0,B|376:168|304:264,1,170,8|0
+256,288,153964,5,2
+192,240,154230,1,4
+272,208,154495,1,0
+229,134,154761,2,0,B|276:214,1,85,0|2
+160,248,155292,1,4
+120,136,155557,1,0
+229,134,155823,6,0,B|331:134,1,85,0|2
+408,208,156354,2,0,B|312:208,1,85,4|0
+216,256,156885,2,0,B|272:280|264:352|208:344|192:296|256:272|328:312,1,170,0|4
+456,224,157947,5,0
+400,136,158212,1,0
+456,224,158478,1,8
+392,304,158743,1,0
+456,224,159009,1,0
+288,232,159540,5,8
+200,283,159805,1,0
+176,184,160071,1,0
+176,184,160601,5,8
+278,184,160867,1,0
+176,184,161132,2,0,B|88:184,1,85
+24,88,161663,2,0,B|192:88,1,170,8|0
+280,88,162460,1,2
+240,168,162725,1,4
+360,48,163256,5,0
+280,88,163522,1,2
+240,168,163787,2,0,B|344:168,1,85,4|0
+376,240,164318,2,0,B|320:312,1,85,2|0
+248,304,164849,2,0,B|200:232,1,85,6|0
+288,240,165380,2,0,B|288:136|288:136|286:82|344:72,1,170,6|8
+480,104,166442,6,0,B|416:168|416:296,1,170,4|8
+336,280,167239,1,0
+288,208,167504,2,0,B|232:288|120:264,1,170,0|8
+56,184,168301,1,0
+184,144,168566,1,8
+96,248,168832,1,0
+104,112,169097,1,8
+176,232,169363,1,0
+124,182,169628,1,8
+272,256,170159,5,8
+272,256,170424,1,0
+272,256,170690,2,0,B|310:339|428:329,1,170,0|8
+487,259,171486,1,0
+423,179,171752,2,0,B|340:241|340:329,1,170,0|8
+251,346,172548,1,0
+260,193,172814,5,8
+340,321,173079,1,0
+260,193,173345,1,8
+404,249,173610,1,0
+260,193,173876,1,8
+112,120,174407,6,0,B|117:173|144:200,1,85,8|0
+309,191,174938,2,0,B|225:225|117:191,1,170,0|8
+184,128,175734,1,0
+264,104,176000,2,0,B|328:168|432:152,1,170,0|8
+312,224,176796,1,0
+240,339,177062,5,8
+361,276,177327,1,0
+245,204,177593,1,8
+308,322,177858,1,0
+225,270,178124,1,8
+225,270,178655,6,0,B|176:256|144:208,1,85,8|0
+32,256,179186,2,0,B|120:256|192:312,1,170,0|8
+272,288,179982,1,0
+352,248,180247,2,0,B|296:176|192:216,1,170,0|8
+240,136,181044,1,0
+325,129,181309,6,0,B|322:176|285:217,1,85,8|0
+167,291,181840,2,0,B|170:244|207:203,1,85,8|0
+327,289,182371,2,0,B|280:286|239:249,1,85,8|0
+160,120,182902,2,0,B|216:112|248:152|272:192|336:192,1,170,8|4
+256,192,183699,12,4,185557
+80,104,202017,5,2
+152,219,202283,1,0
+16,224,202548,2,0,B|88:208|158:111,1,170,8|0
+226,87,203345,1,0
+304,120,203610,2,0,B|352:120|400:104,1,85,2|0
+304,120,204141,2,0,B|336:88|344:32,1,85,0|0
+341,45,204672,6,0,B|429:77|450:203,1,170,8|0
+360,184,205469,1,0
+304,120,205734,2,0,B|264:96|240:48,1,85,2|0
+304,120,206265,2,0,B|311:76|344:32,1,85,0|0
+408,88,206796,5,4
+472,168,207062,1,0
+392,224,207327,1,0
+304,280,207593,1,0
+224,208,207858,2,0,B|309:237|393:224,1,170
+472,168,208655,1,0
+408,88,208920,6,0,B|368:166|402:252,1,170,8|0
+504,280,209717,1,0
+403,319,209982,2,0,B|459:276|475:151,1,170,4|0
+408,88,210778,1,0
+384,200,211044,5,2
+240,160,211309,1,0
+264,304,211575,1,0
+296,224,211840,2,0,B|336:137|464:136,1,170,2|0
+296,224,212637,6,0,B|243:220|208:161,1,85,2|0
+163,324,213168,2,0,B|244:308|308:204,1,170,8|0
+296,136,213964,1,0
+264,56,214230,2,0,B|232:96|192:136,1,85,4|0
+208,120,214761,2,0,B|200:72|168:32,1,85
+175,42,215292,2,0,B|155:86|98:112,1,85,2|0
+50,53,215823,2,0,B|98:69|122:109,1,85,0|0
+117,102,216354,1,4
+168,344,216885,6,0,B|167:287|131:246,1,85
+88,160,217416,2,0,B|48:248|96:328,1,170,8|0
+144,264,218212,1,0
+224,296,218478,2,0,B|328:312|368:216,1,170,6|0
+363,110,219274,2,0,B|259:246|139:206|147:94|275:70|355:198|130:268,1,446.249986700714,2|8
+160,112,221663,6,0,B|80:168|96:296,1,170,4|8
+176,280,222460,1,0
+224,208,222725,2,0,B|280:288|392:264,1,170,0|8
+456,184,223522,1,0
+328,144,223787,5,8
+416,248,224053,1,0
+408,112,224318,1,8
+336,232,224584,1,0
+388,182,224849,1,8
+240,256,225380,5,8
+240,256,225646,1,0
+240,256,225911,2,0,B|184:328|76:314,1,170,0|8
+3,315,226708,1,0
+89,315,226973,2,0,B|184:302|240:374,1,170,0|8
+314,332,227770,1,0
+252,194,228035,5,8
+116,130,228301,1,0
+252,194,228566,1,8
+140,298,228832,1,0
+252,194,229097,1,8
+400,120,229628,6,0,B|352:112|288:144,1,85,8|0
+203,191,230159,2,0,B|287:225|395:191,1,170,0|8
+330,124,230955,1,0
+248,104,231221,2,0,B|152:96|80:152,1,170,0|8
+200,224,232017,1,0
+272,339,232283,5,8
+151,276,232548,1,0
+267,204,232814,1,8
+204,322,233079,1,0
+287,270,233345,1,8
+287,270,233876,6,0,B|335:254|367:206,1,85,8|0
+464,288,234407,2,0,B|368:272|304:344,1,170,0|8
+226,317,235203,1,0
+165,256,235469,2,0,B|224:192|336:208,1,170,0|8
+272,136,236265,1,0
+199,63,236531,2,0,B|152:80|120:128,1,85,8|0
+203,184,237062,2,0,B|167:218|165:267,1,85,8|0
+312,264,237593,5,8
+440,264,237858,1,8
+256,144,238124,1,8
+496,144,238389,1,0
+256,192,238655,12,4,240778
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544-expected-conversion.json
new file mode 100644
index 0000000000..2289a7243f
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"RandomW":273523780,"RandomX":842502087,"RandomY":3579807591,"RandomZ":273326509,"StartTime":7693.0,"Objects":[{"StartTime":7693.0,"EndTime":7693.0,"Column":0}]},{"RandomW":2659866685,"RandomX":3579807591,"RandomY":273326509,"RandomZ":273523780,"StartTime":8043.0,"Objects":[{"StartTime":8043.0,"EndTime":8043.0,"Column":1}]},{"RandomW":3083309108,"RandomX":273326509,"RandomY":273523780,"RandomZ":2659866685,"StartTime":8393.0,"Objects":[{"StartTime":8393.0,"EndTime":8393.0,"Column":2}]},{"RandomW":2413296944,"RandomX":2659866685,"RandomY":3083309108,"RandomZ":4072999080,"StartTime":8626.0,"Objects":[{"StartTime":8626.0,"EndTime":8626.0,"Column":2},{"StartTime":8626.0,"EndTime":8626.0,"Column":0}]},{"RandomW":1129322311,"RandomX":3083309108,"RandomY":4072999080,"RandomZ":2413296944,"StartTime":8860.0,"Objects":[{"StartTime":8860.0,"EndTime":8860.0,"Column":2}]},{"RandomW":3365759273,"RandomX":4072999080,"RandomY":2413296944,"RandomZ":1129322311,"StartTime":9326.0,"Objects":[{"StartTime":9326.0,"EndTime":9326.0,"Column":3}]},{"RandomW":315078874,"RandomX":2413296944,"RandomY":1129322311,"RandomZ":3365759273,"StartTime":9560.0,"Objects":[{"StartTime":9560.0,"EndTime":9560.0,"Column":3}]},{"RandomW":583662031,"RandomX":1129322311,"RandomY":3365759273,"RandomZ":315078874,"StartTime":9793.0,"Objects":[{"StartTime":9793.0,"EndTime":9793.0,"Column":3}]},{"RandomW":3789568254,"RandomX":3365759273,"RandomY":315078874,"RandomZ":583662031,"StartTime":10260.0,"Objects":[{"StartTime":10260.0,"EndTime":10260.0,"Column":2}]},{"RandomW":3256340938,"RandomX":315078874,"RandomY":583662031,"RandomZ":3789568254,"StartTime":10493.0,"Objects":[{"StartTime":10493.0,"EndTime":10493.0,"Column":2}]},{"RandomW":2152938451,"RandomX":3789568254,"RandomY":3256340938,"RandomZ":3979976762,"StartTime":10727.0,"Objects":[{"StartTime":10727.0,"EndTime":10727.0,"Column":1},{"StartTime":10727.0,"EndTime":10727.0,"Column":0}]},{"RandomW":1620362479,"RandomX":3256340938,"RandomY":3979976762,"RandomZ":2152938451,"StartTime":11427.0,"Objects":[{"StartTime":11427.0,"EndTime":11427.0,"Column":1}]},{"RandomW":477221046,"RandomX":3979976762,"RandomY":2152938451,"RandomZ":1620362479,"StartTime":11777.0,"Objects":[{"StartTime":11777.0,"EndTime":11777.0,"Column":1}]},{"RandomW":1013554034,"RandomX":2152938451,"RandomY":1620362479,"RandomZ":477221046,"StartTime":12127.0,"Objects":[{"StartTime":12127.0,"EndTime":12127.0,"Column":2}]},{"RandomW":637383311,"RandomX":1620362479,"RandomY":477221046,"RandomZ":1013554034,"StartTime":12360.0,"Objects":[{"StartTime":12360.0,"EndTime":12360.0,"Column":2}]},{"RandomW":3817388387,"RandomX":477221046,"RandomY":1013554034,"RandomZ":637383311,"StartTime":12594.0,"Objects":[{"StartTime":12594.0,"EndTime":12594.0,"Column":3}]},{"RandomW":19695232,"RandomX":637383311,"RandomY":3817388387,"RandomZ":1911435716,"StartTime":13060.0,"Objects":[{"StartTime":13060.0,"EndTime":13060.0,"Column":3},{"StartTime":13060.0,"EndTime":13060.0,"Column":0}]},{"RandomW":3381470688,"RandomX":3817388387,"RandomY":1911435716,"RandomZ":19695232,"StartTime":13294.0,"Objects":[{"StartTime":13294.0,"EndTime":13294.0,"Column":3}]},{"RandomW":1862836779,"RandomX":19695232,"RandomY":3381470688,"RandomZ":1869143571,"StartTime":13527.0,"Objects":[{"StartTime":13527.0,"EndTime":13527.0,"Column":3},{"StartTime":13527.0,"EndTime":13527.0,"Column":5}]},{"RandomW":175452620,"RandomX":3381470688,"RandomY":1869143571,"RandomZ":1862836779,"StartTime":13994.0,"Objects":[{"StartTime":13994.0,"EndTime":13994.0,"Column":4}]},{"RandomW":2859972423,"RandomX":1869143571,"RandomY":1862836779,"RandomZ":175452620,"StartTime":14227.0,"Objects":[{"StartTime":14227.0,"EndTime":14227.0,"Column":4}]},{"RandomW":2210823260,"RandomX":1862836779,"RandomY":175452620,"RandomZ":2859972423,"StartTime":14461.0,"Objects":[{"StartTime":14461.0,"EndTime":14461.0,"Column":5}]},{"RandomW":2851442677,"RandomX":175452620,"RandomY":2859972423,"RandomZ":2210823260,"StartTime":14927.0,"Objects":[{"StartTime":14927.0,"EndTime":16561.0,"Column":1}]},{"RandomW":179122262,"RandomX":2859972423,"RandomY":2210823260,"RandomZ":2851442677,"StartTime":16794.0,"Objects":[{"StartTime":16794.0,"EndTime":18078.0,"Column":0}]},{"RandomW":2917386405,"RandomX":2851442677,"RandomY":179122262,"RandomZ":494367691,"StartTime":18661.0,"Objects":[{"StartTime":18661.0,"EndTime":19127.0,"Column":2}]},{"RandomW":3407923728,"RandomX":494367691,"RandomY":2917386405,"RandomZ":2825679051,"StartTime":19595.0,"Objects":[{"StartTime":19595.0,"EndTime":20061.0,"Column":3}]},{"RandomW":358318928,"RandomX":3407923728,"RandomY":1835995540,"RandomZ":3732560508,"StartTime":20528.0,"Objects":[{"StartTime":20528.0,"EndTime":20994.0,"Column":4},{"StartTime":20528.0,"EndTime":20994.0,"Column":1}]},{"RandomW":3440439960,"RandomX":3732560508,"RandomY":358318928,"RandomZ":3638999969,"StartTime":21462.0,"Objects":[{"StartTime":21462.0,"EndTime":21928.0,"Column":3}]},{"RandomW":3249928444,"RandomX":358318928,"RandomY":3638999969,"RandomZ":3440439960,"StartTime":22395.0,"Objects":[{"StartTime":22395.0,"EndTime":22395.0,"Column":1}]},{"RandomW":3857394572,"RandomX":3440439960,"RandomY":3249928444,"RandomZ":138257049,"StartTime":22628.0,"Objects":[{"StartTime":22628.0,"EndTime":24028.0,"Column":4}]},{"RandomW":2938470811,"RandomX":3249928444,"RandomY":138257049,"RandomZ":3857394572,"StartTime":24262.0,"Objects":[{"StartTime":24262.0,"EndTime":24262.0,"Column":3}]},{"RandomW":3241803419,"RandomX":138257049,"RandomY":3857394572,"RandomZ":2938470811,"StartTime":24495.0,"Objects":[{"StartTime":24495.0,"EndTime":24495.0,"Column":4}]},{"RandomW":620078415,"RandomX":3857394572,"RandomY":2938470811,"RandomZ":3241803419,"StartTime":25195.0,"Objects":[{"StartTime":25195.0,"EndTime":25195.0,"Column":4}]},{"RandomW":2566806806,"RandomX":2938470811,"RandomY":3241803419,"RandomZ":620078415,"StartTime":25429.0,"Objects":[{"StartTime":25429.0,"EndTime":25429.0,"Column":4}]},{"RandomW":458505931,"RandomX":3241803419,"RandomY":620078415,"RandomZ":2566806806,"StartTime":26129.0,"Objects":[{"StartTime":26129.0,"EndTime":26129.0,"Column":3}]},{"RandomW":2629948988,"RandomX":2566806806,"RandomY":458505931,"RandomZ":362272284,"StartTime":26362.0,"Objects":[{"StartTime":26362.0,"EndTime":27762.0,"Column":1}]},{"RandomW":1285940261,"RandomX":362272284,"RandomY":2629948988,"RandomZ":4139597407,"StartTime":27996.0,"Objects":[{"StartTime":27996.0,"EndTime":27996.0,"Column":1},{"StartTime":27996.0,"EndTime":27996.0,"Column":3}]},{"RandomW":3878288539,"RandomX":2629948988,"RandomY":4139597407,"RandomZ":1285940261,"StartTime":28229.0,"Objects":[{"StartTime":28229.0,"EndTime":28229.0,"Column":1}]},{"RandomW":1788551508,"RandomX":1285940261,"RandomY":3878288539,"RandomZ":1976280692,"StartTime":28929.0,"Objects":[{"StartTime":28929.0,"EndTime":28929.0,"Column":1},{"StartTime":28929.0,"EndTime":28929.0,"Column":4}]},{"RandomW":159147246,"RandomX":3878288539,"RandomY":1976280692,"RandomZ":1788551508,"StartTime":29163.0,"Objects":[{"StartTime":29163.0,"EndTime":29163.0,"Column":1}]},{"RandomW":2702806142,"RandomX":1976280692,"RandomY":1788551508,"RandomZ":159147246,"StartTime":29863.0,"Objects":[{"StartTime":29863.0,"EndTime":29863.0,"Column":2}]},{"RandomW":2311677487,"RandomX":1788551508,"RandomY":159147246,"RandomZ":2702806142,"StartTime":30213.0,"Objects":[{"StartTime":30213.0,"EndTime":30213.0,"Column":3}]},{"RandomW":3175953261,"RandomX":2311677487,"RandomY":988506051,"RandomZ":3495571300,"StartTime":30446.0,"Objects":[{"StartTime":30446.0,"EndTime":31146.0,"Column":2}]},{"RandomW":516122535,"RandomX":3495571300,"RandomY":3175953261,"RandomZ":2138555125,"StartTime":31730.0,"Objects":[{"StartTime":31730.0,"EndTime":31730.0,"Column":2},{"StartTime":31730.0,"EndTime":31730.0,"Column":1}]},{"RandomW":534989332,"RandomX":3175953261,"RandomY":2138555125,"RandomZ":516122535,"StartTime":32080.0,"Objects":[{"StartTime":32080.0,"EndTime":32080.0,"Column":2}]},{"RandomW":3420570846,"RandomX":2138555125,"RandomY":516122535,"RandomZ":534989332,"StartTime":32430.0,"Objects":[{"StartTime":32430.0,"EndTime":32430.0,"Column":2}]},{"RandomW":172021565,"RandomX":516122535,"RandomY":534989332,"RandomZ":3420570846,"StartTime":32663.0,"Objects":[{"StartTime":32663.0,"EndTime":32663.0,"Column":2}]},{"RandomW":168636292,"RandomX":3420570846,"RandomY":172021565,"RandomZ":263944077,"StartTime":32780.0,"Objects":[{"StartTime":32780.0,"EndTime":32780.0,"Column":0}]},{"RandomW":3473923375,"RandomX":172021565,"RandomY":263944077,"RandomZ":168636292,"StartTime":33597.0,"Objects":[{"StartTime":33597.0,"EndTime":33597.0,"Column":1}]},{"RandomW":3287941836,"RandomX":263944077,"RandomY":168636292,"RandomZ":3473923375,"StartTime":33947.0,"Objects":[{"StartTime":33947.0,"EndTime":33947.0,"Column":1}]},{"RandomW":1950056015,"RandomX":3473923375,"RandomY":3287941836,"RandomZ":388563489,"StartTime":34180.0,"Objects":[{"StartTime":34180.0,"EndTime":35230.0,"Column":5}]},{"RandomW":3600000321,"RandomX":388563489,"RandomY":1950056015,"RandomZ":3312202562,"StartTime":35464.0,"Objects":[{"StartTime":35464.0,"EndTime":36164.0,"Column":4}]},{"RandomW":647123919,"RandomX":3312202562,"RandomY":3600000321,"RandomZ":2314505656,"StartTime":36397.0,"Objects":[{"StartTime":36397.0,"EndTime":37097.0,"Column":1}]},{"RandomW":3375531720,"RandomX":2314505656,"RandomY":647123919,"RandomZ":2193654396,"StartTime":37564.0,"Objects":[{"StartTime":37564.0,"EndTime":37914.0,"Column":3}]},{"RandomW":2335314869,"RandomX":3834006299,"RandomY":1346269295,"RandomZ":3597388662,"StartTime":38264.0,"Objects":[{"StartTime":38264.0,"EndTime":38264.0,"Column":4},{"StartTime":38380.0,"EndTime":38380.0,"Column":3},{"StartTime":38496.0,"EndTime":38496.0,"Column":4}]},{"RandomW":1564102491,"RandomX":1346269295,"RandomY":3597388662,"RandomZ":2335314869,"StartTime":39197.0,"Objects":[{"StartTime":39197.0,"EndTime":39197.0,"Column":2}]},{"RandomW":1989977426,"RandomX":2335314869,"RandomY":1564102491,"RandomZ":4263834011,"StartTime":39431.0,"Objects":[{"StartTime":39431.0,"EndTime":39431.0,"Column":2},{"StartTime":39431.0,"EndTime":39431.0,"Column":5}]},{"RandomW":3806815718,"RandomX":4263834011,"RandomY":1989977426,"RandomZ":1831387023,"StartTime":39664.0,"Objects":[{"StartTime":39664.0,"EndTime":39664.0,"Column":1},{"StartTime":39664.0,"EndTime":39664.0,"Column":4}]},{"RandomW":999749640,"RandomX":1989977426,"RandomY":1831387023,"RandomZ":3806815718,"StartTime":39898.0,"Objects":[{"StartTime":39898.0,"EndTime":40831.0,"Column":1}]},{"RandomW":2830335005,"RandomX":1831387023,"RandomY":3806815718,"RandomZ":999749640,"StartTime":41298.0,"Objects":[{"StartTime":41298.0,"EndTime":41298.0,"Column":1}]},{"RandomW":2152692291,"RandomX":3806815718,"RandomY":999749640,"RandomZ":2830335005,"StartTime":41648.0,"Objects":[{"StartTime":41648.0,"EndTime":41648.0,"Column":1}]},{"RandomW":1499396089,"RandomX":999749640,"RandomY":2830335005,"RandomZ":2152692291,"StartTime":41998.0,"Objects":[{"StartTime":41998.0,"EndTime":41998.0,"Column":2}]},{"RandomW":3582202466,"RandomX":2830335005,"RandomY":2152692291,"RandomZ":1499396089,"StartTime":42231.0,"Objects":[{"StartTime":42231.0,"EndTime":42231.0,"Column":2}]},{"RandomW":3873754971,"RandomX":2152692291,"RandomY":1499396089,"RandomZ":3582202466,"StartTime":42931.0,"Objects":[{"StartTime":42931.0,"EndTime":42931.0,"Column":4}]},{"RandomW":495070374,"RandomX":1499396089,"RandomY":3582202466,"RandomZ":3873754971,"StartTime":43165.0,"Objects":[{"StartTime":43165.0,"EndTime":43165.0,"Column":4}]},{"RandomW":3016618448,"RandomX":3582202466,"RandomY":3873754971,"RandomZ":495070374,"StartTime":43398.0,"Objects":[{"StartTime":43398.0,"EndTime":43398.0,"Column":4}]},{"RandomW":1177547465,"RandomX":3873754971,"RandomY":495070374,"RandomZ":3016618448,"StartTime":43631.0,"Objects":[{"StartTime":43631.0,"EndTime":43631.0,"Column":3}]},{"RandomW":2255582016,"RandomX":495070374,"RandomY":3016618448,"RandomZ":1177547465,"StartTime":43865.0,"Objects":[{"StartTime":43865.0,"EndTime":43865.0,"Column":3}]},{"RandomW":2325387316,"RandomX":3016618448,"RandomY":1177547465,"RandomZ":2255582016,"StartTime":44098.0,"Objects":[{"StartTime":44098.0,"EndTime":44098.0,"Column":2}]},{"RandomW":1443216326,"RandomX":1177547465,"RandomY":2255582016,"RandomZ":2325387316,"StartTime":44332.0,"Objects":[{"StartTime":44332.0,"EndTime":44332.0,"Column":2}]},{"RandomW":1650665398,"RandomX":2325387316,"RandomY":1443216326,"RandomZ":1871032949,"StartTime":44565.0,"Objects":[{"StartTime":44565.0,"EndTime":44565.0,"Column":1},{"StartTime":44565.0,"EndTime":44565.0,"Column":4}]},{"RandomW":1204166455,"RandomX":1871032949,"RandomY":1650665398,"RandomZ":1013336310,"StartTime":44798.0,"Objects":[{"StartTime":44798.0,"EndTime":45498.0,"Column":3}]},{"RandomW":2125976115,"RandomX":1013336310,"RandomY":1204166455,"RandomZ":93461408,"StartTime":45732.0,"Objects":[{"StartTime":45732.0,"EndTime":46432.0,"Column":5}]},{"RandomW":1391245329,"RandomX":1889010923,"RandomY":131109480,"RandomZ":2450179625,"StartTime":46665.0,"Objects":[{"StartTime":46665.0,"EndTime":47365.0,"Column":0},{"StartTime":46665.0,"EndTime":47365.0,"Column":3}]},{"RandomW":1629740061,"RandomX":2450179625,"RandomY":1391245329,"RandomZ":3806548475,"StartTime":47599.0,"Objects":[{"StartTime":47599.0,"EndTime":47949.0,"Column":4}]},{"RandomW":2462543108,"RandomX":3806548475,"RandomY":1629740061,"RandomZ":2782684574,"StartTime":48532.0,"Objects":[{"StartTime":48532.0,"EndTime":49232.0,"Column":0}]},{"RandomW":1398343675,"RandomX":2462543108,"RandomY":1783863854,"RandomZ":368009293,"StartTime":49466.0,"Objects":[{"StartTime":49466.0,"EndTime":50166.0,"Column":1},{"StartTime":49466.0,"EndTime":50166.0,"Column":3}]},{"RandomW":1655209110,"RandomX":1398343675,"RandomY":4200591321,"RandomZ":204183638,"StartTime":50399.0,"Objects":[{"StartTime":50399.0,"EndTime":51099.0,"Column":0},{"StartTime":50399.0,"EndTime":51099.0,"Column":4}]},{"RandomW":2898792131,"RandomX":1655209110,"RandomY":4183149031,"RandomZ":4235317299,"StartTime":51333.0,"Objects":[{"StartTime":51333.0,"EndTime":52033.0,"Column":5},{"StartTime":51333.0,"EndTime":52033.0,"Column":2}]},{"RandomW":2376440576,"RandomX":4183149031,"RandomY":4235317299,"RandomZ":2898792131,"StartTime":52266.0,"Objects":[{"StartTime":52266.0,"EndTime":52266.0,"Column":0}]},{"RandomW":3672662434,"RandomX":4235317299,"RandomY":2898792131,"RandomZ":2376440576,"StartTime":52499.0,"Objects":[{"StartTime":52499.0,"EndTime":52499.0,"Column":1}]},{"RandomW":1144553308,"RandomX":2376440576,"RandomY":3672662434,"RandomZ":2825568900,"StartTime":52849.0,"Objects":[{"StartTime":52849.0,"EndTime":53199.0,"Column":3}]},{"RandomW":3856961856,"RandomX":3672662434,"RandomY":2825568900,"RandomZ":1144553308,"StartTime":54133.0,"Objects":[{"StartTime":54133.0,"EndTime":54133.0,"Column":3}]},{"RandomW":3856961856,"RandomX":3672662434,"RandomY":2825568900,"RandomZ":1144553308,"StartTime":54366.0,"Objects":[{"StartTime":54366.0,"EndTime":54366.0,"Column":2}]},{"RandomW":3856961856,"RandomX":3672662434,"RandomY":2825568900,"RandomZ":1144553308,"StartTime":54600.0,"Objects":[{"StartTime":54600.0,"EndTime":54600.0,"Column":3}]},{"RandomW":2182646490,"RandomX":1144553308,"RandomY":3856961856,"RandomZ":2090342703,"StartTime":55066.0,"Objects":[{"StartTime":55066.0,"EndTime":55066.0,"Column":2},{"StartTime":55066.0,"EndTime":55066.0,"Column":0}]},{"RandomW":2182646490,"RandomX":1144553308,"RandomY":3856961856,"RandomZ":2090342703,"StartTime":55300.0,"Objects":[{"StartTime":55300.0,"EndTime":55300.0,"Column":5},{"StartTime":55300.0,"EndTime":55300.0,"Column":3}]},{"RandomW":2182646490,"RandomX":1144553308,"RandomY":3856961856,"RandomZ":2090342703,"StartTime":55533.0,"Objects":[{"StartTime":55533.0,"EndTime":55533.0,"Column":2},{"StartTime":55533.0,"EndTime":55533.0,"Column":0}]},{"RandomW":3304208416,"RandomX":2090342703,"RandomY":2182646490,"RandomZ":90031962,"StartTime":56000.0,"Objects":[{"StartTime":56000.0,"EndTime":56233.0,"Column":3}]},{"RandomW":1041697651,"RandomX":90031962,"RandomY":3304208416,"RandomZ":2015301872,"StartTime":56583.0,"Objects":[{"StartTime":56583.0,"EndTime":56583.0,"Column":1},{"StartTime":56583.0,"EndTime":56583.0,"Column":2}]},{"RandomW":3818981880,"RandomX":15037736,"RandomY":2251270868,"RandomZ":2287819377,"StartTime":56700.0,"Objects":[{"StartTime":56700.0,"EndTime":56700.0,"Column":0},{"StartTime":56700.0,"EndTime":56700.0,"Column":4}]},{"RandomW":3368447121,"RandomX":2251270868,"RandomY":2287819377,"RandomZ":3818981880,"StartTime":56933.0,"Objects":[{"StartTime":56933.0,"EndTime":56933.0,"Column":1}]},{"RandomW":860096087,"RandomX":2287819377,"RandomY":3818981880,"RandomZ":3368447121,"StartTime":57867.0,"Objects":[{"StartTime":57867.0,"EndTime":57867.0,"Column":3}]},{"RandomW":860096087,"RandomX":2287819377,"RandomY":3818981880,"RandomZ":3368447121,"StartTime":58100.0,"Objects":[{"StartTime":58100.0,"EndTime":58100.0,"Column":2}]},{"RandomW":860096087,"RandomX":2287819377,"RandomY":3818981880,"RandomZ":3368447121,"StartTime":58334.0,"Objects":[{"StartTime":58334.0,"EndTime":58334.0,"Column":3}]},{"RandomW":1369988252,"RandomX":3818981880,"RandomY":3368447121,"RandomZ":860096087,"StartTime":58800.0,"Objects":[{"StartTime":58800.0,"EndTime":58800.0,"Column":4}]},{"RandomW":1369988252,"RandomX":3818981880,"RandomY":3368447121,"RandomZ":860096087,"StartTime":59034.0,"Objects":[{"StartTime":59034.0,"EndTime":59034.0,"Column":1}]},{"RandomW":1369988252,"RandomX":3818981880,"RandomY":3368447121,"RandomZ":860096087,"StartTime":59267.0,"Objects":[{"StartTime":59267.0,"EndTime":59267.0,"Column":4}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544.osu b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544.osu
new file mode 100644
index 0000000000..237a13ecd2
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544.osu
@@ -0,0 +1,126 @@
+osu file format v5
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:2
+CircleSize:5
+OverallDifficulty:2
+SliderMultiplier:1
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Failing)
+//Storyboard Layer 2 (Passing)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+//Background Colour Transformations
+3,100,163,162,255
+
+[TimingPoints]
+7460,466.735154027506,4,1,0,100
+
+[HitObjects]
+80,56,7693,1,0
+120,96,8043,1,0
+176,104,8393,1,0
+216,104,8626,1,0
+256,104,8860,1,0
+296,168,9326,5,0
+296,208,9560,1,0
+296,248,9793,1,0
+216,256,10260,1,0
+176,256,10493,1,0
+136,256,10727,1,0
+136,136,11427,5,0
+136,72,11777,1,0
+192,72,12127,1,0
+232,72,12360,1,0
+272,72,12594,1,0
+280,152,13060,5,0
+280,192,13294,1,0
+280,232,13527,1,0
+360,240,13994,1,0
+400,240,14227,1,0
+440,240,14461,1,0
+256,192,14927,12,0,16561
+256,192,16794,12,0,18078
+192,96,18661,6,0,B|312:96,1,100
+288,176,19595,2,0,B|168:176,1,100
+192,256,20528,2,0,B|312:256,1,100
+304,176,21462,2,0,B|240:176|248:88,1,100
+168,104,22395,5,0
+128,104,22628,2,0,B|296:368,1,300
+328,352,24262,5,0
+368,352,24495,1,0
+368,232,25195,1,0
+368,192,25429,1,0
+280,104,26129,5,0
+240,104,26362,2,0,B|40:352,1,300
+88,336,27996,5,0
+128,336,28229,1,0
+136,216,28929,1,0
+136,176,29163,1,0
+256,176,29863,5,0
+312,176,30213,1,0
+352,176,30446,2,0,B|360:264|360:280|360:272|272:272,1,150
+208,232,31730,5,0
+208,168,32080,1,0
+208,104,32430,1,0
+248,104,32663,1,0
+248,104,32780,1,0
+120,160,33597,5,0
+120,216,33947,1,0
+120,256,34180,2,0,B|352:256,1,225
+344,216,35464,6,0,B|200:128,1,150
+176,136,36397,2,0,B|176:288,1,150
+296,288,37564,6,0,B|296:208,1,75
+296,152,38264,2,0,B|296:104,2,25
+248,32,39197,1,0
+208,32,39431,1,0
+168,32,39664,1,0
+168,72,39898,2,0,B|168:136,4,50
+104,128,41298,5,0
+168,136,41648,1,0
+208,184,41998,1,0
+232,216,42231,1,0
+344,248,42931,5,0
+344,208,43165,1,0
+344,168,43398,1,0
+304,168,43631,1,0
+264,168,43865,1,0
+224,168,44098,1,0
+184,168,44332,1,0
+144,168,44565,1,0
+104,176,44798,6,0,B|32:240|160:272,1,150
+192,272,45732,2,0,B|280:272|320:200,1,150
+320,160,46665,2,0,B|248:96|176:136,1,150
+144,144,47599,2,0,B|48:168,1,75
+112,256,48532,6,0,B|256:336,1,150
+280,320,49466,2,0,B|416:240,1,150
+408,200,50399,2,0,B|256:136,1,150
+232,144,51333,2,0,B|80:208,1,150
+56,216,52266,5,0
+96,216,52499,1,0
+152,216,52849,2,0,B|248:216,1,75
+328,88,54133,5,0
+328,88,54366,1,0
+328,88,54600,1,0
+248,88,55066,5,0
+248,88,55300,1,0
+248,88,55533,1,0
+256,168,56000,6,0,B|184:168,1,50
+144,168,56583,1,0
+144,168,56700,1,0
+104,168,56933,1,0
+264,168,57867,5,0
+264,168,58100,1,0
+264,168,58334,1,0
+344,168,58800,5,0
+344,168,59034,1,0
+344,168,59267,1,0
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/basic-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/basic-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/basic-expected-conversion.json
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/basic-expected-conversion.json
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/basic.osu b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/basic.osu
similarity index 96%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/basic.osu
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/basic.osu
index 40b4409760..abd2ff2ee6 100644
--- a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/basic.osu
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/basic.osu
@@ -1,27 +1,27 @@
-osu file format v14
-
-[Difficulty]
-HPDrainRate:6
-CircleSize:4
-OverallDifficulty:7
-ApproachRate:8.3
-SliderMultiplier:1.6
-SliderTickRate:1
-
-[TimingPoints]
-500,500,4,2,1,50,1,0
-13426,-100,4,3,1,45,0,0
-14884,-100,4,2,1,50,0,0
-
-[HitObjects]
-96,192,500,6,0,L|416:192,2,320
-256,192,3000,12,0,4000,0:0:0:0:
-256,192,4500,12,0,5500,0:0:0:0:
-256,192,6000,12,0,6500,0:0:0:0:
-256,128,7000,6,0,L|352:128,4,80
-32,192,8500,6,0,B|32:384|256:384|256:192|256:192|256:0|512:0|512:192,1,800
-256,192,11500,12,0,12000,0:0:0:0:
-512,320,12500,6,0,B|0:256|0:256|512:96|512:96|256:32,1,1280
-256,256,17000,6,0,L|160:256,4,80
-256,192,18500,12,0,19450,0:0:0:0:
-216,231,19875,6,0,B|216:135|280:135|344:135|344:199|344:263|248:327|248:327|120:327|120:327|56:39|408:39|408:39|472:150|408:342,1,1280
+osu file format v14
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4
+OverallDifficulty:7
+ApproachRate:8.3
+SliderMultiplier:1.6
+SliderTickRate:1
+
+[TimingPoints]
+500,500,4,2,1,50,1,0
+13426,-100,4,3,1,45,0,0
+14884,-100,4,2,1,50,0,0
+
+[HitObjects]
+96,192,500,6,0,L|416:192,2,320
+256,192,3000,12,0,4000,0:0:0:0:
+256,192,4500,12,0,5500,0:0:0:0:
+256,192,6000,12,0,6500,0:0:0:0:
+256,128,7000,6,0,L|352:128,4,80
+32,192,8500,6,0,B|32:384|256:384|256:192|256:192|256:0|512:0|512:192,1,800
+256,192,11500,12,0,12000,0:0:0:0:
+512,320,12500,6,0,B|0:256|0:256|512:96|512:96|256:32,1,1280
+256,256,17000,6,0,L|160:256,4,80
+256,192,18500,12,0,19450,0:0:0:0:
+216,231,19875,6,0,B|216:135|280:135|344:135|344:199|344:263|248:327|248:327|120:327|120:327|56:39|408:39|408:39|472:150|408:342,1,1280
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples.osu b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/convert-samples.osu
similarity index 100%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples.osu
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/convert-samples.osu
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/diffcalc-test.osu b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/diffcalc-test.osu
similarity index 100%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/diffcalc-test.osu
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/diffcalc-test.osu
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples.osu b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/mania-samples.osu
similarity index 100%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples.osu
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/mania-samples.osu
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples.osu b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/slider-convert-samples.osu
similarity index 100%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples.osu
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/slider-convert-samples.osu
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json
diff --git a/osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider.osu b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/zero-length-slider.osu
similarity index 100%
rename from osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/zero-length-slider.osu
rename to osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/zero-length-slider.osu
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs
index 77f93b4ef9..e04b44311e 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs
@@ -52,14 +52,18 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <returns>The column.</returns>
         protected int GetColumn(float position, bool allowSpecial = false)
         {
+            // Casts to doubles are present here because, although code is originally written as float division,
+            // the division actually appears to occur on doubles in osu!stable. This is likely a result of
+            // differences in optimisations between .NET versions due to the presence of the double parameter type of Math.Floor().
+
             if (allowSpecial && TotalColumns == 8)
             {
                 const float local_x_divisor = 512f / 7;
-                return Math.Clamp((int)MathF.Floor(position / local_x_divisor), 0, 6) + 1;
+                return Math.Clamp((int)Math.Floor((double)position / local_x_divisor), 0, 6) + 1;
             }
 
             float localXDivisor = 512f / TotalColumns;
-            return Math.Clamp((int)MathF.Floor(position / localXDivisor), 0, TotalColumns - 1);
+            return Math.Clamp((int)Math.Floor((double)position / localXDivisor), 0, TotalColumns - 1);
         }
 
         /// <summary>

From 0553de768caaaaa9938a462953cc5e6960e26fcb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Dec 2023 15:26:02 +0900
Subject: [PATCH 1903/2296] Enforce namespace body style

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 342bc8aa79..c8c5d6745c 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -15,6 +15,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeNamespaceBody/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeObjectCreationWhenTypeEvident/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeObjectCreationWhenTypeNotEvident/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>

From 005fb789945497ea67cd12ef42ba735278fa0af0 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 7 Dec 2023 15:38:15 +0900
Subject: [PATCH 1904/2296] Fix last tick handling in osu beatmap conversion
 tests

---
 .../OsuBeatmapConversionTest.cs               |   19 +-
 .../OsuDifficultyCalculatorTest.cs            |    2 +-
 .../Beatmaps/1124896-expected-conversion.json |    1 +
 .../Resources/Testing/Beatmaps/1124896.osu    | 1122 +++++++++++++++++
 .../Beatmaps/basic-expected-conversion.json   |    0
 .../Resources/Testing/Beatmaps/basic.osu      |   54 +-
 ...ear-perfect-curve-expected-conversion.json |    0
 .../Beatmaps/colinear-perfect-curve.osu       |    0
 .../Testing/Beatmaps/diffcalc-test.osu        |    0
 ...ti-segment-slider-expected-conversion.json |    0
 .../Testing/Beatmaps/multi-segment-slider.osu |    0
 .../nan-slider-expected-conversion.json       |    0
 .../Resources/Testing/Beatmaps/nan-slider.osu |    0
 .../old-stacking-expected-conversion.json     |    0
 .../Testing/Beatmaps/old-stacking.osu         |    0
 .../repeat-slider-expected-conversion.json    |    0
 .../Testing/Beatmaps/repeat-slider.osu        |    0
 ...r-paths-edge-case-expected-conversion.json |    0
 .../Beatmaps/slider-paths-edge-case.osu       |    0
 ...r-ticks-edge-case-expected-conversion.json |   22 +-
 .../Beatmaps/slider-ticks-edge-case.osu       |    0
 .../slider-ticks-expected-conversion.json     |    0
 .../Testing/Beatmaps/slider-ticks.osu         |    0
 ...ven-repeat-slider-expected-conversion.json |  579 +++++++++
 .../Testing/Beatmaps/uneven-repeat-slider.osu |    0
 .../Testing/Beatmaps/very-fast-slider.osu     |    0
 .../Testing/Beatmaps/zero-length-sliders.osu  |    0
 ...ven-repeat-slider-expected-conversion.json |  348 -----
 28 files changed, 1744 insertions(+), 403 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/1124896-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/1124896.osu
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/basic-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/basic.osu (96%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/colinear-perfect-curve.osu (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/diffcalc-test.osu (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/multi-segment-slider.osu (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/nan-slider.osu (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/old-stacking-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/old-stacking.osu (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/repeat-slider-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/repeat-slider.osu (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/slider-paths-edge-case.osu (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json (99%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/slider-ticks-expected-conversion.json (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/slider-ticks.osu (100%)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/uneven-repeat-slider-expected-conversion.json
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/uneven-repeat-slider.osu (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/very-fast-slider.osu (100%)
 rename {osu.Game.Rulesets.Osu => osu.Game.Rulesets.Osu.Tests}/Resources/Testing/Beatmaps/zero-length-sliders.osu (100%)
 delete mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/uneven-repeat-slider-expected-conversion.json

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index 3e0a86d39c..4a217a19ea 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects;
@@ -15,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class OsuBeatmapConversionTest : BeatmapConversionTest<ConvertValue>
     {
-        protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
+        protected override string ResourceAssembly => "osu.Game.Rulesets.Osu.Tests";
 
         [TestCase("basic")]
         [TestCase("colinear-perfect-curve")]
@@ -27,6 +26,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase("old-stacking")]
         [TestCase("multi-segment-slider")]
         [TestCase("nan-slider")]
+        [TestCase("1124896")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
@@ -34,21 +34,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             switch (hitObject)
             {
                 case Slider slider:
-                    var objects = new List<ConvertValue>();
-
                     foreach (var nested in slider.NestedHitObjects)
-                        objects.Add(createConvertValue((OsuHitObject)nested, slider));
-
-                    // stable does slider tail leniency by offsetting the last tick 36ms back.
-                    // based on player feedback, we're doing this a little different in lazer,
-                    // and the lazer method does not require offsetting the last tick
-                    // (see `DrawableSliderTail.CheckForResult()`).
-                    // however, in conversion tests, just so the output matches, we're bringing
-                    // the 36ms offset back locally.
-                    // in particular, on some sliders, this may rearrange nested objects,
-                    // so we sort them again by start time to prevent test failures.
-                    foreach (var obj in objects.OrderBy(cv => cv.StartTime))
-                        yield return obj;
+                        yield return createConvertValue((OsuHitObject)nested, slider);
 
                     break;
 
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index fa7454b435..e35cf10d95 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class OsuDifficultyCalculatorTest : DifficultyCalculatorTest
     {
-        protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
+        protected override string ResourceAssembly => "osu.Game.Rulesets.Osu.Tests";
 
         [TestCase(6.710442985146793d, 239, "diffcalc-test")]
         [TestCase(1.4386882251130073d, 54, "zero-length-sliders")]
diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/1124896-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/1124896-expected-conversion.json
new file mode 100644
index 0000000000..68551d5d10
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/1124896-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":633.0,"Objects":[{"StartTime":633.0,"EndTime":633.0,"X":84.5217361,"Y":88.5217361}]},{"StartTime":844.0,"Objects":[{"StartTime":844.0,"EndTime":844.0,"X":88.2608643,"Y":92.2608643}]},{"StartTime":1055.0,"Objects":[{"StartTime":1055.0,"EndTime":1055.0,"X":92.0,"Y":96.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":1230.0,"EndTime":1230.0,"X":76.53984,"Y":161.705658,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":1477.0,"Objects":[{"StartTime":1477.0,"EndTime":1477.0,"X":200.0,"Y":100.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":1652.0,"EndTime":1652.0,"X":184.097,"Y":34.400116,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":1900.0,"Objects":[{"StartTime":1900.0,"EndTime":1900.0,"X":164.0,"Y":228.0}]},{"StartTime":2111.0,"Objects":[{"StartTime":2111.0,"EndTime":2111.0,"X":256.0,"Y":240.0}]},{"StartTime":2322.0,"Objects":[{"StartTime":2322.0,"EndTime":2322.0,"X":340.0,"Y":192.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":2497.0,"EndTime":2497.0,"X":350.197235,"Y":127.18325,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":2745.0,"Objects":[{"StartTime":2745.0,"EndTime":2745.0,"X":440.0,"Y":200.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":2920.0,"EndTime":2920.0,"X":450.363068,"Y":264.618042,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":3167.0,"Objects":[{"StartTime":3167.0,"EndTime":3167.0,"X":324.521729,"Y":308.521729}]},{"StartTime":3378.0,"Objects":[{"StartTime":3378.0,"EndTime":3378.0,"X":328.260864,"Y":312.260864,"StackOffset":{"X":-3.73913574,"Y":-3.73913574}},{"StartTime":3764.0,"EndTime":3764.0,"X":241.358566,"Y":327.7687,"StackOffset":{"X":-3.73913574,"Y":-3.73913574}}]},{"StartTime":4012.0,"Objects":[{"StartTime":4012.0,"EndTime":4012.0,"X":332.0,"Y":316.0}]},{"StartTime":4224.0,"Objects":[{"StartTime":4224.0,"EndTime":4224.0,"X":312.0,"Y":224.0}]},{"StartTime":4435.0,"Objects":[{"StartTime":4435.0,"EndTime":4435.0,"X":284.0,"Y":132.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":4610.0,"EndTime":4610.0,"X":218.719162,"Y":130.832062,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":4857.0,"Objects":[{"StartTime":4857.0,"EndTime":4857.0,"X":400.0,"Y":192.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":5032.0,"EndTime":5032.0,"X":465.280823,"Y":193.167923,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":5280.0,"Objects":[{"StartTime":5280.0,"EndTime":5280.0,"X":312.0,"Y":224.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":5455.0,"EndTime":5455.0,"X":310.832062,"Y":289.280823,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":5702.0,"Objects":[{"StartTime":5702.0,"EndTime":5702.0,"X":372.260864,"Y":104.260864}]},{"StartTime":5914.0,"Objects":[{"StartTime":5914.0,"EndTime":5914.0,"X":376.0,"Y":108.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":6300.0,"EndTime":6300.0,"X":249.910217,"Y":112.133125,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":6547.0,"Objects":[{"StartTime":6547.0,"EndTime":6547.0,"X":154.0,"Y":122.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":6722.0,"EndTime":6722.0,"X":171.671921,"Y":58.8828773,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":6970.0,"Objects":[{"StartTime":6970.0,"EndTime":6970.0,"X":107.0,"Y":195.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":7181.0,"EndTime":7181.0,"X":68.5987,"Y":143.051712,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":7356.0,"EndTime":7356.0,"X":107.0,"Y":195.0,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":7604.0,"Objects":[{"StartTime":7604.0,"EndTime":7604.0,"X":216.0,"Y":232.0}]},{"StartTime":7815.0,"Objects":[{"StartTime":7815.0,"EndTime":7815.0,"X":116.0,"Y":280.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":7990.0,"EndTime":7990.0,"X":53.6959572,"Y":265.658173,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":8238.0,"Objects":[{"StartTime":8238.0,"EndTime":8238.0,"X":176.0,"Y":160.0}]},{"StartTime":8449.0,"Objects":[{"StartTime":8449.0,"EndTime":8449.0,"X":248.0,"Y":291.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":8729.0,"EndTime":8729.0,"X":333.029968,"Y":327.610535,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":8871.0,"Objects":[{"StartTime":8871.0,"EndTime":8871.0,"X":334.0,"Y":328.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":9257.0,"EndTime":9257.0,"X":318.562378,"Y":193.885574,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":9505.0,"Objects":[{"StartTime":9505.0,"EndTime":9505.0,"X":428.0,"Y":184.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":9680.0,"EndTime":9680.0,"X":436.122375,"Y":251.009521,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":9928.0,"Objects":[{"StartTime":9928.0,"EndTime":9928.0,"X":328.0,"Y":128.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":10103.0,"EndTime":10103.0,"X":318.879852,"Y":194.881042,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":10350.0,"Objects":[{"StartTime":10350.0,"EndTime":10350.0,"X":320.0,"Y":108.0}]},{"StartTime":10773.0,"Objects":[{"StartTime":10773.0,"EndTime":10773.0,"X":308.0,"Y":88.0}]},{"StartTime":11195.0,"Objects":[{"StartTime":11195.0,"EndTime":11195.0,"X":296.0,"Y":68.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":11370.0,"EndTime":11370.0,"X":228.5764,"Y":64.78935,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":11618.0,"Objects":[{"StartTime":11618.0,"EndTime":11618.0,"X":318.0,"Y":194.0}]},{"StartTime":11829.0,"Objects":[{"StartTime":11829.0,"EndTime":11829.0,"X":288.0,"Y":52.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":12004.0,"EndTime":12004.0,"X":220.5764,"Y":48.7893524,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":12252.0,"Objects":[{"StartTime":12252.0,"EndTime":12252.0,"X":236.0,"Y":248.0}]},{"StartTime":12463.0,"Objects":[{"StartTime":12463.0,"EndTime":12463.0,"X":299.0,"Y":170.0}]},{"StartTime":12674.0,"Objects":[{"StartTime":12674.0,"EndTime":12674.0,"X":300.0,"Y":300.0}]},{"StartTime":12885.0,"Objects":[{"StartTime":12885.0,"EndTime":12885.0,"X":168.0,"Y":204.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":13096.0,"EndTime":13096.0,"X":100.5764,"Y":200.789352,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":13271.0,"EndTime":13271.0,"X":168.0,"Y":204.0,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":13519.0,"Objects":[{"StartTime":13519.0,"EndTime":13519.0,"X":227.0,"Y":332.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":13694.0,"EndTime":13694.0,"X":159.619965,"Y":336.022675,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":13942.0,"Objects":[{"StartTime":13942.0,"EndTime":13942.0,"X":299.260864,"Y":362.260864}]},{"StartTime":14153.0,"Objects":[{"StartTime":14153.0,"EndTime":14153.0,"X":302.0,"Y":365.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":14328.0,"EndTime":14328.0,"X":299.3276,"Y":299.703552,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":14576.0,"Objects":[{"StartTime":14576.0,"EndTime":14576.0,"X":469.0,"Y":258.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":14751.0,"EndTime":14751.0,"X":452.420563,"Y":331.144531,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":14998.0,"Objects":[{"StartTime":14998.0,"EndTime":14998.0,"X":376.0,"Y":256.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":15173.0,"EndTime":15173.0,"X":359.2077,"Y":182.904053,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":15421.0,"Objects":[{"StartTime":15421.0,"EndTime":15421.0,"X":384.0,"Y":80.0}]},{"StartTime":15632.0,"Objects":[{"StartTime":15632.0,"EndTime":15632.0,"X":282.0,"Y":102.0}]},{"StartTime":15843.0,"Objects":[{"StartTime":15843.0,"EndTime":15843.0,"X":436.0,"Y":148.0}]},{"StartTime":16055.0,"Objects":[{"StartTime":16055.0,"EndTime":16055.0,"X":266.521729,"Y":178.521729}]},{"StartTime":16160.0,"Objects":[{"StartTime":16160.0,"EndTime":16160.0,"X":270.260864,"Y":182.260864}]},{"StartTime":16266.0,"Objects":[{"StartTime":16266.0,"EndTime":16266.0,"X":274.0,"Y":186.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":16441.0,"EndTime":16441.0,"X":257.420563,"Y":259.144531,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":16688.0,"Objects":[{"StartTime":16688.0,"EndTime":16688.0,"X":160.0,"Y":202.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":16863.0,"EndTime":16863.0,"X":143.207687,"Y":128.904053,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":17111.0,"Objects":[{"StartTime":17111.0,"EndTime":17111.0,"X":79.0,"Y":35.0}]},{"StartTime":17322.0,"Objects":[{"StartTime":17322.0,"EndTime":17322.0,"X":23.0,"Y":123.0}]},{"StartTime":17533.0,"Objects":[{"StartTime":17533.0,"EndTime":17533.0,"X":161.0,"Y":42.0}]},{"StartTime":17745.0,"Objects":[{"StartTime":17745.0,"EndTime":17745.0,"X":76.0,"Y":188.0}]},{"StartTime":17956.0,"Objects":[{"StartTime":17956.0,"EndTime":17956.0,"X":79.0,"Y":35.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":18131.0,"EndTime":18131.0,"X":99.60409,"Y":107.114296,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":18378.0,"Objects":[{"StartTime":18378.0,"EndTime":18378.0,"X":211.0,"Y":104.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":18553.0,"EndTime":18553.0,"X":231.60408,"Y":176.114288,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":18801.0,"Objects":[{"StartTime":18801.0,"EndTime":18801.0,"X":344.0,"Y":170.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":18976.0,"EndTime":18976.0,"X":364.6041,"Y":242.114288,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":19224.0,"Objects":[{"StartTime":19224.0,"EndTime":19224.0,"X":433.0,"Y":132.0}]},{"StartTime":19435.0,"Objects":[{"StartTime":19435.0,"EndTime":19435.0,"X":364.521729,"Y":241.521729}]},{"StartTime":19540.0,"Objects":[{"StartTime":19540.0,"EndTime":19540.0,"X":368.260864,"Y":245.260864}]},{"StartTime":19646.0,"Objects":[{"StartTime":19646.0,"EndTime":19646.0,"X":372.0,"Y":249.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":19821.0,"EndTime":19821.0,"X":444.6992,"Y":253.148651,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":20069.0,"Objects":[{"StartTime":20069.0,"EndTime":20069.0,"X":468.0,"Y":104.0}]},{"StartTime":20280.0,"Objects":[{"StartTime":20280.0,"EndTime":20280.0,"X":413.0,"Y":180.0}]},{"StartTime":20491.0,"Objects":[{"StartTime":20491.0,"EndTime":20491.0,"X":324.0,"Y":58.0}]},{"StartTime":20702.0,"Objects":[{"StartTime":20702.0,"EndTime":20702.0,"X":414.0,"Y":31.0}]},{"StartTime":20914.0,"Objects":[{"StartTime":20914.0,"EndTime":20914.0,"X":324.0,"Y":151.0}]},{"StartTime":21125.0,"Objects":[{"StartTime":21125.0,"EndTime":21125.0,"X":244.0,"Y":40.0}]},{"StartTime":21336.0,"Objects":[{"StartTime":21336.0,"EndTime":21336.0,"X":301.0,"Y":186.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":21616.0,"EndTime":21616.0,"X":197.183792,"Y":187.195663,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":21759.0,"Objects":[{"StartTime":21759.0,"EndTime":21759.0,"X":197.0,"Y":187.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":21934.0,"EndTime":21934.0,"X":197.444717,"Y":260.028961,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":22181.0,"Objects":[{"StartTime":22181.0,"EndTime":22181.0,"X":287.0,"Y":362.0}]},{"StartTime":22393.0,"Objects":[{"StartTime":22393.0,"EndTime":22393.0,"X":330.0,"Y":234.0}]},{"StartTime":22604.0,"Objects":[{"StartTime":22604.0,"EndTime":22604.0,"X":197.0,"Y":260.0}]},{"StartTime":22815.0,"Objects":[{"StartTime":22815.0,"EndTime":22815.0,"X":356.260864,"Y":315.260864}]},{"StartTime":23026.0,"Objects":[{"StartTime":23026.0,"EndTime":23026.0,"X":360.0,"Y":319.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":23306.0,"EndTime":23306.0,"X":465.503235,"Y":323.503082,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":23449.0,"Objects":[{"StartTime":23449.0,"EndTime":23449.0,"X":468.739136,"Y":326.739136}]},{"StartTime":23660.0,"Objects":[{"StartTime":23660.0,"EndTime":23660.0,"X":398.260864,"Y":176.260864}]},{"StartTime":23871.0,"Objects":[{"StartTime":23871.0,"EndTime":23871.0,"X":402.0,"Y":180.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":24046.0,"EndTime":24046.0,"X":415.0339,"Y":253.858765,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":24294.0,"Objects":[{"StartTime":24294.0,"EndTime":24294.0,"X":314.0,"Y":145.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":24469.0,"EndTime":24469.0,"X":326.976959,"Y":71.13121,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":24716.0,"Objects":[{"StartTime":24716.0,"EndTime":24716.0,"X":472.0,"Y":72.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":24891.0,"EndTime":24891.0,"X":485.1493,"Y":145.838318,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":25139.0,"Objects":[{"StartTime":25139.0,"EndTime":25139.0,"X":320.0,"Y":222.0}]},{"StartTime":25350.0,"Objects":[{"StartTime":25350.0,"EndTime":25350.0,"X":235.0,"Y":116.0}]},{"StartTime":25562.0,"Objects":[{"StartTime":25562.0,"EndTime":25562.0,"X":276.0,"Y":295.0}]},{"StartTime":25667.0,"Objects":[{"StartTime":25667.0,"EndTime":25667.0,"X":304.0,"Y":305.0}]},{"StartTime":25773.0,"Objects":[{"StartTime":25773.0,"EndTime":25773.0,"X":333.0,"Y":306.0}]},{"StartTime":25878.0,"Objects":[{"StartTime":25878.0,"EndTime":25878.0,"X":362.0,"Y":299.0}]},{"StartTime":25984.0,"Objects":[{"StartTime":25984.0,"EndTime":25984.0,"X":392.0,"Y":280.0}]},{"StartTime":26090.0,"Objects":[{"StartTime":26090.0,"EndTime":26090.0,"X":425.0,"Y":239.0}]},{"StartTime":26195.0,"Objects":[{"StartTime":26195.0,"EndTime":26195.0,"X":447.0,"Y":193.0}]},{"StartTime":26301.0,"Objects":[{"StartTime":26301.0,"EndTime":26301.0,"X":454.0,"Y":143.0}]},{"StartTime":26407.0,"Objects":[{"StartTime":26407.0,"EndTime":26407.0,"X":452.0,"Y":88.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":26829.0,"EndTime":26829.0,"X":419.177216,"Y":32.9294777,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":27216.0,"EndTime":27216.0,"X":378.111816,"Y":82.11954,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":27463.0,"Objects":[{"StartTime":27463.0,"EndTime":27463.0,"X":368.0,"Y":160.0}]},{"StartTime":27674.0,"Objects":[{"StartTime":27674.0,"EndTime":27674.0,"X":487.0,"Y":58.0}]},{"StartTime":28097.0,"Objects":[{"StartTime":28097.0,"EndTime":28097.0,"X":300.0,"Y":200.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":28272.0,"EndTime":28272.0,"X":296.528,"Y":128.962769,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":28519.0,"Objects":[{"StartTime":28519.0,"EndTime":28519.0,"X":377.0,"Y":238.0}]},{"StartTime":28731.0,"Objects":[{"StartTime":28731.0,"EndTime":28731.0,"X":222.0,"Y":217.0}]},{"StartTime":28942.0,"Objects":[{"StartTime":28942.0,"EndTime":28942.0,"X":369.0,"Y":92.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":29117.0,"EndTime":29117.0,"X":365.6939,"Y":163.550735,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":29364.0,"Objects":[{"StartTime":29364.0,"EndTime":29364.0,"X":223.0,"Y":136.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":29539.0,"EndTime":29539.0,"X":224.683,"Y":64.56601,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":29787.0,"Objects":[{"StartTime":29787.0,"EndTime":29787.0,"X":251.0,"Y":276.0}]},{"StartTime":29998.0,"Objects":[{"StartTime":29998.0,"EndTime":29998.0,"X":135.0,"Y":240.0}]},{"StartTime":30209.0,"Objects":[{"StartTime":30209.0,"EndTime":30209.0,"X":244.0,"Y":356.0}]},{"StartTime":30421.0,"Objects":[{"StartTime":30421.0,"EndTime":30421.0,"X":137.0,"Y":161.0}]},{"StartTime":30632.0,"Objects":[{"StartTime":30632.0,"EndTime":30632.0,"X":166.0,"Y":327.0}]},{"StartTime":30843.0,"Objects":[{"StartTime":30843.0,"EndTime":30843.0,"X":219.0,"Y":187.0}]},{"StartTime":31055.0,"Objects":[{"StartTime":31055.0,"EndTime":31055.0,"X":68.0,"Y":322.0}]},{"StartTime":31266.0,"Objects":[{"StartTime":31266.0,"EndTime":31266.0,"X":311.0,"Y":192.0}]},{"StartTime":31477.0,"Objects":[{"StartTime":31477.0,"EndTime":31477.0,"X":140.0,"Y":89.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":31652.0,"EndTime":31652.0,"X":136.569946,"Y":160.058075,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":31899.0,"Objects":[{"StartTime":31899.0,"EndTime":31899.0,"X":217.0,"Y":51.0}]},{"StartTime":32111.0,"Objects":[{"StartTime":32111.0,"EndTime":32111.0,"X":62.0,"Y":72.0}]},{"StartTime":32322.0,"Objects":[{"StartTime":32322.0,"EndTime":32322.0,"X":209.0,"Y":197.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":32497.0,"EndTime":32497.0,"X":206.163559,"Y":125.298256,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":32744.0,"Objects":[{"StartTime":32744.0,"EndTime":32744.0,"X":64.0,"Y":168.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":32919.0,"EndTime":32919.0,"X":66.155014,"Y":239.272888,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":33167.0,"Objects":[{"StartTime":33167.0,"EndTime":33167.0,"X":209.0,"Y":197.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":33342.0,"EndTime":33342.0,"X":137.56601,"Y":198.683,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":33589.0,"Objects":[{"StartTime":33589.0,"EndTime":33589.0,"X":136.0,"Y":340.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":33764.0,"EndTime":33764.0,"X":207.453568,"Y":342.3376,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":34012.0,"Objects":[{"StartTime":34012.0,"EndTime":34012.0,"X":285.0,"Y":167.0}]},{"StartTime":34224.0,"Objects":[{"StartTime":34224.0,"EndTime":34224.0,"X":308.0,"Y":326.0}]},{"StartTime":34435.0,"Objects":[{"StartTime":34435.0,"EndTime":34435.0,"X":176.0,"Y":276.0}]},{"StartTime":34646.0,"Objects":[{"StartTime":34646.0,"EndTime":34646.0,"X":362.0,"Y":263.0}]},{"StartTime":34857.0,"Objects":[{"StartTime":34857.0,"EndTime":34857.0,"X":184.0,"Y":201.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":35032.0,"EndTime":35032.0,"X":175.4032,"Y":275.505676,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":35280.0,"Objects":[{"StartTime":35280.0,"EndTime":35280.0,"X":118.0,"Y":138.0}]},{"StartTime":35491.0,"Objects":[{"StartTime":35491.0,"EndTime":35491.0,"X":272.0,"Y":162.0}]},{"StartTime":35702.0,"Objects":[{"StartTime":35702.0,"EndTime":35702.0,"X":120.0,"Y":57.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":35877.0,"EndTime":35877.0,"X":164.450928,"Y":3.121443,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":36125.0,"Objects":[{"StartTime":36125.0,"EndTime":36125.0,"X":294.0,"Y":133.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":36300.0,"EndTime":36300.0,"X":247.996475,"Y":185.8328,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":36547.0,"Objects":[{"StartTime":36547.0,"EndTime":36547.0,"X":243.0,"Y":11.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":36722.0,"EndTime":36722.0,"X":296.045258,"Y":56.4152451,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":36970.0,"Objects":[{"StartTime":36970.0,"EndTime":36970.0,"X":171.0,"Y":183.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":37145.0,"EndTime":37145.0,"X":117.339569,"Y":137.949753,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":37393.0,"Objects":[{"StartTime":37393.0,"EndTime":37393.0,"X":368.0,"Y":94.0}]},{"StartTime":37604.0,"Objects":[{"StartTime":37604.0,"EndTime":37604.0,"X":228.0,"Y":243.0}]},{"StartTime":37815.0,"Objects":[{"StartTime":37815.0,"EndTime":37815.0,"X":222.0,"Y":94.0}]},{"StartTime":38026.0,"Objects":[{"StartTime":38026.0,"EndTime":38026.0,"X":374.0,"Y":238.0}]},{"StartTime":38238.0,"Objects":[{"StartTime":38238.0,"EndTime":38238.0,"X":368.0,"Y":94.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":38413.0,"EndTime":38413.0,"X":441.399017,"Y":109.413795,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":38660.0,"Objects":[{"StartTime":38660.0,"EndTime":38660.0,"X":240.0,"Y":170.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":38835.0,"EndTime":38835.0,"X":313.399017,"Y":185.413788,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":39083.0,"Objects":[{"StartTime":39083.0,"EndTime":39083.0,"X":110.0,"Y":240.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":39258.0,"EndTime":39258.0,"X":183.399017,"Y":255.413788,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":39505.0,"Objects":[{"StartTime":39505.0,"EndTime":39505.0,"X":106.0,"Y":321.0}]},{"StartTime":39716.0,"Objects":[{"StartTime":39716.0,"EndTime":39716.0,"X":148.0,"Y":159.0}]},{"StartTime":39928.0,"Objects":[{"StartTime":39928.0,"EndTime":39928.0,"X":35.0,"Y":279.0}]},{"StartTime":40139.0,"Objects":[{"StartTime":40139.0,"EndTime":40139.0,"X":213.0,"Y":325.0}]},{"StartTime":40350.0,"Objects":[{"StartTime":40350.0,"EndTime":40350.0,"X":61.0,"Y":312.0}]},{"StartTime":40561.0,"Objects":[{"StartTime":40561.0,"EndTime":40561.0,"X":237.0,"Y":299.0}]},{"StartTime":40773.0,"Objects":[{"StartTime":40773.0,"EndTime":40773.0,"X":120.0,"Y":92.0}]},{"StartTime":40878.0,"Objects":[{"StartTime":40878.0,"EndTime":40878.0,"X":124.0,"Y":129.0}]},{"StartTime":40984.0,"Objects":[{"StartTime":40984.0,"EndTime":40984.0,"X":128.0,"Y":166.0}]},{"StartTime":41089.0,"Objects":[{"StartTime":41089.0,"EndTime":41089.0,"X":132.0,"Y":203.0}]},{"StartTime":41195.0,"Objects":[{"StartTime":41195.0,"EndTime":41195.0,"X":136.0,"Y":241.0}]},{"StartTime":41407.0,"Objects":[{"StartTime":41407.0,"EndTime":41407.0,"X":273.521729,"Y":106.521736}]},{"StartTime":41512.0,"Objects":[{"StartTime":41512.0,"EndTime":41512.0,"X":277.260864,"Y":110.260864}]},{"StartTime":41618.0,"Objects":[{"StartTime":41618.0,"EndTime":41618.0,"X":281.0,"Y":114.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":41793.0,"EndTime":41793.0,"X":355.8014,"Y":108.545731,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":42040.0,"Objects":[{"StartTime":42040.0,"EndTime":42040.0,"X":292.0,"Y":34.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":42215.0,"EndTime":42215.0,"X":366.8014,"Y":28.54573,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":42463.0,"Objects":[{"StartTime":42463.0,"EndTime":42463.0,"X":400.0,"Y":177.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":42638.0,"EndTime":42638.0,"X":405.454285,"Y":251.8014,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":42885.0,"Objects":[{"StartTime":42885.0,"EndTime":42885.0,"X":480.0,"Y":188.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":43060.0,"EndTime":43060.0,"X":485.454285,"Y":262.8014,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":43308.0,"Objects":[{"StartTime":43308.0,"EndTime":43308.0,"X":330.0,"Y":317.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":43483.0,"EndTime":43483.0,"X":255.1986,"Y":311.545715,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":43730.0,"Objects":[{"StartTime":43730.0,"EndTime":43730.0,"X":319.0,"Y":237.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":43905.0,"EndTime":43905.0,"X":244.1986,"Y":231.545731,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":44153.0,"Objects":[{"StartTime":44153.0,"EndTime":44153.0,"X":129.0,"Y":357.0}]},{"StartTime":44364.0,"Objects":[{"StartTime":44364.0,"EndTime":44364.0,"X":43.0,"Y":239.0}]},{"StartTime":44576.0,"Objects":[{"StartTime":44576.0,"EndTime":44576.0,"X":181.0,"Y":284.0}]},{"StartTime":44787.0,"Objects":[{"StartTime":44787.0,"EndTime":44787.0,"X":43.0,"Y":329.0}]},{"StartTime":44998.0,"Objects":[{"StartTime":44998.0,"EndTime":44998.0,"X":129.0,"Y":211.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":45173.0,"EndTime":45173.0,"X":134.815765,"Y":136.22583,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":45421.0,"Objects":[{"StartTime":45421.0,"EndTime":45421.0,"X":224.0,"Y":157.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":45596.0,"EndTime":45596.0,"X":218.184235,"Y":82.22582,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":45843.0,"Objects":[{"StartTime":45843.0,"EndTime":45843.0,"X":312.0,"Y":60.0}]},{"StartTime":46055.0,"Objects":[{"StartTime":46055.0,"EndTime":46055.0,"X":414.0,"Y":106.0}]},{"StartTime":46266.0,"Objects":[{"StartTime":46266.0,"EndTime":46266.0,"X":401.0,"Y":1.0}]},{"StartTime":46477.0,"Objects":[{"StartTime":46477.0,"EndTime":46477.0,"X":302.521729,"Y":134.521729}]},{"StartTime":46583.0,"Objects":[{"StartTime":46583.0,"EndTime":46583.0,"X":306.260864,"Y":138.260864}]},{"StartTime":46688.0,"Objects":[{"StartTime":46688.0,"EndTime":46688.0,"X":310.0,"Y":142.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":46863.0,"EndTime":46863.0,"X":315.815765,"Y":216.77417,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":47111.0,"Objects":[{"StartTime":47111.0,"EndTime":47111.0,"X":405.0,"Y":196.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":47286.0,"EndTime":47286.0,"X":399.184235,"Y":270.77417,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":47533.0,"Objects":[{"StartTime":47533.0,"EndTime":47533.0,"X":280.0,"Y":288.0}]},{"StartTime":47745.0,"Objects":[{"StartTime":47745.0,"EndTime":47745.0,"X":388.0,"Y":352.0}]},{"StartTime":47956.0,"Objects":[{"StartTime":47956.0,"EndTime":47956.0,"X":492.0,"Y":176.0}]},{"StartTime":48167.0,"Objects":[{"StartTime":48167.0,"EndTime":48167.0,"X":465.0,"Y":312.0}]},{"StartTime":48378.0,"Objects":[{"StartTime":48378.0,"EndTime":48378.0,"X":315.0,"Y":216.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":48553.0,"EndTime":48553.0,"X":243.195923,"Y":215.908646,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":48801.0,"Objects":[{"StartTime":48801.0,"EndTime":48801.0,"X":280.0,"Y":288.0}]},{"StartTime":49012.0,"Objects":[{"StartTime":49012.0,"EndTime":49012.0,"X":392.0,"Y":188.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":49187.0,"EndTime":49187.0,"X":341.5537,"Y":136.966446,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":49435.0,"Objects":[{"StartTime":49435.0,"EndTime":49435.0,"X":472.0,"Y":212.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":49610.0,"EndTime":49610.0,"X":458.927246,"Y":141.03653,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":49857.0,"Objects":[{"StartTime":49857.0,"EndTime":49857.0,"X":399.0,"Y":270.0}]},{"StartTime":50069.0,"Objects":[{"StartTime":50069.0,"EndTime":50069.0,"X":341.0,"Y":136.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":50244.0,"EndTime":50244.0,"X":352.818542,"Y":61.9370422,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":50491.0,"Objects":[{"StartTime":50491.0,"EndTime":50491.0,"X":430.0,"Y":31.0}]},{"StartTime":50702.0,"Objects":[{"StartTime":50702.0,"EndTime":50702.0,"X":274.0,"Y":83.0}]},{"StartTime":50914.0,"Objects":[{"StartTime":50914.0,"EndTime":50914.0,"X":423.0,"Y":111.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":51089.0,"EndTime":51089.0,"X":497.184875,"Y":122.027481,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":51336.0,"Objects":[{"StartTime":51336.0,"EndTime":51336.0,"X":338.0,"Y":215.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":51511.0,"EndTime":51511.0,"X":407.975128,"Y":188.0096,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":51759.0,"Objects":[{"StartTime":51759.0,"EndTime":51759.0,"X":282.0,"Y":268.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":51934.0,"EndTime":51934.0,"X":262.7776,"Y":198.471313,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":52181.0,"Objects":[{"StartTime":52181.0,"EndTime":52181.0,"X":358.0,"Y":289.0}]},{"StartTime":52393.0,"Objects":[{"StartTime":52393.0,"EndTime":52393.0,"X":184.0,"Y":202.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":52568.0,"EndTime":52568.0,"X":218.515137,"Y":138.736755,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":52815.0,"Objects":[{"StartTime":52815.0,"EndTime":52815.0,"X":190.0,"Y":281.0}]},{"StartTime":53026.0,"Objects":[{"StartTime":53026.0,"EndTime":53026.0,"X":119.0,"Y":158.0}]},{"StartTime":53238.0,"Objects":[{"StartTime":53238.0,"EndTime":53238.0,"X":262.0,"Y":200.0}]},{"StartTime":53449.0,"Objects":[{"StartTime":53449.0,"EndTime":53449.0,"X":99.0,"Y":230.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":53624.0,"EndTime":53624.0,"X":118.7338,"Y":157.642715,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":53871.0,"Objects":[{"StartTime":53871.0,"EndTime":53871.0,"X":31.0,"Y":295.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":54046.0,"EndTime":54046.0,"X":11.2661953,"Y":222.642715,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":54294.0,"Objects":[{"StartTime":54294.0,"EndTime":54294.0,"X":131.0,"Y":316.0}]},{"StartTime":54505.0,"Objects":[{"StartTime":54505.0,"EndTime":54505.0,"X":222.0,"Y":242.0}]},{"StartTime":54716.0,"Objects":[{"StartTime":54716.0,"EndTime":54716.0,"X":110.521736,"Y":149.521729}]},{"StartTime":54822.0,"Objects":[{"StartTime":54822.0,"EndTime":54822.0,"X":114.260864,"Y":153.260864}]},{"StartTime":54928.0,"Objects":[{"StartTime":54928.0,"EndTime":54928.0,"X":118.0,"Y":157.0}]},{"StartTime":55139.0,"Objects":[{"StartTime":55139.0,"EndTime":55139.0,"X":226.0,"Y":332.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":55419.0,"EndTime":55419.0,"X":332.02774,"Y":333.580322,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":55562.0,"Objects":[{"StartTime":55562.0,"EndTime":55562.0,"X":332.0,"Y":333.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":55737.0,"EndTime":55737.0,"X":347.450775,"Y":259.608765,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":55984.0,"Objects":[{"StartTime":55984.0,"EndTime":55984.0,"X":289.0,"Y":191.0}]},{"StartTime":56195.0,"Objects":[{"StartTime":56195.0,"EndTime":56195.0,"X":338.0,"Y":116.0}]},{"StartTime":56407.0,"Objects":[{"StartTime":56407.0,"EndTime":56407.0,"X":427.0,"Y":103.0}]},{"StartTime":56618.0,"Objects":[{"StartTime":56618.0,"EndTime":56618.0,"X":502.0,"Y":151.0}]},{"StartTime":56829.0,"Objects":[{"StartTime":56829.0,"EndTime":56829.0,"X":371.0,"Y":38.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":57109.0,"EndTime":57109.0,"X":264.9723,"Y":36.41969,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":57252.0,"Objects":[{"StartTime":57252.0,"EndTime":57252.0,"X":265.0,"Y":37.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":57427.0,"EndTime":57427.0,"X":249.54921,"Y":110.391235,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":57674.0,"Objects":[{"StartTime":57674.0,"EndTime":57674.0,"X":132.0,"Y":25.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":57990.0,"EndTime":57990.0,"X":155.7147,"Y":134.790283,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":58271.0,"EndTime":58271.0,"X":132.0,"Y":25.0,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":58519.0,"Objects":[{"StartTime":58519.0,"EndTime":58519.0,"X":79.0,"Y":150.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":58799.0,"EndTime":58799.0,"X":158.959457,"Y":212.030838,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":58942.0,"Objects":[{"StartTime":58942.0,"EndTime":58942.0,"X":158.0,"Y":212.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":59117.0,"EndTime":59117.0,"X":231.232117,"Y":195.811844,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":59364.0,"Objects":[{"StartTime":59364.0,"EndTime":59364.0,"X":249.0,"Y":110.0}]},{"StartTime":59575.0,"Objects":[{"StartTime":59575.0,"EndTime":59575.0,"X":324.0,"Y":159.0}]},{"StartTime":59787.0,"Objects":[{"StartTime":59787.0,"EndTime":59787.0,"X":337.0,"Y":248.0}]},{"StartTime":59998.0,"Objects":[{"StartTime":59998.0,"EndTime":59998.0,"X":289.0,"Y":323.0}]},{"StartTime":60209.0,"Objects":[{"StartTime":60209.0,"EndTime":60209.0,"X":406.0,"Y":192.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":60489.0,"EndTime":60489.0,"X":468.030823,"Y":271.959473,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":60632.0,"Objects":[{"StartTime":60632.0,"EndTime":60632.0,"X":469.0,"Y":272.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":60807.0,"EndTime":60807.0,"X":451.908661,"Y":345.0266,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":61055.0,"Objects":[{"StartTime":61055.0,"EndTime":61055.0,"X":337.0,"Y":248.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":61371.0,"EndTime":61371.0,"X":359.946777,"Y":357.953369,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":61652.0,"EndTime":61652.0,"X":337.0,"Y":248.0,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":61900.0,"Objects":[{"StartTime":61900.0,"EndTime":61900.0,"X":232.0,"Y":195.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":62075.0,"EndTime":62075.0,"X":214.908661,"Y":268.0266,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":62322.0,"Objects":[{"StartTime":62322.0,"EndTime":62322.0,"X":129.0,"Y":122.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":62497.0,"EndTime":62497.0,"X":145.792313,"Y":195.095947,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":62745.0,"Objects":[{"StartTime":62745.0,"EndTime":62745.0,"X":177.0,"Y":358.0}]},{"StartTime":62956.0,"Objects":[{"StartTime":62956.0,"EndTime":62956.0,"X":108.0,"Y":282.0}]},{"StartTime":63167.0,"Objects":[{"StartTime":63167.0,"EndTime":63167.0,"X":286.0,"Y":341.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":63342.0,"EndTime":63342.0,"X":359.260956,"Y":357.0572,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":63590.0,"Objects":[{"StartTime":63590.0,"EndTime":63590.0,"X":410.0,"Y":231.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":63765.0,"EndTime":63765.0,"X":336.693939,"Y":246.84996,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":64012.0,"Objects":[{"StartTime":64012.0,"EndTime":64012.0,"X":465.0,"Y":158.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":64187.0,"EndTime":64187.0,"X":391.904053,"Y":141.207687,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":64435.0,"Objects":[{"StartTime":64435.0,"EndTime":64435.0,"X":226.0,"Y":111.0}]},{"StartTime":64646.0,"Objects":[{"StartTime":64646.0,"EndTime":64646.0,"X":320.0,"Y":175.0}]},{"StartTime":64857.0,"Objects":[{"StartTime":64857.0,"EndTime":64857.0,"X":222.0,"Y":34.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":65032.0,"EndTime":65032.0,"X":162.249863,"Y":68.4071,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":65280.0,"Objects":[{"StartTime":65280.0,"EndTime":65280.0,"X":218.0,"Y":189.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":65455.0,"EndTime":65455.0,"X":158.249863,"Y":154.592911,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":65702.0,"Objects":[{"StartTime":65702.0,"EndTime":65702.0,"X":296.0,"Y":70.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":65877.0,"EndTime":65877.0,"X":276.006042,"Y":142.285828,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":66125.0,"Objects":[{"StartTime":66125.0,"EndTime":66125.0,"X":236.0,"Y":337.0}]},{"StartTime":66336.0,"Objects":[{"StartTime":66336.0,"EndTime":66336.0,"X":325.0,"Y":219.0}]},{"StartTime":66547.0,"Objects":[{"StartTime":66547.0,"EndTime":66547.0,"X":152.0,"Y":247.0}]},{"StartTime":66758.0,"Objects":[{"StartTime":66758.0,"EndTime":66758.0,"X":316.0,"Y":312.0}]},{"StartTime":66970.0,"Objects":[{"StartTime":66970.0,"EndTime":66970.0,"X":88.0,"Y":184.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":67145.0,"EndTime":67145.0,"X":28.2498646,"Y":218.4071,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":67392.0,"Objects":[{"StartTime":67392.0,"EndTime":67392.0,"X":172.0,"Y":320.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":67567.0,"EndTime":67567.0,"X":152.006042,"Y":247.714172,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":67815.0,"Objects":[{"StartTime":67815.0,"EndTime":67815.0,"X":194.0,"Y":118.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":67990.0,"EndTime":67990.0,"X":127.445862,"Y":99.08952,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":68238.0,"Objects":[{"StartTime":68238.0,"EndTime":68238.0,"X":297.0,"Y":315.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":68413.0,"EndTime":68413.0,"X":277.006042,"Y":242.714172,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":68660.0,"Objects":[{"StartTime":68660.0,"EndTime":68660.0,"X":300.0,"Y":75.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":68835.0,"EndTime":68835.0,"X":277.048523,"Y":162.0243,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":68977.0,"Objects":[{"StartTime":68977.0,"EndTime":68977.0,"X":337.0,"Y":56.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":69152.0,"EndTime":69152.0,"X":314.048523,"Y":143.0243,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":69294.0,"Objects":[{"StartTime":69294.0,"EndTime":69294.0,"X":374.0,"Y":43.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":69363.0,"EndTime":69363.0,"X":353.9267,"Y":115.263847,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":69505.0,"Objects":[{"StartTime":69505.0,"EndTime":69505.0,"X":385.0,"Y":192.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":69680.0,"EndTime":69680.0,"X":470.1033,"Y":203.038986,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":69822.0,"Objects":[{"StartTime":69822.0,"EndTime":69822.0,"X":360.0,"Y":235.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":69997.0,"EndTime":69997.0,"X":444.7288,"Y":245.275024,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":70139.0,"Objects":[{"StartTime":70139.0,"EndTime":70139.0,"X":341.0,"Y":274.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":70208.0,"EndTime":70208.0,"X":412.045074,"Y":278.015778,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":70350.0,"Objects":[{"StartTime":70350.0,"EndTime":70350.0,"X":245.0,"Y":332.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":70525.0,"EndTime":70525.0,"X":238.370941,"Y":249.928986,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":70667.0,"Objects":[{"StartTime":70667.0,"EndTime":70667.0,"X":185.0,"Y":311.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":70842.0,"EndTime":70842.0,"X":238.16449,"Y":248.16507,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":70984.0,"Objects":[{"StartTime":70984.0,"EndTime":70984.0,"X":169.0,"Y":248.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":71053.0,"EndTime":71053.0,"X":237.883636,"Y":247.620834,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":71195.0,"Objects":[{"StartTime":71195.0,"EndTime":71195.0,"X":78.0,"Y":207.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":71370.0,"EndTime":71370.0,"X":63.43404,"Y":122.660629,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":71512.0,"Objects":[{"StartTime":71512.0,"EndTime":71512.0,"X":108.0,"Y":176.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":71687.0,"EndTime":71687.0,"X":93.43404,"Y":91.66063,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":71829.0,"Objects":[{"StartTime":71829.0,"EndTime":71829.0,"X":143.0,"Y":143.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":71898.0,"EndTime":71898.0,"X":131.188721,"Y":73.56615,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":72040.0,"Objects":[{"StartTime":72040.0,"EndTime":72040.0,"X":307.0,"Y":58.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":72215.0,"EndTime":72215.0,"X":225.182,"Y":43.19644,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":72357.0,"Objects":[{"StartTime":72357.0,"EndTime":72357.0,"X":388.0,"Y":72.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":72532.0,"EndTime":72532.0,"X":306.182,"Y":57.1964378,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":72674.0,"Objects":[{"StartTime":72674.0,"EndTime":72674.0,"X":454.0,"Y":91.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":72743.0,"EndTime":72743.0,"X":387.1621,"Y":71.76814,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":72885.0,"Objects":[{"StartTime":72885.0,"EndTime":72885.0,"X":338.0,"Y":180.0}]},{"StartTime":73097.0,"Objects":[{"StartTime":73097.0,"EndTime":73097.0,"X":269.0,"Y":308.0}]},{"StartTime":73202.0,"Objects":[{"StartTime":73202.0,"EndTime":73202.0,"X":304.0,"Y":334.0}]},{"StartTime":73308.0,"Objects":[{"StartTime":73308.0,"EndTime":73308.0,"X":348.0,"Y":344.0}]},{"StartTime":73414.0,"Objects":[{"StartTime":73414.0,"EndTime":73414.0,"X":391.0,"Y":335.0}]},{"StartTime":73519.0,"Objects":[{"StartTime":73519.0,"EndTime":73519.0,"X":428.0,"Y":309.0}]},{"StartTime":73625.0,"Objects":[{"StartTime":73625.0,"EndTime":73625.0,"X":450.0,"Y":271.0}]},{"StartTime":73730.0,"Objects":[{"StartTime":73730.0,"EndTime":73730.0,"X":453.0,"Y":227.0}]},{"StartTime":74576.0,"Objects":[{"StartTime":74576.0,"EndTime":74576.0,"X":453.0,"Y":227.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":74611.0,"EndTime":74611.0,"X":475.4206,"Y":227.605957,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":74646.0,"EndTime":74646.0,"X":453.142365,"Y":227.003845,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":74681.0,"EndTime":74681.0,"X":475.278259,"Y":227.602112,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":74716.0,"EndTime":74716.0,"X":453.2847,"Y":227.00769,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":74752.0,"EndTime":74752.0,"X":475.2071,"Y":227.600189,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":74787.0,"EndTime":74787.0,"X":453.213531,"Y":227.005768,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":74822.0,"EndTime":74822.0,"X":475.349426,"Y":227.604034,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":74857.0,"EndTime":74857.0,"X":453.071167,"Y":227.001923,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":74856.0,"EndTime":74856.0,"X":475.4918,"Y":227.60788,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":74998.0,"Objects":[{"StartTime":74998.0,"EndTime":74998.0,"X":506.0,"Y":152.0}]},{"StartTime":75421.0,"Objects":[{"StartTime":75421.0,"EndTime":75421.0,"X":222.0,"Y":89.0}]},{"StartTime":75632.0,"Objects":[{"StartTime":75632.0,"EndTime":75632.0,"X":194.0,"Y":259.0}]},{"StartTime":75843.0,"Objects":[{"StartTime":75843.0,"EndTime":75843.0,"X":320.0,"Y":218.0}]},{"StartTime":76054.0,"Objects":[{"StartTime":76054.0,"EndTime":76054.0,"X":150.0,"Y":190.0}]},{"StartTime":76266.0,"Objects":[{"StartTime":76266.0,"EndTime":76266.0,"X":339.0,"Y":335.0}]},{"StartTime":76477.0,"Objects":[{"StartTime":76477.0,"EndTime":76477.0,"X":372.0,"Y":130.0}]},{"StartTime":76688.0,"Objects":[{"StartTime":76688.0,"EndTime":76688.0,"X":221.0,"Y":180.0}]},{"StartTime":76899.0,"Objects":[{"StartTime":76899.0,"EndTime":76899.0,"X":425.0,"Y":212.0}]},{"StartTime":77111.0,"Objects":[{"StartTime":77111.0,"EndTime":77111.0,"X":285.0,"Y":121.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":77286.0,"EndTime":77286.0,"X":371.8806,"Y":129.901413,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":77533.0,"Objects":[{"StartTime":77533.0,"EndTime":77533.0,"X":194.0,"Y":259.0}]},{"StartTime":77745.0,"Objects":[{"StartTime":77745.0,"EndTime":77745.0,"X":323.0,"Y":182.0}]},{"StartTime":77956.0,"Objects":[{"StartTime":77956.0,"EndTime":77956.0,"X":244.0,"Y":316.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":78131.0,"EndTime":78131.0,"X":154.157745,"Y":324.1849,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":78378.0,"Objects":[{"StartTime":78378.0,"EndTime":78378.0,"X":245.0,"Y":179.0}]},{"StartTime":78590.0,"Objects":[{"StartTime":78590.0,"EndTime":78590.0,"X":350.0,"Y":277.0}]},{"StartTime":78801.0,"Objects":[{"StartTime":78801.0,"EndTime":78801.0,"X":160.0,"Y":228.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":79081.0,"EndTime":79081.0,"X":163.6551,"Y":81.7956848,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":79224.0,"Objects":[{"StartTime":79224.0,"EndTime":79224.0,"X":194.0,"Y":90.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":79399.0,"EndTime":79399.0,"X":283.264221,"Y":89.8079147,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":79646.0,"Objects":[{"StartTime":79646.0,"EndTime":79646.0,"X":129.0,"Y":0.0}]},{"StartTime":79857.0,"Objects":[{"StartTime":79857.0,"EndTime":79857.0,"X":22.0,"Y":146.0}]},{"StartTime":80069.0,"Objects":[{"StartTime":80069.0,"EndTime":80069.0,"X":194.0,"Y":90.0}]},{"StartTime":80280.0,"Objects":[{"StartTime":80280.0,"EndTime":80280.0,"X":22.0,"Y":33.0}]},{"StartTime":80491.0,"Objects":[{"StartTime":80491.0,"EndTime":80491.0,"X":129.0,"Y":180.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":80666.0,"EndTime":80666.0,"X":219.221863,"Y":178.1168,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":80913.0,"Objects":[{"StartTime":80913.0,"EndTime":80913.0,"X":308.0,"Y":80.0}]},{"StartTime":81125.0,"Objects":[{"StartTime":81125.0,"EndTime":81125.0,"X":280.0,"Y":252.0}]},{"StartTime":81336.0,"Objects":[{"StartTime":81336.0,"EndTime":81336.0,"X":446.0,"Y":206.0}]},{"StartTime":81547.0,"Objects":[{"StartTime":81547.0,"EndTime":81547.0,"X":339.0,"Y":60.0}]},{"StartTime":81759.0,"Objects":[{"StartTime":81759.0,"EndTime":81759.0,"X":511.0,"Y":116.0}]},{"StartTime":81970.0,"Objects":[{"StartTime":81970.0,"EndTime":81970.0,"X":339.0,"Y":173.0}]},{"StartTime":82181.0,"Objects":[{"StartTime":82181.0,"EndTime":82181.0,"X":446.0,"Y":26.0}]},{"StartTime":82393.0,"Objects":[{"StartTime":82393.0,"EndTime":82393.0,"X":280.0,"Y":118.0}]},{"StartTime":82604.0,"Objects":[{"StartTime":82604.0,"EndTime":82604.0,"X":435.0,"Y":118.0}]},{"StartTime":82816.0,"Objects":[{"StartTime":82816.0,"EndTime":82816.0,"X":259.0,"Y":26.0}]},{"StartTime":83026.0,"Objects":[{"StartTime":83026.0,"EndTime":83026.0,"X":339.0,"Y":173.0}]},{"StartTime":83238.0,"Objects":[{"StartTime":83238.0,"EndTime":83238.0,"X":154.0,"Y":128.0}]},{"StartTime":83449.0,"Objects":[{"StartTime":83449.0,"EndTime":83449.0,"X":304.0,"Y":88.0}]},{"StartTime":83661.0,"Objects":[{"StartTime":83661.0,"EndTime":83661.0,"X":157.0,"Y":222.0}]},{"StartTime":83871.0,"Objects":[{"StartTime":83871.0,"EndTime":83871.0,"X":352.0,"Y":280.0}]},{"StartTime":84083.0,"Objects":[{"StartTime":84083.0,"EndTime":84083.0,"X":160.0,"Y":173.0}]},{"StartTime":84294.0,"Objects":[{"StartTime":84294.0,"EndTime":84294.0,"X":339.0,"Y":173.0}]},{"StartTime":84506.0,"Objects":[{"StartTime":84506.0,"EndTime":84506.0,"X":135.0,"Y":280.0}]},{"StartTime":84716.0,"Objects":[{"StartTime":84716.0,"EndTime":84716.0,"X":259.0,"Y":130.0}]},{"StartTime":84928.0,"Objects":[{"StartTime":84928.0,"EndTime":84928.0,"X":65.0,"Y":235.0}]},{"StartTime":85139.0,"Objects":[{"StartTime":85139.0,"EndTime":85139.0,"X":244.0,"Y":235.0}]},{"StartTime":85351.0,"Objects":[{"StartTime":85351.0,"EndTime":85351.0,"X":40.0,"Y":129.0}]},{"StartTime":85562.0,"Objects":[{"StartTime":85562.0,"EndTime":85562.0,"X":300.0,"Y":92.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":85737.0,"EndTime":85737.0,"X":277.179749,"Y":186.7918,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":85984.0,"Objects":[{"StartTime":85984.0,"EndTime":85984.0,"X":192.0,"Y":43.0}]},{"StartTime":86195.0,"Objects":[{"StartTime":86195.0,"EndTime":86195.0,"X":361.0,"Y":34.0}]},{"StartTime":86407.0,"Objects":[{"StartTime":86407.0,"EndTime":86407.0,"X":327.0,"Y":233.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":86582.0,"EndTime":86582.0,"X":232.2082,"Y":210.179749,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":86829.0,"Objects":[{"StartTime":86829.0,"EndTime":86829.0,"X":376.0,"Y":125.0}]},{"StartTime":87040.0,"Objects":[{"StartTime":87040.0,"EndTime":87040.0,"X":385.0,"Y":294.0}]},{"StartTime":87252.0,"Objects":[{"StartTime":87252.0,"EndTime":87252.0,"X":195.0,"Y":265.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":87427.0,"EndTime":87427.0,"X":217.820251,"Y":170.2082,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":87674.0,"Objects":[{"StartTime":87674.0,"EndTime":87674.0,"X":303.0,"Y":314.0}]},{"StartTime":87885.0,"Objects":[{"StartTime":87885.0,"EndTime":87885.0,"X":134.0,"Y":323.0}]},{"StartTime":88097.0,"Objects":[{"StartTime":88097.0,"EndTime":88097.0,"X":177.0,"Y":108.0}]},{"StartTime":88202.0,"Objects":[{"StartTime":88202.0,"EndTime":88202.0,"X":223.0,"Y":95.0}]},{"StartTime":88308.0,"Objects":[{"StartTime":88308.0,"EndTime":88308.0,"X":267.0,"Y":114.0}]},{"StartTime":88413.0,"Objects":[{"StartTime":88413.0,"EndTime":88413.0,"X":291.0,"Y":155.0}]},{"StartTime":88519.0,"Objects":[{"StartTime":88519.0,"EndTime":88519.0,"X":284.0,"Y":203.0}]},{"StartTime":88731.0,"Objects":[{"StartTime":88731.0,"EndTime":88731.0,"X":102.0,"Y":204.0}]},{"StartTime":88942.0,"Objects":[{"StartTime":88942.0,"EndTime":88942.0,"X":224.0,"Y":16.0}]},{"StartTime":89153.0,"Objects":[{"StartTime":89153.0,"EndTime":89153.0,"X":207.0,"Y":200.0}]},{"StartTime":89364.0,"Objects":[{"StartTime":89364.0,"EndTime":89364.0,"X":96.0,"Y":112.0}]},{"StartTime":89575.0,"Objects":[{"StartTime":89575.0,"EndTime":89575.0,"X":113.0,"Y":296.0}]},{"StartTime":89787.0,"Objects":[{"StartTime":89787.0,"EndTime":89787.0,"X":0.0,"Y":152.0}]},{"StartTime":89998.0,"Objects":[{"StartTime":89998.0,"EndTime":89998.0,"X":184.0,"Y":169.0}]},{"StartTime":90209.0,"Objects":[{"StartTime":90209.0,"EndTime":90209.0,"X":16.0,"Y":296.0}]},{"StartTime":90420.0,"Objects":[{"StartTime":90420.0,"EndTime":90420.0,"X":211.0,"Y":242.0}]},{"StartTime":90632.0,"Objects":[{"StartTime":90632.0,"EndTime":90632.0,"X":88.0,"Y":52.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":90807.0,"EndTime":90807.0,"X":78.2983856,"Y":149.016129,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":91055.0,"Objects":[{"StartTime":91055.0,"EndTime":91055.0,"X":231.0,"Y":2.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":91230.0,"EndTime":91230.0,"X":173.4124,"Y":80.6760254,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":91477.0,"Objects":[{"StartTime":91477.0,"EndTime":91477.0,"X":383.0,"Y":22.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":91652.0,"EndTime":91652.0,"X":293.9368,"Y":61.67361,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":91900.0,"Objects":[{"StartTime":91900.0,"EndTime":91900.0,"X":491.0,"Y":110.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":92075.0,"EndTime":92075.0,"X":393.715942,"Y":103.5144,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":92322.0,"Objects":[{"StartTime":92322.0,"EndTime":92322.0,"X":436.0,"Y":284.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":92497.0,"EndTime":92497.0,"X":441.562347,"Y":186.658783,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":92745.0,"Objects":[{"StartTime":92745.0,"EndTime":92745.0,"X":300.260864,"Y":155.260864}]},{"StartTime":92956.0,"Objects":[{"StartTime":92956.0,"EndTime":92956.0,"X":304.0,"Y":159.0}]},{"StartTime":93167.0,"Objects":[{"StartTime":93167.0,"EndTime":93167.0,"X":412.0,"Y":328.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":93342.0,"EndTime":93342.0,"X":417.562347,"Y":230.658783,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":93590.0,"Objects":[{"StartTime":93590.0,"EndTime":93590.0,"X":288.260864,"Y":172.260864}]},{"StartTime":93801.0,"Objects":[{"StartTime":93801.0,"EndTime":93801.0,"X":292.0,"Y":176.0}]},{"StartTime":94012.0,"Objects":[{"StartTime":94012.0,"EndTime":94012.0,"X":392.0,"Y":364.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":94187.0,"EndTime":94187.0,"X":397.562347,"Y":266.658783,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":94435.0,"Objects":[{"StartTime":94435.0,"EndTime":94435.0,"X":276.260864,"Y":192.260864}]},{"StartTime":94646.0,"Objects":[{"StartTime":94646.0,"EndTime":94646.0,"X":280.0,"Y":196.0}]},{"StartTime":94857.0,"Objects":[{"StartTime":94857.0,"EndTime":94857.0,"X":160.0,"Y":155.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":95032.0,"EndTime":95032.0,"X":167.9152,"Y":243.954712,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":95280.0,"Objects":[{"StartTime":95280.0,"EndTime":95280.0,"X":424.0,"Y":112.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":95455.0,"EndTime":95455.0,"X":416.084778,"Y":23.0452919,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":95702.0,"Objects":[{"StartTime":95702.0,"EndTime":95702.0,"X":224.0,"Y":192.0}]},{"StartTime":95913.0,"Objects":[{"StartTime":95913.0,"EndTime":95913.0,"X":421.0,"Y":192.0}]},{"StartTime":96125.0,"Objects":[{"StartTime":96125.0,"EndTime":96125.0,"X":280.0,"Y":56.0}]},{"StartTime":96336.0,"Objects":[{"StartTime":96336.0,"EndTime":96336.0,"X":280.0,"Y":253.0}]},{"StartTime":96547.0,"Objects":[{"StartTime":96547.0,"EndTime":96547.0,"X":431.0,"Y":112.0}]},{"StartTime":96758.0,"Objects":[{"StartTime":96758.0,"EndTime":96758.0,"X":195.0,"Y":112.0}]},{"StartTime":96970.0,"Objects":[{"StartTime":96970.0,"EndTime":96970.0,"X":364.0,"Y":268.0}]},{"StartTime":97181.0,"Objects":[{"StartTime":97181.0,"EndTime":97181.0,"X":364.0,"Y":32.0}]},{"StartTime":97393.0,"Objects":[{"StartTime":97393.0,"EndTime":97393.0,"X":176.0,"Y":264.0}]},{"StartTime":97604.0,"Objects":[{"StartTime":97604.0,"EndTime":97604.0,"X":426.0,"Y":108.0}]},{"StartTime":97815.0,"Objects":[{"StartTime":97815.0,"EndTime":97815.0,"X":200.0,"Y":184.0}]},{"StartTime":98026.0,"Objects":[{"StartTime":98026.0,"EndTime":98026.0,"X":459.0,"Y":264.0}]},{"StartTime":98238.0,"Objects":[{"StartTime":98238.0,"EndTime":98238.0,"X":200.0,"Y":108.0}]},{"StartTime":98449.0,"Objects":[{"StartTime":98449.0,"EndTime":98449.0,"X":426.0,"Y":184.0}]},{"StartTime":98660.0,"Objects":[{"StartTime":98660.0,"EndTime":98660.0,"X":164.0,"Y":32.0}]},{"StartTime":98871.0,"Objects":[{"StartTime":98871.0,"EndTime":98871.0,"X":447.0,"Y":32.0}]},{"StartTime":99083.0,"Objects":[{"StartTime":99083.0,"EndTime":99083.0,"X":312.0,"Y":264.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":99258.0,"EndTime":99258.0,"X":305.2918,"Y":166.731049,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":99505.0,"Objects":[{"StartTime":99505.0,"EndTime":99505.0,"X":412.0,"Y":236.0}]},{"StartTime":99716.0,"Objects":[{"StartTime":99716.0,"EndTime":99716.0,"X":224.0,"Y":224.0}]},{"StartTime":99928.0,"Objects":[{"StartTime":99928.0,"EndTime":99928.0,"X":420.0,"Y":144.0}]},{"StartTime":100139.0,"Objects":[{"StartTime":100139.0,"EndTime":100139.0,"X":408.0,"Y":332.0}]},{"StartTime":100350.0,"Objects":[{"StartTime":100350.0,"EndTime":100350.0,"X":252.0,"Y":136.0}]},{"StartTime":100561.0,"Objects":[{"StartTime":100561.0,"EndTime":100561.0,"X":191.0,"Y":314.0}]},{"StartTime":100773.0,"Objects":[{"StartTime":100773.0,"EndTime":100773.0,"X":412.0,"Y":236.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":100948.0,"EndTime":100948.0,"X":487.0,"Y":236.0,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":101195.0,"Objects":[{"StartTime":101195.0,"EndTime":101195.0,"X":348.0,"Y":288.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":101370.0,"EndTime":101370.0,"X":273.0,"Y":288.0,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":101618.0,"Objects":[{"StartTime":101618.0,"EndTime":101618.0,"X":415.0,"Y":339.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":101898.0,"EndTime":101898.0,"X":411.2817,"Y":235.5634,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":102040.0,"Objects":[{"StartTime":102040.0,"EndTime":102040.0,"X":414.739136,"Y":238.739136}]},{"StartTime":102252.0,"Objects":[{"StartTime":102252.0,"EndTime":102252.0,"X":339.521729,"Y":119.521736}]},{"StartTime":102357.0,"Objects":[{"StartTime":102357.0,"EndTime":102357.0,"X":343.260864,"Y":123.260864}]},{"StartTime":102463.0,"Objects":[{"StartTime":102463.0,"EndTime":102463.0,"X":347.0,"Y":127.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":102638.0,"EndTime":102638.0,"X":432.363373,"Y":134.772491,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":102885.0,"Objects":[{"StartTime":102885.0,"EndTime":102885.0,"X":444.0,"Y":20.0}]},{"StartTime":103097.0,"Objects":[{"StartTime":103097.0,"EndTime":103097.0,"X":280.0,"Y":60.0}]},{"StartTime":103308.0,"Objects":[{"StartTime":103308.0,"EndTime":103308.0,"X":433.0,"Y":135.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":103483.0,"EndTime":103483.0,"X":423.061157,"Y":224.449539,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":103731.0,"Objects":[{"StartTime":103731.0,"EndTime":103731.0,"X":232.0,"Y":120.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":103906.0,"EndTime":103906.0,"X":222.061157,"Y":30.55046,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":104153.0,"Objects":[{"StartTime":104153.0,"EndTime":104153.0,"X":92.0,"Y":254.0}]},{"StartTime":104364.0,"Objects":[{"StartTime":104364.0,"EndTime":104364.0,"X":139.0,"Y":123.0}]},{"StartTime":104575.0,"Objects":[{"StartTime":104575.0,"EndTime":104575.0,"X":0.0,"Y":157.0}]},{"StartTime":104787.0,"Objects":[{"StartTime":104787.0,"EndTime":104787.0,"X":158.0,"Y":201.0}]},{"StartTime":104998.0,"Objects":[{"StartTime":104998.0,"EndTime":104998.0,"X":204.0,"Y":26.0}]},{"StartTime":105209.0,"Objects":[{"StartTime":105209.0,"EndTime":105209.0,"X":34.0,"Y":71.0}]},{"StartTime":105421.0,"Objects":[{"StartTime":105421.0,"EndTime":105421.0,"X":267.0,"Y":106.0}]},{"StartTime":105632.0,"Objects":[{"StartTime":105632.0,"EndTime":105632.0,"X":30.0,"Y":179.0}]},{"StartTime":105843.0,"Objects":[{"StartTime":105843.0,"EndTime":105843.0,"X":163.0,"Y":290.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":106018.0,"EndTime":106018.0,"X":157.2056,"Y":200.186722,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":106266.0,"Objects":[{"StartTime":106266.0,"EndTime":106266.0,"X":273.0,"Y":144.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":106441.0,"EndTime":106441.0,"X":354.2163,"Y":157.9499,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":106688.0,"Objects":[{"StartTime":106688.0,"EndTime":106688.0,"X":512.0,"Y":116.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":106863.0,"EndTime":106863.0,"X":430.2963,"Y":129.688965,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":107111.0,"Objects":[{"StartTime":107111.0,"EndTime":107111.0,"X":384.0,"Y":4.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":107286.0,"EndTime":107286.0,"X":368.694946,"Y":84.79979,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":107533.0,"Objects":[{"StartTime":107533.0,"EndTime":107533.0,"X":396.0,"Y":288.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":107708.0,"EndTime":107708.0,"X":410.385376,"Y":206.609482,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":107956.0,"Objects":[{"StartTime":107956.0,"EndTime":107956.0,"X":408.0,"Y":368.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":108131.0,"EndTime":108131.0,"X":475.4191,"Y":320.030762,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":108378.0,"Objects":[{"StartTime":108378.0,"EndTime":108378.0,"X":332.0,"Y":336.0}]},{"StartTime":108590.0,"Objects":[{"StartTime":108590.0,"EndTime":108590.0,"X":480.0,"Y":244.0}]},{"StartTime":108801.0,"Objects":[{"StartTime":108801.0,"EndTime":108801.0,"X":332.0,"Y":336.0}]},{"StartTime":109013.0,"Objects":[{"StartTime":109013.0,"EndTime":109013.0,"X":372.0,"Y":168.0}]},{"StartTime":109224.0,"Objects":[{"StartTime":109224.0,"EndTime":109224.0,"X":247.0,"Y":313.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":109399.0,"EndTime":109399.0,"X":267.7445,"Y":230.566544,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":109646.0,"Objects":[{"StartTime":109646.0,"EndTime":109646.0,"X":96.0,"Y":136.0}]},{"StartTime":109858.0,"Objects":[{"StartTime":109858.0,"EndTime":109858.0,"X":196.0,"Y":252.0}]},{"StartTime":110069.0,"Objects":[{"StartTime":110069.0,"EndTime":110069.0,"X":260.0,"Y":120.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":110244.0,"EndTime":110244.0,"X":170.550461,"Y":129.938843,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":110491.0,"Objects":[{"StartTime":110491.0,"EndTime":110491.0,"X":28.0,"Y":236.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":110666.0,"EndTime":110666.0,"X":117.449539,"Y":245.938843,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":110914.0,"Objects":[{"StartTime":110914.0,"EndTime":110914.0,"X":86.0,"Y":46.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":111089.0,"EndTime":111089.0,"X":95.05495,"Y":135.543335,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":111337.0,"Objects":[{"StartTime":111337.0,"EndTime":111337.0,"X":186.0,"Y":341.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":111512.0,"EndTime":111512.0,"X":195.938843,"Y":251.550461,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":111759.0,"Objects":[{"StartTime":111759.0,"EndTime":111759.0,"X":216.0,"Y":88.0}]},{"StartTime":111970.0,"Objects":[{"StartTime":111970.0,"EndTime":111970.0,"X":95.0,"Y":135.0}]},{"StartTime":112181.0,"Objects":[{"StartTime":112181.0,"EndTime":112181.0,"X":264.0,"Y":168.0}]},{"StartTime":112393.0,"Objects":[{"StartTime":112393.0,"EndTime":112393.0,"X":191.0,"Y":8.0}]},{"StartTime":112604.0,"Objects":[{"StartTime":112604.0,"EndTime":112604.0,"X":142.0,"Y":221.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":112779.0,"EndTime":112779.0,"X":132.061157,"Y":310.449524,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":113026.0,"Objects":[{"StartTime":113026.0,"EndTime":113026.0,"X":264.0,"Y":168.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":113201.0,"EndTime":113201.0,"X":254.061157,"Y":257.449524,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":113449.0,"Objects":[{"StartTime":113449.0,"EndTime":113449.0,"X":396.0,"Y":112.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":113624.0,"EndTime":113624.0,"X":386.061157,"Y":201.449539,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":113871.0,"Objects":[{"StartTime":113871.0,"EndTime":113871.0,"X":312.0,"Y":104.0}]},{"StartTime":114083.0,"Objects":[{"StartTime":114083.0,"EndTime":114083.0,"X":456.0,"Y":240.0}]},{"StartTime":114294.0,"Objects":[{"StartTime":114294.0,"EndTime":114294.0,"X":442.0,"Y":48.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":114469.0,"EndTime":114469.0,"X":360.0754,"Y":43.94542,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":114716.0,"Objects":[{"StartTime":114716.0,"EndTime":114716.0,"X":303.0,"Y":196.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":114891.0,"EndTime":114891.0,"X":386.2208,"Y":200.863846,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":115139.0,"Objects":[{"StartTime":115139.0,"EndTime":115139.0,"X":208.0,"Y":80.0}]},{"StartTime":115244.0,"Objects":[{"StartTime":115244.0,"EndTime":115244.0,"X":213.0,"Y":124.0}]},{"StartTime":115350.0,"Objects":[{"StartTime":115350.0,"EndTime":115350.0,"X":218.0,"Y":169.0}]},{"StartTime":115455.0,"Objects":[{"StartTime":115455.0,"EndTime":115455.0,"X":224.0,"Y":214.0}]},{"StartTime":115561.0,"Objects":[{"StartTime":115561.0,"EndTime":115561.0,"X":229.0,"Y":258.0}]},{"StartTime":115773.0,"Objects":[{"StartTime":115773.0,"EndTime":115773.0,"X":128.521729,"Y":184.521729}]},{"StartTime":115878.0,"Objects":[{"StartTime":115878.0,"EndTime":115878.0,"X":132.260864,"Y":188.260864}]},{"StartTime":115984.0,"Objects":[{"StartTime":115984.0,"EndTime":115984.0,"X":136.0,"Y":192.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":116159.0,"EndTime":116159.0,"X":61.1985931,"Y":186.545731,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":116407.0,"Objects":[{"StartTime":116407.0,"EndTime":116407.0,"X":60.0,"Y":104.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":116582.0,"EndTime":116582.0,"X":134.853943,"Y":108.678375,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":116829.0,"Objects":[{"StartTime":116829.0,"EndTime":116829.0,"X":202.0,"Y":5.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":117004.0,"EndTime":117004.0,"X":207.454269,"Y":79.80141,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":117251.0,"Objects":[{"StartTime":117251.0,"EndTime":117251.0,"X":288.0,"Y":104.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":117426.0,"EndTime":117426.0,"X":292.988922,"Y":29.1661148,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":117674.0,"Objects":[{"StartTime":117674.0,"EndTime":117674.0,"X":336.0,"Y":184.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":117849.0,"EndTime":117849.0,"X":261.1986,"Y":178.545731,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":118096.0,"Objects":[{"StartTime":118096.0,"EndTime":118096.0,"X":340.0,"Y":264.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":118271.0,"EndTime":118271.0,"X":414.754669,"Y":257.9388,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":118519.0,"Objects":[{"StartTime":118519.0,"EndTime":118519.0,"X":414.0,"Y":112.0}]},{"StartTime":118730.0,"Objects":[{"StartTime":118730.0,"EndTime":118730.0,"X":500.0,"Y":230.0}]},{"StartTime":118942.0,"Objects":[{"StartTime":118942.0,"EndTime":118942.0,"X":362.0,"Y":185.0}]},{"StartTime":119153.0,"Objects":[{"StartTime":119153.0,"EndTime":119153.0,"X":500.0,"Y":140.0}]},{"StartTime":119364.0,"Objects":[{"StartTime":119364.0,"EndTime":119364.0,"X":414.0,"Y":258.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":119539.0,"EndTime":119539.0,"X":339.245331,"Y":264.0612,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":119787.0,"Objects":[{"StartTime":119787.0,"EndTime":119787.0,"X":186.0,"Y":173.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":119962.0,"EndTime":119962.0,"X":260.829376,"Y":178.056046,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":120209.0,"Objects":[{"StartTime":120209.0,"EndTime":120209.0,"X":260.0,"Y":292.0}]},{"StartTime":120421.0,"Objects":[{"StartTime":120421.0,"EndTime":120421.0,"X":169.0,"Y":344.0}]},{"StartTime":120632.0,"Objects":[{"StartTime":120632.0,"EndTime":120632.0,"X":182.0,"Y":239.0}]},{"StartTime":120843.0,"Objects":[{"StartTime":120843.0,"EndTime":120843.0,"X":244.0,"Y":372.0}]},{"StartTime":121054.0,"Objects":[{"StartTime":121054.0,"EndTime":121054.0,"X":104.0,"Y":296.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":121229.0,"EndTime":121229.0,"X":29.2258224,"Y":301.815765,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":121477.0,"Objects":[{"StartTime":121477.0,"EndTime":121477.0,"X":186.0,"Y":173.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":121652.0,"EndTime":121652.0,"X":260.829376,"Y":178.056046,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":121899.0,"Objects":[{"StartTime":121899.0,"EndTime":121899.0,"X":104.0,"Y":208.0}]},{"StartTime":122111.0,"Objects":[{"StartTime":122111.0,"EndTime":122111.0,"X":78.0,"Y":106.0}]},{"StartTime":122322.0,"Objects":[{"StartTime":122322.0,"EndTime":122322.0,"X":104.0,"Y":248.0}]},{"StartTime":122534.0,"Objects":[{"StartTime":122534.0,"EndTime":122534.0,"X":177.0,"Y":144.0}]},{"StartTime":122744.0,"Objects":[{"StartTime":122744.0,"EndTime":122744.0,"X":288.0,"Y":256.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":122919.0,"EndTime":122919.0,"X":216.195923,"Y":256.09137,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":123167.0,"Objects":[{"StartTime":123167.0,"EndTime":123167.0,"X":216.0,"Y":144.0}]},{"StartTime":123378.0,"Objects":[{"StartTime":123378.0,"EndTime":123378.0,"X":367.0,"Y":280.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":123553.0,"EndTime":123553.0,"X":316.5537,"Y":331.033569,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":123801.0,"Objects":[{"StartTime":123801.0,"EndTime":123801.0,"X":450.0,"Y":260.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":123976.0,"EndTime":123976.0,"X":431.362823,"Y":329.464874,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":124223.0,"Objects":[{"StartTime":124223.0,"EndTime":124223.0,"X":277.0,"Y":260.0}]},{"StartTime":124435.0,"Objects":[{"StartTime":124435.0,"EndTime":124435.0,"X":332.0,"Y":128.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":124610.0,"EndTime":124610.0,"X":402.4845,"Y":153.630737,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":124857.0,"Objects":[{"StartTime":124857.0,"EndTime":124857.0,"X":367.0,"Y":280.0}]},{"StartTime":125069.0,"Objects":[{"StartTime":125069.0,"EndTime":125069.0,"X":272.0,"Y":180.0}]},{"StartTime":125280.0,"Objects":[{"StartTime":125280.0,"EndTime":125280.0,"X":470.0,"Y":129.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":125455.0,"EndTime":125455.0,"X":460.233978,"Y":199.678162,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":125702.0,"Objects":[{"StartTime":125702.0,"EndTime":125702.0,"X":356.0,"Y":52.0}]},{"StartTime":125914.0,"Objects":[{"StartTime":125914.0,"EndTime":125914.0,"X":402.0,"Y":153.0}]},{"StartTime":126125.0,"Objects":[{"StartTime":126125.0,"EndTime":126125.0,"X":232.0,"Y":72.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":126300.0,"EndTime":126300.0,"X":212.777573,"Y":141.528687,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":126547.0,"Objects":[{"StartTime":126547.0,"EndTime":126547.0,"X":288.0,"Y":124.0}]},{"StartTime":126759.0,"Objects":[{"StartTime":126759.0,"EndTime":126759.0,"X":134.0,"Y":138.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":126934.0,"EndTime":126934.0,"X":168.515137,"Y":201.263245,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":127181.0,"Objects":[{"StartTime":127181.0,"EndTime":127181.0,"X":335.0,"Y":212.0}]},{"StartTime":127393.0,"Objects":[{"StartTime":127393.0,"EndTime":127393.0,"X":212.0,"Y":141.0}]},{"StartTime":127604.0,"Objects":[{"StartTime":127604.0,"EndTime":127604.0,"X":254.0,"Y":284.0}]},{"StartTime":127815.0,"Objects":[{"StartTime":127815.0,"EndTime":127815.0,"X":286.0,"Y":130.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":127990.0,"EndTime":127990.0,"X":211.678345,"Y":140.064392,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":128237.0,"Objects":[{"StartTime":128237.0,"EndTime":128237.0,"X":384.0,"Y":51.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":128412.0,"EndTime":128412.0,"X":311.6427,"Y":31.2661953,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":128660.0,"Objects":[{"StartTime":128660.0,"EndTime":128660.0,"X":480.0,"Y":108.0}]},{"StartTime":128871.0,"Objects":[{"StartTime":128871.0,"EndTime":128871.0,"X":396.0,"Y":232.0}]},{"StartTime":129082.0,"Objects":[{"StartTime":129082.0,"EndTime":129082.0,"X":233.521729,"Y":217.521729}]},{"StartTime":129188.0,"Objects":[{"StartTime":129188.0,"EndTime":129188.0,"X":237.260864,"Y":221.260864}]},{"StartTime":129294.0,"Objects":[{"StartTime":129294.0,"EndTime":129294.0,"X":241.0,"Y":225.0}]},{"StartTime":129505.0,"Objects":[{"StartTime":129505.0,"EndTime":129505.0,"X":295.0,"Y":288.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":129785.0,"EndTime":129785.0,"X":191.701752,"Y":291.7883,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":129928.0,"Objects":[{"StartTime":129928.0,"EndTime":129928.0,"X":192.0,"Y":292.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":130103.0,"EndTime":130103.0,"X":175.94281,"Y":365.260956,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":130350.0,"Objects":[{"StartTime":130350.0,"EndTime":130350.0,"X":148.0,"Y":220.0}]},{"StartTime":130561.0,"Objects":[{"StartTime":130561.0,"EndTime":130561.0,"X":68.0,"Y":187.0}]},{"StartTime":130772.0,"Objects":[{"StartTime":130772.0,"EndTime":130772.0,"X":36.0,"Y":267.0}]},{"StartTime":130983.0,"Objects":[{"StartTime":130983.0,"EndTime":130983.0,"X":115.0,"Y":300.0}]},{"StartTime":131195.0,"Objects":[{"StartTime":131195.0,"EndTime":131195.0,"X":16.0,"Y":127.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":131475.0,"EndTime":131475.0,"X":119.044754,"Y":123.706215,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":131618.0,"Objects":[{"StartTime":131618.0,"EndTime":131618.0,"X":119.0,"Y":124.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":131793.0,"EndTime":131793.0,"X":192.260956,"Y":107.94281,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":132040.0,"Objects":[{"StartTime":132040.0,"EndTime":132040.0,"X":280.0,"Y":44.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":132356.0,"EndTime":132356.0,"X":170.209717,"Y":20.2853,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":132637.0,"EndTime":132637.0,"X":280.0,"Y":44.0,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":132885.0,"Objects":[{"StartTime":132885.0,"EndTime":132885.0,"X":96.0,"Y":56.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":133165.0,"EndTime":133165.0,"X":90.74685,"Y":156.698685,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":133308.0,"Objects":[{"StartTime":133308.0,"EndTime":133308.0,"X":91.0,"Y":157.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":133483.0,"EndTime":133483.0,"X":164.045471,"Y":139.98941,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":133731.0,"Objects":[{"StartTime":133731.0,"EndTime":133731.0,"X":44.0,"Y":216.0}]},{"StartTime":133942.0,"Objects":[{"StartTime":133942.0,"EndTime":133942.0,"X":123.0,"Y":249.0}]},{"StartTime":134153.0,"Objects":[{"StartTime":134153.0,"EndTime":134153.0,"X":91.0,"Y":329.0}]},{"StartTime":134364.0,"Objects":[{"StartTime":134364.0,"EndTime":134364.0,"X":11.0,"Y":296.0}]},{"StartTime":134576.0,"Objects":[{"StartTime":134576.0,"EndTime":134576.0,"X":200.0,"Y":268.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":134856.0,"EndTime":134856.0,"X":304.8808,"Y":260.356873,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":134998.0,"Objects":[{"StartTime":134998.0,"EndTime":134998.0,"X":304.0,"Y":260.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":135173.0,"EndTime":135173.0,"X":286.908661,"Y":333.0266,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":135421.0,"Objects":[{"StartTime":135421.0,"EndTime":135421.0,"X":436.0,"Y":348.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":135737.0,"EndTime":135737.0,"X":413.2101,"Y":238.014038,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":136018.0,"EndTime":136018.0,"X":436.0,"Y":348.0,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":136266.0,"Objects":[{"StartTime":136266.0,"EndTime":136266.0,"X":448.0,"Y":168.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":136441.0,"EndTime":136441.0,"X":377.865,"Y":166.693008,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":136688.0,"Objects":[{"StartTime":136688.0,"EndTime":136688.0,"X":232.0,"Y":260.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":136863.0,"EndTime":136863.0,"X":302.135,"Y":261.306976,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":137111.0,"Objects":[{"StartTime":137111.0,"EndTime":137111.0,"X":340.0,"Y":100.0}]},{"StartTime":137322.0,"Objects":[{"StartTime":137322.0,"EndTime":137322.0,"X":268.0,"Y":196.0}]},{"StartTime":137533.0,"Objects":[{"StartTime":137533.0,"EndTime":137533.0,"X":240.0,"Y":48.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":137708.0,"EndTime":137708.0,"X":250.133484,"Y":122.312263,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":137956.0,"Objects":[{"StartTime":137956.0,"EndTime":137956.0,"X":92.0,"Y":44.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":138131.0,"EndTime":138131.0,"X":163.568558,"Y":39.28212,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":138378.0,"Objects":[{"StartTime":138378.0,"EndTime":138378.0,"X":168.0,"Y":180.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":138553.0,"EndTime":138553.0,"X":98.2096,"Y":180.324524,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":138801.0,"Objects":[{"StartTime":138801.0,"EndTime":138801.0,"X":12.0,"Y":56.0}]},{"StartTime":139012.0,"Objects":[{"StartTime":139012.0,"EndTime":139012.0,"X":132.0,"Y":112.0}]},{"StartTime":139223.0,"Objects":[{"StartTime":139223.0,"EndTime":139223.0,"X":44.0,"Y":236.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":139398.0,"EndTime":139398.0,"X":19.9848156,"Y":171.056885,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":139646.0,"Objects":[{"StartTime":139646.0,"EndTime":139646.0,"X":244.0,"Y":172.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":139821.0,"EndTime":139821.0,"X":219.45665,"Y":236.357651,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":140069.0,"Objects":[{"StartTime":140069.0,"EndTime":140069.0,"X":216.0,"Y":104.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":140244.0,"EndTime":140244.0,"X":238.580536,"Y":39.2729034,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":140491.0,"Objects":[{"StartTime":140491.0,"EndTime":140491.0,"X":436.0,"Y":68.0}]},{"StartTime":140702.0,"Objects":[{"StartTime":140702.0,"EndTime":140702.0,"X":289.0,"Y":88.0}]},{"StartTime":140913.0,"Objects":[{"StartTime":140913.0,"EndTime":140913.0,"X":459.0,"Y":156.0}]},{"StartTime":141124.0,"Objects":[{"StartTime":141124.0,"EndTime":141124.0,"X":317.0,"Y":50.0}]},{"StartTime":141336.0,"Objects":[{"StartTime":141336.0,"EndTime":141336.0,"X":336.0,"Y":232.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":141511.0,"EndTime":141511.0,"X":325.956146,"Y":306.324432,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":141759.0,"Objects":[{"StartTime":141759.0,"EndTime":141759.0,"X":468.0,"Y":230.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":141934.0,"EndTime":141934.0,"X":458.0877,"Y":155.6579,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":142181.0,"Objects":[{"StartTime":142181.0,"EndTime":142181.0,"X":436.0,"Y":324.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":142356.0,"EndTime":142356.0,"X":510.4514,"Y":333.0549,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":142604.0,"Objects":[{"StartTime":142604.0,"EndTime":142604.0,"X":336.0,"Y":124.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":142779.0,"EndTime":142779.0,"X":261.534241,"Y":132.9359,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":143026.0,"Objects":[{"StartTime":143026.0,"EndTime":143026.0,"X":210.0,"Y":89.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":143201.0,"EndTime":143201.0,"X":184.922729,"Y":169.4724,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":143343.0,"Objects":[{"StartTime":143343.0,"EndTime":143343.0,"X":261.0,"Y":132.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":143518.0,"EndTime":143518.0,"X":185.715179,"Y":170.3263,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":143660.0,"Objects":[{"StartTime":143660.0,"EndTime":143660.0,"X":256.0,"Y":184.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":143729.0,"EndTime":143729.0,"X":184.960236,"Y":170.093552,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":143871.0,"Objects":[{"StartTime":143871.0,"EndTime":143871.0,"X":124.0,"Y":70.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":144046.0,"EndTime":144046.0,"X":110.185104,"Y":158.9334,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":144188.0,"Objects":[{"StartTime":144188.0,"EndTime":144188.0,"X":96.0,"Y":247.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":144363.0,"EndTime":144363.0,"X":109.814896,"Y":158.0666,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":144505.0,"Objects":[{"StartTime":144505.0,"EndTime":144505.0,"X":184.0,"Y":170.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":144574.0,"EndTime":144574.0,"X":109.964081,"Y":158.013229,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":144716.0,"Objects":[{"StartTime":144716.0,"EndTime":144716.0,"X":261.0,"Y":132.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":144891.0,"EndTime":144891.0,"X":349.75293,"Y":146.9304,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":145033.0,"Objects":[{"StartTime":145033.0,"EndTime":145033.0,"X":336.0,"Y":84.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":145208.0,"EndTime":145208.0,"X":387.835815,"Y":157.573425,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":145350.0,"Objects":[{"StartTime":145350.0,"EndTime":145350.0,"X":428.0,"Y":96.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":145419.0,"EndTime":145419.0,"X":415.2836,"Y":169.9141,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":145562.0,"Objects":[{"StartTime":145562.0,"EndTime":145562.0,"X":411.0,"Y":278.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":145737.0,"EndTime":145737.0,"X":491.462463,"Y":247.365463,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":145878.0,"Objects":[{"StartTime":145878.0,"EndTime":145878.0,"X":324.0,"Y":276.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":146053.0,"EndTime":146053.0,"X":409.8932,"Y":277.2359,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":146195.0,"Objects":[{"StartTime":146195.0,"EndTime":146195.0,"X":252.0,"Y":272.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":146264.0,"EndTime":146264.0,"X":324.1942,"Y":274.656555,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":146407.0,"Objects":[{"StartTime":146407.0,"EndTime":146407.0,"X":317.0,"Y":119.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":146582.0,"EndTime":146582.0,"X":292.912048,"Y":205.716614,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":146724.0,"Objects":[{"StartTime":146724.0,"EndTime":146724.0,"X":240.0,"Y":74.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":146899.0,"EndTime":146899.0,"X":262.5866,"Y":161.11972,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":147040.0,"Objects":[{"StartTime":147040.0,"EndTime":147040.0,"X":166.0,"Y":90.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":147109.0,"EndTime":147109.0,"X":219.407776,"Y":142.655563,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":147252.0,"Objects":[{"StartTime":147252.0,"EndTime":147252.0,"X":170.0,"Y":152.0}]},{"StartTime":147464.0,"Objects":[{"StartTime":147464.0,"EndTime":147464.0,"X":38.0,"Y":120.0}]},{"StartTime":147569.0,"Objects":[{"StartTime":147569.0,"EndTime":147569.0,"X":12.0,"Y":155.0}]},{"StartTime":147675.0,"Objects":[{"StartTime":147675.0,"EndTime":147675.0,"X":2.0,"Y":199.0}]},{"StartTime":147781.0,"Objects":[{"StartTime":147781.0,"EndTime":147781.0,"X":11.0,"Y":242.0}]},{"StartTime":147886.0,"Objects":[{"StartTime":147886.0,"EndTime":147886.0,"X":37.0,"Y":279.0}]},{"StartTime":147992.0,"Objects":[{"StartTime":147992.0,"EndTime":147992.0,"X":75.0,"Y":301.0}]},{"StartTime":148097.0,"Objects":[{"StartTime":148097.0,"EndTime":148097.0,"X":119.0,"Y":304.0}]},{"StartTime":148942.0,"Objects":[{"StartTime":148942.0,"EndTime":148942.0,"X":245.0,"Y":208.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":148977.0,"EndTime":148977.0,"X":264.88504,"Y":197.6252,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":149012.0,"EndTime":149012.0,"X":245.126251,"Y":207.934128,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":149047.0,"EndTime":149047.0,"X":264.7588,"Y":197.691071,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":149082.0,"EndTime":149082.0,"X":245.2525,"Y":207.868256,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":149118.0,"EndTime":149118.0,"X":264.695648,"Y":197.724014,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":149153.0,"EndTime":149153.0,"X":245.189377,"Y":207.901184,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":149188.0,"EndTime":149188.0,"X":264.8219,"Y":197.658142,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":149223.0,"EndTime":149223.0,"X":245.063126,"Y":207.967072,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":149222.0,"EndTime":149222.0,"X":264.948151,"Y":197.59227,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":149364.0,"Objects":[{"StartTime":149364.0,"EndTime":149364.0,"X":232.0,"Y":288.0}]},{"StartTime":149787.0,"Objects":[{"StartTime":149787.0,"EndTime":149787.0,"X":217.0,"Y":38.0}]},{"StartTime":149998.0,"Objects":[{"StartTime":149998.0,"EndTime":149998.0,"X":56.0,"Y":98.0}]},{"StartTime":150209.0,"Objects":[{"StartTime":150209.0,"EndTime":150209.0,"X":155.0,"Y":187.0}]},{"StartTime":150420.0,"Objects":[{"StartTime":150420.0,"EndTime":150420.0,"X":94.0,"Y":26.0}]},{"StartTime":150632.0,"Objects":[{"StartTime":150632.0,"EndTime":150632.0,"X":63.0,"Y":262.0}]},{"StartTime":150843.0,"Objects":[{"StartTime":150843.0,"EndTime":150843.0,"X":257.0,"Y":188.0}]},{"StartTime":151054.0,"Objects":[{"StartTime":151054.0,"EndTime":151054.0,"X":138.0,"Y":82.0}]},{"StartTime":151265.0,"Objects":[{"StartTime":151265.0,"EndTime":151265.0,"X":212.0,"Y":275.0}]},{"StartTime":151477.0,"Objects":[{"StartTime":151477.0,"EndTime":151477.0,"X":288.0,"Y":60.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":151652.0,"EndTime":151652.0,"X":266.524567,"Y":155.1055,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":151899.0,"Objects":[{"StartTime":151899.0,"EndTime":151899.0,"X":204.0,"Y":48.0}]},{"StartTime":152111.0,"Objects":[{"StartTime":152111.0,"EndTime":152111.0,"X":346.0,"Y":175.0}]},{"StartTime":152322.0,"Objects":[{"StartTime":152322.0,"EndTime":152322.0,"X":130.0,"Y":263.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":152497.0,"EndTime":152497.0,"X":151.311874,"Y":167.857727,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":152744.0,"Objects":[{"StartTime":152744.0,"EndTime":152744.0,"X":232.0,"Y":244.0}]},{"StartTime":152956.0,"Objects":[{"StartTime":152956.0,"EndTime":152956.0,"X":56.0,"Y":170.0}]},{"StartTime":153167.0,"Objects":[{"StartTime":153167.0,"EndTime":153167.0,"X":64.0,"Y":352.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":153447.0,"EndTime":153447.0,"X":194.861862,"Y":335.192657,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":153590.0,"Objects":[{"StartTime":153590.0,"EndTime":153590.0,"X":224.0,"Y":348.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":153765.0,"EndTime":153765.0,"X":313.264221,"Y":347.8079,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":154012.0,"Objects":[{"StartTime":154012.0,"EndTime":154012.0,"X":376.0,"Y":140.0}]},{"StartTime":154223.0,"Objects":[{"StartTime":154223.0,"EndTime":154223.0,"X":269.0,"Y":286.0}]},{"StartTime":154435.0,"Objects":[{"StartTime":154435.0,"EndTime":154435.0,"X":441.0,"Y":230.0}]},{"StartTime":154646.0,"Objects":[{"StartTime":154646.0,"EndTime":154646.0,"X":269.0,"Y":173.0}]},{"StartTime":154857.0,"Objects":[{"StartTime":154857.0,"EndTime":154857.0,"X":376.0,"Y":320.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":155032.0,"EndTime":155032.0,"X":465.264221,"Y":319.8079,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":155280.0,"Objects":[{"StartTime":155280.0,"EndTime":155280.0,"X":496.0,"Y":136.0}]},{"StartTime":155491.0,"Objects":[{"StartTime":155491.0,"EndTime":155491.0,"X":420.0,"Y":256.0}]},{"StartTime":155702.0,"Objects":[{"StartTime":155702.0,"EndTime":155702.0,"X":330.0,"Y":80.0}]},{"StartTime":155913.0,"Objects":[{"StartTime":155913.0,"EndTime":155913.0,"X":223.0,"Y":226.0}]},{"StartTime":156125.0,"Objects":[{"StartTime":156125.0,"EndTime":156125.0,"X":395.0,"Y":170.0}]},{"StartTime":156336.0,"Objects":[{"StartTime":156336.0,"EndTime":156336.0,"X":223.0,"Y":113.0}]},{"StartTime":156547.0,"Objects":[{"StartTime":156547.0,"EndTime":156547.0,"X":330.0,"Y":260.0}]},{"StartTime":156759.0,"Objects":[{"StartTime":156759.0,"EndTime":156759.0,"X":408.0,"Y":92.0}]},{"StartTime":156970.0,"Objects":[{"StartTime":156970.0,"EndTime":156970.0,"X":168.0,"Y":168.0}]},{"StartTime":157182.0,"Objects":[{"StartTime":157182.0,"EndTime":157182.0,"X":408.0,"Y":244.0}]},{"StartTime":157392.0,"Objects":[{"StartTime":157392.0,"EndTime":157392.0,"X":256.0,"Y":44.0}]},{"StartTime":157604.0,"Objects":[{"StartTime":157604.0,"EndTime":157604.0,"X":264.0,"Y":296.0}]},{"StartTime":157815.0,"Objects":[{"StartTime":157815.0,"EndTime":157815.0,"X":436.0,"Y":168.0}]},{"StartTime":158027.0,"Objects":[{"StartTime":158027.0,"EndTime":158027.0,"X":188.0,"Y":92.0}]},{"StartTime":158238.0,"Objects":[{"StartTime":158238.0,"EndTime":158238.0,"X":212.0,"Y":336.0}]},{"StartTime":158450.0,"Objects":[{"StartTime":158450.0,"EndTime":158450.0,"X":290.0,"Y":168.0}]},{"StartTime":158661.0,"Objects":[{"StartTime":158661.0,"EndTime":158661.0,"X":50.0,"Y":244.0}]},{"StartTime":158871.0,"Objects":[{"StartTime":158871.0,"EndTime":158871.0,"X":290.0,"Y":320.0}]},{"StartTime":159083.0,"Objects":[{"StartTime":159083.0,"EndTime":159083.0,"X":138.0,"Y":120.0}]},{"StartTime":159295.0,"Objects":[{"StartTime":159295.0,"EndTime":159295.0,"X":146.0,"Y":372.0}]},{"StartTime":159506.0,"Objects":[{"StartTime":159506.0,"EndTime":159506.0,"X":318.0,"Y":244.0}]},{"StartTime":159716.0,"Objects":[{"StartTime":159716.0,"EndTime":159716.0,"X":70.0,"Y":168.0}]},{"StartTime":159928.0,"Objects":[{"StartTime":159928.0,"EndTime":159928.0,"X":324.0,"Y":164.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":160103.0,"EndTime":160103.0,"X":396.4909,"Y":220.798523,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":160350.0,"Objects":[{"StartTime":160350.0,"EndTime":160350.0,"X":291.0,"Y":354.0}]},{"StartTime":160562.0,"Objects":[{"StartTime":160562.0,"EndTime":160562.0,"X":209.0,"Y":190.0}]},{"StartTime":160773.0,"Objects":[{"StartTime":160773.0,"EndTime":160773.0,"X":377.0,"Y":321.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":160948.0,"EndTime":160948.0,"X":290.7343,"Y":353.17215,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":161195.0,"Objects":[{"StartTime":161195.0,"EndTime":161195.0,"X":209.0,"Y":190.0}]},{"StartTime":161407.0,"Objects":[{"StartTime":161407.0,"EndTime":161407.0,"X":396.0,"Y":220.0}]},{"StartTime":161618.0,"Objects":[{"StartTime":161618.0,"EndTime":161618.0,"X":200.0,"Y":283.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":161793.0,"EndTime":161793.0,"X":209.6018,"Y":190.27742,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":162040.0,"Objects":[{"StartTime":162040.0,"EndTime":162040.0,"X":396.0,"Y":221.0}]},{"StartTime":162251.0,"Objects":[{"StartTime":162251.0,"EndTime":162251.0,"X":290.0,"Y":353.0}]},{"StartTime":162463.0,"Objects":[{"StartTime":162463.0,"EndTime":162463.0,"X":264.0,"Y":56.0}]},{"StartTime":162568.0,"Objects":[{"StartTime":162568.0,"EndTime":162568.0,"X":277.0,"Y":102.0}]},{"StartTime":162674.0,"Objects":[{"StartTime":162674.0,"EndTime":162674.0,"X":290.0,"Y":149.0}]},{"StartTime":162779.0,"Objects":[{"StartTime":162779.0,"EndTime":162779.0,"X":304.0,"Y":196.0}]},{"StartTime":162885.0,"Objects":[{"StartTime":162885.0,"EndTime":162885.0,"X":317.0,"Y":243.0}]},{"StartTime":163097.0,"Objects":[{"StartTime":163097.0,"EndTime":163097.0,"X":172.0,"Y":164.0}]},{"StartTime":163308.0,"Objects":[{"StartTime":163308.0,"EndTime":163308.0,"X":416.0,"Y":108.0}]},{"StartTime":163519.0,"Objects":[{"StartTime":163519.0,"EndTime":163519.0,"X":232.0,"Y":91.0}]},{"StartTime":163730.0,"Objects":[{"StartTime":163730.0,"EndTime":163730.0,"X":400.0,"Y":12.0}]},{"StartTime":163941.0,"Objects":[{"StartTime":163941.0,"EndTime":163941.0,"X":383.0,"Y":196.0}]},{"StartTime":164153.0,"Objects":[{"StartTime":164153.0,"EndTime":164153.0,"X":217.0,"Y":0.0}]},{"StartTime":164364.0,"Objects":[{"StartTime":164364.0,"EndTime":164364.0,"X":200.0,"Y":184.0}]},{"StartTime":164575.0,"Objects":[{"StartTime":164575.0,"EndTime":164575.0,"X":313.0,"Y":16.0}]},{"StartTime":164786.0,"Objects":[{"StartTime":164786.0,"EndTime":164786.0,"X":112.0,"Y":32.0}]},{"StartTime":164998.0,"Objects":[{"StartTime":164998.0,"EndTime":164998.0,"X":200.0,"Y":184.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":165173.0,"EndTime":165173.0,"X":205.788208,"Y":91.45287,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":165421.0,"Objects":[{"StartTime":165421.0,"EndTime":165421.0,"X":112.0,"Y":256.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":165596.0,"EndTime":165596.0,"X":106.211784,"Y":348.547119,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":165843.0,"Objects":[{"StartTime":165843.0,"EndTime":165843.0,"X":116.0,"Y":176.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":166018.0,"EndTime":166018.0,"X":23.4528751,"Y":170.211777,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":166266.0,"Objects":[{"StartTime":166266.0,"EndTime":166266.0,"X":196.0,"Y":264.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":166441.0,"EndTime":166441.0,"X":288.547119,"Y":269.7882,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":166688.0,"Objects":[{"StartTime":166688.0,"EndTime":166688.0,"X":248.0,"Y":60.0}]},{"StartTime":166899.0,"Objects":[{"StartTime":166899.0,"EndTime":166899.0,"X":248.0,"Y":201.0}]},{"StartTime":167111.0,"Objects":[{"StartTime":167111.0,"EndTime":167111.0,"X":333.0,"Y":55.0}]},{"StartTime":167322.0,"Objects":[{"StartTime":167322.0,"EndTime":167322.0,"X":248.0,"Y":201.0}]},{"StartTime":167533.0,"Objects":[{"StartTime":167533.0,"EndTime":167533.0,"X":424.0,"Y":101.0}]},{"StartTime":167744.0,"Objects":[{"StartTime":167744.0,"EndTime":167744.0,"X":248.0,"Y":201.0}]},{"StartTime":167956.0,"Objects":[{"StartTime":167956.0,"EndTime":167956.0,"X":468.0,"Y":224.0}]},{"StartTime":168167.0,"Objects":[{"StartTime":168167.0,"EndTime":168167.0,"X":292.0,"Y":124.0}]},{"StartTime":168378.0,"Objects":[{"StartTime":168378.0,"EndTime":168378.0,"X":364.0,"Y":328.0}]},{"StartTime":168589.0,"Objects":[{"StartTime":168589.0,"EndTime":168589.0,"X":364.0,"Y":158.0}]},{"StartTime":168801.0,"Objects":[{"StartTime":168801.0,"EndTime":168801.0,"X":244.0,"Y":304.0}]},{"StartTime":169013.0,"Objects":[{"StartTime":169013.0,"EndTime":169013.0,"X":464.0,"Y":327.0}]},{"StartTime":169224.0,"Objects":[{"StartTime":169224.0,"EndTime":169224.0,"X":192.0,"Y":248.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":169399.0,"EndTime":169399.0,"X":184.99115,"Y":345.247742,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":169646.0,"Objects":[{"StartTime":169646.0,"EndTime":169646.0,"X":508.0,"Y":272.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":169821.0,"EndTime":169821.0,"X":500.99115,"Y":174.752258,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":170068.0,"Objects":[{"StartTime":170068.0,"EndTime":170068.0,"X":268.0,"Y":60.0}]},{"StartTime":170279.0,"Objects":[{"StartTime":170279.0,"EndTime":170279.0,"X":268.0,"Y":257.0}]},{"StartTime":170491.0,"Objects":[{"StartTime":170491.0,"EndTime":170491.0,"X":404.0,"Y":116.0}]},{"StartTime":170702.0,"Objects":[{"StartTime":170702.0,"EndTime":170702.0,"X":207.0,"Y":116.0}]},{"StartTime":170913.0,"Objects":[{"StartTime":170913.0,"EndTime":170913.0,"X":348.0,"Y":267.0}]},{"StartTime":171124.0,"Objects":[{"StartTime":171124.0,"EndTime":171124.0,"X":348.0,"Y":31.0}]},{"StartTime":171336.0,"Objects":[{"StartTime":171336.0,"EndTime":171336.0,"X":192.0,"Y":200.0}]},{"StartTime":171547.0,"Objects":[{"StartTime":171547.0,"EndTime":171547.0,"X":428.0,"Y":200.0}]},{"StartTime":171759.0,"Objects":[{"StartTime":171759.0,"EndTime":171759.0,"X":268.0,"Y":60.0}]},{"StartTime":171970.0,"Objects":[{"StartTime":171970.0,"EndTime":171970.0,"X":386.0,"Y":236.0}]},{"StartTime":172181.0,"Objects":[{"StartTime":172181.0,"EndTime":172181.0,"X":386.0,"Y":11.0}]},{"StartTime":172393.0,"Objects":[{"StartTime":172393.0,"EndTime":172393.0,"X":268.0,"Y":187.0}]},{"StartTime":172604.0,"Objects":[{"StartTime":172604.0,"EndTime":172604.0,"X":149.0,"Y":55.0}]},{"StartTime":172815.0,"Objects":[{"StartTime":172815.0,"EndTime":172815.0,"X":30.0,"Y":231.0}]},{"StartTime":173026.0,"Objects":[{"StartTime":173026.0,"EndTime":173026.0,"X":30.0,"Y":7.0}]},{"StartTime":173238.0,"Objects":[{"StartTime":173238.0,"EndTime":173238.0,"X":149.0,"Y":183.0}]},{"StartTime":173449.0,"Objects":[{"StartTime":173449.0,"EndTime":173449.0,"X":30.0,"Y":7.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":173624.0,"EndTime":173624.0,"X":52.15489,"Y":101.949524,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":173871.0,"Objects":[{"StartTime":173871.0,"EndTime":173871.0,"X":240.0,"Y":64.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":174046.0,"EndTime":174046.0,"X":146.743469,"Y":35.54885,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":174294.0,"Objects":[{"StartTime":174294.0,"EndTime":174294.0,"X":80.0,"Y":216.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":174469.0,"EndTime":174469.0,"X":150.509186,"Y":148.659775,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":174716.0,"Objects":[{"StartTime":174716.0,"EndTime":174716.0,"X":124.0,"Y":280.0}]},{"StartTime":174928.0,"Objects":[{"StartTime":174928.0,"EndTime":174928.0,"X":56.0,"Y":128.0}]},{"StartTime":175139.0,"Objects":[{"StartTime":175139.0,"EndTime":175139.0,"X":216.0,"Y":212.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":175314.0,"EndTime":175314.0,"X":204.150711,"Y":286.058044,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":175562.0,"Objects":[{"StartTime":175562.0,"EndTime":175562.0,"X":296.0,"Y":216.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":175737.0,"EndTime":175737.0,"X":280.708374,"Y":304.6914,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":175984.0,"Objects":[{"StartTime":175984.0,"EndTime":175984.0,"X":376.0,"Y":208.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":176264.0,"EndTime":176264.0,"X":353.806122,"Y":341.1632,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":176406.0,"Objects":[{"StartTime":176406.0,"EndTime":176406.0,"X":356.739136,"Y":344.739136}]},{"StartTime":176618.0,"Objects":[{"StartTime":176618.0,"EndTime":176618.0,"X":320.521729,"Y":136.521729}]},{"StartTime":176723.0,"Objects":[{"StartTime":176723.0,"EndTime":176723.0,"X":324.260864,"Y":140.260864}]},{"StartTime":176829.0,"Objects":[{"StartTime":176829.0,"EndTime":176829.0,"X":328.0,"Y":144.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":177004.0,"EndTime":177004.0,"X":411.899,"Y":139.8616,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":177252.0,"Objects":[{"StartTime":177252.0,"EndTime":177252.0,"X":248.0,"Y":152.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":177427.0,"EndTime":177427.0,"X":164.101013,"Y":156.138382,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":177674.0,"Objects":[{"StartTime":177674.0,"EndTime":177674.0,"X":344.0,"Y":120.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":177849.0,"EndTime":177849.0,"X":427.899,"Y":115.8616,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":178097.0,"Objects":[{"StartTime":178097.0,"EndTime":178097.0,"X":236.0,"Y":168.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":178272.0,"EndTime":178272.0,"X":152.101013,"Y":172.138382,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":178519.0,"Objects":[{"StartTime":178519.0,"EndTime":178519.0,"X":192.0,"Y":272.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":178694.0,"EndTime":178694.0,"X":196.1384,"Y":355.899,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":178942.0,"Objects":[{"StartTime":178942.0,"EndTime":178942.0,"X":152.0,"Y":172.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":179117.0,"EndTime":179117.0,"X":147.8616,"Y":88.10101,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":179364.0,"Objects":[{"StartTime":179364.0,"EndTime":179364.0,"X":228.0,"Y":284.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":179539.0,"EndTime":179539.0,"X":232.1384,"Y":367.899,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":179787.0,"Objects":[{"StartTime":179787.0,"EndTime":179787.0,"X":116.0,"Y":152.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":179962.0,"EndTime":179962.0,"X":111.86161,"Y":68.10102,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":180209.0,"Objects":[{"StartTime":180209.0,"EndTime":180209.0,"X":100.0,"Y":256.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":180384.0,"EndTime":180384.0,"X":16.1010227,"Y":260.1384,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":180632.0,"Objects":[{"StartTime":180632.0,"EndTime":180632.0,"X":240.0,"Y":184.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":180807.0,"EndTime":180807.0,"X":323.899,"Y":179.8616,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":181055.0,"Objects":[{"StartTime":181055.0,"EndTime":181055.0,"X":288.0,"Y":336.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":181230.0,"EndTime":181230.0,"X":284.541016,"Y":246.0665,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":181477.0,"Objects":[{"StartTime":181477.0,"EndTime":181477.0,"X":432.0,"Y":84.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":181652.0,"EndTime":181652.0,"X":423.044678,"Y":173.553345,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":181900.0,"Objects":[{"StartTime":181900.0,"EndTime":181900.0,"X":368.0,"Y":352.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":182075.0,"EndTime":182075.0,"X":364.541016,"Y":262.0665,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":182322.0,"Objects":[{"StartTime":182322.0,"EndTime":182322.0,"X":512.0,"Y":100.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":182497.0,"EndTime":182497.0,"X":503.044678,"Y":189.553345,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":182745.0,"Objects":[{"StartTime":182745.0,"EndTime":182745.0,"X":272.0,"Y":104.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":182920.0,"EndTime":182920.0,"X":361.553345,"Y":112.955338,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":183062.0,"Objects":[{"StartTime":183062.0,"EndTime":183062.0,"X":356.0,"Y":132.0}]},{"StartTime":183167.0,"Objects":[{"StartTime":183167.0,"EndTime":183167.0,"X":352.0,"Y":156.0}]},{"StartTime":183378.0,"Objects":[{"StartTime":183378.0,"EndTime":183378.0,"X":276.0,"Y":20.0}]},{"StartTime":183590.0,"Objects":[{"StartTime":183590.0,"EndTime":183590.0,"X":304.0,"Y":240.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":183765.0,"EndTime":183765.0,"X":220.5027,"Y":243.341385,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":184012.0,"Objects":[{"StartTime":184012.0,"EndTime":184012.0,"X":392.0,"Y":272.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":184187.0,"EndTime":184187.0,"X":436.5039,"Y":342.962158,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":184435.0,"Objects":[{"StartTime":184435.0,"EndTime":184435.0,"X":376.0,"Y":184.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":184610.0,"EndTime":184610.0,"X":413.9991,"Y":109.324722,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":184857.0,"Objects":[{"StartTime":184857.0,"EndTime":184857.0,"X":320.0,"Y":336.0}]},{"StartTime":185069.0,"Objects":[{"StartTime":185069.0,"EndTime":185069.0,"X":260.0,"Y":180.0}]},{"StartTime":185280.0,"Objects":[{"StartTime":185280.0,"EndTime":185280.0,"X":176.0,"Y":304.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":185455.0,"EndTime":185455.0,"X":146.285233,"Y":347.999146,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":185702.0,"Objects":[{"StartTime":185702.0,"EndTime":185702.0,"X":207.0,"Y":176.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":185877.0,"EndTime":185877.0,"X":258.989227,"Y":179.51886,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":186125.0,"Objects":[{"StartTime":186125.0,"EndTime":186125.0,"X":84.0,"Y":224.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":186300.0,"EndTime":186300.0,"X":60.46429,"Y":176.0,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":186547.0,"Objects":[{"StartTime":186547.0,"EndTime":186547.0,"X":244.0,"Y":260.0}]},{"StartTime":186759.0,"Objects":[{"StartTime":186759.0,"EndTime":186759.0,"X":88.0,"Y":300.0}]},{"StartTime":186970.0,"Objects":[{"StartTime":186970.0,"EndTime":186970.0,"X":128.0,"Y":44.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":187145.0,"EndTime":187145.0,"X":133.824356,"Y":148.838348,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":187393.0,"Objects":[{"StartTime":187393.0,"EndTime":187393.0,"X":340.0,"Y":208.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":187568.0,"EndTime":187568.0,"X":345.824341,"Y":103.161659,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":187815.0,"Objects":[{"StartTime":187815.0,"EndTime":187815.0,"X":244.0,"Y":260.0}]},{"StartTime":188026.0,"Objects":[{"StartTime":188026.0,"EndTime":188026.0,"X":424.0,"Y":240.0}]},{"StartTime":188238.0,"Objects":[{"StartTime":188238.0,"EndTime":188238.0,"X":211.0,"Y":244.0}]},{"StartTime":188449.0,"Objects":[{"StartTime":188449.0,"EndTime":188449.0,"X":377.0,"Y":317.0}]},{"StartTime":188660.0,"Objects":[{"StartTime":188660.0,"EndTime":188660.0,"X":196.0,"Y":336.0}]},{"StartTime":188871.0,"Objects":[{"StartTime":188871.0,"EndTime":188871.0,"X":224.0,"Y":154.0}]},{"StartTime":189083.0,"Objects":[{"StartTime":189083.0,"EndTime":189083.0,"X":367.0,"Y":270.0}]},{"StartTime":189294.0,"Objects":[{"StartTime":189294.0,"EndTime":189294.0,"X":132.0,"Y":216.0}]},{"StartTime":189505.0,"Objects":[{"StartTime":189505.0,"EndTime":189505.0,"X":338.0,"Y":135.0}]},{"StartTime":189610.0,"Objects":[{"StartTime":189610.0,"EndTime":189610.0,"X":330.0,"Y":186.0}]},{"StartTime":189716.0,"Objects":[{"StartTime":189716.0,"EndTime":189716.0,"X":322.0,"Y":238.0}]},{"StartTime":189821.0,"Objects":[{"StartTime":189821.0,"EndTime":189821.0,"X":314.0,"Y":290.0}]},{"StartTime":189927.0,"Objects":[{"StartTime":189927.0,"EndTime":189927.0,"X":306.0,"Y":342.0}]},{"StartTime":190139.0,"Objects":[{"StartTime":190139.0,"EndTime":190139.0,"X":228.0,"Y":252.0}]},{"StartTime":190350.0,"Objects":[{"StartTime":190350.0,"EndTime":190350.0,"X":420.0,"Y":216.0}]},{"StartTime":190562.0,"Objects":[{"StartTime":190562.0,"EndTime":190562.0,"X":247.0,"Y":160.0}]},{"StartTime":190773.0,"Objects":[{"StartTime":190773.0,"EndTime":190773.0,"X":406.0,"Y":252.0}]},{"StartTime":190985.0,"Objects":[{"StartTime":190985.0,"EndTime":190985.0,"X":368.0,"Y":74.0}]},{"StartTime":191195.0,"Objects":[{"StartTime":191195.0,"EndTime":191195.0,"X":373.0,"Y":269.0}]},{"StartTime":191407.0,"Objects":[{"StartTime":191407.0,"EndTime":191407.0,"X":507.0,"Y":146.0}]},{"StartTime":191618.0,"Objects":[{"StartTime":191618.0,"EndTime":191618.0,"X":335.0,"Y":271.0}]},{"StartTime":191830.0,"Objects":[{"StartTime":191830.0,"EndTime":191830.0,"X":508.0,"Y":325.0}]},{"StartTime":192040.0,"Objects":[{"StartTime":192040.0,"EndTime":192040.0,"X":219.0,"Y":271.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":192215.0,"EndTime":192215.0,"X":205.632385,"Y":186.8185,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":192463.0,"Objects":[{"StartTime":192463.0,"EndTime":192463.0,"X":279.0,"Y":327.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":192638.0,"EndTime":192638.0,"X":197.296051,"Y":348.666077,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":192885.0,"Objects":[{"StartTime":192885.0,"EndTime":192885.0,"X":335.0,"Y":271.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":193060.0,"EndTime":193060.0,"X":356.590668,"Y":352.7418,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":193308.0,"Objects":[{"StartTime":193308.0,"EndTime":193308.0,"X":279.0,"Y":219.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":193483.0,"EndTime":193483.0,"X":360.7418,"Y":197.409332,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":193731.0,"Objects":[{"StartTime":193731.0,"EndTime":193731.0,"X":108.0,"Y":296.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":194011.0,"EndTime":194011.0,"X":111.138687,"Y":161.0365,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":194153.0,"Objects":[{"StartTime":194153.0,"EndTime":194153.0,"X":72.0,"Y":100.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":194328.0,"EndTime":194328.0,"X":155.1787,"Y":102.726517,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":194576.0,"Objects":[{"StartTime":194576.0,"EndTime":194576.0,"X":24.0,"Y":24.0}]},{"StartTime":194787.0,"Objects":[{"StartTime":194787.0,"EndTime":194787.0,"X":36.0,"Y":168.0}]},{"StartTime":194998.0,"Objects":[{"StartTime":194998.0,"EndTime":194998.0,"X":116.0,"Y":40.0}]},{"StartTime":195209.0,"Objects":[{"StartTime":195209.0,"EndTime":195209.0,"X":184.0,"Y":184.0}]},{"StartTime":195421.0,"Objects":[{"StartTime":195421.0,"EndTime":195421.0,"X":256.0,"Y":56.0}]},{"StartTime":195632.0,"Objects":[{"StartTime":195632.0,"EndTime":195632.0,"X":112.0,"Y":155.0}]},{"StartTime":195843.0,"Objects":[{"StartTime":195843.0,"EndTime":195843.0,"X":276.0,"Y":224.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":196018.0,"EndTime":196018.0,"X":268.203339,"Y":134.338348,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":196266.0,"Objects":[{"StartTime":196266.0,"EndTime":196266.0,"X":160.0,"Y":72.0}]},{"StartTime":196477.0,"Objects":[{"StartTime":196477.0,"EndTime":196477.0,"X":16.0,"Y":171.0}]},{"StartTime":196688.0,"Objects":[{"StartTime":196688.0,"EndTime":196688.0,"X":180.0,"Y":240.0}]},{"StartTime":196899.0,"Objects":[{"StartTime":196899.0,"EndTime":196899.0,"X":72.0,"Y":108.0}]},{"StartTime":197111.0,"Objects":[{"StartTime":197111.0,"EndTime":197111.0,"X":76.0,"Y":328.0}]},{"StartTime":197323.0,"Objects":[{"StartTime":197323.0,"EndTime":197323.0,"X":249.0,"Y":274.0}]},{"StartTime":197534.0,"Objects":[{"StartTime":197534.0,"EndTime":197534.0,"X":83.0,"Y":171.0}]},{"StartTime":197745.0,"Objects":[{"StartTime":197745.0,"EndTime":197745.0,"X":217.0,"Y":295.0}]},{"StartTime":197956.0,"Objects":[{"StartTime":197956.0,"EndTime":197956.0,"X":218.0,"Y":119.0}]},{"StartTime":198168.0,"Objects":[{"StartTime":198168.0,"EndTime":198168.0,"X":179.0,"Y":297.0}]},{"StartTime":198379.0,"Objects":[{"StartTime":198379.0,"EndTime":198379.0,"X":317.0,"Y":223.0}]},{"StartTime":198591.0,"Objects":[{"StartTime":198591.0,"EndTime":198591.0,"X":144.0,"Y":279.0}]},{"StartTime":198801.0,"Objects":[{"StartTime":198801.0,"EndTime":198801.0,"X":295.0,"Y":284.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":198976.0,"EndTime":198976.0,"X":277.349548,"Y":195.747742,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":199224.0,"Objects":[{"StartTime":199224.0,"EndTime":199224.0,"X":489.0,"Y":254.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":199399.0,"EndTime":199399.0,"X":471.349548,"Y":342.252258,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":199646.0,"Objects":[{"StartTime":199646.0,"EndTime":199646.0,"X":277.0,"Y":195.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":199821.0,"EndTime":199821.0,"X":259.349548,"Y":106.747734,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":200069.0,"Objects":[{"StartTime":200069.0,"EndTime":200069.0,"X":506.0,"Y":165.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":200244.0,"EndTime":200244.0,"X":488.349548,"Y":253.252258,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":200491.0,"Objects":[{"StartTime":200491.0,"EndTime":200491.0,"X":301.0,"Y":42.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":200771.0,"EndTime":200771.0,"X":419.8098,"Y":32.4704971,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":200914.0,"Objects":[{"StartTime":200914.0,"EndTime":200914.0,"X":432.0,"Y":52.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":201089.0,"EndTime":201089.0,"X":422.412018,"Y":141.487823,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":201336.0,"Objects":[{"StartTime":201336.0,"EndTime":201336.0,"X":262.0,"Y":226.0}]},{"StartTime":201547.0,"Objects":[{"StartTime":201547.0,"EndTime":201547.0,"X":352.0,"Y":103.0}]},{"StartTime":201759.0,"Objects":[{"StartTime":201759.0,"EndTime":201759.0,"X":352.0,"Y":256.0}]},{"StartTime":201970.0,"Objects":[{"StartTime":201970.0,"EndTime":201970.0,"X":262.0,"Y":132.0}]},{"StartTime":202181.0,"Objects":[{"StartTime":202181.0,"EndTime":202181.0,"X":407.0,"Y":179.0}]},{"StartTime":202393.0,"Objects":[{"StartTime":202393.0,"EndTime":202393.0,"X":240.0,"Y":253.0}]},{"StartTime":202604.0,"Objects":[{"StartTime":202604.0,"EndTime":202604.0,"X":418.0,"Y":291.0}]},{"StartTime":202815.0,"Objects":[{"StartTime":202815.0,"EndTime":202815.0,"X":296.0,"Y":155.0}]},{"StartTime":203026.0,"Objects":[{"StartTime":203026.0,"EndTime":203026.0,"X":315.0,"Y":338.0}]},{"StartTime":203131.0,"Objects":[{"StartTime":203131.0,"EndTime":203131.0,"X":281.0,"Y":308.0}]},{"StartTime":203237.0,"Objects":[{"StartTime":203237.0,"EndTime":203237.0,"X":239.0,"Y":292.0}]},{"StartTime":203342.0,"Objects":[{"StartTime":203342.0,"EndTime":203342.0,"X":195.0,"Y":291.0}]},{"StartTime":203448.0,"Objects":[{"StartTime":203448.0,"EndTime":203448.0,"X":152.0,"Y":306.0}]},{"StartTime":203660.0,"Objects":[{"StartTime":203660.0,"EndTime":203660.0,"X":328.0,"Y":380.0}]},{"StartTime":203871.0,"Objects":[{"StartTime":203871.0,"EndTime":203871.0,"X":312.0,"Y":204.0}]},{"StartTime":204083.0,"Objects":[{"StartTime":204083.0,"EndTime":204083.0,"X":120.0,"Y":266.0}]},{"StartTime":204294.0,"Objects":[{"StartTime":204294.0,"EndTime":204294.0,"X":284.0,"Y":136.0}]},{"StartTime":204506.0,"Objects":[{"StartTime":204506.0,"EndTime":204506.0,"X":241.0,"Y":334.0}]},{"StartTime":204716.0,"Objects":[{"StartTime":204716.0,"EndTime":204716.0,"X":210.0,"Y":130.0}]},{"StartTime":204928.0,"Objects":[{"StartTime":204928.0,"EndTime":204928.0,"X":359.0,"Y":267.0}]},{"StartTime":205139.0,"Objects":[{"StartTime":205139.0,"EndTime":205139.0,"X":152.0,"Y":180.0}]},{"StartTime":205351.0,"Objects":[{"StartTime":205351.0,"EndTime":205351.0,"X":345.0,"Y":120.0}]},{"StartTime":205562.0,"Objects":[{"StartTime":205562.0,"EndTime":205562.0,"X":84.0,"Y":136.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":205737.0,"EndTime":205737.0,"X":83.80006,"Y":221.6485,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":205984.0,"Objects":[{"StartTime":205984.0,"EndTime":205984.0,"X":284.0,"Y":136.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":206159.0,"EndTime":206159.0,"X":284.199921,"Y":50.3514977,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":206407.0,"Objects":[{"StartTime":206407.0,"EndTime":206407.0,"X":184.0,"Y":248.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":206582.0,"EndTime":206582.0,"X":269.6485,"Y":248.199936,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":206829.0,"Objects":[{"StartTime":206829.0,"EndTime":206829.0,"X":180.0,"Y":28.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":207004.0,"EndTime":207004.0,"X":94.3514938,"Y":27.80006,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":207252.0,"Objects":[{"StartTime":207252.0,"EndTime":207252.0,"X":153.0,"Y":305.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":207532.0,"EndTime":207532.0,"X":151.988937,"Y":179.081238,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":207674.0,"Objects":[{"StartTime":207674.0,"EndTime":207674.0,"X":140.0,"Y":160.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":207849.0,"EndTime":207849.0,"X":54.3514977,"Y":159.800079,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":208097.0,"Objects":[{"StartTime":208097.0,"EndTime":208097.0,"X":72.0,"Y":336.0}]},{"StartTime":208308.0,"Objects":[{"StartTime":208308.0,"EndTime":208308.0,"X":256.0,"Y":292.0}]},{"StartTime":208519.0,"Objects":[{"StartTime":208519.0,"EndTime":208519.0,"X":100.0,"Y":224.0}]},{"StartTime":208730.0,"Objects":[{"StartTime":208730.0,"EndTime":208730.0,"X":204.0,"Y":381.0}]},{"StartTime":208942.0,"Objects":[{"StartTime":208942.0,"EndTime":208942.0,"X":351.0,"Y":209.0}]},{"StartTime":209153.0,"Objects":[{"StartTime":209153.0,"EndTime":209153.0,"X":178.0,"Y":305.0}]},{"StartTime":209364.0,"Objects":[{"StartTime":209364.0,"EndTime":209364.0,"X":312.0,"Y":344.0}]},{"StartTime":209576.0,"Objects":[{"StartTime":209576.0,"EndTime":209576.0,"X":217.0,"Y":171.0}]},{"StartTime":209787.0,"Objects":[{"StartTime":209787.0,"EndTime":209787.0,"X":472.0,"Y":144.0}]},{"StartTime":209998.0,"Objects":[{"StartTime":209998.0,"EndTime":209998.0,"X":264.0,"Y":259.0}]},{"StartTime":210209.0,"Objects":[{"StartTime":210209.0,"EndTime":210209.0,"X":425.0,"Y":306.0}]},{"StartTime":210421.0,"Objects":[{"StartTime":210421.0,"EndTime":210421.0,"X":311.0,"Y":98.0}]},{"StartTime":210632.0,"Objects":[{"StartTime":210632.0,"EndTime":210632.0,"X":332.0,"Y":312.0}]},{"StartTime":210843.0,"Objects":[{"StartTime":210843.0,"EndTime":210843.0,"X":396.0,"Y":100.0}]},{"StartTime":211055.0,"Objects":[{"StartTime":211055.0,"EndTime":211055.0,"X":192.0,"Y":160.0}]},{"StartTime":211266.0,"Objects":[{"StartTime":211266.0,"EndTime":211266.0,"X":403.0,"Y":224.0}]},{"StartTime":211477.0,"Objects":[{"StartTime":211477.0,"EndTime":211477.0,"X":328.0,"Y":24.0}]},{"StartTime":211688.0,"Objects":[{"StartTime":211688.0,"EndTime":211688.0,"X":255.0,"Y":267.0}]},{"StartTime":211900.0,"Objects":[{"StartTime":211900.0,"EndTime":211900.0,"X":488.0,"Y":198.0}]},{"StartTime":212111.0,"Objects":[{"StartTime":212111.0,"EndTime":212111.0,"X":247.0,"Y":125.0}]},{"StartTime":212322.0,"Objects":[{"StartTime":212322.0,"EndTime":212322.0,"X":392.0,"Y":312.0}]},{"StartTime":212533.0,"Objects":[{"StartTime":212533.0,"EndTime":212533.0,"X":334.0,"Y":66.0}]},{"StartTime":212745.0,"Objects":[{"StartTime":212745.0,"EndTime":212745.0,"X":342.0,"Y":351.0}]},{"StartTime":212956.0,"Objects":[{"StartTime":212956.0,"EndTime":212956.0,"X":372.0,"Y":100.0}]},{"StartTime":213167.0,"Objects":[{"StartTime":213167.0,"EndTime":213167.0,"X":251.0,"Y":373.0}]},{"StartTime":213378.0,"Objects":[{"StartTime":213378.0,"EndTime":213378.0,"X":402.0,"Y":170.0}]},{"StartTime":213590.0,"Objects":[{"StartTime":213590.0,"EndTime":213590.0,"X":136.0,"Y":327.0}]},{"StartTime":213801.0,"Objects":[{"StartTime":213801.0,"EndTime":213801.0,"X":382.0,"Y":270.0}]},{"StartTime":214012.0,"Objects":[{"StartTime":214012.0,"EndTime":214012.0,"X":212.0,"Y":144.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":214187.0,"EndTime":214187.0,"X":220.116043,"Y":240.231522,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":214435.0,"Objects":[{"StartTime":214435.0,"EndTime":214435.0,"X":152.0,"Y":88.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":214610.0,"EndTime":214610.0,"X":65.05222,"Y":46.2239647,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":214857.0,"Objects":[{"StartTime":214857.0,"EndTime":214857.0,"X":232.0,"Y":64.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":215032.0,"EndTime":215032.0,"X":310.786377,"Y":7.698365,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":215280.0,"Objects":[{"StartTime":215280.0,"EndTime":215280.0,"X":80.0,"Y":120.0}]},{"StartTime":215491.0,"Objects":[{"StartTime":215491.0,"EndTime":215491.0,"X":272.0,"Y":188.0}]},{"StartTime":215702.0,"Objects":[{"StartTime":215702.0,"EndTime":215702.0,"X":192.0,"Y":8.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":215877.0,"EndTime":215877.0,"X":194.429779,"Y":88.99472,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":216125.0,"Objects":[{"StartTime":216125.0,"EndTime":216125.0,"X":384.0,"Y":64.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":216300.0,"EndTime":216300.0,"X":328.026855,"Y":123.368477,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":216547.0,"Objects":[{"StartTime":216547.0,"EndTime":216547.0,"X":432.0,"Y":244.0}]},{"StartTime":216759.0,"Objects":[{"StartTime":216759.0,"EndTime":216759.0,"X":260.0,"Y":264.0}]},{"StartTime":216970.0,"Objects":[{"StartTime":216970.0,"EndTime":216970.0,"X":328.0,"Y":123.0}]},{"StartTime":217075.0,"Objects":[{"StartTime":217075.0,"EndTime":217075.0,"X":333.0,"Y":175.0}]},{"StartTime":217181.0,"Objects":[{"StartTime":217181.0,"EndTime":217181.0,"X":338.0,"Y":227.0}]},{"StartTime":217286.0,"Objects":[{"StartTime":217286.0,"EndTime":217286.0,"X":344.0,"Y":279.0}]},{"StartTime":217392.0,"Objects":[{"StartTime":217392.0,"EndTime":217392.0,"X":349.0,"Y":331.0}]},{"StartTime":218238.0,"Objects":[{"StartTime":218238.0,"EndTime":218238.0,"X":349.0,"Y":331.0}]},{"StartTime":218343.0,"Objects":[{"StartTime":218343.0,"EndTime":218343.0,"X":310.0,"Y":323.0}]},{"StartTime":218449.0,"Objects":[{"StartTime":218449.0,"EndTime":218449.0,"X":273.0,"Y":317.0}]},{"StartTime":218554.0,"Objects":[{"StartTime":218554.0,"EndTime":218554.0,"X":236.0,"Y":312.0}]},{"StartTime":218660.0,"Objects":[{"StartTime":218660.0,"EndTime":218660.0,"X":198.0,"Y":306.0}]},{"StartTime":218765.0,"Objects":[{"StartTime":218765.0,"EndTime":218765.0,"X":253.0,"Y":296.0}]},{"StartTime":218871.0,"Objects":[{"StartTime":218871.0,"EndTime":218871.0,"X":309.0,"Y":287.0}]},{"StartTime":218976.0,"Objects":[{"StartTime":218976.0,"EndTime":218976.0,"X":365.0,"Y":278.0}]},{"StartTime":219082.0,"Objects":[{"StartTime":219082.0,"EndTime":219082.0,"X":421.0,"Y":268.0}]},{"StartTime":219294.0,"Objects":[{"StartTime":219294.0,"EndTime":219294.0,"X":348.0,"Y":92.0}]},{"StartTime":219505.0,"Objects":[{"StartTime":219505.0,"EndTime":219505.0,"X":205.0,"Y":236.0}]},{"StartTime":219717.0,"Objects":[{"StartTime":219717.0,"EndTime":219717.0,"X":381.0,"Y":163.0}]},{"StartTime":219928.0,"Objects":[{"StartTime":219928.0,"EndTime":219928.0,"X":237.0,"Y":24.0}]},{"StartTime":220140.0,"Objects":[{"StartTime":220140.0,"EndTime":220140.0,"X":310.0,"Y":200.0}]},{"StartTime":220350.0,"Objects":[{"StartTime":220350.0,"EndTime":220350.0,"X":449.0,"Y":52.0}]},{"StartTime":220562.0,"Objects":[{"StartTime":220562.0,"EndTime":220562.0,"X":273.0,"Y":125.0}]},{"StartTime":220773.0,"Objects":[{"StartTime":220773.0,"EndTime":220773.0,"X":392.0,"Y":272.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":220948.0,"EndTime":220948.0,"X":493.387451,"Y":282.365265,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":221195.0,"Objects":[{"StartTime":221195.0,"EndTime":221195.0,"X":257.0,"Y":249.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":221370.0,"EndTime":221370.0,"X":168.323166,"Y":298.312439,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":221618.0,"Objects":[{"StartTime":221618.0,"EndTime":221618.0,"X":380.0,"Y":189.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":221793.0,"EndTime":221793.0,"X":421.2337,"Y":95.80929,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":222040.0,"Objects":[{"StartTime":222040.0,"EndTime":222040.0,"X":317.0,"Y":308.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":222215.0,"EndTime":222215.0,"X":392.657227,"Y":376.100861,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":222463.0,"Objects":[{"StartTime":222463.0,"EndTime":222463.0,"X":297.0,"Y":175.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":222743.0,"EndTime":222743.0,"X":252.84137,"Y":29.1527958,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":222885.0,"Objects":[{"StartTime":222885.0,"EndTime":222885.0,"X":253.0,"Y":29.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":223060.0,"EndTime":223060.0,"X":343.9761,"Y":72.90899,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":223308.0,"Objects":[{"StartTime":223308.0,"EndTime":223308.0,"X":168.0,"Y":34.0}]},{"StartTime":223519.0,"Objects":[{"StartTime":223519.0,"EndTime":223519.0,"X":63.0,"Y":216.0}]},{"StartTime":223731.0,"Objects":[{"StartTime":223731.0,"EndTime":223731.0,"X":220.0,"Y":125.0}]},{"StartTime":223942.0,"Objects":[{"StartTime":223942.0,"EndTime":223942.0,"X":10.0,"Y":125.0}]},{"StartTime":224153.0,"Objects":[{"StartTime":224153.0,"EndTime":224153.0,"X":168.0,"Y":216.0}]},{"StartTime":224364.0,"Objects":[{"StartTime":224364.0,"EndTime":224364.0,"X":63.0,"Y":34.0}]},{"StartTime":224576.0,"Objects":[{"StartTime":224576.0,"EndTime":224576.0,"X":0.0,"Y":264.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":224751.0,"EndTime":224751.0,"X":93.40772,"Y":288.831,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":224998.0,"Objects":[{"StartTime":224998.0,"EndTime":224998.0,"X":144.0,"Y":140.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":225067.0,"EndTime":225067.0,"X":149.111465,"Y":87.74942,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":225209.0,"Objects":[{"StartTime":225209.0,"EndTime":225209.0,"X":208.0,"Y":304.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":225278.0,"EndTime":225278.0,"X":201.982239,"Y":356.153961,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":225421.0,"Objects":[{"StartTime":225421.0,"EndTime":225421.0,"X":256.0,"Y":144.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":225490.0,"EndTime":225490.0,"X":261.111481,"Y":91.74942,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":225632.0,"Objects":[{"StartTime":225632.0,"EndTime":225632.0,"X":320.0,"Y":308.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":225701.0,"EndTime":225701.0,"X":313.982239,"Y":360.153961,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":225843.0,"Objects":[{"StartTime":225843.0,"EndTime":225843.0,"X":425.0,"Y":265.0}]},{"StartTime":226055.0,"Objects":[{"StartTime":226055.0,"EndTime":226055.0,"X":256.0,"Y":188.0}]},{"StartTime":226266.0,"Objects":[{"StartTime":226266.0,"EndTime":226266.0,"X":425.0,"Y":102.0}]},{"StartTime":226477.0,"Objects":[{"StartTime":226477.0,"EndTime":226477.0,"X":299.0,"Y":248.0}]},{"StartTime":226688.0,"Objects":[{"StartTime":226688.0,"EndTime":226688.0,"X":271.0,"Y":53.0}]},{"StartTime":226900.0,"Objects":[{"StartTime":226900.0,"EndTime":226900.0,"X":369.0,"Y":225.0}]},{"StartTime":227111.0,"Objects":[{"StartTime":227111.0,"EndTime":227111.0,"X":176.0,"Y":183.0}]},{"StartTime":227322.0,"Objects":[{"StartTime":227322.0,"EndTime":227322.0,"X":369.0,"Y":151.0}]},{"StartTime":227533.0,"Objects":[{"StartTime":227533.0,"EndTime":227533.0,"X":274.0,"Y":339.0}]},{"StartTime":227745.0,"Objects":[{"StartTime":227745.0,"EndTime":227745.0,"X":307.0,"Y":116.0}]},{"StartTime":227956.0,"Objects":[{"StartTime":227956.0,"EndTime":227956.0,"X":458.0,"Y":279.0}]},{"StartTime":228168.0,"Objects":[{"StartTime":228168.0,"EndTime":228168.0,"X":256.0,"Y":187.0}]},{"StartTime":228379.0,"Objects":[{"StartTime":228379.0,"EndTime":228379.0,"X":458.0,"Y":83.0}]},{"StartTime":228590.0,"Objects":[{"StartTime":228590.0,"EndTime":228590.0,"X":308.0,"Y":256.0}]},{"StartTime":228801.0,"Objects":[{"StartTime":228801.0,"EndTime":228801.0,"X":274.0,"Y":25.0}]},{"StartTime":229013.0,"Objects":[{"StartTime":229013.0,"EndTime":229013.0,"X":391.0,"Y":231.0}]},{"StartTime":229224.0,"Objects":[{"StartTime":229224.0,"EndTime":229224.0,"X":160.0,"Y":181.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":229399.0,"EndTime":229399.0,"X":175.200348,"Y":84.64736,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":229646.0,"Objects":[{"StartTime":229646.0,"EndTime":229646.0,"X":257.0,"Y":263.0}]},{"StartTime":229858.0,"Objects":[{"StartTime":229858.0,"EndTime":229858.0,"X":288.0,"Y":39.0}]},{"StartTime":230069.0,"Objects":[{"StartTime":230069.0,"EndTime":230069.0,"X":348.0,"Y":227.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":230244.0,"EndTime":230244.0,"X":257.087128,"Y":263.065033,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":230491.0,"Objects":[{"StartTime":230491.0,"EndTime":230491.0,"X":366.0,"Y":100.0}]},{"StartTime":230703.0,"Objects":[{"StartTime":230703.0,"EndTime":230703.0,"X":160.0,"Y":181.0}]},{"StartTime":230914.0,"Objects":[{"StartTime":230914.0,"EndTime":230914.0,"X":288.0,"Y":39.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":231089.0,"EndTime":231089.0,"X":366.498749,"Y":100.621391,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":231336.0,"Objects":[{"StartTime":231336.0,"EndTime":231336.0,"X":175.0,"Y":84.0}]},{"StartTime":231547.0,"Objects":[{"StartTime":231547.0,"EndTime":231547.0,"X":348.0,"Y":227.0}]},{"StartTime":231759.0,"Objects":[{"StartTime":231759.0,"EndTime":231759.0,"X":184.0,"Y":336.0}]},{"StartTime":231864.0,"Objects":[{"StartTime":231864.0,"EndTime":231864.0,"X":181.0,"Y":283.0}]},{"StartTime":231970.0,"Objects":[{"StartTime":231970.0,"EndTime":231970.0,"X":179.0,"Y":231.0}]},{"StartTime":232075.0,"Objects":[{"StartTime":232075.0,"EndTime":232075.0,"X":176.0,"Y":178.0}]},{"StartTime":232181.0,"Objects":[{"StartTime":232181.0,"EndTime":232181.0,"X":174.0,"Y":126.0}]},{"StartTime":232393.0,"Objects":[{"StartTime":232393.0,"EndTime":232393.0,"X":366.0,"Y":100.0}]},{"StartTime":232604.0,"Objects":[{"StartTime":232604.0,"EndTime":232604.0,"X":268.0,"Y":228.0}]},{"StartTime":232815.0,"Objects":[{"StartTime":232815.0,"EndTime":232815.0,"X":412.0,"Y":280.0}]},{"StartTime":233026.0,"Objects":[{"StartTime":233026.0,"EndTime":233026.0,"X":268.0,"Y":188.0}]},{"StartTime":233237.0,"Objects":[{"StartTime":233237.0,"EndTime":233237.0,"X":451.0,"Y":187.0}]},{"StartTime":233449.0,"Objects":[{"StartTime":233449.0,"EndTime":233449.0,"X":256.0,"Y":152.0}]},{"StartTime":233660.0,"Objects":[{"StartTime":233660.0,"EndTime":233660.0,"X":473.0,"Y":113.0}]},{"StartTime":233871.0,"Objects":[{"StartTime":233871.0,"EndTime":233871.0,"X":328.0,"Y":248.0}]},{"StartTime":234082.0,"Objects":[{"StartTime":234082.0,"EndTime":234082.0,"X":289.0,"Y":31.0}]},{"StartTime":234294.0,"Objects":[{"StartTime":234294.0,"EndTime":234294.0,"X":192.0,"Y":204.0}]},{"StartTime":234505.0,"Objects":[{"StartTime":234505.0,"EndTime":234505.0,"X":410.0,"Y":241.0}]},{"StartTime":234716.0,"Objects":[{"StartTime":234716.0,"EndTime":234716.0,"X":112.0,"Y":188.0}]},{"StartTime":234927.0,"Objects":[{"StartTime":234927.0,"EndTime":234927.0,"X":305.0,"Y":297.0}]},{"StartTime":235139.0,"Objects":[{"StartTime":235139.0,"EndTime":235139.0,"X":36.0,"Y":176.0}]},{"StartTime":235350.0,"Objects":[{"StartTime":235350.0,"EndTime":235350.0,"X":181.0,"Y":344.0}]},{"StartTime":235562.0,"Objects":[{"StartTime":235562.0,"EndTime":235562.0,"X":252.0,"Y":136.0}]},{"StartTime":235773.0,"Objects":[{"StartTime":235773.0,"EndTime":235773.0,"X":84.0,"Y":281.0}]},{"StartTime":235984.0,"Objects":[{"StartTime":235984.0,"EndTime":235984.0,"X":316.0,"Y":188.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":236159.0,"EndTime":236159.0,"X":320.0774,"Y":88.93266,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":236407.0,"Objects":[{"StartTime":236407.0,"EndTime":236407.0,"X":328.0,"Y":268.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":236582.0,"EndTime":236582.0,"X":399.9171,"Y":200.393,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":236829.0,"Objects":[{"StartTime":236829.0,"EndTime":236829.0,"X":276.0,"Y":333.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":237004.0,"EndTime":237004.0,"X":374.878357,"Y":336.5995,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":237252.0,"Objects":[{"StartTime":237252.0,"EndTime":237252.0,"X":316.0,"Y":188.0}]},{"StartTime":237463.0,"Objects":[{"StartTime":237463.0,"EndTime":237463.0,"X":204.0,"Y":296.0}]},{"StartTime":237674.0,"Objects":[{"StartTime":237674.0,"EndTime":237674.0,"X":452.0,"Y":336.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":237849.0,"EndTime":237849.0,"X":469.90686,"Y":232.5382,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":238097.0,"Objects":[{"StartTime":238097.0,"EndTime":238097.0,"X":209.0,"Y":104.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":238272.0,"EndTime":238272.0,"X":227.870361,"Y":207.290421,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":238519.0,"Objects":[{"StartTime":238519.0,"EndTime":238519.0,"X":425.0,"Y":45.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":238588.0,"EndTime":238588.0,"X":477.25058,"Y":50.11147,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":238731.0,"Objects":[{"StartTime":238731.0,"EndTime":238731.0,"X":421.0,"Y":157.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":238800.0,"EndTime":238800.0,"X":473.25058,"Y":162.111465,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":238942.0,"Objects":[{"StartTime":238942.0,"EndTime":238942.0,"X":227.0,"Y":207.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":239011.0,"EndTime":239011.0,"X":174.833221,"Y":201.09433,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":239153.0,"Objects":[{"StartTime":239153.0,"EndTime":239153.0,"X":223.0,"Y":319.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":239222.0,"EndTime":239222.0,"X":170.833221,"Y":313.09433,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":239364.0,"Objects":[{"StartTime":239364.0,"EndTime":239364.0,"X":475.0,"Y":370.0}]},{"StartTime":239576.0,"Objects":[{"StartTime":239576.0,"EndTime":239576.0,"X":496.0,"Y":228.0}]},{"StartTime":239787.0,"Objects":[{"StartTime":239787.0,"EndTime":239787.0,"X":380.0,"Y":344.0}]},{"StartTime":239999.0,"Objects":[{"StartTime":239999.0,"EndTime":239999.0,"X":405.0,"Y":173.0}]},{"StartTime":240209.0,"Objects":[{"StartTime":240209.0,"EndTime":240209.0,"X":272.0,"Y":320.0}]},{"StartTime":240421.0,"Objects":[{"StartTime":240421.0,"EndTime":240421.0,"X":302.0,"Y":114.0}]},{"StartTime":240632.0,"Objects":[{"StartTime":240632.0,"EndTime":240632.0,"X":156.0,"Y":300.0}]},{"StartTime":240844.0,"Objects":[{"StartTime":240844.0,"EndTime":240844.0,"X":192.0,"Y":52.0}]},{"StartTime":241055.0,"Objects":[{"StartTime":241055.0,"EndTime":241055.0,"X":20.0,"Y":164.0}]},{"StartTime":241267.0,"Objects":[{"StartTime":241267.0,"EndTime":241267.0,"X":252.0,"Y":84.0}]},{"StartTime":241477.0,"Objects":[{"StartTime":241477.0,"EndTime":241477.0,"X":40.0,"Y":8.0}]},{"StartTime":241689.0,"Objects":[{"StartTime":241689.0,"EndTime":241689.0,"X":240.0,"Y":164.0}]},{"StartTime":241900.0,"Objects":[{"StartTime":241900.0,"EndTime":241900.0,"X":116.0,"Y":28.0}]},{"StartTime":242111.0,"Objects":[{"StartTime":242111.0,"EndTime":242111.0,"X":80.0,"Y":274.0}]},{"StartTime":242322.0,"Objects":[{"StartTime":242322.0,"EndTime":242322.0,"X":32.0,"Y":88.0}]},{"StartTime":242534.0,"Objects":[{"StartTime":242534.0,"EndTime":242534.0,"X":227.0,"Y":242.0}]},{"StartTime":242745.0,"Objects":[{"StartTime":242745.0,"EndTime":242745.0,"X":218.0,"Y":61.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":242920.0,"EndTime":242920.0,"X":239.304214,"Y":163.81601,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":243167.0,"Objects":[{"StartTime":243167.0,"EndTime":243167.0,"X":131.0,"Y":120.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":243342.0,"EndTime":243342.0,"X":31.3882523,"Y":86.79608,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":243590.0,"Objects":[{"StartTime":243590.0,"EndTime":243590.0,"X":292.0,"Y":32.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":243765.0,"EndTime":243765.0,"X":313.30423,"Y":134.81601,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":244012.0,"Objects":[{"StartTime":244012.0,"EndTime":244012.0,"X":132.0,"Y":204.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":244187.0,"EndTime":244187.0,"X":32.3882523,"Y":170.796082,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":244435.0,"Objects":[{"StartTime":244435.0,"EndTime":244435.0,"X":368.0,"Y":4.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":244821.0,"EndTime":244821.0,"X":393.857056,"Y":151.754578,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":245280.0,"Objects":[{"StartTime":245280.0,"EndTime":245280.0,"X":136.0,"Y":288.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":245560.0,"EndTime":245560.0,"X":28.55529,"Y":254.65509,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":245702.0,"Objects":[{"StartTime":245702.0,"EndTime":245702.0,"X":31.7391319,"Y":257.739136}]},{"StartTime":245914.0,"Objects":[{"StartTime":245914.0,"EndTime":245914.0,"X":196.521729,"Y":236.521729}]},{"StartTime":246020.0,"Objects":[{"StartTime":246020.0,"EndTime":246020.0,"X":200.260864,"Y":240.260864}]},{"StartTime":246125.0,"Objects":[{"StartTime":246125.0,"EndTime":246125.0,"X":204.0,"Y":244.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":246300.0,"EndTime":246300.0,"X":198.885376,"Y":339.263245,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":246547.0,"Objects":[{"StartTime":246547.0,"EndTime":246547.0,"X":100.0,"Y":188.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":246722.0,"EndTime":246722.0,"X":93.48614,"Y":92.7003,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":246970.0,"Objects":[{"StartTime":246970.0,"EndTime":246970.0,"X":120.0,"Y":272.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":247145.0,"EndTime":247145.0,"X":24.73676,"Y":266.885345,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":247393.0,"Objects":[{"StartTime":247393.0,"EndTime":247393.0,"X":176.0,"Y":160.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":247568.0,"EndTime":247568.0,"X":271.263245,"Y":165.114624,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":247815.0,"Objects":[{"StartTime":247815.0,"EndTime":247815.0,"X":277.0,"Y":260.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":247990.0,"EndTime":247990.0,"X":270.486145,"Y":164.7003,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":248238.0,"Objects":[{"StartTime":248238.0,"EndTime":248238.0,"X":357.0,"Y":288.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":248413.0,"EndTime":248413.0,"X":276.222839,"Y":340.022369,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":248660.0,"Objects":[{"StartTime":248660.0,"EndTime":248660.0,"X":341.0,"Y":208.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":248835.0,"EndTime":248835.0,"X":425.827118,"Y":250.5753,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":249083.0,"Objects":[{"StartTime":249083.0,"EndTime":249083.0,"X":276.0,"Y":340.0}]},{"StartTime":249294.0,"Objects":[{"StartTime":249294.0,"EndTime":249294.0,"X":341.0,"Y":208.0}]},{"StartTime":249505.0,"Objects":[{"StartTime":249505.0,"EndTime":249505.0,"X":200.0,"Y":120.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":249680.0,"EndTime":249680.0,"X":101.756859,"Y":119.9113,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":249928.0,"Objects":[{"StartTime":249928.0,"EndTime":249928.0,"X":64.0,"Y":300.0}]},{"StartTime":250139.0,"Objects":[{"StartTime":250139.0,"EndTime":250139.0,"X":152.0,"Y":176.0}]},{"StartTime":250350.0,"Objects":[{"StartTime":250350.0,"EndTime":250350.0,"X":12.0,"Y":196.0}]},{"StartTime":250561.0,"Objects":[{"StartTime":250561.0,"EndTime":250561.0,"X":164.0,"Y":210.0}]},{"StartTime":250773.0,"Objects":[{"StartTime":250773.0,"EndTime":250773.0,"X":32.0,"Y":88.0}]},{"StartTime":250984.0,"Objects":[{"StartTime":250984.0,"EndTime":250984.0,"X":49.0,"Y":269.0}]},{"StartTime":251195.0,"Objects":[{"StartTime":251195.0,"EndTime":251195.0,"X":218.0,"Y":129.0}]},{"StartTime":251406.0,"Objects":[{"StartTime":251406.0,"EndTime":251406.0,"X":293.0,"Y":294.0}]},{"StartTime":251618.0,"Objects":[{"StartTime":251618.0,"EndTime":251618.0,"X":341.0,"Y":84.0}]},{"StartTime":251829.0,"Objects":[{"StartTime":251829.0,"EndTime":251829.0,"X":164.0,"Y":210.0}]},{"StartTime":252040.0,"Objects":[{"StartTime":252040.0,"EndTime":252040.0,"X":400.0,"Y":176.0}]},{"StartTime":252251.0,"Objects":[{"StartTime":252251.0,"EndTime":252251.0,"X":232.0,"Y":80.0}]},{"StartTime":252463.0,"Objects":[{"StartTime":252463.0,"EndTime":252463.0,"X":340.0,"Y":272.0}]},{"StartTime":252674.0,"Objects":[{"StartTime":252674.0,"EndTime":252674.0,"X":456.0,"Y":80.0}]},{"StartTime":252885.0,"Objects":[{"StartTime":252885.0,"EndTime":252885.0,"X":452.0,"Y":316.0}]},{"StartTime":253307.0,"Objects":[{"StartTime":253307.0,"EndTime":253307.0,"X":452.0,"Y":316.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":253482.0,"EndTime":253482.0,"X":474.438171,"Y":213.4255,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":253730.0,"Objects":[{"StartTime":253730.0,"EndTime":253730.0,"X":284.0,"Y":220.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":253905.0,"EndTime":253905.0,"X":306.438171,"Y":117.4255,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":254153.0,"Objects":[{"StartTime":254153.0,"EndTime":254153.0,"X":116.0,"Y":132.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":254328.0,"EndTime":254328.0,"X":138.438171,"Y":29.425499,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":254576.0,"Objects":[{"StartTime":254576.0,"EndTime":254576.0,"X":36.0,"Y":236.0}]},{"StartTime":254998.0,"Objects":[{"StartTime":254998.0,"EndTime":254998.0,"X":36.0,"Y":236.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":255173.0,"EndTime":255173.0,"X":111.50975,"Y":251.103058,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":255421.0,"Objects":[{"StartTime":255421.0,"EndTime":255421.0,"X":204.0,"Y":152.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":255596.0,"EndTime":255596.0,"X":279.509766,"Y":167.103058,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":255843.0,"Objects":[{"StartTime":255843.0,"EndTime":255843.0,"X":356.0,"Y":56.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":256018.0,"EndTime":256018.0,"X":431.509766,"Y":71.10306,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":256266.0,"Objects":[{"StartTime":256266.0,"EndTime":256266.0,"X":356.0,"Y":204.0}]},{"StartTime":256688.0,"Objects":[{"StartTime":256688.0,"EndTime":256688.0,"X":356.0,"Y":204.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":256863.0,"EndTime":256863.0,"X":358.602356,"Y":299.339142,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":257111.0,"Objects":[{"StartTime":257111.0,"EndTime":257111.0,"X":252.0,"Y":184.0}]},{"StartTime":257322.0,"Objects":[{"StartTime":257322.0,"EndTime":257322.0,"X":296.0,"Y":340.0}]},{"StartTime":257533.0,"Objects":[{"StartTime":257533.0,"EndTime":257533.0,"X":192.0,"Y":272.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":257708.0,"EndTime":257708.0,"X":295.660339,"Y":255.2806,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":257956.0,"Objects":[{"StartTime":257956.0,"EndTime":257956.0,"X":117.0,"Y":119.0}]},{"StartTime":258167.0,"Objects":[{"StartTime":258167.0,"EndTime":258167.0,"X":285.0,"Y":31.0}]},{"StartTime":258378.0,"Objects":[{"StartTime":258378.0,"EndTime":258378.0,"X":137.0,"Y":31.0}]},{"StartTime":258589.0,"Objects":[{"StartTime":258589.0,"EndTime":258589.0,"X":305.0,"Y":119.0}]},{"StartTime":258801.0,"Objects":[{"StartTime":258801.0,"EndTime":258801.0,"X":49.0,"Y":55.0}]},{"StartTime":258906.0,"Objects":[{"StartTime":258906.0,"EndTime":258906.0,"X":26.0,"Y":101.0}]},{"StartTime":259012.0,"Objects":[{"StartTime":259012.0,"EndTime":259012.0,"X":32.0,"Y":153.0}]},{"StartTime":259117.0,"Objects":[{"StartTime":259117.0,"EndTime":259117.0,"X":64.0,"Y":194.0}]},{"StartTime":259223.0,"Objects":[{"StartTime":259223.0,"EndTime":259223.0,"X":112.0,"Y":212.0}]},{"StartTime":259435.0,"Objects":[{"StartTime":259435.0,"EndTime":259435.0,"X":255.0,"Y":75.0}]},{"StartTime":259646.0,"Objects":[{"StartTime":259646.0,"EndTime":259646.0,"X":240.0,"Y":252.0}]},{"StartTime":259857.0,"Objects":[{"StartTime":259857.0,"EndTime":259857.0,"X":112.0,"Y":212.0}]},{"StartTime":260068.0,"Objects":[{"StartTime":260068.0,"EndTime":260068.0,"X":236.0,"Y":330.0}]},{"StartTime":260280.0,"Objects":[{"StartTime":260280.0,"EndTime":260280.0,"X":114.0,"Y":133.0}]},{"StartTime":260491.0,"Objects":[{"StartTime":260491.0,"EndTime":260491.0,"X":146.0,"Y":308.0}]},{"StartTime":260702.0,"Objects":[{"StartTime":260702.0,"EndTime":260702.0,"X":204.0,"Y":154.0}]},{"StartTime":260914.0,"Objects":[{"StartTime":260914.0,"EndTime":260914.0,"X":51.0,"Y":304.0}]},{"StartTime":261125.0,"Objects":[{"StartTime":261125.0,"EndTime":261125.0,"X":298.0,"Y":156.0}]},{"StartTime":261336.0,"Objects":[{"StartTime":261336.0,"EndTime":261336.0,"X":28.0,"Y":232.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":261511.0,"EndTime":261511.0,"X":26.3694744,"Y":134.648315,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":261759.0,"Objects":[{"StartTime":261759.0,"EndTime":261759.0,"X":320.0,"Y":228.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":261934.0,"EndTime":261934.0,"X":321.6305,"Y":325.351685,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":262181.0,"Objects":[{"StartTime":262181.0,"EndTime":262181.0,"X":64.0,"Y":208.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":262356.0,"EndTime":262356.0,"X":59.4033928,"Y":109.17572,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":262604.0,"Objects":[{"StartTime":262604.0,"EndTime":262604.0,"X":364.0,"Y":248.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":262779.0,"EndTime":262779.0,"X":367.656372,"Y":346.437134,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":263026.0,"Objects":[{"StartTime":263026.0,"EndTime":263026.0,"X":484.0,"Y":148.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":263306.0,"EndTime":263306.0,"X":348.198273,"Y":146.574341,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":263449.0,"Objects":[{"StartTime":263449.0,"EndTime":263449.0,"X":315.0,"Y":131.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":263624.0,"EndTime":263624.0,"X":216.875748,"Y":124.6084,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":263871.0,"Objects":[{"StartTime":263871.0,"EndTime":263871.0,"X":192.0,"Y":300.0}]},{"StartTime":264083.0,"Objects":[{"StartTime":264083.0,"EndTime":264083.0,"X":264.0,"Y":188.0}]},{"StartTime":264294.0,"Objects":[{"StartTime":264294.0,"EndTime":264294.0,"X":172.0,"Y":208.0}]},{"StartTime":264506.0,"Objects":[{"StartTime":264506.0,"EndTime":264506.0,"X":284.0,"Y":280.0}]},{"StartTime":264716.0,"Objects":[{"StartTime":264716.0,"EndTime":264716.0,"X":160.0,"Y":44.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":264996.0,"EndTime":264996.0,"X":161.425659,"Y":179.801727,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":265139.0,"Objects":[{"StartTime":265139.0,"EndTime":265139.0,"X":172.0,"Y":208.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":265314.0,"EndTime":265314.0,"X":163.511826,"Y":305.6148,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":265562.0,"Objects":[{"StartTime":265562.0,"EndTime":265562.0,"X":104.0,"Y":252.0}]},{"StartTime":265773.0,"Objects":[{"StartTime":265773.0,"EndTime":265773.0,"X":264.0,"Y":352.0}]},{"StartTime":265984.0,"Objects":[{"StartTime":265984.0,"EndTime":265984.0,"X":76.0,"Y":352.0}]},{"StartTime":266195.0,"Objects":[{"StartTime":266195.0,"EndTime":266195.0,"X":248.0,"Y":252.0}]},{"StartTime":266407.0,"Objects":[{"StartTime":266407.0,"EndTime":266407.0,"X":132.0,"Y":112.0}]},{"StartTime":266618.0,"Objects":[{"StartTime":266618.0,"EndTime":266618.0,"X":22.0,"Y":288.0}]},{"StartTime":266829.0,"Objects":[{"StartTime":266829.0,"EndTime":266829.0,"X":22.0,"Y":81.0}]},{"StartTime":267040.0,"Objects":[{"StartTime":267040.0,"EndTime":267040.0,"X":132.0,"Y":270.0}]},{"StartTime":267252.0,"Objects":[{"StartTime":267252.0,"EndTime":267252.0,"X":240.0,"Y":112.0}]},{"StartTime":267463.0,"Objects":[{"StartTime":267463.0,"EndTime":267463.0,"X":350.0,"Y":288.0}]},{"StartTime":267674.0,"Objects":[{"StartTime":267674.0,"EndTime":267674.0,"X":350.0,"Y":81.0}]},{"StartTime":267885.0,"Objects":[{"StartTime":267885.0,"EndTime":267885.0,"X":240.0,"Y":270.0}]},{"StartTime":268097.0,"Objects":[{"StartTime":268097.0,"EndTime":268097.0,"X":512.0,"Y":212.0}]},{"StartTime":268308.0,"Objects":[{"StartTime":268308.0,"EndTime":268308.0,"X":290.0,"Y":94.0}]},{"StartTime":268519.0,"Objects":[{"StartTime":268519.0,"EndTime":268519.0,"X":415.0,"Y":310.0}]},{"StartTime":268730.0,"Objects":[{"StartTime":268730.0,"EndTime":268730.0,"X":417.0,"Y":47.0}]},{"StartTime":268942.0,"Objects":[{"StartTime":268942.0,"EndTime":268942.0,"X":168.0,"Y":180.0}]},{"StartTime":269153.0,"Objects":[{"StartTime":269153.0,"EndTime":269153.0,"X":416.0,"Y":214.0}]},{"StartTime":269364.0,"Objects":[{"StartTime":269364.0,"EndTime":269364.0,"X":225.0,"Y":54.0}]},{"StartTime":269576.0,"Objects":[{"StartTime":269576.0,"EndTime":269576.0,"X":313.0,"Y":302.0}]},{"StartTime":269787.0,"Objects":[{"StartTime":269787.0,"EndTime":269787.0,"X":376.0,"Y":172.0}]},{"StartTime":269998.0,"Objects":[{"StartTime":269998.0,"EndTime":269998.0,"X":177.0,"Y":242.0}]},{"StartTime":270209.0,"Objects":[{"StartTime":270209.0,"EndTime":270209.0,"X":345.0,"Y":147.0}]},{"StartTime":270420.0,"Objects":[{"StartTime":270420.0,"EndTime":270420.0,"X":215.0,"Y":254.0}]},{"StartTime":270632.0,"Objects":[{"StartTime":270632.0,"EndTime":270632.0,"X":325.0,"Y":146.0}]},{"StartTime":270843.0,"Objects":[{"StartTime":270843.0,"EndTime":270843.0,"X":237.0,"Y":249.0}]},{"StartTime":271055.0,"Objects":[{"StartTime":271055.0,"EndTime":271055.0,"X":333.0,"Y":238.0}]},{"StartTime":271266.0,"Objects":[{"StartTime":271266.0,"EndTime":271266.0,"X":230.0,"Y":151.0}]},{"StartTime":271477.0,"Objects":[{"StartTime":271477.0,"EndTime":271477.0,"X":292.0,"Y":312.0}]},{"StartTime":271583.0,"Objects":[{"StartTime":271583.0,"EndTime":272745.0,"X":256.0,"Y":192.0}]},{"StartTime":273167.0,"Objects":[{"StartTime":273167.0,"EndTime":273167.0,"X":163.0,"Y":256.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":273342.0,"EndTime":273342.0,"X":78.18209,"Y":248.905472,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":273590.0,"Objects":[{"StartTime":273590.0,"EndTime":273590.0,"X":68.0,"Y":364.0}]},{"StartTime":273801.0,"Objects":[{"StartTime":273801.0,"EndTime":273801.0,"X":236.0,"Y":324.0}]},{"StartTime":274012.0,"Objects":[{"StartTime":274012.0,"EndTime":274012.0,"X":79.0,"Y":249.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":274187.0,"EndTime":274187.0,"X":88.9388351,"Y":159.550461,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":274435.0,"Objects":[{"StartTime":274435.0,"EndTime":274435.0,"X":280.0,"Y":264.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":274610.0,"EndTime":274610.0,"X":289.938843,"Y":353.449524,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":274857.0,"Objects":[{"StartTime":274857.0,"EndTime":274857.0,"X":420.0,"Y":130.0}]},{"StartTime":275068.0,"Objects":[{"StartTime":275068.0,"EndTime":275068.0,"X":373.0,"Y":261.0}]},{"StartTime":275279.0,"Objects":[{"StartTime":275279.0,"EndTime":275279.0,"X":512.0,"Y":227.0}]},{"StartTime":275491.0,"Objects":[{"StartTime":275491.0,"EndTime":275491.0,"X":354.0,"Y":183.0}]},{"StartTime":275702.0,"Objects":[{"StartTime":275702.0,"EndTime":275702.0,"X":308.0,"Y":358.0}]},{"StartTime":275913.0,"Objects":[{"StartTime":275913.0,"EndTime":275913.0,"X":478.0,"Y":313.0}]},{"StartTime":276125.0,"Objects":[{"StartTime":276125.0,"EndTime":276125.0,"X":245.0,"Y":278.0}]},{"StartTime":276336.0,"Objects":[{"StartTime":276336.0,"EndTime":276336.0,"X":482.0,"Y":205.0}]},{"StartTime":276547.0,"Objects":[{"StartTime":276547.0,"EndTime":276547.0,"X":349.0,"Y":94.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":276722.0,"EndTime":276722.0,"X":354.7944,"Y":183.813278,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":276970.0,"Objects":[{"StartTime":276970.0,"EndTime":276970.0,"X":239.0,"Y":240.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":277145.0,"EndTime":277145.0,"X":157.7837,"Y":226.0501,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":277393.0,"Objects":[{"StartTime":277393.0,"EndTime":277393.0,"X":0.0,"Y":268.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":277568.0,"EndTime":277568.0,"X":81.70373,"Y":254.311035,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":277815.0,"Objects":[{"StartTime":277815.0,"EndTime":277815.0,"X":128.0,"Y":380.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":277990.0,"EndTime":277990.0,"X":143.305069,"Y":299.2002,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":278237.0,"Objects":[{"StartTime":278237.0,"EndTime":278237.0,"X":116.0,"Y":96.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":278412.0,"EndTime":278412.0,"X":101.614624,"Y":177.390518,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":278660.0,"Objects":[{"StartTime":278660.0,"EndTime":278660.0,"X":104.0,"Y":16.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":278835.0,"EndTime":278835.0,"X":36.5809135,"Y":63.969265,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":279082.0,"Objects":[{"StartTime":279082.0,"EndTime":279082.0,"X":180.0,"Y":48.0}]},{"StartTime":279294.0,"Objects":[{"StartTime":279294.0,"EndTime":279294.0,"X":32.0,"Y":140.0}]},{"StartTime":279505.0,"Objects":[{"StartTime":279505.0,"EndTime":279505.0,"X":180.0,"Y":48.0}]},{"StartTime":279717.0,"Objects":[{"StartTime":279717.0,"EndTime":279717.0,"X":140.0,"Y":216.0}]},{"StartTime":279928.0,"Objects":[{"StartTime":279928.0,"EndTime":279928.0,"X":265.0,"Y":71.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":280103.0,"EndTime":280103.0,"X":243.523376,"Y":153.8613,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":280350.0,"Objects":[{"StartTime":280350.0,"EndTime":280350.0,"X":416.0,"Y":248.0}]},{"StartTime":280562.0,"Objects":[{"StartTime":280562.0,"EndTime":280562.0,"X":316.0,"Y":132.0}]},{"StartTime":280773.0,"Objects":[{"StartTime":280773.0,"EndTime":280773.0,"X":252.0,"Y":264.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":280948.0,"EndTime":280948.0,"X":341.449524,"Y":254.061157,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":281196.0,"Objects":[{"StartTime":281196.0,"EndTime":281196.0,"X":484.0,"Y":148.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":281371.0,"EndTime":281371.0,"X":394.550476,"Y":138.061157,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":281618.0,"Objects":[{"StartTime":281618.0,"EndTime":281618.0,"X":426.0,"Y":338.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":281793.0,"EndTime":281793.0,"X":416.945068,"Y":248.456665,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":282041.0,"Objects":[{"StartTime":282041.0,"EndTime":282041.0,"X":326.0,"Y":43.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":282216.0,"EndTime":282216.0,"X":316.061157,"Y":132.449539,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":282463.0,"Objects":[{"StartTime":282463.0,"EndTime":282463.0,"X":296.0,"Y":296.0}]},{"StartTime":282674.0,"Objects":[{"StartTime":282674.0,"EndTime":282674.0,"X":417.0,"Y":249.0}]},{"StartTime":282885.0,"Objects":[{"StartTime":282885.0,"EndTime":282885.0,"X":248.0,"Y":216.0}]},{"StartTime":283097.0,"Objects":[{"StartTime":283097.0,"EndTime":283097.0,"X":321.0,"Y":376.0}]},{"StartTime":283308.0,"Objects":[{"StartTime":283308.0,"EndTime":283308.0,"X":370.0,"Y":163.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":283483.0,"EndTime":283483.0,"X":379.938843,"Y":73.55046,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":283730.0,"Objects":[{"StartTime":283730.0,"EndTime":283730.0,"X":248.0,"Y":216.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":283905.0,"EndTime":283905.0,"X":257.938843,"Y":126.550461,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":284153.0,"Objects":[{"StartTime":284153.0,"EndTime":284153.0,"X":122.0,"Y":266.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":284328.0,"EndTime":284328.0,"X":131.938843,"Y":176.550461,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":284575.0,"Objects":[{"StartTime":284575.0,"EndTime":284575.0,"X":200.0,"Y":280.0}]},{"StartTime":284787.0,"Objects":[{"StartTime":284787.0,"EndTime":284787.0,"X":56.0,"Y":144.0}]},{"StartTime":284998.0,"Objects":[{"StartTime":284998.0,"EndTime":284998.0,"X":69.0,"Y":335.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":285173.0,"EndTime":285173.0,"X":151.50708,"Y":340.3292,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":285420.0,"Objects":[{"StartTime":285420.0,"EndTime":285420.0,"X":213.0,"Y":180.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":285595.0,"EndTime":285595.0,"X":130.326477,"Y":176.450455,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":285843.0,"Objects":[{"StartTime":285843.0,"EndTime":285843.0,"X":304.0,"Y":272.0}]},{"StartTime":285948.0,"Objects":[{"StartTime":285948.0,"EndTime":285948.0,"X":299.0,"Y":228.0}]},{"StartTime":286054.0,"Objects":[{"StartTime":286054.0,"EndTime":286054.0,"X":294.0,"Y":183.0}]},{"StartTime":286159.0,"Objects":[{"StartTime":286159.0,"EndTime":286159.0,"X":288.0,"Y":138.0}]},{"StartTime":286265.0,"Objects":[{"StartTime":286265.0,"EndTime":286265.0,"X":283.0,"Y":94.0}]},{"StartTime":286477.0,"Objects":[{"StartTime":286477.0,"EndTime":286477.0,"X":156.521729,"Y":44.5217361}]},{"StartTime":286583.0,"Objects":[{"StartTime":286583.0,"EndTime":286583.0,"X":160.260864,"Y":48.2608681}]},{"StartTime":286688.0,"Objects":[{"StartTime":286688.0,"EndTime":286688.0,"X":164.0,"Y":52.0,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":287110.0,"EndTime":287110.0,"X":183.3807,"Y":124.354652,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":287533.0,"EndTime":287533.0,"X":172.208191,"Y":190.150177,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":287955.0,"EndTime":287955.0,"X":124.254967,"Y":247.694046,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":288378.0,"EndTime":288378.0,"X":173.0462,"Y":261.451965,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":288800.0,"EndTime":288800.0,"X":242.3152,"Y":273.1244,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":289223.0,"EndTime":289223.0,"X":282.0523,"Y":336.8299,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":289645.0,"EndTime":289645.0,"X":313.3097,"Y":323.5751,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":290068.0,"EndTime":290068.0,"X":338.3643,"Y":252.795883,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":290490.0,"EndTime":290490.0,"X":410.361755,"Y":235.620316,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":290913.0,"EndTime":290913.0,"X":431.88385,"Y":207.80217,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":291335.0,"EndTime":291335.0,"X":373.0279,"Y":161.46875,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":291758.0,"EndTime":291758.0,"X":367.150818,"Y":92.54223,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":292180.0,"EndTime":292180.0,"X":357.807159,"Y":45.76682,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":292603.0,"EndTime":292603.0,"X":294.6491,"Y":86.36842,"StackOffset":{"X":0.0,"Y":0.0}},{"StartTime":292990.0,"EndTime":292990.0,"X":228.255249,"Y":76.85775,"StackOffset":{"X":0.0,"Y":0.0}}]},{"StartTime":293238.0,"Objects":[{"StartTime":293238.0,"EndTime":293238.0,"X":231.739136,"Y":79.7391357}]},{"StartTime":293343.0,"Objects":[{"StartTime":293343.0,"EndTime":301900.0,"X":256.0,"Y":192.0}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/1124896.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/1124896.osu
new file mode 100644
index 0000000000..8a9b18ae9c
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/1124896.osu
@@ -0,0 +1,1122 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.6
+Mode: 0
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:3.8
+OverallDifficulty:7.5
+ApproachRate:8.7
+SliderMultiplier:1.5
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+
+[TimingPoints]
+1055,422.535211267606,4,2,1,35,1,0
+1055,-111.111111111111,4,2,1,35,0,0
+8660,-111.111111111111,4,2,1,10,0,0
+8871,-111.111111111111,4,2,1,35,0,0
+13942,-111.111111111111,4,2,2,60,0,0
+14470,-111.111111111111,4,2,2,5,0,0
+14576,-100,4,2,2,45,0,0
+25562,-200,4,2,2,40,0,0
+28097,-100,4,2,2,40,0,0
+41618,-100,4,2,2,50,0,0
+55139,-100,4,2,3,45,0,0
+68660,-83.3333333333333,4,2,2,50,0,0
+69294,-50,4,2,2,50,0,0
+69505,-83.3333333333333,4,2,2,50,0,0
+70139,-50,4,2,2,50,0,0
+70350,-83.3333333333333,4,2,2,50,0,0
+70984,-50,4,2,2,50,0,0
+71195,-83.3333333333333,4,2,2,50,0,0
+71829,-50,4,2,2,50,0,0
+72040,-83.3333333333333,4,2,2,50,0,0
+72674,-50,4,2,2,50,0,0
+74576,-55.5555555555556,4,2,1,50,0,0
+75421,-76.9230769230769,4,2,2,60,0,1
+100773,-100,4,2,2,50,0,0
+102463,-83.3333333333333,4,2,2,50,0,0
+115984,-100,4,2,2,50,0,0
+129505,-100,4,2,3,45,0,0
+143026,-83.3333333333333,4,2,2,50,0,0
+143660,-50,4,2,2,50,0,0
+143871,-83.3333333333333,4,2,2,50,0,0
+144505,-50,4,2,2,50,0,0
+144716,-83.3333333333333,4,2,2,50,0,0
+145350,-50,4,2,2,50,0,0
+145562,-83.3333333333333,4,2,2,50,0,0
+146195,-50,4,2,2,50,0,0
+146407,-83.3333333333333,4,2,2,50,0,0
+147040,-50,4,2,2,50,0,0
+148942,-55.5555555555556,4,2,1,50,0,0
+149787,-76.9230769230769,4,2,2,60,0,1
+175139,-100,4,2,2,50,0,0
+175562,-83.3333333333333,4,2,3,50,0,0
+185280,-76.9230769230769,4,2,3,50,0,0
+186970,-71.4285714285714,4,2,3,50,0,0
+190350,-83.3333333333333,4,2,2,50,0,0
+214012,-71.4285714285714,4,2,2,50,0,0
+219083,-71.4285714285714,4,2,2,60,0,1
+244435,-100,4,2,2,50,0,0
+246125,-71.4285714285714,4,2,2,60,0,1
+273167,-83.3333333333333,4,2,2,50,0,0
+286688,-200,4,2,2,50,0,0
+293238,-200,4,2,0,30,0,0
+293343,-200,4,2,0,5,0,0
+
+[HitObjects]
+92,96,633,5,0,0:0:0:0:
+92,96,844,1,0,0:0:0:0:
+92,96,1055,6,0,L|76:164,1,67.4999979400635,2|0,3:0|0:0,0:0:0:0:
+200,100,1477,2,0,L|184:34,1,67.4999979400635,0|2,0:0|0:3,0:0:0:0:
+164,228,1900,1,0,0:0:0:0:
+256,240,2111,1,0,0:0:0:0:
+340,192,2322,2,0,P|352:160|348:120,1,67.4999979400635,2|0,0:3|0:0,0:0:0:0:
+440,200,2745,6,0,P|438:233|450:264,1,67.4999979400635,2|0,0:3|0:0,0:0:0:0:
+332,316,3167,1,0,0:0:0:0:
+332,316,3378,2,0,B|280:296|224:320|224:320|268:344,1,134.999995880127,2|0,0:3|0:0,0:0:0:0:
+332,316,4012,1,2,0:3:0:0:
+312,224,4224,1,0,0:0:0:0:
+284,132,4435,6,0,P|248:124|216:132,1,67.4999979400635,2|0,0:3|0:0,0:0:0:0:
+400,192,4857,2,0,P|436:200|468:192,1,67.4999979400635,2|0,0:3|0:3,0:3:0:0:
+312,224,5280,2,0,P|304:260|312:292,1,67.4999979400635,2|0,0:3|0:0,0:0:0:0:
+376,108,5702,1,2,0:3:0:0:
+376,108,5914,2,0,B|336:132|336:132|232:108,1,134.999995880127,2|0,0:3|0:0,0:0:0:0:
+154,122,6547,6,0,P|159:80|174:56,1,67.4999979400635,2|0,0:3|0:0,0:0:0:0:
+107,195,6970,2,0,P|73:160|68:132,2,67.4999979400635,2|0|2,0:3|0:0|0:3,0:0:0:0:
+216,232,7604,1,0,0:0:0:0:
+116,280,7815,6,0,P|76:280|51:263,1,67.4999979400635,2|0,0:3|0:0,0:0:0:0:
+176,160,8238,1,0,0:0:0:0:
+248,291,8449,2,0,P|292:291|336:335,1,101.249996910095,2|0,0:3|0:0,0:0:0:0:
+334,328,8871,2,0,L|318:189,1,134.999995880127,2|0,0:3|0:0,0:0:0:0:
+428,184,9505,6,0,L|436:250,1,67.4999979400635,2|0,0:3|0:0,0:0:0:0:
+328,128,9928,2,0,L|319:194,1,67.4999979400635,0|2,0:0|0:3,0:0:0:0:
+320,108,10350,1,0,0:0:0:0:
+308,88,10773,1,2,0:3:0:0:
+296,68,11195,6,0,L|212:64,1,67.4999979400635,2|0,0:3|0:0,0:0:0:0:
+318,194,11618,1,0,0:0:0:0:
+288,52,11829,2,0,L|204:48,1,67.4999979400635,2|0,0:3|0:0,0:0:0:0:
+236,248,12252,1,0,0:0:0:0:
+299,170,12463,1,2,0:3:0:0:
+300,300,12674,1,0,0:0:0:0:
+168,204,12885,6,0,L|84:200,2,67.4999979400635,2|0|0,0:3|0:0|0:0,0:0:0:0:
+227,332,13519,2,0,L|160:336,1,67.4999979400635,2|0,0:3|0:0,0:0:0:0:
+303,366,13942,1,2,0:0:0:0:
+302,365,14153,2,0,P|308:332|299:299,1,67.4999979400635,2|0,0:0|0:0,0:0:0:0:
+469,258,14576,6,0,L|452:333,1,75,4|0,0:0|0:0,0:0:0:0:
+376,256,14998,2,0,L|359:182,1,75,0|2,0:0|0:0,0:0:0:0:
+384,80,15421,1,0,0:0:0:0:
+282,102,15632,1,2,0:0:0:0:
+436,148,15843,1,0,0:0:0:0:
+274,186,16055,5,2,0:0:0:0:
+274,186,16160,1,0,0:0:0:0:
+274,186,16266,2,0,L|257:261,1,75,0|2,0:0|0:0,0:0:0:0:
+160,202,16688,2,0,L|143:128,1,75,0|2,0:0|0:0,0:0:0:0:
+79,35,17111,1,0,0:0:0:0:
+23,123,17322,1,2,0:0:0:0:
+161,42,17533,1,0,0:0:0:0:
+76,188,17745,1,2,0:0:0:0:
+79,35,17956,6,0,L|105:126,1,75,0|2,0:0|0:0,0:0:0:0:
+211,104,18378,2,0,L|237:195,1,75,0|2,0:0|0:0,0:0:0:0:
+344,170,18801,2,0,L|370:261,1,75,0|2,0:0|0:0,0:0:0:0:
+433,132,19224,1,0,0:0:0:0:
+372,249,19435,5,2,0:0:0:0:
+372,249,19540,1,0,0:0:0:0:
+372,249,19646,2,0,P|414:259|452:250,1,75,0|2,0:0|0:0,0:0:0:0:
+468,104,20069,1,0,0:0:0:0:
+413,180,20280,1,2,0:0:0:0:
+324,58,20491,1,2,0:0:0:0:
+414,31,20702,1,2,0:0:0:0:
+324,151,20914,1,10,0:0:0:0:
+244,40,21125,1,2,0:0:0:0:
+301,186,21336,6,0,P|242:205|184:174,1,112.5,6|0,0:0|0:0,0:0:0:0:
+197,187,21759,2,0,P|190:229|215:287,1,75,0|2,0:0|0:0,0:0:0:0:
+287,362,22181,1,0,0:0:0:0:
+330,234,22393,1,2,0:0:0:0:
+197,260,22604,1,8,0:0:0:0:
+360,319,22815,1,2,0:0:0:0:
+360,319,23026,6,0,P|419:338|479:313,1,112.5
+465,323,23449,1,0,0:0:0:0:
+402,180,23660,1,2,0:0:0:0:
+402,180,23871,2,0,L|417:265,1,75,0|2,0:0|0:0,0:0:0:0:
+314,145,24294,6,0,L|327:71,1,75,8|2,0:0|0:0,0:0:0:0:
+472,72,24716,2,0,L|485:145,1,75,4|2,0:0|0:0,0:0:0:0:
+320,222,25139,1,0,0:0:0:0:
+235,116,25350,1,2,0:0:0:0:
+276,295,25562,5,8,0:0:0:0:
+304,305,25667,1,8,0:0:0:0:
+333,306,25773,1,8,0:0:0:0:
+362,299,25878,1,8,0:0:0:0:
+392,280,25984,5,8,0:0:0:0:
+425,239,26090,1,8,0:0:0:0:
+447,193,26195,1,8,0:0:0:0:
+454,143,26301,1,8,0:0:0:0:
+452,88,26407,6,0,P|426:34|384:95,1,150,4|0,0:0|0:0,0:0:0:0:
+368,160,27463,1,0,0:0:0:0:
+487,58,27674,1,12,0:0:0:0:
+300,200,28097,6,0,P|288:158|305:117,1,75,12|0,0:0|0:0,0:0:0:0:
+377,238,28519,1,10,0:0:0:0:
+222,217,28731,1,2,0:0:0:0:
+369,92,28942,2,0,P|377:128|366:163,1,75,10|0,0:0|0:0,0:0:0:0:
+223,136,29364,2,0,P|214:99|225:64,1,75,10|0,0:0|0:0,0:0:0:0:
+251,276,29787,5,10,0:0:0:0:
+135,240,29998,1,0,0:0:0:0:
+244,356,30209,1,10,0:0:0:0:
+137,161,30421,1,0,0:0:0:0:
+166,327,30632,1,10,0:0:0:0:
+219,187,30843,1,0,0:0:0:0:
+68,322,31055,1,10,0:0:0:0:
+311,192,31266,1,0,0:0:0:0:
+140,89,31477,6,0,P|128:130|145:172,1,75,10|0,0:0|0:0,0:0:0:0:
+217,51,31899,1,10,0:0:0:0:
+62,72,32111,1,2,0:0:0:0:
+209,197,32322,2,0,P|217:160|206:125,1,75,8|0,0:0|0:0,0:0:0:0:
+64,168,32744,2,0,P|55:204|66:239,1,75,10|0,0:0|0:0,0:0:0:0:
+209,197,33167,6,0,P|172:188|137:199,1,75,8|0,0:0|0:0,0:0:0:0:
+136,340,33589,2,0,P|171:351|206:343,1,75,8|0,0:0|0:0,0:0:0:0:
+285,167,34012,1,10,0:0:0:0:
+308,326,34224,1,2,0:0:0:0:
+176,276,34435,1,10,0:0:0:0:
+362,263,34646,1,2,0:0:0:0:
+184,201,34857,6,0,L|172:305,1,75,14|0,0:0|0:0,0:0:0:0:
+118,138,35280,1,10,0:0:0:0:
+272,162,35491,1,2,0:0:0:0:
+120,57,35702,2,0,P|146:11|197:5,1,75,10|0,0:0|0:0,0:0:0:0:
+294,133,36125,2,0,P|267:178|216:184,1,75,10|0,0:0|0:0,0:0:0:0:
+243,11,36547,6,0,P|288:37|294:88,1,75,10|0,0:0|0:0,0:0:0:0:
+171,183,36970,2,0,P|125:156|119:105,1,75,10|0,0:0|0:0,0:0:0:0:
+368,94,37393,1,10,0:0:0:0:
+228,243,37604,1,0,0:0:0:0:
+222,94,37815,1,10,0:0:0:0:
+374,238,38026,1,0,0:0:0:0:
+368,94,38238,6,0,L|468:115,1,75,10|0,0:0|0:0,0:0:0:0:
+240,170,38660,2,0,L|340:191,1,75,10|0,0:0|0:0,0:0:0:0:
+110,240,39083,2,0,L|210:261,1,75,10|0,0:0|0:0,0:0:0:0:
+106,321,39505,1,10,0:0:0:0:
+148,159,39716,1,2,0:0:0:0:
+35,279,39928,5,10,0:0:0:0:
+213,325,40139,1,2,0:0:0:0:
+61,312,40350,1,8,0:0:0:0:
+237,299,40561,1,2,0:0:0:0:
+120,92,40773,1,8,0:0:0:0:
+124,129,40878,1,8,0:0:0:0:
+128,166,40984,1,8,0:0:0:0:
+132,203,41089,1,8,0:0:0:0:
+136,241,41195,1,12,0:0:0:0:
+281,114,41407,5,8,0:0:0:0:
+281,114,41512,1,8,0:0:0:0:
+281,114,41618,2,0,L|377:107,1,75,12|2,0:0|0:0,0:0:0:0:
+292,34,42040,2,0,L|388:27,1,75,0|2,0:0|0:0,0:0:0:0:
+400,177,42463,2,0,L|407:273,1,75,0|2,0:0|0:0,0:0:0:0:
+480,188,42885,2,0,L|487:284,1,75,0|2,0:0|0:0,0:0:0:0:
+330,317,43308,6,0,L|234:310,1,75,0|2,0:0|0:0,0:0:0:0:
+319,237,43730,2,0,L|223:230,1,75,0|2,0:0|0:0,0:0:0:0:
+129,357,44153,1,0,0:0:0:0:
+43,239,44364,1,2,0:0:0:0:
+181,284,44576,1,2,0:0:0:0:
+43,329,44787,1,2,0:0:0:0:
+129,211,44998,6,0,L|136:121,1,75,0|2,0:0|0:0,0:0:0:0:
+224,157,45421,2,0,L|217:67,1,75,0|2,0:0|0:0,0:0:0:0:
+312,60,45843,1,0,0:0:0:0:
+414,106,46055,1,2,0:0:0:0:
+401,1,46266,1,0,0:0:0:0:
+310,142,46477,5,2,0:0:0:0:
+310,142,46583,1,0,0:0:0:0:
+310,142,46688,2,0,L|317:232,1,75,0|2,0:0|0:0,0:0:0:0:
+405,196,47111,2,0,L|398:286,1,75,0|2,0:0|0:0,0:0:0:0:
+280,288,47533,1,0,0:0:0:0:
+388,352,47745,1,2,0:0:0:0:
+492,176,47956,1,10,0:0:0:0:
+465,312,48167,1,2,0:0:0:0:
+315,216,48378,6,0,P|271:207|228:227,1,75,4|2,0:0|0:0,0:0:0:0:
+280,288,48801,1,0,0:0:0:0:
+392,188,49012,2,0,P|367:150|322:134,1,75,2|0,0:0|0:0,0:0:0:0:
+472,212,49435,2,0,P|472:166|445:127,1,75,2|0,0:0|0:0,0:0:0:0:
+399,270,49857,1,2,0:0:0:0:
+341,136,50069,6,0,L|356:42,1,75,0|2,0:0|0:0,0:0:0:0:
+430,31,50491,1,0,0:0:0:0:
+274,83,50702,1,2,0:0:0:0:
+423,111,50914,2,0,L|497:122,1,75,0|2,0:0|0:0,0:0:0:0:
+338,215,51336,2,0,L|408:188,1,75,8|2,0:0|0:0,0:0:0:0:
+282,268,51759,6,0,P|261:214|276:169,1,75,4|2,0:0|0:0,0:0:0:0:
+358,289,52181,1,0,0:0:0:0:
+184,202,52393,2,0,P|207:148|249:127,1,75,2|0,0:0|0:0,0:0:0:0:
+190,281,52815,1,2,0:0:0:0:
+119,158,53026,1,10,0:0:0:0:
+262,200,53238,1,0,0:0:0:0:
+99,230,53449,6,0,L|123:142,1,75,4|2,0:0|0:0,0:0:0:0:
+31,295,53871,2,0,L|7:207,1,75,8|2,0:0|0:0,0:0:0:0:
+131,316,54294,1,8,0:0:0:0:
+222,242,54505,1,8,0:0:0:0:
+118,157,54716,1,8,0:0:0:0:
+118,157,54822,1,8,0:0:0:0:
+118,157,54928,1,8,0:0:0:0:
+226,332,55139,6,0,P|281:349|357:310,1,112.5,4|0,0:0|0:0,0:0:0:0:
+332,333,55562,2,0,L|352:238,1,75,2|0,0:0|0:0,0:0:0:0:
+289,191,55984,1,2,0:0:0:0:
+338,116,56195,1,0,0:0:0:0:
+427,103,56407,1,10,0:0:0:0:
+502,151,56618,1,0,0:0:0:0:
+371,38,56829,6,0,P|316:21|240:60,1,112.5,2|0,0:0|0:0,0:0:0:0:
+265,37,57252,2,0,L|245:132,1,75,2|0,0:0|0:0,0:0:0:0:
+132,25,57674,2,0,L|159:150,2,112.5,2|0|0,0:0|0:0|0:0,0:0:0:0:
+79,150,58519,6,0,P|160:212|192:199,1,112.5,4|0,0:0|0:0,0:0:0:0:
+158,212,58942,2,0,L|253:191,1,75,2|0,0:0|0:0,0:0:0:0:
+249,110,59364,1,2,0:0:0:0:
+324,159,59575,1,0,0:0:0:0:
+337,248,59787,1,10,0:0:0:0:
+289,323,59998,1,0,0:0:0:0:
+406,192,60209,6,0,P|468:273|455:305,1,112.5,2|0,0:0|0:0,0:0:0:0:
+469,272,60632,2,0,L|447:366,1,75,2|0,0:0|0:0,0:0:0:0:
+337,248,61055,2,0,L|361:363,2,112.5,2|0|0,0:0|0:0|0:0,0:0:0:0:
+232,195,61900,6,0,L|210:289,1,75,4|0,0:0|0:0,0:0:0:0:
+129,122,62322,2,0,L|146:196,1,75,10|0,0:0|0:0,0:0:0:0:
+177,358,62745,1,2,0:0:0:0:
+108,282,62956,1,0,0:0:0:0:
+286,341,63167,2,0,L|359:357,1,75,10|0,0:0|0:0,0:0:0:0:
+410,231,63590,6,0,L|336:247,1,75,2|0,0:0|0:0,0:0:0:0:
+465,158,64012,2,0,L|391:141,1,75,10|0,0:0|0:0,0:0:0:0:
+226,111,64435,1,2,0:0:0:0:
+320,175,64646,1,0,0:0:0:0:
+222,34,64857,2,0,P|180:44|159:87,1,75,8|2,0:0|0:0,0:0:0:0:
+218,189,65280,6,0,P|176:179|155:136,1,75,4|2,0:0|0:0,0:0:0:0:
+296,70,65702,2,0,L|270:164,1,75,0|2,0:0|0:0,0:0:0:0:
+236,337,66125,1,0,0:0:0:0:
+325,219,66336,1,2,0:0:0:0:
+152,247,66547,1,0,0:0:0:0:
+316,312,66758,1,2,0:0:0:0:
+88,184,66970,6,0,P|46:194|25:237,1,75,0|2,0:0|0:0,0:0:0:0:
+172,320,67392,2,0,L|146:226,1,75,0|2,0:0|0:0,0:0:0:0:
+194,118,67815,2,0,P|157:95|111:110,1,75,0|2,0:0|0:0,0:0:0:0:
+297,315,68238,2,0,L|271:221,1,75,8|2,0:0|0:0,0:0:0:0:
+300,75,68660,6,0,L|276:166,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+337,56,68977,2,0,L|313:147,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+374,43,69294,2,0,L|354:115,1,75,8|0,0:0|0:0,0:0:0:0:
+385,192,69505,6,0,B|417:183|417:183|470:203,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+360,235,69822,2,0,B|391:225|391:225|444:245,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+341,274,70139,2,0,B|372:264|372:264|412:278,1,75,8|0,0:0|0:0,0:0:0:0:
+245,332,70350,6,0,P|226:291|239:249,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+185,311,70667,2,0,P|200:269|239:248,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+169,248,70984,2,0,P|202:235|237:247,1,75,8|0,0:0|0:0,0:0:0:0:
+78,207,71195,6,0,B|66:171|66:171|74:157|74:157|62:118,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+108,176,71512,2,0,B|96:140|96:140|104:126|104:126|92:87,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+143,143,71829,2,0,B|130:108|130:108|138:94|138:94|131:73,1,75,8|0,0:0|0:0,0:0:0:0:
+307,58,72040,6,0,P|254:35|207:58,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+388,72,72357,2,0,P|335:49|288:72,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+454,91,72674,2,0,P|401:68|364:89,1,75,12|0,0:0|0:0,0:0:0:0:
+338,180,72885,5,8,0:0:0:0:
+269,308,73097,1,8,0:0:0:0:
+304,334,73202,1,8,0:0:0:0:
+348,344,73308,1,8,0:0:0:0:
+391,335,73414,1,8,0:0:0:0:
+428,309,73519,1,8,0:0:0:0:
+450,271,73625,1,8,0:0:0:0:
+453,227,73730,1,8,0:0:0:0:
+453,227,74576,6,0,L|490:228,9,22.4999993133545
+506,152,74998,1,12,0:0:0:0:
+222,89,75421,5,12,0:0:0:0:
+194,259,75632,1,0,0:0:0:0:
+320,218,75843,1,8,0:0:0:0:
+150,190,76054,1,2,0:0:0:0:
+339,335,76266,1,8,0:0:0:0:
+372,130,76477,1,2,0:0:0:0:
+221,180,76688,1,10,0:0:0:0:
+425,212,76899,1,2,0:0:0:0:
+285,121,77111,6,0,P|341:109|385:165,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+194,259,77533,1,8,0:0:0:0:
+323,182,77745,1,2,0:0:0:0:
+244,316,77956,2,0,P|200:336|140:312,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+245,179,78378,1,10,0:0:0:0:
+350,277,78590,1,2,0:0:0:0:
+160,228,78801,6,0,L|164:68,1,146.249993305207,8|0,0:0|0:0,0:0:0:0:
+194,90,79224,2,0,P|254:105|296:75,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+129,0,79646,1,10,0:0:0:0:
+22,146,79857,1,2,0:0:0:0:
+194,90,80069,1,10,0:0:0:0:
+22,33,80280,1,2,0:0:0:0:
+129,180,80491,6,0,P|174:195|218:179,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+308,80,80913,1,10,0:0:0:0:
+280,252,81125,1,0,0:0:0:0:
+446,206,81336,1,8,0:0:0:0:
+339,60,81547,1,2,0:0:0:0:
+511,116,81759,1,10,0:0:0:0:
+339,173,81970,1,2,0:0:0:0:
+446,26,82181,5,12,0:0:0:0:
+280,118,82393,1,0,0:0:0:0:
+435,118,82604,1,8,0:0:0:0:
+259,26,82816,1,2,0:0:0:0:
+339,173,83026,1,8,0:0:0:0:
+154,128,83238,1,2,0:0:0:0:
+304,88,83449,1,10,0:0:0:0:
+157,222,83661,1,2,0:0:0:0:
+352,280,83871,5,8,0:0:0:0:
+160,173,84083,1,0,0:0:0:0:
+339,173,84294,1,8,0:0:0:0:
+135,280,84506,1,2,0:0:0:0:
+259,130,84716,5,8,0:0:0:0:
+65,235,84928,1,2,0:0:0:0:
+244,235,85139,1,10,0:0:0:0:
+40,129,85351,1,2,0:0:0:0:
+300,92,85562,6,0,L|274:200,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+192,43,85984,1,8,0:0:0:0:
+361,34,86195,1,2,0:0:0:0:
+327,233,86407,2,0,L|219:207,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+376,125,86829,1,10,0:0:0:0:
+385,294,87040,1,2,0:0:0:0:
+195,265,87252,6,0,L|221:157,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+303,314,87674,1,8,0:0:0:0:
+134,323,87885,1,2,0:0:0:0:
+177,108,88097,1,8,0:0:0:0:
+223,95,88202,1,8,0:0:0:0:
+267,114,88308,1,8,0:0:0:0:
+291,155,88413,1,8,0:0:0:0:
+284,203,88519,1,12,0:0:0:0:
+102,204,88731,1,8,0:0:0:0:
+224,16,88942,5,12,0:0:0:0:
+207,200,89153,1,0,0:0:0:0:
+96,112,89364,1,8,0:0:0:0:
+113,296,89575,1,2,0:0:0:0:
+0,152,89787,1,8,0:0:0:0:
+184,169,89998,1,2,0:0:0:0:
+16,296,90209,1,10,0:0:0:0:
+211,242,90420,1,2,0:0:0:0:
+88,52,90632,6,0,L|76:172,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+231,2,91055,2,0,L|160:99,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+383,22,91477,2,0,L|273:71,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+491,110,91900,2,2,L|356:101,1,97.4999955368044,10|2,0:0|0:0,0:0:0:0:
+436,284,92322,6,0,L|444:144,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+304,159,92745,1,8,0:0:0:0:
+304,159,92956,1,2,0:0:0:0:
+412,328,93167,6,0,L|420:188,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+292,176,93590,1,8,0:0:0:0:
+292,176,93801,1,2,0:0:0:0:
+392,364,94012,6,2,L|400:224,1,97.4999955368044,10|2,0:0|0:0,0:0:0:0:
+280,196,94435,1,8,0:0:0:0:
+280,196,94646,1,2,0:0:0:0:
+160,155,94857,2,0,P|148:207|192:259,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+424,112,95280,2,2,P|436:60|392:8,1,97.4999955368044,10|2,0:0|0:0,0:0:0:0:
+224,192,95702,5,12,0:0:0:0:
+421,192,95913,1,2,0:0:0:0:
+280,56,96125,1,8,0:0:0:0:
+280,253,96336,1,2,0:0:0:0:
+431,112,96547,1,8,0:0:0:0:
+195,112,96758,1,2,0:0:0:0:
+364,268,96970,1,10,0:0:0:0:
+364,32,97181,1,2,0:0:0:0:
+176,264,97393,5,14,0:0:0:0:
+426,108,97604,1,2,0:0:0:0:
+200,184,97815,1,10,0:0:0:0:
+459,264,98026,1,2,0:0:0:0:
+200,108,98238,1,8,0:0:0:0:
+426,184,98449,1,2,0:0:0:0:
+164,32,98660,1,10,0:0:0:0:
+447,32,98871,1,2,0:0:0:0:
+312,264,99083,6,0,L|304:148,1,97.4999955368044,12|2,0:0|0:0,0:0:0:0:
+412,236,99505,1,8,0:0:0:0:
+224,224,99716,1,2,0:0:0:0:
+420,144,99928,1,8,0:0:0:0:
+408,332,100139,1,2,0:0:0:0:
+252,136,100350,1,10,0:0:0:0:
+191,314,100561,1,2,0:0:0:0:
+412,236,100773,6,0,L|504:236,1,75,4|0,0:0|0:0,0:0:0:0:
+348,288,101195,2,0,L|256:288,1,75,2|0,0:0|0:0,0:0:0:0:
+415,339,101618,2,8,B|435:283|435:283|399:211,1,112.5
+411,235,102040,1,8,0:0:0:0:
+347,127,102252,5,8,0:0:0:0:
+347,127,102357,1,8,0:0:0:0:
+347,127,102463,2,0,P|399:143|455:119,1,89.9999972534181,14|0,0:0|0:0,0:0:0:0:
+444,20,102885,1,10,0:0:0:0:
+280,60,103097,1,2,0:0:0:0:
+433,135,103308,2,0,L|421:243,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+232,120,103731,2,0,L|222:30,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+92,254,104153,5,2,0:0:0:0:
+139,123,104364,1,0,0:0:0:0:
+0,157,104575,1,10,0:0:0:0:
+158,201,104787,1,0,0:0:0:0:
+204,26,104998,1,10,0:0:0:0:
+34,71,105209,1,0,0:0:0:0:
+267,106,105421,1,8,0:0:0:0:
+30,179,105632,1,2,0:0:0:0:
+163,290,105843,6,0,L|155:166,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+273,144,106266,2,0,P|327:167|371:143,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+512,116,106688,2,0,P|468:108|430:130,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+384,4,107111,2,0,P|360:58|384:102,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+396,288,107533,6,0,P|419:233|395:189,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+408,368,107956,2,0,P|462:346|477:297,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+332,336,108378,1,10,0:0:0:0:
+480,244,108590,1,2,0:0:0:0:
+332,336,108801,1,10,0:0:0:0:
+372,168,109013,1,2,0:0:0:0:
+247,313,109224,6,0,P|272:252|252:204,1,89.9999972534181,14|0,0:0|0:0,0:0:0:0:
+96,136,109646,1,10,0:0:0:0:
+196,252,109858,1,2,0:0:0:0:
+260,120,110069,2,0,L|152:132,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+28,236,110491,2,0,L|118:246,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+86,46,110914,6,0,L|95:135,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+186,341,111337,2,0,L|196:251,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+216,88,111759,1,10,0:0:0:0:
+95,135,111970,1,0,0:0:0:0:
+264,168,112181,1,10,0:0:0:0:
+191,8,112393,1,0,0:0:0:0:
+142,221,112604,6,0,L|130:329,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+264,168,113026,2,0,L|252:276,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+396,112,113449,2,0,L|384:220,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+312,104,113871,1,10,0:0:0:0:
+456,240,114083,1,0,0:0:0:0:
+442,48,114294,6,0,P|401:30|360:44,1,89.9999972534181,10|2,0:0|0:0,0:0:0:0:
+303,196,114716,2,0,P|343:213|386:201,1,89.9999972534181,10|2,0:0|0:0,0:0:0:0:
+208,80,115139,1,8,0:0:0:0:
+213,124,115244,1,8,0:0:0:0:
+218,169,115350,1,8,0:0:0:0:
+224,214,115455,1,8,0:0:0:0:
+229,258,115561,1,12,0:0:0:0:
+136,192,115773,5,8,0:0:0:0:
+136,192,115878,1,8,0:0:0:0:
+136,192,115984,2,0,L|40:185,1,75,12|2,0:0|0:0,0:0:0:0:
+60,104,116407,2,0,L|156:110,1,75,0|2,0:0|0:0,0:0:0:0:
+202,5,116829,2,0,L|209:101,1,75,0|2,0:0|0:0,0:0:0:0:
+288,104,117251,2,0,L|293:29,1,75,0|2,0:0|0:0,0:0:0:0:
+336,184,117674,6,0,L|240:177,1,75,0|2,0:0|0:0,0:0:0:0:
+340,264,118096,2,0,L|414:258,1,75,0|2,0:0|0:0,0:0:0:0:
+414,112,118519,1,0,0:0:0:0:
+500,230,118730,1,2,0:0:0:0:
+362,185,118942,1,10,0:0:0:0:
+500,140,119153,1,2,0:0:0:0:
+414,258,119364,6,0,L|340:264,1,75,0|2,0:0|0:0,0:0:0:0:
+186,173,119787,2,0,L|260:178,1,75,0|2,0:0|0:0,0:0:0:0:
+260,292,120209,1,0,0:0:0:0:
+169,344,120421,1,2,0:0:0:0:
+182,239,120632,1,0,0:0:0:0:
+244,372,120843,1,2,0:0:0:0:
+104,296,121054,6,0,L|14:303,1,75,0|2,0:0|0:0,0:0:0:0:
+186,173,121477,2,0,L|260:178,1,75,0|2,0:0|0:0,0:0:0:0:
+104,208,121899,1,0,0:0:0:0:
+78,106,122111,1,2,0:0:0:0:
+104,248,122322,1,10,0:0:0:0:
+177,144,122534,1,2,0:0:0:0:
+288,256,122744,6,0,P|244:265|201:245,1,75,4|2,0:0|0:0,0:0:0:0:
+216,144,123167,1,0,0:0:0:0:
+367,280,123378,2,0,P|342:318|297:334,1,75,2|0,0:0|0:0,0:0:0:0:
+450,260,123801,2,0,P|447:305|416:342,1,75,2|0,0:0|0:0,0:0:0:0:
+277,260,124223,1,2,0:0:0:0:
+332,128,124435,6,0,L|420:160,1,75,0|2,0:0|0:0,0:0:0:0:
+367,280,124857,1,0,0:0:0:0:
+272,180,125069,1,2,0:0:0:0:
+470,129,125280,2,0,P|475:166|460:200,1,75,0|2,0:0|0:0,0:0:0:0:
+356,52,125702,1,8,0:0:0:0:
+402,153,125914,1,2,0:0:0:0:
+232,72,126125,6,0,P|211:126|226:171,1,75,4|2,0:0|0:0,0:0:0:0:
+288,124,126547,1,0,0:0:0:0:
+134,138,126759,2,0,P|157:192|199:213,1,75,2|0,0:0|0:0,0:0:0:0:
+335,212,127181,1,2,0:0:0:0:
+212,141,127393,1,8,0:0:0:0:
+254,284,127604,1,2,0:0:0:0:
+286,130,127815,6,0,L|190:143,1,75,4|2,0:0|0:0,0:0:0:0:
+384,51,128237,2,0,L|296:27,1,75,8|2,0:0|0:0,0:0:0:0:
+480,108,128660,1,8,0:0:0:0:
+396,232,128871,1,8,0:0:0:0:
+241,225,129082,1,8,0:0:0:0:
+241,225,129188,1,8,0:0:0:0:
+241,225,129294,1,8,0:0:0:0:
+295,288,129505,6,0,P|244:309|192:292,1,112.5,6|0,0:0|0:0,0:0:0:0:
+192,292,129928,2,0,L|176:365,1,75,2|0,0:0|0:0,0:0:0:0:
+148,220,130350,1,2,0:0:0:0:
+68,187,130561,1,0,0:0:0:0:
+36,267,130772,1,10,0:0:0:0:
+115,300,130983,1,0,0:0:0:0:
+16,127,131195,6,0,P|67:106|124:128,1,112.5,2|0,0:0|0:0,0:0:0:0:
+119,124,131618,2,0,L|192:108,1,75,2|0,0:0|0:0,0:0:0:0:
+280,44,132040,2,0,L|155:17,2,112.5,2|0|0,0:0|0:0|0:0,0:0:0:0:
+96,56,132885,6,0,P|72:105|91:157,1,112.5,6|0,0:0|0:0,0:0:0:0:
+91,157,133308,2,0,L|164:140,1,75
+44,216,133731,1,0,0:0:0:0:
+123,249,133942,1,0,0:0:0:0:
+91,329,134153,1,8,0:0:0:0:
+11,296,134364,1,0,0:0:0:0:
+200,268,134576,6,0,P|264:280|320:244,1,112.5
+304,260,134998,2,0,L|282:354,1,75
+436,348,135421,2,0,L|413:237,2,112.5,2|0|0,0:0|0:0|0:0,0:0:0:0:
+448,168,136266,6,0,P|408:156|364:180,1,75,6|0,0:0|0:0,0:0:0:0:
+232,260,136688,2,0,P|272:272|316:248,1,75,10|0,0:0|0:0,0:0:0:0:
+340,100,137111,1,2,0:0:0:0:
+268,196,137322,1,0,0:0:0:0:
+240,48,137533,2,0,L|252:136,1,75,10|0,0:0|0:0,0:0:0:0:
+92,44,137956,6,0,P|132:32|172:44,1,75,2|0,0:0|0:0,0:0:0:0:
+168,180,138378,2,0,P|132:192|94:177,1,75,10|0,0:0|0:0,0:0:0:0:
+12,56,138801,1,2,0:0:0:0:
+132,112,139012,1,0,0:0:0:0:
+44,236,139223,2,0,P|20:207|20:171,1,75,10|2,0:0|0:0,0:0:0:0:
+244,172,139646,6,0,P|244:208|220:236,1,75,4|2,0:0|0:0,0:0:0:0:
+216,104,140069,2,0,P|215:67|239:39,1,75,0|2,0:0|0:0,0:0:0:0:
+436,68,140491,1,0,0:0:0:0:
+289,88,140702,1,2,0:0:0:0:
+459,156,140913,1,0,0:0:0:0:
+317,50,141124,1,2,0:0:0:0:
+336,232,141336,6,0,L|326:306,1,75,0|2,0:0|0:0,0:0:0:0:
+468,230,141759,2,0,L|458:155,1,75,0|2,0:0|0:0,0:0:0:0:
+436,324,142181,2,0,L|510:333,1,75,0|2,0:0|0:0,0:0:0:0:
+336,124,142604,2,0,L|261:133,1,75,8|2,0:0|0:0,0:0:0:0:
+210,89,143026,6,0,P|208:140|183:171,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+261,132,143343,2,0,P|223:166|183:170,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+256,184,143660,2,0,P|204:181|181:167,1,75,8|0,0:0|0:0,0:0:0:0:
+124,70,143871,6,0,L|108:173,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+96,247,144188,2,0,L|112:144,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+184,170,144505,2,0,L|79:153,1,75,8|0,0:0|0:0,0:0:0:0:
+261,132,144716,6,8,L|368:150,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+336,84,145033,2,8,L|398:172,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+428,96,145350,2,8,L|412:189,1,75,12|0,0:0|0:0,0:0:0:0:
+411,278,145562,6,8,P|456:273|497:240,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+324,276,145878,2,8,P|367:265|417:282,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+252,272,146195,2,8,P|295:282|340:265,1,75,8|0,0:0|0:0,0:0:0:0:
+317,119,146407,6,8,L|287:227,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+240,74,146724,2,8,L|268:182,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+166,90,147040,2,8,L|237:160,1,75,12|0,0:0|0:0,0:0:0:0:
+170,152,147252,5,8,0:0:0:0:
+38,120,147464,1,8,0:0:0:0:
+12,155,147569,1,8,0:0:0:0:
+2,199,147675,1,8,0:0:0:0:
+11,242,147781,1,8,0:0:0:0:
+37,279,147886,1,8,0:0:0:0:
+75,301,147992,1,8,0:0:0:0:
+119,304,148097,1,8,0:0:0:0:
+245,208,148942,6,0,L|268:196,9,22.4999993133545
+232,288,149364,1,12,0:0:0:0:
+217,38,149787,5,12,0:0:0:0:
+56,98,149998,1,0,0:0:0:0:
+155,187,150209,1,8,0:0:0:0:
+94,26,150420,1,2,0:0:0:0:
+63,262,150632,5,8,0:0:0:0:
+257,188,150843,1,2,0:0:0:0:
+138,82,151054,1,10,0:0:0:0:
+212,275,151265,1,2,0:0:0:0:
+288,60,151477,6,0,L|260:184,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+204,48,151899,1,8,0:0:0:0:
+346,175,152111,1,2,0:0:0:0:
+130,263,152322,6,0,L|158:138,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+232,244,152744,1,10,0:0:0:0:
+56,170,152956,1,2,0:0:0:0:
+64,352,153167,6,0,P|136:316|220:364,1,146.249993305207,8|0,0:0|0:0,0:0:0:0:
+224,348,153590,2,0,P|284:363|326:333,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+376,140,154012,1,10,0:0:0:0:
+269,286,154223,1,2,0:0:0:0:
+441,230,154435,1,10,0:0:0:0:
+269,173,154646,1,2,0:0:0:0:
+376,320,154857,6,0,P|436:335|478:305,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+496,136,155280,1,10,0:0:0:0:
+420,256,155491,1,0,0:0:0:0:
+330,80,155702,1,10,0:0:0:0:
+223,226,155913,1,2,0:0:0:0:
+395,170,156125,1,10,0:0:0:0:
+223,113,156336,1,2,0:0:0:0:
+330,260,156547,5,12,0:0:0:0:
+408,92,156759,1,0,0:0:0:0:
+168,168,156970,1,8,0:0:0:0:
+408,244,157182,1,2,0:0:0:0:
+256,44,157392,5,8,0:0:0:0:
+264,296,157604,1,2,0:0:0:0:
+436,168,157815,1,10,0:0:0:0:
+188,92,158027,1,2,0:0:0:0:
+212,336,158238,5,8,0:0:0:0:
+290,168,158450,1,0,0:0:0:0:
+50,244,158661,1,8,0:0:0:0:
+290,320,158871,1,2,0:0:0:0:
+138,120,159083,5,8,0:0:0:0:
+146,372,159295,1,2,0:0:0:0:
+318,244,159506,1,10,0:0:0:0:
+70,168,159716,1,2,0:0:0:0:
+324,164,159928,6,0,P|384:197|399:266,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+291,354,160350,1,8,0:0:0:0:
+209,190,160562,1,2,0:0:0:0:
+377,321,160773,6,0,P|317:355|255:335,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+209,190,161195,1,10,0:0:0:0:
+396,220,161407,1,2,0:0:0:0:
+200,283,161618,6,0,P|198:212|240:163,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+396,221,162040,1,8,0:0:0:0:
+290,353,162251,1,2,0:0:0:0:
+264,56,162463,5,8,0:0:0:0:
+277,102,162568,1,8,0:0:0:0:
+290,149,162674,1,8,0:0:0:0:
+304,196,162779,1,8,0:0:0:0:
+317,243,162885,1,12,0:0:0:0:
+172,164,163097,1,8,0:0:0:0:
+416,108,163308,5,12,0:0:0:0:
+232,91,163519,1,0,0:0:0:0:
+400,12,163730,1,8,0:0:0:0:
+383,196,163941,1,2,0:0:0:0:
+217,0,164153,5,8,0:0:0:0:
+200,184,164364,1,2,0:0:0:0:
+313,16,164575,1,10,0:0:0:0:
+112,32,164786,1,2,0:0:0:0:
+200,184,164998,6,0,P|216:136|204:88,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+112,256,165421,2,0,P|96:304|108:352,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+116,176,165843,2,0,P|68:160|20:172,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+196,264,166266,2,2,P|244:280|292:268,1,97.4999955368044,10|2,0:0|0:0,0:0:0:0:
+248,60,166688,5,8,0:0:0:0:
+248,201,166899,1,0,0:0:0:0:
+333,55,167111,1,8,0:0:0:0:
+248,201,167322,1,2,0:0:0:0:
+424,101,167533,5,8,0:0:0:0:
+248,201,167744,1,2,0:0:0:0:
+468,224,167956,1,10,0:0:0:0:
+292,124,168167,1,2,0:0:0:0:
+364,328,168378,5,8,0:0:0:0:
+364,158,168589,1,0,0:0:0:0:
+244,304,168801,1,8,0:0:0:0:
+464,327,169013,1,2,0:0:0:0:
+192,248,169224,6,0,L|184:359,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+508,272,169646,2,2,L|500:161,1,97.4999955368044,10|2,0:0|0:0,0:0:0:0:
+268,60,170068,5,12,0:0:0:0:
+268,257,170279,1,2,0:0:0:0:
+404,116,170491,1,8,0:0:0:0:
+207,116,170702,1,2,0:0:0:0:
+348,267,170913,5,8,0:0:0:0:
+348,31,171124,1,2,0:0:0:0:
+192,200,171336,1,8,0:0:0:0:
+428,200,171547,1,2,0:0:0:0:
+268,60,171759,5,12,0:0:0:0:
+386,236,171970,1,2,0:0:0:0:
+386,11,172181,1,8,0:0:0:0:
+268,187,172393,1,2,0:0:0:0:
+149,55,172604,5,10,0:0:0:0:
+30,231,172815,1,2,0:0:0:0:
+30,7,173026,1,10,0:0:0:0:
+149,183,173238,1,2,0:0:0:0:
+30,7,173449,6,0,L|58:127,1,97.4999955368044,12|0,0:0|0:0,0:0:0:0:
+240,64,173871,2,0,L|122:28,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+80,216,174294,2,0,L|169:131,1,97.4999955368044,8|2,0:0|0:0,0:0:0:0:
+124,280,174716,1,10,0:0:0:0:
+56,128,174928,1,2,0:0:0:0:
+216,212,175139,6,0,L|200:312,1,75,4|0,0:0|0:0,0:0:0:0:
+296,216,175562,6,0,L|276:332,1,89.9999972534181,2|0,0:0|0:0,0:0:0:0:
+376,208,175984,6,8,L|352:352,1,134.999995880127
+353,341,176406,1,8,0:0:0:0:
+328,144,176618,5,8,0:0:0:0:
+328,144,176723,1,8,0:0:0:0:
+328,144,176829,2,0,P|376:128|432:160,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+248,152,177252,2,0,P|200:168|144:136,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+344,120,177674,2,0,P|392:104|448:136,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+236,168,178097,2,0,P|188:184|132:152,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+192,272,178519,6,0,P|208:320|176:376,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+152,172,178942,2,0,P|136:124|168:68,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+228,284,179364,2,0,P|244:332|212:388,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+116,152,179787,2,0,P|100:104|132:48,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+100,256,180209,6,0,P|52:272|-4:240,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+240,184,180632,2,0,P|288:168|344:200,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+288,336,181055,2,0,L|284:232,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+432,84,181477,2,0,L|420:204,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+368,352,181900,6,0,L|364:248,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+512,100,182322,2,0,L|500:220,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+272,104,182745,2,0,L|392:116,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+356,132,183062,1,0,0:0:0:0:
+352,156,183167,1,8,0:0:0:0:
+276,20,183378,1,0,0:0:0:0:
+304,240,183590,6,0,P|264:256|216:240,1,89.9999972534181,12|0,0:0|0:0,0:0:0:0:
+392,272,184012,2,0,P|425:298|436:348,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+376,184,184435,2,0,P|382:141|419:107,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+320,336,184857,1,8,0:0:0:0:
+260,180,185069,1,0,0:0:0:0:
+176,304,185280,6,0,B|160:372|160:372|144:344,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+207,176,185702,2,0,B|273:155|273:155|257:183,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+84,224,186125,2,0,B|33:176|33:176|65:176,1,97.4999955368044,8|0,0:0|0:0,0:0:0:0:
+244,260,186547,1,8,0:0:0:0:
+88,300,186759,1,0,0:0:0:0:
+128,44,186970,6,0,L|136:188,1,104.999996795654,8|0,0:0|0:0,0:0:0:0:
+340,208,187393,2,0,L|348:64,1,104.999996795654,8|0,0:0|0:0,0:0:0:0:
+244,260,187815,1,8,0:0:0:0:
+424,240,188026,1,0,0:0:0:0:
+211,244,188238,1,8,0:0:0:0:
+377,317,188449,1,0,0:0:0:0:
+196,336,188660,5,8,0:0:0:0:
+224,154,188871,1,0,0:0:0:0:
+367,270,189083,1,8,0:0:0:0:
+132,216,189294,1,0,0:0:0:0:
+338,135,189505,1,8,0:0:0:0:
+330,186,189610,1,8,0:0:0:0:
+322,238,189716,1,8,0:0:0:0:
+314,290,189821,1,8,0:0:0:0:
+306,342,189927,1,12,0:0:0:0:
+228,252,190139,1,8,0:0:0:0:
+420,216,190350,5,12,0:0:0:0:
+247,160,190562,1,0,0:0:0:0:
+406,252,190773,1,8,0:0:0:0:
+368,74,190985,1,2,0:0:0:0:
+373,269,191195,1,8,0:0:0:0:
+507,146,191407,1,2,0:0:0:0:
+335,271,191618,1,10,0:0:0:0:
+508,325,191830,1,2,0:0:0:0:
+219,271,192040,6,0,P|199:219|231:155,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+279,327,192463,2,0,P|217:353|163:323,1,89.9999972534181,8|2,0:0|0:0,0:0:0:0:
+335,271,192885,2,0,P|361:332|331:387,1,89.9999972534181,8|2,0:0|0:0,0:0:0:0:
+279,219,193308,2,2,P|340:193|395:223,1,89.9999972534181,10|2,0:0|0:0,0:0:0:0:
+108,296,193731,6,0,L|112:124,1,134.999995880127,8|0,0:0|0:0,0:0:0:0:
+72,100,194153,2,0,P|120:116|172:84,1,89.9999972534181,8|2,0:0|0:0,0:0:0:0:
+24,24,194576,1,8,0:0:0:0:
+36,168,194787,1,2,0:0:0:0:
+116,40,194998,1,10,0:0:0:0:
+184,184,195209,1,2,0:0:0:0:
+256,56,195421,5,8,0:0:0:0:
+112,155,195632,1,2,0:0:0:0:
+276,224,195843,2,0,L|268:132,1,89.9999972534181
+160,72,196266,1,10,0:0:0:0:
+16,171,196477,1,2,0:0:0:0:
+180,240,196688,1,8,0:0:0:0:
+72,108,196899,1,2,0:0:0:0:
+76,328,197111,5,12,0:0:0:0:
+249,274,197323,1,0,0:0:0:0:
+83,171,197534,1,8,0:0:0:0:
+217,295,197745,1,2,0:0:0:0:
+218,119,197956,1,8,0:0:0:0:
+179,297,198168,1,2,0:0:0:0:
+317,223,198379,1,10,0:0:0:0:
+144,279,198591,1,2,0:0:0:0:
+295,284,198801,6,0,L|271:164,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+489,254,199224,2,0,L|465:374,1,89.9999972534181,8|2,0:0|0:0,0:0:0:0:
+277,195,199646,2,0,L|253:75,1,89.9999972534181,8|2,0:0|0:0,0:0:0:0:
+506,165,200069,2,2,L|482:285,1,89.9999972534181,10|2,0:0|0:0,0:0:0:0:
+301,42,200491,6,0,P|361:10|425:38,1,134.999995880127,8|0,0:0|0:0,0:0:0:0:
+432,52,200914,2,0,L|420:164,1,89.9999972534181,8|2,0:0|0:0,0:0:0:0:
+262,226,201336,1,8,0:0:0:0:
+352,103,201547,1,2,0:0:0:0:
+352,256,201759,1,10,0:0:0:0:
+262,132,201970,1,2,0:0:0:0:
+407,179,202181,5,8,0:0:0:0:
+240,253,202393,1,2,0:0:0:0:
+418,291,202604,1,8,0:0:0:0:
+296,155,202815,1,2,0:0:0:0:
+315,338,203026,1,8,0:0:0:0:
+281,308,203131,1,8,0:0:0:0:
+239,292,203237,1,8,0:0:0:0:
+195,291,203342,1,8,0:0:0:0:
+152,306,203448,1,12,0:0:0:0:
+328,380,203660,1,8,0:0:0:0:
+312,204,203871,5,12,0:0:0:0:
+120,266,204083,1,0,0:0:0:0:
+284,136,204294,1,8,0:0:0:0:
+241,334,204506,1,2,0:0:0:0:
+210,130,204716,5,8,0:0:0:0:
+359,267,204928,1,2,0:0:0:0:
+152,180,205139,1,10,0:0:0:0:
+345,120,205351,1,2,0:0:0:0:
+84,136,205562,6,0,P|72:176|88:228,1,89.9999972534181,8|0,0:0|0:0,0:0:0:0:
+284,136,205984,2,0,P|296:96|280:44,1,89.9999972534181,8|2,0:0|0:0,0:0:0:0:
+184,248,206407,2,0,P|224:260|276:244,1,89.9999972534181,8|2,0:0|0:0,0:0:0:0:
+180,28,206829,2,2,P|140:16|88:32,1,89.9999972534181,10|2,0:0|0:0,0:0:0:0:
+153,305,207252,6,0,P|173:233|137:163,1,134.999995880127,12|0,0:0|0:0,0:0:0:0:
+140,160,207674,2,0,P|100:148|48:164,1,89.9999972534181,8|2,0:0|0:0,0:0:0:0:
+72,336,208097,5,8,0:0:0:0:
+256,292,208308,1,2,0:0:0:0:
+100,224,208519,1,10,0:0:0:0:
+204,381,208730,1,2,0:0:0:0:
+351,209,208942,5,8,0:0:0:0:
+178,305,209153,1,2,0:0:0:0:
+312,344,209364,1,8,0:0:0:0:
+217,171,209576,1,2,0:0:0:0:
+472,144,209787,5,8,0:0:0:0:
+264,259,209998,1,2,0:0:0:0:
+425,306,210209,1,10,0:0:0:0:
+311,98,210421,1,2,0:0:0:0:
+332,312,210632,5,12,0:0:0:0:
+396,100,210843,1,2,0:0:0:0:
+192,160,211055,1,8,0:0:0:0:
+403,224,211266,1,2,0:0:0:0:
+328,24,211477,5,8,0:0:0:0:
+255,267,211688,1,2,0:0:0:0:
+488,198,211900,1,10,0:0:0:0:
+247,125,212111,1,2,0:0:0:0:
+392,312,212322,5,12,0:0:0:0:
+334,66,212533,1,2,0:0:0:0:
+342,351,212745,1,8,0:0:0:0:
+372,100,212956,1,2,0:0:0:0:
+251,373,213167,5,8,0:0:0:0:
+402,170,213378,1,2,0:0:0:0:
+136,327,213590,1,10,0:0:0:0:
+382,270,213801,1,2,0:0:0:0:
+212,144,214012,6,0,P|200:204|224:244,1,104.999996795654,12|2,0:0|0:0,0:0:0:0:
+152,88,214435,2,0,P|106:47|59:48,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+232,64,214857,2,0,P|289:44|312:3,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+80,120,215280,1,10,0:0:0:0:
+272,188,215491,1,2,0:0:0:0:
+192,8,215702,6,0,B|183:98|183:98|216:72,1,104.999996795654,12|2,0:0|0:0,0:0:0:0:
+384,64,216125,2,0,B|314:122|314:122|355:126,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+432,244,216547,1,8,0:0:0:0:
+260,264,216759,1,8,0:0:0:0:
+328,123,216970,1,8,0:0:0:0:
+333,175,217075,1,8,0:0:0:0:
+338,227,217181,1,8,0:0:0:0:
+344,279,217286,1,8,0:0:0:0:
+349,331,217392,1,8,0:0:0:0:
+349,331,218238,5,8,0:0:0:0:
+310,323,218343,1,8,0:0:0:0:
+273,317,218449,1,8,0:0:0:0:
+236,312,218554,1,8,0:0:0:0:
+198,306,218660,5,8,0:0:0:0:
+253,296,218765,1,8,0:0:0:0:
+309,287,218871,1,8,0:0:0:0:
+365,278,218976,1,8,0:0:0:0:
+421,268,219082,5,12,0:0:0:0:
+348,92,219294,1,0,0:0:0:0:
+205,236,219505,5,8,0:0:0:0:
+381,163,219717,1,2,0:0:0:0:
+237,24,219928,5,8,0:0:0:0:
+310,200,220140,1,2,0:0:0:0:
+449,52,220350,5,10,0:0:0:0:
+273,125,220562,1,2,0:0:0:0:
+392,272,220773,6,0,P|441:288|509:276,1,104.999996795654,8|0,0:0|0:0,0:0:0:0:
+257,249,221195,2,0,P|206:264|159:314,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+380,189,221618,2,0,P|411:146|420:79,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+317,308,222040,2,2,P|347:350|409:380,1,104.999996795654,10|2,0:0|0:0,0:0:0:0:
+297,175,222463,6,0,P|297:122|248:24,1,157.499995193482,8|0,0:0|0:0,0:0:0:0:
+253,29,222885,2,0,P|308:68|384:64,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+168,34,223308,1,10,0:0:0:0:
+63,216,223519,1,2,0:0:0:0:
+220,125,223731,1,10,0:0:0:0:
+10,125,223942,1,2,0:0:0:0:
+168,216,224153,5,10,0:0:0:0:
+63,34,224364,1,2,0:0:0:0:
+0,264,224576,2,0,P|60:296|120:268,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+144,140,224998,6,0,L|153:48,1,52.4999983978272,8|8,0:0|0:0,0:0:0:0:
+208,304,225209,2,0,L|202:356,1,52.4999983978272,8|8,0:0|0:0,0:0:0:0:
+256,144,225421,2,0,L|265:52,1,52.4999983978272,8|8,0:0|0:0,0:0:0:0:
+320,308,225632,2,0,L|314:360,1,52.4999983978272,8|8,0:0|0:0,0:0:0:0:
+425,265,225843,5,12,0:0:0:0:
+256,188,226055,1,0,0:0:0:0:
+425,102,226266,5,8,0:0:0:0:
+299,248,226477,1,2,0:0:0:0:
+271,53,226688,5,8,0:0:0:0:
+369,225,226900,1,2,0:0:0:0:
+176,183,227111,5,10,0:0:0:0:
+369,151,227322,1,2,0:0:0:0:
+274,339,227533,5,8,0:0:0:0:
+307,116,227745,1,0,0:0:0:0:
+458,279,227956,5,8,0:0:0:0:
+256,187,228168,1,2,0:0:0:0:
+458,83,228379,5,10,0:0:0:0:
+308,256,228590,1,2,0:0:0:0:
+274,25,228801,5,10,0:0:0:0:
+391,231,229013,1,2,0:0:0:0:
+160,181,229224,6,0,P|159:106|212:65,1,104.999996795654,8|0,0:0|0:0,0:0:0:0:
+257,263,229646,1,8,0:0:0:0:
+288,39,229858,1,2,0:0:0:0:
+348,227,230069,6,0,P|282:266|220:241,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+366,100,230491,1,10,0:0:0:0:
+160,181,230703,1,2,0:0:0:0:
+288,39,230914,6,0,P|353:76|372:145,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+175,84,231336,1,8,0:0:0:0:
+348,227,231547,1,2,0:0:0:0:
+184,336,231759,5,8,0:0:0:0:
+181,283,231864,1,8,0:0:0:0:
+179,231,231970,1,8,0:0:0:0:
+176,178,232075,1,8,0:0:0:0:
+174,126,232181,1,12,0:0:0:0:
+366,100,232393,1,8,0:0:0:0:
+268,228,232604,5,12,0:0:0:0:
+412,280,232815,1,0,0:0:0:0:
+268,188,233026,5,8,0:0:0:0:
+451,187,233237,1,2,0:0:0:0:
+256,152,233449,5,8,0:0:0:0:
+473,113,233660,1,2,0:0:0:0:
+328,248,233871,5,10,0:0:0:0:
+289,31,234082,1,2,0:0:0:0:
+192,204,234294,5,8,0:0:0:0:
+410,241,234505,1,0,0:0:0:0:
+112,188,234716,5,8,0:0:0:0:
+305,297,234927,1,2,0:0:0:0:
+36,176,235139,5,10,0:0:0:0:
+181,344,235350,1,2,0:0:0:0:
+252,136,235562,5,10,0:0:0:0:
+84,281,235773,1,2,0:0:0:0:
+316,188,235984,6,0,P|333:134|317:84,1,104.999996795654,8|0,0:0|0:0,0:0:0:0:
+328,268,236407,2,0,P|378:242|401:195,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+276,333,236829,2,0,P|329:350|379:334,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+316,188,237252,1,10,0:0:0:0:
+204,296,237463,1,2,0:0:0:0:
+452,336,237674,6,0,L|470:232,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+209,104,238097,2,0,L|228:208,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+425,45,238519,6,0,L|517:54,1,52.4999983978272,8|8,0:0|0:0,0:0:0:0:
+421,157,238731,2,0,L|513:166,1,52.4999983978272,8|8,0:0|0:0,0:0:0:0:
+227,207,238942,2,0,L|174:201,1,52.4999983978272,8|8,0:0|0:0,0:0:0:0:
+223,319,239153,2,0,L|170:313,1,52.4999983978272,8|8,0:0|0:0,0:0:0:0:
+475,370,239364,5,12,0:0:0:0:
+496,228,239576,1,2,0:0:0:0:
+380,344,239787,5,8,0:0:0:0:
+405,173,239999,1,2,0:0:0:0:
+272,320,240209,5,8,0:0:0:0:
+302,114,240421,1,2,0:0:0:0:
+156,300,240632,5,8,0:0:0:0:
+192,52,240844,1,2,0:0:0:0:
+20,164,241055,5,12,0:0:0:0:
+252,84,241267,1,0,0:0:0:0:
+40,8,241477,5,8,0:0:0:0:
+240,164,241689,1,2,0:0:0:0:
+116,28,241900,5,8,0:0:0:0:
+80,274,242111,1,2,0:0:0:0:
+32,88,242322,5,8,0:0:0:0:
+227,242,242534,1,2,0:0:0:0:
+218,61,242745,6,0,L|241:172,1,104.999996795654,12|0,0:0|0:0,0:0:0:0:
+131,120,243167,2,0,L|23:84,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+292,32,243590,2,0,L|315:143,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+132,204,244012,2,2,L|24:168,1,104.999996795654,10|2,0:0|0:0,0:0:0:0:
+368,4,244435,6,0,L|396:164,1,150,12|0,0:0|0:0,0:0:0:0:
+136,288,245280,2,8,L|20:252,1,112.5
+28,254,245702,1,8,0:0:0:0:
+204,244,245914,5,8,0:0:0:0:
+204,244,246020,1,8,0:0:0:0:
+204,244,246125,2,0,P|220:296|188:348,1,104.999996795654,12|2,0:0|0:0,0:0:0:0:
+100,188,246547,2,0,P|78:141|94:92,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+120,272,246970,2,0,P|68:288|16:256,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+176,160,247393,2,2,P|228:144|280:176,1,104.999996795654,10|2,0:0|0:0,0:0:0:0:
+277,260,247815,6,0,P|255:213|271:164,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+357,288,248238,2,0,P|327:329|276:340,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+341,208,248660,2,2,P|392:212|426:251,1,104.999996795654,10|2,0:0|0:0,0:0:0:0:
+276,340,249083,1,10,0:0:0:0:
+341,208,249294,1,2,0:0:0:0:
+200,120,249505,6,0,P|152:104|92:128,1,104.999996795654,12|2,0:0|0:0,0:0:0:0:
+64,300,249928,1,8,0:0:0:0:
+152,176,250139,1,2,0:0:0:0:
+12,196,250350,1,8,0:0:0:0:
+164,210,250561,1,2,0:0:0:0:
+32,88,250773,1,10,0:0:0:0:
+49,269,250984,1,2,0:0:0:0:
+218,129,251195,5,8,0:0:0:0:
+293,294,251406,1,2,0:0:0:0:
+341,84,251618,1,8,0:0:0:0:
+164,210,251829,1,2,0:0:0:0:
+400,176,252040,1,10,0:0:0:0:
+232,80,252251,1,2,0:0:0:0:
+340,272,252463,1,10,0:0:0:0:
+456,80,252674,1,2,0:0:0:0:
+452,316,252885,5,12,0:0:0:0:
+452,316,253307,2,0,L|480:188,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+284,220,253730,2,0,L|312:92,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+116,132,254153,2,2,L|144:4,1,104.999996795654,10|2,0:0|0:0,0:0:0:0:
+36,236,254576,5,12,0:0:0:0:
+36,236,254998,2,0,B|120:232|120:232|104:268,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+204,152,255421,2,2,B|288:148|288:148|272:184,1,104.999996795654,10|2,0:0|0:0,0:0:0:0:
+356,56,255843,2,2,B|440:52|440:52|424:88,1,104.999996795654,10|2,0:0|0:0,0:0:0:0:
+356,204,256266,5,12,0:0:0:0:
+356,204,256688,2,0,P|376:248|344:312,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+252,184,257111,1,8,0:0:0:0:
+296,340,257322,1,2,0:0:0:0:
+192,272,257533,2,2,L|316:252,1,104.999996795654,10|2,0:0|0:0,0:0:0:0:
+117,119,257956,5,12,0:0:0:0:
+285,31,258167,1,2,0:0:0:0:
+137,31,258378,1,8,0:0:0:0:
+305,119,258589,1,2,0:0:0:0:
+49,55,258801,1,8,0:0:0:0:
+26,101,258906,1,8,0:0:0:0:
+32,153,259012,1,8,0:0:0:0:
+64,194,259117,1,8,0:0:0:0:
+112,212,259223,1,12,0:0:0:0:
+255,75,259435,1,8,0:0:0:0:
+240,252,259646,5,12,0:0:0:0:
+112,212,259857,1,0,0:0:0:0:
+236,330,260068,1,8,0:0:0:0:
+114,133,260280,1,2,0:0:0:0:
+146,308,260491,1,8,0:0:0:0:
+204,154,260702,1,2,0:0:0:0:
+51,304,260914,1,10,0:0:0:0:
+298,156,261125,1,2,0:0:0:0:
+28,232,261336,6,0,P|44:180|16:124,1,104.999996795654,12|0,0:0|0:0,0:0:0:0:
+320,228,261759,2,0,P|304:280|332:336,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+64,208,262181,2,2,P|76:149|40:90,1,104.999996795654,10|2,0:0|0:0,0:0:0:0:
+364,248,262604,2,2,P|351:307|387:365,1,104.999996795654,10|2,0:0|0:0,0:0:0:0:
+484,148,263026,6,4,B|448:184|448:184|320:136,1,157.499995193482,12|0,0:0|0:0,0:0:0:0:
+315,131,263449,2,0,P|268:112|218:124,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+192,300,263871,1,8,0:0:0:0:
+264,188,264083,1,2,0:0:0:0:
+172,208,264294,1,10,0:0:0:0:
+284,280,264506,1,2,0:0:0:0:
+160,44,264716,6,0,B|124:80|124:80|172:208,1,157.499995193482,12|0,0:0|0:0,0:0:0:0:
+172,208,265139,2,0,P|184:258|164:305,1,104.999996795654,8|2,0:0|0:0,0:0:0:0:
+104,252,265562,1,10,0:0:0:0:
+264,352,265773,1,2,0:0:0:0:
+76,352,265984,1,10,0:0:0:0:
+248,252,266195,1,2,0:0:0:0:
+132,112,266407,5,12,0:0:0:0:
+22,288,266618,1,2,0:0:0:0:
+22,81,266829,1,8,0:0:0:0:
+132,270,267040,1,2,0:0:0:0:
+240,112,267252,1,8,0:0:0:0:
+350,288,267463,1,2,0:0:0:0:
+350,81,267674,1,8,0:0:0:0:
+240,270,267885,1,2,0:0:0:0:
+512,212,268097,5,12,0:0:0:0:
+290,94,268308,1,2,0:0:0:0:
+415,310,268519,1,8,0:0:0:0:
+417,47,268730,1,2,0:0:0:0:
+168,180,268942,1,8,0:0:0:0:
+416,214,269153,1,2,0:0:0:0:
+225,54,269364,1,10,0:0:0:0:
+313,302,269576,1,2,0:0:0:0:
+376,172,269787,5,12,0:0:0:0:
+177,242,269998,1,2,0:0:0:0:
+345,147,270209,1,8,0:0:0:0:
+215,254,270420,1,2,0:0:0:0:
+325,146,270632,1,8,0:0:0:0:
+237,249,270843,1,2,0:0:0:0:
+333,238,271055,1,8,0:0:0:0:
+230,151,271266,1,2,0:0:0:0:
+292,312,271477,1,12,0:0:0:0:
+256,192,271583,12,0,272745,0:0:0:0:
+163,256,273167,6,0,P|123:240|67:256,1,89.9999972534181,14|0,0:0|0:0,0:0:0:0:
+68,364,273590,1,10,0:0:0:0:
+236,324,273801,1,2,0:0:0:0:
+79,249,274012,2,0,L|91:141,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+280,264,274435,2,0,L|290:354,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+420,130,274857,5,2,0:0:0:0:
+373,261,275068,1,0,0:0:0:0:
+512,227,275279,1,10,0:0:0:0:
+354,183,275491,1,0,0:0:0:0:
+308,358,275702,1,10,0:0:0:0:
+478,313,275913,1,0,0:0:0:0:
+245,278,276125,1,8,0:0:0:0:
+482,205,276336,1,2,0:0:0:0:
+349,94,276547,6,0,L|357:218,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+239,240,276970,2,0,P|185:217|141:241,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+0,268,277393,2,0,P|44:276|82:254,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+128,380,277815,2,0,P|152:326|128:282,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+116,96,278237,6,0,P|93:151|117:195,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+104,16,278660,2,0,P|50:38|35:87,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+180,48,279082,1,10,0:0:0:0:
+32,140,279294,1,2,0:0:0:0:
+180,48,279505,1,10,0:0:0:0:
+140,216,279717,1,2,0:0:0:0:
+265,71,279928,6,0,P|240:132|260:184,1,89.9999972534181,14|0,0:0|0:0,0:0:0:0:
+416,248,280350,1,10,0:0:0:0:
+316,132,280562,1,2,0:0:0:0:
+252,264,280773,2,0,L|360:252,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+484,148,281196,2,0,L|394:138,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+426,338,281618,6,0,L|417:249,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+326,43,282041,2,0,L|316:133,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+296,296,282463,1,10,0:0:0:0:
+417,249,282674,1,0,0:0:0:0:
+248,216,282885,1,10,0:0:0:0:
+321,376,283097,1,0,0:0:0:0:
+370,163,283308,6,0,L|382:55,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+248,216,283730,2,0,L|260:108,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+122,266,284153,2,0,L|134:158,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+200,280,284575,1,10,0:0:0:0:
+56,144,284787,1,0,0:0:0:0:
+69,335,284998,6,0,P|110:353|152:340,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+213,180,285420,2,0,P|173:163|131:176,1,89.9999972534181,10|0,0:0|0:0,0:0:0:0:
+304,272,285843,1,8,0:0:0:0:
+299,228,285948,1,8,0:0:0:0:
+294,183,286054,1,8,0:0:0:0:
+288,138,286159,1,8,0:0:0:0:
+283,94,286265,1,12,0:0:0:0:
+164,52,286477,5,8,0:0:0:0:
+164,52,286583,1,8,0:0:0:0:
+164,52,286688,2,0,B|194:164|194:164|114:260|114:260|236:263|236:263|299:364|299:364|339:251|339:251|455:226|455:226|361:152|361:152|373:36|373:36|275:99|275:99|218:72,1,1124.99994039536,4|0,0:0|0:0,0:1:0:0:
+228,76,293238,5,0,0:0:0:0:
+256,192,293343,12,0,301900,0:0:0:0:
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/basic-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/basic-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/basic-expected-conversion.json
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/basic-expected-conversion.json
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/basic.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/basic.osu
similarity index 96%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/basic.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/basic.osu
index 40b4409760..abd2ff2ee6 100644
--- a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/basic.osu
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/basic.osu
@@ -1,27 +1,27 @@
-osu file format v14
-
-[Difficulty]
-HPDrainRate:6
-CircleSize:4
-OverallDifficulty:7
-ApproachRate:8.3
-SliderMultiplier:1.6
-SliderTickRate:1
-
-[TimingPoints]
-500,500,4,2,1,50,1,0
-13426,-100,4,3,1,45,0,0
-14884,-100,4,2,1,50,0,0
-
-[HitObjects]
-96,192,500,6,0,L|416:192,2,320
-256,192,3000,12,0,4000,0:0:0:0:
-256,192,4500,12,0,5500,0:0:0:0:
-256,192,6000,12,0,6500,0:0:0:0:
-256,128,7000,6,0,L|352:128,4,80
-32,192,8500,6,0,B|32:384|256:384|256:192|256:192|256:0|512:0|512:192,1,800
-256,192,11500,12,0,12000,0:0:0:0:
-512,320,12500,6,0,B|0:256|0:256|512:96|512:96|256:32,1,1280
-256,256,17000,6,0,L|160:256,4,80
-256,192,18500,12,0,19450,0:0:0:0:
-216,231,19875,6,0,B|216:135|280:135|344:135|344:199|344:263|248:327|248:327|120:327|120:327|56:39|408:39|408:39|472:150|408:342,1,1280
+osu file format v14
+
+[Difficulty]
+HPDrainRate:6
+CircleSize:4
+OverallDifficulty:7
+ApproachRate:8.3
+SliderMultiplier:1.6
+SliderTickRate:1
+
+[TimingPoints]
+500,500,4,2,1,50,1,0
+13426,-100,4,3,1,45,0,0
+14884,-100,4,2,1,50,0,0
+
+[HitObjects]
+96,192,500,6,0,L|416:192,2,320
+256,192,3000,12,0,4000,0:0:0:0:
+256,192,4500,12,0,5500,0:0:0:0:
+256,192,6000,12,0,6500,0:0:0:0:
+256,128,7000,6,0,L|352:128,4,80
+32,192,8500,6,0,B|32:384|256:384|256:192|256:192|256:0|512:0|512:192,1,800
+256,192,11500,12,0,12000,0:0:0:0:
+512,320,12500,6,0,B|0:256|0:256|512:96|512:96|256:32,1,1280
+256,256,17000,6,0,L|160:256,4,80
+256,192,18500,12,0,19450,0:0:0:0:
+216,231,19875,6,0,B|216:135|280:135|344:135|344:199|344:263|248:327|248:327|120:327|120:327|56:39|408:39|408:39|472:150|408:342,1,1280
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/colinear-perfect-curve.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/colinear-perfect-curve.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/diffcalc-test.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/diffcalc-test.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/diffcalc-test.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/diffcalc-test.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/multi-segment-slider.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/multi-segment-slider.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider-expected-conversion.json
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/nan-slider.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/nan-slider.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/old-stacking-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/old-stacking-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/old-stacking-expected-conversion.json
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/old-stacking-expected-conversion.json
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/old-stacking.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/old-stacking.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/old-stacking.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/old-stacking.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/repeat-slider-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/repeat-slider-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/repeat-slider-expected-conversion.json
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/repeat-slider-expected-conversion.json
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/repeat-slider.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/repeat-slider.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/repeat-slider.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/repeat-slider.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-paths-edge-case-expected-conversion.json
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-paths-edge-case.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-paths-edge-case.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-paths-edge-case.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
similarity index 99%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
index 6d97b643b1..0bfe776dc7 100644
--- a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-ticks-edge-case-expected-conversion.json
@@ -13,16 +13,6 @@
             "Y": 0.0
           }
         },
-        {
-          "StartTime": 7817.0,
-          "EndTime": 7817.0,
-          "X": 30.9946651,
-          "Y": 208.5157,
-          "StackOffset": {
-            "X": 0.0,
-            "Y": 0.0
-          }
-        },
         {
           "StartTime": 7843.0,
           "EndTime": 7843.0,
@@ -32,8 +22,18 @@
             "X": 0.0,
             "Y": 0.0
           }
+        },
+        {
+          "StartTime": 7817.0,
+          "EndTime": 7817.0,
+          "X": 30.9946651,
+          "Y": 208.5157,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
         }
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-ticks-edge-case.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-ticks-expected-conversion.json
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks-expected-conversion.json
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-ticks-expected-conversion.json
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-ticks.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/slider-ticks.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/slider-ticks.osu
diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/uneven-repeat-slider-expected-conversion.json b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/uneven-repeat-slider-expected-conversion.json
new file mode 100644
index 0000000000..dda9078e57
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/uneven-repeat-slider-expected-conversion.json
@@ -0,0 +1,579 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 369.0,
+      "Objects": [
+        {
+          "StartTime": 369.0,
+          "EndTime": 369.0,
+          "X": 127.0,
+          "Y": 194.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 450.0,
+          "EndTime": 450.0,
+          "X": 166.53389,
+          "Y": 193.8691,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 532.0,
+          "EndTime": 532.0,
+          "X": 206.555847,
+          "Y": 193.736572,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 614.0,
+          "EndTime": 614.0,
+          "X": 246.57782,
+          "Y": 193.60405,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 696.0,
+          "EndTime": 696.0,
+          "X": 286.5998,
+          "Y": 193.471527,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 778.0,
+          "EndTime": 778.0,
+          "X": 326.621765,
+          "Y": 193.339,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 860.0,
+          "EndTime": 860.0,
+          "X": 366.6437,
+          "Y": 193.206482,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 942.0,
+          "EndTime": 942.0,
+          "X": 406.66568,
+          "Y": 193.073959,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 970.0,
+          "EndTime": 970.0,
+          "X": 420.331726,
+          "Y": 193.0287,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 997.0,
+          "EndTime": 997.0,
+          "X": 407.153748,
+          "Y": 193.072342,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1079.0,
+          "EndTime": 1079.0,
+          "X": 367.131775,
+          "Y": 193.204865,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1161.0,
+          "EndTime": 1161.0,
+          "X": 327.1098,
+          "Y": 193.337387,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1243.0,
+          "EndTime": 1243.0,
+          "X": 287.08783,
+          "Y": 193.46991,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1325.0,
+          "EndTime": 1325.0,
+          "X": 247.0659,
+          "Y": 193.602432,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1407.0,
+          "EndTime": 1407.0,
+          "X": 207.043915,
+          "Y": 193.734955,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1489.0,
+          "EndTime": 1489.0,
+          "X": 167.021988,
+          "Y": 193.867477,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1571.0,
+          "EndTime": 1571.0,
+          "X": 127.0,
+          "Y": 194.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1653.0,
+          "EndTime": 1653.0,
+          "X": 167.021988,
+          "Y": 193.867477,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1735.0,
+          "EndTime": 1735.0,
+          "X": 207.043976,
+          "Y": 193.734955,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1817.0,
+          "EndTime": 1817.0,
+          "X": 247.065887,
+          "Y": 193.602432,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1899.0,
+          "EndTime": 1899.0,
+          "X": 287.08783,
+          "Y": 193.46991,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 1981.0,
+          "EndTime": 1981.0,
+          "X": 327.1098,
+          "Y": 193.337387,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2062.0,
+          "EndTime": 2062.0,
+          "X": 366.643738,
+          "Y": 193.206482,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2144.0,
+          "EndTime": 2144.0,
+          "X": 406.665649,
+          "Y": 193.073959,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2172.0,
+          "EndTime": 2172.0,
+          "X": 420.331726,
+          "Y": 193.0287,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2199.0,
+          "EndTime": 2199.0,
+          "X": 407.153748,
+          "Y": 193.072342,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2281.0,
+          "EndTime": 2281.0,
+          "X": 367.1318,
+          "Y": 193.204865,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2363.0,
+          "EndTime": 2363.0,
+          "X": 327.1098,
+          "Y": 193.337387,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2445.0,
+          "EndTime": 2445.0,
+          "X": 287.08783,
+          "Y": 193.46991,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2527.0,
+          "EndTime": 2527.0,
+          "X": 247.065887,
+          "Y": 193.602432,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2609.0,
+          "EndTime": 2609.0,
+          "X": 207.043976,
+          "Y": 193.734955,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2691.0,
+          "EndTime": 2691.0,
+          "X": 167.021988,
+          "Y": 193.867477,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2773.0,
+          "EndTime": 2773.0,
+          "X": 127.0,
+          "Y": 194.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2855.0,
+          "EndTime": 2855.0,
+          "X": 167.021988,
+          "Y": 193.867477,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 2937.0,
+          "EndTime": 2937.0,
+          "X": 207.043976,
+          "Y": 193.734955,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3019.0,
+          "EndTime": 3019.0,
+          "X": 247.065948,
+          "Y": 193.602432,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3101.0,
+          "EndTime": 3101.0,
+          "X": 287.087952,
+          "Y": 193.46991,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3183.0,
+          "EndTime": 3183.0,
+          "X": 327.109772,
+          "Y": 193.337387,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3265.0,
+          "EndTime": 3265.0,
+          "X": 367.131775,
+          "Y": 193.204865,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3347.0,
+          "EndTime": 3347.0,
+          "X": 407.153748,
+          "Y": 193.072342,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3374.0,
+          "EndTime": 3374.0,
+          "X": 420.331726,
+          "Y": 193.0287,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3401.0,
+          "EndTime": 3401.0,
+          "X": 407.153748,
+          "Y": 193.072342,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3483.0,
+          "EndTime": 3483.0,
+          "X": 367.131775,
+          "Y": 193.204865,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3565.0,
+          "EndTime": 3565.0,
+          "X": 327.109772,
+          "Y": 193.337387,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3647.0,
+          "EndTime": 3647.0,
+          "X": 287.087952,
+          "Y": 193.46991,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3729.0,
+          "EndTime": 3729.0,
+          "X": 247.065948,
+          "Y": 193.602432,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3811.0,
+          "EndTime": 3811.0,
+          "X": 207.043976,
+          "Y": 193.734955,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3893.0,
+          "EndTime": 3893.0,
+          "X": 167.021988,
+          "Y": 193.867477,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 3975.0,
+          "EndTime": 3975.0,
+          "X": 127.0,
+          "Y": 194.0,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 4057.0,
+          "EndTime": 4057.0,
+          "X": 167.021988,
+          "Y": 193.867477,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 4139.0,
+          "EndTime": 4139.0,
+          "X": 207.043976,
+          "Y": 193.734955,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 4221.0,
+          "EndTime": 4221.0,
+          "X": 247.065948,
+          "Y": 193.602432,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 4303.0,
+          "EndTime": 4303.0,
+          "X": 287.087952,
+          "Y": 193.46991,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 4385.0,
+          "EndTime": 4385.0,
+          "X": 327.109772,
+          "Y": 193.337387,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 4467.0,
+          "EndTime": 4467.0,
+          "X": 367.131775,
+          "Y": 193.204865,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 4549.0,
+          "EndTime": 4549.0,
+          "X": 407.153748,
+          "Y": 193.072342,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        },
+        {
+          "StartTime": 4540.0,
+          "EndTime": 4540.0,
+          "X": 420.331726,
+          "Y": 193.0287,
+          "StackOffset": {
+            "X": 0.0,
+            "Y": 0.0
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/uneven-repeat-slider.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/uneven-repeat-slider.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/uneven-repeat-slider.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/uneven-repeat-slider.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/very-fast-slider.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/very-fast-slider.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/very-fast-slider.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/very-fast-slider.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/zero-length-sliders.osu b/osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/zero-length-sliders.osu
similarity index 100%
rename from osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/zero-length-sliders.osu
rename to osu.Game.Rulesets.Osu.Tests/Resources/Testing/Beatmaps/zero-length-sliders.osu
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/uneven-repeat-slider-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/uneven-repeat-slider-expected-conversion.json
deleted file mode 100644
index 12d1645c04..0000000000
--- a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/uneven-repeat-slider-expected-conversion.json
+++ /dev/null
@@ -1,348 +0,0 @@
-{
-    "Mappings": [{
-        "StartTime": 369,
-        "Objects": [{
-                "StartTime": 369,
-                "EndTime": 369,
-                "X": 127,
-                "Y": 194
-            },
-            {
-                "StartTime": 450,
-                "EndTime": 450,
-                "X": 166.53389,
-                "Y": 193.8691
-            },
-            {
-                "StartTime": 532,
-                "EndTime": 532,
-                "X": 206.555847,
-                "Y": 193.736572
-            },
-            {
-                "StartTime": 614,
-                "EndTime": 614,
-                "X": 246.57782,
-                "Y": 193.60405
-            },
-            {
-                "StartTime": 696,
-                "EndTime": 696,
-                "X": 286.5998,
-                "Y": 193.471527
-            },
-            {
-                "StartTime": 778,
-                "EndTime": 778,
-                "X": 326.621765,
-                "Y": 193.339
-            },
-            {
-                "StartTime": 860,
-                "EndTime": 860,
-                "X": 366.6437,
-                "Y": 193.206482
-            },
-            {
-                "StartTime": 942,
-                "EndTime": 942,
-                "X": 406.66568,
-                "Y": 193.073959
-            },
-            {
-                "StartTime": 970,
-                "EndTime": 970,
-                "X": 420.331726,
-                "Y": 193.0287
-            },
-            {
-                "StartTime": 997,
-                "EndTime": 997,
-                "X": 407.153748,
-                "Y": 193.072342
-            },
-            {
-                "StartTime": 1079,
-                "EndTime": 1079,
-                "X": 367.131775,
-                "Y": 193.204865
-            },
-            {
-                "StartTime": 1161,
-                "EndTime": 1161,
-                "X": 327.1098,
-                "Y": 193.337387
-            },
-            {
-                "StartTime": 1243,
-                "EndTime": 1243,
-                "X": 287.08783,
-                "Y": 193.46991
-            },
-            {
-                "StartTime": 1325,
-                "EndTime": 1325,
-                "X": 247.0659,
-                "Y": 193.602432
-            },
-            {
-                "StartTime": 1407,
-                "EndTime": 1407,
-                "X": 207.043915,
-                "Y": 193.734955
-            },
-            {
-                "StartTime": 1489,
-                "EndTime": 1489,
-                "X": 167.021988,
-                "Y": 193.867477
-            },
-            {
-                "StartTime": 1571,
-                "EndTime": 1571,
-                "X": 127,
-                "Y": 194
-            },
-            {
-                "StartTime": 1653,
-                "EndTime": 1653,
-                "X": 167.021988,
-                "Y": 193.867477
-            },
-            {
-                "StartTime": 1735,
-                "EndTime": 1735,
-                "X": 207.043976,
-                "Y": 193.734955
-            },
-            {
-                "StartTime": 1817,
-                "EndTime": 1817,
-                "X": 247.065887,
-                "Y": 193.602432
-            },
-            {
-                "StartTime": 1899,
-                "EndTime": 1899,
-                "X": 287.08783,
-                "Y": 193.46991
-            },
-            {
-                "StartTime": 1981,
-                "EndTime": 1981,
-                "X": 327.1098,
-                "Y": 193.337387
-            },
-            {
-                "StartTime": 2062,
-                "EndTime": 2062,
-                "X": 366.643738,
-                "Y": 193.206482
-            },
-            {
-                "StartTime": 2144,
-                "EndTime": 2144,
-                "X": 406.665649,
-                "Y": 193.073959
-            },
-            {
-                "StartTime": 2172,
-                "EndTime": 2172,
-                "X": 420.331726,
-                "Y": 193.0287
-            },
-            {
-                "StartTime": 2199,
-                "EndTime": 2199,
-                "X": 407.153748,
-                "Y": 193.072342
-            },
-            {
-                "StartTime": 2281,
-                "EndTime": 2281,
-                "X": 367.1318,
-                "Y": 193.204865
-            },
-            {
-                "StartTime": 2363,
-                "EndTime": 2363,
-                "X": 327.1098,
-                "Y": 193.337387
-            },
-            {
-                "StartTime": 2445,
-                "EndTime": 2445,
-                "X": 287.08783,
-                "Y": 193.46991
-            },
-            {
-                "StartTime": 2527,
-                "EndTime": 2527,
-                "X": 247.065887,
-                "Y": 193.602432
-            },
-            {
-                "StartTime": 2609,
-                "EndTime": 2609,
-                "X": 207.043976,
-                "Y": 193.734955
-            },
-            {
-                "StartTime": 2691,
-                "EndTime": 2691,
-                "X": 167.021988,
-                "Y": 193.867477
-            },
-            {
-                "StartTime": 2773,
-                "EndTime": 2773,
-                "X": 127,
-                "Y": 194
-            },
-            {
-                "StartTime": 2855,
-                "EndTime": 2855,
-                "X": 167.021988,
-                "Y": 193.867477
-            },
-            {
-                "StartTime": 2937,
-                "EndTime": 2937,
-                "X": 207.043976,
-                "Y": 193.734955
-            },
-            {
-                "StartTime": 3019,
-                "EndTime": 3019,
-                "X": 247.065948,
-                "Y": 193.602432
-            },
-            {
-                "StartTime": 3101,
-                "EndTime": 3101,
-                "X": 287.087952,
-                "Y": 193.46991
-            },
-            {
-                "StartTime": 3183,
-                "EndTime": 3183,
-                "X": 327.109772,
-                "Y": 193.337387
-            },
-            {
-                "StartTime": 3265,
-                "EndTime": 3265,
-                "X": 367.131775,
-                "Y": 193.204865
-            },
-            {
-                "StartTime": 3347,
-                "EndTime": 3347,
-                "X": 407.153748,
-                "Y": 193.072342
-            },
-            {
-                "StartTime": 3374,
-                "EndTime": 3374,
-                "X": 420.331726,
-                "Y": 193.0287
-            },
-            {
-                "StartTime": 3401,
-                "EndTime": 3401,
-                "X": 407.153748,
-                "Y": 193.072342
-            },
-            {
-                "StartTime": 3483,
-                "EndTime": 3483,
-                "X": 367.131775,
-                "Y": 193.204865
-            },
-            {
-                "StartTime": 3565,
-                "EndTime": 3565,
-                "X": 327.109772,
-                "Y": 193.337387
-            },
-            {
-                "StartTime": 3647,
-                "EndTime": 3647,
-                "X": 287.087952,
-                "Y": 193.46991
-            },
-            {
-                "StartTime": 3729,
-                "EndTime": 3729,
-                "X": 247.065948,
-                "Y": 193.602432
-            },
-            {
-                "StartTime": 3811,
-                "EndTime": 3811,
-                "X": 207.043976,
-                "Y": 193.734955
-            },
-            {
-                "StartTime": 3893,
-                "EndTime": 3893,
-                "X": 167.021988,
-                "Y": 193.867477
-            },
-            {
-                "StartTime": 3975,
-                "EndTime": 3975,
-                "X": 127,
-                "Y": 194
-            },
-            {
-                "StartTime": 4057,
-                "EndTime": 4057,
-                "X": 167.021988,
-                "Y": 193.867477
-            },
-            {
-                "StartTime": 4139,
-                "EndTime": 4139,
-                "X": 207.043976,
-                "Y": 193.734955
-            },
-            {
-                "StartTime": 4221,
-                "EndTime": 4221,
-                "X": 247.065948,
-                "Y": 193.602432
-            },
-            {
-                "StartTime": 4303,
-                "EndTime": 4303,
-                "X": 287.087952,
-                "Y": 193.46991
-            },
-            {
-                "StartTime": 4385,
-                "EndTime": 4385,
-                "X": 327.109772,
-                "Y": 193.337387
-            },
-            {
-                "StartTime": 4467,
-                "EndTime": 4467,
-                "X": 367.131775,
-                "Y": 193.204865
-            },
-            {
-                "StartTime": 4540,
-                "EndTime": 4540,
-                "X": 420.331726,
-                "Y": 193.0287
-            },
-            {
-                "StartTime": 4549,
-                "EndTime": 4549,
-                "X": 407.153748,
-                "Y": 193.072342
-            }
-        ]
-    }]
-}
\ No newline at end of file

From 07dc44ccd769213a1078ac36bd867c7f6ee300f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Dec 2023 16:18:54 +0900
Subject: [PATCH 1905/2296] Make log export async and show notification on
 completion

---
 .../Sections/General/UpdateSettings.cs        | 62 +++++++++++++------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index 398e4b39af..a8f5b655d0 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -31,8 +31,11 @@ namespace osu.Game.Overlays.Settings.Sections.General
         [Resolved]
         private INotificationOverlay? notifications { get; set; }
 
+        [Resolved]
+        private Storage storage { get; set; } = null!;
+
         [BackgroundDependencyLoader]
-        private void load(Storage storage, OsuConfigManager config, OsuGame game)
+        private void load(OsuConfigManager config, OsuGame game)
         {
             Add(new SettingsEnumDropdown<ReleaseStream>
             {
@@ -78,23 +81,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 {
                     Text = GeneralSettingsStrings.ExportLogs,
                     Keywords = new[] { @"bug", "report", "logs", "files" },
-                    Action = () =>
-                    {
-                        var logStorage = Logger.Storage;
-
-                        const string archive_filename = "exports/compressed-logs.zip";
-
-                        using (var outStream = storage.CreateFileSafely(archive_filename))
-                        using (var zip = ZipArchive.Create())
-                        {
-                            foreach (string? f in logStorage.GetFiles(string.Empty, "*.log"))
-                                zip.AddEntry(f, logStorage.GetStream(f), true);
-
-                            zip.SaveTo(outStream);
-                        }
-
-                        storage.PresentFileExternally(archive_filename);
-                    },
+                    Action = () => Task.Run(exportLogs),
                 });
 
                 Add(new SettingsButton
@@ -104,5 +91,44 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 });
             }
         }
+
+        private void exportLogs()
+        {
+            ProgressNotification notification = new ProgressNotification
+            {
+                State = ProgressNotificationState.Active,
+                Text = "Exporting logs...",
+            };
+
+            notifications?.Post(notification);
+
+            const string archive_filename = "exports/compressed-logs.zip";
+
+            try
+            {
+                var logStorage = Logger.Storage;
+
+                using (var outStream = storage.CreateFileSafely(archive_filename))
+                using (var zip = ZipArchive.Create())
+                {
+                    foreach (string? f in logStorage.GetFiles(string.Empty, "*.log")) zip.AddEntry(f, logStorage.GetStream(f), true);
+
+                    zip.SaveTo(outStream);
+                }
+            }
+            catch
+            {
+                notification.State = ProgressNotificationState.Cancelled;
+
+                // cleanup if export is failed or canceled.
+                storage.Delete(archive_filename);
+                throw;
+            }
+
+            notification.CompletionText = "Exported logs! Click to view.";
+            notification.CompletionClickAction = () => storage.PresentFileExternally(archive_filename);
+
+            notification.State = ProgressNotificationState.Completed;
+        }
     }
 }

From 856310e954fd0a5b25ba20a26239a314bc2363ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 7 Dec 2023 08:22:01 +0100
Subject: [PATCH 1906/2296] Remove reference to removed comment from another
 comment

---
 osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index 4a217a19ea..838bd35dd4 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -50,9 +50,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                 double startTime = obj.StartTime;
                 double endTime = obj.GetEndTime();
 
-                // as stated in the inline comment above, this is locally bringing back
-                // the stable treatment of the "legacy last tick" just to make sure
-                // that the conversion output matches.
+                // this is locally bringing back the stable treatment of the "legacy last tick"
+                // just to make sure that the conversion output matches.
                 // compare: `SliderEventGenerator.Generate()`, and the calculation of `legacyLastTickTime`.
                 if (obj is SliderTailCircle && parent is Slider slider)
                 {

From 323808ad1e915ef2b9f2aeb5b9846ba8f92cc9dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Dec 2023 16:34:26 +0900
Subject: [PATCH 1907/2296] Add more inline commenting around
 `VELOCITY_MULTIPLIER` application to `TimeRange`

---
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 88085dfe97..49b0ad811d 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -71,14 +71,18 @@ namespace osu.Game.Rulesets.Taiko.UI
         protected virtual double ComputeTimeRange()
         {
             // Taiko scrolls at a constant 100px per 1000ms. More notes become visible as the playfield is lengthened.
-            const float scroll_rate = 10 / TaikoBeatmapConverter.VELOCITY_MULTIPLIER;
+            const float scroll_rate = 10;
 
             // Since the time range will depend on a positional value, it is referenced to the x480 pixel space.
             // Width is used because it defines how many notes fit on the playfield.
             // We clamp the ratio to the maximum aspect ratio to keep scroll speed consistent on widths lower than the default.
             float ratio = Math.Max(DrawSize.X / 768f, TaikoPlayfieldAdjustmentContainer.MAXIMUM_ASPECT);
 
-            return (Playfield.HitObjectContainer.DrawWidth / ratio) * scroll_rate;
+            // Stable internally increased the slider velocity of objects by a factor of `VELOCITY_MULTIPLIER`.
+            // To simulate this, we shrink the time range by that factor here.
+            // This, when combined with the rest of the scrolling ruleset machinery (see `MultiplierControlPoint` et al.),
+            // has the effect of increasing each multiplier control point's multiplier by `VELOCITY_MULTIPLIER`, ensuring parity with stable.
+            return (Playfield.HitObjectContainer.DrawWidth / ratio) * scroll_rate / TaikoBeatmapConverter.VELOCITY_MULTIPLIER;
         }
 
         protected override void UpdateAfterChildren()

From 0fe2e1e8d60bde53ded276d1787d8404c6035570 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 8 Dec 2023 16:33:10 +0900
Subject: [PATCH 1908/2296] Re-fix mania conversion following new discoveries

---
 .../Beatmaps/100374-expected-conversion.json  |   2 +-
 .../Beatmaps/20544-expected-conversion.json   |   2 +-
 .../Beatmaps/basic-expected-conversion.json   | 296 ++++++++++--------
 ...ero-length-slider-expected-conversion.json |  28 +-
 .../Patterns/Legacy/PatternGenerator.cs       |   8 +-
 5 files changed, 186 insertions(+), 150 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374-expected-conversion.json
index 59f73f7ad4..59cf6d2672 100644
--- a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/100374-expected-conversion.json
@@ -1 +1 @@
-{"Mappings":[{"RandomW":273084013,"RandomX":842502087,"RandomY":3579807591,"RandomZ":273326509,"StartTime":15562.0,"Objects":[{"StartTime":15562.0,"EndTime":17155.0,"Column":0}]},{"RandomW":2659258901,"RandomX":3579807591,"RandomY":273326509,"RandomZ":273084013,"StartTime":17686.0,"Objects":[{"StartTime":17686.0,"EndTime":17686.0,"Column":0},{"StartTime":17686.0,"EndTime":17686.0,"Column":1}]},{"RandomW":3083655709,"RandomX":273326509,"RandomY":273084013,"RandomZ":2659258901,"StartTime":17951.0,"Objects":[{"StartTime":17951.0,"EndTime":17951.0,"Column":1}]},{"RandomW":3588026162,"RandomX":2659258901,"RandomY":3083655709,"RandomZ":4073603712,"StartTime":18217.0,"Objects":[{"StartTime":18217.0,"EndTime":18217.0,"Column":2},{"StartTime":18217.0,"EndTime":18217.0,"Column":4}]},{"RandomW":1130061350,"RandomX":3083655709,"RandomY":4073603712,"RandomZ":3588026162,"StartTime":18482.0,"Objects":[{"StartTime":18482.0,"EndTime":18482.0,"Column":2}]},{"RandomW":315421426,"RandomX":3588026162,"RandomY":1130061350,"RandomZ":2459334754,"StartTime":18748.0,"Objects":[{"StartTime":18748.0,"EndTime":19013.0,"Column":0}]},{"RandomW":3110660773,"RandomX":2459334754,"RandomY":315421426,"RandomZ":542845670,"StartTime":19279.0,"Objects":[{"StartTime":19279.0,"EndTime":19809.0,"Column":3},{"StartTime":19544.0,"EndTime":19544.0,"Column":1},{"StartTime":19809.0,"EndTime":19809.0,"Column":1}]},{"RandomW":3110660773,"RandomX":2459334754,"RandomY":315421426,"RandomZ":542845670,"StartTime":20075.0,"Objects":[{"StartTime":20075.0,"EndTime":20075.0,"Column":4},{"StartTime":20075.0,"EndTime":20075.0,"Column":2}]},{"RandomW":2552021122,"RandomX":315421426,"RandomY":542845670,"RandomZ":3110660773,"StartTime":20341.0,"Objects":[{"StartTime":20341.0,"EndTime":20341.0,"Column":3}]},{"RandomW":3979536913,"RandomX":542845670,"RandomY":3110660773,"RandomZ":2552021122,"StartTime":20606.0,"Objects":[{"StartTime":20606.0,"EndTime":20606.0,"Column":2},{"StartTime":20606.0,"EndTime":20606.0,"Column":3}]},{"RandomW":3926138036,"RandomX":2552021122,"RandomY":3979536913,"RandomZ":348643659,"StartTime":20871.0,"Objects":[{"StartTime":20871.0,"EndTime":21401.0,"Column":4}]},{"RandomW":4001028953,"RandomX":348643659,"RandomY":3926138036,"RandomZ":2489502118,"StartTime":21933.0,"Objects":[{"StartTime":21933.0,"EndTime":22198.0,"Column":5}]},{"RandomW":263714783,"RandomX":2489502118,"RandomY":4001028953,"RandomZ":3315380836,"StartTime":22464.0,"Objects":[{"StartTime":22464.0,"EndTime":22729.0,"Column":0}]},{"RandomW":3045229215,"RandomX":3315380836,"RandomY":263714783,"RandomZ":2367299702,"StartTime":22995.0,"Objects":[{"StartTime":22995.0,"EndTime":23791.0,"Column":2}]},{"RandomW":622075324,"RandomX":2367299702,"RandomY":3045229215,"RandomZ":2511145433,"StartTime":24057.0,"Objects":[{"StartTime":24057.0,"EndTime":24322.0,"Column":1}]},{"RandomW":1428674661,"RandomX":3630592823,"RandomY":628640291,"RandomZ":2684635853,"StartTime":24588.0,"Objects":[{"StartTime":24588.0,"EndTime":24853.0,"Column":4},{"StartTime":24588.0,"EndTime":24853.0,"Column":3}]},{"RandomW":2963472042,"RandomX":3191072317,"RandomY":1509788298,"RandomZ":3677221210,"StartTime":25119.0,"Objects":[{"StartTime":25119.0,"EndTime":25649.0,"Column":2}]},{"RandomW":2441208973,"RandomX":1509788298,"RandomY":3677221210,"RandomZ":2963472042,"StartTime":26181.0,"Objects":[{"StartTime":26181.0,"EndTime":26181.0,"Column":2},{"StartTime":26181.0,"EndTime":26181.0,"Column":3}]},{"RandomW":614303213,"RandomX":3677221210,"RandomY":2963472042,"RandomZ":2441208973,"StartTime":26447.0,"Objects":[{"StartTime":26447.0,"EndTime":26447.0,"Column":3}]},{"RandomW":931064848,"RandomX":2441208973,"RandomY":614303213,"RandomZ":2425227013,"StartTime":26712.0,"Objects":[{"StartTime":26712.0,"EndTime":26977.0,"Column":2}]},{"RandomW":1631554006,"RandomX":2425227013,"RandomY":931064848,"RandomZ":2839921662,"StartTime":27243.0,"Objects":[{"StartTime":27243.0,"EndTime":27508.0,"Column":4}]},{"RandomW":1102544522,"RandomX":2839921662,"RandomY":1631554006,"RandomZ":2171149531,"StartTime":27774.0,"Objects":[{"StartTime":27774.0,"EndTime":28039.0,"Column":3}]},{"RandomW":1535528787,"RandomX":2171149531,"RandomY":1102544522,"RandomZ":3328843633,"StartTime":28305.0,"Objects":[{"StartTime":28305.0,"EndTime":28835.0,"Column":4},{"StartTime":28305.0,"EndTime":28305.0,"Column":3},{"StartTime":28570.0,"EndTime":28570.0,"Column":3},{"StartTime":28835.0,"EndTime":28835.0,"Column":3}]},{"RandomW":2462060348,"RandomX":1102544522,"RandomY":3328843633,"RandomZ":1535528787,"StartTime":29102.0,"Objects":[{"StartTime":29102.0,"EndTime":29102.0,"Column":3}]},{"RandomW":2548780898,"RandomX":2462060348,"RandomY":1752789184,"RandomZ":4269701929,"StartTime":29367.0,"Objects":[{"StartTime":29367.0,"EndTime":29897.0,"Column":5},{"StartTime":29367.0,"EndTime":29897.0,"Column":1}]},{"RandomW":2872444045,"RandomX":2548780898,"RandomY":96471884,"RandomZ":2795275332,"StartTime":30429.0,"Objects":[{"StartTime":30429.0,"EndTime":30694.0,"Column":2}]},{"RandomW":554186146,"RandomX":2872444045,"RandomY":1718345430,"RandomZ":1676944188,"StartTime":30960.0,"Objects":[{"StartTime":30960.0,"EndTime":31225.0,"Column":4},{"StartTime":30960.0,"EndTime":31225.0,"Column":1}]},{"RandomW":44350362,"RandomX":1676944188,"RandomY":554186146,"RandomZ":973164386,"StartTime":31491.0,"Objects":[{"StartTime":31491.0,"EndTime":32287.0,"Column":0}]},{"RandomW":2689469863,"RandomX":973164386,"RandomY":44350362,"RandomZ":3230373169,"StartTime":32553.0,"Objects":[{"StartTime":32553.0,"EndTime":32818.0,"Column":1}]},{"RandomW":3076210018,"RandomX":3230373169,"RandomY":2689469863,"RandomZ":2416196755,"StartTime":33084.0,"Objects":[{"StartTime":33084.0,"EndTime":33349.0,"Column":2}]},{"RandomW":4212524875,"RandomX":2416196755,"RandomY":3076210018,"RandomZ":736433317,"StartTime":33615.0,"Objects":[{"StartTime":33615.0,"EndTime":34145.0,"Column":5}]},{"RandomW":668643347,"RandomX":4212524875,"RandomY":1246190622,"RandomZ":614058009,"StartTime":34677.0,"Objects":[{"StartTime":34677.0,"EndTime":34677.0,"Column":0},{"StartTime":34677.0,"EndTime":34677.0,"Column":5}]},{"RandomW":4133034829,"RandomX":668643347,"RandomY":1824376828,"RandomZ":476758489,"StartTime":34942.0,"Objects":[{"StartTime":34942.0,"EndTime":34942.0,"Column":1},{"StartTime":34942.0,"EndTime":34942.0,"Column":5}]},{"RandomW":82933693,"RandomX":1824376828,"RandomY":476758489,"RandomZ":4133034829,"StartTime":35208.0,"Objects":[{"StartTime":35208.0,"EndTime":35208.0,"Column":0},{"StartTime":35208.0,"EndTime":35208.0,"Column":1}]},{"RandomW":2263995128,"RandomX":476758489,"RandomY":4133034829,"RandomZ":82933693,"StartTime":35473.0,"Objects":[{"StartTime":35473.0,"EndTime":35473.0,"Column":1}]},{"RandomW":3437211638,"RandomX":4133034829,"RandomY":82933693,"RandomZ":2263995128,"StartTime":35739.0,"Objects":[{"StartTime":35739.0,"EndTime":35739.0,"Column":2}]},{"RandomW":2107738941,"RandomX":2263995128,"RandomY":3437211638,"RandomZ":4066526803,"StartTime":36004.0,"Objects":[{"StartTime":36004.0,"EndTime":36004.0,"Column":2},{"StartTime":36004.0,"EndTime":36004.0,"Column":5}]},{"RandomW":1976561763,"RandomX":3437211638,"RandomY":4066526803,"RandomZ":2107738941,"StartTime":36270.0,"Objects":[{"StartTime":36270.0,"EndTime":36270.0,"Column":3},{"StartTime":36270.0,"EndTime":36270.0,"Column":4}]},{"RandomW":1147027763,"RandomX":4066526803,"RandomY":2107738941,"RandomZ":1976561763,"StartTime":36535.0,"Objects":[{"StartTime":36535.0,"EndTime":36535.0,"Column":3}]},{"RandomW":3580315894,"RandomX":1976561763,"RandomY":1147027763,"RandomZ":2767111989,"StartTime":36801.0,"Objects":[{"StartTime":36801.0,"EndTime":37331.0,"Column":4}]},{"RandomW":3743545041,"RandomX":1147027763,"RandomY":2767111989,"RandomZ":3580315894,"StartTime":37597.0,"Objects":[{"StartTime":37597.0,"EndTime":37597.0,"Column":1}]},{"RandomW":1409948107,"RandomX":3743545041,"RandomY":1774216159,"RandomZ":3150304957,"StartTime":37863.0,"Objects":[{"StartTime":37863.0,"EndTime":38393.0,"Column":2},{"StartTime":37863.0,"EndTime":38393.0,"Column":3}]},{"RandomW":4009340712,"RandomX":3150304957,"RandomY":1409948107,"RandomZ":2219703013,"StartTime":38925.0,"Objects":[{"StartTime":38925.0,"EndTime":39190.0,"Column":5}]},{"RandomW":3071167491,"RandomX":2065497204,"RandomY":2145154717,"RandomZ":2494378321,"StartTime":39456.0,"Objects":[{"StartTime":39456.0,"EndTime":39721.0,"Column":0},{"StartTime":39456.0,"EndTime":39721.0,"Column":2}]},{"RandomW":1245938367,"RandomX":3071167491,"RandomY":728627658,"RandomZ":3080260260,"StartTime":39987.0,"Objects":[{"StartTime":39987.0,"EndTime":40783.0,"Column":3}]},{"RandomW":3032241617,"RandomX":1245938367,"RandomY":2414391712,"RandomZ":3406801470,"StartTime":41048.0,"Objects":[{"StartTime":41048.0,"EndTime":41313.0,"Column":2}]},{"RandomW":3367991920,"RandomX":3804000131,"RandomY":672376773,"RandomZ":2667292323,"StartTime":41579.0,"Objects":[{"StartTime":41579.0,"EndTime":41844.0,"Column":1},{"StartTime":41579.0,"EndTime":41844.0,"Column":3}]},{"RandomW":2095476726,"RandomX":2667292323,"RandomY":3367991920,"RandomZ":3380532371,"StartTime":42110.0,"Objects":[{"StartTime":42110.0,"EndTime":42640.0,"Column":5}]},{"RandomW":869340745,"RandomX":2095476726,"RandomY":1063981175,"RandomZ":204767504,"StartTime":43172.0,"Objects":[{"StartTime":43172.0,"EndTime":43172.0,"Column":1},{"StartTime":43172.0,"EndTime":43172.0,"Column":4}]},{"RandomW":461904197,"RandomX":204767504,"RandomY":869340745,"RandomZ":2080855578,"StartTime":43438.0,"Objects":[{"StartTime":43438.0,"EndTime":43438.0,"Column":2},{"StartTime":43438.0,"EndTime":43438.0,"Column":1}]},{"RandomW":3004966693,"RandomX":869340745,"RandomY":2080855578,"RandomZ":461904197,"StartTime":43703.0,"Objects":[{"StartTime":43703.0,"EndTime":43703.0,"Column":3},{"StartTime":43703.0,"EndTime":43703.0,"Column":4}]},{"RandomW":147065937,"RandomX":2080855578,"RandomY":461904197,"RandomZ":3004966693,"StartTime":43969.0,"Objects":[{"StartTime":43969.0,"EndTime":43969.0,"Column":4}]},{"RandomW":1312111829,"RandomX":461904197,"RandomY":3004966693,"RandomZ":147065937,"StartTime":44234.0,"Objects":[{"StartTime":44234.0,"EndTime":44234.0,"Column":4}]},{"RandomW":355223143,"RandomX":3004966693,"RandomY":147065937,"RandomZ":1312111829,"StartTime":44500.0,"Objects":[{"StartTime":44500.0,"EndTime":44500.0,"Column":3}]},{"RandomW":1197174504,"RandomX":147065937,"RandomY":1312111829,"RandomZ":355223143,"StartTime":44765.0,"Objects":[{"StartTime":44765.0,"EndTime":44765.0,"Column":2},{"StartTime":44765.0,"EndTime":44765.0,"Column":3}]},{"RandomW":2296450669,"RandomX":355223143,"RandomY":1197174504,"RandomZ":1876247766,"StartTime":45031.0,"Objects":[{"StartTime":45031.0,"EndTime":45031.0,"Column":1},{"StartTime":45031.0,"EndTime":45031.0,"Column":0}]},{"RandomW":1664705375,"RandomX":1876247766,"RandomY":2296450669,"RandomZ":4287200872,"StartTime":45296.0,"Objects":[{"StartTime":45296.0,"EndTime":45296.0,"Column":0},{"StartTime":45296.0,"EndTime":45296.0,"Column":4}]},{"RandomW":2786027546,"RandomX":2296450669,"RandomY":4287200872,"RandomZ":1664705375,"StartTime":45562.0,"Objects":[{"StartTime":45562.0,"EndTime":45562.0,"Column":1}]},{"RandomW":639469776,"RandomX":4287200872,"RandomY":1664705375,"RandomZ":2786027546,"StartTime":45827.0,"Objects":[{"StartTime":45827.0,"EndTime":45827.0,"Column":3},{"StartTime":45827.0,"EndTime":45827.0,"Column":4}]},{"RandomW":2463352901,"RandomX":1664705375,"RandomY":2786027546,"RandomZ":639469776,"StartTime":46093.0,"Objects":[{"StartTime":46093.0,"EndTime":46093.0,"Column":4}]},{"RandomW":760995091,"RandomX":2463352901,"RandomY":978871003,"RandomZ":3888812594,"StartTime":46358.0,"Objects":[{"StartTime":46358.0,"EndTime":46888.0,"Column":2}]},{"RandomW":3631307076,"RandomX":3888812594,"RandomY":760995091,"RandomZ":566667549,"StartTime":47420.0,"Objects":[{"StartTime":47420.0,"EndTime":47685.0,"Column":4}]},{"RandomW":2353216536,"RandomX":3631307076,"RandomY":1805196154,"RandomZ":2564415583,"StartTime":47951.0,"Objects":[{"StartTime":47951.0,"EndTime":48216.0,"Column":1},{"StartTime":47951.0,"EndTime":48216.0,"Column":0}]},{"RandomW":717730087,"RandomX":2353216536,"RandomY":3735744429,"RandomZ":2102099401,"StartTime":48482.0,"Objects":[{"StartTime":48482.0,"EndTime":49278.0,"Column":5},{"StartTime":48482.0,"EndTime":49278.0,"Column":2}]},{"RandomW":271333990,"RandomX":717730087,"RandomY":3220302747,"RandomZ":917482575,"StartTime":49544.0,"Objects":[{"StartTime":49544.0,"EndTime":49809.0,"Column":0}]},{"RandomW":937976203,"RandomX":917482575,"RandomY":271333990,"RandomZ":125173709,"StartTime":50075.0,"Objects":[{"StartTime":50075.0,"EndTime":50340.0,"Column":2}]},{"RandomW":2781059562,"RandomX":937976203,"RandomY":2087616237,"RandomZ":232817676,"StartTime":50606.0,"Objects":[{"StartTime":50606.0,"EndTime":51667.0,"Column":0},{"StartTime":50606.0,"EndTime":51667.0,"Column":1}]},{"RandomW":3511898336,"RandomX":2087616237,"RandomY":232817676,"RandomZ":2781059562,"StartTime":52730.0,"Objects":[{"StartTime":52730.0,"EndTime":52730.0,"Column":4}]},{"RandomW":623291556,"RandomX":3737503025,"RandomY":3607951873,"RandomZ":1857627587,"StartTime":53792.0,"Objects":[{"StartTime":53792.0,"EndTime":54322.0,"Column":5},{"StartTime":53792.0,"EndTime":54322.0,"Column":1}]},{"RandomW":3577350524,"RandomX":3607951873,"RandomY":1857627587,"RandomZ":623291556,"StartTime":54588.0,"Objects":[{"StartTime":54588.0,"EndTime":54588.0,"Column":2}]},{"RandomW":3611414219,"RandomX":1700150568,"RandomY":3261504380,"RandomZ":3526708248,"StartTime":54854.0,"Objects":[{"StartTime":54854.0,"EndTime":55384.0,"Column":3},{"StartTime":54854.0,"EndTime":55384.0,"Column":4}]},{"RandomW":4116828180,"RandomX":3526708248,"RandomY":3611414219,"RandomZ":53089910,"StartTime":55916.0,"Objects":[{"StartTime":55916.0,"EndTime":56446.0,"Column":5}]},{"RandomW":1419945944,"RandomX":53089910,"RandomY":4116828180,"RandomZ":2370574124,"StartTime":56978.0,"Objects":[{"StartTime":56978.0,"EndTime":57549.0,"Column":3}]},{"RandomW":4235330325,"RandomX":2370574124,"RandomY":1419945944,"RandomZ":124293788,"StartTime":58120.0,"Objects":[{"StartTime":58120.0,"EndTime":58405.0,"Column":5}]},{"RandomW":1354196818,"RandomX":124293788,"RandomY":4235330325,"RandomZ":292200128,"StartTime":58692.0,"Objects":[{"StartTime":58692.0,"EndTime":58973.0,"Column":3}]},{"RandomW":2131632245,"RandomX":292200128,"RandomY":1354196818,"RandomZ":319349674,"StartTime":59325.0,"Objects":[{"StartTime":59325.0,"EndTime":60170.0,"Column":5}]},{"RandomW":987180490,"RandomX":1354196818,"RandomY":319349674,"RandomZ":2131632245,"StartTime":60513.0,"Objects":[{"StartTime":60513.0,"EndTime":60513.0,"Column":3}]},{"RandomW":2247158810,"RandomX":2131632245,"RandomY":987180490,"RandomZ":3518058549,"StartTime":60778.0,"Objects":[{"StartTime":60778.0,"EndTime":61043.0,"Column":0}]},{"RandomW":2347989337,"RandomX":987180490,"RandomY":3518058549,"RandomZ":2247158810,"StartTime":61309.0,"Objects":[{"StartTime":61309.0,"EndTime":61309.0,"Column":3}]},{"RandomW":82954311,"RandomX":1403151684,"RandomY":1362150166,"RandomZ":1092174296,"StartTime":61840.0,"Objects":[{"StartTime":61840.0,"EndTime":62105.0,"Column":0}]},{"RandomW":408605211,"RandomX":82954311,"RandomY":1144587736,"RandomZ":2479248954,"StartTime":62371.0,"Objects":[{"StartTime":62371.0,"EndTime":62901.0,"Column":1}]},{"RandomW":2455999143,"RandomX":1144587736,"RandomY":2479248954,"RandomZ":408605211,"StartTime":63168.0,"Objects":[{"StartTime":63168.0,"EndTime":63168.0,"Column":2}]},{"RandomW":1898608481,"RandomX":2455999143,"RandomY":519590646,"RandomZ":3207504021,"StartTime":63433.0,"Objects":[{"StartTime":63433.0,"EndTime":63963.0,"Column":5}]},{"RandomW":601995191,"RandomX":3207504021,"RandomY":1898608481,"RandomZ":4283573577,"StartTime":64230.0,"Objects":[{"StartTime":64230.0,"EndTime":64230.0,"Column":5},{"StartTime":64230.0,"EndTime":64230.0,"Column":1}]},{"RandomW":3909194070,"RandomX":1898608481,"RandomY":4283573577,"RandomZ":601995191,"StartTime":64495.0,"Objects":[{"StartTime":64495.0,"EndTime":64495.0,"Column":3},{"StartTime":64495.0,"EndTime":64495.0,"Column":4}]},{"RandomW":3417465448,"RandomX":4283573577,"RandomY":601995191,"RandomZ":3909194070,"StartTime":64761.0,"Objects":[{"StartTime":64761.0,"EndTime":64761.0,"Column":4}]},{"RandomW":2779016762,"RandomX":601995191,"RandomY":3909194070,"RandomZ":3417465448,"StartTime":65026.0,"Objects":[{"StartTime":65026.0,"EndTime":65026.0,"Column":4},{"StartTime":65026.0,"EndTime":65026.0,"Column":5}]},{"RandomW":2346068278,"RandomX":3909194070,"RandomY":3417465448,"RandomZ":2779016762,"StartTime":65292.0,"Objects":[{"StartTime":65292.0,"EndTime":65292.0,"Column":3}]},{"RandomW":1857589819,"RandomX":3417465448,"RandomY":2779016762,"RandomZ":2346068278,"StartTime":65557.0,"Objects":[{"StartTime":65557.0,"EndTime":65557.0,"Column":4},{"StartTime":65557.0,"EndTime":65557.0,"Column":5}]},{"RandomW":910236838,"RandomX":2779016762,"RandomY":2346068278,"RandomZ":1857589819,"StartTime":66088.0,"Objects":[{"StartTime":66088.0,"EndTime":66088.0,"Column":2},{"StartTime":66088.0,"EndTime":66088.0,"Column":3}]},{"RandomW":910236838,"RandomX":2779016762,"RandomY":2346068278,"RandomZ":1857589819,"StartTime":66354.0,"Objects":[{"StartTime":66354.0,"EndTime":66354.0,"Column":3},{"StartTime":66354.0,"EndTime":66354.0,"Column":2}]},{"RandomW":2327273799,"RandomX":1857589819,"RandomY":910236838,"RandomZ":2953998826,"StartTime":66619.0,"Objects":[{"StartTime":66619.0,"EndTime":67149.0,"Column":0}]},{"RandomW":540283744,"RandomX":910236838,"RandomY":2953998826,"RandomZ":2327273799,"StartTime":67416.0,"Objects":[{"StartTime":67416.0,"EndTime":67416.0,"Column":0}]},{"RandomW":1024467186,"RandomX":2327273799,"RandomY":540283744,"RandomZ":514760684,"StartTime":67681.0,"Objects":[{"StartTime":67681.0,"EndTime":68211.0,"Column":2}]},{"RandomW":211600206,"RandomX":540283744,"RandomY":514760684,"RandomZ":1024467186,"StartTime":68478.0,"Objects":[{"StartTime":68478.0,"EndTime":68478.0,"Column":2}]},{"RandomW":2360573614,"RandomX":514760684,"RandomY":1024467186,"RandomZ":211600206,"StartTime":68743.0,"Objects":[{"StartTime":68743.0,"EndTime":68743.0,"Column":4},{"StartTime":68743.0,"EndTime":68743.0,"Column":5}]},{"RandomW":3867722027,"RandomX":1024467186,"RandomY":211600206,"RandomZ":2360573614,"StartTime":69009.0,"Objects":[{"StartTime":69009.0,"EndTime":69009.0,"Column":3}]},{"RandomW":1512274616,"RandomX":211600206,"RandomY":2360573614,"RandomZ":3867722027,"StartTime":69274.0,"Objects":[{"StartTime":69274.0,"EndTime":69274.0,"Column":4},{"StartTime":69274.0,"EndTime":69274.0,"Column":5}]},{"RandomW":2957984769,"RandomX":2360573614,"RandomY":3867722027,"RandomZ":1512274616,"StartTime":69540.0,"Objects":[{"StartTime":69540.0,"EndTime":69540.0,"Column":3}]},{"RandomW":2803767976,"RandomX":3867722027,"RandomY":1512274616,"RandomZ":2957984769,"StartTime":69805.0,"Objects":[{"StartTime":69805.0,"EndTime":69805.0,"Column":4},{"StartTime":69805.0,"EndTime":69805.0,"Column":5}]},{"RandomW":1183341084,"RandomX":2957984769,"RandomY":2803767976,"RandomZ":121575161,"StartTime":70336.0,"Objects":[{"StartTime":70336.0,"EndTime":70601.0,"Column":3}]},{"RandomW":3685872119,"RandomX":121575161,"RandomY":1183341084,"RandomZ":2351788416,"StartTime":70867.0,"Objects":[{"StartTime":70867.0,"EndTime":71397.0,"Column":4}]},{"RandomW":617004198,"RandomX":1183341084,"RandomY":2351788416,"RandomZ":3685872119,"StartTime":71663.0,"Objects":[{"StartTime":71663.0,"EndTime":71663.0,"Column":3}]},{"RandomW":2478235967,"RandomX":617004198,"RandomY":546986648,"RandomZ":3353120378,"StartTime":71929.0,"Objects":[{"StartTime":71929.0,"EndTime":72459.0,"Column":0}]},{"RandomW":2189712483,"RandomX":546986648,"RandomY":3353120378,"RandomZ":2478235967,"StartTime":72725.0,"Objects":[{"StartTime":72725.0,"EndTime":72725.0,"Column":2}]},{"RandomW":1882757169,"RandomX":3353120378,"RandomY":2478235967,"RandomZ":2189712483,"StartTime":72991.0,"Objects":[{"StartTime":72991.0,"EndTime":72991.0,"Column":3},{"StartTime":72991.0,"EndTime":72991.0,"Column":4}]},{"RandomW":1404331794,"RandomX":2478235967,"RandomY":2189712483,"RandomZ":1882757169,"StartTime":73256.0,"Objects":[{"StartTime":73256.0,"EndTime":73256.0,"Column":1}]},{"RandomW":1999620930,"RandomX":2189712483,"RandomY":1882757169,"RandomZ":1404331794,"StartTime":73522.0,"Objects":[{"StartTime":73522.0,"EndTime":73522.0,"Column":3},{"StartTime":73522.0,"EndTime":73522.0,"Column":4}]},{"RandomW":3622364800,"RandomX":1882757169,"RandomY":1404331794,"RandomZ":1999620930,"StartTime":73787.0,"Objects":[{"StartTime":73787.0,"EndTime":73787.0,"Column":2}]},{"RandomW":1671763292,"RandomX":1404331794,"RandomY":1999620930,"RandomZ":3622364800,"StartTime":74053.0,"Objects":[{"StartTime":74053.0,"EndTime":74053.0,"Column":3},{"StartTime":74053.0,"EndTime":74053.0,"Column":4}]},{"RandomW":2594561583,"RandomX":3622364800,"RandomY":1671763292,"RandomZ":2480497357,"StartTime":74584.0,"Objects":[{"StartTime":74584.0,"EndTime":74849.0,"Column":1}]},{"RandomW":1101860073,"RandomX":2480497357,"RandomY":2594561583,"RandomZ":183105309,"StartTime":75115.0,"Objects":[{"StartTime":75115.0,"EndTime":75645.0,"Column":3}]},{"RandomW":423280923,"RandomX":2594561583,"RandomY":183105309,"RandomZ":1101860073,"StartTime":75911.0,"Objects":[{"StartTime":75911.0,"EndTime":75911.0,"Column":2}]},{"RandomW":3905841932,"RandomX":1101860073,"RandomY":423280923,"RandomZ":2916757685,"StartTime":76177.0,"Objects":[{"StartTime":76177.0,"EndTime":76707.0,"Column":4}]},{"RandomW":3241015480,"RandomX":423280923,"RandomY":2916757685,"RandomZ":3905841932,"StartTime":76973.0,"Objects":[{"StartTime":76973.0,"EndTime":76973.0,"Column":3}]},{"RandomW":1928531304,"RandomX":3905841932,"RandomY":3241015480,"RandomZ":248564639,"StartTime":77239.0,"Objects":[{"StartTime":77239.0,"EndTime":77504.0,"Column":5}]},{"RandomW":634267655,"RandomX":3925777969,"RandomY":1203262350,"RandomZ":3485263061,"StartTime":77770.0,"Objects":[{"StartTime":77770.0,"EndTime":78035.0,"Column":3},{"StartTime":77770.0,"EndTime":78035.0,"Column":1}]},{"RandomW":953955737,"RandomX":1203262350,"RandomY":3485263061,"RandomZ":634267655,"StartTime":78301.0,"Objects":[{"StartTime":78301.0,"EndTime":78301.0,"Column":3}]},{"RandomW":3179099439,"RandomX":3485263061,"RandomY":634267655,"RandomZ":953955737,"StartTime":78566.0,"Objects":[{"StartTime":78566.0,"EndTime":78566.0,"Column":2},{"StartTime":78566.0,"EndTime":78566.0,"Column":3}]},{"RandomW":2513433625,"RandomX":634267655,"RandomY":953955737,"RandomZ":3179099439,"StartTime":78832.0,"Objects":[{"StartTime":78832.0,"EndTime":78832.0,"Column":3},{"StartTime":78832.0,"EndTime":78832.0,"Column":4}]},{"RandomW":3239409847,"RandomX":953955737,"RandomY":3179099439,"RandomZ":2513433625,"StartTime":79097.0,"Objects":[{"StartTime":79097.0,"EndTime":79097.0,"Column":5},{"StartTime":79097.0,"EndTime":79097.0,"Column":0}]},{"RandomW":1279031172,"RandomX":2513433625,"RandomY":3239409847,"RandomZ":415034865,"StartTime":79363.0,"Objects":[{"StartTime":79363.0,"EndTime":79893.0,"Column":3}]},{"RandomW":2797153574,"RandomX":3239409847,"RandomY":415034865,"RandomZ":1279031172,"StartTime":80159.0,"Objects":[{"StartTime":80159.0,"EndTime":80159.0,"Column":3}]},{"RandomW":858752658,"RandomX":1279031172,"RandomY":2797153574,"RandomZ":3422759302,"StartTime":80424.0,"Objects":[{"StartTime":80424.0,"EndTime":80954.0,"Column":2}]},{"RandomW":2617268004,"RandomX":2797153574,"RandomY":3422759302,"RandomZ":858752658,"StartTime":81221.0,"Objects":[{"StartTime":81221.0,"EndTime":81221.0,"Column":4}]},{"RandomW":4089416095,"RandomX":3422759302,"RandomY":858752658,"RandomZ":2617268004,"StartTime":81486.0,"Objects":[{"StartTime":81486.0,"EndTime":81486.0,"Column":4},{"StartTime":81486.0,"EndTime":81486.0,"Column":5}]},{"RandomW":640008567,"RandomX":858752658,"RandomY":2617268004,"RandomZ":4089416095,"StartTime":81752.0,"Objects":[{"StartTime":81752.0,"EndTime":81752.0,"Column":4}]},{"RandomW":1769064503,"RandomX":2617268004,"RandomY":4089416095,"RandomZ":640008567,"StartTime":82017.0,"Objects":[{"StartTime":82017.0,"EndTime":82017.0,"Column":5},{"StartTime":82017.0,"EndTime":82017.0,"Column":0}]},{"RandomW":4171929422,"RandomX":640008567,"RandomY":1769064503,"RandomZ":4149611338,"StartTime":82283.0,"Objects":[{"StartTime":82283.0,"EndTime":82283.0,"Column":3},{"StartTime":82283.0,"EndTime":82283.0,"Column":5}]},{"RandomW":4035764053,"RandomX":1769064503,"RandomY":4149611338,"RandomZ":4171929422,"StartTime":82548.0,"Objects":[{"StartTime":82548.0,"EndTime":82548.0,"Column":5},{"StartTime":82548.0,"EndTime":82548.0,"Column":0}]},{"RandomW":391872771,"RandomX":4149611338,"RandomY":4171929422,"RandomZ":4035764053,"StartTime":83079.0,"Objects":[{"StartTime":83079.0,"EndTime":83079.0,"Column":3},{"StartTime":83079.0,"EndTime":83079.0,"Column":4}]},{"RandomW":391872771,"RandomX":4149611338,"RandomY":4171929422,"RandomZ":4035764053,"StartTime":83345.0,"Objects":[{"StartTime":83345.0,"EndTime":83345.0,"Column":2},{"StartTime":83345.0,"EndTime":83345.0,"Column":1}]},{"RandomW":4239141202,"RandomX":4035764053,"RandomY":391872771,"RandomZ":1343280377,"StartTime":83610.0,"Objects":[{"StartTime":83610.0,"EndTime":84140.0,"Column":5}]},{"RandomW":2008371177,"RandomX":4239141202,"RandomY":1783379941,"RandomZ":2715086902,"StartTime":84407.0,"Objects":[{"StartTime":84407.0,"EndTime":84407.0,"Column":1},{"StartTime":84407.0,"EndTime":84407.0,"Column":5}]},{"RandomW":980563717,"RandomX":3939376884,"RandomY":3778473815,"RandomZ":3882214919,"StartTime":84672.0,"Objects":[{"StartTime":84672.0,"EndTime":85202.0,"Column":4},{"StartTime":84672.0,"EndTime":85202.0,"Column":2}]},{"RandomW":2698098433,"RandomX":3778473815,"RandomY":3882214919,"RandomZ":980563717,"StartTime":85469.0,"Objects":[{"StartTime":85469.0,"EndTime":85469.0,"Column":1}]},{"RandomW":4140546075,"RandomX":3882214919,"RandomY":980563717,"RandomZ":2698098433,"StartTime":85734.0,"Objects":[{"StartTime":85734.0,"EndTime":85734.0,"Column":3},{"StartTime":85734.0,"EndTime":85734.0,"Column":4}]},{"RandomW":1045835035,"RandomX":980563717,"RandomY":2698098433,"RandomZ":4140546075,"StartTime":86000.0,"Objects":[{"StartTime":86000.0,"EndTime":86000.0,"Column":1}]},{"RandomW":2503475147,"RandomX":2698098433,"RandomY":4140546075,"RandomZ":1045835035,"StartTime":86265.0,"Objects":[{"StartTime":86265.0,"EndTime":86265.0,"Column":1},{"StartTime":86265.0,"EndTime":86265.0,"Column":2}]},{"RandomW":3094559699,"RandomX":4140546075,"RandomY":1045835035,"RandomZ":2503475147,"StartTime":86531.0,"Objects":[{"StartTime":86531.0,"EndTime":86531.0,"Column":3}]},{"RandomW":332613542,"RandomX":1045835035,"RandomY":2503475147,"RandomZ":3094559699,"StartTime":86796.0,"Objects":[{"StartTime":86796.0,"EndTime":86796.0,"Column":2},{"StartTime":86796.0,"EndTime":86796.0,"Column":3}]},{"RandomW":2534271858,"RandomX":332613542,"RandomY":2623704626,"RandomZ":3061969874,"StartTime":87327.0,"Objects":[{"StartTime":87327.0,"EndTime":87592.0,"Column":1}]},{"RandomW":794230988,"RandomX":2534271858,"RandomY":510287938,"RandomZ":2532404899,"StartTime":87858.0,"Objects":[{"StartTime":87858.0,"EndTime":88388.0,"Column":2}]},{"RandomW":3623430191,"RandomX":510287938,"RandomY":2532404899,"RandomZ":794230988,"StartTime":88655.0,"Objects":[{"StartTime":88655.0,"EndTime":88655.0,"Column":2}]},{"RandomW":2269498220,"RandomX":794230988,"RandomY":3623430191,"RandomZ":2598120162,"StartTime":88920.0,"Objects":[{"StartTime":88920.0,"EndTime":89450.0,"Column":0}]},{"RandomW":277080616,"RandomX":3623430191,"RandomY":2598120162,"RandomZ":2269498220,"StartTime":89717.0,"Objects":[{"StartTime":89717.0,"EndTime":89717.0,"Column":2}]},{"RandomW":237305927,"RandomX":2598120162,"RandomY":2269498220,"RandomZ":277080616,"StartTime":89982.0,"Objects":[{"StartTime":89982.0,"EndTime":89982.0,"Column":1},{"StartTime":89982.0,"EndTime":89982.0,"Column":2}]},{"RandomW":3697412902,"RandomX":277080616,"RandomY":237305927,"RandomZ":1976938587,"StartTime":90247.0,"Objects":[{"StartTime":90247.0,"EndTime":90247.0,"Column":1},{"StartTime":90247.0,"EndTime":90247.0,"Column":4}]},{"RandomW":3552536616,"RandomX":237305927,"RandomY":1976938587,"RandomZ":3697412902,"StartTime":90513.0,"Objects":[{"StartTime":90513.0,"EndTime":90513.0,"Column":2},{"StartTime":90513.0,"EndTime":90513.0,"Column":3}]},{"RandomW":758205604,"RandomX":3697412902,"RandomY":3552536616,"RandomZ":4122897696,"StartTime":90778.0,"Objects":[{"StartTime":90778.0,"EndTime":90778.0,"Column":1},{"StartTime":90778.0,"EndTime":90778.0,"Column":2}]},{"RandomW":3787868447,"RandomX":3552536616,"RandomY":4122897696,"RandomZ":758205604,"StartTime":91044.0,"Objects":[{"StartTime":91044.0,"EndTime":91044.0,"Column":2},{"StartTime":91044.0,"EndTime":91044.0,"Column":3}]},{"RandomW":1748107640,"RandomX":3787868447,"RandomY":3373302567,"RandomZ":3485540424,"StartTime":91575.0,"Objects":[{"StartTime":91575.0,"EndTime":91840.0,"Column":4}]},{"RandomW":4130051617,"RandomX":3485540424,"RandomY":1748107640,"RandomZ":3144627152,"StartTime":92106.0,"Objects":[{"StartTime":92106.0,"EndTime":92636.0,"Column":5}]},{"RandomW":808332236,"RandomX":1748107640,"RandomY":3144627152,"RandomZ":4130051617,"StartTime":92902.0,"Objects":[{"StartTime":92902.0,"EndTime":92902.0,"Column":3}]},{"RandomW":182226446,"RandomX":4130051617,"RandomY":808332236,"RandomZ":3371160944,"StartTime":93168.0,"Objects":[{"StartTime":93168.0,"EndTime":93698.0,"Column":0}]},{"RandomW":2699856874,"RandomX":808332236,"RandomY":3371160944,"RandomZ":182226446,"StartTime":93964.0,"Objects":[{"StartTime":93964.0,"EndTime":93964.0,"Column":1}]},{"RandomW":3110990203,"RandomX":2699856874,"RandomY":3789399152,"RandomZ":1462741358,"StartTime":94230.0,"Objects":[{"StartTime":94230.0,"EndTime":94495.0,"Column":4},{"StartTime":94230.0,"EndTime":94495.0,"Column":2}]},{"RandomW":2375429180,"RandomX":2098892391,"RandomY":1911053200,"RandomZ":1537665050,"StartTime":94761.0,"Objects":[{"StartTime":94761.0,"EndTime":95026.0,"Column":5},{"StartTime":94761.0,"EndTime":95026.0,"Column":0}]},{"RandomW":391186846,"RandomX":1537665050,"RandomY":2375429180,"RandomZ":609673823,"StartTime":95292.0,"Objects":[{"StartTime":95292.0,"EndTime":96353.0,"Column":1}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":96486.0,"Objects":[{"StartTime":96486.0,"EndTime":98478.0,"Column":5}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":113345.0,"Objects":[{"StartTime":113345.0,"EndTime":113345.0,"Column":4}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":113876.0,"Objects":[{"StartTime":113876.0,"EndTime":113876.0,"Column":1}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":114407.0,"Objects":[{"StartTime":114407.0,"EndTime":114407.0,"Column":4}]},{"RandomW":1192288733,"RandomX":609673823,"RandomY":391186846,"RandomZ":2078004566,"StartTime":114672.0,"Objects":[{"StartTime":114672.0,"EndTime":114672.0,"Column":2},{"StartTime":114672.0,"EndTime":114672.0,"Column":3}]},{"RandomW":3569858426,"RandomX":391186846,"RandomY":2078004566,"RandomZ":1192288733,"StartTime":114938.0,"Objects":[{"StartTime":114938.0,"EndTime":114938.0,"Column":2}]},{"RandomW":1262832005,"RandomX":2078004566,"RandomY":1192288733,"RandomZ":3569858426,"StartTime":115203.0,"Objects":[{"StartTime":115203.0,"EndTime":115203.0,"Column":3},{"StartTime":115203.0,"EndTime":115203.0,"Column":4}]},{"RandomW":4002501854,"RandomX":1192288733,"RandomY":3569858426,"RandomZ":1262832005,"StartTime":115469.0,"Objects":[{"StartTime":115469.0,"EndTime":115469.0,"Column":3},{"StartTime":115469.0,"EndTime":115469.0,"Column":4}]},{"RandomW":776953560,"RandomX":3569858426,"RandomY":1262832005,"RandomZ":4002501854,"StartTime":116000.0,"Objects":[{"StartTime":116000.0,"EndTime":116000.0,"Column":3},{"StartTime":116000.0,"EndTime":116000.0,"Column":4}]},{"RandomW":776953560,"RandomX":3569858426,"RandomY":1262832005,"RandomZ":4002501854,"StartTime":116531.0,"Objects":[{"StartTime":116531.0,"EndTime":116531.0,"Column":2},{"StartTime":116531.0,"EndTime":116531.0,"Column":1}]},{"RandomW":3352969228,"RandomX":1262832005,"RandomY":4002501854,"RandomZ":776953560,"StartTime":117062.0,"Objects":[{"StartTime":117062.0,"EndTime":117062.0,"Column":3},{"StartTime":117062.0,"EndTime":117062.0,"Column":4}]},{"RandomW":2796695571,"RandomX":4002501854,"RandomY":776953560,"RandomZ":3352969228,"StartTime":117327.0,"Objects":[{"StartTime":117327.0,"EndTime":117327.0,"Column":2}]},{"RandomW":3269572543,"RandomX":776953560,"RandomY":3352969228,"RandomZ":2796695571,"StartTime":117593.0,"Objects":[{"StartTime":117593.0,"EndTime":117593.0,"Column":4},{"StartTime":117593.0,"EndTime":117593.0,"Column":5}]},{"RandomW":3269572543,"RandomX":776953560,"RandomY":3352969228,"RandomZ":2796695571,"StartTime":118124.0,"Objects":[{"StartTime":118124.0,"EndTime":118124.0,"Column":1},{"StartTime":118124.0,"EndTime":118124.0,"Column":0}]},{"RandomW":3269572543,"RandomX":776953560,"RandomY":3352969228,"RandomZ":2796695571,"StartTime":118655.0,"Objects":[{"StartTime":118655.0,"EndTime":118655.0,"Column":5},{"StartTime":118655.0,"EndTime":118655.0,"Column":4}]},{"RandomW":2517403813,"RandomX":3352969228,"RandomY":2796695571,"RandomZ":3269572543,"StartTime":118920.0,"Objects":[{"StartTime":118920.0,"EndTime":118920.0,"Column":2},{"StartTime":118920.0,"EndTime":118920.0,"Column":3}]},{"RandomW":2210619464,"RandomX":2796695571,"RandomY":3269572543,"RandomZ":2517403813,"StartTime":119186.0,"Objects":[{"StartTime":119186.0,"EndTime":119186.0,"Column":4}]},{"RandomW":3032935051,"RandomX":3269572543,"RandomY":2517403813,"RandomZ":2210619464,"StartTime":119451.0,"Objects":[{"StartTime":119451.0,"EndTime":119451.0,"Column":5},{"StartTime":119451.0,"EndTime":119451.0,"Column":0}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":119717.0,"Objects":[{"StartTime":119717.0,"EndTime":119717.0,"Column":4},{"StartTime":119717.0,"EndTime":119717.0,"Column":5}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":120247.0,"Objects":[{"StartTime":120247.0,"EndTime":120247.0,"Column":1},{"StartTime":120247.0,"EndTime":120247.0,"Column":0}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":120778.0,"Objects":[{"StartTime":120778.0,"EndTime":120778.0,"Column":5},{"StartTime":120778.0,"EndTime":120778.0,"Column":4}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":121309.0,"Objects":[{"StartTime":121309.0,"EndTime":121309.0,"Column":1},{"StartTime":121309.0,"EndTime":121309.0,"Column":0}]},{"RandomW":2314078604,"RandomX":2210619464,"RandomY":3032935051,"RandomZ":2069229539,"StartTime":121575.0,"Objects":[{"StartTime":121575.0,"EndTime":121575.0,"Column":3}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":121840.0,"Objects":[{"StartTime":121840.0,"EndTime":121840.0,"Column":2},{"StartTime":121840.0,"EndTime":121840.0,"Column":3}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":122371.0,"Objects":[{"StartTime":122371.0,"EndTime":122371.0,"Column":3},{"StartTime":122371.0,"EndTime":122371.0,"Column":2}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":122902.0,"Objects":[{"StartTime":122902.0,"EndTime":122902.0,"Column":3},{"StartTime":122902.0,"EndTime":122902.0,"Column":2}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":123433.0,"Objects":[{"StartTime":123433.0,"EndTime":123433.0,"Column":3},{"StartTime":123433.0,"EndTime":123433.0,"Column":2}]},{"RandomW":2460408790,"RandomX":2069229539,"RandomY":2314078604,"RandomZ":297269721,"StartTime":123699.0,"Objects":[{"StartTime":123699.0,"EndTime":123699.0,"Column":1}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":123964.0,"Objects":[{"StartTime":123964.0,"EndTime":123964.0,"Column":3},{"StartTime":123964.0,"EndTime":123964.0,"Column":4}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":124495.0,"Objects":[{"StartTime":124495.0,"EndTime":124495.0,"Column":2},{"StartTime":124495.0,"EndTime":124495.0,"Column":1}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":125026.0,"Objects":[{"StartTime":125026.0,"EndTime":125026.0,"Column":4},{"StartTime":125026.0,"EndTime":125026.0,"Column":3}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":125557.0,"Objects":[{"StartTime":125557.0,"EndTime":125557.0,"Column":2},{"StartTime":125557.0,"EndTime":125557.0,"Column":1}]},{"RandomW":3204700088,"RandomX":297269721,"RandomY":2460408790,"RandomZ":1180177558,"StartTime":125823.0,"Objects":[{"StartTime":125823.0,"EndTime":125823.0,"Column":2}]},{"RandomW":299141296,"RandomX":2460408790,"RandomY":1180177558,"RandomZ":3204700088,"StartTime":126088.0,"Objects":[{"StartTime":126088.0,"EndTime":126088.0,"Column":3},{"StartTime":126088.0,"EndTime":126088.0,"Column":4}]},{"RandomW":299141296,"RandomX":2460408790,"RandomY":1180177558,"RandomZ":3204700088,"StartTime":126619.0,"Objects":[{"StartTime":126619.0,"EndTime":126619.0,"Column":2},{"StartTime":126619.0,"EndTime":126619.0,"Column":1}]},{"RandomW":299141296,"RandomX":2460408790,"RandomY":1180177558,"RandomZ":3204700088,"StartTime":127150.0,"Objects":[{"StartTime":127150.0,"EndTime":127150.0,"Column":4},{"StartTime":127150.0,"EndTime":127150.0,"Column":3}]},{"RandomW":3037239607,"RandomX":1180177558,"RandomY":3204700088,"RandomZ":299141296,"StartTime":127416.0,"Objects":[{"StartTime":127416.0,"EndTime":127416.0,"Column":4},{"StartTime":127416.0,"EndTime":127416.0,"Column":5}]},{"RandomW":863164324,"RandomX":3204700088,"RandomY":299141296,"RandomZ":3037239607,"StartTime":127681.0,"Objects":[{"StartTime":127681.0,"EndTime":127681.0,"Column":5}]},{"RandomW":2456647781,"RandomX":299141296,"RandomY":3037239607,"RandomZ":863164324,"StartTime":127947.0,"Objects":[{"StartTime":127947.0,"EndTime":127947.0,"Column":4},{"StartTime":127947.0,"EndTime":127947.0,"Column":5}]},{"RandomW":659157904,"RandomX":3037239607,"RandomY":863164324,"RandomZ":2456647781,"StartTime":128212.0,"Objects":[{"StartTime":128212.0,"EndTime":128212.0,"Column":3},{"StartTime":128212.0,"EndTime":128212.0,"Column":4}]},{"RandomW":659157904,"RandomX":3037239607,"RandomY":863164324,"RandomZ":2456647781,"StartTime":128743.0,"Objects":[{"StartTime":128743.0,"EndTime":128743.0,"Column":2},{"StartTime":128743.0,"EndTime":128743.0,"Column":1}]},{"RandomW":659157904,"RandomX":3037239607,"RandomY":863164324,"RandomZ":2456647781,"StartTime":129274.0,"Objects":[{"StartTime":129274.0,"EndTime":129274.0,"Column":4},{"StartTime":129274.0,"EndTime":129274.0,"Column":3}]},{"RandomW":3598260079,"RandomX":863164324,"RandomY":2456647781,"RandomZ":659157904,"StartTime":129540.0,"Objects":[{"StartTime":129540.0,"EndTime":129540.0,"Column":3},{"StartTime":129540.0,"EndTime":129540.0,"Column":4}]},{"RandomW":1930638835,"RandomX":2456647781,"RandomY":659157904,"RandomZ":3598260079,"StartTime":129805.0,"Objects":[{"StartTime":129805.0,"EndTime":129805.0,"Column":1},{"StartTime":129805.0,"EndTime":129805.0,"Column":2}]},{"RandomW":4230333264,"RandomX":1930638835,"RandomY":2319762852,"RandomZ":3807998479,"StartTime":130071.0,"Objects":[{"StartTime":130071.0,"EndTime":130071.0,"Column":2},{"StartTime":130071.0,"EndTime":130071.0,"Column":3}]},{"RandomW":2482386774,"RandomX":4230333264,"RandomY":376688010,"RandomZ":3132506885,"StartTime":132460.0,"Objects":[{"StartTime":132460.0,"EndTime":132990.0,"Column":0}]},{"RandomW":3381449487,"RandomX":3132506885,"RandomY":2482386774,"RandomZ":1092311355,"StartTime":133522.0,"Objects":[{"StartTime":133522.0,"EndTime":134052.0,"Column":3}]},{"RandomW":3812940964,"RandomX":1092311355,"RandomY":3381449487,"RandomZ":3240759120,"StartTime":134318.0,"Objects":[{"StartTime":134318.0,"EndTime":134848.0,"Column":4}]},{"RandomW":2199106412,"RandomX":2014155638,"RandomY":3619038163,"RandomZ":1182263034,"StartTime":135115.0,"Objects":[{"StartTime":135115.0,"EndTime":135380.0,"Column":3},{"StartTime":135115.0,"EndTime":135380.0,"Column":0}]},{"RandomW":4049541057,"RandomX":1182263034,"RandomY":2199106412,"RandomZ":2542868059,"StartTime":135646.0,"Objects":[{"StartTime":135646.0,"EndTime":136176.0,"Column":5}]},{"RandomW":376448389,"RandomX":2542868059,"RandomY":4049541057,"RandomZ":149323558,"StartTime":136708.0,"Objects":[{"StartTime":136708.0,"EndTime":136973.0,"Column":1}]},{"RandomW":10761513,"RandomX":149323558,"RandomY":376448389,"RandomZ":156027614,"StartTime":137239.0,"Objects":[{"StartTime":137239.0,"EndTime":137504.0,"Column":0}]},{"RandomW":2890609580,"RandomX":156027614,"RandomY":10761513,"RandomZ":998270292,"StartTime":137770.0,"Objects":[{"StartTime":137770.0,"EndTime":138566.0,"Column":2}]},{"RandomW":3792858866,"RandomX":998270292,"RandomY":2890609580,"RandomZ":3275622081,"StartTime":138832.0,"Objects":[{"StartTime":138832.0,"EndTime":139097.0,"Column":4}]},{"RandomW":479756469,"RandomX":3792858866,"RandomY":3665829153,"RandomZ":799245198,"StartTime":139363.0,"Objects":[{"StartTime":139363.0,"EndTime":139628.0,"Column":2},{"StartTime":139363.0,"EndTime":139628.0,"Column":1}]},{"RandomW":1559664190,"RandomX":1837897770,"RandomY":3074386351,"RandomZ":2226336565,"StartTime":139894.0,"Objects":[{"StartTime":139894.0,"EndTime":140690.0,"Column":0},{"StartTime":139894.0,"EndTime":140690.0,"Column":4}]},{"RandomW":1370921154,"RandomX":3074386351,"RandomY":2226336565,"RandomZ":1559664190,"StartTime":140955.0,"Objects":[{"StartTime":140955.0,"EndTime":140955.0,"Column":4}]},{"RandomW":12534613,"RandomX":1559664190,"RandomY":1370921154,"RandomZ":495513930,"StartTime":141221.0,"Objects":[{"StartTime":141221.0,"EndTime":141751.0,"Column":3},{"StartTime":141486.0,"EndTime":141486.0,"Column":1},{"StartTime":141751.0,"EndTime":141751.0,"Column":1}]},{"RandomW":1474110729,"RandomX":12534613,"RandomY":3893387802,"RandomZ":226854738,"StartTime":142017.0,"Objects":[{"StartTime":142017.0,"EndTime":142017.0,"Column":2},{"StartTime":142017.0,"EndTime":142017.0,"Column":3}]},{"RandomW":3883366092,"RandomX":1474110729,"RandomY":2911002956,"RandomZ":3337209428,"StartTime":142283.0,"Objects":[{"StartTime":142283.0,"EndTime":142548.0,"Column":4}]},{"RandomW":1868157439,"RandomX":3883366092,"RandomY":1497166406,"RandomZ":3876220972,"StartTime":142814.0,"Objects":[{"StartTime":142814.0,"EndTime":143079.0,"Column":5}]},{"RandomW":868486094,"RandomX":1497166406,"RandomY":3876220972,"RandomZ":1868157439,"StartTime":143345.0,"Objects":[{"StartTime":143345.0,"EndTime":143345.0,"Column":2}]},{"RandomW":2379505970,"RandomX":3876220972,"RandomY":1868157439,"RandomZ":868486094,"StartTime":143610.0,"Objects":[{"StartTime":143610.0,"EndTime":143610.0,"Column":2}]},{"RandomW":971762612,"RandomX":1868157439,"RandomY":868486094,"RandomZ":2379505970,"StartTime":143876.0,"Objects":[{"StartTime":143876.0,"EndTime":143876.0,"Column":4}]},{"RandomW":2333467129,"RandomX":2379505970,"RandomY":971762612,"RandomZ":2560365407,"StartTime":144141.0,"Objects":[{"StartTime":144141.0,"EndTime":144671.0,"Column":0}]},{"RandomW":3275109659,"RandomX":2560365407,"RandomY":2333467129,"RandomZ":2783370328,"StartTime":145203.0,"Objects":[{"StartTime":145203.0,"EndTime":145468.0,"Column":3}]},{"RandomW":2675369072,"RandomX":2783370328,"RandomY":3275109659,"RandomZ":3142107337,"StartTime":145734.0,"Objects":[{"StartTime":145734.0,"EndTime":145999.0,"Column":1}]},{"RandomW":2114821552,"RandomX":3142107337,"RandomY":2675369072,"RandomZ":216133594,"StartTime":146265.0,"Objects":[{"StartTime":146265.0,"EndTime":146795.0,"Column":5}]},{"RandomW":2210288688,"RandomX":2675369072,"RandomY":216133594,"RandomZ":2114821552,"StartTime":147062.0,"Objects":[{"StartTime":147062.0,"EndTime":147062.0,"Column":3}]},{"RandomW":2824847566,"RandomX":2114821552,"RandomY":2210288688,"RandomZ":2881713491,"StartTime":147327.0,"Objects":[{"StartTime":147327.0,"EndTime":147592.0,"Column":1}]},{"RandomW":3418617049,"RandomX":2881713491,"RandomY":2824847566,"RandomZ":3131910248,"StartTime":147858.0,"Objects":[{"StartTime":147858.0,"EndTime":148123.0,"Column":3}]},{"RandomW":4264037536,"RandomX":3418617049,"RandomY":2065328415,"RandomZ":756387586,"StartTime":148389.0,"Objects":[{"StartTime":148389.0,"EndTime":149450.0,"Column":2},{"StartTime":148389.0,"EndTime":149450.0,"Column":5}]},{"RandomW":714689152,"RandomX":2065328415,"RandomY":756387586,"RandomZ":4264037536,"StartTime":149717.0,"Objects":[{"StartTime":149717.0,"EndTime":149717.0,"Column":2}]},{"RandomW":2187562077,"RandomX":756387586,"RandomY":4264037536,"RandomZ":714689152,"StartTime":149982.0,"Objects":[{"StartTime":149982.0,"EndTime":149982.0,"Column":1},{"StartTime":149982.0,"EndTime":149982.0,"Column":2}]},{"RandomW":59731596,"RandomX":4264037536,"RandomY":714689152,"RandomZ":2187562077,"StartTime":150247.0,"Objects":[{"StartTime":150247.0,"EndTime":150247.0,"Column":0}]},{"RandomW":3179032401,"RandomX":714689152,"RandomY":2187562077,"RandomZ":59731596,"StartTime":150513.0,"Objects":[{"StartTime":150513.0,"EndTime":150513.0,"Column":1}]},{"RandomW":1565638452,"RandomX":2187562077,"RandomY":59731596,"RandomZ":3179032401,"StartTime":150778.0,"Objects":[{"StartTime":150778.0,"EndTime":150778.0,"Column":2}]},{"RandomW":3285111207,"RandomX":59731596,"RandomY":3179032401,"RandomZ":1565638452,"StartTime":151044.0,"Objects":[{"StartTime":151044.0,"EndTime":151044.0,"Column":3},{"StartTime":151044.0,"EndTime":151044.0,"Column":4}]},{"RandomW":3142401116,"RandomX":3179032401,"RandomY":1565638452,"RandomZ":3285111207,"StartTime":151309.0,"Objects":[{"StartTime":151309.0,"EndTime":151309.0,"Column":4}]},{"RandomW":2191101353,"RandomX":3142401116,"RandomY":3877079747,"RandomZ":930029834,"StartTime":151575.0,"Objects":[{"StartTime":151575.0,"EndTime":152105.0,"Column":2},{"StartTime":151575.0,"EndTime":152105.0,"Column":0}]},{"RandomW":1171726387,"RandomX":2191101353,"RandomY":1357180538,"RandomZ":201209655,"StartTime":152637.0,"Objects":[{"StartTime":152637.0,"EndTime":152902.0,"Column":3}]},{"RandomW":2089660876,"RandomX":201209655,"RandomY":1171726387,"RandomZ":191699429,"StartTime":153168.0,"Objects":[{"StartTime":153168.0,"EndTime":153698.0,"Column":5}]},{"RandomW":2251323109,"RandomX":1171726387,"RandomY":191699429,"RandomZ":2089660876,"StartTime":153964.0,"Objects":[{"StartTime":153964.0,"EndTime":153964.0,"Column":2}]},{"RandomW":147408153,"RandomX":2251323109,"RandomY":2048526504,"RandomZ":433820735,"StartTime":154230.0,"Objects":[{"StartTime":154230.0,"EndTime":154230.0,"Column":0},{"StartTime":154230.0,"EndTime":154230.0,"Column":5}]},{"RandomW":223059387,"RandomX":2048526504,"RandomY":433820735,"RandomZ":147408153,"StartTime":154495.0,"Objects":[{"StartTime":154495.0,"EndTime":154495.0,"Column":3}]},{"RandomW":1644267862,"RandomX":147408153,"RandomY":223059387,"RandomZ":2814282738,"StartTime":154761.0,"Objects":[{"StartTime":154761.0,"EndTime":155026.0,"Column":4}]},{"RandomW":585628331,"RandomX":1644267862,"RandomY":547547522,"RandomZ":1901399656,"StartTime":155292.0,"Objects":[{"StartTime":155292.0,"EndTime":155292.0,"Column":0},{"StartTime":155292.0,"EndTime":155292.0,"Column":5}]},{"RandomW":1287818392,"RandomX":547547522,"RandomY":1901399656,"RandomZ":585628331,"StartTime":155557.0,"Objects":[{"StartTime":155557.0,"EndTime":155557.0,"Column":1}]},{"RandomW":3879046214,"RandomX":2065404539,"RandomY":2732913982,"RandomZ":3217781099,"StartTime":155823.0,"Objects":[{"StartTime":155823.0,"EndTime":156088.0,"Column":2},{"StartTime":155823.0,"EndTime":156088.0,"Column":4}]},{"RandomW":3318878889,"RandomX":3217781099,"RandomY":3879046214,"RandomZ":1075466897,"StartTime":156354.0,"Objects":[{"StartTime":156354.0,"EndTime":156619.0,"Column":3}]},{"RandomW":1785367685,"RandomX":1075466897,"RandomY":3318878889,"RandomZ":561406801,"StartTime":156885.0,"Objects":[{"StartTime":156885.0,"EndTime":157415.0,"Column":4}]},{"RandomW":2909067134,"RandomX":561406801,"RandomY":1785367685,"RandomZ":4168537475,"StartTime":157947.0,"Objects":[{"StartTime":157947.0,"EndTime":157947.0,"Column":5},{"StartTime":157947.0,"EndTime":157947.0,"Column":2}]},{"RandomW":1067074920,"RandomX":1785367685,"RandomY":4168537475,"RandomZ":2909067134,"StartTime":158212.0,"Objects":[{"StartTime":158212.0,"EndTime":158212.0,"Column":4}]},{"RandomW":27977914,"RandomX":4168537475,"RandomY":2909067134,"RandomZ":1067074920,"StartTime":158478.0,"Objects":[{"StartTime":158478.0,"EndTime":158478.0,"Column":5},{"StartTime":158478.0,"EndTime":158478.0,"Column":0}]},{"RandomW":1329528769,"RandomX":2909067134,"RandomY":1067074920,"RandomZ":27977914,"StartTime":158743.0,"Objects":[{"StartTime":158743.0,"EndTime":158743.0,"Column":4}]},{"RandomW":3295284863,"RandomX":1067074920,"RandomY":27977914,"RandomZ":1329528769,"StartTime":159009.0,"Objects":[{"StartTime":159009.0,"EndTime":159009.0,"Column":5}]},{"RandomW":691446431,"RandomX":27977914,"RandomY":1329528769,"RandomZ":3295284863,"StartTime":159540.0,"Objects":[{"StartTime":159540.0,"EndTime":159540.0,"Column":3},{"StartTime":159540.0,"EndTime":159540.0,"Column":4}]},{"RandomW":3354872060,"RandomX":3295284863,"RandomY":691446431,"RandomZ":2140106811,"StartTime":159805.0,"Objects":[{"StartTime":159805.0,"EndTime":159805.0,"Column":2},{"StartTime":159805.0,"EndTime":159805.0,"Column":3}]},{"RandomW":1400553355,"RandomX":691446431,"RandomY":2140106811,"RandomZ":3354872060,"StartTime":160071.0,"Objects":[{"StartTime":160071.0,"EndTime":160071.0,"Column":2}]},{"RandomW":1400553355,"RandomX":691446431,"RandomY":2140106811,"RandomZ":3354872060,"StartTime":160601.0,"Objects":[{"StartTime":160601.0,"EndTime":160601.0,"Column":3}]},{"RandomW":3485781281,"RandomX":2140106811,"RandomY":3354872060,"RandomZ":1400553355,"StartTime":160867.0,"Objects":[{"StartTime":160867.0,"EndTime":160867.0,"Column":3}]},{"RandomW":3053679463,"RandomX":1400553355,"RandomY":3485781281,"RandomZ":3419304522,"StartTime":161132.0,"Objects":[{"StartTime":161132.0,"EndTime":161397.0,"Column":2}]},{"RandomW":3645336111,"RandomX":3419304522,"RandomY":3053679463,"RandomZ":805504203,"StartTime":161663.0,"Objects":[{"StartTime":161663.0,"EndTime":162193.0,"Column":4}]},{"RandomW":1638076271,"RandomX":3053679463,"RandomY":805504203,"RandomZ":3645336111,"StartTime":162460.0,"Objects":[{"StartTime":162460.0,"EndTime":162460.0,"Column":3}]},{"RandomW":107981020,"RandomX":1638076271,"RandomY":3432435831,"RandomZ":3835408498,"StartTime":162725.0,"Objects":[{"StartTime":162725.0,"EndTime":162725.0,"Column":0},{"StartTime":162725.0,"EndTime":162725.0,"Column":5}]},{"RandomW":94467567,"RandomX":3835408498,"RandomY":107981020,"RandomZ":2144208649,"StartTime":163256.0,"Objects":[{"StartTime":163256.0,"EndTime":163256.0,"Column":4},{"StartTime":163256.0,"EndTime":163256.0,"Column":0}]},{"RandomW":1015041289,"RandomX":107981020,"RandomY":2144208649,"RandomZ":94467567,"StartTime":163522.0,"Objects":[{"StartTime":163522.0,"EndTime":163522.0,"Column":3}]},{"RandomW":2029876639,"RandomX":1204955917,"RandomY":1210817201,"RandomZ":1177260118,"StartTime":163787.0,"Objects":[{"StartTime":163787.0,"EndTime":164052.0,"Column":5}]},{"RandomW":3125496505,"RandomX":1177260118,"RandomY":2029876639,"RandomZ":2929832910,"StartTime":164318.0,"Objects":[{"StartTime":164318.0,"EndTime":164583.0,"Column":2}]},{"RandomW":2426857185,"RandomX":3125496505,"RandomY":2700661894,"RandomZ":859446411,"StartTime":164849.0,"Objects":[{"StartTime":164849.0,"EndTime":165114.0,"Column":0}]},{"RandomW":4116661924,"RandomX":2426857185,"RandomY":1884842190,"RandomZ":375578279,"StartTime":165380.0,"Objects":[{"StartTime":165380.0,"EndTime":165910.0,"Column":1},{"StartTime":165380.0,"EndTime":165910.0,"Column":5}]},{"RandomW":3787729819,"RandomX":375578279,"RandomY":4116661924,"RandomZ":1382622976,"StartTime":166442.0,"Objects":[{"StartTime":166442.0,"EndTime":166972.0,"Column":4}]},{"RandomW":3780331234,"RandomX":4116661924,"RandomY":1382622976,"RandomZ":3787729819,"StartTime":167239.0,"Objects":[{"StartTime":167239.0,"EndTime":167239.0,"Column":3}]},{"RandomW":891570220,"RandomX":3780331234,"RandomY":3996538378,"RandomZ":4118560235,"StartTime":167504.0,"Objects":[{"StartTime":167504.0,"EndTime":168034.0,"Column":5},{"StartTime":167504.0,"EndTime":168034.0,"Column":2}]},{"RandomW":1312521276,"RandomX":3996538378,"RandomY":4118560235,"RandomZ":891570220,"StartTime":168301.0,"Objects":[{"StartTime":168301.0,"EndTime":168301.0,"Column":0}]},{"RandomW":316798455,"RandomX":4118560235,"RandomY":891570220,"RandomZ":1312521276,"StartTime":168566.0,"Objects":[{"StartTime":168566.0,"EndTime":168566.0,"Column":2},{"StartTime":168566.0,"EndTime":168566.0,"Column":3}]},{"RandomW":107348261,"RandomX":891570220,"RandomY":1312521276,"RandomZ":316798455,"StartTime":168832.0,"Objects":[{"StartTime":168832.0,"EndTime":168832.0,"Column":1}]},{"RandomW":286543085,"RandomX":1312521276,"RandomY":316798455,"RandomZ":107348261,"StartTime":169097.0,"Objects":[{"StartTime":169097.0,"EndTime":169097.0,"Column":1},{"StartTime":169097.0,"EndTime":169097.0,"Column":2}]},{"RandomW":2220558447,"RandomX":316798455,"RandomY":107348261,"RandomZ":286543085,"StartTime":169363.0,"Objects":[{"StartTime":169363.0,"EndTime":169363.0,"Column":2}]},{"RandomW":2567445342,"RandomX":107348261,"RandomY":286543085,"RandomZ":2220558447,"StartTime":169628.0,"Objects":[{"StartTime":169628.0,"EndTime":169628.0,"Column":1},{"StartTime":169628.0,"EndTime":169628.0,"Column":2}]},{"RandomW":2941341299,"RandomX":286543085,"RandomY":2220558447,"RandomZ":2567445342,"StartTime":170159.0,"Objects":[{"StartTime":170159.0,"EndTime":170159.0,"Column":3},{"StartTime":170159.0,"EndTime":170159.0,"Column":4}]},{"RandomW":2941341299,"RandomX":286543085,"RandomY":2220558447,"RandomZ":2567445342,"StartTime":170424.0,"Objects":[{"StartTime":170424.0,"EndTime":170424.0,"Column":2},{"StartTime":170424.0,"EndTime":170424.0,"Column":1}]},{"RandomW":1087727581,"RandomX":2567445342,"RandomY":2941341299,"RandomZ":479267920,"StartTime":170690.0,"Objects":[{"StartTime":170690.0,"EndTime":171220.0,"Column":3}]},{"RandomW":2581485170,"RandomX":2941341299,"RandomY":479267920,"RandomZ":1087727581,"StartTime":171486.0,"Objects":[{"StartTime":171486.0,"EndTime":171486.0,"Column":5}]},{"RandomW":683596203,"RandomX":1087727581,"RandomY":2581485170,"RandomZ":3168383468,"StartTime":171752.0,"Objects":[{"StartTime":171752.0,"EndTime":172282.0,"Column":1}]},{"RandomW":3284056302,"RandomX":2581485170,"RandomY":3168383468,"RandomZ":683596203,"StartTime":172548.0,"Objects":[{"StartTime":172548.0,"EndTime":172548.0,"Column":2}]},{"RandomW":2830633773,"RandomX":3168383468,"RandomY":683596203,"RandomZ":3284056302,"StartTime":172814.0,"Objects":[{"StartTime":172814.0,"EndTime":172814.0,"Column":3},{"StartTime":172814.0,"EndTime":172814.0,"Column":4}]},{"RandomW":3651115271,"RandomX":683596203,"RandomY":3284056302,"RandomZ":2830633773,"StartTime":173079.0,"Objects":[{"StartTime":173079.0,"EndTime":173079.0,"Column":3}]},{"RandomW":120746014,"RandomX":3284056302,"RandomY":2830633773,"RandomZ":3651115271,"StartTime":173345.0,"Objects":[{"StartTime":173345.0,"EndTime":173345.0,"Column":3},{"StartTime":173345.0,"EndTime":173345.0,"Column":4}]},{"RandomW":830325214,"RandomX":2830633773,"RandomY":3651115271,"RandomZ":120746014,"StartTime":173610.0,"Objects":[{"StartTime":173610.0,"EndTime":173610.0,"Column":4}]},{"RandomW":1509180863,"RandomX":3651115271,"RandomY":120746014,"RandomZ":830325214,"StartTime":173876.0,"Objects":[{"StartTime":173876.0,"EndTime":173876.0,"Column":3},{"StartTime":173876.0,"EndTime":173876.0,"Column":4}]},{"RandomW":2233493011,"RandomX":3902833961,"RandomY":923589330,"RandomZ":3425613873,"StartTime":174407.0,"Objects":[{"StartTime":174407.0,"EndTime":174672.0,"Column":2},{"StartTime":174407.0,"EndTime":174672.0,"Column":0}]},{"RandomW":2517643905,"RandomX":1207989122,"RandomY":993303558,"RandomZ":3011821377,"StartTime":174938.0,"Objects":[{"StartTime":174938.0,"EndTime":175468.0,"Column":3},{"StartTime":174938.0,"EndTime":175468.0,"Column":1}]},{"RandomW":3720863650,"RandomX":993303558,"RandomY":3011821377,"RandomZ":2517643905,"StartTime":175734.0,"Objects":[{"StartTime":175734.0,"EndTime":175734.0,"Column":2}]},{"RandomW":3563355415,"RandomX":2517643905,"RandomY":3720863650,"RandomZ":1116519600,"StartTime":176000.0,"Objects":[{"StartTime":176000.0,"EndTime":176530.0,"Column":3}]},{"RandomW":3287800096,"RandomX":3720863650,"RandomY":1116519600,"RandomZ":3563355415,"StartTime":176796.0,"Objects":[{"StartTime":176796.0,"EndTime":176796.0,"Column":3}]},{"RandomW":539898931,"RandomX":1116519600,"RandomY":3563355415,"RandomZ":3287800096,"StartTime":177062.0,"Objects":[{"StartTime":177062.0,"EndTime":177062.0,"Column":2},{"StartTime":177062.0,"EndTime":177062.0,"Column":3}]},{"RandomW":123758010,"RandomX":3563355415,"RandomY":3287800096,"RandomZ":539898931,"StartTime":177327.0,"Objects":[{"StartTime":177327.0,"EndTime":177327.0,"Column":4}]},{"RandomW":4028312708,"RandomX":3287800096,"RandomY":539898931,"RandomZ":123758010,"StartTime":177593.0,"Objects":[{"StartTime":177593.0,"EndTime":177593.0,"Column":2},{"StartTime":177593.0,"EndTime":177593.0,"Column":3}]},{"RandomW":2371409278,"RandomX":539898931,"RandomY":123758010,"RandomZ":4028312708,"StartTime":177858.0,"Objects":[{"StartTime":177858.0,"EndTime":177858.0,"Column":3}]},{"RandomW":3699828554,"RandomX":123758010,"RandomY":4028312708,"RandomZ":2371409278,"StartTime":178124.0,"Objects":[{"StartTime":178124.0,"EndTime":178124.0,"Column":2},{"StartTime":178124.0,"EndTime":178124.0,"Column":3}]},{"RandomW":4053363780,"RandomX":2371409278,"RandomY":3699828554,"RandomZ":3637445845,"StartTime":178655.0,"Objects":[{"StartTime":178655.0,"EndTime":178920.0,"Column":5}]},{"RandomW":1366734997,"RandomX":3637445845,"RandomY":4053363780,"RandomZ":3122766892,"StartTime":179186.0,"Objects":[{"StartTime":179186.0,"EndTime":179716.0,"Column":3}]},{"RandomW":2085192570,"RandomX":1366734997,"RandomY":4047501250,"RandomZ":3422445293,"StartTime":179982.0,"Objects":[{"StartTime":179982.0,"EndTime":179982.0,"Column":3},{"StartTime":179982.0,"EndTime":179982.0,"Column":5}]},{"RandomW":2526042960,"RandomX":3422445293,"RandomY":2085192570,"RandomZ":2552180342,"StartTime":180247.0,"Objects":[{"StartTime":180247.0,"EndTime":180777.0,"Column":1}]},{"RandomW":2946528857,"RandomX":2085192570,"RandomY":2552180342,"RandomZ":2526042960,"StartTime":181044.0,"Objects":[{"StartTime":181044.0,"EndTime":181044.0,"Column":2}]},{"RandomW":4275012500,"RandomX":2526042960,"RandomY":2946528857,"RandomZ":2680316548,"StartTime":181309.0,"Objects":[{"StartTime":181309.0,"EndTime":181574.0,"Column":5}]},{"RandomW":716767862,"RandomX":1177533555,"RandomY":3396673648,"RandomZ":1210370441,"StartTime":181840.0,"Objects":[{"StartTime":181840.0,"EndTime":182105.0,"Column":3},{"StartTime":181840.0,"EndTime":182105.0,"Column":2}]},{"RandomW":1918581647,"RandomX":1210370441,"RandomY":716767862,"RandomZ":290385782,"StartTime":182371.0,"Objects":[{"StartTime":182371.0,"EndTime":182636.0,"Column":5}]},{"RandomW":2554770024,"RandomX":1918581647,"RandomY":475913420,"RandomZ":4262840195,"StartTime":182902.0,"Objects":[{"StartTime":182902.0,"EndTime":183432.0,"Column":1}]},{"RandomW":862610860,"RandomX":475913420,"RandomY":4262840195,"RandomZ":2554770024,"StartTime":183699.0,"Objects":[{"StartTime":183699.0,"EndTime":185557.0,"Column":2}]},{"RandomW":3240322225,"RandomX":4262840195,"RandomY":2554770024,"RandomZ":862610860,"StartTime":202017.0,"Objects":[{"StartTime":202017.0,"EndTime":202017.0,"Column":0}]},{"RandomW":2438630089,"RandomX":2554770024,"RandomY":862610860,"RandomZ":3240322225,"StartTime":202283.0,"Objects":[{"StartTime":202283.0,"EndTime":202283.0,"Column":1}]},{"RandomW":1543895637,"RandomX":3240322225,"RandomY":2438630089,"RandomZ":1008910200,"StartTime":202548.0,"Objects":[{"StartTime":202548.0,"EndTime":203078.0,"Column":4}]},{"RandomW":2262375304,"RandomX":2438630089,"RandomY":1008910200,"RandomZ":1543895637,"StartTime":203345.0,"Objects":[{"StartTime":203345.0,"EndTime":203345.0,"Column":2}]},{"RandomW":3932191533,"RandomX":1543895637,"RandomY":2262375304,"RandomZ":3281044824,"StartTime":203610.0,"Objects":[{"StartTime":203610.0,"EndTime":203875.0,"Column":4}]},{"RandomW":2456816417,"RandomX":3932191533,"RandomY":2579817318,"RandomZ":3616517773,"StartTime":204141.0,"Objects":[{"StartTime":204141.0,"EndTime":204406.0,"Column":0}]},{"RandomW":1863357795,"RandomX":2456816417,"RandomY":2065740625,"RandomZ":3309416576,"StartTime":204672.0,"Objects":[{"StartTime":204672.0,"EndTime":205202.0,"Column":3},{"StartTime":204672.0,"EndTime":205202.0,"Column":5}]},{"RandomW":66010220,"RandomX":3309416576,"RandomY":1863357795,"RandomZ":2100015779,"StartTime":205469.0,"Objects":[{"StartTime":205469.0,"EndTime":205469.0,"Column":4},{"StartTime":205469.0,"EndTime":205469.0,"Column":0}]},{"RandomW":548562611,"RandomX":2100015779,"RandomY":66010220,"RandomZ":3420604705,"StartTime":205734.0,"Objects":[{"StartTime":205734.0,"EndTime":205999.0,"Column":1}]},{"RandomW":2052728473,"RandomX":3420604705,"RandomY":548562611,"RandomZ":2913964,"StartTime":206265.0,"Objects":[{"StartTime":206265.0,"EndTime":206530.0,"Column":5}]},{"RandomW":1944462115,"RandomX":2052728473,"RandomY":2737357746,"RandomZ":270315162,"StartTime":206796.0,"Objects":[{"StartTime":206796.0,"EndTime":206796.0,"Column":2},{"StartTime":206796.0,"EndTime":206796.0,"Column":3}]},{"RandomW":3626216744,"RandomX":2737357746,"RandomY":270315162,"RandomZ":1944462115,"StartTime":207062.0,"Objects":[{"StartTime":207062.0,"EndTime":207062.0,"Column":5}]},{"RandomW":1039388877,"RandomX":270315162,"RandomY":1944462115,"RandomZ":3626216744,"StartTime":207327.0,"Objects":[{"StartTime":207327.0,"EndTime":207327.0,"Column":4}]},{"RandomW":3362701719,"RandomX":1944462115,"RandomY":3626216744,"RandomZ":1039388877,"StartTime":207593.0,"Objects":[{"StartTime":207593.0,"EndTime":207593.0,"Column":3}]},{"RandomW":3968495235,"RandomX":3362701719,"RandomY":2329091202,"RandomZ":1331472925,"StartTime":207858.0,"Objects":[{"StartTime":207858.0,"EndTime":208388.0,"Column":5}]},{"RandomW":1381394684,"RandomX":2329091202,"RandomY":1331472925,"RandomZ":3968495235,"StartTime":208655.0,"Objects":[{"StartTime":208655.0,"EndTime":208655.0,"Column":5}]},{"RandomW":1435798214,"RandomX":1381394684,"RandomY":1081301304,"RandomZ":3939835753,"StartTime":208920.0,"Objects":[{"StartTime":208920.0,"EndTime":209450.0,"Column":4}]},{"RandomW":3026458880,"RandomX":1081301304,"RandomY":3939835753,"RandomZ":1435798214,"StartTime":209717.0,"Objects":[{"StartTime":209717.0,"EndTime":209717.0,"Column":5}]},{"RandomW":3713738018,"RandomX":3026458880,"RandomY":1845767213,"RandomZ":745035987,"StartTime":209982.0,"Objects":[{"StartTime":209982.0,"EndTime":210512.0,"Column":2},{"StartTime":209982.0,"EndTime":210512.0,"Column":4}]},{"RandomW":1231260560,"RandomX":1845767213,"RandomY":745035987,"RandomZ":3713738018,"StartTime":210778.0,"Objects":[{"StartTime":210778.0,"EndTime":210778.0,"Column":4}]},{"RandomW":105489365,"RandomX":745035987,"RandomY":3713738018,"RandomZ":1231260560,"StartTime":211044.0,"Objects":[{"StartTime":211044.0,"EndTime":211044.0,"Column":4}]},{"RandomW":1753861391,"RandomX":3713738018,"RandomY":1231260560,"RandomZ":105489365,"StartTime":211309.0,"Objects":[{"StartTime":211309.0,"EndTime":211309.0,"Column":2}]},{"RandomW":966114829,"RandomX":105489365,"RandomY":1753861391,"RandomZ":1828685577,"StartTime":211575.0,"Objects":[{"StartTime":211575.0,"EndTime":211575.0,"Column":3},{"StartTime":211575.0,"EndTime":211575.0,"Column":2}]},{"RandomW":1431749195,"RandomX":1836275468,"RandomY":1290011463,"RandomZ":1159621643,"StartTime":211840.0,"Objects":[{"StartTime":211840.0,"EndTime":212370.0,"Column":5},{"StartTime":211840.0,"EndTime":212370.0,"Column":4}]},{"RandomW":3472418283,"RandomX":1159621643,"RandomY":1431749195,"RandomZ":2724869338,"StartTime":212637.0,"Objects":[{"StartTime":212637.0,"EndTime":212902.0,"Column":3}]},{"RandomW":1755864208,"RandomX":3472418283,"RandomY":2016458251,"RandomZ":2610391004,"StartTime":213168.0,"Objects":[{"StartTime":213168.0,"EndTime":213698.0,"Column":1},{"StartTime":213168.0,"EndTime":213698.0,"Column":4}]},{"RandomW":1635138515,"RandomX":2016458251,"RandomY":2610391004,"RandomZ":1755864208,"StartTime":213964.0,"Objects":[{"StartTime":213964.0,"EndTime":213964.0,"Column":3}]},{"RandomW":3162662082,"RandomX":1755864208,"RandomY":1635138515,"RandomZ":2617989400,"StartTime":214230.0,"Objects":[{"StartTime":214230.0,"EndTime":214495.0,"Column":2}]},{"RandomW":1184692914,"RandomX":2617989400,"RandomY":3162662082,"RandomZ":2531582750,"StartTime":214761.0,"Objects":[{"StartTime":214761.0,"EndTime":215026.0,"Column":3}]},{"RandomW":798124101,"RandomX":2531582750,"RandomY":1184692914,"RandomZ":2157553888,"StartTime":215292.0,"Objects":[{"StartTime":215292.0,"EndTime":215557.0,"Column":2}]},{"RandomW":1923400471,"RandomX":798124101,"RandomY":2665448122,"RandomZ":1060614841,"StartTime":215823.0,"Objects":[{"StartTime":215823.0,"EndTime":216088.0,"Column":5}]},{"RandomW":775950648,"RandomX":1923400471,"RandomY":3469237574,"RandomZ":2892029047,"StartTime":216354.0,"Objects":[{"StartTime":216354.0,"EndTime":216354.0,"Column":1},{"StartTime":216354.0,"EndTime":216354.0,"Column":4}]},{"RandomW":1321234603,"RandomX":4127626210,"RandomY":1546611249,"RandomZ":1925740893,"StartTime":216885.0,"Objects":[{"StartTime":216885.0,"EndTime":217150.0,"Column":5},{"StartTime":216885.0,"EndTime":217150.0,"Column":3}]},{"RandomW":2881678930,"RandomX":1925740893,"RandomY":1321234603,"RandomZ":2358993682,"StartTime":217416.0,"Objects":[{"StartTime":217416.0,"EndTime":217946.0,"Column":2}]},{"RandomW":2599512294,"RandomX":1321234603,"RandomY":2358993682,"RandomZ":2881678930,"StartTime":218212.0,"Objects":[{"StartTime":218212.0,"EndTime":218212.0,"Column":1}]},{"RandomW":2150464549,"RandomX":2881678930,"RandomY":2599512294,"RandomZ":3623425595,"StartTime":218478.0,"Objects":[{"StartTime":218478.0,"EndTime":219008.0,"Column":0}]},{"RandomW":763775798,"RandomX":3623425595,"RandomY":2150464549,"RandomZ":1008837132,"StartTime":219274.0,"Objects":[{"StartTime":219274.0,"EndTime":221132.0,"Column":2}]},{"RandomW":3656799832,"RandomX":1008837132,"RandomY":763775798,"RandomZ":852609139,"StartTime":221663.0,"Objects":[{"StartTime":221663.0,"EndTime":222193.0,"Column":4}]},{"RandomW":4147545979,"RandomX":852609139,"RandomY":3656799832,"RandomZ":3908484776,"StartTime":222460.0,"Objects":[{"StartTime":222460.0,"EndTime":222460.0,"Column":2},{"StartTime":222460.0,"EndTime":222460.0,"Column":5}]},{"RandomW":540508179,"RandomX":3908484776,"RandomY":4147545979,"RandomZ":1259887550,"StartTime":222725.0,"Objects":[{"StartTime":222725.0,"EndTime":223255.0,"Column":1}]},{"RandomW":1042752714,"RandomX":1259887550,"RandomY":540508179,"RandomZ":2104064323,"StartTime":223522.0,"Objects":[{"StartTime":223522.0,"EndTime":223522.0,"Column":5},{"StartTime":223522.0,"EndTime":223522.0,"Column":2}]},{"RandomW":3077262619,"RandomX":540508179,"RandomY":2104064323,"RandomZ":1042752714,"StartTime":223787.0,"Objects":[{"StartTime":223787.0,"EndTime":223787.0,"Column":3},{"StartTime":223787.0,"EndTime":223787.0,"Column":4}]},{"RandomW":734033149,"RandomX":2104064323,"RandomY":1042752714,"RandomZ":3077262619,"StartTime":224053.0,"Objects":[{"StartTime":224053.0,"EndTime":224053.0,"Column":4}]},{"RandomW":492155815,"RandomX":1042752714,"RandomY":3077262619,"RandomZ":734033149,"StartTime":224318.0,"Objects":[{"StartTime":224318.0,"EndTime":224318.0,"Column":4},{"StartTime":224318.0,"EndTime":224318.0,"Column":5}]},{"RandomW":441697715,"RandomX":3077262619,"RandomY":734033149,"RandomZ":492155815,"StartTime":224584.0,"Objects":[{"StartTime":224584.0,"EndTime":224584.0,"Column":3}]},{"RandomW":4156379255,"RandomX":734033149,"RandomY":492155815,"RandomZ":441697715,"StartTime":224849.0,"Objects":[{"StartTime":224849.0,"EndTime":224849.0,"Column":4},{"StartTime":224849.0,"EndTime":224849.0,"Column":5}]},{"RandomW":3757225441,"RandomX":492155815,"RandomY":441697715,"RandomZ":4156379255,"StartTime":225380.0,"Objects":[{"StartTime":225380.0,"EndTime":225380.0,"Column":2},{"StartTime":225380.0,"EndTime":225380.0,"Column":3}]},{"RandomW":3757225441,"RandomX":492155815,"RandomY":441697715,"RandomZ":4156379255,"StartTime":225646.0,"Objects":[{"StartTime":225646.0,"EndTime":225646.0,"Column":3},{"StartTime":225646.0,"EndTime":225646.0,"Column":2}]},{"RandomW":2225043333,"RandomX":3950035756,"RandomY":4132636893,"RandomZ":3158636107,"StartTime":225911.0,"Objects":[{"StartTime":225911.0,"EndTime":226441.0,"Column":5},{"StartTime":225911.0,"EndTime":226441.0,"Column":0}]},{"RandomW":479006094,"RandomX":2225043333,"RandomY":3919293849,"RandomZ":2279622039,"StartTime":226708.0,"Objects":[{"StartTime":226708.0,"EndTime":226708.0,"Column":0},{"StartTime":226708.0,"EndTime":226708.0,"Column":1}]},{"RandomW":3529234379,"RandomX":479006094,"RandomY":1674670789,"RandomZ":1460857923,"StartTime":226973.0,"Objects":[{"StartTime":226973.0,"EndTime":227503.0,"Column":4},{"StartTime":226973.0,"EndTime":227503.0,"Column":3}]},{"RandomW":2798539123,"RandomX":1674670789,"RandomY":1460857923,"RandomZ":3529234379,"StartTime":227770.0,"Objects":[{"StartTime":227770.0,"EndTime":227770.0,"Column":3}]},{"RandomW":1315002421,"RandomX":1460857923,"RandomY":3529234379,"RandomZ":2798539123,"StartTime":228035.0,"Objects":[{"StartTime":228035.0,"EndTime":228035.0,"Column":2},{"StartTime":228035.0,"EndTime":228035.0,"Column":3}]},{"RandomW":2396116302,"RandomX":3529234379,"RandomY":2798539123,"RandomZ":1315002421,"StartTime":228301.0,"Objects":[{"StartTime":228301.0,"EndTime":228301.0,"Column":1}]},{"RandomW":2184752848,"RandomX":2798539123,"RandomY":1315002421,"RandomZ":2396116302,"StartTime":228566.0,"Objects":[{"StartTime":228566.0,"EndTime":228566.0,"Column":2},{"StartTime":228566.0,"EndTime":228566.0,"Column":3}]},{"RandomW":1453929005,"RandomX":1315002421,"RandomY":2396116302,"RandomZ":2184752848,"StartTime":228832.0,"Objects":[{"StartTime":228832.0,"EndTime":228832.0,"Column":1}]},{"RandomW":307062845,"RandomX":2396116302,"RandomY":2184752848,"RandomZ":1453929005,"StartTime":229097.0,"Objects":[{"StartTime":229097.0,"EndTime":229097.0,"Column":2},{"StartTime":229097.0,"EndTime":229097.0,"Column":3}]},{"RandomW":2488853431,"RandomX":1430246951,"RandomY":1243135735,"RandomZ":862796553,"StartTime":229628.0,"Objects":[{"StartTime":229628.0,"EndTime":229893.0,"Column":0}]},{"RandomW":2954723307,"RandomX":862796553,"RandomY":2488853431,"RandomZ":1065193973,"StartTime":230159.0,"Objects":[{"StartTime":230159.0,"EndTime":230689.0,"Column":2}]},{"RandomW":3118771232,"RandomX":1065193973,"RandomY":2954723307,"RandomZ":3941773202,"StartTime":230955.0,"Objects":[{"StartTime":230955.0,"EndTime":230955.0,"Column":3},{"StartTime":230955.0,"EndTime":230955.0,"Column":2}]},{"RandomW":1630107201,"RandomX":3532926875,"RandomY":2476115689,"RandomZ":1207743047,"StartTime":231221.0,"Objects":[{"StartTime":231221.0,"EndTime":231751.0,"Column":0},{"StartTime":231221.0,"EndTime":231751.0,"Column":4}]},{"RandomW":313681160,"RandomX":2476115689,"RandomY":1207743047,"RandomZ":1630107201,"StartTime":232017.0,"Objects":[{"StartTime":232017.0,"EndTime":232017.0,"Column":2}]},{"RandomW":892602489,"RandomX":1207743047,"RandomY":1630107201,"RandomZ":313681160,"StartTime":232283.0,"Objects":[{"StartTime":232283.0,"EndTime":232283.0,"Column":3},{"StartTime":232283.0,"EndTime":232283.0,"Column":4}]},{"RandomW":2549672466,"RandomX":1630107201,"RandomY":313681160,"RandomZ":892602489,"StartTime":232548.0,"Objects":[{"StartTime":232548.0,"EndTime":232548.0,"Column":1}]},{"RandomW":3175685586,"RandomX":313681160,"RandomY":892602489,"RandomZ":2549672466,"StartTime":232814.0,"Objects":[{"StartTime":232814.0,"EndTime":232814.0,"Column":3},{"StartTime":232814.0,"EndTime":232814.0,"Column":4}]},{"RandomW":1012053334,"RandomX":892602489,"RandomY":2549672466,"RandomZ":3175685586,"StartTime":233079.0,"Objects":[{"StartTime":233079.0,"EndTime":233079.0,"Column":2}]},{"RandomW":2846885221,"RandomX":2549672466,"RandomY":3175685586,"RandomZ":1012053334,"StartTime":233345.0,"Objects":[{"StartTime":233345.0,"EndTime":233345.0,"Column":3},{"StartTime":233345.0,"EndTime":233345.0,"Column":4}]},{"RandomW":2773158813,"RandomX":2846885221,"RandomY":4182295099,"RandomZ":203093837,"StartTime":233876.0,"Objects":[{"StartTime":233876.0,"EndTime":234141.0,"Column":0},{"StartTime":233876.0,"EndTime":234141.0,"Column":1}]},{"RandomW":857734082,"RandomX":203093837,"RandomY":2773158813,"RandomZ":2365172092,"StartTime":234407.0,"Objects":[{"StartTime":234407.0,"EndTime":234937.0,"Column":2}]},{"RandomW":3898917491,"RandomX":2773158813,"RandomY":2365172092,"RandomZ":857734082,"StartTime":235203.0,"Objects":[{"StartTime":235203.0,"EndTime":235203.0,"Column":2}]},{"RandomW":1417532037,"RandomX":857734082,"RandomY":3898917491,"RandomZ":361638657,"StartTime":235469.0,"Objects":[{"StartTime":235469.0,"EndTime":235999.0,"Column":3}]},{"RandomW":2557538851,"RandomX":3898917491,"RandomY":361638657,"RandomZ":1417532037,"StartTime":236265.0,"Objects":[{"StartTime":236265.0,"EndTime":236265.0,"Column":3}]},{"RandomW":846935039,"RandomX":1417532037,"RandomY":2557538851,"RandomZ":1456065540,"StartTime":236531.0,"Objects":[{"StartTime":236531.0,"EndTime":236796.0,"Column":2}]},{"RandomW":2547399683,"RandomX":1456065540,"RandomY":846935039,"RandomZ":2284332751,"StartTime":237062.0,"Objects":[{"StartTime":237062.0,"EndTime":237327.0,"Column":1}]},{"RandomW":2405919505,"RandomX":846935039,"RandomY":2284332751,"RandomZ":2547399683,"StartTime":237593.0,"Objects":[{"StartTime":237593.0,"EndTime":237593.0,"Column":3},{"StartTime":237593.0,"EndTime":237593.0,"Column":4}]},{"RandomW":1684559305,"RandomX":2284332751,"RandomY":2547399683,"RandomZ":2405919505,"StartTime":237858.0,"Objects":[{"StartTime":237858.0,"EndTime":237858.0,"Column":5},{"StartTime":237858.0,"EndTime":237858.0,"Column":0}]},{"RandomW":2914982357,"RandomX":2547399683,"RandomY":2405919505,"RandomZ":1684559305,"StartTime":238124.0,"Objects":[{"StartTime":238124.0,"EndTime":238124.0,"Column":2},{"StartTime":238124.0,"EndTime":238124.0,"Column":3}]},{"RandomW":2343509573,"RandomX":2405919505,"RandomY":1684559305,"RandomZ":2914982357,"StartTime":238389.0,"Objects":[{"StartTime":238389.0,"EndTime":238389.0,"Column":5}]},{"RandomW":1059378114,"RandomX":1684559305,"RandomY":2914982357,"RandomZ":2343509573,"StartTime":238655.0,"Objects":[{"StartTime":238655.0,"EndTime":240778.0,"Column":2}]}]}
\ No newline at end of file
+{"Mappings":[{"RandomW":273084013,"RandomX":842502087,"RandomY":3579807591,"RandomZ":273326509,"StartTime":15562.0,"Objects":[{"StartTime":15562.0,"EndTime":17155.0,"Column":0}]},{"RandomW":2659258901,"RandomX":3579807591,"RandomY":273326509,"RandomZ":273084013,"StartTime":17686.0,"Objects":[{"StartTime":17686.0,"EndTime":17686.0,"Column":0},{"StartTime":17686.0,"EndTime":17686.0,"Column":1}]},{"RandomW":3083655709,"RandomX":273326509,"RandomY":273084013,"RandomZ":2659258901,"StartTime":17951.0,"Objects":[{"StartTime":17951.0,"EndTime":17951.0,"Column":1}]},{"RandomW":3588026162,"RandomX":2659258901,"RandomY":3083655709,"RandomZ":4073603712,"StartTime":18217.0,"Objects":[{"StartTime":18217.0,"EndTime":18217.0,"Column":2},{"StartTime":18217.0,"EndTime":18217.0,"Column":4}]},{"RandomW":1130061350,"RandomX":3083655709,"RandomY":4073603712,"RandomZ":3588026162,"StartTime":18482.0,"Objects":[{"StartTime":18482.0,"EndTime":18482.0,"Column":2}]},{"RandomW":315421426,"RandomX":3588026162,"RandomY":1130061350,"RandomZ":2459334754,"StartTime":18748.0,"Objects":[{"StartTime":18748.0,"EndTime":19013.0,"Column":0}]},{"RandomW":3110660773,"RandomX":2459334754,"RandomY":315421426,"RandomZ":542845670,"StartTime":19279.0,"Objects":[{"StartTime":19279.0,"EndTime":19809.0,"Column":3},{"StartTime":19544.0,"EndTime":19544.0,"Column":1},{"StartTime":19809.0,"EndTime":19809.0,"Column":1}]},{"RandomW":3110660773,"RandomX":2459334754,"RandomY":315421426,"RandomZ":542845670,"StartTime":20075.0,"Objects":[{"StartTime":20075.0,"EndTime":20075.0,"Column":4},{"StartTime":20075.0,"EndTime":20075.0,"Column":2}]},{"RandomW":2552021122,"RandomX":315421426,"RandomY":542845670,"RandomZ":3110660773,"StartTime":20341.0,"Objects":[{"StartTime":20341.0,"EndTime":20341.0,"Column":3}]},{"RandomW":3979536913,"RandomX":542845670,"RandomY":3110660773,"RandomZ":2552021122,"StartTime":20606.0,"Objects":[{"StartTime":20606.0,"EndTime":20606.0,"Column":2},{"StartTime":20606.0,"EndTime":20606.0,"Column":3}]},{"RandomW":3926138036,"RandomX":2552021122,"RandomY":3979536913,"RandomZ":348643659,"StartTime":20871.0,"Objects":[{"StartTime":20871.0,"EndTime":21401.0,"Column":4}]},{"RandomW":4001028953,"RandomX":348643659,"RandomY":3926138036,"RandomZ":2489502118,"StartTime":21933.0,"Objects":[{"StartTime":21933.0,"EndTime":22198.0,"Column":5}]},{"RandomW":263714783,"RandomX":2489502118,"RandomY":4001028953,"RandomZ":3315380836,"StartTime":22464.0,"Objects":[{"StartTime":22464.0,"EndTime":22729.0,"Column":0}]},{"RandomW":3045229215,"RandomX":3315380836,"RandomY":263714783,"RandomZ":2367299702,"StartTime":22995.0,"Objects":[{"StartTime":22995.0,"EndTime":23791.0,"Column":2}]},{"RandomW":622075324,"RandomX":2367299702,"RandomY":3045229215,"RandomZ":2511145433,"StartTime":24057.0,"Objects":[{"StartTime":24057.0,"EndTime":24322.0,"Column":1}]},{"RandomW":1428674661,"RandomX":3630592823,"RandomY":628640291,"RandomZ":2684635853,"StartTime":24588.0,"Objects":[{"StartTime":24588.0,"EndTime":24853.0,"Column":4},{"StartTime":24588.0,"EndTime":24853.0,"Column":3}]},{"RandomW":2963472042,"RandomX":3191072317,"RandomY":1509788298,"RandomZ":3677221210,"StartTime":25119.0,"Objects":[{"StartTime":25119.0,"EndTime":25649.0,"Column":2}]},{"RandomW":2441208973,"RandomX":1509788298,"RandomY":3677221210,"RandomZ":2963472042,"StartTime":26181.0,"Objects":[{"StartTime":26181.0,"EndTime":26181.0,"Column":2},{"StartTime":26181.0,"EndTime":26181.0,"Column":3}]},{"RandomW":614303213,"RandomX":3677221210,"RandomY":2963472042,"RandomZ":2441208973,"StartTime":26447.0,"Objects":[{"StartTime":26447.0,"EndTime":26447.0,"Column":3}]},{"RandomW":931064848,"RandomX":2441208973,"RandomY":614303213,"RandomZ":2425227013,"StartTime":26712.0,"Objects":[{"StartTime":26712.0,"EndTime":26977.0,"Column":2}]},{"RandomW":1631554006,"RandomX":2425227013,"RandomY":931064848,"RandomZ":2839921662,"StartTime":27243.0,"Objects":[{"StartTime":27243.0,"EndTime":27508.0,"Column":4}]},{"RandomW":1102544522,"RandomX":2839921662,"RandomY":1631554006,"RandomZ":2171149531,"StartTime":27774.0,"Objects":[{"StartTime":27774.0,"EndTime":28039.0,"Column":3}]},{"RandomW":1535528787,"RandomX":2171149531,"RandomY":1102544522,"RandomZ":3328843633,"StartTime":28305.0,"Objects":[{"StartTime":28305.0,"EndTime":28835.0,"Column":4},{"StartTime":28305.0,"EndTime":28305.0,"Column":3},{"StartTime":28570.0,"EndTime":28570.0,"Column":3},{"StartTime":28835.0,"EndTime":28835.0,"Column":3}]},{"RandomW":2462060348,"RandomX":1102544522,"RandomY":3328843633,"RandomZ":1535528787,"StartTime":29102.0,"Objects":[{"StartTime":29102.0,"EndTime":29102.0,"Column":3}]},{"RandomW":2548780898,"RandomX":2462060348,"RandomY":1752789184,"RandomZ":4269701929,"StartTime":29367.0,"Objects":[{"StartTime":29367.0,"EndTime":29897.0,"Column":5},{"StartTime":29367.0,"EndTime":29897.0,"Column":1}]},{"RandomW":2872444045,"RandomX":2548780898,"RandomY":96471884,"RandomZ":2795275332,"StartTime":30429.0,"Objects":[{"StartTime":30429.0,"EndTime":30694.0,"Column":2}]},{"RandomW":554186146,"RandomX":2872444045,"RandomY":1718345430,"RandomZ":1676944188,"StartTime":30960.0,"Objects":[{"StartTime":30960.0,"EndTime":31225.0,"Column":4},{"StartTime":30960.0,"EndTime":31225.0,"Column":1}]},{"RandomW":44350362,"RandomX":1676944188,"RandomY":554186146,"RandomZ":973164386,"StartTime":31491.0,"Objects":[{"StartTime":31491.0,"EndTime":32287.0,"Column":0}]},{"RandomW":2689469863,"RandomX":973164386,"RandomY":44350362,"RandomZ":3230373169,"StartTime":32553.0,"Objects":[{"StartTime":32553.0,"EndTime":32818.0,"Column":1}]},{"RandomW":3076210018,"RandomX":3230373169,"RandomY":2689469863,"RandomZ":2416196755,"StartTime":33084.0,"Objects":[{"StartTime":33084.0,"EndTime":33349.0,"Column":2}]},{"RandomW":4212524875,"RandomX":2416196755,"RandomY":3076210018,"RandomZ":736433317,"StartTime":33615.0,"Objects":[{"StartTime":33615.0,"EndTime":34145.0,"Column":5}]},{"RandomW":668643347,"RandomX":4212524875,"RandomY":1246190622,"RandomZ":614058009,"StartTime":34677.0,"Objects":[{"StartTime":34677.0,"EndTime":34677.0,"Column":0},{"StartTime":34677.0,"EndTime":34677.0,"Column":5}]},{"RandomW":4133034829,"RandomX":668643347,"RandomY":1824376828,"RandomZ":476758489,"StartTime":34942.0,"Objects":[{"StartTime":34942.0,"EndTime":34942.0,"Column":1},{"StartTime":34942.0,"EndTime":34942.0,"Column":5}]},{"RandomW":82933693,"RandomX":1824376828,"RandomY":476758489,"RandomZ":4133034829,"StartTime":35208.0,"Objects":[{"StartTime":35208.0,"EndTime":35208.0,"Column":0},{"StartTime":35208.0,"EndTime":35208.0,"Column":1}]},{"RandomW":2263995128,"RandomX":476758489,"RandomY":4133034829,"RandomZ":82933693,"StartTime":35473.0,"Objects":[{"StartTime":35473.0,"EndTime":35473.0,"Column":1}]},{"RandomW":3437211638,"RandomX":4133034829,"RandomY":82933693,"RandomZ":2263995128,"StartTime":35739.0,"Objects":[{"StartTime":35739.0,"EndTime":35739.0,"Column":2}]},{"RandomW":2107738941,"RandomX":2263995128,"RandomY":3437211638,"RandomZ":4066526803,"StartTime":36004.0,"Objects":[{"StartTime":36004.0,"EndTime":36004.0,"Column":2},{"StartTime":36004.0,"EndTime":36004.0,"Column":5}]},{"RandomW":1976561763,"RandomX":3437211638,"RandomY":4066526803,"RandomZ":2107738941,"StartTime":36270.0,"Objects":[{"StartTime":36270.0,"EndTime":36270.0,"Column":3},{"StartTime":36270.0,"EndTime":36270.0,"Column":4}]},{"RandomW":1147027763,"RandomX":4066526803,"RandomY":2107738941,"RandomZ":1976561763,"StartTime":36535.0,"Objects":[{"StartTime":36535.0,"EndTime":36535.0,"Column":3}]},{"RandomW":3580315894,"RandomX":1976561763,"RandomY":1147027763,"RandomZ":2767111989,"StartTime":36801.0,"Objects":[{"StartTime":36801.0,"EndTime":37331.0,"Column":4}]},{"RandomW":3743545041,"RandomX":1147027763,"RandomY":2767111989,"RandomZ":3580315894,"StartTime":37597.0,"Objects":[{"StartTime":37597.0,"EndTime":37597.0,"Column":1}]},{"RandomW":1409948107,"RandomX":3743545041,"RandomY":1774216159,"RandomZ":3150304957,"StartTime":37863.0,"Objects":[{"StartTime":37863.0,"EndTime":38393.0,"Column":2},{"StartTime":37863.0,"EndTime":38393.0,"Column":3}]},{"RandomW":4009340712,"RandomX":3150304957,"RandomY":1409948107,"RandomZ":2219703013,"StartTime":38925.0,"Objects":[{"StartTime":38925.0,"EndTime":39190.0,"Column":5}]},{"RandomW":3071167491,"RandomX":2065497204,"RandomY":2145154717,"RandomZ":2494378321,"StartTime":39456.0,"Objects":[{"StartTime":39456.0,"EndTime":39721.0,"Column":0},{"StartTime":39456.0,"EndTime":39721.0,"Column":2}]},{"RandomW":1245938367,"RandomX":3071167491,"RandomY":728627658,"RandomZ":3080260260,"StartTime":39987.0,"Objects":[{"StartTime":39987.0,"EndTime":40783.0,"Column":3}]},{"RandomW":3032241617,"RandomX":1245938367,"RandomY":2414391712,"RandomZ":3406801470,"StartTime":41048.0,"Objects":[{"StartTime":41048.0,"EndTime":41313.0,"Column":2}]},{"RandomW":3367991920,"RandomX":3804000131,"RandomY":672376773,"RandomZ":2667292323,"StartTime":41579.0,"Objects":[{"StartTime":41579.0,"EndTime":41844.0,"Column":1},{"StartTime":41579.0,"EndTime":41844.0,"Column":3}]},{"RandomW":2095476726,"RandomX":2667292323,"RandomY":3367991920,"RandomZ":3380532371,"StartTime":42110.0,"Objects":[{"StartTime":42110.0,"EndTime":42640.0,"Column":5}]},{"RandomW":869340745,"RandomX":2095476726,"RandomY":1063981175,"RandomZ":204767504,"StartTime":43172.0,"Objects":[{"StartTime":43172.0,"EndTime":43172.0,"Column":1},{"StartTime":43172.0,"EndTime":43172.0,"Column":4}]},{"RandomW":461904197,"RandomX":204767504,"RandomY":869340745,"RandomZ":2080855578,"StartTime":43438.0,"Objects":[{"StartTime":43438.0,"EndTime":43438.0,"Column":2},{"StartTime":43438.0,"EndTime":43438.0,"Column":1}]},{"RandomW":3004966693,"RandomX":869340745,"RandomY":2080855578,"RandomZ":461904197,"StartTime":43703.0,"Objects":[{"StartTime":43703.0,"EndTime":43703.0,"Column":3},{"StartTime":43703.0,"EndTime":43703.0,"Column":4}]},{"RandomW":147065937,"RandomX":2080855578,"RandomY":461904197,"RandomZ":3004966693,"StartTime":43969.0,"Objects":[{"StartTime":43969.0,"EndTime":43969.0,"Column":4}]},{"RandomW":1312111829,"RandomX":461904197,"RandomY":3004966693,"RandomZ":147065937,"StartTime":44234.0,"Objects":[{"StartTime":44234.0,"EndTime":44234.0,"Column":4}]},{"RandomW":355223143,"RandomX":3004966693,"RandomY":147065937,"RandomZ":1312111829,"StartTime":44500.0,"Objects":[{"StartTime":44500.0,"EndTime":44500.0,"Column":3}]},{"RandomW":1197174504,"RandomX":147065937,"RandomY":1312111829,"RandomZ":355223143,"StartTime":44765.0,"Objects":[{"StartTime":44765.0,"EndTime":44765.0,"Column":2},{"StartTime":44765.0,"EndTime":44765.0,"Column":3}]},{"RandomW":2296450669,"RandomX":355223143,"RandomY":1197174504,"RandomZ":1876247766,"StartTime":45031.0,"Objects":[{"StartTime":45031.0,"EndTime":45031.0,"Column":1},{"StartTime":45031.0,"EndTime":45031.0,"Column":0}]},{"RandomW":1664705375,"RandomX":1876247766,"RandomY":2296450669,"RandomZ":4287200872,"StartTime":45296.0,"Objects":[{"StartTime":45296.0,"EndTime":45296.0,"Column":0},{"StartTime":45296.0,"EndTime":45296.0,"Column":4}]},{"RandomW":2786027546,"RandomX":2296450669,"RandomY":4287200872,"RandomZ":1664705375,"StartTime":45562.0,"Objects":[{"StartTime":45562.0,"EndTime":45562.0,"Column":1}]},{"RandomW":639469776,"RandomX":4287200872,"RandomY":1664705375,"RandomZ":2786027546,"StartTime":45827.0,"Objects":[{"StartTime":45827.0,"EndTime":45827.0,"Column":3},{"StartTime":45827.0,"EndTime":45827.0,"Column":4}]},{"RandomW":2463352901,"RandomX":1664705375,"RandomY":2786027546,"RandomZ":639469776,"StartTime":46093.0,"Objects":[{"StartTime":46093.0,"EndTime":46093.0,"Column":4}]},{"RandomW":760995091,"RandomX":2463352901,"RandomY":978871003,"RandomZ":3888812594,"StartTime":46358.0,"Objects":[{"StartTime":46358.0,"EndTime":46888.0,"Column":2}]},{"RandomW":3631307076,"RandomX":3888812594,"RandomY":760995091,"RandomZ":566667549,"StartTime":47420.0,"Objects":[{"StartTime":47420.0,"EndTime":47685.0,"Column":4}]},{"RandomW":2353216536,"RandomX":3631307076,"RandomY":1805196154,"RandomZ":2564415583,"StartTime":47951.0,"Objects":[{"StartTime":47951.0,"EndTime":48216.0,"Column":1},{"StartTime":47951.0,"EndTime":48216.0,"Column":0}]},{"RandomW":717730087,"RandomX":2353216536,"RandomY":3735744429,"RandomZ":2102099401,"StartTime":48482.0,"Objects":[{"StartTime":48482.0,"EndTime":49278.0,"Column":5},{"StartTime":48482.0,"EndTime":49278.0,"Column":2}]},{"RandomW":271333990,"RandomX":717730087,"RandomY":3220302747,"RandomZ":917482575,"StartTime":49544.0,"Objects":[{"StartTime":49544.0,"EndTime":49809.0,"Column":0}]},{"RandomW":937976203,"RandomX":917482575,"RandomY":271333990,"RandomZ":125173709,"StartTime":50075.0,"Objects":[{"StartTime":50075.0,"EndTime":50340.0,"Column":2}]},{"RandomW":2781059562,"RandomX":937976203,"RandomY":2087616237,"RandomZ":232817676,"StartTime":50606.0,"Objects":[{"StartTime":50606.0,"EndTime":51667.0,"Column":0},{"StartTime":50606.0,"EndTime":51667.0,"Column":1}]},{"RandomW":3511898336,"RandomX":2087616237,"RandomY":232817676,"RandomZ":2781059562,"StartTime":52730.0,"Objects":[{"StartTime":52730.0,"EndTime":52730.0,"Column":4}]},{"RandomW":623291556,"RandomX":3737503025,"RandomY":3607951873,"RandomZ":1857627587,"StartTime":53792.0,"Objects":[{"StartTime":53792.0,"EndTime":54322.0,"Column":5},{"StartTime":53792.0,"EndTime":54322.0,"Column":1}]},{"RandomW":3577350524,"RandomX":3607951873,"RandomY":1857627587,"RandomZ":623291556,"StartTime":54588.0,"Objects":[{"StartTime":54588.0,"EndTime":54588.0,"Column":2}]},{"RandomW":3611414219,"RandomX":1700150568,"RandomY":3261504380,"RandomZ":3526708248,"StartTime":54854.0,"Objects":[{"StartTime":54854.0,"EndTime":55384.0,"Column":3},{"StartTime":54854.0,"EndTime":55384.0,"Column":4}]},{"RandomW":4116828180,"RandomX":3526708248,"RandomY":3611414219,"RandomZ":53089910,"StartTime":55916.0,"Objects":[{"StartTime":55916.0,"EndTime":56446.0,"Column":5}]},{"RandomW":1419945944,"RandomX":53089910,"RandomY":4116828180,"RandomZ":2370574124,"StartTime":56978.0,"Objects":[{"StartTime":56978.0,"EndTime":57549.0,"Column":3}]},{"RandomW":4235330325,"RandomX":2370574124,"RandomY":1419945944,"RandomZ":124293788,"StartTime":58120.0,"Objects":[{"StartTime":58120.0,"EndTime":58405.0,"Column":5}]},{"RandomW":1354196818,"RandomX":124293788,"RandomY":4235330325,"RandomZ":292200128,"StartTime":58692.0,"Objects":[{"StartTime":58692.0,"EndTime":58973.0,"Column":3}]},{"RandomW":2131632245,"RandomX":292200128,"RandomY":1354196818,"RandomZ":319349674,"StartTime":59325.0,"Objects":[{"StartTime":59325.0,"EndTime":60170.0,"Column":5}]},{"RandomW":987180490,"RandomX":1354196818,"RandomY":319349674,"RandomZ":2131632245,"StartTime":60513.0,"Objects":[{"StartTime":60513.0,"EndTime":60513.0,"Column":3}]},{"RandomW":2247158810,"RandomX":2131632245,"RandomY":987180490,"RandomZ":3518058549,"StartTime":60778.0,"Objects":[{"StartTime":60778.0,"EndTime":61043.0,"Column":0}]},{"RandomW":2347989337,"RandomX":987180490,"RandomY":3518058549,"RandomZ":2247158810,"StartTime":61309.0,"Objects":[{"StartTime":61309.0,"EndTime":61309.0,"Column":3}]},{"RandomW":82954311,"RandomX":1403151684,"RandomY":1362150166,"RandomZ":1092174296,"StartTime":61840.0,"Objects":[{"StartTime":61840.0,"EndTime":62105.0,"Column":0}]},{"RandomW":408605211,"RandomX":82954311,"RandomY":1144587736,"RandomZ":2479248954,"StartTime":62371.0,"Objects":[{"StartTime":62371.0,"EndTime":62901.0,"Column":1}]},{"RandomW":2455999143,"RandomX":1144587736,"RandomY":2479248954,"RandomZ":408605211,"StartTime":63168.0,"Objects":[{"StartTime":63168.0,"EndTime":63168.0,"Column":2}]},{"RandomW":1898608481,"RandomX":2455999143,"RandomY":519590646,"RandomZ":3207504021,"StartTime":63433.0,"Objects":[{"StartTime":63433.0,"EndTime":63963.0,"Column":5}]},{"RandomW":601995191,"RandomX":3207504021,"RandomY":1898608481,"RandomZ":4283573577,"StartTime":64230.0,"Objects":[{"StartTime":64230.0,"EndTime":64230.0,"Column":5},{"StartTime":64230.0,"EndTime":64230.0,"Column":1}]},{"RandomW":3909194070,"RandomX":1898608481,"RandomY":4283573577,"RandomZ":601995191,"StartTime":64495.0,"Objects":[{"StartTime":64495.0,"EndTime":64495.0,"Column":3},{"StartTime":64495.0,"EndTime":64495.0,"Column":4}]},{"RandomW":3417465448,"RandomX":4283573577,"RandomY":601995191,"RandomZ":3909194070,"StartTime":64761.0,"Objects":[{"StartTime":64761.0,"EndTime":64761.0,"Column":4}]},{"RandomW":2779016762,"RandomX":601995191,"RandomY":3909194070,"RandomZ":3417465448,"StartTime":65026.0,"Objects":[{"StartTime":65026.0,"EndTime":65026.0,"Column":4},{"StartTime":65026.0,"EndTime":65026.0,"Column":5}]},{"RandomW":2346068278,"RandomX":3909194070,"RandomY":3417465448,"RandomZ":2779016762,"StartTime":65292.0,"Objects":[{"StartTime":65292.0,"EndTime":65292.0,"Column":3}]},{"RandomW":1857589819,"RandomX":3417465448,"RandomY":2779016762,"RandomZ":2346068278,"StartTime":65557.0,"Objects":[{"StartTime":65557.0,"EndTime":65557.0,"Column":4},{"StartTime":65557.0,"EndTime":65557.0,"Column":5}]},{"RandomW":910236838,"RandomX":2779016762,"RandomY":2346068278,"RandomZ":1857589819,"StartTime":66088.0,"Objects":[{"StartTime":66088.0,"EndTime":66088.0,"Column":3},{"StartTime":66088.0,"EndTime":66088.0,"Column":4}]},{"RandomW":910236838,"RandomX":2779016762,"RandomY":2346068278,"RandomZ":1857589819,"StartTime":66354.0,"Objects":[{"StartTime":66354.0,"EndTime":66354.0,"Column":2},{"StartTime":66354.0,"EndTime":66354.0,"Column":1}]},{"RandomW":2327273799,"RandomX":1857589819,"RandomY":910236838,"RandomZ":2953998826,"StartTime":66619.0,"Objects":[{"StartTime":66619.0,"EndTime":67149.0,"Column":0}]},{"RandomW":540283744,"RandomX":910236838,"RandomY":2953998826,"RandomZ":2327273799,"StartTime":67416.0,"Objects":[{"StartTime":67416.0,"EndTime":67416.0,"Column":0}]},{"RandomW":1024467186,"RandomX":2327273799,"RandomY":540283744,"RandomZ":514760684,"StartTime":67681.0,"Objects":[{"StartTime":67681.0,"EndTime":68211.0,"Column":2}]},{"RandomW":211600206,"RandomX":540283744,"RandomY":514760684,"RandomZ":1024467186,"StartTime":68478.0,"Objects":[{"StartTime":68478.0,"EndTime":68478.0,"Column":3}]},{"RandomW":2360573614,"RandomX":514760684,"RandomY":1024467186,"RandomZ":211600206,"StartTime":68743.0,"Objects":[{"StartTime":68743.0,"EndTime":68743.0,"Column":4},{"StartTime":68743.0,"EndTime":68743.0,"Column":5}]},{"RandomW":3867722027,"RandomX":1024467186,"RandomY":211600206,"RandomZ":2360573614,"StartTime":69009.0,"Objects":[{"StartTime":69009.0,"EndTime":69009.0,"Column":3}]},{"RandomW":1512274616,"RandomX":211600206,"RandomY":2360573614,"RandomZ":3867722027,"StartTime":69274.0,"Objects":[{"StartTime":69274.0,"EndTime":69274.0,"Column":4},{"StartTime":69274.0,"EndTime":69274.0,"Column":5}]},{"RandomW":2957984769,"RandomX":2360573614,"RandomY":3867722027,"RandomZ":1512274616,"StartTime":69540.0,"Objects":[{"StartTime":69540.0,"EndTime":69540.0,"Column":3}]},{"RandomW":2803767976,"RandomX":3867722027,"RandomY":1512274616,"RandomZ":2957984769,"StartTime":69805.0,"Objects":[{"StartTime":69805.0,"EndTime":69805.0,"Column":4},{"StartTime":69805.0,"EndTime":69805.0,"Column":5}]},{"RandomW":1183341084,"RandomX":2957984769,"RandomY":2803767976,"RandomZ":121575161,"StartTime":70336.0,"Objects":[{"StartTime":70336.0,"EndTime":70601.0,"Column":3}]},{"RandomW":3685872119,"RandomX":121575161,"RandomY":1183341084,"RandomZ":2351788416,"StartTime":70867.0,"Objects":[{"StartTime":70867.0,"EndTime":71397.0,"Column":4}]},{"RandomW":617004198,"RandomX":1183341084,"RandomY":2351788416,"RandomZ":3685872119,"StartTime":71663.0,"Objects":[{"StartTime":71663.0,"EndTime":71663.0,"Column":3}]},{"RandomW":2478235967,"RandomX":617004198,"RandomY":546986648,"RandomZ":3353120378,"StartTime":71929.0,"Objects":[{"StartTime":71929.0,"EndTime":72459.0,"Column":0}]},{"RandomW":2189712483,"RandomX":546986648,"RandomY":3353120378,"RandomZ":2478235967,"StartTime":72725.0,"Objects":[{"StartTime":72725.0,"EndTime":72725.0,"Column":2}]},{"RandomW":1882757169,"RandomX":3353120378,"RandomY":2478235967,"RandomZ":2189712483,"StartTime":72991.0,"Objects":[{"StartTime":72991.0,"EndTime":72991.0,"Column":3},{"StartTime":72991.0,"EndTime":72991.0,"Column":4}]},{"RandomW":1404331794,"RandomX":2478235967,"RandomY":2189712483,"RandomZ":1882757169,"StartTime":73256.0,"Objects":[{"StartTime":73256.0,"EndTime":73256.0,"Column":1}]},{"RandomW":1999620930,"RandomX":2189712483,"RandomY":1882757169,"RandomZ":1404331794,"StartTime":73522.0,"Objects":[{"StartTime":73522.0,"EndTime":73522.0,"Column":3},{"StartTime":73522.0,"EndTime":73522.0,"Column":4}]},{"RandomW":3622364800,"RandomX":1882757169,"RandomY":1404331794,"RandomZ":1999620930,"StartTime":73787.0,"Objects":[{"StartTime":73787.0,"EndTime":73787.0,"Column":2}]},{"RandomW":1671763292,"RandomX":1404331794,"RandomY":1999620930,"RandomZ":3622364800,"StartTime":74053.0,"Objects":[{"StartTime":74053.0,"EndTime":74053.0,"Column":3},{"StartTime":74053.0,"EndTime":74053.0,"Column":4}]},{"RandomW":2594561583,"RandomX":3622364800,"RandomY":1671763292,"RandomZ":2480497357,"StartTime":74584.0,"Objects":[{"StartTime":74584.0,"EndTime":74849.0,"Column":1}]},{"RandomW":1101860073,"RandomX":2480497357,"RandomY":2594561583,"RandomZ":183105309,"StartTime":75115.0,"Objects":[{"StartTime":75115.0,"EndTime":75645.0,"Column":3}]},{"RandomW":423280923,"RandomX":2594561583,"RandomY":183105309,"RandomZ":1101860073,"StartTime":75911.0,"Objects":[{"StartTime":75911.0,"EndTime":75911.0,"Column":2}]},{"RandomW":3905841932,"RandomX":1101860073,"RandomY":423280923,"RandomZ":2916757685,"StartTime":76177.0,"Objects":[{"StartTime":76177.0,"EndTime":76707.0,"Column":4}]},{"RandomW":3241015480,"RandomX":423280923,"RandomY":2916757685,"RandomZ":3905841932,"StartTime":76973.0,"Objects":[{"StartTime":76973.0,"EndTime":76973.0,"Column":3}]},{"RandomW":1928531304,"RandomX":3905841932,"RandomY":3241015480,"RandomZ":248564639,"StartTime":77239.0,"Objects":[{"StartTime":77239.0,"EndTime":77504.0,"Column":5}]},{"RandomW":634267655,"RandomX":3925777969,"RandomY":1203262350,"RandomZ":3485263061,"StartTime":77770.0,"Objects":[{"StartTime":77770.0,"EndTime":78035.0,"Column":3},{"StartTime":77770.0,"EndTime":78035.0,"Column":1}]},{"RandomW":953955737,"RandomX":1203262350,"RandomY":3485263061,"RandomZ":634267655,"StartTime":78301.0,"Objects":[{"StartTime":78301.0,"EndTime":78301.0,"Column":3}]},{"RandomW":3179099439,"RandomX":3485263061,"RandomY":634267655,"RandomZ":953955737,"StartTime":78566.0,"Objects":[{"StartTime":78566.0,"EndTime":78566.0,"Column":2},{"StartTime":78566.0,"EndTime":78566.0,"Column":3}]},{"RandomW":2513433625,"RandomX":634267655,"RandomY":953955737,"RandomZ":3179099439,"StartTime":78832.0,"Objects":[{"StartTime":78832.0,"EndTime":78832.0,"Column":3},{"StartTime":78832.0,"EndTime":78832.0,"Column":4}]},{"RandomW":3239409847,"RandomX":953955737,"RandomY":3179099439,"RandomZ":2513433625,"StartTime":79097.0,"Objects":[{"StartTime":79097.0,"EndTime":79097.0,"Column":5},{"StartTime":79097.0,"EndTime":79097.0,"Column":0}]},{"RandomW":1279031172,"RandomX":2513433625,"RandomY":3239409847,"RandomZ":415034865,"StartTime":79363.0,"Objects":[{"StartTime":79363.0,"EndTime":79893.0,"Column":3}]},{"RandomW":2797153574,"RandomX":3239409847,"RandomY":415034865,"RandomZ":1279031172,"StartTime":80159.0,"Objects":[{"StartTime":80159.0,"EndTime":80159.0,"Column":3}]},{"RandomW":858752658,"RandomX":1279031172,"RandomY":2797153574,"RandomZ":3422759302,"StartTime":80424.0,"Objects":[{"StartTime":80424.0,"EndTime":80954.0,"Column":2}]},{"RandomW":2617268004,"RandomX":2797153574,"RandomY":3422759302,"RandomZ":858752658,"StartTime":81221.0,"Objects":[{"StartTime":81221.0,"EndTime":81221.0,"Column":4}]},{"RandomW":4089416095,"RandomX":3422759302,"RandomY":858752658,"RandomZ":2617268004,"StartTime":81486.0,"Objects":[{"StartTime":81486.0,"EndTime":81486.0,"Column":4},{"StartTime":81486.0,"EndTime":81486.0,"Column":5}]},{"RandomW":640008567,"RandomX":858752658,"RandomY":2617268004,"RandomZ":4089416095,"StartTime":81752.0,"Objects":[{"StartTime":81752.0,"EndTime":81752.0,"Column":4}]},{"RandomW":1769064503,"RandomX":2617268004,"RandomY":4089416095,"RandomZ":640008567,"StartTime":82017.0,"Objects":[{"StartTime":82017.0,"EndTime":82017.0,"Column":5},{"StartTime":82017.0,"EndTime":82017.0,"Column":0}]},{"RandomW":4171929422,"RandomX":640008567,"RandomY":1769064503,"RandomZ":4149611338,"StartTime":82283.0,"Objects":[{"StartTime":82283.0,"EndTime":82283.0,"Column":3},{"StartTime":82283.0,"EndTime":82283.0,"Column":5}]},{"RandomW":4035764053,"RandomX":1769064503,"RandomY":4149611338,"RandomZ":4171929422,"StartTime":82548.0,"Objects":[{"StartTime":82548.0,"EndTime":82548.0,"Column":5},{"StartTime":82548.0,"EndTime":82548.0,"Column":0}]},{"RandomW":391872771,"RandomX":4149611338,"RandomY":4171929422,"RandomZ":4035764053,"StartTime":83079.0,"Objects":[{"StartTime":83079.0,"EndTime":83079.0,"Column":3},{"StartTime":83079.0,"EndTime":83079.0,"Column":4}]},{"RandomW":391872771,"RandomX":4149611338,"RandomY":4171929422,"RandomZ":4035764053,"StartTime":83345.0,"Objects":[{"StartTime":83345.0,"EndTime":83345.0,"Column":2},{"StartTime":83345.0,"EndTime":83345.0,"Column":1}]},{"RandomW":4239141202,"RandomX":4035764053,"RandomY":391872771,"RandomZ":1343280377,"StartTime":83610.0,"Objects":[{"StartTime":83610.0,"EndTime":84140.0,"Column":5}]},{"RandomW":2008371177,"RandomX":4239141202,"RandomY":1783379941,"RandomZ":2715086902,"StartTime":84407.0,"Objects":[{"StartTime":84407.0,"EndTime":84407.0,"Column":1},{"StartTime":84407.0,"EndTime":84407.0,"Column":5}]},{"RandomW":980563717,"RandomX":3939376884,"RandomY":3778473815,"RandomZ":3882214919,"StartTime":84672.0,"Objects":[{"StartTime":84672.0,"EndTime":85202.0,"Column":4},{"StartTime":84672.0,"EndTime":85202.0,"Column":2}]},{"RandomW":2698098433,"RandomX":3778473815,"RandomY":3882214919,"RandomZ":980563717,"StartTime":85469.0,"Objects":[{"StartTime":85469.0,"EndTime":85469.0,"Column":1}]},{"RandomW":4140546075,"RandomX":3882214919,"RandomY":980563717,"RandomZ":2698098433,"StartTime":85734.0,"Objects":[{"StartTime":85734.0,"EndTime":85734.0,"Column":3},{"StartTime":85734.0,"EndTime":85734.0,"Column":4}]},{"RandomW":1045835035,"RandomX":980563717,"RandomY":2698098433,"RandomZ":4140546075,"StartTime":86000.0,"Objects":[{"StartTime":86000.0,"EndTime":86000.0,"Column":1}]},{"RandomW":2503475147,"RandomX":2698098433,"RandomY":4140546075,"RandomZ":1045835035,"StartTime":86265.0,"Objects":[{"StartTime":86265.0,"EndTime":86265.0,"Column":1},{"StartTime":86265.0,"EndTime":86265.0,"Column":2}]},{"RandomW":3094559699,"RandomX":4140546075,"RandomY":1045835035,"RandomZ":2503475147,"StartTime":86531.0,"Objects":[{"StartTime":86531.0,"EndTime":86531.0,"Column":3}]},{"RandomW":332613542,"RandomX":1045835035,"RandomY":2503475147,"RandomZ":3094559699,"StartTime":86796.0,"Objects":[{"StartTime":86796.0,"EndTime":86796.0,"Column":2},{"StartTime":86796.0,"EndTime":86796.0,"Column":3}]},{"RandomW":2534271858,"RandomX":332613542,"RandomY":2623704626,"RandomZ":3061969874,"StartTime":87327.0,"Objects":[{"StartTime":87327.0,"EndTime":87592.0,"Column":1}]},{"RandomW":794230988,"RandomX":2534271858,"RandomY":510287938,"RandomZ":2532404899,"StartTime":87858.0,"Objects":[{"StartTime":87858.0,"EndTime":88388.0,"Column":2}]},{"RandomW":3623430191,"RandomX":510287938,"RandomY":2532404899,"RandomZ":794230988,"StartTime":88655.0,"Objects":[{"StartTime":88655.0,"EndTime":88655.0,"Column":2}]},{"RandomW":2269498220,"RandomX":794230988,"RandomY":3623430191,"RandomZ":2598120162,"StartTime":88920.0,"Objects":[{"StartTime":88920.0,"EndTime":89450.0,"Column":0}]},{"RandomW":277080616,"RandomX":3623430191,"RandomY":2598120162,"RandomZ":2269498220,"StartTime":89717.0,"Objects":[{"StartTime":89717.0,"EndTime":89717.0,"Column":2}]},{"RandomW":237305927,"RandomX":2598120162,"RandomY":2269498220,"RandomZ":277080616,"StartTime":89982.0,"Objects":[{"StartTime":89982.0,"EndTime":89982.0,"Column":1},{"StartTime":89982.0,"EndTime":89982.0,"Column":2}]},{"RandomW":3697412902,"RandomX":277080616,"RandomY":237305927,"RandomZ":1976938587,"StartTime":90247.0,"Objects":[{"StartTime":90247.0,"EndTime":90247.0,"Column":1},{"StartTime":90247.0,"EndTime":90247.0,"Column":4}]},{"RandomW":3552536616,"RandomX":237305927,"RandomY":1976938587,"RandomZ":3697412902,"StartTime":90513.0,"Objects":[{"StartTime":90513.0,"EndTime":90513.0,"Column":2},{"StartTime":90513.0,"EndTime":90513.0,"Column":3}]},{"RandomW":758205604,"RandomX":3697412902,"RandomY":3552536616,"RandomZ":4122897696,"StartTime":90778.0,"Objects":[{"StartTime":90778.0,"EndTime":90778.0,"Column":1},{"StartTime":90778.0,"EndTime":90778.0,"Column":2}]},{"RandomW":3787868447,"RandomX":3552536616,"RandomY":4122897696,"RandomZ":758205604,"StartTime":91044.0,"Objects":[{"StartTime":91044.0,"EndTime":91044.0,"Column":2},{"StartTime":91044.0,"EndTime":91044.0,"Column":3}]},{"RandomW":1748107640,"RandomX":3787868447,"RandomY":3373302567,"RandomZ":3485540424,"StartTime":91575.0,"Objects":[{"StartTime":91575.0,"EndTime":91840.0,"Column":4}]},{"RandomW":4130051617,"RandomX":3485540424,"RandomY":1748107640,"RandomZ":3144627152,"StartTime":92106.0,"Objects":[{"StartTime":92106.0,"EndTime":92636.0,"Column":5}]},{"RandomW":808332236,"RandomX":1748107640,"RandomY":3144627152,"RandomZ":4130051617,"StartTime":92902.0,"Objects":[{"StartTime":92902.0,"EndTime":92902.0,"Column":3}]},{"RandomW":182226446,"RandomX":4130051617,"RandomY":808332236,"RandomZ":3371160944,"StartTime":93168.0,"Objects":[{"StartTime":93168.0,"EndTime":93698.0,"Column":0}]},{"RandomW":2699856874,"RandomX":808332236,"RandomY":3371160944,"RandomZ":182226446,"StartTime":93964.0,"Objects":[{"StartTime":93964.0,"EndTime":93964.0,"Column":1}]},{"RandomW":3110990203,"RandomX":2699856874,"RandomY":3789399152,"RandomZ":1462741358,"StartTime":94230.0,"Objects":[{"StartTime":94230.0,"EndTime":94495.0,"Column":4},{"StartTime":94230.0,"EndTime":94495.0,"Column":2}]},{"RandomW":2375429180,"RandomX":2098892391,"RandomY":1911053200,"RandomZ":1537665050,"StartTime":94761.0,"Objects":[{"StartTime":94761.0,"EndTime":95026.0,"Column":5},{"StartTime":94761.0,"EndTime":95026.0,"Column":0}]},{"RandomW":391186846,"RandomX":1537665050,"RandomY":2375429180,"RandomZ":609673823,"StartTime":95292.0,"Objects":[{"StartTime":95292.0,"EndTime":96353.0,"Column":1}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":96486.0,"Objects":[{"StartTime":96486.0,"EndTime":98478.0,"Column":5}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":113345.0,"Objects":[{"StartTime":113345.0,"EndTime":113345.0,"Column":4}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":113876.0,"Objects":[{"StartTime":113876.0,"EndTime":113876.0,"Column":1}]},{"RandomW":2078004566,"RandomX":2375429180,"RandomY":609673823,"RandomZ":391186846,"StartTime":114407.0,"Objects":[{"StartTime":114407.0,"EndTime":114407.0,"Column":4}]},{"RandomW":1192288733,"RandomX":609673823,"RandomY":391186846,"RandomZ":2078004566,"StartTime":114672.0,"Objects":[{"StartTime":114672.0,"EndTime":114672.0,"Column":2},{"StartTime":114672.0,"EndTime":114672.0,"Column":3}]},{"RandomW":3569858426,"RandomX":391186846,"RandomY":2078004566,"RandomZ":1192288733,"StartTime":114938.0,"Objects":[{"StartTime":114938.0,"EndTime":114938.0,"Column":2}]},{"RandomW":1262832005,"RandomX":2078004566,"RandomY":1192288733,"RandomZ":3569858426,"StartTime":115203.0,"Objects":[{"StartTime":115203.0,"EndTime":115203.0,"Column":3},{"StartTime":115203.0,"EndTime":115203.0,"Column":4}]},{"RandomW":4002501854,"RandomX":1192288733,"RandomY":3569858426,"RandomZ":1262832005,"StartTime":115469.0,"Objects":[{"StartTime":115469.0,"EndTime":115469.0,"Column":3},{"StartTime":115469.0,"EndTime":115469.0,"Column":4}]},{"RandomW":776953560,"RandomX":3569858426,"RandomY":1262832005,"RandomZ":4002501854,"StartTime":116000.0,"Objects":[{"StartTime":116000.0,"EndTime":116000.0,"Column":3},{"StartTime":116000.0,"EndTime":116000.0,"Column":4}]},{"RandomW":776953560,"RandomX":3569858426,"RandomY":1262832005,"RandomZ":4002501854,"StartTime":116531.0,"Objects":[{"StartTime":116531.0,"EndTime":116531.0,"Column":2},{"StartTime":116531.0,"EndTime":116531.0,"Column":1}]},{"RandomW":3352969228,"RandomX":1262832005,"RandomY":4002501854,"RandomZ":776953560,"StartTime":117062.0,"Objects":[{"StartTime":117062.0,"EndTime":117062.0,"Column":3},{"StartTime":117062.0,"EndTime":117062.0,"Column":4}]},{"RandomW":2796695571,"RandomX":4002501854,"RandomY":776953560,"RandomZ":3352969228,"StartTime":117327.0,"Objects":[{"StartTime":117327.0,"EndTime":117327.0,"Column":2}]},{"RandomW":3269572543,"RandomX":776953560,"RandomY":3352969228,"RandomZ":2796695571,"StartTime":117593.0,"Objects":[{"StartTime":117593.0,"EndTime":117593.0,"Column":4},{"StartTime":117593.0,"EndTime":117593.0,"Column":5}]},{"RandomW":3269572543,"RandomX":776953560,"RandomY":3352969228,"RandomZ":2796695571,"StartTime":118124.0,"Objects":[{"StartTime":118124.0,"EndTime":118124.0,"Column":1},{"StartTime":118124.0,"EndTime":118124.0,"Column":0}]},{"RandomW":3269572543,"RandomX":776953560,"RandomY":3352969228,"RandomZ":2796695571,"StartTime":118655.0,"Objects":[{"StartTime":118655.0,"EndTime":118655.0,"Column":5},{"StartTime":118655.0,"EndTime":118655.0,"Column":4}]},{"RandomW":2517403813,"RandomX":3352969228,"RandomY":2796695571,"RandomZ":3269572543,"StartTime":118920.0,"Objects":[{"StartTime":118920.0,"EndTime":118920.0,"Column":2},{"StartTime":118920.0,"EndTime":118920.0,"Column":3}]},{"RandomW":2210619464,"RandomX":2796695571,"RandomY":3269572543,"RandomZ":2517403813,"StartTime":119186.0,"Objects":[{"StartTime":119186.0,"EndTime":119186.0,"Column":4}]},{"RandomW":3032935051,"RandomX":3269572543,"RandomY":2517403813,"RandomZ":2210619464,"StartTime":119451.0,"Objects":[{"StartTime":119451.0,"EndTime":119451.0,"Column":5},{"StartTime":119451.0,"EndTime":119451.0,"Column":0}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":119717.0,"Objects":[{"StartTime":119717.0,"EndTime":119717.0,"Column":4},{"StartTime":119717.0,"EndTime":119717.0,"Column":5}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":120247.0,"Objects":[{"StartTime":120247.0,"EndTime":120247.0,"Column":1},{"StartTime":120247.0,"EndTime":120247.0,"Column":0}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":120778.0,"Objects":[{"StartTime":120778.0,"EndTime":120778.0,"Column":5},{"StartTime":120778.0,"EndTime":120778.0,"Column":4}]},{"RandomW":2069229539,"RandomX":2517403813,"RandomY":2210619464,"RandomZ":3032935051,"StartTime":121309.0,"Objects":[{"StartTime":121309.0,"EndTime":121309.0,"Column":1},{"StartTime":121309.0,"EndTime":121309.0,"Column":0}]},{"RandomW":2314078604,"RandomX":2210619464,"RandomY":3032935051,"RandomZ":2069229539,"StartTime":121575.0,"Objects":[{"StartTime":121575.0,"EndTime":121575.0,"Column":3}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":121840.0,"Objects":[{"StartTime":121840.0,"EndTime":121840.0,"Column":3},{"StartTime":121840.0,"EndTime":121840.0,"Column":4}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":122371.0,"Objects":[{"StartTime":122371.0,"EndTime":122371.0,"Column":2},{"StartTime":122371.0,"EndTime":122371.0,"Column":1}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":122902.0,"Objects":[{"StartTime":122902.0,"EndTime":122902.0,"Column":4},{"StartTime":122902.0,"EndTime":122902.0,"Column":3}]},{"RandomW":297269721,"RandomX":3032935051,"RandomY":2069229539,"RandomZ":2314078604,"StartTime":123433.0,"Objects":[{"StartTime":123433.0,"EndTime":123433.0,"Column":2},{"StartTime":123433.0,"EndTime":123433.0,"Column":1}]},{"RandomW":2460408790,"RandomX":2069229539,"RandomY":2314078604,"RandomZ":297269721,"StartTime":123699.0,"Objects":[{"StartTime":123699.0,"EndTime":123699.0,"Column":1}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":123964.0,"Objects":[{"StartTime":123964.0,"EndTime":123964.0,"Column":3},{"StartTime":123964.0,"EndTime":123964.0,"Column":4}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":124495.0,"Objects":[{"StartTime":124495.0,"EndTime":124495.0,"Column":2},{"StartTime":124495.0,"EndTime":124495.0,"Column":1}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":125026.0,"Objects":[{"StartTime":125026.0,"EndTime":125026.0,"Column":4},{"StartTime":125026.0,"EndTime":125026.0,"Column":3}]},{"RandomW":1180177558,"RandomX":2314078604,"RandomY":297269721,"RandomZ":2460408790,"StartTime":125557.0,"Objects":[{"StartTime":125557.0,"EndTime":125557.0,"Column":2},{"StartTime":125557.0,"EndTime":125557.0,"Column":1}]},{"RandomW":3204700088,"RandomX":297269721,"RandomY":2460408790,"RandomZ":1180177558,"StartTime":125823.0,"Objects":[{"StartTime":125823.0,"EndTime":125823.0,"Column":2}]},{"RandomW":299141296,"RandomX":2460408790,"RandomY":1180177558,"RandomZ":3204700088,"StartTime":126088.0,"Objects":[{"StartTime":126088.0,"EndTime":126088.0,"Column":3},{"StartTime":126088.0,"EndTime":126088.0,"Column":4}]},{"RandomW":299141296,"RandomX":2460408790,"RandomY":1180177558,"RandomZ":3204700088,"StartTime":126619.0,"Objects":[{"StartTime":126619.0,"EndTime":126619.0,"Column":2},{"StartTime":126619.0,"EndTime":126619.0,"Column":1}]},{"RandomW":299141296,"RandomX":2460408790,"RandomY":1180177558,"RandomZ":3204700088,"StartTime":127150.0,"Objects":[{"StartTime":127150.0,"EndTime":127150.0,"Column":4},{"StartTime":127150.0,"EndTime":127150.0,"Column":3}]},{"RandomW":3037239607,"RandomX":1180177558,"RandomY":3204700088,"RandomZ":299141296,"StartTime":127416.0,"Objects":[{"StartTime":127416.0,"EndTime":127416.0,"Column":4},{"StartTime":127416.0,"EndTime":127416.0,"Column":5}]},{"RandomW":863164324,"RandomX":3204700088,"RandomY":299141296,"RandomZ":3037239607,"StartTime":127681.0,"Objects":[{"StartTime":127681.0,"EndTime":127681.0,"Column":5}]},{"RandomW":2456647781,"RandomX":299141296,"RandomY":3037239607,"RandomZ":863164324,"StartTime":127947.0,"Objects":[{"StartTime":127947.0,"EndTime":127947.0,"Column":4},{"StartTime":127947.0,"EndTime":127947.0,"Column":5}]},{"RandomW":659157904,"RandomX":3037239607,"RandomY":863164324,"RandomZ":2456647781,"StartTime":128212.0,"Objects":[{"StartTime":128212.0,"EndTime":128212.0,"Column":3},{"StartTime":128212.0,"EndTime":128212.0,"Column":4}]},{"RandomW":659157904,"RandomX":3037239607,"RandomY":863164324,"RandomZ":2456647781,"StartTime":128743.0,"Objects":[{"StartTime":128743.0,"EndTime":128743.0,"Column":2},{"StartTime":128743.0,"EndTime":128743.0,"Column":1}]},{"RandomW":659157904,"RandomX":3037239607,"RandomY":863164324,"RandomZ":2456647781,"StartTime":129274.0,"Objects":[{"StartTime":129274.0,"EndTime":129274.0,"Column":4},{"StartTime":129274.0,"EndTime":129274.0,"Column":3}]},{"RandomW":3598260079,"RandomX":863164324,"RandomY":2456647781,"RandomZ":659157904,"StartTime":129540.0,"Objects":[{"StartTime":129540.0,"EndTime":129540.0,"Column":3},{"StartTime":129540.0,"EndTime":129540.0,"Column":4}]},{"RandomW":1930638835,"RandomX":2456647781,"RandomY":659157904,"RandomZ":3598260079,"StartTime":129805.0,"Objects":[{"StartTime":129805.0,"EndTime":129805.0,"Column":1},{"StartTime":129805.0,"EndTime":129805.0,"Column":2}]},{"RandomW":4230333264,"RandomX":1930638835,"RandomY":2319762852,"RandomZ":3807998479,"StartTime":130071.0,"Objects":[{"StartTime":130071.0,"EndTime":130071.0,"Column":2},{"StartTime":130071.0,"EndTime":130071.0,"Column":3}]},{"RandomW":2482386774,"RandomX":4230333264,"RandomY":376688010,"RandomZ":3132506885,"StartTime":132460.0,"Objects":[{"StartTime":132460.0,"EndTime":132990.0,"Column":0}]},{"RandomW":3381449487,"RandomX":3132506885,"RandomY":2482386774,"RandomZ":1092311355,"StartTime":133522.0,"Objects":[{"StartTime":133522.0,"EndTime":134052.0,"Column":3}]},{"RandomW":3812940964,"RandomX":1092311355,"RandomY":3381449487,"RandomZ":3240759120,"StartTime":134318.0,"Objects":[{"StartTime":134318.0,"EndTime":134848.0,"Column":4}]},{"RandomW":2199106412,"RandomX":2014155638,"RandomY":3619038163,"RandomZ":1182263034,"StartTime":135115.0,"Objects":[{"StartTime":135115.0,"EndTime":135380.0,"Column":3},{"StartTime":135115.0,"EndTime":135380.0,"Column":0}]},{"RandomW":4049541057,"RandomX":1182263034,"RandomY":2199106412,"RandomZ":2542868059,"StartTime":135646.0,"Objects":[{"StartTime":135646.0,"EndTime":136176.0,"Column":5}]},{"RandomW":376448389,"RandomX":2542868059,"RandomY":4049541057,"RandomZ":149323558,"StartTime":136708.0,"Objects":[{"StartTime":136708.0,"EndTime":136973.0,"Column":1}]},{"RandomW":10761513,"RandomX":149323558,"RandomY":376448389,"RandomZ":156027614,"StartTime":137239.0,"Objects":[{"StartTime":137239.0,"EndTime":137504.0,"Column":0}]},{"RandomW":2890609580,"RandomX":156027614,"RandomY":10761513,"RandomZ":998270292,"StartTime":137770.0,"Objects":[{"StartTime":137770.0,"EndTime":138566.0,"Column":2}]},{"RandomW":3792858866,"RandomX":998270292,"RandomY":2890609580,"RandomZ":3275622081,"StartTime":138832.0,"Objects":[{"StartTime":138832.0,"EndTime":139097.0,"Column":4}]},{"RandomW":479756469,"RandomX":3792858866,"RandomY":3665829153,"RandomZ":799245198,"StartTime":139363.0,"Objects":[{"StartTime":139363.0,"EndTime":139628.0,"Column":2},{"StartTime":139363.0,"EndTime":139628.0,"Column":1}]},{"RandomW":1559664190,"RandomX":1837897770,"RandomY":3074386351,"RandomZ":2226336565,"StartTime":139894.0,"Objects":[{"StartTime":139894.0,"EndTime":140690.0,"Column":0},{"StartTime":139894.0,"EndTime":140690.0,"Column":4}]},{"RandomW":1370921154,"RandomX":3074386351,"RandomY":2226336565,"RandomZ":1559664190,"StartTime":140955.0,"Objects":[{"StartTime":140955.0,"EndTime":140955.0,"Column":4}]},{"RandomW":12534613,"RandomX":1559664190,"RandomY":1370921154,"RandomZ":495513930,"StartTime":141221.0,"Objects":[{"StartTime":141221.0,"EndTime":141751.0,"Column":3},{"StartTime":141486.0,"EndTime":141486.0,"Column":1},{"StartTime":141751.0,"EndTime":141751.0,"Column":1}]},{"RandomW":1474110729,"RandomX":12534613,"RandomY":3893387802,"RandomZ":226854738,"StartTime":142017.0,"Objects":[{"StartTime":142017.0,"EndTime":142017.0,"Column":2},{"StartTime":142017.0,"EndTime":142017.0,"Column":3}]},{"RandomW":3883366092,"RandomX":1474110729,"RandomY":2911002956,"RandomZ":3337209428,"StartTime":142283.0,"Objects":[{"StartTime":142283.0,"EndTime":142548.0,"Column":4}]},{"RandomW":1868157439,"RandomX":3883366092,"RandomY":1497166406,"RandomZ":3876220972,"StartTime":142814.0,"Objects":[{"StartTime":142814.0,"EndTime":143079.0,"Column":5}]},{"RandomW":868486094,"RandomX":1497166406,"RandomY":3876220972,"RandomZ":1868157439,"StartTime":143345.0,"Objects":[{"StartTime":143345.0,"EndTime":143345.0,"Column":2}]},{"RandomW":2379505970,"RandomX":3876220972,"RandomY":1868157439,"RandomZ":868486094,"StartTime":143610.0,"Objects":[{"StartTime":143610.0,"EndTime":143610.0,"Column":2}]},{"RandomW":971762612,"RandomX":1868157439,"RandomY":868486094,"RandomZ":2379505970,"StartTime":143876.0,"Objects":[{"StartTime":143876.0,"EndTime":143876.0,"Column":4}]},{"RandomW":2333467129,"RandomX":2379505970,"RandomY":971762612,"RandomZ":2560365407,"StartTime":144141.0,"Objects":[{"StartTime":144141.0,"EndTime":144671.0,"Column":0}]},{"RandomW":3275109659,"RandomX":2560365407,"RandomY":2333467129,"RandomZ":2783370328,"StartTime":145203.0,"Objects":[{"StartTime":145203.0,"EndTime":145468.0,"Column":3}]},{"RandomW":2675369072,"RandomX":2783370328,"RandomY":3275109659,"RandomZ":3142107337,"StartTime":145734.0,"Objects":[{"StartTime":145734.0,"EndTime":145999.0,"Column":1}]},{"RandomW":2114821552,"RandomX":3142107337,"RandomY":2675369072,"RandomZ":216133594,"StartTime":146265.0,"Objects":[{"StartTime":146265.0,"EndTime":146795.0,"Column":5}]},{"RandomW":2210288688,"RandomX":2675369072,"RandomY":216133594,"RandomZ":2114821552,"StartTime":147062.0,"Objects":[{"StartTime":147062.0,"EndTime":147062.0,"Column":3}]},{"RandomW":2824847566,"RandomX":2114821552,"RandomY":2210288688,"RandomZ":2881713491,"StartTime":147327.0,"Objects":[{"StartTime":147327.0,"EndTime":147592.0,"Column":1}]},{"RandomW":3418617049,"RandomX":2881713491,"RandomY":2824847566,"RandomZ":3131910248,"StartTime":147858.0,"Objects":[{"StartTime":147858.0,"EndTime":148123.0,"Column":3}]},{"RandomW":4264037536,"RandomX":3418617049,"RandomY":2065328415,"RandomZ":756387586,"StartTime":148389.0,"Objects":[{"StartTime":148389.0,"EndTime":149450.0,"Column":2},{"StartTime":148389.0,"EndTime":149450.0,"Column":5}]},{"RandomW":714689152,"RandomX":2065328415,"RandomY":756387586,"RandomZ":4264037536,"StartTime":149717.0,"Objects":[{"StartTime":149717.0,"EndTime":149717.0,"Column":2}]},{"RandomW":2187562077,"RandomX":756387586,"RandomY":4264037536,"RandomZ":714689152,"StartTime":149982.0,"Objects":[{"StartTime":149982.0,"EndTime":149982.0,"Column":1},{"StartTime":149982.0,"EndTime":149982.0,"Column":2}]},{"RandomW":59731596,"RandomX":4264037536,"RandomY":714689152,"RandomZ":2187562077,"StartTime":150247.0,"Objects":[{"StartTime":150247.0,"EndTime":150247.0,"Column":0}]},{"RandomW":3179032401,"RandomX":714689152,"RandomY":2187562077,"RandomZ":59731596,"StartTime":150513.0,"Objects":[{"StartTime":150513.0,"EndTime":150513.0,"Column":1}]},{"RandomW":1565638452,"RandomX":2187562077,"RandomY":59731596,"RandomZ":3179032401,"StartTime":150778.0,"Objects":[{"StartTime":150778.0,"EndTime":150778.0,"Column":2}]},{"RandomW":3285111207,"RandomX":59731596,"RandomY":3179032401,"RandomZ":1565638452,"StartTime":151044.0,"Objects":[{"StartTime":151044.0,"EndTime":151044.0,"Column":3},{"StartTime":151044.0,"EndTime":151044.0,"Column":4}]},{"RandomW":3142401116,"RandomX":3179032401,"RandomY":1565638452,"RandomZ":3285111207,"StartTime":151309.0,"Objects":[{"StartTime":151309.0,"EndTime":151309.0,"Column":4}]},{"RandomW":2191101353,"RandomX":3142401116,"RandomY":3877079747,"RandomZ":930029834,"StartTime":151575.0,"Objects":[{"StartTime":151575.0,"EndTime":152105.0,"Column":2},{"StartTime":151575.0,"EndTime":152105.0,"Column":0}]},{"RandomW":1171726387,"RandomX":2191101353,"RandomY":1357180538,"RandomZ":201209655,"StartTime":152637.0,"Objects":[{"StartTime":152637.0,"EndTime":152902.0,"Column":3}]},{"RandomW":2089660876,"RandomX":201209655,"RandomY":1171726387,"RandomZ":191699429,"StartTime":153168.0,"Objects":[{"StartTime":153168.0,"EndTime":153698.0,"Column":5}]},{"RandomW":2251323109,"RandomX":1171726387,"RandomY":191699429,"RandomZ":2089660876,"StartTime":153964.0,"Objects":[{"StartTime":153964.0,"EndTime":153964.0,"Column":3}]},{"RandomW":147408153,"RandomX":2251323109,"RandomY":2048526504,"RandomZ":433820735,"StartTime":154230.0,"Objects":[{"StartTime":154230.0,"EndTime":154230.0,"Column":0},{"StartTime":154230.0,"EndTime":154230.0,"Column":5}]},{"RandomW":223059387,"RandomX":2048526504,"RandomY":433820735,"RandomZ":147408153,"StartTime":154495.0,"Objects":[{"StartTime":154495.0,"EndTime":154495.0,"Column":3}]},{"RandomW":1644267862,"RandomX":147408153,"RandomY":223059387,"RandomZ":2814282738,"StartTime":154761.0,"Objects":[{"StartTime":154761.0,"EndTime":155026.0,"Column":4}]},{"RandomW":585628331,"RandomX":1644267862,"RandomY":547547522,"RandomZ":1901399656,"StartTime":155292.0,"Objects":[{"StartTime":155292.0,"EndTime":155292.0,"Column":0},{"StartTime":155292.0,"EndTime":155292.0,"Column":5}]},{"RandomW":1287818392,"RandomX":547547522,"RandomY":1901399656,"RandomZ":585628331,"StartTime":155557.0,"Objects":[{"StartTime":155557.0,"EndTime":155557.0,"Column":1}]},{"RandomW":3879046214,"RandomX":2065404539,"RandomY":2732913982,"RandomZ":3217781099,"StartTime":155823.0,"Objects":[{"StartTime":155823.0,"EndTime":156088.0,"Column":2},{"StartTime":155823.0,"EndTime":156088.0,"Column":4}]},{"RandomW":3318878889,"RandomX":3217781099,"RandomY":3879046214,"RandomZ":1075466897,"StartTime":156354.0,"Objects":[{"StartTime":156354.0,"EndTime":156619.0,"Column":3}]},{"RandomW":1785367685,"RandomX":1075466897,"RandomY":3318878889,"RandomZ":561406801,"StartTime":156885.0,"Objects":[{"StartTime":156885.0,"EndTime":157415.0,"Column":4}]},{"RandomW":2909067134,"RandomX":561406801,"RandomY":1785367685,"RandomZ":4168537475,"StartTime":157947.0,"Objects":[{"StartTime":157947.0,"EndTime":157947.0,"Column":5},{"StartTime":157947.0,"EndTime":157947.0,"Column":2}]},{"RandomW":1067074920,"RandomX":1785367685,"RandomY":4168537475,"RandomZ":2909067134,"StartTime":158212.0,"Objects":[{"StartTime":158212.0,"EndTime":158212.0,"Column":4}]},{"RandomW":27977914,"RandomX":4168537475,"RandomY":2909067134,"RandomZ":1067074920,"StartTime":158478.0,"Objects":[{"StartTime":158478.0,"EndTime":158478.0,"Column":5},{"StartTime":158478.0,"EndTime":158478.0,"Column":0}]},{"RandomW":1329528769,"RandomX":2909067134,"RandomY":1067074920,"RandomZ":27977914,"StartTime":158743.0,"Objects":[{"StartTime":158743.0,"EndTime":158743.0,"Column":4}]},{"RandomW":3295284863,"RandomX":1067074920,"RandomY":27977914,"RandomZ":1329528769,"StartTime":159009.0,"Objects":[{"StartTime":159009.0,"EndTime":159009.0,"Column":5}]},{"RandomW":691446431,"RandomX":27977914,"RandomY":1329528769,"RandomZ":3295284863,"StartTime":159540.0,"Objects":[{"StartTime":159540.0,"EndTime":159540.0,"Column":3},{"StartTime":159540.0,"EndTime":159540.0,"Column":4}]},{"RandomW":3354872060,"RandomX":3295284863,"RandomY":691446431,"RandomZ":2140106811,"StartTime":159805.0,"Objects":[{"StartTime":159805.0,"EndTime":159805.0,"Column":2},{"StartTime":159805.0,"EndTime":159805.0,"Column":3}]},{"RandomW":1400553355,"RandomX":691446431,"RandomY":2140106811,"RandomZ":3354872060,"StartTime":160071.0,"Objects":[{"StartTime":160071.0,"EndTime":160071.0,"Column":2}]},{"RandomW":1400553355,"RandomX":691446431,"RandomY":2140106811,"RandomZ":3354872060,"StartTime":160601.0,"Objects":[{"StartTime":160601.0,"EndTime":160601.0,"Column":3}]},{"RandomW":3485781281,"RandomX":2140106811,"RandomY":3354872060,"RandomZ":1400553355,"StartTime":160867.0,"Objects":[{"StartTime":160867.0,"EndTime":160867.0,"Column":3}]},{"RandomW":3053679463,"RandomX":1400553355,"RandomY":3485781281,"RandomZ":3419304522,"StartTime":161132.0,"Objects":[{"StartTime":161132.0,"EndTime":161397.0,"Column":2}]},{"RandomW":3645336111,"RandomX":3419304522,"RandomY":3053679463,"RandomZ":805504203,"StartTime":161663.0,"Objects":[{"StartTime":161663.0,"EndTime":162193.0,"Column":4}]},{"RandomW":1638076271,"RandomX":3053679463,"RandomY":805504203,"RandomZ":3645336111,"StartTime":162460.0,"Objects":[{"StartTime":162460.0,"EndTime":162460.0,"Column":3}]},{"RandomW":107981020,"RandomX":1638076271,"RandomY":3432435831,"RandomZ":3835408498,"StartTime":162725.0,"Objects":[{"StartTime":162725.0,"EndTime":162725.0,"Column":0},{"StartTime":162725.0,"EndTime":162725.0,"Column":5}]},{"RandomW":94467567,"RandomX":3835408498,"RandomY":107981020,"RandomZ":2144208649,"StartTime":163256.0,"Objects":[{"StartTime":163256.0,"EndTime":163256.0,"Column":4},{"StartTime":163256.0,"EndTime":163256.0,"Column":0}]},{"RandomW":1015041289,"RandomX":107981020,"RandomY":2144208649,"RandomZ":94467567,"StartTime":163522.0,"Objects":[{"StartTime":163522.0,"EndTime":163522.0,"Column":3}]},{"RandomW":2029876639,"RandomX":1204955917,"RandomY":1210817201,"RandomZ":1177260118,"StartTime":163787.0,"Objects":[{"StartTime":163787.0,"EndTime":164052.0,"Column":5}]},{"RandomW":3125496505,"RandomX":1177260118,"RandomY":2029876639,"RandomZ":2929832910,"StartTime":164318.0,"Objects":[{"StartTime":164318.0,"EndTime":164583.0,"Column":2}]},{"RandomW":2426857185,"RandomX":3125496505,"RandomY":2700661894,"RandomZ":859446411,"StartTime":164849.0,"Objects":[{"StartTime":164849.0,"EndTime":165114.0,"Column":0}]},{"RandomW":4116661924,"RandomX":2426857185,"RandomY":1884842190,"RandomZ":375578279,"StartTime":165380.0,"Objects":[{"StartTime":165380.0,"EndTime":165910.0,"Column":1},{"StartTime":165380.0,"EndTime":165910.0,"Column":5}]},{"RandomW":3787729819,"RandomX":375578279,"RandomY":4116661924,"RandomZ":1382622976,"StartTime":166442.0,"Objects":[{"StartTime":166442.0,"EndTime":166972.0,"Column":4}]},{"RandomW":3780331234,"RandomX":4116661924,"RandomY":1382622976,"RandomZ":3787729819,"StartTime":167239.0,"Objects":[{"StartTime":167239.0,"EndTime":167239.0,"Column":3}]},{"RandomW":891570220,"RandomX":3780331234,"RandomY":3996538378,"RandomZ":4118560235,"StartTime":167504.0,"Objects":[{"StartTime":167504.0,"EndTime":168034.0,"Column":5},{"StartTime":167504.0,"EndTime":168034.0,"Column":2}]},{"RandomW":1312521276,"RandomX":3996538378,"RandomY":4118560235,"RandomZ":891570220,"StartTime":168301.0,"Objects":[{"StartTime":168301.0,"EndTime":168301.0,"Column":0}]},{"RandomW":316798455,"RandomX":4118560235,"RandomY":891570220,"RandomZ":1312521276,"StartTime":168566.0,"Objects":[{"StartTime":168566.0,"EndTime":168566.0,"Column":2},{"StartTime":168566.0,"EndTime":168566.0,"Column":3}]},{"RandomW":107348261,"RandomX":891570220,"RandomY":1312521276,"RandomZ":316798455,"StartTime":168832.0,"Objects":[{"StartTime":168832.0,"EndTime":168832.0,"Column":1}]},{"RandomW":286543085,"RandomX":1312521276,"RandomY":316798455,"RandomZ":107348261,"StartTime":169097.0,"Objects":[{"StartTime":169097.0,"EndTime":169097.0,"Column":1},{"StartTime":169097.0,"EndTime":169097.0,"Column":2}]},{"RandomW":2220558447,"RandomX":316798455,"RandomY":107348261,"RandomZ":286543085,"StartTime":169363.0,"Objects":[{"StartTime":169363.0,"EndTime":169363.0,"Column":2}]},{"RandomW":2567445342,"RandomX":107348261,"RandomY":286543085,"RandomZ":2220558447,"StartTime":169628.0,"Objects":[{"StartTime":169628.0,"EndTime":169628.0,"Column":1},{"StartTime":169628.0,"EndTime":169628.0,"Column":2}]},{"RandomW":2941341299,"RandomX":286543085,"RandomY":2220558447,"RandomZ":2567445342,"StartTime":170159.0,"Objects":[{"StartTime":170159.0,"EndTime":170159.0,"Column":3},{"StartTime":170159.0,"EndTime":170159.0,"Column":4}]},{"RandomW":2941341299,"RandomX":286543085,"RandomY":2220558447,"RandomZ":2567445342,"StartTime":170424.0,"Objects":[{"StartTime":170424.0,"EndTime":170424.0,"Column":2},{"StartTime":170424.0,"EndTime":170424.0,"Column":1}]},{"RandomW":1087727581,"RandomX":2567445342,"RandomY":2941341299,"RandomZ":479267920,"StartTime":170690.0,"Objects":[{"StartTime":170690.0,"EndTime":171220.0,"Column":3}]},{"RandomW":2581485170,"RandomX":2941341299,"RandomY":479267920,"RandomZ":1087727581,"StartTime":171486.0,"Objects":[{"StartTime":171486.0,"EndTime":171486.0,"Column":5}]},{"RandomW":683596203,"RandomX":1087727581,"RandomY":2581485170,"RandomZ":3168383468,"StartTime":171752.0,"Objects":[{"StartTime":171752.0,"EndTime":172282.0,"Column":1}]},{"RandomW":3284056302,"RandomX":2581485170,"RandomY":3168383468,"RandomZ":683596203,"StartTime":172548.0,"Objects":[{"StartTime":172548.0,"EndTime":172548.0,"Column":2}]},{"RandomW":2830633773,"RandomX":3168383468,"RandomY":683596203,"RandomZ":3284056302,"StartTime":172814.0,"Objects":[{"StartTime":172814.0,"EndTime":172814.0,"Column":3},{"StartTime":172814.0,"EndTime":172814.0,"Column":4}]},{"RandomW":3651115271,"RandomX":683596203,"RandomY":3284056302,"RandomZ":2830633773,"StartTime":173079.0,"Objects":[{"StartTime":173079.0,"EndTime":173079.0,"Column":3}]},{"RandomW":120746014,"RandomX":3284056302,"RandomY":2830633773,"RandomZ":3651115271,"StartTime":173345.0,"Objects":[{"StartTime":173345.0,"EndTime":173345.0,"Column":3},{"StartTime":173345.0,"EndTime":173345.0,"Column":4}]},{"RandomW":830325214,"RandomX":2830633773,"RandomY":3651115271,"RandomZ":120746014,"StartTime":173610.0,"Objects":[{"StartTime":173610.0,"EndTime":173610.0,"Column":4}]},{"RandomW":1509180863,"RandomX":3651115271,"RandomY":120746014,"RandomZ":830325214,"StartTime":173876.0,"Objects":[{"StartTime":173876.0,"EndTime":173876.0,"Column":3},{"StartTime":173876.0,"EndTime":173876.0,"Column":4}]},{"RandomW":2233493011,"RandomX":3902833961,"RandomY":923589330,"RandomZ":3425613873,"StartTime":174407.0,"Objects":[{"StartTime":174407.0,"EndTime":174672.0,"Column":2},{"StartTime":174407.0,"EndTime":174672.0,"Column":0}]},{"RandomW":2517643905,"RandomX":1207989122,"RandomY":993303558,"RandomZ":3011821377,"StartTime":174938.0,"Objects":[{"StartTime":174938.0,"EndTime":175468.0,"Column":3},{"StartTime":174938.0,"EndTime":175468.0,"Column":1}]},{"RandomW":3720863650,"RandomX":993303558,"RandomY":3011821377,"RandomZ":2517643905,"StartTime":175734.0,"Objects":[{"StartTime":175734.0,"EndTime":175734.0,"Column":2}]},{"RandomW":3563355415,"RandomX":2517643905,"RandomY":3720863650,"RandomZ":1116519600,"StartTime":176000.0,"Objects":[{"StartTime":176000.0,"EndTime":176530.0,"Column":3}]},{"RandomW":3287800096,"RandomX":3720863650,"RandomY":1116519600,"RandomZ":3563355415,"StartTime":176796.0,"Objects":[{"StartTime":176796.0,"EndTime":176796.0,"Column":3}]},{"RandomW":539898931,"RandomX":1116519600,"RandomY":3563355415,"RandomZ":3287800096,"StartTime":177062.0,"Objects":[{"StartTime":177062.0,"EndTime":177062.0,"Column":2},{"StartTime":177062.0,"EndTime":177062.0,"Column":3}]},{"RandomW":123758010,"RandomX":3563355415,"RandomY":3287800096,"RandomZ":539898931,"StartTime":177327.0,"Objects":[{"StartTime":177327.0,"EndTime":177327.0,"Column":4}]},{"RandomW":4028312708,"RandomX":3287800096,"RandomY":539898931,"RandomZ":123758010,"StartTime":177593.0,"Objects":[{"StartTime":177593.0,"EndTime":177593.0,"Column":2},{"StartTime":177593.0,"EndTime":177593.0,"Column":3}]},{"RandomW":2371409278,"RandomX":539898931,"RandomY":123758010,"RandomZ":4028312708,"StartTime":177858.0,"Objects":[{"StartTime":177858.0,"EndTime":177858.0,"Column":3}]},{"RandomW":3699828554,"RandomX":123758010,"RandomY":4028312708,"RandomZ":2371409278,"StartTime":178124.0,"Objects":[{"StartTime":178124.0,"EndTime":178124.0,"Column":2},{"StartTime":178124.0,"EndTime":178124.0,"Column":3}]},{"RandomW":4053363780,"RandomX":2371409278,"RandomY":3699828554,"RandomZ":3637445845,"StartTime":178655.0,"Objects":[{"StartTime":178655.0,"EndTime":178920.0,"Column":5}]},{"RandomW":1366734997,"RandomX":3637445845,"RandomY":4053363780,"RandomZ":3122766892,"StartTime":179186.0,"Objects":[{"StartTime":179186.0,"EndTime":179716.0,"Column":3}]},{"RandomW":2085192570,"RandomX":1366734997,"RandomY":4047501250,"RandomZ":3422445293,"StartTime":179982.0,"Objects":[{"StartTime":179982.0,"EndTime":179982.0,"Column":3},{"StartTime":179982.0,"EndTime":179982.0,"Column":5}]},{"RandomW":2526042960,"RandomX":3422445293,"RandomY":2085192570,"RandomZ":2552180342,"StartTime":180247.0,"Objects":[{"StartTime":180247.0,"EndTime":180777.0,"Column":1}]},{"RandomW":2946528857,"RandomX":2085192570,"RandomY":2552180342,"RandomZ":2526042960,"StartTime":181044.0,"Objects":[{"StartTime":181044.0,"EndTime":181044.0,"Column":2}]},{"RandomW":4275012500,"RandomX":2526042960,"RandomY":2946528857,"RandomZ":2680316548,"StartTime":181309.0,"Objects":[{"StartTime":181309.0,"EndTime":181574.0,"Column":5}]},{"RandomW":716767862,"RandomX":1177533555,"RandomY":3396673648,"RandomZ":1210370441,"StartTime":181840.0,"Objects":[{"StartTime":181840.0,"EndTime":182105.0,"Column":3},{"StartTime":181840.0,"EndTime":182105.0,"Column":2}]},{"RandomW":1918581647,"RandomX":1210370441,"RandomY":716767862,"RandomZ":290385782,"StartTime":182371.0,"Objects":[{"StartTime":182371.0,"EndTime":182636.0,"Column":5}]},{"RandomW":2554770024,"RandomX":1918581647,"RandomY":475913420,"RandomZ":4262840195,"StartTime":182902.0,"Objects":[{"StartTime":182902.0,"EndTime":183432.0,"Column":1}]},{"RandomW":862610860,"RandomX":475913420,"RandomY":4262840195,"RandomZ":2554770024,"StartTime":183699.0,"Objects":[{"StartTime":183699.0,"EndTime":185557.0,"Column":2}]},{"RandomW":3240322225,"RandomX":4262840195,"RandomY":2554770024,"RandomZ":862610860,"StartTime":202017.0,"Objects":[{"StartTime":202017.0,"EndTime":202017.0,"Column":0}]},{"RandomW":2438630089,"RandomX":2554770024,"RandomY":862610860,"RandomZ":3240322225,"StartTime":202283.0,"Objects":[{"StartTime":202283.0,"EndTime":202283.0,"Column":1}]},{"RandomW":1543895637,"RandomX":3240322225,"RandomY":2438630089,"RandomZ":1008910200,"StartTime":202548.0,"Objects":[{"StartTime":202548.0,"EndTime":203078.0,"Column":4}]},{"RandomW":2262375304,"RandomX":2438630089,"RandomY":1008910200,"RandomZ":1543895637,"StartTime":203345.0,"Objects":[{"StartTime":203345.0,"EndTime":203345.0,"Column":2}]},{"RandomW":3932191533,"RandomX":1543895637,"RandomY":2262375304,"RandomZ":3281044824,"StartTime":203610.0,"Objects":[{"StartTime":203610.0,"EndTime":203875.0,"Column":4}]},{"RandomW":2456816417,"RandomX":3932191533,"RandomY":2579817318,"RandomZ":3616517773,"StartTime":204141.0,"Objects":[{"StartTime":204141.0,"EndTime":204406.0,"Column":0}]},{"RandomW":1863357795,"RandomX":2456816417,"RandomY":2065740625,"RandomZ":3309416576,"StartTime":204672.0,"Objects":[{"StartTime":204672.0,"EndTime":205202.0,"Column":3},{"StartTime":204672.0,"EndTime":205202.0,"Column":5}]},{"RandomW":66010220,"RandomX":3309416576,"RandomY":1863357795,"RandomZ":2100015779,"StartTime":205469.0,"Objects":[{"StartTime":205469.0,"EndTime":205469.0,"Column":4},{"StartTime":205469.0,"EndTime":205469.0,"Column":0}]},{"RandomW":548562611,"RandomX":2100015779,"RandomY":66010220,"RandomZ":3420604705,"StartTime":205734.0,"Objects":[{"StartTime":205734.0,"EndTime":205999.0,"Column":1}]},{"RandomW":2052728473,"RandomX":3420604705,"RandomY":548562611,"RandomZ":2913964,"StartTime":206265.0,"Objects":[{"StartTime":206265.0,"EndTime":206530.0,"Column":5}]},{"RandomW":1944462115,"RandomX":2052728473,"RandomY":2737357746,"RandomZ":270315162,"StartTime":206796.0,"Objects":[{"StartTime":206796.0,"EndTime":206796.0,"Column":2},{"StartTime":206796.0,"EndTime":206796.0,"Column":3}]},{"RandomW":3626216744,"RandomX":2737357746,"RandomY":270315162,"RandomZ":1944462115,"StartTime":207062.0,"Objects":[{"StartTime":207062.0,"EndTime":207062.0,"Column":5}]},{"RandomW":1039388877,"RandomX":270315162,"RandomY":1944462115,"RandomZ":3626216744,"StartTime":207327.0,"Objects":[{"StartTime":207327.0,"EndTime":207327.0,"Column":4}]},{"RandomW":3362701719,"RandomX":1944462115,"RandomY":3626216744,"RandomZ":1039388877,"StartTime":207593.0,"Objects":[{"StartTime":207593.0,"EndTime":207593.0,"Column":3}]},{"RandomW":3968495235,"RandomX":3362701719,"RandomY":2329091202,"RandomZ":1331472925,"StartTime":207858.0,"Objects":[{"StartTime":207858.0,"EndTime":208388.0,"Column":5}]},{"RandomW":1381394684,"RandomX":2329091202,"RandomY":1331472925,"RandomZ":3968495235,"StartTime":208655.0,"Objects":[{"StartTime":208655.0,"EndTime":208655.0,"Column":5}]},{"RandomW":1435798214,"RandomX":1381394684,"RandomY":1081301304,"RandomZ":3939835753,"StartTime":208920.0,"Objects":[{"StartTime":208920.0,"EndTime":209450.0,"Column":4}]},{"RandomW":3026458880,"RandomX":1081301304,"RandomY":3939835753,"RandomZ":1435798214,"StartTime":209717.0,"Objects":[{"StartTime":209717.0,"EndTime":209717.0,"Column":5}]},{"RandomW":3713738018,"RandomX":3026458880,"RandomY":1845767213,"RandomZ":745035987,"StartTime":209982.0,"Objects":[{"StartTime":209982.0,"EndTime":210512.0,"Column":2},{"StartTime":209982.0,"EndTime":210512.0,"Column":4}]},{"RandomW":1231260560,"RandomX":1845767213,"RandomY":745035987,"RandomZ":3713738018,"StartTime":210778.0,"Objects":[{"StartTime":210778.0,"EndTime":210778.0,"Column":4}]},{"RandomW":105489365,"RandomX":745035987,"RandomY":3713738018,"RandomZ":1231260560,"StartTime":211044.0,"Objects":[{"StartTime":211044.0,"EndTime":211044.0,"Column":4}]},{"RandomW":1753861391,"RandomX":3713738018,"RandomY":1231260560,"RandomZ":105489365,"StartTime":211309.0,"Objects":[{"StartTime":211309.0,"EndTime":211309.0,"Column":2}]},{"RandomW":966114829,"RandomX":105489365,"RandomY":1753861391,"RandomZ":1828685577,"StartTime":211575.0,"Objects":[{"StartTime":211575.0,"EndTime":211575.0,"Column":3},{"StartTime":211575.0,"EndTime":211575.0,"Column":2}]},{"RandomW":1431749195,"RandomX":1836275468,"RandomY":1290011463,"RandomZ":1159621643,"StartTime":211840.0,"Objects":[{"StartTime":211840.0,"EndTime":212370.0,"Column":5},{"StartTime":211840.0,"EndTime":212370.0,"Column":4}]},{"RandomW":3472418283,"RandomX":1159621643,"RandomY":1431749195,"RandomZ":2724869338,"StartTime":212637.0,"Objects":[{"StartTime":212637.0,"EndTime":212902.0,"Column":3}]},{"RandomW":1755864208,"RandomX":3472418283,"RandomY":2016458251,"RandomZ":2610391004,"StartTime":213168.0,"Objects":[{"StartTime":213168.0,"EndTime":213698.0,"Column":1},{"StartTime":213168.0,"EndTime":213698.0,"Column":4}]},{"RandomW":1635138515,"RandomX":2016458251,"RandomY":2610391004,"RandomZ":1755864208,"StartTime":213964.0,"Objects":[{"StartTime":213964.0,"EndTime":213964.0,"Column":3}]},{"RandomW":3162662082,"RandomX":1755864208,"RandomY":1635138515,"RandomZ":2617989400,"StartTime":214230.0,"Objects":[{"StartTime":214230.0,"EndTime":214495.0,"Column":2}]},{"RandomW":1184692914,"RandomX":2617989400,"RandomY":3162662082,"RandomZ":2531582750,"StartTime":214761.0,"Objects":[{"StartTime":214761.0,"EndTime":215026.0,"Column":3}]},{"RandomW":798124101,"RandomX":2531582750,"RandomY":1184692914,"RandomZ":2157553888,"StartTime":215292.0,"Objects":[{"StartTime":215292.0,"EndTime":215557.0,"Column":2}]},{"RandomW":1923400471,"RandomX":798124101,"RandomY":2665448122,"RandomZ":1060614841,"StartTime":215823.0,"Objects":[{"StartTime":215823.0,"EndTime":216088.0,"Column":5}]},{"RandomW":775950648,"RandomX":1923400471,"RandomY":3469237574,"RandomZ":2892029047,"StartTime":216354.0,"Objects":[{"StartTime":216354.0,"EndTime":216354.0,"Column":1},{"StartTime":216354.0,"EndTime":216354.0,"Column":4}]},{"RandomW":1321234603,"RandomX":4127626210,"RandomY":1546611249,"RandomZ":1925740893,"StartTime":216885.0,"Objects":[{"StartTime":216885.0,"EndTime":217150.0,"Column":5},{"StartTime":216885.0,"EndTime":217150.0,"Column":3}]},{"RandomW":2881678930,"RandomX":1925740893,"RandomY":1321234603,"RandomZ":2358993682,"StartTime":217416.0,"Objects":[{"StartTime":217416.0,"EndTime":217946.0,"Column":2}]},{"RandomW":2599512294,"RandomX":1321234603,"RandomY":2358993682,"RandomZ":2881678930,"StartTime":218212.0,"Objects":[{"StartTime":218212.0,"EndTime":218212.0,"Column":1}]},{"RandomW":2150464549,"RandomX":2881678930,"RandomY":2599512294,"RandomZ":3623425595,"StartTime":218478.0,"Objects":[{"StartTime":218478.0,"EndTime":219008.0,"Column":0}]},{"RandomW":763775798,"RandomX":3623425595,"RandomY":2150464549,"RandomZ":1008837132,"StartTime":219274.0,"Objects":[{"StartTime":219274.0,"EndTime":221132.0,"Column":2}]},{"RandomW":3656799832,"RandomX":1008837132,"RandomY":763775798,"RandomZ":852609139,"StartTime":221663.0,"Objects":[{"StartTime":221663.0,"EndTime":222193.0,"Column":4}]},{"RandomW":4147545979,"RandomX":852609139,"RandomY":3656799832,"RandomZ":3908484776,"StartTime":222460.0,"Objects":[{"StartTime":222460.0,"EndTime":222460.0,"Column":2},{"StartTime":222460.0,"EndTime":222460.0,"Column":5}]},{"RandomW":540508179,"RandomX":3908484776,"RandomY":4147545979,"RandomZ":1259887550,"StartTime":222725.0,"Objects":[{"StartTime":222725.0,"EndTime":223255.0,"Column":1}]},{"RandomW":1042752714,"RandomX":1259887550,"RandomY":540508179,"RandomZ":2104064323,"StartTime":223522.0,"Objects":[{"StartTime":223522.0,"EndTime":223522.0,"Column":5},{"StartTime":223522.0,"EndTime":223522.0,"Column":2}]},{"RandomW":3077262619,"RandomX":540508179,"RandomY":2104064323,"RandomZ":1042752714,"StartTime":223787.0,"Objects":[{"StartTime":223787.0,"EndTime":223787.0,"Column":3},{"StartTime":223787.0,"EndTime":223787.0,"Column":4}]},{"RandomW":734033149,"RandomX":2104064323,"RandomY":1042752714,"RandomZ":3077262619,"StartTime":224053.0,"Objects":[{"StartTime":224053.0,"EndTime":224053.0,"Column":4}]},{"RandomW":492155815,"RandomX":1042752714,"RandomY":3077262619,"RandomZ":734033149,"StartTime":224318.0,"Objects":[{"StartTime":224318.0,"EndTime":224318.0,"Column":4},{"StartTime":224318.0,"EndTime":224318.0,"Column":5}]},{"RandomW":441697715,"RandomX":3077262619,"RandomY":734033149,"RandomZ":492155815,"StartTime":224584.0,"Objects":[{"StartTime":224584.0,"EndTime":224584.0,"Column":3}]},{"RandomW":4156379255,"RandomX":734033149,"RandomY":492155815,"RandomZ":441697715,"StartTime":224849.0,"Objects":[{"StartTime":224849.0,"EndTime":224849.0,"Column":4},{"StartTime":224849.0,"EndTime":224849.0,"Column":5}]},{"RandomW":3757225441,"RandomX":492155815,"RandomY":441697715,"RandomZ":4156379255,"StartTime":225380.0,"Objects":[{"StartTime":225380.0,"EndTime":225380.0,"Column":2},{"StartTime":225380.0,"EndTime":225380.0,"Column":3}]},{"RandomW":3757225441,"RandomX":492155815,"RandomY":441697715,"RandomZ":4156379255,"StartTime":225646.0,"Objects":[{"StartTime":225646.0,"EndTime":225646.0,"Column":3},{"StartTime":225646.0,"EndTime":225646.0,"Column":2}]},{"RandomW":2225043333,"RandomX":3950035756,"RandomY":4132636893,"RandomZ":3158636107,"StartTime":225911.0,"Objects":[{"StartTime":225911.0,"EndTime":226441.0,"Column":5},{"StartTime":225911.0,"EndTime":226441.0,"Column":0}]},{"RandomW":479006094,"RandomX":2225043333,"RandomY":3919293849,"RandomZ":2279622039,"StartTime":226708.0,"Objects":[{"StartTime":226708.0,"EndTime":226708.0,"Column":0},{"StartTime":226708.0,"EndTime":226708.0,"Column":1}]},{"RandomW":3529234379,"RandomX":479006094,"RandomY":1674670789,"RandomZ":1460857923,"StartTime":226973.0,"Objects":[{"StartTime":226973.0,"EndTime":227503.0,"Column":4},{"StartTime":226973.0,"EndTime":227503.0,"Column":3}]},{"RandomW":2798539123,"RandomX":1674670789,"RandomY":1460857923,"RandomZ":3529234379,"StartTime":227770.0,"Objects":[{"StartTime":227770.0,"EndTime":227770.0,"Column":3}]},{"RandomW":1315002421,"RandomX":1460857923,"RandomY":3529234379,"RandomZ":2798539123,"StartTime":228035.0,"Objects":[{"StartTime":228035.0,"EndTime":228035.0,"Column":2},{"StartTime":228035.0,"EndTime":228035.0,"Column":3}]},{"RandomW":2396116302,"RandomX":3529234379,"RandomY":2798539123,"RandomZ":1315002421,"StartTime":228301.0,"Objects":[{"StartTime":228301.0,"EndTime":228301.0,"Column":1}]},{"RandomW":2184752848,"RandomX":2798539123,"RandomY":1315002421,"RandomZ":2396116302,"StartTime":228566.0,"Objects":[{"StartTime":228566.0,"EndTime":228566.0,"Column":2},{"StartTime":228566.0,"EndTime":228566.0,"Column":3}]},{"RandomW":1453929005,"RandomX":1315002421,"RandomY":2396116302,"RandomZ":2184752848,"StartTime":228832.0,"Objects":[{"StartTime":228832.0,"EndTime":228832.0,"Column":1}]},{"RandomW":307062845,"RandomX":2396116302,"RandomY":2184752848,"RandomZ":1453929005,"StartTime":229097.0,"Objects":[{"StartTime":229097.0,"EndTime":229097.0,"Column":2},{"StartTime":229097.0,"EndTime":229097.0,"Column":3}]},{"RandomW":2488853431,"RandomX":1430246951,"RandomY":1243135735,"RandomZ":862796553,"StartTime":229628.0,"Objects":[{"StartTime":229628.0,"EndTime":229893.0,"Column":0}]},{"RandomW":2954723307,"RandomX":862796553,"RandomY":2488853431,"RandomZ":1065193973,"StartTime":230159.0,"Objects":[{"StartTime":230159.0,"EndTime":230689.0,"Column":2}]},{"RandomW":3118771232,"RandomX":1065193973,"RandomY":2954723307,"RandomZ":3941773202,"StartTime":230955.0,"Objects":[{"StartTime":230955.0,"EndTime":230955.0,"Column":3},{"StartTime":230955.0,"EndTime":230955.0,"Column":2}]},{"RandomW":1630107201,"RandomX":3532926875,"RandomY":2476115689,"RandomZ":1207743047,"StartTime":231221.0,"Objects":[{"StartTime":231221.0,"EndTime":231751.0,"Column":0},{"StartTime":231221.0,"EndTime":231751.0,"Column":4}]},{"RandomW":313681160,"RandomX":2476115689,"RandomY":1207743047,"RandomZ":1630107201,"StartTime":232017.0,"Objects":[{"StartTime":232017.0,"EndTime":232017.0,"Column":2}]},{"RandomW":892602489,"RandomX":1207743047,"RandomY":1630107201,"RandomZ":313681160,"StartTime":232283.0,"Objects":[{"StartTime":232283.0,"EndTime":232283.0,"Column":3},{"StartTime":232283.0,"EndTime":232283.0,"Column":4}]},{"RandomW":2549672466,"RandomX":1630107201,"RandomY":313681160,"RandomZ":892602489,"StartTime":232548.0,"Objects":[{"StartTime":232548.0,"EndTime":232548.0,"Column":1}]},{"RandomW":3175685586,"RandomX":313681160,"RandomY":892602489,"RandomZ":2549672466,"StartTime":232814.0,"Objects":[{"StartTime":232814.0,"EndTime":232814.0,"Column":3},{"StartTime":232814.0,"EndTime":232814.0,"Column":4}]},{"RandomW":1012053334,"RandomX":892602489,"RandomY":2549672466,"RandomZ":3175685586,"StartTime":233079.0,"Objects":[{"StartTime":233079.0,"EndTime":233079.0,"Column":2}]},{"RandomW":2846885221,"RandomX":2549672466,"RandomY":3175685586,"RandomZ":1012053334,"StartTime":233345.0,"Objects":[{"StartTime":233345.0,"EndTime":233345.0,"Column":3},{"StartTime":233345.0,"EndTime":233345.0,"Column":4}]},{"RandomW":2773158813,"RandomX":2846885221,"RandomY":4182295099,"RandomZ":203093837,"StartTime":233876.0,"Objects":[{"StartTime":233876.0,"EndTime":234141.0,"Column":0},{"StartTime":233876.0,"EndTime":234141.0,"Column":1}]},{"RandomW":857734082,"RandomX":203093837,"RandomY":2773158813,"RandomZ":2365172092,"StartTime":234407.0,"Objects":[{"StartTime":234407.0,"EndTime":234937.0,"Column":2}]},{"RandomW":3898917491,"RandomX":2773158813,"RandomY":2365172092,"RandomZ":857734082,"StartTime":235203.0,"Objects":[{"StartTime":235203.0,"EndTime":235203.0,"Column":2}]},{"RandomW":1417532037,"RandomX":857734082,"RandomY":3898917491,"RandomZ":361638657,"StartTime":235469.0,"Objects":[{"StartTime":235469.0,"EndTime":235999.0,"Column":3}]},{"RandomW":2557538851,"RandomX":3898917491,"RandomY":361638657,"RandomZ":1417532037,"StartTime":236265.0,"Objects":[{"StartTime":236265.0,"EndTime":236265.0,"Column":3}]},{"RandomW":846935039,"RandomX":1417532037,"RandomY":2557538851,"RandomZ":1456065540,"StartTime":236531.0,"Objects":[{"StartTime":236531.0,"EndTime":236796.0,"Column":2}]},{"RandomW":2547399683,"RandomX":1456065540,"RandomY":846935039,"RandomZ":2284332751,"StartTime":237062.0,"Objects":[{"StartTime":237062.0,"EndTime":237327.0,"Column":1}]},{"RandomW":2405919505,"RandomX":846935039,"RandomY":2284332751,"RandomZ":2547399683,"StartTime":237593.0,"Objects":[{"StartTime":237593.0,"EndTime":237593.0,"Column":3},{"StartTime":237593.0,"EndTime":237593.0,"Column":4}]},{"RandomW":1684559305,"RandomX":2284332751,"RandomY":2547399683,"RandomZ":2405919505,"StartTime":237858.0,"Objects":[{"StartTime":237858.0,"EndTime":237858.0,"Column":5},{"StartTime":237858.0,"EndTime":237858.0,"Column":0}]},{"RandomW":2914982357,"RandomX":2547399683,"RandomY":2405919505,"RandomZ":1684559305,"StartTime":238124.0,"Objects":[{"StartTime":238124.0,"EndTime":238124.0,"Column":3},{"StartTime":238124.0,"EndTime":238124.0,"Column":4}]},{"RandomW":2343509573,"RandomX":2405919505,"RandomY":1684559305,"RandomZ":2914982357,"StartTime":238389.0,"Objects":[{"StartTime":238389.0,"EndTime":238389.0,"Column":5}]},{"RandomW":1059378114,"RandomX":1684559305,"RandomY":2914982357,"RandomZ":2343509573,"StartTime":238655.0,"Objects":[{"StartTime":238655.0,"EndTime":240778.0,"Column":2}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544-expected-conversion.json
index 2289a7243f..ed4b550f01 100644
--- a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/20544-expected-conversion.json
@@ -1 +1 @@
-{"Mappings":[{"RandomW":273523780,"RandomX":842502087,"RandomY":3579807591,"RandomZ":273326509,"StartTime":7693.0,"Objects":[{"StartTime":7693.0,"EndTime":7693.0,"Column":0}]},{"RandomW":2659866685,"RandomX":3579807591,"RandomY":273326509,"RandomZ":273523780,"StartTime":8043.0,"Objects":[{"StartTime":8043.0,"EndTime":8043.0,"Column":1}]},{"RandomW":3083309108,"RandomX":273326509,"RandomY":273523780,"RandomZ":2659866685,"StartTime":8393.0,"Objects":[{"StartTime":8393.0,"EndTime":8393.0,"Column":2}]},{"RandomW":2413296944,"RandomX":2659866685,"RandomY":3083309108,"RandomZ":4072999080,"StartTime":8626.0,"Objects":[{"StartTime":8626.0,"EndTime":8626.0,"Column":2},{"StartTime":8626.0,"EndTime":8626.0,"Column":0}]},{"RandomW":1129322311,"RandomX":3083309108,"RandomY":4072999080,"RandomZ":2413296944,"StartTime":8860.0,"Objects":[{"StartTime":8860.0,"EndTime":8860.0,"Column":2}]},{"RandomW":3365759273,"RandomX":4072999080,"RandomY":2413296944,"RandomZ":1129322311,"StartTime":9326.0,"Objects":[{"StartTime":9326.0,"EndTime":9326.0,"Column":3}]},{"RandomW":315078874,"RandomX":2413296944,"RandomY":1129322311,"RandomZ":3365759273,"StartTime":9560.0,"Objects":[{"StartTime":9560.0,"EndTime":9560.0,"Column":3}]},{"RandomW":583662031,"RandomX":1129322311,"RandomY":3365759273,"RandomZ":315078874,"StartTime":9793.0,"Objects":[{"StartTime":9793.0,"EndTime":9793.0,"Column":3}]},{"RandomW":3789568254,"RandomX":3365759273,"RandomY":315078874,"RandomZ":583662031,"StartTime":10260.0,"Objects":[{"StartTime":10260.0,"EndTime":10260.0,"Column":2}]},{"RandomW":3256340938,"RandomX":315078874,"RandomY":583662031,"RandomZ":3789568254,"StartTime":10493.0,"Objects":[{"StartTime":10493.0,"EndTime":10493.0,"Column":2}]},{"RandomW":2152938451,"RandomX":3789568254,"RandomY":3256340938,"RandomZ":3979976762,"StartTime":10727.0,"Objects":[{"StartTime":10727.0,"EndTime":10727.0,"Column":1},{"StartTime":10727.0,"EndTime":10727.0,"Column":0}]},{"RandomW":1620362479,"RandomX":3256340938,"RandomY":3979976762,"RandomZ":2152938451,"StartTime":11427.0,"Objects":[{"StartTime":11427.0,"EndTime":11427.0,"Column":1}]},{"RandomW":477221046,"RandomX":3979976762,"RandomY":2152938451,"RandomZ":1620362479,"StartTime":11777.0,"Objects":[{"StartTime":11777.0,"EndTime":11777.0,"Column":1}]},{"RandomW":1013554034,"RandomX":2152938451,"RandomY":1620362479,"RandomZ":477221046,"StartTime":12127.0,"Objects":[{"StartTime":12127.0,"EndTime":12127.0,"Column":2}]},{"RandomW":637383311,"RandomX":1620362479,"RandomY":477221046,"RandomZ":1013554034,"StartTime":12360.0,"Objects":[{"StartTime":12360.0,"EndTime":12360.0,"Column":2}]},{"RandomW":3817388387,"RandomX":477221046,"RandomY":1013554034,"RandomZ":637383311,"StartTime":12594.0,"Objects":[{"StartTime":12594.0,"EndTime":12594.0,"Column":3}]},{"RandomW":19695232,"RandomX":637383311,"RandomY":3817388387,"RandomZ":1911435716,"StartTime":13060.0,"Objects":[{"StartTime":13060.0,"EndTime":13060.0,"Column":3},{"StartTime":13060.0,"EndTime":13060.0,"Column":0}]},{"RandomW":3381470688,"RandomX":3817388387,"RandomY":1911435716,"RandomZ":19695232,"StartTime":13294.0,"Objects":[{"StartTime":13294.0,"EndTime":13294.0,"Column":3}]},{"RandomW":1862836779,"RandomX":19695232,"RandomY":3381470688,"RandomZ":1869143571,"StartTime":13527.0,"Objects":[{"StartTime":13527.0,"EndTime":13527.0,"Column":3},{"StartTime":13527.0,"EndTime":13527.0,"Column":5}]},{"RandomW":175452620,"RandomX":3381470688,"RandomY":1869143571,"RandomZ":1862836779,"StartTime":13994.0,"Objects":[{"StartTime":13994.0,"EndTime":13994.0,"Column":4}]},{"RandomW":2859972423,"RandomX":1869143571,"RandomY":1862836779,"RandomZ":175452620,"StartTime":14227.0,"Objects":[{"StartTime":14227.0,"EndTime":14227.0,"Column":4}]},{"RandomW":2210823260,"RandomX":1862836779,"RandomY":175452620,"RandomZ":2859972423,"StartTime":14461.0,"Objects":[{"StartTime":14461.0,"EndTime":14461.0,"Column":5}]},{"RandomW":2851442677,"RandomX":175452620,"RandomY":2859972423,"RandomZ":2210823260,"StartTime":14927.0,"Objects":[{"StartTime":14927.0,"EndTime":16561.0,"Column":1}]},{"RandomW":179122262,"RandomX":2859972423,"RandomY":2210823260,"RandomZ":2851442677,"StartTime":16794.0,"Objects":[{"StartTime":16794.0,"EndTime":18078.0,"Column":0}]},{"RandomW":2917386405,"RandomX":2851442677,"RandomY":179122262,"RandomZ":494367691,"StartTime":18661.0,"Objects":[{"StartTime":18661.0,"EndTime":19127.0,"Column":2}]},{"RandomW":3407923728,"RandomX":494367691,"RandomY":2917386405,"RandomZ":2825679051,"StartTime":19595.0,"Objects":[{"StartTime":19595.0,"EndTime":20061.0,"Column":3}]},{"RandomW":358318928,"RandomX":3407923728,"RandomY":1835995540,"RandomZ":3732560508,"StartTime":20528.0,"Objects":[{"StartTime":20528.0,"EndTime":20994.0,"Column":4},{"StartTime":20528.0,"EndTime":20994.0,"Column":1}]},{"RandomW":3440439960,"RandomX":3732560508,"RandomY":358318928,"RandomZ":3638999969,"StartTime":21462.0,"Objects":[{"StartTime":21462.0,"EndTime":21928.0,"Column":3}]},{"RandomW":3249928444,"RandomX":358318928,"RandomY":3638999969,"RandomZ":3440439960,"StartTime":22395.0,"Objects":[{"StartTime":22395.0,"EndTime":22395.0,"Column":1}]},{"RandomW":3857394572,"RandomX":3440439960,"RandomY":3249928444,"RandomZ":138257049,"StartTime":22628.0,"Objects":[{"StartTime":22628.0,"EndTime":24028.0,"Column":4}]},{"RandomW":2938470811,"RandomX":3249928444,"RandomY":138257049,"RandomZ":3857394572,"StartTime":24262.0,"Objects":[{"StartTime":24262.0,"EndTime":24262.0,"Column":3}]},{"RandomW":3241803419,"RandomX":138257049,"RandomY":3857394572,"RandomZ":2938470811,"StartTime":24495.0,"Objects":[{"StartTime":24495.0,"EndTime":24495.0,"Column":4}]},{"RandomW":620078415,"RandomX":3857394572,"RandomY":2938470811,"RandomZ":3241803419,"StartTime":25195.0,"Objects":[{"StartTime":25195.0,"EndTime":25195.0,"Column":4}]},{"RandomW":2566806806,"RandomX":2938470811,"RandomY":3241803419,"RandomZ":620078415,"StartTime":25429.0,"Objects":[{"StartTime":25429.0,"EndTime":25429.0,"Column":4}]},{"RandomW":458505931,"RandomX":3241803419,"RandomY":620078415,"RandomZ":2566806806,"StartTime":26129.0,"Objects":[{"StartTime":26129.0,"EndTime":26129.0,"Column":3}]},{"RandomW":2629948988,"RandomX":2566806806,"RandomY":458505931,"RandomZ":362272284,"StartTime":26362.0,"Objects":[{"StartTime":26362.0,"EndTime":27762.0,"Column":1}]},{"RandomW":1285940261,"RandomX":362272284,"RandomY":2629948988,"RandomZ":4139597407,"StartTime":27996.0,"Objects":[{"StartTime":27996.0,"EndTime":27996.0,"Column":1},{"StartTime":27996.0,"EndTime":27996.0,"Column":3}]},{"RandomW":3878288539,"RandomX":2629948988,"RandomY":4139597407,"RandomZ":1285940261,"StartTime":28229.0,"Objects":[{"StartTime":28229.0,"EndTime":28229.0,"Column":1}]},{"RandomW":1788551508,"RandomX":1285940261,"RandomY":3878288539,"RandomZ":1976280692,"StartTime":28929.0,"Objects":[{"StartTime":28929.0,"EndTime":28929.0,"Column":1},{"StartTime":28929.0,"EndTime":28929.0,"Column":4}]},{"RandomW":159147246,"RandomX":3878288539,"RandomY":1976280692,"RandomZ":1788551508,"StartTime":29163.0,"Objects":[{"StartTime":29163.0,"EndTime":29163.0,"Column":1}]},{"RandomW":2702806142,"RandomX":1976280692,"RandomY":1788551508,"RandomZ":159147246,"StartTime":29863.0,"Objects":[{"StartTime":29863.0,"EndTime":29863.0,"Column":2}]},{"RandomW":2311677487,"RandomX":1788551508,"RandomY":159147246,"RandomZ":2702806142,"StartTime":30213.0,"Objects":[{"StartTime":30213.0,"EndTime":30213.0,"Column":3}]},{"RandomW":3175953261,"RandomX":2311677487,"RandomY":988506051,"RandomZ":3495571300,"StartTime":30446.0,"Objects":[{"StartTime":30446.0,"EndTime":31146.0,"Column":2}]},{"RandomW":516122535,"RandomX":3495571300,"RandomY":3175953261,"RandomZ":2138555125,"StartTime":31730.0,"Objects":[{"StartTime":31730.0,"EndTime":31730.0,"Column":2},{"StartTime":31730.0,"EndTime":31730.0,"Column":1}]},{"RandomW":534989332,"RandomX":3175953261,"RandomY":2138555125,"RandomZ":516122535,"StartTime":32080.0,"Objects":[{"StartTime":32080.0,"EndTime":32080.0,"Column":2}]},{"RandomW":3420570846,"RandomX":2138555125,"RandomY":516122535,"RandomZ":534989332,"StartTime":32430.0,"Objects":[{"StartTime":32430.0,"EndTime":32430.0,"Column":2}]},{"RandomW":172021565,"RandomX":516122535,"RandomY":534989332,"RandomZ":3420570846,"StartTime":32663.0,"Objects":[{"StartTime":32663.0,"EndTime":32663.0,"Column":2}]},{"RandomW":168636292,"RandomX":3420570846,"RandomY":172021565,"RandomZ":263944077,"StartTime":32780.0,"Objects":[{"StartTime":32780.0,"EndTime":32780.0,"Column":0}]},{"RandomW":3473923375,"RandomX":172021565,"RandomY":263944077,"RandomZ":168636292,"StartTime":33597.0,"Objects":[{"StartTime":33597.0,"EndTime":33597.0,"Column":1}]},{"RandomW":3287941836,"RandomX":263944077,"RandomY":168636292,"RandomZ":3473923375,"StartTime":33947.0,"Objects":[{"StartTime":33947.0,"EndTime":33947.0,"Column":1}]},{"RandomW":1950056015,"RandomX":3473923375,"RandomY":3287941836,"RandomZ":388563489,"StartTime":34180.0,"Objects":[{"StartTime":34180.0,"EndTime":35230.0,"Column":5}]},{"RandomW":3600000321,"RandomX":388563489,"RandomY":1950056015,"RandomZ":3312202562,"StartTime":35464.0,"Objects":[{"StartTime":35464.0,"EndTime":36164.0,"Column":4}]},{"RandomW":647123919,"RandomX":3312202562,"RandomY":3600000321,"RandomZ":2314505656,"StartTime":36397.0,"Objects":[{"StartTime":36397.0,"EndTime":37097.0,"Column":1}]},{"RandomW":3375531720,"RandomX":2314505656,"RandomY":647123919,"RandomZ":2193654396,"StartTime":37564.0,"Objects":[{"StartTime":37564.0,"EndTime":37914.0,"Column":3}]},{"RandomW":2335314869,"RandomX":3834006299,"RandomY":1346269295,"RandomZ":3597388662,"StartTime":38264.0,"Objects":[{"StartTime":38264.0,"EndTime":38264.0,"Column":4},{"StartTime":38380.0,"EndTime":38380.0,"Column":3},{"StartTime":38496.0,"EndTime":38496.0,"Column":4}]},{"RandomW":1564102491,"RandomX":1346269295,"RandomY":3597388662,"RandomZ":2335314869,"StartTime":39197.0,"Objects":[{"StartTime":39197.0,"EndTime":39197.0,"Column":2}]},{"RandomW":1989977426,"RandomX":2335314869,"RandomY":1564102491,"RandomZ":4263834011,"StartTime":39431.0,"Objects":[{"StartTime":39431.0,"EndTime":39431.0,"Column":2},{"StartTime":39431.0,"EndTime":39431.0,"Column":5}]},{"RandomW":3806815718,"RandomX":4263834011,"RandomY":1989977426,"RandomZ":1831387023,"StartTime":39664.0,"Objects":[{"StartTime":39664.0,"EndTime":39664.0,"Column":1},{"StartTime":39664.0,"EndTime":39664.0,"Column":4}]},{"RandomW":999749640,"RandomX":1989977426,"RandomY":1831387023,"RandomZ":3806815718,"StartTime":39898.0,"Objects":[{"StartTime":39898.0,"EndTime":40831.0,"Column":1}]},{"RandomW":2830335005,"RandomX":1831387023,"RandomY":3806815718,"RandomZ":999749640,"StartTime":41298.0,"Objects":[{"StartTime":41298.0,"EndTime":41298.0,"Column":1}]},{"RandomW":2152692291,"RandomX":3806815718,"RandomY":999749640,"RandomZ":2830335005,"StartTime":41648.0,"Objects":[{"StartTime":41648.0,"EndTime":41648.0,"Column":1}]},{"RandomW":1499396089,"RandomX":999749640,"RandomY":2830335005,"RandomZ":2152692291,"StartTime":41998.0,"Objects":[{"StartTime":41998.0,"EndTime":41998.0,"Column":2}]},{"RandomW":3582202466,"RandomX":2830335005,"RandomY":2152692291,"RandomZ":1499396089,"StartTime":42231.0,"Objects":[{"StartTime":42231.0,"EndTime":42231.0,"Column":2}]},{"RandomW":3873754971,"RandomX":2152692291,"RandomY":1499396089,"RandomZ":3582202466,"StartTime":42931.0,"Objects":[{"StartTime":42931.0,"EndTime":42931.0,"Column":4}]},{"RandomW":495070374,"RandomX":1499396089,"RandomY":3582202466,"RandomZ":3873754971,"StartTime":43165.0,"Objects":[{"StartTime":43165.0,"EndTime":43165.0,"Column":4}]},{"RandomW":3016618448,"RandomX":3582202466,"RandomY":3873754971,"RandomZ":495070374,"StartTime":43398.0,"Objects":[{"StartTime":43398.0,"EndTime":43398.0,"Column":4}]},{"RandomW":1177547465,"RandomX":3873754971,"RandomY":495070374,"RandomZ":3016618448,"StartTime":43631.0,"Objects":[{"StartTime":43631.0,"EndTime":43631.0,"Column":3}]},{"RandomW":2255582016,"RandomX":495070374,"RandomY":3016618448,"RandomZ":1177547465,"StartTime":43865.0,"Objects":[{"StartTime":43865.0,"EndTime":43865.0,"Column":3}]},{"RandomW":2325387316,"RandomX":3016618448,"RandomY":1177547465,"RandomZ":2255582016,"StartTime":44098.0,"Objects":[{"StartTime":44098.0,"EndTime":44098.0,"Column":2}]},{"RandomW":1443216326,"RandomX":1177547465,"RandomY":2255582016,"RandomZ":2325387316,"StartTime":44332.0,"Objects":[{"StartTime":44332.0,"EndTime":44332.0,"Column":2}]},{"RandomW":1650665398,"RandomX":2325387316,"RandomY":1443216326,"RandomZ":1871032949,"StartTime":44565.0,"Objects":[{"StartTime":44565.0,"EndTime":44565.0,"Column":1},{"StartTime":44565.0,"EndTime":44565.0,"Column":4}]},{"RandomW":1204166455,"RandomX":1871032949,"RandomY":1650665398,"RandomZ":1013336310,"StartTime":44798.0,"Objects":[{"StartTime":44798.0,"EndTime":45498.0,"Column":3}]},{"RandomW":2125976115,"RandomX":1013336310,"RandomY":1204166455,"RandomZ":93461408,"StartTime":45732.0,"Objects":[{"StartTime":45732.0,"EndTime":46432.0,"Column":5}]},{"RandomW":1391245329,"RandomX":1889010923,"RandomY":131109480,"RandomZ":2450179625,"StartTime":46665.0,"Objects":[{"StartTime":46665.0,"EndTime":47365.0,"Column":0},{"StartTime":46665.0,"EndTime":47365.0,"Column":3}]},{"RandomW":1629740061,"RandomX":2450179625,"RandomY":1391245329,"RandomZ":3806548475,"StartTime":47599.0,"Objects":[{"StartTime":47599.0,"EndTime":47949.0,"Column":4}]},{"RandomW":2462543108,"RandomX":3806548475,"RandomY":1629740061,"RandomZ":2782684574,"StartTime":48532.0,"Objects":[{"StartTime":48532.0,"EndTime":49232.0,"Column":0}]},{"RandomW":1398343675,"RandomX":2462543108,"RandomY":1783863854,"RandomZ":368009293,"StartTime":49466.0,"Objects":[{"StartTime":49466.0,"EndTime":50166.0,"Column":1},{"StartTime":49466.0,"EndTime":50166.0,"Column":3}]},{"RandomW":1655209110,"RandomX":1398343675,"RandomY":4200591321,"RandomZ":204183638,"StartTime":50399.0,"Objects":[{"StartTime":50399.0,"EndTime":51099.0,"Column":0},{"StartTime":50399.0,"EndTime":51099.0,"Column":4}]},{"RandomW":2898792131,"RandomX":1655209110,"RandomY":4183149031,"RandomZ":4235317299,"StartTime":51333.0,"Objects":[{"StartTime":51333.0,"EndTime":52033.0,"Column":5},{"StartTime":51333.0,"EndTime":52033.0,"Column":2}]},{"RandomW":2376440576,"RandomX":4183149031,"RandomY":4235317299,"RandomZ":2898792131,"StartTime":52266.0,"Objects":[{"StartTime":52266.0,"EndTime":52266.0,"Column":0}]},{"RandomW":3672662434,"RandomX":4235317299,"RandomY":2898792131,"RandomZ":2376440576,"StartTime":52499.0,"Objects":[{"StartTime":52499.0,"EndTime":52499.0,"Column":1}]},{"RandomW":1144553308,"RandomX":2376440576,"RandomY":3672662434,"RandomZ":2825568900,"StartTime":52849.0,"Objects":[{"StartTime":52849.0,"EndTime":53199.0,"Column":3}]},{"RandomW":3856961856,"RandomX":3672662434,"RandomY":2825568900,"RandomZ":1144553308,"StartTime":54133.0,"Objects":[{"StartTime":54133.0,"EndTime":54133.0,"Column":3}]},{"RandomW":3856961856,"RandomX":3672662434,"RandomY":2825568900,"RandomZ":1144553308,"StartTime":54366.0,"Objects":[{"StartTime":54366.0,"EndTime":54366.0,"Column":2}]},{"RandomW":3856961856,"RandomX":3672662434,"RandomY":2825568900,"RandomZ":1144553308,"StartTime":54600.0,"Objects":[{"StartTime":54600.0,"EndTime":54600.0,"Column":3}]},{"RandomW":2182646490,"RandomX":1144553308,"RandomY":3856961856,"RandomZ":2090342703,"StartTime":55066.0,"Objects":[{"StartTime":55066.0,"EndTime":55066.0,"Column":2},{"StartTime":55066.0,"EndTime":55066.0,"Column":0}]},{"RandomW":2182646490,"RandomX":1144553308,"RandomY":3856961856,"RandomZ":2090342703,"StartTime":55300.0,"Objects":[{"StartTime":55300.0,"EndTime":55300.0,"Column":5},{"StartTime":55300.0,"EndTime":55300.0,"Column":3}]},{"RandomW":2182646490,"RandomX":1144553308,"RandomY":3856961856,"RandomZ":2090342703,"StartTime":55533.0,"Objects":[{"StartTime":55533.0,"EndTime":55533.0,"Column":2},{"StartTime":55533.0,"EndTime":55533.0,"Column":0}]},{"RandomW":3304208416,"RandomX":2090342703,"RandomY":2182646490,"RandomZ":90031962,"StartTime":56000.0,"Objects":[{"StartTime":56000.0,"EndTime":56233.0,"Column":3}]},{"RandomW":1041697651,"RandomX":90031962,"RandomY":3304208416,"RandomZ":2015301872,"StartTime":56583.0,"Objects":[{"StartTime":56583.0,"EndTime":56583.0,"Column":1},{"StartTime":56583.0,"EndTime":56583.0,"Column":2}]},{"RandomW":3818981880,"RandomX":15037736,"RandomY":2251270868,"RandomZ":2287819377,"StartTime":56700.0,"Objects":[{"StartTime":56700.0,"EndTime":56700.0,"Column":0},{"StartTime":56700.0,"EndTime":56700.0,"Column":4}]},{"RandomW":3368447121,"RandomX":2251270868,"RandomY":2287819377,"RandomZ":3818981880,"StartTime":56933.0,"Objects":[{"StartTime":56933.0,"EndTime":56933.0,"Column":1}]},{"RandomW":860096087,"RandomX":2287819377,"RandomY":3818981880,"RandomZ":3368447121,"StartTime":57867.0,"Objects":[{"StartTime":57867.0,"EndTime":57867.0,"Column":3}]},{"RandomW":860096087,"RandomX":2287819377,"RandomY":3818981880,"RandomZ":3368447121,"StartTime":58100.0,"Objects":[{"StartTime":58100.0,"EndTime":58100.0,"Column":2}]},{"RandomW":860096087,"RandomX":2287819377,"RandomY":3818981880,"RandomZ":3368447121,"StartTime":58334.0,"Objects":[{"StartTime":58334.0,"EndTime":58334.0,"Column":3}]},{"RandomW":1369988252,"RandomX":3818981880,"RandomY":3368447121,"RandomZ":860096087,"StartTime":58800.0,"Objects":[{"StartTime":58800.0,"EndTime":58800.0,"Column":4}]},{"RandomW":1369988252,"RandomX":3818981880,"RandomY":3368447121,"RandomZ":860096087,"StartTime":59034.0,"Objects":[{"StartTime":59034.0,"EndTime":59034.0,"Column":1}]},{"RandomW":1369988252,"RandomX":3818981880,"RandomY":3368447121,"RandomZ":860096087,"StartTime":59267.0,"Objects":[{"StartTime":59267.0,"EndTime":59267.0,"Column":4}]}]}
\ No newline at end of file
+{"Mappings":[{"RandomW":273523780,"RandomX":842502087,"RandomY":3579807591,"RandomZ":273326509,"StartTime":7693.0,"Objects":[{"StartTime":7693.0,"EndTime":7693.0,"Column":0}]},{"RandomW":2659866685,"RandomX":3579807591,"RandomY":273326509,"RandomZ":273523780,"StartTime":8043.0,"Objects":[{"StartTime":8043.0,"EndTime":8043.0,"Column":1}]},{"RandomW":3083309108,"RandomX":273326509,"RandomY":273523780,"RandomZ":2659866685,"StartTime":8393.0,"Objects":[{"StartTime":8393.0,"EndTime":8393.0,"Column":2}]},{"RandomW":2413296944,"RandomX":2659866685,"RandomY":3083309108,"RandomZ":4072999080,"StartTime":8626.0,"Objects":[{"StartTime":8626.0,"EndTime":8626.0,"Column":2},{"StartTime":8626.0,"EndTime":8626.0,"Column":0}]},{"RandomW":1129322311,"RandomX":3083309108,"RandomY":4072999080,"RandomZ":2413296944,"StartTime":8860.0,"Objects":[{"StartTime":8860.0,"EndTime":8860.0,"Column":3}]},{"RandomW":3365759273,"RandomX":4072999080,"RandomY":2413296944,"RandomZ":1129322311,"StartTime":9326.0,"Objects":[{"StartTime":9326.0,"EndTime":9326.0,"Column":3}]},{"RandomW":315078874,"RandomX":2413296944,"RandomY":1129322311,"RandomZ":3365759273,"StartTime":9560.0,"Objects":[{"StartTime":9560.0,"EndTime":9560.0,"Column":3}]},{"RandomW":583662031,"RandomX":1129322311,"RandomY":3365759273,"RandomZ":315078874,"StartTime":9793.0,"Objects":[{"StartTime":9793.0,"EndTime":9793.0,"Column":3}]},{"RandomW":3789568254,"RandomX":3365759273,"RandomY":315078874,"RandomZ":583662031,"StartTime":10260.0,"Objects":[{"StartTime":10260.0,"EndTime":10260.0,"Column":2}]},{"RandomW":3256340938,"RandomX":315078874,"RandomY":583662031,"RandomZ":3789568254,"StartTime":10493.0,"Objects":[{"StartTime":10493.0,"EndTime":10493.0,"Column":2}]},{"RandomW":2152938451,"RandomX":3789568254,"RandomY":3256340938,"RandomZ":3979976762,"StartTime":10727.0,"Objects":[{"StartTime":10727.0,"EndTime":10727.0,"Column":1},{"StartTime":10727.0,"EndTime":10727.0,"Column":0}]},{"RandomW":1620362479,"RandomX":3256340938,"RandomY":3979976762,"RandomZ":2152938451,"StartTime":11427.0,"Objects":[{"StartTime":11427.0,"EndTime":11427.0,"Column":1}]},{"RandomW":477221046,"RandomX":3979976762,"RandomY":2152938451,"RandomZ":1620362479,"StartTime":11777.0,"Objects":[{"StartTime":11777.0,"EndTime":11777.0,"Column":1}]},{"RandomW":1013554034,"RandomX":2152938451,"RandomY":1620362479,"RandomZ":477221046,"StartTime":12127.0,"Objects":[{"StartTime":12127.0,"EndTime":12127.0,"Column":2}]},{"RandomW":637383311,"RandomX":1620362479,"RandomY":477221046,"RandomZ":1013554034,"StartTime":12360.0,"Objects":[{"StartTime":12360.0,"EndTime":12360.0,"Column":2}]},{"RandomW":3817388387,"RandomX":477221046,"RandomY":1013554034,"RandomZ":637383311,"StartTime":12594.0,"Objects":[{"StartTime":12594.0,"EndTime":12594.0,"Column":3}]},{"RandomW":19695232,"RandomX":637383311,"RandomY":3817388387,"RandomZ":1911435716,"StartTime":13060.0,"Objects":[{"StartTime":13060.0,"EndTime":13060.0,"Column":3},{"StartTime":13060.0,"EndTime":13060.0,"Column":0}]},{"RandomW":3381470688,"RandomX":3817388387,"RandomY":1911435716,"RandomZ":19695232,"StartTime":13294.0,"Objects":[{"StartTime":13294.0,"EndTime":13294.0,"Column":3}]},{"RandomW":1862836779,"RandomX":19695232,"RandomY":3381470688,"RandomZ":1869143571,"StartTime":13527.0,"Objects":[{"StartTime":13527.0,"EndTime":13527.0,"Column":3},{"StartTime":13527.0,"EndTime":13527.0,"Column":5}]},{"RandomW":175452620,"RandomX":3381470688,"RandomY":1869143571,"RandomZ":1862836779,"StartTime":13994.0,"Objects":[{"StartTime":13994.0,"EndTime":13994.0,"Column":4}]},{"RandomW":2859972423,"RandomX":1869143571,"RandomY":1862836779,"RandomZ":175452620,"StartTime":14227.0,"Objects":[{"StartTime":14227.0,"EndTime":14227.0,"Column":4}]},{"RandomW":2210823260,"RandomX":1862836779,"RandomY":175452620,"RandomZ":2859972423,"StartTime":14461.0,"Objects":[{"StartTime":14461.0,"EndTime":14461.0,"Column":5}]},{"RandomW":2851442677,"RandomX":175452620,"RandomY":2859972423,"RandomZ":2210823260,"StartTime":14927.0,"Objects":[{"StartTime":14927.0,"EndTime":16561.0,"Column":1}]},{"RandomW":179122262,"RandomX":2859972423,"RandomY":2210823260,"RandomZ":2851442677,"StartTime":16794.0,"Objects":[{"StartTime":16794.0,"EndTime":18078.0,"Column":0}]},{"RandomW":2917386405,"RandomX":2851442677,"RandomY":179122262,"RandomZ":494367691,"StartTime":18661.0,"Objects":[{"StartTime":18661.0,"EndTime":19127.0,"Column":2}]},{"RandomW":3407923728,"RandomX":494367691,"RandomY":2917386405,"RandomZ":2825679051,"StartTime":19595.0,"Objects":[{"StartTime":19595.0,"EndTime":20061.0,"Column":3}]},{"RandomW":358318928,"RandomX":3407923728,"RandomY":1835995540,"RandomZ":3732560508,"StartTime":20528.0,"Objects":[{"StartTime":20528.0,"EndTime":20994.0,"Column":4},{"StartTime":20528.0,"EndTime":20994.0,"Column":1}]},{"RandomW":3440439960,"RandomX":3732560508,"RandomY":358318928,"RandomZ":3638999969,"StartTime":21462.0,"Objects":[{"StartTime":21462.0,"EndTime":21928.0,"Column":3}]},{"RandomW":3249928444,"RandomX":358318928,"RandomY":3638999969,"RandomZ":3440439960,"StartTime":22395.0,"Objects":[{"StartTime":22395.0,"EndTime":22395.0,"Column":1}]},{"RandomW":3857394572,"RandomX":3440439960,"RandomY":3249928444,"RandomZ":138257049,"StartTime":22628.0,"Objects":[{"StartTime":22628.0,"EndTime":24028.0,"Column":4}]},{"RandomW":2938470811,"RandomX":3249928444,"RandomY":138257049,"RandomZ":3857394572,"StartTime":24262.0,"Objects":[{"StartTime":24262.0,"EndTime":24262.0,"Column":3}]},{"RandomW":3241803419,"RandomX":138257049,"RandomY":3857394572,"RandomZ":2938470811,"StartTime":24495.0,"Objects":[{"StartTime":24495.0,"EndTime":24495.0,"Column":4}]},{"RandomW":620078415,"RandomX":3857394572,"RandomY":2938470811,"RandomZ":3241803419,"StartTime":25195.0,"Objects":[{"StartTime":25195.0,"EndTime":25195.0,"Column":4}]},{"RandomW":2566806806,"RandomX":2938470811,"RandomY":3241803419,"RandomZ":620078415,"StartTime":25429.0,"Objects":[{"StartTime":25429.0,"EndTime":25429.0,"Column":4}]},{"RandomW":458505931,"RandomX":3241803419,"RandomY":620078415,"RandomZ":2566806806,"StartTime":26129.0,"Objects":[{"StartTime":26129.0,"EndTime":26129.0,"Column":3}]},{"RandomW":2629948988,"RandomX":2566806806,"RandomY":458505931,"RandomZ":362272284,"StartTime":26362.0,"Objects":[{"StartTime":26362.0,"EndTime":27762.0,"Column":1}]},{"RandomW":1285940261,"RandomX":362272284,"RandomY":2629948988,"RandomZ":4139597407,"StartTime":27996.0,"Objects":[{"StartTime":27996.0,"EndTime":27996.0,"Column":1},{"StartTime":27996.0,"EndTime":27996.0,"Column":3}]},{"RandomW":3878288539,"RandomX":2629948988,"RandomY":4139597407,"RandomZ":1285940261,"StartTime":28229.0,"Objects":[{"StartTime":28229.0,"EndTime":28229.0,"Column":1}]},{"RandomW":1788551508,"RandomX":1285940261,"RandomY":3878288539,"RandomZ":1976280692,"StartTime":28929.0,"Objects":[{"StartTime":28929.0,"EndTime":28929.0,"Column":1},{"StartTime":28929.0,"EndTime":28929.0,"Column":4}]},{"RandomW":159147246,"RandomX":3878288539,"RandomY":1976280692,"RandomZ":1788551508,"StartTime":29163.0,"Objects":[{"StartTime":29163.0,"EndTime":29163.0,"Column":1}]},{"RandomW":2702806142,"RandomX":1976280692,"RandomY":1788551508,"RandomZ":159147246,"StartTime":29863.0,"Objects":[{"StartTime":29863.0,"EndTime":29863.0,"Column":3}]},{"RandomW":2311677487,"RandomX":1788551508,"RandomY":159147246,"RandomZ":2702806142,"StartTime":30213.0,"Objects":[{"StartTime":30213.0,"EndTime":30213.0,"Column":3}]},{"RandomW":3175953261,"RandomX":2311677487,"RandomY":988506051,"RandomZ":3495571300,"StartTime":30446.0,"Objects":[{"StartTime":30446.0,"EndTime":31146.0,"Column":2}]},{"RandomW":516122535,"RandomX":3495571300,"RandomY":3175953261,"RandomZ":2138555125,"StartTime":31730.0,"Objects":[{"StartTime":31730.0,"EndTime":31730.0,"Column":2},{"StartTime":31730.0,"EndTime":31730.0,"Column":1}]},{"RandomW":534989332,"RandomX":3175953261,"RandomY":2138555125,"RandomZ":516122535,"StartTime":32080.0,"Objects":[{"StartTime":32080.0,"EndTime":32080.0,"Column":2}]},{"RandomW":3420570846,"RandomX":2138555125,"RandomY":516122535,"RandomZ":534989332,"StartTime":32430.0,"Objects":[{"StartTime":32430.0,"EndTime":32430.0,"Column":2}]},{"RandomW":172021565,"RandomX":516122535,"RandomY":534989332,"RandomZ":3420570846,"StartTime":32663.0,"Objects":[{"StartTime":32663.0,"EndTime":32663.0,"Column":2}]},{"RandomW":168636292,"RandomX":3420570846,"RandomY":172021565,"RandomZ":263944077,"StartTime":32780.0,"Objects":[{"StartTime":32780.0,"EndTime":32780.0,"Column":0}]},{"RandomW":3473923375,"RandomX":172021565,"RandomY":263944077,"RandomZ":168636292,"StartTime":33597.0,"Objects":[{"StartTime":33597.0,"EndTime":33597.0,"Column":1}]},{"RandomW":3287941836,"RandomX":263944077,"RandomY":168636292,"RandomZ":3473923375,"StartTime":33947.0,"Objects":[{"StartTime":33947.0,"EndTime":33947.0,"Column":1}]},{"RandomW":1950056015,"RandomX":3473923375,"RandomY":3287941836,"RandomZ":388563489,"StartTime":34180.0,"Objects":[{"StartTime":34180.0,"EndTime":35230.0,"Column":5}]},{"RandomW":3600000321,"RandomX":388563489,"RandomY":1950056015,"RandomZ":3312202562,"StartTime":35464.0,"Objects":[{"StartTime":35464.0,"EndTime":36164.0,"Column":4}]},{"RandomW":647123919,"RandomX":3312202562,"RandomY":3600000321,"RandomZ":2314505656,"StartTime":36397.0,"Objects":[{"StartTime":36397.0,"EndTime":37097.0,"Column":1}]},{"RandomW":3375531720,"RandomX":2314505656,"RandomY":647123919,"RandomZ":2193654396,"StartTime":37564.0,"Objects":[{"StartTime":37564.0,"EndTime":37914.0,"Column":3}]},{"RandomW":2335314869,"RandomX":3834006299,"RandomY":1346269295,"RandomZ":3597388662,"StartTime":38264.0,"Objects":[{"StartTime":38264.0,"EndTime":38264.0,"Column":4},{"StartTime":38380.0,"EndTime":38380.0,"Column":3},{"StartTime":38496.0,"EndTime":38496.0,"Column":4}]},{"RandomW":1564102491,"RandomX":1346269295,"RandomY":3597388662,"RandomZ":2335314869,"StartTime":39197.0,"Objects":[{"StartTime":39197.0,"EndTime":39197.0,"Column":2}]},{"RandomW":1989977426,"RandomX":2335314869,"RandomY":1564102491,"RandomZ":4263834011,"StartTime":39431.0,"Objects":[{"StartTime":39431.0,"EndTime":39431.0,"Column":2},{"StartTime":39431.0,"EndTime":39431.0,"Column":5}]},{"RandomW":3806815718,"RandomX":4263834011,"RandomY":1989977426,"RandomZ":1831387023,"StartTime":39664.0,"Objects":[{"StartTime":39664.0,"EndTime":39664.0,"Column":1},{"StartTime":39664.0,"EndTime":39664.0,"Column":4}]},{"RandomW":999749640,"RandomX":1989977426,"RandomY":1831387023,"RandomZ":3806815718,"StartTime":39898.0,"Objects":[{"StartTime":39898.0,"EndTime":40831.0,"Column":1}]},{"RandomW":2830335005,"RandomX":1831387023,"RandomY":3806815718,"RandomZ":999749640,"StartTime":41298.0,"Objects":[{"StartTime":41298.0,"EndTime":41298.0,"Column":1}]},{"RandomW":2152692291,"RandomX":3806815718,"RandomY":999749640,"RandomZ":2830335005,"StartTime":41648.0,"Objects":[{"StartTime":41648.0,"EndTime":41648.0,"Column":1}]},{"RandomW":1499396089,"RandomX":999749640,"RandomY":2830335005,"RandomZ":2152692291,"StartTime":41998.0,"Objects":[{"StartTime":41998.0,"EndTime":41998.0,"Column":2}]},{"RandomW":3582202466,"RandomX":2830335005,"RandomY":2152692291,"RandomZ":1499396089,"StartTime":42231.0,"Objects":[{"StartTime":42231.0,"EndTime":42231.0,"Column":2}]},{"RandomW":3873754971,"RandomX":2152692291,"RandomY":1499396089,"RandomZ":3582202466,"StartTime":42931.0,"Objects":[{"StartTime":42931.0,"EndTime":42931.0,"Column":4}]},{"RandomW":495070374,"RandomX":1499396089,"RandomY":3582202466,"RandomZ":3873754971,"StartTime":43165.0,"Objects":[{"StartTime":43165.0,"EndTime":43165.0,"Column":4}]},{"RandomW":3016618448,"RandomX":3582202466,"RandomY":3873754971,"RandomZ":495070374,"StartTime":43398.0,"Objects":[{"StartTime":43398.0,"EndTime":43398.0,"Column":4}]},{"RandomW":1177547465,"RandomX":3873754971,"RandomY":495070374,"RandomZ":3016618448,"StartTime":43631.0,"Objects":[{"StartTime":43631.0,"EndTime":43631.0,"Column":3}]},{"RandomW":2255582016,"RandomX":495070374,"RandomY":3016618448,"RandomZ":1177547465,"StartTime":43865.0,"Objects":[{"StartTime":43865.0,"EndTime":43865.0,"Column":3}]},{"RandomW":2325387316,"RandomX":3016618448,"RandomY":1177547465,"RandomZ":2255582016,"StartTime":44098.0,"Objects":[{"StartTime":44098.0,"EndTime":44098.0,"Column":2}]},{"RandomW":1443216326,"RandomX":1177547465,"RandomY":2255582016,"RandomZ":2325387316,"StartTime":44332.0,"Objects":[{"StartTime":44332.0,"EndTime":44332.0,"Column":2}]},{"RandomW":1650665398,"RandomX":2325387316,"RandomY":1443216326,"RandomZ":1871032949,"StartTime":44565.0,"Objects":[{"StartTime":44565.0,"EndTime":44565.0,"Column":1},{"StartTime":44565.0,"EndTime":44565.0,"Column":4}]},{"RandomW":1204166455,"RandomX":1871032949,"RandomY":1650665398,"RandomZ":1013336310,"StartTime":44798.0,"Objects":[{"StartTime":44798.0,"EndTime":45498.0,"Column":3}]},{"RandomW":2125976115,"RandomX":1013336310,"RandomY":1204166455,"RandomZ":93461408,"StartTime":45732.0,"Objects":[{"StartTime":45732.0,"EndTime":46432.0,"Column":5}]},{"RandomW":1391245329,"RandomX":1889010923,"RandomY":131109480,"RandomZ":2450179625,"StartTime":46665.0,"Objects":[{"StartTime":46665.0,"EndTime":47365.0,"Column":0},{"StartTime":46665.0,"EndTime":47365.0,"Column":3}]},{"RandomW":1629740061,"RandomX":2450179625,"RandomY":1391245329,"RandomZ":3806548475,"StartTime":47599.0,"Objects":[{"StartTime":47599.0,"EndTime":47949.0,"Column":4}]},{"RandomW":2462543108,"RandomX":3806548475,"RandomY":1629740061,"RandomZ":2782684574,"StartTime":48532.0,"Objects":[{"StartTime":48532.0,"EndTime":49232.0,"Column":0}]},{"RandomW":1398343675,"RandomX":2462543108,"RandomY":1783863854,"RandomZ":368009293,"StartTime":49466.0,"Objects":[{"StartTime":49466.0,"EndTime":50166.0,"Column":1},{"StartTime":49466.0,"EndTime":50166.0,"Column":3}]},{"RandomW":1655209110,"RandomX":1398343675,"RandomY":4200591321,"RandomZ":204183638,"StartTime":50399.0,"Objects":[{"StartTime":50399.0,"EndTime":51099.0,"Column":0},{"StartTime":50399.0,"EndTime":51099.0,"Column":4}]},{"RandomW":2898792131,"RandomX":1655209110,"RandomY":4183149031,"RandomZ":4235317299,"StartTime":51333.0,"Objects":[{"StartTime":51333.0,"EndTime":52033.0,"Column":5},{"StartTime":51333.0,"EndTime":52033.0,"Column":2}]},{"RandomW":2376440576,"RandomX":4183149031,"RandomY":4235317299,"RandomZ":2898792131,"StartTime":52266.0,"Objects":[{"StartTime":52266.0,"EndTime":52266.0,"Column":0}]},{"RandomW":3672662434,"RandomX":4235317299,"RandomY":2898792131,"RandomZ":2376440576,"StartTime":52499.0,"Objects":[{"StartTime":52499.0,"EndTime":52499.0,"Column":1}]},{"RandomW":1144553308,"RandomX":2376440576,"RandomY":3672662434,"RandomZ":2825568900,"StartTime":52849.0,"Objects":[{"StartTime":52849.0,"EndTime":53199.0,"Column":3}]},{"RandomW":3856961856,"RandomX":3672662434,"RandomY":2825568900,"RandomZ":1144553308,"StartTime":54133.0,"Objects":[{"StartTime":54133.0,"EndTime":54133.0,"Column":3}]},{"RandomW":3856961856,"RandomX":3672662434,"RandomY":2825568900,"RandomZ":1144553308,"StartTime":54366.0,"Objects":[{"StartTime":54366.0,"EndTime":54366.0,"Column":2}]},{"RandomW":3856961856,"RandomX":3672662434,"RandomY":2825568900,"RandomZ":1144553308,"StartTime":54600.0,"Objects":[{"StartTime":54600.0,"EndTime":54600.0,"Column":3}]},{"RandomW":2182646490,"RandomX":1144553308,"RandomY":3856961856,"RandomZ":2090342703,"StartTime":55066.0,"Objects":[{"StartTime":55066.0,"EndTime":55066.0,"Column":2},{"StartTime":55066.0,"EndTime":55066.0,"Column":0}]},{"RandomW":2182646490,"RandomX":1144553308,"RandomY":3856961856,"RandomZ":2090342703,"StartTime":55300.0,"Objects":[{"StartTime":55300.0,"EndTime":55300.0,"Column":5},{"StartTime":55300.0,"EndTime":55300.0,"Column":3}]},{"RandomW":2182646490,"RandomX":1144553308,"RandomY":3856961856,"RandomZ":2090342703,"StartTime":55533.0,"Objects":[{"StartTime":55533.0,"EndTime":55533.0,"Column":2},{"StartTime":55533.0,"EndTime":55533.0,"Column":0}]},{"RandomW":3304208416,"RandomX":2090342703,"RandomY":2182646490,"RandomZ":90031962,"StartTime":56000.0,"Objects":[{"StartTime":56000.0,"EndTime":56233.0,"Column":3}]},{"RandomW":1041697651,"RandomX":90031962,"RandomY":3304208416,"RandomZ":2015301872,"StartTime":56583.0,"Objects":[{"StartTime":56583.0,"EndTime":56583.0,"Column":1},{"StartTime":56583.0,"EndTime":56583.0,"Column":2}]},{"RandomW":3818981880,"RandomX":15037736,"RandomY":2251270868,"RandomZ":2287819377,"StartTime":56700.0,"Objects":[{"StartTime":56700.0,"EndTime":56700.0,"Column":0},{"StartTime":56700.0,"EndTime":56700.0,"Column":4}]},{"RandomW":3368447121,"RandomX":2251270868,"RandomY":2287819377,"RandomZ":3818981880,"StartTime":56933.0,"Objects":[{"StartTime":56933.0,"EndTime":56933.0,"Column":1}]},{"RandomW":860096087,"RandomX":2287819377,"RandomY":3818981880,"RandomZ":3368447121,"StartTime":57867.0,"Objects":[{"StartTime":57867.0,"EndTime":57867.0,"Column":3}]},{"RandomW":860096087,"RandomX":2287819377,"RandomY":3818981880,"RandomZ":3368447121,"StartTime":58100.0,"Objects":[{"StartTime":58100.0,"EndTime":58100.0,"Column":2}]},{"RandomW":860096087,"RandomX":2287819377,"RandomY":3818981880,"RandomZ":3368447121,"StartTime":58334.0,"Objects":[{"StartTime":58334.0,"EndTime":58334.0,"Column":3}]},{"RandomW":1369988252,"RandomX":3818981880,"RandomY":3368447121,"RandomZ":860096087,"StartTime":58800.0,"Objects":[{"StartTime":58800.0,"EndTime":58800.0,"Column":4}]},{"RandomW":1369988252,"RandomX":3818981880,"RandomY":3368447121,"RandomZ":860096087,"StartTime":59034.0,"Objects":[{"StartTime":59034.0,"EndTime":59034.0,"Column":1}]},{"RandomW":1369988252,"RandomX":3818981880,"RandomY":3368447121,"RandomZ":860096087,"StartTime":59267.0,"Objects":[{"StartTime":59267.0,"EndTime":59267.0,"Column":4}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/basic-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/basic-expected-conversion.json
index 753db99856..a25c8a12ab 100644
--- a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/basic-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/basic-expected-conversion.json
@@ -1,132 +1,168 @@
 {
-    "Mappings": [{
-        "RandomW": 2659373485,
-        "RandomX": 3579807591,
-        "RandomY": 273326509,
-        "RandomZ": 272969173,
-        "StartTime": 500.0,
-        "Objects": [{
-            "StartTime": 500.0,
-            "EndTime": 2500.0,
-            "Column": 0
-        }, {
-            "StartTime": 1500.0,
-            "EndTime": 2500.0,
-            "Column": 1
-        }]
-    }, {
-        "RandomW": 3083803045,
-        "RandomX": 273326509,
-        "RandomY": 272969173,
-        "RandomZ": 2659373485,
-        "StartTime": 3000.0,
-        "Objects": [{
-            "StartTime": 3000.0,
-            "EndTime": 4000.0,
-            "Column": 2
-        }]
-    }, {
-        "RandomW": 4073554232,
-        "RandomX": 272969173,
-        "RandomY": 2659373485,
-        "RandomZ": 3083803045,
-        "StartTime": 4500.0,
-        "Objects": [{
-            "StartTime": 4500.0,
-            "EndTime": 5500.0,
-            "Column": 4
-        }]
-    }, {
-        "RandomW": 3420401969,
-        "RandomX": 2659373485,
-        "RandomY": 3083803045,
-        "RandomZ": 4073554232,
-        "StartTime": 6000.0,
-        "Objects": [{
-            "StartTime": 6000.0,
-            "EndTime": 6500.0,
-            "Column": 2
-        }]
-    }, {
-        "RandomW": 1129881182,
-        "RandomX": 3083803045,
-        "RandomY": 4073554232,
-        "RandomZ": 3420401969,
-        "StartTime": 7000.0,
-        "Objects": [{
-            "StartTime": 7000.0,
-            "EndTime": 8000.0,
-            "Column": 2
-        }]
-    }, {
-        "RandomW": 315568458,
-        "RandomX": 3420401969,
-        "RandomY": 1129881182,
-        "RandomZ": 2358617505,
-        "StartTime": 8500.0,
-        "Objects": [{
-            "StartTime": 8500.0,
-            "EndTime": 11000.0,
-            "Column": 0
-        }]
-    }, {
-        "RandomW": 548134043,
-        "RandomX": 1129881182,
-        "RandomY": 2358617505,
-        "RandomZ": 315568458,
-        "StartTime": 11500.0,
-        "Objects": [{
-            "StartTime": 11500.0,
-            "EndTime": 12000.0,
-            "Column": 1
-        }]
-    }, {
-        "RandomW": 3979422122,
-        "RandomX": 548134043,
-        "RandomY": 2810584254,
-        "RandomZ": 2250186050,
-        "StartTime": 12500.0,
-        "Objects": [{
-            "StartTime": 12500.0,
-            "EndTime": 16500.0,
-            "Column": 4
-        }]
-    }, {
-        "RandomW": 2466283411,
-        "RandomX": 2810584254,
-        "RandomY": 2250186050,
-        "RandomZ": 3979422122,
-        "StartTime": 17000.0,
-        "Objects": [{
-            "StartTime": 17000.0,
-            "EndTime": 18000.0,
-            "Column": 2
-        }]
-    }, {
-        "RandomW": 83157665,
-        "RandomX": 2250186050,
-        "RandomY": 3979422122,
-        "RandomZ": 2466283411,
-        "StartTime": 18500.0,
-        "Objects": [{
-            "StartTime": 18500.0,
-            "EndTime": 19450.0,
-            "Column": 0
-        }]
-    }, {
-        "RandomW": 2383087700,
-        "RandomX": 83157665,
-        "RandomY": 2055150192,
-        "RandomZ": 510071020,
-        "StartTime": 19875.0,
-        "Objects": [{
-            "StartTime": 19875.0,
-            "EndTime": 23875.0,
-            "Column": 1
-        }, {
-            "StartTime": 19875.0,
-            "EndTime": 23875.0,
-            "Column": 0
-        }]
-    }]
+  "Mappings": [
+    {
+      "RandomW": 2659373485,
+      "RandomX": 3579807591,
+      "RandomY": 273326509,
+      "RandomZ": 272969173,
+      "StartTime": 500.0,
+      "Objects": [
+        {
+          "StartTime": 500.0,
+          "EndTime": 2500.0,
+          "Column": 0
+        },
+        {
+          "StartTime": 1500.0,
+          "EndTime": 2500.0,
+          "Column": 1
+        }
+      ]
+    },
+    {
+      "RandomW": 3083803045,
+      "RandomX": 273326509,
+      "RandomY": 272969173,
+      "RandomZ": 2659373485,
+      "StartTime": 3000.0,
+      "Objects": [
+        {
+          "StartTime": 3000.0,
+          "EndTime": 4000.0,
+          "Column": 2
+        }
+      ]
+    },
+    {
+      "RandomW": 4073554232,
+      "RandomX": 272969173,
+      "RandomY": 2659373485,
+      "RandomZ": 3083803045,
+      "StartTime": 4500.0,
+      "Objects": [
+        {
+          "StartTime": 4500.0,
+          "EndTime": 5500.0,
+          "Column": 4
+        }
+      ]
+    },
+    {
+      "RandomW": 3420401969,
+      "RandomX": 2659373485,
+      "RandomY": 3083803045,
+      "RandomZ": 4073554232,
+      "StartTime": 6000.0,
+      "Objects": [
+        {
+          "StartTime": 6000.0,
+          "EndTime": 6500.0,
+          "Column": 2
+        }
+      ]
+    },
+    {
+      "RandomW": 1129881182,
+      "RandomX": 3083803045,
+      "RandomY": 4073554232,
+      "RandomZ": 3420401969,
+      "StartTime": 7000.0,
+      "Objects": [
+        {
+          "StartTime": 7000.0,
+          "EndTime": 8000.0,
+          "Column": 2
+        }
+      ]
+    },
+    {
+      "RandomW": 315568458,
+      "RandomX": 3420401969,
+      "RandomY": 1129881182,
+      "RandomZ": 2358617505,
+      "StartTime": 8500.0,
+      "Objects": [
+        {
+          "StartTime": 8500.0,
+          "EndTime": 11000.0,
+          "Column": 0
+        }
+      ]
+    },
+    {
+      "RandomW": 548134043,
+      "RandomX": 1129881182,
+      "RandomY": 2358617505,
+      "RandomZ": 315568458,
+      "StartTime": 11500.0,
+      "Objects": [
+        {
+          "StartTime": 11500.0,
+          "EndTime": 12000.0,
+          "Column": 1
+        }
+      ]
+    },
+    {
+      "RandomW": 3979422122,
+      "RandomX": 548134043,
+      "RandomY": 2810584254,
+      "RandomZ": 2250186050,
+      "StartTime": 12500.0,
+      "Objects": [
+        {
+          "StartTime": 12500.0,
+          "EndTime": 16500.0,
+          "Column": 4
+        }
+      ]
+    },
+    {
+      "RandomW": 2466283411,
+      "RandomX": 2810584254,
+      "RandomY": 2250186050,
+      "RandomZ": 3979422122,
+      "StartTime": 17000.0,
+      "Objects": [
+        {
+          "StartTime": 17000.0,
+          "EndTime": 18000.0,
+          "Column": 2
+        }
+      ]
+    },
+    {
+      "RandomW": 83157665,
+      "RandomX": 2250186050,
+      "RandomY": 3979422122,
+      "RandomZ": 2466283411,
+      "StartTime": 18500.0,
+      "Objects": [
+        {
+          "StartTime": 18500.0,
+          "EndTime": 19450.0,
+          "Column": 0
+        }
+      ]
+    },
+    {
+      "RandomW": 2383087700,
+      "RandomX": 83157665,
+      "RandomY": 2055150192,
+      "RandomZ": 510071020,
+      "StartTime": 19875.0,
+      "Objects": [
+        {
+          "StartTime": 19875.0,
+          "EndTime": 23875.0,
+          "Column": 1
+        },
+        {
+          "StartTime": 19875.0,
+          "EndTime": 23875.0,
+          "Column": 0
+        }
+      ]
+    }
+  ]
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json
index 229760cd1c..400ce9cc1c 100644
--- a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/zero-length-slider-expected-conversion.json
@@ -1,14 +1,18 @@
 {
-    "Mappings": [{
-        "RandomW": 3083084786,
-        "RandomX": 273326509,
-        "RandomY": 273553282,
-        "RandomZ": 2659838971,
-        "StartTime": 4836,
-        "Objects": [{
-            "StartTime": 4836,
-            "EndTime": 4836,
-            "Column": 0
-        }]
-    }]
+  "Mappings": [
+    {
+      "RandomW": 3083084786,
+      "RandomX": 273326509,
+      "RandomY": 273553282,
+      "RandomZ": 2659838971,
+      "StartTime": 4836.0,
+      "Objects": [
+        {
+          "StartTime": 4836.0,
+          "EndTime": 4836.0,
+          "Column": 0
+        }
+      ]
+    }
+  ]
 }
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs
index e04b44311e..77f93b4ef9 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs
@@ -52,18 +52,14 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <returns>The column.</returns>
         protected int GetColumn(float position, bool allowSpecial = false)
         {
-            // Casts to doubles are present here because, although code is originally written as float division,
-            // the division actually appears to occur on doubles in osu!stable. This is likely a result of
-            // differences in optimisations between .NET versions due to the presence of the double parameter type of Math.Floor().
-
             if (allowSpecial && TotalColumns == 8)
             {
                 const float local_x_divisor = 512f / 7;
-                return Math.Clamp((int)Math.Floor((double)position / local_x_divisor), 0, 6) + 1;
+                return Math.Clamp((int)MathF.Floor(position / local_x_divisor), 0, 6) + 1;
             }
 
             float localXDivisor = 512f / TotalColumns;
-            return Math.Clamp((int)Math.Floor((double)position / localXDivisor), 0, TotalColumns - 1);
+            return Math.Clamp((int)MathF.Floor(position / localXDivisor), 0, TotalColumns - 1);
         }
 
         /// <summary>

From 9a83d7be81d7f2d2115ab76283be02c0806525f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Dec 2023 09:27:12 +0100
Subject: [PATCH 1909/2296] Ensure that `SoloScoreInfo` serialisation result
 does not contain interface members

---
 .../TestSoloScoreInfoJsonSerialization.cs     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Tests/Online/TestSoloScoreInfoJsonSerialization.cs b/osu.Game.Tests/Online/TestSoloScoreInfoJsonSerialization.cs
index 19bc96c677..509768530f 100644
--- a/osu.Game.Tests/Online/TestSoloScoreInfoJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestSoloScoreInfoJsonSerialization.cs
@@ -5,6 +5,7 @@ using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Game.IO.Serialization;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Scoring;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Online
@@ -36,5 +37,31 @@ namespace osu.Game.Tests.Online
             Assert.That(serialised, Contains.Substring("large_tick_hit"));
             Assert.That(serialised, Contains.Substring("\"rank\":\"S\""));
         }
+
+        /// <summary>
+        /// Ensures that the proxy implementations of <see cref="IScoreInfo"/> by <see cref="SoloScoreInfo"/>
+        /// do not get serialised to JSON.
+        /// </summary>
+        [Test]
+        public void TestScoreSerialisationSkipsInterfaceMembers()
+        {
+            var score = SoloScoreInfo.ForSubmission(TestResources.CreateTestScoreInfo());
+
+            string[] variants =
+            {
+                JsonConvert.SerializeObject(score),
+                score.Serialize()
+            };
+
+            foreach (string serialised in variants)
+            {
+                Assert.That(serialised, Does.Not.Contain("\"online_id\":"));
+                Assert.That(serialised, Does.Not.Contain("\"user\":"));
+                Assert.That(serialised, Does.Not.Contain("\"date\":"));
+                Assert.That(serialised, Does.Not.Contain("\"legacy_online_id\":"));
+                Assert.That(serialised, Does.Not.Contain("\"beatmap\":"));
+                Assert.That(serialised, Does.Not.Contain("\"ruleset\":"));
+            }
+        }
     }
 }

From 81fe15f2882e54d0041538c1af5b16a1748b347f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 9 Dec 2023 15:39:54 +0900
Subject: [PATCH 1910/2296] Fix osu!mania converted key count edge cases

---
 .../ManiaBeatmapConversionTest.cs             |   1 +
 .../Beatmaps/1450162-expected-conversion.json |   1 +
 .../Resources/Testing/Beatmaps/1450162.osu    | 297 ++++++++++++++++++
 .../Beatmaps/ManiaBeatmapConverter.cs         |   5 +-
 4 files changed, 303 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/1450162-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/1450162.osu

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
index 435d5e737e..609c2e8953 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         [TestCase("zero-length-slider")]
         [TestCase("20544")]
         [TestCase("100374")]
+        [TestCase("1450162")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/1450162-expected-conversion.json b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/1450162-expected-conversion.json
new file mode 100644
index 0000000000..4981951267
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/1450162-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"RandomW":2659430625,"RandomX":3579807591,"RandomY":273326509,"RandomZ":272911513,"StartTime":1107.0,"Objects":[{"StartTime":1107.0,"EndTime":1838.0,"Column":1}]},{"RandomW":4073513076,"RandomX":272911513,"RandomY":2659430625,"RandomZ":3083761897,"StartTime":2570.0,"Objects":[{"StartTime":2570.0,"EndTime":2935.0,"Column":6}]},{"RandomW":1129971314,"RandomX":3083761897,"RandomY":4073513076,"RandomZ":3235797552,"StartTime":3302.0,"Objects":[{"StartTime":3302.0,"EndTime":3667.0,"Column":3}]},{"RandomW":315510790,"RandomX":3235797552,"RandomY":1129971314,"RandomZ":2274676672,"StartTime":4033.0,"Objects":[{"StartTime":4033.0,"EndTime":4764.0,"Column":1}]},{"RandomW":2899658679,"RandomX":2274676672,"RandomY":315510790,"RandomZ":552830901,"StartTime":5497.0,"Objects":[{"StartTime":5497.0,"EndTime":5862.0,"Column":2}]},{"RandomW":3979364583,"RandomX":552830901,"RandomY":2899658679,"RandomZ":2367584034,"StartTime":6228.0,"Objects":[{"StartTime":6228.0,"EndTime":6593.0,"Column":5}]},{"RandomW":1470933435,"RandomX":2367584034,"RandomY":3979364583,"RandomZ":1363326171,"StartTime":6960.0,"Objects":[{"StartTime":6960.0,"EndTime":7142.0,"Column":4}]},{"RandomW":695558923,"RandomX":3979364583,"RandomY":1363326171,"RandomZ":1470933435,"StartTime":7326.0,"Objects":[{"StartTime":7326.0,"EndTime":7326.0,"Column":2},{"StartTime":7326.0,"EndTime":7326.0,"Column":3}]},{"RandomW":47047112,"RandomX":1470933435,"RandomY":695558923,"RandomZ":1181573554,"StartTime":7509.0,"Objects":[{"StartTime":7509.0,"EndTime":7691.0,"Column":0}]},{"RandomW":807301467,"RandomX":695558923,"RandomY":1181573554,"RandomZ":47047112,"StartTime":7875.0,"Objects":[{"StartTime":7875.0,"EndTime":7875.0,"Column":5}]},{"RandomW":2679940725,"RandomX":47047112,"RandomY":807301467,"RandomZ":3002147176,"StartTime":8058.0,"Objects":[{"StartTime":8058.0,"EndTime":8240.0,"Column":1}]},{"RandomW":176449914,"RandomX":2679940725,"RandomY":4061321195,"RandomZ":826668123,"StartTime":8424.0,"Objects":[{"StartTime":8424.0,"EndTime":8789.0,"Column":2},{"StartTime":8424.0,"EndTime":8789.0,"Column":0}]},{"RandomW":3697485076,"RandomX":347653435,"RandomY":172035291,"RandomZ":598178640,"StartTime":8972.0,"Objects":[{"StartTime":8972.0,"EndTime":9154.0,"Column":1},{"StartTime":8972.0,"EndTime":9154.0,"Column":5}]},{"RandomW":237023934,"RandomX":172035291,"RandomY":598178640,"RandomZ":3697485076,"StartTime":9338.0,"Objects":[{"StartTime":9338.0,"EndTime":9338.0,"Column":4},{"StartTime":9338.0,"EndTime":9338.0,"Column":5}]},{"RandomW":201670773,"RandomX":598178640,"RandomY":3697485076,"RandomZ":237023934,"StartTime":9521.0,"Objects":[{"StartTime":9521.0,"EndTime":9521.0,"Column":3}]},{"RandomW":3522038595,"RandomX":237023934,"RandomY":201670773,"RandomZ":341886814,"StartTime":9887.0,"Objects":[{"StartTime":9887.0,"EndTime":10069.0,"Column":4}]},{"RandomW":3662734978,"RandomX":201670773,"RandomY":341886814,"RandomZ":3522038595,"StartTime":10253.0,"Objects":[{"StartTime":10253.0,"EndTime":10253.0,"Column":3},{"StartTime":10253.0,"EndTime":10253.0,"Column":4}]},{"RandomW":4235203413,"RandomX":341886814,"RandomY":3522038595,"RandomZ":3662734978,"StartTime":10436.0,"Objects":[{"StartTime":10436.0,"EndTime":10436.0,"Column":2},{"StartTime":10436.0,"EndTime":10436.0,"Column":3}]},{"RandomW":3996672434,"RandomX":3522038595,"RandomY":3662734978,"RandomZ":4235203413,"StartTime":10619.0,"Objects":[{"StartTime":10619.0,"EndTime":10619.0,"Column":1},{"StartTime":10619.0,"EndTime":10619.0,"Column":2}]},{"RandomW":1328405285,"RandomX":3662734978,"RandomY":4235203413,"RandomZ":3996672434,"StartTime":10802.0,"Objects":[{"StartTime":10802.0,"EndTime":10802.0,"Column":0},{"StartTime":10802.0,"EndTime":10802.0,"Column":1}]},{"RandomW":303317172,"RandomX":4235203413,"RandomY":3996672434,"RandomZ":1328405285,"StartTime":10985.0,"Objects":[{"StartTime":10985.0,"EndTime":10985.0,"Column":1},{"StartTime":10985.0,"EndTime":10985.0,"Column":2}]},{"RandomW":1854018328,"RandomX":3996672434,"RandomY":1328405285,"RandomZ":303317172,"StartTime":11167.0,"Objects":[{"StartTime":11167.0,"EndTime":11167.0,"Column":2},{"StartTime":11167.0,"EndTime":11167.0,"Column":3}]},{"RandomW":1134221963,"RandomX":1328405285,"RandomY":303317172,"RandomZ":1854018328,"StartTime":12814.0,"Objects":[{"StartTime":12814.0,"EndTime":12814.0,"Column":1}]},{"RandomW":2894789541,"RandomX":1134221963,"RandomY":1649399086,"RandomZ":3538823219,"StartTime":13180.0,"Objects":[{"StartTime":13180.0,"EndTime":13362.0,"Column":4},{"StartTime":13180.0,"EndTime":13362.0,"Column":2}]},{"RandomW":2259123626,"RandomX":2894789541,"RandomY":961618493,"RandomZ":631989916,"StartTime":13546.0,"Objects":[{"StartTime":13546.0,"EndTime":13728.0,"Column":0}]},{"RandomW":3004853499,"RandomX":2259123626,"RandomY":2097932552,"RandomZ":3455806558,"StartTime":13911.0,"Objects":[{"StartTime":13911.0,"EndTime":14093.0,"Column":4},{"StartTime":13911.0,"EndTime":14093.0,"Column":2}]},{"RandomW":1511929919,"RandomX":250420511,"RandomY":747435619,"RandomZ":973338160,"StartTime":14277.0,"Objects":[{"StartTime":14277.0,"EndTime":14277.0,"Column":5},{"StartTime":14277.0,"EndTime":14277.0,"Column":6},{"StartTime":14459.0,"EndTime":14459.0,"Column":2},{"StartTime":14459.0,"EndTime":14459.0,"Column":3},{"StartTime":14641.0,"EndTime":14641.0,"Column":3},{"StartTime":14641.0,"EndTime":14641.0,"Column":4}]},{"RandomW":1997079940,"RandomX":973338160,"RandomY":1511929919,"RandomZ":1014879110,"StartTime":14826.0,"Objects":[{"StartTime":14826.0,"EndTime":15191.0,"Column":6}]},{"RandomW":735692759,"RandomX":1997079940,"RandomY":1386139427,"RandomZ":4192918159,"StartTime":15375.0,"Objects":[{"StartTime":15375.0,"EndTime":15557.0,"Column":2}]},{"RandomW":348373517,"RandomX":1386139427,"RandomY":4192918159,"RandomZ":735692759,"StartTime":15741.0,"Objects":[{"StartTime":15741.0,"EndTime":15741.0,"Column":5},{"StartTime":15741.0,"EndTime":15741.0,"Column":6}]},{"RandomW":521239132,"RandomX":735692759,"RandomY":348373517,"RandomZ":2961240161,"StartTime":16106.0,"Objects":[{"StartTime":16106.0,"EndTime":16288.0,"Column":1}]},{"RandomW":1199465075,"RandomX":521239132,"RandomY":4195606806,"RandomZ":4039804915,"StartTime":16472.0,"Objects":[{"StartTime":16472.0,"EndTime":16654.0,"Column":6},{"StartTime":16472.0,"EndTime":16654.0,"Column":3}]},{"RandomW":3059180408,"RandomX":4039804915,"RandomY":1199465075,"RandomZ":3542692698,"StartTime":16838.0,"Objects":[{"StartTime":16838.0,"EndTime":17020.0,"Column":2}]},{"RandomW":834119344,"RandomX":302423902,"RandomY":2799635095,"RandomZ":1022775029,"StartTime":17204.0,"Objects":[{"StartTime":17204.0,"EndTime":17204.0,"Column":4},{"StartTime":17204.0,"EndTime":17204.0,"Column":5},{"StartTime":17386.0,"EndTime":17386.0,"Column":2},{"StartTime":17386.0,"EndTime":17386.0,"Column":3},{"StartTime":17568.0,"EndTime":17568.0,"Column":3},{"StartTime":17568.0,"EndTime":17568.0,"Column":4}]},{"RandomW":1236797567,"RandomX":1022775029,"RandomY":834119344,"RandomZ":393032631,"StartTime":17753.0,"Objects":[{"StartTime":17753.0,"EndTime":18118.0,"Column":4}]},{"RandomW":892840048,"RandomX":1236797567,"RandomY":3350685275,"RandomZ":1270471227,"StartTime":18302.0,"Objects":[{"StartTime":18302.0,"EndTime":18484.0,"Column":2}]},{"RandomW":3233581364,"RandomX":1270471227,"RandomY":892840048,"RandomZ":3158680921,"StartTime":18667.0,"Objects":[{"StartTime":18667.0,"EndTime":19032.0,"Column":3}]},{"RandomW":1163000602,"RandomX":892840048,"RandomY":3158680921,"RandomZ":3233581364,"StartTime":19216.0,"Objects":[{"StartTime":19216.0,"EndTime":19216.0,"Column":2}]},{"RandomW":1548989545,"RandomX":3233581364,"RandomY":1163000602,"RandomZ":3450712040,"StartTime":19399.0,"Objects":[{"StartTime":19399.0,"EndTime":19581.0,"Column":5}]},{"RandomW":313779584,"RandomX":1548989545,"RandomY":2021811198,"RandomZ":2999045855,"StartTime":19765.0,"Objects":[{"StartTime":19765.0,"EndTime":19947.0,"Column":2},{"StartTime":19765.0,"EndTime":19947.0,"Column":1}]},{"RandomW":3548572483,"RandomX":2021811198,"RandomY":2999045855,"RandomZ":313779584,"StartTime":20131.0,"Objects":[{"StartTime":20131.0,"EndTime":20131.0,"Column":6}]},{"RandomW":75459001,"RandomX":313779584,"RandomY":3548572483,"RandomZ":3094675294,"StartTime":20314.0,"Objects":[{"StartTime":20314.0,"EndTime":20496.0,"Column":0}]},{"RandomW":1299261902,"RandomX":3094675294,"RandomY":75459001,"RandomZ":2305626963,"StartTime":20680.0,"Objects":[{"StartTime":20680.0,"EndTime":21045.0,"Column":4}]},{"RandomW":2905421941,"RandomX":2305626963,"RandomY":1299261902,"RandomZ":1390453041,"StartTime":21228.0,"Objects":[{"StartTime":21228.0,"EndTime":21410.0,"Column":2}]},{"RandomW":2294300184,"RandomX":1390453041,"RandomY":2905421941,"RandomZ":1278955784,"StartTime":21594.0,"Objects":[{"StartTime":21594.0,"EndTime":22325.0,"Column":6},{"StartTime":21594.0,"EndTime":21594.0,"Column":4},{"StartTime":21959.0,"EndTime":21959.0,"Column":4},{"StartTime":22324.0,"EndTime":22324.0,"Column":4}]},{"RandomW":3749637912,"RandomX":2905421941,"RandomY":1278955784,"RandomZ":2294300184,"StartTime":22509.0,"Objects":[{"StartTime":22509.0,"EndTime":22509.0,"Column":6},{"StartTime":22509.0,"EndTime":22509.0,"Column":0}]},{"RandomW":753327495,"RandomX":458525202,"RandomY":2373004129,"RandomZ":80278569,"StartTime":22692.0,"Objects":[{"StartTime":22692.0,"EndTime":22874.0,"Column":2}]},{"RandomW":3562609217,"RandomX":753327495,"RandomY":2472396307,"RandomZ":2540952890,"StartTime":23058.0,"Objects":[{"StartTime":23058.0,"EndTime":23058.0,"Column":1},{"StartTime":23058.0,"EndTime":23058.0,"Column":5}]},{"RandomW":3562609217,"RandomX":753327495,"RandomY":2472396307,"RandomZ":2540952890,"StartTime":23241.0,"Objects":[{"StartTime":23241.0,"EndTime":23241.0,"Column":5},{"StartTime":23241.0,"EndTime":23241.0,"Column":1}]},{"RandomW":3009004844,"RandomX":2540952890,"RandomY":3562609217,"RandomZ":3460951976,"StartTime":23606.0,"Objects":[{"StartTime":23606.0,"EndTime":23971.0,"Column":2}]},{"RandomW":1524995266,"RandomX":3133817968,"RandomY":2791164538,"RandomZ":669533622,"StartTime":24155.0,"Objects":[{"StartTime":24155.0,"EndTime":24337.0,"Column":4}]},{"RandomW":2667749121,"RandomX":1524995266,"RandomY":3001332266,"RandomZ":4204965910,"StartTime":24521.0,"Objects":[{"StartTime":24521.0,"EndTime":24521.0,"Column":0},{"StartTime":24521.0,"EndTime":24521.0,"Column":6}]},{"RandomW":1230014889,"RandomX":2127937865,"RandomY":2434329733,"RandomZ":443126576,"StartTime":24704.0,"Objects":[{"StartTime":24704.0,"EndTime":25069.0,"Column":1},{"StartTime":24704.0,"EndTime":25069.0,"Column":4}]},{"RandomW":1409501366,"RandomX":2573194819,"RandomY":3480583465,"RandomZ":2580776932,"StartTime":25253.0,"Objects":[{"StartTime":25253.0,"EndTime":25253.0,"Column":0},{"StartTime":25253.0,"EndTime":25253.0,"Column":1},{"StartTime":25435.0,"EndTime":25435.0,"Column":4},{"StartTime":25435.0,"EndTime":25435.0,"Column":5},{"StartTime":25617.0,"EndTime":25617.0,"Column":1},{"StartTime":25617.0,"EndTime":25617.0,"Column":2}]},{"RandomW":864641467,"RandomX":3480583465,"RandomY":2580776932,"RandomZ":1409501366,"StartTime":25802.0,"Objects":[{"StartTime":25802.0,"EndTime":25802.0,"Column":1}]},{"RandomW":1467076310,"RandomX":2580776932,"RandomY":1409501366,"RandomZ":864641467,"StartTime":25985.0,"Objects":[{"StartTime":25985.0,"EndTime":25985.0,"Column":2}]},{"RandomW":479214438,"RandomX":864641467,"RandomY":1467076310,"RandomZ":1385729915,"StartTime":26167.0,"Objects":[{"StartTime":26167.0,"EndTime":26532.0,"Column":1}]},{"RandomW":3054605916,"RandomX":1684801014,"RandomY":3182588115,"RandomZ":734516041,"StartTime":26716.0,"Objects":[{"StartTime":26716.0,"EndTime":26716.0,"Column":4},{"StartTime":26716.0,"EndTime":26716.0,"Column":2},{"StartTime":26898.0,"EndTime":26898.0,"Column":3},{"StartTime":26898.0,"EndTime":26898.0,"Column":1},{"StartTime":27080.0,"EndTime":27080.0,"Column":2},{"StartTime":27080.0,"EndTime":27080.0,"Column":6}]},{"RandomW":2992010973,"RandomX":3182588115,"RandomY":734516041,"RandomZ":3054605916,"StartTime":27265.0,"Objects":[{"StartTime":27265.0,"EndTime":27265.0,"Column":2}]},{"RandomW":2622274732,"RandomX":734516041,"RandomY":3054605916,"RandomZ":2992010973,"StartTime":27448.0,"Objects":[{"StartTime":27448.0,"EndTime":27448.0,"Column":3}]},{"RandomW":3013455357,"RandomX":2992010973,"RandomY":2622274732,"RandomZ":2298767863,"StartTime":27631.0,"Objects":[{"StartTime":27631.0,"EndTime":27996.0,"Column":2}]},{"RandomW":2994521549,"RandomX":2622274732,"RandomY":2298767863,"RandomZ":3013455357,"StartTime":28180.0,"Objects":[{"StartTime":28180.0,"EndTime":28180.0,"Column":5}]},{"RandomW":3949426364,"RandomX":1261217522,"RandomY":3788322225,"RandomZ":3210845744,"StartTime":28363.0,"Objects":[{"StartTime":28363.0,"EndTime":28363.0,"Column":5},{"StartTime":28363.0,"EndTime":28363.0,"Column":2},{"StartTime":28545.0,"EndTime":28545.0,"Column":5},{"StartTime":28545.0,"EndTime":28545.0,"Column":2},{"StartTime":28727.0,"EndTime":28727.0,"Column":3},{"StartTime":28727.0,"EndTime":28727.0,"Column":6}]},{"RandomW":1304069042,"RandomX":3210845744,"RandomY":3949426364,"RandomZ":3310503444,"StartTime":28911.0,"Objects":[{"StartTime":28911.0,"EndTime":29276.0,"Column":4}]},{"RandomW":781934546,"RandomX":3310503444,"RandomY":1304069042,"RandomZ":4271440939,"StartTime":29460.0,"Objects":[{"StartTime":29460.0,"EndTime":29460.0,"Column":6},{"StartTime":29460.0,"EndTime":29460.0,"Column":2}]},{"RandomW":3592330498,"RandomX":781934546,"RandomY":2041503475,"RandomZ":3767559527,"StartTime":29643.0,"Objects":[{"StartTime":29643.0,"EndTime":30008.0,"Column":5},{"StartTime":29643.0,"EndTime":30008.0,"Column":4}]},{"RandomW":579808732,"RandomX":2041503475,"RandomY":3767559527,"RandomZ":3592330498,"StartTime":30192.0,"Objects":[{"StartTime":30192.0,"EndTime":30192.0,"Column":4}]},{"RandomW":769209912,"RandomX":3767559527,"RandomY":3592330498,"RandomZ":579808732,"StartTime":30375.0,"Objects":[{"StartTime":30375.0,"EndTime":30375.0,"Column":4}]},{"RandomW":1825941494,"RandomX":579808732,"RandomY":769209912,"RandomZ":1308743097,"StartTime":30558.0,"Objects":[{"StartTime":30558.0,"EndTime":30923.0,"Column":5}]},{"RandomW":1378114054,"RandomX":930055805,"RandomY":3554877022,"RandomZ":2467280262,"StartTime":31106.0,"Objects":[{"StartTime":31106.0,"EndTime":31106.0,"Column":2},{"StartTime":31106.0,"EndTime":31106.0,"Column":5},{"StartTime":31288.0,"EndTime":31288.0,"Column":4},{"StartTime":31288.0,"EndTime":31288.0,"Column":1},{"StartTime":31470.0,"EndTime":31470.0,"Column":1},{"StartTime":31470.0,"EndTime":31470.0,"Column":4}]},{"RandomW":422797905,"RandomX":3554877022,"RandomY":2467280262,"RandomZ":1378114054,"StartTime":31655.0,"Objects":[{"StartTime":31655.0,"EndTime":31655.0,"Column":1}]},{"RandomW":3538525895,"RandomX":2467280262,"RandomY":1378114054,"RandomZ":422797905,"StartTime":31838.0,"Objects":[{"StartTime":31838.0,"EndTime":31838.0,"Column":0}]},{"RandomW":1277180769,"RandomX":422797905,"RandomY":3538525895,"RandomZ":1017422489,"StartTime":32021.0,"Objects":[{"StartTime":32021.0,"EndTime":32386.0,"Column":4}]},{"RandomW":69027963,"RandomX":3464755550,"RandomY":1342331375,"RandomZ":1235978524,"StartTime":32570.0,"Objects":[{"StartTime":32570.0,"EndTime":32752.0,"Column":0}]},{"RandomW":3582265519,"RandomX":1342331375,"RandomY":1235978524,"RandomZ":69027963,"StartTime":32936.0,"Objects":[{"StartTime":32936.0,"EndTime":32936.0,"Column":2},{"StartTime":32936.0,"EndTime":32936.0,"Column":3}]},{"RandomW":2197579333,"RandomX":69027963,"RandomY":3582265519,"RandomZ":2534080209,"StartTime":33302.0,"Objects":[{"StartTime":33302.0,"EndTime":33667.0,"Column":0}]},{"RandomW":820123404,"RandomX":1816967409,"RandomY":2440103335,"RandomZ":1364041006,"StartTime":33850.0,"Objects":[{"StartTime":33850.0,"EndTime":34215.0,"Column":4},{"StartTime":33850.0,"EndTime":34215.0,"Column":2}]},{"RandomW":962636497,"RandomX":2440103335,"RandomY":1364041006,"RandomZ":820123404,"StartTime":34399.0,"Objects":[{"StartTime":34399.0,"EndTime":34399.0,"Column":3},{"StartTime":34399.0,"EndTime":34399.0,"Column":4}]},{"RandomW":539348071,"RandomX":1364041006,"RandomY":820123404,"RandomZ":962636497,"StartTime":34582.0,"Objects":[{"StartTime":34582.0,"EndTime":34582.0,"Column":4}]},{"RandomW":1036431212,"RandomX":962636497,"RandomY":539348071,"RandomZ":498893216,"StartTime":34765.0,"Objects":[{"StartTime":34765.0,"EndTime":34947.0,"Column":3}]},{"RandomW":30194727,"RandomX":539348071,"RandomY":498893216,"RandomZ":1036431212,"StartTime":35131.0,"Objects":[{"StartTime":35131.0,"EndTime":35131.0,"Column":4},{"StartTime":35131.0,"EndTime":35131.0,"Column":5}]},{"RandomW":4140580700,"RandomX":1036431212,"RandomY":30194727,"RandomZ":260312717,"StartTime":35314.0,"Objects":[{"StartTime":35314.0,"EndTime":35496.0,"Column":6}]},{"RandomW":4269364006,"RandomX":30194727,"RandomY":260312717,"RandomZ":4140580700,"StartTime":35680.0,"Objects":[{"StartTime":35680.0,"EndTime":35680.0,"Column":5},{"StartTime":35680.0,"EndTime":35680.0,"Column":6}]},{"RandomW":3052364007,"RandomX":4140580700,"RandomY":4269364006,"RandomZ":2586895690,"StartTime":35863.0,"Objects":[{"StartTime":35863.0,"EndTime":36045.0,"Column":2}]},{"RandomW":575578073,"RandomX":4269364006,"RandomY":2586895690,"RandomZ":3052364007,"StartTime":36228.0,"Objects":[{"StartTime":36228.0,"EndTime":36228.0,"Column":4}]},{"RandomW":379197653,"RandomX":2586895690,"RandomY":3052364007,"RandomZ":575578073,"StartTime":36411.0,"Objects":[{"StartTime":36411.0,"EndTime":36411.0,"Column":3}]},{"RandomW":2472409868,"RandomX":379197653,"RandomY":194885113,"RandomZ":3317367861,"StartTime":36594.0,"Objects":[{"StartTime":36594.0,"EndTime":36776.0,"Column":1}]},{"RandomW":3530386304,"RandomX":1439106306,"RandomY":3004383294,"RandomZ":2928959685,"StartTime":36960.0,"Objects":[{"StartTime":36960.0,"EndTime":36960.0,"Column":1},{"StartTime":36960.0,"EndTime":36960.0,"Column":5},{"StartTime":37142.0,"EndTime":37142.0,"Column":2},{"StartTime":37142.0,"EndTime":37142.0,"Column":6},{"StartTime":37324.0,"EndTime":37324.0,"Column":2},{"StartTime":37324.0,"EndTime":37324.0,"Column":6}]},{"RandomW":3220147162,"RandomX":3004383294,"RandomY":2928959685,"RandomZ":3530386304,"StartTime":37509.0,"Objects":[{"StartTime":37509.0,"EndTime":37509.0,"Column":2}]},{"RandomW":2530492073,"RandomX":2928959685,"RandomY":3530386304,"RandomZ":3220147162,"StartTime":37692.0,"Objects":[{"StartTime":37692.0,"EndTime":37692.0,"Column":1}]},{"RandomW":2605446910,"RandomX":3530386304,"RandomY":3220147162,"RandomZ":2530492073,"StartTime":37875.0,"Objects":[{"StartTime":37875.0,"EndTime":37875.0,"Column":2}]},{"RandomW":3786494373,"RandomX":2530492073,"RandomY":2605446910,"RandomZ":583253884,"StartTime":38058.0,"Objects":[{"StartTime":38058.0,"EndTime":38240.0,"Column":5}]},{"RandomW":1188028287,"RandomX":3601275468,"RandomY":312474208,"RandomZ":764976912,"StartTime":38424.0,"Objects":[{"StartTime":38424.0,"EndTime":38424.0,"Column":4},{"StartTime":38424.0,"EndTime":38424.0,"Column":2},{"StartTime":38606.0,"EndTime":38606.0,"Column":1},{"StartTime":38606.0,"EndTime":38606.0,"Column":5},{"StartTime":38788.0,"EndTime":38788.0,"Column":2},{"StartTime":38788.0,"EndTime":38788.0,"Column":6}]},{"RandomW":2824132752,"RandomX":312474208,"RandomY":764976912,"RandomZ":1188028287,"StartTime":38972.0,"Objects":[{"StartTime":38972.0,"EndTime":38972.0,"Column":3}]},{"RandomW":1173715712,"RandomX":764976912,"RandomY":1188028287,"RandomZ":2824132752,"StartTime":39155.0,"Objects":[{"StartTime":39155.0,"EndTime":39155.0,"Column":4}]},{"RandomW":2490370662,"RandomX":2824132752,"RandomY":1173715712,"RandomZ":2893810865,"StartTime":39338.0,"Objects":[{"StartTime":39338.0,"EndTime":39520.0,"Column":1}]},{"RandomW":1949144326,"RandomX":2893810865,"RandomY":2490370662,"RandomZ":2599342112,"StartTime":39704.0,"Objects":[{"StartTime":39704.0,"EndTime":40069.0,"Column":6}]},{"RandomW":743381221,"RandomX":2599342112,"RandomY":1949144326,"RandomZ":947390134,"StartTime":40253.0,"Objects":[{"StartTime":40253.0,"EndTime":40435.0,"Column":2}]},{"RandomW":3629226534,"RandomX":947390134,"RandomY":743381221,"RandomZ":3234636444,"StartTime":40619.0,"Objects":[{"StartTime":40619.0,"EndTime":40984.0,"Column":4}]},{"RandomW":551844396,"RandomX":743381221,"RandomY":3234636444,"RandomZ":3629226534,"StartTime":41167.0,"Objects":[{"StartTime":41167.0,"EndTime":41167.0,"Column":3}]},{"RandomW":2240897560,"RandomX":551844396,"RandomY":1949877989,"RandomZ":3510981308,"StartTime":41350.0,"Objects":[{"StartTime":41350.0,"EndTime":41532.0,"Column":4},{"StartTime":41350.0,"EndTime":41532.0,"Column":0}]},{"RandomW":874163267,"RandomX":3510981308,"RandomY":2240897560,"RandomZ":2259115420,"StartTime":41716.0,"Objects":[{"StartTime":41716.0,"EndTime":41898.0,"Column":2}]},{"RandomW":3476146382,"RandomX":2240897560,"RandomY":2259115420,"RandomZ":874163267,"StartTime":42082.0,"Objects":[{"StartTime":42082.0,"EndTime":42082.0,"Column":4}]},{"RandomW":2101943428,"RandomX":874163267,"RandomY":3476146382,"RandomZ":3250516626,"StartTime":42265.0,"Objects":[{"StartTime":42265.0,"EndTime":42447.0,"Column":6}]},{"RandomW":2630934490,"RandomX":3476146382,"RandomY":3250516626,"RandomZ":2101943428,"StartTime":42631.0,"Objects":[{"StartTime":42631.0,"EndTime":42631.0,"Column":4}]},{"RandomW":3294029476,"RandomX":3722838838,"RandomY":3959050362,"RandomZ":3731020989,"StartTime":42814.0,"Objects":[{"StartTime":42814.0,"EndTime":42814.0,"Column":6},{"StartTime":42814.0,"EndTime":42814.0,"Column":4},{"StartTime":42996.0,"EndTime":42996.0,"Column":5},{"StartTime":42996.0,"EndTime":42996.0,"Column":3},{"StartTime":43178.0,"EndTime":43178.0,"Column":5},{"StartTime":43178.0,"EndTime":43178.0,"Column":3}]},{"RandomW":692368043,"RandomX":3959050362,"RandomY":3731020989,"RandomZ":3294029476,"StartTime":43363.0,"Objects":[{"StartTime":43363.0,"EndTime":43363.0,"Column":5}]},{"RandomW":268717689,"RandomX":3731020989,"RandomY":3294029476,"RandomZ":692368043,"StartTime":43546.0,"Objects":[{"StartTime":43546.0,"EndTime":43546.0,"Column":4}]},{"RandomW":3628859376,"RandomX":3294029476,"RandomY":692368043,"RandomZ":268717689,"StartTime":43728.0,"Objects":[{"StartTime":43728.0,"EndTime":43728.0,"Column":3}]},{"RandomW":2810605489,"RandomX":268717689,"RandomY":3628859376,"RandomZ":2874884507,"StartTime":43911.0,"Objects":[{"StartTime":43911.0,"EndTime":44093.0,"Column":2}]},{"RandomW":317739913,"RandomX":2874884507,"RandomY":2810605489,"RandomZ":2512620222,"StartTime":44277.0,"Objects":[{"StartTime":44277.0,"EndTime":44459.0,"Column":1}]},{"RandomW":967116709,"RandomX":4156133369,"RandomY":2124840394,"RandomZ":3998877068,"StartTime":44643.0,"Objects":[{"StartTime":44643.0,"EndTime":44825.0,"Column":6},{"StartTime":44643.0,"EndTime":44825.0,"Column":3}]},{"RandomW":1331553411,"RandomX":3998877068,"RandomY":967116709,"RandomZ":39354671,"StartTime":45009.0,"Objects":[{"StartTime":45009.0,"EndTime":45374.0,"Column":4}]},{"RandomW":2785797100,"RandomX":1331553411,"RandomY":1897266817,"RandomZ":1620854569,"StartTime":45558.0,"Objects":[{"StartTime":45558.0,"EndTime":45923.0,"Column":5},{"StartTime":45558.0,"EndTime":45923.0,"Column":2}]},{"RandomW":114455122,"RandomX":1897266817,"RandomY":1620854569,"RandomZ":2785797100,"StartTime":46106.0,"Objects":[{"StartTime":46106.0,"EndTime":46106.0,"Column":3},{"StartTime":46106.0,"EndTime":46106.0,"Column":4}]},{"RandomW":3639436799,"RandomX":1620854569,"RandomY":2785797100,"RandomZ":114455122,"StartTime":46289.0,"Objects":[{"StartTime":46289.0,"EndTime":46289.0,"Column":4}]},{"RandomW":2239997850,"RandomX":1523242180,"RandomY":2737260786,"RandomZ":921894438,"StartTime":46472.0,"Objects":[{"StartTime":46472.0,"EndTime":46472.0,"Column":5},{"StartTime":46472.0,"EndTime":46472.0,"Column":3},{"StartTime":46654.0,"EndTime":46654.0,"Column":1},{"StartTime":46654.0,"EndTime":46654.0,"Column":5},{"StartTime":46836.0,"EndTime":46836.0,"Column":3},{"StartTime":46836.0,"EndTime":46836.0,"Column":1}]},{"RandomW":270173708,"RandomX":921894438,"RandomY":2239997850,"RandomZ":2313367322,"StartTime":47021.0,"Objects":[{"StartTime":47021.0,"EndTime":47386.0,"Column":0}]},{"RandomW":2981644775,"RandomX":2239997850,"RandomY":2313367322,"RandomZ":270173708,"StartTime":47570.0,"Objects":[{"StartTime":47570.0,"EndTime":47570.0,"Column":5}]},{"RandomW":698324797,"RandomX":2313367322,"RandomY":270173708,"RandomZ":2981644775,"StartTime":47936.0,"Objects":[{"StartTime":47936.0,"EndTime":47936.0,"Column":2}]},{"RandomW":2105158963,"RandomX":2981644775,"RandomY":698324797,"RandomZ":3113547499,"StartTime":48119.0,"Objects":[{"StartTime":48119.0,"EndTime":48667.0,"Column":6}]},{"RandomW":3675126935,"RandomX":3113547499,"RandomY":2105158963,"RandomZ":251569162,"StartTime":48850.0,"Objects":[{"StartTime":48850.0,"EndTime":49398.0,"Column":4}]},{"RandomW":1771033747,"RandomX":251569162,"RandomY":3675126935,"RandomZ":3308284595,"StartTime":49582.0,"Objects":[{"StartTime":49582.0,"EndTime":50130.0,"Column":5}]},{"RandomW":653741274,"RandomX":3308284595,"RandomY":1771033747,"RandomZ":2460676956,"StartTime":50314.0,"Objects":[{"StartTime":50314.0,"EndTime":50862.0,"Column":2}]},{"RandomW":3908591175,"RandomX":2011739264,"RandomY":2988284210,"RandomZ":772833847,"StartTime":51046.0,"Objects":[{"StartTime":51046.0,"EndTime":51594.0,"Column":6},{"StartTime":51046.0,"EndTime":51594.0,"Column":5}]},{"RandomW":782718603,"RandomX":3908591175,"RandomY":3666262892,"RandomZ":2215410951,"StartTime":51777.0,"Objects":[{"StartTime":51777.0,"EndTime":51959.0,"Column":0},{"StartTime":51777.0,"EndTime":51959.0,"Column":2}]},{"RandomW":3946166617,"RandomX":2215410951,"RandomY":782718603,"RandomZ":75972478,"StartTime":52143.0,"Objects":[{"StartTime":52143.0,"EndTime":52508.0,"Column":5}]},{"RandomW":204866941,"RandomX":782718603,"RandomY":75972478,"RandomZ":3946166617,"StartTime":52692.0,"Objects":[{"StartTime":52692.0,"EndTime":52692.0,"Column":3},{"StartTime":52692.0,"EndTime":52692.0,"Column":4}]},{"RandomW":628140489,"RandomX":3946166617,"RandomY":204866941,"RandomZ":405870974,"StartTime":52875.0,"Objects":[{"StartTime":52875.0,"EndTime":53240.0,"Column":2}]},{"RandomW":1325586396,"RandomX":628140489,"RandomY":1674126159,"RandomZ":3748192166,"StartTime":53424.0,"Objects":[{"StartTime":53424.0,"EndTime":53606.0,"Column":5},{"StartTime":53424.0,"EndTime":53606.0,"Column":4}]},{"RandomW":3311768819,"RandomX":3748192166,"RandomY":1325586396,"RandomZ":4019978516,"StartTime":53789.0,"Objects":[{"StartTime":53789.0,"EndTime":53789.0,"Column":4},{"StartTime":53789.0,"EndTime":53789.0,"Column":3}]},{"RandomW":1550448150,"RandomX":1325586396,"RandomY":4019978516,"RandomZ":3311768819,"StartTime":53972.0,"Objects":[{"StartTime":53972.0,"EndTime":53972.0,"Column":5}]},{"RandomW":169296756,"RandomX":3311768819,"RandomY":1550448150,"RandomZ":93091440,"StartTime":54155.0,"Objects":[{"StartTime":54155.0,"EndTime":54337.0,"Column":0}]},{"RandomW":2528106598,"RandomX":169296756,"RandomY":3812396233,"RandomZ":4042657790,"StartTime":54521.0,"Objects":[{"StartTime":54521.0,"EndTime":54703.0,"Column":6},{"StartTime":54521.0,"EndTime":54703.0,"Column":1}]},{"RandomW":1636289987,"RandomX":2528106598,"RandomY":638788900,"RandomZ":558809067,"StartTime":54887.0,"Objects":[{"StartTime":54887.0,"EndTime":55069.0,"Column":5}]},{"RandomW":914779004,"RandomX":558809067,"RandomY":1636289987,"RandomZ":2298692989,"StartTime":55253.0,"Objects":[{"StartTime":55253.0,"EndTime":55618.0,"Column":2}]},{"RandomW":1650670496,"RandomX":1636289987,"RandomY":2298692989,"RandomZ":914779004,"StartTime":55802.0,"Objects":[{"StartTime":55802.0,"EndTime":55802.0,"Column":2}]},{"RandomW":3497220679,"RandomX":1037372410,"RandomY":2926479760,"RandomZ":2880883370,"StartTime":55985.0,"Objects":[{"StartTime":55985.0,"EndTime":56350.0,"Column":4}]},{"RandomW":1164710248,"RandomX":2926479760,"RandomY":2880883370,"RandomZ":3497220679,"StartTime":56533.0,"Objects":[{"StartTime":56533.0,"EndTime":56533.0,"Column":5}]},{"RandomW":2188007582,"RandomX":3497220679,"RandomY":1164710248,"RandomZ":2677289564,"StartTime":56716.0,"Objects":[{"StartTime":56716.0,"EndTime":57081.0,"Column":0}]},{"RandomW":3363933174,"RandomX":1164710248,"RandomY":2677289564,"RandomZ":2188007582,"StartTime":57265.0,"Objects":[{"StartTime":57265.0,"EndTime":57265.0,"Column":3}]},{"RandomW":50721184,"RandomX":3363933174,"RandomY":3980600543,"RandomZ":3548114425,"StartTime":57448.0,"Objects":[{"StartTime":57448.0,"EndTime":57630.0,"Column":4},{"StartTime":57448.0,"EndTime":57630.0,"Column":0}]},{"RandomW":864990701,"RandomX":3548114425,"RandomY":50721184,"RandomZ":3340702733,"StartTime":57814.0,"Objects":[{"StartTime":57814.0,"EndTime":57996.0,"Column":2}]},{"RandomW":322108643,"RandomX":3340702733,"RandomY":864990701,"RandomZ":1066828352,"StartTime":58180.0,"Objects":[{"StartTime":58180.0,"EndTime":58362.0,"Column":1}]},{"RandomW":1792394322,"RandomX":1066828352,"RandomY":322108643,"RandomZ":749878772,"StartTime":58546.0,"Objects":[{"StartTime":58546.0,"EndTime":58728.0,"Column":5}]},{"RandomW":475567653,"RandomX":3789213642,"RandomY":1703666422,"RandomZ":3630902830,"StartTime":58911.0,"Objects":[{"StartTime":58911.0,"EndTime":59093.0,"Column":4},{"StartTime":58911.0,"EndTime":59093.0,"Column":1}]},{"RandomW":292381990,"RandomX":3630902830,"RandomY":475567653,"RandomZ":734768891,"StartTime":59277.0,"Objects":[{"StartTime":59277.0,"EndTime":59459.0,"Column":0}]},{"RandomW":1221027582,"RandomX":734768891,"RandomY":292381990,"RandomZ":2432050043,"StartTime":59643.0,"Objects":[{"StartTime":59643.0,"EndTime":60008.0,"Column":3}]},{"RandomW":1041081707,"RandomX":292381990,"RandomY":2432050043,"RandomZ":1221027582,"StartTime":60192.0,"Objects":[{"StartTime":60192.0,"EndTime":60192.0,"Column":0}]},{"RandomW":1144239065,"RandomX":2432050043,"RandomY":1221027582,"RandomZ":1041081707,"StartTime":60375.0,"Objects":[{"StartTime":60375.0,"EndTime":60375.0,"Column":1}]},{"RandomW":1711255007,"RandomX":1221027582,"RandomY":1041081707,"RandomZ":1144239065,"StartTime":60558.0,"Objects":[{"StartTime":60558.0,"EndTime":60558.0,"Column":2},{"StartTime":60558.0,"EndTime":60558.0,"Column":3}]},{"RandomW":377276168,"RandomX":1041081707,"RandomY":1144239065,"RandomZ":1711255007,"StartTime":60649.0,"Objects":[{"StartTime":60649.0,"EndTime":60649.0,"Column":1}]},{"RandomW":377276168,"RandomX":1041081707,"RandomY":1144239065,"RandomZ":1711255007,"StartTime":60741.0,"Objects":[{"StartTime":60741.0,"EndTime":60741.0,"Column":2}]},{"RandomW":1158225489,"RandomX":1144239065,"RandomY":1711255007,"RandomZ":377276168,"StartTime":60924.0,"Objects":[{"StartTime":60924.0,"EndTime":60924.0,"Column":3}]},{"RandomW":74717015,"RandomX":377276168,"RandomY":1158225489,"RandomZ":2625486930,"StartTime":61106.0,"Objects":[{"StartTime":61106.0,"EndTime":61288.0,"Column":0}]},{"RandomW":4106277974,"RandomX":1158225489,"RandomY":2625486930,"RandomZ":74717015,"StartTime":61472.0,"Objects":[{"StartTime":61472.0,"EndTime":61472.0,"Column":2},{"StartTime":61472.0,"EndTime":61472.0,"Column":3}]},{"RandomW":3720471658,"RandomX":4181108489,"RandomY":2335938349,"RandomZ":793896882,"StartTime":61655.0,"Objects":[{"StartTime":61655.0,"EndTime":61655.0,"Column":6},{"StartTime":61746.0,"EndTime":61746.0,"Column":0},{"StartTime":61837.0,"EndTime":61837.0,"Column":2}]},{"RandomW":3031050452,"RandomX":2441289268,"RandomY":3327554006,"RandomZ":1721397977,"StartTime":62021.0,"Objects":[{"StartTime":62021.0,"EndTime":62021.0,"Column":0},{"StartTime":62112.0,"EndTime":62112.0,"Column":3},{"StartTime":62203.0,"EndTime":62203.0,"Column":5}]},{"RandomW":1028780747,"RandomX":3327554006,"RandomY":1721397977,"RandomZ":3031050452,"StartTime":62387.0,"Objects":[{"StartTime":62387.0,"EndTime":62387.0,"Column":1}]},{"RandomW":4249178890,"RandomX":3031050452,"RandomY":1028780747,"RandomZ":1224535158,"StartTime":62570.0,"Objects":[{"StartTime":62570.0,"EndTime":62935.0,"Column":6}]},{"RandomW":407644414,"RandomX":1028780747,"RandomY":1224535158,"RandomZ":4249178890,"StartTime":63119.0,"Objects":[{"StartTime":63119.0,"EndTime":63119.0,"Column":4}]},{"RandomW":84513019,"RandomX":4249178890,"RandomY":407644414,"RandomZ":2855880342,"StartTime":63302.0,"Objects":[{"StartTime":63302.0,"EndTime":63667.0,"Column":0}]},{"RandomW":2876344117,"RandomX":2855880342,"RandomY":84513019,"RandomZ":3523432019,"StartTime":63850.0,"Objects":[{"StartTime":63850.0,"EndTime":63850.0,"Column":5},{"StartTime":63850.0,"EndTime":63850.0,"Column":2}]},{"RandomW":1247936821,"RandomX":2876344117,"RandomY":3407636795,"RandomZ":2195437291,"StartTime":64033.0,"Objects":[{"StartTime":64033.0,"EndTime":64033.0,"Column":1},{"StartTime":64033.0,"EndTime":64033.0,"Column":5}]},{"RandomW":1165002312,"RandomX":2195437291,"RandomY":1247936821,"RandomZ":1829597027,"StartTime":64216.0,"Objects":[{"StartTime":64216.0,"EndTime":64216.0,"Column":6},{"StartTime":64216.0,"EndTime":64216.0,"Column":3}]},{"RandomW":440601827,"RandomX":1247936821,"RandomY":1829597027,"RandomZ":1165002312,"StartTime":64399.0,"Objects":[{"StartTime":64399.0,"EndTime":64399.0,"Column":6},{"StartTime":64399.0,"EndTime":64399.0,"Column":0}]},{"RandomW":1174586413,"RandomX":1165002312,"RandomY":440601827,"RandomZ":1081265463,"StartTime":64582.0,"Objects":[{"StartTime":64582.0,"EndTime":64947.0,"Column":3}]},{"RandomW":1399461522,"RandomX":1174586413,"RandomY":2273396835,"RandomZ":2242340964,"StartTime":65131.0,"Objects":[{"StartTime":65131.0,"EndTime":65313.0,"Column":0},{"StartTime":65131.0,"EndTime":65313.0,"Column":4}]},{"RandomW":806141128,"RandomX":1399461522,"RandomY":52007806,"RandomZ":2388001070,"StartTime":65497.0,"Objects":[{"StartTime":65497.0,"EndTime":65862.0,"Column":2}]},{"RandomW":869393117,"RandomX":52007806,"RandomY":2388001070,"RandomZ":806141128,"StartTime":66046.0,"Objects":[{"StartTime":66046.0,"EndTime":66046.0,"Column":2}]},{"RandomW":2114055664,"RandomX":932480042,"RandomY":484530218,"RandomZ":2599754617,"StartTime":66228.0,"Objects":[{"StartTime":66228.0,"EndTime":66593.0,"Column":3},{"StartTime":66228.0,"EndTime":66593.0,"Column":1},{"StartTime":66228.0,"EndTime":66593.0,"Column":6}]},{"RandomW":4212241992,"RandomX":2599754617,"RandomY":2114055664,"RandomZ":3978789838,"StartTime":66777.0,"Objects":[{"StartTime":66777.0,"EndTime":66777.0,"Column":0},{"StartTime":66777.0,"EndTime":66777.0,"Column":6}]},{"RandomW":1778029315,"RandomX":4212241992,"RandomY":3373094016,"RandomZ":3088207420,"StartTime":66960.0,"Objects":[{"StartTime":66960.0,"EndTime":67142.0,"Column":3},{"StartTime":66960.0,"EndTime":67142.0,"Column":5}]},{"RandomW":523225986,"RandomX":3373094016,"RandomY":3088207420,"RandomZ":1778029315,"StartTime":67326.0,"Objects":[{"StartTime":67326.0,"EndTime":67326.0,"Column":2},{"StartTime":67326.0,"EndTime":67326.0,"Column":3}]},{"RandomW":2523721637,"RandomX":1778029315,"RandomY":523225986,"RandomZ":3156555187,"StartTime":67509.0,"Objects":[{"StartTime":67509.0,"EndTime":67874.0,"Column":1}]},{"RandomW":3753678213,"RandomX":2523721637,"RandomY":733156576,"RandomZ":1252112847,"StartTime":68058.0,"Objects":[{"StartTime":68058.0,"EndTime":68240.0,"Column":4},{"StartTime":68058.0,"EndTime":68240.0,"Column":5}]},{"RandomW":765988363,"RandomX":2650496303,"RandomY":3671318686,"RandomZ":3791148796,"StartTime":68424.0,"Objects":[{"StartTime":68424.0,"EndTime":68789.0,"Column":1},{"StartTime":68424.0,"EndTime":68789.0,"Column":2}]},{"RandomW":1639351583,"RandomX":1794981044,"RandomY":795866725,"RandomZ":201525954,"StartTime":68972.0,"Objects":[{"StartTime":68972.0,"EndTime":69337.0,"Column":0},{"StartTime":68972.0,"EndTime":69337.0,"Column":5}]},{"RandomW":3794603265,"RandomX":795866725,"RandomY":201525954,"RandomZ":1639351583,"StartTime":69521.0,"Objects":[{"StartTime":69521.0,"EndTime":69521.0,"Column":4},{"StartTime":69521.0,"EndTime":69521.0,"Column":5}]},{"RandomW":2799716979,"RandomX":1639351583,"RandomY":3794603265,"RandomZ":2996900863,"StartTime":69704.0,"Objects":[{"StartTime":69704.0,"EndTime":69886.0,"Column":2}]},{"RandomW":1138768260,"RandomX":2799716979,"RandomY":1940635085,"RandomZ":4184142780,"StartTime":70070.0,"Objects":[{"StartTime":70070.0,"EndTime":70252.0,"Column":6},{"StartTime":70070.0,"EndTime":70252.0,"Column":3}]},{"RandomW":3382500543,"RandomX":4184142780,"RandomY":1138768260,"RandomZ":3891744857,"StartTime":70436.0,"Objects":[{"StartTime":70436.0,"EndTime":70436.0,"Column":3},{"StartTime":70436.0,"EndTime":70436.0,"Column":4}]},{"RandomW":665559990,"RandomX":398143267,"RandomY":1440028745,"RandomZ":150863666,"StartTime":70619.0,"Objects":[{"StartTime":70619.0,"EndTime":70984.0,"Column":0},{"StartTime":70619.0,"EndTime":70984.0,"Column":2}]},{"RandomW":340592762,"RandomX":150863666,"RandomY":665559990,"RandomZ":3920056919,"StartTime":71167.0,"Objects":[{"StartTime":71167.0,"EndTime":71167.0,"Column":5},{"StartTime":71167.0,"EndTime":71167.0,"Column":1}]},{"RandomW":1518605551,"RandomX":340592762,"RandomY":4088291758,"RandomZ":2304957054,"StartTime":71350.0,"Objects":[{"StartTime":71350.0,"EndTime":71532.0,"Column":0},{"StartTime":71350.0,"EndTime":71532.0,"Column":4}]},{"RandomW":972812530,"RandomX":1518605551,"RandomY":653707549,"RandomZ":2799009660,"StartTime":71716.0,"Objects":[{"StartTime":71716.0,"EndTime":71898.0,"Column":2},{"StartTime":71716.0,"EndTime":71898.0,"Column":3}]},{"RandomW":3736044692,"RandomX":972812530,"RandomY":1134737486,"RandomZ":3549179654,"StartTime":72082.0,"Objects":[{"StartTime":72082.0,"EndTime":72264.0,"Column":4},{"StartTime":72082.0,"EndTime":72264.0,"Column":5}]},{"RandomW":2646968586,"RandomX":3695561354,"RandomY":2121039538,"RandomZ":3939713463,"StartTime":72448.0,"Objects":[{"StartTime":72448.0,"EndTime":72630.0,"Column":6},{"StartTime":72448.0,"EndTime":72630.0,"Column":1}]},{"RandomW":34357760,"RandomX":2646968586,"RandomY":1864765858,"RandomZ":1923246874,"StartTime":72814.0,"Objects":[{"StartTime":72814.0,"EndTime":72814.0,"Column":0},{"StartTime":72814.0,"EndTime":72814.0,"Column":6}]},{"RandomW":34357760,"RandomX":2646968586,"RandomY":1864765858,"RandomZ":1923246874,"StartTime":72997.0,"Objects":[{"StartTime":72997.0,"EndTime":72997.0,"Column":6},{"StartTime":72997.0,"EndTime":72997.0,"Column":0}]},{"RandomW":3006273170,"RandomX":1864765858,"RandomY":1923246874,"RandomZ":34357760,"StartTime":73363.0,"Objects":[{"StartTime":73363.0,"EndTime":73363.0,"Column":4},{"StartTime":73363.0,"EndTime":73363.0,"Column":5}]},{"RandomW":3978541447,"RandomX":3006273170,"RandomY":3972311639,"RandomZ":2371876462,"StartTime":73728.0,"Objects":[{"StartTime":73728.0,"EndTime":73728.0,"Column":2},{"StartTime":73819.0,"EndTime":73819.0,"Column":5},{"StartTime":73910.0,"EndTime":73910.0,"Column":0}]},{"RandomW":399194528,"RandomX":2371876462,"RandomY":3978541447,"RandomZ":3734283831,"StartTime":74094.0,"Objects":[{"StartTime":74094.0,"EndTime":74094.0,"Column":3},{"StartTime":74094.0,"EndTime":74094.0,"Column":1}]},{"RandomW":2883430810,"RandomX":4002716317,"RandomY":2698819798,"RandomZ":1875619237,"StartTime":74277.0,"Objects":[{"StartTime":74277.0,"EndTime":74642.0,"Column":6},{"StartTime":74277.0,"EndTime":74642.0,"Column":2}]},{"RandomW":3502984571,"RandomX":3789000206,"RandomY":2760409322,"RandomZ":2518464347,"StartTime":74826.0,"Objects":[{"StartTime":74826.0,"EndTime":74826.0,"Column":1},{"StartTime":74826.0,"EndTime":74826.0,"Column":4}]},{"RandomW":2447473462,"RandomX":1834893326,"RandomY":512459921,"RandomZ":2493625006,"StartTime":75009.0,"Objects":[{"StartTime":75009.0,"EndTime":75374.0,"Column":5},{"StartTime":75009.0,"EndTime":75374.0,"Column":0}]},{"RandomW":236980020,"RandomX":512459921,"RandomY":2493625006,"RandomZ":2447473462,"StartTime":75558.0,"Objects":[{"StartTime":75558.0,"EndTime":75558.0,"Column":4}]},{"RandomW":1338160073,"RandomX":236980020,"RandomY":1288545645,"RandomZ":3579861656,"StartTime":75741.0,"Objects":[{"StartTime":75741.0,"EndTime":75741.0,"Column":1},{"StartTime":75741.0,"EndTime":75741.0,"Column":5}]},{"RandomW":1104479394,"RandomX":1288545645,"RandomY":3579861656,"RandomZ":1338160073,"StartTime":75924.0,"Objects":[{"StartTime":75924.0,"EndTime":75924.0,"Column":6}]},{"RandomW":1611802424,"RandomX":3579861656,"RandomY":1338160073,"RandomZ":1104479394,"StartTime":76106.0,"Objects":[{"StartTime":76106.0,"EndTime":76106.0,"Column":5},{"StartTime":76106.0,"EndTime":76106.0,"Column":6}]},{"RandomW":74337788,"RandomX":1611802424,"RandomY":3077637432,"RandomZ":3984045284,"StartTime":76289.0,"Objects":[{"StartTime":76289.0,"EndTime":76654.0,"Column":0}]},{"RandomW":2589155279,"RandomX":74337788,"RandomY":4122247598,"RandomZ":3402826469,"StartTime":76838.0,"Objects":[{"StartTime":76838.0,"EndTime":77020.0,"Column":4},{"StartTime":76838.0,"EndTime":77020.0,"Column":1}]},{"RandomW":4015672441,"RandomX":2589155279,"RandomY":3961839828,"RandomZ":3184309519,"StartTime":77204.0,"Objects":[{"StartTime":77204.0,"EndTime":77569.0,"Column":3},{"StartTime":77204.0,"EndTime":77569.0,"Column":6}]},{"RandomW":605987856,"RandomX":3184309519,"RandomY":4015672441,"RandomZ":4025998202,"StartTime":77753.0,"Objects":[{"StartTime":77753.0,"EndTime":77753.0,"Column":0},{"StartTime":77753.0,"EndTime":77753.0,"Column":1}]},{"RandomW":1497070673,"RandomX":2430309501,"RandomY":1093966930,"RandomZ":2905669028,"StartTime":77936.0,"Objects":[{"StartTime":77936.0,"EndTime":78301.0,"Column":3},{"StartTime":77936.0,"EndTime":78301.0,"Column":2},{"StartTime":77936.0,"EndTime":78301.0,"Column":4}]},{"RandomW":353334135,"RandomX":1093966930,"RandomY":2905669028,"RandomZ":1497070673,"StartTime":78485.0,"Objects":[{"StartTime":78485.0,"EndTime":78485.0,"Column":1}]},{"RandomW":912971684,"RandomX":4030507912,"RandomY":3670783478,"RandomZ":1485865738,"StartTime":78667.0,"Objects":[{"StartTime":78667.0,"EndTime":78849.0,"Column":4},{"StartTime":78667.0,"EndTime":78849.0,"Column":2}]},{"RandomW":589257226,"RandomX":3670783478,"RandomY":1485865738,"RandomZ":912971684,"StartTime":79033.0,"Objects":[{"StartTime":79033.0,"EndTime":79033.0,"Column":3},{"StartTime":79033.0,"EndTime":79033.0,"Column":4}]},{"RandomW":2024304860,"RandomX":912971684,"RandomY":589257226,"RandomZ":2767994778,"StartTime":79216.0,"Objects":[{"StartTime":79216.0,"EndTime":79581.0,"Column":6}]},{"RandomW":2219601613,"RandomX":2024304860,"RandomY":404709274,"RandomZ":3238631833,"StartTime":79765.0,"Objects":[{"StartTime":79765.0,"EndTime":79947.0,"Column":3},{"StartTime":79765.0,"EndTime":79947.0,"Column":0}]},{"RandomW":3490718869,"RandomX":2219601613,"RandomY":3210330120,"RandomZ":1566096374,"StartTime":80131.0,"Objects":[{"StartTime":80131.0,"EndTime":80496.0,"Column":5},{"StartTime":80131.0,"EndTime":80496.0,"Column":4}]},{"RandomW":1189469485,"RandomX":1566096374,"RandomY":3490718869,"RandomZ":936182364,"StartTime":80680.0,"Objects":[{"StartTime":80680.0,"EndTime":81045.0,"Column":3}]},{"RandomW":3740948748,"RandomX":3490718869,"RandomY":936182364,"RandomZ":1189469485,"StartTime":81228.0,"Objects":[{"StartTime":81228.0,"EndTime":81228.0,"Column":5},{"StartTime":81228.0,"EndTime":81228.0,"Column":6}]},{"RandomW":3491747463,"RandomX":1189469485,"RandomY":3740948748,"RandomZ":2409626314,"StartTime":81411.0,"Objects":[{"StartTime":81411.0,"EndTime":81776.0,"Column":4}]},{"RandomW":3095098652,"RandomX":3740948748,"RandomY":2409626314,"RandomZ":3491747463,"StartTime":81960.0,"Objects":[{"StartTime":81960.0,"EndTime":81960.0,"Column":3},{"StartTime":81960.0,"EndTime":81960.0,"Column":4}]},{"RandomW":3024447782,"RandomX":2409626314,"RandomY":3491747463,"RandomZ":3095098652,"StartTime":82143.0,"Objects":[{"StartTime":82143.0,"EndTime":82143.0,"Column":2},{"StartTime":82143.0,"EndTime":82143.0,"Column":3}]},{"RandomW":3942236456,"RandomX":3095098652,"RandomY":3024447782,"RandomZ":3296500942,"StartTime":82326.0,"Objects":[{"StartTime":82326.0,"EndTime":82508.0,"Column":5}]},{"RandomW":912304721,"RandomX":3942236456,"RandomY":2303302398,"RandomZ":383442600,"StartTime":82692.0,"Objects":[{"StartTime":82692.0,"EndTime":82874.0,"Column":1},{"StartTime":82692.0,"EndTime":82874.0,"Column":2}]},{"RandomW":2431170151,"RandomX":3622775798,"RandomY":385908797,"RandomZ":604082862,"StartTime":83058.0,"Objects":[{"StartTime":83058.0,"EndTime":83240.0,"Column":4},{"StartTime":83058.0,"EndTime":83240.0,"Column":0}]},{"RandomW":4088921973,"RandomX":1523770388,"RandomY":1345324755,"RandomZ":2436511051,"StartTime":83424.0,"Objects":[{"StartTime":83424.0,"EndTime":83606.0,"Column":2},{"StartTime":83424.0,"EndTime":83606.0,"Column":6}]},{"RandomW":2663434012,"RandomX":3999189199,"RandomY":2928551970,"RandomZ":3800966865,"StartTime":83789.0,"Objects":[{"StartTime":83789.0,"EndTime":83971.0,"Column":5},{"StartTime":83789.0,"EndTime":83971.0,"Column":1}]},{"RandomW":183339481,"RandomX":3405481532,"RandomY":1385906264,"RandomZ":3611020052,"StartTime":84155.0,"Objects":[{"StartTime":84155.0,"EndTime":84337.0,"Column":4},{"StartTime":84155.0,"EndTime":84337.0,"Column":0}]},{"RandomW":472982750,"RandomX":1385906264,"RandomY":3611020052,"RandomZ":183339481,"StartTime":84521.0,"Objects":[{"StartTime":84521.0,"EndTime":84521.0,"Column":4}]},{"RandomW":2485141120,"RandomX":3611020052,"RandomY":183339481,"RandomZ":472982750,"StartTime":84704.0,"Objects":[{"StartTime":84704.0,"EndTime":84704.0,"Column":5}]},{"RandomW":2638881915,"RandomX":183339481,"RandomY":472982750,"RandomZ":2485141120,"StartTime":84887.0,"Objects":[{"StartTime":84887.0,"EndTime":84887.0,"Column":6},{"StartTime":84887.0,"EndTime":84887.0,"Column":0}]},{"RandomW":2991178386,"RandomX":1846348081,"RandomY":4216122958,"RandomZ":938042528,"StartTime":85070.0,"Objects":[{"StartTime":85070.0,"EndTime":85070.0,"Column":5},{"StartTime":85161.0,"EndTime":85161.0,"Column":6},{"StartTime":85252.0,"EndTime":85252.0,"Column":3}]},{"RandomW":2830634920,"RandomX":3020624235,"RandomY":682207034,"RandomZ":1410927339,"StartTime":85436.0,"Objects":[{"StartTime":85436.0,"EndTime":85436.0,"Column":4},{"StartTime":85527.0,"EndTime":85527.0,"Column":2},{"StartTime":85618.0,"EndTime":85618.0,"Column":4}]},{"RandomW":1154798493,"RandomX":682207034,"RandomY":1410927339,"RandomZ":2830634920,"StartTime":85802.0,"Objects":[{"StartTime":85802.0,"EndTime":85802.0,"Column":3}]},{"RandomW":3579754894,"RandomX":1154798493,"RandomY":555826250,"RandomZ":3186828503,"StartTime":85985.0,"Objects":[{"StartTime":85985.0,"EndTime":86167.0,"Column":4}]},{"RandomW":522156379,"RandomX":3186828503,"RandomY":3579754894,"RandomZ":938791043,"StartTime":86350.0,"Objects":[{"StartTime":86350.0,"EndTime":86532.0,"Column":1}]},{"RandomW":2327696617,"RandomX":522156379,"RandomY":1005466611,"RandomZ":459042761,"StartTime":86716.0,"Objects":[{"StartTime":86716.0,"EndTime":86898.0,"Column":0}]},{"RandomW":3698157493,"RandomX":2327696617,"RandomY":1854714180,"RandomZ":615999181,"StartTime":87082.0,"Objects":[{"StartTime":87082.0,"EndTime":87264.0,"Column":2},{"StartTime":87082.0,"EndTime":87264.0,"Column":5}]},{"RandomW":2615638464,"RandomX":3088317005,"RandomY":3005119130,"RandomZ":738255674,"StartTime":87448.0,"Objects":[{"StartTime":87448.0,"EndTime":87448.0,"Column":4},{"StartTime":87448.0,"EndTime":87448.0,"Column":1},{"StartTime":87630.0,"EndTime":87630.0,"Column":2},{"StartTime":87630.0,"EndTime":87630.0,"Column":5},{"StartTime":87812.0,"EndTime":87812.0,"Column":2},{"StartTime":87812.0,"EndTime":87812.0,"Column":5}]},{"RandomW":4236988115,"RandomX":738255674,"RandomY":2615638464,"RandomZ":3154196835,"StartTime":87997.0,"Objects":[{"StartTime":87997.0,"EndTime":88362.0,"Column":6}]},{"RandomW":3260011681,"RandomX":4236988115,"RandomY":3619257163,"RandomZ":1999646981,"StartTime":88546.0,"Objects":[{"StartTime":88546.0,"EndTime":88728.0,"Column":3}]},{"RandomW":1679091693,"RandomX":3619257163,"RandomY":1999646981,"RandomZ":3260011681,"StartTime":88911.0,"Objects":[{"StartTime":88911.0,"EndTime":88911.0,"Column":1},{"StartTime":88911.0,"EndTime":88911.0,"Column":2}]},{"RandomW":4053500035,"RandomX":2020322055,"RandomY":2384790806,"RandomZ":846406319,"StartTime":89277.0,"Objects":[{"StartTime":89277.0,"EndTime":89459.0,"Column":0},{"StartTime":89277.0,"EndTime":89459.0,"Column":6}]},{"RandomW":3656101543,"RandomX":4053500035,"RandomY":3566026276,"RandomZ":1915132950,"StartTime":89643.0,"Objects":[{"StartTime":89643.0,"EndTime":89825.0,"Column":4}]},{"RandomW":3002483376,"RandomX":1234751024,"RandomY":253242681,"RandomZ":2332173547,"StartTime":90009.0,"Objects":[{"StartTime":90009.0,"EndTime":90191.0,"Column":0},{"StartTime":90009.0,"EndTime":90191.0,"Column":2}]},{"RandomW":1769147212,"RandomX":1032909712,"RandomY":4079968510,"RandomZ":1771054860,"StartTime":90375.0,"Objects":[{"StartTime":90375.0,"EndTime":90375.0,"Column":3},{"StartTime":90375.0,"EndTime":90375.0,"Column":6},{"StartTime":90557.0,"EndTime":90557.0,"Column":6},{"StartTime":90557.0,"EndTime":90557.0,"Column":3},{"StartTime":90739.0,"EndTime":90739.0,"Column":5},{"StartTime":90739.0,"EndTime":90739.0,"Column":2}]},{"RandomW":1533402007,"RandomX":1771054860,"RandomY":1769147212,"RandomZ":3552934273,"StartTime":90924.0,"Objects":[{"StartTime":90924.0,"EndTime":91289.0,"Column":4}]},{"RandomW":1123904499,"RandomX":3552934273,"RandomY":1533402007,"RandomZ":3005562800,"StartTime":91472.0,"Objects":[{"StartTime":91472.0,"EndTime":91654.0,"Column":3}]},{"RandomW":3485521641,"RandomX":3005562800,"RandomY":1123904499,"RandomZ":3121355612,"StartTime":91838.0,"Objects":[{"StartTime":91838.0,"EndTime":92203.0,"Column":4}]},{"RandomW":1434626078,"RandomX":1123904499,"RandomY":3121355612,"RandomZ":3485521641,"StartTime":92387.0,"Objects":[{"StartTime":92387.0,"EndTime":92387.0,"Column":4}]},{"RandomW":4013632575,"RandomX":1434626078,"RandomY":4236899246,"RandomZ":646300056,"StartTime":92570.0,"Objects":[{"StartTime":92570.0,"EndTime":92752.0,"Column":2},{"StartTime":92570.0,"EndTime":92752.0,"Column":6}]},{"RandomW":471738692,"RandomX":646300056,"RandomY":4013632575,"RandomZ":2948180894,"StartTime":92936.0,"Objects":[{"StartTime":92936.0,"EndTime":93118.0,"Column":1}]},{"RandomW":1081382077,"RandomX":471738692,"RandomY":346006110,"RandomZ":586362406,"StartTime":93302.0,"Objects":[{"StartTime":93302.0,"EndTime":93302.0,"Column":1},{"StartTime":93302.0,"EndTime":93302.0,"Column":5}]},{"RandomW":1151929163,"RandomX":586362406,"RandomY":1081382077,"RandomZ":2915942910,"StartTime":93485.0,"Objects":[{"StartTime":93485.0,"EndTime":93667.0,"Column":3}]},{"RandomW":3634683246,"RandomX":1151929163,"RandomY":4287668198,"RandomZ":463810005,"StartTime":93850.0,"Objects":[{"StartTime":93850.0,"EndTime":94215.0,"Column":1},{"StartTime":93850.0,"EndTime":94215.0,"Column":4}]},{"RandomW":2941238432,"RandomX":463810005,"RandomY":3634683246,"RandomZ":3562759778,"StartTime":94399.0,"Objects":[{"StartTime":94399.0,"EndTime":94581.0,"Column":2}]},{"RandomW":1661408876,"RandomX":3562759778,"RandomY":2941238432,"RandomZ":2646009625,"StartTime":94765.0,"Objects":[{"StartTime":94765.0,"EndTime":95130.0,"Column":5}]},{"RandomW":3189251976,"RandomX":2646009625,"RandomY":1661408876,"RandomZ":1818231832,"StartTime":95314.0,"Objects":[{"StartTime":95314.0,"EndTime":95314.0,"Column":5},{"StartTime":95314.0,"EndTime":95314.0,"Column":3}]},{"RandomW":2743067846,"RandomX":3189251976,"RandomY":2495392125,"RandomZ":3478354416,"StartTime":95497.0,"Objects":[{"StartTime":95497.0,"EndTime":95497.0,"Column":0},{"StartTime":95497.0,"EndTime":95497.0,"Column":6}]},{"RandomW":2762867836,"RandomX":3722791806,"RandomY":2892228350,"RandomZ":4171994747,"StartTime":95680.0,"Objects":[{"StartTime":95680.0,"EndTime":95680.0,"Column":5},{"StartTime":95680.0,"EndTime":95680.0,"Column":3},{"StartTime":95862.0,"EndTime":95862.0,"Column":2},{"StartTime":95862.0,"EndTime":95862.0,"Column":6},{"StartTime":96044.0,"EndTime":96044.0,"Column":6},{"StartTime":96044.0,"EndTime":96044.0,"Column":4}]},{"RandomW":1153177485,"RandomX":2762867836,"RandomY":1407653164,"RandomZ":3758120376,"StartTime":96228.0,"Objects":[{"StartTime":96228.0,"EndTime":96228.0,"Column":1},{"StartTime":96228.0,"EndTime":96228.0,"Column":5}]},{"RandomW":1153177485,"RandomX":2762867836,"RandomY":1407653164,"RandomZ":3758120376,"StartTime":96411.0,"Objects":[{"StartTime":96411.0,"EndTime":96411.0,"Column":5},{"StartTime":96411.0,"EndTime":96411.0,"Column":1}]},{"RandomW":2430957186,"RandomX":1407653164,"RandomY":3758120376,"RandomZ":1153177485,"StartTime":96777.0,"Objects":[{"StartTime":96777.0,"EndTime":96777.0,"Column":3},{"StartTime":96777.0,"EndTime":96777.0,"Column":4}]},{"RandomW":4223688647,"RandomX":3758120376,"RandomY":1153177485,"RandomZ":2430957186,"StartTime":97143.0,"Objects":[{"StartTime":97143.0,"EndTime":97143.0,"Column":4},{"StartTime":97143.0,"EndTime":97143.0,"Column":5}]},{"RandomW":433008794,"RandomX":1153177485,"RandomY":2430957186,"RandomZ":4223688647,"StartTime":97509.0,"Objects":[{"StartTime":97509.0,"EndTime":97509.0,"Column":5},{"StartTime":97509.0,"EndTime":97509.0,"Column":6}]},{"RandomW":3177925713,"RandomX":2430957186,"RandomY":4223688647,"RandomZ":433008794,"StartTime":97692.0,"Objects":[{"StartTime":97692.0,"EndTime":100619.0,"Column":3}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/1450162.osu b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/1450162.osu
new file mode 100644
index 0000000000..42669b1516
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Resources/Testing/Beatmaps/1450162.osu
@@ -0,0 +1,297 @@
+osu file format v14
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:5
+CircleSize:4
+OverallDifficulty:7
+ApproachRate:7.5
+SliderMultiplier:1.4
+SliderTickRate:1
+
+[Events]
+//Background and Video events
+//Break Periods
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+
+[TimingPoints]
+1107,365.853658536585,4,2,1,50,1,0
+1107,-166.666666666667,4,2,1,50,0,0
+6960,-111.111111111111,4,2,1,50,0,0
+8424,-100,4,2,1,50,0,0
+48119,-125,4,2,1,50,0,0
+52143,-100,4,2,1,50,0,0
+62570,-100,4,2,1,60,0,1
+85985,-100,4,2,1,50,0,0
+97692,-100,4,2,1,30,0,0
+99155,-100,4,2,1,20,0,0
+100619,-100,4,2,1,5,0,0
+
+[HitObjects]
+38,247,1107,6,0,P|96:269|170:192,1,167.999994873047,2|0,0:0|0:0,0:0:0:0:
+201,128,2570,6,0,L|205:221,1,83.9999974365235,2|0,0:0|0:0,0:0:0:0:
+242,230,3302,2,0,L|234:324,1,83.9999974365235,2|0,0:0|0:0,0:0:0:0:
+205,343,4033,6,0,P|246:296|351:314,1,167.999994873047,2|0,0:0|0:0,0:0:0:0:
+400,368,5497,6,0,L|412:269,1,83.9999974365235,6|0,0:0|0:0,0:0:0:0:
+436,251,6228,2,0,P|425:203|408:153,1,83.9999974365235,2|0,0:0|0:0,0:0:0:0:
+304,200,6960,6,0,P|262:186|234:181,1,62.9999980773926,6|0,0:0|0:0,0:0:0:0:
+202,179,7326,1,8,0:0:0:0:
+276,94,7509,2,0,P|313:92|353:87,1,62.9999980773926,2|0,0:0|0:0,0:0:0:0:
+398,31,7875,1,2,0:0:0:0:
+464,81,8058,2,0,L|450:150,1,62.9999980773926,2|0,0:0|0:0,0:0:0:0:
+449,230,8424,6,0,P|347:206|306:217,1,140,2|8,0:0|0:0,0:0:0:0:
+229,273,8972,2,0,P|225:339|235:361,1,70,2|0,0:0|0:0,0:0:0:0:
+304,313,9338,1,8,0:0:0:0:
+224,190,9521,1,2,0:0:0:0:
+296,45,9887,6,0,P|297:97|288:125,1,70,6|0,0:0|0:0,0:0:0:0:
+224,190,10253,1,8,0:0:0:0:
+167,118,10436,1,8,0:0:0:0:
+76,126,10619,1,8,0:0:0:0:
+39,209,10802,1,8,0:0:0:0:
+93,282,10985,1,10,0:0:0:0:
+184,280,11167,1,10,0:0:0:0:
+102,136,12814,5,2,0:0:0:0:
+102,136,13180,2,0,L|199:130,1,70,8|0,0:0|0:0,0:0:0:0:
+256,167,13546,2,0,L|339:161,1,70,8|2,0:0|0:0,0:0:0:0:
+408,201,13911,2,0,P|454:176|471:143,1,70,8|2,0:0|0:0,0:0:0:0:
+373,54,14277,6,0,L|396:137,2,70,6|0|8,0:0|0:0|0:0,0:0:0:0:
+305,111,14826,2,0,L|287:274,1,140,0|2,0:0|0:0,0:0:0:0:
+262,337,15375,2,0,L|349:327,1,70,8|2,0:0|0:0,0:0:0:0:
+419,354,15741,1,8,0:0:0:0:
+477,197,16106,6,0,P|423:197|385:209,1,70,8|0,0:0|0:0,0:0:0:0:
+321,170,16472,2,0,P|278:190|253:219,1,70,8|2,0:0|0:0,0:0:0:0:
+171,213,16838,2,0,P|152:259|158:304,1,70,8|2,0:0|0:0,0:0:0:0:
+305,294,17204,6,0,L|224:278,2,70,6|0|8,0:0|0:0|0:0,0:0:0:0:
+310,202,17753,2,0,L|149:214,1,140,0|2,0:0|0:0,0:0:0:0:
+84,244,18302,2,0,L|92:152,1,70,8|2,0:0|0:0,0:0:0:0:
+47,93,18667,6,0,P|78:53|176:80,1,140,6|8,0:0|0:0,0:0:0:0:
+218,130,19216,1,0,0:0:0:0:
+299,88,19399,2,0,L|387:91,1,70,8|0,0:0|0:0,0:0:0:0:
+458,106,19765,2,0,P|447:139|444:205,1,70,8|0,0:0|0:0,0:0:0:0:
+455,274,20131,5,2,0:0:0:0:
+366,292,20314,2,0,L|353:211,1,70,0|8,0:0|0:0,0:0:0:0:
+277,173,20680,2,0,L|253:342,1,140,0|2,0:0|0:0,0:0:0:0:
+322,376,21228,2,0,P|368:368|416:370,1,70,8|2,0:0|0:0,0:0:0:0:
+500,287,21594,6,0,P|427:273|362:293,2,140,6|8|8,0:0|0:0|0:0,0:0:0:0:
+496,111,22509,1,8,0:0:0:0:
+499,189,22692,2,0,L|418:191,1,70,8|2,0:0|0:0,0:0:0:0:
+344,164,23058,5,6,0:0:0:0:
+344,164,23241,1,12,0:0:0:0:
+261,326,23606,2,0,L|246:178,1,140,8|2,0:0|0:0,0:0:0:0:
+277,100,24155,2,0,P|225:99|196:109,1,70,8|2,0:0|0:0,0:0:0:0:
+165,273,24521,5,6,0:0:0:0:
+83,235,24704,2,0,L|93:81,1,140,0|0,0:0|0:0,0:0:0:0:
+21,37,25253,2,0,L|1:120,2,70,2|0|8,0:0|0:0|0:0,0:0:0:0:
+110,17,25802,1,0,0:0:0:0:
+172,83,25985,5,2,0:0:0:0:
+236,19,26167,2,0,P|223:70|227:170,1,140,0|0,0:0|0:0,0:0:0:0:
+293,216,26716,2,0,P|316:165|314:134,2,70,2|0|8,0:0|0:0|0:0,0:0:0:0:
+206,245,27265,1,0,0:0:0:0:
+274,305,27448,5,2,0:0:0:0:
+194,348,27631,2,0,L|363:332,1,140,0|0,0:0|0:0,0:0:0:0:
+424,336,28180,1,2,0:0:0:0:
+431,245,28363,2,0,P|381:252|354:276,2,70,0|8|0,0:0|0:0|0:0,0:0:0:0:
+509,291,28911,6,0,L|496:128,1,140,2|8,0:0|0:0,0:0:0:0:
+504,60,29460,1,0,0:0:0:0:
+417,34,29643,2,0,L|402:183,1,140,2|8,0:0|0:0,0:0:0:0:
+365,262,30192,1,0,0:0:0:0:
+295,202,30375,5,2,0:0:0:0:
+309,112,30558,2,0,P|282:172|196:176,1,140,0|0,0:0|0:0,0:0:0:0:
+148,120,31106,2,0,P|189:99|225:99,2,70,2|0|8,0:0|0:0|0:0,0:0:0:0:
+129,209,31655,1,0,0:0:0:0:
+63,146,31838,5,2,0:0:0:0:
+16,67,32021,2,0,L|27:220,1,140,0|0,0:0|0:0,0:0:0:0:
+23,297,32570,2,0,P|81:286|111:290,1,70,2|0,0:0|0:0,0:0:0:0:
+173,327,32936,1,8,0:0:0:0:
+338,251,33302,6,0,P|268:254|227:199,1,140,2|8,0:0|0:0,0:0:0:0:
+203,114,33850,2,0,L|185:262,1,140,0|0,0:0|0:0,0:0:0:0:
+244,323,34399,1,8,0:0:0:0:
+334,335,34582,1,0,0:0:0:0:
+419,219,34765,6,0,L|410:304,1,70,2|0,0:0|0:0,0:0:0:0:
+338,251,35131,1,8,0:0:0:0:
+301,111,35314,2,0,L|301:190,1,70,6|0,0:0|0:0,0:0:0:0:
+383,141,35680,1,8,0:0:0:0:
+462,97,35863,2,0,P|427:64|393:54,1,70,2|0,0:0|0:0,0:0:0:0:
+321,23,36228,5,2,0:0:0:0:
+237,60,36411,1,0,0:0:0:0:
+148,38,36594,2,0,P|107:33|56:43,1,70,8|0,0:0|0:0,0:0:0:0:
+86,125,36960,2,0,P|51:125|17:117,2,70,2|0|8,0:0|0:0|0:0,0:0:0:0:
+175,123,37509,1,0,0:0:0:0:
+129,201,37692,5,2,0:0:0:0:
+198,259,37875,1,0,0:0:0:0:
+205,349,38058,2,0,P|251:330|284:326,1,70,8|0,0:0|0:0,0:0:0:0:
+352,285,38424,2,0,P|361:318|357:353,2,70,2|0|8,0:0|0:0|0:0,0:0:0:0:
+282,239,38972,1,0,0:0:0:0:
+362,195,39155,5,2,0:0:0:0:
+436,142,39338,2,0,P|398:115|354:112,1,70,0|8,0:0|0:0,0:0:0:0:
+286,92,39704,2,0,L|451:74,1,140,0|0,0:0|0:0,0:0:0:0:
+512,118,40253,2,0,L|494:198,1,70,8|0,0:0|0:0,0:0:0:0:
+430,297,40619,6,0,P|423:236|336:195,1,140,2|8,0:0|0:0,0:0:0:0:
+282,239,41167,1,0,0:0:0:0:
+209,184,41350,2,0,L|222:112,1,70,2|2,0:0|0:0,0:0:0:0:
+177,34,41716,2,0,P|230:26|269:38,1,70,8|0,0:0|0:0,0:0:0:0:
+307,95,42082,5,2,0:0:0:0:
+363,23,42265,2,0,L|359:114,1,70,0|8,0:0|0:0,0:0:0:0:
+360,184,42631,1,0,0:0:0:0:
+450,191,42814,2,0,P|443:145|424:119,2,70,2|0|8,0:0|0:0|0:0,0:0:0:0:
+393,263,43363,1,0,0:0:0:0:
+304,242,43546,5,2,0:0:0:0:
+241,308,43728,1,0,0:0:0:0:
+167,256,43911,2,0,P|205:228|245:226,1,70,8|0,0:0|0:0,0:0:0:0:
+166,341,44277,2,0,P|118:325|90:289,1,70,2|0,0:0|0:0,0:0:0:0:
+125,177,44643,2,0,P|168:152|201:153,1,70,8|0,0:0|0:0,0:0:0:0:
+276,132,45009,6,0,L|119:105,1,140,2|8,0:0|0:0,0:0:0:0:
+52,74,45558,2,0,L|210:57,1,140,2|0,0:0|0:0,0:0:0:0:
+277,28,46106,1,8,0:0:0:0:
+349,82,46289,1,0,0:0:0:0:
+425,32,46472,6,0,L|451:110,2,70,6|2|8,0:0|0:0|0:0,0:0:0:0:
+349,82,47021,2,0,L|344:235,1,140,2|8,0:0|0:0,0:0:0:0:
+372,308,47570,1,2,0:0:0:0:
+170,324,47936,5,2,0:0:0:0:
+99,286,48119,2,0,L|112:112,1,168,2|2,0:0|0:0,0:0:0:0:
+64,48,48850,2,0,P|125:36|195:111,1,168,2|2,0:0|0:0,0:0:0:0:
+199,189,49582,6,0,L|369:166,1,168,2|2,0:0|0:0,0:0:0:0:
+413,97,50314,2,0,P|390:180|377:274,1,168,2|2,0:0|0:0,0:0:0:0:
+347,339,51046,6,0,P|424:333|463:251,1,168,2|2,0:0|0:0,0:0:0:0:
+473,175,51777,2,0,L|477:105,1,56,2|2,0:0|0:0,0:0:0:0:
+446,24,52143,6,0,P|363:22|308:82,1,140,12|2,0:0|0:0,0:0:0:0:
+282,138,52692,1,8,0:0:0:0:
+193,118,52875,2,0,L|213:281,1,140,2|8,0:0|0:0,0:0:0:0:
+225,347,53424,2,0,P|268:328|286:301,1,70,2|0,0:0|0:0,0:0:0:0:
+304,222,53789,5,2,0:0:0:0:
+385,263,53972,1,0,0:0:0:0:
+462,214,54155,2,0,P|421:185|383:179,1,70,8|0,0:0|0:0,0:0:0:0:
+322,136,54521,2,0,P|360:105|400:93,1,70,2|0,0:0|0:0,0:0:0:0:
+469,107,54887,2,0,L|483:24,1,70,8|0,0:0|0:0,0:0:0:0:
+390,22,55253,6,0,L|223:30,1,140,2|8,0:0|0:0,0:0:0:0:
+180,87,55802,1,0,0:0:0:0:
+230,162,55985,2,0,L|391:154,1,140,2|8,0:0|0:0,0:0:0:0:
+430,223,56533,1,0,0:0:0:0:
+407,311,56716,6,0,P|356:347|285:307,1,140,2|8,0:0|0:0,0:0:0:0:
+236,245,57265,1,0,0:0:0:0:
+145,237,57448,2,0,L|162:316,1,70,2|0,0:0|0:0,0:0:0:0:
+233,360,57814,6,0,P|185:349|142:350,1,70,8|0,0:0|0:0,0:0:0:0:
+11,311,58180,2,0,P|64:302|104:306,1,70,2|0,0:0|0:0,0:0:0:0:
+213,248,58546,2,0,P|162:237|130:237,1,70,8|0,0:0|0:0,0:0:0:0:
+1,194,58911,2,0,P|47:183|74:185,1,70,2|0,0:0|0:0,0:0:0:0:
+234,142,59277,2,0,P|175:129|152:128,1,70,8|0,0:0|0:0,0:0:0:0:
+12,26,59643,6,0,P|66:38|71:140,1,140,2|8,0:0|0:0,0:0:0:0:
+1,194,60192,1,0,0:0:0:0:
+84,230,60375,1,2,0:0:0:0:
+173,216,60558,1,8,0:0:0:0:
+173,216,60649,1,8,0:0:0:0:
+173,216,60741,1,8,0:0:0:0:
+263,213,60924,1,2,0:0:0:0:
+345,174,61106,6,0,P|320:144|286:130,1,70,2|0,0:0|0:0,0:0:0:0:
+200,134,61472,1,8,0:0:0:0:
+249,57,61655,2,0,L|263:12,2,35,12|8|8,0:0|0:0|0:0,0:0:0:0:
+157,64,62021,2,0,L|153:13,2,35,12|8|8,0:0|0:0|0:0,0:0:0:0:
+118,150,62387,1,2,0:0:0:0:
+101,260,62570,6,0,P|207:236|257:243,1,140,2|8,0:0|0:0,0:0:0:0:
+328,304,63119,1,0,0:0:0:0:
+434,156,63302,2,0,P|373:157|329:217,1,140,2|8,0:0|0:0,0:0:0:0:
+408,230,63850,1,2,0:0:0:0:
+483,215,64033,5,6,0:0:0:0:
+508,142,64216,1,0,0:0:0:0:
+482,69,64399,1,8,0:0:0:0:
+413,34,64582,2,0,P|336:30|256:49,1,140,0|2,0:0|0:0,0:0:0:0:
+150,97,65131,2,0,P|190:97|243:107,1,70,8|2,0:0|0:0,0:0:0:0:
+257,168,65497,6,0,L|225:323,1,140,2|8,0:0|0:0,0:0:0:0:
+155,329,66046,1,0,0:0:0:0:
+20,204,66228,2,0,P|92:202|133:271,1,140,8|8,0:0|0:0,0:0:0:0:
+56,274,66777,1,2,0:0:0:0:
+18,125,66960,6,0,L|93:119,1,70,6|0,0:0|0:0,0:0:0:0:
+162,156,67326,1,8,0:0:0:0:
+223,52,67509,2,0,L|227:219,1,140,0|2,0:0|0:0,0:0:0:0:
+266,263,68058,2,0,P|300:229|308:199,1,70,8|2,0:0|0:0,0:0:0:0:
+298,95,68424,6,0,L|458:75,1,140,6|8,0:0|0:0,0:0:0:0:
+512,164,68972,2,0,L|358:154,1,140,0|2,0:0|0:0,0:0:0:0:
+306,209,69521,1,8,0:0:0:0:
+342,334,69704,6,0,P|361:289|369:244,1,70,2|6,0:0|0:0,0:0:0:0:
+250,277,70070,2,0,P|223:228|219:186,1,70,0|8,0:0|0:0,0:0:0:0:
+272,128,70436,1,0,0:0:0:0:
+172,111,70619,2,0,L|343:97,1,140,8|8,0:0|0:0,0:0:0:0:
+385,128,71167,1,2,0:0:0:0:
+494,63,71350,6,0,L|413:54,1,70,6|0,0:0|0:0,0:0:0:0:
+385,128,71716,2,0,L|475:140,1,70,8|0,0:0|0:0,0:0:0:0:
+467,217,72082,2,0,L|386:208,1,70,8|2,0:0|0:0,0:0:0:0:
+358,282,72448,2,0,L|448:294,1,70,8|2,0:0|0:0,0:0:0:0:
+498,339,72814,5,12,0:0:0:0:
+498,339,72997,1,12,0:0:0:0:
+301,343,73363,1,8,0:0:0:0:
+211,173,73728,2,0,L|221:216,2,35,2|2|8,0:0|0:0|0:0,0:0:0:0:
+250,100,74094,1,2,0:0:0:0:
+123,92,74277,6,0,P|129:156|129:236,1,140,2|8,0:0|0:0,0:0:0:0:
+109,321,74826,1,0,0:0:0:0:
+211,173,75009,2,0,P|266:165|333:237,1,140,8|8,0:0|0:0,0:0:0:0:
+341,302,75558,1,2,0:0:0:0:
+418,272,75741,5,6,0:0:0:0:
+484,322,75924,1,0,0:0:0:0:
+407,352,76106,1,8,0:0:0:0:
+341,302,76289,2,0,L|364:147,1,140,0|2,0:0|0:0,0:0:0:0:
+269,60,76838,2,0,P|315:69|349:94,1,70,8|0,0:0|0:0,0:0:0:0:
+269,150,77204,6,0,P|228:160|114:139,1,140,2|8,0:0|0:0,0:0:0:0:
+49,80,77753,1,0,0:0:0:0:
+39,235,77936,2,0,P|103:222|160:277,1,140,8|8,0:0|0:0,0:0:0:0:
+82,297,78485,1,2,0:0:0:0:
+227,326,78667,6,0,L|233:241,1,70,4|0,0:0|0:0,0:0:0:0:
+269,150,79033,1,8,0:0:0:0:
+408,194,79216,2,0,P|359:172|271:187,1,140,0|2,0:0|0:0,0:0:0:0:
+409,281,79765,2,0,P|447:272|478:250,1,70,8|2,0:0|0:0,0:0:0:0:
+497,168,80131,6,0,L|481:332,1,140,6|8,0:0|0:0,0:0:0:0:
+389,365,80680,2,0,L|376:198,1,140,0|2,0:0|0:0,0:0:0:0:
+414,157,81228,1,8,0:0:0:0:
+229,89,81411,6,0,P|304:91|338:167,1,140,2|0,0:0|0:0,0:0:0:0:
+290,222,81960,1,8,0:0:0:0:
+211,214,82143,1,8,0:0:0:0:
+93,155,82326,2,0,P|137:143|172:150,1,70,2|2,0:0|0:0,0:0:0:0:
+235,301,82692,2,0,P|177:296|141:279,1,70,8|2,0:0|0:0,0:0:0:0:
+68,244,83058,6,0,L|72:328,1,70,6|0,0:0|0:0,0:0:0:0:
+166,292,83424,2,0,L|157:372,1,70,8|0,0:0|0:0,0:0:0:0:
+254,227,83789,2,0,L|258:310,1,70,8|2,0:0|0:0,0:0:0:0:
+345,265,84155,2,0,L|336:349,1,70,8|0,0:0|0:0,0:0:0:0:
+331,175,84521,5,2,0:0:0:0:
+416,205,84704,1,2,0:0:0:0:
+481,141,84887,1,8,0:0:0:0:
+431,64,85070,2,0,L|444:26,2,35,8|8|2,0:0|0:0|0:0,0:0:0:0:
+339,79,85436,2,0,L|341:39,2,35,8|8|8,0:0|0:0|0:0,0:0:0:0:
+256,109,85802,1,2,0:0:0:0:
+165,97,85985,6,0,P|167:150|164:187,1,70,2|0,0:0|0:0,0:0:0:0:
+117,244,86350,2,0,P|163:241|204:235,1,70,8|0,0:0|0:0,0:0:0:0:
+229,317,86716,2,0,P|273:305|300:294,1,70,8|2,0:0|0:0,0:0:0:0:
+365,354,87082,2,0,P|404:334|430:310,1,70,8|0,0:0|0:0,0:0:0:0:
+352,230,87448,6,0,L|271:216,2,70,6|0|8,0:0|0:0|0:0,0:0:0:0:
+378,142,87997,2,0,L|222:144,1,140,0|2,0:0|0:0,0:0:0:0:
+152,112,88546,2,0,L|166:214,1,70,8|2,0:0|0:0,0:0:0:0:
+139,270,88911,5,8,0:0:0:0:
+12,138,89277,2,0,L|29:55,1,70,8|0,0:0|0:0,0:0:0:0:
+91,5,89643,2,0,L|104:97,1,70,8|2,0:0|0:0,0:0:0:0:
+153,149,90009,2,0,L|175:78,1,70,8|0,0:0|0:0,0:0:0:0:
+279,36,90375,6,0,L|357:27,2,70,6|0|8,0:0|0:0|0:0,0:0:0:0:
+248,122,90924,2,0,L|398:125,1,140,0|2,0:0|0:0,0:0:0:0:
+479,123,91472,2,0,P|468:170|445:195,1,70,8|2,0:0|0:0,0:0:0:0:
+365,204,91838,6,0,P|414:220|409:320,1,140,6|8,0:0|0:0,0:0:0:0:
+354,354,92387,1,0,0:0:0:0:
+262,353,92570,2,0,L|271:273,1,70,8|2,0:0|0:0,0:0:0:0:
+297,196,92936,2,0,P|243:198|216:215,1,70,8|0,0:0|0:0,0:0:0:0:
+172,276,93302,5,6,0:0:0:0:
+137,360,93485,2,0,L|127:265,1,70,0|8,0:0|0:0,0:0:0:0:
+81,212,93850,2,0,P|93:138|118:67,1,140,0|2,0:0|0:0,0:0:0:0:
+170,4,94399,2,0,P|195:37|204:74,1,70,8|2,0:0|0:0,0:0:0:0:
+186,153,94765,6,0,L|340:139,1,140,6|8,0:0|0:0,0:0:0:0:
+408,101,95314,1,2,0:0:0:0:
+443,184,95497,1,6,0:0:0:0:
+369,237,95680,2,0,L|300:224,2,70,8|8|2,0:0|0:0|0:0,0:0:0:0:
+448,282,96228,5,12,0:0:0:0:
+448,282,96411,1,12,0:0:0:0:
+270,320,96777,1,8,0:0:0:0:
+313,143,97143,1,8,0:0:0:0:
+377,314,97509,1,8,0:0:0:0:
+256,192,97692,12,0,100619,0:0:0:0:
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index ccfe1501bd..184c09f378 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -64,7 +64,10 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             double roundedOverallDifficulty = Math.Round(difficulty.OverallDifficulty);
 
             int countSliderOrSpinner = difficulty.TotalObjectCount - difficulty.CircleCount;
-            float percentSpecialObjects = (float)countSliderOrSpinner / difficulty.TotalObjectCount;
+
+            // In osu!stable, this division appears as if it happens on floats, but due to release-mode
+            // optimisations, it actually ends up happening on doubles.
+            double percentSpecialObjects = (double)countSliderOrSpinner / difficulty.TotalObjectCount;
 
             if (percentSpecialObjects < 0.2)
                 return 7;

From 767d5c8018abb2a8aca3d8aaf8a3259862f976e2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 9 Dec 2023 21:57:34 +0900
Subject: [PATCH 1911/2296] Add object counts to IBeatmapDifficultyInfo

---
 osu.Game/BackgroundDataStoreProcessor.cs      | 38 +++++++++++++++++++
 osu.Game/Beatmaps/BeatmapDifficulty.cs        |  9 +++++
 osu.Game/Beatmaps/BeatmapImporter.cs          |  3 ++
 osu.Game/Beatmaps/BeatmapUpdater.cs           | 20 +++++++++-
 osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs   | 13 +++++++
 osu.Game/Database/RealmAccess.cs              |  3 +-
 .../API/Requests/Responses/APIBeatmap.cs      |  2 +
 .../LegacyBeatmapConversionDifficultyInfo.cs  |  1 +
 8 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 90e55dea6d..8195856991 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Screens.Play;
+using Realms;
 
 namespace osu.Game
 {
@@ -68,6 +69,7 @@ namespace osu.Game
 
                 checkForOutdatedStarRatings();
                 processBeatmapSetsWithMissingMetrics();
+                processBeatmapsWithMissingObjectCounts();
                 processScoresWithMissingStatistics();
                 convertLegacyTotalScoreToStandardised();
             }, TaskCreationOptions.LongRunning).ContinueWith(t =>
@@ -178,6 +180,42 @@ namespace osu.Game
             }
         }
 
+        private void processBeatmapsWithMissingObjectCounts()
+        {
+            Logger.Log("Querying for beatmaps with missing hitobject counts to reprocess...");
+
+            HashSet<Guid> beatmapIds = realmAccess.Run(r => new HashSet<Guid>(r.All<BeatmapInfo>()
+                                                                               .Filter($"{nameof(BeatmapInfo.Difficulty)}.{nameof(BeatmapDifficulty.TotalObjectCount)} == 0")
+                                                                               .AsEnumerable().Select(b => b.ID)));
+
+            Logger.Log($"Found {beatmapIds.Count} beatmaps which require reprocessing.");
+
+            int i = 0;
+
+            foreach (var id in beatmapIds)
+            {
+                sleepIfRequired();
+
+                realmAccess.Run(r =>
+                {
+                    var beatmap = r.Find<BeatmapInfo>(id);
+
+                    if (beatmap != null)
+                    {
+                        try
+                        {
+                            Logger.Log($"Background processing {beatmap} ({++i} / {beatmapIds.Count})");
+                            beatmapUpdater.ProcessObjectCounts(beatmap);
+                        }
+                        catch (Exception e)
+                        {
+                            Logger.Log($"Background processing failed on {beatmap}: {e}");
+                        }
+                    }
+                });
+            }
+        }
+
         private void processScoresWithMissingStatistics()
         {
             HashSet<Guid> scoreIds = new HashSet<Guid>();
diff --git a/osu.Game/Beatmaps/BeatmapDifficulty.cs b/osu.Game/Beatmaps/BeatmapDifficulty.cs
index ac2267380d..785728141e 100644
--- a/osu.Game/Beatmaps/BeatmapDifficulty.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficulty.cs
@@ -21,6 +21,9 @@ namespace osu.Game.Beatmaps
         public double SliderMultiplier { get; set; } = 1.4;
         public double SliderTickRate { get; set; } = 1;
 
+        public int EndTimeObjectCount { get; set; }
+        public int TotalObjectCount { get; set; }
+
         public BeatmapDifficulty()
         {
         }
@@ -44,6 +47,9 @@ namespace osu.Game.Beatmaps
 
             difficulty.SliderMultiplier = SliderMultiplier;
             difficulty.SliderTickRate = SliderTickRate;
+
+            difficulty.EndTimeObjectCount = EndTimeObjectCount;
+            difficulty.TotalObjectCount = TotalObjectCount;
         }
 
         public virtual void CopyFrom(IBeatmapDifficultyInfo other)
@@ -55,6 +61,9 @@ namespace osu.Game.Beatmaps
 
             SliderMultiplier = other.SliderMultiplier;
             SliderTickRate = other.SliderTickRate;
+
+            EndTimeObjectCount = other.EndTimeObjectCount;
+            TotalObjectCount = other.TotalObjectCount;
         }
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index e89e5339e1..31d6b0108e 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -20,6 +20,7 @@ using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects.Types;
 using Realms;
 
 namespace osu.Game.Beatmaps
@@ -388,6 +389,8 @@ namespace osu.Game.Beatmaps
                         ApproachRate = decodedDifficulty.ApproachRate,
                         SliderMultiplier = decodedDifficulty.SliderMultiplier,
                         SliderTickRate = decodedDifficulty.SliderTickRate,
+                        EndTimeObjectCount = decoded.HitObjects.Count(h => h is IHasDuration),
+                        TotalObjectCount = decoded.HitObjects.Count
                     };
 
                     var metadata = new BeatmapMetadata
diff --git a/osu.Game/Beatmaps/BeatmapUpdater.cs b/osu.Game/Beatmaps/BeatmapUpdater.cs
index 56bfdc5001..472ac26ebe 100644
--- a/osu.Game/Beatmaps/BeatmapUpdater.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdater.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
@@ -10,6 +11,7 @@ using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Database;
 using osu.Game.Online.API;
+using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Beatmaps
 {
@@ -44,7 +46,8 @@ namespace osu.Game.Beatmaps
         public void Queue(Live<BeatmapSetInfo> beatmapSet, MetadataLookupScope lookupScope = MetadataLookupScope.LocalCacheFirst)
         {
             Logger.Log($"Queueing change for local beatmap {beatmapSet}");
-            Task.Factory.StartNew(() => beatmapSet.PerformRead(b => Process(b, lookupScope)), default, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
+            Task.Factory.StartNew(() => beatmapSet.PerformRead(b => Process(b, lookupScope)), default, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously,
+                updateScheduler);
         }
 
         /// <summary>
@@ -80,6 +83,21 @@ namespace osu.Game.Beatmaps
             workingBeatmapCache.Invalidate(beatmapSet);
         });
 
+        public void ProcessObjectCounts(BeatmapInfo beatmapInfo, MetadataLookupScope lookupScope = MetadataLookupScope.LocalCacheFirst) => beatmapInfo.Realm!.Write(_ =>
+        {
+            // Before we use below, we want to invalidate.
+            workingBeatmapCache.Invalidate(beatmapInfo);
+
+            var working = workingBeatmapCache.GetWorkingBeatmap(beatmapInfo);
+            var beatmap = working.Beatmap;
+
+            beatmapInfo.Difficulty.EndTimeObjectCount = beatmap.HitObjects.Count(h => h is IHasDuration);
+            beatmapInfo.Difficulty.TotalObjectCount = beatmap.HitObjects.Count;
+
+            // And invalidate again afterwards as re-fetching the most up-to-date database metadata will be required.
+            workingBeatmapCache.Invalidate(beatmapInfo);
+        });
+
         #region Implementation of IDisposable
 
         public void Dispose()
diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index e7a3d87d0a..47b261d1f6 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -44,6 +44,19 @@ namespace osu.Game.Beatmaps
         /// </summary>
         double SliderTickRate { get; }
 
+        /// <summary>
+        /// The number of hitobjects in the beatmap with a distinct end time.
+        /// </summary>
+        /// <remarks>
+        /// Canonically, these are hitobjects are either sliders or spinners.
+        /// </remarks>
+        int EndTimeObjectCount { get; }
+
+        /// <summary>
+        /// The total number of hitobjects in the beatmap.
+        /// </summary>
+        int TotalObjectCount { get; }
+
         /// <summary>
         /// Maps a difficulty value [0, 10] to a two-piece linear range of values.
         /// </summary>
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index e9f49ec662..9c7fe464dd 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -88,8 +88,9 @@ namespace osu.Game.Database
         /// 34   2023-08-21    Add BackgroundReprocessingFailed flag to ScoreInfo to track upgrade failures.
         /// 35   2023-10-16    Clear key combinations of keybindings that are assigned to more than one action in a given settings section.
         /// 36   2023-10-26    Add LegacyOnlineID to ScoreInfo. Move osu_scores_*_high IDs stored in OnlineID to LegacyOnlineID. Reset anomalous OnlineIDs.
+        /// 37   2023-12-10    Add EndTimeObjectCount and TotalObjectCount to BeatmapDifficulty.
         /// </summary>
-        private const int schema_version = 36;
+        private const int schema_version = 37;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index 902b651be9..c1ceff7c43 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -109,6 +109,8 @@ namespace osu.Game.Online.API.Requests.Responses
             CircleSize = CircleSize,
             ApproachRate = ApproachRate,
             OverallDifficulty = OverallDifficulty,
+            EndTimeObjectCount = SliderCount + SpinnerCount,
+            TotalObjectCount = CircleCount + SliderCount + SpinnerCount
         };
 
         IBeatmapSetInfo? IBeatmapInfo.BeatmapSet => BeatmapSet;
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
index 97ccf787af..9c9294417f 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Rulesets.Scoring.Legacy
         float IBeatmapDifficultyInfo.ApproachRate => 0;
         double IBeatmapDifficultyInfo.SliderMultiplier => 0;
         double IBeatmapDifficultyInfo.SliderTickRate => 0;
+        int IBeatmapDifficultyInfo.EndTimeObjectCount => TotalObjectCount - CircleCount;
 
         public static LegacyBeatmapConversionDifficultyInfo FromAPIBeatmap(APIBeatmap apiBeatmap) => new LegacyBeatmapConversionDifficultyInfo
         {

From b36db3518c79486a94fc97411fbf340fd3741a38 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 9 Dec 2023 22:09:49 +0900
Subject: [PATCH 1912/2296] Add keycount to song select details panel and
 carousel panels

---
 .../Beatmaps/ManiaBeatmapConverter.cs         | 13 ++-----
 .../ManiaFilterCriteria.cs                    |  3 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  3 ++
 osu.Game/Rulesets/ILegacyRuleset.cs           |  7 ++++
 .../LegacyBeatmapConversionDifficultyInfo.cs  | 28 +++++---------
 .../Carousel/DrawableCarouselBeatmap.cs       | 37 +++++++++++++++++++
 .../Screens/Select/Details/AdvancedStats.cs   | 16 ++++++--
 7 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index ccfe1501bd..c4a8db92ed 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -57,10 +57,11 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
         public static int GetColumnCount(LegacyBeatmapConversionDifficultyInfo difficulty)
         {
-            if (new ManiaRuleset().RulesetInfo.Equals(difficulty.SourceRuleset))
-                return GetColumnCountForNonConvert(difficulty);
-
             double roundedCircleSize = Math.Round(difficulty.CircleSize);
+
+            if (new ManiaRuleset().RulesetInfo.Equals(difficulty.SourceRuleset))
+                return (int)Math.Max(1, roundedCircleSize);
+
             double roundedOverallDifficulty = Math.Round(difficulty.OverallDifficulty);
 
             int countSliderOrSpinner = difficulty.TotalObjectCount - difficulty.CircleCount;
@@ -76,12 +77,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             return Math.Max(4, Math.Min((int)roundedOverallDifficulty + 1, 7));
         }
 
-        public static int GetColumnCountForNonConvert(IBeatmapDifficultyInfo difficulty)
-        {
-            double roundedCircleSize = Math.Round(difficulty.CircleSize);
-            return (int)Math.Max(1, roundedCircleSize);
-        }
-
         public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition);
 
         protected override Beatmap<ManiaHitObject> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
diff --git a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
index 7f8a00bf88..930ca217cd 100644
--- a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
+++ b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
@@ -4,6 +4,7 @@
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Filter;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
 
@@ -15,7 +16,7 @@ namespace osu.Game.Rulesets.Mania
 
         public bool Matches(BeatmapInfo beatmapInfo)
         {
-            return !keys.HasFilter || (beatmapInfo.Ruleset.OnlineID == new ManiaRuleset().LegacyID && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmapInfo.Difficulty)));
+            return !keys.HasFilter || keys.IsInRange(ManiaBeatmapConverter.GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmapInfo(beatmapInfo)));
         }
 
         public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 0c317e0f8a..c38d6519bd 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -420,6 +420,9 @@ namespace osu.Game.Rulesets.Mania
         public override RulesetSetupSection CreateEditorSetupSection() => new ManiaSetupSection();
 
         public override DifficultySection CreateEditorDifficultySection() => new ManiaDifficultySection();
+
+        public int GetKeyCount(IBeatmapInfo beatmapInfo)
+            => ManiaBeatmapConverter.GetColumnCount(LegacyBeatmapConversionDifficultyInfo.FromBeatmapInfo(beatmapInfo));
     }
 
     public enum PlayfieldType
diff --git a/osu.Game/Rulesets/ILegacyRuleset.cs b/osu.Game/Rulesets/ILegacyRuleset.cs
index 6900afa243..18d86f477a 100644
--- a/osu.Game/Rulesets/ILegacyRuleset.cs
+++ b/osu.Game/Rulesets/ILegacyRuleset.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 osu.Game.Beatmaps;
 using osu.Game.Rulesets.Scoring.Legacy;
 
 namespace osu.Game.Rulesets
@@ -14,6 +15,12 @@ namespace osu.Game.Rulesets
         /// </summary>
         int LegacyID { get; }
 
+        /// <summary>
+        /// Retrieves the number of mania keys required to play the beatmap.
+        /// </summary>
+        /// <returns></returns>
+        int GetKeyCount(IBeatmapInfo beatmapInfo) => 0;
+
         ILegacyScoreSimulator CreateLegacyScoreSimulator();
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
index 9c9294417f..6f379e4ef1 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
@@ -1,10 +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.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Scoring.Legacy
 {
@@ -31,9 +29,6 @@ namespace osu.Game.Rulesets.Scoring.Legacy
         /// <summary>
         /// The count of hitcircles in the beatmap.
         /// </summary>
-        /// <remarks>
-        /// When converting from osu! ruleset beatmaps, this is equivalent to the sum of sliders and spinners in the beatmap.
-        /// </remarks>
         public int CircleCount { get; set; }
 
         /// <summary>
@@ -47,22 +42,17 @@ namespace osu.Game.Rulesets.Scoring.Legacy
         double IBeatmapDifficultyInfo.SliderTickRate => 0;
         int IBeatmapDifficultyInfo.EndTimeObjectCount => TotalObjectCount - CircleCount;
 
-        public static LegacyBeatmapConversionDifficultyInfo FromAPIBeatmap(APIBeatmap apiBeatmap) => new LegacyBeatmapConversionDifficultyInfo
-        {
-            SourceRuleset = apiBeatmap.Ruleset,
-            CircleSize = apiBeatmap.CircleSize,
-            OverallDifficulty = apiBeatmap.OverallDifficulty,
-            CircleCount = apiBeatmap.CircleCount,
-            TotalObjectCount = apiBeatmap.SliderCount + apiBeatmap.SpinnerCount + apiBeatmap.CircleCount
-        };
+        public static LegacyBeatmapConversionDifficultyInfo FromAPIBeatmap(APIBeatmap apiBeatmap) => FromBeatmapInfo(apiBeatmap);
 
-        public static LegacyBeatmapConversionDifficultyInfo FromBeatmap(IBeatmap beatmap) => new LegacyBeatmapConversionDifficultyInfo
+        public static LegacyBeatmapConversionDifficultyInfo FromBeatmap(IBeatmap beatmap) => FromBeatmapInfo(beatmap.BeatmapInfo);
+
+        public static LegacyBeatmapConversionDifficultyInfo FromBeatmapInfo(IBeatmapInfo beatmapInfo) => new LegacyBeatmapConversionDifficultyInfo
         {
-            SourceRuleset = beatmap.BeatmapInfo.Ruleset,
-            CircleSize = beatmap.Difficulty.CircleSize,
-            OverallDifficulty = beatmap.Difficulty.OverallDifficulty,
-            CircleCount = beatmap.HitObjects.Count(h => h is not IHasDuration),
-            TotalObjectCount = beatmap.HitObjects.Count
+            SourceRuleset = beatmapInfo.Ruleset,
+            CircleSize = beatmapInfo.Difficulty.CircleSize,
+            OverallDifficulty = beatmapInfo.Difficulty.OverallDifficulty,
+            CircleCount = beatmapInfo.Difficulty.TotalObjectCount - beatmapInfo.Difficulty.EndTimeObjectCount,
+            TotalObjectCount = beatmapInfo.Difficulty.TotalObjectCount
         };
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 3dfd801f02..cda95a9d29 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -27,6 +27,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
+using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
 
@@ -57,6 +58,8 @@ namespace osu.Game.Screens.Select.Carousel
         private StarCounter starCounter = null!;
         private DifficultyIcon difficultyIcon = null!;
 
+        private OsuSpriteText keyCountText = null!;
+
         [Resolved]
         private BeatmapSetOverlay? beatmapOverlay { get; set; }
 
@@ -69,6 +72,9 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
 
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
+
         private IBindable<StarDifficulty?> starDifficultyBindable = null!;
         private CancellationTokenSource? starDifficultyCancellationSource;
 
@@ -133,6 +139,13 @@ namespace osu.Game.Screens.Select.Carousel
                                     AutoSizeAxes = Axes.Both,
                                     Children = new[]
                                     {
+                                        keyCountText = new OsuSpriteText
+                                        {
+                                            Font = OsuFont.GetFont(size: 20),
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            Alpha = 0,
+                                        },
                                         new OsuSpriteText
                                         {
                                             Text = beatmapInfo.DifficultyName,
@@ -167,6 +180,13 @@ namespace osu.Game.Screens.Select.Carousel
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ruleset.BindValueChanged(_ => updateKeyCount());
+        }
+
         protected override void Selected()
         {
             base.Selected();
@@ -216,11 +236,28 @@ namespace osu.Game.Screens.Select.Carousel
                     if (d.NewValue != null)
                         difficultyIcon.Current.Value = d.NewValue.Value;
                 }, true);
+
+                updateKeyCount();
             }
 
             base.ApplyState();
         }
 
+        private void updateKeyCount()
+        {
+            if (ruleset.Value.OnlineID == 3)
+            {
+                // Account for mania differences locally for now.
+                // Eventually this should be handled in a more modular way, allowing rulesets to add more information to the panel.
+                ILegacyRuleset legacyRuleset = (ILegacyRuleset)ruleset.Value.CreateInstance();
+
+                keyCountText.Alpha = 1;
+                keyCountText.Text = $"[{legacyRuleset.GetKeyCount(beatmapInfo)}K]";
+            }
+            else
+                keyCountText.Alpha = 0;
+        }
+
         public MenuItem[] ContextMenuItems
         {
             get
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index a383298faa..87185c351e 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -126,13 +126,21 @@ namespace osu.Game.Screens.Select.Details
                     mod.ApplyToDifficulty(adjustedDifficulty);
             }
 
-            switch (BeatmapInfo?.Ruleset.OnlineID)
+            switch (gameRuleset.Value.OnlineID)
             {
                 case 3:
-                    // Account for mania differences locally for now
-                    // Eventually this should be handled in a more modular way, allowing rulesets to return arbitrary difficulty attributes
+                    // Account for mania differences locally for now.
+                    // Eventually this should be handled in a more modular way, allowing rulesets to return arbitrary difficulty attributes.
+                    ILegacyRuleset legacyRuleset = (ILegacyRuleset)gameRuleset.Value.CreateInstance();
+
+                    // For the time being, the key count is static no matter what, because:
+                    // a) The method doesn't have knowledge of the active keymods. Doing so may require considerations for filtering.
+                    // b) Using the difficulty adjustment mod to adjust OD doesn't have an effect on conversion.
+                    int keyCount = baseDifficulty == null ? 0 : legacyRuleset.GetKeyCount(BeatmapInfo);
+
                     FirstValue.Title = BeatmapsetsStrings.ShowStatsCsMania;
-                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, null);
+                    FirstValue.Value = (keyCount, keyCount);
+
                     break;
 
                 default:

From 1d0c37e13875b57b4f8dfaf2f0b4ab299b222a15 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 10 Dec 2023 00:40:05 +0200
Subject: [PATCH 1913/2296] fixed test errors

---
 osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs | 10 ++++++----
 osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs  |  6 +++---
 osu.Game/Screens/Select/Details/AdvancedStats.cs    |  8 --------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
index 3e800bfaf1..5314c6f4a9 100644
--- a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
+++ b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
@@ -17,11 +17,11 @@ namespace osu.Game.Overlays.Mods
 {
     public partial class AdjustedAttributesTooltip : CompositeDrawable, ITooltip
     {
-        private Dictionary<string, Bindable<OldNewPair>> attributes = new Dictionary<string, Bindable<OldNewPair>>();
+        private readonly Dictionary<string, Bindable<OldNewPair>> attributes = new Dictionary<string, Bindable<OldNewPair>>();
 
-        private Container content;
+        private readonly Container content;
 
-        private FillFlowContainer attributesFillFlow;
+        private readonly FillFlowContainer attributesFillFlow;
 
         [Resolved]
         private OsuColour colours { get; set; } = null!;
@@ -83,8 +83,8 @@ namespace osu.Game.Overlays.Mods
                     return;
                 }
             }
-            content.Hide();
 
+            content.Hide();
         }
 
         public void AddAttribute(string name)
@@ -97,6 +97,8 @@ namespace osu.Game.Overlays.Mods
 
         public void UpdateAttribute(string name, double oldValue, double newValue)
         {
+            if (!attributes.ContainsKey(name)) return;
+
             Bindable<OldNewPair> attribute = attributes[name];
 
             OldNewPair attributeValue = attribute.Value;
diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index fa8f9cb7a4..d74f088ac2 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -104,6 +104,9 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
+            rateAdjustTooltip.AddAttribute("AR");
+            rateAdjustTooltip.AddAttribute("OD");
+
             mods.BindValueChanged(_ =>
             {
                 modSettingChangeTracker?.Dispose();
@@ -126,9 +129,6 @@ namespace osu.Game.Overlays.Mods
 
             BeatmapInfo.BindValueChanged(_ => updateValues(), true);
 
-            rateAdjustTooltip.AddAttribute("AR");
-            rateAdjustTooltip.AddAttribute("OD");
-
             updateCollapsedState();
         }
 
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index d3a6a88c68..30cb0601f3 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -214,14 +214,6 @@ namespace osu.Game.Screens.Select.Details
             starDifficultyCancellationSource?.Cancel();
         }
 
-        private static bool hasRateAdjustedProperties(BeatmapDifficulty a, BeatmapDifficulty b)
-        {
-            if (!Precision.AlmostEquals(a.ApproachRate, b.ApproachRate)) return true;
-            if (!Precision.AlmostEquals(a.OverallDifficulty, b.OverallDifficulty)) return true;
-
-            return false;
-        }
-
         public partial class StatisticRow : Container, IHasAccentColour
         {
             private const float value_width = 25;

From 78cdedf34d1f0c24b5b1f7d342c58fc96d27e18a Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 10 Dec 2023 00:42:02 +0200
Subject: [PATCH 1914/2296] Update BeatmapAttributesDisplay.cs

---
 osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index d74f088ac2..0c35e55df5 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -62,7 +62,6 @@ namespace osu.Game.Overlays.Mods
         public ITooltip GetCustomTooltip() => rateAdjustTooltip;
         public object TooltipContent => this;
 
-
         private const float transition_duration = 250;
 
         [BackgroundDependencyLoader]

From f5b93121f1194591aab5d538062e48e7315f6589 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 10 Dec 2023 00:51:50 +0200
Subject: [PATCH 1915/2296] Update AdjustedAttributesTooltip.cs

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

diff --git a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
index 5314c6f4a9..e9b7ee5c54 100644
--- a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
+++ b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
@@ -111,6 +111,7 @@ namespace osu.Game.Overlays.Mods
         protected override void Update()
         {
         }
+
         public void SetContent(object content)
         {
         }
@@ -128,12 +129,13 @@ namespace osu.Game.Overlays.Mods
         private partial class AttributeDisplay : CompositeDrawable
         {
             public readonly Bindable<OldNewPair> AttributeValues;
-            public string AttributeName;
+            public readonly string AttributeName;
 
-            private OsuSpriteText text = new OsuSpriteText
+            private readonly OsuSpriteText text = new OsuSpriteText
             {
                 Font = OsuFont.Default.With(weight: FontWeight.Bold)
             };
+
             public AttributeDisplay(string name, Bindable<OldNewPair> boundCopy)
             {
                 AutoSizeAxes = Axes.Both;

From 2d94841929aae312a09b81c8aee45d2befabcb27 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Sun, 10 Dec 2023 02:00:32 +0200
Subject: [PATCH 1916/2296] fixed one test

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 30cb0601f3..819fe122fa 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -128,7 +128,8 @@ namespace osu.Game.Screens.Select.Details
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
             BeatmapDifficulty adjustedDifficulty = null;
 
-            if (baseDifficulty != null)
+            if (baseDifficulty != null &&
+                (mods.Value.Any(m => m is IApplicableToDifficulty) || mods.Value.Any(m => m is IApplicableToRate)))
             {
                 BeatmapDifficulty originalDifficulty = new BeatmapDifficulty(baseDifficulty);
 

From 6320194e19510bcd7cb26ad69b84a492fb0db6ab Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 11 Dec 2023 21:52:39 +0900
Subject: [PATCH 1917/2296] Fix catch applying positional clamping too early

---
 .../CatchBeatmapConversionTest.cs             |   1 +
 .../Beatmaps/112643-expected-conversion.json  |   1 +
 .../Resources/Testing/Beatmaps/112643.osu     | 582 ++++++++++++++++++
 .../Beatmaps/CatchBeatmapProcessor.cs         |  12 +
 .../Objects/JuiceStream.cs                    |  12 +-
 5 files changed, 600 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/112643-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/112643.osu

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index 7572c6670f..d0ecb828df 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase("3644427", new[] { typeof(CatchModEasy), typeof(CatchModFlashlight) })]
         [TestCase("3689906", new[] { typeof(CatchModDoubleTime), typeof(CatchModEasy) })]
         [TestCase("3949367", new[] { typeof(CatchModDoubleTime), typeof(CatchModEasy) })]
+        [TestCase("112643")]
         public new void Test(string name, params Type[] mods) => base.Test(name, mods);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/112643-expected-conversion.json b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/112643-expected-conversion.json
new file mode 100644
index 0000000000..7d6e29b6c1
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/112643-expected-conversion.json
@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":2375.0,"Objects":[{"StartTime":2375.0,"Position":64.0,"HyperDash":false}]},{"StartTime":2625.0,"Objects":[{"StartTime":2625.0,"Position":172.0,"HyperDash":false}]},{"StartTime":2875.0,"Objects":[{"StartTime":2875.0,"Position":152.0,"HyperDash":false}]},{"StartTime":3125.0,"Objects":[{"StartTime":3125.0,"Position":80.0,"HyperDash":false}]},{"StartTime":3375.0,"Objects":[{"StartTime":3375.0,"Position":224.0,"HyperDash":false}]},{"StartTime":3625.0,"Objects":[{"StartTime":3625.0,"Position":192.0,"HyperDash":false}]},{"StartTime":3875.0,"Objects":[{"StartTime":3875.0,"Position":136.0,"HyperDash":false}]},{"StartTime":4125.0,"Objects":[{"StartTime":4125.0,"Position":272.0,"HyperDash":false},{"StartTime":4187.0,"Position":295.965057,"HyperDash":false},{"StartTime":4250.0,"Position":339.30658,"HyperDash":false},{"StartTime":4312.0,"Position":372.55603,"HyperDash":false},{"StartTime":4375.0,"Position":372.509583,"HyperDash":false},{"StartTime":4437.0,"Position":372.203644,"HyperDash":false},{"StartTime":4500.0,"Position":340.885864,"HyperDash":false},{"StartTime":4562.0,"Position":348.843384,"HyperDash":false},{"StartTime":4625.0,"Position":384.566772,"HyperDash":false},{"StartTime":4749.0,"Position":462.643433,"HyperDash":false}]},{"StartTime":4875.0,"Objects":[{"StartTime":4875.0,"Position":504.0,"HyperDash":false},{"StartTime":4937.0,"Position":456.809235,"HyperDash":false},{"StartTime":5000.0,"Position":413.577362,"HyperDash":false},{"StartTime":5062.0,"Position":384.032623,"HyperDash":false},{"StartTime":5125.0,"Position":351.76297,"HyperDash":false},{"StartTime":5178.0,"Position":327.56488,"HyperDash":false},{"StartTime":5232.0,"Position":288.905457,"HyperDash":false},{"StartTime":5285.0,"Position":281.458923,"HyperDash":false},{"StartTime":5375.0,"Position":249.3499,"HyperDash":false}]},{"StartTime":5625.0,"Objects":[{"StartTime":5625.0,"Position":384.0,"HyperDash":false}]},{"StartTime":5875.0,"Objects":[{"StartTime":5875.0,"Position":272.0,"HyperDash":false}]},{"StartTime":6000.0,"Objects":[{"StartTime":6000.0,"Position":272.0,"HyperDash":false}]},{"StartTime":6125.0,"Objects":[{"StartTime":6125.0,"Position":272.0,"HyperDash":false}]},{"StartTime":6375.0,"Objects":[{"StartTime":6375.0,"Position":92.0,"HyperDash":false}]},{"StartTime":6625.0,"Objects":[{"StartTime":6625.0,"Position":124.0,"HyperDash":false}]},{"StartTime":6875.0,"Objects":[{"StartTime":6875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":7125.0,"Objects":[{"StartTime":7125.0,"Position":388.0,"HyperDash":false}]},{"StartTime":7375.0,"Objects":[{"StartTime":7375.0,"Position":420.0,"HyperDash":false}]},{"StartTime":7625.0,"Objects":[{"StartTime":7625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":7875.0,"Objects":[{"StartTime":7875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":8125.0,"Objects":[{"StartTime":8125.0,"Position":443.0,"HyperDash":false},{"StartTime":8187.0,"Position":392.598877,"HyperDash":false},{"StartTime":8250.0,"Position":365.1502,"HyperDash":false},{"StartTime":8312.0,"Position":352.954926,"HyperDash":false},{"StartTime":8375.0,"Position":294.614716,"HyperDash":false},{"StartTime":8437.0,"Position":268.171936,"HyperDash":false},{"StartTime":8500.0,"Position":207.09552,"HyperDash":false},{"StartTime":8562.0,"Position":158.395874,"HyperDash":false},{"StartTime":8625.0,"Position":135.590256,"HyperDash":false},{"StartTime":8749.0,"Position":67.66239,"HyperDash":false}]},{"StartTime":8875.0,"Objects":[{"StartTime":8875.0,"Position":24.0,"HyperDash":false},{"StartTime":8937.0,"Position":54.41505,"HyperDash":false},{"StartTime":9000.0,"Position":92.0854,"HyperDash":false},{"StartTime":9062.0,"Position":91.62684,"HyperDash":false},{"StartTime":9125.0,"Position":114.961037,"HyperDash":false},{"StartTime":9178.0,"Position":112.725426,"HyperDash":false},{"StartTime":9232.0,"Position":118.526962,"HyperDash":false},{"StartTime":9285.0,"Position":72.53759,"HyperDash":false},{"StartTime":9374.0,"Position":43.35332,"HyperDash":false}]},{"StartTime":9625.0,"Objects":[{"StartTime":9625.0,"Position":16.0,"HyperDash":false}]},{"StartTime":9875.0,"Objects":[{"StartTime":9875.0,"Position":136.0,"HyperDash":false}]},{"StartTime":10000.0,"Objects":[{"StartTime":10000.0,"Position":136.0,"HyperDash":false}]},{"StartTime":10125.0,"Objects":[{"StartTime":10125.0,"Position":136.0,"HyperDash":false}]},{"StartTime":10375.0,"Objects":[{"StartTime":10375.0,"Position":256.0,"HyperDash":false}]},{"StartTime":10625.0,"Objects":[{"StartTime":10625.0,"Position":368.0,"HyperDash":false}]},{"StartTime":10875.0,"Objects":[{"StartTime":10875.0,"Position":196.0,"HyperDash":false}]},{"StartTime":11125.0,"Objects":[{"StartTime":11125.0,"Position":316.0,"HyperDash":false}]},{"StartTime":11375.0,"Objects":[{"StartTime":11375.0,"Position":144.0,"HyperDash":false}]},{"StartTime":11625.0,"Objects":[{"StartTime":11625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":11875.0,"Objects":[{"StartTime":11875.0,"Position":112.0,"HyperDash":false}]},{"StartTime":12125.0,"Objects":[{"StartTime":12125.0,"Position":164.0,"HyperDash":false},{"StartTime":12250.0,"Position":238.49942,"HyperDash":false}]},{"StartTime":12500.0,"Objects":[{"StartTime":12500.0,"Position":100.0,"HyperDash":false},{"StartTime":12625.0,"Position":25.50058,"HyperDash":false}]},{"StartTime":12875.0,"Objects":[{"StartTime":12875.0,"Position":144.0,"HyperDash":false},{"StartTime":13000.0,"Position":69.50058,"HyperDash":false}]},{"StartTime":13250.0,"Objects":[{"StartTime":13250.0,"Position":208.0,"HyperDash":false},{"StartTime":13375.0,"Position":282.49942,"HyperDash":false}]},{"StartTime":13625.0,"Objects":[{"StartTime":13625.0,"Position":332.0,"HyperDash":false}]},{"StartTime":13875.0,"Objects":[{"StartTime":13875.0,"Position":180.0,"HyperDash":false}]},{"StartTime":14125.0,"Objects":[{"StartTime":14125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":14250.0,"Objects":[{"StartTime":14250.0,"Position":256.0,"HyperDash":false}]},{"StartTime":14500.0,"Objects":[{"StartTime":14500.0,"Position":324.0,"HyperDash":false}]},{"StartTime":14625.0,"Objects":[{"StartTime":14625.0,"Position":324.0,"HyperDash":false}]},{"StartTime":14875.0,"Objects":[{"StartTime":14875.0,"Position":192.0,"HyperDash":false}]},{"StartTime":15000.0,"Objects":[{"StartTime":15000.0,"Position":192.0,"HyperDash":false}]},{"StartTime":15250.0,"Objects":[{"StartTime":15250.0,"Position":256.0,"HyperDash":false}]},{"StartTime":15375.0,"Objects":[{"StartTime":15375.0,"Position":256.0,"HyperDash":false}]},{"StartTime":15625.0,"Objects":[{"StartTime":15625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":15875.0,"Objects":[{"StartTime":15875.0,"Position":120.0,"HyperDash":false}]},{"StartTime":16125.0,"Objects":[{"StartTime":16125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":18375.0,"Objects":[{"StartTime":18375.0,"Position":20.0,"HyperDash":false}]},{"StartTime":18625.0,"Objects":[{"StartTime":18625.0,"Position":180.0,"HyperDash":false}]},{"StartTime":18875.0,"Objects":[{"StartTime":18875.0,"Position":52.0,"HyperDash":false}]},{"StartTime":19125.0,"Objects":[{"StartTime":19125.0,"Position":120.0,"HyperDash":false}]},{"StartTime":19375.0,"Objects":[{"StartTime":19375.0,"Position":128.0,"HyperDash":false}]},{"StartTime":19625.0,"Objects":[{"StartTime":19625.0,"Position":48.0,"HyperDash":false}]},{"StartTime":19875.0,"Objects":[{"StartTime":19875.0,"Position":192.0,"HyperDash":false}]},{"StartTime":20125.0,"Objects":[{"StartTime":20125.0,"Position":300.0,"HyperDash":false},{"StartTime":20187.0,"Position":319.510284,"HyperDash":false},{"StartTime":20250.0,"Position":361.959717,"HyperDash":false},{"StartTime":20312.0,"Position":410.823639,"HyperDash":false},{"StartTime":20375.0,"Position":393.9937,"HyperDash":false},{"StartTime":20428.0,"Position":389.407,"HyperDash":false},{"StartTime":20482.0,"Position":394.563232,"HyperDash":false},{"StartTime":20535.0,"Position":430.098541,"HyperDash":false},{"StartTime":20624.0,"Position":486.9303,"HyperDash":false}]},{"StartTime":20875.0,"Objects":[{"StartTime":20875.0,"Position":472.0,"HyperDash":false},{"StartTime":20937.0,"Position":454.614349,"HyperDash":false},{"StartTime":21000.0,"Position":395.812744,"HyperDash":false},{"StartTime":21062.0,"Position":377.009979,"HyperDash":false},{"StartTime":21125.0,"Position":345.3677,"HyperDash":false},{"StartTime":21178.0,"Position":342.8652,"HyperDash":false},{"StartTime":21232.0,"Position":325.856567,"HyperDash":false},{"StartTime":21285.0,"Position":310.223846,"HyperDash":false},{"StartTime":21374.0,"Position":280.7244,"HyperDash":false}]},{"StartTime":21625.0,"Objects":[{"StartTime":21625.0,"Position":404.0,"HyperDash":false}]},{"StartTime":21875.0,"Objects":[{"StartTime":21875.0,"Position":432.0,"HyperDash":false}]},{"StartTime":22000.0,"Objects":[{"StartTime":22000.0,"Position":432.0,"HyperDash":false}]},{"StartTime":22125.0,"Objects":[{"StartTime":22125.0,"Position":432.0,"HyperDash":false}]},{"StartTime":22375.0,"Objects":[{"StartTime":22375.0,"Position":296.0,"HyperDash":false}]},{"StartTime":22625.0,"Objects":[{"StartTime":22625.0,"Position":168.0,"HyperDash":false},{"StartTime":22678.0,"Position":157.672318,"HyperDash":false},{"StartTime":22732.0,"Position":121.82901,"HyperDash":false},{"StartTime":22785.0,"Position":68.50134,"HyperDash":false},{"StartTime":22875.0,"Position":39.09584,"HyperDash":false}]},{"StartTime":23125.0,"Objects":[{"StartTime":23125.0,"Position":268.0,"HyperDash":false},{"StartTime":23178.0,"Position":252.906113,"HyperDash":false},{"StartTime":23232.0,"Position":215.4331,"HyperDash":false},{"StartTime":23285.0,"Position":192.339218,"HyperDash":false},{"StartTime":23375.0,"Position":173.217529,"HyperDash":false}]},{"StartTime":23625.0,"Objects":[{"StartTime":23625.0,"Position":252.0,"HyperDash":false},{"StartTime":23678.0,"Position":297.327667,"HyperDash":false},{"StartTime":23732.0,"Position":299.171,"HyperDash":false},{"StartTime":23785.0,"Position":350.498657,"HyperDash":false},{"StartTime":23875.0,"Position":380.904175,"HyperDash":false}]},{"StartTime":24125.0,"Objects":[{"StartTime":24125.0,"Position":484.0,"HyperDash":false},{"StartTime":24187.0,"Position":459.330444,"HyperDash":false},{"StartTime":24250.0,"Position":410.3108,"HyperDash":false},{"StartTime":24312.0,"Position":381.927948,"HyperDash":false},{"StartTime":24375.0,"Position":342.702942,"HyperDash":false},{"StartTime":24437.0,"Position":307.727,"HyperDash":false},{"StartTime":24500.0,"Position":254.618744,"HyperDash":false},{"StartTime":24562.0,"Position":219.823792,"HyperDash":false},{"StartTime":24625.0,"Position":195.842667,"HyperDash":false},{"StartTime":24750.0,"Position":124.114441,"HyperDash":false}]},{"StartTime":24875.0,"Objects":[{"StartTime":24875.0,"Position":72.0,"HyperDash":false},{"StartTime":24937.0,"Position":90.6446,"HyperDash":false},{"StartTime":25000.0,"Position":102.976662,"HyperDash":false},{"StartTime":25062.0,"Position":121.259918,"HyperDash":false},{"StartTime":25125.0,"Position":115.072632,"HyperDash":false},{"StartTime":25178.0,"Position":104.017952,"HyperDash":false},{"StartTime":25232.0,"Position":66.87554,"HyperDash":false},{"StartTime":25285.0,"Position":53.7148743,"HyperDash":false},{"StartTime":25374.0,"Position":0.0,"HyperDash":false}]},{"StartTime":25625.0,"Objects":[{"StartTime":25625.0,"Position":56.0,"HyperDash":false}]},{"StartTime":25875.0,"Objects":[{"StartTime":25875.0,"Position":176.0,"HyperDash":false}]},{"StartTime":26000.0,"Objects":[{"StartTime":26000.0,"Position":176.0,"HyperDash":false}]},{"StartTime":26125.0,"Objects":[{"StartTime":26125.0,"Position":176.0,"HyperDash":false}]},{"StartTime":26375.0,"Objects":[{"StartTime":26375.0,"Position":316.0,"HyperDash":false}]},{"StartTime":26625.0,"Objects":[{"StartTime":26625.0,"Position":464.0,"HyperDash":false},{"StartTime":26678.0,"Position":423.678864,"HyperDash":false},{"StartTime":26732.0,"Position":428.026764,"HyperDash":false},{"StartTime":26785.0,"Position":431.558746,"HyperDash":false},{"StartTime":26875.0,"Position":408.8022,"HyperDash":false}]},{"StartTime":27125.0,"Objects":[{"StartTime":27125.0,"Position":232.0,"HyperDash":false},{"StartTime":27178.0,"Position":266.0937,"HyperDash":false},{"StartTime":27232.0,"Position":284.472229,"HyperDash":false},{"StartTime":27285.0,"Position":289.223022,"HyperDash":false},{"StartTime":27374.0,"Position":288.2113,"HyperDash":false}]},{"StartTime":27625.0,"Objects":[{"StartTime":27625.0,"Position":136.0,"HyperDash":false}]},{"StartTime":27875.0,"Objects":[{"StartTime":27875.0,"Position":60.0,"HyperDash":false}]},{"StartTime":28125.0,"Objects":[{"StartTime":28125.0,"Position":212.0,"HyperDash":false},{"StartTime":28250.0,"Position":244.219086,"HyperDash":false}]},{"StartTime":28500.0,"Objects":[{"StartTime":28500.0,"Position":340.0,"HyperDash":false},{"StartTime":28625.0,"Position":372.2191,"HyperDash":false}]},{"StartTime":28875.0,"Objects":[{"StartTime":28875.0,"Position":256.0,"HyperDash":false},{"StartTime":29000.0,"Position":223.780914,"HyperDash":false}]},{"StartTime":29250.0,"Objects":[{"StartTime":29250.0,"Position":128.0,"HyperDash":false},{"StartTime":29375.0,"Position":95.7809143,"HyperDash":false}]},{"StartTime":29625.0,"Objects":[{"StartTime":29625.0,"Position":238.0,"HyperDash":false},{"StartTime":29678.0,"Position":279.04657,"HyperDash":false},{"StartTime":29731.0,"Position":322.09314,"HyperDash":false},{"StartTime":29784.0,"Position":325.1397,"HyperDash":false},{"StartTime":29874.0,"Position":397.954651,"HyperDash":false}]},{"StartTime":30125.0,"Objects":[{"StartTime":30125.0,"Position":512.0,"HyperDash":false}]},{"StartTime":30250.0,"Objects":[{"StartTime":30250.0,"Position":512.0,"HyperDash":false}]},{"StartTime":30500.0,"Objects":[{"StartTime":30500.0,"Position":416.0,"HyperDash":false}]},{"StartTime":30625.0,"Objects":[{"StartTime":30625.0,"Position":416.0,"HyperDash":false}]},{"StartTime":30875.0,"Objects":[{"StartTime":30875.0,"Position":300.0,"HyperDash":false}]},{"StartTime":31000.0,"Objects":[{"StartTime":31000.0,"Position":300.0,"HyperDash":false}]},{"StartTime":31250.0,"Objects":[{"StartTime":31250.0,"Position":236.0,"HyperDash":false}]},{"StartTime":31375.0,"Objects":[{"StartTime":31375.0,"Position":236.0,"HyperDash":false}]},{"StartTime":31625.0,"Objects":[{"StartTime":31625.0,"Position":152.0,"HyperDash":false}]},{"StartTime":31875.0,"Objects":[{"StartTime":31875.0,"Position":300.0,"HyperDash":false}]},{"StartTime":32125.0,"Objects":[{"StartTime":32125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":34625.0,"Objects":[{"StartTime":34625.0,"Position":52.0,"HyperDash":false}]},{"StartTime":34875.0,"Objects":[{"StartTime":34875.0,"Position":152.0,"HyperDash":false}]},{"StartTime":35125.0,"Objects":[{"StartTime":35125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":35625.0,"Objects":[{"StartTime":35625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":36125.0,"Objects":[{"StartTime":36125.0,"Position":256.0,"HyperDash":false},{"StartTime":36178.0,"Position":285.74295,"HyperDash":false},{"StartTime":36232.0,"Position":306.695557,"HyperDash":false},{"StartTime":36285.0,"Position":338.9461,"HyperDash":false},{"StartTime":36375.0,"Position":338.0262,"HyperDash":false}]},{"StartTime":36625.0,"Objects":[{"StartTime":36625.0,"Position":320.0,"HyperDash":false}]},{"StartTime":36875.0,"Objects":[{"StartTime":36875.0,"Position":204.0,"HyperDash":false}]},{"StartTime":37125.0,"Objects":[{"StartTime":37125.0,"Position":104.0,"HyperDash":false},{"StartTime":37178.0,"Position":84.88513,"HyperDash":false},{"StartTime":37232.0,"Position":58.02897,"HyperDash":false},{"StartTime":37285.0,"Position":32.3897247,"HyperDash":false},{"StartTime":37375.0,"Position":42.93435,"HyperDash":false}]},{"StartTime":37625.0,"Objects":[{"StartTime":37625.0,"Position":92.0,"HyperDash":false}]},{"StartTime":37875.0,"Objects":[{"StartTime":37875.0,"Position":212.0,"HyperDash":false}]},{"StartTime":38000.0,"Objects":[{"StartTime":38000.0,"Position":268.0,"HyperDash":false}]},{"StartTime":38125.0,"Objects":[{"StartTime":38125.0,"Position":324.0,"HyperDash":false},{"StartTime":38178.0,"Position":338.3627,"HyperDash":false},{"StartTime":38232.0,"Position":380.1851,"HyperDash":false},{"StartTime":38285.0,"Position":411.5478,"HyperDash":false},{"StartTime":38375.0,"Position":438.918457,"HyperDash":false}]},{"StartTime":38625.0,"Objects":[{"StartTime":38625.0,"Position":504.0,"HyperDash":false}]},{"StartTime":38875.0,"Objects":[{"StartTime":38875.0,"Position":364.0,"HyperDash":false}]},{"StartTime":39125.0,"Objects":[{"StartTime":39125.0,"Position":232.0,"HyperDash":false},{"StartTime":39187.0,"Position":199.986359,"HyperDash":false},{"StartTime":39250.0,"Position":169.811844,"HyperDash":false},{"StartTime":39312.0,"Position":133.274048,"HyperDash":false},{"StartTime":39375.0,"Position":115.502953,"HyperDash":false},{"StartTime":39437.0,"Position":95.79658,"HyperDash":false},{"StartTime":39500.0,"Position":126.272606,"HyperDash":false},{"StartTime":39562.0,"Position":153.43367,"HyperDash":false},{"StartTime":39625.0,"Position":177.594223,"HyperDash":false},{"StartTime":39687.0,"Position":138.43367,"HyperDash":false},{"StartTime":39750.0,"Position":126.007256,"HyperDash":false},{"StartTime":39812.0,"Position":110.796577,"HyperDash":false},{"StartTime":39875.0,"Position":115.652954,"HyperDash":false},{"StartTime":39928.0,"Position":111.270706,"HyperDash":false},{"StartTime":39982.0,"Position":160.599289,"HyperDash":false},{"StartTime":40035.0,"Position":158.120911,"HyperDash":false},{"StartTime":40124.0,"Position":232.0,"HyperDash":false}]},{"StartTime":40375.0,"Objects":[{"StartTime":40375.0,"Position":280.0,"HyperDash":false}]},{"StartTime":40625.0,"Objects":[{"StartTime":40625.0,"Position":400.0,"HyperDash":false},{"StartTime":40678.0,"Position":429.074829,"HyperDash":false},{"StartTime":40732.0,"Position":455.5662,"HyperDash":false},{"StartTime":40785.0,"Position":457.641022,"HyperDash":false},{"StartTime":40875.0,"Position":504.126617,"HyperDash":false}]},{"StartTime":41125.0,"Objects":[{"StartTime":41125.0,"Position":480.0,"HyperDash":false}]},{"StartTime":41375.0,"Objects":[{"StartTime":41375.0,"Position":324.0,"HyperDash":false}]},{"StartTime":41625.0,"Objects":[{"StartTime":41625.0,"Position":168.0,"HyperDash":false}]},{"StartTime":41875.0,"Objects":[{"StartTime":41875.0,"Position":72.0,"HyperDash":false}]},{"StartTime":42000.0,"Objects":[{"StartTime":42000.0,"Position":48.0,"HyperDash":false}]},{"StartTime":42125.0,"Objects":[{"StartTime":42125.0,"Position":96.0,"HyperDash":false},{"StartTime":42178.0,"Position":114.931221,"HyperDash":false},{"StartTime":42232.0,"Position":153.604843,"HyperDash":false},{"StartTime":42285.0,"Position":193.4396,"HyperDash":false},{"StartTime":42374.0,"Position":240.778946,"HyperDash":false}]},{"StartTime":42625.0,"Objects":[{"StartTime":42625.0,"Position":400.0,"HyperDash":false}]},{"StartTime":42875.0,"Objects":[{"StartTime":42875.0,"Position":440.0,"HyperDash":false}]},{"StartTime":43000.0,"Objects":[{"StartTime":43000.0,"Position":464.0,"HyperDash":false}]},{"StartTime":43125.0,"Objects":[{"StartTime":43125.0,"Position":416.0,"HyperDash":false},{"StartTime":43178.0,"Position":375.182983,"HyperDash":false},{"StartTime":43232.0,"Position":366.663025,"HyperDash":false},{"StartTime":43285.0,"Position":335.968475,"HyperDash":false},{"StartTime":43375.0,"Position":271.221039,"HyperDash":false}]},{"StartTime":43625.0,"Objects":[{"StartTime":43625.0,"Position":112.0,"HyperDash":false}]},{"StartTime":43875.0,"Objects":[{"StartTime":43875.0,"Position":140.0,"HyperDash":false}]},{"StartTime":44125.0,"Objects":[{"StartTime":44125.0,"Position":52.0,"HyperDash":false}]},{"StartTime":44375.0,"Objects":[{"StartTime":44375.0,"Position":208.0,"HyperDash":false}]},{"StartTime":44625.0,"Objects":[{"StartTime":44625.0,"Position":344.0,"HyperDash":false}]},{"StartTime":44875.0,"Objects":[{"StartTime":44875.0,"Position":448.0,"HyperDash":false},{"StartTime":44937.0,"Position":411.344635,"HyperDash":false},{"StartTime":45000.0,"Position":386.572845,"HyperDash":false},{"StartTime":45062.0,"Position":355.1799,"HyperDash":false},{"StartTime":45125.0,"Position":304.139374,"HyperDash":false},{"StartTime":45187.0,"Position":271.8332,"HyperDash":false},{"StartTime":45250.0,"Position":232.840988,"HyperDash":false},{"StartTime":45312.0,"Position":235.629944,"HyperDash":false},{"StartTime":45375.0,"Position":232.882874,"HyperDash":false},{"StartTime":45437.0,"Position":251.629944,"HyperDash":false},{"StartTime":45500.0,"Position":243.152222,"HyperDash":false},{"StartTime":45562.0,"Position":270.8332,"HyperDash":false},{"StartTime":45625.0,"Position":304.729126,"HyperDash":false},{"StartTime":45678.0,"Position":323.441345,"HyperDash":false},{"StartTime":45732.0,"Position":370.914246,"HyperDash":false},{"StartTime":45785.0,"Position":421.2586,"HyperDash":false},{"StartTime":45874.0,"Position":448.0,"HyperDash":false}]},{"StartTime":46125.0,"Objects":[{"StartTime":46125.0,"Position":326.0,"HyperDash":false},{"StartTime":46187.0,"Position":309.377716,"HyperDash":false},{"StartTime":46250.0,"Position":271.650543,"HyperDash":false},{"StartTime":46312.0,"Position":219.299332,"HyperDash":false},{"StartTime":46375.0,"Position":182.286819,"HyperDash":false},{"StartTime":46428.0,"Position":144.357529,"HyperDash":false},{"StartTime":46482.0,"Position":145.0256,"HyperDash":false},{"StartTime":46535.0,"Position":101.934631,"HyperDash":false},{"StartTime":46625.0,"Position":110.882874,"HyperDash":false}]},{"StartTime":46875.0,"Objects":[{"StartTime":46875.0,"Position":230.0,"HyperDash":false},{"StartTime":46937.0,"Position":247.622284,"HyperDash":false},{"StartTime":47000.0,"Position":299.3495,"HyperDash":false},{"StartTime":47062.0,"Position":322.700653,"HyperDash":false},{"StartTime":47125.0,"Position":373.7132,"HyperDash":false},{"StartTime":47178.0,"Position":390.642456,"HyperDash":false},{"StartTime":47232.0,"Position":424.974426,"HyperDash":false},{"StartTime":47285.0,"Position":428.065369,"HyperDash":false},{"StartTime":47375.0,"Position":445.1171,"HyperDash":false}]},{"StartTime":47625.0,"Objects":[{"StartTime":47625.0,"Position":376.0,"HyperDash":false}]},{"StartTime":48125.0,"Objects":[{"StartTime":48125.0,"Position":376.0,"HyperDash":false},{"StartTime":48178.0,"Position":340.223816,"HyperDash":false},{"StartTime":48232.0,"Position":305.204224,"HyperDash":false},{"StartTime":48285.0,"Position":270.449249,"HyperDash":false},{"StartTime":48375.0,"Position":222.9901,"HyperDash":false}]},{"StartTime":48625.0,"Objects":[{"StartTime":48625.0,"Position":84.0,"HyperDash":false}]},{"StartTime":48875.0,"Objects":[{"StartTime":48875.0,"Position":152.0,"HyperDash":false}]},{"StartTime":49125.0,"Objects":[{"StartTime":49125.0,"Position":44.0,"HyperDash":false},{"StartTime":49178.0,"Position":69.96314,"HyperDash":false},{"StartTime":49232.0,"Position":103.8065,"HyperDash":false},{"StartTime":49285.0,"Position":156.7781,"HyperDash":false},{"StartTime":49374.0,"Position":197.1017,"HyperDash":false}]},{"StartTime":49625.0,"Objects":[{"StartTime":49625.0,"Position":336.0,"HyperDash":false}]},{"StartTime":49875.0,"Objects":[{"StartTime":49875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":50125.0,"Objects":[{"StartTime":50125.0,"Position":176.0,"HyperDash":false}]},{"StartTime":50625.0,"Objects":[{"StartTime":50625.0,"Position":340.0,"HyperDash":false}]},{"StartTime":50875.0,"Objects":[{"StartTime":50875.0,"Position":420.0,"HyperDash":false}]},{"StartTime":51125.0,"Objects":[{"StartTime":51125.0,"Position":500.0,"HyperDash":false}]},{"StartTime":51625.0,"Objects":[{"StartTime":51625.0,"Position":172.0,"HyperDash":false}]},{"StartTime":51875.0,"Objects":[{"StartTime":51875.0,"Position":92.0,"HyperDash":false}]},{"StartTime":52125.0,"Objects":[{"StartTime":52125.0,"Position":12.0,"HyperDash":false},{"StartTime":52178.0,"Position":43.4575653,"HyperDash":false},{"StartTime":52232.0,"Position":57.4520721,"HyperDash":false},{"StartTime":52285.0,"Position":85.90964,"HyperDash":false},{"StartTime":52375.0,"Position":146.23381,"HyperDash":false}]},{"StartTime":52625.0,"Objects":[{"StartTime":52625.0,"Position":304.0,"HyperDash":false}]},{"StartTime":52875.0,"Objects":[{"StartTime":52875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":53125.0,"Objects":[{"StartTime":53125.0,"Position":216.0,"HyperDash":false},{"StartTime":53178.0,"Position":229.457565,"HyperDash":false},{"StartTime":53232.0,"Position":269.452057,"HyperDash":false},{"StartTime":53285.0,"Position":304.909637,"HyperDash":false},{"StartTime":53375.0,"Position":350.233826,"HyperDash":false}]},{"StartTime":53625.0,"Objects":[{"StartTime":53625.0,"Position":508.0,"HyperDash":false}]},{"StartTime":53875.0,"Objects":[{"StartTime":53875.0,"Position":460.0,"HyperDash":false}]},{"StartTime":54125.0,"Objects":[{"StartTime":54125.0,"Position":344.0,"HyperDash":false}]},{"StartTime":54375.0,"Objects":[{"StartTime":54375.0,"Position":228.0,"HyperDash":false}]},{"StartTime":54625.0,"Objects":[{"StartTime":54625.0,"Position":153.0,"HyperDash":false}]},{"StartTime":54875.0,"Objects":[{"StartTime":54875.0,"Position":72.0,"HyperDash":false}]},{"StartTime":55125.0,"Objects":[{"StartTime":55125.0,"Position":180.0,"HyperDash":false}]},{"StartTime":55375.0,"Objects":[{"StartTime":55375.0,"Position":284.0,"HyperDash":false}]},{"StartTime":55625.0,"Objects":[{"StartTime":55625.0,"Position":359.0,"HyperDash":false}]},{"StartTime":55875.0,"Objects":[{"StartTime":55875.0,"Position":440.0,"HyperDash":false}]},{"StartTime":56125.0,"Objects":[{"StartTime":56125.0,"Position":352.0,"HyperDash":false},{"StartTime":56178.0,"Position":355.0677,"HyperDash":false},{"StartTime":56231.0,"Position":396.135376,"HyperDash":false},{"StartTime":56284.0,"Position":431.2031,"HyperDash":false},{"StartTime":56374.0,"Position":455.6765,"HyperDash":false}]},{"StartTime":56625.0,"Objects":[{"StartTime":56625.0,"Position":312.0,"HyperDash":false}]},{"StartTime":56875.0,"Objects":[{"StartTime":56875.0,"Position":200.0,"HyperDash":false}]},{"StartTime":57125.0,"Objects":[{"StartTime":57125.0,"Position":160.0,"HyperDash":false},{"StartTime":57178.0,"Position":134.932312,"HyperDash":false},{"StartTime":57231.0,"Position":131.864609,"HyperDash":false},{"StartTime":57284.0,"Position":84.7969055,"HyperDash":false},{"StartTime":57374.0,"Position":56.32347,"HyperDash":false}]},{"StartTime":57625.0,"Objects":[{"StartTime":57625.0,"Position":200.0,"HyperDash":false}]},{"StartTime":57875.0,"Objects":[{"StartTime":57875.0,"Position":312.0,"HyperDash":false}]},{"StartTime":58125.0,"Objects":[{"StartTime":58125.0,"Position":444.0,"HyperDash":false},{"StartTime":58178.0,"Position":405.081421,"HyperDash":false},{"StartTime":58232.0,"Position":380.062256,"HyperDash":false},{"StartTime":58285.0,"Position":399.193085,"HyperDash":false},{"StartTime":58374.0,"Position":377.6735,"HyperDash":false}]},{"StartTime":58500.0,"Objects":[{"StartTime":58500.0,"Position":344.0,"HyperDash":false}]},{"StartTime":58625.0,"Objects":[{"StartTime":58625.0,"Position":272.0,"HyperDash":false},{"StartTime":58678.0,"Position":263.870544,"HyperDash":false},{"StartTime":58732.0,"Position":246.779541,"HyperDash":false},{"StartTime":58785.0,"Position":179.497513,"HyperDash":false},{"StartTime":58875.0,"Position":139.25528,"HyperDash":false}]},{"StartTime":59125.0,"Objects":[{"StartTime":59125.0,"Position":68.0,"HyperDash":false},{"StartTime":59178.0,"Position":89.57149,"HyperDash":false},{"StartTime":59232.0,"Position":123.207489,"HyperDash":false},{"StartTime":59285.0,"Position":141.936157,"HyperDash":false},{"StartTime":59375.0,"Position":133.961975,"HyperDash":false}]},{"StartTime":59500.0,"Objects":[{"StartTime":59500.0,"Position":168.0,"HyperDash":false}]},{"StartTime":59625.0,"Objects":[{"StartTime":59625.0,"Position":240.0,"HyperDash":false},{"StartTime":59678.0,"Position":245.129486,"HyperDash":false},{"StartTime":59732.0,"Position":270.220459,"HyperDash":false},{"StartTime":59785.0,"Position":296.5025,"HyperDash":false},{"StartTime":59875.0,"Position":372.74472,"HyperDash":false}]},{"StartTime":60125.0,"Objects":[{"StartTime":60125.0,"Position":456.0,"HyperDash":false}]},{"StartTime":60375.0,"Objects":[{"StartTime":60375.0,"Position":328.0,"HyperDash":false}]},{"StartTime":60625.0,"Objects":[{"StartTime":60625.0,"Position":216.0,"HyperDash":false}]},{"StartTime":60875.0,"Objects":[{"StartTime":60875.0,"Position":72.0,"HyperDash":false},{"StartTime":60937.0,"Position":71.25553,"HyperDash":false},{"StartTime":61000.0,"Position":61.5583878,"HyperDash":false},{"StartTime":61062.0,"Position":98.84126,"HyperDash":false},{"StartTime":61125.0,"Position":119.510284,"HyperDash":false},{"StartTime":61187.0,"Position":142.845825,"HyperDash":false},{"StartTime":61250.0,"Position":184.319992,"HyperDash":false},{"StartTime":61312.0,"Position":240.90744,"HyperDash":false},{"StartTime":61375.0,"Position":269.728363,"HyperDash":false},{"StartTime":61437.0,"Position":239.90744,"HyperDash":false},{"StartTime":61500.0,"Position":197.687851,"HyperDash":false},{"StartTime":61562.0,"Position":150.845825,"HyperDash":false},{"StartTime":61625.0,"Position":119.024872,"HyperDash":false},{"StartTime":61678.0,"Position":90.12531,"HyperDash":false},{"StartTime":61732.0,"Position":72.3374557,"HyperDash":false},{"StartTime":61785.0,"Position":89.06496,"HyperDash":false},{"StartTime":61874.0,"Position":72.0,"HyperDash":false}]},{"StartTime":62125.0,"Objects":[{"StartTime":62125.0,"Position":200.0,"HyperDash":false},{"StartTime":62187.0,"Position":191.234039,"HyperDash":false},{"StartTime":62250.0,"Position":203.319962,"HyperDash":false},{"StartTime":62312.0,"Position":235.3192,"HyperDash":false},{"StartTime":62375.0,"Position":246.7092,"HyperDash":false},{"StartTime":62428.0,"Position":291.675018,"HyperDash":false},{"StartTime":62482.0,"Position":309.9024,"HyperDash":false},{"StartTime":62535.0,"Position":336.449463,"HyperDash":false},{"StartTime":62625.0,"Position":396.8608,"HyperDash":false}]},{"StartTime":62875.0,"Objects":[{"StartTime":62875.0,"Position":480.0,"HyperDash":false},{"StartTime":62937.0,"Position":492.1737,"HyperDash":false},{"StartTime":63000.0,"Position":476.1641,"HyperDash":false},{"StartTime":63062.0,"Position":475.045135,"HyperDash":false},{"StartTime":63125.0,"Position":433.461975,"HyperDash":false},{"StartTime":63178.0,"Position":389.354034,"HyperDash":false},{"StartTime":63232.0,"Position":366.034546,"HyperDash":false},{"StartTime":63285.0,"Position":321.454956,"HyperDash":false},{"StartTime":63375.0,"Position":283.111176,"HyperDash":false}]},{"StartTime":63625.0,"Objects":[{"StartTime":63625.0,"Position":136.0,"HyperDash":false},{"StartTime":63678.0,"Position":111.887825,"HyperDash":false},{"StartTime":63732.0,"Position":108.904541,"HyperDash":false},{"StartTime":63785.0,"Position":105.234535,"HyperDash":false},{"StartTime":63874.0,"Position":128.127991,"HyperDash":false}]},{"StartTime":64125.0,"Objects":[{"StartTime":64125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":64375.0,"Objects":[{"StartTime":64375.0,"Position":284.0,"HyperDash":false}]},{"StartTime":64625.0,"Objects":[{"StartTime":64625.0,"Position":440.0,"HyperDash":false}]},{"StartTime":64875.0,"Objects":[{"StartTime":64875.0,"Position":420.0,"HyperDash":false}]},{"StartTime":65125.0,"Objects":[{"StartTime":65125.0,"Position":300.0,"HyperDash":false}]},{"StartTime":65375.0,"Objects":[{"StartTime":65375.0,"Position":272.0,"HyperDash":false}]},{"StartTime":65625.0,"Objects":[{"StartTime":65625.0,"Position":116.0,"HyperDash":false}]},{"StartTime":65875.0,"Objects":[{"StartTime":65875.0,"Position":136.0,"HyperDash":false}]},{"StartTime":66125.0,"Objects":[{"StartTime":66125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":68125.0,"Objects":[{"StartTime":68125.0,"Position":256.0,"HyperDash":false},{"StartTime":68187.0,"Position":266.157,"HyperDash":false},{"StartTime":68250.0,"Position":280.344269,"HyperDash":false},{"StartTime":68312.0,"Position":243.4508,"HyperDash":false},{"StartTime":68375.0,"Position":216.9601,"HyperDash":false},{"StartTime":68428.0,"Position":173.102234,"HyperDash":false},{"StartTime":68482.0,"Position":150.915558,"HyperDash":false},{"StartTime":68535.0,"Position":106.794662,"HyperDash":false},{"StartTime":68625.0,"Position":73.61266,"HyperDash":false}]},{"StartTime":68875.0,"Objects":[{"StartTime":68875.0,"Position":132.0,"HyperDash":false},{"StartTime":68937.0,"Position":160.783325,"HyperDash":false},{"StartTime":69000.0,"Position":193.9825,"HyperDash":false},{"StartTime":69062.0,"Position":205.765823,"HyperDash":false},{"StartTime":69125.0,"Position":235.965,"HyperDash":false},{"StartTime":69178.0,"Position":262.005585,"HyperDash":false},{"StartTime":69232.0,"Position":285.462,"HyperDash":false},{"StartTime":69285.0,"Position":302.5026,"HyperDash":false},{"StartTime":69375.0,"Position":339.93,"HyperDash":false}]},{"StartTime":69625.0,"Objects":[{"StartTime":69625.0,"Position":456.0,"HyperDash":false}]},{"StartTime":69875.0,"Objects":[{"StartTime":69875.0,"Position":340.0,"HyperDash":false}]},{"StartTime":70000.0,"Objects":[{"StartTime":70000.0,"Position":340.0,"HyperDash":false}]},{"StartTime":70125.0,"Objects":[{"StartTime":70125.0,"Position":340.0,"HyperDash":false}]},{"StartTime":70375.0,"Objects":[{"StartTime":70375.0,"Position":228.0,"HyperDash":false}]},{"StartTime":70625.0,"Objects":[{"StartTime":70625.0,"Position":256.0,"HyperDash":false},{"StartTime":70678.0,"Position":210.6065,"HyperDash":false},{"StartTime":70732.0,"Position":177.325424,"HyperDash":false},{"StartTime":70785.0,"Position":151.573288,"HyperDash":false},{"StartTime":70875.0,"Position":107.425896,"HyperDash":false}]},{"StartTime":71125.0,"Objects":[{"StartTime":71125.0,"Position":148.0,"HyperDash":false},{"StartTime":71178.0,"Position":184.328445,"HyperDash":false},{"StartTime":71232.0,"Position":200.780228,"HyperDash":false},{"StartTime":71285.0,"Position":257.6842,"HyperDash":false},{"StartTime":71374.0,"Position":296.433563,"HyperDash":false}]},{"StartTime":71625.0,"Objects":[{"StartTime":71625.0,"Position":424.0,"HyperDash":false}]},{"StartTime":71875.0,"Objects":[{"StartTime":71875.0,"Position":336.0,"HyperDash":false}]},{"StartTime":72000.0,"Objects":[{"StartTime":72000.0,"Position":336.0,"HyperDash":false}]},{"StartTime":72125.0,"Objects":[{"StartTime":72125.0,"Position":336.0,"HyperDash":false}]},{"StartTime":72375.0,"Objects":[{"StartTime":72375.0,"Position":228.0,"HyperDash":false},{"StartTime":72428.0,"Position":211.104858,"HyperDash":false},{"StartTime":72482.0,"Position":163.608932,"HyperDash":false},{"StartTime":72535.0,"Position":134.045914,"HyperDash":false},{"StartTime":72625.0,"Position":143.764755,"HyperDash":false}]},{"StartTime":72875.0,"Objects":[{"StartTime":72875.0,"Position":268.0,"HyperDash":false},{"StartTime":72937.0,"Position":248.6492,"HyperDash":false},{"StartTime":73000.0,"Position":273.503021,"HyperDash":false},{"StartTime":73062.0,"Position":247.768143,"HyperDash":false},{"StartTime":73125.0,"Position":228.062622,"HyperDash":false},{"StartTime":73178.0,"Position":204.959824,"HyperDash":false},{"StartTime":73232.0,"Position":170.633987,"HyperDash":false},{"StartTime":73285.0,"Position":155.368179,"HyperDash":false},{"StartTime":73375.0,"Position":103.8164,"HyperDash":false}]},{"StartTime":73625.0,"Objects":[{"StartTime":73625.0,"Position":24.0,"HyperDash":false}]},{"StartTime":73875.0,"Objects":[{"StartTime":73875.0,"Position":92.0,"HyperDash":false}]},{"StartTime":74000.0,"Objects":[{"StartTime":74000.0,"Position":92.0,"HyperDash":false}]},{"StartTime":74125.0,"Objects":[{"StartTime":74125.0,"Position":92.0,"HyperDash":false}]},{"StartTime":74375.0,"Objects":[{"StartTime":74375.0,"Position":224.0,"HyperDash":false}]},{"StartTime":74625.0,"Objects":[{"StartTime":74625.0,"Position":340.0,"HyperDash":false},{"StartTime":74678.0,"Position":381.308228,"HyperDash":false},{"StartTime":74732.0,"Position":376.477844,"HyperDash":false},{"StartTime":74785.0,"Position":399.771942,"HyperDash":false},{"StartTime":74875.0,"Position":387.2963,"HyperDash":false}]},{"StartTime":75125.0,"Objects":[{"StartTime":75125.0,"Position":268.0,"HyperDash":false},{"StartTime":75178.0,"Position":219.691772,"HyperDash":false},{"StartTime":75232.0,"Position":224.522156,"HyperDash":false},{"StartTime":75285.0,"Position":185.228043,"HyperDash":false},{"StartTime":75375.0,"Position":220.70369,"HyperDash":false}]},{"StartTime":75625.0,"Objects":[{"StartTime":75625.0,"Position":268.0,"HyperDash":false},{"StartTime":75678.0,"Position":251.437485,"HyperDash":false},{"StartTime":75732.0,"Position":209.2417,"HyperDash":false},{"StartTime":75785.0,"Position":166.6792,"HyperDash":false},{"StartTime":75875.0,"Position":109.686234,"HyperDash":false}]},{"StartTime":76125.0,"Objects":[{"StartTime":76125.0,"Position":24.0,"HyperDash":false},{"StartTime":76250.0,"Position":103.510704,"HyperDash":false}]},{"StartTime":76375.0,"Objects":[{"StartTime":76375.0,"Position":176.0,"HyperDash":false}]},{"StartTime":76625.0,"Objects":[{"StartTime":76625.0,"Position":348.0,"HyperDash":false}]},{"StartTime":76875.0,"Objects":[{"StartTime":76875.0,"Position":248.0,"HyperDash":false}]},{"StartTime":77125.0,"Objects":[{"StartTime":77125.0,"Position":264.0,"HyperDash":false}]},{"StartTime":77375.0,"Objects":[{"StartTime":77375.0,"Position":324.0,"HyperDash":false}]},{"StartTime":77625.0,"Objects":[{"StartTime":77625.0,"Position":180.0,"HyperDash":false}]},{"StartTime":77875.0,"Objects":[{"StartTime":77875.0,"Position":240.0,"HyperDash":false}]},{"StartTime":78125.0,"Objects":[{"StartTime":78125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":78375.0,"Objects":[{"StartTime":78375.0,"Position":100.0,"HyperDash":false}]},{"StartTime":78625.0,"Objects":[{"StartTime":78625.0,"Position":8.0,"HyperDash":false},{"StartTime":78678.0,"Position":30.0805969,"HyperDash":false},{"StartTime":78732.0,"Position":72.26928,"HyperDash":false},{"StartTime":78785.0,"Position":94.77067,"HyperDash":false},{"StartTime":78874.0,"Position":149.724487,"HyperDash":false}]},{"StartTime":79125.0,"Objects":[{"StartTime":79125.0,"Position":304.0,"HyperDash":false},{"StartTime":79178.0,"Position":282.0235,"HyperDash":false},{"StartTime":79232.0,"Position":238.981018,"HyperDash":false},{"StartTime":79285.0,"Position":222.634567,"HyperDash":false},{"StartTime":79375.0,"Position":162.2755,"HyperDash":false}]},{"StartTime":79625.0,"Objects":[{"StartTime":79625.0,"Position":304.0,"HyperDash":false}]},{"StartTime":79875.0,"Objects":[{"StartTime":79875.0,"Position":460.0,"HyperDash":false}]},{"StartTime":80125.0,"Objects":[{"StartTime":80125.0,"Position":420.0,"HyperDash":false},{"StartTime":80250.0,"Position":340.0,"HyperDash":false}]},{"StartTime":80375.0,"Objects":[{"StartTime":80375.0,"Position":256.0,"HyperDash":false}]},{"StartTime":80625.0,"Objects":[{"StartTime":80625.0,"Position":344.0,"HyperDash":false}]},{"StartTime":80875.0,"Objects":[{"StartTime":80875.0,"Position":168.0,"HyperDash":false}]},{"StartTime":81125.0,"Objects":[{"StartTime":81125.0,"Position":384.0,"HyperDash":false}]},{"StartTime":81375.0,"Objects":[{"StartTime":81375.0,"Position":256.0,"HyperDash":false}]},{"StartTime":81625.0,"Objects":[{"StartTime":81625.0,"Position":168.0,"HyperDash":false}]},{"StartTime":81875.0,"Objects":[{"StartTime":81875.0,"Position":344.0,"HyperDash":false}]},{"StartTime":82125.0,"Objects":[{"StartTime":82125.0,"Position":128.0,"HyperDash":false}]},{"StartTime":82250.0,"Objects":[{"StartTime":82250.0,"Position":48.0,"HyperDash":false},{"StartTime":82303.0,"Position":38.86482,"HyperDash":false},{"StartTime":82357.0,"Position":53.93512,"HyperDash":false},{"StartTime":82410.0,"Position":60.0134125,"HyperDash":false},{"StartTime":82500.0,"Position":124.821884,"HyperDash":false}]},{"StartTime":82625.0,"Objects":[{"StartTime":82625.0,"Position":204.0,"HyperDash":false},{"StartTime":82678.0,"Position":208.888657,"HyperDash":false},{"StartTime":82731.0,"Position":211.78508,"HyperDash":false},{"StartTime":82784.0,"Position":215.863892,"HyperDash":false},{"StartTime":82874.0,"Position":280.821869,"HyperDash":false}]},{"StartTime":83000.0,"Objects":[{"StartTime":83000.0,"Position":352.0,"HyperDash":false},{"StartTime":83053.0,"Position":303.246552,"HyperDash":false},{"StartTime":83107.0,"Position":291.2771,"HyperDash":false},{"StartTime":83160.0,"Position":254.710571,"HyperDash":false},{"StartTime":83250.0,"Position":222.496063,"HyperDash":false}]},{"StartTime":83375.0,"Objects":[{"StartTime":83375.0,"Position":192.0,"HyperDash":false},{"StartTime":83428.0,"Position":152.246567,"HyperDash":false},{"StartTime":83482.0,"Position":112.277092,"HyperDash":false},{"StartTime":83535.0,"Position":87.71058,"HyperDash":false},{"StartTime":83625.0,"Position":62.496067,"HyperDash":false}]},{"StartTime":83875.0,"Objects":[{"StartTime":83875.0,"Position":32.0,"HyperDash":false}]},{"StartTime":84125.0,"Objects":[{"StartTime":84125.0,"Position":172.0,"HyperDash":false}]},{"StartTime":84250.0,"Objects":[{"StartTime":84250.0,"Position":179.0,"HyperDash":false},{"StartTime":84308.0,"Position":278.0,"HyperDash":false},{"StartTime":84367.0,"Position":474.0,"HyperDash":false},{"StartTime":84425.0,"Position":50.0,"HyperDash":false},{"StartTime":84484.0,"Position":458.0,"HyperDash":false},{"StartTime":84542.0,"Position":425.0,"HyperDash":false},{"StartTime":84601.0,"Position":466.0,"HyperDash":false},{"StartTime":84660.0,"Position":56.0,"HyperDash":false},{"StartTime":84718.0,"Position":109.0,"HyperDash":false},{"StartTime":84777.0,"Position":482.0,"HyperDash":false},{"StartTime":84835.0,"Position":147.0,"HyperDash":false},{"StartTime":84894.0,"Position":285.0,"HyperDash":false},{"StartTime":84953.0,"Position":452.0,"HyperDash":false},{"StartTime":85011.0,"Position":419.0,"HyperDash":false},{"StartTime":85070.0,"Position":269.0,"HyperDash":false},{"StartTime":85128.0,"Position":249.0,"HyperDash":false},{"StartTime":85187.0,"Position":233.0,"HyperDash":false},{"StartTime":85246.0,"Position":449.0,"HyperDash":false},{"StartTime":85304.0,"Position":411.0,"HyperDash":false},{"StartTime":85363.0,"Position":75.0,"HyperDash":false},{"StartTime":85421.0,"Position":474.0,"HyperDash":false},{"StartTime":85480.0,"Position":176.0,"HyperDash":false},{"StartTime":85539.0,"Position":1.0,"HyperDash":false},{"StartTime":85597.0,"Position":37.0,"HyperDash":false},{"StartTime":85656.0,"Position":481.0,"HyperDash":false},{"StartTime":85714.0,"Position":375.0,"HyperDash":false},{"StartTime":85773.0,"Position":407.0,"HyperDash":false},{"StartTime":85832.0,"Position":231.0,"HyperDash":false},{"StartTime":85890.0,"Position":338.0,"HyperDash":false},{"StartTime":85949.0,"Position":322.0,"HyperDash":false},{"StartTime":86007.0,"Position":347.0,"HyperDash":false},{"StartTime":86066.0,"Position":365.0,"HyperDash":false},{"StartTime":86125.0,"Position":453.0,"HyperDash":false}]},{"StartTime":86250.0,"Objects":[{"StartTime":86250.0,"Position":486.0,"HyperDash":false},{"StartTime":86304.0,"Position":68.0,"HyperDash":false},{"StartTime":86359.0,"Position":498.0,"HyperDash":false},{"StartTime":86414.0,"Position":164.0,"HyperDash":false},{"StartTime":86468.0,"Position":1.0,"HyperDash":false},{"StartTime":86523.0,"Position":501.0,"HyperDash":false},{"StartTime":86578.0,"Position":82.0,"HyperDash":false},{"StartTime":86632.0,"Position":494.0,"HyperDash":false},{"StartTime":86687.0,"Position":479.0,"HyperDash":false},{"StartTime":86742.0,"Position":373.0,"HyperDash":false},{"StartTime":86796.0,"Position":450.0,"HyperDash":false},{"StartTime":86851.0,"Position":144.0,"HyperDash":false},{"StartTime":86906.0,"Position":365.0,"HyperDash":false},{"StartTime":86960.0,"Position":285.0,"HyperDash":false},{"StartTime":87015.0,"Position":45.0,"HyperDash":false},{"StartTime":87070.0,"Position":65.0,"HyperDash":false},{"StartTime":87125.0,"Position":337.0,"HyperDash":false}]},{"StartTime":88125.0,"Objects":[{"StartTime":88125.0,"Position":256.0,"HyperDash":false},{"StartTime":88178.0,"Position":292.30423,"HyperDash":false},{"StartTime":88232.0,"Position":341.450134,"HyperDash":false},{"StartTime":88285.0,"Position":358.591034,"HyperDash":false},{"StartTime":88375.0,"Position":390.822968,"HyperDash":false}]},{"StartTime":88625.0,"Objects":[{"StartTime":88625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":88875.0,"Objects":[{"StartTime":88875.0,"Position":136.0,"HyperDash":false}]},{"StartTime":89125.0,"Objects":[{"StartTime":89125.0,"Position":8.0,"HyperDash":false},{"StartTime":89178.0,"Position":0.0,"HyperDash":false},{"StartTime":89232.0,"Position":12.7492714,"HyperDash":false},{"StartTime":89285.0,"Position":7.342363,"HyperDash":false},{"StartTime":89375.0,"Position":41.059124,"HyperDash":false}]},{"StartTime":89625.0,"Objects":[{"StartTime":89625.0,"Position":164.0,"HyperDash":false}]},{"StartTime":89875.0,"Objects":[{"StartTime":89875.0,"Position":288.0,"HyperDash":false}]},{"StartTime":90000.0,"Objects":[{"StartTime":90000.0,"Position":288.0,"HyperDash":false}]},{"StartTime":90125.0,"Objects":[{"StartTime":90125.0,"Position":288.0,"HyperDash":false},{"StartTime":90178.0,"Position":307.058655,"HyperDash":false},{"StartTime":90232.0,"Position":366.7033,"HyperDash":false},{"StartTime":90285.0,"Position":400.761932,"HyperDash":false},{"StartTime":90375.0,"Position":434.503052,"HyperDash":false}]},{"StartTime":90625.0,"Objects":[{"StartTime":90625.0,"Position":476.0,"HyperDash":false}]},{"StartTime":90875.0,"Objects":[{"StartTime":90875.0,"Position":332.0,"HyperDash":false}]},{"StartTime":91125.0,"Objects":[{"StartTime":91125.0,"Position":180.0,"HyperDash":false}]},{"StartTime":91375.0,"Objects":[{"StartTime":91375.0,"Position":36.0,"HyperDash":false}]},{"StartTime":91625.0,"Objects":[{"StartTime":91625.0,"Position":56.0,"HyperDash":false}]},{"StartTime":92125.0,"Objects":[{"StartTime":92125.0,"Position":56.0,"HyperDash":false},{"StartTime":92178.0,"Position":78.15752,"HyperDash":false},{"StartTime":92232.0,"Position":134.940643,"HyperDash":false},{"StartTime":92285.0,"Position":142.098145,"HyperDash":false},{"StartTime":92375.0,"Position":212.403366,"HyperDash":false}]},{"StartTime":92625.0,"Objects":[{"StartTime":92625.0,"Position":84.0,"HyperDash":false}]},{"StartTime":92875.0,"Objects":[{"StartTime":92875.0,"Position":220.0,"HyperDash":false}]},{"StartTime":93125.0,"Objects":[{"StartTime":93125.0,"Position":320.0,"HyperDash":false},{"StartTime":93178.0,"Position":369.1575,"HyperDash":false},{"StartTime":93232.0,"Position":398.940643,"HyperDash":false},{"StartTime":93285.0,"Position":408.098145,"HyperDash":false},{"StartTime":93375.0,"Position":476.403381,"HyperDash":false}]},{"StartTime":93625.0,"Objects":[{"StartTime":93625.0,"Position":432.0,"HyperDash":false}]},{"StartTime":93875.0,"Objects":[{"StartTime":93875.0,"Position":296.0,"HyperDash":false}]},{"StartTime":94000.0,"Objects":[{"StartTime":94000.0,"Position":296.0,"HyperDash":false}]},{"StartTime":94125.0,"Objects":[{"StartTime":94125.0,"Position":296.0,"HyperDash":false},{"StartTime":94178.0,"Position":273.1039,"HyperDash":false},{"StartTime":94232.0,"Position":244.445969,"HyperDash":false},{"StartTime":94285.0,"Position":219.02182,"HyperDash":false},{"StartTime":94374.0,"Position":170.471848,"HyperDash":false}]},{"StartTime":94625.0,"Objects":[{"StartTime":94625.0,"Position":216.0,"HyperDash":false},{"StartTime":94678.0,"Position":259.7602,"HyperDash":false},{"StartTime":94732.0,"Position":282.299927,"HyperDash":false},{"StartTime":94785.0,"Position":294.678436,"HyperDash":false},{"StartTime":94875.0,"Position":341.528168,"HyperDash":false}]},{"StartTime":95000.0,"Objects":[{"StartTime":95000.0,"Position":341.0,"HyperDash":false}]},{"StartTime":95125.0,"Objects":[{"StartTime":95125.0,"Position":341.0,"HyperDash":false},{"StartTime":95178.0,"Position":347.282532,"HyperDash":false},{"StartTime":95232.0,"Position":344.6459,"HyperDash":false},{"StartTime":95285.0,"Position":339.928436,"HyperDash":false},{"StartTime":95375.0,"Position":361.200684,"HyperDash":false}]},{"StartTime":95625.0,"Objects":[{"StartTime":95625.0,"Position":171.0,"HyperDash":false},{"StartTime":95678.0,"Position":158.717453,"HyperDash":false},{"StartTime":95732.0,"Position":169.354111,"HyperDash":false},{"StartTime":95785.0,"Position":172.071564,"HyperDash":false},{"StartTime":95875.0,"Position":150.799316,"HyperDash":false}]},{"StartTime":96125.0,"Objects":[{"StartTime":96125.0,"Position":43.0,"HyperDash":false}]},{"StartTime":96375.0,"Objects":[{"StartTime":96375.0,"Position":81.0,"HyperDash":false}]},{"StartTime":96625.0,"Objects":[{"StartTime":96625.0,"Position":169.0,"HyperDash":false}]},{"StartTime":96875.0,"Objects":[{"StartTime":96875.0,"Position":304.0,"HyperDash":false},{"StartTime":96937.0,"Position":333.433136,"HyperDash":false},{"StartTime":97000.0,"Position":385.325043,"HyperDash":false},{"StartTime":97062.0,"Position":379.667,"HyperDash":false},{"StartTime":97125.0,"Position":401.778076,"HyperDash":false},{"StartTime":97187.0,"Position":418.125366,"HyperDash":false},{"StartTime":97250.0,"Position":403.005768,"HyperDash":false},{"StartTime":97312.0,"Position":375.9013,"HyperDash":false},{"StartTime":97375.0,"Position":343.426239,"HyperDash":false},{"StartTime":97437.0,"Position":382.9013,"HyperDash":false},{"StartTime":97499.0,"Position":392.005768,"HyperDash":false},{"StartTime":97561.0,"Position":388.066345,"HyperDash":false},{"StartTime":97624.0,"Position":401.778076,"HyperDash":false},{"StartTime":97677.0,"Position":380.074066,"HyperDash":false},{"StartTime":97731.0,"Position":366.190063,"HyperDash":false},{"StartTime":97785.0,"Position":348.305481,"HyperDash":false},{"StartTime":97874.0,"Position":304.0,"HyperDash":false}]},{"StartTime":98125.0,"Objects":[{"StartTime":98125.0,"Position":240.0,"HyperDash":false},{"StartTime":98187.0,"Position":220.193451,"HyperDash":false},{"StartTime":98250.0,"Position":179.67662,"HyperDash":false},{"StartTime":98312.0,"Position":167.455551,"HyperDash":false},{"StartTime":98375.0,"Position":115.407051,"HyperDash":false},{"StartTime":98428.0,"Position":97.24337,"HyperDash":false},{"StartTime":98482.0,"Position":115.416969,"HyperDash":false},{"StartTime":98535.0,"Position":122.237556,"HyperDash":false},{"StartTime":98624.0,"Position":166.963364,"HyperDash":false}]},{"StartTime":98875.0,"Objects":[{"StartTime":98875.0,"Position":240.0,"HyperDash":false},{"StartTime":98937.0,"Position":273.329651,"HyperDash":false},{"StartTime":99000.0,"Position":306.601349,"HyperDash":false},{"StartTime":99062.0,"Position":324.816467,"HyperDash":false},{"StartTime":99125.0,"Position":363.818481,"HyperDash":false},{"StartTime":99178.0,"Position":391.8492,"HyperDash":false},{"StartTime":99232.0,"Position":363.507568,"HyperDash":false},{"StartTime":99285.0,"Position":349.543182,"HyperDash":false},{"StartTime":99374.0,"Position":311.711731,"HyperDash":false}]},{"StartTime":99625.0,"Objects":[{"StartTime":99625.0,"Position":180.0,"HyperDash":false},{"StartTime":99678.0,"Position":143.011124,"HyperDash":false},{"StartTime":99732.0,"Position":113.192444,"HyperDash":false},{"StartTime":99785.0,"Position":79.4256439,"HyperDash":false},{"StartTime":99874.0,"Position":45.3982735,"HyperDash":false}]},{"StartTime":100125.0,"Objects":[{"StartTime":100125.0,"Position":48.0,"HyperDash":false},{"StartTime":100178.0,"Position":75.85622,"HyperDash":false},{"StartTime":100231.0,"Position":116.712425,"HyperDash":false},{"StartTime":100284.0,"Position":156.568634,"HyperDash":false},{"StartTime":100374.0,"Position":202.3622,"HyperDash":false}]},{"StartTime":100625.0,"Objects":[{"StartTime":100625.0,"Position":348.0,"HyperDash":false},{"StartTime":100678.0,"Position":383.8562,"HyperDash":false},{"StartTime":100731.0,"Position":402.712433,"HyperDash":false},{"StartTime":100784.0,"Position":456.568634,"HyperDash":false},{"StartTime":100874.0,"Position":502.362183,"HyperDash":false}]},{"StartTime":101125.0,"Objects":[{"StartTime":101125.0,"Position":504.0,"HyperDash":false},{"StartTime":101178.0,"Position":488.1438,"HyperDash":false},{"StartTime":101231.0,"Position":446.287567,"HyperDash":false},{"StartTime":101284.0,"Position":423.431366,"HyperDash":false},{"StartTime":101374.0,"Position":349.637817,"HyperDash":false}]},{"StartTime":101625.0,"Objects":[{"StartTime":101625.0,"Position":204.0,"HyperDash":false},{"StartTime":101678.0,"Position":156.143784,"HyperDash":false},{"StartTime":101731.0,"Position":133.287567,"HyperDash":false},{"StartTime":101784.0,"Position":117.431358,"HyperDash":false},{"StartTime":101874.0,"Position":49.6378021,"HyperDash":false}]},{"StartTime":102000.0,"Objects":[{"StartTime":102000.0,"Position":49.0,"HyperDash":false}]},{"StartTime":102125.0,"Objects":[{"StartTime":102125.0,"Position":49.0,"HyperDash":false}]},{"StartTime":102625.0,"Objects":[{"StartTime":102625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":102875.0,"Objects":[{"StartTime":102875.0,"Position":384.0,"HyperDash":false}]},{"StartTime":103125.0,"Objects":[{"StartTime":103125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":103625.0,"Objects":[{"StartTime":103625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":103875.0,"Objects":[{"StartTime":103875.0,"Position":128.0,"HyperDash":false}]},{"StartTime":104125.0,"Objects":[{"StartTime":104125.0,"Position":256.0,"HyperDash":false},{"StartTime":104178.0,"Position":272.994537,"HyperDash":false},{"StartTime":104232.0,"Position":332.6524,"HyperDash":false},{"StartTime":104285.0,"Position":355.331024,"HyperDash":false},{"StartTime":104375.0,"Position":402.7333,"HyperDash":false}]},{"StartTime":104625.0,"Objects":[{"StartTime":104625.0,"Position":492.0,"HyperDash":false}]},{"StartTime":104875.0,"Objects":[{"StartTime":104875.0,"Position":332.0,"HyperDash":false}]},{"StartTime":105125.0,"Objects":[{"StartTime":105125.0,"Position":256.0,"HyperDash":false},{"StartTime":105178.0,"Position":241.889923,"HyperDash":false},{"StartTime":105232.0,"Position":211.080078,"HyperDash":false},{"StartTime":105285.0,"Position":144.258759,"HyperDash":false},{"StartTime":105374.0,"Position":109.266708,"HyperDash":false}]},{"StartTime":105625.0,"Objects":[{"StartTime":105625.0,"Position":20.0,"HyperDash":false}]},{"StartTime":105875.0,"Objects":[{"StartTime":105875.0,"Position":180.0,"HyperDash":false}]},{"StartTime":106125.0,"Objects":[{"StartTime":106125.0,"Position":368.0,"HyperDash":false},{"StartTime":106178.0,"Position":376.172974,"HyperDash":false},{"StartTime":106231.0,"Position":410.418945,"HyperDash":false},{"StartTime":106284.0,"Position":421.151764,"HyperDash":false},{"StartTime":106374.0,"Position":416.485779,"HyperDash":false}]},{"StartTime":106625.0,"Objects":[{"StartTime":106625.0,"Position":220.0,"HyperDash":false},{"StartTime":106678.0,"Position":241.054184,"HyperDash":false},{"StartTime":106731.0,"Position":282.792328,"HyperDash":false},{"StartTime":106784.0,"Position":301.047577,"HyperDash":false},{"StartTime":106874.0,"Position":349.247284,"HyperDash":false}]},{"StartTime":107125.0,"Objects":[{"StartTime":107125.0,"Position":144.0,"HyperDash":false},{"StartTime":107178.0,"Position":125.932152,"HyperDash":false},{"StartTime":107232.0,"Position":88.3730545,"HyperDash":false},{"StartTime":107285.0,"Position":97.8173752,"HyperDash":false},{"StartTime":107375.0,"Position":95.51424,"HyperDash":false}]},{"StartTime":107625.0,"Objects":[{"StartTime":107625.0,"Position":292.0,"HyperDash":false},{"StartTime":107678.0,"Position":279.032471,"HyperDash":false},{"StartTime":107732.0,"Position":263.904663,"HyperDash":false},{"StartTime":107785.0,"Position":230.72316,"HyperDash":false},{"StartTime":107875.0,"Position":162.752716,"HyperDash":false}]},{"StartTime":108125.0,"Objects":[{"StartTime":108125.0,"Position":44.0,"HyperDash":false},{"StartTime":108178.0,"Position":95.98508,"HyperDash":false},{"StartTime":108232.0,"Position":110.3604,"HyperDash":false},{"StartTime":108285.0,"Position":123.706589,"HyperDash":false},{"StartTime":108374.0,"Position":169.6919,"HyperDash":false}]},{"StartTime":108625.0,"Objects":[{"StartTime":108625.0,"Position":304.0,"HyperDash":false}]},{"StartTime":108875.0,"Objects":[{"StartTime":108875.0,"Position":408.0,"HyperDash":false}]},{"StartTime":109125.0,"Objects":[{"StartTime":109125.0,"Position":468.0,"HyperDash":false},{"StartTime":109178.0,"Position":439.149963,"HyperDash":false},{"StartTime":109232.0,"Position":396.891418,"HyperDash":false},{"StartTime":109285.0,"Position":370.5935,"HyperDash":false},{"StartTime":109375.0,"Position":342.308075,"HyperDash":false}]},{"StartTime":109625.0,"Objects":[{"StartTime":109625.0,"Position":208.0,"HyperDash":false}]},{"StartTime":109875.0,"Objects":[{"StartTime":109875.0,"Position":104.0,"HyperDash":false}]},{"StartTime":110125.0,"Objects":[{"StartTime":110125.0,"Position":256.0,"HyperDash":false},{"StartTime":110178.0,"Position":239.263885,"HyperDash":false},{"StartTime":110232.0,"Position":204.098785,"HyperDash":false},{"StartTime":110285.0,"Position":187.362686,"HyperDash":false},{"StartTime":110375.0,"Position":148.7542,"HyperDash":false}]},{"StartTime":110625.0,"Objects":[{"StartTime":110625.0,"Position":256.0,"HyperDash":false},{"StartTime":110678.0,"Position":283.827423,"HyperDash":false},{"StartTime":110731.0,"Position":319.654846,"HyperDash":false},{"StartTime":110784.0,"Position":325.482239,"HyperDash":false},{"StartTime":110874.0,"Position":363.2458,"HyperDash":false}]},{"StartTime":111125.0,"Objects":[{"StartTime":111125.0,"Position":208.0,"HyperDash":false},{"StartTime":111178.0,"Position":185.263885,"HyperDash":false},{"StartTime":111232.0,"Position":170.098785,"HyperDash":false},{"StartTime":111285.0,"Position":123.362686,"HyperDash":false},{"StartTime":111375.0,"Position":100.754196,"HyperDash":false}]},{"StartTime":111625.0,"Objects":[{"StartTime":111625.0,"Position":304.0,"HyperDash":false},{"StartTime":111678.0,"Position":318.7361,"HyperDash":false},{"StartTime":111732.0,"Position":353.901184,"HyperDash":false},{"StartTime":111785.0,"Position":357.6373,"HyperDash":false},{"StartTime":111875.0,"Position":411.2458,"HyperDash":false}]},{"StartTime":112125.0,"Objects":[{"StartTime":112125.0,"Position":252.0,"HyperDash":false}]},{"StartTime":112375.0,"Objects":[{"StartTime":112375.0,"Position":112.0,"HyperDash":false}]},{"StartTime":112625.0,"Objects":[{"StartTime":112625.0,"Position":72.0,"HyperDash":false}]},{"StartTime":112875.0,"Objects":[{"StartTime":112875.0,"Position":158.0,"HyperDash":false},{"StartTime":112937.0,"Position":180.39856,"HyperDash":false},{"StartTime":113000.0,"Position":253.684036,"HyperDash":false},{"StartTime":113062.0,"Position":263.862976,"HyperDash":false},{"StartTime":113125.0,"Position":289.459473,"HyperDash":false},{"StartTime":113187.0,"Position":294.857574,"HyperDash":false},{"StartTime":113250.0,"Position":301.491974,"HyperDash":false},{"StartTime":113312.0,"Position":306.150818,"HyperDash":false},{"StartTime":113375.0,"Position":278.112,"HyperDash":false},{"StartTime":113437.0,"Position":308.150818,"HyperDash":false},{"StartTime":113500.0,"Position":291.538177,"HyperDash":false},{"StartTime":113562.0,"Position":288.857574,"HyperDash":false},{"StartTime":113625.0,"Position":289.160065,"HyperDash":false},{"StartTime":113678.0,"Position":275.785217,"HyperDash":false},{"StartTime":113732.0,"Position":261.88623,"HyperDash":false},{"StartTime":113785.0,"Position":219.895935,"HyperDash":false},{"StartTime":113874.0,"Position":158.0,"HyperDash":false}]},{"StartTime":114125.0,"Objects":[{"StartTime":114125.0,"Position":176.0,"HyperDash":false},{"StartTime":114187.0,"Position":215.46962,"HyperDash":false},{"StartTime":114250.0,"Position":243.459351,"HyperDash":false},{"StartTime":114312.0,"Position":280.9655,"HyperDash":false},{"StartTime":114375.0,"Position":311.184082,"HyperDash":false},{"StartTime":114428.0,"Position":345.321442,"HyperDash":false},{"StartTime":114482.0,"Position":372.3753,"HyperDash":false},{"StartTime":114535.0,"Position":414.472534,"HyperDash":false},{"StartTime":114624.0,"Position":431.115143,"HyperDash":false}]},{"StartTime":114875.0,"Objects":[{"StartTime":114875.0,"Position":328.0,"HyperDash":false},{"StartTime":114937.0,"Position":303.669556,"HyperDash":false},{"StartTime":115000.0,"Position":279.312225,"HyperDash":false},{"StartTime":115062.0,"Position":265.2286,"HyperDash":false},{"StartTime":115125.0,"Position":258.051422,"HyperDash":false},{"StartTime":115178.0,"Position":262.0706,"HyperDash":false},{"StartTime":115231.0,"Position":286.7301,"HyperDash":false},{"StartTime":115284.0,"Position":315.1607,"HyperDash":false},{"StartTime":115374.0,"Position":349.780029,"HyperDash":false}]},{"StartTime":115625.0,"Objects":[{"StartTime":115625.0,"Position":488.0,"HyperDash":false},{"StartTime":115678.0,"Position":480.653168,"HyperDash":false},{"StartTime":115732.0,"Position":483.186554,"HyperDash":false},{"StartTime":115785.0,"Position":463.839722,"HyperDash":false},{"StartTime":115875.0,"Position":458.062073,"HyperDash":false}]},{"StartTime":116125.0,"Objects":[{"StartTime":116125.0,"Position":416.0,"HyperDash":false}]},{"StartTime":116375.0,"Objects":[{"StartTime":116375.0,"Position":288.0,"HyperDash":false}]},{"StartTime":116625.0,"Objects":[{"StartTime":116625.0,"Position":164.0,"HyperDash":false}]},{"StartTime":116875.0,"Objects":[{"StartTime":116875.0,"Position":36.0,"HyperDash":false}]},{"StartTime":117125.0,"Objects":[{"StartTime":117125.0,"Position":104.0,"HyperDash":false}]},{"StartTime":117375.0,"Objects":[{"StartTime":117375.0,"Position":232.0,"HyperDash":false}]},{"StartTime":117625.0,"Objects":[{"StartTime":117625.0,"Position":356.0,"HyperDash":false}]},{"StartTime":117875.0,"Objects":[{"StartTime":117875.0,"Position":484.0,"HyperDash":false}]},{"StartTime":118125.0,"Objects":[{"StartTime":118125.0,"Position":356.0,"HyperDash":false}]},{"StartTime":128125.0,"Objects":[{"StartTime":128125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":128250.0,"Objects":[{"StartTime":128250.0,"Position":256.0,"HyperDash":false}]},{"StartTime":128500.0,"Objects":[{"StartTime":128500.0,"Position":336.0,"HyperDash":false}]},{"StartTime":128625.0,"Objects":[{"StartTime":128625.0,"Position":336.0,"HyperDash":false}]},{"StartTime":128875.0,"Objects":[{"StartTime":128875.0,"Position":400.0,"HyperDash":false}]},{"StartTime":129000.0,"Objects":[{"StartTime":129000.0,"Position":400.0,"HyperDash":false}]},{"StartTime":129250.0,"Objects":[{"StartTime":129250.0,"Position":492.0,"HyperDash":false}]},{"StartTime":129375.0,"Objects":[{"StartTime":129375.0,"Position":492.0,"HyperDash":false}]},{"StartTime":129625.0,"Objects":[{"StartTime":129625.0,"Position":440.0,"HyperDash":false},{"StartTime":129678.0,"Position":420.699738,"HyperDash":false},{"StartTime":129731.0,"Position":376.399475,"HyperDash":false},{"StartTime":129784.0,"Position":327.099243,"HyperDash":false},{"StartTime":129874.0,"Position":283.551636,"HyperDash":false}]},{"StartTime":130125.0,"Objects":[{"StartTime":130125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":130250.0,"Objects":[{"StartTime":130250.0,"Position":256.0,"HyperDash":false}]},{"StartTime":130500.0,"Objects":[{"StartTime":130500.0,"Position":176.0,"HyperDash":false}]},{"StartTime":130625.0,"Objects":[{"StartTime":130625.0,"Position":176.0,"HyperDash":false}]},{"StartTime":130875.0,"Objects":[{"StartTime":130875.0,"Position":112.0,"HyperDash":false}]},{"StartTime":131000.0,"Objects":[{"StartTime":131000.0,"Position":112.0,"HyperDash":false}]},{"StartTime":131250.0,"Objects":[{"StartTime":131250.0,"Position":20.0,"HyperDash":false}]},{"StartTime":131375.0,"Objects":[{"StartTime":131375.0,"Position":20.0,"HyperDash":false}]},{"StartTime":131625.0,"Objects":[{"StartTime":131625.0,"Position":72.0,"HyperDash":false},{"StartTime":131678.0,"Position":85.16705,"HyperDash":false},{"StartTime":131732.0,"Position":139.959915,"HyperDash":false},{"StartTime":131785.0,"Position":179.126953,"HyperDash":false},{"StartTime":131875.0,"Position":228.44838,"HyperDash":false}]},{"StartTime":132125.0,"Objects":[{"StartTime":132125.0,"Position":408.0,"HyperDash":false},{"StartTime":132187.0,"Position":432.7211,"HyperDash":false},{"StartTime":132250.0,"Position":463.48645,"HyperDash":false},{"StartTime":132312.0,"Position":484.605652,"HyperDash":false},{"StartTime":132375.0,"Position":511.913147,"HyperDash":false},{"StartTime":132437.0,"Position":511.3131,"HyperDash":false},{"StartTime":132500.0,"Position":512.0,"HyperDash":false},{"StartTime":132562.0,"Position":512.0,"HyperDash":false},{"StartTime":132625.0,"Position":491.9296,"HyperDash":false},{"StartTime":132687.0,"Position":477.671265,"HyperDash":false},{"StartTime":132750.0,"Position":455.869171,"HyperDash":false},{"StartTime":132812.0,"Position":413.826355,"HyperDash":false},{"StartTime":132875.0,"Position":366.962769,"HyperDash":false},{"StartTime":132937.0,"Position":340.888336,"HyperDash":false},{"StartTime":133000.0,"Position":273.617157,"HyperDash":false},{"StartTime":133062.0,"Position":263.5604,"HyperDash":false},{"StartTime":133125.0,"Position":210.586578,"HyperDash":false},{"StartTime":133187.0,"Position":176.064163,"HyperDash":false},{"StartTime":133250.0,"Position":127.187744,"HyperDash":false},{"StartTime":133312.0,"Position":131.32103,"HyperDash":false},{"StartTime":133375.0,"Position":102.106659,"HyperDash":false},{"StartTime":133437.0,"Position":101.403084,"HyperDash":false},{"StartTime":133500.0,"Position":84.85893,"HyperDash":false},{"StartTime":133562.0,"Position":83.863945,"HyperDash":false},{"StartTime":133625.0,"Position":119.323433,"HyperDash":false},{"StartTime":133687.0,"Position":159.490738,"HyperDash":false},{"StartTime":133750.0,"Position":179.476852,"HyperDash":false},{"StartTime":133812.0,"Position":207.3787,"HyperDash":false},{"StartTime":133875.0,"Position":256.6099,"HyperDash":false},{"StartTime":133937.0,"Position":289.899384,"HyperDash":false},{"StartTime":134000.0,"Position":322.431061,"HyperDash":false},{"StartTime":134062.0,"Position":371.9527,"HyperDash":false},{"StartTime":134125.0,"Position":392.617126,"HyperDash":false},{"StartTime":134187.0,"Position":422.877838,"HyperDash":false},{"StartTime":134250.0,"Position":425.129883,"HyperDash":false},{"StartTime":134312.0,"Position":404.693054,"HyperDash":false},{"StartTime":134375.0,"Position":409.929779,"HyperDash":false},{"StartTime":134437.0,"Position":384.0832,"HyperDash":false},{"StartTime":134500.0,"Position":354.885651,"HyperDash":false},{"StartTime":134562.0,"Position":326.547424,"HyperDash":false},{"StartTime":134625.0,"Position":301.508575,"HyperDash":false},{"StartTime":134687.0,"Position":255.1601,"HyperDash":false},{"StartTime":134750.0,"Position":222.486877,"HyperDash":false},{"StartTime":134812.0,"Position":183.853729,"HyperDash":false},{"StartTime":134875.0,"Position":145.138245,"HyperDash":false},{"StartTime":134937.0,"Position":107.848343,"HyperDash":false},{"StartTime":135000.0,"Position":58.21479,"HyperDash":false},{"StartTime":135062.0,"Position":57.82658,"HyperDash":false},{"StartTime":135125.0,"Position":20.1227779,"HyperDash":false},{"StartTime":135187.0,"Position":0.0,"HyperDash":false},{"StartTime":135250.0,"Position":0.0,"HyperDash":false},{"StartTime":135312.0,"Position":0.0,"HyperDash":false},{"StartTime":135375.0,"Position":0.05981236,"HyperDash":false},{"StartTime":135428.0,"Position":14.5409756,"HyperDash":false},{"StartTime":135482.0,"Position":36.1827965,"HyperDash":false},{"StartTime":135535.0,"Position":37.5372772,"HyperDash":false},{"StartTime":135625.0,"Position":103.892265,"HyperDash":false}]},{"StartTime":135875.0,"Objects":[{"StartTime":135875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":136000.0,"Objects":[{"StartTime":136000.0,"Position":256.0,"HyperDash":false}]},{"StartTime":136125.0,"Objects":[{"StartTime":136125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":136375.0,"Objects":[{"StartTime":136375.0,"Position":136.0,"HyperDash":false}]},{"StartTime":136625.0,"Objects":[{"StartTime":136625.0,"Position":132.0,"HyperDash":false}]},{"StartTime":136750.0,"Objects":[{"StartTime":136750.0,"Position":133.0,"HyperDash":false}]},{"StartTime":137000.0,"Objects":[{"StartTime":137000.0,"Position":256.0,"HyperDash":false}]},{"StartTime":137125.0,"Objects":[{"StartTime":137125.0,"Position":255.0,"HyperDash":false}]},{"StartTime":137250.0,"Objects":[{"StartTime":137250.0,"Position":256.0,"HyperDash":false}]},{"StartTime":137375.0,"Objects":[{"StartTime":137375.0,"Position":256.0,"HyperDash":false}]},{"StartTime":137625.0,"Objects":[{"StartTime":137625.0,"Position":380.0,"HyperDash":false}]},{"StartTime":137875.0,"Objects":[{"StartTime":137875.0,"Position":376.0,"HyperDash":false}]},{"StartTime":138125.0,"Objects":[{"StartTime":138125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":138375.0,"Objects":[{"StartTime":138375.0,"Position":256.0,"HyperDash":false}]},{"StartTime":138625.0,"Objects":[{"StartTime":138625.0,"Position":144.0,"HyperDash":false}]},{"StartTime":138750.0,"Objects":[{"StartTime":138750.0,"Position":144.0,"HyperDash":false}]},{"StartTime":139000.0,"Objects":[{"StartTime":139000.0,"Position":256.0,"HyperDash":false}]},{"StartTime":139125.0,"Objects":[{"StartTime":139125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":139250.0,"Objects":[{"StartTime":139250.0,"Position":256.0,"HyperDash":false}]},{"StartTime":139375.0,"Objects":[{"StartTime":139375.0,"Position":256.0,"HyperDash":false}]},{"StartTime":139625.0,"Objects":[{"StartTime":139625.0,"Position":368.0,"HyperDash":false}]},{"StartTime":139875.0,"Objects":[{"StartTime":139875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":140000.0,"Objects":[{"StartTime":140000.0,"Position":256.0,"HyperDash":false}]},{"StartTime":140125.0,"Objects":[{"StartTime":140125.0,"Position":256.0,"HyperDash":false},{"StartTime":140178.0,"Position":227.121277,"HyperDash":false},{"StartTime":140232.0,"Position":201.278854,"HyperDash":false},{"StartTime":140285.0,"Position":210.432343,"HyperDash":false},{"StartTime":140374.0,"Position":256.095947,"HyperDash":false}]},{"StartTime":140625.0,"Objects":[{"StartTime":140625.0,"Position":332.0,"HyperDash":false}]},{"StartTime":140750.0,"Objects":[{"StartTime":140750.0,"Position":332.0,"HyperDash":false}]},{"StartTime":141000.0,"Objects":[{"StartTime":141000.0,"Position":332.0,"HyperDash":false}]},{"StartTime":141125.0,"Objects":[{"StartTime":141125.0,"Position":332.0,"HyperDash":false}]},{"StartTime":141250.0,"Objects":[{"StartTime":141250.0,"Position":332.0,"HyperDash":false}]},{"StartTime":141375.0,"Objects":[{"StartTime":141375.0,"Position":332.0,"HyperDash":false}]},{"StartTime":141625.0,"Objects":[{"StartTime":141625.0,"Position":180.0,"HyperDash":false}]},{"StartTime":141875.0,"Objects":[{"StartTime":141875.0,"Position":180.0,"HyperDash":false}]},{"StartTime":142125.0,"Objects":[{"StartTime":142125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":142375.0,"Objects":[{"StartTime":142375.0,"Position":256.0,"HyperDash":false}]},{"StartTime":142625.0,"Objects":[{"StartTime":142625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":142750.0,"Objects":[{"StartTime":142750.0,"Position":256.0,"HyperDash":false}]},{"StartTime":143000.0,"Objects":[{"StartTime":143000.0,"Position":256.0,"HyperDash":false}]},{"StartTime":143125.0,"Objects":[{"StartTime":143125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":143250.0,"Objects":[{"StartTime":143250.0,"Position":256.0,"HyperDash":false}]},{"StartTime":143375.0,"Objects":[{"StartTime":143375.0,"Position":256.0,"HyperDash":false}]},{"StartTime":143625.0,"Objects":[{"StartTime":143625.0,"Position":188.0,"HyperDash":false}]},{"StartTime":143875.0,"Objects":[{"StartTime":143875.0,"Position":324.0,"HyperDash":false}]},{"StartTime":144000.0,"Objects":[{"StartTime":144000.0,"Position":324.0,"HyperDash":false}]},{"StartTime":144125.0,"Objects":[{"StartTime":144125.0,"Position":324.0,"HyperDash":false},{"StartTime":144178.0,"Position":375.919983,"HyperDash":false},{"StartTime":144232.0,"Position":388.48,"HyperDash":false},{"StartTime":144285.0,"Position":424.4,"HyperDash":false},{"StartTime":144375.0,"Position":484.0,"HyperDash":false}]},{"StartTime":144625.0,"Objects":[{"StartTime":144625.0,"Position":392.0,"HyperDash":false}]},{"StartTime":144750.0,"Objects":[{"StartTime":144750.0,"Position":392.0,"HyperDash":false}]},{"StartTime":145000.0,"Objects":[{"StartTime":145000.0,"Position":324.0,"HyperDash":false}]},{"StartTime":145125.0,"Objects":[{"StartTime":145125.0,"Position":324.0,"HyperDash":false}]},{"StartTime":145250.0,"Objects":[{"StartTime":145250.0,"Position":324.0,"HyperDash":false}]},{"StartTime":145375.0,"Objects":[{"StartTime":145375.0,"Position":324.0,"HyperDash":false}]},{"StartTime":145625.0,"Objects":[{"StartTime":145625.0,"Position":188.0,"HyperDash":false}]},{"StartTime":145875.0,"Objects":[{"StartTime":145875.0,"Position":120.0,"HyperDash":false}]},{"StartTime":146125.0,"Objects":[{"StartTime":146125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":146375.0,"Objects":[{"StartTime":146375.0,"Position":256.0,"HyperDash":false}]},{"StartTime":146625.0,"Objects":[{"StartTime":146625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":146750.0,"Objects":[{"StartTime":146750.0,"Position":256.0,"HyperDash":false}]},{"StartTime":147000.0,"Objects":[{"StartTime":147000.0,"Position":176.0,"HyperDash":false}]},{"StartTime":147125.0,"Objects":[{"StartTime":147125.0,"Position":176.0,"HyperDash":false}]},{"StartTime":147250.0,"Objects":[{"StartTime":147250.0,"Position":176.0,"HyperDash":false}]},{"StartTime":147375.0,"Objects":[{"StartTime":147375.0,"Position":176.0,"HyperDash":false}]},{"StartTime":147625.0,"Objects":[{"StartTime":147625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":147875.0,"Objects":[{"StartTime":147875.0,"Position":336.0,"HyperDash":false}]},{"StartTime":148000.0,"Objects":[{"StartTime":148000.0,"Position":336.0,"HyperDash":false}]},{"StartTime":148125.0,"Objects":[{"StartTime":148125.0,"Position":336.0,"HyperDash":false},{"StartTime":148178.0,"Position":375.538025,"HyperDash":false},{"StartTime":148231.0,"Position":390.979462,"HyperDash":false},{"StartTime":148284.0,"Position":386.895447,"HyperDash":false},{"StartTime":148374.0,"Position":370.6822,"HyperDash":false}]},{"StartTime":148625.0,"Objects":[{"StartTime":148625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":148750.0,"Objects":[{"StartTime":148750.0,"Position":240.0,"HyperDash":false}]},{"StartTime":149000.0,"Objects":[{"StartTime":149000.0,"Position":240.0,"HyperDash":false}]},{"StartTime":149125.0,"Objects":[{"StartTime":149125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":149250.0,"Objects":[{"StartTime":149250.0,"Position":272.0,"HyperDash":false}]},{"StartTime":149375.0,"Objects":[{"StartTime":149375.0,"Position":288.0,"HyperDash":false}]},{"StartTime":149625.0,"Objects":[{"StartTime":149625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":149875.0,"Objects":[{"StartTime":149875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":150125.0,"Objects":[{"StartTime":150125.0,"Position":116.0,"HyperDash":false}]},{"StartTime":150250.0,"Objects":[{"StartTime":150250.0,"Position":120.0,"HyperDash":false}]},{"StartTime":150375.0,"Objects":[{"StartTime":150375.0,"Position":132.0,"HyperDash":false}]},{"StartTime":150500.0,"Objects":[{"StartTime":150500.0,"Position":152.0,"HyperDash":false}]},{"StartTime":150625.0,"Objects":[{"StartTime":150625.0,"Position":176.0,"HyperDash":false}]},{"StartTime":150750.0,"Objects":[{"StartTime":150750.0,"Position":208.0,"HyperDash":false}]},{"StartTime":150875.0,"Objects":[{"StartTime":150875.0,"Position":232.0,"HyperDash":false}]},{"StartTime":151000.0,"Objects":[{"StartTime":151000.0,"Position":248.0,"HyperDash":false}]},{"StartTime":151125.0,"Objects":[{"StartTime":151125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":151250.0,"Objects":[{"StartTime":151250.0,"Position":260.0,"HyperDash":false}]},{"StartTime":151375.0,"Objects":[{"StartTime":151375.0,"Position":272.0,"HyperDash":false}]},{"StartTime":151500.0,"Objects":[{"StartTime":151500.0,"Position":292.0,"HyperDash":false}]},{"StartTime":151625.0,"Objects":[{"StartTime":151625.0,"Position":316.0,"HyperDash":false}]},{"StartTime":151750.0,"Objects":[{"StartTime":151750.0,"Position":348.0,"HyperDash":false}]},{"StartTime":151875.0,"Objects":[{"StartTime":151875.0,"Position":372.0,"HyperDash":false}]},{"StartTime":152000.0,"Objects":[{"StartTime":152000.0,"Position":388.0,"HyperDash":false}]},{"StartTime":152125.0,"Objects":[{"StartTime":152125.0,"Position":404.0,"HyperDash":false},{"StartTime":152178.0,"Position":429.642151,"HyperDash":false},{"StartTime":152232.0,"Position":425.184479,"HyperDash":false},{"StartTime":152285.0,"Position":392.507416,"HyperDash":false},{"StartTime":152375.0,"Position":342.072266,"HyperDash":false}]},{"StartTime":152625.0,"Objects":[{"StartTime":152625.0,"Position":108.0,"HyperDash":false},{"StartTime":152678.0,"Position":112.349617,"HyperDash":false},{"StartTime":152732.0,"Position":112.903786,"HyperDash":false},{"StartTime":152785.0,"Position":119.761673,"HyperDash":false},{"StartTime":152874.0,"Position":169.927719,"HyperDash":false}]},{"StartTime":153125.0,"Objects":[{"StartTime":153125.0,"Position":256.0,"HyperDash":false},{"StartTime":153250.0,"Position":256.0,"HyperDash":false}]},{"StartTime":153375.0,"Objects":[{"StartTime":153375.0,"Position":256.0,"HyperDash":false},{"StartTime":153437.0,"Position":269.0,"HyperDash":false},{"StartTime":153500.0,"Position":241.0,"HyperDash":false},{"StartTime":153562.0,"Position":247.0,"HyperDash":false},{"StartTime":153625.0,"Position":256.0,"HyperDash":false},{"StartTime":153678.0,"Position":244.0,"HyperDash":false},{"StartTime":153732.0,"Position":258.0,"HyperDash":false},{"StartTime":153785.0,"Position":240.0,"HyperDash":false},{"StartTime":153875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":154125.0,"Objects":[{"StartTime":154125.0,"Position":360.0,"HyperDash":false}]},{"StartTime":154250.0,"Objects":[{"StartTime":154250.0,"Position":360.0,"HyperDash":false}]},{"StartTime":154375.0,"Objects":[{"StartTime":154375.0,"Position":360.0,"HyperDash":false}]},{"StartTime":154625.0,"Objects":[{"StartTime":154625.0,"Position":256.0,"HyperDash":false}]},{"StartTime":154750.0,"Objects":[{"StartTime":154750.0,"Position":256.0,"HyperDash":false}]},{"StartTime":154875.0,"Objects":[{"StartTime":154875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":155125.0,"Objects":[{"StartTime":155125.0,"Position":154.0,"HyperDash":false}]},{"StartTime":155250.0,"Objects":[{"StartTime":155250.0,"Position":154.0,"HyperDash":false}]},{"StartTime":155375.0,"Objects":[{"StartTime":155375.0,"Position":155.0,"HyperDash":false},{"StartTime":155437.0,"Position":134.040146,"HyperDash":false},{"StartTime":155500.0,"Position":134.7992,"HyperDash":false},{"StartTime":155562.0,"Position":112.444061,"HyperDash":false},{"StartTime":155625.0,"Position":165.451813,"HyperDash":false},{"StartTime":155678.0,"Position":137.274612,"HyperDash":false},{"StartTime":155732.0,"Position":123.117592,"HyperDash":false},{"StartTime":155785.0,"Position":139.026031,"HyperDash":false},{"StartTime":155874.0,"Position":155.0,"HyperDash":false}]},{"StartTime":156000.0,"Objects":[{"StartTime":156000.0,"Position":163.0,"HyperDash":false}]},{"StartTime":156125.0,"Objects":[{"StartTime":156125.0,"Position":163.0,"HyperDash":false}]},{"StartTime":156250.0,"Objects":[{"StartTime":156250.0,"Position":163.0,"HyperDash":false},{"StartTime":156312.0,"Position":183.5915,"HyperDash":false},{"StartTime":156375.0,"Position":203.198776,"HyperDash":false},{"StartTime":156437.0,"Position":232.230286,"HyperDash":false},{"StartTime":156500.0,"Position":268.618439,"HyperDash":false},{"StartTime":156562.0,"Position":314.36087,"HyperDash":false},{"StartTime":156625.0,"Position":335.6506,"HyperDash":false},{"StartTime":156687.0,"Position":380.1404,"HyperDash":false},{"StartTime":156750.0,"Position":422.05127,"HyperDash":false},{"StartTime":156874.0,"Position":473.144562,"HyperDash":false}]},{"StartTime":157125.0,"Objects":[{"StartTime":157125.0,"Position":320.0,"HyperDash":false},{"StartTime":157187.0,"Position":278.6829,"HyperDash":false},{"StartTime":157250.0,"Position":245.222778,"HyperDash":false},{"StartTime":157312.0,"Position":218.502289,"HyperDash":false},{"StartTime":157375.0,"Position":221.008591,"HyperDash":false},{"StartTime":157428.0,"Position":240.596039,"HyperDash":false},{"StartTime":157482.0,"Position":248.418259,"HyperDash":false},{"StartTime":157535.0,"Position":260.110321,"HyperDash":false},{"StartTime":157624.0,"Position":317.0907,"HyperDash":false}]},{"StartTime":157750.0,"Objects":[{"StartTime":157750.0,"Position":348.0,"HyperDash":false}]},{"StartTime":157875.0,"Objects":[{"StartTime":157875.0,"Position":380.0,"HyperDash":false}]},{"StartTime":158000.0,"Objects":[{"StartTime":158000.0,"Position":404.0,"HyperDash":false}]},{"StartTime":158125.0,"Objects":[{"StartTime":158125.0,"Position":412.0,"HyperDash":false}]},{"StartTime":158250.0,"Objects":[{"StartTime":158250.0,"Position":412.0,"HyperDash":false}]},{"StartTime":158375.0,"Objects":[{"StartTime":158375.0,"Position":404.0,"HyperDash":false}]},{"StartTime":158625.0,"Objects":[{"StartTime":158625.0,"Position":264.0,"HyperDash":false},{"StartTime":158687.0,"Position":234.814957,"HyperDash":false},{"StartTime":158750.0,"Position":191.04628,"HyperDash":false},{"StartTime":158875.0,"Position":264.0,"HyperDash":false}]},{"StartTime":159125.0,"Objects":[{"StartTime":159125.0,"Position":164.0,"HyperDash":false},{"StartTime":159187.0,"Position":197.185043,"HyperDash":false},{"StartTime":159250.0,"Position":236.95372,"HyperDash":false},{"StartTime":159375.0,"Position":164.0,"HyperDash":false}]},{"StartTime":159625.0,"Objects":[{"StartTime":159625.0,"Position":56.0,"HyperDash":false}]},{"StartTime":159875.0,"Objects":[{"StartTime":159875.0,"Position":64.0,"HyperDash":false}]},{"StartTime":160000.0,"Objects":[{"StartTime":160000.0,"Position":64.0,"HyperDash":false}]},{"StartTime":160125.0,"Objects":[{"StartTime":160125.0,"Position":64.0,"HyperDash":false},{"StartTime":160187.0,"Position":64.51918,"HyperDash":false},{"StartTime":160250.0,"Position":26.7402878,"HyperDash":false},{"StartTime":160375.0,"Position":64.0,"HyperDash":false}]},{"StartTime":160500.0,"Objects":[{"StartTime":160500.0,"Position":128.0,"HyperDash":false},{"StartTime":160562.0,"Position":132.164291,"HyperDash":false},{"StartTime":160625.0,"Position":134.379623,"HyperDash":false},{"StartTime":160750.0,"Position":128.0,"HyperDash":false}]},{"StartTime":160875.0,"Objects":[{"StartTime":160875.0,"Position":192.0,"HyperDash":false},{"StartTime":160937.0,"Position":189.164291,"HyperDash":false},{"StartTime":161000.0,"Position":198.379623,"HyperDash":false},{"StartTime":161125.0,"Position":192.0,"HyperDash":false}]},{"StartTime":161250.0,"Objects":[{"StartTime":161250.0,"Position":240.0,"HyperDash":false},{"StartTime":161312.0,"Position":248.7879,"HyperDash":false},{"StartTime":161375.0,"Position":289.975616,"HyperDash":false},{"StartTime":161500.0,"Position":240.0,"HyperDash":false}]},{"StartTime":161625.0,"Objects":[{"StartTime":161625.0,"Position":284.0,"HyperDash":false},{"StartTime":161687.0,"Position":327.2897,"HyperDash":false},{"StartTime":161750.0,"Position":339.019562,"HyperDash":false},{"StartTime":161875.0,"Position":284.0,"HyperDash":false}]},{"StartTime":162000.0,"Objects":[{"StartTime":162000.0,"Position":328.0,"HyperDash":false},{"StartTime":162062.0,"Position":364.361755,"HyperDash":false},{"StartTime":162124.0,"Position":407.040955,"HyperDash":false},{"StartTime":162249.0,"Position":328.0,"HyperDash":false}]},{"StartTime":162375.0,"Objects":[{"StartTime":162375.0,"Position":308.0,"HyperDash":false},{"StartTime":162437.0,"Position":269.638245,"HyperDash":false},{"StartTime":162499.0,"Position":228.959045,"HyperDash":false},{"StartTime":162624.0,"Position":308.0,"HyperDash":false}]},{"StartTime":162750.0,"Objects":[{"StartTime":162750.0,"Position":340.0,"HyperDash":false},{"StartTime":162812.0,"Position":374.361755,"HyperDash":false},{"StartTime":162874.0,"Position":419.040955,"HyperDash":false},{"StartTime":162999.0,"Position":340.0,"HyperDash":false}]},{"StartTime":163125.0,"Objects":[{"StartTime":163125.0,"Position":284.0,"HyperDash":false},{"StartTime":163187.0,"Position":280.849731,"HyperDash":false},{"StartTime":163249.0,"Position":271.649841,"HyperDash":false},{"StartTime":163374.0,"Position":284.0,"HyperDash":false}]},{"StartTime":163500.0,"Objects":[{"StartTime":163500.0,"Position":224.0,"HyperDash":false},{"StartTime":163562.0,"Position":227.849731,"HyperDash":false},{"StartTime":163624.0,"Position":211.649857,"HyperDash":false},{"StartTime":163749.0,"Position":224.0,"HyperDash":false}]},{"StartTime":163875.0,"Objects":[{"StartTime":163875.0,"Position":180.0,"HyperDash":false},{"StartTime":163937.0,"Position":134.564423,"HyperDash":false},{"StartTime":163999.0,"Position":102.8189,"HyperDash":false},{"StartTime":164124.0,"Position":180.0,"HyperDash":false}]},{"StartTime":164250.0,"Objects":[{"StartTime":164250.0,"Position":144.0,"HyperDash":false},{"StartTime":164312.0,"Position":107.832245,"HyperDash":false},{"StartTime":164375.0,"Position":79.14566,"HyperDash":false},{"StartTime":164500.0,"Position":144.0,"HyperDash":false}]},{"StartTime":164625.0,"Objects":[{"StartTime":164625.0,"Position":168.0,"HyperDash":false},{"StartTime":164687.0,"Position":182.167755,"HyperDash":false},{"StartTime":164750.0,"Position":232.85434,"HyperDash":false},{"StartTime":164875.0,"Position":168.0,"HyperDash":false}]},{"StartTime":165000.0,"Objects":[{"StartTime":165000.0,"Position":136.0,"HyperDash":false},{"StartTime":165062.0,"Position":117.871719,"HyperDash":false},{"StartTime":165124.0,"Position":101.605316,"HyperDash":false},{"StartTime":165249.0,"Position":136.0,"HyperDash":false}]},{"StartTime":165375.0,"Objects":[{"StartTime":165375.0,"Position":188.0,"HyperDash":false},{"StartTime":165437.0,"Position":220.128281,"HyperDash":false},{"StartTime":165499.0,"Position":222.394684,"HyperDash":false},{"StartTime":165624.0,"Position":188.0,"HyperDash":false}]},{"StartTime":165750.0,"Objects":[{"StartTime":165750.0,"Position":236.0,"HyperDash":false}]},{"StartTime":165875.0,"Objects":[{"StartTime":165875.0,"Position":236.0,"HyperDash":false}]},{"StartTime":166125.0,"Objects":[{"StartTime":166125.0,"Position":364.0,"HyperDash":false},{"StartTime":166187.0,"Position":369.388123,"HyperDash":false},{"StartTime":166250.0,"Position":391.656616,"HyperDash":false},{"StartTime":166312.0,"Position":357.6028,"HyperDash":false},{"StartTime":166375.0,"Position":309.5534,"HyperDash":false},{"StartTime":166499.0,"Position":282.373474,"HyperDash":false}]},{"StartTime":166625.0,"Objects":[{"StartTime":166625.0,"Position":264.0,"HyperDash":false},{"StartTime":166687.0,"Position":284.388123,"HyperDash":false},{"StartTime":166750.0,"Position":283.656616,"HyperDash":false},{"StartTime":166812.0,"Position":260.602844,"HyperDash":false},{"StartTime":166875.0,"Position":209.5534,"HyperDash":false},{"StartTime":166999.0,"Position":182.373489,"HyperDash":false}]},{"StartTime":167125.0,"Objects":[{"StartTime":167125.0,"Position":192.0,"HyperDash":false}]},{"StartTime":167375.0,"Objects":[{"StartTime":167375.0,"Position":320.0,"HyperDash":false}]},{"StartTime":167625.0,"Objects":[{"StartTime":167625.0,"Position":192.0,"HyperDash":false}]},{"StartTime":167750.0,"Objects":[{"StartTime":167750.0,"Position":256.0,"HyperDash":false}]},{"StartTime":167875.0,"Objects":[{"StartTime":167875.0,"Position":320.0,"HyperDash":false}]},{"StartTime":168125.0,"Objects":[{"StartTime":168125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":168250.0,"Objects":[{"StartTime":168250.0,"Position":193.0,"HyperDash":false},{"StartTime":168308.0,"Position":488.0,"HyperDash":false},{"StartTime":168367.0,"Position":314.0,"HyperDash":false},{"StartTime":168425.0,"Position":135.0,"HyperDash":false},{"StartTime":168484.0,"Position":399.0,"HyperDash":false},{"StartTime":168542.0,"Position":404.0,"HyperDash":false},{"StartTime":168601.0,"Position":152.0,"HyperDash":false},{"StartTime":168660.0,"Position":353.0,"HyperDash":false},{"StartTime":168718.0,"Position":358.0,"HyperDash":false},{"StartTime":168777.0,"Position":447.0,"HyperDash":false},{"StartTime":168835.0,"Position":222.0,"HyperDash":false},{"StartTime":168894.0,"Position":382.0,"HyperDash":false},{"StartTime":168953.0,"Position":433.0,"HyperDash":false},{"StartTime":169011.0,"Position":450.0,"HyperDash":false},{"StartTime":169070.0,"Position":326.0,"HyperDash":false},{"StartTime":169128.0,"Position":414.0,"HyperDash":false},{"StartTime":169187.0,"Position":285.0,"HyperDash":false},{"StartTime":169246.0,"Position":336.0,"HyperDash":false},{"StartTime":169304.0,"Position":509.0,"HyperDash":false},{"StartTime":169363.0,"Position":334.0,"HyperDash":false},{"StartTime":169421.0,"Position":72.0,"HyperDash":false},{"StartTime":169480.0,"Position":425.0,"HyperDash":false},{"StartTime":169539.0,"Position":451.0,"HyperDash":false},{"StartTime":169597.0,"Position":220.0,"HyperDash":false},{"StartTime":169656.0,"Position":25.0,"HyperDash":false},{"StartTime":169714.0,"Position":77.0,"HyperDash":false},{"StartTime":169773.0,"Position":509.0,"HyperDash":false},{"StartTime":169832.0,"Position":90.0,"HyperDash":false},{"StartTime":169890.0,"Position":118.0,"HyperDash":false},{"StartTime":169949.0,"Position":58.0,"HyperDash":false},{"StartTime":170007.0,"Position":12.0,"HyperDash":false},{"StartTime":170066.0,"Position":215.0,"HyperDash":false},{"StartTime":170125.0,"Position":487.0,"HyperDash":false}]},{"StartTime":171125.0,"Objects":[{"StartTime":171125.0,"Position":446.0,"HyperDash":false},{"StartTime":171187.0,"Position":491.0,"HyperDash":false},{"StartTime":171250.0,"Position":459.0,"HyperDash":false},{"StartTime":171312.0,"Position":37.0,"HyperDash":false},{"StartTime":171375.0,"Position":291.0,"HyperDash":false},{"StartTime":171437.0,"Position":315.0,"HyperDash":false},{"StartTime":171500.0,"Position":35.0,"HyperDash":false},{"StartTime":171562.0,"Position":208.0,"HyperDash":false},{"StartTime":171625.0,"Position":504.0,"HyperDash":false},{"StartTime":171687.0,"Position":296.0,"HyperDash":false},{"StartTime":171750.0,"Position":105.0,"HyperDash":false},{"StartTime":171812.0,"Position":488.0,"HyperDash":false},{"StartTime":171875.0,"Position":230.0,"HyperDash":false},{"StartTime":171937.0,"Position":446.0,"HyperDash":false},{"StartTime":172000.0,"Position":241.0,"HyperDash":false},{"StartTime":172062.0,"Position":413.0,"HyperDash":false},{"StartTime":172125.0,"Position":357.0,"HyperDash":false}]},{"StartTime":172375.0,"Objects":[{"StartTime":172375.0,"Position":48.0,"HyperDash":false}]},{"StartTime":172625.0,"Objects":[{"StartTime":172625.0,"Position":20.0,"HyperDash":false},{"StartTime":172678.0,"Position":23.1916313,"HyperDash":false},{"StartTime":172732.0,"Position":25.55497,"HyperDash":false},{"StartTime":172785.0,"Position":75.26404,"HyperDash":false},{"StartTime":172875.0,"Position":108.478035,"HyperDash":false}]},{"StartTime":173125.0,"Objects":[{"StartTime":173125.0,"Position":240.0,"HyperDash":false}]},{"StartTime":173375.0,"Objects":[{"StartTime":173375.0,"Position":200.0,"HyperDash":false}]},{"StartTime":173625.0,"Objects":[{"StartTime":173625.0,"Position":324.0,"HyperDash":false},{"StartTime":173678.0,"Position":349.476471,"HyperDash":false},{"StartTime":173732.0,"Position":378.649323,"HyperDash":false},{"StartTime":173785.0,"Position":384.945282,"HyperDash":false},{"StartTime":173875.0,"Position":412.1426,"HyperDash":false}]},{"StartTime":174000.0,"Objects":[{"StartTime":174000.0,"Position":412.0,"HyperDash":false}]},{"StartTime":174125.0,"Objects":[{"StartTime":174125.0,"Position":412.0,"HyperDash":false},{"StartTime":174178.0,"Position":426.1397,"HyperDash":false},{"StartTime":174232.0,"Position":445.433044,"HyperDash":false},{"StartTime":174285.0,"Position":425.572754,"HyperDash":false},{"StartTime":174375.0,"Position":450.394928,"HyperDash":false}]},{"StartTime":174625.0,"Objects":[{"StartTime":174625.0,"Position":398.0,"HyperDash":false},{"StartTime":174678.0,"Position":380.028442,"HyperDash":false},{"StartTime":174732.0,"Position":327.434753,"HyperDash":false},{"StartTime":174785.0,"Position":306.4632,"HyperDash":false},{"StartTime":174875.0,"Position":242.473724,"HyperDash":false}]},{"StartTime":175000.0,"Objects":[{"StartTime":175000.0,"Position":245.0,"HyperDash":false}]},{"StartTime":175125.0,"Objects":[{"StartTime":175125.0,"Position":245.0,"HyperDash":false},{"StartTime":175178.0,"Position":247.860275,"HyperDash":false},{"StartTime":175232.0,"Position":229.566971,"HyperDash":false},{"StartTime":175285.0,"Position":219.427246,"HyperDash":false},{"StartTime":175375.0,"Position":206.605072,"HyperDash":false}]},{"StartTime":175625.0,"Objects":[{"StartTime":175625.0,"Position":259.0,"HyperDash":false},{"StartTime":175678.0,"Position":271.971558,"HyperDash":false},{"StartTime":175732.0,"Position":338.565247,"HyperDash":false},{"StartTime":175785.0,"Position":339.5368,"HyperDash":false},{"StartTime":175875.0,"Position":414.526276,"HyperDash":false}]},{"StartTime":176125.0,"Objects":[{"StartTime":176125.0,"Position":424.0,"HyperDash":false}]},{"StartTime":176375.0,"Objects":[{"StartTime":176375.0,"Position":272.0,"HyperDash":false}]},{"StartTime":176625.0,"Objects":[{"StartTime":176625.0,"Position":116.0,"HyperDash":false}]},{"StartTime":176875.0,"Objects":[{"StartTime":176875.0,"Position":173.0,"HyperDash":false},{"StartTime":176937.0,"Position":220.433136,"HyperDash":false},{"StartTime":177000.0,"Position":248.325027,"HyperDash":false},{"StartTime":177062.0,"Position":256.667,"HyperDash":false},{"StartTime":177125.0,"Position":270.778076,"HyperDash":false},{"StartTime":177187.0,"Position":271.125366,"HyperDash":false},{"StartTime":177250.0,"Position":267.005768,"HyperDash":false},{"StartTime":177312.0,"Position":259.9013,"HyperDash":false},{"StartTime":177375.0,"Position":212.426208,"HyperDash":false},{"StartTime":177437.0,"Position":239.901321,"HyperDash":false},{"StartTime":177500.0,"Position":249.239349,"HyperDash":false},{"StartTime":177562.0,"Position":285.125366,"HyperDash":false},{"StartTime":177625.0,"Position":270.676758,"HyperDash":false},{"StartTime":177678.0,"Position":275.8453,"HyperDash":false},{"StartTime":177732.0,"Position":255.82901,"HyperDash":false},{"StartTime":177785.0,"Position":207.305466,"HyperDash":false},{"StartTime":177874.0,"Position":173.0,"HyperDash":false}]},{"StartTime":178125.0,"Objects":[{"StartTime":178125.0,"Position":28.0,"HyperDash":false},{"StartTime":178187.0,"Position":78.55116,"HyperDash":false},{"StartTime":178250.0,"Position":102.707985,"HyperDash":false},{"StartTime":178312.0,"Position":129.259155,"HyperDash":false},{"StartTime":178375.0,"Position":179.41597,"HyperDash":false},{"StartTime":178428.0,"Position":226.516159,"HyperDash":false},{"StartTime":178482.0,"Position":240.222,"HyperDash":false},{"StartTime":178535.0,"Position":283.3222,"HyperDash":false},{"StartTime":178625.0,"Position":330.83194,"HyperDash":false}]},{"StartTime":178875.0,"Objects":[{"StartTime":178875.0,"Position":172.0,"HyperDash":false},{"StartTime":178937.0,"Position":221.551163,"HyperDash":false},{"StartTime":179000.0,"Position":253.707977,"HyperDash":false},{"StartTime":179062.0,"Position":274.259155,"HyperDash":false},{"StartTime":179125.0,"Position":323.415955,"HyperDash":false},{"StartTime":179178.0,"Position":344.516174,"HyperDash":false},{"StartTime":179232.0,"Position":379.222,"HyperDash":false},{"StartTime":179285.0,"Position":429.3222,"HyperDash":false},{"StartTime":179375.0,"Position":474.83194,"HyperDash":false}]},{"StartTime":179625.0,"Objects":[{"StartTime":179625.0,"Position":384.0,"HyperDash":false},{"StartTime":179678.0,"Position":348.327026,"HyperDash":false},{"StartTime":179732.0,"Position":316.224579,"HyperDash":false},{"StartTime":179785.0,"Position":267.12973,"HyperDash":false},{"StartTime":179875.0,"Position":244.098541,"HyperDash":false}]},{"StartTime":180000.0,"Objects":[{"StartTime":180000.0,"Position":244.0,"HyperDash":false}]},{"StartTime":180125.0,"Objects":[{"StartTime":180125.0,"Position":244.0,"HyperDash":false},{"StartTime":180178.0,"Position":217.455292,"HyperDash":false},{"StartTime":180232.0,"Position":186.277634,"HyperDash":false},{"StartTime":180285.0,"Position":129.732925,"HyperDash":false},{"StartTime":180375.0,"Position":85.77019,"HyperDash":false}]},{"StartTime":180625.0,"Objects":[{"StartTime":180625.0,"Position":100.0,"HyperDash":false},{"StartTime":180678.0,"Position":146.386475,"HyperDash":false},{"StartTime":180732.0,"Position":185.4029,"HyperDash":false},{"StartTime":180785.0,"Position":189.789368,"HyperDash":false},{"StartTime":180875.0,"Position":257.4834,"HyperDash":false}]},{"StartTime":181000.0,"Objects":[{"StartTime":181000.0,"Position":257.0,"HyperDash":false}]},{"StartTime":181125.0,"Objects":[{"StartTime":181125.0,"Position":256.0,"HyperDash":false},{"StartTime":181178.0,"Position":273.4897,"HyperDash":false},{"StartTime":181231.0,"Position":332.9794,"HyperDash":false},{"StartTime":181284.0,"Position":358.4691,"HyperDash":false},{"StartTime":181374.0,"Position":413.338379,"HyperDash":false}]},{"StartTime":181625.0,"Objects":[{"StartTime":181625.0,"Position":426.0,"HyperDash":false},{"StartTime":181678.0,"Position":383.4294,"HyperDash":false},{"StartTime":181732.0,"Position":353.2254,"HyperDash":false},{"StartTime":181785.0,"Position":325.654816,"HyperDash":false},{"StartTime":181875.0,"Position":267.648163,"HyperDash":false}]},{"StartTime":182000.0,"Objects":[{"StartTime":182000.0,"Position":267.0,"HyperDash":false}]},{"StartTime":182125.0,"Objects":[{"StartTime":182125.0,"Position":267.0,"HyperDash":false},{"StartTime":182178.0,"Position":226.982559,"HyperDash":false},{"StartTime":182232.0,"Position":205.749466,"HyperDash":false},{"StartTime":182285.0,"Position":176.327576,"HyperDash":false},{"StartTime":182375.0,"Position":168.9247,"HyperDash":false}]},{"StartTime":182625.0,"Objects":[{"StartTime":182625.0,"Position":140.0,"HyperDash":false},{"StartTime":182678.0,"Position":155.139557,"HyperDash":false},{"StartTime":182731.0,"Position":203.985977,"HyperDash":false},{"StartTime":182784.0,"Position":216.5605,"HyperDash":false},{"StartTime":182874.0,"Position":238.0753,"HyperDash":false}]},{"StartTime":183125.0,"Objects":[{"StartTime":183125.0,"Position":62.0,"HyperDash":false},{"StartTime":183178.0,"Position":70.6348648,"HyperDash":false},{"StartTime":183232.0,"Position":74.16411,"HyperDash":false},{"StartTime":183285.0,"Position":122.076561,"HyperDash":false},{"StartTime":183375.0,"Position":173.7103,"HyperDash":false}]},{"StartTime":183625.0,"Objects":[{"StartTime":183625.0,"Position":348.0,"HyperDash":false},{"StartTime":183678.0,"Position":324.143158,"HyperDash":false},{"StartTime":183732.0,"Position":333.585327,"HyperDash":false},{"StartTime":183785.0,"Position":270.711,"HyperDash":false},{"StartTime":183874.0,"Position":236.603912,"HyperDash":false}]},{"StartTime":184125.0,"Objects":[{"StartTime":184125.0,"Position":64.0,"HyperDash":false}]},{"StartTime":184250.0,"Objects":[{"StartTime":184250.0,"Position":488.0,"HyperDash":false},{"StartTime":184335.0,"Position":482.0,"HyperDash":false},{"StartTime":184421.0,"Position":321.0,"HyperDash":false},{"StartTime":184507.0,"Position":474.0,"HyperDash":false},{"StartTime":184593.0,"Position":252.0,"HyperDash":false},{"StartTime":184679.0,"Position":247.0,"HyperDash":false},{"StartTime":184765.0,"Position":406.0,"HyperDash":false},{"StartTime":184851.0,"Position":319.0,"HyperDash":false},{"StartTime":184937.0,"Position":253.0,"HyperDash":false},{"StartTime":185023.0,"Position":411.0,"HyperDash":false},{"StartTime":185109.0,"Position":205.0,"HyperDash":false},{"StartTime":185195.0,"Position":54.0,"HyperDash":false},{"StartTime":185281.0,"Position":224.0,"HyperDash":false},{"StartTime":185367.0,"Position":465.0,"HyperDash":false},{"StartTime":185453.0,"Position":432.0,"HyperDash":false},{"StartTime":185539.0,"Position":108.0,"HyperDash":false},{"StartTime":185625.0,"Position":95.0,"HyperDash":false}]},{"StartTime":186125.0,"Objects":[{"StartTime":186125.0,"Position":48.0,"HyperDash":false},{"StartTime":186187.0,"Position":89.47744,"HyperDash":false},{"StartTime":186250.0,"Position":93.06244,"HyperDash":false},{"StartTime":186312.0,"Position":160.382751,"HyperDash":false},{"StartTime":186375.0,"Position":190.718857,"HyperDash":false},{"StartTime":186437.0,"Position":209.265518,"HyperDash":false},{"StartTime":186500.0,"Position":273.188416,"HyperDash":false},{"StartTime":186562.0,"Position":294.6259,"HyperDash":false},{"StartTime":186625.0,"Position":321.75354,"HyperDash":false},{"StartTime":186678.0,"Position":352.728241,"HyperDash":false},{"StartTime":186732.0,"Position":377.1885,"HyperDash":false},{"StartTime":186785.0,"Position":409.4063,"HyperDash":false},{"StartTime":186874.0,"Position":463.955,"HyperDash":false}]},{"StartTime":187125.0,"Objects":[{"StartTime":187125.0,"Position":328.0,"HyperDash":false},{"StartTime":187178.0,"Position":313.795776,"HyperDash":false},{"StartTime":187232.0,"Position":325.474457,"HyperDash":false},{"StartTime":187285.0,"Position":313.270233,"HyperDash":false},{"StartTime":187375.0,"Position":298.734741,"HyperDash":false}]},{"StartTime":187625.0,"Objects":[{"StartTime":187625.0,"Position":184.0,"HyperDash":false},{"StartTime":187678.0,"Position":198.204239,"HyperDash":false},{"StartTime":187732.0,"Position":213.525543,"HyperDash":false},{"StartTime":187785.0,"Position":188.729767,"HyperDash":false},{"StartTime":187875.0,"Position":213.265274,"HyperDash":false}]},{"StartTime":188125.0,"Objects":[{"StartTime":188125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":188250.0,"Objects":[{"StartTime":188250.0,"Position":175.0,"HyperDash":false},{"StartTime":188335.0,"Position":48.0,"HyperDash":false},{"StartTime":188421.0,"Position":307.0,"HyperDash":false},{"StartTime":188507.0,"Position":375.0,"HyperDash":false},{"StartTime":188593.0,"Position":149.0,"HyperDash":false},{"StartTime":188679.0,"Position":250.0,"HyperDash":false},{"StartTime":188765.0,"Position":142.0,"HyperDash":false},{"StartTime":188851.0,"Position":170.0,"HyperDash":false},{"StartTime":188937.0,"Position":281.0,"HyperDash":false},{"StartTime":189023.0,"Position":444.0,"HyperDash":false},{"StartTime":189109.0,"Position":414.0,"HyperDash":false},{"StartTime":189195.0,"Position":321.0,"HyperDash":false},{"StartTime":189281.0,"Position":328.0,"HyperDash":false},{"StartTime":189367.0,"Position":32.0,"HyperDash":false},{"StartTime":189453.0,"Position":259.0,"HyperDash":false},{"StartTime":189539.0,"Position":169.0,"HyperDash":false},{"StartTime":189625.0,"Position":207.0,"HyperDash":false}]},{"StartTime":190125.0,"Objects":[{"StartTime":190125.0,"Position":464.0,"HyperDash":false},{"StartTime":190187.0,"Position":452.522552,"HyperDash":false},{"StartTime":190250.0,"Position":408.937561,"HyperDash":false},{"StartTime":190312.0,"Position":358.617249,"HyperDash":false},{"StartTime":190375.0,"Position":321.281128,"HyperDash":false},{"StartTime":190437.0,"Position":281.7345,"HyperDash":false},{"StartTime":190500.0,"Position":240.811569,"HyperDash":false},{"StartTime":190562.0,"Position":234.374115,"HyperDash":false},{"StartTime":190625.0,"Position":190.246445,"HyperDash":false},{"StartTime":190678.0,"Position":161.271759,"HyperDash":false},{"StartTime":190732.0,"Position":103.811485,"HyperDash":false},{"StartTime":190785.0,"Position":84.59368,"HyperDash":false},{"StartTime":190874.0,"Position":48.04496,"HyperDash":false}]},{"StartTime":191125.0,"Objects":[{"StartTime":191125.0,"Position":184.0,"HyperDash":false},{"StartTime":191178.0,"Position":177.204239,"HyperDash":false},{"StartTime":191232.0,"Position":205.525543,"HyperDash":false},{"StartTime":191285.0,"Position":211.729767,"HyperDash":false},{"StartTime":191375.0,"Position":213.265274,"HyperDash":false}]},{"StartTime":191625.0,"Objects":[{"StartTime":191625.0,"Position":328.0,"HyperDash":false},{"StartTime":191678.0,"Position":303.795776,"HyperDash":false},{"StartTime":191732.0,"Position":318.474457,"HyperDash":false},{"StartTime":191785.0,"Position":296.270233,"HyperDash":false},{"StartTime":191875.0,"Position":298.734741,"HyperDash":false}]},{"StartTime":192125.0,"Objects":[{"StartTime":192125.0,"Position":164.0,"HyperDash":false}]},{"StartTime":192375.0,"Objects":[{"StartTime":192375.0,"Position":28.0,"HyperDash":false}]},{"StartTime":192625.0,"Objects":[{"StartTime":192625.0,"Position":28.0,"HyperDash":false}]},{"StartTime":192875.0,"Objects":[{"StartTime":192875.0,"Position":128.0,"HyperDash":false},{"StartTime":192937.0,"Position":126.887405,"HyperDash":false},{"StartTime":193000.0,"Position":175.597244,"HyperDash":false},{"StartTime":193062.0,"Position":198.553162,"HyperDash":false},{"StartTime":193125.0,"Position":235.7683,"HyperDash":false},{"StartTime":193187.0,"Position":291.259583,"HyperDash":false},{"StartTime":193250.0,"Position":330.488678,"HyperDash":false},{"StartTime":193312.0,"Position":338.450653,"HyperDash":false},{"StartTime":193375.0,"Position":390.71225,"HyperDash":false},{"StartTime":193437.0,"Position":356.065,"HyperDash":false},{"StartTime":193500.0,"Position":315.488678,"HyperDash":false},{"StartTime":193562.0,"Position":279.894,"HyperDash":false},{"StartTime":193625.0,"Position":235.7683,"HyperDash":false},{"StartTime":193678.0,"Position":221.0309,"HyperDash":false},{"StartTime":193732.0,"Position":168.99295,"HyperDash":false},{"StartTime":193785.0,"Position":164.902176,"HyperDash":false},{"StartTime":193875.0,"Position":128.0,"HyperDash":false}]},{"StartTime":194125.0,"Objects":[{"StartTime":194125.0,"Position":276.0,"HyperDash":false},{"StartTime":194187.0,"Position":324.316467,"HyperDash":false},{"StartTime":194250.0,"Position":328.094818,"HyperDash":false},{"StartTime":194312.0,"Position":373.795776,"HyperDash":false},{"StartTime":194375.0,"Position":386.318756,"HyperDash":false},{"StartTime":194428.0,"Position":376.7576,"HyperDash":false},{"StartTime":194482.0,"Position":404.218842,"HyperDash":false},{"StartTime":194535.0,"Position":384.551483,"HyperDash":false},{"StartTime":194624.0,"Position":374.339844,"HyperDash":false}]},{"StartTime":194875.0,"Objects":[{"StartTime":194875.0,"Position":236.0,"HyperDash":false},{"StartTime":194937.0,"Position":201.752014,"HyperDash":false},{"StartTime":195000.0,"Position":162.019058,"HyperDash":false},{"StartTime":195062.0,"Position":146.331146,"HyperDash":false},{"StartTime":195125.0,"Position":125.789307,"HyperDash":false},{"StartTime":195178.0,"Position":127.304863,"HyperDash":false},{"StartTime":195232.0,"Position":133.772476,"HyperDash":false},{"StartTime":195285.0,"Position":111.34684,"HyperDash":false},{"StartTime":195375.0,"Position":137.660187,"HyperDash":false}]},{"StartTime":195625.0,"Objects":[{"StartTime":195625.0,"Position":280.0,"HyperDash":false},{"StartTime":195678.0,"Position":279.7856,"HyperDash":false},{"StartTime":195732.0,"Position":250.37854,"HyperDash":false},{"StartTime":195785.0,"Position":235.164154,"HyperDash":false},{"StartTime":195875.0,"Position":231.818985,"HyperDash":false}]},{"StartTime":196125.0,"Objects":[{"StartTime":196125.0,"Position":104.0,"HyperDash":false}]},{"StartTime":196375.0,"Objects":[{"StartTime":196375.0,"Position":136.0,"HyperDash":false}]},{"StartTime":196625.0,"Objects":[{"StartTime":196625.0,"Position":116.0,"HyperDash":false}]},{"StartTime":196875.0,"Objects":[{"StartTime":196875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":197000.0,"Objects":[{"StartTime":197000.0,"Position":332.0,"HyperDash":false}]},{"StartTime":197125.0,"Objects":[{"StartTime":197125.0,"Position":408.0,"HyperDash":false}]},{"StartTime":197250.0,"Objects":[{"StartTime":197250.0,"Position":392.0,"HyperDash":false}]},{"StartTime":197375.0,"Objects":[{"StartTime":197375.0,"Position":376.0,"HyperDash":false}]},{"StartTime":197625.0,"Objects":[{"StartTime":197625.0,"Position":396.0,"HyperDash":false}]},{"StartTime":197875.0,"Objects":[{"StartTime":197875.0,"Position":256.0,"HyperDash":false}]},{"StartTime":198000.0,"Objects":[{"StartTime":198000.0,"Position":256.0,"HyperDash":false}]},{"StartTime":198125.0,"Objects":[{"StartTime":198125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":198625.0,"Objects":[{"StartTime":198625.0,"Position":136.0,"HyperDash":false}]},{"StartTime":199125.0,"Objects":[{"StartTime":199125.0,"Position":256.0,"HyperDash":false}]},{"StartTime":199625.0,"Objects":[{"StartTime":199625.0,"Position":376.0,"HyperDash":false}]},{"StartTime":200125.0,"Objects":[{"StartTime":200125.0,"Position":256.0,"HyperDash":false}]}]}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/112643.osu b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/112643.osu
new file mode 100644
index 0000000000..35ef17ae34
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/Resources/Testing/Beatmaps/112643.osu
@@ -0,0 +1,582 @@
+osu file format v9
+
+[General]
+StackLeniency: 0.7
+Mode: 0
+
+[Difficulty]
+HPDrainRate:7
+CircleSize:5
+OverallDifficulty:8
+ApproachRate:8
+SliderMultiplier:3.2
+SliderTickRate:2
+
+[Events]
+//Background and Video events
+//Break Periods
+2,16325,17625
+2,32325,33875
+2,66325,67375
+2,120135,127375
+//Storyboard Layer 0 (Background)
+//Storyboard Layer 1 (Fail)
+//Storyboard Layer 2 (Pass)
+//Storyboard Layer 3 (Foreground)
+//Storyboard Sound Samples
+//Background Colour Transformations
+3,100,163,162,255
+
+[TimingPoints]
+125,500,4,1,0,50,1,0
+36125,-100,4,1,0,50,0,1
+66125,-100,4,1,0,50,0,0
+88125,-100,4,1,0,50,0,1
+120125,-100,4,1,0,50,0,0
+170125,-100,4,2,0,5,0,0
+170250,-100,4,1,0,50,0,0
+172125,-100,4,1,0,50,0,1
+200125,-100,4,1,0,50,0,0
+
+[HitObjects]
+64,80,2375,5,0
+172,192,2625,1,2
+152,36,2875,1,0
+80,176,3125,1,2
+224,112,3375,1,0
+192,256,3625,1,8
+136,116,3875,1,0
+272,32,4125,2,2,B|376:0|408:56|412:125|320:144|304:176|328:216|368:272|496:208,1,400,6|0
+504,216,4875,2,2,B|376:232|288:280|248:384,1,320
+384,344,5625,1,8
+272,216,5875,1,0
+272,216,6000,1,0
+272,216,6125,1,4
+92,280,6375,5,0
+124,108,6625,1,8
+256,8,6875,1,0
+388,108,7125,1,2
+420,280,7375,1,8
+256,296,7625,1,8
+256,120,7875,1,0
+443,152,8125,2,2,B|397:202|305:219|256:192|203:163|114:181|68:231,1,400,2|0
+24,256,8875,2,2,B|112:227|141:134|122:36|37:1,1,320
+16,132,9625,1,8
+136,280,9875,1,0
+136,280,10000,1,0
+136,280,10125,1,4
+256,172,10375,5,0
+368,56,10625,1,8
+196,116,10875,1,0
+316,116,11125,1,2
+144,56,11375,1,0
+256,0,11625,1,8
+112,128,11875,1,0
+164,280,12125,6,0,B|256:316,1,80,4|2
+100,348,12500,2,0,B|8:312,1,80,0|2
+144,212,12875,2,0,B|52:176,1,80,0|2
+208,144,13250,2,0,B|300:180,1,80,0|2
+332,324,13625,1,8
+180,324,13875,1,0
+256,240,14125,5,4
+256,240,14250,1,2
+324,112,14500,1,0
+324,112,14625,1,2
+192,56,14875,1,4
+192,56,15000,1,2
+256,164,15250,1,0
+256,164,15375,1,2
+256,20,15625,1,8
+120,56,15875,1,0
+256,92,16125,1,6
+20,152,18375,5,0
+180,136,18625,1,8
+52,228,18875,1,0
+120,84,19125,1,2
+128,244,19375,1,0
+48,84,19625,1,8
+192,212,19875,1,0
+300,72,20125,2,4,B|396:36|444:84|396:144|352:184|372:224|416:260|532:224|528:164,1,320,4|0
+472,40,20875,2,2,B|376:72|304:164|272:260|280:320,1,320
+404,352,21625,1,8
+432,196,21875,1,0
+432,196,22000,1,0
+432,196,22125,1,4
+296,100,22375,5,0
+168,196,22625,2,0,B|32:296,1,160,8|0
+268,212,23125,2,0,B|168:76,1,160,2|8
+252,312,23625,2,0,B|388:212,1,160,8|0
+484,96,24125,2,2,B|412:0|320:36|288:120|240:136|200:132|156:116|132:96|80:44,1,400,2|0
+72,24,24875,2,2,B|158:66|148:177|67:253|-19:210,1,320
+56,108,25625,1,8
+176,200,25875,1,0
+176,200,26000,1,0
+176,200,26125,1,4
+316,92,26375,5,0
+464,164,26625,2,0,B|394:224|412:336,1,160,2|0
+232,316,27125,2,0,B|306:256|284:144,1,160,2|8
+136,88,27625,1,8
+60,224,27875,1,0
+212,132,28125,6,0,B|256:32,1,80,4|2
+340,228,28500,2,0,B|384:128,1,80,0|2
+256,284,28875,2,0,B|212:184,1,80,4|2
+128,380,29250,2,0,B|84:280,1,80,0|2
+238,383,29625,2,0,B|406:379,1,160,8|0
+512,267,30125,5,4
+512,267,30250,1,2
+416,152,30500,1,0
+416,152,30625,1,2
+300,264,30875,1,4
+300,264,31000,1,2
+236,100,31250,1,0
+236,100,31375,1,2
+152,256,31625,1,8
+300,160,31875,1,0
+256,332,32125,1,6
+52,52,34625,5,0
+152,164,34875,1,0
+256,56,35125,1,4
+256,56,35625,1,2
+256,56,36125,2,4,B|331:63|364:136|320:224,1,160,4|0
+320,312,36625,1,8
+204,228,36875,1,0
+104,328,37125,2,2,B|24:287|44:188,1,160
+92,60,37625,1,8
+212,148,37875,1,0
+268,104,38000,1,0
+324,60,38125,2,0,B|452:184,1,160,4|0
+504,300,38625,1,8
+364,340,38875,1,0
+232,280,39125,6,2,B|150:282|69:198|105:87|179:53,2,320,2|2|6
+280,148,40375,1,0
+400,228,40625,2,0,B|520:368,1,160,8|0
+480,192,41125,1,2
+324,220,41375,1,2
+168,256,41625,1,8
+72,148,41875,1,2
+48,84,42000,1,2
+96,36,42125,2,0,B|164:108|256:44,1,160,6|0
+400,72,42625,1,2
+440,236,42875,1,2
+464,300,43000,1,2
+416,348,43125,2,0,B|348:276|256:340,1,160,6|0
+112,312,43625,1,2
+140,188,43875,1,0
+52,64,44125,5,6
+208,48,44375,1,0
+344,132,44625,1,8
+448,256,44875,2,2,B|401:321|285:337|217:242|233:163,2,320,2|2|0
+326,211,46125,2,2,B|279:146|163:130|95:225|111:304,1,320,6|0
+230,287,46875,2,2,B|277:352|393:368|461:273|445:194,1,320,6|8
+376,80,47625,1,8
+376,80,48125,6,0,B|304:128|216:96,1,160,4|0
+84,56,48625,1,8
+152,200,48875,1,0
+44,320,49125,2,0,B|121:364|204:320,1,160,4|0
+336,240,49625,5,8
+256,148,49875,1,0
+176,240,50125,1,0
+340,144,50625,1,0
+420,236,50875,1,0
+500,144,51125,1,2
+172,144,51625,1,2
+92,236,51875,1,0
+12,144,52125,6,0,B|160:48,1,160,4|0
+304,76,52625,1,8
+256,228,52875,1,0
+216,112,53125,2,0,B|364:208,1,160,2|0
+508,180,53625,1,8
+460,28,53875,1,0
+344,96,54125,1,2
+228,8,54375,1,0
+153,116,54625,1,2
+72,220,54875,1,0
+180,295,55125,1,2
+284,376,55375,1,0
+359,268,55625,1,2
+440,164,55875,1,0
+352,160,56125,6,0,B|466:294,1,160,4|0
+312,228,56625,1,8
+200,300,56875,1,0
+160,160,57125,2,0,B|46:294,1,160,4|0
+200,228,57625,1,8
+312,300,57875,1,0
+444,208,58125,2,0,B|362:164|380:56,1,160,2|0
+344,12,58500,1,0
+272,4,58625,2,0,B|232:88|120:68,1,160,2|0
+68,176,59125,2,0,B|148:220|132:328,1,160,2|0
+168,372,59500,1,0
+240,380,59625,2,0,B|280:296|392:316,1,160,2|0
+456,176,60125,5,6
+328,80,60375,1,0
+216,196,60625,1,8
+72,136,60875,2,2,B|54:209|91:305|191:336|269:306,2,320,2|2|0
+200,224,62125,2,2,B|182:150|219:54|319:23|397:53,1,320,2|0
+480,179,62875,2,2,B|499:252|462:348|362:379|284:349,1,320,2|0
+136,296,63625,2,0,B|67:220|140:136,1,160,8|0
+256,56,64125,5,6
+284,212,64375,1,0
+440,180,64625,1,8
+420,24,64875,1,0
+300,132,65125,1,6
+272,288,65375,1,0
+116,256,65625,1,8
+136,100,65875,1,0
+256,8,66125,1,4
+256,56,68125,6,0,B|298:128|244:237|123:241|74:173,1,320
+132,80,68875,2,2,B|344:328,1,320
+456,224,69625,1,8
+340,116,69875,1,0
+340,116,70000,1,0
+340,116,70125,1,4
+228,4,70375,5,0
+256,160,70625,2,0,B|186:224|88:168,1,160,2|0
+148,332,71125,2,0,B|216:396|316:340,1,160,2|8
+424,248,71625,1,8
+336,112,71875,1,0
+336,112,72000,1,0
+336,112,72125,1,4
+228,208,72375,2,0,B|139:179|144:80,1,160,0|8
+268,56,72875,2,2,B|272:164|220:272|120:308|72:308,1,320
+24,192,73625,1,8
+92,64,73875,1,0
+92,64,74000,1,0
+92,64,74125,1,4
+224,140,74375,5,0
+340,224,74625,2,0,B|412:211|428:121|363:77,1,160,2|0
+268,192,75125,2,0,B|196:205|180:295|245:339,1,160,2|0
+268,192,75625,2,0,B|104:168,1,160,8|0
+24,52,76125,6,0,B|132:40,1,80
+176,32,76375,1,2
+348,60,76625,1,2
+248,164,76875,1,2
+264,20,77125,1,2
+324,140,77375,1,2
+180,116,77625,1,2
+240,240,77875,1,0
+256,92,78125,1,4
+100,124,78375,5,0
+8,256,78625,2,0,B|64:332|176:304,1,160,8|0
+304,260,79125,2,0,B|248:184|136:212,1,160,2|0
+304,260,79625,1,8
+460,284,79875,1,2
+420,128,80125,6,0,B|332:128,1,80,4|0
+256,124,80375,1,2
+344,260,80625,1,2
+168,260,80875,1,2
+384,192,81125,1,2
+256,260,81375,1,2
+168,124,81625,1,2
+344,124,81875,1,2
+128,192,82125,1,4
+48,192,82250,6,0,B|48:84|152:52,1,160,2|0
+204,44,82625,2,0,B|204:152|308:184,1,160,2|0
+352,160,83000,2,0,B|244:160|212:264,1,160,2|0
+192,316,83375,2,0,B|84:316|52:212,1,160,2|2
+32,88,83875,1,2
+172,8,84125,1,4
+256,192,84250,12,6,86125
+256,192,86250,12,4,87125
+256,100,88125,6,2,B|308:116|368:104|404:16,1,160,6|0
+256,100,88625,1,8
+136,180,88875,1,0
+8,96,89125,2,0,B|-28:168|16:232|68:256,1,160,2|0
+164,312,89625,1,8
+288,236,89875,1,2
+288,236,90000,1,2
+288,236,90125,2,2,B|452:164,1,160,6|0
+476,32,90625,1,8
+332,104,90875,1,0
+180,104,91125,5,6
+36,32,91375,1,8
+56,164,91625,1,8
+56,164,92125,2,0,B|260:208,1,160,6|0
+84,296,92625,1,8
+220,376,92875,1,0
+320,268,93125,2,0,B|524:224,1,160,6|0
+432,80,93625,1,8
+296,152,93875,1,2
+296,152,94000,1,2
+296,152,94125,2,2,B|232:164|176:132|164:52,1,160,6|0
+216,232,94625,2,2,B|280:220|336:252|348:332,1,160,2|0
+341,304,95000,1,0
+341,304,95125,2,0,B|369:84,1,160,2|0
+171,80,95625,2,0,B|143:300,1,160,2|0
+43,358,96125,5,6
+81,219,96375,1,0
+169,332,96625,1,8
+304,272,96875,2,2,B|388:252|426:161|418:63|344:19,2,320,2|2|0
+240,144,98125,2,2,B|219:244|50:229|65:60|168:58,1,320
+240,144,98875,2,2,B|260:43|429:58|414:227|311:229,1,320,2|0
+180,292,99625,2,0,B|80:304|36:208,1,160,2|0
+48,64,100125,6,0,B|224:112,1,160,4|0
+348,52,100625,2,0,B|524:4,1,160,2|0
+504,172,101125,2,0,B|328:124,1,160,2|0
+204,184,101625,2,0,B|28:232,1,160,2|0
+49,226,102000,1,0
+49,226,102125,1,2
+256,324,102625,5,8
+384,256,102875,1,0
+256,188,103125,1,6
+256,188,103625,1,2
+128,256,103875,1,0
+256,324,104125,6,0,B|324:252|432:316,1,160,6|0
+492,168,104625,1,8
+332,188,104875,1,0
+256,60,105125,2,0,B|188:132|80:68,1,160,6|0
+20,216,105625,1,8
+180,196,105875,1,0
+368,156,106125,2,0,B|418:184|462:234|408:296,1,160,2|0
+220,80,106625,2,0,B|248:30|298:-14|360:40,1,160,2|0
+144,228,107125,2,0,B|94:200|50:150|104:88,1,160,2|0
+292,304,107625,2,0,B|264:354|214:398|152:344,1,160,2|0
+44,216,108125,6,0,B|145:221|172:132,1,160,6|0
+304,224,108625,1,8
+408,104,108875,1,0
+468,216,109125,2,0,B|367:221|340:132,1,160,6|0
+208,224,109625,1,8
+104,104,109875,1,0
+256,56,110125,2,0,B|144:180,1,160,2|0
+256,328,110625,2,0,B|368:204,1,160,2|0
+208,244,111125,2,0,B|96:368,1,160,2|0
+304,140,111625,2,0,B|416:16,1,160,2|0
+252,20,112125,5,6
+112,60,112375,1,0
+72,200,112625,1,8
+158,316,112875,2,2,B|236:321|324:259|326:152|278:89,2,320,2|2|0
+176,168,114125,2,2,B|214:236|313:276|405:220|431:145,1,320,2|0
+328,64,114875,2,2,B|259:102|219:201|275:293|350:319,1,320,2|0
+488,340,115625,2,0,B|456:172,1,160,2|0
+416,72,116125,5,6
+288,140,116375,1,0
+164,68,116625,1,8
+36,136,116875,1,0
+104,264,117125,1,6
+232,332,117375,1,0
+356,260,117625,1,8
+484,328,117875,1,0
+356,384,118125,1,6
+256,12,128125,5,4
+256,12,128250,1,2
+336,128,128500,1,0
+336,128,128625,1,2
+400,0,128875,1,0
+400,0,129000,1,2
+492,112,129250,1,0
+492,112,129375,1,2
+440,248,129625,2,2,B|272:284,1,160
+256,108,130125,5,4
+256,108,130250,1,2
+176,224,130500,1,0
+176,224,130625,1,2
+112,96,130875,1,0
+112,96,131000,1,2
+20,208,131250,1,0
+20,208,131375,1,2
+72,344,131625,2,2,B|240:380,1,160
+408,376,132125,6,0,B|512:352|584:248|592:-32|416:-48|256:-80|96:-16|56:88|8:224|88:304|144:336|184:368|256:368|256:368|328:368|368:336|424:304|504:224|456:88|416:-16|256:-80|96:-48|-80:-32|-72:248|0:352|104:376,1,2240,6|0
+256,192,135875,5,2
+256,192,136000,1,0
+256,192,136125,1,4
+136,104,136375,1,0
+132,240,136625,1,8
+133,240,136750,1,0
+256,280,137000,1,0
+255,280,137125,1,8
+256,280,137250,1,0
+256,280,137375,1,0
+380,240,137625,1,8
+376,104,137875,1,0
+256,124,138125,5,4
+256,124,138375,1,0
+144,192,138625,1,8
+144,192,138750,1,0
+256,260,139000,1,0
+256,260,139125,1,8
+256,260,139250,1,0
+256,260,139375,1,0
+368,192,139625,1,8
+256,124,139875,1,0
+256,124,140000,1,0
+256,124,140125,2,2,B|188:112|212:76|188:36|256:20,1,160,6|2
+332,128,140625,5,8
+332,128,140750,1,0
+332,256,141000,1,0
+332,256,141125,1,8
+332,256,141250,1,0
+332,256,141375,1,0
+180,256,141625,1,8
+180,128,141875,1,0
+256,56,142125,5,4
+256,56,142375,1,0
+256,160,142625,1,8
+256,160,142750,1,0
+256,264,143000,1,0
+256,264,143125,1,8
+256,264,143250,1,0
+256,264,143375,1,0
+188,352,143625,1,8
+324,352,143875,1,0
+324,352,144000,1,0
+324,352,144125,2,0,B|492:352,1,160,6|2
+392,280,144625,5,8
+392,280,144750,1,0
+324,192,145000,1,0
+324,192,145125,1,8
+324,192,145250,1,0
+324,192,145375,1,0
+188,192,145625,1,8
+120,280,145875,1,0
+256,288,146125,5,4
+256,288,146375,1,0
+256,176,146625,1,8
+256,176,146750,1,0
+176,96,147000,1,0
+176,96,147125,1,8
+176,96,147250,1,0
+176,96,147375,1,0
+256,16,147625,1,8
+336,96,147875,1,0
+336,96,148000,1,0
+336,96,148125,2,6,B|400:156|388:224|364:248,1,160,6|2
+256,272,148625,5,8
+240,264,148750,1,0
+240,180,149000,1,0
+256,172,149125,1,8
+272,164,149250,1,0
+288,156,149375,1,0
+256,64,149625,1,8
+256,64,149875,1,0
+116,180,150125,5,0
+120,200,150250,1,0
+132,224,150375,1,0
+152,236,150500,1,0
+176,240,150625,1,8
+208,240,150750,1,0
+232,236,150875,1,0
+248,216,151000,1,0
+256,192,151125,1,8
+260,168,151250,1,0
+272,144,151375,1,8
+292,132,151500,1,0
+316,128,151625,1,8
+348,128,151750,1,8
+372,132,151875,1,8
+388,152,152000,1,0
+404,184,152125,6,0,B|436:250|377:334|292:300,1,160,6|0
+108,200,152625,2,0,B|76:134|135:50|220:84,1,160,6|0
+256,192,153125,2,0,B|256:100,1,80,2|0
+256,192,153375,2,0,B|256:368,2,160,2|8|0
+360,60,154125,5,0
+360,60,154250,1,0
+360,60,154375,1,2
+256,12,154625,1,0
+256,12,154750,1,0
+256,12,154875,1,2
+154,64,155125,1,0
+154,64,155250,1,2
+155,63,155375,2,0,B|87:119|115:191|179:211|227:179,2,160,0|8|0
+163,74,156000,5,0
+163,74,156125,1,0
+163,74,156250,2,2,B|174:151|299:265|445:180|473:106,1,400,2|0
+320,80,157125,2,2,B|224:88|184:188|224:288|320:295,1,320
+348,292,157750,1,0
+380,280,157875,1,0
+404,260,158000,1,0
+412,236,158125,1,0
+412,208,158250,1,0
+404,180,158375,1,0
+264,68,158625,2,0,B|184:104,2,80,2|0|2
+164,216,159125,2,0,B|244:180,2,80,2|0|2
+56,144,159625,5,8
+64,276,159875,1,8
+64,276,160000,1,8
+64,276,160125,2,0,B|24:352,2,80,2|0|0
+128,288,160500,2,0,B|136:188,2,80,2|0|0
+192,300,160875,2,0,B|200:400,2,80,2|0|0
+240,256,161250,2,0,B|304:176,2,80,2|0|0
+284,304,161625,2,0,B|356:380,2,80,2|0|0
+328,256,162000,6,0,B|456:236,2,80,0|2|0
+308,192,162375,2,0,B|180:172,2,80,0|2|0
+340,136,162750,2,0,B|468:116,2,80,0|2|0
+284,100,163125,2,0,B|264:-28,2,80,0|2|0
+224,128,163500,2,0,B|204:256,2,80,0|2|0
+180,76,163875,6,0,B|92:52,2,80,2|0|0
+144,132,164250,2,0,B|72:184,2,80,2|0|0
+168,196,164625,2,0,B|240:248,2,80,2|0|0
+136,256,165000,2,0,B|96:340,2,80,2|0|0
+188,296,165375,2,0,B|228:380,2,80,2|0|0
+236,252,165750,1,0
+236,252,165875,1,2
+364,276,166125,6,2,B|408:176|360:156|320:168|296:176|268:132|264:112|272:76|304:52|328:40,1,240,2|0
+264,24,166625,2,2,B|308:124|260:144|220:132|196:124|168:168|164:188|172:224|204:248|228:260,1,240,2|0
+192,280,167125,1,0
+320,376,167375,1,0
+192,376,167625,1,0
+256,328,167750,1,0
+320,280,167875,1,0
+256,124,168125,1,6
+256,192,168250,12,0,170125
+256,192,171125,12,6,172125
+48,56,172375,5,0
+20,184,172625,2,0,B|16:264|92:316|152:304,1,160,8|0
+240,300,173125,1,2
+200,176,173375,1,0
+324,220,173625,2,0,B|360:220|416:258|412:338,1,160,8|0
+412,334,174000,1,0
+412,334,174125,2,0,B|456:156,1,160,6|0
+398,35,174625,2,0,B|220:-8,1,160,2|0
+245,0,175000,1,0
+245,0,175125,2,0,B|201:178,1,160,6|0
+259,299,175625,2,0,B|437:342,1,160,2|0
+424,176,176125,5,6
+272,128,176375,1,0
+116,152,176625,1,8
+173,253,176875,2,2,B|257:233|295:142|287:44|213:0,2,320,2|2|0
+28,204,178125,2,2,B|356:316,1,320
+172,360,178875,2,2,B|500:248,1,320,2|0
+384,148,179625,2,0,B|292:168|224:96|232:44,1,160,2|0
+244,93,180000,1,0
+244,93,180125,6,0,B|64:120,1,160,6|0
+100,268,180625,2,0,B|256:296,1,160,8|0
+257,296,181000,1,0
+256,296,181125,2,0,B|413:267,1,160,6|0
+426,116,181625,2,0,B|267:93,1,160,8|2
+267,93,182000,5,2
+267,93,182125,2,2,B|180:112|168:212,1,160,2|0
+140,380,182625,2,0,B|227:361|239:261,1,160,8|0
+62,169,183125,2,2,B|80:256|180:268,1,160,2|0
+348,296,183625,2,0,B|329:208|229:196,1,160,8|0
+64,172,184125,1,6
+256,192,184250,12,2,185625
+48,188,186125,6,2,B|96:108|256:108|256:192|256:276|416:276|464:196,1,480,2|0
+328,144,187125,2,0,B|296:316,1,160,2|0
+184,240,187625,2,0,B|216:68,1,160,2|0
+256,192,188125,1,6
+256,192,188250,12,2,189625
+464,188,190125,6,2,B|416:108|256:108|256:192|256:276|96:276|48:196,1,480,2|0
+184,144,191125,2,0,B|216:316,1,160,2|0
+328,240,191625,2,0,B|296:68,1,160,2|0
+164,32,192125,5,6
+28,84,192375,1,0
+28,228,192625,1,8
+128,332,192875,2,2,B|160:224|300:172|408:244,2,320,2|2|0
+276,356,194125,2,2,B|384:324|436:184|364:76,1,320
+236,28,194875,2,2,B|128:60|76:200|148:308,1,320,2|0
+280,268,195625,2,0,B|232:116,1,160,2|0
+104,52,196125,5,6
+136,192,196375,1,0
+116,344,196625,1,8
+256,312,196875,1,0
+332,312,197000,1,0
+408,332,197125,1,6
+392,264,197250,1,0
+376,192,197375,1,0
+396,40,197625,1,8
+256,72,197875,5,0
+256,72,198000,1,0
+256,72,198125,1,6
+136,192,198625,1,6
+256,312,199125,1,6
+376,192,199625,1,6
+256,192,200125,1,6
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 02d4cdbb94..d5d4d3b694 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -44,6 +44,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             base.PostProcess();
 
             ApplyPositionOffsets(Beatmap);
+            ApplyPositionClamping(Beatmap);
 
             int index = 0;
 
@@ -114,6 +115,17 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             initialiseHyperDash(beatmap);
         }
 
+        public void ApplyPositionClamping(IBeatmap beatmap)
+        {
+            foreach (var obj in beatmap.HitObjects.OfType<CatchHitObject>())
+            {
+                if (obj.EffectiveX < 0)
+                    obj.XOffset += Math.Abs(obj.EffectiveX);
+                else if (obj.EffectiveX > CatchPlayfield.WIDTH)
+                    obj.XOffset += CatchPlayfield.WIDTH - obj.EffectiveX;
+            }
+        }
+
         private static void applyHardRockOffset(CatchHitObject hitObject, ref float? lastPosition, ref double lastStartTime, LegacyRandom rng)
         {
             float offsetPosition = hitObject.OriginalX;
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index d691ceceb1..671291ef0e 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 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;
@@ -103,8 +102,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                X = ClampToPlayfield(EffectiveX + Path.PositionAt(
-                                    lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X),
+                                X = EffectiveX + Path.PositionAt(lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X,
                             });
                         }
                     }
@@ -121,7 +119,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            X = ClampToPlayfield(EffectiveX + Path.PositionAt(e.PathProgress).X),
+                            X = EffectiveX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
 
@@ -132,16 +130,14 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            X = ClampToPlayfield(EffectiveX + Path.PositionAt(e.PathProgress).X),
+                            X = EffectiveX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
                 }
             }
         }
 
-        public float EndX => ClampToPlayfield(EffectiveX + this.CurvePositionAt(1).X);
-
-        public float ClampToPlayfield(float value) => Math.Clamp(value, 0, CatchPlayfield.WIDTH);
+        public float EndX => EffectiveX + this.CurvePositionAt(1).X;
 
         [JsonIgnore]
         public double Duration

From b20b2203ac92c3c261df43967fe6d6e140e58496 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Mon, 11 Dec 2023 21:06:46 +0800
Subject: [PATCH 1918/2296] Fix mania Autoplay mod missing 0ms hold notes

---
 .../Mods/TestSceneManiaModAutoplay.cs         | 42 +++++++++++++++++++
 .../Replays/ManiaAutoGenerator.cs             | 17 +++++---
 2 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.cs
new file mode 100644
index 0000000000..f653f209c1
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModAutoplay.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.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests.Mods
+{
+    public partial class TestSceneManiaModAutoplay : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
+        [Test]
+        public void TestPerfectScoreOnShortHoldNote()
+        {
+            CreateModTest(new ModTestData
+            {
+                Autoplay = true,
+                Beatmap = new ManiaBeatmap(new StageDefinition(1))
+                {
+                    HitObjects = new List<ManiaHitObject>
+                    {
+                        new HoldNote
+                        {
+                            StartTime = 100,
+                            EndTime = 100,
+                        },
+                        new HoldNote
+                        {
+                            StartTime = 100.1,
+                            EndTime = 150,
+                        },
+                    }
+                },
+                PassCondition = () => Player.ScoreProcessor.Combo.Value == 4
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 7c8afdff12..dd3208bd89 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -87,15 +87,22 @@ namespace osu.Game.Rulesets.Mania.Replays
         private double calculateReleaseTime(HitObject currentObject, HitObject? nextObject)
         {
             double endTime = currentObject.GetEndTime();
+            double releaseDelay = RELEASE_DELAY;
 
-            if (currentObject is HoldNote)
-                // hold note releases must be timed exactly.
-                return endTime;
+            if (currentObject is HoldNote hold)
+            {
+                if (hold.Duration > 0)
+                    // hold note releases must be timed exactly.
+                    return endTime;
+
+                // Special case for super short hold notes
+                releaseDelay = 1;
+            }
 
             bool canDelayKeyUpFully = nextObject == null ||
-                                      nextObject.StartTime > endTime + RELEASE_DELAY;
+                                      nextObject.StartTime > endTime + releaseDelay;
 
-            return endTime + (canDelayKeyUpFully ? RELEASE_DELAY : (nextObject.AsNonNull().StartTime - endTime) * 0.9);
+            return endTime + (canDelayKeyUpFully ? releaseDelay : (nextObject.AsNonNull().StartTime - endTime) * 0.9);
         }
 
         protected override HitObject? GetNextObject(int currentIndex)

From f0ddcb22c6e33a20ae07cafeae5360fc1e2173f8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Dec 2023 21:21:04 +0300
Subject: [PATCH 1919/2296] Remove arbitrary margin

---
 osu.Game/Graphics/UserInterface/OsuDropdown.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 96604275ea..ea0da30911 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -413,11 +413,6 @@ namespace osu.Game.Graphics.UserInterface
 
                 private partial class DropdownSearchTextBox : SearchTextBox
                 {
-                    public DropdownSearchTextBox()
-                    {
-                        TextContainer.Margin = new MarginPadding { Top = 4f };
-                    }
-
                     public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
                     {
                         if (e.Action == GlobalAction.Back)

From 67a9eab741ab3a715ad0882fa8597529e380f844 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Dec 2023 21:21:11 +0300
Subject: [PATCH 1920/2296] Update caret layout

---
 osu.Game/Graphics/UserInterface/OsuTextBox.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 4742da6d0b..08d38837f6 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -314,18 +314,16 @@ namespace osu.Game.Graphics.UserInterface
 
             public OsuCaret()
             {
-                RelativeSizeAxes = Axes.Y;
-                Size = new Vector2(1, 0.9f);
-
                 Colour = Color4.Transparent;
-                Anchor = Anchor.CentreLeft;
-                Origin = Anchor.CentreLeft;
 
-                Masking = true;
-                CornerRadius = 1;
                 InternalChild = beatSync = new CaretBeatSyncedContainer
                 {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Masking = true,
+                    CornerRadius = 1f,
                     RelativeSizeAxes = Axes.Both,
+                    Height = 0.9f,
                 };
             }
 

From daaadf3fc38efb9631eb01a618d0a0033439ca03 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 11:51:45 +0900
Subject: [PATCH 1921/2296] Fix IgnoreMiss judgements not updating accuracy

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs    | 21 ++++++++++++++++++
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 22 +++++++++----------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index fd041d3dd0..d883b91abc 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -356,6 +356,27 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.That(actual, Is.EqualTo(expected).Within(Precision.FLOAT_EPSILON));
         }
 
+        [TestCase(HitResult.Great)]
+        [TestCase(HitResult.LargeTickHit)]
+        public void TestAccuracyUpdateFromIgnoreMiss(HitResult maxResult)
+        {
+            scoreProcessor.ApplyBeatmap(new Beatmap
+            {
+                HitObjects =
+                {
+                    new TestHitObject(maxResult, HitResult.IgnoreMiss)
+                }
+            });
+
+            var judgementResult = new JudgementResult(beatmap.HitObjects.Single(), new TestJudgement(maxResult, HitResult.IgnoreMiss))
+            {
+                Type = HitResult.IgnoreMiss
+            };
+            scoreProcessor.ApplyResult(judgementResult);
+
+            Assert.That(scoreProcessor.Accuracy.Value, Is.Not.EqualTo(1));
+        }
+
         private class TestJudgement : Judgement
         {
             public override HitResult MaxResult { get; }
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index baeddbd0e8..f110172988 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -218,9 +218,6 @@ namespace osu.Game.Rulesets.Scoring
 
             scoreResultCounts[result.Type] = scoreResultCounts.GetValueOrDefault(result.Type) + 1;
 
-            if (!result.Type.IsScorable())
-                return;
-
             if (result.Type.IncreasesCombo())
                 Combo.Value++;
             else if (result.Type.BreaksCombo())
@@ -228,16 +225,18 @@ namespace osu.Game.Rulesets.Scoring
 
             result.ComboAfterJudgement = Combo.Value;
 
-            if (result.Type.AffectsAccuracy())
+            if (result.Judgement.MaxResult.AffectsAccuracy())
             {
                 currentMaximumBaseScore += Judgement.ToNumericResult(result.Judgement.MaxResult);
-                currentBaseScore += Judgement.ToNumericResult(result.Type);
                 currentAccuracyJudgementCount++;
             }
 
+            if (result.Type.AffectsAccuracy())
+                currentBaseScore += Judgement.ToNumericResult(result.Type);
+
             if (result.Type.IsBonus())
                 currentBonusPortion += GetBonusScoreChange(result);
-            else
+            else if (result.Type.IsScorable())
                 currentComboPortion += GetComboScoreChange(result);
 
             ApplyScoreChange(result);
@@ -275,19 +274,18 @@ namespace osu.Game.Rulesets.Scoring
 
             scoreResultCounts[result.Type] = scoreResultCounts.GetValueOrDefault(result.Type) - 1;
 
-            if (!result.Type.IsScorable())
-                return;
-
-            if (result.Type.AffectsAccuracy())
+            if (result.Judgement.MaxResult.AffectsAccuracy())
             {
                 currentMaximumBaseScore -= Judgement.ToNumericResult(result.Judgement.MaxResult);
-                currentBaseScore -= Judgement.ToNumericResult(result.Type);
                 currentAccuracyJudgementCount--;
             }
 
+            if (result.Type.AffectsAccuracy())
+                currentBaseScore -= Judgement.ToNumericResult(result.Type);
+
             if (result.Type.IsBonus())
                 currentBonusPortion -= GetBonusScoreChange(result);
-            else
+            else if (result.Type.IsScorable())
                 currentComboPortion -= GetComboScoreChange(result);
 
             RemoveScoreChange(result);

From 8977e74171793d6321b2b8b23a7599ee6d6e490a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 13:15:49 +0900
Subject: [PATCH 1922/2296] Fix editor test not waiting for editor to load

---
 .../Visual/Editing/TestSceneOpenEditorTimestamp.cs     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
index 1a754d5145..1f46a08831 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Editing
 {
     public partial class TestSceneOpenEditorTimestamp : OsuGameTestScene
     {
-        private Editor editor => (Editor)Game.ScreenStack.CurrentScreen;
+        private Editor? editor => Game.ScreenStack.CurrentScreen as Editor;
         private EditorBeatmap editorBeatmap => editor.ChildrenOfType<EditorBeatmap>().Single();
         private EditorClock editorClock => editor.ChildrenOfType<EditorClock>().Single();
 
@@ -111,18 +111,18 @@ namespace osu.Game.Tests.Visual.Editing
         }
 
         private void addStepScreenModeTo(EditorScreenMode screenMode) =>
-            AddStep("change screen to " + screenMode, () => editor.Mode.Value = screenMode);
+            AddStep("change screen to " + screenMode, () => editor!.Mode.Value = screenMode);
 
         private void assertOnScreenAt(EditorScreenMode screen, double time)
         {
             AddAssert($"stayed on {screen} at {time}", () =>
-                editor.Mode.Value == screen
+                editor!.Mode.Value == screen
                 && editorClock.CurrentTime == time
             );
         }
 
         private void assertMovedScreenTo(EditorScreenMode screen, string text = "moved to") =>
-            AddAssert($"{text} {screen}", () => editor.Mode.Value == screen);
+            AddAssert($"{text} {screen}", () => editor!.Mode.Value == screen);
 
         private void setUpEditor(RulesetInfo ruleset)
         {
@@ -145,7 +145,7 @@ namespace osu.Game.Tests.Visual.Editing
                 ((PlaySongSelect)Game.ScreenStack.CurrentScreen)
                 .Edit(beatmapSet.Beatmaps.Last(beatmap => beatmap.Ruleset.Name == ruleset.Name))
             );
-            AddUntilStep("Wait for editor open", () => editor.ReadyForUse);
+            AddUntilStep("Wait for editor open", () => editor?.ReadyForUse == true);
         }
     }
 }

From c31ff84417b76fd6e6e47ec4a92f93e029bbbeb8 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 13:32:27 +0900
Subject: [PATCH 1923/2296] Fix possible nullref

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 87185c351e..1d6b383dea 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -126,12 +126,14 @@ namespace osu.Game.Screens.Select.Details
                     mod.ApplyToDifficulty(adjustedDifficulty);
             }
 
-            switch (gameRuleset.Value.OnlineID)
+            IRulesetInfo ruleset = gameRuleset?.Value ?? beatmapInfo.Ruleset;
+
+            switch (ruleset.OnlineID)
             {
                 case 3:
                     // Account for mania differences locally for now.
                     // Eventually this should be handled in a more modular way, allowing rulesets to return arbitrary difficulty attributes.
-                    ILegacyRuleset legacyRuleset = (ILegacyRuleset)gameRuleset.Value.CreateInstance();
+                    ILegacyRuleset legacyRuleset = (ILegacyRuleset)ruleset.CreateInstance();
 
                     // For the time being, the key count is static no matter what, because:
                     // a) The method doesn't have knowledge of the active keymods. Doing so may require considerations for filtering.

From 8c760e511041ba5635f5c5987e89262905b74f32 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 13:41:01 +0900
Subject: [PATCH 1924/2296] Fix hitobject count when creating from an IBeatmap

---
 .../Legacy/LegacyBeatmapConversionDifficultyInfo.cs   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
index 6f379e4ef1..baf771adef 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
@@ -1,8 +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.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Scoring.Legacy
 {
@@ -44,7 +46,14 @@ namespace osu.Game.Rulesets.Scoring.Legacy
 
         public static LegacyBeatmapConversionDifficultyInfo FromAPIBeatmap(APIBeatmap apiBeatmap) => FromBeatmapInfo(apiBeatmap);
 
-        public static LegacyBeatmapConversionDifficultyInfo FromBeatmap(IBeatmap beatmap) => FromBeatmapInfo(beatmap.BeatmapInfo);
+        public static LegacyBeatmapConversionDifficultyInfo FromBeatmap(IBeatmap beatmap) => new LegacyBeatmapConversionDifficultyInfo
+        {
+            SourceRuleset = beatmap.BeatmapInfo.Ruleset,
+            CircleSize = beatmap.Difficulty.CircleSize,
+            OverallDifficulty = beatmap.Difficulty.OverallDifficulty,
+            CircleCount = beatmap.HitObjects.Count - beatmap.HitObjects.Count(h => h is IHasDuration),
+            TotalObjectCount = beatmap.HitObjects.Count
+        };
 
         public static LegacyBeatmapConversionDifficultyInfo FromBeatmapInfo(IBeatmapInfo beatmapInfo) => new LegacyBeatmapConversionDifficultyInfo
         {

From 2930b53edd9aa4e007bd6db05e0072ae5ae906ce Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 13:43:14 +0900
Subject: [PATCH 1925/2296] Simplify implementation

---
 .../Beatmaps/ManiaBeatmapConverter.cs                |  2 +-
 .../Legacy/LegacyBeatmapConversionDifficultyInfo.cs  | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index c4a8db92ed..c3cd623c5d 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
             double roundedOverallDifficulty = Math.Round(difficulty.OverallDifficulty);
 
-            int countSliderOrSpinner = difficulty.TotalObjectCount - difficulty.CircleCount;
+            int countSliderOrSpinner = difficulty.EndTimeObjectCount;
             float percentSpecialObjects = (float)countSliderOrSpinner / difficulty.TotalObjectCount;
 
             if (percentSpecialObjects < 0.2)
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
index baf771adef..2021aa127d 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
@@ -29,9 +29,12 @@ namespace osu.Game.Rulesets.Scoring.Legacy
         public float OverallDifficulty { get; set; }
 
         /// <summary>
-        /// The count of hitcircles in the beatmap.
+        /// The number of hitobjects in the beatmap with a distinct end time.
         /// </summary>
-        public int CircleCount { get; set; }
+        /// <remarks>
+        /// Canonically, these are hitobjects are either sliders or spinners.
+        /// </remarks>
+        public int EndTimeObjectCount { get; set; }
 
         /// <summary>
         /// The total count of hitobjects in the beatmap.
@@ -42,7 +45,6 @@ namespace osu.Game.Rulesets.Scoring.Legacy
         float IBeatmapDifficultyInfo.ApproachRate => 0;
         double IBeatmapDifficultyInfo.SliderMultiplier => 0;
         double IBeatmapDifficultyInfo.SliderTickRate => 0;
-        int IBeatmapDifficultyInfo.EndTimeObjectCount => TotalObjectCount - CircleCount;
 
         public static LegacyBeatmapConversionDifficultyInfo FromAPIBeatmap(APIBeatmap apiBeatmap) => FromBeatmapInfo(apiBeatmap);
 
@@ -51,7 +53,7 @@ namespace osu.Game.Rulesets.Scoring.Legacy
             SourceRuleset = beatmap.BeatmapInfo.Ruleset,
             CircleSize = beatmap.Difficulty.CircleSize,
             OverallDifficulty = beatmap.Difficulty.OverallDifficulty,
-            CircleCount = beatmap.HitObjects.Count - beatmap.HitObjects.Count(h => h is IHasDuration),
+            EndTimeObjectCount = beatmap.HitObjects.Count(h => h is IHasDuration),
             TotalObjectCount = beatmap.HitObjects.Count
         };
 
@@ -60,7 +62,7 @@ namespace osu.Game.Rulesets.Scoring.Legacy
             SourceRuleset = beatmapInfo.Ruleset,
             CircleSize = beatmapInfo.Difficulty.CircleSize,
             OverallDifficulty = beatmapInfo.Difficulty.OverallDifficulty,
-            CircleCount = beatmapInfo.Difficulty.TotalObjectCount - beatmapInfo.Difficulty.EndTimeObjectCount,
+            EndTimeObjectCount = beatmapInfo.Difficulty.EndTimeObjectCount,
             TotalObjectCount = beatmapInfo.Difficulty.TotalObjectCount
         };
     }

From 2579b42ac5dc5d7e7f41f86628bc8503dec26b64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 14:01:03 +0900
Subject: [PATCH 1926/2296] Update framework

---
 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 6609db3027..bd35bb8d54 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1201.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1213.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cc100605b4..b0ab8e445c 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1201.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1213.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1127.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index a6b3527466..84a4e61267 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1201.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1213.0" />
   </ItemGroup>
 </Project>

From 0be6743e87b241b36b396c840e1d5acc1bb6b578 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 14:07:38 +0900
Subject: [PATCH 1927/2296] Apply `Bindable.Parse` refactorings

---
 osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs    | 2 +-
 osu.Game/Rulesets/Configuration/RulesetConfigManager.cs        | 2 +-
 osu.Game/Rulesets/Mods/Mod.cs                                  | 3 ++-
 .../Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs | 2 +-
 osu.Game/Skinning/ISerialisableDrawable.cs                     | 3 ++-
 osu.Game/Skinning/LegacySkin.cs                                | 3 ++-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
index 37ea2a3f96..e5ba7f61bf 100644
--- a/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/SliderWithTextBoxInput.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
                         break;
 
                     default:
-                        slider.Current.Parse(textBox.Current.Value);
+                        slider.Current.Parse(textBox.Current.Value, CultureInfo.CurrentCulture);
                         break;
                 }
             }
diff --git a/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs b/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
index 0eea1ff215..418dc3576f 100644
--- a/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
+++ b/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Configuration
 
             if (setting != null)
             {
-                bindable.Parse(setting.Value);
+                bindable.Parse(setting.Value, CultureInfo.InvariantCulture);
             }
             else
             {
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 775f6a0ed4..d635dccab1 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using Newtonsoft.Json;
@@ -284,7 +285,7 @@ namespace osu.Game.Rulesets.Mods
                 if (!(target is IParseable parseable))
                     throw new InvalidOperationException($"Bindable type {target.GetType().ReadableName()} is not {nameof(IParseable)}.");
 
-                parseable.Parse(source);
+                parseable.Parse(source, CultureInfo.InvariantCulture);
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs b/osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs
index eabe9b9f64..151d469415 100644
--- a/osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs
+++ b/osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.Edit.Timing
                             break;
 
                         default:
-                            slider.Current.Parse(t.Text);
+                            slider.Current.Parse(t.Text, CultureInfo.CurrentCulture);
                             break;
                     }
                 }
diff --git a/osu.Game/Skinning/ISerialisableDrawable.cs b/osu.Game/Skinning/ISerialisableDrawable.cs
index 503b44c2dd..c9dcaca6d1 100644
--- a/osu.Game/Skinning/ISerialisableDrawable.cs
+++ b/osu.Game/Skinning/ISerialisableDrawable.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Globalization;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
@@ -46,7 +47,7 @@ namespace osu.Game.Skinning
                 if (!(target is IParseable parseable))
                     throw new InvalidOperationException($"Bindable type {target.GetType().ReadableName()} is not {nameof(IParseable)}.");
 
-                parseable.Parse(source);
+                parseable.Parse(source, CultureInfo.InvariantCulture);
             }
         }
     }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 2e91770919..9102231913 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
@@ -330,7 +331,7 @@ namespace osu.Game.Skinning
 
                     var bindable = new Bindable<TValue>();
                     if (val != null)
-                        bindable.Parse(val);
+                        bindable.Parse(val, CultureInfo.InvariantCulture);
                     return bindable;
                 }
             }

From 996bc659e4ed9806edf9d1f433afc6c03ad7b621 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 14:29:51 +0900
Subject: [PATCH 1928/2296] Adjust some mod multipliers for initial leaderboard
 sanity

---
 osu.Game/Rulesets/Mods/ModClassic.cs     | 2 +-
 osu.Game/Rulesets/Mods/ModSynesthesia.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModClassic.cs b/osu.Game/Rulesets/Mods/ModClassic.cs
index 55b16297e2..42fdee0402 100644
--- a/osu.Game/Rulesets/Mods/ModClassic.cs
+++ b/osu.Game/Rulesets/Mods/ModClassic.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override string Acronym => "CL";
 
-        public override double ScoreMultiplier => 1;
+        public override double ScoreMultiplier => 0.5;
 
         public override IconUsage? Icon => FontAwesome.Solid.History;
 
diff --git a/osu.Game/Rulesets/Mods/ModSynesthesia.cs b/osu.Game/Rulesets/Mods/ModSynesthesia.cs
index 23cb135c50..9084127f33 100644
--- a/osu.Game/Rulesets/Mods/ModSynesthesia.cs
+++ b/osu.Game/Rulesets/Mods/ModSynesthesia.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "Synesthesia";
         public override string Acronym => "SY";
         public override LocalisableString Description => "Colours hit objects based on the rhythm.";
-        public override double ScoreMultiplier => 1;
+        public override double ScoreMultiplier => 0.8;
         public override ModType Type => ModType.Fun;
     }
 }

From eb30a603d97e878565c58504831fc149a81ccf3d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2023 17:54:15 +0900
Subject: [PATCH 1929/2296] Fix typo in argument name

---
 osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs
index 9da032e489..28d664a48b 100644
--- a/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs
@@ -23,11 +23,11 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            AccuracyDisplay.BindValueChanged(mod =>
+            AccuracyDisplay.BindValueChanged(mode =>
             {
                 Current.UnbindBindings();
 
-                switch (mod.NewValue)
+                switch (mode.NewValue)
                 {
                     case AccuracyDisplayMode.Standard:
                         Current.BindTo(scoreProcessor.Accuracy);

From 0e4e916388443d9429dee33fd0e3795706252a89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 15:04:52 +0900
Subject: [PATCH 1930/2296] Sneaky comment fix

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
index ee274fc45e..07045b76ca 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs
@@ -234,7 +234,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                     break;
 
                 default:
-                    // this is where things get fucked up.
+                    // this is where things get a bit messed up.
                     // honestly there's three modes to handle here but they seem really pointless?
                     // let's wait to see if anyone actually uses them in skins.
                     if (bodySprite != null)

From 5e10f9f899de50d4fe589798a486ad36fa881885 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 14:42:32 +0900
Subject: [PATCH 1931/2296] Fix failing tests due to more textboxes being
 present with searchable dropdowns

---
 .../Navigation/TestSceneScreenNavigation.cs   | 10 +++++----
 .../Visual/Online/TestSceneChatOverlay.cs     |  2 +-
 .../Visual/Online/TestSceneCommentActions.cs  |  2 +-
 .../Visual/Settings/TestSceneSettingsPanel.cs | 22 +++++++++----------
 .../SongSelect/TestScenePlaySongSelect.cs     |  4 ++--
 osu.Game/Screens/Select/FilterControl.cs      |  2 +-
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index c6a668a714..d8dc512787 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -143,13 +143,13 @@ namespace osu.Game.Tests.Visual.Navigation
 
             PushAndConfirm(() => songSelect = new TestPlaySongSelect());
 
-            AddStep("set filter", () => songSelect.ChildrenOfType<SearchTextBox>().Single().Current.Value = "test");
+            AddStep("set filter", () => filterControlTextBox().Current.Value = "test");
             AddStep("press back", () => InputManager.Click(MouseButton.Button1));
 
             AddAssert("still at song select", () => Game.ScreenStack.CurrentScreen == songSelect);
-            AddAssert("filter cleared", () => string.IsNullOrEmpty(songSelect.ChildrenOfType<SearchTextBox>().Single().Current.Value));
+            AddAssert("filter cleared", () => string.IsNullOrEmpty(filterControlTextBox().Current.Value));
 
-            AddStep("set filter again", () => songSelect.ChildrenOfType<SearchTextBox>().Single().Current.Value = "test");
+            AddStep("set filter again", () => filterControlTextBox().Current.Value = "test");
             AddStep("open collections dropdown", () =>
             {
                 InputManager.MoveMouseTo(songSelect.ChildrenOfType<CollectionDropdown>().Single());
@@ -163,10 +163,12 @@ namespace osu.Game.Tests.Visual.Navigation
                                                            .ChildrenOfType<Dropdown<CollectionFilterMenuItem>.DropdownMenu>().Single().State == MenuState.Closed);
 
             AddStep("press back a second time", () => InputManager.Click(MouseButton.Button1));
-            AddAssert("filter cleared", () => string.IsNullOrEmpty(songSelect.ChildrenOfType<SearchTextBox>().Single().Current.Value));
+            AddAssert("filter cleared", () => string.IsNullOrEmpty(filterControlTextBox().Current.Value));
 
             AddStep("press back a third time", () => InputManager.Click(MouseButton.Button1));
             ConfirmAtMainMenu();
+
+            TextBox filterControlTextBox() => songSelect.ChildrenOfType<FilterControl.FilterControlTextBox>().Single();
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 8a2a66f60f..58feab4ebb 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -631,7 +631,7 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("Nothing happened", () => this.ChildrenOfType<ReportChatPopover>().Any());
             AddStep("Set report data", () =>
             {
-                var field = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<OsuTextBox>().Single();
+                var field = this.ChildrenOfType<ReportChatPopover>().Single().ChildrenOfType<OsuTextBox>().First();
                 field.Current.Value = "test other";
             });
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
index dbf3b52572..10fdffb8e1 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
@@ -262,7 +262,7 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("Nothing happened", () => this.ChildrenOfType<ReportCommentPopover>().Any());
             AddStep("Set report data", () =>
             {
-                var field = this.ChildrenOfType<ReportCommentPopover>().Single().ChildrenOfType<OsuTextBox>().Single();
+                var field = this.ChildrenOfType<ReportCommentPopover>().Single().ChildrenOfType<OsuTextBox>().First();
                 field.Current.Value = report_text;
                 var reason = this.ChildrenOfType<OsuEnumDropdown<CommentReportReason>>().Single();
                 reason.Current.Value = CommentReportReason.Other;
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
index 69e489b247..5d9c2f890c 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
@@ -49,12 +49,12 @@ namespace osu.Game.Tests.Visual.Settings
             AddStep("reset mouse", () => InputManager.MoveMouseTo(settings));
 
             if (beforeLoad)
-                AddStep("set filter", () => settings.SectionsContainer.ChildrenOfType<SearchTextBox>().First().Current.Value = "scaling");
+                AddStep("set filter", () => settings.SectionsContainer.ChildrenOfType<SettingsSearchTextBox>().First().Current.Value = "scaling");
 
             AddUntilStep("wait for items to load", () => settings.SectionsContainer.ChildrenOfType<IFilterable>().Any());
 
             if (!beforeLoad)
-                AddStep("set filter", () => settings.SectionsContainer.ChildrenOfType<SearchTextBox>().First().Current.Value = "scaling");
+                AddStep("set filter", () => settings.SectionsContainer.ChildrenOfType<SettingsSearchTextBox>().First().Current.Value = "scaling");
 
             AddAssert("ensure all items match filter", () => settings.SectionsContainer
                                                                      .ChildrenOfType<SettingsSection>().Where(f => f.IsPresent)
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.Settings
 
             AddUntilStep("wait for items to load", () => settings.SectionsContainer.ChildrenOfType<IFilterable>().Any());
 
-            AddStep("set filter", () => settings.SectionsContainer.ChildrenOfType<SearchTextBox>().First().Current.Value = "scaling");
+            AddStep("set filter", () => settings.SectionsContainer.ChildrenOfType<SettingsSearchTextBox>().First().Current.Value = "scaling");
         }
 
         [Test]
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddStep("reset mouse", () => InputManager.MoveMouseTo(settings));
 
             AddUntilStep("sections loaded", () => settings.SectionsContainer.Children.Count > 0);
-            AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<FocusedTextBox>().FirstOrDefault()?.HasFocus == true);
+            AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<SettingsSearchTextBox>().FirstOrDefault()?.HasFocus == true);
 
             AddStep("open key binding subpanel", () =>
             {
@@ -106,13 +106,13 @@ namespace osu.Game.Tests.Visual.Settings
 
             AddUntilStep("binding panel textbox focused", () => settings
                                                                 .ChildrenOfType<KeyBindingPanel>().FirstOrDefault()?
-                                                                .ChildrenOfType<FocusedTextBox>().FirstOrDefault()?.HasFocus == true);
+                                                                .ChildrenOfType<SettingsSearchTextBox>().FirstOrDefault()?.HasFocus == true);
 
             AddStep("Press back", () => settings
                                         .ChildrenOfType<KeyBindingPanel>().FirstOrDefault()?
                                         .ChildrenOfType<SettingsSubPanel.BackButton>().FirstOrDefault()?.TriggerClick());
 
-            AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<FocusedTextBox>().FirstOrDefault()?.HasFocus == true);
+            AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<SettingsSearchTextBox>().FirstOrDefault()?.HasFocus == true);
         }
 
         [Test]
@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddStep("reset mouse", () => InputManager.MoveMouseTo(settings));
 
             AddUntilStep("sections loaded", () => settings.SectionsContainer.Children.Count > 0);
-            AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<FocusedTextBox>().FirstOrDefault()?.HasFocus == true);
+            AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<SettingsSearchTextBox>().FirstOrDefault()?.HasFocus == true);
 
             AddStep("open key binding subpanel", () =>
             {
@@ -133,19 +133,19 @@ namespace osu.Game.Tests.Visual.Settings
 
             AddUntilStep("binding panel textbox focused", () => settings
                                                                 .ChildrenOfType<KeyBindingPanel>().FirstOrDefault()?
-                                                                .ChildrenOfType<FocusedTextBox>().FirstOrDefault()?.HasFocus == true);
+                                                                .ChildrenOfType<SettingsSearchTextBox>().FirstOrDefault()?.HasFocus == true);
 
             AddStep("Escape", () => InputManager.Key(Key.Escape));
 
-            AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<FocusedTextBox>().FirstOrDefault()?.HasFocus == true);
+            AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<SettingsSearchTextBox>().FirstOrDefault()?.HasFocus == true);
         }
 
         [Test]
         public void TestSearchTextBoxSelectedOnShow()
         {
-            SearchTextBox searchTextBox = null!;
+            SettingsSearchTextBox searchTextBox = null!;
 
-            AddStep("set text", () => (searchTextBox = settings.SectionsContainer.ChildrenOfType<SearchTextBox>().First()).Current.Value = "some text");
+            AddStep("set text", () => (searchTextBox = settings.SectionsContainer.ChildrenOfType<SettingsSearchTextBox>().First()).Current.Value = "some text");
             AddAssert("no text selected", () => searchTextBox.SelectedText == string.Empty);
             AddRepeatStep("toggle visibility", () => settings.ToggleVisibility(), 2);
             AddAssert("search text selected", () => searchTextBox.SelectedText == searchTextBox.Current.Value);
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 84750d4c16..64f10cb427 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -1135,7 +1135,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             createSongSelect();
 
-            AddStep("set filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
+            AddStep("set filter text", () => songSelect!.FilterControl.ChildrenOfType<FilterControl.FilterControlTextBox>().First().Text = "nonono");
             AddStep("select all", () => InputManager.Keys(PlatformAction.SelectAll));
             AddStep("press ctrl-x", () =>
             {
@@ -1144,7 +1144,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.ReleaseKey(Key.ControlLeft);
             });
 
-            AddAssert("filter text cleared", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text, () => Is.Empty);
+            AddAssert("filter text cleared", () => songSelect!.FilterControl.ChildrenOfType<FilterControl.FilterControlTextBox>().First().Text, () => Is.Empty);
         }
 
         private void waitForInitialSelection()
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index c15bd76ef8..1827eb58ca 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Screens.Select
 
         protected override bool OnHover(HoverEvent e) => true;
 
-        private partial class FilterControlTextBox : SeekLimitedSearchTextBox
+        internal partial class FilterControlTextBox : SeekLimitedSearchTextBox
         {
             private const float filter_text_size = 12;
 

From c2d3dcdd9c1c7bfc1a8df9756db557549a5f4e47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 15:15:22 +0900
Subject: [PATCH 1932/2296] Fix slider tests and incorrect nullability handling
 around `freehandToolboxGroup`

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs  | 7 +++++--
 .../Visual/SongSelect/TestScenePlaySongSelect.cs         | 9 ++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index e5dada19bb..28e972bacd 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -42,12 +42,15 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private int currentSegmentLength;
 
         [Resolved(CanBeNull = true)]
+        [CanBeNull]
         private IPositionSnapProvider positionSnapProvider { get; set; }
 
         [Resolved(CanBeNull = true)]
+        [CanBeNull]
         private IDistanceSnapProvider distanceSnapProvider { get; set; }
 
         [Resolved(CanBeNull = true)]
+        [CanBeNull]
         private FreehandSliderToolboxGroup freehandToolboxGroup { get; set; }
 
         private readonly IncrementalBSplineBuilder bSplineBuilder = new IncrementalBSplineBuilder { Degree = 4 };
@@ -363,7 +366,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private Vector2[] tryCircleArc(List<Vector2> segment)
         {
-            if (segment.Count < 3 || freehandToolboxGroup.CircleThreshold.Value == 0) return null;
+            if (segment.Count < 3 || freehandToolboxGroup?.CircleThreshold.Value == 0) return null;
 
             // Assume the segment creates a reasonable circular arc and then check if it reasonable
             var points = PathApproximator.BSplineToPiecewiseLinear(segment.ToArray(), bSplineBuilder.Degree);
@@ -436,7 +439,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             loss /= points.Count;
 
-            return loss > freehandToolboxGroup.CircleThreshold.Value || totalWinding > MathHelper.TwoPi ? null : circleArcControlPoints;
+            return loss > freehandToolboxGroup?.CircleThreshold.Value || totalWinding > MathHelper.TwoPi ? null : circleArcControlPoints;
         }
 
         private enum SliderPlacementState
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 64f10cb427..6b53277964 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -22,7 +22,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Extensions;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
@@ -614,7 +613,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             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<FilterControl.FilterControlTextBox>().First().Text = "nonono");
 
             AddUntilStep("dummy selected", () => Beatmap.Value is DummyWorkingBeatmap);
 
@@ -648,7 +647,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             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<FilterControl.FilterControlTextBox>().First().Text = string.Empty);
 
             AddAssert("game still correct", () => Beatmap.Value?.BeatmapInfo.MatchesOnlineID(target) == true);
             AddAssert("carousel still correct", () => songSelect!.Carousel.SelectedBeatmapInfo.MatchesOnlineID(target));
@@ -666,7 +665,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             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<FilterControl.FilterControlTextBox>().First().Text = "nonono");
 
             AddUntilStep("dummy selected", () => Beatmap.Value is DummyWorkingBeatmap);
 
@@ -689,7 +688,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             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<FilterControl.FilterControlTextBox>().First().Text = "nononoo");
 
             AddUntilStep("game lost selection", () => Beatmap.Value is DummyWorkingBeatmap);
             AddAssert("carousel lost selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);

From 0611a1ddc98462af34e6f1820b58dcd231769af5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 15:28:54 +0900
Subject: [PATCH 1933/2296] Avoid background processing falling over is
 `BeatmapSet` is `null`

See https://github.com/ppy/osu/issues/10458.
---
 osu.Game/BackgroundDataStoreProcessor.cs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 8195856991..c8a108a5f6 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -136,19 +135,13 @@ namespace osu.Game
                 // of other possible ways), but for now avoid queueing if the user isn't logged in at startup.
                 if (api.IsLoggedIn)
                 {
-                    foreach (var b in r.All<BeatmapInfo>().Where(b => b.StarRating < 0 || (b.OnlineID > 0 && b.LastOnlineUpdate == null)))
-                    {
-                        Debug.Assert(b.BeatmapSet != null);
-                        beatmapSetIds.Add(b.BeatmapSet.ID);
-                    }
+                    foreach (var b in r.All<BeatmapInfo>().Where(b => (b.StarRating < 0 || (b.OnlineID > 0 && b.LastOnlineUpdate == null)) && b.BeatmapSet != null))
+                        beatmapSetIds.Add(b.BeatmapSet!.ID);
                 }
                 else
                 {
-                    foreach (var b in r.All<BeatmapInfo>().Where(b => b.StarRating < 0))
-                    {
-                        Debug.Assert(b.BeatmapSet != null);
-                        beatmapSetIds.Add(b.BeatmapSet.ID);
-                    }
+                    foreach (var b in r.All<BeatmapInfo>().Where(b => b.StarRating < 0 && b.BeatmapSet != null))
+                        beatmapSetIds.Add(b.BeatmapSet!.ID);
                 }
             });
 

From 4983845041794eb5acff6037be4e163b50ae8418 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 15:51:26 +0900
Subject: [PATCH 1934/2296] Update HT mod multiplier to match stable better

---
 osu.Game/Rulesets/Mods/RateAdjustModHelper.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
index ffd4de0e90..8bc481921f 100644
--- a/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
+++ b/osu.Game/Rulesets/Mods/RateAdjustModHelper.cs
@@ -32,9 +32,9 @@ namespace osu.Game.Rulesets.Mods
                 value -= 1;
 
                 if (SpeedChange.Value >= 1)
-                    value /= 5;
-
-                return 1 + value;
+                    return 1 + value / 5;
+                else
+                    return 0.6 + value;
             }
         }
 

From eff81be6fdbfd16fdc9040c3eeb0cd0087d5d7d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 15:38:06 +0900
Subject: [PATCH 1935/2296] Fix failing test and add coverage of conversion
 case

---
 .../SongSelect/TestSceneAdvancedStats.cs      | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
index 8650119dd4..4bb2b557ff 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
@@ -14,7 +14,9 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Select.Details;
 using osuTK.Graphics;
@@ -38,6 +40,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             Width = 500
         });
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("reset game ruleset", () => Ruleset.Value = new OsuRuleset().RulesetInfo);
+        }
+
         private BeatmapInfo exampleBeatmapInfo => new BeatmapInfo
         {
             Ruleset = rulesets.AvailableRulesets.First(),
@@ -66,8 +74,10 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        public void TestManiaFirstBarText()
+        public void TestManiaFirstBarTextManiaBeatmap()
         {
+            AddStep("set game ruleset to mania", () => Ruleset.Value = new ManiaRuleset().RulesetInfo);
+
             AddStep("set beatmap", () => advancedStats.BeatmapInfo = new BeatmapInfo
             {
                 Ruleset = rulesets.GetRuleset(3) ?? throw new InvalidOperationException("osu!mania ruleset not found"),
@@ -84,6 +94,27 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("first bar text is correct", () => advancedStats.ChildrenOfType<SpriteText>().First().Text == BeatmapsetsStrings.ShowStatsCsMania);
         }
 
+        [Test]
+        public void TestManiaFirstBarTextConvert()
+        {
+            AddStep("set game ruleset to mania", () => Ruleset.Value = new ManiaRuleset().RulesetInfo);
+
+            AddStep("set beatmap", () => advancedStats.BeatmapInfo = new BeatmapInfo
+            {
+                Ruleset = new OsuRuleset().RulesetInfo,
+                Difficulty = new BeatmapDifficulty
+                {
+                    CircleSize = 5,
+                    DrainRate = 4.3f,
+                    OverallDifficulty = 4.5f,
+                    ApproachRate = 3.1f
+                },
+                StarRating = 8
+            });
+
+            AddAssert("first bar text is correct", () => advancedStats.ChildrenOfType<SpriteText>().First().Text == BeatmapsetsStrings.ShowStatsCsMania);
+        }
+
         [Test]
         public void TestEasyMod()
         {

From 2abf3a55ae0bc214c484867ed9a4b67dd267a1f8 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 16:08:34 +0900
Subject: [PATCH 1936/2296] Add IsLegacyScore to SoloScoreInfo

---
 osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index ac2d8152b1..732da3d5da 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -150,6 +150,12 @@ namespace osu.Game.Online.API.Requests.Responses
 
         #endregion
 
+        /// <summary>
+        /// Whether this <see cref="ScoreInfo"/> represents a legacy (osu!stable) score.
+        /// </summary>
+        [JsonIgnore]
+        public bool IsLegacyScore => LegacyScoreId != null;
+
         public override string ToString() => $"score_id: {ID} user_id: {UserID}";
 
         /// <summary>
@@ -191,6 +197,7 @@ namespace osu.Game.Online.API.Requests.Responses
             {
                 OnlineID = OnlineID,
                 LegacyOnlineID = (long?)LegacyScoreId ?? -1,
+                IsLegacyScore = IsLegacyScore,
                 User = User ?? new APIUser { Id = UserID },
                 BeatmapInfo = new BeatmapInfo { OnlineID = BeatmapID },
                 Ruleset = new RulesetInfo { OnlineID = RulesetID },

From 110749205d7366f05ca5d56dd2f037bc7770bff2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 16:13:08 +0900
Subject: [PATCH 1937/2296] Cache `GameplayClockContainer` to allow usage of
 `OnSeek`

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

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 5a713fdae7..4def1d36bb 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Screens.Play
     /// Encapsulates gameplay timing logic and provides a <see cref="IGameplayClock"/> via DI for gameplay components to use.
     /// </summary>
     [Cached(typeof(IGameplayClock))]
+    [Cached(typeof(GameplayClockContainer))]
     public partial class GameplayClockContainer : Container, IAdjustableClock, IGameplayClock
     {
         public IBindable<bool> IsPaused => isPaused;

From f2c6c348be850bb07347bfb46a9c836c6304895f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 16:13:23 +0900
Subject: [PATCH 1938/2296] Fix `HitError` `Clear` methods not correctly
 returning pooled drawables

---
 .../Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs     | 6 +++++-
 .../Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index eb5221aa45..a9141110c5 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -485,7 +485,11 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             }
         }
 
-        public override void Clear() => judgementsContainer.Clear();
+        public override void Clear()
+        {
+            foreach (var j in judgementsContainer)
+                j.FadeOut().Expire();
+        }
 
         public enum CentreMarkerStyles
         {
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 5793713fca..d95959bf9e 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -63,7 +63,11 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             judgementsFlow.Push(GetColourForHitResult(judgement.Type));
         }
 
-        public override void Clear() => judgementsFlow.Clear();
+        public override void Clear()
+        {
+            foreach (var j in judgementsFlow)
+                j.FadeOut().Expire();
+        }
 
         private partial class JudgementFlow : FillFlowContainer<HitErrorShape>
         {

From fb44fb18e021a153d3d44d12190d53f15c288838 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 16:42:20 +0900
Subject: [PATCH 1939/2296] Update in line with upstream changes

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 019c38679e..9433588b03 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -128,6 +128,8 @@ namespace osu.Game.Screens.Select.Details
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
             BeatmapDifficulty adjustedDifficulty = null;
 
+            IRulesetInfo ruleset = gameRuleset?.Value ?? beatmapInfo.Ruleset;
+
             if (baseDifficulty != null &&
                 (mods.Value.Any(m => m is IApplicableToDifficulty) || mods.Value.Any(m => m is IApplicableToRate)))
             {
@@ -140,21 +142,17 @@ namespace osu.Game.Screens.Select.Details
 
                 if (gameRuleset != null)
                 {
-                    Ruleset ruleset = gameRuleset.Value.CreateInstance();
-
                     double rate = 1;
                     foreach (var mod in mods.Value.OfType<IApplicableToRate>())
                         rate = mod.ApplyToRate(0, rate);
 
-                    adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
+                    adjustedDifficulty = ruleset.CreateInstance().GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
 
                     rateAdjustTooltip.UpdateAttribute("AR", originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
                     rateAdjustTooltip.UpdateAttribute("OD", originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
                 }
             }
 
-            IRulesetInfo ruleset = gameRuleset?.Value ?? beatmapInfo.Ruleset;
-
             switch (ruleset.OnlineID)
             {
                 case 3:

From 9433180ffeacf239b4f688ad954387a12fcbbfb7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 16:57:31 +0900
Subject: [PATCH 1940/2296] Fix various code quality and visual issues with
 `AdjustedAttributesTooltip`

---
 .../Mods/AdjustedAttributesTooltip.cs         | 135 +++++++++---------
 1 file changed, 68 insertions(+), 67 deletions(-)

diff --git a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
index e9b7ee5c54..a56c09931a 100644
--- a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
+++ b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
@@ -2,6 +2,7 @@
 // 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.Bindables;
 using osu.Framework.Graphics;
@@ -15,84 +16,72 @@ using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class AdjustedAttributesTooltip : CompositeDrawable, ITooltip
+    public partial class AdjustedAttributesTooltip : VisibilityContainer, ITooltip
     {
         private readonly Dictionary<string, Bindable<OldNewPair>> attributes = new Dictionary<string, Bindable<OldNewPair>>();
 
-        private readonly Container content;
+        private FillFlowContainer? attributesFillFlow;
 
-        private readonly FillFlowContainer attributesFillFlow;
+        private Container content = null!;
 
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
-        public AdjustedAttributesTooltip()
-        {
-            // Need to be initialized in constructor to ensure accessability in AddAttribute function
-            InternalChild = content = new Container
-            {
-                AutoSizeAxes = Axes.Both
-            };
-            attributesFillFlow = new FillFlowContainer
-            {
-                Direction = FillDirection.Vertical,
-                AutoSizeAxes = Axes.Both
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
             AutoSizeAxes = Axes.Both;
 
             Masking = true;
-            CornerRadius = 15;
+            CornerRadius = 5;
 
-            content.AddRange(new Drawable[]
+            InternalChildren = new Drawable[]
             {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colours.Gray1,
-                    Alpha = 0.8f
-                },
-                new FillFlowContainer
+                content = new Container
                 {
                     AutoSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Vertical = 10, Horizontal = 15 },
-                    Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        new OsuSpriteText
+                        new Box
                         {
-                            Text = "One or more values are being adjusted by mods that change speed.",
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = colours.Gray3,
                         },
-                        attributesFillFlow
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Vertical = 10, Horizontal = 15 },
+                            Direction = FillDirection.Vertical,
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Text = "One or more values are being adjusted by mods that change speed.",
+                                },
+                                attributesFillFlow = new FillFlowContainer
+                                {
+                                    Direction = FillDirection.Vertical,
+                                    AutoSizeAxes = Axes.Both
+                                }
+                            }
+                        }
                     }
-                }
-            });
-        }
+                },
+            };
 
-        private void checkAttributes()
-        {
             foreach (var attribute in attributes)
-            {
-                if (!Precision.AlmostEquals(attribute.Value.Value.Old, attribute.Value.Value.New))
-                {
-                    content.Show();
-                    return;
-                }
-            }
+                attributesFillFlow?.Add(new AttributeDisplay(attribute.Key, attribute.Value.GetBoundCopy()));
 
-            content.Hide();
+            updateVisibility();
         }
 
         public void AddAttribute(string name)
         {
             Bindable<OldNewPair> newBindable = new Bindable<OldNewPair>();
-            newBindable.BindValueChanged(_ => checkAttributes());
+            newBindable.BindValueChanged(_ => updateVisibility());
             attributes.Add(name, newBindable);
-            attributesFillFlow.Add(new AttributeDisplay(name, newBindable.GetBoundCopy()));
+
+            attributesFillFlow?.Add(new AttributeDisplay(name, newBindable.GetBoundCopy()));
         }
 
         public void UpdateAttribute(string name, double oldValue, double newValue)
@@ -102,8 +91,8 @@ namespace osu.Game.Overlays.Mods
             Bindable<OldNewPair> attribute = attributes[name];
 
             OldNewPair attributeValue = attribute.Value;
-            attributeValue.Old = oldValue;
-            attributeValue.New = newValue;
+            attributeValue.OldValue = oldValue;
+            attributeValue.NewValue = newValue;
 
             attribute.Value = attributeValue;
         }
@@ -116,14 +105,20 @@ namespace osu.Game.Overlays.Mods
         {
         }
 
-        public void Move(Vector2 pos)
-        {
-            Position = pos;
-        }
+        protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
+        protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
 
-        private struct OldNewPair
+        public void Move(Vector2 pos) => Position = pos;
+
+        private void updateVisibility()
         {
-            public double Old, New;
+            if (!IsLoaded)
+                return;
+
+            if (attributes.Any(attribute => !Precision.AlmostEquals(attribute.Value.Value.OldValue, attribute.Value.Value.NewValue)))
+                content.Show();
+            else
+                content.Hide();
         }
 
         private partial class AttributeDisplay : CompositeDrawable
@@ -131,33 +126,39 @@ namespace osu.Game.Overlays.Mods
             public readonly Bindable<OldNewPair> AttributeValues;
             public readonly string AttributeName;
 
-            private readonly OsuSpriteText text = new OsuSpriteText
-            {
-                Font = OsuFont.Default.With(weight: FontWeight.Bold)
-            };
+            private readonly OsuSpriteText text;
 
-            public AttributeDisplay(string name, Bindable<OldNewPair> boundCopy)
+            public AttributeDisplay(string name, Bindable<OldNewPair> values)
             {
                 AutoSizeAxes = Axes.Both;
 
                 AttributeName = name;
-                AttributeValues = boundCopy;
-                InternalChild = text;
+                AttributeValues = values;
+
+                InternalChild = text = new OsuSpriteText
+                {
+                    Font = OsuFont.Default.With(weight: FontWeight.Bold)
+                };
+
                 AttributeValues.BindValueChanged(_ => update(), true);
             }
 
             private void update()
             {
-                if (Precision.AlmostEquals(AttributeValues.Value.Old, AttributeValues.Value.New))
+                if (Precision.AlmostEquals(AttributeValues.Value.OldValue, AttributeValues.Value.NewValue))
                 {
                     Hide();
+                    return;
                 }
-                else
-                {
-                    Show();
-                    text.Text = $"{AttributeName}: {(AttributeValues.Value.Old):0.0#} → {(AttributeValues.Value.New):0.0#}";
-                }
+
+                Show();
+                text.Text = $"{AttributeName}: {(AttributeValues.Value.OldValue):0.0#} → {(AttributeValues.Value.NewValue):0.0#}";
             }
         }
+
+        private struct OldNewPair
+        {
+            public double OldValue, NewValue;
+        }
     }
 }

From c131f91736dc2d947fce9c0decea049358d93536 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 16:59:09 +0900
Subject: [PATCH 1941/2296] Add tests

---
 .../TestSceneSliderEarlyHitJudgement.cs       | 187 ++++++++++++++++++
 1 file changed, 187 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
new file mode 100644
index 0000000000..46278dfb12
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
@@ -0,0 +1,187 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public partial class TestSceneSliderEarlyHitJudgement : RateAdjustedBeatmapTestScene
+    {
+        private const double time_slider_start = 1000;
+        private const double time_slider_tick = 2000;
+        private const double time_slider_end = 3000;
+
+        private static readonly Vector2 slider_start_position = new Vector2(256 - slider_path_length / 2, 192);
+        private static readonly Vector2 slider_end_position = new Vector2(256 + slider_path_length / 2, 192);
+
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
+
+        private const float slider_path_length = 200;
+
+        private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
+
+        [Test]
+        public void TestHitEarlyMoveIntoFollowRegion()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start - 300, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 200, slider_start_position + new Vector2(32, 0), OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end - 200, slider_end_position + new Vector2(32, 0), OsuAction.LeftButton),
+            });
+
+            assertHeadJudgement(HitResult.Miss);
+            assertTickJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.LargeTickHit);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
+        [Test]
+        public void TestHitEarlyMoveOutsideFollowRegion()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start - 300, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 200, slider_start_position + new Vector2(96, 0), OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end - 200, slider_end_position + new Vector2(96, 0), OsuAction.LeftButton),
+            });
+
+            assertHeadJudgement(HitResult.Miss);
+            assertTickJudgement(HitResult.LargeTickMiss);
+            assertTailJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreMiss);
+        }
+
+        private void assertHeadJudgement(HitResult result)
+        {
+            AddAssert(
+                "check head result",
+                () => judgementResults.SingleOrDefault(r => r.HitObject is SliderHeadCircle)?.Type,
+                () => Is.EqualTo(result));
+        }
+
+        private void assertTickJudgement(HitResult result)
+        {
+            AddAssert(
+                "check tick result",
+                () => judgementResults.SingleOrDefault(r => r.HitObject is SliderTick)?.Type,
+                () => Is.EqualTo(result));
+        }
+
+        private void assertRepeatJudgement(HitResult result)
+        {
+            AddAssert(
+                "check tick result",
+                () => judgementResults.SingleOrDefault(r => r.HitObject is SliderRepeat)?.Type,
+                () => Is.EqualTo(result));
+        }
+
+        private void assertTailJudgement(HitResult result)
+        {
+            AddAssert(
+                "check tail result",
+                () => judgementResults.SingleOrDefault(r => r.HitObject is SliderTailCircle)?.Type,
+                () => Is.EqualTo(result));
+        }
+
+        private void assertSliderJudgement(HitResult result)
+        {
+            AddAssert(
+                "check slider result",
+                () => judgementResults.SingleOrDefault(r => r.HitObject is Slider)?.Type,
+                () => Is.EqualTo(result));
+        }
+
+        private Vector2 computePositionFromTime(double time)
+        {
+            Vector2 dist = slider_end_position - slider_start_position;
+            double t = (time - time_slider_start) / (time_slider_end - time_slider_start);
+            return slider_start_position + dist * (float)t;
+        }
+
+        private void performTest(List<ReplayFrame> frames, Action<Slider>? adjustSliderFunc = null, bool classic = false)
+        {
+            Slider slider = new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(256 - slider_path_length / 2, 192),
+                TickDistanceMultiplier = 3,
+                ClassicSliderBehaviour = classic,
+                Path = new SliderPath(PathType.LINEAR, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(slider_path_length, 0),
+                }, slider_path_length),
+            };
+
+            adjustSliderFunc?.Invoke(slider);
+
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
+                {
+                    HitObjects = { slider },
+                    BeatmapInfo =
+                    {
+                        Difficulty = new BeatmapDifficulty
+                        {
+                            SliderMultiplier = 1,
+                            SliderTickRate = 3
+                        },
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                    }
+                });
+
+                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+
+                p.OnLoadComplete += _ =>
+                {
+                    p.ScoreProcessor.NewJudgement += result =>
+                    {
+                        if (currentPlayer == p) judgementResults.Add(result);
+                    };
+                };
+
+                LoadScreen(currentPlayer = p);
+                judgementResults.Clear();
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
+        }
+
+        private partial class ScoreAccessibleReplayPlayer : ReplayPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            protected override bool PauseOnFocusLost => false;
+
+            public ScoreAccessibleReplayPlayer(Score score)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+            }
+        }
+    }
+}

From 3f67538d6103f411bbbaf6f54dcd750f650f2387 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 16:59:41 +0900
Subject: [PATCH 1942/2296] Allow slider to be tracked before its start time

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index 292f2ffd7d..a1724d6fdc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -153,11 +153,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             Tracking =
-                // in valid time range
-                Time.Current >= drawableSlider.HitObject.StartTime
                 // even in an edge case where current time has exceeded the slider's time, we may not have finished judging.
                 // we don't want to potentially update from Tracking=true to Tracking=false at this point.
-                && (!drawableSlider.AllJudged || Time.Current <= drawableSlider.HitObject.GetEndTime())
+                (!drawableSlider.AllJudged || Time.Current <= drawableSlider.HitObject.GetEndTime())
                 // in valid position range
                 && lastScreenSpaceMousePosition.HasValue && followCircleReceptor.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action

From 3131d376218af0673a1b79190f52f7aaf576105e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 17:00:21 +0900
Subject: [PATCH 1943/2296] Clear transformations with more fire

---
 osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs | 5 ++++-
 .../Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index a9141110c5..443863fb2f 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -488,7 +488,10 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         public override void Clear()
         {
             foreach (var j in judgementsContainer)
-                j.FadeOut().Expire();
+            {
+                j.ClearTransforms();
+                j.Expire();
+            }
         }
 
         public enum CentreMarkerStyles
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index d95959bf9e..65f4b50dde 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -66,7 +66,10 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         public override void Clear()
         {
             foreach (var j in judgementsFlow)
-                j.FadeOut().Expire();
+            {
+                j.ClearTransforms();
+                j.Expire();
+            }
         }
 
         private partial class JudgementFlow : FillFlowContainer<HitErrorShape>

From 9a982a9564e11252ba3a7e0dda77ffc6c0d86e0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 17:13:15 +0900
Subject: [PATCH 1944/2296] Tidy up `GetRateAdjustedDisplayDifficulty`
 implemetations

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs |  7 +++++--
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 10 ++++++++--
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs |  8 +++++---
 osu.Game/Rulesets/Ruleset.cs            |  1 +
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 12d197109b..bcb28328f0 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -240,10 +240,13 @@ namespace osu.Game.Rulesets.Catch
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
-            double preempt = adjustedDifficulty.ApproachRate < 6 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
+            double preempt = adjustedDifficulty.ApproachRate < 6
+                ? 1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5
+                : 1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5;
 
             preempt /= rate;
-            adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
+
+            adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5);
 
             return adjustedDifficulty;
         }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 88489f2dc3..5355743a50 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -336,12 +336,18 @@ namespace osu.Game.Rulesets.Osu
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
-            double preempt = adjustedDifficulty.ApproachRate < 5 ? (1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5) : (1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5);
+            double preempt = adjustedDifficulty.ApproachRate < 5
+                ? 1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5
+                : 1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5;
+
             preempt /= rate;
-            adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? ((1800 - preempt) / 120) : ((1200 - preempt) / 150 + 5));
+
+            adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5);
 
             double hitwindow = 80.0 - 6 * adjustedDifficulty.OverallDifficulty;
+
             hitwindow /= rate;
+
             adjustedDifficulty.OverallDifficulty = (float)(80.0 - hitwindow) / 6;
 
             return adjustedDifficulty;
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 6e5cdbf2d1..94136a11d3 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -269,9 +269,11 @@ namespace osu.Game.Rulesets.Taiko
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
-            double hitwindow = 35.0 - 15.0 * (adjustedDifficulty.OverallDifficulty - 5) / 5;
-            hitwindow /= rate;
-            adjustedDifficulty.OverallDifficulty = (float)(5 * (35 - hitwindow) / 15 + 5);
+            double hitWindow = 35.0 - 15.0 * (adjustedDifficulty.OverallDifficulty - 5) / 5;
+
+            hitWindow /= rate;
+
+            adjustedDifficulty.OverallDifficulty = (float)(5 * (35 - hitWindow) / 15 + 5);
 
             return adjustedDifficulty;
         }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index c7c81ecb55..37a35fd3ae 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -380,6 +380,7 @@ namespace osu.Game.Rulesets
         /// <summary>
         /// Applies changes to difficulty attributes for presenting to a user a rough estimate of how rate adjust mods affect difficulty.
         /// Importantly, this should NOT BE USED FOR ANY CALCULATIONS.
+        ///
         /// It is also not always correct, and arguably is never correct depending on your frame of mind.
         /// </summary>
         /// <param name="difficulty">>The <see cref="IBeatmapDifficultyInfo"/> that will be adjusted.</param>

From e865de7a6b8cdbef85211b1d74571d1c8ac9b8b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Dec 2023 09:25:56 +0100
Subject: [PATCH 1945/2296] Update test assertions in line with half time mod
 multiplier changes

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index f0822ce2a8..fed5f68449 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -787,7 +787,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.MoveMouseTo(this.ChildrenOfType<ModPresetPanel>().Single(preset => preset.Preset.Value.Name == "Half Time 0.5x"));
                 InputManager.Click(MouseButton.Left);
             });
-            AddAssert("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.5));
+            AddAssert("difficulty multiplier display shows correct value",
+                () => modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.1).Within(Precision.DOUBLE_EPSILON));
 
             // this is highly unorthodox in a test, but because the `ModSettingChangeTracker` machinery heavily leans on events and object disposal and re-creation,
             // it is instrumental in the reproduction of the failure scenario that this test is supposed to cover.
@@ -796,7 +797,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("open customisation area", () => modSelectOverlay.CustomisationButton!.TriggerClick());
             AddStep("reset half time speed to default", () => modSelectOverlay.ChildrenOfType<ModSettingsArea>().Single()
                                                                               .ChildrenOfType<RevertToDefaultButton<double>>().Single().TriggerClick());
-            AddUntilStep("difficulty multiplier display shows correct value", () => modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.7));
+            AddUntilStep("difficulty multiplier display shows correct value",
+                () => modSelectOverlay.ChildrenOfType<ScoreMultiplierDisplay>().Single().Current.Value, () => Is.EqualTo(0.3).Within(Precision.DOUBLE_EPSILON));
         }
 
         private void waitForColumnLoad() => AddUntilStep("all column content loaded", () =>

From 01710780525bca3126764bb77805964968ed19d6 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 17:33:24 +0900
Subject: [PATCH 1946/2296] Move object counts to BeatmapInfo

---
 osu.Game.Tournament/Models/TournamentBeatmap.cs     |  6 ++++++
 osu.Game/BackgroundDataStoreProcessor.cs            | 11 +++++++----
 osu.Game/Beatmaps/BeatmapDifficulty.cs              |  9 ---------
 osu.Game/Beatmaps/BeatmapImporter.cs                |  6 +++---
 osu.Game/Beatmaps/BeatmapInfo.cs                    |  4 ++++
 osu.Game/Beatmaps/BeatmapUpdater.cs                 |  4 ++--
 osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs         | 13 -------------
 osu.Game/Beatmaps/IBeatmapInfo.cs                   | 13 +++++++++++++
 .../Online/API/Requests/Responses/APIBeatmap.cs     |  8 +++++---
 .../Legacy/LegacyBeatmapConversionDifficultyInfo.cs |  4 ++--
 10 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tournament/Models/TournamentBeatmap.cs b/osu.Game.Tournament/Models/TournamentBeatmap.cs
index 7f57b6a151..a7ba5b7db1 100644
--- a/osu.Game.Tournament/Models/TournamentBeatmap.cs
+++ b/osu.Game.Tournament/Models/TournamentBeatmap.cs
@@ -21,6 +21,10 @@ namespace osu.Game.Tournament.Models
 
         public double StarRating { get; set; }
 
+        public int EndTimeObjectCount { get; set; }
+
+        public int TotalObjectCount { get; set; }
+
         public IBeatmapMetadataInfo Metadata { get; set; } = new BeatmapMetadata();
 
         public IBeatmapDifficultyInfo Difficulty { get; set; } = new BeatmapDifficulty();
@@ -41,6 +45,8 @@ namespace osu.Game.Tournament.Models
             Metadata = beatmap.Metadata;
             Difficulty = beatmap.Difficulty;
             Covers = beatmap.BeatmapSet?.Covers ?? new BeatmapSetOnlineCovers();
+            EndTimeObjectCount = beatmap.EndTimeObjectCount;
+            TotalObjectCount = beatmap.TotalObjectCount;
         }
 
         public bool Equals(IBeatmapInfo? other) => other is TournamentBeatmap b && this.MatchesOnlineID(b);
diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index c8a108a5f6..10cc13dc29 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -20,7 +20,6 @@ using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
 using osu.Game.Screens.Play;
-using Realms;
 
 namespace osu.Game
 {
@@ -177,9 +176,13 @@ namespace osu.Game
         {
             Logger.Log("Querying for beatmaps with missing hitobject counts to reprocess...");
 
-            HashSet<Guid> beatmapIds = realmAccess.Run(r => new HashSet<Guid>(r.All<BeatmapInfo>()
-                                                                               .Filter($"{nameof(BeatmapInfo.Difficulty)}.{nameof(BeatmapDifficulty.TotalObjectCount)} == 0")
-                                                                               .AsEnumerable().Select(b => b.ID)));
+            HashSet<Guid> beatmapIds = new HashSet<Guid>();
+
+            realmAccess.Run(r =>
+            {
+                foreach (var b in r.All<BeatmapInfo>().Where(b => b.TotalObjectCount == 0))
+                    beatmapIds.Add(b.ID);
+            });
 
             Logger.Log($"Found {beatmapIds.Count} beatmaps which require reprocessing.");
 
diff --git a/osu.Game/Beatmaps/BeatmapDifficulty.cs b/osu.Game/Beatmaps/BeatmapDifficulty.cs
index 785728141e..ac2267380d 100644
--- a/osu.Game/Beatmaps/BeatmapDifficulty.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficulty.cs
@@ -21,9 +21,6 @@ namespace osu.Game.Beatmaps
         public double SliderMultiplier { get; set; } = 1.4;
         public double SliderTickRate { get; set; } = 1;
 
-        public int EndTimeObjectCount { get; set; }
-        public int TotalObjectCount { get; set; }
-
         public BeatmapDifficulty()
         {
         }
@@ -47,9 +44,6 @@ namespace osu.Game.Beatmaps
 
             difficulty.SliderMultiplier = SliderMultiplier;
             difficulty.SliderTickRate = SliderTickRate;
-
-            difficulty.EndTimeObjectCount = EndTimeObjectCount;
-            difficulty.TotalObjectCount = TotalObjectCount;
         }
 
         public virtual void CopyFrom(IBeatmapDifficultyInfo other)
@@ -61,9 +55,6 @@ namespace osu.Game.Beatmaps
 
             SliderMultiplier = other.SliderMultiplier;
             SliderTickRate = other.SliderTickRate;
-
-            EndTimeObjectCount = other.EndTimeObjectCount;
-            TotalObjectCount = other.TotalObjectCount;
         }
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapImporter.cs b/osu.Game/Beatmaps/BeatmapImporter.cs
index 31d6b0108e..7bb52eef52 100644
--- a/osu.Game/Beatmaps/BeatmapImporter.cs
+++ b/osu.Game/Beatmaps/BeatmapImporter.cs
@@ -388,9 +388,7 @@ namespace osu.Game.Beatmaps
                         OverallDifficulty = decodedDifficulty.OverallDifficulty,
                         ApproachRate = decodedDifficulty.ApproachRate,
                         SliderMultiplier = decodedDifficulty.SliderMultiplier,
-                        SliderTickRate = decodedDifficulty.SliderTickRate,
-                        EndTimeObjectCount = decoded.HitObjects.Count(h => h is IHasDuration),
-                        TotalObjectCount = decoded.HitObjects.Count
+                        SliderTickRate = decodedDifficulty.SliderTickRate
                     };
 
                     var metadata = new BeatmapMetadata
@@ -428,6 +426,8 @@ namespace osu.Game.Beatmaps
                         GridSize = decodedInfo.GridSize,
                         TimelineZoom = decodedInfo.TimelineZoom,
                         MD5Hash = memoryStream.ComputeMD5Hash(),
+                        EndTimeObjectCount = decoded.HitObjects.Count(h => h is IHasDuration),
+                        TotalObjectCount = decoded.HitObjects.Count
                     };
 
                     beatmaps.Add(beatmap);
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index c1aeec1f71..2d04732f91 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -120,6 +120,10 @@ namespace osu.Game.Beatmaps
         [JsonIgnore]
         public bool Hidden { get; set; }
 
+        public int EndTimeObjectCount { get; set; }
+
+        public int TotalObjectCount { get; set; }
+
         /// <summary>
         /// Reset any fetched online linking information (and history).
         /// </summary>
diff --git a/osu.Game/Beatmaps/BeatmapUpdater.cs b/osu.Game/Beatmaps/BeatmapUpdater.cs
index 472ac26ebe..27492b8bac 100644
--- a/osu.Game/Beatmaps/BeatmapUpdater.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdater.cs
@@ -91,8 +91,8 @@ namespace osu.Game.Beatmaps
             var working = workingBeatmapCache.GetWorkingBeatmap(beatmapInfo);
             var beatmap = working.Beatmap;
 
-            beatmapInfo.Difficulty.EndTimeObjectCount = beatmap.HitObjects.Count(h => h is IHasDuration);
-            beatmapInfo.Difficulty.TotalObjectCount = beatmap.HitObjects.Count;
+            beatmapInfo.EndTimeObjectCount = beatmap.HitObjects.Count(h => h is IHasDuration);
+            beatmapInfo.TotalObjectCount = beatmap.HitObjects.Count;
 
             // And invalidate again afterwards as re-fetching the most up-to-date database metadata will be required.
             workingBeatmapCache.Invalidate(beatmapInfo);
diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index 47b261d1f6..e7a3d87d0a 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -44,19 +44,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         double SliderTickRate { get; }
 
-        /// <summary>
-        /// The number of hitobjects in the beatmap with a distinct end time.
-        /// </summary>
-        /// <remarks>
-        /// Canonically, these are hitobjects are either sliders or spinners.
-        /// </remarks>
-        int EndTimeObjectCount { get; }
-
-        /// <summary>
-        /// The total number of hitobjects in the beatmap.
-        /// </summary>
-        int TotalObjectCount { get; }
-
         /// <summary>
         /// Maps a difficulty value [0, 10] to a two-piece linear range of values.
         /// </summary>
diff --git a/osu.Game/Beatmaps/IBeatmapInfo.cs b/osu.Game/Beatmaps/IBeatmapInfo.cs
index b8c69cc525..9dcff5ce5e 100644
--- a/osu.Game/Beatmaps/IBeatmapInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapInfo.cs
@@ -61,5 +61,18 @@ namespace osu.Game.Beatmaps
         /// The basic star rating for this beatmap (with no mods applied).
         /// </summary>
         double StarRating { get; }
+
+        /// <summary>
+        /// The number of hitobjects in the beatmap with a distinct end time.
+        /// </summary>
+        /// <remarks>
+        /// Canonically, these are hitobjects are either sliders or spinners.
+        /// </remarks>
+        int EndTimeObjectCount { get; }
+
+        /// <summary>
+        /// The total number of hitobjects in the beatmap.
+        /// </summary>
+        int TotalObjectCount { get; }
     }
 }
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index c1ceff7c43..e5ecfe2c99 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -41,6 +41,10 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"difficulty_rating")]
         public double StarRating { get; set; }
 
+        public int EndTimeObjectCount => SliderCount + SpinnerCount;
+
+        public int TotalObjectCount => CircleCount + SliderCount + SpinnerCount;
+
         [JsonProperty(@"drain")]
         public float DrainRate { get; set; }
 
@@ -108,9 +112,7 @@ namespace osu.Game.Online.API.Requests.Responses
             DrainRate = DrainRate,
             CircleSize = CircleSize,
             ApproachRate = ApproachRate,
-            OverallDifficulty = OverallDifficulty,
-            EndTimeObjectCount = SliderCount + SpinnerCount,
-            TotalObjectCount = CircleCount + SliderCount + SpinnerCount
+            OverallDifficulty = OverallDifficulty
         };
 
         IBeatmapSetInfo? IBeatmapInfo.BeatmapSet => BeatmapSet;
diff --git a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
index 2021aa127d..7d69069455 100644
--- a/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
+++ b/osu.Game/Rulesets/Scoring/Legacy/LegacyBeatmapConversionDifficultyInfo.cs
@@ -62,8 +62,8 @@ namespace osu.Game.Rulesets.Scoring.Legacy
             SourceRuleset = beatmapInfo.Ruleset,
             CircleSize = beatmapInfo.Difficulty.CircleSize,
             OverallDifficulty = beatmapInfo.Difficulty.OverallDifficulty,
-            EndTimeObjectCount = beatmapInfo.Difficulty.EndTimeObjectCount,
-            TotalObjectCount = beatmapInfo.Difficulty.TotalObjectCount
+            EndTimeObjectCount = beatmapInfo.EndTimeObjectCount,
+            TotalObjectCount = beatmapInfo.TotalObjectCount
         };
     }
 }

From 5062c53e36c1d4d68cd62bfedd14e1306553c8e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Dec 2023 17:33:39 +0900
Subject: [PATCH 1947/2296] Refactor everything for sanity

---
 .../Mods/AdjustedAttributesTooltip.cs         | 105 +++++++-----------
 .../Overlays/Mods/BeatmapAttributesDisplay.cs |   7 +-
 .../Screens/Select/Details/AdvancedStats.cs   |   6 +-
 3 files changed, 41 insertions(+), 77 deletions(-)

diff --git a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
index a56c09931a..ed12d917ad 100644
--- a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
+++ b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
@@ -1,29 +1,30 @@
 // 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;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
     public partial class AdjustedAttributesTooltip : VisibilityContainer, ITooltip
     {
-        private readonly Dictionary<string, Bindable<OldNewPair>> attributes = new Dictionary<string, Bindable<OldNewPair>>();
-
-        private FillFlowContainer? attributesFillFlow;
+        private FillFlowContainer attributesFillFlow = null!;
 
         private Container content = null!;
 
+        private BeatmapDifficulty? originalDifficulty;
+        private BeatmapDifficulty? adjustedDifficulty;
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -69,36 +70,43 @@ namespace osu.Game.Overlays.Mods
                 },
             };
 
-            foreach (var attribute in attributes)
-                attributesFillFlow?.Add(new AttributeDisplay(attribute.Key, attribute.Value.GetBoundCopy()));
-
-            updateVisibility();
+            updateDisplay();
         }
 
-        public void AddAttribute(string name)
+        public void UpdateAttributes(BeatmapDifficulty original, BeatmapDifficulty adjusted)
         {
-            Bindable<OldNewPair> newBindable = new Bindable<OldNewPair>();
-            newBindable.BindValueChanged(_ => updateVisibility());
-            attributes.Add(name, newBindable);
+            originalDifficulty = original;
+            adjustedDifficulty = adjusted;
 
-            attributesFillFlow?.Add(new AttributeDisplay(name, newBindable.GetBoundCopy()));
+            if (IsLoaded)
+                updateDisplay();
         }
 
-        public void UpdateAttribute(string name, double oldValue, double newValue)
+        private void updateDisplay()
         {
-            if (!attributes.ContainsKey(name)) return;
+            attributesFillFlow.Clear();
 
-            Bindable<OldNewPair> attribute = attributes[name];
+            if (originalDifficulty == null || adjustedDifficulty == null)
+                return;
 
-            OldNewPair attributeValue = attribute.Value;
-            attributeValue.OldValue = oldValue;
-            attributeValue.NewValue = newValue;
+            attemptAdd("AR", bd => bd.ApproachRate);
+            attemptAdd("OD", bd => bd.OverallDifficulty);
+            attemptAdd("CS", bd => bd.CircleSize);
+            attemptAdd("HP", bd => bd.DrainRate);
 
-            attribute.Value = attributeValue;
-        }
+            if (attributesFillFlow.Any())
+                content.Show();
+            else
+                content.Hide();
 
-        protected override void Update()
-        {
+            void attemptAdd(string name, Func<BeatmapDifficulty, double> lookup)
+            {
+                double a = lookup(originalDifficulty);
+                double b = lookup(adjustedDifficulty);
+
+                if (!Precision.AlmostEquals(a, b))
+                    attributesFillFlow.Add(new AttributeDisplay(name, a, b));
+            }
         }
 
         public void SetContent(object content)
@@ -110,55 +118,18 @@ namespace osu.Game.Overlays.Mods
 
         public void Move(Vector2 pos) => Position = pos;
 
-        private void updateVisibility()
-        {
-            if (!IsLoaded)
-                return;
-
-            if (attributes.Any(attribute => !Precision.AlmostEquals(attribute.Value.Value.OldValue, attribute.Value.Value.NewValue)))
-                content.Show();
-            else
-                content.Hide();
-        }
-
         private partial class AttributeDisplay : CompositeDrawable
         {
-            public readonly Bindable<OldNewPair> AttributeValues;
-            public readonly string AttributeName;
-
-            private readonly OsuSpriteText text;
-
-            public AttributeDisplay(string name, Bindable<OldNewPair> values)
+            public AttributeDisplay(string name, double original, double adjusted)
             {
                 AutoSizeAxes = Axes.Both;
 
-                AttributeName = name;
-                AttributeValues = values;
-
-                InternalChild = text = new OsuSpriteText
+                InternalChild = new OsuSpriteText
                 {
-                    Font = OsuFont.Default.With(weight: FontWeight.Bold)
+                    Font = OsuFont.Default.With(weight: FontWeight.Bold),
+                    Text = $"{name}: {original:0.0#} → {adjusted:0.0#}"
                 };
-
-                AttributeValues.BindValueChanged(_ => update(), true);
             }
-
-            private void update()
-            {
-                if (Precision.AlmostEquals(AttributeValues.Value.OldValue, AttributeValues.Value.NewValue))
-                {
-                    Hide();
-                    return;
-                }
-
-                Show();
-                text.Text = $"{AttributeName}: {(AttributeValues.Value.OldValue):0.0#} → {(AttributeValues.Value.NewValue):0.0#}";
-            }
-        }
-
-        private struct OldNewPair
-        {
-            public double OldValue, NewValue;
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 0c35e55df5..dd3daa2b7a 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -60,6 +60,7 @@ namespace osu.Game.Overlays.Mods
         private AdjustedAttributesTooltip rateAdjustTooltip = null!;
 
         public ITooltip GetCustomTooltip() => rateAdjustTooltip;
+
         public object TooltipContent => this;
 
         private const float transition_duration = 250;
@@ -103,9 +104,6 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            rateAdjustTooltip.AddAttribute("AR");
-            rateAdjustTooltip.AddAttribute("OD");
-
             mods.BindValueChanged(_ =>
             {
                 modSettingChangeTracker?.Dispose();
@@ -184,8 +182,7 @@ namespace osu.Game.Overlays.Mods
             Ruleset ruleset = gameRuleset.Value.CreateInstance();
             BeatmapDifficulty adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
 
-            rateAdjustTooltip.UpdateAttribute("AR", originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
-            rateAdjustTooltip.UpdateAttribute("OD", originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
+            rateAdjustTooltip.UpdateAttributes(originalDifficulty, adjustedDifficulty);
 
             approachRateDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
             overallDifficultyDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 9433588b03..2a9e69f141 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -101,9 +101,6 @@ namespace osu.Game.Screens.Select.Details
             gameRuleset.BindValueChanged(_ => updateStatistics());
 
             mods.BindValueChanged(modsChanged, true);
-
-            rateAdjustTooltip.AddAttribute("AR");
-            rateAdjustTooltip.AddAttribute("OD");
         }
 
         private ModSettingChangeTracker modSettingChangeTracker;
@@ -148,8 +145,7 @@ namespace osu.Game.Screens.Select.Details
 
                     adjustedDifficulty = ruleset.CreateInstance().GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
 
-                    rateAdjustTooltip.UpdateAttribute("AR", originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
-                    rateAdjustTooltip.UpdateAttribute("OD", originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
+                    rateAdjustTooltip.UpdateAttributes(originalDifficulty, adjustedDifficulty);
                 }
             }
 

From 812f52e793b4729548e1b452a063591fb28c546d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 17:38:16 +0900
Subject: [PATCH 1948/2296] Bump version number

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

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 9c7fe464dd..191bb49b0c 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -88,9 +88,9 @@ namespace osu.Game.Database
         /// 34   2023-08-21    Add BackgroundReprocessingFailed flag to ScoreInfo to track upgrade failures.
         /// 35   2023-10-16    Clear key combinations of keybindings that are assigned to more than one action in a given settings section.
         /// 36   2023-10-26    Add LegacyOnlineID to ScoreInfo. Move osu_scores_*_high IDs stored in OnlineID to LegacyOnlineID. Reset anomalous OnlineIDs.
-        /// 37   2023-12-10    Add EndTimeObjectCount and TotalObjectCount to BeatmapDifficulty.
+        /// 38   2023-12-10    Add EndTimeObjectCount and TotalObjectCount to BeatmapInfo.
         /// </summary>
-        private const int schema_version = 37;
+        private const int schema_version = 38;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.

From 7a4ea90bda6374b89a978e735c88731429e14fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Dec 2023 11:01:06 +0100
Subject: [PATCH 1949/2296] Fix test failures due to dependency becoming
 required

---
 .../Overlays/Settings/Sections/General/UpdateSettings.cs    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index a8f5b655d0..3ff5556f4d 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
         private Storage storage { get; set; } = null!;
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, OsuGame game)
+        private void load(OsuConfigManager config, OsuGame? game)
         {
             Add(new SettingsEnumDropdown<ReleaseStream>
             {
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                             {
                                 notifications?.Post(new SimpleNotification
                                 {
-                                    Text = GeneralSettingsStrings.RunningLatestRelease(game.Version),
+                                    Text = GeneralSettingsStrings.RunningLatestRelease(game!.Version),
                                     Icon = FontAwesome.Solid.CheckCircle,
                                 });
                             }
@@ -87,7 +87,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Add(new SettingsButton
                 {
                     Text = GeneralSettingsStrings.ChangeFolderLocation,
-                    Action = () => game.PerformFromScreen(menu => menu.Push(new MigrationSelectScreen()))
+                    Action = () => game?.PerformFromScreen(menu => menu.Push(new MigrationSelectScreen()))
                 });
             }
         }

From 683ac6f63a169351bf2bf16c9ddd24ec1493f551 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 19:25:41 +0900
Subject: [PATCH 1950/2296] Add some more tests

---
 .../TestSceneSliderEarlyHitJudgement.cs       | 46 +++++++++++++++++--
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
index 46278dfb12..fb7d00b28c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
@@ -25,11 +25,12 @@ namespace osu.Game.Rulesets.Osu.Tests
     public partial class TestSceneSliderEarlyHitJudgement : RateAdjustedBeatmapTestScene
     {
         private const double time_slider_start = 1000;
-        private const double time_slider_tick = 2000;
         private const double time_slider_end = 3000;
 
         private static readonly Vector2 slider_start_position = new Vector2(256 - slider_path_length / 2, 192);
         private static readonly Vector2 slider_end_position = new Vector2(256 + slider_path_length / 2, 192);
+        private static readonly Vector2 offset_inside_follow = new Vector2(35, 0);
+        private static readonly Vector2 offset_outside_follow = offset_inside_follow * 2;
 
         private ScoreAccessibleReplayPlayer currentPlayer = null!;
 
@@ -43,8 +44,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame(time_slider_start - 300, slider_start_position, OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_start - 200, slider_start_position + new Vector2(32, 0), OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_end - 200, slider_end_position + new Vector2(32, 0), OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 200, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end - 200, slider_end_position + offset_inside_follow, OsuAction.LeftButton),
             });
 
             assertHeadJudgement(HitResult.Miss);
@@ -53,14 +54,49 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
+        [Test]
+        public void TestHitEarlyAndReleaseInFollowRegion()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start - 300, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 200, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 100, slider_start_position + offset_inside_follow),
+                new OsuReplayFrame(time_slider_end - 100, slider_end_position + offset_inside_follow, OsuAction.LeftButton),
+            });
+
+            assertHeadJudgement(HitResult.Miss);
+            assertTickJudgement(HitResult.LargeTickMiss);
+            assertTailJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreMiss);
+        }
+
+        [Test]
+        public void TestHitEarlyAndRepressInFollowRegion()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start - 300, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 200, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 100, slider_start_position + offset_inside_follow),
+                new OsuReplayFrame(time_slider_start - 50, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end - 50, slider_end_position + offset_inside_follow, OsuAction.LeftButton),
+            });
+
+            assertHeadJudgement(HitResult.Miss);
+            assertTickJudgement(HitResult.LargeTickMiss);
+            assertTailJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreMiss);
+        }
+
         [Test]
         public void TestHitEarlyMoveOutsideFollowRegion()
         {
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame(time_slider_start - 300, slider_start_position, OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_start - 200, slider_start_position + new Vector2(96, 0), OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_end - 200, slider_end_position + new Vector2(96, 0), OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 200, slider_start_position + offset_outside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end - 200, slider_end_position + offset_outside_follow, OsuAction.LeftButton),
             });
 
             assertHeadJudgement(HitResult.Miss);

From 27e55def641cbf0eb233b4b094c2843b5648344b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 13 Dec 2023 20:27:14 +0900
Subject: [PATCH 1951/2296] Make animation start at the slider's start time

---
 osu.Game.Rulesets.Osu/Skinning/FollowCircle.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/FollowCircle.cs b/osu.Game.Rulesets.Osu/Skinning/FollowCircle.cs
index 355d3f9a2f..4fadb09948 100644
--- a/osu.Game.Rulesets.Osu/Skinning/FollowCircle.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/FollowCircle.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -26,13 +27,17 @@ namespace osu.Game.Rulesets.Osu.Skinning
             ((DrawableSlider?)ParentObject)?.Tracking.BindValueChanged(tracking =>
             {
                 Debug.Assert(ParentObject != null);
+
                 if (ParentObject.Judged)
                     return;
 
-                if (tracking.NewValue)
-                    OnSliderPress();
-                else
-                    OnSliderRelease();
+                using (BeginAbsoluteSequence(Math.Max(Time.Current, ParentObject.HitObject?.StartTime ?? 0)))
+                {
+                    if (tracking.NewValue)
+                        OnSliderPress();
+                    else
+                        OnSliderRelease();
+                }
             }, true);
         }
 

From a6bf4cdb986b0d598cb74a863d2bab4de5998354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Dec 2023 13:22:12 +0100
Subject: [PATCH 1952/2296] Remove dead clamping code

`EffectiveX` is already defined as clamped
to `[0, CatchPlayfield.WIDTH]`.
---
 .../Beatmaps/CatchBeatmapProcessor.cs                | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index d5d4d3b694..02d4cdbb94 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             base.PostProcess();
 
             ApplyPositionOffsets(Beatmap);
-            ApplyPositionClamping(Beatmap);
 
             int index = 0;
 
@@ -115,17 +114,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             initialiseHyperDash(beatmap);
         }
 
-        public void ApplyPositionClamping(IBeatmap beatmap)
-        {
-            foreach (var obj in beatmap.HitObjects.OfType<CatchHitObject>())
-            {
-                if (obj.EffectiveX < 0)
-                    obj.XOffset += Math.Abs(obj.EffectiveX);
-                else if (obj.EffectiveX > CatchPlayfield.WIDTH)
-                    obj.XOffset += CatchPlayfield.WIDTH - obj.EffectiveX;
-            }
-        }
-
         private static void applyHardRockOffset(CatchHitObject hitObject, ref float? lastPosition, ref double lastStartTime, LegacyRandom rng)
         {
             float offsetPosition = hitObject.OriginalX;

From 31c9489cb92e6d365813f7faef4139cb9ae2ddcc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Dec 2023 23:37:34 +0300
Subject: [PATCH 1953/2296] Fix failing tests

---
 .../Visual/SongSelect/TestSceneFilterControl.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 00a0d4a849..94c6130f15 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("select collection", () =>
             {
-                InputManager.MoveMouseTo(getCollectionDropdownItems().ElementAt(1));
+                InputManager.MoveMouseTo(getCollectionDropdownItemAt(1));
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -206,7 +206,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("click manage collections filter", () =>
             {
-                InputManager.MoveMouseTo(getCollectionDropdownItems().Last());
+                int lastItemIndex = control.ChildrenOfType<CollectionDropdown>().Single().Items.Count() - 1;
+                InputManager.MoveMouseTo(getCollectionDropdownItemAt(lastItemIndex));
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -232,10 +233,10 @@ namespace osu.Game.Tests.Visual.SongSelect
         private void assertCollectionDropdownContains(string collectionName, bool shouldContain = true) =>
             AddUntilStep($"collection dropdown {(shouldContain ? "contains" : "does not contain")} '{collectionName}'",
                 // A bit of a roundabout way of going about this, see: https://github.com/ppy/osu-framework/issues/3871 + https://github.com/ppy/osu-framework/issues/3872
-                () => shouldContain == (getCollectionDropdownItems().Any(i => i.ChildrenOfType<CompositeDrawable>().OfType<IHasText>().First().Text == collectionName)));
+                () => shouldContain == control.ChildrenOfType<Menu.DrawableMenuItem>().Any(i => i.ChildrenOfType<CompositeDrawable>().OfType<IHasText>().First().Text == collectionName));
 
         private IconButton getAddOrRemoveButton(int index)
-            => getCollectionDropdownItems().ElementAt(index).ChildrenOfType<IconButton>().Single();
+            => getCollectionDropdownItemAt(index).ChildrenOfType<IconButton>().Single();
 
         private void addExpandHeaderStep() => AddStep("expand header", () =>
         {
@@ -249,7 +250,11 @@ namespace osu.Game.Tests.Visual.SongSelect
             InputManager.Click(MouseButton.Left);
         });
 
-        private IEnumerable<Dropdown<CollectionFilterMenuItem>.DropdownMenu.DrawableDropdownMenuItem> getCollectionDropdownItems()
-            => control.ChildrenOfType<CollectionDropdown>().Single().ChildrenOfType<Dropdown<CollectionFilterMenuItem>.DropdownMenu.DrawableDropdownMenuItem>();
+        private Menu.DrawableMenuItem getCollectionDropdownItemAt(int index)
+        {
+            // todo: we should be able to use Items, but apparently that's not guaranteed to be ordered... see: https://github.com/ppy/osu-framework/pull/6079
+            CollectionFilterMenuItem item = control.ChildrenOfType<CollectionDropdown>().Single().ItemSource.ElementAt(index);
+            return control.ChildrenOfType<Menu.DrawableMenuItem>().Single(i => i.Item.Text.Value == item.CollectionName);
+        }
     }
 }

From 38e7c035008ba1e61ee364d53e6eb3bd0b1bc588 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 14 Dec 2023 12:00:01 +0900
Subject: [PATCH 1954/2296] Update tests to not miss the head

---
 .../TestSceneSliderEarlyHitJudgement.cs       | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
index fb7d00b28c..9caee86a32 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
@@ -43,12 +43,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             performTest(new List<ReplayFrame>
             {
-                new OsuReplayFrame(time_slider_start - 300, slider_start_position, OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_start - 200, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_end - 200, slider_end_position + offset_inside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 100, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end - 100, slider_end_position + offset_inside_follow, OsuAction.LeftButton),
             });
 
-            assertHeadJudgement(HitResult.Miss);
+            assertHeadJudgement(HitResult.Meh);
             assertTickJudgement(HitResult.LargeTickHit);
             assertTailJudgement(HitResult.LargeTickHit);
             assertSliderJudgement(HitResult.IgnoreHit);
@@ -59,16 +59,16 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             performTest(new List<ReplayFrame>
             {
-                new OsuReplayFrame(time_slider_start - 300, slider_start_position, OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_start - 200, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_start - 100, slider_start_position + offset_inside_follow),
-                new OsuReplayFrame(time_slider_end - 100, slider_end_position + offset_inside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 100, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 50, slider_start_position + offset_inside_follow),
+                new OsuReplayFrame(time_slider_end - 50, slider_end_position + offset_inside_follow, OsuAction.LeftButton),
             });
 
-            assertHeadJudgement(HitResult.Miss);
+            assertHeadJudgement(HitResult.Meh);
             assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.IgnoreMiss);
-            assertSliderJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreHit);
         }
 
         [Test]
@@ -76,17 +76,17 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             performTest(new List<ReplayFrame>
             {
-                new OsuReplayFrame(time_slider_start - 300, slider_start_position, OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_start - 200, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_start - 100, slider_start_position + offset_inside_follow),
+                new OsuReplayFrame(time_slider_start - 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 100, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 75, slider_start_position + offset_inside_follow),
                 new OsuReplayFrame(time_slider_start - 50, slider_start_position + offset_inside_follow, OsuAction.LeftButton),
                 new OsuReplayFrame(time_slider_end - 50, slider_end_position + offset_inside_follow, OsuAction.LeftButton),
             });
 
-            assertHeadJudgement(HitResult.Miss);
+            assertHeadJudgement(HitResult.Meh);
             assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.IgnoreMiss);
-            assertSliderJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreHit);
         }
 
         [Test]
@@ -94,15 +94,15 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             performTest(new List<ReplayFrame>
             {
-                new OsuReplayFrame(time_slider_start - 300, slider_start_position, OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_start - 200, slider_start_position + offset_outside_follow, OsuAction.LeftButton),
-                new OsuReplayFrame(time_slider_end - 200, slider_end_position + offset_outside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_start - 100, slider_start_position + offset_outside_follow, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end - 100, slider_end_position + offset_outside_follow, OsuAction.LeftButton),
             });
 
-            assertHeadJudgement(HitResult.Miss);
+            assertHeadJudgement(HitResult.Meh);
             assertTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.IgnoreMiss);
-            assertSliderJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreHit);
         }
 
         private void assertHeadJudgement(HitResult result)
@@ -179,7 +179,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                         Difficulty = new BeatmapDifficulty
                         {
                             SliderMultiplier = 1,
-                            SliderTickRate = 3
+                            SliderTickRate = 3,
+                            OverallDifficulty = 0
                         },
                         Ruleset = new OsuRuleset().RulesetInfo,
                     }

From 70a546b23cb3bb38f785f33dc3e18a1cbe3c129b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 09:23:03 +0100
Subject: [PATCH 1955/2296] Add setting for adjusting whether text search is
 active by default

---
 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 6ef55ab919..ea526c6d54 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -49,6 +49,7 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.RandomSelectAlgorithm, RandomSelectAlgorithm.RandomPermutation);
             SetDefault(OsuSetting.ModSelectHotkeyStyle, ModSelectHotkeyStyle.Sequential);
+            SetDefault(OsuSetting.ModSelectTextSearchStartsActive, true);
 
             SetDefault(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2f, 1f);
 
@@ -416,5 +417,6 @@ namespace osu.Game.Configuration
         AutomaticallyDownloadMissingBeatmaps,
         EditorShowSpeedChanges,
         TouchDisableGameplayTaps,
+        ModSelectTextSearchStartsActive,
     }
 }

From 839a0802476deae907f773e781ab6b317434d332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 09:30:04 +0100
Subject: [PATCH 1956/2296] Add test coverage for desired mod overlay search
 box behaviour

---
 .../TestSceneModSelectOverlay.cs              | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index fed5f68449..80be4412b3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -38,6 +39,9 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private TestModSelectOverlay modSelectOverlay = null!;
 
+        [Resolved]
+        private OsuConfigManager configManager { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -566,17 +570,33 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
-        public void TestSearchFocusChangeViaKey()
+        public void TestTextSearchActiveByDefault()
         {
+            configManager.SetValue(OsuSetting.ModSelectTextSearchStartsActive, true);
             createScreen();
 
-            const Key focus_switch_key = Key.Tab;
+            AddUntilStep("search text box focused", () => modSelectOverlay.SearchTextBox.HasFocus);
 
-            AddStep("press tab", () => InputManager.Key(focus_switch_key));
-            AddAssert("focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddAssert("search text box unfocused", () => !modSelectOverlay.SearchTextBox.HasFocus);
 
-            AddStep("press tab", () => InputManager.Key(focus_switch_key));
-            AddAssert("lost focus", () => !modSelectOverlay.SearchTextBox.HasFocus);
+            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddAssert("search text box focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+        }
+
+        [Test]
+        public void TestTextSearchNotActiveByDefault()
+        {
+            configManager.SetValue(OsuSetting.ModSelectTextSearchStartsActive, false);
+            createScreen();
+
+            AddUntilStep("search text box not focused", () => !modSelectOverlay.SearchTextBox.HasFocus);
+
+            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddAssert("search text box focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+
+            AddStep("press tab", () => InputManager.Key(Key.Tab));
+            AddAssert("search text box unfocused", () => !modSelectOverlay.SearchTextBox.HasFocus);
         }
 
         [Test]

From 0ab6e1879276a75702ef7b0f2ffd435a3521ac28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 09:49:48 +0100
Subject: [PATCH 1957/2296] Automatically focus search text box on open
 depending on setting

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index f2b3264a84..ce798ae752 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -115,6 +115,7 @@ namespace osu.Game.Overlays.Mods
         public IEnumerable<ModState> AllAvailableMods => AvailableMods.Value.SelectMany(pair => pair.Value);
 
         private readonly BindableBool customisationVisible = new BindableBool();
+        private Bindable<bool> textSearchStartsActive = null!;
 
         private ModSettingsArea modSettingsArea = null!;
         private ColumnScrollContainer columnScroll = null!;
@@ -154,7 +155,7 @@ namespace osu.Game.Overlays.Mods
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, OsuColour colours, AudioManager audio)
+        private void load(OsuGameBase game, OsuColour colours, AudioManager audio, OsuConfigManager configManager)
         {
             Header.Title = ModSelectOverlayStrings.ModSelectTitle;
             Header.Description = ModSelectOverlayStrings.ModSelectDescription;
@@ -282,6 +283,8 @@ namespace osu.Game.Overlays.Mods
             }
 
             globalAvailableMods.BindTo(game.AvailableMods);
+
+            textSearchStartsActive = configManager.GetBindable<bool>(OsuSetting.ModSelectTextSearchStartsActive);
         }
 
         public override void Hide()
@@ -617,6 +620,9 @@ namespace osu.Game.Overlays.Mods
 
                 nonFilteredColumnCount += 1;
             }
+
+            if (textSearchStartsActive.Value)
+                SearchTextBox.TakeFocus();
         }
 
         protected override void PopOut()

From b3a7c7a7c9bba70c1372a5f39875e8e3402c80fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 10:04:37 +0100
Subject: [PATCH 1958/2296] Add control to adjust mod select search text box
 behaviour

---
 osu.Game/Localisation/UserInterfaceStrings.cs               | 5 +++++
 .../Settings/Sections/UserInterface/SongSelectSettings.cs   | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/osu.Game/Localisation/UserInterfaceStrings.cs b/osu.Game/Localisation/UserInterfaceStrings.cs
index 612668171c..68c5c3ccbc 100644
--- a/osu.Game/Localisation/UserInterfaceStrings.cs
+++ b/osu.Game/Localisation/UserInterfaceStrings.cs
@@ -104,6 +104,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ModSelectHotkeyStyle => new TranslatableString(getKey(@"mod_select_hotkey_style"), @"Mod select hotkey style");
 
+        /// <summary>
+        /// "Automatically focus search text box in mod select"
+        /// </summary>
+        public static LocalisableString ModSelectTextSearchStartsActive => new TranslatableString(getKey(@"mod_select_text_search_starts_active"), @"Automatically focus search text box in mod select");
+
         /// <summary>
         /// "no limit"
         /// </summary>
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
index addf5ce163..49bd17dfde 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
@@ -42,6 +42,12 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                     ClassicDefault = ModSelectHotkeyStyle.Classic
                 },
                 new SettingsCheckbox
+                {
+                    LabelText = UserInterfaceStrings.ModSelectTextSearchStartsActive,
+                    Current = config.GetBindable<bool>(OsuSetting.ModSelectTextSearchStartsActive),
+                    ClassicDefault = false
+                },
+                new SettingsCheckbox
                 {
                     LabelText = GameplaySettingsStrings.BackgroundBlur,
                     Current = config.GetBindable<bool>(OsuSetting.SongSelectBackgroundBlur),

From d77972a39b18f17e43f347fe3bf704e1fde8936b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Dec 2023 18:26:13 +0900
Subject: [PATCH 1959/2296] Show search bar by default in language and
 collection dropdowns

---
 osu.Game/Collections/CollectionDropdown.cs                      | 2 ++
 osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/osu.Game/Collections/CollectionDropdown.cs b/osu.Game/Collections/CollectionDropdown.cs
index e435992381..db7b27d30c 100644
--- a/osu.Game/Collections/CollectionDropdown.cs
+++ b/osu.Game/Collections/CollectionDropdown.cs
@@ -48,6 +48,8 @@ namespace osu.Game.Collections
             ItemSource = filters;
 
             Current.Value = new AllBeatmapsCollectionFilterMenuItem();
+
+            AlwaysShowSearchBar = true;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index cf7f63211e..2af6e36b7f 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 {
                     LabelText = GeneralSettingsStrings.LanguageDropdown,
                     Current = game.CurrentLanguage,
+                    AlwaysShowSearchBar = true,
                 },
                 new SettingsCheckbox
                 {

From 8698835db2e1d0163b3cb1af22532d8a7d4b1554 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Thu, 14 Dec 2023 14:00:35 +0200
Subject: [PATCH 1960/2296] fixed bug

fixed the bug where it's not updates tooltip when there are no mods
---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 2a9e69f141..6309b2b993 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -123,6 +123,8 @@ namespace osu.Game.Screens.Select.Details
         private void updateStatistics()
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
+
+            BeatmapDifficulty originalDifficulty = null;
             BeatmapDifficulty adjustedDifficulty = null;
 
             IRulesetInfo ruleset = gameRuleset?.Value ?? beatmapInfo.Ruleset;
@@ -130,7 +132,7 @@ namespace osu.Game.Screens.Select.Details
             if (baseDifficulty != null &&
                 (mods.Value.Any(m => m is IApplicableToDifficulty) || mods.Value.Any(m => m is IApplicableToRate)))
             {
-                BeatmapDifficulty originalDifficulty = new BeatmapDifficulty(baseDifficulty);
+                originalDifficulty = new BeatmapDifficulty(baseDifficulty);
 
                 foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
                     mod.ApplyToDifficulty(originalDifficulty);
@@ -149,6 +151,13 @@ namespace osu.Game.Screens.Select.Details
                 }
             }
 
+            // update tooltip anyway
+            else if (baseDifficulty != null)
+            {
+                originalDifficulty = new BeatmapDifficulty(baseDifficulty);
+                rateAdjustTooltip.UpdateAttributes(originalDifficulty, originalDifficulty);
+            }
+
             switch (ruleset.OnlineID)
             {
                 case 3:

From c2373bb37b6574bdae17a39a064098bf83737fe7 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Thu, 14 Dec 2023 14:31:19 +0200
Subject: [PATCH 1961/2296] change the order of attributes

+ simplifying the bug fix
---
 osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs |  2 +-
 osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs  |  2 +-
 osu.Game/Screens/Select/Details/AdvancedStats.cs    | 13 ++-----------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
index ed12d917ad..7b991dbbfb 100644
--- a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
+++ b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
@@ -89,8 +89,8 @@ namespace osu.Game.Overlays.Mods
             if (originalDifficulty == null || adjustedDifficulty == null)
                 return;
 
-            attemptAdd("AR", bd => bd.ApproachRate);
             attemptAdd("OD", bd => bd.OverallDifficulty);
+            attemptAdd("AR", bd => bd.ApproachRate);
             attemptAdd("CS", bd => bd.CircleSize);
             attemptAdd("HP", bd => bd.DrainRate);
 
diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index dd3daa2b7a..8b50bfc791 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -95,8 +95,8 @@ namespace osu.Game.Overlays.Mods
             {
                 circleSizeDisplay = new VerticalAttributeDisplay("CS") { Shear = new Vector2(-shear, 0), },
                 drainRateDisplay = new VerticalAttributeDisplay("HP") { Shear = new Vector2(-shear, 0), },
-                approachRateDisplay = new VerticalAttributeDisplay("AR") { Shear = new Vector2(-shear, 0), },
                 overallDifficultyDisplay = new VerticalAttributeDisplay("OD") { Shear = new Vector2(-shear, 0), },
+                approachRateDisplay = new VerticalAttributeDisplay("AR") { Shear = new Vector2(-shear, 0), },
             });
         }
 
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 6309b2b993..1c0667b9ee 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -124,15 +124,13 @@ namespace osu.Game.Screens.Select.Details
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
 
-            BeatmapDifficulty originalDifficulty = null;
             BeatmapDifficulty adjustedDifficulty = null;
 
             IRulesetInfo ruleset = gameRuleset?.Value ?? beatmapInfo.Ruleset;
 
-            if (baseDifficulty != null &&
-                (mods.Value.Any(m => m is IApplicableToDifficulty) || mods.Value.Any(m => m is IApplicableToRate)))
+            if (baseDifficulty != null)
             {
-                originalDifficulty = new BeatmapDifficulty(baseDifficulty);
+                BeatmapDifficulty originalDifficulty = new BeatmapDifficulty(baseDifficulty);
 
                 foreach (var mod in mods.Value.OfType<IApplicableToDifficulty>())
                     mod.ApplyToDifficulty(originalDifficulty);
@@ -151,13 +149,6 @@ namespace osu.Game.Screens.Select.Details
                 }
             }
 
-            // update tooltip anyway
-            else if (baseDifficulty != null)
-            {
-                originalDifficulty = new BeatmapDifficulty(baseDifficulty);
-                rateAdjustTooltip.UpdateAttributes(originalDifficulty, originalDifficulty);
-            }
-
             switch (ruleset.OnlineID)
             {
                 case 3:

From b22a7cf520b7dc0408b4199783ca898b47bb02f4 Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Thu, 14 Dec 2023 14:31:58 +0200
Subject: [PATCH 1962/2296] Update AdvancedStats.cs

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 1c0667b9ee..f56e84abce 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -123,7 +123,6 @@ namespace osu.Game.Screens.Select.Details
         private void updateStatistics()
         {
             IBeatmapDifficultyInfo baseDifficulty = BeatmapInfo?.Difficulty;
-
             BeatmapDifficulty adjustedDifficulty = null;
 
             IRulesetInfo ruleset = gameRuleset?.Value ?? beatmapInfo.Ruleset;

From 23c427cd3ee70781fbf226101af8d0156c1536fb Mon Sep 17 00:00:00 2001
From: Givikap120 <givikap120@gmail.com>
Date: Thu, 14 Dec 2023 14:38:01 +0200
Subject: [PATCH 1963/2296] Update AdjustedAttributesTooltip.cs

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

diff --git a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
index 7b991dbbfb..10b84340ae 100644
--- a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
+++ b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
@@ -89,10 +89,10 @@ namespace osu.Game.Overlays.Mods
             if (originalDifficulty == null || adjustedDifficulty == null)
                 return;
 
-            attemptAdd("OD", bd => bd.OverallDifficulty);
-            attemptAdd("AR", bd => bd.ApproachRate);
             attemptAdd("CS", bd => bd.CircleSize);
             attemptAdd("HP", bd => bd.DrainRate);
+            attemptAdd("OD", bd => bd.OverallDifficulty);
+            attemptAdd("AR", bd => bd.ApproachRate);
 
             if (attributesFillFlow.Any())
                 content.Show();

From 67a5e01c49fe9a36ab6a70f63129156aa1ed1d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 15:19:29 +0100
Subject: [PATCH 1964/2296] Update assertions in test

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index 60fb6b8c86..325cb9e0cb 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.Visual.Online
         public void TestSelectedModsDontAffectStatistics()
         {
             AddStep("show map", () => overlay.ShowBeatmapSet(getBeatmapSet()));
-            AddAssert("AR displayed as 0", () => overlay.ChildrenOfType<AdvancedStats.StatisticRow>().Single(s => s.Title == BeatmapsetsStrings.ShowStatsAr).Value == (0, null));
+            AddAssert("AR displayed as 0", () => overlay.ChildrenOfType<AdvancedStats.StatisticRow>().Single(s => s.Title == BeatmapsetsStrings.ShowStatsAr).Value, () => Is.EqualTo((0, 0)));
             AddStep("set AR10 diff adjust", () => SelectedMods.Value = new[]
             {
                 new OsuModDifficultyAdjust
@@ -228,7 +228,7 @@ namespace osu.Game.Tests.Visual.Online
                     ApproachRate = { Value = 10 }
                 }
             });
-            AddAssert("AR still displayed as 0", () => overlay.ChildrenOfType<AdvancedStats.StatisticRow>().Single(s => s.Title == BeatmapsetsStrings.ShowStatsAr).Value == (0, null));
+            AddAssert("AR still displayed as 0", () => overlay.ChildrenOfType<AdvancedStats.StatisticRow>().Single(s => s.Title == BeatmapsetsStrings.ShowStatsAr).Value, () => Is.EqualTo((0, 0)));
         }
 
         [Test]

From 9e5b6b97ff52753140331e16aa1b001df493ce89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 16:11:08 +0100
Subject: [PATCH 1965/2296] Fix `AdjustedAttributesTooltip` being broken by
 design

Fixes issue described in the following comment:
https://github.com/ppy/osu/pull/25759#issuecomment-1855954637

That is just not how the tooltip system is supposed to be used.

To name the individual sins:

- Caching and returning a tooltip instance like the classes that used
  tooltips is incorrect. The lifetime of tooltip instances is managed by
  the tooltip container. `GetCustomTooltip()` is called by it
  exclusively. It should return a fresh instance every time.

- Not putting actual data in `IHasCustomTooltip.TooltipContent` is
  wrong.

- Having `Tooltip.SetContent()` be a no-op is *grossly and flagrantly*
  wrong.

I'm not even sure which particular combination of the above
transgressions caused the issue as it presented itself, but at this time
I frankly do not care.
---
 .../Mods/AdjustedAttributesTooltip.cs         | 55 +++++++++++--------
 .../Overlays/Mods/BeatmapAttributesDisplay.cs | 12 ++--
 .../Screens/Select/Details/AdvancedStats.cs   | 10 ++--
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
index 10b84340ae..957ee23e3b 100644
--- a/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
+++ b/osu.Game/Overlays/Mods/AdjustedAttributesTooltip.cs
@@ -16,14 +16,13 @@ using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    public partial class AdjustedAttributesTooltip : VisibilityContainer, ITooltip
+    public partial class AdjustedAttributesTooltip : VisibilityContainer, ITooltip<AdjustedAttributesTooltip.Data?>
     {
         private FillFlowContainer attributesFillFlow = null!;
 
         private Container content = null!;
 
-        private BeatmapDifficulty? originalDifficulty;
-        private BeatmapDifficulty? adjustedDifficulty;
+        private Data? data;
 
         [Resolved]
         private OsuColour colours { get; set; } = null!;
@@ -73,26 +72,17 @@ namespace osu.Game.Overlays.Mods
             updateDisplay();
         }
 
-        public void UpdateAttributes(BeatmapDifficulty original, BeatmapDifficulty adjusted)
-        {
-            originalDifficulty = original;
-            adjustedDifficulty = adjusted;
-
-            if (IsLoaded)
-                updateDisplay();
-        }
-
         private void updateDisplay()
         {
             attributesFillFlow.Clear();
 
-            if (originalDifficulty == null || adjustedDifficulty == null)
-                return;
-
-            attemptAdd("CS", bd => bd.CircleSize);
-            attemptAdd("HP", bd => bd.DrainRate);
-            attemptAdd("OD", bd => bd.OverallDifficulty);
-            attemptAdd("AR", bd => bd.ApproachRate);
+            if (data != null)
+            {
+                attemptAdd("CS", bd => bd.CircleSize);
+                attemptAdd("HP", bd => bd.DrainRate);
+                attemptAdd("OD", bd => bd.OverallDifficulty);
+                attemptAdd("AR", bd => bd.ApproachRate);
+            }
 
             if (attributesFillFlow.Any())
                 content.Show();
@@ -101,16 +91,21 @@ namespace osu.Game.Overlays.Mods
 
             void attemptAdd(string name, Func<BeatmapDifficulty, double> lookup)
             {
-                double a = lookup(originalDifficulty);
-                double b = lookup(adjustedDifficulty);
+                double originalValue = lookup(data.OriginalDifficulty);
+                double adjustedValue = lookup(data.AdjustedDifficulty);
 
-                if (!Precision.AlmostEquals(a, b))
-                    attributesFillFlow.Add(new AttributeDisplay(name, a, b));
+                if (!Precision.AlmostEquals(originalValue, adjustedValue))
+                    attributesFillFlow.Add(new AttributeDisplay(name, originalValue, adjustedValue));
             }
         }
 
-        public void SetContent(object content)
+        public void SetContent(Data? data)
         {
+            if (this.data == data)
+                return;
+
+            this.data = data;
+            updateDisplay();
         }
 
         protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
@@ -118,6 +113,18 @@ namespace osu.Game.Overlays.Mods
 
         public void Move(Vector2 pos) => Position = pos;
 
+        public class Data
+        {
+            public BeatmapDifficulty OriginalDifficulty { get; }
+            public BeatmapDifficulty AdjustedDifficulty { get; }
+
+            public Data(BeatmapDifficulty originalDifficulty, BeatmapDifficulty adjustedDifficulty)
+            {
+                OriginalDifficulty = originalDifficulty;
+                AdjustedDifficulty = adjustedDifficulty;
+            }
+        }
+
         private partial class AttributeDisplay : CompositeDrawable
         {
             public AttributeDisplay(string name, double original, double adjusted)
diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index 8b50bfc791..d50b2c33d7 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Mods
     /// On the mod select overlay, this provides a local updating view of BPM, star rating and other
     /// difficulty attributes so the user can have a better insight into what mods are changing.
     /// </summary>
-    public partial class BeatmapAttributesDisplay : ModFooterInformationDisplay, IHasCustomTooltip
+    public partial class BeatmapAttributesDisplay : ModFooterInformationDisplay, IHasCustomTooltip<AdjustedAttributesTooltip.Data?>
     {
         private StarRatingDisplay starRatingDisplay = null!;
         private BPMDisplay bpmDisplay = null!;
@@ -57,11 +57,9 @@ namespace osu.Game.Overlays.Mods
         private CancellationTokenSource? cancellationSource;
         private IBindable<StarDifficulty?> starDifficulty = null!;
 
-        private AdjustedAttributesTooltip rateAdjustTooltip = null!;
+        public ITooltip<AdjustedAttributesTooltip.Data?> GetCustomTooltip() => new AdjustedAttributesTooltip();
 
-        public ITooltip GetCustomTooltip() => rateAdjustTooltip;
-
-        public object TooltipContent => this;
+        public AdjustedAttributesTooltip.Data? TooltipContent { get; private set; }
 
         private const float transition_duration = 250;
 
@@ -70,8 +68,6 @@ namespace osu.Game.Overlays.Mods
         {
             const float shear = ShearedOverlayContainer.SHEAR;
 
-            rateAdjustTooltip = new AdjustedAttributesTooltip();
-
             LeftContent.AddRange(new Drawable[]
             {
                 starRatingDisplay = new StarRatingDisplay(default, animated: true)
@@ -182,7 +178,7 @@ namespace osu.Game.Overlays.Mods
             Ruleset ruleset = gameRuleset.Value.CreateInstance();
             BeatmapDifficulty adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
 
-            rateAdjustTooltip.UpdateAttributes(originalDifficulty, adjustedDifficulty);
+            TooltipContent = new AdjustedAttributesTooltip.Data(originalDifficulty, adjustedDifficulty);
 
             approachRateDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.ApproachRate, adjustedDifficulty.ApproachRate);
             overallDifficultyDisplay.AdjustType.Value = VerticalAttributeDisplay.CalculateEffect(originalDifficulty.OverallDifficulty, adjustedDifficulty.OverallDifficulty);
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index f56e84abce..ee805c2d12 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -30,7 +30,7 @@ using osu.Game.Overlays.Mods;
 
 namespace osu.Game.Screens.Select.Details
 {
-    public partial class AdvancedStats : Container, IHasCustomTooltip
+    public partial class AdvancedStats : Container, IHasCustomTooltip<AdjustedAttributesTooltip.Data>
     {
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
@@ -46,9 +46,8 @@ namespace osu.Game.Screens.Select.Details
         protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate;
         private readonly StatisticRow starDifficulty;
 
-        private AdjustedAttributesTooltip rateAdjustTooltip;
-        public ITooltip GetCustomTooltip() => rateAdjustTooltip;
-        public object TooltipContent => this;
+        public ITooltip<AdjustedAttributesTooltip.Data> GetCustomTooltip() => new AdjustedAttributesTooltip();
+        public AdjustedAttributesTooltip.Data TooltipContent { get; private set; }
 
         private IBeatmapInfo beatmapInfo;
 
@@ -86,7 +85,6 @@ namespace osu.Game.Screens.Select.Details
         private void load(OsuColour colours)
         {
             starDifficulty.AccentColour = colours.Yellow;
-            rateAdjustTooltip = new AdjustedAttributesTooltip();
         }
 
         protected override void LoadComplete()
@@ -144,7 +142,7 @@ namespace osu.Game.Screens.Select.Details
 
                     adjustedDifficulty = ruleset.CreateInstance().GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
 
-                    rateAdjustTooltip.UpdateAttributes(originalDifficulty, adjustedDifficulty);
+                    TooltipContent = new AdjustedAttributesTooltip.Data(originalDifficulty, adjustedDifficulty);
                 }
             }
 

From 555559c5c12010122798086b6419b51442b86ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 20:41:07 +0100
Subject: [PATCH 1966/2296] Add testing for
 `GetRateAdjustedDisplayDifficulty()` implementations

---
 .../CatchRateAdjustedDisplayDifficultyTest.cs | 52 +++++++++++++++
 .../OsuRateAdjustedDisplayDifficultyTest.cs   | 65 +++++++++++++++++++
 .../TaikoRateAdjustedDisplayDifficultyTest.cs | 52 +++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/CatchRateAdjustedDisplayDifficultyTest.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/OsuRateAdjustedDisplayDifficultyTest.cs
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TaikoRateAdjustedDisplayDifficultyTest.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchRateAdjustedDisplayDifficultyTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchRateAdjustedDisplayDifficultyTest.cs
new file mode 100644
index 0000000000..f77ec64df3
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/CatchRateAdjustedDisplayDifficultyTest.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class CatchRateAdjustedDisplayDifficultyTest
+    {
+        private static IEnumerable<float> difficultyValuesToTest()
+        {
+            for (float i = 0; i <= 10; i += 0.5f)
+                yield return i;
+        }
+
+        [TestCaseSource(nameof(difficultyValuesToTest))]
+        public void TestApproachRateIsUnchangedWithRateEqualToOne(float originalApproachRate)
+        {
+            var ruleset = new CatchRuleset();
+            var difficulty = new BeatmapDifficulty { ApproachRate = originalApproachRate };
+
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 1);
+
+            Assert.That(adjustedDifficulty.ApproachRate, Is.EqualTo(originalApproachRate));
+        }
+
+        [Test]
+        public void TestRateBelowOne()
+        {
+            var ruleset = new CatchRuleset();
+            var difficulty = new BeatmapDifficulty();
+
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 0.75);
+
+            Assert.That(adjustedDifficulty.ApproachRate, Is.EqualTo(1.67).Within(0.01));
+        }
+
+        [Test]
+        public void TestRateAboveOne()
+        {
+            var ruleset = new CatchRuleset();
+            var difficulty = new BeatmapDifficulty();
+
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 1.5);
+
+            Assert.That(adjustedDifficulty.ApproachRate, Is.EqualTo(7.67).Within(0.01));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuRateAdjustedDisplayDifficultyTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuRateAdjustedDisplayDifficultyTest.cs
new file mode 100644
index 0000000000..aa903205c8
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/OsuRateAdjustedDisplayDifficultyTest.cs
@@ -0,0 +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.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public class OsuRateAdjustedDisplayDifficultyTest
+    {
+        private static IEnumerable<float> difficultyValuesToTest()
+        {
+            for (float i = 0; i <= 10; i += 0.5f)
+                yield return i;
+        }
+
+        [TestCaseSource(nameof(difficultyValuesToTest))]
+        public void TestApproachRateIsUnchangedWithRateEqualToOne(float originalApproachRate)
+        {
+            var ruleset = new OsuRuleset();
+            var difficulty = new BeatmapDifficulty { ApproachRate = originalApproachRate };
+
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 1);
+
+            Assert.That(adjustedDifficulty.ApproachRate, Is.EqualTo(originalApproachRate));
+        }
+
+        [TestCaseSource(nameof(difficultyValuesToTest))]
+        public void TestOverallDifficultyIsUnchangedWithRateEqualToOne(float originalOverallDifficulty)
+        {
+            var ruleset = new OsuRuleset();
+            var difficulty = new BeatmapDifficulty { OverallDifficulty = originalOverallDifficulty };
+
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 1);
+
+            Assert.That(adjustedDifficulty.OverallDifficulty, Is.EqualTo(originalOverallDifficulty));
+        }
+
+        [Test]
+        public void TestRateBelowOne()
+        {
+            var ruleset = new OsuRuleset();
+            var difficulty = new BeatmapDifficulty();
+
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 0.75);
+
+            Assert.That(adjustedDifficulty.ApproachRate, Is.EqualTo(1.67).Within(0.01));
+            Assert.That(adjustedDifficulty.OverallDifficulty, Is.EqualTo(2.22).Within(0.01));
+        }
+
+        [Test]
+        public void TestRateAboveOne()
+        {
+            var ruleset = new OsuRuleset();
+            var difficulty = new BeatmapDifficulty();
+
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 1.5);
+
+            Assert.That(adjustedDifficulty.ApproachRate, Is.EqualTo(7.67).Within(0.01));
+            Assert.That(adjustedDifficulty.OverallDifficulty, Is.EqualTo(7.77).Within(0.01));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoRateAdjustedDisplayDifficultyTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoRateAdjustedDisplayDifficultyTest.cs
new file mode 100644
index 0000000000..4ab3f502ad
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoRateAdjustedDisplayDifficultyTest.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    [TestFixture]
+    public class TaikoRateAdjustedDisplayDifficultyTest
+    {
+        private static IEnumerable<float> difficultyValuesToTest()
+        {
+            for (float i = 0; i <= 10; i += 0.5f)
+                yield return i;
+        }
+
+        [TestCaseSource(nameof(difficultyValuesToTest))]
+        public void TestOverallDifficultyIsUnchangedWithRateEqualToOne(float originalOverallDifficulty)
+        {
+            var ruleset = new TaikoRuleset();
+            var difficulty = new BeatmapDifficulty { OverallDifficulty = originalOverallDifficulty };
+
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 1);
+
+            Assert.That(adjustedDifficulty.OverallDifficulty, Is.EqualTo(originalOverallDifficulty));
+        }
+
+        [Test]
+        public void TestRateBelowOne()
+        {
+            var ruleset = new TaikoRuleset();
+            var difficulty = new BeatmapDifficulty();
+
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 0.75);
+
+            Assert.That(adjustedDifficulty.OverallDifficulty, Is.EqualTo(1.11).Within(0.01));
+        }
+
+        [Test]
+        public void TestRateAboveOne()
+        {
+            var ruleset = new TaikoRuleset();
+            var difficulty = new BeatmapDifficulty();
+
+            var adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(difficulty, 1.5);
+
+            Assert.That(adjustedDifficulty.OverallDifficulty, Is.EqualTo(8.89).Within(0.01));
+        }
+    }
+}

From 24e31f7d9199ea89c422447c228579d7779d346a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 19:00:00 +0100
Subject: [PATCH 1967/2296] Implement inverse of
 `IBeatmapDifficultyInfo.DifficultyRange()`

---
 osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index e7a3d87d0a..07b966ca44 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
@@ -92,5 +92,21 @@ namespace osu.Game.Beatmaps
         /// <returns>Value to which the difficulty value maps in the specified range.</returns>
         static double DifficultyRange(double difficulty, (double od0, double od5, double od10) range)
             => DifficultyRange(difficulty, range.od0, range.od5, range.od10);
+
+        /// <summary>
+        /// Inverse function to <see cref="DifficultyRange(double,double,double,double)"/>.
+        /// Maps a value returned by the function above back to the difficulty that produced it.
+        /// </summary>
+        /// <param name="difficultyValue">The difficulty-dependent value to be unmapped.</param>
+        /// <param name="min">Minimum of the resulting range which will be achieved by a difficulty value of 0.</param>
+        /// <param name="mid">Midpoint of the resulting range which will be achieved by a difficulty value of 5.</param>
+        /// <param name="max">Maximum of the resulting range which will be achieved by a difficulty value of 10.</param>
+        /// <returns>Value to which the difficulty value maps in the specified range.</returns>
+        static double InverseDifficultyRange(double difficultyValue, double min, double mid, double max)
+        {
+            return difficultyValue >= mid
+                ? (difficultyValue - mid) / (max - mid) * 5 + 5
+                : (difficultyValue - mid) / (mid - min) * 5 + 5;
+        }
     }
 }

From fd1c72bf747cefdc9152008610550d28b24631d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 19:16:08 +0100
Subject: [PATCH 1968/2296] Use
 `IBeatmapDifficultyInfo.(Inverse)DifficultyRange()` instead of local
 reimplementations

Also adds explicit references to places from where the magic constants
were lifted.
---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 10 ++++------
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 18 +++++++-----------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs |  9 ++++-----
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index bcb28328f0..9b9840f71b 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty;
 using osu.Game.Rulesets.Catch.Edit;
 using osu.Game.Rulesets.Catch.Mods;
+using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Catch.Scoring;
 using osu.Game.Rulesets.Catch.Skinning.Argon;
@@ -236,17 +237,14 @@ namespace osu.Game.Rulesets.Catch
             };
         }
 
+        /// <seealso cref="CatchHitObject.ApplyDefaultsToSelf"/>
         public override BeatmapDifficulty GetRateAdjustedDisplayDifficulty(IBeatmapDifficultyInfo difficulty, double rate)
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
-            double preempt = adjustedDifficulty.ApproachRate < 6
-                ? 1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5
-                : 1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5;
-
+            double preempt = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.ApproachRate, 1800, 1200, 450);
             preempt /= rate;
-
-            adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5);
+            adjustedDifficulty.ApproachRate = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(preempt, 1800, 1200, 450);
 
             return adjustedDifficulty;
         }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 5355743a50..744f57eae9 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -332,23 +332,19 @@ namespace osu.Game.Rulesets.Osu
 
         public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
 
+        /// <seealso cref="OsuHitObject.ApplyDefaultsToSelf"/>
+        /// <seealso cref="OsuHitWindows"/>
         public override BeatmapDifficulty GetRateAdjustedDisplayDifficulty(IBeatmapDifficultyInfo difficulty, double rate)
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
-            double preempt = adjustedDifficulty.ApproachRate < 5
-                ? 1200.0 + 600.0 * (5 - adjustedDifficulty.ApproachRate) / 5
-                : 1200.0 - 750.0 * (adjustedDifficulty.ApproachRate - 5) / 5;
-
+            double preempt = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.ApproachRate, 1800, 1200, 450);
             preempt /= rate;
+            adjustedDifficulty.ApproachRate = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(preempt, 1800, 1200, 450);
 
-            adjustedDifficulty.ApproachRate = (float)(preempt > 1200 ? (1800 - preempt) / 120 : (1200 - preempt) / 150 + 5);
-
-            double hitwindow = 80.0 - 6 * adjustedDifficulty.OverallDifficulty;
-
-            hitwindow /= rate;
-
-            adjustedDifficulty.OverallDifficulty = (float)(80.0 - hitwindow) / 6;
+            double greatHitWindow = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.OverallDifficulty, 80, 50, 20);
+            greatHitWindow /= rate;
+            adjustedDifficulty.OverallDifficulty = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(greatHitWindow, 80, 50, 20);
 
             return adjustedDifficulty;
         }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 94136a11d3..e97f132e7a 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -265,15 +265,14 @@ namespace osu.Game.Rulesets.Taiko
             };
         }
 
+        /// <seealso cref="TaikoHitWindows"/>
         public override BeatmapDifficulty GetRateAdjustedDisplayDifficulty(IBeatmapDifficultyInfo difficulty, double rate)
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
-            double hitWindow = 35.0 - 15.0 * (adjustedDifficulty.OverallDifficulty - 5) / 5;
-
-            hitWindow /= rate;
-
-            adjustedDifficulty.OverallDifficulty = (float)(5 * (35 - hitWindow) / 15 + 5);
+            double greatHitWindow = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.OverallDifficulty, 50, 35, 20);
+            greatHitWindow /= rate;
+            adjustedDifficulty.OverallDifficulty = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(greatHitWindow, 50, 35, 20);
 
             return adjustedDifficulty;
         }

From c0e68df20fb7d90bcd398e69a0a2f42dbfa72b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 19:30:56 +0100
Subject: [PATCH 1969/2296] Fix `InverseDifficultyRange()` not working
 correctly in both directions

---
 osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
index 07b966ca44..48f6564084 100644
--- a/osu.Game/Beatmaps/IBeatmapDifficultyInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapDifficultyInfo.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;
+
 namespace osu.Game.Beatmaps
 {
     /// <summary>
@@ -98,15 +100,15 @@ namespace osu.Game.Beatmaps
         /// Maps a value returned by the function above back to the difficulty that produced it.
         /// </summary>
         /// <param name="difficultyValue">The difficulty-dependent value to be unmapped.</param>
-        /// <param name="min">Minimum of the resulting range which will be achieved by a difficulty value of 0.</param>
-        /// <param name="mid">Midpoint of the resulting range which will be achieved by a difficulty value of 5.</param>
-        /// <param name="max">Maximum of the resulting range which will be achieved by a difficulty value of 10.</param>
+        /// <param name="diff0">Minimum of the resulting range which will be achieved by a difficulty value of 0.</param>
+        /// <param name="diff5">Midpoint of the resulting range which will be achieved by a difficulty value of 5.</param>
+        /// <param name="diff10">Maximum of the resulting range which will be achieved by a difficulty value of 10.</param>
         /// <returns>Value to which the difficulty value maps in the specified range.</returns>
-        static double InverseDifficultyRange(double difficultyValue, double min, double mid, double max)
+        static double InverseDifficultyRange(double difficultyValue, double diff0, double diff5, double diff10)
         {
-            return difficultyValue >= mid
-                ? (difficultyValue - mid) / (max - mid) * 5 + 5
-                : (difficultyValue - mid) / (mid - min) * 5 + 5;
+            return Math.Sign(difficultyValue - diff5) == Math.Sign(diff10 - diff5)
+                ? (difficultyValue - diff5) / (diff10 - diff5) * 5 + 5
+                : (difficultyValue - diff5) / (diff5 - diff0) * 5 + 5;
         }
     }
 }

From 605269f65feea2657e5d6fae48d0ae99b5469b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 19:54:23 +0100
Subject: [PATCH 1970/2296] Extract preempt durations to shared constants

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs         |  4 ++--
 .../Objects/CatchHitObject.cs                   | 17 ++++++++++++++++-
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs   | 12 +++++++++++-
 osu.Game.Rulesets.Osu/OsuRuleset.cs             |  4 ++--
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 9b9840f71b..72d1a161dd 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -242,9 +242,9 @@ namespace osu.Game.Rulesets.Catch
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
-            double preempt = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.ApproachRate, 1800, 1200, 450);
+            double preempt = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.ApproachRate, CatchHitObject.PREEMPT_MAX, CatchHitObject.PREEMPT_MID, CatchHitObject.PREEMPT_MIN);
             preempt /= rate;
-            adjustedDifficulty.ApproachRate = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(preempt, 1800, 1200, 450);
+            adjustedDifficulty.ApproachRate = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(preempt, CatchHitObject.PREEMPT_MAX, CatchHitObject.PREEMPT_MID, CatchHitObject.PREEMPT_MIN);
 
             return adjustedDifficulty;
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 17ff8afb87..52c42dfddb 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            TimePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
+            TimePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, PREEMPT_MAX, PREEMPT_MID, PREEMPT_MIN);
 
             Scale = LegacyRulesetExtensions.CalculateScaleFromCircleSize(difficulty.CircleSize);
         }
@@ -189,6 +189,21 @@ namespace osu.Game.Rulesets.Catch.Objects
         // The half of the height of the osu! playfield.
         public const float DEFAULT_LEGACY_CONVERT_Y = 192;
 
+        /// <summary>
+        /// Minimum preempt time at AR=10.
+        /// </summary>
+        public const double PREEMPT_MIN = 450;
+
+        /// <summary>
+        /// Median preempt time at AR=5.
+        /// </summary>
+        public const double PREEMPT_MID = 1200;
+
+        /// <summary>
+        /// Maximum preempt time at AR=0.
+        /// </summary>
+        public const double PREEMPT_MAX = 1800;
+
         /// <summary>
         /// The Y position of the hit object is not used in the normal osu!catch gameplay.
         /// It is preserved to maximize the backward compatibility with the legacy editor, in which the mappers use the Y position to organize the patterns.
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 21f7b4b22d..74631400ca 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -37,6 +37,16 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public const double PREEMPT_MIN = 450;
 
+        /// <summary>
+        /// Median preempt time at AR=5.
+        /// </summary>
+        public const double PREEMPT_MID = 1200;
+
+        /// <summary>
+        /// Maximum preempt time at AR=0.
+        /// </summary>
+        public const double PREEMPT_MAX = 1800;
+
         public double TimePreempt = 600;
         public double TimeFadeIn = 400;
 
@@ -148,7 +158,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            TimePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, 1800, 1200, PREEMPT_MIN);
+            TimePreempt = (float)IBeatmapDifficultyInfo.DifficultyRange(difficulty.ApproachRate, PREEMPT_MAX, PREEMPT_MID, PREEMPT_MIN);
 
             // Preempt time can go below 450ms. Normally, this is achieved via the DT mod which uniformly speeds up all animations game wide regardless of AR.
             // This uniform speedup is hard to match 1:1, however we can at least make AR>10 (via mods) feel good by extending the upper linear function above.
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 744f57eae9..5fe6e76e39 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -338,9 +338,9 @@ namespace osu.Game.Rulesets.Osu
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
-            double preempt = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.ApproachRate, 1800, 1200, 450);
+            double preempt = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.ApproachRate, OsuHitObject.PREEMPT_MAX, OsuHitObject.PREEMPT_MID, OsuHitObject.PREEMPT_MIN);
             preempt /= rate;
-            adjustedDifficulty.ApproachRate = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(preempt, 1800, 1200, 450);
+            adjustedDifficulty.ApproachRate = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(preempt, OsuHitObject.PREEMPT_MAX, OsuHitObject.PREEMPT_MID, OsuHitObject.PREEMPT_MIN);
 
             double greatHitWindow = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.OverallDifficulty, 80, 50, 20);
             greatHitWindow /= rate;

From 0f4d054bfef007601f13d5695749c37e1898ea53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 14 Dec 2023 20:02:02 +0100
Subject: [PATCH 1971/2296] Use `HitWindows` data directly for computing
 effective OD

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs                | 5 +++--
 osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs     | 4 ++--
 osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs | 4 ++--
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs            | 5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 5fe6e76e39..35cbfa3790 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -342,9 +342,10 @@ namespace osu.Game.Rulesets.Osu
             preempt /= rate;
             adjustedDifficulty.ApproachRate = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(preempt, OsuHitObject.PREEMPT_MAX, OsuHitObject.PREEMPT_MID, OsuHitObject.PREEMPT_MIN);
 
-            double greatHitWindow = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.OverallDifficulty, 80, 50, 20);
+            var greatHitWindowRange = OsuHitWindows.OSU_RANGES.Single(range => range.Result == HitResult.Great);
+            double greatHitWindow = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.OverallDifficulty, greatHitWindowRange.Min, greatHitWindowRange.Average, greatHitWindowRange.Max);
             greatHitWindow /= rate;
-            adjustedDifficulty.OverallDifficulty = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(greatHitWindow, 80, 50, 20);
+            adjustedDifficulty.OverallDifficulty = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(greatHitWindow, greatHitWindowRange.Min, greatHitWindowRange.Average, greatHitWindowRange.Max);
 
             return adjustedDifficulty;
         }
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
index 6f55e1790f..fd86e0eeda 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
         /// </summary>
         public const double MISS_WINDOW = 400;
 
-        private static readonly DifficultyRange[] osu_ranges =
+        internal static readonly DifficultyRange[] OSU_RANGES =
         {
             new DifficultyRange(HitResult.Great, 80, 50, 20),
             new DifficultyRange(HitResult.Ok, 140, 100, 60),
@@ -34,6 +34,6 @@ namespace osu.Game.Rulesets.Osu.Scoring
             return false;
         }
 
-        protected override DifficultyRange[] GetRanges() => osu_ranges;
+        protected override DifficultyRange[] GetRanges() => OSU_RANGES;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs
index cf806c0c97..b44ef8ee93 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoHitWindows.cs
@@ -7,7 +7,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring
 {
     public class TaikoHitWindows : HitWindows
     {
-        private static readonly DifficultyRange[] taiko_ranges =
+        internal static readonly DifficultyRange[] TAIKO_RANGES =
         {
             new DifficultyRange(HitResult.Great, 50, 35, 20),
             new DifficultyRange(HitResult.Ok, 120, 80, 50),
@@ -27,6 +27,6 @@ namespace osu.Game.Rulesets.Taiko.Scoring
             return false;
         }
 
-        protected override DifficultyRange[] GetRanges() => taiko_ranges;
+        protected override DifficultyRange[] GetRanges() => TAIKO_RANGES;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index e97f132e7a..9d34a34fce 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -270,9 +270,10 @@ namespace osu.Game.Rulesets.Taiko
         {
             BeatmapDifficulty adjustedDifficulty = new BeatmapDifficulty(difficulty);
 
-            double greatHitWindow = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.OverallDifficulty, 50, 35, 20);
+            var greatHitWindowRange = TaikoHitWindows.TAIKO_RANGES.Single(range => range.Result == HitResult.Great);
+            double greatHitWindow = IBeatmapDifficultyInfo.DifficultyRange(adjustedDifficulty.OverallDifficulty, greatHitWindowRange.Min, greatHitWindowRange.Average, greatHitWindowRange.Max);
             greatHitWindow /= rate;
-            adjustedDifficulty.OverallDifficulty = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(greatHitWindow, 50, 35, 20);
+            adjustedDifficulty.OverallDifficulty = (float)IBeatmapDifficultyInfo.InverseDifficultyRange(greatHitWindow, greatHitWindowRange.Min, greatHitWindowRange.Average, greatHitWindowRange.Max);
 
             return adjustedDifficulty;
         }

From fbef40bb1f083dad5146e8d32f8ca879b06f3f29 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Dec 2023 11:01:13 +0900
Subject: [PATCH 1972/2296] Reduce some allocations in SongSelect in the mania
 ruleset

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index cda95a9d29..3c64df656d 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -245,6 +245,9 @@ namespace osu.Game.Screens.Select.Carousel
 
         private void updateKeyCount()
         {
+            if (Item?.State.Value == CarouselItemState.Collapsed)
+                return;
+
             if (ruleset.Value.OnlineID == 3)
             {
                 // Account for mania differences locally for now.

From 27296c59defef2897879ccfe2cee52c9e203e747 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Dec 2023 11:26:10 +0900
Subject: [PATCH 1973/2296] Show back button when spectating

Avoids getting stuck at some screens.
It's a bit ugly having the back button visible like this,
but is the best approach we have for now.
---
 osu.Game/Screens/Play/SpectatorPlayer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index d1404ac184..2faead0ee1 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Play
 
         private readonly Score score;
 
+        public override bool AllowBackButton => true;
+
         protected override bool CheckModsAllowFailure()
         {
             if (!allowFail)

From 599fdb0128d88cbc44b8147cd5058b83528f2287 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 14 Dec 2023 11:51:50 +0900
Subject: [PATCH 1974/2296] Add lenience for late-hit of slider heads

---
 .../TestSceneSliderLateHitJudgement.cs        | 419 ++++++++++++++++++
 .../Objects/Drawables/DrawableSlider.cs       |   2 +
 .../Objects/Drawables/DrawableSliderBall.cs   |  57 +--
 .../Objects/Drawables/DrawableSliderHead.cs   |  48 ++
 .../Objects/Drawables/DrawableSliderRepeat.cs |  26 +-
 .../Objects/Drawables/DrawableSliderTail.cs   |  26 +-
 .../Objects/Drawables/DrawableSliderTick.cs   |  28 +-
 7 files changed, 565 insertions(+), 41 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
new file mode 100644
index 0000000000..4f32a6fe9f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
@@ -0,0 +1,419 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public partial class TestSceneSliderLateHitJudgement : RateAdjustedBeatmapTestScene
+    {
+        // Note: In the following tests, the terminology "in range of the follow circle" is used as meaning
+        // the equivalent of "in range of the follow circle as if it were in its expanded state".
+
+        private const double time_slider_start = 1000;
+        private const double time_slider_end = 1500;
+
+        private static readonly Vector2 slider_start_position = new Vector2(256 - slider_path_length / 2, 192);
+        private static readonly Vector2 slider_end_position = new Vector2(256 + slider_path_length / 2, 192);
+
+        private ScoreAccessibleReplayPlayer currentPlayer = null!;
+
+        private const float slider_path_length = 200;
+
+        private readonly List<JudgementResult> judgementResults = new List<JudgementResult>();
+
+        /// <summary>
+        /// If the head circle is hit and the mouse is in range of the follow circle,
+        /// then tracking should be enabled.
+        /// </summary>
+        [Test]
+        public void TestHitLateInRangeTracks()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 100, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 100, slider_end_position, OsuAction.LeftButton),
+            });
+
+            assertHeadJudgement(HitResult.Ok);
+            assertTailJudgement(HitResult.LargeTickHit);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
+        /// <summary>
+        /// If the head circle is hit and the mouse is NOT in range of the follow circle,
+        /// then tracking should NOT be enabled.
+        /// </summary>
+        [Test]
+        public void TestHitLateOutOfRangeDoesNotTrack()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 100, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 100, slider_end_position, OsuAction.LeftButton),
+            }, s =>
+            {
+                s.SliderVelocityMultiplier = 2;
+            });
+
+            assertHeadJudgement(HitResult.Ok);
+            assertTailJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
+        /// <summary>
+        /// If the head circle is hit late and the mouse is in range of the follow circle,
+        /// then all ticks that the follow circle has passed through should be hit.
+        /// </summary>
+        [Test]
+        public void TestHitLateInRangeHitsTicks()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 150, slider_end_position, OsuAction.LeftButton),
+            }, s =>
+            {
+                s.TickDistanceMultiplier = 0.2f;
+            });
+
+            assertHeadJudgement(HitResult.Meh);
+            assertTickJudgement(0, HitResult.LargeTickHit);
+            assertTickJudgement(1, HitResult.LargeTickHit);
+            assertTickJudgement(2, HitResult.LargeTickHit);
+            assertTickJudgement(3, HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.LargeTickHit);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
+        /// <summary>
+        /// If the head circle is hit late and the mouse is NOT in range of the follow circle,
+        /// then all ticks that the follow circle has passed through should NOT be hit.
+        /// </summary>
+        [Test]
+        public void TestHitLateOutOfRangeDoesNotHitTicks()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 150, slider_end_position, OsuAction.LeftButton),
+            }, s =>
+            {
+                s.SliderVelocityMultiplier = 2;
+                s.TickDistanceMultiplier = 0.2f;
+            });
+
+            assertHeadJudgement(HitResult.Meh);
+            assertTickJudgement(0, HitResult.LargeTickMiss);
+            assertTickJudgement(1, HitResult.LargeTickMiss);
+            assertTailJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
+        /// <summary>
+        /// If the head circle is pressed after it's missed and the mouse is in range of the follow circle,
+        /// then tracking should NOT be enabled.
+        /// </summary>
+        [Test]
+        public void TestMissHeadInRangeDoesNotTrack()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 151, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 151, slider_end_position, OsuAction.LeftButton),
+            }, s =>
+            {
+                s.TickDistanceMultiplier = 0.2f;
+            });
+
+            assertHeadJudgement(HitResult.Miss);
+            assertTickJudgement(0, HitResult.LargeTickMiss);
+            assertTickJudgement(1, HitResult.LargeTickMiss);
+            assertTickJudgement(2, HitResult.LargeTickMiss);
+            assertTickJudgement(3, HitResult.LargeTickMiss);
+            assertTailJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreMiss);
+        }
+
+        /// <summary>
+        /// If the head circle is hit late but after the completion of the slider and the mouse is in range of the follow circle,
+        /// then all nested objects (ticks/repeats/tail) should be hit.
+        /// </summary>
+        [Test]
+        public void TestHitLateShortSliderHitsAll()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 150, slider_start_position, OsuAction.LeftButton),
+            }, s =>
+            {
+                s.Path = new SliderPath(PathType.LINEAR, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(20, 0),
+                }, 20);
+
+                s.TickDistanceMultiplier = 0.01f;
+                s.RepeatCount = 1;
+            });
+
+            assertHeadJudgement(HitResult.Meh);
+            assertAllTickJudgements(HitResult.LargeTickHit);
+            assertRepeatJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.LargeTickHit);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
+        /// <summary>
+        /// If the head circle is hit late and the mouse is in range of the follow circle,
+        /// then all the repeats that the mouse has passed through should be hit.
+        /// </summary>
+        [Test]
+        public void TestHitLateInRangeHitsRepeat()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 150, slider_start_position, OsuAction.LeftButton),
+            }, s =>
+            {
+                s.Path = new SliderPath(PathType.LINEAR, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(50, 0),
+                }, 50);
+
+                s.RepeatCount = 1;
+            });
+
+            assertHeadJudgement(HitResult.Meh);
+            assertRepeatJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.LargeTickHit);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
+        /// <summary>
+        /// If the head circle is hit and the mouse is in range of the follow circle,
+        /// then only the ticks that were in range of the follow circle at the head should be hit.
+        /// If any hitobject was outside the follow range, ALL hitobjects after that point should be missed.
+        /// </summary>
+        [Test]
+        public void TestHitLateInRangeDoesNotHitAfterAnyOutOfRange()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 150, slider_start_position, OsuAction.LeftButton),
+            }, s =>
+            {
+                s.Path = new SliderPath(PathType.PERFECT_CURVE, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(70, 70),
+                    new Vector2(20, 0),
+                });
+
+                s.TickDistanceMultiplier = 0.03f;
+                s.SliderVelocityMultiplier = 6f;
+            });
+
+            assertHeadJudgement(HitResult.Meh);
+
+            // The first few ticks that are in the follow range of the head should be hit.
+            assertTickJudgement(0, HitResult.LargeTickHit); // This tick is hidden under the slider head :(
+            assertTickJudgement(1, HitResult.LargeTickHit);
+            assertTickJudgement(2, HitResult.LargeTickHit);
+
+            // Every other tick should be missed
+            assertTickJudgement(3, HitResult.LargeTickMiss);
+            assertTickJudgement(4, HitResult.LargeTickMiss);
+            assertTickJudgement(5, HitResult.LargeTickMiss);
+            assertTickJudgement(6, HitResult.LargeTickMiss);
+            assertTickJudgement(7, HitResult.LargeTickMiss);
+            assertTickJudgement(8, HitResult.LargeTickMiss);
+            assertTickJudgement(9, HitResult.LargeTickMiss);
+            assertTickJudgement(10, HitResult.LargeTickMiss);
+
+            // In particular, these three are in the follow range of the head, but should not be hit
+            // because the slider was at some point outside the follow range of the head.
+            assertTickJudgement(11, HitResult.LargeTickMiss);
+            assertTickJudgement(12, HitResult.LargeTickMiss);
+
+            // And the tail should be hit because of its leniency.
+            assertTailJudgement(HitResult.LargeTickHit);
+
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
+        /// <summary>
+        /// If the head circle is hit and the mouse is in range of the follow circle,
+        /// then a tick outside the range of the follow circle from the head should not be hit.
+        /// </summary>
+        [Test]
+        public void TestHitLateInRangeDoesNotHitOutOfRange()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 150, slider_start_position, OsuAction.LeftButton),
+            }, s =>
+            {
+                s.Path = new SliderPath(PathType.PERFECT_CURVE, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(50, 50),
+                    new Vector2(20, 0),
+                });
+
+                s.TickDistanceMultiplier = 0.3f;
+                s.SliderVelocityMultiplier = 3;
+            });
+
+            assertHeadJudgement(HitResult.Meh);
+            assertTickJudgement(0, HitResult.LargeTickMiss);
+            assertTailJudgement(HitResult.LargeTickHit);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
+        private void assertHeadJudgement(HitResult result)
+        {
+            AddAssert(
+                "check head result",
+                () => judgementResults.SingleOrDefault(r => r.HitObject is SliderHeadCircle)?.Type,
+                () => Is.EqualTo(result));
+        }
+
+        private void assertTickJudgement(int index, HitResult result)
+        {
+            AddAssert(
+                $"check tick({index}) result",
+                () => judgementResults.Where(r => r.HitObject is SliderTick).ElementAtOrDefault(index)?.Type,
+                () => Is.EqualTo(result));
+        }
+
+        private void assertAllTickJudgements(HitResult result)
+        {
+            AddAssert(
+                "check all tick results",
+                () => judgementResults.Where(r => r.HitObject is SliderTick).Select(t => t.Type),
+                () => Has.All.EqualTo(result));
+        }
+
+        private void assertRepeatJudgement(HitResult result)
+        {
+            AddAssert(
+                "check repeat result",
+                () => judgementResults.SingleOrDefault(r => r.HitObject is SliderRepeat)?.Type,
+                () => Is.EqualTo(result));
+        }
+
+        private void assertTailJudgement(HitResult result)
+        {
+            AddAssert(
+                "check tail result",
+                () => judgementResults.SingleOrDefault(r => r.HitObject is SliderTailCircle)?.Type,
+                () => Is.EqualTo(result));
+        }
+
+        private void assertSliderJudgement(HitResult result)
+        {
+            AddAssert(
+                "check slider result",
+                () => judgementResults.SingleOrDefault(r => r.HitObject is Slider)?.Type,
+                () => Is.EqualTo(result));
+        }
+
+        private Vector2 computePositionFromTime(double time)
+        {
+            Vector2 dist = slider_end_position - slider_start_position;
+            double t = (time - time_slider_start) / (time_slider_end - time_slider_start);
+            return slider_start_position + dist * (float)t;
+        }
+
+        private void performTest(List<ReplayFrame> frames, Action<Slider>? adjustSliderFunc = null, bool classic = false)
+        {
+            Slider slider = new Slider
+            {
+                StartTime = time_slider_start,
+                Position = new Vector2(256 - slider_path_length / 2, 192),
+                TickDistanceMultiplier = 3,
+                ClassicSliderBehaviour = classic,
+                Path = new SliderPath(PathType.LINEAR, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(slider_path_length, 0),
+                }, slider_path_length),
+            };
+
+            adjustSliderFunc?.Invoke(slider);
+
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
+                {
+                    HitObjects = { slider },
+                    BeatmapInfo =
+                    {
+                        Difficulty = new BeatmapDifficulty
+                        {
+                            SliderMultiplier = 4,
+                            SliderTickRate = 3
+                        },
+                        Ruleset = new OsuRuleset().RulesetInfo,
+                    }
+                });
+
+                var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
+
+                p.OnLoadComplete += _ =>
+                {
+                    p.ScoreProcessor.NewJudgement += result =>
+                    {
+                        if (currentPlayer == p) judgementResults.Add(result);
+                    };
+                };
+
+                LoadScreen(currentPlayer = p);
+                judgementResults.Clear();
+            });
+
+            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
+            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
+        }
+
+        private partial class ScoreAccessibleReplayPlayer : ReplayPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            protected override bool PauseOnFocusLost => false;
+
+            public ScoreAccessibleReplayPlayer(Score score)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index a053c99a53..1dd6f108f5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public DrawableSliderHead HeadCircle => headContainer.Child;
         public DrawableSliderTail TailCircle => tailContainer.Child;
+        public IEnumerable<DrawableSliderTick> Ticks => tickContainer.Children;
+        public IEnumerable<DrawableSliderRepeat> Repeats => repeatContainer.Children;
 
         [Cached]
         public DrawableSliderBall Ball { get; private set; }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index a1724d6fdc..764dd43c30 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -27,7 +27,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public Func<OsuAction?> GetInitialHitAction;
 
-        private Drawable followCircleReceptor;
         private DrawableSlider drawableSlider;
         private Drawable ball;
 
@@ -48,13 +47,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Anchor = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
                 },
-                followCircleReceptor = new CircularContainer
-                {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true
-                },
                 ball = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.SliderBall), _ => new DefaultSliderBall())
                 {
                     Anchor = Anchor.Centre,
@@ -86,21 +78,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.ApplyTransformsAt(time, false);
         }
 
-        private bool tracking;
-
-        public bool Tracking
-        {
-            get => tracking;
-            private set
-            {
-                if (value == tracking)
-                    return;
-
-                tracking = value;
-
-                followCircleReceptor.Scale = new Vector2(tracking ? FOLLOW_AREA : 1f);
-            }
-        }
+        public bool Tracking { get; private set; }
 
         /// <summary>
         /// If the cursor moves out of the ball's radius we still need to be able to receive positional updates to stop tracking.
@@ -129,6 +107,30 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         private readonly List<OsuAction> lastPressedActions = new List<OsuAction>();
 
+        public bool IsMouseInFollowCircleWithState(bool expanded)
+        {
+            if (lastScreenSpaceMousePosition is not Vector2 mousePos)
+                return false;
+
+            float radius = GetFollowCircleRadius(expanded);
+
+            double followProgress = Math.Clamp((Time.Current - drawableSlider.HitObject.StartTime) / drawableSlider.HitObject.Duration, 0, 1);
+            Vector2 followCirclePosition = drawableSlider.HitObject.CurvePositionAt(followProgress);
+            Vector2 mousePositionInSlider = drawableSlider.ToLocalSpace(mousePos) - drawableSlider.OriginPosition;
+
+            return (mousePositionInSlider - followCirclePosition).LengthSquared <= radius * radius;
+        }
+
+        public float GetFollowCircleRadius(bool expanded)
+        {
+            float radius = (float)drawableSlider.HitObject.Radius;
+
+            if (expanded)
+                radius *= FOLLOW_AREA;
+
+            return radius;
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -152,14 +154,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     timeToAcceptAnyKeyAfter = Time.Current;
             }
 
+            bool validInFollowArea = IsMouseInFollowCircleWithState(Tracking);
+            bool validInHeadCircle = drawableSlider.HeadCircle.IsHit
+                                     && IsMouseInFollowCircleWithState(true)
+                                     && drawableSlider.HeadCircle.Result.TimeAbsolute == Time.Current;
+
             Tracking =
                 // even in an edge case where current time has exceeded the slider's time, we may not have finished judging.
                 // we don't want to potentially update from Tracking=true to Tracking=false at this point.
                 (!drawableSlider.AllJudged || Time.Current <= drawableSlider.HitObject.GetEndTime())
                 // in valid position range
-                && lastScreenSpaceMousePosition.HasValue && followCircleReceptor.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
+                && (validInFollowArea || validInHeadCircle)
                 // valid action
-                (actions?.Any(isValidTrackingAction) ?? false);
+                && (actions?.Any(isValidTrackingAction) ?? false);
 
             lastPressedActions.Clear();
             if (actions != null)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index ff690417a8..0a104c123b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -3,10 +3,14 @@
 
 #nullable disable
 
+using System;
 using System.Diagnostics;
+using System.Linq;
 using osu.Framework.Bindables;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -61,6 +65,50 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             CheckHittable = (d, t, r) => DrawableSlider.CheckHittable?.Invoke(d, t, r) ?? ClickAction.Hit;
         }
 
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            base.CheckForResult(userTriggered, timeOffset);
+
+            if (!Judged || !Result.IsHit)
+                return;
+
+            // If the head is hit and in radius of the would-be-expanded follow circle,
+            // then hit every object that the follow circle has passed through up until the current time.
+            if (DrawableSlider.Ball.IsMouseInFollowCircleWithState(true))
+            {
+                foreach (var nested in DrawableSlider.NestedHitObjects.OfType<DrawableOsuHitObject>())
+                {
+                    if (nested.Judged)
+                        continue;
+
+                    if (!check(nested.HitObject))
+                        break;
+
+                    if (nested is DrawableSliderTick tick)
+                        tick.HitForcefully();
+
+                    if (nested is DrawableSliderRepeat repeat)
+                        repeat.HitForcefully();
+
+                    if (nested is DrawableSliderTail tail)
+                        tail.HitForcefully();
+                }
+            }
+
+            bool check(OsuHitObject h)
+            {
+                if (h.StartTime > Time.Current)
+                    return false;
+
+                float radius = DrawableSlider.Ball.GetFollowCircleRadius(true);
+
+                double objectProgress = Math.Clamp((h.StartTime - DrawableSlider.HitObject.StartTime) / DrawableSlider.HitObject.Duration, 0, 1);
+                Vector2 objectPosition = DrawableSlider.HitObject.CurvePositionAt(objectProgress);
+
+                return objectPosition.LengthSquared <= radius * radius;
+            }
+        }
+
         protected override HitResult ResultFor(double timeOffset)
         {
             Debug.Assert(HitObject != null);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index cdfd96514e..a7979bde27 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -85,17 +85,33 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Position = HitObject.Position - DrawableSlider.Position;
         }
 
+        public void HitForcefully()
+        {
+            if (Judged)
+                return;
+
+            ApplyResult(r => r.Type = r.Judgement.MaxResult);
+        }
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             // shared implementation with DrawableSliderTick.
             if (timeOffset >= 0)
             {
-                // Attempt to preserve correct ordering of judgements as best we can by forcing
-                // an un-judged head to be missed when the user has clearly skipped it.
-                //
                 // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
-                if (Tracking && !DrawableSlider.HeadCircle.Judged)
-                    DrawableSlider.HeadCircle.MissForcefully();
+                if (!DrawableSlider.HeadCircle.Judged)
+                {
+                    if (Tracking)
+                    {
+                        // Attempt to preserve correct ordering of judgements as best we can by forcing an un-judged head to be missed when the user has clearly skipped it.
+                        DrawableSlider.HeadCircle.MissForcefully();
+                    }
+                    else
+                    {
+                        // Don't judge this object as a miss before the head has been judged, to allow the head to be hit late.
+                        return;
+                    }
+                }
 
                 ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
             }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index e3ed12a648..1ffbaf11c5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -125,6 +125,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        public void HitForcefully()
+        {
+            if (Judged)
+                return;
+
+            ApplyResult(r => r.Type = r.Judgement.MaxResult);
+        }
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (userTriggered)
@@ -141,12 +149,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (timeOffset < SliderEventGenerator.TAIL_LENIENCY)
                 return;
 
-            // Attempt to preserve correct ordering of judgements as best we can by forcing
-            // an un-judged head to be missed when the user has clearly skipped it.
-            //
             // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
-            if (Tracking && !DrawableSlider.HeadCircle.Judged)
-                DrawableSlider.HeadCircle.MissForcefully();
+            if (!DrawableSlider.HeadCircle.Judged)
+            {
+                if (Tracking)
+                {
+                    // Attempt to preserve correct ordering of judgements as best we can by forcing an un-judged head to be missed when the user has clearly skipped it.
+                    DrawableSlider.HeadCircle.MissForcefully();
+                }
+                else
+                {
+                    // Don't judge this object as a miss before the head has been judged, to allow the head to be hit late.
+                    return;
+                }
+            }
 
             // The player needs to have engaged in tracking at any point after the tail leniency cutoff.
             // An actual tick miss should only occur if reaching the tick itself.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 172dca356e..b2ac8ecbda 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -73,17 +73,33 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Position = HitObject.Position - DrawableSlider.HitObject.Position;
         }
 
+        public void HitForcefully()
+        {
+            if (Judged)
+                return;
+
+            ApplyResult(r => r.Type = r.Judgement.MaxResult);
+        }
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             // shared implementation with DrawableSliderRepeat.
             if (timeOffset >= 0)
             {
-                // Attempt to preserve correct ordering of judgements as best we can by forcing
-                // an un-judged head to be missed when the user has clearly skipped it.
-                //
                 // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
-                if (Tracking && !DrawableSlider.HeadCircle.Judged)
-                    DrawableSlider.HeadCircle.MissForcefully();
+                if (!DrawableSlider.HeadCircle.Judged)
+                {
+                    if (Tracking)
+                    {
+                        // Attempt to preserve correct ordering of judgements as best we can by forcing an un-judged head to be missed when the user has clearly skipped it.
+                        DrawableSlider.HeadCircle.MissForcefully();
+                    }
+                    else
+                    {
+                        // Don't judge this object as a miss before the head has been judged, to allow the head to be hit late.
+                        return;
+                    }
+                }
 
                 ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
             }
@@ -107,7 +123,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                 case ArmedState.Miss:
                     this.FadeOut(ANIM_DURATION);
-                    this.FadeColour(Color4.Red, ANIM_DURATION / 2);
+                    this.TransformBindableTo(AccentColour, Color4.Red, 0);
                     break;
 
                 case ArmedState.Hit:

From b86f387fd30acab999ad27d38dfb31bd9a993e8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Dec 2023 15:04:20 +0900
Subject: [PATCH 1975/2296] Fix the width of vertical attribute display numbers

Not necessarily required to fix the issue at hand, but probably good
practice here.
---
 osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
index 62c08f8132..33b7eaae1c 100644
--- a/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
+++ b/osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
@@ -82,7 +82,8 @@ namespace osu.Game.Overlays.Mods
             {
                 Origin = Anchor.CentreLeft,
                 Anchor = Anchor.CentreLeft,
-                AutoSizeAxes = Axes.Both,
+                AutoSizeAxes = Axes.Y,
+                Width = 50,
                 Direction = FillDirection.Vertical,
                 Children = new Drawable[]
                 {

From dc5c9837ed969d736645b9bf287099069774caa1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Dec 2023 16:00:03 +0900
Subject: [PATCH 1976/2296] Fix `StarRatingDisplay`'s display width to avoid
 text making slight autosize changes

---
 .../Beatmaps/Drawables/StarRatingDisplay.cs   | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/StarRatingDisplay.cs b/osu.Game/Beatmaps/Drawables/StarRatingDisplay.cs
index df8953d57c..55ef6f705e 100644
--- a/osu.Game/Beatmaps/Drawables/StarRatingDisplay.cs
+++ b/osu.Game/Beatmaps/Drawables/StarRatingDisplay.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -38,6 +39,8 @@ namespace osu.Game.Beatmaps.Drawables
 
         private readonly Bindable<double> displayedStars = new BindableDouble();
 
+        private readonly Container textContainer;
+
         /// <summary>
         /// The currently displayed stars of this display wrapped in a bindable.
         /// This bindable gets transformed on change rather than instantaneous, if animation is enabled.
@@ -116,15 +119,19 @@ namespace osu.Game.Beatmaps.Drawables
                                     Size = new Vector2(8f),
                                 },
                                 Empty(),
-                                starsText = new OsuSpriteText
+                                textContainer = new Container
                                 {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Margin = new MarginPadding { Bottom = 1.5f },
-                                    // todo: this should be size: 12f, but to match up with the design, it needs to be 14.4f
-                                    // see https://github.com/ppy/osu-framework/issues/3271.
-                                    Font = OsuFont.Torus.With(size: 14.4f, weight: FontWeight.Bold),
-                                    Shadow = false,
+                                    AutoSizeAxes = Axes.Y,
+                                    Child = starsText = new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Margin = new MarginPadding { Bottom = 1.5f },
+                                        // todo: this should be size: 12f, but to match up with the design, it needs to be 14.4f
+                                        // see https://github.com/ppy/osu-framework/issues/3271.
+                                        Font = OsuFont.Torus.With(size: 14.4f, weight: FontWeight.Bold),
+                                        Shadow = false,
+                                    },
                                 },
                             }
                         }
@@ -155,6 +162,11 @@ namespace osu.Game.Beatmaps.Drawables
 
                 starIcon.Colour = s.NewValue >= 6.5 ? colours.Orange1 : colourProvider?.Background5 ?? Color4Extensions.FromHex("303d47");
                 starsText.Colour = s.NewValue >= 6.5 ? colours.Orange1 : colourProvider?.Background5 ?? Color4.Black.Opacity(0.75f);
+
+                // In order to avoid autosize throwing the width of these displays all over the place,
+                // let's lock in some sane defaults for the text width based on how many digits we're
+                // displaying.
+                textContainer.Width = 24 + Math.Max(starsText.Text.ToString().Length - 4, 0) * 6;
             }, true);
         }
     }

From 4357bb1040b6f7e64f7bc24eb98434e682d352cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Dec 2023 16:01:07 +0900
Subject: [PATCH 1977/2296] Change `LeftContent` autosize duration to match
 main content to reduce visual awkwards

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

diff --git a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
index d50b2c33d7..94dd96ec1c 100644
--- a/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
+++ b/osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
@@ -144,8 +144,8 @@ namespace osu.Game.Overlays.Mods
 
         private void startAnimating()
         {
-            Content.AutoSizeEasing = Easing.OutQuint;
-            Content.AutoSizeDuration = transition_duration;
+            LeftContent.AutoSizeEasing = Content.AutoSizeEasing = Easing.OutQuint;
+            LeftContent.AutoSizeDuration = Content.AutoSizeDuration = transition_duration;
         }
 
         private void updateValues() => Scheduler.AddOnce(() =>

From 6e7e243e70492bc55dac69ce28ab7b8480c8702b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Dec 2023 16:05:29 +0900
Subject: [PATCH 1978/2296] Allow new common cases when a user is locating a
 stable osu! install directory for import

---
 .../Maintenance/StableDirectorySelectScreen.cs   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 1b935b0cec..73ac6efcd8 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -15,7 +15,16 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
 
-        protected override bool IsValidDirectory(DirectoryInfo? info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
+        protected override bool IsValidDirectory(DirectoryInfo? info) =>
+            // A full stable installation will have a configuration file present.
+            // This is the best case scenario, as it may contain a custom beatmap directory we need to traverse to.
+            info?.GetFiles("osu!.*.cfg").Any() == true ||
+            // The user may only have their songs or skins folders left.
+            // We still want to allow them to import based on this.
+            info?.GetDirectories("Songs").Any() == true ||
+            info?.GetDirectories("Skins").Any() == true ||
+            // The user may have traverse *inside* their songs or skins folders.
+            shouldUseParentDirectory(info);
 
         public override LocalisableString HeaderText => "Please select your osu!stable install location";
 
@@ -26,7 +35,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override void OnSelection(DirectoryInfo directory)
         {
-            taskCompletionSource.TrySetResult(directory.FullName);
+            taskCompletionSource.TrySetResult(shouldUseParentDirectory(directory) ? directory.Parent!.FullName : directory.FullName);
             this.Exit();
         }
 
@@ -35,5 +44,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             taskCompletionSource.TrySetCanceled();
             return base.OnExiting(e);
         }
+
+        private bool shouldUseParentDirectory(DirectoryInfo? info)
+            => info?.Parent != null && (info?.Name == "Songs" || info?.Name == "Skins");
     }
 }

From 6bd190c55d809ee6b69db19d5ce944bd6c887bfd Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Dec 2023 16:13:32 +0900
Subject: [PATCH 1979/2296] Refactor all slider input into SliderInputManager

---
 .../Objects/Drawables/DrawableHitCircle.cs    |   2 +-
 .../Objects/Drawables/DrawableOsuHitObject.cs |   5 +
 .../Objects/Drawables/DrawableSlider.cs       |  14 +-
 .../Objects/Drawables/DrawableSliderBall.cs   | 126 +--------
 .../Objects/Drawables/DrawableSliderHead.cs   |  44 +---
 .../Objects/Drawables/DrawableSliderRepeat.cs |  36 +--
 .../Objects/Drawables/DrawableSliderTail.cs   |  53 +---
 .../Objects/Drawables/DrawableSliderTick.cs   |  36 +--
 .../Objects/Drawables/IRequireTracking.cs     |  13 -
 .../Objects/Drawables/SliderInputManager.cs   | 248 ++++++++++++++++++
 10 files changed, 270 insertions(+), 307 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
 create mode 100644 osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index e87a075a11..0d665cad0c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public partial class DrawableHitCircle : DrawableOsuHitObject, IHasApproachCircle
     {
-        public OsuAction? HitAction => HitArea.HitAction;
+        public OsuAction? HitAction => HitArea?.HitAction;
         protected virtual OsuSkinComponents CirclePieceComponent => OsuSkinComponents.HitCircle;
 
         public SkinnableDrawable ApproachCircle { get; private set; }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index bdd818cf18..5b379a0d90 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -97,6 +97,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public virtual void Shake() { }
 
+        /// <summary>
+        /// Causes this <see cref="DrawableOsuHitObject"/> to get hit, disregarding all conditions in implementations of <see cref="DrawableHitObject.CheckForResult"/>.
+        /// </summary>
+        public void HitForcefully() => ApplyResult(r => r.Type = r.Judgement.MaxResult);
+
         /// <summary>
         /// Causes this <see cref="DrawableOsuHitObject"/> to get missed, disregarding all conditions in implementations of <see cref="DrawableHitObject.CheckForResult"/>.
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 1dd6f108f5..1f9a028045 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public DrawableSliderHead HeadCircle => headContainer.Child;
         public DrawableSliderTail TailCircle => tailContainer.Child;
-        public IEnumerable<DrawableSliderTick> Ticks => tickContainer.Children;
-        public IEnumerable<DrawableSliderRepeat> Repeats => repeatContainer.Children;
 
         [Cached]
         public DrawableSliderBall Ball { get; private set; }
@@ -60,6 +58,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public IBindable<int> PathVersion => pathVersion;
         private readonly Bindable<int> pathVersion = new Bindable<int>();
 
+        public readonly SliderInputManager SliderInputManager;
+
         private Container<DrawableSliderHead> headContainer;
         private Container<DrawableSliderTail> tailContainer;
         private Container<DrawableSliderTick> tickContainer;
@@ -74,9 +74,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public DrawableSlider([CanBeNull] Slider s = null)
             : base(s)
         {
+            SliderInputManager = new SliderInputManager(this);
+
             Ball = new DrawableSliderBall
             {
-                GetInitialHitAction = () => HeadCircle.HitAction,
                 BypassAutoSizeAxes = Axes.Both,
                 AlwaysPresent = true,
                 Alpha = 0
@@ -90,6 +91,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             AddRangeInternal(new Drawable[]
             {
+                SliderInputManager,
                 shakeContainer = new ShakeContainer
                 {
                     ShakeDuration = 30,
@@ -234,7 +236,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
-            Tracking.Value = Ball.Tracking;
+            Tracking.Value = SliderInputManager.Tracking;
 
             if (Tracking.Value && slidingSample != null)
                 // keep the sliding sample playing at the current tracking position
@@ -247,8 +249,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             foreach (DrawableHitObject hitObject in NestedHitObjects)
             {
-                if (hitObject is ITrackSnaking s) s.UpdateSnakingPosition(HitObject.Path.PositionAt(SliderBody?.SnakedStart ?? 0), HitObject.Path.PositionAt(SliderBody?.SnakedEnd ?? 0));
-                if (hitObject is IRequireTracking t) t.Tracking = Ball.Tracking;
+                if (hitObject is ITrackSnaking s)
+                    s.UpdateSnakingPosition(HitObject.Path.PositionAt(SliderBody?.SnakedStart ?? 0), HitObject.Path.PositionAt(SliderBody?.SnakedEnd ?? 0));
             }
 
             Size = SliderBody?.Size ?? Vector2.Zero;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
index 764dd43c30..46f0231981 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBall.cs
@@ -4,14 +4,9 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input;
-using osu.Framework.Input.Events;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Skinning.Default;
@@ -21,12 +16,10 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public partial class DrawableSliderBall : CircularContainer, ISliderProgress, IRequireHighFrequencyMousePosition
+    public partial class DrawableSliderBall : CircularContainer, ISliderProgress
     {
         public const float FOLLOW_AREA = 2.4f;
 
-        public Func<OsuAction?> GetInitialHitAction;
-
         private DrawableSlider drawableSlider;
         private Drawable ball;
 
@@ -55,14 +48,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             };
         }
 
-        private Vector2? lastScreenSpaceMousePosition;
-
-        protected override bool OnMouseMove(MouseMoveEvent e)
-        {
-            lastScreenSpaceMousePosition = e.ScreenSpaceMousePosition;
-            return base.OnMouseMove(e);
-        }
-
         public override void ClearTransformsAfter(double time, bool propagateChildren = false, string targetMember = null)
         {
             // Consider the case of rewinding - children's transforms are handled internally, so propagating down
@@ -78,115 +63,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.ApplyTransformsAt(time, false);
         }
 
-        public bool Tracking { get; private set; }
-
-        /// <summary>
-        /// If the cursor moves out of the ball's radius we still need to be able to receive positional updates to stop tracking.
-        /// </summary>
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
-
-        /// <summary>
-        /// The point in time after which we can accept any key for tracking. Before this time, we may need to restrict tracking to the key used to hit the head circle.
-        ///
-        /// This is a requirement to stop the case where a player holds down one key (from before the slider) and taps the second key while maintaining full scoring (tracking) of sliders.
-        /// Visually, this special case can be seen below (time increasing from left to right):
-        ///
-        ///  Z  Z+X  Z
-        ///      o========o
-        ///
-        /// Without this logic, tracking would continue through the entire slider even though no key hold action is directly attributing to it.
-        ///
-        /// In all other cases, no special handling is required (either key being pressed is allowable as valid tracking).
-        ///
-        /// The reason for storing this as a time value (rather than a bool) is to correctly handle rewind scenarios.
-        /// </summary>
-        private double? timeToAcceptAnyKeyAfter;
-
-        /// <summary>
-        /// The actions that were pressed in the previous frame.
-        /// </summary>
-        private readonly List<OsuAction> lastPressedActions = new List<OsuAction>();
-
-        public bool IsMouseInFollowCircleWithState(bool expanded)
-        {
-            if (lastScreenSpaceMousePosition is not Vector2 mousePos)
-                return false;
-
-            float radius = GetFollowCircleRadius(expanded);
-
-            double followProgress = Math.Clamp((Time.Current - drawableSlider.HitObject.StartTime) / drawableSlider.HitObject.Duration, 0, 1);
-            Vector2 followCirclePosition = drawableSlider.HitObject.CurvePositionAt(followProgress);
-            Vector2 mousePositionInSlider = drawableSlider.ToLocalSpace(mousePos) - drawableSlider.OriginPosition;
-
-            return (mousePositionInSlider - followCirclePosition).LengthSquared <= radius * radius;
-        }
-
-        public float GetFollowCircleRadius(bool expanded)
-        {
-            float radius = (float)drawableSlider.HitObject.Radius;
-
-            if (expanded)
-                radius *= FOLLOW_AREA;
-
-            return radius;
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            // from the point at which the head circle is hit, this will be non-null.
-            // it may be null if the head circle was missed.
-            var headCircleHitAction = GetInitialHitAction();
-
-            if (headCircleHitAction == null)
-                timeToAcceptAnyKeyAfter = null;
-
-            var actions = drawableSlider.OsuActionInputManager?.PressedActions;
-
-            // if the head circle was hit with a specific key, tracking should only occur while that key is pressed.
-            if (headCircleHitAction != null && timeToAcceptAnyKeyAfter == null)
-            {
-                var otherKey = headCircleHitAction == OsuAction.RightButton ? OsuAction.LeftButton : OsuAction.RightButton;
-
-                // we can start accepting any key once all other keys have been released in the previous frame.
-                if (!lastPressedActions.Contains(otherKey))
-                    timeToAcceptAnyKeyAfter = Time.Current;
-            }
-
-            bool validInFollowArea = IsMouseInFollowCircleWithState(Tracking);
-            bool validInHeadCircle = drawableSlider.HeadCircle.IsHit
-                                     && IsMouseInFollowCircleWithState(true)
-                                     && drawableSlider.HeadCircle.Result.TimeAbsolute == Time.Current;
-
-            Tracking =
-                // even in an edge case where current time has exceeded the slider's time, we may not have finished judging.
-                // we don't want to potentially update from Tracking=true to Tracking=false at this point.
-                (!drawableSlider.AllJudged || Time.Current <= drawableSlider.HitObject.GetEndTime())
-                // in valid position range
-                && (validInFollowArea || validInHeadCircle)
-                // valid action
-                && (actions?.Any(isValidTrackingAction) ?? false);
-
-            lastPressedActions.Clear();
-            if (actions != null)
-                lastPressedActions.AddRange(actions);
-        }
-
-        /// <summary>
-        /// Check whether a given user input is a valid tracking action.
-        /// </summary>
-        private bool isValidTrackingAction(OsuAction action)
-        {
-            bool headCircleHit = GetInitialHitAction().HasValue;
-
-            // if the head circle was hit, we may not yet be allowed to accept any key, so we must use the initial hit action.
-            if (headCircleHit && (!timeToAcceptAnyKeyAfter.HasValue || Time.Current <= timeToAcceptAnyKeyAfter.Value))
-                return action == GetInitialHitAction();
-
-            return action == OsuAction.LeftButton || action == OsuAction.RightButton;
-        }
-
         private Vector2? lastPosition;
 
         public void UpdateProgress(double completionProgress)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 0a104c123b..76b9fdc3ce 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -3,14 +3,10 @@
 
 #nullable disable
 
-using System;
 using System.Diagnostics;
-using System.Linq;
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -68,45 +64,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             base.CheckForResult(userTriggered, timeOffset);
-
-            if (!Judged || !Result.IsHit)
-                return;
-
-            // If the head is hit and in radius of the would-be-expanded follow circle,
-            // then hit every object that the follow circle has passed through up until the current time.
-            if (DrawableSlider.Ball.IsMouseInFollowCircleWithState(true))
-            {
-                foreach (var nested in DrawableSlider.NestedHitObjects.OfType<DrawableOsuHitObject>())
-                {
-                    if (nested.Judged)
-                        continue;
-
-                    if (!check(nested.HitObject))
-                        break;
-
-                    if (nested is DrawableSliderTick tick)
-                        tick.HitForcefully();
-
-                    if (nested is DrawableSliderRepeat repeat)
-                        repeat.HitForcefully();
-
-                    if (nested is DrawableSliderTail tail)
-                        tail.HitForcefully();
-                }
-            }
-
-            bool check(OsuHitObject h)
-            {
-                if (h.StartTime > Time.Current)
-                    return false;
-
-                float radius = DrawableSlider.Ball.GetFollowCircleRadius(true);
-
-                double objectProgress = Math.Clamp((h.StartTime - DrawableSlider.HitObject.StartTime) / DrawableSlider.HitObject.Duration, 0, 1);
-                Vector2 objectPosition = DrawableSlider.HitObject.CurvePositionAt(objectProgress);
-
-                return objectPosition.LengthSquared <= radius * radius;
-            }
+            DrawableSlider.SliderInputManager.PostProcessHeadJudgement(this);
         }
 
         protected override HitResult ResultFor(double timeOffset)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index a7979bde27..0c8e5b765f 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -17,7 +17,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public partial class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking, IRequireTracking
+    public partial class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking
     {
         public new SliderRepeat HitObject => (SliderRepeat)base.HitObject;
 
@@ -36,8 +36,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => false;
 
-        public bool Tracking { get; set; }
-
         public DrawableSliderRepeat()
             : base(null)
         {
@@ -85,37 +83,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Position = HitObject.Position - DrawableSlider.Position;
         }
 
-        public void HitForcefully()
-        {
-            if (Judged)
-                return;
-
-            ApplyResult(r => r.Type = r.Judgement.MaxResult);
-        }
-
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
-        {
-            // shared implementation with DrawableSliderTick.
-            if (timeOffset >= 0)
-            {
-                // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
-                if (!DrawableSlider.HeadCircle.Judged)
-                {
-                    if (Tracking)
-                    {
-                        // Attempt to preserve correct ordering of judgements as best we can by forcing an un-judged head to be missed when the user has clearly skipped it.
-                        DrawableSlider.HeadCircle.MissForcefully();
-                    }
-                    else
-                    {
-                        // Don't judge this object as a miss before the head has been judged, to allow the head to be hit late.
-                        return;
-                    }
-                }
-
-                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
-            }
-        }
+        protected override void CheckForResult(bool userTriggered, double timeOffset) => DrawableSlider.SliderInputManager.TryJudgeNestedObject(this, timeOffset);
 
         protected override void UpdateInitialTransforms()
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 1ffbaf11c5..60bad5d4a7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -4,12 +4,10 @@
 #nullable disable
 
 using System.Diagnostics;
-using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
@@ -17,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public partial class DrawableSliderTail : DrawableOsuHitObject, IRequireTracking
+    public partial class DrawableSliderTail : DrawableOsuHitObject
     {
         public new SliderTailCircle HitObject => (SliderTailCircle)base.HitObject;
 
@@ -37,8 +35,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public bool SamplePlaysOnlyOnHit { get; set; } = true;
 
-        public bool Tracking { get; set; }
-
         public SkinnableDrawable CirclePiece { get; private set; }
 
         private Container scaleContainer;
@@ -125,52 +121,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        public void HitForcefully()
-        {
-            if (Judged)
-                return;
-
-            ApplyResult(r => r.Type = r.Judgement.MaxResult);
-        }
-
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
-        {
-            if (userTriggered)
-                return;
-
-            // Ensure the tail can only activate after all previous ticks/repeats already have.
-            //
-            // This covers the edge case where the lenience may allow the tail to activate before
-            // the last tick, changing ordering of score/combo awarding.
-            var lastTick = DrawableSlider.NestedHitObjects.LastOrDefault(o => o.HitObject is SliderTick || o.HitObject is SliderRepeat);
-            if (lastTick?.Judged == false)
-                return;
-
-            if (timeOffset < SliderEventGenerator.TAIL_LENIENCY)
-                return;
-
-            // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
-            if (!DrawableSlider.HeadCircle.Judged)
-            {
-                if (Tracking)
-                {
-                    // Attempt to preserve correct ordering of judgements as best we can by forcing an un-judged head to be missed when the user has clearly skipped it.
-                    DrawableSlider.HeadCircle.MissForcefully();
-                }
-                else
-                {
-                    // Don't judge this object as a miss before the head has been judged, to allow the head to be hit late.
-                    return;
-                }
-            }
-
-            // The player needs to have engaged in tracking at any point after the tail leniency cutoff.
-            // An actual tick miss should only occur if reaching the tick itself.
-            if (Tracking)
-                ApplyResult(r => r.Type = r.Judgement.MaxResult);
-            else if (timeOffset > 0)
-                ApplyResult(r => r.Type = r.Judgement.MinResult);
-        }
+        protected override void CheckForResult(bool userTriggered, double timeOffset) => DrawableSlider.SliderInputManager.TryJudgeNestedObject(this, timeOffset);
 
         protected override void OnApply()
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index b2ac8ecbda..cb323f4ac7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -14,14 +14,12 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public partial class DrawableSliderTick : DrawableOsuHitObject, IRequireTracking
+    public partial class DrawableSliderTick : DrawableOsuHitObject
     {
         public const double ANIM_DURATION = 150;
 
         private const float default_tick_size = 16;
 
-        public bool Tracking { get; set; }
-
         public override bool DisplayResult => false;
 
         protected DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
@@ -73,37 +71,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Position = HitObject.Position - DrawableSlider.HitObject.Position;
         }
 
-        public void HitForcefully()
-        {
-            if (Judged)
-                return;
-
-            ApplyResult(r => r.Type = r.Judgement.MaxResult);
-        }
-
-        protected override void CheckForResult(bool userTriggered, double timeOffset)
-        {
-            // shared implementation with DrawableSliderRepeat.
-            if (timeOffset >= 0)
-            {
-                // This check is applied to all nested slider objects apart from the head (ticks, repeats, tail).
-                if (!DrawableSlider.HeadCircle.Judged)
-                {
-                    if (Tracking)
-                    {
-                        // Attempt to preserve correct ordering of judgements as best we can by forcing an un-judged head to be missed when the user has clearly skipped it.
-                        DrawableSlider.HeadCircle.MissForcefully();
-                    }
-                    else
-                    {
-                        // Don't judge this object as a miss before the head has been judged, to allow the head to be hit late.
-                        return;
-                    }
-                }
-
-                ApplyResult(r => r.Type = Tracking ? r.Judgement.MaxResult : r.Judgement.MinResult);
-            }
-        }
+        protected override void CheckForResult(bool userTriggered, double timeOffset) => DrawableSlider.SliderInputManager.TryJudgeNestedObject(this, timeOffset);
 
         protected override void UpdateInitialTransforms()
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
deleted file mode 100644
index b1815b23c9..0000000000
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs
+++ /dev/null
@@ -1,13 +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.Osu.Objects.Drawables
-{
-    public interface IRequireTracking
-    {
-        /// <summary>
-        /// Whether the <see cref="DrawableSlider"/> is currently being tracked by the user.
-        /// </summary>
-        bool Tracking { get; set; }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
new file mode 100644
index 0000000000..a5d7bdc7db
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
@@ -0,0 +1,248 @@
+// 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.Graphics;
+using osu.Framework.Input;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    public partial class SliderInputManager : Component, IRequireHighFrequencyMousePosition
+    {
+        /// <summary>
+        /// Whether the slider is currently being tracked.
+        /// </summary>
+        public bool Tracking { get; private set; }
+
+        /// <summary>
+        /// The point in time after which we can accept any key for tracking. Before this time, we may need to restrict tracking to the key used to hit the head circle.
+        ///
+        /// This is a requirement to stop the case where a player holds down one key (from before the slider) and taps the second key while maintaining full scoring (tracking) of sliders.
+        /// Visually, this special case can be seen below (time increasing from left to right):
+        ///
+        ///  Z  Z+X  Z
+        ///      o========o
+        ///
+        /// Without this logic, tracking would continue through the entire slider even though no key hold action is directly attributing to it.
+        ///
+        /// In all other cases, no special handling is required (either key being pressed is allowable as valid tracking).
+        ///
+        /// The reason for storing this as a time value (rather than a bool) is to correctly handle rewind scenarios.
+        /// </summary>
+        private double? timeToAcceptAnyKeyAfter;
+
+        /// <summary>
+        /// The actions that were pressed in the previous frame.
+        /// </summary>
+        private readonly List<OsuAction> lastPressedActions = new List<OsuAction>();
+
+        private Vector2? screenSpaceMousePosition;
+        private readonly DrawableSlider slider;
+
+        public SliderInputManager(DrawableSlider slider)
+        {
+            this.slider = slider;
+        }
+
+        /// <summary>
+        /// This component handles all input of the slider, so it should receive input no matter the position.
+        /// </summary>
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
+        protected override bool OnMouseMove(MouseMoveEvent e)
+        {
+            screenSpaceMousePosition = e.ScreenSpaceMousePosition;
+            return base.OnMouseMove(e);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            updateTracking(isMouseInFollowArea(Tracking));
+        }
+
+        public void PostProcessHeadJudgement(DrawableSliderHead head)
+        {
+            if (!head.Judged || !head.Result.IsHit)
+                return;
+
+            if (!isMouseInFollowArea(true))
+                return;
+
+            // When the head is hit and the mouse is in the expanded follow area, force a hit on every nested hitobject
+            // from the start of the slider that is within follow-radius units from the head.
+
+            bool forceMiss = false;
+
+            foreach (var nested in slider.NestedHitObjects.OfType<DrawableOsuHitObject>())
+            {
+                // Skip nested objects that are already judged.
+                if (nested.Judged)
+                    continue;
+
+                // Stop the process when a nested object is reached that can't be hit before the current time.
+                if (nested.HitObject.StartTime > Time.Current)
+                    break;
+
+                float radius = getFollowRadius(true);
+                double objectProgress = Math.Clamp((nested.HitObject.StartTime - slider.HitObject.StartTime) / slider.HitObject.Duration, 0, 1);
+                Vector2 objectPosition = slider.HitObject.CurvePositionAt(objectProgress);
+
+                // When the first nested object that is further than follow-radius units away from the start of the slider is reached,
+                // forcefully miss all other nested objects that would otherwise be valid to be hit by this process.
+                if (forceMiss || objectPosition.LengthSquared > radius * radius)
+                {
+                    nested.MissForcefully();
+                    forceMiss = true;
+                }
+                else
+                    nested.HitForcefully();
+            }
+
+            // Enable tracking, since the mouse is within the follow area (if it were expanded).
+            updateTracking(true);
+        }
+
+        public void TryJudgeNestedObject(DrawableOsuHitObject nestedObject, double timeOffset)
+        {
+            switch (nestedObject)
+            {
+                case DrawableSliderRepeat:
+                case DrawableSliderTick:
+                    if (timeOffset < 0)
+                        return;
+
+                    break;
+
+                case DrawableSliderTail:
+                    if (timeOffset < SliderEventGenerator.TAIL_LENIENCY)
+                        return;
+
+                    // Ensure the tail can only activate after all previous ticks/repeats already have.
+                    //
+                    // This covers the edge case where the lenience may allow the tail to activate before
+                    // the last tick, changing ordering of score/combo awarding.
+                    var lastTick = slider.NestedHitObjects.LastOrDefault(o => o.HitObject is SliderTick || o.HitObject is SliderRepeat);
+                    if (lastTick?.Judged == false)
+                        return;
+
+                    break;
+
+                default:
+                    return;
+            }
+
+            if (!slider.HeadCircle.Judged)
+            {
+                if (slider.Tracking.Value)
+                {
+                    // Attempt to preserve correct ordering of judgements as best we can by forcing an un-judged head to be missed when the user has clearly skipped it.
+                    slider.HeadCircle.MissForcefully();
+                }
+                else
+                {
+                    // Don't judge this object as a miss before the head has been judged, to allow the head to be hit late.
+                    return;
+                }
+            }
+
+            if (slider.Tracking.Value)
+                nestedObject.HitForcefully();
+            else
+                nestedObject.MissForcefully();
+        }
+
+        /// <summary>
+        /// Whether the mouse is currently in the follow area.
+        /// </summary>
+        /// <param name="expanded">Whether to test against the maximum area of the follow circle.</param>
+        private bool isMouseInFollowArea(bool expanded)
+        {
+            if (screenSpaceMousePosition is not Vector2 pos)
+                return false;
+
+            float radius = getFollowRadius(expanded);
+
+            double followProgress = Math.Clamp((Time.Current - slider.HitObject.StartTime) / slider.HitObject.Duration, 0, 1);
+            Vector2 followCirclePosition = slider.HitObject.CurvePositionAt(followProgress);
+            Vector2 mousePositionInSlider = slider.ToLocalSpace(pos) - slider.OriginPosition;
+
+            return (mousePositionInSlider - followCirclePosition).LengthSquared <= radius * radius;
+        }
+
+        /// <summary>
+        /// Retrieves the radius of the follow area.
+        /// </summary>
+        /// <param name="expanded">Whether to return the maximum area of the follow circle.</param>
+        private float getFollowRadius(bool expanded)
+        {
+            float radius = (float)slider.HitObject.Radius;
+
+            if (expanded)
+                radius *= DrawableSliderBall.FOLLOW_AREA;
+
+            return radius;
+        }
+
+        /// <summary>
+        /// Updates the tracking state.
+        /// </summary>
+        /// <param name="isValidTrackingPosition">Whether the current mouse position is valid to begin tracking.</param>
+        private void updateTracking(bool isValidTrackingPosition)
+        {
+            // from the point at which the head circle is hit, this will be non-null.
+            // it may be null if the head circle was missed.
+            OsuAction? headCircleHitAction = getInitialHitAction();
+
+            if (headCircleHitAction == null)
+                timeToAcceptAnyKeyAfter = null;
+
+            var actions = slider.OsuActionInputManager?.PressedActions;
+
+            // if the head circle was hit with a specific key, tracking should only occur while that key is pressed.
+            if (headCircleHitAction != null && timeToAcceptAnyKeyAfter == null)
+            {
+                var otherKey = headCircleHitAction == OsuAction.RightButton ? OsuAction.LeftButton : OsuAction.RightButton;
+
+                // we can start accepting any key once all other keys have been released in the previous frame.
+                if (!lastPressedActions.Contains(otherKey))
+                    timeToAcceptAnyKeyAfter = Time.Current;
+            }
+
+            Tracking =
+                // even in an edge case where current time has exceeded the slider's time, we may not have finished judging.
+                // we don't want to potentially update from Tracking=true to Tracking=false at this point.
+                (!slider.AllJudged || Time.Current <= slider.HitObject.GetEndTime())
+                // in valid position range
+                && isValidTrackingPosition
+                // valid action
+                && (actions?.Any(isValidTrackingAction) ?? false);
+
+            lastPressedActions.Clear();
+            if (actions != null)
+                lastPressedActions.AddRange(actions);
+        }
+
+        private OsuAction? getInitialHitAction() => slider.HeadCircle?.HitAction;
+
+        /// <summary>
+        /// Check whether a given user input is a valid tracking action.
+        /// </summary>
+        private bool isValidTrackingAction(OsuAction action)
+        {
+            OsuAction? hitAction = getInitialHitAction();
+
+            // if the head circle was hit, we may not yet be allowed to accept any key, so we must use the initial hit action.
+            if (hitAction.HasValue && (!timeToAcceptAnyKeyAfter.HasValue || Time.Current <= timeToAcceptAnyKeyAfter.Value))
+                return action == hitAction;
+
+            return action == OsuAction.LeftButton || action == OsuAction.RightButton;
+        }
+    }
+}

From 3b8a73bf2c5ac25224ae2fc88967b58f98cb07a7 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Dec 2023 16:13:34 +0900
Subject: [PATCH 1980/2296] Refactor test

---
 .../TestSceneSliderLateHitJudgement.cs        | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
index 4f32a6fe9f..04bdd0094d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
@@ -296,7 +296,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void assertHeadJudgement(HitResult result)
         {
             AddAssert(
-                "check head result",
+                $"head = {result}",
                 () => judgementResults.SingleOrDefault(r => r.HitObject is SliderHeadCircle)?.Type,
                 () => Is.EqualTo(result));
         }
@@ -304,7 +304,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void assertTickJudgement(int index, HitResult result)
         {
             AddAssert(
-                $"check tick({index}) result",
+                $"tick({index}) = {result}",
                 () => judgementResults.Where(r => r.HitObject is SliderTick).ElementAtOrDefault(index)?.Type,
                 () => Is.EqualTo(result));
         }
@@ -312,7 +312,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void assertAllTickJudgements(HitResult result)
         {
             AddAssert(
-                "check all tick results",
+                $"all ticks = {result}",
                 () => judgementResults.Where(r => r.HitObject is SliderTick).Select(t => t.Type),
                 () => Has.All.EqualTo(result));
         }
@@ -320,7 +320,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void assertRepeatJudgement(HitResult result)
         {
             AddAssert(
-                "check repeat result",
+                $"repeat = {result}",
                 () => judgementResults.SingleOrDefault(r => r.HitObject is SliderRepeat)?.Type,
                 () => Is.EqualTo(result));
         }
@@ -328,7 +328,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void assertTailJudgement(HitResult result)
         {
             AddAssert(
-                "check tail result",
+                $"tail = {result}",
                 () => judgementResults.SingleOrDefault(r => r.HitObject is SliderTailCircle)?.Type,
                 () => Is.EqualTo(result));
         }
@@ -336,18 +336,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void assertSliderJudgement(HitResult result)
         {
             AddAssert(
-                "check slider result",
+                $"slider = {result}",
                 () => judgementResults.SingleOrDefault(r => r.HitObject is Slider)?.Type,
                 () => Is.EqualTo(result));
         }
 
-        private Vector2 computePositionFromTime(double time)
-        {
-            Vector2 dist = slider_end_position - slider_start_position;
-            double t = (time - time_slider_start) / (time_slider_end - time_slider_start);
-            return slider_start_position + dist * (float)t;
-        }
-
         private void performTest(List<ReplayFrame> frames, Action<Slider>? adjustSliderFunc = null, bool classic = false)
         {
             Slider slider = new Slider

From 12210017e44341e5378edc2af86553addeae4eab Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Dec 2023 17:05:14 +0900
Subject: [PATCH 1981/2296] Use the cursor position to test nested object
 validity

---
 .../TestSceneSliderLateHitJudgement.cs        | 42 ++++++++++++++++---
 .../Objects/Drawables/SliderInputManager.cs   | 14 +++++--
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
index 04bdd0094d..80e4b04178 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         /// <summary>
         /// If the head circle is hit late and the mouse is in range of the follow circle,
-        /// then all the repeats that the mouse has passed through should be hit.
+        /// then all the repeats that the follow circle has passed through should be hit.
         /// </summary>
         [Test]
         public void TestHitLateInRangeHitsRepeat()
@@ -212,8 +212,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         /// <summary>
         /// If the head circle is hit and the mouse is in range of the follow circle,
-        /// then only the ticks that were in range of the follow circle at the head should be hit.
-        /// If any hitobject was outside the follow range, ALL hitobjects after that point should be missed.
+        /// then only the ticks that are in range of the cursor position should be hit.
+        /// If any hitobject does not meet this criteria, ALL hitobjects after that one should be missed.
         /// </summary>
         [Test]
         public void TestHitLateInRangeDoesNotHitAfterAnyOutOfRange()
@@ -257,7 +257,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertTickJudgement(11, HitResult.LargeTickMiss);
             assertTickJudgement(12, HitResult.LargeTickMiss);
 
-            // And the tail should be hit because of its leniency.
+            // This particular test actually starts tracking the slider just before the end, so the tail should be hit because of its leniency.
             assertTailJudgement(HitResult.LargeTickHit);
 
             assertSliderJudgement(HitResult.IgnoreHit);
@@ -265,10 +265,10 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         /// <summary>
         /// If the head circle is hit and the mouse is in range of the follow circle,
-        /// then a tick outside the range of the follow circle from the head should not be hit.
+        /// then a tick not within the follow radius from the cursor position should not be hit.
         /// </summary>
         [Test]
-        public void TestHitLateInRangeDoesNotHitOutOfRange()
+        public void TestHitLateInRangeDoesNotHitOutOfRangeTick()
         {
             performTest(new List<ReplayFrame>
             {
@@ -293,6 +293,36 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
+        /// <summary>
+        /// If the head circle is hit and the mouse is in range of the follow circle,
+        /// then a tick not within the follow radius from the cursor position should not be hit.
+        /// </summary>
+        [Test]
+        public void TestHitLateWithEdgeHit()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 150, slider_start_position - new Vector2(20), OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 150, slider_start_position - new Vector2(20), OsuAction.LeftButton),
+            }, s =>
+            {
+                s.Path = new SliderPath(PathType.PERFECT_CURVE, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(50, 50),
+                    new Vector2(20, 0),
+                });
+
+                s.TickDistanceMultiplier = 0.35f;
+                s.SliderVelocityMultiplier = 4;
+            });
+
+            assertHeadJudgement(HitResult.Meh);
+            assertTickJudgement(0, HitResult.LargeTickMiss);
+            assertTailJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
         private void assertHeadJudgement(HitResult result)
         {
             AddAssert(
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
index a5d7bdc7db..9feeb6ef14 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
@@ -75,8 +76,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (!isMouseInFollowArea(true))
                 return;
 
+            Debug.Assert(screenSpaceMousePosition != null);
+
+            Vector2 mousePositionInSlider = slider.ToLocalSpace(screenSpaceMousePosition.Value) - slider.OriginPosition;
+
             // When the head is hit and the mouse is in the expanded follow area, force a hit on every nested hitobject
-            // from the start of the slider that is within follow-radius units from the head.
+            // from the start of the slider that is within the follow area.
 
             bool forceMiss = false;
 
@@ -94,9 +99,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 double objectProgress = Math.Clamp((nested.HitObject.StartTime - slider.HitObject.StartTime) / slider.HitObject.Duration, 0, 1);
                 Vector2 objectPosition = slider.HitObject.CurvePositionAt(objectProgress);
 
-                // When the first nested object that is further than follow-radius units away from the start of the slider is reached,
-                // forcefully miss all other nested objects that would otherwise be valid to be hit by this process.
-                if (forceMiss || objectPosition.LengthSquared > radius * radius)
+                // When the first nested object that is further outside the follow area is reached,
+                // forcefully miss all other nested objects that would otherwise be valid to be hit.
+                // This covers a case of a slider overlapping itself that requires tracking to a tick on an outer edge.
+                if (forceMiss || (objectPosition - mousePositionInSlider).LengthSquared > radius * radius)
                 {
                     nested.MissForcefully();
                     forceMiss = true;

From 9ae3be817fa77dd142b5292e3d361953319efe07 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Dec 2023 17:40:36 +0900
Subject: [PATCH 1982/2296] Add some text to the test scene showing hits/misses

---
 .../TestSceneSliderLateHitJudgement.cs        | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
index 80e4b04178..2a3655eccd 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
@@ -5,12 +5,17 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Replays;
@@ -410,7 +415,21 @@ namespace osu.Game.Rulesets.Osu.Tests
                 {
                     p.ScoreProcessor.NewJudgement += result =>
                     {
-                        if (currentPlayer == p) judgementResults.Add(result);
+                        if (currentPlayer == p)
+                            judgementResults.Add(result);
+
+                        DrawableHitObject drawableObj = this.ChildrenOfType<DrawableHitObject>().Single(h => h.HitObject == result.HitObject);
+
+                        var text = new OsuSpriteText
+                        {
+                            Origin = Anchor.Centre,
+                            Position = Content.ToLocalSpace(drawableObj.ToScreenSpace(drawableObj.OriginPosition)) - new Vector2(0, 20),
+                            Text = result.IsHit ? "hit" : "miss"
+                        };
+
+                        Add(text);
+
+                        text.FadeOutFromOne(1000).Expire();
                     };
                 };
 

From 9e3b1dbb5926684b151066fed1df14e25cbb26b2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Dec 2023 17:41:22 +0900
Subject: [PATCH 1983/2296] Fix CI inspection

---
 .../Sections/Maintenance/StableDirectorySelectScreen.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 73ac6efcd8..17f09ade4e 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -46,6 +46,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         }
 
         private bool shouldUseParentDirectory(DirectoryInfo? info)
-            => info?.Parent != null && (info?.Name == "Songs" || info?.Name == "Skins");
+            => info?.Parent != null && (info.Name == "Songs" || info.Name == "Skins");
     }
 }

From 456916f680c608acbd24ed3953e97e630a656551 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Dec 2023 18:02:27 +0900
Subject: [PATCH 1984/2296] Fix column sizing exceeding screen width on tablets

---
 .../Argon/ManiaArgonSkinTransformer.cs        | 10 +----
 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs      | 45 +++++++++++++++----
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index ca7f84cb4d..7f6540e7b5 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
@@ -100,16 +99,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                         return SkinUtils.As<TValue>(new Bindable<float>(30));
 
                     case LegacyManiaSkinConfigurationLookups.ColumnWidth:
-
-                        float width;
-
                         bool isSpecialColumn = stage.IsSpecialColumn(columnIndex);
 
-                        // Best effort until we have better mobile support.
-                        if (RuntimeInfo.IsMobile)
-                            width = 170 * Math.Min(1, 7f / beatmap.TotalColumns) * (isSpecialColumn ? 1.8f : 1);
-                        else
-                            width = 60 * (isSpecialColumn ? 2 : 1);
+                        float width = 60 * (isSpecialColumn ? 2 : 1);
 
                         return SkinUtils.As<TValue>(new Bindable<float>(width));
 
diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
index 0bc0bf4caf..44c318a2c5 100644
--- a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -3,14 +3,17 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -60,6 +63,12 @@ namespace osu.Game.Rulesets.Mania.UI
             onSkinChanged();
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateMobileSizing();
+        }
+
         private void onSkinChanged()
         {
             for (int i = 0; i < stageDefinition.Columns; i++)
@@ -77,12 +86,15 @@ namespace osu.Game.Rulesets.Mania.UI
                                               new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, i))
                                           ?.Value;
 
-                if (width == null)
-                    // only used by default skin (legacy skins get defaults set in LegacyManiaSkinConfiguration)
-                    columns[i].Width = stageDefinition.IsSpecialColumn(i) ? Column.SPECIAL_COLUMN_WIDTH : Column.COLUMN_WIDTH;
-                else
-                    columns[i].Width = width.Value;
+                bool isSpecialColumn = stageDefinition.IsSpecialColumn(i);
+
+                // only used by default skin (legacy skins get defaults set in LegacyManiaSkinConfiguration)
+                width ??= isSpecialColumn ? Column.SPECIAL_COLUMN_WIDTH : Column.COLUMN_WIDTH;
+
+                columns[i].Width = width.Value;
             }
+
+            updateMobileSizing();
         }
 
         /// <summary>
@@ -92,10 +104,27 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <param name="content">The content.</param>
         public void SetContentForColumn(int column, TContent content) => columns[column].Child = content;
 
-        public new MarginPadding Padding
+        private void updateMobileSizing()
         {
-            get => base.Padding;
-            set => base.Padding = value;
+            if (!IsLoaded)
+                return;
+
+            for (int i = 0; i < stageDefinition.Columns; i++)
+            {
+                // GridContainer+CellContainer containing this stage (gets split up for dual stages).
+                Vector2 containingCell = this.FindClosestParent<Stage>().Parent!.DrawSize;
+
+                // Best effort until we have better mobile support.
+                if (RuntimeInfo.IsMobile)
+                {
+                    // These numbers are based on mobile phones, aspect ~1.92.
+                    float mobileAdjust = 2.83f * Math.Min(1, 7f / stageDefinition.Columns);
+                    // We should scale it back for cases like tablets which aren't so extreme.
+                    mobileAdjust *= (containingCell.X / containingCell.Y) / 1.92f;
+
+                    columns[i].Width *= mobileAdjust;
+                }
+            }
         }
 
         protected override void Dispose(bool isDisposing)

From 4ad312ef5b8bd4ce392f1a5cbb738da5cb991389 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Dec 2023 19:12:45 +0900
Subject: [PATCH 1985/2296] Update xmldoc for `LegacyComboIncrease`

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

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 6380b73558..9705421571 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -139,9 +139,12 @@ namespace osu.Game.Rulesets.Scoring
 
         /// <summary>
         /// A special result used as a padding value for legacy rulesets. It is a hit type and affects combo, but does not affect the base score (does not affect accuracy).
+        ///
+        /// DO NOT USE FOR ANYTHING EVER.
         /// </summary>
         /// <remarks>
-        /// DO NOT USE.
+        /// This is used when dealing with legacy scores, which historically only have counts stored for 300/100/50/miss.
+        /// For these scores, we pad the hit statistics with `LegacyComboIncrease` to meet the correct max combo for the score.
         /// </remarks>
         [EnumMember(Value = "legacy_combo_increase")]
         [Order(99)]

From eb5a8284f1200e80a8e9b616e68b8a056c8a84e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Dec 2023 19:15:25 +0900
Subject: [PATCH 1986/2296] Move mobile check earlier to avoid unnecessary
 looping

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

diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
index 44c318a2c5..f28619fb64 100644
--- a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private void updateMobileSizing()
         {
-            if (!IsLoaded)
+            if (!IsLoaded || !RuntimeInfo.IsMobile)
                 return;
 
             for (int i = 0; i < stageDefinition.Columns; i++)

From e8f3e52c9e0bccbe6f67f4904e4db0a45bd29f4b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Dec 2023 19:17:48 +0900
Subject: [PATCH 1987/2296] Fix nullref failure in tests

---
 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs | 31 ++++++++++++------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
index f28619fb64..3ecd14ce81 100644
--- a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -109,22 +109,23 @@ namespace osu.Game.Rulesets.Mania.UI
             if (!IsLoaded || !RuntimeInfo.IsMobile)
                 return;
 
+            // GridContainer+CellContainer containing this stage (gets split up for dual stages).
+            Vector2? containingCell = this.FindClosestParent<Stage>()?.Parent?.DrawSize;
+
+            // Will be null in tests.
+            if (containingCell == null)
+                return;
+
+            float aspectRatio = containingCell.Value.X / containingCell.Value.Y;
+
+            // These numbers are based on mobile phones, aspect ~1.92.
+            float mobileAdjust = 2.83f * Math.Min(1, 7f / stageDefinition.Columns);
+            // We should scale it back for cases like tablets which aren't so extreme.
+            mobileAdjust *= aspectRatio / 1.92f;
+
+            // Best effort until we have better mobile support.
             for (int i = 0; i < stageDefinition.Columns; i++)
-            {
-                // GridContainer+CellContainer containing this stage (gets split up for dual stages).
-                Vector2 containingCell = this.FindClosestParent<Stage>().Parent!.DrawSize;
-
-                // Best effort until we have better mobile support.
-                if (RuntimeInfo.IsMobile)
-                {
-                    // These numbers are based on mobile phones, aspect ~1.92.
-                    float mobileAdjust = 2.83f * Math.Min(1, 7f / stageDefinition.Columns);
-                    // We should scale it back for cases like tablets which aren't so extreme.
-                    mobileAdjust *= (containingCell.X / containingCell.Y) / 1.92f;
-
-                    columns[i].Width *= mobileAdjust;
-                }
-            }
+                columns[i].Width *= mobileAdjust;
         }
 
         protected override void Dispose(bool isDisposing)

From 94f63d604401ad7b2a9153da1b944d6986045e51 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Dec 2023 19:18:53 +0900
Subject: [PATCH 1988/2296] Update resources

---
 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 b0ab8e445c..807e3ede2a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1213.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1127.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1215.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.33.0" />

From b384c9f9388f10ca2447a47e5b0fa75000e75f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Dec 2023 15:42:19 +0100
Subject: [PATCH 1989/2296] Extract common method for determining stable import
 usability of directory

---
 osu.Game/Database/LegacyImportManager.cs      | 46 +++++++++++++++++++
 .../FirstRunSetup/ScreenImportFromStable.cs   |  4 +-
 .../StableDirectorySelectScreen.cs            | 26 +++++------
 3 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Database/LegacyImportManager.cs b/osu.Game/Database/LegacyImportManager.cs
index 20738f859e..7e1641d16f 100644
--- a/osu.Game/Database/LegacyImportManager.cs
+++ b/osu.Game/Database/LegacyImportManager.cs
@@ -3,6 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework;
@@ -54,6 +57,49 @@ namespace osu.Game.Database
 
         public void UpdateStorage(string stablePath) => cachedStorage = new StableStorage(stablePath, gameHost as DesktopGameHost);
 
+        /// <summary>
+        /// Checks whether a valid location to run a stable import from can be determined starting from the supplied <paramref name="directory"/>.
+        /// </summary>
+        /// <param name="directory">The directory to check for stable import eligibility.</param>
+        /// <param name="stableRoot">
+        /// If the return value is <see langword="true"/>,
+        /// this parameter will contain the <see cref="DirectoryInfo"/> to use as the root directory for importing.
+        /// </param>
+        public bool IsUsableForStableImport(DirectoryInfo? directory, [NotNullWhen(true)] out DirectoryInfo? stableRoot)
+        {
+            if (directory == null)
+            {
+                stableRoot = null;
+                return false;
+            }
+
+            // A full stable installation will have a configuration file present.
+            // This is the best case scenario, as it may contain a custom beatmap directory we need to traverse to.
+            if (directory.GetFiles(@"osu!.*.cfg").Any())
+            {
+                stableRoot = directory;
+                return true;
+            }
+
+            // The user may only have their songs or skins folders left.
+            // We still want to allow them to import based on this.
+            if (directory.GetDirectories(@"Songs").Any() || directory.GetDirectories(@"Skins").Any())
+            {
+                stableRoot = directory;
+                return true;
+            }
+
+            // The user may have traversed *inside* their songs or skins folders.
+            if (directory.Parent != null && (directory.Name == @"Songs" || directory.Name == @"Skins"))
+            {
+                stableRoot = directory.Parent;
+                return true;
+            }
+
+            stableRoot = null;
+            return false;
+        }
+
         public bool CheckSongsFolderHardLinkAvailability()
         {
             var stableStorage = GetCurrentStableStorage();
diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs b/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
index 23f3b3e1af..185a47c371 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
@@ -269,11 +269,11 @@ namespace osu.Game.Overlays.FirstRunSetup
                 if (directory.OldValue?.FullName == directory.NewValue.FullName)
                     return;
 
-                if (directory.NewValue?.GetFiles(@"osu!.*.cfg").Any() ?? false)
+                if (legacyImportManager.IsUsableForStableImport(directory.NewValue, out var stableRoot))
                 {
                     this.HidePopover();
 
-                    string path = directory.NewValue.FullName;
+                    string path = stableRoot.FullName;
 
                     legacyImportManager.UpdateStorage(path);
                     Current.Value = path;
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 17f09ade4e..3f12b9c0df 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -1,11 +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 System.IO;
-using System.Linq;
 using System.Threading.Tasks;
+using osu.Framework.Allocation;
 using osu.Framework.Localisation;
 using osu.Framework.Screens;
+using osu.Game.Database;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -13,18 +15,12 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     {
         private readonly TaskCompletionSource<string> taskCompletionSource;
 
+        [Resolved]
+        private LegacyImportManager legacyImportManager { get; set; } = null!;
+
         protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
 
-        protected override bool IsValidDirectory(DirectoryInfo? info) =>
-            // A full stable installation will have a configuration file present.
-            // This is the best case scenario, as it may contain a custom beatmap directory we need to traverse to.
-            info?.GetFiles("osu!.*.cfg").Any() == true ||
-            // The user may only have their songs or skins folders left.
-            // We still want to allow them to import based on this.
-            info?.GetDirectories("Songs").Any() == true ||
-            info?.GetDirectories("Skins").Any() == true ||
-            // The user may have traverse *inside* their songs or skins folders.
-            shouldUseParentDirectory(info);
+        protected override bool IsValidDirectory(DirectoryInfo? info) => legacyImportManager.IsUsableForStableImport(info, out _);
 
         public override LocalisableString HeaderText => "Please select your osu!stable install location";
 
@@ -35,7 +31,10 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override void OnSelection(DirectoryInfo directory)
         {
-            taskCompletionSource.TrySetResult(shouldUseParentDirectory(directory) ? directory.Parent!.FullName : directory.FullName);
+            if (!legacyImportManager.IsUsableForStableImport(directory, out var stableRoot))
+                throw new InvalidOperationException($@"{nameof(OnSelection)} was called on an invalid directory. This should never happen.");
+
+            taskCompletionSource.TrySetResult(stableRoot.FullName);
             this.Exit();
         }
 
@@ -44,8 +43,5 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             taskCompletionSource.TrySetCanceled();
             return base.OnExiting(e);
         }
-
-        private bool shouldUseParentDirectory(DirectoryInfo? info)
-            => info?.Parent != null && (info.Name == "Songs" || info.Name == "Skins");
     }
 }

From acb7016156c7dd3411ed1d70154eafaab970e57e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 15 Dec 2023 23:53:26 +0900
Subject: [PATCH 1990/2296] Remove unused using

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
index 2a3655eccd..d12020db59 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Replays;

From 91f4123aa79b05c0a3e56a4025b54f993e001b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Dec 2023 16:00:29 +0100
Subject: [PATCH 1991/2296] Fix first run locator stable locator directory
 desyncing between display & popover

---
 .../FirstRunSetup/ScreenImportFromStable.cs   | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs b/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
index 185a47c371..24ac5e72e8 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenImportFromStable.cs
@@ -244,6 +244,8 @@ namespace osu.Game.Overlays.FirstRunSetup
             [Resolved(canBeNull: true)] // Can't really be null but required to handle potential of disposal before DI completes.
             private OsuGameBase? game { get; set; }
 
+            private bool changingDirectory;
+
             protected override void LoadComplete()
             {
                 base.LoadComplete();
@@ -259,24 +261,37 @@ namespace osu.Game.Overlays.FirstRunSetup
 
             private void onDirectorySelected(ValueChangedEvent<DirectoryInfo?> directory)
             {
-                if (directory.NewValue == null)
-                {
-                    Current.Value = string.Empty;
+                if (changingDirectory)
                     return;
+
+                try
+                {
+                    changingDirectory = true;
+
+                    if (directory.NewValue == null)
+                    {
+                        Current.Value = string.Empty;
+                        return;
+                    }
+
+                    // DirectorySelectors can trigger a noop value changed, but `DirectoryInfo` equality doesn't catch this.
+                    if (directory.OldValue?.FullName == directory.NewValue.FullName)
+                        return;
+
+                    if (legacyImportManager.IsUsableForStableImport(directory.NewValue, out var stableRoot))
+                    {
+                        this.HidePopover();
+
+                        string path = stableRoot.FullName;
+
+                        legacyImportManager.UpdateStorage(path);
+                        Current.Value = path;
+                        currentDirectory.Value = stableRoot;
+                    }
                 }
-
-                // DirectorySelectors can trigger a noop value changed, but `DirectoryInfo` equality doesn't catch this.
-                if (directory.OldValue?.FullName == directory.NewValue.FullName)
-                    return;
-
-                if (legacyImportManager.IsUsableForStableImport(directory.NewValue, out var stableRoot))
+                finally
                 {
-                    this.HidePopover();
-
-                    string path = stableRoot.FullName;
-
-                    legacyImportManager.UpdateStorage(path);
-                    Current.Value = path;
+                    changingDirectory = false;
                 }
             }
 

From 432ce275c4dad16cc1ad848bfbe4900445d0c8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Dec 2023 20:43:18 +0100
Subject: [PATCH 1992/2296] Explain magic constants better

---
 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
index 3ecd14ce81..8734f8ac8a 100644
--- a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -118,8 +118,9 @@ namespace osu.Game.Rulesets.Mania.UI
 
             float aspectRatio = containingCell.Value.X / containingCell.Value.Y;
 
-            // These numbers are based on mobile phones, aspect ~1.92.
+            // 2.83 is a mostly arbitrary scale-up (170 / 60, based on original implementation for argon)
             float mobileAdjust = 2.83f * Math.Min(1, 7f / stageDefinition.Columns);
+            // 1.92 is a "reference" mobile screen aspect ratio for phones.
             // We should scale it back for cases like tablets which aren't so extreme.
             mobileAdjust *= aspectRatio / 1.92f;
 

From f07771f59b19c5ac3c9d9709bb32d3baf6fe4138 Mon Sep 17 00:00:00 2001
From: clayton <me@clayton.cc>
Date: Fri, 15 Dec 2023 22:41:55 -0800
Subject: [PATCH 1993/2296] Fix fallback column colors for legacy split stage
 mania skins

---
 .../Skinning/Legacy/LegacyManiaColumnElement.cs               | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
index 7e3fb0438c..3a69142b3c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
@@ -34,7 +34,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                 FallbackColumnIndex = "S";
             else
             {
-                int distanceToEdge = Math.Min(Column.Index, (stage.Columns - 1) - Column.Index);
+                // Account for cases like dual-stage (assume that all stages have the same column count for now).
+                int columnInStage = Column.Index % stage.Columns;
+                int distanceToEdge = Math.Min(columnInStage, (stage.Columns - 1) - columnInStage);
                 FallbackColumnIndex = distanceToEdge % 2 == 0 ? "1" : "2";
             }
         }

From d7aca2f64143d75d11fb09f2acfbb10709396206 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 17 Dec 2023 19:27:03 +0900
Subject: [PATCH 1994/2296] Add IApplicableHealthProcessor

---
 .../Mods/IApplicableHealthProcessor.cs         | 18 ++++++++++++++++++
 osu.Game/Screens/Play/Player.cs                |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Rulesets/Mods/IApplicableHealthProcessor.cs

diff --git a/osu.Game/Rulesets/Mods/IApplicableHealthProcessor.cs b/osu.Game/Rulesets/Mods/IApplicableHealthProcessor.cs
new file mode 100644
index 0000000000..e16faa9595
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/IApplicableHealthProcessor.cs
@@ -0,0 +1,18 @@
+// 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.Scoring;
+
+namespace osu.Game.Rulesets.Mods
+{
+    /// <summary>
+    /// Interface for a <see cref="Mod"/> that provides its own health processor.
+    /// </summary>
+    public interface IApplicableHealthProcessor
+    {
+        /// <summary>
+        /// Creates the <see cref="HealthProcessor"/>.
+        /// </summary>
+        HealthProcessor CreateHealthProcessor(double drainStartTime);
+    }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1c97efcff7..cc08079d88 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -227,7 +227,8 @@ namespace osu.Game.Screens.Play
 
             dependencies.CacheAs(ScoreProcessor);
 
-            HealthProcessor = ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
+            HealthProcessor = gameplayMods.OfType<IApplicableHealthProcessor>().FirstOrDefault()?.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
+            HealthProcessor ??= ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
             HealthProcessor.ApplyBeatmap(playableBeatmap);
 
             dependencies.CacheAs(HealthProcessor);

From 4b9aefa6f2d7b7ad5a2fdc31685a6a900c55d444 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 17 Dec 2023 19:33:02 +0900
Subject: [PATCH 1995/2296] Change osu ruleset to use new HP algorithm by
 default

---
 .../TestSceneOsuHealthProcessor.cs                        | 8 ++++----
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs               | 7 ++++++-
 osu.Game.Rulesets.Osu/OsuRuleset.cs                       | 2 --
 ...{OsuHealthProcessor.cs => OsuLegacyHealthProcessor.cs} | 4 ++--
 osu.Game/Rulesets/Mods/IApplicableHealthProcessor.cs      | 4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)
 rename osu.Game.Rulesets.Osu/Scoring/{OsuHealthProcessor.cs => OsuLegacyHealthProcessor.cs} (95%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs
index 16f28c0212..83c818c20d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestNoBreak()
         {
-            OsuHealthProcessor hp = new OsuHealthProcessor(-1000);
+            OsuLegacyHealthProcessor hp = new OsuLegacyHealthProcessor(-1000);
             hp.ApplyBeatmap(new Beatmap<OsuHitObject>
             {
                 HitObjects =
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestSingleBreak()
         {
-            OsuHealthProcessor hp = new OsuHealthProcessor(-1000);
+            OsuLegacyHealthProcessor hp = new OsuLegacyHealthProcessor(-1000);
             hp.ApplyBeatmap(new Beatmap<OsuHitObject>
             {
                 HitObjects =
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestOverlappingBreak()
         {
-            OsuHealthProcessor hp = new OsuHealthProcessor(-1000);
+            OsuLegacyHealthProcessor hp = new OsuLegacyHealthProcessor(-1000);
             hp.ApplyBeatmap(new Beatmap<OsuHitObject>
             {
                 HitObjects =
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestSequentialBreak()
         {
-            OsuHealthProcessor hp = new OsuHealthProcessor(-1000);
+            OsuLegacyHealthProcessor hp = new OsuLegacyHealthProcessor(-1000);
             hp.ApplyBeatmap(new Beatmap<OsuHitObject>
             {
                 HitObjects =
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index f20f95b384..10d7af5e58 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -18,7 +18,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModClassic : ModClassic, IApplicableToHitObject, IApplicableToDrawableHitObject, IApplicableToDrawableRuleset<OsuHitObject>
+    public class OsuModClassic : ModClassic, IApplicableToHitObject, IApplicableToDrawableHitObject, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableHealthProcessor
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModStrictTracking)).ToArray();
 
@@ -34,6 +34,9 @@ namespace osu.Game.Rulesets.Osu.Mods
         [SettingSource("Fade out hit circles earlier", "Make hit circles fade out into a miss, rather than after it.")]
         public Bindable<bool> FadeHitCircleEarly { get; } = new Bindable<bool>(true);
 
+        [SettingSource("Classic health", "More closely resembles the original HP drain mechanics.")]
+        public Bindable<bool> ClassicHealth { get; } = new Bindable<bool>(true);
+
         private bool usingHiddenFading;
 
         public void ApplyToHitObject(HitObject hitObject)
@@ -115,5 +118,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 }
             };
         }
+
+        public HealthProcessor? CreateHealthProcessor(double drainStartTime) => ClassicHealth.Value ? new OsuLegacyHealthProcessor(drainStartTime) : null;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 35cbfa3790..e53f20277b 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -48,8 +48,6 @@ namespace osu.Game.Rulesets.Osu
 
         public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
 
-        public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new OsuHealthProcessor(drainStartTime);
-
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new OsuBeatmapConverter(beatmap, this);
 
         public override IBeatmapProcessor CreateBeatmapProcessor(IBeatmap beatmap) => new OsuBeatmapProcessor(beatmap);
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuLegacyHealthProcessor.cs
similarity index 95%
rename from osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
rename to osu.Game.Rulesets.Osu/Scoring/OsuLegacyHealthProcessor.cs
index 7025a7be65..e383e82b86 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuLegacyHealthProcessor.cs
@@ -10,9 +10,9 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
-    public partial class OsuHealthProcessor : LegacyDrainingHealthProcessor
+    public partial class OsuLegacyHealthProcessor : LegacyDrainingHealthProcessor
     {
-        public OsuHealthProcessor(double drainStartTime)
+        public OsuLegacyHealthProcessor(double drainStartTime)
             : base(drainStartTime)
         {
         }
diff --git a/osu.Game/Rulesets/Mods/IApplicableHealthProcessor.cs b/osu.Game/Rulesets/Mods/IApplicableHealthProcessor.cs
index e16faa9595..be46828069 100644
--- a/osu.Game/Rulesets/Mods/IApplicableHealthProcessor.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableHealthProcessor.cs
@@ -11,8 +11,8 @@ namespace osu.Game.Rulesets.Mods
     public interface IApplicableHealthProcessor
     {
         /// <summary>
-        /// Creates the <see cref="HealthProcessor"/>.
+        /// Creates the <see cref="HealthProcessor"/>. May be null to use the ruleset default.
         /// </summary>
-        HealthProcessor CreateHealthProcessor(double drainStartTime);
+        HealthProcessor? CreateHealthProcessor(double drainStartTime);
     }
 }

From 10610d3387acd1863c406723d20e9557459def66 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 17 Dec 2023 19:33:38 +0900
Subject: [PATCH 1996/2296] Rename test scene

---
 ...uHealthProcessor.cs => TestSceneOsuLegacyHealthProcessor.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Rulesets.Osu.Tests/{TestSceneOsuHealthProcessor.cs => TestSceneOsuLegacyHealthProcessor.cs} (98%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuLegacyHealthProcessor.cs
similarity index 98%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs
rename to osu.Game.Rulesets.Osu.Tests/TestSceneOsuLegacyHealthProcessor.cs
index 83c818c20d..a7ae06a9ce 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuLegacyHealthProcessor.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Osu.Scoring;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneOsuHealthProcessor
+    public class TestSceneOsuLegacyHealthProcessor
     {
         [Test]
         public void TestNoBreak()

From f77884b62f0a8c2b8b058c9e1180c21bd25cbdba Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 17 Dec 2023 19:57:48 +0900
Subject: [PATCH 1997/2296] Only hit passed-through ticks if none were missed

---
 .../TestSceneSliderLateHitJudgement.cs        | 23 ++-------------
 .../Objects/Drawables/SliderInputManager.cs   | 29 ++++++++++++++-----
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
index d12020db59..54140e4d49 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         /// If any hitobject does not meet this criteria, ALL hitobjects after that one should be missed.
         /// </summary>
         [Test]
-        public void TestHitLateInRangeDoesNotHitAfterAnyOutOfRange()
+        public void TestHitLateDoesNotHitTicksIfAnyOutOfRange()
         {
             performTest(new List<ReplayFrame>
             {
@@ -241,25 +241,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             assertHeadJudgement(HitResult.Meh);
 
-            // The first few ticks that are in the follow range of the head should be hit.
-            assertTickJudgement(0, HitResult.LargeTickHit); // This tick is hidden under the slider head :(
-            assertTickJudgement(1, HitResult.LargeTickHit);
-            assertTickJudgement(2, HitResult.LargeTickHit);
-
-            // Every other tick should be missed
-            assertTickJudgement(3, HitResult.LargeTickMiss);
-            assertTickJudgement(4, HitResult.LargeTickMiss);
-            assertTickJudgement(5, HitResult.LargeTickMiss);
-            assertTickJudgement(6, HitResult.LargeTickMiss);
-            assertTickJudgement(7, HitResult.LargeTickMiss);
-            assertTickJudgement(8, HitResult.LargeTickMiss);
-            assertTickJudgement(9, HitResult.LargeTickMiss);
-            assertTickJudgement(10, HitResult.LargeTickMiss);
-
-            // In particular, these three are in the follow range of the head, but should not be hit
-            // because the slider was at some point outside the follow range of the head.
-            assertTickJudgement(11, HitResult.LargeTickMiss);
-            assertTickJudgement(12, HitResult.LargeTickMiss);
+            // At least one tick was out of range, so they all should be missed.
+            assertAllTickJudgements(HitResult.LargeTickMiss);
 
             // This particular test actually starts tracking the slider just before the end, so the tail should be hit because of its leniency.
             assertTailJudgement(HitResult.LargeTickHit);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
index 9feeb6ef14..e71f4fcd48 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
@@ -80,10 +80,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Vector2 mousePositionInSlider = slider.ToLocalSpace(screenSpaceMousePosition.Value) - slider.OriginPosition;
 
-            // When the head is hit and the mouse is in the expanded follow area, force a hit on every nested hitobject
-            // from the start of the slider that is within the follow area.
+            // When the head is hit late:
+            // - If the cursor has at all times been within range of the expanded follow area, hit all nested objects that have been passed through.
+            // - If the cursor has at some point left the expanded follow area, miss those nested objects instead.
 
-            bool forceMiss = false;
+            bool allTicksInRange = true;
 
             foreach (var nested in slider.NestedHitObjects.OfType<DrawableOsuHitObject>())
             {
@@ -102,13 +103,27 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 // When the first nested object that is further outside the follow area is reached,
                 // forcefully miss all other nested objects that would otherwise be valid to be hit.
                 // This covers a case of a slider overlapping itself that requires tracking to a tick on an outer edge.
-                if (forceMiss || (objectPosition - mousePositionInSlider).LengthSquared > radius * radius)
+                if ((objectPosition - mousePositionInSlider).LengthSquared > radius * radius)
                 {
-                    nested.MissForcefully();
-                    forceMiss = true;
+                    allTicksInRange = false;
+                    break;
                 }
-                else
+            }
+
+            foreach (var nested in slider.NestedHitObjects.OfType<DrawableOsuHitObject>())
+            {
+                // Skip nested objects that are already judged.
+                if (nested.Judged)
+                    continue;
+
+                // Stop the process when a nested object is reached that can't be hit before the current time.
+                if (nested.HitObject.StartTime > Time.Current)
+                    break;
+
+                if (allTicksInRange)
                     nested.HitForcefully();
+                else
+                    nested.MissForcefully();
             }
 
             // Enable tracking, since the mouse is within the follow area (if it were expanded).

From fbe48d7be84874d902d5559f723379bc5c9c395a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 17 Dec 2023 20:11:15 +0900
Subject: [PATCH 1998/2296] Fix tail being missed too early

---
 osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
index e71f4fcd48..996a477153 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (slider.Tracking.Value)
                 nestedObject.HitForcefully();
-            else
+            else if (timeOffset >= 0)
                 nestedObject.MissForcefully();
         }
 

From 9b02bd712b19b34bd8d3813ce9a2c700063267c7 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 17 Dec 2023 20:12:02 +0900
Subject: [PATCH 1999/2296] Only track if in slider ball after any ticks missed

---
 .../TestSceneSliderLateHitJudgement.cs        | 31 +++++++++++++++++++
 .../Objects/Drawables/SliderInputManager.cs   |  6 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
index 54140e4d49..78633369c7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
@@ -280,6 +280,37 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
+        /// <summary>
+        /// Same as <see cref="TestHitLateInRangeDoesNotHitOutOfRangeTick"/> except the tracking is limited to the ball
+        /// because the tick was missed.
+        /// </summary>
+        [Test]
+        public void TestHitLateInRangeDoesNotHitOutOfRangeTickAndTrackingLimitedToBall()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame(time_slider_start + 150, slider_start_position, OsuAction.LeftButton),
+                new OsuReplayFrame(time_slider_end + 150, slider_start_position, OsuAction.LeftButton),
+            }, s =>
+            {
+                s.Path = new SliderPath(PathType.PERFECT_CURVE, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(50, 50),
+                    new Vector2(20, 0),
+                });
+
+                s.TickDistanceMultiplier = 0.25f;
+                s.SliderVelocityMultiplier = 3;
+            });
+
+            assertHeadJudgement(HitResult.Meh);
+            assertTickJudgement(0, HitResult.LargeTickMiss);
+            assertTickJudgement(1, HitResult.LargeTickMiss);
+            assertTailJudgement(HitResult.LargeTickHit);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
         /// <summary>
         /// If the head circle is hit and the mouse is in range of the follow circle,
         /// then a tick not within the follow radius from the cursor position should not be hit.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
index 996a477153..a497c04894 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
@@ -126,8 +126,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     nested.MissForcefully();
             }
 
-            // Enable tracking, since the mouse is within the follow area (if it were expanded).
-            updateTracking(true);
+            // If all ticks were hit so far, enable tracking the full extent.
+            // If any ticks were missed, assume tracking would've broken at some point, and should only activate if the cursor is within the slider ball.
+            // For the second case, this may be the last chance we have to enable tracking before other objects get judged, otherwise the same would normally happen via Update().
+            updateTracking(allTicksInRange || isMouseInFollowArea(false));
         }
 
         public void TryJudgeNestedObject(DrawableOsuHitObject nestedObject, double timeOffset)

From fddfa33e4982a87b2b27302c0dcd057526827412 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 17 Dec 2023 20:19:17 +0900
Subject: [PATCH 2000/2296] Fix 1-frame issues due to referencing external
 value

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
index a497c04894..d698ba56c4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (!slider.HeadCircle.Judged)
             {
-                if (slider.Tracking.Value)
+                if (Tracking)
                 {
                     // Attempt to preserve correct ordering of judgements as best we can by forcing an un-judged head to be missed when the user has clearly skipped it.
                     slider.HeadCircle.MissForcefully();
@@ -175,7 +175,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 }
             }
 
-            if (slider.Tracking.Value)
+            if (Tracking)
                 nestedObject.HitForcefully();
             else if (timeOffset >= 0)
                 nestedObject.MissForcefully();

From 2b33aec12418e17f462730a4542f81e0d68cfe57 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 17 Dec 2023 21:26:48 +0900
Subject: [PATCH 2001/2296] Require slider head to be judged before ticks

---
 .../TestSceneSliderLateHitJudgement.cs        | 80 ++++++++++++++++---
 .../Objects/Drawables/SliderInputManager.cs   | 13 +--
 2 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
index 78633369c7..e1797e877e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
@@ -341,6 +341,45 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
+        /// <summary>
+        /// Late hit and release on each slider head of a slider stream.
+        /// </summary>
+        [Test]
+        public void TestLateHitSliderStream()
+        {
+            var beatmap = new Beatmap<OsuHitObject>();
+
+            for (int i = 0; i < 20; i++)
+            {
+                beatmap.HitObjects.Add(new Slider
+                {
+                    StartTime = time_slider_start + 75 * i, // 200BPM @ 1/4
+                    Position = new Vector2(256 - slider_path_length / 2, 192),
+                    TickDistanceMultiplier = 3,
+                    Path = new SliderPath(PathType.LINEAR, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(20, 0),
+                    }),
+                });
+            }
+
+            var replay = new List<ReplayFrame>();
+
+            for (int i = 0; i < 20; i++)
+            {
+                replay.Add(new OsuReplayFrame(time_slider_start + 75 * i + 75, slider_start_position, i % 2 == 0 ? OsuAction.LeftButton : OsuAction.RightButton));
+                replay.Add(new OsuReplayFrame(time_slider_start + 75 * i + 140, slider_start_position));
+            }
+
+            performTest(replay, beatmap);
+
+            assertHeadJudgement(HitResult.Meh);
+            assertTickJudgement(0, HitResult.LargeTickMiss);
+            assertTailJudgement(HitResult.IgnoreMiss);
+            assertSliderJudgement(HitResult.IgnoreHit);
+        }
+
         private void assertHeadJudgement(HitResult result)
         {
             AddAssert(
@@ -406,21 +445,36 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             adjustSliderFunc?.Invoke(slider);
 
+            var beatmap = new Beatmap<OsuHitObject>
+            {
+                HitObjects = { slider },
+                BeatmapInfo =
+                {
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        SliderMultiplier = 4,
+                        SliderTickRate = 3
+                    },
+                    Ruleset = new OsuRuleset().RulesetInfo,
+                }
+            };
+
+            performTest(frames, beatmap);
+        }
+
+        private void performTest(List<ReplayFrame> frames, Beatmap<OsuHitObject> beatmap)
+        {
+            beatmap.BeatmapInfo.Ruleset = new OsuRuleset().RulesetInfo;
+            beatmap.BeatmapInfo.StackLeniency = 0;
+            beatmap.BeatmapInfo.Difficulty = new BeatmapDifficulty
+            {
+                SliderMultiplier = 4,
+                SliderTickRate = 3,
+            };
+
             AddStep("load player", () =>
             {
-                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
-                {
-                    HitObjects = { slider },
-                    BeatmapInfo =
-                    {
-                        Difficulty = new BeatmapDifficulty
-                        {
-                            SliderMultiplier = 4,
-                            SliderTickRate = 3
-                        },
-                        Ruleset = new OsuRuleset().RulesetInfo,
-                    }
-                });
+                Beatmap.Value = CreateWorkingBeatmap(beatmap);
 
                 var p = new ScoreAccessibleReplayPlayer(new Score { Replay = new Replay { Frames = frames } });
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
index d698ba56c4..8aa982783e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
@@ -162,18 +162,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             if (!slider.HeadCircle.Judged)
-            {
-                if (Tracking)
-                {
-                    // Attempt to preserve correct ordering of judgements as best we can by forcing an un-judged head to be missed when the user has clearly skipped it.
-                    slider.HeadCircle.MissForcefully();
-                }
-                else
-                {
-                    // Don't judge this object as a miss before the head has been judged, to allow the head to be hit late.
-                    return;
-                }
-            }
+                return;
 
             if (Tracking)
                 nestedObject.HitForcefully();

From 04d542105f1518119f18f7d3b160802d7d468e67 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 17 Dec 2023 21:52:21 +0900
Subject: [PATCH 2002/2296] Fix assertions

---
 .../TestSceneSliderLateHitJudgement.cs                    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
index e1797e877e..6ba9c723da 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
@@ -374,10 +374,10 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             performTest(replay, beatmap);
 
-            assertHeadJudgement(HitResult.Meh);
-            assertTickJudgement(0, HitResult.LargeTickMiss);
-            assertTailJudgement(HitResult.IgnoreMiss);
-            assertSliderJudgement(HitResult.IgnoreHit);
+            AddAssert(
+                $"all heads = {HitResult.Ok}",
+                () => judgementResults.Where(r => r.HitObject is SliderHeadCircle).Select(r => r.Type),
+                () => Has.All.EqualTo(HitResult.Ok));
         }
 
         private void assertHeadJudgement(HitResult result)

From 30116512ca2dcd61a63813cab04cfc9d9bacb734 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 18 Dec 2023 12:01:51 +0900
Subject: [PATCH 2003/2296] Populate MaxCombo scoring attrib for non-osu
 rulesets

---
 .../Difficulty/CatchLegacyScoreSimulator.cs                 | 1 +
 .../Difficulty/ManiaLegacyScoreSimulator.cs                 | 6 +++++-
 .../Difficulty/TaikoLegacyScoreSimulator.cs                 | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index ed27e11208..7a84d9245d 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -75,6 +75,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             attributes.BonusScoreRatio = legacyBonusScore == 0 ? 0 : (double)standardisedBonusScore / legacyBonusScore;
             attributes.BonusScore = legacyBonusScore;
+            attributes.MaxCombo = combo;
 
             return attributes;
         }
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
index ddb4b868a3..d9fd96ac6a 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
@@ -15,7 +15,11 @@ namespace osu.Game.Rulesets.Mania.Difficulty
     {
         public LegacyScoreAttributes Simulate(IWorkingBeatmap workingBeatmap, IBeatmap playableBeatmap)
         {
-            return new LegacyScoreAttributes { ComboScore = 1000000 };
+            return new LegacyScoreAttributes
+            {
+                ComboScore = 1000000,
+                MaxCombo = 0 // Max combo is mod-dependent, so any value here is insufficient.
+            };
         }
 
         public double GetLegacyScoreMultiplier(IReadOnlyList<Mod> mods, LegacyBeatmapConversionDifficultyInfo difficulty)
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index 1db44592b8..a8ed056c89 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -76,6 +76,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
 
             attributes.BonusScoreRatio = legacyBonusScore == 0 ? 0 : (double)standardisedBonusScore / legacyBonusScore;
             attributes.BonusScore = legacyBonusScore;
+            attributes.MaxCombo = combo;
 
             return attributes;
         }

From f84c1815734d5aa7a921a0feacc73611f1568c51 Mon Sep 17 00:00:00 2001
From: clayton <me@clayton.cc>
Date: Sun, 17 Dec 2023 23:47:50 -0800
Subject: [PATCH 2004/2296] Don't convert TaikoModRandom to/from legacy mods

---
 .../TaikoLegacyModConversionTest.cs                 |  1 -
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs             | 13 -------------
 2 files changed, 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
index 5f7a78ddf1..c15dc17ae4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoLegacyModConversionTest.cs
@@ -25,7 +25,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
             new object[] { LegacyMods.HalfTime, new[] { typeof(TaikoModHalfTime) } },
             new object[] { LegacyMods.Flashlight, new[] { typeof(TaikoModFlashlight) } },
             new object[] { LegacyMods.Autoplay, new[] { typeof(TaikoModAutoplay) } },
-            new object[] { LegacyMods.Random, new[] { typeof(TaikoModRandom) } },
             new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(TaikoModHardRock), typeof(TaikoModDoubleTime) } },
             new object[] { LegacyMods.ScoreV2, new[] { typeof(ModScoreV2) } },
         };
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 9d34a34fce..ad3b7b09f7 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -115,23 +115,10 @@ namespace osu.Game.Rulesets.Taiko
             if (mods.HasFlagFast(LegacyMods.Relax))
                 yield return new TaikoModRelax();
 
-            if (mods.HasFlagFast(LegacyMods.Random))
-                yield return new TaikoModRandom();
-
             if (mods.HasFlagFast(LegacyMods.ScoreV2))
                 yield return new ModScoreV2();
         }
 
-        public override LegacyMods ConvertToLegacyMods(Mod[] mods)
-        {
-            var value = base.ConvertToLegacyMods(mods);
-
-            if (mods.OfType<TaikoModRandom>().Any())
-                value |= LegacyMods.Random;
-
-            return value;
-        }
-
         public override IEnumerable<Mod> GetModsFor(ModType type)
         {
             switch (type)

From ef230884a87a51a25b9380193a13b94ff8144ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Dec 2023 09:03:01 +0100
Subject: [PATCH 2005/2296] Fix collections dropdown crashing during storage
 migration

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

`CollectionDropdown.collectionsChanged()` was assuming that if it
received `null` changes, then it must mean that the change subscription
is being initialised and the `filters` list will not contain any items.

However, that is not the only circumstance wherein a realm subscription
can fire with `null` changes; that can also happen after the main realm
instance gets recycled via the notification registration flow:

	https://github.com/ppy/osu/blob/2f28a92f0a03c8aed6fac2ec7fb41f7ed865f798/osu.Game/Database/RealmAccess.cs#L545-L549

	https://github.com/ppy/osu/blob/2f28a92f0a03c8aed6fac2ec7fb41f7ed865f798/osu.Game/Database/RealmAccess.cs#L1228-L1251

Therefore, to fix the crash, just ensure that the list is cleared every
time.
---
 osu.Game/Collections/CollectionDropdown.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Collections/CollectionDropdown.cs b/osu.Game/Collections/CollectionDropdown.cs
index e43d8f4b02..8d83ed3ec9 100644
--- a/osu.Game/Collections/CollectionDropdown.cs
+++ b/osu.Game/Collections/CollectionDropdown.cs
@@ -66,6 +66,7 @@ namespace osu.Game.Collections
         {
             if (changes == null)
             {
+                filters.Clear();
                 filters.Add(allBeatmapsItem);
                 filters.AddRange(collections.Select(c => new CollectionFilterMenuItem(c.ToLive(realm))));
                 if (ShowManageCollectionsItem)

From 7462a9f4ab84997dfd550f8b3025f5630c72beab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 18:17:47 +0900
Subject: [PATCH 2006/2296] Add helper method to handle progress notifications
 for background jobs

---
 osu.Game/BackgroundDataStoreProcessor.cs | 51 +++++++++++++++++++-----
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 10cc13dc29..794d534f10 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -279,20 +279,17 @@ namespace osu.Game
             if (scoreIds.Count == 0)
                 return;
 
-            ProgressNotification notification = new ProgressNotification { State = ProgressNotificationState.Active };
-
-            notificationOverlay?.Post(notification);
+            var notification = showProgressNotification("Upgrading scores to new scoring algorithm", "scores have been upgraded to the new scoring algorithm");
 
             int processedCount = 0;
             int failedCount = 0;
 
             foreach (var id in scoreIds)
             {
-                if (notification.State == ProgressNotificationState.Cancelled)
+                if (notification?.State == ProgressNotificationState.Cancelled)
                     break;
 
-                notification.Text = $"Upgrading scores to new scoring algorithm ({processedCount} of {scoreIds.Count})";
-                notification.Progress = (float)processedCount / scoreIds.Count;
+                updateNotificationProgress(notification, processedCount, scoreIds.Count);
 
                 sleepIfRequired();
 
@@ -325,24 +322,58 @@ namespace osu.Game
                 }
             }
 
-            if (processedCount == scoreIds.Count)
+            completeNotification(notification, processedCount, scoreIds.Count, failedCount);
+        }
+
+        private void updateNotificationProgress(ProgressNotification? notification, int processedCount, int totalCount)
+        {
+            if (notification == null)
+                return;
+
+            notification.Text = notification.Text.ToString().Split('(').First().TrimEnd() + $" ({processedCount} of {totalCount})";
+            notification.Progress = (float)processedCount / totalCount;
+        }
+
+        private void completeNotification(ProgressNotification? notification, int processedCount, int totalCount, int? failedCount = null)
+        {
+            if (notification == null)
+                return;
+
+            if (processedCount == totalCount)
             {
-                notification.CompletionText = $"{processedCount} score(s) have been upgraded to the new scoring algorithm";
+                notification.CompletionText = $"{processedCount} {notification.CompletionText}";
                 notification.Progress = 1;
                 notification.State = ProgressNotificationState.Completed;
             }
             else
             {
-                notification.Text = $"{processedCount} of {scoreIds.Count} score(s) have been upgraded to the new scoring algorithm.";
+                notification.Text = $"{processedCount} of {totalCount} {notification.CompletionText}";
 
                 // We may have arrived here due to user cancellation or completion with failures.
                 if (failedCount > 0)
-                    notification.Text += $" Check logs for issues with {failedCount} failed upgrades.";
+                    notification.Text += $" Check logs for issues with {failedCount} failed items.";
 
                 notification.State = ProgressNotificationState.Cancelled;
             }
         }
 
+        private ProgressNotification? showProgressNotification(string running, string completed)
+        {
+            if (notificationOverlay == null)
+                return null;
+
+            ProgressNotification notification = new ProgressNotification
+            {
+                Text = running,
+                CompletionText = completed,
+                State = ProgressNotificationState.Active
+            };
+
+            notificationOverlay?.Post(notification);
+
+            return notification;
+        }
+
         private void sleepIfRequired()
         {
             while (localUserPlayInfo?.IsPlaying.Value == true)

From e7d1cf7868663126479d2997b7d0da3062817072 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 18:22:40 +0900
Subject: [PATCH 2007/2296] Add progress notifications for background tasks
 which don't already have them

---
 osu.Game/BackgroundDataStoreProcessor.cs | 60 +++++++++++++++++++++---
 1 file changed, 54 insertions(+), 6 deletions(-)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 794d534f10..58b1c912c4 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -144,12 +144,24 @@ namespace osu.Game
                 }
             });
 
+            if (beatmapSetIds.Count == 0)
+                return;
+
             Logger.Log($"Found {beatmapSetIds.Count} beatmap sets which require reprocessing.");
 
-            int i = 0;
+            // Technically this is doing more than just star ratings, but easier for the end user to understand.
+            var notification = showProgressNotification("Reprocessing star rating for beatmaps", "beatmaps' star ratings have been updated");
+
+            int processedCount = 0;
+            int failedCount = 0;
 
             foreach (var id in beatmapSetIds)
             {
+                if (notification?.State == ProgressNotificationState.Cancelled)
+                    break;
+
+                updateNotificationProgress(notification, processedCount, beatmapSetIds.Count);
+
                 sleepIfRequired();
 
                 realmAccess.Run(r =>
@@ -160,16 +172,19 @@ namespace osu.Game
                     {
                         try
                         {
-                            Logger.Log($"Background processing {set} ({++i} / {beatmapSetIds.Count})");
                             beatmapUpdater.Process(set);
+                            ++processedCount;
                         }
                         catch (Exception e)
                         {
                             Logger.Log($"Background processing failed on {set}: {e}");
+                            ++failedCount;
                         }
                     }
                 });
             }
+
+            completeNotification(notification, processedCount, beatmapSetIds.Count, failedCount);
         }
 
         private void processBeatmapsWithMissingObjectCounts()
@@ -184,12 +199,23 @@ namespace osu.Game
                     beatmapIds.Add(b.ID);
             });
 
-            Logger.Log($"Found {beatmapIds.Count} beatmaps which require reprocessing.");
+            if (beatmapIds.Count == 0)
+                return;
 
-            int i = 0;
+            Logger.Log($"Found {beatmapIds.Count} beatmaps which require statistics population.");
+
+            var notification = showProgressNotification("Populating missing statistics for beatmaps", "beatmaps have been populated with missing statistics");
+
+            int processedCount = 0;
+            int failedCount = 0;
 
             foreach (var id in beatmapIds)
             {
+                if (notification?.State == ProgressNotificationState.Cancelled)
+                    break;
+
+                updateNotificationProgress(notification, processedCount, beatmapIds.Count);
+
                 sleepIfRequired();
 
                 realmAccess.Run(r =>
@@ -200,16 +226,19 @@ namespace osu.Game
                     {
                         try
                         {
-                            Logger.Log($"Background processing {beatmap} ({++i} / {beatmapIds.Count})");
                             beatmapUpdater.ProcessObjectCounts(beatmap);
+                            ++processedCount;
                         }
                         catch (Exception e)
                         {
                             Logger.Log($"Background processing failed on {beatmap}: {e}");
+                            ++failedCount;
                         }
                     }
                 });
             }
+
+            completeNotification(notification, processedCount, beatmapIds.Count, failedCount);
         }
 
         private void processScoresWithMissingStatistics()
@@ -231,10 +260,23 @@ namespace osu.Game
                 }
             });
 
-            Logger.Log($"Found {scoreIds.Count} scores which require reprocessing.");
+            if (scoreIds.Count == 0)
+                return;
+
+            Logger.Log($"Found {scoreIds.Count} scores which require statistics population.");
+
+            var notification = showProgressNotification("Populating missing statistics for scores", "scores have been populated with missing statistics");
+
+            int processedCount = 0;
+            int failedCount = 0;
 
             foreach (var id in scoreIds)
             {
+                if (notification?.State == ProgressNotificationState.Cancelled)
+                    break;
+
+                updateNotificationProgress(notification, processedCount, scoreIds.Count);
+
                 sleepIfRequired();
 
                 try
@@ -251,6 +293,7 @@ namespace osu.Game
                     });
 
                     Logger.Log($"Populated maximum statistics for score {id}");
+                    ++processedCount;
                 }
                 catch (ObjectDisposedException)
                 {
@@ -260,8 +303,11 @@ namespace osu.Game
                 {
                     Logger.Log(@$"Failed to populate maximum statistics for {id}: {e}");
                     realmAccess.Write(r => r.Find<ScoreInfo>(id)!.BackgroundReprocessingFailed = true);
+                    ++failedCount;
                 }
             }
+
+            completeNotification(notification, processedCount, scoreIds.Count, failedCount);
         }
 
         private void convertLegacyTotalScoreToStandardised()
@@ -332,6 +378,8 @@ namespace osu.Game
 
             notification.Text = notification.Text.ToString().Split('(').First().TrimEnd() + $" ({processedCount} of {totalCount})";
             notification.Progress = (float)processedCount / totalCount;
+
+            // TODO add log output
         }
 
         private void completeNotification(ProgressNotification? notification, int processedCount, int totalCount, int? failedCount = null)

From bfa90e9dcb73f0c8687a184e4b91b95d2d98d72f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 18:34:55 +0900
Subject: [PATCH 2008/2296] Also populate `ObjectCount`s when running a full
 beatmap process

Saves running things twice on an old install
---
 osu.Game/BackgroundDataStoreProcessor.cs | 1 +
 osu.Game/Beatmaps/BeatmapUpdater.cs      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 58b1c912c4..38dc170ccc 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -67,6 +67,7 @@ namespace osu.Game
 
                 checkForOutdatedStarRatings();
                 processBeatmapSetsWithMissingMetrics();
+                // Note that the previous method will also update these on a fresh run.
                 processBeatmapsWithMissingObjectCounts();
                 processScoresWithMissingStatistics();
                 convertLegacyTotalScoreToStandardised();
diff --git a/osu.Game/Beatmaps/BeatmapUpdater.cs b/osu.Game/Beatmaps/BeatmapUpdater.cs
index 27492b8bac..e897d28916 100644
--- a/osu.Game/Beatmaps/BeatmapUpdater.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdater.cs
@@ -77,6 +77,8 @@ namespace osu.Game.Beatmaps
                 beatmap.StarRating = calculator.Calculate().StarRating;
                 beatmap.Length = working.Beatmap.CalculatePlayableLength();
                 beatmap.BPM = 60000 / working.Beatmap.GetMostCommonBeatLength();
+                beatmap.EndTimeObjectCount = working.Beatmap.HitObjects.Count(h => h is IHasDuration);
+                beatmap.TotalObjectCount = working.Beatmap.HitObjects.Count;
             }
 
             // And invalidate again afterwards as re-fetching the most up-to-date database metadata will be required.

From 5ab38151239d39d4feec8b2f84d92e651c992a60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 18:41:36 +0900
Subject: [PATCH 2009/2296] Add logging of progress every so often

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

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 38dc170ccc..6a801ab5bf 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -380,7 +380,8 @@ namespace osu.Game
             notification.Text = notification.Text.ToString().Split('(').First().TrimEnd() + $" ({processedCount} of {totalCount})";
             notification.Progress = (float)processedCount / totalCount;
 
-            // TODO add log output
+            if (processedCount % 100 == 0)
+                Logger.Log(notification.Text.ToString());
         }
 
         private void completeNotification(ProgressNotification? notification, int processedCount, int totalCount, int? failedCount = null)

From e3251b40b311e504c6bb22e75e1b1ab347704714 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 19:00:44 +0900
Subject: [PATCH 2010/2296] Fix progress notifications queueing up infinite
 text changes when not visible

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

diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 6ea032213e..2362cb11f6 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Notifications
             set
             {
                 text = value;
-                Schedule(() => textDrawable.Text = text);
+                Scheduler.AddOnce(t => textDrawable.Text = t, text);
             }
         }
 

From 62444c3d0423284daf1f8511977cd8d8f93fab6b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 19:17:59 +0900
Subject: [PATCH 2011/2296] Fix song select's carousel scroll position getting
 reset on background processing

This only happened for users using absolute right-click scroll.
---
 osu.Game/Graphics/Containers/OsuScrollContainer.cs     | 10 +++++-----
 .../Graphics/Containers/UserTrackingScrollContainer.cs |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuScrollContainer.cs b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
index da6996c170..124becc35a 100644
--- a/osu.Game/Graphics/Containers/OsuScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
@@ -44,9 +44,6 @@ namespace osu.Game.Graphics.Containers
 
         private bool shouldPerformRightMouseScroll(MouseButtonEvent e) => RightMouseScrollbar && e.Button == MouseButton.Right;
 
-        private void scrollFromMouseEvent(MouseEvent e) =>
-            ScrollTo(Clamp(ToLocalSpace(e.ScreenSpaceMousePosition)[ScrollDim] / DrawSize[ScrollDim]) * Content.DrawSize[ScrollDim], true, DistanceDecayOnRightMouseScrollbar);
-
         private bool rightMouseDragging;
 
         protected override bool IsDragging => base.IsDragging || rightMouseDragging;
@@ -80,7 +77,7 @@ namespace osu.Game.Graphics.Containers
         {
             if (shouldPerformRightMouseScroll(e))
             {
-                scrollFromMouseEvent(e);
+                ScrollFromMouseEvent(e);
                 return true;
             }
 
@@ -91,7 +88,7 @@ namespace osu.Game.Graphics.Containers
         {
             if (rightMouseDragging)
             {
-                scrollFromMouseEvent(e);
+                ScrollFromMouseEvent(e);
                 return;
             }
 
@@ -129,6 +126,9 @@ namespace osu.Game.Graphics.Containers
             return base.OnScroll(e);
         }
 
+        protected virtual void ScrollFromMouseEvent(MouseEvent e) =>
+            ScrollTo(Clamp(ToLocalSpace(e.ScreenSpaceMousePosition)[ScrollDim] / DrawSize[ScrollDim]) * Content.DrawSize[ScrollDim], true, DistanceDecayOnRightMouseScrollbar);
+
         protected override ScrollbarContainer CreateScrollbar(Direction direction) => new OsuScrollbar(direction);
 
         protected partial class OsuScrollbar : ScrollbarContainer
diff --git a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
index 6934c95385..354a57b7d2 100644
--- a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -46,6 +47,12 @@ namespace osu.Game.Graphics.Containers
             base.ScrollIntoView(target, animated);
         }
 
+        protected override void ScrollFromMouseEvent(MouseEvent e)
+        {
+            UserScrolling = true;
+            base.ScrollFromMouseEvent(e);
+        }
+
         public new void ScrollTo(float value, bool animated = true, double? distanceDecay = null)
         {
             UserScrolling = false;

From 03ac2c30949c66900e04a67250ff21e2f34f2dfe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 19:20:57 +0900
Subject: [PATCH 2012/2296] Remove some excessive logging

---
 osu.Game/BackgroundDataStoreProcessor.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 6a801ab5bf..55be7f2c9e 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -293,7 +293,6 @@ namespace osu.Game
                         r.Find<ScoreInfo>(id)!.MaximumStatisticsJson = JsonConvert.SerializeObject(score.MaximumStatistics);
                     });
 
-                    Logger.Log($"Populated maximum statistics for score {id}");
                     ++processedCount;
                 }
                 catch (ObjectDisposedException)
@@ -354,7 +353,6 @@ namespace osu.Game
                         s.TotalScoreVersion = LegacyScoreEncoder.LATEST_VERSION;
                     });
 
-                    Logger.Log($"Converted total score for score {id}");
                     ++processedCount;
                 }
                 catch (ObjectDisposedException)

From 32cc3f9ef74594875f9049bbe7f5bdea901cb1e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 20:00:57 +0900
Subject: [PATCH 2013/2296] Combine multiple similar invalidation logic into
 single event

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 33 ++++++++--------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index eb47a7201a..19ade780e1 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Screens.Select
             applyActiveCriteria(false);
 
             if (loadedTestBeatmaps)
-                signalBeatmapsLoaded();
+                invalidateAfterChange(true);
 
             // Restore selection
             if (selectedBeatmapBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedBeatmapBefore.BeatmapSet!.ID, out var newSelectionCandidates))
@@ -298,7 +298,8 @@ namespace osu.Game.Screens.Select
                         removeBeatmapSet(id);
                 }
 
-                signalBeatmapsLoaded();
+                invalidateAfterChange(!BeatmapSetsLoaded);
+                BeatmapSetsLoaded = true;
                 return;
             }
 
@@ -393,12 +394,7 @@ namespace osu.Game.Screens.Select
                 root.RemoveItem(set);
             }
 
-            itemsCache.Invalidate();
-
-            if (!Scroll.UserScrolling)
-                ScrollToSelected(true);
-
-            BeatmapSetsChanged?.Invoke();
+            invalidateAfterChange(true);
         });
 
         public void UpdateBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
@@ -465,12 +461,7 @@ namespace osu.Game.Screens.Select
                 }
             }
 
-            itemsCache.Invalidate();
-
-            if (!Scroll.UserScrolling)
-                ScrollToSelected(true);
-
-            BeatmapSetsChanged?.Invoke();
+            invalidateAfterChange(true);
         });
 
         /// <summary>
@@ -748,15 +739,15 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private void signalBeatmapsLoaded()
+        private void invalidateAfterChange(bool invokeSetsChangedEvent)
         {
-            if (!BeatmapSetsLoaded)
-            {
-                BeatmapSetsChanged?.Invoke();
-                BeatmapSetsLoaded = true;
-            }
-
             itemsCache.Invalidate();
+
+            if (!Scroll.UserScrolling)
+                ScrollToSelected(true);
+
+            if (invokeSetsChangedEvent)
+                BeatmapSetsChanged?.Invoke();
         }
 
         private float? scrollTarget;

From 87b7699fcc29ab7e70ec1f632a0341bbe08a23b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 20:09:09 +0900
Subject: [PATCH 2014/2296] Avoid calling invalidation logic per beatmap set
 updated

Realm will batch the updates. We don't want to do expensive operations per set when we don't need to.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 33 +++++++++++++++-------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 19ade780e1..63654fd36a 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -289,7 +289,7 @@ namespace osu.Game.Screens.Select
                 foreach (var id in realmSets)
                 {
                     if (!root.BeatmapSetsByID.ContainsKey(id))
-                        UpdateBeatmapSet(realm.Realm.Find<BeatmapSetInfo>(id)!.Detach());
+                        updateBeatmapSet(realm.Realm.Find<BeatmapSetInfo>(id)!.Detach());
                 }
 
                 foreach (var id in root.BeatmapSetsByID.Keys)
@@ -304,10 +304,10 @@ namespace osu.Game.Screens.Select
             }
 
             foreach (int i in changes.NewModifiedIndices)
-                UpdateBeatmapSet(sender[i].Detach());
+                updateBeatmapSet(sender[i].Detach());
 
             foreach (int i in changes.InsertedIndices)
-                UpdateBeatmapSet(sender[i].Detach());
+                updateBeatmapSet(sender[i].Detach());
 
             if (changes.DeletedIndices.Length > 0 && SelectedBeatmapInfo != null)
             {
@@ -348,6 +348,8 @@ namespace osu.Game.Screens.Select
                     SelectBeatmap(sender[modifiedAndInserted.First()].Beatmaps.First());
                 }
             }
+
+            invalidateAfterChange(!BeatmapSetsLoaded);
         }
 
         private void beatmapsChanged(IRealmCollection<BeatmapInfo> sender, ChangeSet? changes)
@@ -356,6 +358,8 @@ namespace osu.Game.Screens.Select
             if (changes == null)
                 return;
 
+            bool changed = false;
+
             foreach (int i in changes.InsertedIndices)
             {
                 var beatmapInfo = sender[i];
@@ -368,17 +372,24 @@ namespace osu.Game.Screens.Select
                 if (root.BeatmapSetsByID.TryGetValue(beatmapSet.ID, out var existingSets)
                     && existingSets.SelectMany(s => s.Beatmaps).All(b => b.BeatmapInfo.ID != beatmapInfo.ID))
                 {
-                    UpdateBeatmapSet(beatmapSet.Detach());
+                    updateBeatmapSet(beatmapSet.Detach());
+                    changed = true;
                 }
             }
+
+            if (changed)
+                invalidateAfterChange(true);
         }
 
         private IQueryable<BeatmapSetInfo> getBeatmapSets(Realm realm) => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected);
 
-        public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet) =>
+        public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
+        {
             removeBeatmapSet(beatmapSet.ID);
+            invalidateAfterChange(true);
+        });
 
-        private void removeBeatmapSet(Guid beatmapSetID) => Schedule(() =>
+        private void removeBeatmapSet(Guid beatmapSetID)
         {
             if (!root.BeatmapSetsByID.TryGetValue(beatmapSetID, out var existingSets))
                 return;
@@ -393,11 +404,15 @@ namespace osu.Game.Screens.Select
 
                 root.RemoveItem(set);
             }
+        }
 
+        public void UpdateBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
+        {
+            updateBeatmapSet(beatmapSet);
             invalidateAfterChange(true);
         });
 
-        public void UpdateBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
+        private void updateBeatmapSet(BeatmapSetInfo beatmapSet)
         {
             Guid? previouslySelectedID = null;
 
@@ -460,9 +475,7 @@ namespace osu.Game.Screens.Select
                         select((CarouselItem?)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
                 }
             }
-
-            invalidateAfterChange(true);
-        });
+        }
 
         /// <summary>
         /// Selects a given beatmap on the carousel.

From 6fa1f5ef9bfaac577cad7b29d4840e9302c6a889 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 20:10:31 +0900
Subject: [PATCH 2015/2296] Simplify invalidation logic

The only case where this was checking is guaranteed by realm to only be called once.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 63654fd36a..5178413ad6 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Screens.Select
             applyActiveCriteria(false);
 
             if (loadedTestBeatmaps)
-                invalidateAfterChange(true);
+                invalidateAfterChange();
 
             // Restore selection
             if (selectedBeatmapBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedBeatmapBefore.BeatmapSet!.ID, out var newSelectionCandidates))
@@ -298,7 +298,7 @@ namespace osu.Game.Screens.Select
                         removeBeatmapSet(id);
                 }
 
-                invalidateAfterChange(!BeatmapSetsLoaded);
+                invalidateAfterChange();
                 BeatmapSetsLoaded = true;
                 return;
             }
@@ -349,7 +349,7 @@ namespace osu.Game.Screens.Select
                 }
             }
 
-            invalidateAfterChange(!BeatmapSetsLoaded);
+            invalidateAfterChange();
         }
 
         private void beatmapsChanged(IRealmCollection<BeatmapInfo> sender, ChangeSet? changes)
@@ -378,7 +378,7 @@ namespace osu.Game.Screens.Select
             }
 
             if (changed)
-                invalidateAfterChange(true);
+                invalidateAfterChange();
         }
 
         private IQueryable<BeatmapSetInfo> getBeatmapSets(Realm realm) => realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected);
@@ -386,7 +386,7 @@ namespace osu.Game.Screens.Select
         public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
         {
             removeBeatmapSet(beatmapSet.ID);
-            invalidateAfterChange(true);
+            invalidateAfterChange();
         });
 
         private void removeBeatmapSet(Guid beatmapSetID)
@@ -409,7 +409,7 @@ namespace osu.Game.Screens.Select
         public void UpdateBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
         {
             updateBeatmapSet(beatmapSet);
-            invalidateAfterChange(true);
+            invalidateAfterChange();
         });
 
         private void updateBeatmapSet(BeatmapSetInfo beatmapSet)
@@ -752,15 +752,14 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private void invalidateAfterChange(bool invokeSetsChangedEvent)
+        private void invalidateAfterChange()
         {
             itemsCache.Invalidate();
 
             if (!Scroll.UserScrolling)
                 ScrollToSelected(true);
 
-            if (invokeSetsChangedEvent)
-                BeatmapSetsChanged?.Invoke();
+            BeatmapSetsChanged?.Invoke();
         }
 
         private float? scrollTarget;

From 034c5cd6541d622fe42ed1c301b647a3ac06afd8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 20:30:56 +0900
Subject: [PATCH 2016/2296] Debounce count updates for good measure

---
 osu.Game/Screens/Select/SongSelect.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index dfea4e3794..7c30fd5baa 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Screens.Select
                 BleedBottom = Footer.HEIGHT,
                 SelectionChanged = updateSelectedBeatmap,
                 BeatmapSetsChanged = carouselBeatmapsLoaded,
-                FilterApplied = updateVisibleBeatmapCount,
+                FilterApplied = () => Scheduler.Add(updateVisibleBeatmapCount),
                 GetRecommendedBeatmap = s => recommender?.GetRecommendedBeatmap(s),
             }, c => carouselContainer.Child = c);
 
@@ -843,7 +843,7 @@ namespace osu.Game.Screens.Select
         private void carouselBeatmapsLoaded()
         {
             bindBindables();
-            updateVisibleBeatmapCount();
+            Scheduler.AddOnce(updateVisibleBeatmapCount);
 
             Carousel.AllowSelection = true;
 
@@ -877,7 +877,8 @@ namespace osu.Game.Screens.Select
         {
             // Intentionally not localised until we have proper support for this (see https://github.com/ppy/osu-framework/pull/4918
             // but also in this case we want support for formatting a number within a string).
-            FilterControl.InformationalText = Carousel.CountDisplayed != 1 ? $"{Carousel.CountDisplayed:#,0} matches" : $"{Carousel.CountDisplayed:#,0} match";
+            int carouselCountDisplayed = Carousel.CountDisplayed;
+            FilterControl.InformationalText = carouselCountDisplayed != 1 ? $"{carouselCountDisplayed:#,0} matches" : $"{carouselCountDisplayed:#,0} match";
         }
 
         private bool boundLocalBindables;

From 5755fa214a450d1663babcad4fd1eb5bcafb12e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 20:44:08 +0900
Subject: [PATCH 2017/2296] Cache non-filtered beatmap counts to massively
 improve count performance

---
 osu.Game/Screens/Select/BeatmapCarousel.cs      |  2 +-
 .../Screens/Select/Carousel/CarouselGroup.cs    | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 5178413ad6..919a320bca 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Select
         /// <summary>
         /// The total count of non-filtered beatmaps displayed.
         /// </summary>
-        public int CountDisplayed => beatmapSets.Where(s => !s.Filtered.Value).Sum(s => s.Beatmaps.Count(b => !b.Filtered.Value));
+        public int CountDisplayed => beatmapSets.Where(s => !s.Filtered.Value).Sum(s => s.TotalItemsNotFiltered);
 
         /// <summary>
         /// The currently selected beatmap set.
diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
index c353ee98ae..5aefdf5e28 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Screens.Select.Carousel
 
         public IReadOnlyList<CarouselItem> Items => items;
 
+        public int TotalItemsNotFiltered { get; private set; }
+
         private readonly List<CarouselItem> items = new List<CarouselItem>();
 
         /// <summary>
@@ -31,6 +33,9 @@ namespace osu.Game.Screens.Select.Carousel
         {
             items.Remove(i);
 
+            if (!i.Filtered.Value)
+                TotalItemsNotFiltered--;
+
             // it's important we do the deselection after removing, so any further actions based on
             // State.ValueChanged make decisions post-removal.
             i.State.Value = CarouselItemState.Collapsed;
@@ -55,6 +60,9 @@ namespace osu.Game.Screens.Select.Carousel
                 // criteria may be null for initial population. the filtering will be applied post-add.
                 items.Add(i);
             }
+
+            if (!i.Filtered.Value)
+                TotalItemsNotFiltered--;
         }
 
         public CarouselGroup(List<CarouselItem>? items = null)
@@ -84,7 +92,14 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Filter(criteria);
 
-            items.ForEach(c => c.Filter(criteria));
+            TotalItemsNotFiltered = 0;
+
+            foreach (var c in items)
+            {
+                c.Filter(criteria);
+                if (!c.Filtered.Value)
+                    TotalItemsNotFiltered++;
+            }
 
             // Sorting is expensive, so only perform if it's actually changed.
             if (lastCriteria?.Sort != criteria.Sort)

From 25df42630ecba979457a9dcd2a7678d154a85a5e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 20:47:08 +0900
Subject: [PATCH 2018/2296] Improve performance of `attemptSelection` using new
 cached count and `LastSelected`

---
 osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
index 7f90e05744..8d2ddc5812 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace osu.Game.Screens.Select.Carousel
 {
@@ -101,7 +100,7 @@ namespace osu.Game.Screens.Select.Carousel
             if (State.Value != CarouselItemState.Selected) return;
 
             // we only perform eager selection if none of our items are in a selected state already.
-            if (Items.Any(i => i.State.Value == CarouselItemState.Selected)) return;
+            if (LastSelected?.State.Value == CarouselItemState.Selected || TotalItemsNotFiltered == 0) return;
 
             PerformSelection();
         }

From be16e0e538465369aa9e33223f2814b34fdbddaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Dec 2023 12:47:42 +0100
Subject: [PATCH 2019/2296] Add failing test for adding collection w/ name
 colliding w/\ default items

---
 .../TestSceneManageCollectionsDialog.cs       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index cfa45ec6ef..747cf73baf 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -166,6 +166,29 @@ namespace osu.Game.Tests.Visual.Collections
             })));
         }
 
+        [Test]
+        public void TestCollectionNameCollisionsWithBuiltInItems()
+        {
+            AddStep("add dropdown", () =>
+            {
+                Add(new CollectionDropdown
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.4f,
+                });
+            });
+            AddStep("add two collections which collide with default items", () => Realm.Write(r => r.Add(new[]
+            {
+                new BeatmapCollection(name: "All beatmaps"),
+                new BeatmapCollection(name: "Manage collections...")
+                {
+                    BeatmapMD5Hashes = { beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0].MD5Hash }
+                },
+            })));
+        }
+
         [Test]
         public void TestRemoveCollectionViaButton()
         {

From eeeb5aa3d4d0eeb8360b345751157eb52f09ad40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Dec 2023 12:52:06 +0100
Subject: [PATCH 2020/2296] Fix crash when creating collections named "All
 beatmaps" or "Manage collections..."

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

The name fallback that was there previously since
https://github.com/ppy/osu/pull/11892 was half broken. This way should
be a lot less prone to failure.
---
 .../Collections/CollectionFilterMenuItem.cs   | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Collections/CollectionFilterMenuItem.cs b/osu.Game/Collections/CollectionFilterMenuItem.cs
index 2ac5784f09..49262ed917 100644
--- a/osu.Game/Collections/CollectionFilterMenuItem.cs
+++ b/osu.Game/Collections/CollectionFilterMenuItem.cs
@@ -37,22 +37,17 @@ namespace osu.Game.Collections
             CollectionName = name;
         }
 
-        public bool Equals(CollectionFilterMenuItem? other)
+        public virtual bool Equals(CollectionFilterMenuItem? other)
         {
-            if (other == null)
-                return false;
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
 
-            // collections may have the same name, so compare first on reference equality.
-            // this relies on the assumption that only one instance of the BeatmapCollection exists game-wide, managed by CollectionManager.
-            if (Collection != null)
-                return Collection.ID == other.Collection?.ID;
+            if (Collection == null) return false;
 
-            // fallback to name-based comparison.
-            // this is required for special dropdown items which don't have a collection (all beatmaps / manage collections items below).
-            return CollectionName == other.CollectionName;
+            return Collection.ID == other.Collection?.ID;
         }
 
-        public override int GetHashCode() => CollectionName.GetHashCode();
+        public override int GetHashCode() => Collection?.ID.GetHashCode() ?? 0;
     }
 
     public class AllBeatmapsCollectionFilterMenuItem : CollectionFilterMenuItem
@@ -61,6 +56,10 @@ namespace osu.Game.Collections
             : base("All beatmaps")
         {
         }
+
+        public override bool Equals(CollectionFilterMenuItem? other) => other is AllBeatmapsCollectionFilterMenuItem;
+
+        public override int GetHashCode() => 1;
     }
 
     public class ManageCollectionsFilterMenuItem : CollectionFilterMenuItem
@@ -69,5 +68,9 @@ namespace osu.Game.Collections
             : base("Manage collections...")
         {
         }
+
+        public override bool Equals(CollectionFilterMenuItem? other) => other is ManageCollectionsFilterMenuItem;
+
+        public override int GetHashCode() => 2;
     }
 }

From 17f1f8bb43b7cadb1765338428870736a6f713bc Mon Sep 17 00:00:00 2001
From: 65-7a <exploit.exploit.02@gmail.com>
Date: Tue, 19 Dec 2023 00:28:23 +1100
Subject: [PATCH 2021/2296] Fix padding on dropdown search bar

---
 osu.Game/Graphics/UserInterface/OsuDropdown.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index ea0da30911..632036fef9 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -397,7 +397,7 @@ namespace osu.Game.Graphics.UserInterface
 
             protected override DropdownSearchBar CreateSearchBar() => new OsuDropdownSearchBar
             {
-                Padding = new MarginPadding { Right = 36 },
+                Padding = new MarginPadding { Right = 26 },
             };
 
             private partial class OsuDropdownSearchBar : DropdownSearchBar

From 25e3a8e82e712d18c904ccfcc29fbcf821e94163 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 22:24:57 +0900
Subject: [PATCH 2022/2296] Fix a few of silly issues

---
 osu.Game/Screens/Select/BeatmapCarousel.cs        | 3 +++
 osu.Game/Screens/Select/Carousel/CarouselGroup.cs | 2 +-
 osu.Game/Screens/Select/SongSelect.cs             | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 919a320bca..607b891beb 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -168,7 +168,10 @@ namespace osu.Game.Screens.Select
             applyActiveCriteria(false);
 
             if (loadedTestBeatmaps)
+            {
                 invalidateAfterChange();
+                BeatmapSetsLoaded = true;
+            }
 
             // Restore selection
             if (selectedBeatmapBefore != null && newRoot.BeatmapSetsByID.TryGetValue(selectedBeatmapBefore.BeatmapSet!.ID, out var newSelectionCandidates))
diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
index 5aefdf5e28..f5ea32a22a 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Select.Carousel
             }
 
             if (!i.Filtered.Value)
-                TotalItemsNotFiltered--;
+                TotalItemsNotFiltered++;
         }
 
         public CarouselGroup(List<CarouselItem>? items = null)
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 7c30fd5baa..d23a660ff6 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Screens.Select
                 BleedBottom = Footer.HEIGHT,
                 SelectionChanged = updateSelectedBeatmap,
                 BeatmapSetsChanged = carouselBeatmapsLoaded,
-                FilterApplied = () => Scheduler.Add(updateVisibleBeatmapCount),
+                FilterApplied = () => Scheduler.AddOnce(updateVisibleBeatmapCount),
                 GetRecommendedBeatmap = s => recommender?.GetRecommendedBeatmap(s),
             }, c => carouselContainer.Child = c);
 

From d81cabc06361ab9cfb20f7294c38166d4bdb03a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2023 22:35:36 +0900
Subject: [PATCH 2023/2296] Revert "Improve performance of `attemptSelection`
 using new cached count and `LastSelected`"

This reverts commit 25df42630ecba979457a9dcd2a7678d154a85a5e.
---
 osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
index 8d2ddc5812..7f90e05744 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Screens.Select.Carousel
 {
@@ -100,7 +101,7 @@ namespace osu.Game.Screens.Select.Carousel
             if (State.Value != CarouselItemState.Selected) return;
 
             // we only perform eager selection if none of our items are in a selected state already.
-            if (LastSelected?.State.Value == CarouselItemState.Selected || TotalItemsNotFiltered == 0) return;
+            if (Items.Any(i => i.State.Value == CarouselItemState.Selected)) return;
 
             PerformSelection();
         }

From 9aaaa128098af6a8e57e07d5131bb719779b428c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 00:01:09 +0900
Subject: [PATCH 2024/2296] Don't show progress notifications when there are
 too few items to be worthwhile

---
 osu.Game/BackgroundDataStoreProcessor.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 55be7f2c9e..33b66ecfc7 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -151,7 +151,7 @@ namespace osu.Game
             Logger.Log($"Found {beatmapSetIds.Count} beatmap sets which require reprocessing.");
 
             // Technically this is doing more than just star ratings, but easier for the end user to understand.
-            var notification = showProgressNotification("Reprocessing star rating for beatmaps", "beatmaps' star ratings have been updated");
+            var notification = showProgressNotification(beatmapSetIds.Count, "Reprocessing star rating for beatmaps", "beatmaps' star ratings have been updated");
 
             int processedCount = 0;
             int failedCount = 0;
@@ -205,7 +205,7 @@ namespace osu.Game
 
             Logger.Log($"Found {beatmapIds.Count} beatmaps which require statistics population.");
 
-            var notification = showProgressNotification("Populating missing statistics for beatmaps", "beatmaps have been populated with missing statistics");
+            var notification = showProgressNotification(beatmapIds.Count, "Populating missing statistics for beatmaps", "beatmaps have been populated with missing statistics");
 
             int processedCount = 0;
             int failedCount = 0;
@@ -266,7 +266,7 @@ namespace osu.Game
 
             Logger.Log($"Found {scoreIds.Count} scores which require statistics population.");
 
-            var notification = showProgressNotification("Populating missing statistics for scores", "scores have been populated with missing statistics");
+            var notification = showProgressNotification(scoreIds.Count, "Populating missing statistics for scores", "scores have been populated with missing statistics");
 
             int processedCount = 0;
             int failedCount = 0;
@@ -325,7 +325,7 @@ namespace osu.Game
             if (scoreIds.Count == 0)
                 return;
 
-            var notification = showProgressNotification("Upgrading scores to new scoring algorithm", "scores have been upgraded to the new scoring algorithm");
+            var notification = showProgressNotification(scoreIds.Count, "Upgrading scores to new scoring algorithm", "scores have been upgraded to the new scoring algorithm");
 
             int processedCount = 0;
             int failedCount = 0;
@@ -405,11 +405,14 @@ namespace osu.Game
             }
         }
 
-        private ProgressNotification? showProgressNotification(string running, string completed)
+        private ProgressNotification? showProgressNotification(int totalCount, string running, string completed)
         {
             if (notificationOverlay == null)
                 return null;
 
+            if (totalCount < 10)
+                return null;
+
             ProgressNotification notification = new ProgressNotification
             {
                 Text = running,

From 374425ea75ee36a853f170c3a3ae04deccdb9981 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 01:07:33 +0900
Subject: [PATCH 2025/2296] Fix keyboard precision of nightcore/daycore
 adjustments being incorrect

Closes https://github.com/ppy/osu/issues/25854.
---
 osu.Game/Rulesets/Mods/ModDaycore.cs   | 3 ++-
 osu.Game/Rulesets/Mods/ModNightcore.cs | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModDaycore.cs b/osu.Game/Rulesets/Mods/ModDaycore.cs
index 39ebd1fe4c..09b35c249e 100644
--- a/osu.Game/Rulesets/Mods/ModDaycore.cs
+++ b/osu.Game/Rulesets/Mods/ModDaycore.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -17,7 +18,7 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyReduction;
         public override LocalisableString Description => "Whoaaaaa...";
 
-        [SettingSource("Speed decrease", "The actual decrease to apply")]
+        [SettingSource("Speed decrease", "The actual decrease to apply", SettingControlType = typeof(MultiplierSettingsSlider))]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(0.75)
         {
             MinValue = 0.5,
diff --git a/osu.Game/Rulesets/Mods/ModNightcore.cs b/osu.Game/Rulesets/Mods/ModNightcore.cs
index b519ab4db7..b42927256c 100644
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@@ -14,6 +14,7 @@ using osu.Game.Beatmaps.Timing;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
@@ -28,7 +29,7 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyIncrease;
         public override LocalisableString Description => "Uguuuuuuuu...";
 
-        [SettingSource("Speed increase", "The actual increase to apply")]
+        [SettingSource("Speed increase", "The actual increase to apply", SettingControlType = typeof(MultiplierSettingsSlider))]
         public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(1.5)
         {
             MinValue = 1.01,

From 51f4c7254c80bca74ea0ae9e772c630feb7f6a4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 01:32:30 +0900
Subject: [PATCH 2026/2296] Fix mod search textbox having focus while settings
 are visible

Stopped arrow key adjust on slider bars from working.

Also just felt wrong that you could type into an off-screen textbox.
---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 13 ++++++++-----
 osu.Game/Overlays/Mods/ModSettingsArea.cs  |  2 ++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ce798ae752..30d7b6191e 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -508,6 +508,11 @@ namespace osu.Game.Overlays.Mods
 
             modSettingsArea.ResizeHeightTo(modAreaHeight, transition_duration, Easing.InOutCubic);
             TopLevelContent.MoveToY(-modAreaHeight, transition_duration, Easing.InOutCubic);
+
+            if (customisationVisible.Value)
+                GetContainingInputManager().ChangeFocus(modSettingsArea);
+            else
+                Scheduler.Add(() => GetContainingInputManager().ChangeFocus(null));
         }
 
         /// <summary>
@@ -622,7 +627,7 @@ namespace osu.Game.Overlays.Mods
             }
 
             if (textSearchStartsActive.Value)
-                SearchTextBox.TakeFocus();
+                SearchTextBox.HoldFocus = true;
         }
 
         protected override void PopOut()
@@ -761,11 +766,9 @@ namespace osu.Game.Overlays.Mods
                 return false;
 
             // TODO: should probably eventually support typical platform search shortcuts (`Ctrl-F`, `/`)
-            if (SearchTextBox.HasFocus)
-                SearchTextBox.KillFocus();
-            else
+            SearchTextBox.HoldFocus = !SearchTextBox.HoldFocus;
+            if (SearchTextBox.HoldFocus)
                 SearchTextBox.TakeFocus();
-
             return true;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSettingsArea.cs b/osu.Game/Overlays/Mods/ModSettingsArea.cs
index 6158c2c70f..54bfcc7199 100644
--- a/osu.Game/Overlays/Mods/ModSettingsArea.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsArea.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        public override bool AcceptsFocus => true;
+
         public ModSettingsArea()
         {
             RelativeSizeAxes = Axes.X;

From 41485c19cfe597a5144911fdaff34fe218f1d963 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 02:08:25 +0900
Subject: [PATCH 2027/2296] Add realm refresh steps in an attempt to stabilise
 failing test

I think this is required because there is a higher chance of batched
updates with the new structure (and less calls to `BeatmapSetsChanged`
which causes re-selection).
---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 6b53277964..28b4dae56d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -464,6 +464,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                 manager.Import(testBeatmapSetInfo);
             }, 10);
 
+            AddStep("Force realm refresh", () => Realm.Run(r => r.Refresh()));
+
             AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
 
             Task<Live<BeatmapSetInfo>?> updateTask = null!;
@@ -476,6 +478,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             });
             AddUntilStep("wait for update completion", () => updateTask.IsCompleted);
 
+            AddStep("Force realm refresh", () => Realm.Run(r => r.Refresh()));
+
             AddUntilStep("retained selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
         }
 

From bf668174ecc743f5941035a57fbbbcfa8d2278fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Dec 2023 19:02:23 +0100
Subject: [PATCH 2028/2296] Use nunit constraints in test for transparency

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 28b4dae56d..6af53df725 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -466,7 +466,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Force realm refresh", () => Realm.Run(r => r.Refresh()));
 
-            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID, () => Is.EqualTo(originalOnlineSetID));
 
             Task<Live<BeatmapSetInfo>?> updateTask = null!;
 
@@ -480,7 +480,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Force realm refresh", () => Realm.Run(r => r.Refresh()));
 
-            AddUntilStep("retained selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
+            AddUntilStep("retained selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID, () => Is.EqualTo(originalOnlineSetID));
         }
 
         [Test]

From 9594ae7802fce0edea82d09d2bc2ecfe4bb50f85 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 03:22:22 +0900
Subject: [PATCH 2029/2296] Update framework

---
 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 bd35bb8d54..cf01f2f99b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1213.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1219.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 807e3ede2a..2ec954b3a5 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1213.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1219.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1215.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index 84a4e61267..c7b9d02b26 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1213.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1219.0" />
   </ItemGroup>
 </Project>

From cc800a18b203e474fc9fe6d43f50c2bc4e63ea03 Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Mon, 18 Dec 2023 21:11:00 +0100
Subject: [PATCH 2030/2296] Fix opening log files from notification not
 presenting the correct file

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 8d9e029c9d..e7ff99ef01 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1190,7 +1190,7 @@ namespace osu.Game
                 }
                 else if (recentLogCount == short_term_display_limit)
                 {
-                    string logFile = $@"{entry.Target.Value.ToString().ToLowerInvariant()}.log";
+                    string logFile = Logger.GetLogger(entry.Target.Value).Filename;
 
                     Schedule(() => Notifications.Post(new SimpleNotification
                     {
@@ -1198,7 +1198,7 @@ namespace osu.Game
                         Text = NotificationsStrings.SubsequentMessagesLogged,
                         Activated = () =>
                         {
-                            Storage.GetStorageForDirectory(@"logs").PresentFileExternally(logFile);
+                            Logger.Storage.PresentFileExternally(logFile);
                             return true;
                         }
                     }));

From 017003deea88739c244e88facd84252a940a6372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Dec 2023 21:56:56 +0100
Subject: [PATCH 2031/2296] Fix osu! standardised score conversion sometimes
 exceeding bounds

Co-authored-by: Zyf <zyfarok@gmail.com>

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

Users reported that some stable scores would convert to large negative
total scores in lazer after the introduction of combo exponent. Those
large negative total scores were actually mangled NaNs.

The root cause of this was the following calculation going below zero
unexpectedly:

	https://github.com/ppy/osu/blob/8e8d9b2cd96be4c4b3d8f1f01dc013fc9d41f765/osu.Game/Database/StandardisedScoreMigrationTools.cs#L323

which then propagates negative numbers onward until

	https://github.com/ppy/osu/blob/8e8d9b2cd96be4c4b3d8f1f01dc013fc9d41f765/osu.Game/Database/StandardisedScoreMigrationTools.cs#L337

which yields a NaN due to attempting to take the square root of a
negative number.

To fix, clamp `comboPortionInScoreV1` to sane limits: to
`comboPortionFromLongestComboInScoreV1` from below, and to
`maximumAchievableComboPortionInScoreV1` from above. This is a less
direct fix than perhaps imagined, but it seems like a better one as it
will also affect the calculation of both the lower and the upper
estimate of the score.
---
 .../Database/StandardisedScoreMigrationTools.cs   | 15 +++++++++++++--
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs     |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 6484500bcc..a30c40fdb0 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -293,13 +293,24 @@ namespace osu.Game.Database
                     // Roughly corresponds to integrating f(combo) = combo ^ COMBO_EXPONENT (omitting constants)
                     double maximumAchievableComboPortionInStandardisedScore = Math.Pow(maximumLegacyCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
-                    double comboPortionInScoreV1 = maximumAchievableComboPortionInScoreV1 * comboProportion / score.Accuracy;
-
                     // This is - roughly - how much score, in the combo portion, the longest combo on this particular play would gain in score V1.
                     double comboPortionFromLongestComboInScoreV1 = Math.Pow(score.MaxCombo, 2);
                     // Same for standardised score.
                     double comboPortionFromLongestComboInStandardisedScore = Math.Pow(score.MaxCombo, 1 + ScoreProcessor.COMBO_EXPONENT);
 
+                    // We estimate the combo portion of the score in score V1 terms.
+                    // The division by accuracy is supposed to lessen the impact of accuracy on the combo portion,
+                    // but in some edge cases it cannot sanely undo it.
+                    // Therefore the resultant value is clamped from both sides for sanity.
+                    // The clamp from below to `comboPortionFromLongestComboInScoreV1` targets near-FC scores wherein
+                    // the player had bad accuracy at the end of their longest combo, which causes the division by accuracy
+                    // to underestimate the combo portion.
+                    // The clamp from above to `maximumAchievableComboPortionInScoreV1` targets FC scores wherein
+                    // the player had bad accuracy at the start of the map, which causes the division by accuracy
+                    // to overestimate the combo portion.
+                    double comboPortionInScoreV1 = Math.Clamp(maximumAchievableComboPortionInScoreV1 * comboProportion / score.Accuracy,
+                        comboPortionFromLongestComboInScoreV1, maximumAchievableComboPortionInScoreV1);
+
                     // Calculate how many times the longest combo the user has achieved in the play can repeat
                     // without exceeding the combo portion in score V1 as achieved by the player.
                     // This is a pessimistic estimate; it intentionally does not operate on object count and uses only score instead.
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 00b1f04782..5c51e68d9f 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -32,9 +32,10 @@ namespace osu.Game.Scoring.Legacy
         /// <item><description>30000003: First version after converting legacy total score to standardised.</description></item>
         /// <item><description>30000004: Fixed mod multipliers during legacy score conversion. Reconvert all scores.</description></item>
         /// <item><description>30000005: Introduce combo exponent in the osu! gamemode. Reconvert all scores.</description></item>
+        /// <item><description>30000006: Fix edge cases in conversion after combo exponent introduction that lead to NaNs. Reconvert all scores.</description></item>
         /// </list>
         /// </remarks>
-        public const int LATEST_VERSION = 30000005;
+        public const int LATEST_VERSION = 30000006;
 
         /// <summary>
         /// The first stable-compatible YYYYMMDD format version given to lazer usage of replays.

From 9c8df4e6d1a041c0b2fc19873aa8ae8e1d0d9fb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 18 Dec 2023 22:23:58 +0100
Subject: [PATCH 2032/2296] Run score conversion for previously-imported scores

---
 osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs | 3 +++
 osu.Game/BackgroundDataStoreProcessor.cs                     | 3 +--
 osu.Game/Database/StandardisedScoreMigrationTools.cs         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
index e65088ca2e..43ce7200d2 100644
--- a/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
+++ b/osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
@@ -127,8 +127,11 @@ namespace osu.Game.Tests.Database
             });
         }
 
+        [TestCase(30000001)]
         [TestCase(30000002)]
         [TestCase(30000003)]
+        [TestCase(30000004)]
+        [TestCase(30000005)]
         public void TestScoreUpgradeSuccess(int scoreVersion)
         {
             ScoreInfo scoreInfo = null!;
diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 33b66ecfc7..0d5cb84359 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -316,8 +316,7 @@ namespace osu.Game
 
             HashSet<Guid> scoreIds = realmAccess.Run(r => new HashSet<Guid>(r.All<ScoreInfo>()
                                                                              .Where(s => !s.BackgroundReprocessingFailed && s.BeatmapInfo != null
-                                                                                                                         && (s.TotalScoreVersion == 30000002
-                                                                                                                             || s.TotalScoreVersion == 30000003))
+                                                                                                                         && s.TotalScoreVersion < LegacyScoreEncoder.LATEST_VERSION)
                                                                              .AsEnumerable().Select(s => s.ID)));
 
             Logger.Log($"Found {scoreIds.Count} scores which require total score conversion.");
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index a30c40fdb0..6980e81f58 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Database
             if (score.IsLegacyScore)
                 return false;
 
-            if (score.TotalScoreVersion > 30000004)
+            if (score.TotalScoreVersion > 30000005)
                 return false;
 
             // Recalculate the old-style standardised score to see if this was an old lazer score.

From ee8a5d5a3077c5a1045ef74fc8b037296a26a005 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 13:33:45 +0900
Subject: [PATCH 2033/2296] Update bug-issue.yml with new workflow for
 exporting logs

---
 .github/ISSUE_TEMPLATE/bug-issue.yml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-issue.yml b/.github/ISSUE_TEMPLATE/bug-issue.yml
index ff6d869e72..17a3e1df41 100644
--- a/.github/ISSUE_TEMPLATE/bug-issue.yml
+++ b/.github/ISSUE_TEMPLATE/bug-issue.yml
@@ -46,22 +46,16 @@ body:
       value: |
         ## Logs
 
-        Attaching log files is required for every reported bug. See instructions below on how to find them.
-
-        **Logs are reset when you reopen the game.** If the game crashed or has been closed since you found the bug, retrieve the logs using the file explorer instead.
+        Attaching log files is required for **every** issue, regardless of whether you deem them required or not. See instructions below on how to find them.
 
         ### Desktop platforms
 
         If the game has not yet been closed since you found the bug:
-          1. Head on to game settings and click on "Open osu! folder"
-          2. Then open the `logs` folder located there
+          1. Head on to game settings and click on "Export logs"
+          2. Click the notification to locate the file
+          3. Drag the generated `.zip` files into the github issue window 
 
-        The default places to find the logs on desktop platforms are as follows:
-          - `%AppData%/osu/logs` *on Windows*
-          - `~/.local/share/osu/logs` *on Linux*
-          - `~/Library/Application Support/osu/logs` *on macOS*
-
-        If you have selected a custom location for the game files, you can find the `logs` folder there.
+        ![export logs button](https://github.com/ppy/osu/assets/191335/0866443f-0728-47bc-9dbd-f2b79ac802d5)
 
         ### Mobile platforms
 
@@ -69,10 +63,6 @@ body:
           - *On Android*, navigate to `Android/data/sh.ppy.osulazer/files/logs` using a file browser app.
           - *On iOS*, connect your device to a PC and copy the `logs` directory from the app's document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
 
-        ---
-
-        After locating the `logs` folder, select all log files inside and drag them into the "Logs" box below.
-
   - type: textarea
     attributes:
       label: Logs

From 469a659938dfb3c696c9a9fb51c7252214014a31 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 13:35:02 +0900
Subject: [PATCH 2034/2296] Fix arrow pointing to wrong place

---
 .github/ISSUE_TEMPLATE/bug-issue.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-issue.yml b/.github/ISSUE_TEMPLATE/bug-issue.yml
index 17a3e1df41..00a873f9c8 100644
--- a/.github/ISSUE_TEMPLATE/bug-issue.yml
+++ b/.github/ISSUE_TEMPLATE/bug-issue.yml
@@ -53,9 +53,9 @@ body:
         If the game has not yet been closed since you found the bug:
           1. Head on to game settings and click on "Export logs"
           2. Click the notification to locate the file
-          3. Drag the generated `.zip` files into the github issue window 
+          3. Drag the generated `.zip` files into the github issue window
 
-        ![export logs button](https://github.com/ppy/osu/assets/191335/0866443f-0728-47bc-9dbd-f2b79ac802d5)
+        ![export logs button](https://github.com/ppy/osu/assets/191335/cbfa5550-b7ed-4c5c-8dd0-8b87cc90ad9b)
 
         ### Mobile platforms
 

From c1b55c7facaa675d62a68179657df8b9a1170846 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 19 Dec 2023 13:48:46 +0900
Subject: [PATCH 2035/2296] Add ScoreProcessor methods to override numeric
 result

---
 .../Scoring/CatchScoreProcessor.cs            |  2 +-
 .../Scoring/ManiaScoreProcessor.cs            |  2 +-
 .../Scoring/TaikoScoreProcessor.cs            |  2 +-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 24 ++++++++++++++-----
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index 66c76f9b17..503252df02 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Scoring
         }
 
         protected override double GetComboScoreChange(JudgementResult result)
-            => Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
+            => GetNumericResultFor(result) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
 
         public override ScoreRank RankFromAccuracy(double accuracy)
         {
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index c53f3c3e07..e5f9b33c6b 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Mania.Scoring
         }
 
         protected override double GetComboScoreChange(JudgementResult result)
-            => Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
+            => GetNumericResultFor(result) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
 
         private class JudgementOrderComparer : IComparer<HitObject>
         {
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index a77e6db6f3..a34e977ee9 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring
 
         protected override double GetComboScoreChange(JudgementResult result)
         {
-            return Judgement.ToNumericResult(result.Type)
+            return GetNumericResultFor(result)
                    * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base))
                    * strongScaleValue(result);
         }
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index f110172988..aa8905c0b6 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -227,12 +227,12 @@ namespace osu.Game.Rulesets.Scoring
 
             if (result.Judgement.MaxResult.AffectsAccuracy())
             {
-                currentMaximumBaseScore += Judgement.ToNumericResult(result.Judgement.MaxResult);
+                currentMaximumBaseScore += GetMaxNumericResultFor(result);
                 currentAccuracyJudgementCount++;
             }
 
             if (result.Type.AffectsAccuracy())
-                currentBaseScore += Judgement.ToNumericResult(result.Type);
+                currentBaseScore += GetNumericResultFor(result);
 
             if (result.Type.IsBonus())
                 currentBonusPortion += GetBonusScoreChange(result);
@@ -276,12 +276,12 @@ namespace osu.Game.Rulesets.Scoring
 
             if (result.Judgement.MaxResult.AffectsAccuracy())
             {
-                currentMaximumBaseScore -= Judgement.ToNumericResult(result.Judgement.MaxResult);
+                currentMaximumBaseScore -= GetMaxNumericResultFor(result);
                 currentAccuracyJudgementCount--;
             }
 
             if (result.Type.AffectsAccuracy())
-                currentBaseScore -= Judgement.ToNumericResult(result.Type);
+                currentBaseScore -= GetNumericResultFor(result);
 
             if (result.Type.IsBonus())
                 currentBonusPortion -= GetBonusScoreChange(result);
@@ -297,9 +297,21 @@ namespace osu.Game.Rulesets.Scoring
             updateScore();
         }
 
-        protected virtual double GetBonusScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type);
+        protected virtual double GetBonusScoreChange(JudgementResult result) => GetNumericResultFor(result);
 
-        protected virtual double GetComboScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Judgement.MaxResult) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT);
+        protected virtual double GetComboScoreChange(JudgementResult result) => GetMaxNumericResultFor(result) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT);
+
+        /// <summary>
+        /// Retrieves the numeric score representation for a <see cref="JudgementResult"/>.
+        /// </summary>
+        /// <param name="result">The <see cref="JudgementResult"/>.</param>
+        protected virtual double GetNumericResultFor(JudgementResult result) => result.Judgement.NumericResultFor(result);
+
+        /// <summary>
+        /// Retrieves the maximum numeric score representation for a <see cref="JudgementResult"/>.
+        /// </summary>
+        /// <param name="result">The <see cref="JudgementResult"/>.</param>
+        protected virtual double GetMaxNumericResultFor(JudgementResult result) => result.Judgement.MaxNumericResult;
 
         protected virtual void ApplyScoreChange(JudgementResult result)
         {

From 35c0eaee1c5ff6a55609e61aa40c14c6a3645fe9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 19 Dec 2023 13:50:46 +0900
Subject: [PATCH 2036/2296] Make taiko OKs worth 150 points

---
 .../Scoring/TaikoScoreProcessor.cs                    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index a34e977ee9..bc1e42c5d1 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -33,6 +33,17 @@ namespace osu.Game.Rulesets.Taiko.Scoring
                    * strongScaleValue(result);
         }
 
+        protected override double GetNumericResultFor(JudgementResult result)
+        {
+            switch (result.Type)
+            {
+                case HitResult.Ok:
+                    return 150;
+            }
+
+            return base.GetNumericResultFor(result);
+        }
+
         private double strongScaleValue(JudgementResult result)
         {
             if (result.HitObject is StrongNestedHitObject strong)

From f2edb3ea54ef0bd5cbc181bd6b25a4ba20eaba8d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 19 Dec 2023 14:01:08 +0900
Subject: [PATCH 2037/2296] Add test

---
 .../TestSceneTaikoScoreProcessor.cs           | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoScoreProcessor.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoScoreProcessor.cs
new file mode 100644
index 0000000000..6f3b9f9748
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoScoreProcessor.cs
@@ -0,0 +1,41 @@
+// 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.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Taiko.Judgements;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Scoring;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    [TestFixture]
+    public class TestSceneTaikoScoreProcessor
+    {
+        [Test]
+        public void TestInaccurateHitScore()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects =
+                {
+                    new Hit(),
+                    new Hit { StartTime = 1000 }
+                }
+            };
+
+            var scoreProcessor = new TaikoScoreProcessor();
+            scoreProcessor.ApplyBeatmap(beatmap);
+
+            // Apply a miss judgement
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[0], new TaikoJudgement()) { Type = HitResult.Great });
+            scoreProcessor.ApplyResult(new JudgementResult(beatmap.HitObjects[1], new TaikoJudgement()) { Type = HitResult.Ok });
+
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(453745));
+            Assert.That(scoreProcessor.Accuracy.Value, Is.EqualTo(0.75).Within(0.0001));
+        }
+    }
+}

From 30957f847cdca20f1ee3a8619c406808289080a0 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 19 Dec 2023 14:27:29 +0900
Subject: [PATCH 2038/2296] Rename class/file (this is not a test scene)

---
 ...stSceneTaikoScoreProcessor.cs => TaikoScoreProcessorTest.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Rulesets.Taiko.Tests/{TestSceneTaikoScoreProcessor.cs => TaikoScoreProcessorTest.cs} (96%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoScoreProcessorTest.cs
similarity index 96%
rename from osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoScoreProcessor.cs
rename to osu.Game.Rulesets.Taiko.Tests/TaikoScoreProcessorTest.cs
index 6f3b9f9748..d74fe99a9f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoScoreProcessorTest.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Taiko.Scoring;
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    public class TestSceneTaikoScoreProcessor
+    public class TaikoScoreProcessorTest
     {
         [Test]
         public void TestInaccurateHitScore()

From 44efa2c540c392c998af7cd052a88d35d053aa5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 15:09:03 +0900
Subject: [PATCH 2039/2296] Fix incorrect ordering of items at song select when
 certain sort modes are used

---
 .../Screens/Select/Carousel/CarouselGroup.cs  |  2 +-
 osu.Game/Screens/Select/FilterCriteria.cs     | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
index c353ee98ae..be841465bf 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroup.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Screens.Select.Carousel
             items.ForEach(c => c.Filter(criteria));
 
             // Sorting is expensive, so only perform if it's actually changed.
-            if (lastCriteria?.Sort != criteria.Sort)
+            if (lastCriteria?.RequiresSorting(criteria) != false)
             {
                 criteriaComparer = Comparer<CarouselItem>.Create((x, y) =>
                 {
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 811f623ee5..0bea2247ce 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -219,6 +219,44 @@ namespace osu.Game.Screens.Select
             public bool Equals(OptionalTextFilter other) => SearchTerm == other.SearchTerm;
         }
 
+        /// <summary>
+        /// Given a new filter criteria, decide whether a full sort needs to be performed.
+        /// </summary>
+        /// <param name="newCriteria"></param>
+        /// <returns></returns>
+        public bool RequiresSorting(FilterCriteria newCriteria)
+        {
+            if (Sort != newCriteria.Sort)
+                return true;
+
+            switch (Sort)
+            {
+                // Some sorts are stable across all other changes.
+                // Running these sorts will sort all items, including currently hidden items.
+                case SortMode.Artist:
+                case SortMode.Author:
+                case SortMode.DateSubmitted:
+                case SortMode.DateAdded:
+                case SortMode.DateRanked:
+                case SortMode.Source:
+                case SortMode.Title:
+                    return false;
+
+                // Some sorts use aggregate max comparisons, which will change based on filtered items.
+                // These sorts generally ignore items hidden by filtered state, so we must force a sort under all circumstances here.
+                //
+                // This makes things very slow when typing a text search, and we probably want to consider a way to optimise things going forward.
+                case SortMode.LastPlayed:
+                case SortMode.BPM:
+                case SortMode.Length:
+                case SortMode.Difficulty:
+                    return true;
+
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
         public enum MatchMode
         {
             /// <summary>

From ddb67c87a8c20680c6ef77d8faa512b50d090be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Dec 2023 08:13:02 +0100
Subject: [PATCH 2040/2296] Roll back incorrect change in
 `ShouldMigrateToNewStandardised()`

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

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 6980e81f58..11eacd1c6b 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Database
             if (score.IsLegacyScore)
                 return false;
 
-            if (score.TotalScoreVersion > 30000005)
+            if (score.TotalScoreVersion > 30000002)
                 return false;
 
             // Recalculate the old-style standardised score to see if this was an old lazer score.

From 011bd61e7d3f7301fd00bd5acd0d89120a92b61a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 19 Dec 2023 16:47:49 +0900
Subject: [PATCH 2041/2296] Give sliders in test scene a sample

---
 .../TestSceneSliderEarlyHitJudgement.cs                      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
index 9caee86a32..4ea21e51f6 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
@@ -160,6 +161,10 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Position = new Vector2(256 - slider_path_length / 2, 192),
                 TickDistanceMultiplier = 3,
                 ClassicSliderBehaviour = classic,
+                Samples = new[]
+                {
+                    new HitSampleInfo(HitSampleInfo.HIT_NORMAL)
+                },
                 Path = new SliderPath(PathType.LINEAR, new[]
                 {
                     Vector2.Zero,

From 7c05d66bd7913c3f7aa1a569af5fa1dd901c58dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Dec 2023 08:57:18 +0100
Subject: [PATCH 2042/2296] Add more detail to exception

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

diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 0bea2247ce..a7c8e7d093 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -253,7 +253,7 @@ namespace osu.Game.Screens.Select
                     return true;
 
                 default:
-                    throw new ArgumentOutOfRangeException();
+                    throw new ArgumentOutOfRangeException(nameof(Sort), Sort, "Unknown sort mode");
             }
         }
 

From fe5e071e70cbd0a24f555fb9255dfa957246eb36 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 19 Dec 2023 17:01:52 +0900
Subject: [PATCH 2043/2296] Fix sliding sample playing before Slider's start
 time

---
 .../Objects/Drawables/DrawableSlider.cs       | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 1f9a028045..b306fd38c1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -128,8 +128,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 foreach (var drawableHitObject in NestedHitObjects)
                     drawableHitObject.AccentColour.Value = colour.NewValue;
             }, true);
-
-            Tracking.BindValueChanged(updateSlidingSample);
         }
 
         protected override void OnApply()
@@ -166,14 +164,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             slidingSample?.Stop();
         }
 
-        private void updateSlidingSample(ValueChangedEvent<bool> tracking)
-        {
-            if (tracking.NewValue)
-                slidingSample?.Play();
-            else
-                slidingSample?.Stop();
-        }
-
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
         {
             base.AddNestedHitObject(hitObject);
@@ -238,9 +228,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Tracking.Value = SliderInputManager.Tracking;
 
-            if (Tracking.Value && slidingSample != null)
-                // keep the sliding sample playing at the current tracking position
-                slidingSample.Balance.Value = CalculateSamplePlaybackBalance(CalculateDrawableRelativePosition(Ball));
+            if (slidingSample != null)
+            {
+                if (Tracking.Value && Time.Current >= HitObject.StartTime)
+                {
+                    // keep the sliding sample playing at the current tracking position
+                    if (!slidingSample.IsPlaying)
+                        slidingSample.Play();
+                    slidingSample.Balance.Value = CalculateSamplePlaybackBalance(CalculateDrawableRelativePosition(Ball));
+                }
+                else if (slidingSample.IsPlaying)
+                    slidingSample.Stop();
+            }
 
             double completionProgress = Math.Clamp((Time.Current - HitObject.StartTime) / HitObject.Duration, 0, 1);
 

From 7e9c1b2acbaabb19564821d748deb2c97a964554 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 17:27:52 +0900
Subject: [PATCH 2044/2296] Use `sender`'s realm (because we can)

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

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 607b891beb..4c6c67c348 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -320,7 +320,7 @@ namespace osu.Game.Screens.Select
                 // To handle the beatmap update flow, attempt to track selection changes across delete-insert transactions.
                 // When an update occurs, the previous beatmap set is either soft or hard deleted.
                 // Check if the current selection was potentially deleted by re-querying its validity.
-                bool selectedSetMarkedDeleted = realm.Run(r => r.Find<BeatmapSetInfo>(SelectedBeatmapSet.ID))?.DeletePending != false;
+                bool selectedSetMarkedDeleted = sender.Realm.Find<BeatmapSetInfo>(SelectedBeatmapSet.ID)?.DeletePending != false;
 
                 int[] modifiedAndInserted = changes.NewModifiedIndices.Concat(changes.InsertedIndices).ToArray();
 

From 8f5d21dc703e3c1f3930e4b4e1c58c90acaba87a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 18:10:55 +0900
Subject: [PATCH 2045/2296] Actually fix realm selection retention regression

---
 .../SongSelect/TestScenePlaySongSelect.cs     |  4 ----
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 24 +++++++++++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 6af53df725..518035fb82 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -464,8 +464,6 @@ namespace osu.Game.Tests.Visual.SongSelect
                 manager.Import(testBeatmapSetInfo);
             }, 10);
 
-            AddStep("Force realm refresh", () => Realm.Run(r => r.Refresh()));
-
             AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID, () => Is.EqualTo(originalOnlineSetID));
 
             Task<Live<BeatmapSetInfo>?> updateTask = null!;
@@ -478,8 +476,6 @@ namespace osu.Game.Tests.Visual.SongSelect
             });
             AddUntilStep("wait for update completion", () => updateTask.IsCompleted);
 
-            AddStep("Force realm refresh", () => Realm.Run(r => r.Refresh()));
-
             AddUntilStep("retained selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID, () => Is.EqualTo(originalOnlineSetID));
         }
 
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 4c6c67c348..47cdbe34f4 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -269,8 +269,28 @@ namespace osu.Game.Screens.Select
             if (changes == null)
                 return;
 
-            foreach (int i in changes.InsertedIndices)
-                removeBeatmapSet(sender[i].ID);
+            var removeableSets = changes.InsertedIndices.Select(i => sender[i].ID).ToHashSet();
+
+            // This schedule is required to retain selection of beatmaps over an ImportAsUpdate operation.
+            // This is covered by TestPlaySongSelect.TestSelectionRetainedOnBeatmapUpdate.
+            //
+            // In short, we have specialised logic in `beatmapSetsChanged` (directly below) to infer that an
+            // update operation has occurred. For this to work, we need to confirm the `DeletePending` flag
+            // of the current selection.
+            //
+            // If we don't schedule the following code, it is possible for the `deleteBeatmapSetsChanged` handler
+            // to be invoked before the `beatmapSetsChanged` handler (realm call order seems non-deterministic)
+            // which will lead to the currently selected beatmap changing via `CarouselGroupEagerSelect`.
+            //
+            // We need a better path forward here. A few ideas:
+            // - Avoid the necessity of having realm subscriptions on deleted/hidden items, maybe by storing all guids in realm
+            //   to a local list so we can better look them up on receiving `DeletedIndices`.
+            // - Add a new property on `BeatmapSetInfo` to link to the pre-update set, and use that to handle the update case.
+            Schedule(() =>
+            {
+                foreach (var set in removeableSets)
+                    removeBeatmapSet(set);
+            });
         }
 
         private void beatmapSetsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes)

From f09c6b8c1ba778d2a5a6f6f3c29de875bc3dc7a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 18:20:02 +0900
Subject: [PATCH 2046/2296] Change default values of new object counts to `-1`
 to identify non-processed values

---
 osu.Game/BackgroundDataStoreProcessor.cs |  2 +-
 osu.Game/Beatmaps/BeatmapInfo.cs         |  4 ++--
 osu.Game/Beatmaps/IBeatmapInfo.cs        |  3 +++
 osu.Game/Database/RealmAccess.cs         | 17 ++++++++++++++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 33b66ecfc7..d4cd1ff6ea 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -196,7 +196,7 @@ namespace osu.Game
 
             realmAccess.Run(r =>
             {
-                foreach (var b in r.All<BeatmapInfo>().Where(b => b.TotalObjectCount == 0))
+                foreach (var b in r.All<BeatmapInfo>().Where(b => b.TotalObjectCount < 0 || b.EndTimeObjectCount < 0))
                     beatmapIds.Add(b.ID);
             });
 
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 2d04732f91..425fd98d27 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -120,9 +120,9 @@ namespace osu.Game.Beatmaps
         [JsonIgnore]
         public bool Hidden { get; set; }
 
-        public int EndTimeObjectCount { get; set; }
+        public int EndTimeObjectCount { get; set; } = -1;
 
-        public int TotalObjectCount { get; set; }
+        public int TotalObjectCount { get; set; } = -1;
 
         /// <summary>
         /// Reset any fetched online linking information (and history).
diff --git a/osu.Game/Beatmaps/IBeatmapInfo.cs b/osu.Game/Beatmaps/IBeatmapInfo.cs
index 9dcff5ce5e..04c2017ded 100644
--- a/osu.Game/Beatmaps/IBeatmapInfo.cs
+++ b/osu.Game/Beatmaps/IBeatmapInfo.cs
@@ -59,11 +59,13 @@ namespace osu.Game.Beatmaps
 
         /// <summary>
         /// The basic star rating for this beatmap (with no mods applied).
+        /// Defaults to -1 (meaning not-yet-calculated).
         /// </summary>
         double StarRating { get; }
 
         /// <summary>
         /// The number of hitobjects in the beatmap with a distinct end time.
+        /// Defaults to -1 (meaning not-yet-calculated).
         /// </summary>
         /// <remarks>
         /// Canonically, these are hitobjects are either sliders or spinners.
@@ -72,6 +74,7 @@ namespace osu.Game.Beatmaps
 
         /// <summary>
         /// The total number of hitobjects in the beatmap.
+        /// Defaults to -1 (meaning not-yet-calculated).
         /// </summary>
         int TotalObjectCount { get; }
     }
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 191bb49b0c..ad61292c2e 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -89,8 +89,9 @@ namespace osu.Game.Database
         /// 35   2023-10-16    Clear key combinations of keybindings that are assigned to more than one action in a given settings section.
         /// 36   2023-10-26    Add LegacyOnlineID to ScoreInfo. Move osu_scores_*_high IDs stored in OnlineID to LegacyOnlineID. Reset anomalous OnlineIDs.
         /// 38   2023-12-10    Add EndTimeObjectCount and TotalObjectCount to BeatmapInfo.
+        /// 39   2023-12-19    Migrate any EndTimeObjectCount and TotalObjectCount values of 0 to -1 to better identify non-calculated values.
         /// </summary>
-        private const int schema_version = 38;
+        private const int schema_version = 39;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -1095,6 +1096,20 @@ namespace osu.Game.Database
 
                     break;
                 }
+
+                case 39:
+                    foreach (var b in migration.NewRealm.All<BeatmapInfo>())
+                    {
+                        // Either actually no objects, or processing ran and failed.
+                        // Reset to -1 so the next time they become zero we know that processing was attempted.
+                        if (b.TotalObjectCount == 0 && b.EndTimeObjectCount == 0)
+                        {
+                            b.TotalObjectCount = -1;
+                            b.EndTimeObjectCount = -1;
+                        }
+                    }
+
+                    break;
             }
 
             Logger.Log($"Migration completed in {stopwatch.ElapsedMilliseconds}ms");

From 372f930f8bd17b6ab4b928805fa4ee78a2100a48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 18:27:44 +0900
Subject: [PATCH 2047/2296] Refactor usage of object counts for mania key count
 lookup to be a bit safer

Protects against non-initialised values and also div-by-zero.
---
 .../Beatmaps/ManiaBeatmapConverter.cs         | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index a496049729..def22608d6 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -59,23 +59,26 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
         {
             double roundedCircleSize = Math.Round(difficulty.CircleSize);
 
-            if (new ManiaRuleset().RulesetInfo.Equals(difficulty.SourceRuleset))
+            if (difficulty.SourceRuleset.ShortName == ManiaRuleset.SHORT_NAME)
                 return (int)Math.Max(1, roundedCircleSize);
 
             double roundedOverallDifficulty = Math.Round(difficulty.OverallDifficulty);
 
-            int countSliderOrSpinner = difficulty.EndTimeObjectCount;
+            if (difficulty.TotalObjectCount > 0 && difficulty.EndTimeObjectCount >= 0)
+            {
+                int countSliderOrSpinner = difficulty.EndTimeObjectCount;
 
-            // In osu!stable, this division appears as if it happens on floats, but due to release-mode
-            // optimisations, it actually ends up happening on doubles.
-            double percentSpecialObjects = (double)countSliderOrSpinner / difficulty.TotalObjectCount;
+                // In osu!stable, this division appears as if it happens on floats, but due to release-mode
+                // optimisations, it actually ends up happening on doubles.
+                double percentSpecialObjects = (double)countSliderOrSpinner / difficulty.TotalObjectCount;
 
-            if (percentSpecialObjects < 0.2)
-                return 7;
-            if (percentSpecialObjects < 0.3 || roundedCircleSize >= 5)
-                return roundedOverallDifficulty > 5 ? 7 : 6;
-            if (percentSpecialObjects > 0.6)
-                return roundedOverallDifficulty > 4 ? 5 : 4;
+                if (percentSpecialObjects < 0.2)
+                    return 7;
+                if (percentSpecialObjects < 0.3 || roundedCircleSize >= 5)
+                    return roundedOverallDifficulty > 5 ? 7 : 6;
+                if (percentSpecialObjects > 0.6)
+                    return roundedOverallDifficulty > 4 ? 5 : 4;
+            }
 
             return Math.Max(4, Math.Min((int)roundedOverallDifficulty + 1, 7));
         }

From 0a64d631e2af017dd042b8786201fd64de7b6e36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 19:09:47 +0900
Subject: [PATCH 2048/2296] Add support for dual-column advanced stats

---
 .../Screens/Select/Details/AdvancedStats.cs   | 48 ++++++++++++++-----
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index ee805c2d12..3254ac4d99 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -64,21 +64,43 @@ namespace osu.Game.Screens.Select.Details
             }
         }
 
-        public AdvancedStats()
+        public AdvancedStats(int columns = 1)
         {
-            Child = new FillFlowContainer
+            switch (columns)
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Children = new[]
-                {
-                    FirstValue = new StatisticRow(), // circle size/key amount
-                    HpDrain = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsDrain },
-                    Accuracy = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsAccuracy },
-                    ApproachRate = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsAr },
-                    starDifficulty = new StatisticRow(10, true) { Title = BeatmapsetsStrings.ShowStatsStars },
-                },
-            };
+                case 1:
+                    Child = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new[]
+                        {
+                            FirstValue = new StatisticRow(), // circle size/key amount
+                            HpDrain = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsDrain },
+                            Accuracy = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsAccuracy },
+                            ApproachRate = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsAr },
+                            starDifficulty = new StatisticRow(10, true) { Title = BeatmapsetsStrings.ShowStatsStars },
+                        },
+                    };
+                    break;
+
+                case 2:
+                    Child = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Full,
+                        Children = new[]
+                        {
+                            FirstValue = new StatisticRow { Width = 0.5f }, // circle size/key amount
+                            HpDrain = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsDrain, Width = 0.5f },
+                            Accuracy = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsAccuracy, Width = 0.5f },
+                            ApproachRate = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsAr, Width = 0.5f },
+                            starDifficulty = new StatisticRow(10, true) { Title = BeatmapsetsStrings.ShowStatsStars, Width = 0.5f },
+                        },
+                    };
+                    break;
+            }
         }
 
         [BackgroundDependencyLoader]

From 07bb0805e9b1980ed26212ab485193b28fa11baf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 19:09:56 +0900
Subject: [PATCH 2049/2296] Move advanced stats to a more permanent location on
 song select

---
 osu.Game/Screens/Select/BeatmapDetails.cs   |  8 ---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs |  2 +-
 osu.Game/Screens/Select/SongSelect.cs       | 55 ++++++++++++++++++++-
 3 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 179323176a..e1166b5abe 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Screens.Select
         private const float spacing = 10;
         private const float transition_duration = 250;
 
-        private readonly AdvancedStats advanced;
         private readonly UserRatings ratingsDisplay;
         private readonly MetadataSection description, source, tags;
         private readonly Container failRetryContainer;
@@ -109,12 +108,6 @@ namespace osu.Game.Screens.Select
                                                 Padding = new MarginPadding { Right = spacing / 2 },
                                                 Children = new[]
                                                 {
-                                                    new DetailBox().WithChild(advanced = new AdvancedStats
-                                                    {
-                                                        RelativeSizeAxes = Axes.X,
-                                                        AutoSizeAxes = Axes.Y,
-                                                        Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
-                                                    }),
                                                     new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
                                                     {
                                                         RelativeSizeAxes = Axes.X,
@@ -180,7 +173,6 @@ namespace osu.Game.Screens.Select
 
         private void updateStatistics()
         {
-            advanced.BeatmapInfo = BeatmapInfo;
             description.Metadata = BeatmapInfo?.DifficultyName ?? string.Empty;
             source.Metadata = BeatmapInfo?.Metadata.Source ?? string.Empty;
             tags.Metadata = BeatmapInfo?.Metadata.Tags ?? string.Empty;
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 8bbf569566..a9ac30394f 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -305,7 +305,7 @@ namespace osu.Game.Screens.Select
                             },
                             infoLabelContainer = new FillFlowContainer
                             {
-                                Margin = new MarginPadding { Top = 20 },
+                                Margin = new MarginPadding { Top = 8 },
                                 Spacing = new Vector2(20, 0),
                                 AutoSizeAxes = Axes.Both,
                             }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index dfea4e3794..0f2b49f9bf 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -13,6 +13,8 @@ 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.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Bindings;
@@ -35,6 +37,7 @@ using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Select.Details;
 using osu.Game.Screens.Select.Options;
 using osu.Game.Skinning;
 using osuTK;
@@ -45,7 +48,7 @@ namespace osu.Game.Screens.Select
 {
     public abstract partial class SongSelect : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
     {
-        public static readonly float WEDGE_HEIGHT = 245;
+        public static readonly float WEDGE_HEIGHT = 200;
 
         protected const float BACKGROUND_BLUR = 20;
         private const float left_area_padding = 20;
@@ -132,6 +135,8 @@ namespace osu.Game.Screens.Select
 
         private IDisposable? modSelectOverlayRegistration;
 
+        private AdvancedStats advancedStats = null!;
+
         [Resolved]
         private MusicController music { get; set; } = null!;
 
@@ -253,12 +258,56 @@ namespace osu.Game.Screens.Select
                                                 },
                                             },
                                             new Container
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Height = 90,
+                                                Padding = new MarginPadding(10)
+                                                {
+                                                    Left = left_area_padding,
+                                                    Right = left_area_padding * 2,
+                                                },
+                                                Y = WEDGE_HEIGHT,
+                                                Children = new Drawable[]
+                                                {
+                                                    new Container
+                                                    {
+                                                        RelativeSizeAxes = Axes.Both,
+                                                        Masking = true,
+                                                        CornerRadius = 10,
+                                                        EdgeEffect = new EdgeEffectParameters
+                                                        {
+                                                            Type = EdgeEffectType.Glow,
+                                                            Hollow = true,
+                                                            Colour = new Color4(130, 204, 255, 15),
+                                                            Radius = 10,
+                                                        },
+                                                        Children = new Drawable[]
+                                                        {
+                                                            new Box
+                                                            {
+                                                                Colour = new Color4(130, 204, 255, 40),
+                                                                Blending = BlendingParameters.Additive,
+                                                                RelativeSizeAxes = Axes.Both,
+                                                            },
+                                                            advancedStats = new AdvancedStats(2)
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                AutoSizeAxes = Axes.Y,
+                                                                Width = 0.8f,
+                                                                Anchor = Anchor.Centre,
+                                                                Origin = Anchor.Centre,
+                                                            },
+                                                        }
+                                                    },
+                                                }
+                                            },
+                                            new Container
                                             {
                                                 RelativeSizeAxes = Axes.Both,
                                                 Padding = new MarginPadding
                                                 {
                                                     Bottom = Footer.HEIGHT,
-                                                    Top = WEDGE_HEIGHT,
+                                                    Top = WEDGE_HEIGHT + 70,
                                                     Left = left_area_padding,
                                                     Right = left_area_padding * 2,
                                                 },
@@ -797,6 +846,8 @@ namespace osu.Game.Screens.Select
 
             ModSelect.Beatmap = beatmap;
 
+            advancedStats.BeatmapInfo = beatmap.BeatmapInfo;
+
             bool beatmapSelected = beatmap is not DummyWorkingBeatmap;
 
             if (beatmapSelected)

From 3b848e85037a28afcc9fa43d99603af1c5cf456f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 19:18:36 +0900
Subject: [PATCH 2050/2296] Tidy up visual look

---
 osu.Game/Screens/Select/BeatmapDetails.cs     | 24 +++++++----
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   |  2 +-
 .../Screens/Select/Details/AdvancedStats.cs   | 43 ++++++++++++-------
 osu.Game/Screens/Select/SongSelect.cs         |  4 +-
 4 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index e1166b5abe..679ebfcf48 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -3,9 +3,9 @@
 
 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.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -67,12 +67,24 @@ namespace osu.Game.Screens.Select
 
         public BeatmapDetails()
         {
+            CornerRadius = 10;
+            Masking = true;
+
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Hollow = true,
+                Colour = new Color4(130, 204, 255, 15),
+                Radius = 10,
+            };
+
             Children = new Drawable[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black.Opacity(0.5f),
+                    Colour = new Color4(130, 204, 255, 40),
+                    Blending = BlendingParameters.Additive,
                 },
                 new Container
                 {
@@ -122,7 +134,8 @@ namespace osu.Game.Screens.Select
                                             },
                                             new OsuScrollContainer
                                             {
-                                                RelativeSizeAxes = Axes.Both,
+                                                RelativeSizeAxes = Axes.X,
+                                                Height = 250,
                                                 Width = 0.5f,
                                                 ScrollbarVisible = false,
                                                 Padding = new MarginPadding { Left = spacing / 2 },
@@ -271,11 +284,6 @@ namespace osu.Game.Screens.Select
 
                 InternalChildren = new Drawable[]
                 {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black.Opacity(0.5f),
-                    },
                     content = new Container
                     {
                         RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index a9ac30394f..2613857998 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Select
             {
                 Type = EdgeEffectType.Glow,
                 Colour = new Color4(130, 204, 255, 150),
-                Radius = 20,
+                Radius = 15,
                 Roundness = 15,
             };
         }
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 3254ac4d99..66a913fda1 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -311,23 +311,36 @@ namespace osu.Game.Screens.Select.Details
                             Font = OsuFont.GetFont(size: 12)
                         },
                     },
-                    bar = new Bar
+                    new Container
                     {
-                        Origin = Anchor.CentreLeft,
-                        Anchor = Anchor.CentreLeft,
-                        RelativeSizeAxes = Axes.X,
-                        Height = 5,
-                        BackgroundColour = Color4.White.Opacity(0.5f),
-                        Padding = new MarginPadding { Left = name_width + 10, Right = value_width + 10 },
-                    },
-                    ModBar = new Bar
-                    {
-                        Origin = Anchor.CentreLeft,
-                        Anchor = Anchor.CentreLeft,
-                        RelativeSizeAxes = Axes.X,
-                        Alpha = 0.5f,
-                        Height = 5,
+                        RelativeSizeAxes = Axes.Both,
                         Padding = new MarginPadding { Left = name_width + 10, Right = value_width + 10 },
+                        Children = new Drawable[]
+                        {
+                            new Container
+                            {
+                                Origin = Anchor.CentreLeft,
+                                Anchor = Anchor.CentreLeft,
+                                RelativeSizeAxes = Axes.X,
+                                Height = 5,
+
+                                CornerRadius = 2,
+                                Masking = true,
+                                Children = new Drawable[]
+                                {
+                                    bar = new Bar
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        BackgroundColour = Color4.White.Opacity(0.5f),
+                                    },
+                                    ModBar = new Bar
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Alpha = 0.5f,
+                                    },
+                                }
+                            },
+                        }
                     },
                     new Container
                     {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 0f2b49f9bf..208a8eb321 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Screens.Select
                                         Origin = Anchor.BottomLeft,
                                         Anchor = Anchor.BottomLeft,
                                         RelativeSizeAxes = Axes.Both,
-                                        Padding = new MarginPadding { Top = left_area_padding },
+                                        Padding = new MarginPadding { Top = 5 },
                                         Children = new Drawable[]
                                         {
                                             new LeftSideInteractionContainer(() => Carousel.ScrollToSelected())
@@ -264,7 +264,7 @@ namespace osu.Game.Screens.Select
                                                 Padding = new MarginPadding(10)
                                                 {
                                                     Left = left_area_padding,
-                                                    Right = left_area_padding * 2,
+                                                    Right = left_area_padding * 2 + 5,
                                                 },
                                                 Y = WEDGE_HEIGHT,
                                                 Children = new Drawable[]

From 2c5ca9c1c88b6c80cea70d47d5fdb121825e0146 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 19:31:05 +0900
Subject: [PATCH 2051/2296] Change default song select tab display to local
 leaderboard

---
 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 ea526c6d54..0df870655f 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.Ruleset, string.Empty);
             SetDefault(OsuSetting.Skin, SkinInfo.ARGON_SKIN.ToString());
 
-            SetDefault(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
+            SetDefault(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Local);
             SetDefault(OsuSetting.BeatmapDetailModsFilter, false);
 
             SetDefault(OsuSetting.ShowConvertedBeatmaps, true);

From 502e3edac3ea2c5082718ca49d87064fdea4e92e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 19:39:48 +0900
Subject: [PATCH 2052/2296] Add missing invalidation call

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

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 47cdbe34f4..fe7eee701f 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -290,6 +290,8 @@ namespace osu.Game.Screens.Select
             {
                 foreach (var set in removeableSets)
                     removeBeatmapSet(set);
+
+                invalidateAfterChange();
             });
         }
 

From c556475c2c3522729cc1cf17b02b1497730d6e66 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 19:46:30 +0900
Subject: [PATCH 2053/2296] Revert to using a more manual approach to holding
 focus

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 23 +++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 30d7b6191e..baa7e594c1 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -132,6 +132,8 @@ namespace osu.Game.Overlays.Mods
         protected ShearedToggleButton? CustomisationButton { get; private set; }
         protected SelectAllModsButton? SelectAllModsButton { get; set; }
 
+        private bool textBoxShouldFocus;
+
         private Sample? columnAppearSample;
 
         private WorkingBeatmap? beatmap;
@@ -510,9 +512,9 @@ namespace osu.Game.Overlays.Mods
             TopLevelContent.MoveToY(-modAreaHeight, transition_duration, Easing.InOutCubic);
 
             if (customisationVisible.Value)
-                GetContainingInputManager().ChangeFocus(modSettingsArea);
+                SearchTextBox.KillFocus();
             else
-                Scheduler.Add(() => GetContainingInputManager().ChangeFocus(null));
+                setTextBoxFocus(textBoxShouldFocus);
         }
 
         /// <summary>
@@ -626,8 +628,7 @@ namespace osu.Game.Overlays.Mods
                 nonFilteredColumnCount += 1;
             }
 
-            if (textSearchStartsActive.Value)
-                SearchTextBox.HoldFocus = true;
+            setTextBoxFocus(textSearchStartsActive.Value);
         }
 
         protected override void PopOut()
@@ -766,12 +767,20 @@ namespace osu.Game.Overlays.Mods
                 return false;
 
             // TODO: should probably eventually support typical platform search shortcuts (`Ctrl-F`, `/`)
-            SearchTextBox.HoldFocus = !SearchTextBox.HoldFocus;
-            if (SearchTextBox.HoldFocus)
-                SearchTextBox.TakeFocus();
+            setTextBoxFocus(!textBoxShouldFocus);
             return true;
         }
 
+        private void setTextBoxFocus(bool keepFocus)
+        {
+            textBoxShouldFocus = keepFocus;
+
+            if (textBoxShouldFocus)
+                SearchTextBox.TakeFocus();
+            else
+                SearchTextBox.KillFocus();
+        }
+
         #endregion
 
         #region Sample playback control

From bbfdd6892ded1baf4e1d3da372e7678fe3e84d1e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Dec 2023 19:58:49 +0900
Subject: [PATCH 2054/2296] Allow choosing "Edit" from any beatmap carousel
 item

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs |  2 +-
 .../Select/Carousel/CarouselGroupEagerSelect.cs        |  2 +-
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs |  2 +-
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs      | 10 +++++++++-
 osu.Game/Screens/Select/PlaySongSelect.cs              |  7 ++++---
 osu.Game/Screens/Select/SongSelect.cs                  |  6 +++---
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 67822a27ee..6d2e938fb7 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Select.Carousel
                       .ForEach(AddItem);
         }
 
-        protected override CarouselItem? GetNextToSelect()
+        public override CarouselItem? GetNextToSelect()
         {
             if (LastSelected == null || LastSelected.Filtered.Value)
             {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
index 7f90e05744..b4313c1895 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Select.Carousel
         /// Finds the item this group would select next if it attempted selection
         /// </summary>
         /// <returns>An unfiltered item nearest to the last selected one or null if all items are filtered</returns>
-        protected virtual CarouselItem? GetNextToSelect()
+        public virtual CarouselItem? GetNextToSelect()
         {
             if (Items.Count == 0)
                 return null;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 3c64df656d..baf0a14062 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             if (songSelect != null)
             {
-                mainMenuItems = songSelect.CreateForwardNavigationMenuItemsForBeatmap(beatmapInfo);
+                mainMenuItems = songSelect.CreateForwardNavigationMenuItemsForBeatmap(() => beatmapInfo);
                 selectRequested = b => songSelect.FinaliseSelection(b);
             }
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index dd711b2513..f16e92a82a 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Screens.Select.Carousel
 
         private Task? beatmapsLoadTask;
 
+        private MenuItem[]? mainMenuItems;
+
         [Resolved]
         private BeatmapManager manager { get; set; } = null!;
 
@@ -57,8 +59,11 @@ namespace osu.Game.Screens.Select.Carousel
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapSetOverlay? beatmapOverlay)
+        private void load(BeatmapSetOverlay? beatmapOverlay, SongSelect? songSelect)
         {
+            if (songSelect != null)
+                mainMenuItems = songSelect.CreateForwardNavigationMenuItemsForBeatmap(() => (((CarouselBeatmapSet)Item!).GetNextToSelect() as CarouselBeatmap)!.BeatmapInfo);
+
             restoreHiddenRequested = s =>
             {
                 foreach (var b in s.Beatmaps)
@@ -222,6 +227,9 @@ namespace osu.Game.Screens.Select.Carousel
                 if (Item?.State.Value == CarouselItemState.NotSelected)
                     items.Add(new OsuMenuItem("Expand", MenuItemType.Highlighted, () => Item.State.Value = CarouselItemState.Selected));
 
+                if (mainMenuItems != null)
+                    items.AddRange(mainMenuItems);
+
                 if (beatmapSet.OnlineID > 0 && viewDetails != null)
                     items.Add(new OsuMenuItem("Details...", MenuItemType.Standard, () => viewDetails(beatmapSet.OnlineID)));
 
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 86bebdc2ff..7b7b8857f3 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.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.Allocation;
@@ -34,10 +35,10 @@ namespace osu.Game.Screens.Select
 
         public override bool AllowExternalScreenChange => true;
 
-        public override MenuItem[] CreateForwardNavigationMenuItemsForBeatmap(BeatmapInfo beatmap) => new MenuItem[]
+        public override MenuItem[] CreateForwardNavigationMenuItemsForBeatmap(Func<BeatmapInfo> getBeatmap) => new MenuItem[]
         {
-            new OsuMenuItem(ButtonSystemStrings.Play.ToSentence(), MenuItemType.Highlighted, () => FinaliseSelection(beatmap)),
-            new OsuMenuItem(ButtonSystemStrings.Edit.ToSentence(), MenuItemType.Standard, () => Edit(beatmap))
+            new OsuMenuItem(ButtonSystemStrings.Play.ToSentence(), MenuItemType.Highlighted, () => FinaliseSelection(getBeatmap())),
+            new OsuMenuItem(ButtonSystemStrings.Edit.ToSentence(), MenuItemType.Standard, () => Edit(getBeatmap()))
         };
 
         protected override UserActivity InitialActivity => new UserActivity.ChoosingBeatmap();
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index dfea4e3794..f4d1028747 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -89,11 +89,11 @@ namespace osu.Game.Screens.Select
         /// Creates any "action" menu items for the provided beatmap (ie. "Select", "Play", "Edit").
         /// These will always be placed at the top of the context menu, with common items added below them.
         /// </summary>
-        /// <param name="beatmap">The beatmap to create items for.</param>
+        /// <param name="getBeatmap">The beatmap to create items for.</param>
         /// <returns>The menu items.</returns>
-        public virtual MenuItem[] CreateForwardNavigationMenuItemsForBeatmap(BeatmapInfo beatmap) => new MenuItem[]
+        public virtual MenuItem[] CreateForwardNavigationMenuItemsForBeatmap(Func<BeatmapInfo> getBeatmap) => new MenuItem[]
         {
-            new OsuMenuItem(@"Select", MenuItemType.Highlighted, () => FinaliseSelection(beatmap))
+            new OsuMenuItem(@"Select", MenuItemType.Highlighted, () => FinaliseSelection(getBeatmap()))
         };
 
         [Resolved]

From d793d1cea16de4098c58fb5c50a3e20142a7a996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Dec 2023 14:52:16 +0100
Subject: [PATCH 2055/2296] Add test coverage of desired input handling
 behaviour

---
 .../TestSceneModSelectOverlay.cs              | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 80be4412b3..4b101a52f4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -572,7 +572,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestTextSearchActiveByDefault()
         {
-            configManager.SetValue(OsuSetting.ModSelectTextSearchStartsActive, true);
+            AddStep("text search starts active", () => configManager.SetValue(OsuSetting.ModSelectTextSearchStartsActive, true));
             createScreen();
 
             AddUntilStep("search text box focused", () => modSelectOverlay.SearchTextBox.HasFocus);
@@ -587,7 +587,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestTextSearchNotActiveByDefault()
         {
-            configManager.SetValue(OsuSetting.ModSelectTextSearchStartsActive, false);
+            AddStep("text search does not start active", () => configManager.SetValue(OsuSetting.ModSelectTextSearchStartsActive, false));
             createScreen();
 
             AddUntilStep("search text box not focused", () => !modSelectOverlay.SearchTextBox.HasFocus);
@@ -599,6 +599,31 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("search text box unfocused", () => !modSelectOverlay.SearchTextBox.HasFocus);
         }
 
+        [Test]
+        public void TestTextSearchDoesNotBlockCustomisationPanelKeyboardInteractions()
+        {
+            AddStep("text search starts active", () => configManager.SetValue(OsuSetting.ModSelectTextSearchStartsActive, true));
+            createScreen();
+
+            AddUntilStep("search text box focused", () => modSelectOverlay.SearchTextBox.HasFocus);
+
+            AddStep("select DT", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime() });
+            AddAssert("DT selected", () => modSelectOverlay.ChildrenOfType<ModPanel>().Count(panel => panel.Active.Value), () => Is.EqualTo(1));
+
+            AddStep("open customisation area", () => modSelectOverlay.CustomisationButton!.TriggerClick());
+            assertCustomisationToggleState(false, true);
+            AddStep("hover over mod settings slider", () =>
+            {
+                var slider = modSelectOverlay.ChildrenOfType<ModSettingsArea>().Single().ChildrenOfType<OsuSliderBar<double>>().First();
+                InputManager.MoveMouseTo(slider);
+            });
+            AddStep("press right arrow", () => InputManager.PressKey(Key.Right));
+            AddAssert("DT speed changed", () => !SelectedMods.Value.OfType<OsuModDoubleTime>().Single().SpeedChange.IsDefault);
+
+            AddStep("close customisation area", () => InputManager.PressKey(Key.Escape));
+            AddUntilStep("search text box reacquired focus", () => modSelectOverlay.SearchTextBox.HasFocus);
+        }
+
         [Test]
         public void TestDeselectAllViaKey()
         {

From 3f41c20ac6badc09efb5cf61205ecc106c1cabc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Dec 2023 17:25:15 +0100
Subject: [PATCH 2056/2296] Use safer fix for now

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

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 11eacd1c6b..d2321f4fc4 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -305,11 +305,10 @@ namespace osu.Game.Database
                     // The clamp from below to `comboPortionFromLongestComboInScoreV1` targets near-FC scores wherein
                     // the player had bad accuracy at the end of their longest combo, which causes the division by accuracy
                     // to underestimate the combo portion.
-                    // The clamp from above to `maximumAchievableComboPortionInScoreV1` targets FC scores wherein
-                    // the player had bad accuracy at the start of the map, which causes the division by accuracy
-                    // to overestimate the combo portion.
-                    double comboPortionInScoreV1 = Math.Clamp(maximumAchievableComboPortionInScoreV1 * comboProportion / score.Accuracy,
-                        comboPortionFromLongestComboInScoreV1, maximumAchievableComboPortionInScoreV1);
+                    // Ideally, this would be clamped from above to `maximumAchievableComboPortionInScoreV1` too,
+                    // but in practice this appears to fail for some scores (https://github.com/ppy/osu/pull/25876#issuecomment-1862248413).
+                    // TODO: investigate the above more closely
+                    double comboPortionInScoreV1 = Math.Max(maximumAchievableComboPortionInScoreV1 * comboProportion / score.Accuracy, comboPortionFromLongestComboInScoreV1);
 
                     // Calculate how many times the longest combo the user has achieved in the play can repeat
                     // without exceeding the combo portion in score V1 as achieved by the player.

From ec578e1d9f62697eee1b2b0b9f53c6a7727c0ca7 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 19 Dec 2023 21:20:21 +0100
Subject: [PATCH 2057/2296] fix near-zero length sliders n stuff being
 placeable

---
 .../Edit/Blueprints/BananaShowerPlacementBlueprint.cs          | 3 ++-
 .../Edit/Blueprints/JuiceStreamPlacementBlueprint.cs           | 3 ++-
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs              | 3 ++-
 .../Edit/Blueprints/TaikoSpanPlacementBlueprint.cs             | 3 ++-
 osu.Game/Rulesets/Objects/SliderPath.cs                        | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerPlacementBlueprint.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerPlacementBlueprint.cs
index 1e63d32c41..6902f78172 100644
--- a/osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerPlacementBlueprint.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Edit;
@@ -17,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
         private double placementStartTime;
         private double placementEndTime;
 
-        protected override bool IsValidForPlacement => HitObject.Duration > 0;
+        protected override bool IsValidForPlacement => Precision.DefinitelyBigger(HitObject.Duration, 0);
 
         public BananaShowerPlacementBlueprint()
         {
diff --git a/osu.Game.Rulesets.Catch/Edit/Blueprints/JuiceStreamPlacementBlueprint.cs b/osu.Game.Rulesets.Catch/Edit/Blueprints/JuiceStreamPlacementBlueprint.cs
index 9e50b5a80f..c8c8db1ebd 100644
--- a/osu.Game.Rulesets.Catch/Edit/Blueprints/JuiceStreamPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Catch/Edit/Blueprints/JuiceStreamPlacementBlueprint.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Edit;
@@ -24,7 +25,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
 
         private InputManager inputManager = null!;
 
-        protected override bool IsValidForPlacement => HitObject.Duration > 0;
+        protected override bool IsValidForPlacement => Precision.DefinitelyBigger(HitObject.Duration, 0);
 
         public JuiceStreamPlacementBlueprint()
         {
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 02ad1655b5..991b7f476c 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
@@ -23,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; } = null!;
 
-        protected override bool IsValidForPlacement => HitObject.Duration > 0;
+        protected override bool IsValidForPlacement => Precision.DefinitelyBigger(HitObject.Duration, 0);
 
         public HoldNotePlacementBlueprint()
             : base(new HoldNote())
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
index bc4129c982..b0919417a4 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
@@ -6,6 +6,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -25,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
 
         private readonly IHasDuration spanPlacementObject;
 
-        protected override bool IsValidForPlacement => spanPlacementObject.Duration > 0;
+        protected override bool IsValidForPlacement => Precision.DefinitelyBigger(spanPlacementObject.Duration, 0);
 
         public TaikoSpanPlacementBlueprint(HitObject hitObject)
             : base(hitObject)
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index e9a192669f..dc71608132 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public readonly Bindable<double?> ExpectedDistance = new Bindable<double?>();
 
-        public bool HasValidLength => Distance > 0;
+        public bool HasValidLength => Precision.DefinitelyBigger(Distance, 0);
 
         /// <summary>
         /// The control points of the path.

From c167f10ad5ff9b82b26ee5f3eb3b709fd7467f82 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 19 Dec 2023 21:20:45 +0100
Subject: [PATCH 2058/2296] fix crash from dragging near zero-length repeating
 object in timeline

---
 .../Compose/Components/Timeline/TimelineHitObjectBlueprint.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 77afad2d4f..47dc3fb82e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -409,7 +409,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     double lengthOfOneRepeat = repeatHitObject.Duration / (repeatHitObject.RepeatCount + 1);
                                     int proposedCount = Math.Max(0, (int)Math.Round(proposedDuration / lengthOfOneRepeat) - 1);
 
-                                    if (proposedCount == repeatHitObject.RepeatCount || lengthOfOneRepeat == 0)
+                                    if (proposedCount == repeatHitObject.RepeatCount || Precision.AlmostEquals(lengthOfOneRepeat, 0))
                                         return;
 
                                     repeatHitObject.RepeatCount = proposedCount;

From 1b004dbebce337df0a38b6e3d4408758460d4399 Mon Sep 17 00:00:00 2001
From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com>
Date: Tue, 19 Dec 2023 12:20:44 -0800
Subject: [PATCH 2059/2296] Allow Relax to fail and remove failable mod
 exclusions

Allows the Relax mod to fail, and remove NF/PF/SD mod exclusion

ref: https://github.com/ppy/osu/discussions/13229
---
 osu.Game/Rulesets/Mods/ModFailCondition.cs | 2 +-
 osu.Game/Rulesets/Mods/ModNoFail.cs        | 2 +-
 osu.Game/Rulesets/Mods/ModRelax.cs         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
index e671c065cf..a116826e32 100644
--- a/osu.Game/Rulesets/Mods/ModFailCondition.cs
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mods
 {
     public abstract class ModFailCondition : Mod, IApplicableToHealthProcessor, IApplicableFailOverride
     {
-        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModBlockFail) };
 
         [SettingSource("Restart on fail", "Automatically restarts when failed.")]
         public BindableBool Restart { get; } = new BindableBool();
diff --git a/osu.Game/Rulesets/Mods/ModNoFail.cs b/osu.Game/Rulesets/Mods/ModNoFail.cs
index 8c61d948a4..8fca98b018 100644
--- a/osu.Game/Rulesets/Mods/ModNoFail.cs
+++ b/osu.Game/Rulesets/Mods/ModNoFail.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyReduction;
         public override LocalisableString Description => "You can't fail, no matter what.";
         public override double ScoreMultiplier => 0.5;
-        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModFailCondition) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModFailCondition) };
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModRelax.cs b/osu.Game/Rulesets/Mods/ModRelax.cs
index 49c10339ee..3d672b5ef8 100644
--- a/osu.Game/Rulesets/Mods/ModRelax.cs
+++ b/osu.Game/Rulesets/Mods/ModRelax.cs
@@ -7,13 +7,13 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModRelax : ModBlockFail
+    public abstract class ModRelax : Mod
     {
         public override string Name => "Relax";
         public override string Acronym => "RX";
         public override IconUsage? Icon => OsuIcon.ModRelax;
         public override ModType Type => ModType.Automation;
         public override double ScoreMultiplier => 0.1;
-        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModFailCondition) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay) };
     }
 }

From 85e5d74a16eead4bc1dc01049698be56d8669de1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 12:42:06 +0900
Subject: [PATCH 2060/2296] Apply proposed changes

---
 osu.Game/Screens/Select/BeatmapDetails.cs     | 13 +------
 .../Screens/Select/Details/AdvancedStats.cs   | 34 ++++++++++++++++---
 osu.Game/Screens/Select/SongSelect.cs         | 13 ++-----
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 679ebfcf48..dec2c1c1de 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -19,7 +18,6 @@ using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Screens.Select.Details;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Select
 {
@@ -70,21 +68,12 @@ namespace osu.Game.Screens.Select
             CornerRadius = 10;
             Masking = true;
 
-            EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Glow,
-                Hollow = true,
-                Colour = new Color4(130, 204, 255, 15),
-                Radius = 10,
-            };
-
             Children = new Drawable[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = new Color4(130, 204, 255, 40),
-                    Blending = BlendingParameters.Additive,
+                    Colour = Colour4.Black.Opacity(0.3f),
                 },
                 new Container
                 {
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 66a913fda1..0d68a0ec3c 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -92,11 +92,35 @@ namespace osu.Game.Screens.Select.Details
                         Direction = FillDirection.Full,
                         Children = new[]
                         {
-                            FirstValue = new StatisticRow { Width = 0.5f }, // circle size/key amount
-                            HpDrain = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsDrain, Width = 0.5f },
-                            Accuracy = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsAccuracy, Width = 0.5f },
-                            ApproachRate = new StatisticRow { Title = BeatmapsetsStrings.ShowStatsAr, Width = 0.5f },
-                            starDifficulty = new StatisticRow(10, true) { Title = BeatmapsetsStrings.ShowStatsStars, Width = 0.5f },
+                            FirstValue = new StatisticRow
+                            {
+                                Width = 0.5f,
+                                Padding = new MarginPadding { Right = 5, Vertical = 2.5f },
+                            }, // circle size/key amount
+                            HpDrain = new StatisticRow
+                            {
+                                Title = BeatmapsetsStrings.ShowStatsDrain,
+                                Width = 0.5f,
+                                Padding = new MarginPadding { Left = 5, Vertical = 2.5f },
+                            },
+                            Accuracy = new StatisticRow
+                            {
+                                Title = BeatmapsetsStrings.ShowStatsAccuracy,
+                                Width = 0.5f,
+                                Padding = new MarginPadding { Right = 5, Vertical = 2.5f },
+                            },
+                            ApproachRate = new StatisticRow
+                            {
+                                Title = BeatmapsetsStrings.ShowStatsAr,
+                                Width = 0.5f,
+                                Padding = new MarginPadding { Left = 5, Vertical = 2.5f },
+                            },
+                            starDifficulty = new StatisticRow(10, true)
+                            {
+                                Title = BeatmapsetsStrings.ShowStatsStars,
+                                Width = 0.5f,
+                                Padding = new MarginPadding { Right = 5, Vertical = 2.5f },
+                            },
                         },
                     };
                     break;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 208a8eb321..0d302dc561 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -13,7 +13,6 @@ 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.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
@@ -274,28 +273,20 @@ namespace osu.Game.Screens.Select
                                                         RelativeSizeAxes = Axes.Both,
                                                         Masking = true,
                                                         CornerRadius = 10,
-                                                        EdgeEffect = new EdgeEffectParameters
-                                                        {
-                                                            Type = EdgeEffectType.Glow,
-                                                            Hollow = true,
-                                                            Colour = new Color4(130, 204, 255, 15),
-                                                            Radius = 10,
-                                                        },
                                                         Children = new Drawable[]
                                                         {
                                                             new Box
                                                             {
-                                                                Colour = new Color4(130, 204, 255, 40),
-                                                                Blending = BlendingParameters.Additive,
                                                                 RelativeSizeAxes = Axes.Both,
+                                                                Colour = Colour4.Black.Opacity(0.3f),
                                                             },
                                                             advancedStats = new AdvancedStats(2)
                                                             {
                                                                 RelativeSizeAxes = Axes.X,
                                                                 AutoSizeAxes = Axes.Y,
-                                                                Width = 0.8f,
                                                                 Anchor = Anchor.Centre,
                                                                 Origin = Anchor.Centre,
+                                                                Padding = new MarginPadding(10)
                                                             },
                                                         }
                                                     },

From 856c59f7f75d9322e03d98b874ab04691c5bc968 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 14:08:12 +0900
Subject: [PATCH 2061/2296] Fix thread safety of
 `OnlineMetadataClient.UserStates`

Closes https://github.com/ppy/osu-framework/issues/6081.
---
 osu.Game/Online/Metadata/OnlineMetadataClient.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
index 27093d7961..b916386b06 100644
--- a/osu.Game/Online/Metadata/OnlineMetadataClient.cs
+++ b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
@@ -97,8 +97,11 @@ namespace osu.Game.Online.Metadata
         {
             if (!connected.NewValue)
             {
-                isWatchingUserPresence.Value = false;
-                userStates.Clear();
+                Schedule(() =>
+                {
+                    isWatchingUserPresence.Value = false;
+                    userStates.Clear();
+                });
                 return;
             }
 
@@ -187,13 +190,13 @@ namespace osu.Game.Online.Metadata
 
         public override Task UserPresenceUpdated(int userId, UserPresence? presence)
         {
-            lock (userStates)
+            Schedule(() =>
             {
                 if (presence != null)
                     userStates[userId] = presence.Value;
                 else
                     userStates.Remove(userId);
-            }
+            });
 
             return Task.CompletedTask;
         }
@@ -215,8 +218,8 @@ namespace osu.Game.Online.Metadata
                 if (connector?.IsConnected.Value != true)
                     throw new OperationCanceledException();
 
-                // must happen synchronously before any remote calls to avoid misordering.
-                userStates.Clear();
+                // must happen synchronously before any remote calls to avoid mis-ordering.
+                Schedule(() => userStates.Clear());
                 Debug.Assert(connection != null);
                 await connection.InvokeAsync(nameof(IMetadataServer.EndWatchingUserPresence)).ConfigureAwait(false);
             }

From d7603e8021a0a0ae3cd09ee73344c76054cbcd8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 14:32:38 +0900
Subject: [PATCH 2062/2296] Adjust "classic" mod multiplier to 0.96x

Following discussions on discord, this seems like the most agreed upon
value. Increasing this is important so that imported legacy scores don't
lose too much value.
---
 osu.Game/Rulesets/Mods/ModClassic.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModClassic.cs b/osu.Game/Rulesets/Mods/ModClassic.cs
index 42fdee0402..16cb928bd4 100644
--- a/osu.Game/Rulesets/Mods/ModClassic.cs
+++ b/osu.Game/Rulesets/Mods/ModClassic.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override string Acronym => "CL";
 
-        public override double ScoreMultiplier => 0.5;
+        public override double ScoreMultiplier => 0.96;
 
         public override IconUsage? Icon => FontAwesome.Solid.History;
 

From 14d2d0d21538e4240211fa839ab6a34256cf797b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 14:50:21 +0900
Subject: [PATCH 2063/2296] Remove `ModBlockFail`

Was only being used by `NoFail` now.
---
 osu.Game/Rulesets/Mods/ModBlockFail.cs     | 31 ----------------------
 osu.Game/Rulesets/Mods/ModFailCondition.cs |  2 +-
 osu.Game/Rulesets/Mods/ModNoFail.cs        | 24 ++++++++++++++++-
 3 files changed, 24 insertions(+), 33 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Mods/ModBlockFail.cs

diff --git a/osu.Game/Rulesets/Mods/ModBlockFail.cs b/osu.Game/Rulesets/Mods/ModBlockFail.cs
deleted file mode 100644
index cdfb36ebbc..0000000000
--- a/osu.Game/Rulesets/Mods/ModBlockFail.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.
-
-using osu.Framework.Bindables;
-using osu.Game.Configuration;
-using osu.Game.Screens.Play;
-
-namespace osu.Game.Rulesets.Mods
-{
-    public abstract class ModBlockFail : Mod, IApplicableFailOverride, IApplicableToHUD, IReadFromConfig
-    {
-        private readonly Bindable<bool> showHealthBar = new Bindable<bool>();
-
-        /// <summary>
-        /// We never fail, 'yo.
-        /// </summary>
-        public bool PerformFail() => false;
-
-        public bool RestartOnFail => false;
-
-        public void ReadFromConfig(OsuConfigManager config)
-        {
-            config.BindWith(OsuSetting.ShowHealthDisplayWhenCantFail, showHealthBar);
-        }
-
-        public void ApplyToHUD(HUDOverlay overlay)
-        {
-            overlay.ShowHealthBar.BindTo(showHealthBar);
-        }
-    }
-}
diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
index a116826e32..471c3bfe8d 100644
--- a/osu.Game/Rulesets/Mods/ModFailCondition.cs
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mods
 {
     public abstract class ModFailCondition : Mod, IApplicableToHealthProcessor, IApplicableFailOverride
     {
-        public override Type[] IncompatibleMods => new[] { typeof(ModBlockFail) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail) };
 
         [SettingSource("Restart on fail", "Automatically restarts when failed.")]
         public BindableBool Restart { get; } = new BindableBool();
diff --git a/osu.Game/Rulesets/Mods/ModNoFail.cs b/osu.Game/Rulesets/Mods/ModNoFail.cs
index 8fca98b018..0cf81bf4c9 100644
--- a/osu.Game/Rulesets/Mods/ModNoFail.cs
+++ b/osu.Game/Rulesets/Mods/ModNoFail.cs
@@ -2,13 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModNoFail : ModBlockFail
+    public abstract class ModNoFail : Mod, IApplicableFailOverride, IApplicableToHUD, IReadFromConfig
     {
         public override string Name => "No Fail";
         public override string Acronym => "NF";
@@ -17,5 +20,24 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "You can't fail, no matter what.";
         public override double ScoreMultiplier => 0.5;
         public override Type[] IncompatibleMods => new[] { typeof(ModFailCondition) };
+
+        private readonly Bindable<bool> showHealthBar = new Bindable<bool>();
+
+        /// <summary>
+        /// We never fail, 'yo.
+        /// </summary>
+        public bool PerformFail() => false;
+
+        public bool RestartOnFail => false;
+
+        public void ReadFromConfig(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.ShowHealthDisplayWhenCantFail, showHealthBar);
+        }
+
+        public void ApplyToHUD(HUDOverlay overlay)
+        {
+            overlay.ShowHealthBar.BindTo(showHealthBar);
+        }
     }
 }

From b6f0c98a0907ad1869a19c4dc00c83cedbf4b03c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 14:56:52 +0900
Subject: [PATCH 2064/2296] Also apply to autopilot

---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 56bf0e08e9..bf74b741d5 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -16,7 +16,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModAutopilot : Mod, IApplicableFailOverride, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
+    public class OsuModAutopilot : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
     {
         public override string Name => "Autopilot";
         public override string Acronym => "AP";
@@ -37,10 +37,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             typeof(ModTouchDevice)
         };
 
-        public bool PerformFail() => false;
-
-        public bool RestartOnFail => false;
-
         private OsuInputManager inputManager = null!;
 
         private List<OsuReplayFrame> replayFrames = null!;

From 64f62e7d904a31a31df6b0926aba6284ef4f7087 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 17:31:08 +0900
Subject: [PATCH 2065/2296] Fix song select running updates when screen is not
 active
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Who would have guessed that `Schedule` calls were there for a reason!

I've tidied things up. Most of the changes I've made here are not
required – the schedule is the main thing here. The reason the sound was
playing is because one-too-many schedules was removed causing beatmap
updates to update carousel specifics while still at the player loader
screen.

Note that the selection sound still plays on returning to song select,
but this is not a regression. I'm looking at fixing this in a separate
PR because I'm in a good place as far as understanding the logic right
now and it would be a waste to leave it broken.

Closes https://github.com/ppy/osu/issues/25875.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 100 ++++++++++++---------
 1 file changed, 58 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index fe7eee701f..53529d592b 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -301,6 +301,9 @@ namespace osu.Game.Screens.Select
             if (loadedTestBeatmaps)
                 return;
 
+            var setsRequiringUpdate = new HashSet<BeatmapSetInfo>();
+            var setsRequiringRemoval = new HashSet<Guid>();
+
             if (changes == null)
             {
                 // During initial population, we must manually account for the fact that our original query was done on an async thread.
@@ -314,67 +317,80 @@ namespace osu.Game.Screens.Select
                 foreach (var id in realmSets)
                 {
                     if (!root.BeatmapSetsByID.ContainsKey(id))
-                        updateBeatmapSet(realm.Realm.Find<BeatmapSetInfo>(id)!.Detach());
+                        setsRequiringUpdate.Add(realm.Realm.Find<BeatmapSetInfo>(id)!.Detach());
                 }
 
                 foreach (var id in root.BeatmapSetsByID.Keys)
                 {
                     if (!realmSets.Contains(id))
-                        removeBeatmapSet(id);
+                        setsRequiringRemoval.Add(id);
                 }
+            }
+            else
+            {
+                foreach (int i in changes.NewModifiedIndices)
+                    setsRequiringUpdate.Add(sender[i].Detach());
 
-                invalidateAfterChange();
-                BeatmapSetsLoaded = true;
-                return;
+                foreach (int i in changes.InsertedIndices)
+                    setsRequiringUpdate.Add(sender[i].Detach());
             }
 
-            foreach (int i in changes.NewModifiedIndices)
-                updateBeatmapSet(sender[i].Detach());
-
-            foreach (int i in changes.InsertedIndices)
-                updateBeatmapSet(sender[i].Detach());
-
-            if (changes.DeletedIndices.Length > 0 && SelectedBeatmapInfo != null)
+            // All local operations must be scheduled.
+            //
+            // If we don't schedule, beatmaps getting changed while song select is suspended (ie. last played being updated)
+            // will cause unexpected sounds and operations to occur in the background.
+            Schedule(() =>
             {
-                // If SelectedBeatmapInfo is non-null, the set should also be non-null.
-                Debug.Assert(SelectedBeatmapSet != null);
-
-                // To handle the beatmap update flow, attempt to track selection changes across delete-insert transactions.
-                // When an update occurs, the previous beatmap set is either soft or hard deleted.
-                // Check if the current selection was potentially deleted by re-querying its validity.
-                bool selectedSetMarkedDeleted = sender.Realm.Find<BeatmapSetInfo>(SelectedBeatmapSet.ID)?.DeletePending != false;
-
-                int[] modifiedAndInserted = changes.NewModifiedIndices.Concat(changes.InsertedIndices).ToArray();
-
-                if (selectedSetMarkedDeleted && modifiedAndInserted.Any())
+                try
                 {
-                    // If it is no longer valid, make the bold assumption that an updated version will be available in the modified/inserted indices.
-                    // This relies on the full update operation being in a single transaction, so please don't change that.
-                    foreach (int i in modifiedAndInserted)
+                    foreach (var set in setsRequiringRemoval)
+                        removeBeatmapSet(set);
+
+                    foreach (var set in setsRequiringUpdate)
+                        updateBeatmapSet(set);
+
+                    if (changes?.DeletedIndices.Length > 0 && SelectedBeatmapInfo != null)
                     {
-                        var beatmapSetInfo = sender[i];
+                        // If SelectedBeatmapInfo is non-null, the set should also be non-null.
+                        Debug.Assert(SelectedBeatmapSet != null);
 
-                        foreach (var beatmapInfo in beatmapSetInfo.Beatmaps)
+                        // To handle the beatmap update flow, attempt to track selection changes across delete-insert transactions.
+                        // When an update occurs, the previous beatmap set is either soft or hard deleted.
+                        // Check if the current selection was potentially deleted by re-querying its validity.
+                        bool selectedSetMarkedDeleted = realm.Run(r => r.Find<BeatmapSetInfo>(SelectedBeatmapSet.ID)?.DeletePending != false);
+
+                        if (selectedSetMarkedDeleted && setsRequiringUpdate.Any())
                         {
-                            if (!((IBeatmapMetadataInfo)beatmapInfo.Metadata).Equals(SelectedBeatmapInfo.Metadata))
-                                continue;
-
-                            // Best effort matching. We can't use ID because in the update flow a new version will get its own GUID.
-                            if (beatmapInfo.DifficultyName == SelectedBeatmapInfo.DifficultyName)
+                            // If it is no longer valid, make the bold assumption that an updated version will be available in the modified/inserted indices.
+                            // This relies on the full update operation being in a single transaction, so please don't change that.
+                            foreach (var set in setsRequiringUpdate)
                             {
-                                SelectBeatmap(beatmapInfo);
-                                return;
+                                foreach (var beatmapInfo in set.Beatmaps)
+                                {
+                                    if (!((IBeatmapMetadataInfo)beatmapInfo.Metadata).Equals(SelectedBeatmapInfo.Metadata))
+                                        continue;
+
+                                    // Best effort matching. We can't use ID because in the update flow a new version will get its own GUID.
+                                    if (beatmapInfo.DifficultyName == SelectedBeatmapInfo.DifficultyName)
+                                    {
+                                        SelectBeatmap(beatmapInfo);
+                                        return;
+                                    }
+                                }
                             }
+
+                            // If a direct selection couldn't be made, it's feasible that the difficulty name (or beatmap metadata) changed.
+                            // Let's attempt to follow set-level selection anyway.
+                            SelectBeatmap(setsRequiringUpdate.First().Beatmaps.First());
                         }
                     }
-
-                    // If a direct selection couldn't be made, it's feasible that the difficulty name (or beatmap metadata) changed.
-                    // Let's attempt to follow set-level selection anyway.
-                    SelectBeatmap(sender[modifiedAndInserted.First()].Beatmaps.First());
                 }
-            }
-
-            invalidateAfterChange();
+                finally
+                {
+                    BeatmapSetsLoaded = true;
+                    invalidateAfterChange();
+                }
+            });
         }
 
         private void beatmapsChanged(IRealmCollection<BeatmapInfo> sender, ChangeSet? changes)

From 104fbbde9460d42c10fe5d4d60db2dbfc4218421 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 20 Dec 2023 18:35:45 +0900
Subject: [PATCH 2066/2296] Change mania scoring to match ScoreV2

---
 .../Objects/Drawables/DrawableNote.cs         | 40 -----------------
 .../Drawables/DrawableNotePerfectBonus.cs     | 26 -----------
 .../Scoring/ManiaScoreProcessor.cs            | 43 +++++++++++++++++--
 osu.Game.Rulesets.Mania/UI/Column.cs          |  1 -
 4 files changed, 40 insertions(+), 70 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNotePerfectBonus.cs

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index c70dfcb761..680009bc4c 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -13,8 +13,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Skinning.Default;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
@@ -40,8 +38,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private Drawable headPiece;
 
-        private DrawableNotePerfectBonus perfectBonus;
-
         public DrawableNote()
             : this(null)
         {
@@ -93,10 +89,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             if (!userTriggered)
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                {
-                    perfectBonus.TriggerResult(false);
                     ApplyResult(r => r.Type = r.Judgement.MinResult);
-                }
 
                 return;
             }
@@ -107,16 +100,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             result = GetCappedResult(result);
 
-            perfectBonus.TriggerResult(result == HitResult.Perfect);
             ApplyResult(r => r.Type = result);
         }
 
-        public override void MissForcefully()
-        {
-            perfectBonus.TriggerResult(false);
-            base.MissForcefully();
-        }
-
         /// <summary>
         /// Some objects in mania may want to limit the max result.
         /// </summary>
@@ -137,32 +123,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
         }
 
-        protected override void AddNestedHitObject(DrawableHitObject hitObject)
-        {
-            switch (hitObject)
-            {
-                case DrawableNotePerfectBonus bonus:
-                    AddInternal(perfectBonus = bonus);
-                    break;
-            }
-        }
-
-        protected override void ClearNestedHitObjects()
-        {
-            RemoveInternal(perfectBonus, false);
-        }
-
-        protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
-        {
-            switch (hitObject)
-            {
-                case NotePerfectBonus bonus:
-                    return new DrawableNotePerfectBonus(bonus);
-            }
-
-            return base.CreateNestedHitObject(hitObject);
-        }
-
         private void updateSnapColour()
         {
             if (beatmap == null || HitObject == null) return;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNotePerfectBonus.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNotePerfectBonus.cs
deleted file mode 100644
index 70ddb60296..0000000000
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNotePerfectBonus.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.
-
-namespace osu.Game.Rulesets.Mania.Objects.Drawables
-{
-    public partial class DrawableNotePerfectBonus : DrawableManiaHitObject<NotePerfectBonus>
-    {
-        public override bool DisplayResult => false;
-
-        public DrawableNotePerfectBonus()
-            : this(null!)
-        {
-        }
-
-        public DrawableNotePerfectBonus(NotePerfectBonus hitObject)
-            : base(hitObject)
-        {
-        }
-
-        /// <summary>
-        /// Apply a judgement result.
-        /// </summary>
-        /// <param name="hit">Whether this tick was reached.</param>
-        internal void TriggerResult(bool hit) => ApplyResult(r => r.Type = hit ? r.Judgement.MaxResult : r.Judgement.MinResult);
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index e5f9b33c6b..31435ddaad 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -26,13 +26,50 @@ namespace osu.Game.Rulesets.Mania.Scoring
 
         protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
-            return 10000 * comboProgress
-                   + 990000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyProgress
+            return 200000 * comboProgress
+                   + 800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyProgress
                    + bonusPortion;
         }
 
+        protected override double GetNumericResultFor(JudgementResult result)
+        {
+            switch (result.Type)
+            {
+                case HitResult.Perfect:
+                    return 305;
+            }
+
+            return base.GetNumericResultFor(result);
+        }
+
+        protected override double GetMaxNumericResultFor(JudgementResult result)
+        {
+            switch (result.Judgement.MaxResult)
+            {
+                case HitResult.Perfect:
+                    return 305;
+            }
+
+            return base.GetMaxNumericResultFor(result);
+        }
+
         protected override double GetComboScoreChange(JudgementResult result)
-            => GetNumericResultFor(result) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
+        {
+            double numericResult;
+
+            switch (result.Type)
+            {
+                case HitResult.Perfect:
+                    numericResult = 300;
+                    break;
+
+                default:
+                    numericResult = GetNumericResultFor(result);
+                    break;
+            }
+
+            return numericResult * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
+        }
 
         private class JudgementOrderComparer : IComparer<HitObject>
         {
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 9489281176..6cd55bb099 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -109,7 +109,6 @@ namespace osu.Game.Rulesets.Mania.UI
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
             RegisterPool<Note, DrawableNote>(10, 50);
-            RegisterPool<NotePerfectBonus, DrawableNotePerfectBonus>(10, 50);
             RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);

From 023bbda7dbb381255e66c84ac209c6510662380f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 20 Dec 2023 18:43:06 +0900
Subject: [PATCH 2067/2296] Change mania to 85% acc / 15% combo

---
 osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 31435ddaad..d5191c880a 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -26,8 +26,8 @@ namespace osu.Game.Rulesets.Mania.Scoring
 
         protected override double ComputeTotalScore(double comboProgress, double accuracyProgress, double bonusPortion)
         {
-            return 200000 * comboProgress
-                   + 800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyProgress
+            return 150000 * comboProgress
+                   + 850000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * accuracyProgress
                    + bonusPortion;
         }
 

From e003462f7d4077d43513d233ae2b4143270be3e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 19:09:07 +0900
Subject: [PATCH 2068/2296] Fix beatmap updates causing one extra carousel
 selection

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 85 +++++++++++--------
 .../Carousel/CarouselGroupEagerSelect.cs      |  8 +-
 2 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 53529d592b..a51b54b21d 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -455,30 +455,13 @@ namespace osu.Game.Screens.Select
 
         private void updateBeatmapSet(BeatmapSetInfo beatmapSet)
         {
-            Guid? previouslySelectedID = null;
-
             originalBeatmapSetsDetached.RemoveAll(set => set.ID == beatmapSet.ID);
             originalBeatmapSetsDetached.Add(beatmapSet.Detach());
 
-            // If the selected beatmap is about to be removed, store its ID so it can be re-selected if required
-            if (selectedBeatmapSet?.BeatmapSet.ID == beatmapSet.ID)
-                previouslySelectedID = selectedBeatmap?.BeatmapInfo.ID;
-
-            var removedSets = root.RemoveItemsByID(beatmapSet.ID);
-
-            foreach (var removedSet in removedSets)
-            {
-                // If we don't remove this here, it may remain in a hidden state until scrolled off screen.
-                // Doesn't really affect anything during actual user interaction, but makes testing annoying.
-                var removedDrawable = Scroll.FirstOrDefault(c => c.Item == removedSet);
-                if (removedDrawable != null)
-                    expirePanelImmediately(removedDrawable);
-            }
+            var newSets = new List<CarouselBeatmapSet>();
 
             if (beatmapsSplitOut)
             {
-                var newSets = new List<CarouselBeatmapSet>();
-
                 foreach (var beatmap in beatmapSet.Beatmaps)
                 {
                     var newSet = createCarouselSet(new BeatmapSetInfo(new[] { beatmap })
@@ -489,18 +472,7 @@ namespace osu.Game.Screens.Select
                     });
 
                     if (newSet != null)
-                    {
                         newSets.Add(newSet);
-                        root.AddItem(newSet);
-                    }
-                }
-
-                // check if we can/need to maintain our current selection.
-                if (previouslySelectedID != null)
-                {
-                    var toSelect = newSets.FirstOrDefault(s => s.Beatmaps.Any(b => b.BeatmapInfo.ID == previouslySelectedID))
-                                   ?? newSets.FirstOrDefault();
-                    select(toSelect);
                 }
             }
             else
@@ -508,13 +480,18 @@ namespace osu.Game.Screens.Select
                 var newSet = createCarouselSet(beatmapSet);
 
                 if (newSet != null)
-                {
-                    root.AddItem(newSet);
+                    newSets.Add(newSet);
+            }
 
-                    // check if we can/need to maintain our current selection.
-                    if (previouslySelectedID != null)
-                        select((CarouselItem?)newSet.Beatmaps.FirstOrDefault(b => b.BeatmapInfo.ID == previouslySelectedID) ?? newSet);
-                }
+            var removedSets = root.ReplaceItem(beatmapSet, newSets);
+
+            // If we don't remove these here, it may remain in a hidden state until scrolled off screen.
+            // Doesn't really affect anything during actual user interaction, but makes testing annoying.
+            foreach (var removedSet in removedSets)
+            {
+                var removedDrawable = Scroll.FirstOrDefault(c => c.Item == removedSet);
+                if (removedDrawable != null)
+                    expirePanelImmediately(removedDrawable);
             }
         }
 
@@ -1207,6 +1184,44 @@ namespace osu.Game.Screens.Select
                 base.AddItem(i);
             }
 
+            /// <summary>
+            /// A special method to handle replace operations (general for updating a beatmap).
+            /// Avoids event-driven selection flip-flopping during the remove/add process.
+            /// </summary>
+            /// <param name="oldItem">The beatmap set to be replaced.</param>
+            /// <param name="newItems">All new items to replace the removed beatmap set.</param>
+            /// <returns>All removed items, for any further processing.</returns>
+            public IEnumerable<CarouselBeatmapSet> ReplaceItem(BeatmapSetInfo oldItem, List<CarouselBeatmapSet> newItems)
+            {
+                // Without doing this, the removal of the old beatmap will cause carousel's eager selection
+                // logic to invoke, causing one unnecessary selection.
+                DisableSelection = true;
+                var removedSets = RemoveItemsByID(oldItem.ID);
+                DisableSelection = false;
+
+                foreach (var set in newItems)
+                    AddItem(set);
+
+                Guid? previouslySelectedID = null;
+
+                var selectedBeatmap = (LastSelected as CarouselBeatmap)?.BeatmapInfo;
+
+                // If the selected beatmap is about to be removed, store its ID so it can be re-selected if required
+                if (selectedBeatmap?.BeatmapSet?.ID == oldItem.ID)
+                    previouslySelectedID = selectedBeatmap.ID;
+
+                // check if we can/need to maintain our current selection.
+                if (previouslySelectedID != null)
+                {
+                    var toSelect = newItems.FirstOrDefault(s => s.Beatmaps.Any(b => b.BeatmapInfo.ID == previouslySelectedID))
+                                   ?? newItems.First();
+
+                    toSelect.State.Value = CarouselItemState.Selected;
+                }
+
+                return removedSets;
+            }
+
             public IEnumerable<CarouselBeatmapSet> RemoveItemsByID(Guid beatmapSetID)
             {
                 if (BeatmapSetsByID.TryGetValue(beatmapSetID, out var carouselBeatmapSets))
diff --git a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
index b4313c1895..cf4ba5924f 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
@@ -36,13 +36,13 @@ namespace osu.Game.Screens.Select.Carousel
         /// items have been filtered. This bool will be true during the base <see cref="Filter(FilterCriteria)"/>
         /// operation.
         /// </summary>
-        private bool filteringItems;
+        protected bool DisableSelection;
 
         public override void Filter(FilterCriteria criteria)
         {
-            filteringItems = true;
+            DisableSelection = true;
             base.Filter(criteria);
-            filteringItems = false;
+            DisableSelection = false;
 
             attemptSelection();
         }
@@ -95,7 +95,7 @@ namespace osu.Game.Screens.Select.Carousel
 
         private void attemptSelection()
         {
-            if (filteringItems) return;
+            if (DisableSelection) return;
 
             // we only perform eager selection if we are a currently selected group.
             if (State.Value != CarouselItemState.Selected) return;

From 7fa4dcf0fbd95c3f68de861a4985613c0ed29538 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 19:27:57 +0900
Subject: [PATCH 2069/2296] Fix selection retention logic copy paste failure

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index a51b54b21d..370b559897 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -1193,6 +1193,12 @@ namespace osu.Game.Screens.Select
             /// <returns>All removed items, for any further processing.</returns>
             public IEnumerable<CarouselBeatmapSet> ReplaceItem(BeatmapSetInfo oldItem, List<CarouselBeatmapSet> newItems)
             {
+                var previousSelection = (LastSelected as CarouselBeatmapSet)?.Beatmaps
+                                                                            .FirstOrDefault(s => s.State.Value == CarouselItemState.Selected)
+                                                                            ?.BeatmapInfo;
+
+                bool wasSelected = previousSelection?.BeatmapSet?.ID == oldItem.ID;
+
                 // Without doing this, the removal of the old beatmap will cause carousel's eager selection
                 // logic to invoke, causing one unnecessary selection.
                 DisableSelection = true;
@@ -1202,21 +1208,14 @@ namespace osu.Game.Screens.Select
                 foreach (var set in newItems)
                     AddItem(set);
 
-                Guid? previouslySelectedID = null;
-
-                var selectedBeatmap = (LastSelected as CarouselBeatmap)?.BeatmapInfo;
-
-                // If the selected beatmap is about to be removed, store its ID so it can be re-selected if required
-                if (selectedBeatmap?.BeatmapSet?.ID == oldItem.ID)
-                    previouslySelectedID = selectedBeatmap.ID;
-
-                // check if we can/need to maintain our current selection.
-                if (previouslySelectedID != null)
+                // Check if we can/need to maintain our current selection.
+                if (wasSelected)
                 {
-                    var toSelect = newItems.FirstOrDefault(s => s.Beatmaps.Any(b => b.BeatmapInfo.ID == previouslySelectedID))
-                                   ?? newItems.First();
+                    CarouselBeatmap? matchingBeatmap = newItems.SelectMany(s => s.Beatmaps)
+                                                               .FirstOrDefault(b => b.BeatmapInfo.ID == previousSelection?.ID);
 
-                    toSelect.State.Value = CarouselItemState.Selected;
+                    if (matchingBeatmap != null)
+                        matchingBeatmap.State.Value = CarouselItemState.Selected;
                 }
 
                 return removedSets;

From 5284b95bb8ffe943f8e53c52b33c0275ac59b529 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 19:42:05 +0900
Subject: [PATCH 2070/2296] Schedule even more

---
 osu.Game/Online/Metadata/OnlineMetadataClient.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
index b916386b06..6d00ce7551 100644
--- a/osu.Game/Online/Metadata/OnlineMetadataClient.cs
+++ b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Online.Metadata
 
             Debug.Assert(connection != null);
             await connection.InvokeAsync(nameof(IMetadataServer.BeginWatchingUserPresence)).ConfigureAwait(false);
-            isWatchingUserPresence.Value = true;
+            Schedule(() => isWatchingUserPresence.Value = true);
         }
 
         public override async Task EndWatchingUserPresence()
@@ -218,14 +218,14 @@ namespace osu.Game.Online.Metadata
                 if (connector?.IsConnected.Value != true)
                     throw new OperationCanceledException();
 
-                // must happen synchronously before any remote calls to avoid mis-ordering.
+                // must be scheduled before any remote calls to avoid mis-ordering.
                 Schedule(() => userStates.Clear());
                 Debug.Assert(connection != null);
                 await connection.InvokeAsync(nameof(IMetadataServer.EndWatchingUserPresence)).ConfigureAwait(false);
             }
             finally
             {
-                isWatchingUserPresence.Value = false;
+                Schedule(() => isWatchingUserPresence.Value = false);
             }
         }
 

From e0c27510f23b71df4d13b78d7b4800135a3d16ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 19:47:36 +0900
Subject: [PATCH 2071/2296] Remove remaining usage of `NotePerfectBonus`

---
 osu.Game.Rulesets.Mania/Objects/Note.cs       |  8 --------
 .../Objects/NotePerfectBonus.cs               | 20 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Objects/NotePerfectBonus.cs

diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 5914132624..0035960c63 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.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.Threading;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -13,12 +12,5 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class Note : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new ManiaJudgement();
-
-        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
-        {
-            base.CreateNestedHitObjects(cancellationToken);
-
-            AddNested(new NotePerfectBonus { StartTime = StartTime });
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/NotePerfectBonus.cs b/osu.Game.Rulesets.Mania/Objects/NotePerfectBonus.cs
deleted file mode 100644
index def4c01268..0000000000
--- a/osu.Game.Rulesets.Mania/Objects/NotePerfectBonus.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 osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Judgements;
-using osu.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Mania.Objects
-{
-    public class NotePerfectBonus : ManiaHitObject
-    {
-        public override Judgement CreateJudgement() => new NotePerfectBonusJudgement();
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
-
-        public class NotePerfectBonusJudgement : ManiaJudgement
-        {
-            public override HitResult MaxResult => HitResult.SmallBonus;
-        }
-    }
-}

From d417b156b25b9541ae88d1acc1d93aa571abbaf0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 19:57:42 +0900
Subject: [PATCH 2072/2296] Update test expectations

---
 .../Mods/TestSceneManiaModDoubleTime.cs                    | 7 ++++---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs    | 6 +++---
 osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs     | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
index c717f03f51..975e43ec08 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Objects;
@@ -25,8 +26,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         public void TestHitWindowWithoutDoubleTime() => CreateModTest(new ModTestData
         {
             PassCondition = () => Player.ScoreProcessor.JudgedHits > 0
-                                  && Player.ScoreProcessor.Accuracy.Value == 1
-                                  && Player.ScoreProcessor.TotalScore.Value == 1_000_000,
+                                  && Precision.AlmostEquals(Player.ScoreProcessor.Accuracy.Value, 0.9836, 0.01)
+                                  && Player.ScoreProcessor.TotalScore.Value == 946_049,
             Autoplay = false,
             Beatmap = new Beatmap
             {
@@ -53,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
                 Mod = doubleTime,
                 PassCondition = () => Player.ScoreProcessor.JudgedHits > 0
                                       && Player.ScoreProcessor.Accuracy.Value == 1
-                                      && Player.ScoreProcessor.TotalScore.Value == (long)(1_000_010 * doubleTime.ScoreMultiplier),
+                                      && Player.ScoreProcessor.TotalScore.Value == (long)(1_000_000 * doubleTime.ScoreMultiplier),
                 Autoplay = false,
                 Beatmap = new Beatmap
                 {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 044ce37832..d752c443cc 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -201,11 +201,11 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             assertHeadJudgement(HitResult.Perfect);
             // judgement combo offset by perfect bonus judgement. see logic in DrawableNote.CheckForResult.
-            assertComboAtJudgement(1, 1);
+            assertComboAtJudgement(0, 1);
             assertTailJudgement(HitResult.Meh);
-            assertComboAtJudgement(2, 0);
+            assertComboAtJudgement(1, 0);
             // judgement combo offset by perfect bonus judgement. see logic in DrawableNote.CheckForResult.
-            assertComboAtJudgement(4, 1);
+            assertComboAtJudgement(3, 1);
         }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
index edf866952b..ee6d999932 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneMaximumScore.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("all objects perfectly judged",
                 () => judgementResults.Select(result => result.Type),
                 () => Is.EquivalentTo(judgementResults.Select(result => result.Judgement.MaxResult)));
-            AddAssert("score is correct", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_030));
+            AddAssert("score is correct", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_000));
         }
 
         [Test]
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("all objects perfectly judged",
                 () => judgementResults.Select(result => result.Type),
                 () => Is.EquivalentTo(judgementResults.Select(result => result.Judgement.MaxResult)));
-            AddAssert("score is correct", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_040));
+            AddAssert("score is correct", () => currentPlayer.ScoreProcessor.TotalScore.Value, () => Is.EqualTo(1_000_000));
         }
 
         private void performTest(List<ManiaHitObject> hitObjects, List<ReplayFrame> frames)

From 38d6b7f45b7d07bfb0b9e5bdac1163dda0dcc25b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 20 Dec 2023 20:03:13 +0900
Subject: [PATCH 2073/2296] Update total score conversion

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

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 6484500bcc..a9225050b7 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -367,8 +367,8 @@ namespace osu.Game.Database
 
                 case 3:
                     return (long)Math.Round((
-                        990000 * comboProportion
-                        + 10000 * Math.Pow(score.Accuracy, 2 + 2 * score.Accuracy)
+                        850000 * comboProportion
+                        + 150000 * Math.Pow(score.Accuracy, 2 + 2 * score.Accuracy)
                         + bonusProportion) * modMultiplier);
 
                 default:

From 9b383e3276c23ec9f070b3ab1ccd01df969c83a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 20:23:19 +0900
Subject: [PATCH 2074/2296] Add support for showing tick misses

---
 .../Objects/Drawables/DrawableSliderRepeat.cs |  2 -
 .../Objects/Drawables/DrawableSliderTail.cs   |  5 --
 .../Objects/Drawables/DrawableSliderTick.cs   |  2 -
 .../Scoring/OsuHitWindows.cs                  |  2 +
 .../Skinning/Argon/ArgonJudgementPiece.cs     | 30 +++++------
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  5 +-
 osu.Game/Graphics/OsuColour.cs                |  1 +
 .../Judgements/DefaultJudgementPiece.cs       | 16 +++---
 .../Rulesets/Judgements/DrawableJudgement.cs  |  9 ++--
 osu.Game/Rulesets/Scoring/HitResult.cs        |  2 +
 osu.Game/Skinning/LegacyJudgementPieceNew.cs  |  2 +-
 osu.Game/Skinning/LegacyJudgementPieceOld.cs  | 52 +++++++++----------
 osu.Game/Skinning/LegacySkin.cs               |  6 +--
 13 files changed, 62 insertions(+), 72 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 0c8e5b765f..c6d4f7c4ca 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private Drawable scaleContainer;
 
-        public override bool DisplayResult => false;
-
         public DrawableSliderRepeat()
             : base(null)
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 60bad5d4a7..c4731118a1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -24,11 +24,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
 
-        /// <summary>
-        /// The judgement text is provided by the <see cref="DrawableSlider"/>.
-        /// </summary>
-        public override bool DisplayResult => false;
-
         /// <summary>
         /// Whether the hit samples only play on successful hits.
         /// If <c>false</c>, the hit samples will also play on misses.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index cb323f4ac7..d64fb0bcc6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private const float default_tick_size = 16;
 
-        public override bool DisplayResult => false;
-
         protected DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
 
         private SkinnableDrawable scaleContainer;
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
index fd86e0eeda..5b2c95b536 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.Osu.Scoring
                 case HitResult.Ok:
                 case HitResult.Meh:
                 case HitResult.Miss:
+                case HitResult.LargeTickMiss:
+                case HitResult.IgnoreMiss:
                     return true;
             }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
index 6f55d93eff..94766cb077 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
@@ -62,25 +62,23 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         /// </remarks>
         public virtual void PlayAnimation()
         {
-            switch (Result)
+            if (Result.IsHit())
             {
-                default:
-                    JudgementText
-                        .FadeInFromZero(300, Easing.OutQuint)
-                        .ScaleTo(Vector2.One)
-                        .ScaleTo(new Vector2(1.2f), 1800, Easing.OutQuint);
-                    break;
+                JudgementText
+                    .FadeInFromZero(300, Easing.OutQuint)
+                    .ScaleTo(Vector2.One)
+                    .ScaleTo(new Vector2(1.2f), 1800, Easing.OutQuint);
+            }
+            else
+            {
+                this.ScaleTo(1.6f);
+                this.ScaleTo(1, 100, Easing.In);
 
-                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.MoveTo(Vector2.Zero);
-                    this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
-
-                    this.RotateTo(0);
-                    this.RotateTo(40, 800, Easing.InQuint);
-                    break;
+                this.RotateTo(0);
+                this.RotateTo(40, 800, Easing.InQuint);
             }
 
             this.FadeOutFromOne(800);
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 15ca0a90de..3f60ce3610 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -170,7 +170,10 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            DrawableOsuJudgement explosion = poolDictionary[result.Type].Get(doj => doj.Apply(result, judgedObject));
+            if (!poolDictionary.TryGetValue(result.Type, out var pool))
+                return;
+
+            DrawableOsuJudgement explosion = pool.Get(doj => doj.Apply(result, judgedObject));
 
             judgementLayer.Add(explosion);
 
diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index a417164e27..caa2037691 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -77,6 +77,7 @@ namespace osu.Game.Graphics
             {
                 case HitResult.SmallTickMiss:
                 case HitResult.LargeTickMiss:
+                case HitResult.IgnoreMiss:
                 case HitResult.Miss:
                 case HitResult.ComboBreak:
                     return Red;
diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index d5f586dc35..3c5e37f91c 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -38,18 +38,16 @@ namespace osu.Game.Rulesets.Judgements
         /// </remarks>
         public virtual void PlayAnimation()
         {
-            switch (Result)
+            if (Result != HitResult.None && !Result.IsHit())
             {
-                case HitResult.Miss:
-                    this.ScaleTo(1.6f);
-                    this.ScaleTo(1, 100, Easing.In);
+                this.ScaleTo(1.6f);
+                this.ScaleTo(1, 100, Easing.In);
 
-                    this.MoveTo(Vector2.Zero);
-                    this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+                this.MoveTo(Vector2.Zero);
+                this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
 
-                    this.RotateTo(0);
-                    this.RotateTo(40, 800, Easing.InQuint);
-                    break;
+                this.RotateTo(0);
+                this.RotateTo(40, 800, Easing.InQuint);
             }
 
             this.FadeOutFromOne(800);
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 15434fcc04..b4686c52f3 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -133,12 +133,11 @@ namespace osu.Game.Rulesets.Judgements
                     case HitResult.None:
                         break;
 
-                    case HitResult.Miss:
-                        ApplyMissAnimations();
-                        break;
-
                     default:
-                        ApplyHitAnimations();
+                        if (Result.Type.IsHit())
+                            ApplyHitAnimations();
+                        else
+                            ApplyMissAnimations();
                         break;
                 }
 
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 9705421571..b490501021 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -86,6 +86,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Indicates a large tick miss.
         /// </summary>
         [EnumMember(Value = "large_tick_miss")]
+        [Description(@"x")]
         [Order(10)]
         LargeTickMiss,
 
@@ -117,6 +118,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Indicates a miss that should be ignored for scoring purposes.
         /// </summary>
         [EnumMember(Value = "ignore_miss")]
+        [Description("x")]
         [Order(13)]
         IgnoreMiss,
 
diff --git a/osu.Game/Skinning/LegacyJudgementPieceNew.cs b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
index 9b1ff9b22f..a93c48ba63 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceNew.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Skinning
                 });
             }
 
-            if (result != HitResult.Miss)
+            if (result.IsHit())
             {
                 //new judgement shows old as a temporary effect
                 AddInternal(temporaryOldStyle = new LegacyJudgementPieceOld(result, createMainDrawable, 1.05f, true)
diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index 082d0e4a67..5381cfc050 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -52,39 +52,35 @@ namespace osu.Game.Skinning
             if (animation?.FrameCount > 1 && !forceTransforms)
                 return;
 
-            switch (result)
+            if (result.IsHit())
             {
-                case HitResult.Miss:
-                    this.ScaleTo(1.6f);
-                    this.ScaleTo(1, 100, Easing.In);
+                this.ScaleTo(0.6f).Then()
+                    .ScaleTo(1.1f, fade_in_length * 0.8f).Then() // t = 0.8
+                    .Delay(fade_in_length * 0.2f) // t = 1.0
+                    .ScaleTo(0.9f, fade_in_length * 0.2f).Then() // t = 1.2
+                    // stable dictates scale of 0.9->1 over time 1.0 to 1.4, but we are already at 1.2.
+                    // so we need to force the current value to be correct at 1.2 (0.95) then complete the
+                    // second half of the transform.
+                    .ScaleTo(0.95f).ScaleTo(finalScale, fade_in_length * 0.2f); // t = 1.4
+            }
+            else
+            {
+                this.ScaleTo(1.6f);
+                this.ScaleTo(1, 100, Easing.In);
 
-                    decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
+                decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
 
-                    if (legacyVersion >= 2.0m)
-                    {
-                        this.MoveTo(new Vector2(0, -5));
-                        this.MoveToOffset(new Vector2(0, 80), fade_out_delay + fade_out_length, Easing.In);
-                    }
+                if (legacyVersion >= 2.0m)
+                {
+                    this.MoveTo(new Vector2(0, -5));
+                    this.MoveToOffset(new Vector2(0, 80), fade_out_delay + fade_out_length, Easing.In);
+                }
 
-                    float rotation = RNG.NextSingle(-8.6f, 8.6f);
+                float rotation = RNG.NextSingle(-8.6f, 8.6f);
 
-                    this.RotateTo(0);
-                    this.RotateTo(rotation, fade_in_length)
-                        .Then().RotateTo(rotation * 2, fade_out_delay + fade_out_length - fade_in_length, Easing.In);
-                    break;
-
-                default:
-
-                    this.ScaleTo(0.6f).Then()
-                        .ScaleTo(1.1f, fade_in_length * 0.8f).Then() // t = 0.8
-                        .Delay(fade_in_length * 0.2f) // t = 1.0
-                        .ScaleTo(0.9f, fade_in_length * 0.2f).Then() // t = 1.2
-
-                        // stable dictates scale of 0.9->1 over time 1.0 to 1.4, but we are already at 1.2.
-                        // so we need to force the current value to be correct at 1.2 (0.95) then complete the
-                        // second half of the transform.
-                        .ScaleTo(0.95f).ScaleTo(finalScale, fade_in_length * 0.2f); // t = 1.4
-                    break;
+                this.RotateTo(0);
+                this.RotateTo(rotation, fade_in_length)
+                    .Then().RotateTo(rotation * 2, fade_out_delay + fade_out_length - fade_in_length, Easing.In);
             }
         }
 
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 9102231913..7516c73b68 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -453,11 +453,11 @@ namespace osu.Game.Skinning
 
         private Drawable? getJudgementAnimation(HitResult result)
         {
+            if (!result.IsHit())
+                return this.GetAnimation("hit0", true, false);
+
             switch (result)
             {
-                case HitResult.Miss:
-                    return this.GetAnimation("hit0", true, false);
-
                 case HitResult.Meh:
                     return this.GetAnimation("hit50", true, false);
 

From d2716d855741c7461a33aa317965486a85ecd3d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 20:26:28 +0900
Subject: [PATCH 2075/2296] Improve animation for legacy skins

---
 osu.Game/Skinning/LegacyJudgementPieceOld.cs | 32 +++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index 5381cfc050..6ad188bb47 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -65,22 +65,32 @@ namespace osu.Game.Skinning
             }
             else
             {
-                this.ScaleTo(1.6f);
-                this.ScaleTo(1, 100, Easing.In);
+                bool isTick = result != HitResult.Miss;
 
-                decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
-
-                if (legacyVersion >= 2.0m)
+                if (isTick)
                 {
-                    this.MoveTo(new Vector2(0, -5));
-                    this.MoveToOffset(new Vector2(0, 80), fade_out_delay + fade_out_length, Easing.In);
+                    this.ScaleTo(0.6f);
+                    this.ScaleTo(0.3f, 100, Easing.In);
                 }
+                else
+                {
+                    this.ScaleTo(1.6f);
+                    this.ScaleTo(1, 100, Easing.In);
 
-                float rotation = RNG.NextSingle(-8.6f, 8.6f);
+                    decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
 
-                this.RotateTo(0);
-                this.RotateTo(rotation, fade_in_length)
-                    .Then().RotateTo(rotation * 2, fade_out_delay + fade_out_length - fade_in_length, Easing.In);
+                    if (legacyVersion >= 2.0m)
+                    {
+                        this.MoveTo(new Vector2(0, -5));
+                        this.MoveToOffset(new Vector2(0, 80), fade_out_delay + fade_out_length, Easing.In);
+                    }
+
+                    float rotation = RNG.NextSingle(-8.6f, 8.6f);
+
+                    this.RotateTo(0);
+                    this.RotateTo(rotation, fade_in_length)
+                        .Then().RotateTo(rotation * 2, fade_out_delay + fade_out_length - fade_in_length, Easing.In);
+                }
             }
         }
 

From d1ba2a4a64f7e5c51c5309d5366b9778b98fbdf4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Dec 2023 20:45:18 +0900
Subject: [PATCH 2076/2296] Use orange for non-combo-breaking miss

---
 osu.Game/Graphics/OsuColour.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index caa2037691..0d11d2d4ef 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -75,10 +75,12 @@ namespace osu.Game.Graphics
         {
             switch (result)
             {
-                case HitResult.SmallTickMiss:
-                case HitResult.LargeTickMiss:
                 case HitResult.IgnoreMiss:
+                case HitResult.SmallTickMiss:
+                    return Orange1;
+
                 case HitResult.Miss:
+                case HitResult.LargeTickMiss:
                 case HitResult.ComboBreak:
                     return Red;
 

From bff08d124ba7d925566a1a2445036d3ace99c071 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 20 Dec 2023 22:28:46 +0900
Subject: [PATCH 2077/2296] Remove mania mod multiplier for DT/NC

---
 osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs | 5 +++++
 osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs
index a841a8ab37..bea1a14110 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModDoubleTime.cs
@@ -10,5 +10,10 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModDoubleTime : ModDoubleTime, IManiaRateAdjustmentMod
     {
         public HitWindows HitWindows { get; set; } = new ManiaHitWindows();
+
+        // For now, all rate-increasing mods should be given a 1x multiplier in mania because it doesn't always
+        // make the map harder and is more of a personal preference.
+        // In the future, we can consider adjusting this by experimenting with not applying the hitwindow leniency.
+        public override double ScoreMultiplier => 1;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs
index f64f7ae31a..7e5e80db6c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModNightcore.cs
@@ -11,5 +11,10 @@ namespace osu.Game.Rulesets.Mania.Mods
     public class ManiaModNightcore : ModNightcore<ManiaHitObject>, IManiaRateAdjustmentMod
     {
         public HitWindows HitWindows { get; set; } = new ManiaHitWindows();
+
+        // For now, all rate-increasing mods should be given a 1x multiplier in mania because it doesn't always
+        // make the map any harder and is more of a personal preference.
+        // In the future, we can consider adjusting this by experimenting with not applying the hitwindow leniency.
+        public override double ScoreMultiplier => 1;
     }
 }

From b0da24176e5e2026173f25abb8a9e094f7d118ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Dec 2023 15:44:02 +0100
Subject: [PATCH 2078/2296] Remove outdated inline comments

---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index d752c443cc..5f299f419d 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -200,11 +200,9 @@ namespace osu.Game.Rulesets.Mania.Tests
             });
 
             assertHeadJudgement(HitResult.Perfect);
-            // judgement combo offset by perfect bonus judgement. see logic in DrawableNote.CheckForResult.
             assertComboAtJudgement(0, 1);
             assertTailJudgement(HitResult.Meh);
             assertComboAtJudgement(1, 0);
-            // judgement combo offset by perfect bonus judgement. see logic in DrawableNote.CheckForResult.
             assertComboAtJudgement(3, 1);
         }
 

From 9515f7dbfa778a22eef7414e2ec68ff732befa7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Dec 2023 15:58:26 +0100
Subject: [PATCH 2079/2296] Bump score version in order to recompute legacy
 scores

---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 5c51e68d9f..fa930d77d3 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -33,9 +33,10 @@ namespace osu.Game.Scoring.Legacy
         /// <item><description>30000004: Fixed mod multipliers during legacy score conversion. Reconvert all scores.</description></item>
         /// <item><description>30000005: Introduce combo exponent in the osu! gamemode. Reconvert all scores.</description></item>
         /// <item><description>30000006: Fix edge cases in conversion after combo exponent introduction that lead to NaNs. Reconvert all scores.</description></item>
+        /// <item><description>30000007: Adjust osu!mania combo and accuracy portions and judgement scoring values. Reconvert all scores.</description></item>
         /// </list>
         /// </remarks>
-        public const int LATEST_VERSION = 30000006;
+        public const int LATEST_VERSION = 30000007;
 
         /// <summary>
         /// The first stable-compatible YYYYMMDD format version given to lazer usage of replays.

From fcf47267fd3a38e53794ca8dadd0d6222c327b64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Dec 2023 00:48:46 +0900
Subject: [PATCH 2080/2296] Revert change to `OsuHitWindows` and move logic
 local to pooling initialisation

---
 osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs |  2 --
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs       | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
index 5b2c95b536..fd86e0eeda 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Rulesets.Osu.Scoring
                 case HitResult.Ok:
                 case HitResult.Meh:
                 case HitResult.Miss:
-                case HitResult.LargeTickMiss:
-                case HitResult.IgnoreMiss:
                     return true;
             }
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 3f60ce3610..c94057cf6d 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -20,7 +20,6 @@ using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
-using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
@@ -66,8 +65,21 @@ namespace osu.Game.Rulesets.Osu.UI
 
             HitPolicy = new StartTimeOrderedHitPolicy();
 
-            var hitWindows = new OsuHitWindows();
-            foreach (var result in Enum.GetValues<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
+            foreach (var result in Enum.GetValues<HitResult>().Where(r =>
+                     {
+                         switch (r)
+                         {
+                             case HitResult.Great:
+                             case HitResult.Ok:
+                             case HitResult.Meh:
+                             case HitResult.Miss:
+                             case HitResult.LargeTickMiss:
+                             case HitResult.IgnoreMiss:
+                                 return true;
+                         }
+
+                         return false;
+                     }))
                 poolDictionary.Add(result, new DrawableJudgementPool(result, onJudgementLoaded));
 
             AddRangeInternal(poolDictionary.Values);

From eb8fb8092d2effd3c4251f8247f0dcc5d8f52a93 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Dec 2023 00:58:43 +0900
Subject: [PATCH 2081/2296] Attempt to standardise miss handling logic

---
 .../Skinning/Argon/ArgonJudgementPiece.cs     | 16 ++++++-------
 osu.Game/Rulesets/Scoring/HitResult.cs        | 19 +++++++++++++++
 osu.Game/Skinning/LegacyJudgementPieceNew.cs  |  2 +-
 osu.Game/Skinning/LegacyJudgementPieceOld.cs  | 24 +++++++++----------
 osu.Game/Skinning/LegacySkin.cs               |  2 +-
 5 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
index 94766cb077..edeece0293 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
@@ -62,14 +62,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         /// </remarks>
         public virtual void PlayAnimation()
         {
-            if (Result.IsHit())
-            {
-                JudgementText
-                    .FadeInFromZero(300, Easing.OutQuint)
-                    .ScaleTo(Vector2.One)
-                    .ScaleTo(new Vector2(1.2f), 1800, Easing.OutQuint);
-            }
-            else
+            if (Result.IsMiss())
             {
                 this.ScaleTo(1.6f);
                 this.ScaleTo(1, 100, Easing.In);
@@ -80,6 +73,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 this.RotateTo(0);
                 this.RotateTo(40, 800, Easing.InQuint);
             }
+            else
+            {
+                JudgementText
+                    .FadeInFromZero(300, Easing.OutQuint)
+                    .ScaleTo(Vector2.One)
+                    .ScaleTo(new Vector2(1.2f), 1800, Easing.OutQuint);
+            }
 
             this.FadeOutFromOne(800);
 
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index b490501021..bdb2a9db23 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -269,6 +269,25 @@ namespace osu.Game.Rulesets.Scoring
             }
         }
 
+        /// <summary>
+        /// Whether a <see cref="HitResult"/> represents a miss of any type.
+        /// </summary>
+        public static bool IsMiss(this HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.IgnoreMiss:
+                case HitResult.Miss:
+                case HitResult.SmallTickMiss:
+                case HitResult.LargeTickMiss:
+                case HitResult.ComboBreak:
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
         /// <summary>
         /// Whether a <see cref="HitResult"/> represents a successful hit.
         /// </summary>
diff --git a/osu.Game/Skinning/LegacyJudgementPieceNew.cs b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
index a93c48ba63..5ff28726c0 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceNew.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Skinning
                 });
             }
 
-            if (result.IsHit())
+            if (!result.IsMiss())
             {
                 //new judgement shows old as a temporary effect
                 AddInternal(temporaryOldStyle = new LegacyJudgementPieceOld(result, createMainDrawable, 1.05f, true)
diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index 6ad188bb47..39697090d1 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -52,18 +52,7 @@ namespace osu.Game.Skinning
             if (animation?.FrameCount > 1 && !forceTransforms)
                 return;
 
-            if (result.IsHit())
-            {
-                this.ScaleTo(0.6f).Then()
-                    .ScaleTo(1.1f, fade_in_length * 0.8f).Then() // t = 0.8
-                    .Delay(fade_in_length * 0.2f) // t = 1.0
-                    .ScaleTo(0.9f, fade_in_length * 0.2f).Then() // t = 1.2
-                    // stable dictates scale of 0.9->1 over time 1.0 to 1.4, but we are already at 1.2.
-                    // so we need to force the current value to be correct at 1.2 (0.95) then complete the
-                    // second half of the transform.
-                    .ScaleTo(0.95f).ScaleTo(finalScale, fade_in_length * 0.2f); // t = 1.4
-            }
-            else
+            if (result.IsMiss())
             {
                 bool isTick = result != HitResult.Miss;
 
@@ -92,6 +81,17 @@ namespace osu.Game.Skinning
                         .Then().RotateTo(rotation * 2, fade_out_delay + fade_out_length - fade_in_length, Easing.In);
                 }
             }
+            else
+            {
+                this.ScaleTo(0.6f).Then()
+                    .ScaleTo(1.1f, fade_in_length * 0.8f).Then() // t = 0.8
+                    .Delay(fade_in_length * 0.2f) // t = 1.0
+                    .ScaleTo(0.9f, fade_in_length * 0.2f).Then() // t = 1.2
+                    // stable dictates scale of 0.9->1 over time 1.0 to 1.4, but we are already at 1.2.
+                    // so we need to force the current value to be correct at 1.2 (0.95) then complete the
+                    // second half of the transform.
+                    .ScaleTo(0.95f).ScaleTo(finalScale, fade_in_length * 0.2f); // t = 1.4
+            }
         }
 
         public Drawable GetAboveHitObjectsProxiedContent() => CreateProxy();
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 7516c73b68..a37a386889 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -453,7 +453,7 @@ namespace osu.Game.Skinning
 
         private Drawable? getJudgementAnimation(HitResult result)
         {
-            if (!result.IsHit())
+            if (result.IsMiss())
                 return this.GetAnimation("hit0", true, false);
 
             switch (result)

From ebbc8333e84509d39c5ed4afada29f07cd8d2d04 Mon Sep 17 00:00:00 2001
From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com>
Date: Tue, 19 Dec 2023 23:36:57 -0800
Subject: [PATCH 2082/2296] Prevent `ExportReplay` being spammed on fail by
 being held down

This was already handled in ReplayDownloadButton (https://github.com/ppy/osu/blob/98efff0bd61ea6cc5d6a884aeda1614d81592b9d/osu.Game/Screens/Ranking/ReplayDownloadButton.cs#L114-L115) but seemingly missed for SaveFailedScoreButton
---
 osu.Game/Screens/Play/SaveFailedScoreButton.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Play/SaveFailedScoreButton.cs b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
index 0a2696339c..b97c140250 100644
--- a/osu.Game/Screens/Play/SaveFailedScoreButton.cs
+++ b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
@@ -102,6 +102,9 @@ namespace osu.Game.Screens.Play
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
+            if (e.Repeat)
+                return false;
+
             switch (e.Action)
             {
                 case GlobalAction.SaveReplay:

From c5fb4d0f5c85714d207916d8035565c7a15a39c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Dec 2023 01:52:40 +0900
Subject: [PATCH 2083/2296] Mark flaky test temporarily

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 518035fb82..218bf495e3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -420,6 +420,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
+        [FlakyTest] // temporary while peppy investigates
         public void TestSelectionRetainedOnBeatmapUpdate()
         {
             createSongSelect();

From a763ad84730112774e89960d1c3afc115c3e1851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Dec 2023 19:07:18 +0100
Subject: [PATCH 2084/2296] Add remarks to `Is{Hit,Miss}()` to explain their
 simultaneous existence

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

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index bdb2a9db23..e174ebd00f 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -272,6 +272,9 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// Whether a <see cref="HitResult"/> represents a miss of any type.
         /// </summary>
+        /// <remarks>
+        /// Of note, both <see cref="IsMiss"/> and <see cref="IsHit"/> return <see langword="false"/> for <see cref="HitResult.None"/>.
+        /// </remarks>
         public static bool IsMiss(this HitResult result)
         {
             switch (result)
@@ -291,6 +294,9 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// Whether a <see cref="HitResult"/> represents a successful hit.
         /// </summary>
+        /// <remarks>
+        /// Of note, both <see cref="IsMiss"/> and <see cref="IsHit"/> return <see langword="false"/> for <see cref="HitResult.None"/>.
+        /// </remarks>
         public static bool IsHit(this HitResult result)
         {
             switch (result)

From 975bacaeb750daef25afa0c7c117e23baeb42586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Dec 2023 19:07:26 +0100
Subject: [PATCH 2085/2296] Add back blank line to fix code quality inspection

---
 osu.Game/Skinning/LegacyJudgementPieceOld.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index 39697090d1..ca2c8ce6bc 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -87,6 +87,7 @@ namespace osu.Game.Skinning
                     .ScaleTo(1.1f, fade_in_length * 0.8f).Then() // t = 0.8
                     .Delay(fade_in_length * 0.2f) // t = 1.0
                     .ScaleTo(0.9f, fade_in_length * 0.2f).Then() // t = 1.2
+
                     // stable dictates scale of 0.9->1 over time 1.0 to 1.4, but we are already at 1.2.
                     // so we need to force the current value to be correct at 1.2 (0.95) then complete the
                     // second half of the transform.

From b6a331b2f7c64100874d2eebe0ecff069a7b9693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Dec 2023 20:52:26 +0100
Subject: [PATCH 2086/2296] Fix argon pro not showing slider tick judgements

Addresses https://github.com/ppy/osu/discussions/25968.
---
 osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index f98a47097d..0f9c97059c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             {
                 case GameplaySkinComponentLookup<HitResult> resultComponent:
                     // This should eventually be moved to a skin setting, when supported.
-                    if (Skin is ArgonProSkin && resultComponent.Component >= HitResult.Great)
+                    if (Skin is ArgonProSkin && (resultComponent.Component == HitResult.Great || resultComponent.Component == HitResult.Perfect))
                         return Drawable.Empty();
 
                     return new ArgonJudgementPiece(resultComponent.Component);

From 88e36eb08c353e8a65108995ad32718831eded66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Dec 2023 21:46:18 +0100
Subject: [PATCH 2087/2296] Fix autopilot mod still declaring incompatibility
 with fail-preventing mods

Closes https://github.com/ppy/osu/issues/25974.
---
 osu.Game.Rulesets.Osu/Mods/OsuModAccuracyChallenge.cs | 3 ---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs         | 2 --
 osu.Game.Rulesets.Osu/Mods/OsuModNoFail.cs            | 3 ---
 osu.Game.Rulesets.Osu/Mods/OsuModPerfect.cs           | 3 ---
 osu.Game.Rulesets.Osu/Mods/OsuModSuddenDeath.cs       | 1 -
 5 files changed, 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAccuracyChallenge.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAccuracyChallenge.cs
index 5b79753632..e6daa3846f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAccuracyChallenge.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAccuracyChallenge.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.
 
-using System;
-using System.Linq;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModAccuracyChallenge : ModAccuracyChallenge
     {
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModAutopilot)).ToArray();
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index bf74b741d5..efcc728d55 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             typeof(OsuModSpunOut),
             typeof(ModRelax),
-            typeof(ModFailCondition),
-            typeof(ModNoFail),
             typeof(ModAutoplay),
             typeof(OsuModMagnetised),
             typeof(OsuModRepel),
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModNoFail.cs b/osu.Game.Rulesets.Osu/Mods/OsuModNoFail.cs
index 9f707a5aa6..53c67cd1c3 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModNoFail.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModNoFail.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.
 
-using System;
-using System.Linq;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModNoFail : ModNoFail
     {
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModAutopilot)).ToArray();
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModPerfect.cs b/osu.Game.Rulesets.Osu/Mods/OsuModPerfect.cs
index 33581405a6..da462eb6e8 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModPerfect.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModPerfect.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.
 
-using System;
-using System.Linq;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModPerfect : ModPerfect
     {
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModSuddenDeath.cs b/osu.Game.Rulesets.Osu/Mods/OsuModSuddenDeath.cs
index b4edb1581e..e661610fe7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModSuddenDeath.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModSuddenDeath.cs
@@ -11,7 +11,6 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[]
         {
-            typeof(OsuModAutopilot),
             typeof(OsuModTargetPractice),
         }).ToArray();
     }

From 4e3b9941423591977dfe969d637661308dc7d9f6 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 20 Dec 2023 20:23:43 +0900
Subject: [PATCH 2088/2296] Relocate HitResult numeric score to ScoreProcessor

---
 .../Difficulty/CatchLegacyScoreSimulator.cs   |   6 +-
 .../Scoring/CatchScoreProcessor.cs            |   2 +-
 .../Scoring/ManiaScoreProcessor.cs            |  31 ++---
 .../TestSceneSpinnerRotation.cs               |  11 +-
 .../Difficulty/OsuLegacyScoreSimulator.cs     |   6 +-
 .../Objects/Drawables/DrawableSpinner.cs      |   3 +-
 .../Difficulty/TaikoLegacyScoreSimulator.cs   |   6 +-
 .../Scoring/TaikoScoreProcessor.cs            |  19 +++-
 .../Gameplay/TestSceneScoreProcessor.cs       |   2 +-
 .../StandardisedScoreMigrationTools.cs        |  46 +++++++-
 osu.Game/Rulesets/Judgements/Judgement.cs     |  59 +---------
 .../Rulesets/Judgements/JudgementResult.cs    |   2 +-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 107 +++++++++++++++---
 osu.Game/Scoring/ScoreImporter.cs             |   4 +-
 14 files changed, 182 insertions(+), 122 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index 7a84d9245d..52605ec0cc 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Mods;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Catch.Scoring;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 {
     internal class CatchLegacyScoreSimulator : ILegacyScoreSimulator
     {
+        private readonly ScoreProcessor scoreProcessor = new CatchScoreProcessor();
+
         private int legacyBonusScore;
         private int standardisedBonusScore;
         private int combo;
@@ -134,7 +136,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                standardisedBonusScore += Judgement.ToNumericResult(bonusResult);
+                standardisedBonusScore += scoreProcessor.GetRawBonusScore(bonusResult);
             }
             else
                 attributes.AccuracyScore += scoreIncrease;
diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index 503252df02..023369badc 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Scoring
         }
 
         protected override double GetComboScoreChange(JudgementResult result)
-            => GetNumericResultFor(result) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
+            => GetRawComboScore(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
 
         public override ScoreRank RankFromAccuracy(double accuracy)
         {
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index d5191c880a..d059d99d9f 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -31,45 +31,30 @@ namespace osu.Game.Rulesets.Mania.Scoring
                    + bonusPortion;
         }
 
-        protected override double GetNumericResultFor(JudgementResult result)
+        public override int GetRawAccuracyScore(HitResult result)
         {
-            switch (result.Type)
+            switch (result)
             {
                 case HitResult.Perfect:
                     return 305;
             }
 
-            return base.GetNumericResultFor(result);
+            return base.GetRawAccuracyScore(result);
         }
 
-        protected override double GetMaxNumericResultFor(JudgementResult result)
+        public override int GetRawComboScore(HitResult result)
         {
-            switch (result.Judgement.MaxResult)
+            switch (result)
             {
                 case HitResult.Perfect:
-                    return 305;
+                    return 300;
             }
 
-            return base.GetMaxNumericResultFor(result);
+            return base.GetRawComboScore(result);
         }
 
         protected override double GetComboScoreChange(JudgementResult result)
-        {
-            double numericResult;
-
-            switch (result.Type)
-            {
-                case HitResult.Perfect:
-                    numericResult = 300;
-                    break;
-
-                default:
-                    numericResult = GetNumericResultFor(result);
-                    break;
-            }
-
-            return numericResult * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
-        }
+            => GetRawComboScore(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
 
         private class JudgementOrderComparer : IComparer<HitObject>
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 8711aa9c09..fd445bc1ac 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -58,10 +58,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             double trackerRotationTolerance = 0;
 
             addSeekStep(5000);
-            AddStep("calculate rotation tolerance", () =>
-            {
-                trackerRotationTolerance = Math.Abs(drawableSpinner.RotationTracker.Rotation * 0.1f);
-            });
+            AddStep("calculate rotation tolerance", () => { trackerRotationTolerance = Math.Abs(drawableSpinner.RotationTracker.Rotation * 0.1f); });
             AddAssert("is disc rotation not almost 0", () => drawableSpinner.RotationTracker.Rotation, () => Is.Not.EqualTo(0).Within(100));
             AddAssert("is disc rotation absolute not almost 0", () => drawableSpinner.Result.TotalRotation, () => Is.Not.EqualTo(0).Within(100));
 
@@ -133,9 +130,11 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddAssert("player score matching expected bonus score", () =>
             {
+                var scoreProcessor = ((ScoreExposedPlayer)Player).ScoreProcessor;
+
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
-                long totalScore = ((ScoreExposedPlayer)Player).ScoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.Result.TotalRotation / 360) * new SpinnerTick().CreateJudgement().MaxNumericResult;
+                long totalScore = scoreProcessor.TotalScore.Value * 2;
+                return totalScore == (int)(drawableSpinner.Result.TotalRotation / 360) * scoreProcessor.GetRawBonusScore(new SpinnerTick().CreateJudgement().MaxResult);
             });
 
             addSeekStep(0);
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 28967cbf7e..6ac7c33275 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -5,12 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Scoring.Legacy;
 
@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 {
     internal class OsuLegacyScoreSimulator : ILegacyScoreSimulator
     {
+        private readonly ScoreProcessor scoreProcessor = new OsuScoreProcessor();
+
         private int legacyBonusScore;
         private int standardisedBonusScore;
         private int combo;
@@ -171,7 +173,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                standardisedBonusScore += Judgement.ToNumericResult(bonusResult);
+                standardisedBonusScore += scoreProcessor.GetRawBonusScore(bonusResult);
             }
             else
                 attributes.AccuracyScore += scoreIncrease;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index c0c135d145..787d5e5937 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
@@ -312,7 +313,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             updateBonusScore();
         }
 
-        private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
+        private static readonly int score_per_tick = new OsuScoreProcessor().GetRawBonusScore(new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxResult);
 
         private void updateBonusScore()
         {
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index a8ed056c89..8b34c8c808 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -13,11 +12,14 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Scoring;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
 {
     internal class TaikoLegacyScoreSimulator : ILegacyScoreSimulator
     {
+        private readonly ScoreProcessor scoreProcessor = new TaikoScoreProcessor();
+
         private int legacyBonusScore;
         private int standardisedBonusScore;
         private int combo;
@@ -191,7 +193,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                standardisedBonusScore += Judgement.ToNumericResult(bonusResult);
+                standardisedBonusScore += scoreProcessor.GetRawBonusScore(bonusResult);
             }
             else
                 attributes.AccuracyScore += scoreIncrease;
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index bc1e42c5d1..e81ba324bd 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -28,20 +28,31 @@ namespace osu.Game.Rulesets.Taiko.Scoring
 
         protected override double GetComboScoreChange(JudgementResult result)
         {
-            return GetNumericResultFor(result)
+            return GetRawComboScore(result.Type)
                    * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base))
                    * strongScaleValue(result);
         }
 
-        protected override double GetNumericResultFor(JudgementResult result)
+        public override int GetRawAccuracyScore(HitResult result)
         {
-            switch (result.Type)
+            switch (result)
             {
                 case HitResult.Ok:
                     return 150;
             }
 
-            return base.GetNumericResultFor(result);
+            return base.GetRawAccuracyScore(result);
+        }
+
+        public override int GetRawComboScore(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.Ok:
+                    return 150;
+            }
+
+            return base.GetRawComboScore(result);
         }
 
         private double strongScaleValue(JudgementResult result)
diff --git a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
index 1cf72cf937..5d2ad8b363 100644
--- a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Gameplay
             // Apply a judgement
             scoreProcessor.ApplyResult(new JudgementResult(new HitObject(), new TestJudgement(HitResult.LargeBonus)) { Type = HitResult.LargeBonus });
 
-            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(Judgement.LARGE_BONUS_SCORE));
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(scoreProcessor.GetRawBonusScore(HitResult.LargeBonus)));
         }
 
         [Test]
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 2e5ca390d7..5324d2569e 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -57,14 +57,14 @@ namespace osu.Game.Database
             // We are constructing a "best possible" score from the statistics provided because it's the best we can do.
             List<HitResult> sortedHits = score.Statistics
                                               .Where(kvp => kvp.Key.AffectsCombo())
-                                              .OrderByDescending(kvp => Judgement.ToNumericResult(kvp.Key))
+                                              .OrderByDescending(kvp => processor.GetRawComboScore(kvp.Key))
                                               .SelectMany(kvp => Enumerable.Repeat(kvp.Key, kvp.Value))
                                               .ToList();
 
             // Attempt to use maximum statistics from the database.
             var maximumJudgements = score.MaximumStatistics
                                          .Where(kvp => kvp.Key.AffectsCombo())
-                                         .OrderByDescending(kvp => Judgement.ToNumericResult(kvp.Key))
+                                         .OrderByDescending(kvp => processor.GetRawComboScore(kvp.Key))
                                          .SelectMany(kvp => Enumerable.Repeat(new FakeJudgement(kvp.Key), kvp.Value))
                                          .ToList();
 
@@ -169,10 +169,10 @@ namespace osu.Game.Database
         public static long GetOldStandardised(ScoreInfo score)
         {
             double accuracyScore =
-                (double)score.Statistics.Where(kvp => kvp.Key.AffectsAccuracy()).Sum(kvp => Judgement.ToNumericResult(kvp.Key) * kvp.Value)
-                / score.MaximumStatistics.Where(kvp => kvp.Key.AffectsAccuracy()).Sum(kvp => Judgement.ToNumericResult(kvp.Key) * kvp.Value);
+                (double)score.Statistics.Where(kvp => kvp.Key.AffectsAccuracy()).Sum(kvp => numericScoreFor(kvp.Key) * kvp.Value)
+                / score.MaximumStatistics.Where(kvp => kvp.Key.AffectsAccuracy()).Sum(kvp => numericScoreFor(kvp.Key) * kvp.Value);
             double comboScore = (double)score.MaxCombo / score.MaximumStatistics.Where(kvp => kvp.Key.AffectsCombo()).Sum(kvp => kvp.Value);
-            double bonusScore = score.Statistics.Where(kvp => kvp.Key.IsBonus()).Sum(kvp => Judgement.ToNumericResult(kvp.Key) * kvp.Value);
+            double bonusScore = score.Statistics.Where(kvp => kvp.Key.IsBonus()).Sum(kvp => numericScoreFor(kvp.Key) * kvp.Value);
 
             double accuracyPortion = 0.3;
 
@@ -193,6 +193,42 @@ namespace osu.Game.Database
                 modMultiplier *= mod.ScoreMultiplier;
 
             return (long)Math.Round((1000000 * (accuracyPortion * accuracyScore + (1 - accuracyPortion) * comboScore) + bonusScore) * modMultiplier);
+
+            static int numericScoreFor(HitResult result)
+            {
+                switch (result)
+                {
+                    default:
+                        return 0;
+
+                    case HitResult.SmallTickHit:
+                        return 10;
+
+                    case HitResult.LargeTickHit:
+                        return 30;
+
+                    case HitResult.Meh:
+                        return 50;
+
+                    case HitResult.Ok:
+                        return 100;
+
+                    case HitResult.Good:
+                        return 200;
+
+                    case HitResult.Great:
+                        return 300;
+
+                    case HitResult.Perfect:
+                        return 315;
+
+                    case HitResult.SmallBonus:
+                        return 10;
+
+                    case HitResult.LargeBonus:
+                        return 50;
+                }
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index cd1e81046d..27402d522c 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -11,16 +11,6 @@ namespace osu.Game.Rulesets.Judgements
     /// </summary>
     public class Judgement
     {
-        /// <summary>
-        /// The score awarded for a small bonus.
-        /// </summary>
-        public const int SMALL_BONUS_SCORE = 10;
-
-        /// <summary>
-        /// The score awarded for a large bonus.
-        /// </summary>
-        public const int LARGE_BONUS_SCORE = 50;
-
         /// <summary>
         /// The default health increase for a maximum judgement, as a proportion of total health.
         /// By default, each maximum judgement restores 5% of total health.
@@ -91,23 +81,11 @@ namespace osu.Game.Rulesets.Judgements
             }
         }
 
-        /// <summary>
-        /// The numeric score representation for the maximum achievable result.
-        /// </summary>
-        public int MaxNumericResult => ToNumericResult(MaxResult);
-
         /// <summary>
         /// The health increase for the maximum achievable result.
         /// </summary>
         public double MaxHealthIncrease => HealthIncreaseFor(MaxResult);
 
-        /// <summary>
-        /// Retrieves the numeric score representation of a <see cref="JudgementResult"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="JudgementResult"/> to find the numeric score representation for.</param>
-        /// <returns>The numeric score representation of <paramref name="result"/>.</returns>
-        public int NumericResultFor(JudgementResult result) => ToNumericResult(result.Type);
-
         /// <summary>
         /// Retrieves the numeric health increase of a <see cref="HitResult"/>.
         /// </summary>
@@ -165,41 +143,6 @@ namespace osu.Game.Rulesets.Judgements
         /// <returns>The numeric health increase of <paramref name="result"/>.</returns>
         public double HealthIncreaseFor(JudgementResult result) => HealthIncreaseFor(result.Type);
 
-        public override string ToString() => $"MaxResult:{MaxResult} MaxScore:{MaxNumericResult}";
-
-        public static int ToNumericResult(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.SmallTickHit:
-                    return 10;
-
-                case HitResult.LargeTickHit:
-                    return 30;
-
-                case HitResult.Meh:
-                    return 50;
-
-                case HitResult.Ok:
-                    return 100;
-
-                case HitResult.Good:
-                    return 200;
-
-                case HitResult.Great:
-                // Perfect doesn't actually give more score / accuracy directly.
-                case HitResult.Perfect:
-                    return 300;
-
-                case HitResult.SmallBonus:
-                    return SMALL_BONUS_SCORE;
-
-                case HitResult.LargeBonus:
-                    return LARGE_BONUS_SCORE;
-            }
-        }
+        public override string ToString() => $"MaxResult:{MaxResult}";
     }
 }
diff --git a/osu.Game/Rulesets/Judgements/JudgementResult.cs b/osu.Game/Rulesets/Judgements/JudgementResult.cs
index db621b4851..1b915d52b7 100644
--- a/osu.Game/Rulesets/Judgements/JudgementResult.cs
+++ b/osu.Game/Rulesets/Judgements/JudgementResult.cs
@@ -112,6 +112,6 @@ namespace osu.Game.Rulesets.Judgements
             RawTime = null;
         }
 
-        public override string ToString() => $"{Type} (Score:{Judgement.NumericResultFor(this)} HP:{Judgement.HealthIncreaseFor(this)} {Judgement})";
+        public override string ToString() => $"{Type} ({Judgement})";
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index aa8905c0b6..a80a118363 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -227,12 +227,12 @@ namespace osu.Game.Rulesets.Scoring
 
             if (result.Judgement.MaxResult.AffectsAccuracy())
             {
-                currentMaximumBaseScore += GetMaxNumericResultFor(result);
+                currentMaximumBaseScore += GetRawAccuracyScore(result.Judgement.MaxResult);
                 currentAccuracyJudgementCount++;
             }
 
             if (result.Type.AffectsAccuracy())
-                currentBaseScore += GetNumericResultFor(result);
+                currentBaseScore += GetRawAccuracyScore(result.Type);
 
             if (result.Type.IsBonus())
                 currentBonusPortion += GetBonusScoreChange(result);
@@ -276,12 +276,12 @@ namespace osu.Game.Rulesets.Scoring
 
             if (result.Judgement.MaxResult.AffectsAccuracy())
             {
-                currentMaximumBaseScore -= GetMaxNumericResultFor(result);
+                currentMaximumBaseScore -= GetRawAccuracyScore(result.Judgement.MaxResult);
                 currentAccuracyJudgementCount--;
             }
 
             if (result.Type.AffectsAccuracy())
-                currentBaseScore -= GetNumericResultFor(result);
+                currentBaseScore -= GetRawAccuracyScore(result.Type);
 
             if (result.Type.IsBonus())
                 currentBonusPortion -= GetBonusScoreChange(result);
@@ -297,21 +297,100 @@ namespace osu.Game.Rulesets.Scoring
             updateScore();
         }
 
-        protected virtual double GetBonusScoreChange(JudgementResult result) => GetNumericResultFor(result);
-
-        protected virtual double GetComboScoreChange(JudgementResult result) => GetMaxNumericResultFor(result) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT);
+        /// <summary>
+        /// Gets the final score change to be applied to the bonus portion of the score.
+        /// </summary>
+        /// <param name="result">The judgement result.</param>
+        protected virtual double GetBonusScoreChange(JudgementResult result) => GetRawBonusScore(result.Type);
 
         /// <summary>
-        /// Retrieves the numeric score representation for a <see cref="JudgementResult"/>.
+        /// Gets the final score change to be applied to the combo portion of the score.
         /// </summary>
-        /// <param name="result">The <see cref="JudgementResult"/>.</param>
-        protected virtual double GetNumericResultFor(JudgementResult result) => result.Judgement.NumericResultFor(result);
+        /// <param name="result">The judgement result.</param>
+        protected virtual double GetComboScoreChange(JudgementResult result) => GetRawComboScore(result.Judgement.MaxResult) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT);
 
         /// <summary>
-        /// Retrieves the maximum numeric score representation for a <see cref="JudgementResult"/>.
+        /// Retrieves the raw score value for a hit result, in order to be applied to the combo portion.
         /// </summary>
-        /// <param name="result">The <see cref="JudgementResult"/>.</param>
-        protected virtual double GetMaxNumericResultFor(JudgementResult result) => result.Judgement.MaxNumericResult;
+        /// <param name="result">The hit result.</param>
+        public virtual int GetRawComboScore(HitResult result)
+        {
+            switch (result)
+            {
+                default:
+                    return 0;
+
+                case HitResult.SmallTickHit:
+                    return 10;
+
+                case HitResult.LargeTickHit:
+                    return 30;
+
+                case HitResult.Meh:
+                    return 50;
+
+                case HitResult.Ok:
+                    return 100;
+
+                case HitResult.Good:
+                    return 200;
+
+                case HitResult.Great:
+                case HitResult.Perfect: // Perfect doesn't actually give more score / accuracy directly.
+                    return 300;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the raw score value for a hit result, in order to be applied to the accuracy portion.
+        /// </summary>
+        /// <param name="result">The hit result.</param>
+        public virtual int GetRawAccuracyScore(HitResult result)
+        {
+            switch (result)
+            {
+                default:
+                    return 0;
+
+                case HitResult.SmallTickHit:
+                    return 10;
+
+                case HitResult.LargeTickHit:
+                    return 30;
+
+                case HitResult.Meh:
+                    return 50;
+
+                case HitResult.Ok:
+                    return 100;
+
+                case HitResult.Good:
+                    return 200;
+
+                case HitResult.Great:
+                case HitResult.Perfect: // Perfect doesn't actually give more score / accuracy directly.
+                    return 300;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the raw score value for a hit result, in order to be applied to the bonus portion.
+        /// </summary>
+        /// <param name="result">The hit result.</param>
+        public virtual int GetRawBonusScore(HitResult result)
+        {
+            switch (result)
+            {
+                default:
+                    return 0;
+
+                case HitResult.SmallBonus:
+                    return 10;
+
+                case HitResult.LargeBonus:
+                    return 50;
+            }
+        }
 
         protected virtual void ApplyScoreChange(JudgementResult result)
         {
@@ -540,7 +619,7 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         /// <remarks>
         /// Used to compute accuracy.
-        /// See: <see cref="HitResultExtensions.IsBasic"/> and <see cref="Judgement.ToNumericResult"/>.
+        /// See: <see cref="HitResultExtensions.IsBasic"/> and <see cref="ScoreProcessor.GetRawAccuracyScore"/>.
         /// </remarks>
         [Key(0)]
         public double BaseScore { get; set; }
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index b216c0897e..b1cba3756b 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -17,7 +17,6 @@ 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;
 
@@ -125,13 +124,14 @@ namespace osu.Game.Scoring
             var beatmap = score.BeatmapInfo!.Detach();
             var ruleset = score.Ruleset.Detach();
             var rulesetInstance = ruleset.CreateInstance();
+            var scoreProcessor = rulesetInstance.CreateScoreProcessor();
 
             Debug.Assert(rulesetInstance != null);
 
             // Populate the maximum statistics.
             HitResult maxBasicResult = rulesetInstance.GetHitResults()
                                                       .Select(h => h.result)
-                                                      .Where(h => h.IsBasic()).MaxBy(Judgement.ToNumericResult);
+                                                      .Where(h => h.IsBasic()).MaxBy(scoreProcessor.GetRawAccuracyScore);
 
             foreach ((HitResult result, int count) in score.Statistics)
             {

From 6b4b2a57fc7d9652dd4726b388656175cec1e09b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 21 Dec 2023 14:58:23 +0900
Subject: [PATCH 2089/2296] Expose only as one method

---
 .../Difficulty/CatchLegacyScoreSimulator.cs   |  2 +-
 .../Scoring/CatchScoreProcessor.cs            |  2 +-
 .../Scoring/ManiaScoreProcessor.cs            | 16 +++--
 .../TestSceneSpinnerRotation.cs               |  2 +-
 .../Difficulty/OsuLegacyScoreSimulator.cs     |  2 +-
 .../Objects/Drawables/DrawableSpinner.cs      |  2 +-
 .../Difficulty/TaikoLegacyScoreSimulator.cs   |  2 +-
 .../Scoring/TaikoScoreProcessor.cs            | 17 +----
 .../Gameplay/TestSceneScoreProcessor.cs       |  2 +-
 .../StandardisedScoreMigrationTools.cs        |  4 +-
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 65 +++----------------
 osu.Game/Scoring/ScoreImporter.cs             |  2 +-
 12 files changed, 30 insertions(+), 88 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
index 52605ec0cc..f65b6ef381 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                standardisedBonusScore += scoreProcessor.GetRawBonusScore(bonusResult);
+                standardisedBonusScore += scoreProcessor.GetBaseScoreForResult(bonusResult);
             }
             else
                 attributes.AccuracyScore += scoreIncrease;
diff --git a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
index 023369badc..4b3d378889 100644
--- a/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Scoring
         }
 
         protected override double GetComboScoreChange(JudgementResult result)
-            => GetRawComboScore(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
+            => GetBaseScoreForResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
 
         public override ScoreRank RankFromAccuracy(double accuracy)
         {
diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index d059d99d9f..1947d86a97 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -31,7 +31,12 @@ namespace osu.Game.Rulesets.Mania.Scoring
                    + bonusPortion;
         }
 
-        public override int GetRawAccuracyScore(HitResult result)
+        protected override double GetComboScoreChange(JudgementResult result)
+        {
+            return getBaseComboScoreForResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
+        }
+
+        public override int GetBaseScoreForResult(HitResult result)
         {
             switch (result)
             {
@@ -39,10 +44,10 @@ namespace osu.Game.Rulesets.Mania.Scoring
                     return 305;
             }
 
-            return base.GetRawAccuracyScore(result);
+            return base.GetBaseScoreForResult(result);
         }
 
-        public override int GetRawComboScore(HitResult result)
+        private int getBaseComboScoreForResult(HitResult result)
         {
             switch (result)
             {
@@ -50,12 +55,9 @@ namespace osu.Game.Rulesets.Mania.Scoring
                     return 300;
             }
 
-            return base.GetRawComboScore(result);
+            return GetBaseScoreForResult(result);
         }
 
-        protected override double GetComboScoreChange(JudgementResult result)
-            => GetRawComboScore(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
-
         private class JudgementOrderComparer : IComparer<HitObject>
         {
             public static readonly JudgementOrderComparer DEFAULT = new JudgementOrderComparer();
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index fd445bc1ac..6706d20080 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
                 // multipled by 2 to nullify the score multiplier. (autoplay mod selected)
                 long totalScore = scoreProcessor.TotalScore.Value * 2;
-                return totalScore == (int)(drawableSpinner.Result.TotalRotation / 360) * scoreProcessor.GetRawBonusScore(new SpinnerTick().CreateJudgement().MaxResult);
+                return totalScore == (int)(drawableSpinner.Result.TotalRotation / 360) * scoreProcessor.GetBaseScoreForResult(new SpinnerTick().CreateJudgement().MaxResult);
             });
 
             addSeekStep(0);
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
index 6ac7c33275..a76054b42c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                standardisedBonusScore += scoreProcessor.GetRawBonusScore(bonusResult);
+                standardisedBonusScore += scoreProcessor.GetBaseScoreForResult(bonusResult);
             }
             else
                 attributes.AccuracyScore += scoreIncrease;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 787d5e5937..f7c1437009 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -313,7 +313,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             updateBonusScore();
         }
 
-        private static readonly int score_per_tick = new OsuScoreProcessor().GetRawBonusScore(new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxResult);
+        private static readonly int score_per_tick = new OsuScoreProcessor().GetBaseScoreForResult(new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxResult);
 
         private void updateBonusScore()
         {
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
index 8b34c8c808..b20aa4f2b6 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             if (isBonus)
             {
                 legacyBonusScore += scoreIncrease;
-                standardisedBonusScore += scoreProcessor.GetRawBonusScore(bonusResult);
+                standardisedBonusScore += scoreProcessor.GetBaseScoreForResult(bonusResult);
             }
             else
                 attributes.AccuracyScore += scoreIncrease;
diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
index e81ba324bd..2fd9f070ec 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
@@ -28,12 +28,12 @@ namespace osu.Game.Rulesets.Taiko.Scoring
 
         protected override double GetComboScoreChange(JudgementResult result)
         {
-            return GetRawComboScore(result.Type)
+            return GetBaseScoreForResult(result.Type)
                    * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base))
                    * strongScaleValue(result);
         }
 
-        public override int GetRawAccuracyScore(HitResult result)
+        public override int GetBaseScoreForResult(HitResult result)
         {
             switch (result)
             {
@@ -41,18 +41,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring
                     return 150;
             }
 
-            return base.GetRawAccuracyScore(result);
-        }
-
-        public override int GetRawComboScore(HitResult result)
-        {
-            switch (result)
-            {
-                case HitResult.Ok:
-                    return 150;
-            }
-
-            return base.GetRawComboScore(result);
+            return base.GetBaseScoreForResult(result);
         }
 
         private double strongScaleValue(JudgementResult result)
diff --git a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
index 5d2ad8b363..1a644ad600 100644
--- a/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneScoreProcessor.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Gameplay
             // Apply a judgement
             scoreProcessor.ApplyResult(new JudgementResult(new HitObject(), new TestJudgement(HitResult.LargeBonus)) { Type = HitResult.LargeBonus });
 
-            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(scoreProcessor.GetRawBonusScore(HitResult.LargeBonus)));
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(scoreProcessor.GetBaseScoreForResult(HitResult.LargeBonus)));
         }
 
         [Test]
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 5324d2569e..8a25a44b80 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -57,14 +57,14 @@ namespace osu.Game.Database
             // We are constructing a "best possible" score from the statistics provided because it's the best we can do.
             List<HitResult> sortedHits = score.Statistics
                                               .Where(kvp => kvp.Key.AffectsCombo())
-                                              .OrderByDescending(kvp => processor.GetRawComboScore(kvp.Key))
+                                              .OrderByDescending(kvp => processor.GetBaseScoreForResult(kvp.Key))
                                               .SelectMany(kvp => Enumerable.Repeat(kvp.Key, kvp.Value))
                                               .ToList();
 
             // Attempt to use maximum statistics from the database.
             var maximumJudgements = score.MaximumStatistics
                                          .Where(kvp => kvp.Key.AffectsCombo())
-                                         .OrderByDescending(kvp => processor.GetRawComboScore(kvp.Key))
+                                         .OrderByDescending(kvp => processor.GetBaseScoreForResult(kvp.Key))
                                          .SelectMany(kvp => Enumerable.Repeat(new FakeJudgement(kvp.Key), kvp.Value))
                                          .ToList();
 
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index a80a118363..5123668e54 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -227,12 +227,12 @@ namespace osu.Game.Rulesets.Scoring
 
             if (result.Judgement.MaxResult.AffectsAccuracy())
             {
-                currentMaximumBaseScore += GetRawAccuracyScore(result.Judgement.MaxResult);
+                currentMaximumBaseScore += GetBaseScoreForResult(result.Judgement.MaxResult);
                 currentAccuracyJudgementCount++;
             }
 
             if (result.Type.AffectsAccuracy())
-                currentBaseScore += GetRawAccuracyScore(result.Type);
+                currentBaseScore += GetBaseScoreForResult(result.Type);
 
             if (result.Type.IsBonus())
                 currentBonusPortion += GetBonusScoreChange(result);
@@ -276,12 +276,12 @@ namespace osu.Game.Rulesets.Scoring
 
             if (result.Judgement.MaxResult.AffectsAccuracy())
             {
-                currentMaximumBaseScore -= GetRawAccuracyScore(result.Judgement.MaxResult);
+                currentMaximumBaseScore -= GetBaseScoreForResult(result.Judgement.MaxResult);
                 currentAccuracyJudgementCount--;
             }
 
             if (result.Type.AffectsAccuracy())
-                currentBaseScore -= GetRawAccuracyScore(result.Type);
+                currentBaseScore -= GetBaseScoreForResult(result.Type);
 
             if (result.Type.IsBonus())
                 currentBonusPortion -= GetBonusScoreChange(result);
@@ -301,19 +301,15 @@ namespace osu.Game.Rulesets.Scoring
         /// Gets the final score change to be applied to the bonus portion of the score.
         /// </summary>
         /// <param name="result">The judgement result.</param>
-        protected virtual double GetBonusScoreChange(JudgementResult result) => GetRawBonusScore(result.Type);
+        protected virtual double GetBonusScoreChange(JudgementResult result) => GetBaseScoreForResult(result.Type);
 
         /// <summary>
         /// Gets the final score change to be applied to the combo portion of the score.
         /// </summary>
         /// <param name="result">The judgement result.</param>
-        protected virtual double GetComboScoreChange(JudgementResult result) => GetRawComboScore(result.Judgement.MaxResult) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT);
+        protected virtual double GetComboScoreChange(JudgementResult result) => GetBaseScoreForResult(result.Judgement.MaxResult) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT);
 
-        /// <summary>
-        /// Retrieves the raw score value for a hit result, in order to be applied to the combo portion.
-        /// </summary>
-        /// <param name="result">The hit result.</param>
-        public virtual int GetRawComboScore(HitResult result)
+        public virtual int GetBaseScoreForResult(HitResult result)
         {
             switch (result)
             {
@@ -338,51 +334,6 @@ namespace osu.Game.Rulesets.Scoring
                 case HitResult.Great:
                 case HitResult.Perfect: // Perfect doesn't actually give more score / accuracy directly.
                     return 300;
-            }
-        }
-
-        /// <summary>
-        /// Retrieves the raw score value for a hit result, in order to be applied to the accuracy portion.
-        /// </summary>
-        /// <param name="result">The hit result.</param>
-        public virtual int GetRawAccuracyScore(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
-
-                case HitResult.SmallTickHit:
-                    return 10;
-
-                case HitResult.LargeTickHit:
-                    return 30;
-
-                case HitResult.Meh:
-                    return 50;
-
-                case HitResult.Ok:
-                    return 100;
-
-                case HitResult.Good:
-                    return 200;
-
-                case HitResult.Great:
-                case HitResult.Perfect: // Perfect doesn't actually give more score / accuracy directly.
-                    return 300;
-            }
-        }
-
-        /// <summary>
-        /// Retrieves the raw score value for a hit result, in order to be applied to the bonus portion.
-        /// </summary>
-        /// <param name="result">The hit result.</param>
-        public virtual int GetRawBonusScore(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return 0;
 
                 case HitResult.SmallBonus:
                     return 10;
@@ -619,7 +570,7 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         /// <remarks>
         /// Used to compute accuracy.
-        /// See: <see cref="HitResultExtensions.IsBasic"/> and <see cref="ScoreProcessor.GetRawAccuracyScore"/>.
+        /// See: <see cref="HitResultExtensions.IsBasic"/> and <see cref="ScoreProcessor.GetBaseScoreForResult"/>.
         /// </remarks>
         [Key(0)]
         public double BaseScore { get; set; }
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index b1cba3756b..3c7ee5c86b 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Scoring
             // Populate the maximum statistics.
             HitResult maxBasicResult = rulesetInstance.GetHitResults()
                                                       .Select(h => h.result)
-                                                      .Where(h => h.IsBasic()).MaxBy(scoreProcessor.GetRawAccuracyScore);
+                                                      .Where(h => h.IsBasic()).MaxBy(scoreProcessor.GetBaseScoreForResult);
 
             foreach ((HitResult result, int count) in score.Statistics)
             {

From eb072a1d242f0f1680183200310742fa4d850371 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 21 Dec 2023 15:08:10 +0900
Subject: [PATCH 2090/2296] Add accuracy conversion, fix usages

---
 osu.Game/BackgroundDataStoreProcessor.cs      |  5 +--
 .../StandardisedScoreMigrationTools.cs        | 42 +++++++++++++++++--
 osu.Game/Scoring/ScoreImporter.cs             |  2 +-
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/osu.Game/BackgroundDataStoreProcessor.cs b/osu.Game/BackgroundDataStoreProcessor.cs
index 8f6dced350..a748a7422a 100644
--- a/osu.Game/BackgroundDataStoreProcessor.cs
+++ b/osu.Game/BackgroundDataStoreProcessor.cs
@@ -340,15 +340,12 @@ namespace osu.Game
 
                 try
                 {
-                    var score = scoreManager.Query(s => s.ID == id);
-                    long newTotalScore = StandardisedScoreMigrationTools.ConvertFromLegacyTotalScore(score, beatmapManager);
-
                     // Can't use async overload because we're not on the update thread.
                     // ReSharper disable once MethodHasAsyncOverload
                     realmAccess.Write(r =>
                     {
                         ScoreInfo s = r.Find<ScoreInfo>(id)!;
-                        s.TotalScore = newTotalScore;
+                        StandardisedScoreMigrationTools.UpdateFromLegacy(s, beatmapManager);
                         s.TotalScoreVersion = LegacyScoreEncoder.LATEST_VERSION;
                     });
 
diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 8a25a44b80..380bf63e63 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -231,13 +231,36 @@ namespace osu.Game.Database
             }
         }
 
+        /// <summary>
+        /// Updates a legacy <see cref="ScoreInfo"/> to standardised scoring.
+        /// </summary>
+        /// <param name="score">The score to update.</param>
+        /// <param name="beatmaps">A <see cref="BeatmapManager"/> used for <see cref="WorkingBeatmap"/> lookups.</param>
+        public static void UpdateFromLegacy(ScoreInfo score, BeatmapManager beatmaps)
+        {
+            score.TotalScore = convertFromLegacyTotalScore(score, beatmaps);
+            score.Accuracy = ComputeAccuracy(score);
+        }
+
+        /// <summary>
+        /// Updates a legacy <see cref="ScoreInfo"/> to standardised scoring.
+        /// </summary>
+        /// <param name="score">The score to update.</param>
+        /// <param name="difficulty">The beatmap difficulty.</param>
+        /// <param name="attributes">The legacy scoring attributes for the beatmap which the score was set on.</param>
+        public static void UpdateFromLegacy(ScoreInfo score, LegacyBeatmapConversionDifficultyInfo difficulty, LegacyScoreAttributes attributes)
+        {
+            score.TotalScore = convertFromLegacyTotalScore(score, difficulty, attributes);
+            score.Accuracy = ComputeAccuracy(score);
+        }
+
         /// <summary>
         /// Converts from <see cref="ScoreInfo.LegacyTotalScore"/> to the new standardised scoring of <see cref="ScoreProcessor"/>.
         /// </summary>
         /// <param name="score">The score to convert the total score of.</param>
         /// <param name="beatmaps">A <see cref="BeatmapManager"/> used for <see cref="WorkingBeatmap"/> lookups.</param>
         /// <returns>The standardised total score.</returns>
-        public static long ConvertFromLegacyTotalScore(ScoreInfo score, BeatmapManager beatmaps)
+        private static long convertFromLegacyTotalScore(ScoreInfo score, BeatmapManager beatmaps)
         {
             if (!score.IsLegacyScore)
                 return score.TotalScore;
@@ -260,7 +283,7 @@ namespace osu.Game.Database
             ILegacyScoreSimulator sv1Simulator = legacyRuleset.CreateLegacyScoreSimulator();
             LegacyScoreAttributes attributes = sv1Simulator.Simulate(beatmap, playableBeatmap);
 
-            return ConvertFromLegacyTotalScore(score, LegacyBeatmapConversionDifficultyInfo.FromBeatmap(beatmap.Beatmap), attributes);
+            return convertFromLegacyTotalScore(score, LegacyBeatmapConversionDifficultyInfo.FromBeatmap(beatmap.Beatmap), attributes);
         }
 
         /// <summary>
@@ -270,7 +293,7 @@ namespace osu.Game.Database
         /// <param name="difficulty">The beatmap difficulty.</param>
         /// <param name="attributes">The legacy scoring attributes for the beatmap which the score was set on.</param>
         /// <returns>The standardised total score.</returns>
-        public static long ConvertFromLegacyTotalScore(ScoreInfo score, LegacyBeatmapConversionDifficultyInfo difficulty, LegacyScoreAttributes attributes)
+        private static long convertFromLegacyTotalScore(ScoreInfo score, LegacyBeatmapConversionDifficultyInfo difficulty, LegacyScoreAttributes attributes)
         {
             if (!score.IsLegacyScore)
                 return score.TotalScore;
@@ -422,6 +445,19 @@ namespace osu.Game.Database
             }
         }
 
+        public static double ComputeAccuracy(ScoreInfo scoreInfo)
+        {
+            Ruleset ruleset = scoreInfo.Ruleset.CreateInstance();
+            ScoreProcessor scoreProcessor = ruleset.CreateScoreProcessor();
+
+            int baseScore = scoreInfo.Statistics.Where(kvp => kvp.Key.AffectsAccuracy())
+                                     .Sum(kvp => kvp.Value * scoreProcessor.GetBaseScoreForResult(kvp.Key));
+            int maxBaseScore = scoreInfo.MaximumStatistics.Where(kvp => kvp.Key.AffectsAccuracy())
+                                        .Sum(kvp => kvp.Value * scoreProcessor.GetBaseScoreForResult(kvp.Key));
+
+            return maxBaseScore == 0 ? 1 : baseScore / (double)maxBaseScore;
+        }
+
         /// <summary>
         /// Used to populate the <paramref name="score"/> model using data parsed from its corresponding replay file.
         /// </summary>
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 3c7ee5c86b..8e28707107 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Scoring
             else if (model.IsLegacyScore)
             {
                 model.LegacyTotalScore = model.TotalScore;
-                model.TotalScore = StandardisedScoreMigrationTools.ConvertFromLegacyTotalScore(model, beatmaps());
+                StandardisedScoreMigrationTools.UpdateFromLegacy(model, beatmaps());
             }
         }
 

From c3c1752a5a315ae2d72b8c4b6b6a9436d5e579eb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 21 Dec 2023 15:32:34 +0900
Subject: [PATCH 2091/2296] Reconvert all legacy scores

---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index fa930d77d3..dbd9a106df 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -34,9 +34,10 @@ namespace osu.Game.Scoring.Legacy
         /// <item><description>30000005: Introduce combo exponent in the osu! gamemode. Reconvert all scores.</description></item>
         /// <item><description>30000006: Fix edge cases in conversion after combo exponent introduction that lead to NaNs. Reconvert all scores.</description></item>
         /// <item><description>30000007: Adjust osu!mania combo and accuracy portions and judgement scoring values. Reconvert all scores.</description></item>
+        /// <item><description>30000008: Add accuracy conversion. Reconvert all scores.</description></item>
         /// </list>
         /// </remarks>
-        public const int LATEST_VERSION = 30000007;
+        public const int LATEST_VERSION = 30000008;
 
         /// <summary>
         /// The first stable-compatible YYYYMMDD format version given to lazer usage of replays.

From 0648201844a962429a99a2754a2c10e439882680 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Dec 2023 18:17:03 +0900
Subject: [PATCH 2092/2296] Cancel test more

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 218bf495e3..ce241f3676 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -420,7 +420,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         }
 
         [Test]
-        [FlakyTest] // temporary while peppy investigates
+        [Ignore("temporary while peppy investigates. probably realm batching related.")]
         public void TestSelectionRetainedOnBeatmapUpdate()
         {
             createSongSelect();

From a4baa0a716f05e6415e907824ff0bd06b66e2dfb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Dec 2023 18:14:24 +0900
Subject: [PATCH 2093/2296] Add versioning of local scores

For any potential future usage
---
 osu.Game.Tests/Scores/IO/ImportScoreTest.cs              | 2 ++
 .../Visual/Gameplay/TestScenePlayerLocalScoreImport.cs   | 4 ++++
 osu.Game/Database/RealmAccess.cs                         | 3 ++-
 osu.Game/Scoring/ScoreInfo.cs                            | 6 ++++++
 osu.Game/Screens/Play/Player.cs                          | 9 ++++++++-
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index dd724d268e..85b4219792 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -196,6 +196,7 @@ namespace osu.Game.Tests.Scores.IO
                         User = new APIUser { Username = "Test user" },
                         BeatmapInfo = beatmap.Beatmaps.First(),
                         Ruleset = new OsuRuleset().RulesetInfo,
+                        Version = "12345",
                         Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
                     };
 
@@ -203,6 +204,7 @@ namespace osu.Game.Tests.Scores.IO
 
                     Assert.IsTrue(imported.Mods.Any(m => m is OsuModHardRock));
                     Assert.IsTrue(imported.Mods.Any(m => m is OsuModDoubleTime));
+                    Assert.That(imported.Version, Is.EqualTo(toImport.Version));
                 }
                 finally
                 {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 0dd544bb30..f7a5ec7562 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -41,6 +41,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private BeatmapSetInfo? importedSet;
 
+        [Resolved]
+        private OsuGameBase osu { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
         {
@@ -153,6 +156,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("results displayed", () => Player.GetChildScreen() is ResultsScreen);
             AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
+            AddUntilStep("score has correct version", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID)!.Version), () => Is.EqualTo(osu.Version));
         }
 
         [Test]
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index ad61292c2e..4bd7f36cdd 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -90,8 +90,9 @@ namespace osu.Game.Database
         /// 36   2023-10-26    Add LegacyOnlineID to ScoreInfo. Move osu_scores_*_high IDs stored in OnlineID to LegacyOnlineID. Reset anomalous OnlineIDs.
         /// 38   2023-12-10    Add EndTimeObjectCount and TotalObjectCount to BeatmapInfo.
         /// 39   2023-12-19    Migrate any EndTimeObjectCount and TotalObjectCount values of 0 to -1 to better identify non-calculated values.
+        /// 40   2023-12-21    Add ScoreInfo.Version to keep track of which build scores were set on.
         /// </summary>
-        private const int schema_version = 39;
+        private const int schema_version = 40;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 5545ba552e..4c00c73341 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -46,6 +46,12 @@ namespace osu.Game.Scoring
         /// </remarks>
         public BeatmapInfo? BeatmapInfo { get; set; }
 
+        /// <summary>
+        /// The version of the client this score was set using.
+        /// Sourced from <see cref="OsuGameBase.Version"/> at the point of score submission.
+        /// </summary>
+        public string Version { get; set; } = string.Empty;
+
         /// <summary>
         /// The <see cref="osu.Game.Beatmaps.BeatmapInfo.Hash"/> at the point in time when the score was set.
         /// </summary>
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index cc08079d88..a432242046 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -109,6 +109,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private MusicController musicController { get; set; }
 
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
         public GameplayState GameplayState { get; private set; }
 
         private Ruleset ruleset;
@@ -1155,7 +1158,11 @@ namespace osu.Game.Screens.Play
         /// <returns>The <see cref="Scoring.Score"/>.</returns>
         protected virtual Score CreateScore(IBeatmap beatmap) => new Score
         {
-            ScoreInfo = new ScoreInfo { User = api.LocalUser.Value },
+            ScoreInfo = new ScoreInfo
+            {
+                User = api.LocalUser.Value,
+                Version = game.Version,
+            },
         };
 
         /// <summary>

From 81bbdccee788daac7c7865859673eed1521191e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Dec 2023 12:56:19 +0100
Subject: [PATCH 2094/2296] Rename `ScoreInfo.{ -> Client}Version`

---
 osu.Game.Tests/Scores/IO/ImportScoreTest.cs                   | 4 ++--
 .../Visual/Gameplay/TestScenePlayerLocalScoreImport.cs        | 2 +-
 osu.Game/Scoring/ScoreInfo.cs                                 | 2 +-
 osu.Game/Screens/Play/Player.cs                               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index 85b4219792..ebbc329b9d 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Tests.Scores.IO
                         User = new APIUser { Username = "Test user" },
                         BeatmapInfo = beatmap.Beatmaps.First(),
                         Ruleset = new OsuRuleset().RulesetInfo,
-                        Version = "12345",
+                        ClientVersion = "12345",
                         Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
                     };
 
@@ -204,7 +204,7 @@ namespace osu.Game.Tests.Scores.IO
 
                     Assert.IsTrue(imported.Mods.Any(m => m is OsuModHardRock));
                     Assert.IsTrue(imported.Mods.Any(m => m is OsuModDoubleTime));
-                    Assert.That(imported.Version, Is.EqualTo(toImport.Version));
+                    Assert.That(imported.ClientVersion, Is.EqualTo(toImport.ClientVersion));
                 }
                 finally
                 {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index f7a5ec7562..fafd1330cc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("results displayed", () => Player.GetChildScreen() is ResultsScreen);
             AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
-            AddUntilStep("score has correct version", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID)!.Version), () => Is.EqualTo(osu.Version));
+            AddUntilStep("score has correct version", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID)!.ClientVersion), () => Is.EqualTo(osu.Version));
         }
 
         [Test]
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 4c00c73341..7071bd380e 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Scoring
         /// The version of the client this score was set using.
         /// Sourced from <see cref="OsuGameBase.Version"/> at the point of score submission.
         /// </summary>
-        public string Version { get; set; } = string.Empty;
+        public string ClientVersion { get; set; } = string.Empty;
 
         /// <summary>
         /// The <see cref="osu.Game.Beatmaps.BeatmapInfo.Hash"/> at the point in time when the score was set.
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a432242046..c9251b0a78 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1161,7 +1161,7 @@ namespace osu.Game.Screens.Play
             ScoreInfo = new ScoreInfo
             {
                 User = api.LocalUser.Value,
-                Version = game.Version,
+                ClientVersion = game.Version,
             },
         };
 

From 2baf579f7ce62429e83aa4781ec3d55320b92d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Dec 2023 12:58:08 +0100
Subject: [PATCH 2095/2296] Serialise and deserialise `ClientVersion` to
 replays

---
 osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs | 4 ++++
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs        | 1 +
 2 files changed, 5 insertions(+)

diff --git a/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs b/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
index d34edf7bdf..2c5b91f10f 100644
--- a/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
+++ b/osu.Game/Scoring/Legacy/LegacyReplaySoloScoreInfo.cs
@@ -35,12 +35,16 @@ namespace osu.Game.Scoring.Legacy
         [JsonProperty("maximum_statistics")]
         public Dictionary<HitResult, int> MaximumStatistics { get; set; } = new Dictionary<HitResult, int>();
 
+        [JsonProperty("client_version")]
+        public string ClientVersion = string.Empty;
+
         public static LegacyReplaySoloScoreInfo FromScore(ScoreInfo score) => new LegacyReplaySoloScoreInfo
         {
             OnlineID = score.OnlineID,
             Mods = score.APIMods,
             Statistics = score.Statistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
             MaximumStatistics = score.MaximumStatistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
+            ClientVersion = score.ClientVersion,
         };
     }
 }
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index c5e6e3bcce..ed11691674 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Scoring.Legacy
                         score.ScoreInfo.Statistics = readScore.Statistics;
                         score.ScoreInfo.MaximumStatistics = readScore.MaximumStatistics;
                         score.ScoreInfo.Mods = readScore.Mods.Select(m => m.ToMod(currentRuleset)).ToArray();
+                        score.ScoreInfo.ClientVersion = readScore.ClientVersion;
                     });
                 }
             }

From 5ff95db02c2af9ce6e7b1d707ee88440e3df9e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Dec 2023 13:06:42 +0100
Subject: [PATCH 2096/2296] Add test coverage of `ClientVersion` serialisation

---
 osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
index ab88be1511..4e281cf28e 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyScoreDecoderTest.cs
@@ -219,6 +219,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
             {
                 new OsuModDoubleTime { SpeedChange = { Value = 1.1 } }
             };
+            scoreInfo.OnlineID = 123123;
+            scoreInfo.ClientVersion = "2023.1221.0";
 
             var beatmap = new TestBeatmap(ruleset);
             var score = new Score
@@ -237,9 +239,11 @@ namespace osu.Game.Tests.Beatmaps.Formats
 
             Assert.Multiple(() =>
             {
+                Assert.That(decodedAfterEncode.ScoreInfo.OnlineID, Is.EqualTo(123123));
                 Assert.That(decodedAfterEncode.ScoreInfo.Statistics, Is.EqualTo(scoreInfo.Statistics));
                 Assert.That(decodedAfterEncode.ScoreInfo.MaximumStatistics, Is.EqualTo(scoreInfo.MaximumStatistics));
                 Assert.That(decodedAfterEncode.ScoreInfo.Mods, Is.EqualTo(scoreInfo.Mods));
+                Assert.That(decodedAfterEncode.ScoreInfo.ClientVersion, Is.EqualTo("2023.1221.0"));
             });
         }
 

From d4731e0830867868eec1050e51e90587bcfb330b Mon Sep 17 00:00:00 2001
From: Daniel Power <me@danielpower.ca>
Date: Thu, 21 Dec 2023 08:56:39 -0330
Subject: [PATCH 2097/2296] Fix scale of skin element bounding box

---
 osu.Game/Overlays/SkinEditor/SkinBlueprint.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs b/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
index 01cd3d97e0..8f8d899fad 100644
--- a/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
@@ -136,9 +136,10 @@ namespace osu.Game.Overlays.SkinEditor
         {
             base.Update();
 
+            Vector2 scale = drawable.DrawInfo.MatrixInverse.ExtractScale().Xy;
             drawableQuad = drawable.ToScreenSpace(
                 drawable.DrawRectangle
-                        .Inflate(SkinSelectionHandler.INFLATE_SIZE));
+                        .Inflate(SkinSelectionHandler.INFLATE_SIZE * scale));
 
             var localSpaceQuad = ToLocalSpace(drawableQuad);
 

From b4e71a0787df19714a5cbf0a166a81d139d7cd23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Dec 2023 13:58:12 +0100
Subject: [PATCH 2098/2296] Fix slider tick / end misses displaying with full
 size on legacy skins with animated misses

Resolves https://github.com/ppy/osu/issues/25987.

Structure is a bit clumsy but I'm not sure how to do better...
---
 osu.Game/Skinning/LegacyJudgementPieceOld.cs | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index ca2c8ce6bc..68274ffa2d 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -50,17 +50,16 @@ namespace osu.Game.Skinning
 
             // legacy judgements don't play any transforms if they are an animation.... UNLESS they are the temporary displayed judgement from new piece.
             if (animation?.FrameCount > 1 && !forceTransforms)
+            {
+                if (isMissedTick())
+                    applyMissedTickScaling();
                 return;
+            }
 
             if (result.IsMiss())
             {
-                bool isTick = result != HitResult.Miss;
-
-                if (isTick)
-                {
-                    this.ScaleTo(0.6f);
-                    this.ScaleTo(0.3f, 100, Easing.In);
-                }
+                if (isMissedTick())
+                    applyMissedTickScaling();
                 else
                 {
                     this.ScaleTo(1.6f);
@@ -95,6 +94,14 @@ namespace osu.Game.Skinning
             }
         }
 
+        private bool isMissedTick() => result.IsMiss() && result != HitResult.Miss;
+
+        private void applyMissedTickScaling()
+        {
+            this.ScaleTo(0.6f);
+            this.ScaleTo(0.3f, 100, Easing.In);
+        }
+
         public Drawable GetAboveHitObjectsProxiedContent() => CreateProxy();
     }
 }

From 3f6dad5502d6aec67d9e7522fdb69d21299d5058 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 22 Dec 2023 01:33:50 +0900
Subject: [PATCH 2099/2296] Use classic HP values for non-classic osu! HP drain

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  2 +
 .../Scoring/OsuHealthProcessor.cs             | 68 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index e53f20277b..35cbfa3790 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -48,6 +48,8 @@ namespace osu.Game.Rulesets.Osu
 
         public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
 
+        public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new OsuHealthProcessor(drainStartTime);
+
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new OsuBeatmapConverter(beatmap, this);
 
         public override IBeatmapProcessor CreateBeatmapProcessor(IBeatmap beatmap) => new OsuBeatmapProcessor(beatmap);
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
new file mode 100644
index 0000000000..784d3b934d
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -0,0 +1,68 @@
+// 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.Beatmaps;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Scoring
+{
+    public partial class OsuHealthProcessor : DrainingHealthProcessor
+    {
+        public OsuHealthProcessor(double drainStartTime, double drainLenience = 0)
+            : base(drainStartTime, drainLenience)
+        {
+        }
+
+        protected override double GetHealthIncreaseFor(JudgementResult result)
+        {
+            switch (result.Type)
+            {
+                case HitResult.SmallTickMiss:
+                    return IBeatmapDifficultyInfo.DifficultyRange(Beatmap.Difficulty.DrainRate, -0.02, -0.075, -0.14);
+
+                case HitResult.LargeTickMiss:
+                    return IBeatmapDifficultyInfo.DifficultyRange(Beatmap.Difficulty.DrainRate, -0.02, -0.075, -0.14);
+
+                case HitResult.Miss:
+                    return IBeatmapDifficultyInfo.DifficultyRange(Beatmap.Difficulty.DrainRate, -0.03, -0.125, -0.2);
+
+                case HitResult.SmallTickHit:
+                    // When classic slider mechanics are enabled, this result comes from the tail.
+                    return 0.02;
+
+                case HitResult.LargeTickHit:
+                    switch (result.HitObject)
+                    {
+                        case SliderTick:
+                            return 0.015;
+
+                        case SliderHeadCircle:
+                        case SliderTailCircle:
+                        case SliderRepeat:
+                            return 0.02;
+                    }
+
+                    break;
+
+                case HitResult.Meh:
+                    return 0.002;
+
+                case HitResult.Ok:
+                    return 0.011;
+
+                case HitResult.Great:
+                    return 0.03;
+
+                case HitResult.SmallBonus:
+                    return 0.0085;
+
+                case HitResult.LargeBonus:
+                    return 0.01;
+            }
+
+            return base.GetHealthIncreaseFor(result);
+        }
+    }
+}

From b31b9e96d0cf016e4f7b892116fd6951977a7853 Mon Sep 17 00:00:00 2001
From: Simon G <45692977+jeenyuhs@users.noreply.github.com>
Date: Fri, 22 Dec 2023 03:04:48 +0100
Subject: [PATCH 2100/2296] adjust beatmap length and drain based on rate
 changing mods

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 25 ++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 2613857998..c69cd6ead6 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -161,6 +161,7 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
             private Container bpmLabelContainer;
+            private Container lengthLabelContainer;
 
             private readonly WorkingBeatmap working;
             private readonly RulesetInfo ruleset;
@@ -341,10 +342,10 @@ namespace osu.Game.Screens.Select
                 {
                     settingChangeTracker?.Dispose();
 
-                    refreshBPMLabel();
+                    refreshBPMAndLengthLabel();
 
                     settingChangeTracker = new ModSettingChangeTracker(m.NewValue);
-                    settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+                    settingChangeTracker.SettingChanged += _ => refreshBPMAndLengthLabel();
                 }, true);
             }
 
@@ -370,12 +371,10 @@ namespace osu.Game.Screens.Select
 
                     infoLabelContainer.Children = new Drawable[]
                     {
-                        new InfoLabel(new BeatmapStatistic
+                        lengthLabelContainer = new Container
                         {
-                            Name = BeatmapsetsStrings.ShowStatsTotalLength(playableBeatmap.CalculateDrainLength().ToFormattedDuration()),
-                            CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
-                            Content = working.BeatmapInfo.Length.ToFormattedDuration().ToString(),
-                        }),
+                            AutoSizeAxes = Axes.Both,
+                        },
                         bpmLabelContainer = new Container
                         {
                             AutoSizeAxes = Axes.Both,
@@ -394,7 +393,7 @@ namespace osu.Game.Screens.Select
                 }
             }
 
-            private void refreshBPMLabel()
+            private void refreshBPMAndLengthLabel()
             {
                 var beatmap = working.Beatmap;
 
@@ -420,6 +419,16 @@ namespace osu.Game.Screens.Select
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Bpm),
                     Content = labelText
                 });
+
+                double drainLength = Math.Round(beatmap.CalculateDrainLength() / rate);
+                double hitLength = Math.Round(beatmap.BeatmapInfo.Length / rate);
+
+                lengthLabelContainer.Child = new InfoLabel(new BeatmapStatistic
+                {
+                    Name = BeatmapsetsStrings.ShowStatsTotalLength(drainLength.ToFormattedDuration()),
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
+                    Content = hitLength.ToFormattedDuration().ToString(),
+                });
             }
 
             private Drawable getMapper(BeatmapMetadata metadata)

From 9c35e250368ca3d777e1b2f4394310008839d3b3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 22 Dec 2023 13:38:52 +0900
Subject: [PATCH 2101/2296] Add failing tests

---
 .../Mods/TestSceneManiaModPerfect.cs          | 29 +++++++++++++++++++
 .../Mods/TestSceneOsuModPerfect.cs            | 29 +++++++++++++++++++
 osu.Game/Tests/Visual/ModPerfectTestScene.cs  |  8 ++---
 osu.Game/Tests/Visual/ModTestScene.cs         | 18 ++++++------
 4 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 97a6ee28f4..a734979bf6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -1,9 +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 System.Collections.Generic;
 using NUnit.Framework;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Replays;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests.Mods
@@ -24,5 +29,29 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         [TestCase(false)]
         [TestCase(true)]
         public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+
+        [Test]
+        public void TestBreakOnHoldNote() => CreateModTest(new ModTestData
+        {
+            Mod = new ManiaModPerfect(),
+            PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HoldNote
+                    {
+                        StartTime = 1000,
+                        EndTime = 3000,
+                    },
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(1000, ManiaAction.Key1),
+                new ManiaReplayFrame(2000)
+            }
+        });
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
index 26c4133bc4..7030061e0e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
@@ -1,11 +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 NUnit.Framework;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
 using osu.Game.Tests.Visual;
 using osuTK;
 
@@ -50,5 +54,30 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 
             CreateHitObjectTest(new HitObjectTestData(spinner), shouldMiss);
         }
+
+        [Test]
+        public void TestMissSliderTail() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModPerfect(),
+            PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(true),
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        Position = new Vector2(256, 192),
+                        StartTime = 1000,
+                        Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(100, 0), })
+                    },
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new OsuReplayFrame(1000, new Vector2(256, 192), OsuAction.LeftButton),
+                new OsuReplayFrame(1001, new Vector2(256, 192)),
+            }
+        });
     }
 }
diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index 164faa16aa..c6f4a27ec4 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -29,12 +29,12 @@ namespace osu.Game.Tests.Visual
             PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(shouldMiss && testData.FailOnMiss)
         });
 
-        protected override TestPlayer CreateModPlayer(Ruleset ruleset) => new PerfectModTestPlayer();
+        protected override TestPlayer CreateModPlayer(Ruleset ruleset) => new PerfectModTestPlayer(CurrentTestData, AllowFail);
 
-        private partial class PerfectModTestPlayer : TestPlayer
+        protected partial class PerfectModTestPlayer : ModTestPlayer
         {
-            public PerfectModTestPlayer()
-                : base(showResults: false)
+            public PerfectModTestPlayer(ModTestData data, bool allowFail)
+                : base(data, allowFail)
             {
             }
 
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index aa5b506343..c2ebcdefac 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -20,35 +20,35 @@ namespace osu.Game.Tests.Visual
     {
         protected sealed override bool HasCustomSteps => true;
 
-        private ModTestData currentTestData;
+        protected ModTestData CurrentTestData { get; private set; }
 
         protected void CreateModTest(ModTestData testData) => CreateTest(() =>
         {
-            AddStep("set test data", () => currentTestData = testData);
+            AddStep("set test data", () => CurrentTestData = testData);
         });
 
         public override void TearDownSteps()
         {
             AddUntilStep("test passed", () =>
             {
-                if (currentTestData == null)
+                if (CurrentTestData == null)
                     return true;
 
-                return currentTestData.PassCondition?.Invoke() ?? false;
+                return CurrentTestData.PassCondition?.Invoke() ?? false;
             });
 
             base.TearDownSteps();
         }
 
-        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestData?.Beatmap ?? base.CreateBeatmap(ruleset);
+        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => CurrentTestData?.Beatmap ?? base.CreateBeatmap(ruleset);
 
         protected sealed override TestPlayer CreatePlayer(Ruleset ruleset)
         {
             var mods = new List<Mod>(SelectedMods.Value);
 
-            if (currentTestData.Mods != null)
-                mods.AddRange(currentTestData.Mods);
-            if (currentTestData.Autoplay)
+            if (CurrentTestData.Mods != null)
+                mods.AddRange(CurrentTestData.Mods);
+            if (CurrentTestData.Autoplay)
                 mods.Add(ruleset.GetAutoplayMod());
 
             SelectedMods.Value = mods;
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual
             return CreateModPlayer(ruleset);
         }
 
-        protected virtual TestPlayer CreateModPlayer(Ruleset ruleset) => new ModTestPlayer(currentTestData, AllowFail);
+        protected virtual TestPlayer CreateModPlayer(Ruleset ruleset) => new ModTestPlayer(CurrentTestData, AllowFail);
 
         protected partial class ModTestPlayer : TestPlayer
         {

From ea778c6e0aa6bf52ae5e12f287b0fb7f131348ca Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 22 Dec 2023 13:39:41 +0900
Subject: [PATCH 2102/2296] Fix perfect/sudden death not working on slider
 tails

---
 osu.Game/Rulesets/Mods/ModPerfect.cs     | 4 +++-
 osu.Game/Rulesets/Mods/ModSuddenDeath.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModPerfect.cs b/osu.Game/Rulesets/Mods/ModPerfect.cs
index 6f0bb7ad3b..0ba40ba070 100644
--- a/osu.Game/Rulesets/Mods/ModPerfect.cs
+++ b/osu.Game/Rulesets/Mods/ModPerfect.cs
@@ -28,7 +28,9 @@ namespace osu.Game.Rulesets.Mods
         }
 
         protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
-            => result.Type.AffectsAccuracy()
+            => (isRelevantResult(result.Judgement.MinResult) || isRelevantResult(result.Judgement.MaxResult) || isRelevantResult(result.Type))
                && result.Type != result.Judgement.MaxResult;
+
+        private bool isRelevantResult(HitResult result) => result.AffectsAccuracy() || result.AffectsCombo();
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
index 4e4e8662e8..56420e5ff4 100644
--- a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
+++ b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mods
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModPerfect)).ToArray();
 
         protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
-            => result.Type.AffectsCombo()
+            => (result.Judgement.MinResult.AffectsCombo() || result.Judgement.MaxResult.AffectsCombo() || result.Type.AffectsCombo())
                && !result.IsHit;
     }
 }

From 93efa98d9b8c1ce647a5baca6770f3c0c3e39755 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 22 Dec 2023 16:19:36 +0900
Subject: [PATCH 2103/2296] Fix mania "Great" hits failing with perfect mod

---
 .../Mods/TestSceneManiaModPerfect.cs          | 23 +++++++++++++++++++
 .../Mods/ManiaModPerfect.cs                   | 15 ++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index a734979bf6..73d6fe357d 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -30,6 +30,29 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         [TestCase(true)]
         public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote { StartTime = 1000, EndTime = 3000 }), shouldMiss);
 
+        [Test]
+        public void TestGreatHit() => CreateModTest(new ModTestData
+        {
+            Mod = new ManiaModPerfect(),
+            PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(false),
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Note
+                    {
+                        StartTime = 1000,
+                    }
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(1020, ManiaAction.Key1),
+                new ManiaReplayFrame(2000)
+            }
+        });
+
         [Test]
         public void TestBreakOnHoldNote() => CreateModTest(new ModTestData
         {
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPerfect.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModPerfect.cs
index 2e22e23dbd..b02a18c9f4 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModPerfect.cs
@@ -1,11 +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.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModPerfect : ModPerfect
     {
+        protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
+        {
+            if (!isRelevantResult(result.Judgement.MinResult) && !isRelevantResult(result.Judgement.MaxResult) && !isRelevantResult(result.Type))
+                return false;
+
+            // Mania allows imperfect "Great" hits without failing.
+            if (result.Judgement.MaxResult == HitResult.Perfect)
+                return result.Type < HitResult.Great;
+
+            return result.Type != result.Judgement.MaxResult;
+        }
+
+        private bool isRelevantResult(HitResult result) => result.AffectsAccuracy() || result.AffectsCombo();
     }
 }

From 88a5ba8167facffe4c7c401ca32ddf9f003bf4df Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 22 Dec 2023 16:43:09 +0900
Subject: [PATCH 2104/2296] Add mania/osu sudden death mod tests

---
 .../Mods/TestSceneCatchModPerfect.cs          |  2 +-
 .../Mods/TestSceneManiaModPerfect.cs          |  6 +-
 .../Mods/TestSceneManiaModSuddenDeath.cs      | 72 +++++++++++++++++
 .../Mods/TestSceneOsuModPerfect.cs            |  4 +-
 .../Mods/TestSceneOsuModSuddenDeath.cs        | 77 +++++++++++++++++++
 .../Mods/TestSceneTaikoModPerfect.cs          |  2 +-
 ...tScene.cs => ModFailConditionTestScene.cs} | 14 ++--
 7 files changed, 163 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs
 rename osu.Game/Tests/Visual/{ModPerfectTestScene.cs => ModFailConditionTestScene.cs} (74%)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
index 45e7d7aa28..7d539f91e4 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests.Mods
 {
-    public partial class TestSceneCatchModPerfect : ModPerfectTestScene
+    public partial class TestSceneCatchModPerfect : ModFailConditionTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
 
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 73d6fe357d..51730e2b43 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -13,7 +13,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests.Mods
 {
-    public partial class TestSceneManiaModPerfect : ModPerfectTestScene
+    public partial class TestSceneManiaModPerfect : ModFailConditionTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
 
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         public void TestGreatHit() => CreateModTest(new ModTestData
         {
             Mod = new ManiaModPerfect(),
-            PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(false),
+            PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
             Autoplay = false,
             Beatmap = new Beatmap
             {
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
         public void TestBreakOnHoldNote() => CreateModTest(new ModTestData
         {
             Mod = new ManiaModPerfect(),
-            PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
+            PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
             Autoplay = false,
             Beatmap = new Beatmap
             {
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs
new file mode 100644
index 0000000000..619816a815
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModSuddenDeath.cs
@@ -0,0 +1,72 @@
+// 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.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests.Mods
+{
+    public partial class TestSceneManiaModSuddenDeath : ModFailConditionTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
+        public TestSceneManiaModSuddenDeath()
+            : base(new ManiaModSuddenDeath())
+        {
+        }
+
+        [Test]
+        public void TestGreatHit() => CreateModTest(new ModTestData
+        {
+            Mod = new ManiaModSuddenDeath(),
+            PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Note
+                    {
+                        StartTime = 1000,
+                    }
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(1020, ManiaAction.Key1),
+                new ManiaReplayFrame(2000)
+            }
+        });
+
+        [Test]
+        public void TestBreakOnHoldNote() => CreateModTest(new ModTestData
+        {
+            Mod = new ManiaModSuddenDeath(),
+            PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HoldNote
+                    {
+                        StartTime = 1000,
+                        EndTime = 3000,
+                    },
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(1000, ManiaAction.Key1),
+                new ManiaReplayFrame(2000)
+            }
+        });
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
index 7030061e0e..b01bbbfca1 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public partial class TestSceneOsuModPerfect : ModPerfectTestScene
+    public partial class TestSceneOsuModPerfect : ModFailConditionTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
 
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         public void TestMissSliderTail() => CreateModTest(new ModTestData
         {
             Mod = new OsuModPerfect(),
-            PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(true),
+            PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true),
             Autoplay = false,
             Beatmap = new Beatmap
             {
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs
new file mode 100644
index 0000000000..ea048aaa6e
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSuddenDeath.cs
@@ -0,0 +1,77 @@
+// 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.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public partial class TestSceneOsuModSuddenDeath : ModFailConditionTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
+        public TestSceneOsuModSuddenDeath()
+            : base(new OsuModSuddenDeath())
+        {
+        }
+
+        [Test]
+        public void TestMissTail() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModSuddenDeath(),
+            PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        Position = new Vector2(256, 192),
+                        StartTime = 1000,
+                        Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(100, 0), })
+                    },
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new OsuReplayFrame(1000, new Vector2(256, 192), OsuAction.LeftButton),
+                new OsuReplayFrame(1001, new Vector2(256, 192)),
+            }
+        });
+
+        [Test]
+        public void TestMissTick() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModSuddenDeath(),
+            PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true),
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        Position = new Vector2(256, 192),
+                        StartTime = 1000,
+                        Path = new SliderPath(PathType.LINEAR, new[] { Vector2.Zero, new Vector2(200, 0), })
+                    },
+                },
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new OsuReplayFrame(1000, new Vector2(256, 192), OsuAction.LeftButton),
+                new OsuReplayFrame(1001, new Vector2(256, 192)),
+            }
+        });
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
index aed08f33e0..8a1157a7f8 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
@@ -10,7 +10,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests.Mods
 {
-    public partial class TestSceneTaikoModPerfect : ModPerfectTestScene
+    public partial class TestSceneTaikoModPerfect : ModFailConditionTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new TestTaikoRuleset();
 
diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModFailConditionTestScene.cs
similarity index 74%
rename from osu.Game/Tests/Visual/ModPerfectTestScene.cs
rename to osu.Game/Tests/Visual/ModFailConditionTestScene.cs
index c6f4a27ec4..8f0dff055d 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModFailConditionTestScene.cs
@@ -8,11 +8,11 @@ using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract partial class ModPerfectTestScene : ModTestScene
+    public abstract partial class ModFailConditionTestScene : ModTestScene
     {
-        private readonly ModPerfect mod;
+        private readonly ModFailCondition mod;
 
-        protected ModPerfectTestScene(ModPerfect mod)
+        protected ModFailConditionTestScene(ModFailCondition mod)
         {
             this.mod = mod;
         }
@@ -26,14 +26,14 @@ namespace osu.Game.Tests.Visual
                 HitObjects = { testData.HitObject }
             },
             Autoplay = !shouldMiss,
-            PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(shouldMiss && testData.FailOnMiss)
+            PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(shouldMiss && testData.FailOnMiss)
         });
 
-        protected override TestPlayer CreateModPlayer(Ruleset ruleset) => new PerfectModTestPlayer(CurrentTestData, AllowFail);
+        protected override TestPlayer CreateModPlayer(Ruleset ruleset) => new ModFailConditionTestPlayer(CurrentTestData, AllowFail);
 
-        protected partial class PerfectModTestPlayer : ModTestPlayer
+        protected partial class ModFailConditionTestPlayer : ModTestPlayer
         {
-            public PerfectModTestPlayer(ModTestData data, bool allowFail)
+            public ModFailConditionTestPlayer(ModTestData data, bool allowFail)
                 : base(data, allowFail)
             {
             }

From 5703546d715687d58b832c25082386d35abadb09 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 22 Dec 2023 16:43:17 +0900
Subject: [PATCH 2105/2296] Revert change to ModSuddenDeath

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

diff --git a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
index 56420e5ff4..4e4e8662e8 100644
--- a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
+++ b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mods
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModPerfect)).ToArray();
 
         protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
-            => (result.Judgement.MinResult.AffectsCombo() || result.Judgement.MaxResult.AffectsCombo() || result.Type.AffectsCombo())
+            => result.Type.AffectsCombo()
                && !result.IsHit;
     }
 }

From a0185508b76af5f650534d575226d27fe3fc1f21 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 22 Dec 2023 17:55:06 +0900
Subject: [PATCH 2106/2296] Add basic consideration of density for HP drain

---
 .../Scoring/OsuHealthProcessor.cs             |  4 ++
 .../Scoring/DrainingHealthProcessor.cs        | 55 +++++++++++++++++--
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 784d3b934d..5ae5766cda 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -3,6 +3,8 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 
@@ -15,6 +17,8 @@ namespace osu.Game.Rulesets.Osu.Scoring
         {
         }
 
+        protected override int? GetDensityGroup(HitObject hitObject) => (hitObject as IHasComboInformation)?.ComboIndex;
+
         protected override double GetHealthIncreaseFor(JudgementResult result)
         {
             switch (result.Type)
diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index a2fc23ac2e..4f6f8598fb 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -61,7 +61,9 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         protected readonly double DrainLenience;
 
-        private readonly List<(double time, double health)> healthIncreases = new List<(double, double)>();
+        private readonly List<HealthIncrease> healthIncreases = new List<HealthIncrease>();
+        private readonly Dictionary<int, double> densityMultiplierByGroup = new Dictionary<int, double>();
+
         private double gameplayEndTime;
         private double targetMinimumHealth;
 
@@ -133,14 +135,33 @@ namespace osu.Game.Rulesets.Scoring
         {
             base.ApplyResultInternal(result);
 
-            if (!result.Type.IsBonus())
-                healthIncreases.Add((result.HitObject.GetEndTime() + result.TimeOffset, GetHealthIncreaseFor(result)));
+            if (IsSimulating && !result.Type.IsBonus())
+            {
+                healthIncreases.Add(new HealthIncrease(
+                    result.HitObject.GetEndTime() + result.TimeOffset,
+                    GetHealthIncreaseFor(result),
+                    GetDensityGroup(result.HitObject)));
+            }
         }
 
+        protected override double GetHealthIncreaseFor(JudgementResult result) => base.GetHealthIncreaseFor(result) * getDensityMultiplier(GetDensityGroup(result.HitObject));
+
+        private double getDensityMultiplier(int? group)
+        {
+            if (group == null)
+                return 1;
+
+            return densityMultiplierByGroup.TryGetValue(group.Value, out double multiplier) ? multiplier : 1;
+        }
+
+        protected virtual int? GetDensityGroup(HitObject hitObject) => null;
+
         protected override void Reset(bool storeResults)
         {
             base.Reset(storeResults);
 
+            densityMultiplierByGroup.Clear();
+
             if (storeResults)
                 DrainRate = ComputeDrainRate();
 
@@ -152,6 +173,24 @@ namespace osu.Game.Rulesets.Scoring
             if (healthIncreases.Count <= 1)
                 return 0;
 
+            // Normalise the health gain during sections with higher densities.
+            (int group, double avgIncrease)[] avgIncreasesByGroup = healthIncreases
+                                                                    .Where(i => i.Group != null)
+                                                                    .GroupBy(i => i.Group)
+                                                                    .Select(g => ((int)g.Key!, g.Sum(i => i.Amount) / (g.Max(i => i.Time) - g.Min(i => i.Time) + 1)))
+                                                                    .ToArray();
+
+            if (avgIncreasesByGroup.Length > 1)
+            {
+                double overallAverageIncrease = avgIncreasesByGroup.Average(g => g.avgIncrease);
+
+                foreach ((int group, double avgIncrease) in avgIncreasesByGroup)
+                {
+                    // Reduce the health increase for groups that return more health than average.
+                    densityMultiplierByGroup[group] = Math.Min(1, overallAverageIncrease / avgIncrease);
+                }
+            }
+
             int adjustment = 1;
             double result = 1;
 
@@ -165,8 +204,8 @@ namespace osu.Game.Rulesets.Scoring
 
                 for (int i = 0; i < healthIncreases.Count; i++)
                 {
-                    double currentTime = healthIncreases[i].time;
-                    double lastTime = i > 0 ? healthIncreases[i - 1].time : DrainStartTime;
+                    double currentTime = healthIncreases[i].Time;
+                    double lastTime = i > 0 ? healthIncreases[i - 1].Time : DrainStartTime;
 
                     while (currentBreak < Beatmap.Breaks.Count && Beatmap.Breaks[currentBreak].EndTime <= currentTime)
                     {
@@ -177,10 +216,12 @@ namespace osu.Game.Rulesets.Scoring
                         currentBreak++;
                     }
 
+                    double multiplier = getDensityMultiplier(healthIncreases[i].Group);
+
                     // Apply health adjustments
                     currentHealth -= (currentTime - lastTime) * result;
                     lowestHealth = Math.Min(lowestHealth, currentHealth);
-                    currentHealth = Math.Min(1, currentHealth + healthIncreases[i].health);
+                    currentHealth = Math.Min(1, currentHealth + healthIncreases[i].Amount * multiplier);
 
                     // Common scenario for when the drain rate is definitely too harsh
                     if (lowestHealth < 0)
@@ -198,5 +239,7 @@ namespace osu.Game.Rulesets.Scoring
 
             return result;
         }
+
+        private record struct HealthIncrease(double Time, double Amount, int? Group);
     }
 }

From 7e557152fb430219ab484107d592311e983094f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 22 Dec 2023 12:40:24 +0100
Subject: [PATCH 2107/2296] Fix relax mod not considering full follow area
 radius when automatically holding sliders

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

Regressed in https://github.com/ppy/osu/pull/25776 with the changes to
`DrawableSliderBall`.

I would have liked to include tests, but relax mod is a bit untestable,
because it disengages completely in the presence of a replay:

	https://github.com/ppy/osu/blob/7e09164d7084265536570ac7036d7244934b651c/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs#L49-L58

Additionally, `RulesetInputManager` disengages completely from parent
inputs when there is a replay active:

	https://github.com/ppy/osu/blob/7e09164d7084265536570ac7036d7244934b651c/osu.Game/Rulesets/UI/RulesetInputManager.cs#L116

which means there is really no easy way to control positional input
while still having relax logic work. So I'm hoping the fix could be
considered obvious enough to not require test coverage.
---
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs                 | 2 +-
 .../Objects/Drawables/SliderInputManager.cs               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index aaa7c70a8d..40fadfb77e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                         if (!slider.HeadCircle.IsHit)
                             handleHitCircle(slider.HeadCircle);
 
-                        requiresHold |= slider.Ball.IsHovered || h.IsHovered;
+                        requiresHold |= slider.SliderInputManager.IsMouseInFollowArea(true);
                         break;
 
                     case DrawableSpinner spinner:
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
index 8aa982783e..95896c7c91 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void Update()
         {
             base.Update();
-            updateTracking(isMouseInFollowArea(Tracking));
+            updateTracking(IsMouseInFollowArea(Tracking));
         }
 
         public void PostProcessHeadJudgement(DrawableSliderHead head)
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (!head.Judged || !head.Result.IsHit)
                 return;
 
-            if (!isMouseInFollowArea(true))
+            if (!IsMouseInFollowArea(true))
                 return;
 
             Debug.Assert(screenSpaceMousePosition != null);
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             // If all ticks were hit so far, enable tracking the full extent.
             // If any ticks were missed, assume tracking would've broken at some point, and should only activate if the cursor is within the slider ball.
             // For the second case, this may be the last chance we have to enable tracking before other objects get judged, otherwise the same would normally happen via Update().
-            updateTracking(allTicksInRange || isMouseInFollowArea(false));
+            updateTracking(allTicksInRange || IsMouseInFollowArea(false));
         }
 
         public void TryJudgeNestedObject(DrawableOsuHitObject nestedObject, double timeOffset)
@@ -174,7 +174,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// Whether the mouse is currently in the follow area.
         /// </summary>
         /// <param name="expanded">Whether to test against the maximum area of the follow circle.</param>
-        private bool isMouseInFollowArea(bool expanded)
+        public bool IsMouseInFollowArea(bool expanded)
         {
             if (screenSpaceMousePosition is not Vector2 pos)
                 return false;

From 6cb82310549a73ca2657efe65c9528da8367f1ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 22 Dec 2023 13:22:26 +0100
Subject: [PATCH 2108/2296] Add test coverage for failure case

---
 .../Mods/TestSceneOsuModStrictTracking.cs     | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs
new file mode 100644
index 0000000000..726b415977
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModStrictTracking.cs
@@ -0,0 +1,53 @@
+// 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.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public partial class TestSceneOsuModStrictTracking : OsuModTestScene
+    {
+        [Test]
+        public void TestSliderInput() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModStrictTracking(),
+            Autoplay = false,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 1000,
+                        Path = new SliderPath
+                        {
+                            ControlPoints =
+                            {
+                                new PathControlPoint(),
+                                new PathControlPoint(new Vector2(0, 100))
+                            }
+                        }
+                    }
+                }
+            },
+            ReplayFrames = new List<ReplayFrame>
+            {
+                new OsuReplayFrame(0, new Vector2(), OsuAction.LeftButton),
+                new OsuReplayFrame(500, new Vector2(200, 0), OsuAction.LeftButton),
+                new OsuReplayFrame(501, new Vector2(200, 0)),
+                new OsuReplayFrame(1000, new Vector2(), OsuAction.LeftButton),
+                new OsuReplayFrame(1750, new Vector2(0, 100), OsuAction.LeftButton),
+                new OsuReplayFrame(1751, new Vector2(0, 100)),
+            },
+            PassCondition = () => Player.ScoreProcessor.Combo.Value == 2
+        });
+    }
+}

From 30553dc7b839600145ac57bd789b7e9992c34dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 22 Dec 2023 13:38:07 +0100
Subject: [PATCH 2109/2296] Fix strict tracking mod forcefully missing tail
 before slider start time

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

Regressed in https://github.com/ppy/osu/pull/25748.

The reason this broke is that allowing the state of `Tracking` to change
before the slider's start time to support the early hit scenario causes
strict tracking to consider loss of tracking before the slider's start
time as an actual miss, and thus forcefully miss the tail
(see test case in 6cb82310549a73ca2657efe65c9528da8367f1ab).
---
 osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
index c465ab8732..2c9292c58b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModStrictTracking.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Rulesets.Osu.Mods
                 {
                     if (e.NewValue || slider.Judged) return;
 
+                    if (slider.Time.Current < slider.HitObject.StartTime)
+                        return;
+
                     var tail = slider.NestedHitObjects.OfType<StrictTrackingDrawableSliderTail>().First();
 
                     if (!tail.Judged)

From 01cf4ee15a8456ccc56381f138dfdf7f210de121 Mon Sep 17 00:00:00 2001
From: Simon G <45692977+jeenyuhs@users.noreply.github.com>
Date: Fri, 22 Dec 2023 18:11:37 +0100
Subject: [PATCH 2110/2296] add test for length updates

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 7cd4f06bce..4e100a37dc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -194,6 +195,36 @@ namespace osu.Game.Tests.Visual.SongSelect
             });
         }
 
+        [TestCase]
+        public void TestLengthUpdates()
+        {
+            IBeatmap beatmap = createTestBeatmap(new OsuRuleset().RulesetInfo);
+            double drain = beatmap.CalculateDrainLength();
+            beatmap.BeatmapInfo.Length = drain;
+
+            OsuModDoubleTime doubleTime = null;
+
+            selectBeatmap(beatmap);
+            checkDisplayedLength(drain);
+
+            AddStep("select DT", () => SelectedMods.Value = new[] { doubleTime = new OsuModDoubleTime() });
+            checkDisplayedLength(Math.Round(drain / 1.5f));
+
+            AddStep("change DT rate", () => doubleTime.SpeedChange.Value = 2);
+            checkDisplayedLength(Math.Round(drain / 2));
+        }
+
+        private void checkDisplayedLength(double drain)
+        {
+            var displayedLength = drain.ToFormattedDuration();
+
+            AddUntilStep($"check map drain ({displayedLength})", () =>
+            {
+                var label = infoWedge.DisplayedContent.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Single(l => l.Statistic.Name == BeatmapsetsStrings.ShowStatsTotalLength(displayedLength));
+                return label.Statistic.Content == displayedLength.ToString();
+            });
+        }
+
         private void setRuleset(RulesetInfo rulesetInfo)
         {
             Container containerBefore = null;

From c5893f245ce7a89d1900dbb620390823702481fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 Dec 2023 14:03:45 +0900
Subject: [PATCH 2111/2296] Change legacy version checks to account for users
 specifying incorrect versions

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs | 2 +-
 osu.Game/Skinning/LegacyJudgementPieceOld.cs                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index d8d86d1802..ef616ae964 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         {
                             decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
 
-                            if (legacyVersion >= 2.0m)
+                            if (legacyVersion > 1.0m)
                                 // legacy skins of version 2.0 and newer only apply very short fade out to the number piece.
                                 hitCircleText.FadeOut(legacy_fade_duration / 4);
                             else
diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index 68274ffa2d..b8fe2f8d06 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
 
                     decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
 
-                    if (legacyVersion >= 2.0m)
+                    if (legacyVersion > 1.0m)
                     {
                         this.MoveTo(new Vector2(0, -5));
                         this.MoveToOffset(new Vector2(0, 80), fade_out_delay + fade_out_length, Easing.In);

From 9f34dfa2baa7e649d43ad74a444fa32df7b172e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 Dec 2023 16:25:52 +0900
Subject: [PATCH 2112/2296] Add missing using statement

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 4e100a37dc..fd102da026 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Extensions;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;

From 8349cb7bbe4f30777f73cbf7c18f071997bd185c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 Dec 2023 17:03:57 +0900
Subject: [PATCH 2113/2296] Fix hard crash when attempting to change folder
 location during a large import

Closes https://github.com/ppy/osu/issues/26067.
---
 osu.Game/OsuGameBase.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 2d8024a45a..48548dc1ef 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -527,14 +527,21 @@ namespace osu.Game
             {
                 ManualResetEventSlim readyToRun = new ManualResetEventSlim();
 
+                bool success = false;
+
                 Scheduler.Add(() =>
                 {
-                    realmBlocker = realm.BlockAllOperations("migration");
+                    try
+                    {
+                        realmBlocker = realm.BlockAllOperations("migration");
+                        success = true;
+                    }
+                    catch { }
 
                     readyToRun.Set();
                 }, false);
 
-                if (!readyToRun.Wait(30000))
+                if (!readyToRun.Wait(30000) || !success)
                     throw new TimeoutException("Attempting to block for migration took too long.");
 
                 bool? cleanupSucceded = (Storage as OsuStorage)?.Migrate(Host.GetStorage(path));

From 27a9dcc5a1a375e7d0591c90880ccb09fd8c0042 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 Dec 2023 19:55:05 +0900
Subject: [PATCH 2114/2296] Add basic hotkey offset adjust support (via
 existing offset control)

---
 .../Input/Bindings/GlobalActionContainer.cs   |  8 ++
 .../GlobalActionKeyBindingStrings.cs          | 10 +++
 .../PlayerSettings/BeatmapOffsetControl.cs    | 73 +++++++++++++------
 3 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 947cd5f54f..5a39c02185 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -160,6 +160,8 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.Enter, GlobalAction.ToggleChatFocus),
             new KeyBinding(InputKey.F1, GlobalAction.SaveReplay),
             new KeyBinding(InputKey.F2, GlobalAction.ExportReplay),
+            new KeyBinding(InputKey.Plus, GlobalAction.IncreaseOffset),
+            new KeyBinding(InputKey.Minus, GlobalAction.DecreaseOffset),
         };
 
         private static IEnumerable<KeyBinding> replayKeyBindings => new[]
@@ -404,6 +406,12 @@ namespace osu.Game.Input.Bindings
 
         [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorToggleRotateControl))]
         EditorToggleRotateControl,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.IncreaseOffset))]
+        IncreaseOffset,
+
+        [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.DecreaseOffset))]
+        DecreaseOffset
     }
 
     public enum GlobalActionCategory
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index 8356c480dd..ca27d0ff95 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -344,6 +344,16 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ExportReplay => new TranslatableString(getKey(@"export_replay"), @"Export replay");
 
+        /// <summary>
+        /// "Increase offset"
+        /// </summary>
+        public static LocalisableString IncreaseOffset => new TranslatableString(getKey(@"increase_offset"), @"Increase offset");
+
+        /// <summary>
+        /// "Decrease offset"
+        /// </summary>
+        public static LocalisableString DecreaseOffset => new TranslatableString(getKey(@"decrease_offset"), @"Decrease offset");
+
         /// <summary>
         /// "Toggle rotate control"
         /// </summary>
diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index 840077eb7f..b4bb35377d 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -9,6 +9,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -16,6 +18,7 @@ using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Mods;
@@ -26,7 +29,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Play.PlayerSettings
 {
-    public partial class BeatmapOffsetControl : CompositeDrawable
+    public partial class BeatmapOffsetControl : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         public Bindable<ScoreInfo?> ReferenceScore { get; } = new Bindable<ScoreInfo?>();
 
@@ -88,28 +91,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
             };
         }
 
-        public partial class OffsetSliderBar : PlayerSliderBar<double>
-        {
-            protected override Drawable CreateControl() => new CustomSliderBar();
-
-            protected partial class CustomSliderBar : SliderBar
-            {
-                public override LocalisableString TooltipText =>
-                    Current.Value == 0
-                        ? LocalisableString.Interpolate($@"{base.TooltipText} ms")
-                        : LocalisableString.Interpolate($@"{base.TooltipText} ms {getEarlyLateText(Current.Value)}");
-
-                private LocalisableString getEarlyLateText(double value)
-                {
-                    Debug.Assert(value != 0);
-
-                    return value > 0
-                        ? BeatmapOffsetControlStrings.HitObjectsAppearEarlier
-                        : BeatmapOffsetControlStrings.HitObjectsAppearLater;
-                }
-            }
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -243,5 +224,51 @@ namespace osu.Game.Screens.Play.PlayerSettings
             base.Dispose(isDisposing);
             beatmapOffsetSubscription?.Dispose();
         }
+
+        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            double amount = e.AltPressed ? 1 : 5;
+
+            switch (e.Action)
+            {
+                case GlobalAction.IncreaseOffset:
+                    Current.Value += amount;
+
+                    return true;
+
+                case GlobalAction.DecreaseOffset:
+                    Current.Value -= amount;
+
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+        }
+
+        public partial class OffsetSliderBar : PlayerSliderBar<double>
+        {
+            protected override Drawable CreateControl() => new CustomSliderBar();
+
+            protected partial class CustomSliderBar : SliderBar
+            {
+                public override LocalisableString TooltipText =>
+                    Current.Value == 0
+                        ? LocalisableString.Interpolate($@"{base.TooltipText} ms")
+                        : LocalisableString.Interpolate($@"{base.TooltipText} ms {getEarlyLateText(Current.Value)}");
+
+                private LocalisableString getEarlyLateText(double value)
+                {
+                    Debug.Assert(value != 0);
+
+                    return value > 0
+                        ? BeatmapOffsetControlStrings.HitObjectsAppearEarlier
+                        : BeatmapOffsetControlStrings.HitObjectsAppearLater;
+                }
+            }
+        }
     }
 }

From 7e9522a722fd01ca872877e1e3b4bcfeb61c8a2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 Dec 2023 20:46:12 +0900
Subject: [PATCH 2115/2296] Allow external use of offset text explanation

---
 .../PlayerSettings/BeatmapOffsetControl.cs    | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index b4bb35377d..80549343a5 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -233,12 +233,10 @@ namespace osu.Game.Screens.Play.PlayerSettings
             {
                 case GlobalAction.IncreaseOffset:
                     Current.Value += amount;
-
                     return true;
 
                 case GlobalAction.DecreaseOffset:
                     Current.Value -= amount;
-
                     return true;
             }
 
@@ -249,25 +247,29 @@ namespace osu.Game.Screens.Play.PlayerSettings
         {
         }
 
+        public static LocalisableString GetOffsetExplanatoryText(double offset)
+        {
+            return offset == 0
+                ? LocalisableString.Interpolate($@"{offset:0.0} ms")
+                : LocalisableString.Interpolate($@"{offset:0.0} ms {getEarlyLateText(offset)}");
+
+            LocalisableString getEarlyLateText(double value)
+            {
+                Debug.Assert(value != 0);
+
+                return value > 0
+                    ? BeatmapOffsetControlStrings.HitObjectsAppearEarlier
+                    : BeatmapOffsetControlStrings.HitObjectsAppearLater;
+            }
+        }
+
         public partial class OffsetSliderBar : PlayerSliderBar<double>
         {
             protected override Drawable CreateControl() => new CustomSliderBar();
 
             protected partial class CustomSliderBar : SliderBar
             {
-                public override LocalisableString TooltipText =>
-                    Current.Value == 0
-                        ? LocalisableString.Interpolate($@"{base.TooltipText} ms")
-                        : LocalisableString.Interpolate($@"{base.TooltipText} ms {getEarlyLateText(Current.Value)}");
-
-                private LocalisableString getEarlyLateText(double value)
-                {
-                    Debug.Assert(value != 0);
-
-                    return value > 0
-                        ? BeatmapOffsetControlStrings.HitObjectsAppearEarlier
-                        : BeatmapOffsetControlStrings.HitObjectsAppearLater;
-                }
+                public override LocalisableString TooltipText => GetOffsetExplanatoryText(Current.Value);
             }
         }
     }

From 6f11885d4bedc303859964ab1415a2f1959e9bda Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 Dec 2023 20:46:22 +0900
Subject: [PATCH 2116/2296] Add control to allow changing offset from gameplay

---
 .../Screens/Play/GameplayOffsetControl.cs     | 104 ++++++++++++++++++
 osu.Game/Screens/Play/Player.cs               |   6 +
 2 files changed, 110 insertions(+)
 create mode 100644 osu.Game/Screens/Play/GameplayOffsetControl.cs

diff --git a/osu.Game/Screens/Play/GameplayOffsetControl.cs b/osu.Game/Screens/Play/GameplayOffsetControl.cs
new file mode 100644
index 0000000000..3f5a5bef2a
--- /dev/null
+++ b/osu.Game/Screens/Play/GameplayOffsetControl.cs
@@ -0,0 +1,104 @@
+// 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.Threading;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
+using osu.Game.Screens.Play.PlayerSettings;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Play
+{
+    /// <summary>
+    /// This provides the ability to change the offset while in gameplay.
+    /// Eventually this should be replaced with all settings from PlayerLoader being accessible from the game.
+    /// </summary>
+    internal partial class GameplayOffsetControl : VisibilityContainer
+    {
+        protected override bool StartHidden => true;
+
+        public override bool PropagateNonPositionalInputSubTree => true;
+
+        private BeatmapOffsetControl offsetControl = null!;
+
+        private OsuTextFlowContainer text = null!;
+
+        private ScheduledDelegate? hideOp;
+
+        public GameplayOffsetControl()
+        {
+            AutoSizeAxes = Axes.Y;
+            Width = SettingsToolboxGroup.CONTAINER_WIDTH;
+
+            Masking = true;
+            CornerRadius = 5;
+
+            // Allow BeatmapOffsetControl to handle keyboard input.
+            AlwaysPresent = true;
+
+            Anchor = Anchor.CentreRight;
+            Origin = Anchor.CentreRight;
+
+            X = 100;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider? colourProvider)
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.8f,
+                    Colour = colourProvider?.Background4 ?? Color4.Black,
+                },
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding(10),
+                    Spacing = new Vector2(5),
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        offsetControl = new BeatmapOffsetControl(),
+                        text = new OsuTextFlowContainer(cp => cp.Font = OsuFont.Default.With(weight: FontWeight.SemiBold))
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            TextAnchor = Anchor.TopCentre,
+                        }
+                    }
+                },
+            };
+
+            offsetControl.Current.BindValueChanged(val =>
+            {
+                text.Text = BeatmapOffsetControl.GetOffsetExplanatoryText(val.NewValue);
+                Show();
+
+                hideOp?.Cancel();
+                hideOp = Scheduler.AddDelayed(Hide, 500);
+            });
+        }
+
+        protected override void PopIn()
+        {
+            this.FadeIn(500, Easing.OutQuint)
+                .MoveToX(0, 500, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            this.FadeOut(500, Easing.InQuint)
+                .MoveToX(100, 500, Easing.InQuint);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c9251b0a78..c960ac357f 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -461,6 +461,12 @@ namespace osu.Game.Screens.Play
                         OnRetry = () => Restart(),
                         OnQuit = () => PerformExit(true),
                     },
+                    new GameplayOffsetControl
+                    {
+                        Margin = new MarginPadding(20),
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                    }
                 },
             };
 

From a2e5f624789d852a23d555e12b5dd962ad6f7712 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 Dec 2023 21:07:17 +0900
Subject: [PATCH 2117/2296] Fix user profile cover showing 1px line when
 contracted

Addresses https://github.com/ppy/osu/discussions/26068.
---
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 36bd8a5af5..c9e5068b2a 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -232,6 +232,14 @@ namespace osu.Game.Overlays.Profile.Header
             bool expanded = coverToggle.CoverExpanded.Value;
 
             cover.ResizeHeightTo(expanded ? 250 : 0, transition_duration, Easing.OutQuint);
+
+            // Without this a very tiny slither of the cover will be visible even with a size of zero.
+            // Integer masking woes, no doubt.
+            if (expanded)
+                cover.FadeIn(transition_duration, Easing.OutQuint);
+            else
+                cover.FadeOut(transition_duration, Easing.InQuint);
+
             avatar.ResizeTo(new Vector2(expanded ? 120 : content_height), transition_duration, Easing.OutQuint);
             avatar.TransformTo(nameof(avatar.CornerRadius), expanded ? 40f : 20f, transition_duration, Easing.OutQuint);
             flow.TransformTo(nameof(flow.Spacing), new Vector2(expanded ? 20f : 10f), transition_duration, Easing.OutQuint);

From 007ea51e202d546e813725991221436066c3db74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Dec 2023 13:07:29 +0100
Subject: [PATCH 2118/2296] Add extra safety against returning negative total
 score in conversion operation

---
 .../StandardisedScoreMigrationTools.cs        | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 380bf63e63..5cd2a2f29c 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -321,6 +321,8 @@ namespace osu.Game.Database
 
             double modMultiplier = score.Mods.Select(m => m.ScoreMultiplier).Aggregate(1.0, (c, n) => c * n);
 
+            long convertedTotalScore;
+
             switch (score.Ruleset.OnlineID)
             {
                 case 0:
@@ -417,32 +419,42 @@ namespace osu.Game.Database
 
                     double newComboScoreProportion = estimatedComboPortionInStandardisedScore / maximumAchievableComboPortionInStandardisedScore;
 
-                    return (long)Math.Round((
+                    convertedTotalScore = (long)Math.Round((
                         500000 * newComboScoreProportion * score.Accuracy
                         + 500000 * Math.Pow(score.Accuracy, 5)
                         + bonusProportion) * modMultiplier);
+                    break;
 
                 case 1:
-                    return (long)Math.Round((
+                    convertedTotalScore = (long)Math.Round((
                         250000 * comboProportion
                         + 750000 * Math.Pow(score.Accuracy, 3.6)
                         + bonusProportion) * modMultiplier);
+                    break;
 
                 case 2:
-                    return (long)Math.Round((
+                    convertedTotalScore = (long)Math.Round((
                         600000 * comboProportion
                         + 400000 * score.Accuracy
                         + bonusProportion) * modMultiplier);
+                    break;
 
                 case 3:
-                    return (long)Math.Round((
+                    convertedTotalScore = (long)Math.Round((
                         850000 * comboProportion
                         + 150000 * Math.Pow(score.Accuracy, 2 + 2 * score.Accuracy)
                         + bonusProportion) * modMultiplier);
+                    break;
 
                 default:
-                    return score.TotalScore;
+                    convertedTotalScore = score.TotalScore;
+                    break;
             }
+
+            if (convertedTotalScore < 0)
+                throw new InvalidOperationException($"Total score conversion operation returned invalid total of {convertedTotalScore}");
+
+            return convertedTotalScore;
         }
 
         public static double ComputeAccuracy(ScoreInfo scoreInfo)

From 15a9740eb65f39dbc3e58c55ad146e3103d483a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 Dec 2023 21:12:47 +0900
Subject: [PATCH 2119/2296] Change "cinema" mod to never fail

Addresses https://github.com/ppy/osu/discussions/26032.
---
 osu.Game/Rulesets/Mods/ModCinema.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index ae661c5f25..a942bcc678 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mods
         }
     }
 
-    public class ModCinema : ModAutoplay, IApplicableToHUD, IApplicableToPlayer
+    public class ModCinema : ModAutoplay, IApplicableToHUD, IApplicableToPlayer, IApplicableFailOverride
     {
         public override string Name => "Cinema";
         public override string Acronym => "CN";
@@ -45,5 +45,9 @@ namespace osu.Game.Rulesets.Mods
 
             player.BreakOverlay.Hide();
         }
+
+        public bool PerformFail() => false;
+
+        public bool RestartOnFail => false;
     }
 }

From 644c9816739b2aadfcdb9b5e14d438a0cae81313 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 23 Dec 2023 21:21:34 +0900
Subject: [PATCH 2120/2296] Fix "spectate" button not always being clickable in
 online users list

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

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
index fe3151398f..37ea3f9c38 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -218,6 +219,7 @@ namespace osu.Game.Overlays.Dashboard
             {
                 panel.Anchor = Anchor.TopCentre;
                 panel.Origin = Anchor.TopCentre;
+                panel.CanSpectate.Value = playingUsers.Contains(user.Id);
             });
 
         public partial class OnlineUserPanel : CompositeDrawable, IFilterable

From 3a2ed3677b75bbbf8ec1683be7ecd8eb6e0a3e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Dec 2023 13:25:20 +0100
Subject: [PATCH 2121/2296] Fix standardised score conversion failing for
 scores set with 0.0x mod mutliplier

Closes https://github.com/ppy/osu/issues/26073.
---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 8 ++++++--
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs        | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 5cd2a2f29c..66c816e796 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -312,8 +312,12 @@ namespace osu.Game.Database
 
             double legacyAccScore = maximumLegacyAccuracyScore * score.Accuracy;
             // We can not separate the ComboScore from the BonusScore, so we keep the bonus in the ratio.
-            double comboProportion =
-                ((double)score.LegacyTotalScore - legacyAccScore) / (maximumLegacyComboScore + maximumLegacyBonusScore);
+            // Note that `maximumLegacyComboScore + maximumLegacyBonusScore` can actually be 0
+            // when playing a beatmap with no bonus objects, with mods that have a 0.0x multiplier on stable (relax/autopilot).
+            // In such cases, just assume 0.
+            double comboProportion = maximumLegacyComboScore + maximumLegacyBonusScore > 0
+                ? ((double)score.LegacyTotalScore - legacyAccScore) / (maximumLegacyComboScore + maximumLegacyBonusScore)
+                : 0;
 
             // We assume the bonus proportion only makes up the rest of the score that exceeds maximumLegacyBaseScore.
             long maximumLegacyBaseScore = maximumLegacyAccuracyScore + maximumLegacyComboScore;
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index dbd9a106df..cf0a7bd54f 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -35,9 +35,10 @@ namespace osu.Game.Scoring.Legacy
         /// <item><description>30000006: Fix edge cases in conversion after combo exponent introduction that lead to NaNs. Reconvert all scores.</description></item>
         /// <item><description>30000007: Adjust osu!mania combo and accuracy portions and judgement scoring values. Reconvert all scores.</description></item>
         /// <item><description>30000008: Add accuracy conversion. Reconvert all scores.</description></item>
+        /// <item><description>30000009: Fix edge cases in conversion for scores which have 0.0x mod multiplier on stable. Reconvert all scores.</description></item>
         /// </list>
         /// </remarks>
-        public const int LATEST_VERSION = 30000008;
+        public const int LATEST_VERSION = 30000009;
 
         /// <summary>
         /// The first stable-compatible YYYYMMDD format version given to lazer usage of replays.

From 32d8ee2d0c30b4922ac96bb172959ea375cd2e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Dec 2023 13:42:19 +0100
Subject: [PATCH 2122/2296] Add test coverage

---
 .../Online/TestSceneCurrentlyOnlineDisplay.cs     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs
index 7687cd195d..b696c5d8ca 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyOnlineDisplay.cs
@@ -81,6 +81,21 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("End watching user presence", () => metadataClient.EndWatchingUserPresence());
         }
 
+        [Test]
+        public void TestUserWasPlayingBeforeWatchingUserPresence()
+        {
+            AddStep("User began playing", () => spectatorClient.SendStartPlay(streamingUser.Id, 0));
+            AddStep("Begin watching user presence", () => metadataClient.BeginWatchingUserPresence());
+            AddStep("Add online user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, new UserPresence { Status = UserStatus.Online, Activity = new UserActivity.ChoosingBeatmap() }));
+            AddUntilStep("Panel loaded", () => currentlyOnline.ChildrenOfType<UserGridPanel>().FirstOrDefault()?.User.Id == 2);
+            AddAssert("Spectate button enabled", () => currentlyOnline.ChildrenOfType<PurpleRoundedButton>().First().Enabled.Value, () => Is.True);
+
+            AddStep("User finished playing", () => spectatorClient.SendEndPlay(streamingUser.Id));
+            AddAssert("Spectate button disabled", () => currentlyOnline.ChildrenOfType<PurpleRoundedButton>().First().Enabled.Value, () => Is.False);
+            AddStep("Remove playing user", () => metadataClient.UserPresenceUpdated(streamingUser.Id, null));
+            AddStep("End watching user presence", () => metadataClient.EndWatchingUserPresence());
+        }
+
         internal partial class TestUserLookupCache : UserLookupCache
         {
             private static readonly string[] usernames =

From 0cbf594a8c151e3699ca15431e29d3dac96f2016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Dec 2023 15:10:31 +0100
Subject: [PATCH 2123/2296] Make cinema mod incompatible with no fail

---
 osu.Game/Rulesets/Mods/ModCinema.cs | 2 +-
 osu.Game/Rulesets/Mods/ModNoFail.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index a942bcc678..dbb37e0af6 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => OsuIcon.ModCinema;
         public override LocalisableString Description => "Watch the video without visual distractions.";
 
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModAutoplay)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(ModAutoplay), typeof(ModNoFail) }).ToArray();
 
         public void ApplyToHUD(HUDOverlay overlay)
         {
diff --git a/osu.Game/Rulesets/Mods/ModNoFail.cs b/osu.Game/Rulesets/Mods/ModNoFail.cs
index 0cf81bf4c9..cc451772b2 100644
--- a/osu.Game/Rulesets/Mods/ModNoFail.cs
+++ b/osu.Game/Rulesets/Mods/ModNoFail.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyReduction;
         public override LocalisableString Description => "You can't fail, no matter what.";
         public override double ScoreMultiplier => 0.5;
-        public override Type[] IncompatibleMods => new[] { typeof(ModFailCondition) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModFailCondition), typeof(ModCinema) };
 
         private readonly Bindable<bool> showHealthBar = new Bindable<bool>();
 

From d1000b2e6c527f170e9fd1dd525d2ba296c31f17 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 23 Dec 2023 23:36:15 +0900
Subject: [PATCH 2124/2296] remove HP density

---
 .../Scoring/OsuHealthProcessor.cs             |  2 -
 .../Scoring/DrainingHealthProcessor.cs        | 42 ++-----------------
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 5ae5766cda..7463bb565c 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Rulesets.Osu.Scoring
         {
         }
 
-        protected override int? GetDensityGroup(HitObject hitObject) => (hitObject as IHasComboInformation)?.ComboIndex;
-
         protected override double GetHealthIncreaseFor(JudgementResult result)
         {
             switch (result.Type)
diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index 4f6f8598fb..629a84ea62 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -62,7 +62,6 @@ namespace osu.Game.Rulesets.Scoring
         protected readonly double DrainLenience;
 
         private readonly List<HealthIncrease> healthIncreases = new List<HealthIncrease>();
-        private readonly Dictionary<int, double> densityMultiplierByGroup = new Dictionary<int, double>();
 
         private double gameplayEndTime;
         private double targetMinimumHealth;
@@ -139,29 +138,14 @@ namespace osu.Game.Rulesets.Scoring
             {
                 healthIncreases.Add(new HealthIncrease(
                     result.HitObject.GetEndTime() + result.TimeOffset,
-                    GetHealthIncreaseFor(result),
-                    GetDensityGroup(result.HitObject)));
+                    GetHealthIncreaseFor(result)));
             }
         }
 
-        protected override double GetHealthIncreaseFor(JudgementResult result) => base.GetHealthIncreaseFor(result) * getDensityMultiplier(GetDensityGroup(result.HitObject));
-
-        private double getDensityMultiplier(int? group)
-        {
-            if (group == null)
-                return 1;
-
-            return densityMultiplierByGroup.TryGetValue(group.Value, out double multiplier) ? multiplier : 1;
-        }
-
-        protected virtual int? GetDensityGroup(HitObject hitObject) => null;
-
         protected override void Reset(bool storeResults)
         {
             base.Reset(storeResults);
 
-            densityMultiplierByGroup.Clear();
-
             if (storeResults)
                 DrainRate = ComputeDrainRate();
 
@@ -173,24 +157,6 @@ namespace osu.Game.Rulesets.Scoring
             if (healthIncreases.Count <= 1)
                 return 0;
 
-            // Normalise the health gain during sections with higher densities.
-            (int group, double avgIncrease)[] avgIncreasesByGroup = healthIncreases
-                                                                    .Where(i => i.Group != null)
-                                                                    .GroupBy(i => i.Group)
-                                                                    .Select(g => ((int)g.Key!, g.Sum(i => i.Amount) / (g.Max(i => i.Time) - g.Min(i => i.Time) + 1)))
-                                                                    .ToArray();
-
-            if (avgIncreasesByGroup.Length > 1)
-            {
-                double overallAverageIncrease = avgIncreasesByGroup.Average(g => g.avgIncrease);
-
-                foreach ((int group, double avgIncrease) in avgIncreasesByGroup)
-                {
-                    // Reduce the health increase for groups that return more health than average.
-                    densityMultiplierByGroup[group] = Math.Min(1, overallAverageIncrease / avgIncrease);
-                }
-            }
-
             int adjustment = 1;
             double result = 1;
 
@@ -216,12 +182,10 @@ namespace osu.Game.Rulesets.Scoring
                         currentBreak++;
                     }
 
-                    double multiplier = getDensityMultiplier(healthIncreases[i].Group);
-
                     // Apply health adjustments
                     currentHealth -= (currentTime - lastTime) * result;
                     lowestHealth = Math.Min(lowestHealth, currentHealth);
-                    currentHealth = Math.Min(1, currentHealth + healthIncreases[i].Amount * multiplier);
+                    currentHealth = Math.Min(1, currentHealth + healthIncreases[i].Amount);
 
                     // Common scenario for when the drain rate is definitely too harsh
                     if (lowestHealth < 0)
@@ -240,6 +204,6 @@ namespace osu.Game.Rulesets.Scoring
             return result;
         }
 
-        private record struct HealthIncrease(double Time, double Amount, int? Group);
+        private record struct HealthIncrease(double Time, double Amount);
     }
 }

From 00090bc527989b6caa094a40caf67023aeb352b3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 23 Dec 2023 23:36:24 +0900
Subject: [PATCH 2125/2296] Add combo end bonus to HP

---
 .../Scoring/OsuHealthProcessor.cs             | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 7463bb565c..672a8c91ba 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.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;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 
@@ -12,12 +14,68 @@ namespace osu.Game.Rulesets.Osu.Scoring
 {
     public partial class OsuHealthProcessor : DrainingHealthProcessor
     {
+        private ComboResult currentComboResult = ComboResult.Perfect;
+
         public OsuHealthProcessor(double drainStartTime, double drainLenience = 0)
             : base(drainStartTime, drainLenience)
         {
         }
 
         protected override double GetHealthIncreaseFor(JudgementResult result)
+        {
+            if (IsSimulating)
+                return getHealthIncreaseFor(result);
+
+            if (result.HitObject is not IHasComboInformation combo)
+                return getHealthIncreaseFor(result);
+
+            if (combo.NewCombo)
+                currentComboResult = ComboResult.Perfect;
+
+            switch (result.Type)
+            {
+                case HitResult.LargeTickMiss:
+                case HitResult.Ok:
+                    setComboResult(ComboResult.Good);
+                    break;
+
+                case HitResult.Meh:
+                case HitResult.Miss:
+                    setComboResult(ComboResult.None);
+                    break;
+            }
+
+            // The tail has a special IgnoreMiss judgement
+            if (result.HitObject is SliderTailCircle && !result.IsHit)
+                setComboResult(ComboResult.Good);
+
+            if (combo.LastInCombo && result.Type.IsHit())
+            {
+                switch (currentComboResult)
+                {
+                    case ComboResult.Perfect:
+                        return getHealthIncreaseFor(result) + 0.07;
+
+                    case ComboResult.Good:
+                        return getHealthIncreaseFor(result) + 0.05;
+
+                    default:
+                        return getHealthIncreaseFor(result) + 0.03;
+                }
+            }
+
+            return getHealthIncreaseFor(result);
+
+            void setComboResult(ComboResult comboResult) => currentComboResult = (ComboResult)Math.Min((int)currentComboResult, (int)comboResult);
+        }
+
+        protected override void Reset(bool storeResults)
+        {
+            base.Reset(storeResults);
+            currentComboResult = ComboResult.Perfect;
+        }
+
+        private double getHealthIncreaseFor(JudgementResult result)
         {
             switch (result.Type)
             {

From 8b11bcc6ea617bbb689b793443a90b977ae2d5e9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 24 Dec 2023 00:08:15 +0900
Subject: [PATCH 2126/2296] Remove unused using

---
 osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 672a8c91ba..bd6281a7d3 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -4,7 +4,6 @@
 using System;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;

From 7437d21f498cca28084c7ed70341e714392e0690 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 24 Dec 2023 00:45:22 +0900
Subject: [PATCH 2127/2296] Adjust comment regarding slider tail

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

diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index bd6281a7d3..2eb257b3e6 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     break;
             }
 
-            // The tail has a special IgnoreMiss judgement
+            // The slider tail has a special judgement that can't accurately be described above.
             if (result.HitObject is SliderTailCircle && !result.IsHit)
                 setComboResult(ComboResult.Good);
 

From 92b490f2e79d850980fa9e681f7c62c1ba1d5692 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 Dec 2023 01:59:48 +0900
Subject: [PATCH 2128/2296] Don't bother with alt support for now

---
 osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index 80549343a5..80003aeaba 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -227,7 +227,10 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
-            double amount = e.AltPressed ? 1 : 5;
+            // To match stable, this should adjust by 5 ms, or 1 ms when holding alt.
+            // But that is hard to make work with global actions due to the operating mode.
+            // Let's use the more precise as a default for now.
+            const double amount = 1;
 
             switch (e.Action)
             {

From 72bec527fd06714bd0b88f56ff1d7538bbf37710 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 Dec 2023 02:36:27 +0900
Subject: [PATCH 2129/2296] Add conditions to match stable offset adjust
 limitations

---
 .../PlayerSettings/BeatmapOffsetControl.cs     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index 80003aeaba..b0e7d08699 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -51,6 +51,12 @@ namespace osu.Game.Screens.Play.PlayerSettings
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
+        [Resolved]
+        private Player? player { get; set; }
+
+        [Resolved]
+        private IGameplayClock? gameplayClock { get; set; }
+
         private double lastPlayAverage;
         private double lastPlayBeatmapOffset;
         private HitEventTimingDistributionGraph? lastPlayGraph;
@@ -227,6 +233,18 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
+            // General limitations to ensure players don't do anything too weird.
+            // These match stable for now.
+            if (player is SubmittingPlayer)
+            {
+                // TODO: the blocking conditions should probably display a message.
+                if (player?.IsBreakTime.Value == false && gameplayClock?.CurrentTime - gameplayClock?.StartTime > 10000)
+                    return false;
+
+                if (gameplayClock?.IsPaused.Value == true)
+                    return false;
+            }
+
             // To match stable, this should adjust by 5 ms, or 1 ms when holding alt.
             // But that is hard to make work with global actions due to the operating mode.
             // Let's use the more precise as a default for now.

From 686b2a4394ac735ef309976910fed859f3f3b779 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 Dec 2023 03:00:51 +0900
Subject: [PATCH 2130/2296] Disable positional interaction for now

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

diff --git a/osu.Game/Screens/Play/GameplayOffsetControl.cs b/osu.Game/Screens/Play/GameplayOffsetControl.cs
index 3f5a5bef2a..2f0cb821ec 100644
--- a/osu.Game/Screens/Play/GameplayOffsetControl.cs
+++ b/osu.Game/Screens/Play/GameplayOffsetControl.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Screens.Play
 
         public override bool PropagateNonPositionalInputSubTree => true;
 
+        // Disable interaction for now to avoid any funny business with slider bar dragging.
+        public override bool PropagatePositionalInputSubTree => false;
+
         private BeatmapOffsetControl offsetControl = null!;
 
         private OsuTextFlowContainer text = null!;

From 5b03dc8d0bb1d189dc68103971fccf41bfc2a008 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 Dec 2023 03:20:42 +0900
Subject: [PATCH 2131/2296] Use a realm subscription to avoid overhead when
 hovering a toolbar button

Addresses https://github.com/ppy/osu/discussions/26018.
---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 08bcb6bd8a..344f7b2018 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -157,6 +157,15 @@ namespace osu.Game.Overlays.Toolbar
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (Hotkey != null)
+            {
+                realm.SubscribeToPropertyChanged(r => r.All<RealmKeyBinding>().FirstOrDefault(rkb => rkb.RulesetName == null && rkb.ActionInt == (int)Hotkey.Value), kb => kb.KeyCombinationString, updateKeyBindingTooltip);
+            }
+        }
+
         protected override bool OnMouseDown(MouseDownEvent e) => false;
 
         protected override bool OnClick(ClickEvent e)
@@ -168,8 +177,6 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool OnHover(HoverEvent e)
         {
-            updateKeyBindingTooltip();
-
             HoverBackground.FadeIn(200);
             tooltipContainer.FadeIn(100);
 
@@ -197,19 +204,12 @@ namespace osu.Game.Overlays.Toolbar
         {
         }
 
-        private void updateKeyBindingTooltip()
+        private void updateKeyBindingTooltip(string keyCombination)
         {
-            if (Hotkey == null) return;
+            string keyBindingString = keyCombinationProvider.GetReadableString(keyCombination);
 
-            var realmKeyBinding = realm.Realm.All<RealmKeyBinding>().FirstOrDefault(rkb => rkb.RulesetName == null && rkb.ActionInt == (int)Hotkey.Value);
-
-            if (realmKeyBinding != null)
-            {
-                string keyBindingString = keyCombinationProvider.GetReadableString(realmKeyBinding.KeyCombination);
-
-                if (!string.IsNullOrEmpty(keyBindingString))
-                    keyBindingTooltip.Text = $" ({keyBindingString})";
-            }
+            if (!string.IsNullOrEmpty(keyBindingString))
+                keyBindingTooltip.Text = $" ({keyBindingString})";
         }
     }
 

From 68430d6ecdbf7810285a818e4f762c07477f6de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Dec 2023 19:39:17 +0100
Subject: [PATCH 2132/2296] Fix toolbar keybinding hint not clearing after
 unbinding the keybinding

---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 344f7b2018..81d2de5acb 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -208,8 +208,9 @@ namespace osu.Game.Overlays.Toolbar
         {
             string keyBindingString = keyCombinationProvider.GetReadableString(keyCombination);
 
-            if (!string.IsNullOrEmpty(keyBindingString))
-                keyBindingTooltip.Text = $" ({keyBindingString})";
+            keyBindingTooltip.Text = !string.IsNullOrEmpty(keyBindingString)
+                ? $" ({keyBindingString})"
+                : string.Empty;
         }
     }
 

From 19d02364185b72e97c157b42f1d668c2fa794dd8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 23 Dec 2023 22:11:00 +0300
Subject: [PATCH 2133/2296] Change mod acronym

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
index f71acf95b8..b70d607ca1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     public class OsuModDepth : ModWithVisibilityAdjustment, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
     {
         public override string Name => "Depth";
-        public override string Acronym => "DH";
+        public override string Acronym => "DP";
         public override IconUsage? Icon => FontAwesome.Solid.Cube;
         public override ModType Type => ModType.Fun;
         public override LocalisableString Description => "3D. Almost.";

From b1d994b6ffb617f12a09aca20cf0482a3b5db2b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Dec 2023 17:17:23 +0900
Subject: [PATCH 2134/2296] Add classic skin sprites for slider tick and slider
 end misses

---
 osu.Game/Skinning/LegacyJudgementPieceOld.cs | 16 +++++++++++++---
 osu.Game/Skinning/LegacySkin.cs              | 13 ++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index b8fe2f8d06..1834a17279 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -58,14 +58,24 @@ namespace osu.Game.Skinning
 
             if (result.IsMiss())
             {
+                decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
+
+                // missed ticks / slider end don't get the normal animation.
                 if (isMissedTick())
-                    applyMissedTickScaling();
-                else
                 {
                     this.ScaleTo(1.6f);
                     this.ScaleTo(1, 100, Easing.In);
 
-                    decimal? legacyVersion = skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value;
+                    if (legacyVersion > 1.0m)
+                    {
+                        this.MoveTo(new Vector2(0, -2f));
+                        this.MoveToOffset(new Vector2(0, 10), fade_out_delay + fade_out_length, Easing.In);
+                    }
+                }
+                else
+                {
+                    this.ScaleTo(1.6f);
+                    this.ScaleTo(1, 100, Easing.In);
 
                     if (legacyVersion > 1.0m)
                     {
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index a37a386889..270abe2849 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -453,11 +453,18 @@ namespace osu.Game.Skinning
 
         private Drawable? getJudgementAnimation(HitResult result)
         {
-            if (result.IsMiss())
-                return this.GetAnimation("hit0", true, false);
-
             switch (result)
             {
+                case HitResult.Miss:
+                    return this.GetAnimation("hit0", true, false);
+
+                case HitResult.LargeTickMiss:
+                    return this.GetAnimation("slidertickmiss", true, false);
+
+                case HitResult.ComboBreak:
+                case HitResult.IgnoreMiss:
+                    return this.GetAnimation("sliderendmiss", true, false);
+
                 case HitResult.Meh:
                     return this.GetAnimation("hit50", true, false);
 

From 02c771f540489eedaf56719632f500981b20da6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Dec 2023 17:27:15 +0900
Subject: [PATCH 2135/2296] Add warning for linux users about to report a
 non-bug as a bug

---
 .github/ISSUE_TEMPLATE/bug-issue.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug-issue.yml b/.github/ISSUE_TEMPLATE/bug-issue.yml
index 00a873f9c8..dfdcf8d320 100644
--- a/.github/ISSUE_TEMPLATE/bug-issue.yml
+++ b/.github/ISSUE_TEMPLATE/bug-issue.yml
@@ -11,6 +11,10 @@ body:
         - Current open `priority:0` issues, filterable [here](https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Apriority%3A0).
         - And most importantly, search for your issue both in the [issue listing](https://github.com/ppy/osu/issues) and the [Q&A discussion listing](https://github.com/ppy/osu/discussions/categories/q-a). If you find that it already exists, respond with a reaction or add any further information that may be helpful.
 
+        # ATTENTION LINUX USERS
+
+        If you are having an issue and it is hardware related, **please open a [q&a discussion](https://github.com/ppy/osu/discussions/categories/q-a)** instead of an issue. There's a high chance your issue is due to your system configuration, and not our software.
+
   - type: dropdown
     attributes:
       label: Type

From 8e6ea2dd9b098aa41f32d54a3c953218aee459fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Dec 2023 17:32:30 +0900
Subject: [PATCH 2136/2296] Update argon and triangles to match display style

---
 .../Skinning/Argon/ArgonJudgementPiece.cs         | 11 ++++++++++-
 .../Rulesets/Judgements/DefaultJudgementPiece.cs  | 15 ++++++++++++++-
 osu.Game/Rulesets/Scoring/HitResult.cs            |  4 ++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
index edeece0293..bb61bd37c1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
@@ -62,7 +62,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         /// </remarks>
         public virtual void PlayAnimation()
         {
-            if (Result.IsMiss())
+            if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss)
+            {
+                this.RotateTo(-45);
+                this.ScaleTo(1.8f);
+                this.ScaleTo(1.2f, 100, Easing.In);
+
+                this.MoveTo(Vector2.Zero);
+                this.MoveToOffset(new Vector2(0, 10), 800, Easing.InQuint);
+            }
+            else if (Result.IsMiss())
             {
                 this.ScaleTo(1.6f);
                 this.ScaleTo(1, 100, Easing.In);
diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index 3c5e37f91c..ada651b60e 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -38,7 +38,20 @@ namespace osu.Game.Rulesets.Judgements
         /// </remarks>
         public virtual void PlayAnimation()
         {
-            if (Result != HitResult.None && !Result.IsHit())
+            // TODO: make these better. currently they are using a text `-` and it's not centered properly.
+            // Should be an explicit drawable.
+            //
+            // When this is done, remove the [Description] attributes from HitResults which were added for this purpose.
+            if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss)
+            {
+                this.RotateTo(-45);
+                this.ScaleTo(1.8f);
+                this.ScaleTo(1.2f, 100, Easing.In);
+
+                this.MoveTo(Vector2.Zero);
+                this.MoveToOffset(new Vector2(0, 10), 800, Easing.InQuint);
+            }
+            else if (Result.IsMiss())
             {
                 this.ScaleTo(1.6f);
                 this.ScaleTo(1, 100, Easing.In);
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index e174ebd00f..2d55f1a649 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Indicates a large tick miss.
         /// </summary>
         [EnumMember(Value = "large_tick_miss")]
-        [Description(@"x")]
+        [Description("-")]
         [Order(10)]
         LargeTickMiss,
 
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Scoring
         /// Indicates a miss that should be ignored for scoring purposes.
         /// </summary>
         [EnumMember(Value = "ignore_miss")]
-        [Description("x")]
+        [Description("-")]
         [Order(13)]
         IgnoreMiss,
 

From 8142a7cb7e82d7053004cd6e4b2f62e74254ed57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 25 Dec 2023 14:00:32 +0100
Subject: [PATCH 2137/2296] Remove incorrect spec

---
 osu.Game/Skinning/LegacySkin.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 270abe2849..8f0cd59b68 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -461,7 +461,6 @@ namespace osu.Game.Skinning
                 case HitResult.LargeTickMiss:
                     return this.GetAnimation("slidertickmiss", true, false);
 
-                case HitResult.ComboBreak:
                 case HitResult.IgnoreMiss:
                     return this.GetAnimation("sliderendmiss", true, false);
 

From 4fa35d709cb163a1a93bc17c6772f2b034614e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 25 Dec 2023 14:56:40 +0100
Subject: [PATCH 2138/2296] Update resources

---
 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 2ec954b3a5..fbcdb00cdb 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1219.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1215.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1225.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.33.0" />

From f84b07e71a3298a5093eab2806a74c0ef2066679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 25 Dec 2023 19:01:06 +0100
Subject: [PATCH 2139/2296] Do not attempt to stop preview tracks when arriving
 from a "track completed" sync

This fixes an issue identified with the WASAPI implementation in
https://github.com/ppy/osu-framework/pull/6088. It has no real effect
on current `master`, but fixes a deadlock that occurs with the
aforementioned framework branch when one lets a preview track play out
to the end - at this point all audio will stop and an attempt to perform
any synchronous BASS operation (playing another track, seeking) will
result in a deadlock.

It isn't terribly clear as to why this is happening precisely, but
there does not appear to be any need to stop and seek at that point,
so this feels like a decent workaround even if the actual issue is
upstream (and will unblock pushing out WASAPI support to users).
---
 osu.Game/Audio/PreviewTrack.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Audio/PreviewTrack.cs b/osu.Game/Audio/PreviewTrack.cs
index d625566ee7..6184ff85dd 100644
--- a/osu.Game/Audio/PreviewTrack.cs
+++ b/osu.Game/Audio/PreviewTrack.cs
@@ -96,10 +96,13 @@ namespace osu.Game.Audio
 
             hasStarted = false;
 
-            Track.Stop();
+            if (!Track.HasCompleted)
+            {
+                Track.Stop();
 
-            // Ensure the track is reset immediately on stopping, so the next time it is started it has a correct time value.
-            Track.Seek(0);
+                // Ensure the track is reset immediately on stopping, so the next time it is started it has a correct time value.
+                Track.Seek(0);
+            }
 
             Stopped?.Invoke();
         }

From 060bf8beff4f58060e9d60f41dce5850a20748ba Mon Sep 17 00:00:00 2001
From: Nathan Tran <ntranswe@gmail.com>
Date: Mon, 25 Dec 2023 15:09:39 -0800
Subject: [PATCH 2140/2296] Fix rewind backtracking

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

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 370b559897..89911c9a69 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -643,7 +643,7 @@ namespace osu.Game.Screens.Select
             while (randomSelectedBeatmaps.Any())
             {
                 var beatmap = randomSelectedBeatmaps[^1];
-                randomSelectedBeatmaps.Remove(beatmap);
+                randomSelectedBeatmaps.RemoveAt(randomSelectedBeatmaps.Count - 1);
 
                 if (!beatmap.Filtered.Value && beatmap.BeatmapInfo.BeatmapSet?.DeletePending != true)
                 {

From b18b5b99773bffbd5cea8f2b536db763ae983f80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Dec 2023 12:06:56 +0900
Subject: [PATCH 2141/2296] Add inline note about deadlock

---
 osu.Game/Audio/PreviewTrack.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Audio/PreviewTrack.cs b/osu.Game/Audio/PreviewTrack.cs
index 6184ff85dd..961990a1bd 100644
--- a/osu.Game/Audio/PreviewTrack.cs
+++ b/osu.Game/Audio/PreviewTrack.cs
@@ -96,6 +96,7 @@ namespace osu.Game.Audio
 
             hasStarted = false;
 
+            // This pre-check is important, fixes a BASS deadlock in some scenarios.
             if (!Track.HasCompleted)
             {
                 Track.Stop();

From 2ec6aa7fbb92aa286f1281c4043274f6d007e98b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 26 Dec 2023 12:46:21 +0900
Subject: [PATCH 2142/2296] Make mania scroll speed independent of hit position

---
 .../UI/DrawableManiaRuleset.cs                | 20 ++++++++++++++++++-
 .../Skinning/LegacyManiaSkinConfiguration.cs  |  4 +++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 9169599798..bea536e4af 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -19,12 +19,14 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Scoring;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -57,6 +59,9 @@ namespace osu.Game.Rulesets.Mania.UI
         // Stores the current speed adjustment active in gameplay.
         private readonly Track speedAdjustmentTrack = new TrackVirtual(0);
 
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
         public DrawableManiaRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)
         {
@@ -104,7 +109,20 @@ namespace osu.Game.Rulesets.Mania.UI
             updateTimeRange();
         }
 
-        private void updateTimeRange() => TimeRange.Value = smoothTimeRange * speedAdjustmentTrack.AggregateTempo.Value * speedAdjustmentTrack.AggregateFrequency.Value;
+        private void updateTimeRange()
+        {
+            float hitPosition = skin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                    new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.HitPosition))?.Value
+                                ?? Stage.HIT_TARGET_POSITION;
+
+            const float length_to_default_hit_position = 768 - LegacyManiaSkinConfiguration.DEFAULT_HIT_POSITION;
+            float lengthToHitPosition = 768 - hitPosition;
+
+            // This scaling factor preserves the scroll speed as the scroll length varies from changes to the hit position.
+            float scale = lengthToHitPosition / length_to_default_hit_position;
+
+            TimeRange.Value = smoothTimeRange * speedAdjustmentTrack.AggregateTempo.Value * speedAdjustmentTrack.AggregateFrequency.Value * scale;
+        }
 
         /// <summary>
         /// Computes a scroll time (in milliseconds) from a scroll speed in the range of 1-40.
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 9acb29a793..042836984a 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Skinning
         /// </summary>
         public const float DEFAULT_COLUMN_SIZE = 30 * POSITION_SCALE_FACTOR;
 
+        public const float DEFAULT_HIT_POSITION = (480 - 402) * POSITION_SCALE_FACTOR;
+
         public readonly int Keys;
 
         public Dictionary<string, Color4> CustomColours { get; } = new Dictionary<string, Color4>();
@@ -35,7 +37,7 @@ namespace osu.Game.Skinning
         public readonly float[] ExplosionWidth;
         public readonly float[] HoldNoteLightWidth;
 
-        public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
+        public float HitPosition = DEFAULT_HIT_POSITION;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
         public float ScorePosition = 300 * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;

From f9e47242db508d596fe92afef5e15ab5f6583c1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Dec 2023 17:44:49 +0900
Subject: [PATCH 2143/2296] Add visual offset to better align editor waveforms
 with expectations

---
 .../Edit/Compose/Components/Timeline/Timeline.cs    |  7 ++++++-
 osu.Game/Screens/Edit/Editor.cs                     | 13 +++++++++++++
 .../Edit/Timing/WaveformComparisonDisplay.cs        |  2 +-
 3 files changed, 20 insertions(+), 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 75de15fe56..83d34ab61a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -141,7 +141,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
 
             track.BindTo(editorClock.Track);
-            track.BindValueChanged(_ => waveform.Waveform = beatmap.Value.Waveform, true);
+            track.BindValueChanged(_ =>
+            {
+                waveform.Waveform = beatmap.Value.Waveform;
+                waveform.RelativePositionAxes = Axes.X;
+                waveform.X = -(float)(Editor.WAVEFORM_VISUAL_OFFSET / beatmap.Value.Track.Length);
+            }, true);
 
             Zoom = (float)(defaultTimelineZoom * editorBeatmap.BeatmapInfo.TimelineZoom);
         }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a6c18bdf0e..c1f6c02301 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -60,6 +60,19 @@ namespace osu.Game.Screens.Edit
     [Cached]
     public partial class Editor : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>, IKeyBindingHandler<PlatformAction>, IBeatSnapProvider, ISamplePlaybackDisabler, IBeatSyncProvider
     {
+        /// <summary>
+        /// An offset applied to waveform visuals to align them with expectations.
+        /// </summary>
+        /// <remarks>
+        /// Historically, osu! beatmaps have an assumption of full system latency baked in.
+        /// This comes from a culmination of stable's platform offset, average hardware playback
+        /// latency, and users having their universal offsets tweaked to previous beatmaps.
+        ///
+        /// Coming to this value involved running various tests with existing users / beatmaps.
+        /// This included both visual and audible comparisons. Ballpark confidence is ≈2 ms.
+        /// </remarks>
+        public const float WAVEFORM_VISUAL_OFFSET = 20;
+
         public override float BackgroundParallaxAmount => 0.1f;
 
         public override bool AllowBackButton => false;
diff --git a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
index 856bc7c303..b5315feccb 100644
--- a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
+++ b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Screens.Edit.Timing
                 // offset to the required beat index.
                 double time = selectedGroupStartTime + index * timingPoint.BeatLength;
 
-                float offset = (float)(time - visible_width / 2) / trackLength * scale;
+                float offset = (float)(time - visible_width / 2 + Editor.WAVEFORM_VISUAL_OFFSET) / trackLength * scale;
 
                 row.Alpha = time < selectedGroupStartTime || time > selectedGroupEndTime ? 0.2f : 1;
                 row.WaveformOffsetTo(-offset, animated);

From 4e3bdb2b56bd0d8430ffeeb988498d42412d72ee Mon Sep 17 00:00:00 2001
From: Nathan Tran <ntranswe@gmail.com>
Date: Tue, 26 Dec 2023 00:57:06 -0800
Subject: [PATCH 2144/2296] Add test coverage

---
 .../SongSelect/TestSceneBeatmapCarousel.cs      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index c509d40e07..41ea347ef3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -454,6 +454,23 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
         }
 
+        [Test]
+        public void TestRewind()
+        {
+            const int local_set_count = 3;
+            const int random_select_count = local_set_count * 3;
+            loadBeatmaps(setCount: local_set_count);
+
+            for (int i = 0; i < random_select_count; i++)
+                nextRandom();
+
+            for (int i = 0; i < random_select_count; i++)
+            {
+                prevRandom();
+                AddAssert("correct random last selected", () => selectedSets.Peek() == carousel.SelectedBeatmapSet);
+            }
+        }
+
         [Test]
         public void TestRewindToDeletedBeatmap()
         {

From 225528d519cf65420cf54055ff0602edc3c211d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Dec 2023 19:20:41 +0900
Subject: [PATCH 2145/2296] Bail from score submission if audio playback rate
 is too far from reality

Closes https://github.com/ppy/osu/issues/23149.
---
 .../Play/MasterGameplayClockContainer.cs      | 55 +++++++++++++++++++
 osu.Game/Screens/Play/SubmittingPlayer.cs     |  8 +++
 2 files changed, 63 insertions(+)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 54ed7ba626..2844d84f31 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.Logging;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -39,6 +40,14 @@ namespace osu.Game.Screens.Play
             Precision = 0.1,
         };
 
+        /// <summary>
+        /// Whether the audio playback is within acceptable ranges.
+        /// Will become false if audio playback is not going as expected.
+        /// </summary>
+        public IBindable<bool> PlaybackRateValid => playbackRateValid;
+
+        private readonly Bindable<bool> playbackRateValid = new Bindable<bool>(true);
+
         private readonly WorkingBeatmap beatmap;
 
         private Track track;
@@ -128,6 +137,7 @@ namespace osu.Game.Screens.Play
         {
             // Safety in case the clock is seeked while stopped.
             LastStopTime = null;
+            elapsedValidationTime = null;
 
             base.Seek(time);
         }
@@ -197,6 +207,51 @@ namespace osu.Game.Screens.Play
             addAdjustmentsToTrack();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            checkPlaybackValidity();
+        }
+
+        #region Clock validation (ensure things are running correctly for local gameplay)
+
+        private double elapsedGameplayClockTime;
+        private double? elapsedValidationTime;
+        private int playbackDiscrepancyCount;
+
+        private const int allowed_playback_discrepancies = 5;
+
+        private void checkPlaybackValidity()
+        {
+            if (GameplayClock.IsRunning)
+            {
+                elapsedGameplayClockTime += GameplayClock.ElapsedFrameTime;
+
+                elapsedValidationTime ??= elapsedGameplayClockTime;
+                elapsedValidationTime += GameplayClock.Rate * Time.Elapsed;
+
+                if (Math.Abs(elapsedGameplayClockTime - elapsedValidationTime!.Value) > 300)
+                {
+                    if (playbackDiscrepancyCount++ > allowed_playback_discrepancies)
+                    {
+                        if (playbackRateValid.Value)
+                        {
+                            playbackRateValid.Value = false;
+                            Logger.Log("System audio playback is not working as expected. Some online functionality will not work.\n\nPlease check your audio drivers.", level: LogLevel.Important);
+                        }
+                    }
+                    else
+                    {
+                        Logger.Log($"Playback discrepancy detected ({playbackDiscrepancyCount} of allowed {allowed_playback_discrepancies}): {elapsedGameplayClockTime:N1} vs {elapsedValidationTime:N1}");
+                    }
+
+                    elapsedValidationTime = null;
+                }
+            }
+        }
+
+        #endregion
+
         private bool speedAdjustmentsApplied;
 
         private void addAdjustmentsToTrack()
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 785164178a..f88526b8f9 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -208,6 +208,14 @@ namespace osu.Game.Screens.Play
 
         private Task submitScore(Score score)
         {
+            var masterClock = GameplayClockContainer as MasterGameplayClockContainer;
+
+            if (masterClock?.PlaybackRateValid.Value != true)
+            {
+                Logger.Log("Score submission cancelled due to audio playback rate discrepancy.");
+                return Task.CompletedTask;
+            }
+
             // token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
             if (token == null)
             {

From 30b5b36f1d72f9285971287d6d78c4628c3dde94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Dec 2023 12:19:04 +0100
Subject: [PATCH 2146/2296] Fix code quality inspection

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 41ea347ef3..aa4c879468 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -467,7 +467,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             for (int i = 0; i < random_select_count; i++)
             {
                 prevRandom();
-                AddAssert("correct random last selected", () => selectedSets.Peek() == carousel.SelectedBeatmapSet);
+                AddAssert("correct random last selected", () => selectedSets.Peek(), () => Is.EqualTo(carousel.SelectedBeatmapSet));
             }
         }
 

From f2c0e7cf2ecc04d5f3f01bd945623a61a8ab7f04 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Dec 2023 20:31:34 +0900
Subject: [PATCH 2147/2296] Fix editor's control point list refreshing multiple
 times for a single change

---
 osu.Game/Screens/Edit/Timing/ControlPointList.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointList.cs b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
index 22e37b9efb..7cd1dbc630 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointList.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointList.cs
@@ -109,8 +109,13 @@ namespace osu.Game.Screens.Edit.Timing
             controlPointGroups.BindTo(Beatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((_, _) =>
             {
-                table.ControlGroups = controlPointGroups;
-                changeHandler?.SaveState();
+                // This callback can happen many times in a change operation. It gets expensive.
+                // We really should be handling the `CollectionChanged` event properly.
+                Scheduler.AddOnce(() =>
+                {
+                    table.ControlGroups = controlPointGroups;
+                    changeHandler?.SaveState();
+                });
             }, true);
 
             table.OnRowSelected += drawable => scroll.ScrollIntoView(drawable);

From 1f2f749db68fe3a541150abb7acdae7e0aabf79e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Dec 2023 20:42:04 +0900
Subject: [PATCH 2148/2296] Fix selection not being retained in control point
 list when undoing / redoing

---
 osu.Game/Screens/Edit/EditorTable.cs          | 30 ++++++++++++++++++-
 .../Screens/Edit/Timing/ControlPointTable.cs  | 14 +++++----
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index b79d71b42b..5ccb21cf59 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
@@ -46,15 +47,42 @@ namespace osu.Game.Screens.Edit
             });
         }
 
-        protected void SetSelectedRow(object? item)
+        protected int GetIndexForObject(object? item)
         {
+            for (int i = 0; i < BackgroundFlow.Count; i++)
+            {
+                if (BackgroundFlow[i].Item == item)
+                    return i;
+            }
+
+            return -1;
+        }
+
+        protected bool SetSelectedRow(object? item)
+        {
+            bool foundSelection = false;
+
             foreach (var b in BackgroundFlow)
             {
                 b.Selected = ReferenceEquals(b.Item, item);
 
                 if (b.Selected)
+                {
+                    Debug.Assert(!foundSelection);
                     OnRowSelected?.Invoke(b);
+                    foundSelection = true;
+                }
             }
+
+            return foundSelection;
+        }
+
+        protected object? GetObjectAtIndex(int index)
+        {
+            if (index < 0 || index > BackgroundFlow.Count - 1)
+                return null;
+
+            return BackgroundFlow[index].Item;
         }
 
         protected override Drawable CreateHeader(int index, TableColumn? column) => new HeaderText(column?.Header ?? default);
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index b078e3fa44..335077c6f0 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit.Timing
     public partial class ControlPointTable : EditorTable
     {
         [Resolved]
-        private Bindable<ControlPointGroup> selectedGroup { get; set; } = null!;
+        private Bindable<ControlPointGroup?> selectedGroup { get; set; } = null!;
 
         [Resolved]
         private EditorClock clock { get; set; } = null!;
@@ -32,6 +32,8 @@ namespace osu.Game.Screens.Edit.Timing
         {
             set
             {
+                int selectedIndex = GetIndexForObject(selectedGroup.Value);
+
                 Content = null;
                 BackgroundFlow.Clear();
 
@@ -53,7 +55,11 @@ namespace osu.Game.Screens.Edit.Timing
                 Columns = createHeaders();
                 Content = value.Select(createContent).ToArray().ToRectangular();
 
-                updateSelectedGroup();
+                if (!SetSelectedRow(selectedGroup.Value))
+                {
+                    // Some operations completely obliterate references, so best-effort reselect based on index.
+                    selectedGroup.Value = GetObjectAtIndex(selectedIndex) as ControlPointGroup;
+                }
             }
         }
 
@@ -61,11 +67,9 @@ namespace osu.Game.Screens.Edit.Timing
         {
             base.LoadComplete();
 
-            selectedGroup.BindValueChanged(_ => updateSelectedGroup(), true);
+            selectedGroup.BindValueChanged(_ => SetSelectedRow(selectedGroup.Value), true);
         }
 
-        private void updateSelectedGroup() => SetSelectedRow(selectedGroup.Value);
-
         private TableColumn[] createHeaders()
         {
             var columns = new List<TableColumn>

From 03e2463b06b14b66529627fc76941d901231001c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Dec 2023 21:20:18 +0900
Subject: [PATCH 2149/2296] Add test coverage and refactor to better handle
 equality edge case

---
 .../Visual/Editing/TestSceneTimingScreen.cs   | 43 +++++++++++++++++++
 osu.Game/Screens/Edit/EditorTable.cs          |  2 +-
 .../Screens/Edit/Timing/ControlPointTable.cs  | 29 ++++++++++---
 3 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
index 216c35de65..40aadc8164 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Timing;
 using osu.Game.Screens.Edit.Timing.RowAttributes;
+using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing
@@ -69,6 +70,48 @@ namespace osu.Game.Tests.Visual.Editing
             AddUntilStep("Wait for rows to load", () => Child.ChildrenOfType<EffectRowAttribute>().Any());
         }
 
+        [Test]
+        public void TestSelectedRetainedOverUndo()
+        {
+            AddStep("Select first timing point", () =>
+            {
+                InputManager.MoveMouseTo(Child.ChildrenOfType<TimingRowAttribute>().First());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("Selection changed", () => timingScreen.SelectedGroup.Value.Time == 2170);
+            AddUntilStep("Ensure seeked to correct time", () => EditorClock.CurrentTimeAccurate == 2170);
+
+            AddStep("Adjust offset", () =>
+            {
+                InputManager.MoveMouseTo(timingScreen.ChildrenOfType<TimingAdjustButton>().First().ScreenSpaceDrawQuad.Centre + new Vector2(20, 0));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("wait for offset changed", () =>
+            {
+                return timingScreen.SelectedGroup.Value.ControlPoints.Any(c => c is TimingControlPoint) && timingScreen.SelectedGroup.Value.Time > 2170;
+            });
+
+            AddStep("simulate undo", () =>
+            {
+                var clone = editorBeatmap.ControlPointInfo.DeepClone();
+
+                editorBeatmap.ControlPointInfo.Clear();
+
+                foreach (var group in clone.Groups)
+                {
+                    foreach (var cp in group.ControlPoints)
+                        editorBeatmap.ControlPointInfo.Add(group.Time, cp);
+                }
+            });
+
+            AddUntilStep("selection retained", () =>
+            {
+                return timingScreen.SelectedGroup.Value.ControlPoints.Any(c => c is TimingControlPoint) && timingScreen.SelectedGroup.Value.Time > 2170;
+            });
+        }
+
         [Test]
         public void TestTrackingCurrentTimeWhileRunning()
         {
diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index 5ccb21cf59..e5dc540b06 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Edit
             return -1;
         }
 
-        protected bool SetSelectedRow(object? item)
+        protected virtual bool SetSelectedRow(object? item)
         {
             bool foundSelection = false;
 
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 335077c6f0..7a27056da3 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Edit.Timing
                     {
                         Action = () =>
                         {
-                            selectedGroup.Value = group;
+                            SetSelectedRow(group);
                             clock.SeekSmoothlyTo(group.Time);
                         }
                     });
@@ -55,11 +55,16 @@ namespace osu.Game.Screens.Edit.Timing
                 Columns = createHeaders();
                 Content = value.Select(createContent).ToArray().ToRectangular();
 
-                if (!SetSelectedRow(selectedGroup.Value))
-                {
-                    // Some operations completely obliterate references, so best-effort reselect based on index.
-                    selectedGroup.Value = GetObjectAtIndex(selectedIndex) as ControlPointGroup;
-                }
+                // Attempt to retain selection.
+                if (SetSelectedRow(selectedGroup.Value))
+                    return;
+
+                // Some operations completely obliterate references, so best-effort reselect based on index.
+                if (SetSelectedRow(GetObjectAtIndex(selectedIndex)))
+                    return;
+
+                // Selection could not be retained.
+                selectedGroup.Value = null;
             }
         }
 
@@ -67,7 +72,17 @@ namespace osu.Game.Screens.Edit.Timing
         {
             base.LoadComplete();
 
-            selectedGroup.BindValueChanged(_ => SetSelectedRow(selectedGroup.Value), true);
+            // Handle external selections.
+            selectedGroup.BindValueChanged(g => SetSelectedRow(g.NewValue), true);
+        }
+
+        protected override bool SetSelectedRow(object? item)
+        {
+            if (!base.SetSelectedRow(item))
+                return false;
+
+            selectedGroup.Value = item as ControlPointGroup;
+            return true;
         }
 
         private TableColumn[] createHeaders()

From d70fddb6fde18de0ef092c047509ee0a2efd2d16 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 00:11:22 +0900
Subject: [PATCH 2150/2296] Fix elapsed time being counted twice on first frame

---
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 2844d84f31..a475f4823f 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -227,8 +227,10 @@ namespace osu.Game.Screens.Play
             {
                 elapsedGameplayClockTime += GameplayClock.ElapsedFrameTime;
 
-                elapsedValidationTime ??= elapsedGameplayClockTime;
-                elapsedValidationTime += GameplayClock.Rate * Time.Elapsed;
+                if (elapsedValidationTime == null)
+                    elapsedValidationTime = elapsedGameplayClockTime;
+                else
+                    elapsedValidationTime += GameplayClock.Rate * Time.Elapsed;
 
                 if (Math.Abs(elapsedGameplayClockTime - elapsedValidationTime!.Value) > 300)
                 {

From c55458e49c6b5747a1a84e00ac05787829c81a2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 02:32:47 +0900
Subject: [PATCH 2151/2296] Remove pointless intermediary class

---
 .../Containers/ExpandingButtonContainer.cs    | 21 -------------------
 osu.Game/Overlays/Settings/SettingsSidebar.cs |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 osu.Game/Graphics/Containers/ExpandingButtonContainer.cs

diff --git a/osu.Game/Graphics/Containers/ExpandingButtonContainer.cs b/osu.Game/Graphics/Containers/ExpandingButtonContainer.cs
deleted file mode 100644
index 5abb4096ac..0000000000
--- a/osu.Game/Graphics/Containers/ExpandingButtonContainer.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.
-
-namespace osu.Game.Graphics.Containers
-{
-    /// <summary>
-    /// An <see cref="ExpandingContainer"/> with a long hover expansion delay.
-    /// </summary>
-    /// <remarks>
-    /// Mostly used for buttons with explanatory labels, in which the label would display after a "long hover".
-    /// </remarks>
-    public partial class ExpandingButtonContainer : ExpandingContainer
-    {
-        protected ExpandingButtonContainer(float contractedWidth, float expandedWidth)
-            : base(contractedWidth, expandedWidth)
-        {
-        }
-
-        protected override double HoverExpansionDelay => 400;
-    }
-}
diff --git a/osu.Game/Overlays/Settings/SettingsSidebar.cs b/osu.Game/Overlays/Settings/SettingsSidebar.cs
index 06bc2fd788..7baf9a58ff 100644
--- a/osu.Game/Overlays/Settings/SettingsSidebar.cs
+++ b/osu.Game/Overlays/Settings/SettingsSidebar.cs
@@ -8,7 +8,7 @@ using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings
 {
-    public partial class SettingsSidebar : ExpandingButtonContainer
+    public partial class SettingsSidebar : ExpandingContainer
     {
         public const float DEFAULT_WIDTH = 70;
         public const int EXPANDED_WIDTH = 200;

From 58476d5429985109a13240c481da362449489167 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 02:33:02 +0900
Subject: [PATCH 2152/2296] Allow `ExpandingContainer` to not auto expand on
 hover

---
 osu.Game/Graphics/Containers/ExpandingContainer.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/ExpandingContainer.cs b/osu.Game/Graphics/Containers/ExpandingContainer.cs
index 60b9e6a167..2abdb508ae 100644
--- a/osu.Game/Graphics/Containers/ExpandingContainer.cs
+++ b/osu.Game/Graphics/Containers/ExpandingContainer.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;
 using osu.Framework.Graphics.Containers;
@@ -26,6 +24,8 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         protected virtual double HoverExpansionDelay => 0;
 
+        protected virtual bool ExpandOnHover => true;
+
         protected override Container<Drawable> Content => FillFlow;
 
         protected FillFlowContainer FillFlow { get; }
@@ -53,7 +53,7 @@ namespace osu.Game.Graphics.Containers
             };
         }
 
-        private ScheduledDelegate hoverExpandEvent;
+        private ScheduledDelegate? hoverExpandEvent;
 
         protected override void LoadComplete()
         {
@@ -93,6 +93,9 @@ namespace osu.Game.Graphics.Containers
 
         private void updateHoverExpansion()
         {
+            if (!ExpandOnHover)
+                return;
+
             hoverExpandEvent?.Cancel();
 
             if (IsHovered && !Expanded.Value)

From 9a1a97180d7938bbc1dced8d887cc226f28deb46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 02:33:17 +0900
Subject: [PATCH 2153/2296] Change settings overlay to always show expanded
 buttons

---
 osu.Game/Overlays/Settings/SettingsSidebar.cs | 3 +++
 osu.Game/Overlays/SettingsOverlay.cs          | 7 +++++--
 osu.Game/Overlays/SettingsPanel.cs            | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsSidebar.cs b/osu.Game/Overlays/Settings/SettingsSidebar.cs
index 7baf9a58ff..fc5c6b07bb 100644
--- a/osu.Game/Overlays/Settings/SettingsSidebar.cs
+++ b/osu.Game/Overlays/Settings/SettingsSidebar.cs
@@ -13,9 +13,12 @@ namespace osu.Game.Overlays.Settings
         public const float DEFAULT_WIDTH = 70;
         public const int EXPANDED_WIDTH = 200;
 
+        protected override bool ExpandOnHover => false;
+
         public SettingsSidebar()
             : base(DEFAULT_WIDTH, EXPANDED_WIDTH)
         {
+            Expanded.Value = true;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 746d451343..a779c3c263 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -72,16 +72,19 @@ namespace osu.Game.Overlays
             switch (state.NewValue)
             {
                 case Visibility.Visible:
-                    Sidebar?.FadeColour(Color4.DarkGray, 300, Easing.OutQuint);
+                    Sidebar.Expanded.Value = false;
+                    Sidebar.FadeColour(Color4.DarkGray, 300, Easing.OutQuint);
 
                     SectionsContainer.FadeOut(300, Easing.OutQuint);
                     ContentContainer.MoveToX(-PANEL_WIDTH, 500, Easing.OutQuint);
 
                     lastOpenedSubPanel = panel;
+
                     break;
 
                 case Visibility.Hidden:
-                    Sidebar?.FadeColour(Color4.White, 300, Easing.OutQuint);
+                    Sidebar.Expanded.Value = true;
+                    Sidebar.FadeColour(Color4.White, 300, Easing.OutQuint);
 
                     SectionsContainer.FadeIn(500, Easing.OutQuint);
                     ContentContainer.MoveToX(0, 500, Easing.OutQuint);
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 3bac6c400f..339120fd84 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -285,7 +285,6 @@ namespace osu.Game.Overlays
                             return;
 
                         SectionsContainer.ScrollTo(section);
-                        Sidebar.Expanded.Value = false;
                     },
                 };
             }

From 5de8307918216ed5f18edb42bfc8eb28c6f310b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 02:38:23 +0900
Subject: [PATCH 2154/2296] Reduce width of sidebar buttons

---
 osu.Game/Overlays/Settings/SettingsSidebar.cs   |  2 +-
 osu.Game/Overlays/Settings/SidebarIconButton.cs | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsSidebar.cs b/osu.Game/Overlays/Settings/SettingsSidebar.cs
index fc5c6b07bb..c751f12003 100644
--- a/osu.Game/Overlays/Settings/SettingsSidebar.cs
+++ b/osu.Game/Overlays/Settings/SettingsSidebar.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Settings
     public partial class SettingsSidebar : ExpandingContainer
     {
         public const float DEFAULT_WIDTH = 70;
-        public const int EXPANDED_WIDTH = 200;
+        public const int EXPANDED_WIDTH = 170;
 
         protected override bool ExpandOnHover => false;
 
diff --git a/osu.Game/Overlays/Settings/SidebarIconButton.cs b/osu.Game/Overlays/Settings/SidebarIconButton.cs
index 4e5b361460..bd9ac3cf97 100644
--- a/osu.Game/Overlays/Settings/SidebarIconButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarIconButton.cs
@@ -69,18 +69,18 @@ namespace osu.Game.Overlays.Settings
                     Colour = OsuColour.Gray(0.6f),
                     Children = new Drawable[]
                     {
-                        headerText = new OsuSpriteText
-                        {
-                            Position = new Vector2(SettingsSidebar.DEFAULT_WIDTH + 10, 0),
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                        },
                         iconContainer = new ConstrainedIconContainer
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Size = new Vector2(20),
                         },
+                        headerText = new OsuSpriteText
+                        {
+                            Position = new Vector2(60, 0),
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                        },
                     }
                 },
                 selectionIndicator = new CircularContainer

From 5b1deb7c4b1139aa55543094dc652b6763ddfcd2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 02:40:50 +0900
Subject: [PATCH 2155/2296] Give buttons a touch of padding to make click
 effect feel better

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

diff --git a/osu.Game/Overlays/Settings/SidebarIconButton.cs b/osu.Game/Overlays/Settings/SidebarIconButton.cs
index bd9ac3cf97..a8d27eb792 100644
--- a/osu.Game/Overlays/Settings/SidebarIconButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarIconButton.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Overlays.Settings
             RelativeSizeAxes = Axes.X;
             Height = 46;
 
+            Padding = new MarginPadding(5);
+
             AddRange(new Drawable[]
             {
                 textIconContent = new Container

From 8e13f65c5d388ba0494367dfedcb2cccdc066b84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 02:46:21 +0900
Subject: [PATCH 2156/2296] Adjust hover effect slightly

---
 osu.Game/Overlays/Settings/SidebarIconButton.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Settings/SidebarIconButton.cs b/osu.Game/Overlays/Settings/SidebarIconButton.cs
index a8d27eb792..041d19e8bf 100644
--- a/osu.Game/Overlays/Settings/SidebarIconButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarIconButton.cs
@@ -111,10 +111,13 @@ namespace osu.Game.Overlays.Settings
         private void load()
         {
             selectionIndicator.Colour = ColourProvider.Highlight1;
+            Hover.Colour = ColourProvider.Light4;
         }
 
         protected override void UpdateState()
         {
+            Hover.FadeTo(IsHovered ? 0.1f : 0, FADE_DURATION, Easing.OutQuint);
+
             if (Selected)
             {
                 textIconContent.FadeColour(ColourProvider.Content1, FADE_DURATION, Easing.OutQuint);

From 5d0b5247946e758fd28f8bad58ec16cf7c15ee18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 02:54:24 +0900
Subject: [PATCH 2157/2296] Adjust back button to match style better

---
 osu.Game/Overlays/Settings/SidebarButton.cs     |  7 ++++++-
 osu.Game/Overlays/Settings/SidebarIconButton.cs |  3 +--
 osu.Game/Overlays/SettingsSubPanel.cs           | 13 +++++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SidebarButton.cs b/osu.Game/Overlays/Settings/SidebarButton.cs
index a63688762d..f58c2f41ef 100644
--- a/osu.Game/Overlays/Settings/SidebarButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarButton.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 
@@ -23,6 +24,7 @@ namespace osu.Game.Overlays.Settings
         private void load()
         {
             BackgroundColour = ColourProvider.Background5;
+            Hover.Colour = ColourProvider.Light4;
         }
 
         protected override void LoadComplete()
@@ -40,6 +42,9 @@ namespace osu.Game.Overlays.Settings
 
         protected override void OnHoverLost(HoverLostEvent e) => UpdateState();
 
-        protected abstract void UpdateState();
+        protected virtual void UpdateState()
+        {
+            Hover.FadeTo(IsHovered ? 0.1f : 0, FADE_DURATION, Easing.OutQuint);
+        }
     }
 }
diff --git a/osu.Game/Overlays/Settings/SidebarIconButton.cs b/osu.Game/Overlays/Settings/SidebarIconButton.cs
index 041d19e8bf..1bb3aa2921 100644
--- a/osu.Game/Overlays/Settings/SidebarIconButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarIconButton.cs
@@ -111,12 +111,11 @@ namespace osu.Game.Overlays.Settings
         private void load()
         {
             selectionIndicator.Colour = ColourProvider.Highlight1;
-            Hover.Colour = ColourProvider.Light4;
         }
 
         protected override void UpdateState()
         {
-            Hover.FadeTo(IsHovered ? 0.1f : 0, FADE_DURATION, Easing.OutQuint);
+            base.UpdateState();
 
             if (Selected)
             {
diff --git a/osu.Game/Overlays/SettingsSubPanel.cs b/osu.Game/Overlays/SettingsSubPanel.cs
index 1651975a74..1b9edeebc2 100644
--- a/osu.Game/Overlays/SettingsSubPanel.cs
+++ b/osu.Game/Overlays/SettingsSubPanel.cs
@@ -47,7 +47,9 @@ namespace osu.Game.Overlays
             [BackgroundDependencyLoader]
             private void load()
             {
-                Size = new Vector2(SettingsSidebar.DEFAULT_WIDTH);
+                Size = new Vector2(SettingsSidebar.EXPANDED_WIDTH);
+
+                Padding = new MarginPadding(5);
 
                 AddRange(new Drawable[]
                 {
@@ -61,7 +63,8 @@ namespace osu.Game.Overlays
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Size = new Vector2(15),
+                                Y = -5,
+                                Size = new Vector2(30),
                                 Shadow = true,
                                 Icon = FontAwesome.Solid.ChevronLeft
                             },
@@ -69,8 +72,8 @@ namespace osu.Game.Overlays
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Y = 15,
-                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                                Y = 30,
+                                Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
                                 Text = @"back",
                             },
                         }
@@ -80,6 +83,8 @@ namespace osu.Game.Overlays
 
             protected override void UpdateState()
             {
+                base.UpdateState();
+
                 content.FadeColour(IsHovered ? ColourProvider.Light1 : ColourProvider.Light3, FADE_DURATION, Easing.OutQuint);
             }
         }

From c087578e011c6ade4411dbccfcfce80da407dba3 Mon Sep 17 00:00:00 2001
From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com>
Date: Tue, 26 Dec 2023 10:07:21 -0800
Subject: [PATCH 2158/2296] Force minimum cursor size for `OsuResumeOverlay`

On cursor sizes below 0.3x it becomes exceedingly difficult to quickly locate and then accurately click the resume cursor on the pause overlay as it could as big as a handful of pixels. This clamps the minimum cursor size to 1x for the resume overlay, which is way more comfortable and more closely resembles stable.
---
 osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs | 10 +++++-----
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
index ba9fda25e4..18351c20ce 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
@@ -70,10 +70,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             };
 
             userCursorScale = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
-            userCursorScale.ValueChanged += _ => calculateCursorScale();
+            userCursorScale.ValueChanged += _ => cursorScale.Value = CalculateCursorScale();
 
             autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
-            autoCursorScale.ValueChanged += _ => calculateCursorScale();
+            autoCursorScale.ValueChanged += _ => cursorScale.Value = CalculateCursorScale();
 
             cursorScale.BindValueChanged(e => cursorScaleContainer.Scale = new Vector2(e.NewValue), true);
         }
@@ -81,10 +81,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            calculateCursorScale();
+            cursorScale.Value = CalculateCursorScale();
         }
 
-        private void calculateCursorScale()
+        protected virtual float CalculateCursorScale()
         {
             float scale = userCursorScale.Value;
 
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 scale *= GetScaleForCircleSize(state.Beatmap.Difficulty.CircleSize);
             }
 
-            cursorScale.Value = scale;
+            return scale;
         }
 
         protected override void SkinChanged(ISkinSource skin)
diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index ea49836772..f5e83f46f2 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -71,6 +71,12 @@ namespace osu.Game.Rulesets.Osu.UI
                 RelativePositionAxes = Axes.Both;
             }
 
+            protected override float CalculateCursorScale()
+            {
+                // Force minimum cursor size so it's easily clickable
+                return Math.Max(1f, base.CalculateCursorScale());
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 updateColour();

From c107bfcd3112cc8b1589d84f4634be1688cc684d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Dec 2023 20:09:34 +0100
Subject: [PATCH 2159/2296] Fix `TestSceneSideOverlays` test failure

---
 osu.Game/Overlays/Settings/SettingsSidebar.cs   | 4 ++--
 osu.Game/Overlays/Settings/SidebarIconButton.cs | 2 +-
 osu.Game/Overlays/SettingsPanel.cs              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsSidebar.cs b/osu.Game/Overlays/Settings/SettingsSidebar.cs
index c751f12003..302c52fbd2 100644
--- a/osu.Game/Overlays/Settings/SettingsSidebar.cs
+++ b/osu.Game/Overlays/Settings/SettingsSidebar.cs
@@ -10,13 +10,13 @@ namespace osu.Game.Overlays.Settings
 {
     public partial class SettingsSidebar : ExpandingContainer
     {
-        public const float DEFAULT_WIDTH = 70;
+        public const float CONTRACTED_WIDTH = 70;
         public const int EXPANDED_WIDTH = 170;
 
         protected override bool ExpandOnHover => false;
 
         public SettingsSidebar()
-            : base(DEFAULT_WIDTH, EXPANDED_WIDTH)
+            : base(CONTRACTED_WIDTH, EXPANDED_WIDTH)
         {
             Expanded.Value = true;
         }
diff --git a/osu.Game/Overlays/Settings/SidebarIconButton.cs b/osu.Game/Overlays/Settings/SidebarIconButton.cs
index 1bb3aa2921..e7ae4cc81d 100644
--- a/osu.Game/Overlays/Settings/SidebarIconButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarIconButton.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Settings
             {
                 textIconContent = new Container
                 {
-                    Width = SettingsSidebar.DEFAULT_WIDTH,
+                    Width = SettingsSidebar.CONTRACTED_WIDTH,
                     RelativeSizeAxes = Axes.Y,
                     Colour = OsuColour.Gray(0.6f),
                     Children = new Drawable[]
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 339120fd84..f4dfc7fa27 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays
 
         public const float TRANSITION_LENGTH = 600;
 
-        private const float sidebar_width = SettingsSidebar.DEFAULT_WIDTH;
+        private const float sidebar_width = SettingsSidebar.EXPANDED_WIDTH;
 
         /// <summary>
         /// The width of the settings panel content, excluding the sidebar.

From 9ac79782d25f3625d79d1d9096cb3eecacbdad21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Dec 2023 20:21:15 +0100
Subject: [PATCH 2160/2296] Add visibility toggle step to settings panel test
 scene

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

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
index 5d9c2f890c..8c4ca47fc3 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Tests.Visual.Settings
         public void TestBasic()
         {
             AddStep("do nothing", () => { });
+            AddToggleStep("toggle visibility", visible => settings.State.Value = visible ? Visibility.Visible : Visibility.Hidden);
         }
 
         [Test]

From af47f9fd701897a3096c785a5c2e31c2b87ee6f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Dec 2023 20:24:43 +0100
Subject: [PATCH 2161/2296] Fix sidebar button text becoming masked away during
 fadeout

---
 osu.Game/Overlays/Settings/SidebarIconButton.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SidebarIconButton.cs b/osu.Game/Overlays/Settings/SidebarIconButton.cs
index e7ae4cc81d..f4b71207e3 100644
--- a/osu.Game/Overlays/Settings/SidebarIconButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarIconButton.cs
@@ -66,16 +66,16 @@ namespace osu.Game.Overlays.Settings
             {
                 textIconContent = new Container
                 {
-                    Width = SettingsSidebar.CONTRACTED_WIDTH,
-                    RelativeSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.Both,
                     Colour = OsuColour.Gray(0.6f),
                     Children = new Drawable[]
                     {
                         iconContainer = new ConstrainedIconContainer
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
                             Size = new Vector2(20),
+                            Margin = new MarginPadding { Left = 25 }
                         },
                         headerText = new OsuSpriteText
                         {

From 6f672b8cb302fb7aa5034b07a2b6f0f351df54aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Dec 2023 20:36:12 +0100
Subject: [PATCH 2162/2296] Fix `TestSceneKeyBindingPanel` failures

---
 .../Visual/Settings/TestSceneKeyBindingPanel.cs          | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 1c4e89e1a2..57c9770c9a 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -13,7 +13,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Localisation;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Rulesets.Taiko;
 using osuTK.Input;
@@ -152,7 +151,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddStep("click first row with two bindings", () =>
             {
                 multiBindingRow = panel.ChildrenOfType<KeyBindingRow>().First(row => row.Defaults.Count() > 1);
-                InputManager.MoveMouseTo(multiBindingRow);
+                InputManager.MoveMouseTo(multiBindingRow.ChildrenOfType<OsuSpriteText>().First());
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -256,7 +255,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddStep("click first row with two bindings", () =>
             {
                 multiBindingRow = panel.ChildrenOfType<KeyBindingRow>().First(row => row.Defaults.Count() > 1);
-                InputManager.MoveMouseTo(multiBindingRow);
+                InputManager.MoveMouseTo(multiBindingRow.ChildrenOfType<OsuSpriteText>().First());
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -305,7 +304,6 @@ namespace osu.Game.Tests.Visual.Settings
                 section.ChildrenOfType<ResetButton>().Single().TriggerClick();
             });
             AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
             scrollToAndStartBinding("Left (rim)");
             AddStep("attempt to bind M1 to two keys", () => InputManager.Click(MouseButton.Left));
 
@@ -325,7 +323,6 @@ namespace osu.Game.Tests.Visual.Settings
                 section.ChildrenOfType<ResetButton>().Single().TriggerClick();
             });
             AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
             scrollToAndStartBinding("Left (rim)");
             AddStep("attempt to bind M1 to two keys", () => InputManager.Click(MouseButton.Left));
 
@@ -345,7 +342,6 @@ namespace osu.Game.Tests.Visual.Settings
                 section.ChildrenOfType<ResetButton>().Single().TriggerClick();
             });
             AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
             scrollToAndStartBinding("Left (centre)");
             AddStep("clear binding", () =>
             {
@@ -377,7 +373,6 @@ namespace osu.Game.Tests.Visual.Settings
                 section.ChildrenOfType<ResetButton>().Single().TriggerClick();
             });
             AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
             scrollToAndStartBinding("Left (centre)");
             AddStep("clear binding", () =>
             {

From 8cd240fbecebf7bd37ba2cc504fe751c5afe727a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 13:20:19 +0900
Subject: [PATCH 2163/2296] Reduce size and fix alignment of back button

---
 osu.Game/Overlays/SettingsSubPanel.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/SettingsSubPanel.cs b/osu.Game/Overlays/SettingsSubPanel.cs
index 1b9edeebc2..4d1f8f45cc 100644
--- a/osu.Game/Overlays/SettingsSubPanel.cs
+++ b/osu.Game/Overlays/SettingsSubPanel.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Overlays
 
         public partial class BackButton : SidebarButton
         {
-            private Container content;
+            private Drawable content;
 
             public BackButton()
                 : base(HoverSampleSet.Default)
@@ -49,30 +49,31 @@ namespace osu.Game.Overlays
             {
                 Size = new Vector2(SettingsSidebar.EXPANDED_WIDTH);
 
-                Padding = new MarginPadding(5);
+                Padding = new MarginPadding(40);
 
                 AddRange(new Drawable[]
                 {
-                    content = new Container
+                    content = new FillFlowContainer
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
+                        Direction = FillDirection.Vertical,
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(5),
                         Children = new Drawable[]
                         {
                             new SpriteIcon
                             {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Y = -5,
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
                                 Size = new Vector2(30),
                                 Shadow = true,
                                 Icon = FontAwesome.Solid.ChevronLeft
                             },
                             new OsuSpriteText
                             {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Y = 30,
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
                                 Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
                                 Text = @"back",
                             },

From 901674a1303a349185d5123f013a3d2e3d2d4fad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 13:39:13 +0900
Subject: [PATCH 2164/2296] Move back button inside sidebar to fix weird
 animation

---
 .../Visual/Settings/TestSceneSettingsPanel.cs |  2 +-
 osu.Game/Overlays/Settings/SettingsSidebar.cs | 79 ++++++++++++++++++-
 osu.Game/Overlays/SettingsOverlay.cs          |  2 +-
 osu.Game/Overlays/SettingsPanel.cs            | 13 +--
 osu.Game/Overlays/SettingsSubPanel.cs         | 71 -----------------
 5 files changed, 87 insertions(+), 80 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
index 8c4ca47fc3..df0fc8de57 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsPanel.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual.Settings
 
             AddStep("Press back", () => settings
                                         .ChildrenOfType<KeyBindingPanel>().FirstOrDefault()?
-                                        .ChildrenOfType<SettingsSubPanel.BackButton>().FirstOrDefault()?.TriggerClick());
+                                        .ChildrenOfType<SettingsSidebar.BackButton>().FirstOrDefault()?.TriggerClick());
 
             AddUntilStep("top-level textbox focused", () => settings.SectionsContainer.ChildrenOfType<SettingsSearchTextBox>().FirstOrDefault()?.HasFocus == true);
         }
diff --git a/osu.Game/Overlays/Settings/SettingsSidebar.cs b/osu.Game/Overlays/Settings/SettingsSidebar.cs
index 302c52fbd2..ddbcd60ef6 100644
--- a/osu.Game/Overlays/Settings/SettingsSidebar.cs
+++ b/osu.Game/Overlays/Settings/SettingsSidebar.cs
@@ -1,10 +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.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
 
 namespace osu.Game.Overlays.Settings
 {
@@ -13,11 +20,16 @@ namespace osu.Game.Overlays.Settings
         public const float CONTRACTED_WIDTH = 70;
         public const int EXPANDED_WIDTH = 170;
 
+        public Action? BackButtonAction;
+
         protected override bool ExpandOnHover => false;
 
-        public SettingsSidebar()
+        private readonly bool showBackButton;
+
+        public SettingsSidebar(bool showBackButton)
             : base(CONTRACTED_WIDTH, EXPANDED_WIDTH)
         {
+            this.showBackButton = showBackButton;
             Expanded.Value = true;
         }
 
@@ -30,6 +42,71 @@ namespace osu.Game.Overlays.Settings
                 RelativeSizeAxes = Axes.Both,
                 Depth = float.MaxValue
             });
+
+            if (showBackButton)
+            {
+                AddInternal(new BackButton
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Action = () => BackButtonAction?.Invoke(),
+                });
+            }
+        }
+
+        public partial class BackButton : SidebarButton
+        {
+            private Drawable content = null!;
+
+            public BackButton()
+                : base(HoverSampleSet.Default)
+            {
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Size = new Vector2(SettingsSidebar.EXPANDED_WIDTH);
+
+                Padding = new MarginPadding(40);
+
+                AddRange(new[]
+                {
+                    content = new FillFlowContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Direction = FillDirection.Vertical,
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(5),
+                        Children = new Drawable[]
+                        {
+                            new SpriteIcon
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Size = new Vector2(30),
+                                Shadow = true,
+                                Icon = FontAwesome.Solid.ChevronLeft
+                            },
+                            new OsuSpriteText
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
+                                Text = @"back",
+                            },
+                        }
+                    }
+                });
+            }
+
+            protected override void UpdateState()
+            {
+                base.UpdateState();
+
+                content.FadeColour(IsHovered ? ColourProvider.Light1 : ColourProvider.Light3, FADE_DURATION, Easing.OutQuint);
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index a779c3c263..5735b1515a 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays
         protected override Drawable CreateFooter() => new SettingsFooter();
 
         public SettingsOverlay()
-            : base(true)
+            : base(false)
         {
         }
 
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index f4dfc7fa27..3861c5abc7 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays
         protected override string PopInSampleName => "UI/settings-pop-in";
         protected override double PopInOutSampleBalance => -OsuGameBase.SFX_STEREO_STRENGTH;
 
-        private readonly bool showSidebar;
+        private readonly bool showBackButton;
 
         private LoadingLayer loading;
 
@@ -72,9 +72,9 @@ namespace osu.Game.Overlays
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        protected SettingsPanel(bool showSidebar)
+        protected SettingsPanel(bool showBackButton)
         {
-            this.showSidebar = showSidebar;
+            this.showBackButton = showBackButton;
             RelativeSizeAxes = Axes.Y;
             AutoSizeAxes = Axes.X;
         }
@@ -146,10 +146,11 @@ namespace osu.Game.Overlays
                 }
             });
 
-            if (showSidebar)
+            AddInternal(Sidebar = new SettingsSidebar(showBackButton)
             {
-                AddInternal(Sidebar = new SettingsSidebar { Width = sidebar_width });
-            }
+                BackButtonAction = Hide,
+                Width = sidebar_width
+            });
 
             CreateSections()?.ForEach(AddSection);
         }
diff --git a/osu.Game/Overlays/SettingsSubPanel.cs b/osu.Game/Overlays/SettingsSubPanel.cs
index 4d1f8f45cc..440639f06b 100644
--- a/osu.Game/Overlays/SettingsSubPanel.cs
+++ b/osu.Game/Overlays/SettingsSubPanel.cs
@@ -1,17 +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.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.Settings;
-using osuTK;
 
 namespace osu.Game.Overlays
 {
@@ -25,69 +15,8 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(new BackButton
-            {
-                Anchor = Anchor.BottomLeft,
-                Origin = Anchor.BottomLeft,
-                Action = Hide
-            });
         }
 
         protected override bool DimMainContent => false; // dimming is handled by main overlay
-
-        public partial class BackButton : SidebarButton
-        {
-            private Drawable content;
-
-            public BackButton()
-                : base(HoverSampleSet.Default)
-            {
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Size = new Vector2(SettingsSidebar.EXPANDED_WIDTH);
-
-                Padding = new MarginPadding(40);
-
-                AddRange(new Drawable[]
-                {
-                    content = new FillFlowContainer
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Direction = FillDirection.Vertical,
-                        AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(5),
-                        Children = new Drawable[]
-                        {
-                            new SpriteIcon
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Size = new Vector2(30),
-                                Shadow = true,
-                                Icon = FontAwesome.Solid.ChevronLeft
-                            },
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
-                                Text = @"back",
-                            },
-                        }
-                    }
-                });
-            }
-
-            protected override void UpdateState()
-            {
-                base.UpdateState();
-
-                content.FadeColour(IsHovered ? ColourProvider.Light1 : ColourProvider.Light3, FADE_DURATION, Easing.OutQuint);
-            }
-        }
     }
 }

From 81ba46216f0951e30329c3e2779a5380ee25e743 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 13:49:00 +0900
Subject: [PATCH 2165/2296] Speed up fades in transition to avoid ugliness

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

diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 3861c5abc7..748673035b 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Overlays
             Scheduler.AddDelayed(loadSections, TRANSITION_LENGTH / 3);
 
             Sidebar?.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
-            this.FadeTo(1, TRANSITION_LENGTH, Easing.OutQuint);
+            this.FadeTo(1, TRANSITION_LENGTH / 2, Easing.OutQuint);
 
             searchTextBox.TakeFocus();
             searchTextBox.HoldFocus = true;
@@ -197,7 +197,7 @@ namespace osu.Game.Overlays
             ContentContainer.MoveToX(-WIDTH + ExpandedPosition, TRANSITION_LENGTH, Easing.OutQuint);
 
             Sidebar?.MoveToX(-sidebar_width, TRANSITION_LENGTH, Easing.OutQuint);
-            this.FadeTo(0, TRANSITION_LENGTH, Easing.OutQuint);
+            this.FadeTo(0, TRANSITION_LENGTH / 2, Easing.OutQuint);
 
             searchTextBox.HoldFocus = false;
             if (searchTextBox.HasFocus)

From 768e10d55f5e3cc144856b47906b03187f162e13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 13:50:47 +0900
Subject: [PATCH 2166/2296] Adjust `NotificationOverlay` fades to match

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

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index c3ddb228ea..f56d09f2b2 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -227,7 +227,7 @@ namespace osu.Game.Overlays
         protected override void PopIn()
         {
             this.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
-            mainContent.FadeTo(1, TRANSITION_LENGTH, Easing.OutQuint);
+            mainContent.FadeTo(1, TRANSITION_LENGTH / 2, Easing.OutQuint);
             mainContent.FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
 
             toastTray.FlushAllToasts();
@@ -240,7 +240,7 @@ namespace osu.Game.Overlays
             markAllRead();
 
             this.MoveToX(WIDTH, TRANSITION_LENGTH, Easing.OutQuint);
-            mainContent.FadeTo(0, TRANSITION_LENGTH, Easing.OutQuint);
+            mainContent.FadeTo(0, TRANSITION_LENGTH / 2, Easing.OutQuint);
             mainContent.FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.In);
         }
 

From 8f7e0571f0693cfd8fefcc41f41a70239db1f21e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 10:51:05 +0100
Subject: [PATCH 2167/2296] Add failing test coverage of handling out-of-bounds
 catch objects

---
 .../TestSceneOutOfBoundsObjects.cs            | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneOutOfBoundsObjects.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneOutOfBoundsObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneOutOfBoundsObjects.cs
new file mode 100644
index 0000000000..951f5d1ca1
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneOutOfBoundsObjects.cs
@@ -0,0 +1,72 @@
+// 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.Beatmaps;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public partial class TestSceneOutOfBoundsObjects : TestSceneCatchPlayer
+    {
+        protected override bool Autoplay => true;
+
+        [Test]
+        public void TestNoOutOfBoundsObjects()
+        {
+            bool anyObjectOutOfBounds = false;
+
+            AddStep("reset flag", () => anyObjectOutOfBounds = false);
+
+            AddUntilStep("check for out-of-bounds objects",
+                () =>
+                {
+                    anyObjectOutOfBounds |= Player.ChildrenOfType<DrawableCatchHitObject>().Any(dho => dho.X < 0 || dho.X > CatchPlayfield.WIDTH);
+                    return Player.ScoreProcessor.HasCompleted.Value;
+                });
+
+            AddAssert("no out of bound objects found", () => !anyObjectOutOfBounds);
+        }
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new Beatmap
+        {
+            BeatmapInfo = new BeatmapInfo
+            {
+                Ruleset = ruleset,
+            },
+            HitObjects = new List<HitObject>
+            {
+                new Fruit { StartTime = 1000, X = -50 },
+                new Fruit { StartTime = 1200, X = CatchPlayfield.WIDTH + 50 },
+                new JuiceStream
+                {
+                    StartTime = 1500,
+                    X = 10,
+                    Path = new SliderPath(PathType.LINEAR, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(-200, 0)
+                    })
+                },
+                new JuiceStream
+                {
+                    StartTime = 3000,
+                    X = CatchPlayfield.WIDTH - 10,
+                    Path = new SliderPath(PathType.LINEAR, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(200, 0)
+                    })
+                },
+            }
+        };
+    }
+}

From 2e8b49b93a7ec12ace3ea9e3f0713f8ba20545e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 10:55:29 +0100
Subject: [PATCH 2168/2296] Fix catch drawable objects not being clamped to
 playfield bounds

---
 .../Objects/Drawables/DrawablePalpableCatchHitObject.cs    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 4a9661f108..ade00918ab 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.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;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Catch.UI;
 using osuTK;
 using osuTK.Graphics;
 
@@ -70,7 +72,10 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         private void updateXPosition(ValueChangedEvent<float> _)
         {
-            X = OriginalXBindable.Value + XOffsetBindable.Value;
+            // same as `CatchHitObject.EffectiveX`.
+            // not using that property directly to support scenarios where `HitObject` may not necessarily be present
+            // for this pooled drawable.
+            X = Math.Clamp(OriginalXBindable.Value + XOffsetBindable.Value, 0, CatchPlayfield.WIDTH);
         }
 
         protected override void OnApply()

From 1233533fb967390c2c433ea0f7feb0dadd682635 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 22:14:15 +0900
Subject: [PATCH 2169/2296] Update framework

---
 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 cf01f2f99b..b179b8b837 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1219.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2023.1227.1" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fbcdb00cdb..dd2393ff21 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="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2023.1219.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2023.1227.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1225.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index c7b9d02b26..7e03ab50e2 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -23,6 +23,6 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1219.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2023.1227.1" />
   </ItemGroup>
 </Project>

From 14b37db3dd17d3be07a9dce5b088b59205d33815 Mon Sep 17 00:00:00 2001
From: Gabriel Del Nero <43073074+Gabixel@users.noreply.github.com>
Date: Wed, 27 Dec 2023 14:35:19 +0100
Subject: [PATCH 2170/2296] Make `ModDaycore` sequential for `ModHalfTime`

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

diff --git a/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs b/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
index 59a631a7b5..bf58efc339 100644
--- a/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
+++ b/osu.Game/Overlays/Mods/Input/ClassicModHotkeyHandler.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Mods.Input
         {
             [Key.Q] = new[] { typeof(ModEasy) },
             [Key.W] = new[] { typeof(ModNoFail) },
-            [Key.E] = new[] { typeof(ModHalfTime) },
+            [Key.E] = new[] { typeof(ModHalfTime), typeof(ModDaycore) },
             [Key.A] = new[] { typeof(ModHardRock) },
             [Key.S] = new[] { typeof(ModSuddenDeath), typeof(ModPerfect) },
             [Key.D] = new[] { typeof(ModDoubleTime), typeof(ModNightcore) },

From 13333f75756e587572411971524a65cda09eedab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 15:02:19 +0100
Subject: [PATCH 2171/2296] Make room for `OsuIcon` to accept new icons

---
 osu.Game/Graphics/OsuIcon.cs | 132 ++++++++++++++++++-----------------
 1 file changed, 68 insertions(+), 64 deletions(-)

diff --git a/osu.Game/Graphics/OsuIcon.cs b/osu.Game/Graphics/OsuIcon.cs
index 15af8f000b..d1ad818300 100644
--- a/osu.Game/Graphics/OsuIcon.cs
+++ b/osu.Game/Graphics/OsuIcon.cs
@@ -7,90 +7,94 @@ namespace osu.Game.Graphics
 {
     public static class OsuIcon
     {
-        public static IconUsage Get(int icon) => new IconUsage((char)icon, "osuFont");
+        #region Legacy spritesheet-based icons
+
+        private static IconUsage get(int icon) => new IconUsage((char)icon, @"osuFont");
 
         // ruleset icons in circles
-        public static IconUsage RulesetOsu => Get(0xe000);
-        public static IconUsage RulesetMania => Get(0xe001);
-        public static IconUsage RulesetCatch => Get(0xe002);
-        public static IconUsage RulesetTaiko => Get(0xe003);
+        public static IconUsage RulesetOsu => get(0xe000);
+        public static IconUsage RulesetMania => get(0xe001);
+        public static IconUsage RulesetCatch => get(0xe002);
+        public static IconUsage RulesetTaiko => get(0xe003);
 
         // ruleset icons without circles
-        public static IconUsage FilledCircle => Get(0xe004);
-        public static IconUsage CrossCircle => Get(0xe005);
-        public static IconUsage Logo => Get(0xe006);
-        public static IconUsage ChevronDownCircle => Get(0xe007);
-        public static IconUsage EditCircle => Get(0xe033);
-        public static IconUsage LeftCircle => Get(0xe034);
-        public static IconUsage RightCircle => Get(0xe035);
-        public static IconUsage Charts => Get(0xe036);
-        public static IconUsage Solo => Get(0xe037);
-        public static IconUsage Multi => Get(0xe038);
-        public static IconUsage Gear => Get(0xe039);
+        public static IconUsage FilledCircle => get(0xe004);
+        public static IconUsage CrossCircle => get(0xe005);
+        public static IconUsage Logo => get(0xe006);
+        public static IconUsage ChevronDownCircle => get(0xe007);
+        public static IconUsage EditCircle => get(0xe033);
+        public static IconUsage LeftCircle => get(0xe034);
+        public static IconUsage RightCircle => get(0xe035);
+        public static IconUsage Charts => get(0xe036);
+        public static IconUsage Solo => get(0xe037);
+        public static IconUsage Multi => get(0xe038);
+        public static IconUsage Gear => get(0xe039);
 
         // misc icons
-        public static IconUsage Bat => Get(0xe008);
-        public static IconUsage Bubble => Get(0xe009);
-        public static IconUsage BubblePop => Get(0xe02e);
-        public static IconUsage Dice => Get(0xe011);
-        public static IconUsage Heart => Get(0xe02f);
-        public static IconUsage HeartBreak => Get(0xe030);
-        public static IconUsage Hot => Get(0xe031);
-        public static IconUsage ListSearch => Get(0xe032);
+        public static IconUsage Bat => get(0xe008);
+        public static IconUsage Bubble => get(0xe009);
+        public static IconUsage BubblePop => get(0xe02e);
+        public static IconUsage Dice => get(0xe011);
+        public static IconUsage Heart => get(0xe02f);
+        public static IconUsage HeartBreak => get(0xe030);
+        public static IconUsage Hot => get(0xe031);
+        public static IconUsage ListSearch => get(0xe032);
 
         //osu! playstyles
-        public static IconUsage PlayStyleTablet => Get(0xe02a);
-        public static IconUsage PlayStyleMouse => Get(0xe029);
-        public static IconUsage PlayStyleKeyboard => Get(0xe02b);
-        public static IconUsage PlayStyleTouch => Get(0xe02c);
+        public static IconUsage PlayStyleTablet => get(0xe02a);
+        public static IconUsage PlayStyleMouse => get(0xe029);
+        public static IconUsage PlayStyleKeyboard => get(0xe02b);
+        public static IconUsage PlayStyleTouch => get(0xe02c);
 
         // osu! difficulties
-        public static IconUsage EasyOsu => Get(0xe015);
-        public static IconUsage NormalOsu => Get(0xe016);
-        public static IconUsage HardOsu => Get(0xe017);
-        public static IconUsage InsaneOsu => Get(0xe018);
-        public static IconUsage ExpertOsu => Get(0xe019);
+        public static IconUsage EasyOsu => get(0xe015);
+        public static IconUsage NormalOsu => get(0xe016);
+        public static IconUsage HardOsu => get(0xe017);
+        public static IconUsage InsaneOsu => get(0xe018);
+        public static IconUsage ExpertOsu => get(0xe019);
 
         // taiko difficulties
-        public static IconUsage EasyTaiko => Get(0xe01a);
-        public static IconUsage NormalTaiko => Get(0xe01b);
-        public static IconUsage HardTaiko => Get(0xe01c);
-        public static IconUsage InsaneTaiko => Get(0xe01d);
-        public static IconUsage ExpertTaiko => Get(0xe01e);
+        public static IconUsage EasyTaiko => get(0xe01a);
+        public static IconUsage NormalTaiko => get(0xe01b);
+        public static IconUsage HardTaiko => get(0xe01c);
+        public static IconUsage InsaneTaiko => get(0xe01d);
+        public static IconUsage ExpertTaiko => get(0xe01e);
 
         // fruits difficulties
-        public static IconUsage EasyFruits => Get(0xe01f);
-        public static IconUsage NormalFruits => Get(0xe020);
-        public static IconUsage HardFruits => Get(0xe021);
-        public static IconUsage InsaneFruits => Get(0xe022);
-        public static IconUsage ExpertFruits => Get(0xe023);
+        public static IconUsage EasyFruits => get(0xe01f);
+        public static IconUsage NormalFruits => get(0xe020);
+        public static IconUsage HardFruits => get(0xe021);
+        public static IconUsage InsaneFruits => get(0xe022);
+        public static IconUsage ExpertFruits => get(0xe023);
 
         // mania difficulties
-        public static IconUsage EasyMania => Get(0xe024);
-        public static IconUsage NormalMania => Get(0xe025);
-        public static IconUsage HardMania => Get(0xe026);
-        public static IconUsage InsaneMania => Get(0xe027);
-        public static IconUsage ExpertMania => Get(0xe028);
+        public static IconUsage EasyMania => get(0xe024);
+        public static IconUsage NormalMania => get(0xe025);
+        public static IconUsage HardMania => get(0xe026);
+        public static IconUsage InsaneMania => get(0xe027);
+        public static IconUsage ExpertMania => get(0xe028);
 
         // mod icons
-        public static IconUsage ModPerfect => Get(0xe049);
-        public static IconUsage ModAutopilot => Get(0xe03a);
-        public static IconUsage ModAuto => Get(0xe03b);
-        public static IconUsage ModCinema => Get(0xe03c);
-        public static IconUsage ModDoubleTime => Get(0xe03d);
-        public static IconUsage ModEasy => Get(0xe03e);
-        public static IconUsage ModFlashlight => Get(0xe03f);
-        public static IconUsage ModHalftime => Get(0xe040);
-        public static IconUsage ModHardRock => Get(0xe041);
-        public static IconUsage ModHidden => Get(0xe042);
-        public static IconUsage ModNightcore => Get(0xe043);
-        public static IconUsage ModNoFail => Get(0xe044);
-        public static IconUsage ModRelax => Get(0xe045);
-        public static IconUsage ModSpunOut => Get(0xe046);
-        public static IconUsage ModSuddenDeath => Get(0xe047);
-        public static IconUsage ModTarget => Get(0xe048);
+        public static IconUsage ModPerfect => get(0xe049);
+        public static IconUsage ModAutopilot => get(0xe03a);
+        public static IconUsage ModAuto => get(0xe03b);
+        public static IconUsage ModCinema => get(0xe03c);
+        public static IconUsage ModDoubleTime => get(0xe03d);
+        public static IconUsage ModEasy => get(0xe03e);
+        public static IconUsage ModFlashlight => get(0xe03f);
+        public static IconUsage ModHalftime => get(0xe040);
+        public static IconUsage ModHardRock => get(0xe041);
+        public static IconUsage ModHidden => get(0xe042);
+        public static IconUsage ModNightcore => get(0xe043);
+        public static IconUsage ModNoFail => get(0xe044);
+        public static IconUsage ModRelax => get(0xe045);
+        public static IconUsage ModSpunOut => get(0xe046);
+        public static IconUsage ModSuddenDeath => get(0xe047);
+        public static IconUsage ModTarget => get(0xe048);
 
         // Use "Icons/BeatmapDetails/mod-icon" instead
         // public static IconUsage ModBg => Get(0xe04a);
+
+        #endregion
     }
 }

From 45143a6c17e4574aab8a910a7be27e568f91c34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 15:17:39 +0100
Subject: [PATCH 2172/2296] Implement new icon store

---
 osu.Game/Graphics/OsuIcon.cs | 348 ++++++++++++++++++++++++++++++++++-
 osu.Game/OsuGameBase.cs      |   1 +
 2 files changed, 347 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/OsuIcon.cs b/osu.Game/Graphics/OsuIcon.cs
index d1ad818300..3cd10b1315 100644
--- a/osu.Game/Graphics/OsuIcon.cs
+++ b/osu.Game/Graphics/OsuIcon.cs
@@ -1,7 +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 System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Text;
 
 namespace osu.Game.Graphics
 {
@@ -19,7 +28,6 @@ namespace osu.Game.Graphics
 
         // ruleset icons without circles
         public static IconUsage FilledCircle => get(0xe004);
-        public static IconUsage CrossCircle => get(0xe005);
         public static IconUsage Logo => get(0xe006);
         public static IconUsage ChevronDownCircle => get(0xe007);
         public static IconUsage EditCircle => get(0xe033);
@@ -35,7 +43,6 @@ namespace osu.Game.Graphics
         public static IconUsage Bubble => get(0xe009);
         public static IconUsage BubblePop => get(0xe02e);
         public static IconUsage Dice => get(0xe011);
-        public static IconUsage Heart => get(0xe02f);
         public static IconUsage HeartBreak => get(0xe030);
         public static IconUsage Hot => get(0xe031);
         public static IconUsage ListSearch => get(0xe032);
@@ -96,5 +103,342 @@ namespace osu.Game.Graphics
         // public static IconUsage ModBg => Get(0xe04a);
 
         #endregion
+
+        #region New single-file-based icons
+
+        public const string FONT_NAME = @"Icons";
+
+        public static IconUsage Audio => get(OsuIconMapping.Audio);
+        public static IconUsage Beatmap => get(OsuIconMapping.Beatmap);
+        public static IconUsage Calendar => get(OsuIconMapping.Calendar);
+        public static IconUsage ChangelogA => get(OsuIconMapping.ChangelogA);
+        public static IconUsage ChangelogB => get(OsuIconMapping.ChangelogB);
+        public static IconUsage Chat => get(OsuIconMapping.Chat);
+        public static IconUsage CheckCircle => get(OsuIconMapping.CheckCircle);
+        public static IconUsage CollapseA => get(OsuIconMapping.CollapseA);
+        public static IconUsage Collections => get(OsuIconMapping.Collections);
+        public static IconUsage Cross => get(OsuIconMapping.Cross);
+        public static IconUsage CrossCircle => get(OsuIconMapping.CrossCircle);
+        public static IconUsage Crown => get(OsuIconMapping.Crown);
+        public static IconUsage Debug => get(OsuIconMapping.Debug);
+        public static IconUsage Delete => get(OsuIconMapping.Delete);
+        public static IconUsage Details => get(OsuIconMapping.Details);
+        public static IconUsage Discord => get(OsuIconMapping.Discord);
+        public static IconUsage EllipsisHorizontal => get(OsuIconMapping.EllipsisHorizontal);
+        public static IconUsage EllipsisVertical => get(OsuIconMapping.EllipsisVertical);
+        public static IconUsage ExpandA => get(OsuIconMapping.ExpandA);
+        public static IconUsage ExpandB => get(OsuIconMapping.ExpandB);
+        public static IconUsage FeaturedArtist => get(OsuIconMapping.FeaturedArtist);
+        public static IconUsage FeaturedArtistCircle => get(OsuIconMapping.FeaturedArtistCircle);
+        public static IconUsage GameplayA => get(OsuIconMapping.GameplayA);
+        public static IconUsage GameplayB => get(OsuIconMapping.GameplayB);
+        public static IconUsage GameplayC => get(OsuIconMapping.GameplayC);
+        public static IconUsage Global => get(OsuIconMapping.Global);
+        public static IconUsage Graphics => get(OsuIconMapping.Graphics);
+        public static IconUsage Heart => get(OsuIconMapping.Heart);
+        public static IconUsage Home => get(OsuIconMapping.Home);
+        public static IconUsage Input => get(OsuIconMapping.Input);
+        public static IconUsage Maintenance => get(OsuIconMapping.Maintenance);
+        public static IconUsage Megaphone => get(OsuIconMapping.Megaphone);
+        public static IconUsage Music => get(OsuIconMapping.Music);
+        public static IconUsage News => get(OsuIconMapping.News);
+        public static IconUsage Next => get(OsuIconMapping.Next);
+        public static IconUsage NextCircle => get(OsuIconMapping.NextCircle);
+        public static IconUsage Notification => get(OsuIconMapping.Notification);
+        public static IconUsage Online => get(OsuIconMapping.Online);
+        public static IconUsage Play => get(OsuIconMapping.Play);
+        public static IconUsage Player => get(OsuIconMapping.Player);
+        public static IconUsage PlayerFollow => get(OsuIconMapping.PlayerFollow);
+        public static IconUsage Prev => get(OsuIconMapping.Prev);
+        public static IconUsage PrevCircle => get(OsuIconMapping.PrevCircle);
+        public static IconUsage Ranking => get(OsuIconMapping.Ranking);
+        public static IconUsage Rulesets => get(OsuIconMapping.Rulesets);
+        public static IconUsage Search => get(OsuIconMapping.Search);
+        public static IconUsage Settings => get(OsuIconMapping.Settings);
+        public static IconUsage SkinA => get(OsuIconMapping.SkinA);
+        public static IconUsage SkinB => get(OsuIconMapping.SkinB);
+        public static IconUsage Star => get(OsuIconMapping.Star);
+        public static IconUsage Storyboard => get(OsuIconMapping.Storyboard);
+        public static IconUsage Team => get(OsuIconMapping.Team);
+        public static IconUsage ThumbsUp => get(OsuIconMapping.ThumbsUp);
+        public static IconUsage Tournament => get(OsuIconMapping.Tournament);
+        public static IconUsage Twitter => get(OsuIconMapping.Twitter);
+        public static IconUsage UserInterface => get(OsuIconMapping.UserInterface);
+        public static IconUsage Wiki => get(OsuIconMapping.Wiki);
+        public static IconUsage EditorAddControlPoint => get(OsuIconMapping.EditorAddControlPoint);
+        public static IconUsage EditorConvertToStream => get(OsuIconMapping.EditorConvertToStream);
+        public static IconUsage EditorDistanceSnap => get(OsuIconMapping.EditorDistanceSnap);
+        public static IconUsage EditorFinish => get(OsuIconMapping.EditorFinish);
+        public static IconUsage EditorGridSnap => get(OsuIconMapping.EditorGridSnap);
+        public static IconUsage EditorNewComboA => get(OsuIconMapping.EditorNewComboA);
+        public static IconUsage EditorNewComboB => get(OsuIconMapping.EditorNewComboB);
+        public static IconUsage EditorSelect => get(OsuIconMapping.EditorSelect);
+        public static IconUsage EditorSound => get(OsuIconMapping.EditorSound);
+        public static IconUsage EditorWhistle => get(OsuIconMapping.EditorWhistle);
+
+        private static IconUsage get(OsuIconMapping glyph) => new IconUsage((char)glyph, FONT_NAME);
+
+        private enum OsuIconMapping
+        {
+            [Description(@"audio")]
+            Audio,
+
+            [Description(@"beatmap")]
+            Beatmap,
+
+            [Description(@"calendar")]
+            Calendar,
+
+            [Description(@"changelog-a")]
+            ChangelogA,
+
+            [Description(@"changelog-b")]
+            ChangelogB,
+
+            [Description(@"chat")]
+            Chat,
+
+            [Description(@"check-circle")]
+            CheckCircle,
+
+            [Description(@"collapse-a")]
+            CollapseA,
+
+            [Description(@"collections")]
+            Collections,
+
+            [Description(@"cross")]
+            Cross,
+
+            [Description(@"cross-circle")]
+            CrossCircle,
+
+            [Description(@"crown")]
+            Crown,
+
+            [Description(@"debug")]
+            Debug,
+
+            [Description(@"delete")]
+            Delete,
+
+            [Description(@"details")]
+            Details,
+
+            [Description(@"discord")]
+            Discord,
+
+            [Description(@"ellipsis-horizontal")]
+            EllipsisHorizontal,
+
+            [Description(@"ellipsis-vertical")]
+            EllipsisVertical,
+
+            [Description(@"expand-a")]
+            ExpandA,
+
+            [Description(@"expand-b")]
+            ExpandB,
+
+            [Description(@"featured-artist")]
+            FeaturedArtist,
+
+            [Description(@"featured-artist-circle")]
+            FeaturedArtistCircle,
+
+            [Description(@"gameplay-a")]
+            GameplayA,
+
+            [Description(@"gameplay-b")]
+            GameplayB,
+
+            [Description(@"gameplay-c")]
+            GameplayC,
+
+            [Description(@"global")]
+            Global,
+
+            [Description(@"graphics")]
+            Graphics,
+
+            [Description(@"heart")]
+            Heart,
+
+            [Description(@"home")]
+            Home,
+
+            [Description(@"input")]
+            Input,
+
+            [Description(@"maintenance")]
+            Maintenance,
+
+            [Description(@"megaphone")]
+            Megaphone,
+
+            [Description(@"music")]
+            Music,
+
+            [Description(@"news")]
+            News,
+
+            [Description(@"next")]
+            Next,
+
+            [Description(@"next-circle")]
+            NextCircle,
+
+            [Description(@"notification")]
+            Notification,
+
+            [Description(@"online")]
+            Online,
+
+            [Description(@"play")]
+            Play,
+
+            [Description(@"player")]
+            Player,
+
+            [Description(@"player-follow")]
+            PlayerFollow,
+
+            [Description(@"prev")]
+            Prev,
+
+            [Description(@"prev-circle")]
+            PrevCircle,
+
+            [Description(@"ranking")]
+            Ranking,
+
+            [Description(@"rulesets")]
+            Rulesets,
+
+            [Description(@"search")]
+            Search,
+
+            [Description(@"settings")]
+            Settings,
+
+            [Description(@"skin-a")]
+            SkinA,
+
+            [Description(@"skin-b")]
+            SkinB,
+
+            [Description(@"star")]
+            Star,
+
+            [Description(@"storyboard")]
+            Storyboard,
+
+            [Description(@"team")]
+            Team,
+
+            [Description(@"thumbs-up")]
+            ThumbsUp,
+
+            [Description(@"tournament")]
+            Tournament,
+
+            [Description(@"twitter")]
+            Twitter,
+
+            [Description(@"user-interface")]
+            UserInterface,
+
+            [Description(@"wiki")]
+            Wiki,
+
+            [Description(@"Editor/add-control-point")]
+            EditorAddControlPoint = 1000,
+
+            [Description(@"Editor/convert-to-stream")]
+            EditorConvertToStream,
+
+            [Description(@"Editor/distance-snap")]
+            EditorDistanceSnap,
+
+            [Description(@"Editor/finish")]
+            EditorFinish,
+
+            [Description(@"Editor/grid-snap")]
+            EditorGridSnap,
+
+            [Description(@"Editor/new-combo-a")]
+            EditorNewComboA,
+
+            [Description(@"Editor/new-combo-b")]
+            EditorNewComboB,
+
+            [Description(@"Editor/select")]
+            EditorSelect,
+
+            [Description(@"Editor/sound")]
+            EditorSound,
+
+            [Description(@"Editor/whistle")]
+            EditorWhistle,
+        }
+
+        public class OsuIconStore : ITextureStore, ITexturedGlyphLookupStore
+        {
+            private readonly TextureStore textures;
+
+            public OsuIconStore(TextureStore textures)
+            {
+                this.textures = textures;
+            }
+
+            public ITexturedCharacterGlyph? Get(string? fontName, char character)
+            {
+                if (fontName == FONT_NAME)
+                    return new Glyph(textures.Get($@"{fontName}/{((OsuIconMapping)character).GetDescription()}"));
+
+                return null;
+            }
+
+            public Task<ITexturedCharacterGlyph?> GetAsync(string fontName, char character) => Task.Run(() => Get(fontName, character));
+
+            public Texture? Get(string name, WrapMode wrapModeS, WrapMode wrapModeT) => null;
+
+            public Texture Get(string name) => throw new NotImplementedException();
+
+            public Task<Texture> GetAsync(string name, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+
+            public Stream GetStream(string name) => throw new NotImplementedException();
+
+            public IEnumerable<string> GetAvailableResources() => throw new NotImplementedException();
+
+            public Task<Texture?> GetAsync(string name, WrapMode wrapModeS, WrapMode wrapModeT, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+
+            public class Glyph : ITexturedCharacterGlyph
+            {
+                public float XOffset => default;
+                public float YOffset => default;
+                public float XAdvance => default;
+                public float Baseline => default;
+                public char Character => default;
+
+                public float GetKerning<T>(T lastGlyph) where T : ICharacterGlyph => throw new NotImplementedException();
+
+                public Texture Texture { get; }
+                public float Width => Texture.Width;
+                public float Height => Texture.Height;
+
+                public Glyph(Texture texture)
+                {
+                    Texture = texture;
+                }
+            }
+
+            public void Dispose()
+            {
+                textures.Dispose();
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 48548dc1ef..b4ad21f045 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -479,6 +479,7 @@ namespace osu.Game
             AddFont(Resources, @"Fonts/Venera/Venera-Black");
 
             Fonts.AddStore(new HexaconsIcons.HexaconsStore(Textures));
+            Fonts.AddStore(new OsuIcon.OsuIconStore(Textures));
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>

From 69baabee627f55d87f6ba61f361e1b370bbfdd2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 15:35:03 +0100
Subject: [PATCH 2173/2296] Replace hexacons in toolbar with new icons

---
 osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs | 2 +-
 osu.Game/Overlays/Changelog/ChangelogHeader.cs           | 2 +-
 osu.Game/Overlays/ChatOverlay.cs                         | 2 +-
 osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs    | 2 +-
 osu.Game/Overlays/News/NewsHeader.cs                     | 2 +-
 osu.Game/Overlays/NotificationOverlay.cs                 | 2 +-
 osu.Game/Overlays/NowPlayingOverlay.cs                   | 2 +-
 osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs      | 2 +-
 osu.Game/Overlays/SettingsOverlay.cs                     | 2 +-
 osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs           | 2 +-
 osu.Game/Overlays/Wiki/WikiHeader.cs                     | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
index 27fab82bf3..075dfd02b0 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.BeatmapListing
             {
                 Title = PageTitleStrings.MainBeatmapsetsControllerIndex;
                 Description = NamedOverlayComponentStrings.BeatmapListingDescription;
-                Icon = HexaconsIcons.Beatmap;
+                Icon = OsuIcon.Beatmap;
             }
         }
     }
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 61ea9dc4db..f738d70370 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.Changelog
             {
                 Title = PageTitleStrings.MainChangelogControllerDefault;
                 Description = NamedOverlayComponentStrings.ChangelogDescription;
-                Icon = HexaconsIcons.Devtools;
+                Icon = OsuIcon.ChangelogB;
             }
         }
     }
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 4aa4c59471..8f3b7031c2 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays
 {
     public partial class ChatOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent, IKeyBindingHandler<PlatformAction>
     {
-        public IconUsage Icon => HexaconsIcons.Messaging;
+        public IconUsage Icon => OsuIcon.Chat;
         public LocalisableString Title => ChatStrings.HeaderTitle;
         public LocalisableString Description => ChatStrings.HeaderDescription;
 
diff --git a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
index 104f0943dc..8fd8f6b332 100644
--- a/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
+++ b/osu.Game/Overlays/Dashboard/DashboardOverlayHeader.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Dashboard
             {
                 Title = PageTitleStrings.MainHomeControllerIndex;
                 Description = NamedOverlayComponentStrings.DashboardDescription;
-                Icon = HexaconsIcons.Social;
+                Icon = OsuIcon.Global;
             }
         }
     }
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index f237ed66f2..92d71a21ef 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Overlays.News
             {
                 Title = PageTitleStrings.MainNewsControllerDefault;
                 Description = NamedOverlayComponentStrings.NewsDescription;
-                Icon = HexaconsIcons.News;
+                Icon = OsuIcon.News;
             }
         }
     }
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index f56d09f2b2..18a487a312 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays
 {
     public partial class NotificationOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent, INotificationOverlay
     {
-        public IconUsage Icon => HexaconsIcons.Notification;
+        public IconUsage Icon => OsuIcon.Notification;
         public LocalisableString Title => NotificationsStrings.HeaderTitle;
         public LocalisableString Description => NotificationsStrings.HeaderDescription;
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 425ff0935d..7ec52364d4 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays
 {
     public partial class NowPlayingOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
-        public IconUsage Icon => HexaconsIcons.Music;
+        public IconUsage Icon => OsuIcon.Music;
         public LocalisableString Title => NowPlayingStrings.HeaderTitle;
         public LocalisableString Description => NowPlayingStrings.HeaderDescription;
 
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 63128fb73d..a23ec18afe 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Rankings
             {
                 Title = PageTitleStrings.MainRankingControllerDefault;
                 Description = NamedOverlayComponentStrings.RankingsDescription;
-                Icon = HexaconsIcons.Rankings;
+                Icon = OsuIcon.Ranking;
             }
         }
     }
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 5735b1515a..9efd848035 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Overlays
 {
     public partial class SettingsOverlay : SettingsPanel, INamedOverlayComponent
     {
-        public IconUsage Icon => HexaconsIcons.Settings;
+        public IconUsage Icon => OsuIcon.Settings;
         public LocalisableString Title => SettingsStrings.HeaderTitle;
         public LocalisableString Description => SettingsStrings.HeaderDescription;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
index ded0229d67..70675c1b92 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Toolbar
         {
             TooltipMain = ToolbarStrings.HomeHeaderTitle;
             TooltipSub = ToolbarStrings.HomeHeaderDescription;
-            SetIcon(HexaconsIcons.Home);
+            SetIcon(OsuIcon.Home);
         }
     }
 }
diff --git a/osu.Game/Overlays/Wiki/WikiHeader.cs b/osu.Game/Overlays/Wiki/WikiHeader.cs
index 9e9e565684..24eddeb0c2 100644
--- a/osu.Game/Overlays/Wiki/WikiHeader.cs
+++ b/osu.Game/Overlays/Wiki/WikiHeader.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Overlays.Wiki
             {
                 Title = PageTitleStrings.MainWikiControllerDefault;
                 Description = NamedOverlayComponentStrings.WikiDescription;
-                Icon = HexaconsIcons.Wiki;
+                Icon = OsuIcon.Wiki;
             }
         }
     }

From 28d9145a4c182ecb66029e0b1e52f24f7cc16acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 15:47:29 +0100
Subject: [PATCH 2174/2296] Add more spacing to toolbar icons

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

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 81d2de5acb..a547fda814 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Overlays.Toolbar
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Size = new Vector2(26),
+                            Size = new Vector2(20),
                             Alpha = 0,
                         },
                         DrawableText = new OsuSpriteText

From c45477bd1fff8447755f7afd54bf5156e1352833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 15:40:48 +0100
Subject: [PATCH 2175/2296] Use new icons in main menu wherever feasible

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index ca5bef985e..b2b3fbd626 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -13,7 +13,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
@@ -103,8 +102,8 @@ namespace osu.Game.Screens.Menu
 
             buttonArea.AddRange(new Drawable[]
             {
-                new MainMenuButton(ButtonSystemStrings.Settings, string.Empty, FontAwesome.Solid.Cog, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
-                backButton = new MainMenuButton(ButtonSystemStrings.Back, @"back-to-top", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel,
+                new MainMenuButton(ButtonSystemStrings.Settings, string.Empty, OsuIcon.Settings, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
+                backButton = new MainMenuButton(ButtonSystemStrings.Back, @"back-to-top", OsuIcon.PrevCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel,
                     -WEDGE_WIDTH)
                 {
                     VisibleStateMin = ButtonSystemState.Play,
@@ -128,18 +127,18 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, IdleTracker? idleTracker, GameHost host)
         {
-            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Solo, @"button-default-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Multi, @"button-default-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Playlists, @"button-default-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
+            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Solo, @"button-default-select", OsuIcon.Player, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
+            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Multi, @"button-default-select", OsuIcon.Online, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
+            buttonsPlay.Add(new MainMenuButton(ButtonSystemStrings.Playlists, @"button-default-select", OsuIcon.Tournament, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
-            buttonsEdit.Add(new MainMenuButton(EditorStrings.BeatmapEditor.ToLower(), @"button-default-select", HexaconsIcons.Beatmap, new Color4(238, 170, 0, 255), () => OnEditBeatmap?.Invoke(), WEDGE_WIDTH, Key.B));
-            buttonsEdit.Add(new MainMenuButton(SkinEditorStrings.SkinEditor.ToLower(), @"button-default-select", HexaconsIcons.Editor, new Color4(220, 160, 0, 255), () => OnEditSkin?.Invoke(), 0, Key.S));
+            buttonsEdit.Add(new MainMenuButton(EditorStrings.BeatmapEditor.ToLower(), @"button-default-select", OsuIcon.Beatmap, new Color4(238, 170, 0, 255), () => OnEditBeatmap?.Invoke(), WEDGE_WIDTH, Key.B));
+            buttonsEdit.Add(new MainMenuButton(SkinEditorStrings.SkinEditor.ToLower(), @"button-default-select", OsuIcon.SkinB, new Color4(220, 160, 0, 255), () => OnEditSkin?.Invoke(), 0, Key.S));
             buttonsEdit.ForEach(b => b.VisibleState = ButtonSystemState.Edit);
 
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Edit, @"button-play-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => State = ButtonSystemState.Edit, 0, Key.E));
-            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-default-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B, Key.D));
+            buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Browse, @"button-default-select", OsuIcon.Beatmap, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.B, Key.D));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new MainMenuButton(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));

From 2857322a8bc3257ae26ea35567b8f1741b7a45ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 15:53:01 +0100
Subject: [PATCH 2176/2296] Use new icons in settings

---
 osu.Game/Overlays/Settings/Sections/AudioSection.cs         | 3 ++-
 osu.Game/Overlays/Settings/Sections/DebugSection.cs         | 3 ++-
 osu.Game/Overlays/Settings/Sections/GameplaySection.cs      | 3 ++-
 osu.Game/Overlays/Settings/Sections/GeneralSection.cs       | 2 +-
 osu.Game/Overlays/Settings/Sections/GraphicsSection.cs      | 3 ++-
 osu.Game/Overlays/Settings/Sections/InputSection.cs         | 3 ++-
 osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs   | 3 ++-
 osu.Game/Overlays/Settings/Sections/OnlineSection.cs        | 3 ++-
 osu.Game/Overlays/Settings/Sections/RulesetSection.cs       | 3 ++-
 osu.Game/Overlays/Settings/Sections/SkinSection.cs          | 3 ++-
 osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs | 3 ++-
 11 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/AudioSection.cs b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
index fb3d486776..1ab0d6c886 100644
--- a/osu.Game/Overlays/Settings/Sections/AudioSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Localisation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings.Sections.Audio;
 
@@ -17,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Solid.VolumeUp
+            Icon = OsuIcon.Audio
         };
 
         public override IEnumerable<LocalisableString> FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { "sound" });
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSection.cs b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
index 33a6f4c673..b84c441057 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSection.cs
@@ -5,6 +5,7 @@ using osu.Framework.Development;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings.Sections.DebugSettings;
 
@@ -16,7 +17,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Solid.Bug
+            Icon = OsuIcon.Debug
         };
 
         public DebugSection()
diff --git a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
index b60689b611..463b3d1d09 100644
--- a/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GameplaySection.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings.Sections.Gameplay;
 
@@ -15,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Regular.DotCircle
+            Icon = OsuIcon.GameplayC
         };
 
         public GameplaySection()
diff --git a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
index 2b043d40bc..2aa1008b1d 100644
--- a/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GeneralSection.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Solid.Cog
+            Icon = OsuIcon.Settings
         };
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
index 98f6908512..e1fa1eef9c 100644
--- a/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings.Sections.Graphics;
 
@@ -15,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Solid.Laptop
+            Icon = OsuIcon.Graphics
         };
 
         public GraphicsSection()
diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index a8f19cc91d..0204aa5e64 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Handlers;
 using osu.Framework.Localisation;
 using osu.Framework.Platform;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings.Sections.Input;
 
@@ -20,7 +21,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Solid.Keyboard
+            Icon = OsuIcon.Input
         };
 
         public InputSection(KeyBindingPanel keyConfig)
diff --git a/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs b/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
index bb0a952164..bd90e4c35d 100644
--- a/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/MaintenanceSection.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings.Sections.Maintenance;
 
@@ -15,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Solid.Wrench
+            Icon = OsuIcon.Maintenance
         };
 
         public MaintenanceSection()
diff --git a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
index c8faa3b697..1484f2c756 100644
--- a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings.Sections.Online;
 
@@ -15,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Solid.GlobeAsia
+            Icon = OsuIcon.Online
         };
 
         public OnlineSection()
diff --git a/osu.Game/Overlays/Settings/Sections/RulesetSection.cs b/osu.Game/Overlays/Settings/Sections/RulesetSection.cs
index aaad1ec4e2..626264151f 100644
--- a/osu.Game/Overlays/Settings/Sections/RulesetSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/RulesetSection.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Rulesets;
 
@@ -18,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Solid.Chess
+            Icon = OsuIcon.Rulesets
         };
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 1d057f42c0..9b04f208a7 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Game.Database;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Overlays.SkinEditor;
@@ -31,7 +32,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Solid.PaintBrush
+            Icon = OsuIcon.SkinB
         };
 
         private static readonly Live<SkinInfo> random_skin_info = new SkinInfo
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs b/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs
index 2ec9e32ea9..953ede25e1 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterfaceSection.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Overlays.Settings.Sections.UserInterface;
 
@@ -15,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override Drawable CreateIcon() => new SpriteIcon
         {
-            Icon = FontAwesome.Solid.LayerGroup
+            Icon = OsuIcon.UserInterface
         };
 
         public UserInterfaceSection()

From 288ac930e44bd8dc5b5ab8d5f5f342228625fc0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 16:03:57 +0100
Subject: [PATCH 2177/2296] Use new icons in editor

Some that exist on figma are purposefully not used due to an editorial
request from @peppy.
---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs          | 3 ++-
 osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs      | 3 ++-
 osu.Game/Rulesets/Edit/Tools/SelectTool.cs                  | 3 ++-
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs    | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 8382317d70..448cfaf84c 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -17,6 +17,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
@@ -54,7 +55,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                    .Concat(DistanceSnapProvider.CreateTernaryButtons())
                    .Concat(new[]
                    {
-                       new TernaryButton(rectangularGridSnapToggle, "Grid Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Th })
+                       new TernaryButton(rectangularGridSnapToggle, "Grid Snap", () => new SpriteIcon { Icon = OsuIcon.EditorGridSnap })
                    });
 
         private BindableList<HitObject> selectedHitObjects;
diff --git a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
index ddf539771d..b3ca59a5b0 100644
--- a/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
+++ b/osu.Game/Rulesets/Edit/ComposerDistanceSnapProvider.cs
@@ -16,6 +16,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
@@ -169,7 +170,7 @@ namespace osu.Game.Rulesets.Edit
 
         public IEnumerable<TernaryButton> CreateTernaryButtons() => new[]
         {
-            new TernaryButton(DistanceSnapToggle, "Distance Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Ruler })
+            new TernaryButton(DistanceSnapToggle, "Distance Snap", () => new SpriteIcon { Icon = OsuIcon.EditorDistanceSnap })
         };
 
         protected override bool OnKeyDown(KeyDownEvent e)
diff --git a/osu.Game/Rulesets/Edit/Tools/SelectTool.cs b/osu.Game/Rulesets/Edit/Tools/SelectTool.cs
index 9640830a09..a272e9f480 100644
--- a/osu.Game/Rulesets/Edit/Tools/SelectTool.cs
+++ b/osu.Game/Rulesets/Edit/Tools/SelectTool.cs
@@ -5,6 +5,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Edit.Tools
 {
@@ -15,7 +16,7 @@ namespace osu.Game.Rulesets.Edit.Tools
         {
         }
 
-        public override Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.MousePointer };
+        public override Drawable CreateIcon() => new SpriteIcon { Icon = OsuIcon.EditorSelect };
 
         public override PlacementBlueprint CreatePlacementBlueprint() => null;
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index c7c7c4aa83..4fba798a26 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -225,7 +225,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected virtual IEnumerable<TernaryButton> CreateTernaryButtons()
         {
             //TODO: this should only be enabled (visible?) for rulesets that provide combo-supporting HitObjects.
-            yield return new TernaryButton(NewCombo, "New combo", () => new SpriteIcon { Icon = FontAwesome.Regular.DotCircle });
+            yield return new TernaryButton(NewCombo, "New combo", () => new SpriteIcon { Icon = OsuIcon.EditorNewComboA });
 
             foreach (var kvp in SelectionHandler.SelectionSampleStates)
                 yield return new TernaryButton(kvp.Value, kvp.Key.Replace("hit", string.Empty).Titleize(), () => getIconForSample(kvp.Key));
@@ -272,10 +272,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     return new SpriteIcon { Icon = FontAwesome.Solid.Hands };
 
                 case HitSampleInfo.HIT_WHISTLE:
-                    return new SpriteIcon { Icon = FontAwesome.Solid.Bullhorn };
+                    return new SpriteIcon { Icon = OsuIcon.EditorWhistle };
 
                 case HitSampleInfo.HIT_FINISH:
-                    return new SpriteIcon { Icon = FontAwesome.Solid.DrumSteelpan };
+                    return new SpriteIcon { Icon = OsuIcon.EditorFinish };
             }
 
             return null;

From 53766285ce6cd5b227e933fe45da8f32bc2f6cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 15:55:19 +0100
Subject: [PATCH 2178/2296] Remove remaining hexacons usages

---
 osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs | 2 +-
 osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs              | 2 +-
 osu.Game/Overlays/Chat/ChatOverlayTopBar.cs                   | 2 +-
 osu.Game/Overlays/Profile/ProfileHeader.cs                    | 2 +-
 osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs       | 2 +-
 osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index 55a04b129c..5db7223bdf 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             public TestTitle()
             {
                 Title = "title";
-                Icon = HexaconsIcons.Devtools;
+                Icon = OsuIcon.ChangelogB;
             }
         }
     }
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
index eced27f35e..1df246ae77 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.BeatmapSet
             public BeatmapHeaderTitle()
             {
                 Title = PageTitleStrings.MainBeatmapsetsControllerShow;
-                Icon = HexaconsIcons.Beatmap;
+                Icon = OsuIcon.Beatmap;
             }
         }
     }
diff --git a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
index 4fc9fbb6d5..3ecdb09976 100644
--- a/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
+++ b/osu.Game/Overlays/Chat/ChatOverlayTopBar.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Chat
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Icon = HexaconsIcons.Messaging,
+                                Icon = OsuIcon.Chat,
                                 Size = new Vector2(24),
                             },
                             // Placeholder text
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 78343d08f1..42bec50022 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Overlays.Profile
             public ProfileHeaderTitle()
             {
                 Title = PageTitleStrings.MainUsersControllerDefault;
-                Icon = HexaconsIcons.Profile;
+                Icon = OsuIcon.Player;
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
index 5c77672d90..0e125d0ec0 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit.Components.Menus
                             Size = new Vector2(26),
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Icon = HexaconsIcons.Editor,
+                            Icon = OsuIcon.EditCircle,
                         },
                         text = new TextFlowContainer
                         {
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index 93448c4394..022da36abc 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Screens.Edit.Setup
             {
                 Title = EditorSetupStrings.BeatmapSetup.ToLower();
                 Description = EditorSetupStrings.BeatmapSetupDescription;
-                Icon = HexaconsIcons.Social;
+                Icon = OsuIcon.Beatmap;
             }
         }
 

From 89e2b6358a2937ee46246f3b05b4122c7528ae95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 15:55:37 +0100
Subject: [PATCH 2179/2296] Remove hexacons

---
 osu.Game/Graphics/HexaconsIcons.cs | 131 -----------------------------
 osu.Game/OsuGameBase.cs            |   1 -
 2 files changed, 132 deletions(-)
 delete mode 100644 osu.Game/Graphics/HexaconsIcons.cs

diff --git a/osu.Game/Graphics/HexaconsIcons.cs b/osu.Game/Graphics/HexaconsIcons.cs
deleted file mode 100644
index 3eee5d7197..0000000000
--- a/osu.Game/Graphics/HexaconsIcons.cs
+++ /dev/null
@@ -1,131 +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.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Text;
-
-namespace osu.Game.Graphics
-{
-    public static class HexaconsIcons
-    {
-        public const string FONT_NAME = "Icons/Hexacons";
-
-        public static IconUsage BeatmapPacks => get(HexaconsMapping.beatmap_packs);
-        public static IconUsage Beatmap => get(HexaconsMapping.beatmap);
-        public static IconUsage Calendar => get(HexaconsMapping.calendar);
-        public static IconUsage Chart => get(HexaconsMapping.chart);
-        public static IconUsage Community => get(HexaconsMapping.community);
-        public static IconUsage Contests => get(HexaconsMapping.contests);
-        public static IconUsage Devtools => get(HexaconsMapping.devtools);
-        public static IconUsage Download => get(HexaconsMapping.download);
-        public static IconUsage Editor => get(HexaconsMapping.editor);
-        public static IconUsage FeaturedArtist => get(HexaconsMapping.featured_artist);
-        public static IconUsage Home => get(HexaconsMapping.home);
-        public static IconUsage Messaging => get(HexaconsMapping.messaging);
-        public static IconUsage Music => get(HexaconsMapping.music);
-        public static IconUsage News => get(HexaconsMapping.news);
-        public static IconUsage Notification => get(HexaconsMapping.notification);
-        public static IconUsage Profile => get(HexaconsMapping.profile);
-        public static IconUsage Rankings => get(HexaconsMapping.rankings);
-        public static IconUsage Search => get(HexaconsMapping.search);
-        public static IconUsage Settings => get(HexaconsMapping.settings);
-        public static IconUsage Social => get(HexaconsMapping.social);
-        public static IconUsage Store => get(HexaconsMapping.store);
-        public static IconUsage Tournament => get(HexaconsMapping.tournament);
-        public static IconUsage Wiki => get(HexaconsMapping.wiki);
-
-        private static IconUsage get(HexaconsMapping icon) => new IconUsage((char)icon, FONT_NAME);
-
-        // Basically just converting to something we can use in a `char` lookup for FontStore/GlyphStore compatibility.
-        // Names should match filenames in resources.
-        private enum HexaconsMapping
-        {
-            beatmap_packs,
-            beatmap,
-            calendar,
-            chart,
-            community,
-            contests,
-            devtools,
-            download,
-            editor,
-            featured_artist,
-            home,
-            messaging,
-            music,
-            news,
-            notification,
-            profile,
-            rankings,
-            search,
-            settings,
-            social,
-            store,
-            tournament,
-            wiki,
-        }
-
-        public class HexaconsStore : ITextureStore, ITexturedGlyphLookupStore
-        {
-            private readonly TextureStore textures;
-
-            public HexaconsStore(TextureStore textures)
-            {
-                this.textures = textures;
-            }
-
-            public void Dispose()
-            {
-                textures.Dispose();
-            }
-
-            public ITexturedCharacterGlyph? Get(string? fontName, char character)
-            {
-                if (fontName == FONT_NAME)
-                    return new Glyph(textures.Get($"{fontName}/{((HexaconsMapping)character).ToString().Replace("_", "-")}"));
-
-                return null;
-            }
-
-            public Task<ITexturedCharacterGlyph?> GetAsync(string fontName, char character) => Task.Run(() => Get(fontName, character));
-
-            public Texture? Get(string name, WrapMode wrapModeS, WrapMode wrapModeT) => null;
-
-            public Texture Get(string name) => throw new NotImplementedException();
-
-            public Task<Texture> GetAsync(string name, CancellationToken cancellationToken = default) => throw new NotImplementedException();
-
-            public Stream GetStream(string name) => throw new NotImplementedException();
-
-            public IEnumerable<string> GetAvailableResources() => throw new NotImplementedException();
-
-            public Task<Texture?> GetAsync(string name, WrapMode wrapModeS, WrapMode wrapModeT, CancellationToken cancellationToken = default) => throw new NotImplementedException();
-
-            public class Glyph : ITexturedCharacterGlyph
-            {
-                public float XOffset => default;
-                public float YOffset => default;
-                public float XAdvance => default;
-                public float Baseline => default;
-                public char Character => default;
-
-                public float GetKerning<T>(T lastGlyph) where T : ICharacterGlyph => throw new NotImplementedException();
-
-                public Texture Texture { get; }
-                public float Width => Texture.Width;
-                public float Height => Texture.Height;
-
-                public Glyph(Texture texture)
-                {
-                    Texture = texture;
-                }
-            }
-        }
-    }
-}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index b4ad21f045..5b17dc13c2 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -478,7 +478,6 @@ namespace osu.Game
             AddFont(Resources, @"Fonts/Venera/Venera-Bold");
             AddFont(Resources, @"Fonts/Venera/Venera-Black");
 
-            Fonts.AddStore(new HexaconsIcons.HexaconsStore(Textures));
             Fonts.AddStore(new OsuIcon.OsuIconStore(Textures));
         }
 

From 655528a5370fe83b05452e220d22103824bfecc0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 03:04:13 +0900
Subject: [PATCH 2180/2296] Update resources

---
 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 dd2393ff21..c7e0cc3808 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2023.1227.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1225.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2023.1228.0" />
     <PackageReference Include="Sentry" Version="3.40.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.33.0" />

From 5f7f1f771d2404e05a7d152d73e893e3d1c54cc0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 03:09:20 +0900
Subject: [PATCH 2181/2296] Reword tooltip text for dashboard

---
 osu.Game/Localisation/NamedOverlayComponentStrings.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Localisation/NamedOverlayComponentStrings.cs b/osu.Game/Localisation/NamedOverlayComponentStrings.cs
index 475bea2a4a..72e63d699a 100644
--- a/osu.Game/Localisation/NamedOverlayComponentStrings.cs
+++ b/osu.Game/Localisation/NamedOverlayComponentStrings.cs
@@ -20,12 +20,12 @@ namespace osu.Game.Localisation
         public static LocalisableString ChangelogDescription => new TranslatableString(getKey(@"changelog_description"), @"track recent dev updates in the osu! ecosystem");
 
         /// <summary>
-        /// "view your friends and other information"
+        /// "view your friends and spectate other players"
         /// </summary>
-        public static LocalisableString DashboardDescription => new TranslatableString(getKey(@"dashboard_description"), @"view your friends and other information");
+        public static LocalisableString DashboardDescription => new TranslatableString(getKey(@"dashboard_description"), @"view your friends and spectate other players");
 
         /// <summary>
-        /// "find out who's the best right now"
+        /// "find out who&#39;s the best right now"
         /// </summary>
         public static LocalisableString RankingsDescription => new TranslatableString(getKey(@"rankings_description"), @"find out who's the best right now");
 
@@ -39,6 +39,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString WikiDescription => new TranslatableString(getKey(@"wiki_description"), @"knowledge base");
 
-        private static string getKey(string key) => $"{prefix}:{key}";
+        private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }

From 1f55ef211eda02b867327746313a32d599645d17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 03:11:27 +0900
Subject: [PATCH 2182/2296] Rearrange buttons

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 93294a9d30..ec1238ad1f 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -164,11 +164,11 @@ namespace osu.Game.Overlays.Toolbar
                                         {
                                             new ToolbarNewsButton(),
                                             new ToolbarChangelogButton(),
+                                            new ToolbarWikiButton(),
                                             new ToolbarRankingsButton(),
                                             new ToolbarBeatmapListingButton(),
                                             new ToolbarChatButton(),
                                             new ToolbarSocialButton(),
-                                            new ToolbarWikiButton(),
                                             new ToolbarMusicButton(),
                                             //new ToolbarButton
                                             //{

From d4423d493364065baa7984acda63884e26e8a98d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 18:38:29 +0100
Subject: [PATCH 2183/2296] Store last set score to a `SessionStatic`

---
 osu.Game/Configuration/SessionStatics.cs  | 7 +++++++
 osu.Game/Scoring/ScoreInfo.cs             | 1 +
 osu.Game/Screens/Play/SubmittingPlayer.cs | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 8f0a60b23d..1548b781a7 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -9,6 +9,7 @@ using osu.Game.Input;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
+using osu.Game.Scoring;
 
 namespace osu.Game.Configuration
 {
@@ -27,6 +28,7 @@ namespace osu.Game.Configuration
             SetDefault(Static.LastModSelectPanelSamplePlaybackTime, (double?)null);
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
             SetDefault(Static.TouchInputActive, RuntimeInfo.IsMobile);
+            SetDefault<ScoreInfo>(Static.LastLocalUserScore, null);
         }
 
         /// <summary>
@@ -73,5 +75,10 @@ namespace osu.Game.Configuration
         /// Used in touchscreen detection scenarios (<see cref="TouchInputInterceptor"/>).
         /// </summary>
         TouchInputActive,
+
+        /// <summary>
+        /// Stores the local user's last score (can be completed or aborted).
+        /// </summary>
+        LastLocalUserScore,
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 7071bd380e..44795c6fa7 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -207,6 +207,7 @@ namespace osu.Game.Scoring
 
             clone.Statistics = new Dictionary<HitResult, int>(clone.Statistics);
             clone.MaximumStatistics = new Dictionary<HitResult, int>(clone.MaximumStatistics);
+            clone.HitEvents = new List<HitEvent>(clone.HitEvents);
 
             // Ensure we have fresh mods to avoid any references (ie. after gameplay).
             clone.clearAllMods();
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index f88526b8f9..ff2c57bf35 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
@@ -37,6 +38,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private SpectatorClient spectatorClient { get; set; }
 
+        [Resolved]
+        private SessionStatics statics { get; set; }
+
         private TaskCompletionSource<bool> scoreSubmissionSource;
 
         protected SubmittingPlayer(PlayerConfiguration configuration = null)
@@ -176,6 +180,7 @@ namespace osu.Game.Screens.Play
         {
             bool exiting = base.OnExiting(e);
             submitFromFailOrQuit();
+            statics.SetValue(Static.LastLocalUserScore, Score.ScoreInfo.DeepClone());
             return exiting;
         }
 

From 1b7af989ec68e06b10c1a014e37c4a56f47cd1c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 19:14:17 +0100
Subject: [PATCH 2184/2296] Migrate `BeatmapOffsetControl` to use session
 static directly

---
 .../Gameplay/TestSceneBeatmapOffsetControl.cs | 28 ++++++++++++++++---
 osu.Game/Screens/Play/PlayerLoader.cs         |  4 ---
 .../Play/PlayerSettings/AudioSettings.cs      |  7 +++--
 .../PlayerSettings/BeatmapOffsetControl.cs    |  4 +++
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
index f3701b664c..83fc5c2013 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.PlayerSettings;
+using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual.Ranking;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -44,7 +45,23 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 offsetControl.ReferenceScore.Value = new ScoreInfo
                 {
-                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(0, 2)
+                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(0, 2),
+                    BeatmapInfo = Beatmap.Value.BeatmapInfo,
+                };
+            });
+
+            AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
+        }
+
+        [Test]
+        public void TestScoreFromDifferentBeatmap()
+        {
+            AddStep("Set short reference score", () =>
+            {
+                offsetControl.ReferenceScore.Value = new ScoreInfo
+                {
+                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(10),
+                    BeatmapInfo = TestResources.CreateTestBeatmapSetInfo().Beatmaps.First(),
                 };
             });
 
@@ -59,7 +76,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 offsetControl.ReferenceScore.Value = new ScoreInfo
                 {
                     HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(10),
-                    Mods = new Mod[] { new OsuModRelax() }
+                    Mods = new Mod[] { new OsuModRelax() },
+                    BeatmapInfo = Beatmap.Value.BeatmapInfo,
                 };
             });
 
@@ -77,7 +95,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 offsetControl.ReferenceScore.Value = new ScoreInfo
                 {
-                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(average_error)
+                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(average_error),
+                    BeatmapInfo = Beatmap.Value.BeatmapInfo,
                 };
             });
 
@@ -105,7 +124,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 offsetControl.ReferenceScore.Value = new ScoreInfo
                 {
-                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(average_error)
+                    HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(average_error),
+                    BeatmapInfo = Beatmap.Value.BeatmapInfo,
                 };
             });
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 681189d184..232de53ac3 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -263,10 +263,6 @@ namespace osu.Game.Screens.Play
 
             Debug.Assert(CurrentPlayer != null);
 
-            var lastScore = CurrentPlayer.Score;
-
-            AudioSettings.ReferenceScore.Value = lastScore?.ScoreInfo;
-
             // prepare for a retry.
             CurrentPlayer = null;
             playerConsumed = false;
diff --git a/osu.Game/Screens/Play/PlayerSettings/AudioSettings.cs b/osu.Game/Screens/Play/PlayerSettings/AudioSettings.cs
index 010d8115fa..3c79721590 100644
--- a/osu.Game/Screens/Play/PlayerSettings/AudioSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/AudioSettings.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
 {
     public partial class AudioSettings : PlayerSettingsGroup
     {
-        public Bindable<ScoreInfo> ReferenceScore { get; } = new Bindable<ScoreInfo>();
+        private Bindable<ScoreInfo> referenceScore { get; } = new Bindable<ScoreInfo>();
 
         private readonly PlayerCheckbox beatmapHitsoundsToggle;
 
@@ -26,15 +26,16 @@ namespace osu.Game.Screens.Play.PlayerSettings
                 beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = SkinSettingsStrings.BeatmapHitsounds },
                 new BeatmapOffsetControl
                 {
-                    ReferenceScore = { BindTarget = ReferenceScore },
+                    ReferenceScore = { BindTarget = referenceScore },
                 },
             };
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, SessionStatics statics)
         {
             beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
+            statics.BindWith(Static.LastLocalUserScore, referenceScore);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index b0e7d08699..3f0f0fd1df 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Threading.Tasks;
 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.Input.Bindings;
@@ -174,6 +175,9 @@ namespace osu.Game.Screens.Play.PlayerSettings
             if (score.NewValue == null)
                 return;
 
+            if (!score.NewValue.BeatmapInfo.AsNonNull().Equals(beatmap.Value.BeatmapInfo))
+                return;
+
             if (score.NewValue.Mods.Any(m => !m.UserPlayable || m is IHasNoTimedInputs))
                 return;
 

From 70aa067eb166477f29b31495da6b1a8121a0bf8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 03:23:04 +0900
Subject: [PATCH 2185/2296] Adjust gradient visibility and transition

---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index ec1238ad1f..52fad2ba3b 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -224,9 +224,9 @@ namespace osu.Game.Overlays.Toolbar
                         RelativeSizeAxes = Axes.X,
                         Anchor = Anchor.BottomLeft,
                         Alpha = 0,
-                        Height = 100,
+                        Height = 80,
                         Colour = ColourInfo.GradientVertical(
-                            OsuColour.Gray(0).Opacity(0.9f), OsuColour.Gray(0).Opacity(0)),
+                            OsuColour.Gray(0f).Opacity(0.7f), OsuColour.Gray(0).Opacity(0)),
                     },
                 };
             }
@@ -241,9 +241,9 @@ namespace osu.Game.Overlays.Toolbar
             private void updateState()
             {
                 if (ShowGradient.Value)
-                    gradientBackground.FadeIn(transition_time, Easing.OutQuint);
+                    gradientBackground.FadeIn(2500, Easing.OutQuint);
                 else
-                    gradientBackground.FadeOut(transition_time, Easing.OutQuint);
+                    gradientBackground.FadeOut(200, Easing.OutQuint);
             }
         }
 

From 92c4c20a51e544a27b745932334e6442d5d5d994 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 03:43:38 +0900
Subject: [PATCH 2186/2296] Adjust paddings and fills of toolbar buttons

---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs    | 45 ++++++++++---------
 osu.Game/Overlays/Toolbar/ToolbarClock.cs     | 34 +++++++++-----
 .../Toolbar/ToolbarOverlayToggleButton.cs     |  2 +-
 .../Toolbar/ToolbarRulesetSelector.cs         |  1 +
 .../Overlays/Toolbar/ToolbarUserButton.cs     |  2 +-
 5 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index a547fda814..bd5faf1588 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -7,7 +7,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
@@ -74,6 +73,8 @@ namespace osu.Game.Overlays.Toolbar
         private readonly SpriteText keyBindingTooltip;
         protected FillFlowContainer Flow;
 
+        protected readonly Container BackgroundContent;
+
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
 
@@ -82,21 +83,33 @@ namespace osu.Game.Overlays.Toolbar
             Width = Toolbar.HEIGHT;
             RelativeSizeAxes = Axes.Y;
 
+            Padding = new MarginPadding(3);
+
             Children = new Drawable[]
             {
-                HoverBackground = new Box
+                BackgroundContent = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.Gray(80).Opacity(180),
-                    Blending = BlendingParameters.Additive,
-                    Alpha = 0,
-                },
-                flashBackground = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0,
-                    Colour = Color4.White.Opacity(100),
-                    Blending = BlendingParameters.Additive,
+                    Masking = true,
+                    CornerRadius = 6,
+                    CornerExponent = 3f,
+                    Children = new Drawable[]
+                    {
+                        HoverBackground = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = OsuColour.Gray(80).Opacity(180),
+                            Blending = BlendingParameters.Additive,
+                            Alpha = 0,
+                        },
+                        flashBackground = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            Colour = Color4.White.Opacity(100),
+                            Blending = BlendingParameters.Additive,
+                        },
+                    }
                 },
                 Flow = new FillFlowContainer
                 {
@@ -219,14 +232,6 @@ namespace osu.Game.Overlays.Toolbar
         public OpaqueBackground()
         {
             RelativeSizeAxes = Axes.Both;
-            Masking = true;
-            MaskingSmoothness = 0;
-            EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Shadow,
-                Colour = Color4.Black.Opacity(40),
-                Radius = 5,
-            };
 
             Children = new Drawable[]
             {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarClock.cs b/osu.Game/Overlays/Toolbar/ToolbarClock.cs
index f1310d8535..67688155ae 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarClock.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarClock.cs
@@ -42,21 +42,33 @@ namespace osu.Game.Overlays.Toolbar
             clockDisplayMode = config.GetBindable<ToolbarClockDisplayMode>(OsuSetting.ToolbarClockDisplayMode);
             prefer24HourTime = config.GetBindable<bool>(OsuSetting.Prefer24HourTime);
 
+            Padding = new MarginPadding(3);
+
             Children = new Drawable[]
             {
-                hoverBackground = new Box
+                new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.Gray(80).Opacity(180),
-                    Blending = BlendingParameters.Additive,
-                    Alpha = 0,
-                },
-                flashBackground = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0,
-                    Colour = Color4.White.Opacity(100),
-                    Blending = BlendingParameters.Additive,
+                    Masking = true,
+                    CornerRadius = 6,
+                    CornerExponent = 3f,
+                    Children = new Drawable[]
+                    {
+                        hoverBackground = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = OsuColour.Gray(80).Opacity(180),
+                            Blending = BlendingParameters.Additive,
+                            Alpha = 0,
+                        },
+                        flashBackground = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            Colour = Color4.White.Opacity(100),
+                            Blending = BlendingParameters.Additive,
+                        },
+                    }
                 },
                 new FillFlowContainer
                 {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
index 78c976111b..37038161e1 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Toolbar
 
         public ToolbarOverlayToggleButton()
         {
-            Add(stateBackground = new Box
+            BackgroundContent.Add(stateBackground = new Box
             {
                 RelativeSizeAxes = Axes.Both,
                 Colour = OsuColour.Gray(150).Opacity(180),
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index 715076b368..63d11c1b9e 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Overlays.Toolbar
                 new OpaqueBackground
                 {
                     Depth = 1,
+                    Masking = true,
                 },
                 ModeButtonLine = new Container
                 {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index 028decea1e..7d1b6c7404 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Toolbar
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, IAPIProvider api, LoginOverlay? login)
         {
-            Add(new OpaqueBackground { Depth = 1 });
+            BackgroundContent.Add(new OpaqueBackground { Depth = 1 });
 
             Flow.Add(new Container
             {

From cf5e3e886386737385fe75cf1642e75279c7ff16 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 04:06:29 +0900
Subject: [PATCH 2187/2296] Breathe some colour and life into the toolbar

---
 .../Toolbar/ToolbarOverlayToggleButton.cs     |  8 ++--
 .../Toolbar/ToolbarRulesetSelector.cs         | 43 +++++++++----------
 .../Toolbar/ToolbarRulesetTabButton.cs        | 30 +++++++------
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
index 37038161e1..09b8df14a6 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -14,7 +15,7 @@ namespace osu.Game.Overlays.Toolbar
 {
     public partial class ToolbarOverlayToggleButton : ToolbarButton
     {
-        private readonly Box stateBackground;
+        private Box stateBackground;
 
         private OverlayContainer stateContainer;
 
@@ -44,12 +45,13 @@ namespace osu.Game.Overlays.Toolbar
             }
         }
 
-        public ToolbarOverlayToggleButton()
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
         {
             BackgroundContent.Add(stateBackground = new Box
             {
                 RelativeSizeAxes = Axes.Both,
-                Colour = OsuColour.Gray(150).Opacity(180),
+                Colour = colours.Carmine.Opacity(180),
                 Blending = BlendingParameters.Additive,
                 Depth = 2,
                 Alpha = 0,
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index 63d11c1b9e..723c24597a 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
@@ -4,20 +4,19 @@
 #nullable disable
 
 using System.Collections.Generic;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osuTK;
-using osuTK.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osuTK.Input;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets;
+using osuTK;
+using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -47,20 +46,18 @@ namespace osu.Game.Overlays.Toolbar
                 {
                     Size = new Vector2(Toolbar.HEIGHT, 3),
                     Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.TopLeft,
-                    Masking = true,
-                    EdgeEffect = new EdgeEffectParameters
+                    Origin = Anchor.BottomLeft,
+                    Y = -1,
+                    Children = new Drawable[]
                     {
-                        Type = EdgeEffectType.Glow,
-                        Colour = new Color4(255, 194, 224, 100),
-                        Radius = 15,
-                        Roundness = 15,
-                    },
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
+                        new Circle
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(18, 3),
+                        }
                     }
-                }
+                },
             });
 
             foreach (var ruleset in Rulesets.AvailableRulesets)
@@ -90,7 +87,7 @@ namespace osu.Game.Overlays.Toolbar
         {
             if (SelectedTab != null)
             {
-                ModeButtonLine.MoveToX(SelectedTab.DrawPosition.X, !hasInitialPosition ? 0 : 200, Easing.OutQuint);
+                ModeButtonLine.MoveToX(SelectedTab.DrawPosition.X, !hasInitialPosition ? 0 : 500, Easing.OutElasticQuarter);
 
                 if (hasInitialPosition)
                     selectionSamples[SelectedTab.Value.ShortName]?.Play();
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
index 74f76c7c89..5500f1c879 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetTabButton.cs
@@ -1,14 +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.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Rulesets;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -41,27 +43,31 @@ namespace osu.Game.Overlays.Toolbar
         {
             protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds();
 
+            [Resolved]
+            private OsuColour colours { get; set; } = null!;
+
+            public RulesetButton()
+            {
+                Padding = new MarginPadding(3)
+                {
+                    Bottom = 5
+                };
+            }
+
             public bool Active
             {
-                set
+                set => Scheduler.AddOnce(() =>
                 {
                     if (value)
                     {
-                        IconContainer.Colour = Color4.White;
-                        IconContainer.EdgeEffect = new EdgeEffectParameters
-                        {
-                            Type = EdgeEffectType.Glow,
-                            Colour = new Color4(255, 194, 224, 100),
-                            Radius = 15,
-                            Roundness = 15,
-                        };
+                        IconContainer.Colour = Color4Extensions.FromHex("#00FFAA");
                     }
                     else
                     {
-                        IconContainer.Colour = new Color4(255, 194, 224, 255);
+                        IconContainer.Colour = colours.GrayF;
                         IconContainer.EdgeEffect = new EdgeEffectParameters();
                     }
-                }
+                });
             }
 
             protected override bool OnClick(ClickEvent e)

From f51b5f5487e770b783cc12513865eb1d5a3462d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 19:43:14 +0100
Subject: [PATCH 2188/2296] Add components to track average hit errors across
 session

---
 osu.Game/OsuGameBase.cs                       |  2 +
 .../Audio/AudioOffsetAdjustControl.cs         | 23 ++++++++
 .../Audio/SessionAverageHitErrorTracker.cs    | 55 +++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
 create mode 100644 osu.Game/Overlays/Settings/Sections/Audio/SessionAverageHitErrorTracker.cs

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 48548dc1ef..64f15efb15 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -55,6 +55,7 @@ using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.Settings.Sections;
+using osu.Game.Overlays.Settings.Sections.Audio;
 using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Resources;
 using osu.Game.Rulesets;
@@ -349,6 +350,7 @@ namespace osu.Game
                 dependencies.CacheAs(powerStatus);
 
             dependencies.Cache(SessionStatics = new SessionStatics());
+            dependencies.Cache(new SessionAverageHitErrorTracker());
             dependencies.Cache(Colours = new OsuColour());
 
             RegisterImportHandler(BeatmapManager);
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
new file mode 100644
index 0000000000..045cd24fc0
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
@@ -0,0 +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.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Overlays.Settings.Sections.Audio
+{
+    public partial class AudioOffsetAdjustControl : SettingsItem<double>
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+        }
+
+        protected override Drawable CreateControl() => new AudioOffsetPreview();
+
+        private partial class AudioOffsetPreview : CompositeDrawable
+        {
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/SessionAverageHitErrorTracker.cs b/osu.Game/Overlays/Settings/Sections/Audio/SessionAverageHitErrorTracker.cs
new file mode 100644
index 0000000000..b714d49b89
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Audio/SessionAverageHitErrorTracker.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 System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+
+namespace osu.Game.Overlays.Settings.Sections.Audio
+{
+    /// <summary>
+    /// Tracks the local user's average hit error during the ongoing play session.
+    /// </summary>
+    [Cached]
+    public partial class SessionAverageHitErrorTracker : Component
+    {
+        public IBindableList<double> AverageHitErrorHistory => averageHitErrorHistory;
+        private readonly BindableList<double> averageHitErrorHistory = new BindableList<double>();
+
+        private readonly Bindable<ScoreInfo?> latestScore = new Bindable<ScoreInfo?>();
+
+        [BackgroundDependencyLoader]
+        private void load(SessionStatics statics)
+        {
+            statics.BindWith(Static.LastLocalUserScore, latestScore);
+            latestScore.BindValueChanged(score => calculateAverageHitError(score.NewValue), true);
+        }
+
+        private void calculateAverageHitError(ScoreInfo? newScore)
+        {
+            if (newScore == null)
+                return;
+
+            if (newScore.Mods.Any(m => !m.UserPlayable || m is IHasNoTimedInputs))
+                return;
+
+            if (newScore.HitEvents.Count < 10)
+                return;
+
+            if (newScore.HitEvents.CalculateAverageHitError() is not double averageError)
+                return;
+
+            // keep a sane maximum number of entries.
+            if (averageHitErrorHistory.Count >= 50)
+                averageHitErrorHistory.RemoveAt(0);
+            averageHitErrorHistory.Add(averageError);
+        }
+
+        public void ClearHistory() => averageHitErrorHistory.Clear();
+    }
+}

From 160342ceed4824a3214157c049ff981e2710568f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 21:14:37 +0100
Subject: [PATCH 2189/2296] Implement automatic suggestion of audio offset
 based on last plays

---
 .../TestSceneAudioOffsetAdjustControl.cs      |  63 ++++++++
 osu.Game/OsuGameBase.cs                       |   5 +-
 .../Audio/AudioOffsetAdjustControl.cs         | 138 +++++++++++++++++-
 .../Settings/Sections/Audio/OffsetSettings.cs |   5 +-
 4 files changed, 205 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneAudioOffsetAdjustControl.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneAudioOffsetAdjustControl.cs b/osu.Game.Tests/Visual/Settings/TestSceneAudioOffsetAdjustControl.cs
new file mode 100644
index 0000000000..efb65bb0a8
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneAudioOffsetAdjustControl.cs
@@ -0,0 +1,63 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
+using osu.Game.Configuration;
+using osu.Game.Overlays.Settings.Sections.Audio;
+using osu.Game.Scoring;
+using osu.Game.Tests.Visual.Ranking;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    public partial class TestSceneAudioOffsetAdjustControl : OsuTestScene
+    {
+        [Resolved]
+        private SessionStatics statics { get; set; } = null!;
+
+        [Cached]
+        private SessionAverageHitErrorTracker tracker = new SessionAverageHitErrorTracker();
+
+        private Container content = null!;
+        protected override Container Content => content;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            base.Content.AddRange(new Drawable[]
+            {
+                tracker,
+                content = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 400,
+                    AutoSizeAxes = Axes.Y
+                }
+            });
+        }
+
+        [Test]
+        public void TestBehaviour()
+        {
+            AddStep("create control", () => Child = new AudioOffsetAdjustControl
+            {
+                Current = new BindableDouble
+                {
+                    MinValue = -500,
+                    MaxValue = 500
+                }
+            });
+            AddStep("set new score", () => statics.SetValue(Static.LastLocalUserScore, new ScoreInfo
+            {
+                HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(RNG.NextDouble(-100, 100)),
+                BeatmapInfo = Beatmap.Value.BeatmapInfo,
+            }));
+            AddStep("clear history", () => tracker.ClearHistory());
+        }
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 64f15efb15..0d8a2fbb97 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -201,6 +201,8 @@ namespace osu.Game
 
         private RulesetConfigCache rulesetConfigCache;
 
+        private SessionAverageHitErrorTracker hitErrorTracker;
+
         protected SpectatorClient SpectatorClient { get; private set; }
 
         protected MultiplayerClient MultiplayerClient { get; private set; }
@@ -350,7 +352,7 @@ namespace osu.Game
                 dependencies.CacheAs(powerStatus);
 
             dependencies.Cache(SessionStatics = new SessionStatics());
-            dependencies.Cache(new SessionAverageHitErrorTracker());
+            dependencies.Cache(hitErrorTracker = new SessionAverageHitErrorTracker());
             dependencies.Cache(Colours = new OsuColour());
 
             RegisterImportHandler(BeatmapManager);
@@ -410,6 +412,7 @@ namespace osu.Game
             });
 
             base.Content.Add(new TouchInputInterceptor());
+            base.Content.Add(hitErrorTracker);
 
             KeyBindingStore = new RealmKeyBindingStore(realm, keyCombinationProvider);
             KeyBindingStore.Register(globalBindings, RulesetStore.AvailableRulesets);
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
index 045cd24fc0..0023c60c61 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
@@ -1,9 +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.
 
+using System;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Localisation;
+using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Audio
 {
@@ -12,12 +26,134 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
         [BackgroundDependencyLoader]
         private void load()
         {
+            LabelText = AudioSettingsStrings.AudioOffset;
         }
 
         protected override Drawable CreateControl() => new AudioOffsetPreview();
 
-        private partial class AudioOffsetPreview : CompositeDrawable
+        private partial class AudioOffsetPreview : CompositeDrawable, IHasCurrentValue<double>
         {
+            public Bindable<double> Current
+            {
+                get => current.Current;
+                set => current.Current = value;
+            }
+
+            private readonly BindableNumberWithCurrent<double> current = new BindableNumberWithCurrent<double>();
+
+            private readonly IBindableList<double> averageHitErrorHistory = new BindableList<double>();
+
+            private readonly Bindable<double?> suggestedOffset = new Bindable<double?>();
+
+            private Container<Box> notchContainer = null!;
+            private TextFlowContainer hintText = null!;
+            private RoundedButton applySuggestion = null!;
+
+            [BackgroundDependencyLoader]
+            private void load(SessionAverageHitErrorTracker hitErrorTracker)
+            {
+                averageHitErrorHistory.BindTo(hitErrorTracker.AverageHitErrorHistory);
+
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                InternalChild = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Spacing = new Vector2(10),
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new TimeSlider
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Current = { BindTarget = Current },
+                            KeyboardStep = 1,
+                        },
+                        notchContainer = new Container<Box>
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 10,
+                            Padding = new MarginPadding { Horizontal = Nub.DEFAULT_EXPANDED_SIZE / 2 },
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                        },
+                        hintText = new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 16))
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                        },
+                        applySuggestion = new RoundedButton
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Text = "Apply suggested offset",
+                            Action = () =>
+                            {
+                                if (suggestedOffset.Value.HasValue)
+                                    current.Value = suggestedOffset.Value.Value;
+                                hitErrorTracker.ClearHistory();
+                            }
+                        }
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                averageHitErrorHistory.BindCollectionChanged(updateDisplay, true);
+                suggestedOffset.BindValueChanged(_ => updateHintText(), true);
+            }
+
+            private void updateDisplay(object? _, NotifyCollectionChangedEventArgs e)
+            {
+                switch (e.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (double average in e.NewItems!)
+                        {
+                            notchContainer.ForEach(n => n.Alpha *= 0.95f);
+                            notchContainer.Add(new Box
+                            {
+                                RelativeSizeAxes = Axes.Y,
+                                Width = 2,
+                                RelativePositionAxes = Axes.X,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                X = getXPositionForAverage(average)
+                            });
+                        }
+
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (double average in e.OldItems!)
+                        {
+                            var notch = notchContainer.FirstOrDefault(n => n.X == getXPositionForAverage(average));
+                            Debug.Assert(notch != null);
+                            notchContainer.Remove(notch, true);
+                        }
+
+                        break;
+
+                    case NotifyCollectionChangedAction.Reset:
+                        notchContainer.Clear();
+                        break;
+                }
+
+                suggestedOffset.Value = averageHitErrorHistory.Count < 3 ? null : -averageHitErrorHistory.Average();
+            }
+
+            private float getXPositionForAverage(double average) => (float)(Math.Clamp(-average, current.MinValue, current.MaxValue) / (2 * current.MaxValue));
+
+            private void updateHintText()
+            {
+                hintText.Text = suggestedOffset.Value == null
+                    ? @"Play a few beatmaps to receive a suggested offset!"
+                    : $@"Based on the last {averageHitErrorHistory.Count} plays, the suggested offset is {suggestedOffset.Value:N0} ms.";
+                applySuggestion.Enabled.Value = suggestedOffset.Value != null;
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
index 6b5c769853..af15d310fc 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.Audio
@@ -23,11 +22,9 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
         {
             Children = new Drawable[]
             {
-                new SettingsSlider<double, TimeSlider>
+                new AudioOffsetAdjustControl
                 {
-                    LabelText = AudioSettingsStrings.AudioOffset,
                     Current = config.GetBindable<double>(OsuSetting.AudioOffset),
-                    KeyboardStep = 1f
                 },
                 new SettingsButton
                 {

From cf39bb7a18877055a58324d542b9c4feb83d1611 Mon Sep 17 00:00:00 2001
From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com>
Date: Wed, 27 Dec 2023 12:55:20 -0800
Subject: [PATCH 2190/2296] Fix spinner max bonus not respecting
 ISamplePlaybackDisabler

The spinner max bonus was loaded through SkinnableSound instead of PausableSkinnableSound, leading to it not respecting the case where sample playback is globally disabled through ISamplePlaybackDisabler, and can be easily heard in situations like during the catchup period after seeking using the ArgonSongProgressBar with song volume at 0
---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index f7c1437009..bf4b07eaab 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private const float spinning_sample_initial_frequency = 1.0f;
         private const float spinning_sample_modulated_base_frequency = 0.5f;
 
-        private SkinnableSound maxBonusSample;
+        private PausableSkinnableSound maxBonusSample;
 
         /// <summary>
         /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Looping = true,
                     Frequency = { Value = spinning_sample_initial_frequency }
                 },
-                maxBonusSample = new SkinnableSound
+                maxBonusSample = new PausableSkinnableSound
                 {
                     MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME,
                 }

From d9299a8a55bff6757358db2d46b38806817f974a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 23:07:17 +0100
Subject: [PATCH 2191/2296] Implement visual appearance of "system title"
 message in main menu

---
 .../Visual/Menus/TestSceneMainMenu.cs         |  30 ++++++
 .../API/Requests/Responses/APISystemTitle.cs  |  16 +++
 osu.Game/OsuGame.cs                           |   5 +-
 osu.Game/Screens/Menu/MainMenu.cs             |  15 +++
 osu.Game/Screens/Menu/SystemTitle.cs          | 101 ++++++++++++++++++
 5 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs
 create mode 100644 osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
 create mode 100644 osu.Game/Screens/Menu/SystemTitle.cs

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs b/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs
new file mode 100644
index 0000000000..85aa14f33e
--- /dev/null
+++ b/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs
@@ -0,0 +1,30 @@
+// 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.Testing;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+    public partial class TestSceneMainMenu : OsuGameTestScene
+    {
+        [Test]
+        public void TestSystemTitle()
+        {
+            AddStep("set system title", () => Game.ChildrenOfType<SystemTitle>().Single().Current.Value = new APISystemTitle
+            {
+                Image = @"https://assets.ppy.sh/main-menu/project-loved-2@2x.png",
+                Url = @"https://osu.ppy.sh/home/news/2023-12-21-project-loved-december-2023",
+            });
+            AddStep("set another title", () => Game.ChildrenOfType<SystemTitle>().Single().Current.Value = new APISystemTitle
+            {
+                Image = @"https://assets.ppy.sh/main-menu/wf2023-vote@2x.png",
+                Url = @"https://osu.ppy.sh/community/contests/189",
+            });
+            AddStep("unset system title", () => Game.ChildrenOfType<SystemTitle>().Single().Current.Value = null);
+        }
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs b/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
new file mode 100644
index 0000000000..3a2342cc4c
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Responses/APISystemTitle.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 Newtonsoft.Json;
+
+namespace osu.Game.Online.API.Requests.Responses
+{
+    public class APISystemTitle
+    {
+        [JsonProperty(@"image")]
+        public string Image { get; set; } = string.Empty;
+
+        [JsonProperty(@"url")]
+        public string Url { get; set; } = string.Empty;
+    }
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e7ff99ef01..37996e8832 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -995,7 +995,10 @@ namespace osu.Game
             }, topMostOverlayContent.Add);
 
             if (!args?.Any(a => a == @"--no-version-overlay") ?? true)
-                loadComponentSingleFile(versionManager = new VersionManager { Depth = int.MinValue }, ScreenContainer.Add);
+            {
+                dependencies.Cache(versionManager = new VersionManager { Depth = int.MinValue });
+                loadComponentSingleFile(versionManager, ScreenContainer.Add);
+            }
 
             loadComponentSingleFile(osuLogo, _ =>
             {
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c25e62d69e..0739689daa 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -76,6 +76,9 @@ namespace osu.Game.Screens.Menu
         [Resolved(canBeNull: true)]
         private IDialogOverlay dialogOverlay { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private VersionManager versionManager { get; set; }
+
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenDefault();
 
         protected override bool PlayExitSound => false;
@@ -91,6 +94,7 @@ namespace osu.Game.Screens.Menu
         private ParallaxContainer buttonsContainer;
         private SongTicker songTicker;
         private Container logoTarget;
+        private SystemTitle systemTitle;
 
         private Sample reappearSampleSwoosh;
 
@@ -153,6 +157,7 @@ namespace osu.Game.Screens.Menu
                     Margin = new MarginPadding { Right = 15, Top = 5 }
                 },
                 new KiaiMenuFountains(),
+                systemTitle = new SystemTitle(),
                 holdToExitGameOverlay?.CreateProxy() ?? Empty()
             });
 
@@ -263,6 +268,16 @@ namespace osu.Game.Screens.Menu
             }
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            systemTitle.Margin = new MarginPadding
+            {
+                Bottom = (versionManager?.DrawHeight + 5) ?? 0
+            };
+        }
+
         protected override void LogoSuspending(OsuLogo logo)
         {
             var seq = logo.FadeOut(300, Easing.InSine)
diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
new file mode 100644
index 0000000000..6ca9aab6c7
--- /dev/null
+++ b/osu.Game/Screens/Menu/SystemTitle.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 System.Threading;
+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.Graphics.Textures;
+using osu.Framework.Input.Events;
+using osu.Framework.Platform;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Screens.Menu
+{
+    public partial class SystemTitle : CompositeDrawable
+    {
+        internal Bindable<APISystemTitle?> Current { get; } = new Bindable<APISystemTitle?>();
+
+        private Container content = null!;
+        private CancellationTokenSource? cancellationTokenSource;
+        private SystemTitleImage? currentImage;
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost? gameHost)
+        {
+            Anchor = Anchor.BottomCentre;
+            Origin = Anchor.BottomCentre;
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = content = new ClickableContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Action = () =>
+                {
+                    if (!string.IsNullOrEmpty(Current.Value?.Url))
+                        gameHost?.OpenUrlExternally(Current.Value.Url);
+                }
+            };
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            content.ScaleTo(1.1f, 500, Easing.OutBounce);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            content.ScaleTo(1f, 500, Easing.OutBounce);
+            base.OnHoverLost(e);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(_ => loadNewImage(), true);
+        }
+
+        private void loadNewImage()
+        {
+            cancellationTokenSource?.Cancel();
+            cancellationTokenSource = null;
+            currentImage?.FadeOut(500, Easing.OutQuint).Expire();
+
+            if (string.IsNullOrEmpty(Current.Value?.Image))
+                return;
+
+            LoadComponentAsync(new SystemTitleImage(Current.Value), loaded =>
+            {
+                if (loaded.SystemTitle != Current.Value)
+                    loaded.Dispose();
+
+                loaded.FadeInFromZero(500, Easing.OutQuint);
+                content.Add(currentImage = loaded);
+            }, (cancellationTokenSource ??= new CancellationTokenSource()).Token);
+        }
+
+        [LongRunningLoad]
+        private partial class SystemTitleImage : Sprite
+        {
+            public readonly APISystemTitle SystemTitle;
+
+            public SystemTitleImage(APISystemTitle systemTitle)
+            {
+                SystemTitle = systemTitle;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(LargeTextureStore textureStore)
+            {
+                var texture = textureStore.Get(SystemTitle.Image);
+                if (SystemTitle.Image.Contains(@"@2x"))
+                    texture.ScaleAdjust *= 2;
+                Texture = texture;
+            }
+        }
+    }
+}

From a3f720bc627f27d6bcc9fe36c011190010930b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 23:31:14 +0100
Subject: [PATCH 2192/2296] Retrieve system title from online source

---
 .../API/Requests/GetSystemTitleRequest.cs     | 15 ++++++++++++
 .../API/Requests/Responses/APISystemTitle.cs  |  2 +-
 osu.Game/Screens/Menu/SystemTitle.cs          | 23 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Online/API/Requests/GetSystemTitleRequest.cs

diff --git a/osu.Game/Online/API/Requests/GetSystemTitleRequest.cs b/osu.Game/Online/API/Requests/GetSystemTitleRequest.cs
new file mode 100644
index 0000000000..52ca0c11eb
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetSystemTitleRequest.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.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetSystemTitleRequest : OsuJsonWebRequest<APISystemTitle>
+    {
+        public GetSystemTitleRequest()
+            : base(@"https://assets.ppy.sh/lazer-status.json")
+        {
+        }
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs b/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
index 3a2342cc4c..97bdc8355a 100644
--- a/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
+++ b/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
@@ -5,7 +5,7 @@ using Newtonsoft.Json;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
-    public class APISystemTitle
+    public record APISystemTitle
     {
         [JsonProperty(@"image")]
         public string Image { get; set; } = string.Empty;
diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index 6ca9aab6c7..0867fc4748 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -1,7 +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.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -10,6 +12,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Screens.Menu
@@ -57,6 +60,26 @@ namespace osu.Game.Screens.Menu
             base.LoadComplete();
 
             Current.BindValueChanged(_ => loadNewImage(), true);
+
+            checkForUpdates();
+            Scheduler.AddDelayed(checkForUpdates, TimeSpan.FromMinutes(15).TotalMilliseconds, true);
+        }
+
+        private void checkForUpdates()
+        {
+            var request = new GetSystemTitleRequest();
+            Task.Run(() => request.Perform())
+                .ContinueWith(r =>
+                {
+                    if (r.IsCompletedSuccessfully)
+                        Schedule(() => Current.Value = request.ResponseObject);
+
+                    // if the request failed, "observe" the exception.
+                    // it isn't very important why this failed, as it's only for display.
+                    // the inner error will be logged by framework mechanisms anyway.
+                    if (r.IsFaulted)
+                        _ = r.Exception;
+                });
         }
 
         private void loadNewImage()

From ac449131edcee95d9ca61fef538aeea7010c128d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Dec 2023 23:47:37 +0100
Subject: [PATCH 2193/2296] CodeFileSanity does not like records in standalone
 files

---
 .../API/Requests/Responses/APISystemTitle.cs      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs b/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
index 97bdc8355a..6d5d91f8f3 100644
--- a/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
+++ b/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
@@ -1,16 +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 System;
 using Newtonsoft.Json;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
-    public record APISystemTitle
+    public class APISystemTitle : IEquatable<APISystemTitle>
     {
         [JsonProperty(@"image")]
         public string Image { get; set; } = string.Empty;
 
         [JsonProperty(@"url")]
         public string Url { get; set; } = string.Empty;
+
+        public bool Equals(APISystemTitle? other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return Image == other.Image && Url == other.Url;
+        }
+
+        public override bool Equals(object? obj) => obj is APISystemTitle other && Equals(other);
+
+        public override int GetHashCode() => HashCode.Combine(Image, Url);
     }
 }

From ef3975981376e7308f4156024929f404f9240504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Dec 2023 00:09:51 +0100
Subject: [PATCH 2194/2296] More code quality inspections

---
 osu.Game/Online/API/Requests/Responses/APISystemTitle.cs | 1 +
 osu.Game/Screens/Menu/SystemTitle.cs                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs b/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
index 6d5d91f8f3..bfa5c1043b 100644
--- a/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
+++ b/osu.Game/Online/API/Requests/Responses/APISystemTitle.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public override bool Equals(object? obj) => obj is APISystemTitle other && Equals(other);
 
+        // ReSharper disable NonReadonlyMemberInGetHashCode
         public override int GetHashCode() => HashCode.Combine(Image, Url);
     }
 }
diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index 0867fc4748..6b976a8ed6 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Menu
 
             LoadComponentAsync(new SystemTitleImage(Current.Value), loaded =>
             {
-                if (loaded.SystemTitle != Current.Value)
+                if (!loaded.SystemTitle.Equals(Current.Value))
                     loaded.Dispose();
 
                 loaded.FadeInFromZero(500, Easing.OutQuint);

From f8d6b8e347c18e2bf0bec85cdf76aac6f0f5d7a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 14:10:52 +0900
Subject: [PATCH 2195/2296] Adjust toolbar animations / layering to feel better

---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs              | 2 +-
 osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index bd5faf1588..03a1cfc005 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -183,7 +183,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool OnClick(ClickEvent e)
         {
-            flashBackground.FadeOutFromOne(800, Easing.OutQuint);
+            flashBackground.FadeIn(50).Then().FadeOutFromOne(800, Easing.OutQuint);
             tooltipContainer.FadeOut(100);
             return base.OnClick(e);
         }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
index 09b8df14a6..06755a9da9 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.Toolbar
                 RelativeSizeAxes = Axes.Both,
                 Colour = colours.Carmine.Opacity(180),
                 Blending = BlendingParameters.Additive,
-                Depth = 2,
+                Depth = float.MaxValue,
                 Alpha = 0,
             });
 
@@ -65,11 +65,11 @@ namespace osu.Game.Overlays.Toolbar
             switch (state.NewValue)
             {
                 case Visibility.Hidden:
-                    stateBackground.FadeOut(200);
+                    stateBackground.FadeOut(200, Easing.OutQuint);
                     break;
 
                 case Visibility.Visible:
-                    stateBackground.FadeIn(200);
+                    stateBackground.FadeIn(200, Easing.OutQuint);
                     break;
             }
         }

From ffc8778d673dd54a650066b9dc47d6252367da15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 14:13:35 +0900
Subject: [PATCH 2196/2296] Fix song select leaderboard tab ordering not
 matching stable

---
 .../Select/Leaderboards/BeatmapLeaderboardScope.cs        | 6 +++---
 osu.Game/Screens/Select/PlayBeatmapDetailArea.cs          | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs
index 5bcb4c27a7..e2e3404877 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboardScope.cs
@@ -12,12 +12,12 @@ namespace osu.Game.Screens.Select.Leaderboards
         [Description("Local Ranking")]
         Local,
 
-        [LocalisableDescription(typeof(BeatmapsetsStrings), nameof(BeatmapsetsStrings.ShowScoreboardCountry))]
-        Country,
-
         [LocalisableDescription(typeof(BeatmapsetsStrings), nameof(BeatmapsetsStrings.ShowScoreboardGlobal))]
         Global,
 
+        [LocalisableDescription(typeof(BeatmapsetsStrings), nameof(BeatmapsetsStrings.ShowScoreboardCountry))]
+        Country,
+
         [LocalisableDescription(typeof(BeatmapsetsStrings), nameof(BeatmapsetsStrings.ShowScoreboardFriend))]
         Friend,
     }
diff --git a/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs b/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
index 8a1b9ef3e1..deb1100dfc 100644
--- a/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
@@ -80,8 +80,8 @@ namespace osu.Game.Screens.Select
         protected override BeatmapDetailAreaTabItem[] CreateTabItems() => base.CreateTabItems().Concat(new BeatmapDetailAreaTabItem[]
         {
             new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Local),
-            new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Country),
             new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Global),
+            new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Country),
             new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Friend),
         }).ToArray();
 
@@ -95,12 +95,12 @@ namespace osu.Game.Screens.Select
                 case TabType.Local:
                     return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Local);
 
-                case TabType.Country:
-                    return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Country);
-
                 case TabType.Global:
                     return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Global);
 
+                case TabType.Country:
+                    return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Country);
+
                 case TabType.Friends:
                     return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Friend);
 

From 93a8afe96e101a63f65e6bcca92d9707c1fde767 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 14:40:10 +0900
Subject: [PATCH 2197/2296] Add very simple cache-busting (30 minutes)

---
 osu.Game/Online/API/Requests/GetSystemTitleRequest.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/GetSystemTitleRequest.cs b/osu.Game/Online/API/Requests/GetSystemTitleRequest.cs
index 52ca0c11eb..659e46bb11 100644
--- a/osu.Game/Online/API/Requests/GetSystemTitleRequest.cs
+++ b/osu.Game/Online/API/Requests/GetSystemTitleRequest.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 osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
@@ -8,7 +9,7 @@ namespace osu.Game.Online.API.Requests
     public class GetSystemTitleRequest : OsuJsonWebRequest<APISystemTitle>
     {
         public GetSystemTitleRequest()
-            : base(@"https://assets.ppy.sh/lazer-status.json")
+            : base($@"https://assets.ppy.sh/lazer-status.json?{DateTimeOffset.UtcNow.ToUnixTimeSeconds() / 1800}")
         {
         }
     }

From c70e7d340da905d081eb87863ea9588021816453 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 14:48:17 +0900
Subject: [PATCH 2198/2296] Adjust animation and add delay to URL open

---
 osu.Game/Screens/Menu/SystemTitle.cs | 37 ++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index 6b976a8ed6..2c8cb90b96 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -12,6 +12,8 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
+using osu.Framework.Threading;
+using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 
@@ -25,6 +27,8 @@ namespace osu.Game.Screens.Menu
         private CancellationTokenSource? cancellationTokenSource;
         private SystemTitleImage? currentImage;
 
+        private ScheduledDelegate? openUrlAction;
+
         [BackgroundDependencyLoader]
         private void load(GameHost? gameHost)
         {
@@ -32,29 +36,52 @@ namespace osu.Game.Screens.Menu
             Origin = Anchor.BottomCentre;
             AutoSizeAxes = Axes.Both;
 
-            InternalChild = content = new ClickableContainer
+            InternalChild = content = new OsuClickableContainer
             {
                 AutoSizeAxes = Axes.Both,
                 Action = () =>
                 {
-                    if (!string.IsNullOrEmpty(Current.Value?.Url))
-                        gameHost?.OpenUrlExternally(Current.Value.Url);
+                    // Delay slightly to allow animation to play out.
+                    openUrlAction?.Cancel();
+                    openUrlAction = Scheduler.AddDelayed(() =>
+                    {
+                        if (!string.IsNullOrEmpty(Current.Value?.Url))
+                            gameHost?.OpenUrlExternally(Current.Value.Url);
+                    }, 250);
                 }
             };
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            content.ScaleTo(1.1f, 500, Easing.OutBounce);
+            content.ScaleTo(1.05f, 2000, Easing.OutQuint);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            content.ScaleTo(1f, 500, Easing.OutBounce);
+            content.ScaleTo(1f, 500, Easing.OutQuint);
             base.OnHoverLost(e);
         }
 
+        protected override bool OnClick(ClickEvent e)
+        {
+            //hover.FlashColour(FlashColour, 800, Easing.OutQuint);
+            return base.OnClick(e);
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            content.ScaleTo(0.95f, 500, Easing.OutQuint);
+            return base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            content.ScaleTo(1, 500, Easing.OutElastic);
+            base.OnMouseUp(e);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 289e0f00f98ea570fd0a3f6b644b4399c0e4b5ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 14:58:05 +0900
Subject: [PATCH 2199/2296] Add flash on click

---
 osu.Game/Screens/Menu/SystemTitle.cs | 37 +++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index 2c8cb90b96..667dc6e947 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -41,6 +41,8 @@ namespace osu.Game.Screens.Menu
                 AutoSizeAxes = Axes.Both,
                 Action = () =>
                 {
+                    currentImage?.Flash();
+
                     // Delay slightly to allow animation to play out.
                     openUrlAction?.Cancel();
                     openUrlAction = Scheduler.AddDelayed(() =>
@@ -64,12 +66,6 @@ namespace osu.Game.Screens.Menu
             base.OnHoverLost(e);
         }
 
-        protected override bool OnClick(ClickEvent e)
-        {
-            //hover.FlashColour(FlashColour, 800, Easing.OutQuint);
-            return base.OnClick(e);
-        }
-
         protected override bool OnMouseDown(MouseDownEvent e)
         {
             content.ScaleTo(0.95f, 500, Easing.OutQuint);
@@ -78,7 +74,9 @@ namespace osu.Game.Screens.Menu
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            content.ScaleTo(1, 500, Easing.OutElastic);
+            content
+                .ScaleTo(0.95f)
+                .ScaleTo(1, 500, Easing.OutElastic);
             base.OnMouseUp(e);
         }
 
@@ -129,10 +127,12 @@ namespace osu.Game.Screens.Menu
         }
 
         [LongRunningLoad]
-        private partial class SystemTitleImage : Sprite
+        private partial class SystemTitleImage : CompositeDrawable
         {
             public readonly APISystemTitle SystemTitle;
 
+            private Sprite flash = null!;
+
             public SystemTitleImage(APISystemTitle systemTitle)
             {
                 SystemTitle = systemTitle;
@@ -144,7 +144,26 @@ namespace osu.Game.Screens.Menu
                 var texture = textureStore.Get(SystemTitle.Image);
                 if (SystemTitle.Image.Contains(@"@2x"))
                     texture.ScaleAdjust *= 2;
-                Texture = texture;
+
+                AutoSizeAxes = Axes.Both;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Sprite { Texture = texture },
+                    flash = new Sprite
+                    {
+                        Texture = texture,
+                        Blending = BlendingParameters.Additive,
+                        Alpha = 0,
+                    },
+                };
+            }
+
+            public void Flash()
+            {
+                flash.FadeInFromZero(50)
+                     .Then()
+                     .FadeOut(500, Easing.OutQuint);
             }
         }
     }

From 481a25178658e80891a59bcdd7ad1720576854fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 15:10:05 +0900
Subject: [PATCH 2200/2296] Use `HandleLink` to allow potentially opening wiki
 or otherwise

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

diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index 667dc6e947..967b928b43 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
-using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests;
@@ -30,7 +29,7 @@ namespace osu.Game.Screens.Menu
         private ScheduledDelegate? openUrlAction;
 
         [BackgroundDependencyLoader]
-        private void load(GameHost? gameHost)
+        private void load(OsuGame? game)
         {
             Anchor = Anchor.BottomCentre;
             Origin = Anchor.BottomCentre;
@@ -48,7 +47,7 @@ namespace osu.Game.Screens.Menu
                     openUrlAction = Scheduler.AddDelayed(() =>
                     {
                         if (!string.IsNullOrEmpty(Current.Value?.Url))
-                            gameHost?.OpenUrlExternally(Current.Value.Url);
+                            game?.HandleLink(Current.Value.Url);
                     }, 250);
                 }
             };

From 972234b1e5c1a505f23fe1491d509ab343636b4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 15:12:44 +0900
Subject: [PATCH 2201/2296] Move re-schedule inside continuation

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

diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index 967b928b43..b8510dde87 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -86,7 +86,6 @@ namespace osu.Game.Screens.Menu
             Current.BindValueChanged(_ => loadNewImage(), true);
 
             checkForUpdates();
-            Scheduler.AddDelayed(checkForUpdates, TimeSpan.FromMinutes(15).TotalMilliseconds, true);
         }
 
         private void checkForUpdates()
@@ -103,6 +102,8 @@ namespace osu.Game.Screens.Menu
                     // the inner error will be logged by framework mechanisms anyway.
                     if (r.IsFaulted)
                         _ = r.Exception;
+
+                    Scheduler.AddDelayed(checkForUpdates, TimeSpan.FromMinutes(15).TotalMilliseconds);
                 });
         }
 

From 0ea62d0c5d52f98c19062e8baba5e225daea8c5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 15:16:42 +0900
Subject: [PATCH 2202/2296] Add initial additive blending on fade in

---
 osu.Game/Screens/Menu/SystemTitle.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index b8510dde87..8b243e8f7f 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -121,7 +121,6 @@ namespace osu.Game.Screens.Menu
                 if (!loaded.SystemTitle.Equals(Current.Value))
                     loaded.Dispose();
 
-                loaded.FadeInFromZero(500, Easing.OutQuint);
                 content.Add(currentImage = loaded);
             }, (cancellationTokenSource ??= new CancellationTokenSource()).Token);
         }
@@ -154,16 +153,25 @@ namespace osu.Game.Screens.Menu
                     {
                         Texture = texture,
                         Blending = BlendingParameters.Additive,
-                        Alpha = 0,
                     },
                 };
             }
 
-            public void Flash()
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                this.FadeInFromZero(500, Easing.OutQuint);
+                flash.FadeOutFromOne(4000, Easing.OutQuint);
+            }
+
+            public Drawable Flash()
             {
                 flash.FadeInFromZero(50)
                      .Then()
                      .FadeOut(500, Easing.OutQuint);
+
+                return this;
             }
         }
     }

From 6684987289a6dcbd0ab918cd9976909bead57dc1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 15:18:21 +0900
Subject: [PATCH 2203/2296] Reduce refresh interval slightly

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

diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index 8b243e8f7f..bb623cacdf 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.Menu
                     if (r.IsFaulted)
                         _ = r.Exception;
 
-                    Scheduler.AddDelayed(checkForUpdates, TimeSpan.FromMinutes(15).TotalMilliseconds);
+                    Scheduler.AddDelayed(checkForUpdates, TimeSpan.FromMinutes(5).TotalMilliseconds);
                 });
         }
 

From a1867afbb43307ca775e56586bb6c86af038cc81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 16:05:20 +0900
Subject: [PATCH 2204/2296] Move menu tips to main menu

In preparation for removing the disclaimer screen.
---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 +
 osu.Game/Localisation/UserInterfaceStrings.cs |  7 +-
 .../UserInterface/MainMenuSettings.cs         |  5 ++
 osu.Game/Screens/Menu/Disclaimer.cs           | 30 -------
 osu.Game/Screens/Menu/MainMenu.cs             | 38 +++++++-
 osu.Game/Screens/Menu/MenuTip.cs              | 89 +++++++++++++++++++
 osu.Game/Screens/Menu/SystemTitle.cs          |  2 -
 7 files changed, 138 insertions(+), 35 deletions(-)
 create mode 100644 osu.Game/Screens/Menu/MenuTip.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 0df870655f..d4162b76d6 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -96,6 +96,7 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.MenuVoice, true);
             SetDefault(OsuSetting.MenuMusic, true);
+            SetDefault(OsuSetting.MenuTips, true);
 
             SetDefault(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1);
 
@@ -350,6 +351,7 @@ namespace osu.Game.Configuration
         VolumeInactive,
         MenuMusic,
         MenuVoice,
+        MenuTips,
         CursorRotation,
         MenuParallax,
         Prefer24HourTime,
diff --git a/osu.Game/Localisation/UserInterfaceStrings.cs b/osu.Game/Localisation/UserInterfaceStrings.cs
index 68c5c3ccbc..dceedca05c 100644
--- a/osu.Game/Localisation/UserInterfaceStrings.cs
+++ b/osu.Game/Localisation/UserInterfaceStrings.cs
@@ -24,6 +24,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString MenuCursorSize => new TranslatableString(getKey(@"menu_cursor_size"), @"Menu cursor size");
 
+        /// <summary>
+        /// "Menu tips"
+        /// </summary>
+        public static LocalisableString ShowMenuTips => new TranslatableString(getKey(@"show_menu_tips"), @"Menu tips");
+
         /// <summary>
         /// "Parallax"
         /// </summary>
@@ -154,6 +159,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString TrueRandom => new TranslatableString(getKey(@"true_random"), @"True Random");
 
-        private static string getKey(string key) => $"{prefix}:{key}";
+        private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 4577fadb01..5e42c3035c 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -29,6 +29,11 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
 
             Children = new Drawable[]
             {
+                new SettingsCheckbox
+                {
+                    LabelText = UserInterfaceStrings.ShowMenuTips,
+                    Current = config.GetBindable<bool>(OsuSetting.MenuTips)
+                },
                 new SettingsCheckbox
                 {
                     LabelText = UserInterfaceStrings.InterfaceVoices,
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 539d58d2d7..1afef66313 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -12,7 +12,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
-using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
@@ -122,10 +121,6 @@ namespace osu.Game.Screens.Menu
             textFlow.NewParagraph();
             textFlow.NewParagraph();
 
-            textFlow.AddParagraph("today's tip:", formatSemiBold);
-            textFlow.AddParagraph(getRandomTip(), formatRegular);
-            textFlow.NewParagraph();
-
             textFlow.NewParagraph();
 
             iconColour = colours.Yellow;
@@ -228,30 +223,5 @@ namespace osu.Game.Screens.Menu
                         this.Push(nextScreen);
                 });
         }
-
-        private string getRandomTip()
-        {
-            string[] tips =
-            {
-                "You can press Ctrl-T anywhere in the game to toggle the toolbar!",
-                "You can press Ctrl-O anywhere in the game to access options!",
-                "All settings are dynamic and take effect in real-time. Try pausing and changing the skin while playing!",
-                "New features are coming online every update. Make sure to stay up-to-date!",
-                "If you find the UI too large or small, try adjusting UI scale in settings!",
-                "Try adjusting the \"Screen Scaling\" mode to change your gameplay or UI area, even in fullscreen!",
-                "What used to be \"osu!direct\" is available to all users just like on the website. You can access it anywhere using Ctrl-B!",
-                "Seeking in replays is available by dragging on the difficulty bar at the bottom of the screen!",
-                "Multithreading support means that even with low \"FPS\" your input and judgements will be accurate!",
-                "Try scrolling down in the mod select panel to find a bunch of new fun mods!",
-                "Most of the web content (profiles, rankings, etc.) are available natively in-game from the icons on the toolbar!",
-                "Get more details, hide or delete a beatmap by right-clicking on its panel at song select!",
-                "All delete operations are temporary until exiting. Restore accidentally deleted content from the maintenance settings!",
-                "Check out the \"playlists\" system, which lets users create their own custom and permanent leaderboards!",
-                "Toggle advanced frame / thread statistics with Ctrl-F11!",
-                "Take a look under the hood at performance counters and enable verbose performance logging with Ctrl-F2!",
-            };
-
-            return tips[RNG.Next(0, tips.Length)];
-        }
     }
 }
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 0739689daa..cde7da53ce 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -95,6 +95,8 @@ namespace osu.Game.Screens.Menu
         private SongTicker songTicker;
         private Container logoTarget;
         private SystemTitle systemTitle;
+        private MenuTip menuTip;
+        private FillFlowContainer bottomElementsFlow;
 
         private Sample reappearSampleSwoosh;
 
@@ -157,7 +159,27 @@ namespace osu.Game.Screens.Menu
                     Margin = new MarginPadding { Right = 15, Top = 5 }
                 },
                 new KiaiMenuFountains(),
-                systemTitle = new SystemTitle(),
+                bottomElementsFlow = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Spacing = new Vector2(15),
+                    Children = new Drawable[]
+                    {
+                        menuTip = new MenuTip
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                        },
+                        systemTitle = new SystemTitle
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                        }
+                    }
+                },
                 holdToExitGameOverlay?.CreateProxy() ?? Empty()
             });
 
@@ -220,6 +242,8 @@ namespace osu.Game.Screens.Menu
 
             if (storage is OsuStorage osuStorage && osuStorage.Error != OsuStorageError.None)
                 dialogOverlay?.Push(new StorageErrorDialog(osuStorage, osuStorage.Error));
+
+            menuTip.ShowNextTip();
         }
 
         [CanBeNull]
@@ -272,7 +296,7 @@ namespace osu.Game.Screens.Menu
         {
             base.Update();
 
-            systemTitle.Margin = new MarginPadding
+            bottomElementsFlow.Margin = new MarginPadding
             {
                 Bottom = (versionManager?.DrawHeight + 5) ?? 0
             };
@@ -314,6 +338,10 @@ namespace osu.Game.Screens.Menu
             buttonsContainer.MoveTo(new Vector2(-800, 0), FADE_OUT_DURATION, Easing.InSine);
 
             sideFlashes.FadeOut(64, Easing.OutQuint);
+
+            bottomElementsFlow
+                .ScaleTo(0.9f, 1000, Easing.OutQuint)
+                .FadeOut(500, Easing.OutQuint);
         }
 
         public override void OnResuming(ScreenTransitionEvent e)
@@ -330,6 +358,12 @@ namespace osu.Game.Screens.Menu
             preloadSongSelect();
 
             musicController.EnsurePlayingSomething();
+
+            menuTip.ShowNextTip();
+
+            bottomElementsFlow
+                .ScaleTo(1, 1000, Easing.OutQuint)
+                .FadeIn(1000, Easing.OutQuint);
         }
 
         public override bool OnExiting(ScreenExitEvent e)
diff --git a/osu.Game/Screens/Menu/MenuTip.cs b/osu.Game/Screens/Menu/MenuTip.cs
new file mode 100644
index 0000000000..c9c8fea1c1
--- /dev/null
+++ b/osu.Game/Screens/Menu/MenuTip.cs
@@ -0,0 +1,89 @@
+// 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.Sprites;
+using osu.Framework.Utils;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Screens.Menu
+{
+    public partial class MenuTip : CompositeDrawable
+    {
+        [Resolved]
+        private OsuConfigManager config { get; set; } = null!;
+
+        private LinkFlowContainer textFlow = null!;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                textFlow = new LinkFlowContainer
+                {
+                    Width = 700,
+                    AutoSizeAxes = Axes.Y,
+                    TextAnchor = Anchor.TopCentre,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Spacing = new Vector2(0, 2),
+                },
+            };
+        }
+
+        public void ShowNextTip()
+        {
+            if (!config.Get<bool>(OsuSetting.MenuTips)) return;
+
+            static void formatRegular(SpriteText t) => t.Font = OsuFont.GetFont(size: 20, weight: FontWeight.Regular);
+            static void formatSemiBold(SpriteText t) => t.Font = OsuFont.GetFont(size: 20, weight: FontWeight.SemiBold);
+
+            string tip = getRandomTip();
+
+            AutoSizeAxes = Axes.Both;
+
+            textFlow.Clear();
+            textFlow.AddParagraph("a tip for you:", formatSemiBold);
+            textFlow.AddParagraph(tip, formatRegular);
+
+            this.FadeInFromZero(200, Easing.OutQuint)
+                .Delay(1000 + 80 * tip.Length)
+                .Then()
+                .FadeOutFromOne(2000, Easing.OutQuint)
+                .Finally(_ => AutoSizeAxes = Axes.X);
+        }
+
+        private string getRandomTip()
+        {
+            string[] tips =
+            {
+                "You can press Ctrl-T anywhere in the game to toggle the toolbar!",
+                "You can press Ctrl-O anywhere in the game to access options!",
+                "All settings are dynamic and take effect in real-time. Try changing the skin while watching autoplay!",
+                "New features are coming online every update. Make sure to stay up-to-date!",
+                "If you find the UI too large or small, try adjusting UI scale in settings!",
+                "Try adjusting the \"Screen Scaling\" mode to change your gameplay or UI area, even in fullscreen!",
+                "What used to be \"osu!direct\" is available to all users just like on the website. You can access it anywhere using Ctrl-B!",
+                "Seeking in replays is available by dragging on the difficulty bar at the bottom of the screen!",
+                "Multithreading support means that even with low \"FPS\" your input and judgements will be accurate!",
+                "Try scrolling down in the mod select panel to find a bunch of new fun mods!",
+                "Most of the web content (profiles, rankings, etc.) are available natively in-game from the icons on the toolbar!",
+                "Get more details, hide or delete a beatmap by right-clicking on its panel at song select!",
+                "All delete operations are temporary until exiting. Restore accidentally deleted content from the maintenance settings!",
+                "Check out the \"playlists\" system, which lets users create their own custom and permanent leaderboards!",
+                "Toggle advanced frame / thread statistics with Ctrl-F11!",
+                "Take a look under the hood at performance counters and enable verbose performance logging with Ctrl-F2!",
+            };
+
+            return tips[RNG.Next(0, tips.Length)];
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index bb623cacdf..060e426f8c 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load(OsuGame? game)
         {
-            Anchor = Anchor.BottomCentre;
-            Origin = Anchor.BottomCentre;
             AutoSizeAxes = Axes.Both;
 
             InternalChild = content = new OsuClickableContainer

From 222459d921f886a7dd621057752a94442bc703d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 16:16:27 +0900
Subject: [PATCH 2205/2296] Add background and improve layout

---
 osu.Game/Screens/Menu/MainMenu.cs |  2 +-
 osu.Game/Screens/Menu/MenuTip.cs  | 32 ++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index cde7da53ce..e8554d077b 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.Menu
                     Direction = FillDirection.Vertical,
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
-                    Spacing = new Vector2(15),
+                    Spacing = new Vector2(5),
                     Children = new Drawable[]
                     {
                         menuTip = new MenuTip
diff --git a/osu.Game/Screens/Menu/MenuTip.cs b/osu.Game/Screens/Menu/MenuTip.cs
index c9c8fea1c1..ac23162bd0 100644
--- a/osu.Game/Screens/Menu/MenuTip.cs
+++ b/osu.Game/Screens/Menu/MenuTip.cs
@@ -4,12 +4,14 @@
 using osu.Framework.Allocation;
 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.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Menu
 {
@@ -27,14 +29,29 @@ namespace osu.Game.Screens.Menu
 
             InternalChildren = new Drawable[]
             {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    CornerExponent = 2.5f,
+                    CornerRadius = 15,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.Black,
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0.4f,
+                        },
+                    }
+                },
                 textFlow = new LinkFlowContainer
                 {
-                    Width = 700,
+                    Width = 600,
                     AutoSizeAxes = Axes.Y,
                     TextAnchor = Anchor.TopCentre,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
                     Spacing = new Vector2(0, 2),
+                    Margin = new MarginPadding(10)
                 },
             };
         }
@@ -43,13 +60,11 @@ namespace osu.Game.Screens.Menu
         {
             if (!config.Get<bool>(OsuSetting.MenuTips)) return;
 
-            static void formatRegular(SpriteText t) => t.Font = OsuFont.GetFont(size: 20, weight: FontWeight.Regular);
-            static void formatSemiBold(SpriteText t) => t.Font = OsuFont.GetFont(size: 20, weight: FontWeight.SemiBold);
+            static void formatRegular(SpriteText t) => t.Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular);
+            static void formatSemiBold(SpriteText t) => t.Font = OsuFont.GetFont(size: 16, weight: FontWeight.SemiBold);
 
             string tip = getRandomTip();
 
-            AutoSizeAxes = Axes.Both;
-
             textFlow.Clear();
             textFlow.AddParagraph("a tip for you:", formatSemiBold);
             textFlow.AddParagraph(tip, formatRegular);
@@ -57,8 +72,7 @@ namespace osu.Game.Screens.Menu
             this.FadeInFromZero(200, Easing.OutQuint)
                 .Delay(1000 + 80 * tip.Length)
                 .Then()
-                .FadeOutFromOne(2000, Easing.OutQuint)
-                .Finally(_ => AutoSizeAxes = Axes.X);
+                .FadeOutFromOne(2000, Easing.OutQuint);
         }
 
         private string getRandomTip()

From 932d03a4f8aebf8b76d43fad4c7b8ffa17e0ae95 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 16:19:12 +0900
Subject: [PATCH 2206/2296] Make toggle more immediately hide/show tips

---
 osu.Game/Screens/Menu/MainMenu.cs |  3 +--
 osu.Game/Screens/Menu/MenuTip.cs  | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index e8554d077b..e3fc69dc2f 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -242,8 +242,6 @@ namespace osu.Game.Screens.Menu
 
             if (storage is OsuStorage osuStorage && osuStorage.Error != OsuStorageError.None)
                 dialogOverlay?.Push(new StorageErrorDialog(osuStorage, osuStorage.Error));
-
-            menuTip.ShowNextTip();
         }
 
         [CanBeNull]
@@ -359,6 +357,7 @@ namespace osu.Game.Screens.Menu
 
             musicController.EnsurePlayingSomething();
 
+            // Cycle tip on resuming
             menuTip.ShowNextTip();
 
             bottomElementsFlow
diff --git a/osu.Game/Screens/Menu/MenuTip.cs b/osu.Game/Screens/Menu/MenuTip.cs
index ac23162bd0..325fb07767 100644
--- a/osu.Game/Screens/Menu/MenuTip.cs
+++ b/osu.Game/Screens/Menu/MenuTip.cs
@@ -2,6 +2,7 @@
 // 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;
@@ -22,6 +23,8 @@ namespace osu.Game.Screens.Menu
 
         private LinkFlowContainer textFlow = null!;
 
+        private Bindable<bool> showMenuTips = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -56,9 +59,21 @@ namespace osu.Game.Screens.Menu
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            showMenuTips = config.GetBindable<bool>(OsuSetting.MenuTips);
+            showMenuTips.BindValueChanged(_ => ShowNextTip(), true);
+        }
+
         public void ShowNextTip()
         {
-            if (!config.Get<bool>(OsuSetting.MenuTips)) return;
+            if (!showMenuTips.Value)
+            {
+                this.FadeOut(100, Easing.OutQuint);
+                return;
+            }
 
             static void formatRegular(SpriteText t) => t.Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular);
             static void formatSemiBold(SpriteText t) => t.Font = OsuFont.GetFont(size: 16, weight: FontWeight.SemiBold);

From 0ad6ac8b2a2866d5b26cb044110122cd4702cd8b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 16:48:17 +0900
Subject: [PATCH 2207/2296] Remove unused variable

---
 osu.Game/Screens/Menu/MainMenu.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index e3fc69dc2f..a90d9151b5 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -94,7 +94,6 @@ namespace osu.Game.Screens.Menu
         private ParallaxContainer buttonsContainer;
         private SongTicker songTicker;
         private Container logoTarget;
-        private SystemTitle systemTitle;
         private MenuTip menuTip;
         private FillFlowContainer bottomElementsFlow;
 
@@ -173,7 +172,7 @@ namespace osu.Game.Screens.Menu
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                         },
-                        systemTitle = new SystemTitle
+                        new SystemTitle
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,

From b19f72481b5d3cd1ad81458601aca0404a09d8fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 17:19:41 +0900
Subject: [PATCH 2208/2296] Fade out quickly on game exit sequence

---
 osu.Game/Screens/Menu/MainMenu.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index a90d9151b5..bc19e9cb63 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -399,6 +399,10 @@ namespace osu.Game.Screens.Menu
             songTicker.Hide();
 
             this.FadeOut(3000);
+
+            bottomElementsFlow
+                .FadeOut(500, Easing.OutQuint);
+
             return base.OnExiting(e);
         }
 

From 1f2339244ef739341e3429d88678e512430a47d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 17:14:16 +0900
Subject: [PATCH 2209/2296] Add supporter display to main menu

---
 .../Visual/Menus/TestSceneSupporterDisplay.cs |  37 +++++
 osu.Game/Screens/Menu/MainMenu.cs             |  13 ++
 osu.Game/Screens/Menu/SupporterDisplay.cs     | 126 ++++++++++++++++++
 3 files changed, 176 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Menus/TestSceneSupporterDisplay.cs
 create mode 100644 osu.Game/Screens/Menu/SupporterDisplay.cs

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneSupporterDisplay.cs b/osu.Game.Tests/Visual/Menus/TestSceneSupporterDisplay.cs
new file mode 100644
index 0000000000..8b18adbe0d
--- /dev/null
+++ b/osu.Game.Tests/Visual/Menus/TestSceneSupporterDisplay.cs
@@ -0,0 +1,37 @@
+// 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.Graphics;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Screens.Menu;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+    public partial class TestSceneSupporterDisplay : OsuTestScene
+    {
+        [Test]
+        public void TestBasic()
+        {
+            AddStep("create display", () =>
+            {
+                Child = new SupporterDisplay
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                };
+            });
+
+            AddStep("toggle support", () =>
+            {
+                ((DummyAPIAccess)API).LocalUser.Value = new APIUser
+                {
+                    Username = API.LocalUser.Value.Username,
+                    Id = API.LocalUser.Value.Id + 1,
+                    IsSupporter = !API.LocalUser.Value.IsSupporter,
+                };
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index bc19e9cb63..401460a498 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -96,6 +96,7 @@ namespace osu.Game.Screens.Menu
         private Container logoTarget;
         private MenuTip menuTip;
         private FillFlowContainer bottomElementsFlow;
+        private SupporterDisplay supporterDisplay;
 
         private Sample reappearSampleSwoosh;
 
@@ -179,6 +180,12 @@ namespace osu.Game.Screens.Menu
                         }
                     }
                 },
+                supporterDisplay = new SupporterDisplay
+                {
+                    Margin = new MarginPadding(5),
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                },
                 holdToExitGameOverlay?.CreateProxy() ?? Empty()
             });
 
@@ -339,6 +346,9 @@ namespace osu.Game.Screens.Menu
             bottomElementsFlow
                 .ScaleTo(0.9f, 1000, Easing.OutQuint)
                 .FadeOut(500, Easing.OutQuint);
+
+            supporterDisplay
+                .FadeOut(500, Easing.OutQuint);
         }
 
         public override void OnResuming(ScreenTransitionEvent e)
@@ -403,6 +413,9 @@ namespace osu.Game.Screens.Menu
             bottomElementsFlow
                 .FadeOut(500, Easing.OutQuint);
 
+            supporterDisplay
+                .FadeOut(500, Easing.OutQuint);
+
             return base.OnExiting(e);
         }
 
diff --git a/osu.Game/Screens/Menu/SupporterDisplay.cs b/osu.Game/Screens/Menu/SupporterDisplay.cs
new file mode 100644
index 0000000000..d8ba21cd88
--- /dev/null
+++ b/osu.Game/Screens/Menu/SupporterDisplay.cs
@@ -0,0 +1,126 @@
+// 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.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Menu
+{
+    public partial class SupporterDisplay : CompositeDrawable
+    {
+        private LinkFlowContainer supportFlow = null!;
+
+        private Drawable heart = null!;
+
+        private readonly IBindable<APIUser> currentUser = new Bindable<APIUser>();
+
+        private Box backgroundBox = null!;
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Height = 40;
+
+            AutoSizeAxes = Axes.X;
+            AutoSizeDuration = 1000;
+            AutoSizeEasing = Easing.OutQuint;
+
+            Masking = true;
+            CornerExponent = 2.5f;
+            CornerRadius = 15;
+
+            InternalChildren = new Drawable[]
+            {
+                backgroundBox = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.4f,
+                },
+                supportFlow = new LinkFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(10),
+                    Spacing = new Vector2(0, 2),
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            const float font_size = 14;
+
+            static void formatSemiBold(SpriteText t) => t.Font = OsuFont.GetFont(size: font_size, weight: FontWeight.SemiBold);
+
+            currentUser.BindTo(api.LocalUser);
+            currentUser.BindValueChanged(e =>
+            {
+                supportFlow.Children.ForEach(d => d.FadeOut().Expire());
+
+                if (e.NewValue.IsSupporter)
+                {
+                    supportFlow.AddText("Eternal thanks to you for supporting osu!", formatSemiBold);
+
+                    backgroundBox.FadeColour(colours.Pink, 250);
+                }
+                else
+                {
+                    supportFlow.AddText("Consider becoming an ", formatSemiBold);
+                    supportFlow.AddLink("osu!supporter", "https://osu.ppy.sh/home/support", formatSemiBold);
+                    supportFlow.AddText(" to help support osu!'s development", formatSemiBold);
+
+                    backgroundBox.FadeColour(colours.Pink4, 250);
+                }
+
+                supportFlow.AddIcon(FontAwesome.Solid.Heart, t =>
+                {
+                    heart = t;
+
+                    t.Padding = new MarginPadding { Left = 5, Top = 1 };
+                    t.Font = t.Font.With(size: font_size);
+                    t.Origin = Anchor.Centre;
+                    t.Colour = colours.Pink;
+
+                    Schedule(() =>
+                    {
+                        heart?.FlashColour(Color4.White, 750, Easing.OutQuint).Loop();
+                    });
+                });
+            }, true);
+
+            this
+                .FadeOut()
+                .Delay(1000)
+                .FadeInFromZero(800, Easing.OutQuint);
+
+            Scheduler.AddDelayed(() =>
+            {
+                AutoSizeEasing = Easing.In;
+                supportFlow.BypassAutoSizeAxes = Axes.X;
+                this
+                    .Delay(200)
+                    .FadeOut(750, Easing.Out);
+            }, 6000);
+        }
+    }
+}

From 7dc50b9baf5e6268c84b4177d3f6b14bbaa99514 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 17:18:47 +0900
Subject: [PATCH 2210/2296] Don't dismiss on hover, and allow dismissing via
 click

---
 osu.Game/Screens/Menu/SupporterDisplay.cs | 43 ++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/SupporterDisplay.cs b/osu.Game/Screens/Menu/SupporterDisplay.cs
index d8ba21cd88..6639300f4a 100644
--- a/osu.Game/Screens/Menu/SupporterDisplay.cs
+++ b/osu.Game/Screens/Menu/SupporterDisplay.cs
@@ -8,6 +8,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
@@ -113,8 +115,47 @@ namespace osu.Game.Screens.Menu
                 .Delay(1000)
                 .FadeInFromZero(800, Easing.OutQuint);
 
-            Scheduler.AddDelayed(() =>
+            scheduleDismissal();
+        }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            dismissalDelegate?.Cancel();
+
+            supportFlow.BypassAutoSizeAxes = Axes.X;
+            this.FadeOut(500, Easing.OutQuint);
+            return base.OnClick(e);
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            backgroundBox.FadeTo(0.6f, 500, Easing.OutQuint);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            backgroundBox.FadeTo(0.4f, 500, Easing.OutQuint);
+            base.OnHoverLost(e);
+        }
+
+        private ScheduledDelegate? dismissalDelegate;
+
+        private void scheduleDismissal()
+        {
+            dismissalDelegate?.Cancel();
+            dismissalDelegate = Scheduler.AddDelayed(() =>
             {
+                // If the user is hovering they may want to interact with the link.
+                // Give them more time.
+                if (IsHovered)
+                {
+                    scheduleDismissal();
+                    return;
+                }
+
+                dismissalDelegate?.Cancel();
+
                 AutoSizeEasing = Easing.In;
                 supportFlow.BypassAutoSizeAxes = Axes.X;
                 this

From bd0e2b4dde99cd20d990959ba52965cc73099977 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 17:21:29 +0900
Subject: [PATCH 2211/2296] Remove disclaimer screen completely

---
 .../Visual/Menus/TestSceneDisclaimer.cs       |  29 ---
 osu.Game/Screens/Loader.cs                    |  13 +-
 osu.Game/Screens/Menu/Disclaimer.cs           | 227 ------------------
 3 files changed, 2 insertions(+), 267 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
 delete mode 100644 osu.Game/Screens/Menu/Disclaimer.cs

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs b/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
deleted file mode 100644
index fb82b0df80..0000000000
--- a/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
+++ /dev/null
@@ -1,29 +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.Game.Online.API;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Screens.Menu;
-
-namespace osu.Game.Tests.Visual.Menus
-{
-    public partial class TestSceneDisclaimer : ScreenTestScene
-    {
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AddStep("load disclaimer", () => LoadScreen(new Disclaimer()));
-
-            AddStep("toggle support", () =>
-            {
-                ((DummyAPIAccess)API).LocalUser.Value = new APIUser
-                {
-                    Username = API.LocalUser.Value.Username,
-                    Id = API.LocalUser.Value.Id + 1,
-                    IsSupporter = !API.LocalUser.Value.IsSupporter,
-                };
-            });
-        }
-    }
-}
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index 372cfe748e..4dba512cbd 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Screens
 {
     public partial class Loader : StartupScreen
     {
-        private bool showDisclaimer;
-
         public Loader()
         {
             ValidForResume = false;
@@ -35,13 +33,7 @@ namespace osu.Game.Screens
         private LoadingSpinner spinner;
         private ScheduledDelegate spinnerShow;
 
-        protected virtual OsuScreen CreateLoadableScreen()
-        {
-            if (showDisclaimer)
-                return new Disclaimer(getIntroSequence());
-
-            return getIntroSequence();
-        }
+        protected virtual OsuScreen CreateLoadableScreen() => getIntroSequence();
 
         private IntroScreen getIntroSequence()
         {
@@ -107,9 +99,8 @@ namespace osu.Game.Screens
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, OsuConfigManager config)
+        private void load(OsuConfigManager config)
         {
-            showDisclaimer = game.IsDeployedBuild;
             introSequence = config.Get<IntroSequence>(OsuSetting.IntroSequence);
         }
 
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
deleted file mode 100644
index 1afef66313..0000000000
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ /dev/null
@@ -1,227 +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 System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Screens;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests.Responses;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.Menu
-{
-    public partial class Disclaimer : StartupScreen
-    {
-        private SpriteIcon icon;
-        private Color4 iconColour;
-        private LinkFlowContainer textFlow;
-        private LinkFlowContainer supportFlow;
-
-        private Drawable heart;
-
-        private const float icon_y = -85;
-        private const float icon_size = 30;
-
-        private readonly OsuScreen nextScreen;
-
-        private readonly Bindable<APIUser> currentUser = new Bindable<APIUser>();
-        private FillFlowContainer fill;
-
-        private readonly List<ITextPart> expendableText = new List<ITextPart>();
-
-        public Disclaimer(OsuScreen nextScreen = null)
-        {
-            this.nextScreen = nextScreen;
-            ValidForResume = false;
-        }
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            InternalChildren = new Drawable[]
-            {
-                icon = new SpriteIcon
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Icon = OsuIcon.Logo,
-                    Size = new Vector2(icon_size),
-                    Y = icon_y,
-                },
-                fill = new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Y = icon_y,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.TopCentre,
-                    Children = new Drawable[]
-                    {
-                        textFlow = new LinkFlowContainer
-                        {
-                            Width = 680,
-                            AutoSizeAxes = Axes.Y,
-                            TextAnchor = Anchor.TopCentre,
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Spacing = new Vector2(0, 2),
-                        },
-                    }
-                },
-                supportFlow = new LinkFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    TextAnchor = Anchor.BottomCentre,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    Padding = new MarginPadding(20),
-                    Alpha = 0,
-                    Spacing = new Vector2(0, 2),
-                },
-            };
-
-            textFlow.AddText("this is osu!", t => t.Font = t.Font.With(Typeface.Torus, 30, FontWeight.Regular));
-
-            expendableText.Add(textFlow.AddText("lazer", t =>
-            {
-                t.Font = t.Font.With(Typeface.Torus, 30, FontWeight.Regular);
-                t.Colour = colours.PinkLight;
-            }));
-
-            static void formatRegular(SpriteText t) => t.Font = OsuFont.GetFont(size: 20, weight: FontWeight.Regular);
-            static void formatSemiBold(SpriteText t) => t.Font = OsuFont.GetFont(size: 20, weight: FontWeight.SemiBold);
-
-            textFlow.NewParagraph();
-
-            textFlow.AddText("the next ", formatRegular);
-            textFlow.AddText("major update", t =>
-            {
-                t.Font = t.Font.With(Typeface.Torus, 20, FontWeight.SemiBold);
-                t.Colour = colours.Pink;
-            });
-            expendableText.Add(textFlow.AddText(" coming to osu!", formatRegular));
-            textFlow.AddText(".", formatRegular);
-
-            textFlow.NewParagraph();
-            textFlow.NewParagraph();
-
-            textFlow.NewParagraph();
-
-            iconColour = colours.Yellow;
-
-            // manually transfer the user once, but only do the final bind in LoadComplete to avoid thread woes (API scheduler could run while this screen is still loading).
-            // the manual transfer is here to ensure all text content is loaded ahead of time as this is very early in the game load process and we want to avoid stutters.
-            currentUser.Value = api.LocalUser.Value;
-            currentUser.BindValueChanged(e =>
-            {
-                supportFlow.Children.ForEach(d => d.FadeOut().Expire());
-
-                if (e.NewValue.IsSupporter)
-                {
-                    supportFlow.AddText("Eternal thanks to you for supporting osu!", formatSemiBold);
-                }
-                else
-                {
-                    supportFlow.AddText("Consider becoming an ", formatSemiBold);
-                    supportFlow.AddLink("osu!supporter", "https://osu.ppy.sh/home/support", formatSemiBold);
-                    supportFlow.AddText(" to help support osu!'s development", formatSemiBold);
-                }
-
-                supportFlow.AddIcon(FontAwesome.Solid.Heart, t =>
-                {
-                    heart = t;
-
-                    t.Padding = new MarginPadding { Left = 5, Top = 3 };
-                    t.Font = t.Font.With(size: 20);
-                    t.Origin = Anchor.Centre;
-                    t.Colour = colours.Pink;
-
-                    Schedule(() => heart?.FlashColour(Color4.White, 750, Easing.OutQuint).Loop());
-                });
-
-                if (supportFlow.IsPresent)
-                    supportFlow.FadeInFromZero(500);
-            }, true);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            if (nextScreen != null)
-                LoadComponentAsync(nextScreen);
-
-            ((IBindable<APIUser>)currentUser).BindTo(api.LocalUser);
-        }
-
-        public override void OnSuspending(ScreenTransitionEvent e)
-        {
-            base.OnSuspending(e);
-
-            // Once this screen has finished being displayed, we don't want to unnecessarily handle user change events.
-            currentUser.UnbindAll();
-        }
-
-        public override void OnEntering(ScreenTransitionEvent e)
-        {
-            base.OnEntering(e);
-
-            icon.RotateTo(10);
-            icon.FadeOut();
-            icon.ScaleTo(0.5f);
-
-            icon.Delay(500).FadeIn(500).ScaleTo(1, 500, Easing.OutQuint);
-
-            using (BeginDelayedSequence(3000))
-            {
-                icon.FadeColour(iconColour, 200, Easing.OutQuint);
-                icon.MoveToY(icon_y * 1.3f, 500, Easing.OutCirc)
-                    .RotateTo(-360, 520, Easing.OutQuint)
-                    .Then()
-                    .MoveToY(icon_y, 160, Easing.InQuart)
-                    .FadeColour(Color4.White, 160);
-
-                using (BeginDelayedSequence(520 + 160))
-                {
-                    fill.MoveToOffset(new Vector2(0, 15), 160, Easing.OutQuart);
-                    Schedule(() => expendableText.SelectMany(t => t.Drawables).ForEach(t =>
-                    {
-                        t.FadeOut(100);
-                        t.ScaleTo(new Vector2(0, 1), 100, Easing.OutQuart);
-                    }));
-                }
-            }
-
-            supportFlow.FadeOut().Delay(2000).FadeIn(500);
-            double delay = 500;
-            foreach (var c in textFlow.Children)
-                c.FadeTo(0.001f).Delay(delay += 20).FadeIn(500);
-
-            this
-                .FadeInFromZero(500)
-                .Then(5500)
-                .FadeOut(250)
-                .ScaleTo(0.9f, 250, Easing.InQuint)
-                .Finally(_ =>
-                {
-                    if (nextScreen != null)
-                        this.Push(nextScreen);
-                });
-        }
-    }
-}

From 2ec9343868693f45f7650e2209271b157222d973 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 17:35:10 +0900
Subject: [PATCH 2212/2296] Add the ability to spectate a user by right
 clicking their user panel

---
 osu.Game/Localisation/ContextMenuStrings.cs |  9 +++--
 osu.Game/Users/UserPanel.cs                 | 39 +++++++++++++--------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Localisation/ContextMenuStrings.cs b/osu.Game/Localisation/ContextMenuStrings.cs
index 029fba67d8..cb18a2159c 100644
--- a/osu.Game/Localisation/ContextMenuStrings.cs
+++ b/osu.Game/Localisation/ContextMenuStrings.cs
@@ -20,9 +20,14 @@ namespace osu.Game.Localisation
         public static LocalisableString ViewBeatmap => new TranslatableString(getKey(@"view_beatmap"), @"View beatmap");
 
         /// <summary>
-        /// "Invite player"
+        /// "Invite to room"
         /// </summary>
-        public static LocalisableString InvitePlayer => new TranslatableString(getKey(@"invite_player"), @"Invite player");
+        public static LocalisableString InvitePlayer => new TranslatableString(getKey(@"invite_player"), @"Invite to room");
+
+        /// <summary>
+        /// "Spectate"
+        /// </summary>
+        public static LocalisableString SpectatePlayer => new TranslatableString(getKey(@"spectate_player"), @"Spectate");
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 273faf9bd1..b6a77e754d 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -13,6 +13,7 @@ using osu.Game.Overlays;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
@@ -20,6 +21,8 @@ using osu.Game.Online.Chat;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Localisation;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Screens;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Users
 {
@@ -60,6 +63,9 @@ namespace osu.Game.Users
         [Resolved]
         protected OverlayColourProvider? ColourProvider { get; private set; }
 
+        [Resolved]
+        private IPerformFromScreenRunner? performer { get; set; }
+
         [Resolved]
         protected OsuColour Colours { get; private set; } = null!;
 
@@ -113,23 +119,26 @@ namespace osu.Game.Users
                     new OsuMenuItem(ContextMenuStrings.ViewProfile, MenuItemType.Highlighted, ViewProfile)
                 };
 
-                if (!User.Equals(api.LocalUser.Value))
-                {
-                    items.Add(new OsuMenuItem(UsersStrings.CardSendMessage, MenuItemType.Standard, () =>
-                    {
-                        channelManager?.OpenPrivateChannel(User);
-                        chatOverlay?.Show();
-                    }));
-                }
+                if (User.Equals(api.LocalUser.Value))
+                    return items.ToArray();
 
-                if (
-                    // TODO: uncomment this once lazer / osu-web is updating online states
-                    // User.IsOnline &&
-                    multiplayerClient?.Room != null &&
-                    multiplayerClient.Room.Users.All(u => u.UserID != User.Id)
-                )
+                items.Add(new OsuMenuItem(UsersStrings.CardSendMessage, MenuItemType.Standard, () =>
                 {
-                    items.Add(new OsuMenuItem(ContextMenuStrings.InvitePlayer, MenuItemType.Standard, () => multiplayerClient.InvitePlayer(User.Id)));
+                    channelManager?.OpenPrivateChannel(User);
+                    chatOverlay?.Show();
+                }));
+
+                if (User.IsOnline)
+                {
+                    items.Add(new OsuMenuItem(ContextMenuStrings.SpectatePlayer, MenuItemType.Standard, () =>
+                    {
+                        performer?.PerformFromScreen(s => s.Push(new SoloSpectatorScreen(User)));
+                    }));
+
+                    if (multiplayerClient?.Room?.Users.All(u => u.UserID != User.Id) == true)
+                    {
+                        items.Add(new OsuMenuItem(ContextMenuStrings.InvitePlayer, MenuItemType.Standard, () => multiplayerClient.InvitePlayer(User.Id)));
+                    }
                 }
 
                 return items.ToArray();

From 22eced33006f959af2bc17198eafd46779a4923b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 17:40:07 +0900
Subject: [PATCH 2213/2296] Show local user in online users

---
 osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
index 37ea3f9c38..ee277ff538 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyOnlineDisplay.cs
@@ -131,9 +131,6 @@ namespace osu.Game.Overlays.Dashboard
                     {
                         int userId = kvp.Key;
 
-                        if (userId == api.LocalUser.Value.Id)
-                            continue;
-
                         users.GetUserAsync(userId).ContinueWith(task =>
                         {
                             APIUser user = task.GetResultSafely();

From 28e220ca501592f854aab01b294981ca4d83154e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 19:04:19 +0900
Subject: [PATCH 2214/2296] Update popup dialog design

Had to be done. I hated the old ones so much.

As usual, disclaimer that this is an iterative design and will probably
be replaced in the future.
---
 .../UserInterface/TestSceneDialogOverlay.cs   | 19 ++---
 .../Graphics/UserInterface/DialogButton.cs    | 14 ++--
 osu.Game/Overlays/Dialog/PopupDialog.cs       | 77 +++++++++++--------
 osu.Game/Overlays/DialogOverlay.cs            | 12 +--
 4 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs
index 81b692004b..3b38343f04 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs
@@ -9,6 +9,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Testing;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 
@@ -19,11 +20,15 @@ namespace osu.Game.Tests.Visual.UserInterface
     {
         private DialogOverlay overlay;
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create dialog overlay", () => Child = overlay = new DialogOverlay());
+        }
+
         [Test]
         public void TestBasic()
         {
-            AddStep("create dialog overlay", () => Child = overlay = new DialogOverlay());
-
             TestPopupDialog firstDialog = null;
             TestPopupDialog secondDialog = null;
 
@@ -84,7 +89,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             }));
 
             AddAssert("second dialog displayed", () => overlay.CurrentDialog == secondDialog);
-            AddAssert("first dialog is not part of hierarchy", () => firstDialog.Parent == null);
+            AddUntilStep("first dialog is not part of hierarchy", () => firstDialog.Parent == null);
         }
 
         [Test]
@@ -92,7 +97,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             PopupDialog dialog = null;
 
-            AddStep("create dialog overlay", () => overlay = new SlowLoadingDialogOverlay());
+            AddStep("create slow loading dialog overlay", () => overlay = new SlowLoadingDialogOverlay());
 
             AddStep("start loading overlay", () => LoadComponentAsync(overlay, Add));
 
@@ -128,8 +133,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestDismissBeforePush()
         {
-            AddStep("create dialog overlay", () => Child = overlay = new DialogOverlay());
-
             TestPopupDialog testDialog = null;
             AddStep("dismissed dialog push", () =>
             {
@@ -146,8 +149,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestDismissBeforePushViaButtonPress()
         {
-            AddStep("create dialog overlay", () => Child = overlay = new DialogOverlay());
-
             TestPopupDialog testDialog = null;
             AddStep("dismissed dialog push", () =>
             {
@@ -163,7 +164,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
 
             AddAssert("no dialog pushed", () => overlay.CurrentDialog == null);
-            AddAssert("dialog is not part of hierarchy", () => testDialog.Parent == null);
+            AddUntilStep("dialog is not part of hierarchy", () => testDialog.Parent == null);
         }
 
         private partial class TestPopupDialog : PopupDialog
diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs
index db81bc991d..c920597a95 100644
--- a/osu.Game/Graphics/UserInterface/DialogButton.cs
+++ b/osu.Game/Graphics/UserInterface/DialogButton.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Graphics.UserInterface
         private const float idle_width = 0.8f;
         private const float hover_width = 0.9f;
 
-        private const float hover_duration = 500;
+        private const float hover_duration = 300;
         private const float click_duration = 200;
 
         public event Action<SelectionState>? StateChanged;
@@ -54,7 +54,7 @@ namespace osu.Game.Graphics.UserInterface
         private readonly Box rightGlow;
         private readonly Box background;
         private readonly SpriteText spriteText;
-        private Vector2 hoverSpacing => new Vector2(3f, 0f);
+        private Vector2 hoverSpacing => new Vector2(1.4f, 0f);
 
         public DialogButton(HoverSampleSet sampleSet = HoverSampleSet.Button)
             : base(sampleSet)
@@ -279,15 +279,15 @@ namespace osu.Game.Graphics.UserInterface
 
             if (newState == SelectionState.Selected)
             {
-                spriteText.TransformSpacingTo(hoverSpacing, hover_duration, Easing.OutElastic);
-                ColourContainer.ResizeWidthTo(hover_width, hover_duration, Easing.OutElastic);
+                spriteText.TransformSpacingTo(hoverSpacing, hover_duration, Easing.OutQuint);
+                ColourContainer.ResizeWidthTo(hover_width, hover_duration, Easing.OutQuint);
                 glowContainer.FadeIn(hover_duration, Easing.OutQuint);
             }
             else
             {
-                ColourContainer.ResizeWidthTo(idle_width, hover_duration, Easing.OutElastic);
-                spriteText.TransformSpacingTo(Vector2.Zero, hover_duration, Easing.OutElastic);
-                glowContainer.FadeOut(hover_duration, Easing.OutQuint);
+                ColourContainer.ResizeWidthTo(idle_width, hover_duration / 2, Easing.OutQuint);
+                spriteText.TransformSpacingTo(Vector2.Zero, hover_duration / 2, Easing.OutQuint);
+                glowContainer.FadeOut(hover_duration / 2, Easing.OutQuint);
             }
         }
 
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 36a9baac67..663c2e78ce 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -25,11 +26,10 @@ namespace osu.Game.Overlays.Dialog
     public abstract partial class PopupDialog : VisibilityContainer
     {
         public const float ENTER_DURATION = 500;
-        public const float EXIT_DURATION = 200;
+        public const float EXIT_DURATION = 500;
 
         private readonly Vector2 ringSize = new Vector2(100f);
         private readonly Vector2 ringMinifiedSize = new Vector2(20f);
-        private readonly Vector2 buttonsEnterSpacing = new Vector2(0f, 50f);
 
         private readonly Box flashLayer;
         private Sample flashSample = null!;
@@ -108,13 +108,20 @@ namespace osu.Game.Overlays.Dialog
 
         protected PopupDialog()
         {
-            RelativeSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
 
             Children = new Drawable[]
             {
                 content = new Container
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Alpha = 0f,
                     Children = new Drawable[]
                     {
@@ -122,11 +129,13 @@ namespace osu.Game.Overlays.Dialog
                         {
                             RelativeSizeAxes = Axes.Both,
                             Masking = true,
+                            CornerRadius = 20,
+                            CornerExponent = 2.5f,
                             EdgeEffect = new EdgeEffectParameters
                             {
                                 Type = EdgeEffectType.Shadow,
-                                Colour = Color4.Black.Opacity(0.5f),
-                                Radius = 8,
+                                Colour = Color4.Black.Opacity(0.2f),
+                                Radius = 14,
                             },
                             Children = new Drawable[]
                             {
@@ -142,23 +151,29 @@ namespace osu.Game.Overlays.Dialog
                                     ColourDark = Color4Extensions.FromHex(@"1e171e"),
                                     TriangleScale = 4,
                                 },
+                                flashLayer = new Box
+                                {
+                                    Alpha = 0,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Blending = BlendingParameters.Additive,
+                                    Colour = Color4Extensions.FromHex(@"221a21"),
+                                },
                             },
                         },
                         new FillFlowContainer
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.BottomCentre,
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Direction = FillDirection.Vertical,
                             Spacing = new Vector2(0f, 10f),
-                            Padding = new MarginPadding { Bottom = 10 },
+                            Padding = new MarginPadding { Vertical = 60 },
                             Children = new Drawable[]
                             {
                                 new Container
                                 {
                                     Origin = Anchor.TopCentre,
                                     Anchor = Anchor.TopCentre,
+                                    Padding = new MarginPadding { Bottom = 30 },
                                     Size = ringSize,
                                     Children = new Drawable[]
                                     {
@@ -181,6 +196,7 @@ namespace osu.Game.Overlays.Dialog
                                                     Origin = Anchor.Centre,
                                                     Anchor = Anchor.Centre,
                                                     Icon = FontAwesome.Solid.TimesCircle,
+                                                    Y = -2,
                                                     Size = new Vector2(50),
                                                 },
                                             },
@@ -202,25 +218,18 @@ namespace osu.Game.Overlays.Dialog
                                     TextAnchor = Anchor.TopCentre,
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
-                                    Padding = new MarginPadding(5),
+                                },
+                                buttonsContainer = new FillFlowContainer<PopupDialogButton>
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Direction = FillDirection.Vertical,
+                                    Padding = new MarginPadding { Top = 30 },
                                 },
                             },
                         },
-                        buttonsContainer = new FillFlowContainer<PopupDialogButton>
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.TopCentre,
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Vertical,
-                        },
-                        flashLayer = new Box
-                        {
-                            Alpha = 0,
-                            RelativeSizeAxes = Axes.Both,
-                            Blending = BlendingParameters.Additive,
-                            Colour = Color4Extensions.FromHex(@"221a21"),
-                        },
                     },
                 },
             };
@@ -231,7 +240,7 @@ namespace osu.Game.Overlays.Dialog
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load(AudioManager audio, OsuColour colours)
         {
             flashSample = audio.Samples.Get(@"UI/default-select-disabled");
         }
@@ -288,15 +297,15 @@ namespace osu.Game.Overlays.Dialog
             // Reset various animations but only if the dialog animation fully completed
             if (content.Alpha == 0)
             {
-                buttonsContainer.TransformSpacingTo(buttonsEnterSpacing);
-                buttonsContainer.MoveToY(buttonsEnterSpacing.Y);
+                content.ScaleTo(0.7f);
                 ring.ResizeTo(ringMinifiedSize);
             }
 
-            content.FadeIn(ENTER_DURATION, Easing.OutQuint);
-            ring.ResizeTo(ringSize, ENTER_DURATION, Easing.OutQuint);
-            buttonsContainer.TransformSpacingTo(Vector2.Zero, ENTER_DURATION, Easing.OutQuint);
-            buttonsContainer.MoveToY(0, ENTER_DURATION, Easing.OutQuint);
+            content
+                .ScaleTo(1, 750, Easing.OutElasticHalf)
+                .FadeIn(ENTER_DURATION, Easing.OutQuint);
+
+            ring.ResizeTo(ringSize, ENTER_DURATION * 1.5f, Easing.OutQuint);
         }
 
         protected override void PopOut()
@@ -306,7 +315,9 @@ namespace osu.Game.Overlays.Dialog
                 // This is presumed to always be a sane default "cancel" action.
                 buttonsContainer.Last().TriggerClick();
 
-            content.FadeOut(EXIT_DURATION, Easing.InSine);
+            content
+                .ScaleTo(0.7f, EXIT_DURATION, Easing.Out)
+                .FadeOut(EXIT_DURATION, Easing.OutQuint);
         }
 
         private void pressButtonAtIndex(int index)
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 005162bbcc..a85f1ecbcd 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -29,16 +29,18 @@ namespace osu.Game.Overlays
 
         public DialogOverlay()
         {
-            RelativeSizeAxes = Axes.Both;
+            AutoSizeAxes = Axes.Y;
 
             Child = dialogContainer = new Container
             {
-                RelativeSizeAxes = Axes.Both,
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
             };
 
-            Width = 0.4f;
-            Anchor = Anchor.BottomCentre;
-            Origin = Anchor.BottomCentre;
+            Width = 500;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
         }
 
         [BackgroundDependencyLoader]

From b7f3c83514deec96959b51bcbb227ec0ee4f8801 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 20:01:29 +0900
Subject: [PATCH 2215/2296] Expose the ability to update global offset from the
 player loader screen

---
 osu.Game/Overlays/SettingsOverlay.cs          | 29 +++++++++++++++----
 .../PlayerSettings/BeatmapOffsetControl.cs    | 19 ++++++++++++
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 5735b1515a..cf76ed8781 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -3,19 +3,21 @@
 
 #nullable disable
 
+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.Testing;
+using osu.Game.Graphics;
+using osu.Game.Localisation;
 using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.Settings.Sections;
 using osu.Game.Overlays.Settings.Sections.Input;
 using osuTK.Graphics;
-using System.Collections.Generic;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Localisation;
-using osu.Game.Graphics;
-using osu.Game.Localisation;
 
 namespace osu.Game.Overlays
 {
@@ -55,6 +57,21 @@ namespace osu.Game.Overlays
 
         public override bool AcceptsFocus => lastOpenedSubPanel == null || lastOpenedSubPanel.State.Value == Visibility.Hidden;
 
+        public void ShowAtControl<T>()
+            where T : Drawable
+        {
+            Show();
+
+            // wait for load of sections
+            if (!SectionsContainer.Any())
+            {
+                Scheduler.Add(ShowAtControl<T>);
+                return;
+            }
+
+            SectionsContainer.ScrollTo(SectionsContainer.ChildrenOfType<T>().Single());
+        }
+
         private T createSubPanel<T>(T subPanel)
             where T : SettingsSubPanel
         {
diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index 3f0f0fd1df..8c6f1a8f7f 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -21,7 +21,9 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
 using osu.Game.Localisation;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
+using osu.Game.Overlays.Settings.Sections.Audio;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -213,6 +215,8 @@ namespace osu.Game.Screens.Play.PlayerSettings
             lastPlayAverage = average;
             lastPlayBeatmapOffset = Current.Value;
 
+            LinkFlowContainer globalOffsetText;
+
             referenceScoreContainer.AddRange(new Drawable[]
             {
                 lastPlayGraph = new HitEventTimingDistributionGraph(hitEvents)
@@ -226,9 +230,24 @@ namespace osu.Game.Screens.Play.PlayerSettings
                     Text = BeatmapOffsetControlStrings.CalibrateUsingLastPlay,
                     Action = () => Current.Value = lastPlayBeatmapOffset - lastPlayAverage
                 },
+                globalOffsetText = new LinkFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                }
             });
+
+            if (settings != null)
+            {
+                globalOffsetText.AddText("You can also ");
+                globalOffsetText.AddLink("adjust the global offset", () => settings.ShowAtControl<AudioOffsetAdjustControl>());
+                globalOffsetText.AddText(" based off this play.");
+            }
         }
 
+        [Resolved]
+        private SettingsOverlay? settings { get; set; }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 91af94086c6ba2905779c07ebb35dc011979993f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 20:02:06 +0900
Subject: [PATCH 2216/2296] Remove offset wizard button for now

---
 osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
index af15d310fc..e05d20a5db 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
     {
         protected override LocalisableString Header => AudioSettingsStrings.OffsetHeader;
 
-        public override IEnumerable<LocalisableString> FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { "universal", "uo", "timing", "delay", "latency" });
+        public override IEnumerable<LocalisableString> FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { "universal", "uo", "timing", "delay", "latency", "wizard" });
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
@@ -26,10 +26,6 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                 {
                     Current = config.GetBindable<double>(OsuSetting.AudioOffset),
                 },
-                new SettingsButton
-                {
-                    Text = AudioSettingsStrings.OffsetWizard
-                }
             };
         }
     }

From e1a376c0a742d958399734683c8eb79631f37add Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 20:13:19 +0900
Subject: [PATCH 2217/2296] Fix using "Back" binding at spectator fail screen
 not working

---
 osu.Game/Screens/Play/GameplayMenuOverlay.cs | 10 +++++++++-
 osu.Game/Screens/Play/PauseOverlay.cs        |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 0680842891..440b8d37b9 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -44,7 +44,15 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Action that is invoked when <see cref="GlobalAction.Back"/> is triggered.
         /// </summary>
-        protected virtual Action BackAction => () => InternalButtons.LastOrDefault()?.TriggerClick();
+        protected virtual Action BackAction => () =>
+        {
+            // We prefer triggering the button click as it will animate...
+            // but sometimes buttons aren't present (see FailOverlay's constructor as an example).
+            if (Buttons.Any())
+                Buttons.Last().TriggerClick();
+            else
+                OnQuit?.Invoke();
+        };
 
         /// <summary>
         /// Action that is invoked when <see cref="GlobalAction.Select"/> is triggered.
diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index 88561ada71..2aa2793fd4 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -29,7 +29,13 @@ namespace osu.Game.Screens.Play
 
         private SkinnableSound pauseLoop;
 
-        protected override Action BackAction => () => InternalButtons.First().TriggerClick();
+        protected override Action BackAction => () =>
+        {
+            if (Buttons.Any())
+                Buttons.First().TriggerClick();
+            else
+                OnResume?.Invoke();
+        };
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)

From f8347288c1a5cdc5ab6587a49e3980075eec4872 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 20:29:56 +0900
Subject: [PATCH 2218/2296] Add padding around text in dialogs

---
 .../UserInterface/TestSceneDialogOverlay.cs   | 24 +++++++++++++++++++
 osu.Game/Overlays/Dialog/PopupDialog.cs       |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs
index 3b38343f04..f2313022ec 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs
@@ -92,6 +92,30 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("first dialog is not part of hierarchy", () => firstDialog.Parent == null);
         }
 
+        [Test]
+        public void TestTooMuchText()
+        {
+            AddStep("dialog #1", () => overlay.Push(new TestPopupDialog
+            {
+                Icon = FontAwesome.Regular.TrashAlt,
+                HeaderText = @"Confirm deletion ofConfirm deletion ofConfirm deletion ofConfirm deletion ofConfirm deletion ofConfirm deletion of",
+                BodyText = @"Ayase Rie - Yuima-ru*World TVver.Ayase Rie - Yuima-ru*World TVver.Ayase Rie - Yuima-ru*World TVver.Ayase Rie - Yuima-ru*World TVver.Ayase Rie - Yuima-ru*World TVver.Ayase Rie - Yuima-ru*World TVver.Ayase Rie - Yuima-ru*World TVver.Ayase Rie - Yuima-ru*World TVver.Ayase Rie - Yuima-ru*World TVver. ",
+                Buttons = new PopupDialogButton[]
+                {
+                    new PopupDialogOkButton
+                    {
+                        Text = @"I never want to see this again.",
+                        Action = () => Console.WriteLine(@"OK"),
+                    },
+                    new PopupDialogCancelButton
+                    {
+                        Text = @"Firetruck, I still want quick ranks!",
+                        Action = () => Console.WriteLine(@"Cancel"),
+                    },
+                },
+            }));
+        }
+
         [Test]
         public void TestPushBeforeLoad()
         {
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 663c2e78ce..4048b35e78 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -210,6 +210,7 @@ namespace osu.Game.Overlays.Dialog
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
                                     TextAnchor = Anchor.TopCentre,
+                                    Padding = new MarginPadding { Horizontal = 5 },
                                 },
                                 body = new OsuTextFlowContainer(t => t.Font = t.Font.With(size: 18))
                                 {
@@ -218,6 +219,7 @@ namespace osu.Game.Overlays.Dialog
                                     TextAnchor = Anchor.TopCentre,
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
+                                    Padding = new MarginPadding { Horizontal = 5 },
                                 },
                                 buttonsContainer = new FillFlowContainer<PopupDialogButton>
                                 {

From 6bc0f02e2d46296fe2838cf97d57a3905d739928 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 20:40:51 +0900
Subject: [PATCH 2219/2296] Fix test initialising dialogs without cleaning up

---
 .../Visual/UserInterface/TestScenePopupDialog.cs       | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
index 9537ab63be..37ff66aa35 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.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 NUnit.Framework;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Game.Overlays.Dialog;
@@ -15,18 +12,17 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public partial class TestScenePopupDialog : OsuManualInputManagerTestScene
     {
-        private TestPopupDialog dialog;
+        private TestPopupDialog dialog = null!;
 
         [SetUpSteps]
         public void SetUpSteps()
         {
             AddStep("new popup", () =>
             {
-                Add(dialog = new TestPopupDialog
+                Child = dialog = new TestPopupDialog
                 {
-                    RelativeSizeAxes = Axes.Both,
                     State = { Value = Framework.Graphics.Containers.Visibility.Visible },
-                });
+                };
             });
         }
 

From bb0737837b537fd7d97f276e48aaae871f0abc5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Dec 2023 13:58:00 +0100
Subject: [PATCH 2220/2296] Fix test failing due to querying button position
 during transform

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
index 37ff66aa35..96d19911bd 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePopupDialog.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestDangerousButton([Values(false, true)] bool atEdge)
         {
+            AddStep("finish transforms", () => dialog.FinishTransforms(true));
+
             if (atEdge)
             {
                 AddStep("move mouse to button edge", () =>

From e6f1d7db4446e9e0c2308b5d17c937c65a4f7a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Dec 2023 14:10:03 +0100
Subject: [PATCH 2221/2296] Move `SessionAverageHitErrorTracker` to more
 general namespace

---
 .../Audio => Configuration}/SessionAverageHitErrorTracker.cs   | 3 +--
 .../Settings/Sections/Audio/AudioOffsetAdjustControl.cs        | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/{Overlays/Settings/Sections/Audio => Configuration}/SessionAverageHitErrorTracker.cs (95%)

diff --git a/osu.Game/Overlays/Settings/Sections/Audio/SessionAverageHitErrorTracker.cs b/osu.Game/Configuration/SessionAverageHitErrorTracker.cs
similarity index 95%
rename from osu.Game/Overlays/Settings/Sections/Audio/SessionAverageHitErrorTracker.cs
rename to osu.Game/Configuration/SessionAverageHitErrorTracker.cs
index b714d49b89..13b1ea7d37 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/SessionAverageHitErrorTracker.cs
+++ b/osu.Game/Configuration/SessionAverageHitErrorTracker.cs
@@ -5,12 +5,11 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 
-namespace osu.Game.Overlays.Settings.Sections.Audio
+namespace osu.Game.Configuration
 {
     /// <summary>
     /// Tracks the local user's average hit error during the ongoing play session.
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
index 0023c60c61..e10de58a6c 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;

From 6718de01ecc7397f3804954f0c01aaa81d1fffdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Dec 2023 14:11:08 +0100
Subject: [PATCH 2222/2296] Suggest audio adjust after one play

---
 .../Settings/Sections/Audio/AudioOffsetAdjustControl.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
index e10de58a6c..98acea1f2e 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                         break;
                 }
 
-                suggestedOffset.Value = averageHitErrorHistory.Count < 3 ? null : -averageHitErrorHistory.Average();
+                suggestedOffset.Value = averageHitErrorHistory.Any() ? -averageHitErrorHistory.Average() : null;
             }
 
             private float getXPositionForAverage(double average) => (float)(Math.Clamp(-average, current.MinValue, current.MaxValue) / (2 * current.MaxValue));
@@ -152,7 +152,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
             {
                 hintText.Text = suggestedOffset.Value == null
                     ? @"Play a few beatmaps to receive a suggested offset!"
-                    : $@"Based on the last {averageHitErrorHistory.Count} plays, the suggested offset is {suggestedOffset.Value:N0} ms.";
+                    : $@"Based on the last {averageHitErrorHistory.Count} play(s), the suggested offset is {suggestedOffset.Value:N0} ms.";
                 applySuggestion.Enabled.Value = suggestedOffset.Value != null;
             }
         }

From 619b0cc69b1998fdc8b1b1fcb69bcddaefc08004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Dec 2023 14:12:28 +0100
Subject: [PATCH 2223/2296] Fix code quality inspection

---
 .../Screens/Play/PlayerSettings/BeatmapOffsetControl.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index 8c6f1a8f7f..8efb80e771 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -160,11 +160,11 @@ namespace osu.Game.Screens.Play.PlayerSettings
                     // Apply to all difficulties in a beatmap set for now (they generally always share timing).
                     foreach (var b in setInfo.Beatmaps)
                     {
-                        BeatmapUserSettings settings = b.UserSettings;
+                        BeatmapUserSettings userSettings = b.UserSettings;
                         double val = Current.Value;
 
-                        if (settings.Offset != val)
-                            settings.Offset = val;
+                        if (userSettings.Offset != val)
+                            userSettings.Offset = val;
                     }
                 });
             }

From 6d124513e7d88aba2849b5494783820eeb476777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Dec 2023 14:15:15 +0100
Subject: [PATCH 2224/2296] Fix test failures due to player bailing early after
 failing to load beatmap

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

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index ff2c57bf35..83adf1f960 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Screens.Play
         {
             bool exiting = base.OnExiting(e);
             submitFromFailOrQuit();
-            statics.SetValue(Static.LastLocalUserScore, Score.ScoreInfo.DeepClone());
+            statics.SetValue(Static.LastLocalUserScore, Score?.ScoreInfo.DeepClone());
             return exiting;
         }
 

From 93c7ebdae3f61e95e36cc61c014d71fb67e8a3b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Dec 2023 14:30:11 +0100
Subject: [PATCH 2225/2296] Remove unused using

---
 osu.Game/OsuGameBase.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 90c88b2b33..4e465f59df 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -55,7 +55,6 @@ using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
 using osu.Game.Overlays.Settings.Sections;
-using osu.Game.Overlays.Settings.Sections.Audio;
 using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Resources;
 using osu.Game.Rulesets;

From 68402bfd113b3c4051aead283fe3cf57d5b9ca78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Dec 2023 20:32:33 +0100
Subject: [PATCH 2226/2296] Add test coverage of failure scenario

---
 osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs b/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs
index 85aa14f33e..46570e7cdf 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs
@@ -24,6 +24,11 @@ namespace osu.Game.Tests.Visual.Menus
                 Image = @"https://assets.ppy.sh/main-menu/wf2023-vote@2x.png",
                 Url = @"https://osu.ppy.sh/community/contests/189",
             });
+            AddStep("set title with nonexistent image", () => Game.ChildrenOfType<SystemTitle>().Single().Current.Value = new APISystemTitle
+            {
+                Image = @"https://test.invalid/@2x", // .invalid TLD reserved by https://datatracker.ietf.org/doc/html/rfc2606#section-2
+                Url = @"https://osu.ppy.sh/community/contests/189",
+            });
             AddStep("unset system title", () => Game.ChildrenOfType<SystemTitle>().Single().Current.Value = null);
         }
     }

From 7a10e132eaea162febb65d03baa16067a1244e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Dec 2023 20:33:56 +0100
Subject: [PATCH 2227/2296] Fix crash when retrieval of system title image
 fails

Closes https://github.com/ppy/osu/issues/26194.
---
 osu.Game/Screens/Menu/SystemTitle.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index 060e426f8c..7d49a1dd5f 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -138,8 +138,8 @@ namespace osu.Game.Screens.Menu
             [BackgroundDependencyLoader]
             private void load(LargeTextureStore textureStore)
             {
-                var texture = textureStore.Get(SystemTitle.Image);
-                if (SystemTitle.Image.Contains(@"@2x"))
+                Texture? texture = textureStore.Get(SystemTitle.Image);
+                if (texture != null && SystemTitle.Image.Contains(@"@2x"))
                     texture.ScaleAdjust *= 2;
 
                 AutoSizeAxes = Axes.Both;

From 637119f7d4ae7142d9cef29e8a2cd22000c95fb1 Mon Sep 17 00:00:00 2001
From: iminlikewithyou <christian@omg.games>
Date: Thu, 28 Dec 2023 17:15:23 -0600
Subject: [PATCH 2228/2296] increase the base size of button icons

---
 osu.Game/Screens/Menu/MainMenuButton.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index bc638b44ac..a9927541f1 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.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;
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.Menu
                             Shadow = true,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Size = new Vector2(30),
+                            Size = new Vector2(32),
                             Position = new Vector2(0, 0),
                             Icon = symbol
                         },

From 4760c6aaee2bef3a47329158c612d9ea231d4e3b Mon Sep 17 00:00:00 2001
From: iminlikewithyou <christian@omg.games>
Date: Thu, 28 Dec 2023 17:17:24 -0600
Subject: [PATCH 2229/2296] move icon upwards to be visually centered

---
 osu.Game/Screens/Menu/MainMenuButton.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index a9927541f1..87136675a2 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Screens.Menu
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Size = new Vector2(32),
-                            Position = new Vector2(0, 0),
+                            Position = new Vector2(0, -4),
                             Icon = symbol
                         },
                         new OsuSpriteText
@@ -186,7 +186,7 @@ namespace osu.Game.Screens.Menu
         {
             icon.ClearTransforms();
             icon.RotateTo(0, 500, Easing.Out);
-            icon.MoveTo(Vector2.Zero, 500, Easing.Out);
+            icon.MoveTo(new Vector2(0, -4), 500, Easing.Out);
             icon.ScaleTo(Vector2.One, 200, Easing.Out);
 
             if (State == ButtonState.Expanded)

From f1f1221e0e4f5e83f89b74df1c6e1b1c3ce4e04d Mon Sep 17 00:00:00 2001
From: iminlikewithyou <christian@omg.games>
Date: Thu, 28 Dec 2023 17:18:41 -0600
Subject: [PATCH 2230/2296] move text left to be visually centered in the
 skewed rectangle

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

diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index 87136675a2..69dbaa8ed8 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Menu
                             AllowMultiline = false,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Position = new Vector2(0, 35),
+                            Position = new Vector2(-3, 35),
                             Text = text
                         }
                     }

From 51d26d2d715f463a13b47d4692daac3d13a9319d Mon Sep 17 00:00:00 2001
From: iminlikewithyou <christian@omg.games>
Date: Thu, 28 Dec 2023 17:20:44 -0600
Subject: [PATCH 2231/2296] make the hover scale bigger

as a consequence, the rotation needs to be tweaked to be lower
---
 osu.Game/Screens/Menu/MainMenuButton.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index 69dbaa8ed8..3d56a75ca8 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.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;
@@ -31,6 +31,9 @@ namespace osu.Game.Screens.Menu
     /// </summary>
     public partial class MainMenuButton : BeatSyncedContainer, IStateful<ButtonState>
     {
+        public const float BOUNCE_COMPRESSION = 0.9f;
+        public const float HOVER_SCALE = 1.2f;
+        public const float BOUNCE_ROTATION = 8;
         public event Action<ButtonState>? StateChanged;
 
         public readonly Key[] TriggerKeys;
@@ -153,14 +156,14 @@ namespace osu.Game.Screens.Menu
 
             double duration = timingPoint.BeatLength / 2;
 
-            icon.RotateTo(rightward ? 10 : -10, duration * 2, Easing.InOutSine);
+            icon.RotateTo(rightward ? BOUNCE_ROTATION : -BOUNCE_ROTATION, duration * 2, Easing.InOutSine);
 
             icon.Animate(
                 i => i.MoveToY(-10, duration, Easing.Out),
-                i => i.ScaleTo(1, duration, Easing.Out)
+                i => i.ScaleTo(HOVER_SCALE, duration, Easing.Out)
             ).Then(
                 i => i.MoveToY(0, duration, Easing.In),
-                i => i.ScaleTo(new Vector2(1, 0.9f), duration, Easing.In)
+                i => i.ScaleTo(new Vector2(HOVER_SCALE, HOVER_SCALE * BOUNCE_COMPRESSION), duration, Easing.In)
             );
 
             rightward = !rightward;
@@ -177,8 +180,8 @@ namespace osu.Game.Screens.Menu
             double duration = TimeUntilNextBeat;
 
             icon.ClearTransforms();
-            icon.RotateTo(rightward ? -10 : 10, duration, Easing.InOutSine);
-            icon.ScaleTo(new Vector2(1, 0.9f), duration, Easing.Out);
+            icon.RotateTo(rightward ? -BOUNCE_ROTATION : BOUNCE_ROTATION, duration, Easing.InOutSine);
+            icon.ScaleTo(new Vector2(HOVER_SCALE, HOVER_SCALE * BOUNCE_COMPRESSION), duration, Easing.Out);
             return true;
         }
 

From c68a850325e36b8585b2d60f25be81deef52565a Mon Sep 17 00:00:00 2001
From: Nitrous <nathan.alo2000@gmail.com>
Date: Fri, 29 Dec 2023 08:51:54 +0800
Subject: [PATCH 2232/2296] Make menu tip about mod select more up to date.

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

diff --git a/osu.Game/Screens/Menu/MenuTip.cs b/osu.Game/Screens/Menu/MenuTip.cs
index 325fb07767..ab09c07e64 100644
--- a/osu.Game/Screens/Menu/MenuTip.cs
+++ b/osu.Game/Screens/Menu/MenuTip.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.Menu
                 "What used to be \"osu!direct\" is available to all users just like on the website. You can access it anywhere using Ctrl-B!",
                 "Seeking in replays is available by dragging on the difficulty bar at the bottom of the screen!",
                 "Multithreading support means that even with low \"FPS\" your input and judgements will be accurate!",
-                "Try scrolling down in the mod select panel to find a bunch of new fun mods!",
+                "Try scrolling right in mod select to find a bunch of new fun mods!",
                 "Most of the web content (profiles, rankings, etc.) are available natively in-game from the icons on the toolbar!",
                 "Get more details, hide or delete a beatmap by right-clicking on its panel at song select!",
                 "All delete operations are temporary until exiting. Restore accidentally deleted content from the maintenance settings!",

From 150bf670649e61ac071796fa4056aa372ff9023b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 29 Dec 2023 05:30:50 +0300
Subject: [PATCH 2233/2296] Fix dropdown colour not updating correctly on
 enabled state changes

---
 osu.Game/Graphics/UserInterface/OsuDropdown.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 632036fef9..c99a21ac28 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -363,6 +363,7 @@ namespace osu.Game.Graphics.UserInterface
                 base.LoadComplete();
 
                 SearchBar.State.ValueChanged += _ => updateColour();
+                Enabled.BindValueChanged(_ => updateColour());
                 updateColour();
             }
 

From c147ec0a98b22bec0a4635e1fc65cc32c5b34ddf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 29 Dec 2023 05:31:13 +0300
Subject: [PATCH 2234/2296] Update dropdown disabled state to match with other
 components

---
 osu.Game/Graphics/UserInterface/OsuDropdown.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index c99a21ac28..2dc701dc9d 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -384,6 +384,9 @@ namespace osu.Game.Graphics.UserInterface
                 var hoveredColour = colourProvider?.Light4 ?? colours.PinkDarker;
                 var unhoveredColour = colourProvider?.Background5 ?? Color4.Black.Opacity(0.5f);
 
+                Colour = Color4.White;
+                Alpha = Enabled.Value ? 1 : 0.3f;
+
                 if (SearchBar.State.Value == Visibility.Visible)
                 {
                     Icon.Colour = hovered ? hoveredColour.Lighten(0.5f) : Colour4.White;

From a6313c4ee8b78361d052304a3469fc9bf229edfb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 29 Dec 2023 17:16:16 +0900
Subject: [PATCH 2235/2296] Expose `Mod.UsesDefaultConfiguration`

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index d635dccab1..0500b49513 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -195,7 +195,7 @@ namespace osu.Game.Rulesets.Mods
         /// <summary>
         /// Whether all settings in this mod are set to their default state.
         /// </summary>
-        protected virtual bool UsesDefaultConfiguration => SettingsBindables.All(s => s.IsDefault);
+        public virtual bool UsesDefaultConfiguration => SettingsBindables.All(s => s.IsDefault);
 
         /// <summary>
         /// Creates a copy of this <see cref="Mod"/> initialised to a default state.

From 9bb0663b3bb3b7f717a5cedbcd62a0051062eacc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 29 Dec 2023 10:36:52 +0100
Subject: [PATCH 2236/2296] Add test coverage of failure case

---
 .../Visual/Editing/TestSceneEditorBeatmapCreation.cs        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 7a2ed23cae..db87987815 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -25,6 +25,7 @@ using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Resources;
@@ -94,8 +95,11 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestAddAudioTrack()
         {
-            AddAssert("track is virtual", () => Beatmap.Value.Track is TrackVirtual);
+            AddStep("enter compose mode", () => InputManager.Key(Key.F1));
+            AddUntilStep("wait for timeline load", () => Editor.ChildrenOfType<Timeline>().FirstOrDefault()?.IsLoaded == true);
 
+            AddStep("enter setup mode", () => InputManager.Key(Key.F4));
+            AddAssert("track is virtual", () => Beatmap.Value.Track is TrackVirtual);
             AddAssert("switch track to real track", () =>
             {
                 var setup = Editor.ChildrenOfType<SetupScreen>().First();

From cd1f6b46c40639443c49cb03bc84289fcdd47f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 29 Dec 2023 10:24:48 +0100
Subject: [PATCH 2237/2296] Fix crash after changing audio track in editor

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

Reproduction scenario: switch audio track in editor after timeline
loads.

Happens because `beatmap.Value.Track.Length` is 0 immediately after a
track switch, until BASS computes the actual track length on the audio
thread.

Yes this is a hack. No I have no better immediate ideas how to address
this otherwise.
---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs     | 5 +++--
 1 file changed, 3 insertions(+), 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 83d34ab61a..03a868b0f3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -141,12 +141,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
 
             track.BindTo(editorClock.Track);
-            track.BindValueChanged(_ =>
+            // schedule added as without it, `beatmap.Value.Track.Length` can be 0 immediately after a track switch.
+            track.BindValueChanged(_ => Schedule(() =>
             {
                 waveform.Waveform = beatmap.Value.Waveform;
                 waveform.RelativePositionAxes = Axes.X;
                 waveform.X = -(float)(Editor.WAVEFORM_VISUAL_OFFSET / beatmap.Value.Track.Length);
-            }, true);
+            }), true);
 
             Zoom = (float)(defaultTimelineZoom * editorBeatmap.BeatmapInfo.TimelineZoom);
         }

From 99cddb631702f2aebe23056424ae86428369a5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 29 Dec 2023 11:07:45 +0100
Subject: [PATCH 2238/2296] Use alternative workaround

---
 .../Compose/Components/Timeline/Timeline.cs   | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 03a868b0f3..a2704e550c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -141,17 +141,29 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
 
             track.BindTo(editorClock.Track);
-            // schedule added as without it, `beatmap.Value.Track.Length` can be 0 immediately after a track switch.
-            track.BindValueChanged(_ => Schedule(() =>
+            track.BindValueChanged(_ =>
             {
                 waveform.Waveform = beatmap.Value.Waveform;
-                waveform.RelativePositionAxes = Axes.X;
-                waveform.X = -(float)(Editor.WAVEFORM_VISUAL_OFFSET / beatmap.Value.Track.Length);
-            }), true);
+                Scheduler.AddOnce(applyVisualOffset, beatmap);
+            }, true);
 
             Zoom = (float)(defaultTimelineZoom * editorBeatmap.BeatmapInfo.TimelineZoom);
         }
 
+        private void applyVisualOffset(IBindable<WorkingBeatmap> beatmap)
+        {
+            waveform.RelativePositionAxes = Axes.X;
+
+            if (beatmap.Value.Track.Length > 0)
+                waveform.X = -(float)(Editor.WAVEFORM_VISUAL_OFFSET / beatmap.Value.Track.Length);
+            else
+            {
+                // sometimes this can be the case immediately after a track switch.
+                // reschedule with the hope that the track length eventually populates.
+                Scheduler.AddOnce(applyVisualOffset, beatmap);
+            }
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 25fa76a1b2bbb8d96794466e28024842aff9e71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 29 Dec 2023 11:14:28 +0100
Subject: [PATCH 2239/2296] Do not show main menu version display on deployed
 builds

See https://discord.com/channels/188630481301012481/188630652340404224/1190028102525530202.
---
 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 37996e8832..0d6eb1ea44 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -994,7 +994,7 @@ namespace osu.Game
                 Margin = new MarginPadding(5),
             }, topMostOverlayContent.Add);
 
-            if (!args?.Any(a => a == @"--no-version-overlay") ?? true)
+            if (!IsDeployedBuild)
             {
                 dependencies.Cache(versionManager = new VersionManager { Depth = int.MinValue });
                 loadComponentSingleFile(versionManager, ScreenContainer.Add);

From db78d73fa511b647e45286e805a6ae7784ee4fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 29 Dec 2023 11:50:30 +0100
Subject: [PATCH 2240/2296] Do not display system title in inital menu state

Addresses https://github.com/ppy/osu/discussions/26199.
---
 osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs | 15 +++++++++++----
 osu.Game/Screens/Menu/MainMenu.cs                |  5 ++++-
 osu.Game/Screens/Menu/SystemTitle.cs             | 12 +++++++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs b/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs
index 46570e7cdf..7053a9d544 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneMainMenu.cs
@@ -3,33 +3,40 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Screens.Menu;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Menus
 {
     public partial class TestSceneMainMenu : OsuGameTestScene
     {
+        private SystemTitle systemTitle => Game.ChildrenOfType<SystemTitle>().Single();
+
         [Test]
         public void TestSystemTitle()
         {
-            AddStep("set system title", () => Game.ChildrenOfType<SystemTitle>().Single().Current.Value = new APISystemTitle
+            AddStep("set system title", () => systemTitle.Current.Value = new APISystemTitle
             {
                 Image = @"https://assets.ppy.sh/main-menu/project-loved-2@2x.png",
                 Url = @"https://osu.ppy.sh/home/news/2023-12-21-project-loved-december-2023",
             });
-            AddStep("set another title", () => Game.ChildrenOfType<SystemTitle>().Single().Current.Value = new APISystemTitle
+            AddAssert("system title not visible", () => systemTitle.State.Value, () => Is.EqualTo(Visibility.Hidden));
+            AddStep("enter menu", () => InputManager.Key(Key.Enter));
+            AddUntilStep("system title visible", () => systemTitle.State.Value, () => Is.EqualTo(Visibility.Visible));
+            AddStep("set another title", () => systemTitle.Current.Value = new APISystemTitle
             {
                 Image = @"https://assets.ppy.sh/main-menu/wf2023-vote@2x.png",
                 Url = @"https://osu.ppy.sh/community/contests/189",
             });
-            AddStep("set title with nonexistent image", () => Game.ChildrenOfType<SystemTitle>().Single().Current.Value = new APISystemTitle
+            AddStep("set title with nonexistent image", () => systemTitle.Current.Value = new APISystemTitle
             {
                 Image = @"https://test.invalid/@2x", // .invalid TLD reserved by https://datatracker.ietf.org/doc/html/rfc2606#section-2
                 Url = @"https://osu.ppy.sh/community/contests/189",
             });
-            AddStep("unset system title", () => Game.ChildrenOfType<SystemTitle>().Single().Current.Value = null);
+            AddStep("unset system title", () => systemTitle.Current.Value = null);
         }
     }
 }
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 401460a498..516b090a16 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -94,6 +94,7 @@ namespace osu.Game.Screens.Menu
         private ParallaxContainer buttonsContainer;
         private SongTicker songTicker;
         private Container logoTarget;
+        private SystemTitle systemTitle;
         private MenuTip menuTip;
         private FillFlowContainer bottomElementsFlow;
         private SupporterDisplay supporterDisplay;
@@ -173,7 +174,7 @@ namespace osu.Game.Screens.Menu
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                         },
-                        new SystemTitle
+                        systemTitle = new SystemTitle
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
@@ -196,10 +197,12 @@ namespace osu.Game.Screens.Menu
                     case ButtonSystemState.Initial:
                     case ButtonSystemState.Exit:
                         ApplyToBackground(b => b.FadeColour(Color4.White, 500, Easing.OutSine));
+                        systemTitle.State.Value = Visibility.Hidden;
                         break;
 
                     default:
                         ApplyToBackground(b => b.FadeColour(OsuColour.Gray(0.8f), 500, Easing.OutSine));
+                        systemTitle.State.Value = Visibility.Visible;
                         break;
                 }
             };
diff --git a/osu.Game/Screens/Menu/SystemTitle.cs b/osu.Game/Screens/Menu/SystemTitle.cs
index 7d49a1dd5f..813a470ed6 100644
--- a/osu.Game/Screens/Menu/SystemTitle.cs
+++ b/osu.Game/Screens/Menu/SystemTitle.cs
@@ -18,10 +18,12 @@ using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Screens.Menu
 {
-    public partial class SystemTitle : CompositeDrawable
+    public partial class SystemTitle : VisibilityContainer
     {
         internal Bindable<APISystemTitle?> Current { get; } = new Bindable<APISystemTitle?>();
 
+        private const float transition_duration = 500;
+
         private Container content = null!;
         private CancellationTokenSource? cancellationTokenSource;
         private SystemTitleImage? currentImage;
@@ -32,9 +34,13 @@ namespace osu.Game.Screens.Menu
         private void load(OsuGame? game)
         {
             AutoSizeAxes = Axes.Both;
+            AutoSizeDuration = transition_duration;
+            AutoSizeEasing = Easing.OutQuint;
 
             InternalChild = content = new OsuClickableContainer
             {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
                 AutoSizeAxes = Axes.Both,
                 Action = () =>
                 {
@@ -51,6 +57,10 @@ namespace osu.Game.Screens.Menu
             };
         }
 
+        protected override void PopIn() => content.FadeInFromZero(transition_duration, Easing.OutQuint);
+
+        protected override void PopOut() => content.FadeOut(transition_duration, Easing.OutQuint);
+
         protected override bool OnHover(HoverEvent e)
         {
             content.ScaleTo(1.05f, 2000, Easing.OutQuint);

From cdcb3ef4aa7401243d6a97e151d9cc41cd284060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 29 Dec 2023 12:20:14 +0100
Subject: [PATCH 2241/2296] Fix global audio offset suggestion feature not
 taking previous offset value into account

See https://osu.ppy.sh/comments/2989193 etc.
---
 .../SessionAverageHitErrorTracker.cs          | 25 ++++++++++++++++---
 .../Audio/AudioOffsetAdjustControl.cs         | 14 +++++------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Configuration/SessionAverageHitErrorTracker.cs b/osu.Game/Configuration/SessionAverageHitErrorTracker.cs
index 13b1ea7d37..cd21eb6fa8 100644
--- a/osu.Game/Configuration/SessionAverageHitErrorTracker.cs
+++ b/osu.Game/Configuration/SessionAverageHitErrorTracker.cs
@@ -17,11 +17,14 @@ namespace osu.Game.Configuration
     [Cached]
     public partial class SessionAverageHitErrorTracker : Component
     {
-        public IBindableList<double> AverageHitErrorHistory => averageHitErrorHistory;
-        private readonly BindableList<double> averageHitErrorHistory = new BindableList<double>();
+        public IBindableList<DataPoint> AverageHitErrorHistory => averageHitErrorHistory;
+        private readonly BindableList<DataPoint> averageHitErrorHistory = new BindableList<DataPoint>();
 
         private readonly Bindable<ScoreInfo?> latestScore = new Bindable<ScoreInfo?>();
 
+        [Resolved]
+        private OsuConfigManager configManager { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load(SessionStatics statics)
         {
@@ -46,9 +49,25 @@ namespace osu.Game.Configuration
             // keep a sane maximum number of entries.
             if (averageHitErrorHistory.Count >= 50)
                 averageHitErrorHistory.RemoveAt(0);
-            averageHitErrorHistory.Add(averageError);
+
+            double globalOffset = configManager.Get<double>(OsuSetting.AudioOffset);
+            averageHitErrorHistory.Add(new DataPoint(averageError, globalOffset));
         }
 
         public void ClearHistory() => averageHitErrorHistory.Clear();
+
+        public readonly struct DataPoint
+        {
+            public double AverageHitError { get; }
+            public double GlobalAudioOffset { get; }
+
+            public double SuggestedGlobalAudioOffset => GlobalAudioOffset - AverageHitError;
+
+            public DataPoint(double averageHitError, double globalOffset)
+            {
+                AverageHitError = averageHitError;
+                GlobalAudioOffset = globalOffset;
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
index 98acea1f2e..08bf4b0dad 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
 
             private readonly BindableNumberWithCurrent<double> current = new BindableNumberWithCurrent<double>();
 
-            private readonly IBindableList<double> averageHitErrorHistory = new BindableList<double>();
+            private readonly IBindableList<SessionAverageHitErrorTracker.DataPoint> averageHitErrorHistory = new BindableList<SessionAverageHitErrorTracker.DataPoint>();
 
             private readonly Bindable<double?> suggestedOffset = new Bindable<double?>();
 
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                 switch (e.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                        foreach (double average in e.NewItems!)
+                        foreach (SessionAverageHitErrorTracker.DataPoint dataPoint in e.NewItems!)
                         {
                             notchContainer.ForEach(n => n.Alpha *= 0.95f);
                             notchContainer.Add(new Box
@@ -122,16 +122,16 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                                 RelativePositionAxes = Axes.X,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                X = getXPositionForAverage(average)
+                                X = getXPositionForOffset(dataPoint.SuggestedGlobalAudioOffset)
                             });
                         }
 
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
-                        foreach (double average in e.OldItems!)
+                        foreach (SessionAverageHitErrorTracker.DataPoint dataPoint in e.OldItems!)
                         {
-                            var notch = notchContainer.FirstOrDefault(n => n.X == getXPositionForAverage(average));
+                            var notch = notchContainer.FirstOrDefault(n => n.X == getXPositionForOffset(dataPoint.SuggestedGlobalAudioOffset));
                             Debug.Assert(notch != null);
                             notchContainer.Remove(notch, true);
                         }
@@ -143,10 +143,10 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                         break;
                 }
 
-                suggestedOffset.Value = averageHitErrorHistory.Any() ? -averageHitErrorHistory.Average() : null;
+                suggestedOffset.Value = averageHitErrorHistory.Any() ? -averageHitErrorHistory.Average(dataPoint => dataPoint.SuggestedGlobalAudioOffset) : null;
             }
 
-            private float getXPositionForAverage(double average) => (float)(Math.Clamp(-average, current.MinValue, current.MaxValue) / (2 * current.MaxValue));
+            private float getXPositionForOffset(double offset) => (float)(Math.Clamp(offset, current.MinValue, current.MaxValue) / (2 * current.MaxValue));
 
             private void updateHintText()
             {

From 17753b82356c4e4f51fb6e55dbff4e8b604c6ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 29 Dec 2023 13:48:49 +0100
Subject: [PATCH 2242/2296] Remove opaque background from toolbar user button

Would close https://github.com/ppy/osu/issues/26223, and generally seems
more consistent with the rest of toolbar anyhow?
---
 osu.Game/Overlays/Toolbar/ToolbarUserButton.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index 7d1b6c7404..19b98628e6 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -40,8 +40,6 @@ namespace osu.Game.Overlays.Toolbar
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, IAPIProvider api, LoginOverlay? login)
         {
-            BackgroundContent.Add(new OpaqueBackground { Depth = 1 });
-
             Flow.Add(new Container
             {
                 Masking = true,

From d00b7c9cdf23b204f4843523dbd7a5ae0883faaa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Dec 2023 22:14:51 +0900
Subject: [PATCH 2243/2296] Add some new menu tips (and reword some others)

---
 osu.Game/Screens/Menu/MenuTip.cs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/MenuTip.cs b/osu.Game/Screens/Menu/MenuTip.cs
index ab09c07e64..e31281ea20 100644
--- a/osu.Game/Screens/Menu/MenuTip.cs
+++ b/osu.Game/Screens/Menu/MenuTip.cs
@@ -94,14 +94,14 @@ namespace osu.Game.Screens.Menu
         {
             string[] tips =
             {
-                "You can press Ctrl-T anywhere in the game to toggle the toolbar!",
-                "You can press Ctrl-O anywhere in the game to access options!",
+                "Press Ctrl-T anywhere in the game to toggle the toolbar!",
+                "Press Ctrl-O anywhere in the game to access options!",
                 "All settings are dynamic and take effect in real-time. Try changing the skin while watching autoplay!",
                 "New features are coming online every update. Make sure to stay up-to-date!",
                 "If you find the UI too large or small, try adjusting UI scale in settings!",
                 "Try adjusting the \"Screen Scaling\" mode to change your gameplay or UI area, even in fullscreen!",
                 "What used to be \"osu!direct\" is available to all users just like on the website. You can access it anywhere using Ctrl-B!",
-                "Seeking in replays is available by dragging on the difficulty bar at the bottom of the screen!",
+                "Seeking in replays is available by dragging on the difficulty bar at the bottom of the screen or by using the left and right arrow keys!",
                 "Multithreading support means that even with low \"FPS\" your input and judgements will be accurate!",
                 "Try scrolling right in mod select to find a bunch of new fun mods!",
                 "Most of the web content (profiles, rankings, etc.) are available natively in-game from the icons on the toolbar!",
@@ -110,6 +110,18 @@ namespace osu.Game.Screens.Menu
                 "Check out the \"playlists\" system, which lets users create their own custom and permanent leaderboards!",
                 "Toggle advanced frame / thread statistics with Ctrl-F11!",
                 "Take a look under the hood at performance counters and enable verbose performance logging with Ctrl-F2!",
+                "You can pause during a replay by pressing Space!",
+                "Most of the hotkeys in the game are configurable and can be changed to anything you want. Check the bindings panel under input settings!",
+                "When your gameplay HUD is hidden, you can press and hold Ctrl to view it temporarily!",
+                "Your gameplay HUD can be customized by using the skin layout editor. Open at any time via Ctrl-Shift-S!",
+                "Drag and drop any image into the skin editor to load it in quickly!",
+                "You can create mod presets to make toggling your favorite mod combinations easier!",
+                "Many mods have customisation settings that drastically change how they function. Click the Mod Customisation button in mod select to view settings!",
+                "Press Ctrl-Shift-R to switch to a random skin!",
+                "Press Ctrl-Shift-F to toggle the FPS Counter. But make sure not to pay too much attention to it!",
+                "While watching a reply replay, press Ctrl-H to toggle replay settings!",
+                "You can easily copy the mods from scores on a leaderboard by right-clicking on them!",
+                "Ctrl-Enter at song select will start a beatmap in autoplay mode!"
             };
 
             return tips[RNG.Next(0, tips.Length)];

From 9f0fe6c6cab17dc1395e6874e57bf29a58b39a8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Dec 2023 22:20:29 +0900
Subject: [PATCH 2244/2296] Fix common typos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Screens/Menu/MenuTip.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/MenuTip.cs b/osu.Game/Screens/Menu/MenuTip.cs
index e31281ea20..0f250768f1 100644
--- a/osu.Game/Screens/Menu/MenuTip.cs
+++ b/osu.Game/Screens/Menu/MenuTip.cs
@@ -113,13 +113,13 @@ namespace osu.Game.Screens.Menu
                 "You can pause during a replay by pressing Space!",
                 "Most of the hotkeys in the game are configurable and can be changed to anything you want. Check the bindings panel under input settings!",
                 "When your gameplay HUD is hidden, you can press and hold Ctrl to view it temporarily!",
-                "Your gameplay HUD can be customized by using the skin layout editor. Open at any time via Ctrl-Shift-S!",
+                "Your gameplay HUD can be customized by using the skin layout editor. Open it at any time via Ctrl-Shift-S!",
                 "Drag and drop any image into the skin editor to load it in quickly!",
                 "You can create mod presets to make toggling your favorite mod combinations easier!",
                 "Many mods have customisation settings that drastically change how they function. Click the Mod Customisation button in mod select to view settings!",
                 "Press Ctrl-Shift-R to switch to a random skin!",
                 "Press Ctrl-Shift-F to toggle the FPS Counter. But make sure not to pay too much attention to it!",
-                "While watching a reply replay, press Ctrl-H to toggle replay settings!",
+                "While watching a replay, press Ctrl-H to toggle replay settings!",
                 "You can easily copy the mods from scores on a leaderboard by right-clicking on them!",
                 "Ctrl-Enter at song select will start a beatmap in autoplay mode!"
             };

From 61c46b78bd380189944107782533915f9ec37995 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Dec 2023 22:24:16 +0900
Subject: [PATCH 2245/2296] Update MenuTip.cs

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game/Screens/Menu/MenuTip.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/MenuTip.cs b/osu.Game/Screens/Menu/MenuTip.cs
index 0f250768f1..da349373c3 100644
--- a/osu.Game/Screens/Menu/MenuTip.cs
+++ b/osu.Game/Screens/Menu/MenuTip.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.Menu
                 "If you find the UI too large or small, try adjusting UI scale in settings!",
                 "Try adjusting the \"Screen Scaling\" mode to change your gameplay or UI area, even in fullscreen!",
                 "What used to be \"osu!direct\" is available to all users just like on the website. You can access it anywhere using Ctrl-B!",
-                "Seeking in replays is available by dragging on the difficulty bar at the bottom of the screen or by using the left and right arrow keys!",
+                "Seeking in replays is available by dragging on the progress bar at the bottom of the screen or by using the left and right arrow keys!",
                 "Multithreading support means that even with low \"FPS\" your input and judgements will be accurate!",
                 "Try scrolling right in mod select to find a bunch of new fun mods!",
                 "Most of the web content (profiles, rankings, etc.) are available natively in-game from the icons on the toolbar!",

From 8df9a1ee1f8b8253e1438909f245aa709bd0be46 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 29 Dec 2023 20:43:00 +0300
Subject: [PATCH 2246/2296] Fix argon miss judgement on mania placed on a
 different position

---
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs
index 4ce3c50f7c..6b1d8a7fcd 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs
@@ -76,7 +76,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     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);

From 08d88ec2fa94b8d6e855246e40d7eb23e632773a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 29 Dec 2023 20:47:18 +0300
Subject: [PATCH 2247/2296] Add back initial position transform to ensure
 correctness

---
 .../Skinning/Argon/ArgonJudgementPiece.cs                    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs
index 6b1d8a7fcd..a191dee1ca 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 {
     public partial class ArgonJudgementPiece : JudgementPiece, IAnimatableJudgement
     {
+        private const float judgement_y_position = 160;
+
         private RingExplosion? ringExplosion;
 
         [Resolved]
@@ -30,7 +32,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             AutoSizeAxes = Axes.Both;
 
             Origin = Anchor.Centre;
-            Y = 160;
+            Y = judgement_y_position;
         }
 
         [BackgroundDependencyLoader]
@@ -76,6 +78,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     this.ScaleTo(1.6f);
                     this.ScaleTo(1, 100, Easing.In);
 
+                    this.MoveToY(judgement_y_position);
                     this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
 
                     this.RotateTo(0);

From 807443b6481223fc14574b6c0829e4f197dee6cb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 30 Dec 2023 10:21:59 +0900
Subject: [PATCH 2248/2296] Add HitResult.SliderTailHit

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs        |  8 ++++++++
 osu.Game/Rulesets/Judgements/Judgement.cs         |  2 ++
 osu.Game/Rulesets/Scoring/HitResult.cs            | 15 +++++++++++++++
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs       |  3 +++
 4 files changed, 28 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index d883b91abc..567bf6968f 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -84,6 +84,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 493_652)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 326_963)]
+        [TestCase(ScoringMode.Standardised, HitResult.SliderTailHit, HitResult.SliderTailHit, 326_963)]
         [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)]
         [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)]
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)]
@@ -96,6 +97,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 49_365)]
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)]
         [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 32_696)]
+        [TestCase(ScoringMode.Classic, HitResult.SliderTailHit, HitResult.SliderTailHit, 32_696)]
         [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 100_003)]
         [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 100_015)]
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
@@ -167,6 +169,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.Perfect, HitResult.Miss)]
         [TestCase(HitResult.SmallTickHit, HitResult.SmallTickMiss)]
         [TestCase(HitResult.LargeTickHit, HitResult.LargeTickMiss)]
+        [TestCase(HitResult.SliderTailHit, HitResult.LargeTickMiss)]
         [TestCase(HitResult.SmallBonus, HitResult.IgnoreMiss)]
         [TestCase(HitResult.LargeBonus, HitResult.IgnoreMiss)]
         public void TestMinResults(HitResult hitResult, HitResult expectedMinResult)
@@ -187,6 +190,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.SmallTickHit, false)]
         [TestCase(HitResult.LargeTickMiss, true)]
         [TestCase(HitResult.LargeTickHit, true)]
+        [TestCase(HitResult.SliderTailHit, true)]
         [TestCase(HitResult.SmallBonus, false)]
         [TestCase(HitResult.LargeBonus, false)]
         public void TestAffectsCombo(HitResult hitResult, bool expectedReturnValue)
@@ -207,6 +211,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.SmallTickHit, true)]
         [TestCase(HitResult.LargeTickMiss, true)]
         [TestCase(HitResult.LargeTickHit, true)]
+        [TestCase(HitResult.SliderTailHit, true)]
         [TestCase(HitResult.SmallBonus, false)]
         [TestCase(HitResult.LargeBonus, false)]
         public void TestAffectsAccuracy(HitResult hitResult, bool expectedReturnValue)
@@ -227,6 +232,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.SmallTickHit, false)]
         [TestCase(HitResult.LargeTickMiss, false)]
         [TestCase(HitResult.LargeTickHit, false)]
+        [TestCase(HitResult.SliderTailHit, false)]
         [TestCase(HitResult.SmallBonus, true)]
         [TestCase(HitResult.LargeBonus, true)]
         public void TestIsBonus(HitResult hitResult, bool expectedReturnValue)
@@ -247,6 +253,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.SmallTickHit, true)]
         [TestCase(HitResult.LargeTickMiss, false)]
         [TestCase(HitResult.LargeTickHit, true)]
+        [TestCase(HitResult.SliderTailHit, true)]
         [TestCase(HitResult.SmallBonus, true)]
         [TestCase(HitResult.LargeBonus, true)]
         public void TestIsHit(HitResult hitResult, bool expectedReturnValue)
@@ -267,6 +274,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.SmallTickHit, true)]
         [TestCase(HitResult.LargeTickMiss, true)]
         [TestCase(HitResult.LargeTickHit, true)]
+        [TestCase(HitResult.SliderTailHit, true)]
         [TestCase(HitResult.SmallBonus, true)]
         [TestCase(HitResult.LargeBonus, true)]
         public void TestIsScorable(HitResult hitResult, bool expectedReturnValue)
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 27402d522c..93386de483 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -73,6 +73,7 @@ namespace osu.Game.Rulesets.Judgements
                         return HitResult.SmallTickMiss;
 
                     case HitResult.LargeTickHit:
+                    case HitResult.SliderTailHit:
                         return HitResult.LargeTickMiss;
 
                     default:
@@ -104,6 +105,7 @@ namespace osu.Game.Rulesets.Judgements
                 case HitResult.SmallTickMiss:
                     return -DEFAULT_MAX_HEALTH_INCREASE * 0.5;
 
+                case HitResult.SliderTailHit:
                 case HitResult.LargeTickHit:
                     return DEFAULT_MAX_HEALTH_INCREASE;
 
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 2d55f1a649..f307344347 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -139,6 +139,13 @@ namespace osu.Game.Rulesets.Scoring
         [Order(15)]
         ComboBreak,
 
+        /// <summary>
+        /// A special judgement similar to <see cref="LargeTickHit"/> that's used to increase the valuation of the final tick of a slider.
+        /// </summary>
+        [EnumMember(Value = "slider_tail_hit")]
+        [Order(16)]
+        SliderTailHit,
+
         /// <summary>
         /// A special result used as a padding value for legacy rulesets. It is a hit type and affects combo, but does not affect the base score (does not affect accuracy).
         ///
@@ -188,6 +195,7 @@ namespace osu.Game.Rulesets.Scoring
                 case HitResult.LargeTickMiss:
                 case HitResult.LegacyComboIncrease:
                 case HitResult.ComboBreak:
+                case HitResult.SliderTailHit:
                     return true;
 
                 default:
@@ -246,6 +254,7 @@ namespace osu.Game.Rulesets.Scoring
                 case HitResult.LargeTickMiss:
                 case HitResult.SmallTickHit:
                 case HitResult.SmallTickMiss:
+                case HitResult.SliderTailHit:
                     return true;
 
                 default:
@@ -329,6 +338,9 @@ namespace osu.Game.Rulesets.Scoring
                 case HitResult.ComboBreak:
                     return true;
 
+                case HitResult.SliderTailHit:
+                    return true;
+
                 default:
                     // Note that IgnoreHit and IgnoreMiss are excluded as they do not affect score.
                     return result >= HitResult.Miss && result < HitResult.IgnoreMiss;
@@ -383,6 +395,9 @@ namespace osu.Game.Rulesets.Scoring
             if (minResult == HitResult.IgnoreMiss)
                 return;
 
+            if (maxResult == HitResult.SliderTailHit && minResult != HitResult.LargeTickMiss)
+                throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.LargeTickMiss} is the only valid minimum result for a {maxResult} judgement.");
+
             if (maxResult == HitResult.LargeTickHit && minResult != HitResult.LargeTickMiss)
                 throw new ArgumentOutOfRangeException(nameof(minResult), $"{HitResult.LargeTickMiss} is the only valid minimum result for a {maxResult} judgement.");
 
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 5123668e54..837bb4080e 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -322,6 +322,9 @@ namespace osu.Game.Rulesets.Scoring
                 case HitResult.LargeTickHit:
                     return 30;
 
+                case HitResult.SliderTailHit:
+                    return 150;
+
                 case HitResult.Meh:
                     return 50;
 

From 17a531209cf4ca6d2e2386f736779ad084a9fa44 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sat, 30 Dec 2023 10:24:59 +0900
Subject: [PATCH 2249/2296] Use SliderTailHit result for slider tails
 (non-classic-mod)

---
 .../TestSceneSliderEarlyHitJudgement.cs            |  2 +-
 .../TestSceneSliderInput.cs                        |  4 ++--
 .../TestSceneSliderLateHitJudgement.cs             | 14 +++++++-------
 osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs  |  2 +-
 .../Scoring/OsuHealthProcessor.cs                  |  1 +
 .../Scoring/OsuLegacyHealthProcessor.cs            |  1 +
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
index 4ea21e51f6..19883060a0 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderEarlyHitJudgement.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             assertHeadJudgement(HitResult.Meh);
             assertTickJudgement(HitResult.LargeTickHit);
-            assertTailJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.SliderTailHit);
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 716d2e0756..12be74c4cc 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -467,13 +467,13 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private void assertHeadMissTailTracked()
         {
-            AddAssert("Tracking retained", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.LargeTickHit));
+            AddAssert("Tracking retained", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.SliderTailHit));
             AddAssert("Slider head missed", () => judgementResults.First().IsHit, () => Is.False);
         }
 
         private void assertMidSliderJudgements()
         {
-            AddAssert("Tracking acquired", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.LargeTickHit));
+            AddAssert("Tracking acquired", () => judgementResults[^2].Type, () => Is.EqualTo(HitResult.SliderTailHit));
         }
 
         private void assertMidSliderJudgementFail()
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
index 6ba9c723da..1ba4a60b75 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderLateHitJudgement.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
 
             assertHeadJudgement(HitResult.Ok);
-            assertTailJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.SliderTailHit);
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertTickJudgement(1, HitResult.LargeTickHit);
             assertTickJudgement(2, HitResult.LargeTickHit);
             assertTickJudgement(3, HitResult.LargeTickHit);
-            assertTailJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.SliderTailHit);
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
@@ -182,7 +182,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertHeadJudgement(HitResult.Meh);
             assertAllTickJudgements(HitResult.LargeTickHit);
             assertRepeatJudgement(HitResult.LargeTickHit);
-            assertTailJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.SliderTailHit);
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
@@ -210,7 +210,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             assertHeadJudgement(HitResult.Meh);
             assertRepeatJudgement(HitResult.LargeTickHit);
-            assertTailJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.SliderTailHit);
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
@@ -245,7 +245,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertAllTickJudgements(HitResult.LargeTickMiss);
 
             // This particular test actually starts tracking the slider just before the end, so the tail should be hit because of its leniency.
-            assertTailJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.SliderTailHit);
 
             assertSliderJudgement(HitResult.IgnoreHit);
         }
@@ -276,7 +276,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             assertHeadJudgement(HitResult.Meh);
             assertTickJudgement(0, HitResult.LargeTickMiss);
-            assertTailJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.SliderTailHit);
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
@@ -307,7 +307,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertHeadJudgement(HitResult.Meh);
             assertTickJudgement(0, HitResult.LargeTickMiss);
             assertTickJudgement(1, HitResult.LargeTickMiss);
-            assertTailJudgement(HitResult.LargeTickHit);
+            assertTailJudgement(HitResult.SliderTailHit);
             assertSliderJudgement(HitResult.IgnoreHit);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index 357476ed30..ceee513412 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public class TailJudgement : SliderEndJudgement
         {
-            public override HitResult MaxResult => HitResult.LargeTickHit;
+            public override HitResult MaxResult => HitResult.SliderTailHit;
             public override HitResult MinResult => HitResult.IgnoreMiss;
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
index 2eb257b3e6..fe6da9af35 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHealthProcessor.cs
@@ -91,6 +91,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     // When classic slider mechanics are enabled, this result comes from the tail.
                     return 0.02;
 
+                case HitResult.SliderTailHit:
                 case HitResult.LargeTickHit:
                     switch (result.HitObject)
                     {
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuLegacyHealthProcessor.cs b/osu.Game.Rulesets.Osu/Scoring/OsuLegacyHealthProcessor.cs
index e383e82b86..57d2f64e2c 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuLegacyHealthProcessor.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuLegacyHealthProcessor.cs
@@ -57,6 +57,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
                     increase = 0.02;
                     break;
 
+                case HitResult.SliderTailHit:
                 case HitResult.LargeTickHit:
                     // This result comes from either a slider tick or repeat.
                     increase = hitObject is SliderTick ? 0.015 : 0.02;

From bca060048266e1b124699def72b8f86e00b79c99 Mon Sep 17 00:00:00 2001
From: CaffeeLake <PascalCoffeeLake@gmail.com>
Date: Wed, 27 Dec 2023 22:11:54 +0900
Subject: [PATCH 2250/2296] Use 0.99x or 1.01x

Signed-off-by: CaffeeLake <PascalCoffeeLake@gmail.com>
---
 osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs | 10 ++++++++--
 osu.Game/Screens/Select/FooterButtonMods.cs      | 12 +++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
index c758632392..85bcf6f0b2 100644
--- a/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -108,13 +109,13 @@ namespace osu.Game.Overlays.Mods
 
             Current.BindValueChanged(e =>
             {
-                if (e.NewValue > Current.Default)
+                if (Precision.DefinitelyBigger(e.NewValue, Current.Default))
                 {
                     MainBackground
                         .FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
                     counter.FadeColour(ColourProvider.Background5, transition_duration, Easing.OutQuint);
                 }
-                else if (e.NewValue < Current.Default)
+                else if (Precision.DefinitelyBigger(Current.Default, e.NewValue))
                 {
                     MainBackground
                         .FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
@@ -131,6 +132,11 @@ namespace osu.Game.Overlays.Mods
                     .FadeTo(0.15f, 60, Easing.OutQuint)
                     .Then().FadeOut(500, Easing.OutQuint);
 
+                if (Precision.DefinitelyBigger(1.0, Current.Value) && Current.Value >= 0.995)
+                    Current.Value = 0.99;
+                if (Precision.DefinitelyBigger(Current.Value, 1.0) && Current.Value < 1.005)
+                    Current.Value = 1.01;
+
                 const float move_amount = 4;
                 if (e.NewValue > e.OldValue)
                     counter.MoveToY(Math.Max(-move_amount * 2, counter.Y - move_amount)).Then().MoveToY(0, transition_duration * 2, Easing.OutQuint);
diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index 9a84f9a0aa..cfbd17be01 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 using osu.Game.Input.Bindings;
+using osu.Framework.Utils;
 
 namespace osu.Game.Screens.Select
 {
@@ -88,11 +89,16 @@ namespace osu.Game.Screens.Select
         {
             double multiplier = Current.Value?.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier) ?? 1;
 
-            MultiplierText.Text = multiplier.Equals(1.0) ? string.Empty : $"{multiplier:N2}x";
+            if (Precision.DefinitelyBigger(1.0, multiplier) && multiplier >= 0.995)
+                MultiplierText.Text = $"{0.99:N2}x";
+            else if (Precision.DefinitelyBigger(multiplier, 1.0) && multiplier < 1.005)
+                MultiplierText.Text = $"{1.01:N2}x";
+            else
+                MultiplierText.Text = multiplier.Equals(1.0) ? string.Empty : $"{multiplier:N2}x";
 
-            if (multiplier > 1.0)
+            if (Precision.DefinitelyBigger(multiplier, 1.0))
                 MultiplierText.FadeColour(highMultiplierColour, 200);
-            else if (multiplier < 1.0)
+            else if (Precision.DefinitelyBigger(1.0, multiplier))
                 MultiplierText.FadeColour(lowMultiplierColour, 200);
             else
                 MultiplierText.FadeColour(Color4.White, 200);

From cc89390ea89e6b1f8127adef2717e4d6438b7b46 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 30 Dec 2023 21:33:03 +0300
Subject: [PATCH 2251/2296] Expose `SuggestedOffset` bindable for testing
 purposes

---
 .../Sections/Audio/AudioOffsetAdjustControl.cs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
index 08bf4b0dad..e46dc602eb 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
 {
     public partial class AudioOffsetAdjustControl : SettingsItem<double>
     {
+        public IBindable<double?> SuggestedOffset => ((AudioOffsetPreview)Control).SuggestedOffset;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -44,7 +46,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
 
             private readonly IBindableList<SessionAverageHitErrorTracker.DataPoint> averageHitErrorHistory = new BindableList<SessionAverageHitErrorTracker.DataPoint>();
 
-            private readonly Bindable<double?> suggestedOffset = new Bindable<double?>();
+            public readonly Bindable<double?> SuggestedOffset = new Bindable<double?>();
 
             private Container<Box> notchContainer = null!;
             private TextFlowContainer hintText = null!;
@@ -90,8 +92,8 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                             Text = "Apply suggested offset",
                             Action = () =>
                             {
-                                if (suggestedOffset.Value.HasValue)
-                                    current.Value = suggestedOffset.Value.Value;
+                                if (SuggestedOffset.Value.HasValue)
+                                    current.Value = SuggestedOffset.Value.Value;
                                 hitErrorTracker.ClearHistory();
                             }
                         }
@@ -104,7 +106,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                 base.LoadComplete();
 
                 averageHitErrorHistory.BindCollectionChanged(updateDisplay, true);
-                suggestedOffset.BindValueChanged(_ => updateHintText(), true);
+                SuggestedOffset.BindValueChanged(_ => updateHintText(), true);
             }
 
             private void updateDisplay(object? _, NotifyCollectionChangedEventArgs e)
@@ -143,17 +145,17 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                         break;
                 }
 
-                suggestedOffset.Value = averageHitErrorHistory.Any() ? -averageHitErrorHistory.Average(dataPoint => dataPoint.SuggestedGlobalAudioOffset) : null;
+                SuggestedOffset.Value = averageHitErrorHistory.Any() ? -averageHitErrorHistory.Average(dataPoint => dataPoint.SuggestedGlobalAudioOffset) : null;
             }
 
             private float getXPositionForOffset(double offset) => (float)(Math.Clamp(offset, current.MinValue, current.MaxValue) / (2 * current.MaxValue));
 
             private void updateHintText()
             {
-                hintText.Text = suggestedOffset.Value == null
+                hintText.Text = SuggestedOffset.Value == null
                     ? @"Play a few beatmaps to receive a suggested offset!"
-                    : $@"Based on the last {averageHitErrorHistory.Count} play(s), the suggested offset is {suggestedOffset.Value:N0} ms.";
-                applySuggestion.Enabled.Value = suggestedOffset.Value != null;
+                    : $@"Based on the last {averageHitErrorHistory.Count} play(s), the suggested offset is {SuggestedOffset.Value:N0} ms.";
+                applySuggestion.Enabled.Value = SuggestedOffset.Value != null;
             }
         }
     }

From 68dd103c89e25619bf4aea6aea65e61d369396d6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 30 Dec 2023 21:33:22 +0300
Subject: [PATCH 2252/2296] Add failing test cases

---
 .../TestSceneAudioOffsetAdjustControl.cs      | 88 ++++++++++++++++---
 1 file changed, 78 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneAudioOffsetAdjustControl.cs b/osu.Game.Tests/Visual/Settings/TestSceneAudioOffsetAdjustControl.cs
index efb65bb0a8..85cde966b1 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneAudioOffsetAdjustControl.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneAudioOffsetAdjustControl.cs
@@ -3,7 +3,7 @@
 
 using NUnit.Framework;
 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.Utils;
@@ -25,9 +25,15 @@ namespace osu.Game.Tests.Visual.Settings
         private Container content = null!;
         protected override Container Content => content;
 
+        private OsuConfigManager localConfig = null!;
+        private AudioOffsetAdjustControl adjustControl = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
+            localConfig = new OsuConfigManager(LocalStorage);
+            Dependencies.CacheAs(localConfig);
+
             base.Content.AddRange(new Drawable[]
             {
                 tracker,
@@ -41,17 +47,21 @@ namespace osu.Game.Tests.Visual.Settings
             });
         }
 
-        [Test]
-        public void TestBehaviour()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
-            AddStep("create control", () => Child = new AudioOffsetAdjustControl
+            Child = adjustControl = new AudioOffsetAdjustControl
             {
-                Current = new BindableDouble
-                {
-                    MinValue = -500,
-                    MaxValue = 500
-                }
-            });
+                Current = localConfig.GetBindable<double>(OsuSetting.AudioOffset),
+            };
+
+            localConfig.SetValue(OsuSetting.AudioOffset, 0.0);
+            tracker.ClearHistory();
+        });
+
+        [Test]
+        public void TestDisplay()
+        {
             AddStep("set new score", () => statics.SetValue(Static.LastLocalUserScore, new ScoreInfo
             {
                 HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(RNG.NextDouble(-100, 100)),
@@ -59,5 +69,63 @@ namespace osu.Game.Tests.Visual.Settings
             }));
             AddStep("clear history", () => tracker.ClearHistory());
         }
+
+        [Test]
+        public void TestBehaviour()
+        {
+            AddStep("set score with -20ms", () => setScore(-20));
+            AddAssert("suggested global offset is 20ms", () => adjustControl.SuggestedOffset.Value, () => Is.EqualTo(20));
+            AddStep("clear history", () => tracker.ClearHistory());
+
+            AddStep("set score with 40ms", () => setScore(40));
+            AddAssert("suggested global offset is -40ms", () => adjustControl.SuggestedOffset.Value, () => Is.EqualTo(-40));
+            AddStep("clear history", () => tracker.ClearHistory());
+        }
+
+        [Test]
+        public void TestNonZeroGlobalOffset()
+        {
+            AddStep("set global offset to -20ms", () => localConfig.SetValue(OsuSetting.AudioOffset, -20.0));
+            AddStep("set score with -20ms", () => setScore(-20));
+            AddAssert("suggested global offset is 0ms", () => adjustControl.SuggestedOffset.Value, () => Is.EqualTo(0));
+            AddStep("clear history", () => tracker.ClearHistory());
+
+            AddStep("set global offset to 20ms", () => localConfig.SetValue(OsuSetting.AudioOffset, 20.0));
+            AddStep("set score with 40ms", () => setScore(40));
+            AddAssert("suggested global offset is -20ms", () => adjustControl.SuggestedOffset.Value, () => Is.EqualTo(-20));
+            AddStep("clear history", () => tracker.ClearHistory());
+        }
+
+        [Test]
+        public void TestMultiplePlays()
+        {
+            AddStep("set score with -20ms", () => setScore(-20));
+            AddStep("set score with -10ms", () => setScore(-10));
+            AddAssert("suggested global offset is 15ms", () => adjustControl.SuggestedOffset.Value, () => Is.EqualTo(15));
+            AddStep("clear history", () => tracker.ClearHistory());
+
+            AddStep("set score with -20ms", () => setScore(-20));
+            AddStep("set global offset to 30ms", () => localConfig.SetValue(OsuSetting.AudioOffset, 30.0));
+            AddStep("set score with 10ms", () => setScore(10));
+            AddAssert("suggested global offset is 20ms", () => adjustControl.SuggestedOffset.Value, () => Is.EqualTo(20));
+            AddStep("clear history", () => tracker.ClearHistory());
+        }
+
+        private void setScore(double averageHitError)
+        {
+            statics.SetValue(Static.LastLocalUserScore, new ScoreInfo
+            {
+                HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(averageHitError),
+                BeatmapInfo = Beatmap.Value.BeatmapInfo,
+            });
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            if (localConfig.IsNotNull())
+                localConfig.Dispose();
+
+            base.Dispose(isDisposing);
+        }
     }
 }

From e6fe631625643a23b18641a132c6e67c1062b9ee Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 30 Dec 2023 21:34:37 +0300
Subject: [PATCH 2253/2296] Fix suggested value in audio offset adjust control
 being opposite in signs

---
 .../Settings/Sections/Audio/AudioOffsetAdjustControl.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
index e46dc602eb..90f5a59215 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioOffsetAdjustControl.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                         break;
                 }
 
-                SuggestedOffset.Value = averageHitErrorHistory.Any() ? -averageHitErrorHistory.Average(dataPoint => dataPoint.SuggestedGlobalAudioOffset) : null;
+                SuggestedOffset.Value = averageHitErrorHistory.Any() ? averageHitErrorHistory.Average(dataPoint => dataPoint.SuggestedGlobalAudioOffset) : null;
             }
 
             private float getXPositionForOffset(double offset) => (float)(Math.Clamp(offset, current.MinValue, current.MaxValue) / (2 * current.MaxValue));

From 452f201f0673426df7e88b78f720293863e8d660 Mon Sep 17 00:00:00 2001
From: iminlikewithyou <christian@omg.games>
Date: Sat, 30 Dec 2023 12:56:38 -0600
Subject: [PATCH 2254/2296] use margins isntead of moving the position of the
 sprite

---
 osu.Game/Screens/Menu/MainMenuButton.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenuButton.cs b/osu.Game/Screens/Menu/MainMenuButton.cs
index 3d56a75ca8..422599a4a8 100644
--- a/osu.Game/Screens/Menu/MainMenuButton.cs
+++ b/osu.Game/Screens/Menu/MainMenuButton.cs
@@ -129,7 +129,8 @@ namespace osu.Game.Screens.Menu
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Size = new Vector2(32),
-                            Position = new Vector2(0, -4),
+                            Position = new Vector2(0, 0),
+                            Margin = new MarginPadding { Top = -4 },
                             Icon = symbol
                         },
                         new OsuSpriteText
@@ -138,7 +139,8 @@ namespace osu.Game.Screens.Menu
                             AllowMultiline = false,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Position = new Vector2(-3, 35),
+                            Position = new Vector2(0, 35),
+                            Margin = new MarginPadding { Left = -3 },
                             Text = text
                         }
                     }
@@ -189,7 +191,7 @@ namespace osu.Game.Screens.Menu
         {
             icon.ClearTransforms();
             icon.RotateTo(0, 500, Easing.Out);
-            icon.MoveTo(new Vector2(0, -4), 500, Easing.Out);
+            icon.MoveTo(Vector2.Zero, 500, Easing.Out);
             icon.ScaleTo(Vector2.One, 200, Easing.Out);
 
             if (State == ButtonState.Expanded)

From 535177ab97c06c291aaba6860b0499096413c708 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 30 Dec 2023 11:40:40 -0800
Subject: [PATCH 2255/2296] Remove outdated main menu version reference on
 issue template

---
 .github/ISSUE_TEMPLATE/bug-issue.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-issue.yml b/.github/ISSUE_TEMPLATE/bug-issue.yml
index dfdcf8d320..a8a5d5e64b 100644
--- a/.github/ISSUE_TEMPLATE/bug-issue.yml
+++ b/.github/ISSUE_TEMPLATE/bug-issue.yml
@@ -42,7 +42,7 @@ body:
   - type: input
     attributes:
       label: Version
-      description: The version you encountered this bug on. This is shown at the bottom of the main menu and also at the end of the settings screen.
+      description: The version you encountered this bug on. This is shown at the end of the settings overlay.
     validations:
       required: true
   - type: markdown

From 922b6ccb83b0e83d9b2be6f63ee7e8366e500c73 Mon Sep 17 00:00:00 2001
From: Gabriel Del Nero <43073074+Gabixel@users.noreply.github.com>
Date: Sun, 31 Dec 2023 00:36:55 +0100
Subject: [PATCH 2256/2296] Use `FontAwesome` solid heart icon instead of
 `OsuIcon`'s

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

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 08a816930e..85751e7457 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Profile.Header
             bool anyInfoAdded = false;
 
             anyInfoAdded |= tryAddInfo(FontAwesome.Solid.MapMarker, user.Location);
-            anyInfoAdded |= tryAddInfo(OsuIcon.Heart, user.Interests);
+            anyInfoAdded |= tryAddInfo(FontAwesome.Solid.Heart, user.Interests);
             anyInfoAdded |= tryAddInfo(FontAwesome.Solid.Suitcase, user.Occupation);
 
             if (anyInfoAdded)

From 7cfb786b1a1dae5ef00c5d0359de336c4725c757 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 31 Dec 2023 04:48:06 +0300
Subject: [PATCH 2257/2296] Add helper method for properly formatting score
 multiplier in `ModUtils`

---
 osu.Game/Utils/ModUtils.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 1bd60fcdde..dad8c72aa1 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using osu.Framework.Extensions.LocalisationExtensions;
+using osu.Framework.Localisation;
 using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -226,5 +228,21 @@ namespace osu.Game.Utils
 
             return proposedWereValid;
         }
+
+        /// <summary>
+        /// Given a value of a score multiplier, returns a string version with special handling for a value near 1.00x.
+        /// </summary>
+        /// <param name="scoreMultiplier">The value of the score multiplier.</param>
+        /// <returns>A formatted score multiplier with a trailing "x" symbol</returns>
+        public static LocalisableString FormatScoreMultiplier(double scoreMultiplier)
+        {
+            // Round multiplier values away from 1.00x to two significant digits.
+            if (scoreMultiplier > 1)
+                scoreMultiplier = Math.Ceiling(scoreMultiplier * 100) / 100;
+            else
+                scoreMultiplier = Math.Floor(scoreMultiplier * 100) / 100;
+
+            return scoreMultiplier.ToLocalisableString("0.00x");
+        }
     }
 }

From 4dc11c4c48d49104a2d5e504a58441f1752e6d7b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 31 Dec 2023 05:18:07 +0300
Subject: [PATCH 2258/2296] Update existing code to use helper method

---
 osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs | 14 ++++----------
 osu.Game/Screens/Select/FooterButtonMods.cs      | 14 ++++----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
index 85bcf6f0b2..b599b53082 100644
--- a/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
@@ -4,18 +4,17 @@
 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;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
-using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
 using osuTK;
 
 namespace osu.Game.Overlays.Mods
@@ -109,13 +108,13 @@ namespace osu.Game.Overlays.Mods
 
             Current.BindValueChanged(e =>
             {
-                if (Precision.DefinitelyBigger(e.NewValue, Current.Default))
+                if (e.NewValue > Current.Default)
                 {
                     MainBackground
                         .FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
                     counter.FadeColour(ColourProvider.Background5, transition_duration, Easing.OutQuint);
                 }
-                else if (Precision.DefinitelyBigger(Current.Default, e.NewValue))
+                else if (e.NewValue < Current.Default)
                 {
                     MainBackground
                         .FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
@@ -132,11 +131,6 @@ namespace osu.Game.Overlays.Mods
                     .FadeTo(0.15f, 60, Easing.OutQuint)
                     .Then().FadeOut(500, Easing.OutQuint);
 
-                if (Precision.DefinitelyBigger(1.0, Current.Value) && Current.Value >= 0.995)
-                    Current.Value = 0.99;
-                if (Precision.DefinitelyBigger(Current.Value, 1.0) && Current.Value < 1.005)
-                    Current.Value = 1.01;
-
                 const float move_amount = 4;
                 if (e.NewValue > e.OldValue)
                     counter.MoveToY(Math.Max(-move_amount * 2, counter.Y - move_amount)).Then().MoveToY(0, transition_duration * 2, Easing.OutQuint);
@@ -153,7 +147,7 @@ namespace osu.Game.Overlays.Mods
         {
             protected override double RollingDuration => 500;
 
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(@"0.00x");
+            protected override LocalisableString FormatCount(double count) => ModUtils.FormatScoreMultiplier(count);
 
             protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
             {
diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index cfbd17be01..69782c25bb 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -19,7 +19,7 @@ using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 using osu.Game.Input.Bindings;
-using osu.Framework.Utils;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.Select
 {
@@ -88,17 +88,11 @@ namespace osu.Game.Screens.Select
         private void updateMultiplierText() => Schedule(() =>
         {
             double multiplier = Current.Value?.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier) ?? 1;
+            MultiplierText.Text = multiplier == 1 ? string.Empty : ModUtils.FormatScoreMultiplier(multiplier);
 
-            if (Precision.DefinitelyBigger(1.0, multiplier) && multiplier >= 0.995)
-                MultiplierText.Text = $"{0.99:N2}x";
-            else if (Precision.DefinitelyBigger(multiplier, 1.0) && multiplier < 1.005)
-                MultiplierText.Text = $"{1.01:N2}x";
-            else
-                MultiplierText.Text = multiplier.Equals(1.0) ? string.Empty : $"{multiplier:N2}x";
-
-            if (Precision.DefinitelyBigger(multiplier, 1.0))
+            if (multiplier > 1)
                 MultiplierText.FadeColour(highMultiplierColour, 200);
-            else if (Precision.DefinitelyBigger(1.0, multiplier))
+            else if (multiplier < 1)
                 MultiplierText.FadeColour(lowMultiplierColour, 200);
             else
                 MultiplierText.FadeColour(Color4.White, 200);

From cd9250d08ccc415b5d94bacf8e0c31eb0d273ffb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 31 Dec 2023 05:18:10 +0300
Subject: [PATCH 2259/2296] Add test coverage

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index 9107ddd1ae..4f10a0ea54 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -310,6 +310,13 @@ namespace osu.Game.Tests.Mods
                 Assert.That(invalid?.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
         }
 
+        [Test]
+        public void TestFormatScoreMultiplier()
+        {
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(0.9999).ToString(), "0.99x");
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.0001).ToString(), "1.01x");
+        }
+
         public abstract class CustomMod1 : Mod, IModCompatibilitySpecification
         {
         }
@@ -339,6 +346,16 @@ namespace osu.Game.Tests.Mods
             public override bool ValidForMultiplayerAsFreeMod => false;
         }
 
+        public class EditableMod : Mod
+        {
+            public override string Name => string.Empty;
+            public override LocalisableString Description => string.Empty;
+            public override string Acronym => string.Empty;
+            public override double ScoreMultiplier => Multiplier;
+
+            public double Multiplier = 1;
+        }
+
         public interface IModCompatibilitySpecification
         {
         }

From 5ae5d7f92dc7b002e5b685922707c9cef61edbf9 Mon Sep 17 00:00:00 2001
From: iminlikewithyou <christian@omg.games>
Date: Sat, 30 Dec 2023 23:59:47 -0600
Subject: [PATCH 2260/2296] change floor to round

---
 osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
index b5315feccb..45213b7bdb 100644
--- a/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
+++ b/osu.Game/Screens/Edit/Timing/WaveformComparisonDisplay.cs
@@ -224,7 +224,7 @@ namespace osu.Game.Screens.Edit.Timing
                 row.Alpha = time < selectedGroupStartTime || time > selectedGroupEndTime ? 0.2f : 1;
                 row.WaveformOffsetTo(-offset, animated);
                 row.WaveformScale = new Vector2(scale, 1);
-                row.BeatIndex = (int)Math.Floor(index);
+                row.BeatIndex = (int)Math.Round(index);
 
                 index++;
             }

From 4a94cfd35d74060daf691aabf6cf6235a1282344 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 31 Dec 2023 16:47:10 +0300
Subject: [PATCH 2261/2296] Fix failing test case

---
 .../Visual/UserInterface/TestSceneFooterButtonMods.cs         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
index 4e1bf1390a..b98b91e8e5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
@@ -5,10 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Select;
+using osu.Game.Utils;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -74,7 +76,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private bool assertModsMultiplier(IEnumerable<Mod> mods)
         {
             double multiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
-            string expectedValue = multiplier.Equals(1.0) ? string.Empty : $"{multiplier:N2}x";
+            string expectedValue = multiplier == 1 ? string.Empty : ModUtils.FormatScoreMultiplier(multiplier).ToString();
 
             return expectedValue == footerButtonMods.MultiplierText.Current.Value;
         }

From ca0f09733ab7741a1ee583d710bafead4fe86039 Mon Sep 17 00:00:00 2001
From: CaffeeLake <PascalCoffeeLake@gmail.com>
Date: Sun, 31 Dec 2023 23:35:42 +0900
Subject: [PATCH 2262/2296] Remove unnecessary using directives

Signed-off-by: CaffeeLake <PascalCoffeeLake@gmail.com>
---
 osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
index b98b91e8e5..a95bb2c9e3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;

From ad4b5f6deddc8cab855be638d7c77a358e6bf05a Mon Sep 17 00:00:00 2001
From: CaffeeLake <PascalCoffeeLake@gmail.com>
Date: Mon, 1 Jan 2024 08:32:21 +0900
Subject: [PATCH 2263/2296] Fix: floating point errors

Signed-off-by: CaffeeLake <PascalCoffeeLake@gmail.com>
---
 osu.Game/Utils/ModUtils.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index dad8c72aa1..252579a186 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -238,9 +238,9 @@ namespace osu.Game.Utils
         {
             // Round multiplier values away from 1.00x to two significant digits.
             if (scoreMultiplier > 1)
-                scoreMultiplier = Math.Ceiling(scoreMultiplier * 100) / 100;
+                scoreMultiplier = Math.Ceiling(Math.Round(scoreMultiplier * 100, 12)) / 100;
             else
-                scoreMultiplier = Math.Floor(scoreMultiplier * 100) / 100;
+                scoreMultiplier = Math.Floor(Math.Round(scoreMultiplier * 100, 12)) / 100;
 
             return scoreMultiplier.ToLocalisableString("0.00x");
         }

From 94531807e476c774c42df3ef0ef745608eb80534 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Jan 2024 17:01:32 +0900
Subject: [PATCH 2264/2296] Make slider ends show on results screen again

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs | 2 ++
 osu.Game/Scoring/ScoreInfo.cs       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 5959576b9d..0496d1f680 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -277,6 +277,7 @@ namespace osu.Game.Rulesets.Osu
 
                 HitResult.LargeTickHit,
                 HitResult.SmallTickHit,
+                HitResult.SliderTailHit,
                 HitResult.SmallBonus,
                 HitResult.LargeBonus,
             };
@@ -289,6 +290,7 @@ namespace osu.Game.Rulesets.Osu
                 case HitResult.LargeTickHit:
                     return "slider tick";
 
+                case HitResult.SliderTailHit:
                 case HitResult.SmallTickHit:
                     return "slider end";
 
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 44795c6fa7..32e4bbbf29 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -350,6 +350,7 @@ namespace osu.Game.Scoring
                 {
                     case HitResult.SmallTickHit:
                     case HitResult.LargeTickHit:
+                    case HitResult.SliderTailHit:
                     case HitResult.LargeBonus:
                     case HitResult.SmallBonus:
                         if (MaximumStatistics.TryGetValue(r.result, out int count) && count > 0)

From b0cfea491675a012694576168396ba1c433133e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Jan 2024 10:11:49 +0100
Subject: [PATCH 2265/2296] Fix standardised score conversion failing for some
 taiko scores due to overestimating accuracy portion

Standardised score conversion would return a negative total score for
https://osu.ppy.sh/scores/taiko/182230346.

The underlying reason for this is that the estimation of the accuracy
portion for a score can be above the actual accuracy portion in the
taiko ruleset.

When calculating the maximum accuracy portion achievable,
`TaikoLegacyScoreSimulator` will include the extra 300 points from
a double hit on a strong hit, per strong hit. However, this double hit
is not factored into accuracy.

Both of the aforementioned facts mean that in taiko

	maximumLegacyAccuracyScore * score.Accuracy

- which normally in other rulesets can be used pretty reliably as the
exact number of points gained from the accuracy portion - is an
estimate in the case of taiko, and an _upper_ estimate at that,
because it implicitly assumes that the user has also hit
`score.Accuracy` percent of all double hits possible in the beatmap. If
this assumption is not upheld, then the user will have earned _less_
points than that from the accuracy portion, which means that the combo
proportion estimate will go below zero.

It is possible that this has happened on other scores before, but did
not result in the total score going negative as the accuracy portion
gained would have counteracted the effect of that due to being larger in
magnitude than the score loss incurred from the negative combo
portion. In the case of the score in question this was not the case due
to very low accuracy _and_ very low max combo.
---
 osu.Game/Database/StandardisedScoreMigrationTools.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/StandardisedScoreMigrationTools.cs b/osu.Game/Database/StandardisedScoreMigrationTools.cs
index 66c816e796..9cfb9ea957 100644
--- a/osu.Game/Database/StandardisedScoreMigrationTools.cs
+++ b/osu.Game/Database/StandardisedScoreMigrationTools.cs
@@ -316,7 +316,7 @@ namespace osu.Game.Database
             // when playing a beatmap with no bonus objects, with mods that have a 0.0x multiplier on stable (relax/autopilot).
             // In such cases, just assume 0.
             double comboProportion = maximumLegacyComboScore + maximumLegacyBonusScore > 0
-                ? ((double)score.LegacyTotalScore - legacyAccScore) / (maximumLegacyComboScore + maximumLegacyBonusScore)
+                ? Math.Max((double)score.LegacyTotalScore - legacyAccScore, 0) / (maximumLegacyComboScore + maximumLegacyBonusScore)
                 : 0;
 
             // We assume the bonus proportion only makes up the rest of the score that exceeds maximumLegacyBaseScore.

From 3c5e9ac9a9cfc224905f8f8c6da66ed143cc7e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Jan 2024 10:49:09 +0100
Subject: [PATCH 2266/2296] Fix possible double score submission when
 auto-retrying via perfect mod

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

`submitOnFailOrQuit()`, as the name suggests, can be called both when
the player has failed, or when the player screen is being exited from.
Notably, when perfect mod with auto-retry is active, the two happen
almost simultaneously.

This double call exposes a data race in `submitScore()` concerning the
handling of `scoreSubmissionSource`. The race could be experimentally
confirmed by applying the following patch:

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 83adf1f960..76dd29bbdb 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -228,6 +228,7 @@ private Task submitScore(Score score)
                 return Task.CompletedTask;
             }

+            Logger.Log($"{nameof(scoreSubmissionSource)} is {(scoreSubmissionSource == null ? "null" : "not null")}");
             if (scoreSubmissionSource != null)
                 return scoreSubmissionSource.Task;

@@ -237,6 +238,7 @@ private Task submitScore(Score score)

             Logger.Log($"Beginning score submission (token:{token.Value})...");

+            Logger.Log($"creating new {nameof(scoreSubmissionSource)}");
             scoreSubmissionSource = new TaskCompletionSource<bool>();
             var request = CreateSubmissionRequest(score, token.Value);

which would result in the following log output:

	[runtime] 2024-01-02 09:54:13 [verbose]: scoreSubmissionSource is null
	[runtime] 2024-01-02 09:54:13 [verbose]: scoreSubmissionSource is null
	[runtime] 2024-01-02 09:54:13 [verbose]: Beginning score submission (token:36780)...
	[runtime] 2024-01-02 09:54:13 [verbose]: creating new scoreSubmissionSource
	[runtime] 2024-01-02 09:54:13 [verbose]: Beginning score submission (token:36780)...
	[runtime] 2024-01-02 09:54:13 [verbose]: creating new scoreSubmissionSource
	[network] 2024-01-02 09:54:13 [verbose]: Performing request osu.Game.Online.Solo.SubmitSoloScoreRequest
	[network] 2024-01-02 09:54:14 [verbose]: Request to https://dev.ppy.sh/api/v2/beatmaps/869310/solo/scores/36780 successfully completed!
	[network] 2024-01-02 09:54:14 [verbose]: SubmitSoloScoreRequest finished with response size of 639 bytes
	[network] 2024-01-02 09:54:14 [verbose]: Performing request osu.Game.Online.Solo.SubmitSoloScoreRequest
	[runtime] 2024-01-02 09:54:14 [verbose]: Score submission completed! (token:36780 id:20247)
	[network] 2024-01-02 09:54:14 [verbose]: Request to https://dev.ppy.sh/api/v2/beatmaps/869310/solo/scores/36780 successfully completed!
	[network] 2024-01-02 09:54:14 [verbose]: SubmitSoloScoreRequest finished with response size of 639 bytes
	[runtime] 2024-01-02 09:54:14 [error]: An unhandled error has occurred.
	[runtime] 2024-01-02 09:54:14 [error]: System.InvalidOperationException: An attempt was made to transition a task to a final state when it had already completed.
	[runtime] 2024-01-02 09:54:14 [error]: at osu.Game.Screens.Play.SubmittingPlayer.<>c__DisplayClass30_0.<submitScore>b__0(MultiplayerScore s) in /home/dachb/Documents/opensource/osu/osu.Game/Screens/Play/SubmittingPlayer.cs:line 250

The intention of the submission logic was to only ever create one
`scoreSubmissionSource`, and then reuse this one if a redundant
submission request was made. However, because of the temporal proximity
of fail and quit in this particular case, combined with the fact that
the calls to `submitScore()` are taking place on TPL threads, means that
there is a read-write data race on `scoreSubmissionSource`, wherein the
source can be actually created twice.

This leads to two concurrent score submission requests, which, upon
completion, attempt to transition only _the second_
`scoreSubmissionSource` to a final state (this is because the API
success/failure request callbacks capture `this`, i.e. the entire
`SubmittingPlayer` instance, rather than the `scoreSubmissionSource`
reference specifically).

To fix, ensure correct synchronisation on the read-write critical
section, which should prevent the `scoreSubmissionSource` from being
created multiple times.
---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 83adf1f960..fb3481cbc4 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private SessionStatics statics { get; set; }
 
+        private readonly object scoreSubmissionLock = new object();
         private TaskCompletionSource<bool> scoreSubmissionSource;
 
         protected SubmittingPlayer(PlayerConfiguration configuration = null)
@@ -228,16 +229,19 @@ namespace osu.Game.Screens.Play
                 return Task.CompletedTask;
             }
 
-            if (scoreSubmissionSource != null)
-                return scoreSubmissionSource.Task;
+            lock (scoreSubmissionLock)
+            {
+                if (scoreSubmissionSource != null)
+                    return scoreSubmissionSource.Task;
+
+                scoreSubmissionSource = new TaskCompletionSource<bool>();
+            }
 
             // if the user never hit anything, this score should not be counted in any way.
             if (!score.ScoreInfo.Statistics.Any(s => s.Key.IsHit() && s.Value > 0))
                 return Task.CompletedTask;
 
             Logger.Log($"Beginning score submission (token:{token.Value})...");
-
-            scoreSubmissionSource = new TaskCompletionSource<bool>();
             var request = CreateSubmissionRequest(score, token.Value);
 
             request.Success += s =>

From 72e502e6156b58474c8a6c9517b6f4c73ad420b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Jan 2024 11:55:59 +0100
Subject: [PATCH 2267/2296] Fix backwards z-ordering of fruits in juice streams
 and banana showers

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

The logic cannot be easily abstracted out (because
`CompareReverseChildID()` is protected and non-static on
`CompositeDrawable`), so a local copy was applied instead.

No testing as any testing would have been purely visual anyways.
---
 .../Objects/Drawables/DrawableBananaShower.cs |  2 +-
 .../Objects/Drawables/DrawableJuiceStream.cs  |  2 +-
 .../Objects/Drawables/NestedFruitContainer.cs | 26 +++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/NestedFruitContainer.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
index 03adbce885..9ee4a15182 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             RelativeSizeAxes = Axes.X;
             Origin = Anchor.BottomLeft;
 
-            AddInternal(bananaContainer = new Container { RelativeSizeAxes = Axes.Both });
+            AddInternal(bananaContainer = new NestedFruitContainer { RelativeSizeAxes = Axes.Both });
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
index 41ecf59276..677b61df47 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             RelativeSizeAxes = Axes.X;
             Origin = Anchor.BottomLeft;
 
-            AddInternal(dropletContainer = new Container { RelativeSizeAxes = Axes.Both, });
+            AddInternal(dropletContainer = new NestedFruitContainer { RelativeSizeAxes = Axes.Both, });
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/NestedFruitContainer.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/NestedFruitContainer.cs
new file mode 100644
index 0000000000..90bdb0237e
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/NestedFruitContainer.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.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    public partial class NestedFruitContainer : Container
+    {
+        /// <remarks>
+        /// This comparison logic is a copy of <see cref="HitObjectContainer"/> comparison logic,
+        /// which can't be easily extracted to a more common place.
+        /// </remarks>
+        /// <seealso cref="HitObjectContainer.Compare"/>
+        protected override int Compare(Drawable x, Drawable y)
+        {
+            if (x is not DrawableCatchHitObject xObj || y is not DrawableCatchHitObject yObj)
+                return base.Compare(x, y);
+
+            int result = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
+            return result == 0 ? CompareReverseChildID(x, y) : result;
+        }
+    }
+}

From f9f03ebc0f066dc8d7c23764fc3d88e4d6278bc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Jan 2024 14:04:40 +0100
Subject: [PATCH 2268/2296] Store user online state in config for next launch

Closes remainder of https://github.com/ppy/osu/issues/12635.
---
 osu.Game/Configuration/OsuConfigManager.cs |  3 +++
 osu.Game/Online/API/APIAccess.cs           | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index d4162b76d6..23686db1f8 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
 using osu.Game.Skinning;
+using osu.Game.Users;
 
 namespace osu.Game.Configuration
 {
@@ -193,6 +194,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.LastProcessedMetadataId, -1);
 
             SetDefault(OsuSetting.ComboColourNormalisationAmount, 0.2f, 0f, 1f, 0.01f);
+            SetDefault<UserStatus?>(OsuSetting.UserOnlineStatus, null);
         }
 
         protected override bool CheckLookupContainsPrivateInformation(OsuSetting lookup)
@@ -420,5 +422,6 @@ namespace osu.Game.Configuration
         EditorShowSpeedChanges,
         TouchDisableGameplayTaps,
         ModSelectTextSearchStartsActive,
+        UserOnlineStatus,
     }
 }
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 21107d61fc..be5bdeca77 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -62,6 +62,9 @@ namespace osu.Game.Online.API
 
         private Bindable<UserActivity> activity { get; } = new Bindable<UserActivity>();
 
+        private Bindable<UserStatus?> configStatus { get; } = new Bindable<UserStatus?>();
+        private Bindable<UserStatus?> localUserStatus { get; } = new Bindable<UserStatus?>();
+
         protected bool HasLogin => authentication.Token.Value != null || (!string.IsNullOrEmpty(ProvidedUsername) && !string.IsNullOrEmpty(password));
 
         private readonly CancellationTokenSource cancellationToken = new CancellationTokenSource();
@@ -85,12 +88,20 @@ namespace osu.Game.Online.API
             authentication.TokenString = config.Get<string>(OsuSetting.Token);
             authentication.Token.ValueChanged += onTokenChanged;
 
+            config.BindWith(OsuSetting.UserOnlineStatus, configStatus);
+
             localUser.BindValueChanged(u =>
             {
                 u.OldValue?.Activity.UnbindFrom(activity);
                 u.NewValue.Activity.BindTo(activity);
+
+                if (u.OldValue != null)
+                    localUserStatus.UnbindFrom(u.OldValue.Status);
+                localUserStatus.BindTo(u.NewValue.Status);
             }, true);
 
+            localUserStatus.BindValueChanged(val => configStatus.Value = val.NewValue);
+
             var thread = new Thread(run)
             {
                 Name = "APIAccess",
@@ -200,6 +211,7 @@ namespace osu.Game.Online.API
                 setLocalUser(new APIUser
                 {
                     Username = ProvidedUsername,
+                    Status = { Value = configStatus.Value ?? UserStatus.Online }
                 });
             }
 
@@ -246,8 +258,7 @@ namespace osu.Game.Online.API
             };
             userReq.Success += user =>
             {
-                // todo: save/pull from settings
-                user.Status.Value = UserStatus.Online;
+                user.Status.Value = configStatus.Value ?? UserStatus.Online;
 
                 setLocalUser(user);
 

From d4e917448d98e6409982719231f8b53e4340e11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Jan 2024 14:07:04 +0100
Subject: [PATCH 2269/2296] Fix login panel dropdown forcing user online

It was sort of assuming that the user can't be anything but online when
opening, thus forcing the status to online via the immediately-run value
change callback.
---
 osu.Game/Overlays/Login/LoginPanel.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index 19af95459f..b0af2fa273 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -143,6 +143,8 @@ namespace osu.Game.Overlays.Login
                     panel.Status.BindTo(api.LocalUser.Value.Status);
                     panel.Activity.BindTo(api.LocalUser.Value.Activity);
 
+                    panel.Status.BindValueChanged(_ => updateDropdownCurrent(), true);
+
                     dropdown.Current.BindValueChanged(action =>
                     {
                         switch (action.NewValue)
@@ -174,6 +176,24 @@ namespace osu.Game.Overlays.Login
                 ScheduleAfterChildren(() => GetContainingInputManager()?.ChangeFocus(form));
         });
 
+        private void updateDropdownCurrent()
+        {
+            switch (panel.Status.Value)
+            {
+                case UserStatus.Online:
+                    dropdown.Current.Value = UserAction.Online;
+                    break;
+
+                case UserStatus.DoNotDisturb:
+                    dropdown.Current.Value = UserAction.DoNotDisturb;
+                    break;
+
+                case UserStatus.Offline:
+                    dropdown.Current.Value = UserAction.AppearOffline;
+                    break;
+            }
+        }
+
         public override bool AcceptsFocus => true;
 
         protected override bool OnClick(ClickEvent e) => true;

From 09b2a4e3b42defa1ead3a156c2f8c890ed175473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Jan 2024 14:07:59 +0100
Subject: [PATCH 2270/2296] Fix users blipping online briefly before their
 online status is known

---
 osu.Game/Online/Metadata/OnlineMetadataClient.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
index 6d00ce7551..c42c3378b7 100644
--- a/osu.Game/Online/Metadata/OnlineMetadataClient.cs
+++ b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Online.Metadata
         public override IBindable<bool> IsWatchingUserPresence => isWatchingUserPresence;
         private readonly BindableBool isWatchingUserPresence = new BindableBool();
 
-        // ReSharper disable once InconsistentlySynchronizedField
         public override IBindableDictionary<int, UserPresence> UserStates => userStates;
         private readonly BindableDictionary<int, UserPresence> userStates = new BindableDictionary<int, UserPresence>();
 
@@ -192,7 +191,7 @@ namespace osu.Game.Online.Metadata
         {
             Schedule(() =>
             {
-                if (presence != null)
+                if (presence?.Status != null)
                     userStates[userId] = presence.Value;
                 else
                     userStates.Remove(userId);

From 17656e9b9cfe4e6ce3fa2627bb1b3e34694ad305 Mon Sep 17 00:00:00 2001
From: Lena <lena@nihil.gay>
Date: Tue, 2 Jan 2024 18:38:25 +0100
Subject: [PATCH 2271/2296] update the current activity when the multiplayer
 room updates

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 7c12e6eab5..56256bb15c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -349,6 +349,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             addItemButton.Alpha = localUserCanAddItem ? 1 : 0;
 
             Scheduler.AddOnce(UpdateMods);
+
+            Activity.Value = new UserActivity.InLobby(Room);
         }
 
         private bool localUserCanAddItem => client.IsHost || Room.QueueMode.Value != QueueMode.HostOnly;

From 88509f28ad66110f0b8b7fb79e69aeccce7e5929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Jan 2024 20:51:22 +0100
Subject: [PATCH 2272/2296] Adjust assertion to match new juice stream child
 ordering

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

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index 419a846ec3..825e8c697c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 Mod = new CatchModHidden(),
                 PassCondition = () => Player.Results.Count > 0
                                       && Player.ChildrenOfType<DrawableJuiceStream>().Single().Alpha > 0
-                                      && Player.ChildrenOfType<DrawableFruit>().Last().Alpha > 0
+                                      && Player.ChildrenOfType<DrawableFruit>().First().Alpha > 0
             });
         }
 

From bdfaa4b583912ebe4bba70a0d48c13ef1e79b919 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jan 2024 13:34:49 +0900
Subject: [PATCH 2273/2296] Fix crash when dragging rotation control in editor
 with both mouse buttons

Closes https://github.com/ppy/osu/issues/26325.
---
 .../Edit/Compose/Components/SelectionBoxRotationHandle.cs      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index 024749a701..5270162189 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -62,6 +62,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnDragStart(DragStartEvent e)
         {
+            if (e.Button != MouseButton.Left)
+                return false;
+
             if (rotationHandler == null) return false;
 
             rotationHandler.Begin();

From 9e8d07d3144bd4b072d28bd9bd0e255fee410de0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Dec 2023 15:47:05 +0900
Subject: [PATCH 2274/2296] Add NVAPI and force thread optimisations on

This undoes what stable does to force this setting off.
---
 osu.Desktop/NVAPI.cs   | 737 +++++++++++++++++++++++++++++++++++++++++
 osu.Desktop/Program.cs |   2 +
 2 files changed, 739 insertions(+)
 create mode 100644 osu.Desktop/NVAPI.cs

diff --git a/osu.Desktop/NVAPI.cs b/osu.Desktop/NVAPI.cs
new file mode 100644
index 0000000000..9648ea1072
--- /dev/null
+++ b/osu.Desktop/NVAPI.cs
@@ -0,0 +1,737 @@
+// 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.CodeAnalysis;
+using System.Runtime.InteropServices;
+using osu.Framework.Logging;
+
+namespace osu.Desktop
+{
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    internal static class NVAPI
+    {
+        private const string osu_filename = "osu!.exe";
+
+        // This is a good reference:
+        // https://github.com/errollw/Warp-and-Blend-Quadros/blob/master/WarpBlend-Quadros/UnwarpAll-Quadros/include/nvapi.h
+        // Note our Stride == their VERSION (e.g. NVDRS_SETTING_VER)
+
+        public const int MAX_PHYSICAL_GPUS = 64;
+        public const int UNICODE_STRING_MAX = 2048;
+
+        public const string APPLICATION_NAME = @"osu!";
+        public const string PROFILE_NAME = @"osu!";
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvStatus EnumPhysicalGPUsDelegate([Out] IntPtr[] gpuHandles, out int gpuCount);
+
+        public static readonly EnumPhysicalGPUsDelegate EnumPhysicalGPUs;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvStatus EnumLogicalGPUsDelegate([Out] IntPtr[] gpuHandles, out int gpuCount);
+
+        public static readonly EnumLogicalGPUsDelegate EnumLogicalGPUs;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvStatus GetSystemTypeDelegate(IntPtr gpuHandle, out NvSystemType systemType);
+
+        public static readonly GetSystemTypeDelegate GetSystemType;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvStatus GetGPUTypeDelegate(IntPtr gpuHandle, out NvGpuType gpuType);
+
+        public static readonly GetGPUTypeDelegate GetGPUType;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvStatus CreateSessionDelegate(out IntPtr sessionHandle);
+
+        public static CreateSessionDelegate CreateSession;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvStatus LoadSettingsDelegate(IntPtr sessionHandle);
+
+        public static LoadSettingsDelegate LoadSettings;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvStatus FindApplicationByNameDelegate(IntPtr sessionHandle, [MarshalAs(UnmanagedType.BStr)] string appName, out IntPtr profileHandle, ref NvApplication application);
+
+        public static FindApplicationByNameDelegate FindApplicationByName;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvStatus GetCurrentGlobalProfileDelegate(IntPtr sessionHandle, out IntPtr profileHandle);
+
+        public static GetCurrentGlobalProfileDelegate GetCurrentGlobalProfile;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvStatus GetProfileInfoDelegate(IntPtr sessionHandle, IntPtr profileHandle, ref NvProfile profile);
+
+        public static GetProfileInfoDelegate GetProfileInfo;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate NvStatus GetSettingDelegate(IntPtr sessionHandle, IntPtr profileHandle, NvSettingID settingID, ref NvSetting setting);
+
+        public static GetSettingDelegate GetSetting;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        private delegate NvStatus CreateProfileDelegate(IntPtr sessionHandle, ref NvProfile profile, out IntPtr profileHandle);
+
+        private static readonly CreateProfileDelegate CreateProfile;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        private delegate NvStatus SetSettingDelegate(IntPtr sessionHandle, IntPtr profileHandle, ref NvSetting setting);
+
+        private static readonly SetSettingDelegate SetSetting;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        private delegate NvStatus EnumApplicationsDelegate(IntPtr sessionHandle, IntPtr profileHandle, uint startIndex, ref uint appCount, [In, Out, MarshalAs(UnmanagedType.LPArray)] NvApplication[] applications);
+
+        private static readonly EnumApplicationsDelegate EnumApplications;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        private delegate NvStatus CreateApplicationDelegate(IntPtr sessionHandle, IntPtr profileHandle, ref NvApplication application);
+
+        private static readonly CreateApplicationDelegate CreateApplication;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        private delegate NvStatus SaveSettingsDelegate(IntPtr sessionHandle);
+
+        private static readonly SaveSettingsDelegate SaveSettings;
+
+        public static NvStatus Status { get; private set; } = NvStatus.OK;
+        public static bool Available { get; private set; }
+
+        private static IntPtr sessionHandle;
+
+        public static bool IsUsingOptimusDedicatedGpu
+        {
+            get
+            {
+                if (!Available)
+                    return false;
+
+                if (!IsLaptop)
+                    return false;
+
+                IntPtr profileHandle;
+                if (!getProfile(out profileHandle, out _, out bool _))
+                    return false;
+
+                // Get the optimus setting
+                NvSetting setting;
+                if (!getSetting(NvSettingID.SHIM_RENDERING_MODE_ID, profileHandle, out setting))
+                    return false;
+
+                return (setting.U32CurrentValue & (uint)NvShimSetting.SHIM_RENDERING_MODE_ENABLE) > 0;
+            }
+        }
+
+        public static bool IsLaptop
+        {
+            get
+            {
+                if (!Available)
+                    return false;
+
+                // Make sure that this is a laptop.
+                var gpus = new IntPtr[64];
+                if (checkError(EnumPhysicalGPUs(gpus, out int gpuCount)))
+                    return false;
+
+                for (int i = 0; i < gpuCount; i++)
+                {
+                    if (checkError(GetSystemType(gpus[i], out var type)))
+                        return false;
+
+                    if (type == NvSystemType.LAPTOP)
+                        return true;
+                }
+
+                return false;
+            }
+        }
+
+        public static bool ThreadedOptimisations
+        {
+            get
+            {
+                if (!Available)
+                    return false;
+
+                IntPtr profileHandle;
+                if (!getProfile(out profileHandle, out _, out bool _))
+                    return false;
+
+                // Get the threaded optimisations setting
+                NvSetting setting;
+                if (!getSetting(NvSettingID.OGL_THREAD_CONTROL_ID, profileHandle, out setting))
+                    return false;
+
+                return setting.U32CurrentValue != (uint)NvThreadControlSetting.OGL_THREAD_CONTROL_DISABLE;
+            }
+            set
+            {
+                if (!Available)
+                    return;
+
+                bool success = setSetting(NvSettingID.OGL_THREAD_CONTROL_ID, (uint)(value ? NvThreadControlSetting.OGL_THREAD_CONTROL_ENABLE : NvThreadControlSetting.OGL_THREAD_CONTROL_DISABLE));
+
+                Logger.Log(success ? $"Threaded optimizations set to \"{value}\"!" : "Threaded optimizations set failed!");
+            }
+        }
+
+        /// <summary>
+        /// Checks if the profile contains the current application.
+        /// </summary>
+        /// <returns>If the profile contains the current application.</returns>
+        private static bool containsApplication(IntPtr profileHandle, NvProfile profile, out NvApplication application)
+        {
+            application = new NvApplication
+            {
+                Version = NvApplication.Stride
+            };
+
+            if (profile.NumOfApps == 0)
+                return false;
+
+            NvApplication[] applications = new NvApplication[profile.NumOfApps];
+            applications[0].Version = NvApplication.Stride;
+
+            uint numApps = profile.NumOfApps;
+
+            if (checkError(EnumApplications(sessionHandle, profileHandle, 0, ref numApps, applications)))
+                return false;
+
+            for (uint i = 0; i < numApps; i++)
+            {
+                if (applications[i].AppName == osu_filename)
+                {
+                    application = applications[i];
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Retrieves the profile of the current application.
+        /// </summary>
+        /// <param name="profileHandle">The profile handle.</param>
+        /// <param name="application">The current application description.</param>
+        /// <param name="isApplicationSpecific">If this profile is not a global (default) profile.</param>
+        /// <returns>If the operation succeeded.</returns>
+        private static bool getProfile(out IntPtr profileHandle, out NvApplication application, out bool isApplicationSpecific)
+        {
+            application = new NvApplication
+            {
+                Version = NvApplication.Stride
+            };
+
+            isApplicationSpecific = true;
+
+            if (checkError(FindApplicationByName(sessionHandle, osu_filename, out profileHandle, ref application)))
+            {
+                isApplicationSpecific = false;
+                if (checkError(GetCurrentGlobalProfile(sessionHandle, out profileHandle)))
+                    return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Creates a profile.
+        /// </summary>
+        /// <param name="profileHandle">The profile handle.</param>
+        /// <returns>If the operation succeeded.</returns>
+        private static bool createProfile(out IntPtr profileHandle)
+        {
+            NvProfile newProfile = new NvProfile
+            {
+                Version = NvProfile.Stride,
+                IsPredefined = 0,
+                ProfileName = PROFILE_NAME,
+                GPUSupport = new uint[32]
+            };
+
+            newProfile.GPUSupport[0] = 1;
+
+            if (checkError(CreateProfile(sessionHandle, ref newProfile, out profileHandle)))
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Retrieves a setting from the profile.
+        /// </summary>
+        /// <param name="settingId">The setting to retrieve.</param>
+        /// <param name="profileHandle">The profile handle to retrieve the setting from.</param>
+        /// <param name="setting">The setting.</param>
+        /// <returns>If the operation succeeded.</returns>
+        private static bool getSetting(NvSettingID settingId, IntPtr profileHandle, out NvSetting setting)
+        {
+            setting = new NvSetting
+            {
+                Version = NvSetting.Stride,
+                SettingID = settingId
+            };
+
+            if (checkError(GetSetting(sessionHandle, profileHandle, settingId, ref setting)))
+                return false;
+
+            return true;
+        }
+
+        private static bool setSetting(NvSettingID settingId, uint settingValue)
+        {
+            NvApplication application;
+            IntPtr profileHandle;
+            bool isApplicationSpecific;
+            if (!getProfile(out profileHandle, out application, out isApplicationSpecific))
+                return false;
+
+            if (!isApplicationSpecific)
+            {
+                // We don't want to interfere with the user's other settings, so let's create a separate config for osu!
+                if (!createProfile(out profileHandle))
+                    return false;
+            }
+
+            NvSetting newSetting = new NvSetting
+            {
+                Version = NvSetting.Stride,
+                SettingID = settingId,
+                U32CurrentValue = settingValue
+            };
+
+            // Set the thread state
+            if (checkError(SetSetting(sessionHandle, profileHandle, ref newSetting)))
+                return false;
+
+            // Get the profile (needed to check app count)
+            NvProfile profile = new NvProfile
+            {
+                Version = NvProfile.Stride
+            };
+            if (checkError(GetProfileInfo(sessionHandle, profileHandle, ref profile)))
+                return false;
+
+            if (!containsApplication(profileHandle, profile, out application))
+            {
+                // Need to add the current application to the profile
+                application.IsPredefined = 0;
+
+                application.AppName = osu_filename;
+                application.UserFriendlyName = APPLICATION_NAME;
+
+                if (checkError(CreateApplication(sessionHandle, profileHandle, ref application)))
+                    return false;
+            }
+
+            // Save!
+            return !checkError(SaveSettings(sessionHandle));
+        }
+
+        /// <summary>
+        /// Creates a session to access the driver configuration.
+        /// </summary>
+        /// <returns>If the operation succeeded.</returns>
+        private static bool createSession()
+        {
+            if (checkError(CreateSession(out sessionHandle)))
+                return false;
+
+            // Load settings into session
+            if (checkError(LoadSettings(sessionHandle)))
+                return false;
+
+            return true;
+        }
+
+        private static bool checkError(NvStatus status)
+        {
+            Status = status;
+            return status != NvStatus.OK;
+        }
+
+        static NVAPI()
+        {
+            // TODO: check whether gpu vendor contains NVIDIA before attempting load?
+
+            try
+            {
+                // Try to load NVAPI
+                if ((IntPtr.Size == 4 && loadLibrary(@"nvapi.dll") == IntPtr.Zero)
+                    || (IntPtr.Size == 8 && loadLibrary(@"nvapi64.dll") == IntPtr.Zero))
+                {
+                    return;
+                }
+
+                InitializeDelegate initialize;
+                getDelegate(0x0150E828, out initialize);
+
+                if (initialize?.Invoke() == NvStatus.OK)
+                {
+                    // IDs can be found here: https://github.com/jNizM/AHK_NVIDIA_NvAPI/blob/master/info/NvAPI_IDs.txt
+
+                    getDelegate(0xE5AC921F, out EnumPhysicalGPUs);
+                    getDelegate(0x48B3EA59, out EnumLogicalGPUs);
+                    getDelegate(0xBAAABFCC, out GetSystemType);
+                    getDelegate(0xC33BAEB1, out GetGPUType);
+                    getDelegate(0x0694D52E, out CreateSession);
+                    getDelegate(0x375DBD6B, out LoadSettings);
+                    getDelegate(0xEEE566B2, out FindApplicationByName);
+                    getDelegate(0x617BFF9F, out GetCurrentGlobalProfile);
+                    getDelegate(0x577DD202, out SetSetting);
+                    getDelegate(0x61CD6FD6, out GetProfileInfo);
+                    getDelegate(0x73BF8338, out GetSetting);
+                    getDelegate(0xCC176068, out CreateProfile);
+                    getDelegate(0x7FA2173A, out EnumApplications);
+                    getDelegate(0x4347A9DE, out CreateApplication);
+                    getDelegate(0xFCBC7E14, out SaveSettings);
+                }
+
+                if (createSession())
+                    Available = true;
+            }
+            catch { }
+        }
+
+        private static void getDelegate<T>(uint id, out T newDelegate) where T : class
+        {
+            IntPtr ptr = IntPtr.Size == 4 ? queryInterface32(id) : queryInterface64(id);
+            newDelegate = ptr == IntPtr.Zero ? null : Marshal.GetDelegateForFunctionPointer(ptr, typeof(T)) as T;
+        }
+
+        [DllImport("kernel32.dll", EntryPoint = "LoadLibrary")]
+        private static extern IntPtr loadLibrary(string dllToLoad);
+
+        [DllImport(@"nvapi.dll", EntryPoint = "nvapi_QueryInterface", CallingConvention = CallingConvention.Cdecl)]
+        private static extern IntPtr queryInterface32(uint id);
+
+        [DllImport(@"nvapi64.dll", EntryPoint = "nvapi_QueryInterface", CallingConvention = CallingConvention.Cdecl)]
+        private static extern IntPtr queryInterface64(uint id);
+
+        private delegate NvStatus InitializeDelegate();
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    internal struct NvSetting
+    {
+        public uint Version;
+
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NVAPI.UNICODE_STRING_MAX)]
+        public string SettingName;
+
+        public NvSettingID SettingID;
+        public uint SettingType;
+        public uint SettingLocation;
+        public uint IsCurrentPredefined;
+        public uint IsPredefinedValid;
+
+        public uint U32PredefinedValue;
+
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NVAPI.UNICODE_STRING_MAX)]
+        public string StringPredefinedValue;
+
+        public uint U32CurrentValue;
+
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NVAPI.UNICODE_STRING_MAX)]
+        public string StringCurrentValue;
+
+        public static uint Stride => (uint)Marshal.SizeOf(typeof(NvSetting)) | (1 << 16);
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 8, CharSet = CharSet.Unicode)]
+    internal struct NvProfile
+    {
+        public uint Version;
+
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NVAPI.UNICODE_STRING_MAX)]
+        public string ProfileName;
+
+        [MarshalAs(UnmanagedType.ByValArray)]
+        public uint[] GPUSupport;
+
+        public uint IsPredefined;
+        public uint NumOfApps;
+        public uint NumOfSettings;
+
+        public static uint Stride => (uint)Marshal.SizeOf(typeof(NvProfile)) | (1 << 16);
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 8, CharSet = CharSet.Unicode)]
+    internal struct NvApplication
+    {
+        public uint Version;
+        public uint IsPredefined;
+
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NVAPI.UNICODE_STRING_MAX)]
+        public string AppName;
+
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NVAPI.UNICODE_STRING_MAX)]
+        public string UserFriendlyName;
+
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NVAPI.UNICODE_STRING_MAX)]
+        public string Launcher;
+
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NVAPI.UNICODE_STRING_MAX)]
+        public string FileInFolder;
+
+        public static uint Stride => (uint)Marshal.SizeOf(typeof(NvApplication)) | (2 << 16);
+    }
+
+    internal enum NvStatus
+    {
+        OK = 0, // Success. Request is completed.
+        ERROR = -1, // Generic error
+        LIBRARY_NOT_FOUND = -2, // NVAPI support library cannot be loaded.
+        NO_IMPLEMENTATION = -3, // not implemented in current driver installation
+        API_NOT_INITIALIZED = -4, // Initialize has not been called (successfully)
+        INVALID_ARGUMENT = -5, // The argument/parameter value is not valid or NULL.
+        NVIDIA_DEVICE_NOT_FOUND = -6, // No NVIDIA display driver, or NVIDIA GPU driving a display, was found.
+        END_ENUMERATION = -7, // No more items to enumerate
+        INVALID_HANDLE = -8, // Invalid handle
+        INCOMPATIBLE_STRUCT_VERSION = -9, // An argument's structure version is not supported
+        HANDLE_INVALIDATED = -10, // The handle is no longer valid (likely due to GPU or display re-configuration)
+        OPENGL_CONTEXT_NOT_CURRENT = -11, // No NVIDIA OpenGL context is current (but needs to be)
+        INVALID_POINTER = -14, // An invalid pointer, usually NULL, was passed as a parameter
+        NO_GL_EXPERT = -12, // OpenGL Expert is not supported by the current drivers
+        INSTRUMENTATION_DISABLED = -13, // OpenGL Expert is supported, but driver instrumentation is currently disabled
+        NO_GL_NSIGHT = -15, // OpenGL does not support Nsight
+
+        EXPECTED_LOGICAL_GPU_HANDLE = -100, // Expected a logical GPU handle for one or more parameters
+        EXPECTED_PHYSICAL_GPU_HANDLE = -101, // Expected a physical GPU handle for one or more parameters
+        EXPECTED_DISPLAY_HANDLE = -102, // Expected an NV display handle for one or more parameters
+        INVALID_COMBINATION = -103, // The combination of parameters is not valid.
+        NOT_SUPPORTED = -104, // Requested feature is not supported in the selected GPU
+        PORTID_NOT_FOUND = -105, // No port ID was found for the I2C transaction
+        EXPECTED_UNATTACHED_DISPLAY_HANDLE = -106, // Expected an unattached display handle as one of the input parameters.
+        INVALID_PERF_LEVEL = -107, // Invalid perf level
+        DEVICE_BUSY = -108, // Device is busy; request not fulfilled
+        NV_PERSIST_FILE_NOT_FOUND = -109, // NV persist file is not found
+        PERSIST_DATA_NOT_FOUND = -110, // NV persist data is not found
+        EXPECTED_TV_DISPLAY = -111, // Expected a TV output display
+        EXPECTED_TV_DISPLAY_ON_DCONNECTOR = -112, // Expected a TV output on the D Connector - HDTV_EIAJ4120.
+        NO_ACTIVE_SLI_TOPOLOGY = -113, // SLI is not active on this device.
+        SLI_RENDERING_MODE_NOTALLOWED = -114, // Setup of SLI rendering mode is not possible right now.
+        EXPECTED_DIGITAL_FLAT_PANEL = -115, // Expected a digital flat panel.
+        ARGUMENT_EXCEED_MAX_SIZE = -116, // Argument exceeds the expected size.
+        DEVICE_SWITCHING_NOT_ALLOWED = -117, // Inhibit is ON due to one of the flags in NV_GPU_DISPLAY_CHANGE_INHIBIT or SLI active.
+        TESTING_CLOCKS_NOT_SUPPORTED = -118, // Testing of clocks is not supported.
+        UNKNOWN_UNDERSCAN_CONFIG = -119, // The specified underscan config is from an unknown source (e.g. INF)
+        TIMEOUT_RECONFIGURING_GPU_TOPO = -120, // Timeout while reconfiguring GPUs
+        DATA_NOT_FOUND = -121, // Requested data was not found
+        EXPECTED_ANALOG_DISPLAY = -122, // Expected an analog display
+        NO_VIDLINK = -123, // No SLI video bridge is present
+        REQUIRES_REBOOT = -124, // NVAPI requires a reboot for the settings to take effect
+        INVALID_HYBRID_MODE = -125, // The function is not supported with the current Hybrid mode.
+        MIXED_TARGET_TYPES = -126, // The target types are not all the same
+        SYSWOW64_NOT_SUPPORTED = -127, // The function is not supported from 32-bit on a 64-bit system.
+        IMPLICIT_SET_GPU_TOPOLOGY_CHANGE_NOT_ALLOWED = -128, // There is no implicit GPU topology active. Use SetHybridMode to change topology.
+        REQUEST_USER_TO_CLOSE_NON_MIGRATABLE_APPS = -129, // Prompt the user to close all non-migratable applications.
+        OUT_OF_MEMORY = -130, // Could not allocate sufficient memory to complete the call.
+        WAS_STILL_DRAWING = -131, // The previous operation that is transferring information to or from this surface is incomplete.
+        FILE_NOT_FOUND = -132, // The file was not found.
+        TOO_MANY_UNIQUE_STATE_OBJECTS = -133, // There are too many unique instances of a particular type of state object.
+        INVALID_CALL = -134, // The method call is invalid. For example, a method's parameter may not be a valid pointer.
+        D3D10_1_LIBRARY_NOT_FOUND = -135, // d3d10_1.dll cannot be loaded.
+        FUNCTION_NOT_FOUND = -136, // Couldn't find the function in the loaded DLL.
+        INVALID_USER_PRIVILEGE = -137, // Current User is not Admin.
+        EXPECTED_NON_PRIMARY_DISPLAY_HANDLE = -138, // The handle corresponds to GDIPrimary.
+        EXPECTED_COMPUTE_GPU_HANDLE = -139, // Setting Physx GPU requires that the GPU is compute-capable.
+        STEREO_NOT_INITIALIZED = -140, // The Stereo part of NVAPI failed to initialize completely. Check if the stereo driver is installed.
+        STEREO_REGISTRY_ACCESS_FAILED = -141, // Access to stereo-related registry keys or values has failed.
+        STEREO_REGISTRY_PROFILE_TYPE_NOT_SUPPORTED = -142, // The given registry profile type is not supported.
+        STEREO_REGISTRY_VALUE_NOT_SUPPORTED = -143, // The given registry value is not supported.
+        STEREO_NOT_ENABLED = -144, // Stereo is not enabled and the function needed it to execute completely.
+        STEREO_NOT_TURNED_ON = -145, // Stereo is not turned on and the function needed it to execute completely.
+        STEREO_INVALID_DEVICE_INTERFACE = -146, // Invalid device interface.
+        STEREO_PARAMETER_OUT_OF_RANGE = -147, // Separation percentage or JPEG image capture quality is out of [0-100] range.
+        STEREO_FRUSTUM_ADJUST_MODE_NOT_SUPPORTED = -148, // The given frustum adjust mode is not supported.
+        TOPO_NOT_POSSIBLE = -149, // The mosaic topology is not possible given the current state of the hardware.
+        MODE_CHANGE_FAILED = -150, // An attempt to do a display resolution mode change has failed.
+        D3D11_LIBRARY_NOT_FOUND = -151, // d3d11.dll/d3d11_beta.dll cannot be loaded.
+        INVALID_ADDRESS = -152, // Address is outside of valid range.
+        STRING_TOO_SMALL = -153, // The pre-allocated string is too small to hold the result.
+        MATCHING_DEVICE_NOT_FOUND = -154, // The input does not match any of the available devices.
+        DRIVER_RUNNING = -155, // Driver is running.
+        DRIVER_NOTRUNNING = -156, // Driver is not running.
+        ERROR_DRIVER_RELOAD_REQUIRED = -157, // A driver reload is required to apply these settings.
+        SET_NOT_ALLOWED = -158, // Intended setting is not allowed.
+        ADVANCED_DISPLAY_TOPOLOGY_REQUIRED = -159, // Information can't be returned due to "advanced display topology".
+        SETTING_NOT_FOUND = -160, // Setting is not found.
+        SETTING_SIZE_TOO_LARGE = -161, // Setting size is too large.
+        TOO_MANY_SETTINGS_IN_PROFILE = -162, // There are too many settings for a profile.
+        PROFILE_NOT_FOUND = -163, // Profile is not found.
+        PROFILE_NAME_IN_USE = -164, // Profile name is duplicated.
+        PROFILE_NAME_EMPTY = -165, // Profile name is empty.
+        EXECUTABLE_NOT_FOUND = -166, // Application not found in the Profile.
+        EXECUTABLE_ALREADY_IN_USE = -167, // Application already exists in the other profile.
+        DATATYPE_MISMATCH = -168, // Data Type mismatch
+        PROFILE_REMOVED = -169, // The profile passed as parameter has been removed and is no longer valid.
+        UNREGISTERED_RESOURCE = -170, // An unregistered resource was passed as a parameter.
+        ID_OUT_OF_RANGE = -171, // The DisplayId corresponds to a display which is not within the normal outputId range.
+        DISPLAYCONFIG_VALIDATION_FAILED = -172, // Display topology is not valid so the driver cannot do a mode set on this configuration.
+        DPMST_CHANGED = -173, // Display Port Multi-Stream topology has been changed.
+        INSUFFICIENT_BUFFER = -174, // Input buffer is insufficient to hold the contents.
+        ACCESS_DENIED = -175, // No access to the caller.
+        MOSAIC_NOT_ACTIVE = -176, // The requested action cannot be performed without Mosaic being enabled.
+        SHARE_RESOURCE_RELOCATED = -177, // The surface is relocated away from video memory.
+        REQUEST_USER_TO_DISABLE_DWM = -178, // The user should disable DWM before calling NvAPI.
+        D3D_DEVICE_LOST = -179, // D3D device status is D3DERR_DEVICELOST or D3DERR_DEVICENOTRESET - the user has to reset the device.
+        INVALID_CONFIGURATION = -180, // The requested action cannot be performed in the current state.
+        STEREO_HANDSHAKE_NOT_DONE = -181, // Call failed as stereo handshake not completed.
+        EXECUTABLE_PATH_IS_AMBIGUOUS = -182, // The path provided was too short to determine the correct NVDRS_APPLICATION
+        DEFAULT_STEREO_PROFILE_IS_NOT_DEFINED = -183, // Default stereo profile is not currently defined
+        DEFAULT_STEREO_PROFILE_DOES_NOT_EXIST = -184, // Default stereo profile does not exist
+        CLUSTER_ALREADY_EXISTS = -185, // A cluster is already defined with the given configuration.
+        DPMST_DISPLAY_ID_EXPECTED = -186, // The input display id is not that of a multi stream enabled connector or a display device in a multi stream topology
+        INVALID_DISPLAY_ID = -187, // The input display id is not valid or the monitor associated to it does not support the current operation
+        STREAM_IS_OUT_OF_SYNC = -188, // While playing secure audio stream, stream goes out of sync
+        INCOMPATIBLE_AUDIO_DRIVER = -189, // Older audio driver version than required
+        VALUE_ALREADY_SET = -190, // Value already set, setting again not allowed.
+        TIMEOUT = -191, // Requested operation timed out
+        GPU_WORKSTATION_FEATURE_INCOMPLETE = -192, // The requested workstation feature set has incomplete driver internal allocation resources
+        STEREO_INIT_ACTIVATION_NOT_DONE = -193, // Call failed because InitActivation was not called.
+        SYNC_NOT_ACTIVE = -194, // The requested action cannot be performed without Sync being enabled.
+        SYNC_MASTER_NOT_FOUND = -195, // The requested action cannot be performed without Sync Master being enabled.
+        INVALID_SYNC_TOPOLOGY = -196, // Invalid displays passed in the NV_GSYNC_DISPLAY pointer.
+        ECID_SIGN_ALGO_UNSUPPORTED = -197, // The specified signing algorithm is not supported. Either an incorrect value was entered or the current installed driver/hardware does not support the input value.
+        ECID_KEY_VERIFICATION_FAILED = -198, // The encrypted public key verification has failed.
+        FIRMWARE_OUT_OF_DATE = -199, // The device's firmware is out of date.
+        FIRMWARE_REVISION_NOT_SUPPORTED = -200, // The device's firmware is not supported.
+    }
+
+    internal enum NvSystemType
+    {
+        UNKNOWN = 0,
+        LAPTOP = 1,
+        DESKTOP = 2
+    }
+
+    internal enum NvGpuType
+    {
+        UNKNOWN = 0,
+        IGPU = 1, // Integrated
+        DGPU = 2, // Discrete
+    }
+
+    internal enum NvSettingID : uint
+    {
+        OGL_AA_LINE_GAMMA_ID = 0x2089BF6C,
+        OGL_DEEP_COLOR_SCANOUT_ID = 0x2097C2F6,
+        OGL_DEFAULT_SWAP_INTERVAL_ID = 0x206A6582,
+        OGL_DEFAULT_SWAP_INTERVAL_FRACTIONAL_ID = 0x206C4581,
+        OGL_DEFAULT_SWAP_INTERVAL_SIGN_ID = 0x20655CFA,
+        OGL_EVENT_LOG_SEVERITY_THRESHOLD_ID = 0x209DF23E,
+        OGL_EXTENSION_STRING_VERSION_ID = 0x20FF7493,
+        OGL_FORCE_BLIT_ID = 0x201F619F,
+        OGL_FORCE_STEREO_ID = 0x204D9A0C,
+        OGL_IMPLICIT_GPU_AFFINITY_ID = 0x20D0F3E6,
+        OGL_MAX_FRAMES_ALLOWED_ID = 0x208E55E3,
+        OGL_MULTIMON_ID = 0x200AEBFC,
+        OGL_OVERLAY_PIXEL_TYPE_ID = 0x209AE66F,
+        OGL_OVERLAY_SUPPORT_ID = 0x206C28C4,
+        OGL_QUALITY_ENHANCEMENTS_ID = 0x20797D6C,
+        OGL_SINGLE_BACKDEPTH_BUFFER_ID = 0x20A29055,
+        OGL_THREAD_CONTROL_ID = 0x20C1221E,
+        OGL_TRIPLE_BUFFER_ID = 0x20FDD1F9,
+        OGL_VIDEO_EDITING_MODE_ID = 0x20EE02B4,
+        AA_BEHAVIOR_FLAGS_ID = 0x10ECDB82,
+        AA_MODE_ALPHATOCOVERAGE_ID = 0x10FC2D9C,
+        AA_MODE_GAMMACORRECTION_ID = 0x107D639D,
+        AA_MODE_METHOD_ID = 0x10D773D2,
+        AA_MODE_REPLAY_ID = 0x10D48A85,
+        AA_MODE_SELECTOR_ID = 0x107EFC5B,
+        AA_MODE_SELECTOR_SLIAA_ID = 0x107AFC5B,
+        ANISO_MODE_LEVEL_ID = 0x101E61A9,
+        ANISO_MODE_SELECTOR_ID = 0x10D2BB16,
+        APPLICATION_PROFILE_NOTIFICATION_TIMEOUT_ID = 0x104554B6,
+        APPLICATION_STEAM_ID_ID = 0x107CDDBC,
+        CPL_HIDDEN_PROFILE_ID = 0x106D5CFF,
+        CUDA_EXCLUDED_GPUS_ID = 0x10354FF8,
+        D3DOGL_GPU_MAX_POWER_ID = 0x10D1EF29,
+        EXPORT_PERF_COUNTERS_ID = 0x108F0841,
+        FXAA_ALLOW_ID = 0x1034CB89,
+        FXAA_ENABLE_ID = 0x1074C972,
+        FXAA_INDICATOR_ENABLE_ID = 0x1068FB9C,
+        MCSFRSHOWSPLIT_ID = 0x10287051,
+        OPTIMUS_MAXAA_ID = 0x10F9DC83,
+        PHYSXINDICATOR_ID = 0x1094F16F,
+        PREFERRED_PSTATE_ID = 0x1057EB71,
+        PREVENT_UI_AF_OVERRIDE_ID = 0x103BCCB5,
+        PS_FRAMERATE_LIMITER_ID = 0x10834FEE,
+        PS_FRAMERATE_LIMITER_GPS_CTRL_ID = 0x10834F01,
+        SHIM_MAXRES_ID = 0x10F9DC82,
+        SHIM_MCCOMPAT_ID = 0x10F9DC80,
+        SHIM_RENDERING_MODE_ID = 0x10F9DC81,
+        SHIM_RENDERING_OPTIONS_ID = 0x10F9DC84,
+        SLI_GPU_COUNT_ID = 0x1033DCD1,
+        SLI_PREDEFINED_GPU_COUNT_ID = 0x1033DCD2,
+        SLI_PREDEFINED_GPU_COUNT_DX10_ID = 0x1033DCD3,
+        SLI_PREDEFINED_MODE_ID = 0x1033CEC1,
+        SLI_PREDEFINED_MODE_DX10_ID = 0x1033CEC2,
+        SLI_RENDERING_MODE_ID = 0x1033CED1,
+        VRRFEATUREINDICATOR_ID = 0x1094F157,
+        VRROVERLAYINDICATOR_ID = 0x1095F16F,
+        VRRREQUESTSTATE_ID = 0x1094F1F7,
+        VSYNCSMOOTHAFR_ID = 0x101AE763,
+        VSYNCVRRCONTROL_ID = 0x10A879CE,
+        VSYNC_BEHAVIOR_FLAGS_ID = 0x10FDEC23,
+        WKS_API_STEREO_EYES_EXCHANGE_ID = 0x11AE435C,
+        WKS_API_STEREO_MODE_ID = 0x11E91A61,
+        WKS_MEMORY_ALLOCATION_POLICY_ID = 0x11112233,
+        WKS_STEREO_DONGLE_SUPPORT_ID = 0x112493BD,
+        WKS_STEREO_SUPPORT_ID = 0x11AA9E99,
+        WKS_STEREO_SWAP_MODE_ID = 0x11333333,
+        AO_MODE_ID = 0x00667329,
+        AO_MODE_ACTIVE_ID = 0x00664339,
+        AUTO_LODBIASADJUST_ID = 0x00638E8F,
+        ICAFE_LOGO_CONFIG_ID = 0x00DB1337,
+        LODBIASADJUST_ID = 0x00738E8F,
+        PRERENDERLIMIT_ID = 0x007BA09E,
+        PS_DYNAMIC_TILING_ID = 0x00E5C6C0,
+        PS_SHADERDISKCACHE_ID = 0x00198FFF,
+        PS_TEXFILTER_ANISO_OPTS2_ID = 0x00E73211,
+        PS_TEXFILTER_BILINEAR_IN_ANISO_ID = 0x0084CD70,
+        PS_TEXFILTER_DISABLE_TRILIN_SLOPE_ID = 0x002ECAF2,
+        PS_TEXFILTER_NO_NEG_LODBIAS_ID = 0x0019BB68,
+        QUALITY_ENHANCEMENTS_ID = 0x00CE2691,
+        REFRESH_RATE_OVERRIDE_ID = 0x0064B541,
+        SET_POWER_THROTTLE_FOR_PCIe_COMPLIANCE_ID = 0x00AE785C,
+        SET_VAB_DATA_ID = 0x00AB8687,
+        VSYNCMODE_ID = 0x00A879CF,
+        VSYNCTEARCONTROL_ID = 0x005A375C,
+        TOTAL_DWORD_SETTING_NUM = 80,
+        TOTAL_WSTRING_SETTING_NUM = 4,
+        TOTAL_SETTING_NUM = 84,
+        INVALID_SETTING_ID = 0xFFFFFFFF
+    }
+
+    internal enum NvShimSetting : uint
+    {
+        SHIM_RENDERING_MODE_INTEGRATED = 0x00000000,
+        SHIM_RENDERING_MODE_ENABLE = 0x00000001,
+        SHIM_RENDERING_MODE_USER_EDITABLE = 0x00000002,
+        SHIM_RENDERING_MODE_MASK = 0x00000003,
+        SHIM_RENDERING_MODE_VIDEO_MASK = 0x00000004,
+        SHIM_RENDERING_MODE_VARYING_BIT = 0x00000008,
+        SHIM_RENDERING_MODE_AUTO_SELECT = 0x00000010,
+        SHIM_RENDERING_MODE_OVERRIDE_BIT = 0x80000000,
+        SHIM_RENDERING_MODE_NUM_VALUES = 8,
+        SHIM_RENDERING_MODE_DEFAULT = SHIM_RENDERING_MODE_AUTO_SELECT
+    }
+
+    internal enum NvThreadControlSetting : uint
+    {
+        OGL_THREAD_CONTROL_ENABLE = 0x00000001,
+        OGL_THREAD_CONTROL_DISABLE = 0x00000002,
+        OGL_THREAD_CONTROL_NUM_VALUES = 2,
+        OGL_THREAD_CONTROL_DEFAULT = 0
+    }
+}
diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index a33e845f5b..b37b5cf6ca 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -30,6 +30,8 @@ namespace osu.Desktop
         [STAThread]
         public static void Main(string[] args)
         {
+            NVAPI.ThreadedOptimisations = true;
+
             // run Squirrel first, as the app may exit after these run
             if (OperatingSystem.IsWindows())
             {

From d38f8d9c783049f0c6a577383f3097a923ba635c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Jan 2024 15:37:24 +0900
Subject: [PATCH 2275/2296] Change threaded optimisations setting to "Auto" on
 startup

---
 osu.Desktop/NVAPI.cs   | 12 ++++++------
 osu.Desktop/Program.cs |  5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Desktop/NVAPI.cs b/osu.Desktop/NVAPI.cs
index 9648ea1072..e1c5971e28 100644
--- a/osu.Desktop/NVAPI.cs
+++ b/osu.Desktop/NVAPI.cs
@@ -153,30 +153,30 @@ namespace osu.Desktop
             }
         }
 
-        public static bool ThreadedOptimisations
+        public static NvThreadControlSetting ThreadedOptimisations
         {
             get
             {
                 if (!Available)
-                    return false;
+                    return NvThreadControlSetting.OGL_THREAD_CONTROL_DEFAULT;
 
                 IntPtr profileHandle;
                 if (!getProfile(out profileHandle, out _, out bool _))
-                    return false;
+                    return NvThreadControlSetting.OGL_THREAD_CONTROL_DEFAULT;
 
                 // Get the threaded optimisations setting
                 NvSetting setting;
                 if (!getSetting(NvSettingID.OGL_THREAD_CONTROL_ID, profileHandle, out setting))
-                    return false;
+                    return NvThreadControlSetting.OGL_THREAD_CONTROL_DEFAULT;
 
-                return setting.U32CurrentValue != (uint)NvThreadControlSetting.OGL_THREAD_CONTROL_DISABLE;
+                return (NvThreadControlSetting)setting.U32CurrentValue;
             }
             set
             {
                 if (!Available)
                     return;
 
-                bool success = setSetting(NvSettingID.OGL_THREAD_CONTROL_ID, (uint)(value ? NvThreadControlSetting.OGL_THREAD_CONTROL_ENABLE : NvThreadControlSetting.OGL_THREAD_CONTROL_DISABLE));
+                bool success = setSetting(NvSettingID.OGL_THREAD_CONTROL_ID, (uint)value);
 
                 Logger.Log(success ? $"Threaded optimizations set to \"{value}\"!" : "Threaded optimizations set failed!");
             }
diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index b37b5cf6ca..a652e31f62 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -30,7 +30,10 @@ namespace osu.Desktop
         [STAThread]
         public static void Main(string[] args)
         {
-            NVAPI.ThreadedOptimisations = true;
+            // NVIDIA profiles are based on the executable name of a process.
+            // Lazer and stable share the same executable name.
+            // Stable sets this setting to "Off", which may not be what we want, so let's force it back to the default "Auto" on startup.
+            NVAPI.ThreadedOptimisations = NvThreadControlSetting.OGL_THREAD_CONTROL_DEFAULT;
 
             // run Squirrel first, as the app may exit after these run
             if (OperatingSystem.IsWindows())

From e686a6a1dddbe20c3c22dd1ec8cb572d7a9d8aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Jan 2024 09:17:01 +0100
Subject: [PATCH 2276/2296] Fix player submission test intermittent failures
 due to audio playback discrepancy logic kicking in

See https://github.com/ppy/osu/actions/runs/7384457927/job/20087439457#step:5:133.
---
 .../Visual/Gameplay/TestScenePlayerScoreSubmission.cs    | 6 ++++++
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs    | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
index f75a2656ef..96cfcd61c3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Beatmaps;
 
@@ -359,6 +360,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                 AllowImportCompletion = new SemaphoreSlim(1);
             }
 
+            protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart) => new MasterGameplayClockContainer(beatmap, gameplayStart)
+            {
+                ShouldValidatePlaybackRate = false,
+            };
+
             protected override async Task ImportScore(Score score)
             {
                 ScoreImportStarted = true;
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index a475f4823f..0d60ec4713 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -40,6 +40,12 @@ namespace osu.Game.Screens.Play
             Precision = 0.1,
         };
 
+        /// <summary>
+        /// Whether the audio playback rate should be validated.
+        /// Mostly disabled for tests.
+        /// </summary>
+        internal bool ShouldValidatePlaybackRate { get; init; }
+
         /// <summary>
         /// Whether the audio playback is within acceptable ranges.
         /// Will become false if audio playback is not going as expected.
@@ -223,6 +229,9 @@ namespace osu.Game.Screens.Play
 
         private void checkPlaybackValidity()
         {
+            if (!ShouldValidatePlaybackRate)
+                return;
+
             if (GameplayClock.IsRunning)
             {
                 elapsedGameplayClockTime += GameplayClock.ElapsedFrameTime;

From 474c416bd9985aab49f895054189ea5b61b40949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Jan 2024 10:05:11 +0100
Subject: [PATCH 2277/2296] Make `dotnet format` shut up about naming

---
 osu.Desktop/NVAPI.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Desktop/NVAPI.cs b/osu.Desktop/NVAPI.cs
index e1c5971e28..bb3a59cc7f 100644
--- a/osu.Desktop/NVAPI.cs
+++ b/osu.Desktop/NVAPI.cs
@@ -3,6 +3,8 @@
 
 #nullable disable
 
+#pragma warning disable IDE1006 // Naming rule violation
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;

From 04147eb68988e4ce7f94f5d36def2c8669821508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Jan 2024 11:46:26 +0100
Subject: [PATCH 2278/2296] Fix lack of correct default value spec

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

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 0d60ec4713..8b8bf87436 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Play
         /// Whether the audio playback rate should be validated.
         /// Mostly disabled for tests.
         /// </summary>
-        internal bool ShouldValidatePlaybackRate { get; init; }
+        internal bool ShouldValidatePlaybackRate { get; init; } = true;
 
         /// <summary>
         /// Whether the audio playback is within acceptable ranges.

From 4312e9e9a9c70bd7a139833108edca8dd4ff63e3 Mon Sep 17 00:00:00 2001
From: CaffeeLake <PascalCoffeeLake@gmail.com>
Date: Wed, 3 Jan 2024 20:17:05 +0900
Subject: [PATCH 2279/2296] Add Test: floating point errors

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index 4f10a0ea54..f1db146f3a 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -315,6 +315,10 @@ namespace osu.Game.Tests.Mods
         {
             Assert.AreEqual(ModUtils.FormatScoreMultiplier(0.9999).ToString(), "0.99x");
             Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.0001).ToString(), "1.01x");
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(0.899999999999999).ToString(), "0.90x");
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.099999999999999).ToString(), "1.10x");
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(0.900000000000001).ToString(), "0.90x");
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.100000000000001).ToString(), "1.10x");
         }
 
         public abstract class CustomMod1 : Mod, IModCompatibilitySpecification

From 92c45662874d2c4e3992124a8aeabcca90fa1862 Mon Sep 17 00:00:00 2001
From: wooster0 <wooster0@proton.me>
Date: Thu, 4 Jan 2024 12:20:05 +0900
Subject: [PATCH 2280/2296] Fix typo

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index d4b6bc2b91..6c87553971 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -275,7 +275,7 @@ Phasellus eu nunc nec ligula semper fringilla. Aliquam magna neque, placerat sed
             AddStep("set content", () =>
             {
                 markdownContainer.Text = @"
-This is a paragraph containing `inline code` synatax.
+This is a paragraph containing `inline code` syntax.
 Oh wow I do love the `WikiMarkdownContainer`, it is very cool!
 
 This is a line before the fenced code block:

From 659118c04353bca73182a82e6d48c533779f6777 Mon Sep 17 00:00:00 2001
From: wooster0 <wooster0@proton.me>
Date: Thu, 4 Jan 2024 12:20:51 +0900
Subject: [PATCH 2281/2296] Fix wiki link path inconsistencies

If I access https://osu.ppy.sh/wiki/en/MAIN_PAGE or use any other
capitalization my browser always redirects me to
https://osu.ppy.sh/wiki/en/Main_page so I think Main_page is the
correct capitalization.

This might slightly reduce loading time? No idea though. Probably
negligible if so.
---
 osu.Game/Overlays/Wiki/WikiHeader.cs | 2 +-
 osu.Game/Overlays/WikiOverlay.cs     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Wiki/WikiHeader.cs b/osu.Game/Overlays/Wiki/WikiHeader.cs
index 24eddeb0c2..55be05ed7a 100644
--- a/osu.Game/Overlays/Wiki/WikiHeader.cs
+++ b/osu.Game/Overlays/Wiki/WikiHeader.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Wiki
 {
     public partial class WikiHeader : BreadcrumbControlOverlayHeader
     {
-        private const string index_path = "Main_Page";
+        private const string index_path = "Main_page";
 
         public static LocalisableString IndexPageString => LayoutStrings.HeaderHelpIndex;
 
diff --git a/osu.Game/Overlays/WikiOverlay.cs b/osu.Game/Overlays/WikiOverlay.cs
index c816eca776..440e451201 100644
--- a/osu.Game/Overlays/WikiOverlay.cs
+++ b/osu.Game/Overlays/WikiOverlay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays
 {
     public partial class WikiOverlay : OnlineOverlay<WikiHeader>
     {
-        private const string index_path = @"main_page";
+        private const string index_path = "Main_page";
 
         public string CurrentPath => path.Value;
 
@@ -161,7 +161,7 @@ namespace osu.Game.Overlays
             path.Value = "error";
 
             LoadDisplay(articlePage = new WikiArticlePage($@"{api.WebsiteRootUrl}/wiki/",
-                $"Something went wrong when trying to fetch page \"{originalPath}\".\n\n[Return to the main page](Main_Page)."));
+                $"Something went wrong when trying to fetch page \"{originalPath}\".\n\n[Return to the main page](Main_page)."));
         }
 
         private void showParentPage()

From ddc8a647640ee1c6f4c2dcf005cb7dad0b9e4700 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 14:55:52 +0900
Subject: [PATCH 2282/2296] Reduce spinner glow

It was horrible
---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
index 88769442a1..76afeeb2c4 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     RelativeSizeAxes = Axes.Both,
                     InnerRadius = arc_radius,
                     RoundedCaps = true,
-                    GlowColour = new Color4(171, 255, 255, 255)
+                    GlowColour = new Color4(171, 255, 255, 180)
                 }
             };
         }

From cf5f0a2bdc79e50b178f9b41d08a7ab52b1b5a9f Mon Sep 17 00:00:00 2001
From: wooster0 <wooster0@proton.me>
Date: Thu, 4 Jan 2024 15:01:27 +0900
Subject: [PATCH 2283/2296] Make chat commands case-insensitive

Would be nice if I accidentally have caps lock enabled and write "/HELP" it still works.
---
 .../Chat/TestSceneChannelManager.cs           | 19 ++++++++++++++++++-
 osu.Game/Online/Chat/ChannelManager.cs        |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Chat/TestSceneChannelManager.cs b/osu.Game.Tests/Chat/TestSceneChannelManager.cs
index 3a4c55c65c..eae12edebd 100644
--- a/osu.Game.Tests/Chat/TestSceneChannelManager.cs
+++ b/osu.Game.Tests/Chat/TestSceneChannelManager.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Tests.Chat
             });
 
             AddStep("post message", () => channelManager.PostMessage("Something interesting"));
-            AddUntilStep("message postesd", () => !channel.Messages.Any(m => m is LocalMessage));
+            AddUntilStep("message posted", () => !channel.Messages.Any(m => m is LocalMessage));
 
             AddStep("post /help command", () => channelManager.PostCommand("help", channel));
             AddStep("post /me command with no action", () => channelManager.PostCommand("me", channel));
@@ -146,6 +146,23 @@ namespace osu.Game.Tests.Chat
             AddAssert("channel has no more messages", () => channel.Messages, () => Is.Empty);
         }
 
+        [Test]
+        public void TestCommandNameCaseInsensitivity()
+        {
+            Channel channel = null;
+
+            AddStep("join channel and select it", () =>
+            {
+                channelManager.JoinChannel(channel = createChannel(1, ChannelType.Public));
+                channelManager.CurrentChannel.Value = channel;
+            });
+
+            AddStep("post /me command", () => channelManager.PostCommand("ME DANCES"));
+            AddUntilStep("/me command received", () => channel.Messages.Last().Content.Contains("DANCES"));
+            AddStep("post /help command", () => channelManager.PostCommand("HeLp"));
+            AddUntilStep("/help command received", () => channel.Messages.Last().Content.Contains("Supported commands"));
+        }
+
         private void handlePostMessageRequest(PostMessageRequest request)
         {
             var message = new Message(++currentMessageId)
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index e95bc128c8..23989caae2 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Online.Chat
             string command = parameters[0];
             string content = parameters.Length == 2 ? parameters[1] : string.Empty;
 
-            switch (command)
+            switch (command.ToLowerInvariant())
             {
                 case "np":
                     AddInternal(new NowPlayingCommand(target));

From cd9bf0c753c0d4e6ca86c4ccc17fe1a668654e8e Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 3 Jan 2024 21:30:46 -0800
Subject: [PATCH 2284/2296] Flash blocking ongoing operations dialog when
 trying to force quit

---
 osu.Game/Screens/Menu/MainMenu.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 516b090a16..14c950d726 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -25,6 +26,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.SkinEditor;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Backgrounds;
@@ -390,7 +392,12 @@ namespace osu.Game.Screens.Menu
             if (requiresConfirmation)
             {
                 if (dialogOverlay.CurrentDialog is ConfirmExitDialog exitDialog)
-                    exitDialog.PerformOkAction();
+                {
+                    if (exitDialog.Buttons.OfType<PopupDialogOkButton>().FirstOrDefault() != null)
+                        exitDialog.PerformOkAction();
+                    else
+                        exitDialog.Flash();
+                }
                 else
                 {
                     dialogOverlay.Push(new ConfirmExitDialog(() =>

From ea714c86d427cb6fa498b1d76a02e6ee389dae6f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 3 Jan 2024 22:22:25 -0800
Subject: [PATCH 2285/2296] Fix potential null reference with flash sample when
 exiting rapidly

Fixes `TestForceExitWithOperationInProgress()`.
---
 osu.Game/Overlays/Dialog/PopupDialog.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 4048b35e78..4ac37a63e2 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Dialog
         private readonly Vector2 ringMinifiedSize = new Vector2(20f);
 
         private readonly Box flashLayer;
-        private Sample flashSample = null!;
+        private Sample? flashSample;
 
         private readonly Container content;
         private readonly Container ring;
@@ -267,7 +267,7 @@ namespace osu.Game.Overlays.Dialog
             flashLayer.FadeInFromZero(80, Easing.OutQuint)
                       .Then()
                       .FadeOutFromOne(1500, Easing.OutQuint);
-            flashSample.Play();
+            flashSample?.Play();
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)

From b1813b17a2f84b5ee318a6db89fdff588356678b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 16:39:50 +0900
Subject: [PATCH 2286/2296] Few new rider inspection

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDifficultySwitching.cs b/osu.Game.Tests/Visual/Editing/TestSceneDifficultySwitching.cs
index 69070b0b64..76ed5063b0 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDifficultySwitching.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDifficultySwitching.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.Visual.Editing
             if (sameRuleset)
             {
                 AddUntilStep("prompt for save dialog shown", () => DialogOverlay.CurrentDialog is PromptForSaveDialog);
-                AddStep("discard changes", () => ((PromptForSaveDialog)DialogOverlay.CurrentDialog).PerformOkAction());
+                AddStep("discard changes", () => ((PromptForSaveDialog)DialogOverlay.CurrentDialog)?.PerformOkAction());
             }
 
             // ensure editor loader didn't resume.

From df99a37254b930b7369c754d09b3ad2ce9d115c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 17:04:36 +0900
Subject: [PATCH 2287/2296] Fix another realm null inspection

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

diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index bb4e06654a..015c2c62ed 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -132,8 +132,8 @@ namespace osu.Game.Tests.Beatmaps
         public AudioManager AudioManager => Audio;
         public IResourceStore<byte[]> Files => userSkinResourceStore;
         public new IResourceStore<byte[]> Resources => base.Resources;
-        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
-        RealmAccess IStorageResourceProvider.RealmAccess => null;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => throw new NotImplementedException();
+        RealmAccess IStorageResourceProvider.RealmAccess => throw new NotImplementedException();
 
         #endregion
 

From f0aeeeea966f06add12cf2bca3dd48dac8573e82 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 17:13:21 +0900
Subject: [PATCH 2288/2296] ...in a safer way

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

diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index 015c2c62ed..1f491be7e3 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -132,8 +132,8 @@ namespace osu.Game.Tests.Beatmaps
         public AudioManager AudioManager => Audio;
         public IResourceStore<byte[]> Files => userSkinResourceStore;
         public new IResourceStore<byte[]> Resources => base.Resources;
-        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => throw new NotImplementedException();
-        RealmAccess IStorageResourceProvider.RealmAccess => throw new NotImplementedException();
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null!;
+        RealmAccess IStorageResourceProvider.RealmAccess => null!;
 
         #endregion
 

From 0bbc27e380b7fb2d430322edba27e8b0122f583f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 16:41:52 +0900
Subject: [PATCH 2289/2296] Add a gameplay configuration flag to disable fail
 animation

---
 .../Multiplayer/MultiplayerPlayer.cs          |  4 +-
 osu.Game/Screens/Play/GameplayState.cs        |  2 +-
 osu.Game/Screens/Play/Player.cs               | 57 +++++++++++--------
 osu.Game/Screens/Play/PlayerConfiguration.cs  |  6 ++
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index e6d9dd4cd0..d9043df1d5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -26,9 +26,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     {
         protected override bool PauseOnFocusLost => false;
 
-        // Disallow fails in multiplayer for now.
-        protected override bool CheckModsAllowFailure() => false;
-
         protected override UserActivity InitialActivity => new UserActivity.InMultiplayerGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
 
         [Resolved]
@@ -55,6 +52,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 AllowPause = false,
                 AllowRestart = false,
+                AllowFailAnimation = false,
                 AllowSkipping = room.AutoSkip.Value,
                 AutomaticallySkipIntro = room.AutoSkip.Value,
                 AlwaysShowLeaderboard = true,
diff --git a/osu.Game/Screens/Play/GameplayState.cs b/osu.Game/Screens/Play/GameplayState.cs
index c2162d4df2..cc399a0fbe 100644
--- a/osu.Game/Screens/Play/GameplayState.cs
+++ b/osu.Game/Screens/Play/GameplayState.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Play
         public bool HasPassed { get; set; }
 
         /// <summary>
-        /// Whether the user failed during gameplay.
+        /// Whether the user failed during gameplay. This is only set when the gameplay session has completed due to the fail.
         /// </summary>
         public bool HasFailed { get; set; }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c960ac357f..df50e35986 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -735,7 +735,7 @@ namespace osu.Game.Screens.Play
             }
 
             // Only show the completion screen if the player hasn't failed
-            if (HealthProcessor.HasFailed)
+            if (GameplayState.HasFailed)
                 return;
 
             GameplayState.HasPassed = true;
@@ -924,37 +924,44 @@ namespace osu.Game.Screens.Play
             if (!CheckModsAllowFailure())
                 return false;
 
-            Debug.Assert(!GameplayState.HasFailed);
-            Debug.Assert(!GameplayState.HasPassed);
-            Debug.Assert(!GameplayState.HasQuit);
+            if (Configuration.AllowFailAnimation)
+            {
+                Debug.Assert(!GameplayState.HasFailed);
+                Debug.Assert(!GameplayState.HasPassed);
+                Debug.Assert(!GameplayState.HasQuit);
 
-            GameplayState.HasFailed = true;
+                GameplayState.HasFailed = true;
 
-            updateGameplayState();
+                updateGameplayState();
 
-            // There is a chance that we could be in a paused state as the ruleset's internal clock (see FrameStabilityContainer)
-            // could process an extra frame after the GameplayClock is stopped.
-            // In such cases we want the fail state to precede a user triggered pause.
-            if (PauseOverlay.State.Value == Visibility.Visible)
-                PauseOverlay.Hide();
+                // There is a chance that we could be in a paused state as the ruleset's internal clock (see FrameStabilityContainer)
+                // could process an extra frame after the GameplayClock is stopped.
+                // In such cases we want the fail state to precede a user triggered pause.
+                if (PauseOverlay.State.Value == Visibility.Visible)
+                    PauseOverlay.Hide();
 
-            failAnimationContainer.Start();
+                failAnimationContainer.Start();
 
-            // Failures can be triggered either by a judgement, or by a mod.
-            //
-            // For the case of a judgement, due to ordering considerations, ScoreProcessor will not have received
-            // the final judgement which triggered the failure yet (see DrawableRuleset.NewResult handling above).
-            //
-            // A schedule here ensures that any lingering judgements from the current frame are applied before we
-            // finalise the score as "failed".
-            Schedule(() =>
+                // Failures can be triggered either by a judgement, or by a mod.
+                //
+                // For the case of a judgement, due to ordering considerations, ScoreProcessor will not have received
+                // the final judgement which triggered the failure yet (see DrawableRuleset.NewResult handling above).
+                //
+                // A schedule here ensures that any lingering judgements from the current frame are applied before we
+                // finalise the score as "failed".
+                Schedule(() =>
+                {
+                    ScoreProcessor.FailScore(Score.ScoreInfo);
+                    OnFail();
+
+                    if (GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
+                        Restart(true);
+                });
+            }
+            else
             {
                 ScoreProcessor.FailScore(Score.ScoreInfo);
-                OnFail();
-
-                if (GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
-                    Restart(true);
-            });
+            }
 
             return true;
         }
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
index 122e25f406..466a691118 100644
--- a/osu.Game/Screens/Play/PlayerConfiguration.cs
+++ b/osu.Game/Screens/Play/PlayerConfiguration.cs
@@ -15,6 +15,12 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public bool ShowResults { get; set; } = true;
 
+        /// <summary>
+        /// Whether the fail animation / screen should be triggered on failing.
+        /// If false, the score will still be marked as failed but gameplay will continue.
+        /// </summary>
+        public bool AllowFailAnimation { get; set; } = true;
+
         /// <summary>
         /// Whether the player should be allowed to trigger a restart.
         /// </summary>

From 705f25e4b990c0ab726c29d6541121f7eb47b034 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 16:42:05 +0900
Subject: [PATCH 2290/2296] Make `ScoreProcessor.Rank` read-only

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs     |  3 ---
 osu.Game/Rulesets/Mods/ModHidden.cs         |  2 --
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 14 ++++++++------
 osu.Game/Screens/Play/BreakOverlay.cs       |  4 +++-
 osu.Game/Screens/Play/Player.cs             |  2 --
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 95406cc9e6..dc2ad6f47e 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -56,9 +56,6 @@ namespace osu.Game.Rulesets.Mods
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
         {
             Combo.BindTo(scoreProcessor.Combo);
-
-            // Default value of ScoreProcessor's Rank in Flashlight Mod should be SS+
-            scoreProcessor.Rank.Value = ScoreRank.XH;
         }
 
         public ScoreRank AdjustRank(ScoreRank rank, double accuracy)
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 5a8226115f..8b25768575 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
         {
-            // Default value of ScoreProcessor's Rank in Hidden Mod should be SS+
-            scoreProcessor.Rank.Value = ScoreRank.XH;
         }
 
         public ScoreRank AdjustRank(ScoreRank rank, double accuracy)
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 837bb4080e..4ef65c55ab 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -86,7 +86,9 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// The current rank.
         /// </summary>
-        public readonly Bindable<ScoreRank> Rank = new Bindable<ScoreRank>(ScoreRank.X);
+        public IBindable<ScoreRank> Rank => rank;
+
+        private readonly Bindable<ScoreRank> rank = new Bindable<ScoreRank>(ScoreRank.X);
 
         /// <summary>
         /// The highest combo achieved by this score.
@@ -186,9 +188,9 @@ namespace osu.Game.Rulesets.Scoring
             Combo.ValueChanged += combo => HighestCombo.Value = Math.Max(HighestCombo.Value, combo.NewValue);
             Accuracy.ValueChanged += accuracy =>
             {
-                Rank.Value = RankFromAccuracy(accuracy.NewValue);
+                rank.Value = RankFromAccuracy(accuracy.NewValue);
                 foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
-                    Rank.Value = mod.AdjustRank(Rank.Value, accuracy.NewValue);
+                    rank.Value = mod.AdjustRank(Rank.Value, accuracy.NewValue);
             };
 
             Mods.ValueChanged += mods =>
@@ -411,8 +413,8 @@ namespace osu.Game.Rulesets.Scoring
             TotalScore.Value = 0;
             Accuracy.Value = 1;
             Combo.Value = 0;
-            Rank.Disabled = false;
-            Rank.Value = ScoreRank.X;
+            rank.Disabled = false;
+            rank.Value = ScoreRank.X;
             HighestCombo.Value = 0;
         }
 
@@ -448,7 +450,7 @@ namespace osu.Game.Rulesets.Scoring
                 return;
 
             score.Passed = false;
-            Rank.Value = ScoreRank.F;
+            rank.Value = ScoreRank.F;
 
             PopulateScore(score);
         }
diff --git a/osu.Game/Screens/Play/BreakOverlay.cs b/osu.Game/Screens/Play/BreakOverlay.cs
index 3ca82ec00b..e18612c955 100644
--- a/osu.Game/Screens/Play/BreakOverlay.cs
+++ b/osu.Game/Screens/Play/BreakOverlay.cs
@@ -4,12 +4,14 @@
 #nullable disable
 
 using System.Collections.Generic;
+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.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play.Break;
 
 namespace osu.Game.Screens.Play
@@ -113,7 +115,7 @@ namespace osu.Game.Screens.Play
             if (scoreProcessor != null)
             {
                 info.AccuracyDisplay.Current.BindTo(scoreProcessor.Accuracy);
-                info.GradeDisplay.Current.BindTo(scoreProcessor.Rank);
+                ((IBindable<ScoreRank>)info.GradeDisplay.Current).BindTo(scoreProcessor.Rank);
             }
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index df50e35986..b87306b9a2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -801,8 +801,6 @@ namespace osu.Game.Screens.Play
                     // This player instance may already be in the process of exiting.
                     return;
 
-                Debug.Assert(ScoreProcessor.Rank.Value != ScoreRank.F);
-
                 this.Push(CreateResults(prepareScoreForDisplayTask.GetResultSafely()));
             }, Time.Current + delay, 50);
 

From a4dee1a01af5c572f4fdd48c58caa754e542a32b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 16:51:25 +0900
Subject: [PATCH 2291/2296] Don't unset `Disabled` on rank (never actually
 disabled?)

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 4ef65c55ab..6d2b43a3e7 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -413,7 +413,6 @@ namespace osu.Game.Rulesets.Scoring
             TotalScore.Value = 0;
             Accuracy.Value = 1;
             Combo.Value = 0;
-            rank.Disabled = false;
             rank.Value = ScoreRank.X;
             HighestCombo.Value = 0;
         }

From b12011d501ab28a34932176ab72854f4ed19fa52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 17:04:45 +0900
Subject: [PATCH 2292/2296] Avoid rank updates after failing

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

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 6d2b43a3e7..13c5d523da 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -188,6 +188,10 @@ namespace osu.Game.Rulesets.Scoring
             Combo.ValueChanged += combo => HighestCombo.Value = Math.Max(HighestCombo.Value, combo.NewValue);
             Accuracy.ValueChanged += accuracy =>
             {
+                // Once failed, we shouldn't update the rank anymore.
+                if (rank.Value == ScoreRank.F)
+                    return;
+
                 rank.Value = RankFromAccuracy(accuracy.NewValue);
                 foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
                     rank.Value = mod.AdjustRank(Rank.Value, accuracy.NewValue);

From 44d35020d16a1f445abd65758dd37a939de44b3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 17:54:52 +0900
Subject: [PATCH 2293/2296] Add test coverage of failed multiplayer score

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 16030d568b..462286335a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -29,6 +29,7 @@ using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Lounge;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;
@@ -690,6 +691,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             }
 
             AddUntilStep("wait for results", () => multiplayerComponents.CurrentScreen is ResultsScreen);
+
+            AddAssert("check is fail", () =>
+            {
+                var scoreInfo = ((ResultsScreen)multiplayerComponents.CurrentScreen).Score;
+
+                return !scoreInfo.Passed && scoreInfo.Rank == ScoreRank.F;
+            });
         }
 
         [Test]

From fc1a2c594cbf53322b8e10aea3ce173dd6d9d82d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 18:02:37 +0900
Subject: [PATCH 2294/2296] Add a bit more test coverage

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index f1db146f3a..13da69871e 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -314,11 +314,20 @@ namespace osu.Game.Tests.Mods
         public void TestFormatScoreMultiplier()
         {
             Assert.AreEqual(ModUtils.FormatScoreMultiplier(0.9999).ToString(), "0.99x");
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.0).ToString(), "1.00x");
             Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.0001).ToString(), "1.01x");
+
             Assert.AreEqual(ModUtils.FormatScoreMultiplier(0.899999999999999).ToString(), "0.90x");
-            Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.099999999999999).ToString(), "1.10x");
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(0.9).ToString(), "0.90x");
             Assert.AreEqual(ModUtils.FormatScoreMultiplier(0.900000000000001).ToString(), "0.90x");
+
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.099999999999999).ToString(), "1.10x");
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.1).ToString(), "1.10x");
             Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.100000000000001).ToString(), "1.10x");
+
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.045).ToString(), "1.05x");
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.05).ToString(), "1.05x");
+            Assert.AreEqual(ModUtils.FormatScoreMultiplier(1.055).ToString(), "1.06x");
         }
 
         public abstract class CustomMod1 : Mod, IModCompatibilitySpecification

From 085f5acd1abaf8cf309c5e2ccb12df367a19cc33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Jan 2024 19:26:28 +0900
Subject: [PATCH 2295/2296] Fix another rider inspection (why do these keep
 coming up at random)

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 8c32135cfd..8691f46605 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -368,7 +368,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 var cardContainer = this.ChildrenOfType<ReverseChildIDFillFlowContainer<BeatmapCard>>().Single().Parent;
                 var expandedContent = this.ChildrenOfType<ExpandedContentScrollContainer>().Single();
-                return expandedContent.ScreenSpaceDrawQuad.GetVertices().ToArray().All(v => cardContainer.ScreenSpaceDrawQuad.Contains(v));
+                return expandedContent.ScreenSpaceDrawQuad.GetVertices().ToArray().All(v => cardContainer!.ScreenSpaceDrawQuad.Contains(v));
             });
         }
 

From b190333c17f3e0209e7f04ad1463b272b957c774 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 4 Jan 2024 09:00:24 -0800
Subject: [PATCH 2296/2296] Use repeat step for more delay between the two
 exits

---
 .../Visual/Navigation/TestSceneScreenNavigation.cs          | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index d8dc512787..a0069f55c7 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -799,11 +799,7 @@ namespace osu.Game.Tests.Visual.Navigation
                 });
             });
 
-            AddStep("attempt exit", () =>
-            {
-                for (int i = 0; i < 2; ++i)
-                    Game.ScreenStack.CurrentScreen.Exit();
-            });
+            AddRepeatStep("attempt force exit", () => Game.ScreenStack.CurrentScreen.Exit(), 2);
             AddUntilStep("stopped at exit confirm", () => Game.ChildrenOfType<DialogOverlay>().Single().CurrentDialog is ConfirmExitDialog);
         }